4631 files changed, 84428 insertions, 80658 deletions

diff --git a/databases/Makefile b/databases/Makefile
index 2c84d32b33df..5f97c2795586 100644
--- a/databases/Makefile
+++ b/databases/Makefile
@@ -4,24 +4,19 @@
     SUBDIR += R-cran-RMySQL
     SUBDIR += R-cran-RPostgreSQL
     SUBDIR += R-cran-RSQLite
-    SUBDIR += R-cran-RSQLite.extfuns
     SUBDIR += R-cran-cachem
+    SUBDIR += R-cran-dbplyr
+    SUBDIR += R-cran-dtplyr
     SUBDIR += R-cran-fastmap
     SUBDIR += R-cran-sqldf
     SUBDIR += WWWdb
-    SUBDIR += adabase
     SUBDIR += adminer
-    SUBDIR += adodb
+    SUBDIR += adminerevo
     SUBDIR += adodb5
     SUBDIR += akonadi
     SUBDIR += apache-commons-dbutils
-    SUBDIR += apq
-    SUBDIR += apq-mysql
-    SUBDIR += apq-odbc
-    SUBDIR += apq-pgsql
     SUBDIR += arrow
-    SUBDIR += ateam_mysql57_ldap_auth
-    SUBDIR += ateam_mysql_ldap_auth
+    SUBDIR += arrow-glib
     SUBDIR += autobackupmysql
     SUBDIR += automysqlbackup
     SUBDIR += bbdb
@@ -38,6 +33,7 @@
     SUBDIR += cegobridge
     SUBDIR += clickhouse
     SUBDIR += closql
+    SUBDIR += closql-devel
     SUBDIR += cockroach
     SUBDIR += couchdb3
     SUBDIR += courier-authlib-mysql
@@ -49,6 +45,7 @@
     SUBDIR += credis
     SUBDIR += cutelyst-asql
     SUBDIR += dalmp
+    SUBDIR += datasette
     SUBDIR += db
     SUBDIR += db18
     SUBDIR += db5
@@ -58,42 +55,26 @@
     SUBDIR += dbow
     SUBDIR += dbtool
     SUBDIR += dbview
-    SUBDIR += elixir-calecto
-    SUBDIR += elixir-db_connection
-    SUBDIR += elixir-ecto
-    SUBDIR += elixir-geo
-    SUBDIR += elixir-mariaex
-    SUBDIR += elixir-postgrex
-    SUBDIR += elixir-timex_ecto
+    SUBDIR += diesel
+    SUBDIR += duckdb
+    SUBDIR += ejdb
+    SUBDIR += emacs-sqlite3-api
     SUBDIR += emacsql
-    SUBDIR += erlang-couchbeam
-    SUBDIR += erlang-epgsql
-    SUBDIR += erlang-eredis
+    SUBDIR += emacsql-devel
     SUBDIR += erlfdb
     SUBDIR += evolution-data-server
     SUBDIR += fastdb
-    SUBDIR += firebird25-client
-    SUBDIR += firebird25-server
     SUBDIR += firebird30-client
     SUBDIR += firebird30-server
     SUBDIR += firebird40-client
     SUBDIR += firebird40-server
     SUBDIR += fortytwo-bdb
     SUBDIR += foundationdb
-    SUBDIR += foundationdb-devel
-    SUBDIR += fpc-dblib
-    SUBDIR += fpc-fpindexer
-    SUBDIR += fpc-gdbm
-    SUBDIR += fpc-ibase
-    SUBDIR += fpc-mysql
-    SUBDIR += fpc-odbc
-    SUBDIR += fpc-oracle
-    SUBDIR += fpc-postgres
-    SUBDIR += fpc-pxlib
-    SUBDIR += fpc-sqlite
+    SUBDIR += frece
     SUBDIR += freetds
     SUBDIR += freetds-devel
     SUBDIR += frontbase-jdbc
+    SUBDIR += futuresql
     SUBDIR += galera
     SUBDIR += galera26
     SUBDIR += gdbm
@@ -104,35 +85,42 @@
     SUBDIR += gnatsweb4
     SUBDIR += go-carbon
     SUBDIR += go-pgweb
+    SUBDIR += gobang
     SUBDIR += gom
+    SUBDIR += goose
     SUBDIR += gqlplus
     SUBDIR += grass7
+    SUBDIR += grass8
+    SUBDIR += greptimedb
     SUBDIR += hashtypes
-    SUBDIR += hbase
     SUBDIR += hiredis
     SUBDIR += hsqldb
+    SUBDIR += immudb
+    SUBDIR += imposm3
     SUBDIR += influxdb
+    SUBDIR += influxdb2-cli
     SUBDIR += innotop
     SUBDIR += iowow
     SUBDIR += ip4r
     SUBDIR += ipa_sdb
     SUBDIR += iplike
-    SUBDIR += isql-viewer
-    SUBDIR += jasperreports
     SUBDIR += jdb
     SUBDIR += jdbc-oracle11g
+    SUBDIR += jetbrains-datagrip
     SUBDIR += jlog
     SUBDIR += jrobin
     SUBDIR += jrrd
     SUBDIR += kbibtex
     SUBDIR += kdb
     SUBDIR += kexi
+    SUBDIR += keydb
     SUBDIR += kyotocabinet
     SUBDIR += kyototycoon
     SUBDIR += ldb15
     SUBDIR += ldb20
     SUBDIR += ldb21
     SUBDIR += ldb22
+    SUBDIR += ldb25
     SUBDIR += leo_center
     SUBDIR += leofs
     SUBDIR += leveldb
@@ -142,10 +130,8 @@
     SUBDIR += libdrizzle
     SUBDIR += libdrizzle-redux
     SUBDIR += libgda5
-    SUBDIR += libgda5-bdb
     SUBDIR += libgda5-jdbc
     SUBDIR += libgda5-ldap
-    SUBDIR += libgda5-mdb
     SUBDIR += libgda5-mysql
     SUBDIR += libgda5-postgresql
     SUBDIR += libgda5-ui
@@ -155,6 +141,7 @@
     SUBDIR += libmemcache
     SUBDIR += libmemcached
     SUBDIR += libmongo-client
+    SUBDIR += libmongocrypt
     SUBDIR += libmswstr
     SUBDIR += libnvpair
     SUBDIR += libodbc++
@@ -183,69 +170,57 @@
     SUBDIR += mantis
     SUBDIR += mariadb-connector-c
     SUBDIR += mariadb-connector-odbc
-    SUBDIR += mariadb103-client
-    SUBDIR += mariadb103-server
-    SUBDIR += mariadb104-client
-    SUBDIR += mariadb104-server
+    SUBDIR += mariadb1011-client
+    SUBDIR += mariadb1011-server
     SUBDIR += mariadb105-client
     SUBDIR += mariadb105-server
+    SUBDIR += mariadb106-client
+    SUBDIR += mariadb106-server
     SUBDIR += mdbtools
     SUBDIR += mdbx
     SUBDIR += mdcached
     SUBDIR += memcached
     SUBDIR += metabase
     SUBDIR += mongodb-tools
-    SUBDIR += mongodb36
-    SUBDIR += mongodb36-tools
-    SUBDIR += mongodb40
-    SUBDIR += mongodb40-tools
-    SUBDIR += mongodb42
-    SUBDIR += mongodb42-tools
     SUBDIR += mongodb44
     SUBDIR += mongodb50
+    SUBDIR += mongodb60
+    SUBDIR += mongodb70
+    SUBDIR += movine
     SUBDIR += mroonga
     SUBDIR += mtop
     SUBDIR += mydumper
-    SUBDIR += mysac
-    SUBDIR += mysql-connector-c
+    SUBDIR += mysql++
     SUBDIR += mysql-connector-c++
-    SUBDIR += mysql-connector-java
+    SUBDIR += mysql-connector-j
     SUBDIR += mysql-connector-java51
-    SUBDIR += mysql-connector-odbc
-    SUBDIR += mysql-q4m
-    SUBDIR += mysql-udf
+    SUBDIR += mysql-connector-odbc-80
     SUBDIR += mysql2pgsql
-    SUBDIR += mysql55-client
-    SUBDIR += mysql55-server
-    SUBDIR += mysql56-client
-    SUBDIR += mysql56-server
-    SUBDIR += mysql57-client
-    SUBDIR += mysql57-server
     SUBDIR += mysql80-client
     SUBDIR += mysql80-server
+    SUBDIR += mysql81-client
+    SUBDIR += mysql81-server
     SUBDIR += mysqlbackup
-    SUBDIR += mysqlbigram
     SUBDIR += mysqldump-secure
     SUBDIR += mysqlreport
     SUBDIR += mysqlsla
-    SUBDIR += mysqlsniffer
     SUBDIR += mysqltcl
     SUBDIR += mysqltuner
-    SUBDIR += mysqlwsrep56-server
-    SUBDIR += mysqlwsrep57-server
     SUBDIR += mytop
     SUBDIR += nagios-check_mongodb
     SUBDIR += nagios-check_postgres_replication
     SUBDIR += nagios-check_redis
     SUBDIR += namazu2
+    SUBDIR += nanodbc
     SUBDIR += neo4j
     SUBDIR += ocaml-dbm
     SUBDIR += ocaml-mysql
     SUBDIR += ocaml-sqlite3
+    SUBDIR += octosql
+    SUBDIR += odbc-cpp-wrapper
     SUBDIR += ods2sql
     SUBDIR += opendbviewer
     SUBDIR += opendbx
-    SUBDIR += opentsdb
     SUBDIR += ora2pg
     SUBDIR += oracle8-client
     SUBDIR += p5-Amazon-SimpleDB
@@ -325,6 +300,7 @@
     SUBDIR += p5-DBD-XBase
     SUBDIR += p5-DBD-cego
     SUBDIR += p5-DBD-mysql
+    SUBDIR += p5-DBD-mysql4
     SUBDIR += p5-DBI
     SUBDIR += p5-DBI-Shell
     SUBDIR += p5-DBICx-Deploy
@@ -414,6 +390,7 @@
     SUBDIR += p5-DBIx-Skinny-Schema-Loader
     SUBDIR += p5-DBIx-Sunny
     SUBDIR += p5-DBIx-TableHash
+    SUBDIR += p5-DBIx-Tracer
     SUBDIR += p5-DBIx-TransactionManager
     SUBDIR += p5-DBIx-Tree
     SUBDIR += p5-DBIx-VersionedDDL
@@ -502,7 +479,6 @@
     SUBDIR += p5-Search-InvertedIndex
     SUBDIR += p5-Search-Namazu
     SUBDIR += p5-Search-Xapian
-    SUBDIR += p5-Search-Xapian12
     SUBDIR += p5-Store-CouchDB
     SUBDIR += p5-T2
     SUBDIR += p5-Tangram
@@ -552,7 +528,6 @@
     SUBDIR += pear-Structures_DataGrid_DataSource_DB
     SUBDIR += pear-Structures_DataGrid_DataSource_PDO
     SUBDIR += pear-XML_Query2XML
-    SUBDIR += pecl-cassandra
     SUBDIR += pecl-couchbase
     SUBDIR += pecl-leveldb
     SUBDIR += pecl-memcache
@@ -560,19 +535,16 @@
     SUBDIR += pecl-mongodb
     SUBDIR += pecl-redis
     SUBDIR += pecl-rrd
-    SUBDIR += percona-pam-for-mysql
+    SUBDIR += percona-orchestrator
     SUBDIR += percona-toolkit
-    SUBDIR += percona56-client
-    SUBDIR += percona56-server
-    SUBDIR += percona57-client
-    SUBDIR += percona57-pam-for-mysql
-    SUBDIR += percona57-server
+    SUBDIR += pg-gvm
     SUBDIR += pg.el
     SUBDIR += pgFormatter
     SUBDIR += pg_activity
     SUBDIR += pg_citus
     SUBDIR += pg_dirtyread
     SUBDIR += pg_ed25519
+    SUBDIR += pg_filedump
     SUBDIR += pg_hashids
     SUBDIR += pg_partman
     SUBDIR += pg_qualstats
@@ -582,6 +554,7 @@
     SUBDIR += pg_tileserv
     SUBDIR += pgaccess
     SUBDIR += pgadmin3
+    SUBDIR += pgagroal
     SUBDIR += pgbackrest
     SUBDIR += pgbadger
     SUBDIR += pgbarman
@@ -592,11 +565,11 @@
     SUBDIR += pglogical
     SUBDIR += pgmetrics
     SUBDIR += pgmodeler
-    SUBDIR += pgpool-II-36
-    SUBDIR += pgpool-II-37
-    SUBDIR += pgpool-II-40
     SUBDIR += pgpool-II-41
     SUBDIR += pgpool-II-42
+    SUBDIR += pgpool-II-43
+    SUBDIR += pgpool-II-44
+    SUBDIR += pgpool-II-45
     SUBDIR += pgreplay
     SUBDIR += pgroonga
     SUBDIR += pgrouting
@@ -605,45 +578,45 @@
     SUBDIR += pgtcl
     SUBDIR += pgtop
     SUBDIR += pguri
+    SUBDIR += pgvector
     SUBDIR += php-tarantool
     SUBDIR += php-xapian
-    SUBDIR += php73-dba
-    SUBDIR += php73-interbase
-    SUBDIR += php73-mysqli
-    SUBDIR += php73-odbc
-    SUBDIR += php73-pdo
-    SUBDIR += php73-pdo_dblib
-    SUBDIR += php73-pdo_firebird
-    SUBDIR += php73-pdo_mysql
-    SUBDIR += php73-pdo_odbc
-    SUBDIR += php73-pdo_pgsql
-    SUBDIR += php73-pdo_sqlite
-    SUBDIR += php73-pgsql
-    SUBDIR += php73-sqlite3
-    SUBDIR += php74-dba
-    SUBDIR += php74-mysqli
-    SUBDIR += php74-odbc
-    SUBDIR += php74-pdo
-    SUBDIR += php74-pdo_dblib
-    SUBDIR += php74-pdo_firebird
-    SUBDIR += php74-pdo_mysql
-    SUBDIR += php74-pdo_odbc
-    SUBDIR += php74-pdo_pgsql
-    SUBDIR += php74-pdo_sqlite
-    SUBDIR += php74-pgsql
-    SUBDIR += php74-sqlite3
-    SUBDIR += php80-dba
-    SUBDIR += php80-mysqli
-    SUBDIR += php80-odbc
-    SUBDIR += php80-pdo
-    SUBDIR += php80-pdo_dblib
-    SUBDIR += php80-pdo_firebird
-    SUBDIR += php80-pdo_mysql
-    SUBDIR += php80-pdo_odbc
-    SUBDIR += php80-pdo_pgsql
-    SUBDIR += php80-pdo_sqlite
-    SUBDIR += php80-pgsql
-    SUBDIR += php80-sqlite3
+    SUBDIR += php81-dba
+    SUBDIR += php81-mysqli
+    SUBDIR += php81-odbc
+    SUBDIR += php81-pdo
+    SUBDIR += php81-pdo_dblib
+    SUBDIR += php81-pdo_firebird
+    SUBDIR += php81-pdo_mysql
+    SUBDIR += php81-pdo_odbc
+    SUBDIR += php81-pdo_pgsql
+    SUBDIR += php81-pdo_sqlite
+    SUBDIR += php81-pgsql
+    SUBDIR += php81-sqlite3
+    SUBDIR += php82-dba
+    SUBDIR += php82-mysqli
+    SUBDIR += php82-odbc
+    SUBDIR += php82-pdo
+    SUBDIR += php82-pdo_dblib
+    SUBDIR += php82-pdo_firebird
+    SUBDIR += php82-pdo_mysql
+    SUBDIR += php82-pdo_odbc
+    SUBDIR += php82-pdo_pgsql
+    SUBDIR += php82-pdo_sqlite
+    SUBDIR += php82-pgsql
+    SUBDIR += php82-sqlite3
+    SUBDIR += php83-dba
+    SUBDIR += php83-mysqli
+    SUBDIR += php83-odbc
+    SUBDIR += php83-pdo
+    SUBDIR += php83-pdo_dblib
+    SUBDIR += php83-pdo_firebird
+    SUBDIR += php83-pdo_mysql
+    SUBDIR += php83-pdo_odbc
+    SUBDIR += php83-pdo_pgsql
+    SUBDIR += php83-pdo_sqlite
+    SUBDIR += php83-pgsql
+    SUBDIR += php83-sqlite3
     SUBDIR += phpliteadmin
     SUBDIR += phpminiadmin
     SUBDIR += phpmyadmin
@@ -653,11 +626,12 @@
     SUBDIR += plpgsql_check
     SUBDIR += pointcloud
     SUBDIR += postgis-jdbc
-    SUBDIR += postgis24
-    SUBDIR += postgis25
-    SUBDIR += postgis30
     SUBDIR += postgis31
+    SUBDIR += postgis32
+    SUBDIR += postgis33
+    SUBDIR += postgis34
     SUBDIR += postgresql-cstore_fdw
+    SUBDIR += postgresql-idn
     SUBDIR += postgresql-jdbc
     SUBDIR += postgresql-libpgeasy
     SUBDIR += postgresql-libpqxx
@@ -665,30 +639,18 @@
     SUBDIR += postgresql-odbc
     SUBDIR += postgresql-ogr_fdw
     SUBDIR += postgresql-orafce
+    SUBDIR += postgresql-pgaudit
     SUBDIR += postgresql-plproxy
     SUBDIR += postgresql-plv8js
     SUBDIR += postgresql-prefix
+    SUBDIR += postgresql-promscale
     SUBDIR += postgresql-relay
     SUBDIR += postgresql-repmgr
     SUBDIR += postgresql-rum
+    SUBDIR += postgresql-semver
     SUBDIR += postgresql-tds_fdw
+    SUBDIR += postgresql-wal2json
     SUBDIR += postgresql-zhparser
-    SUBDIR += postgresql10-client
-    SUBDIR += postgresql10-contrib
-    SUBDIR += postgresql10-docs
-    SUBDIR += postgresql10-pgtcl
-    SUBDIR += postgresql10-plperl
-    SUBDIR += postgresql10-plpython
-    SUBDIR += postgresql10-pltcl
-    SUBDIR += postgresql10-server
-    SUBDIR += postgresql11-client
-    SUBDIR += postgresql11-contrib
-    SUBDIR += postgresql11-docs
-    SUBDIR += postgresql11-pgtcl
-    SUBDIR += postgresql11-plperl
-    SUBDIR += postgresql11-plpython
-    SUBDIR += postgresql11-pltcl
-    SUBDIR += postgresql11-server
     SUBDIR += postgresql12-client
     SUBDIR += postgresql12-contrib
     SUBDIR += postgresql12-docs
@@ -713,14 +675,22 @@
     SUBDIR += postgresql14-plpython
     SUBDIR += postgresql14-pltcl
     SUBDIR += postgresql14-server
-    SUBDIR += postgresql96-client
-    SUBDIR += postgresql96-contrib
-    SUBDIR += postgresql96-docs
-    SUBDIR += postgresql96-pgtcl
-    SUBDIR += postgresql96-plperl
-    SUBDIR += postgresql96-plpython
-    SUBDIR += postgresql96-pltcl
-    SUBDIR += postgresql96-server
+    SUBDIR += postgresql15-client
+    SUBDIR += postgresql15-contrib
+    SUBDIR += postgresql15-docs
+    SUBDIR += postgresql15-pgtcl
+    SUBDIR += postgresql15-plperl
+    SUBDIR += postgresql15-plpython
+    SUBDIR += postgresql15-pltcl
+    SUBDIR += postgresql15-server
+    SUBDIR += postgresql16-client
+    SUBDIR += postgresql16-contrib
+    SUBDIR += postgresql16-docs
+    SUBDIR += postgresql16-pgtcl
+    SUBDIR += postgresql16-plperl
+    SUBDIR += postgresql16-plpython
+    SUBDIR += postgresql16-pltcl
+    SUBDIR += postgresql16-server
     SUBDIR += powa-archivist
     SUBDIR += powa-web
     SUBDIR += powerarchitect
@@ -730,11 +700,12 @@
     SUBDIR += proftpd-mod_sql_sqlite
     SUBDIR += proftpd-mod_sql_tds
     SUBDIR += prometheus-postgresql-adapter
+    SUBDIR += proxysql
     SUBDIR += pspg
-    SUBDIR += puppetdb-terminus6
     SUBDIR += puppetdb-terminus7
-    SUBDIR += puppetdb6
+    SUBDIR += puppetdb-terminus8
     SUBDIR += puppetdb7
+    SUBDIR += puppetdb8
     SUBDIR += puredb
     SUBDIR += pxlib
     SUBDIR += pxtools
@@ -743,24 +714,36 @@
     SUBDIR += py-Pyrseas
     SUBDIR += py-aesqlapius
     SUBDIR += py-agate-sql
+    SUBDIR += py-aiomcache
     SUBDIR += py-aiomysql
     SUBDIR += py-aiopg
     SUBDIR += py-aioredis
     SUBDIR += py-aiosqlite
     SUBDIR += py-alembic
+    SUBDIR += py-alembic14
+    SUBDIR += py-apache-arrow
     SUBDIR += py-apsw
+    SUBDIR += py-asyncmy
     SUBDIR += py-asyncpg
     SUBDIR += py-berkeleydb
-    SUBDIR += py-bsddb3
     SUBDIR += py-carbon
     SUBDIR += py-cassandra-driver
     SUBDIR += py-couchdb
+    SUBDIR += py-databases
     SUBDIR += py-dbf
+    SUBDIR += py-dbt-core
+    SUBDIR += py-dbt-duckdb
+    SUBDIR += py-dbt-semantic-interfaces
+    SUBDIR += py-dbt-snowflake
     SUBDIR += py-dbutils
+    SUBDIR += py-duckdb
     SUBDIR += py-fakeredis
+    SUBDIR += py-fastapi-users-db-ormar
+    SUBDIR += py-fastparquet
     SUBDIR += py-fdb
     SUBDIR += py-firebirdsql
     SUBDIR += py-flask-sqlalchemy
+    SUBDIR += py-flask-sqlalchemy30
     SUBDIR += py-gdbm
     SUBDIR += py-geoalchemy2
     SUBDIR += py-hiredis
@@ -776,29 +759,35 @@
     SUBDIR += py-mycli
     SUBDIR += py-mysql-connector-python
     SUBDIR += py-mysqlclient
+    SUBDIR += py-ormar
     SUBDIR += py-partd
     SUBDIR += py-peewee
     SUBDIR += py-peewee_migrate
     SUBDIR += py-pg8000
-    SUBDIR += py-pg8000-112
     SUBDIR += py-pgcli
     SUBDIR += py-pgdbconn
     SUBDIR += py-pglast
     SUBDIR += py-pglite
     SUBDIR += py-pgmigrate
     SUBDIR += py-pgspecial
+    SUBDIR += py-pgspecial1
     SUBDIR += py-pgxnclient
     SUBDIR += py-pickledb
     SUBDIR += py-pickleshare
     SUBDIR += py-pony
     SUBDIR += py-postgresql
     SUBDIR += py-psycogreen
+    SUBDIR += py-psycopg
+    SUBDIR += py-psycopg-c
+    SUBDIR += py-psycopg-pool
     SUBDIR += py-psycopg2
     SUBDIR += py-psycopg2cffi
     SUBDIR += py-pum
+    SUBDIR += py-pyarrow
     SUBDIR += py-pycql
     SUBDIR += py-pylibmc
     SUBDIR += py-pymemcache
+    SUBDIR += py-pymongo
     SUBDIR += py-pymssql
     SUBDIR += py-pymysql
     SUBDIR += py-pyodbc
@@ -808,13 +797,17 @@
     SUBDIR += py-python-memcached
     SUBDIR += py-python-sql
     SUBDIR += py-python-swiftclient
-    SUBDIR += py-qt5-sql
     SUBDIR += py-queries
     SUBDIR += py-rb
     SUBDIR += py-redis
     SUBDIR += py-redis2
+    SUBDIR += py-redis3
+    SUBDIR += py-redis4
     SUBDIR += py-rrdtool
+    SUBDIR += py-schemachange
     SUBDIR += py-sispy
+    SUBDIR += py-snowddl
+    SUBDIR += py-snowflake-connector-python
     SUBDIR += py-south
     SUBDIR += py-sqlalchemy-json
     SUBDIR += py-sqlalchemy-migrate
@@ -824,6 +817,11 @@
     SUBDIR += py-sqlalchemy12
     SUBDIR += py-sqlalchemy13
     SUBDIR += py-sqlalchemy14
+    SUBDIR += py-sqlalchemy20
+    SUBDIR += py-sqlcipher3
+    SUBDIR += py-sqlglot
+    SUBDIR += py-sqlite-fts4
+    SUBDIR += py-sqlite-utils
     SUBDIR += py-sqlite3
     SUBDIR += py-sqlobject
     SUBDIR += py-sqlparse
@@ -837,29 +835,31 @@
     SUBDIR += py-whisper
     SUBDIR += py-xapian
     SUBDIR += py-zodbpickle
-    SUBDIR += pymongo
     SUBDIR += qdbm
     SUBDIR += qdbm-plus
+    SUBDIR += qdrant
     SUBDIR += qof
     SUBDIR += qt5-sql
-    SUBDIR += qt5-sqldrivers-ibase
     SUBDIR += qt5-sqldrivers-mysql
     SUBDIR += qt5-sqldrivers-odbc
     SUBDIR += qt5-sqldrivers-pgsql
     SUBDIR += qt5-sqldrivers-sqlite2
     SUBDIR += qt5-sqldrivers-sqlite3
     SUBDIR += qt5-sqldrivers-tds
+    SUBDIR += qt6-base_sqldriver
+    SUBDIR += quake
     SUBDIR += recutils
     SUBDIR += redis
     SUBDIR += redis-devel
-    SUBDIR += redis5
-    SUBDIR += redis6
+    SUBDIR += redis62
+    SUBDIR += redis70
     SUBDIR += redis_exporter
     SUBDIR += redisdesktopmanager
     SUBDIR += redisjson
+    SUBDIR += replibyte
     SUBDIR += retcl
     SUBDIR += rocksdb
-    SUBDIR += rocksdb-lite
+    SUBDIR += rqlite
     SUBDIR += rrdman
     SUBDIR += rrdmerge
     SUBDIR += rrdtool
@@ -869,6 +869,7 @@
     SUBDIR += ruby-tokyocabinet
     SUBDIR += ruby-xapian
     SUBDIR += rubygem-active_model_serializers
+    SUBDIR += rubygem-active_model_serializers61
     SUBDIR += rubygem-active_record_query_trace
     SUBDIR += rubygem-activemodel-serializers-xml
     SUBDIR += rubygem-activemodel4
@@ -877,17 +878,22 @@
     SUBDIR += rubygem-activemodel52
     SUBDIR += rubygem-activemodel60
     SUBDIR += rubygem-activemodel61
+    SUBDIR += rubygem-activemodel70
+    SUBDIR += rubygem-activemodel71
     SUBDIR += rubygem-activerecord-explain-analyze
     SUBDIR += rubygem-activerecord-import
     SUBDIR += rubygem-activerecord-jdbc-adapter
     SUBDIR += rubygem-activerecord-jdbcmysql-adapter
     SUBDIR += rubygem-activerecord-session_store
+    SUBDIR += rubygem-activerecord-trilogy-adapter
     SUBDIR += rubygem-activerecord4
     SUBDIR += rubygem-activerecord5
     SUBDIR += rubygem-activerecord50
     SUBDIR += rubygem-activerecord52
     SUBDIR += rubygem-activerecord60
     SUBDIR += rubygem-activerecord61
+    SUBDIR += rubygem-activerecord70
+    SUBDIR += rubygem-activerecord71
     SUBDIR += rubygem-after_commit_queue
     SUBDIR += rubygem-amalgalite
     SUBDIR += rubygem-arel
@@ -895,6 +901,7 @@
     SUBDIR += rubygem-arel6
     SUBDIR += rubygem-arel7
     SUBDIR += rubygem-arel8
+    SUBDIR += rubygem-attr_json
     SUBDIR += rubygem-awesome_nested_set
     SUBDIR += rubygem-bdb1
     SUBDIR += rubygem-bigrecord
@@ -909,6 +916,7 @@
     SUBDIR += rubygem-dbf
     SUBDIR += rubygem-dbi
     SUBDIR += rubygem-dbm
+    SUBDIR += rubygem-discard-rails61
     SUBDIR += rubygem-dm-aggregates
     SUBDIR += rubygem-dm-chunked_query
     SUBDIR += rubygem-dm-constraints
@@ -929,10 +937,11 @@
     SUBDIR += rubygem-do_postgres
     SUBDIR += rubygem-do_sqlite3
     SUBDIR += rubygem-em-redis-unified
+    SUBDIR += rubygem-fabrication
     SUBDIR += rubygem-familia
     SUBDIR += rubygem-flipper-active_record
     SUBDIR += rubygem-flipper-active_record-rails61
-    SUBDIR += rubygem-flipper-active_record017
+    SUBDIR += rubygem-flipper-active_record-rails70
     SUBDIR += rubygem-gdbm
     SUBDIR += rubygem-globalid
     SUBDIR += rubygem-globalid-rails5
@@ -940,6 +949,12 @@
     SUBDIR += rubygem-globalid-rails52
     SUBDIR += rubygem-globalid-rails60
     SUBDIR += rubygem-globalid-rails61
+    SUBDIR += rubygem-globalid-rails70
+    SUBDIR += rubygem-globalid-rails71
+    SUBDIR += rubygem-google-cloud-datastore
+    SUBDIR += rubygem-google-cloud-datastore-v1
+    SUBDIR += rubygem-google-cloud-firestore
+    SUBDIR += rubygem-google-cloud-firestore-v1
     SUBDIR += rubygem-her
     SUBDIR += rubygem-hiredis
     SUBDIR += rubygem-influxdb
@@ -951,21 +966,24 @@
     SUBDIR += rubygem-memcache-client
     SUBDIR += rubygem-mysql
     SUBDIR += rubygem-mysql2
-    SUBDIR += rubygem-mysql204
+    SUBDIR += rubygem-neighbor
     SUBDIR += rubygem-openid-redis-store
     SUBDIR += rubygem-paranoia
     SUBDIR += rubygem-pg
-    SUBDIR += rubygem-pg0
-    SUBDIR += rubygem-pg018
     SUBDIR += rubygem-pg_array_parser
     SUBDIR += rubygem-pg_query
     SUBDIR += rubygem-pghero
     SUBDIR += rubygem-pghero-rails5
     SUBDIR += rubygem-pghero-rails50
+    SUBDIR += rubygem-pghero-rails61
     SUBDIR += rubygem-pl-puppetdb-ruby
     SUBDIR += rubygem-postgres_ext
     SUBDIR += rubygem-puppetdb_cli
     SUBDIR += rubygem-rbase
+    SUBDIR += rubygem-red-arrow
+    SUBDIR += rubygem-red-arrow-dataset
+    SUBDIR += rubygem-red-gandiva
+    SUBDIR += rubygem-red-parquet
     SUBDIR += rubygem-redis
     SUBDIR += rubygem-redis-actionpack
     SUBDIR += rubygem-redis-actionpack-rails5
@@ -973,15 +991,26 @@
     SUBDIR += rubygem-redis-actionpack-rails52
     SUBDIR += rubygem-redis-actionpack-rails60
     SUBDIR += rubygem-redis-actionpack-rails61
+    SUBDIR += rubygem-redis-actionpack-rails70
+    SUBDIR += rubygem-redis-client
+    SUBDIR += rubygem-redis-cluster-client
+    SUBDIR += rubygem-redis-clustering
+    SUBDIR += rubygem-redis-clustering50
     SUBDIR += rubygem-redis-namespace
-    SUBDIR += rubygem-redis-namespace16
+    SUBDIR += rubygem-redis-namespace110
+    SUBDIR += rubygem-redis4
+    SUBDIR += rubygem-redis50
+    SUBDIR += rubygem-ruby-mysql
+    SUBDIR += rubygem-scenic61
     SUBDIR += rubygem-sdbm
     SUBDIR += rubygem-seed-fu
     SUBDIR += rubygem-sqlite3
     SUBDIR += rubygem-sqlite3-ruby
     SUBDIR += rubygem-state_machines-activemodel
     SUBDIR += rubygem-state_machines-activerecord
+    SUBDIR += rubygem-state_machines-activerecord08
     SUBDIR += rubygem-tarantool
+    SUBDIR += rubygem-trilogy
     SUBDIR += sequeler
     SUBDIR += sfcgal
     SUBDIR += sharedance
@@ -1009,10 +1038,14 @@
     SUBDIR += sqliteodbc
     SUBDIR += sqlitestudio
     SUBDIR += sqlrelay
+    SUBDIR += sqlx-cli
     SUBDIR += sqsh
     SUBDIR += squirrel-sql
+    SUBDIR += surrealdb
+    SUBDIR += symphytum
     SUBDIR += tarantool
     SUBDIR += tarantool-c
+    SUBDIR += tarantool2
     SUBDIR += tcl-Mysql
     SUBDIR += tcl-lmdb
     SUBDIR += tcl-sqlite3
@@ -1021,28 +1054,29 @@
     SUBDIR += tile38
     SUBDIR += tiledb
     SUBDIR += timescaledb
+    SUBDIR += timescaledb-backup
+    SUBDIR += timescaledb-tune
     SUBDIR += tinycdb
     SUBDIR += tokyocabinet
     SUBDIR += tokyotyrant
+    SUBDIR += trilogy
     SUBDIR += tsearch_extras
     SUBDIR += tuning-primer
     SUBDIR += twemproxy
     SUBDIR += unixODBC
     SUBDIR += usql
+    SUBDIR += valkey
     SUBDIR += vfront
     SUBDIR += virtualpg
-    SUBDIR += virtuoso
     SUBDIR += vsqlite
     SUBDIR += webdis
     SUBDIR += wfb2sql
     SUBDIR += xapian-bindings
-    SUBDIR += xapian-bindings12
     SUBDIR += xapian-core
-    SUBDIR += xapian-core12
     SUBDIR += xls2txt
     SUBDIR += xrootd
-    SUBDIR += xtrabackup
-    SUBDIR += xtrabackup8
-    SUBDIR += zabbix3-libzbxpgsql
+    SUBDIR += xtrabackup80
+    SUBDIR += xtrabackup81
+    SUBDIR += zodb
 
 .include <bsd.port.subdir.mk>
diff --git a/databases/R-cran-DBI/Makefile b/databases/R-cran-DBI/Makefile
index c8d4a1c480e8..a908ac15147d 100644
--- a/databases/R-cran-DBI/Makefile
+++ b/databases/R-cran-DBI/Makefile
@@ -1,15 +1,14 @@
-# Created by: TAKATSU Tomonari <tota@FreeBSD.org>
-
 PORTNAME=	DBI
-DISTVERSION=	1.1.1
+DISTVERSION=	1.2.2
 CATEGORIES=	databases
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	R Database Interface
+WWW=		https://cran.r-project.org/web/packages/DBI/
 
 LICENSE=	LGPL21+
 
-USES=	cran:auto-plist
+USES=		cran:auto-plist
 
 .include <bsd.port.mk>
diff --git a/databases/R-cran-DBI/distinfo b/databases/R-cran-DBI/distinfo
index e34b8a452831..f8ec56934b91 100644
--- a/databases/R-cran-DBI/distinfo
+++ b/databases/R-cran-DBI/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1610800537
-SHA256 (DBI_1.1.1.tar.gz) = 572ab3b8a6421d0ac3e7665c4c842826f1723af98fca25d4f43edb419e771344
-SIZE (DBI_1.1.1.tar.gz) = 743802
+TIMESTAMP = 1708159603
+SHA256 (DBI_1.2.2.tar.gz) = 8d55a0b3654511b776ae8ad201f4ebefa707c5f5f4ee6ae39af3856913d5a781
+SIZE (DBI_1.2.2.tar.gz) = 1132818
diff --git a/databases/R-cran-DBI/pkg-descr b/databases/R-cran-DBI/pkg-descr
index 97bd8d16c149..ad370d6f8973 100644
--- a/databases/R-cran-DBI/pkg-descr
+++ b/databases/R-cran-DBI/pkg-descr
@@ -2,5 +2,3 @@ A database interface (DBI) definition for communication between R
 and relational database management systems. All classes in this
 package are virtual and need to be extended by the various R/DBMS
 implementations.
-
-WWW: https://cran.r-project.org/web/packages/DBI/
diff --git a/databases/R-cran-RMySQL/Makefile b/databases/R-cran-RMySQL/Makefile
index de1d85c84485..70d05090513e 100644
--- a/databases/R-cran-RMySQL/Makefile
+++ b/databases/R-cran-RMySQL/Makefile
@@ -1,19 +1,18 @@
-# Created by: TAKATSU Tomonari <tota@FreeBSD.org>
-
 PORTNAME=	RMySQL
-DISTVERSION=	0.10.22
+DISTVERSION=	0.10.27
 CATEGORIES=	databases
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	R interface to the MySQL database
+WWW=		https://cran.r-project.org/web/packages/RMySQL/
 
 LICENSE=	GPLv2
 
-CRAN_DEPENDS=	R-cran-DBI>=0.4:databases/R-cran-DBI
-BUILD_DEPENDS=	${CRAN_DEPENDS}
-RUN_DEPENDS=	${CRAN_DEPENDS}
+RUN_DEPENDS=	R-cran-DBI>=0.4:databases/R-cran-DBI
+
+USES=		cpe cran:auto-plist,compiles mysql
 
-USES=	cran:auto-plist,compiles mysql
+CPE_VENDOR=	r-consortium
 
 .include <bsd.port.mk>
diff --git a/databases/R-cran-RMySQL/distinfo b/databases/R-cran-RMySQL/distinfo
index d9c275b2498c..562217dd5992 100644
--- a/databases/R-cran-RMySQL/distinfo
+++ b/databases/R-cran-RMySQL/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1624537359
-SHA256 (RMySQL_0.10.22.tar.gz) = d4326d920d106edb383c328d791e17c3a285b4cedd7b22549e217c3815e61116
-SIZE (RMySQL_0.10.22.tar.gz) = 53215
+TIMESTAMP = 1702311143
+SHA256 (RMySQL_0.10.27.tar.gz) = f1735b689cd9bdb9c776a16138eaa1f6c5cbdbab5c1d292e1240e3bbf105bfab
+SIZE (RMySQL_0.10.27.tar.gz) = 53406
diff --git a/databases/R-cran-RMySQL/pkg-descr b/databases/R-cran-RMySQL/pkg-descr
index 0b0daa0ff156..901280d8adef 100644
--- a/databases/R-cran-RMySQL/pkg-descr
+++ b/databases/R-cran-RMySQL/pkg-descr
@@ -1,5 +1,3 @@
 RMySQL is a database interface and MySQL driver for R. This version
 complies with the database interface definition as implemented in
 the package DBI 0.2-2.
-
-WWW: https://cran.r-project.org/web/packages/RMySQL/
diff --git a/databases/R-cran-RPostgreSQL/Makefile b/databases/R-cran-RPostgreSQL/Makefile
index 0b83c95bf3c9..6f6497fd3452 100644
--- a/databases/R-cran-RPostgreSQL/Makefile
+++ b/databases/R-cran-RPostgreSQL/Makefile
@@ -1,22 +1,20 @@
 PORTNAME=	RPostgreSQL
-DISTVERSION=	0.7
+DISTVERSION=	0.7-6
 CATEGORIES=	databases
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	tota@FreeBSD.org
 COMMENT=	R Interface to the 'PostgreSQL' Database System
+WWW=		https://cran.r-project.org/web/packages/RPostgreSQL/
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-CRAN_DEPENDS=	R-cran-DBI>=0.3:databases/R-cran-DBI
-BUILD_DEPENDS=	${CRAN_DEPENDS}
-RUN_DEPENDS=	${CRAN_DEPENDS}
+RUN_DEPENDS=	R-cran-DBI>=0.3:databases/R-cran-DBI
 
 USES=		cran:auto-plist,compiles pgsql shebangfix
 
-SHEBANG_FILES=	inst/devTests/*.r \
-		inst/devTests/*.sh
+SHEBANG_FILES=	inst/devTests/*.r inst/devTests/*.sh
 SHEBANG_LANG=	r
 r_OLD_CMD=	/usr/bin/r
 r_CMD=		${LOCALBASE}/bin/R
diff --git a/databases/R-cran-RPostgreSQL/distinfo b/databases/R-cran-RPostgreSQL/distinfo
index 727d6197e90e..1f8f5fd5078c 100644
--- a/databases/R-cran-RPostgreSQL/distinfo
+++ b/databases/R-cran-RPostgreSQL/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1627459959
-SHA256 (RPostgreSQL_0.7.tar.gz) = 040b3c155b0edc61f88f5d46bbb05112a958e71c9ff46598d6c5b804f46a0eaf
-SIZE (RPostgreSQL_0.7.tar.gz) = 581710
+TIMESTAMP = 1705078953
+SHA256 (RPostgreSQL_0.7-6.tar.gz) = 385939708b6a3657663409f91e165ded0ff5268d1dc6225e0f9b34764baf2d2c
+SIZE (RPostgreSQL_0.7-6.tar.gz) = 576636
diff --git a/databases/R-cran-RPostgreSQL/pkg-descr b/databases/R-cran-RPostgreSQL/pkg-descr
index 14b54ce509b2..36b591c5d45c 100644
--- a/databases/R-cran-RPostgreSQL/pkg-descr
+++ b/databases/R-cran-RPostgreSQL/pkg-descr
@@ -6,5 +6,3 @@ system to provide 'PostgreSQL' functionality via its libraries and
 header files. These files are provided as 'postgresql-devel' package
 under some Linux distributions. On 'macOS' and 'Microsoft Windows'
 system the attached 'libpq' library source will be used.
-
-WWW: https://cran.r-project.org/web/packages/RPostgreSQL/
diff --git a/databases/R-cran-RSQLite.extfuns/Makefile b/databases/R-cran-RSQLite.extfuns/Makefile
deleted file mode 100644
index 1cec3c18975b..000000000000
--- a/databases/R-cran-RSQLite.extfuns/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-# Created by: Steven Kreuzer <skreuzer@FreeBSD.org>
-
-PORTNAME=	RSQLite.extfuns
-PORTVERSION=	0.0.1
-PORTREVISION=	12
-CATEGORIES=	databases
-DISTNAME=	${PORTNAME}_${PORTVERSION}
-
-MAINTAINER=	skreuzer@FreeBSD.org
-COMMENT=	SQLite extension functions for RSQLite
-
-LICENSE=	APACHE20
-
-BUILD_DEPENDS=	R-cran-RSQLite>=0.11.1:databases/R-cran-RSQLite
-RUN_DEPENDS:=	${BUILD_DEPENDS}
-
-USES=		cran:auto-plist,compiles
-
-.include <bsd.port.mk>
diff --git a/databases/R-cran-RSQLite.extfuns/distinfo b/databases/R-cran-RSQLite.extfuns/distinfo
deleted file mode 100644
index 60d360551189..000000000000
--- a/databases/R-cran-RSQLite.extfuns/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (RSQLite.extfuns_0.0.1.tar.gz) = ca5c7947c041e17ba83bed3f5866f7eeb9b7f361e5c050c9b58eec5670f03d0e
-SIZE (RSQLite.extfuns_0.0.1.tar.gz) = 15367
diff --git a/databases/R-cran-RSQLite.extfuns/pkg-descr b/databases/R-cran-RSQLite.extfuns/pkg-descr
deleted file mode 100644
index 65da847990af..000000000000
--- a/databases/R-cran-RSQLite.extfuns/pkg-descr
+++ /dev/null
@@ -1,4 +0,0 @@
-This package uses SQLite's loadable extension feature to provide a number of
-additional SQL functions and aggregates within R
-
-WWW: http://cran.r-project.org/web/packages/RSQLite.extfuns/
diff --git a/databases/R-cran-RSQLite/Makefile b/databases/R-cran-RSQLite/Makefile
index d8fef063aa89..4644618957ee 100644
--- a/databases/R-cran-RSQLite/Makefile
+++ b/databases/R-cran-RSQLite/Makefile
@@ -1,18 +1,26 @@
-# Created by: Steven Kreuzer <skreuzer@FreeBSD.org>
-
 PORTNAME=	RSQLite
-PORTVERSION=	1.0.0
-PORTREVISION=	5
+PORTVERSION=	2.3.6
 CATEGORIES=	databases
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	skreuzer@FreeBSD.org
 COMMENT=	Database Interface R driver for SQLite
+WWW=		https://cran.r-project.org/web/packages/RSQLite/
 
-LICENSE=	LGPL20
+LICENSE=	LGPL21
 
-BUILD_DEPENDS=	R-cran-DBI>=0.2.5:databases/R-cran-DBI
-RUN_DEPENDS=	R-cran-DBI>=0.2.5:databases/R-cran-DBI
+CRAN_DEPENDS=	R-cran-bit64>0:devel/R-cran-bit64 \
+		R-cran-blob>=1.2.0:devel/R-cran-blob \
+		R-cran-cpp11>=0.4.0:devel/R-cran-cpp11 \
+		R-cran-DBI>=1.2.0:databases/R-cran-DBI \
+		R-cran-memoise>0:devel/R-cran-memoise \
+		R-cran-pkgconfig>0:devel/R-cran-pkgconfig \
+		R-cran-plogr>=0.2.0:devel/R-cran-plogr \
+		R-cran-Rcpp>=0.4.00:devel/R-cran-Rcpp \
+		R-cran-rlang>0:devel/R-cran-rlang
+BUILD_DEPENDS=	${CRAN_DEPENDS}
+RUN_DEPENDS=	${CRAN_DEPENDS}
+TEST_DEPENDS=	R-cran-testthat>0:devel/R-cran-testthat
 
 USES=		cran:auto-plist,compiles
 
diff --git a/databases/R-cran-RSQLite/distinfo b/databases/R-cran-RSQLite/distinfo
index d70c2e1ac8f7..70c43090fb60 100644
--- a/databases/R-cran-RSQLite/distinfo
+++ b/databases/R-cran-RSQLite/distinfo
@@ -1,2 +1,3 @@
-SHA256 (RSQLite_1.0.0.tar.gz) = 8e0cfca19afbc61f40c6d86018cd723a7e00f16d0944c4637f07a18fb6d76121
-SIZE (RSQLite_1.0.0.tar.gz) = 1745731
+TIMESTAMP = 1711979278
+SHA256 (RSQLite_2.3.6.tar.gz) = fbb1b7a58ff49af30059a802a9fed0055b8cf1e401b8022382b94fc6c3c9f8f2
+SIZE (RSQLite_2.3.6.tar.gz) = 4249332
diff --git a/databases/R-cran-RSQLite/files/patch-tests_testthat_test-encoding.R b/databases/R-cran-RSQLite/files/patch-tests_testthat_test-encoding.R
new file mode 100644
index 000000000000..443e56a34ca7
--- /dev/null
+++ b/databases/R-cran-RSQLite/files/patch-tests_testthat_test-encoding.R
@@ -0,0 +1,27 @@
+Fix to skip a windows only test that does not exclude FreeBSD.
+https://github.com/r-dbi/RSQLite/pull/504
+
+--- tests/testthat/test-encoding.R.orig	2024-01-20 09:56:34 UTC
++++ tests/testthat/test-encoding.R
+@@ -34,9 +34,7 @@ test_that("list the field of tables whose colnames are
+ })
+ 
+ test_that("list the field of tables whose colnames are BIG5 encoded (#277)", {
+-  skip_on_os("linux")
+-  skip_on_os("mac")
+-  skip_on_os("solaris")
++  skip_if_not(.Platform$OS.type == "windows")
+   if (.Platform$OS.type == "windows") {
+     withr::local_collate("cht")
+   } else {
+@@ -133,9 +131,7 @@ test_that("write tables whose colnames or contents are
+ })
+ 
+ test_that("write tables whose colnames or contents are BIG5 encoded (#277)", {
+-  skip_on_os("linux")
+-  skip_on_os("mac")
+-  skip_on_os("solaris")
++  skip_if_not(.Platform$OS.type == "windows")
+ 
+   .loc <- Sys.getlocale("LC_COLLATE")
+   suppressWarnings(Sys.setlocale(locale = "cht"))
diff --git a/databases/R-cran-RSQLite/pkg-descr b/databases/R-cran-RSQLite/pkg-descr
index 6a20b2082c20..7f6f7abab05d 100644
--- a/databases/R-cran-RSQLite/pkg-descr
+++ b/databases/R-cran-RSQLite/pkg-descr
@@ -1,4 +1,2 @@
 Database Interface R driver for SQLite. This package embeds the SQLite database
 engine in R and provides an interface compliant with the DBI package.
-
-WWW: http://cran.r-project.org/web/packages/RSQLite/
diff --git a/databases/R-cran-cachem/Makefile b/databases/R-cran-cachem/Makefile
index 87cf240f8a6e..331640f0de2c 100644
--- a/databases/R-cran-cachem/Makefile
+++ b/databases/R-cran-cachem/Makefile
@@ -1,15 +1,16 @@
 PORTNAME=	cachem
-PORTVERSION=	1.0.6
+PORTVERSION=	1.0.8
 CATEGORIES=	databases
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
-MAINTAINER=	tota@FreeBSD.org
+MAINTAINER=	uzsolt@FreeBSD.org
 COMMENT=	Cache R Objects with Automatic Pruning
+WWW=		https://cran.r-project.org/web/packages/cachem/
 
 LICENSE=	MIT
 
-CRAN_DEPENDS=	R-cran-rlang>0:devel/R-cran-rlang \
-		R-cran-fastmap>0:databases/R-cran-fastmap
+CRAN_DEPENDS=	R-cran-fastmap>=1.1.1:databases/R-cran-fastmap \
+		R-cran-rlang>0:devel/R-cran-rlang
 BUILD_DEPENDS=	${CRAN_DEPENDS}
 RUN_DEPENDS=	${CRAN_DEPENDS}
 
diff --git a/databases/R-cran-cachem/distinfo b/databases/R-cran-cachem/distinfo
index 4f31486b5701..2d53ecc08a6e 100644
--- a/databases/R-cran-cachem/distinfo
+++ b/databases/R-cran-cachem/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1629530386
-SHA256 (cachem_1.0.6.tar.gz) = 9a9452f7bcf3f79436c418b3c3290449fb8fd338714d9b992153754d112f1864
-SIZE (cachem_1.0.6.tar.gz) = 25413
+TIMESTAMP = 1683331492
+SHA256 (cachem_1.0.8.tar.gz) = ea9ca919fe615dce8770758ecc2fc88ac99074f66ff1cde3a0b95d40007f45c2
+SIZE (cachem_1.0.8.tar.gz) = 26510
diff --git a/databases/R-cran-cachem/pkg-descr b/databases/R-cran-cachem/pkg-descr
index e0b149d1b920..d88a31ccd7b5 100644
--- a/databases/R-cran-cachem/pkg-descr
+++ b/databases/R-cran-cachem/pkg-descr
@@ -1,5 +1,3 @@
 Key-value stores with automatic pruning. Caches can limit either
 their total size or the age of the oldest object (or both),
 automatically pruning objects to maintain the constraints.
-
-WWW: https://cran.r-project.org/web/packages/cachem/
diff --git a/databases/R-cran-dbplyr/Makefile b/databases/R-cran-dbplyr/Makefile
new file mode 100644
index 000000000000..58f605e3426f
--- /dev/null
+++ b/databases/R-cran-dbplyr/Makefile
@@ -0,0 +1,35 @@
+PORTNAME=	dbplyr
+DISTVERSION=	2.5.0
+CATEGORIES=	databases
+DISTNAME=	${PORTNAME}_${DISTVERSION}
+
+MAINTAINER=	einar@isnic.is
+COMMENT=	'dplyr' Back End for Databases
+WWW=		https://dbplyr.tidyverse.org/
+
+LICENSE=	MIT
+
+CRAN_DEPENDS=	R-cran-blob>=1.2.0:devel/R-cran-blob \
+		R-cran-cli>=3.6.1:devel/R-cran-cli \
+		R-cran-DBI>=1.1.3:databases/R-cran-DBI \
+		R-cran-dplyr>=1.1.2:math/R-cran-dplyr \
+		R-cran-glue>=1.6.2:devel/R-cran-glue \
+		R-cran-lifecycle>=1.0.3:devel/R-cran-lifecycle \
+		R-cran-magrittr>0:devel/R-cran-magrittr \
+		R-cran-pillar>=1.9.0:devel/R-cran-pillar \
+		R-cran-purrr>=1.0.1:devel/R-cran-purrr \
+		R-cran-R6>=2.2.2:devel/R-cran-R6 \
+		R-cran-rlang>=1.1.1:devel/R-cran-rlang \
+		R-cran-tibble>=3.2.1:devel/R-cran-tibble \
+		R-cran-tidyr>=1.3.0:devel/R-cran-tidyr \
+		R-cran-tidyselect>=1.2.1:devel/R-cran-tidyselect \
+		R-cran-vctrs>=0.6.3:devel/R-cran-vctrs \
+		R-cran-withr>=2.5.0:devel/R-cran-withr
+BUILD_DEPENDS=	${CRAN_DEPENDS}
+RUN_DEPENDS=	${CRAN_DEPENDS}
+TEST_DEPENDS=	R-cran-RSQLite>=2.3.1:databases/R-cran-RSQLite \
+		R-cran-testthat>=3.1.10:devel/R-cran-testthat
+
+USES=		cran:auto-plist
+
+.include <bsd.port.mk>
diff --git a/databases/R-cran-dbplyr/distinfo b/databases/R-cran-dbplyr/distinfo
new file mode 100644
index 000000000000..ed1a65ffeecf
--- /dev/null
+++ b/databases/R-cran-dbplyr/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1712478874
+SHA256 (dbplyr_2.5.0.tar.gz) = bb475bdbe89487b189ecc257b5c92007a7458803c81aa77bfc4ed46f5f24bcff
+SIZE (dbplyr_2.5.0.tar.gz) = 770647
diff --git a/databases/R-cran-dbplyr/pkg-descr b/databases/R-cran-dbplyr/pkg-descr
new file mode 100644
index 000000000000..99a89aeb00f6
--- /dev/null
+++ b/databases/R-cran-dbplyr/pkg-descr
@@ -0,0 +1,4 @@
+A 'dplyr' back end for databases that allows you to work with remote database
+tables as if they are in-memory data frames. Basic features works with any
+database that has a 'DBI' back end; more advanced features require 'SQL'
+translation to be provided by the package author.
diff --git a/databases/R-cran-dtplyr/Makefile b/databases/R-cran-dtplyr/Makefile
new file mode 100644
index 000000000000..fff62a008ca9
--- /dev/null
+++ b/databases/R-cran-dtplyr/Makefile
@@ -0,0 +1,28 @@
+PORTNAME=	dtplyr
+DISTVERSION=	1.3.1
+CATEGORIES=	databases
+DISTNAME=	${PORTNAME}_${DISTVERSION}
+
+MAINTAINER=	einar@isnic.is
+COMMENT=	Data Table Back-End for 'dplyr'
+WWW=		https://dtplyr.tidyverse.org/
+
+LICENSE=	MIT
+
+CRAN_DEPENDS=	R-cran-cli>=3.4.0:devel/R-cran-cli \
+		R-cran-data.table>=1.13.0:devel/R-cran-data.table \
+		R-cran-dplyr>=1.1.0:math/R-cran-dplyr \
+		R-cran-glue>0:devel/R-cran-glue \
+		R-cran-lifecycle>0:devel/R-cran-lifecycle \
+		R-cran-rlang>=1.0.4:devel/R-cran-rlang \
+		R-cran-tibble>0:devel/R-cran-tibble \
+		R-cran-tidyselect>=1.2.0:devel/R-cran-tidyselect \
+		R-cran-vctrs>=0.4.1:devel/R-cran-vctrs
+BUILD_DEPENDS=	${CRAN_DEPENDS}
+RUN_DEPENDS=	${CRAN_DEPENDS}
+TEST_DEPENDS=	R-cran-testthat>0:devel/R-cran-testthat \
+		R-cran-tidyr>0:devel/R-cran-tidyr
+
+USES=		cran:auto-plist
+
+.include <bsd.port.mk>
diff --git a/databases/R-cran-dtplyr/distinfo b/databases/R-cran-dtplyr/distinfo
new file mode 100644
index 000000000000..188c853cdc05
--- /dev/null
+++ b/databases/R-cran-dtplyr/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1706915299
+SHA256 (dtplyr_1.3.1.tar.gz) = a5a9689a640b8bd1274519af220c33deaa3919654acac4ebdff1ff365cc8d6e5
+SIZE (dtplyr_1.3.1.tar.gz) = 150971
diff --git a/databases/R-cran-dtplyr/pkg-descr b/databases/R-cran-dtplyr/pkg-descr
new file mode 100644
index 000000000000..1a2509c71627
--- /dev/null
+++ b/databases/R-cran-dtplyr/pkg-descr
@@ -0,0 +1,3 @@
+Provides a data.table backend for 'dplyr'. The goal of 'dtplyr' is to allow you
+to write 'dplyr' code that is automatically translated to the equivalent, but
+usually much faster, data.table code.
diff --git a/databases/R-cran-fastmap/Makefile b/databases/R-cran-fastmap/Makefile
index 46f926016bcb..6a02d9f658c3 100644
--- a/databases/R-cran-fastmap/Makefile
+++ b/databases/R-cran-fastmap/Makefile
@@ -1,10 +1,11 @@
 PORTNAME=	fastmap
-PORTVERSION=	1.1.0
+PORTVERSION=	1.1.1
 CATEGORIES=	databases
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
-MAINTAINER=	tota@FreeBSD.org
+MAINTAINER=	uzsolt@FreeBSD.org
 COMMENT=	Fast Implementation of a Key-Value Store
+WWW=		https://cran.r-project.org/web/packages/fastmap/
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.note
diff --git a/databases/R-cran-fastmap/distinfo b/databases/R-cran-fastmap/distinfo
index 7399aa0584f8..d1dd62b44ab6 100644
--- a/databases/R-cran-fastmap/distinfo
+++ b/databases/R-cran-fastmap/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1611895485
-SHA256 (fastmap_1.1.0.tar.gz) = 9113e526b4c096302cfeae660a06de2c4c82ae4e2d3d6ef53af6de812d4c822b
-SIZE (fastmap_1.1.0.tar.gz) = 44277
+TIMESTAMP = 1682400568
+SHA256 (fastmap_1.1.1.tar.gz) = 3623809dd016ae8abd235200ba7834effc4b916915a059deb76044137c5c7173
+SIZE (fastmap_1.1.1.tar.gz) = 46412
diff --git a/databases/R-cran-fastmap/pkg-descr b/databases/R-cran-fastmap/pkg-descr
index af0f5476c281..e0740ba04810 100644
--- a/databases/R-cran-fastmap/pkg-descr
+++ b/databases/R-cran-fastmap/pkg-descr
@@ -4,5 +4,3 @@ added to R's global symbol table, causing a small amount of memory
 leakage. This can be problematic in cases where many different keys
 are used. Fastmap avoids this memory leak issue by implementing the
 map using data structures in C++.
-
-WWW: https://cran.r-project.org/web/packages/fastmap/
diff --git a/databases/R-cran-sqldf/Makefile b/databases/R-cran-sqldf/Makefile
index 5ecdaaf7bfbd..71d2e09d931e 100644
--- a/databases/R-cran-sqldf/Makefile
+++ b/databases/R-cran-sqldf/Makefile
@@ -1,23 +1,22 @@
-# Created by: Steven Kreuzer <skreuzer@FreeBSD.org>
-
 PORTNAME=	sqldf
-DISTVERSION=	0.4-7.1
-PORTREVISION=	5
+DISTVERSION=	0.4-11
+PORTREVISION=	1
 CATEGORIES=	databases
 DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	skreuzer@FreeBSD.org
 COMMENT=	SQL select on R data frames
+WWW=		https://cran.r-project.org/web/packages/sqldf/
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	R-cran-proto>=0.3.9.2_6:devel/R-cran-proto \
+CRAN_DEPENDS=	R-cran-proto>=0.3.9.2_6:devel/R-cran-proto \
 		R-cran-chron>=2.3.42:devel/R-cran-chron \
 		R-cran-gsubfn>=0.6.4:devel/R-cran-gsubfn \
-		R-cran-DBI>=0.2.5_6:databases/R-cran-DBI \
-		R-cran-RSQLite>=0.11.1:databases/R-cran-RSQLite \
-		R-cran-RSQLite.extfuns>=0.0.1:databases/R-cran-RSQLite.extfuns
-RUN_DEPENDS:=	${BUILD_DEPENDS}
+		R-cran-DBI>=1.1.0:databases/R-cran-DBI \
+		R-cran-RSQLite>=2.2.14:databases/R-cran-RSQLite
+BUILD_DEPENDS=	${CRAN_DEPENDS}
+RUN_DEPENDS=	${CRAN_DEPENDS}
 
 USES=	cran:auto-plist
 
diff --git a/databases/R-cran-sqldf/distinfo b/databases/R-cran-sqldf/distinfo
index 2e2b13a698d6..57ecd3399158 100644
--- a/databases/R-cran-sqldf/distinfo
+++ b/databases/R-cran-sqldf/distinfo
@@ -1,2 +1,3 @@
-SHA256 (sqldf_0.4-7.1.tar.gz) = e2b3d1eaf61fb4b7eda72a83f2718f1f683a4d52c565924ef406c235330fef0e
-SIZE (sqldf_0.4-7.1.tar.gz) = 28418
+TIMESTAMP = 1651944475
+SHA256 (sqldf_0.4-11.tar.gz) = cee979d4e8c67b4924655365d925a8d67104e62adf71741f645cdc5196de2260
+SIZE (sqldf_0.4-11.tar.gz) = 63097
diff --git a/databases/R-cran-sqldf/pkg-descr b/databases/R-cran-sqldf/pkg-descr
index 2378ae63cdc5..51c3fa23550e 100644
--- a/databases/R-cran-sqldf/pkg-descr
+++ b/databases/R-cran-sqldf/pkg-descr
@@ -1,10 +1,8 @@
-sqldf is an R package for runing SQL statements on R data frames, optimized for
-convenience. The user simply specifies an SQL statement in R using data frame
-names in place of table names and a database with appropriate table
-layouts/schema is automatically created, the data frames are automatically
-loaded into the database, the specified SQL statement is performed, the result
-is read back into R and the database is deleted all automatically behind the
-scenes making the database's existence transparent to the user who only
-specifies the SQL statement.
-
-WWW: https://code.google.com/p/sqldf
+The sqldf() function is typically passed a single argument which is an SQL
+select statement where the table names are ordinary R data frame names. sqldf()
+transparently sets up a database, imports the data frames into that database,
+performs the SQL select or other statement and returns the result using a
+heuristic to determine which class to assign to each column of the returned
+data frame. The sqldf() or read.csv.sql() functions can also be used to read
+filtered files into R even if the original files are larger than R itself can
+handle. 'RSQLite', 'RH2', 'RMySQL' and 'RPostgreSQL' backends are supported.
diff --git a/databases/WWWdb/Makefile b/databases/WWWdb/Makefile
index 0aacbf6df479..0297e7b165d3 100644
--- a/databases/WWWdb/Makefile
+++ b/databases/WWWdb/Makefile
@@ -1,5 +1,3 @@
-# Created by: Jens Rehsack <rehsack@liwing.de>
-
 PORTNAME=	WWWdb
 PORTVERSION=	0.8.3
 PORTREVISION=	2
@@ -8,6 +6,7 @@ MASTER_SITES=	SF/${PORTNAME:tl}/${PORTNAME}/${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Perl based generic WWW DB interface / frontend
+WWW=		https://sourceforge.net/projects/wwwdb/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
diff --git a/databases/WWWdb/pkg-descr b/databases/WWWdb/pkg-descr
index 4ed1174858f2..98c82077f79c 100644
--- a/databases/WWWdb/pkg-descr
+++ b/databases/WWWdb/pkg-descr
@@ -1,4 +1,2 @@
 A flexible web-enabled frontend and application-server for different
 databases ...  that is WWWdb
-
-WWW: https://sourceforge.net/projects/wwwdb/
diff --git a/databases/adabase/Makefile b/databases/adabase/Makefile
deleted file mode 100644
index 51aa05e513a1..000000000000
--- a/databases/adabase/Makefile
+++ /dev/null
@@ -1,73 +0,0 @@
-# Created by: John Marino <marino@FreeBSD.org>
-
-PORTNAME=	adabase
-PORTVERSION=	3.1
-PORTREVISION=	3
-DISTVERSIONPREFIX=	v
-CATEGORIES=	databases
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Thick database bindings for Ada
-
-LICENSE=	ISCL
-LICENSE_FILE=	${WRKSRC}/License.txt
-
-BUILD_DEPENDS=	gprbuild:devel/gprbuild
-
-USES=		ada
-USE_GITHUB=	yes
-GH_ACCOUNT=	jrmarino
-GH_PROJECT=	AdaBase
-
-BROKEN_aarch64=		fails to install: digits value out of range, maximum is 15
-
-OPTIONS_DEFINE=		DEBUG
-OPTIONS_MULTI=		DBASE
-OPTIONS_MULTI_DBASE=	MYSQL SQLITE PGSQL
-OPTIONS_DEFAULT=	MYSQL SQLITE PGSQL
-OPTIONS_SUB=		yes
-
-DBASE_DESC=		Databases Supported
-
-SQLITE_MAKE_ENV=	SQLITE=yes
-SQLITE_USES=		sqlite:3
-SQLITE_VARS=		DRVSQLITE=yes
-SQLITE_VARS_OFF=	DRVSQLITE=no
-
-MYSQL_MAKE_ENV=		MYSQL=yes
-MYSQL_USES=		mysql
-MYSQL_VARS=		DRVMYSQL=yes
-MYSQL_VARS_OFF=		DRVMYSQL=no
-
-PGSQL_MAKE_ENV=		POSTGRESQL=yes
-PGSQL_USES=		pgsql
-PGSQL_VARS=		DRVPGSQL=yes
-PGSQL_VARS_OFF=		DRVPGSQL=no
-
-DEBUG_MAKE_ENV=		DEBUGSYM=yes
-
-MAKE_ENV+=	OS_VERSION=unix
-
-post-patch:
-	${RM} ${WRKSRC}/src/drivers/adabase-driver-base-firebird.ad?
-	${REINPLACE_CMD} -e '/Driver_MySQL/ s/yes/no/' \
-		${WRKSRC}/adabase.gpr
-
-do-build:
-	(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
-		gprbuild -p -P adabase ${BUILD_ARGS})
-
-do-install:
-	${MKDIR} ${STAGEDIR}${PREFIX}/include/adabase \
-		${STAGEDIR}${PREFIX}/lib/adabase \
-		${STAGEDIR}${PREFIX}/lib/gnat
-	${INSTALL_DATA} ${WRKSRC}/lib/* ${STAGEDIR}${PREFIX}/lib/adabase
-	${INSTALL_DATA} ${WRKSRC}/src/*/*.ad[bs] ${WRKSRC}/src/adabase.ads \
-		${STAGEDIR}${PREFIX}/include/adabase
-	${SED} -e "s|@PREFIX@|${PREFIX}|" \
-	       -e "s|@MYSQL@|${DRVMYSQL}|" \
-	       -e "s|@PGSQL@|${DRVPGSQL}|" \
-	       -e "s|@SQLITE@|${DRVSQLITE}|" ${WRKSRC}/adabase.gpr.in > \
-		${STAGEDIR}${PREFIX}/lib/gnat/adabase.gpr
-
-.include <bsd.port.mk>
diff --git a/databases/adabase/distinfo b/databases/adabase/distinfo
deleted file mode 100644
index 4b266c4d5ca2..000000000000
--- a/databases/adabase/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1466107071
-SHA256 (jrmarino-AdaBase-v3.1_GH0.tar.gz) = 115967a90abf94f102aa4916a2ed14fb7aac2382f56113b791f2fd08b909444a
-SIZE (jrmarino-AdaBase-v3.1_GH0.tar.gz) = 163154
diff --git a/databases/adabase/pkg-descr b/databases/adabase/pkg-descr
deleted file mode 100644
index 6a7bb5a37a04..000000000000
--- a/databases/adabase/pkg-descr
+++ /dev/null
@@ -1,21 +0,0 @@
-Thick database bindings for MySQL, PostgreSQL and SQLite written in Ada.
-
-This is the third release of AdaBase, an abstraction library that provides
-a consistent interface to multiple database servers.  Currently three
-drivers are provided, MySQL, PostgreSQL and SQLite.  It's extensible, so
-support for other databases such as Firebird, Oracle and MSSQL would be
-easily possible.
-
-AdaBase offers unique features over similar frameworks.  For starters,
-it's limited to database support rather than including many other unwanted
-components in a "kitchen sink" fashion, and unneeded drivers can be
-excluded from the library as desired.  It's got a developer and commerce
-friend license (ICS), it comes with good documentation and working
-examples, and the bindings are thick enough where database server backends
-can be interchangeable.
-
-AdaBase may seem familiar to some users as it was partially inspired by
-PHP's PDO database framework and is a sequel of sorts to an earlier
-project by the same author, Pascal Data Objects.
-
-WWW: http://jrmarino.github.io/AdaBase/
diff --git a/databases/adabase/pkg-plist b/databases/adabase/pkg-plist
deleted file mode 100644
index 431dc0c92bc8..000000000000
--- a/databases/adabase/pkg-plist
+++ /dev/null
@@ -1,101 +0,0 @@
-%%MYSQL%%include/adabase/adabase-bindings-mysql.ads
-%%PGSQL%%include/adabase/adabase-bindings-postgresql.ads
-%%SQLITE%%include/adabase/adabase-bindings-sqlite.ads
-include/adabase/adabase-bindings.ads
-%%MYSQL%%include/adabase/adabase-connection-base-mysql.adb
-%%MYSQL%%include/adabase/adabase-connection-base-mysql.ads
-%%PGSQL%%include/adabase/adabase-connection-base-postgresql.adb
-%%PGSQL%%include/adabase/adabase-connection-base-postgresql.ads
-%%SQLITE%%include/adabase/adabase-connection-base-sqlite.adb
-%%SQLITE%%include/adabase/adabase-connection-base-sqlite.ads
-include/adabase/adabase-connection-base.adb
-include/adabase/adabase-connection-base.ads
-include/adabase/adabase-connection.ads
-%%MYSQL%%include/adabase/adabase-driver-base-mysql.adb
-%%MYSQL%%include/adabase/adabase-driver-base-mysql.ads
-%%PGSQL%%include/adabase/adabase-driver-base-postgresql.adb
-%%PGSQL%%include/adabase/adabase-driver-base-postgresql.ads
-%%SQLITE%%include/adabase/adabase-driver-base-sqlite.adb
-%%SQLITE%%include/adabase/adabase-driver-base-sqlite.ads
-include/adabase/adabase-driver-base.adb
-include/adabase/adabase-driver-base.ads
-include/adabase/adabase-driver.ads
-include/adabase/adabase-interfaces-connection.ads
-include/adabase/adabase-interfaces-driver.ads
-include/adabase/adabase-interfaces-logger.ads
-include/adabase/adabase-interfaces-statement.ads
-include/adabase/adabase-interfaces.ads
-include/adabase/adabase-logger-base-file.adb
-include/adabase/adabase-logger-base-file.ads
-include/adabase/adabase-logger-base-screen.adb
-include/adabase/adabase-logger-base-screen.ads
-include/adabase/adabase-logger-base.adb
-include/adabase/adabase-logger-base.ads
-include/adabase/adabase-logger-facility.adb
-include/adabase/adabase-logger-facility.ads
-include/adabase/adabase-logger.ads
-include/adabase/adabase-results-converters.adb
-include/adabase/adabase-results-converters.ads
-include/adabase/adabase-results-field.adb
-include/adabase/adabase-results-field.ads
-include/adabase/adabase-results-generic_converters.adb
-include/adabase/adabase-results-generic_converters.ads
-include/adabase/adabase-results-sets.adb
-include/adabase/adabase-results-sets.ads
-include/adabase/adabase-results.ads
-%%MYSQL%%include/adabase/adabase-statement-base-mysql.adb
-%%MYSQL%%include/adabase/adabase-statement-base-mysql.ads
-%%PGSQL%%include/adabase/adabase-statement-base-postgresql.adb
-%%PGSQL%%include/adabase/adabase-statement-base-postgresql.ads
-%%SQLITE%%include/adabase/adabase-statement-base-sqlite.adb
-%%SQLITE%%include/adabase/adabase-statement-base-sqlite.ads
-include/adabase/adabase-statement-base.adb
-include/adabase/adabase-statement-base.ads
-include/adabase/adabase-statement.ads
-include/adabase/adabase.ads
-include/adabase/commontext.adb
-include/adabase/commontext.ads
-include/adabase/spatial_data-well_known_binary.adb
-include/adabase/spatial_data-well_known_binary.ads
-include/adabase/spatial_data.adb
-include/adabase/spatial_data.ads
-%%MYSQL%%lib/adabase/adabase-bindings-mysql.ali
-%%PGSQL%%lib/adabase/adabase-bindings-postgresql.ali
-%%SQLITE%%lib/adabase/adabase-bindings-sqlite.ali
-lib/adabase/adabase-bindings.ali
-%%MYSQL%%lib/adabase/adabase-connection-base-mysql.ali
-%%PGSQL%%lib/adabase/adabase-connection-base-postgresql.ali
-%%SQLITE%%lib/adabase/adabase-connection-base-sqlite.ali
-lib/adabase/adabase-connection-base.ali
-lib/adabase/adabase-connection.ali
-%%MYSQL%%lib/adabase/adabase-driver-base-mysql.ali
-%%PGSQL%%lib/adabase/adabase-driver-base-postgresql.ali
-%%SQLITE%%lib/adabase/adabase-driver-base-sqlite.ali
-lib/adabase/adabase-driver-base.ali
-lib/adabase/adabase-driver.ali
-lib/adabase/adabase-interfaces-connection.ali
-lib/adabase/adabase-interfaces-driver.ali
-lib/adabase/adabase-interfaces-logger.ali
-lib/adabase/adabase-interfaces-statement.ali
-lib/adabase/adabase-interfaces.ali
-lib/adabase/adabase-logger-base-file.ali
-lib/adabase/adabase-logger-base-screen.ali
-lib/adabase/adabase-logger-base.ali
-lib/adabase/adabase-logger-facility.ali
-lib/adabase/adabase-logger.ali
-lib/adabase/adabase-results-converters.ali
-lib/adabase/adabase-results-field.ali
-lib/adabase/adabase-results-generic_converters.ali
-lib/adabase/adabase-results-sets.ali
-lib/adabase/adabase-results.ali
-%%MYSQL%%lib/adabase/adabase-statement-base-mysql.ali
-%%PGSQL%%lib/adabase/adabase-statement-base-postgresql.ali
-%%SQLITE%%lib/adabase/adabase-statement-base-sqlite.ali
-lib/adabase/adabase-statement-base.ali
-lib/adabase/adabase-statement.ali
-lib/adabase/adabase.ali
-lib/adabase/commontext.ali
-lib/adabase/libadabase.a
-lib/adabase/spatial_data-well_known_binary.ali
-lib/adabase/spatial_data.ali
-lib/gnat/adabase.gpr
diff --git a/databases/adminer/Makefile b/databases/adminer/Makefile
index 9e9cbdd9a4cc..2b4f2adb927d 100644
--- a/databases/adminer/Makefile
+++ b/databases/adminer/Makefile
@@ -1,26 +1,25 @@
-# Created by: Wen Heping <wenheping@gmail.com>
-
 PORTNAME=	adminer
-PORTVERSION=	4.7.7
+PORTVERSION=	4.8.1
 CATEGORIES=	databases www
 MASTER_SITES=	https://github.com/vrana/adminer/releases/download/v${PORTVERSION}/
 EXTRACT_SUFX=	.php
 EXTRACT_ONLY=
 
-MAINTAINER=	uzsolt@uzsolt.hu
+MAINTAINER=	uzsolt@FreeBSD.org
 COMMENT=	Full-featured database management tool written in PHP
+WWW=		https://www.adminer.org
 
 LICENSE=	APACHE20
 
-USES=		php
+USES=		cpe php
 USE_PHP=	session
 
-NO_BUILD=	yes
 NO_ARCH=	yes
+NO_BUILD=	yes
 
-PLIST_SUB=	WWWOWN="${WWWOWN}" WWWGRP="${WWWGRP}"
 SUB_FILES=	pkg-message
 SUB_LIST=	PHPVER="${PHP_VER}"
+PLIST_SUB=	WWWOWN="${WWWOWN}" WWWGRP="${WWWGRP}"
 
 do-install:
 	${MKDIR} ${STAGEDIR}${WWWDIR}
diff --git a/databases/adminer/distinfo b/databases/adminer/distinfo
index cc0688ac6f56..598ac9360c8e 100644
--- a/databases/adminer/distinfo
+++ b/databases/adminer/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1599474039
-SHA256 (adminer-4.7.7.php) = 566152a2d86186dcfb28856b4ed0dfdb60e355d93ab693f7931201f75868fff0
-SIZE (adminer-4.7.7.php) = 489307
+TIMESTAMP = 1652299956
+SHA256 (adminer-4.8.1.php) = 2fd7e6d8f987b243ab1839249551f62adce19704c47d3d0c8dd9e57ea5b9c6b3
+SIZE (adminer-4.8.1.php) = 476603
diff --git a/databases/adminer/pkg-descr b/databases/adminer/pkg-descr
index c2ddf122761e..8bc21a4f1858 100644
--- a/databases/adminer/pkg-descr
+++ b/databases/adminer/pkg-descr
@@ -5,5 +5,3 @@ server.
 
 Adminer is available for MySQL, PostgreSQL, SQLite, MS SQL
 and Oracle.
-
-WWW: https://www.adminer.org
diff --git a/databases/adminerevo/Makefile b/databases/adminerevo/Makefile
new file mode 100644
index 000000000000..9c90cfe68164
--- /dev/null
+++ b/databases/adminerevo/Makefile
@@ -0,0 +1,30 @@
+PORTNAME=	adminerevo
+PORTVERSION=	4.8.2
+CATEGORIES=	databases www
+MASTER_SITES=	https://github.com/${PORTNAME}/${PORTNAME}/releases/download/v${PORTVERSION}/
+DISTNAME=	adminer-${DISTVERSION}
+EXTRACT_SUFX=	.php
+EXTRACT_ONLY=
+
+MAINTAINER=	DtxdF@disroot.org
+COMMENT=	Database management in a single PHP file
+WWW=		https://adminerevo.org \
+		https://github.com/${PORTNAME}/${PORTNAME}
+
+LICENSE=	APACHE20 GPLv3
+LICENSE_COMB=	dual
+
+USES=		php
+USE_PHP=	session
+
+NO_ARCH=	yes
+NO_BUILD=	yes
+
+SUB_FILES=	pkg-message
+SUB_LIST=	PHPVER="${PHP_VER}"
+
+do-install:
+	${MKDIR} ${STAGEDIR}${WWWDIR}
+	${INSTALL_DATA} ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} ${STAGEDIR}${WWWDIR}/index.php
+
+.include <bsd.port.mk>
diff --git a/databases/adminerevo/distinfo b/databases/adminerevo/distinfo
new file mode 100644
index 000000000000..f81e15b34a0e
--- /dev/null
+++ b/databases/adminerevo/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1696076245
+SHA256 (adminer-4.8.2.php) = 8d772718bc8d419a89292d11b3e518d52c7392704467006171b0f406625514ab
+SIZE (adminer-4.8.2.php) = 498440
diff --git a/databases/adminerevo/files/pkg-message.in b/databases/adminerevo/files/pkg-message.in
new file mode 100644
index 000000000000..64a90680749d
--- /dev/null
+++ b/databases/adminerevo/files/pkg-message.in
@@ -0,0 +1,8 @@
+[
+{ type: install
+  message: <<EOM
+You should install the database extension(s) what you want to use:
+php%%PHPVER%%-mysqli, php%%PHPVER%%-mssql, php%%PHPVER%%-odbc, php%%PHPVER%%-pgsql or php%%PHPVER%%-pdo_sqlite.
+EOM
+}
+]
diff --git a/databases/adminerevo/pkg-descr b/databases/adminerevo/pkg-descr
new file mode 100644
index 000000000000..d053d044b831
--- /dev/null
+++ b/databases/adminerevo/pkg-descr
@@ -0,0 +1,3 @@
+AdminerEvo (fork of Adminer) is a full-featured database management tool
+written in PHP. Conversely to phpMyAdmin, it consists of a single file
+ready to deploy to the target server.
diff --git a/databases/adminerevo/pkg-plist b/databases/adminerevo/pkg-plist
new file mode 100644
index 000000000000..9ca1fbea4081
--- /dev/null
+++ b/databases/adminerevo/pkg-plist
@@ -0,0 +1,2 @@
+@mode 0644
+%%WWWDIR%%/index.php
diff --git a/databases/adodb/Makefile b/databases/adodb/Makefile
deleted file mode 100644
index 4513790eceff..000000000000
--- a/databases/adodb/Makefile
+++ /dev/null
@@ -1,60 +0,0 @@
-# Created by: abgoeree@uwnet.nl
-
-PORTNAME=	adodb
-PORTVERSION=	4.99.2
-CATEGORIES=	databases www
-MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-php-4-and-5/${PORTNAME}-${PORTVERSION:S/.//g}-for-php
-DISTNAME=	${PORTNAME}${PORTVERSION:S/.//g}
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Database library for PHP
-
-LICENSE=	BSD4CLAUSE LGPL21
-LICENSE_COMB=	dual
-
-USES=		cpe php tar:tgz
-USE_PHP=	pcre
-
-CONFLICTS=	adodb-5.*
-
-CPE_VENDOR=	adodb_project
-
-WRKSRC=		${WRKDIR}/${PORTNAME}
-NO_BUILD=	yes
-NO_ARCH=	yes
-SUB_FILES=	pkg-message
-
-ADODB_SUBDIRS=	contrib datadict drivers lang pear perf session xsl
-
-OPTIONS_DEFINE=	TESTS DOCS
-OPTIONS_SUB=	yes
-
-TESTS_DESC=	Install tests
-
-post-patch:
-	@cd ${WRKSRC}; ${RM} cute_icons_for_site/Thumbs.db
-
-do-install:
-	@${MKDIR} ${STAGEDIR}${DATADIR}
-	@cd ${WRKSRC}; ${FIND} ${ADODB_SUBDIRS} -type d \
-		-exec ${MKDIR} ${STAGEDIR}${DATADIR}/{} \;
-	@cd ${WRKSRC}; ${FIND} . ! -path './*/*' -type f \( -name '*.php' -or -name '*.dtd' -or -name '*.zip' \) \
-		-exec ${INSTALL_DATA} ${WRKSRC}/{} ${STAGEDIR}${DATADIR}/{} \;
-	@cd ${WRKSRC}; ${FIND} ${ADODB_SUBDIRS} -type f \
-		-exec ${INSTALL_DATA} ${WRKSRC}/{} ${STAGEDIR}${DATADIR}/{} \;
-
-do-install-TESTS-on:
-	@${MKDIR} ${STAGEDIR}${DATADIR}/tests
-	@cd ${WRKSRC}; ${FIND} tests -type f \
-		-exec ${INSTALL_DATA} ${WRKSRC}/{} ${STAGEDIR}${DATADIR}/{} \;
-
-do-install-DOCS-on:
-	@${MKDIR} ${STAGEDIR}${DOCSDIR} ${STAGEDIR}${DOCSDIR}/cute_icons_for_site
-	@cd ${WRKSRC}; ${FIND} . ! -path './*/*' -type f -name '*.txt' \
-		-exec ${INSTALL_DATA} ${WRKSRC}/{} ${STAGEDIR}${DOCSDIR}/{} \;
-	@cd ${WRKSRC}/docs; ${FIND} . -type f \
-		-exec ${INSTALL_DATA} ${WRKSRC}/docs/{} ${STAGEDIR}${DOCSDIR}/{} \;
-	@cd ${WRKSRC}; ${FIND} cute_icons_for_site -type f \
-		-exec ${INSTALL_DATA} ${WRKSRC}/{} ${STAGEDIR}${DOCSDIR}/{} \;
-
-.include <bsd.port.mk>
diff --git a/databases/adodb/distinfo b/databases/adodb/distinfo
deleted file mode 100644
index 8c2dc00cfcec..000000000000
--- a/databases/adodb/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (adodb4992.tgz) = 11432c58517f91bbce301360a2c4e3b41d3a9fb21a5b10662acc5b729e849a03
-SIZE (adodb4992.tgz) = 511376
diff --git a/databases/adodb/files/pkg-message.in b/databases/adodb/files/pkg-message.in
deleted file mode 100644
index 8d80ec626abd..000000000000
--- a/databases/adodb/files/pkg-message.in
+++ /dev/null
@@ -1,8 +0,0 @@
-[
-{ type: install
-  message: <<EOM
-You can add the ADOdb path (%%DATADIR%%)
-to the "include_path=" directive in your php.ini
-EOM
-}
-]
diff --git a/databases/adodb/pkg-descr b/databases/adodb/pkg-descr
deleted file mode 100644
index ea81cfee4119..000000000000
--- a/databases/adodb/pkg-descr
+++ /dev/null
@@ -1,14 +0,0 @@
-ADOdb stands for Active Data Objects Data Base.
-
-ADOdb is a database abstraction library for PHP.
-
-The PHP version currently supports an amazing number of databases,
-thanks to the wonderful ADOdb community:
-MySQL, PostgreSQL, Interbase, Firebird, Informix, Oracle, MS SQL, Foxpro,
-Access, ADO, Sybase, FrontBase, DB2, SAP DB, SQLite, Netezza, LDAP, and generic
-ODBC, ODBTP.
-
-The Sybase, Informix, FrontBase and PostgreSQL, Netezza, LDAP, ODBTP drivers
-are community contributions.
-
-WWW: http://adodb.sourceforge.net/
diff --git a/databases/adodb/pkg-plist b/databases/adodb/pkg-plist
deleted file mode 100644
index 6e97127953ee..000000000000
--- a/databases/adodb/pkg-plist
+++ /dev/null
@@ -1,195 +0,0 @@
-%%DATADIR%%/adodb-active-record.inc.php
-%%DATADIR%%/adodb-csvlib.inc.php
-%%DATADIR%%/adodb-datadict.inc.php
-%%DATADIR%%/adodb-error.inc.php
-%%DATADIR%%/adodb-errorhandler.inc.php
-%%DATADIR%%/adodb-errorpear.inc.php
-%%DATADIR%%/adodb-exceptions.inc.php
-%%DATADIR%%/adodb-iterator.inc.php
-%%DATADIR%%/adodb-lib.inc.php
-%%DATADIR%%/adodb-memcache.lib.inc.php
-%%DATADIR%%/adodb-pager.inc.php
-%%DATADIR%%/adodb-pear.inc.php
-%%DATADIR%%/adodb-perf.inc.php
-%%DATADIR%%/adodb-php4.inc.php
-%%DATADIR%%/adodb-time.inc.php
-%%DATADIR%%/adodb-time.zip
-%%DATADIR%%/adodb-xmlschema.inc.php
-%%DATADIR%%/adodb-xmlschema03.inc.php
-%%DATADIR%%/adodb.inc.php
-%%DATADIR%%/contrib/toxmlrpc.inc.php
-%%DATADIR%%/datadict/datadict-access.inc.php
-%%DATADIR%%/datadict/datadict-db2.inc.php
-%%DATADIR%%/datadict/datadict-firebird.inc.php
-%%DATADIR%%/datadict/datadict-generic.inc.php
-%%DATADIR%%/datadict/datadict-ibase.inc.php
-%%DATADIR%%/datadict/datadict-informix.inc.php
-%%DATADIR%%/datadict/datadict-mssql.inc.php
-%%DATADIR%%/datadict/datadict-mssqlnative.inc.php
-%%DATADIR%%/datadict/datadict-mysql.inc.php
-%%DATADIR%%/datadict/datadict-oci8.inc.php
-%%DATADIR%%/datadict/datadict-postgres.inc.php
-%%DATADIR%%/datadict/datadict-sapdb.inc.php
-%%DATADIR%%/datadict/datadict-sybase.inc.php
-%%DATADIR%%/drivers/adodb-access.inc.php
-%%DATADIR%%/drivers/adodb-ado.inc.php
-%%DATADIR%%/drivers/adodb-ado5.inc.php
-%%DATADIR%%/drivers/adodb-ado_access.inc.php
-%%DATADIR%%/drivers/adodb-ado_mssql.inc.php
-%%DATADIR%%/drivers/adodb-borland_ibase.inc.php
-%%DATADIR%%/drivers/adodb-csv.inc.php
-%%DATADIR%%/drivers/adodb-db2.inc.php
-%%DATADIR%%/drivers/adodb-fbsql.inc.php
-%%DATADIR%%/drivers/adodb-firebird.inc.php
-%%DATADIR%%/drivers/adodb-ibase.inc.php
-%%DATADIR%%/drivers/adodb-informix.inc.php
-%%DATADIR%%/drivers/adodb-informix72.inc.php
-%%DATADIR%%/drivers/adodb-ldap.inc.php
-%%DATADIR%%/drivers/adodb-mssql.inc.php
-%%DATADIR%%/drivers/adodb-mssql.inc.php.bak
-%%DATADIR%%/drivers/adodb-mssql_n.inc.php
-%%DATADIR%%/drivers/adodb-mssqlnative.inc.php
-%%DATADIR%%/drivers/adodb-mssqlpo.inc.php
-%%DATADIR%%/drivers/adodb-mysql.inc.php
-%%DATADIR%%/drivers/adodb-mysqli.inc.php
-%%DATADIR%%/drivers/adodb-mysqlt.inc.php
-%%DATADIR%%/drivers/adodb-netezza.inc.php
-%%DATADIR%%/drivers/adodb-oci8.inc.php
-%%DATADIR%%/drivers/adodb-oci805.inc.php
-%%DATADIR%%/drivers/adodb-oci8po.inc.php
-%%DATADIR%%/drivers/adodb-odbc.inc.php
-%%DATADIR%%/drivers/adodb-odbc_db2.inc.php
-%%DATADIR%%/drivers/adodb-odbc_mssql.inc.php
-%%DATADIR%%/drivers/adodb-odbc_oracle.inc.php
-%%DATADIR%%/drivers/adodb-odbtp.inc.php
-%%DATADIR%%/drivers/adodb-odbtp_unicode.inc.php
-%%DATADIR%%/drivers/adodb-oracle.inc.php
-%%DATADIR%%/drivers/adodb-pdo.inc.php
-%%DATADIR%%/drivers/adodb-pdo_mssql.inc.php
-%%DATADIR%%/drivers/adodb-pdo_mysql.inc.php
-%%DATADIR%%/drivers/adodb-pdo_oci.inc.php
-%%DATADIR%%/drivers/adodb-pdo_pgsql.inc.php
-%%DATADIR%%/drivers/adodb-postgres.inc.php
-%%DATADIR%%/drivers/adodb-postgres64.inc.php
-%%DATADIR%%/drivers/adodb-postgres7.inc.php
-%%DATADIR%%/drivers/adodb-postgres8.inc.php
-%%DATADIR%%/drivers/adodb-proxy.inc.php
-%%DATADIR%%/drivers/adodb-sapdb.inc.php
-%%DATADIR%%/drivers/adodb-sqlanywhere.inc.php
-%%DATADIR%%/drivers/adodb-sqlite.inc.php
-%%DATADIR%%/drivers/adodb-sqlitepo.inc.php
-%%DATADIR%%/drivers/adodb-sybase.inc.php
-%%DATADIR%%/drivers/adodb-sybase_ase.inc.php
-%%DATADIR%%/drivers/adodb-vfp.inc.php
-%%DATADIR%%/lang/adodb-ar.inc.php
-%%DATADIR%%/lang/adodb-bg.inc.php
-%%DATADIR%%/lang/adodb-bgutf8.inc.php
-%%DATADIR%%/lang/adodb-ca.inc.php
-%%DATADIR%%/lang/adodb-cn.inc.php
-%%DATADIR%%/lang/adodb-cz.inc.php
-%%DATADIR%%/lang/adodb-da.inc.php
-%%DATADIR%%/lang/adodb-de.inc.php
-%%DATADIR%%/lang/adodb-en.inc.php
-%%DATADIR%%/lang/adodb-es.inc.php
-%%DATADIR%%/lang/adodb-esperanto.inc.php
-%%DATADIR%%/lang/adodb-fa.inc.php
-%%DATADIR%%/lang/adodb-fr.inc.php
-%%DATADIR%%/lang/adodb-hu.inc.php
-%%DATADIR%%/lang/adodb-it.inc.php
-%%DATADIR%%/lang/adodb-nl.inc.php
-%%DATADIR%%/lang/adodb-pl.inc.php
-%%DATADIR%%/lang/adodb-pt-br.inc.php
-%%DATADIR%%/lang/adodb-ro.inc.php
-%%DATADIR%%/lang/adodb-ru1251.inc.php
-%%DATADIR%%/lang/adodb-sv.inc.php
-%%DATADIR%%/lang/adodb-uk1251.inc.php
-%%DATADIR%%/lang/adodb_th.inc.php
-%%DATADIR%%/pear/Auth/Container/ADOdb.php
-%%DATADIR%%/pear/readme.Auth.txt
-%%DATADIR%%/perf/perf-db2.inc.php
-%%DATADIR%%/perf/perf-informix.inc.php
-%%DATADIR%%/perf/perf-mssql.inc.php
-%%DATADIR%%/perf/perf-mssqlnative.inc.php
-%%DATADIR%%/perf/perf-mysql.inc.php
-%%DATADIR%%/perf/perf-oci8.inc.php
-%%DATADIR%%/perf/perf-postgres.inc.php
-%%DATADIR%%/pivottable.inc.php
-%%DATADIR%%/rsfilter.inc.php
-%%DATADIR%%/server.php
-%%DATADIR%%/session/adodb-compress-bzip2.php
-%%DATADIR%%/session/adodb-compress-gzip.php
-%%DATADIR%%/session/adodb-cryptsession.php
-%%DATADIR%%/session/adodb-cryptsession2.php
-%%DATADIR%%/session/adodb-encrypt-mcrypt.php
-%%DATADIR%%/session/adodb-encrypt-md5.php
-%%DATADIR%%/session/adodb-encrypt-secret.php
-%%DATADIR%%/session/adodb-encrypt-sha1.php
-%%DATADIR%%/session/adodb-sess.txt
-%%DATADIR%%/session/adodb-session-clob.php
-%%DATADIR%%/session/adodb-session-clob2.php
-%%DATADIR%%/session/adodb-session.php
-%%DATADIR%%/session/adodb-session2.php
-%%DATADIR%%/session/adodb-sessions.mysql.sql
-%%DATADIR%%/session/adodb-sessions.oracle.clob.sql
-%%DATADIR%%/session/adodb-sessions.oracle.sql
-%%DATADIR%%/session/crypt.inc.php
-%%DATADIR%%/session/old/adodb-cryptsession.php
-%%DATADIR%%/session/old/adodb-session-clob.php
-%%DATADIR%%/session/old/adodb-session.php
-%%DATADIR%%/session/old/crypt.inc.php
-%%DATADIR%%/session/session_schema.xml
-%%DATADIR%%/session/session_schema2.xml
-%%TESTS%%%%DATADIR%%/tests/benchmark.php
-%%TESTS%%%%DATADIR%%/tests/client.php
-%%TESTS%%%%DATADIR%%/tests/pdo.php
-%%TESTS%%%%DATADIR%%/tests/test-active-record.php
-%%TESTS%%%%DATADIR%%/tests/test-active-recs2.php
-%%TESTS%%%%DATADIR%%/tests/test-datadict.php
-%%TESTS%%%%DATADIR%%/tests/test-perf.php
-%%TESTS%%%%DATADIR%%/tests/test-pgblob.php
-%%TESTS%%%%DATADIR%%/tests/test-php5.php
-%%TESTS%%%%DATADIR%%/tests/test-xmlschema.php
-%%TESTS%%%%DATADIR%%/tests/test.php
-%%TESTS%%%%DATADIR%%/tests/test2.php
-%%TESTS%%%%DATADIR%%/tests/test3.php
-%%TESTS%%%%DATADIR%%/tests/test4.php
-%%TESTS%%%%DATADIR%%/tests/test5.php
-%%TESTS%%%%DATADIR%%/tests/test_rs_array.php
-%%TESTS%%%%DATADIR%%/tests/testcache.php
-%%TESTS%%%%DATADIR%%/tests/testdatabases.inc.php
-%%TESTS%%%%DATADIR%%/tests/testgenid.php
-%%TESTS%%%%DATADIR%%/tests/testmssql.php
-%%TESTS%%%%DATADIR%%/tests/testoci8.php
-%%TESTS%%%%DATADIR%%/tests/testoci8cursor.php
-%%TESTS%%%%DATADIR%%/tests/testpaging.php
-%%TESTS%%%%DATADIR%%/tests/testpear.php
-%%TESTS%%%%DATADIR%%/tests/testsessions.php
-%%TESTS%%%%DATADIR%%/tests/time.php
-%%TESTS%%%%DATADIR%%/tests/tmssql.php
-%%TESTS%%%%DATADIR%%/tests/xmlschema.xml
-%%TESTS%%%%DATADIR%%/tests/xmlschema-mssql.xml
-%%DATADIR%%/toexport.inc.php
-%%DATADIR%%/tohtml.inc.php
-%%DATADIR%%/xmlschema.dtd
-%%DATADIR%%/xmlschema03.dtd
-%%DATADIR%%/xsl/convert-0.1-0.2.xsl
-%%DATADIR%%/xsl/convert-0.1-0.3.xsl
-%%DATADIR%%/xsl/convert-0.2-0.1.xsl
-%%DATADIR%%/xsl/convert-0.2-0.3.xsl
-%%DATADIR%%/xsl/remove-0.2.xsl
-%%DATADIR%%/xsl/remove-0.3.xsl
-%%PORTDOCS%%%%DOCSDIR%%/cute_icons_for_site/adodb.gif
-%%PORTDOCS%%%%DOCSDIR%%/cute_icons_for_site/adodb2.gif
-%%PORTDOCS%%%%DOCSDIR%%/docs-active-record.htm
-%%PORTDOCS%%%%DOCSDIR%%/docs-adodb.htm
-%%PORTDOCS%%%%DOCSDIR%%/docs-datadict.htm
-%%PORTDOCS%%%%DOCSDIR%%/docs-oracle.htm
-%%PORTDOCS%%%%DOCSDIR%%/docs-perf.htm
-%%PORTDOCS%%%%DOCSDIR%%/docs-session.htm
-%%PORTDOCS%%%%DOCSDIR%%/docs-session.old.htm
-%%PORTDOCS%%%%DOCSDIR%%/license.txt
-%%PORTDOCS%%%%DOCSDIR%%/old-changelog.htm
-%%PORTDOCS%%%%DOCSDIR%%/readme.htm
-%%PORTDOCS%%%%DOCSDIR%%/readme.txt
-%%PORTDOCS%%%%DOCSDIR%%/tips_portable_sql.htm
-%%PORTDOCS%%%%DOCSDIR%%/tute.htm
diff --git a/databases/adodb5/Makefile b/databases/adodb5/Makefile
index a06d175ca4dd..78cc359d909c 100644
--- a/databases/adodb5/Makefile
+++ b/databases/adodb5/Makefile
@@ -1,24 +1,23 @@
-# Created by: mm@FreeBSD.org
-
 PORTNAME=	adodb
-PORTVERSION=	5.21.2
+PORTVERSION=	5.22.7
 DISTVERSIONPREFIX=	v
 CATEGORIES=	databases www
 PKGNAMESUFFIX=	5${PHP_PKGNAMESUFFIX}
 
 MAINTAINER=	fluffy@FreeBSD.org
 COMMENT=	Database library for PHP
+WWW=		http://adodb.org/
 
 LICENSE=	BSD3CLAUSE LGPL21+
 LICENSE_COMB=	dual
 
-USES=		php:flavors
-USE_PHP=	pcre
+USES=		cpe php:flavors
+CPE_VENDOR=	${PORTNAME}_project
 
 USE_GITHUB=	yes
 GH_PROJECT=	ADOdb
 
-CONFLICTS=	adodb-4.*
+CONFLICTS_INSTALL=	adodb5-php[0-9][0-9] # share/adodb/adodb-active-record.inc.php
 
 NO_BUILD=	yes
 NO_ARCH=	yes
diff --git a/databases/adodb5/distinfo b/databases/adodb5/distinfo
index 4a04d180d4a8..418d082b7a81 100644
--- a/databases/adodb5/distinfo
+++ b/databases/adodb5/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1629705756
-SHA256 (adodb-ADOdb-v5.21.2_GH0.tar.gz) = 9262fe53fb2e25aee53a4490133c55a8837e7197baa1c8c77237a4754ed3bb20
-SIZE (adodb-ADOdb-v5.21.2_GH0.tar.gz) = 434575
+TIMESTAMP = 1703602874
+SHA256 (adodb-ADOdb-v5.22.7_GH0.tar.gz) = 7555e4ee9cdae65949e82dd4e6199dad1a9128728646e6ff71b2111b53e3364c
+SIZE (adodb-ADOdb-v5.22.7_GH0.tar.gz) = 447580
diff --git a/databases/adodb5/pkg-descr b/databases/adodb5/pkg-descr
index 8d4faf9221e7..03f63b43890e 100644
--- a/databases/adodb5/pkg-descr
+++ b/databases/adodb5/pkg-descr
@@ -10,5 +10,3 @@ ODBC, ODBTP.
 
 The Sybase, Informix, FrontBase and PostgreSQL, Netezza, LDAP, ODBTP drivers
 are community contributions.
-
-WWW: http://adodb.org/
diff --git a/databases/adodb5/pkg-plist b/databases/adodb5/pkg-plist
index 05bbeabe7fb3..01f2d0d108bf 100644
--- a/databases/adodb5/pkg-plist
+++ b/databases/adodb5/pkg-plist
@@ -51,10 +51,7 @@
 %%DATADIR%%/drivers/adodb-mssqlnative.inc.php
 %%DATADIR%%/drivers/adodb-mssqlpo.inc.php
 %%DATADIR%%/drivers/adodb-mssql_n.inc.php
-%%DATADIR%%/drivers/adodb-mysql.inc.php
 %%DATADIR%%/drivers/adodb-mysqli.inc.php
-%%DATADIR%%/drivers/adodb-mysqlpo.inc.php
-%%DATADIR%%/drivers/adodb-mysqlt.inc.php
 %%DATADIR%%/drivers/adodb-netezza.inc.php
 %%DATADIR%%/drivers/adodb-oci8.inc.php
 %%DATADIR%%/drivers/adodb-oci8po.inc.php
@@ -126,9 +123,9 @@
 %%DATADIR%%/perf/perf-mysql.inc.php
 %%DATADIR%%/perf/perf-oci8.inc.php
 %%DATADIR%%/perf/perf-postgres.inc.php
+%%DATADIR%%/perf/perf-sqlite3.inc.php
 %%DATADIR%%/pivottable.inc.php
 %%DATADIR%%/rsfilter.inc.php
-%%DATADIR%%/server.php
 %%DATADIR%%/session/adodb-compress-bzip2.php
 %%DATADIR%%/session/adodb-compress-gzip.php
 %%DATADIR%%/session/adodb-cryptsession.php
diff --git a/databases/akonadi/Makefile b/databases/akonadi/Makefile
index 50d1ec3f1e0c..690597a688ed 100644
--- a/databases/akonadi/Makefile
+++ b/databases/akonadi/Makefile
@@ -1,78 +1,59 @@
 PORTNAME=	akonadi
 DISTVERSION=	${KDE_APPLICATIONS_VERSION}
+PORTREVISION=	1
 CATEGORIES=	databases kde kde-applications
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Storage server for KDE-Pim
+WWW=		https://community.kde.org/KDE_PIM/Akonadi
 
 LICENSE=	LGPL21
 
-LIB_DEPENDS=	libboost_thread.so:devel/boost-libs
+LIB_DEPENDS=	libboost_thread.so:devel/boost-libs \
+		libkaccounts.so:net-im/kaccounts-integration \
+		libaccounts-qt5.so:net-im/libaccounts-qt@qt5
 # Let process generate meaningful backtrace on core dump.
 BUILD_DEPENDS=	xsltproc:textproc/libxslt
 
-CONFLICTS=	akonadi-[0-9]* akonadi-kf5-git-[0-9]*
+CONFLICTS=	akonadi akonadi-kf5-git
 
 USES=		cmake compiler:c++11-lib gettext gnome kde:5 qt:5 \
-		shared-mime-info tar:xz
+		shared-mime-info sqlite:3 tar:xz xorg
 USE_GNOME=	libxml2
 USE_KDE=	auth codecs completion config configwidgets coreaddons crash \
 		dbusaddons guiaddons i18n iconthemes itemmodels itemviews \
 		kio service windowsystem widgetsaddons xmlgui \
-		designerplugin_build ecm_build \
-		designerplugin_run
+		designerplugin:build ecm:build \
+		designerplugin:run
 USE_QT=		concurrent core dbus designer gui network sql testlib widgets xml \
-		buildtools_build qmake_build
-CMAKE_ARGS+=	-DCMAKE_REQUIRED_INCLUDES:STRING="${LOCALBASE}/include"
+		buildtools:build qmake:build \
+		sql-sqlite3:run
+USE_XORG=	x11
+CMAKE_ARGS+=	-DCMAKE_REQUIRED_INCLUDES:STRING="${LOCALBASE}/include" \
+		-DMYSQLD_EXECUTABLE:FILEPATH="${LOCALBASE}/libexec/mysqld" \
+		-DMYSQLD_SCRIPTS_PATH:PATH="${LOCALBASE}/bin" \
+		-DPOSTGRES_PATH:FILEPATH="${LOCALBASE}/bin/pg_ctl"
 
 USE_LDCONFIG=	yes
 
-OPTIONS_DEFINE=	DOCS
-OPTIONS_MULTI=		DB
-OPTIONS_MULTI_DB=	MYSQL PGSQL SQLITE
-OPTIONS_SUB=		yes
+OPTIONS_DEFINE=		DOCS
+OPTIONS_GROUP=		DB
+OPTIONS_GROUP_DB=	MYSQL PGSQL
 OPTIONS_DEFAULT=	MYSQL
 
 MYSQL_DESC=		Install MySQL Qt plugin and server
-MYSQL_USES=	mysql:server qt:5
-MYSQL_USE=		QT=sql-mysql_run
-MYSQL_CMAKE_BOOL=	AKONADI_BUILD_MYSQL
+MYSQL_USES=		mysql:server
+MYSQL_USE=		QT=sql-mysql:run
 
 PGSQL_DESC=		Install PostgreSQL Qt plugin
-# Do not add a dependency on PostgreSQL server as someone preferring
-# it over MySQL might like to use some advanced configuration, like a
-# remote server.
-#PGSQL_USE=	PGSQL=server
-PGSQL_USES=	qt:5
-PGSQL_USE=		QT=sql-pgsql_run
-PGSQL_CMAKE_BOOL=	AKONADI_BUILD_PGSQL
-
-SQLITE_DESC=		Enable SQLite backend
-SQLITE_USES=		qt:5 sqlite:3
-SQLITE_USE=		QT=sql-sqlite3_run
-SQLITE_CMAKE_BOOL=	AKONADI_BUILD_QSQLITE
+PGSQL_USE=		QT=sql-pgsql:run
 
 .include <bsd.port.options.mk>
 
-# Multiple backends may be enabled, but there can be only
-# one default. Set a default (the user can change it locally)
-# based on the selected backends, preferring MySQL (if enabled).
-#
-# If you build this port with only a single backend selected,
-# that one will be the default. This is useful for users of SQLite.
 .if ${PORT_OPTIONS:MMYSQL}
-CMAKE_ARGS+=	-DDATABASE_BACKEND=MYSQL
-.else
-.  if ${PORT_OPTIONS:MPGSQL}
-CMAKE_ARGS+=	-DDATABASE_BACKEND=POSTGRES
-.  else
-.    if ${PORT_OPTIONS:MSQLITE}
-CMAKE_ARGS+=	-DDATABASE_BACKEND=SQLITE
-.    else
-# Nothing else selected, very odd
-CMAKE_ARGS+=	-DDATABASE_BACKEND=MYSQL
-.    endif
-.  endif
+CMAKE_ARGS+=	-DDATABASE_BACKEND:STRING="MYSQL"
+.elif ${PORT_OPTIONS:MPGSQL}
+CMAKE_ARGS+=	-DDATABASE_BACKEND:STRING="POSTGRES"
 .endif
 
 post-patch:
diff --git a/databases/akonadi/distinfo b/databases/akonadi/distinfo
index 6e8371c74498..0a04279adfac 100644
--- a/databases/akonadi/distinfo
+++ b/databases/akonadi/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1630583829
-SHA256 (KDE/release-service/21.08.1/akonadi-21.08.1.tar.xz) = a6d588534579dc6dc4e19399215a1c9e6b802591cdd2165f064359deebd04b09
-SIZE (KDE/release-service/21.08.1/akonadi-21.08.1.tar.xz) = 1607852
+TIMESTAMP = 1707889372
+SHA256 (KDE/release-service/23.08.5/akonadi-23.08.5.tar.xz) = abdbdb28c1084a6ad119d7292175ad31efb4a7898a32cc32a35aa1485d9c4f38
+SIZE (KDE/release-service/23.08.5/akonadi-23.08.5.tar.xz) = 1662512
diff --git a/databases/akonadi/pkg-descr b/databases/akonadi/pkg-descr
index f19c69404f3f..34565660d4ed 100644
--- a/databases/akonadi/pkg-descr
+++ b/databases/akonadi/pkg-descr
@@ -2,5 +2,3 @@ The Akonadi framework is responsible for providing applications with a
 centralized database to store, index and retrieve the user's personal
 information. This includes the user's emails, contacts, calendars,
 events, journals, alarms, notes, etc.
-
-WWW: https://community.kde.org/KDE_PIM/Akonadi
diff --git a/databases/akonadi/pkg-plist b/databases/akonadi/pkg-plist
index 8e7d891fc418..c6654533d25d 100644
--- a/databases/akonadi/pkg-plist
+++ b/databases/akonadi/pkg-plist
@@ -15,335 +15,343 @@ etc/apparmor.d/postgresql_akonadi
 etc/apparmor.d/usr.bin.akonadiserver
 etc/xdg/akonadi/mysql-global-mobile.conf
 etc/xdg/akonadi/mysql-global.conf
-include/KF5/AkonadiAgentBase/AccountsIntegration
-include/KF5/AkonadiAgentBase/AgentBase
-include/KF5/AkonadiAgentBase/AgentSearchInterface
-include/KF5/AkonadiAgentBase/PreprocessorBase
-include/KF5/AkonadiAgentBase/ResourceBase
-include/KF5/AkonadiAgentBase/ResourceSettings
-include/KF5/AkonadiAgentBase/TransportResourceBase
-include/KF5/AkonadiAgentBase/accountsintegration.h
-include/KF5/AkonadiAgentBase/agentbase.h
-include/KF5/AkonadiAgentBase/agentsearchinterface.h
-include/KF5/AkonadiAgentBase/akonadiagentbase_export.h
-include/KF5/AkonadiAgentBase/preprocessorbase.h
-include/KF5/AkonadiAgentBase/resourcebase.h
-include/KF5/AkonadiAgentBase/resourcebasesettings.h
-include/KF5/AkonadiAgentBase/resourcesettings.h
-include/KF5/AkonadiAgentBase/transportresourcebase.h
-include/KF5/AkonadiCore/AbstractDifferencesReporter
-include/KF5/AkonadiCore/AgentConfigurationBase
-include/KF5/AkonadiCore/AgentConfigurationFactoryBase
-include/KF5/AkonadiCore/AgentFilterProxyModel
-include/KF5/AkonadiCore/AgentInstance
-include/KF5/AkonadiCore/AgentInstanceCreateJob
-include/KF5/AkonadiCore/AgentInstanceModel
-include/KF5/AkonadiCore/AgentManager
-include/KF5/AkonadiCore/AgentType
-include/KF5/AkonadiCore/AgentTypeModel
-include/KF5/AkonadiCore/Attribute
-include/KF5/AkonadiCore/AttributeFactory
-include/KF5/AkonadiCore/CachePolicy
-include/KF5/AkonadiCore/ChangeNotification
-include/KF5/AkonadiCore/ChangeRecorder
-include/KF5/AkonadiCore/Collection
-include/KF5/AkonadiCore/CollectionAttributesSynchronizationJob
-include/KF5/AkonadiCore/CollectionColorAttribute
-include/KF5/AkonadiCore/CollectionCopyJob
-include/KF5/AkonadiCore/CollectionCreateJob
-include/KF5/AkonadiCore/CollectionDeleteJob
-include/KF5/AkonadiCore/CollectionFetchJob
-include/KF5/AkonadiCore/CollectionFetchScope
-include/KF5/AkonadiCore/CollectionFilterProxyModel
-include/KF5/AkonadiCore/CollectionIdentificationAttribute
-include/KF5/AkonadiCore/CollectionModifyJob
-include/KF5/AkonadiCore/CollectionMoveJob
-include/KF5/AkonadiCore/CollectionPathResolver
-include/KF5/AkonadiCore/CollectionQuotaAttribute
-include/KF5/AkonadiCore/CollectionStatistics
-include/KF5/AkonadiCore/CollectionStatisticsJob
-include/KF5/AkonadiCore/CollectionUtils
-include/KF5/AkonadiCore/Control
-include/KF5/AkonadiCore/DifferencesAlgorithmInterface
-include/KF5/AkonadiCore/EntityAnnotationsAttribute
-include/KF5/AkonadiCore/EntityDeletedAttribute
-include/KF5/AkonadiCore/EntityDisplayAttribute
-include/KF5/AkonadiCore/EntityHiddenAttribute
-include/KF5/AkonadiCore/EntityMimeTypeFilterModel
-include/KF5/AkonadiCore/EntityOrderProxyModel
-include/KF5/AkonadiCore/EntityRightsFilterModel
-include/KF5/AkonadiCore/EntityTreeModel
-include/KF5/AkonadiCore/ExceptionBase
-include/KF5/AkonadiCore/FavoriteCollectionAttribute
-include/KF5/AkonadiCore/FavoriteCollectionsModel
-include/KF5/AkonadiCore/GidExtractorInterface
-include/KF5/AkonadiCore/IndexPolicyAttribute
-include/KF5/AkonadiCore/Item
-include/KF5/AkonadiCore/ItemCopyJob
-include/KF5/AkonadiCore/ItemCreateJob
-include/KF5/AkonadiCore/ItemDeleteJob
-include/KF5/AkonadiCore/ItemFetchJob
-include/KF5/AkonadiCore/ItemFetchScope
-include/KF5/AkonadiCore/ItemModifyJob
-include/KF5/AkonadiCore/ItemMonitor
-include/KF5/AkonadiCore/ItemMoveJob
-include/KF5/AkonadiCore/ItemSearchJob
-include/KF5/AkonadiCore/ItemSerializerPlugin
-include/KF5/AkonadiCore/ItemSync
-include/KF5/AkonadiCore/Job
-include/KF5/AkonadiCore/LinkJob
-include/KF5/AkonadiCore/MimeTypeChecker
-include/KF5/AkonadiCore/Monitor
-include/KF5/AkonadiCore/NotificationSubscriber
-include/KF5/AkonadiCore/PartFetcher
-include/KF5/AkonadiCore/PersistentSearchAttribute
-include/KF5/AkonadiCore/RecursiveCollectionFilterProxyModel
-include/KF5/AkonadiCore/RecursiveItemFetchJob
-include/KF5/AkonadiCore/Relation
-include/KF5/AkonadiCore/RelationCreateJob
-include/KF5/AkonadiCore/RelationDeleteJob
-include/KF5/AkonadiCore/RelationFetchJob
-include/KF5/AkonadiCore/ResourceSynchronizationJob
-include/KF5/AkonadiCore/SearchCreateJob
-include/KF5/AkonadiCore/SearchQuery
-include/KF5/AkonadiCore/SelectionProxyModel
-include/KF5/AkonadiCore/ServerManager
-include/KF5/AkonadiCore/Session
-include/KF5/AkonadiCore/SpecialCollectionAttribute
-include/KF5/AkonadiCore/SpecialCollections
-include/KF5/AkonadiCore/SpecialCollectionsDiscoveryJob
-include/KF5/AkonadiCore/SpecialCollectionsRequestJob
-include/KF5/AkonadiCore/StatisticsProxyModel
-include/KF5/AkonadiCore/Supertrait
-include/KF5/AkonadiCore/Tag
-include/KF5/AkonadiCore/TagAttribute
-include/KF5/AkonadiCore/TagCreateJob
-include/KF5/AkonadiCore/TagDeleteJob
-include/KF5/AkonadiCore/TagFetchJob
-include/KF5/AkonadiCore/TagFetchScope
-include/KF5/AkonadiCore/TagModel
-include/KF5/AkonadiCore/TagModifyJob
-include/KF5/AkonadiCore/TransactionJobs
-include/KF5/AkonadiCore/TransactionSequence
-include/KF5/AkonadiCore/TrashFilterProxyModel
-include/KF5/AkonadiCore/TrashJob
-include/KF5/AkonadiCore/TrashRestoreJob
-include/KF5/AkonadiCore/TrashSettings
-include/KF5/AkonadiCore/UnlinkJob
-include/KF5/AkonadiCore/VectorHelper
-include/KF5/AkonadiCore/abstractdifferencesreporter.h
-include/KF5/AkonadiCore/agentconfigurationbase.h
-include/KF5/AkonadiCore/agentconfigurationfactorybase.h
-include/KF5/AkonadiCore/agentfilterproxymodel.h
-include/KF5/AkonadiCore/agentinstance.h
-include/KF5/AkonadiCore/agentinstancecreatejob.h
-include/KF5/AkonadiCore/agentinstancemodel.h
-include/KF5/AkonadiCore/agentmanager.h
-include/KF5/AkonadiCore/agenttype.h
-include/KF5/AkonadiCore/agenttypemodel.h
-include/KF5/AkonadiCore/akonadicore_export.h
-include/KF5/AkonadiCore/attribute.h
-include/KF5/AkonadiCore/attributefactory.h
-include/KF5/AkonadiCore/cachepolicy.h
-include/KF5/AkonadiCore/changenotification.h
-include/KF5/AkonadiCore/changerecorder.h
-include/KF5/AkonadiCore/collection.h
-include/KF5/AkonadiCore/collectionattributessynchronizationjob.h
-include/KF5/AkonadiCore/collectioncolorattribute.h
-include/KF5/AkonadiCore/collectioncopyjob.h
-include/KF5/AkonadiCore/collectioncreatejob.h
-include/KF5/AkonadiCore/collectiondeletejob.h
-include/KF5/AkonadiCore/collectionfetchjob.h
-include/KF5/AkonadiCore/collectionfetchscope.h
-include/KF5/AkonadiCore/collectionfilterproxymodel.h
-include/KF5/AkonadiCore/collectionidentificationattribute.h
-include/KF5/AkonadiCore/collectionmodifyjob.h
-include/KF5/AkonadiCore/collectionmovejob.h
-include/KF5/AkonadiCore/collectionpathresolver.h
-include/KF5/AkonadiCore/collectionquotaattribute.h
-include/KF5/AkonadiCore/collectionstatistics.h
-include/KF5/AkonadiCore/collectionstatisticsjob.h
-include/KF5/AkonadiCore/collectionutils.h
-include/KF5/AkonadiCore/config-akonadi.h
-include/KF5/AkonadiCore/control.h
-include/KF5/AkonadiCore/differencesalgorithminterface.h
-include/KF5/AkonadiCore/entityannotationsattribute.h
-include/KF5/AkonadiCore/entitydeletedattribute.h
-include/KF5/AkonadiCore/entitydisplayattribute.h
-include/KF5/AkonadiCore/entityhiddenattribute.h
-include/KF5/AkonadiCore/entitymimetypefiltermodel.h
-include/KF5/AkonadiCore/entityorderproxymodel.h
-include/KF5/AkonadiCore/entityrightsfiltermodel.h
-include/KF5/AkonadiCore/entitytreemodel.h
-include/KF5/AkonadiCore/exceptionbase.h
-include/KF5/AkonadiCore/favoritecollectionattribute.h
-include/KF5/AkonadiCore/favoritecollectionsmodel.h
-include/KF5/AkonadiCore/gidextractorinterface.h
-include/KF5/AkonadiCore/indexpolicyattribute.h
-include/KF5/AkonadiCore/item.h
-include/KF5/AkonadiCore/itemcopyjob.h
-include/KF5/AkonadiCore/itemcreatejob.h
-include/KF5/AkonadiCore/itemdeletejob.h
-include/KF5/AkonadiCore/itemfetchjob.h
-include/KF5/AkonadiCore/itemfetchscope.h
-include/KF5/AkonadiCore/itemmodifyjob.h
-include/KF5/AkonadiCore/itemmonitor.h
-include/KF5/AkonadiCore/itemmovejob.h
-include/KF5/AkonadiCore/itempayloadinternals_p.h
-include/KF5/AkonadiCore/itemsearchjob.h
-include/KF5/AkonadiCore/itemserializerplugin.h
-include/KF5/AkonadiCore/itemsync.h
-include/KF5/AkonadiCore/job.h
-include/KF5/AkonadiCore/linkjob.h
-include/KF5/AkonadiCore/mimetypechecker.h
-include/KF5/AkonadiCore/monitor.h
-include/KF5/AkonadiCore/notificationsubscriber.h
-include/KF5/AkonadiCore/partfetcher.h
-include/KF5/AkonadiCore/persistentsearchattribute.h
-include/KF5/AkonadiCore/qtest_akonadi.h
-include/KF5/AkonadiCore/recursivecollectionfilterproxymodel.h
-include/KF5/AkonadiCore/recursiveitemfetchjob.h
-include/KF5/AkonadiCore/relation.h
-include/KF5/AkonadiCore/relationcreatejob.h
-include/KF5/AkonadiCore/relationdeletejob.h
-include/KF5/AkonadiCore/relationfetchjob.h
-include/KF5/AkonadiCore/resourcesynchronizationjob.h
-include/KF5/AkonadiCore/searchcreatejob.h
-include/KF5/AkonadiCore/searchquery.h
-include/KF5/AkonadiCore/selectionproxymodel.h
-include/KF5/AkonadiCore/servermanager.h
-include/KF5/AkonadiCore/session.h
-include/KF5/AkonadiCore/specialcollectionattribute.h
-include/KF5/AkonadiCore/specialcollections.h
-include/KF5/AkonadiCore/specialcollectionsdiscoveryjob.h
-include/KF5/AkonadiCore/specialcollectionsrequestjob.h
-include/KF5/AkonadiCore/statisticsproxymodel.h
-include/KF5/AkonadiCore/supertrait.h
-include/KF5/AkonadiCore/tag.h
-include/KF5/AkonadiCore/tagattribute.h
-include/KF5/AkonadiCore/tagcreatejob.h
-include/KF5/AkonadiCore/tagdeletejob.h
-include/KF5/AkonadiCore/tagfetchjob.h
-include/KF5/AkonadiCore/tagfetchscope.h
-include/KF5/AkonadiCore/tagmodel.h
-include/KF5/AkonadiCore/tagmodifyjob.h
-include/KF5/AkonadiCore/transactionjobs.h
-include/KF5/AkonadiCore/transactionsequence.h
-include/KF5/AkonadiCore/trashfilterproxymodel.h
-include/KF5/AkonadiCore/trashjob.h
-include/KF5/AkonadiCore/trashrestorejob.h
-include/KF5/AkonadiCore/trashsettings.h
-include/KF5/AkonadiCore/unlinkjob.h
-include/KF5/AkonadiCore/vectorhelper.h
-include/KF5/AkonadiWidgets/AgentActionManager
-include/KF5/AkonadiWidgets/AgentConfigurationDialog
-include/KF5/AkonadiWidgets/AgentConfigurationWidget
-include/KF5/AkonadiWidgets/AgentInstanceWidget
-include/KF5/AkonadiWidgets/AgentTypeDialog
-include/KF5/AkonadiWidgets/AgentTypeWidget
-include/KF5/AkonadiWidgets/CollectionComboBox
-include/KF5/AkonadiWidgets/CollectionDialog
-include/KF5/AkonadiWidgets/CollectionMaintenancePage
-include/KF5/AkonadiWidgets/CollectionPropertiesDialog
-include/KF5/AkonadiWidgets/CollectionPropertiesPage
-include/KF5/AkonadiWidgets/CollectionRequester
-include/KF5/AkonadiWidgets/CollectionStatisticsDelegate
-include/KF5/AkonadiWidgets/CollectionView
-include/KF5/AkonadiWidgets/ControlGui
-include/KF5/AkonadiWidgets/ETMViewStateSaver
-include/KF5/AkonadiWidgets/EntityListView
-include/KF5/AkonadiWidgets/EntityTreeView
-include/KF5/AkonadiWidgets/ItemView
-include/KF5/AkonadiWidgets/ManageAccountWidget
-include/KF5/AkonadiWidgets/StandardActionManager
-include/KF5/AkonadiWidgets/SubscriptionDialog
-include/KF5/AkonadiWidgets/TagEditWidget
-include/KF5/AkonadiWidgets/TagManagementDialog
-include/KF5/AkonadiWidgets/TagSelectWidget
-include/KF5/AkonadiWidgets/TagSelectionComboBox
-include/KF5/AkonadiWidgets/TagSelectionDialog
-include/KF5/AkonadiWidgets/TagWidget
-include/KF5/AkonadiWidgets/agentactionmanager.h
-include/KF5/AkonadiWidgets/agentconfigurationdialog.h
-include/KF5/AkonadiWidgets/agentconfigurationwidget.h
-include/KF5/AkonadiWidgets/agentinstancewidget.h
-include/KF5/AkonadiWidgets/agenttypedialog.h
-include/KF5/AkonadiWidgets/agenttypewidget.h
-include/KF5/AkonadiWidgets/akonadiwidgets_export.h
-include/KF5/AkonadiWidgets/collectioncombobox.h
-include/KF5/AkonadiWidgets/collectiondialog.h
-include/KF5/AkonadiWidgets/collectionmaintenancepage.h
-include/KF5/AkonadiWidgets/collectionpropertiesdialog.h
-include/KF5/AkonadiWidgets/collectionpropertiespage.h
-include/KF5/AkonadiWidgets/collectionrequester.h
-include/KF5/AkonadiWidgets/collectionstatisticsdelegate.h
-include/KF5/AkonadiWidgets/collectionview.h
-include/KF5/AkonadiWidgets/controlgui.h
-include/KF5/AkonadiWidgets/entitylistview.h
-include/KF5/AkonadiWidgets/entitytreeview.h
-include/KF5/AkonadiWidgets/etmviewstatesaver.h
-include/KF5/AkonadiWidgets/itemview.h
-include/KF5/AkonadiWidgets/manageaccountwidget.h
-include/KF5/AkonadiWidgets/standardactionmanager.h
-include/KF5/AkonadiWidgets/subscriptiondialog.h
-include/KF5/AkonadiWidgets/tageditwidget.h
-include/KF5/AkonadiWidgets/tagmanagementdialog.h
-include/KF5/AkonadiWidgets/tagselectioncombobox.h
-include/KF5/AkonadiWidgets/tagselectiondialog.h
-include/KF5/AkonadiWidgets/tagselectwidget.h
-include/KF5/AkonadiWidgets/tagwidget.h
-include/KF5/AkonadiXml/XmlDocument
-include/KF5/AkonadiXml/XmlReader
-include/KF5/AkonadiXml/XmlWriteJob
-include/KF5/AkonadiXml/XmlWriter
-include/KF5/AkonadiXml/akonadi-xml_export.h
-include/KF5/AkonadiXml/xmldocument.h
-include/KF5/AkonadiXml/xmlreader.h
-include/KF5/AkonadiXml/xmlwritejob.h
-include/KF5/AkonadiXml/xmlwriter.h
-include/KF5/akonadi/abstractsearchplugin.h
-include/KF5/akonadi/private/akonadiprivate_export.h
-include/KF5/akonadi/private/capabilities_p.h
-include/KF5/akonadi/private/compressionstream_p.h
-include/KF5/akonadi/private/dbus_p.h
-include/KF5/akonadi/private/externalpartstorage_p.h
-include/KF5/akonadi/private/imapparser_p.h
-include/KF5/akonadi/private/imapset_p.h
-include/KF5/akonadi/private/instance_p.h
-include/KF5/akonadi/private/protocol_exception_p.h
-include/KF5/akonadi/private/protocol_gen.h
-include/KF5/akonadi/private/protocol_p.h
-include/KF5/akonadi/private/scope_p.h
-include/KF5/akonadi/private/standarddirs_p.h
-include/KF5/akonadi/private/tristate_p.h
-include/KF5/akonadi_version.h
+include/KPim5/Akonadi/akonadi/private/akonadiprivate_export.h
+include/KPim5/Akonadi/akonadi/private/capabilities_p.h
+include/KPim5/Akonadi/akonadi/private/compressionstream_p.h
+include/KPim5/Akonadi/akonadi/private/dbus_p.h
+include/KPim5/Akonadi/akonadi/private/externalpartstorage_p.h
+include/KPim5/Akonadi/akonadi/private/imapparser_p.h
+include/KPim5/Akonadi/akonadi/private/imapset_p.h
+include/KPim5/Akonadi/akonadi/private/instance_p.h
+include/KPim5/Akonadi/akonadi/private/protocol_exception_p.h
+include/KPim5/Akonadi/akonadi/private/protocol_gen.h
+include/KPim5/Akonadi/akonadi/private/protocol_p.h
+include/KPim5/Akonadi/akonadi/private/scope_p.h
+include/KPim5/Akonadi/akonadi/private/standarddirs_p.h
+include/KPim5/Akonadi/akonadi/private/tristate_p.h
+include/KPim5/AkonadiAgentBase/Akonadi/AccountsIntegration
+include/KPim5/AkonadiAgentBase/Akonadi/AgentBase
+include/KPim5/AkonadiAgentBase/Akonadi/AgentSearchInterface
+include/KPim5/AkonadiAgentBase/Akonadi/PreprocessorBase
+include/KPim5/AkonadiAgentBase/Akonadi/ResourceBase
+include/KPim5/AkonadiAgentBase/Akonadi/ResourceSettings
+include/KPim5/AkonadiAgentBase/Akonadi/TransportResourceBase
+include/KPim5/AkonadiAgentBase/akonadi/accountsintegration.h
+include/KPim5/AkonadiAgentBase/akonadi/agentbase.h
+include/KPim5/AkonadiAgentBase/akonadi/agentsearchinterface.h
+include/KPim5/AkonadiAgentBase/akonadi/akonadiagentbase_export.h
+include/KPim5/AkonadiAgentBase/akonadi/preprocessorbase.h
+include/KPim5/AkonadiAgentBase/akonadi/resourcebase.h
+include/KPim5/AkonadiAgentBase/akonadi/resourcebasesettings.h
+include/KPim5/AkonadiAgentBase/akonadi/resourcesettings.h
+include/KPim5/AkonadiAgentBase/akonadi/transportresourcebase.h
+include/KPim5/AkonadiCore/Akonadi/AbstractDifferencesReporter
+include/KPim5/AkonadiCore/Akonadi/AgentConfigurationBase
+include/KPim5/AkonadiCore/Akonadi/AgentConfigurationFactoryBase
+include/KPim5/AkonadiCore/Akonadi/AgentFilterProxyModel
+include/KPim5/AkonadiCore/Akonadi/AgentInstance
+include/KPim5/AkonadiCore/Akonadi/AgentInstanceCreateJob
+include/KPim5/AkonadiCore/Akonadi/AgentInstanceModel
+include/KPim5/AkonadiCore/Akonadi/AgentManager
+include/KPim5/AkonadiCore/Akonadi/AgentType
+include/KPim5/AkonadiCore/Akonadi/AgentTypeModel
+include/KPim5/AkonadiCore/Akonadi/Attribute
+include/KPim5/AkonadiCore/Akonadi/AttributeFactory
+include/KPim5/AkonadiCore/Akonadi/CachePolicy
+include/KPim5/AkonadiCore/Akonadi/ChangeNotification
+include/KPim5/AkonadiCore/Akonadi/ChangeRecorder
+include/KPim5/AkonadiCore/Akonadi/Collection
+include/KPim5/AkonadiCore/Akonadi/CollectionAnnotationsAttribute
+include/KPim5/AkonadiCore/Akonadi/CollectionAttributesSynchronizationJob
+include/KPim5/AkonadiCore/Akonadi/CollectionColorAttribute
+include/KPim5/AkonadiCore/Akonadi/CollectionCopyJob
+include/KPim5/AkonadiCore/Akonadi/CollectionCreateJob
+include/KPim5/AkonadiCore/Akonadi/CollectionDeleteJob
+include/KPim5/AkonadiCore/Akonadi/CollectionFetchJob
+include/KPim5/AkonadiCore/Akonadi/CollectionFetchScope
+include/KPim5/AkonadiCore/Akonadi/CollectionFilterProxyModel
+include/KPim5/AkonadiCore/Akonadi/CollectionIdentificationAttribute
+include/KPim5/AkonadiCore/Akonadi/CollectionModifyJob
+include/KPim5/AkonadiCore/Akonadi/CollectionMoveJob
+include/KPim5/AkonadiCore/Akonadi/CollectionPathResolver
+include/KPim5/AkonadiCore/Akonadi/CollectionQuotaAttribute
+include/KPim5/AkonadiCore/Akonadi/CollectionStatistics
+include/KPim5/AkonadiCore/Akonadi/CollectionStatisticsJob
+include/KPim5/AkonadiCore/Akonadi/CollectionUtils
+include/KPim5/AkonadiCore/Akonadi/Control
+include/KPim5/AkonadiCore/Akonadi/DifferencesAlgorithmInterface
+include/KPim5/AkonadiCore/Akonadi/EntityAnnotationsAttribute
+include/KPim5/AkonadiCore/Akonadi/EntityDeletedAttribute
+include/KPim5/AkonadiCore/Akonadi/EntityDisplayAttribute
+include/KPim5/AkonadiCore/Akonadi/EntityHiddenAttribute
+include/KPim5/AkonadiCore/Akonadi/EntityMimeTypeFilterModel
+include/KPim5/AkonadiCore/Akonadi/EntityOrderProxyModel
+include/KPim5/AkonadiCore/Akonadi/EntityRightsFilterModel
+include/KPim5/AkonadiCore/Akonadi/EntityTreeModel
+include/KPim5/AkonadiCore/Akonadi/ExceptionBase
+include/KPim5/AkonadiCore/Akonadi/FavoriteCollectionAttribute
+include/KPim5/AkonadiCore/Akonadi/FavoriteCollectionsModel
+include/KPim5/AkonadiCore/Akonadi/GidExtractorInterface
+include/KPim5/AkonadiCore/Akonadi/IndexPolicyAttribute
+include/KPim5/AkonadiCore/Akonadi/Item
+include/KPim5/AkonadiCore/Akonadi/ItemCopyJob
+include/KPim5/AkonadiCore/Akonadi/ItemCreateJob
+include/KPim5/AkonadiCore/Akonadi/ItemDeleteJob
+include/KPim5/AkonadiCore/Akonadi/ItemFetchJob
+include/KPim5/AkonadiCore/Akonadi/ItemFetchScope
+include/KPim5/AkonadiCore/Akonadi/ItemModifyJob
+include/KPim5/AkonadiCore/Akonadi/ItemMonitor
+include/KPim5/AkonadiCore/Akonadi/ItemMoveJob
+include/KPim5/AkonadiCore/Akonadi/ItemSearchJob
+include/KPim5/AkonadiCore/Akonadi/ItemSerializerPlugin
+include/KPim5/AkonadiCore/Akonadi/ItemSync
+include/KPim5/AkonadiCore/Akonadi/Job
+include/KPim5/AkonadiCore/Akonadi/LinkJob
+include/KPim5/AkonadiCore/Akonadi/MimeTypeChecker
+include/KPim5/AkonadiCore/Akonadi/Monitor
+include/KPim5/AkonadiCore/Akonadi/NotificationSubscriber
+include/KPim5/AkonadiCore/Akonadi/PartFetcher
+include/KPim5/AkonadiCore/Akonadi/PersistentSearchAttribute
+include/KPim5/AkonadiCore/Akonadi/RecursiveCollectionFilterProxyModel
+include/KPim5/AkonadiCore/Akonadi/RecursiveItemFetchJob
+include/KPim5/AkonadiCore/Akonadi/Relation
+include/KPim5/AkonadiCore/Akonadi/RelationCreateJob
+include/KPim5/AkonadiCore/Akonadi/RelationDeleteJob
+include/KPim5/AkonadiCore/Akonadi/RelationFetchJob
+include/KPim5/AkonadiCore/Akonadi/ResourceSynchronizationJob
+include/KPim5/AkonadiCore/Akonadi/SearchCreateJob
+include/KPim5/AkonadiCore/Akonadi/SearchQuery
+include/KPim5/AkonadiCore/Akonadi/SelectionProxyModel
+include/KPim5/AkonadiCore/Akonadi/ServerManager
+include/KPim5/AkonadiCore/Akonadi/Session
+include/KPim5/AkonadiCore/Akonadi/SpecialCollectionAttribute
+include/KPim5/AkonadiCore/Akonadi/SpecialCollections
+include/KPim5/AkonadiCore/Akonadi/SpecialCollectionsDiscoveryJob
+include/KPim5/AkonadiCore/Akonadi/SpecialCollectionsRequestJob
+include/KPim5/AkonadiCore/Akonadi/StatisticsProxyModel
+include/KPim5/AkonadiCore/Akonadi/Supertrait
+include/KPim5/AkonadiCore/Akonadi/Tag
+include/KPim5/AkonadiCore/Akonadi/TagAttribute
+include/KPim5/AkonadiCore/Akonadi/TagCache
+include/KPim5/AkonadiCore/Akonadi/TagCreateJob
+include/KPim5/AkonadiCore/Akonadi/TagDeleteJob
+include/KPim5/AkonadiCore/Akonadi/TagFetchJob
+include/KPim5/AkonadiCore/Akonadi/TagFetchScope
+include/KPim5/AkonadiCore/Akonadi/TagModel
+include/KPim5/AkonadiCore/Akonadi/TagModifyJob
+include/KPim5/AkonadiCore/Akonadi/TransactionJobs
+include/KPim5/AkonadiCore/Akonadi/TransactionSequence
+include/KPim5/AkonadiCore/Akonadi/TrashFilterProxyModel
+include/KPim5/AkonadiCore/Akonadi/TrashJob
+include/KPim5/AkonadiCore/Akonadi/TrashRestoreJob
+include/KPim5/AkonadiCore/Akonadi/TrashSettings
+include/KPim5/AkonadiCore/Akonadi/UnlinkJob
+include/KPim5/AkonadiCore/Akonadi/VectorHelper
+include/KPim5/AkonadiCore/akonadi/abstractdifferencesreporter.h
+include/KPim5/AkonadiCore/akonadi/abstractsearchplugin.h
+include/KPim5/AkonadiCore/akonadi/agentconfigurationbase.h
+include/KPim5/AkonadiCore/akonadi/agentconfigurationfactorybase.h
+include/KPim5/AkonadiCore/akonadi/agentfilterproxymodel.h
+include/KPim5/AkonadiCore/akonadi/agentinstance.h
+include/KPim5/AkonadiCore/akonadi/agentinstancecreatejob.h
+include/KPim5/AkonadiCore/akonadi/agentinstancemodel.h
+include/KPim5/AkonadiCore/akonadi/agentmanager.h
+include/KPim5/AkonadiCore/akonadi/agenttype.h
+include/KPim5/AkonadiCore/akonadi/agenttypemodel.h
+include/KPim5/AkonadiCore/akonadi/akonadicore_export.h
+include/KPim5/AkonadiCore/akonadi/attribute.h
+include/KPim5/AkonadiCore/akonadi/attributefactory.h
+include/KPim5/AkonadiCore/akonadi/cachepolicy.h
+include/KPim5/AkonadiCore/akonadi/changenotification.h
+include/KPim5/AkonadiCore/akonadi/changerecorder.h
+include/KPim5/AkonadiCore/akonadi/collection.h
+include/KPim5/AkonadiCore/akonadi/collectionannotationsattribute.h
+include/KPim5/AkonadiCore/akonadi/collectionattributessynchronizationjob.h
+include/KPim5/AkonadiCore/akonadi/collectioncolorattribute.h
+include/KPim5/AkonadiCore/akonadi/collectioncopyjob.h
+include/KPim5/AkonadiCore/akonadi/collectioncreatejob.h
+include/KPim5/AkonadiCore/akonadi/collectiondeletejob.h
+include/KPim5/AkonadiCore/akonadi/collectionfetchjob.h
+include/KPim5/AkonadiCore/akonadi/collectionfetchscope.h
+include/KPim5/AkonadiCore/akonadi/collectionfilterproxymodel.h
+include/KPim5/AkonadiCore/akonadi/collectionidentificationattribute.h
+include/KPim5/AkonadiCore/akonadi/collectionmodifyjob.h
+include/KPim5/AkonadiCore/akonadi/collectionmovejob.h
+include/KPim5/AkonadiCore/akonadi/collectionpathresolver.h
+include/KPim5/AkonadiCore/akonadi/collectionquotaattribute.h
+include/KPim5/AkonadiCore/akonadi/collectionstatistics.h
+include/KPim5/AkonadiCore/akonadi/collectionstatisticsjob.h
+include/KPim5/AkonadiCore/akonadi/collectionutils.h
+include/KPim5/AkonadiCore/akonadi/config-akonadi.h
+include/KPim5/AkonadiCore/akonadi/control.h
+include/KPim5/AkonadiCore/akonadi/differencesalgorithminterface.h
+include/KPim5/AkonadiCore/akonadi/entityannotationsattribute.h
+include/KPim5/AkonadiCore/akonadi/entitydeletedattribute.h
+include/KPim5/AkonadiCore/akonadi/entitydisplayattribute.h
+include/KPim5/AkonadiCore/akonadi/entityhiddenattribute.h
+include/KPim5/AkonadiCore/akonadi/entitymimetypefiltermodel.h
+include/KPim5/AkonadiCore/akonadi/entityorderproxymodel.h
+include/KPim5/AkonadiCore/akonadi/entityrightsfiltermodel.h
+include/KPim5/AkonadiCore/akonadi/entitytreemodel.h
+include/KPim5/AkonadiCore/akonadi/exceptionbase.h
+include/KPim5/AkonadiCore/akonadi/favoritecollectionattribute.h
+include/KPim5/AkonadiCore/akonadi/favoritecollectionsmodel.h
+include/KPim5/AkonadiCore/akonadi/gidextractorinterface.h
+include/KPim5/AkonadiCore/akonadi/indexpolicyattribute.h
+include/KPim5/AkonadiCore/akonadi/item.h
+include/KPim5/AkonadiCore/akonadi/itemcopyjob.h
+include/KPim5/AkonadiCore/akonadi/itemcreatejob.h
+include/KPim5/AkonadiCore/akonadi/itemdeletejob.h
+include/KPim5/AkonadiCore/akonadi/itemfetchjob.h
+include/KPim5/AkonadiCore/akonadi/itemfetchscope.h
+include/KPim5/AkonadiCore/akonadi/itemmodifyjob.h
+include/KPim5/AkonadiCore/akonadi/itemmonitor.h
+include/KPim5/AkonadiCore/akonadi/itemmovejob.h
+include/KPim5/AkonadiCore/akonadi/itempayloadinternals_p.h
+include/KPim5/AkonadiCore/akonadi/itemsearchjob.h
+include/KPim5/AkonadiCore/akonadi/itemserializerplugin.h
+include/KPim5/AkonadiCore/akonadi/itemsync.h
+include/KPim5/AkonadiCore/akonadi/job.h
+include/KPim5/AkonadiCore/akonadi/linkjob.h
+include/KPim5/AkonadiCore/akonadi/mimetypechecker.h
+include/KPim5/AkonadiCore/akonadi/monitor.h
+include/KPim5/AkonadiCore/akonadi/notificationsubscriber.h
+include/KPim5/AkonadiCore/akonadi/partfetcher.h
+include/KPim5/AkonadiCore/akonadi/persistentsearchattribute.h
+include/KPim5/AkonadiCore/akonadi/qtest_akonadi.h
+include/KPim5/AkonadiCore/akonadi/recursivecollectionfilterproxymodel.h
+include/KPim5/AkonadiCore/akonadi/recursiveitemfetchjob.h
+include/KPim5/AkonadiCore/akonadi/relation.h
+include/KPim5/AkonadiCore/akonadi/relationcreatejob.h
+include/KPim5/AkonadiCore/akonadi/relationdeletejob.h
+include/KPim5/AkonadiCore/akonadi/relationfetchjob.h
+include/KPim5/AkonadiCore/akonadi/resourcesynchronizationjob.h
+include/KPim5/AkonadiCore/akonadi/searchcreatejob.h
+include/KPim5/AkonadiCore/akonadi/searchquery.h
+include/KPim5/AkonadiCore/akonadi/selectionproxymodel.h
+include/KPim5/AkonadiCore/akonadi/servermanager.h
+include/KPim5/AkonadiCore/akonadi/session.h
+include/KPim5/AkonadiCore/akonadi/specialcollectionattribute.h
+include/KPim5/AkonadiCore/akonadi/specialcollections.h
+include/KPim5/AkonadiCore/akonadi/specialcollectionsdiscoveryjob.h
+include/KPim5/AkonadiCore/akonadi/specialcollectionsrequestjob.h
+include/KPim5/AkonadiCore/akonadi/statisticsproxymodel.h
+include/KPim5/AkonadiCore/akonadi/supertrait.h
+include/KPim5/AkonadiCore/akonadi/tag.h
+include/KPim5/AkonadiCore/akonadi/tagattribute.h
+include/KPim5/AkonadiCore/akonadi/tagcache.h
+include/KPim5/AkonadiCore/akonadi/tagcreatejob.h
+include/KPim5/AkonadiCore/akonadi/tagdeletejob.h
+include/KPim5/AkonadiCore/akonadi/tagfetchjob.h
+include/KPim5/AkonadiCore/akonadi/tagfetchscope.h
+include/KPim5/AkonadiCore/akonadi/tagmodel.h
+include/KPim5/AkonadiCore/akonadi/tagmodifyjob.h
+include/KPim5/AkonadiCore/akonadi/transactionjobs.h
+include/KPim5/AkonadiCore/akonadi/transactionsequence.h
+include/KPim5/AkonadiCore/akonadi/trashfilterproxymodel.h
+include/KPim5/AkonadiCore/akonadi/trashjob.h
+include/KPim5/AkonadiCore/akonadi/trashrestorejob.h
+include/KPim5/AkonadiCore/akonadi/trashsettings.h
+include/KPim5/AkonadiCore/akonadi/unlinkjob.h
+include/KPim5/AkonadiCore/akonadi/vectorhelper.h
+include/KPim5/AkonadiCore/akonadi_version.h
+include/KPim5/AkonadiWidgets/Akonadi/AgentActionManager
+include/KPim5/AkonadiWidgets/Akonadi/AgentConfigurationDialog
+include/KPim5/AkonadiWidgets/Akonadi/AgentConfigurationWidget
+include/KPim5/AkonadiWidgets/Akonadi/AgentInstanceWidget
+include/KPim5/AkonadiWidgets/Akonadi/AgentTypeDialog
+include/KPim5/AkonadiWidgets/Akonadi/AgentTypeWidget
+include/KPim5/AkonadiWidgets/Akonadi/ClearCacheFoldersJob
+include/KPim5/AkonadiWidgets/Akonadi/CollectionComboBox
+include/KPim5/AkonadiWidgets/Akonadi/CollectionDialog
+include/KPim5/AkonadiWidgets/Akonadi/CollectionMaintenancePage
+include/KPim5/AkonadiWidgets/Akonadi/CollectionPropertiesDialog
+include/KPim5/AkonadiWidgets/Akonadi/CollectionPropertiesPage
+include/KPim5/AkonadiWidgets/Akonadi/CollectionRequester
+include/KPim5/AkonadiWidgets/Akonadi/CollectionStatisticsDelegate
+include/KPim5/AkonadiWidgets/Akonadi/ControlGui
+include/KPim5/AkonadiWidgets/Akonadi/DbAccess
+include/KPim5/AkonadiWidgets/Akonadi/ETMViewStateSaver
+include/KPim5/AkonadiWidgets/Akonadi/EntityListView
+include/KPim5/AkonadiWidgets/Akonadi/EntityTreeView
+include/KPim5/AkonadiWidgets/Akonadi/ManageAccountWidget
+include/KPim5/AkonadiWidgets/Akonadi/StandardActionManager
+include/KPim5/AkonadiWidgets/Akonadi/SubscriptionDialog
+include/KPim5/AkonadiWidgets/Akonadi/TagEditWidget
+include/KPim5/AkonadiWidgets/Akonadi/TagManagementDialog
+include/KPim5/AkonadiWidgets/Akonadi/TagSelectWidget
+include/KPim5/AkonadiWidgets/Akonadi/TagSelectionComboBox
+include/KPim5/AkonadiWidgets/Akonadi/TagSelectionDialog
+include/KPim5/AkonadiWidgets/Akonadi/TagWidget
+include/KPim5/AkonadiWidgets/akonadi/agentactionmanager.h
+include/KPim5/AkonadiWidgets/akonadi/agentconfigurationdialog.h
+include/KPim5/AkonadiWidgets/akonadi/agentconfigurationwidget.h
+include/KPim5/AkonadiWidgets/akonadi/agentinstancewidget.h
+include/KPim5/AkonadiWidgets/akonadi/agenttypedialog.h
+include/KPim5/AkonadiWidgets/akonadi/agenttypewidget.h
+include/KPim5/AkonadiWidgets/akonadi/akonadiwidgets_export.h
+include/KPim5/AkonadiWidgets/akonadi/clearcachefoldersjob.h
+include/KPim5/AkonadiWidgets/akonadi/collectioncombobox.h
+include/KPim5/AkonadiWidgets/akonadi/collectiondialog.h
+include/KPim5/AkonadiWidgets/akonadi/collectionmaintenancepage.h
+include/KPim5/AkonadiWidgets/akonadi/collectionpropertiesdialog.h
+include/KPim5/AkonadiWidgets/akonadi/collectionpropertiespage.h
+include/KPim5/AkonadiWidgets/akonadi/collectionrequester.h
+include/KPim5/AkonadiWidgets/akonadi/collectionstatisticsdelegate.h
+include/KPim5/AkonadiWidgets/akonadi/controlgui.h
+include/KPim5/AkonadiWidgets/akonadi/dbaccess.h
+include/KPim5/AkonadiWidgets/akonadi/entitylistview.h
+include/KPim5/AkonadiWidgets/akonadi/entitytreeview.h
+include/KPim5/AkonadiWidgets/akonadi/etmviewstatesaver.h
+include/KPim5/AkonadiWidgets/akonadi/manageaccountwidget.h
+include/KPim5/AkonadiWidgets/akonadi/standardactionmanager.h
+include/KPim5/AkonadiWidgets/akonadi/subscriptiondialog.h
+include/KPim5/AkonadiWidgets/akonadi/tageditwidget.h
+include/KPim5/AkonadiWidgets/akonadi/tagmanagementdialog.h
+include/KPim5/AkonadiWidgets/akonadi/tagselectioncombobox.h
+include/KPim5/AkonadiWidgets/akonadi/tagselectiondialog.h
+include/KPim5/AkonadiWidgets/akonadi/tagselectwidget.h
+include/KPim5/AkonadiWidgets/akonadi/tagwidget.h
+include/KPim5/AkonadiXml/Akonadi/XmlDocument
+include/KPim5/AkonadiXml/Akonadi/XmlReader
+include/KPim5/AkonadiXml/Akonadi/XmlWriteJob
+include/KPim5/AkonadiXml/Akonadi/XmlWriter
+include/KPim5/AkonadiXml/akonadi/akonadi-xml_export.h
+include/KPim5/AkonadiXml/akonadi/xmldocument.h
+include/KPim5/AkonadiXml/akonadi/xmlreader.h
+include/KPim5/AkonadiXml/akonadi/xmlwritejob.h
+include/KPim5/AkonadiXml/akonadi/xmlwriter.h
 lib/cmake/KF5Akonadi/KF5AkonadiConfig.cmake
 lib/cmake/KF5Akonadi/KF5AkonadiConfigVersion.cmake
-lib/cmake/KF5Akonadi/KF5AkonadiMacros.cmake
-lib/cmake/KF5Akonadi/KF5AkonadiTargets-%%CMAKE_BUILD_TYPE%%.cmake
-lib/cmake/KF5Akonadi/KF5AkonadiTargets.cmake
-lib/libKF5AkonadiAgentBase.so
-lib/libKF5AkonadiAgentBase.so.5
-lib/libKF5AkonadiAgentBase.so.%%KDE_APPLICATIONS_SHLIB_VER%%
-lib/libKF5AkonadiCore.so
-lib/libKF5AkonadiCore.so.5
-lib/libKF5AkonadiCore.so.%%KDE_APPLICATIONS_SHLIB_VER%%
-lib/libKF5AkonadiPrivate.so
-lib/libKF5AkonadiPrivate.so.5
-lib/libKF5AkonadiPrivate.so.%%KDE_APPLICATIONS_SHLIB_VER%%
-lib/libKF5AkonadiWidgets.so
-lib/libKF5AkonadiWidgets.so.5
-lib/libKF5AkonadiWidgets.so.%%KDE_APPLICATIONS_SHLIB_VER%%
-lib/libKF5AkonadiXml.so
-lib/libKF5AkonadiXml.so.5
-lib/libKF5AkonadiXml.so.%%KDE_APPLICATIONS_SHLIB_VER%%
+lib/cmake/KF5Akonadi/KPim5AkonadiTargets-%%CMAKE_BUILD_TYPE%%.cmake
+lib/cmake/KF5Akonadi/KPim5AkonadiTargets.cmake
+lib/cmake/KF5Akonadi/KPimAkonadiMacros.cmake
+lib/cmake/KPim5Akonadi/KPim5AkonadiConfig.cmake
+lib/cmake/KPim5Akonadi/KPim5AkonadiConfigVersion.cmake
+lib/cmake/KPim5Akonadi/KPim5AkonadiTargets-%%CMAKE_BUILD_TYPE%%.cmake
+lib/cmake/KPim5Akonadi/KPim5AkonadiTargets.cmake
+lib/cmake/KPim5Akonadi/KPimAkonadiMacros.cmake
+lib/libKPim5AkonadiAgentBase.so
+lib/libKPim5AkonadiAgentBase.so.5
+lib/libKPim5AkonadiAgentBase.so.%%KDE_APPLICATIONS_SHLIB_VER%%
+lib/libKPim5AkonadiCore.so
+lib/libKPim5AkonadiCore.so.5
+lib/libKPim5AkonadiCore.so.%%KDE_APPLICATIONS_SHLIB_VER%%
+lib/libKPim5AkonadiPrivate.so
+lib/libKPim5AkonadiPrivate.so.5
+lib/libKPim5AkonadiPrivate.so.%%KDE_APPLICATIONS_SHLIB_VER%%
+lib/libKPim5AkonadiWidgets.so
+lib/libKPim5AkonadiWidgets.so.5
+lib/libKPim5AkonadiWidgets.so.%%KDE_APPLICATIONS_SHLIB_VER%%
+lib/libKPim5AkonadiXml.so
+lib/libKPim5AkonadiXml.so.5
+lib/libKPim5AkonadiXml.so.%%KDE_APPLICATIONS_SHLIB_VER%%
 %%QT_MKSPECDIR%%/modules/qt_AkonadiAgentBase.pri
 %%QT_MKSPECDIR%%/modules/qt_AkonadiCore.pri
 %%QT_MKSPECDIR%%/modules/qt_AkonadiWidgets.pri
 %%QT_MKSPECDIR%%/modules/qt_AkonadiXml.pri
-%%QT_PLUGINDIR%%/akonadi/akonadi_test_searchplugin.so
-%%QT_PLUGINDIR%%/designer/akonadiwidgets.so
-%%SQLITE%%%%QT_PLUGINDIR%%/sqldrivers/libqsqlite3.so
+%%QT_PLUGINDIR%%/designer/akonadi5widgets.so
+%%QT_PLUGINDIR%%/pim5/akonadi/akonadi_test_searchplugin.so
 %%DATADIR%%/agents/knutresource.desktop
 share/config.kcfg/resourcebase.kcfg
 share/dbus-1/interfaces/org.freedesktop.Akonadi.Agent.Control.xml
@@ -379,6 +387,8 @@ share/locale/ar/LC_MESSAGES/libakonadi5.mo
 share/locale/az/LC_MESSAGES/akonadi_knut_resource.mo
 share/locale/az/LC_MESSAGES/libakonadi5.mo
 share/locale/be/LC_MESSAGES/libakonadi5.mo
+share/locale/bg/LC_MESSAGES/akonadi_knut_resource.mo
+share/locale/bg/LC_MESSAGES/libakonadi5.mo
 share/locale/bs/LC_MESSAGES/akonadi_knut_resource.mo
 share/locale/bs/LC_MESSAGES/libakonadi5.mo
 share/locale/ca/LC_MESSAGES/akonadi_knut_resource.mo
@@ -388,8 +398,6 @@ share/locale/ca@valencia/LC_MESSAGES/libakonadi5.mo
 share/locale/cs/LC_MESSAGES/akonadi_knut_resource.mo
 share/locale/cs/LC_MESSAGES/libakonadi5.mo
 share/locale/da/LC_MESSAGES/akonadi_knut_resource.mo
-share/locale/se/LC_MESSAGES/libakonadi5.mo
-share/locale/sq/LC_MESSAGES/akonadi_knut_resource.mo
 share/locale/da/LC_MESSAGES/libakonadi5.mo
 share/locale/de/LC_MESSAGES/akonadi_knut_resource.mo
 share/locale/de/LC_MESSAGES/libakonadi5.mo
@@ -413,14 +421,19 @@ share/locale/ga/LC_MESSAGES/akonadi_knut_resource.mo
 share/locale/ga/LC_MESSAGES/libakonadi5.mo
 share/locale/gl/LC_MESSAGES/akonadi_knut_resource.mo
 share/locale/gl/LC_MESSAGES/libakonadi5.mo
+share/locale/hsb/LC_MESSAGES/libakonadi5.mo
 share/locale/hu/LC_MESSAGES/akonadi_knut_resource.mo
 share/locale/hu/LC_MESSAGES/libakonadi5.mo
 share/locale/ia/LC_MESSAGES/akonadi_knut_resource.mo
 share/locale/ia/LC_MESSAGES/libakonadi5.mo
+share/locale/id/LC_MESSAGES/akonadi_knut_resource.mo
+share/locale/id/LC_MESSAGES/libakonadi5.mo
 share/locale/it/LC_MESSAGES/akonadi_knut_resource.mo
 share/locale/it/LC_MESSAGES/libakonadi5.mo
 share/locale/ja/LC_MESSAGES/akonadi_knut_resource.mo
 share/locale/ja/LC_MESSAGES/libakonadi5.mo
+share/locale/ka/LC_MESSAGES/akonadi_knut_resource.mo
+share/locale/ka/LC_MESSAGES/libakonadi5.mo
 share/locale/kk/LC_MESSAGES/akonadi_knut_resource.mo
 share/locale/kk/LC_MESSAGES/libakonadi5.mo
 share/locale/km/LC_MESSAGES/akonadi_knut_resource.mo
@@ -431,8 +444,11 @@ share/locale/lt/LC_MESSAGES/akonadi_knut_resource.mo
 share/locale/lt/LC_MESSAGES/libakonadi5.mo
 share/locale/lv/LC_MESSAGES/akonadi_knut_resource.mo
 share/locale/lv/LC_MESSAGES/libakonadi5.mo
+share/locale/mai/LC_MESSAGES/libakonadi5.mo
 share/locale/mr/LC_MESSAGES/akonadi_knut_resource.mo
 share/locale/mr/LC_MESSAGES/libakonadi5.mo
+share/locale/my/LC_MESSAGES/akonadi_knut_resource.mo
+share/locale/my/LC_MESSAGES/libakonadi5.mo
 share/locale/nb/LC_MESSAGES/akonadi_knut_resource.mo
 share/locale/nb/LC_MESSAGES/libakonadi5.mo
 share/locale/nds/LC_MESSAGES/akonadi_knut_resource.mo
@@ -453,14 +469,25 @@ share/locale/ro/LC_MESSAGES/akonadi_knut_resource.mo
 share/locale/ro/LC_MESSAGES/libakonadi5.mo
 share/locale/ru/LC_MESSAGES/akonadi_knut_resource.mo
 share/locale/ru/LC_MESSAGES/libakonadi5.mo
+share/locale/se/LC_MESSAGES/libakonadi5.mo
 share/locale/sk/LC_MESSAGES/akonadi_knut_resource.mo
 share/locale/sk/LC_MESSAGES/libakonadi5.mo
 share/locale/sl/LC_MESSAGES/akonadi_knut_resource.mo
 share/locale/sl/LC_MESSAGES/libakonadi5.mo
+share/locale/sq/LC_MESSAGES/akonadi_knut_resource.mo
 share/locale/sr/LC_MESSAGES/akonadi_knut_resource.mo
 share/locale/sr/LC_MESSAGES/libakonadi5.mo
+share/locale/sr@ijekavian/LC_MESSAGES/akonadi_knut_resource.mo
+share/locale/sr@ijekavian/LC_MESSAGES/libakonadi5.mo
+share/locale/sr@ijekavianlatin/LC_MESSAGES/akonadi_knut_resource.mo
+share/locale/sr@ijekavianlatin/LC_MESSAGES/libakonadi5.mo
+share/locale/sr@latin/LC_MESSAGES/akonadi_knut_resource.mo
+share/locale/sr@latin/LC_MESSAGES/libakonadi5.mo
 share/locale/sv/LC_MESSAGES/akonadi_knut_resource.mo
 share/locale/sv/LC_MESSAGES/libakonadi5.mo
+share/locale/tg/LC_MESSAGES/akonadi_knut_resource.mo
+share/locale/tg/LC_MESSAGES/libakonadi5.mo
+share/locale/th/LC_MESSAGES/libakonadi5.mo
 share/locale/tr/LC_MESSAGES/akonadi_knut_resource.mo
 share/locale/tr/LC_MESSAGES/libakonadi5.mo
 share/locale/ug/LC_MESSAGES/akonadi_knut_resource.mo
diff --git a/databases/apache-commons-dbutils/Makefile b/databases/apache-commons-dbutils/Makefile
index d40f7e9edc93..921020354caf 100644
--- a/databases/apache-commons-dbutils/Makefile
+++ b/databases/apache-commons-dbutils/Makefile
@@ -1,5 +1,3 @@
-# Created by: Michael Winking <mwfp@foldl.net>
-
 PORTNAME=	commons-dbutils
 PORTVERSION=	1.7
 CATEGORIES=	databases java
@@ -9,6 +7,7 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}-bin
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	JDBC helper library
+WWW=		https://commons.apache.org/proper/commons-dbutils/
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
diff --git a/databases/apache-commons-dbutils/pkg-descr b/databases/apache-commons-dbutils/pkg-descr
index da293d64c72e..ebefb0cf5265 100644
--- a/databases/apache-commons-dbutils/pkg-descr
+++ b/databases/apache-commons-dbutils/pkg-descr
@@ -2,5 +2,3 @@ DbUtils is a small set of classes designed to make working with JDBC easier.
 JDBC resource cleanup code is mundane, error prone work so these classes
 abstract out all of the cleanup tasks from your code leaving you with what
 you really wanted to do with JDBC in the first place: query and update data.
-
-WWW: http://jakarta.apache.org/commons/dbutils/
diff --git a/databases/apq-mysql/Makefile b/databases/apq-mysql/Makefile
deleted file mode 100644
index 24edc6848b86..000000000000
--- a/databases/apq-mysql/Makefile
+++ /dev/null
@@ -1,57 +0,0 @@
-# Created by: John Marino <marino@FreeBSD.org>
-
-PORTNAME=	apq-mysql
-PORTVERSION=	${APQ_VERSION}
-PORTREVISION=	${DRV_MYSQL_PR}
-CATEGORIES=	databases
-MASTER_SITES=	LOCAL/marino
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	APQ Ada95 MySQL database driver
-
-LICENSE=	GPLv2 GMGPL
-LICENSE_COMB=	multi
-
-BUILD_DEPENDS=	bash:shells/bash \
-		gprbuild:devel/gprbuild \
-		${LOCALBASE}/lib/gnat/apq.gpr:databases/apq
-RUN_DEPENDS=	${LOCALBASE}/lib/gnat/apq.gpr:databases/apq
-
-USES=		ada tar:bzip2 mysql
-
-IGNORE_WITH_MYSQL=	57 80 101m 102m 103m 57p 57w
-HAS_CONFIGURE=	yes
-WRKPATH=	${WRKDIR}/build
-CONFIGURE_ARGS= --prefix=${PREFIX} \
-		--disable-relocatable \
-		--work-path=${WRKPATH} \
-		--processors=${MAKE_JOBS_NUMBER}
-
-.include "${.CURDIR}/../apq/Makefile.version"
-
-post-patch:
-	@${REINPLACE_CMD} -e '/for Object_Dir/d' \
-		${WRKSRC}/src-in/apq-mysql.gpr.in
-	${REINPLACE_CMD} -e 's|processors=2|gprbuild_params="--autoconf=apq.cgpr"|' \
-		${WRKSRC}/configure
-	${REINPLACE_CMD} -e 's|-ws|-ws --autoconf=dummy.cgpr|' \
-		${WRKSRC}/scripts/buildutil.sh
-
-post-configure:
-	# The header generated with MySQL 5.6 comes with two instances of
-	# double underscore variables, which is illegal in Ada
-	${REINPLACE_CMD} -e 's|__|_|' \
-		${WRKDIR}/build/include/apq-mysql/apq-mysql.ads
-
-do-install:
-	${MKDIR} ${STAGEDIR}${PREFIX}/lib/gnat \
-		${STAGEDIR}${PREFIX}/lib/apq-mysql/static \
-		${STAGEDIR}${PREFIX}/include/apq-mysql
-	${INSTALL_DATA} ${WRKPATH}/include/apq-mysql/* \
-		${STAGEDIR}${PREFIX}/include/apq-mysql
-	${INSTALL_DATA} ${WRKPATH}/lib/apq-mysql/static/*.a* \
-		${STAGEDIR}${PREFIX}/lib/apq-mysql/static
-	${INSTALL_DATA} ${WRKPATH}/lib/gnat/apq-mysql.gpr \
-		${STAGEDIR}${PREFIX}/lib/gnat
-
-.include <bsd.port.mk>
diff --git a/databases/apq-mysql/distinfo b/databases/apq-mysql/distinfo
deleted file mode 100644
index 27be788eb72d..000000000000
--- a/databases/apq-mysql/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (apq-mysql-3.2.0.tar.bz2) = 7dfa7eaf52b2b5695f067595903fb0f5200583b462603cb707b26f11064ee358
-SIZE (apq-mysql-3.2.0.tar.bz2) = 29910
diff --git a/databases/apq-mysql/pkg-descr b/databases/apq-mysql/pkg-descr
deleted file mode 100644
index 174e248798be..000000000000
--- a/databases/apq-mysql/pkg-descr
+++ /dev/null
@@ -1,4 +0,0 @@
-APQ is a database interface library written in Ada95, and this is the
-MySQL driver that is used with it.
-
-WWW: https://bitbucket.org/kowframework/apq-mysql
diff --git a/databases/apq-mysql/pkg-plist b/databases/apq-mysql/pkg-plist
deleted file mode 100644
index db951c234389..000000000000
--- a/databases/apq-mysql/pkg-plist
+++ /dev/null
@@ -1,8 +0,0 @@
-include/apq-mysql/apq-mysql-client.adb
-include/apq-mysql/apq-mysql-client.ads
-include/apq-mysql/apq-mysql.ads
-include/apq-mysql/c_mysql.c
-lib/apq-mysql/static/apq-mysql-client.ali
-lib/apq-mysql/static/apq-mysql.ali
-lib/apq-mysql/static/libapq-mysql.a
-lib/gnat/apq-mysql.gpr
diff --git a/databases/apq-odbc/Makefile b/databases/apq-odbc/Makefile
deleted file mode 100644
index bfca9b4e9322..000000000000
--- a/databases/apq-odbc/Makefile
+++ /dev/null
@@ -1,55 +0,0 @@
-# Created by: John Marino <marino@FreeBSD.org>
-
-PORTNAME=	apq-odbc
-PORTVERSION=	${APQ_VERSION}
-PORTREVISION=	${DRV_ODBC_PR}
-CATEGORIES=	databases
-MASTER_SITES=	LOCAL/marino
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	APQ Ada95 ODBC database driver
-
-LICENSE=	GPLv2 GMGPL
-LICENSE_COMB=	multi
-
-BUILD_DEPENDS=	bash:shells/bash \
-		gprbuild:devel/gprbuild \
-		${LOCALBASE}/lib/gnat/apq.gpr:databases/apq
-RUN_DEPENDS=	${LOCALBASE}/lib/gnat/apq.gpr:databases/apq
-LIB_DEPENDS=	libodbc.so:databases/unixODBC
-
-USES=		ada tar:bzip2
-HAS_CONFIGURE=	yes
-WRKPATH=	${WRKDIR}/build
-CONFIGURE_ARGS= --prefix=${PREFIX} \
-		--disable-relocatable \
-		--work-path=${WRKPATH} \
-		--processors=${MAKE_JOBS_NUMBER}
-
-.include "${.CURDIR}/../apq/Makefile.version"
-
-post-extract:
-	${RM} ${WRKSRC}/src/test.adb
-	${ECHO} ${APQ_VERSION} > ${WRKSRC}/version
-
-post-patch:
-	${RM} ${WRKSRC}/src/*.orig
-	${REINPLACE_CMD} -e 's|"-march=x86-64",||g' -e '/for Object_Dir/d' \
-		${WRKSRC}/gnat/apq-odbc.gpr.in
-	${REINPLACE_CMD} -e 's|processors=2|gprbuild_params="--autoconf=apq.cgpr"|' \
-		${WRKSRC}/configure
-	${REINPLACE_CMD} -e 's|-ws|-ws --autoconf=dummy.cgpr|' \
-		${WRKSRC}/scripts/buildutil.sh
-
-do-install:
-	${MKDIR} ${STAGEDIR}${PREFIX}/lib/gnat \
-		${STAGEDIR}${PREFIX}/lib/apq-odbc/static \
-		${STAGEDIR}${PREFIX}/include/apq-odbc
-	${INSTALL_DATA} ${WRKPATH}/src/apq-odbc/* \
-		${STAGEDIR}${PREFIX}/include/apq-odbc
-	${INSTALL_DATA} ${WRKPATH}/lib/apq-odbc/static/*.a* \
-		${STAGEDIR}${PREFIX}/lib/apq-odbc/static
-	${INSTALL_DATA} ${WRKPATH}/lib/gnat/apq-odbc.gpr \
-		${STAGEDIR}${PREFIX}/lib/gnat
-
-.include <bsd.port.mk>
diff --git a/databases/apq-odbc/distinfo b/databases/apq-odbc/distinfo
deleted file mode 100644
index c864d2810b65..000000000000
--- a/databases/apq-odbc/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (apq-odbc-3.2.0.tar.bz2) = abdcb427d194a75eb8631ea1ff9d8d78a913cc6373971fffdd59d111bc66a808
-SIZE (apq-odbc-3.2.0.tar.bz2) = 18781
diff --git a/databases/apq-odbc/files/patch-src_odbc__lib.c b/databases/apq-odbc/files/patch-src_odbc__lib.c
deleted file mode 100644
index e0e7b28f45c5..000000000000
--- a/databases/apq-odbc/files/patch-src_odbc__lib.c
+++ /dev/null
@@ -1,61 +0,0 @@
---- src/odbc_lib.c.orig	2012-01-10 14:17:05.000000000 -0500
-+++ src/odbc_lib.c
-@@ -1,3 +1,5 @@
-+#include <stdlib.h>
-+#include <string.h>
- #include "odbc_lib.h"
- 
- 
-@@ -43,10 +45,10 @@ void login_Information_Set_Up (ODBC_Logi
- 
- int get_Login_String_Size (ODBC_Login_Information* login_Information) {
- 
-+  int total_Size = 0;
-   if (!is_Ready(login_Information))
-     return(-1);
- 
--  int total_Size = 0;
-   total_Size += strlen(login_Information->p_Formatted_User_Name);
-   total_Size += strlen(login_Information->p_Formatted_Password);
-   total_Size += strlen(login_Information->p_Formatted_Data_Source);
-@@ -75,6 +77,7 @@ int print_Login_String (ODBC_Login_Infor
-   strcat(destiny, login_Information->p_Formatted_User_Name);
-   strcat(destiny, login_Information->p_Formatted_Password);
-   strcat(destiny, login_Information->p_Formatted_Data_Source);
-+  return(0);
- }
- 
- void reset_Login_Information (ODBC_Login_Information* login_Information) {
-@@ -241,7 +244,7 @@ void connect_With_Data_Source (ODBC_Faca
- 		     + 1);
- 
-   if (SQL_SUCCEEDED(SQLDriverConnect(odbc_Facade->connection_Handle, NULL,
--				     login_String, SQL_NTS, NULL, 0, NULL,
-+                           (SQLCHAR*)login_String, SQL_NTS, NULL, 0, NULL,
- 				     SQL_DRIVER_NOPROMPT)))
-     switch_On_Connection(odbc_Facade);
- 
-@@ -273,14 +276,14 @@ ODBC_Query_Results* create_And_Run_SQL_S
- //TODO: Return error string instead of printing it?
- void p_Print_Error_Information (ODBC_Facade* odbc_Facade) {
- 
--  char ercode[6];
-+  SQLCHAR     ercode[6];
-   SQLINTEGER  err;
--  char error[250];
-+  SQLCHAR     error[250];
-   SQLSMALLINT size;
- 
-   SQLGetDiagRec(SQL_HANDLE_DBC, odbc_Facade->environment_Handle, 1, ercode,
- 		&err, error, 250, &size);
--  printf ("\n%d, %s - %s\n", err, ercode, error);
-+  printf ("\n%d, %s - %s\n", (int)err, ercode, error);
- }
- 
- 
-@@ -289,4 +292,5 @@ void p_Print_Error_Information (ODBC_Fac
- char* alloc_String (int size) {
-   char* return_Value = malloc(sizeof(char) * size);
-   *return_Value = '\0';
-+  return return_Value;
- }
diff --git a/databases/apq-odbc/files/patch-src_odbc__lib.h b/databases/apq-odbc/files/patch-src_odbc__lib.h
deleted file mode 100644
index 0ba235b168e1..000000000000
--- a/databases/apq-odbc/files/patch-src_odbc__lib.h
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/odbc_lib.h.orig	2012-01-10 14:17:05.000000000 -0500
-+++ src/odbc_lib.h
-@@ -43,7 +43,7 @@ struct odbc_login_information {
- };
- 
- //Public methods for ODBC_Login_Information.
--ODBC_Login_Information* new_ODBC_Login_Information ();
-+ODBC_Login_Information* new_ODBC_Login_Information (void);
- 
- void set_User_Name (ODBC_Login_Information* login_Information,
- 		    char* new_User_Name);
-@@ -126,7 +126,7 @@ struct odbc_facade {
-   ODBC_Login_Information* login_Information;
- };
- 
--ODBC_Facade* new_ODBC_Facade ();
-+ODBC_Facade* new_ODBC_Facade (void);
- 
- void set_Up_Environment_Handle (ODBC_Facade* odbc_Facade);
- 
diff --git a/databases/apq-odbc/pkg-descr b/databases/apq-odbc/pkg-descr
deleted file mode 100644
index 7065f7950a41..000000000000
--- a/databases/apq-odbc/pkg-descr
+++ /dev/null
@@ -1,4 +0,0 @@
-APQ is a database interface library written in Ada95, and this is the
-ODBC driver that is used with it.
-
-WWW: https://bitbucket.org/kowframework/apq-odbc
diff --git a/databases/apq-odbc/pkg-plist b/databases/apq-odbc/pkg-plist
deleted file mode 100644
index 26aeee8f8092..000000000000
--- a/databases/apq-odbc/pkg-plist
+++ /dev/null
@@ -1,10 +0,0 @@
-include/apq-odbc/apq-odbc-client.adb
-include/apq-odbc/apq-odbc-client.ads
-include/apq-odbc/apq-odbc.adb
-include/apq-odbc/apq-odbc.ads
-include/apq-odbc/odbc_lib.c
-include/apq-odbc/odbc_lib.h
-lib/apq-odbc/static/apq-odbc-client.ali
-lib/apq-odbc/static/apq-odbc.ali
-lib/apq-odbc/static/libapq-odbc.a
-lib/gnat/apq-odbc.gpr
diff --git a/databases/apq-pgsql/Makefile b/databases/apq-pgsql/Makefile
deleted file mode 100644
index 7f39a33ebaa9..000000000000
--- a/databases/apq-pgsql/Makefile
+++ /dev/null
@@ -1,51 +0,0 @@
-# Created by: John Marino <marino@FreeBSD.org>
-
-PORTNAME=	apq-pgsql
-PORTVERSION=	${APQ_VERSION}
-PORTREVISION=	${DRV_PGSQL_PR}
-CATEGORIES=	databases
-MASTER_SITES=	LOCAL/marino
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	APQ Ada95 PostgreSQL database driver
-
-LICENSE=	GPLv2 GMGPL
-LICENSE_COMB=	multi
-
-BUILD_DEPENDS=	bash:shells/bash \
-		gprbuild:devel/gprbuild \
-		${LOCALBASE}/lib/gnat/apq.gpr:databases/apq
-RUN_DEPENDS=	${LOCALBASE}/lib/gnat/apq.gpr:databases/apq
-
-USES=		ada tar:bzip2 pgsql
-WANT_PGSQL=	lib
-HAS_CONFIGURE=	yes
-WRKPATH=	${WRKDIR}/build
-CONFIGURE_ARGS= --prefix=${PREFIX} \
-		--disable-relocatable \
-		--work-path=${WRKPATH} \
-		--processors=${MAKE_JOBS_NUMBER}
-
-.include "${.CURDIR}/../apq/Makefile.version"
-
-post-patch:
-	${RM} ${WRKSRC}/src/*.orig
-	@${REINPLACE_CMD} -e '/for Object_Dir/d' \
-		${WRKSRC}/src-in/apq-postgresql.gpr.in
-	${REINPLACE_CMD} -e 's|processors=2|gprbuild_params="--autoconf=apq.cgpr"|' \
-		${WRKSRC}/configure
-	${REINPLACE_CMD} -e 's|-ws|-ws --autoconf=dummy.cgpr|' \
-		${WRKSRC}/scripts/buildutil.sh
-
-do-install:
-	${MKDIR} ${STAGEDIR}${PREFIX}/lib/gnat \
-		${STAGEDIR}${PREFIX}/lib/apq-postgresql/static \
-		${STAGEDIR}${PREFIX}/include/apq-postgresql
-	${INSTALL_DATA} ${WRKPATH}/include/apq-postgresql/* \
-		${STAGEDIR}${PREFIX}/include/apq-postgresql
-	${INSTALL_DATA} ${WRKPATH}/lib/apq-postgresql/static/*.a* \
-		${STAGEDIR}${PREFIX}/lib/apq-postgresql/static
-	${INSTALL_DATA} ${WRKPATH}/lib/gnat/apq-postgresql.gpr \
-		${STAGEDIR}${PREFIX}/lib/gnat
-
-.include <bsd.port.mk>
diff --git a/databases/apq-pgsql/distinfo b/databases/apq-pgsql/distinfo
deleted file mode 100644
index 487761539bd5..000000000000
--- a/databases/apq-pgsql/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (apq-pgsql-3.2.0.tar.bz2) = b2bd6b1f3eaa26fe3abb88c1d8fb408e9fcfecc02c8732428bde2236dbcb2843
-SIZE (apq-pgsql-3.2.0.tar.bz2) = 51553
diff --git a/databases/apq-pgsql/files/patch-src_notices.c b/databases/apq-pgsql/files/patch-src_notices.c
deleted file mode 100644
index 1a8a30e827f4..000000000000
--- a/databases/apq-pgsql/files/patch-src_notices.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/notices.c.orig	2012-04-26 16:10:18.000000000 -0500
-+++ src/notices.c
-@@ -31,6 +31,9 @@
- #include <stdio.h>
- #include <libpq-fe.h>
- 
-+void notice_install (PGconn *, void *);
-+void notice_uninstall (PGconn *);
-+
- /*
-  * Connection_Notify is an Ada procedure using C calling convention :
-  */
diff --git a/databases/apq-pgsql/files/patch-src_numeric.c b/databases/apq-pgsql/files/patch-src_numeric.c
deleted file mode 100644
index b39dd16344f8..000000000000
--- a/databases/apq-pgsql/files/patch-src_numeric.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/numeric.c.orig	2012-04-26 16:10:18.000000000 -0500
-+++ src/numeric.c
-@@ -30,6 +30,7 @@
- 
- #include <stdlib.h>
- #include <string.h>
-+#include <ctype.h>
- 
- #include "decimal.h"
- 
diff --git a/databases/apq-pgsql/pkg-descr b/databases/apq-pgsql/pkg-descr
deleted file mode 100644
index f821a16d91ba..000000000000
--- a/databases/apq-pgsql/pkg-descr
+++ /dev/null
@@ -1,4 +0,0 @@
-APQ is a database interface library written in Ada95, and this is the
-PostgreSQL driver that is used with it.
-
-WWW: https://bitbucket.org/kowframework/apq-postgresql
diff --git a/databases/apq-pgsql/pkg-plist b/databases/apq-pgsql/pkg-plist
deleted file mode 100644
index 9860732538de..000000000000
--- a/databases/apq-pgsql/pkg-plist
+++ /dev/null
@@ -1,16 +0,0 @@
-include/apq-postgresql/apq-postgresql-client.adb
-include/apq-postgresql/apq-postgresql-client.ads
-include/apq-postgresql/apq-postgresql-decimal.adb
-include/apq-postgresql/apq-postgresql-decimal.ads
-include/apq-postgresql/apq-postgresql.ads
-include/apq-postgresql/apq-postgresql.ads-e
-include/apq-postgresql/decimal.h
-include/apq-postgresql/notices.c
-include/apq-postgresql/numeric.c
-include/apq-postgresql/numeric.h
-include/apq-postgresql/pgtypes.h
-lib/apq-postgresql/static/apq-postgresql-client.ali
-lib/apq-postgresql/static/apq-postgresql-decimal.ali
-lib/apq-postgresql/static/apq-postgresql.ali
-lib/apq-postgresql/static/libapq-postgresql.a
-lib/gnat/apq-postgresql.gpr
diff --git a/databases/apq/Makefile b/databases/apq/Makefile
deleted file mode 100644
index f5ca7876c69d..000000000000
--- a/databases/apq/Makefile
+++ /dev/null
@@ -1,54 +0,0 @@
-# Created by: John Marino <marino@FreeBSD.org>
-
-PORTNAME=	apq
-PORTVERSION=	${APQ_VERSION}
-PORTREVISION=	${BASE_PORTREV}
-CATEGORIES=	databases
-MASTER_SITES=	LOCAL/marino
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	APQ Ada95 database base library
-
-LICENSE=	GPLv2 GMGPL
-LICENSE_COMB=	multi
-
-BUILD_DEPENDS=	bash:shells/bash \
-		gprbuild:devel/gprbuild
-
-USES=		ada tar:bzip2
-PORTDOCS=	README HISTORY
-HAS_CONFIGURE=	yes
-WRKPATH=	${WRKDIR}/build
-CONFIGURE_ARGS= --prefix=${PREFIX} \
-		--disable-relocatable \
-		--work-path=${WRKPATH} \
-		--processors=${MAKE_JOBS_NUMBER}
-
-OPTIONS_DEFINE=	DOCS
-
-.include "${.CURDIR}/Makefile.version"
-
-post-patch:
-	@${REINPLACE_CMD} -e '/for Object_Dir/d' ${WRKSRC}/gnat/apq.gpr.in
-	${REINPLACE_CMD} -e 's|processors=2|gprbuild_params="--autoconf=apq.cgpr"|' \
-		${WRKSRC}/configure
-	${REINPLACE_CMD} -e 's|-ws|-ws --autoconf=dummy.cgpr|' \
-		${WRKSRC}/scripts/buildutil.sh
-
-do-install:
-	${MKDIR} ${STAGEDIR}${PREFIX}/lib/gnat \
-		${STAGEDIR}${PREFIX}/lib/apq/static \
-		${STAGEDIR}${PREFIX}/include/apq \
-		${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${WRKPATH}/include/apq/* \
-		${STAGEDIR}${PREFIX}/include/apq
-	${INSTALL_DATA} ${WRKPATH}/lib/apq/static/*.a* \
-		${STAGEDIR}${PREFIX}/lib/apq/static
-	${INSTALL_DATA} ${WRKPATH}/lib/gnat/apq.gpr \
-		${STAGEDIR}${PREFIX}/lib/gnat
-
-do-install-DOCS-on:
-	${INSTALL_DATA} ${WRKSRC}/README ${WRKSRC}/HISTORY \
-		${STAGEDIR}${DOCSDIR}
-
-.include <bsd.port.mk>
diff --git a/databases/apq/Makefile.version b/databases/apq/Makefile.version
deleted file mode 100644
index 31fcf1ccdb4e..000000000000
--- a/databases/apq/Makefile.version
+++ /dev/null
@@ -1,5 +0,0 @@
-APQ_VERSION=	3.2.0
-BASE_PORTREV=	2
-DRV_ODBC_PR=	1
-DRV_MYSQL_PR=	2
-DRV_PGSQL_PR=	3
diff --git a/databases/apq/distinfo b/databases/apq/distinfo
deleted file mode 100644
index 533cd782e53d..000000000000
--- a/databases/apq/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (apq-3.2.0.tar.bz2) = 0a5cf0ecca4a6ed103948221184d21588aacd4e43438ce35dfea4a873679a9d8
-SIZE (apq-3.2.0.tar.bz2) = 115841
diff --git a/databases/apq/pkg-descr b/databases/apq/pkg-descr
deleted file mode 100644
index 09c7cef714c0..000000000000
--- a/databases/apq/pkg-descr
+++ /dev/null
@@ -1,14 +0,0 @@
-APQ is a database interface library written in Ada95.  This is the base
-library, but it is not useful without a driver.  There are three drivers
-available for PostgreSQL, MySQL, and ODBC in separate ports.
-
-Some features:
-  * Thick binding
-  * Strong typing support
-  * Full BLOB support (PGSQL)
-  * High performance BLOB I/O via streams
-  * Full support for NULL Values
-  * Fully portable (database neutral) code possible
-  * Four levels of debug tracing
-
-WWW: https://bitbucket.org/kowframework/apq
diff --git a/databases/apq/pkg-plist b/databases/apq/pkg-plist
deleted file mode 100644
index 9639e41d152b..000000000000
--- a/databases/apq/pkg-plist
+++ /dev/null
@@ -1,8 +0,0 @@
-include/apq/apq.adb
-include/apq/apq.ads
-include/apq/apq_helper.adb
-include/apq/apq_helper.ads
-lib/apq/static/apq.ali
-lib/apq/static/apq_helper.ali
-lib/apq/static/libapq.a
-lib/gnat/apq.gpr
diff --git a/databases/arrow-glib/Makefile b/databases/arrow-glib/Makefile
new file mode 100644
index 000000000000..1a3e4722e657
--- /dev/null
+++ b/databases/arrow-glib/Makefile
@@ -0,0 +1,27 @@
+PORTNAME=	arrow
+PORTVERSION=	15.0.2
+CATEGORIES=	databases
+MASTER_SITES=	APACHE/arrow/arrow-${PORTVERSION}/
+PKGNAMESUFFIX=	-glib
+DISTNAME=	apache-arrow-${PORTVERSION}
+
+MAINTAINER=	sunpoet@FreeBSD.org
+COMMENT=	C API wrapper library for Arrow C++
+WWW=		https://arrow.apache.org/ \
+		https://github.com/apache/arrow/tree/master/c_glib
+
+LICENSE=	APACHE20
+LICENSE_FILE=	${WRKSRC}/../LICENSE.txt
+
+BUILD_DEPENDS=	arrow>=${PORTVERSION}<${PORTVERSION}_99:databases/arrow
+LIB_DEPENDS=	libarrow.so:databases/arrow
+
+USES=		compiler:c++17-lang gnome meson pkgconfig
+USE_GNOME=	introspection
+
+MESON_ARGS=	--default-library=both -Darrow_cpp_build_dir='' -Darrow_cpp_build_type='release' -Dgtk_doc=false
+WRKSRC_SUBDIR=	c_glib
+
+PLIST_SUB=	SHLIB_VER=${PORTVERSION:R:R}00.${PORTVERSION:E}.0
+
+.include <bsd.port.mk>
diff --git a/databases/arrow-glib/distinfo b/databases/arrow-glib/distinfo
new file mode 100644
index 000000000000..0ad717036e72
--- /dev/null
+++ b/databases/arrow-glib/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1711466060
+SHA256 (apache-arrow-15.0.2.tar.gz) = abbf97176db6a9e8186fe005e93320dac27c64562755c77de50a882eb6179ac6
+SIZE (apache-arrow-15.0.2.tar.gz) = 21503812
diff --git a/databases/arrow-glib/pkg-descr b/databases/arrow-glib/pkg-descr
new file mode 100644
index 000000000000..a4ed9b32b7b3
--- /dev/null
+++ b/databases/arrow-glib/pkg-descr
@@ -0,0 +1,4 @@
+Arrow GLib is a wrapper library for Arrow C++. Arrow GLib provides C API.
+
+Arrow GLib supports GObject Introspection. It means that you can create language
+bindings at runtime or compile time.
diff --git a/databases/arrow-glib/pkg-plist b/databases/arrow-glib/pkg-plist
new file mode 100644
index 000000000000..5cb5c98fc4c0
--- /dev/null
+++ b/databases/arrow-glib/pkg-plist
@@ -0,0 +1,172 @@
+include/arrow-dataset-glib/arrow-dataset-glib.h
+include/arrow-dataset-glib/arrow-dataset-glib.hpp
+include/arrow-dataset-glib/dataset-definition.h
+include/arrow-dataset-glib/dataset-factory.h
+include/arrow-dataset-glib/dataset-factory.hpp
+include/arrow-dataset-glib/dataset.h
+include/arrow-dataset-glib/dataset.hpp
+include/arrow-dataset-glib/enums.h
+include/arrow-dataset-glib/file-format.h
+include/arrow-dataset-glib/file-format.hpp
+include/arrow-dataset-glib/fragment.h
+include/arrow-dataset-glib/fragment.hpp
+include/arrow-dataset-glib/partitioning.h
+include/arrow-dataset-glib/partitioning.hpp
+include/arrow-dataset-glib/scanner.h
+include/arrow-dataset-glib/scanner.hpp
+include/arrow-glib/array-builder.h
+include/arrow-glib/array-builder.hpp
+include/arrow-glib/array.h
+include/arrow-glib/array.hpp
+include/arrow-glib/arrow-glib.h
+include/arrow-glib/arrow-glib.hpp
+include/arrow-glib/basic-array-definition.h
+include/arrow-glib/basic-array.h
+include/arrow-glib/basic-array.hpp
+include/arrow-glib/basic-data-type.h
+include/arrow-glib/basic-data-type.hpp
+include/arrow-glib/buffer.h
+include/arrow-glib/buffer.hpp
+include/arrow-glib/chunked-array-definition.h
+include/arrow-glib/chunked-array.h
+include/arrow-glib/chunked-array.hpp
+include/arrow-glib/codec.h
+include/arrow-glib/codec.hpp
+include/arrow-glib/composite-array.h
+include/arrow-glib/composite-data-type.h
+include/arrow-glib/compute-definition.h
+include/arrow-glib/compute.h
+include/arrow-glib/compute.hpp
+include/arrow-glib/data-type.h
+include/arrow-glib/data-type.hpp
+include/arrow-glib/datum.h
+include/arrow-glib/datum.hpp
+include/arrow-glib/decimal.h
+include/arrow-glib/decimal.hpp
+include/arrow-glib/enums.h
+include/arrow-glib/error.h
+include/arrow-glib/error.hpp
+include/arrow-glib/expression.h
+include/arrow-glib/expression.hpp
+include/arrow-glib/field.h
+include/arrow-glib/field.hpp
+include/arrow-glib/file-mode.h
+include/arrow-glib/file-mode.hpp
+include/arrow-glib/file-system.h
+include/arrow-glib/file-system.hpp
+include/arrow-glib/file.h
+include/arrow-glib/file.hpp
+include/arrow-glib/gobject-type.h
+include/arrow-glib/input-stream.h
+include/arrow-glib/input-stream.hpp
+include/arrow-glib/interval.h
+include/arrow-glib/interval.hpp
+include/arrow-glib/ipc-options.h
+include/arrow-glib/ipc-options.hpp
+include/arrow-glib/local-file-system.h
+include/arrow-glib/local-file-system.hpp
+include/arrow-glib/memory-pool.h
+include/arrow-glib/memory-pool.hpp
+include/arrow-glib/metadata-version.h
+include/arrow-glib/metadata-version.hpp
+include/arrow-glib/output-stream.h
+include/arrow-glib/output-stream.hpp
+include/arrow-glib/readable.h
+include/arrow-glib/readable.hpp
+include/arrow-glib/reader.h
+include/arrow-glib/reader.hpp
+include/arrow-glib/record-batch.h
+include/arrow-glib/record-batch.hpp
+include/arrow-glib/scalar.h
+include/arrow-glib/scalar.hpp
+include/arrow-glib/schema.h
+include/arrow-glib/schema.hpp
+include/arrow-glib/table-builder.h
+include/arrow-glib/table-builder.hpp
+include/arrow-glib/table.h
+include/arrow-glib/table.hpp
+include/arrow-glib/tensor.h
+include/arrow-glib/tensor.hpp
+include/arrow-glib/type.h
+include/arrow-glib/type.hpp
+include/arrow-glib/version.h
+include/arrow-glib/writable-file.h
+include/arrow-glib/writable-file.hpp
+include/arrow-glib/writable.h
+include/arrow-glib/writable.hpp
+include/arrow-glib/writer.h
+include/arrow-glib/writer.hpp
+include/gandiva-glib/enums.h
+include/gandiva-glib/expression.h
+include/gandiva-glib/expression.hpp
+include/gandiva-glib/filter.h
+include/gandiva-glib/filter.hpp
+include/gandiva-glib/function-registry.h
+include/gandiva-glib/function-signature.h
+include/gandiva-glib/function-signature.hpp
+include/gandiva-glib/gandiva-glib.h
+include/gandiva-glib/gandiva-glib.hpp
+include/gandiva-glib/native-function.h
+include/gandiva-glib/native-function.hpp
+include/gandiva-glib/node.h
+include/gandiva-glib/node.hpp
+include/gandiva-glib/projector.h
+include/gandiva-glib/projector.hpp
+include/gandiva-glib/selection-vector.h
+include/gandiva-glib/selection-vector.hpp
+include/gandiva-glib/version.h
+include/parquet-glib/arrow-file-reader.h
+include/parquet-glib/arrow-file-reader.hpp
+include/parquet-glib/arrow-file-writer.h
+include/parquet-glib/arrow-file-writer.hpp
+include/parquet-glib/metadata.h
+include/parquet-glib/metadata.hpp
+include/parquet-glib/parquet-glib.h
+include/parquet-glib/parquet-glib.hpp
+include/parquet-glib/statistics.h
+include/parquet-glib/statistics.hpp
+lib/girepository-1.0/Arrow-1.0.typelib
+lib/girepository-1.0/ArrowDataset-1.0.typelib
+lib/girepository-1.0/Gandiva-1.0.typelib
+lib/girepository-1.0/Parquet-1.0.typelib
+lib/libarrow-dataset-glib.a
+lib/libarrow-dataset-glib.so
+lib/libarrow-dataset-glib.so.1500
+lib/libarrow-dataset-glib.so.%%SHLIB_VER%%
+lib/libarrow-glib.a
+lib/libarrow-glib.so
+lib/libarrow-glib.so.1500
+lib/libarrow-glib.so.%%SHLIB_VER%%
+lib/libgandiva-glib.a
+lib/libgandiva-glib.so
+lib/libgandiva-glib.so.1500
+lib/libgandiva-glib.so.%%SHLIB_VER%%
+lib/libparquet-glib.a
+lib/libparquet-glib.so
+lib/libparquet-glib.so.1500
+lib/libparquet-glib.so.%%SHLIB_VER%%
+libdata/pkgconfig/arrow-dataset-glib.pc
+libdata/pkgconfig/arrow-glib.pc
+libdata/pkgconfig/gandiva-glib.pc
+libdata/pkgconfig/parquet-glib.pc
+share/arrow-glib/example/README.md
+share/arrow-glib/example/build.c
+share/arrow-glib/example/extension-type.c
+share/arrow-glib/example/lua/README.md
+share/arrow-glib/example/lua/read-file.lua
+share/arrow-glib/example/lua/read-stream.lua
+share/arrow-glib/example/lua/write-file.lua
+share/arrow-glib/example/lua/write-stream.lua
+share/arrow-glib/example/read-file.c
+share/arrow-glib/example/read-stream.c
+share/arrow-glib/example/receive-network.c
+share/arrow-glib/example/send-network.c
+share/arrow-glib/example/vala/README.md
+share/arrow-glib/example/vala/read-file.vala
+share/arrow-glib/example/vala/read-stream.vala
+share/arrow-glib/example/vala/write-file.vala
+share/arrow-glib/example/vala/write-stream.vala
+share/gir-1.0/Arrow-1.0.gir
+share/gir-1.0/ArrowDataset-1.0.gir
+share/gir-1.0/Gandiva-1.0.gir
+share/gir-1.0/Parquet-1.0.gir
diff --git a/databases/arrow/Makefile b/databases/arrow/Makefile
index bef6fba557a4..72d6ebf2c4a7 100644
--- a/databases/arrow/Makefile
+++ b/databases/arrow/Makefile
@@ -1,8 +1,8 @@
 PORTNAME=	arrow
-DISTVERSION=	4.0.1
-PORTREVISION=	3
+DISTVERSION=	15.0.2
+PORTREVISION=	1
 CATEGORIES=	databases
-MASTER_SITES=	https://mirrors.advancedhosters.com/apache/${PORTNAME}/${PORTNAME}-${DISTVERSION}/ \
+MASTER_SITES=	APACHE/${PORTNAME}/${PORTNAME}-${DISTVERSION} \
 		https://github.com/apache/orc/archive/rel/:orc
 DISTNAME=	apache-${PORTNAME}-${DISTVERSION}
 DISTFILES=	apache-${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX} release-1.6.6${EXTRACT_SUFX}:orc
@@ -10,27 +10,32 @@ EXTRACT_ONLY=	apache-${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Columnar in-memory analytics layer for big data
+WWW=		https://arrow.apache.org/
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/../LICENSE.txt
 
-BROKEN_FreeBSD_11=	The OpenSSL must be greater than or equal to 1.1.0
-
 LIB_DEPENDS=	libboost_system.so:devel/boost-libs
 
-USES=		cmake compiler:c++11-lang localbase pkgconfig python:build
+USES=		cmake compiler:c++17-lang localbase pkgconfig python:build
 USE_LDCONFIG=	yes
 
+USE_GITHUB=	nodefault
+GH_ACCOUNT=	apache
+
 WRKSRC_SUBDIR=	cpp
 
-CMAKE_ARGS=	-DARROW_SIMD_LEVEL=NONE -DARROW_RUNTIME_SIMD_LEVEL=NONE
+CMAKE_ARGS=	-DCMAKE_CXX_STANDARD=17 -DARROW_SIMD_LEVEL=NONE -DARROW_RUNTIME_SIMD_LEVEL=NONE \
+		-DPython3_EXECUTABLE=${PYTHON_CMD}
 CMAKE_OFF=	ARROW_BUILD_STATIC ARROW_WITH_BACKTRACE ARROW_BUILD_TESTS ARROW_BUILD_BENCHMARKS
 
 OPTIONS_GROUP=			COMPRESSION COMPONENTS # components are listed in cpp/cmake_modules/DefineOptions.cmake
 OPTIONS_GROUP_COMPRESSION=	BROTLI BZ2 LZ4 SNAPPY ZLIB ZSTD
-OPTIONS_GROUP_COMPONENTS=	COMPUTE CSV DATASET FILESYSTEM FLIGHT GANDIVA HDFS HIVESERVER2 IPC JSON MIMALLOC PARQUET ORC PLASMA PYTHON S3 BUILD_UTILITIES TESTING
+OPTIONS_GROUP_COMPONENTS=	ACERO COMPUTE CSV DATASET FILESYSTEM FLIGHT GANDIVA HDFS IPC JSON MIMALLOC PARQUET ORC S3 SKYHOOK SUBSTRAIT BUILD_UTILITIES TENSORFLOW TESTING
 OPTIONS_SUB=			yes
 
+## DESCs
+
 COMPRESSION_DESC=		Compression support:
 COMPONENTS_DESC=		Build components:
 
@@ -56,8 +61,13 @@ ZSTD_LIB_DEPENDS=		libzstd.so:archivers/zstd
 
 ## Component options
 
+ACERO_DESC=			Arrow Acero Engine Module
+ACERO_CMAKE_BOOL=		ARROW_ACERO
+ACERO_IMPLIES=			COMPUTE IPC
+
 COMPUTE_DESC=			Arrow Compute Modules
 COMPUTE_CMAKE_BOOL=		ARROW_COMPUTE
+COMPUTE_CMAKE_ON=		-DARROW_WITH_UTF8PROC=ON
 COMPUTE_LIB_DEPENDS=		libre2.so:devel/re2 \
 				libutf8proc.so:textproc/utf8proc
 
@@ -66,7 +76,7 @@ CSV_CMAKE_BOOL=			ARROW_CSV
 
 DATASET_DESC=			Arrow Dataset Modules
 DATASET_CMAKE_BOOL=		ARROW_DATASET
-DATASET_IMPLIES=		COMPUTE FILESYSTEM
+DATASET_IMPLIES=		ACERO FILESYSTEM
 
 FILESYSTEM_DESC=		Arrow Filesystem Layer
 FILESYSTEM_CMAKE_BOOL=		ARROW_FILESYSTEM
@@ -80,27 +90,21 @@ FLIGHT_LIB_DEPENDS=		libgflags.so:devel/gflags \
 				libcares.so:dns/c-ares \
 				libgrpc.so:devel/grpc \
 				libre2.so:devel/re2
-FLIGHT_IMPLIES=			IPC
+FLIGHT_IMPLIES=			IPC COMPUTE # see https://github.com/apache/arrow/issues/40766
 FLIGHT_BROKEN=			configure breaks: Could not find a package configuration file provided by "re2"
 
 GANDIVA_DESC=			Gandiva libraries
-GANDIVA_USES=			ssl
+GANDIVA_USES=			llvm:17,lib ssl
 GANDIVA_CMAKE_BOOL=		ARROW_GANDIVA
-GANDIVA_BUILD_DEPENDS=		${LOCALBASE}/bin/clang12:devel/llvm12 # explicitly requires llvm-12
+GANDIVA_CMAKE_ON=		-DARROW_WITH_UTF8PROC=ON
 GANDIVA_LIB_DEPENDS=		libgrpc.so:devel/grpc \
 				libprotobuf.so:devel/protobuf \
-				libre2.so:devel/re2
+				libre2.so:devel/re2 \
+				libutf8proc.so:textproc/utf8proc
 
 HDFS_DESC=			Arrow HDFS bridge
 HDFS_CMAKE_BOOL=		ARROW_HDFS
 
-HIVESERVER2_DESC=		HiveServer2 client and Arrow adapter
-HIVESERVER2_USES=		python:build
-HIVESERVER2_VARS=		BINARY_ALIAS=python=${PYTHON_CMD}
-HIVESERVER2_BUILD_DEPENDS=	thrift:devel/thrift
-HIVESERVER2_CMAKE_BOOL=		ARROW_HIVESERVER2
-HIVESERVER2_BROKEN=		Pending conflict fix in thrift ports in bug#255538
-
 IPC_DESC=			Arrow IPC extensions
 IPC_CMAKE_BOOL=			ARROW_IPC
 
@@ -117,7 +121,7 @@ PARQUET_DESC=			Parquet libraries
 PARQUET_CMAKE_BOOL=		ARROW_PARQUET PARQUET_REQUIRE_ENCRYPTION
 PARQUET_USES=			ssl
 PARQUET_LIB_DEPENDS=		libthrift.so:devel/thrift-cpp
-PARQUET_IMPLIES=		COMPUTE
+PARQUET_IMPLIES=		IPC
 
 ORC_DESC=			Arrow ORC adapter
 ORC_CMAKE_BOOL=			ARROW_ORC
@@ -126,92 +130,81 @@ ORC_CONFIGURE_ENV=		ARROW_ORC_URL=file://${DISTDIR}/${DIST_SUBDIR}/release-1.6.6
 ORC_IMPLIES=			LZ4 SNAPPY ZLIB ZSTD # cpp/CMakeLists.txt
 ORC_BROKEN=			fatal error: 'orc/OrcFile.hh' file not found: https://issues.apache.org/jira/browse/ARROW-12624
 
-PLASMA_DESC=			Plasma object store
-PLASMA_CMAKE_BOOL=		ARROW_PLASMA
-PLASMA_LIB_DEPENDS=		libgflags.so:devel/gflags
-
 BUILD_UTILITIES_DESC=		build Arrow commandline utilities
 BUILD_UTILITIES_CMAKE_BOOL=	ARROW_BUILD_UTILITIES
 
-PYTHON_DESC=			build the Arrow CPython extensions
-PYTHON_CMAKE_BOOL=		ARROW_PYTHON
-PYTHON_USES=			python:3.9
-PYTHON_BUILD_DEPENDS=		${PY_NUMPY} \
-				${PYTHON_PKGNAMEPREFIX}numpy>0:math/py-numpy@${PY_FLAVOR} \
-				${PYTHON_PKGNAMEPREFIX}cython>0:lang/cython@${PY_FLAVOR} \
-				${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/py-setuptools@${PY_FLAVOR} \
-				${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm@${PY_FLAVOR}
-PYTHON_LIB_DEPENDS=		libutf8proc.so:textproc/utf8proc
-PYTHON_RUN_DEPENDS=		${PY_NUMPY}
-PYTHON_IMPLIES=			COMPUTE CSV DATASET FILESYSTEM HDFS JSON
-PYTHON_BROKEN=			py39-setuptools_scm-4.1.2_1 Unknown flavor 'py39', possible flavors: py38
-PYTHON_VARS=			PLIST_SUB=PYTHON_SUFFIX=${PYTHON_SUFFIX}
+#PYTHON_DESC=			Build python extension support
+#PYTHON_CMAKE_BOOL=		ARROW_PYTHON
+#PYTHON_USES=			python
+#PYTHON_BUILD_DEPENDS=		${PYNUMPY} # see https://issues.apache.org/jira/browse/ARROW-16820
+#PYTHON_CMAKE_ON=		-DPython3_EXECUTABLE=${PYTHON_CMD}
+#PYTHON_RUN_DEPENDS=		${PYNUMPY}
+#PYTHON_IMPLIES=			COMPUTE CSV DATASET FILESYSTEM HDFS JSON
+#PYTHON_VARS=			PLIST_SUB+=PYTHON_SUFFIX=${PYTHON_SUFFIX}
 
 S3_DESC=			S3 support
 S3_CMAKE_BOOL=			ARROW_S3
 S3_USES=			ssl
 S3_LIB_DEPENDS=			\
+				libaws-c-auth.so:security/aws-c-auth \
 				libaws-c-cal.so:security/aws-c-cal \
 				libaws-c-common.so:devel/aws-c-common \
+				libaws-c-compression.so:devel/aws-c-compression \
 				libaws-c-event-stream.so:devel/aws-c-event-stream \
+				libaws-c-http.so:devel/aws-c-http \
 				libaws-c-io.so:devel/aws-c-io \
+				libaws-c-mqtt.so:devel/aws-c-mqtt \
+				libaws-c-s3.so:devel/aws-c-s3 \
+				libaws-c-sdkutils.so:devel/aws-c-sdkutils \
 				libaws-checksums.so:devel/aws-checksums \
+				libaws-crt-cpp.so:devel/aws-crt-cpp \
 				libaws-cpp-sdk-s3.so:devel/aws-sdk-cpp \
-				libs2n.so:security/s2n
-S3_IMPLIES=			ZLIB
+				libs2n.so:security/s2n-tls
+
+SKYHOOK_DESC=			Build the Skyhook libraries
+SKYHOOK_CMAKE_BOOL=		ARROW_SKYHOOK
+SKYHOOK_IMPLIES=		DATASET PARQUET
+SKYHOOK_BROKEN=			could NOT find librados
+
+SUBSTRAIT_DESC=			Build the Arrow Substrait Consumer Module
+SUBSTRAIT_CMAKE_BOOL=		ARROW_SUBSTRAIT
+SUBSTRAIT_IMPLIES=		DATASET IPC PARQUET
+SUBSTRAIT_BROKEN=		needs investigation
+
+TENSORFLOW_DESC=		TensorFlow support
+TENSORFLOW_CMAKE_BOOL=		ARROW_TENSORFLOW
+TENSORFLOW_BROKEN=		needs testing
 
 TESTING_DESC=			Arrow testing libraries
 TESTING_CMAKE_BOOL=		ARROW_TESTING
 TESTING_LIB_DEPENDS=		libgtest.so:devel/googletest
 
-.for opt in ${OPTIONS_GROUP_COMPRESSION} ${OPTIONS_GROUP_COMPONENTS}
+# workaround for https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=277953
+OPSYS!=		uname -s # HACK: OPSYS is defined in bsd.port.options.mk which has to be later
+OSVERSION!=	awk '/^\#define[[:blank:]]__FreeBSD_version/ {print $$3}' < ${CROSS_SYSROOT}/usr/include/sys/param.h # HACK: same as above
+.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1303000
+TESTING_BROKEN=	configure fails because GTest built with C++ level <17 isn't compatible with C++17 used in arrow
+.endif
+
+# form OPTIONS_DEFAULT
+.for opt in ${OPTIONS_GROUP_COMPONENTS}
 .  if "${${opt}_BROKEN}" == ""
 OPTIONS_DEFAULT+=	${opt}
 .  endif
 .endfor
 
-.include <bsd.port.pre.mk>
-
-.if ${CHOSEN_COMPILER_TYPE} == clang && ${OPSYS} == FreeBSD
-LLVM_VER=	10 # clang-11 crashes on FreeBSD 14: https://bugs.llvm.org/show_bug.cgi?id=50277
-
-BUILD_DEPENDS+=	clang${LLVM_VER}:devel/llvm${LLVM_VER}
-CC=		${LOCALBASE}/bin/clang${LLVM_VER}
-CXX=		${LOCALBASE}/bin/clang++${LLVM_VER}
-.endif
-
-pre-configure-PYTHON-on:
-	@${REINPLACE_CMD} -e ' \
-		s|arrow_python|arrow_python${PYTHON_SUFFIX}|g; \
-		s|arrow-python|arrow-python${PYTHON_SUFFIX}|g \
-		' \
-		${WRKSRC}/../ci/appveyor-cpp-build.bat \
-		${WRKSRC}/../cpp/cmake_modules/FindArrowPython.cmake \
-		${WRKSRC}/../cpp/cmake_modules/FindArrowPythonFlight.cmake \
-		${WRKSRC}/../cpp/src/arrow/python/arrow-python-flight.pc.in \
-		${WRKSRC}/../cpp/src/arrow/python/arrow-python.pc.in \
-		${WRKSRC}/../cpp/src/arrow/python/ArrowPythonConfig.cmake.in \
-		${WRKSRC}/../cpp/src/arrow/python/ArrowPythonFlightConfig.cmake.in \
-		${WRKSRC}/../cpp/src/arrow/python/CMakeLists.txt \
-		${WRKSRC}/../dev/release/rat_exclude_files.txt \
-		${WRKSRC}/../dev/release/verify-apt.sh \
-		${WRKSRC}/../dev/release/verify-yum.sh \
-		${WRKSRC}/../dev/tasks/conda-recipes/arrow-cpp/meta.yaml \
-		${WRKSRC}/../dev/tasks/tasks.yml \
-		${WRKSRC}/../docs/source/developers/python.rst \
-		${WRKSRC}/../python/cmake_modules/FindArrowPython.cmake \
-		${WRKSRC}/../python/cmake_modules/FindArrowPythonFlight.cmake \
-		${WRKSRC}/../python/CMakeLists.txt \
-		${WRKSRC}/../python/pyarrow/__init__.py \
-		${WRKSRC}/../python/pyarrow/plasma.py \
-		${WRKSRC}/../python/setup.py
-	@${MV} ${WRKSRC}/src/arrow/python/arrow-python.pc.in ${WRKSRC}/src/arrow/python/arrow-python${PYTHON_SUFFIX}.pc.in
-	@${MV} ${WRKSRC}/src/arrow/python/arrow-python-flight.pc.in ${WRKSRC}/src/arrow/python/arrow-python${PYTHON_SUFFIX}-flight.pc.in
-
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MCOMPUTE} || ${PORT_OPTIONS:MFLIGHT} || ${PORT_OPTIONS:MGANDIVA}
-PLIST_FILES+=	lib/cmake/arrow/Findre2Alt.cmake
+PLIST_FILES+=	lib/cmake/Arrow/Findre2Alt.cmake
+.endif
+
+.if ${PORT_OPTIONS:MIPC} && ${PORT_OPTIONS:MBUILD_UTILITIES}
+PLIST_FILES+=	bin/arrow-file-to-stream \
+		bin/arrow-stream-to-file
+.endif
+.if ${PORT_OPTIONS:MGANDIVA} || ${PORT_OPTIONS:MCOMPUTE}
+PLIST_FILES+=	lib/cmake/Arrow/Findutf8proc.cmake
 .endif
 
 .if ${PORT_OPTIONS:MPYTHON} == "PYTHON" && ${PORT_OPTIONS:MFLIGHT} == "FLIGHT"
@@ -226,10 +219,17 @@ PLIST_FILES+=	lib/cmake/arrow/Findre2Alt.cmake
     PLIST_SUB+=	TESTINGFLIGHT="@comment "
 .endif
 
+post-install:
+	# based on the user's report on 2024-04-12, the R extension expects only "ON" and "OFF" values in lib/cmake/Arrow/ArrowOptions.cmake
+	# other values confuse the R extension build, so we adjust these values to "ON" and "OFF" as a workaround
+	${REINPLACE_CMD} -i '' \
+		-e 's|"true"|"ON"|; s|"false"|"OFF"|' \
+		${STAGEDIR}${PREFIX}/lib/cmake/Arrow/ArrowOptions.cmake
+
 do-test: # tests fail to compile: https://issues.apache.org/jira/browse/ARROW-12625
 	@cd ${BUILD_WRKSRC} && \
 		${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} -DARROW_BUILD_TESTS:BOOL=ON ${CMAKE_SOURCE_PATH} && \
 		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} && \
 		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} test
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/databases/arrow/distinfo b/databases/arrow/distinfo
index 00a29f73d3b4..a4ff137977a5 100644
--- a/databases/arrow/distinfo
+++ b/databases/arrow/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1622656236
-SHA256 (apache-arrow-4.0.1.tar.gz) = 75ccbfa276b925c6b1c978a920ff2f30c4b0d3fdf8b51777915b6f69a211896e
-SIZE (apache-arrow-4.0.1.tar.gz) = 9048515
+TIMESTAMP = 1711166482
+SHA256 (apache-arrow-15.0.2.tar.gz) = abbf97176db6a9e8186fe005e93320dac27c64562755c77de50a882eb6179ac6
+SIZE (apache-arrow-15.0.2.tar.gz) = 21503812
 SHA256 (release-1.6.6.tar.gz) = 9a92b3eaad1d8b88a18cee41058feb34eb43d919df363e0b74a0b857724e4ba0
 SIZE (release-1.6.6.tar.gz) = 13939853
diff --git a/databases/arrow/files/patch-CMakeLists.txt b/databases/arrow/files/patch-CMakeLists.txt
index a5913686ab35..97bc4e65ef81 100644
--- a/databases/arrow/files/patch-CMakeLists.txt
+++ b/databases/arrow/files/patch-CMakeLists.txt
@@ -1,6 +1,6 @@
---- CMakeLists.txt.orig	2021-04-21 16:14:36 UTC
+--- CMakeLists.txt.orig	2024-03-13 13:37:59 UTC
 +++ CMakeLists.txt
-@@ -98,7 +98,7 @@ set(ARROW_BINARY_DIR ${PROJECT_BINARY_DIR})
+@@ -124,7 +124,7 @@ include(CMakeParseArguments)
  
  include(CMakePackageConfigHelpers)
  include(CMakeParseArguments)
@@ -9,18 +9,16 @@
  include(FindPackageHandleStandardArgs)
  
  include(GNUInstallDirs)
-@@ -910,10 +910,10 @@ if(ARROW_BUILD_EXAMPLES)
+@@ -1010,9 +1010,9 @@ endif()
    add_subdirectory(examples/arrow)
  endif()
  
 -install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/../LICENSE.txt
 -              ${CMAKE_CURRENT_SOURCE_DIR}/../NOTICE.txt
--              ${CMAKE_CURRENT_SOURCE_DIR}/README.md
--        DESTINATION "${ARROW_DOC_DIR}")
+-              ${CMAKE_CURRENT_SOURCE_DIR}/README.md DESTINATION "${ARROW_DOC_DIR}")
 +#install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/../LICENSE.txt
 +#              ${CMAKE_CURRENT_SOURCE_DIR}/../NOTICE.txt
-+#              ${CMAKE_CURRENT_SOURCE_DIR}/README.md
-+#        DESTINATION "${ARROW_DOC_DIR}")
++#              ${CMAKE_CURRENT_SOURCE_DIR}/README.md DESTINATION "${ARROW_DOC_DIR}")
+ 
+ install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/gdb_arrow.py DESTINATION "${ARROW_GDB_DIR}")
  
- #
- # Validate and print out Arrow configuration options
diff --git a/databases/arrow/files/patch-cmake__modules_SetupCxxFlags.cmake b/databases/arrow/files/patch-cmake__modules_SetupCxxFlags.cmake
index 7c5034184e6e..bd10749c566a 100644
--- a/databases/arrow/files/patch-cmake__modules_SetupCxxFlags.cmake
+++ b/databases/arrow/files/patch-cmake__modules_SetupCxxFlags.cmake
@@ -1,10 +1,10 @@
---- cmake_modules/SetupCxxFlags.cmake.orig	2021-04-21 16:14:36 UTC
+--- cmake_modules/SetupCxxFlags.cmake.orig	2023-08-17 08:05:04 UTC
 +++ cmake_modules/SetupCxxFlags.cmake
-@@ -28,7 +28,7 @@ if(NOT DEFINED ARROW_CPU_FLAG)
-     set(ARROW_CPU_FLAG "armv8")
-   elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "armv7")
-     set(ARROW_CPU_FLAG "armv7")
--  elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "ppc")
+@@ -30,7 +30,7 @@ if(NOT DEFINED ARROW_CPU_FLAG)
+     set(ARROW_CPU_FLAG "aarch64")
+   elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^arm$|armv[4-7]")
+     set(ARROW_CPU_FLAG "aarch32")
+-  elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "powerpc|ppc")
 +  elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "powerpc|powerpc64|ppc")
      set(ARROW_CPU_FLAG "ppc")
    elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "s390x")
diff --git a/databases/arrow/files/patch-cmake__modules_ThirdpartyToolchain.cmake b/databases/arrow/files/patch-cmake__modules_ThirdpartyToolchain.cmake
index e2d8e7fbe58e..2901134cd147 100644
--- a/databases/arrow/files/patch-cmake__modules_ThirdpartyToolchain.cmake
+++ b/databases/arrow/files/patch-cmake__modules_ThirdpartyToolchain.cmake
@@ -1,6 +1,6 @@
---- cmake_modules/ThirdpartyToolchain.cmake.orig	2021-04-21 16:14:36 UTC
+--- cmake_modules/ThirdpartyToolchain.cmake.orig	2024-03-13 13:37:59 UTC
 +++ cmake_modules/ThirdpartyToolchain.cmake
-@@ -16,6 +16,7 @@
+@@ -16,6 +16,7 @@ include(ProcessorCount)
  # under the License.
  
  include(ProcessorCount)
@@ -8,26 +8,12 @@
  processorcount(NPROC)
  
  add_custom_target(rapidjson)
-@@ -2320,10 +2321,10 @@ macro(build_cares)
-   file(MAKE_DIRECTORY ${CARES_INCLUDE_DIR})
+@@ -5233,6 +5234,8 @@ message(STATUS "All bundled static libraries: ${ARROW_
+ endif()
  
-   add_dependencies(toolchain cares_ep)
--  add_library(c-ares::cares STATIC IMPORTED)
--  set_target_properties(c-ares::cares
--                        PROPERTIES IMPORTED_LOCATION "${CARES_STATIC_LIB}"
--                                   INTERFACE_INCLUDE_DIRECTORIES "${CARES_INCLUDE_DIR}")
-+  # add_library(c-ares::cares STATIC IMPORTED)
-+  # set_target_properties(c-ares::cares
-+  #                       PROPERTIES IMPORTED_LOCATION "${CARES_STATIC_LIB}"
-+  #                                  INTERFACE_INCLUDE_DIRECTORIES "${CARES_INCLUDE_DIR}")
-   add_dependencies(c-ares::cares cares_ep)
+ message(STATUS "All bundled static libraries: ${ARROW_BUNDLED_STATIC_LIBS}")
++
++set(BUILD_SHARED_LIBS ON)
  
-   if(APPLE)
-@@ -2904,6 +2905,7 @@ if(ARROW_S3)
-     set(BUILD_SHARED_LIBS "ON")
-   endif()
+ # Write out the package configurations.
  
-+  set(BUILD_SHARED_LIBS ON)
-   # Need to customize the find_package() call, so cannot call resolve_dependency()
-   if(AWSSDK_SOURCE STREQUAL "AUTO")
-     find_package(AWSSDK
diff --git a/databases/arrow/files/patch-thirdparty_download__dependencies.sh b/databases/arrow/files/patch-thirdparty_download__dependencies.sh
index d74e1c74338e..be9540a6a6e0 100644
--- a/databases/arrow/files/patch-thirdparty_download__dependencies.sh
+++ b/databases/arrow/files/patch-thirdparty_download__dependencies.sh
@@ -1,6 +1,6 @@
---- thirdparty/download_dependencies.sh.orig	2019-02-16 22:21:34 UTC
+--- thirdparty/download_dependencies.sh.orig	2023-08-17 08:05:04 UTC
 +++ thirdparty/download_dependencies.sh
-@@ -61,4 +61,6 @@ main() {
+@@ -62,4 +62,6 @@ main() {
    done
  }
  
diff --git a/databases/arrow/pkg-descr b/databases/arrow/pkg-descr
index 85cc5a106692..e38447c799ea 100644
--- a/databases/arrow/pkg-descr
+++ b/databases/arrow/pkg-descr
@@ -4,5 +4,3 @@ and hierarchical data, organized for efficient analytic operations on modern
 hardware. It also provides computational libraries and zero-copy streaming
 messaging and interprocess communication. Languages currently supported include
 C, C++, C#, Go, Java, JavaScript, MATLAB, Python, R, Ruby, and Rust.
-
-WWW: https://arrow.apache.org/
diff --git a/databases/arrow/pkg-plist b/databases/arrow/pkg-plist
index b0211c34cd21..c3dfecdb6558 100644
--- a/databases/arrow/pkg-plist
+++ b/databases/arrow/pkg-plist
@@ -1,4 +1,29 @@
-%%PLASMA%%bin/plasma-store-server
+%%ACERO%%include/arrow/acero/accumulation_queue.h
+%%ACERO%%include/arrow/acero/aggregate_node.h
+%%ACERO%%include/arrow/acero/api.h
+%%ACERO%%include/arrow/acero/asof_join_node.h
+%%ACERO%%include/arrow/acero/backpressure_handler.h
+%%ACERO%%include/arrow/acero/benchmark_util.h
+%%ACERO%%include/arrow/acero/bloom_filter.h
+%%ACERO%%include/arrow/acero/exec_plan.h
+%%ACERO%%include/arrow/acero/hash_join.h
+%%ACERO%%include/arrow/acero/hash_join_dict.h
+%%ACERO%%include/arrow/acero/hash_join_node.h
+%%ACERO%%include/arrow/acero/map_node.h
+%%ACERO%%include/arrow/acero/options.h
+%%ACERO%%include/arrow/acero/order_by_impl.h
+%%ACERO%%include/arrow/acero/partition_util.h
+%%ACERO%%include/arrow/acero/pch.h
+%%ACERO%%include/arrow/acero/query_context.h
+%%ACERO%%include/arrow/acero/schema_util.h
+%%ACERO%%include/arrow/acero/task_util.h
+%%ACERO%%include/arrow/acero/test_nodes.h
+%%ACERO%%include/arrow/acero/time_series_util.h
+%%ACERO%%include/arrow/acero/tpch_node.h
+%%ACERO%%include/arrow/acero/type_fwd.h
+%%ACERO%%include/arrow/acero/unmaterialized_table.h
+%%ACERO%%include/arrow/acero/util.h
+%%ACERO%%include/arrow/acero/visibility.h
 include/arrow/api.h
 include/arrow/array.h
 include/arrow/array/array_base.h
@@ -7,6 +32,7 @@ include/arrow/array/array_decimal.h
 include/arrow/array/array_dict.h
 include/arrow/array/array_nested.h
 include/arrow/array/array_primitive.h
+include/arrow/array/array_run_end.h
 include/arrow/array/builder_adaptive.h
 include/arrow/array/builder_base.h
 include/arrow/array/builder_binary.h
@@ -14,6 +40,7 @@ include/arrow/array/builder_decimal.h
 include/arrow/array/builder_dict.h
 include/arrow/array/builder_nested.h
 include/arrow/array/builder_primitive.h
+include/arrow/array/builder_run_end.h
 include/arrow/array/builder_time.h
 include/arrow/array/builder_union.h
 include/arrow/array/concatenate.h
@@ -26,7 +53,10 @@ include/arrow/buffer_builder.h
 include/arrow/builder.h
 include/arrow/c/abi.h
 include/arrow/c/bridge.h
+include/arrow/c/dlpack.h
+include/arrow/c/dlpack_abi.h
 include/arrow/c/helpers.h
+include/arrow/chunk_resolver.h
 include/arrow/chunked_array.h
 include/arrow/compare.h
 %%COMPUTE%%include/arrow/compute/api.h
@@ -35,16 +65,25 @@ include/arrow/compare.h
 %%COMPUTE%%include/arrow/compute/api_vector.h
 %%COMPUTE%%include/arrow/compute/cast.h
 %%COMPUTE%%include/arrow/compute/exec.h
+%%COMPUTE%%include/arrow/compute/expression.h
 %%COMPUTE%%include/arrow/compute/function.h
+%%COMPUTE%%include/arrow/compute/function_options.h
 %%COMPUTE%%include/arrow/compute/kernel.h
+%%COMPUTE%%include/arrow/compute/key_hash.h
+%%COMPUTE%%include/arrow/compute/key_map.h
+%%COMPUTE%%include/arrow/compute/light_array.h
+%%COMPUTE%%include/arrow/compute/ordering.h
 %%COMPUTE%%include/arrow/compute/registry.h
+%%COMPUTE%%include/arrow/compute/row/grouper.h
 %%COMPUTE%%include/arrow/compute/type_fwd.h
+%%COMPUTE%%include/arrow/compute/util.h
 include/arrow/config.h
 %%CSV%%include/arrow/csv/api.h
 %%CSV%%include/arrow/csv/chunker.h
 %%CSV%%include/arrow/csv/column_builder.h
 %%CSV%%include/arrow/csv/column_decoder.h
 %%CSV%%include/arrow/csv/converter.h
+%%CSV%%include/arrow/csv/invalid_row.h
 %%CSV%%include/arrow/csv/options.h
 %%CSV%%include/arrow/csv/parser.h
 %%CSV%%include/arrow/csv/reader.h
@@ -53,24 +92,30 @@ include/arrow/config.h
 %%CSV%%include/arrow/csv/writer.h
 %%DATASET%%include/arrow/dataset/api.h
 %%DATASET%%include/arrow/dataset/dataset.h
+%%DATASET%%include/arrow/dataset/dataset_writer.h
 %%DATASET%%include/arrow/dataset/discovery.h
-%%DATASET%%include/arrow/dataset/expression.h
 %%DATASET%%include/arrow/dataset/file_base.h
 %%DATASET%%include/arrow/dataset/file_csv.h
 %%DATASET%%include/arrow/dataset/file_ipc.h
+%%DATASET%%include/arrow/dataset/file_json.h
+%%DATASET%%include/arrow/dataset/file_orc.h
 %%DATASET%%include/arrow/dataset/file_parquet.h
+%%DATASET%%include/arrow/dataset/parquet_encryption_config.h
 %%DATASET%%include/arrow/dataset/partition.h
 %%DATASET%%include/arrow/dataset/pch.h
+%%DATASET%%include/arrow/dataset/plan.h
 %%DATASET%%include/arrow/dataset/projector.h
 %%DATASET%%include/arrow/dataset/scanner.h
-%%DATASET%%include/arrow/dataset/test_util.h
 %%DATASET%%include/arrow/dataset/type_fwd.h
 %%DATASET%%include/arrow/dataset/visibility.h
 include/arrow/datum.h
 include/arrow/device.h
+%%JSON%%include/arrow/extension/fixed_shape_tensor.h
 include/arrow/extension_type.h
 %%FILESYSTEM%%include/arrow/filesystem/api.h
+%%FILESYSTEM%%include/arrow/filesystem/azurefs.h
 %%FILESYSTEM%%include/arrow/filesystem/filesystem.h
+%%FILESYSTEM%%include/arrow/filesystem/gcsfs.h
 %%FILESYSTEM%%include/arrow/filesystem/hdfs.h
 %%FILESYSTEM%%include/arrow/filesystem/localfs.h
 %%FILESYSTEM%%include/arrow/filesystem/mockfs.h
@@ -82,17 +127,23 @@ include/arrow/extension_type.h
 %%FLIGHT%%include/arrow/flight/api.h
 %%FLIGHT%%include/arrow/flight/client.h
 %%FLIGHT%%include/arrow/flight/client_auth.h
+%%FLIGHT%%include/arrow/flight/client_cookie_middleware.h
 %%FLIGHT%%include/arrow/flight/client_middleware.h
-%%FLIGHT%%include/arrow/flight/customize_protobuf.h
+%%FLIGHT%%include/arrow/flight/client_tracing_middleware.h
 %%FLIGHT%%include/arrow/flight/middleware.h
 %%FLIGHT%%include/arrow/flight/pch.h
 %%FLIGHT%%include/arrow/flight/platform.h
 %%FLIGHT%%include/arrow/flight/server.h
 %%FLIGHT%%include/arrow/flight/server_auth.h
 %%FLIGHT%%include/arrow/flight/server_middleware.h
-%%FLIGHT%%include/arrow/flight/test_integration.h
+%%FLIGHT%%include/arrow/flight/server_tracing_middleware.h
+%%FLIGHT%%include/arrow/flight/test_definitions.h
 %%FLIGHT%%include/arrow/flight/test_util.h
+%%FLIGHT%%include/arrow/flight/transport.h
+%%FLIGHT%%include/arrow/flight/transport_server.h
+%%FLIGHT%%include/arrow/flight/type_fwd.h
 %%FLIGHT%%include/arrow/flight/types.h
+%%FLIGHT%%include/arrow/flight/types_async.h
 %%FLIGHT%%include/arrow/flight/visibility.h
 include/arrow/io/api.h
 include/arrow/io/buffered.h
@@ -105,6 +156,7 @@ include/arrow/io/interfaces.h
 include/arrow/io/memory.h
 include/arrow/io/mman.h
 include/arrow/io/slow.h
+include/arrow/io/stdio.h
 include/arrow/io/test_common.h
 include/arrow/io/transform.h
 include/arrow/io/type_fwd.h
@@ -135,34 +187,6 @@ include/arrow/memory_pool.h
 include/arrow/memory_pool_test.h
 include/arrow/pch.h
 include/arrow/pretty_print.h
-%%PYTHON%%include/arrow/python/api.h
-%%PYTHON%%include/arrow/python/arrow_to_pandas.h
-%%PYTHON%%include/arrow/python/benchmark.h
-%%PYTHON%%include/arrow/python/common.h
-%%PYTHON%%include/arrow/python/datetime.h
-%%PYTHON%%include/arrow/python/decimal.h
-%%PYTHON%%include/arrow/python/deserialize.h
-%%PYTHON%%include/arrow/python/extension_type.h
-%%PYTHON%%include/arrow/python/filesystem.h
-%%PYTHON%%include/arrow/python/flight.h
-%%PYTHON%%include/arrow/python/helpers.h
-%%PYTHON%%include/arrow/python/inference.h
-%%PYTHON%%include/arrow/python/init.h
-%%PYTHON%%include/arrow/python/io.h
-%%PYTHON%%include/arrow/python/ipc.h
-%%PYTHON%%include/arrow/python/iterators.h
-%%PYTHON%%include/arrow/python/numpy_convert.h
-%%PYTHON%%include/arrow/python/numpy_interop.h
-%%PYTHON%%include/arrow/python/numpy_to_arrow.h
-%%PYTHON%%include/arrow/python/pch.h
-%%PYTHON%%include/arrow/python/platform.h
-%%PYTHON%%include/arrow/python/pyarrow.h
-%%PYTHON%%include/arrow/python/pyarrow_api.h
-%%PYTHON%%include/arrow/python/pyarrow_lib.h
-%%PYTHON%%include/arrow/python/python_to_arrow.h
-%%PYTHON%%include/arrow/python/serialize.h
-%%PYTHON%%include/arrow/python/type_traits.h
-%%PYTHON%%include/arrow/python/visibility.h
 include/arrow/record_batch.h
 include/arrow/result.h
 include/arrow/scalar.h
@@ -175,16 +199,18 @@ include/arrow/table.h
 include/arrow/table_builder.h
 include/arrow/tensor.h
 include/arrow/tensor/converter.h
+include/arrow/testing/async_test_util.h
+include/arrow/testing/builder.h
+include/arrow/testing/executor_util.h
 include/arrow/testing/extension_type.h
 include/arrow/testing/future_util.h
 include/arrow/testing/generator.h
-include/arrow/testing/gtest_common.h
 include/arrow/testing/gtest_compat.h
 include/arrow/testing/gtest_util.h
-include/arrow/testing/json_integration.h
-include/arrow/testing/macros.h
+include/arrow/testing/matchers.h
 include/arrow/testing/pch.h
 include/arrow/testing/random.h
+include/arrow/testing/uniform_real.h
 include/arrow/testing/util.h
 include/arrow/testing/visibility.h
 include/arrow/type.h
@@ -192,11 +218,14 @@ include/arrow/type_fwd.h
 include/arrow/type_traits.h
 include/arrow/util/algorithm.h
 include/arrow/util/align_util.h
+include/arrow/util/aligned_storage.h
 include/arrow/util/async_generator.h
-include/arrow/util/atomic_shared_ptr.h
+include/arrow/util/async_generator_fwd.h
+include/arrow/util/async_util.h
 include/arrow/util/base64.h
 include/arrow/util/basic_decimal.h
 include/arrow/util/benchmark_util.h
+include/arrow/util/binary_view_util.h
 include/arrow/util/bit_block_counter.h
 include/arrow/util/bit_run_reader.h
 include/arrow/util/bit_stream_utils.h
@@ -210,72 +239,80 @@ include/arrow/util/bitmap_visit.h
 include/arrow/util/bitmap_writer.h
 include/arrow/util/bitset_stack.h
 include/arrow/util/bpacking.h
+include/arrow/util/bpacking64_default.h
 include/arrow/util/bpacking_avx2.h
-include/arrow/util/bpacking_avx2_generated.h
 include/arrow/util/bpacking_avx512.h
-include/arrow/util/bpacking_avx512_generated.h
 include/arrow/util/bpacking_default.h
 include/arrow/util/bpacking_neon.h
-include/arrow/util/bpacking_simd128_generated.h
-include/arrow/util/bpacking_simd256_generated.h
-include/arrow/util/bpacking_simd512_generated.h
-include/arrow/util/byte_stream_split.h
+include/arrow/util/byte_size.h
 include/arrow/util/cancel.h
 include/arrow/util/checked_cast.h
 include/arrow/util/compare.h
-include/arrow/util/compiler_util.h
 include/arrow/util/compression.h
 include/arrow/util/concurrent_map.h
 include/arrow/util/config.h
 include/arrow/util/converter.h
+include/arrow/util/counting_semaphore.h
 include/arrow/util/cpu_info.h
+include/arrow/util/crc32.h
+include/arrow/util/debug.h
 include/arrow/util/decimal.h
 include/arrow/util/delimiting.h
+include/arrow/util/dict_util.h
 include/arrow/util/dispatch.h
 include/arrow/util/double_conversion.h
 include/arrow/util/endian.h
+include/arrow/util/float16.h
 include/arrow/util/formatting.h
 include/arrow/util/functional.h
 include/arrow/util/future.h
-include/arrow/util/future_iterator.h
 include/arrow/util/hash_util.h
 include/arrow/util/hashing.h
 include/arrow/util/int_util.h
+include/arrow/util/int_util_overflow.h
 include/arrow/util/io_util.h
 include/arrow/util/iterator.h
 include/arrow/util/key_value_metadata.h
+include/arrow/util/launder.h
+include/arrow/util/list_util.h
 include/arrow/util/logging.h
 include/arrow/util/macros.h
-include/arrow/util/make_unique.h
 include/arrow/util/map.h
+include/arrow/util/math_constants.h
 include/arrow/util/memory.h
 include/arrow/util/mutex.h
-include/arrow/util/optional.h
 include/arrow/util/parallel.h
+include/arrow/util/pcg_random.h
 include/arrow/util/print.h
 include/arrow/util/queue.h
 include/arrow/util/range.h
+include/arrow/util/ree_util.h
+include/arrow/util/regex.h
 include/arrow/util/rle_encoding.h
+include/arrow/util/rows_to_batches.h
 include/arrow/util/simd.h
+include/arrow/util/small_vector.h
 include/arrow/util/sort.h
 include/arrow/util/spaced.h
+include/arrow/util/span.h
 include/arrow/util/stopwatch.h
 include/arrow/util/string.h
 include/arrow/util/string_builder.h
-include/arrow/util/string_view.h
 include/arrow/util/task_group.h
 include/arrow/util/tdigest.h
 include/arrow/util/test_common.h
 include/arrow/util/thread_pool.h
 include/arrow/util/time.h
+include/arrow/util/tracing.h
 include/arrow/util/trie.h
 include/arrow/util/type_fwd.h
 include/arrow/util/type_traits.h
 include/arrow/util/ubsan.h
+include/arrow/util/union_util.h
+include/arrow/util/unreachable.h
 include/arrow/util/uri.h
 include/arrow/util/utf8.h
 include/arrow/util/value_parsing.h
-include/arrow/util/variant.h
 include/arrow/util/vector.h
 include/arrow/util/visibility.h
 include/arrow/util/windows_compatibility.h
@@ -292,17 +329,27 @@ include/arrow/vendored/double-conversion/bignum.h
 include/arrow/vendored/double-conversion/cached-powers.h
 include/arrow/vendored/double-conversion/diy-fp.h
 include/arrow/vendored/double-conversion/double-conversion.h
+include/arrow/vendored/double-conversion/double-to-string.h
 include/arrow/vendored/double-conversion/fast-dtoa.h
 include/arrow/vendored/double-conversion/fixed-dtoa.h
 include/arrow/vendored/double-conversion/ieee.h
+include/arrow/vendored/double-conversion/string-to-double.h
 include/arrow/vendored/double-conversion/strtod.h
 include/arrow/vendored/double-conversion/utils.h
-include/arrow/vendored/optional.hpp
-include/arrow/vendored/string_view.hpp
+include/arrow/vendored/pcg/pcg_extras.hpp
+include/arrow/vendored/pcg/pcg_random.hpp
+include/arrow/vendored/pcg/pcg_uint128.hpp
+include/arrow/vendored/portable-snippets/debug-trap.h
+include/arrow/vendored/portable-snippets/safe-math.h
 include/arrow/vendored/strptime.h
 include/arrow/vendored/xxhash.h
+include/arrow/vendored/xxhash/xxhash.h
+include/arrow/visit_array_inline.h
+include/arrow/visit_data_inline.h
+include/arrow/visit_scalar_inline.h
+include/arrow/visit_type_inline.h
 include/arrow/visitor.h
-include/arrow/visitor_inline.h
+include/arrow/visitor_generate.h
 %%GANDIVA%%include/gandiva/annotator.h
 %%GANDIVA%%include/gandiva/arrow.h
 %%GANDIVA%%include/gandiva/basic_decimal_scalar.h
@@ -318,6 +365,7 @@ include/arrow/visitor_inline.h
 %%GANDIVA%%include/gandiva/decimal_xlarge.h
 %%GANDIVA%%include/gandiva/dex.h
 %%GANDIVA%%include/gandiva/dex_visitor.h
+%%GANDIVA%%include/gandiva/encrypt_utils.h
 %%GANDIVA%%include/gandiva/engine.h
 %%GANDIVA%%include/gandiva/eval_batch.h
 %%GANDIVA%%include/gandiva/execution_context.h
@@ -326,13 +374,14 @@ include/arrow/visitor_inline.h
 %%GANDIVA%%include/gandiva/expr_decomposer.h
 %%GANDIVA%%include/gandiva/expr_validator.h
 %%GANDIVA%%include/gandiva/expression.h
+%%GANDIVA%%include/gandiva/expression_cache_key.h
 %%GANDIVA%%include/gandiva/expression_registry.h
 %%GANDIVA%%include/gandiva/field_descriptor.h
 %%GANDIVA%%include/gandiva/filter.h
 %%GANDIVA%%include/gandiva/formatting_utils.h
 %%GANDIVA%%include/gandiva/func_descriptor.h
 %%GANDIVA%%include/gandiva/function_holder.h
-%%GANDIVA%%include/gandiva/function_holder_registry.h
+%%GANDIVA%%include/gandiva/function_holder_maker_registry.h
 %%GANDIVA%%include/gandiva/function_ir_builder.h
 %%GANDIVA%%include/gandiva/function_registry.h
 %%GANDIVA%%include/gandiva/function_registry_arithmetic.h
@@ -344,10 +393,11 @@ include/arrow/visitor_inline.h
 %%GANDIVA%%include/gandiva/function_registry_timestamp_arithmetic.h
 %%GANDIVA%%include/gandiva/function_signature.h
 %%GANDIVA%%include/gandiva/gandiva_aliases.h
+%%GANDIVA%%include/gandiva/gandiva_object_cache.h
 %%GANDIVA%%include/gandiva/gdv_function_stubs.h
 %%GANDIVA%%include/gandiva/hash_utils.h
 %%GANDIVA%%include/gandiva/in_holder.h
-%%GANDIVA%%include/gandiva/like_holder.h
+%%GANDIVA%%include/gandiva/interval_holder.h
 %%GANDIVA%%include/gandiva/literal_holder.h
 %%GANDIVA%%include/gandiva/llvm_generator.h
 %%GANDIVA%%include/gandiva/llvm_includes.h
@@ -361,6 +411,7 @@ include/arrow/visitor_inline.h
 %%GANDIVA%%include/gandiva/pch.h
 %%GANDIVA%%include/gandiva/projector.h
 %%GANDIVA%%include/gandiva/random_generator_holder.h
+%%GANDIVA%%include/gandiva/regex_functions_holder.h
 %%GANDIVA%%include/gandiva/regex_util.h
 %%GANDIVA%%include/gandiva/selection_vector.h
 %%GANDIVA%%include/gandiva/selection_vector_impl.h
@@ -377,7 +428,9 @@ include/arrow/visitor_inline.h
 %%PARQUET%%include/parquet/arrow/schema.h
 %%PARQUET%%include/parquet/arrow/test_util.h
 %%PARQUET%%include/parquet/arrow/writer.h
+%%PARQUET%%include/parquet/benchmark_util.h
 %%PARQUET%%include/parquet/bloom_filter.h
+%%PARQUET%%include/parquet/bloom_filter_reader.h
 %%PARQUET%%include/parquet/column_page.h
 %%PARQUET%%include/parquet/column_reader.h
 %%PARQUET%%include/parquet/column_scanner.h
@@ -388,6 +441,7 @@ include/arrow/visitor_inline.h
 %%PARQUET%%include/parquet/encryption/file_key_material_store.h
 %%PARQUET%%include/parquet/encryption/file_key_unwrapper.h
 %%PARQUET%%include/parquet/encryption/file_key_wrapper.h
+%%PARQUET%%include/parquet/encryption/file_system_key_material_store.h
 %%PARQUET%%include/parquet/encryption/key_encryption_key.h
 %%PARQUET%%include/parquet/encryption/key_material.h
 %%PARQUET%%include/parquet/encryption/key_metadata.h
@@ -398,6 +452,7 @@ include/arrow/visitor_inline.h
 %%PARQUET%%include/parquet/encryption/test_encryption_util.h
 %%PARQUET%%include/parquet/encryption/test_in_memory_kms.h
 %%PARQUET%%include/parquet/encryption/two_level_cache_with_expiration.h
+%%PARQUET%%include/parquet/encryption/type_fwd.h
 %%PARQUET%%include/parquet/exception.h
 %%PARQUET%%include/parquet/file_reader.h
 %%PARQUET%%include/parquet/file_writer.h
@@ -407,7 +462,7 @@ include/arrow/visitor_inline.h
 %%PARQUET%%include/parquet/level_conversion.h
 %%PARQUET%%include/parquet/level_conversion_inc.h
 %%PARQUET%%include/parquet/metadata.h
-%%PARQUET%%include/parquet/murmur3.h
+%%PARQUET%%include/parquet/page_index.h
 %%PARQUET%%include/parquet/parquet_version.h
 %%PARQUET%%include/parquet/pch.h
 %%PARQUET%%include/parquet/platform.h
@@ -421,94 +476,77 @@ include/arrow/visitor_inline.h
 %%PARQUET%%include/parquet/type_fwd.h
 %%PARQUET%%include/parquet/types.h
 %%PARQUET%%include/parquet/windows_compatibility.h
-%%PLASMA%%include/plasma/client.h
-%%PLASMA%%include/plasma/common.h
-%%PLASMA%%include/plasma/compat.h
-%%PLASMA%%include/plasma/events.h
-%%PLASMA%%include/plasma/test_util.h
-lib/cmake/arrow/ArrowConfig.cmake
-lib/cmake/arrow/ArrowConfigVersion.cmake
-%%DATASET%%lib/cmake/arrow/ArrowDatasetConfig.cmake
-%%DATASET%%lib/cmake/arrow/ArrowDatasetConfigVersion.cmake
-%%DATASET%%lib/cmake/arrow/ArrowDatasetTargets-%%CMAKE_BUILD_TYPE%%.cmake
-%%DATASET%%lib/cmake/arrow/ArrowDatasetTargets.cmake
-%%FLIGHT%%lib/cmake/arrow/ArrowFlightConfig.cmake
-%%FLIGHT%%lib/cmake/arrow/ArrowFlightConfigVersion.cmake
-%%FLIGHT%%lib/cmake/arrow/ArrowFlightTargets-%%CMAKE_BUILD_TYPE%%.cmake
-%%FLIGHT%%lib/cmake/arrow/ArrowFlightTargets.cmake
+%%PARQUET%%include/parquet/windows_fixup.h
+%%PARQUET%%include/parquet/xxhasher.h
+lib/cmake/Arrow/ArrowConfig.cmake
+lib/cmake/Arrow/ArrowConfigVersion.cmake
+lib/cmake/Arrow/ArrowOptions.cmake
+lib/cmake/Arrow/ArrowTargets-%%CMAKE_BUILD_TYPE%%.cmake
+lib/cmake/Arrow/ArrowTargets.cmake
+%%S3%%lib/cmake/Arrow/FindAWSSDKAlt.cmake
+%%S3%%lib/cmake/Arrow/FindOpenSSLAlt.cmake
+lib/cmake/Arrow/arrow-config.cmake
+%%FLIGHT%%lib/cmake/ArrowFlight/ArrowFlightConfig.cmake
+%%FLIGHT%%lib/cmake/ArrowFlight/ArrowFlightConfigVersion.cmake
+%%FLIGHT%%lib/cmake/ArrowFlight/ArrowFlightTargets-%%CMAKE_BUILD_TYPE%%.cmake
+%%FLIGHT%%lib/cmake/ArrowFlight/ArrowFlightTargets.cmake
+%%FLIGHT%%lib/cmake/ArrowFlight/FindProtobufAlt.cmake
+%%FLIGHT%%lib/cmake/ArrowFlight/FindgRPCAlt.cmake
 %%TESTINGFLIGHT%%lib/cmake/arrow/ArrowFlightTestingConfig.cmake
 %%TESTINGFLIGHT%%lib/cmake/arrow/ArrowFlightTestingConfigVersion.cmake
 %%TESTINGFLIGHT%%lib/cmake/arrow/ArrowFlightTestingTargets-%%CMAKE_BUILD_TYPE%%.cmake
 %%TESTINGFLIGHT%%lib/cmake/arrow/ArrowFlightTestingTargets.cmake
-lib/cmake/arrow/ArrowOptions.cmake
-%%PYTHON%%lib/cmake/arrow/ArrowPythonConfig.cmake
-%%PYTHON%%lib/cmake/arrow/ArrowPythonConfigVersion.cmake
 %%PYTHONFLIGHT%%lib/cmake/arrow/ArrowPythonFlightConfig.cmake
 %%PYTHONFLIGHT%%lib/cmake/arrow/ArrowPythonFlightConfigVersion.cmake
 %%PYTHONFLIGHT%%lib/cmake/arrow/ArrowPythonFlightTargets-%%CMAKE_BUILD_TYPE%%.cmake
 %%PYTHONFLIGHT%%lib/cmake/arrow/ArrowPythonFlightTargets.cmake
-%%PYTHON%%lib/cmake/arrow/ArrowPythonTargets-%%CMAKE_BUILD_TYPE%%.cmake
-%%PYTHON%%lib/cmake/arrow/ArrowPythonTargets.cmake
-lib/cmake/arrow/ArrowTargets-%%CMAKE_BUILD_TYPE%%.cmake
-lib/cmake/arrow/ArrowTargets.cmake
-%%TESTING%%lib/cmake/arrow/ArrowTestingConfig.cmake
-%%TESTING%%lib/cmake/arrow/ArrowTestingConfigVersion.cmake
-%%TESTING%%lib/cmake/arrow/ArrowTestingTargets-%%CMAKE_BUILD_TYPE%%.cmake
-%%TESTING%%lib/cmake/arrow/ArrowTestingTargets.cmake
-lib/cmake/arrow/FindArrow.cmake
-%%DATASET%%lib/cmake/arrow/FindArrowDataset.cmake
-%%FLIGHT%%lib/cmake/arrow/FindArrowFlight.cmake
-%%PYTHON%%lib/cmake/arrow/FindArrowPython.cmake
-%%PLASMA%%lib/cmake/arrow/FindPlasma.cmake
+%%ACERO%%lib/cmake/ArrowAcero/ArrowAceroConfig.cmake
+%%ACERO%%lib/cmake/ArrowAcero/ArrowAceroConfigVersion.cmake
+%%ACERO%%lib/cmake/ArrowAcero/ArrowAceroTargets-%%CMAKE_BUILD_TYPE%%.cmake
+%%ACERO%%lib/cmake/ArrowAcero/ArrowAceroTargets.cmake
+%%DATASET%%lib/cmake/ArrowDataset/ArrowDatasetConfig.cmake
+%%DATASET%%lib/cmake/ArrowDataset/ArrowDatasetConfigVersion.cmake
+%%DATASET%%lib/cmake/ArrowDataset/ArrowDatasetTargets-%%CMAKE_BUILD_TYPE%%.cmake
+%%DATASET%%lib/cmake/ArrowDataset/ArrowDatasetTargets.cmake
 %%PYTHONFLIGHT%%lib/cmake/arrow/FindArrowPythonFlight.cmake
-%%TESTING%%lib/cmake/arrow/FindArrowTesting.cmake
-%%BROTLI%%lib/cmake/arrow/FindBrotli.cmake
-%%GANDIVA%%lib/cmake/arrow/FindGandiva.cmake
-%%LZ4%%lib/cmake/arrow/FindLz4.cmake
-%%PARQUET%%lib/cmake/arrow/FindParquet.cmake
-%%SNAPPY%%lib/cmake/arrow/FindSnappy.cmake
-%%PYTHON%%lib/cmake/arrow/Findutf8proc.cmake
-%%ZSTD%%lib/cmake/arrow/Findzstd.cmake
-%%GANDIVA%%lib/cmake/arrow/GandivaConfig.cmake
-%%GANDIVA%%lib/cmake/arrow/GandivaConfigVersion.cmake
-%%GANDIVA%%lib/cmake/arrow/GandivaTargets-%%CMAKE_BUILD_TYPE%%.cmake
-%%GANDIVA%%lib/cmake/arrow/GandivaTargets.cmake
-%%PARQUET%%lib/cmake/arrow/ParquetConfig.cmake
-%%PARQUET%%lib/cmake/arrow/ParquetConfigVersion.cmake
-%%PARQUET%%lib/cmake/arrow/ParquetTargets-%%CMAKE_BUILD_TYPE%%.cmake
-%%PARQUET%%lib/cmake/arrow/ParquetTargets.cmake
-%%PLASMA%%lib/cmake/arrow/PlasmaConfig.cmake
-%%PLASMA%%lib/cmake/arrow/PlasmaConfigVersion.cmake
-%%PLASMA%%lib/cmake/arrow/PlasmaTargets-%%CMAKE_BUILD_TYPE%%.cmake
-%%PLASMA%%lib/cmake/arrow/PlasmaTargets.cmake
-lib/cmake/arrow/arrow-config.cmake
+%%TESTING%%lib/cmake/ArrowTesting/ArrowTestingConfig.cmake
+%%TESTING%%lib/cmake/ArrowTesting/ArrowTestingConfigVersion.cmake
+%%TESTING%%lib/cmake/ArrowTesting/ArrowTestingTargets-%%CMAKE_BUILD_TYPE%%.cmake
+%%TESTING%%lib/cmake/ArrowTesting/ArrowTestingTargets.cmake
+%%TESTING%%lib/cmake/ArrowTesting/FindGTestAlt.cmake
+%%GANDIVA%%lib/cmake/Gandiva/FindLLVMAlt.cmake
+%%GANDIVA%%lib/cmake/Gandiva/GandivaAddBitcode.cmake
+%%GANDIVA%%lib/cmake/Gandiva/GandivaConfig.cmake
+%%GANDIVA%%lib/cmake/Gandiva/GandivaConfigVersion.cmake
+%%GANDIVA%%lib/cmake/Gandiva/GandivaTargets-%%CMAKE_BUILD_TYPE%%.cmake
+%%GANDIVA%%lib/cmake/Gandiva/GandivaTargets.cmake
+%%PARQUET%%lib/cmake/Parquet/FindThriftAlt.cmake
+%%PARQUET%%lib/cmake/Parquet/ParquetConfig.cmake
+%%PARQUET%%lib/cmake/Parquet/ParquetConfigVersion.cmake
+%%PARQUET%%lib/cmake/Parquet/ParquetTargets-%%CMAKE_BUILD_TYPE%%.cmake
+%%PARQUET%%lib/cmake/Parquet/ParquetTargets.cmake
 lib/libarrow.so
-lib/libarrow.so.400
-lib/libarrow.so.400.1.0
+lib/libarrow.so.1500
+lib/libarrow.so.1500.2.0
+%%ACERO%%lib/libarrow_acero.so
+%%ACERO%%lib/libarrow_acero.so.1500
+%%ACERO%%lib/libarrow_acero.so.1500.2.0
 %%DATASET%%lib/libarrow_dataset.so
-%%DATASET%%lib/libarrow_dataset.so.400
-%%DATASET%%lib/libarrow_dataset.so.400.1.0
+%%DATASET%%lib/libarrow_dataset.so.1500
+%%DATASET%%lib/libarrow_dataset.so.1500.2.0
 %%FLIGHT%%lib/libarrow_flight.so
-%%FLIGHT%%lib/libarrow_flight.so.400
-%%FLIGHT%%lib/libarrow_flight.so.400.1.0
-%%PYTHON%%lib/libarrow_python%%PYTHON_SUFFIX%%.so
-%%PYTHON%%lib/libarrow_python%%PYTHON_SUFFIX%%.so.400
-%%PYTHON%%lib/libarrow_python%%PYTHON_SUFFIX%%.so.400.1.0
-%%PYTHONFLIGHT%%lib/libarrow_python%%PYTHON_SUFFIX%%_flight.so
-%%PYTHONFLIGHT%%lib/libarrow_python%%PYTHON_SUFFIX%%_flight.so.400
-%%PYTHONFLIGHT%%lib/libarrow_python%%PYTHON_SUFFIX%%_flight.so.400.1.0
+%%FLIGHT%%lib/libarrow_flight.so.1500
+%%FLIGHT%%lib/libarrow_flight.so.1500.2.0
 %%TESTING%%lib/libarrow_testing.so
-%%TESTING%%lib/libarrow_testing.so.400
-%%TESTING%%lib/libarrow_testing.so.400.1.0
+%%TESTING%%lib/libarrow_testing.so.1500
+%%TESTING%%lib/libarrow_testing.so.1500.2.0
 %%GANDIVA%%lib/libgandiva.so
-%%GANDIVA%%lib/libgandiva.so.400
-%%GANDIVA%%lib/libgandiva.so.400.1.0
+%%GANDIVA%%lib/libgandiva.so.1500
+%%GANDIVA%%lib/libgandiva.so.1500.2.0
 %%PARQUET%%lib/libparquet.so
-%%PARQUET%%lib/libparquet.so.400
-%%PARQUET%%lib/libparquet.so.400.1.0
-%%PLASMA%%lib/libplasma.so
-%%PLASMA%%lib/libplasma.so.400
-%%PLASMA%%lib/libplasma.so.400.1.0
+%%PARQUET%%lib/libparquet.so.1500
+%%PARQUET%%lib/libparquet.so.1500.2.0
+%%ACERO%%libdata/pkgconfig/arrow-acero.pc
 %%COMPUTE%%libdata/pkgconfig/arrow-compute.pc
 %%CSV%%libdata/pkgconfig/arrow-csv.pc
 %%DATASET%%libdata/pkgconfig/arrow-dataset.pc
@@ -516,9 +554,9 @@ lib/libarrow.so.400.1.0
 %%FLIGHT%%libdata/pkgconfig/arrow-flight.pc
 %%JSON%%libdata/pkgconfig/arrow-json.pc
 %%PYTHONFLIGHT%%libdata/pkgconfig/arrow-python%%PYTHON_SUFFIX%%-flight.pc
-%%PYTHON%%libdata/pkgconfig/arrow-python%%PYTHON_SUFFIX%%.pc
 %%TESTING%%libdata/pkgconfig/arrow-testing.pc
 libdata/pkgconfig/arrow.pc
 %%GANDIVA%%libdata/pkgconfig/gandiva.pc
 %%PARQUET%%libdata/pkgconfig/parquet.pc
-%%PLASMA%%libdata/pkgconfig/plasma.pc
+%%DATADIR%%/gdb/gdb_arrow.py
+share/gdb/auto-load/usr/local/lib/libarrow.so.1500.2.0-gdb.py
diff --git a/databases/ateam_mysql57_ldap_auth/Makefile b/databases/ateam_mysql57_ldap_auth/Makefile
deleted file mode 100644
index 37eb88bd72af..000000000000
--- a/databases/ateam_mysql57_ldap_auth/Makefile
+++ /dev/null
@@ -1,47 +0,0 @@
-# Created by: Ganbold Tsagaankhuu <ganbold@FreeBSD.org>
-
-PORTNAME=	ateam_mysql57_ldap_auth
-PORTVERSION=	1.0
-PORTREVISION=	1
-CATEGORIES=	databases
-
-MAINTAINER=	ganbold@FreeBSD.org
-COMMENT=	A-Team MySQL LDAP authentication plugin
-
-LICENSE=	GPLv2
-LICENSE_FILE=	${WRKSRC}/COPYING
-
-IGNORE_WITH_MYSQL=	56 80 101m 102m 103m
-
-LIB_DEPENDS=	libconfig.so:devel/libconfig
-
-USES=		compiler:c++11-lang gmake mysql:57,client,server
-USE_OPENLDAP=	yes
-
-USE_GITHUB=	yes
-GH_ACCOUNT=	ateamsystems
-GH_TAGNAME=	f6d79fb
-
-PLIST_FILES=	lib/mysql/plugin/auth_ldap.so \
-		"@sample etc/ateam_mysql_ldap_auth.conf.sample"
-PORTDOCS=	README INSTALL
-
-OPTIONS_DEFINE=	DOCS
-
-SUB_FILES=	pkg-message
-
-MAKE_ARGS=	CC="${CC}"
-
-do-install:
-	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/mysql/plugin
-	${INSTALL_PROGRAM} ${WRKSRC}/src/auth_ldap.so \
-		${STAGEDIR}${PREFIX}/lib/mysql/plugin
-	${INSTALL_DATA} ${WRKSRC}/ateam_mysql_ldap_auth.conf \
-		${STAGEDIR}${PREFIX}/etc/ateam_mysql_ldap_auth.conf.sample
-
-do-install-DOCS-on:
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/INSTALL ${STAGEDIR}${DOCSDIR}
-
-.include <bsd.port.mk>
diff --git a/databases/ateam_mysql57_ldap_auth/distinfo b/databases/ateam_mysql57_ldap_auth/distinfo
deleted file mode 100644
index b8dce6744fad..000000000000
--- a/databases/ateam_mysql57_ldap_auth/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1593015605
-SHA256 (ateamsystems-ateam_mysql57_ldap_auth-1.0-f6d79fb_GH0.tar.gz) = 0f175183472d89bc8dde450b2fc3d5f6562900a912898898ef9dcd32498bb875
-SIZE (ateamsystems-ateam_mysql57_ldap_auth-1.0-f6d79fb_GH0.tar.gz) = 18081
diff --git a/databases/ateam_mysql57_ldap_auth/files/pkg-message.in b/databases/ateam_mysql57_ldap_auth/files/pkg-message.in
deleted file mode 100644
index fd841b038634..000000000000
--- a/databases/ateam_mysql57_ldap_auth/files/pkg-message.in
+++ /dev/null
@@ -1,4 +0,0 @@
----------------------------------------------------------------------
-Please see %%DOCSDIR%%/INSTALL
-for install notes.
----------------------------------------------------------------------
diff --git a/databases/ateam_mysql57_ldap_auth/pkg-descr b/databases/ateam_mysql57_ldap_auth/pkg-descr
deleted file mode 100644
index 5779311202ab..000000000000
--- a/databases/ateam_mysql57_ldap_auth/pkg-descr
+++ /dev/null
@@ -1,24 +0,0 @@
-A-Team MySQL LDAP Authenticator
-WWW: https://github.com/ateamsystems/ateam_mysql_ldap_auth
----------------------------------------------------------------------------- -
-A-Team MySQL LDAP Authenticator (ateam_mysql_ldap_auth) is an authentication
-plugin for MySQL 5.5.7 and up, and has been tested with 5.6 under FreeBSD.
-This module allows you to create MySQL users that are then authenticated
-against an LDAP server. This reduces administrative overhead and eliminates
-your users having to remember a seperate username and password for MySQL.
-Just like MySQL Enterprise's PAM module, for client side authentication
-this plugin uses the clear_text password module as the LDAP server must
-perform the password hashing and comparison.  For command line clients this
-is done by setting the following environment variable:
-
-  export LIBMYSQL_ENABLE_CLEARTEXT_PLUGIN=1
-
-In MySQL Workbench this is acheived by going to go to the "Advanced" tab and
-checking "Enable Cleartext Authentication Plugin" when editing a connction.
-
-!!! IMPORTANT:
-!!! ------------------------------------------------------------------------
-!!! ENSURE THE COMMUNICATIONS PATH BETWEEN THE CLIENT AND SERVER IS SECURE!
-!!! ------------------------------------------------------------------------
-!!! By default MySQL does not use SSL so additional steps and network design
-!!! are needed to ensure you're not exposing your credetials.
diff --git a/databases/ateam_mysql_ldap_auth/Makefile b/databases/ateam_mysql_ldap_auth/Makefile
deleted file mode 100644
index c2ba494c1f53..000000000000
--- a/databases/ateam_mysql_ldap_auth/Makefile
+++ /dev/null
@@ -1,45 +0,0 @@
-# Created by: Ganbold Tsagaankhuu <ganbold@FreeBSD.org>
-
-PORTNAME=	ateam_mysql_ldap_auth
-PORTVERSION=	1.0
-PORTREVISION=	2
-CATEGORIES=	databases
-
-MAINTAINER=	ganbold@FreeBSD.org
-COMMENT=	A-Team MySQL LDAP authentication plugin
-
-LICENSE=	GPLv2
-LICENSE_FILE=	${WRKSRC}/COPYING
-
-LIB_DEPENDS=	libconfig.so:devel/libconfig
-
-USE_OPENLDAP=	yes
-USES=		gmake mysql:client,server
-
-IGNORE_WITH_MYSQL=	57 80 101m 102m 103m 57p 57w
-
-USE_GITHUB=	yes
-GH_ACCOUNT=	ateamsystems
-GH_TAGNAME=	f6a1a5d
-
-PLIST_FILES=	lib/mysql/plugin/auth_ldap.so \
-		"@sample etc/ateam_mysql_ldap_auth.conf.sample"
-PORTDOCS=	README INSTALL
-
-OPTIONS_DEFINE=	DOCS
-
-SUB_FILES=	pkg-message
-
-do-install:
-	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/mysql/plugin
-	${INSTALL_PROGRAM} ${WRKSRC}/src/auth_ldap.so \
-		${STAGEDIR}${PREFIX}/lib/mysql/plugin
-	${INSTALL_DATA} ${WRKSRC}/ateam_mysql_ldap_auth.conf \
-		${STAGEDIR}${PREFIX}/etc/ateam_mysql_ldap_auth.conf.sample
-
-do-install-DOCS-on:
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/INSTALL ${STAGEDIR}${DOCSDIR}
-
-.include <bsd.port.mk>
diff --git a/databases/ateam_mysql_ldap_auth/distinfo b/databases/ateam_mysql_ldap_auth/distinfo
deleted file mode 100644
index 2ec86012d1cc..000000000000
--- a/databases/ateam_mysql_ldap_auth/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (ateamsystems-ateam_mysql_ldap_auth-1.0-f6a1a5d_GH0.tar.gz) = 3a20533fb4fed93daad0e8944ab6e8ae530ecbebefd95240b1e60f3c5ca5ec9c
-SIZE (ateamsystems-ateam_mysql_ldap_auth-1.0-f6a1a5d_GH0.tar.gz) = 17971
diff --git a/databases/ateam_mysql_ldap_auth/files/pkg-message.in b/databases/ateam_mysql_ldap_auth/files/pkg-message.in
deleted file mode 100644
index 85ba9c30cac8..000000000000
--- a/databases/ateam_mysql_ldap_auth/files/pkg-message.in
+++ /dev/null
@@ -1,8 +0,0 @@
-[
-{ type: install
-  message: <<EOM
-Please see %%DOCSDIR%%/INSTALL
-for install notes.
-EOM
-}
-]
diff --git a/databases/ateam_mysql_ldap_auth/pkg-descr b/databases/ateam_mysql_ldap_auth/pkg-descr
deleted file mode 100644
index e8e43e525657..000000000000
--- a/databases/ateam_mysql_ldap_auth/pkg-descr
+++ /dev/null
@@ -1,23 +0,0 @@
-A-Team MySQL LDAP Authenticator (ateam_mysql_ldap_auth) is an authentication
-plugin for MySQL 5.5.7 and up, and has been tested with 5.6 under FreeBSD.
-This module allows you to create MySQL users that are then authenticated
-against an LDAP server. This reduces administrative overhead and eliminates
-your users having to remember a seperate username and password for MySQL.
-Just like MySQL Enterprise's PAM module, for client side authentication
-this plugin uses the clear_text password module as the LDAP server must
-perform the password hasing and comparison.  For command line clients this
-is done by setting the following environment variable:
-
-  export LIBMYSQL_ENABLE_CLEARTEXT_PLUGIN=1
-
-In MySQL Workbench this is acheived by going to go to the "Advanced" tab and
-checking "Enable Cleartext Authentication Plugin" when editing a connction.
-
-!!! IMPORTANT:
-!!! ------------------------------------------------------------------------
-!!! ENSURE THE COMMUNICATIONS PATH BETWEEN THE CLIENT AND SERVER IS SECURE!
-!!! ------------------------------------------------------------------------
-!!! By default MySQL does not use SSL so additional steps and network design
-!!! are needed to ensure you're not exposing your credetials.
-
-WWW: https://github.com/ateamsystems/ateam_mysql_ldap_auth
diff --git a/databases/autobackupmysql/Makefile b/databases/autobackupmysql/Makefile
index ff37cc4a692b..2bf4ae0b8b70 100644
--- a/databases/autobackupmysql/Makefile
+++ b/databases/autobackupmysql/Makefile
@@ -1,5 +1,3 @@
-# Created by: Frank Wall <fw@moov.de>
-
 PORTNAME=	autobackupmysql
 PORTVERSION=	1.4
 CATEGORIES=	databases
@@ -9,6 +7,7 @@ EXTRACT_SUFX=	.sh
 
 MAINTAINER=	fw@moov.de
 COMMENT=	Make daily, weekly, and monthly backups of your MySQL databases
+WWW=		https://sourceforge.net/projects/autobackupmysql/
 
 RUN_DEPENDS=	${LOCALBASE}/bin/bash:shells/bash
 
diff --git a/databases/autobackupmysql/pkg-descr b/databases/autobackupmysql/pkg-descr
index fe25acb1c02b..edaa9c3bfb2b 100644
--- a/databases/autobackupmysql/pkg-descr
+++ b/databases/autobackupmysql/pkg-descr
@@ -7,5 +7,3 @@ Features:
 - Compress backup files
 - Backup remote servers
 - E-mail logs
-
-WWW: https://sourceforge.net/projects/autobackupmysql/
diff --git a/databases/automysqlbackup/Makefile b/databases/automysqlbackup/Makefile
index 77e6489f7395..afd7a43c06df 100644
--- a/databases/automysqlbackup/Makefile
+++ b/databases/automysqlbackup/Makefile
@@ -6,6 +6,7 @@ MASTER_SITES=	SF/automysqlbackup/AutoMySQLBackup/AutoMySQLBackup%20VER%203.0
 
 MAINTAINER=	me@cschwarz.com
 COMMENT=	Automatic MySQL Backup Tool
+WWW=		https://sourceforge.net/projects/automysqlbackup
 
 LICENSE=	GPLv2
 
diff --git a/databases/automysqlbackup/pkg-descr b/databases/automysqlbackup/pkg-descr
index 4fc5f4e74eac..262c74487982 100644
--- a/databases/automysqlbackup/pkg-descr
+++ b/databases/automysqlbackup/pkg-descr
@@ -7,5 +7,3 @@ Other Features include:
 - Backup Compression and Encryption
 - Configurable backup rotation
 - Incremental database backups
-
-WWW: https://sourceforge.net/projects/automysqlbackup
diff --git a/databases/bbdb/Makefile b/databases/bbdb/Makefile
index d6c59b3c188e..ce22e44242fe 100644
--- a/databases/bbdb/Makefile
+++ b/databases/bbdb/Makefile
@@ -1,30 +1,28 @@
-# Created by: Yoichi NAKAYAMA <yoichi@FreeBSD.org>
-
 PORTNAME=	bbdb
 DISTVERSIONPREFIX=	v
-DISTVERSION=	3.2
-PORTREVISION=	4
+DISTVERSION=	3.2.2a
+PORTREVISION=	8
 CATEGORIES=	databases elisp
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	emacs@FreeBSD.org
 COMMENT=	Big Brother Database
+WWW=		https://savannah.nongnu.org/projects/bbdb/
 
 LICENSE=	GPLv3+
 
-.if ${FLAVOR:U} == devel_full || ${FLAVOR:U} == devel_nox
-BROKEN=		Error occurred processing bbdb.el: Wrong type argument ((stringp nil))
-.endif
-
 BUILD_DEPENDS=	texi2dvi:print/texinfo
 
 USES=		autoreconf emacs
 USE_GITHUB=	yes
 GH_ACCOUNT=	emacsmirror
-USE_TEX=	latex:build
+GH_TAGNAME=	a50c89a
 
 BBDB_LISPDIR=	${EMACS_SITE_LISPDIR}/${PORTNAME}
 GNU_CONFIGURE=	yes
+
+CONFLICTS_INSTALL=	bbdb bbdb-emacs_* # share/doc/bbdb/bbdb.pdf
+
 # Do not install the info file.  Upstream has yet to add any real content to it.
 #INFO=		bbdb
 PORTDOCS=	bbdb.pdf
@@ -32,6 +30,9 @@ NO_ARCH=	yes
 PLIST_SUB+=	BBDB_LISPDIR=${BBDB_LISPDIR}
 
 OPTIONS_DEFINE=	DOCS
+DOCS_USES=	tex
+DOCS_USE=	TEX=latex:build
+DOCS_CONFIGURE_ENABLE=	docs
 
 # See http://lists.nongnu.org/archive/html/bbdb-user/2018-11/msg00003.html
 .if ${FLAVOR:U} != devel_full && ${FLAVOR:U} != devel_nox
diff --git a/databases/bbdb/distinfo b/databases/bbdb/distinfo
index 2f18b76c1ced..77eec132116c 100644
--- a/databases/bbdb/distinfo
+++ b/databases/bbdb/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1542049821
-SHA256 (emacsmirror-bbdb-v3.2_GH0.tar.gz) = 36482abe5e9c11b9262334ae741b8828b9e76e708e54900559a70974f9f0b5df
-SIZE (emacsmirror-bbdb-v3.2_GH0.tar.gz) = 189456
+TIMESTAMP = 1649185489
+SHA256 (emacsmirror-bbdb-v3.2.2a-a50c89a_GH0.tar.gz) = 07bacd44de94722bdca41e4145680bd6c008105d8c809bba99db61177ea11d50
+SIZE (emacsmirror-bbdb-v3.2.2a-a50c89a_GH0.tar.gz) = 198766
diff --git a/databases/bbdb/pkg-descr b/databases/bbdb/pkg-descr
index 76a4bd072d1a..c7bc658e6b88 100644
--- a/databases/bbdb/pkg-descr
+++ b/databases/bbdb/pkg-descr
@@ -3,5 +3,3 @@ address book for email and snail mail addresses, phone numbers and the
 like. It can be linked with various Emacs mail clients (Message and Mail
 mode, Rmail, Gnus, MH-E, Mu4e, VM, and Wanderlust). BBDB is fully
 customizable.
-
-WWW: http://savannah.nongnu.org/projects/bbdb/
diff --git a/databases/beansdb/Makefile b/databases/beansdb/Makefile
index 375c1b643eac..71b2d817c1d8 100644
--- a/databases/beansdb/Makefile
+++ b/databases/beansdb/Makefile
@@ -1,12 +1,12 @@
-# Created by: Qing Feng <qingfeng@douban.com>
-
 PORTNAME=	beansdb
 PORTVERSION=	0.7.1.4
+PORTREVISION=	1
 DISTVERSIONPREFIX=	v
 CATEGORIES=	databases
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Yet another distributed key-value storage system from Douban Inc
+WWW=		https://github.com/douban/beansdb
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
@@ -16,7 +16,8 @@ GH_ACCOUNT=	douban
 
 USES=		autoreconf
 GNU_CONFIGURE=	yes
+GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
 
-PLIST_FILES=	bin/beansdb man/man1/beansdb.1.gz
+PLIST_FILES=	bin/beansdb share/man/man1/beansdb.1.gz
 
 .include <bsd.port.mk>
diff --git a/databases/beansdb/pkg-descr b/databases/beansdb/pkg-descr
index 19a2ddef0169..a053e366db7b 100644
--- a/databases/beansdb/pkg-descr
+++ b/databases/beansdb/pkg-descr
@@ -2,5 +2,3 @@ BeansDB is a major amount of data for large, high-availability storage
 systems distributed KeyValue using HashTree and simplified version
 number to quickly synchronize to ensure consistency in the final (weak),
 a simplified version of the Dynamo.
-
-WWW: https://github.com/douban/beansdb
diff --git a/databases/buzhug/Makefile b/databases/buzhug/Makefile
index 972690f5f460..41e38a75cefa 100644
--- a/databases/buzhug/Makefile
+++ b/databases/buzhug/Makefile
@@ -1,5 +1,3 @@
-# Created by: Wen Heping <wenheping@gmail.com>
-
 PORTNAME=	buzhug
 PORTVERSION=	1.8
 PORTREVISION=	1
@@ -8,8 +6,9 @@ MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Pure-Python database engine
+WWW=		https://buzhug.sourceforge.net/
 
-USES=		python:3.6+ zip
+USES=		dos2unix python zip
 USE_PYTHON=	distutils autoplist concurrent optsuffix
 
 .include <bsd.port.mk>
diff --git a/databases/buzhug/files/patch-2to3 b/databases/buzhug/files/patch-2to3
new file mode 100644
index 000000000000..8fe1a4507903
--- /dev/null
+++ b/databases/buzhug/files/patch-2to3
@@ -0,0 +1,1032 @@
+--- buzhug/buzhug_algos.py.orig	2022-03-15 18:59:32 UTC
++++ buzhug/buzhug_algos.py
+@@ -28,11 +28,11 @@ def make_search_func(db,field,value):
+     if isinstance(value,(list,tuple)):
+         value = list(value)
+         if not len(value)==2:
+-            raise ValueError,"If argument is a list, only 2 values \
+-                should be passed (found %s)" %len(value)
++            raise ValueError("If argument is a list, only 2 values \
++                should be passed (found %s)" %len(value))
+         if not db.fields[field] in [int,float,date,datetime]:
+-            raise TypeError,"Search between values is only allowed for " \
+-                "int, float, date and datetime (found %s)" %db.fields[field]
++            raise TypeError("Search between values is only allowed for " \
++                "int, float, date and datetime (found %s)" %db.fields[field])
+         db._validate(field,value[0])
+         db._validate(field,value[1])
+         value.sort()
+@@ -110,15 +110,15 @@ def fast_select(db,names,**args):
+     used to select a subset of record rows in field files
+     """
+     # fixed and variable length fields
+-    f_args = [ (k,v) for k,v in args.iteritems() 
++    f_args = [ (k,v) for k,v in args.items() 
+         if hasattr(db._file[k],'block_len') ]
+-    v_args = [ (k,v) for (k,v) in args.iteritems() 
++    v_args = [ (k,v) for (k,v) in args.items() 
+         if not hasattr(db._file[k],'block_len') ]
+     arg_names = [ k for k,v in f_args + v_args ]
+     no_args = [ n for n in names if not n in arg_names ]
+     names = arg_names + no_args
+ 
+-    [ db._file[k].seek(0) for k in names + args.keys() ]
++    [ db._file[k].seek(0) for k in names + list(args.keys()) ]
+     max_len = max([ db._file[k[0]].block_len for k in f_args ])
+     num_blocks = db.BLOCKSIZE / max_len
+     funcs = dict([(k,make_search_func(db,k,v)) 
+@@ -148,7 +148,7 @@ def fast_select(db,names,**args):
+             res[bl_offset+c] = [ ranks[k][c] for k,v in f_args ]
+         bl_offset += num_blocks
+ 
+-    fl_ranks = res.keys()
++    fl_ranks = list(res.keys())
+     fl_ranks.sort()
+ 
+     # The field files for the other arguments are browsed ; if their
+@@ -162,7 +162,7 @@ def fast_select(db,names,**args):
+     for f in other_files:
+         f.seek(0)
+ 
+-    for i,lines in enumerate(itertools.izip(*other_files)):
++    for i,lines in enumerate(zip(*other_files)):
+         try:
+             if i == fl_ranks[0]:
+                 fl_ranks.pop(0)
+--- buzhug/buzhug_files.py.orig	2022-03-15 18:59:32 UTC
++++ buzhug/buzhug_files.py
+@@ -149,8 +149,8 @@ class StringFile(VariableLengthFile):
+         if value is None:
+             return '!\n'
+         elif not isinstance(value,str):
+-            raise ValueError,'Bad type : expected str, got %s %s' %(value,
+-                    value.__class__)
++            raise ValueError('Bad type : expected str, got %s %s' %(value,
++                    value.__class__))
+         else:
+             # escape CR & LF so that the block is on one line
+             value = value.replace('\\','\\\\')
+@@ -192,9 +192,9 @@ class UnicodeFile(StringFile):
+     def to_block(self,value):
+         if value is None:
+             return '!\n'
+-        elif not isinstance(value,unicode):
+-            raise ValueError,'Bad type : expected unicode, got %s %s' %(value,
+-                    value.__class__)
++        elif not isinstance(value,str):
++            raise ValueError('Bad type : expected unicode, got %s %s' %(value,
++                    value.__class__))
+         else:
+             return StringFile.to_block(self,value.encode('utf-8'))
+     
+@@ -220,8 +220,8 @@ class DateFile(VariableLengthFile):
+         if value is None:
+             return '!xxxxxxxx\n'
+         elif not isinstance(value,date):
+-            raise ValueError,'Bad type : expected datetime.date, got %s %s' \
+-                %(value,value.__class__)
++            raise ValueError('Bad type : expected datetime.date, got %s %s' \
++                %(value,value.__class__))
+         else:
+             if value.year>=1900:
+                 return value.strftime('-%Y%m%d')+'\n'
+@@ -243,8 +243,8 @@ class DateTimeFile(VariableLengthFile):
+         if value is None:
+             return '!xxxxxxxxxxxxxx\n'
+         elif not isinstance(value,date):
+-            raise ValueError,'Bad type : expected datetime.date, got %s %s' \
+-                %(value,value.__class__)
++            raise ValueError('Bad type : expected datetime.date, got %s %s' \
++                %(value,value.__class__))
+         else:
+             if value.year>=1900:
+                 return value.strftime('-%Y%m%d%H%M%S')+'\n'
+@@ -272,8 +272,8 @@ class TimeFile(VariableLengthFile):
+         if value is None:
+             return '!xxxxxx\n'
+         elif not isinstance(value, dtime):
+-            raise ValueError,'Bad type : expected datetime.time, got %s %s' \
+-                %(value,value.__class__)
++            raise ValueError('Bad type : expected datetime.time, got %s %s' \
++                %(value,value.__class__))
+         else:
+             return value.strftime('-%H%M%S')+'\n'
+     
+@@ -291,8 +291,8 @@ class BooleanFile(FixedLengthFile):
+         if value is None:
+             return '!'+chr(0)
+         elif not isinstance(value,bool):
+-            raise ValueError,'Bad type : expected bool, got %s %s' \
+-                %(value,value.__class__)
++            raise ValueError('Bad type : expected bool, got %s %s' \
++                %(value,value.__class__))
+         else:
+             if value:
+                 return '-1'
+@@ -317,15 +317,15 @@ class IntegerFile(FixedLengthFile):
+         if value is None:
+             return '!'+chr(0)*4
+         elif not isinstance(value,int):
+-            raise ValueError,'Bad type : expected int, got %s %s' \
+-                %(value,value.__class__)
++            raise ValueError('Bad type : expected int, got %s %s' \
++                %(value,value.__class__))
+         else:
+-            if value <= -sys.maxint/2:
+-                raise OverflowError,"Integer value must be > %s, got %s" \
+-                    %(-sys.maxint/2,value)
+-            if value > sys.maxint/2:
+-                raise OverflowError,"Integer value must be <= %s, got %s" \
+-                    %(sys.maxint/2,value)
++            if value <= -sys.maxsize/2:
++                raise OverflowError("Integer value must be > %s, got %s" \
++                    %(-sys.maxsize/2,value))
++            if value > sys.maxsize/2:
++                raise OverflowError("Integer value must be <= %s, got %s" \
++                    %(sys.maxsize/2,value))
+             return '-'+struct.pack('>i',value+self.MIDINT)
+ 
+     def from_block(self,block):
+@@ -370,8 +370,8 @@ class FloatFile(FixedLengthFile):
+         if value is None:
+             return '!'+chr(0)*9
+         elif not isinstance(value,float):
+-            raise ValueError,'Bad type : expected float, got %s %s' \
+-                %(value,value.__class__)
++            raise ValueError('Bad type : expected float, got %s %s' \
++                %(value,value.__class__))
+         elif value == 0.0:
+             return '-'+chr(128)+chr(0)*8
+         else:
+--- buzhug/buzhug_info.py.orig	2022-03-15 18:59:32 UTC
++++ buzhug/buzhug_info.py
+@@ -2,7 +2,7 @@
+ field definitions with types and default values"""
+ 
+ import os
+-import urllib
++import urllib.request, urllib.parse, urllib.error
+ 
+ def set_info(base,fields):
+     base.defaults = {}
+@@ -13,28 +13,28 @@ def validate_field(base,field_def):
+     """Validate field definition"""
+     name,typ = field_def[:2]
+     if name in ['__id__','__version__']:
+-        raise ValueError,'Field name "%s" is reserved' %name
++        raise ValueError('Field name "%s" is reserved' %name)
+     elif name.startswith('_'):
+-        raise ValueError,"Error for %s : names can't begin with _" \
+-            % name
+-    if typ not in base.types.values():
++        raise ValueError("Error for %s : names can't begin with _" \
++            % name)
++    if typ not in list(base.types.values()):
+         if isinstance(typ,base.__class__): # external link
+             base._register_base(typ)
+         else:
+-            raise TypeError,"type %s not allowed" %typ    
++            raise TypeError("type %s not allowed" %typ)    
+     if len(field_def)>2:
+         # if a default value is provided, check if it is valid
+         default = field_def[2]
+         if isinstance(typ,base.__class__):
+             if not hasattr(default.__class__,"db") or \
+                 not default.__class__.db is typ:
+-                raise ValueError,'Incorrect default value for field "%s"' \
++                raise ValueError('Incorrect default value for field "%s"' \
+                     " : expected %s, got %s (class %s)" %(name,typ,
+-                        default,default.__class__)
++                        default,default.__class__))
+         elif not isinstance(default,typ):
+-            raise ValueError,'Incorrect default value for field "%s"' \
++            raise ValueError('Incorrect default value for field "%s"' \
+                 " : expected %s, got %s (class %s)" %(name,typ,
+-                    default,default.__class__)
++                    default,default.__class__))
+         base.defaults[name] = default
+     else:
+         base.defaults[name] = None
+@@ -45,13 +45,13 @@ def save_info(base):
+     fields = []
+     for k in base.field_names:
+         if isinstance(base.fields[k],base.__class__):
+-            fields.append((k,'<base>'+urllib.quote(base.fields[k].name)))
++            fields.append((k,'<base>'+urllib.parse.quote(base.fields[k].name)))
+         else:
+             fields.append((k,base.fields[k].__name__))
+     _info.write(' '.join(['%s:%s' %(k,v) for (k,v) in fields]))
+     _info.close()
+     out = open(os.path.join(base.name,"__defaults__"),"wb")
+-    for field_name,default_value in base.defaults.iteritems():
++    for field_name,default_value in base.defaults.items():
+         if field_name in ["__id__","__version__"]:
+             continue
+         value = base._file[field_name].to_block(default_value)
+@@ -59,7 +59,7 @@ def save_info(base):
+     out.close()
+ 
+ def read_defaults(base):
+-    import buzhug_files
++    from . import buzhug_files
+     defaults = dict([(f,None) for f in base.field_names[2:]])
+     if os.path.exists(os.path.join(base.name,"__defaults__")):
+         defs = open(os.path.join(base.name,"__defaults__"),"rb").read()
+--- buzhug/buzhug_test.py.orig	2022-03-15 18:59:32 UTC
++++ buzhug/buzhug_test.py
+@@ -3,8 +3,8 @@ import random
+ import re
+ 
+ from datetime import date, datetime, time as dtime
+-from buzhug import Base, TS_Base, Record
+-import buzhug,buzhug_files
++from .buzhug import Base, TS_Base, Record
++from . import buzhug,buzhug_files
+ 
+ 
+ names = ['pierre','claire','simon','camille','jean',
+@@ -18,7 +18,7 @@ def run_test(thread_safe=False):
+     else:
+         db = TS_Base('dummy')
+ 
+-    db.create(('name',str), ('fr_name',unicode),
++    db.create(('name',str), ('fr_name',str),
+         ('age',int),
+         ('size',int,300),
+         ('birth',date,date(1994,1,14)),
+@@ -38,10 +38,10 @@ def run_test(thread_safe=False):
+             try:
+                 assert cmp(afloat,0.0) == cmp(f.to_block(afloat),f.to_block(0.0))
+             except:
+-                print afloat
+-                print "afloat > 0.0 ?",afloat>0.0
+-                print "blocks ?",f.to_block(afloat)>f.to_block(0.0)
+-                print all(f.to_block(afloat)),all(f.to_block(0.0))
++                print(afloat)
++                print("afloat > 0.0 ?",afloat>0.0)
++                print("blocks ?",f.to_block(afloat)>f.to_block(0.0))
++                print(all(f.to_block(afloat)),all(f.to_block(0.0)))
+                 raise
+ 
+     assert db.defaults["age"] == None
+@@ -52,7 +52,7 @@ def run_test(thread_safe=False):
+ 
+     for i in range(100):
+         db.insert(name=random.choice(names),
+-             fr_name = unicode(random.choice(fr_names),'latin-1'),
++             fr_name = str(random.choice(fr_names),'latin-1'),
+              age=random.randint(7,47),size=random.randint(110,175),
+              birth=date(random.randint(1858,1999),random.randint(1,12),10),
+              afloat = random.uniform(-10**random.randint(-307,307),
+@@ -60,8 +60,8 @@ def run_test(thread_safe=False):
+              birth_hour = dtime(random.randint(0, 23), random.randint(0, 59), random.randint(0, 59)))
+ 
+     assert len(db)==100
+-    assert isinstance(db[50].fr_name,unicode)
+-    print db[50].fr_name.encode('latin-1')
++    assert isinstance(db[50].fr_name,str)
++    print(db[50].fr_name.encode('latin-1'))
+ 
+     db.open()
+     # test if default values have not been modified after open()
+@@ -74,7 +74,7 @@ def run_test(thread_safe=False):
+     for i in range(5):
+         # insert a list
+         db.insert(random.choice(names),
+-             unicode(random.choice(fr_names),'latin-1'),
++             str(random.choice(fr_names),'latin-1'),
+              random.randint(7,47),random.randint(110,175),
+              date(random.randint(1958,1999),random.randint(1,12),10),
+              random.uniform(-10**random.randint(-307,307),
+@@ -87,11 +87,11 @@ def run_test(thread_safe=False):
+             try:
+                 assert getattr(db[-1],field) == db.defaults[field]
+             except:
+-                print "attribute %s not set to default value %s" %(field,db[-1])
++                print("attribute %s not set to default value %s" %(field,db[-1]))
+                 raise
+ 
+     # insert as string
+-    db.set_string_format(unicode,'latin-1')
++    db.set_string_format(str,'latin-1')
+     db.set_string_format(date,'%d-%m-%y')
+     db.set_string_format(dtime,'%H-%M-%S')
+     db.insert_as_strings(name="testname",fr_name=random.choice(fr_names),
+@@ -112,13 +112,13 @@ def run_test(thread_safe=False):
+     assert db[-1].afloat == 1.0
+ 
+     # search between 2 dates
+-    print '\nBirth between 1960 and 1970'
++    print('\nBirth between 1960 and 1970')
+     for r in db.select(None,birth=[date(1960,1,1),date(1970,12,13)]):
+-        print r.name,r.birth
++        print(r.name,r.birth)
+ 
+-    print "sorted"
++    print("sorted")
+     for r in db.select(None,birth=[date(1960,1,1),date(1970,12,13)]).sort_by('+name-birth'):
+-        print r.name,r.birth
++        print(r.name,r.birth)
+ 
+     f = buzhug_files.FloatFile().to_block
+     def all(v):
+@@ -136,28 +136,28 @@ def run_test(thread_safe=False):
+     try:
+         assert len(s1) == len(s2) == len(s3)
+     except:
+-        print "%s records by list comprehension, " %len(s1)
+-        print "%s by select by formula," %len(s2)
+-        print "%s by select by interval" %len(s3)
++        print("%s records by list comprehension, " %len(s1))
++        print("%s by select by formula," %len(s2))
++        print("%s by select by interval" %len(s3))
+ 
+     for r in s1:
+         try:
+             assert r in s2
+         except:
+-            print all(r.afloat)
++            print(all(r.afloat))
+ 
+     for r in s2:
+         try:
+             assert r in s1
+         except:
+-            print "in select but not in list comprehension",r
++            print("in select but not in list comprehension",r)
+             raise
+     r = db[0]
+     assert r.__class__.db is db
+ 
+     fr=random.choice(fr_names)
+-    s1 = [ r for r in db if r.age == 30 and r.fr_name == unicode(fr,'latin-1')]
+-    s2 = db.select(['name','fr_name'],age=30,fr_name = unicode(fr,'latin-1'))
++    s1 = [ r for r in db if r.age == 30 and r.fr_name == str(fr,'latin-1')]
++    s2 = db.select(['name','fr_name'],age=30,fr_name = str(fr,'latin-1'))
+ 
+     assert len(s1)==len(s2)
+ 
+@@ -182,7 +182,7 @@ def run_test(thread_safe=False):
+     assert recs[0] == db[20]
+ 
+     # check that has_key returns False for invalid hey
+-    assert not db.has_key(1000)
++    assert 1000 not in db
+ 
+     # drop field
+     db.drop_field('name')
+@@ -207,8 +207,8 @@ def run_test(thread_safe=False):
+     db.delete([db[10]])
+     # check if record has been deleted
+     try:
+-        print db[10]
+-        raise Exception,"Row 10 should have been deleted"
++        print(db[10])
++        raise Exception("Row 10 should have been deleted")
+     except IndexError:
+         pass
+ 
+@@ -273,19 +273,19 @@ def run_test(thread_safe=False):
+ 
+     # check that record 10 is still deleted
+     try:
+-        print db[10]
+-        raise Exception,"Row 10 should have been deleted"
++        print(db[10])
++        raise Exception("Row 10 should have been deleted")
+     except IndexError:
+         pass
+ 
+-    print db.keys()
+-    print "has key 10 ?",db.has_key(10)
++    print(list(db.keys()))
++    print("has key 10 ?",10 in db)
+     assert 10 not in db
+     #raw_input()
+ 
+     # check that deleted_lines was cleared by commit()
+     assert not db._pos.deleted_lines
+-    print db._del_rows.deleted_rows
++    print(db._del_rows.deleted_rows)
+ 
+     length = len(db) # before cleanup
+ 
+@@ -297,8 +297,8 @@ def run_test(thread_safe=False):
+ 
+     # check that record 10 is still deleted
+     try:
+-        print db[10]
+-        raise Exception,"Row 10 should have been deleted"
++        print(db[10])
++        raise Exception("Row 10 should have been deleted")
+     except IndexError:
+         pass
+ 
+@@ -365,7 +365,7 @@ def run_test(thread_safe=False):
+ 
+     addresses = ['Giono','Proust','Mauriac','Gide','Bernanos','Racine',
+         'La Fontaine']
+-    ks = db.keys()
++    ks = list(db.keys())
+     for i in range(50):
+         x = random.choice(ks)
+         address = random.choice(addresses)
+@@ -397,9 +397,9 @@ def run_test(thread_safe=False):
+             return item
+ 
+     h1.set_record_class(DictRecord)
+-    print '\nrecord_class = DictRecord, h1[0]'
+-    print h1[0]
+-    print "\nResident name: %(resident.name)s\nAddress: %(address)s" % h1[0]
++    print('\nrecord_class = DictRecord, h1[0]')
++    print(h1[0])
++    print("\nResident name: %(resident.name)s\nAddress: %(address)s" % h1[0])
+ 
+ if __name__ == "__main__":
+     run_test(thread_safe = True)
+--- buzhug/buzhug.py.orig	2022-03-15 18:59:32 UTC
++++ buzhug/buzhug.py
+@@ -88,14 +88,14 @@ Version 1.8
+ 
+ import os
+ import threading
+-import cStringIO
++import io
+ import itertools
+ import token
+ import tokenize
+ import re
+ import tempfile
+ import shutil
+-import urllib
++import urllib.request, urllib.parse, urllib.error
+ 
+ import time
+ from datetime import date,datetime, time as dtime
+@@ -106,9 +106,9 @@ try:
+ except NameError:
+     from sets import Set as set
+ 
+-from buzhug_files import *
+-import buzhug_algos
+-import buzhug_info
++from .buzhug_files import *
++from . import buzhug_algos
++from . import buzhug_info
+ 
+ version = "1.8"
+ 
+@@ -133,12 +133,12 @@ class Record(list):
+         try:
+             ix = self.fields.index(k)
+         except ValueError:
+-            raise AttributeError,'No attribute named %s' %k
++            raise AttributeError('No attribute named %s' %k)
+         try:
+             return self.db.f_decode[self.types[ix]](list.__getitem__(self,ix))
+         except:
+-            print 'error for key %s type %s value %s' %(k,self.types[ix],
+-                list.__getitem__(self,ix))
++            print('error for key %s type %s value %s' %(k,self.types[ix],
++                list.__getitem__(self,ix)))
+             raise
+ 
+     def __setattr__(self,k,v):
+@@ -151,7 +151,7 @@ class Record(list):
+     def __repr__(self):
+         elts = []
+         for k in self.fields:
+-            if not isinstance(getattr(self,k),unicode):
++            if not isinstance(getattr(self,k),str):
+                 elts.append('%s:%s' %(k,getattr(self,k)))
+             else:
+                 elts.append(('%s:%s' %(k,getattr(self,k))).encode('utf-8'))
+@@ -190,17 +190,17 @@ class ResultSet(list):
+         """pretty print"""
+         col_width = width/len(self.names)
+         fmt = '%%-%ss' %col_width
+-        print '|'.join([fmt %name for name in self.names])
+-        print '|'.join([fmt %('-'*col_width) for name in self.names])
++        print('|'.join([fmt %name for name in self.names]))
++        print('|'.join([fmt %('-'*col_width) for name in self.names]))
+         for rec in self:
+             line = []
+             for name in self.names:
+                 v = fmt %getattr(rec,name)
+-                if not isinstance(getattr(rec,name),unicode):
++                if not isinstance(getattr(rec,name),str):
+                     line.append(v)
+                 else:
+                     enc = line.append(v.encode('latin-1'))
+-            print '|'.join(line)
++            print('|'.join(line))
+ 
+     def sort_by(self,order):
+         """order is a string with field names separated by + or -
+@@ -208,7 +208,7 @@ class ResultSet(list):
+         name, ascending surname and descending age"""
+         
+         # parse the order string
+-        e = cStringIO.StringIO(order).readline
++        e = io.StringIO(order).readline
+         cond = []
+         order = '+'
+         for t in tokenize.generate_tokens(e):
+@@ -216,11 +216,11 @@ class ResultSet(list):
+             ts = t[1]
+             if tt == 'OP':
+                 if not ts in ['+','-']:
+-                    raise SyntaxError,"Bad operator in sort condition: %s" %ts
++                    raise SyntaxError("Bad operator in sort condition: %s" %ts)
+                 order = ts
+             elif tt == 'NAME':
+                 if not ts in self.names:
+-                    raise ValueError,"Unknown sort field :%s" %ts
++                    raise ValueError("Unknown sort field :%s" %ts)
+                 cond.append((self.names.index(ts),order))
+         # build the function order_func used to sort records
+         o_f = "def order_func(rec):\n"
+@@ -232,7 +232,7 @@ class ResultSet(list):
+             else:
+                 elts.append("buzhug_algos.rev(rec[%s])" %ix)
+         o_f += ",".join(elts) +"]"        
+-        exec o_f in globals()  # this creates the global function order_func
++        exec(o_f, globals())  # this creates the global function order_func
+ 
+         # apply the key
+         try:
+@@ -320,7 +320,7 @@ class Base:
+     
+ 
+     types_map = [ (int,IntegerFile),(float,FloatFile),
+-            (str,StringFile),(unicode,UnicodeFile),
++            (str,StringFile),(str,UnicodeFile),
+             (date,DateFile),(datetime,DateTimeFile), (dtime, TimeFile),
+             (bool,BooleanFile)]
+ 
+@@ -387,14 +387,14 @@ class Base:
+                 elif mode == 'open':
+                     return self.open()
+                 else:
+-                    raise IOError,"Base %s already exists" %self.name
++                    raise IOError("Base %s already exists" %self.name)
+             else:
+                 if mode != 'open':
+-                    raise IOError,"Directory %s already exists" %self.name
++                    raise IOError("Directory %s already exists" %self.name)
+                 else:
+-                    raise IOError,"Mode 'open' : " \
++                    raise IOError("Mode 'open' : " \
+                         "Directory %s already exists but no info file found" \
+-                        %self.name
++                        %self.name)
+ 
+         self.field_names = [ f[0] for f in fields ]
+         self.fields = dict([(f[0],f[1]) for f in fields])
+@@ -431,11 +431,11 @@ class Base:
+         Raise IOError if no base is found for the path entered in __init__
+         """
+         if not os.path.exists(self.name) or not os.path.isdir(self.name):
+-            raise IOError,"Base %s doesn't exist" %self.name
++            raise IOError("Base %s doesn't exist" %self.name)
+         try:
+             _info = open(self.info_name,'rb')
+         except IOError:
+-            raise IOError,"No buzhug base in directory %s" %self.name
++            raise IOError("No buzhug base in directory %s" %self.name)
+         return self._open(_info)
+         
+     def _open(self,info):
+@@ -445,7 +445,7 @@ class Base:
+         for (k,v) in fields:
+             if v.startswith('<base>'):
+                 # reference to an external base
+-                base_path = urllib.unquote(v[6:])
++                base_path = urllib.parse.unquote(v[6:])
+                 ext_db = Base(base_path).open()
+                 self._register_base(ext_db)
+                 self.fields[k] = ext_db
+@@ -474,7 +474,7 @@ class Base:
+ 
+     def close(self):
+         """Close all files"""
+-        for f in self._file.values():
++        for f in list(self._file.values()):
+             f.close()
+         self._pos.close()
+         self._id_pos.close()
+@@ -508,19 +508,19 @@ class Base:
+         Return the identifier of the newly inserted record
+         """
+         if args and kw:
+-            raise SyntaxError,"Can't use both positional and keyword arguments"
++            raise SyntaxError("Can't use both positional and keyword arguments")
+         if args:
+             # insert a list of values ordered like in the base definition
+             if not len(args) == len(self.field_names)-2:
+-                raise TypeError,"Expected %s arguments, found %s" \
+-                   %(len(self.field_names)-2,len(args))
+-            return self.insert(**dict(zip(self.field_names[2:],args)))
+-        if '__id__' in kw.keys():
+-            raise NameError,"Specifying the __id__ is not allowed"
+-        if '__version__' in kw.keys():
+-            raise NameError,"Specifying the __version__ is not allowed"
++                raise TypeError("Expected %s arguments, found %s" \
++                   %(len(self.field_names)-2,len(args)))
++            return self.insert(**dict(list(zip(self.field_names[2:],args))))
++        if '__id__' in list(kw.keys()):
++            raise NameError("Specifying the __id__ is not allowed")
++        if '__version__' in list(kw.keys()):
++            raise NameError("Specifying the __version__ is not allowed")
+         rec = dict([(f,self.defaults[f]) for f in self.field_names[2:]])
+-        for (k,v) in kw.iteritems():
++        for (k,v) in kw.items():
+             self._validate(k,v)
+             rec[k] = v
+         # initial version = 0
+@@ -544,19 +544,19 @@ class Base:
+         - unicode : the format is the encoding
+         - date, datetime : format = the format string as defined in strftime
+         """
+-        if class_ is unicode:
++        if class_ is str:
+             # test encoding ; will raise LookupError if invalid
+-            unicode('a').encode(format)
++            str('a').encode(format)
+             # create the conversion function bytestring -> unicode string
+             def _from_string(us):
+-                return unicode(us,format)
+-            self.from_string[unicode] = _from_string
++                return str(us,format)
++            self.from_string[str] = _from_string
+         elif class_ is date:
+             # test date format
+             d = date(1994,10,7)
+             t = time.strptime(d.strftime(format),format)
+             if not t[:3] == d.timetuple()[:3]:
+-                raise TimeFormatError,'%s is not a valid date format' %format
++                raise TimeFormatError('%s is not a valid date format' %format)
+             else:
+                 # create the conversion function string -> date
+                 def _from_string(ds):
+@@ -567,8 +567,8 @@ class Base:
+             dt = datetime(1994,10,7,8,30,15)
+             t = time.strptime(dt.strftime(format),format)
+             if not t[:6] == dt.timetuple()[:6]:
+-                raise TimeFormatError,'%s is not a valid datetime format' \
+-                    %format
++                raise TimeFormatError('%s is not a valid datetime format' \
++                    %format)
+             else:
+                 # create the conversion function string -> date
+                 def _from_string(dts):
+@@ -579,15 +579,15 @@ class Base:
+             dt = dtime(8,30,15)
+             t = time.strptime(dt.strftime(format),format)
+             if not t[3:6] == (dt.hour, dt.minute, dt.second):
+-                raise TimeFormatError,'%s is not a valid datetime.time format' \
+-                    %format
++                raise TimeFormatError('%s is not a valid datetime.time format' \
++                    %format)
+             else:
+                 # create the conversion function string -> dtime
+                 def _from_string(dts):
+                     return dtime(*time.strptime(dts,format)[3:6])
+                 self.from_string[dtime] = _from_string
+         else:
+-            raise ValueError,"Can't specify a format for class %s" %class_
++            raise ValueError("Can't specify a format for class %s" %class_)
+ 
+     def insert_as_strings(self,*args,**kw):
+         """Insert a record with values provided as strings. They must be
+@@ -595,32 +595,32 @@ class Base:
+         functions defined in the dictionary from_string
+         """
+         if args and kw:
+-            raise SyntaxError,"Can't use both positional and keyword arguments"
++            raise SyntaxError("Can't use both positional and keyword arguments")
+         if args:
+             # insert a list of strings ordered like in the base definition
+             if not len(args) == len(self.field_names)-2:
+-                raise TypeError,"Expected %s arguments, found %s" \
+-                   %(len(self.field_names)-2,len(args))
+-            return self.insert_as_strings(**dict(zip(self.field_names[2:],
+-                args)))
++                raise TypeError("Expected %s arguments, found %s" \
++                   %(len(self.field_names)-2,len(args)))
++            return self.insert_as_strings(**dict(list(zip(self.field_names[2:],
++                args))))
+         return self.insert(**self.apply_types(**kw))
+ 
+     def apply_types(self,**kw):
+         """Transform the strings in kw values to their type
+         Return a dictionary with the same keys and converted values"""
+         or_kw = {}
+-        for k in kw.keys():
++        for k in list(kw.keys()):
+             try:
+                 t = self.fields[k]
+             except KeyError:
+-                raise NameError,"No field named %s" %k
+-            if not self.from_string.has_key(t):
+-                raise Exception,'No string format defined for %s' %t
++                raise NameError("No field named %s" %k)
++            if t not in self.from_string:
++                raise Exception('No string format defined for %s' %t)
+             else:
+                 try:
+                     or_kw[k] = self.from_string[t](kw[k])
+                 except:
+-                    raise TypeError,"Can't convert %s into %s" %(kw[k],t)
++                    raise TypeError("Can't convert %s into %s" %(kw[k],t))
+         return or_kw
+ 
+     def commit(self):
+@@ -710,7 +710,7 @@ class Base:
+                                # only field 'name' set
+         """
+         res,names = self._select(names,request,**args)
+-        return ResultSet(names,res.values())
++        return ResultSet(names,list(res.values()))
+     
+     def select_for_update(self,names=None,request=None,**args):
+         """Same syntax as select, only checks that the field __version__
+@@ -726,7 +726,7 @@ class Base:
+         else:
+             names += [ f for f in ['__id__','__version__'] if not f in names ]
+         res,names = self._select(names,request,**args)
+-        return ResultSet(names,res.values())
++        return ResultSet(names,list(res.values()))
+ 
+     def __call__(self,**kw):
+         return self.select_for_update(**kw)
+@@ -745,7 +745,7 @@ class Base:
+             _names = self.field_names
+ 
+         _namespace = {}
+-        if args.has_key('_namespace'):
++        if '_namespace' in args:
+             _namespace = args['_namespace']
+             del args['_namespace']
+ 
+@@ -755,7 +755,7 @@ class Base:
+         # the return value of match and search applied to the string
+         # stripped from its first and last character
+         regexps = []
+-        for k,v in args.iteritems():
++        for k,v in args.items():
+             if type(v) is REGEXPTYPE:
+                 _namespace[k] = Pattern(v)
+                 regexps.append(k)
+@@ -765,14 +765,14 @@ class Base:
+             del args[k]
+ 
+         if _request is None:
+-            f_args = [ k for k in args.keys() 
++            f_args = [ k for k in list(args.keys()) 
+                 if hasattr(self._file[k],'block_len') ]
+             # if there is at least one fixed length field to search, use the
+             # fast_select algorithm
+             if f_args:
+                 res,names = buzhug_algos.fast_select(self,_names,**args)
+                 _Record = makeRecordClass(self,self.record_class,names)
+-                for k in res.keys():
++                for k in list(res.keys()):
+                     res[k] = _Record(res[k])
+                 return res,names
+             conds = []
+@@ -780,17 +780,17 @@ class Base:
+                 conds.append('%s == _c[%s]' %(k,i))
+             _request = ' and '.join(conds)
+             _c = []
+-            for (k,v) in args.iteritems():
++            for (k,v) in args.items():
+                 t = self.fields[k]  # field type
+                 if isinstance(v,(tuple,list)):
+                     _c.append([self.f_encode[t](x) for x in v])
+                 else:
+                     _c.append(self.f_encode[t](v))
+-            for n in args.keys():
++            for n in list(args.keys()):
+                 if not n in _names:
+                     _names.append(n)
+         else:
+-            for (k,v) in args.iteritems():
++            for (k,v) in args.items():
+                 if isinstance(v,Record):
+                     # comparison with a record of another base
+                     ft = self.file_types[self.types[v.db.name]]
+@@ -832,7 +832,7 @@ class Base:
+         args.update(_namespace)
+ 
+         # execute the loop
+-        exec loop in locals(),args
++        exec(loop, locals(),args)
+ 
+         # exclude deleted rows from the results
+         if self._del_rows.deleted_rows:
+@@ -854,11 +854,11 @@ class Base:
+                 self.update(rec,**kw)
+             return
+         only_fixed_length = True
+-        if '__id__' in kw.keys():
+-            raise NameError,"Can't update __id__"
+-        if '__version__' in kw.keys():
+-            raise NameError,"Can't update __version__"
+-        for (k,v) in kw.iteritems():
++        if '__id__' in list(kw.keys()):
++            raise NameError("Can't update __id__")
++        if '__version__' in list(kw.keys()):
++            raise NameError("Can't update __version__")
++        for (k,v) in kw.items():
+             self._validate(k,v)
+             setattr(record,k,v)
+             if not hasattr(self.file_types[self.fields[k]],
+@@ -867,7 +867,7 @@ class Base:
+ 
+         if not hasattr(record,'__id__') or not hasattr(record,'__version__'):
+             # refuse to update a record that was not selected for update
+-            raise UpdateError,'The record was not selected for update'
++            raise UpdateError('The record was not selected for update')
+ 
+         _id = record.__id__
+         # line number of the record in position file
+@@ -878,7 +878,7 @@ class Base:
+         # file is not the same, refuse to update
+         current_version = self[_id].__version__
+         if not record.__version__ == current_version:
+-            raise ConflictError,'The record has changed since selection'
++            raise ConflictError('The record has changed since selection')
+ 
+         # increment version
+         record.__version__ += 1
+@@ -888,7 +888,7 @@ class Base:
+         if only_fixed_length:
+             # only fixed length fields modified : just change the values
+             kw['__version__'] = record.__version__
+-            for k,v in kw.iteritems():
++            for k,v in kw.items():
+                 ix = self.field_names.index(k)
+                 self._file[k].write_value_at_pos(field_pos[ix],v)
+         else:
+@@ -926,7 +926,7 @@ class Base:
+         """Add a new field after the specified field, or in the beginning if
+         no field is specified"""
+         if field_name in self.field_names:
+-            raise NameError,"Field %s already exists" %field_name
++            raise NameError("Field %s already exists" %field_name)
+         field_def = [field_name,field_type]
+         if default is not None:
+             field_def.append(default)
+@@ -937,7 +937,7 @@ class Base:
+         if after is None:
+             indx = 2 # insert after __version__
+         elif not after in self.field_names:
+-            raise NameError,"No field named %s" %after
++            raise NameError("No field named %s" %after)
+         else:
+             indx = 1+self.field_names.index(after)
+         self.field_names.insert(indx,field_name)
+@@ -955,11 +955,11 @@ class Base:
+     def drop_field(self,field_name):
+         """Remove the specified field name"""
+         if not field_name in self.field_names:
+-            raise NameError,"No field named %s" %field_name
++            raise NameError("No field named %s" %field_name)
+         if field_name == '__id__':
+-            raise ValueError,"Field __id__ can't be removed"
++            raise ValueError("Field __id__ can't be removed")
+         if field_name == '__version__':
+-            raise ValueError,"Field __version__ can't be removed"
++            raise ValueError("Field __version__ can't be removed")
+         indx = self.field_names.index(field_name)
+         self.field_names.remove(field_name)
+         del self.defaults[field_name]
+@@ -972,8 +972,8 @@ class Base:
+ 
+     def _validate(self,k,v):
+         """Validate the couple key,value"""
+-        if not k in self.fields.keys():
+-            raise NameError,"No field named %s" %k
++        if not k in list(self.fields.keys()):
++            raise NameError("No field named %s" %k)
+         if v is None:
+             return
+         # if self.fields[k] is an instance of Base, the value must be an
+@@ -981,21 +981,21 @@ class Base:
+         # db == self.fields[k]
+         if isinstance(self.fields[k],Base):
+             if not issubclass(v.__class__,Record):
+-                raise TypeError,"Bad type for %s : expected %s, got %s %s" \
+-                      %(k,self.fields[k],v,v.__class__)
++                raise TypeError("Bad type for %s : expected %s, got %s %s" \
++                      %(k,self.fields[k],v,v.__class__))
+             if v.__class__.db.name != self.fields[k].name:
+-                raise TypeError,"Bad base for %s : expected %s, got %s" \
+-                      %(k,self.fields[k].name,v.__class__.db.name)
++                raise TypeError("Bad base for %s : expected %s, got %s" \
++                      %(k,self.fields[k].name,v.__class__.db.name))
+         else:
+             if not isinstance(v,self.fields[k]):
+-                raise TypeError,"Bad type for %s : expected %s, got %s %s" \
+-                      %(k,self.fields[k],v,v.__class__)
++                raise TypeError("Bad type for %s : expected %s, got %s %s" \
++                      %(k,self.fields[k],v,v.__class__))
+ 
+     def _iterate(self,*names):
+         """_iterate on the specified names only"""
+         Record = makeRecordClass(self,self.record_class,names)
+         files = [ self._file[f] for f in names ]
+-        for record in itertools.izip(*files):
++        for record in zip(*files):
+             yield Record(record)
+ 
+     def __getitem__(self,num):
+@@ -1005,7 +1005,7 @@ class Base:
+         # first find the line in position file
+         block_pos = self._id_pos.get_block_at_pos(5*num)
+         if block_pos[0] == '#':
+-            raise IndexError,'No item at position %s' %num
++            raise IndexError('No item at position %s' %num)
+         else:
+             _id_pos = self._id_pos.from_block(block_pos)
+         # block in position file
+@@ -1031,7 +1031,7 @@ class Base:
+         return True
+ 
+     def __contains__(self,num):
+-        return self.has_key(num)
++        return num in self
+ 
+     def keys(self):
+         return [ r.__id__ for r in self.select(['__id__']) ]
+@@ -1042,7 +1042,7 @@ class Base:
+         remove the test record[0][0] != "#"
+         """
+         files = [ self._file[f] for f in self.field_names ]
+-        for record in itertools.izip(*files):
++        for record in zip(*files):
+             if record[0][0] != "#":
+                 r = self._full_rec(record)
+                 yield r
+--- buzhug/conversion_float.py.orig	2022-03-15 18:59:32 UTC
++++ buzhug/conversion_float.py
+@@ -51,8 +51,8 @@ class FloatFile:
+         if value is None:
+             return '!'+chr(0)*9
+         elif not isinstance(value,float):
+-            raise ValueError,'Bad type : expected float, got %s %s' \
+-                %(value,value.__class__)
++            raise ValueError('Bad type : expected float, got %s %s' \
++                %(value,value.__class__))
+         else:
+             # get mantissa and exponent
+             # f = mant*2**exp, 0.5 <= abs(mant) < 1
+@@ -82,7 +82,7 @@ def conv(old):
+     # update base to new version
+     of = OldFloatFile()
+     nf = FloatFile()
+-    for (f,t) in old.fields.iteritems():
++    for (f,t) in old.fields.items():
+         if t is float:
+             old_path = db._file[f].path
+             new_path = os.path.join(db._file[f].base,"new_"+db._file[f].name)
+@@ -94,10 +94,10 @@ def conv(old):
+                 else:
+                     new_block = nf.to_block(v)
+                     if nf.from_block(new_block) != v:
+-                        raise ValueError,"conversion error : %s != %s" \
+-                            %(v,nf.from_block(new_block))
++                        raise ValueError("conversion error : %s != %s" \
++                            %(v,nf.from_block(new_block)))
+                 new_file.write(new_block)
+-            print i,"lines"
++            print(i,"lines")
+             new_file.close()
+ 
+             # double-check if values are the same between old and new file
+@@ -110,8 +110,8 @@ def conv(old):
+                     break
+                 new = new_file.read(bl)
+                 if not of.from_block(old) == nf.from_block(new):
+-                    raise ValueError, "conversion error : %s != %s" \
+-                        %(of.from_block(old),nf.from_block(new))
++                    raise ValueError("conversion error : %s != %s" \
++                        %(of.from_block(old),nf.from_block(new)))
+ 
+             new_file.close()
+             # replace old file
+@@ -122,10 +122,10 @@ def conv(old):
+             os.rename(db._file[f].path,os.path.join(db._file[f].base,backup_name))
+             os.rename(new_path,old_path)            
+ 
+-import buzhug                
+-import tkFileDialog
++from . import buzhug                
++import tkinter.filedialog
+ 
+-path = tkFileDialog.askdirectory()
++path = tkinter.filedialog.askdirectory()
+ if path :
+     db = buzhug.Base(path).open()
+     conv(db)
diff --git a/databases/buzhug/pkg-descr b/databases/buzhug/pkg-descr
index 606decf47304..766c6c7e93fc 100644
--- a/databases/buzhug/pkg-descr
+++ b/databases/buzhug/pkg-descr
@@ -9,5 +9,3 @@ The database is implemented as a Python iterator, yielding objects whose
 attributes are the fields defined when the base is created ; therefore,
 requests can be expressed as list comprehensions or generator expressions,
 instead of SQL queries.
-
-WWW: http://buzhug.sourceforge.net/
diff --git a/databases/c3p0/Makefile b/databases/c3p0/Makefile
index 10a735108e07..4a5ec0c9a4ac 100644
--- a/databases/c3p0/Makefile
+++ b/databases/c3p0/Makefile
@@ -6,11 +6,13 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}.bin
 
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	Library for augmenting JDBC drivers with JNDI-bindable DataSources
+WWW=		https://www.mchange.com/projects/c3p0/
 
 LICENSE=	LGPL21 EPL
 LICENSE_COMB=	dual
 
-USES=		tar:tgz
+USES=		cpe tar:tgz
+CPE_VENDOR=	mchange
 USE_JAVA=	yes
 NO_BUILD=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
diff --git a/databases/c3p0/pkg-descr b/databases/c3p0/pkg-descr
index ba669114ddff..3425d0771471 100644
--- a/databases/c3p0/pkg-descr
+++ b/databases/c3p0/pkg-descr
@@ -2,5 +2,3 @@ c3p0 is an easy-to-use Java library for augmenting traditional
 (DriverManager-based) JDBC drivers with JNDI-bindable DataSources,
 including DataSources that implement Connection and Statement
 Pooling, as described by the jdbc3 spec and jdbc2 std extension.
-
-WWW: https://www.mchange.com/projects/c3p0/
diff --git a/databases/cassandra-cpp-driver/Makefile b/databases/cassandra-cpp-driver/Makefile
index 4e984c90ce3f..69dc2f45a289 100644
--- a/databases/cassandra-cpp-driver/Makefile
+++ b/databases/cassandra-cpp-driver/Makefile
@@ -1,12 +1,11 @@
-# Created by: gahr
-
 PORTNAME=	cassandra-cpp-driver
-PORTVERSION=	2.16.0
+PORTVERSION=	2.17.1
 PORTREVISION=	0
 CATEGORIES=	databases
 
 MAINTAINER=	gahr@FreeBSD.org
 COMMENT=	DataStax C/C++ Driver for Apache Cassandra
+WWW=		https://datastax.github.io/cpp-driver/
 
 LICENSE=	APACHE20
 
diff --git a/databases/cassandra-cpp-driver/distinfo b/databases/cassandra-cpp-driver/distinfo
index de29d547c46b..d58bc44e7e76 100644
--- a/databases/cassandra-cpp-driver/distinfo
+++ b/databases/cassandra-cpp-driver/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1615540362
-SHA256 (datastax-cpp-driver-2.16.0_GH0.tar.gz) = 35b0f4bac3d17fef47e28611dbeb51e07639395e957f23f4a3cc60770db1ab9c
-SIZE (datastax-cpp-driver-2.16.0_GH0.tar.gz) = 12282109
+TIMESTAMP = 1709631503
+SHA256 (datastax-cpp-driver-2.17.1_GH0.tar.gz) = 53b4123aad59b39f2da0eb0ce7fe0e92559f7bba0770b2e958254f17bffcd7cf
+SIZE (datastax-cpp-driver-2.17.1_GH0.tar.gz) = 12287959
diff --git a/databases/cassandra-cpp-driver/pkg-descr b/databases/cassandra-cpp-driver/pkg-descr
index 8fba9a83b616..9b6feaf567a9 100644
--- a/databases/cassandra-cpp-driver/pkg-descr
+++ b/databases/cassandra-cpp-driver/pkg-descr
@@ -1,5 +1,3 @@
 DataStax Cpp Driver is modern, feature-rich, and highly tunable C/C++ client
 library for Apache Cassandra (1.2+) and DataStax Enterprise (3.1+) using
 exclusively Cassandra's native protocol and Cassandra Query Language v3.
-
-WWW: http://datastax.github.io/cpp-driver/
diff --git a/databases/cassandra3/Makefile b/databases/cassandra3/Makefile
index 9eb185060312..9150badf46ee 100644
--- a/databases/cassandra3/Makefile
+++ b/databases/cassandra3/Makefile
@@ -1,12 +1,13 @@
 PORTNAME=	cassandra
-DISTVERSION=	3.11.10
+DISTVERSION=	3.11.14
 CATEGORIES=	databases java
-MASTER_SITES=	LOCAL/nc:repo
+MASTER_SITES=	LOCAL/fernape:repo
 PKGNAMESUFFIX=	3
 DISTFILES=	apache-${PORTNAME}-${DISTVERSION}-repo.tar.gz:repo
 
 MAINTAINER=	language.devel@gmail.com
 COMMENT=	Highly scalable distributed database
+WWW=		https://cassandra.apache.org/
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
@@ -16,17 +17,18 @@ TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}virtualenv>=0:devel/py-virtualenv@${PY_FLAV
 		bash>0:shells/bash \
 		git>0:devel/git
 
-USES=		python:3.6+
+USES=		cpe python
 USE_ANT=	yes
 USE_JAVA=	yes
-JAVA_VERSION=	1.8
+JAVA_VERSION=	8
 JAVA_VENDOR=	openjdk
+CPE_VENDOR=	apache
 
 USE_RC_SUBR=	cassandra
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	polo-language
-GH_TAGNAME=	62fe1f7
+GH_TAGNAME=	c29ba30
 
 TEST_TARGET=	test
 
@@ -75,6 +77,8 @@ SCRIPT_FILES=	cassandra \
 		sstableutil \
 		sstableverify
 
+ANT_OPTS_LOCAL=	${ANT_OPTS} -Xmx512m
+
 post-patch:
 	@${CHMOD} ug+x ${WRKSRC}/pylib/cassandra-cqlsh-tests.sh
 
@@ -82,10 +86,10 @@ do-build:
 	@${DO_NADA} # Do nothing: Prevent USE_ANT from running a default build target.
 
 do-build-DOCS-on:
-	@cd ${WRKSRC} && ANT_OPTS="${ANT_OPTS} -Xmx512m" ${ANT} -Dmaven.repo.local=${REPO_DIR} -Dlocalm2=${REPO_DIR} -Dpycmd=${PYTHON_CMD} freebsd-stage-doc
+	@cd ${WRKSRC} && ANT_OPTS="${ANT_OPTS_LOCAL}" ${ANT} -Dmaven.repo.local=${REPO_DIR} -Dlocal.repository=${REPO_DIR} -Dpycmd=${PYTHON_CMD} freebsd-stage-doc
 
 do-build-DOCS-off:
-	@cd ${WRKSRC} && ANT_OPTS="${ANT_OPTS} -Xmx512m" ${ANT} -Dmaven.repo.local=${REPO_DIR} -Dlocalm2=${REPO_DIR} freebsd-stage
+	@cd ${WRKSRC} && ANT_OPTS="${ANT_OPTS} -Xmx512m" ${ANT} -Dmaven.repo.local=${REPO_DIR} -Dlocal.repository=${REPO_DIR} freebsd-stage
 
 post-build:
 .for f in ${SCRIPT_FILES}
@@ -133,7 +137,7 @@ do-test:
 	# A bare 'python' must be on PATH for test to succeed.
 	@cd ${WRKSRC} && ${MV} bin/cassandra.in.sh bin/cassandra.in.sh.patched
 	@cd ${WRKSRC} && ${MV} bin/cassandra.in.sh.orig bin/cassandra.in.sh
-	@cd ${WRKSRC} && pylib/cassandra-cqlsh-tests.sh ${WRKSRC} python3 ${JAVA_HOME} ${REPO_DIR} ${PYTHON_CMD}
+	@cd ${WRKSRC} && ANT_OPTS="${ANT_OPTS_LOCAL}" ANT_CMD="${ANT}" pylib/cassandra-cqlsh-tests.sh ${WRKSRC} ${JAVA_HOME} ${REPO_DIR} ${PYTHON_CMD} ${REPO_DIR}
 	@cd ${WRKSRC} && ${MV} bin/cassandra.in.sh bin/cassandra.in.sh.orig
 	@cd ${WRKSRC} && ${MV} bin/cassandra.in.sh.patched bin/cassandra.in.sh
 
diff --git a/databases/cassandra3/distinfo b/databases/cassandra3/distinfo
index 7d3826881e73..ab256d0ea2bd 100644
--- a/databases/cassandra3/distinfo
+++ b/databases/cassandra3/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1612608662
-SHA256 (apache-cassandra-3.11.10-repo.tar.gz) = 09e154d4db06007c58193be4869346263e16c4eeb5bc42d9fb5f5165ce5ad4dc
-SIZE (apache-cassandra-3.11.10-repo.tar.gz) = 52449193
-SHA256 (polo-language-cassandra-3.11.10-62fe1f7_GH0.tar.gz) = 7c9624aa1287007cc858cb95e96d2e8a88ba7997332a8093ed90688aff4789f6
-SIZE (polo-language-cassandra-3.11.10-62fe1f7_GH0.tar.gz) = 35636492
+TIMESTAMP = 1667648919
+SHA256 (apache-cassandra-3.11.14-repo.tar.gz) = 6390ad0eb91156c37d738f5fe96695c5b3d5c3603ab24c8e65e443cbd916b1d2
+SIZE (apache-cassandra-3.11.14-repo.tar.gz) = 59360725
+SHA256 (polo-language-cassandra-3.11.14-c29ba30_GH0.tar.gz) = 03c501b62952256e28ef19c85c73fe371cd1a6c40cc7f84dae076152ab3130ef
+SIZE (polo-language-cassandra-3.11.14-c29ba30_GH0.tar.gz) = 16297535
diff --git a/databases/cassandra3/files/patch-build.xml b/databases/cassandra3/files/patch-build.xml
index c6bb818a1c09..6b406a5d7b31 100644
--- a/databases/cassandra3/files/patch-build.xml
+++ b/databases/cassandra3/files/patch-build.xml
@@ -1,14 +1,15 @@
---- build.xml.orig	2020-10-20 17:07:48 UTC
+--- build.xml.orig	2022-10-28 19:54:09 UTC
 +++ build.xml
-@@ -23,6 +23,7 @@
+@@ -31,6 +31,8 @@
      <property file="build.properties" />
      <property file="build.properties.default" />
      <property name="debuglevel" value="source,lines,vars"/>
 +    <property name="pycmd" value="python"/>
++    <property name="rat.skip" value="true"/>
  
      <!-- default version and SCM information -->
-     <property name="base.version" value="3.11.9"/>
-@@ -80,14 +81,14 @@
+     <property name="base.version" value="3.11.14"/>
+@@ -85,7 +87,7 @@
      <condition property="version" value="${base.version}">
        <isset property="release"/>
      </condition>
@@ -17,82 +18,15 @@
      <property name="version.properties.dir"
                value="${build.src.resources}/org/apache/cassandra/config/" />
      <property name="final.name" value="${ant.project.name}-${version}"/>
- 
-     <!-- details of what version of Maven ANT Tasks to fetch -->
-     <property name="maven-ant-tasks.version" value="2.1.3" />
--    <property name="maven-ant-tasks.local" value="${user.home}/.m2/repository/org/apache/maven/maven-ant-tasks"/>
-+    <property name="maven-ant-tasks.local" value="${localm2}/org/apache/maven/maven-ant-tasks"/>
-     <property name="maven-ant-tasks.url"
-               value="https://repo.maven.apache.org/maven2/org/apache/maven/maven-ant-tasks" />
-     <!-- details of how and which Maven repository we publish to -->
-@@ -247,8 +248,7 @@
-         <artifact:dependencies pathId="wikitext.classpath">
-             <dependency groupId="com.datastax.wikitext" artifactId="wikitext-core-ant" version="1.3"/>
-             <dependency groupId="org.fusesource.wikitext" artifactId="textile-core" version="1.3"/>
--            <remoteRepository refid="central"/>
--            <remoteRepository refid="apache"/>
-+            <localRepository path="${localm2}"/>
-         </artifact:dependencies>
-         <taskdef classpathref="wikitext.classpath" resource="wikitexttasks.properties" />
-         <wikitext-to-html markupLanguage="Textile">
-@@ -261,6 +261,7 @@
-     <target name="gen-doc" depends="maven-ant-tasks-init" description="Generate documentation">
+@@ -272,6 +274,7 @@
+     <target name="gen-doc" description="Generate documentation" depends="gen-asciidoc,generate-cql-html" unless="ant.gen-doc.skip">
          <exec executable="make" osfamily="unix" dir="${doc.dir}">
              <arg value="html"/>
 +            <arg value="PYTHON_CMD=${pycmd}"/>
          </exec>
-         <exec executable="cmd" osfamily="dos" dir="${doc.dir}">
-             <arg value="/c"/>
-@@ -303,10 +304,6 @@
-             description="Initialize Maven ANT Tasks">
-       <typedef uri="antlib:org.apache.maven.artifact.ant" classpathref="maven-ant-tasks.classpath" />
+     </target>
  
--      <!-- define the remote repositories we use -->
--      <artifact:remoteRepository id="central"   url="${artifact.remoteRepository.central}"/>
--      <artifact:remoteRepository id="apache"    url="${artifact.remoteRepository.apache}"/>
--
-       <macrodef name="install">
-         <attribute name="pomFile"/>
-         <attribute name="file"/>
-@@ -706,16 +703,14 @@
-                              filesetId="build-dependency-jars"
-                              cacheDependencyRefs="true"
-                              dependencyRefsBuildFile="${build.dir}/build-dependencies.xml">
--          <remoteRepository refid="central"/>
--          <remoteRepository refid="apache"/>
-+          <localRepository path="${localm2}"/>
-       </artifact:dependencies>
-       <!-- retrieve -source.jar artifacts using the reference-pom with the artifacts that have these -->
-       <artifact:dependencies pomRefId="build-deps-pom-sources"
-                              sourcesFilesetId="build-dependency-sources"
-                              cacheDependencyRefs="true"
-                              dependencyRefsBuildFile="${build.dir}/build-dependencies-sources.xml">
--          <remoteRepository refid="central"/>
--          <remoteRepository refid="apache"/>
-+          <localRepository path="${localm2}"/>
-       </artifact:dependencies>
-       <copy todir="${build.dir.lib}/jars">
-           <fileset refid="build-dependency-jars"/>
-@@ -728,7 +723,7 @@
-       <!-- code coverage tools -->
-       <artifact:dependencies pomRefId="coverage-deps-pom"
-                              filesetId="coverage-dependency-jars">
--          <remoteRepository refid="central"/>
-+          <localRepository path="${localm2}"/>
-       </artifact:dependencies>
-       <copy todir="${build.dir.lib}/jars">
-           <fileset refid="coverage-dependency-jars"/>
-@@ -749,8 +744,7 @@
-                              sourcesFilesetId="test-dependency-sources"
-                              cacheDependencyRefs="true"
-                              dependencyRefsBuildFile="${build.dir}/test-dependencies.xml">
--        <remoteRepository refid="apache"/>
--        <remoteRepository refid="central"/>
-+        <localRepository path="${localm2}"/>
-       </artifact:dependencies>
-       <copy todir="${test.lib}/jars">
-         <fileset refid="test-dependency-jars"/>
-@@ -1045,6 +1039,88 @@
+@@ -924,6 +927,88 @@
        </jar>
      </target>
  
@@ -179,38 +113,5 @@
 +    </target>
 +    
      <!-- creates release tarballs -->
-     <target name="artifacts" depends="jar,javadoc,gen-doc"
+     <target name="artifacts" depends="jar,gen-doc,build-test,stress-build-test,sources-jar"
              description="Create Cassandra release artifacts">
-@@ -1644,8 +1720,7 @@
-   <target name="rat-init" depends="maven-ant-tasks-init">
-     <artifact:dependencies pathId="rat.classpath">
-       <dependency groupId="org.apache.rat" artifactId="apache-rat-tasks" version="0.6" />
--      <remoteRepository refid="central"/>
--      <remoteRepository refid="apache"/>
-+      <localRepository path="${localm2}"/>
-     </artifact:dependencies>
-     <typedef uri="antlib:org.apache.rat.anttasks" classpathref="rat.classpath"/>
-   </target>
-@@ -1794,8 +1869,8 @@
-     <exec executable="nproc" outputproperty="cores.count" os="Linux,SunOS,Solaris" failifexecutionfails="false">
-       <arg value="--all"/>
-     </exec>
--    <!-- support for Mac OS X -->
--    <exec executable="sysctl" outputproperty="cores.count" os="Mac,Mac OS X,Darwin" failifexecutionfails="false">
-+    <!-- support for Mac OS X and FreeBSD -->
-+    <exec executable="sysctl" outputproperty="cores.count" os="Mac,Mac OS X,Darwin,FreeBSD" failifexecutionfails="false">
-       <arg value="-n"/>
-       <arg value="hw.ncpu"/>
-     </exec>
-@@ -1815,6 +1890,11 @@
-     <exec executable="sysctl" outputproperty="mem.size" os="Mac,Mac OS X,Darwin" failifexecutionfails="false">
-       <arg value="-n"/>
-       <arg value="hw.memsize"/>
-+    </exec>
-+    <!-- support for FreeBSD -->
-+    <exec executable="sysctl" outputproperty="mem.size" os="FreeBSD" failifexecutionfails="false">
-+      <arg value="-n"/>
-+      <arg value="hw.physmem"/>
-     </exec>
-     <echo message="Mem size : ${mem.size}"/>
-   </target>
diff --git a/databases/cassandra3/files/patch-conf_cassandra.yaml b/databases/cassandra3/files/patch-conf_cassandra.yaml
index 6d878e8ab4c2..a38a0d3fbf95 100644
--- a/databases/cassandra3/files/patch-conf_cassandra.yaml
+++ b/databases/cassandra3/files/patch-conf_cassandra.yaml
@@ -1,6 +1,6 @@
---- conf/cassandra.yaml.orig	2019-02-02 22:09:01 UTC
+--- conf/cassandra.yaml.orig	2022-10-28 19:54:09 UTC
 +++ conf/cassandra.yaml
-@@ -70,7 +70,7 @@ max_hints_delivery_threads: 2
+@@ -71,7 +71,7 @@ max_hints_delivery_threads: 2
  
  # Directory where Cassandra should store hints.
  # If not set, the default directory is $CASSANDRA_HOME/data/hints.
@@ -9,7 +9,7 @@
  
  # How often hints should be flushed from the internal buffers to disk.
  # Will *not* trigger fsync.
-@@ -187,13 +187,13 @@ partitioner: org.apache.cassandra.dht.Murmur3Partition
+@@ -188,13 +188,13 @@ partitioner: org.apache.cassandra.dht.Murmur3Partition
  # will spread data evenly across them, subject to the granularity of
  # the configured compaction strategy.
  # If not set, the default directory is $CASSANDRA_HOME/data/data.
@@ -26,7 +26,7 @@
  
  # Enable / disable CDC functionality on a per-node basis. This modifies the logic used
  # for write path allocation rejection (standard: never reject. cdc: reject Mutation
-@@ -204,7 +204,7 @@ cdc_enabled: false
+@@ -205,7 +205,7 @@ cdc_enabled: false
  # segment contains mutations for a CDC-enabled table. This should be placed on a
  # separate spindle than the data directories. If not set, the default directory is
  # $CASSANDRA_HOME/data/cdc_raw.
@@ -35,7 +35,7 @@
  
  # Policy for data disk failures:
  #
-@@ -305,20 +305,12 @@ key_cache_save_period: 14400
+@@ -306,20 +306,12 @@ key_cache_save_period: 14400
  
  # Row cache implementation class name. Available implementations:
  #
@@ -57,12 +57,12 @@
  #
  # Default value is 0, to disable row caching.
  row_cache_size_in_mb: 0
-@@ -365,7 +357,7 @@ counter_cache_save_period: 7200
+@@ -366,7 +358,7 @@ counter_cache_save_period: 7200
  
  # saved caches
  # If not set, the default directory is $CASSANDRA_HOME/data/saved_caches.
 -# saved_caches_directory: /var/lib/cassandra/saved_caches
 +saved_caches_directory: /var/db/cassandra/saved_caches
  
- # commitlog_sync may be either "periodic" or "batch." 
- # 
+ # Number of seconds the server will wait for each cache (row, key, etc ...) to load while starting
+ # the Cassandra process. Setting this to a negative value is equivalent to disabling all cache loading on startup
diff --git a/databases/cassandra3/files/patch-doc_Makefile b/databases/cassandra3/files/patch-doc_Makefile
deleted file mode 100644
index 7f83c34a50e4..000000000000
--- a/databases/cassandra3/files/patch-doc_Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- doc/Makefile.orig	2020-10-27 14:38:56 UTC
-+++ doc/Makefile
-@@ -17,7 +17,7 @@ I18NSPHINXOPTS  = $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) s
- YAML_DOC_INPUT=../conf/cassandra.yaml
- YAML_DOC_OUTPUT=source/configuration/cassandra_config_file.rst
- 
--MAKE_CASSANDRA_YAML = python convert_yaml_to_rst.py $(YAML_DOC_INPUT) $(YAML_DOC_OUTPUT)
-+MAKE_CASSANDRA_YAML = ${PYTHON_CMD} convert_yaml_to_rst.py $(YAML_DOC_INPUT) $(YAML_DOC_OUTPUT)
- 
- WEB_SITE_PRESENCE_FILE='source/.build_for_website'
- 
diff --git a/databases/cassandra3/files/patch-doc_source___templates_indexcontent.html b/databases/cassandra3/files/patch-doc_source___templates_indexcontent.html
deleted file mode 100644
index 7d8a637c9653..000000000000
--- a/databases/cassandra3/files/patch-doc_source___templates_indexcontent.html
+++ /dev/null
@@ -1,17 +0,0 @@
---- doc/source/_templates/indexcontent.html.orig	2020-10-28 18:46:34 UTC
-+++ doc/source/_templates/indexcontent.html
-@@ -1,5 +1,12 @@
--{% extends "defindex.html" %}
--{% block tables %}
-+{% extends "layout.html" %}
-+{%- block htmltitle -%}
-+<title>{{ html_title }}</title>
-+{%- endblock -%}
-+{% block body %}
-+  <h1>{{ docstitle|e }}</h1>
-+  <p>
-+  {% trans %}Welcome! This is the documentation for Apache Cassandra {{ version }}.{% endtrans %}
-+  </p>
- <div id="wipwarning">This documentation is currently a work-in-progress and contains a number of TODO sections.
-     <a href="{{ pathto("bugs") }}">Contributions</a> are welcome.</div>
- 
diff --git a/databases/cassandra3/files/patch-doc_source___util_cql.py b/databases/cassandra3/files/patch-doc_source___util_cql.py
deleted file mode 100644
index b3898552dfcd..000000000000
--- a/databases/cassandra3/files/patch-doc_source___util_cql.py
+++ /dev/null
@@ -1,10 +0,0 @@
---- doc/source/_util/cql.py.orig	2020-10-28 18:48:05 UTC
-+++ doc/source/_util/cql.py
-@@ -26,7 +26,6 @@ from pygments.lexer import Lexer, RegexLexer, do_inser
- from pygments.token import Punctuation, Whitespace, Error, \
-     Text, Comment, Operator, Keyword, Name, String, Number, Generic, Literal
- from pygments.lexers import get_lexer_by_name, ClassNotFound
--from pygments.util import iteritems
- 
- __all__ = [ 'CQLLexer' ]
- 
diff --git a/databases/cassandra3/files/patch-pylib_cassandra-cqlsh-tests.sh b/databases/cassandra3/files/patch-pylib_cassandra-cqlsh-tests.sh
index 137c6014c092..b27df106f467 100644
--- a/databases/cassandra3/files/patch-pylib_cassandra-cqlsh-tests.sh
+++ b/databases/cassandra3/files/patch-pylib_cassandra-cqlsh-tests.sh
@@ -1,39 +1,54 @@
---- pylib/cassandra-cqlsh-tests.sh.orig	2020-10-20 17:07:48 UTC
+--- pylib/cassandra-cqlsh-tests.sh.orig	2022-01-03 17:11:14 UTC
 +++ pylib/cassandra-cqlsh-tests.sh
 @@ -1,4 +1,4 @@
 -#!/bin/bash -x
 +#!/usr/local/bin/bash -x
+ #
+ # Licensed to the Apache Software Foundation (ASF) under one
+ # or more contributor license agreements.  See the NOTICE file
+@@ -15,7 +15,6 @@
+ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ # See the License for the specific language governing permissions and
+ # limitations under the License.
+-#
  
  ################################
  #
-@@ -9,6 +9,8 @@
+@@ -24,9 +23,13 @@
+ ################################
+ 
  WORKSPACE=$1
- PYTHON_VERSION=$2
- JAVA_HOME=$3
-+REPO_DIR=$4
-+PYTHON_CMD=$5
+-PYTHON_VERSION=$2
+-JAVA_HOME=$3
++JAVA_HOME=$2
++REPO_DIR=$3
++PYTHON_CMD=$4
++REPO_DIR=$5
  
++PYTHON_VERSION=python3
++
  if [ "${WORKSPACE}" = "" ]; then
      echo "Specify Cassandra source directory"
-@@ -48,7 +50,7 @@ fi
+     exit
+@@ -65,7 +68,7 @@ fi
  
  # Loop to prevent failure due to maven-ant-tasks not downloading a jar..
  for x in $(seq 1 3); do
 -    ant -buildfile ${CASSANDRA_DIR}/build.xml realclean jar
-+    ant -buildfile ${CASSANDRA_DIR}/build.xml -Dmaven.repo.local=${REPO_DIR} -Dlocalm2=${REPO_DIR} -Dpycmd=${PYTHON_CMD} realclean jar
++    ${ANT_CMD} -buildfile ${CASSANDRA_DIR}/build.xml realclean jar -Dmaven.repo.local=${REPO_DIR} -Dlocalm2=${REPO_DIR}
      RETURN="$?"
      if [ "${RETURN}" -eq "0" ]; then
          break
-@@ -62,7 +64,7 @@ fi
+@@ -79,7 +82,7 @@ fi
  
  # Set up venv with dtest dependencies
  set -e # enable immediate exit if venv setup fails
 -virtualenv --python=$PYTHON_VERSION venv
-+virtualenv --python=${PYTHON_CMD} venv
++virtualenv --python=$PYTHON_CMD venv
  source venv/bin/activate
  pip install -r ${CASSANDRA_DIR}/pylib/requirements.txt
  pip freeze
-@@ -103,7 +105,7 @@ case "${pre_or_post_cdc}" in
+@@ -120,7 +123,7 @@ case "${pre_or_post_cdc}" in
          ;;
  esac
  
diff --git a/databases/cassandra3/files/patch-pylib_requirements.txt b/databases/cassandra3/files/patch-pylib_requirements.txt
new file mode 100644
index 000000000000..27616df2d111
--- /dev/null
+++ b/databases/cassandra3/files/patch-pylib_requirements.txt
@@ -0,0 +1,16 @@
+--- pylib/requirements.txt.orig	2022-01-04 12:21:36 UTC
++++ pylib/requirements.txt
+@@ -1,7 +1,6 @@
+ # See python driver docs: futures and six have to be installed before
+ # cythonizing the driver, perhaps only on old pips.
+ # http://datastax.github.io/python-driver/installation.html#cython-based-extensions
+-futures
+ six>=0.12.0
+ -e git+https://github.com/datastax/python-driver.git@cassandra-test#egg=cassandra-driver
+ # Used ccm version is tracked by cassandra-test branch in ccm repo. Please create a PR there for fixes or upgrades to new releases.
+@@ -17,4 +16,4 @@ nose-test-select
+ parse
+ pycodestyle
+ psutil
+-thrift==0.9.3
++thrift==0.10.0
diff --git a/databases/cassandra3/files/patch-src_java_org_apache_cassandra_tools_nodetool_Status.java b/databases/cassandra3/files/patch-src_java_org_apache_cassandra_tools_nodetool_Status.java
index c2a3dcd724e4..5390ab1f59cd 100644
--- a/databases/cassandra3/files/patch-src_java_org_apache_cassandra_tools_nodetool_Status.java
+++ b/databases/cassandra3/files/patch-src_java_org_apache_cassandra_tools_nodetool_Status.java
@@ -1,6 +1,6 @@
---- src/java/org/apache/cassandra/tools/nodetool/Status.java.orig	2019-12-18 11:47:59 UTC
+--- src/java/org/apache/cassandra/tools/nodetool/Status.java.orig	2021-07-01 14:37:50 UTC
 +++ src/java/org/apache/cassandra/tools/nodetool/Status.java
-@@ -188,7 +188,7 @@ public class Status extends NodeToolCmd
+@@ -190,7 +190,7 @@ public class Status extends NodeToolCmd
              String addressPlaceholder = String.format("%%-%ds  ", maxAddressLength);
              buf.append("%s%s  ");                         // status
              buf.append(addressPlaceholder);               // address
diff --git a/databases/cassandra3/pkg-descr b/databases/cassandra3/pkg-descr
index 682185d32a1c..c14d3a30ca12 100644
--- a/databases/cassandra3/pkg-descr
+++ b/databases/cassandra3/pkg-descr
@@ -10,5 +10,3 @@ Apache project.
 
 The CQL query language offers SQL-like data access and management.
 Drivers are available for a number of languages.
-
-WWW: https://cassandra.apache.org/
diff --git a/databases/cassandra3/pkg-plist b/databases/cassandra3/pkg-plist
index 715f931dabf0..580b15fa5b78 100644
--- a/databases/cassandra3/pkg-plist
+++ b/databases/cassandra3/pkg-plist
@@ -19,7 +19,7 @@
 %%DATADIR%%/lib/asm-5.0.4.jar
 %%DATADIR%%/lib/caffeine-2.2.6.jar
 %%DATADIR%%/lib/cassandra-driver-core-3.0.1-shaded.jar
-%%DATADIR%%/lib/cassandra-driver-internal-only-3.23.0.post0-1a184b99.zip
+%%DATADIR%%/lib/cassandra-driver-internal-only-3.11.0-bb96859b.zip
 %%DATADIR%%/lib/commons-cli-1.1.jar
 %%DATADIR%%/lib/commons-codec-1.9.jar
 %%DATADIR%%/lib/commons-lang3-3.1.jar
@@ -30,78 +30,26 @@
 %%DATADIR%%/lib/disruptor-3.0.1.jar
 %%DATADIR%%/lib/ecj-4.4.2.jar
 %%DATADIR%%/lib/futures-2.1.6-py2.py3-none-any.zip
-%%DATADIR%%/lib/geomet-0.1.0.zip
 %%DATADIR%%/lib/guava-18.0.jar
 %%DATADIR%%/lib/HdrHistogram-2.1.9.jar
 %%DATADIR%%/lib/high-scale-lib-1.0.6.jar
 %%DATADIR%%/lib/hppc-0.5.4.jar
-%%DATADIR%%/lib/jackson-annotations-2.9.10.jar
-%%DATADIR%%/lib/jackson-core-2.9.10.jar
-%%DATADIR%%/lib/jackson-databind-2.9.10.4.jar
+%%DATADIR%%/lib/jackson-annotations-2.13.2.jar
+%%DATADIR%%/lib/jackson-core-2.13.2.jar
+%%DATADIR%%/lib/jackson-databind-2.13.2.2.jar
 %%DATADIR%%/lib/jamm-0.3.0.jar
-%%DATADIR%%/lib/javax.inject.jar
-%%DATADIR%%/lib/jbcrypt-0.3m.jar
-%%DATADIR%%/lib/jcl-over-slf4j-1.7.7.jar
+%%DATADIR%%/lib/javax.inject-1.jar
+%%DATADIR%%/lib/jbcrypt-0.4.jar
+%%DATADIR%%/lib/jcl-over-slf4j-1.7.25.jar
 %%DATADIR%%/lib/jctools-core-1.2.1.jar
 %%DATADIR%%/lib/jflex-1.6.0.jar
 %%DATADIR%%/lib/jna-4.2.2.jar
 %%DATADIR%%/lib/joda-time-2.4.jar
 %%DATADIR%%/lib/json-simple-1.1.jar
-%%DATADIR%%/lib/jstackjunit-0.0.1.jar
 %%DATADIR%%/lib/libthrift-0.9.2.jar
-%%DATADIR%%/lib/licenses/airline-0.6.txt
-%%DATADIR%%/lib/licenses/antlr-runtime-3.5.2.txt
-%%DATADIR%%/lib/licenses/asm-5.0.4.txt
-%%DATADIR%%/lib/licenses/caffeine-2.2.6.txt
-%%DATADIR%%/lib/licenses/cassandra-driver-3.0.1.txt
-%%DATADIR%%/lib/licenses/commons-cli-1.1.txt
-%%DATADIR%%/lib/licenses/commons-codec-1.9.txt
-%%DATADIR%%/lib/licenses/commons-lang3-3.1.txt
-%%DATADIR%%/lib/licenses/commons-math3-3.2.txt
-%%DATADIR%%/lib/licenses/compress-lzf-0.8.4.txt
-%%DATADIR%%/lib/licenses/concurrent-trees-2.4.0.txt
-%%DATADIR%%/lib/licenses/concurrentlinkedhashmap-lru-1.4.txt
-%%DATADIR%%/lib/licenses/disruptor-3.0.1.txt
-%%DATADIR%%/lib/licenses/ecj-4.4.2.txt
-%%DATADIR%%/lib/licenses/futures-2.1.6.txt
-%%DATADIR%%/lib/licenses/guava-18.0.txt
-%%DATADIR%%/lib/licenses/hdrhistogram-2.1.9.txt
-%%DATADIR%%/lib/licenses/high-scale-lib-1.0.6.txt
-%%DATADIR%%/lib/licenses/hppc-0.5.4.txt
-%%DATADIR%%/lib/licenses/jackson-core-asl-1.9.13.txt
-%%DATADIR%%/lib/licenses/jackson-mapper-asl-1.9.13.txt
-%%DATADIR%%/lib/licenses/jamm-0.3.0.txt
-%%DATADIR%%/lib/licenses/javax.inject.txt
-%%DATADIR%%/lib/licenses/jbcrypt-0.3m.txt
-%%DATADIR%%/lib/licenses/jcl-over-slf4j-1.7.7.txt
-%%DATADIR%%/lib/licenses/jctools-core-1.2.1.txt
-%%DATADIR%%/lib/licenses/jflex-1.6.0.txt
-%%DATADIR%%/lib/licenses/jna-4.2.2.txt
-%%DATADIR%%/lib/licenses/joda-time-2.4.txt
-%%DATADIR%%/lib/licenses/json-simple-1.1.txt
-%%DATADIR%%/lib/licenses/jstackjunit-0.0.1.txt
-%%DATADIR%%/lib/licenses/libthrift-0.9.2.txt
-%%DATADIR%%/lib/licenses/log4j-over-slf4j-1.7.7.txt
-%%DATADIR%%/lib/licenses/logback-classic-1.1.3.txt
-%%DATADIR%%/lib/licenses/logback-core-1.1.3.txt
-%%DATADIR%%/lib/licenses/lz4-1.3.0.txt
-%%DATADIR%%/lib/licenses/metrics-core-3.1.5.txt
-%%DATADIR%%/lib/licenses/metrics-jvm-3.1.5.txt
-%%DATADIR%%/lib/licenses/metrics-logback-3.1.5.txt
-%%DATADIR%%/lib/licenses/netty-all-4.0.44.Final.txt
-%%DATADIR%%/lib/licenses/ohc-0.4.4.txt
-%%DATADIR%%/lib/licenses/reporter-config-base-3.0.3.txt
-%%DATADIR%%/lib/licenses/reporter-config3-3.0.3.txt
-%%DATADIR%%/lib/licenses/six-1.7.3.txt
-%%DATADIR%%/lib/licenses/slf4j-api-1.7.7.txt
-%%DATADIR%%/lib/licenses/snakeyaml-1.11.txt
-%%DATADIR%%/lib/licenses/snowball-stemmer-1.3.0.581.1.txt
-%%DATADIR%%/lib/licenses/ST4-4.0.8.txt
-%%DATADIR%%/lib/licenses/stream-2.5.2.txt
-%%DATADIR%%/lib/licenses/thrift-server-0.3.7.txt
-%%DATADIR%%/lib/log4j-over-slf4j-1.7.7.jar
-%%DATADIR%%/lib/logback-classic-1.1.3.jar
-%%DATADIR%%/lib/logback-core-1.1.3.jar
+%%DATADIR%%/lib/log4j-over-slf4j-1.7.25.jar
+%%DATADIR%%/lib/logback-classic-1.2.9.jar
+%%DATADIR%%/lib/logback-core-1.2.9.jar
 %%DATADIR%%/lib/lz4-1.3.0.jar
 %%DATADIR%%/lib/metrics-core-3.1.5.jar
 %%DATADIR%%/lib/metrics-jvm-3.1.5.jar
@@ -111,9 +59,9 @@
 %%DATADIR%%/lib/ohc-core-j8-0.4.4.jar
 %%DATADIR%%/lib/reporter-config-base-3.0.3.jar
 %%DATADIR%%/lib/reporter-config3-3.0.3.jar
-%%DATADIR%%/lib/six-1.12.0-py2.py3-none-any.zip
-%%DATADIR%%/lib/slf4j-api-1.7.7.jar
-%%DATADIR%%/lib/snakeyaml-1.11.jar
+%%DATADIR%%/lib/six-1.16.0-py2.py3-none-any.zip
+%%DATADIR%%/lib/slf4j-api-1.7.25.jar
+%%DATADIR%%/lib/snakeyaml-1.26.jar
 %%DATADIR%%/lib/snappy-java.jar
 %%DATADIR%%/lib/snowball-stemmer-1.3.0.581.1.jar
 %%DATADIR%%/lib/ST4-4.0.8.jar
@@ -139,7 +87,10 @@
 %%DATADIR%%/pylib/cqlshlib/test/ansi_colors.py
 %%DATADIR%%/pylib/cqlshlib/test/basecase.py
 %%DATADIR%%/pylib/cqlshlib/test/cassconnect.py
+%%DATADIR%%/pylib/cqlshlib/test/config/sslhandling.config
+%%DATADIR%%/pylib/cqlshlib/test/config/sslhandling_invalid.config
 %%DATADIR%%/pylib/cqlshlib/test/run_cqlsh.py
+%%DATADIR%%/pylib/cqlshlib/test/test_constants.py
 %%DATADIR%%/pylib/cqlshlib/test/test_cql_parsing.py
 %%DATADIR%%/pylib/cqlshlib/test/test_cqlsh_commands.py
 %%DATADIR%%/pylib/cqlshlib/test/test_cqlsh_completion.py
@@ -147,6 +98,7 @@
 %%DATADIR%%/pylib/cqlshlib/test/test_cqlsh_output.py
 %%DATADIR%%/pylib/cqlshlib/test/test_cqlsh_parsing.py
 %%DATADIR%%/pylib/cqlshlib/test/test_keyspace_init.cql
+%%DATADIR%%/pylib/cqlshlib/test/test_sslhandling.py
 %%DATADIR%%/pylib/cqlshlib/test/winpty.py
 %%DATADIR%%/pylib/cqlshlib/tracing.py
 %%DATADIR%%/pylib/cqlshlib/util.py
diff --git a/databases/cassandra4/Makefile b/databases/cassandra4/Makefile
index e895d061956f..c65f5bdc4bdf 100644
--- a/databases/cassandra4/Makefile
+++ b/databases/cassandra4/Makefile
@@ -1,31 +1,35 @@
 PORTNAME=	cassandra
-DISTVERSION=	4.0-beta2
+DISTVERSION=	4.0.8
 CATEGORIES=	databases java
-MASTER_SITES=	APACHE/cassandra/${DISTVERSION}:apache \
-		https://repo1.maven.org/maven2/com/github/luben/zstd-jni/1.4.5-4/:maven \
-		LOCAL/mikael:repo
+MASTER_SITES=	https://archive.apache.org/dist/${PORTNAME}/${DISTVERSION}/:apache \
+		https://repo1.maven.org/maven2/com/github/luben/zstd-jni/1.5.0-4/:maven
 PKGNAMESUFFIX=	4
 DISTNAME=	apache-${PORTNAME}-${DISTVERSION}-src
 DISTFILES=	${DISTNAME}.tar.gz:apache \
 		${ZSTD_DISTFILE} \
-		apache-${PORTNAME}-${DISTVERSION}-repo.tar.gz:repo
+		${MAVEN_CACHE_FILE}:prefetch
+DIST_SUBDIR=	${PORTNAME}
 EXTRACT_ONLY=	${DISTNAME}.tar.gz \
-		apache-${PORTNAME}-${DISTVERSION}-repo.tar.gz
+		${MAVEN_CACHE_FILE}
 
 MAINTAINER=	language.devel@gmail.com
 COMMENT=	Highly scalable distributed database
+WWW=		https://cassandra.apache.org/
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
+FETCH_DEPENDS=	ant:devel/apache-ant
 RUN_DEPENDS=	snappyjava>=0:archivers/snappy-java \
 		netty>0:java/netty
 
-USES=		python:3.7+
+USES=		cpe python shebangfix
 USE_JAVA=	yes
 USE_ANT=	yes
 USE_RC_SUBR=	cassandra
+SHEBANG_FILES=	bin/cqlsh.py pylib/setup.py
 TEST_TARGET=	test
+CPE_VENDOR=	apache
 
 CONFLICTS=	cassandra3
 
@@ -65,7 +69,7 @@ SCRIPT_FILES=	cassandra \
 		sstableutil \
 		sstableverify
 
-ZSTDJNI_VERSION=${MASTER_SITES:M*\:maven:H:T}
+ZSTDJNI_VERSION=	${MASTER_SITES:M*\:maven:H:T}
 PLIST_SUB=	DISTVERSION=${DISTVERSION} ZSTDJNI_VERSION=${ZSTDJNI_VERSION}
 
 OPTIONS_DEFINE=		SIGAR DOCS
@@ -80,14 +84,36 @@ DOCS_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sphinx>=0,1:textproc/py-sphinx@${PY_F
 
 PORTDOCS=		*
 
+MAVEN_CACHE_FILE=	apache-${PORTNAME}-${DISTVERSION}-repo.tar.xz
+
+.if !exists(${DISTDIR}/${DIST_SUBDIR}/${MAVEN_CACHE_FILE})
+pre-fetch:
+	${MKDIR} ${DISTDIR}/${DIST_SUBDIR}
+	${MKDIR} ${WRKSRC}/.build
+	${MKDIR} ${WRKSRC}/src/java
+	${CP} ${FILESDIR}/maven/build.* ${WRKSRC}
+	${CP} ${FILESDIR}/maven/build-* ${WRKSRC}/.build
+	cd ${WRKSRC} && ${ANT} -Dmaven.repo.local=${REPO_DIR} -Dlocal.repository=${REPO_DIR} ${USEJDK11} resolver-dist-lib
+	cd ${REPO_DIR} && ${FIND} . -type f -name "*.repositories" -a -exec ${SED} -i '' -e '2s,.*,Mon Aug 08 20:40:04 CEST 2022,' {} +
+	cd ${WRKDIR} && ${MTREE_CMD} -cbnSp repository | ${MTREE_CMD} -C | ${SED} \
+		-e 's:time=[0-9.]*:time=0.000000000:' \
+		-e 's:\([gu]id\)=[0-9]*:\1=0:g' \
+		-e 's:flags=.*:flags=none:' \
+		-e 's:^\.:./repository:' \
+		> maven-offline-cache.mtree
+	cd ${WRKDIR} && ${TAR} cJf ${DISTDIR}/${DIST_SUBDIR}/${MAVEN_CACHE_FILE} \
+		@maven-offline-cache.mtree
+	${SHA256} ${WRKDIR}/maven-offline-cache.mtree ${DISTDIR}/${DIST_SUBDIR}/${MAVEN_CACHE_FILE}
+.endif
+
 do-build:
 	@${DO_NADA} # Do nothing: Prevent USE_ANT from running a default build target.
 
 do-build-DOCS-on:
-	cd ${WRKSRC} && ${SETENV} CASSANDRA_LOG_DIR=${WRKDIR}/gen-doc-log ${ANT} -Dmaven.repo.local=${REPO_DIR} -Dlocalm2=${REPO_DIR} ${USEJDK11} -Dpycmd=${PYTHON_CMD} -Dpyver=${PYTHON_VER} freebsd-stage-doc
+	cd ${WRKSRC} && ${SETENV} CASSANDRA_LOG_DIR=${WRKDIR}/gen-doc-log ${ANT} -Dmaven.repo.local=${REPO_DIR} -Dlocal.repository=${REPO_DIR} ${USEJDK11} -Dpycmd=${PYTHON_CMD} -Dpyver=${PYTHON_VER} freebsd-stage-doc
 
 do-build-DOCS-off:
-	cd ${WRKSRC} && ${ANT} -Dmaven.repo.local=${REPO_DIR} -Dlocalm2=${REPO_DIR} ${USEJDK11} freebsd-stage
+	cd ${WRKSRC} && ${ANT} -Dmaven.repo.local=${REPO_DIR} -Dlocal.repository=${REPO_DIR} ${USEJDK11} freebsd-stage
 
 post-build:
 .for f in ${SCRIPT_FILES}
@@ -119,6 +145,8 @@ do-install:
 	cd ${BUILD_DIST_DIR} && ${INSTALL_DATA} bin/cassandra.in.sh ${STAGEDIR}${DATADIR}/bin/
 	cd ${BUILD_DIST_DIR} && ${COPYTREE_BIN} tools/bin ${STAGEDIR}${DATADIR}/
 	cd ${BUILD_DIST_DIR} && ${INSTALL_DATA} tools/bin/cassandra.in.sh ${STAGEDIR}${DATADIR}/tools/bin/
+	cd ${BUILD_DIST_DIR} && ${INSTALL_DATA} tools/lib/fqltool.jar ${STAGEDIR}${DATADIR}/tools/lib/
+	cd ${BUILD_DIST_DIR} && ${INSTALL_DATA} tools/lib/stress.jar ${STAGEDIR}${DATADIR}/tools/lib/
 .for f in ${SCRIPT_FILES}
 	${RLN} ${STAGEDIR}${DATADIR}/bin/${f} ${STAGEDIR}${PREFIX}/bin/${f}
 .endfor
@@ -126,12 +154,12 @@ do-install:
 	${LN} -s ${JAVAJARDIR}/snappy-java.jar ${STAGEDIR}${DATADIR}/lib/snappy-java.jar
 
 do-test:
-	@cd ${WRKSRC} && ${ANT} -Dmaven.repo.local=${REPO_DIR} -Dlocalm2=${REPO_DIR} ${USEJDK11} -Dstagedlib=${STAGEDIR}${DATADIR}/lib test
+	@cd ${WRKSRC} && ${ANT} -Dmaven.repo.local=${REPO_DIR} -Dlocal.repository=${REPO_DIR} ${USEJDK11} -Dstagedlib=${STAGEDIR}${DATADIR}/lib test
 
 .include <bsd.port.pre.mk>
 
 .if ${JAVA_PORT_VERSION} == 11
-USEJDK11=	-Duse.jdk11=true
+USEJDK11=	-Duse.jdk11=true -Drat.skip=true
 .endif
 
 .if ${ARCH} == amd64
@@ -154,7 +182,7 @@ ZSTD_DISTFILE=
 post-install:
 	${LN} -s ${JAVAJARDIR}/netty.jar ${STAGEDIR}${DATADIR}/lib/netty.jar
 .if ${ARCH} == amd64 || ${ARCH} == i386
-	${CP} ${DISTDIR}/zstd-jni-${ZSTDJNI_VERSION}-freebsd_${ARCH}.jar ${STAGEDIR}${DATADIR}/lib/
+	${CP} ${DISTDIR}/${DIST_SUBDIR}/zstd-jni-${ZSTDJNI_VERSION}-freebsd_${ARCH}.jar ${STAGEDIR}${DATADIR}/lib/
 .endif
 
 post-install-DOCS-on:
diff --git a/databases/cassandra4/distinfo b/databases/cassandra4/distinfo
index 82d3b4cbe97c..976d31650bd9 100644
--- a/databases/cassandra4/distinfo
+++ b/databases/cassandra4/distinfo
@@ -1,9 +1,9 @@
-TIMESTAMP = 1601573969
-SHA256 (apache-cassandra-4.0-beta2-src.tar.gz) = 02347ce3d55fd7d68f90c112ee01d82902dfd959cf03c107a51d15bcaabb48c5
-SIZE (apache-cassandra-4.0-beta2-src.tar.gz) = 46741277
-SHA256 (zstd-jni-1.4.5-4-freebsd_amd64.jar) = cdfcacd3d0b405869fc71c7c73ff861fa5421045f53a6168a0d0b4e8ae7ebfbc
-SIZE (zstd-jni-1.4.5-4-freebsd_amd64.jar) = 512671
-SHA256 (zstd-jni-1.4.5-4-freebsd_i386.jar) = bb3e6e4081ffbe28648983d3c2f47cd488a29b6bb09b1e9f1219cdf82b3ed648
-SIZE (zstd-jni-1.4.5-4-freebsd_i386.jar) = 418462
-SHA256 (apache-cassandra-4.0-beta2-repo.tar.gz) = 9a0d3ad05f535158dd65761a16f3a9fb0362cbe365d6e08ef6d9896bbf3a022f
-SIZE (apache-cassandra-4.0-beta2-repo.tar.gz) = 77730955
+TIMESTAMP = 1679924890
+SHA256 (cassandra/apache-cassandra-4.0.8-src.tar.gz) = 98da97d7fe850a0a24eb2aef212e982f73205cbd63955d2915b4ad02e28dae9c
+SIZE (cassandra/apache-cassandra-4.0.8-src.tar.gz) = 12953548
+SHA256 (cassandra/zstd-jni-1.5.0-4-freebsd_amd64.jar) = b653460b6ff374db2c01f39a7b7cdb44008c9efd55dc96ae5f869abe9f58d180
+SIZE (cassandra/zstd-jni-1.5.0-4-freebsd_amd64.jar) = 670993
+SHA256 (cassandra/zstd-jni-1.5.0-4-freebsd_i386.jar) = 1bcb75c5837e42d10ec0193ba9df099874792f0829b0ce8dd3412303c6454595
+SIZE (cassandra/zstd-jni-1.5.0-4-freebsd_i386.jar) = 604557
+SHA256 (cassandra/apache-cassandra-4.0.8-repo.tar.xz) = 807a108e3639f247dafa3ce4ebc4744b93668cf463915edf7b654d317d1abaff
+SIZE (cassandra/apache-cassandra-4.0.8-repo.tar.xz) = 78148020
diff --git a/databases/cassandra4/files/cassandra.in b/databases/cassandra4/files/cassandra.in
index 421ba7e55d9c..9615fbe572f6 100644
--- a/databases/cassandra4/files/cassandra.in
+++ b/databases/cassandra4/files/cassandra.in
@@ -23,13 +23,12 @@ load_rc_config $name
 : ${cassandra_enable:=NO}
 : ${cassandra_user:=cassandra}
 
-command=%%PREFIX%%/bin/cassandra
-command_args="-p /var/run/cassandra/cassandra.pid >/dev/null 2>/dev/null"
-start_precmd="${name}_prestart"
-
-procname=%%JAVA_HOME%%/bin/java
 pidfile=/var/run/cassandra/cassandra.pid
 
+command=/usr/sbin/daemon
+command_args="-frP ${pidfile} %%PREFIX%%/bin/cassandra -f"
+start_precmd="${name}_prestart"
+
 cassandra_prestart()
 {
 	export JAVA_HOME=%%JAVA_HOME%%
diff --git a/databases/cassandra4/files/maven/build-owasp.xml b/databases/cassandra4/files/maven/build-owasp.xml
new file mode 100644
index 000000000000..f3174999e8d4
--- /dev/null
+++ b/databases/cassandra4/files/maven/build-owasp.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!--
+  ~ Licensed to the Apache Software Foundation (ASF) under one
+  ~ or more contributor license agreements.  See the NOTICE file
+  ~ distributed with this work for additional information
+  ~ regarding copyright ownership.  The ASF licenses this file
+  ~ to you under the Apache License, Version 2.0 (the
+  ~ "License"); you may not use this file except in compliance
+  ~ with the License.  You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<project basedir="." name="apache-cassandra-owasp-tasks">
+    <property name="dependency-check.version" value="6.3.2"/>
+    <property name="dependency-check.home" value="${build.dir}/dependency-check-ant-${dependency-check.version}"/>
+
+    <condition property="is.dependency.check.jar">
+        <available file="${dependency-check.home}/dependency-check-ant/dependency-check-ant.jar" type="file" />
+    </condition>
+
+    <target name="dependency-check-download"
+            depends="build"
+            description="Fetch OWASP Dependency checker"
+            unless="is.dependency.check.jar">
+
+        <echo>Downloading OWASP Dependency checks ...</echo>
+
+        <mkdir dir="${dependency-check.home}"/>
+
+        <get src="https://github.com/jeremylong/DependencyCheck/releases/download/v${dependency-check.version}/dependency-check-ant-${dependency-check.version}-release.zip"
+             dest="${dependency-check.home}/dependency-check-ant-${dependency-check.version}-release.zip"/>
+
+        <unzip src="${dependency-check.home}/dependency-check-ant-${dependency-check.version}-release.zip" dest="${dependency-check.home}"/>
+    </target>
+
+    <target name="dependency-check" description="Dependency-Check Analysis" depends="dependency-check-download,resolver-dist-lib">
+
+        <path id="dependency-check.path">
+            <fileset dir="${dependency-check.home}/dependency-check-ant/lib">
+                <include name="*.jar"/>
+            </fileset>
+        </path>
+
+        <taskdef resource="dependency-check-taskdefs.properties">
+            <classpath refid="dependency-check.path" />
+        </taskdef>
+
+        <!--
+            default value for cveValidForHours is 4 after which sync is done again
+
+            skipping using two specific caches at the end is solving (1)
+
+            failBuildOnCVSS is by default 11 so build would never fail,
+            the table categorising vulnerabilities is here (2), so by setting
+            "failBuildOnCVSS" to 1, we will fail the build on any CVE found
+            if it is not suppressed already dependency-check-suppressions.xml
+
+            If a vendor provides no details about a vulnerability,
+            NVD will score that vulnerability as 10.0 (the highest rating translating to critical).
+
+            (1) https://github.com/jeremylong/DependencyCheck/issues/2166
+            (2) https://nvd.nist.gov/vuln-metrics/cvss
+        -->
+        <dependency-check projectname="Apache Cassandra"
+                          reportoutputdirectory="${basedir}/build"
+                          reportformat="HTML"
+                          prettyPrint="true"
+                          cveValidForHours="1"
+                          centralAnalyzerUseCache="false"
+                          nodeAuditAnalyzerUseCache="false"
+                          failBuildOnCVSS="1"
+                          assemblyAnalyzerEnabled="false"
+                          dataDirectory="${dependency-check.home}/data"
+                          suppressionFile="${basedir}/.build/dependency-check-suppressions.xml">
+            <fileset dir="lib">
+                <include name="**/*.jar"/>
+            </fileset>
+        </dependency-check>
+    </target>
+</project>
diff --git a/databases/cassandra4/files/maven/build-rat.xml b/databases/cassandra4/files/maven/build-rat.xml
new file mode 100644
index 000000000000..5a6aa0aa8546
--- /dev/null
+++ b/databases/cassandra4/files/maven/build-rat.xml
@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<project basedir="." name="apache-cassandra--rat-tasks"
+     xmlns:rat="antlib:org.apache.rat.anttasks">
+
+    <!--
+      License audit tool
+    -->
+
+    <target name="_rat_init" depends="resolver-init">
+        <typedef uri="antlib:org.apache.rat.anttasks" classpathref="rat.classpath"/>
+    </target>
+
+    <target name="_build_ratinclude" depends="_rat_init">
+        <exec executable="git" failifexecutionfails="false" failonerror="false" resultproperty="git.success" output="build/.versioned_files">
+            <arg line="ls-tree -r HEAD --name-only"/>
+        </exec>
+        <condition property="rat.skip" value="true">
+            <not>
+                <equals arg1="${git.success}" arg2="0"/>
+            </not>
+        </condition>
+        <copy file="build/.versioned_files" tofile="build/.ratinclude">
+            <filterchain>
+                <linecontainsregexp>
+                    <regexp pattern=".*\.(java|py|sh|xml|spec|md|iml|bat|btm|cql|css|g|html|jflex|jks|mod|name|pom|textile|yml|yaml|MIDRES|HIGHRES|LOWRES)$"/>
+                </linecontainsregexp>
+            </filterchain>
+        </copy>
+    </target>
+
+    <target name="rat-check" depends="_build_ratinclude" unless="${rat.skip}" description="License checks on source" >
+        <rat:report reportFile="${build.dir}/rat.txt">
+            <fileset dir="." includesfile="build/.ratinclude">
+                 <!-- Config files with not much creativity -->
+                 <exclude name="**/ide/**/*"/>
+                 <exclude name="**/metrics-reporter-config-sample.yaml"/>
+                 <exclude name="**/cassandra.yaml"/>
+                 <exclude name="**/cassandra-murmur.yaml"/>
+                 <exclude name="**/cassandra-seeds.yaml"/>
+                 <exclude NAME="**/doc/antora.yml"/>
+                 <exclude name="**/test/conf/cassandra.yaml"/>
+                 <exclude name="**/test/conf/cassandra_deprecated_parameters_names.yaml"/>
+                 <exclude name="**/test/conf/cassandra_encryption.yaml"/>
+                 <exclude name="**/test/conf/cdc.yaml"/>
+                 <exclude name="**/test/conf/commitlog_compression_LZ4.yaml"/>
+                 <exclude name="**/test/conf/commitlog_compression_Zstd.yaml"/>
+                 <exclude name="**/test/conf/system_keyspaces_directory.yaml"/>
+                 <exclude name="**/test/conf/sstableloader_with_encryption.yaml"/>
+                 <exclude name="**/test/conf/unit-test-conf/test-native-port.yaml"/>
+                 <exclude name="**/test/data/jmxdump/cassandra-3.0-jmx.yaml"/>
+                 <exclude name="**/test/data/jmxdump/cassandra-3.11-jmx.yaml"/>
+                 <exclude name="**/test/data/jmxdump/cassandra-4.0-jmx.yaml"/>
+                 <exclude name="**/tools/cqlstress-counter-example.yaml"/>
+                 <exclude name="**/tools/cqlstress-example.yaml"/>
+                 <exclude name="**/tools/cqlstress-insanity-example.yaml"/>
+                 <exclude name="**/tools/cqlstress-lwt-example.yaml"/>
+                 <!-- Documentation files -->
+                 <exclude NAME="**/doc/modules/**/*"/>
+                 <!-- NOTICE files -->
+                 <exclude NAME="**/NOTICE.md"/>
+                 <!-- LICENSE files -->
+                 <exclude NAME="**/LICENSE.md"/>
+            </fileset>
+        </rat:report>
+        <exec executable="grep" outputproperty="rat.failed.files" failifexecutionfails="false">
+            <arg line="-A5 'Unapproved licenses' ${build.dir}/rat.txt"/>
+        </exec>
+        <fail message="Some files have missing or incorrect license information. Check RAT report in ${build.dir}/rat.txt for more details! \n ${rat.failed.files}">
+            <condition>
+                <and>
+                    <not>
+                        <resourcecontains resource="${build.dir}/rat.txt" substring="0 Unknown Licenses" casesensitive="false" />
+                    </not>
+                </and>
+            </condition>
+        </fail>
+    </target>
+
+    <target name="_assert_rat_output">
+        <fail message="The rat report at build/rat.txt was not generated. Please ensure that the rat-check task is able to run successfully. For dev builds only, touch build/rat.txt to skip this check">
+            <condition>
+                <not>
+                    <available file="build/rat.txt" />
+                </not>
+            </condition>
+        </fail>
+    </target>
+
+</project>
diff --git a/databases/cassandra4/files/maven/build-resolver.xml b/databases/cassandra4/files/maven/build-resolver.xml
new file mode 100644
index 000000000000..a159d97acaff
--- /dev/null
+++ b/databases/cassandra4/files/maven/build-resolver.xml
@@ -0,0 +1,262 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<project basedir="." name="apache-cassandra--resolver-tasks"
+         xmlns:resolver="antlib:org.apache.maven.resolver.ant"
+         xmlns:if="ant:if"
+         xmlns:unless="ant:unless">
+
+    <!-- details of what version of Resolver ANT Tasks to fetch -->
+    <property name="resolver-ant-tasks.version" value="1.3.0" />
+    <property name="resolver-ant-tasks.local" value="${local.repository}/org/apache/maven/resolver/maven-resolver-ant-tasks/${resolver-ant-tasks.version}/maven-resolver-ant-tasks-${resolver-ant-tasks.version}.jar"/>
+    <property name="resolver-ant-tasks.url" value="https://repo1.maven.org/maven2/org/apache/maven/resolver/maven-resolver-ant-tasks" />
+    <condition property="resolver-ant-tasks.jar.exists">
+        <available file="${resolver-ant-tasks.local}" />
+    </condition>
+
+    <property name="artifact.python.pypi" value="https://files.pythonhosted.org/packages" />
+    <property name="artifact.github.release" value="https://github.com" />
+
+    <!-- some artifacts are fetched from github as blobs; these are all in the cassandra project, but in an older commit -->
+    <property name="lib.download.sha" value="1371883db3d8bf7d7c54e0baaca89c6c2d2a5abe"/>
+    <property name="lib.download.base.url" value="https://raw.githubusercontent.com/apache/cassandra/${lib.download.sha}" />
+    <property name="lib.download.url.postfix" value="" />
+
+    <path id="resolver-ant-tasks.classpath" path="${resolver-ant-tasks.local}" />
+
+    <!--
+       Fetch Resolver Ant Tasks and Cassandra's dependencies.
+    -->
+
+    <target name="_resolver_download" unless="resolver-ant-tasks.jar.exists" description="Fetch Resolver ANT Tasks from Maven Central Repository">
+        <echo>Downloading Resolver ANT Tasks...</echo>
+        <mkdir dir="${local.repository}/org/apache/maven/resolver/maven-resolver-ant-tasks/${resolver-ant-tasks.version}" />
+
+        <get src="${resolver-ant-tasks.url}/${resolver-ant-tasks.version}/maven-resolver-ant-tasks-${resolver-ant-tasks.version}-uber.jar"
+             dest="${resolver-ant-tasks.local}" usetimestamp="true" quiet="true"/>
+    </target>
+
+    <target name="resolver-init" depends="init,_resolver_download" unless="resolver-ant-tasks.initialized" description="Initialize Resolver ANT Tasks">
+
+        <typedef uri="antlib:org.apache.maven.resolver.ant" resource="org/apache/maven/resolver/ant/antlib.xml" classpathref="resolver-ant-tasks.classpath" />
+        <resolver:remoterepos id="all">
+            <remoterepo id="resolver-central" url="${artifact.remoteRepository.central}"/>
+            <remoterepo id="resolver-apache" url="${artifact.remoteRepository.apache}"/>
+        </resolver:remoterepos>
+
+        <macrodef name="resolve">
+            <!--
+              maven-resolver-ant-tasks's resolve logic doesn't have retry logic and does not respect settings.xml,
+              this causes issues when overriding maven central is required (such as when behind a corporate firewall);
+              it is critical to always provide the 'all' remoterepos to override resolve's default hard coded logic.
+
+              This macro simplifies this logic by centralizing retries and forcing the remoterepo 'all' to be used.
+            -->
+            <attribute name="failonmissingattachments" default="true"/>
+            <element name="elements" implicit="yes"/>
+            <sequential>
+                <retry retrycount="3">
+                  <resolver:resolve failonmissingattachments="@{failonmissingattachments}">
+                        <resolver:remoterepos refid="all"/>
+                        <elements/>
+                    </resolver:resolve>
+                </retry>
+            </sequential>
+        </macrodef>
+        <macrodef name="resolvepom">
+            <attribute name="file"/>
+            <attribute name="id"/>
+            <element name="elements" implicit="yes" optional="yes"/>
+            <sequential>
+                <retry retrycount="3">
+                    <resolver:pom file="@{file}" id="@{id}">
+                          <remoterepos refid="all"/>
+                          <elements/>
+                    </resolver:pom>
+                </retry>
+            </sequential>
+        </macrodef>
+
+        <resolve>
+            <dependencies>
+                <dependency groupId="com.datastax.wikitext" artifactId="wikitext-core-ant" version="1.3"/>
+                <dependency groupId="org.fusesource.wikitext" artifactId="textile-core" version="1.3"/>
+            </dependencies>
+            <path refid="wikitext.classpath" classpath="runtime"/>
+        </resolve>
+        <resolve>
+            <dependencies>
+                <dependency groupId="org.apache.rat" artifactId="apache-rat-tasks" version="0.6" />
+            </dependencies>
+            <path refid="rat.classpath" classpath="runtime"/>
+        </resolve>
+        <resolve>
+            <dependencies>
+                <dependency groupId="org.jacoco" artifactId="org.jacoco.ant" version="${jacoco.version}" />
+            </dependencies>
+            <path refid="jacocoant.classpath" classpath="runtime"/>
+        </resolve>
+        <resolve>
+            <dependencies>
+                <dependency groupId="org.antlr" artifactId="antlr" version="3.5.2"/>
+                <dependency groupId="org.antlr" artifactId="antlr-runtime" version="3.5.2"/>
+                <dependency groupId="org.antlr" artifactId="ST4" version="4.0.8"/>
+            </dependencies>
+            <path refid="cql3-grammar.classpath" classpath="runtime"/>
+        </resolve>
+        <resolve>
+            <dependencies>
+                <dependency groupId="de.jflex" artifactId="jflex" version="${jflex.version}" />
+            </dependencies>
+            <path refid="jflex.classpath" classpath="runtime"/>
+        </resolve>
+
+        <macrodef name="install">
+            <attribute name="pomFile"/>
+            <attribute name="file"/>
+            <attribute name="classifier" default=""/>
+            <attribute name="packaging" default="jar"/>
+            <sequential>
+                <exec dir="." executable="sh">
+                    <arg line="-c 'mvn org.apache.maven.plugins:maven-install-plugin:2.3.1:install-file -DpomFile=@{pomFile} -Dfile=@{file} -Dclassifier=@{classifier} -Dpackaging=@{packaging}'" />
+                </exec>
+            </sequential>
+        </macrodef>
+
+        <macrodef name="deploy">
+            <attribute name="pomFile"/>
+            <attribute name="file"/>
+            <attribute name="classifier" default=""/>
+            <attribute name="packaging" default="jar"/>
+            <sequential>
+                <exec dir="." executable="sh">
+                    <arg line="-c 'mvn org.apache.maven.plugins:maven-gpg-plugin:1.6:sign-and-deploy-file -DretryFailedDeploymentCount=5 -Durl=${maven-repository-url} -DrepositoryId=${maven-repository-id} -DpomFile=@{pomFile} -Dfile=@{file} -Dclassifier=@{classifier} -Dpackaging=@{packaging}'" />
+                </exec>
+            </sequential>
+        </macrodef>
+
+        <macrodef name="sign-dist">
+            <attribute name="file"/>
+            <sequential>
+                <echo message="gpg signing @{file}" />
+                <exec dir="." executable="sh">
+                    <!-- dummy out the deploy parameters, only the signing is required here -->
+                    <arg line="-c 'mvn -q org.apache.maven.plugins:maven-gpg-plugin:1.6:sign-and-deploy-file -Dfile=@{file} -DgroupId=org.apache.cassandra -DartifactId=cassandra-parent -Dversion=${version} -Durl=file:///tmp/ -DrepositoryId=tmp'" />
+                </exec>
+            </sequential>
+        </macrodef>
+
+        <property name="resolver-ant-tasks.initialized" value="true"/>
+    </target>
+
+    <target name="resolver-retrieve-build" depends="resolver-init,write-poms">
+        <resolvepom file="${build.dir}/${final.name}.pom" id="all-pom" />
+        <resolvepom file="${build.dir}/tmp-${final.name}-deps.pom" id="pom-deps" />
+
+        <resolve>
+            <dependencies pomRef="all-pom"/>
+            <files dir="${build.dir.lib}/jars" layout="{artifactId}-{version}-{classifier}.{extension}" scopes="compile,provided,!system"/>
+        </resolve>
+        <resolve>
+            <dependencies pomRef="pom-deps"/>
+            <files dir="${test.lib}/jars" layout="{artifactId}-{version}-{classifier}.{extension}" scopes="test,!provide,!system"/>
+        </resolve>
+
+
+        <!-- jacoco agent jar comes wrapped in a jar -->
+        <unzip src="${local.repository}/org/jacoco/org.jacoco.agent/${jacoco.version}/org.jacoco.agent-${jacoco.version}.jar" dest="${build.dir.lib}/jars">
+            <patternset>
+                <include name="*.jar"/>
+            </patternset>
+            <mapper type="flatten"/>
+        </unzip>
+    </target>
+
+    <target name="resolver-dist-lib" depends="resolver-retrieve-build,write-poms">
+        <resolvepom file="${build.dir}/${final.name}.pom" id="all-pom" />
+
+        <resolve failOnMissingAttachments="true">
+            <dependencies pomRef="all-pom"/>
+            <files dir="${build.lib}" layout="{artifactId}-{version}-{classifier}.{extension}" scopes="compile,!provide,!system"/>
+        </resolve>
+        <mkdir dir="${local.repository}/org/apache/cassandra/deps/sigar-bin"/>
+        <mkdir dir="${build.lib}/sigar-bin"/>
+
+        <!-- files.pythonhosted.org -->
+        <get src="${artifact.python.pypi}/59/a0/cf4cd997e1750f0c2d91c6ea5abea218251c43c3581bcc2f118b00baf5cf/futures-2.1.6-py2.py3-none-any.whl" dest="${local.repository}/org/apache/cassandra/deps/futures-2.1.6-py2.py3-none-any.zip" usetimestamp="true" quiet="true" skipexisting="true"/>
+        <get src="${artifact.python.pypi}/73/fb/00a976f728d0d1fecfe898238ce23f502a721c0ac0ecfedb80e0d88c64e9/six-1.12.0-py2.py3-none-any.whl" dest="${local.repository}/org/apache/cassandra/deps/six-1.12.0-py2.py3-none-any.zip" usetimestamp="true" quiet="true" skipexisting="true"/>
+
+        <!-- apache/cassandra/lib -->
+        <get src="${lib.download.base.url}/lib/geomet-0.1.0.zip" dest="${local.repository}/org/apache/cassandra/deps/geomet-0.1.0.zip" usetimestamp="true" quiet="true" skipexisting="true"/>
+        <get dest="${local.repository}/org/apache/cassandra/deps/sigar-bin/" quiet="true" usetimestamp="true" skipexisting="true">
+            <url url="${lib.download.base.url}/lib/sigar-bin/libsigar-amd64-freebsd-6.so"/>
+            <url url="${lib.download.base.url}/lib/sigar-bin/libsigar-amd64-linux.so"/>
+            <url url="${lib.download.base.url}/lib/sigar-bin/libsigar-amd64-solaris.so"/>
+            <url url="${lib.download.base.url}/lib/sigar-bin/libsigar-ia64-hpux-11.sl"/>
+            <url url="${lib.download.base.url}/lib/sigar-bin/libsigar-ia64-linux.so"/>
+            <url url="${lib.download.base.url}/lib/sigar-bin/libsigar-pa-hpux-11.sl"/>
+            <url url="${lib.download.base.url}/lib/sigar-bin/libsigar-ppc-aix-5.so"/>
+            <url url="${lib.download.base.url}/lib/sigar-bin/libsigar-ppc-linux.so"/>
+            <url url="${lib.download.base.url}/lib/sigar-bin/libsigar-ppc64-aix-5.so"/>
+            <url url="${lib.download.base.url}/lib/sigar-bin/libsigar-ppc64-linux.so"/>
+            <url url="${lib.download.base.url}/lib/sigar-bin/libsigar-ppc64le-linux.so"/>
+            <url url="${lib.download.base.url}/lib/sigar-bin/libsigar-s390x-linux.so"/>
+            <url url="${lib.download.base.url}/lib/sigar-bin/libsigar-sparc-solaris.so"/>
+            <url url="${lib.download.base.url}/lib/sigar-bin/libsigar-sparc64-solaris.so"/>
+            <url url="${lib.download.base.url}/lib/sigar-bin/libsigar-universal-macosx.dylib"/>
+            <url url="${lib.download.base.url}/lib/sigar-bin/libsigar-universal64-macosx.dylib"/>
+            <url url="${lib.download.base.url}/lib/sigar-bin/libsigar-x86-freebsd-5.so"/>
+            <url url="${lib.download.base.url}/lib/sigar-bin/libsigar-x86-freebsd-6.so"/>
+            <url url="${lib.download.base.url}/lib/sigar-bin/libsigar-x86-linux.so"/>
+            <url url="${lib.download.base.url}/lib/sigar-bin/libsigar-x86-solaris.so"/>
+            <url url="${lib.download.base.url}/lib/sigar-bin/sigar-amd64-winnt.dll"/>
+            <url url="${lib.download.base.url}/lib/sigar-bin/sigar-x86-winnt.dll"/>
+            <url url="${lib.download.base.url}/lib/sigar-bin/sigar-x86-winnt.lib"/>
+        </get>
+
+        <copy todir="${build.lib}" quiet="true">
+            <file file="${local.repository}/org/apache/cassandra/deps/futures-2.1.6-py2.py3-none-any.zip"/>
+            <file file="${local.repository}/org/apache/cassandra/deps/six-1.12.0-py2.py3-none-any.zip"/>
+            <file file="${local.repository}/org/apache/cassandra/deps/geomet-0.1.0.zip"/>
+        </copy>
+        <copy todir="${build.lib}/sigar-bin/" quiet="true">
+            <file file="${local.repository}/org/apache/cassandra/deps/sigar-bin/libsigar-amd64-freebsd-6.so"/>
+            <file file="${local.repository}/org/apache/cassandra/deps/sigar-bin/libsigar-amd64-linux.so"/>
+            <file file="${local.repository}/org/apache/cassandra/deps/sigar-bin/libsigar-amd64-solaris.so"/>
+            <file file="${local.repository}/org/apache/cassandra/deps/sigar-bin/libsigar-ia64-hpux-11.sl"/>
+            <file file="${local.repository}/org/apache/cassandra/deps/sigar-bin/libsigar-ia64-linux.so"/>
+            <file file="${local.repository}/org/apache/cassandra/deps/sigar-bin/libsigar-pa-hpux-11.sl"/>
+            <file file="${local.repository}/org/apache/cassandra/deps/sigar-bin/libsigar-ppc-aix-5.so"/>
+            <file file="${local.repository}/org/apache/cassandra/deps/sigar-bin/libsigar-ppc-linux.so"/>
+            <file file="${local.repository}/org/apache/cassandra/deps/sigar-bin/libsigar-ppc64-aix-5.so"/>
+            <file file="${local.repository}/org/apache/cassandra/deps/sigar-bin/libsigar-ppc64-linux.so"/>
+            <file file="${local.repository}/org/apache/cassandra/deps/sigar-bin/libsigar-ppc64le-linux.so"/>
+            <file file="${local.repository}/org/apache/cassandra/deps/sigar-bin/libsigar-s390x-linux.so"/>
+            <file file="${local.repository}/org/apache/cassandra/deps/sigar-bin/libsigar-sparc-solaris.so"/>
+            <file file="${local.repository}/org/apache/cassandra/deps/sigar-bin/libsigar-sparc64-solaris.so"/>
+            <file file="${local.repository}/org/apache/cassandra/deps/sigar-bin/libsigar-universal-macosx.dylib"/>
+            <file file="${local.repository}/org/apache/cassandra/deps/sigar-bin/libsigar-universal64-macosx.dylib"/>
+            <file file="${local.repository}/org/apache/cassandra/deps/sigar-bin/libsigar-x86-freebsd-5.so"/>
+            <file file="${local.repository}/org/apache/cassandra/deps/sigar-bin/libsigar-x86-freebsd-6.so"/>
+            <file file="${local.repository}/org/apache/cassandra/deps/sigar-bin/libsigar-x86-linux.so"/>
+            <file file="${local.repository}/org/apache/cassandra/deps/sigar-bin/libsigar-x86-solaris.so"/>
+            <file file="${local.repository}/org/apache/cassandra/deps/sigar-bin/sigar-amd64-winnt.dll"/>
+            <file file="${local.repository}/org/apache/cassandra/deps/sigar-bin/sigar-x86-winnt.dll"/>
+            <file file="${local.repository}/org/apache/cassandra/deps/sigar-bin/sigar-x86-winnt.lib"/>
+        </copy>
+    </target>
+</project>
diff --git a/databases/cassandra4/files/maven/build.properties.default b/databases/cassandra4/files/maven/build.properties.default
new file mode 100644
index 000000000000..11da534e32c1
--- /dev/null
+++ b/databases/cassandra4/files/maven/build.properties.default
@@ -0,0 +1,4 @@
+# Maven2 Repository Locations (you can override these in "build.properties" to point to a local proxy, e.g. Nexus)
+artifact.remoteRepository.central:     https://repo1.maven.org/maven2
+artifact.remoteRepository.apache:      https://repo.maven.apache.org/maven2
+
diff --git a/databases/cassandra4/files/maven/build.xml b/databases/cassandra4/files/maven/build.xml
new file mode 100644
index 000000000000..e9093d367d3b
--- /dev/null
+++ b/databases/cassandra4/files/maven/build.xml
@@ -0,0 +1,2174 @@
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<project basedir="." default="jar" name="apache-cassandra"
+         xmlns:artifact="antlib:org.apache.maven.artifact.ant"
+         xmlns:if="ant:if"
+         xmlns:unless="ant:unless">
+
+    <fail message="You need to use Ant of version at least 1.10 to continue.">
+      <condition>
+        <not>
+          <antversion atleast="1.10"/>
+        </not>
+      </condition>
+    </fail>
+
+    <property environment="env"/>
+    <property file="build.properties" />
+    <property file="build.properties.default" />
+    <property name="debuglevel" value="source,lines,vars"/>
+
+    <!-- default version and SCM information -->
+    <property name="base.version" value="4.0.5"/>
+    <property name="scm.connection" value="scm:https://gitbox.apache.org/repos/asf/cassandra.git"/>
+    <property name="scm.developerConnection" value="scm:https://gitbox.apache.org/repos/asf/cassandra.git"/>
+    <property name="scm.url" value="https://gitbox.apache.org/repos/asf?p=cassandra.git;a=tree"/>
+
+    <!-- directory details -->
+    <property name="basedir" value="."/>
+    <property name="build.src" value="${basedir}/src"/>
+    <property name="build.src.java" value="${basedir}/src/java"/>
+    <property name="build.src.antlr" value="${basedir}/src/antlr"/>
+    <property name="build.src.resources" value="${basedir}/src/resources"/>
+    <property name="build.src.gen-java" value="${basedir}/src/gen-java"/>
+    <property name="build.lib" value="${basedir}/lib"/>
+    <property name="build.dir" value="${basedir}/build"/>
+    <property name="build.dir.lib" value="${basedir}/build/lib"/>
+    <property name="build.test.dir" value="${build.dir}/test"/>
+    <property name="build.classes" value="${build.dir}/classes"/>
+    <property name="build.classes.main" value="${build.classes}/main" />
+    <property name="javadoc.dir" value="${build.dir}/javadoc"/>
+    <property name="interface.dir" value="${basedir}/interface"/>
+    <property name="test.dir" value="${basedir}/test"/>
+    <property name="test.resources" value="${test.dir}/resources"/>
+    <property name="test.lib" value="${build.dir}/test/lib"/>
+    <property name="test.classes" value="${build.dir}/test/classes"/>
+    <property name="test.conf" value="${test.dir}/conf"/>
+    <property name="test.data" value="${test.dir}/data"/>
+    <property name="test.name" value="*Test"/>
+    <property name="test.classlistfile" value="testlist.txt"/>
+    <property name="test.classlistprefix" value="unit"/>
+    <property name="benchmark.name" value=""/>
+    <property name="test.methods" value=""/>
+    <property name="test.unit.src" value="${test.dir}/unit"/>
+    <property name="test.long.src" value="${test.dir}/long"/>
+    <property name="test.burn.src" value="${test.dir}/burn"/>
+    <property name="test.memory.src" value="${test.dir}/memory"/>
+    <property name="test.microbench.src" value="${test.dir}/microbench"/>
+    <property name="test.distributed.src" value="${test.dir}/distributed"/>
+    <property name="test.compression.algo" value="LZ4"/>
+    <property name="test.driver.connection_timeout_ms" value="5000"/>
+    <property name="test.driver.read_timeout_ms" value="12000"/>
+    <property name="dist.dir" value="${build.dir}/dist"/>
+    <property name="tmp.dir" value="${java.io.tmpdir}"/>
+
+    <property name="doc.dir" value="${basedir}/doc"/>
+
+    <condition property="version" value="${base.version}">
+      <isset property="release"/>
+    </condition>
+    <property name="version" value="${base.version}-SNAPSHOT"/>
+    <property name="version.properties.dir"
+              value="${build.src.resources}/org/apache/cassandra/config/" />
+    <property name="final.name" value="${ant.project.name}-${version}"/>
+
+    <property name="local.repository" value="${user.home}/.m2/repository" />
+
+    <!-- details of what version of Maven ANT Tasks to fetch -->
+    <property name="maven-ant-tasks.version" value="2.1.3" />
+    <property name="maven-ant-tasks.local" value="${local.repository}/org/apache/maven/maven-ant-tasks"/>
+    <property name="maven-ant-tasks.url"
+              value="https://repo.maven.apache.org/maven2/org/apache/maven/maven-ant-tasks" />
+    <!-- details of how and which Maven repository we publish to -->
+    <property name="maven.version" value="3.0.3" />
+    <condition property="maven-repository-url" value="https://repository.apache.org/service/local/staging/deploy/maven2">
+      <isset property="release"/>
+    </condition>
+    <condition property="maven-repository-id" value="apache.releases.https">
+      <isset property="release"/>
+    </condition>
+    <property name="maven-repository-url" value="https://repository.apache.org/content/repositories/snapshots"/>
+    <property name="maven-repository-id" value="apache.snapshots.https"/>
+
+    <property name="test.timeout" value="240000" />
+    <property name="test.memory.timeout" value="480000" />
+    <property name="test.long.timeout" value="600000" />
+    <property name="test.burn.timeout" value="60000000" />
+    <property name="test.distributed.timeout" value="900000" />
+
+    <!-- default for cql tests. Can be override by -Dcassandra.test.use_prepared=false -->
+    <property name="cassandra.test.use_prepared" value="true" />
+
+    <!-- skip flushing schema tables during tests -->
+    <property name="cassandra.test.flush_local_schema_changes" value="false" />
+
+    <!-- https://www.eclemma.org/jacoco/ -->
+    <property name="jacoco.export.dir" value="${build.dir}/jacoco/" />
+    <property name="jacoco.partials.dir" value="${jacoco.export.dir}/partials" />
+    <property name="jacoco.partialexecfile" value="${jacoco.partials.dir}/partial.exec" />
+    <property name="jacoco.finalexecfile" value="${jacoco.export.dir}/jacoco.exec" />
+    <property name="jacoco.version" value="0.8.6"/>
+
+    <property name="byteman.version" value="4.0.6"/>
+    <property name="jamm.version" value="0.3.2"/>
+    <property name="ecj.version" value="4.6.1"/>
+    <property name="ohc.version" value="0.5.1"/>
+    <property name="asm.version" value="7.1"/>
+    <property name="allocation-instrumenter.version" value="3.1.0"/>
+    <property name="bytebuddy.version" value="1.10.10"/>
+    <property name="jflex.version" value="1.8.2"/>
+
+    <!-- https://mvnrepository.com/artifact/net.openhft/chronicle-bom/1.16.23 -->
+    <property name="chronicle-queue.version" value="5.20.123" />
+    <property name="chronicle-core.version" value="2.20.126" />
+    <property name="chronicle-bytes.version" value="2.20.111" />
+    <property name="chronicle-wire.version" value="2.20.117" />
+    <property name="chronicle-threads.version" value="2.20.111" />
+
+    <condition property="maven-ant-tasks.jar.exists">
+      <available file="${build.dir}/maven-ant-tasks-${maven-ant-tasks.version}.jar" />
+    </condition>
+
+    <condition property="maven-ant-tasks.jar.local">
+      <available file="${maven-ant-tasks.local}/${maven-ant-tasks.version}/maven-ant-tasks-${maven-ant-tasks.version}.jar" />
+    </condition>
+
+    <condition property="is.source.artifact">
+      <available file="${build.src.java}" type="dir" />
+    </condition>
+
+    <!-- Check if all tests are being run or just one. If it's all tests don't spam the console with test output.
+         If it's an individual test print the output from the test under the assumption someone is debugging the test
+         and wants to know what is going on without having to context switch to the log file that is generated.
+         Debug level output still needs to be retrieved from the log file.  -->
+    <script language="javascript">
+        if (project.getProperty("cassandra.keepBriefBrief") == null)
+        {
+            if (project.getProperty("test.name").equals("*Test"))
+                project.setProperty("cassandra.keepBriefBrief", "true");
+            else
+                project.setProperty("cassandra.keepBriefBrief", "false");
+        }
+    </script>
+
+    <condition property="java.version.8">
+        <equals arg1="${ant.java.version}" arg2="1.8"/>
+    </condition>
+    <condition property="java.version.11">
+        <not><isset property="java.version.8"/></not>
+    </condition>
+    <fail><condition><not><or>
+        <isset property="java.version.8"/>
+        <isset property="java.version.11"/>
+    </or></not></condition></fail>
+
+    <resources id="_jvm11_arg_items">
+        <string>-Djdk.attach.allowAttachSelf=true</string>
+
+        <string>-XX:+UseConcMarkSweepGC</string>
+        <string>-XX:+CMSParallelRemarkEnabled</string>
+        <string>-XX:SurvivorRatio=8</string>
+        <string>-XX:MaxTenuringThreshold=1</string>
+        <string>-XX:CMSInitiatingOccupancyFraction=75</string>
+        <string>-XX:+UseCMSInitiatingOccupancyOnly</string>
+        <string>-XX:CMSWaitDuration=10000</string>
+        <string>-XX:+CMSParallelInitialMarkEnabled</string>
+        <string>-XX:+CMSEdenChunksRecordAlways</string>
+
+        <string>--add-exports java.base/jdk.internal.misc=ALL-UNNAMED</string>
+        <string>--add-exports java.base/jdk.internal.ref=ALL-UNNAMED</string>
+        <string>--add-exports java.base/sun.nio.ch=ALL-UNNAMED</string>
+        <string>--add-exports java.management.rmi/com.sun.jmx.remote.internal.rmi=ALL-UNNAMED</string>
+        <string>--add-exports java.rmi/sun.rmi.registry=ALL-UNNAMED</string>
+        <string>--add-exports java.rmi/sun.rmi.server=ALL-UNNAMED</string>
+        <string>--add-exports java.sql/java.sql=ALL-UNNAMED</string>
+
+        <string>--add-opens java.base/java.lang.module=ALL-UNNAMED</string>
+        <string>--add-opens java.base/java.net=ALL-UNNAMED</string>
+        <string>--add-opens java.base/jdk.internal.loader=ALL-UNNAMED</string>
+        <string>--add-opens java.base/jdk.internal.ref=ALL-UNNAMED</string>
+        <string>--add-opens java.base/jdk.internal.reflect=ALL-UNNAMED</string>
+        <string>--add-opens java.base/jdk.internal.math=ALL-UNNAMED</string>
+        <string>--add-opens java.base/jdk.internal.module=ALL-UNNAMED</string>
+        <string>--add-opens java.base/jdk.internal.util.jar=ALL-UNNAMED</string>
+        <string>--add-opens jdk.management/com.sun.management.internal=ALL-UNNAMED</string>
+    </resources>
+    <pathconvert property="_jvm_args_concat" refid="_jvm11_arg_items" pathsep=" "/>
+    <condition property="java11-jvmargs" value="${_jvm_args_concat}" else="">
+        <not>
+            <equals arg1="${ant.java.version}" arg2="1.8"/>
+        </not>
+    </condition>
+
+    <!--
+      JVM arguments for tests.
+
+      There is a race condition bug in java 11 (see CASSANDRA-15981) which causes a crash of the
+      JVM; this race is between CMS and class unloading.  In java 8 we can cap the metaspace to
+      make tests stable on low resource environments, but in java 11 we need to make it unlimited
+      (don't define MaxMetaspaceSize) and disable class unloading in CMS outside of a
+      stop-the-world pause.
+
+      In java 11 we also need to set a system property to enable netty to use Unsafe direct byte
+      buffer construction (see CASSANDRA-16493)
+    -->
+    <resources id="_jvm8_test_arg_items">
+      <!-- TODO see CASSANDRA-16212 - we seem to OOM non stop now after CASSANDRA-16212, so to have clean CI while this gets looked into, disabling limiting metaspace
+        <string>-XX:MaxMetaspaceExpansion=64M</string>
+        <string>-XX:MaxMetaspaceSize=512M</string>
+        <string>-XX:MetaspaceSize=128M</string>
+      -->
+    </resources>
+    <pathconvert property="_jvm8_test_arg_items_concat" refid="_jvm8_test_arg_items" pathsep=" "/>
+    <resources id="_jvm11_test_arg_items">
+        <string>-XX:-CMSClassUnloadingEnabled</string>
+        <string>-Dio.netty.tryReflectionSetAccessible=true</string>
+    </resources>
+    <pathconvert property="_jvm11_test_arg_items_concat" refid="_jvm11_test_arg_items" pathsep=" "/>
+    <condition property="test-jvmargs" value="${_jvm11_test_arg_items_concat}" else="${_jvm8_test_arg_items_concat}">
+        <not>
+            <equals arg1="${ant.java.version}" arg2="1.8"/>
+        </not>
+    </condition>
+
+    <!-- needed to compile org.apache.cassandra.utils.JMXServerUtils -->
+    <condition property="jdk11-javac-exports" value="--add-exports java.rmi/sun.rmi.registry=ALL-UNNAMED" else="">
+        <not>
+            <equals arg1="${ant.java.version}" arg2="1.8"/>
+        </not>
+    </condition>
+    <condition property="jdk11-javadoc-exports" value="${jdk11-javac-exports} --frames" else="">
+        <not>
+            <equals arg1="${ant.java.version}" arg2="1.8"/>
+        </not>
+    </condition>
+
+    <condition property="build.java.11">
+        <istrue value="${use.jdk11}"/>
+    </condition>
+
+    <condition property="source.version" value="8" else="11">
+        <equals arg1="${java.version.8}" arg2="true"/>
+    </condition>
+    <condition property="target.version" value="8" else="11">
+        <equals arg1="${java.version.8}" arg2="true"/>
+    </condition>
+
+    <!--
+         Add all the dependencies.
+    -->
+    <path id="maven-ant-tasks.classpath" path="${build.dir}/maven-ant-tasks-${maven-ant-tasks.version}.jar" />
+    <path id="cassandra.classpath">
+        <pathelement location="${build.classes.main}" />
+        <fileset dir="${build.dir.lib}">
+            <include name="**/*.jar" />
+        </fileset>
+    </path>
+    <path id="cassandra.classpath.test">
+        <file file="${build.dir}/${final.name}.jar"/> <!-- we need the jar for tests and benchmarks (multi-version jar) -->
+        <fileset dir="${build.dir.lib}">
+            <include name="**/*.jar" />
+        </fileset>
+        <fileset dir="${test.lib}/jars">
+            <include name="**/*.jar" />
+            <exclude name="**/ant-*.jar"/>
+        </fileset>
+    </path>
+
+  <macrodef name="create-javadoc">
+    <attribute name="destdir"/>
+    <element name="filesets"/>
+    <sequential>
+      <javadoc destdir="@{destdir}" author="true" version="true" use="true"
+        windowtitle="${ant.project.name} API" classpathref="cassandra.classpath"
+        bottom="Copyright &amp;copy; 2009-2022 The Apache Software Foundation"
+        useexternalfile="yes" encoding="UTF-8" failonerror="false"
+        maxmemory="256m" additionalparam="${jdk11-javadoc-exports}">
+        <filesets/>
+      </javadoc>
+      <fail message="javadoc failed">
+        <condition>
+            <not>
+                <available file="@{destdir}/index-all.html" />
+            </not>
+        </condition>
+      </fail>
+    </sequential>
+  </macrodef>
+
+    <target name="validate-build-conf">
+        <condition property="use-jdk11">
+            <or>
+                <isset property="build.java.11"/>
+                <istrue value="${env.CASSANDRA_USE_JDK11}"/>
+            </or>
+        </condition>
+        <fail message="Inconsistent JDK11 options set">
+            <condition>
+                    <and>
+                        <istrue value="${env.CASSANDRA_USE_JDK11}"/>
+                        <isset property="use.jdk11"/>
+                        <not>
+                            <istrue value="${use.jdk11}"/>
+                        </not>
+                    </and>
+            </condition>
+                </fail>
+        <fail message="Inconsistent JDK11 options set">
+            <condition>
+                    <and>
+                        <isset property="env.CASSANDRA_USE_JDK11"/>
+                        <not>
+                            <istrue value="${env.CASSANDRA_USE_JDK11}"/>
+                        </not>
+                        <istrue value="${use.jdk11}"/>
+                    </and>
+            </condition>
+        </fail>
+        <fail message="-Duse.jdk11=true or $CASSANDRA_USE_JDK11=true cannot be set when building from java 8">
+            <condition>
+                <not><or>
+                    <not><isset property="java.version.8"/></not>
+                    <not><isset property="use-jdk11"/></not>
+                </or></not>
+            </condition>
+        </fail>
+        <fail message="-Duse.jdk11=true or $CASSANDRA_USE_JDK11=true must be set when building from java 11">
+            <condition>
+                <not><or>
+                    <isset property="java.version.8"/>
+                    <isset property="use-jdk11"/>
+                </or></not>
+            </condition>
+        </fail>
+    </target>
+
+    <!--
+        Setup the output directories.
+    -->
+    <target name="init" depends="validate-build-conf">
+        <fail unless="is.source.artifact"
+            message="Not a source artifact, stopping here." />
+        <mkdir dir="${build.classes.main}"/>
+        <mkdir dir="${test.lib}"/>
+        <mkdir dir="${test.classes}"/>
+        <mkdir dir="${stress.test.classes}"/>
+        <mkdir dir="${fqltool.test.classes}"/>
+        <mkdir dir="${build.src.gen-java}"/>
+        <mkdir dir="${build.dir.lib}"/>
+        <mkdir dir="${jacoco.export.dir}"/>
+        <mkdir dir="${jacoco.partials.dir}"/>
+    </target>
+
+    <target name="clean" description="Remove all locally created artifacts">
+        <delete dir="${build.test.dir}" />
+        <delete dir="${build.classes}" />
+        <delete dir="${build.src.gen-java}" />
+        <delete dir="${version.properties.dir}" />
+        <delete dir="${jacoco.export.dir}" />
+        <delete dir="${jacoco.partials.dir}"/>
+    </target>
+    <target depends="clean" name="cleanall"/>
+
+    <target name="realclean" depends="clean" description="Remove the entire build directory and all downloaded artifacts">
+        <delete>
+          <fileset dir="${build.lib}" excludes="cassandra-driver-internal-only-*"/>
+        </delete>
+        <delete dir="${build.dir}" />
+        <delete dir="${doc.dir}/build" />
+        <delete dir="${doc.dir}/source/tools/nodetool" />
+    </target>
+
+    <!--
+       This generates the CQL grammar files from Cql.g
+    -->
+    <target name="check-gen-cql3-grammar">
+        <uptodate property="cql3current"
+                targetfile="${build.src.gen-java}/org/apache/cassandra/cql3/Cql.tokens">
+            <srcfiles dir="${build.src.antlr}">
+                <include name="*.g"/>
+            </srcfiles>
+        </uptodate>
+    </target>
+
+    <target name="gen-cql3-grammar" depends="check-gen-cql3-grammar" unless="cql3current">
+      <echo>Building Grammar ${build.src.antlr}/Cql.g  ...</echo>
+      <java classname="org.antlr.Tool"
+            classpathref="cql3-grammar.classpath"
+            failonerror="true">
+         <arg value="-Xconversiontimeout" />
+         <arg value="10000" />
+         <arg value="${build.src.antlr}/Cql.g" />
+         <arg value="-fo" />
+         <arg value="${build.src.gen-java}/org/apache/cassandra/cql3/" />
+         <arg value="-Xmaxinlinedfastates"/>
+         <arg value="10"/> <!-- default is 60 -->
+      </java>
+    </target>
+
+    <target name="generate-cql-html" depends="resolver-init" description="Generate HTML from textile source">
+        <taskdef classpathref="wikitext.classpath" resource="wikitexttasks.properties" />
+        <wikitext-to-html markupLanguage="Textile">
+            <fileset dir="${basedir}">
+                <include name="doc/cql3/*.textile"/>
+            </fileset>
+        </wikitext-to-html>
+    </target>
+
+    <target name="gen-asciidoc" description="Generate dynamic asciidoc pages" depends="jar" unless="ant.gen-doc.skip">
+        <exec executable="make" osfamily="unix" dir="${doc.dir}">
+            <arg value="gen-asciidoc"/>
+        </exec>
+    </target>
+
+    <target name="gen-doc" description="Generate documentation" depends="gen-asciidoc,generate-cql-html" unless="ant.gen-doc.skip">
+        <exec executable="make" osfamily="unix" dir="${doc.dir}">
+            <arg value="html"/>
+        </exec>
+    </target>
+
+    <!--
+        Generates Java sources for tokenization support from jflex
+        grammar files
+    -->
+    <target name="generate-jflex-java" description="Generate Java from jflex grammar">
+        <taskdef classname="jflex.anttask.JFlexTask" classpathref="jflex.classpath" name="jflex" />
+        <jflex file="${build.src.java}/org/apache/cassandra/index/sasi/analyzer/StandardTokenizerImpl.jflex" destdir="${build.src.gen-java}/" />
+    </target>
+
+    <!--
+       Fetch Maven Ant Tasks and Cassandra's dependencies
+       These targets are intentionally free of dependencies so that they
+       can be run stand-alone from a binary release artifact.
+    -->
+    <target name="maven-ant-tasks-localrepo" unless="maven-ant-tasks.jar.exists" if="maven-ant-tasks.jar.local"
+            depends="init" description="Fetch Maven ANT Tasks from Maven Local Repository">
+      <copy file="${maven-ant-tasks.local}/${maven-ant-tasks.version}/maven-ant-tasks-${maven-ant-tasks.version}.jar"
+           tofile="${build.dir}/maven-ant-tasks-${maven-ant-tasks.version}.jar"/>
+      <property name="maven-ant-tasks.jar.exists" value="true"/>
+    </target>
+
+    <target name="maven-ant-tasks-download" depends="init,maven-ant-tasks-localrepo" unless="maven-ant-tasks.jar.exists"
+            description="Fetch Maven ANT Tasks from Maven Central Repositroy">
+      <echo>Downloading Maven ANT Tasks...</echo>
+      <get src="${maven-ant-tasks.url}/${maven-ant-tasks.version}/maven-ant-tasks-${maven-ant-tasks.version}.jar"
+           dest="${build.dir}/maven-ant-tasks-${maven-ant-tasks.version}.jar" usetimestamp="true" />
+      <copy file="${build.dir}/maven-ant-tasks-${maven-ant-tasks.version}.jar"
+            tofile="${maven-ant-tasks.local}/${maven-ant-tasks.version}/maven-ant-tasks-${maven-ant-tasks.version}.jar"/>
+    </target>
+
+    <target name="maven-ant-tasks-init" depends="maven-ant-tasks-download,resolver-init" unless="maven-ant-tasks.initialized"
+            description="Initialize Maven ANT Tasks">
+      <typedef uri="antlib:org.apache.maven.artifact.ant" classpathref="maven-ant-tasks.classpath" />
+      <property name="maven-ant-tasks.initialized" value="true"/>
+    </target>
+
+    <!-- this task defines the dependencies that will be fetched by Maven ANT Tasks
+         the dependencies are re-used for publishing artifacts to Maven Central
+         in order to keep everything consistent -->
+    <target name="maven-declare-dependencies" depends="maven-ant-tasks-init"
+            description="Define dependencies and dependency versions">
+      <!-- The parent pom defines the versions of all dependencies -->
+      <artifact:pom id="parent-pom"
+                    groupId="org.apache.cassandra"
+                    artifactId="cassandra-parent"
+                    packaging="pom"
+                    version="${version}"
+                    url="https://cassandra.apache.org"
+                    name="Apache Cassandra"
+                    inceptionYear="2009"
+                    description="The Apache Cassandra Project develops a highly scalable second-generation distributed database, bringing together Dynamo's fully distributed design and Bigtable's ColumnFamily-based data model.">
+
+        <!-- Inherit from the ASF template pom file, ref http://maven.apache.org/pom/asf/ -->
+        <parent groupId="org.apache" artifactId="apache" version="22"/>
+        <license name="The Apache Software License, Version 2.0" url="https://www.apache.org/licenses/LICENSE-2.0.txt"/>
+        <scm connection="${scm.connection}" developerConnection="${scm.developerConnection}" url="${scm.url}"/>
+        <dependencyManagement>
+          <dependency groupId="org.xerial.snappy" artifactId="snappy-java" version="1.1.2.6"/>
+          <dependency groupId="org.lz4" artifactId="lz4-java" version="1.8.0"/>
+          <dependency groupId="com.ning" artifactId="compress-lzf" version="0.8.4" scope="provided"/>
+          <dependency groupId="com.github.luben" artifactId="zstd-jni" version="1.5.0-4"/>
+          <dependency groupId="com.google.guava" artifactId="guava" version="27.0-jre">
+            <exclusion groupId="com.google.code.findbugs" artifactId="jsr305" />
+            <exclusion groupId="org.codehaus.mojo" artifactId="animal-sniffer-annotations" />
+            <exclusion groupId="com.google.guava" artifactId="listenablefuture" />
+            <exclusion groupId="com.google.guava" artifactId="failureaccess" />
+            <exclusion groupId="org.checkerframework" artifactId="checker-qual" />
+            <exclusion groupId="com.google.errorprone" artifactId="error_prone_annotations" />
+          </dependency>
+          <dependency groupId="org.hdrhistogram" artifactId="HdrHistogram" version="2.1.9"/>
+          <dependency groupId="commons-cli" artifactId="commons-cli" version="1.1"/>
+          <dependency groupId="commons-codec" artifactId="commons-codec" version="1.9"/>
+          <dependency groupId="commons-io" artifactId="commons-io" version="2.6" scope="test"/>
+          <dependency groupId="org.apache.commons" artifactId="commons-lang3" version="3.11"/>
+          <dependency groupId="org.apache.commons" artifactId="commons-math3" version="3.2"/>
+          <dependency groupId="org.antlr" artifactId="antlr" version="3.5.2" scope="provided">
+            <exclusion groupId="org.antlr" artifactId="stringtemplate"/>
+          </dependency>
+          <dependency groupId="org.antlr" artifactId="ST4" version="4.0.8"/>
+          <dependency groupId="org.antlr" artifactId="antlr-runtime" version="3.5.2">
+            <exclusion groupId="org.antlr" artifactId="stringtemplate"/>
+          </dependency>
+          <dependency groupId="org.slf4j" artifactId="slf4j-api" version="1.7.25"/>
+          <dependency groupId="org.slf4j" artifactId="log4j-over-slf4j" version="1.7.25"/>
+          <dependency groupId="org.slf4j" artifactId="jcl-over-slf4j" version="1.7.25" />
+          <dependency groupId="ch.qos.logback" artifactId="logback-core" version="1.2.9"/>
+          <dependency groupId="ch.qos.logback" artifactId="logback-classic" version="1.2.9"/>
+          <dependency groupId="com.fasterxml.jackson.core" artifactId="jackson-core" version="2.13.2"/>
+          <dependency groupId="com.fasterxml.jackson.core" artifactId="jackson-databind" version="2.13.2.2"/>
+          <dependency groupId="com.fasterxml.jackson.core" artifactId="jackson-annotations" version="2.13.2"/>
+          <dependency groupId="com.googlecode.json-simple" artifactId="json-simple" version="1.1"/>
+          <dependency groupId="com.boundary" artifactId="high-scale-lib" version="1.0.6"/>
+          <dependency groupId="com.github.jbellis" artifactId="jamm" version="${jamm.version}"/>
+          <dependency groupId="org.yaml" artifactId="snakeyaml" version="1.26"/>
+          <dependency groupId="junit" artifactId="junit" version="4.12" scope="test">
+            <exclusion groupId="org.hamcrest" artifactId="hamcrest-core"/>
+          </dependency>
+          <dependency groupId="org.mockito" artifactId="mockito-core" version="3.2.4" scope="test"/>
+          <dependency groupId="org.quicktheories" artifactId="quicktheories" version="0.26" scope="test"/>
+          <dependency groupId="com.google.code.java-allocation-instrumenter" artifactId="java-allocation-instrumenter" version="${allocation-instrumenter.version}" scope="test">
+            <exclusion groupId="com.google.guava" artifactId="guava"/>
+          </dependency>
+          <dependency groupId="org.apache.cassandra" artifactId="dtest-api" version="0.0.13" scope="test"/>
+          <dependency groupId="org.reflections" artifactId="reflections" version="0.10.2" scope="test"/>
+          <dependency groupId="org.apache.hadoop" artifactId="hadoop-core" version="1.0.3" scope="provided">
+            <exclusion groupId="org.mortbay.jetty" artifactId="servlet-api"/>
+            <exclusion groupId="commons-logging" artifactId="commons-logging"/>
+            <exclusion groupId="org.eclipse.jdt" artifactId="core"/>
+            <exclusion groupId="ant" artifactId="ant"/>
+            <exclusion groupId="junit" artifactId="junit"/>
+            <exclusion groupId="org.codehaus.jackson" artifactId="jackson-mapper-asl"/>
+            <exclusion groupId="org.slf4j" artifactId="slf4j-api"/>
+          </dependency>
+          <dependency groupId="org.apache.hadoop" artifactId="hadoop-minicluster" version="1.0.3" scope="provided">
+            <exclusion groupId="asm" artifactId="asm"/> <!-- this is the outdated version 3.1 -->
+            <exclusion groupId="org.slf4j" artifactId="slf4j-api"/>
+            <exclusion groupId="org.codehaus.jackson" artifactId="jackson-mapper-asl"/>
+          </dependency>
+          <dependency groupId="net.java.dev.jna" artifactId="jna" version="5.6.0"/>
+
+          <dependency groupId="org.jacoco" artifactId="org.jacoco.agent" version="${jacoco.version}" scope="test"/>
+          <dependency groupId="org.jacoco" artifactId="org.jacoco.ant" version="${jacoco.version}" scope="test"/>
+
+          <dependency groupId="org.jboss.byteman" artifactId="byteman-install" version="${byteman.version}" scope="provided"/>
+          <dependency groupId="org.jboss.byteman" artifactId="byteman" version="${byteman.version}" scope="provided"/>
+          <dependency groupId="org.jboss.byteman" artifactId="byteman-submit" version="${byteman.version}" scope="provided"/>
+          <dependency groupId="org.jboss.byteman" artifactId="byteman-bmunit" version="${byteman.version}" scope="provided"/>
+
+          <dependency groupId="net.bytebuddy" artifactId="byte-buddy" version="${bytebuddy.version}" />
+          <dependency groupId="net.bytebuddy" artifactId="byte-buddy-agent" version="${bytebuddy.version}" />
+
+          <dependency groupId="org.openjdk.jmh" artifactId="jmh-core" version="1.21" scope="test"/>
+          <dependency groupId="org.openjdk.jmh" artifactId="jmh-generator-annprocess" version="1.21" scope="test"/>
+
+          <dependency groupId="org.apache.ant" artifactId="ant-junit" version="1.10.12" scope="test"/>
+
+          <dependency groupId="org.apache.cassandra" artifactId="cassandra-all" version="${version}" />
+          <dependency groupId="io.dropwizard.metrics" artifactId="metrics-core" version="3.1.5" />
+          <dependency groupId="io.dropwizard.metrics" artifactId="metrics-jvm" version="3.1.5" />
+          <dependency groupId="io.dropwizard.metrics" artifactId="metrics-logback" version="3.1.5" />
+          <dependency groupId="com.addthis.metrics" artifactId="reporter-config3" version="3.0.3">
+            <exclusion groupId="org.hibernate" artifactId="hibernate-validator" />
+           </dependency>
+          <dependency groupId="org.mindrot" artifactId="jbcrypt" version="0.4" />
+          <dependency groupId="io.airlift" artifactId="airline" version="0.8">
+            <exclusion groupId="com.google.code.findbugs" artifactId="jsr305" />
+           </dependency>
+          <dependency groupId="io.netty" artifactId="netty-bom" version="4.1.58.Final" type="pom" scope="provided"/>
+          <dependency groupId="io.netty" artifactId="netty-all" version="4.1.58.Final" />
+          <dependency groupId="io.netty" artifactId="netty-tcnative-boringssl-static" version="2.0.36.Final"/>
+          <dependency groupId="net.openhft" artifactId="chronicle-queue" version="${chronicle-queue.version}">
+            <exclusion groupId="com.sun" artifactId="tools" />
+          </dependency>
+          <dependency groupId="net.openhft" artifactId="chronicle-core" version="${chronicle-core.version}">
+            <exclusion groupId="net.openhft" artifactId="chronicle-analytics" />
+            <exclusion groupId="org.jetbrains" artifactId="annotations" />
+          </dependency>
+          <dependency groupId="net.openhft" artifactId="chronicle-bytes" version="${chronicle-bytes.version}">
+            <exclusion groupId="org.jetbrains" artifactId="annotations" />
+          </dependency>
+          <dependency groupId="net.openhft" artifactId="chronicle-wire" version="${chronicle-wire.version}">
+            <exclusion groupId="net.openhft" artifactId="compiler" />
+          </dependency>
+          <dependency groupId="net.openhft" artifactId="chronicle-threads" version="${chronicle-threads.version}">
+            <exclusion groupId="net.openhft" artifactId="affinity" />
+            <!-- Exclude JNA here, as we want to avoid breaking consumers of the cassandra-all jar -->
+            <exclusion groupId="net.java.dev.jna" artifactId="jna" />
+            <exclusion groupId="net.java.dev.jna" artifactId="jna-platform" />
+          </dependency>
+          <dependency groupId="com.google.code.findbugs" artifactId="jsr305" version="2.0.2" scope="provided"/>
+          <dependency groupId="com.clearspring.analytics" artifactId="stream" version="2.5.2">
+            <exclusion groupId="it.unimi.dsi" artifactId="fastutil" />
+          </dependency>
+          <dependency groupId="com.datastax.cassandra" artifactId="cassandra-driver-core" version="3.11.0" classifier="shaded">
+            <exclusion groupId="io.netty" artifactId="netty-buffer"/>
+            <exclusion groupId="io.netty" artifactId="netty-codec"/>
+            <exclusion groupId="io.netty" artifactId="netty-handler"/>
+            <exclusion groupId="io.netty" artifactId="netty-transport"/>
+            <exclusion groupId="org.slf4j" artifactId="slf4j-api"/>
+            <exclusion groupId="com.github.jnr" artifactId="jnr-ffi"/>
+            <exclusion groupId="com.github.jnr" artifactId="jnr-posix"/>
+          </dependency>
+          <dependency groupId="org.eclipse.jdt.core.compiler" artifactId="ecj" version="${ecj.version}" />
+          <dependency groupId="org.caffinitas.ohc" artifactId="ohc-core" version="${ohc.version}">
+            <exclusion groupId="org.slf4j" artifactId="slf4j-api"/>
+          </dependency>
+          <dependency groupId="org.caffinitas.ohc" artifactId="ohc-core-j8" version="${ohc.version}" />
+          <dependency groupId="net.ju-n.compile-command-annotations" artifactId="compile-command-annotations" version="1.2.0" scope="provided"/>
+          <dependency groupId="org.fusesource" artifactId="sigar" version="1.6.4">
+            <exclusion groupId="log4j" artifactId="log4j"/>
+          </dependency>
+          <dependency groupId="com.carrotsearch" artifactId="hppc" version="0.8.1" />
+          <dependency groupId="de.jflex" artifactId="jflex" version="${jflex.version}">
+            <exclusion groupId="org.apache.ant" artifactId="ant"/>
+          </dependency>
+          <dependency groupId="com.github.rholder" artifactId="snowball-stemmer" version="1.3.0.581.1" />
+          <dependency groupId="com.googlecode.concurrent-trees" artifactId="concurrent-trees" version="2.4.0" />
+          <dependency groupId="com.github.ben-manes.caffeine" artifactId="caffeine" version="2.5.6" />
+          <dependency groupId="org.jctools" artifactId="jctools-core" version="3.1.0"/>
+          <dependency groupId="org.ow2.asm" artifactId="asm" version="${asm.version}"/>
+          <dependency groupId="org.ow2.asm" artifactId="asm-tree" version="${asm.version}" scope="test"/>
+          <dependency groupId="org.ow2.asm" artifactId="asm-commons" version="${asm.version}" scope="test"/>
+          <dependency groupId="org.gridkit.jvmtool" artifactId="sjk-cli" version="0.14"/>
+          <dependency groupId="org.gridkit.jvmtool" artifactId="sjk-core" version="0.14">
+            <exclusion groupId="org.gridkit.jvmtool" artifactId="sjk-hflame"/>
+            <exclusion groupId="org.perfkit.sjk.parsers" artifactId="sjk-hflame"/>
+            <exclusion groupId="org.perfkit.sjk.parsers" artifactId="sjk-jfr-standalone"/>
+            <exclusion groupId="org.perfkit.sjk.parsers" artifactId="sjk-nps"/>
+            <exclusion groupId="org.perfkit.sjk.parsers" artifactId="sjk-jfr5"/>
+            <exclusion groupId="org.perfkit.sjk.parsers" artifactId="sjk-jfr6"/>
+          </dependency>
+          <dependency groupId="org.gridkit.jvmtool" artifactId="sjk-stacktrace" version="0.14"/>
+          <dependency groupId="org.gridkit.jvmtool" artifactId="mxdump" version="0.14"/>
+          <dependency groupId="org.gridkit.lab" artifactId="jvm-attach-api" version="1.5"/>
+          <dependency groupId="org.gridkit.jvmtool" artifactId="sjk-json" version="0.14"/>
+          <dependency groupId="com.beust" artifactId="jcommander" version="1.30"/>
+          <dependency groupId="org.psjava" artifactId="psjava" version="0.1.19"/>
+          <dependency groupId="javax.inject" artifactId="javax.inject" version="1"/>
+          <dependency groupId="com.google.j2objc" artifactId="j2objc-annotations" version="1.3"/>
+          <!-- adding this dependency is necessary for assertj. When updating assertj, need to also update the version of
+             this that the new assertj's `assertj-parent-pom` depends on. -->
+          <dependency groupId="org.junit" artifactId="junit-bom" version="5.6.0" type="pom" scope="test"/>
+          <!-- when updating assertj, make sure to also update the corresponding junit-bom dependency -->
+          <dependency groupId="org.assertj" artifactId="assertj-core" version="3.15.0" scope="provided"/>
+          <dependency groupId="org.awaitility" artifactId="awaitility" version="4.0.3"  scope="test">
+            <exclusion groupId="org.hamcrest" artifactId="hamcrest"/>
+          </dependency>
+          <dependency groupId="org.hamcrest" artifactId="hamcrest" version="2.2" scope="test"/>
+        </dependencyManagement>
+        <developer id="adelapena" name="Andres de la Peña"/>
+        <developer id="alakshman" name="Avinash Lakshman"/>
+        <developer id="aleksey" name="Aleksey Yeschenko"/>
+        <developer id="amorton" name="Aaron Morton"/>
+        <developer id="aweisberg" name="Ariel Weisberg"/>
+        <developer id="bdeggleston" name="Blake Eggleston"/>
+        <developer id="benedict" name="Benedict Elliott Smith"/>
+        <developer id="benjamin" name="Benjamin Lerer"/>
+        <developer id="blambov" name="Branimir Lambov"/>
+        <developer id="brandonwilliams" name="Brandon Williams"/>
+        <developer id="carl" name="Carl Yeksigian"/>
+        <developer id="dbrosius" name="David Brosiusd"/>
+        <developer id="dikang" name="Dikang Gu"/>
+        <developer id="eevans" name="Eric Evans"/>
+        <developer id="edimitrova" name="Ekaterina Dimitrova"/>
+        <developer id="gdusbabek" name="Gary Dusbabek"/>
+        <developer id="goffinet" name="Chris Goffinet"/>
+        <developer id="ifesdjeen" name="Alex Petrov"/>
+        <developer id="jaakko" name="Laine Jaakko Olavi"/>
+        <developer id="jake" name="T Jake Luciani"/>
+        <developer id="jasonbrown" name="Jason Brown"/>
+        <developer id="jbellis" name="Jonathan Ellis"/>
+        <developer id="jfarrell" name="Jake Farrell"/>
+        <developer id="jjirsa" name="Jeff Jirsa"/>
+        <developer id="jkni" name="Joel Knighton"/>
+        <developer id="jmckenzie" name="Josh McKenzie"/>
+        <developer id="johan" name="Johan Oskarsson"/>
+        <developer id="junrao" name="Jun Rao"/>
+        <developer id="jzhuang" name="Jay Zhuang"/>
+        <developer id="kohlisankalp" name="Sankalp Kohli"/>
+        <developer id="marcuse" name="Marcus Eriksson"/>
+        <developer id="mck" name="Michael Semb Wever"/>
+        <developer id="mishail" name="Mikhail Stepura"/>
+        <developer id="mshuler" name="Michael Shuler"/>
+        <developer id="paulo" name="Paulo Motta"/>
+        <developer id="pmalik" name="Prashant Malik"/>
+        <developer id="rstupp" name="Robert Stupp"/>
+        <developer id="scode" name="Peter Schuller"/>
+        <developer id="beobal" name="Sam Tunnicliffe"/>
+        <developer id="slebresne" name="Sylvain Lebresne"/>
+        <developer id="stefania" name="Stefania Alborghetti"/>
+        <developer id="tylerhobbs" name="Tyler Hobbs"/>
+        <developer id="vijay" name="Vijay Parthasarathy"/>
+        <developer id="xedin" name="Pavel Yaskevich"/>
+        <developer id="yukim" name="Yuki Morishita"/>
+        <developer id="zznate" name="Nate McCall"/>
+      </artifact:pom>
+
+      <!-- each dependency set then defines the subset of the dependencies for that dependency set -->
+      <artifact:pom id="build-deps-pom"
+                    artifactId="cassandra-build-deps">
+        <parent groupId="org.apache.cassandra"
+                artifactId="cassandra-parent"
+                version="${version}"
+                relativePath="${final.name}-parent.pom"/>
+        <dependency groupId="junit" artifactId="junit"/>
+        <dependency groupId="commons-io" artifactId="commons-io"/>
+        <dependency groupId="org.mockito" artifactId="mockito-core"/>
+        <dependency groupId="org.quicktheories" artifactId="quicktheories"/>
+        <dependency groupId="org.reflections" artifactId="reflections"/>
+        <dependency groupId="com.google.code.java-allocation-instrumenter" artifactId="java-allocation-instrumenter" version="${allocation-instrumenter.version}"/>
+        <dependency groupId="org.apache.cassandra" artifactId="dtest-api"/>
+        <dependency groupId="org.openjdk.jmh" artifactId="jmh-core"/>
+        <dependency groupId="org.openjdk.jmh" artifactId="jmh-generator-annprocess"/>
+        <dependency groupId="org.apache.ant" artifactId="ant-junit"/>
+        <!-- adding this dependency is necessary for assertj. When updating assertj, need to also update the version of
+             this that the new assertj's `assertj-parent-pom` depends on. -->
+        <dependency groupId="org.junit" artifactId="junit-bom" type="pom"/>
+        <dependency groupId="org.awaitility" artifactId="awaitility"/>
+        <dependency groupId="org.hamcrest" artifactId="hamcrest"/>
+        <!-- coverage debs -->
+        <dependency groupId="org.jacoco" artifactId="org.jacoco.agent"/>
+        <dependency groupId="org.jacoco" artifactId="org.jacoco.ant"/>
+      </artifact:pom>
+
+      <!-- now the pom's for artifacts being deployed to Maven Central -->
+      <artifact:pom id="all-pom"
+                    artifactId="cassandra-all"
+                    url="https://cassandra.apache.org"
+                    name="Apache Cassandra">
+        <parent groupId="org.apache.cassandra"
+                artifactId="cassandra-parent"
+                version="${version}"
+                relativePath="${final.name}-parent.pom"/>
+        <scm connection="${scm.connection}" developerConnection="${scm.developerConnection}" url="${scm.url}"/>
+        <dependency groupId="org.xerial.snappy" artifactId="snappy-java"/>
+        <dependency groupId="org.lz4" artifactId="lz4-java"/>
+        <dependency groupId="com.ning" artifactId="compress-lzf"/>
+        <dependency groupId="com.google.guava" artifactId="guava"/>
+        <dependency groupId="commons-cli" artifactId="commons-cli"/>
+        <dependency groupId="commons-codec" artifactId="commons-codec"/>
+        <dependency groupId="org.apache.commons" artifactId="commons-lang3"/>
+        <dependency groupId="org.apache.commons" artifactId="commons-math3"/>
+        <dependency groupId="org.antlr" artifactId="antlr" scope="provided"/>
+        <dependency groupId="org.antlr" artifactId="ST4"/>
+        <dependency groupId="org.antlr" artifactId="antlr-runtime"/>
+        <dependency groupId="org.slf4j" artifactId="slf4j-api"/>
+        <dependency groupId="org.slf4j" artifactId="log4j-over-slf4j"/>
+        <dependency groupId="org.slf4j" artifactId="jcl-over-slf4j"/>
+        <dependency groupId="com.fasterxml.jackson.core" artifactId="jackson-core"/>
+        <dependency groupId="com.fasterxml.jackson.core" artifactId="jackson-databind"/>
+        <dependency groupId="com.fasterxml.jackson.core" artifactId="jackson-annotations"/>
+        <dependency groupId="com.googlecode.json-simple" artifactId="json-simple"/>
+        <dependency groupId="com.boundary" artifactId="high-scale-lib"/>
+        <dependency groupId="org.yaml" artifactId="snakeyaml"/>
+        <dependency groupId="org.mindrot" artifactId="jbcrypt"/>
+        <dependency groupId="io.airlift" artifactId="airline"/>
+        <dependency groupId="io.dropwizard.metrics" artifactId="metrics-core"/>
+        <dependency groupId="io.dropwizard.metrics" artifactId="metrics-jvm"/>
+        <dependency groupId="io.dropwizard.metrics" artifactId="metrics-logback"/>
+        <dependency groupId="com.addthis.metrics" artifactId="reporter-config3"/>
+        <dependency groupId="com.clearspring.analytics" artifactId="stream"/>
+
+        <dependency groupId="ch.qos.logback" artifactId="logback-core"/>
+        <dependency groupId="ch.qos.logback" artifactId="logback-classic"/>
+
+        <!-- don't need hadoop classes to run, but if you use the hadoop stuff -->
+        <dependency groupId="org.apache.hadoop" artifactId="hadoop-core" optional="true"/>
+        <dependency groupId="org.apache.hadoop" artifactId="hadoop-minicluster" optional="true"/>
+
+        <!-- don't need the Java Driver to run, but if you use the hadoop stuff or UDFs -->
+        <dependency groupId="com.datastax.cassandra" artifactId="cassandra-driver-core" classifier="shaded" optional="true"/>
+          <!-- don't need jna to run, but nice to have -->
+        <dependency groupId="net.java.dev.jna" artifactId="jna"/>
+
+        <!-- don't need jamm unless running a server in which case it needs to be a -javagent to be used anyway -->
+        <dependency groupId="com.github.jbellis" artifactId="jamm"/>
+
+        <dependency groupId="io.netty" artifactId="netty-bom"  type="pom"  />
+        <dependency groupId="io.netty" artifactId="netty-all"/>
+        <dependency groupId="net.openhft" artifactId="chronicle-queue"/>
+        <dependency groupId="net.openhft" artifactId="chronicle-core"/>
+        <dependency groupId="net.openhft" artifactId="chronicle-bytes"/>
+        <dependency groupId="net.openhft" artifactId="chronicle-wire"/>
+        <dependency groupId="net.openhft" artifactId="chronicle-threads"/>
+        <dependency groupId="org.fusesource" artifactId="sigar"/>
+        <dependency groupId="org.eclipse.jdt.core.compiler" artifactId="ecj"/>
+        <dependency groupId="org.caffinitas.ohc" artifactId="ohc-core"/>
+        <dependency groupId="org.caffinitas.ohc" artifactId="ohc-core-j8"/>
+        <dependency groupId="com.github.ben-manes.caffeine" artifactId="caffeine" />
+        <dependency groupId="org.jctools" artifactId="jctools-core"/>
+        <dependency groupId="org.ow2.asm" artifactId="asm" />
+        <dependency groupId="com.carrotsearch" artifactId="hppc" />
+        <dependency groupId="org.gridkit.jvmtool" artifactId="sjk-cli" />
+        <dependency groupId="org.gridkit.jvmtool" artifactId="sjk-core" />
+        <dependency groupId="org.gridkit.jvmtool" artifactId="sjk-stacktrace" />
+        <dependency groupId="org.gridkit.jvmtool" artifactId="mxdump" />
+        <dependency groupId="org.gridkit.lab" artifactId="jvm-attach-api" />
+        <dependency groupId="com.beust" artifactId="jcommander" />
+        <dependency groupId="org.gridkit.jvmtool" artifactId="sjk-json"/>
+        <dependency groupId="com.github.luben" artifactId="zstd-jni"/>
+        <dependency groupId="org.psjava" artifactId="psjava"/>
+        <dependency groupId="io.netty" artifactId="netty-tcnative-boringssl-static"/>
+        <dependency groupId="javax.inject" artifactId="javax.inject"/>
+        <dependency groupId="com.google.j2objc" artifactId="j2objc-annotations"/>
+        <dependency groupId="org.hdrhistogram" artifactId="HdrHistogram"/>
+
+        <!-- sasi deps -->
+        <dependency groupId="de.jflex" artifactId="jflex" />
+        <dependency groupId="com.github.rholder" artifactId="snowball-stemmer" />
+        <dependency groupId="com.googlecode.concurrent-trees" artifactId="concurrent-trees" />
+
+        <!-- compile tools -->
+        <dependency groupId="com.google.code.findbugs" artifactId="jsr305"/>
+        <dependency groupId="net.ju-n.compile-command-annotations" artifactId="compile-command-annotations"/>
+        <dependency groupId="org.assertj" artifactId="assertj-core"/>
+        <dependency groupId="org.jboss.byteman" artifactId="byteman-install"/>
+        <dependency groupId="org.jboss.byteman" artifactId="byteman"/>
+        <dependency groupId="org.jboss.byteman" artifactId="byteman-submit"/>
+        <dependency groupId="org.jboss.byteman" artifactId="byteman-bmunit"/>
+      </artifact:pom>
+    </target>
+
+    <!-- deprecated: legacy compatibility for build scripts in other repositories -->
+    <target name="maven-ant-tasks-retrieve-build" depends="resolver-retrieve-build"/>
+
+    <target name="echo-base-version">
+        <echo message="${base.version}" />
+    </target>
+
+    <!-- create properties file with C version -->
+    <target name="createVersionPropFile">
+      <taskdef name="propertyfile" classname="org.apache.tools.ant.taskdefs.optional.PropertyFile"/>
+      <mkdir dir="${version.properties.dir}"/>
+      <propertyfile file="${version.properties.dir}/version.properties">
+        <entry key="CassandraVersion" value="${version}"/>
+      </propertyfile>
+    </target>
+
+    <target name="test-run" depends="jar"
+            description="Run in test mode.  Not for production use!">
+      <java classname="org.apache.cassandra.service.CassandraDaemon" fork="true">
+        <classpath>
+          <path refid="cassandra.classpath.test"/>
+          <pathelement location="${test.conf}"/>
+        </classpath>
+        <jvmarg value="-Dstorage-config=${test.conf}"/>
+        <jvmarg value="-javaagent:${build.lib}/jamm-${jamm.version}.jar" />
+        <jvmarg value="-ea"/>
+        <jvmarg line="${java11-jvmargs}"/>
+      </java>
+    </target>
+
+    <!--
+        The build target builds all the .class files
+    -->
+    <target name="build" depends="resolver-retrieve-build,build-project" description="Compile Cassandra classes"/>
+    <target name="codecoverage" depends="jacoco-run,jacoco-report" description="Create code coverage report"/>
+
+    <target name="_build_java">
+        <!-- Note: we cannot use javac's 'release' option, as that does not allow accessing sun.misc.Unsafe nor
+        Nashorn's ClassFilter class as any javac modules option is invalid for relase 8. -->
+        <echo message="Compiling for Java ${target.version}..."/>
+        <javac
+               debug="true" debuglevel="${debuglevel}" encoding="utf-8"
+               destdir="${build.classes.main}" includeantruntime="false" source="${source.version}" target="${target.version}">
+            <src path="${build.src.java}"/>
+            <src path="${build.src.gen-java}"/>
+            <compilerarg value="-XDignore.symbol.file"/>
+            <compilerarg line="${jdk11-javac-exports}"/>
+            <classpath>
+                <path refid="cassandra.classpath"/>
+            </classpath>
+        </javac>
+    </target>
+
+    <target depends="init,gen-cql3-grammar,generate-cql-html,generate-jflex-java,rat-check"
+            name="build-project">
+        <echo message="${ant.project.name}: ${ant.file}"/>
+        <!-- Order matters! -->
+        <antcall target="_build_java"/>
+        <antcall target="createVersionPropFile"/>
+        <copy todir="${build.classes.main}">
+            <fileset dir="${build.src.resources}" />
+        </copy>
+        <copy todir="${basedir}/conf" file="${build.classes.main}/META-INF/hotspot_compiler"/>
+    </target>
+
+    <!-- Stress build file -->
+    <property name="stress.build.src" value="${basedir}/tools/stress/src" />
+    <property name="stress.test.src" value="${basedir}/tools/stress/test/unit" />
+    <property name="stress.build.classes" value="${build.classes}/stress" />
+    <property name="stress.test.classes" value="${build.dir}/test/stress-classes" />
+    <property name="stress.manifest" value="${stress.build.classes}/MANIFEST.MF" />
+
+    <target name="stress-build-test" depends="stress-build" description="Compile stress tests">
+        <javac debug="true" debuglevel="${debuglevel}" destdir="${stress.test.classes}"
+               source="${source.version}" target="${target.version}"
+               includeantruntime="false" encoding="utf-8">
+            <classpath>
+                <path refid="cassandra.classpath.test"/>
+                <pathelement location="${stress.build.classes}" />
+            </classpath>
+            <src path="${stress.test.src}"/>
+        </javac>
+    </target>
+
+    <target name="stress-build" depends="build" description="build stress tool">
+        <antcall target="_stress_build"/>
+    </target>
+
+    <target name="_stress_build">
+        <mkdir dir="${stress.build.classes}" />
+        <javac compiler="modern" debug="true" debuglevel="${debuglevel}"
+               source="${source.version}" target="${target.version}"
+               encoding="utf-8" destdir="${stress.build.classes}" includeantruntime="true">
+            <src path="${stress.build.src}" />
+            <classpath>
+                <path refid="cassandra.classpath" />
+            </classpath>
+        </javac>
+        <copy todir="${stress.build.classes}">
+            <fileset dir="${stress.build.src}/resources" />
+        </copy>
+    </target>
+
+    <target name="stress-test" depends="stress-build-test, build-test" description="Runs stress tests">
+        <testmacro inputdir="${stress.test.src}"
+                       timeout="${test.timeout}">
+        </testmacro>
+    </target>
+
+    <!-- Use this with an FQDN for test class, and an optional csv list of methods like this:
+      ant stress-test-some -Dtest.name=org.apache.cassandra.stress.generate.DistributionGaussianTest
+      ant stress-test-some -Dtest.name=org.apache.cassandra.stress.generate.DistributionGaussianTest -Dtest.methods=simpleGaussian
+    -->
+    <target name="stress-test-some" depends="stress-build-test, build-test" description="Runs stress tests">
+        <testmacro inputdir="${stress.test.src}"
+                       timeout="${test.timeout}">
+          <test unless:blank="${test.methods}" name="${test.name}" methods="${test.methods}" outfile="build/test/output/TEST-${test.name}-${test.methods}"/>
+          <test if:blank="${test.methods}" name="${test.name}" outfile="build/test/output/TEST-${test.name}"/>
+        </testmacro>
+    </target>
+
+    <!--
+        fqltool build file
+        -->
+    <property name="fqltool.build.src" value="${basedir}/tools/fqltool/src" />
+    <property name="fqltool.test.src" value="${basedir}/tools/fqltool/test/unit" />
+    <property name="fqltool.build.classes" value="${build.classes}/fqltool" />
+    <property name="fqltool.test.classes" value="${build.dir}/test/fqltool-classes" />
+    <property name="fqltool.manifest" value="${fqltool.build.classes}/MANIFEST.MF" />
+
+    <target name="fqltool-build-test" depends="fqltool-build" description="Compile fqltool tests">
+        <javac debug="true" debuglevel="${debuglevel}" destdir="${fqltool.test.classes}"
+               source="${source.version}" target="${target.version}"
+               includeantruntime="false" encoding="utf-8">
+            <classpath>
+                <path refid="cassandra.classpath.test"/>
+                <pathelement location="${fqltool.build.classes}" />
+            </classpath>
+            <src path="${fqltool.test.src}"/>
+        </javac>
+    </target>
+
+    <target name="fqltool-build" depends="build" description="build fqltool">
+        <antcall target="_fqltool_build"/>
+    </target>
+
+    <target name="_fqltool_build">
+        <mkdir dir="${fqltool.build.classes}" />
+        <javac compiler="modern" debug="true" debuglevel="${debuglevel}"
+               source="${source.version}" target="${target.version}"
+               encoding="utf-8" destdir="${fqltool.build.classes}" includeantruntime="true">
+            <src path="${fqltool.build.src}" />
+            <classpath>
+                <path refid="cassandra.classpath" />
+            </classpath>
+        </javac>
+    </target>
+
+    <target name="fqltool-test" depends="fqltool-build-test, build-test" description="Runs fqltool tests">
+        <testmacro inputdir="${fqltool.test.src}"
+                       timeout="${test.timeout}">
+        </testmacro>
+    </target>
+
+    <target name="_write-poms" depends="maven-declare-dependencies">
+        <artifact:writepom pomRefId="parent-pom" file="${build.dir}/${final.name}-parent.pom"/>
+        <artifact:writepom pomRefId="all-pom" file="${build.dir}/${final.name}.pom"/>
+        <artifact:writepom pomRefId="build-deps-pom" file="${build.dir}/tmp-${final.name}-deps.pom"/>
+    </target>
+
+    <target name="write-poms" unless="without.maven">
+        <antcall target="_write-poms" />
+    </target>
+
+    <!--
+        The jar target makes cassandra.jar output.
+    -->
+    <target name="_main-jar"
+            depends="build"
+            description="Assemble Cassandra JAR files">
+      <mkdir dir="${build.classes.main}/META-INF" />
+      <copy file="LICENSE.txt"
+            tofile="${build.classes.main}/META-INF/LICENSE.txt"/>
+      <copy file="NOTICE.txt"
+            tofile="${build.classes.main}/META-INF/NOTICE.txt"/>
+
+      <!-- Main Jar -->
+      <jar jarfile="${build.dir}/${final.name}.jar">
+        <fileset dir="${build.classes.main}">
+        </fileset>
+        <manifest>
+        <!-- <section name="org/apache/cassandra/infrastructure"> -->
+          <attribute name="Multi-Release" value="true"/>
+          <attribute name="Implementation-Title" value="Cassandra"/>
+          <attribute name="Implementation-Version" value="${version}"/>
+          <attribute name="Implementation-Vendor" value="Apache"/>
+        <!-- </section> -->
+        </manifest>
+      </jar>
+    </target>
+    <target name="jar"
+            depends="_main-jar,build-test,stress-build,fqltool-build,write-poms"
+            description="Assemble Cassandra JAR files">
+      <!-- Stress jar -->
+      <manifest file="${stress.manifest}">
+        <attribute name="Built-By" value="Pavel Yaskevich"/>
+        <attribute name="Main-Class" value="org.apache.cassandra.stress.Stress"/>
+      </manifest>
+      <mkdir dir="${stress.build.classes}/META-INF" />
+      <mkdir dir="${build.dir}/tools/lib/" />
+      <jar destfile="${build.dir}/tools/lib/stress.jar" manifest="${stress.manifest}">
+        <fileset dir="${stress.build.classes}"/>
+      </jar>
+      <!-- fqltool jar -->
+      <manifest file="${fqltool.manifest}">
+        <attribute name="Built-By" value="Marcus Eriksson"/>
+        <attribute name="Main-Class" value="org.apache.cassandra.fqltool.FullQueryLogTool"/>
+      </manifest>
+      <mkdir dir="${fqltool.build.classes}/META-INF" />
+      <mkdir dir="${build.dir}/tools/lib/" />
+      <jar destfile="${build.dir}/tools/lib/fqltool.jar" manifest="${stress.manifest}">
+        <fileset dir="${fqltool.build.classes}"/>
+      </jar>
+    </target>
+
+    <!--
+        The javadoc-jar target makes cassandra-javadoc.jar output required for publishing to Maven central repository.
+    -->
+    <target name="javadoc-jar" depends="javadoc" unless="no-javadoc" description="Assemble Cassandra JavaDoc JAR file">
+      <jar jarfile="${build.dir}/${final.name}-javadoc.jar" basedir="${javadoc.dir}"/>
+      <!-- javadoc task always rebuilds so might as well remove the generated docs to prevent
+           being pulled into the distribution by accident -->
+      <delete quiet="true" dir="${javadoc.dir}"/>
+    </target>
+
+    <!--
+        The sources-jar target makes cassandra-sources.jar output required for publishing to Maven central repository.
+    -->
+    <target name="sources-jar" depends="init" description="Assemble Cassandra Sources JAR file">
+      <jar jarfile="${build.dir}/${final.name}-sources.jar">
+        <fileset dir="${build.src.java}" defaultexcludes="yes">
+          <include name="org/apache/**/*.java"/>
+        </fileset>
+        <fileset dir="${build.src.gen-java}" defaultexcludes="yes">
+          <include name="org/apache/**/*.java"/>
+        </fileset>
+      </jar>
+    </target>
+
+    <target name="_artifacts-init" depends="jar">
+      <mkdir dir="${dist.dir}"/>
+      <!-- fix the control linefeed so that builds on windows works on linux -->
+      <fixcrlf srcdir="bin" includes="**/*" eol="lf" eof="remove" />
+      <fixcrlf srcdir="conf" includes="**/*" eol="lf" eof="remove" />
+      <fixcrlf srcdir="tools/bin" includes="**/*" eol="lf" eof="remove" />
+      <copy todir="${dist.dir}/lib">
+        <fileset dir="${build.lib}"/>
+        <fileset dir="${build.dir}">
+          <include name="${final.name}.jar" />
+        </fileset>
+      </copy>
+      <copy todir="${dist.dir}/doc" failonerror="false">
+        <fileset dir="doc">
+          <include name="cql3/CQL.html" />
+          <include name="cql3/CQL.css" />
+          <include name="SASI.md" />
+        </fileset>
+      </copy>
+      <copy todir="${dist.dir}/doc/html" failonerror="false">
+        <fileset dir="doc" />
+        <globmapper from="build/html/*" to="*"/>
+      </copy>
+      <copy todir="${dist.dir}/bin">
+        <fileset dir="bin"/>
+      </copy>
+      <copy todir="${dist.dir}/conf">
+        <fileset dir="conf"/>
+      </copy>
+      <copy todir="${dist.dir}/pylib">
+        <fileset dir="pylib">
+          <include name="**" />
+          <exclude name="**/*.pyc" />
+        </fileset>
+      </copy>
+      <copy todir="${dist.dir}/">
+        <fileset dir="${basedir}">
+          <include name="*.txt" />
+        </fileset>
+      </copy>
+      <copy todir="${dist.dir}/tools/bin">
+        <fileset dir="${basedir}/tools/bin"/>
+      </copy>
+      <copy todir="${dist.dir}/tools/">
+        <fileset dir="${basedir}/tools/">
+            <include name="*.yaml"/>
+    </fileset>
+      </copy>
+      <copy todir="${dist.dir}/tools/lib">
+        <fileset dir="${build.dir}/tools/lib/">
+            <include name="*.jar" />
+        </fileset>
+      </copy>
+    </target>
+
+    <!-- creates release tarballs -->
+    <target name="artifacts" depends="_artifacts-init,gen-doc,sources-jar,javadoc-jar"
+            description="Create Cassandra release artifacts">
+      <tar compression="gzip" longfile="gnu"
+        destfile="${build.dir}/${final.name}-bin.tar.gz">
+
+        <!-- Everything but bin/ (default mode) -->
+        <tarfileset dir="${dist.dir}" prefix="${final.name}">
+          <include name="**"/>
+          <exclude name="bin/*" />
+          <exclude name="tools/bin/*"/>
+        </tarfileset>
+        <!-- Shell includes in bin/ (default mode) -->
+        <tarfileset dir="${dist.dir}" prefix="${final.name}">
+          <include name="bin/*.in.sh" />
+          <include name="tools/bin/*.in.sh" />
+        </tarfileset>
+        <!-- Executable scripts in bin/ -->
+        <tarfileset dir="${dist.dir}" prefix="${final.name}" mode="755">
+          <include name="bin/*"/>
+          <include name="tools/bin/*"/>
+          <exclude name="bin/*.in.sh" />
+          <exclude name="tools/bin/*.in.sh" />
+        </tarfileset>
+      </tar>
+
+      <tar compression="gzip" longfile="gnu"
+           destfile="${build.dir}/${final.name}-src.tar.gz">
+
+        <tarfileset dir="${basedir}"
+                    prefix="${final.name}-src">
+          <include name="**"/>
+          <exclude name="build/**" />
+          <exclude name="lib/**" />
+          <exclude name="src/gen-java/**" />
+          <exclude name=".git/**" />
+          <exclude name="venv/**" />
+          <exclude name="src/resources/org/apache/cassandra/config/version.properties" />
+          <exclude name="conf/hotspot_compiler" />
+          <exclude name="doc/cql3/CQL.html" />
+          <exclude name="doc/build/**" />
+          <exclude name="bin/*" /> <!-- handled separately below -->
+          <exclude name="tools/bin/*" /> <!-- handled separately below -->
+          <!-- exclude python generated files -->
+          <exclude name="**/__pycache__/**" />
+          <!-- exclude Eclipse files -->
+          <exclude name=".project" />
+          <exclude name=".classpath" />
+          <exclude name=".settings/**" />
+          <exclude name=".externalToolBuilders/**" />
+          <!-- exclude NetBeans files -->
+          <exclude name="ide/nbproject/private/**" />
+        </tarfileset>
+
+        <!-- python driver -->
+        <tarfileset dir="${basedir}" prefix="${final.name}-src">
+          <include name="lib/cassandra-driver-internal-only-**" />
+        </tarfileset>
+
+        <!-- Shell includes in bin/ and tools/bin/ -->
+        <tarfileset dir="${basedir}" prefix="${final.name}-src">
+          <include name="bin/*.in.sh" />
+          <include name="tools/bin/*.in.sh" />
+        </tarfileset>
+        <!-- Everything else (assumed to be scripts), is executable -->
+        <tarfileset dir="${basedir}" prefix="${final.name}-src" mode="755">
+          <include name="bin/*"/>
+          <exclude name="bin/*.in.sh" />
+          <include name="tools/bin/*"/>
+          <exclude name="tools/bin/*.in.sh" />
+        </tarfileset>
+      </tar>
+
+      <checksum forceOverwrite="yes" todir="${build.dir}" fileext=".sha256" algorithm="SHA-256">
+        <fileset dir="${build.dir}">
+          <include name="${final.name}-bin.tar.gz" />
+          <include name="${final.name}-src.tar.gz" />
+        </fileset>
+      </checksum>
+      <checksum forceOverwrite="yes" todir="${build.dir}" fileext=".sha512" algorithm="SHA-512">
+        <fileset dir="${build.dir}">
+          <include name="${final.name}-bin.tar.gz" />
+          <include name="${final.name}-src.tar.gz" />
+        </fileset>
+      </checksum>
+    </target>
+
+  <target name="build-jmh" depends="build-test, jar" description="Create JMH uber jar">
+      <jar jarfile="${build.test.dir}/deps.jar">
+          <zipgroupfileset dir="${test.lib}/jars">
+              <include name="*jmh*.jar"/>
+              <include name="jopt*.jar"/>
+              <include name="commons*.jar"/>
+              <include name="junit*.jar"/>
+              <include name="hamcrest*.jar"/>
+          </zipgroupfileset>
+          <zipgroupfileset dir="${build.lib}" includes="*.jar"/>
+      </jar>
+      <jar jarfile="${build.test.dir}/benchmarks.jar">
+          <manifest>
+              <attribute name="Main-Class" value="org.openjdk.jmh.Main"/>
+          </manifest>
+          <zipfileset src="${build.test.dir}/deps.jar" excludes="META-INF/*.SF" />
+          <fileset dir="${build.classes.main}"/>
+          <fileset dir="${test.classes}"/>
+          <fileset dir="${test.conf}" />
+      </jar>
+  </target>
+
+  <target name="build-test" depends="_main-jar,stress-build,fqltool-build,resolver-dist-lib" unless="no-build-test"
+          description="Compile test classes">
+    <antcall target="_build-test"/>
+  </target>
+
+  <target name="_build-test">
+    <javac
+     compiler="modern"
+     debug="true"
+     debuglevel="${debuglevel}"
+     destdir="${test.classes}"
+     includeantruntime="true"
+     source="${source.version}"
+     target="${target.version}"
+     encoding="utf-8">
+     <classpath>
+        <path refid="cassandra.classpath.test"/>
+        <pathelement location="${fqltool.build.classes}"/>
+     </classpath>
+     <compilerarg value="-XDignore.symbol.file"/>
+     <src path="${test.unit.src}"/>
+     <src path="${test.long.src}"/>
+     <src path="${test.burn.src}"/>
+     <src path="${test.memory.src}"/>
+     <src path="${test.microbench.src}"/>
+     <src path="${test.distributed.src}"/>
+    </javac>
+
+    <!-- Non-java resources needed by the test suite -->
+    <copy todir="${test.classes}">
+      <fileset dir="${test.resources}"/>
+    </copy>
+  </target>
+
+  <!-- Run tests separately and report errors after and generate a junit report -->
+  <macrodef name="testhelper">
+    <attribute name="testdelegate"/>
+    <sequential>
+      <testhelper_ testdelegate="@{testdelegate}"/>
+      <fail message="Some test(s) failed.">
+        <condition>
+            <and>
+            <isset property="testfailed"/>
+            <not>
+              <isset property="ant.test.failure.ignore"/>
+            </not>
+          </and>
+        </condition>
+      </fail>
+    </sequential>
+  </macrodef>
+
+  <!-- Run a list of junit tasks but don't track errors or generate a report after
+       If a test fails the testfailed property will be set. All the tests are run using the testdelegate
+       macro that is specified as an attribute and they will be run sequentially in this ant process -->
+  <scriptdef name="testhelper_" language="javascript">
+    <attribute name="testdelegate"/>
+    <![CDATA[
+        sep = project.getProperty("path.separator");
+        all = project.getProperty("all-test-classes").split(sep);
+        var p = project.createTask('sequential');
+        for (i = 0; i < all.length; i++) {
+            if (all[i] == undefined) continue;
+            task = project.createTask( attributes.get("testdelegate") );
+            task.setDynamicAttribute( "test.file.list", "" + all[i]);
+            p.addTask(task);
+        }
+        p.perform();
+    ]]>
+  </scriptdef>
+
+  <!-- Defines how to run a set of tests. If you change the defaults for attributes
+       you should also update them in testmacro.,
+       The two are split because the helper doesn't generate
+       a junit report or fail on errors -->
+  <macrodef name="testmacrohelper">
+    <attribute name="inputdir" />
+    <attribute name="timeout" default="${test.timeout}" />
+    <attribute name="forkmode" default="perTest"/>
+    <element name="optjvmargs" implicit="true" optional="true" />
+    <attribute name="filter" default="**/${test.name}.java"/>
+    <attribute name="exclude" default="" />
+    <attribute name="filelist" default="" />
+    <attribute name="testtag" default=""/>
+    <attribute name="usejacoco" default="no"/>
+    <attribute name="showoutput" default="false"/>
+
+    <sequential>
+      <condition property="additionalagent"
+                 value="-javaagent:${build.dir.lib}/jars/jacocoagent.jar=destfile=${jacoco.partialexecfile}"
+                 else="">
+        <istrue value="${usejacoco}"/>
+      </condition>
+      <taskdef name="junit-timeout" classname="org.apache.cassandra.JStackJUnitTask">
+        <classpath>
+          <pathelement location="${test.classes}"/>
+        </classpath>
+      </taskdef>
+      <mkdir dir="${build.test.dir}/cassandra"/>
+      <mkdir dir="${build.test.dir}/output"/>
+      <mkdir dir="${build.test.dir}/output/@{testtag}"/>
+      <junit-timeout fork="on" forkmode="@{forkmode}" failureproperty="testfailed" maxmemory="1024m" timeout="@{timeout}" showoutput="@{showoutput}">
+        <formatter classname="org.apache.cassandra.CassandraXMLJUnitResultFormatter" extension=".xml" usefile="true"/>
+        <formatter classname="org.apache.cassandra.CassandraBriefJUnitResultFormatter" usefile="false"/>
+        <jvmarg value="-Dstorage-config=${test.conf}"/>
+        <jvmarg value="-Djava.awt.headless=true"/>
+        <!-- Cassandra 3.0+ needs <jvmarg line="... ${additionalagent}" /> here! (not value=) -->
+        <jvmarg line="-javaagent:${build.lib}/jamm-${jamm.version}.jar ${additionalagent}" />
+        <jvmarg value="-ea"/>
+        <jvmarg value="-Djava.io.tmpdir=${tmp.dir}"/>
+        <jvmarg value="-Dcassandra.debugrefcount=true"/>
+        <jvmarg value="-Xss256k"/>
+        <!-- When we do classloader manipulation SoftReferences can cause memory leaks
+             that can OOM our test runs. The next two settings informs our GC
+             algorithm to limit the metaspace size and clean up SoftReferences
+             more aggressively rather than waiting. See CASSANDRA-14922 for more details.
+        -->
+        <jvmarg value="-XX:SoftRefLRUPolicyMSPerMB=0" />
+        <jvmarg value="-Dcassandra.test.driver.connection_timeout_ms=${test.driver.connection_timeout_ms}"/>
+        <jvmarg value="-Dcassandra.test.driver.read_timeout_ms=${test.driver.read_timeout_ms}"/>
+        <jvmarg value="-Dcassandra.memtable_row_overhead_computation_step=100"/>
+        <jvmarg value="-Dcassandra.test.use_prepared=${cassandra.test.use_prepared}"/>
+        <jvmarg value="-Dcassandra.test.sstableformatdevelopment=true"/>
+        <!-- The first time SecureRandom initializes can be slow if it blocks on /dev/random -->
+        <jvmarg value="-Djava.security.egd=file:/dev/urandom" />
+        <jvmarg value="-Dcassandra.testtag=@{testtag}"/>
+        <jvmarg value="-Dcassandra.keepBriefBrief=${cassandra.keepBriefBrief}" />
+        <jvmarg value="-Dcassandra.strict.runtime.checks=true" />
+        <jvmarg line="${java11-jvmargs}"/>
+        <!-- disable shrinks in quicktheories CASSANDRA-15554 -->
+        <jvmarg value="-DQT_SHRINKS=0"/>
+        <jvmarg line="${test-jvmargs}" />
+        <optjvmargs/>
+        <!-- Uncomment to debug unittest, attach debugger to port 1416 -->
+        <!--
+        <jvmarg line="-agentlib:jdwp=transport=dt_socket,address=localhost:1416,server=y,suspend=y" />
+        -->
+        <classpath>
+          <pathelement path="${java.class.path}"/>
+          <pathelement location="${stress.build.classes}"/>
+          <pathelement location="${fqltool.build.classes}"/>
+          <path refid="cassandra.classpath.test" />
+          <pathelement location="${test.classes}"/>
+          <pathelement location="${stress.test.classes}"/>
+          <pathelement location="${fqltool.test.classes}"/>
+          <pathelement location="${test.conf}"/>
+          <fileset dir="${test.lib}">
+            <include name="**/*.jar" />
+              <exclude name="**/ant-*.jar"/>
+          </fileset>
+        </classpath>
+        <batchtest todir="${build.test.dir}/output/@{testtag}">
+            <fileset dir="@{inputdir}" includes="@{filter}" excludes="@{exclude}"/>
+            <filelist dir="@{inputdir}" files="@{filelist}"/>
+        </batchtest>
+      </junit-timeout>
+
+      <delete quiet="true" failonerror="false" dir="${build.test.dir}/cassandra/commitlog"/>
+      <delete quiet="true" failonerror="false" dir="${build.test.dir}/cassandra/cdc_raw"/>
+      <delete quiet="true" failonerror="false" dir="${build.test.dir}/cassandra/data"/>
+      <delete quiet="true" failonerror="false" dir="${build.test.dir}/cassandra/ssl_upload_tables"/>
+      <delete quiet="true" failonerror="false" dir="${build.test.dir}/cassandra/system_data"/>
+      <delete quiet="true" failonerror="false" dir="${build.test.dir}/cassandra/saved_caches"/>
+      <delete quiet="true" failonerror="false" dir="${build.test.dir}/cassandra/hints"/>
+    </sequential>
+  </macrodef>
+
+  <target name="testold" depends="build-test" description="Execute unit tests">
+    <testmacro inputdir="${test.unit.src}" timeout="${test.timeout}">
+      <jvmarg value="-Dlegacy-sstable-root=${test.data}/legacy-sstables"/>
+      <jvmarg value="-Dinvalid-legacy-sstable-root=${test.data}/invalid-legacy-sstables"/>
+      <jvmarg value="-Dcassandra.ring_delay_ms=1000"/>
+      <jvmarg value="-Dcassandra.tolerate_sstable_size=true"/>
+      <jvmarg value="-Dcassandra.skip_sync=true" />
+    </testmacro>
+    <fileset dir="${test.unit.src}" />
+  </target>
+
+  <!-- Will not generate a junit report or fail on error  -->
+  <macrodef name="testlist">
+    <attribute name="test.file.list"/>
+    <sequential>
+      <testmacrohelper inputdir="${test.dir}/${test.classlistprefix}" filelist="@{test.file.list}" exclude="**/*.java" timeout="${test.timeout}">
+        <jvmarg value="-Dlegacy-sstable-root=${test.data}/legacy-sstables"/>
+        <jvmarg value="-Dinvalid-legacy-sstable-root=${test.data}/invalid-legacy-sstables"/>
+        <jvmarg value="-Dcassandra.ring_delay_ms=1000"/>
+        <jvmarg value="-Dcassandra.tolerate_sstable_size=true"/>
+        <jvmarg value="-Dcassandra.skip_sync=true" />
+      </testmacrohelper>
+    </sequential>
+  </macrodef>
+
+  <!-- Will not generate a junit report  -->
+  <macrodef name="testlist-compression">
+    <attribute name="test.file.list" />
+    <sequential>
+      <property name="compressed_yaml" value="${build.test.dir}/cassandra.compressed.yaml"/>
+      <concat destfile="${compressed_yaml}">
+          <fileset file="${test.conf}/cassandra.yaml"/>
+          <fileset file="${test.conf}/commitlog_compression_${test.compression.algo}.yaml"/>
+      </concat>
+      <testmacrohelper inputdir="${test.unit.src}" filelist="@{test.file.list}"
+                       exclude="**/*.java" timeout="${test.timeout}" testtag="compression">
+        <jvmarg value="-Dlegacy-sstable-root=${test.data}/legacy-sstables"/>
+        <jvmarg value="-Dinvalid-legacy-sstable-root=${test.data}/invalid-legacy-sstables"/>
+        <jvmarg value="-Dcassandra.test.compression=true"/>
+        <jvmarg value="-Dcassandra.test.compression.algo=${test.compression.algo}"/>
+        <jvmarg value="-Dcassandra.ring_delay_ms=1000"/>
+        <jvmarg value="-Dcassandra.tolerate_sstable_size=true"/>
+        <jvmarg value="-Dcassandra.config=file:///${compressed_yaml}"/>
+        <jvmarg value="-Dcassandra.skip_sync=true" />
+      </testmacrohelper>
+    </sequential>
+  </macrodef>
+
+  <macrodef name="testlist-cdc">
+    <attribute name="test.file.list" />
+    <sequential>
+      <property name="cdc_yaml" value="${build.test.dir}/cassandra.cdc.yaml"/>
+      <concat destfile="${cdc_yaml}">
+        <fileset file="${test.conf}/cassandra.yaml"/>
+        <fileset file="${test.conf}/cdc.yaml"/>
+      </concat>
+      <testmacrohelper inputdir="${test.unit.src}" filelist="@{test.file.list}"
+                       exclude="**/*.java" timeout="${test.timeout}" testtag="cdc">
+        <jvmarg value="-Dlegacy-sstable-root=${test.data}/legacy-sstables"/>
+        <jvmarg value="-Dinvalid-legacy-sstable-root=${test.data}/invalid-legacy-sstables"/>
+        <jvmarg value="-Dcassandra.ring_delay_ms=1000"/>
+        <jvmarg value="-Dcassandra.tolerate_sstable_size=true"/>
+        <jvmarg value="-Dcassandra.config=file:///${cdc_yaml}"/>
+        <jvmarg value="-Dcassandra.skip_sync=true" />
+      </testmacrohelper>
+    </sequential>
+  </macrodef>
+
+  <macrodef name="testlist-system-keyspace-directory">
+    <attribute name="test.file.list" />
+    <sequential>
+      <property name="system_keyspaces_directory_yaml" value="${build.test.dir}/cassandra.system.yaml"/>
+      <concat destfile="${system_keyspaces_directory_yaml}">
+        <fileset file="${test.conf}/cassandra.yaml"/>
+        <fileset file="${test.conf}/system_keyspaces_directory.yaml"/>
+      </concat>
+      <testmacrohelper inputdir="${test.unit.src}" filelist="@{test.file.list}"
+                       exclude="**/*.java" timeout="${test.timeout}" testtag="system_keyspace_directory">
+        <jvmarg value="-Dlegacy-sstable-root=${test.data}/legacy-sstables"/>
+        <jvmarg value="-Dinvalid-legacy-sstable-root=${test.data}/invalid-legacy-sstables"/>
+        <jvmarg value="-Dcassandra.ring_delay_ms=1000"/>
+        <jvmarg value="-Dcassandra.tolerate_sstable_size=true"/>
+        <jvmarg value="-Dcassandra.config=file:///${system_keyspaces_directory_yaml}"/>
+        <jvmarg value="-Dcassandra.skip_sync=true" />
+      </testmacrohelper>
+    </sequential>
+  </macrodef>
+
+  <!--
+    Run named ant task with jacoco, such as "ant jacoco-run -Dtaskname=test"
+    the target run must enable the jacoco agent if usejacoco is 'yes' -->
+  <target name="jacoco-run" description="run named task with jacoco instrumentation">
+    <condition property="runtask" value="${taskname}" else="test">
+      <isset property="taskname"/>
+    </condition>
+    <antcall target="${runtask}">
+      <param name="usejacoco" value="yes"/>
+    </antcall>
+  </target>
+
+  <!-- Use this with an FQDN for test class, and an optional csv list of methods like this:
+    ant testsome -Dtest.name=org.apache.cassandra.service.StorageServiceServerTest -Dtest.methods=testRegularMode,testGetAllRangesEmpty
+  -->
+  <target name="testsome" depends="build-test" description="Execute specific unit tests" >
+    <testmacro inputdir="${test.unit.src}" timeout="${test.timeout}">
+      <test unless:blank="${test.methods}" name="${test.name}" methods="${test.methods}" outfile="build/test/output/TEST-${test.name}-${test.methods}"/>
+      <test if:blank="${test.methods}" name="${test.name}" outfile="build/test/output/TEST-${test.name}"/>
+      <jvmarg value="-Dlegacy-sstable-root=${test.data}/legacy-sstables"/>
+      <jvmarg value="-Dinvalid-legacy-sstable-root=${test.data}/invalid-legacy-sstables"/>
+      <jvmarg value="-Dcassandra.ring_delay_ms=1000"/>
+      <jvmarg value="-Dcassandra.tolerate_sstable_size=true"/>
+      <jvmarg value="-Dcassandra.skip_sync=true" />
+    </testmacro>
+  </target>
+
+  <!-- Use this with an FQDN for test class, and an optional csv list of methods like this:
+    ant long-testsome -Dtest.name=org.apache.cassandra.cql3.ManyRowsTest
+    ant long-testsome -Dtest.name=org.apache.cassandra.cql3.ManyRowsTest -Dtest.methods=testLargeCount
+  -->
+  <target name="long-testsome" depends="build-test" description="Execute specific long unit tests" >
+    <testmacro inputdir="${test.long.src}" timeout="${test.long.timeout}">
+      <test unless:blank="${test.methods}" name="${test.name}" methods="${test.methods}"/>
+      <test if:blank="${test.methods}" name="${test.name}"/>
+      <jvmarg value="-Dcassandra.ring_delay_ms=1000"/>
+      <jvmarg value="-Dcassandra.tolerate_sstable_size=true"/>
+    </testmacro>
+  </target>
+
+  <!-- Use this with an FQDN for test class, and an optional csv list of methods like this:
+    ant burn-testsome -Dtest.name=org.apache.cassandra.utils.memory.LongBufferPoolTest
+    ant burn-testsome -Dtest.name=org.apache.cassandra.utils.memory.LongBufferPoolTest -Dtest.methods=testPoolAllocateWithRecyclePartially
+  -->
+  <target name="burn-testsome" depends="build-test" description="Execute specific burn unit tests" >
+    <testmacro inputdir="${test.burn.src}" timeout="${test.burn.timeout}">
+      <test unless:blank="${test.methods}" name="${test.name}" methods="${test.methods}"/>
+      <test if:blank="${test.methods}" name="${test.name}"/>
+      <jvmarg value="-Dlogback.configurationFile=test/conf/logback-burntest.xml"/>
+    </testmacro>
+  </target>
+
+  <target name="test-compression" depends="build-test,stress-build" description="Execute unit tests with sstable compression enabled">
+    <path id="all-test-classes-path">
+      <fileset dir="${test.unit.src}" includes="**/${test.name}.java" />
+      <fileset dir="${test.distributed.src}" includes="**/${test.name}.java" />
+    </path>
+    <property name="all-test-classes" refid="all-test-classes-path"/>
+    <testhelper testdelegate="testlist-compression" />
+  </target>
+
+  <target name="test-cdc" depends="build-test" description="Execute unit tests with change-data-capture enabled">
+    <path id="all-test-classes-path">
+      <fileset dir="${test.unit.src}" includes="**/${test.name}.java" />
+    </path>
+    <property name="all-test-classes" refid="all-test-classes-path"/>
+    <testhelper testdelegate="testlist-cdc" />
+  </target>
+
+  <target name="test-system-keyspace-directory" depends="build-test" description="Execute unit tests with a system keyspaces directory configured">
+    <path id="all-test-classes-path">
+      <fileset dir="${test.unit.src}" includes="**/${test.name}.java" />
+    </path>
+    <property name="all-test-classes" refid="all-test-classes-path"/>
+    <testhelper testdelegate="testlist-system-keyspace-directory" />
+  </target>
+
+  <target name="msg-ser-gen-test" depends="build-test" description="Generates message serializations">
+    <testmacro inputdir="${test.unit.src}"
+        timeout="${test.timeout}" filter="**/SerializationsTest.java">
+      <jvmarg value="-Dcassandra.test-serialization-writes=True"/>
+    </testmacro>
+  </target>
+
+  <target name="msg-ser-test" depends="build-test" description="Tests message serializations">
+      <testmacro inputdir="${test.unit.src}" timeout="${test.timeout}"
+               filter="**/SerializationsTest.java"/>
+  </target>
+
+  <target name="msg-ser-test-7" depends="build-test" description="Generates message serializations">
+    <testmacro inputdir="${test.unit.src}"
+        timeout="${test.timeout}" filter="**/SerializationsTest.java">
+      <jvmarg value="-Dcassandra.version=0.7"/>
+    </testmacro>
+  </target>
+
+  <target name="msg-ser-test-10" depends="build-test" description="Tests message serializations on 1.0 messages">
+    <testmacro inputdir="${test.unit.src}"
+        timeout="${test.timeout}" filter="**/SerializationsTest.java">
+      <jvmarg value="-Dcassandra.version=1.0"/>
+    </testmacro>
+  </target>
+
+  <target name="test-burn" depends="build-test" description="Execute functional tests">
+    <testmacro inputdir="${test.burn.src}"
+               timeout="${test.burn.timeout}">
+    </testmacro>
+  </target>
+
+  <target name="long-test" depends="build-test" description="Execute functional tests">
+    <testmacro inputdir="${test.long.src}"
+               timeout="${test.long.timeout}">
+      <jvmarg value="-Dcassandra.ring_delay_ms=1000"/>
+      <jvmarg value="-Dcassandra.tolerate_sstable_size=true"/>
+    </testmacro>
+  </target>
+
+  <target name="test-memory" depends="build-test" description="Execute functional tests">
+      <testmacro inputdir="${test.memory.src}"
+                 timeout="${test.memory.timeout}">
+          <jvmarg value="-javaagent:${build.dir}/test/lib/jars/java-allocation-instrumenter-${allocation-instrumenter.version}.jar"/>
+      </testmacro>
+  </target>
+
+  <target name="cql-test" depends="build-test" description="Execute CQL tests">
+    <sequential>
+      <echo message="running CQL tests"/>
+      <mkdir dir="${build.test.dir}/cassandra"/>
+      <mkdir dir="${build.test.dir}/output"/>
+      <junit fork="on" forkmode="once" failureproperty="testfailed" maxmemory="1024m" timeout="${test.timeout}">
+        <formatter type="brief" usefile="false"/>
+        <jvmarg value="-Dstorage-config=${test.conf}"/>
+        <jvmarg value="-Djava.awt.headless=true"/>
+        <jvmarg value="-javaagent:${build.lib}/jamm-${jamm.version}.jar" />
+        <jvmarg value="-ea"/>
+        <jvmarg value="-Xss256k"/>
+        <jvmarg value="-Dcassandra.memtable_row_overhead_computation_step=100"/>
+        <jvmarg value="-Dcassandra.test.use_prepared=${cassandra.test.use_prepared}"/>
+        <jvmarg value="-Dcassandra.skip_sync=true" />
+        <classpath>
+          <path refid="cassandra.classpath.test" />
+          <pathelement location="${test.classes}"/>
+          <pathelement location="${test.conf}"/>
+          <fileset dir="${test.lib}">
+            <include name="**/*.jar" />
+          </fileset>
+        </classpath>
+        <batchtest todir="${build.test.dir}/output">
+            <fileset dir="${test.unit.src}" includes="**/cql3/*Test.java">
+                <contains text="CQLTester" casesensitive="yes"/>
+            </fileset>
+        </batchtest>
+      </junit>
+      <fail message="Some CQL test(s) failed.">
+        <condition>
+            <and>
+            <isset property="testfailed"/>
+            <not>
+              <isset property="ant.test.failure.ignore"/>
+            </not>
+          </and>
+        </condition>
+      </fail>
+    </sequential>
+  </target>
+
+  <!-- Use this with an simple class name for test class, and an optional csv list of methods like this:
+      ant cql-test-some -Dtest.name=ListsTest
+      ant cql-test-some -Dtest.name=ListsTest -Dtest.methods=testPrecisionTime_getNext_simple
+    -->
+  <target name="cql-test-some" depends="build-test" description="Execute specific CQL tests" >
+    <sequential>
+      <echo message="running ${test.methods} tests from ${test.name}"/>
+      <mkdir dir="${build.test.dir}/cassandra"/>
+      <mkdir dir="${build.test.dir}/output"/>
+      <junit fork="on" forkmode="once" failureproperty="testfailed" maxmemory="1024m" timeout="${test.timeout}">
+        <formatter type="brief" usefile="false"/>
+        <jvmarg value="-Dstorage-config=${test.conf}"/>
+        <jvmarg value="-Djava.awt.headless=true"/>
+        <jvmarg value="-javaagent:${build.lib}/jamm-${jamm.version}.jar" />
+        <jvmarg value="-ea"/>
+        <jvmarg value="-Xss256k"/>
+        <jvmarg value="-Dcassandra.test.use_prepared=${cassandra.test.use_prepared}"/>
+        <jvmarg value="-Dcassandra.memtable_row_overhead_computation_step=100"/>
+        <jvmarg value="-Dcassandra.skip_sync=true" />
+        <classpath>
+          <path refid="cassandra.classpath.test" />
+          <pathelement location="${test.classes}"/>
+          <pathelement location="${test.conf}"/>
+          <fileset dir="${test.lib}">
+            <include name="**/*.jar" />
+          </fileset>
+        </classpath>
+        <test unless:blank="${test.methods}" name="org.apache.cassandra.cql3.${test.name}" methods="${test.methods}" todir="${build.test.dir}/output"/>
+        <test if:blank="${test.methods}" name="org.apache.cassandra.cql3.${test.name}" todir="${build.test.dir}/output"/>
+      </junit>
+    </sequential>
+  </target>
+
+  <!-- Use JaCoCo ant extension without needing externally saved lib -->
+  <target name="jacoco-init" depends="resolver-init">
+    <typedef uri="antlib:org.jacoco.ant" classpathref="jacocoant.classpath"/>
+  </target>
+
+  <target name="jacoco-merge" depends="jacoco-init">
+    <jacoco:merge destfile="${jacoco.finalexecfile}" xmlns:jacoco="antlib:org.jacoco.ant">
+        <fileset dir="${jacoco.export.dir}" includes="*.exec,**/*.exec"/>
+    </jacoco:merge>
+  </target>
+
+  <target name="jacoco-report" depends="jacoco-merge">
+    <jacoco:report xmlns:jacoco="antlib:org.jacoco.ant">
+      <executiondata>
+        <file file="${jacoco.finalexecfile}" />
+      </executiondata>
+      <structure name="JaCoCo Cassandara Coverage Report">
+        <classfiles>
+          <fileset dir="${build.classes.main}">
+            <include name="**/*.class"/>
+          </fileset>
+        </classfiles>
+        <sourcefiles encoding="UTF-8">
+          <dirset dir="${build.src}">
+            <include name="java"/>
+            <include name="gen-java"/>
+          </dirset>
+        </sourcefiles>
+      </structure>
+      <!-- to produce reports in different formats. -->
+      <html destdir="${jacoco.export.dir}" />
+      <csv destfile="${jacoco.export.dir}/report.csv" />
+      <xml destfile="${jacoco.export.dir}/report.xml" />
+    </jacoco:report>
+  </target>
+
+  <target name="jacoco-cleanup" description="Destroy JaCoCo exec data and reports">
+    <delete file="${jacoco.partialexecfile}"/>
+    <delete dir="${jacoco.export.dir}"/>
+  </target>
+
+  <target name="javadoc" depends="build" description="Create javadoc" unless="no-javadoc">
+    <create-javadoc destdir="${javadoc.dir}">
+      <filesets>
+        <fileset dir="${build.src.java}" defaultexcludes="yes">
+          <include name="org/apache/**/*.java"/>
+        </fileset>
+      </filesets>
+    </create-javadoc>
+   </target>
+
+  <!-- Run tests and reports errors and generates a junit report after -->
+  <macrodef name="testmacro">
+    <attribute name="inputdir" />
+    <attribute name="timeout" default="${test.timeout}" />
+    <attribute name="forkmode" default="perTest"/>
+    <attribute name="showoutput" default="true"/>
+    <element name="optjvmargs" implicit="true" optional="true" />
+    <attribute name="filter" default="**/${test.name}.java"/>
+    <attribute name="exclude" default="" />
+    <attribute name="filelist" default="" />
+    <attribute name="testtag" default=""/>
+
+    <sequential>
+      <testmacrohelper inputdir="@{inputdir}" timeout="@{timeout}"
+                       forkmode="@{forkmode}" filter="@{filter}"
+                       exclude="@{exclude}" filelist="@{filelist}"
+                       testtag="@{testtag}" showoutput="false" >
+          <optjvmargs/>
+      </testmacrohelper>
+      <fail message="Some test(s) failed.">
+        <condition>
+            <and>
+            <isset property="testfailed"/>
+            <not>
+              <isset property="ant.test.failure.ignore"/>
+            </not>
+          </and>
+        </condition>
+      </fail>
+    </sequential>
+  </macrodef>
+
+  <target name="test" depends="eclipse-warnings,build-test" description="Test Runner">
+    <path id="all-test-classes-path">
+      <fileset dir="${test.unit.src}" includes="**/${test.name}.java" excludes="**/distributed/test/UpgradeTest*.java" />
+    </path>
+    <property name="all-test-classes" refid="all-test-classes-path"/>
+    <testhelper testdelegate="testlist"/>
+  </target>
+
+  <target name="generate-test-report" description="Generates JUnit's HTML report from results already in build/output">
+      <junitreport todir="${build.test.dir}">
+        <fileset dir="${build.test.dir}/output">
+          <include name="**/TEST-*.xml"/>
+        </fileset>
+        <report format="frames" todir="${build.test.dir}/junitreport"/>
+      </junitreport>
+  </target>
+
+  <!-- run a list of tests as provided in -Dtest.classlistfile (or default of 'testnames.txt')
+  The class list file should be one test class per line, with the path starting after test/unit
+  e.g. org/apache/cassandra/hints/HintMessageTest.java -->
+  <target name="testclasslist" depends="build-test" description="Run tests given in file -Dtest.classlistfile (one-class-per-line, e.g. org/apache/cassandra/db/SomeTest.java)">
+    <path id="all-test-classes-path">
+      <fileset dir="${test.dir}/${test.classlistprefix}" includesfile="${test.classlistfile}"/>
+    </path>
+    <property name="all-test-classes" refid="all-test-classes-path"/>
+    <testhelper testdelegate="testlist"/>
+  </target>
+  <target name="testclasslist-compression" depends="build-test" description="Run tests given in file -Dtest.classlistfile (one-class-per-line, e.g. org/apache/cassandra/db/SomeTest.java)">
+      <path id="all-test-classes-path">
+          <fileset dir="${test.dir}/${test.classlistprefix}" includesfile="${test.classlistfile}"/>
+      </path>
+      <property name="all-test-classes" refid="all-test-classes-path"/>
+      <testhelper testdelegate="testlist-compression"/>
+  </target>
+  <target name="testclasslist-cdc" depends="build-test" description="Run tests given in file -Dtest.classlistfile (one-class-per-line, e.g. org/apache/cassandra/db/SomeTest.java)">
+      <path id="all-test-classes-path">
+          <fileset dir="${test.dir}/${test.classlistprefix}" includesfile="${test.classlistfile}"/>
+      </path>
+      <property name="all-test-classes" refid="all-test-classes-path"/>
+      <testhelper testdelegate="testlist-cdc"/>
+  </target>
+  <target name="testclasslist-system-keyspace-directory" depends="build-test" description="Run tests given in file -Dtest.classlistfile (one-class-per-line, e.g. org/apache/cassandra/db/SomeTest.java)">
+      <path id="all-test-classes-path">
+          <fileset dir="${test.dir}/${test.classlistprefix}" includesfile="${test.classlistfile}"/>
+      </path>
+      <property name="all-test-classes" refid="all-test-classes-path"/>
+      <testhelper testdelegate="testlist-system-keyspace-directory"/>
+  </target>
+
+  <!-- Build a self-contained jar for e.g. remote execution; not currently used for running burn tests with this build script -->
+  <target name="burn-test-jar" depends="build-test, build" description="Create dtest-compatible jar, including all dependencies">
+      <jar jarfile="${build.dir}/burntest.jar">
+          <zipgroupfileset dir="${build.lib}" includes="*.jar" excludes="META-INF/*.SF"/>
+          <fileset dir="${build.classes.main}"/>
+          <fileset dir="${test.classes}"/>
+          <fileset dir="${test.conf}" excludes="logback*.xml"/>
+          <fileset dir="${basedir}/conf" includes="logback*.xml"/>
+          <zipgroupfileset dir="${build.dir.lib}/jars">
+              <include name="junit*.jar"/>
+          </zipgroupfileset>
+      </jar>
+  </target>
+
+  <target name="dtest-jar" depends="build-test, build" description="Create dtest-compatible jar, including all dependencies">
+      <jar jarfile="${build.dir}/dtest-${base.version}.jar">
+          <zipgroupfileset dir="${build.lib}" includes="*.jar" excludes="META-INF/*.SF"/>
+          <zipgroupfileset dir="${build.dir.lib}/jars" includes="javassist-*.jar,reflections-*.jar" excludes="META-INF/*.SF"/>
+          <fileset dir="${build.classes.main}"/>
+          <fileset dir="${test.classes}"/>
+          <fileset dir="${test.conf}" />
+      </jar>
+  </target>
+
+  <target name="test-jvm-dtest" depends="build-test" description="Execute in-jvm dtests">
+    <testmacro inputdir="${test.distributed.src}" timeout="${test.distributed.timeout}" forkmode="once" showoutput="true" filter="**/test/*Test.java">
+      <jvmarg value="-Dlogback.configurationFile=test/conf/logback-dtest.xml"/>
+      <jvmarg value="-Dcassandra.ring_delay_ms=10000"/>
+      <jvmarg value="-Dcassandra.tolerate_sstable_size=true"/>
+      <jvmarg value="-Dcassandra.skip_sync=true" />
+    </testmacro>
+  </target>
+
+  <target name="test-jvm-upgrade-dtest" depends="build-test" description="Execute in-jvm dtests">
+    <testmacro inputdir="${test.distributed.src}" timeout="${test.distributed.timeout}" forkmode="once" showoutput="true" filter="**/upgrade/*Test.java">
+      <jvmarg value="-Dlogback.configurationFile=test/conf/logback-dtest.xml"/>
+      <jvmarg value="-Dcassandra.ring_delay_ms=10000"/>
+      <jvmarg value="-Dcassandra.tolerate_sstable_size=true"/>
+      <jvmarg value="-Dcassandra.skip_sync=true" />
+    </testmacro>
+  </target>
+
+  <!-- Use this with an FQDN for test class, and an optional csv list of methods like this:
+      ant test-jvm-dtest-some -Dtest.name=org.apache.cassandra.distributed.test.ResourceLeakTest -Dtest.methods=looperTest
+    -->
+  <target name="test-jvm-dtest-some" depends="build-test" description="Execute some in-jvm dtests">
+    <testmacro inputdir="${test.distributed.src}" timeout="${test.distributed.timeout}" forkmode="once" showoutput="true">
+      <test unless:blank="${test.methods}" name="${test.name}" methods="${test.methods}" outfile="build/test/output/TEST-${test.name}-${test.methods}"/>
+      <test if:blank="${test.methods}" name="${test.name}" outfile="build/test/output/TEST-${test.name}"/>
+      <jvmarg value="-Dlogback.configurationFile=test/conf/logback-dtest.xml"/>
+      <jvmarg value="-Dcassandra.ring_delay_ms=10000"/>
+      <jvmarg value="-Dcassandra.tolerate_sstable_size=true"/>
+      <jvmarg value="-Dcassandra.skip_sync=true" />
+    </testmacro>
+  </target>
+
+  <!-- run microbenchmarks suite -->
+  <target name="microbench" depends="build-jmh">
+      <java classname="org.openjdk.jmh.Main"
+            fork="true"
+            failonerror="true">
+          <classpath>
+              <path refid="cassandra.classpath.test" />
+              <pathelement location="${test.classes}"/>
+              <pathelement location="${test.conf}"/>
+              <fileset dir="${test.lib}">
+                  <include name="**/*.jar" />
+              </fileset>
+          </classpath>
+          <arg value="-foe"/>
+          <arg value="true"/>
+          <arg value="-rf"/>
+          <arg value="json"/>
+          <arg value="-rff"/>
+          <arg value="${build.test.dir}/jmh-result.json"/>
+          <arg value="-v"/>
+          <arg value="EXTRA"/>
+
+          <!-- Broken: ZeroCopyStreamingBench,MutationBench,FastThreadLocalBench  (FIXME) -->
+          <arg value="-e"/><arg value="ZeroCopyStreamingBench|MutationBench|FastThreadLocalBench"/>
+
+          <arg value=".*microbench.*${benchmark.name}"/>
+      </java>
+  </target>
+
+  <!-- run arbitrary mains in tests, for example to run the long running memory tests with lots of memory pressure
+      ant run-main -Dmainclass=org.apache.cassandra.utils.memory.LongBufferPoolTest -Dvmargs="-Xmx30m -XX:-UseGCOverheadLimit"
+  -->
+  <target name="run-main" depends="build-test">
+      <property name="mainclass" value="" />
+      <property name="vmargs" value="" />
+      <property name="args" value="" />
+      <java classname="${mainclass}"
+            fork="true"
+            failonerror="true">
+          <jvmarg value="-server" />
+          <jvmarg value="-ea" />
+          <jvmarg line="${vmargs}" />
+          <arg line="${args}" />
+          <classpath>
+              <path refid="cassandra.classpath" />
+              <pathelement location="${test.classes}"/>
+              <pathelement location="${test.conf}"/>
+              <fileset dir="${test.lib}">
+                  <include name="**/*.jar" />
+              </fileset>
+          </classpath>
+      </java>
+  </target>
+
+  <target name="_maybe_update_idea_to_java11" if="java.version.11">
+    <replace file="${eclipse.project.name}.iml" token="JDK_1_8" value="JDK_11"/>
+    <replace file=".idea/misc.xml" token="JDK_1_8" value="JDK_11"/>
+    <replace file=".idea/misc.xml" token="1.8" value="11"/>
+    <replaceregexp file=".idea/workspace.xml"
+                   match="name=&quot;VM_PARAMETERS&quot; value=&quot;(.*)&quot;"
+                   replace="name=&quot;VM_PARAMETERS&quot; value=&quot;\1 ${java11-jvmargs}&quot;"
+                   byline="true"/>
+
+      <echo file=".idea/compiler.xml"><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="JavacSettings">
+    <option name="ADDITIONAL_OPTIONS_STRING" value="--add-exports java.rmi/sun.rmi.registry=ALL-UNNAMED" />
+  </component>
+</project>]]></echo>
+  </target>
+
+  <!-- Generate IDEA project description files -->
+  <target name="generate-idea-files" depends="init,maven-ant-tasks-init,resolver-dist-lib,gen-cql3-grammar,generate-jflex-java,createVersionPropFile" description="Generate IDEA files">
+    <mkdir dir=".idea"/>
+    <mkdir dir=".idea/libraries"/>
+    <copy todir=".idea" overwrite="true">
+        <fileset dir="ide/idea"/>
+    </copy>
+    <replace file=".idea/workspace.xml" token="trunk" value="${eclipse.project.name}"/>
+    <copy tofile="${eclipse.project.name}.iml" file="ide/idea-iml-file.xml"/>
+    <echo file=".idea/.name">Apache Cassandra ${eclipse.project.name}</echo>
+    <echo file=".idea/modules.xml"><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/]]>${eclipse.project.name}<![CDATA[.iml" filepath="$PROJECT_DIR$/]]>${eclipse.project.name}<![CDATA[.iml" />
+    </modules>
+  </component>
+</project>]]></echo>
+      <antcall target="_maybe_update_idea_to_java11"/>
+  </target>
+
+  <!-- Generate Eclipse project description files -->
+  <target name="generate-eclipse-files" depends="build-test" description="Generate eclipse files">
+    <echo file=".project"><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+  <name>${eclipse.project.name}</name>
+  <comment></comment>
+  <projects>
+  </projects>
+  <buildSpec>
+    <buildCommand>
+      <name>org.eclipse.jdt.core.javabuilder</name>
+    </buildCommand>
+  </buildSpec>
+  <natures>
+    <nature>org.eclipse.jdt.core.javanature</nature>
+  </natures>
+</projectDescription>]]>
+    </echo>
+    <echo file=".classpath"><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+  <classpathentry kind="src" path="src/java"/>
+  <classpathentry kind="src" path="src/resources"/>
+  <classpathentry kind="src" path="src/gen-java"/>
+  <classpathentry kind="src" path="conf" including="hotspot_compiler"/>
+  <classpathentry kind="src" output="build/test/classes" path="test/unit"/>
+  <classpathentry kind="src" output="build/test/classes" path="test/long"/>
+  <classpathentry kind="src" output="build/test/classes" path="test/distributed"/>
+  <classpathentry kind="src" output="build/test/classes" path="test/resources" />
+  <classpathentry kind="src" path="tools/stress/src"/>
+  <classpathentry kind="src" path="tools/fqltool/src"/>
+  <classpathentry kind="src" output="build/test/stress-classes" path="tools/stress/test/unit" />
+  <classpathentry kind="src" output="build/test/fqltool-classes" path="tools/fqltool/test/unit" />
+  <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+  <classpathentry kind="output" path="build/classes/eclipse"/>
+  <classpathentry kind="lib" path="test/conf"/>
+  <classpathentry kind="lib" path="${java.home}/../lib/tools.jar"/>
+]]>
+    </echo>
+      <path id="eclipse-project-libs-path">
+       <fileset dir="lib">
+          <include name="**/*.jar" />
+     </fileset>
+      <fileset dir="build/lib/jars">
+          <include name="**/*.jar" />
+       </fileset>
+     <fileset dir="build/test/lib/jars">
+        <include name="**/*.jar" />
+     </fileset>
+      </path>
+      <property name="eclipse-project-libs" refid="eclipse-project-libs-path"/>
+       <script language="javascript">
+        <classpath>
+            <path refid="cassandra.classpath"/>
+            <path refid="cassandra.classpath.test"/>
+        </classpath>
+        <![CDATA[
+        var File = java.io.File;
+          var FilenameUtils = Packages.org.apache.commons.io.FilenameUtils;
+          jars = project.getProperty("eclipse-project-libs").split(project.getProperty("path.separator"));
+
+          cp = "";
+          for (i=0; i< jars.length; i++) {
+             srcjar = FilenameUtils.getBaseName(jars[i]) + '-sources.jar';
+           srcdir = FilenameUtils.concat(project.getProperty("build.test.dir"), 'sources');
+             srcfile = new File(FilenameUtils.concat(srcdir, srcjar));
+
+             cp += ' <classpathentry kind="lib" path="' + jars[i] + '"';
+             if (srcfile.exists()) {
+                cp += ' sourcepath="' + srcfile.getAbsolutePath() + '"';
+             }
+             cp += '/>\n';
+          }
+
+          cp += '</classpath>';
+
+          echo = project.createTask("echo");
+          echo.setMessage(cp);
+          echo.setFile(new File(".classpath"));
+          echo.setAppend(true);
+          echo.perform();
+      ]]> </script>
+    <mkdir dir=".settings" />
+  </target>
+
+  <pathconvert property="eclipse.project.name">
+    <path path="${basedir}" />
+    <regexpmapper from="^.*/([^/]+)$$" to="\1" handledirsep="yes" />
+  </pathconvert>
+
+  <!-- Clean Eclipse project description files -->
+  <target name="clean-eclipse-files">
+    <delete file=".project" />
+    <delete file=".classpath" />
+    <delete dir=".settings" />
+      <delete dir=".externalToolBuilders" />
+      <delete dir="build/eclipse-classes" />
+  </target>
+
+  <!-- ECJ 4.6.1 in standalone mode does not work with JPMS, so we skip this target for Java 11 -->
+  <target name="eclipse-warnings" depends="build, _assert_rat_output" description="Run eclipse compiler code analysis" if="java.version.8">
+        <property name="ecj.log.dir" value="${build.dir}/ecj" />
+        <property name="ecj.warnings.file" value="${ecj.log.dir}/eclipse_compiler_checks.txt"/>
+        <mkdir  dir="${ecj.log.dir}" />
+
+        <property name="ecj.properties" value="${basedir}/eclipse_compiler.properties" />
+
+        <echo message="Running Eclipse Code Analysis.  Output logged to ${ecj.warnings.file}" />
+
+    <java
+        jar="${build.dir.lib}/jars/ecj-${ecj.version}.jar"
+            fork="true"
+        failonerror="true"
+            maxmemory="512m">
+            <arg value="-source"/>
+        <arg value="${source.version}" />
+        <arg value="-target"/>
+        <arg value="${target.version}" />
+        <arg value="-d" />
+            <arg value="none" />
+        <arg value="-proc:none" />
+            <arg value="-log" />
+            <arg value="${ecj.warnings.file}" />
+            <arg value="-properties" />
+            <arg value="${ecj.properties}" />
+            <arg value="-cp" />
+            <arg value="${toString:cassandra.classpath}" />
+            <arg value="${build.src.java}" />
+        </java>
+  </target>
+
+
+  <!-- Installs artifacts to local Maven repository -->
+  <target name="mvn-install"
+          depends="maven-declare-dependencies,jar,sources-jar,javadoc-jar"
+          description="Installs the artifacts in the Maven Local Repository">
+
+    <!-- the parent -->
+    <install pomFile="${build.dir}/${final.name}-parent.pom"
+             file="${build.dir}/${final.name}-parent.pom"
+             packaging="pom"/>
+
+    <!-- the cassandra-all jar -->
+    <install pomFile="${build.dir}/${final.name}.pom"
+             file="${build.dir}/${final.name}.jar"/>
+    <install pomFile="${build.dir}/${final.name}.pom"
+             file="${build.dir}/${final.name}-sources.jar"
+             classifier="sources"/>
+    <install pomFile="${build.dir}/${final.name}.pom"
+             file="${build.dir}/${final.name}-javadoc.jar"
+             classifier="javadoc"/>
+  </target>
+
+  <!-- Publish artifacts to remote Maven repository -->
+  <target name="publish"
+          depends="mvn-install,artifacts"
+          description="Publishes the artifacts to the Maven repository">
+
+    <!-- the parent -->
+    <deploy pomFile="${build.dir}/${final.name}-parent.pom"
+            file="${build.dir}/${final.name}-parent.pom"
+            packaging="pom"/>
+
+    <!-- the cassandra-all jar -->
+    <deploy pomFile="${build.dir}/${final.name}.pom"
+            file="${build.dir}/${final.name}.jar"/>
+    <deploy pomFile="${build.dir}/${final.name}.pom"
+            file="${build.dir}/${final.name}-sources.jar"
+            classifier="sources"/>
+    <deploy pomFile="${build.dir}/${final.name}.pom"
+            file="${build.dir}/${final.name}-javadoc.jar"
+            classifier="javadoc"/>
+
+    <!-- the distribution -->
+    <sign-dist file="${build.dir}/${final.name}-bin.tar.gz" />
+    <sign-dist file="${build.dir}/${final.name}-src.tar.gz" />
+
+  </target>
+
+  <import file="${basedir}/.build/build-resolver.xml"/>
+  <import file="${basedir}/.build/build-rat.xml"/>
+  <import file="${basedir}/.build/build-owasp.xml"/>
+</project>
diff --git a/databases/cassandra4/files/patch-bin_cqlsh b/databases/cassandra4/files/patch-bin_cqlsh
new file mode 100644
index 000000000000..8797af062ef5
--- /dev/null
+++ b/databases/cassandra4/files/patch-bin_cqlsh
@@ -0,0 +1,11 @@
+--- bin/cqlsh.orig	2022-05-06 16:40:06 UTC
++++ bin/cqlsh
+@@ -88,7 +88,7 @@ if [ "$USER_SPECIFIED_PYTHON" != "" ]; then
+     # run a user specified Python interpreter
+     run_if_supported_version "$USER_SPECIFIED_PYTHON" "$@"
+ else
+-    for interpreter in python3 python python2.7; do
++    for interpreter in python3 python3.9 python3.8 python3.7 python3.6 python python2.7; do
+         run_if_supported_version "$interpreter" "$@"
+     done
+ fi
diff --git a/databases/cassandra4/files/patch-build.xml b/databases/cassandra4/files/patch-build.xml
index 525d27889af5..260d784805f8 100644
--- a/databases/cassandra4/files/patch-build.xml
+++ b/databases/cassandra4/files/patch-build.xml
@@ -1,14 +1,14 @@
---- build.xml.orig	2020-08-28 13:55:55 UTC
+--- build.xml.orig	2022-07-12 10:18:13 UTC
 +++ build.xml
-@@ -23,6 +23,7 @@
+@@ -31,6 +31,7 @@
      <property file="build.properties" />
      <property file="build.properties.default" />
      <property name="debuglevel" value="source,lines,vars"/>
 +    <property name="pycmd" value="python"/>
  
      <!-- default version and SCM information -->
-     <property name="base.version" value="4.0-beta2"/>
-@@ -74,14 +75,14 @@
+     <property name="base.version" value="4.0.5"/>
+@@ -81,7 +82,7 @@
      <condition property="version" value="${base.version}">
        <isset property="release"/>
      </condition>
@@ -17,101 +17,59 @@
      <property name="version.properties.dir"
                value="${build.src.resources}/org/apache/cassandra/config/" />
      <property name="final.name" value="${ant.project.name}-${version}"/>
- 
-     <!-- details of what version of Maven ANT Tasks to fetch -->
-     <property name="maven-ant-tasks.version" value="2.1.3" />
--    <property name="maven-ant-tasks.local" value="${user.home}/.m2/repository/org/apache/maven/maven-ant-tasks"/>
-+    <property name="maven-ant-tasks.local" value="${localm2}/org/apache/maven/maven-ant-tasks"/>
-     <property name="maven-ant-tasks.url"
-               value="https://repo.maven.apache.org/maven2/org/apache/maven/maven-ant-tasks" />
-     <!-- details of how and which Maven repository we publish to -->
-@@ -271,7 +272,7 @@
+@@ -288,6 +289,24 @@
+             <exclude name="**/ant-*.jar"/>
+         </fileset>
      </path>
-     <path id="cassandra.classpath.test">
-         <file file="${build.dir}/${final.name}.jar"/> <!-- we need the jar for tests and benchmarks (multi-version jar) -->
--        <fileset dir="${build.lib}">
++    <path id="cassandra.classpath.staged">
++        <file file="${build.dir}/${final.name}.jar"/> <!-- we need the jar for tests and benchmarks (multi-version jar) -->
 +        <fileset dir="${stagedlib}">
-             <include name="**/*.jar" />
-             <exclude name="**/*-sources.jar"/>
-             <exclude name="**/ant-*.jar"/>
-@@ -291,7 +292,7 @@
++            <include name="**/*.jar" />
++        </fileset>
++        <fileset dir="${build.dir.lib}">
++            <include name="**/assertj-core-3.15.0.jar" />
++            <include name="**/byteman*.jar" />
++            <include name="**/commons-lang-2.4.jar" />
++            <include name="**/commons-collections-3.2.1.jar" />
++            <include name="**/ohc-core-0.5.1.jar" />
++            <include name="**/ohc-core-j8-0.5.1.jar" />
++        </fileset>
++        <fileset dir="${test.lib}/jars">
++            <include name="**/*.jar" />
++            <exclude name="**/ant-*.jar"/>
++        </fileset>
++    </path>
+ 
+   <macrodef name="create-javadoc">
+     <attribute name="destdir"/>
+@@ -297,7 +316,7 @@
          windowtitle="${ant.project.name} API" classpathref="cassandra.classpath"
-         bottom="Copyright &amp;copy; 2009-2020 The Apache Software Foundation"
+         bottom="Copyright &amp;copy; 2009-2022 The Apache Software Foundation"
          useexternalfile="yes" encoding="UTF-8" failonerror="false"
 -        maxmemory="256m" additionalparam="${jdk11-javadoc-exports}">
 +        maxmemory="512m" additionalparam="${jdk11-javadoc-exports}">
          <filesets/>
        </javadoc>
        <fail message="javadoc failed">
-@@ -416,8 +417,7 @@
-         <artifact:dependencies pathId="wikitext.classpath">
-             <dependency groupId="com.datastax.wikitext" artifactId="wikitext-core-ant" version="1.3"/>
-             <dependency groupId="org.fusesource.wikitext" artifactId="textile-core" version="1.3"/>
--            <remoteRepository refid="central"/>
--            <remoteRepository refid="apache"/>
-+            <localRepository path="${localm2}"/>
-         </artifact:dependencies>
-         <taskdef classpathref="wikitext.classpath" resource="wikitexttasks.properties" />
-         <wikitext-to-html markupLanguage="Textile">
-@@ -430,6 +430,8 @@
-     <target name="gen-doc" depends="maven-ant-tasks-init" description="Generate documentation" unless="ant.gen-doc.skip">
+@@ -438,6 +457,8 @@
+     <target name="gen-doc" description="Generate documentation" depends="gen-asciidoc,generate-cql-html" unless="ant.gen-doc.skip">
          <exec executable="make" osfamily="unix" dir="${doc.dir}">
              <arg value="html"/>
 +            <arg value="PYTHON_CMD=${pycmd}"/>
 +            <arg value="PYTHON_VER=${pyver}"/>
          </exec>
-         <exec executable="cmd" osfamily="dos" dir="${doc.dir}">
-             <arg value="/c"/>
-@@ -472,10 +474,6 @@
-             description="Initialize Maven ANT Tasks">
-       <typedef uri="antlib:org.apache.maven.artifact.ant" classpathref="maven-ant-tasks.classpath" />
+     </target>
  
--      <!-- define the remote repositories we use -->
--      <artifact:remoteRepository id="central"   url="${artifact.remoteRepository.central}"/>
--      <artifact:remoteRepository id="apache"    url="${artifact.remoteRepository.apache}"/>
--
-       <macrodef name="install">
-         <attribute name="pomFile"/>
-         <attribute name="file"/>
-@@ -889,16 +887,14 @@
-                              filesetId="build-dependency-jars"
-                              cacheDependencyRefs="true"
-                              dependencyRefsBuildFile="${build.dir}/build-dependencies.xml">
--          <remoteRepository refid="central"/>
--          <remoteRepository refid="apache"/>
-+          <localRepository path="${localm2}"/>
-       </artifact:dependencies>
-       <!-- retrieve -source.jar artifacts using the reference-pom with the artifacts that have these -->
-       <artifact:dependencies pomRefId="build-deps-pom-sources"
-                              sourcesFilesetId="build-dependency-sources"
-                              cacheDependencyRefs="true"
-                              dependencyRefsBuildFile="${build.dir}/build-dependencies-sources.xml">
--          <remoteRepository refid="central"/>
--          <remoteRepository refid="apache"/>
-+          <localRepository path="${localm2}"/>
-       </artifact:dependencies>
-       <copy todir="${build.dir.lib}/jars">
-           <fileset refid="build-dependency-jars"/>
-@@ -911,7 +907,7 @@
-       <!-- code coverage tools -->
-       <artifact:dependencies pomRefId="coverage-deps-pom"
-                              filesetId="coverage-dependency-jars">
--          <remoteRepository refid="central"/>
-+          <localRepository path="${localm2}"/>
-       </artifact:dependencies>
-       <copy todir="${build.dir.lib}/jars">
-           <fileset refid="coverage-dependency-jars"/>
-@@ -940,8 +936,7 @@
-                              sourcesFilesetId="test-dependency-sources"
-                              cacheDependencyRefs="true"
-                              dependencyRefsBuildFile="${build.dir}/test-dependencies.xml">
--        <remoteRepository refid="apache"/>
--        <remoteRepository refid="central"/>
-+        <localRepository path="${localm2}"/>
-       </artifact:dependencies>
-       <copy todir="${test.lib}/jars">
-         <fileset refid="test-dependency-jars"/>
-@@ -1251,6 +1246,87 @@
+@@ -896,7 +917,7 @@
+         </javac>
+     </target>
+ 
+-    <target depends="init,gen-cql3-grammar,generate-cql-html,generate-jflex-java,rat-check"
++    <target depends="init,gen-cql3-grammar,generate-cql-html,generate-jflex-java"
+             name="build-project">
+         <echo message="${ant.project.name}: ${ant.file}"/>
+         <!-- Order matters! -->
+@@ -1147,6 +1168,89 @@
        </copy>
      </target>
  
@@ -127,7 +85,7 @@
 +          <exclude name="netty-all*.jar"/>
 +          <exclude name="ohc*.jar"/>
 +          <exclude name="licenses/snappy*.txt"/>
-+          <exclude name="licenses/netty-4*.txt"/>
++          <exclude name="licenses/netty-all*.txt"/>
 +          <exclude name="licenses/ohc*.txt"/>
 +        </fileset>
 +        <fileset dir="${build.dir}">
@@ -152,6 +110,8 @@
 +          <include name="**" />
 +          <exclude name="**/*.pyc" />
 +          <exclude name="Dockerfile.ubuntu.*" />
++          <exclude name="cqlshlib/test/**" />
++          <exclude name="cassandra-cqlsh-tests.sh" />
 +        </fileset>
 +      </copy>
 +      <copy todir="${dist.dir}/">
@@ -197,36 +157,23 @@
 +    </target>
 +    
      <!-- creates release tarballs -->
-     <target name="artifacts" depends="_artifacts-init"
+     <target name="artifacts" depends="_artifacts-init,gen-doc,sources-jar,javadoc-jar"
              description="Create Cassandra release artifacts">
-@@ -1371,6 +1447,7 @@
-   <target name="_build-test">
-     <javac
-      fork="true"
-+     memorymaximumsize="512M"
-      compiler="modern"
-      debug="true"
-      debuglevel="${debuglevel}"
-@@ -1960,8 +2037,8 @@
-     <exec executable="nproc" outputproperty="cores.count" os="Linux,SunOS,Solaris" failifexecutionfails="false">
-       <arg value="--all"/>
-     </exec>
--    <!-- support for Mac OS X -->
--    <exec executable="sysctl" outputproperty="cores.count" os="Mac,Mac OS X,Darwin" failifexecutionfails="false">
-+    <!-- support for Mac OS X and FreeBSD -->
-+    <exec executable="sysctl" outputproperty="cores.count" os="Mac,Mac OS X,Darwin,FreeBSD" failifexecutionfails="false">
-       <arg value="-n"/>
-       <arg value="hw.ncpu"/>
-     </exec>
-@@ -1981,6 +2058,11 @@
-     <exec executable="sysctl" outputproperty="mem.size" os="Mac,Mac OS X,Darwin" failifexecutionfails="false">
-       <arg value="-n"/>
-       <arg value="hw.memsize"/>
-+    </exec>
-+    <!-- support for FreeBSD -->
-+    <exec executable="sysctl" outputproperty="mem.size" os="FreeBSD" failifexecutionfails="false">
-+      <arg value="-n"/>
-+      <arg value="hw.physmem"/>
-     </exec>
-     <echo message="Mem size : ${mem.size}"/>
+@@ -1397,7 +1501,7 @@
+           <pathelement path="${java.class.path}"/>
+           <pathelement location="${stress.build.classes}"/>
+           <pathelement location="${fqltool.build.classes}"/>
+-          <path refid="cassandra.classpath.test" />
++          <path refid="cassandra.classpath.staged" />
+           <pathelement location="${test.classes}"/>
+           <pathelement location="${stress.test.classes}"/>
+           <pathelement location="${fqltool.test.classes}"/>
+@@ -2089,7 +2193,7 @@
    </target>
+ 
+   <!-- ECJ 4.6.1 in standalone mode does not work with JPMS, so we skip this target for Java 11 -->
+-  <target name="eclipse-warnings" depends="build, _assert_rat_output" description="Run eclipse compiler code analysis" if="java.version.8">
++  <target name="eclipse-warnings" depends="build" description="Run eclipse compiler code analysis" if="java.version.8">
+         <property name="ecj.log.dir" value="${build.dir}/ecj" />
+         <property name="ecj.warnings.file" value="${ecj.log.dir}/eclipse_compiler_checks.txt"/>
+         <mkdir  dir="${ecj.log.dir}" />
diff --git a/databases/cassandra4/files/patch-conf_cassandra.yaml b/databases/cassandra4/files/patch-conf_cassandra.yaml
index e0a14634891b..ceb30f186b12 100644
--- a/databases/cassandra4/files/patch-conf_cassandra.yaml
+++ b/databases/cassandra4/files/patch-conf_cassandra.yaml
@@ -1,6 +1,6 @@
---- conf/cassandra.yaml.orig	2020-07-17 21:24:30 UTC
+--- conf/cassandra.yaml.orig	2022-05-06 16:40:06 UTC
 +++ conf/cassandra.yaml
-@@ -73,7 +73,7 @@ max_hints_delivery_threads: 2
+@@ -77,7 +77,7 @@ max_hints_delivery_threads: 2
  
  # Directory where Cassandra should store hints.
  # If not set, the default directory is $CASSANDRA_HOME/data/hints.
@@ -9,7 +9,7 @@
  
  # How often hints should be flushed from the internal buffers to disk.
  # Will *not* trigger fsync.
-@@ -200,13 +200,13 @@ partitioner: org.apache.cassandra.dht.Murmur3Partition
+@@ -204,8 +204,8 @@ partitioner: org.apache.cassandra.dht.Murmur3Partition
  # directories are specified, Cassandra will spread data evenly across 
  # them by partitioning the token ranges.
  # If not set, the default directory is $CASSANDRA_HOME/data/data.
@@ -18,6 +18,9 @@
 +data_file_directories:
 +    - /var/db/cassandra/data
  
+ # Directory were Cassandra should store the data of the local system keyspaces.
+ # By default Cassandra will store the data of the local system keyspaces in the first of the data directories specified
+@@ -217,7 +217,7 @@ partitioner: org.apache.cassandra.dht.Murmur3Partition
  # commit log.  when running on magnetic HDD, this should be a
  # separate spindle than the data directories.
  # If not set, the default directory is $CASSANDRA_HOME/data/commitlog.
@@ -26,7 +29,7 @@
  
  # Enable / disable CDC functionality on a per-node basis. This modifies the logic used
  # for write path allocation rejection (standard: never reject. cdc: reject Mutation
-@@ -217,7 +217,7 @@ cdc_enabled: false
+@@ -228,7 +228,7 @@ cdc_enabled: false
  # segment contains mutations for a CDC-enabled table. This should be placed on a
  # separate spindle than the data directories. If not set, the default directory is
  # $CASSANDRA_HOME/data/cdc_raw.
@@ -35,7 +38,7 @@
  
  # Policy for data disk failures:
  #
-@@ -309,20 +309,12 @@ key_cache_save_period: 14400
+@@ -320,20 +320,12 @@ key_cache_save_period: 14400
  
  # Row cache implementation class name. Available implementations:
  #
@@ -57,12 +60,12 @@
  #
  # Default value is 0, to disable row caching.
  row_cache_size_in_mb: 0
-@@ -369,7 +361,7 @@ counter_cache_save_period: 7200
+@@ -380,7 +372,7 @@ counter_cache_save_period: 7200
  
  # saved caches
  # If not set, the default directory is $CASSANDRA_HOME/data/saved_caches.
 -# saved_caches_directory: /var/lib/cassandra/saved_caches
 +saved_caches_directory: /var/db/cassandra/saved_caches
  
- # commitlog_sync may be either "periodic", "group", or "batch." 
- # 
+ # Number of seconds the server will wait for each cache (row, key, etc ...) to load while starting
+ # the Cassandra process. Setting this to a negative value is equivalent to disabling all cache loading on startup
diff --git a/databases/cassandra4/files/patch-doc_Makefile b/databases/cassandra4/files/patch-doc_Makefile
deleted file mode 100644
index b47ccff34712..000000000000
--- a/databases/cassandra4/files/patch-doc_Makefile
+++ /dev/null
@@ -1,23 +0,0 @@
---- doc/Makefile.orig	2020-01-30 17:34:31 UTC
-+++ doc/Makefile
-@@ -3,7 +3,7 @@
- 
- # You can set these variables from the command line.
- SPHINXOPTS    =
--SPHINXBUILD   = sphinx-build
-+SPHINXBUILD   = sphinx-build-${PYTHON_VER}
- PAPER         =
- BUILDDIR      = build
- 
-@@ -17,9 +17,9 @@ I18NSPHINXOPTS  = $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) s
- YAML_DOC_INPUT=../conf/cassandra.yaml
- YAML_DOC_OUTPUT=source/configuration/cassandra_config_file.rst
- 
--MAKE_CASSANDRA_YAML = python convert_yaml_to_rst.py $(YAML_DOC_INPUT) $(YAML_DOC_OUTPUT)
-+MAKE_CASSANDRA_YAML = ${PYTHON_CMD} convert_yaml_to_rst.py $(YAML_DOC_INPUT) $(YAML_DOC_OUTPUT)
- 
--GENERATE_NODETOOL_DOCS = python gen-nodetool-docs.py
-+GENERATE_NODETOOL_DOCS = ${PYTHON_CMD} gen-nodetool-docs.py
- 
- WEB_SITE_PRESENCE_FILE='source/.build_for_website'
- 
diff --git a/databases/cassandra4/files/patch-doc_source___templates_indexcontent.html b/databases/cassandra4/files/patch-doc_source___templates_indexcontent.html
deleted file mode 100644
index 98f93b30a521..000000000000
--- a/databases/cassandra4/files/patch-doc_source___templates_indexcontent.html
+++ /dev/null
@@ -1,17 +0,0 @@
---- doc/source/_templates/indexcontent.html.orig	2020-08-28 13:55:55 UTC
-+++ doc/source/_templates/indexcontent.html
-@@ -1,5 +1,12 @@
--{% extends "defindex.html" %}
--{% block tables %}
-+{% extends "layout.html" %}
-+{%- block htmltitle -%}
-+<title>{{ html_title }}</title>
-+{%- endblock -%}
-+{% block body %}
-+  <h1>{{ docstitle|e }}</h1>
-+  <p>
-+  {% trans %}Welcome! This is the documentation for Apache Cassandra {{ version }}.{% endtrans %}
-+  </p>
- <div id="wipwarning">This documentation is a work-in-progress.
-     <a href="{{ pathto("bugs") }}">Contributions</a> are welcome.</div>
- 
diff --git a/databases/cassandra4/files/patch-doc_source___util_cql.py b/databases/cassandra4/files/patch-doc_source___util_cql.py
deleted file mode 100644
index 33bb6108a90a..000000000000
--- a/databases/cassandra4/files/patch-doc_source___util_cql.py
+++ /dev/null
@@ -1,10 +0,0 @@
---- doc/source/_util/cql.py.orig	2020-10-03 15:05:17 UTC
-+++ doc/source/_util/cql.py
-@@ -26,7 +26,6 @@ from pygments.lexer import Lexer, RegexLexer, do_inser
- from pygments.token import Punctuation, Whitespace, Error, \
-     Text, Comment, Operator, Keyword, Name, String, Number, Generic, Literal
- from pygments.lexers import get_lexer_by_name, ClassNotFound
--from pygments.util import iteritems
- 
- __all__ = [ 'CQLLexer' ]
- 
diff --git a/databases/cassandra4/files/patch-src_java_org_apache_cassandra_config_Config.java b/databases/cassandra4/files/patch-src_java_org_apache_cassandra_config_Config.java
index 7983231aeb11..86e8c2a152bf 100644
--- a/databases/cassandra4/files/patch-src_java_org_apache_cassandra_config_Config.java
+++ b/databases/cassandra4/files/patch-src_java_org_apache_cassandra_config_Config.java
@@ -1,6 +1,6 @@
---- src/java/org/apache/cassandra/config/Config.java.orig	2020-08-28 13:55:55 UTC
+--- src/java/org/apache/cassandra/config/Config.java.orig	2022-05-06 16:40:06 UTC
 +++ src/java/org/apache/cassandra/config/Config.java
-@@ -290,7 +290,7 @@ public class Config
+@@ -304,7 +304,7 @@ public class Config
      public volatile int key_cache_save_period = 14400;
      public volatile int key_cache_keys_to_save = Integer.MAX_VALUE;
  
diff --git a/databases/cassandra4/files/patch-src_java_org_apache_cassandra_service_NativeTransportService.java b/databases/cassandra4/files/patch-src_java_org_apache_cassandra_service_NativeTransportService.java
index ddc683881057..1b1c2d0aadf3 100644
--- a/databases/cassandra4/files/patch-src_java_org_apache_cassandra_service_NativeTransportService.java
+++ b/databases/cassandra4/files/patch-src_java_org_apache_cassandra_service_NativeTransportService.java
@@ -1,6 +1,6 @@
---- src/java/org/apache/cassandra/service/NativeTransportService.java.orig	2020-04-01 19:54:51 UTC
+--- src/java/org/apache/cassandra/service/NativeTransportService.java.orig	2020-12-18 17:35:13 UTC
 +++ src/java/org/apache/cassandra/service/NativeTransportService.java
-@@ -143,12 +143,15 @@ public class NativeTransportService
+@@ -159,12 +159,15 @@ public class NativeTransportService
       */
      public static boolean useEpoll()
      {
diff --git a/databases/cassandra4/files/patch-src_java_org_apache_cassandra_service_StartupChecks.java b/databases/cassandra4/files/patch-src_java_org_apache_cassandra_service_StartupChecks.java
index c562d9011acd..6f62b1c83ef8 100644
--- a/databases/cassandra4/files/patch-src_java_org_apache_cassandra_service_StartupChecks.java
+++ b/databases/cassandra4/files/patch-src_java_org_apache_cassandra_service_StartupChecks.java
@@ -1,4 +1,4 @@
---- src/java/org/apache/cassandra/service/StartupChecks.java.orig	2020-08-28 13:55:56 UTC
+--- src/java/org/apache/cassandra/service/StartupChecks.java.orig	2021-03-26 19:57:28 UTC
 +++ src/java/org/apache/cassandra/service/StartupChecks.java
 @@ -281,7 +281,14 @@ public class StartupChecks
      {
diff --git a/databases/cassandra4/files/patch-src_java_org_apache_cassandra_utils_FastByteOperations.java b/databases/cassandra4/files/patch-src_java_org_apache_cassandra_utils_FastByteOperations.java
index 8ccde2695304..3f18ded96bcb 100644
--- a/databases/cassandra4/files/patch-src_java_org_apache_cassandra_utils_FastByteOperations.java
+++ b/databases/cassandra4/files/patch-src_java_org_apache_cassandra_utils_FastByteOperations.java
@@ -1,6 +1,6 @@
---- src/java/org/apache/cassandra/utils/FastByteOperations.java.orig	2020-03-30 16:37:37 UTC
+--- src/java/org/apache/cassandra/utils/FastByteOperations.java.orig	2020-12-18 17:35:13 UTC
 +++ src/java/org/apache/cassandra/utils/FastByteOperations.java
-@@ -191,6 +191,20 @@ public class FastByteOperations
+@@ -205,6 +205,20 @@ public class FastByteOperations
  
          static final boolean BIG_ENDIAN = ByteOrder.nativeOrder().equals(ByteOrder.BIG_ENDIAN);
  
@@ -21,7 +21,7 @@
          public int compare(byte[] buffer1, int offset1, int length1, byte[] buffer2, int offset2, int length2)
          {
              return compareTo(buffer1, BYTE_ARRAY_BASE_OFFSET + offset1, length1,
-@@ -214,7 +228,7 @@ public class FastByteOperations
+@@ -228,7 +242,7 @@ public class FastByteOperations
              else
              {
                  obj1 = null;
@@ -30,7 +30,7 @@
              }
  
              return compareTo(obj1, offset1, length1, buffer2, BYTE_ARRAY_BASE_OFFSET + offset2, length2);
-@@ -230,7 +244,7 @@ public class FastByteOperations
+@@ -249,7 +263,7 @@ public class FastByteOperations
              if (src.hasArray())
                  System.arraycopy(src.array(), src.arrayOffset() + srcPosition, trg, trgPosition, length);
              else
@@ -38,8 +38,8 @@
 +                copy(null, srcPosition + unsafeGetLong(src, DIRECT_BUFFER_ADDRESS_OFFSET), trg, trgPosition, length);
          }
  
-         public void copy(ByteBuffer srcBuf, int srcPosition, ByteBuffer trgBuf, int trgPosition, int length)
-@@ -245,7 +259,7 @@ public class FastByteOperations
+         public void copy(byte[] src, int srcPosition, ByteBuffer trg, int trgPosition, int length)
+@@ -272,7 +286,7 @@ public class FastByteOperations
              else
              {
                  src = null;
@@ -48,7 +48,7 @@
              }
              copy(src, srcOffset + srcPosition, trgBuf, trgPosition, length);
          }
-@@ -255,7 +269,7 @@ public class FastByteOperations
+@@ -282,7 +296,7 @@ public class FastByteOperations
              if (trgBuf.hasArray())
                  copy(src, srcOffset, trgBuf.array(), trgBuf.arrayOffset() + trgPosition, length);
              else
@@ -57,7 +57,7 @@
          }
  
          public static void copy(Object src, long srcOffset, byte[] trg, int trgPosition, int length)
-@@ -263,7 +277,7 @@ public class FastByteOperations
+@@ -290,7 +304,7 @@ public class FastByteOperations
              if (length <= MIN_COPY_THRESHOLD)
              {
                  for (int i = 0 ; i < length ; i++)
@@ -66,7 +66,7 @@
              }
              else
              {
-@@ -302,7 +316,7 @@ public class FastByteOperations
+@@ -329,7 +343,7 @@ public class FastByteOperations
              else
              {
                  obj1 = null;
@@ -75,7 +75,7 @@
              }
              offset1 += buffer1.position();
              length1 = buffer1.remaining();
-@@ -325,7 +339,7 @@ public class FastByteOperations
+@@ -352,7 +366,7 @@ public class FastByteOperations
              else
              {
                  obj2 = null;
@@ -84,7 +84,7 @@
              }
              int length2 = limit - position;
              offset2 += position;
-@@ -358,8 +372,8 @@ public class FastByteOperations
+@@ -385,8 +399,8 @@ public class FastByteOperations
              int wordComparisons = minLength & ~7;
              for (int i = 0; i < wordComparisons ; i += Longs.BYTES)
              {
@@ -95,7 +95,7 @@
  
                  if (lw != rw)
                  {
-@@ -372,8 +386,8 @@ public class FastByteOperations
+@@ -399,8 +413,8 @@ public class FastByteOperations
  
              for (int i = wordComparisons ; i < minLength ; i++)
              {
diff --git a/databases/cassandra4/files/patch-test_conf_cassandra-murmur.yaml b/databases/cassandra4/files/patch-test_conf_cassandra-murmur.yaml
new file mode 100644
index 000000000000..b9ec0a7b5450
--- /dev/null
+++ b/databases/cassandra4/files/patch-test_conf_cassandra-murmur.yaml
@@ -0,0 +1,10 @@
+--- test/conf/cassandra-murmur.yaml.orig	2021-05-25 15:24:22 UTC
++++ test/conf/cassandra-murmur.yaml
+@@ -36,7 +36,6 @@ server_encryption_options:
+ incremental_backups: true
+ concurrent_compactors: 4
+ compaction_throughput_mb_per_sec: 0
+-row_cache_class_name: org.apache.cassandra.cache.OHCProvider
+ row_cache_size_in_mb: 16
+ enable_user_defined_functions: true
+ enable_scripted_user_defined_functions: true
diff --git a/databases/cassandra4/files/patch-test_conf_cassandra-seeds.yaml b/databases/cassandra4/files/patch-test_conf_cassandra-seeds.yaml
new file mode 100644
index 000000000000..af236bca394c
--- /dev/null
+++ b/databases/cassandra4/files/patch-test_conf_cassandra-seeds.yaml
@@ -0,0 +1,10 @@
+--- test/conf/cassandra-seeds.yaml.orig	2021-05-25 15:24:52 UTC
++++ test/conf/cassandra-seeds.yaml
+@@ -37,7 +37,6 @@ server_encryption_options:
+ incremental_backups: true
+ concurrent_compactors: 4
+ compaction_throughput_mb_per_sec: 0
+-row_cache_class_name: org.apache.cassandra.cache.OHCProvider
+ row_cache_size_in_mb: 16
+ enable_user_defined_functions: true
+ enable_scripted_user_defined_functions: true
diff --git a/databases/cassandra4/files/patch-test_conf_unit-test-conf_test-native-port.yaml b/databases/cassandra4/files/patch-test_conf_unit-test-conf_test-native-port.yaml
new file mode 100644
index 000000000000..72ab0ee6d9af
--- /dev/null
+++ b/databases/cassandra4/files/patch-test_conf_unit-test-conf_test-native-port.yaml
@@ -0,0 +1,10 @@
+--- test/conf/unit-test-conf/test-native-port.yaml.orig	2021-05-25 15:19:42 UTC
++++ test/conf/unit-test-conf/test-native-port.yaml
+@@ -40,7 +40,6 @@ server_encryption_options:
+ incremental_backups: true
+ concurrent_compactors: 4
+ compaction_throughput_mb_per_sec: 0
+-row_cache_class_name: org.apache.cassandra.cache.OHCProvider
+ row_cache_size_in_mb: 16
+ enable_user_defined_functions: true
+ enable_scripted_user_defined_functions: true
diff --git a/databases/cassandra4/pkg-descr b/databases/cassandra4/pkg-descr
index 84cd178dbc3f..32774a3354f5 100644
--- a/databases/cassandra4/pkg-descr
+++ b/databases/cassandra4/pkg-descr
@@ -12,5 +12,3 @@ The CQL query language offers SQL-like data access and management.
 Drivers are available for a number of languages.
 
 This is a BETA version!
-
-WWW: https://cassandra.apache.org/
diff --git a/databases/cassandra4/pkg-plist b/databases/cassandra4/pkg-plist
index 017e819e91ca..da8be43e7b34 100644
--- a/databases/cassandra4/pkg-plist
+++ b/databases/cassandra4/pkg-plist
@@ -15,14 +15,14 @@
 %%DATADIR%%/lib/antlr-runtime-3.5.2.jar
 %%DATADIR%%/lib/apache-cassandra-%%DISTVERSION%%.jar
 %%DATADIR%%/lib/asm-7.1.jar
-%%DATADIR%%/lib/caffeine-2.3.5.jar
-%%DATADIR%%/lib/cassandra-driver-core-3.9.0-shaded.jar
-%%DATADIR%%/lib/cassandra-driver-internal-only-3.23.0.post0-1a184b99.zip
-%%DATADIR%%/lib/chronicle-bytes-1.16.3.jar
-%%DATADIR%%/lib/chronicle-core-1.16.4.jar
-%%DATADIR%%/lib/chronicle-queue-4.16.3.jar
-%%DATADIR%%/lib/chronicle-threads-1.16.0.jar
-%%DATADIR%%/lib/chronicle-wire-1.16.1.jar
+%%DATADIR%%/lib/caffeine-2.5.6.jar
+%%DATADIR%%/lib/cassandra-driver-core-3.11.0-shaded.jar
+%%DATADIR%%/lib/cassandra-driver-internal-only-3.25.0.zip
+%%DATADIR%%/lib/chronicle-bytes-2.20.111.jar
+%%DATADIR%%/lib/chronicle-core-2.20.126.jar
+%%DATADIR%%/lib/chronicle-queue-5.20.123.jar
+%%DATADIR%%/lib/chronicle-threads-2.20.111.jar
+%%DATADIR%%/lib/chronicle-wire-2.20.117.jar
 %%DATADIR%%/lib/commons-cli-1.1.jar
 %%DATADIR%%/lib/commons-codec-1.9.jar
 %%DATADIR%%/lib/commons-lang3-3.11.jar
@@ -36,85 +36,30 @@
 %%DATADIR%%/lib/high-scale-lib-1.0.6.jar
 %%DATADIR%%/lib/hppc-0.8.1.jar
 %%DATADIR%%/lib/j2objc-annotations-1.3.jar
-%%DATADIR%%/lib/jackson-annotations-2.9.10.jar
-%%DATADIR%%/lib/jackson-core-2.9.10.jar
-%%DATADIR%%/lib/jackson-databind-2.9.10.4.jar
+%%DATADIR%%/lib/jackson-annotations-2.13.2.jar
+%%DATADIR%%/lib/jackson-core-2.13.2.jar
+%%DATADIR%%/lib/jackson-databind-2.13.2.2.jar
 %%DATADIR%%/lib/jamm-0.3.2.jar
-%%DATADIR%%/lib/javax.inject.jar
-%%DATADIR%%/lib/jbcrypt-0.3m.jar
+%%DATADIR%%/lib/java-cup-runtime-11b-20160615.jar
+%%DATADIR%%/lib/javax.inject-1.jar
+%%DATADIR%%/lib/jbcrypt-0.4.jar
 %%DATADIR%%/lib/jcl-over-slf4j-1.7.25.jar
 %%DATADIR%%/lib/jcommander-1.30.jar
-%%DATADIR%%/lib/jctools-core-1.2.1.jar
-%%DATADIR%%/lib/jflex-1.6.0.jar
-%%DATADIR%%/lib/jna-4.2.2.jar
+%%DATADIR%%/lib/jctools-core-3.1.0.jar
+%%DATADIR%%/lib/jflex-1.8.2.jar
+%%DATADIR%%/lib/jna-5.6.0.jar
 %%DATADIR%%/lib/json-simple-1.1.jar
-%%DATADIR%%/lib/jstackjunit-0.0.1.jar
 %%DATADIR%%/lib/jvm-attach-api-1.5.jar
-%%DATADIR%%/lib/licenses/airline-0.8.txt
-%%DATADIR%%/lib/licenses/antlr-runtime-3.5.2.txt
-%%DATADIR%%/lib/licenses/asm-6.2.txt
-%%DATADIR%%/lib/licenses/caffeine-2.3.5.txt
-%%DATADIR%%/lib/licenses/cassandra-driver-3.0.1.txt
-%%DATADIR%%/lib/licenses/chronicle-bytes-1.16.3.txt
-%%DATADIR%%/lib/licenses/chronicle-core-1.16.3-SNAPSHOT.txt
-%%DATADIR%%/lib/licenses/chronicle-queue-4.16.3.txt
-%%DATADIR%%/lib/licenses/chronicle-threads-1.16.0.txt
-%%DATADIR%%/lib/licenses/chronicle-wire-1.16.1.txt
-%%DATADIR%%/lib/licenses/commons-cli-1.1.txt
-%%DATADIR%%/lib/licenses/commons-codec-1.9.txt
-%%DATADIR%%/lib/licenses/commons-lang3-3.1.txt
-%%DATADIR%%/lib/licenses/commons-math3-3.2.txt
-%%DATADIR%%/lib/licenses/compress-lzf-0.8.4.txt
-%%DATADIR%%/lib/licenses/concurrent-trees-2.4.0.txt
-%%DATADIR%%/lib/licenses/ecj-4.6.1.txt
-%%DATADIR%%/lib/licenses/futures-2.1.6.txt
-%%DATADIR%%/lib/licenses/geom-0.1.0.txt
-%%DATADIR%%/lib/licenses/guava-23.3-jre.txt
-%%DATADIR%%/lib/licenses/hdrhistogram-2.1.9.txt
-%%DATADIR%%/lib/licenses/high-scale-lib-1.0.6.txt
-%%DATADIR%%/lib/licenses/hppc-0.5.4.txt
-%%DATADIR%%/lib/licenses/j2objc-annotations-1.3.txt
-%%DATADIR%%/lib/licenses/jackson-annotations-2.9.5.txt
-%%DATADIR%%/lib/licenses/jackson-core-2.9.5.txt
-%%DATADIR%%/lib/licenses/jackson-databind-2.9.5.txt
-%%DATADIR%%/lib/licenses/jamm-0.3.2.txt
-%%DATADIR%%/lib/licenses/javax.inject.txt
-%%DATADIR%%/lib/licenses/jbcrypt-0.3m.txt
-%%DATADIR%%/lib/licenses/jcl-over-slf4j-1.7.25.txt
-%%DATADIR%%/lib/licenses/jctools-core-1.2.1.txt
-%%DATADIR%%/lib/licenses/jflex-1.6.0.txt
-%%DATADIR%%/lib/licenses/jna-4.2.2.txt
-%%DATADIR%%/lib/licenses/joda-time-2.4.txt
-%%DATADIR%%/lib/licenses/json-simple-1.1.txt
-%%DATADIR%%/lib/licenses/jstackjunit-0.0.1.txt
-%%DATADIR%%/lib/licenses/LICENSE-2.0.txt
-%%DATADIR%%/lib/licenses/log4j-over-slf4j-1.7.25.txt
-%%DATADIR%%/lib/licenses/logback-classic-1.2.3.txt
-%%DATADIR%%/lib/licenses/logback-core-1.2.3.txt
-%%DATADIR%%/lib/licenses/lz4-1.4.0.txt
-%%DATADIR%%/lib/licenses/metrics-core-3.1.5.txt
-%%DATADIR%%/lib/licenses/metrics-jvm-3.1.5.txt
-%%DATADIR%%/lib/licenses/metrics-logback-3.1.5.txt
-%%DATADIR%%/lib/licenses/netty-tcnative-2.0.31.txt
-%%DATADIR%%/lib/licenses/psjava-0.1.19.txt
-%%DATADIR%%/lib/licenses/reporter-config-base-3.0.3.txt
-%%DATADIR%%/lib/licenses/reporter-config3-3.0.3.txt
-%%DATADIR%%/lib/licenses/six-1.7.3.txt
-%%DATADIR%%/lib/licenses/slf4j-api-1.7.25.txt
-%%DATADIR%%/lib/licenses/snakeyaml-1.11.txt
-%%DATADIR%%/lib/licenses/snowball-stemmer-1.3.0.581.1.txt
-%%DATADIR%%/lib/licenses/ST4-4.0.8.txt
-%%DATADIR%%/lib/licenses/stream-2.5.2.txt
 %%DATADIR%%/lib/log4j-over-slf4j-1.7.25.jar
-%%DATADIR%%/lib/logback-classic-1.2.3.jar
-%%DATADIR%%/lib/logback-core-1.2.3.jar
-%%DATADIR%%/lib/lz4-java-1.7.1.jar
+%%DATADIR%%/lib/logback-classic-1.2.9.jar
+%%DATADIR%%/lib/logback-core-1.2.9.jar
+%%DATADIR%%/lib/lz4-java-1.8.0.jar
 %%DATADIR%%/lib/metrics-core-3.1.5.jar
 %%DATADIR%%/lib/metrics-jvm-3.1.5.jar
 %%DATADIR%%/lib/metrics-logback-3.1.5.jar
 %%DATADIR%%/lib/mxdump-0.14.jar
 %%DATADIR%%/lib/netty.jar
-%%DATADIR%%/lib/netty-tcnative-boringssl-static-2.0.31.Final.jar
+%%DATADIR%%/lib/netty-tcnative-boringssl-static-2.0.36.Final.jar
 %%DATADIR%%/lib/psjava-0.1.19.jar
 %%DATADIR%%/lib/reporter-config-base-3.0.3.jar
 %%DATADIR%%/lib/reporter-config3-3.0.3.jar
@@ -124,7 +69,7 @@
 %%DATADIR%%/lib/sjk-json-0.14.jar
 %%DATADIR%%/lib/sjk-stacktrace-0.14.jar
 %%DATADIR%%/lib/slf4j-api-1.7.25.jar
-%%DATADIR%%/lib/snakeyaml-1.11.jar
+%%DATADIR%%/lib/snakeyaml-1.26.jar
 %%DATADIR%%/lib/snappy-java.jar
 %%DATADIR%%/lib/snowball-stemmer-1.3.0.581.1.jar
 %%DATADIR%%/lib/ST4-4.0.8.jar
@@ -134,7 +79,6 @@
 %%DATADIR%%/LICENSE.txt
 %%DATADIR%%/NEWS.txt
 %%DATADIR%%/NOTICE.txt
-%%DATADIR%%/pylib/cassandra-cqlsh-tests.sh
 %%DATADIR%%/pylib/cqlshlib/__init__.py
 %%DATADIR%%/pylib/cqlshlib/copyutil.py
 %%DATADIR%%/pylib/cqlshlib/cql3handling.py
@@ -147,21 +91,11 @@
 %%DATADIR%%/pylib/cqlshlib/saferscanner.py
 %%DATADIR%%/pylib/cqlshlib/setup.cfg
 %%DATADIR%%/pylib/cqlshlib/sslhandling.py
-%%DATADIR%%/pylib/cqlshlib/test/__init__.py
-%%DATADIR%%/pylib/cqlshlib/test/ansi_colors.py
-%%DATADIR%%/pylib/cqlshlib/test/basecase.py
-%%DATADIR%%/pylib/cqlshlib/test/cassconnect.py
-%%DATADIR%%/pylib/cqlshlib/test/run_cqlsh.py
-%%DATADIR%%/pylib/cqlshlib/test/test_copyutil.py
-%%DATADIR%%/pylib/cqlshlib/test/test_cql_parsing.py
-%%DATADIR%%/pylib/cqlshlib/test/test_cqlsh_completion.py
-%%DATADIR%%/pylib/cqlshlib/test/test_cqlsh_output.py
-%%DATADIR%%/pylib/cqlshlib/test/test_keyspace_init.cql
-%%DATADIR%%/pylib/cqlshlib/test/winpty.py
 %%DATADIR%%/pylib/cqlshlib/tracing.py
 %%DATADIR%%/pylib/cqlshlib/util.py
 %%DATADIR%%/pylib/cqlshlib/wcwidth.py
 %%DATADIR%%/pylib/README.asc
+%%DATADIR%%/pylib/pytest.ini
 %%DATADIR%%/pylib/requirements.txt
 %%DATADIR%%/pylib/setup.py
 %%DATADIR%%/tools/bin/auditlogviewer
@@ -170,6 +104,8 @@
 %%DATADIR%%/tools/bin/cassandra.in.sh
 %%DATADIR%%/tools/bin/compaction-stress
 %%DATADIR%%/tools/bin/fqltool
+%%DATADIR%%/tools/bin/generatetokens
+%%DATADIR%%/tools/bin/jmxtool
 %%DATADIR%%/tools/bin/sstabledump
 %%DATADIR%%/tools/bin/sstableexpiredblockers
 %%DATADIR%%/tools/bin/sstablelevelreset
diff --git a/databases/casstcl/Makefile b/databases/casstcl/Makefile
index 97953d31b374..e2c0722bdac8 100644
--- a/databases/casstcl/Makefile
+++ b/databases/casstcl/Makefile
@@ -1,13 +1,12 @@
-# Created by: gahr
-
 PORTNAME=	casstcl
-PORTVERSION=	2.15.0
+PORTVERSION=	2.16.1
 DISTVERSIONPREFIX=v
-PORTREVISION=	1
+PORTREVISION=	0
 CATEGORIES=	databases
 
 MAINTAINER=	gahr@FreeBSD.org
 COMMENT=	Tcl language interface to the Cassandra database
+WWW=		https://github.com/flightaware/casstcl
 
 LICENSE=	BSD3CLAUSE
 
@@ -21,7 +20,4 @@ GH_ACCOUNT=	flightaware
 USE_LDCONFIG=	${PREFIX}/lib/casstcl${PORTVERSION:R}
 PLIST_SUB+=	PORTVERSION=${PORTVERSION:R}
 
-post-patch:
-	@${REINPLACE_CMD} 's|2.14.0|2.15.0|' ${WRKSRC}/configure.in
-
 .include <bsd.port.mk>
diff --git a/databases/casstcl/distinfo b/databases/casstcl/distinfo
index c5c7c3433258..e166edfa1479 100644
--- a/databases/casstcl/distinfo
+++ b/databases/casstcl/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1607690208
-SHA256 (flightaware-casstcl-v2.15.0_GH0.tar.gz) = 81a3d4b4573f1d1252c02c019f657825f1b8bef6685be7e848a225deb41a4e1b
-SIZE (flightaware-casstcl-v2.15.0_GH0.tar.gz) = 120014
+TIMESTAMP = 1645777518
+SHA256 (flightaware-casstcl-v2.16.1_GH0.tar.gz) = 578a91628130e4a4c1537d78b131a032385fa854b0a69eaecba337688b01c9e6
+SIZE (flightaware-casstcl-v2.16.1_GH0.tar.gz) = 120075
diff --git a/databases/casstcl/pkg-descr b/databases/casstcl/pkg-descr
index 62df5d1f1405..2a347d013c54 100644
--- a/databases/casstcl/pkg-descr
+++ b/databases/casstcl/pkg-descr
@@ -1,4 +1,2 @@
 CassTcl provides a Tcl interface to the Cassandra database using DataStax
 cpp-driver C/C++ API.
-
-WWW: https://github.com/flightaware/casstcl
diff --git a/databases/cayley/Makefile b/databases/cayley/Makefile
index c712611d7e87..ecc5dc14f4fe 100644
--- a/databases/cayley/Makefile
+++ b/databases/cayley/Makefile
@@ -1,11 +1,12 @@
 PORTNAME=	cayley
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.7.5-2
-DISTVERSIONSUFFIX=	-gcf576ba
+DISTVERSION=	0.7.7
+PORTREVISION=	9
 CATEGORIES=	databases
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Open-source graph database
+WWW=		https://github.com/cayleygraph/cayley
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
@@ -13,137 +14,17 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 BROKEN_i386=	gopkg.in/mgo.v2/bson/json.go:320:7: constant 9007199254740992 overflows int
 
 USES=		go:modules
+USE_GITHUB=	nodefault
+GH_TUPLE=	golang:sys:v0.6.0:sys
 
-USE_GITHUB=	yes
-GH_ACCOUNT=	${PORTNAME}graph
-GH_TUPLE=	\
-		Azure:go-ansiterm:d6e3b3328b78:azure_go_ansiterm/vendor/github.com/Azure/go-ansiterm \
-		BurntSushi:toml:v0.3.1:burntsushi_toml/vendor/github.com/BurntSushi/toml \
-		Microsoft:go-winio:v0.4.11:microsoft_go_winio/vendor/github.com/Microsoft/go-winio \
-		Nvveen:Gotty:cd527374f1e5:nvveen_gotty/vendor/github.com/Nvveen/Gotty \
-		armon:consul-api:eb2c6b5be1b6:armon_consul_api/vendor/github.com/armon/consul-api \
-		badgerodon:peg:9e5f7f4d07ca:badgerodon_peg/vendor/github.com/badgerodon/peg \
-		boltdb:bolt:e9cf4fae01b5:boltdb_bolt/vendor/github.com/boltdb/bolt \
-		census-instrumentation:opencensus-go:v0.21.0:census_instrumentation_opencensus_go/vendor/go.opencensus.io \
-		cockroachdb:apd:v1.1.0:cockroachdb_apd/vendor/github.com/cockroachdb/apd \
-		containerd:continuity:c7c5070e6f6e:containerd_continuity/vendor/github.com/containerd/continuity \
-		coreos:go-etcd:v2.0.0:coreos_go_etcd/vendor/github.com/coreos/go-etcd \
-		cpuguy83:go-md2man:v1.0.10:cpuguy83_go_md2man/vendor/github.com/cpuguy83/go-md2man \
-		cznic:mathutil:1447ad269d64:cznic_mathutil/vendor/github.com/cznic/mathutil \
-		d4l3k:messagediff:v1.2.1:d4l3k_messagediff/vendor/github.com/d4l3k/messagediff \
-		davecgh:go-spew:v1.1.1:davecgh_go_spew/vendor/github.com/davecgh/go-spew \
-		dennwc:graphql:12cfed44bc5d:dennwc_graphql/vendor/github.com/dennwc/graphql \
-		dlclark:regexp2:v1.1.4:dlclark_regexp2/vendor/github.com/dlclark/regexp2 \
-		moby:moby:0c5f8d2b9b23:docker_docker/vendor/github.com/docker/docker \
-		docker:go-connections:v0.4.0:docker_go_connections/vendor/github.com/docker/go-connections \
-		docker:go-units:v0.3.3:docker_go_units/vendor/github.com/docker/go-units \
-		docker:libnetwork:19279f049241:docker_libnetwork/vendor/github.com/docker/libnetwork \
-		dop251:goja:ef8c030e3c96:dop251_goja/vendor/github.com/dop251/goja \
-		dop251:goja_nodejs:adff31b136e6:dop251_goja_nodejs/vendor/github.com/dop251/goja_nodejs \
-		flimzy:diff:v0.1.4:flimzy_diff/vendor/github.com/flimzy/diff \
-		flimzy:kivik:v1.8.1:flimzy_kivik/vendor/github.com/flimzy/kivik \
-		flimzy:testy:v0.0.13:flimzy_testy/vendor/github.com/flimzy/testy \
-		fortytw2:leaktest:v1.3.0:fortytw2_leaktest/vendor/github.com/fortytw2/leaktest \
-		fsnotify:fsnotify:c282820:fsnotify_fsnotify_gh/vendor/github.com/fsnotify/fsnotify \
-		fsnotify:fsnotify:v1.4.7:fsnotify_fsnotify/vendor/gopkg.in/fsnotify.v1 \
-		fsouza:go-dockerclient:v1.3.1:fsouza_go_dockerclient/vendor/github.com/fsouza/go-dockerclient \
-		go-check:check:788fd7840127:go_check_check/vendor/gopkg.in/check.v1 \
-		go-kivik:couchdb:74d231fe4324:go_kivik_couchdb/vendor/github.com/go-kivik/couchdb \
-		go-kivik:kivik:2a1f6b9dd407:go_kivik_kivik/vendor/github.com/go-kivik/kivik \
-		go-kivik:kiviktest:v1.1.2:go_kivik_kiviktest/vendor/github.com/go-kivik/kiviktest \
-		go-kivik:pouchdb:v1.3.5:go_kivik_pouchdb/vendor/github.com/go-kivik/pouchdb \
-		go-mgo:mgo:3f83fa500528:go_mgo_mgo/vendor/gopkg.in/mgo.v2 \
-		go-mgo:mgo:7446a0344b78:go_mgo_mgo_unstable/vendor/gopkg.in/mgo.v2-unstable \
-		go-sourcemap:sourcemap:v2.1.2:go_sourcemap_sourcemap/vendor/github.com/go-sourcemap/sourcemap \
-		go-sql-driver:mysql:147bd02c2c51:go_sql_driver_mysql/vendor/github.com/go-sql-driver/mysql \
-		go-stack:stack:v1.8.0:go_stack_stack/vendor/github.com/go-stack/stack \
-		go-tomb:tomb:d5d1b5820637:go_tomb_tomb/vendor/gopkg.in/tomb.v2 \
-		go-tomb:tomb:dd632973f1e7:go_tomb_tomb/vendor/gopkg.in/tomb.v1 \
-		go-yaml:yaml:v2.2.1:go_yaml_yaml/vendor/gopkg.in/yaml.v2 \
-		go4org:go4:94abd6928b1d:go4org_go4/vendor/go4.org \
-		gogo:protobuf:v1.1.1:gogo_protobuf/vendor/github.com/gogo/protobuf \
-		golang:appengine:v1.5.0:golang_appengine/vendor/google.golang.org/appengine \
-		golang:crypto:c2843e01d9a2:golang_crypto/vendor/golang.org/x/crypto \
-		golang:glog:23def4e6c14b:golang_glog/vendor/github.com/golang/glog \
-		golang:net:f4e77d36d62c:golang_net/vendor/golang.org/x/net \
-		golang:oauth2:0f29369cfe45:golang_oauth2/vendor/golang.org/x/oauth2 \
-		golang:protobuf:v1.3.1:golang_protobuf/vendor/github.com/golang/protobuf \
-		golang:snappy:553a64147049:golang_snappy/vendor/github.com/golang/snappy \
-		golang:sync:112230192c58:golang_sync/vendor/golang.org/x/sync \
-		golang:sys:ecd444e8653b:golang_sys/vendor/golang.org/x/sys \
-		golang:text:v0.3.2:golang_text/vendor/golang.org/x/text \
-		golang:tools:6cfa55603c28:golang_tools/vendor/golang.org/x/tools \
-		google:go-genproto:fb225487d101:google_go_genproto/vendor/google.golang.org/genproto \
-		google:uuid:v1.1.1:google_uuid/vendor/github.com/google/uuid \
-		googleapis:google-api-go-client:v0.7.0:googleapis_google_api_go_client/vendor/google.golang.org/api \
-		googleapis:google-cloud-go:v0.40.0:googleapis_google_cloud_go/vendor/cloud.google.com/go \
-		gopherjs:gopherjs:558a9132744c:gopherjs_gopherjs/vendor/github.com/gopherjs/gopherjs \
-		gopherjs:jsbuiltin:67703bfb044e:gopherjs_jsbuiltin/vendor/github.com/gopherjs/jsbuiltin \
-		grpc:grpc-go:v1.20.1:grpc_grpc_go/vendor/google.golang.org/grpc \
-		hashicorp:golang-lru:v0.5.1:hashicorp_golang_lru/vendor/github.com/hashicorp/golang-lru \
-		hashicorp:hcl:7fa7fff964d0:hashicorp_hcl/vendor/github.com/hashicorp/hcl \
-		hpcloud:tail:v1.0.0:hpcloud_tail/vendor/github.com/hpcloud/tail \
-		imdario:mergo:0d4b488675fd:imdario_mergo/vendor/github.com/imdario/mergo \
-		inconshreveable:log15:67afb5ed74ec:inconshreveable_log15/vendor/gopkg.in/inconshreveable/log15.v2 \
-		inconshreveable:mousetrap:v1.0.0:inconshreveable_mousetrap/vendor/github.com/inconshreveable/mousetrap \
-		jackc:fake:812a484cc733:jackc_fake/vendor/github.com/jackc/fake \
-		jackc:pgx:606697ffdfe6:jackc_pgx/vendor/github.com/jackc/pgx \
-		json-iterator:go:v1.1.6:json_iterator_go/vendor/github.com/json-iterator/go \
-		julienschmidt:httprouter:6f3f3919c878:julienschmidt_httprouter/vendor/github.com/julienschmidt/httprouter \
-		kr:fs:v0.1.0:kr_fs/vendor/github.com/kr/fs \
-		kr:pretty:v0.1.0:kr_pretty/vendor/github.com/kr/pretty \
-		kr:text:v0.1.0:kr_text/vendor/github.com/kr/text \
-		lib:pq:2704adc878c2:lib_pq/vendor/github.com/lib/pq \
-		linkeddata:gojsonld:4f5db6791326:linkeddata_gojsonld/vendor/github.com/linkeddata/gojsonld \
-		magiconair:properties:51463bfca257:magiconair_properties/vendor/github.com/magiconair/properties \
-		mailru:easyjson:b2ccc519800e:mailru_easyjson/vendor/github.com/mailru/easyjson \
-		mattn:go-colorable:v0.1.2:mattn_go_colorable/vendor/github.com/mattn/go-colorable \
-		mattn:go-isatty:v0.0.8:mattn_go_isatty/vendor/github.com/mattn/go-isatty \
-		mattn:go-runewidth:v0.0.4:mattn_go_runewidth/vendor/github.com/mattn/go-runewidth \
-		mitchellh:go-homedir:v1.1.0:mitchellh_go_homedir/vendor/github.com/mitchellh/go-homedir \
-		mitchellh:mapstructure:cc8532a8e9a5:mitchellh_mapstructure/vendor/github.com/mitchellh/mapstructure \
-		modern-go:concurrent:bacd9c7ef1dd:modern_go_concurrent/vendor/github.com/modern-go/concurrent \
-		modern-go:reflect2:v1.0.1:modern_go_reflect2/vendor/github.com/modern-go/reflect2 \
-		olivere:elastic:v5.0.58:olivere_elastic/vendor/gopkg.in/olivere/elastic.v5 \
-		olivere:elastic:v6.2.19:olivere_elastic_6/vendor/github.com/olivere/elastic \
-		olivere:env:v1.1.0:olivere_env/vendor/github.com/olivere/env \
-		onsi:ginkgo:v1.7.0:onsi_ginkgo/vendor/github.com/onsi/ginkgo \
-		onsi:gomega:v1.4.3:onsi_gomega/vendor/github.com/onsi/gomega \
-		opencontainers:go-digest:v1.0.0-rc1:opencontainers_go_digest/vendor/github.com/opencontainers/go-digest \
-		opencontainers:image-spec:v1.0.1:opencontainers_image_spec/vendor/github.com/opencontainers/image-spec \
-		opencontainers:runc:v0.1.1:opencontainers_runc/vendor/github.com/opencontainers/runc \
-		pborman:uuid:1b00554d8222:pborman_uuid/vendor/github.com/pborman/uuid \
-		pelletier:go-buffruneio:v0.2.0:pelletier_go_buffruneio/vendor/github.com/pelletier/go-buffruneio \
-		pelletier:go-toml:fe206efb84b2:pelletier_go_toml/vendor/github.com/pelletier/go-toml \
-		peterh:liner:88609521dc4b:peterh_liner/vendor/github.com/peterh/liner \
-		pkg:errors:v0.8.1:pkg_errors/vendor/github.com/pkg/errors \
-		pkg:sftp:v1.10.0:pkg_sftp/vendor/github.com/pkg/sftp \
-		pmezard:go-difflib:v1.0.0:pmezard_go_difflib/vendor/github.com/pmezard/go-difflib \
-		pquerna:ffjson:e517b90714f7:pquerna_ffjson/vendor/github.com/pquerna/ffjson \
-		rs:zerolog:v1.14.3:rs_zerolog/vendor/github.com/rs/zerolog \
-		russross:blackfriday:v1.5.2:russross_blackfriday/vendor/github.com/russross/blackfriday \
-		satori:go.uuid:v1.2.0:satori_go_uuid/vendor/github.com/satori/go.uuid \
-		shopspring:decimal:cd690d0c9e24:shopspring_decimal/vendor/github.com/shopspring/decimal \
-		sirupsen:logrus:v1.0.6:sirupsen_logrus/vendor/github.com/sirupsen/logrus \
-		smartystreets:go-aws-auth:0c1422d1fdb9:smartystreets_go_aws_auth/vendor/github.com/smartystreets/go-aws-auth \
-		spf13:afero:9be650865eab:spf13_afero/vendor/github.com/spf13/afero \
-		spf13:cast:v1.1.0:spf13_cast/vendor/github.com/spf13/cast \
-		spf13:cobra:7b1b6e8dc027:spf13_cobra/vendor/github.com/spf13/cobra \
-		spf13:jwalterweatherman:fa7ca7e836cf:spf13_jwalterweatherman/vendor/github.com/spf13/jwalterweatherman \
-		spf13:pflag:f1d95a35e132:spf13_pflag/vendor/github.com/spf13/pflag \
-		spf13:viper:0967fc9aceab:spf13_viper/vendor/github.com/spf13/viper \
-		stretchr:testify:v1.2.2:stretchr_testify/vendor/github.com/stretchr/testify \
-		syndtr:goleveldb:b89cc31ef797:syndtr_goleveldb/vendor/github.com/syndtr/goleveldb \
-		tylertreat:BoomFilters:37e169ae37ed:tylertreat_boomfilters/vendor/github.com/tylertreat/BoomFilters \
-		uber-go:atomic:v1.4.0:uber_go_atomic/vendor/go.uber.org/atomic \
-		uber-go:multierr:v1.1.0:uber_go_multierr/vendor/go.uber.org/multierr \
-		uber-go:zap:v1.10.0:uber_go_zap/vendor/go.uber.org/zap \
-		ugorji:go:v1.1.5-pre:ugorji_go/vendor/github.com/ugorji/go/codec \
-		xordataexchange:crypt:v0.0.2:xordataexchange_crypt/vendor/github.com/xordataexchange/crypt
-
+GO_MODULE=	github.com/cayleygraph/cayley
 GO_TARGET=	./cmd/${PORTNAME}
 GO_BUILDFLAGS=	-ldflags="-X github.com/${GH_ACCOUNT}graph/${GH_PROJECT}/version.GitHash=${PORTVERSION}"
 
 PLIST_FILES=	bin/${PORTNAME}
 
+pre-patch:
+	${RM} -r ${WRKSRC}/vendor/golang.org/x/sys
+	${LN} -s ${WRKDIR}/sys-* ${WRKSRC}/vendor/golang.org/x/sys
+
 .include <bsd.port.mk>
diff --git a/databases/cayley/distinfo b/databases/cayley/distinfo
index 5fc139d5e7ab..589994aa51a9 100644
--- a/databases/cayley/distinfo
+++ b/databases/cayley/distinfo
@@ -1,247 +1,7 @@
-TIMESTAMP = 1561750487
-SHA256 (cayleygraph-cayley-v0.7.5-2-gcf576ba_GH0.tar.gz) = f1ba8a69217ccac3ee66b5750113a7862a8604e4ad5303d07d95670a7e8f75b8
-SIZE (cayleygraph-cayley-v0.7.5-2-gcf576ba_GH0.tar.gz) = 4454083
-SHA256 (Azure-go-ansiterm-d6e3b3328b78_GH0.tar.gz) = ee1ebe2efef498be1c558bf71e143289db2d21e2d42592503ad2d4a989006821
-SIZE (Azure-go-ansiterm-d6e3b3328b78_GH0.tar.gz) = 20946
-SHA256 (BurntSushi-toml-v0.3.1_GH0.tar.gz) = 6593da894578ba510a470735ffbdc88ce88033094dc5a8f4d3957ab87e18803f
-SIZE (BurntSushi-toml-v0.3.1_GH0.tar.gz) = 42077
-SHA256 (Microsoft-go-winio-v0.4.11_GH0.tar.gz) = e46f186982d8d27b8d740e724b6b736d047c3b92419f2265402390a15989a825
-SIZE (Microsoft-go-winio-v0.4.11_GH0.tar.gz) = 79254
-SHA256 (Nvveen-Gotty-cd527374f1e5_GH0.tar.gz) = 8dfbc008689846a4d521f71ee5657a3b51a3fbe79735577604d2fbafebfac13b
-SIZE (Nvveen-Gotty-cd527374f1e5_GH0.tar.gz) = 10505
-SHA256 (armon-consul-api-eb2c6b5be1b6_GH0.tar.gz) = c4707c2cf495f918b229991c818fe59acd28259d7e2d738551312eb5c4347c39
-SIZE (armon-consul-api-eb2c6b5be1b6_GH0.tar.gz) = 17989
-SHA256 (badgerodon-peg-9e5f7f4d07ca_GH0.tar.gz) = d4fdb91c1c5435e90a07832550660c25069fba1566e909c9c275ec1bc811c578
-SIZE (badgerodon-peg-9e5f7f4d07ca_GH0.tar.gz) = 4110
-SHA256 (boltdb-bolt-e9cf4fae01b5_GH0.tar.gz) = 63942fd57f39061a954df191c0c4c2a55c7e47ef9ed3da63515beb8b8ea09fb2
-SIZE (boltdb-bolt-e9cf4fae01b5_GH0.tar.gz) = 83397
-SHA256 (census-instrumentation-opencensus-go-v0.21.0_GH0.tar.gz) = e7129aebb9bcb590f01b4fb773b6cf0b10109211cb38cfbaf1f097d191043251
-SIZE (census-instrumentation-opencensus-go-v0.21.0_GH0.tar.gz) = 161522
-SHA256 (cockroachdb-apd-v1.1.0_GH0.tar.gz) = 7ecbb4ca0e42aef740383329414964eda52d40e6437f7b332c0b042cd51aab05
-SIZE (cockroachdb-apd-v1.1.0_GH0.tar.gz) = 303998
-SHA256 (containerd-continuity-c7c5070e6f6e_GH0.tar.gz) = 22cdeba33d73b8b62ba69fba33d438c754368a8fffbd1da8f239c53d48f76940
-SIZE (containerd-continuity-c7c5070e6f6e_GH0.tar.gz) = 1052249
-SHA256 (coreos-go-etcd-v2.0.0_GH0.tar.gz) = efddec35876c05beca5d5a673acd34df383d92c795167b312167253b93d98f6c
-SIZE (coreos-go-etcd-v2.0.0_GH0.tar.gz) = 19503
-SHA256 (cpuguy83-go-md2man-v1.0.10_GH0.tar.gz) = 76aa56849123b99b95fcea2b15502fd886dead9a5c35be7f78bdc2bad6be8d99
-SIZE (cpuguy83-go-md2man-v1.0.10_GH0.tar.gz) = 43936
-SHA256 (cznic-mathutil-1447ad269d64_GH0.tar.gz) = 5288b19a6e677d2fe27070c98ce5345cbc25c5d2a37326afc1e9f284e0443611
-SIZE (cznic-mathutil-1447ad269d64_GH0.tar.gz) = 108660
-SHA256 (d4l3k-messagediff-v1.2.1_GH0.tar.gz) = 00e0d9baf442b0fdd11164d736ea64012d386353db2bd050f13c01c4db4a7813
-SIZE (d4l3k-messagediff-v1.2.1_GH0.tar.gz) = 8059
-SHA256 (davecgh-go-spew-v1.1.1_GH0.tar.gz) = 7d82b9bb7291adbe7498fe946920ab3e7fc9e6cbfc3b2294693fad00bf0dd17e
-SIZE (davecgh-go-spew-v1.1.1_GH0.tar.gz) = 42152
-SHA256 (dennwc-graphql-12cfed44bc5d_GH0.tar.gz) = a2a16573315ac47c51ca4cb4e6ea652c5c5f435da020cadde1a619c3d6e7b373
-SIZE (dennwc-graphql-12cfed44bc5d_GH0.tar.gz) = 153782
-SHA256 (dlclark-regexp2-v1.1.4_GH0.tar.gz) = 40c6e8116db04655057ee7d73c219650d7f66849830bd5733eb477da1312568f
-SIZE (dlclark-regexp2-v1.1.4_GH0.tar.gz) = 92946
-SHA256 (moby-moby-0c5f8d2b9b23_GH0.tar.gz) = f91be9d3fe1d88c47d6a7b040fe29732cd491a93ce454db0ae019702822388f5
-SIZE (moby-moby-0c5f8d2b9b23_GH0.tar.gz) = 8419382
-SHA256 (docker-go-connections-v0.4.0_GH0.tar.gz) = e31dfcf72dd9b07bf6dc320671a78a142a1b7c6287a7282c034c8cd463bc8663
-SIZE (docker-go-connections-v0.4.0_GH0.tar.gz) = 30770
-SHA256 (docker-go-units-v0.3.3_GH0.tar.gz) = a088ea93ec2d4112d4b100f5760fd73252820ed5872c880234e390d922a1399b
-SIZE (docker-go-units-v0.3.3_GH0.tar.gz) = 11220
-SHA256 (docker-libnetwork-19279f049241_GH0.tar.gz) = 388b4ebaf8ec53ce738c7deb54491947369bf1d2132ec03f45a73e575a4dcc5a
-SIZE (docker-libnetwork-19279f049241_GH0.tar.gz) = 2695886
-SHA256 (dop251-goja-ef8c030e3c96_GH0.tar.gz) = 247c8cba3117db55a5cbf3f31f2de04988a5a68f8cf45905985708f1004a6261
-SIZE (dop251-goja-ef8c030e3c96_GH0.tar.gz) = 159309
-SHA256 (dop251-goja_nodejs-adff31b136e6_GH0.tar.gz) = 161efa627c19fa2d7c51538234922cbe62eb30d9fc553a31ff9aefad9d64f3bb
-SIZE (dop251-goja_nodejs-adff31b136e6_GH0.tar.gz) = 5866
-SHA256 (flimzy-diff-v0.1.4_GH0.tar.gz) = b226decd5ec2efd8d9e4dd233150abdefb38133acaae6d26d4124b850156e3c3
-SIZE (flimzy-diff-v0.1.4_GH0.tar.gz) = 6446
-SHA256 (flimzy-kivik-v1.8.1_GH0.tar.gz) = 72fd524aec7acb98813fa84b4011b28f221855abd487788322a8b5ff6c5a97cb
-SIZE (flimzy-kivik-v1.8.1_GH0.tar.gz) = 64394
-SHA256 (flimzy-testy-v0.0.13_GH0.tar.gz) = 850770f113ef1b76c52ad4c3cfd1cfcb66dad9d03c13cfcf727ffffa07ff6d59
-SIZE (flimzy-testy-v0.0.13_GH0.tar.gz) = 5940
-SHA256 (fortytw2-leaktest-v1.3.0_GH0.tar.gz) = 897726ed584a7c442eb660406e3438d4585b00c5f3769360eb19b18cace35292
-SIZE (fortytw2-leaktest-v1.3.0_GH0.tar.gz) = 5281
-SHA256 (fsnotify-fsnotify-c282820_GH0.tar.gz) = 85d31bf25f43a66fbaf0799ce8993a038694e65312bef96441a83556abaff73a
-SIZE (fsnotify-fsnotify-c282820_GH0.tar.gz) = 31139
-SHA256 (fsnotify-fsnotify-v1.4.7_GH0.tar.gz) = b7530d973d0ab0e58ad8ce1b9a4b963d6f57b3d72f2f9e13d49846976361b1cd
-SIZE (fsnotify-fsnotify-v1.4.7_GH0.tar.gz) = 31139
-SHA256 (fsouza-go-dockerclient-v1.3.1_GH0.tar.gz) = cf57334363021d746248b83bef4c15dfbf84d85f6e7a8849672a81963fceb03d
-SIZE (fsouza-go-dockerclient-v1.3.1_GH0.tar.gz) = 153345
-SHA256 (go-check-check-788fd7840127_GH0.tar.gz) = b7c9de01f3ca7111d889f30f2bbcc36eda4d07c09f032aaba83e34a324146bae
-SIZE (go-check-check-788fd7840127_GH0.tar.gz) = 31597
-SHA256 (go-kivik-couchdb-74d231fe4324_GH0.tar.gz) = eccb0188d42010935333fa31f3632decc2a60bc92829cf1f3e91e075e0800af8
-SIZE (go-kivik-couchdb-74d231fe4324_GH0.tar.gz) = 56609
-SHA256 (go-kivik-kivik-2a1f6b9dd407_GH0.tar.gz) = e869b728d7c4ae499e09967ac8f69169f191c650e8384375db3222ff96708c4a
-SIZE (go-kivik-kivik-2a1f6b9dd407_GH0.tar.gz) = 66069
-SHA256 (go-kivik-kiviktest-v1.1.2_GH0.tar.gz) = 9f58050547859f8a8aa9bafd1251fd41b65bbdadf93463c4bc4f4e5345bbe658
-SIZE (go-kivik-kiviktest-v1.1.2_GH0.tar.gz) = 23974
-SHA256 (go-kivik-pouchdb-v1.3.5_GH0.tar.gz) = 1476f0d0b43d7bdd4c756c4256075f65ddaba21ae163e4fcce3737edb9d07001
-SIZE (go-kivik-pouchdb-v1.3.5_GH0.tar.gz) = 20110
-SHA256 (go-mgo-mgo-3f83fa500528_GH0.tar.gz) = 8f6051f4e5634ae87d5dc7683e84f0345f3fb6a708fd6d15240a87f377807360
-SIZE (go-mgo-mgo-3f83fa500528_GH0.tar.gz) = 376760
-SHA256 (go-mgo-mgo-7446a0344b78_GH0.tar.gz) = fe5e1298ca233da12fcf6e102893422b407c99331e4f11874e681acf3dc033f9
-SIZE (go-mgo-mgo-7446a0344b78_GH0.tar.gz) = 377308
-SHA256 (go-sourcemap-sourcemap-v2.1.2_GH0.tar.gz) = 6e9981d0cf3def24f67bb1f0af720f0100105d4b387fc0fe7dc7d3535388c61a
-SIZE (go-sourcemap-sourcemap-v2.1.2_GH0.tar.gz) = 6378
-SHA256 (go-sql-driver-mysql-147bd02c2c51_GH0.tar.gz) = eedaa5a6003f17e0b4d2c97b363b92c36e244f71a5bc0e8e5f9a8cc5374c5882
-SIZE (go-sql-driver-mysql-147bd02c2c51_GH0.tar.gz) = 62148
-SHA256 (go-stack-stack-v1.8.0_GH0.tar.gz) = 3b8987e137d76f4f35db1e8005ec7fb766b68eed8cac0ca0b795ac43cd72b319
-SIZE (go-stack-stack-v1.8.0_GH0.tar.gz) = 8039
-SHA256 (go-tomb-tomb-dd632973f1e7_GH0.tar.gz) = b67f4ee9324a78176bc3196fe262388696aeb3f31d9879d498200219f9c4c554
-SIZE (go-tomb-tomb-dd632973f1e7_GH0.tar.gz) = 3631
-SHA256 (go-yaml-yaml-v2.2.1_GH0.tar.gz) = 33218aa3bd60a307fe14e66b970473cb411bb6ca3d4f4a5e30c97b44f9b4e84b
-SIZE (go-yaml-yaml-v2.2.1_GH0.tar.gz) = 70217
-SHA256 (go4org-go4-94abd6928b1d_GH0.tar.gz) = be7efd7f6831fcc2022d3f2faf8885c0c85a18909cda2cd538f8106966050fba
-SIZE (go4org-go4-94abd6928b1d_GH0.tar.gz) = 140401
-SHA256 (gogo-protobuf-v1.1.1_GH0.tar.gz) = 9f8c2ad49849ab063cd9fef67e77d49606640044227ecf7f3617ea2c92ef147c
-SIZE (gogo-protobuf-v1.1.1_GH0.tar.gz) = 1868227
-SHA256 (golang-appengine-v1.5.0_GH0.tar.gz) = 0de9d0a9882054e319bf7608b6ede31a6d3005ccd3efecd85b936d4b82cbd6b1
-SIZE (golang-appengine-v1.5.0_GH0.tar.gz) = 325873
-SHA256 (golang-crypto-c2843e01d9a2_GH0.tar.gz) = a4d91350f176b2ef99084cd71f990ecee5f549efed72ef59a5b9e425a00d454a
-SIZE (golang-crypto-c2843e01d9a2_GH0.tar.gz) = 1650817
-SHA256 (golang-glog-23def4e6c14b_GH0.tar.gz) = 528b6072aa1c5dc69325bd6f057940ba8908703542ec5689b64b98e72c48588b
-SIZE (golang-glog-23def4e6c14b_GH0.tar.gz) = 19660
-SHA256 (golang-net-f4e77d36d62c_GH0.tar.gz) = 0c60b192575e149c8f29a3ed63ac7ba3c8525d0f700f0843cadc345b31fbab80
-SIZE (golang-net-f4e77d36d62c_GH0.tar.gz) = 1100359
-SHA256 (golang-oauth2-0f29369cfe45_GH0.tar.gz) = 468421ddfe905216454006b309ebda6e97aa6089265b995bce4259d6a9efd141
-SIZE (golang-oauth2-0f29369cfe45_GH0.tar.gz) = 45498
-SHA256 (golang-protobuf-v1.3.1_GH0.tar.gz) = 3f3a6123054a9847093c119895f1660612f301fe95358f3a6a1a33fd0933e6cf
-SIZE (golang-protobuf-v1.3.1_GH0.tar.gz) = 310884
-SHA256 (golang-snappy-553a64147049_GH0.tar.gz) = 7e322fd3c30642ad1297c9163f86b4775e522e9320cdda09d49bc2fe56428213
-SIZE (golang-snappy-553a64147049_GH0.tar.gz) = 62046
-SHA256 (golang-sync-112230192c58_GH0.tar.gz) = 6d98880ea18369550cb12d7011df8e4b21c5b7588268a412b863b5c9d2fa0313
-SIZE (golang-sync-112230192c58_GH0.tar.gz) = 16832
-SHA256 (golang-sys-ecd444e8653b_GH0.tar.gz) = f3d0e1318b6a87c3ffc822c85e519b6c461322df483daad07e259df22e6190fd
-SIZE (golang-sys-ecd444e8653b_GH0.tar.gz) = 1388929
-SHA256 (golang-text-v0.3.2_GH0.tar.gz) = 0b9309698f5708531c5377ab1e29b423a6d9e20c55a8d386c3b8283428212f22
-SIZE (golang-text-v0.3.2_GH0.tar.gz) = 7168069
-SHA256 (golang-tools-6cfa55603c28_GH0.tar.gz) = 3e5af4d0d3efb2ae3d329491598f98195a7078403366fa371d7b77f6c3ab1923
-SIZE (golang-tools-6cfa55603c28_GH0.tar.gz) = 2161222
-SHA256 (google-go-genproto-fb225487d101_GH0.tar.gz) = 432d262475a762d4e678fbe5494cbd7088858e4dc74d9531ec2b7cdec4687dd7
-SIZE (google-go-genproto-fb225487d101_GH0.tar.gz) = 4077089
-SHA256 (google-uuid-v1.1.1_GH0.tar.gz) = bebd4b0b4ea152a9793615ef23c83f688876d8c284a2092264d20a4bf4ffc423
-SIZE (google-uuid-v1.1.1_GH0.tar.gz) = 13543
-SHA256 (googleapis-google-api-go-client-v0.7.0_GH0.tar.gz) = cb0cd7649e80342940800f2f1e9cc8018c178e840e291589e24cbb65c1c73ac6
-SIZE (googleapis-google-api-go-client-v0.7.0_GH0.tar.gz) = 12103399
-SHA256 (googleapis-google-cloud-go-v0.40.0_GH0.tar.gz) = 0d071f37137e1fdf75ca39cf19ce3fd966a1e2e28091e01c4ecd4e6437c2cd72
-SIZE (googleapis-google-cloud-go-v0.40.0_GH0.tar.gz) = 2090665
-SHA256 (gopherjs-gopherjs-558a9132744c_GH0.tar.gz) = 002b18154f02a95c8ff88b97ab27168c6462b7cdf3e8b1b270d103aa4f365489
-SIZE (gopherjs-gopherjs-558a9132744c_GH0.tar.gz) = 217974
-SHA256 (gopherjs-jsbuiltin-67703bfb044e_GH0.tar.gz) = 0af46dbbc1fef988b73b8f382471fefaa371eae1adeb4e5c6175dc5989bed245
-SIZE (gopherjs-jsbuiltin-67703bfb044e_GH0.tar.gz) = 5301
-SHA256 (grpc-grpc-go-v1.20.1_GH0.tar.gz) = 109f4389cb22f2293a9640a3dd8d3a6d837985615353025c33c7d2923409c8ac
-SIZE (grpc-grpc-go-v1.20.1_GH0.tar.gz) = 707599
-SHA256 (hashicorp-golang-lru-v0.5.1_GH0.tar.gz) = 3bf57512af746dc0338651ba1c35c65fe907ff214ccb22d679539f7ea791511e
-SIZE (hashicorp-golang-lru-v0.5.1_GH0.tar.gz) = 12982
-SHA256 (hashicorp-hcl-7fa7fff964d0_GH0.tar.gz) = 9f5679ea52340f3ee193dd9d7f641ac3a6e7dc44bf55499ea89df09039b09cf1
-SIZE (hashicorp-hcl-7fa7fff964d0_GH0.tar.gz) = 69187
-SHA256 (hpcloud-tail-v1.0.0_GH0.tar.gz) = 3aa982c4a779b1c1dc5723bbf2345eed1dd46cd5bcc490e69de4beab8f5d4b02
-SIZE (hpcloud-tail-v1.0.0_GH0.tar.gz) = 37816
-SHA256 (imdario-mergo-0d4b488675fd_GH0.tar.gz) = ff4525f4a778d32b11f088d6c1dd6b346eee1c68a19b1abf810ebc38caac93e0
-SIZE (imdario-mergo-0d4b488675fd_GH0.tar.gz) = 14631
-SHA256 (inconshreveable-log15-67afb5ed74ec_GH0.tar.gz) = e4c837cfd154a0696c84605595c84459a2d1b2fb33b1abcf284a415d2ca9ab55
-SIZE (inconshreveable-log15-67afb5ed74ec_GH0.tar.gz) = 23261
-SHA256 (inconshreveable-mousetrap-v1.0.0_GH0.tar.gz) = 5edc7731c819c305623568e317aa253d342be3447def97f1fa9e10eb5ad819f6
-SIZE (inconshreveable-mousetrap-v1.0.0_GH0.tar.gz) = 2290
-SHA256 (jackc-fake-812a484cc733_GH0.tar.gz) = 681acd6475aff4a0756f10e7103f1429aae4c5b847b2608f9f04a8577f8d9c78
-SIZE (jackc-fake-812a484cc733_GH0.tar.gz) = 70920
-SHA256 (jackc-pgx-606697ffdfe6_GH0.tar.gz) = 6ac0637bb158a96d16dd8300d8eac0e4b151e4cb05227fc65097141535d06e05
-SIZE (jackc-pgx-606697ffdfe6_GH0.tar.gz) = 188656
-SHA256 (json-iterator-go-v1.1.6_GH0.tar.gz) = fc04b16a3d3798aca44e644d85c1cf5a10faf294ed69a9f44ca57c6dfa6856e2
-SIZE (json-iterator-go-v1.1.6_GH0.tar.gz) = 76814
-SHA256 (julienschmidt-httprouter-6f3f3919c878_GH0.tar.gz) = 1b6731157534b9b9dd41ec89eb47717e979ddb6a3e99e2c77bdea05d84c35025
-SIZE (julienschmidt-httprouter-6f3f3919c878_GH0.tar.gz) = 22299
-SHA256 (kr-fs-v0.1.0_GH0.tar.gz) = 5743b4ec1e7c4a336c40c9936989174dc9bfc1fb19640d7308c04892453f6c8d
-SIZE (kr-fs-v0.1.0_GH0.tar.gz) = 4405
-SHA256 (kr-pretty-v0.1.0_GH0.tar.gz) = 3aeb5d90b719765781befb9f156d0d0b8e5a7aafbcf15321e9eabbd35df31358
-SIZE (kr-pretty-v0.1.0_GH0.tar.gz) = 8550
-SHA256 (kr-text-v0.1.0_GH0.tar.gz) = b67f2744020b25f9298153af0992db252d195edd7ca5afa3b19d6ac300c2d14e
-SIZE (kr-text-v0.1.0_GH0.tar.gz) = 8686
-SHA256 (lib-pq-2704adc878c2_GH0.tar.gz) = 42bc4883582b5b50ca41d56d895be15bc27c909cd59e50babcba1ac3de0b68c4
-SIZE (lib-pq-2704adc878c2_GH0.tar.gz) = 84666
-SHA256 (linkeddata-gojsonld-4f5db6791326_GH0.tar.gz) = 31bf4d277c06afa5cfba9c2e878c4abe76b35c324f908a8badeb048ccb34e5ba
-SIZE (linkeddata-gojsonld-4f5db6791326_GH0.tar.gz) = 2120594
-SHA256 (magiconair-properties-51463bfca257_GH0.tar.gz) = 26c2060236f442448d93e0c43c59907cddc980657970fb6ac2c94f0e479671ae
-SIZE (magiconair-properties-51463bfca257_GH0.tar.gz) = 27510
-SHA256 (mailru-easyjson-b2ccc519800e_GH0.tar.gz) = 73bb6de76adeef10ca058b1a4ef8ebcf045eab25f72075f62bf26158eaae43d3
-SIZE (mailru-easyjson-b2ccc519800e_GH0.tar.gz) = 75658
-SHA256 (mattn-go-colorable-v0.1.2_GH0.tar.gz) = a7189bd9005c571303b117261955ce53b0e2aa89fe415e2289659be343fe1651
-SIZE (mattn-go-colorable-v0.1.2_GH0.tar.gz) = 8518
-SHA256 (mattn-go-isatty-v0.0.8_GH0.tar.gz) = 4f40edb394582f49ac6330bc807be93018216ef485eb65f00adcf61b670d4f3e
-SIZE (mattn-go-isatty-v0.0.8_GH0.tar.gz) = 3564
-SHA256 (mattn-go-runewidth-v0.0.4_GH0.tar.gz) = 1973c2de25bc69c3786a00e8118f4d22aa0d040bdfe46c8c8c30419b23e53dfe
-SIZE (mattn-go-runewidth-v0.0.4_GH0.tar.gz) = 19827
-SHA256 (mitchellh-go-homedir-v1.1.0_GH0.tar.gz) = 646671c73a84a8dfb4a5a76b80c7b63549ffefa906524d45077301bc7da76600
-SIZE (mitchellh-go-homedir-v1.1.0_GH0.tar.gz) = 3362
-SHA256 (mitchellh-mapstructure-cc8532a8e9a5_GH0.tar.gz) = 3e1f1f98a0a92eb38b2cbc7d2f78a9959225f2958d535b580ee1d74d2076dce6
-SIZE (mitchellh-mapstructure-cc8532a8e9a5_GH0.tar.gz) = 15611
-SHA256 (modern-go-concurrent-bacd9c7ef1dd_GH0.tar.gz) = d673e902118a6ece63198dc7e0961e904d0410f142726df0936ec1a52035a60f
-SIZE (modern-go-concurrent-bacd9c7ef1dd_GH0.tar.gz) = 7526
-SHA256 (modern-go-reflect2-v1.0.1_GH0.tar.gz) = d24e856d9aa8fd51b9e6c2cdd712a44c8d18cb8b72802f1bd16e0470322363fd
-SIZE (modern-go-reflect2-v1.0.1_GH0.tar.gz) = 14394
-SHA256 (olivere-elastic-v5.0.58_GH0.tar.gz) = 4ddf9994b653d62d3d298ebd1fc4adbf067554d3174a99dce23cb8bae6f38088
-SIZE (olivere-elastic-v5.0.58_GH0.tar.gz) = 291559
-SHA256 (olivere-elastic-v6.2.19_GH0.tar.gz) = 5425fc61c59badad23b642095a4e13465032195bbf501bcf256e7e376f80bd03
-SIZE (olivere-elastic-v6.2.19_GH0.tar.gz) = 372049
-SHA256 (olivere-env-v1.1.0_GH0.tar.gz) = 7cbbd4aae3831cc046691264197f222b5f9f13186c8739f7f63449bffb1fc0f5
-SIZE (olivere-env-v1.1.0_GH0.tar.gz) = 3311
-SHA256 (onsi-ginkgo-v1.7.0_GH0.tar.gz) = b6c221fe050cbdbbb1b2e2937a73949dad5aabb94213343a31786a5cd78314f9
-SIZE (onsi-ginkgo-v1.7.0_GH0.tar.gz) = 132975
-SHA256 (onsi-gomega-v1.4.3_GH0.tar.gz) = ee4dc5a8bdcf403b631f9e44b996730a36072f06e9aeeb4c527d3c764db37902
-SIZE (onsi-gomega-v1.4.3_GH0.tar.gz) = 87325
-SHA256 (opencontainers-go-digest-v1.0.0-rc1_GH0.tar.gz) = 3f511b32c46f60482644f0ad6a345f52e672c82164bfb08274f15f7c14cd3076
-SIZE (opencontainers-go-digest-v1.0.0-rc1_GH0.tar.gz) = 19206
-SHA256 (opencontainers-image-spec-v1.0.1_GH0.tar.gz) = c7ca467de2cca65e7ea74414a3f51e91450156213af485830dcdfff0571e10d2
-SIZE (opencontainers-image-spec-v1.0.1_GH0.tar.gz) = 138674
-SHA256 (opencontainers-runc-v0.1.1_GH0.tar.gz) = e59694701625218b26b40a8ab2401ef366a940467c61aa21c71f156ea9778f9e
-SIZE (opencontainers-runc-v0.1.1_GH0.tar.gz) = 496426
-SHA256 (pborman-uuid-1b00554d8222_GH0.tar.gz) = 7514b5ec1652bd23cd32302c4b44521236133fd8df27f2dffc8e80cd031dc84c
-SIZE (pborman-uuid-1b00554d8222_GH0.tar.gz) = 12801
-SHA256 (pelletier-go-buffruneio-v0.2.0_GH0.tar.gz) = 2a838bbc3240d323549c9e6820cbf66199296d2706e72697685ee9576affd49f
-SIZE (pelletier-go-buffruneio-v0.2.0_GH0.tar.gz) = 3028
-SHA256 (pelletier-go-toml-fe206efb84b2_GH0.tar.gz) = 0e46f622c9ef7194595461da33f12baefc3271d0f5407871a623af1102bd58fb
-SIZE (pelletier-go-toml-fe206efb84b2_GH0.tar.gz) = 46683
-SHA256 (peterh-liner-88609521dc4b_GH0.tar.gz) = 9045fb5fbb4d2f3850549fcdea6e560155bef823e1b058c477fe2fc87dc61f9f
-SIZE (peterh-liner-88609521dc4b_GH0.tar.gz) = 20382
-SHA256 (pkg-errors-v0.8.1_GH0.tar.gz) = 7a428967c6fc2e80cd84a0d9469ab6bd4dbe6b13493ba6294322a933a5a7e356
-SIZE (pkg-errors-v0.8.1_GH0.tar.gz) = 11009
-SHA256 (pkg-sftp-v1.10.0_GH0.tar.gz) = 583c05019b7c1f3aa9669394f29bf3bf22441498124d1313d9c77f7ef3fdd760
-SIZE (pkg-sftp-v1.10.0_GH0.tar.gz) = 69907
-SHA256 (pmezard-go-difflib-v1.0.0_GH0.tar.gz) = 28f3dc1b5c0efd61203ab07233f774740d3bf08da4d8153fb5310db6cea0ebda
-SIZE (pmezard-go-difflib-v1.0.0_GH0.tar.gz) = 11398
-SHA256 (pquerna-ffjson-e517b90714f7_GH0.tar.gz) = 9acdddc1fdd0e8a703e5be93ad477c7851b9e5d278fa4512fb4e6bb8374ecaba
-SIZE (pquerna-ffjson-e517b90714f7_GH0.tar.gz) = 103447
-SHA256 (rs-zerolog-v1.14.3_GH0.tar.gz) = feb7cb5f9ae807ccf06ac97d67af8a836f1a6d2612baecadd90df3fe8bd1a4ff
-SIZE (rs-zerolog-v1.14.3_GH0.tar.gz) = 212313
-SHA256 (russross-blackfriday-v1.5.2_GH0.tar.gz) = 626138a08abb8579474a555e9d45cb5260629a2c07e8834428620a650dc9f195
-SIZE (russross-blackfriday-v1.5.2_GH0.tar.gz) = 75779
-SHA256 (satori-go.uuid-v1.2.0_GH0.tar.gz) = 6f9d9549958252d7c5a5ed1cabeedeaab7a600ca0b888a3666cce4c3590aa5a7
-SIZE (satori-go.uuid-v1.2.0_GH0.tar.gz) = 8297
-SHA256 (shopspring-decimal-cd690d0c9e24_GH0.tar.gz) = 4ed4e56c00a66cef0e6c836336b57cbbf2b59a728f7c6df2638d2b39407308d1
-SIZE (shopspring-decimal-cd690d0c9e24_GH0.tar.gz) = 36822
-SHA256 (sirupsen-logrus-v1.0.6_GH0.tar.gz) = 238e9909e469f98285ce4d3bad3c513fc0b7ea6142f0dc5388d6062125902edb
-SIZE (sirupsen-logrus-v1.0.6_GH0.tar.gz) = 29022
-SHA256 (smartystreets-go-aws-auth-0c1422d1fdb9_GH0.tar.gz) = 4a354024643da720fab40e2980316b4e89f38742889b66f7ba515d06e25b83de
-SIZE (smartystreets-go-aws-auth-0c1422d1fdb9_GH0.tar.gz) = 15601
-SHA256 (spf13-afero-9be650865eab_GH0.tar.gz) = e455d4ae29952c7e361664957b1c248eb9b3ec4c547f178645266952fecbd22d
-SIZE (spf13-afero-9be650865eab_GH0.tar.gz) = 40623
-SHA256 (spf13-cast-v1.1.0_GH0.tar.gz) = 2758eb969dd8707c0ff165fda4191fd8811e19b0c5d29d3dced0fba1b4410ad4
-SIZE (spf13-cast-v1.1.0_GH0.tar.gz) = 9592
-SHA256 (spf13-cobra-7b1b6e8dc027_GH0.tar.gz) = 210eda6837ebc37e10b8aa13be0a04ff4d48688d2ee72b292a7fc9f97ce007a3
-SIZE (spf13-cobra-7b1b6e8dc027_GH0.tar.gz) = 90278
-SHA256 (spf13-jwalterweatherman-fa7ca7e836cf_GH0.tar.gz) = 2864d6867b3212e6116b6a6b4bf2636c50fe4b973b5f26249b7ff4da58e8ede9
-SIZE (spf13-jwalterweatherman-fa7ca7e836cf_GH0.tar.gz) = 6255
-SHA256 (spf13-pflag-f1d95a35e132_GH0.tar.gz) = c4165ca50bebbd590478c5755e8167ec00f0d39e5368407548406e424bd5d464
-SIZE (spf13-pflag-f1d95a35e132_GH0.tar.gz) = 39336
-SHA256 (spf13-viper-0967fc9aceab_GH0.tar.gz) = 81b38a08354cd6b73b5475a362635196b3581b2aa1f6ab7a26fe51fc5721b090
-SIZE (spf13-viper-0967fc9aceab_GH0.tar.gz) = 30669
-SHA256 (stretchr-testify-v1.2.2_GH0.tar.gz) = 0728bb470254e8b39deae3e6c1c92a98e737239ae0be484188fb9083250adf5f
-SIZE (stretchr-testify-v1.2.2_GH0.tar.gz) = 101698
-SHA256 (syndtr-goleveldb-b89cc31ef797_GH0.tar.gz) = baabb1235873f39efc56d73cceac9d567d2f87765e5136df3aeedcb764debd84
-SIZE (syndtr-goleveldb-b89cc31ef797_GH0.tar.gz) = 137463
-SHA256 (tylertreat-BoomFilters-37e169ae37ed_GH0.tar.gz) = d00a4037f04e517e53e8cb5add6dadeae666773563de00018439128953fcf3b3
-SIZE (tylertreat-BoomFilters-37e169ae37ed_GH0.tar.gz) = 37244
-SHA256 (uber-go-atomic-v1.4.0_GH0.tar.gz) = e29f5050185d29a6ffc361036dd5de9a88af0c73dfa59c16832e4134cff3ee0f
-SIZE (uber-go-atomic-v1.4.0_GH0.tar.gz) = 8494
-SHA256 (uber-go-multierr-v1.1.0_GH0.tar.gz) = 45405583513302d57d4715fada5ef8c8dbd9c9992956f2d0faa8758d9d885851
-SIZE (uber-go-multierr-v1.1.0_GH0.tar.gz) = 9234
-SHA256 (uber-go-zap-v1.10.0_GH0.tar.gz) = 9122a10e6cca67b5231036b8da73f3ce5c7ba6ebae94314533f04e200973002e
-SIZE (uber-go-zap-v1.10.0_GH0.tar.gz) = 112084
-SHA256 (ugorji-go-v1.1.5-pre_GH0.tar.gz) = 93f87c981bc4c99b1bb57519cd7d3250e5a42d1ab13923ee41bdd8590e31b6d8
-SIZE (ugorji-go-v1.1.5-pre_GH0.tar.gz) = 286855
-SHA256 (xordataexchange-crypt-v0.0.2_GH0.tar.gz) = f8203f73cb62049254ef1d43fb202c025f65f8fe7f9f49e3a8ef934ed38e31f7
-SIZE (xordataexchange-crypt-v0.0.2_GH0.tar.gz) = 9045
+TIMESTAMP = 1680112440
+SHA256 (go/databases_cayley/cayley-v0.7.7/v0.7.7.mod) = fa25f58e0fb938fb7302c8fc3cfe009607b6134a7edc99117e58504623a33fa9
+SIZE (go/databases_cayley/cayley-v0.7.7/v0.7.7.mod) = 2824
+SHA256 (go/databases_cayley/cayley-v0.7.7/v0.7.7.zip) = 7a2434c5a9257ad487f854d8e640c39111b9fe0109e0162baf3f288f433ca4b7
+SIZE (go/databases_cayley/cayley-v0.7.7/v0.7.7.zip) = 4772261
+SHA256 (go/databases_cayley/cayley-v0.7.7/golang-sys-v0.6.0_GH0.tar.gz) = b4f6d17c7a128f76169964b437cb66b3f2dbf9a33361928ec19dfecf7b03fc54
+SIZE (go/databases_cayley/cayley-v0.7.7/golang-sys-v0.6.0_GH0.tar.gz) = 1434234
diff --git a/databases/cayley/files/patch-go.mod b/databases/cayley/files/patch-go.mod
new file mode 100644
index 000000000000..5a4f93e3bbb1
--- /dev/null
+++ b/databases/cayley/files/patch-go.mod
@@ -0,0 +1,142 @@
+--- go.mod.orig	2023-03-29 18:02:33 UTC
++++ go.mod
+@@ -1,61 +1,114 @@
+ module github.com/cayleygraph/cayley
+ 
+-go 1.12
++go 1.17
+ 
+ require (
+ 	github.com/badgerodon/peg v0.0.0-20130729175151-9e5f7f4d07ca
+ 	github.com/cayleygraph/quad v1.1.0
++	github.com/cznic/mathutil v0.0.0-20170313102836-1447ad269d64
++	github.com/dennwc/graphql v0.0.0-20180603144102-12cfed44bc5d
++	github.com/dop251/goja v0.0.0-20190105122144-6d5bf35058fa
++	github.com/fsouza/go-dockerclient v1.2.2
++	github.com/go-sql-driver/mysql v1.4.1
++	github.com/gobuffalo/packr/v2 v2.7.1
++	github.com/gogo/protobuf v1.3.0
++	github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b
++	github.com/hidal-go/hidalgo v0.0.0-20190814174001-42e03f3b5eaa
++	github.com/jackc/pgx v3.3.0+incompatible
++	github.com/julienschmidt/httprouter v1.2.0
++	github.com/lib/pq v1.1.1
++	github.com/mattn/go-sqlite3 v1.10.0
++	github.com/peterh/liner v0.0.0-20170317030525-88609521dc4b
++	github.com/prometheus/client_golang v0.9.3
++	github.com/russross/blackfriday v1.5.2
++	github.com/spf13/cobra v0.0.5
++	github.com/spf13/viper v1.4.0
++	github.com/stretchr/testify v1.4.0
++	github.com/syndtr/goleveldb v1.0.0
++	github.com/tylertreat/BoomFilters v0.0.0-20181028192813-611b3dbe80e8
++	golang.org/x/net v0.0.0-20190628185345-da137c7871d7
++	google.golang.org/appengine v1.6.1
++)
++
++require (
++	github.com/AndreasBriese/bbloom v0.0.0-20190306092124-e2d15f34fcf9 // indirect
++	github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78 // indirect
++	github.com/Microsoft/go-winio v0.4.12 // indirect
++	github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5 // indirect
++	github.com/beorn7/perks v1.0.0 // indirect
++	github.com/boltdb/bolt v1.3.1 // indirect
++	github.com/cenkalti/backoff v2.1.1+incompatible // indirect
+ 	github.com/cockroachdb/apd v1.1.0 // indirect
+ 	github.com/containerd/continuity v0.0.0-20190426062206-aaeac12a7ffc // indirect
+ 	github.com/coreos/bbolt v1.3.3 // indirect
+-	github.com/cznic/mathutil v0.0.0-20170313102836-1447ad269d64
+ 	github.com/d4l3k/messagediff v1.2.1 // indirect
+-	github.com/dennwc/graphql v0.0.0-20180603144102-12cfed44bc5d
++	github.com/davecgh/go-spew v1.1.1 // indirect
++	github.com/dennwc/base v1.0.0 // indirect
+ 	github.com/dgraph-io/badger v1.5.5 // indirect
++	github.com/dgryski/go-farm v0.0.0-20190423205320-6a90982ecee2 // indirect
+ 	github.com/dlclark/regexp2 v1.1.4 // indirect
+ 	github.com/docker/docker v0.7.3-0.20180412203414-a422774e593b // indirect
++	github.com/docker/go-connections v0.4.0 // indirect
+ 	github.com/docker/go-units v0.4.0 // indirect
+-	github.com/dop251/goja v0.0.0-20190105122144-6d5bf35058fa
+ 	github.com/flimzy/diff v0.1.6 // indirect
+-	github.com/fsouza/go-dockerclient v1.2.2
++	github.com/flimzy/kivik v1.8.1 // indirect
++	github.com/fsnotify/fsnotify v1.4.7 // indirect
++	github.com/go-kivik/couchdb v1.8.1 // indirect
++	github.com/go-kivik/kivik v1.8.1 // indirect
++	github.com/go-kivik/pouchdb v1.3.5 // indirect
+ 	github.com/go-sourcemap/sourcemap v2.1.2+incompatible // indirect
+-	github.com/go-sql-driver/mysql v1.4.1
+-	github.com/gobuffalo/packr/v2 v2.7.1
+-	github.com/gogo/protobuf v1.3.0
+-	github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b
++	github.com/go-stack/stack v1.8.0 // indirect
++	github.com/gobuffalo/envy v1.7.1 // indirect
++	github.com/gobuffalo/logger v1.0.1 // indirect
++	github.com/gobuffalo/packd v0.3.0 // indirect
++	github.com/golang/protobuf v1.3.1 // indirect
++	github.com/golang/snappy v0.0.1 // indirect
+ 	github.com/google/go-cmp v0.3.0 // indirect
++	github.com/google/uuid v1.1.1 // indirect
+ 	github.com/gopherjs/gopherjs v0.0.0-20190430165422-3e4dfb77656c // indirect
+-	github.com/hidal-go/hidalgo v0.0.0-20190814174001-42e03f3b5eaa
++	github.com/gopherjs/jsbuiltin v0.0.0-20180426082241-50091555e127 // indirect
++	github.com/hashicorp/hcl v1.0.0 // indirect
++	github.com/imdario/mergo v0.3.7 // indirect
++	github.com/inconshreveable/mousetrap v1.0.0 // indirect
+ 	github.com/jackc/fake v0.0.0-20150926172116-812a484cc733 // indirect
+-	github.com/jackc/pgx v3.3.0+incompatible
+-	github.com/julienschmidt/httprouter v1.2.0
+-	github.com/lib/pq v1.1.1
++	github.com/joho/godotenv v1.3.0 // indirect
++	github.com/konsorten/go-windows-terminal-sequences v1.0.2 // indirect
++	github.com/linkeddata/gojsonld v0.0.0-20170418210642-4f5db6791326 // indirect
+ 	github.com/magiconair/properties v1.8.1 // indirect
+ 	github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e // indirect
+-	github.com/mattn/go-sqlite3 v1.10.0
++	github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
++	github.com/mitchellh/mapstructure v1.1.2 // indirect
++	github.com/opencontainers/go-digest v1.0.0-rc1 // indirect
++	github.com/opencontainers/image-spec v1.0.1 // indirect
++	github.com/opencontainers/runc v0.1.1 // indirect
+ 	github.com/opencontainers/selinux v1.0.0 // indirect
++	github.com/ory/dockertest v3.3.4+incompatible // indirect
++	github.com/pborman/uuid v1.2.0 // indirect
+ 	github.com/pelletier/go-toml v1.4.0 // indirect
+-	github.com/peterh/liner v0.0.0-20170317030525-88609521dc4b
+-	github.com/prometheus/client_golang v0.9.3
++	github.com/pkg/errors v0.8.1 // indirect
++	github.com/pmezard/go-difflib v1.0.0 // indirect
++	github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90 // indirect
++	github.com/prometheus/common v0.4.0 // indirect
++	github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084 // indirect
+ 	github.com/rogpeppe/go-internal v1.5.0 // indirect
+-	github.com/russross/blackfriday v1.5.2
+ 	github.com/satori/go.uuid v1.2.0 // indirect
+ 	github.com/shopspring/decimal v0.0.0-20180709203117-cd690d0c9e24 // indirect
++	github.com/sirupsen/logrus v1.4.2 // indirect
+ 	github.com/spf13/afero v1.2.2 // indirect
+-	github.com/spf13/cobra v0.0.5
++	github.com/spf13/cast v1.3.0 // indirect
+ 	github.com/spf13/jwalterweatherman v1.1.0 // indirect
+ 	github.com/spf13/pflag v1.0.5 // indirect
+-	github.com/spf13/viper v1.4.0
+-	github.com/stretchr/testify v1.4.0
+-	github.com/syndtr/goleveldb v1.0.0
+-	github.com/tylertreat/BoomFilters v0.0.0-20181028192813-611b3dbe80e8
++	github.com/xdg/scram v0.0.0-20180814205039-7eeb5667e42c // indirect
++	github.com/xdg/stringprep v1.0.0 // indirect
+ 	go.etcd.io/bbolt v1.3.3 // indirect
++	go.mongodb.org/mongo-driver v1.0.4 // indirect
+ 	golang.org/x/crypto v0.0.0-20191002192127-34f69633bfdc // indirect
+-	golang.org/x/net v0.0.0-20190628185345-da137c7871d7
+-	golang.org/x/sys v0.0.0-20191009170203-06d7bd2c5f4f // indirect
++	golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e // indirect
++	golang.org/x/sys v0.6.0 // indirect
++	golang.org/x/text v0.3.2 // indirect
+ 	golang.org/x/tools v0.0.0-20191010075000-0337d82405ff // indirect
+-	google.golang.org/appengine v1.6.1
+ 	gopkg.in/olivere/elastic.v5 v5.0.81 // indirect
++	gopkg.in/yaml.v2 v2.2.2 // indirect
+ )
+ 
+ replace github.com/Sirupsen/logrus => github.com/Sirupsen/logrus v1.0.1
diff --git a/databases/cayley/files/patch-go.sum b/databases/cayley/files/patch-go.sum
new file mode 100644
index 000000000000..8f676bd8f9f9
--- /dev/null
+++ b/databases/cayley/files/patch-go.sum
@@ -0,0 +1,11 @@
+--- go.sum.orig	2023-03-29 18:02:36 UTC
++++ go.sum
+@@ -385,6 +385,8 @@ golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go
+ golang.org/x/sys v0.0.0-20190614160838-b47fdc937951/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+ golang.org/x/sys v0.0.0-20191009170203-06d7bd2c5f4f h1:hjzMYz/7Ea1mNKfOnFOfktR0mlA5jqhvywClCMHM/qw=
+ golang.org/x/sys v0.0.0-20191009170203-06d7bd2c5f4f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
++golang.org/x/sys v0.6.0 h1:MVltZSvRTcU2ljQOhs94SXPftV6DCNnZViHeQps87pQ=
++golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+ golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+ golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+ golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs=
diff --git a/databases/cayley/files/patch-vendor_github.com_boltdb_bolt_bolt__riscv64.go b/databases/cayley/files/patch-vendor_github.com_boltdb_bolt_bolt__riscv64.go
new file mode 100644
index 000000000000..8b11be4f4104
--- /dev/null
+++ b/databases/cayley/files/patch-vendor_github.com_boltdb_bolt_bolt__riscv64.go
@@ -0,0 +1,16 @@
+--- /dev/null	2023-03-29 16:51:35 UTC
++++ vendor/github.com/boltdb/bolt/bolt_riscv64.go
+@@ -0,0 +1,13 @@
++//go:build riscv64
++// +build riscv64
++
++package bolt
++
++// maxMapSize represents the largest mmap size supported by Bolt.
++const maxMapSize = 0xFFFFFFFFFFFF // 256TB
++
++// maxAllocSize is the size used when creating array pointers.
++const maxAllocSize = 0x7FFFFFFF
++
++// are unaligned reads/writes not supported?
++var brokenUnaligned = false
diff --git a/databases/cayley/files/patch-vendor_modules.txt b/databases/cayley/files/patch-vendor_modules.txt
new file mode 100644
index 000000000000..5dcf32498f89
--- /dev/null
+++ b/databases/cayley/files/patch-vendor_modules.txt
@@ -0,0 +1,414 @@
+--- vendor/modules.txt.orig	2023-03-29 18:04:45 UTC
++++ vendor/modules.txt
+@@ -1,19 +1,27 @@
+ # github.com/AndreasBriese/bbloom v0.0.0-20190306092124-e2d15f34fcf9
++## explicit
+ github.com/AndreasBriese/bbloom
+ # github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78
++## explicit
+ github.com/Azure/go-ansiterm
+ github.com/Azure/go-ansiterm/winterm
+ # github.com/Microsoft/go-winio v0.4.12
++## explicit
+ github.com/Microsoft/go-winio
+ # github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5
++## explicit
+ github.com/Nvveen/Gotty
+ # github.com/badgerodon/peg v0.0.0-20130729175151-9e5f7f4d07ca
++## explicit
+ github.com/badgerodon/peg
+ # github.com/beorn7/perks v1.0.0
++## explicit; go 1.12
+ github.com/beorn7/perks/quantile
+ # github.com/boltdb/bolt v1.3.1
++## explicit
+ github.com/boltdb/bolt
+ # github.com/cayleygraph/quad v1.1.0
++## explicit; go 1.12
+ github.com/cayleygraph/quad
+ github.com/cayleygraph/quad/dot
+ github.com/cayleygraph/quad/gml
+@@ -29,18 +37,29 @@ github.com/cayleygraph/quad/voc/rdf
+ github.com/cayleygraph/quad/voc/rdfs
+ github.com/cayleygraph/quad/voc/schema
+ # github.com/cenkalti/backoff v2.1.1+incompatible
++## explicit
+ github.com/cenkalti/backoff
++# github.com/cockroachdb/apd v1.1.0
++## explicit
+ # github.com/containerd/continuity v0.0.0-20190426062206-aaeac12a7ffc
++## explicit
+ github.com/containerd/continuity/pathdriver
+ # github.com/coreos/bbolt v1.3.3
++## explicit
+ github.com/coreos/bbolt
+ # github.com/cznic/mathutil v0.0.0-20170313102836-1447ad269d64
++## explicit
+ github.com/cznic/mathutil
++# github.com/d4l3k/messagediff v1.2.1
++## explicit
+ # github.com/davecgh/go-spew v1.1.1
++## explicit
+ github.com/davecgh/go-spew/spew
+ # github.com/dennwc/base v1.0.0
++## explicit
+ github.com/dennwc/base
+ # github.com/dennwc/graphql v0.0.0-20180603144102-12cfed44bc5d
++## explicit
+ github.com/dennwc/graphql/gqlerrors
+ github.com/dennwc/graphql/language/ast
+ github.com/dennwc/graphql/language/kinds
+@@ -49,6 +68,7 @@ github.com/dennwc/graphql/language/location
+ github.com/dennwc/graphql/language/parser
+ github.com/dennwc/graphql/language/source
+ # github.com/dgraph-io/badger v1.5.5
++## explicit; go 1.12
+ github.com/dgraph-io/badger
+ github.com/dgraph-io/badger/options
+ github.com/dgraph-io/badger/protos
+@@ -56,11 +76,14 @@ github.com/dgraph-io/badger/skl
+ github.com/dgraph-io/badger/table
+ github.com/dgraph-io/badger/y
+ # github.com/dgryski/go-farm v0.0.0-20190423205320-6a90982ecee2
++## explicit
+ github.com/dgryski/go-farm
+ # github.com/dlclark/regexp2 v1.1.4
++## explicit
+ github.com/dlclark/regexp2
+ github.com/dlclark/regexp2/syntax
+ # github.com/docker/docker v0.7.3-0.20180412203414-a422774e593b
++## explicit
+ github.com/docker/docker/api/types
+ github.com/docker/docker/api/types/blkiodev
+ github.com/docker/docker/api/types/container
+@@ -83,51 +106,69 @@ github.com/docker/docker/pkg/pools
+ github.com/docker/docker/pkg/stdcopy
+ github.com/docker/docker/pkg/system
+ # github.com/docker/go-connections v0.4.0
++## explicit
+ github.com/docker/go-connections/nat
+ # github.com/docker/go-units v0.4.0
++## explicit
+ github.com/docker/go-units
+ # github.com/dop251/goja v0.0.0-20190105122144-6d5bf35058fa
++## explicit
+ github.com/dop251/goja
+ github.com/dop251/goja/ast
+ github.com/dop251/goja/file
+ github.com/dop251/goja/parser
+ github.com/dop251/goja/token
++# github.com/flimzy/diff v0.1.6
++## explicit
+ # github.com/flimzy/kivik v1.8.1
++## explicit
+ github.com/flimzy/kivik
+ github.com/flimzy/kivik/driver
+ github.com/flimzy/kivik/errors
+ # github.com/fsnotify/fsnotify v1.4.7
++## explicit
+ github.com/fsnotify/fsnotify
+ # github.com/fsouza/go-dockerclient v1.2.2
++## explicit
+ github.com/fsouza/go-dockerclient
+ github.com/fsouza/go-dockerclient/internal/archive
+ github.com/fsouza/go-dockerclient/internal/jsonmessage
+ github.com/fsouza/go-dockerclient/internal/term
+ # github.com/go-kivik/couchdb v1.8.1
++## explicit
+ github.com/go-kivik/couchdb
+ github.com/go-kivik/couchdb/chttp
+ # github.com/go-kivik/kivik v1.8.1
++## explicit
+ github.com/go-kivik/kivik
+ github.com/go-kivik/kivik/driver
+ github.com/go-kivik/kivik/errors
+ # github.com/go-kivik/pouchdb v1.3.5
++## explicit
+ github.com/go-kivik/pouchdb
+ github.com/go-kivik/pouchdb/bindings
+ # github.com/go-sourcemap/sourcemap v2.1.2+incompatible
++## explicit
+ github.com/go-sourcemap/sourcemap
+ github.com/go-sourcemap/sourcemap/internal/base64vlq
+ # github.com/go-sql-driver/mysql v1.4.1
++## explicit
+ github.com/go-sql-driver/mysql
+ # github.com/go-stack/stack v1.8.0
++## explicit
+ github.com/go-stack/stack
+ # github.com/gobuffalo/envy v1.7.1
++## explicit; go 1.13
+ github.com/gobuffalo/envy
+ # github.com/gobuffalo/logger v1.0.1
++## explicit; go 1.12
+ github.com/gobuffalo/logger
+ # github.com/gobuffalo/packd v0.3.0
++## explicit; go 1.12
+ github.com/gobuffalo/packd
+ github.com/gobuffalo/packd/internal/takeon/github.com/markbates/errx
+ # github.com/gobuffalo/packr/v2 v2.7.1
++## explicit; go 1.13
+ github.com/gobuffalo/packr/v2
+ github.com/gobuffalo/packr/v2/file
+ github.com/gobuffalo/packr/v2/file/resolver
+@@ -144,22 +185,32 @@ github.com/gobuffalo/packr/v2/packr2/cmd
+ github.com/gobuffalo/packr/v2/packr2/cmd/fix
+ github.com/gobuffalo/packr/v2/plog
+ # github.com/gogo/protobuf v1.3.0
++## explicit
+ github.com/gogo/protobuf/gogoproto
+ github.com/gogo/protobuf/proto
+ github.com/gogo/protobuf/protoc-gen-gogo/descriptor
+ # github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b
++## explicit
+ github.com/golang/glog
+ # github.com/golang/protobuf v1.3.1
++## explicit
+ github.com/golang/protobuf/proto
+ # github.com/golang/snappy v0.0.1
++## explicit
+ github.com/golang/snappy
++# github.com/google/go-cmp v0.3.0
++## explicit; go 1.8
+ # github.com/google/uuid v1.1.1
++## explicit
+ github.com/google/uuid
+ # github.com/gopherjs/gopherjs v0.0.0-20190430165422-3e4dfb77656c
++## explicit
+ github.com/gopherjs/gopherjs/js
+ # github.com/gopherjs/jsbuiltin v0.0.0-20180426082241-50091555e127
++## explicit
+ github.com/gopherjs/jsbuiltin
+ # github.com/hashicorp/hcl v1.0.0
++## explicit
+ github.com/hashicorp/hcl
+ github.com/hashicorp/hcl/hcl/ast
+ github.com/hashicorp/hcl/hcl/parser
+@@ -171,6 +222,7 @@ github.com/hashicorp/hcl/json/parser
+ github.com/hashicorp/hcl/json/scanner
+ github.com/hashicorp/hcl/json/token
+ # github.com/hidal-go/hidalgo v0.0.0-20190814174001-42e03f3b5eaa
++## explicit
+ github.com/hidal-go/hidalgo/base
+ github.com/hidal-go/hidalgo/kv
+ github.com/hidal-go/hidalgo/kv/all
+@@ -193,10 +245,15 @@ github.com/hidal-go/hidalgo/legacy/nosql/mongo/test
+ github.com/hidal-go/hidalgo/legacy/nosql/nosqltest
+ github.com/hidal-go/hidalgo/legacy/nosql/nosqltest/all
+ # github.com/imdario/mergo v0.3.7
++## explicit
+ github.com/imdario/mergo
+ # github.com/inconshreveable/mousetrap v1.0.0
++## explicit
+ github.com/inconshreveable/mousetrap
++# github.com/jackc/fake v0.0.0-20150926172116-812a484cc733
++## explicit
+ # github.com/jackc/pgx v3.3.0+incompatible
++## explicit
+ github.com/jackc/pgx
+ github.com/jackc/pgx/chunkreader
+ github.com/jackc/pgx/internal/sanitize
+@@ -205,38 +262,54 @@ github.com/jackc/pgx/pgproto3
+ github.com/jackc/pgx/pgtype
+ github.com/jackc/pgx/stdlib
+ # github.com/joho/godotenv v1.3.0
++## explicit
+ github.com/joho/godotenv
+ # github.com/julienschmidt/httprouter v1.2.0
++## explicit
+ github.com/julienschmidt/httprouter
+ # github.com/konsorten/go-windows-terminal-sequences v1.0.2
++## explicit
+ github.com/konsorten/go-windows-terminal-sequences
+ # github.com/lib/pq v1.1.1
++## explicit
+ github.com/lib/pq
+ github.com/lib/pq/oid
+ github.com/lib/pq/scram
+ # github.com/linkeddata/gojsonld v0.0.0-20170418210642-4f5db6791326
++## explicit
+ github.com/linkeddata/gojsonld
+ # github.com/magiconair/properties v1.8.1
++## explicit
+ github.com/magiconair/properties
+ # github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e
++## explicit
+ github.com/mailru/easyjson
+ github.com/mailru/easyjson/buffer
+ github.com/mailru/easyjson/jlexer
+ github.com/mailru/easyjson/jwriter
+ # github.com/mattn/go-sqlite3 v1.10.0
++## explicit
+ github.com/mattn/go-sqlite3
+ # github.com/matttproud/golang_protobuf_extensions v1.0.1
++## explicit
+ github.com/matttproud/golang_protobuf_extensions/pbutil
+ # github.com/mitchellh/mapstructure v1.1.2
++## explicit
+ github.com/mitchellh/mapstructure
+ # github.com/opencontainers/go-digest v1.0.0-rc1
++## explicit
+ github.com/opencontainers/go-digest
+ # github.com/opencontainers/image-spec v1.0.1
++## explicit
+ github.com/opencontainers/image-spec/specs-go
+ github.com/opencontainers/image-spec/specs-go/v1
+ # github.com/opencontainers/runc v0.1.1
++## explicit
+ github.com/opencontainers/runc/libcontainer/user
++# github.com/opencontainers/selinux v1.0.0
++## explicit
+ # github.com/ory/dockertest v3.3.4+incompatible
++## explicit
+ github.com/ory/dockertest
+ github.com/ory/dockertest/docker
+ github.com/ory/dockertest/docker/opts
+@@ -263,54 +336,78 @@ github.com/ory/dockertest/docker/types/registry
+ github.com/ory/dockertest/docker/types/strslice
+ github.com/ory/dockertest/docker/types/versions
+ # github.com/pborman/uuid v1.2.0
++## explicit
+ github.com/pborman/uuid
+ # github.com/pelletier/go-toml v1.4.0
++## explicit; go 1.12
+ github.com/pelletier/go-toml
+ # github.com/peterh/liner v0.0.0-20170317030525-88609521dc4b
++## explicit
+ github.com/peterh/liner
+ # github.com/pkg/errors v0.8.1
++## explicit
+ github.com/pkg/errors
+ # github.com/pmezard/go-difflib v1.0.0
++## explicit
+ github.com/pmezard/go-difflib/difflib
+ # github.com/prometheus/client_golang v0.9.3
++## explicit
+ github.com/prometheus/client_golang/prometheus
+ github.com/prometheus/client_golang/prometheus/internal
+ github.com/prometheus/client_golang/prometheus/promauto
+ github.com/prometheus/client_golang/prometheus/promhttp
+ # github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90
++## explicit; go 1.9
+ github.com/prometheus/client_model/go
+ # github.com/prometheus/common v0.4.0
++## explicit
+ github.com/prometheus/common/expfmt
+ github.com/prometheus/common/internal/bitbucket.org/ww/goautoneg
+ github.com/prometheus/common/model
+ # github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084
++## explicit
+ github.com/prometheus/procfs
+ github.com/prometheus/procfs/internal/fs
+ # github.com/rogpeppe/go-internal v1.5.0
++## explicit; go 1.11
+ github.com/rogpeppe/go-internal/modfile
+ github.com/rogpeppe/go-internal/module
+ github.com/rogpeppe/go-internal/semver
+ # github.com/russross/blackfriday v1.5.2
++## explicit
+ github.com/russross/blackfriday
++# github.com/satori/go.uuid v1.2.0
++## explicit
++# github.com/shopspring/decimal v0.0.0-20180709203117-cd690d0c9e24
++## explicit
+ # github.com/sirupsen/logrus v1.4.2
++## explicit
+ github.com/sirupsen/logrus
+ # github.com/spf13/afero v1.2.2
++## explicit
+ github.com/spf13/afero
+ github.com/spf13/afero/mem
+ # github.com/spf13/cast v1.3.0
++## explicit
+ github.com/spf13/cast
+ # github.com/spf13/cobra v0.0.5
++## explicit; go 1.12
+ github.com/spf13/cobra
+ # github.com/spf13/jwalterweatherman v1.1.0
++## explicit
+ github.com/spf13/jwalterweatherman
+ # github.com/spf13/pflag v1.0.5
++## explicit; go 1.12
+ github.com/spf13/pflag
+ # github.com/spf13/viper v1.4.0
++## explicit
+ github.com/spf13/viper
+ # github.com/stretchr/testify v1.4.0
++## explicit
+ github.com/stretchr/testify/assert
+ github.com/stretchr/testify/require
+ # github.com/syndtr/goleveldb v1.0.0
++## explicit
+ github.com/syndtr/goleveldb/leveldb
+ github.com/syndtr/goleveldb/leveldb/cache
+ github.com/syndtr/goleveldb/leveldb/comparer
+@@ -324,12 +421,18 @@ github.com/syndtr/goleveldb/leveldb/storage
+ github.com/syndtr/goleveldb/leveldb/table
+ github.com/syndtr/goleveldb/leveldb/util
+ # github.com/tylertreat/BoomFilters v0.0.0-20181028192813-611b3dbe80e8
++## explicit
+ github.com/tylertreat/BoomFilters
+ # github.com/xdg/scram v0.0.0-20180814205039-7eeb5667e42c
++## explicit
+ github.com/xdg/scram
+ # github.com/xdg/stringprep v1.0.0
++## explicit
+ github.com/xdg/stringprep
++# go.etcd.io/bbolt v1.3.3
++## explicit
+ # go.mongodb.org/mongo-driver v1.0.4
++## explicit
+ go.mongodb.org/mongo-driver/bson
+ go.mongodb.org/mongo-driver/bson/bsoncodec
+ go.mongodb.org/mongo-driver/bson/bsonrw
+@@ -361,20 +464,26 @@ go.mongodb.org/mongo-driver/x/network/description
+ go.mongodb.org/mongo-driver/x/network/result
+ go.mongodb.org/mongo-driver/x/network/wiremessage
+ # golang.org/x/crypto v0.0.0-20191002192127-34f69633bfdc
++## explicit
+ golang.org/x/crypto/pbkdf2
+ golang.org/x/crypto/ssh/terminal
+ # golang.org/x/net v0.0.0-20190628185345-da137c7871d7
++## explicit; go 1.11
+ golang.org/x/net/context
+ golang.org/x/net/internal/timeseries
+ golang.org/x/net/publicsuffix
+ golang.org/x/net/trace
+ # golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e
++## explicit
+ golang.org/x/sync/errgroup
+ golang.org/x/sync/semaphore
+-# golang.org/x/sys v0.0.0-20191009170203-06d7bd2c5f4f
++# golang.org/x/sys v0.6.0
++## explicit; go 1.17
++golang.org/x/sys/internal/unsafeheader
+ golang.org/x/sys/unix
+ golang.org/x/sys/windows
+ # golang.org/x/text v0.3.2
++## explicit
+ golang.org/x/text/cases
+ golang.org/x/text/collate
+ golang.org/x/text/internal
+@@ -386,8 +495,10 @@ golang.org/x/text/language
+ golang.org/x/text/transform
+ golang.org/x/text/unicode/norm
+ # golang.org/x/tools v0.0.0-20191010075000-0337d82405ff
++## explicit; go 1.11
+ golang.org/x/tools/go/ast/astutil
+ # google.golang.org/appengine v1.6.1
++## explicit
+ google.golang.org/appengine
+ google.golang.org/appengine/aetest
+ google.golang.org/appengine/cloudsql
+@@ -404,8 +515,11 @@ google.golang.org/appengine/internal/remote_api
+ google.golang.org/appengine/internal/user
+ google.golang.org/appengine/user
+ # gopkg.in/olivere/elastic.v5 v5.0.81
++## explicit
+ gopkg.in/olivere/elastic.v5
+ gopkg.in/olivere/elastic.v5/config
+ gopkg.in/olivere/elastic.v5/uritemplates
+ # gopkg.in/yaml.v2 v2.2.2
++## explicit
+ gopkg.in/yaml.v2
++# github.com/Sirupsen/logrus => github.com/Sirupsen/logrus v1.0.1
diff --git a/databases/cayley/pkg-descr b/databases/cayley/pkg-descr
index 86e5c366a5ba..dd287e01fdb9 100644
--- a/databases/cayley/pkg-descr
+++ b/databases/cayley/pkg-descr
@@ -4,5 +4,3 @@ and Google's Knowledge Graph.
 Its goal is to be a part of the developer's toolbox where Linked Data and
 graph-shaped data (semantic webs, social networks, etc) in general are
 concerned.
-
-WWW: https://github.com/cayleygraph/cayley
diff --git a/databases/cdb/Makefile b/databases/cdb/Makefile
index b89e67756c0b..5b32880e0899 100644
--- a/databases/cdb/Makefile
+++ b/databases/cdb/Makefile
@@ -1,5 +1,3 @@
-# Created by: Gary Palmer <gpalmer@FreeBSD.org>
-
 PORTNAME=	cdb
 PORTVERSION=	0.75
 CATEGORIES=	databases
@@ -7,6 +5,7 @@ MASTER_SITES=	http://cr.yp.to/cdb/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Fast lookup database library & utilities
+WWW=		https://cr.yp.to/cdb.html
 
 ALL_TARGET=	it
 
diff --git a/databases/cdb/pkg-descr b/databases/cdb/pkg-descr
index ae9d39727134..8b98bd7653ba 100644
--- a/databases/cdb/pkg-descr
+++ b/databases/cdb/pkg-descr
@@ -20,5 +20,3 @@ to pause during a rewrite.
 Note for developers:  packages that need to read cdb files should
 incorporate the necessary portions of the cdb library rather than
 relying on an external cdb library. (See WWW)
-
-WWW: http://cr.yp.to/cdb.html
diff --git a/databases/cego/Makefile b/databases/cego/Makefile
index a8a6ce79a075..3b12e76cbbe8 100644
--- a/databases/cego/Makefile
+++ b/databases/cego/Makefile
@@ -1,10 +1,12 @@
 PORTNAME=	cego
-PORTVERSION=	2.47.6
+PORTVERSION=	2.48.48
+
 CATEGORIES=	databases
 MASTER_SITES=	http://www.lemke-it.com/
 
 MAINTAINER=	pi@FreeBSD.org
 COMMENT=	Relational and transactional database system
+WWW=		https://www.lemke-it.com/
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
diff --git a/databases/cego/distinfo b/databases/cego/distinfo
index 280025eb3d18..426e175bcaa7 100644
--- a/databases/cego/distinfo
+++ b/databases/cego/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1625384462
-SHA256 (cego-2.47.6.tar.gz) = d39eacf5a68ac9365f3f4d2c90a29fc7d6f9479b967895469eea51bd9777bb52
-SIZE (cego-2.47.6.tar.gz) = 3165730
+TIMESTAMP = 1711982900
+SHA256 (cego-2.48.48.tar.gz) = edfd21c07f571686686c6fb03cdf6b99b8553ab8fad617378eb29a188c6de813
+SIZE (cego-2.48.48.tar.gz) = 3252066
diff --git a/databases/cego/pkg-descr b/databases/cego/pkg-descr
index 0f6db4c4785d..b66a254b2317 100644
--- a/databases/cego/pkg-descr
+++ b/databases/cego/pkg-descr
@@ -9,5 +9,3 @@ tableset. If required, the tableset can be switched to the backup
 node and this node gets the active node for the tableset.
 
 Many more details are available at:
-
-WWW: http://www.lemke-it.com/
diff --git a/databases/cegobridge/Makefile b/databases/cegobridge/Makefile
index 8512811f275c..755df678516b 100644
--- a/databases/cegobridge/Makefile
+++ b/databases/cegobridge/Makefile
@@ -1,10 +1,11 @@
 PORTNAME=	cegobridge
-PORTVERSION=	1.6.1
+PORTVERSION=	1.6.5
 CATEGORIES=	databases
 MASTER_SITES=	http://www.lemke-it.com/
 
 MAINTAINER=	pi@FreeBSD.org
 COMMENT=	Imports non-cego database dump files into cego
+WWW=		https://www.lemke-it.com/
 
 LIB_DEPENDS=	liblfcbase.so:devel/lfcbase \
 		liblfcxml.so:devel/lfcxml \
diff --git a/databases/cegobridge/distinfo b/databases/cegobridge/distinfo
index 2117cb8f0071..2a381c695027 100644
--- a/databases/cegobridge/distinfo
+++ b/databases/cegobridge/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1621839333
-SHA256 (cegobridge-1.6.1.tar.gz) = 71d9641196b902c95d5502761bbec1e303488bc17f3052eb458759dee477e4a9
-SIZE (cegobridge-1.6.1.tar.gz) = 700506
+TIMESTAMP = 1702487745
+SHA256 (cegobridge-1.6.5.tar.gz) = 08b33484865b9512de5705bbb447165ddf31b5a74b8ad5fb858039dba0be4d3d
+SIZE (cegobridge-1.6.5.tar.gz) = 588348
diff --git a/databases/cegobridge/pkg-descr b/databases/cegobridge/pkg-descr
index 2147db5700b2..6d509084991f 100644
--- a/databases/cegobridge/pkg-descr
+++ b/databases/cegobridge/pkg-descr
@@ -3,5 +3,3 @@ Relational Database Management System (RDBMS). Currently it supports
 MySQL, other database systems to import/export can be added.
 
 Many more details are available at:
-
-WWW: http://www.lemke-it.com/
diff --git a/databases/clickhouse/Makefile b/databases/clickhouse/Makefile
index 0fdec413b8d4..464b646d8e96 100644
--- a/databases/clickhouse/Makefile
+++ b/databases/clickhouse/Makefile
@@ -1,104 +1,111 @@
-# Created by: proler@gmail.com
-
 PORTNAME=	clickhouse
-PORTVERSION=	21.7.4.18
+PORTVERSION=	22.1.3.7
 DISTVERSIONPREFIX=	v
 DISTVERSIONSUFFIX=-stable
 CATEGORIES=	databases
 
-MAINTAINER=	olevole@olevole.ru
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Fast open-source OLAP database management system
+WWW=		https://clickhouse.tech/
 
 LICENSE=	APACHE20
 
-ONLY_FOR_ARCHS=	amd64
-ONLY_FOR_ARCHS_REASON=	"Only supported on amd64"
+ONLY_FOR_ARCHS=	aarch64 amd64
+ONLY_FOR_ARCHS_REASON=	only supported on aarch64 and amd64
 
 BUILD_DEPENDS=	bash:shells/bash
 RUN_DEPENDS=	bash:shells/bash
 
-USES=		cmake:insource localbase python shebangfix
+USES=		cmake cpe localbase perl5 python shebangfix
+USE_PERL5=	build
+
+CPE_VENDOR=	yandex
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	yandex
 GH_PROJECT=	ClickHouse
 GH_TUPLE=	\
-		ClickHouse-Extras:AMQP-CPP:03781aa:ClickHouse_Extras_AMQP_CPP/contrib/AMQP-CPP \
-		ClickHouse-Extras:NuRaft:976874b:ClickHouse_Extras_NuRaft/contrib/NuRaft \
-		ClickHouse-Extras:abseil-cpp:4f3b686:ClickHouse_Extras_abseil_cpp/contrib/abseil-cpp \
-		ClickHouse-Extras:antlr4-runtime:672643e:ClickHouse_Extras_antlr4_runtime/contrib/antlr4-runtime \
-		ClickHouse-Extras:arrow:debf751:ClickHouse_Extras_arrow/contrib/arrow \
+		ClickHouse-Extras:AMQP-CPP:1a6c51f:ClickHouse_Extras_AMQP_CPP/contrib/AMQP-CPP \
+		ClickHouse-Extras:NuRaft:c2043aa:ClickHouse_Extras_NuRaft/contrib/NuRaft \
+		ClickHouse-Extras:abseil-cpp:2151058:ClickHouse_Extras_abseil_cpp/contrib/abseil-cpp \
+		ClickHouse-Extras:arrow:1d9cc51:ClickHouse_Extras_arrow/contrib/arrow \
 		ClickHouse-Extras:avro:e43c46e:ClickHouse_Extras_avro/contrib/avro \
-		ClickHouse-Extras:aws-sdk-cpp:7d48b2c:ClickHouse_Extras_aws_sdk_cpp/contrib/aws \
+		ClickHouse-Extras:aws-sdk-cpp:00b0360:ClickHouse_Extras_aws_sdk_cpp/contrib/aws \
 		ClickHouse-Extras:aws-c-common:736a82d:ClickHouse_Extras_aws_c_common/contrib/aws-c-common \
 		ClickHouse-Extras:aws-c-event-stream:3bc3366:ClickHouse_Extras_aws_c_event_stream/contrib/aws-c-event-stream \
 		ClickHouse-Extras:aws-checksums:519d6d9:ClickHouse_Extras_aws_checksums/contrib/aws-checksums \
-		ClickHouse-Extras:Turbo-Base64:af9b331:ClickHouse_Extras_Turbo_Base64/contrib/base64 \
-		ClickHouse-Extras:boost:1ccbb5a:ClickHouse_Extras_boost/contrib/boost \
-		ClickHouse-Extras:boringssl:a6a2e2a:ClickHouse_Extras_boringssl/contrib/boringssl \
+		ClickHouse-Extras:azure-sdk-for-cpp:ac4b763:ClickHouse_Extras_azure_sdk_for_cpp/contrib/azure \
+		ClickHouse-Extras:Turbo-Base64:9499e0c:ClickHouse_Extras_Turbo_Base64/contrib/base64 \
+		ClickHouse-Extras:boost:c0807e8:ClickHouse_Extras_boost/contrib/boost \
+		ClickHouse-Extras:boringssl:c1e01a4:ClickHouse_Extras_boringssl/contrib/boringssl \
 		google:brotli:63be8a9:google_brotli/contrib/brotli \
-		capnproto:capnproto:a00ccd9:capnproto_capnproto/contrib/capnproto \
-		ClickHouse-Extras:cpp-driver:eb9b68d:ClickHouse_Extras_cpp_driver/contrib/cassandra \
-		ClickHouse-Extras:cctz:c0f1bcb:ClickHouse_Extras_cctz/contrib/cctz \
+		ClickHouse-Extras:bzip2:bf905ea:ClickHouse_Extras_bzip2/contrib/bzip2 \
+		capnproto:capnproto:c8189ec:capnproto_capnproto/contrib/capnproto \
+		ClickHouse-Extras:cpp-driver:f4a31e9:ClickHouse_Extras_cpp_driver/contrib/cassandra \
+		ClickHouse-Extras:cctz:9edd086:ClickHouse_Extras_cctz/contrib/cctz \
 		mfontanini:cppkafka:5a119f6:mfontanini_cppkafka/contrib/cppkafka \
 		RoaringBitmap:CRoaring:2c867e9:RoaringBitmap_CRoaring/contrib/croaring \
 		curl:curl:3b8bbbb:curl_curl/contrib/curl \
 		ClickHouse-Extras:cyrus-sasl:e6466ed:ClickHouse_Extras_cyrus_sasl/contrib/cyrus-sasl \
+		apache:datasketches-cpp:7d73d76:apache_datasketches/contrib/datasketches-cpp \
 		google:double-conversion:cf2f0f3:google_double_conversion/contrib/double-conversion \
-		apache:datasketches-cpp:7d73d76:contrib/datasketches-cpp \
-		google:double-conversion:cf2f0f3:contrib/double-conversion \
 		ClickHouse-Extras:dragonbox:923705a:ClickHouse_Extras_dragonbox/contrib/dragonbox \
 		fastfloat:fast_float:7eae925:fastfloat_fast_float/contrib/fast_float \
-		ClickHouse-Extras:fastops:88752a5:ClickHouse_Extras_fastops/contrib/fastops \
+		ClickHouse-Extras:fastops:1460583:ClickHouse_Extras_fastops/contrib/fastops \
 		google:flatbuffers:eb3f827:google_flatbuffers/contrib/flatbuffers \
 		fmtlib:fmt:c108ee1:fmtlib_fmt/contrib/fmtlib \
-		kthohr:gcem:8d4f1b5:kthohr_gcem/contrib/gcem \
 		google:googletest:e7e5917:google_googletest/contrib/googletest \
-		ClickHouse-Extras:grpc:60c986e:ClickHouse_Extras_grpc/contrib/grpc \
-		ClickHouse-Extras:h3:e209086:ClickHouse_Extras_h3/contrib/h3 \
+		ClickHouse-Extras:grpc:7eac189:ClickHouse_Extras_grpc/contrib/grpc \
+		ClickHouse-Extras:h3:c7f46cf:ClickHouse_Extras_h3/contrib/h3 \
+		ClickHouse-Extras:hive-metastore:809a77d:ClickHouse_Extras_hive_metastore/contrib/hive-metastore \
 		ClickHouse-Extras:hyperscan:e9f08df:ClickHouse_Extras_hyperscan/contrib/hyperscan \
 		unicode-org:icu:faa2f9f:unicode_org_icu/contrib/icu \
 		ClickHouse-Extras:icudata:f020820:ClickHouse_Extras_icudata/contrib/icudata \
-		ClickHouse-Extras:jemalloc:e6891d9:ClickHouse_Extras_jemalloc/contrib/jemalloc \
+		ClickHouse-Extras:jemalloc:a140480:ClickHouse_Extras_jemalloc/contrib/jemalloc \
 		ClickHouse-Extras:krb5:5149dea:ClickHouse_Extras_krb5/contrib/krb5 \
-		ClickHouse-Extras:libc-headers:a720b71:ClickHouse_Extras_libc_headers/contrib/libc-headers \
+		ClickHouse-Extras:lemmagen-c:59537bd:ClickHouse_Extras_lemmagen_c/contrib/lemmagen-c \
 		ClickHouse-Extras:libcpuid:8db3b8d:ClickHouse_Extras_libcpuid/contrib/libcpuid \
-		ClickHouse-Extras:libcxx:2fa892f:ClickHouse_Extras_libcxx/contrib/libcxx \
+		ClickHouse-Extras:libcxx:61e6029:ClickHouse_Extras_libcxx/contrib/libcxx \
 		ClickHouse-Extras:libcxxabi:df8f1e7:ClickHouse_Extras_libcxxabi/contrib/libcxxabi \
 		ClickHouse-Extras:libgsasl:383ee28:ClickHouse_Extras_libgsasl/contrib/libgsasl \
-		ClickHouse-Extras:libhdfs3:095b9d4:ClickHouse_Extras_libhdfs3/contrib/libhdfs3 \
-		ClickHouse-Extras:libpq:c762458:ClickHouse_Extras_libpq/contrib/libpq \
-		jtv:libpqxx:357608d:jtv_libpqxx/contrib/libpqxx \
-		ClickHouse-Extras:librdkafka:43491d3:ClickHouse_Extras_librdkafka/contrib/librdkafka \
-		ClickHouse-Extras:libunwind:6b816d2:ClickHouse_Extras_libunwind/contrib/libunwind \
-		ClickHouse-Extras:libuv:e2e9b7e:ClickHouse_Extras_libuv/contrib/libuv \
+		ClickHouse-Extras:libhdfs3:9194af4:ClickHouse_Extras_libhdfs3/contrib/libhdfs3 \
+		ClickHouse-Extras:libpq:e071ea5:ClickHouse_Extras_libpq/contrib/libpq \
+		jtv:libpqxx:63e20f9:jtv_libpqxx/contrib/libpqxx \
+		google:libprotobuf-mutator:ffd86a3:google_libprotobuf_mutator/contrib/libprotobuf-mutator \
+		ClickHouse-Extras:librdkafka:b8554f1:ClickHouse_Extras_librdkafka/contrib/librdkafka \
+		ClickHouse-Extras:libstemmer_c:c753054:ClickHouse_Extras_libstemmer_c/contrib/libstemmer_c \
+		ClickHouse-Extras:libunwind:c4ea984:ClickHouse_Extras_libunwind/contrib/libunwind \
+		ClickHouse-Extras:libuv:95081e7:ClickHouse_Extras_libuv/contrib/libuv \
 		GNOME:libxml2:18890f4:GNOME_libxml2/contrib/libxml2 \
-		ClickHouse-Extras:llvm:e575145:ClickHouse_Extras_llvm/contrib/llvm \
+		ClickHouse-Extras:llvm:20607e6:ClickHouse_Extras_llvm/contrib/llvm \
 		lz4:lz4:f39b79f:lz4_lz4/contrib/lz4 \
+		Neargye:magic_enum:38f86e4:Neargye_magic_enum/contrib/magic_enum \
 		ClickHouse-Extras:mariadb-connector-c:5f4034a:ClickHouse_Extras_mariadb_connector_c/contrib/mariadb-connector-c \
 		danlark1:miniselect:be0af6b:danlark1_miniselect/contrib/miniselect \
 		msgpack:msgpack-c:4668426:msgpack_msgpack_c/contrib/msgpack-c \
-		nanodbc:nanodbc:9fc4596:contrib/nanodbc \
+		nanodbc:nanodbc:df52a12:contrib/nanodbc \
 		ClickHouse-Extras:openldap:0208811:ClickHouse_Extras_openldap/contrib/openldap \
-		apache:orc:0a936f6:apache_orc/contrib/orc \
-		ClickHouse-Extras:poco:5994506:ClickHouse_Extras_poco/contrib/poco \
-		ClickHouse-Extras:protobuf:73b1281:ClickHouse_Extras_protobuf/contrib/protobuf \
+		ClickHouse-Extras:orc:0a936f6:ClickHouse_Extras/contrib/orc \
+		ClickHouse-Extras:poco:520a90e:ClickHouse_Extras_poco/contrib/poco \
+		ClickHouse-Extras:protobuf:6bb7019:ClickHouse_Extras_protobuf/contrib/protobuf \
 		ClickHouse-Extras:rapidjson:c4ef90c:ClickHouse_Extras_rapidjson/contrib/rapidjson \
 		google:re2:13ebb37:google_re2/contrib/re2 \
-		ClickHouse-Extras:replxx:c81be6c:ClickHouse_Extras_replxx/contrib/replxx \
-		ClickHouse-Extras:rocksdb:07c7754:ClickHouse_Extras_rocksdb/contrib/rocksdb \
-		ClickHouse-Extras:sentry-native:94644e9:ClickHouse_Extras_sentry_native/contrib/sentry-native \
+		ClickHouse-Extras:replxx:f019cba:ClickHouse_Extras_replxx/contrib/replxx \
+		ClickHouse-Extras:rocksdb:e7c2b2f:ClickHouse_Extras_rocksdb/contrib/rocksdb \
+		ClickHouse-Extras:s2geometry:471fe9d:ClickHouse_Extras_s2geometry/contrib/s2geometry \
+		ClickHouse-Extras:sentry-native:f431047:ClickHouse_Extras_sentry_native/contrib/sentry-native \
 		ClickHouse-Extras:simdjson:8df32ce:ClickHouse_Extras_simdjson/contrib/simdjson \
-		google:snappy:3f194ac:google_snappy/contrib/snappy \
+		ClickHouse-Extras:snappy:fb057ed:ClickHouse_Extras_snappy/contrib/snappy \
 		sparsehash:sparsehash-c11:cf0bffa:sparsehash_sparsehash_c11/contrib/sparsehash-c11 \
-		kthohr:stats:b6dd459:kthohr_stats/contrib/stats \
+		azadkuh:sqlite-amalgamation:9818baa:azadkuh_sqlite_amalgamation/contrib/sqlite-amalgamation \
+		ClickHouse-Extras:sysroot:bbcac83:ClickHouse_Extras_sysroot/contrib/sysroot \
 		apache:thrift:010ccf0:apache_thrift/contrib/thrift \
 		ClickHouse-Extras:UnixODBC:b0ad30f:ClickHouse_Extras_UnixODBC/contrib/unixodbc \
+		ClickHouse-Extras:wordnet-blast:1d16ac2:ClickHouse_Extras_wordnet_blast/contrib/wordnet-blast \
 		xz-mirror:xz:869b9d1:xz_mirror_xz/contrib/xz \
 		ClickHouse-Extras:yaml-cpp:0c86ada:ClickHouse_Extras_yaml_cpp/contrib/yaml-cpp \
-		ClickHouse-Extras:zlib-ng:db232d3:ClickHouse_Extras_zlib_ng/contrib/zlib-ng \
-		facebook:zstd:a488ba1:facebook_zstd/contrib/zstd \
-		c-ares:c-ares:e982924:c_ares_c_ares/contrib/grpc/third_party/cares/cares
+		ClickHouse-Extras:zlib-ng:bffad6f:ClickHouse_Extras_zlib_ng/contrib/zlib-ng \
+		facebook:zstd:a488ba1:facebook_zstd/contrib/zstd
 
 USE_RC_SUBR=	${PORTNAME}
 
@@ -125,7 +132,7 @@ SHEBANG_FILES=	src/Storages/System/StorageSystemLicenses.sh \
 		tests/queries/0_stateless/01179_insert_values_semicolon.expect \
 		tests/queries/0_stateless/01180_client_syntax_errors.expect \
 		tests/queries/0_stateless/01246_insert_into_watch_live_view.py \
-		tests/queries/0_stateless/01293_client_interactive_vertical_multiline_long.expect \
+		tests/queries/0_stateless/01293_client_interactive_vertical_multiline.expect \
 		tests/queries/0_stateless/01293_client_interactive_vertical_singleline.expect \
 		tests/queries/0_stateless/01300_client_save_history_when_terminated_long.expect \
 		tests/queries/0_stateless/01370_client_autocomplete_word_break_characters.expect \
@@ -134,9 +141,6 @@ SHEBANG_FILES=	src/Storages/System/StorageSystemLicenses.sh \
 		tests/queries/0_stateless/01565_reconnect_after_client_error.expect \
 		tests/queries/0_stateless/01599_multiline_input_and_singleline_comments.sh \
 		tests/queries/0_stateless/01610_client_spawn_editor.sh \
-		tests/queries/0_stateless/01755_client_highlight_multi_line_comment_regression.expect \
-		tests/queries/0_stateless/01910_client_replxx_container_overflow_long.expect  \
-		tests/queries/0_stateless/01921_test_progress_bar.py \
 		tests/queries/0_stateless/helpers/00900_parquet_create_table_columns.py \
 		tests/queries/0_stateless/helpers/client.py \
 		tests/queries/0_stateless/helpers/httpclient.py \
@@ -145,33 +149,53 @@ SHEBANG_FILES=	src/Storages/System/StorageSystemLicenses.sh \
 		tests/queries/0_stateless/helpers/pure_http_client.py \
 		tests/queries/0_stateless/helpers/shell.py \
 		tests/queries/0_stateless/helpers/uexpect.py \
-		utils/build/build_debian.sh utils/build/build_debian_shared.sh \
-		utils/build/build_freebsd.sh utils/build/build_macos.sh \
-		utils/build/build_minimal.sh utils/build/build_no_submodules.sh \
+		tests/queries/0_stateless/01910_client_replxx_container_overflow_long.expect \
+		tests/queries/0_stateless/02132_client_history_navigation.expect \
+		tests/queries/0_stateless/01933_client_replxx_convert_history.expect \
+		tests/queries/0_stateless/01945_show_debug_warning.expect \
+		tests/queries/0_stateless/01059_window_view_event_hop_watch_strict_asc.py \
+		tests/queries/0_stateless/01070_window_view_watch_events.py \
+		tests/queries/0_stateless/02116_interactive_hello.expect \
+		tests/queries/0_stateless/01755_client_highlight_multi_line_comment_regression.expect \
+		tests/queries/0_stateless/02112_delayed_clickhouse_client_with_queries_file.expect \
+		tests/queries/0_stateless/02112_delayed_clickhouse_local_with_queries_file.expect \
+		tests/queries/0_stateless/02010_lc_native.python \
+		tests/queries/0_stateless/02105_backslash_letter_commands.expect \
+		tests/queries/0_stateless/01069_window_view_proc_tumble_watch.py \
+		tests/queries/0_stateless/01062_window_view_event_hop_watch_asc.py \
+		tests/queries/0_stateless/01921_test_progress_bar.py \
+		tests/queries/0_stateless/02112_delayed_clickhouse_local.expect \
+		tests/queries/0_stateless/02049_clickhouse_local_merge_tree.expect \
+		tests/queries/0_stateless/01056_window_view_proc_hop_watch.py \
+		tests/queries/0_stateless/01065_window_view_event_hop_watch_bounded.py \
+		tests/queries/0_stateless/02003_memory_limit_in_client.expect \
+		tests/queries/0_stateless/02047_client_exception.expect \
+		tests/queries/0_stateless/02164_clickhouse_local_interactive_exception.expect \
 		utils/check-style/check-duplicate-includes.sh \
 		utils/check-style/check-ungrouped-includes.sh \
 		utils/check-style/format.sh utils/check-style/shellcheck-run.sh \
 		utils/ci/build-clang-from-sources.sh \
 		utils/ci/build-debian-packages.sh \
-		utils/ci/build-gcc-from-sources.sh utils/ci/build-normal.sh \
-		utils/ci/check-docker.sh utils/ci/check-syntax.sh \
+		utils/ci/build-gcc-from-sources.sh \
+		utils/ci/build-normal.sh \
+		utils/ci/check-docker.sh \
+		utils/ci/check-syntax.sh \
 		utils/ci/check-tzdata-updates.sh \
 		utils/ci/create-sources-tarball.sh \
-		utils/ci/docker-multiarch/update.sh utils/ci/get-sources.sh \
+		utils/ci/get-sources.sh \
 		utils/ci/install-compiler-from-packages.sh \
 		utils/ci/install-compiler-from-sources.sh \
-		utils/ci/install-libraries.sh utils/ci/install-os-packages.sh \
-		utils/ci/jobs/quick-build/run.sh \
+		utils/ci/install-libraries.sh \
+		utils/ci/install-os-packages.sh \
 		utils/ci/prepare-docker-image-ubuntu.sh \
 		utils/ci/prepare-toolchain.sh \
 		utils/ci/prepare-vagrant-image-freebsd.sh \
 		utils/ci/run-clickhouse-from-binaries.sh \
-		utils/ci/run-with-docker.sh utils/ci/run-with-vagrant.sh \
+		utils/ci/run-with-docker.sh \
+		utils/ci/run-with-vagrant.sh \
 		utils/clickhouse-docker utils/compressor/test.sh \
 		utils/durability-test/durability-test.sh \
 		utils/durability-test/install.sh \
-		utils/generate-ya-make/generate-ya-make.sh \
-		utils/link-validate/link-validate.sh \
 		utils/list-licenses/list-licenses.sh \
 		utils/list-versions/list-versions.sh
 SHEBANG_LANG=	expect
@@ -181,10 +205,17 @@ expect_CMD=	${LOCALBASE}/bin/expect
 
 CMAKE_ARGS=	-DCMAKE_CXX_STANDARD=20 \
 		-DENABLE_EMBEDDED_COMPILER=OFF \
+		-DENABLE_THINLTO=OFF \
 		-DENABLE_PARQUET=OFF \
 		-DENABLE_UTILS=ON \
 		-DNO_WERROR=1
 
+.if defined(WITH_DEBUG)
+CMAKE_BUILD_TYPE=Debug
+.else
+CMAKE_BUILD_TYPE=RelWithDebInfo
+.endif
+
 USERS=		clickhouse
 GROUPS=		clickhouse
 
@@ -198,16 +229,12 @@ TEST_CMAKE_BOOL=	ENABLE_TESTS
 
 .include <bsd.port.options.mk>
 
-.if ${OSVERSION} < 1300000
-CC=			clang11
-CXX=		clang++11
-BUILD_DEPENDS+= clang++11:devel/llvm11
-.else
-CC=			clang
-CXX=		clang++
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 ))
+USES+=	llvm:max=15
+CFLAGS+=-Wno-error=int-conversion
 .endif
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1200057
+.if ${OPSYS} == FreeBSD
 SUB_LIST+=	LEGACY_LIMITS="@comment " \
 		MODERN_LIMITS=""
 .else
@@ -221,6 +248,7 @@ SOVERSION=	${PORTVERSION}
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/var/lib/clickhouse|/var/db/clickhouse|;s|/var/log/clickhouse-server|/var/log/clickhouse|;s|/etc/clickhouse-server|${PREFIX}/etc/clickhouse-server|' ${WRKSRC}/programs/server/config.xml
+	cd ${WRKSRC}/contrib/openldap-cmake && ${LN} -s freebsd_x86_64 freebsd_aarch64
 
 post-install:
 	@${RM} ${STAGEDIR}${PREFIX}/bin/config-processor
diff --git a/databases/clickhouse/distinfo b/databases/clickhouse/distinfo
index aae7ca1970cc..d700ff1e74ed 100644
--- a/databases/clickhouse/distinfo
+++ b/databases/clickhouse/distinfo
@@ -1,40 +1,42 @@
-TIMESTAMP = 1627341962
-SHA256 (yandex-ClickHouse-v21.7.4.18-stable_GH0.tar.gz) = 43de6d25602a8f24f4a476deb4d84a6aabbe3b90460ce3b1f76c7dfa33d5a711
-SIZE (yandex-ClickHouse-v21.7.4.18-stable_GH0.tar.gz) = 85012428
-SHA256 (ClickHouse-Extras-AMQP-CPP-03781aa_GH0.tar.gz) = 18772fbd31740df6953ec6484c4f58455934bba61e77d491b88dc0fc6c9a2071
-SIZE (ClickHouse-Extras-AMQP-CPP-03781aa_GH0.tar.gz) = 147162
-SHA256 (ClickHouse-Extras-NuRaft-976874b_GH0.tar.gz) = 60ffc9a27c2da2c4bd6ec0c65054b9dd99d7b87e052689ea67df729aea505bc3
-SIZE (ClickHouse-Extras-NuRaft-976874b_GH0.tar.gz) = 465903
-SHA256 (ClickHouse-Extras-abseil-cpp-4f3b686_GH0.tar.gz) = 73986b9bab3a1f4bd8f99039aec28a53244ca519f710a82c57067a8bfa7a18e7
-SIZE (ClickHouse-Extras-abseil-cpp-4f3b686_GH0.tar.gz) = 1680931
-SHA256 (ClickHouse-Extras-antlr4-runtime-672643e_GH0.tar.gz) = 360e7f94c6527d02d2af605ddaac1f984c012becb218e1aa522af01c95eeba7f
-SIZE (ClickHouse-Extras-antlr4-runtime-672643e_GH0.tar.gz) = 226149
-SHA256 (ClickHouse-Extras-arrow-debf751_GH0.tar.gz) = d0b100585449ed56f0adff28b86626483b71988c42c92fc86b8d002fd4cdd493
-SIZE (ClickHouse-Extras-arrow-debf751_GH0.tar.gz) = 8856626
+TIMESTAMP = 1644858197
+SHA256 (yandex-ClickHouse-v22.1.3.7-stable_GH0.tar.gz) = 1f12d8eb8e772ad356052b70d1b13af5223e020ba0e5f4ab2fdf64f2a80a81d5
+SIZE (yandex-ClickHouse-v22.1.3.7-stable_GH0.tar.gz) = 99505696
+SHA256 (ClickHouse-Extras-AMQP-CPP-1a6c51f_GH0.tar.gz) = 50d116a8e01042d7734a90c6f4d7cee3fc15aa584263eda71921abc6dea0ab3d
+SIZE (ClickHouse-Extras-AMQP-CPP-1a6c51f_GH0.tar.gz) = 158209
+SHA256 (ClickHouse-Extras-NuRaft-c2043aa_GH0.tar.gz) = 07e45edd97af71f56e3ac529944d7a63753bdc2588d2954fe510eb5ae91dcb01
+SIZE (ClickHouse-Extras-NuRaft-c2043aa_GH0.tar.gz) = 475731
+SHA256 (ClickHouse-Extras-abseil-cpp-2151058_GH0.tar.gz) = 19681a17321d9661e8ccfc1f1977d529c475b6ef18f0f3f8363105322e7cab46
+SIZE (ClickHouse-Extras-abseil-cpp-2151058_GH0.tar.gz) = 1884031
+SHA256 (ClickHouse-Extras-arrow-1d9cc51_GH0.tar.gz) = 62d644c5781ec07fcaaeb6c717ee497995268caefcb126b34b5703fca0397af0
+SIZE (ClickHouse-Extras-arrow-1d9cc51_GH0.tar.gz) = 8927561
 SHA256 (ClickHouse-Extras-avro-e43c46e_GH0.tar.gz) = b0d9b5b46f3641ea15265035f64b9883b3c5ff3c8465c2a6069d1358bdf7d383
 SIZE (ClickHouse-Extras-avro-e43c46e_GH0.tar.gz) = 1857755
-SHA256 (ClickHouse-Extras-aws-sdk-cpp-7d48b2c_GH0.tar.gz) = 9d0b0c4577e62bc0349579345e4002b3fe304352736fe4676db6b56eec69ad6d
-SIZE (ClickHouse-Extras-aws-sdk-cpp-7d48b2c_GH0.tar.gz) = 32563928
+SHA256 (ClickHouse-Extras-aws-sdk-cpp-00b0360_GH0.tar.gz) = 6d20929bea661bd1fab03aeaf1bb00eee5d0fbd2287d4826b65b303ee504db9d
+SIZE (ClickHouse-Extras-aws-sdk-cpp-00b0360_GH0.tar.gz) = 32562644
 SHA256 (ClickHouse-Extras-aws-c-common-736a82d_GH0.tar.gz) = d4e48a9bb96cc17a0107e3d95f3ef4eb67aaf9c2c39220188456b0c7eb89740b
 SIZE (ClickHouse-Extras-aws-c-common-736a82d_GH0.tar.gz) = 321426
 SHA256 (ClickHouse-Extras-aws-c-event-stream-3bc3366_GH0.tar.gz) = e6e4d3c1a2d518c7292aaef8d023ae567cd000bcba94bdf544db07385148b194
 SIZE (ClickHouse-Extras-aws-c-event-stream-3bc3366_GH0.tar.gz) = 28143
 SHA256 (ClickHouse-Extras-aws-checksums-519d6d9_GH0.tar.gz) = 6574d090c8f340fe6ecea1c3eaeddfc1a014e0bf61682762d5d8a669b1f55dda
 SIZE (ClickHouse-Extras-aws-checksums-519d6d9_GH0.tar.gz) = 78316
-SHA256 (ClickHouse-Extras-Turbo-Base64-af9b331_GH0.tar.gz) = b1d1f40c984d6328d64f7b9ab3b0fb603f10f539af38eac7c878722fac82ee62
-SIZE (ClickHouse-Extras-Turbo-Base64-af9b331_GH0.tar.gz) = 49262
-SHA256 (ClickHouse-Extras-boost-1ccbb5a_GH0.tar.gz) = 83b0b0eaca6d1b5e07ac093e94194e91f8e08a8038ab89e66781a917981a362b
-SIZE (ClickHouse-Extras-boost-1ccbb5a_GH0.tar.gz) = 6558033
-SHA256 (ClickHouse-Extras-boringssl-a6a2e2a_GH0.tar.gz) = b764ed6577735c5bf3d93e1254e038969673c499887f0c4dfa9f9a1e9c2203df
-SIZE (ClickHouse-Extras-boringssl-a6a2e2a_GH0.tar.gz) = 27326509
+SHA256 (ClickHouse-Extras-azure-sdk-for-cpp-ac4b763_GH0.tar.gz) = 641e3af9598016c1bd825a58bacb66e3c685689fcdbe7ae380ac2a5aa94bbfdc
+SIZE (ClickHouse-Extras-azure-sdk-for-cpp-ac4b763_GH0.tar.gz) = 1518987
+SHA256 (ClickHouse-Extras-Turbo-Base64-9499e0c_GH0.tar.gz) = b3e15c68caeb45d570c633d9758901572b9273b7693cf518e7d6a8f4f6d38538
+SIZE (ClickHouse-Extras-Turbo-Base64-9499e0c_GH0.tar.gz) = 48928
+SHA256 (ClickHouse-Extras-boost-c0807e8_GH0.tar.gz) = 30974a4bbac9e69f99e914e9c8670e8e5338a0b83fa65728dd09bce121d7ed4d
+SIZE (ClickHouse-Extras-boost-c0807e8_GH0.tar.gz) = 15024312
+SHA256 (ClickHouse-Extras-boringssl-c1e01a4_GH0.tar.gz) = b5027495980dfa86e00f46f62934dbfa4946e762f82f7c48ea8f8dd6e59a7f62
+SIZE (ClickHouse-Extras-boringssl-c1e01a4_GH0.tar.gz) = 30720133
 SHA256 (google-brotli-63be8a9_GH0.tar.gz) = ab6d0b8c0503a4e085c441bc323cce1746d31c0a52502e2841fee754de07e20f
 SIZE (google-brotli-63be8a9_GH0.tar.gz) = 488535
-SHA256 (capnproto-capnproto-a00ccd9_GH0.tar.gz) = afb081ce4df9e3e1602f796769441b49394215217295cad5bf3f8010c0e708a3
-SIZE (capnproto-capnproto-a00ccd9_GH0.tar.gz) = 1991634
-SHA256 (ClickHouse-Extras-cpp-driver-eb9b68d_GH0.tar.gz) = 251810d39eb446c1fd2d404b32363d9b51ba3148e6261ae6472e062cd77a9cbd
-SIZE (ClickHouse-Extras-cpp-driver-eb9b68d_GH0.tar.gz) = 12282025
-SHA256 (ClickHouse-Extras-cctz-c0f1bcb_GH0.tar.gz) = cb834d27bf68bce146d5f3c7151c6cc20004986585ef2939fcac95f773c72716
-SIZE (ClickHouse-Extras-cctz-c0f1bcb_GH0.tar.gz) = 212987
+SHA256 (ClickHouse-Extras-bzip2-bf905ea_GH0.tar.gz) = e29d3c5806a786b085a9c7fe2d217b48d78375f89991ee41ad338497784a74cd
+SIZE (ClickHouse-Extras-bzip2-bf905ea_GH0.tar.gz) = 378964
+SHA256 (capnproto-capnproto-c8189ec_GH0.tar.gz) = 1840412a73e9bd7c2d6636f4609619d276831a766b4df102068c601255d96351
+SIZE (capnproto-capnproto-c8189ec_GH0.tar.gz) = 2254035
+SHA256 (ClickHouse-Extras-cpp-driver-f4a31e9_GH0.tar.gz) = ff5287440f4dfb207a10f911dd183767152cd65a32fda3132dfb4058778f51f3
+SIZE (ClickHouse-Extras-cpp-driver-f4a31e9_GH0.tar.gz) = 12285147
+SHA256 (ClickHouse-Extras-cctz-9edd086_GH0.tar.gz) = cde98a997d5caf3946f7139c8cc0061e85d735f241485110ff211ca6d890c0c4
+SIZE (ClickHouse-Extras-cctz-9edd086_GH0.tar.gz) = 213325
 SHA256 (mfontanini-cppkafka-5a119f6_GH0.tar.gz) = 025ef2649d48bb3c9c8631244c2b765e0c764b46bfdb4db726e65116734d47bc
 SIZE (mfontanini-cppkafka-5a119f6_GH0.tar.gz) = 106309
 SHA256 (RoaringBitmap-CRoaring-2c867e9_GH0.tar.gz) = af7792501fc8a2d5fa709bbce2bd4bac42aea844bc14112cb6626a630b759859
@@ -43,109 +45,121 @@ SHA256 (curl-curl-3b8bbbb_GH0.tar.gz) = 7405f6074709cc8872070b26073253b6188b4870
 SIZE (curl-curl-3b8bbbb_GH0.tar.gz) = 2980455
 SHA256 (ClickHouse-Extras-cyrus-sasl-e6466ed_GH0.tar.gz) = f48f1b478b98be2a48d5bedb9897c8c2787832dacf5abf32c6cf2e8790c7c5a6
 SIZE (ClickHouse-Extras-cyrus-sasl-e6466ed_GH0.tar.gz) = 2119825
+SHA256 (apache-datasketches-cpp-7d73d76_GH0.tar.gz) = 13083e7ee9ae3083c8f1cba3abbdd681c7641b868ac5f495143151a5ab103635
+SIZE (apache-datasketches-cpp-7d73d76_GH0.tar.gz) = 608753
 SHA256 (google-double-conversion-cf2f0f3_GH0.tar.gz) = 2fa2aaa8afb7d8b32913da01f381a8cfa7dda7b0be7278f1f823935c94fa4baf
 SIZE (google-double-conversion-cf2f0f3_GH0.tar.gz) = 7019614
-SHA256 (nanodbc-nanodbc-9fc4596_GH0.tar.gz) = c70c1afedc2e4fcd510f3c3297d9a3f906be7e6326ea35b8606eb873eabd548c
-SIZE (nanodbc-nanodbc-9fc4596_GH0.tar.gz) = 706069
 SHA256 (ClickHouse-Extras-dragonbox-923705a_GH0.tar.gz) = b086f293f1c92d3674d03d2a7082a5a564b909d9d46d04c708cee76872ea356d
 SIZE (ClickHouse-Extras-dragonbox-923705a_GH0.tar.gz) = 2985032
 SHA256 (fastfloat-fast_float-7eae925_GH0.tar.gz) = 506aecaa2f39420cedded455e21421b57e3c033d5bef11feb3564892793d1e6b
 SIZE (fastfloat-fast_float-7eae925_GH0.tar.gz) = 105248
-SHA256 (ClickHouse-Extras-fastops-88752a5_GH0.tar.gz) = 2df9d0f4bbbf587db4b1690e63063adbc4712c8c6ae7e4c9ed3821f9783f459a
-SIZE (ClickHouse-Extras-fastops-88752a5_GH0.tar.gz) = 266310
+SHA256 (ClickHouse-Extras-fastops-1460583_GH0.tar.gz) = 9febb036d2aca08a8a708263f54ab4f76a1467a079d9858b8108a52763fedc7d
+SIZE (ClickHouse-Extras-fastops-1460583_GH0.tar.gz) = 266459
 SHA256 (google-flatbuffers-eb3f827_GH0.tar.gz) = c882d58624d5af8786f31c4c877555f7fe8ce24b2a3d3df9c2c42286c7e37c59
 SIZE (google-flatbuffers-eb3f827_GH0.tar.gz) = 1538246
 SHA256 (fmtlib-fmt-c108ee1_GH0.tar.gz) = b3ac765e8f65e87cbb6d0d43cfe630c29c7ff8e1d6cd0261f7becfdfd8e6be22
 SIZE (fmtlib-fmt-c108ee1_GH0.tar.gz) = 740300
-SHA256 (kthohr-gcem-8d4f1b5_GH0.tar.gz) = 3aa0e4733a7d4990447d97038446a0411100f9e3455db64e396172bdf30e19ab
-SIZE (kthohr-gcem-8d4f1b5_GH0.tar.gz) = 52091
 SHA256 (google-googletest-e7e5917_GH0.tar.gz) = bc5863c9455b1afb6edd718a216012d929ce1baf26793ab22ac53ccd5dfab980
 SIZE (google-googletest-e7e5917_GH0.tar.gz) = 868168
-SHA256 (ClickHouse-Extras-grpc-60c986e_GH0.tar.gz) = 0d38c756139fa7137a45b7f9ae096b27f8624d3df24a82037a4028873f75722d
-SIZE (ClickHouse-Extras-grpc-60c986e_GH0.tar.gz) = 7269177
-SHA256 (ClickHouse-Extras-h3-e209086_GH0.tar.gz) = df8ae0847625c9fb32ed0a3f81dbf15ad46f7e4a5a8f0f1a0770e9f31e9930e0
-SIZE (ClickHouse-Extras-h3-e209086_GH0.tar.gz) = 17316672
+SHA256 (ClickHouse-Extras-grpc-7eac189_GH0.tar.gz) = f50ed64b9c00e554bf296533285d2781e2b16504d55ce54581a50411045ea851
+SIZE (ClickHouse-Extras-grpc-7eac189_GH0.tar.gz) = 8011016
+SHA256 (ClickHouse-Extras-h3-c7f46cf_GH0.tar.gz) = 9ebafc0a215e31d3d0587d34131b8d780a037fce16f42de0957d6a3bb0696256
+SIZE (ClickHouse-Extras-h3-c7f46cf_GH0.tar.gz) = 17297765
+SHA256 (ClickHouse-Extras-hive-metastore-809a77d_GH0.tar.gz) = fcbb436b55ebab0a60ad6a16d1814728176f7727bf2198429f566be750966159
+SIZE (ClickHouse-Extras-hive-metastore-809a77d_GH0.tar.gz) = 246986
 SHA256 (ClickHouse-Extras-hyperscan-e9f08df_GH0.tar.gz) = ba3d33853271bbff533019fcc2be9df4900410e220ee00a5cbe7a55f1c5550dc
 SIZE (ClickHouse-Extras-hyperscan-e9f08df_GH0.tar.gz) = 1844326
 SHA256 (unicode-org-icu-faa2f9f_GH0.tar.gz) = d44751f8e4f8f3a9c1763db0edd9c6bb40a6cdcf18bf3327805e6f5487e7c762
 SIZE (unicode-org-icu-faa2f9f_GH0.tar.gz) = 44792713
 SHA256 (ClickHouse-Extras-icudata-f020820_GH0.tar.gz) = 45ee70d1db43af034b560556a6218813f011ab5a5af48b40443bdc7121696300
 SIZE (ClickHouse-Extras-icudata-f020820_GH0.tar.gz) = 16305443
-SHA256 (ClickHouse-Extras-jemalloc-e6891d9_GH0.tar.gz) = 6a95a98c77d68c09bc226b11f3d6e21f5f60ea32f9eaac41a8a7362d0df571c2
-SIZE (ClickHouse-Extras-jemalloc-e6891d9_GH0.tar.gz) = 580995
+SHA256 (ClickHouse-Extras-jemalloc-a140480_GH0.tar.gz) = 5db8fafd06e0075453db7ee529e4e17bc6b9ab705daf06ddbeddabecdfd2b317
+SIZE (ClickHouse-Extras-jemalloc-a140480_GH0.tar.gz) = 581661
 SHA256 (ClickHouse-Extras-krb5-5149dea_GH0.tar.gz) = eac6ff30ae30bd11757b57ee0c4d4e5cccbb9bac874de5f6305b1f009853bafc
 SIZE (ClickHouse-Extras-krb5-5149dea_GH0.tar.gz) = 5155458
-SHA256 (ClickHouse-Extras-libc-headers-a720b71_GH0.tar.gz) = 71d9436748bf78f7b97e8c11a5f8fb295d729d9e8f8beb264a00316105ed4128
-SIZE (ClickHouse-Extras-libc-headers-a720b71_GH0.tar.gz) = 397157
+SHA256 (ClickHouse-Extras-lemmagen-c-59537bd_GH0.tar.gz) = c8a44030f28fb0b9d8e689727c7fd01dc970b6d1aaabd1a69eb2d67789e8d782
+SIZE (ClickHouse-Extras-lemmagen-c-59537bd_GH0.tar.gz) = 1662628
 SHA256 (ClickHouse-Extras-libcpuid-8db3b8d_GH0.tar.gz) = 1b1ed73158063d721555b8b6f95e59599cb28be636b8f08b4be281e6f36f965b
 SIZE (ClickHouse-Extras-libcpuid-8db3b8d_GH0.tar.gz) = 140826
-SHA256 (ClickHouse-Extras-libcxx-2fa892f_GH0.tar.gz) = 10109160d12bf72ec4cffce5e524ad1638ebae1d6c482e6d0222503b3dceddf3
-SIZE (ClickHouse-Extras-libcxx-2fa892f_GH0.tar.gz) = 863062
+SHA256 (ClickHouse-Extras-libcxx-61e6029_GH0.tar.gz) = 439fd1282df82b8c21243305e8a2d3b8d2526f07eb0fcee2ca53404e51fa36f2
+SIZE (ClickHouse-Extras-libcxx-61e6029_GH0.tar.gz) = 864994
 SHA256 (ClickHouse-Extras-libcxxabi-df8f1e7_GH0.tar.gz) = 5d21d45648e0454f8db4e5e946d05999d6e59e724d66ce7eeb5162c1de2ec01b
 SIZE (ClickHouse-Extras-libcxxabi-df8f1e7_GH0.tar.gz) = 110708
 SHA256 (ClickHouse-Extras-libgsasl-383ee28_GH0.tar.gz) = 959a1f488db847e674d6935cb2a1c9921c01bb08eee8bdfb124032a3be54aece
 SIZE (ClickHouse-Extras-libgsasl-383ee28_GH0.tar.gz) = 174201
-SHA256 (ClickHouse-Extras-libhdfs3-095b9d4_GH0.tar.gz) = 9b57e83e29ce8058e1de95e9750d0b9eebf99d7a8847fde171f82d3f61871af6
-SIZE (ClickHouse-Extras-libhdfs3-095b9d4_GH0.tar.gz) = 252150
-SHA256 (ClickHouse-Extras-libpq-c762458_GH0.tar.gz) = 5132fa2870036aac05f7406553075054ced19978a4db1167b98523c28336b278
-SIZE (ClickHouse-Extras-libpq-c762458_GH0.tar.gz) = 686583
-SHA256 (jtv-libpqxx-357608d_GH0.tar.gz) = fd38f0e3819e092cf410d4389d1e7dae93e687382226d63f592c4ebcda553a4f
-SIZE (jtv-libpqxx-357608d_GH0.tar.gz) = 716441
-SHA256 (ClickHouse-Extras-librdkafka-43491d3_GH0.tar.gz) = 51c66756dcf05fa28359d3c8ffe13db2c950d047d6fbbac7506d7a7db352f285
-SIZE (ClickHouse-Extras-librdkafka-43491d3_GH0.tar.gz) = 2920605
-SHA256 (ClickHouse-Extras-libunwind-6b816d2_GH0.tar.gz) = af2a1a7cdf9f8cd5ed750b06685de35888b0f75bddea48893e65a09509edef05
-SIZE (ClickHouse-Extras-libunwind-6b816d2_GH0.tar.gz) = 121674
-SHA256 (ClickHouse-Extras-libuv-e2e9b7e_GH0.tar.gz) = e495a83bdfea09e04638f35b16a1c516dfadeee66cb60be6d36754e23b6bf81d
-SIZE (ClickHouse-Extras-libuv-e2e9b7e_GH0.tar.gz) = 1242751
+SHA256 (ClickHouse-Extras-libhdfs3-9194af4_GH0.tar.gz) = 04f78aa825a22dd542d4bc3d663f7188a6acc386686932afb53ba56450d87143
+SIZE (ClickHouse-Extras-libhdfs3-9194af4_GH0.tar.gz) = 252267
+SHA256 (ClickHouse-Extras-libpq-e071ea5_GH0.tar.gz) = 6aff6a7314598c6a72b3694f93d2d90cf5872799ee92ea778f7439f9f281fe88
+SIZE (ClickHouse-Extras-libpq-e071ea5_GH0.tar.gz) = 1634704
+SHA256 (jtv-libpqxx-63e20f9_GH0.tar.gz) = 690c997494ab90245fc00429dfb06e3f5c872acef62c50dd87131da161c0a0f6
+SIZE (jtv-libpqxx-63e20f9_GH0.tar.gz) = 716583
+SHA256 (google-libprotobuf-mutator-ffd86a3_GH0.tar.gz) = bc6d5ded47201b445f117a1f1cdf598d41dd02e69c929204d75bf1efe4a7e544
+SIZE (google-libprotobuf-mutator-ffd86a3_GH0.tar.gz) = 39035
+SHA256 (ClickHouse-Extras-librdkafka-b8554f1_GH0.tar.gz) = fcf9aa8eea56bbf6219fae250e0a8451003eafd3df7f017c35f6c95b113e7f87
+SIZE (ClickHouse-Extras-librdkafka-b8554f1_GH0.tar.gz) = 2920821
+SHA256 (ClickHouse-Extras-libstemmer_c-c753054_GH0.tar.gz) = a0ebe83a16f2b63cc18a942b1119c1964278b69e7f8df46b6746c01ab5c91198
+SIZE (ClickHouse-Extras-libstemmer_c-c753054_GH0.tar.gz) = 222372
+SHA256 (ClickHouse-Extras-libunwind-c4ea984_GH0.tar.gz) = 4ef631625c44080a1932ce4f2d29492c1e275f46e09959bc845a396e957361a7
+SIZE (ClickHouse-Extras-libunwind-c4ea984_GH0.tar.gz) = 121702
+SHA256 (ClickHouse-Extras-libuv-95081e7_GH0.tar.gz) = 5cad9c02dccb74fbcba3b6c6adb327f12a919a0653f31e8768e9b55c6546ea4d
+SIZE (ClickHouse-Extras-libuv-95081e7_GH0.tar.gz) = 1242587
 SHA256 (GNOME-libxml2-18890f4_GH0.tar.gz) = e1ca0f84996af7c394adfa6ca74a85aba031e34197d303b35d4a7b20935c5a84
 SIZE (GNOME-libxml2-18890f4_GH0.tar.gz) = 5170146
-SHA256 (ClickHouse-Extras-llvm-e575145_GH0.tar.gz) = 959219b8ef06bb6065da7368785d2dfd50c5598abd802cb15bc5e95d3270d4fb
-SIZE (ClickHouse-Extras-llvm-e575145_GH0.tar.gz) = 16748547
+SHA256 (ClickHouse-Extras-llvm-20607e6_GH0.tar.gz) = c9b0085fdd8381b9dc5b46fb43866def645507dea5e00d3ccc2d962954470240
+SIZE (ClickHouse-Extras-llvm-20607e6_GH0.tar.gz) = 16750558
 SHA256 (lz4-lz4-f39b79f_GH0.tar.gz) = cdc9ad4f5bdfb96934cb5c1b169e415f05e9405ef8d91a30fc387f9bed969d9a
 SIZE (lz4-lz4-f39b79f_GH0.tar.gz) = 310434
+SHA256 (Neargye-magic_enum-38f86e4_GH0.tar.gz) = 96afd7abfab4138c86aaad591c999831bf12af6e18fb13cf23cb37d6fe6a3b8a
+SIZE (Neargye-magic_enum-38f86e4_GH0.tar.gz) = 157388
 SHA256 (ClickHouse-Extras-mariadb-connector-c-5f4034a_GH0.tar.gz) = 097f2b184a1954f2462fb7395b06c285bfa0747d34bbdd6e9aa3abc8457039c6
 SIZE (ClickHouse-Extras-mariadb-connector-c-5f4034a_GH0.tar.gz) = 745013
 SHA256 (danlark1-miniselect-be0af6b_GH0.tar.gz) = 3e9f40847fa2774a8fdc8a219ad226de30784ae62d926328247534b102cb62ef
 SIZE (danlark1-miniselect-be0af6b_GH0.tar.gz) = 404227
 SHA256 (msgpack-msgpack-c-4668426_GH0.tar.gz) = 77fb0ecbfb46ed73dfe79b1b04d0be19a2441756964e81bd559eadc4f38cb943
 SIZE (msgpack-msgpack-c-4668426_GH0.tar.gz) = 496549
+SHA256 (nanodbc-nanodbc-df52a12_GH0.tar.gz) = 01e1f2dbc58415eb6f22bd0a4e38b880c7fe821fb607c8bc0a4310b02bd6fa1b
+SIZE (nanodbc-nanodbc-df52a12_GH0.tar.gz) = 706781
 SHA256 (ClickHouse-Extras-openldap-0208811_GH0.tar.gz) = e7ff9ba82fd7ed523ed26a518ddd14a0120fe2254b556668d0d3d3b052eaced8
 SIZE (ClickHouse-Extras-openldap-0208811_GH0.tar.gz) = 5706857
-SHA256 (apache-orc-0a936f6_GH0.tar.gz) = 7c48e776356e6a9cfcc85fb4288ae949d29a1752ce18b09d7e6beb8a74d22ae5
-SIZE (apache-orc-0a936f6_GH0.tar.gz) = 13626312
-SHA256 (ClickHouse-Extras-poco-5994506_GH0.tar.gz) = c03b986572296d07d1711727a42bd264bbc4d763e78f444d501f18f28d05025e
-SIZE (ClickHouse-Extras-poco-5994506_GH0.tar.gz) = 10244406
-SHA256 (ClickHouse-Extras-protobuf-73b1281_GH0.tar.gz) = 5761c4b3b5da2f87952642830c5e728f95d4e9f2d0ac9bac2c2cb97b5c2b9266
-SIZE (ClickHouse-Extras-protobuf-73b1281_GH0.tar.gz) = 5277846
+SHA256 (ClickHouse-Extras-orc-0a936f6_GH0.tar.gz) = 7c48e776356e6a9cfcc85fb4288ae949d29a1752ce18b09d7e6beb8a74d22ae5
+SIZE (ClickHouse-Extras-orc-0a936f6_GH0.tar.gz) = 13626312
+SHA256 (ClickHouse-Extras-poco-520a90e_GH0.tar.gz) = e12d3eec232f932733c48644f75965cde99711ca4c32869423c7ce0d2d57486d
+SIZE (ClickHouse-Extras-poco-520a90e_GH0.tar.gz) = 10247769
+SHA256 (ClickHouse-Extras-protobuf-6bb7019_GH0.tar.gz) = f80ca06113095e871206a9a93e1f68c5c4692a6f1a2f7755b676ab1d4394f48b
+SIZE (ClickHouse-Extras-protobuf-6bb7019_GH0.tar.gz) = 5233231
 SHA256 (ClickHouse-Extras-rapidjson-c4ef90c_GH0.tar.gz) = 8c986a8e27c8091d3b4dea24b3910244993e7617cb1d573e96d1ce35a324c81c
 SIZE (ClickHouse-Extras-rapidjson-c4ef90c_GH0.tar.gz) = 1059337
 SHA256 (google-re2-13ebb37_GH0.tar.gz) = 61659543e75181d34bd6c610a4d203b57131c2ba69270809cec66b47cc00de70
 SIZE (google-re2-13ebb37_GH0.tar.gz) = 403329
-SHA256 (ClickHouse-Extras-replxx-c81be6c_GH0.tar.gz) = 730cff2add2b478a2e7fe0aaf68a97d4cd30333dff6d002e650946053147a0e2
-SIZE (ClickHouse-Extras-replxx-c81be6c_GH0.tar.gz) = 87426
-SHA256 (ClickHouse-Extras-rocksdb-07c7754_GH0.tar.gz) = 7da8a44e1f2f10a165e4f8c40115b7be4a80ba07ba0ad6dc99f2220862d40621
-SIZE (ClickHouse-Extras-rocksdb-07c7754_GH0.tar.gz) = 6506946
-SHA256 (ClickHouse-Extras-sentry-native-94644e9_GH0.tar.gz) = b1445b3dec3d42e8ae7e93aff37c96d19b44f1e60b3c83df981b9c19618c169d
-SIZE (ClickHouse-Extras-sentry-native-94644e9_GH0.tar.gz) = 236202
+SHA256 (ClickHouse-Extras-replxx-f019cba_GH0.tar.gz) = 445cce39b359616082eef146ff7f62da9192871461ee4c2ef00feaf4a63b2595
+SIZE (ClickHouse-Extras-replxx-f019cba_GH0.tar.gz) = 99496
+SHA256 (ClickHouse-Extras-rocksdb-e7c2b2f_GH0.tar.gz) = 4aee06eaff67b8b4a069ca52f922a4e37b57b59e2120a140b62ab929c2e7efa4
+SIZE (ClickHouse-Extras-rocksdb-e7c2b2f_GH0.tar.gz) = 9167121
+SHA256 (ClickHouse-Extras-s2geometry-471fe9d_GH0.tar.gz) = 3d6d985013097d42826e88736984ff3da07d34a56b0e72b87d54ba364078ed2f
+SIZE (ClickHouse-Extras-s2geometry-471fe9d_GH0.tar.gz) = 1107866
+SHA256 (ClickHouse-Extras-sentry-native-f431047_GH0.tar.gz) = c4f7fbfb5c4bfe87b78683635502861116dd0a26cacd7d569deab857682a51b6
+SIZE (ClickHouse-Extras-sentry-native-f431047_GH0.tar.gz) = 236223
 SHA256 (ClickHouse-Extras-simdjson-8df32ce_GH0.tar.gz) = c50f7a54966cee7a91b8cdd5a9fa445edd2b95c024c58784e4007d9b0b85ea98
 SIZE (ClickHouse-Extras-simdjson-8df32ce_GH0.tar.gz) = 7959099
-SHA256 (google-snappy-3f194ac_GH0.tar.gz) = d91de408967b49da993e291f5e82ae5975f3ad9e3baca1a6c10cad4d546a8aa6
-SIZE (google-snappy-3f194ac_GH0.tar.gz) = 1092698
+SHA256 (ClickHouse-Extras-snappy-fb057ed_GH0.tar.gz) = d74bf90931bde9b15673b78dd68c60aeb5e91b77824348f8a83184624424f095
+SIZE (ClickHouse-Extras-snappy-fb057ed_GH0.tar.gz) = 1102771
 SHA256 (sparsehash-sparsehash-c11-cf0bffa_GH0.tar.gz) = 6714e34a9b2b16a040bb8f5a04acbd27e89d3fe02b38eae45cca26477e75984d
 SIZE (sparsehash-sparsehash-c11-cf0bffa_GH0.tar.gz) = 576802
-SHA256 (kthohr-stats-b6dd459_GH0.tar.gz) = 5a4285ccfcd856b9fbd69b4e16ec31b43c2ee3578e5927f4597e29e74384e240
-SIZE (kthohr-stats-b6dd459_GH0.tar.gz) = 102211
+SHA256 (azadkuh-sqlite-amalgamation-9818baa_GH0.tar.gz) = f48942a9fc1ad5ee5506b74a6cf2349bd3f2207ed2b23484f37682dfd5633b9b
+SIZE (azadkuh-sqlite-amalgamation-9818baa_GH0.tar.gz) = 2480927
+SHA256 (ClickHouse-Extras-sysroot-bbcac83_GH0.tar.gz) = 04eaac69a4906f6886a9b80983bfce41bbcf55ba1da0d1bc25d0e3583594a785
+SIZE (ClickHouse-Extras-sysroot-bbcac83_GH0.tar.gz) = 41563892
 SHA256 (apache-thrift-010ccf0_GH0.tar.gz) = 839804231ec99111cfb0035641316161f2997b61db73218106001a1b32f1d812
 SIZE (apache-thrift-010ccf0_GH0.tar.gz) = 2923002
 SHA256 (ClickHouse-Extras-UnixODBC-b0ad30f_GH0.tar.gz) = 32d8df90d925324d694e7592d2f04701dc29c93e4e591154e9a77c06f96ccb83
 SIZE (ClickHouse-Extras-UnixODBC-b0ad30f_GH0.tar.gz) = 1595038
+SHA256 (ClickHouse-Extras-wordnet-blast-1d16ac2_GH0.tar.gz) = 45feaac3b6c9685ac41ad87c4186a2fbbaa107e835a67cc16adf764203369840
+SIZE (ClickHouse-Extras-wordnet-blast-1d16ac2_GH0.tar.gz) = 15998
 SHA256 (xz-mirror-xz-869b9d1_GH0.tar.gz) = 7a512bd28783385545dee1d263220afe61c633d84c45ffe459ea814e8ea7f057
 SIZE (xz-mirror-xz-869b9d1_GH0.tar.gz) = 719977
 SHA256 (ClickHouse-Extras-yaml-cpp-0c86ada_GH0.tar.gz) = f2763d5687844fba8c6b2bf15935048a375823bd9ae2bb2bc46c5e36465b5ccd
 SIZE (ClickHouse-Extras-yaml-cpp-0c86ada_GH0.tar.gz) = 1033180
-SHA256 (ClickHouse-Extras-zlib-ng-db232d3_GH0.tar.gz) = e0ac9b22d08a676308ccc938924a45731ae2ad105b33b54ef543e52c0cf12c97
-SIZE (ClickHouse-Extras-zlib-ng-db232d3_GH0.tar.gz) = 699074
+SHA256 (ClickHouse-Extras-zlib-ng-bffad6f_GH0.tar.gz) = 1a706b7b3529bf99caa11a0d277dc08bd4d8c46ba95678382a9c5c222cc88b3e
+SIZE (ClickHouse-Extras-zlib-ng-bffad6f_GH0.tar.gz) = 810000
 SHA256 (facebook-zstd-a488ba1_GH0.tar.gz) = 69836fe7170fa2819ee5c2d3560fd179857f15609846af5325bc3a6c2cdf7f2e
 SIZE (facebook-zstd-a488ba1_GH0.tar.gz) = 1867248
-SHA256 (c-ares-c-ares-e982924_GH0.tar.gz) = b9a9375bcc52e113e485b8ba6d944cb2b6708b6f15e704746fc12b9a1b8790ae
-SIZE (c-ares-c-ares-e982924_GH0.tar.gz) = 746706
diff --git a/databases/clickhouse/files/patch-cmake_find_krb5.cmake b/databases/clickhouse/files/patch-cmake_find_krb5.cmake
new file mode 100644
index 000000000000..c5f2f3935c70
--- /dev/null
+++ b/databases/clickhouse/files/patch-cmake_find_krb5.cmake
@@ -0,0 +1,11 @@
+--- cmake/find/krb5.cmake.orig	2022-01-22 20:43:13 UTC
++++ cmake/find/krb5.cmake
+@@ -5,7 +5,7 @@ if (NOT EXISTS "${ClickHouse_SOURCE_DIR}/contrib/krb5/
+     set (ENABLE_KRB5 0)
+ endif ()
+ 
+-if (NOT CMAKE_SYSTEM_NAME MATCHES "Linux" AND NOT (CMAKE_SYSTEM_NAME MATCHES "Darwin" AND NOT CMAKE_CROSSCOMPILING))
++if (NOT CMAKE_SYSTEM_NAME MATCHES "Linux" AND NOT CMAKE_SYSTEM_NAME MATCHES "FreeBSD" AND NOT (CMAKE_SYSTEM_NAME MATCHES "Darwin" AND NOT CMAKE_CROSSCOMPILING))
+     message (WARNING "krb5 disabled in non-Linux and non-native-Darwin environments")
+     set (ENABLE_KRB5 0)
+ endif ()
diff --git a/databases/clickhouse/files/patch-cmake_freebsd_default__libs.cmake b/databases/clickhouse/files/patch-cmake_freebsd_default__libs.cmake
index 70c32f8227bf..5a1dd2d559a4 100644
--- a/databases/clickhouse/files/patch-cmake_freebsd_default__libs.cmake
+++ b/databases/clickhouse/files/patch-cmake_freebsd_default__libs.cmake
@@ -1,4 +1,4 @@
---- cmake/freebsd/default_libs.cmake.orig	2021-04-12 12:15:33 UTC
+--- cmake/freebsd/default_libs.cmake.orig	2022-01-22 20:43:13 UTC
 +++ cmake/freebsd/default_libs.cmake
 @@ -4,13 +4,13 @@ if (NOT COMPILER_CLANG)
      message (FATAL_ERROR "FreeBSD build is supported only for Clang")
diff --git a/databases/clickhouse/files/patch-cmake_freebsd_toolchain-x86__64.cmake b/databases/clickhouse/files/patch-cmake_freebsd_toolchain-x86__64.cmake
new file mode 100644
index 000000000000..d38c6fa2514e
--- /dev/null
+++ b/databases/clickhouse/files/patch-cmake_freebsd_toolchain-x86__64.cmake
@@ -0,0 +1,14 @@
+--- cmake/freebsd/toolchain-x86_64.cmake.orig	2021-12-26 09:29:33 UTC
++++ cmake/freebsd/toolchain-x86_64.cmake
+@@ -1,8 +1,8 @@
+ set (CMAKE_SYSTEM_NAME "FreeBSD")
+ set (CMAKE_SYSTEM_PROCESSOR "x86_64")
+-set (CMAKE_C_COMPILER_TARGET "x86_64-pc-freebsd11")
+-set (CMAKE_CXX_COMPILER_TARGET "x86_64-pc-freebsd11")
+-set (CMAKE_ASM_COMPILER_TARGET "x86_64-pc-freebsd11")
++set (CMAKE_C_COMPILER_TARGET "x86_64-pc-freebsd13")
++set (CMAKE_CXX_COMPILER_TARGET "x86_64-pc-freebsd13")
++set (CMAKE_ASM_COMPILER_TARGET "x86_64-pc-freebsd13")
+ set (CMAKE_SYSROOT "${CMAKE_CURRENT_LIST_DIR}/../../contrib/sysroot/freebsd-x86_64")
+ 
+ set (CMAKE_TRY_COMPILE_TARGET_TYPE STATIC_LIBRARY)  # disable linkage check - it doesn't work in CMake
diff --git a/databases/clickhouse/files/patch-cmake_tools.cmake b/databases/clickhouse/files/patch-cmake_tools.cmake
new file mode 100644
index 000000000000..9e7a474a7937
--- /dev/null
+++ b/databases/clickhouse/files/patch-cmake_tools.cmake
@@ -0,0 +1,11 @@
+--- cmake/tools.cmake.orig	2021-12-26 09:29:33 UTC
++++ cmake/tools.cmake
+@@ -40,7 +40,7 @@ elseif (COMPILER_CLANG)
+             set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fchar8_t")
+         endif ()
+     else ()
+-        set (CLANG_MINIMUM_VERSION 12)
++        set (CLANG_MINIMUM_VERSION 11)
+         if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS ${CLANG_MINIMUM_VERSION})
+             message (FATAL_ERROR "Clang version must be at least ${CLANG_MINIMUM_VERSION}.")
+         endif ()
diff --git a/databases/clickhouse/files/patch-contrib_cassandra_CMakeLists.txt b/databases/clickhouse/files/patch-contrib_cassandra_CMakeLists.txt
index 733dc7778753..a60049c288d5 100644
--- a/databases/clickhouse/files/patch-contrib_cassandra_CMakeLists.txt
+++ b/databases/clickhouse/files/patch-contrib_cassandra_CMakeLists.txt
@@ -1,12 +1,11 @@
---- contrib/cassandra/CMakeLists.txt.orig	2021-01-25 21:26:46 UTC
+--- contrib/cassandra/CMakeLists.txt.orig	2021-05-28 13:12:55 UTC
 +++ contrib/cassandra/CMakeLists.txt
-@@ -165,7 +165,8 @@ if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" OR
+@@ -165,7 +165,7 @@ if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" OR
     "${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
    # Enable C++11 support to use std::atomic
    if(CASS_USE_STD_ATOMIC)
 -    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
 +    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17")
-+    set(CMAKE_CXX_STANDARD "17")
    endif()
  
    # OpenSSL is deprecated on later versions of Mac OS X. The long-term solution
diff --git a/databases/clickhouse/files/patch-contrib_grpc_third__party_cares_cares_CMakeLists.txt b/databases/clickhouse/files/patch-contrib_grpc_third__party_cares_cares_CMakeLists.txt
new file mode 100644
index 000000000000..e113926a7dd3
--- /dev/null
+++ b/databases/clickhouse/files/patch-contrib_grpc_third__party_cares_cares_CMakeLists.txt
@@ -0,0 +1,15 @@
+--- contrib/grpc/third_party/cares/cares/CMakeLists.txt.orig	2021-10-11 11:30:53 UTC
++++ contrib/grpc/third_party/cares/cares/CMakeLists.txt
+@@ -115,7 +115,11 @@ ENDIF ()
+ CHECK_LIBRARY_EXISTS (nsl gethostbyname "" HAVE_LIBNSL)
+ CHECK_LIBRARY_EXISTS (rt clock_gettime "" HAVE_LIBRT)
+ 
+-SET (HAVE_LIBRESOLV 1)
++# Look for dependent/required libraries
++CHECK_LIBRARY_EXISTS (resolv res_servicename "" HAVE_RES_SERVICENAME_IN_LIBRESOLV)
++IF (HAVE_RES_SERVICENAME_IN_LIBRESOLV)
++	SET (HAVE_LIBRESOLV 1)
++ENDIF ()
+ 
+ # Look for necessary includes
+ CHECK_INCLUDE_FILES (sys/types.h           HAVE_SYS_TYPES_H)
diff --git a/databases/clickhouse/files/patch-contrib_krb5-cmake_autoconf__freebsd.h b/databases/clickhouse/files/patch-contrib_krb5-cmake_autoconf__freebsd.h
new file mode 100644
index 000000000000..474974c1df08
--- /dev/null
+++ b/databases/clickhouse/files/patch-contrib_krb5-cmake_autoconf__freebsd.h
@@ -0,0 +1,767 @@
+--- contrib/krb5-cmake/autoconf_freebsd.h.orig	2022-01-11 05:28:26 UTC
++++ contrib/krb5-cmake/autoconf_freebsd.h
+@@ -0,0 +1,764 @@
++/* include/autoconf.h.  Generated from autoconf.h.in by configure.  */
++/* include/autoconf.h.in.  Generated from configure.in by autoheader.  */
++
++
++#ifndef KRB5_AUTOCONF_H
++#define KRB5_AUTOCONF_H
++
++
++/* Define if AES-NI support is enabled */
++/* #undef AESNI */
++
++/* Define if socket can't be bound to 0.0.0.0 */
++/* #undef BROKEN_STREAMS_SOCKETS */
++
++/* Define if va_list objects can be simply copied by assignment. */
++/* #undef CAN_COPY_VA_LIST */
++
++/* Define to reduce code size even if it means more cpu usage */
++/* #undef CONFIG_SMALL */
++
++/* Define if __attribute__((constructor)) works */
++#define CONSTRUCTOR_ATTR_WORKS 1
++
++/* Define to default ccache name */
++#define DEFCCNAME "FILE:/tmp/krb5cc_%{uid}"
++
++/* Define to default client keytab name */
++#define DEFCKTNAME "FILE:/etc/krb5/user/%{euid}/client.keytab"
++
++/* Define to default keytab name */
++#define DEFKTNAME "FILE:/etc/krb5.keytab"
++
++/* Define if library initialization should be delayed until first use */
++#define DELAY_INITIALIZER 1
++
++/* Define if __attribute__((destructor)) works */
++#define DESTRUCTOR_ATTR_WORKS 1
++
++/* Define to disable PKINIT plugin support */
++#define DISABLE_PKINIT 1
++
++/* Define if LDAP KDB support within the Kerberos library (mainly ASN.1 code)
++   should be enabled. */
++/* #undef ENABLE_LDAP */
++
++/* Define if translation functions should be used. */
++/* #undef ENABLE_NLS */
++
++/* Define if thread support enabled */
++#define ENABLE_THREADS 1
++
++/* Define as return type of endrpcent */
++#define ENDRPCENT_TYPE void
++
++/* Define if Fortuna PRNG is selected */
++#define FORTUNA 1
++
++/* Define to the type of elements in the array set by `getgroups'. Usually
++   this is either `int' or `gid_t'. */
++#define GETGROUPS_T gid_t
++
++/* Define if gethostbyname_r returns int rather than struct hostent * */
++/* #undef GETHOSTBYNAME_R_RETURNS_INT */
++
++/* Type of getpeername second argument. */
++#define GETPEERNAME_ARG3_TYPE GETSOCKNAME_ARG3_TYPE
++
++/* Define if getpwnam_r exists but takes only 4 arguments (e.g., POSIX draft 6
++   implementations like some Solaris releases). */
++/* #undef GETPWNAM_R_4_ARGS */
++
++/* Define if getpwnam_r returns an int */
++#define GETPWNAM_R_RETURNS_INT 1
++
++/* Define if getpwuid_r exists but takes only 4 arguments (e.g., POSIX draft 6
++   implementations like some Solaris releases). */
++/* #undef GETPWUID_R_4_ARGS */
++
++/* Define if getservbyname_r returns int rather than struct servent * */
++/* #undef GETSERVBYNAME_R_RETURNS_INT */
++
++/* Type of pointer target for argument 3 to getsockname */
++#define GETSOCKNAME_ARG3_TYPE socklen_t
++
++/* Define if gmtime_r returns int instead of struct tm pointer, as on old
++   HP-UX systems. */
++/* #undef GMTIME_R_RETURNS_INT */
++
++/* Define if va_copy macro or function is available. */
++#define HAS_VA_COPY 1
++
++/* Define to 1 if you have the `access' function. */
++#define HAVE_ACCESS 1
++
++/* Define to 1 if you have the <alloca.h> header file. */
++#define HAVE_ALLOCA_H 1
++
++/* Define to 1 if you have the <arpa/inet.h> header file. */
++#define HAVE_ARPA_INET_H 1
++
++/* Define to 1 if you have the `bswap16' function. */
++/* #undef HAVE_BSWAP16 */
++
++/* Define to 1 if you have the `bswap64' function. */
++/* #undef HAVE_BSWAP64 */
++
++/* Define to 1 if bswap_16 is available via byteswap.h */
++/* #undef HAVE_BSWAP_16 */
++
++/* Define to 1 if bswap_64 is available via byteswap.h */
++/* #undef HAVE_BSWAP_64 */
++
++/* Define if bt_rseq is available, for recursive btree traversal. */
++#define HAVE_BT_RSEQ 1
++
++/* Define to 1 if you have the <byteswap.h> header file. */
++/* #undef HAVE_BYTESWAP_H */
++
++/* Define to 1 if you have the `chmod' function. */
++#define HAVE_CHMOD 1
++
++/* Define if cmocka library is available. */
++/* #undef HAVE_CMOCKA */
++
++/* Define to 1 if you have the `compile' function. */
++/* #undef HAVE_COMPILE */
++
++/* Define if com_err has compatible gettext support */
++#define HAVE_COM_ERR_INTL 1
++
++/* Define to 1 if you have the <cpuid.h> header file. */
++/* #undef HAVE_CPUID_H */
++
++/* Define to 1 if you have the `daemon' function. */
++#define HAVE_DAEMON 1
++
++/* Define to 1 if you have the declaration of `strerror_r', and to 0 if you
++   don't. */
++#define HAVE_DECL_STRERROR_R 1
++
++/* Define to 1 if you have the <dirent.h> header file, and it defines `DIR'.
++   */
++#define HAVE_DIRENT_H 1
++
++/* Define to 1 if you have the <dlfcn.h> header file. */
++#define HAVE_DLFCN_H 1
++
++/* Define to 1 if you have the `dn_skipname' function. */
++#define HAVE_DN_SKIPNAME 1
++
++/* Define to 1 if you have the <endian.h> header file. */
++/* #undef HAVE_ENDIAN_H */
++
++/* Define to 1 if you have the <errno.h> header file. */
++#define HAVE_ERRNO_H 1
++
++/* Define to 1 if you have the `fchmod' function. */
++#define HAVE_FCHMOD 1
++
++/* Define to 1 if you have the <fcntl.h> header file. */
++#define HAVE_FCNTL_H 1
++
++/* Define to 1 if you have the `flock' function. */
++#define HAVE_FLOCK 1
++
++/* Define to 1 if you have the `fnmatch' function. */
++#define HAVE_FNMATCH 1
++
++/* Define to 1 if you have the <fnmatch.h> header file. */
++#define HAVE_FNMATCH_H 1
++
++/* Define if you have the getaddrinfo function */
++#define HAVE_GETADDRINFO 1
++
++/* Define to 1 if you have the `getcwd' function. */
++#define HAVE_GETCWD 1
++
++/* Define to 1 if you have the `getenv' function. */
++#define HAVE_GETENV 1
++
++/* Define to 1 if you have the `geteuid' function. */
++#define HAVE_GETEUID 1
++
++/* Define if gethostbyname_r exists and its return type is known */
++/* #undef HAVE_GETHOSTBYNAME_R */
++
++/* Define to 1 if you have the `getnameinfo' function. */
++#define HAVE_GETNAMEINFO 1
++
++/* Define if system getopt should be used. */
++#define HAVE_GETOPT 1
++
++/* Define if system getopt_long should be used. */
++#define HAVE_GETOPT_LONG 1
++
++/* Define if getpwnam_r is available and useful. */
++#define HAVE_GETPWNAM_R 1
++
++/* Define if getpwuid_r is available and useful. */
++#define HAVE_GETPWUID_R 1
++
++/* Define if getservbyname_r exists and its return type is known */
++/* #undef HAVE_GETSERVBYNAME_R */
++
++/* Have the gettimeofday function */
++#define HAVE_GETTIMEOFDAY 1
++
++/* Define to 1 if you have the `getusershell' function. */
++#define HAVE_GETUSERSHELL 1
++
++/* Define to 1 if you have the `gmtime_r' function. */
++#define HAVE_GMTIME_R 1
++
++/* Define to 1 if you have the <ifaddrs.h> header file. */
++#define HAVE_IFADDRS_H 1
++
++/* Define to 1 if you have the `inet_ntop' function. */
++#define HAVE_INET_NTOP 1
++
++/* Define to 1 if you have the `inet_pton' function. */
++#define HAVE_INET_PTON 1
++
++/* Define to 1 if the system has the type `int16_t'. */
++#define HAVE_INT16_T 1
++
++/* Define to 1 if the system has the type `int32_t'. */
++#define HAVE_INT32_T 1
++
++/* Define to 1 if the system has the type `int8_t'. */
++#define HAVE_INT8_T 1
++
++/* Define to 1 if you have the <inttypes.h> header file. */
++#define HAVE_INTTYPES_H 1
++
++/* Define to 1 if you have the <keyutils.h> header file. */
++/* #undef HAVE_KEYUTILS_H */
++
++/* Define to 1 if you have the <lber.h> header file. */
++/* #undef HAVE_LBER_H */
++
++/* Define to 1 if you have the <ldap.h> header file. */
++/* #undef HAVE_LDAP_H */
++
++/* Define to 1 if you have the `crypto' library (-lcrypto). */
++#define HAVE_LIBCRYPTO 1
++
++/* Define if building with libedit. */
++/* #undef HAVE_LIBEDIT */
++
++/* Define to 1 if you have the `nsl' library (-lnsl). */
++/* #undef HAVE_LIBNSL */
++
++/* Define to 1 if you have the `resolv' library (-lresolv). */
++#define HAVE_LIBRESOLV 1
++
++/* Define to 1 if you have the `socket' library (-lsocket). */
++/* #undef HAVE_LIBSOCKET */
++
++/* Define if the util library is available */
++#define HAVE_LIBUTIL 1
++
++/* Define to 1 if you have the <limits.h> header file. */
++#define HAVE_LIMITS_H 1
++
++/* Define to 1 if you have the `localtime_r' function. */
++#define HAVE_LOCALTIME_R 1
++
++/* Define to 1 if you have the <machine/byte_order.h> header file. */
++#define HAVE_MACHINE_BYTE_ORDER_H 1
++
++/* Define to 1 if you have the <machine/endian.h> header file. */
++#define HAVE_MACHINE_ENDIAN_H 1
++
++/* Define to 1 if you have the <memory.h> header file. */
++#define HAVE_MEMORY_H 1
++
++/* Define to 1 if you have the `mkstemp' function. */
++#define HAVE_MKSTEMP 1
++
++/* Define to 1 if you have the <ndir.h> header file, and it defines `DIR'. */
++/* #undef HAVE_NDIR_H */
++
++/* Define to 1 if you have the <netdb.h> header file. */
++#define HAVE_NETDB_H 1
++
++/* Define if netdb.h declares h_errno */
++#define HAVE_NETDB_H_H_ERRNO 1
++
++/* Define to 1 if you have the <netinet/in.h> header file. */
++#define HAVE_NETINET_IN_H 1
++
++/* Define to 1 if you have the `ns_initparse' function. */
++#define HAVE_NS_INITPARSE 1
++
++/* Define to 1 if you have the `ns_name_uncompress' function. */
++#define HAVE_NS_NAME_UNCOMPRESS 1
++
++/* Define if OpenSSL supports cms. */
++#define HAVE_OPENSSL_CMS 1
++
++/* Define to 1 if you have the <paths.h> header file. */
++#define HAVE_PATHS_H 1
++
++/* Define if persistent keyrings are supported */
++/* #undef HAVE_PERSISTENT_KEYRING */
++
++/* Define to 1 if you have the <poll.h> header file. */
++#define HAVE_POLL_H 1
++
++/* Define if #pragma weak references work */
++/* #undef HAVE_PRAGMA_WEAK_REF */
++
++/* Define if you have POSIX threads libraries and header files. */
++#define HAVE_PTHREAD 1
++
++/* Define to 1 if you have the `pthread_once' function. */
++#define HAVE_PTHREAD_ONCE 1
++
++/* Have PTHREAD_PRIO_INHERIT. */
++#define HAVE_PTHREAD_PRIO_INHERIT 1
++
++/* Define to 1 if you have the `pthread_rwlock_init' function. */
++#define HAVE_PTHREAD_RWLOCK_INIT 1
++
++/* Define if pthread_rwlock_init is provided in the thread library. */
++#define HAVE_PTHREAD_RWLOCK_INIT_IN_THREAD_LIB 1
++
++/* Define to 1 if you have the <pwd.h> header file. */
++#define HAVE_PWD_H 1
++
++/* Define if building with GNU Readline. */
++/* #undef HAVE_READLINE */
++
++/* Define if regcomp exists and functions */
++#define HAVE_REGCOMP 1
++
++/* Define to 1 if you have the `regexec' function. */
++#define HAVE_REGEXEC 1
++
++/* Define to 1 if you have the <regexpr.h> header file. */
++/* #undef HAVE_REGEXPR_H */
++
++/* Define to 1 if you have the <regex.h> header file. */
++#define HAVE_REGEX_H 1
++
++/* Define to 1 if you have the `res_nclose' function. */
++#define HAVE_RES_NCLOSE 1
++
++/* Define to 1 if you have the `res_ndestroy' function. */
++#define HAVE_RES_NDESTROY 1
++
++/* Define to 1 if you have the `res_ninit' function. */
++#define HAVE_RES_NINIT 1
++
++/* Define to 1 if you have the `res_nsearch' function. */
++#define HAVE_RES_NSEARCH 1
++
++/* Define to 1 if you have the `res_search' function */
++#define HAVE_RES_SEARCH 1
++
++/* Define to 1 if you have the `re_comp' function. */
++/* #undef HAVE_RE_COMP */
++
++/* Define to 1 if you have the `re_exec' function. */
++/* #undef HAVE_RE_EXEC */
++
++/* Define to 1 if you have the <sasl/sasl.h> header file. */
++/* #undef HAVE_SASL_SASL_H */
++
++/* Define if struct sockaddr contains sa_len */
++#define HAVE_SA_LEN 1
++
++/* Define to 1 if you have the `setegid' function. */
++#define HAVE_SETEGID 1
++
++/* Define to 1 if you have the `setenv' function. */
++#define HAVE_SETENV 1
++
++/* Define to 1 if you have the `seteuid' function. */
++#define HAVE_SETEUID 1
++
++/* Define if setluid provided in OSF/1 security library */
++/* #undef HAVE_SETLUID */
++
++/* Define to 1 if you have the `setregid' function. */
++#define HAVE_SETREGID 1
++
++/* Define to 1 if you have the `setresgid' function. */
++/* #undef HAVE_SETRESGID */
++
++/* Define to 1 if you have the `setresuid' function. */
++/* #undef HAVE_SETRESUID */
++
++/* Define to 1 if you have the `setreuid' function. */
++#define HAVE_SETREUID 1
++
++/* Define to 1 if you have the `setsid' function. */
++#define HAVE_SETSID 1
++
++/* Define to 1 if you have the `setvbuf' function. */
++#define HAVE_SETVBUF 1
++
++/* Define if there is a socklen_t type. If not, probably use size_t */
++#define HAVE_SOCKLEN_T 1
++
++/* Define to 1 if you have the `srand' function. */
++#define HAVE_SRAND 1
++
++/* Define to 1 if you have the `srand48' function. */
++#define HAVE_SRAND48 1
++
++/* Define to 1 if you have the `srandom' function. */
++#define HAVE_SRANDOM 1
++
++/* Define to 1 if the system has the type `ssize_t'. */
++#define HAVE_SSIZE_T 1
++
++/* Define to 1 if you have the `stat' function. */
++#define HAVE_STAT 1
++
++/* Define to 1 if you have the <stddef.h> header file. */
++#define HAVE_STDDEF_H 1
++
++/* Define to 1 if you have the <stdint.h> header file. */
++#define HAVE_STDINT_H 1
++
++/* Define to 1 if you have the <stdlib.h> header file. */
++#define HAVE_STDLIB_H 1
++
++/* Define to 1 if you have the `step' function. */
++/* #undef HAVE_STEP */
++
++/* Define to 1 if you have the `strchr' function. */
++#define HAVE_STRCHR 1
++
++/* Define to 1 if you have the `strdup' function. */
++#define HAVE_STRDUP 1
++
++/* Define to 1 if you have the `strerror' function. */
++#define HAVE_STRERROR 1
++
++/* Define to 1 if you have the `strerror_r' function. */
++#define HAVE_STRERROR_R 1
++
++/* Define to 1 if you have the <strings.h> header file. */
++#define HAVE_STRINGS_H 1
++
++/* Define to 1 if you have the <string.h> header file. */
++#define HAVE_STRING_H 1
++
++/* Define to 1 if you have the `strlcpy' function. */
++#define HAVE_STRLCPY 1
++
++/* Define to 1 if you have the `strptime' function. */
++#define HAVE_STRPTIME 1
++
++/* Define to 1 if the system has the type `struct cmsghdr'. */
++#define HAVE_STRUCT_CMSGHDR 1
++
++/* Define if there is a struct if_laddrconf. */
++/* #undef HAVE_STRUCT_IF_LADDRCONF */
++
++/* Define to 1 if the system has the type `struct in6_pktinfo'. */
++#define HAVE_STRUCT_IN6_PKTINFO 1
++
++/* Define to 1 if the system has the type `struct in_pktinfo'. */
++#define HAVE_STRUCT_IN_PKTINFO 1
++
++/* Define if there is a struct lifconf. */
++/* #undef HAVE_STRUCT_LIFCONF */
++
++/* Define to 1 if the system has the type `struct rt_msghdr'. */
++#define HAVE_STRUCT_RT_MSGHDR 1
++
++/* Define to 1 if the system has the type `struct sockaddr_storage'. */
++#define HAVE_STRUCT_SOCKADDR_STORAGE 1
++
++/* Define to 1 if `st_mtimensec' is a member of `struct stat'. */
++/* #undef HAVE_STRUCT_STAT_ST_MTIMENSEC */
++
++/* Define to 1 if `st_mtimespec.tv_nsec' is a member of `struct stat'. */
++#define HAVE_STRUCT_STAT_ST_MTIMESPEC_TV_NSEC 1
++
++/* Define to 1 if `st_mtim.tv_nsec' is a member of `struct stat'. */
++/* #undef HAVE_STRUCT_STAT_ST_MTIM_TV_NSEC */
++
++/* Define to 1 if you have the <sys/bswap.h> header file. */
++/* #undef HAVE_SYS_BSWAP_H */
++
++/* Define to 1 if you have the <sys/dir.h> header file, and it defines `DIR'.
++   */
++/* #undef HAVE_SYS_DIR_H */
++
++/* Define if sys_errlist in libc */
++#define HAVE_SYS_ERRLIST 1
++
++/* Define to 1 if you have the <sys/file.h> header file. */
++#define HAVE_SYS_FILE_H 1
++
++/* Define to 1 if you have the <sys/filio.h> header file. */
++#define HAVE_SYS_FILIO_H 1
++
++/* Define to 1 if you have the <sys/ndir.h> header file, and it defines `DIR'.
++   */
++/* #undef HAVE_SYS_NDIR_H */
++
++/* Define to 1 if you have the <sys/param.h> header file. */
++#define HAVE_SYS_PARAM_H 1
++
++/* Define to 1 if you have the <sys/select.h> header file. */
++#define HAVE_SYS_SELECT_H 1
++
++/* Define to 1 if you have the <sys/socket.h> header file. */
++#define HAVE_SYS_SOCKET_H 1
++
++/* Define to 1 if you have the <sys/sockio.h> header file. */
++#define HAVE_SYS_SOCKIO_H 1
++
++/* Define to 1 if you have the <sys/stat.h> header file. */
++#define HAVE_SYS_STAT_H 1
++
++/* Define to 1 if you have the <sys/time.h> header file. */
++#define HAVE_SYS_TIME_H 1
++
++/* Define to 1 if you have the <sys/types.h> header file. */
++#define HAVE_SYS_TYPES_H 1
++
++/* Define to 1 if you have the <sys/uio.h> header file. */
++#define HAVE_SYS_UIO_H 1
++
++/* Define if tcl.h found */
++/* #undef HAVE_TCL_H */
++
++/* Define if tcl/tcl.h found */
++/* #undef HAVE_TCL_TCL_H */
++
++/* Define to 1 if you have the `timegm' function. */
++#define HAVE_TIMEGM 1
++
++/* Define to 1 if you have the <time.h> header file. */
++#define HAVE_TIME_H 1
++
++/* Define to 1 if you have the <unistd.h> header file. */
++#define HAVE_UNISTD_H 1
++
++/* Define to 1 if you have the `unsetenv' function. */
++#define HAVE_UNSETENV 1
++
++/* Define to 1 if the system has the type `u_char'. */
++#define HAVE_U_CHAR 1
++
++/* Define to 1 if the system has the type `u_int'. */
++#define HAVE_U_INT 1
++
++/* Define to 1 if the system has the type `u_int16_t'. */
++#define HAVE_U_INT16_T 1
++
++/* Define to 1 if the system has the type `u_int32_t'. */
++#define HAVE_U_INT32_T 1
++
++/* Define to 1 if the system has the type `u_int8_t'. */
++#define HAVE_U_INT8_T 1
++
++/* Define to 1 if the system has the type `u_long'. */
++#define HAVE_U_LONG 1
++
++/* Define to 1 if you have the `vasprintf' function. */
++#define HAVE_VASPRINTF 1
++
++/* Define to 1 if you have the `vsnprintf' function. */
++#define HAVE_VSNPRINTF 1
++
++/* Define to 1 if you have the `vsprintf' function. */
++#define HAVE_VSPRINTF 1
++
++/* Define to 1 if the system has the type `__int128_t'. */
++#define HAVE___INT128_T 1
++
++/* Define to 1 if the system has the type `__uint128_t'. */
++#define HAVE___UINT128_T 1
++
++/* Define if errno.h declares perror */
++/* #undef HDR_HAS_PERROR */
++
++/* May need to be defined to enable IPv6 support, for example on IRIX */
++/* #undef INET6 */
++
++/* Define if MIT Project Athena default configuration should be used */
++/* #undef KRB5_ATHENA_COMPAT */
++
++/* Define for DNS support of locating realms and KDCs */
++#undef KRB5_DNS_LOOKUP
++
++/* Define to enable DNS lookups of Kerberos realm names */
++/* #undef KRB5_DNS_LOOKUP_REALM */
++
++/* Define if the KDC should return only vague error codes to clients */
++/* #undef KRBCONF_VAGUE_ERRORS */
++
++/* define if the system header files are missing prototype for daemon() */
++#define NEED_DAEMON_PROTO 1
++
++/* Define if in6addr_any is not defined in libc */
++#define NEED_INSIXADDR_ANY 1
++
++/* define if the system header files are missing prototype for
++   ss_execute_command() */
++/* #undef NEED_SS_EXECUTE_COMMAND_PROTO */
++
++/* define if the system header files are missing prototype for strptime() */
++/* #undef NEED_STRPTIME_PROTO */
++
++/* define if the system header files are missing prototype for swab() */
++/* #undef NEED_SWAB_PROTO */
++
++/* Define if need to declare sys_errlist */
++/* #undef NEED_SYS_ERRLIST */
++
++/* define if the system header files are missing prototype for vasprintf() */
++/* #undef NEED_VASPRINTF_PROTO */
++
++/* Define if the KDC should use no lookaside cache */
++/* #undef NOCACHE */
++
++/* Define if references to pthread routines should be non-weak. */
++/* #undef NO_WEAK_PTHREADS */
++
++/* Define if lex produes code with yylineno */
++/* #undef NO_YYLINENO */
++
++/* Define to the address where bug reports for this package should be sent. */
++#define PACKAGE_BUGREPORT "krb5-bugs@mit.edu"
++
++/* Define to the full name of this package. */
++#define PACKAGE_NAME "Kerberos 5"
++
++/* Define to the full name and version of this package. */
++#define PACKAGE_STRING "Kerberos 5 1.17.1"
++
++/* Define to the one symbol short name of this package. */
++#define PACKAGE_TARNAME "krb5"
++
++/* Define to the home page for this package. */
++#define PACKAGE_URL ""
++
++/* Define to the version of this package. */
++#define PACKAGE_VERSION "1.17.1"
++
++/* Define if setjmp indicates POSIX interface */
++#define POSIX_SETJMP 1
++
++/* Define if POSIX signal handling is used */
++#define POSIX_SIGNALS 1
++
++/* Define if POSIX signal handlers are used */
++#define POSIX_SIGTYPE 1
++
++/* Define if termios.h exists and tcsetattr exists */
++#define POSIX_TERMIOS 1
++
++/* Define to necessary symbol if this constant uses a non-standard name on
++   your system. */
++/* #undef PTHREAD_CREATE_JOINABLE */
++
++/* Define as the return type of signal handlers (`int' or `void'). */
++#define RETSIGTYPE void
++
++/* Define as return type of setrpcent */
++#define SETRPCENT_TYPE void
++
++/* The size of `size_t', as computed by sizeof. */
++#define SIZEOF_SIZE_T 8
++
++/* The size of `time_t', as computed by sizeof. */
++#define SIZEOF_TIME_T 8
++
++/* Define to use OpenSSL for SPAKE preauth */
++#define SPAKE_OPENSSL 1
++
++/* Define for static plugin linkage */
++/* #undef STATIC_PLUGINS */
++
++/* Define to 1 if you have the ANSI C header files. */
++#define STDC_HEADERS 1
++
++/* Define to 1 if strerror_r returns char *. */
++/* #undef STRERROR_R_CHAR_P */
++
++/* Define if sys_errlist is defined in errno.h */
++#define SYS_ERRLIST_DECLARED 1
++
++/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
++#define TIME_WITH_SYS_TIME 1
++
++/* Define if no TLS implementation is selected */
++/* #undef TLS_IMPL_NONE */
++
++/* Define if TLS implementation is OpenSSL */
++#define TLS_IMPL_OPENSSL 1
++
++/* Define if you have dirent.h functionality */
++#define USE_DIRENT_H 1
++
++/* Define if dlopen should be used */
++#define USE_DLOPEN 1
++
++/* Define if the keyring ccache should be enabled */
++/* #undef USE_KEYRING_CCACHE */
++
++/* Define if link-time options for library finalization will be used */
++/* #undef USE_LINKER_FINI_OPTION */
++
++/* Define if link-time options for library initialization will be used */
++/* #undef USE_LINKER_INIT_OPTION */
++
++/* Define if sigprocmask should be used */
++#define USE_SIGPROCMASK 1
++
++/* Define if wait takes int as a argument */
++#define WAIT_USES_INT 1
++
++/* Define to 1 if `lex' declares `yytext' as a `char *' by default, not a
++   `char[]'. */
++#define YYTEXT_POINTER 1
++
++/* Define to enable extensions in glibc */
++#define _GNU_SOURCE 1
++
++/* Define to enable C11 extensions */
++#define __STDC_WANT_LIB_EXT1__ 1
++
++/* Define to empty if `const' does not conform to ANSI C. */
++/* #undef const */
++
++/* Define to `int' if <sys/types.h> doesn't define. */
++/* #undef gid_t */
++
++/* Define to `__inline__' or `__inline' if that's what the C compiler
++   calls it, or to nothing if 'inline' is not supported under any name.  */
++#ifndef __cplusplus
++/* #undef inline */
++#endif
++
++/* Define krb5_sigtype to type of signal handler */
++#define krb5_sigtype void
++
++/* Define to `int' if <sys/types.h> does not define. */
++/* #undef mode_t */
++
++/* Define to `long int' if <sys/types.h> does not define. */
++/* #undef off_t */
++
++/* Define to `long' if <sys/types.h> does not define. */
++/* #undef time_t */
++
++/* Define to `int' if <sys/types.h> doesn't define. */
++/* #undef uid_t */
++
++
++#if defined(__GNUC__) && !defined(inline)
++/* Silence gcc pedantic warnings about ANSI C.  */
++# define inline __inline__
++#endif
++#endif /* KRB5_AUTOCONF_H */
diff --git a/databases/clickhouse/files/patch-src_Common_MemoryStatisticsOS.cpp b/databases/clickhouse/files/patch-src_Common_MemoryStatisticsOS.cpp
index de0458181f69..b5a3d52c9114 100644
--- a/databases/clickhouse/files/patch-src_Common_MemoryStatisticsOS.cpp
+++ b/databases/clickhouse/files/patch-src_Common_MemoryStatisticsOS.cpp
@@ -1,11 +1,15 @@
---- src/Common/MemoryStatisticsOS.cpp.orig	2021-03-19 11:39:14 UTC
+--- src/Common/MemoryStatisticsOS.cpp.orig	2021-12-26 09:29:33 UTC
 +++ src/Common/MemoryStatisticsOS.cpp
-@@ -1,14 +1,20 @@
+@@ -1,4 +1,4 @@
 -#if defined(OS_LINUX)
--
++#if defined(OS_LINUX) || defined(OS_FREEBSD)
+ 
  #include <sys/types.h>
  #include <sys/stat.h>
-+
+@@ -6,6 +6,13 @@
+ #include <unistd.h>
+ #include <cassert>
+ 
 +#ifdef OS_FREEBSD
 +#include <sys/param.h>
 +#include <sys/sysctl.h>
@@ -13,18 +17,10 @@
 +#include <libprocstat.h>
 +#endif
 +
- #include <fcntl.h>
- #include <unistd.h>
- #include <cassert>
- 
  #include "MemoryStatisticsOS.h"
  
--#include <common/logger_useful.h>
-+//#include <common/logger_useful.h>
- #include <common/getPageSize.h>
- #include <Common/Exception.h>
- #include <IO/ReadBufferFromMemory.h>
-@@ -24,20 +30,40 @@ namespace ErrorCodes
+ #include <base/logger_useful.h>
+@@ -24,20 +31,40 @@ namespace ErrorCodes
      extern const int CANNOT_OPEN_FILE;
      extern const int CANNOT_READ_FROM_FILE_DESCRIPTOR;
      extern const int CANNOT_CLOSE_FILE;
@@ -66,7 +62,7 @@
      if (0 != ::close(fd))
      {
          try
-@@ -51,12 +77,42 @@ MemoryStatisticsOS::~MemoryStatisticsOS()
+@@ -51,12 +78,42 @@ MemoryStatisticsOS::~MemoryStatisticsOS()
              DB::tryLogCurrentException(__PRETTY_FUNCTION__);
          }
      }
@@ -109,7 +105,7 @@
      constexpr size_t buf_size = 1024;
      char buf[buf_size];
  
-@@ -99,10 +155,8 @@ MemoryStatisticsOS::Data MemoryStatisticsOS::get() con
+@@ -99,7 +156,7 @@ MemoryStatisticsOS::Data MemoryStatisticsOS::get() con
      data.shared *= page_size;
      data.code *= page_size;
      data.data_and_stack *= page_size;
@@ -118,6 +114,3 @@
      return data;
  }
  
- }
--
--#endif
diff --git a/databases/clickhouse/files/patch-src_Interpreters_AsynchronousMetrics.cpp b/databases/clickhouse/files/patch-src_Interpreters_AsynchronousMetrics.cpp
deleted file mode 100644
index 53cb1e3a2823..000000000000
--- a/databases/clickhouse/files/patch-src_Interpreters_AsynchronousMetrics.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/Interpreters/AsynchronousMetrics.cpp.orig	2021-07-17 10:04:30 UTC
-+++ src/Interpreters/AsynchronousMetrics.cpp
-@@ -207,7 +207,7 @@ void AsynchronousMetrics::update()
-     new_values["Uptime"] = getContext()->getUptimeSeconds();
- 
-     /// Process memory usage according to OS
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_FREEBSD)
-     {
-         MemoryStatisticsOS::Data data = memory_stat.get();
- 
diff --git a/databases/clickhouse/files/patch-src_Interpreters_AsynchronousMetrics.h b/databases/clickhouse/files/patch-src_Interpreters_AsynchronousMetrics.h
deleted file mode 100644
index 6eecdbacede0..000000000000
--- a/databases/clickhouse/files/patch-src_Interpreters_AsynchronousMetrics.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/Interpreters/AsynchronousMetrics.h.orig	2021-03-19 11:39:14 UTC
-+++ src/Interpreters/AsynchronousMetrics.h
-@@ -78,7 +78,7 @@ class AsynchronousMetrics (private)
-     bool quit {false};
-     AsynchronousMetricValues values;
- 
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_FREEBSD)
-     MemoryStatisticsOS memory_stat;
- #endif
- 
diff --git a/databases/clickhouse/pkg-descr b/databases/clickhouse/pkg-descr
index ad5088e5b51e..f3066e778d74 100644
--- a/databases/clickhouse/pkg-descr
+++ b/databases/clickhouse/pkg-descr
@@ -1,4 +1,2 @@
 ClickHouse is an open-source column-oriented database management
 system that allows generating analytical data reports in real time.
-
-WWW: https://clickhouse.tech/
diff --git a/databases/clickhouse/pkg-plist b/databases/clickhouse/pkg-plist
index a2ecbca744b0..da6c62a5b625 100644
--- a/databases/clickhouse/pkg-plist
+++ b/databases/clickhouse/pkg-plist
@@ -12,11 +12,12 @@ bin/clickhouse-obfuscator
 bin/clickhouse-report
 bin/clickhouse-server
 bin/clickhouse-test
+bin/clickhouse-static-files-disk-uploader
 cmake/global-%%CMAKE_BUILD_TYPE%%.cmake
 cmake/global.cmake
-@sample %%ETCDIR%%-client/config.xml.sample
-@sample %%ETCDIR%%-server/config.xml.sample
-@sample %%ETCDIR%%-server/users.xml.sample
+%%ETCDIR%%-client/config.xml.sample
+%%ETCDIR%%-server/config.xml.sample
+%%ETCDIR%%-server/users.xml.sample
 share/bash-completion/completions/clickhouse
 share/bash-completion/completions/clickhouse-benchmark
 share/bash-completion/completions/clickhouse-bootstrap
@@ -25,18 +26,22 @@ share/bash-completion/completions/clickhouse-local
 %%DATADIR%%-test/config/README.md
 %%DATADIR%%-test/config/client_config.xml
 %%DATADIR%%-test/config/config.d/clusters.xml
+%%DATADIR%%-test/config/config.d/CORS.xml
 %%DATADIR%%-test/config/config.d/custom_settings_prefixes.xml
 %%DATADIR%%-test/config/config.d/database_atomic.xml
 %%DATADIR%%-test/config/config.d/database_replicated.xml
 %%DATADIR%%-test/config/config.d/disks.xml
+%%DATADIR%%-test/config/config.d/encryption.xml
 %%DATADIR%%-test/config/config.d/graphite.xml
 %%DATADIR%%-test/config/config.d/keeper_port.xml
 %%DATADIR%%-test/config/config.d/listen.xml
+%%DATADIR%%-test/config/config.d/logger.xml
 %%DATADIR%%-test/config/config.d/logging_no_rotate.xml
 %%DATADIR%%-test/config/config.d/macros.xml
 %%DATADIR%%-test/config/config.d/max_concurrent_queries.xml
-%%DATADIR%%-test/config/config.d/metric_log.xml
-%%DATADIR%%-test/config/config.d/part_log.xml
+%%DATADIR%%-test/config/config.d/merge_tree_settings.xml
+%%DATADIR%%-test/config/config.d/merge_tree.xml
+%%DATADIR%%-test/config/config.d/named_collection.xml
 %%DATADIR%%-test/config/config.d/polymorphic_parts.xml
 %%DATADIR%%-test/config/config.d/query_masking_rules.xml
 %%DATADIR%%-test/config/config.d/secure_ports.xml
@@ -45,6 +50,7 @@ share/bash-completion/completions/clickhouse-local
 %%DATADIR%%-test/config/config.d/text_log.xml
 %%DATADIR%%-test/config/config.d/top_level_domains_lists.xml
 %%DATADIR%%-test/config/config.d/top_level_domains_path.xml
+%%DATADIR%%-test/config/config.d/zookeeper_log.xml
 %%DATADIR%%-test/config/config.d/zookeeper.xml
 %%DATADIR%%-test/config/decimals_dictionary.xml
 %%DATADIR%%-test/config/dhparam.pem
@@ -280,6779 +286,7969 @@ share/bash-completion/completions/clickhouse-local
 %%DATADIR%%-test/performance/visit_param_extract_raw.xml
 %%DATADIR%%-test/performance/website.xml
 %%DATADIR%%-test/performance/window_functions.xml
-%%DATADIR%%-test/queries/0_stateless/00001_select_1.reference
-%%DATADIR%%-test/queries/0_stateless/00001_select_1.sql
-%%DATADIR%%-test/queries/0_stateless/00002_system_numbers.reference
-%%DATADIR%%-test/queries/0_stateless/00002_system_numbers.sql
-%%DATADIR%%-test/queries/0_stateless/00003_reinterpret_as_string.reference
-%%DATADIR%%-test/queries/0_stateless/00003_reinterpret_as_string.sql
-%%DATADIR%%-test/queries/0_stateless/00004_shard_format_ast_and_remote_table.reference
-%%DATADIR%%-test/queries/0_stateless/00004_shard_format_ast_and_remote_table.sql
-%%DATADIR%%-test/queries/0_stateless/00005_shard_format_ast_and_remote_table_lambda.reference
-%%DATADIR%%-test/queries/0_stateless/00005_shard_format_ast_and_remote_table_lambda.sql
-%%DATADIR%%-test/queries/0_stateless/00006_extremes_and_subquery_from.reference
-%%DATADIR%%-test/queries/0_stateless/00006_extremes_and_subquery_from.sql
-%%DATADIR%%-test/queries/0_stateless/00007_array.reference
-%%DATADIR%%-test/queries/0_stateless/00007_array.sql
-%%DATADIR%%-test/queries/0_stateless/00008_array_join.reference
-%%DATADIR%%-test/queries/0_stateless/00008_array_join.sql
-%%DATADIR%%-test/queries/0_stateless/00009_array_join_subquery.reference
-%%DATADIR%%-test/queries/0_stateless/00009_array_join_subquery.sql
-%%DATADIR%%-test/queries/0_stateless/00010_big_array_join.reference
-%%DATADIR%%-test/queries/0_stateless/00010_big_array_join.sql
-%%DATADIR%%-test/queries/0_stateless/00011_array_join_alias.reference
-%%DATADIR%%-test/queries/0_stateless/00011_array_join_alias.sql
-%%DATADIR%%-test/queries/0_stateless/00012_array_join_alias_2.reference
-%%DATADIR%%-test/queries/0_stateless/00012_array_join_alias_2.sql
-%%DATADIR%%-test/queries/0_stateless/00013_create_table_with_arrays.reference
-%%DATADIR%%-test/queries/0_stateless/00013_create_table_with_arrays.sql
-%%DATADIR%%-test/queries/0_stateless/00014_select_from_table_with_nested.reference
-%%DATADIR%%-test/queries/0_stateless/00014_select_from_table_with_nested.sql
-%%DATADIR%%-test/queries/0_stateless/00015_totals_having_constants.reference
-%%DATADIR%%-test/queries/0_stateless/00015_totals_having_constants.sql
-%%DATADIR%%-test/queries/0_stateless/00016_totals_having_constants.reference
-%%DATADIR%%-test/queries/0_stateless/00016_totals_having_constants.sql
-%%DATADIR%%-test/queries/0_stateless/00017_in_subquery_with_empty_result.reference
-%%DATADIR%%-test/queries/0_stateless/00017_in_subquery_with_empty_result.sql
-%%DATADIR%%-test/queries/0_stateless/00018_distinct_in_subquery.reference
-%%DATADIR%%-test/queries/0_stateless/00018_distinct_in_subquery.sql
-%%DATADIR%%-test/queries/0_stateless/00019_shard_quantiles_totals_distributed.reference
-%%DATADIR%%-test/queries/0_stateless/00019_shard_quantiles_totals_distributed.sql
-%%DATADIR%%-test/queries/0_stateless/00020_sorting_arrays.reference
-%%DATADIR%%-test/queries/0_stateless/00020_sorting_arrays.sql
-%%DATADIR%%-test/queries/0_stateless/00021_sorting_arrays.reference
-%%DATADIR%%-test/queries/0_stateless/00021_sorting_arrays.sql
-%%DATADIR%%-test/queries/0_stateless/00022_func_higher_order_and_constants.reference
-%%DATADIR%%-test/queries/0_stateless/00022_func_higher_order_and_constants.sql
-%%DATADIR%%-test/queries/0_stateless/00023_agg_select_agg_subquery.reference
-%%DATADIR%%-test/queries/0_stateless/00023_agg_select_agg_subquery.sql
-%%DATADIR%%-test/queries/0_stateless/00024_unused_array_join_in_subquery.reference
-%%DATADIR%%-test/queries/0_stateless/00024_unused_array_join_in_subquery.sql
-%%DATADIR%%-test/queries/0_stateless/00025_implicitly_used_subquery_column.reference
-%%DATADIR%%-test/queries/0_stateless/00025_implicitly_used_subquery_column.sql
-%%DATADIR%%-test/queries/0_stateless/00026_shard_something_distributed.reference
-%%DATADIR%%-test/queries/0_stateless/00026_shard_something_distributed.sql
-%%DATADIR%%-test/queries/0_stateless/00027_argMinMax.reference
-%%DATADIR%%-test/queries/0_stateless/00027_argMinMax.sql
-%%DATADIR%%-test/queries/0_stateless/00027_distinct_and_order_by.reference
-%%DATADIR%%-test/queries/0_stateless/00027_distinct_and_order_by.sql
-%%DATADIR%%-test/queries/0_stateless/00027_simple_argMinArray.reference
-%%DATADIR%%-test/queries/0_stateless/00027_simple_argMinArray.sql
-%%DATADIR%%-test/queries/0_stateless/00028_shard_big_agg_aj_distributed.reference
-%%DATADIR%%-test/queries/0_stateless/00028_shard_big_agg_aj_distributed.sql
-%%DATADIR%%-test/queries/0_stateless/00029_test_zookeeper_optimize_exception.reference
-%%DATADIR%%-test/queries/0_stateless/00029_test_zookeeper_optimize_exception.sh
-%%DATADIR%%-test/queries/0_stateless/00030_alter_table.reference
-%%DATADIR%%-test/queries/0_stateless/00030_alter_table.sql
-%%DATADIR%%-test/queries/0_stateless/00031_parser_number.reference
-%%DATADIR%%-test/queries/0_stateless/00031_parser_number.sql
-%%DATADIR%%-test/queries/0_stateless/00032_fixed_string_to_string.reference
-%%DATADIR%%-test/queries/0_stateless/00032_fixed_string_to_string.sql
-%%DATADIR%%-test/queries/0_stateless/00033_fixed_string_to_string.reference
-%%DATADIR%%-test/queries/0_stateless/00033_fixed_string_to_string.sql
-%%DATADIR%%-test/queries/0_stateless/00034_fixed_string_to_number.reference
-%%DATADIR%%-test/queries/0_stateless/00034_fixed_string_to_number.sql
-%%DATADIR%%-test/queries/0_stateless/00035_function_array_return_type.reference
-%%DATADIR%%-test/queries/0_stateless/00035_function_array_return_type.sql
-%%DATADIR%%-test/queries/0_stateless/00036_array_element.reference
-%%DATADIR%%-test/queries/0_stateless/00036_array_element.sql
-%%DATADIR%%-test/queries/0_stateless/00037_totals_limit.reference
-%%DATADIR%%-test/queries/0_stateless/00037_totals_limit.sql
-%%DATADIR%%-test/queries/0_stateless/00038_totals_limit.reference
-%%DATADIR%%-test/queries/0_stateless/00038_totals_limit.sql
-%%DATADIR%%-test/queries/0_stateless/00039_inserts_through_http.reference
-%%DATADIR%%-test/queries/0_stateless/00039_inserts_through_http.sh
-%%DATADIR%%-test/queries/0_stateless/00040_array_enumerate_uniq.reference
-%%DATADIR%%-test/queries/0_stateless/00040_array_enumerate_uniq.sql
-%%DATADIR%%-test/queries/0_stateless/00041_aggregation_remap.reference
-%%DATADIR%%-test/queries/0_stateless/00041_aggregation_remap.sql
-%%DATADIR%%-test/queries/0_stateless/00041_big_array_join.reference
-%%DATADIR%%-test/queries/0_stateless/00041_big_array_join.sql
-%%DATADIR%%-test/queries/0_stateless/00042_set.reference
-%%DATADIR%%-test/queries/0_stateless/00042_set.sql
-%%DATADIR%%-test/queries/0_stateless/00043_summing_empty_part.reference
-%%DATADIR%%-test/queries/0_stateless/00043_summing_empty_part.sql
-%%DATADIR%%-test/queries/0_stateless/00044_sorting_by_string_descending.reference
-%%DATADIR%%-test/queries/0_stateless/00044_sorting_by_string_descending.sql
-%%DATADIR%%-test/queries/0_stateless/00045_sorting_by_fixed_string_descending.reference
-%%DATADIR%%-test/queries/0_stateless/00045_sorting_by_fixed_string_descending.sql
-%%DATADIR%%-test/queries/0_stateless/00046_stored_aggregates_simple.reference
-%%DATADIR%%-test/queries/0_stateless/00046_stored_aggregates_simple.sql
-%%DATADIR%%-test/queries/0_stateless/00047_stored_aggregates_complex.reference
-%%DATADIR%%-test/queries/0_stateless/00047_stored_aggregates_complex.sql
-%%DATADIR%%-test/queries/0_stateless/00048_a_stored_aggregates_merge.reference
-%%DATADIR%%-test/queries/0_stateless/00048_a_stored_aggregates_merge.sql
-%%DATADIR%%-test/queries/0_stateless/00048_b_stored_aggregates_merge.reference
-%%DATADIR%%-test/queries/0_stateless/00048_b_stored_aggregates_merge.sql
-%%DATADIR%%-test/queries/0_stateless/00049_any_left_join.reference
-%%DATADIR%%-test/queries/0_stateless/00049_any_left_join.sql
-%%DATADIR%%-test/queries/0_stateless/00050_any_left_join.reference
-%%DATADIR%%-test/queries/0_stateless/00050_any_left_join.sql
-%%DATADIR%%-test/queries/0_stateless/00051_any_inner_join.reference
-%%DATADIR%%-test/queries/0_stateless/00051_any_inner_join.sql
+%%DATADIR%%-test/queries/bugs/01133_max_result_rows.reference
+%%DATADIR%%-test/queries/bugs/01482_move_to_prewhere_and_cast.reference
+%%DATADIR%%-test/queries/bugs/01133_max_result_rows.sql
+%%DATADIR%%-test/queries/bugs/position_case_insensitive_utf8.sql
+%%DATADIR%%-test/queries/bugs/missing_scalar_subquery_removal.sql
+%%DATADIR%%-test/queries/bugs/01060_defaults_all_columns.reference
+%%DATADIR%%-test/queries/bugs/01482_move_to_prewhere_and_cast.sql
+%%DATADIR%%-test/queries/1_stateful/00094_order_by_array_join_limit.sql
+%%DATADIR%%-test/queries/1_stateful/00007_uniq.sql
+%%DATADIR%%-test/queries/1_stateful/00142_system_columns.reference
+%%DATADIR%%-test/queries/1_stateful/00010_quantiles_segfault.reference
+%%DATADIR%%-test/queries/1_stateful/00159_parallel_formatting_json_and_friends.sh
+%%DATADIR%%-test/queries/1_stateful/00008_uniq.sql
+%%DATADIR%%-test/queries/1_stateful/00004_top_counters.sql
+%%DATADIR%%-test/queries/1_stateful/00024_random_counters.reference
+%%DATADIR%%-test/queries/1_stateful/00066_sorting_distributed_many_replicas.reference
+%%DATADIR%%-test/queries/1_stateful/00086_array_reduce.sql
+%%DATADIR%%-test/queries/1_stateful/00001_count_hits.sql
+%%DATADIR%%-test/queries/1_stateful/00061_storage_buffer.sql
+%%DATADIR%%-test/queries/1_stateful/00021_2_select_with_in.sql
+%%DATADIR%%-test/queries/1_stateful/00068_subquery_in_prewhere.reference
+%%DATADIR%%-test/queries/1_stateful/00088_global_in_one_shard_and_rows_before_limit.sql
+%%DATADIR%%-test/queries/1_stateful/00017_aggregation_uninitialized_memory.reference
+%%DATADIR%%-test/queries/1_stateful/00046_uniq_upto_distributed.sql
+%%DATADIR%%-test/queries/1_stateful/00068_subquery_in_prewhere.sql
+%%DATADIR%%-test/queries/1_stateful/00056_view.sql
+%%DATADIR%%-test/queries/1_stateful/00094_order_by_array_join_limit.reference
+%%DATADIR%%-test/queries/1_stateful/00038_uniq_state_merge2.sql
+%%DATADIR%%-test/queries/1_stateful/00015_totals_and_no_aggregate_functions.sql
+%%DATADIR%%-test/queries/1_stateful/00151_replace_partition_with_different_granularity.sql
+%%DATADIR%%-test/queries/1_stateful/00083_array_filter.sql
+%%DATADIR%%-test/queries/1_stateful/00151_order_by_read_in_order.sql
+%%DATADIR%%-test/queries/1_stateful/00062_loyalty.sql
+%%DATADIR%%-test/queries/1_stateful/00083_array_filter.reference
+%%DATADIR%%-test/queries/1_stateful/00078_group_by_arrays.sql
+%%DATADIR%%-test/queries/1_stateful/00011_sorting.sql
+%%DATADIR%%-test/queries/1_stateful/00164_quantileBfloat16.reference
+%%DATADIR%%-test/queries/1_stateful/00167_parallel_parsing_with_names_and_types.sh
+%%DATADIR%%-test/queries/1_stateful/00085_monotonic_evaluation_segfault.sql
+%%DATADIR%%-test/queries/1_stateful/00169_contingency.reference
+%%DATADIR%%-test/queries/1_stateful/00047_bar.sql
+%%DATADIR%%-test/queries/1_stateful/00039_primary_key.sql
+%%DATADIR%%-test/queries/1_stateful/00144_functions_of_aggregation_states.sql
+%%DATADIR%%-test/queries/1_stateful/00055_index_and_not.sql
+%%DATADIR%%-test/queries/1_stateful/00163_column_oriented_formats.sh
+%%DATADIR%%-test/queries/1_stateful/00095_hyperscan_profiler.sql
+%%DATADIR%%-test/queries/1_stateful/00045_uniq_upto.reference
+%%DATADIR%%-test/queries/1_stateful/00051_min_max_array.reference
+%%DATADIR%%-test/queries/1_stateful/00140_rename.sql
+%%DATADIR%%-test/queries/1_stateful/00074_full_join.sql
+%%DATADIR%%-test/queries/1_stateful/00049_max_string_if.sql
+%%DATADIR%%-test/queries/1_stateful/00021_1_select_with_in.reference
+%%DATADIR%%-test/queries/1_stateful/00147_global_in_aggregate_function.reference
+%%DATADIR%%-test/queries/1_stateful/00158_cache_dictionary_has.sql
+%%DATADIR%%-test/queries/1_stateful/00077_log_tinylog_stripelog.reference
+%%DATADIR%%-test/queries/1_stateful/00002_count_visits.reference
+%%DATADIR%%-test/queries/1_stateful/00156_max_execution_speed_sample_merge.sql
+%%DATADIR%%-test/queries/1_stateful/00012_sorting_distributed.reference
+%%DATADIR%%-test/queries/1_stateful/00052_group_by_in.reference
+%%DATADIR%%-test/queries/1_stateful/00050_min_max.sql
+%%DATADIR%%-test/queries/1_stateful/00036_aggregate_hashed.reference
+%%DATADIR%%-test/queries/1_stateful/00075_left_array_join.reference
+%%DATADIR%%-test/queries/1_stateful/00139_like.sql
+%%DATADIR%%-test/queries/1_stateful/00086_array_reduce.reference
+%%DATADIR%%-test/queries/1_stateful/00085_monotonic_evaluation_segfault.reference
+%%DATADIR%%-test/queries/1_stateful/00156_max_execution_speed_sample_merge.reference
+%%DATADIR%%-test/queries/1_stateful/00021_2_select_with_in.reference
+%%DATADIR%%-test/queries/1_stateful/00166_explain_estimate.sql
+%%DATADIR%%-test/queries/1_stateful/00030_array_enumerate_uniq.reference
+%%DATADIR%%-test/queries/1_stateful/00040_aggregating_materialized_view.reference
+%%DATADIR%%-test/queries/1_stateful/00016_any_if_distributed_cond_always_false.reference
+%%DATADIR%%-test/queries/1_stateful/00169_contingency.sql
+%%DATADIR%%-test/queries/1_stateful/00150_quantiles_timing_precision.sql
+%%DATADIR%%-test/queries/1_stateful/00165_jit_aggregate_functions.sql
+%%DATADIR%%-test/queries/1_stateful/00158_cache_dictionary_has.reference
+%%DATADIR%%-test/queries/1_stateful/00090_thread_pool_deadlock.reference
+%%DATADIR%%-test/queries/1_stateful/00168_parallel_processing_on_replicas_part_1.reference
+%%DATADIR%%-test/queries/1_stateful/00037_uniq_state_merge1.sql
+%%DATADIR%%-test/queries/1_stateful/00033_aggregate_key_string.sql
+%%DATADIR%%-test/queries/1_stateful/00038_uniq_state_merge2.reference
+%%DATADIR%%-test/queries/1_stateful/00021_3_select_with_in.reference
+%%DATADIR%%-test/queries/1_stateful/00016_any_if_distributed_cond_always_false.sql
+%%DATADIR%%-test/queries/1_stateful/00159_parallel_formatting_tsv_and_friends.sh
+%%DATADIR%%-test/queries/1_stateful/00077_log_tinylog_stripelog.sql
+%%DATADIR%%-test/queries/1_stateful/00167_parallel_parsing_with_names_and_types.reference
+%%DATADIR%%-test/queries/1_stateful/00165_jit_aggregate_functions.reference
+%%DATADIR%%-test/queries/1_stateful/00062_loyalty.reference
+%%DATADIR%%-test/queries/1_stateful/00072_compare_date_and_string_index.sql
+%%DATADIR%%-test/queries/1_stateful/00071_merge_tree_optimize_aio.sql
+%%DATADIR%%-test/queries/1_stateful/00005_filtering.reference
+%%DATADIR%%-test/queries/1_stateful/00032_aggregate_key64.sql
+%%DATADIR%%-test/queries/1_stateful/00076_system_columns_bytes.sql
+%%DATADIR%%-test/queries/1_stateful/00041_aggregating_materialized_view.reference
+%%DATADIR%%-test/queries/1_stateful/00031_array_enumerate_uniq.reference
+%%DATADIR%%-test/queries/1_stateful/00164_quantileBfloat16.sql
+%%DATADIR%%-test/queries/1_stateful/00144_functions_of_aggregation_states.reference
+%%DATADIR%%-test/queries/1_stateful/00053_replicate_segfault.sql
+%%DATADIR%%-test/queries/1_stateful/00060_move_to_prewhere_and_sets.sql
+%%DATADIR%%-test/queries/1_stateful/00035_aggregate_keys128.sql
+%%DATADIR%%-test/queries/1_stateful/00042_any_left_join.reference
+%%DATADIR%%-test/queries/1_stateful/00159_parallel_formatting_json_and_friends.reference
+%%DATADIR%%-test/queries/1_stateful/00007_uniq.reference
+%%DATADIR%%-test/queries/1_stateful/00080_array_join_and_union.sql
+%%DATADIR%%-test/queries/1_stateful/00013_sorting_of_nested.reference
+%%DATADIR%%-test/queries/1_stateful/00157_cache_dictionary.reference
+%%DATADIR%%-test/queries/1_stateful/00040_aggregating_materialized_view.sql
+%%DATADIR%%-test/queries/1_stateful/00084_external_aggregation.sql
+%%DATADIR%%-test/queries/1_stateful/00075_left_array_join.sql
+%%DATADIR%%-test/queries/1_stateful/00153_aggregate_arena_race.reference
+%%DATADIR%%-test/queries/1_stateful/00162_mmap_compression_none.sql
+%%DATADIR%%-test/queries/1_stateful/00141_transform.sql
+%%DATADIR%%-test/queries/1_stateful/00168_parallel_processing_on_replicas_part_1.sh
+%%DATADIR%%-test/queries/1_stateful/00087_where_0.reference
+%%DATADIR%%-test/queries/1_stateful/00049_max_string_if.reference
+%%DATADIR%%-test/queries/1_stateful/00051_min_max_array.sql
+%%DATADIR%%-test/queries/1_stateful/00140_rename.reference
+%%DATADIR%%-test/queries/1_stateful/00061_storage_buffer.reference
+%%DATADIR%%-test/queries/1_stateful/00093_prewhere_array_join.sql
+%%DATADIR%%-test/queries/1_stateful/00010_quantiles_segfault.sql
+%%DATADIR%%-test/queries/1_stateful/00167_read_bytes_from_fs.sql
+%%DATADIR%%-test/queries/1_stateful/00167_read_bytes_from_fs.reference
+%%DATADIR%%-test/queries/1_stateful/00081_group_by_without_key_and_totals.reference
+%%DATADIR%%-test/queries/1_stateful/00033_aggregate_key_string.reference
+%%DATADIR%%-test/queries/1_stateful/00045_uniq_upto.sql
+%%DATADIR%%-test/queries/1_stateful/00067_union_all.sql
+%%DATADIR%%-test/queries/1_stateful/00143_transform_non_const_default.sql
+%%DATADIR%%-test/queries/1_stateful/00013_sorting_of_nested.sql
+%%DATADIR%%-test/queries/1_stateful/00046_uniq_upto_distributed.reference
+%%DATADIR%%-test/queries/1_stateful/00152_insert_different_granularity.sql
+%%DATADIR%%-test/queries/1_stateful/00001_count_hits.reference
+%%DATADIR%%-test/queries/1_stateful/00149_quantiles_timing_distributed.reference
+%%DATADIR%%-test/queries/1_stateful/00014_filtering_arrays.reference
+%%DATADIR%%-test/queries/1_stateful/00159_parallel_formatting_http.reference
+%%DATADIR%%-test/queries/1_stateful/00004_top_counters.reference
+%%DATADIR%%-test/queries/1_stateful/00145_aggregate_functions_statistics.reference
+%%DATADIR%%-test/queries/1_stateful/00066_sorting_distributed_many_replicas.sql
+%%DATADIR%%-test/queries/1_stateful/00034_aggregate_key_fixed_string.sql
+%%DATADIR%%-test/queries/1_stateful/00161_parallel_parsing_with_names.sh
+%%DATADIR%%-test/queries/1_stateful/00161_parallel_parsing_with_names.reference
+%%DATADIR%%-test/queries/1_stateful/00048_min_max.sql
+%%DATADIR%%-test/queries/1_stateful/00050_min_max.reference
+%%DATADIR%%-test/queries/1_stateful/00031_array_enumerate_uniq.sql
+%%DATADIR%%-test/queries/1_stateful/00002_count_visits.sql
+%%DATADIR%%-test/queries/1_stateful/00147_global_in_aggregate_function.sql
+%%DATADIR%%-test/queries/1_stateful/00056_view.reference
+%%DATADIR%%-test/queries/1_stateful/00023_totals_limit.sql
+%%DATADIR%%-test/queries/1_stateful/00030_array_enumerate_uniq.sql
+%%DATADIR%%-test/queries/1_stateful/00009_uniq_distributed.reference
+%%DATADIR%%-test/queries/1_stateful/00095_hyperscan_profiler.reference
+%%DATADIR%%-test/queries/1_stateful/00146_aggregate_function_uniq.sql
+%%DATADIR%%-test/queries/1_stateful/00092_obfuscator.sh
+%%DATADIR%%-test/queries/1_stateful/00047_bar.reference
+%%DATADIR%%-test/queries/1_stateful/00162_mmap_compression_none.reference
+%%DATADIR%%-test/queries/1_stateful/00065_loyalty_with_storage_join.reference
+%%DATADIR%%-test/queries/1_stateful/00089_position_functions_with_non_constant_arg.reference
+%%DATADIR%%-test/queries/1_stateful/00089_position_functions_with_non_constant_arg.sql
+%%DATADIR%%-test/queries/1_stateful/00091_prewhere_two_conditions.sql
+%%DATADIR%%-test/queries/1_stateful/00074_full_join.reference
+%%DATADIR%%-test/queries/1_stateful/00008_uniq.reference
+%%DATADIR%%-test/queries/1_stateful/00078_group_by_arrays.reference
+%%DATADIR%%-test/queries/1_stateful/00076_system_columns_bytes.reference
+%%DATADIR%%-test/queries/1_stateful/00150_quantiles_timing_precision.reference
+%%DATADIR%%-test/queries/1_stateful/00088_global_in_one_shard_and_rows_before_limit.reference
+%%DATADIR%%-test/queries/1_stateful/00152_insert_different_granularity.reference
+%%DATADIR%%-test/queries/1_stateful/00006_agregates.sql
+%%DATADIR%%-test/queries/1_stateful/00043_any_left_join.sql
+%%DATADIR%%-test/queries/1_stateful/00073_uniq_array.sql
+%%DATADIR%%-test/queries/1_stateful/00079_array_join_not_used_joined_column.sql
+%%DATADIR%%-test/queries/1_stateful/00080_array_join_and_union.reference
+%%DATADIR%%-test/queries/1_stateful/00032_aggregate_key64.reference
+%%DATADIR%%-test/queries/1_stateful/00014_filtering_arrays.sql
+%%DATADIR%%-test/queries/1_stateful/00021_1_select_with_in.sql
+%%DATADIR%%-test/queries/1_stateful/00069_duplicate_aggregation_keys.reference
+%%DATADIR%%-test/queries/1_stateful/00012_sorting_distributed.sql
+%%DATADIR%%-test/queries/1_stateful/00011_sorting.reference
+%%DATADIR%%-test/queries/1_stateful/00146_aggregate_function_uniq.reference
+%%DATADIR%%-test/queries/1_stateful/00082_quantiles.sql
+%%DATADIR%%-test/queries/1_stateful/00055_index_and_not.reference
+%%DATADIR%%-test/queries/1_stateful/00151_order_by_read_in_order.reference
+%%DATADIR%%-test/queries/1_stateful/00142_system_columns.sql
+%%DATADIR%%-test/queries/1_stateful/00063_loyalty_joins.sql
+%%DATADIR%%-test/queries/1_stateful/00024_random_counters.sql
+%%DATADIR%%-test/queries/1_stateful/00009_uniq_distributed.sql
+%%DATADIR%%-test/queries/1_stateful/00052_group_by_in.sql
+%%DATADIR%%-test/queries/1_stateful/00073_uniq_array.reference
+%%DATADIR%%-test/queries/1_stateful/00065_loyalty_with_storage_join.sql
+%%DATADIR%%-test/queries/1_stateful/00093_prewhere_array_join.reference
+%%DATADIR%%-test/queries/1_stateful/00048_min_max.reference
+%%DATADIR%%-test/queries/1_stateful/00069_duplicate_aggregation_keys.sql
+%%DATADIR%%-test/queries/1_stateful/00154_avro.sql
+%%DATADIR%%-test/queries/1_stateful/00063_loyalty_joins.reference
+%%DATADIR%%-test/queries/1_stateful/00036_aggregate_hashed.sql
+%%DATADIR%%-test/queries/1_stateful/00054_merge_tree_partitions.reference
+%%DATADIR%%-test/queries/1_stateful/00159_parallel_formatting_http.sh
+%%DATADIR%%-test/queries/1_stateful/00022_merge_prewhere.sql
+%%DATADIR%%-test/queries/1_stateful/00039_primary_key.reference
+%%DATADIR%%-test/queries/1_stateful/00060_move_to_prewhere_and_sets.reference
+%%DATADIR%%-test/queries/1_stateful/00148_monotonic_functions_and_index.reference
+%%DATADIR%%-test/queries/1_stateful/00023_totals_limit.reference
+%%DATADIR%%-test/queries/1_stateful/00160_decode_xml_component.sql
+%%DATADIR%%-test/queries/1_stateful/00017_aggregation_uninitialized_memory.sql
+%%DATADIR%%-test/queries/1_stateful/00067_union_all.reference
+%%DATADIR%%-test/queries/1_stateful/00092_obfuscator.reference
+%%DATADIR%%-test/queries/1_stateful/00059_merge_sorting_empty_array_joined.sql
+%%DATADIR%%-test/queries/1_stateful/00091_prewhere_two_conditions.reference
+%%DATADIR%%-test/queries/1_stateful/00071_merge_tree_optimize_aio.reference
+%%DATADIR%%-test/queries/1_stateful/00042_any_left_join.sql
+%%DATADIR%%-test/queries/1_stateful/00053_replicate_segfault.reference
+%%DATADIR%%-test/queries/1_stateful/00041_aggregating_materialized_view.sql
+%%DATADIR%%-test/queries/1_stateful/00005_filtering.sql
+%%DATADIR%%-test/queries/1_stateful/00034_aggregate_key_fixed_string.reference
+%%DATADIR%%-test/queries/1_stateful/00149_quantiles_timing_distributed.sql
+%%DATADIR%%-test/queries/1_stateful/00081_group_by_without_key_and_totals.sql
+%%DATADIR%%-test/queries/1_stateful/00015_totals_and_no_aggregate_functions.reference
+%%DATADIR%%-test/queries/1_stateful/00159_parallel_formatting_csv_and_friends.sh
+%%DATADIR%%-test/queries/1_stateful/00021_3_select_with_in.sql
+%%DATADIR%%-test/queries/1_stateful/00143_transform_non_const_default.reference
+%%DATADIR%%-test/queries/1_stateful/00090_thread_pool_deadlock.sh
+%%DATADIR%%-test/queries/1_stateful/00006_agregates.reference
+%%DATADIR%%-test/queries/1_stateful/00044_any_left_join_string.reference
+%%DATADIR%%-test/queries/1_stateful/00159_parallel_formatting_tsv_and_friends.reference
+%%DATADIR%%-test/queries/1_stateful/00166_explain_estimate.reference
+%%DATADIR%%-test/queries/1_stateful/00157_cache_dictionary.sql
+%%DATADIR%%-test/queries/1_stateful/00044_any_left_join_string.sql
+%%DATADIR%%-test/queries/1_stateful/00022_merge_prewhere.reference
+%%DATADIR%%-test/queries/1_stateful/00148_monotonic_functions_and_index.sql
+%%DATADIR%%-test/queries/1_stateful/00154_avro.reference
+%%DATADIR%%-test/queries/1_stateful/00151_replace_partition_with_different_granularity.reference
+%%DATADIR%%-test/queries/1_stateful/00054_merge_tree_partitions.sql
+%%DATADIR%%-test/queries/1_stateful/00079_array_join_not_used_joined_column.reference
+%%DATADIR%%-test/queries/1_stateful/00159_parallel_formatting_csv_and_friends.reference
+%%DATADIR%%-test/queries/1_stateful/00043_any_left_join.reference
+%%DATADIR%%-test/queries/1_stateful/00020_distinct_order_by_distributed.sql
+%%DATADIR%%-test/queries/1_stateful/00145_aggregate_functions_statistics.sql
+%%DATADIR%%-test/queries/1_stateful/00020_distinct_order_by_distributed.reference
+%%DATADIR%%-test/queries/1_stateful/00153_aggregate_arena_race.sql
+%%DATADIR%%-test/queries/1_stateful/00084_external_aggregation.reference
+%%DATADIR%%-test/queries/1_stateful/00082_quantiles.reference
+%%DATADIR%%-test/queries/1_stateful/00035_aggregate_keys128.reference
+%%DATADIR%%-test/queries/1_stateful/00059_merge_sorting_empty_array_joined.reference
+%%DATADIR%%-test/queries/1_stateful/00037_uniq_state_merge1.reference
+%%DATADIR%%-test/queries/1_stateful/00141_transform.reference
+%%DATADIR%%-test/queries/1_stateful/00160_decode_xml_component.reference
+%%DATADIR%%-test/queries/1_stateful/00139_like.reference
+%%DATADIR%%-test/queries/1_stateful/00087_where_0.sql
+%%DATADIR%%-test/queries/1_stateful/00163_column_oriented_formats.reference
+%%DATADIR%%-test/queries/1_stateful/00072_compare_date_and_string_index.reference
+%%DATADIR%%-test/queries/0_stateless/00417_kill_query.reference
+%%DATADIR%%-test/queries/0_stateless/01319_mv_constants_bug.reference
+%%DATADIR%%-test/queries/0_stateless/01783_http_chunk_size.reference
+%%DATADIR%%-test/queries/0_stateless/01256_misspell_layout_name_podshumok.reference
+%%DATADIR%%-test/queries/0_stateless/01570_aggregator_combinator_simple_state.sql
+%%DATADIR%%-test/queries/0_stateless/00973_live_view_with_subquery_select_nested.reference
+%%DATADIR%%-test/queries/0_stateless/00672_arrayDistinct.sql
+%%DATADIR%%-test/queries/0_stateless/01649_with_alias_key_condition.reference
+%%DATADIR%%-test/queries/0_stateless/01956_fuse_quantile_optimization.sql
+%%DATADIR%%-test/queries/0_stateless/00176_if_string_arrays.reference
+%%DATADIR%%-test/queries/0_stateless/00916_add_materialized_column_after.sql
+%%DATADIR%%-test/queries/0_stateless/00484_preferred_max_column_in_block_size_bytes.sql
+%%DATADIR%%-test/queries/0_stateless/01705_normalize_create_alter_function_names.sql
+%%DATADIR%%-test/queries/0_stateless/02097_remove_sample_by.sql
+%%DATADIR%%-test/queries/0_stateless/00840_top_k_weighted.reference
+%%DATADIR%%-test/queries/0_stateless/01720_country_perimeter_and_area.sh
+%%DATADIR%%-test/queries/0_stateless/00388_enum_with_totals.sql
+%%DATADIR%%-test/queries/0_stateless/02124_empty_uuid.reference
+%%DATADIR%%-test/queries/0_stateless/00094_union_race_conditions_5.reference
+%%DATADIR%%-test/queries/0_stateless/00898_quantile_timing_parameter_check.sql
+%%DATADIR%%-test/queries/0_stateless/01129_dict_get_join_lose_constness.reference
+%%DATADIR%%-test/queries/0_stateless/01098_sum.reference
+%%DATADIR%%-test/queries/0_stateless/01127_month_partitioning_consistency_select.reference
+%%DATADIR%%-test/queries/0_stateless/01114_database_atomic.reference
+%%DATADIR%%-test/queries/0_stateless/00742_require_join_strictness.sql
+%%DATADIR%%-test/queries/0_stateless/00293_shard_max_subquery_depth.reference
+%%DATADIR%%-test/queries/0_stateless/01753_fix_clickhouse_format.sh
+%%DATADIR%%-test/queries/0_stateless/01014_lazy_database_concurrent_recreate_reattach_and_show_tables.reference
+%%DATADIR%%-test/queries/0_stateless/00921_datetime64_compatibility_long.python
+%%DATADIR%%-test/queries/0_stateless/00122_join_with_subquery_with_subquery.reference
+%%DATADIR%%-test/queries/0_stateless/01812_basic_auth_http_server.sh
+%%DATADIR%%-test/queries/0_stateless/01737_clickhouse_server_wait_server_pool_long.sh
+%%DATADIR%%-test/queries/0_stateless/01915_create_or_replace_dictionary.reference
+%%DATADIR%%-test/queries/0_stateless/02050_client_profile_events.reference
+%%DATADIR%%-test/queries/0_stateless/01813_quantileBfloat16_nans.reference
+%%DATADIR%%-test/queries/0_stateless/01223_dist_on_dist.sql
+%%DATADIR%%-test/queries/0_stateless/01583_parallel_parsing_exception_with_offset.reference
+%%DATADIR%%-test/queries/0_stateless/01071_live_view_detach_dependency.reference
+%%DATADIR%%-test/queries/0_stateless/01852_s2_get_neighbours.reference
+%%DATADIR%%-test/queries/0_stateless/01012_serialize_array_memory_usage.sql
+%%DATADIR%%-test/queries/0_stateless/01561_Date_and_DateTime64_comparision.reference
+%%DATADIR%%-test/queries/0_stateless/00765_sql_compatibility_aliases.sql
+%%DATADIR%%-test/queries/0_stateless/01054_random_printable_ascii_ubsan.sh
+%%DATADIR%%-test/queries/0_stateless/02020_cast_integer_overflow.reference
+%%DATADIR%%-test/queries/0_stateless/00994_table_function_numbers_mt.reference
+%%DATADIR%%-test/queries/0_stateless/01056_window_view_proc_hop_watch.reference
+%%DATADIR%%-test/queries/0_stateless/01655_agg_if_nullable.sql
+%%DATADIR%%-test/queries/0_stateless/00858_issue_4756.reference
+%%DATADIR%%-test/queries/0_stateless/01506_buffer_table_alter_block_structure.reference
+%%DATADIR%%-test/queries/0_stateless/01280_unicode_whitespaces_lexer.reference
+%%DATADIR%%-test/queries/0_stateless/01445_create_table_as_table_function.sh
+%%DATADIR%%-test/queries/0_stateless/00973_live_view_with_subquery_select_join.reference
+%%DATADIR%%-test/queries/0_stateless/00965_shard_unresolvable_addresses.reference
+%%DATADIR%%-test/queries/0_stateless/00906_low_cardinality_rollup.sql
+%%DATADIR%%-test/queries/0_stateless/00999_nullable_nested_types_4877.reference
+%%DATADIR%%-test/queries/0_stateless/01030_storage_hdfs_syntax.sql
+%%DATADIR%%-test/queries/0_stateless/01312_comparison_with_constant_string_in_index_analysis.reference
+%%DATADIR%%-test/queries/0_stateless/01065_if_not_finite.sql
+%%DATADIR%%-test/queries/0_stateless/00816_join_column_names_sarg.sql
+%%DATADIR%%-test/queries/0_stateless/00381_first_significant_subdomain.reference
+%%DATADIR%%-test/queries/0_stateless/00825_protobuf_format_splitted_nested.sh
+%%DATADIR%%-test/queries/0_stateless/00903_array_with_constant_function.reference
+%%DATADIR%%-test/queries/0_stateless/00107_totals_after_having.reference
+%%DATADIR%%-test/queries/0_stateless/01906_bigint_accurate_cast_ubsan.sql
+%%DATADIR%%-test/queries/0_stateless/00495_reading_const_zero_column.reference
+%%DATADIR%%-test/queries/0_stateless/01663_test_toDate_mysql_compatibility.sql
+%%DATADIR%%-test/queries/0_stateless/00992_system_parts_race_condition_zookeeper_long.sh
+%%DATADIR%%-test/queries/0_stateless/00224_shard_distributed_aggregation_memory_efficient_and_overflows.reference
+%%DATADIR%%-test/queries/0_stateless/01033_storage_odbc_parsing_exception_check.sql
+%%DATADIR%%-test/queries/0_stateless/00448_replicate_nullable_tuple_generic.reference
+%%DATADIR%%-test/queries/0_stateless/01920_async_drain_connections.sql
+%%DATADIR%%-test/queries/0_stateless/00257_shard_no_aggregates_and_constant_keys.sql
+%%DATADIR%%-test/queries/0_stateless/02021_h3_get_faces.reference
+%%DATADIR%%-test/queries/0_stateless/01838_system_dictionaries_virtual_key_column.reference
+%%DATADIR%%-test/queries/0_stateless/02150_index_hypothesis_race_long.sh
+%%DATADIR%%-test/queries/0_stateless/01323_bad_arg_in_arithmetic_operations.reference
+%%DATADIR%%-test/queries/0_stateless/01455_default_compression.reference
+%%DATADIR%%-test/queries/0_stateless/00976_live_view_select_version.sql
+%%DATADIR%%-test/queries/0_stateless/01001_enums_in_in_section.reference
+%%DATADIR%%-test/queries/0_stateless/00975_indices_mutation_replicated_zookeeper_long.reference
+%%DATADIR%%-test/queries/0_stateless/01015_array_split.reference
+%%DATADIR%%-test/queries/0_stateless/02147_arrow_duplicate_columns.sh
+%%DATADIR%%-test/queries/0_stateless/00581_limit_on_result_and_subquery_and_insert.sql
+%%DATADIR%%-test/queries/0_stateless/00962_live_view_periodic_refresh_dictionary.reference
+%%DATADIR%%-test/queries/0_stateless/00327_summing_composite_nested.reference
+%%DATADIR%%-test/queries/0_stateless/01812_optimize_skip_unused_shards_single_node.sql
+%%DATADIR%%-test/queries/0_stateless/00962_enumNotExect.sql
+%%DATADIR%%-test/queries/0_stateless/00950_default_prewhere.reference
+%%DATADIR%%-test/queries/0_stateless/02028_create_select_settings.sql
+%%DATADIR%%-test/queries/0_stateless/01053_if_chain_check.reference
+%%DATADIR%%-test/queries/0_stateless/00537_quarters.sql
+%%DATADIR%%-test/queries/0_stateless/00430_https_server.reference
+%%DATADIR%%-test/queries/0_stateless/01214_test_storage_merge_aliases_with_where.reference
+%%DATADIR%%-test/queries/0_stateless/01137_sample_final.sql
+%%DATADIR%%-test/queries/0_stateless/01306_disable_duplicate_order_by_and_distinct_optimize_for_distributed_table.sql
+%%DATADIR%%-test/queries/0_stateless/01670_distributed_bytes_to_throw_insert.sql
+%%DATADIR%%-test/queries/0_stateless/00433_ifnull.sql
+%%DATADIR%%-test/queries/0_stateless/01866_split_by_regexp.reference
+%%DATADIR%%-test/queries/0_stateless/01889_check_row_policy_defined_using_user_function.reference
+%%DATADIR%%-test/queries/0_stateless/00690_insert_select_converting_exception_message.reference
+%%DATADIR%%-test/queries/0_stateless/02016_aggregation_spark_bar.sql
 %%DATADIR%%-test/queries/0_stateless/00052_all_left_join.reference
-%%DATADIR%%-test/queries/0_stateless/00052_all_left_join.sql
-%%DATADIR%%-test/queries/0_stateless/00053_all_inner_join.reference
-%%DATADIR%%-test/queries/0_stateless/00053_all_inner_join.sql
-%%DATADIR%%-test/queries/0_stateless/00054_join_string.reference
-%%DATADIR%%-test/queries/0_stateless/00054_join_string.sql
-%%DATADIR%%-test/queries/0_stateless/00055_join_two_numbers.reference
-%%DATADIR%%-test/queries/0_stateless/00055_join_two_numbers.sql
-%%DATADIR%%-test/queries/0_stateless/00056_join_number_string.reference
-%%DATADIR%%-test/queries/0_stateless/00056_join_number_string.sql
-%%DATADIR%%-test/queries/0_stateless/00057_join_aliases.reference
-%%DATADIR%%-test/queries/0_stateless/00057_join_aliases.sql
-%%DATADIR%%-test/queries/0_stateless/00059_shard_global_in.reference
-%%DATADIR%%-test/queries/0_stateless/00059_shard_global_in.sql
-%%DATADIR%%-test/queries/0_stateless/00060_date_lut.reference
-%%DATADIR%%-test/queries/0_stateless/00060_date_lut.sql
-%%DATADIR%%-test/queries/0_stateless/00061_merge_tree_alter.reference
-%%DATADIR%%-test/queries/0_stateless/00061_merge_tree_alter.sql
-%%DATADIR%%-test/queries/0_stateless/00062_replicated_merge_tree_alter_zookeeper.reference
-%%DATADIR%%-test/queries/0_stateless/00062_replicated_merge_tree_alter_zookeeper.sql
-%%DATADIR%%-test/queries/0_stateless/00063_check_query.reference
-%%DATADIR%%-test/queries/0_stateless/00063_check_query.sql
-%%DATADIR%%-test/queries/0_stateless/00064_negate_bug.reference
-%%DATADIR%%-test/queries/0_stateless/00064_negate_bug.sql
-%%DATADIR%%-test/queries/0_stateless/00065_shard_float_literals_formatting.reference
-%%DATADIR%%-test/queries/0_stateless/00065_shard_float_literals_formatting.sql
-%%DATADIR%%-test/queries/0_stateless/00066_group_by_in.reference
-%%DATADIR%%-test/queries/0_stateless/00066_group_by_in.sql
-%%DATADIR%%-test/queries/0_stateless/00067_replicate_segfault.reference
-%%DATADIR%%-test/queries/0_stateless/00067_replicate_segfault.sql
-%%DATADIR%%-test/queries/0_stateless/00068_empty_tiny_log.reference
-%%DATADIR%%-test/queries/0_stateless/00068_empty_tiny_log.sql
-%%DATADIR%%-test/queries/0_stateless/00069_date_arithmetic.reference
-%%DATADIR%%-test/queries/0_stateless/00069_date_arithmetic.sql
-%%DATADIR%%-test/queries/0_stateless/00070_insert_fewer_columns_http.reference
-%%DATADIR%%-test/queries/0_stateless/00070_insert_fewer_columns_http.sh
-%%DATADIR%%-test/queries/0_stateless/00071_insert_fewer_columns.reference
-%%DATADIR%%-test/queries/0_stateless/00071_insert_fewer_columns.sql
-%%DATADIR%%-test/queries/0_stateless/00072_in_types.reference
-%%DATADIR%%-test/queries/0_stateless/00072_in_types.sql
-%%DATADIR%%-test/queries/0_stateless/00073_merge_sorting_empty_array_joined.reference
-%%DATADIR%%-test/queries/0_stateless/00073_merge_sorting_empty_array_joined.sql
-%%DATADIR%%-test/queries/0_stateless/00075_shard_formatting_negate_of_negative_literal.reference
-%%DATADIR%%-test/queries/0_stateless/00075_shard_formatting_negate_of_negative_literal.sql
-%%DATADIR%%-test/queries/0_stateless/00076_ip_coding_functions.reference
-%%DATADIR%%-test/queries/0_stateless/00076_ip_coding_functions.sql
-%%DATADIR%%-test/queries/0_stateless/00077_set_keys_fit_128_bits_many_blocks.reference
-%%DATADIR%%-test/queries/0_stateless/00077_set_keys_fit_128_bits_many_blocks.sql
-%%DATADIR%%-test/queries/0_stateless/00078_string_concat.reference
-%%DATADIR%%-test/queries/0_stateless/00078_string_concat.sql
-%%DATADIR%%-test/queries/0_stateless/00079_defaulted_columns.reference
-%%DATADIR%%-test/queries/0_stateless/00079_defaulted_columns.sql
-%%DATADIR%%-test/queries/0_stateless/00080_show_tables_and_system_tables.reference
-%%DATADIR%%-test/queries/0_stateless/00080_show_tables_and_system_tables.sql
-%%DATADIR%%-test/queries/0_stateless/00081_int_div_or_zero.reference
-%%DATADIR%%-test/queries/0_stateless/00081_int_div_or_zero.sql
-%%DATADIR%%-test/queries/0_stateless/00082_append_trailing_char_if_absent.reference
-%%DATADIR%%-test/queries/0_stateless/00082_append_trailing_char_if_absent.sql
-%%DATADIR%%-test/queries/0_stateless/00083_create_merge_tree_zookeeper.reference
-%%DATADIR%%-test/queries/0_stateless/00083_create_merge_tree_zookeeper.sql
-%%DATADIR%%-test/queries/0_stateless/00084_summing_merge_tree.reference
-%%DATADIR%%-test/queries/0_stateless/00084_summing_merge_tree.sql
-%%DATADIR%%-test/queries/0_stateless/00085_visible_width_of_tuple_of_dates.reference
+%%DATADIR%%-test/queries/0_stateless/01281_group_by_limit_memory_tracking.sh
+%%DATADIR%%-test/queries/0_stateless/01254_array_of_unnamed_tuples.reference
+%%DATADIR%%-test/queries/0_stateless/00971_query_id_in_logs.reference
+%%DATADIR%%-test/queries/0_stateless/01202_array_auc_special.sql
+%%DATADIR%%-test/queries/0_stateless/00577_replacing_merge_tree_vertical_merge.reference
+%%DATADIR%%-test/queries/0_stateless/01782_field_oom.reference
+%%DATADIR%%-test/queries/0_stateless/01602_modified_julian_day_msan.reference
+%%DATADIR%%-test/queries/0_stateless/01277_alter_rename_column_constraint_zookeeper_long.sql
+%%DATADIR%%-test/queries/0_stateless/01337_mysql_global_variables.sql
+%%DATADIR%%-test/queries/0_stateless/02125_query_views_log.sql
+%%DATADIR%%-test/queries/0_stateless/00120_join_and_group_by.sql
+%%DATADIR%%-test/queries/0_stateless/00688_low_cardinality_prewhere.sql
+%%DATADIR%%-test/queries/0_stateless/02100_limit_push_down_bug.reference
+%%DATADIR%%-test/queries/0_stateless/01555_system_distribution_queue_mask.reference
+%%DATADIR%%-test/queries/0_stateless/01070_modify_ttl.sql
+%%DATADIR%%-test/queries/0_stateless/00626_in_syntax.reference
+%%DATADIR%%-test/queries/0_stateless/01197_summing_enum.reference
+%%DATADIR%%-test/queries/0_stateless/00532_topk_generic.reference
+%%DATADIR%%-test/queries/0_stateless/01529_union_distinct_and_setting_union_default_mode.sql
+%%DATADIR%%-test/queries/0_stateless/01386_negative_float_constant_key_condition.sql
+%%DATADIR%%-test/queries/0_stateless/00534_functions_bad_arguments8.sh
+%%DATADIR%%-test/queries/0_stateless/01593_functions_in_order_by.sql
+%%DATADIR%%-test/queries/0_stateless/01274_generate_random_nested.reference
+%%DATADIR%%-test/queries/0_stateless/01533_distinct_nullable_uuid.reference
+%%DATADIR%%-test/queries/0_stateless/02151_replace_regexp_all_empty_match_alternative.sql
+%%DATADIR%%-test/queries/0_stateless/01375_compact_parts_codecs.reference
+%%DATADIR%%-test/queries/0_stateless/00501_http_head.reference
+%%DATADIR%%-test/queries/0_stateless/01358_union_threads_bug.sql
+%%DATADIR%%-test/queries/0_stateless/01236_distributed_over_live_view_over_distributed.reference
+%%DATADIR%%-test/queries/0_stateless/00019_shard_quantiles_totals_distributed.reference
+%%DATADIR%%-test/queries/0_stateless/01240_join_get_or_null.reference
+%%DATADIR%%-test/queries/0_stateless/00712_prewhere_with_alias_bug.reference
+%%DATADIR%%-test/queries/0_stateless/01504_rocksdb.sql
+%%DATADIR%%-test/queries/0_stateless/01649_with_alias_key_condition.sql
 %%DATADIR%%-test/queries/0_stateless/00085_visible_width_of_tuple_of_dates.sql
-%%DATADIR%%-test/queries/0_stateless/00086_concat_nary_const_with_nonconst_segfault.reference
-%%DATADIR%%-test/queries/0_stateless/00086_concat_nary_const_with_nonconst_segfault.sql
-%%DATADIR%%-test/queries/0_stateless/00087_distinct_of_empty_arrays.reference
-%%DATADIR%%-test/queries/0_stateless/00087_distinct_of_empty_arrays.sql
-%%DATADIR%%-test/queries/0_stateless/00087_math_functions.reference
-%%DATADIR%%-test/queries/0_stateless/00087_math_functions.sql
-%%DATADIR%%-test/queries/0_stateless/00088_distinct_of_arrays_of_strings.reference
-%%DATADIR%%-test/queries/0_stateless/00088_distinct_of_arrays_of_strings.sql
-%%DATADIR%%-test/queries/0_stateless/00089_group_by_arrays_of_fixed.reference
-%%DATADIR%%-test/queries/0_stateless/00089_group_by_arrays_of_fixed.sql
-%%DATADIR%%-test/queries/0_stateless/00090_union_race_conditions_1.reference
-%%DATADIR%%-test/queries/0_stateless/00090_union_race_conditions_1.sh
-%%DATADIR%%-test/queries/0_stateless/00091_union_race_conditions_2.reference
-%%DATADIR%%-test/queries/0_stateless/00091_union_race_conditions_2.sh
-%%DATADIR%%-test/queries/0_stateless/00092_union_race_conditions_3.reference
-%%DATADIR%%-test/queries/0_stateless/00092_union_race_conditions_3.sh
-%%DATADIR%%-test/queries/0_stateless/00093_union_race_conditions_4.reference
-%%DATADIR%%-test/queries/0_stateless/00093_union_race_conditions_4.sh
-%%DATADIR%%-test/queries/0_stateless/00094_union_race_conditions_5.reference
-%%DATADIR%%-test/queries/0_stateless/00094_union_race_conditions_5.sh
-%%DATADIR%%-test/queries/0_stateless/00096_aggregation_min_if.reference
-%%DATADIR%%-test/queries/0_stateless/00096_aggregation_min_if.sql
-%%DATADIR%%-test/queries/0_stateless/00097_long_storage_buffer_race_condition.reference
-%%DATADIR%%-test/queries/0_stateless/00097_long_storage_buffer_race_condition.sh
-%%DATADIR%%-test/queries/0_stateless/00097_long_storage_buffer_race_condition_mt.reference
-%%DATADIR%%-test/queries/0_stateless/00097_long_storage_buffer_race_condition_mt.sh
+%%DATADIR%%-test/queries/0_stateless/01457_create_as_table_function_structure.sql
+%%DATADIR%%-test/queries/0_stateless/00722_inner_join.reference
+%%DATADIR%%-test/queries/0_stateless/01010_pmj_skip_blocks.reference
+%%DATADIR%%-test/queries/0_stateless/00819_full_join_wrong_columns_in_block.sql
+%%DATADIR%%-test/queries/0_stateless/01715_background_checker_blather_zookeeper_long.sql
+%%DATADIR%%-test/queries/0_stateless/01661_referer.sh
+%%DATADIR%%-test/queries/0_stateless/00936_crc_functions.reference
+%%DATADIR%%-test/queries/0_stateless/00685_output_format_json_escape_forward_slashes.sql
+%%DATADIR%%-test/queries/0_stateless/01720_dictionary_create_source_with_functions.sql
+%%DATADIR%%-test/queries/0_stateless/00112_shard_totals_after_having.sql
+%%DATADIR%%-test/queries/0_stateless/00520_http_nullable.sh
+%%DATADIR%%-test/queries/0_stateless/01406_carriage_return_in_tsv_csv.reference
+%%DATADIR%%-test/queries/0_stateless/01558_ttest.sql
+%%DATADIR%%-test/queries/0_stateless/01037_zookeeper_check_table_empty_pk.sql
+%%DATADIR%%-test/queries/0_stateless/01718_subtract_seconds_date.sql
+%%DATADIR%%-test/queries/0_stateless/01802_toDateTime64_large_values.reference
+%%DATADIR%%-test/queries/0_stateless/01746_extract_text_from_html.sql
+%%DATADIR%%-test/queries/0_stateless/02112_skip_index_set_and_or.sql
+%%DATADIR%%-test/queries/0_stateless/01470_test_insert_select_asterisk.sql
+%%DATADIR%%-test/queries/0_stateless/01318_encrypt.sql
+%%DATADIR%%-test/queries/0_stateless/00751_low_cardinality_nullable_group_by.reference
+%%DATADIR%%-test/queries/0_stateless/01279_dist_group_by.sql
+%%DATADIR%%-test/queries/0_stateless/00674_join_on_syntax.sql
+%%DATADIR%%-test/queries/0_stateless/00804_test_custom_compression_codes_log_storages.reference
+%%DATADIR%%-test/queries/0_stateless/00416_pocopatch_progress_in_http_headers.sh
+%%DATADIR%%-test/queries/0_stateless/00952_input_function.reference
+%%DATADIR%%-test/queries/0_stateless/01763_filter_push_down_bugs.reference
+%%DATADIR%%-test/queries/0_stateless/00988_constraints_replication_zookeeper_long.sql
+%%DATADIR%%-test/queries/0_stateless/01888_bloom_filter_hasAny.reference
+%%DATADIR%%-test/queries/0_stateless/01651_lc_insert_tiny_log.sql
+%%DATADIR%%-test/queries/0_stateless/00183_skip_unavailable_shards.reference
+%%DATADIR%%-test/queries/0_stateless/01676_dictget_in_default_expression.sql
+%%DATADIR%%-test/queries/0_stateless/00503_cast_const_nullable.reference
+%%DATADIR%%-test/queries/0_stateless/00486_if_fixed_string.reference
+%%DATADIR%%-test/queries/0_stateless/01532_clickhouse_local_tmp_folder.sh
+%%DATADIR%%-test/queries/0_stateless/01894_jit_aggregation_function_max_long.sql
+%%DATADIR%%-test/queries/0_stateless/00027_distinct_and_order_by.sql
+%%DATADIR%%-test/queries/0_stateless/00413_least_greatest_new_behavior.sql
+%%DATADIR%%-test/queries/0_stateless/02158_explain_ast_alter_commands.sh
+%%DATADIR%%-test/queries/0_stateless/01149_zookeeper_mutation_stuck_after_replace_partition.reference
+%%DATADIR%%-test/queries/0_stateless/01670_test_repeat_mysql_dialect.sql
+%%DATADIR%%-test/queries/0_stateless/00814_replicated_minimalistic_part_header_zookeeper.sql
+%%DATADIR%%-test/queries/0_stateless/01598_memory_limit_zeros.reference
+%%DATADIR%%-test/queries/0_stateless/01605_dictinct_two_level.sql
+%%DATADIR%%-test/queries/0_stateless/00204_extract_url_parameter.reference
 %%DATADIR%%-test/queries/0_stateless/00098_1_union_all.reference
-%%DATADIR%%-test/queries/0_stateless/00098_1_union_all.sql
-%%DATADIR%%-test/queries/0_stateless/00098_2_union_all.reference
-%%DATADIR%%-test/queries/0_stateless/00098_2_union_all.sql
-%%DATADIR%%-test/queries/0_stateless/00098_3_union_all.reference
-%%DATADIR%%-test/queries/0_stateless/00098_3_union_all.sql
-%%DATADIR%%-test/queries/0_stateless/00098_4_union_all.reference
-%%DATADIR%%-test/queries/0_stateless/00098_4_union_all.sql
-%%DATADIR%%-test/queries/0_stateless/00098_5_union_all.reference
-%%DATADIR%%-test/queries/0_stateless/00098_5_union_all.sql
-%%DATADIR%%-test/queries/0_stateless/00098_6_union_all.reference
-%%DATADIR%%-test/queries/0_stateless/00098_6_union_all.sql
-%%DATADIR%%-test/queries/0_stateless/00098_7_union_all.reference
-%%DATADIR%%-test/queries/0_stateless/00098_7_union_all.sql
-%%DATADIR%%-test/queries/0_stateless/00098_8_union_all.reference
-%%DATADIR%%-test/queries/0_stateless/00098_8_union_all.sql
-%%DATADIR%%-test/queries/0_stateless/00098_9_union_all.reference
-%%DATADIR%%-test/queries/0_stateless/00098_9_union_all.sql
-%%DATADIR%%-test/queries/0_stateless/00098_a_union_all.reference
-%%DATADIR%%-test/queries/0_stateless/00098_a_union_all.sql
-%%DATADIR%%-test/queries/0_stateless/00098_b_union_all.reference
-%%DATADIR%%-test/queries/0_stateless/00098_b_union_all.sql
-%%DATADIR%%-test/queries/0_stateless/00098_c_union_all.reference
-%%DATADIR%%-test/queries/0_stateless/00098_c_union_all.sql
-%%DATADIR%%-test/queries/0_stateless/00098_d_union_all.reference
-%%DATADIR%%-test/queries/0_stateless/00098_d_union_all.sql
-%%DATADIR%%-test/queries/0_stateless/00098_e_union_all.reference
-%%DATADIR%%-test/queries/0_stateless/00098_e_union_all.sql
-%%DATADIR%%-test/queries/0_stateless/00098_f_union_all.reference
-%%DATADIR%%-test/queries/0_stateless/00098_f_union_all.sql
-%%DATADIR%%-test/queries/0_stateless/00098_g_union_all.reference
-%%DATADIR%%-test/queries/0_stateless/00098_g_union_all.sql
-%%DATADIR%%-test/queries/0_stateless/00098_h_union_all.reference
-%%DATADIR%%-test/queries/0_stateless/00098_h_union_all.sql
-%%DATADIR%%-test/queries/0_stateless/00098_j_union_all.reference
-%%DATADIR%%-test/queries/0_stateless/00098_j_union_all.sql
-%%DATADIR%%-test/queries/0_stateless/00098_k_union_all.reference
-%%DATADIR%%-test/queries/0_stateless/00098_k_union_all.sql
-%%DATADIR%%-test/queries/0_stateless/00098_l_union_all.reference
-%%DATADIR%%-test/queries/0_stateless/00098_l_union_all.sql
+%%DATADIR%%-test/queries/0_stateless/00732_decimal_summing_merge_tree.sql
+%%DATADIR%%-test/queries/0_stateless/01914_index_bgranvea.sql
+%%DATADIR%%-test/queries/0_stateless/00550_join_insert_select.sh
+%%DATADIR%%-test/queries/0_stateless/00500_point_in_polygon_bug_2.reference
+%%DATADIR%%-test/queries/0_stateless/01175_distributed_ddl_output_mode_long.sh
+%%DATADIR%%-test/queries/0_stateless/00144_empty_regexp.sql
+%%DATADIR%%-test/queries/0_stateless/01358_lc_parquet.reference
+%%DATADIR%%-test/queries/0_stateless/01604_explain_ast_of_nonselect_query.reference
+%%DATADIR%%-test/queries/0_stateless/00834_not_between.reference
+%%DATADIR%%-test/queries/0_stateless/00962_enumNotExect.reference
+%%DATADIR%%-test/queries/0_stateless/01330_array_join_in_higher_order_function.reference
+%%DATADIR%%-test/queries/0_stateless/02132_empty_mutation_livelock.reference
+%%DATADIR%%-test/queries/0_stateless/00664_cast_from_string_to_nullable.sql
+%%DATADIR%%-test/queries/0_stateless/01047_window_view_parser_inner_table.reference
+%%DATADIR%%-test/queries/0_stateless/01533_collate_in_nullable.sql
+%%DATADIR%%-test/queries/0_stateless/00575_merge_and_index_with_function_in_in.reference
+%%DATADIR%%-test/queries/0_stateless/01593_functions_in_order_by.reference
+%%DATADIR%%-test/queries/0_stateless/01090_fixed_string_bit_ops.reference
+%%DATADIR%%-test/queries/0_stateless/02049_lowcardinality_shortcircuit_crash.sql
+%%DATADIR%%-test/queries/0_stateless/01190_full_attach_syntax.reference
+%%DATADIR%%-test/queries/0_stateless/00366_multi_statements.sh
+%%DATADIR%%-test/queries/0_stateless/01497_mutation_support_for_storage_memory.reference
+%%DATADIR%%-test/queries/0_stateless/01278_random_string_utf8.sql
+%%DATADIR%%-test/queries/0_stateless/00323_quantiles_timing_bug.reference
+%%DATADIR%%-test/queries/0_stateless/01548_with_totals_having.reference
+%%DATADIR%%-test/queries/0_stateless/00856_no_column_issue_4242.reference
+%%DATADIR%%-test/queries/0_stateless/01927_query_views_log_matview_exceptions.reference
+%%DATADIR%%-test/queries/0_stateless/00623_in_partition_key.reference
+%%DATADIR%%-test/queries/0_stateless/00805_round_down.reference
+%%DATADIR%%-test/queries/0_stateless/01900_kill_mutation_parallel_long.reference
+%%DATADIR%%-test/queries/0_stateless/02151_client_option_echo.sh
+%%DATADIR%%-test/queries/0_stateless/01866_view_persist_settings.reference
+%%DATADIR%%-test/queries/0_stateless/00712_nan_comparison.sql
+%%DATADIR%%-test/queries/0_stateless/00643_cast_zookeeper_long.reference
+%%DATADIR%%-test/queries/0_stateless/00954_resample_combinator.reference
+%%DATADIR%%-test/queries/0_stateless/01379_with_fill_several_columns.sql
+%%DATADIR%%-test/queries/0_stateless/01486_json_array_output.reference
+%%DATADIR%%-test/queries/0_stateless/01795_TinyLog_rwlock_ub.sql
+%%DATADIR%%-test/queries/0_stateless/01081_keywords_formatting.reference
+%%DATADIR%%-test/queries/0_stateless/00897_flatten.sql
+%%DATADIR%%-test/queries/0_stateless/02041_openssl_hash_functions_test.reference
+%%DATADIR%%-test/queries/0_stateless/00584_view_union_all.sql
+%%DATADIR%%-test/queries/0_stateless/02015_async_inserts_2.sh
+%%DATADIR%%-test/queries/0_stateless/00127_group_by_concat.reference
+%%DATADIR%%-test/queries/0_stateless/01361_fover_remote_num_tries.reference
+%%DATADIR%%-test/queries/0_stateless/02015_async_inserts_stress_long.reference
+%%DATADIR%%-test/queries/0_stateless/01116_cross_count_asterisks.reference
+%%DATADIR%%-test/queries/0_stateless/00085_visible_width_of_tuple_of_dates.reference
+%%DATADIR%%-test/queries/0_stateless/01404_roundUpToPowerOfTwoOrZero_safety.sql
+%%DATADIR%%-test/queries/0_stateless/01908_with_unknown_column.reference
+%%DATADIR%%-test/queries/0_stateless/01475_read_subcolumns_2.sql
+%%DATADIR%%-test/queries/0_stateless/01655_sleep_infinite_float.sql
+%%DATADIR%%-test/queries/0_stateless/02030_quantiles_underflow.reference
+%%DATADIR%%-test/queries/0_stateless/02126_url_auth.sh
+%%DATADIR%%-test/queries/0_stateless/00272_union_all_and_in_subquery.sql
+%%DATADIR%%-test/queries/0_stateless/01761_cast_to_enum_nullable.sql
+%%DATADIR%%-test/queries/0_stateless/00482_subqueries_and_aliases.reference
+%%DATADIR%%-test/queries/0_stateless/00829_bitmap64_function.reference
+%%DATADIR%%-test/queries/0_stateless/00025_implicitly_used_subquery_column.sql
+%%DATADIR%%-test/queries/0_stateless/01891_partition_hash_no_long_int.sql
+%%DATADIR%%-test/queries/0_stateless/00688_low_cardinality_nullable_cast.reference
 %%DATADIR%%-test/queries/0_stateless/00098_shard_i_union_all.reference
-%%DATADIR%%-test/queries/0_stateless/00098_shard_i_union_all.sql
-%%DATADIR%%-test/queries/0_stateless/00099_join_many_blocks_segfault.reference
-%%DATADIR%%-test/queries/0_stateless/00099_join_many_blocks_segfault.sql
-%%DATADIR%%-test/queries/0_stateless/00100_subquery_table_identifier.reference
-%%DATADIR%%-test/queries/0_stateless/00100_subquery_table_identifier.sh
-%%DATADIR%%-test/queries/0_stateless/00101_materialized_views_and_insert_without_explicit_database.reference
-%%DATADIR%%-test/queries/0_stateless/00101_materialized_views_and_insert_without_explicit_database.sql
-%%DATADIR%%-test/queries/0_stateless/00102_insert_into_temporary_table.reference
-%%DATADIR%%-test/queries/0_stateless/00102_insert_into_temporary_table.sql
-%%DATADIR%%-test/queries/0_stateless/00103_ipv4_num_to_string_class_c.reference
-%%DATADIR%%-test/queries/0_stateless/00103_ipv4_num_to_string_class_c.sql
-%%DATADIR%%-test/queries/0_stateless/00104_totals_having_mode.reference
-%%DATADIR%%-test/queries/0_stateless/00104_totals_having_mode.sql
-%%DATADIR%%-test/queries/0_stateless/00105_shard_collations.reference
-%%DATADIR%%-test/queries/0_stateless/00105_shard_collations.sql
-%%DATADIR%%-test/queries/0_stateless/00106_totals_after_having.reference
-%%DATADIR%%-test/queries/0_stateless/00106_totals_after_having.sql
-%%DATADIR%%-test/queries/0_stateless/00107_totals_after_having.reference
+%%DATADIR%%-test/queries/0_stateless/01732_race_condition_storage_join_long.sh
+%%DATADIR%%-test/queries/0_stateless/00864_union_all_supertype.reference
+%%DATADIR%%-test/queries/0_stateless/00633_materialized_view_and_too_many_parts_zookeeper.sh
+%%DATADIR%%-test/queries/0_stateless/01068_parens.sql
+%%DATADIR%%-test/queries/0_stateless/00700_decimal_casts_2.reference
+%%DATADIR%%-test/queries/0_stateless/01290_max_execution_speed_distributed.sql
+%%DATADIR%%-test/queries/0_stateless/00558_aggregate_merge_totals_with_arenas.reference
+%%DATADIR%%-test/queries/0_stateless/00651_default_database_on_client_reconnect.reference
+%%DATADIR%%-test/queries/0_stateless/00216_bit_test_function_family.sql
+%%DATADIR%%-test/queries/0_stateless/00750_merge_tree_merge_with_o_direct.sql
+%%DATADIR%%-test/queries/0_stateless/00936_substring_utf8_non_const.sql
+%%DATADIR%%-test/queries/0_stateless/02148_sql_user_defined_function_subquery.sql
+%%DATADIR%%-test/queries/0_stateless/00446_clear_column_in_partition_zookeeper_long.reference
+%%DATADIR%%-test/queries/0_stateless/01840_tupleElement_formatting_fuzzer.reference
+%%DATADIR%%-test/queries/0_stateless/01847_bad_like.sql
+%%DATADIR%%-test/queries/0_stateless/01034_values_parse_float_bug.reference
+%%DATADIR%%-test/queries/0_stateless/01375_storage_file_write_prefix_tsv_with_names.reference
+%%DATADIR%%-test/queries/0_stateless/02105_table_function_file_partiotion_by.reference
+%%DATADIR%%-test/queries/0_stateless/00236_replicated_drop_on_non_leader_zookeeper_long.reference
+%%DATADIR%%-test/queries/0_stateless/00439_fixed_string_filter.sql
+%%DATADIR%%-test/queries/0_stateless/02051_read_settings.reference.j2
+%%DATADIR%%-test/queries/0_stateless/00979_quantileExcatExclusive_and_Inclusive.sql
+%%DATADIR%%-test/queries/0_stateless/01700_system_zookeeper_path_in.reference
+%%DATADIR%%-test/queries/0_stateless/00979_quantileExcatExclusive_and_Inclusive.reference
+%%DATADIR%%-test/queries/0_stateless/01603_remove_column_ttl.sql
+%%DATADIR%%-test/queries/0_stateless/00450_higher_order_and_nullable.sql
+%%DATADIR%%-test/queries/0_stateless/01304_polygons_sym_difference.reference
+%%DATADIR%%-test/queries/0_stateless/01513_optimize_aggregation_in_order_memory_long.reference
+%%DATADIR%%-test/queries/0_stateless/01318_map_populate_series.sql
+%%DATADIR%%-test/queries/0_stateless/01301_polygons_within.sql
+%%DATADIR%%-test/queries/0_stateless/00492_drop_temporary_table.sql
+%%DATADIR%%-test/queries/0_stateless/02117_custom_separated_with_names_and_types.sh
+%%DATADIR%%-test/queries/0_stateless/01015_attach_part.sql
+%%DATADIR%%-test/queries/0_stateless/00379_system_processes_port.reference
+%%DATADIR%%-test/queries/0_stateless/02122_4letter_words_stress_zookeeper.reference
+%%DATADIR%%-test/queries/0_stateless/00195_shard_union_all_and_global_in.sql
+%%DATADIR%%-test/queries/0_stateless/02097_remove_sample_by.reference
+%%DATADIR%%-test/queries/0_stateless/01301_polygons_within.reference
+%%DATADIR%%-test/queries/0_stateless/00500_point_in_polygon_nan.sql
+%%DATADIR%%-test/queries/0_stateless/01548_create_table_compound_column_format.reference
+%%DATADIR%%-test/queries/0_stateless/01759_optimize_skip_unused_shards_zero_shards.reference
+%%DATADIR%%-test/queries/0_stateless/01449_json_compact_strings.reference
+%%DATADIR%%-test/queries/0_stateless/01412_optimize_deduplicate_bug.sql
+%%DATADIR%%-test/queries/0_stateless/01781_merge_tree_deduplication.reference
+%%DATADIR%%-test/queries/0_stateless/00480_mac_addresses.reference
+%%DATADIR%%-test/queries/0_stateless/01200_mutations_memory_consumption.sql
+%%DATADIR%%-test/queries/0_stateless/00309_formats.reference
+%%DATADIR%%-test/queries/0_stateless/01034_prewhere_max_parallel_replicas_distributed.sql
+%%DATADIR%%-test/queries/0_stateless/01774_bar_with_illegal_value.reference
+%%DATADIR%%-test/queries/0_stateless/00098_g_union_all.sql
+%%DATADIR%%-test/queries/0_stateless/00448_replicate_nullable_tuple_generic.sql
+%%DATADIR%%-test/queries/0_stateless/01452_normalized_query_hash.reference
+%%DATADIR%%-test/queries/0_stateless/01451_wrong_error_long_query.reference
+%%DATADIR%%-test/queries/0_stateless/01554_bloom_filter_index_big_integer_uuid.reference
+%%DATADIR%%-test/queries/0_stateless/01021_create_as_select.reference
+%%DATADIR%%-test/queries/0_stateless/01796_Log_rwlock_ub.reference
+%%DATADIR%%-test/queries/0_stateless/00250_tuple_comparison.reference
+%%DATADIR%%-test/queries/0_stateless/01872_initial_query_start_time.reference
+%%DATADIR%%-test/queries/0_stateless/00318_pk_tuple_order.reference
+%%DATADIR%%-test/queries/0_stateless/02039_group_by_with_totals_having.sql
+%%DATADIR%%-test/queries/0_stateless/01359_geodistance_loop.reference
+%%DATADIR%%-test/queries/0_stateless/01658_test_base64Encode_mysql_compatibility.sql
+%%DATADIR%%-test/queries/0_stateless/02153_native_bounds_check.sh
+%%DATADIR%%-test/queries/0_stateless/01307_orc_output_format.reference
+%%DATADIR%%-test/queries/0_stateless/01623_constraints_column_swap.reference
+%%DATADIR%%-test/queries/0_stateless/02021_create_database_with_comment.sh
+%%DATADIR%%-test/queries/0_stateless/01017_tuplehamming_distance.sql
+%%DATADIR%%-test/queries/0_stateless/01035_concurrent_move_partition_from_table_zookeeper.reference
+%%DATADIR%%-test/queries/0_stateless/01161_information_schema.sql
+%%DATADIR%%-test/queries/0_stateless/02111_global_context_temporary_tables.sql
+%%DATADIR%%-test/queries/0_stateless/00419_show_sql_queries.sh
+%%DATADIR%%-test/queries/0_stateless/02111_function_mapExtractKeyLike.reference
+%%DATADIR%%-test/queries/0_stateless/00944_minmax_null.sql
+%%DATADIR%%-test/queries/0_stateless/01126_month_partitioning_consistent_code.reference
+%%DATADIR%%-test/queries/0_stateless/01296_pipeline_stuck.sql
+%%DATADIR%%-test/queries/0_stateless/01284_escape_sequences_php_mysql_style.reference
+%%DATADIR%%-test/queries/0_stateless/01590_countSubstrings.sql
+%%DATADIR%%-test/queries/0_stateless/00942_dataparts_500.sh
+%%DATADIR%%-test/queries/0_stateless/00686_client_exit_code.sh
 %%DATADIR%%-test/queries/0_stateless/00107_totals_after_having.sql
-%%DATADIR%%-test/queries/0_stateless/00108_shard_totals_after_having.reference
-%%DATADIR%%-test/queries/0_stateless/00108_shard_totals_after_having.sql
-%%DATADIR%%-test/queries/0_stateless/00109_shard_totals_after_having.reference
+%%DATADIR%%-test/queries/0_stateless/01786_group_by_pk_many_streams.sql
+%%DATADIR%%-test/queries/0_stateless/00946_ml_test.reference
+%%DATADIR%%-test/queries/0_stateless/02020_exponential_smoothing.reference
+%%DATADIR%%-test/queries/0_stateless/01388_clear_all_columns.sql
+%%DATADIR%%-test/queries/0_stateless/00833_sleep_overflow.sql
+%%DATADIR%%-test/queries/0_stateless/00542_materialized_view_and_time_zone_tag.sql
+%%DATADIR%%-test/queries/0_stateless/00461_default_value_of_argument_type.sql
+%%DATADIR%%-test/queries/0_stateless/01926_order_by_desc_limit.sql
+%%DATADIR%%-test/queries/0_stateless/01292_optimize_data_skip_idx_order_by_expr.reference
+%%DATADIR%%-test/queries/0_stateless/00933_alter_ttl.reference
+%%DATADIR%%-test/queries/0_stateless/02011_tuple_vector_functions.reference
+%%DATADIR%%-test/queries/0_stateless/00977_live_view_watch_events.sql
+%%DATADIR%%-test/queries/0_stateless/00620_optimize_on_nonleader_replica_zookeeper.sql
+%%DATADIR%%-test/queries/0_stateless/01014_lazy_database_concurrent_recreate_reattach_and_show_tables.sh
+%%DATADIR%%-test/queries/0_stateless/01514_parallel_formatting.sql
+%%DATADIR%%-test/queries/0_stateless/02006_test_positional_arguments.reference
+%%DATADIR%%-test/queries/0_stateless/01493_alter_remove_properties.sql
+%%DATADIR%%-test/queries/0_stateless/00552_logical_functions_ternary.reference
+%%DATADIR%%-test/queries/0_stateless/02101_sql_user_defined_functions_drop_if_exists.reference
+%%DATADIR%%-test/queries/0_stateless/00465_nullable_default.reference
+%%DATADIR%%-test/queries/0_stateless/01907_multiple_aliases.reference
+%%DATADIR%%-test/queries/0_stateless/01852_s2_get_neighbours.sql
+%%DATADIR%%-test/queries/0_stateless/01748_dictionary_table_dot.sql
+%%DATADIR%%-test/queries/0_stateless/00821_distributed_storage_with_join_on.sql
+%%DATADIR%%-test/queries/0_stateless/01785_dictionary_element_count.reference
+%%DATADIR%%-test/queries/0_stateless/01361_fover_remote_num_tries.sh
+%%DATADIR%%-test/queries/0_stateless/01145_with_fill_const.sql
+%%DATADIR%%-test/queries/0_stateless/00841_temporary_table_database.sql
+%%DATADIR%%-test/queries/0_stateless/00688_low_cardinality_serialization.reference
+%%DATADIR%%-test/queries/0_stateless/00800_versatile_storage_join.sql
+%%DATADIR%%-test/queries/0_stateless/00956_join_use_nulls_with_array_column.reference
+%%DATADIR%%-test/queries/0_stateless/01463_test_alter_live_view_refresh.sql
+%%DATADIR%%-test/queries/0_stateless/01913_if_int_decimal.sql
+%%DATADIR%%-test/queries/0_stateless/00647_multiply_aggregation_state.reference
+%%DATADIR%%-test/queries/0_stateless/00507_sumwithoverflow.sql
+%%DATADIR%%-test/queries/0_stateless/01058_window_view_event_hop_to_strict_asc.reference
+%%DATADIR%%-test/queries/0_stateless/01771_datetime64_no_time_part.sql
+%%DATADIR%%-test/queries/0_stateless/00201_array_uniq.reference
+%%DATADIR%%-test/queries/0_stateless/02041_test_fuzzy_alter.sql
+%%DATADIR%%-test/queries/0_stateless/01051_same_name_alias_with_joins.reference
+%%DATADIR%%-test/queries/0_stateless/01559_aggregate_null_for_empty_fix.reference
+%%DATADIR%%-test/queries/0_stateless/00326_long_function_multi_if.reference
 %%DATADIR%%-test/queries/0_stateless/00109_shard_totals_after_having.sql
-%%DATADIR%%-test/queries/0_stateless/00110_external_sort.reference
-%%DATADIR%%-test/queries/0_stateless/00110_external_sort.sql
-%%DATADIR%%-test/queries/0_stateless/00111_shard_external_sort_distributed.reference
-%%DATADIR%%-test/queries/0_stateless/00111_shard_external_sort_distributed.sql
-%%DATADIR%%-test/queries/0_stateless/00112_shard_totals_after_having.reference
-%%DATADIR%%-test/queries/0_stateless/00112_shard_totals_after_having.sql
-%%DATADIR%%-test/queries/0_stateless/00113_shard_group_array.reference
-%%DATADIR%%-test/queries/0_stateless/00113_shard_group_array.sql
-%%DATADIR%%-test/queries/0_stateless/00114_float_type_result_of_division.reference
-%%DATADIR%%-test/queries/0_stateless/00114_float_type_result_of_division.sql
-%%DATADIR%%-test/queries/0_stateless/00115_shard_in_incomplete_result.reference
-%%DATADIR%%-test/queries/0_stateless/00115_shard_in_incomplete_result.sh
-%%DATADIR%%-test/queries/0_stateless/00116_storage_set.reference
-%%DATADIR%%-test/queries/0_stateless/00116_storage_set.sql
-%%DATADIR%%-test/queries/0_stateless/00117_parsing_arrays.reference
-%%DATADIR%%-test/queries/0_stateless/00117_parsing_arrays.sql
-%%DATADIR%%-test/queries/0_stateless/00118_storage_join.reference
-%%DATADIR%%-test/queries/0_stateless/00118_storage_join.sql
-%%DATADIR%%-test/queries/0_stateless/00119_storage_join.reference
-%%DATADIR%%-test/queries/0_stateless/00119_storage_join.sql
-%%DATADIR%%-test/queries/0_stateless/00120_join_and_group_by.reference
-%%DATADIR%%-test/queries/0_stateless/00120_join_and_group_by.sql
-%%DATADIR%%-test/queries/0_stateless/00121_drop_column_zookeeper.reference
-%%DATADIR%%-test/queries/0_stateless/00121_drop_column_zookeeper.sql
-%%DATADIR%%-test/queries/0_stateless/00122_join_with_subquery_with_subquery.reference
-%%DATADIR%%-test/queries/0_stateless/00122_join_with_subquery_with_subquery.sql
-%%DATADIR%%-test/queries/0_stateless/00123_shard_unmerged_result_when_max_distributed_connections_is_one.reference
-%%DATADIR%%-test/queries/0_stateless/00123_shard_unmerged_result_when_max_distributed_connections_is_one.sql
-%%DATADIR%%-test/queries/0_stateless/00124_shard_distributed_with_many_replicas.reference
-%%DATADIR%%-test/queries/0_stateless/00124_shard_distributed_with_many_replicas.sql
+%%DATADIR%%-test/queries/0_stateless/00609_prewhere_and_default.reference
+%%DATADIR%%-test/queries/0_stateless/01544_fromModifiedJulianDay.sql
+%%DATADIR%%-test/queries/0_stateless/00973_live_view_with_subquery_select_with_aggregation_in_subquery.sql
+%%DATADIR%%-test/queries/0_stateless/00921_datetime64_compatibility_long.sh
+%%DATADIR%%-test/queries/0_stateless/00497_whitespaces_in_insert.sh
+%%DATADIR%%-test/queries/0_stateless/01582_distinct_subquery_groupby.sql
+%%DATADIR%%-test/queries/0_stateless/00614_array_nullable.sql
+%%DATADIR%%-test/queries/0_stateless/01076_predicate_optimizer_with_view.sql
+%%DATADIR%%-test/queries/0_stateless/01943_log_column_sizes.sql
+%%DATADIR%%-test/queries/0_stateless/00615_nullable_alter_optimize.sql
+%%DATADIR%%-test/queries/0_stateless/01087_table_function_generate.sql
+%%DATADIR%%-test/queries/0_stateless/01809_inactive_parts_to_delay_throw_insert.reference
+%%DATADIR%%-test/queries/0_stateless/00312_position_case_insensitive_utf8.reference
+%%DATADIR%%-test/queries/0_stateless/00414_time_zones_direct_conversion.sql
+%%DATADIR%%-test/queries/0_stateless/00097_long_storage_buffer_race_condition_mt.reference
+%%DATADIR%%-test/queries/0_stateless/01411_xor_itai_shirav.reference
 %%DATADIR%%-test/queries/0_stateless/00125_array_element_of_array_of_tuple.reference
-%%DATADIR%%-test/queries/0_stateless/00125_array_element_of_array_of_tuple.sql
-%%DATADIR%%-test/queries/0_stateless/00126_buffer.reference
-%%DATADIR%%-test/queries/0_stateless/00126_buffer.sql
-%%DATADIR%%-test/queries/0_stateless/00127_group_by_concat.reference
-%%DATADIR%%-test/queries/0_stateless/00127_group_by_concat.sql
-%%DATADIR%%-test/queries/0_stateless/00128_group_by_number_and_fixed_string.reference
-%%DATADIR%%-test/queries/0_stateless/00128_group_by_number_and_fixed_string.sql
-%%DATADIR%%-test/queries/0_stateless/00129_quantile_timing_weighted.reference
-%%DATADIR%%-test/queries/0_stateless/00129_quantile_timing_weighted.sql
-%%DATADIR%%-test/queries/0_stateless/00131_set_hashed.reference
-%%DATADIR%%-test/queries/0_stateless/00131_set_hashed.sql
-%%DATADIR%%-test/queries/0_stateless/00132_sets.reference
-%%DATADIR%%-test/queries/0_stateless/00132_sets.sql
-%%DATADIR%%-test/queries/0_stateless/00133_long_shard_memory_tracker_and_exception_safety.reference
-%%DATADIR%%-test/queries/0_stateless/00133_long_shard_memory_tracker_and_exception_safety.sh
-%%DATADIR%%-test/queries/0_stateless/00134_aggregation_by_fixed_string_of_size_1_2_4_8.reference
-%%DATADIR%%-test/queries/0_stateless/00134_aggregation_by_fixed_string_of_size_1_2_4_8.sql
-%%DATADIR%%-test/queries/0_stateless/00135_duplicate_group_by_keys_segfault.reference
-%%DATADIR%%-test/queries/0_stateless/00135_duplicate_group_by_keys_segfault.sql
-%%DATADIR%%-test/queries/0_stateless/00136_duplicate_order_by_elems.reference
-%%DATADIR%%-test/queries/0_stateless/00136_duplicate_order_by_elems.sql
-%%DATADIR%%-test/queries/0_stateless/00137_in_constants.reference
-%%DATADIR%%-test/queries/0_stateless/00137_in_constants.sql
-%%DATADIR%%-test/queries/0_stateless/00138_table_aliases.reference
-%%DATADIR%%-test/queries/0_stateless/00138_table_aliases.sql
-%%DATADIR%%-test/queries/0_stateless/00140_parse_unix_timestamp_as_datetime.reference
-%%DATADIR%%-test/queries/0_stateless/00140_parse_unix_timestamp_as_datetime.sql
-%%DATADIR%%-test/queries/0_stateless/00140_prewhere_column_order.reference
-%%DATADIR%%-test/queries/0_stateless/00140_prewhere_column_order.sql
-%%DATADIR%%-test/queries/0_stateless/00141_parse_timestamp_as_datetime.reference
-%%DATADIR%%-test/queries/0_stateless/00141_parse_timestamp_as_datetime.sql
-%%DATADIR%%-test/queries/0_stateless/00142_parse_timestamp_as_datetime.reference
-%%DATADIR%%-test/queries/0_stateless/00142_parse_timestamp_as_datetime.sql
-%%DATADIR%%-test/queries/0_stateless/00143_number_classification_functions.reference
-%%DATADIR%%-test/queries/0_stateless/00143_number_classification_functions.sql
-%%DATADIR%%-test/queries/0_stateless/00144_empty_regexp.reference
-%%DATADIR%%-test/queries/0_stateless/00144_empty_regexp.sql
-%%DATADIR%%-test/queries/0_stateless/00145_empty_likes.reference
-%%DATADIR%%-test/queries/0_stateless/00145_empty_likes.sql
-%%DATADIR%%-test/queries/0_stateless/00146_summing_merge_tree_nested_map.reference
-%%DATADIR%%-test/queries/0_stateless/00146_summing_merge_tree_nested_map.sql
-%%DATADIR%%-test/queries/0_stateless/00147_alter_nested_default.reference
-%%DATADIR%%-test/queries/0_stateless/00147_alter_nested_default.sql
-%%DATADIR%%-test/queries/0_stateless/00148_summing_merge_tree_aggregate_function.reference
-%%DATADIR%%-test/queries/0_stateless/00148_summing_merge_tree_aggregate_function.sql
-%%DATADIR%%-test/queries/0_stateless/00148_summing_merge_tree_nested_map_multiple_values.reference
-%%DATADIR%%-test/queries/0_stateless/00148_summing_merge_tree_nested_map_multiple_values.sql
-%%DATADIR%%-test/queries/0_stateless/00149_function_url_hash.reference
-%%DATADIR%%-test/queries/0_stateless/00149_function_url_hash.sql
-%%DATADIR%%-test/queries/0_stateless/00150_with_totals_and_join.reference
-%%DATADIR%%-test/queries/0_stateless/00150_with_totals_and_join.sql
-%%DATADIR%%-test/queries/0_stateless/00151_tuple_with_array.reference
-%%DATADIR%%-test/queries/0_stateless/00151_tuple_with_array.sql
-%%DATADIR%%-test/queries/0_stateless/00152_totals_in_subquery.reference
-%%DATADIR%%-test/queries/0_stateless/00152_totals_in_subquery.sql
-%%DATADIR%%-test/queries/0_stateless/00153_transform.reference
-%%DATADIR%%-test/queries/0_stateless/00153_transform.sql
-%%DATADIR%%-test/queries/0_stateless/00154_shard_distributed_with_distinct.reference
-%%DATADIR%%-test/queries/0_stateless/00154_shard_distributed_with_distinct.sql
-%%DATADIR%%-test/queries/0_stateless/00155_long_merges.reference
-%%DATADIR%%-test/queries/0_stateless/00155_long_merges.sh
-%%DATADIR%%-test/queries/0_stateless/00156_array_map_to_constant.reference
-%%DATADIR%%-test/queries/0_stateless/00156_array_map_to_constant.sql
-%%DATADIR%%-test/queries/0_stateless/00157_aliases_and_lambda_formal_parameters.reference
-%%DATADIR%%-test/queries/0_stateless/00157_aliases_and_lambda_formal_parameters.sql
-%%DATADIR%%-test/queries/0_stateless/00158_buffer_and_nonexistent_table.reference
-%%DATADIR%%-test/queries/0_stateless/00158_buffer_and_nonexistent_table.sql
-%%DATADIR%%-test/queries/0_stateless/00159_whitespace_in_columns_list.reference
-%%DATADIR%%-test/queries/0_stateless/00159_whitespace_in_columns_list.sql
-%%DATADIR%%-test/queries/0_stateless/00160_merge_and_index_in_in.reference
-%%DATADIR%%-test/queries/0_stateless/00160_merge_and_index_in_in.sql
-%%DATADIR%%-test/queries/0_stateless/00161_rounding_functions.reference
-%%DATADIR%%-test/queries/0_stateless/00161_rounding_functions.sql
-%%DATADIR%%-test/queries/0_stateless/00162_shard_global_join.reference
-%%DATADIR%%-test/queries/0_stateless/00162_shard_global_join.sql
-%%DATADIR%%-test/queries/0_stateless/00163_shard_join_with_empty_table.reference
-%%DATADIR%%-test/queries/0_stateless/00163_shard_join_with_empty_table.sql
-%%DATADIR%%-test/queries/0_stateless/00164_not_chain.reference
-%%DATADIR%%-test/queries/0_stateless/00164_not_chain.sql
-%%DATADIR%%-test/queries/0_stateless/00165_transform_non_const_default.reference
-%%DATADIR%%-test/queries/0_stateless/00165_transform_non_const_default.sql
-%%DATADIR%%-test/queries/0_stateless/00166_functions_of_aggregation_states.reference
-%%DATADIR%%-test/queries/0_stateless/00166_functions_of_aggregation_states.sql
-%%DATADIR%%-test/queries/0_stateless/00167_settings_inside_query.reference
-%%DATADIR%%-test/queries/0_stateless/00167_settings_inside_query.sql
-%%DATADIR%%-test/queries/0_stateless/00168_buffer_defaults.reference
-%%DATADIR%%-test/queries/0_stateless/00168_buffer_defaults.sql
-%%DATADIR%%-test/queries/0_stateless/00169_join_constant_keys.reference
-%%DATADIR%%-test/queries/0_stateless/00169_join_constant_keys.sql
-%%DATADIR%%-test/queries/0_stateless/00170_lower_upper_utf8.reference
-%%DATADIR%%-test/queries/0_stateless/00170_lower_upper_utf8.sql
-%%DATADIR%%-test/queries/0_stateless/00171_shard_array_of_tuple_remote.reference
-%%DATADIR%%-test/queries/0_stateless/00171_shard_array_of_tuple_remote.sql
-%%DATADIR%%-test/queries/0_stateless/00172_constexprs_in_set.reference
-%%DATADIR%%-test/queries/0_stateless/00172_constexprs_in_set.sql
-%%DATADIR%%-test/queries/0_stateless/00173_compare_date_time_with_constant_string.reference
-%%DATADIR%%-test/queries/0_stateless/00173_compare_date_time_with_constant_string.sql
-%%DATADIR%%-test/queries/0_stateless/00174_compare_date_time_with_constant_string_in_in.reference
-%%DATADIR%%-test/queries/0_stateless/00174_compare_date_time_with_constant_string_in_in.sql
-%%DATADIR%%-test/queries/0_stateless/00175_if_num_arrays.reference
-%%DATADIR%%-test/queries/0_stateless/00175_if_num_arrays.sql
-%%DATADIR%%-test/queries/0_stateless/00176_if_string_arrays.reference
-%%DATADIR%%-test/queries/0_stateless/00176_if_string_arrays.sql
-%%DATADIR%%-test/queries/0_stateless/00177_inserts_through_http_parts.reference
-%%DATADIR%%-test/queries/0_stateless/00177_inserts_through_http_parts.sh
-%%DATADIR%%-test/queries/0_stateless/00178_function_replicate.reference
-%%DATADIR%%-test/queries/0_stateless/00178_function_replicate.sql
-%%DATADIR%%-test/queries/0_stateless/00179_lambdas_with_common_expressions_and_filter.reference
-%%DATADIR%%-test/queries/0_stateless/00179_lambdas_with_common_expressions_and_filter.sql
-%%DATADIR%%-test/queries/0_stateless/00180_attach_materialized_view.reference
-%%DATADIR%%-test/queries/0_stateless/00180_attach_materialized_view.sql
-%%DATADIR%%-test/queries/0_stateless/00181_aggregate_functions_statistics.reference
-%%DATADIR%%-test/queries/0_stateless/00181_aggregate_functions_statistics.sql
-%%DATADIR%%-test/queries/0_stateless/00181_aggregate_functions_statistics_stable.reference
-%%DATADIR%%-test/queries/0_stateless/00181_aggregate_functions_statistics_stable.sql
-%%DATADIR%%-test/queries/0_stateless/00182_functions_higher_order_and_consts.reference
-%%DATADIR%%-test/queries/0_stateless/00182_functions_higher_order_and_consts.sql
-%%DATADIR%%-test/queries/0_stateless/00183_skip_unavailable_shards.reference
-%%DATADIR%%-test/queries/0_stateless/00183_skip_unavailable_shards.sql
-%%DATADIR%%-test/queries/0_stateless/00184_shard_distributed_group_by_no_merge.reference
-%%DATADIR%%-test/queries/0_stateless/00184_shard_distributed_group_by_no_merge.sql
-%%DATADIR%%-test/queries/0_stateless/00185_array_literals.reference
-%%DATADIR%%-test/queries/0_stateless/00185_array_literals.sql
-%%DATADIR%%-test/queries/0_stateless/00186_very_long_arrays.reference
-%%DATADIR%%-test/queries/0_stateless/00186_very_long_arrays.sh
-%%DATADIR%%-test/queries/0_stateless/00187_like_regexp_prefix.reference
-%%DATADIR%%-test/queries/0_stateless/00187_like_regexp_prefix.sql
-%%DATADIR%%-test/queries/0_stateless/00188_constants_as_arguments_of_aggregate_functions.reference
-%%DATADIR%%-test/queries/0_stateless/00188_constants_as_arguments_of_aggregate_functions.sql
-%%DATADIR%%-test/queries/0_stateless/00189_time_zones_long.reference
-%%DATADIR%%-test/queries/0_stateless/00189_time_zones_long.sql
-%%DATADIR%%-test/queries/0_stateless/00190_non_constant_array_of_constant_data.reference
-%%DATADIR%%-test/queries/0_stateless/00190_non_constant_array_of_constant_data.sql
-%%DATADIR%%-test/queries/0_stateless/00191_aggregating_merge_tree_and_final.reference
-%%DATADIR%%-test/queries/0_stateless/00191_aggregating_merge_tree_and_final.sql
-%%DATADIR%%-test/queries/0_stateless/00192_least_greatest.reference
-%%DATADIR%%-test/queries/0_stateless/00192_least_greatest.sql
-%%DATADIR%%-test/queries/0_stateless/00193_parallel_replicas.reference
-%%DATADIR%%-test/queries/0_stateless/00193_parallel_replicas.sql
-%%DATADIR%%-test/queries/0_stateless/00194_identity.reference
-%%DATADIR%%-test/queries/0_stateless/00194_identity.sql
-%%DATADIR%%-test/queries/0_stateless/00195_shard_union_all_and_global_in.reference
-%%DATADIR%%-test/queries/0_stateless/00195_shard_union_all_and_global_in.sql
-%%DATADIR%%-test/queries/0_stateless/00196_float32_formatting.reference
-%%DATADIR%%-test/queries/0_stateless/00196_float32_formatting.sql
-%%DATADIR%%-test/queries/0_stateless/00197_if_fixed_string.reference
-%%DATADIR%%-test/queries/0_stateless/00197_if_fixed_string.sql
-%%DATADIR%%-test/queries/0_stateless/00198_group_by_empty_arrays.reference
+%%DATADIR%%-test/queries/0_stateless/00546_shard_tuple_element_formatting.reference
+%%DATADIR%%-test/queries/0_stateless/01031_pmj_new_any_semi_join.sql
+%%DATADIR%%-test/queries/0_stateless/00099_join_many_blocks_segfault.reference
+%%DATADIR%%-test/queries/0_stateless/01178_int_field_to_decimal.sql
+%%DATADIR%%-test/queries/0_stateless/00999_settings_no_extra_quotes.reference
+%%DATADIR%%-test/queries/0_stateless/01278_min_insert_block_size_rows_for_materialized_views.sh
+%%DATADIR%%-test/queries/0_stateless/01511_alter_version_versioned_collapsing_merge_tree.sql
+%%DATADIR%%-test/queries/0_stateless/00437_nulls_first_last.sql
+%%DATADIR%%-test/queries/0_stateless/01666_great_circle_distance_ubsan.reference
+%%DATADIR%%-test/queries/0_stateless/00098_6_union_all.reference
 %%DATADIR%%-test/queries/0_stateless/00198_group_by_empty_arrays.sql
-%%DATADIR%%-test/queries/0_stateless/00199_ternary_operator_type_check.reference
-%%DATADIR%%-test/queries/0_stateless/00199_ternary_operator_type_check.sql
-%%DATADIR%%-test/queries/0_stateless/00200_shard_distinct_order_by_limit_distributed.reference
-%%DATADIR%%-test/queries/0_stateless/00200_shard_distinct_order_by_limit_distributed.sql
-%%DATADIR%%-test/queries/0_stateless/00201_array_uniq.reference
-%%DATADIR%%-test/queries/0_stateless/00201_array_uniq.sql
-%%DATADIR%%-test/queries/0_stateless/00202_cross_join.reference
-%%DATADIR%%-test/queries/0_stateless/00202_cross_join.sql
-%%DATADIR%%-test/queries/0_stateless/00203_full_join.reference
-%%DATADIR%%-test/queries/0_stateless/00203_full_join.sql
-%%DATADIR%%-test/queries/0_stateless/00204_extract_url_parameter.reference
-%%DATADIR%%-test/queries/0_stateless/00204_extract_url_parameter.sql
-%%DATADIR%%-test/queries/0_stateless/00205_scalar_subqueries.reference
-%%DATADIR%%-test/queries/0_stateless/00205_scalar_subqueries.sql
-%%DATADIR%%-test/queries/0_stateless/00206_empty_array_to_single.reference
-%%DATADIR%%-test/queries/0_stateless/00206_empty_array_to_single.sql
-%%DATADIR%%-test/queries/0_stateless/00207_left_array_join.reference
-%%DATADIR%%-test/queries/0_stateless/00207_left_array_join.sql
-%%DATADIR%%-test/queries/0_stateless/00208_agg_state_merge.reference
-%%DATADIR%%-test/queries/0_stateless/00208_agg_state_merge.sql
-%%DATADIR%%-test/queries/0_stateless/00209_insert_select_extremes.reference
-%%DATADIR%%-test/queries/0_stateless/00209_insert_select_extremes.sql
-%%DATADIR%%-test/queries/0_stateless/00210_insert_select_extremes_http.reference
-%%DATADIR%%-test/queries/0_stateless/00210_insert_select_extremes_http.sh
-%%DATADIR%%-test/queries/0_stateless/00211_shard_query_formatting_aliases.reference
-%%DATADIR%%-test/queries/0_stateless/00211_shard_query_formatting_aliases.sql
-%%DATADIR%%-test/queries/0_stateless/00212_long_shard_aggregate_function_uniq.reference
-%%DATADIR%%-test/queries/0_stateless/00212_long_shard_aggregate_function_uniq.sql
-%%DATADIR%%-test/queries/0_stateless/00213_multiple_global_in.reference
-%%DATADIR%%-test/queries/0_stateless/00213_multiple_global_in.sql
+%%DATADIR%%-test/queries/0_stateless/01430_moving_sum_empty_state.sql
+%%DATADIR%%-test/queries/0_stateless/01010_pm_join_all_join_bug.reference
+%%DATADIR%%-test/queries/0_stateless/00980_zookeeper_merge_tree_alter_settings.reference
+%%DATADIR%%-test/queries/0_stateless/01636_nullable_fuzz2.sql
+%%DATADIR%%-test/queries/0_stateless/01799_long_uniq_theta_sketch.sql
+%%DATADIR%%-test/queries/0_stateless/00167_settings_inside_query.sql
+%%DATADIR%%-test/queries/0_stateless/02148_issue_32737.reference
+%%DATADIR%%-test/queries/0_stateless/00704_drop_truncate_memory_table.reference
+%%DATADIR%%-test/queries/0_stateless/00436_convert_charset.reference
+%%DATADIR%%-test/queries/0_stateless/01010_low_cardinality_and_native_http.sh
+%%DATADIR%%-test/queries/0_stateless/01581_deduplicate_by_columns_replicated_long.reference
+%%DATADIR%%-test/queries/0_stateless/00552_or_nullable.sql
+%%DATADIR%%-test/queries/0_stateless/00715_fetch_merged_or_mutated_part_zookeeper.reference
+%%DATADIR%%-test/queries/0_stateless/01804_uniq_up_to_ubsan.sql
+%%DATADIR%%-test/queries/0_stateless/02028_add_default_database_for_alterquery_on_cluster.reference
+%%DATADIR%%-test/queries/0_stateless/01622_defaults_for_url_engine.reference
+%%DATADIR%%-test/queries/0_stateless/01543_toModifiedJulianDay.reference
+%%DATADIR%%-test/queries/0_stateless/01294_lazy_database_concurrent_recreate_reattach_and_show_tables_long.reference
+%%DATADIR%%-test/queries/0_stateless/01130_in_memory_parts.reference
+%%DATADIR%%-test/queries/0_stateless/01440_big_int_exotic_casts.sql
+%%DATADIR%%-test/queries/0_stateless/02149_external_schema_inference.sh
+%%DATADIR%%-test/queries/0_stateless/01846_alter_column_without_type_bugfix.sql
+%%DATADIR%%-test/queries/0_stateless/00825_http_header_query_id.sh
+%%DATADIR%%-test/queries/0_stateless/01632_nullable_string_type_convert_to_decimal_type.reference
+%%DATADIR%%-test/queries/0_stateless/01586_replicated_mutations_empty_partition.sql
+%%DATADIR%%-test/queries/0_stateless/01030_incorrect_count_summing_merge_tree.sql
+%%DATADIR%%-test/queries/0_stateless/00860_unknown_identifier_bug.reference
+%%DATADIR%%-test/queries/0_stateless/01070_to_decimal_or_null_exception.sql
+%%DATADIR%%-test/queries/0_stateless/01734_datetime64_from_float.sql
+%%DATADIR%%-test/queries/0_stateless/00634_logging_shard.reference
+%%DATADIR%%-test/queries/0_stateless/02017_columns_with_dot.sql
+%%DATADIR%%-test/queries/0_stateless/00825_protobuf_format_nested_in_nested.reference
+%%DATADIR%%-test/queries/0_stateless/01455_rank_correlation_spearman.sql
+%%DATADIR%%-test/queries/0_stateless/01650_expressions_merge_bug.sql
+%%DATADIR%%-test/queries/0_stateless/01155_old_mutation_parts_to_do.reference
+%%DATADIR%%-test/queries/0_stateless/00155_long_merges.reference
+%%DATADIR%%-test/queries/0_stateless/00589_removal_unused_columns_aggregation.sql
+%%DATADIR%%-test/queries/0_stateless/01678_great_circle_angle.sql
+%%DATADIR%%-test/queries/0_stateless/01813_distributed_scalar_subqueries_alias.reference
+%%DATADIR%%-test/queries/0_stateless/01948_heredoc.sql
+%%DATADIR%%-test/queries/0_stateless/01396_inactive_replica_cleanup_nodes_zookeeper.reference
+%%DATADIR%%-test/queries/0_stateless/00825_protobuf_format_array_of_arrays.reference
+%%DATADIR%%-test/queries/0_stateless/01596_setting_limit_offset.reference
+%%DATADIR%%-test/queries/0_stateless/00910_buffer_prewhere.reference
+%%DATADIR%%-test/queries/0_stateless/01268_dictionary_direct_layout.reference
+%%DATADIR%%-test/queries/0_stateless/01560_merge_distributed_join.sql
+%%DATADIR%%-test/queries/0_stateless/00726_modulo_for_date.sql
+%%DATADIR%%-test/queries/0_stateless/00736_disjunction_optimisation.sql
+%%DATADIR%%-test/queries/0_stateless/02162_array_first_last_index.reference
+%%DATADIR%%-test/queries/0_stateless/01748_partition_id_pruning.sql
+%%DATADIR%%-test/queries/0_stateless/01130_in_memory_parts.sql
+%%DATADIR%%-test/queries/0_stateless/01470_columns_transformers2.reference
+%%DATADIR%%-test/queries/0_stateless/01737_clickhouse_server_wait_server_pool_long.reference
+%%DATADIR%%-test/queries/0_stateless/00835_if_generic_case.sql
+%%DATADIR%%-test/queries/0_stateless/00226_zookeeper_deduplication_and_unexpected_parts_long.sql
+%%DATADIR%%-test/queries/0_stateless/01839_join_to_subqueries_rewriter_columns_matcher.reference
+%%DATADIR%%-test/queries/0_stateless/00712_prewhere_with_sampling.sql
+%%DATADIR%%-test/queries/0_stateless/01521_max_length_alias.sql
+%%DATADIR%%-test/queries/0_stateless/00677_shard_any_heavy_merge.reference
+%%DATADIR%%-test/queries/0_stateless/02126_fix_filelog.reference
+%%DATADIR%%-test/queries/0_stateless/00596_limit_on_expanded_ast.sh
+%%DATADIR%%-test/queries/0_stateless/01259_combinator_distinct_distributed.reference
+%%DATADIR%%-test/queries/0_stateless/01550_type_map_formats.reference
+%%DATADIR%%-test/queries/0_stateless/01746_long_zlib_http_compression_json_format.reference
+%%DATADIR%%-test/queries/0_stateless/01132_max_rows_to_read.sql
+%%DATADIR%%-test/queries/0_stateless/01560_DateTime_and_DateTime64_comparision.sql
+%%DATADIR%%-test/queries/0_stateless/01072_json_each_row_data_in_square_brackets.reference
+%%DATADIR%%-test/queries/0_stateless/00087_math_functions.sql
 %%DATADIR%%-test/queries/0_stateless/00214_primary_key_order.reference
-%%DATADIR%%-test/queries/0_stateless/00214_primary_key_order.sql
-%%DATADIR%%-test/queries/0_stateless/00215_primary_key_order_zookeeper.reference
-%%DATADIR%%-test/queries/0_stateless/00215_primary_key_order_zookeeper.sql
-%%DATADIR%%-test/queries/0_stateless/00216_bit_test_function_family.reference
-%%DATADIR%%-test/queries/0_stateless/00216_bit_test_function_family.sql
-%%DATADIR%%-test/queries/0_stateless/00217_shard_global_subquery_columns_with_same_name.reference
-%%DATADIR%%-test/queries/0_stateless/00217_shard_global_subquery_columns_with_same_name.sql
-%%DATADIR%%-test/queries/0_stateless/00218_like_regexp_newline.reference
-%%DATADIR%%-test/queries/0_stateless/00218_like_regexp_newline.sql
-%%DATADIR%%-test/queries/0_stateless/00219_full_right_join_column_order.reference
+%%DATADIR%%-test/queries/0_stateless/01273_arrow_nested_arrays_load.reference
+%%DATADIR%%-test/queries/0_stateless/01946_profile_sleep.reference
+%%DATADIR%%-test/queries/0_stateless/00117_parsing_arrays.sql
+%%DATADIR%%-test/queries/0_stateless/01091_num_threads.reference
+%%DATADIR%%-test/queries/0_stateless/02127_connection_drain.reference
+%%DATADIR%%-test/queries/0_stateless/02049_clickhouse_local_merge_tree.expect
 %%DATADIR%%-test/queries/0_stateless/00219_full_right_join_column_order.sql
-%%DATADIR%%-test/queries/0_stateless/00220_shard_with_totals_in_subquery_remote_and_limit.reference
-%%DATADIR%%-test/queries/0_stateless/00220_shard_with_totals_in_subquery_remote_and_limit.sql
-%%DATADIR%%-test/queries/0_stateless/00222_sequence_aggregate_function_family.reference
-%%DATADIR%%-test/queries/0_stateless/00222_sequence_aggregate_function_family.sql
-%%DATADIR%%-test/queries/0_stateless/00223_shard_distributed_aggregation_memory_efficient.reference
-%%DATADIR%%-test/queries/0_stateless/00223_shard_distributed_aggregation_memory_efficient.sql
-%%DATADIR%%-test/queries/0_stateless/00224_shard_distributed_aggregation_memory_efficient_and_overflows.reference
-%%DATADIR%%-test/queries/0_stateless/00224_shard_distributed_aggregation_memory_efficient_and_overflows.sql
-%%DATADIR%%-test/queries/0_stateless/00225_join_duplicate_columns.reference
-%%DATADIR%%-test/queries/0_stateless/00225_join_duplicate_columns.sql
-%%DATADIR%%-test/queries/0_stateless/00226_zookeeper_deduplication_and_unexpected_parts.reference
-%%DATADIR%%-test/queries/0_stateless/00226_zookeeper_deduplication_and_unexpected_parts.sql
-%%DATADIR%%-test/queries/0_stateless/00227_quantiles_timing_arbitrary_order.reference
-%%DATADIR%%-test/queries/0_stateless/00227_quantiles_timing_arbitrary_order.sql
-%%DATADIR%%-test/queries/0_stateless/00228_shard_quantiles_deterministic_merge_overflow.reference
-%%DATADIR%%-test/queries/0_stateless/00228_shard_quantiles_deterministic_merge_overflow.sql
-%%DATADIR%%-test/queries/0_stateless/00229_prewhere_column_missing.reference
-%%DATADIR%%-test/queries/0_stateless/00229_prewhere_column_missing.sql
-%%DATADIR%%-test/queries/0_stateless/00230_array_functions_has_count_equal_index_of_non_const_second_arg.reference
-%%DATADIR%%-test/queries/0_stateless/00230_array_functions_has_count_equal_index_of_non_const_second_arg.sql
-%%DATADIR%%-test/queries/0_stateless/00231_format_vertical_raw.reference
-%%DATADIR%%-test/queries/0_stateless/00231_format_vertical_raw.sql
-%%DATADIR%%-test/queries/0_stateless/00232_format_readable_size.reference
-%%DATADIR%%-test/queries/0_stateless/00232_format_readable_size.sql
-%%DATADIR%%-test/queries/0_stateless/00233_position_function_family.reference
-%%DATADIR%%-test/queries/0_stateless/00233_position_function_family.sql
-%%DATADIR%%-test/queries/0_stateless/00233_position_function_sql_comparibilty.reference
-%%DATADIR%%-test/queries/0_stateless/00233_position_function_sql_comparibilty.sql
-%%DATADIR%%-test/queries/0_stateless/00234_disjunctive_equality_chains_optimization.reference
-%%DATADIR%%-test/queries/0_stateless/00234_disjunctive_equality_chains_optimization.sql
-%%DATADIR%%-test/queries/0_stateless/00235_create_temporary_table_as.reference
-%%DATADIR%%-test/queries/0_stateless/00235_create_temporary_table_as.sql
-%%DATADIR%%-test/queries/0_stateless/00236_replicated_drop_on_non_leader_zookeeper.reference
-%%DATADIR%%-test/queries/0_stateless/00236_replicated_drop_on_non_leader_zookeeper.sql
-%%DATADIR%%-test/queries/0_stateless/00237_group_by_arrays.reference
+%%DATADIR%%-test/queries/0_stateless/01803_untuple_subquery.reference
+%%DATADIR%%-test/queries/0_stateless/01852_cast_operator_2.sql
+%%DATADIR%%-test/queries/0_stateless/01616_untuple_access_field.reference
+%%DATADIR%%-test/queries/0_stateless/01376_array_fill_empty.sql
+%%DATADIR%%-test/queries/0_stateless/01431_finish_sorting_with_consts.reference
+%%DATADIR%%-test/queries/0_stateless/01942_dateTimeToSnowflake.reference
+%%DATADIR%%-test/queries/0_stateless/01141_join_get_negative.reference
+%%DATADIR%%-test/queries/0_stateless/00991_temporary_live_view_watch_events_heartbeat.python
+%%DATADIR%%-test/queries/0_stateless/01345_array_join_LittleMaverick.reference
+%%DATADIR%%-test/queries/0_stateless/00726_materialized_view_concurrent.reference
+%%DATADIR%%-test/queries/0_stateless/01651_bugs_from_15889.sql
+%%DATADIR%%-test/queries/0_stateless/01086_modulo_or_zero.sql
+%%DATADIR%%-test/queries/0_stateless/00725_ipv4_ipv6_domains.sql
+%%DATADIR%%-test/queries/0_stateless/01752_distributed_query_sigsegv.reference
+%%DATADIR%%-test/queries/0_stateless/02013_zlib_read_after_eof.go
+%%DATADIR%%-test/queries/0_stateless/01915_for_each_crakjie.sql
+%%DATADIR%%-test/queries/0_stateless/01013_totals_without_aggregation.sql
+%%DATADIR%%-test/queries/0_stateless/02136_scalar_read_rows_json.sh
+%%DATADIR%%-test/queries/0_stateless/01866_aggregate_function_interval_length_sum.sql
+%%DATADIR%%-test/queries/0_stateless/00597_with_totals_on_empty_set.sql
+%%DATADIR%%-test/queries/0_stateless/01307_multiple_leaders_zookeeper.sh
+%%DATADIR%%-test/queries/0_stateless/00003_reinterpret_as_string.reference
+%%DATADIR%%-test/queries/0_stateless/01017_tsv_empty_as_default.sh
+%%DATADIR%%-test/queries/0_stateless/01338_sha256_fixedstring.reference
+%%DATADIR%%-test/queries/0_stateless/01355_if_fixed_string.reference
+%%DATADIR%%-test/queries/0_stateless/00748_insert_array_with_null.sql
+%%DATADIR%%-test/queries/0_stateless/02024_join_on_or_long.reference
+%%DATADIR%%-test/queries/0_stateless/00515_shard_desc_table_functions_and_subqueries.reference
+%%DATADIR%%-test/queries/0_stateless/00464_sort_all_constant_columns.sql
+%%DATADIR%%-test/queries/0_stateless/01459_manual_write_to_replicas_quorum.reference
+%%DATADIR%%-test/queries/0_stateless/01016_uniqCombined64.reference
+%%DATADIR%%-test/queries/0_stateless/00423_storage_log_single_thread.reference
+%%DATADIR%%-test/queries/0_stateless/01269_toStartOfSecond.sql
+%%DATADIR%%-test/queries/0_stateless/00837_minmax_index_replicated_zookeeper_long.sql
+%%DATADIR%%-test/queries/0_stateless/01626_cnf_test.reference
+%%DATADIR%%-test/queries/0_stateless/01234_to_string_monotonic.sql
+%%DATADIR%%-test/queries/0_stateless/02115_write_buffers_finalize.sh
+%%DATADIR%%-test/queries/0_stateless/01888_read_int_safe.sql
+%%DATADIR%%-test/queries/0_stateless/00725_join_on_bug_4.sql
+%%DATADIR%%-test/queries/0_stateless/00808_array_enumerate_segfault.reference
+%%DATADIR%%-test/queries/0_stateless/01018_optimize_read_in_order_with_in_subquery.reference
+%%DATADIR%%-test/queries/0_stateless/00531_aggregate_over_nullable.sql
+%%DATADIR%%-test/queries/0_stateless/00876_wrong_arraj_join_column.sql
+%%DATADIR%%-test/queries/0_stateless/00204_extract_url_parameter.sql
+%%DATADIR%%-test/queries/0_stateless/01474_custom_null_tsv.sh
+%%DATADIR%%-test/queries/0_stateless/01362_year_of_ISO8601_week_modificators_for_formatDateTime.sql
+%%DATADIR%%-test/queries/0_stateless/00763_create_query_as_table_engine_bug.sql
+%%DATADIR%%-test/queries/0_stateless/01377_supertype_low_cardinality.reference
 %%DATADIR%%-test/queries/0_stateless/00237_group_by_arrays.sql
-%%DATADIR%%-test/queries/0_stateless/00238_removal_of_temporary_columns.reference
-%%DATADIR%%-test/queries/0_stateless/00238_removal_of_temporary_columns.sql
-%%DATADIR%%-test/queries/0_stateless/00239_type_conversion_in_in.reference
-%%DATADIR%%-test/queries/0_stateless/00239_type_conversion_in_in.sql
-%%DATADIR%%-test/queries/0_stateless/00240_replace_substring_loop.reference
-%%DATADIR%%-test/queries/0_stateless/00240_replace_substring_loop.sql
-%%DATADIR%%-test/queries/0_stateless/00250_tuple_comparison.reference
-%%DATADIR%%-test/queries/0_stateless/00250_tuple_comparison.sql
-%%DATADIR%%-test/queries/0_stateless/00251_has_types.reference
-%%DATADIR%%-test/queries/0_stateless/00251_has_types.sql
-%%DATADIR%%-test/queries/0_stateless/00252_shard_global_in_aggregate_function.reference
-%%DATADIR%%-test/queries/0_stateless/00252_shard_global_in_aggregate_function.sql
-%%DATADIR%%-test/queries/0_stateless/00253_insert_recursive_defaults.reference
-%%DATADIR%%-test/queries/0_stateless/00253_insert_recursive_defaults.sql
-%%DATADIR%%-test/queries/0_stateless/00254_tuple_extremes.reference
-%%DATADIR%%-test/queries/0_stateless/00254_tuple_extremes.sql
-%%DATADIR%%-test/queries/0_stateless/00255_array_concat_string.reference
-%%DATADIR%%-test/queries/0_stateless/00255_array_concat_string.sql
-%%DATADIR%%-test/queries/0_stateless/00256_reverse.reference
-%%DATADIR%%-test/queries/0_stateless/00256_reverse.sql
-%%DATADIR%%-test/queries/0_stateless/00257_shard_no_aggregates_and_constant_keys.reference
-%%DATADIR%%-test/queries/0_stateless/00257_shard_no_aggregates_and_constant_keys.sql
-%%DATADIR%%-test/queries/0_stateless/00258_materializing_tuples.reference
-%%DATADIR%%-test/queries/0_stateless/00258_materializing_tuples.sql
-%%DATADIR%%-test/queries/0_stateless/00259_hashing_tuples.reference
-%%DATADIR%%-test/queries/0_stateless/00259_hashing_tuples.sql
-%%DATADIR%%-test/queries/0_stateless/00260_like_and_curly_braces.reference
-%%DATADIR%%-test/queries/0_stateless/00260_like_and_curly_braces.sql
-%%DATADIR%%-test/queries/0_stateless/00261_storage_aliases_and_array_join.reference
-%%DATADIR%%-test/queries/0_stateless/00261_storage_aliases_and_array_join.sql
-%%DATADIR%%-test/queries/0_stateless/00262_alter_alias.reference
-%%DATADIR%%-test/queries/0_stateless/00262_alter_alias.sql
-%%DATADIR%%-test/queries/0_stateless/00263_merge_aggregates_and_overflow.reference
-%%DATADIR%%-test/queries/0_stateless/00263_merge_aggregates_and_overflow.sql
-%%DATADIR%%-test/queries/0_stateless/00264_uniq_many_args.reference
-%%DATADIR%%-test/queries/0_stateless/00264_uniq_many_args.sql
-%%DATADIR%%-test/queries/0_stateless/00265_http_content_type_format_timezone.reference
-%%DATADIR%%-test/queries/0_stateless/00265_http_content_type_format_timezone.sh
-%%DATADIR%%-test/queries/0_stateless/00266_read_overflow_mode.reference
-%%DATADIR%%-test/queries/0_stateless/00266_read_overflow_mode.sql
-%%DATADIR%%-test/queries/0_stateless/00266_shard_global_subquery_and_aliases.reference
-%%DATADIR%%-test/queries/0_stateless/00266_shard_global_subquery_and_aliases.sql
-%%DATADIR%%-test/queries/0_stateless/00267_tuple_array_access_operators_priority.reference
-%%DATADIR%%-test/queries/0_stateless/00267_tuple_array_access_operators_priority.sql
-%%DATADIR%%-test/queries/0_stateless/00268_aliases_without_as_keyword.reference
-%%DATADIR%%-test/queries/0_stateless/00268_aliases_without_as_keyword.sql
-%%DATADIR%%-test/queries/0_stateless/00269_database_table_whitespace.reference
-%%DATADIR%%-test/queries/0_stateless/00269_database_table_whitespace.sql
-%%DATADIR%%-test/queries/0_stateless/00270_views_query_processing_stage.reference
-%%DATADIR%%-test/queries/0_stateless/00270_views_query_processing_stage.sql
-%%DATADIR%%-test/queries/0_stateless/00271_agg_state_and_totals.reference
-%%DATADIR%%-test/queries/0_stateless/00271_agg_state_and_totals.sql
-%%DATADIR%%-test/queries/0_stateless/00272_union_all_and_in_subquery.reference
-%%DATADIR%%-test/queries/0_stateless/00272_union_all_and_in_subquery.sql
-%%DATADIR%%-test/queries/0_stateless/00273_quantiles.reference
-%%DATADIR%%-test/queries/0_stateless/00273_quantiles.sql
-%%DATADIR%%-test/queries/0_stateless/00274_shard_group_array.reference
-%%DATADIR%%-test/queries/0_stateless/00274_shard_group_array.sql
-%%DATADIR%%-test/queries/0_stateless/00275_shard_quantiles_weighted.reference
-%%DATADIR%%-test/queries/0_stateless/00275_shard_quantiles_weighted.sql
-%%DATADIR%%-test/queries/0_stateless/00276_sample.reference
-%%DATADIR%%-test/queries/0_stateless/00276_sample.sql
-%%DATADIR%%-test/queries/0_stateless/00277_array_filter.reference
-%%DATADIR%%-test/queries/0_stateless/00277_array_filter.sql
-%%DATADIR%%-test/queries/0_stateless/00278_insert_already_sorted.reference
-%%DATADIR%%-test/queries/0_stateless/00278_insert_already_sorted.sql
-%%DATADIR%%-test/queries/0_stateless/00279_quantiles_permuted_args.reference
-%%DATADIR%%-test/queries/0_stateless/00279_quantiles_permuted_args.sql
-%%DATADIR%%-test/queries/0_stateless/00280_hex_escape_sequence.reference
-%%DATADIR%%-test/queries/0_stateless/00280_hex_escape_sequence.sql
-%%DATADIR%%-test/queries/0_stateless/00282_merging.reference
-%%DATADIR%%-test/queries/0_stateless/00282_merging.sql
-%%DATADIR%%-test/queries/0_stateless/00283_column_cut.reference
-%%DATADIR%%-test/queries/0_stateless/00283_column_cut.sql
-%%DATADIR%%-test/queries/0_stateless/00284_external_aggregation.reference
-%%DATADIR%%-test/queries/0_stateless/00284_external_aggregation.sql
-%%DATADIR%%-test/queries/0_stateless/00285_not_all_data_in_totals.reference
-%%DATADIR%%-test/queries/0_stateless/00285_not_all_data_in_totals.sql
-%%DATADIR%%-test/queries/0_stateless/00286_format_long_negative_float.reference
-%%DATADIR%%-test/queries/0_stateless/00286_format_long_negative_float.sql
-%%DATADIR%%-test/queries/0_stateless/00287_column_const_with_nan.reference
-%%DATADIR%%-test/queries/0_stateless/00287_column_const_with_nan.sql
-%%DATADIR%%-test/queries/0_stateless/00288_empty_stripelog.reference
-%%DATADIR%%-test/queries/0_stateless/00288_empty_stripelog.sql
-%%DATADIR%%-test/queries/0_stateless/00290_shard_aggregation_memory_efficient.reference
-%%DATADIR%%-test/queries/0_stateless/00290_shard_aggregation_memory_efficient.sql
-%%DATADIR%%-test/queries/0_stateless/00291_array_reduce.reference
+%%DATADIR%%-test/queries/0_stateless/01114_mysql_database_engine_segfault.reference
+%%DATADIR%%-test/queries/0_stateless/01527_dist_sharding_key_dictGet_reload.sql
+%%DATADIR%%-test/queries/0_stateless/01518_select_in_null.sql
+%%DATADIR%%-test/queries/0_stateless/01099_operators_date_and_timestamp.reference
+%%DATADIR%%-test/queries/0_stateless/00138_table_aliases.sql
+%%DATADIR%%-test/queries/0_stateless/01070_template_empty_file.reference
+%%DATADIR%%-test/queries/0_stateless/01062_pm_all_join_with_block_continuation.reference
 %%DATADIR%%-test/queries/0_stateless/00291_array_reduce.sql
-%%DATADIR%%-test/queries/0_stateless/00292_parser_tuple_element.reference
-%%DATADIR%%-test/queries/0_stateless/00292_parser_tuple_element.sql
-%%DATADIR%%-test/queries/0_stateless/00293_shard_max_subquery_depth.reference
-%%DATADIR%%-test/queries/0_stateless/00293_shard_max_subquery_depth.sql
-%%DATADIR%%-test/queries/0_stateless/00294_shard_enums.reference
+%%DATADIR%%-test/queries/0_stateless/02016_aggregation_spark_bar.reference
+%%DATADIR%%-test/queries/0_stateless/01823_array_low_cardinality_KuliginStepan.reference
+%%DATADIR%%-test/queries/0_stateless/00137_in_constants.reference
+%%DATADIR%%-test/queries/0_stateless/01346_alter_enum_partition_key_replicated_zookeeper_long.reference
+%%DATADIR%%-test/queries/0_stateless/01677_bit_float.reference
+%%DATADIR%%-test/queries/0_stateless/01652_ttl_old_syntax.reference
 %%DATADIR%%-test/queries/0_stateless/00294_shard_enums.sql
-%%DATADIR%%-test/queries/0_stateless/00295_global_in_one_shard_rows_before_limit.reference
-%%DATADIR%%-test/queries/0_stateless/00295_global_in_one_shard_rows_before_limit.sql
-%%DATADIR%%-test/queries/0_stateless/00296_url_parameters.reference
-%%DATADIR%%-test/queries/0_stateless/00296_url_parameters.sql
-%%DATADIR%%-test/queries/0_stateless/00297_attach_negative_numbers_zookeeper.reference
-%%DATADIR%%-test/queries/0_stateless/00297_attach_negative_numbers_zookeeper.sql.disabled
-%%DATADIR%%-test/queries/0_stateless/00298_enum_width_and_cast.reference
-%%DATADIR%%-test/queries/0_stateless/00298_enum_width_and_cast.sql
-%%DATADIR%%-test/queries/0_stateless/00299_stripe_log_multiple_inserts.reference
-%%DATADIR%%-test/queries/0_stateless/00299_stripe_log_multiple_inserts.sql
-%%DATADIR%%-test/queries/0_stateless/00300_csv.reference
-%%DATADIR%%-test/queries/0_stateless/00300_csv.sql
-%%DATADIR%%-test/queries/0_stateless/00301_csv.reference
-%%DATADIR%%-test/queries/0_stateless/00301_csv.sh
-%%DATADIR%%-test/queries/0_stateless/00302_http_compression.reference
-%%DATADIR%%-test/queries/0_stateless/00302_http_compression.sh
-%%DATADIR%%-test/queries/0_stateless/00304_http_external_data.reference
-%%DATADIR%%-test/queries/0_stateless/00304_http_external_data.sh
-%%DATADIR%%-test/queries/0_stateless/00305_http_and_readonly.reference
-%%DATADIR%%-test/queries/0_stateless/00305_http_and_readonly.sh
-%%DATADIR%%-test/queries/0_stateless/00306_insert_values_and_expressions.reference
-%%DATADIR%%-test/queries/0_stateless/00306_insert_values_and_expressions.sql
-%%DATADIR%%-test/queries/0_stateless/00307_format_xml.reference
-%%DATADIR%%-test/queries/0_stateless/00307_format_xml.sql
-%%DATADIR%%-test/queries/0_stateless/00308_write_buffer_valid_utf8.reference
-%%DATADIR%%-test/queries/0_stateless/00308_write_buffer_valid_utf8.sql
-%%DATADIR%%-test/queries/0_stateless/00309_formats.reference
-%%DATADIR%%-test/queries/0_stateless/00309_formats.sql
-%%DATADIR%%-test/queries/0_stateless/00310_tskv.reference
-%%DATADIR%%-test/queries/0_stateless/00310_tskv.sh
-%%DATADIR%%-test/queries/0_stateless/00311_array_primary_key.reference
-%%DATADIR%%-test/queries/0_stateless/00311_array_primary_key.sql
-%%DATADIR%%-test/queries/0_stateless/00312_position_case_insensitive_utf8.reference
-%%DATADIR%%-test/queries/0_stateless/00312_position_case_insensitive_utf8.sql
-%%DATADIR%%-test/queries/0_stateless/00313_const_totals_extremes.reference
-%%DATADIR%%-test/queries/0_stateless/00313_const_totals_extremes.sh
-%%DATADIR%%-test/queries/0_stateless/00314_sample_factor_virtual_column.reference
-%%DATADIR%%-test/queries/0_stateless/00314_sample_factor_virtual_column.sql
-%%DATADIR%%-test/queries/0_stateless/00315_quantile_off_by_one.reference
-%%DATADIR%%-test/queries/0_stateless/00315_quantile_off_by_one.sql
-%%DATADIR%%-test/queries/0_stateless/00316_rounding_functions_and_empty_block.reference
-%%DATADIR%%-test/queries/0_stateless/00316_rounding_functions_and_empty_block.sql
-%%DATADIR%%-test/queries/0_stateless/00317_in_tuples_and_out_of_range_values.reference
-%%DATADIR%%-test/queries/0_stateless/00317_in_tuples_and_out_of_range_values.sql
-%%DATADIR%%-test/queries/0_stateless/00318_pk_tuple_order.reference
-%%DATADIR%%-test/queries/0_stateless/00318_pk_tuple_order.sql
-%%DATADIR%%-test/queries/0_stateless/00319_index_for_like.reference
-%%DATADIR%%-test/queries/0_stateless/00319_index_for_like.sql
-%%DATADIR%%-test/queries/0_stateless/00320_between.reference
-%%DATADIR%%-test/queries/0_stateless/00320_between.sql
-%%DATADIR%%-test/queries/0_stateless/00321_pk_set.reference
-%%DATADIR%%-test/queries/0_stateless/00321_pk_set.sql
-%%DATADIR%%-test/queries/0_stateless/00322_disable_checksumming.reference
-%%DATADIR%%-test/queries/0_stateless/00322_disable_checksumming.sh
-%%DATADIR%%-test/queries/0_stateless/00323_quantiles_timing_bug.reference
-%%DATADIR%%-test/queries/0_stateless/00323_quantiles_timing_bug.sql
-%%DATADIR%%-test/queries/0_stateless/00324_hashing_enums.reference
-%%DATADIR%%-test/queries/0_stateless/00324_hashing_enums.sql
-%%DATADIR%%-test/queries/0_stateless/00325_replacing_merge_tree.reference
-%%DATADIR%%-test/queries/0_stateless/00325_replacing_merge_tree.sql.disabled
-%%DATADIR%%-test/queries/0_stateless/00326_long_function_multi_if.reference
-%%DATADIR%%-test/queries/0_stateless/00326_long_function_multi_if.sql
-%%DATADIR%%-test/queries/0_stateless/00327_summing_composite_nested.reference
-%%DATADIR%%-test/queries/0_stateless/00327_summing_composite_nested.sql
-%%DATADIR%%-test/queries/0_stateless/00328_long_case_construction.reference
-%%DATADIR%%-test/queries/0_stateless/00328_long_case_construction.sql
-%%DATADIR%%-test/queries/0_stateless/00330_view_subqueries.reference
-%%DATADIR%%-test/queries/0_stateless/00330_view_subqueries.sql
-%%DATADIR%%-test/queries/0_stateless/00331_final_and_prewhere.reference
-%%DATADIR%%-test/queries/0_stateless/00331_final_and_prewhere.sql
-%%DATADIR%%-test/queries/0_stateless/00332_quantile_timing_memory_leak.reference
-%%DATADIR%%-test/queries/0_stateless/00332_quantile_timing_memory_leak.sql
-%%DATADIR%%-test/queries/0_stateless/00333_parser_number_bug.reference
-%%DATADIR%%-test/queries/0_stateless/00333_parser_number_bug.sql
-%%DATADIR%%-test/queries/0_stateless/00334_column_aggregate_function_limit.reference
-%%DATADIR%%-test/queries/0_stateless/00334_column_aggregate_function_limit.sql
-%%DATADIR%%-test/queries/0_stateless/00335_bom.reference
-%%DATADIR%%-test/queries/0_stateless/00335_bom.sh
-%%DATADIR%%-test/queries/0_stateless/00336_shard_stack_trace.reference
-%%DATADIR%%-test/queries/0_stateless/00336_shard_stack_trace.sh
-%%DATADIR%%-test/queries/0_stateless/00337_shard_any_heavy.reference
-%%DATADIR%%-test/queries/0_stateless/00337_shard_any_heavy.sql
-%%DATADIR%%-test/queries/0_stateless/00338_replicate_array_of_strings.reference
-%%DATADIR%%-test/queries/0_stateless/00338_replicate_array_of_strings.sql
-%%DATADIR%%-test/queries/0_stateless/00339_parsing_bad_arrays.reference
-%%DATADIR%%-test/queries/0_stateless/00339_parsing_bad_arrays.sh
-%%DATADIR%%-test/queries/0_stateless/00340_squashing_insert_select.reference
-%%DATADIR%%-test/queries/0_stateless/00340_squashing_insert_select.sql
-%%DATADIR%%-test/queries/0_stateless/00341_squashing_insert_select2.reference
-%%DATADIR%%-test/queries/0_stateless/00341_squashing_insert_select2.sql
-%%DATADIR%%-test/queries/0_stateless/00342_escape_sequences.reference
-%%DATADIR%%-test/queries/0_stateless/00342_escape_sequences.sql
-%%DATADIR%%-test/queries/0_stateless/00343_array_element_generic.reference
-%%DATADIR%%-test/queries/0_stateless/00343_array_element_generic.sql
-%%DATADIR%%-test/queries/0_stateless/00344_row_number_in_all_blocks.reference
-%%DATADIR%%-test/queries/0_stateless/00344_row_number_in_all_blocks.sql
-%%DATADIR%%-test/queries/0_stateless/00345_index_accurate_comparison.reference
-%%DATADIR%%-test/queries/0_stateless/00345_index_accurate_comparison.sql
-%%DATADIR%%-test/queries/0_stateless/00346_if_tuple.reference
-%%DATADIR%%-test/queries/0_stateless/00346_if_tuple.sql
-%%DATADIR%%-test/queries/0_stateless/00347_has_tuple.reference
-%%DATADIR%%-test/queries/0_stateless/00347_has_tuple.sql
-%%DATADIR%%-test/queries/0_stateless/00348_tuples.reference
-%%DATADIR%%-test/queries/0_stateless/00348_tuples.sql
-%%DATADIR%%-test/queries/0_stateless/00349_visible_width.reference
-%%DATADIR%%-test/queries/0_stateless/00349_visible_width.sql
-%%DATADIR%%-test/queries/0_stateless/00350_count_distinct.reference
-%%DATADIR%%-test/queries/0_stateless/00350_count_distinct.sql
-%%DATADIR%%-test/queries/0_stateless/00351_select_distinct_arrays_tuples.reference
-%%DATADIR%%-test/queries/0_stateless/00351_select_distinct_arrays_tuples.sql
-%%DATADIR%%-test/queries/0_stateless/00352_external_sorting_and_constants.reference
-%%DATADIR%%-test/queries/0_stateless/00352_external_sorting_and_constants.sql
-%%DATADIR%%-test/queries/0_stateless/00353_join_by_tuple.reference
-%%DATADIR%%-test/queries/0_stateless/00353_join_by_tuple.sql
-%%DATADIR%%-test/queries/0_stateless/00354_host_command_line_option.reference
-%%DATADIR%%-test/queries/0_stateless/00354_host_command_line_option.sh
-%%DATADIR%%-test/queries/0_stateless/00355_array_of_non_const_convertible_types.reference
-%%DATADIR%%-test/queries/0_stateless/00355_array_of_non_const_convertible_types.sql
-%%DATADIR%%-test/queries/0_stateless/00356_analyze_aggregations_and_union_all.reference
-%%DATADIR%%-test/queries/0_stateless/00356_analyze_aggregations_and_union_all.sql
-%%DATADIR%%-test/queries/0_stateless/00357_to_string_complex_types.reference
-%%DATADIR%%-test/queries/0_stateless/00357_to_string_complex_types.sql
-%%DATADIR%%-test/queries/0_stateless/00358_from_string_complex_types.reference
-%%DATADIR%%-test/queries/0_stateless/00358_from_string_complex_types.sql
-%%DATADIR%%-test/queries/0_stateless/00359_convert_or_zero_functions.reference
-%%DATADIR%%-test/queries/0_stateless/00359_convert_or_zero_functions.sql
-%%DATADIR%%-test/queries/0_stateless/00360_to_date_from_string_with_datetime.reference
-%%DATADIR%%-test/queries/0_stateless/00360_to_date_from_string_with_datetime.sql
-%%DATADIR%%-test/queries/0_stateless/00361_shared_array_offsets_and_squash_blocks.reference
-%%DATADIR%%-test/queries/0_stateless/00361_shared_array_offsets_and_squash_blocks.sql
-%%DATADIR%%-test/queries/0_stateless/00362_great_circle_distance.reference
-%%DATADIR%%-test/queries/0_stateless/00362_great_circle_distance.sql
-%%DATADIR%%-test/queries/0_stateless/00363_defaults.reference
-%%DATADIR%%-test/queries/0_stateless/00363_defaults.sql
-%%DATADIR%%-test/queries/0_stateless/00364_java_style_denormals.reference
-%%DATADIR%%-test/queries/0_stateless/00364_java_style_denormals.sql
-%%DATADIR%%-test/queries/0_stateless/00365_statistics_in_formats.reference
-%%DATADIR%%-test/queries/0_stateless/00365_statistics_in_formats.sh
-%%DATADIR%%-test/queries/0_stateless/00366_multi_statements.reference
-%%DATADIR%%-test/queries/0_stateless/00366_multi_statements.sh
-%%DATADIR%%-test/queries/0_stateless/00367_visible_width_of_array_tuple_enum.reference
-%%DATADIR%%-test/queries/0_stateless/00367_visible_width_of_array_tuple_enum.sql
-%%DATADIR%%-test/queries/0_stateless/00368_format_option_collision.reference
-%%DATADIR%%-test/queries/0_stateless/00368_format_option_collision.sh
-%%DATADIR%%-test/queries/0_stateless/00369_int_div_of_float.reference
-%%DATADIR%%-test/queries/0_stateless/00369_int_div_of_float.sql
-%%DATADIR%%-test/queries/0_stateless/00370_duplicate_columns_in_subqueries.reference
-%%DATADIR%%-test/queries/0_stateless/00370_duplicate_columns_in_subqueries.sql
-%%DATADIR%%-test/queries/0_stateless/00371_union_all.reference
-%%DATADIR%%-test/queries/0_stateless/00371_union_all.sql
-%%DATADIR%%-test/queries/0_stateless/00372_cors_header.reference
-%%DATADIR%%-test/queries/0_stateless/00372_cors_header.sh
-%%DATADIR%%-test/queries/0_stateless/00373_group_by_tuple.reference
-%%DATADIR%%-test/queries/0_stateless/00373_group_by_tuple.sql
-%%DATADIR%%-test/queries/0_stateless/00374_any_last_if_merge.reference
-%%DATADIR%%-test/queries/0_stateless/00374_any_last_if_merge.sql
-%%DATADIR%%-test/queries/0_stateless/00374_json_each_row_input_with_noisy_fields.reference
-%%DATADIR%%-test/queries/0_stateless/00374_json_each_row_input_with_noisy_fields.sh
-%%DATADIR%%-test/queries/0_stateless/00375_shard_group_uniq_array_of_string.reference
-%%DATADIR%%-test/queries/0_stateless/00375_shard_group_uniq_array_of_string.sql
-%%DATADIR%%-test/queries/0_stateless/00376_shard_group_uniq_array_of_int_array.reference
-%%DATADIR%%-test/queries/0_stateless/00376_shard_group_uniq_array_of_int_array.sql
-%%DATADIR%%-test/queries/0_stateless/00377_shard_group_uniq_array_of_string_array.reference
-%%DATADIR%%-test/queries/0_stateless/00377_shard_group_uniq_array_of_string_array.sql
-%%DATADIR%%-test/queries/0_stateless/00378_json_quote_64bit_integers.reference
-%%DATADIR%%-test/queries/0_stateless/00378_json_quote_64bit_integers.sql
-%%DATADIR%%-test/queries/0_stateless/00379_system_processes_port.reference
-%%DATADIR%%-test/queries/0_stateless/00379_system_processes_port.sh
-%%DATADIR%%-test/queries/0_stateless/00380_client_break_at_exception_in_batch_mode.reference
-%%DATADIR%%-test/queries/0_stateless/00380_client_break_at_exception_in_batch_mode.sh
-%%DATADIR%%-test/queries/0_stateless/00381_first_significant_subdomain.reference
-%%DATADIR%%-test/queries/0_stateless/00381_first_significant_subdomain.sql
-%%DATADIR%%-test/queries/0_stateless/00383_utf8_validation.reference
-%%DATADIR%%-test/queries/0_stateless/00383_utf8_validation.sql
-%%DATADIR%%-test/queries/0_stateless/00384_column_aggregate_function_insert_from.reference
-%%DATADIR%%-test/queries/0_stateless/00384_column_aggregate_function_insert_from.sql
+%%DATADIR%%-test/queries/0_stateless/01584_distributed_buffer_cannot_find_column.sql
+%%DATADIR%%-test/queries/0_stateless/00962_visit_param_various.reference
+%%DATADIR%%-test/queries/0_stateless/01560_monotonicity_check_multiple_args_bug.sql
+%%DATADIR%%-test/queries/0_stateless/01533_quantile_deterministic_assert.reference
+%%DATADIR%%-test/queries/0_stateless/01456_low_cardinality_sorting_bugfix.reference
+%%DATADIR%%-test/queries/0_stateless/01140_select_from_storage_join_fix.sql
+%%DATADIR%%-test/queries/0_stateless/01513_ilike_like_cache.sql
+%%DATADIR%%-test/queries/0_stateless/02113_untuple_func_alias.reference
+%%DATADIR%%-test/queries/0_stateless/01949_clickhouse_local_with_remote_localhost.reference
+%%DATADIR%%-test/queries/0_stateless/00583_limit_by_expressions.sql
+%%DATADIR%%-test/queries/0_stateless/01052_array_reduce_exception.sql
+%%DATADIR%%-test/queries/0_stateless/01338_long_select_and_alter.sh
+%%DATADIR%%-test/queries/0_stateless/01565_reconnect_after_client_error.expect
+%%DATADIR%%-test/queries/0_stateless/00900_null_array_orc_load.sh
+%%DATADIR%%-test/queries/0_stateless/01762_deltasumtimestamp_datetime64.reference
+%%DATADIR%%-test/queries/0_stateless/01497_now_support_timezone.sql
+%%DATADIR%%-test/queries/0_stateless/00980_skip_unused_shards_without_sharding_key.reference
+%%DATADIR%%-test/queries/0_stateless/01354_tuple_low_cardinality_array_mapped_bug.sql
+%%DATADIR%%-test/queries/0_stateless/01221_system_settings.sql
+%%DATADIR%%-test/queries/0_stateless/00940_max_parts_in_total.sql
+%%DATADIR%%-test/queries/0_stateless/00614_shard_same_header_for_local_and_remote_node_in_distributed_query.reference
+%%DATADIR%%-test/queries/0_stateless/00926_multimatch.sql
+%%DATADIR%%-test/queries/0_stateless/00978_sum_map_bugfix.sql
+%%DATADIR%%-test/queries/0_stateless/01785_pmj_lc_bug.sql
+%%DATADIR%%-test/queries/0_stateless/01811_datename.sql
 %%DATADIR%%-test/queries/0_stateless/00385_storage_file_and_clickhouse-local_app_long.reference
-%%DATADIR%%-test/queries/0_stateless/00385_storage_file_and_clickhouse-local_app_long.sh
-%%DATADIR%%-test/queries/0_stateless/00386_enum_in_pk.reference
-%%DATADIR%%-test/queries/0_stateless/00386_enum_in_pk.sql
-%%DATADIR%%-test/queries/0_stateless/00386_has_column_in_table.reference
-%%DATADIR%%-test/queries/0_stateless/00386_has_column_in_table.sql
-%%DATADIR%%-test/queries/0_stateless/00386_long_in_pk.python
-%%DATADIR%%-test/queries/0_stateless/00386_long_in_pk.reference
-%%DATADIR%%-test/queries/0_stateless/00386_long_in_pk.sh
-%%DATADIR%%-test/queries/0_stateless/00387_use_client_time_zone.reference
-%%DATADIR%%-test/queries/0_stateless/00387_use_client_time_zone.sh
-%%DATADIR%%-test/queries/0_stateless/00388_enum_with_totals.reference
-%%DATADIR%%-test/queries/0_stateless/00388_enum_with_totals.sql
+%%DATADIR%%-test/queries/0_stateless/00692_if_exception_code.reference
+%%DATADIR%%-test/queries/0_stateless/01018_Distributed__shard_num.reference
+%%DATADIR%%-test/queries/0_stateless/01648_mutations_and_escaping.reference
+%%DATADIR%%-test/queries/0_stateless/01610_client_spawn_editor_open.editor
+%%DATADIR%%-test/queries/0_stateless/01048_window_view_parser.sql
+%%DATADIR%%-test/queries/0_stateless/02149_schema_inference_create_table_syntax.reference
+%%DATADIR%%-test/queries/0_stateless/00573_shard_aggregation_by_empty_set.reference
+%%DATADIR%%-test/queries/0_stateless/00468_array_join_multiple_arrays_and_use_original_column.sql
+%%DATADIR%%-test/queries/0_stateless/01127_month_partitioning_consistency_select.sql
+%%DATADIR%%-test/queries/0_stateless/01815_with_mergeable_state_after_aggregation_and_limit.reference
+%%DATADIR%%-test/queries/0_stateless/00500_point_in_polygon_2d_const.sql
+%%DATADIR%%-test/queries/0_stateless/02140_clickhouse_local_queries_file_table.sh
+%%DATADIR%%-test/queries/0_stateless/01491_nested_multiline_comments.reference
+%%DATADIR%%-test/queries/0_stateless/02021_create_database_with_comment.reference
+%%DATADIR%%-test/queries/0_stateless/01012_select_limit_x_0.sql
+%%DATADIR%%-test/queries/0_stateless/00169_join_constant_keys.sql
+%%DATADIR%%-test/queries/0_stateless/01552_dict_fixedstring.reference
+%%DATADIR%%-test/queries/0_stateless/00194_identity.reference
+%%DATADIR%%-test/queries/0_stateless/00411_merge_tree_where_const_in_set.reference
+%%DATADIR%%-test/queries/0_stateless/00113_shard_group_array.sql
+%%DATADIR%%-test/queries/0_stateless/02023_transform_or_to_in.sql
+%%DATADIR%%-test/queries/0_stateless/01532_clickhouse_local_tmp_folder.reference
+%%DATADIR%%-test/queries/0_stateless/02029_test_options_requests.sh
+%%DATADIR%%-test/queries/0_stateless/01268_mv_scalars.sql
+%%DATADIR%%-test/queries/0_stateless/00617_array_in.reference
+%%DATADIR%%-test/queries/0_stateless/00575_merge_and_index_with_function_in_in.sql
+%%DATADIR%%-test/queries/0_stateless/01141_join_get_negative.sql
+%%DATADIR%%-test/queries/0_stateless/01854_HTTP_dict_decompression.python
+%%DATADIR%%-test/queries/0_stateless/01016_simhash_minhash.reference
+%%DATADIR%%-test/queries/0_stateless/00721_force_by_identical_result_after_merge_zookeeper_long.reference
+%%DATADIR%%-test/queries/0_stateless/01603_rename_overwrite_bug.reference
+%%DATADIR%%-test/queries/0_stateless/01062_pm_multiple_all_join_same_value.reference
+%%DATADIR%%-test/queries/0_stateless/02047_alias_for_table_and_database_name.reference
+%%DATADIR%%-test/queries/0_stateless/01018_Distributed__shard_num.sql
+%%DATADIR%%-test/queries/0_stateless/01576_alter_low_cardinality_and_select.reference
 %%DATADIR%%-test/queries/0_stateless/00389_concat_operator.reference
-%%DATADIR%%-test/queries/0_stateless/00389_concat_operator.sql
-%%DATADIR%%-test/queries/0_stateless/00390_array_sort.reference
-%%DATADIR%%-test/queries/0_stateless/00390_array_sort.sql
-%%DATADIR%%-test/queries/0_stateless/00392_enum_nested_alter.reference
-%%DATADIR%%-test/queries/0_stateless/00392_enum_nested_alter.sql
-%%DATADIR%%-test/queries/0_stateless/00393_if_with_constant_condition.reference
-%%DATADIR%%-test/queries/0_stateless/00393_if_with_constant_condition.sql
-%%DATADIR%%-test/queries/0_stateless/00394_new_nested_column_keeps_offsets.reference
-%%DATADIR%%-test/queries/0_stateless/00394_new_nested_column_keeps_offsets.sql
-%%DATADIR%%-test/queries/0_stateless/00394_replaceall_vector_fixed.reference
-%%DATADIR%%-test/queries/0_stateless/00394_replaceall_vector_fixed.sql
-%%DATADIR%%-test/queries/0_stateless/00395_nullable.reference
-%%DATADIR%%-test/queries/0_stateless/00395_nullable.sql
-%%DATADIR%%-test/queries/0_stateless/00396_uuid.reference
-%%DATADIR%%-test/queries/0_stateless/00396_uuid.sql
-%%DATADIR%%-test/queries/0_stateless/00397_tsv_format_synonym.reference
-%%DATADIR%%-test/queries/0_stateless/00397_tsv_format_synonym.sql
-%%DATADIR%%-test/queries/0_stateless/00398_url_functions.reference
-%%DATADIR%%-test/queries/0_stateless/00398_url_functions.sql
-%%DATADIR%%-test/queries/0_stateless/00399_group_uniq_array_date_datetime.reference
-%%DATADIR%%-test/queries/0_stateless/00399_group_uniq_array_date_datetime.sql
-%%DATADIR%%-test/queries/0_stateless/00400_client_external_options.reference
-%%DATADIR%%-test/queries/0_stateless/00400_client_external_options.sh
-%%DATADIR%%-test/queries/0_stateless/00401_merge_and_stripelog.reference
-%%DATADIR%%-test/queries/0_stateless/00401_merge_and_stripelog.sql
-%%DATADIR%%-test/queries/0_stateless/00402_nan_and_extremes.reference
-%%DATADIR%%-test/queries/0_stateless/00402_nan_and_extremes.sql
+%%DATADIR%%-test/queries/0_stateless/01557_field_infinite_convert_to_number.reference
+%%DATADIR%%-test/queries/0_stateless/01070_template_empty_file.sql
+%%DATADIR%%-test/queries/0_stateless/01143_trivial_count_with_join.reference
+%%DATADIR%%-test/queries/0_stateless/02158_explain_ast_alter_commands.reference
+%%DATADIR%%-test/queries/0_stateless/01495_subqueries_in_with_statement_4.reference
+%%DATADIR%%-test/queries/0_stateless/01470_explain.reference
+%%DATADIR%%-test/queries/0_stateless/01302_aggregate_state_exception_memory_leak.sh
+%%DATADIR%%-test/queries/0_stateless/01340_datetime64_fpe.reference
+%%DATADIR%%-test/queries/0_stateless/01602_insert_into_table_function_cluster.sql
+%%DATADIR%%-test/queries/0_stateless/00079_defaulted_columns.sql
+%%DATADIR%%-test/queries/0_stateless/01187_set_profile_as_setting.reference
+%%DATADIR%%-test/queries/0_stateless/01045_order_by_pk_special_storages.reference
+%%DATADIR%%-test/queries/0_stateless/00804_test_delta_codec_compression.reference
+%%DATADIR%%-test/queries/0_stateless/00096_aggregation_min_if.sql
+%%DATADIR%%-test/queries/0_stateless/01746_lc_values_format_bug.sql
+%%DATADIR%%-test/queries/0_stateless/00702_where_with_quailified_names.sql
+%%DATADIR%%-test/queries/0_stateless/00632_aggregation_window_funnel.reference
+%%DATADIR%%-test/queries/0_stateless/00145_empty_likes.sql
+%%DATADIR%%-test/queries/0_stateless/00586_removing_unused_columns_from_subquery.reference
 %%DATADIR%%-test/queries/0_stateless/00403_to_start_of_day.reference
-%%DATADIR%%-test/queries/0_stateless/00403_to_start_of_day.sql
-%%DATADIR%%-test/queries/0_stateless/00404_null_literal.reference
-%%DATADIR%%-test/queries/0_stateless/00404_null_literal.sql
-%%DATADIR%%-test/queries/0_stateless/00405_PrettyCompactMonoBlock.reference
-%%DATADIR%%-test/queries/0_stateless/00405_PrettyCompactMonoBlock.sh
-%%DATADIR%%-test/queries/0_stateless/00405_pretty_formats.reference
-%%DATADIR%%-test/queries/0_stateless/00405_pretty_formats.sql
-%%DATADIR%%-test/queries/0_stateless/00406_tuples_with_nulls.reference
-%%DATADIR%%-test/queries/0_stateless/00406_tuples_with_nulls.sql
-%%DATADIR%%-test/queries/0_stateless/00407_parsing_nulls.reference
-%%DATADIR%%-test/queries/0_stateless/00407_parsing_nulls.sh
-%%DATADIR%%-test/queries/0_stateless/00408_http_keep_alive.reference
-%%DATADIR%%-test/queries/0_stateless/00408_http_keep_alive.sh
-%%DATADIR%%-test/queries/0_stateless/00409_shard_limit_by.reference
-%%DATADIR%%-test/queries/0_stateless/00409_shard_limit_by.sql
-%%DATADIR%%-test/queries/0_stateless/00410_aggregation_combinators_with_arenas.reference
-%%DATADIR%%-test/queries/0_stateless/00410_aggregation_combinators_with_arenas.sql
-%%DATADIR%%-test/queries/0_stateless/00411_long_accurate_number_comparison.python
-%%DATADIR%%-test/queries/0_stateless/00411_long_accurate_number_comparison_float.reference
-%%DATADIR%%-test/queries/0_stateless/00411_long_accurate_number_comparison_float.sql
-%%DATADIR%%-test/queries/0_stateless/00411_long_accurate_number_comparison_int1.reference
-%%DATADIR%%-test/queries/0_stateless/00411_long_accurate_number_comparison_int1.sh
-%%DATADIR%%-test/queries/0_stateless/00411_long_accurate_number_comparison_int2.reference
-%%DATADIR%%-test/queries/0_stateless/00411_long_accurate_number_comparison_int2.sh
-%%DATADIR%%-test/queries/0_stateless/00411_long_accurate_number_comparison_int3.reference
-%%DATADIR%%-test/queries/0_stateless/00411_long_accurate_number_comparison_int3.sh
-%%DATADIR%%-test/queries/0_stateless/00411_long_accurate_number_comparison_int4.reference
-%%DATADIR%%-test/queries/0_stateless/00411_long_accurate_number_comparison_int4.sh
-%%DATADIR%%-test/queries/0_stateless/00411_merge_tree_where_const_in_set.reference
-%%DATADIR%%-test/queries/0_stateless/00411_merge_tree_where_const_in_set.sql
-%%DATADIR%%-test/queries/0_stateless/00412_logical_expressions_optimizer.reference
-%%DATADIR%%-test/queries/0_stateless/00412_logical_expressions_optimizer.sql
-%%DATADIR%%-test/queries/0_stateless/00413_distinct.reference
-%%DATADIR%%-test/queries/0_stateless/00413_distinct.sql
-%%DATADIR%%-test/queries/0_stateless/00413_least_greatest_new_behavior.reference
-%%DATADIR%%-test/queries/0_stateless/00413_least_greatest_new_behavior.sql
-%%DATADIR%%-test/queries/0_stateless/00414_time_zones_direct_conversion.reference
-%%DATADIR%%-test/queries/0_stateless/00414_time_zones_direct_conversion.sql
-%%DATADIR%%-test/queries/0_stateless/00415_into_outfile.reference
-%%DATADIR%%-test/queries/0_stateless/00415_into_outfile.sh
-%%DATADIR%%-test/queries/0_stateless/00416_pocopatch_progress_in_http_headers.reference
-%%DATADIR%%-test/queries/0_stateless/00416_pocopatch_progress_in_http_headers.sh
-%%DATADIR%%-test/queries/0_stateless/00417_kill_query.reference
-%%DATADIR%%-test/queries/0_stateless/00417_kill_query.sh
-%%DATADIR%%-test/queries/0_stateless/00417_system_build_options.reference
-%%DATADIR%%-test/queries/0_stateless/00417_system_build_options.sh
-%%DATADIR%%-test/queries/0_stateless/00418_input_format_allow_errors.reference
-%%DATADIR%%-test/queries/0_stateless/00418_input_format_allow_errors.sh
-%%DATADIR%%-test/queries/0_stateless/00419_show_sql_queries.reference
-%%DATADIR%%-test/queries/0_stateless/00419_show_sql_queries.sh
-%%DATADIR%%-test/queries/0_stateless/00420_null_in_scalar_subqueries.reference
-%%DATADIR%%-test/queries/0_stateless/00420_null_in_scalar_subqueries.sql
-%%DATADIR%%-test/queries/0_stateless/00421_storage_merge__table_index.reference
-%%DATADIR%%-test/queries/0_stateless/00421_storage_merge__table_index.sh
-%%DATADIR%%-test/queries/0_stateless/00422_hash_function_constexpr.reference
-%%DATADIR%%-test/queries/0_stateless/00422_hash_function_constexpr.sql
-%%DATADIR%%-test/queries/0_stateless/00423_storage_log_single_thread.reference
-%%DATADIR%%-test/queries/0_stateless/00423_storage_log_single_thread.sql
-%%DATADIR%%-test/queries/0_stateless/00424_shard_aggregate_functions_of_nullable.reference
-%%DATADIR%%-test/queries/0_stateless/00424_shard_aggregate_functions_of_nullable.sql
-%%DATADIR%%-test/queries/0_stateless/00425_count_nullable.reference
-%%DATADIR%%-test/queries/0_stateless/00425_count_nullable.sql
-%%DATADIR%%-test/queries/0_stateless/00426_nulls_sorting.reference
-%%DATADIR%%-test/queries/0_stateless/00426_nulls_sorting.sql
+%%DATADIR%%-test/queries/0_stateless/02111_modify_table_comment.sql
+%%DATADIR%%-test/queries/0_stateless/01546_log_queries_min_query_duration_ms.sql
+%%DATADIR%%-test/queries/0_stateless/01135_default_and_alter_zookeeper.sql
+%%DATADIR%%-test/queries/0_stateless/00920_multiply_aggregate_states_constants.sql
+%%DATADIR%%-test/queries/0_stateless/00526_array_join_with_arrays_of_nullable.reference
+%%DATADIR%%-test/queries/0_stateless/00679_replace_asterisk.sql
+%%DATADIR%%-test/queries/0_stateless/00348_tuples.reference
+%%DATADIR%%-test/queries/0_stateless/00636_partition_key_parts_pruning.sh
+%%DATADIR%%-test/queries/0_stateless/01753_mutate_table_predicated_with_table.reference
+%%DATADIR%%-test/queries/0_stateless/01343_min_bytes_to_use_mmap_io.sql
+%%DATADIR%%-test/queries/0_stateless/02012_get_server_port.sql
+%%DATADIR%%-test/queries/0_stateless/01783_http_chunk_size.sh
+%%DATADIR%%-test/queries/0_stateless/01706_optimize_normalize_count_variants.reference
+%%DATADIR%%-test/queries/0_stateless/01054_cache_dictionary_overflow_cell.sql
+%%DATADIR%%-test/queries/0_stateless/01055_minmax_index_compact_parts.sh
+%%DATADIR%%-test/queries/0_stateless/01231_log_queries_min_type.reference
+%%DATADIR%%-test/queries/0_stateless/01030_final_mark_empty_primary_key.reference
+%%DATADIR%%-test/queries/0_stateless/00157_aliases_and_lambda_formal_parameters.sql
+%%DATADIR%%-test/queries/0_stateless/02111_global_context_temporary_tables.reference
+%%DATADIR%%-test/queries/0_stateless/01601_temporary_table_session_scope.reference
+%%DATADIR%%-test/queries/0_stateless/01659_array_aggregation_ubsan.sql
+%%DATADIR%%-test/queries/0_stateless/01457_order_by_nulls_first.sql
+%%DATADIR%%-test/queries/0_stateless/01679_incorrect_data_on_insert_collapsing.sh
+%%DATADIR%%-test/queries/0_stateless/00604_shard_remote_and_columns_with_defaults.reference
+%%DATADIR%%-test/queries/0_stateless/01353_nullable_tuple.sql
+%%DATADIR%%-test/queries/0_stateless/00975_values_list.sql
+%%DATADIR%%-test/queries/0_stateless/00190_non_constant_array_of_constant_data.reference
+%%DATADIR%%-test/queries/0_stateless/01130_in_memory_parts_partitons.sql
+%%DATADIR%%-test/queries/0_stateless/01670_dictionary_create_key_expression.reference
+%%DATADIR%%-test/queries/0_stateless/00218_like_regexp_newline.sql
+%%DATADIR%%-test/queries/0_stateless/01762_deltasumtimestamp.sql
+%%DATADIR%%-test/queries/0_stateless/01720_country_intersection.sh
+%%DATADIR%%-test/queries/0_stateless/00676_group_by_in.sql
+%%DATADIR%%-test/queries/0_stateless/00915_tuple_orantius.sql
+%%DATADIR%%-test/queries/0_stateless/01155_old_mutation_parts_to_do.sh
+%%DATADIR%%-test/queries/0_stateless/01543_parse_datetime_besteffort_or_null_empty_string.reference
+%%DATADIR%%-test/queries/0_stateless/02022_storage_filelog_one_file.reference
+%%DATADIR%%-test/queries/0_stateless/data_arrow/test.arrow
+%%DATADIR%%-test/queries/0_stateless/00212_long_shard_aggregate_function_uniq.sql
 %%DATADIR%%-test/queries/0_stateless/00427_alter_primary_key.reference
-%%DATADIR%%-test/queries/0_stateless/00427_alter_primary_key.sh
-%%DATADIR%%-test/queries/0_stateless/00429_long_http_bufferization.reference
-%%DATADIR%%-test/queries/0_stateless/00429_long_http_bufferization.sh
-%%DATADIR%%-test/queries/0_stateless/00429_point_in_ellipses.reference
-%%DATADIR%%-test/queries/0_stateless/00429_point_in_ellipses.sql
-%%DATADIR%%-test/queries/0_stateless/00430_https_server.reference
-%%DATADIR%%-test/queries/0_stateless/00430_https_server.sh
-%%DATADIR%%-test/queries/0_stateless/00431_if_nulls.reference
-%%DATADIR%%-test/queries/0_stateless/00431_if_nulls.sql
-%%DATADIR%%-test/queries/0_stateless/00432_aggregate_function_scalars_and_constants.reference
-%%DATADIR%%-test/queries/0_stateless/00432_aggregate_function_scalars_and_constants.sql
-%%DATADIR%%-test/queries/0_stateless/00433_ifnull.reference
-%%DATADIR%%-test/queries/0_stateless/00433_ifnull.sql
-%%DATADIR%%-test/queries/0_stateless/00434_tonullable.reference
-%%DATADIR%%-test/queries/0_stateless/00434_tonullable.sql
-%%DATADIR%%-test/queries/0_stateless/00435_coalesce.reference
-%%DATADIR%%-test/queries/0_stateless/00435_coalesce.sql
-%%DATADIR%%-test/queries/0_stateless/00436_convert_charset.reference
-%%DATADIR%%-test/queries/0_stateless/00436_convert_charset.sql
-%%DATADIR%%-test/queries/0_stateless/00436_fixed_string_16_comparisons.reference
-%%DATADIR%%-test/queries/0_stateless/00436_fixed_string_16_comparisons.sql
-%%DATADIR%%-test/queries/0_stateless/00437_nulls_first_last.reference
-%%DATADIR%%-test/queries/0_stateless/00437_nulls_first_last.sql
-%%DATADIR%%-test/queries/0_stateless/00438_bit_rotate.reference
-%%DATADIR%%-test/queries/0_stateless/00438_bit_rotate.sql
-%%DATADIR%%-test/queries/0_stateless/00439_fixed_string_filter.reference
-%%DATADIR%%-test/queries/0_stateless/00439_fixed_string_filter.sql
-%%DATADIR%%-test/queries/0_stateless/00440_nulls_merge_tree.reference
-%%DATADIR%%-test/queries/0_stateless/00440_nulls_merge_tree.sql
-%%DATADIR%%-test/queries/0_stateless/00441_nulls_in.reference
-%%DATADIR%%-test/queries/0_stateless/00441_nulls_in.sql
-%%DATADIR%%-test/queries/0_stateless/00442_filter_by_nullable.reference
-%%DATADIR%%-test/queries/0_stateless/00442_filter_by_nullable.sql
-%%DATADIR%%-test/queries/0_stateless/00443_optimize_final_vertical_merge.reference
-%%DATADIR%%-test/queries/0_stateless/00443_optimize_final_vertical_merge.sh
-%%DATADIR%%-test/queries/0_stateless/00443_preferred_block_size_bytes.reference
-%%DATADIR%%-test/queries/0_stateless/00443_preferred_block_size_bytes.sh
-%%DATADIR%%-test/queries/0_stateless/00444_join_use_nulls.reference
-%%DATADIR%%-test/queries/0_stateless/00444_join_use_nulls.sql
-%%DATADIR%%-test/queries/0_stateless/00445_join_nullable_keys.reference
-%%DATADIR%%-test/queries/0_stateless/00445_join_nullable_keys.sql
-%%DATADIR%%-test/queries/0_stateless/00446_clear_column_in_partition_concurrent_zookeeper.reference
-%%DATADIR%%-test/queries/0_stateless/00446_clear_column_in_partition_concurrent_zookeeper.sh
-%%DATADIR%%-test/queries/0_stateless/00446_clear_column_in_partition_zookeeper.reference
-%%DATADIR%%-test/queries/0_stateless/00446_clear_column_in_partition_zookeeper.sql
-%%DATADIR%%-test/queries/0_stateless/00447_foreach_modifier.reference
-%%DATADIR%%-test/queries/0_stateless/00447_foreach_modifier.sql
-%%DATADIR%%-test/queries/0_stateless/00448_replicate_nullable_tuple_generic.reference
-%%DATADIR%%-test/queries/0_stateless/00448_replicate_nullable_tuple_generic.sql
-%%DATADIR%%-test/queries/0_stateless/00448_to_string_cut_to_zero.reference
-%%DATADIR%%-test/queries/0_stateless/00448_to_string_cut_to_zero.sql
-%%DATADIR%%-test/queries/0_stateless/00449_filter_array_nullable_tuple.reference
-%%DATADIR%%-test/queries/0_stateless/00449_filter_array_nullable_tuple.sql
-%%DATADIR%%-test/queries/0_stateless/00450_higher_order_and_nullable.reference
-%%DATADIR%%-test/queries/0_stateless/00450_higher_order_and_nullable.sql
-%%DATADIR%%-test/queries/0_stateless/00451_left_array_join_and_constants.reference
-%%DATADIR%%-test/queries/0_stateless/00451_left_array_join_and_constants.sql
-%%DATADIR%%-test/queries/0_stateless/00452_left_array_join_and_nullable.reference
-%%DATADIR%%-test/queries/0_stateless/00452_left_array_join_and_nullable.sql
-%%DATADIR%%-test/queries/0_stateless/00453_cast_enum.reference
-%%DATADIR%%-test/queries/0_stateless/00453_cast_enum.sql
-%%DATADIR%%-test/queries/0_stateless/00453_top_k.reference
-%%DATADIR%%-test/queries/0_stateless/00453_top_k.sql
-%%DATADIR%%-test/queries/0_stateless/00456_alter_nullable.reference
-%%DATADIR%%-test/queries/0_stateless/00456_alter_nullable.sql
-%%DATADIR%%-test/queries/0_stateless/00457_log_tinylog_stripelog_nullable.reference
-%%DATADIR%%-test/queries/0_stateless/00457_log_tinylog_stripelog_nullable.sql
-%%DATADIR%%-test/queries/0_stateless/00458_merge_type_cast.reference
-%%DATADIR%%-test/queries/0_stateless/00458_merge_type_cast.sql
-%%DATADIR%%-test/queries/0_stateless/00459_group_array_insert_at.reference
-%%DATADIR%%-test/queries/0_stateless/00459_group_array_insert_at.sql
-%%DATADIR%%-test/queries/0_stateless/00460_vertical_and_totals_extremes.reference
+%%DATADIR%%-test/queries/0_stateless/00024_unused_array_join_in_subquery.reference
+%%DATADIR%%-test/queries/0_stateless/00916_join_using_duplicate_columns.reference
+%%DATADIR%%-test/queries/0_stateless/01548_query_log_query_execution_ms.sh
+%%DATADIR%%-test/queries/0_stateless/00379_system_processes_port.sh
+%%DATADIR%%-test/queries/0_stateless/01116_cross_count_asterisks.sql
+%%DATADIR%%-test/queries/0_stateless/00182_functions_higher_order_and_consts.sql
+%%DATADIR%%-test/queries/0_stateless/01662_test_toDayOfMonth_mysql_compatibility.reference
+%%DATADIR%%-test/queries/0_stateless/00205_scalar_subqueries.sql
+%%DATADIR%%-test/queries/0_stateless/00409_shard_limit_by.reference
+%%DATADIR%%-test/queries/0_stateless/01949_heredoc_unfinished.reference
+%%DATADIR%%-test/queries/0_stateless/02118_deserialize_whole_text.sh
+%%DATADIR%%-test/queries/0_stateless/00763_long_lock_buffer_alter_destination_table.sh
+%%DATADIR%%-test/queries/0_stateless/02125_low_cardinality_int256.reference
+%%DATADIR%%-test/queries/0_stateless/00874_issue_3495.reference
+%%DATADIR%%-test/queries/0_stateless/00123_shard_unmerged_result_when_max_distributed_connections_is_one.reference
+%%DATADIR%%-test/queries/0_stateless/00650_csv_with_specified_quote_rule.sh
+%%DATADIR%%-test/queries/0_stateless/00725_memory_tracking.reference
+%%DATADIR%%-test/queries/0_stateless/01033_substr_negative_size_arg.sql
+%%DATADIR%%-test/queries/0_stateless/02133_distributed_queries_formatting.reference
+%%DATADIR%%-test/queries/0_stateless/01010_pmj_one_row_blocks.sql
+%%DATADIR%%-test/queries/0_stateless/01268_data_numeric_parameters.reference
+%%DATADIR%%-test/queries/0_stateless/01018_dictionaries_from_dictionaries.sql
+%%DATADIR%%-test/queries/0_stateless/02020_alter_table_modify_comment.reference
+%%DATADIR%%-test/queries/0_stateless/00098_9_union_all.sql
+%%DATADIR%%-test/queries/0_stateless/01639_distributed_sync_insert_zero_rows.sql
+%%DATADIR%%-test/queries/0_stateless/01323_redundant_functions_in_order_by.sql
+%%DATADIR%%-test/queries/0_stateless/01684_geohash_ubsan.sql
+%%DATADIR%%-test/queries/0_stateless/01440_to_date_monotonicity.reference
+%%DATADIR%%-test/queries/0_stateless/02099_sql_user_defined_functions_lambda.sql
+%%DATADIR%%-test/queries/0_stateless/01921_concurrent_ttl_and_normal_merges_zookeeper_long.reference
+%%DATADIR%%-test/queries/0_stateless/01582_deterministic_function_with_predicate.reference
+%%DATADIR%%-test/queries/0_stateless/01155_rename_move_materialized_view.sql
+%%DATADIR%%-test/queries/0_stateless/01683_codec_encrypted.sql
+%%DATADIR%%-test/queries/0_stateless/01264_nested_baloo_bear.sql
+%%DATADIR%%-test/queries/0_stateless/01948_group_bitmap_and_or_xor_fix.reference
+%%DATADIR%%-test/queries/0_stateless/01130_in_memory_parts_default.sql
+%%DATADIR%%-test/queries/0_stateless/01507_clickhouse_server_start_with_embedded_config.sh
+%%DATADIR%%-test/queries/0_stateless/01473_event_time_microseconds.sql
+%%DATADIR%%-test/queries/0_stateless/01288_shard_max_network_bandwidth.reference
+%%DATADIR%%-test/queries/0_stateless/01508_format_regexp_raw.sh
+%%DATADIR%%-test/queries/0_stateless/01068_parens.reference
+%%DATADIR%%-test/queries/0_stateless/01372_remote_table_function_empty_table.reference
+%%DATADIR%%-test/queries/0_stateless/00725_join_on_bug_3.sql
+%%DATADIR%%-test/queries/0_stateless/00634_performance_introspection_and_logging.sh
+%%DATADIR%%-test/queries/0_stateless/01307_multiple_leaders_zookeeper.reference
+%%DATADIR%%-test/queries/0_stateless/01235_live_view_over_distributed.sql
+%%DATADIR%%-test/queries/0_stateless/00571_alter_nullable.sql
+%%DATADIR%%-test/queries/0_stateless/01372_remote_table_function_empty_table.sql
+%%DATADIR%%-test/queries/0_stateless/00205_emptyscalar_subquery_type_mismatch_bug.sql
+%%DATADIR%%-test/queries/0_stateless/01076_array_join_prewhere_const_folding.sql
+%%DATADIR%%-test/queries/0_stateless/01517_select_final_distributed.sql
+%%DATADIR%%-test/queries/0_stateless/01074_h3_range_check.reference
+%%DATADIR%%-test/queries/0_stateless/02157_readonly_system_suspend.sh
+%%DATADIR%%-test/queries/0_stateless/00848_join_use_nulls_segfault.reference
+%%DATADIR%%-test/queries/0_stateless/01502_long_log_tinylog_deadlock_race.sh
+%%DATADIR%%-test/queries/0_stateless/00779_all_right_join_max_block_size.sql
+%%DATADIR%%-test/queries/0_stateless/01093_cyclic_defaults_filimonov.sql
+%%DATADIR%%-test/queries/0_stateless/00817_with_simple.reference
+%%DATADIR%%-test/queries/0_stateless/01925_merge_prewhere_table.sql
+%%DATADIR%%-test/queries/0_stateless/01047_nullable_rand.reference
+%%DATADIR%%-test/queries/0_stateless/01542_collate_in_array.sql
+%%DATADIR%%-test/queries/0_stateless/01810_max_part_removal_threads_long.reference
+%%DATADIR%%-test/queries/0_stateless/01893_jit_aggregation_function_min_long.sql
+%%DATADIR%%-test/queries/0_stateless/01455_optimize_trivial_insert_select.reference
+%%DATADIR%%-test/queries/0_stateless/00732_quorum_insert_lost_part_and_alive_part_zookeeper_long.sql
+%%DATADIR%%-test/queries/0_stateless/01009_insert_select_nicelulu.reference
+%%DATADIR%%-test/queries/0_stateless/00958_format_of_tuple_array_element.sh
+%%DATADIR%%-test/queries/0_stateless/02009_from_infile.reference
+%%DATADIR%%-test/queries/0_stateless/00511_get_size_of_enum.sql
+%%DATADIR%%-test/queries/0_stateless/00689_join_table_function.sql
+%%DATADIR%%-test/queries/0_stateless/01582_distinct_optimization.reference
+%%DATADIR%%-test/queries/0_stateless/00908_bloom_filter_index.reference
 %%DATADIR%%-test/queries/0_stateless/00460_vertical_and_totals_extremes.sql
-%%DATADIR%%-test/queries/0_stateless/00461_default_value_of_argument_type.reference
-%%DATADIR%%-test/queries/0_stateless/00461_default_value_of_argument_type.sql
-%%DATADIR%%-test/queries/0_stateless/00462_json_true_false_literals.reference
-%%DATADIR%%-test/queries/0_stateless/00462_json_true_false_literals.sql
-%%DATADIR%%-test/queries/0_stateless/00463_long_sessions_in_http_interface.reference
-%%DATADIR%%-test/queries/0_stateless/00463_long_sessions_in_http_interface.sh
-%%DATADIR%%-test/queries/0_stateless/00464_array_element_out_of_range.reference
-%%DATADIR%%-test/queries/0_stateless/00464_array_element_out_of_range.sql
-%%DATADIR%%-test/queries/0_stateless/00464_sort_all_constant_columns.reference
-%%DATADIR%%-test/queries/0_stateless/00464_sort_all_constant_columns.sql
-%%DATADIR%%-test/queries/0_stateless/00465_nullable_default.reference
-%%DATADIR%%-test/queries/0_stateless/00465_nullable_default.sql
-%%DATADIR%%-test/queries/0_stateless/00466_comments_in_keyword.reference
-%%DATADIR%%-test/queries/0_stateless/00466_comments_in_keyword.sql
-%%DATADIR%%-test/queries/0_stateless/00467_qualified_names.reference
-%%DATADIR%%-test/queries/0_stateless/00467_qualified_names.sql
-%%DATADIR%%-test/queries/0_stateless/00468_array_join_multiple_arrays_and_use_original_column.reference
-%%DATADIR%%-test/queries/0_stateless/00468_array_join_multiple_arrays_and_use_original_column.sql
-%%DATADIR%%-test/queries/0_stateless/00469_comparison_of_strings_containing_null_char.reference
-%%DATADIR%%-test/queries/0_stateless/00469_comparison_of_strings_containing_null_char.sql
-%%DATADIR%%-test/queries/0_stateless/00470_identifiers_in_double_quotes.reference
-%%DATADIR%%-test/queries/0_stateless/00470_identifiers_in_double_quotes.sql
-%%DATADIR%%-test/queries/0_stateless/00471_sql_style_quoting.reference
-%%DATADIR%%-test/queries/0_stateless/00471_sql_style_quoting.sql
-%%DATADIR%%-test/queries/0_stateless/00472_compare_uuid_with_constant_string.reference
-%%DATADIR%%-test/queries/0_stateless/00472_compare_uuid_with_constant_string.sql
-%%DATADIR%%-test/queries/0_stateless/00472_create_view_if_not_exists.reference
-%%DATADIR%%-test/queries/0_stateless/00472_create_view_if_not_exists.sql
-%%DATADIR%%-test/queries/0_stateless/00473_output_format_json_quote_denormals.reference
-%%DATADIR%%-test/queries/0_stateless/00473_output_format_json_quote_denormals.sh
-%%DATADIR%%-test/queries/0_stateless/00474_readonly_settings.reference
-%%DATADIR%%-test/queries/0_stateless/00474_readonly_settings.sh
-%%DATADIR%%-test/queries/0_stateless/00475_in_join_db_table.reference
-%%DATADIR%%-test/queries/0_stateless/00475_in_join_db_table.sql
-%%DATADIR%%-test/queries/0_stateless/00476_pretty_formats_and_widths.reference
-%%DATADIR%%-test/queries/0_stateless/00476_pretty_formats_and_widths.sql
-%%DATADIR%%-test/queries/0_stateless/00477_parsing_data_types.reference
-%%DATADIR%%-test/queries/0_stateless/00477_parsing_data_types.sql
-%%DATADIR%%-test/queries/0_stateless/00479_date_and_datetime_to_number.reference
-%%DATADIR%%-test/queries/0_stateless/00479_date_and_datetime_to_number.sql
-%%DATADIR%%-test/queries/0_stateless/00480_mac_addresses.reference
-%%DATADIR%%-test/queries/0_stateless/00480_mac_addresses.sql
-%%DATADIR%%-test/queries/0_stateless/00481_create_view_for_null.reference
-%%DATADIR%%-test/queries/0_stateless/00481_create_view_for_null.sql
-%%DATADIR%%-test/queries/0_stateless/00481_reading_from_last_granula.reference
-%%DATADIR%%-test/queries/0_stateless/00481_reading_from_last_granula.sql
-%%DATADIR%%-test/queries/0_stateless/00482_subqueries_and_aliases.reference
-%%DATADIR%%-test/queries/0_stateless/00482_subqueries_and_aliases.sql
-%%DATADIR%%-test/queries/0_stateless/00483_cast_syntax.reference
-%%DATADIR%%-test/queries/0_stateless/00483_cast_syntax.sql
-%%DATADIR%%-test/queries/0_stateless/00483_reading_from_array_structure.reference
-%%DATADIR%%-test/queries/0_stateless/00483_reading_from_array_structure.sql
-%%DATADIR%%-test/queries/0_stateless/00484_preferred_max_column_in_block_size_bytes.reference
-%%DATADIR%%-test/queries/0_stateless/00484_preferred_max_column_in_block_size_bytes.sql
-%%DATADIR%%-test/queries/0_stateless/00485_http_insert_format.reference
-%%DATADIR%%-test/queries/0_stateless/00485_http_insert_format.sh
-%%DATADIR%%-test/queries/0_stateless/00486_if_fixed_string.reference
-%%DATADIR%%-test/queries/0_stateless/00486_if_fixed_string.sql
-%%DATADIR%%-test/queries/0_stateless/00487_if_array_fixed_string.reference
-%%DATADIR%%-test/queries/0_stateless/00487_if_array_fixed_string.sql
-%%DATADIR%%-test/queries/0_stateless/00488_non_ascii_column_names.reference
-%%DATADIR%%-test/queries/0_stateless/00488_non_ascii_column_names.sql
-%%DATADIR%%-test/queries/0_stateless/00489_pk_subexpression.reference
-%%DATADIR%%-test/queries/0_stateless/00489_pk_subexpression.sql
-%%DATADIR%%-test/queries/0_stateless/00490_special_line_separators_and_characters_outside_of_bmp.reference
-%%DATADIR%%-test/queries/0_stateless/00490_special_line_separators_and_characters_outside_of_bmp.sql
-%%DATADIR%%-test/queries/0_stateless/00490_with_select.reference
-%%DATADIR%%-test/queries/0_stateless/00490_with_select.sql
-%%DATADIR%%-test/queries/0_stateless/00491_shard_distributed_and_aliases_in_where_having.reference
-%%DATADIR%%-test/queries/0_stateless/00491_shard_distributed_and_aliases_in_where_having.sql
-%%DATADIR%%-test/queries/0_stateless/00492_drop_temporary_table.reference
-%%DATADIR%%-test/queries/0_stateless/00492_drop_temporary_table.sql
-%%DATADIR%%-test/queries/0_stateless/00493_substring_of_fixedstring.reference
-%%DATADIR%%-test/queries/0_stateless/00493_substring_of_fixedstring.sql
-%%DATADIR%%-test/queries/0_stateless/00494_shard_alias_substitution_bug.reference
-%%DATADIR%%-test/queries/0_stateless/00494_shard_alias_substitution_bug.sql
-%%DATADIR%%-test/queries/0_stateless/00495_reading_const_zero_column.reference
-%%DATADIR%%-test/queries/0_stateless/00495_reading_const_zero_column.sql
-%%DATADIR%%-test/queries/0_stateless/00496_substring_negative_offset.reference
-%%DATADIR%%-test/queries/0_stateless/00496_substring_negative_offset.sql
-%%DATADIR%%-test/queries/0_stateless/00497_whitespaces_in_insert.reference
-%%DATADIR%%-test/queries/0_stateless/00497_whitespaces_in_insert.sh
-%%DATADIR%%-test/queries/0_stateless/00498_array_functions_concat_slice_push_pop.reference
-%%DATADIR%%-test/queries/0_stateless/00498_array_functions_concat_slice_push_pop.sql
-%%DATADIR%%-test/queries/0_stateless/00498_bitwise_aggregate_functions.reference
-%%DATADIR%%-test/queries/0_stateless/00498_bitwise_aggregate_functions.sql
-%%DATADIR%%-test/queries/0_stateless/00499_json_enum_insert.reference
-%%DATADIR%%-test/queries/0_stateless/00499_json_enum_insert.sql
-%%DATADIR%%-test/queries/0_stateless/00500_point_in_polygon.reference
-%%DATADIR%%-test/queries/0_stateless/00500_point_in_polygon.sql
-%%DATADIR%%-test/queries/0_stateless/00500_point_in_polygon_2d_const.reference
-%%DATADIR%%-test/queries/0_stateless/00500_point_in_polygon_2d_const.sql
-%%DATADIR%%-test/queries/0_stateless/00500_point_in_polygon_bug.reference
-%%DATADIR%%-test/queries/0_stateless/00500_point_in_polygon_bug.sql
-%%DATADIR%%-test/queries/0_stateless/00500_point_in_polygon_bug_2.reference
-%%DATADIR%%-test/queries/0_stateless/00500_point_in_polygon_bug_2.sql
-%%DATADIR%%-test/queries/0_stateless/00500_point_in_polygon_bug_3_linestring_rotation_precision.reference
-%%DATADIR%%-test/queries/0_stateless/00500_point_in_polygon_bug_3_linestring_rotation_precision.sql
-%%DATADIR%%-test/queries/0_stateless/00500_point_in_polygon_nan.reference
-%%DATADIR%%-test/queries/0_stateless/00500_point_in_polygon_nan.sql
-%%DATADIR%%-test/queries/0_stateless/00500_point_in_polygon_non_const_poly.reference
-%%DATADIR%%-test/queries/0_stateless/00500_point_in_polygon_non_const_poly.sql
-%%DATADIR%%-test/queries/0_stateless/00501_http_head.reference
-%%DATADIR%%-test/queries/0_stateless/00501_http_head.sh
-%%DATADIR%%-test/queries/0_stateless/00502_custom_partitioning_local.reference
-%%DATADIR%%-test/queries/0_stateless/00502_custom_partitioning_local.sql
-%%DATADIR%%-test/queries/0_stateless/00502_custom_partitioning_replicated_zookeeper.reference
-%%DATADIR%%-test/queries/0_stateless/00502_custom_partitioning_replicated_zookeeper.sql
-%%DATADIR%%-test/queries/0_stateless/00502_string_concat_with_array.reference
-%%DATADIR%%-test/queries/0_stateless/00502_string_concat_with_array.sql
-%%DATADIR%%-test/queries/0_stateless/00502_sum_map.reference
-%%DATADIR%%-test/queries/0_stateless/00502_sum_map.sql
-%%DATADIR%%-test/queries/0_stateless/00503_cast_const_nullable.reference
-%%DATADIR%%-test/queries/0_stateless/00503_cast_const_nullable.sql
-%%DATADIR%%-test/queries/0_stateless/00504_insert_miss_columns.reference
-%%DATADIR%%-test/queries/0_stateless/00504_insert_miss_columns.sh
-%%DATADIR%%-test/queries/0_stateless/00504_mergetree_arrays_rw.reference
-%%DATADIR%%-test/queries/0_stateless/00504_mergetree_arrays_rw.sql
-%%DATADIR%%-test/queries/0_stateless/00505_distributed_secure.data
-%%DATADIR%%-test/queries/0_stateless/00505_secure.reference
-%%DATADIR%%-test/queries/0_stateless/00505_secure.sh
-%%DATADIR%%-test/queries/0_stateless/00505_shard_secure.reference
-%%DATADIR%%-test/queries/0_stateless/00505_shard_secure.sh
-%%DATADIR%%-test/queries/0_stateless/00506_shard_global_in_union.reference
-%%DATADIR%%-test/queries/0_stateless/00506_shard_global_in_union.sql
+%%DATADIR%%-test/queries/0_stateless/01358_lc_parquet.sh
+%%DATADIR%%-test/queries/0_stateless/01790_dist_INSERT_block_structure_mismatch_types_and_names.reference
+%%DATADIR%%-test/queries/0_stateless/00955_complex_prepared_statements.reference
+%%DATADIR%%-test/queries/0_stateless/00967_ubsan_bit_test.sql
+%%DATADIR%%-test/queries/0_stateless/01412_row_from_totals.sql
+%%DATADIR%%-test/queries/0_stateless/01051_aggregate_function_crash.reference
+%%DATADIR%%-test/queries/0_stateless/01179_insert_values_semicolon.expect
+%%DATADIR%%-test/queries/0_stateless/01286_constraints_on_default.sql
+%%DATADIR%%-test/queries/0_stateless/00292_parser_tuple_element.reference
+%%DATADIR%%-test/queries/0_stateless/01493_alter_remove_properties_zookeeper.reference
+%%DATADIR%%-test/queries/0_stateless/01882_check_max_parts_to_merge_at_once.sql
+%%DATADIR%%-test/queries/0_stateless/01375_storage_file_tsv_csv_with_names_write_prefix.sh
+%%DATADIR%%-test/queries/0_stateless/01017_bithamming_distance.reference
+%%DATADIR%%-test/queries/0_stateless/01475_read_subcolumns.reference
+%%DATADIR%%-test/queries/0_stateless/00193_parallel_replicas.reference
 %%DATADIR%%-test/queries/0_stateless/00506_union_distributed.reference
-%%DATADIR%%-test/queries/0_stateless/00506_union_distributed.sql
-%%DATADIR%%-test/queries/0_stateless/00507_array_no_params.reference
-%%DATADIR%%-test/queries/0_stateless/00507_array_no_params.sh
-%%DATADIR%%-test/queries/0_stateless/00507_sumwithoverflow.reference
-%%DATADIR%%-test/queries/0_stateless/00507_sumwithoverflow.sql
-%%DATADIR%%-test/queries/0_stateless/00508_materialized_view_to.reference
-%%DATADIR%%-test/queries/0_stateless/00508_materialized_view_to.sql
-%%DATADIR%%-test/queries/0_stateless/00509_extended_storage_definition_syntax_zookeeper.reference
-%%DATADIR%%-test/queries/0_stateless/00509_extended_storage_definition_syntax_zookeeper.sql
-%%DATADIR%%-test/queries/0_stateless/00510_materizlized_view_and_deduplication_zookeeper.reference
-%%DATADIR%%-test/queries/0_stateless/00510_materizlized_view_and_deduplication_zookeeper.sql
-%%DATADIR%%-test/queries/0_stateless/00511_get_size_of_enum.reference
-%%DATADIR%%-test/queries/0_stateless/00511_get_size_of_enum.sql
-%%DATADIR%%-test/queries/0_stateless/00512_fractional_time_zones.reference
-%%DATADIR%%-test/queries/0_stateless/00512_fractional_time_zones.sh
-%%DATADIR%%-test/queries/0_stateless/00513_fractional_time_zones.reference
-%%DATADIR%%-test/queries/0_stateless/00513_fractional_time_zones.sql
-%%DATADIR%%-test/queries/0_stateless/00514_interval_operators.reference
-%%DATADIR%%-test/queries/0_stateless/00514_interval_operators.sql
-%%DATADIR%%-test/queries/0_stateless/00515_enhanced_time_zones.reference
-%%DATADIR%%-test/queries/0_stateless/00515_enhanced_time_zones.sql
-%%DATADIR%%-test/queries/0_stateless/00515_gcd_lcm.reference
-%%DATADIR%%-test/queries/0_stateless/00515_gcd_lcm.sql
-%%DATADIR%%-test/queries/0_stateless/00515_shard_desc_table_functions_and_subqueries.reference
-%%DATADIR%%-test/queries/0_stateless/00515_shard_desc_table_functions_and_subqueries.sql
-%%DATADIR%%-test/queries/0_stateless/00516_deduplication_after_drop_partition_zookeeper.reference
-%%DATADIR%%-test/queries/0_stateless/00516_deduplication_after_drop_partition_zookeeper.sql
-%%DATADIR%%-test/queries/0_stateless/00516_is_inf_nan.reference
-%%DATADIR%%-test/queries/0_stateless/00516_is_inf_nan.sql
-%%DATADIR%%-test/queries/0_stateless/00516_modulo.reference
-%%DATADIR%%-test/queries/0_stateless/00516_modulo.sql
-%%DATADIR%%-test/queries/0_stateless/00517_date_parsing.reference
-%%DATADIR%%-test/queries/0_stateless/00517_date_parsing.sql
-%%DATADIR%%-test/queries/0_stateless/00518_extract_all_and_empty_matches.reference
-%%DATADIR%%-test/queries/0_stateless/00518_extract_all_and_empty_matches.sql
-%%DATADIR%%-test/queries/0_stateless/00519_create_as_select_from_temporary_table.reference
-%%DATADIR%%-test/queries/0_stateless/00519_create_as_select_from_temporary_table.sql
-%%DATADIR%%-test/queries/0_stateless/00520_http_nullable.reference
-%%DATADIR%%-test/queries/0_stateless/00520_http_nullable.sh
-%%DATADIR%%-test/queries/0_stateless/00520_tuple_values_interpreter.reference
-%%DATADIR%%-test/queries/0_stateless/00520_tuple_values_interpreter.sql
-%%DATADIR%%-test/queries/0_stateless/00521_multidimensional.reference
-%%DATADIR%%-test/queries/0_stateless/00521_multidimensional.sql
-%%DATADIR%%-test/queries/0_stateless/00522_multidimensional.reference
-%%DATADIR%%-test/queries/0_stateless/00522_multidimensional.sql
-%%DATADIR%%-test/queries/0_stateless/00523_aggregate_functions_in_group_array.reference
-%%DATADIR%%-test/queries/0_stateless/00523_aggregate_functions_in_group_array.sql
-%%DATADIR%%-test/queries/0_stateless/00524_time_intervals_months_underflow.reference
-%%DATADIR%%-test/queries/0_stateless/00524_time_intervals_months_underflow.sql
-%%DATADIR%%-test/queries/0_stateless/00525_aggregate_functions_of_nullable_that_return_non_nullable.reference
-%%DATADIR%%-test/queries/0_stateless/00525_aggregate_functions_of_nullable_that_return_non_nullable.sql
-%%DATADIR%%-test/queries/0_stateless/00526_array_join_with_arrays_of_nullable.reference
-%%DATADIR%%-test/queries/0_stateless/00526_array_join_with_arrays_of_nullable.sql
-%%DATADIR%%-test/queries/0_stateless/00527_totals_having_nullable.reference
-%%DATADIR%%-test/queries/0_stateless/00527_totals_having_nullable.sql
-%%DATADIR%%-test/queries/0_stateless/00528_const_of_nullable.reference
-%%DATADIR%%-test/queries/0_stateless/00528_const_of_nullable.sql
-%%DATADIR%%-test/queries/0_stateless/00529_orantius.reference
-%%DATADIR%%-test/queries/0_stateless/00529_orantius.sql
-%%DATADIR%%-test/queries/0_stateless/00530_arrays_of_nothing.reference
-%%DATADIR%%-test/queries/0_stateless/00530_arrays_of_nothing.sql
-%%DATADIR%%-test/queries/0_stateless/00531_aggregate_over_nullable.reference
-%%DATADIR%%-test/queries/0_stateless/00531_aggregate_over_nullable.sql
-%%DATADIR%%-test/queries/0_stateless/00531_client_ignore_error.reference
-%%DATADIR%%-test/queries/0_stateless/00531_client_ignore_error.sh
-%%DATADIR%%-test/queries/0_stateless/00532_topk_generic.reference
-%%DATADIR%%-test/queries/0_stateless/00532_topk_generic.sql
-%%DATADIR%%-test/queries/0_stateless/00533_uniq_array.reference
-%%DATADIR%%-test/queries/0_stateless/00533_uniq_array.sql
-%%DATADIR%%-test/queries/0_stateless/00534_client_ignore_error.reference
-%%DATADIR%%-test/queries/0_stateless/00534_client_ignore_error.sh
-%%DATADIR%%-test/queries/0_stateless/00534_exp10.reference
-%%DATADIR%%-test/queries/0_stateless/00534_exp10.sql
-%%DATADIR%%-test/queries/0_stateless/00534_filimonov.data
-%%DATADIR%%-test/queries/0_stateless/00534_filimonov.reference
-%%DATADIR%%-test/queries/0_stateless/00534_filimonov.sh
-%%DATADIR%%-test/queries/0_stateless/00534_functions_bad_arguments.lib
-%%DATADIR%%-test/queries/0_stateless/00534_functions_bad_arguments1.reference
-%%DATADIR%%-test/queries/0_stateless/00534_functions_bad_arguments1.sh
-%%DATADIR%%-test/queries/0_stateless/00534_functions_bad_arguments10.reference
-%%DATADIR%%-test/queries/0_stateless/00534_functions_bad_arguments10.sh
-%%DATADIR%%-test/queries/0_stateless/00534_functions_bad_arguments11.reference
-%%DATADIR%%-test/queries/0_stateless/00534_functions_bad_arguments11.sh
-%%DATADIR%%-test/queries/0_stateless/00534_functions_bad_arguments12.reference
-%%DATADIR%%-test/queries/0_stateless/00534_functions_bad_arguments12.sh
-%%DATADIR%%-test/queries/0_stateless/00534_functions_bad_arguments13.reference
-%%DATADIR%%-test/queries/0_stateless/00534_functions_bad_arguments13.sh
-%%DATADIR%%-test/queries/0_stateless/00534_functions_bad_arguments2.reference
-%%DATADIR%%-test/queries/0_stateless/00534_functions_bad_arguments2.sh
-%%DATADIR%%-test/queries/0_stateless/00534_functions_bad_arguments3.reference
-%%DATADIR%%-test/queries/0_stateless/00534_functions_bad_arguments3.sh
-%%DATADIR%%-test/queries/0_stateless/00534_functions_bad_arguments4_long.reference
-%%DATADIR%%-test/queries/0_stateless/00534_functions_bad_arguments4_long.sh
-%%DATADIR%%-test/queries/0_stateless/00534_functions_bad_arguments5.reference
-%%DATADIR%%-test/queries/0_stateless/00534_functions_bad_arguments5.sh
-%%DATADIR%%-test/queries/0_stateless/00534_functions_bad_arguments6.reference
-%%DATADIR%%-test/queries/0_stateless/00534_functions_bad_arguments6.sh
-%%DATADIR%%-test/queries/0_stateless/00534_functions_bad_arguments7.reference
-%%DATADIR%%-test/queries/0_stateless/00534_functions_bad_arguments7.sh
-%%DATADIR%%-test/queries/0_stateless/00534_functions_bad_arguments8.reference
-%%DATADIR%%-test/queries/0_stateless/00534_functions_bad_arguments8.sh
-%%DATADIR%%-test/queries/0_stateless/00534_functions_bad_arguments9.reference
+%%DATADIR%%-test/queries/0_stateless/01925_merge_prewhere_table.reference
+%%DATADIR%%-test/queries/0_stateless/01117_comma_and_others_join_mix.sql
+%%DATADIR%%-test/queries/0_stateless/01946_tskv.sh
+%%DATADIR%%-test/queries/0_stateless/01063_window_view_event_tumble_to_bounded.sh
+%%DATADIR%%-test/queries/0_stateless/01280_min_map_max_map.reference
+%%DATADIR%%-test/queries/0_stateless/01892_jit_aggregation_function_any_last_long.reference
+%%DATADIR%%-test/queries/0_stateless/01414_low_cardinality_nullable.sql
+%%DATADIR%%-test/queries/0_stateless/00935_to_iso_week_first_year.sql
+%%DATADIR%%-test/queries/0_stateless/00453_top_k.sql
+%%DATADIR%%-test/queries/0_stateless/00098_8_union_all.reference
+%%DATADIR%%-test/queries/0_stateless/02150_replace_regexp_all_empty_match.sql
+%%DATADIR%%-test/queries/0_stateless/01455_shard_leaf_max_rows_bytes_to_read.sql
+%%DATADIR%%-test/queries/0_stateless/00014_select_from_table_with_nested.sql
+%%DATADIR%%-test/queries/0_stateless/00965_send_logs_level_concurrent_queries.reference
+%%DATADIR%%-test/queries/0_stateless/00590_limit_by_column_removal.sql
+%%DATADIR%%-test/queries/0_stateless/00962_live_view_periodic_refresh_and_timeout.reference
+%%DATADIR%%-test/queries/0_stateless/02006_todatetime64_from_string.reference
+%%DATADIR%%-test/queries/0_stateless/00715_fetch_merged_or_mutated_part_zookeeper.sh
+%%DATADIR%%-test/queries/0_stateless/01509_parallel_quorum_insert_no_replicas_long.reference
+%%DATADIR%%-test/queries/0_stateless/00033_fixed_string_to_string.reference
+%%DATADIR%%-test/queries/0_stateless/01605_skip_idx_compact_parts.reference
+%%DATADIR%%-test/queries/0_stateless/01062_window_view_event_hop_watch_asc.py
+%%DATADIR%%-test/queries/0_stateless/01569_query_profiler_big_query_id.sh
+%%DATADIR%%-test/queries/0_stateless/02015_global_in_threads.sh
+%%DATADIR%%-test/queries/0_stateless/01395_limit_more_cases.reference
+%%DATADIR%%-test/queries/0_stateless/02100_low_cardinality_nullable_null_default.reference
+%%DATADIR%%-test/queries/0_stateless/00395_nullable.reference
+%%DATADIR%%-test/queries/0_stateless/01247_optimize_distributed_group_by_sharding_key_dist_on_dist.sql
 %%DATADIR%%-test/queries/0_stateless/00534_functions_bad_arguments9.sh
-%%DATADIR%%-test/queries/0_stateless/00535_parse_float_scientific.reference
-%%DATADIR%%-test/queries/0_stateless/00535_parse_float_scientific.sql
-%%DATADIR%%-test/queries/0_stateless/00536_int_exp.reference
-%%DATADIR%%-test/queries/0_stateless/00536_int_exp.sql
-%%DATADIR%%-test/queries/0_stateless/00537_quarters.reference
-%%DATADIR%%-test/queries/0_stateless/00537_quarters.sql
-%%DATADIR%%-test/queries/0_stateless/00538_datediff.reference
-%%DATADIR%%-test/queries/0_stateless/00538_datediff.sql
+%%DATADIR%%-test/queries/0_stateless/01412_mod_float.sql
+%%DATADIR%%-test/queries/0_stateless/01505_log_distributed_deadlock.sql
+%%DATADIR%%-test/queries/0_stateless/01890_jit_aggregation_function_sum_long.reference
+%%DATADIR%%-test/queries/0_stateless/00147_alter_nested_default.sql
+%%DATADIR%%-test/queries/0_stateless/01631_date_overflow_as_partition_key.reference
+%%DATADIR%%-test/queries/0_stateless/01921_not_chain.reference
+%%DATADIR%%-test/queries/0_stateless/01567_system_processes_current_database.sql
+%%DATADIR%%-test/queries/0_stateless/01059_storage_file_compression.reference
+%%DATADIR%%-test/queries/0_stateless/00933_ttl_simple.sql
+%%DATADIR%%-test/queries/0_stateless/00387_use_client_time_zone.reference
+%%DATADIR%%-test/queries/0_stateless/01049_join_low_card_crash.sql
+%%DATADIR%%-test/queries/0_stateless/01428_h3_range_check.sql
+%%DATADIR%%-test/queries/0_stateless/01300_group_by_other_keys.sql
+%%DATADIR%%-test/queries/0_stateless/01550_mutation_subquery.reference
+%%DATADIR%%-test/queries/0_stateless/01622_constraints_where_optimization.reference
+%%DATADIR%%-test/queries/0_stateless/01786_group_by_pk_many_streams.reference
+%%DATADIR%%-test/queries/0_stateless/00732_quorum_insert_select_with_old_data_and_without_quorum_zookeeper_long.sql
+%%DATADIR%%-test/queries/0_stateless/01357_result_rows.reference
+%%DATADIR%%-test/queries/0_stateless/00155_long_merges.sh
+%%DATADIR%%-test/queries/0_stateless/01274_generate_random_nested.sh
+%%DATADIR%%-test/queries/0_stateless/01947_multiple_pipe_read.sh
+%%DATADIR%%-test/queries/0_stateless/02015_async_inserts_3.sh
+%%DATADIR%%-test/queries/0_stateless/01699_timezoneOffset.reference
+%%DATADIR%%-test/queries/0_stateless/01253_subquery_in_aggregate_function_JustStranger.reference
+%%DATADIR%%-test/queries/0_stateless/01236_graphite_mt.sql
+%%DATADIR%%-test/queries/0_stateless/01312_case_insensitive_regexp.reference
+%%DATADIR%%-test/queries/0_stateless/00017_in_subquery_with_empty_result.reference
+%%DATADIR%%-test/queries/0_stateless/00449_filter_array_nullable_tuple.sql
+%%DATADIR%%-test/queries/0_stateless/01881_total_bytes_storage_buffer.sql
+%%DATADIR%%-test/queries/0_stateless/00734_timeslot.reference
+%%DATADIR%%-test/queries/0_stateless/02020_exponential_smoothing.sql
+%%DATADIR%%-test/queries/0_stateless/01530_drop_database_atomic_sync.sql
+%%DATADIR%%-test/queries/0_stateless/01560_crash_in_agg_empty_arglist.sql
+%%DATADIR%%-test/queries/0_stateless/01210_drop_view.reference
+%%DATADIR%%-test/queries/0_stateless/02012_zookeeper_changed_enum_type.sql
+%%DATADIR%%-test/queries/0_stateless/00825_protobuf_format_persons.sh
+%%DATADIR%%-test/queries/0_stateless/01823_explain_json.sh
+%%DATADIR%%-test/queries/0_stateless/00840_top_k_weighted.sql
+%%DATADIR%%-test/queries/0_stateless/01163_search_case_insensetive_utf8.sql
 %%DATADIR%%-test/queries/0_stateless/00539_functions_for_working_with_json.reference
-%%DATADIR%%-test/queries/0_stateless/00539_functions_for_working_with_json.sql
-%%DATADIR%%-test/queries/0_stateless/00540_bad_data_types.reference
-%%DATADIR%%-test/queries/0_stateless/00540_bad_data_types.sh
-%%DATADIR%%-test/queries/0_stateless/00541_kahan_sum.reference
-%%DATADIR%%-test/queries/0_stateless/00541_kahan_sum.sql
-%%DATADIR%%-test/queries/0_stateless/00541_to_start_of_fifteen_minutes.reference
-%%DATADIR%%-test/queries/0_stateless/00541_to_start_of_fifteen_minutes.sql
-%%DATADIR%%-test/queries/0_stateless/00542_access_to_temporary_table_in_readonly_mode.reference
-%%DATADIR%%-test/queries/0_stateless/00542_access_to_temporary_table_in_readonly_mode.sql
-%%DATADIR%%-test/queries/0_stateless/00542_materialized_view_and_time_zone_tag.reference
-%%DATADIR%%-test/queries/0_stateless/00542_materialized_view_and_time_zone_tag.sql
-%%DATADIR%%-test/queries/0_stateless/00543_access_to_temporary_table_in_readonly_mode.reference
-%%DATADIR%%-test/queries/0_stateless/00543_access_to_temporary_table_in_readonly_mode.sh
-%%DATADIR%%-test/queries/0_stateless/00543_null_and_prewhere.reference
-%%DATADIR%%-test/queries/0_stateless/00543_null_and_prewhere.sql
-%%DATADIR%%-test/queries/0_stateless/00544_agg_foreach_of_two_arg.reference
-%%DATADIR%%-test/queries/0_stateless/00544_agg_foreach_of_two_arg.sql
-%%DATADIR%%-test/queries/0_stateless/00544_insert_with_select.reference
-%%DATADIR%%-test/queries/0_stateless/00544_insert_with_select.sql
-%%DATADIR%%-test/queries/0_stateless/00545_weird_aggregate_functions.reference
-%%DATADIR%%-test/queries/0_stateless/00545_weird_aggregate_functions.sql
-%%DATADIR%%-test/queries/0_stateless/00546_shard_tuple_element_formatting.reference
-%%DATADIR%%-test/queries/0_stateless/00546_shard_tuple_element_formatting.sql
-%%DATADIR%%-test/queries/0_stateless/00547_named_tuples.reference
-%%DATADIR%%-test/queries/0_stateless/00547_named_tuples.sql
-%%DATADIR%%-test/queries/0_stateless/00548_slice_of_nested.reference
-%%DATADIR%%-test/queries/0_stateless/00548_slice_of_nested.sql
-%%DATADIR%%-test/queries/0_stateless/00549_join_use_nulls.reference
-%%DATADIR%%-test/queries/0_stateless/00549_join_use_nulls.sql
-%%DATADIR%%-test/queries/0_stateless/00550_join_insert_select.reference
-%%DATADIR%%-test/queries/0_stateless/00550_join_insert_select.sh
-%%DATADIR%%-test/queries/0_stateless/00551_parse_or_null.reference
-%%DATADIR%%-test/queries/0_stateless/00551_parse_or_null.sql
-%%DATADIR%%-test/queries/0_stateless/00552_logical_functions_simple.reference
-%%DATADIR%%-test/queries/0_stateless/00552_logical_functions_simple.sql
-%%DATADIR%%-test/queries/0_stateless/00552_logical_functions_ternary.reference
-%%DATADIR%%-test/queries/0_stateless/00552_logical_functions_ternary.sql
-%%DATADIR%%-test/queries/0_stateless/00552_logical_functions_uint8_as_bool.reference
-%%DATADIR%%-test/queries/0_stateless/00552_logical_functions_uint8_as_bool.sql
-%%DATADIR%%-test/queries/0_stateless/00552_or_nullable.reference
-%%DATADIR%%-test/queries/0_stateless/00552_or_nullable.sql
-%%DATADIR%%-test/queries/0_stateless/00553_buff_exists_materlized_column.reference
-%%DATADIR%%-test/queries/0_stateless/00553_buff_exists_materlized_column.sql
+%%DATADIR%%-test/queries/0_stateless/01660_join_or_inner.reference
+%%DATADIR%%-test/queries/0_stateless/00256_reverse.reference
+%%DATADIR%%-test/queries/0_stateless/00761_lower_utf8_bug.reference
+%%DATADIR%%-test/queries/0_stateless/01246_insert_into_watch_live_view.reference
+%%DATADIR%%-test/queries/0_stateless/00502_sum_map.sql
+%%DATADIR%%-test/queries/0_stateless/00753_alter_destination_for_storage_buffer.reference
+%%DATADIR%%-test/queries/0_stateless/02125_tskv_proper_names_reading.sh
+%%DATADIR%%-test/queries/0_stateless/01505_trivial_count_with_partition_predicate.sql
+%%DATADIR%%-test/queries/0_stateless/01103_check_cpu_instructions_at_startup.reference
+%%DATADIR%%-test/queries/0_stateless/01421_array_nullable_element_nullable_index.sql
+%%DATADIR%%-test/queries/0_stateless/01378_alter_rename_with_ttl_zookeeper.reference
+%%DATADIR%%-test/queries/0_stateless/01413_truncate_without_table_keyword.reference
+%%DATADIR%%-test/queries/0_stateless/01299_alter_merge_tree.sql
+%%DATADIR%%-test/queries/0_stateless/02004_max_hyperscan_regex_length.sql
+%%DATADIR%%-test/queries/0_stateless/01856_create_function.reference
+%%DATADIR%%-test/queries/0_stateless/01712_no_adaptive_granularity_vertical_merge.reference
+%%DATADIR%%-test/queries/0_stateless/01852_cast_operator_bad_cases.sh
+%%DATADIR%%-test/queries/0_stateless/01060_shutdown_table_after_detach.reference
+%%DATADIR%%-test/queries/0_stateless/00223_shard_distributed_aggregation_memory_efficient.sql
+%%DATADIR%%-test/queries/0_stateless/01423_if_nullable_cond.sql
+%%DATADIR%%-test/queries/0_stateless/02100_alter_scalar_circular_deadlock.sql
+%%DATADIR%%-test/queries/0_stateless/00046_stored_aggregates_simple.reference
+%%DATADIR%%-test/queries/0_stateless/00973_live_view_with_subquery_select_with_aggregation_in_subquery.reference
+%%DATADIR%%-test/queries/0_stateless/00043_summing_empty_part.reference
+%%DATADIR%%-test/queries/0_stateless/02141_clickhouse_local_interactive_table.sh
+%%DATADIR%%-test/queries/0_stateless/01785_pmj_lc_bug.reference
+%%DATADIR%%-test/queries/0_stateless/00538_datediff.reference
+%%DATADIR%%-test/queries/0_stateless/00624_length_utf8.reference
+%%DATADIR%%-test/queries/0_stateless/01273_arrow_nested_arrays_load.sh
+%%DATADIR%%-test/queries/0_stateless/01788_update_nested_type_subcolumn_check.sql
+%%DATADIR%%-test/queries/0_stateless/01114_alter_modify_compact_parts.sql
+%%DATADIR%%-test/queries/0_stateless/01356_initialize_aggregation.sql
+%%DATADIR%%-test/queries/0_stateless/01956_skip_unavailable_shards_excessive_attempts.sh
+%%DATADIR%%-test/queries/0_stateless/01943_query_id_check.sql
+%%DATADIR%%-test/queries/0_stateless/02006_h3_to_geo_boundary.sql
+%%DATADIR%%-test/queries/0_stateless/01660_join_or_subqueries.sql
+%%DATADIR%%-test/queries/0_stateless/01780_column_sparse_full.reference
+%%DATADIR%%-test/queries/0_stateless/00900_orc_arrow_parquet_maps.sh
+%%DATADIR%%-test/queries/0_stateless/01778_test_LowCardinality_FixedString_pk.reference
+%%DATADIR%%-test/queries/0_stateless/02003_compress_bz2.reference
+%%DATADIR%%-test/queries/0_stateless/02175_distributed_join_current_database.reference
+%%DATADIR%%-test/queries/0_stateless/01718_subtract_seconds_date.reference
+%%DATADIR%%-test/queries/0_stateless/01508_format_regexp_raw.reference
+%%DATADIR%%-test/queries/0_stateless/01294_create_settings_profile.reference
+%%DATADIR%%-test/queries/0_stateless/01710_projection_array_join.reference
+%%DATADIR%%-test/queries/0_stateless/01297_alter_distributed.sql
+%%DATADIR%%-test/queries/0_stateless/01514_tid_function.reference
+%%DATADIR%%-test/queries/0_stateless/01753_optimize_aggregation_in_order.sh
+%%DATADIR%%-test/queries/0_stateless/01038_dictionary_lifetime_min_zero_sec.reference
+%%DATADIR%%-test/queries/0_stateless/01040_h3_get_resolution.reference
+%%DATADIR%%-test/queries/0_stateless/01532_having_with_totals.sql
+%%DATADIR%%-test/queries/0_stateless/01812_has_generic.reference
+%%DATADIR%%-test/queries/0_stateless/00752_low_cardinality_lambda_argument.reference
+%%DATADIR%%-test/queries/0_stateless/01055_window_view_proc_hop_to.sh
+%%DATADIR%%-test/queries/0_stateless/01042_system_reload_dictionary_reloads_completely.sh
+%%DATADIR%%-test/queries/0_stateless/02004_intersect_except_operators.reference
+%%DATADIR%%-test/queries/0_stateless/00900_orc_load.sh
+%%DATADIR%%-test/queries/0_stateless/01635_sum_map_fuzz.sql
+%%DATADIR%%-test/queries/0_stateless/01925_broken_partition_id_zookeeper.reference
+%%DATADIR%%-test/queries/0_stateless/01007_r1r2_w_r2r1_deadlock.sh
+%%DATADIR%%-test/queries/0_stateless/01497_alias_on_default_array.reference
+%%DATADIR%%-test/queries/0_stateless/01583_const_column_in_set_index.reference
+%%DATADIR%%-test/queries/0_stateless/01055_compact_parts.reference
+%%DATADIR%%-test/queries/0_stateless/01811_filter_by_null.reference
+%%DATADIR%%-test/queries/0_stateless/01480_binary_operator_monotonicity.reference
 %%DATADIR%%-test/queries/0_stateless/00553_invalid_nested_name.reference
-%%DATADIR%%-test/queries/0_stateless/00553_invalid_nested_name.sql
-%%DATADIR%%-test/queries/0_stateless/00554_nested_and_table_engines.reference
-%%DATADIR%%-test/queries/0_stateless/00554_nested_and_table_engines.sql
-%%DATADIR%%-test/queries/0_stateless/00555_hasAll_hasAny.reference
-%%DATADIR%%-test/queries/0_stateless/00555_hasAll_hasAny.sql
-%%DATADIR%%-test/queries/0_stateless/00555_hasSubstr.reference
-%%DATADIR%%-test/queries/0_stateless/00555_hasSubstr.sql
-%%DATADIR%%-test/queries/0_stateless/00555_right_join_excessive_rows.reference
-%%DATADIR%%-test/queries/0_stateless/00555_right_join_excessive_rows.sql
-%%DATADIR%%-test/queries/0_stateless/00556_array_intersect.reference
-%%DATADIR%%-test/queries/0_stateless/00556_array_intersect.sql
-%%DATADIR%%-test/queries/0_stateless/00556_remove_columns_from_subquery.reference
-%%DATADIR%%-test/queries/0_stateless/00556_remove_columns_from_subquery.sql
-%%DATADIR%%-test/queries/0_stateless/00557_alter_null_storage_tables.reference
-%%DATADIR%%-test/queries/0_stateless/00557_alter_null_storage_tables.sql
-%%DATADIR%%-test/queries/0_stateless/00557_array_resize.reference
-%%DATADIR%%-test/queries/0_stateless/00557_array_resize.sql
-%%DATADIR%%-test/queries/0_stateless/00557_remote_port.reference
-%%DATADIR%%-test/queries/0_stateless/00557_remote_port.sh
-%%DATADIR%%-test/queries/0_stateless/00558_aggregate_merge_totals_with_arenas.reference
-%%DATADIR%%-test/queries/0_stateless/00558_aggregate_merge_totals_with_arenas.sql
-%%DATADIR%%-test/queries/0_stateless/00558_parse_floats.reference
-%%DATADIR%%-test/queries/0_stateless/00558_parse_floats.sql
-%%DATADIR%%-test/queries/0_stateless/00559_filter_array_generic.reference
-%%DATADIR%%-test/queries/0_stateless/00559_filter_array_generic.sql
-%%DATADIR%%-test/queries/0_stateless/00560_float_leading_plus_in_exponent.reference
-%%DATADIR%%-test/queries/0_stateless/00560_float_leading_plus_in_exponent.sql
-%%DATADIR%%-test/queries/0_stateless/00561_storage_join.reference
-%%DATADIR%%-test/queries/0_stateless/00561_storage_join.sql
-%%DATADIR%%-test/queries/0_stateless/00562_in_subquery_merge_tree.reference
-%%DATADIR%%-test/queries/0_stateless/00562_in_subquery_merge_tree.sql
-%%DATADIR%%-test/queries/0_stateless/00562_rewrite_select_expression_with_union.reference
-%%DATADIR%%-test/queries/0_stateless/00562_rewrite_select_expression_with_union.sql
-%%DATADIR%%-test/queries/0_stateless/00563_complex_in_expression.reference
+%%DATADIR%%-test/queries/0_stateless/00146_summing_merge_tree_nested_map.sql
+%%DATADIR%%-test/queries/0_stateless/01383_remote_ambiguous_column_shard.sql
+%%DATADIR%%-test/queries/0_stateless/02012_changed_enum_type_non_replicated.sql
+%%DATADIR%%-test/queries/0_stateless/01081_PartialSortingTransform_full_column.sql
+%%DATADIR%%-test/queries/0_stateless/01558_ttest.reference
+%%DATADIR%%-test/queries/0_stateless/00233_position_function_sql_comparibilty.reference
+%%DATADIR%%-test/queries/0_stateless/01710_projection_in_set.sql
+%%DATADIR%%-test/queries/0_stateless/02027_arrayCumSumNonNegative_const.reference
+%%DATADIR%%-test/queries/0_stateless/00690_insert_select_converting_exception_message.sh
+%%DATADIR%%-test/queries/0_stateless/00339_parsing_bad_arrays.reference
+%%DATADIR%%-test/queries/0_stateless/01501_cache_dictionary_all_fields.sql
+%%DATADIR%%-test/queries/0_stateless/01666_date_lut_buffer_overflow.sql
+%%DATADIR%%-test/queries/0_stateless/01746_convert_type_with_default.sql
+%%DATADIR%%-test/queries/0_stateless/01801_distinct_group_by_shard.reference
+%%DATADIR%%-test/queries/0_stateless/00098_b_union_all.sql
+%%DATADIR%%-test/queries/0_stateless/00356_analyze_aggregations_and_union_all.sql
+%%DATADIR%%-test/queries/0_stateless/01083_aggregation_memory_efficient_bug.sql
+%%DATADIR%%-test/queries/0_stateless/00315_quantile_off_by_one.sql
+%%DATADIR%%-test/queries/0_stateless/01353_nullable_tuple.reference
+%%DATADIR%%-test/queries/0_stateless/01821_dictionary_primary_key_wrong_order.reference
+%%DATADIR%%-test/queries/0_stateless/02013_bloom_filter_hasAll.sql
+%%DATADIR%%-test/queries/0_stateless/00342_escape_sequences.sql
+%%DATADIR%%-test/queries/0_stateless/00457_log_tinylog_stripelog_nullable.sql
+%%DATADIR%%-test/queries/0_stateless/00386_has_column_in_table.sql
+%%DATADIR%%-test/queries/0_stateless/01595_countMatches.reference
+%%DATADIR%%-test/queries/0_stateless/01853_s2_cells_intersect.reference
+%%DATADIR%%-test/queries/0_stateless/00910_decimal_group_array_crash_3783.sql
+%%DATADIR%%-test/queries/0_stateless/00632_aggregation_window_funnel.sql
+%%DATADIR%%-test/queries/0_stateless/00220_shard_with_totals_in_subquery_remote_and_limit.reference
+%%DATADIR%%-test/queries/0_stateless/00900_orc_arrow_parquet_maps.reference
+%%DATADIR%%-test/queries/0_stateless/01584_distributed_buffer_cannot_find_column.reference
+%%DATADIR%%-test/queries/0_stateless/01308_polygon_area.reference
+%%DATADIR%%-test/queries/0_stateless/01866_bit_positions_to_array.sql
+%%DATADIR%%-test/queries/0_stateless/00126_buffer.reference
+%%DATADIR%%-test/queries/0_stateless/01290_max_execution_speed_distributed.reference
+%%DATADIR%%-test/queries/0_stateless/01305_replica_create_drop_zookeeper.reference
+%%DATADIR%%-test/queries/0_stateless/00115_shard_in_incomplete_result.reference
+%%DATADIR%%-test/queries/0_stateless/01085_datetime_arithmetic_preserve_timezone.sql
+%%DATADIR%%-test/queries/0_stateless/01293_show_clusters.reference
+%%DATADIR%%-test/queries/0_stateless/01869_function_modulo_legacy.sql
+%%DATADIR%%-test/queries/0_stateless/00127_group_by_concat.sql
+%%DATADIR%%-test/queries/0_stateless/00832_storage_file_lock.sql
+%%DATADIR%%-test/queries/0_stateless/00332_quantile_timing_memory_leak.reference
+%%DATADIR%%-test/queries/0_stateless/00485_http_insert_format.sh
+%%DATADIR%%-test/queries/0_stateless/01319_query_formatting_in_server_log.reference
+%%DATADIR%%-test/queries/0_stateless/01474_executable_dictionary.reference
+%%DATADIR%%-test/queries/0_stateless/00540_bad_data_types.sh
+%%DATADIR%%-test/queries/0_stateless/02126_identity_user_defined_function.sql
+%%DATADIR%%-test/queries/0_stateless/00959_format_with_different_aliases.sh
+%%DATADIR%%-test/queries/0_stateless/02029_output_csv_null_representation.sql
+%%DATADIR%%-test/queries/0_stateless/00838_unique_index.sh
+%%DATADIR%%-test/queries/0_stateless/01763_long_ttl_group_by.sql
+%%DATADIR%%-test/queries/0_stateless/00479_date_and_datetime_to_number.sql
+%%DATADIR%%-test/queries/0_stateless/01293_show_settings.sql
+%%DATADIR%%-test/queries/0_stateless/01318_map_add_map_subtract_on_map_type.sql
+%%DATADIR%%-test/queries/0_stateless/00991_live_view_watch_http.sh.disabled
+%%DATADIR%%-test/queries/0_stateless/00965_logs_level_bugfix.sh
+%%DATADIR%%-test/queries/0_stateless/00732_base64_functions.reference
+%%DATADIR%%-test/queries/0_stateless/02012_low_cardinality_uuid_with_extremes.sql
+%%DATADIR%%-test/queries/0_stateless/00230_array_functions_has_count_equal_index_of_non_const_second_arg.sql
+%%DATADIR%%-test/queries/0_stateless/00444_join_use_nulls.sql
+%%DATADIR%%-test/queries/0_stateless/01477_lc_in_merge_join_left_key.sql
+%%DATADIR%%-test/queries/0_stateless/02097_polygon_dictionary_store_key.sql
+%%DATADIR%%-test/queries/0_stateless/01322_welch_ttest.reference
+%%DATADIR%%-test/queries/0_stateless/00943_mv_rename_without_inner_table.sql
+%%DATADIR%%-test/queries/0_stateless/00678_murmurhash.sql
+%%DATADIR%%-test/queries/0_stateless/00719_insert_block_without_column.sh
+%%DATADIR%%-test/queries/0_stateless/01128_generate_random_nested.reference
+%%DATADIR%%-test/queries/0_stateless/00412_logical_expressions_optimizer.sql
+%%DATADIR%%-test/queries/0_stateless/00149_function_url_hash.reference
+%%DATADIR%%-test/queries/0_stateless/00399_group_uniq_array_date_datetime.reference
+%%DATADIR%%-test/queries/0_stateless/00979_toFloat_monotonicity.reference
+%%DATADIR%%-test/queries/0_stateless/01486_json_array_output.sql
+%%DATADIR%%-test/queries/0_stateless/00714_alter_uuid.sql
+%%DATADIR%%-test/queries/0_stateless/00840_long_concurrent_select_and_drop_deadlock.reference
+%%DATADIR%%-test/queries/0_stateless/00018_distinct_in_subquery.sql
+%%DATADIR%%-test/queries/0_stateless/00984_materialized_view_to_columns.reference
+%%DATADIR%%-test/queries/0_stateless/00931_low_cardinality_nullable_aggregate_function_type.sql
+%%DATADIR%%-test/queries/0_stateless/00348_tuples.sql
+%%DATADIR%%-test/queries/0_stateless/00801_daylight_saving_time_hour_underflow.sql
+%%DATADIR%%-test/queries/0_stateless/00360_to_date_from_string_with_datetime.sql
+%%DATADIR%%-test/queries/0_stateless/00756_power_alias.reference
+%%DATADIR%%-test/queries/0_stateless/00505_shard_secure.reference
+%%DATADIR%%-test/queries/0_stateless/00715_json_each_row_input_nested.reference
+%%DATADIR%%-test/queries/0_stateless/00876_wrong_arraj_join_column.reference
+%%DATADIR%%-test/queries/0_stateless/01019_alter_materialized_view_query.reference
+%%DATADIR%%-test/queries/0_stateless/02000_default_from_default_empty_column.sql
+%%DATADIR%%-test/queries/0_stateless/01475_mutation_with_if.reference
+%%DATADIR%%-test/queries/0_stateless/01300_wkt.reference
+%%DATADIR%%-test/queries/0_stateless/00191_aggregating_merge_tree_and_final.sql
+%%DATADIR%%-test/queries/0_stateless/02121_pager.sh
+%%DATADIR%%-test/queries/0_stateless/01759_dictionary_unique_attribute_names.sql
+%%DATADIR%%-test/queries/0_stateless/01634_sum_map_nulls.reference
+%%DATADIR%%-test/queries/0_stateless/01374_if_nullable_filimonov.sql
 %%DATADIR%%-test/queries/0_stateless/00563_complex_in_expression.sql
-%%DATADIR%%-test/queries/0_stateless/00563_insert_into_remote_and_zookeeper.reference
-%%DATADIR%%-test/queries/0_stateless/00563_insert_into_remote_and_zookeeper.sql
-%%DATADIR%%-test/queries/0_stateless/00563_shard_insert_into_remote.reference
-%%DATADIR%%-test/queries/0_stateless/00563_shard_insert_into_remote.sql
-%%DATADIR%%-test/queries/0_stateless/00564_enum_order.reference
-%%DATADIR%%-test/queries/0_stateless/00564_enum_order.sh
-%%DATADIR%%-test/queries/0_stateless/00564_initial_column_values_with_default_expression.reference
-%%DATADIR%%-test/queries/0_stateless/00564_initial_column_values_with_default_expression.sql
-%%DATADIR%%-test/queries/0_stateless/00564_temporary_table_management.reference
-%%DATADIR%%-test/queries/0_stateless/00564_temporary_table_management.sql
-%%DATADIR%%-test/queries/0_stateless/00564_versioned_collapsing_merge_tree.reference
-%%DATADIR%%-test/queries/0_stateless/00564_versioned_collapsing_merge_tree.sql
-%%DATADIR%%-test/queries/0_stateless/00565_enum_order.reference
-%%DATADIR%%-test/queries/0_stateless/00565_enum_order.sh
-%%DATADIR%%-test/queries/0_stateless/00566_enum_min_max.reference
-%%DATADIR%%-test/queries/0_stateless/00566_enum_min_max.sql
-%%DATADIR%%-test/queries/0_stateless/00567_parse_datetime_as_unix_timestamp.reference
-%%DATADIR%%-test/queries/0_stateless/00567_parse_datetime_as_unix_timestamp.sql
-%%DATADIR%%-test/queries/0_stateless/00568_empty_function_with_fixed_string.reference
-%%DATADIR%%-test/queries/0_stateless/00568_empty_function_with_fixed_string.sql
-%%DATADIR%%-test/queries/0_stateless/00569_parse_date_time_best_effort.reference
-%%DATADIR%%-test/queries/0_stateless/00569_parse_date_time_best_effort.sql
-%%DATADIR%%-test/queries/0_stateless/00570_empty_array_is_const.reference
-%%DATADIR%%-test/queries/0_stateless/00570_empty_array_is_const.sql
-%%DATADIR%%-test/queries/0_stateless/00571_alter_nullable.reference
-%%DATADIR%%-test/queries/0_stateless/00571_alter_nullable.sql
-%%DATADIR%%-test/queries/0_stateless/00571_non_exist_database_when_create_materializ_view.reference
-%%DATADIR%%-test/queries/0_stateless/00571_non_exist_database_when_create_materializ_view.sql
-%%DATADIR%%-test/queries/0_stateless/00572_aggregation_by_empty_set.reference
-%%DATADIR%%-test/queries/0_stateless/00572_aggregation_by_empty_set.sql
-%%DATADIR%%-test/queries/0_stateless/00573_shard_aggregation_by_empty_set.reference
-%%DATADIR%%-test/queries/0_stateless/00573_shard_aggregation_by_empty_set.sql
-%%DATADIR%%-test/queries/0_stateless/00574_empty_strings_deserialization.reference
-%%DATADIR%%-test/queries/0_stateless/00574_empty_strings_deserialization.sh
-%%DATADIR%%-test/queries/0_stateless/00575_illegal_column_exception_when_drop_depen_column.reference
-%%DATADIR%%-test/queries/0_stateless/00575_illegal_column_exception_when_drop_depen_column.sh
-%%DATADIR%%-test/queries/0_stateless/00575_merge_and_index_with_function_in_in.reference
-%%DATADIR%%-test/queries/0_stateless/00575_merge_and_index_with_function_in_in.sql
-%%DATADIR%%-test/queries/0_stateless/00576_nested_and_prewhere.reference
-%%DATADIR%%-test/queries/0_stateless/00576_nested_and_prewhere.sql
-%%DATADIR%%-test/queries/0_stateless/00577_full_join_segfault.reference
+%%DATADIR%%-test/queries/0_stateless/00615_nullable_alter_optimize.reference
+%%DATADIR%%-test/queries/0_stateless/01891_partition_by_uuid.sql
+%%DATADIR%%-test/queries/0_stateless/01632_select_all_syntax.sql
+%%DATADIR%%-test/queries/0_stateless/01275_alter_rename_column_default_expr.sql
+%%DATADIR%%-test/queries/0_stateless/01940_custom_tld_sharding_key.reference
+%%DATADIR%%-test/queries/0_stateless/01660_sum_ubsan.reference
+%%DATADIR%%-test/queries/0_stateless/00956_http_prepared_statements.sh
+%%DATADIR%%-test/queries/0_stateless/01903_correct_block_size_prediction_with_default.sql
+%%DATADIR%%-test/queries/0_stateless/02102_row_binary_with_names_and_types.reference
+%%DATADIR%%-test/queries/0_stateless/01293_client_interactive_vertical_multiline.reference
+%%DATADIR%%-test/queries/0_stateless/00864_union_all_supertype.sql
+%%DATADIR%%-test/queries/0_stateless/01665_running_difference_ubsan.sql
+%%DATADIR%%-test/queries/0_stateless/01624_soft_constraints.sh
+%%DATADIR%%-test/queries/0_stateless/00688_low_cardinality_in.sql
+%%DATADIR%%-test/queries/0_stateless/00456_alter_nullable.reference
+%%DATADIR%%-test/queries/0_stateless/00357_to_string_complex_types.sql
+%%DATADIR%%-test/queries/0_stateless/00938_dataset_test.sql
+%%DATADIR%%-test/queries/0_stateless/01312_skip_empty_params.sh
+%%DATADIR%%-test/queries/0_stateless/01558_transform_null_in.sql
+%%DATADIR%%-test/queries/0_stateless/01921_test_progress_bar.reference
+%%DATADIR%%-test/queries/0_stateless/00270_views_query_processing_stage.reference
+%%DATADIR%%-test/queries/0_stateless/01732_alters_bad_conversions.sql
 %%DATADIR%%-test/queries/0_stateless/00577_full_join_segfault.sql
-%%DATADIR%%-test/queries/0_stateless/00577_replacing_merge_tree_vertical_merge.reference
-%%DATADIR%%-test/queries/0_stateless/00577_replacing_merge_tree_vertical_merge.sql
-%%DATADIR%%-test/queries/0_stateless/00578_merge_table_and_table_virtual_column.reference
-%%DATADIR%%-test/queries/0_stateless/00578_merge_table_and_table_virtual_column.sql
-%%DATADIR%%-test/queries/0_stateless/00578_merge_table_sampling.reference
-%%DATADIR%%-test/queries/0_stateless/00578_merge_table_sampling.sql
-%%DATADIR%%-test/queries/0_stateless/00578_merge_table_shadow_virtual_column.reference
-%%DATADIR%%-test/queries/0_stateless/00578_merge_table_shadow_virtual_column.sql
-%%DATADIR%%-test/queries/0_stateless/00578_merge_trees_without_primary_key.reference
-%%DATADIR%%-test/queries/0_stateless/00578_merge_trees_without_primary_key.sql
-%%DATADIR%%-test/queries/0_stateless/00579_merge_tree_partition_and_primary_keys_using_same_expression.reference
-%%DATADIR%%-test/queries/0_stateless/00579_merge_tree_partition_and_primary_keys_using_same_expression.sql
-%%DATADIR%%-test/queries/0_stateless/00579_virtual_column_and_lazy.reference
-%%DATADIR%%-test/queries/0_stateless/00579_virtual_column_and_lazy.sql
-%%DATADIR%%-test/queries/0_stateless/00580_cast_nullable_to_non_nullable.reference
-%%DATADIR%%-test/queries/0_stateless/00580_cast_nullable_to_non_nullable.sql
-%%DATADIR%%-test/queries/0_stateless/00580_consistent_hashing_functions.reference
-%%DATADIR%%-test/queries/0_stateless/00580_consistent_hashing_functions.sql
-%%DATADIR%%-test/queries/0_stateless/00581_limit_on_result_and_subquery_and_insert.reference
-%%DATADIR%%-test/queries/0_stateless/00581_limit_on_result_and_subquery_and_insert.sql
-%%DATADIR%%-test/queries/0_stateless/00582_not_aliasing_functions.reference
-%%DATADIR%%-test/queries/0_stateless/00582_not_aliasing_functions.sql
-%%DATADIR%%-test/queries/0_stateless/00583_limit_by_expressions.reference
-%%DATADIR%%-test/queries/0_stateless/00583_limit_by_expressions.sql
-%%DATADIR%%-test/queries/0_stateless/00584_view_union_all.reference
-%%DATADIR%%-test/queries/0_stateless/00584_view_union_all.sql
-%%DATADIR%%-test/queries/0_stateless/00585_union_all_subquery_aggregation_column_removal.reference
-%%DATADIR%%-test/queries/0_stateless/00585_union_all_subquery_aggregation_column_removal.sql
-%%DATADIR%%-test/queries/0_stateless/00586_removing_unused_columns_from_subquery.reference
-%%DATADIR%%-test/queries/0_stateless/00586_removing_unused_columns_from_subquery.sql
-%%DATADIR%%-test/queries/0_stateless/00587_union_all_type_conversions.reference
-%%DATADIR%%-test/queries/0_stateless/00587_union_all_type_conversions.sql
-%%DATADIR%%-test/queries/0_stateless/00588_shard_distributed_prewhere.reference
-%%DATADIR%%-test/queries/0_stateless/00588_shard_distributed_prewhere.sql
-%%DATADIR%%-test/queries/0_stateless/00589_removal_unused_columns_aggregation.reference
-%%DATADIR%%-test/queries/0_stateless/00589_removal_unused_columns_aggregation.sql
-%%DATADIR%%-test/queries/0_stateless/00590_limit_by_column_removal.reference
-%%DATADIR%%-test/queries/0_stateless/00590_limit_by_column_removal.sql
-%%DATADIR%%-test/queries/0_stateless/00591_columns_removal_union_all.reference
-%%DATADIR%%-test/queries/0_stateless/00591_columns_removal_union_all.sql
-%%DATADIR%%-test/queries/0_stateless/00592_union_all_different_aliases.reference
-%%DATADIR%%-test/queries/0_stateless/00592_union_all_different_aliases.sql
-%%DATADIR%%-test/queries/0_stateless/00593_union_all_assert_columns_removed.reference
-%%DATADIR%%-test/queries/0_stateless/00593_union_all_assert_columns_removed.sql
-%%DATADIR%%-test/queries/0_stateless/00594_alias_in_distributed.reference
-%%DATADIR%%-test/queries/0_stateless/00594_alias_in_distributed.sql
-%%DATADIR%%-test/queries/0_stateless/00595_insert_into_view.reference
-%%DATADIR%%-test/queries/0_stateless/00595_insert_into_view.sh
-%%DATADIR%%-test/queries/0_stateless/00596_limit_on_expanded_ast.reference
-%%DATADIR%%-test/queries/0_stateless/00596_limit_on_expanded_ast.sh
-%%DATADIR%%-test/queries/0_stateless/00597_push_down_predicate_long.reference
-%%DATADIR%%-test/queries/0_stateless/00597_push_down_predicate_long.sql
-%%DATADIR%%-test/queries/0_stateless/00597_with_totals_on_empty_set.reference
-%%DATADIR%%-test/queries/0_stateless/00597_with_totals_on_empty_set.sql
-%%DATADIR%%-test/queries/0_stateless/00598_create_as_select_http.reference
-%%DATADIR%%-test/queries/0_stateless/00598_create_as_select_http.sh
-%%DATADIR%%-test/queries/0_stateless/00599_create_view_with_subquery.reference
-%%DATADIR%%-test/queries/0_stateless/00599_create_view_with_subquery.sql
-%%DATADIR%%-test/queries/0_stateless/00600_create_temporary_table_if_not_exists.reference
-%%DATADIR%%-test/queries/0_stateless/00600_create_temporary_table_if_not_exists.sql
-%%DATADIR%%-test/queries/0_stateless/00600_replace_running_query.reference
-%%DATADIR%%-test/queries/0_stateless/00600_replace_running_query.sh
-%%DATADIR%%-test/queries/0_stateless/00601_kill_running_query.reference
-%%DATADIR%%-test/queries/0_stateless/00601_kill_running_query.sh
-%%DATADIR%%-test/queries/0_stateless/00602_throw_if.reference
-%%DATADIR%%-test/queries/0_stateless/00602_throw_if.sh
-%%DATADIR%%-test/queries/0_stateless/00603_system_parts_nonexistent_database.reference
-%%DATADIR%%-test/queries/0_stateless/00603_system_parts_nonexistent_database.sql
-%%DATADIR%%-test/queries/0_stateless/00604_shard_remote_and_columns_with_defaults.reference
-%%DATADIR%%-test/queries/0_stateless/00604_shard_remote_and_columns_with_defaults.sql
-%%DATADIR%%-test/queries/0_stateless/00604_show_create_database.reference
-%%DATADIR%%-test/queries/0_stateless/00604_show_create_database.sql
-%%DATADIR%%-test/queries/0_stateless/00605_intersections_aggregate_functions.reference
-%%DATADIR%%-test/queries/0_stateless/00605_intersections_aggregate_functions.sql
-%%DATADIR%%-test/queries/0_stateless/00606_quantiles_and_nans.reference
-%%DATADIR%%-test/queries/0_stateless/00606_quantiles_and_nans.sql
-%%DATADIR%%-test/queries/0_stateless/00607_index_in_in.reference
-%%DATADIR%%-test/queries/0_stateless/00607_index_in_in.sql
-%%DATADIR%%-test/queries/0_stateless/00608_uniq_array.reference
-%%DATADIR%%-test/queries/0_stateless/00608_uniq_array.sql
-%%DATADIR%%-test/queries/0_stateless/00609_distributed_with_case_when_then.reference
-%%DATADIR%%-test/queries/0_stateless/00609_distributed_with_case_when_then.sql
-%%DATADIR%%-test/queries/0_stateless/00609_mv_index_in_in.reference
-%%DATADIR%%-test/queries/0_stateless/00609_mv_index_in_in.sql
-%%DATADIR%%-test/queries/0_stateless/00609_prewhere_and_default.reference
+%%DATADIR%%-test/queries/0_stateless/00163_shard_join_with_empty_table.sql
 %%DATADIR%%-test/queries/0_stateless/00609_prewhere_and_default.sql
-%%DATADIR%%-test/queries/0_stateless/00610_materialized_view_forward_alter_partition_statements.reference
-%%DATADIR%%-test/queries/0_stateless/00610_materialized_view_forward_alter_partition_statements.sql
-%%DATADIR%%-test/queries/0_stateless/00612_count.reference
-%%DATADIR%%-test/queries/0_stateless/00612_count.sql
+%%DATADIR%%-test/queries/0_stateless/00739_array_element_nullable_string_mattrobenolt.reference
+%%DATADIR%%-test/queries/0_stateless/01410_nullable_key_more_tests.reference
+%%DATADIR%%-test/queries/0_stateless/02023_parser_number_binary_literal.reference
+%%DATADIR%%-test/queries/0_stateless/02025_storage_filelog_virtual_col.reference
+%%DATADIR%%-test/queries/0_stateless/01236_graphite_mt.reference
+%%DATADIR%%-test/queries/0_stateless/00754_alter_modify_column_partitions.sql
+%%DATADIR%%-test/queries/0_stateless/02048_parallel_reading_from_infile.sh
+%%DATADIR%%-test/queries/0_stateless/00700_decimal_empty_aggregates.reference
+%%DATADIR%%-test/queries/0_stateless/01079_order_by_pk.reference
+%%DATADIR%%-test/queries/0_stateless/01926_bin_unbin.reference
+%%DATADIR%%-test/queries/0_stateless/01550_query_identifier_parameters.sh
+%%DATADIR%%-test/queries/0_stateless/00800_function_java_hash.reference
+%%DATADIR%%-test/queries/0_stateless/01271_optimize_arithmetic_operations_in_aggr_func_with_alias.sql
+%%DATADIR%%-test/queries/0_stateless/01837_cast_to_array_from_empty_array.reference
+%%DATADIR%%-test/queries/0_stateless/01043_h3_edge_length_m.sql
+%%DATADIR%%-test/queries/0_stateless/01903_correct_block_size_prediction_with_default.reference
+%%DATADIR%%-test/queries/0_stateless/01454_storagememory_data_race_challenge.reference
+%%DATADIR%%-test/queries/0_stateless/02015_async_inserts_1.sh
+%%DATADIR%%-test/queries/0_stateless/01943_query_id_check.reference
+%%DATADIR%%-test/queries/0_stateless/01507_transform_null_in.sql
+%%DATADIR%%-test/queries/0_stateless/01340_datetime64_fpe.sql
+%%DATADIR%%-test/queries/0_stateless/00192_least_greatest.reference
+%%DATADIR%%-test/queries/0_stateless/01511_format_readable_timedelta.sql
+%%DATADIR%%-test/queries/0_stateless/00280_hex_escape_sequence.sql
+%%DATADIR%%-test/queries/0_stateless/00974_query_profiler.reference
+%%DATADIR%%-test/queries/0_stateless/01273_h3EdgeAngle_range_check.reference
+%%DATADIR%%-test/queries/0_stateless/01554_row_number_after_cannot_read_all_data.reference
+%%DATADIR%%-test/queries/0_stateless/00381_first_significant_subdomain.sql
+%%DATADIR%%-test/queries/0_stateless/02162_range_hashed_dictionary_ddl_expression.sql
+%%DATADIR%%-test/queries/0_stateless/01268_mv_scalars.reference
 %%DATADIR%%-test/queries/0_stateless/00612_http_max_query_size.reference
-%%DATADIR%%-test/queries/0_stateless/00612_http_max_query_size.sh
-%%DATADIR%%-test/queries/0_stateless/00612_pk_in_tuple.reference
-%%DATADIR%%-test/queries/0_stateless/00612_pk_in_tuple.sql
-%%DATADIR%%-test/queries/0_stateless/00612_pk_in_tuple_perf.reference
-%%DATADIR%%-test/queries/0_stateless/00612_pk_in_tuple_perf.sh
-%%DATADIR%%-test/queries/0_stateless/00612_shard_count.reference
-%%DATADIR%%-test/queries/0_stateless/00612_shard_count.sql
-%%DATADIR%%-test/queries/0_stateless/00612_union_query_with_subquery.reference
-%%DATADIR%%-test/queries/0_stateless/00612_union_query_with_subquery.sql
-%%DATADIR%%-test/queries/0_stateless/00613_shard_distributed_max_execution_time.reference
-%%DATADIR%%-test/queries/0_stateless/00613_shard_distributed_max_execution_time.sql
-%%DATADIR%%-test/queries/0_stateless/00614_array_nullable.reference
-%%DATADIR%%-test/queries/0_stateless/00614_array_nullable.sql
-%%DATADIR%%-test/queries/0_stateless/00614_shard_same_header_for_local_and_remote_node_in_distributed_query.reference
-%%DATADIR%%-test/queries/0_stateless/00614_shard_same_header_for_local_and_remote_node_in_distributed_query.sql
-%%DATADIR%%-test/queries/0_stateless/00615_nullable_alter_optimize.reference
-%%DATADIR%%-test/queries/0_stateless/00615_nullable_alter_optimize.sql
-%%DATADIR%%-test/queries/0_stateless/00616_final_single_part.reference
-%%DATADIR%%-test/queries/0_stateless/00616_final_single_part.sql
-%%DATADIR%%-test/queries/0_stateless/00617_array_in.reference
-%%DATADIR%%-test/queries/0_stateless/00617_array_in.sql
-%%DATADIR%%-test/queries/0_stateless/00618_nullable_in.reference
-%%DATADIR%%-test/queries/0_stateless/00618_nullable_in.sql
-%%DATADIR%%-test/queries/0_stateless/00619_extract.reference
-%%DATADIR%%-test/queries/0_stateless/00619_extract.sql
-%%DATADIR%%-test/queries/0_stateless/00619_union_highlite.reference
-%%DATADIR%%-test/queries/0_stateless/00619_union_highlite.sql
-%%DATADIR%%-test/queries/0_stateless/00620_optimize_on_nonleader_replica_zookeeper.reference
-%%DATADIR%%-test/queries/0_stateless/00620_optimize_on_nonleader_replica_zookeeper.sql
-%%DATADIR%%-test/queries/0_stateless/00621_regression_for_in_operator.reference
-%%DATADIR%%-test/queries/0_stateless/00621_regression_for_in_operator.sql
-%%DATADIR%%-test/queries/0_stateless/00622_select_in_parens.reference
-%%DATADIR%%-test/queries/0_stateless/00622_select_in_parens.sql
-%%DATADIR%%-test/queries/0_stateless/00623_in_partition_key.reference
-%%DATADIR%%-test/queries/0_stateless/00623_in_partition_key.sql
-%%DATADIR%%-test/queries/0_stateless/00623_replicated_truncate_table_zookeeper.reference
-%%DATADIR%%-test/queries/0_stateless/00623_replicated_truncate_table_zookeeper.sql
-%%DATADIR%%-test/queries/0_stateless/00623_truncate_table.reference
-%%DATADIR%%-test/queries/0_stateless/00623_truncate_table.sql
-%%DATADIR%%-test/queries/0_stateless/00623_truncate_table_throw_exception.reference
-%%DATADIR%%-test/queries/0_stateless/00623_truncate_table_throw_exception.sh
-%%DATADIR%%-test/queries/0_stateless/00624_length_utf8.reference
-%%DATADIR%%-test/queries/0_stateless/00624_length_utf8.sql
-%%DATADIR%%-test/queries/0_stateless/00625_arrays_in_nested.reference
-%%DATADIR%%-test/queries/0_stateless/00625_arrays_in_nested.sql
-%%DATADIR%%-test/queries/0_stateless/00625_query_in_form_data.reference
-%%DATADIR%%-test/queries/0_stateless/00625_query_in_form_data.sh
-%%DATADIR%%-test/queries/0_stateless/00625_summing_merge_tree_merge.reference
-%%DATADIR%%-test/queries/0_stateless/00625_summing_merge_tree_merge.sql
-%%DATADIR%%-test/queries/0_stateless/00626_in_syntax.reference
-%%DATADIR%%-test/queries/0_stateless/00626_in_syntax.sql
-%%DATADIR%%-test/queries/0_stateless/00626_replace_partition_from_table.reference
-%%DATADIR%%-test/queries/0_stateless/00626_replace_partition_from_table.sql
-%%DATADIR%%-test/queries/0_stateless/00626_replace_partition_from_table_zookeeper.reference
-%%DATADIR%%-test/queries/0_stateless/00626_replace_partition_from_table_zookeeper.sh
-%%DATADIR%%-test/queries/0_stateless/00627_recursive_alias.reference
-%%DATADIR%%-test/queries/0_stateless/00627_recursive_alias.sql
-%%DATADIR%%-test/queries/0_stateless/00628_in_lambda_on_merge_table_bug.reference
-%%DATADIR%%-test/queries/0_stateless/00628_in_lambda_on_merge_table_bug.sql
-%%DATADIR%%-test/queries/0_stateless/00630_arbitrary_csv_delimiter.reference
-%%DATADIR%%-test/queries/0_stateless/00630_arbitrary_csv_delimiter.sh
-%%DATADIR%%-test/queries/0_stateless/00632_aggregation_window_funnel.reference
-%%DATADIR%%-test/queries/0_stateless/00632_aggregation_window_funnel.sql
-%%DATADIR%%-test/queries/0_stateless/00632_get_sample_block_cache.reference
-%%DATADIR%%-test/queries/0_stateless/00632_get_sample_block_cache.sql
-%%DATADIR%%-test/queries/0_stateless/00633_func_or_in.reference
-%%DATADIR%%-test/queries/0_stateless/00633_func_or_in.sql
-%%DATADIR%%-test/queries/0_stateless/00633_materialized_view_and_too_many_parts_zookeeper.reference
-%%DATADIR%%-test/queries/0_stateless/00633_materialized_view_and_too_many_parts_zookeeper.sh
-%%DATADIR%%-test/queries/0_stateless/00634_logging_shard.reference
-%%DATADIR%%-test/queries/0_stateless/00634_logging_shard.sh
-%%DATADIR%%-test/queries/0_stateless/00634_performance_introspection_and_logging.reference
-%%DATADIR%%-test/queries/0_stateless/00634_performance_introspection_and_logging.sh
-%%DATADIR%%-test/queries/0_stateless/00634_rename_view.reference
-%%DATADIR%%-test/queries/0_stateless/00634_rename_view.sql
-%%DATADIR%%-test/queries/0_stateless/00635_shard_distinct_order_by.reference
-%%DATADIR%%-test/queries/0_stateless/00635_shard_distinct_order_by.sql
+%%DATADIR%%-test/queries/0_stateless/01556_accurate_cast_or_null.sql
+%%DATADIR%%-test/queries/0_stateless/01273_arrow_load.reference
+%%DATADIR%%-test/queries/0_stateless/00973_live_view_select_prewhere.sql
+%%DATADIR%%-test/queries/0_stateless/01315_count_distinct_return_not_nullable.reference
+%%DATADIR%%-test/queries/0_stateless/00818_alias_bug_4110.sql
+%%DATADIR%%-test/queries/0_stateless/02023_storage_filelog.sh
+%%DATADIR%%-test/queries/0_stateless/01070_string_to_h3.reference
+%%DATADIR%%-test/queries/0_stateless/00605_intersections_aggregate_functions.reference
+%%DATADIR%%-test/queries/0_stateless/00471_sql_style_quoting.reference
+%%DATADIR%%-test/queries/0_stateless/00834_limit_with_constant_expressions.sql
+%%DATADIR%%-test/queries/0_stateless/01069_materialized_view_alter_target_table.sql
+%%DATADIR%%-test/queries/0_stateless/02103_sql_user_defined_functions_composition.reference
+%%DATADIR%%-test/queries/0_stateless/01554_bloom_filter_index_big_integer_uuid.sql
+%%DATADIR%%-test/queries/0_stateless/00588_shard_distributed_prewhere.reference
+%%DATADIR%%-test/queries/0_stateless/00015_totals_having_constants.reference
+%%DATADIR%%-test/queries/0_stateless/00831_quantile_weighted_parameter_check.reference
+%%DATADIR%%-test/queries/0_stateless/01318_map_populate_series.reference
 %%DATADIR%%-test/queries/0_stateless/00636_partition_key_parts_pruning.reference
-%%DATADIR%%-test/queries/0_stateless/00636_partition_key_parts_pruning.sh
-%%DATADIR%%-test/queries/0_stateless/00637_sessions_in_http_interface_and_settings.reference
-%%DATADIR%%-test/queries/0_stateless/00637_sessions_in_http_interface_and_settings.sh
-%%DATADIR%%-test/queries/0_stateless/00638_remote_ssrf.reference
-%%DATADIR%%-test/queries/0_stateless/00638_remote_ssrf.sh.disabled
-%%DATADIR%%-test/queries/0_stateless/00639_startsWith.reference
-%%DATADIR%%-test/queries/0_stateless/00639_startsWith.sql
-%%DATADIR%%-test/queries/0_stateless/00640_endsWith.reference
-%%DATADIR%%-test/queries/0_stateless/00640_endsWith.sql
-%%DATADIR%%-test/queries/0_stateless/00642_cast.reference
-%%DATADIR%%-test/queries/0_stateless/00642_cast.sql
-%%DATADIR%%-test/queries/0_stateless/00643_cast_zookeeper.reference
-%%DATADIR%%-test/queries/0_stateless/00643_cast_zookeeper.sql
-%%DATADIR%%-test/queries/0_stateless/00644_different_expressions_with_same_alias.reference
-%%DATADIR%%-test/queries/0_stateless/00644_different_expressions_with_same_alias.sql
-%%DATADIR%%-test/queries/0_stateless/00645_date_time_input_format.reference
-%%DATADIR%%-test/queries/0_stateless/00645_date_time_input_format.sql
-%%DATADIR%%-test/queries/0_stateless/00646_url_engine.python
-%%DATADIR%%-test/queries/0_stateless/00646_url_engine.reference
-%%DATADIR%%-test/queries/0_stateless/00646_url_engine.sh
-%%DATADIR%%-test/queries/0_stateless/00646_weird_mmx.reference
-%%DATADIR%%-test/queries/0_stateless/00646_weird_mmx.sql
-%%DATADIR%%-test/queries/0_stateless/00647_histogram.reference
-%%DATADIR%%-test/queries/0_stateless/00647_histogram.sql
-%%DATADIR%%-test/queries/0_stateless/00647_multiply_aggregation_state.reference
-%%DATADIR%%-test/queries/0_stateless/00647_multiply_aggregation_state.sql
-%%DATADIR%%-test/queries/0_stateless/00647_select_numbers_with_offset.reference
-%%DATADIR%%-test/queries/0_stateless/00647_select_numbers_with_offset.sql
-%%DATADIR%%-test/queries/0_stateless/00648_replacing_empty_set_from_prewhere.reference
-%%DATADIR%%-test/queries/0_stateless/00648_replacing_empty_set_from_prewhere.sql
-%%DATADIR%%-test/queries/0_stateless/00649_quantile_tdigest_negative.reference
-%%DATADIR%%-test/queries/0_stateless/00649_quantile_tdigest_negative.sql
-%%DATADIR%%-test/queries/0_stateless/00650_array_enumerate_uniq_with_tuples.reference
-%%DATADIR%%-test/queries/0_stateless/00650_array_enumerate_uniq_with_tuples.sql
-%%DATADIR%%-test/queries/0_stateless/00650_csv_with_specified_quote_rule.reference
-%%DATADIR%%-test/queries/0_stateless/00650_csv_with_specified_quote_rule.sh
-%%DATADIR%%-test/queries/0_stateless/00651_default_database_on_client_reconnect.reference
-%%DATADIR%%-test/queries/0_stateless/00651_default_database_on_client_reconnect.sh
-%%DATADIR%%-test/queries/0_stateless/00652_mergetree_mutations.reference
-%%DATADIR%%-test/queries/0_stateless/00652_mergetree_mutations.sh
-%%DATADIR%%-test/queries/0_stateless/00652_mutations_alter_update.reference
+%%DATADIR%%-test/queries/0_stateless/01626_cnf_fuzz_long.python
+%%DATADIR%%-test/queries/0_stateless/01159_combinators_with_parameters.reference
+%%DATADIR%%-test/queries/0_stateless/01891_not_in_partition_prune.reference
+%%DATADIR%%-test/queries/0_stateless/02004_invalid_partition_mutation_stuck.sql
+%%DATADIR%%-test/queries/0_stateless/00754_alter_modify_order_by.sql
+%%DATADIR%%-test/queries/0_stateless/01064_incremental_streaming_from_2_src_with_feedback.sql
+%%DATADIR%%-test/queries/0_stateless/02117_show_create_table_system.sql
+%%DATADIR%%-test/queries/0_stateless/01160_table_dependencies.sh
+%%DATADIR%%-test/queries/0_stateless/01581_deduplicate_by_columns_local.reference
+%%DATADIR%%-test/queries/0_stateless/01104_distributed_numbers_test.reference
+%%DATADIR%%-test/queries/0_stateless/01441_low_cardinality_array_index.sql
+%%DATADIR%%-test/queries/0_stateless/01062_window_view_event_hop_watch_asc.reference
+%%DATADIR%%-test/queries/0_stateless/02028_tokens.sql
+%%DATADIR%%-test/queries/0_stateless/01123_parse_date_time_best_effort_even_more.sql
+%%DATADIR%%-test/queries/0_stateless/01677_array_enumerate_bug.reference
+%%DATADIR%%-test/queries/0_stateless/01683_intdiv_ubsan.reference
+%%DATADIR%%-test/queries/0_stateless/01318_long_unsuccessful_mutation_zookeeper.reference
+%%DATADIR%%-test/queries/0_stateless/01661_arraySlice_ubsan.sql
+%%DATADIR%%-test/queries/0_stateless/01031_semi_anti_join.reference
+%%DATADIR%%-test/queries/0_stateless/00429_long_http_bufferization.reference
+%%DATADIR%%-test/queries/0_stateless/02125_recursive_sql_user_defined_functions.reference
+%%DATADIR%%-test/queries/0_stateless/00714_alter_uuid.reference
+%%DATADIR%%-test/queries/0_stateless/00999_full_join_dup_keys_crash.sql
+%%DATADIR%%-test/queries/0_stateless/00491_shard_distributed_and_aliases_in_where_having.reference
+%%DATADIR%%-test/queries/0_stateless/00254_tuple_extremes.reference
+%%DATADIR%%-test/queries/0_stateless/01661_join_complex.reference
+%%DATADIR%%-test/queries/0_stateless/00421_storage_merge__table_index.reference
+%%DATADIR%%-test/queries/0_stateless/01558_enum_as_num_in_tsv_csv_input.sql
+%%DATADIR%%-test/queries/0_stateless/02116_interactive_hello.expect
+%%DATADIR%%-test/queries/0_stateless/00719_parallel_ddl_db.reference
+%%DATADIR%%-test/queries/0_stateless/01116_asof_join_dolbyzerr.reference
+%%DATADIR%%-test/queries/0_stateless/01280_null_in.reference
+%%DATADIR%%-test/queries/0_stateless/01139_asof_join_types.reference
+%%DATADIR%%-test/queries/0_stateless/01294_system_distributed_on_cluster.reference
+%%DATADIR%%-test/queries/0_stateless/00900_long_parquet_decimal.sh
+%%DATADIR%%-test/queries/0_stateless/01803_untuple_subquery.sql
+%%DATADIR%%-test/queries/0_stateless/00976_asof_join_on.reference
+%%DATADIR%%-test/queries/0_stateless/01833_test_collation_alvarotuso.reference
+%%DATADIR%%-test/queries/0_stateless/00855_join_with_array_join.reference
+%%DATADIR%%-test/queries/0_stateless/02035_isNull_isNotNull_format.sql
+%%DATADIR%%-test/queries/0_stateless/00732_quorum_insert_simple_test_1_parts_zookeeper_long.sql
+%%DATADIR%%-test/queries/0_stateless/00597_push_down_predicate_long.reference
+%%DATADIR%%-test/queries/0_stateless/01465_ttl_recompression.reference
+%%DATADIR%%-test/queries/0_stateless/00506_union_distributed.sql
+%%DATADIR%%-test/queries/0_stateless/02127_plus_before_float.reference
+%%DATADIR%%-test/queries/0_stateless/01917_distinct_on.sql
+%%DATADIR%%-test/queries/0_stateless/01921_test_progress_bar.py
+%%DATADIR%%-test/queries/0_stateless/01762_deltasumtimestamp_datetime64.sh
+%%DATADIR%%-test/queries/0_stateless/00038_totals_limit.sql
+%%DATADIR%%-test/queries/0_stateless/01278_random_string_utf8.reference
+%%DATADIR%%-test/queries/0_stateless/01078_bloom_filter_operator_not_has.reference
+%%DATADIR%%-test/queries/0_stateless/02131_mv_many_chunks_bug.reference
+%%DATADIR%%-test/queries/0_stateless/01889_key_condition_function_chains.reference
+%%DATADIR%%-test/queries/0_stateless/01499_log_deadlock.sql
+%%DATADIR%%-test/queries/0_stateless/01293_show_clusters.sql
+%%DATADIR%%-test/queries/0_stateless/01385_not_function.sql
+%%DATADIR%%-test/queries/0_stateless/01422_array_nullable_element_nullable_index.reference
+%%DATADIR%%-test/queries/0_stateless/01881_join_on_conditions_merge.sql.j2
 %%DATADIR%%-test/queries/0_stateless/00652_mutations_alter_update.sh
-%%DATADIR%%-test/queries/0_stateless/00652_mutations_default_database.reference
-%%DATADIR%%-test/queries/0_stateless/00652_mutations_default_database.sh
-%%DATADIR%%-test/queries/0_stateless/00652_replicated_mutations_default_database_zookeeper.reference
+%%DATADIR%%-test/queries/0_stateless/01121_remote_scalar_subquery.sql
+%%DATADIR%%-test/queries/0_stateless/01747_alter_partition_key_enum_zookeeper_long.reference
+%%DATADIR%%-test/queries/0_stateless/01076_parallel_alter_replicated_zookeeper.reference
+%%DATADIR%%-test/queries/0_stateless/01592_long_window_functions1.reference
+%%DATADIR%%-test/queries/0_stateless/01006_simpod_empty_part_single_column_write.reference
+%%DATADIR%%-test/queries/0_stateless/00995_exception_while_insert.reference
+%%DATADIR%%-test/queries/0_stateless/01780_column_sparse.sql
+%%DATADIR%%-test/queries/0_stateless/00438_bit_rotate.reference
+%%DATADIR%%-test/queries/0_stateless/00422_hash_function_constexpr.reference
+%%DATADIR%%-test/queries/0_stateless/00910_client_window_size_detection.reference
+%%DATADIR%%-test/queries/0_stateless/01586_columns_pruning.sql
+%%DATADIR%%-test/queries/0_stateless/01658_values_ubsan.sql
+%%DATADIR%%-test/queries/0_stateless/00594_alias_in_distributed.reference
+%%DATADIR%%-test/queries/0_stateless/02112_with_fill_interval.reference
+%%DATADIR%%-test/queries/0_stateless/01071_in_array.reference
+%%DATADIR%%-test/queries/0_stateless/01249_bad_arguments_for_bloom_filter.reference
+%%DATADIR%%-test/queries/0_stateless/01477_lc_in_merge_join_left_key.reference
+%%DATADIR%%-test/queries/0_stateless/01657_array_element_ubsan.sql
+%%DATADIR%%-test/queries/0_stateless/00720_with_cube.sql
+%%DATADIR%%-test/queries/0_stateless/01212_empty_join_and_totals.sql
+%%DATADIR%%-test/queries/0_stateless/00457_log_tinylog_stripelog_nullable.reference
+%%DATADIR%%-test/queries/0_stateless/00926_adaptive_index_granularity_replacing_merge_tree.sql
+%%DATADIR%%-test/queries/0_stateless/01562_agg_null_for_empty_ahead.reference
+%%DATADIR%%-test/queries/0_stateless/00534_client_ignore_error.sh
+%%DATADIR%%-test/queries/0_stateless/01276_system_licenses.sql
+%%DATADIR%%-test/queries/0_stateless/01515_with_global_and_with_propagation.sql
+%%DATADIR%%-test/queries/0_stateless/01326_build_id.reference
+%%DATADIR%%-test/queries/0_stateless/01746_executable_pool_dictionary.reference
+%%DATADIR%%-test/queries/0_stateless/01305_nullable-prewhere_bug.sql
+%%DATADIR%%-test/queries/0_stateless/00936_substring_utf8_non_const.reference
+%%DATADIR%%-test/queries/0_stateless/01470_show_databases_like.sql
+%%DATADIR%%-test/queries/0_stateless/00502_custom_partitioning_local.reference
+%%DATADIR%%-test/queries/0_stateless/00825_protobuf_format_no_length_delimiter.reference
+%%DATADIR%%-test/queries/0_stateless/00175_if_num_arrays.sql
+%%DATADIR%%-test/queries/0_stateless/00180_attach_materialized_view.reference
+%%DATADIR%%-test/queries/0_stateless/00732_quorum_insert_have_data_before_quorum_zookeeper_long.sql
+%%DATADIR%%-test/queries/0_stateless/00909_arrayEnumerateUniq.sql
+%%DATADIR%%-test/queries/0_stateless/01262_low_cardinality_remove.reference
+%%DATADIR%%-test/queries/0_stateless/00990_request_splitting.reference
+%%DATADIR%%-test/queries/0_stateless/00507_array_no_params.sh
+%%DATADIR%%-test/queries/0_stateless/01760_polygon_dictionaries.sql
+%%DATADIR%%-test/queries/0_stateless/01213_point_in_Myanmar.sql
+%%DATADIR%%-test/queries/0_stateless/01556_accurate_cast_or_null.reference
 %%DATADIR%%-test/queries/0_stateless/00652_replicated_mutations_default_database_zookeeper.sh
-%%DATADIR%%-test/queries/0_stateless/00652_replicated_mutations_zookeeper.reference
-%%DATADIR%%-test/queries/0_stateless/00652_replicated_mutations_zookeeper.sh
-%%DATADIR%%-test/queries/0_stateless/00653_monotonic_integer_cast.reference
-%%DATADIR%%-test/queries/0_stateless/00653_monotonic_integer_cast.sql
-%%DATADIR%%-test/queries/0_stateless/00653_running_difference.reference
-%%DATADIR%%-test/queries/0_stateless/00653_running_difference.sql
-%%DATADIR%%-test/queries/0_stateless/00653_verification_monotonic_data_load.reference
-%%DATADIR%%-test/queries/0_stateless/00653_verification_monotonic_data_load.sh
-%%DATADIR%%-test/queries/0_stateless/00660_optimize_final_without_partition.reference
-%%DATADIR%%-test/queries/0_stateless/00660_optimize_final_without_partition.sql
-%%DATADIR%%-test/queries/0_stateless/00661_array_has_silviucpp.reference
-%%DATADIR%%-test/queries/0_stateless/00661_array_has_silviucpp.sql
+%%DATADIR%%-test/queries/0_stateless/02119_sumcount.sql
+%%DATADIR%%-test/queries/0_stateless/00834_kill_mutation_replicated_zookeeper.reference
+%%DATADIR%%-test/queries/0_stateless/01606_git_import.reference
+%%DATADIR%%-test/queries/0_stateless/01495_subqueries_in_with_statement_2.reference
+%%DATADIR%%-test/queries/0_stateless/01417_query_time_in_system_events.reference
+%%DATADIR%%-test/queries/0_stateless/01659_h3_buffer_overflow.reference
+%%DATADIR%%-test/queries/0_stateless/01391_limit_overflow.reference
+%%DATADIR%%-test/queries/0_stateless/02016_agg_empty_result_bug_28880.sql
+%%DATADIR%%-test/queries/0_stateless/00621_regression_for_in_operator.reference
+%%DATADIR%%-test/queries/0_stateless/01238_http_memory_tracking.sh
+%%DATADIR%%-test/queries/0_stateless/01105_string_like.sql
+%%DATADIR%%-test/queries/0_stateless/01082_bit_test_out_of_bound.sql
+%%DATADIR%%-test/queries/0_stateless/01259_datetime64_ubsan.reference
+%%DATADIR%%-test/queries/0_stateless/00956_sensitive_data_masking.reference
+%%DATADIR%%-test/queries/0_stateless/00353_join_by_tuple.sql
+%%DATADIR%%-test/queries/0_stateless/01753_max_uri_size.reference
+%%DATADIR%%-test/queries/0_stateless/00851_http_insert_json_defaults.sh
+%%DATADIR%%-test/queries/0_stateless/01235_live_view_over_distributed.reference
+%%DATADIR%%-test/queries/0_stateless/00091_union_race_conditions_2.reference
+%%DATADIR%%-test/queries/0_stateless/01527_clickhouse_local_optimize.reference
+%%DATADIR%%-test/queries/0_stateless/01485_256_bit_multiply.sql
+%%DATADIR%%-test/queries/0_stateless/00288_empty_stripelog.sql
+%%DATADIR%%-test/queries/0_stateless/01473_system_events_zeroes.sql
+%%DATADIR%%-test/queries/0_stateless/01753_optimize_aggregation_in_order.reference
+%%DATADIR%%-test/queries/0_stateless/01526_alter_add_and_modify_order_zookeeper.reference
+%%DATADIR%%-test/queries/0_stateless/01356_wrong_filter-type_bug.reference
+%%DATADIR%%-test/queries/0_stateless/01130_in_memory_parts_default.reference
+%%DATADIR%%-test/queries/0_stateless/01906_partition_by_multiply_by_zero.reference
+%%DATADIR%%-test/queries/0_stateless/01818_case_float_value_fangyc.sql
+%%DATADIR%%-test/queries/0_stateless/01018_insert_multiple_blocks_with_defaults.sh
+%%DATADIR%%-test/queries/0_stateless/01516_drop_table_stress_long.sh
+%%DATADIR%%-test/queries/0_stateless/01622_codec_zstd_long.sql
+%%DATADIR%%-test/queries/0_stateless/01052_window_view_proc_tumble_to_now.sh
+%%DATADIR%%-test/queries/0_stateless/02116_interactive_hello.reference
+%%DATADIR%%-test/queries/0_stateless/01117_comma_and_others_join_mix.reference
+%%DATADIR%%-test/queries/0_stateless/00092_union_race_conditions_3.reference
+%%DATADIR%%-test/queries/0_stateless/01021_create_as_select.sql
+%%DATADIR%%-test/queries/0_stateless/00225_join_duplicate_columns.reference
+%%DATADIR%%-test/queries/0_stateless/02125_transform_decimal_bug.reference
+%%DATADIR%%-test/queries/0_stateless/01932_null_valid_identifier.reference
+%%DATADIR%%-test/queries/0_stateless/00154_shard_distributed_with_distinct.sql
+%%DATADIR%%-test/queries/0_stateless/00518_extract_all_and_empty_matches.reference
+%%DATADIR%%-test/queries/0_stateless/00560_float_leading_plus_in_exponent.sql
+%%DATADIR%%-test/queries/0_stateless/00517_date_parsing.reference
+%%DATADIR%%-test/queries/0_stateless/00286_format_long_negative_float.reference
+%%DATADIR%%-test/queries/0_stateless/01594_too_low_memory_limits.config.xml
+%%DATADIR%%-test/queries/0_stateless/02129_window_functions_disable_optimizations.reference
+%%DATADIR%%-test/queries/0_stateless/00386_long_in_pk.python
+%%DATADIR%%-test/queries/0_stateless/01318_alter_add_constraint_format.sh
+%%DATADIR%%-test/queries/0_stateless/00402_nan_and_extremes.sql
+%%DATADIR%%-test/queries/0_stateless/01737_move_order_key_to_prewhere_select_final.sql
 %%DATADIR%%-test/queries/0_stateless/00661_optimize_final_replicated_without_partition_zookeeper.reference
-%%DATADIR%%-test/queries/0_stateless/00661_optimize_final_replicated_without_partition_zookeeper.sql
-%%DATADIR%%-test/queries/0_stateless/00662_array_has_nullable.reference
-%%DATADIR%%-test/queries/0_stateless/00662_array_has_nullable.sql
-%%DATADIR%%-test/queries/0_stateless/00663_tiny_log_empty_insert.reference
-%%DATADIR%%-test/queries/0_stateless/00663_tiny_log_empty_insert.sql
-%%DATADIR%%-test/queries/0_stateless/00664_cast_from_string_to_nullable.reference
-%%DATADIR%%-test/queries/0_stateless/00664_cast_from_string_to_nullable.sql
-%%DATADIR%%-test/queries/0_stateless/00665_alter_nullable_string_to_nullable_uint8.reference
-%%DATADIR%%-test/queries/0_stateless/00665_alter_nullable_string_to_nullable_uint8.sql
-%%DATADIR%%-test/queries/0_stateless/00666_uniq_complex_types.reference
-%%DATADIR%%-test/queries/0_stateless/00666_uniq_complex_types.sql
-%%DATADIR%%-test/queries/0_stateless/00667_compare_arrays_of_different_types.reference
-%%DATADIR%%-test/queries/0_stateless/00667_compare_arrays_of_different_types.sql
-%%DATADIR%%-test/queries/0_stateless/00668_compare_arrays_silviucpp.reference
-%%DATADIR%%-test/queries/0_stateless/00668_compare_arrays_silviucpp.sql
-%%DATADIR%%-test/queries/0_stateless/00670_truncate_temporary_table.reference
-%%DATADIR%%-test/queries/0_stateless/00670_truncate_temporary_table.sql
-%%DATADIR%%-test/queries/0_stateless/00671_max_intersections.reference
-%%DATADIR%%-test/queries/0_stateless/00671_max_intersections.sql
+%%DATADIR%%-test/queries/0_stateless/01107_join_right_table_totals.sql
+%%DATADIR%%-test/queries/0_stateless/01310_enum_comparison.reference
+%%DATADIR%%-test/queries/0_stateless/00332_quantile_timing_memory_leak.sql
+%%DATADIR%%-test/queries/0_stateless/01821_to_date_time_ubsan.sql
+%%DATADIR%%-test/queries/0_stateless/01747_system_session_log_long.sh
+%%DATADIR%%-test/queries/0_stateless/00997_extract_all_crash_6627.reference
+%%DATADIR%%-test/queries/0_stateless/00057_join_aliases.reference
+%%DATADIR%%-test/queries/0_stateless/02044_url_glob_parallel.reference
+%%DATADIR%%-test/queries/0_stateless/00624_length_utf8.sql
+%%DATADIR%%-test/queries/0_stateless/01916_multiple_join_view_optimize_predicate_chertus.sql
+%%DATADIR%%-test/queries/0_stateless/01070_h3_to_children.sql
+%%DATADIR%%-test/queries/0_stateless/00996_neighbor.sql
+%%DATADIR%%-test/queries/0_stateless/01925_map_populate_series_on_map.sql
+%%DATADIR%%-test/queries/0_stateless/00071_insert_fewer_columns.reference
+%%DATADIR%%-test/queries/0_stateless/00717_low_cardinaliry_distributed_group_by.sql
+%%DATADIR%%-test/queries/0_stateless/02112_skip_index_set_and_or.reference
+%%DATADIR%%-test/queries/0_stateless/01778_where_with_column_name.sql
+%%DATADIR%%-test/queries/0_stateless/00921_datetime64_basic.reference
+%%DATADIR%%-test/queries/0_stateless/01735_join_get_low_card_fix.sql
+%%DATADIR%%-test/queries/0_stateless/00702_join_on_dups.sql
+%%DATADIR%%-test/queries/0_stateless/01425_default_value_of_type_name.reference
+%%DATADIR%%-test/queries/0_stateless/02149_schema_inference.reference
+%%DATADIR%%-test/queries/0_stateless/00429_point_in_ellipses.reference
+%%DATADIR%%-test/queries/0_stateless/02000_map_full_text_bloom_filter_index.reference
+%%DATADIR%%-test/queries/0_stateless/00926_adaptive_index_granularity_versioned_collapsing_merge_tree.sql
+%%DATADIR%%-test/queries/0_stateless/00980_full_join_crash_fancyqlx.sql
+%%DATADIR%%-test/queries/0_stateless/01880_remote_ipv6.reference
+%%DATADIR%%-test/queries/0_stateless/01308_row_policy_and_trivial_count_query.sql
+%%DATADIR%%-test/queries/0_stateless/01664_array_slice_ubsan.reference
+%%DATADIR%%-test/queries/0_stateless/01880_remote_ipv6.sql
+%%DATADIR%%-test/queries/0_stateless/replication.lib
+%%DATADIR%%-test/queries/0_stateless/01244_optimize_distributed_group_by_sharding_key.sql
+%%DATADIR%%-test/queries/0_stateless/01088_array_slice_of_aggregate_functions.sql
+%%DATADIR%%-test/queries/0_stateless/01921_not_chain.sql
+%%DATADIR%%-test/queries/0_stateless/01760_modulo_negative.sql
+%%DATADIR%%-test/queries/0_stateless/00814_replicated_minimalistic_part_header_zookeeper.reference
+%%DATADIR%%-test/queries/0_stateless/01556_explain_select_with_union_query.reference
+%%DATADIR%%-test/queries/0_stateless/01936_three_parts_identifiers_in_wrong_places.reference
+%%DATADIR%%-test/queries/0_stateless/00970_substring_arg_validation.sql
+%%DATADIR%%-test/queries/0_stateless/01226_dist_on_dist_global_in.sql
+%%DATADIR%%-test/queries/0_stateless/01451_wrong_error_long_query.sh
+%%DATADIR%%-test/queries/0_stateless/00343_array_element_generic.reference
+%%DATADIR%%-test/queries/0_stateless/00938_template_input_format.sh
+%%DATADIR%%-test/queries/0_stateless/02048_alter_command_format.sh
+%%DATADIR%%-test/queries/0_stateless/00065_shard_float_literals_formatting.reference
+%%DATADIR%%-test/queries/0_stateless/01305_polygons_union.sql
+%%DATADIR%%-test/queries/0_stateless/00871_t64_codec_signed.sql
+%%DATADIR%%-test/queries/0_stateless/00098_6_union_all.sql
+%%DATADIR%%-test/queries/0_stateless/02006_use_constants_in_with_and_select.reference
+%%DATADIR%%-test/queries/0_stateless/02103_tsv_csv_custom_null_representation.sh
+%%DATADIR%%-test/queries/0_stateless/01581_deduplicate_by_columns_replicated_long.sql
+%%DATADIR%%-test/queries/0_stateless/00505_secure.reference
+%%DATADIR%%-test/queries/0_stateless/00880_decimal_in_key.reference
+%%DATADIR%%-test/queries/0_stateless/00467_qualified_names.reference
+%%DATADIR%%-test/queries/0_stateless/00969_live_view_watch_format_jsoneachrowwithprogress.sql
+%%DATADIR%%-test/queries/0_stateless/01353_neighbor_overflow.sql
+%%DATADIR%%-test/queries/0_stateless/00959_format_with_different_aliases.reference
+%%DATADIR%%-test/queries/0_stateless/01231_operator_null_in.reference
+%%DATADIR%%-test/queries/0_stateless/01851_clear_column_referenced_by_mv.sql
+%%DATADIR%%-test/queries/0_stateless/00937_test_use_header_tsv.sh
+%%DATADIR%%-test/queries/0_stateless/01142_merge_join_lc_and_nullable_in_key.sql
+%%DATADIR%%-test/queries/0_stateless/00050_any_left_join.sql
+%%DATADIR%%-test/queries/0_stateless/01081_keywords_formatting.sql
+%%DATADIR%%-test/queries/0_stateless/00178_function_replicate.sql
+%%DATADIR%%-test/queries/0_stateless/01585_fuzz_bits_with_bugfix.reference
+%%DATADIR%%-test/queries/0_stateless/01429_join_on_error_messages.sql
+%%DATADIR%%-test/queries/0_stateless/01765_move_to_table_overlapping_block_number.sql
+%%DATADIR%%-test/queries/0_stateless/00046_stored_aggregates_simple.sql
+%%DATADIR%%-test/queries/0_stateless/01811_datename.reference
+%%DATADIR%%-test/queries/0_stateless/01230_join_get_truncate.sql
+%%DATADIR%%-test/queries/0_stateless/00030_alter_table.reference
+%%DATADIR%%-test/queries/0_stateless/02028_create_select_settings.reference
+%%DATADIR%%-test/queries/0_stateless/00413_distinct.reference
+%%DATADIR%%-test/queries/0_stateless/00016_totals_having_constants.reference
+%%DATADIR%%-test/queries/0_stateless/01456_min_negative_decimal_formatting.sql
+%%DATADIR%%-test/queries/0_stateless/02045_like_function.sql
+%%DATADIR%%-test/queries/0_stateless/02016_order_by_with_fill_monotonic_functions_removal.sql
+%%DATADIR%%-test/queries/0_stateless/01225_drop_dictionary_as_table.reference
+%%DATADIR%%-test/queries/0_stateless/00276_sample.sql
+%%DATADIR%%-test/queries/0_stateless/00128_group_by_number_and_fixed_string.reference
+%%DATADIR%%-test/queries/0_stateless/01333_select_abc_asterisk.sql
+%%DATADIR%%-test/queries/0_stateless/01432_parse_date_time_best_effort_timestamp.reference
+%%DATADIR%%-test/queries/0_stateless/01373_summing_merge_tree_explicit_columns_definition.reference
+%%DATADIR%%-test/queries/0_stateless/02006_test_positional_arguments.sql
+%%DATADIR%%-test/queries/0_stateless/00566_enum_min_max.reference
+%%DATADIR%%-test/queries/0_stateless/01213_alter_table_rename_nested.sql
+%%DATADIR%%-test/queries/0_stateless/01214_test_storage_merge_aliases_with_where.sql
 %%DATADIR%%-test/queries/0_stateless/00672_arrayDistinct.reference
-%%DATADIR%%-test/queries/0_stateless/00672_arrayDistinct.sql
-%%DATADIR%%-test/queries/0_stateless/00673_subquery_prepared_set_performance.reference
-%%DATADIR%%-test/queries/0_stateless/00673_subquery_prepared_set_performance.sql
-%%DATADIR%%-test/queries/0_stateless/00674_has_array_enum.reference
-%%DATADIR%%-test/queries/0_stateless/00674_has_array_enum.sql
-%%DATADIR%%-test/queries/0_stateless/00674_join_on_syntax.reference
-%%DATADIR%%-test/queries/0_stateless/00674_join_on_syntax.sql
-%%DATADIR%%-test/queries/0_stateless/00675_shard_remote_with_table_function.reference
-%%DATADIR%%-test/queries/0_stateless/00675_shard_remote_with_table_function.sql
-%%DATADIR%%-test/queries/0_stateless/00676_group_by_in.reference
-%%DATADIR%%-test/queries/0_stateless/00676_group_by_in.sql
-%%DATADIR%%-test/queries/0_stateless/00677_shard_any_heavy_merge.reference
-%%DATADIR%%-test/queries/0_stateless/00677_shard_any_heavy_merge.sql
-%%DATADIR%%-test/queries/0_stateless/00678_murmurhash.reference
-%%DATADIR%%-test/queries/0_stateless/00678_murmurhash.sql
-%%DATADIR%%-test/queries/0_stateless/00678_shard_funnel_window.reference
-%%DATADIR%%-test/queries/0_stateless/00678_shard_funnel_window.sql
-%%DATADIR%%-test/queries/0_stateless/00679_replace_asterisk.reference
-%%DATADIR%%-test/queries/0_stateless/00679_replace_asterisk.sql
-%%DATADIR%%-test/queries/0_stateless/00679_uuid_in_key.reference
-%%DATADIR%%-test/queries/0_stateless/00679_uuid_in_key.sql
-%%DATADIR%%-test/queries/0_stateless/00680_duplicate_columns_inside_union_all.reference
-%%DATADIR%%-test/queries/0_stateless/00680_duplicate_columns_inside_union_all.sql
-%%DATADIR%%-test/queries/0_stateless/00681_duplicate_columns_inside_union_all_stas_sviridov.reference
-%%DATADIR%%-test/queries/0_stateless/00681_duplicate_columns_inside_union_all_stas_sviridov.sql
-%%DATADIR%%-test/queries/0_stateless/00682_empty_parts_merge.reference
-%%DATADIR%%-test/queries/0_stateless/00682_empty_parts_merge.sh
-%%DATADIR%%-test/queries/0_stateless/00685_output_format_json_escape_forward_slashes.reference
-%%DATADIR%%-test/queries/0_stateless/00685_output_format_json_escape_forward_slashes.sql
-%%DATADIR%%-test/queries/0_stateless/00686_client_exit_code.reference
-%%DATADIR%%-test/queries/0_stateless/00686_client_exit_code.sh
-%%DATADIR%%-test/queries/0_stateless/00687_insert_into_mv.reference
-%%DATADIR%%-test/queries/0_stateless/00687_insert_into_mv.sql
-%%DATADIR%%-test/queries/0_stateless/00687_top_and_offset.reference
-%%DATADIR%%-test/queries/0_stateless/00687_top_and_offset.sh
-%%DATADIR%%-test/queries/0_stateless/00688_aggregation_retention.reference
-%%DATADIR%%-test/queries/0_stateless/00688_aggregation_retention.sql
-%%DATADIR%%-test/queries/0_stateless/00688_case_without_else.reference
-%%DATADIR%%-test/queries/0_stateless/00688_case_without_else.sql
-%%DATADIR%%-test/queries/0_stateless/00688_low_cardinality_alter_add_column.reference
-%%DATADIR%%-test/queries/0_stateless/00688_low_cardinality_alter_add_column.sql
-%%DATADIR%%-test/queries/0_stateless/00688_low_cardinality_defaults.reference
-%%DATADIR%%-test/queries/0_stateless/00688_low_cardinality_defaults.sql
-%%DATADIR%%-test/queries/0_stateless/00688_low_cardinality_dictionary_deserialization.reference
-%%DATADIR%%-test/queries/0_stateless/00688_low_cardinality_dictionary_deserialization.sql
-%%DATADIR%%-test/queries/0_stateless/00688_low_cardinality_in.reference
-%%DATADIR%%-test/queries/0_stateless/00688_low_cardinality_in.sql
-%%DATADIR%%-test/queries/0_stateless/00688_low_cardinality_nullable_cast.reference
-%%DATADIR%%-test/queries/0_stateless/00688_low_cardinality_nullable_cast.sql
-%%DATADIR%%-test/queries/0_stateless/00688_low_cardinality_prewhere.reference
-%%DATADIR%%-test/queries/0_stateless/00688_low_cardinality_prewhere.sql
-%%DATADIR%%-test/queries/0_stateless/00688_low_cardinality_serialization.reference
-%%DATADIR%%-test/queries/0_stateless/00688_low_cardinality_serialization.sql
-%%DATADIR%%-test/queries/0_stateless/00688_low_cardinality_syntax.reference
-%%DATADIR%%-test/queries/0_stateless/00688_low_cardinality_syntax.sql
-%%DATADIR%%-test/queries/0_stateless/00689_file.txt
-%%DATADIR%%-test/queries/0_stateless/00689_join_table_function.reference
-%%DATADIR%%-test/queries/0_stateless/00689_join_table_function.sql
-%%DATADIR%%-test/queries/0_stateless/00690_insert_select_converting_exception_message.reference
-%%DATADIR%%-test/queries/0_stateless/00690_insert_select_converting_exception_message.sh
-%%DATADIR%%-test/queries/0_stateless/00691_array_distinct.reference
-%%DATADIR%%-test/queries/0_stateless/00691_array_distinct.sql
-%%DATADIR%%-test/queries/0_stateless/00692_if_exception_code.reference
-%%DATADIR%%-test/queries/0_stateless/00692_if_exception_code.sql
-%%DATADIR%%-test/queries/0_stateless/00693_max_block_size_system_tables_columns.reference
-%%DATADIR%%-test/queries/0_stateless/00693_max_block_size_system_tables_columns.sql
-%%DATADIR%%-test/queries/0_stateless/00694_max_block_size_zero.reference
-%%DATADIR%%-test/queries/0_stateless/00694_max_block_size_zero.sql
-%%DATADIR%%-test/queries/0_stateless/00695_pretty_max_column_pad_width.reference
-%%DATADIR%%-test/queries/0_stateless/00695_pretty_max_column_pad_width.sql
-%%DATADIR%%-test/queries/0_stateless/00696_system_columns_limit.reference
-%%DATADIR%%-test/queries/0_stateless/00696_system_columns_limit.sql
-%%DATADIR%%-test/queries/0_stateless/00697_in_subquery_shard.reference
-%%DATADIR%%-test/queries/0_stateless/00697_in_subquery_shard.sql
-%%DATADIR%%-test/queries/0_stateless/00698_validate_array_sizes_for_nested.reference
-%%DATADIR%%-test/queries/0_stateless/00698_validate_array_sizes_for_nested.sql
-%%DATADIR%%-test/queries/0_stateless/00698_validate_array_sizes_for_nested_kshvakov.reference
-%%DATADIR%%-test/queries/0_stateless/00698_validate_array_sizes_for_nested_kshvakov.sql
-%%DATADIR%%-test/queries/0_stateless/00699_materialized_view_mutations.reference
-%%DATADIR%%-test/queries/0_stateless/00699_materialized_view_mutations.sh
-%%DATADIR%%-test/queries/0_stateless/00700_decimal_aggregates.reference
-%%DATADIR%%-test/queries/0_stateless/00700_decimal_aggregates.sql
-%%DATADIR%%-test/queries/0_stateless/00700_decimal_arithm.reference
-%%DATADIR%%-test/queries/0_stateless/00700_decimal_arithm.sql
-%%DATADIR%%-test/queries/0_stateless/00700_decimal_array_functions.reference
-%%DATADIR%%-test/queries/0_stateless/00700_decimal_array_functions.sql
-%%DATADIR%%-test/queries/0_stateless/00700_decimal_bounds.reference
-%%DATADIR%%-test/queries/0_stateless/00700_decimal_bounds.sql
-%%DATADIR%%-test/queries/0_stateless/00700_decimal_casts.reference
-%%DATADIR%%-test/queries/0_stateless/00700_decimal_casts.sql
-%%DATADIR%%-test/queries/0_stateless/00700_decimal_casts_2.reference
-%%DATADIR%%-test/queries/0_stateless/00700_decimal_casts_2.sql
-%%DATADIR%%-test/queries/0_stateless/00700_decimal_compare.reference
-%%DATADIR%%-test/queries/0_stateless/00700_decimal_compare.sql
-%%DATADIR%%-test/queries/0_stateless/00700_decimal_complex_types.reference
-%%DATADIR%%-test/queries/0_stateless/00700_decimal_complex_types.sql
-%%DATADIR%%-test/queries/0_stateless/00700_decimal_defaults.reference
-%%DATADIR%%-test/queries/0_stateless/00700_decimal_defaults.sql
-%%DATADIR%%-test/queries/0_stateless/00700_decimal_empty_aggregates.reference
-%%DATADIR%%-test/queries/0_stateless/00700_decimal_empty_aggregates.sql
-%%DATADIR%%-test/queries/0_stateless/00700_decimal_formats.reference
-%%DATADIR%%-test/queries/0_stateless/00700_decimal_formats.sql
-%%DATADIR%%-test/queries/0_stateless/00700_decimal_gathers.reference
-%%DATADIR%%-test/queries/0_stateless/00700_decimal_gathers.sql
-%%DATADIR%%-test/queries/0_stateless/00700_decimal_in_keys.reference
-%%DATADIR%%-test/queries/0_stateless/00700_decimal_in_keys.sql
-%%DATADIR%%-test/queries/0_stateless/00700_decimal_math.reference
-%%DATADIR%%-test/queries/0_stateless/00700_decimal_math.sql
-%%DATADIR%%-test/queries/0_stateless/00700_decimal_null.reference
-%%DATADIR%%-test/queries/0_stateless/00700_decimal_null.sql
+%%DATADIR%%-test/queries/0_stateless/01651_lc_insert_tiny_log.reference
+%%DATADIR%%-test/queries/0_stateless/01051_random_printable_ascii.sql
+%%DATADIR%%-test/queries/0_stateless/01597_columns_list_ignored.sh
 %%DATADIR%%-test/queries/0_stateless/00700_decimal_round.reference
-%%DATADIR%%-test/queries/0_stateless/00700_decimal_round.sql
-%%DATADIR%%-test/queries/0_stateless/00700_to_decimal_or_something.reference
-%%DATADIR%%-test/queries/0_stateless/00700_to_decimal_or_something.sql
-%%DATADIR%%-test/queries/0_stateless/00701_context_use_after_free.reference
-%%DATADIR%%-test/queries/0_stateless/00701_context_use_after_free.sql
-%%DATADIR%%-test/queries/0_stateless/00701_join_default_strictness.reference
-%%DATADIR%%-test/queries/0_stateless/00701_join_default_strictness.sql
-%%DATADIR%%-test/queries/0_stateless/00701_rollup.reference
-%%DATADIR%%-test/queries/0_stateless/00701_rollup.sql
+%%DATADIR%%-test/queries/0_stateless/01323_bad_arg_in_arithmetic_operations.sql
+%%DATADIR%%-test/queries/0_stateless/00964_bloom_index_string_functions.sh
+%%DATADIR%%-test/queries/0_stateless/02148_cast_type_parsing.sql
+%%DATADIR%%-test/queries/0_stateless/02007_ipv4_and_ipv6_to_and_from_string.reference
+%%DATADIR%%-test/queries/0_stateless/01715_tuple_insert_null_as_default.sql
+%%DATADIR%%-test/queries/0_stateless/01117_chain_finalize_bug.sql
+%%DATADIR%%-test/queries/0_stateless/01191_rename_dictionary.reference
+%%DATADIR%%-test/queries/0_stateless/01161_all_system_tables.sh
+%%DATADIR%%-test/queries/0_stateless/01240_join_get_or_null.sql
+%%DATADIR%%-test/queries/0_stateless/01501_cache_dictionary_all_fields.reference
+%%DATADIR%%-test/queries/0_stateless/02095_function_get_os_kernel_version.reference
+%%DATADIR%%-test/queries/0_stateless/01942_snowflakeToDateTime.sql
+%%DATADIR%%-test/queries/0_stateless/01656_test_hex_mysql_dialect.reference
+%%DATADIR%%-test/queries/0_stateless/00253_insert_recursive_defaults.sql
+%%DATADIR%%-test/queries/0_stateless/01199_url_functions_path_without_schema_yiurule.sql
+%%DATADIR%%-test/queries/0_stateless/01822_short_circuit.sql
+%%DATADIR%%-test/queries/0_stateless/01691_DateTime64_clamp.sql
+%%DATADIR%%-test/queries/0_stateless/00613_shard_distributed_max_execution_time.sql
 %%DATADIR%%-test/queries/0_stateless/00702_join_on_dups.reference
-%%DATADIR%%-test/queries/0_stateless/00702_join_on_dups.sql
-%%DATADIR%%-test/queries/0_stateless/00702_join_with_using.reference
-%%DATADIR%%-test/queries/0_stateless/00702_join_with_using.sql
-%%DATADIR%%-test/queries/0_stateless/00702_join_with_using_dups.reference
-%%DATADIR%%-test/queries/0_stateless/00702_join_with_using_dups.sql
-%%DATADIR%%-test/queries/0_stateless/00702_where_with_quailified_names.reference
-%%DATADIR%%-test/queries/0_stateless/00702_where_with_quailified_names.sql
-%%DATADIR%%-test/queries/0_stateless/00703_join_crash.reference
-%%DATADIR%%-test/queries/0_stateless/00703_join_crash.sql
-%%DATADIR%%-test/queries/0_stateless/00704_arrayCumSumLimited_arrayDifference.reference
-%%DATADIR%%-test/queries/0_stateless/00704_arrayCumSumLimited_arrayDifference.sql
-%%DATADIR%%-test/queries/0_stateless/00704_drop_truncate_memory_table.reference
-%%DATADIR%%-test/queries/0_stateless/00704_drop_truncate_memory_table.sh
-%%DATADIR%%-test/queries/0_stateless/00705_aggregate_states_addition.reference
-%%DATADIR%%-test/queries/0_stateless/00705_aggregate_states_addition.sql
-%%DATADIR%%-test/queries/0_stateless/00705_drop_create_merge_tree.reference
-%%DATADIR%%-test/queries/0_stateless/00705_drop_create_merge_tree.sh
-%%DATADIR%%-test/queries/0_stateless/00706_iso_week_and_day_of_year.reference
-%%DATADIR%%-test/queries/0_stateless/00706_iso_week_and_day_of_year.sql
-%%DATADIR%%-test/queries/0_stateless/00707_float_csv_delimiter.reference
-%%DATADIR%%-test/queries/0_stateless/00707_float_csv_delimiter.sql
-%%DATADIR%%-test/queries/0_stateless/00709_virtual_column_partition_id.reference
-%%DATADIR%%-test/queries/0_stateless/00709_virtual_column_partition_id.sql
-%%DATADIR%%-test/queries/0_stateless/00710_array_enumerate_dense.reference
-%%DATADIR%%-test/queries/0_stateless/00710_array_enumerate_dense.sql
-%%DATADIR%%-test/queries/0_stateless/00711_array_enumerate_variants.reference
-%%DATADIR%%-test/queries/0_stateless/00711_array_enumerate_variants.sql
-%%DATADIR%%-test/queries/0_stateless/00712_nan_comparison.reference
-%%DATADIR%%-test/queries/0_stateless/00712_nan_comparison.sql
-%%DATADIR%%-test/queries/0_stateless/00712_prewhere_with_alias.reference
-%%DATADIR%%-test/queries/0_stateless/00712_prewhere_with_alias.sql
-%%DATADIR%%-test/queries/0_stateless/00712_prewhere_with_alias_and_virtual_column.reference
-%%DATADIR%%-test/queries/0_stateless/00712_prewhere_with_alias_and_virtual_column.sql
-%%DATADIR%%-test/queries/0_stateless/00712_prewhere_with_alias_bug.reference
-%%DATADIR%%-test/queries/0_stateless/00712_prewhere_with_alias_bug.sql
-%%DATADIR%%-test/queries/0_stateless/00712_prewhere_with_alias_bug_2.reference
-%%DATADIR%%-test/queries/0_stateless/00712_prewhere_with_alias_bug_2.sql
-%%DATADIR%%-test/queries/0_stateless/00712_prewhere_with_final.reference
-%%DATADIR%%-test/queries/0_stateless/00712_prewhere_with_final.sql
-%%DATADIR%%-test/queries/0_stateless/00712_prewhere_with_missing_columns.reference
-%%DATADIR%%-test/queries/0_stateless/00712_prewhere_with_missing_columns.sql
-%%DATADIR%%-test/queries/0_stateless/00712_prewhere_with_missing_columns_2.reference
-%%DATADIR%%-test/queries/0_stateless/00712_prewhere_with_missing_columns_2.sql
-%%DATADIR%%-test/queries/0_stateless/00712_prewhere_with_sampling.reference
-%%DATADIR%%-test/queries/0_stateless/00712_prewhere_with_sampling.sql
-%%DATADIR%%-test/queries/0_stateless/00712_prewhere_with_sampling_and_alias.reference
-%%DATADIR%%-test/queries/0_stateless/00712_prewhere_with_sampling_and_alias.sql
-%%DATADIR%%-test/queries/0_stateless/00713_collapsing_merge_tree.reference
-%%DATADIR%%-test/queries/0_stateless/00713_collapsing_merge_tree.sql
-%%DATADIR%%-test/queries/0_stateless/00714_alter_uuid.reference
-%%DATADIR%%-test/queries/0_stateless/00714_alter_uuid.sql
-%%DATADIR%%-test/queries/0_stateless/00714_create_temporary_table_with_in_clause.reference
-%%DATADIR%%-test/queries/0_stateless/00714_create_temporary_table_with_in_clause.sql
-%%DATADIR%%-test/queries/0_stateless/00715_bounding_ratio.reference
-%%DATADIR%%-test/queries/0_stateless/00715_bounding_ratio.sql
-%%DATADIR%%-test/queries/0_stateless/00715_fetch_merged_or_mutated_part_zookeeper.reference
-%%DATADIR%%-test/queries/0_stateless/00715_fetch_merged_or_mutated_part_zookeeper.sh
-%%DATADIR%%-test/queries/0_stateless/00715_json_each_row_input_nested.reference
-%%DATADIR%%-test/queries/0_stateless/00715_json_each_row_input_nested.sh
-%%DATADIR%%-test/queries/0_stateless/00716_allow_ddl.reference
-%%DATADIR%%-test/queries/0_stateless/00716_allow_ddl.sql
-%%DATADIR%%-test/queries/0_stateless/00717_default_join_type.reference
-%%DATADIR%%-test/queries/0_stateless/00717_default_join_type.sql
-%%DATADIR%%-test/queries/0_stateless/00717_low_cardinaliry_distributed_group_by.reference
-%%DATADIR%%-test/queries/0_stateless/00717_low_cardinaliry_distributed_group_by.sql
+%%DATADIR%%-test/queries/0_stateless/01393_benchmark_secure_port.reference
+%%DATADIR%%-test/queries/0_stateless/00446_clear_column_in_partition_zookeeper_long.sql
+%%DATADIR%%-test/queries/0_stateless/01055_compact_parts.sql
+%%DATADIR%%-test/queries/0_stateless/01373_summing_merge_tree_exclude_partition_key.sql
+%%DATADIR%%-test/queries/0_stateless/02014_query_parameters.sh
+%%DATADIR%%-test/queries/0_stateless/00488_non_ascii_column_names.reference
+%%DATADIR%%-test/queries/0_stateless/01194_http_query_id.reference
+%%DATADIR%%-test/queries/0_stateless/01061_window_view_event_hop_to_asc.reference
+%%DATADIR%%-test/queries/0_stateless/00652_mutations_default_database.reference
+%%DATADIR%%-test/queries/0_stateless/00166_functions_of_aggregation_states.sql
+%%DATADIR%%-test/queries/0_stateless/00259_hashing_tuples.sql
+%%DATADIR%%-test/queries/0_stateless/00969_live_view_watch_format_jsoneachrowwithprogress.reference
+%%DATADIR%%-test/queries/0_stateless/02126_dist_desc.sql.j2
+%%DATADIR%%-test/queries/0_stateless/00035_function_array_return_type.reference
+%%DATADIR%%-test/queries/0_stateless/00299_stripe_log_multiple_inserts.reference
+%%DATADIR%%-test/queries/0_stateless/01456_ast_optimizations_over_distributed.reference
+%%DATADIR%%-test/queries/0_stateless/01050_group_array_sample.reference
+%%DATADIR%%-test/queries/0_stateless/01854_s2_cap_union.sql
+%%DATADIR%%-test/queries/0_stateless/00570_empty_array_is_const.sql
+%%DATADIR%%-test/queries/0_stateless/01017_in_unconvertible_complex_type.reference
+%%DATADIR%%-test/queries/0_stateless/00809_add_days_segfault.reference
+%%DATADIR%%-test/queries/0_stateless/02168_avro_bug.sql
+%%DATADIR%%-test/queries/0_stateless/01755_client_highlight_multi_line_comment_regression.reference
+%%DATADIR%%-test/queries/0_stateless/01947_mv_subquery.reference
+%%DATADIR%%-test/queries/0_stateless/00132_sets.sql
+%%DATADIR%%-test/queries/0_stateless/00997_trim.sql
+%%DATADIR%%-test/queries/0_stateless/data_orc/test_null_array.orc
+%%DATADIR%%-test/queries/0_stateless/data_orc/test.orc
+%%DATADIR%%-test/queries/0_stateless/01492_format_readable_quantity.reference
+%%DATADIR%%-test/queries/0_stateless/00762_date_comparsion.reference
+%%DATADIR%%-test/queries/0_stateless/01318_alter_add_column_exists.sql
+%%DATADIR%%-test/queries/0_stateless/02151_invalid_setting_with_hints_in_query.reference
+%%DATADIR%%-test/queries/0_stateless/00966_invalid_json_must_not_parse.sql
+%%DATADIR%%-test/queries/0_stateless/00606_quantiles_and_nans.reference
+%%DATADIR%%-test/queries/0_stateless/01280_null_in.sql
+%%DATADIR%%-test/queries/0_stateless/01560_cancel_agg_func_combinator_native_name_constraint.sql
+%%DATADIR%%-test/queries/0_stateless/01418_custom_settings.sql
+%%DATADIR%%-test/queries/0_stateless/00356_analyze_aggregations_and_union_all.reference
+%%DATADIR%%-test/queries/0_stateless/01435_lcm_overflow.sql
+%%DATADIR%%-test/queries/0_stateless/00324_hashing_enums.reference
+%%DATADIR%%-test/queries/0_stateless/01772_to_start_of_hour_align.reference
+%%DATADIR%%-test/queries/0_stateless/02101_sql_user_defined_functions_create_or_replace.reference
+%%DATADIR%%-test/queries/0_stateless/01165_lost_part_empty_partition.sql
+%%DATADIR%%-test/queries/0_stateless/01932_null_valid_identifier.sql
+%%DATADIR%%-test/queries/0_stateless/01874_select_from_trailing_whitespaces.reference
+%%DATADIR%%-test/queries/0_stateless/00965_send_logs_level_concurrent_queries.sh
+%%DATADIR%%-test/queries/0_stateless/00518_extract_all_and_empty_matches.sql
+%%DATADIR%%-test/queries/0_stateless/01705_normalize_case_insensitive_function_names.sql
+%%DATADIR%%-test/queries/0_stateless/01050_engine_join_view_crash.reference
+%%DATADIR%%-test/queries/0_stateless/01521_format_readable_time_delta2.reference
+%%DATADIR%%-test/queries/0_stateless/01644_distributed_async_insert_fsync_smoke.sql
+%%DATADIR%%-test/queries/0_stateless/02043_user_defined_executable_function_implicit_cast.sql
+%%DATADIR%%-test/queries/0_stateless/01014_function_repeat_corner_cases.reference
+%%DATADIR%%-test/queries/0_stateless/00552_logical_functions_ternary.sql
+%%DATADIR%%-test/queries/0_stateless/01251_dict_is_in_infinite_loop.sql
+%%DATADIR%%-test/queries/0_stateless/00408_http_keep_alive.sh
+%%DATADIR%%-test/queries/0_stateless/00971_live_view_watch_http_heartbeat.py
+%%DATADIR%%-test/queries/0_stateless/01070_h3_to_string.sql
+%%DATADIR%%-test/queries/0_stateless/02160_h3_hex_area_Km2.reference
+%%DATADIR%%-test/queries/0_stateless/01150_ddl_guard_rwr.sh
+%%DATADIR%%-test/queries/0_stateless/01273_arrow_arrays_load.reference
+%%DATADIR%%-test/queries/0_stateless/01720_engine_file_empty_if_not_exists.sql
+%%DATADIR%%-test/queries/0_stateless/00938_fix_rwlock_segfault_long.reference
+%%DATADIR%%-test/queries/0_stateless/01908_with_unknown_column.sql
+%%DATADIR%%-test/queries/0_stateless/00814_parsing_ub.reference
+%%DATADIR%%-test/queries/0_stateless/00448_to_string_cut_to_zero.sql
+%%DATADIR%%-test/queries/0_stateless/01357_result_rows.sql
+%%DATADIR%%-test/queries/0_stateless/01655_agg_if_nullable.reference
+%%DATADIR%%-test/queries/0_stateless/01638_div_mod_ambiguities.reference
+%%DATADIR%%-test/queries/0_stateless/00763_lock_buffer_long.reference
+%%DATADIR%%-test/queries/0_stateless/01764_prefer_column_name_to_alias.sql
+%%DATADIR%%-test/queries/0_stateless/00808_not_optimize_predicate.reference
+%%DATADIR%%-test/queries/0_stateless/00695_pretty_max_column_pad_width.reference
+%%DATADIR%%-test/queries/0_stateless/01351_geohash_assert.sql
+%%DATADIR%%-test/queries/0_stateless/00136_duplicate_order_by_elems.reference
+%%DATADIR%%-test/queries/0_stateless/01064_pm_all_join_const_and_nullable.reference
+%%DATADIR%%-test/queries/0_stateless/01891_not_like_partition_prune.reference
+%%DATADIR%%-test/queries/0_stateless/00979_live_view_watch_continuous_aggregates.py
+%%DATADIR%%-test/queries/0_stateless/02098_sql_user_defined_functions_aliases.sql
+%%DATADIR%%-test/queries/0_stateless/01332_join_type_syntax_position.reference
+%%DATADIR%%-test/queries/0_stateless/02025_dictionary_view_different_db.sql
+%%DATADIR%%-test/queries/0_stateless/01051_all_join_engine.sql
+%%DATADIR%%-test/queries/0_stateless/00974_text_log_table_not_empty.reference
+%%DATADIR%%-test/queries/0_stateless/01075_in_arrays_enmk.sql
+%%DATADIR%%-test/queries/0_stateless/00435_coalesce.reference
+%%DATADIR%%-test/queries/0_stateless/01514_input_format_json_enum_as_number.sql
+%%DATADIR%%-test/queries/0_stateless/00506_shard_global_in_union.sql
+%%DATADIR%%-test/queries/0_stateless/02103_with_names_and_types_parallel_parsing.sh
+%%DATADIR%%-test/queries/0_stateless/01495_subqueries_in_with_statement_3.reference
+%%DATADIR%%-test/queries/0_stateless/02015_shard_crash_clang_12_build.reference
+%%DATADIR%%-test/queries/0_stateless/00688_low_cardinality_alter_add_column.sql
+%%DATADIR%%-test/queries/0_stateless/01702_toDateTime_from_string_clamping.reference
+%%DATADIR%%-test/queries/0_stateless/01710_minmax_count_projection.sql
+%%DATADIR%%-test/queries/0_stateless/00555_right_join_excessive_rows.reference
+%%DATADIR%%-test/queries/0_stateless/01801_dateDiff_DateTime64.sql
+%%DATADIR%%-test/queries/0_stateless/01545_url_file_format_settings.sql
+%%DATADIR%%-test/queries/0_stateless/01923_network_receive_time_metric_insert.reference
+%%DATADIR%%-test/queries/0_stateless/00634_performance_introspection_and_logging.reference
+%%DATADIR%%-test/queries/0_stateless/01699_timezoneOffset.sql
+%%DATADIR%%-test/queries/0_stateless/01913_quantile_deterministic.sh
+%%DATADIR%%-test/queries/0_stateless/01040_distributed_directory_monitor_batch_inserts.reference
+%%DATADIR%%-test/queries/0_stateless/00177_inserts_through_http_parts.reference
+%%DATADIR%%-test/queries/0_stateless/01346_array_join_mrxotey.reference
+%%DATADIR%%-test/queries/0_stateless/00752_low_cardinality_mv_1.sql
+%%DATADIR%%-test/queries/0_stateless/01426_geohash_constants.sql
+%%DATADIR%%-test/queries/0_stateless/01251_dict_is_in_infinite_loop.reference
+%%DATADIR%%-test/queries/0_stateless/01042_system_reload_dictionary_reloads_completely.reference
+%%DATADIR%%-test/queries/0_stateless/00574_empty_strings_deserialization.sh
+%%DATADIR%%-test/queries/0_stateless/01060_window_view_event_tumble_to_asc.reference
+%%DATADIR%%-test/queries/0_stateless/02113_format_row_bug.reference
+%%DATADIR%%-test/queries/0_stateless/00688_low_cardinality_syntax.sql
+%%DATADIR%%-test/queries/0_stateless/00619_union_highlite.reference
+%%DATADIR%%-test/queries/0_stateless/01635_nullable_fuzz.reference
+%%DATADIR%%-test/queries/0_stateless/01221_system_settings.reference
+%%DATADIR%%-test/queries/0_stateless/01291_distributed_low_cardinality_memory_efficient.reference
+%%DATADIR%%-test/queries/0_stateless/01259_combinator_distinct.sql
+%%DATADIR%%-test/queries/0_stateless/01672_actions_dag_merge_crash.sql
+%%DATADIR%%-test/queries/0_stateless/01069_materialized_view_alter_target_table_with_default_expression.reference
+%%DATADIR%%-test/queries/0_stateless/02099_hashed_array_dictionary_complex_key.reference
+%%DATADIR%%-test/queries/0_stateless/01117_greatest_least_case.sql
+%%DATADIR%%-test/queries/0_stateless/00328_long_case_construction.sql
+%%DATADIR%%-test/queries/0_stateless/01681_cache_dictionary_simple_key.sql
+%%DATADIR%%-test/queries/0_stateless/00472_compare_uuid_with_constant_string.reference
+%%DATADIR%%-test/queries/0_stateless/01757_optimize_skip_unused_shards_limit.sql
+%%DATADIR%%-test/queries/0_stateless/01126_month_partitioning_consistent_code.sql
+%%DATADIR%%-test/queries/0_stateless/01091_num_threads.sql
+%%DATADIR%%-test/queries/0_stateless/01319_query_formatting_in_server_log.sql
+%%DATADIR%%-test/queries/0_stateless/01066_bit_count.reference
+%%DATADIR%%-test/queries/0_stateless/00069_date_arithmetic.sql
+%%DATADIR%%-test/queries/0_stateless/00754_distributed_optimize_skip_select_on_unused_shards_with_prewhere.reference
+%%DATADIR%%-test/queries/0_stateless/00375_shard_group_uniq_array_of_string.reference
+%%DATADIR%%-test/queries/0_stateless/01351_parse_date_time_best_effort_us.sql
+%%DATADIR%%-test/queries/0_stateless/01186_conversion_to_nullable.sql
+%%DATADIR%%-test/queries/0_stateless/00800_low_cardinality_array_group_by_arg.sql
 %%DATADIR%%-test/queries/0_stateless/00717_low_cardinaliry_group_by.reference
+%%DATADIR%%-test/queries/0_stateless/00712_prewhere_with_missing_columns_2.sql
+%%DATADIR%%-test/queries/0_stateless/01853_dictionary_cache_duplicates.reference
+%%DATADIR%%-test/queries/0_stateless/01070_exception_code_in_query_log_table.reference
+%%DATADIR%%-test/queries/0_stateless/01009_global_array_join_names.sql
+%%DATADIR%%-test/queries/0_stateless/02127_plus_before_float.sh
+%%DATADIR%%-test/queries/0_stateless/01866_split_by_regexp.sql
+%%DATADIR%%-test/queries/0_stateless/00646_url_engine.sh
+%%DATADIR%%-test/queries/0_stateless/01236_distributed_over_live_view_over_distributed.sql
+%%DATADIR%%-test/queries/0_stateless/01702_system_numbers_scientific_notation.reference
+%%DATADIR%%-test/queries/0_stateless/01942_create_table_with_sample.reference
+%%DATADIR%%-test/queries/0_stateless/01070_h3_indexes_are_neighbors.reference
+%%DATADIR%%-test/queries/0_stateless/01870_modulo_partition_key.reference
+%%DATADIR%%-test/queries/0_stateless/02025_dictionary_array_nested_map.reference
+%%DATADIR%%-test/queries/0_stateless/02112_with_fill_interval.sql
+%%DATADIR%%-test/queries/0_stateless/00747_contributors.sql
+%%DATADIR%%-test/queries/0_stateless/01521_max_length_alias.reference
+%%DATADIR%%-test/queries/0_stateless/02164_clickhouse_local_interactive_exception.expect
+%%DATADIR%%-test/queries/0_stateless/01375_GROUP_BY_injective_elimination_dictGet_BAD_ARGUMENTS.reference
+%%DATADIR%%-test/queries/0_stateless/01065_array_zip_mixed_const.sql
+%%DATADIR%%-test/queries/0_stateless/01530_drop_database_atomic_sync.reference
+%%DATADIR%%-test/queries/0_stateless/01375_storage_file_write_prefix_csv_with_names.reference
+%%DATADIR%%-test/queries/0_stateless/01567_system_processes_current_database.reference
+%%DATADIR%%-test/queries/0_stateless/01090_fixed_string_bit_ops.sql
+%%DATADIR%%-test/queries/0_stateless/00502_custom_partitioning_replicated_zookeeper_long.sql
+%%DATADIR%%-test/queries/0_stateless/01293_client_interactive_vertical_multiline.expect
+%%DATADIR%%-test/queries/0_stateless/00473_output_format_json_quote_denormals.reference
+%%DATADIR%%-test/queries/0_stateless/01881_join_on_conditions_hash.reference.j2
+%%DATADIR%%-test/queries/0_stateless/01407_lambda_arrayJoin.sql
+%%DATADIR%%-test/queries/0_stateless/00387_use_client_time_zone.sh
+%%DATADIR%%-test/queries/0_stateless/00852_any_join_nulls.reference
+%%DATADIR%%-test/queries/0_stateless/01077_mutations_index_consistency.reference
+%%DATADIR%%-test/queries/0_stateless/00111_shard_external_sort_distributed.sql
+%%DATADIR%%-test/queries/0_stateless/02123_MySQLWire_regression.sql
+%%DATADIR%%-test/queries/0_stateless/01034_with_fill_and_push_down_predicate.sql
+%%DATADIR%%-test/queries/0_stateless/00973_live_view_with_subquery_select_with_aggregation.reference
+%%DATADIR%%-test/queries/0_stateless/01932_global_in_function.sql
+%%DATADIR%%-test/queries/0_stateless/01944_insert_partition_by.reference
+%%DATADIR%%-test/queries/0_stateless/00668_compare_arrays_silviucpp.sql
+%%DATADIR%%-test/queries/0_stateless/01647_clickhouse_local_hung.sh
+%%DATADIR%%-test/queries/0_stateless/01004_rename_deadlock.reference
+%%DATADIR%%-test/queries/0_stateless/00465_nullable_default.sql
+%%DATADIR%%-test/queries/0_stateless/01626_cnf_test.sql
+%%DATADIR%%-test/queries/0_stateless/00681_duplicate_columns_inside_union_all_stas_sviridov.sql
+%%DATADIR%%-test/queries/0_stateless/01770_add_months_ubsan.sql
+%%DATADIR%%-test/queries/0_stateless/01031_mutations_interpreter_and_context.reference
+%%DATADIR%%-test/queries/0_stateless/01822_async_read_from_socket_crash.sh
+%%DATADIR%%-test/queries/0_stateless/00650_csv_with_specified_quote_rule.reference
+%%DATADIR%%-test/queries/0_stateless/01042_check_query_and_last_granule_size.reference
+%%DATADIR%%-test/queries/0_stateless/01925_test_storage_merge_aliases.reference
+%%DATADIR%%-test/queries/0_stateless/01664_decimal_ubsan.reference
+%%DATADIR%%-test/queries/0_stateless/00122_join_with_subquery_with_subquery.sql
+%%DATADIR%%-test/queries/0_stateless/01387_clear_column_default_depends.reference
+%%DATADIR%%-test/queries/0_stateless/00825_protobuf_format_squares.sh
+%%DATADIR%%-test/queries/0_stateless/01483_merge_table_join_and_group_by.sql
+%%DATADIR%%-test/queries/0_stateless/01417_freeze_partition_verbose_zookeeper.sh
+%%DATADIR%%-test/queries/0_stateless/00587_union_all_type_conversions.sql
+%%DATADIR%%-test/queries/0_stateless/01036_union_different_columns.reference
+%%DATADIR%%-test/queries/0_stateless/01607_arrays_as_nested_csv.sh
+%%DATADIR%%-test/queries/0_stateless/01275_parallel_mv.reference
+%%DATADIR%%-test/queries/0_stateless/00564_versioned_collapsing_merge_tree.reference
 %%DATADIR%%-test/queries/0_stateless/00717_low_cardinaliry_group_by.sql
-%%DATADIR%%-test/queries/0_stateless/00717_merge_and_distributed.reference
-%%DATADIR%%-test/queries/0_stateless/00717_merge_and_distributed.sql
-%%DATADIR%%-test/queries/0_stateless/00718_format_datetime.reference
-%%DATADIR%%-test/queries/0_stateless/00718_format_datetime.sql
-%%DATADIR%%-test/queries/0_stateless/00718_low_cardinaliry_alter.reference
-%%DATADIR%%-test/queries/0_stateless/00718_low_cardinaliry_alter.sql
-%%DATADIR%%-test/queries/0_stateless/00719_format_datetime_rand.reference
-%%DATADIR%%-test/queries/0_stateless/00719_format_datetime_rand.sql
-%%DATADIR%%-test/queries/0_stateless/00719_insert_block_without_column.reference
-%%DATADIR%%-test/queries/0_stateless/00719_insert_block_without_column.sh
-%%DATADIR%%-test/queries/0_stateless/00719_parallel_ddl_db.reference
-%%DATADIR%%-test/queries/0_stateless/00719_parallel_ddl_db.sh
-%%DATADIR%%-test/queries/0_stateless/00719_parallel_ddl_table.reference
-%%DATADIR%%-test/queries/0_stateless/00719_parallel_ddl_table.sh
-%%DATADIR%%-test/queries/0_stateless/00720_combinations_of_aggregate_combinators.reference
-%%DATADIR%%-test/queries/0_stateless/00720_combinations_of_aggregate_combinators.sql
-%%DATADIR%%-test/queries/0_stateless/00720_with_cube.reference
-%%DATADIR%%-test/queries/0_stateless/00720_with_cube.sql
-%%DATADIR%%-test/queries/0_stateless/00721_force_by_identical_result_after_merge_zookeeper.reference
-%%DATADIR%%-test/queries/0_stateless/00721_force_by_identical_result_after_merge_zookeeper.sql
-%%DATADIR%%-test/queries/0_stateless/00722_inner_join.reference
-%%DATADIR%%-test/queries/0_stateless/00722_inner_join.sql
-%%DATADIR%%-test/queries/0_stateless/00723_remerge_sort.reference
-%%DATADIR%%-test/queries/0_stateless/00723_remerge_sort.sql
-%%DATADIR%%-test/queries/0_stateless/00724_insert_values_datetime_conversion.reference
-%%DATADIR%%-test/queries/0_stateless/00724_insert_values_datetime_conversion.sql
-%%DATADIR%%-test/queries/0_stateless/00725_comment_columns.reference
-%%DATADIR%%-test/queries/0_stateless/00725_comment_columns.sql
+%%DATADIR%%-test/queries/0_stateless/01655_quarter_modificator_for_formatDateTime.sql
+%%DATADIR%%-test/queries/0_stateless/02101_avro_union_index_out_of_boundary.reference
+%%DATADIR%%-test/queries/0_stateless/01796_Log_rwlock_ub.sql
+%%DATADIR%%-test/queries/0_stateless/00570_empty_array_is_const.reference
+%%DATADIR%%-test/queries/0_stateless/01504_view_type_conversion.reference
+%%DATADIR%%-test/queries/0_stateless/00524_time_intervals_months_underflow.reference
+%%DATADIR%%-test/queries/0_stateless/00908_analyze_query.sql
+%%DATADIR%%-test/queries/0_stateless/00999_join_on_expression.sql
+%%DATADIR%%-test/queries/0_stateless/01710_projection_in_index.sql
+%%DATADIR%%-test/queries/0_stateless/01630_simple_aggregate_all_functions_in_summing_merge_tree.sql
+%%DATADIR%%-test/queries/0_stateless/00715_bounding_ratio.sql
+%%DATADIR%%-test/queries/0_stateless/00835_if_generic_case.reference
+%%DATADIR%%-test/queries/0_stateless/00622_select_in_parens.reference
+%%DATADIR%%-test/queries/0_stateless/01268_procfs_metrics.reference
+%%DATADIR%%-test/queries/0_stateless/02136_kill_scalar_queries.reference
+%%DATADIR%%-test/queries/0_stateless/01646_rewrite_sum_if.reference
+%%DATADIR%%-test/queries/0_stateless/00981_topK_topKWeighted_long.reference
+%%DATADIR%%-test/queries/0_stateless/00823_sequence_match_dfa.sql
+%%DATADIR%%-test/queries/0_stateless/00976_shard_low_cardinality_achimbab.sql
+%%DATADIR%%-test/queries/0_stateless/01246_extractAllGroupsHorizontal.reference
+%%DATADIR%%-test/queries/0_stateless/01797_StripeLog_rwlock_ub.reference
+%%DATADIR%%-test/queries/0_stateless/02002_sampling_and_unknown_column_bug.reference
+%%DATADIR%%-test/queries/0_stateless/00732_base64_functions.sql
+%%DATADIR%%-test/queries/0_stateless/01355_ilike.reference
+%%DATADIR%%-test/queries/0_stateless/01781_map_op_ubsan.reference
+%%DATADIR%%-test/queries/0_stateless/00236_replicated_drop_on_non_leader_zookeeper_long.sql
+%%DATADIR%%-test/queries/0_stateless/01850_dist_INSERT_preserve_error.reference
+%%DATADIR%%-test/queries/0_stateless/01073_show_tables_not_like.reference
+%%DATADIR%%-test/queries/0_stateless/02125_constant_if_condition_and_not_existing_column.reference
+%%DATADIR%%-test/queries/0_stateless/00496_substring_negative_offset.sql
+%%DATADIR%%-test/queries/0_stateless/00494_shard_alias_substitution_bug.sql
+%%DATADIR%%-test/queries/0_stateless/01516_date_time_output_format.sql
+%%DATADIR%%-test/queries/0_stateless/02003_bug_from_23515.sql
+%%DATADIR%%-test/queries/0_stateless/01259_dictionary_custom_settings_ddl.reference
+%%DATADIR%%-test/queries/0_stateless/01602_max_distributed_connections.reference
+%%DATADIR%%-test/queries/0_stateless/01323_too_many_threads_bug.sql
+%%DATADIR%%-test/queries/0_stateless/00980_crash_nullable_decimal.reference
+%%DATADIR%%-test/queries/0_stateless/02030_capnp_format.sh
+%%DATADIR%%-test/queries/0_stateless/01136_multiple_sets.reference
+%%DATADIR%%-test/queries/0_stateless/01736_null_as_default.reference
+%%DATADIR%%-test/queries/0_stateless/00985_merge_stack_overflow.reference
+%%DATADIR%%-test/queries/0_stateless/01144_join_rewrite_with_ambiguous_column_and_view.sql
+%%DATADIR%%-test/queries/0_stateless/00917_multiple_joins_denny_crane.sql
+%%DATADIR%%-test/queries/0_stateless/00899_long_attach_memory_limit.reference
+%%DATADIR%%-test/queries/0_stateless/01201_drop_column_compact_part_replicated_zookeeper_long.reference
+%%DATADIR%%-test/queries/0_stateless/00471_sql_style_quoting.sql
+%%DATADIR%%-test/queries/0_stateless/01042_check_query_and_last_granule_size.sql
+%%DATADIR%%-test/queries/0_stateless/02160_h3_rads_to_degs_degs_to_rads.sql
+%%DATADIR%%-test/queries/0_stateless/01071_in_array.sql
+%%DATADIR%%-test/queries/0_stateless/02021_prewhere_column_optimization.reference
+%%DATADIR%%-test/queries/0_stateless/01350_intdiv_nontrivial_fpe.sql
+%%DATADIR%%-test/queries/0_stateless/01675_data_type_coroutine.reference
+%%DATADIR%%-test/queries/0_stateless/01318_decrypt.reference
+%%DATADIR%%-test/queries/0_stateless/00711_array_enumerate_variants.reference
+%%DATADIR%%-test/queries/0_stateless/01076_json_each_row_array.reference
+%%DATADIR%%-test/queries/0_stateless/02112_delayed_clickhouse_client_with_queries_file.reference
+%%DATADIR%%-test/queries/0_stateless/01600_log_queries_with_extensive_info.reference
+%%DATADIR%%-test/queries/0_stateless/02096_date_time_1970_saturation.sql
+%%DATADIR%%-test/queries/0_stateless/01514_parallel_formatting.reference
+%%DATADIR%%-test/queries/0_stateless/01045_zookeeper_system_mutations_with_parts_names.reference
+%%DATADIR%%-test/queries/0_stateless/01379_with_fill_several_columns.reference
+%%DATADIR%%-test/queries/0_stateless/01085_simdjson_uint64.sql
+%%DATADIR%%-test/queries/0_stateless/01600_quota_by_forwarded_ip.reference
+%%DATADIR%%-test/queries/0_stateless/00376_shard_group_uniq_array_of_int_array.reference
+%%DATADIR%%-test/queries/0_stateless/00800_low_cardinality_distinct_numeric.reference
 %%DATADIR%%-test/queries/0_stateless/00725_ipv4_ipv6_domains.reference
-%%DATADIR%%-test/queries/0_stateless/00725_ipv4_ipv6_domains.sql
-%%DATADIR%%-test/queries/0_stateless/00725_join_on_bug_1.reference
-%%DATADIR%%-test/queries/0_stateless/00725_join_on_bug_1.sql
-%%DATADIR%%-test/queries/0_stateless/00725_join_on_bug_2.reference
-%%DATADIR%%-test/queries/0_stateless/00725_join_on_bug_2.sql
-%%DATADIR%%-test/queries/0_stateless/00725_join_on_bug_3.reference
-%%DATADIR%%-test/queries/0_stateless/00725_join_on_bug_3.sql
-%%DATADIR%%-test/queries/0_stateless/00725_join_on_bug_4.reference
-%%DATADIR%%-test/queries/0_stateless/00725_join_on_bug_4.sql
-%%DATADIR%%-test/queries/0_stateless/00725_memory_tracking.reference
-%%DATADIR%%-test/queries/0_stateless/00725_memory_tracking.sql
-%%DATADIR%%-test/queries/0_stateless/00725_quantiles_shard.reference
-%%DATADIR%%-test/queries/0_stateless/00725_quantiles_shard.sql
-%%DATADIR%%-test/queries/0_stateless/00726_length_aliases.reference
-%%DATADIR%%-test/queries/0_stateless/00726_length_aliases.sql
-%%DATADIR%%-test/queries/0_stateless/00726_materialized_view_concurrent.reference
+%%DATADIR%%-test/queries/0_stateless/01003_kill_query_race_condition.sh
+%%DATADIR%%-test/queries/0_stateless/00595_insert_into_view.reference
+%%DATADIR%%-test/queries/0_stateless/01455_optimize_trivial_insert_select.sql
+%%DATADIR%%-test/queries/0_stateless/01927_query_views_log_matview_exceptions.sh
+%%DATADIR%%-test/queries/0_stateless/01312_skip_empty_params.reference
+%%DATADIR%%-test/queries/0_stateless/00989_parallel_parts_loading.sql
+%%DATADIR%%-test/queries/0_stateless/00933_ttl_simple.reference
+%%DATADIR%%-test/queries/0_stateless/00800_low_cardinality_empty_array.sql
+%%DATADIR%%-test/queries/0_stateless/02155_csv_with_strings_with_slash.reference
+%%DATADIR%%-test/queries/0_stateless/00530_arrays_of_nothing.reference
+%%DATADIR%%-test/queries/0_stateless/00982_low_cardinality_setting_in_mv.reference
+%%DATADIR%%-test/queries/0_stateless/01108_restart_replicas_rename_deadlock_zookeeper.sh
+%%DATADIR%%-test/queries/0_stateless/00333_parser_number_bug.reference
+%%DATADIR%%-test/queries/0_stateless/00660_optimize_final_without_partition.sql
+%%DATADIR%%-test/queries/0_stateless/01630_simple_aggregate_all_functions_in_aggregating_merge_tree.sql
+%%DATADIR%%-test/queries/0_stateless/00378_json_quote_64bit_integers.sql
+%%DATADIR%%-test/queries/0_stateless/00901_joint_entropy.reference
+%%DATADIR%%-test/queries/0_stateless/01275_alter_rename_column_default_expr.reference
+%%DATADIR%%-test/queries/0_stateless/01868_order_by_fill_with_datetime64.reference
+%%DATADIR%%-test/queries/0_stateless/00098_h_union_all.sql
+%%DATADIR%%-test/queries/0_stateless/02052_last_granula_adjust_LOGICAL_ERROR.reference
+%%DATADIR%%-test/queries/0_stateless/00980_skip_unused_shards_without_sharding_key.sql
+%%DATADIR%%-test/queries/0_stateless/01537_fuzz_count_equal.sql
+%%DATADIR%%-test/queries/0_stateless/01103_optimize_drop_race_zookeeper.reference
+%%DATADIR%%-test/queries/0_stateless/00098_g_union_all.reference
+%%DATADIR%%-test/queries/0_stateless/00753_with_with_single_alias.sql
+%%DATADIR%%-test/queries/0_stateless/02011_dictionary_empty_attribute_list.sql
+%%DATADIR%%-test/queries/0_stateless/01081_demangle.reference
+%%DATADIR%%-test/queries/0_stateless/01055_prewhere_bugs.reference
+%%DATADIR%%-test/queries/0_stateless/00487_if_array_fixed_string.reference
+%%DATADIR%%-test/queries/0_stateless/02151_lc_prefetch.reference
+%%DATADIR%%-test/queries/0_stateless/02129_add_column_add_ttl.reference
+%%DATADIR%%-test/queries/0_stateless/00974_bitmapContains_with_primary_key.reference
+%%DATADIR%%-test/queries/0_stateless/00933_ttl_with_default.sql
+%%DATADIR%%-test/queries/0_stateless/00974_low_cardinality_cast.reference
+%%DATADIR%%-test/queries/0_stateless/00008_array_join.sql
+%%DATADIR%%-test/queries/0_stateless/01294_system_distributed_on_cluster.sql
+%%DATADIR%%-test/queries/0_stateless/01415_sticking_mutations.reference
+%%DATADIR%%-test/queries/0_stateless/01586_columns_pruning.reference
+%%DATADIR%%-test/queries/0_stateless/01527_materialized_view_stack_overflow.sql
+%%DATADIR%%-test/queries/0_stateless/01084_regexp_empty.reference
+%%DATADIR%%-test/queries/0_stateless/01824_move_to_prewhere_many_columns.reference
+%%DATADIR%%-test/queries/0_stateless/00174_compare_date_time_with_constant_string_in_in.sql
+%%DATADIR%%-test/queries/0_stateless/00525_aggregate_functions_of_nullable_that_return_non_nullable.reference
+%%DATADIR%%-test/queries/0_stateless/00181_aggregate_functions_statistics_stable.sql
+%%DATADIR%%-test/queries/0_stateless/01251_string_comparison.sql
+%%DATADIR%%-test/queries/0_stateless/01433_hex_float.sql
+%%DATADIR%%-test/queries/0_stateless/01780_column_sparse_tuple.reference
+%%DATADIR%%-test/queries/0_stateless/00677_shard_any_heavy_merge.sql
+%%DATADIR%%-test/queries/0_stateless/01373_is_zero_or_null.sql
+%%DATADIR%%-test/queries/0_stateless/00036_array_element.reference
+%%DATADIR%%-test/queries/0_stateless/01071_force_optimize_skip_unused_shards.sql
+%%DATADIR%%-test/queries/0_stateless/01932_alter_index_with_order.sql
+%%DATADIR%%-test/queries/0_stateless/00360_to_date_from_string_with_datetime.reference
+%%DATADIR%%-test/queries/0_stateless/00027_simple_argMinArray.reference
+%%DATADIR%%-test/queries/0_stateless/00394_replaceall_vector_fixed.reference
+%%DATADIR%%-test/queries/0_stateless/01666_great_circle_distance_ubsan.sql
+%%DATADIR%%-test/queries/0_stateless/00481_reading_from_last_granula.reference
+%%DATADIR%%-test/queries/0_stateless/01035_prewhere_with_alias.sql
+%%DATADIR%%-test/queries/0_stateless/01952_optimize_distributed_group_by_sharding_key.reference
+%%DATADIR%%-test/queries/0_stateless/00613_shard_distributed_max_execution_time.reference
+%%DATADIR%%-test/queries/0_stateless/01607_arrays_as_nested_csv.reference
 %%DATADIR%%-test/queries/0_stateless/00726_materialized_view_concurrent.sql
-%%DATADIR%%-test/queries/0_stateless/00726_modulo_for_date.reference
-%%DATADIR%%-test/queries/0_stateless/00726_modulo_for_date.sql
-%%DATADIR%%-test/queries/0_stateless/00727_concat.reference
-%%DATADIR%%-test/queries/0_stateless/00727_concat.sql
-%%DATADIR%%-test/queries/0_stateless/00728_json_each_row_parsing.reference
-%%DATADIR%%-test/queries/0_stateless/00728_json_each_row_parsing.sh
-%%DATADIR%%-test/queries/0_stateless/00729_prewhere_array_join.reference
-%%DATADIR%%-test/queries/0_stateless/00729_prewhere_array_join.sql
-%%DATADIR%%-test/queries/0_stateless/00730_unicode_terminal_format.reference
-%%DATADIR%%-test/queries/0_stateless/00730_unicode_terminal_format.sql
-%%DATADIR%%-test/queries/0_stateless/00731_long_merge_tree_select_opened_files.reference
-%%DATADIR%%-test/queries/0_stateless/00731_long_merge_tree_select_opened_files.sh
-%%DATADIR%%-test/queries/0_stateless/00732_base64_functions.reference
-%%DATADIR%%-test/queries/0_stateless/00732_base64_functions.sql
-%%DATADIR%%-test/queries/0_stateless/00732_decimal_summing_merge_tree.reference
-%%DATADIR%%-test/queries/0_stateless/00732_decimal_summing_merge_tree.sql
-%%DATADIR%%-test/queries/0_stateless/00732_quorum_insert_have_data_before_quorum_zookeeper.reference
-%%DATADIR%%-test/queries/0_stateless/00732_quorum_insert_have_data_before_quorum_zookeeper.sql
-%%DATADIR%%-test/queries/0_stateless/00732_quorum_insert_lost_part_and_alive_part_zookeeper.reference
-%%DATADIR%%-test/queries/0_stateless/00732_quorum_insert_lost_part_and_alive_part_zookeeper.sql
-%%DATADIR%%-test/queries/0_stateless/00732_quorum_insert_lost_part_zookeeper.reference
-%%DATADIR%%-test/queries/0_stateless/00732_quorum_insert_lost_part_zookeeper.sql
-%%DATADIR%%-test/queries/0_stateless/00732_quorum_insert_select_with_old_data_and_without_quorum_zookeeper.reference
-%%DATADIR%%-test/queries/0_stateless/00732_quorum_insert_select_with_old_data_and_without_quorum_zookeeper.sql
-%%DATADIR%%-test/queries/0_stateless/00732_quorum_insert_simple_test_1_parts_zookeeper.reference
-%%DATADIR%%-test/queries/0_stateless/00732_quorum_insert_simple_test_1_parts_zookeeper.sql
-%%DATADIR%%-test/queries/0_stateless/00732_quorum_insert_simple_test_2_parts_zookeeper.reference
-%%DATADIR%%-test/queries/0_stateless/00732_quorum_insert_simple_test_2_parts_zookeeper.sql
-%%DATADIR%%-test/queries/0_stateless/00733_if_datetime.reference
-%%DATADIR%%-test/queries/0_stateless/00733_if_datetime.sql
-%%DATADIR%%-test/queries/0_stateless/00734_timeslot.reference
-%%DATADIR%%-test/queries/0_stateless/00734_timeslot.sql
-%%DATADIR%%-test/queries/0_stateless/00735_long_conditional.reference
-%%DATADIR%%-test/queries/0_stateless/00735_long_conditional.sql
-%%DATADIR%%-test/queries/0_stateless/00735_or_expr_optimize_bug.reference
+%%DATADIR%%-test/queries/0_stateless/02097_default_dict_get_add_database.sql
+%%DATADIR%%-test/queries/0_stateless/01459_manual_write_to_replicas_quorum.sh
+%%DATADIR%%-test/queries/0_stateless/02041_conversion_between_date32_and_datetime64.sql
+%%DATADIR%%-test/queries/0_stateless/02024_compile_expressions_with_short_circuit_evaluation.sql
+%%DATADIR%%-test/queries/0_stateless/00910_zookeeper_test_alter_compression_codecs_long.sql
+%%DATADIR%%-test/queries/0_stateless/01277_fromUnixTimestamp64.sql
+%%DATADIR%%-test/queries/0_stateless/00822_array_insert_default.reference
 %%DATADIR%%-test/queries/0_stateless/00735_or_expr_optimize_bug.sql
-%%DATADIR%%-test/queries/0_stateless/00736_disjunction_optimisation.reference
-%%DATADIR%%-test/queries/0_stateless/00736_disjunction_optimisation.sql
-%%DATADIR%%-test/queries/0_stateless/00737_decimal_group_by.reference
-%%DATADIR%%-test/queries/0_stateless/00737_decimal_group_by.sql
-%%DATADIR%%-test/queries/0_stateless/00738_lock_for_inner_table.reference
-%%DATADIR%%-test/queries/0_stateless/00738_lock_for_inner_table.sh
-%%DATADIR%%-test/queries/0_stateless/00738_nested_merge_multidimensional_array.reference
-%%DATADIR%%-test/queries/0_stateless/00738_nested_merge_multidimensional_array.sql
-%%DATADIR%%-test/queries/0_stateless/00739_array_element_nullable_string_mattrobenolt.reference
-%%DATADIR%%-test/queries/0_stateless/00739_array_element_nullable_string_mattrobenolt.sql
-%%DATADIR%%-test/queries/0_stateless/00740_database_in_nested_view.reference
-%%DATADIR%%-test/queries/0_stateless/00740_database_in_nested_view.sql
-%%DATADIR%%-test/queries/0_stateless/00740_optimize_predicate_expression.reference
-%%DATADIR%%-test/queries/0_stateless/00740_optimize_predicate_expression.sql
-%%DATADIR%%-test/queries/0_stateless/00741_client_comment_multiline.reference
-%%DATADIR%%-test/queries/0_stateless/00741_client_comment_multiline.sql
-%%DATADIR%%-test/queries/0_stateless/00742_require_join_strictness.reference
-%%DATADIR%%-test/queries/0_stateless/00742_require_join_strictness.sql
-%%DATADIR%%-test/queries/0_stateless/00743_limit_by_not_found_column.reference
-%%DATADIR%%-test/queries/0_stateless/00743_limit_by_not_found_column.sql
-%%DATADIR%%-test/queries/0_stateless/00744_join_not_found_column.reference
-%%DATADIR%%-test/queries/0_stateless/00744_join_not_found_column.sql
-%%DATADIR%%-test/queries/0_stateless/00745_compile_scalar_subquery.reference
-%%DATADIR%%-test/queries/0_stateless/00745_compile_scalar_subquery.sql
-%%DATADIR%%-test/queries/0_stateless/00746_compile_non_deterministic_function.reference
-%%DATADIR%%-test/queries/0_stateless/00746_compile_non_deterministic_function.sql
-%%DATADIR%%-test/queries/0_stateless/00746_hashing_tuples.reference
-%%DATADIR%%-test/queries/0_stateless/00746_hashing_tuples.sql
-%%DATADIR%%-test/queries/0_stateless/00746_sql_fuzzy.pl
-%%DATADIR%%-test/queries/0_stateless/00746_sql_fuzzy.reference
-%%DATADIR%%-test/queries/0_stateless/00746_sql_fuzzy.sh
-%%DATADIR%%-test/queries/0_stateless/00747_contributors.reference
-%%DATADIR%%-test/queries/0_stateless/00747_contributors.sql
-%%DATADIR%%-test/queries/0_stateless/00748_insert_array_with_null.reference
-%%DATADIR%%-test/queries/0_stateless/00748_insert_array_with_null.sql
-%%DATADIR%%-test/queries/0_stateless/00749_inner_join_of_unnamed_subqueries.reference
-%%DATADIR%%-test/queries/0_stateless/00749_inner_join_of_unnamed_subqueries.sql
-%%DATADIR%%-test/queries/0_stateless/00750_merge_tree_merge_with_o_direct.reference
-%%DATADIR%%-test/queries/0_stateless/00750_merge_tree_merge_with_o_direct.sql
-%%DATADIR%%-test/queries/0_stateless/00751_default_databasename_for_view.reference
-%%DATADIR%%-test/queries/0_stateless/00751_default_databasename_for_view.sql
-%%DATADIR%%-test/queries/0_stateless/00751_hashing_ints.reference
-%%DATADIR%%-test/queries/0_stateless/00751_hashing_ints.sql
-%%DATADIR%%-test/queries/0_stateless/00751_low_cardinality_nullable_group_by.reference
-%%DATADIR%%-test/queries/0_stateless/00751_low_cardinality_nullable_group_by.sql
-%%DATADIR%%-test/queries/0_stateless/00752_low_cardinality_array_result.reference
-%%DATADIR%%-test/queries/0_stateless/00752_low_cardinality_array_result.sql
-%%DATADIR%%-test/queries/0_stateless/00752_low_cardinality_lambda_argument.reference
-%%DATADIR%%-test/queries/0_stateless/00752_low_cardinality_lambda_argument.sql
-%%DATADIR%%-test/queries/0_stateless/00752_low_cardinality_left_array_join.reference
-%%DATADIR%%-test/queries/0_stateless/00752_low_cardinality_left_array_join.sql
-%%DATADIR%%-test/queries/0_stateless/00752_low_cardinality_mv_1.reference
-%%DATADIR%%-test/queries/0_stateless/00752_low_cardinality_mv_1.sql
-%%DATADIR%%-test/queries/0_stateless/00752_low_cardinality_mv_2.reference
-%%DATADIR%%-test/queries/0_stateless/00752_low_cardinality_mv_2.sql
-%%DATADIR%%-test/queries/0_stateless/00752_low_cardinality_permute.reference
-%%DATADIR%%-test/queries/0_stateless/00752_low_cardinality_permute.sql
-%%DATADIR%%-test/queries/0_stateless/00753_alter_attach.reference
-%%DATADIR%%-test/queries/0_stateless/00753_alter_attach.sql
-%%DATADIR%%-test/queries/0_stateless/00753_alter_destination_for_storage_buffer.reference
-%%DATADIR%%-test/queries/0_stateless/00753_alter_destination_for_storage_buffer.sql
-%%DATADIR%%-test/queries/0_stateless/00753_comment_columns_zookeeper.reference
-%%DATADIR%%-test/queries/0_stateless/00753_comment_columns_zookeeper.sql
-%%DATADIR%%-test/queries/0_stateless/00753_distributed_system_columns_and_system_tables.reference
-%%DATADIR%%-test/queries/0_stateless/00753_distributed_system_columns_and_system_tables.sql
-%%DATADIR%%-test/queries/0_stateless/00753_quantile_format.reference
-%%DATADIR%%-test/queries/0_stateless/00753_quantile_format.sql
-%%DATADIR%%-test/queries/0_stateless/00753_system_columns_and_system_tables_long.reference
-%%DATADIR%%-test/queries/0_stateless/00753_system_columns_and_system_tables_long.sql
-%%DATADIR%%-test/queries/0_stateless/00753_with_with_single_alias.reference
-%%DATADIR%%-test/queries/0_stateless/00753_with_with_single_alias.sql
-%%DATADIR%%-test/queries/0_stateless/00754_alter_modify_column_partitions.reference
-%%DATADIR%%-test/queries/0_stateless/00754_alter_modify_column_partitions.sql
-%%DATADIR%%-test/queries/0_stateless/00754_alter_modify_order_by.reference
-%%DATADIR%%-test/queries/0_stateless/00754_alter_modify_order_by.sql
-%%DATADIR%%-test/queries/0_stateless/00754_alter_modify_order_by_replicated_zookeeper.reference
-%%DATADIR%%-test/queries/0_stateless/00754_alter_modify_order_by_replicated_zookeeper.sql
-%%DATADIR%%-test/queries/0_stateless/00754_distributed_optimize_skip_select_on_unused_shards.reference
-%%DATADIR%%-test/queries/0_stateless/00754_distributed_optimize_skip_select_on_unused_shards.sh
-%%DATADIR%%-test/queries/0_stateless/00754_distributed_optimize_skip_select_on_unused_shards_with_prewhere.reference
+%%DATADIR%%-test/queries/0_stateless/01801_nullable_low_cardinality_tsv.sh
+%%DATADIR%%-test/queries/0_stateless/00732_quorum_insert_simple_test_2_parts_zookeeper_long.sql
+%%DATADIR%%-test/queries/0_stateless/00930_max_partitions_per_insert_block.reference
+%%DATADIR%%-test/queries/0_stateless/02030_function_mapContainsKeyLike.reference
+%%DATADIR%%-test/queries/0_stateless/02026_accurate_cast_or_default.reference
+%%DATADIR%%-test/queries/0_stateless/01034_move_partition_from_table_zookeeper.sh
+%%DATADIR%%-test/queries/0_stateless/00211_shard_query_formatting_aliases.reference
+%%DATADIR%%-test/queries/0_stateless/02012_zookeeper_changed_enum_type_incompatible.reference
+%%DATADIR%%-test/queries/0_stateless/00839_bitmask_negative.reference
+%%DATADIR%%-test/queries/0_stateless/00938_basename.sql
+%%DATADIR%%-test/queries/0_stateless/01432_parse_date_time_best_effort_timestamp.sql
+%%DATADIR%%-test/queries/0_stateless/00928_multi_match_constant_constant.reference
+%%DATADIR%%-test/queries/0_stateless/00830_join_overwrite.sql
+%%DATADIR%%-test/queries/0_stateless/01148_zookeeper_path_macros_unfolding.reference
+%%DATADIR%%-test/queries/0_stateless/01871_merge_tree_compile_expressions.reference
+%%DATADIR%%-test/queries/0_stateless/00977_join_use_nulls_denny_crane.reference
+%%DATADIR%%-test/queries/0_stateless/00405_PrettyCompactMonoBlock.reference
+%%DATADIR%%-test/queries/0_stateless/00955_test_final_mark_use.reference
+%%DATADIR%%-test/queries/0_stateless/01084_regexp_empty.sql
+%%DATADIR%%-test/queries/0_stateless/00960_live_view_watch_events_live.py
+%%DATADIR%%-test/queries/0_stateless/01031_new_any_join.sql
+%%DATADIR%%-test/queries/0_stateless/00508_materialized_view_to.reference
+%%DATADIR%%-test/queries/0_stateless/02030_quantiles_underflow.sql
+%%DATADIR%%-test/queries/0_stateless/01308_polygon_area.sql
+%%DATADIR%%-test/queries/0_stateless/00966_live_view_watch_events_http.reference
+%%DATADIR%%-test/queries/0_stateless/00920_multiply_aggregate_states_constants.reference
+%%DATADIR%%-test/queries/0_stateless/01447_json_strings.sql
+%%DATADIR%%-test/queries/0_stateless/01474_executable_dictionary.sql
+%%DATADIR%%-test/queries/0_stateless/00068_empty_tiny_log.sql
+%%DATADIR%%-test/queries/0_stateless/00550_join_insert_select.reference
+%%DATADIR%%-test/queries/0_stateless/00699_materialized_view_mutations.reference
+%%DATADIR%%-test/queries/0_stateless/01927_query_views_log_current_database.sql
+%%DATADIR%%-test/queries/0_stateless/01925_test_group_by_const_consistency.reference
+%%DATADIR%%-test/queries/0_stateless/01946_test.reference
+%%DATADIR%%-test/queries/0_stateless/01630_simple_aggregate_all_functions_in_aggregating_merge_tree.reference
+%%DATADIR%%-test/queries/0_stateless/01566_negate_formatting.reference
+%%DATADIR%%-test/queries/0_stateless/00719_parallel_ddl_table.sh
+%%DATADIR%%-test/queries/0_stateless/00719_parallel_ddl_table.reference
+%%DATADIR%%-test/queries/0_stateless/02009_decimal_no_trailing_zeros.reference
+%%DATADIR%%-test/queries/0_stateless/01540_verbatim_partition_pruning.reference
+%%DATADIR%%-test/queries/0_stateless/01674_executable_dictionary_implicit_key.reference
+%%DATADIR%%-test/queries/0_stateless/01061_window_view_event_hop_to_asc.sh
+%%DATADIR%%-test/queries/0_stateless/01668_test_toMonth_mysql_dialect.sql
+%%DATADIR%%-test/queries/0_stateless/02047_log_family_data_file_sizes.sh
+%%DATADIR%%-test/queries/0_stateless/01666_date_lut_buffer_overflow.reference
+%%DATADIR%%-test/queries/0_stateless/01085_extract_all_empty.reference
+%%DATADIR%%-test/queries/0_stateless/01285_date_datetime_key_condition.sql
+%%DATADIR%%-test/queries/0_stateless/01307_polygon_perimeter.reference
+%%DATADIR%%-test/queries/0_stateless/00184_shard_distributed_group_by_no_merge.reference
+%%DATADIR%%-test/queries/0_stateless/01660_test_toDayOfYear_mysql_compatibility.sql
+%%DATADIR%%-test/queries/0_stateless/01326_fixed_string_comparison_denny_crane.reference
+%%DATADIR%%-test/queries/0_stateless/00622_select_in_parens.sql
+%%DATADIR%%-test/queries/0_stateless/00937_test_use_header_csv.reference
+%%DATADIR%%-test/queries/0_stateless/01475_read_subcolumns_storages.reference
+%%DATADIR%%-test/queries/0_stateless/02100_low_cardinality_nullable_null_default.sh
+%%DATADIR%%-test/queries/0_stateless/01824_prefer_global_in_and_join.sql
+%%DATADIR%%-test/queries/0_stateless/00803_xxhash.sql
+%%DATADIR%%-test/queries/0_stateless/01101_prewhere_after_alter.reference
 %%DATADIR%%-test/queries/0_stateless/00754_distributed_optimize_skip_select_on_unused_shards_with_prewhere.sh
-%%DATADIR%%-test/queries/0_stateless/00754_first_significant_subdomain_more.reference
-%%DATADIR%%-test/queries/0_stateless/00754_first_significant_subdomain_more.sql
-%%DATADIR%%-test/queries/0_stateless/00755_avg_value_size_hint_passing.reference
-%%DATADIR%%-test/queries/0_stateless/00755_avg_value_size_hint_passing.sql
-%%DATADIR%%-test/queries/0_stateless/00756_power_alias.reference
-%%DATADIR%%-test/queries/0_stateless/00756_power_alias.sql
-%%DATADIR%%-test/queries/0_stateless/00757_enum_defaults.reference
-%%DATADIR%%-test/queries/0_stateless/00757_enum_defaults.sql
-%%DATADIR%%-test/queries/0_stateless/00758_array_reverse.reference
-%%DATADIR%%-test/queries/0_stateless/00758_array_reverse.sql
-%%DATADIR%%-test/queries/0_stateless/00759_kodieg.reference
-%%DATADIR%%-test/queries/0_stateless/00759_kodieg.sql
-%%DATADIR%%-test/queries/0_stateless/00760_insert_json_with_defaults.reference
-%%DATADIR%%-test/queries/0_stateless/00760_insert_json_with_defaults.sql
-%%DATADIR%%-test/queries/0_stateless/00760_url_functions_overflow.reference
-%%DATADIR%%-test/queries/0_stateless/00760_url_functions_overflow.sql
-%%DATADIR%%-test/queries/0_stateless/00761_lower_utf8_bug.reference
-%%DATADIR%%-test/queries/0_stateless/00761_lower_utf8_bug.sql
-%%DATADIR%%-test/queries/0_stateless/00762_date_comparsion.reference
-%%DATADIR%%-test/queries/0_stateless/00762_date_comparsion.sql
-%%DATADIR%%-test/queries/0_stateless/00763_create_query_as_table_engine_bug.reference
-%%DATADIR%%-test/queries/0_stateless/00763_create_query_as_table_engine_bug.sql
-%%DATADIR%%-test/queries/0_stateless/00763_lock_buffer.reference
-%%DATADIR%%-test/queries/0_stateless/00763_lock_buffer.sh
-%%DATADIR%%-test/queries/0_stateless/00763_long_lock_buffer_alter_destination_table.reference
-%%DATADIR%%-test/queries/0_stateless/00763_long_lock_buffer_alter_destination_table.sh
-%%DATADIR%%-test/queries/0_stateless/00764_max_query_size_allocation.reference
-%%DATADIR%%-test/queries/0_stateless/00764_max_query_size_allocation.sh
-%%DATADIR%%-test/queries/0_stateless/00765_sql_compatibility_aliases.reference
-%%DATADIR%%-test/queries/0_stateless/00765_sql_compatibility_aliases.sql
-%%DATADIR%%-test/queries/0_stateless/00779_all_right_join_max_block_size.reference
-%%DATADIR%%-test/queries/0_stateless/00779_all_right_join_max_block_size.sql
-%%DATADIR%%-test/queries/0_stateless/00780_unaligned_array_join.reference
+%%DATADIR%%-test/queries/0_stateless/01388_multi_if_optimization.reference
+%%DATADIR%%-test/queries/0_stateless/01159_combinators_with_parameters.sql
+%%DATADIR%%-test/queries/0_stateless/01655_test_isnull_mysql_dialect.sql
+%%DATADIR%%-test/queries/0_stateless/01260_ubsan_decimal_parse.reference
+%%DATADIR%%-test/queries/0_stateless/01622_byte_size.sql
+%%DATADIR%%-test/queries/0_stateless/00674_has_array_enum.reference
+%%DATADIR%%-test/queries/0_stateless/01526_param_uuid.sh
+%%DATADIR%%-test/queries/0_stateless/00625_summing_merge_tree_merge.sql
+%%DATADIR%%-test/queries/0_stateless/02023_transform_or_to_in.reference
+%%DATADIR%%-test/queries/0_stateless/00609_mv_index_in_in.sql
+%%DATADIR%%-test/queries/0_stateless/01509_check_parallel_quorum_inserts_long.reference
+%%DATADIR%%-test/queries/0_stateless/01057_http_compression_prefer_brotli.sh
+%%DATADIR%%-test/queries/0_stateless/01818_case_float_value_fangyc.reference
+%%DATADIR%%-test/queries/0_stateless/02010_lc_native.sh
+%%DATADIR%%-test/queries/0_stateless/00917_multiple_joins_denny_crane.reference
+%%DATADIR%%-test/queries/0_stateless/00859_distinct_with_join.sql
+%%DATADIR%%-test/queries/0_stateless/01016_null_part_minmax.sql
+%%DATADIR%%-test/queries/0_stateless/01296_pipeline_stuck.reference
+%%DATADIR%%-test/queries/0_stateless/00981_in_subquery_with_tuple.sh
+%%DATADIR%%-test/queries/0_stateless/00976_live_view_select_version.reference
+%%DATADIR%%-test/queries/0_stateless/00554_nested_and_table_engines.reference
+%%DATADIR%%-test/queries/0_stateless/01737_move_order_key_to_prewhere_select_final.reference
+%%DATADIR%%-test/queries/0_stateless/02176_toStartOfWeek_overflow_pruning.sql
+%%DATADIR%%-test/queries/0_stateless/00380_client_break_at_exception_in_batch_mode.reference
+%%DATADIR%%-test/queries/0_stateless/01428_hash_set_nan_key.reference
+%%DATADIR%%-test/queries/0_stateless/01925_date_date_time_comparison.reference
+%%DATADIR%%-test/queries/0_stateless/00567_parse_datetime_as_unix_timestamp.reference
+%%DATADIR%%-test/queries/0_stateless/02025_nested_func_for_if_combinator.sql
+%%DATADIR%%-test/queries/0_stateless/01070_h3_indexes_are_neighbors.sql
+%%DATADIR%%-test/queries/0_stateless/01941_dict_get_has_complex_single_key.reference
+%%DATADIR%%-test/queries/0_stateless/01664_ntoa_aton_mysql_compatibility.reference
+%%DATADIR%%-test/queries/0_stateless/02148_in_memory_part_flush.reference
+%%DATADIR%%-test/queries/0_stateless/01372_wrong_order_by_removal.sql
+%%DATADIR%%-test/queries/0_stateless/01157_replace_table.sql
+%%DATADIR%%-test/queries/0_stateless/01722_long_brotli_http_compression_json_format.reference
+%%DATADIR%%-test/queries/0_stateless/01944_range_max_elements.sql
+%%DATADIR%%-test/queries/0_stateless/01275_parallel_mv.sql
+%%DATADIR%%-test/queries/0_stateless/01711_cte_subquery_fix.reference
+%%DATADIR%%-test/queries/0_stateless/01086_regexp_input_format_skip_unmatched.reference
+%%DATADIR%%-test/queries/0_stateless/00940_max_parts_in_total.reference
+%%DATADIR%%-test/queries/0_stateless/02016_bit_shift_right_for_string_integer.sql
+%%DATADIR%%-test/queries/0_stateless/01650_drop_part_and_deduplication_zookeeper_long.reference
 %%DATADIR%%-test/queries/0_stateless/00780_unaligned_array_join.sql
-%%DATADIR%%-test/queries/0_stateless/00794_materialized_view_with_column_defaults.reference
-%%DATADIR%%-test/queries/0_stateless/00794_materialized_view_with_column_defaults.sql
-%%DATADIR%%-test/queries/0_stateless/00799_function_dry_run.reference
-%%DATADIR%%-test/queries/0_stateless/00799_function_dry_run.sql
-%%DATADIR%%-test/queries/0_stateless/00800_function_java_hash.reference
-%%DATADIR%%-test/queries/0_stateless/00800_function_java_hash.sql
-%%DATADIR%%-test/queries/0_stateless/00800_low_cardinality_array_group_by_arg.reference
-%%DATADIR%%-test/queries/0_stateless/00800_low_cardinality_array_group_by_arg.sql
-%%DATADIR%%-test/queries/0_stateless/00800_low_cardinality_distinct_numeric.reference
-%%DATADIR%%-test/queries/0_stateless/00800_low_cardinality_distinct_numeric.sql
-%%DATADIR%%-test/queries/0_stateless/00800_low_cardinality_distributed_insert.reference
-%%DATADIR%%-test/queries/0_stateless/00800_low_cardinality_distributed_insert.sql
-%%DATADIR%%-test/queries/0_stateless/00800_low_cardinality_empty_array.reference
-%%DATADIR%%-test/queries/0_stateless/00800_low_cardinality_empty_array.sql
-%%DATADIR%%-test/queries/0_stateless/00800_low_cardinality_join.reference
-%%DATADIR%%-test/queries/0_stateless/00800_low_cardinality_join.sql
-%%DATADIR%%-test/queries/0_stateless/00800_low_cardinality_merge_join.reference
-%%DATADIR%%-test/queries/0_stateless/00800_low_cardinality_merge_join.sql
-%%DATADIR%%-test/queries/0_stateless/00800_versatile_storage_join.reference
-%%DATADIR%%-test/queries/0_stateless/00800_versatile_storage_join.sql
-%%DATADIR%%-test/queries/0_stateless/00801_daylight_saving_time_hour_underflow.reference
-%%DATADIR%%-test/queries/0_stateless/00801_daylight_saving_time_hour_underflow.sql
-%%DATADIR%%-test/queries/0_stateless/00802_daylight_saving_time_shift_backwards_at_midnight.reference
-%%DATADIR%%-test/queries/0_stateless/00802_daylight_saving_time_shift_backwards_at_midnight.sql
-%%DATADIR%%-test/queries/0_stateless/00802_system_parts_with_datetime_partition.reference
-%%DATADIR%%-test/queries/0_stateless/00802_system_parts_with_datetime_partition.sql
-%%DATADIR%%-test/queries/0_stateless/00803_odbc_driver_2_format.reference
-%%DATADIR%%-test/queries/0_stateless/00803_odbc_driver_2_format.sql
-%%DATADIR%%-test/queries/0_stateless/00803_xxhash.reference
-%%DATADIR%%-test/queries/0_stateless/00803_xxhash.sql
-%%DATADIR%%-test/queries/0_stateless/00804_rollup_with_having.reference
-%%DATADIR%%-test/queries/0_stateless/00804_rollup_with_having.sql
-%%DATADIR%%-test/queries/0_stateless/00804_test_alter_compression_codecs.reference
-%%DATADIR%%-test/queries/0_stateless/00804_test_alter_compression_codecs.sql
-%%DATADIR%%-test/queries/0_stateless/00804_test_custom_compression_codecs.reference
-%%DATADIR%%-test/queries/0_stateless/00804_test_custom_compression_codecs.sql
-%%DATADIR%%-test/queries/0_stateless/00804_test_custom_compression_codes_log_storages.reference
-%%DATADIR%%-test/queries/0_stateless/00804_test_custom_compression_codes_log_storages.sql
-%%DATADIR%%-test/queries/0_stateless/00804_test_delta_codec_compression.reference
-%%DATADIR%%-test/queries/0_stateless/00804_test_delta_codec_compression.sql
-%%DATADIR%%-test/queries/0_stateless/00804_test_delta_codec_no_type_alter.reference
-%%DATADIR%%-test/queries/0_stateless/00804_test_delta_codec_no_type_alter.sql
-%%DATADIR%%-test/queries/0_stateless/00805_round_down.reference
-%%DATADIR%%-test/queries/0_stateless/00805_round_down.sql
-%%DATADIR%%-test/queries/0_stateless/00806_alter_update.reference
-%%DATADIR%%-test/queries/0_stateless/00806_alter_update.sql
-%%DATADIR%%-test/queries/0_stateless/00807_regexp_quote_meta.reference
-%%DATADIR%%-test/queries/0_stateless/00807_regexp_quote_meta.sql
-%%DATADIR%%-test/queries/0_stateless/00808_array_enumerate_segfault.reference
-%%DATADIR%%-test/queries/0_stateless/00808_array_enumerate_segfault.sql
-%%DATADIR%%-test/queries/0_stateless/00808_not_optimize_predicate.reference
+%%DATADIR%%-test/queries/0_stateless/01029_early_constant_folding.reference
+%%DATADIR%%-test/queries/0_stateless/01446_json_strings_each_row.reference
+%%DATADIR%%-test/queries/0_stateless/00982_low_cardinality_setting_in_mv.sql
+%%DATADIR%%-test/queries/0_stateless/01089_alter_settings_old_format.sql
+%%DATADIR%%-test/queries/0_stateless/01523_client_local_queries_file_parameter.sh
+%%DATADIR%%-test/queries/0_stateless/01601_custom_tld.sql
+%%DATADIR%%-test/queries/0_stateless/01917_system_data_skipping_indices.reference
+%%DATADIR%%-test/queries/0_stateless/01942_snowflakeToDateTime.reference
+%%DATADIR%%-test/queries/0_stateless/01674_filter_by_uint8.reference
+%%DATADIR%%-test/queries/0_stateless/00555_hasSubstr.reference
+%%DATADIR%%-test/queries/0_stateless/01351_geohash_assert.reference
+%%DATADIR%%-test/queries/0_stateless/00754_distributed_optimize_skip_select_on_unused_shards.sh
+%%DATADIR%%-test/queries/0_stateless/00702_join_with_using.reference
+%%DATADIR%%-test/queries/0_stateless/01956_fuse_quantile_optimization.reference
+%%DATADIR%%-test/queries/0_stateless/01019_Buffer_and_max_memory_usage.reference
+%%DATADIR%%-test/queries/0_stateless/01014_format_custom_separated.reference
+%%DATADIR%%-test/queries/0_stateless/00953_indices_alter_exceptions.reference
+%%DATADIR%%-test/queries/0_stateless/01479_cross_join_9855.reference
+%%DATADIR%%-test/queries/0_stateless/01321_aggregate_functions_of_group_by_keys.sql
+%%DATADIR%%-test/queries/0_stateless/00319_index_for_like.sql
+%%DATADIR%%-test/queries/0_stateless/00103_ipv4_num_to_string_class_c.reference
+%%DATADIR%%-test/queries/0_stateless/00726_length_aliases.reference
+%%DATADIR%%-test/queries/0_stateless/00321_pk_set.sql
+%%DATADIR%%-test/queries/0_stateless/01509_format_raw_blob.sh
+%%DATADIR%%-test/queries/0_stateless/00927_disable_hyperscan.sql
 %%DATADIR%%-test/queries/0_stateless/00808_not_optimize_predicate.sql
-%%DATADIR%%-test/queries/0_stateless/00809_add_days_segfault.reference
-%%DATADIR%%-test/queries/0_stateless/00809_add_days_segfault.sql
-%%DATADIR%%-test/queries/0_stateless/00810_in_operators_segfault.reference
-%%DATADIR%%-test/queries/0_stateless/00810_in_operators_segfault.sql
-%%DATADIR%%-test/queries/0_stateless/00811_garbage.reference
-%%DATADIR%%-test/queries/0_stateless/00811_garbage.sql
-%%DATADIR%%-test/queries/0_stateless/00812_prewhere_alias_array.reference
-%%DATADIR%%-test/queries/0_stateless/00812_prewhere_alias_array.sql
-%%DATADIR%%-test/queries/0_stateless/00813_parse_date_time_best_effort_more.reference
-%%DATADIR%%-test/queries/0_stateless/00813_parse_date_time_best_effort_more.sql
-%%DATADIR%%-test/queries/0_stateless/00814_parsing_ub.reference
-%%DATADIR%%-test/queries/0_stateless/00814_parsing_ub.sql
-%%DATADIR%%-test/queries/0_stateless/00814_replicated_minimalistic_part_header_zookeeper.reference
-%%DATADIR%%-test/queries/0_stateless/00814_replicated_minimalistic_part_header_zookeeper.sql
-%%DATADIR%%-test/queries/0_stateless/00815_left_join_on_stepanel.reference
-%%DATADIR%%-test/queries/0_stateless/00815_left_join_on_stepanel.sql
-%%DATADIR%%-test/queries/0_stateless/00816_join_column_names_sarg.reference
-%%DATADIR%%-test/queries/0_stateless/00816_join_column_names_sarg.sql
-%%DATADIR%%-test/queries/0_stateless/00816_long_concurrent_alter_column.reference
-%%DATADIR%%-test/queries/0_stateless/00816_long_concurrent_alter_column.sh
-%%DATADIR%%-test/queries/0_stateless/00817_with_simple.reference
-%%DATADIR%%-test/queries/0_stateless/00817_with_simple.sql
-%%DATADIR%%-test/queries/0_stateless/00818_alias_bug_4110.reference
-%%DATADIR%%-test/queries/0_stateless/00818_alias_bug_4110.sql
-%%DATADIR%%-test/queries/0_stateless/00818_inner_join_bug_3567.reference
-%%DATADIR%%-test/queries/0_stateless/00818_inner_join_bug_3567.sql
-%%DATADIR%%-test/queries/0_stateless/00818_join_bug_4271.reference
-%%DATADIR%%-test/queries/0_stateless/00818_join_bug_4271.sql
-%%DATADIR%%-test/queries/0_stateless/00819_ast_refactoring_bugs.reference
-%%DATADIR%%-test/queries/0_stateless/00819_ast_refactoring_bugs.sql
-%%DATADIR%%-test/queries/0_stateless/00819_full_join_wrong_columns_in_block.reference
-%%DATADIR%%-test/queries/0_stateless/00819_full_join_wrong_columns_in_block.sql
-%%DATADIR%%-test/queries/0_stateless/00820_multiple_joins.reference
-%%DATADIR%%-test/queries/0_stateless/00820_multiple_joins.sql
-%%DATADIR%%-test/queries/0_stateless/00820_multiple_joins_subquery_requires_alias.reference
-%%DATADIR%%-test/queries/0_stateless/00820_multiple_joins_subquery_requires_alias.sql
-%%DATADIR%%-test/queries/0_stateless/00821_distributed_storage_with_join_on.reference
-%%DATADIR%%-test/queries/0_stateless/00821_distributed_storage_with_join_on.sql
-%%DATADIR%%-test/queries/0_stateless/00822_array_insert_default.reference
-%%DATADIR%%-test/queries/0_stateless/00822_array_insert_default.sql
-%%DATADIR%%-test/queries/0_stateless/00823_capnproto_input.reference
-%%DATADIR%%-test/queries/0_stateless/00823_capnproto_input.sh
-%%DATADIR%%-test/queries/0_stateless/00823_sequence_match_dfa.reference
-%%DATADIR%%-test/queries/0_stateless/00823_sequence_match_dfa.sql
-%%DATADIR%%-test/queries/0_stateless/00824_filesystem.reference
-%%DATADIR%%-test/queries/0_stateless/00824_filesystem.sql
-%%DATADIR%%-test/queries/0_stateless/00825_http_header_query_id.reference
-%%DATADIR%%-test/queries/0_stateless/00825_http_header_query_id.sh
-%%DATADIR%%-test/queries/0_stateless/00825_protobuf_format_array_3dim.reference
-%%DATADIR%%-test/queries/0_stateless/00825_protobuf_format_array_3dim.sh
-%%DATADIR%%-test/queries/0_stateless/00825_protobuf_format_array_of_arrays.reference
-%%DATADIR%%-test/queries/0_stateless/00825_protobuf_format_array_of_arrays.sh
-%%DATADIR%%-test/queries/0_stateless/00825_protobuf_format_enum_mapping.reference
-%%DATADIR%%-test/queries/0_stateless/00825_protobuf_format_enum_mapping.sh
-%%DATADIR%%-test/queries/0_stateless/00825_protobuf_format_map.reference
-%%DATADIR%%-test/queries/0_stateless/00825_protobuf_format_map.sh
-%%DATADIR%%-test/queries/0_stateless/00825_protobuf_format_nested_in_nested.reference
-%%DATADIR%%-test/queries/0_stateless/00825_protobuf_format_nested_in_nested.sh
-%%DATADIR%%-test/queries/0_stateless/00825_protobuf_format_nested_optional.reference
-%%DATADIR%%-test/queries/0_stateless/00825_protobuf_format_nested_optional.sh
-%%DATADIR%%-test/queries/0_stateless/00825_protobuf_format_no_length_delimiter.reference
-%%DATADIR%%-test/queries/0_stateless/00825_protobuf_format_no_length_delimiter.sh
-%%DATADIR%%-test/queries/0_stateless/00825_protobuf_format_persons.reference
-%%DATADIR%%-test/queries/0_stateless/00825_protobuf_format_persons.sh
-%%DATADIR%%-test/queries/0_stateless/00825_protobuf_format_splitted_nested.reference
-%%DATADIR%%-test/queries/0_stateless/00825_protobuf_format_splitted_nested.sh
-%%DATADIR%%-test/queries/0_stateless/00825_protobuf_format_squares.reference
-%%DATADIR%%-test/queries/0_stateless/00825_protobuf_format_squares.sh
-%%DATADIR%%-test/queries/0_stateless/00825_protobuf_format_table_default.reference
-%%DATADIR%%-test/queries/0_stateless/00825_protobuf_format_table_default.sh
-%%DATADIR%%-test/queries/0_stateless/00826_cross_to_inner_join.reference
-%%DATADIR%%-test/queries/0_stateless/00826_cross_to_inner_join.sql
-%%DATADIR%%-test/queries/0_stateless/00829_bitmap64_function.reference
-%%DATADIR%%-test/queries/0_stateless/00829_bitmap64_function.sql
-%%DATADIR%%-test/queries/0_stateless/00829_bitmap_function.reference
-%%DATADIR%%-test/queries/0_stateless/00829_bitmap_function.sql
+%%DATADIR%%-test/queries/0_stateless/02155_parse_date_lowcard_default_throw.sql
+%%DATADIR%%-test/queries/0_stateless/00294_shard_enums.reference
+%%DATADIR%%-test/queries/0_stateless/00948_format_in_with_single_element.reference
+%%DATADIR%%-test/queries/0_stateless/01231_markdown_format.sql
+%%DATADIR%%-test/queries/0_stateless/00700_decimal_array_functions.reference
+%%DATADIR%%-test/queries/0_stateless/02039_group_by_with_totals_having.reference
+%%DATADIR%%-test/queries/0_stateless/01032_cityHash64_for_decimal.reference
+%%DATADIR%%-test/queries/0_stateless/01010_pmj_skip_blocks.sql
+%%DATADIR%%-test/queries/0_stateless/00879_cast_to_decimal_crash.reference
+%%DATADIR%%-test/queries/0_stateless/01338_uuid_without_separator.reference
+%%DATADIR%%-test/queries/0_stateless/01277_random_fixed_string.sql
+%%DATADIR%%-test/queries/0_stateless/00754_alter_modify_column_partitions.reference
+%%DATADIR%%-test/queries/0_stateless/01301_aggregate_state_exception_memory_leak.sh
+%%DATADIR%%-test/queries/0_stateless/01285_engine_join_donmikel.sh
+%%DATADIR%%-test/queries/0_stateless/00411_long_accurate_number_comparison_int4.sh
+%%DATADIR%%-test/queries/0_stateless/01869_reinterpret_as_fixed_string_uuid.sql
+%%DATADIR%%-test/queries/0_stateless/01104_distributed_one_test.reference
+%%DATADIR%%-test/queries/0_stateless/01767_timezoneOf.reference
+%%DATADIR%%-test/queries/0_stateless/01080_join_get_null.sql
+%%DATADIR%%-test/queries/0_stateless/02100_limit_push_down_bug.sql
+%%DATADIR%%-test/queries/0_stateless/01295_aggregation_bug_11413.reference
+%%DATADIR%%-test/queries/0_stateless/02029_orc_low_cardinality.reference
+%%DATADIR%%-test/queries/0_stateless/00228_shard_quantiles_deterministic_merge_overflow.reference
+%%DATADIR%%-test/queries/0_stateless/00461_default_value_of_argument_type.reference
+%%DATADIR%%-test/queries/0_stateless/02154_parser_backtracking.sh
+%%DATADIR%%-test/queries/0_stateless/02010_lc_native.reference
+%%DATADIR%%-test/queries/0_stateless/01553_settings_early_apply.reference
+%%DATADIR%%-test/queries/0_stateless/00066_group_by_in.sql
+%%DATADIR%%-test/queries/0_stateless/01550_type_map_formats_input.reference
+%%DATADIR%%-test/queries/0_stateless/00696_system_columns_limit.sql
+%%DATADIR%%-test/queries/0_stateless/01611_constant_folding_subqueries.reference
+%%DATADIR%%-test/queries/0_stateless/01747_transform_empty_arrays.sql
+%%DATADIR%%-test/queries/0_stateless/01692_DateTime64_from_DateTime.reference
+%%DATADIR%%-test/queries/0_stateless/00419_show_sql_queries.reference
+%%DATADIR%%-test/queries/0_stateless/01615_two_args_function_index_fix.reference
+%%DATADIR%%-test/queries/0_stateless/01449_json_compact_strings.sql
+%%DATADIR%%-test/queries/0_stateless/00458_merge_type_cast.reference
+%%DATADIR%%-test/queries/0_stateless/00307_format_xml.reference
+%%DATADIR%%-test/queries/0_stateless/00580_cast_nullable_to_non_nullable.sql
+%%DATADIR%%-test/queries/0_stateless/01593_concurrent_alter_mutations_kill_many_replicas_long.reference
+%%DATADIR%%-test/queries/0_stateless/00802_system_parts_with_datetime_partition.reference
+%%DATADIR%%-test/queries/0_stateless/00108_shard_totals_after_having.reference
+%%DATADIR%%-test/queries/0_stateless/01560_ttl_remove_empty_parts.sql
+%%DATADIR%%-test/queries/0_stateless/01851_array_difference_decimal_overflow_ubsan.sql
+%%DATADIR%%-test/queries/0_stateless/01318_map_add_map_subtract_on_map_type.reference
+%%DATADIR%%-test/queries/0_stateless/01103_distributed_product_mode_local_column_renames.reference
+%%DATADIR%%-test/queries/0_stateless/00948_values_interpreter_template.reference
+%%DATADIR%%-test/queries/0_stateless/01035_avg_weighted_long.sh
+%%DATADIR%%-test/queries/0_stateless/00481_create_view_for_null.sql
+%%DATADIR%%-test/queries/0_stateless/02024_merge_regexp_assert.sql
+%%DATADIR%%-test/queries/0_stateless/00963_startsWith_force_primary_key.sql
+%%DATADIR%%-test/queries/0_stateless/01702_system_query_log.reference
+%%DATADIR%%-test/queries/0_stateless/02111_modify_table_comment.reference
+%%DATADIR%%-test/queries/0_stateless/01047_simple_aggregate_sizes_of_columns_bug.sql
+%%DATADIR%%-test/queries/0_stateless/01202_array_auc_special.reference
+%%DATADIR%%-test/queries/0_stateless/01866_view_persist_settings.sql
+%%DATADIR%%-test/queries/0_stateless/01440_big_int_least_greatest.sql
+%%DATADIR%%-test/queries/0_stateless/00754_alter_modify_order_by_replicated_zookeeper_long.reference
+%%DATADIR%%-test/queries/0_stateless/01773_min_max_time_system_parts_datetime64.sql
+%%DATADIR%%-test/queries/0_stateless/01083_functional_index_in_mergetree.reference
+%%DATADIR%%-test/queries/0_stateless/00714_create_temporary_table_with_in_clause.sql
+%%DATADIR%%-test/queries/0_stateless/02154_parser_backtracking.reference
 %%DATADIR%%-test/queries/0_stateless/00830_join_overwrite.reference
-%%DATADIR%%-test/queries/0_stateless/00830_join_overwrite.sql
-%%DATADIR%%-test/queries/0_stateless/00831_quantile_weighted_parameter_check.reference
-%%DATADIR%%-test/queries/0_stateless/00831_quantile_weighted_parameter_check.sql
-%%DATADIR%%-test/queries/0_stateless/00832_storage_file_lock.reference
-%%DATADIR%%-test/queries/0_stateless/00832_storage_file_lock.sql
-%%DATADIR%%-test/queries/0_stateless/00833_sleep_overflow.reference
-%%DATADIR%%-test/queries/0_stateless/00833_sleep_overflow.sql
-%%DATADIR%%-test/queries/0_stateless/00834_cancel_http_readonly_queries_on_client_close.reference
-%%DATADIR%%-test/queries/0_stateless/00834_cancel_http_readonly_queries_on_client_close.sh
-%%DATADIR%%-test/queries/0_stateless/00834_date_datetime_cmp.reference
-%%DATADIR%%-test/queries/0_stateless/00834_date_datetime_cmp.sql
-%%DATADIR%%-test/queries/0_stateless/00834_dont_allow_to_set_two_configuration_files_in_client.reference
+%%DATADIR%%-test/queries/0_stateless/01550_query_identifier_parameters.reference
+%%DATADIR%%-test/queries/0_stateless/01511_prewhere_with_virtuals.reference
+%%DATADIR%%-test/queries/0_stateless/00086_concat_nary_const_with_nonconst_segfault.reference
 %%DATADIR%%-test/queries/0_stateless/00834_dont_allow_to_set_two_configuration_files_in_client.sh
-%%DATADIR%%-test/queries/0_stateless/00834_hints_for_type_function_typos.reference
-%%DATADIR%%-test/queries/0_stateless/00834_hints_for_type_function_typos.sh
-%%DATADIR%%-test/queries/0_stateless/00834_kill_mutation.reference
-%%DATADIR%%-test/queries/0_stateless/00834_kill_mutation.sh
-%%DATADIR%%-test/queries/0_stateless/00834_kill_mutation_replicated_zookeeper.reference
-%%DATADIR%%-test/queries/0_stateless/00834_kill_mutation_replicated_zookeeper.sh
-%%DATADIR%%-test/queries/0_stateless/00834_limit_with_constant_expressions.reference
-%%DATADIR%%-test/queries/0_stateless/00834_limit_with_constant_expressions.sql
-%%DATADIR%%-test/queries/0_stateless/00834_not_between.reference
-%%DATADIR%%-test/queries/0_stateless/00834_not_between.sql
-%%DATADIR%%-test/queries/0_stateless/00835_if_generic_case.reference
-%%DATADIR%%-test/queries/0_stateless/00835_if_generic_case.sql
-%%DATADIR%%-test/queries/0_stateless/00836_indices_alter.reference
-%%DATADIR%%-test/queries/0_stateless/00836_indices_alter.sql
-%%DATADIR%%-test/queries/0_stateless/00836_indices_alter_replicated_zookeeper.reference
-%%DATADIR%%-test/queries/0_stateless/00836_indices_alter_replicated_zookeeper.sql
-%%DATADIR%%-test/queries/0_stateless/00836_numbers_table_function_zero.reference
-%%DATADIR%%-test/queries/0_stateless/00836_numbers_table_function_zero.sql
-%%DATADIR%%-test/queries/0_stateless/00837_insert_select_and_read_prefix.reference
-%%DATADIR%%-test/queries/0_stateless/00837_insert_select_and_read_prefix.sql
-%%DATADIR%%-test/queries/0_stateless/00837_minmax_index.reference
-%%DATADIR%%-test/queries/0_stateless/00837_minmax_index.sh
-%%DATADIR%%-test/queries/0_stateless/00837_minmax_index_replicated_zookeeper.reference
-%%DATADIR%%-test/queries/0_stateless/00837_minmax_index_replicated_zookeeper.sql
-%%DATADIR%%-test/queries/0_stateless/00838_system_tables_drop_table_race.reference
-%%DATADIR%%-test/queries/0_stateless/00838_system_tables_drop_table_race.sh
+%%DATADIR%%-test/queries/0_stateless/00988_expansion_aliases_limit.sql
+%%DATADIR%%-test/queries/0_stateless/00098_3_union_all.sql
+%%DATADIR%%-test/queries/0_stateless/02025_having_filter_column.reference
+%%DATADIR%%-test/queries/0_stateless/01894_jit_aggregation_function_max_long.reference
+%%DATADIR%%-test/queries/0_stateless/02028_tokens.reference
+%%DATADIR%%-test/queries/0_stateless/00700_decimal_defaults.reference
+%%DATADIR%%-test/queries/0_stateless/01721_dictionary_decimal_p_s.sql
+%%DATADIR%%-test/queries/0_stateless/01339_client_unrecognized_option.reference
+%%DATADIR%%-test/queries/0_stateless/01148_zookeeper_path_macros_unfolding.sql
+%%DATADIR%%-test/queries/0_stateless/01402_cast_nullable_string_to_enum.reference
+%%DATADIR%%-test/queries/0_stateless/01049_window_view_window_functions.reference
+%%DATADIR%%-test/queries/0_stateless/00301_csv.reference
+%%DATADIR%%-test/queries/0_stateless/01646_system_restart_replicas_smoke.reference
+%%DATADIR%%-test/queries/0_stateless/01502_jemalloc_percpu_arena.reference
+%%DATADIR%%-test/queries/0_stateless/01325_freeze_mutation_stuck.sql
+%%DATADIR%%-test/queries/0_stateless/00930_max_partitions_per_insert_block.sql
+%%DATADIR%%-test/queries/0_stateless/00166_functions_of_aggregation_states.reference
+%%DATADIR%%-test/queries/0_stateless/01684_insert_specify_shard_id.sql
+%%DATADIR%%-test/queries/0_stateless/00097_long_storage_buffer_race_condition_mt.sh
+%%DATADIR%%-test/queries/0_stateless/00505_secure.sh
+%%DATADIR%%-test/queries/0_stateless/01662_join_mixed.sql
+%%DATADIR%%-test/queries/0_stateless/00564_enum_order.sh
+%%DATADIR%%-test/queries/0_stateless/01514_input_format_tsv_enum_as_number_setting.sql
+%%DATADIR%%-test/queries/0_stateless/00208_agg_state_merge.reference
+%%DATADIR%%-test/queries/0_stateless/01776_decrypt_aead_size_check.reference
+%%DATADIR%%-test/queries/0_stateless/00328_long_case_construction.reference
+%%DATADIR%%-test/queries/0_stateless/01791_dist_INSERT_block_structure_mismatch.sh
+%%DATADIR%%-test/queries/0_stateless/00990_hasToken_and_tokenbf.sql
+%%DATADIR%%-test/queries/0_stateless/00974_fix_join_on.sql
+%%DATADIR%%-test/queries/0_stateless/00700_decimal_casts.sql
+%%DATADIR%%-test/queries/0_stateless/01550_type_map_formats.sql
+%%DATADIR%%-test/queries/0_stateless/01066_window_view_event_tumble_to_strict_asc_lateness.sh
+%%DATADIR%%-test/queries/0_stateless/00979_live_view_watch_live.reference
+%%DATADIR%%-test/queries/0_stateless/00081_int_div_or_zero.sql
+%%DATADIR%%-test/queries/0_stateless/01249_flush_interactive.reference
+%%DATADIR%%-test/queries/0_stateless/01493_storage_set_persistency.reference
+%%DATADIR%%-test/queries/0_stateless/01600_parts_states_metrics_long.sh
+%%DATADIR%%-test/queries/0_stateless/00951_ngram_search.reference
+%%DATADIR%%-test/queries/0_stateless/01014_count_of_merges_metrics.reference
+%%DATADIR%%-test/queries/0_stateless/00283_column_cut.reference
+%%DATADIR%%-test/queries/0_stateless/01702_rewrite_avg_for_algebraic_optimization.sql
+%%DATADIR%%-test/queries/0_stateless/01547_query_log_current_database.sql
+%%DATADIR%%-test/queries/0_stateless/00914_join_bgranvea.reference
+%%DATADIR%%-test/queries/0_stateless/01572_kill_window_function.sh
+%%DATADIR%%-test/queries/0_stateless/01016_input_null_as_default.reference
+%%DATADIR%%-test/queries/0_stateless/00628_in_lambda_on_merge_table_bug.reference
+%%DATADIR%%-test/queries/0_stateless/00491_shard_distributed_and_aliases_in_where_having.sql
+%%DATADIR%%-test/queries/0_stateless/00545_weird_aggregate_functions.sql
+%%DATADIR%%-test/queries/0_stateless/01461_query_start_time_microseconds.reference
+%%DATADIR%%-test/queries/0_stateless/01660_system_parts_smoke.sql
+%%DATADIR%%-test/queries/0_stateless/01417_query_time_in_system_events.sh
+%%DATADIR%%-test/queries/0_stateless/01615_random_one_shard_insertion.sql
+%%DATADIR%%-test/queries/0_stateless/01663_test_toDate_mysql_compatibility.reference
+%%DATADIR%%-test/queries/0_stateless/00258_materializing_tuples.reference
+%%DATADIR%%-test/queries/0_stateless/01602_show_create_view.sql
+%%DATADIR%%-test/queries/0_stateless/01344_alter_enum_partition_key.reference
+%%DATADIR%%-test/queries/0_stateless/01798_having_push_down.sql
+%%DATADIR%%-test/queries/0_stateless/01118_is_constant.sql
+%%DATADIR%%-test/queries/0_stateless/01601_accurate_cast.sql
+%%DATADIR%%-test/queries/0_stateless/01923_different_expression_name_alias.reference
+%%DATADIR%%-test/queries/0_stateless/01150_ddl_guard_rwr.reference
+%%DATADIR%%-test/queries/0_stateless/01381_for_each_with_states.reference
+%%DATADIR%%-test/queries/0_stateless/01323_redundant_functions_in_order_by.reference
+%%DATADIR%%-test/queries/0_stateless/01051_new_any_join_engine.sql
+%%DATADIR%%-test/queries/0_stateless/01430_modify_sample_by_zookeeper_long.reference
+%%DATADIR%%-test/queries/0_stateless/02157_line_as_string_output_format.sql
+%%DATADIR%%-test/queries/0_stateless/01521_global_in_prewhere_15792.reference
+%%DATADIR%%-test/queries/0_stateless/00937_test_use_header_tsv.reference
+%%DATADIR%%-test/queries/0_stateless/00974_primary_key_for_lowCardinality.reference
+%%DATADIR%%-test/queries/0_stateless/00006_extremes_and_subquery_from.reference
+%%DATADIR%%-test/queries/0_stateless/01013_sync_replica_timeout_zookeeper.reference
+%%DATADIR%%-test/queries/0_stateless/01603_read_with_backoff_bug.reference
+%%DATADIR%%-test/queries/0_stateless/01292_create_user.reference
+%%DATADIR%%-test/queries/0_stateless/02033_join_engine_deadlock_long.sh
+%%DATADIR%%-test/queries/0_stateless/00745_compile_scalar_subquery.reference
+%%DATADIR%%-test/queries/0_stateless/00188_constants_as_arguments_of_aggregate_functions.sql
+%%DATADIR%%-test/queries/0_stateless/01248_least_greatest_mixed_const.sql
+%%DATADIR%%-test/queries/0_stateless/01213_alter_rename_column.reference
+%%DATADIR%%-test/queries/0_stateless/00231_format_vertical_raw.reference
+%%DATADIR%%-test/queries/0_stateless/00106_totals_after_having.reference
+%%DATADIR%%-test/queries/0_stateless/00640_endsWith.reference
 %%DATADIR%%-test/queries/0_stateless/00838_unique_index.reference
-%%DATADIR%%-test/queries/0_stateless/00838_unique_index.sh
-%%DATADIR%%-test/queries/0_stateless/00839_bitmask_negative.reference
-%%DATADIR%%-test/queries/0_stateless/00839_bitmask_negative.sql
-%%DATADIR%%-test/queries/0_stateless/00840_long_concurrent_select_and_drop_deadlock.reference
-%%DATADIR%%-test/queries/0_stateless/00840_long_concurrent_select_and_drop_deadlock.sh
-%%DATADIR%%-test/queries/0_stateless/00840_top_k_weighted.reference
-%%DATADIR%%-test/queries/0_stateless/00840_top_k_weighted.sql
-%%DATADIR%%-test/queries/0_stateless/00841_temporary_table_database.reference
-%%DATADIR%%-test/queries/0_stateless/00841_temporary_table_database.sql
-%%DATADIR%%-test/queries/0_stateless/00842_array_with_constant_overflow.reference
-%%DATADIR%%-test/queries/0_stateless/00842_array_with_constant_overflow.sql
-%%DATADIR%%-test/queries/0_stateless/00843_optimize_predicate_and_rename_table.reference
-%%DATADIR%%-test/queries/0_stateless/00843_optimize_predicate_and_rename_table.sql
-%%DATADIR%%-test/queries/0_stateless/00844_join_lightee2.reference
-%%DATADIR%%-test/queries/0_stateless/00844_join_lightee2.sql
-%%DATADIR%%-test/queries/0_stateless/00845_join_on_aliases.reference
-%%DATADIR%%-test/queries/0_stateless/00845_join_on_aliases.sql
-%%DATADIR%%-test/queries/0_stateless/00846_join_using_tuple_crash.reference
+%%DATADIR%%-test/queries/0_stateless/02020_exponential_smoothing_cross_block.sql
+%%DATADIR%%-test/queries/0_stateless/00727_concat.sql
+%%DATADIR%%-test/queries/0_stateless/01563_distributed_query_finish.sh
+%%DATADIR%%-test/queries/0_stateless/01599_mutation_query_params.sh
+%%DATADIR%%-test/queries/0_stateless/00818_inner_join_bug_3567.sql
+%%DATADIR%%-test/queries/0_stateless/01353_neighbor_overflow.reference
+%%DATADIR%%-test/queries/0_stateless/01533_optimize_skip_merged_partitions.sql
+%%DATADIR%%-test/queries/0_stateless/01069_materialized_view_alter_target_table.reference
 %%DATADIR%%-test/queries/0_stateless/00846_join_using_tuple_crash.sql
-%%DATADIR%%-test/queries/0_stateless/00847_multiple_join_same_column.reference
+%%DATADIR%%-test/queries/0_stateless/00931_low_cardinality_nullable_aggregate_function_type.reference
+%%DATADIR%%-test/queries/0_stateless/00679_uuid_in_key.reference
+%%DATADIR%%-test/queries/0_stateless/01660_join_or_any.reference
+%%DATADIR%%-test/queries/0_stateless/01625_constraints_index_append.sql
+%%DATADIR%%-test/queries/0_stateless/00664_cast_from_string_to_nullable.reference
+%%DATADIR%%-test/queries/0_stateless/01674_where_prewhere_array_crash.sql
+%%DATADIR%%-test/queries/0_stateless/01296_codecs_bad_arguments.sql
+%%DATADIR%%-test/queries/0_stateless/01070_h3_get_base_cell.reference
+%%DATADIR%%-test/queries/0_stateless/01663_quantile_weighted_overflow.sql
+%%DATADIR%%-test/queries/0_stateless/00834_cancel_http_readonly_queries_on_client_close.reference
+%%DATADIR%%-test/queries/0_stateless/01295_create_row_policy.sql
+%%DATADIR%%-test/queries/0_stateless/02125_tskv_proper_names_reading.reference
+%%DATADIR%%-test/queries/0_stateless/00580_consistent_hashing_functions.sql
+%%DATADIR%%-test/queries/0_stateless/02021_map_bloom_filter_index.sql
+%%DATADIR%%-test/queries/0_stateless/01069_insert_float_as_nullable_unit8.reference
+%%DATADIR%%-test/queries/0_stateless/01144_join_rewrite_with_ambiguous_column_and_view.reference
+%%DATADIR%%-test/queries/0_stateless/00052_all_left_join.sql
+%%DATADIR%%-test/queries/0_stateless/02125_fix_storage_filelog.sql
+%%DATADIR%%-test/queries/0_stateless/01008_materialized_view_henyihanwobushi.reference
+%%DATADIR%%-test/queries/0_stateless/00976_ttl_with_old_parts.reference
+%%DATADIR%%-test/queries/0_stateless/01713_table_ttl_old_syntax_zookeeper.reference
+%%DATADIR%%-test/queries/0_stateless/01754_clickhouse_format_backslash.sh
+%%DATADIR%%-test/queries/0_stateless/01812_basic_auth_http_server.reference
+%%DATADIR%%-test/queries/0_stateless/00548_slice_of_nested.sql
+%%DATADIR%%-test/queries/0_stateless/01663_aes_msan.sql
+%%DATADIR%%-test/queries/0_stateless/01490_nullable_string_to_enum.sql
+%%DATADIR%%-test/queries/0_stateless/00738_lock_for_inner_table.sh
+%%DATADIR%%-test/queries/0_stateless/02169_fix_view_offset_limit_setting.sql
+%%DATADIR%%-test/queries/0_stateless/country_polygons.tsv
+%%DATADIR%%-test/queries/0_stateless/01852_cast_operator.sql
+%%DATADIR%%-test/queries/0_stateless/01731_async_task_queue_wait.reference
+%%DATADIR%%-test/queries/0_stateless/00954_client_prepared_statements.sh
+%%DATADIR%%-test/queries/0_stateless/01018_ambiguous_column.reference
+%%DATADIR%%-test/queries/0_stateless/01050_window_view_parser_tumble.reference
+%%DATADIR%%-test/queries/0_stateless/00602_throw_if.reference
+%%DATADIR%%-test/queries/0_stateless/01064_pm_all_join_const_and_nullable.sql
+%%DATADIR%%-test/queries/0_stateless/01444_create_table_drop_database_race.reference
+%%DATADIR%%-test/queries/0_stateless/00981_topK_topKWeighted_long.sql
+%%DATADIR%%-test/queries/0_stateless/01803_const_nullable_map.sql
+%%DATADIR%%-test/queries/0_stateless/01020_function_char.reference
+%%DATADIR%%-test/queries/0_stateless/01018_ddl_dictionaries_concurrent_requrests.reference
+%%DATADIR%%-test/queries/0_stateless/02164_materialized_view_support_virtual_column.reference
+%%DATADIR%%-test/queries/0_stateless/00118_storage_join.reference
+%%DATADIR%%-test/queries/0_stateless/00341_squashing_insert_select2.sql
+%%DATADIR%%-test/queries/0_stateless/00256_reverse.sql
+%%DATADIR%%-test/queries/0_stateless/00234_disjunctive_equality_chains_optimization.sql
+%%DATADIR%%-test/queries/0_stateless/01258_bom_tsv.reference
+%%DATADIR%%-test/queries/0_stateless/00931_low_cardinality_set_index_in_key_condition.reference
+%%DATADIR%%-test/queries/0_stateless/00117_parsing_arrays.reference
+%%DATADIR%%-test/queries/0_stateless/00078_string_concat.reference
+%%DATADIR%%-test/queries/0_stateless/01470_columns_transformers.reference
+%%DATADIR%%-test/queries/0_stateless/01941_dict_get_has_complex_single_key.sql
+%%DATADIR%%-test/queries/0_stateless/00918_has_unsufficient_type_check.reference
+%%DATADIR%%-test/queries/0_stateless/00019_shard_quantiles_totals_distributed.sql
+%%DATADIR%%-test/queries/0_stateless/01049_zookeeper_synchronous_mutations_long.sql
+%%DATADIR%%-test/queries/0_stateless/01245_limit_infinite_sources.sql
+%%DATADIR%%-test/queries/0_stateless/02024_compression_in_query.sh
+%%DATADIR%%-test/queries/0_stateless/00317_in_tuples_and_out_of_range_values.reference
+%%DATADIR%%-test/queries/0_stateless/01050_window_view_parser_tumble.sql
+%%DATADIR%%-test/queries/0_stateless/01034_unknown_qualified_column_in_join.reference
+%%DATADIR%%-test/queries/0_stateless/01375_output_format_tsv_csv_with_names.sh
+%%DATADIR%%-test/queries/0_stateless/01818_input_format_with_names_use_header.sh
+%%DATADIR%%-test/queries/0_stateless/01851_hedged_connections_external_tables.reference
+%%DATADIR%%-test/queries/0_stateless/01903_http_fields.sh
+%%DATADIR%%-test/queries/0_stateless/00662_array_has_nullable.sql
+%%DATADIR%%-test/queries/0_stateless/01545_url_file_format_settings.reference
+%%DATADIR%%-test/queries/0_stateless/00612_shard_count.sql
+%%DATADIR%%-test/queries/0_stateless/00957_delta_diff_bug.reference
+%%DATADIR%%-test/queries/0_stateless/00941_system_columns_race_condition.reference
+%%DATADIR%%-test/queries/0_stateless/00266_shard_global_subquery_and_aliases.reference
+%%DATADIR%%-test/queries/0_stateless/01846_null_as_default_for_insert_select.sql
+%%DATADIR%%-test/queries/0_stateless/02124_buffer_with_type_map_long.sh
+%%DATADIR%%-test/queries/0_stateless/01066_bit_count.sql
+%%DATADIR%%-test/queries/0_stateless/01475_fix_bigint_shift.reference
+%%DATADIR%%-test/queries/0_stateless/02047_log_family_data_file_dumps.sh
+%%DATADIR%%-test/queries/0_stateless/01654_bar_nan.sql
+%%DATADIR%%-test/queries/0_stateless/01014_function_repeat_corner_cases.sql
+%%DATADIR%%-test/queries/0_stateless/01460_DistributedFilesToInsert.reference
+%%DATADIR%%-test/queries/0_stateless/01016_index_tuple_field_type.sql
+%%DATADIR%%-test/queries/0_stateless/01910_memory_tracking_topk.reference
+%%DATADIR%%-test/queries/0_stateless/01732_bigint_ubsan.reference
+%%DATADIR%%-test/queries/0_stateless/00358_from_string_complex_types.reference
+%%DATADIR%%-test/queries/0_stateless/01046_materialized_view_with_join_over_distributed.sql
+%%DATADIR%%-test/queries/0_stateless/01518_cast_nullable_virtual_system_column.sql
+%%DATADIR%%-test/queries/0_stateless/01711_cte_subquery_fix.sql
+%%DATADIR%%-test/queries/0_stateless/01710_projection_detach_part.reference
+%%DATADIR%%-test/queries/0_stateless/00907_set_index_with_nullable_and_low_cardinality_bug.sql
+%%DATADIR%%-test/queries/0_stateless/00557_remote_port.reference
+%%DATADIR%%-test/queries/0_stateless/00879_cast_to_decimal_crash.sql
+%%DATADIR%%-test/queries/0_stateless/00997_trim.reference
+%%DATADIR%%-test/queries/0_stateless/01262_fractional_timezone_near_start_of_epoch.sql
+%%DATADIR%%-test/queries/0_stateless/01764_table_function_dictionary.reference
+%%DATADIR%%-test/queries/0_stateless/01871_merge_tree_compile_expressions.sql
+%%DATADIR%%-test/queries/0_stateless/00826_cross_to_inner_join.reference
+%%DATADIR%%-test/queries/0_stateless/00081_int_div_or_zero.reference
+%%DATADIR%%-test/queries/0_stateless/00376_shard_group_uniq_array_of_int_array.sql
+%%DATADIR%%-test/queries/0_stateless/02100_replaceRegexpAll_bug.sql
+%%DATADIR%%-test/queries/0_stateless/00794_materialized_view_with_column_defaults.reference
+%%DATADIR%%-test/queries/0_stateless/02118_deserialize_whole_text.reference
+%%DATADIR%%-test/queries/0_stateless/01396_low_cardinality_fixed_string_default.reference
+%%DATADIR%%-test/queries/0_stateless/01070_window_view_watch_events.py
+%%DATADIR%%-test/queries/0_stateless/01603_insert_select_too_many_parts.sql
+%%DATADIR%%-test/queries/0_stateless/01650_any_null_if.sql
+%%DATADIR%%-test/queries/0_stateless/00464_sort_all_constant_columns.reference
+%%DATADIR%%-test/queries/0_stateless/00562_rewrite_select_expression_with_union.sql
+%%DATADIR%%-test/queries/0_stateless/01769_extended_range_2.reference
 %%DATADIR%%-test/queries/0_stateless/00847_multiple_join_same_column.sql
-%%DATADIR%%-test/queries/0_stateless/00848_join_use_nulls_segfault.reference
-%%DATADIR%%-test/queries/0_stateless/00848_join_use_nulls_segfault.sql
-%%DATADIR%%-test/queries/0_stateless/00849_multiple_comma_join_2.reference
-%%DATADIR%%-test/queries/0_stateless/00849_multiple_comma_join_2.sql
-%%DATADIR%%-test/queries/0_stateless/00850_global_join_dups.reference
-%%DATADIR%%-test/queries/0_stateless/00850_global_join_dups.sql
-%%DATADIR%%-test/queries/0_stateless/00851_http_insert_json_defaults.reference
-%%DATADIR%%-test/queries/0_stateless/00851_http_insert_json_defaults.sh
-%%DATADIR%%-test/queries/0_stateless/00852_any_join_nulls.reference
-%%DATADIR%%-test/queries/0_stateless/00852_any_join_nulls.sql
-%%DATADIR%%-test/queries/0_stateless/00853_join_with_nulls_crash.reference
-%%DATADIR%%-test/queries/0_stateless/00853_join_with_nulls_crash.sql
-%%DATADIR%%-test/queries/0_stateless/00854_multiple_join_asterisks.reference
-%%DATADIR%%-test/queries/0_stateless/00854_multiple_join_asterisks.sql
-%%DATADIR%%-test/queries/0_stateless/00855_join_with_array_join.reference
-%%DATADIR%%-test/queries/0_stateless/00855_join_with_array_join.sql
-%%DATADIR%%-test/queries/0_stateless/00856_no_column_issue_4242.reference
-%%DATADIR%%-test/queries/0_stateless/00856_no_column_issue_4242.sql
-%%DATADIR%%-test/queries/0_stateless/00857_global_joinsavel_table_alias.reference
-%%DATADIR%%-test/queries/0_stateless/00857_global_joinsavel_table_alias.sql
-%%DATADIR%%-test/queries/0_stateless/00858_issue_4756.reference
-%%DATADIR%%-test/queries/0_stateless/00858_issue_4756.sql
-%%DATADIR%%-test/queries/0_stateless/00859_distinct_with_join.reference
-%%DATADIR%%-test/queries/0_stateless/00859_distinct_with_join.sql
-%%DATADIR%%-test/queries/0_stateless/00860_unknown_identifier_bug.reference
+%%DATADIR%%-test/queries/0_stateless/01039_test_setting_parse.reference
+%%DATADIR%%-test/queries/0_stateless/01704_transform_with_float_key.reference
+%%DATADIR%%-test/queries/0_stateless/01892_setting_limit_offset_distributed.reference
+%%DATADIR%%-test/queries/0_stateless/00395_nullable.sql
+%%DATADIR%%-test/queries/0_stateless/00974_text_log_table_not_empty.sh
+%%DATADIR%%-test/queries/0_stateless/01672_actions_dag_merge_crash.reference
+%%DATADIR%%-test/queries/0_stateless/02000_join_on_const.reference
+%%DATADIR%%-test/queries/0_stateless/01848_partition_value_column.sql
+%%DATADIR%%-test/queries/0_stateless/01938_joins_identifiers.sql
 %%DATADIR%%-test/queries/0_stateless/00860_unknown_identifier_bug.sql
-%%DATADIR%%-test/queries/0_stateless/00861_decimal_quoted_csv.reference
-%%DATADIR%%-test/queries/0_stateless/00861_decimal_quoted_csv.sql
-%%DATADIR%%-test/queries/0_stateless/00862_decimal_in.reference
-%%DATADIR%%-test/queries/0_stateless/00862_decimal_in.sql
-%%DATADIR%%-test/queries/0_stateless/00863_comma_join_in.reference
-%%DATADIR%%-test/queries/0_stateless/00863_comma_join_in.sql
-%%DATADIR%%-test/queries/0_stateless/00864_union_all_supertype.reference
-%%DATADIR%%-test/queries/0_stateless/00864_union_all_supertype.sql
-%%DATADIR%%-test/queries/0_stateless/00870_t64_codec.reference
-%%DATADIR%%-test/queries/0_stateless/00870_t64_codec.sql
-%%DATADIR%%-test/queries/0_stateless/00871_t64_codec_signed.reference
-%%DATADIR%%-test/queries/0_stateless/00871_t64_codec_signed.sql
-%%DATADIR%%-test/queries/0_stateless/00872_t64_bit_codec.reference
-%%DATADIR%%-test/queries/0_stateless/00872_t64_bit_codec.sql
-%%DATADIR%%-test/queries/0_stateless/00874_issue_3495.reference
-%%DATADIR%%-test/queries/0_stateless/00874_issue_3495.sql
-%%DATADIR%%-test/queries/0_stateless/00875_join_right_nulls.reference
-%%DATADIR%%-test/queries/0_stateless/00875_join_right_nulls.sql
-%%DATADIR%%-test/queries/0_stateless/00876_wrong_arraj_join_column.reference
-%%DATADIR%%-test/queries/0_stateless/00876_wrong_arraj_join_column.sql
-%%DATADIR%%-test/queries/0_stateless/00877_memory_limit_for_new_delete.reference
-%%DATADIR%%-test/queries/0_stateless/00877_memory_limit_for_new_delete.sql
-%%DATADIR%%-test/queries/0_stateless/00878_join_unexpected_results.reference
-%%DATADIR%%-test/queries/0_stateless/00878_join_unexpected_results.sql
-%%DATADIR%%-test/queries/0_stateless/00879_cast_to_decimal_crash.reference
-%%DATADIR%%-test/queries/0_stateless/00879_cast_to_decimal_crash.sql
-%%DATADIR%%-test/queries/0_stateless/00880_decimal_in_key.reference
-%%DATADIR%%-test/queries/0_stateless/00880_decimal_in_key.sql
-%%DATADIR%%-test/queries/0_stateless/00881_unknown_identifier_in_in.reference
-%%DATADIR%%-test/queries/0_stateless/00881_unknown_identifier_in_in.sql
-%%DATADIR%%-test/queries/0_stateless/00882_multiple_join_no_alias.reference
-%%DATADIR%%-test/queries/0_stateless/00882_multiple_join_no_alias.sql
-%%DATADIR%%-test/queries/0_stateless/00897_flatten.reference
-%%DATADIR%%-test/queries/0_stateless/00897_flatten.sql
-%%DATADIR%%-test/queries/0_stateless/00898_parsing_bad_diagnostic_message.reference
-%%DATADIR%%-test/queries/0_stateless/00898_parsing_bad_diagnostic_message.sh
-%%DATADIR%%-test/queries/0_stateless/00898_quantile_timing_parameter_check.reference
-%%DATADIR%%-test/queries/0_stateless/00898_quantile_timing_parameter_check.sql
-%%DATADIR%%-test/queries/0_stateless/00899_long_attach_memory_limit.reference
-%%DATADIR%%-test/queries/0_stateless/00899_long_attach_memory_limit.sql
-%%DATADIR%%-test/queries/0_stateless/00900_entropy_shard.reference
-%%DATADIR%%-test/queries/0_stateless/00900_entropy_shard.sql
-%%DATADIR%%-test/queries/0_stateless/00900_long_parquet.reference
-%%DATADIR%%-test/queries/0_stateless/00900_long_parquet.sh
-%%DATADIR%%-test/queries/0_stateless/00900_long_parquet_decimal.reference
-%%DATADIR%%-test/queries/0_stateless/00900_long_parquet_decimal.sh
-%%DATADIR%%-test/queries/0_stateless/00900_long_parquet_load.reference
-%%DATADIR%%-test/queries/0_stateless/00900_long_parquet_load.sh
-%%DATADIR%%-test/queries/0_stateless/00900_null_array_orc_load.reference
-%%DATADIR%%-test/queries/0_stateless/00900_null_array_orc_load.sh
-%%DATADIR%%-test/queries/0_stateless/00900_orc_arrays_load.reference
-%%DATADIR%%-test/queries/0_stateless/00900_orc_arrays_load.sh
-%%DATADIR%%-test/queries/0_stateless/00900_orc_arrow_parquet_maps.reference
-%%DATADIR%%-test/queries/0_stateless/00900_orc_arrow_parquet_maps.sh
-%%DATADIR%%-test/queries/0_stateless/00900_orc_arrow_parquet_tuples.reference
-%%DATADIR%%-test/queries/0_stateless/00900_orc_arrow_parquet_tuples.sh
-%%DATADIR%%-test/queries/0_stateless/00900_orc_load.reference
-%%DATADIR%%-test/queries/0_stateless/00900_orc_load.sh
-%%DATADIR%%-test/queries/0_stateless/00900_orc_nested_arrays_load.reference
-%%DATADIR%%-test/queries/0_stateless/00900_orc_nested_arrays_load.sh
-%%DATADIR%%-test/queries/0_stateless/00900_orc_nullable_arrays_load.reference
-%%DATADIR%%-test/queries/0_stateless/00900_orc_nullable_arrays_load.sh
-%%DATADIR%%-test/queries/0_stateless/00901_joint_entropy.reference
-%%DATADIR%%-test/queries/0_stateless/00901_joint_entropy.sql
-%%DATADIR%%-test/queries/0_stateless/00902_entropy.reference
-%%DATADIR%%-test/queries/0_stateless/00902_entropy.sql
-%%DATADIR%%-test/queries/0_stateless/00903_array_with_constant_function.reference
-%%DATADIR%%-test/queries/0_stateless/00903_array_with_constant_function.sql
-%%DATADIR%%-test/queries/0_stateless/00904_array_with_constant_2.reference
-%%DATADIR%%-test/queries/0_stateless/00904_array_with_constant_2.sql
-%%DATADIR%%-test/queries/0_stateless/00905_compile_expressions_compare_big_dates.reference
-%%DATADIR%%-test/queries/0_stateless/00905_compile_expressions_compare_big_dates.sql
-%%DATADIR%%-test/queries/0_stateless/00905_field_with_aggregate_function_state.reference
-%%DATADIR%%-test/queries/0_stateless/00905_field_with_aggregate_function_state.sql
-%%DATADIR%%-test/queries/0_stateless/00906_low_cardinality_cache.reference
-%%DATADIR%%-test/queries/0_stateless/00906_low_cardinality_cache.sql
-%%DATADIR%%-test/queries/0_stateless/00906_low_cardinality_const_argument.reference
-%%DATADIR%%-test/queries/0_stateless/00906_low_cardinality_const_argument.sql
-%%DATADIR%%-test/queries/0_stateless/00906_low_cardinality_rollup.reference
-%%DATADIR%%-test/queries/0_stateless/00906_low_cardinality_rollup.sql
-%%DATADIR%%-test/queries/0_stateless/00907_set_index_max_rows.reference
-%%DATADIR%%-test/queries/0_stateless/00907_set_index_max_rows.sh
-%%DATADIR%%-test/queries/0_stateless/00907_set_index_with_nullable_and_low_cardinality.reference
-%%DATADIR%%-test/queries/0_stateless/00907_set_index_with_nullable_and_low_cardinality.sql
-%%DATADIR%%-test/queries/0_stateless/00907_set_index_with_nullable_and_low_cardinality_bug.reference
-%%DATADIR%%-test/queries/0_stateless/00907_set_index_with_nullable_and_low_cardinality_bug.sql
-%%DATADIR%%-test/queries/0_stateless/00908_analyze_query.reference
-%%DATADIR%%-test/queries/0_stateless/00908_analyze_query.sql
-%%DATADIR%%-test/queries/0_stateless/00908_bloom_filter_index.reference
-%%DATADIR%%-test/queries/0_stateless/00908_bloom_filter_index.sh
-%%DATADIR%%-test/queries/0_stateless/00908_long_http_insert.reference
-%%DATADIR%%-test/queries/0_stateless/00908_long_http_insert.sh
-%%DATADIR%%-test/queries/0_stateless/00909_arrayEnumerateUniq.reference
-%%DATADIR%%-test/queries/0_stateless/00909_arrayEnumerateUniq.sql
-%%DATADIR%%-test/queries/0_stateless/00909_kill_not_initialized_query.reference
-%%DATADIR%%-test/queries/0_stateless/00909_kill_not_initialized_query.sh
-%%DATADIR%%-test/queries/0_stateless/00909_ngram_distance.reference
-%%DATADIR%%-test/queries/0_stateless/00909_ngram_distance.sql
-%%DATADIR%%-test/queries/0_stateless/00910_buffer_prewhere.reference
-%%DATADIR%%-test/queries/0_stateless/00910_buffer_prewhere.sql
-%%DATADIR%%-test/queries/0_stateless/00910_client_window_size_detection.reference
+%%DATADIR%%-test/queries/0_stateless/01100_split_by_string.sql
+%%DATADIR%%-test/queries/0_stateless/01925_map_populate_series_on_map.reference
+%%DATADIR%%-test/queries/0_stateless/01115_prewhere_array_join.reference
+%%DATADIR%%-test/queries/0_stateless/00168_buffer_defaults.reference
+%%DATADIR%%-test/queries/0_stateless/01889_sql_json_functions.reference
+%%DATADIR%%-test/queries/0_stateless/02013_json_function_null_column.sql
+%%DATADIR%%-test/queries/0_stateless/01231_distributed_aggregation_memory_efficient_mix_levels.sql
+%%DATADIR%%-test/queries/0_stateless/01600_multiple_left_join_with_aliases.reference
+%%DATADIR%%-test/queries/0_stateless/01144_multiword_data_types.reference
+%%DATADIR%%-test/queries/0_stateless/01018_ddl_dictionaries_bad_queries.reference
+%%DATADIR%%-test/queries/0_stateless/01760_ddl_dictionary_use_current_database_name.reference
+%%DATADIR%%-test/queries/0_stateless/02008_tuple_to_name_value_pairs.reference
+%%DATADIR%%-test/queries/0_stateless/01551_mergetree_read_in_order_spread.sql
+%%DATADIR%%-test/queries/0_stateless/00700_decimal_math.reference
+%%DATADIR%%-test/queries/0_stateless/02036_jit_short_circuit.sql
+%%DATADIR%%-test/queries/0_stateless/01014_count_of_merges_metrics.sql
+%%DATADIR%%-test/queries/0_stateless/01493_alter_remove_wrong_default.reference
+%%DATADIR%%-test/queries/0_stateless/01534_lambda_array_join.sql
+%%DATADIR%%-test/queries/0_stateless/00969_roundDuration.reference
+%%DATADIR%%-test/queries/0_stateless/01268_DateTime64_in_WHERE.reference
+%%DATADIR%%-test/queries/0_stateless/01683_dist_INSERT_block_structure_mismatch.sql
+%%DATADIR%%-test/queries/0_stateless/02027_ngrams.reference
+%%DATADIR%%-test/queries/0_stateless/01910_view_dictionary.reference
+%%DATADIR%%-test/queries/0_stateless/02165_auto_format_by_file_extension.sh
+%%DATADIR%%-test/queries/0_stateless/01293_system_distribution_queue.sql
+%%DATADIR%%-test/queries/0_stateless/01631_date_overflow_as_partition_key.sql
+%%DATADIR%%-test/queries/0_stateless/01199_url_functions_path_without_schema_yiurule.reference
+%%DATADIR%%-test/queries/0_stateless/00671_max_intersections.sql
+%%DATADIR%%-test/queries/0_stateless/01944_range_max_elements.reference
+%%DATADIR%%-test/queries/0_stateless/01604_explain_ast_of_nonselect_query.sql
+%%DATADIR%%-test/queries/0_stateless/01176_mysql_client_interactive.expect
+%%DATADIR%%-test/queries/0_stateless/01038_array_of_unnamed_tuples.reference
+%%DATADIR%%-test/queries/0_stateless/02008_materialize_column.reference
+%%DATADIR%%-test/queries/0_stateless/00268_aliases_without_as_keyword.reference
+%%DATADIR%%-test/queries/0_stateless/01559_misplaced_codec_diagnostics.reference
+%%DATADIR%%-test/queries/0_stateless/00723_remerge_sort.reference
+%%DATADIR%%-test/queries/0_stateless/01932_remote_sharding_key_column.sql
+%%DATADIR%%-test/queries/0_stateless/01410_nullable_key_more_tests.sh
+%%DATADIR%%-test/queries/0_stateless/02024_compile_expressions_with_short_circuit_evaluation.reference
+%%DATADIR%%-test/queries/0_stateless/00027_distinct_and_order_by.reference
+%%DATADIR%%-test/queries/0_stateless/01085_datetime_arithmetic_preserve_timezone.reference
 %%DATADIR%%-test/queries/0_stateless/00910_client_window_size_detection.sh
-%%DATADIR%%-test/queries/0_stateless/00910_crash_when_distributed_modify_order_by.reference
-%%DATADIR%%-test/queries/0_stateless/00910_crash_when_distributed_modify_order_by.sql
-%%DATADIR%%-test/queries/0_stateless/00910_decimal_group_array_crash_3783.reference
-%%DATADIR%%-test/queries/0_stateless/00910_decimal_group_array_crash_3783.sql
-%%DATADIR%%-test/queries/0_stateless/00910_zookeeper_custom_compression_codecs_replicated.reference
-%%DATADIR%%-test/queries/0_stateless/00910_zookeeper_custom_compression_codecs_replicated.sql
-%%DATADIR%%-test/queries/0_stateless/00910_zookeeper_test_alter_compression_codecs_long.reference
-%%DATADIR%%-test/queries/0_stateless/00910_zookeeper_test_alter_compression_codecs_long.sql
-%%DATADIR%%-test/queries/0_stateless/00911_tautological_compare.reference
-%%DATADIR%%-test/queries/0_stateless/00911_tautological_compare.sql
-%%DATADIR%%-test/queries/0_stateless/00912_string_comparison.reference
+%%DATADIR%%-test/queries/0_stateless/01850_dist_INSERT_preserve_error.sql
+%%DATADIR%%-test/queries/0_stateless/01024__getScalar.reference
+%%DATADIR%%-test/queries/0_stateless/01424_parse_date_time_bad_date.sql
+%%DATADIR%%-test/queries/0_stateless/00563_shard_insert_into_remote.sql
+%%DATADIR%%-test/queries/0_stateless/01950_kill_large_group_by_query.reference
+%%DATADIR%%-test/queries/0_stateless/01685_ssd_cache_dictionary_complex_key.sh
+%%DATADIR%%-test/queries/0_stateless/01380_nullable_state.sql
+%%DATADIR%%-test/queries/0_stateless/01659_array_aggregation_ubsan.reference
+%%DATADIR%%-test/queries/0_stateless/01403_datetime64_constant_arg.sql
+%%DATADIR%%-test/queries/0_stateless/00726_modulo_for_date.reference
+%%DATADIR%%-test/queries/0_stateless/01356_wrong_filter-type_bug.sql
+%%DATADIR%%-test/queries/0_stateless/00825_protobuf_format_persons.reference
+%%DATADIR%%-test/queries/0_stateless/00724_insert_values_datetime_conversion.sql
+%%DATADIR%%-test/queries/0_stateless/00282_merging.sql
+%%DATADIR%%-test/queries/0_stateless/02113_hdfs_assert.reference
+%%DATADIR%%-test/queries/0_stateless/00753_system_columns_and_system_tables_long.sql
+%%DATADIR%%-test/queries/0_stateless/00098_j_union_all.sql
+%%DATADIR%%-test/queries/0_stateless/00947_ml_test.reference
+%%DATADIR%%-test/queries/0_stateless/00502_string_concat_with_array.reference
+%%DATADIR%%-test/queries/0_stateless/01801_distinct_group_by_shard.sql
+%%DATADIR%%-test/queries/0_stateless/01034_move_partition_from_table_zookeeper.reference
+%%DATADIR%%-test/queries/0_stateless/01051_system_stack_trace.sql
+%%DATADIR%%-test/queries/0_stateless/02116_tuple_element.sql
+%%DATADIR%%-test/queries/0_stateless/00337_shard_any_heavy.reference
+%%DATADIR%%-test/queries/0_stateless/00131_set_hashed.sql
+%%DATADIR%%-test/queries/0_stateless/00197_if_fixed_string.sql
+%%DATADIR%%-test/queries/0_stateless/00181_aggregate_functions_statistics.sql
+%%DATADIR%%-test/queries/0_stateless/01092_memory_profiler.reference
+%%DATADIR%%-test/queries/0_stateless/00535_parse_float_scientific.sql
+%%DATADIR%%-test/queries/0_stateless/02110_clickhouse_local_custom_tld.reference
+%%DATADIR%%-test/queries/0_stateless/01811_storage_buffer_flush_parameters.sql
+%%DATADIR%%-test/queries/0_stateless/01069_insert_float_as_nullable_unit8.sql
+%%DATADIR%%-test/queries/0_stateless/02151_clickhouse_client_hints.sh
+%%DATADIR%%-test/queries/0_stateless/02015_column_default_dict_get_identifier.reference
+%%DATADIR%%-test/queries/0_stateless/02030_tuple_filter.reference
+%%DATADIR%%-test/queries/0_stateless/00674_join_on_syntax.reference
+%%DATADIR%%-test/queries/0_stateless/00029_test_zookeeper_optimize_exception.reference
+%%DATADIR%%-test/queries/0_stateless/01053_if_chain_check.sql
+%%DATADIR%%-test/queries/0_stateless/01345_array_join_LittleMaverick.sql
+%%DATADIR%%-test/queries/0_stateless/00255_array_concat_string.sql
+%%DATADIR%%-test/queries/0_stateless/01495_subqueries_in_with_statement.reference
+%%DATADIR%%-test/queries/0_stateless/00196_float32_formatting.reference
+%%DATADIR%%-test/queries/0_stateless/01822_async_read_from_socket_crash.reference
+%%DATADIR%%-test/queries/0_stateless/01935_parametrized_query_parametric_aggregate_function.reference
+%%DATADIR%%-test/queries/0_stateless/02167_format_from_file_extension.reference
+%%DATADIR%%-test/queries/0_stateless/01063_create_column_set.reference
+%%DATADIR%%-test/queries/0_stateless/00988_expansion_aliases_limit.reference
+%%DATADIR%%-test/queries/0_stateless/01891_partition_hash.sql
+%%DATADIR%%-test/queries/0_stateless/01091_query_profiler_does_not_hang.sql
+%%DATADIR%%-test/queries/0_stateless/01293_system_distribution_queue.reference
+%%DATADIR%%-test/queries/0_stateless/00967_insert_into_distributed_different_types.reference
+%%DATADIR%%-test/queries/0_stateless/00386_enum_in_pk.sql
 %%DATADIR%%-test/queries/0_stateless/00912_string_comparison.sql
-%%DATADIR%%-test/queries/0_stateless/00913_many_threads.reference
-%%DATADIR%%-test/queries/0_stateless/00913_many_threads.sql
-%%DATADIR%%-test/queries/0_stateless/00914_join_bgranvea.reference
-%%DATADIR%%-test/queries/0_stateless/00914_join_bgranvea.sql
-%%DATADIR%%-test/queries/0_stateless/00914_replicate.reference
-%%DATADIR%%-test/queries/0_stateless/00914_replicate.sql
-%%DATADIR%%-test/queries/0_stateless/00915_simple_aggregate_function.reference
-%%DATADIR%%-test/queries/0_stateless/00915_simple_aggregate_function.sql
-%%DATADIR%%-test/queries/0_stateless/00915_tuple_orantius.reference
-%%DATADIR%%-test/queries/0_stateless/00915_tuple_orantius.sql
-%%DATADIR%%-test/queries/0_stateless/00916_add_materialized_column_after.reference
-%%DATADIR%%-test/queries/0_stateless/00916_add_materialized_column_after.sql
-%%DATADIR%%-test/queries/0_stateless/00916_create_or_replace_view.reference
-%%DATADIR%%-test/queries/0_stateless/00916_create_or_replace_view.sql
-%%DATADIR%%-test/queries/0_stateless/00916_join_using_duplicate_columns.reference
-%%DATADIR%%-test/queries/0_stateless/00916_join_using_duplicate_columns.sql
-%%DATADIR%%-test/queries/0_stateless/00917_least_sqr.reference
-%%DATADIR%%-test/queries/0_stateless/00917_least_sqr.sql
-%%DATADIR%%-test/queries/0_stateless/00917_multiple_joins_denny_crane.reference
-%%DATADIR%%-test/queries/0_stateless/00917_multiple_joins_denny_crane.sql
-%%DATADIR%%-test/queries/0_stateless/00918_has_unsufficient_type_check.reference
-%%DATADIR%%-test/queries/0_stateless/00918_has_unsufficient_type_check.sql
-%%DATADIR%%-test/queries/0_stateless/00918_json_functions.reference
-%%DATADIR%%-test/queries/0_stateless/00918_json_functions.sql
-%%DATADIR%%-test/queries/0_stateless/00919_histogram_merge.reference
-%%DATADIR%%-test/queries/0_stateless/00919_histogram_merge.sql
-%%DATADIR%%-test/queries/0_stateless/00919_sum_aggregate_states_constants.reference
-%%DATADIR%%-test/queries/0_stateless/00919_sum_aggregate_states_constants.sql
-%%DATADIR%%-test/queries/0_stateless/00920_multiply_aggregate_states_constants.reference
-%%DATADIR%%-test/queries/0_stateless/00920_multiply_aggregate_states_constants.sql
-%%DATADIR%%-test/queries/0_stateless/00921_datetime64_basic.reference
-%%DATADIR%%-test/queries/0_stateless/00921_datetime64_basic.sql
-%%DATADIR%%-test/queries/0_stateless/00921_datetime64_compatibility_long.python
-%%DATADIR%%-test/queries/0_stateless/00921_datetime64_compatibility_long.reference
-%%DATADIR%%-test/queries/0_stateless/00921_datetime64_compatibility_long.sh
-%%DATADIR%%-test/queries/0_stateless/00925_zookeeper_empty_replicated_merge_tree_optimize_final.reference
-%%DATADIR%%-test/queries/0_stateless/00925_zookeeper_empty_replicated_merge_tree_optimize_final.sql
-%%DATADIR%%-test/queries/0_stateless/00926_adaptive_index_granularity_collapsing_merge_tree.reference
-%%DATADIR%%-test/queries/0_stateless/00926_adaptive_index_granularity_collapsing_merge_tree.sql
-%%DATADIR%%-test/queries/0_stateless/00926_adaptive_index_granularity_merge_tree.reference
-%%DATADIR%%-test/queries/0_stateless/00926_adaptive_index_granularity_merge_tree.sql
-%%DATADIR%%-test/queries/0_stateless/00926_adaptive_index_granularity_pk.reference
-%%DATADIR%%-test/queries/0_stateless/00926_adaptive_index_granularity_pk.sql
-%%DATADIR%%-test/queries/0_stateless/00926_adaptive_index_granularity_replacing_merge_tree.reference
-%%DATADIR%%-test/queries/0_stateless/00926_adaptive_index_granularity_replacing_merge_tree.sql
-%%DATADIR%%-test/queries/0_stateless/00926_adaptive_index_granularity_versioned_collapsing_merge_tree.reference
-%%DATADIR%%-test/queries/0_stateless/00926_adaptive_index_granularity_versioned_collapsing_merge_tree.sql
-%%DATADIR%%-test/queries/0_stateless/00926_geo_to_h3.reference
-%%DATADIR%%-test/queries/0_stateless/00926_geo_to_h3.sql
-%%DATADIR%%-test/queries/0_stateless/00926_multimatch.reference
-%%DATADIR%%-test/queries/0_stateless/00926_multimatch.sql
-%%DATADIR%%-test/queries/0_stateless/00926_zookeeper_adaptive_index_granularity_replicated_merge_tree.reference
-%%DATADIR%%-test/queries/0_stateless/00926_zookeeper_adaptive_index_granularity_replicated_merge_tree.sql
-%%DATADIR%%-test/queries/0_stateless/00927_asof_join_correct_bt.reference
-%%DATADIR%%-test/queries/0_stateless/00927_asof_join_correct_bt.sql
-%%DATADIR%%-test/queries/0_stateless/00927_asof_join_long.reference
-%%DATADIR%%-test/queries/0_stateless/00927_asof_join_long.sql
-%%DATADIR%%-test/queries/0_stateless/00927_asof_join_noninclusive.reference
-%%DATADIR%%-test/queries/0_stateless/00927_asof_join_noninclusive.sql
-%%DATADIR%%-test/queries/0_stateless/00927_asof_join_other_types.reference
-%%DATADIR%%-test/queries/0_stateless/00927_asof_join_other_types.sh
-%%DATADIR%%-test/queries/0_stateless/00927_asof_joins.reference
-%%DATADIR%%-test/queries/0_stateless/00927_asof_joins.sql
-%%DATADIR%%-test/queries/0_stateless/00927_disable_hyperscan.reference
-%%DATADIR%%-test/queries/0_stateless/00927_disable_hyperscan.sql
-%%DATADIR%%-test/queries/0_stateless/00928_multi_match_constant_constant.reference
-%%DATADIR%%-test/queries/0_stateless/00928_multi_match_constant_constant.sql
-%%DATADIR%%-test/queries/0_stateless/00929_multi_match_edit_distance.reference
-%%DATADIR%%-test/queries/0_stateless/00929_multi_match_edit_distance.sql
-%%DATADIR%%-test/queries/0_stateless/00930_arrayIntersect.reference
-%%DATADIR%%-test/queries/0_stateless/00930_arrayIntersect.sql
-%%DATADIR%%-test/queries/0_stateless/00930_max_partitions_per_insert_block.reference
-%%DATADIR%%-test/queries/0_stateless/00930_max_partitions_per_insert_block.sql
-%%DATADIR%%-test/queries/0_stateless/00931_low_cardinality_nullable_aggregate_function_type.reference
-%%DATADIR%%-test/queries/0_stateless/00931_low_cardinality_nullable_aggregate_function_type.sql
-%%DATADIR%%-test/queries/0_stateless/00931_low_cardinality_read_with_empty_array.reference
-%%DATADIR%%-test/queries/0_stateless/00931_low_cardinality_read_with_empty_array.sql
-%%DATADIR%%-test/queries/0_stateless/00931_low_cardinality_set_index_in_key_condition.reference
+%%DATADIR%%-test/queries/0_stateless/02126_url_auth.reference
+%%DATADIR%%-test/queries/0_stateless/01716_drop_rename_sign_column.reference
+%%DATADIR%%-test/queries/0_stateless/01915_merge_prewhere_virtual_column_rand_chao_wang.reference
+%%DATADIR%%-test/queries/0_stateless/00477_parsing_data_types.sql
+%%DATADIR%%-test/queries/0_stateless/02122_parallel_formatting.reference
+%%DATADIR%%-test/queries/0_stateless/00619_extract.sql
+%%DATADIR%%-test/queries/0_stateless/00094_union_race_conditions_5.sh
+%%DATADIR%%-test/queries/0_stateless/01020_function_array_compact.sql
+%%DATADIR%%-test/queries/0_stateless/01933_invalid_date.reference
+%%DATADIR%%-test/queries/0_stateless/01137_order_by_func.sql
+%%DATADIR%%-test/queries/0_stateless/00990_metric_log_table_not_empty.sql
+%%DATADIR%%-test/queries/0_stateless/01451_replicated_detach_drop_and_quorum_long.reference
+%%DATADIR%%-test/queries/0_stateless/00711_array_enumerate_variants.sql
+%%DATADIR%%-test/queries/0_stateless/01925_join_materialized_columns.reference
+%%DATADIR%%-test/queries/0_stateless/02152_bool_type.reference
 %%DATADIR%%-test/queries/0_stateless/00931_low_cardinality_set_index_in_key_condition.sql
-%%DATADIR%%-test/queries/0_stateless/00932_array_intersect_bug.reference
-%%DATADIR%%-test/queries/0_stateless/00932_array_intersect_bug.sql
-%%DATADIR%%-test/queries/0_stateless/00932_geohash_support.reference
-%%DATADIR%%-test/queries/0_stateless/00932_geohash_support.sql
-%%DATADIR%%-test/queries/0_stateless/00933_alter_ttl.reference
 %%DATADIR%%-test/queries/0_stateless/00933_alter_ttl.sql
-%%DATADIR%%-test/queries/0_stateless/00933_reserved_word.reference
-%%DATADIR%%-test/queries/0_stateless/00933_reserved_word.sql
-%%DATADIR%%-test/queries/0_stateless/00933_test_fix_extra_seek_on_compressed_cache.reference
-%%DATADIR%%-test/queries/0_stateless/00933_test_fix_extra_seek_on_compressed_cache.sh
-%%DATADIR%%-test/queries/0_stateless/00933_ttl_replicated_zookeeper.reference
-%%DATADIR%%-test/queries/0_stateless/00933_ttl_replicated_zookeeper.sql
-%%DATADIR%%-test/queries/0_stateless/00933_ttl_simple.reference
-%%DATADIR%%-test/queries/0_stateless/00933_ttl_simple.sql
-%%DATADIR%%-test/queries/0_stateless/00933_ttl_with_default.reference
-%%DATADIR%%-test/queries/0_stateless/00933_ttl_with_default.sql
-%%DATADIR%%-test/queries/0_stateless/00934_is_valid_utf8.reference
-%%DATADIR%%-test/queries/0_stateless/00934_is_valid_utf8.sql
-%%DATADIR%%-test/queries/0_stateless/00935_to_iso_week_first_year.reference
-%%DATADIR%%-test/queries/0_stateless/00935_to_iso_week_first_year.sql
-%%DATADIR%%-test/queries/0_stateless/00936_crc_functions.reference
-%%DATADIR%%-test/queries/0_stateless/00936_crc_functions.sql
-%%DATADIR%%-test/queries/0_stateless/00936_function_result_with_operator_in.reference
-%%DATADIR%%-test/queries/0_stateless/00936_function_result_with_operator_in.sql
-%%DATADIR%%-test/queries/0_stateless/00936_substring_utf8_non_const.reference
-%%DATADIR%%-test/queries/0_stateless/00936_substring_utf8_non_const.sql
-%%DATADIR%%-test/queries/0_stateless/00937_ipv4_cidr_range.reference
-%%DATADIR%%-test/queries/0_stateless/00937_ipv4_cidr_range.sql
-%%DATADIR%%-test/queries/0_stateless/00937_template_output_format.reference
-%%DATADIR%%-test/queries/0_stateless/00937_template_output_format.sh
-%%DATADIR%%-test/queries/0_stateless/00937_test_use_header_csv.reference
-%%DATADIR%%-test/queries/0_stateless/00937_test_use_header_csv.sh
-%%DATADIR%%-test/queries/0_stateless/00937_test_use_header_tsv.reference
-%%DATADIR%%-test/queries/0_stateless/00937_test_use_header_tsv.sh
-%%DATADIR%%-test/queries/0_stateless/00938_basename.reference
-%%DATADIR%%-test/queries/0_stateless/00938_basename.sql
-%%DATADIR%%-test/queries/0_stateless/00938_dataset_test.reference
-%%DATADIR%%-test/queries/0_stateless/00938_dataset_test.sql
-%%DATADIR%%-test/queries/0_stateless/00938_fix_rwlock_segfault_long.reference
-%%DATADIR%%-test/queries/0_stateless/00938_fix_rwlock_segfault_long.sh
-%%DATADIR%%-test/queries/0_stateless/00938_ipv6_cidr_range.reference
-%%DATADIR%%-test/queries/0_stateless/00938_ipv6_cidr_range.sql
-%%DATADIR%%-test/queries/0_stateless/00938_template_input_format.reference
-%%DATADIR%%-test/queries/0_stateless/00938_template_input_format.sh
-%%DATADIR%%-test/queries/0_stateless/00938_test_retention_function.reference
-%%DATADIR%%-test/queries/0_stateless/00938_test_retention_function.sql
-%%DATADIR%%-test/queries/0_stateless/00939_limit_by_offset.reference
-%%DATADIR%%-test/queries/0_stateless/00939_limit_by_offset.sql
-%%DATADIR%%-test/queries/0_stateless/00939_test_null_in.reference
-%%DATADIR%%-test/queries/0_stateless/00939_test_null_in.sql
-%%DATADIR%%-test/queries/0_stateless/00940_max_parts_in_total.reference
-%%DATADIR%%-test/queries/0_stateless/00940_max_parts_in_total.sql
-%%DATADIR%%-test/queries/0_stateless/00940_order_by_read_in_order.reference
-%%DATADIR%%-test/queries/0_stateless/00940_order_by_read_in_order.sql
-%%DATADIR%%-test/queries/0_stateless/00941_system_columns_race_condition.reference
-%%DATADIR%%-test/queries/0_stateless/00941_system_columns_race_condition.sh
-%%DATADIR%%-test/queries/0_stateless/00941_to_custom_week.reference
-%%DATADIR%%-test/queries/0_stateless/00941_to_custom_week.sql
-%%DATADIR%%-test/queries/0_stateless/00942_dataparts_500.reference
-%%DATADIR%%-test/queries/0_stateless/00942_dataparts_500.sh
-%%DATADIR%%-test/queries/0_stateless/00942_mutate_index.reference
-%%DATADIR%%-test/queries/0_stateless/00942_mutate_index.sh
-%%DATADIR%%-test/queries/0_stateless/00942_mv_rename_table.reference
-%%DATADIR%%-test/queries/0_stateless/00942_mv_rename_table.sql
-%%DATADIR%%-test/queries/0_stateless/00943_materialize_index.reference
-%%DATADIR%%-test/queries/0_stateless/00943_materialize_index.sh
-%%DATADIR%%-test/queries/0_stateless/00943_mv_rename_without_inner_table.reference
-%%DATADIR%%-test/queries/0_stateless/00943_mv_rename_without_inner_table.sql
-%%DATADIR%%-test/queries/0_stateless/00944_clear_index_in_partition.reference
-%%DATADIR%%-test/queries/0_stateless/00944_clear_index_in_partition.sh
-%%DATADIR%%-test/queries/0_stateless/00944_create_bloom_filter_index_with_merge_tree.reference
-%%DATADIR%%-test/queries/0_stateless/00944_create_bloom_filter_index_with_merge_tree.sh
-%%DATADIR%%-test/queries/0_stateless/00944_minmax_null.reference
-%%DATADIR%%-test/queries/0_stateless/00944_minmax_null.sql
-%%DATADIR%%-test/queries/0_stateless/00944_ml_test.reference
-%%DATADIR%%-test/queries/0_stateless/00944_ml_test.sql
-%%DATADIR%%-test/queries/0_stateless/00945_bloom_filter_index.reference
-%%DATADIR%%-test/queries/0_stateless/00945_bloom_filter_index.sql
-%%DATADIR%%-test/queries/0_stateless/00945_ml_test.reference
-%%DATADIR%%-test/queries/0_stateless/00945_ml_test.sql
-%%DATADIR%%-test/queries/0_stateless/00946_ml_test.reference
-%%DATADIR%%-test/queries/0_stateless/00946_ml_test.sql
-%%DATADIR%%-test/queries/0_stateless/00947_ml_test.reference
-%%DATADIR%%-test/queries/0_stateless/00947_ml_test.sql
-%%DATADIR%%-test/queries/0_stateless/00948_format_in_with_single_element.reference
-%%DATADIR%%-test/queries/0_stateless/00948_format_in_with_single_element.sh
+%%DATADIR%%-test/queries/0_stateless/01016_macros.reference
+%%DATADIR%%-test/queries/0_stateless/02007_test_any_all_operators.sql
+%%DATADIR%%-test/queries/0_stateless/01037_polygon_dicts_correctness_fast.reference
+%%DATADIR%%-test/queries/0_stateless/01786_nullable_string_tsv_at_eof.sh
+%%DATADIR%%-test/queries/0_stateless/01018_dictionaries_from_dictionaries.reference
+%%DATADIR%%-test/queries/0_stateless/01698_fix_toMinute.reference
+%%DATADIR%%-test/queries/0_stateless/00719_format_datetime_rand.sql
+%%DATADIR%%-test/queries/0_stateless/01872_initial_query_start_time.sh
+%%DATADIR%%-test/queries/0_stateless/02100_alter_scalar_circular_deadlock.reference
+%%DATADIR%%-test/queries/0_stateless/00284_external_aggregation.sql
+%%DATADIR%%-test/queries/0_stateless/01786_explain_merge_tree.sh
+%%DATADIR%%-test/queries/0_stateless/00341_squashing_insert_select2.reference
+%%DATADIR%%-test/queries/0_stateless/00111_shard_external_sort_distributed.reference
+%%DATADIR%%-test/queries/0_stateless/01060_defaults_all_columns.reference
+%%DATADIR%%-test/queries/0_stateless/01087_storage_generate.reference
+%%DATADIR%%-test/queries/0_stateless/00214_primary_key_order.sql
+%%DATADIR%%-test/queries/0_stateless/00500_point_in_polygon_bug.sql
+%%DATADIR%%-test/queries/0_stateless/01109_exchange_tables.reference
+%%DATADIR%%-test/queries/0_stateless/00707_float_csv_delimiter.sql
+%%DATADIR%%-test/queries/0_stateless/00490_with_select.sql
+%%DATADIR%%-test/queries/0_stateless/01457_compile_expressions_fuzzer.reference
+%%DATADIR%%-test/queries/0_stateless/00673_subquery_prepared_set_performance.sql
+%%DATADIR%%-test/queries/0_stateless/00825_protobuf_format_nested_optional.sh
+%%DATADIR%%-test/queries/0_stateless/01064_window_view_event_hop_to_bounded.reference
+%%DATADIR%%-test/queries/0_stateless/00725_join_on_bug_2.sql
+%%DATADIR%%-test/queries/0_stateless/00626_replace_partition_from_table.sql
+%%DATADIR%%-test/queries/0_stateless/01472_many_rows_in_totals.reference
+%%DATADIR%%-test/queries/0_stateless/00900_orc_load.reference
+%%DATADIR%%-test/queries/0_stateless/01853_s2_cells_intersect.sql
+%%DATADIR%%-test/queries/0_stateless/01244_optimize_distributed_group_by_sharding_key.reference
+%%DATADIR%%-test/queries/0_stateless/01388_clear_all_columns.reference
+%%DATADIR%%-test/queries/0_stateless/00420_null_in_scalar_subqueries.reference
+%%DATADIR%%-test/queries/0_stateless/01045_zookeeper_system_mutations_with_parts_names.sh
+%%DATADIR%%-test/queries/0_stateless/00745_compile_scalar_subquery.sql
+%%DATADIR%%-test/queries/0_stateless/01511_alter_version_versioned_collapsing_merge_tree_zookeeper.sql
+%%DATADIR%%-test/queries/0_stateless/00476_pretty_formats_and_widths.sql
+%%DATADIR%%-test/queries/0_stateless/01353_topk_enum.sql
+%%DATADIR%%-test/queries/0_stateless/02017_columns_with_dot.reference
+%%DATADIR%%-test/queries/0_stateless/01922_client_param.sh
+%%DATADIR%%-test/queries/0_stateless/02149_schema_inference_formats_with_schema.reference
+%%DATADIR%%-test/queries/0_stateless/02015_async_inserts_4.sh
+%%DATADIR%%-test/queries/0_stateless/01703_rewrite_aggregate_function_case_insensitive.reference
+%%DATADIR%%-test/queries/0_stateless/01943_log_column_sizes.reference
+%%DATADIR%%-test/queries/0_stateless/00098_shard_i_union_all.sql
+%%DATADIR%%-test/queries/0_stateless/00044_sorting_by_string_descending.reference
+%%DATADIR%%-test/queries/0_stateless/00418_input_format_allow_errors.sh
+%%DATADIR%%-test/queries/0_stateless/00762_date_comparsion.sql
+%%DATADIR%%-test/queries/0_stateless/01596_null_as_default_nullable.sql
+%%DATADIR%%-test/queries/0_stateless/00625_query_in_form_data.reference
+%%DATADIR%%-test/queries/0_stateless/01257_dictionary_mismatch_types.sql
+%%DATADIR%%-test/queries/0_stateless/00559_filter_array_generic.reference
+%%DATADIR%%-test/queries/0_stateless/01744_tuple_cast_to_map_bugfix.sql
+%%DATADIR%%-test/queries/0_stateless/00394_new_nested_column_keeps_offsets.sql
+%%DATADIR%%-test/queries/0_stateless/01756_optimize_skip_unused_shards_rewrite_in.sql
+%%DATADIR%%-test/queries/0_stateless/01787_map_remote.reference
+%%DATADIR%%-test/queries/0_stateless/01305_replica_create_drop_zookeeper.sh
+%%DATADIR%%-test/queries/0_stateless/01355_defaultValueOfArgumentType_bug.sql
+%%DATADIR%%-test/queries/0_stateless/01915_for_each_crakjie.reference
+%%DATADIR%%-test/queries/0_stateless/00721_force_by_identical_result_after_merge_zookeeper_long.sql
+%%DATADIR%%-test/queries/0_stateless/01889_clickhouse_client_config_format.reference
+%%DATADIR%%-test/queries/0_stateless/01771_datetime64_no_time_part.reference
+%%DATADIR%%-test/queries/0_stateless/01532_execute_merges_on_single_replica_long.reference
+%%DATADIR%%-test/queries/0_stateless/01483_merge_table_join_and_group_by.reference
+%%DATADIR%%-test/queries/0_stateless/01276_alter_rename_column_materialized_expr.sql
+%%DATADIR%%-test/queries/0_stateless/00528_const_of_nullable.sql
+%%DATADIR%%-test/queries/0_stateless/00011_array_join_alias.reference
+%%DATADIR%%-test/queries/0_stateless/01710_projections.reference
+%%DATADIR%%-test/queries/0_stateless/00802_daylight_saving_time_shift_backwards_at_midnight.reference
+%%DATADIR%%-test/queries/0_stateless/01213_alter_rename_compact_part.sql
+%%DATADIR%%-test/queries/0_stateless/01345_index_date_vs_datetime.sql
+%%DATADIR%%-test/queries/0_stateless/02160_h3_cell_area_m2.reference
 %%DATADIR%%-test/queries/0_stateless/00948_to_valid_utf8.reference
-%%DATADIR%%-test/queries/0_stateless/00948_to_valid_utf8.sql
-%%DATADIR%%-test/queries/0_stateless/00948_values_interpreter_template.reference
-%%DATADIR%%-test/queries/0_stateless/00948_values_interpreter_template.sql
-%%DATADIR%%-test/queries/0_stateless/00949_format.reference
-%%DATADIR%%-test/queries/0_stateless/00949_format.sql
-%%DATADIR%%-test/queries/0_stateless/00950_bad_alloc_when_truncate_join_storage.reference
-%%DATADIR%%-test/queries/0_stateless/00950_bad_alloc_when_truncate_join_storage.sql
-%%DATADIR%%-test/queries/0_stateless/00950_default_prewhere.reference
-%%DATADIR%%-test/queries/0_stateless/00950_default_prewhere.sql
-%%DATADIR%%-test/queries/0_stateless/00950_dict_get.reference
-%%DATADIR%%-test/queries/0_stateless/00950_dict_get.sql
-%%DATADIR%%-test/queries/0_stateless/00950_test_double_delta_codec.reference
-%%DATADIR%%-test/queries/0_stateless/00950_test_double_delta_codec.sql
-%%DATADIR%%-test/queries/0_stateless/00950_test_gorilla_codec.reference
-%%DATADIR%%-test/queries/0_stateless/00950_test_gorilla_codec.sql
-%%DATADIR%%-test/queries/0_stateless/00951_ngram_search.reference
-%%DATADIR%%-test/queries/0_stateless/00951_ngram_search.sql
-%%DATADIR%%-test/queries/0_stateless/00952_basic_constraints.reference
-%%DATADIR%%-test/queries/0_stateless/00952_basic_constraints.sh
-%%DATADIR%%-test/queries/0_stateless/00952_input_function.reference
-%%DATADIR%%-test/queries/0_stateless/00952_input_function.sh
-%%DATADIR%%-test/queries/0_stateless/00952_insert_into_distributed_with_materialized_column.reference
-%%DATADIR%%-test/queries/0_stateless/00952_insert_into_distributed_with_materialized_column.sql
-%%DATADIR%%-test/queries/0_stateless/00952_part_frozen_info.reference
-%%DATADIR%%-test/queries/0_stateless/00952_part_frozen_info.sql
-%%DATADIR%%-test/queries/0_stateless/00953_constraints_operations.reference
+%%DATADIR%%-test/queries/0_stateless/01191_rename_dictionary.sql
+%%DATADIR%%-test/queries/0_stateless/02152_invalid_setting_with_hints_in_http_request.sh
+%%DATADIR%%-test/queries/0_stateless/00098_1_union_all.sql
+%%DATADIR%%-test/queries/0_stateless/01419_skip_index_compact_parts.sql
+%%DATADIR%%-test/queries/0_stateless/01071_force_optimize_skip_unused_shards.reference
+%%DATADIR%%-test/queries/0_stateless/02047_log_family_data_file_dumps.reference
+%%DATADIR%%-test/queries/0_stateless/01845_add_testcase_for_arrayElement.reference
+%%DATADIR%%-test/queries/0_stateless/00060_date_lut.reference
+%%DATADIR%%-test/queries/0_stateless/01290_empty_array_index_analysis.sql
+%%DATADIR%%-test/queries/0_stateless/01064_array_auc.reference
+%%DATADIR%%-test/queries/0_stateless/00415_into_outfile.sh
+%%DATADIR%%-test/queries/0_stateless/01277_toUnixTimestamp64.sql
+%%DATADIR%%-test/queries/0_stateless/00700_to_decimal_or_something.sql
+%%DATADIR%%-test/queries/0_stateless/01932_alter_index_with_order.reference
+%%DATADIR%%-test/queries/0_stateless/00552_logical_functions_uint8_as_bool.reference
+%%DATADIR%%-test/queries/0_stateless/01867_support_datetime64_version_column.sql
+%%DATADIR%%-test/queries/0_stateless/01066_window_view_event_tumble_to_strict_asc_lateness.reference
+%%DATADIR%%-test/queries/0_stateless/01923_network_receive_time_metric_insert.sh
+%%DATADIR%%-test/queries/0_stateless/00688_low_cardinality_alter_add_column.reference
+%%DATADIR%%-test/queries/0_stateless/00820_multiple_joins_subquery_requires_alias.sql
+%%DATADIR%%-test/queries/0_stateless/02046_low_cardinality_parallel_group_by.sh
+%%DATADIR%%-test/queries/0_stateless/01451_replicated_detach_drop_and_quorum_long.sql
+%%DATADIR%%-test/queries/0_stateless/02096_join_unusual_identifier_begin.sql
+%%DATADIR%%-test/queries/0_stateless/01834_alias_columns_laziness_filimonov.reference
+%%DATADIR%%-test/queries/0_stateless/00620_optimize_on_nonleader_replica_zookeeper.reference
+%%DATADIR%%-test/queries/0_stateless/00008_array_join.reference
+%%DATADIR%%-test/queries/0_stateless/00665_alter_nullable_string_to_nullable_uint8.sql
+%%DATADIR%%-test/queries/0_stateless/01047_simple_aggregate_sizes_of_columns_bug.reference
 %%DATADIR%%-test/queries/0_stateless/00953_constraints_operations.sh
-%%DATADIR%%-test/queries/0_stateless/00953_indices_alter_exceptions.reference
-%%DATADIR%%-test/queries/0_stateless/00953_indices_alter_exceptions.sh
-%%DATADIR%%-test/queries/0_stateless/00953_moving_functions.reference
-%%DATADIR%%-test/queries/0_stateless/00953_moving_functions.sql
-%%DATADIR%%-test/queries/0_stateless/00953_zookeeper_suetin_deduplication_bug.reference
-%%DATADIR%%-test/queries/0_stateless/00953_zookeeper_suetin_deduplication_bug.sh
-%%DATADIR%%-test/queries/0_stateless/00954_client_prepared_statements.reference
-%%DATADIR%%-test/queries/0_stateless/00954_client_prepared_statements.sh
-%%DATADIR%%-test/queries/0_stateless/00954_resample_combinator.reference
-%%DATADIR%%-test/queries/0_stateless/00954_resample_combinator.sql
-%%DATADIR%%-test/queries/0_stateless/00955_complex_prepared_statements.reference
-%%DATADIR%%-test/queries/0_stateless/00955_complex_prepared_statements.sh
-%%DATADIR%%-test/queries/0_stateless/00955_test_final_mark.reference
-%%DATADIR%%-test/queries/0_stateless/00955_test_final_mark.sql
-%%DATADIR%%-test/queries/0_stateless/00955_test_final_mark_use.reference
-%%DATADIR%%-test/queries/0_stateless/00955_test_final_mark_use.sh
-%%DATADIR%%-test/queries/0_stateless/00956_http_prepared_statements.reference
-%%DATADIR%%-test/queries/0_stateless/00956_http_prepared_statements.sh
-%%DATADIR%%-test/queries/0_stateless/00956_join_use_nulls_with_array_column.reference
-%%DATADIR%%-test/queries/0_stateless/00956_join_use_nulls_with_array_column.sql
-%%DATADIR%%-test/queries/0_stateless/00956_sensitive_data_masking.reference
-%%DATADIR%%-test/queries/0_stateless/00956_sensitive_data_masking.sh
-%%DATADIR%%-test/queries/0_stateless/00957_coalesce_const_nullable_crash.reference
-%%DATADIR%%-test/queries/0_stateless/00957_coalesce_const_nullable_crash.sql
-%%DATADIR%%-test/queries/0_stateless/00957_delta_diff_bug.reference
-%%DATADIR%%-test/queries/0_stateless/00957_delta_diff_bug.sql
-%%DATADIR%%-test/queries/0_stateless/00957_format_with_clashed_aliases.reference
-%%DATADIR%%-test/queries/0_stateless/00957_format_with_clashed_aliases.sh
-%%DATADIR%%-test/queries/0_stateless/00957_neighbor.reference
-%%DATADIR%%-test/queries/0_stateless/00957_neighbor.sql
-%%DATADIR%%-test/queries/0_stateless/00958_format_of_tuple_array_element.reference
-%%DATADIR%%-test/queries/0_stateless/00958_format_of_tuple_array_element.sh
-%%DATADIR%%-test/queries/0_stateless/00959_format_with_different_aliases.reference
-%%DATADIR%%-test/queries/0_stateless/00959_format_with_different_aliases.sh
-%%DATADIR%%-test/queries/0_stateless/00960_eval_ml_method_const.reference
-%%DATADIR%%-test/queries/0_stateless/00960_eval_ml_method_const.sql
-%%DATADIR%%-test/queries/0_stateless/00960_live_view_watch_events_live.py
-%%DATADIR%%-test/queries/0_stateless/00960_live_view_watch_events_live.reference
-%%DATADIR%%-test/queries/0_stateless/00961_check_table.reference
-%%DATADIR%%-test/queries/0_stateless/00961_check_table.sql
-%%DATADIR%%-test/queries/0_stateless/00961_checksums_in_system_parts_columns_table.reference
-%%DATADIR%%-test/queries/0_stateless/00961_checksums_in_system_parts_columns_table.sql
-%%DATADIR%%-test/queries/0_stateless/00961_temporary_live_view_watch.reference
-%%DATADIR%%-test/queries/0_stateless/00961_temporary_live_view_watch.sql
-%%DATADIR%%-test/queries/0_stateless/00961_visit_param_buffer_underflow.reference
-%%DATADIR%%-test/queries/0_stateless/00961_visit_param_buffer_underflow.sql
-%%DATADIR%%-test/queries/0_stateless/00962_enumNotExect.reference
-%%DATADIR%%-test/queries/0_stateless/00962_enumNotExect.sql
-%%DATADIR%%-test/queries/0_stateless/00962_live_view_periodic_refresh.py
-%%DATADIR%%-test/queries/0_stateless/00962_live_view_periodic_refresh.reference
-%%DATADIR%%-test/queries/0_stateless/00962_live_view_periodic_refresh_and_timeout.py
-%%DATADIR%%-test/queries/0_stateless/00962_live_view_periodic_refresh_and_timeout.reference
-%%DATADIR%%-test/queries/0_stateless/00962_live_view_periodic_refresh_dictionary.py
-%%DATADIR%%-test/queries/0_stateless/00962_live_view_periodic_refresh_dictionary.reference
-%%DATADIR%%-test/queries/0_stateless/00962_temporary_live_view_watch_live.py
-%%DATADIR%%-test/queries/0_stateless/00962_temporary_live_view_watch_live.reference
-%%DATADIR%%-test/queries/0_stateless/00962_visit_param_various.reference
-%%DATADIR%%-test/queries/0_stateless/00962_visit_param_various.sql
-%%DATADIR%%-test/queries/0_stateless/00963_achimbab.reference
-%%DATADIR%%-test/queries/0_stateless/00963_achimbab.sql
-%%DATADIR%%-test/queries/0_stateless/00963_startsWith_force_primary_key.reference
-%%DATADIR%%-test/queries/0_stateless/00963_startsWith_force_primary_key.sql
-%%DATADIR%%-test/queries/0_stateless/00963_temporary_live_view_watch_live_timeout.py.disabled
-%%DATADIR%%-test/queries/0_stateless/00963_temporary_live_view_watch_live_timeout.reference
-%%DATADIR%%-test/queries/0_stateless/00964_bloom_index_string_functions.reference
-%%DATADIR%%-test/queries/0_stateless/00964_bloom_index_string_functions.sh
-%%DATADIR%%-test/queries/0_stateless/00964_live_view_watch_events_heartbeat.py
-%%DATADIR%%-test/queries/0_stateless/00964_live_view_watch_events_heartbeat.reference
-%%DATADIR%%-test/queries/0_stateless/00964_os_thread_priority.reference
-%%DATADIR%%-test/queries/0_stateless/00964_os_thread_priority.sql
-%%DATADIR%%-test/queries/0_stateless/00965_live_view_watch_heartbeat.py
-%%DATADIR%%-test/queries/0_stateless/00965_live_view_watch_heartbeat.reference
-%%DATADIR%%-test/queries/0_stateless/00965_logs_level_bugfix.reference
-%%DATADIR%%-test/queries/0_stateless/00965_logs_level_bugfix.sh
-%%DATADIR%%-test/queries/0_stateless/00965_send_logs_level_concurrent_queries.reference
-%%DATADIR%%-test/queries/0_stateless/00965_send_logs_level_concurrent_queries.sh
-%%DATADIR%%-test/queries/0_stateless/00965_set_index_string_functions.reference
-%%DATADIR%%-test/queries/0_stateless/00965_set_index_string_functions.sh
-%%DATADIR%%-test/queries/0_stateless/00965_shard_unresolvable_addresses.reference
-%%DATADIR%%-test/queries/0_stateless/00965_shard_unresolvable_addresses.sql
-%%DATADIR%%-test/queries/0_stateless/00966_invalid_json_must_not_parse.reference
-%%DATADIR%%-test/queries/0_stateless/00966_invalid_json_must_not_parse.sql
-%%DATADIR%%-test/queries/0_stateless/00966_live_view_watch_events_http.py
-%%DATADIR%%-test/queries/0_stateless/00966_live_view_watch_events_http.reference
-%%DATADIR%%-test/queries/0_stateless/00967_insert_into_distributed_different_types.reference
-%%DATADIR%%-test/queries/0_stateless/00967_insert_into_distributed_different_types.sql
-%%DATADIR%%-test/queries/0_stateless/00967_live_view_watch_http.py
-%%DATADIR%%-test/queries/0_stateless/00967_live_view_watch_http.reference
-%%DATADIR%%-test/queries/0_stateless/00967_ubsan_bit_test.reference
-%%DATADIR%%-test/queries/0_stateless/00967_ubsan_bit_test.sql
-%%DATADIR%%-test/queries/0_stateless/00968_file_engine_in_subquery.reference
-%%DATADIR%%-test/queries/0_stateless/00968_file_engine_in_subquery.sql
-%%DATADIR%%-test/queries/0_stateless/00968_live_view_select_format_jsoneachrowwithprogress.reference
-%%DATADIR%%-test/queries/0_stateless/00968_live_view_select_format_jsoneachrowwithprogress.sql
-%%DATADIR%%-test/queries/0_stateless/00968_roundAge.reference
-%%DATADIR%%-test/queries/0_stateless/00968_roundAge.sql
-%%DATADIR%%-test/queries/0_stateless/00969_columns_clause.reference
-%%DATADIR%%-test/queries/0_stateless/00969_columns_clause.sql
-%%DATADIR%%-test/queries/0_stateless/00969_live_view_watch_format_jsoneachrowwithprogress.reference
-%%DATADIR%%-test/queries/0_stateless/00969_live_view_watch_format_jsoneachrowwithprogress.sql
-%%DATADIR%%-test/queries/0_stateless/00969_roundDuration.reference
-%%DATADIR%%-test/queries/0_stateless/00969_roundDuration.sql
-%%DATADIR%%-test/queries/0_stateless/00970_live_view_watch_events_http_heartbeat.py
-%%DATADIR%%-test/queries/0_stateless/00970_live_view_watch_events_http_heartbeat.reference
-%%DATADIR%%-test/queries/0_stateless/00970_substring_arg_validation.reference
-%%DATADIR%%-test/queries/0_stateless/00970_substring_arg_validation.sql
-%%DATADIR%%-test/queries/0_stateless/00971_live_view_watch_http_heartbeat.py
-%%DATADIR%%-test/queries/0_stateless/00971_live_view_watch_http_heartbeat.reference
-%%DATADIR%%-test/queries/0_stateless/00971_merge_tree_uniform_read_distribution_and_max_rows_to_read.reference
-%%DATADIR%%-test/queries/0_stateless/00971_merge_tree_uniform_read_distribution_and_max_rows_to_read.sql
-%%DATADIR%%-test/queries/0_stateless/00971_query_id_in_logs.reference
-%%DATADIR%%-test/queries/0_stateless/00971_query_id_in_logs.sh
-%%DATADIR%%-test/queries/0_stateless/00972_desc_table_virtual_columns.reference
-%%DATADIR%%-test/queries/0_stateless/00972_desc_table_virtual_columns.sql
+%%DATADIR%%-test/queries/0_stateless/00700_decimal_in_keys.reference
+%%DATADIR%%-test/queries/0_stateless/01643_merge_tree_fsync_smoke.sql
+%%DATADIR%%-test/queries/0_stateless/02154_bitmap_contains.sql
+%%DATADIR%%-test/queries/0_stateless/01453_fixsed_string_sort.sql
+%%DATADIR%%-test/queries/0_stateless/01184_long_insert_values_huge_strings.reference
+%%DATADIR%%-test/queries/0_stateless/01671_aggregate_function_group_bitmap_data.sql
+%%DATADIR%%-test/queries/0_stateless/00224_shard_distributed_aggregation_memory_efficient_and_overflows.sql
+%%DATADIR%%-test/queries/0_stateless/01756_optimize_skip_unused_shards_rewrite_in.reference
+%%DATADIR%%-test/queries/0_stateless/01753_max_uri_size.sh
+%%DATADIR%%-test/queries/0_stateless/01753_system_zookeeper_query_param_path_long.reference
+%%DATADIR%%-test/queries/0_stateless/01322_monotonous_order_by_with_different_variables.reference
+%%DATADIR%%-test/queries/0_stateless/01848_http_insert_segfault.reference
+%%DATADIR%%-test/queries/0_stateless/02135_local_create_db.reference
+%%DATADIR%%-test/queries/0_stateless/01279_empty_external_table.sh
+%%DATADIR%%-test/queries/0_stateless/01795_TinyLog_rwlock_ub.reference
+%%DATADIR%%-test/queries/0_stateless/01277_large_tuples.reference
+%%DATADIR%%-test/queries/0_stateless/01375_storage_file_tsv_csv_with_names_write_prefix.reference
+%%DATADIR%%-test/queries/0_stateless/01940_point_in_polygon_ubsan.sql
+%%DATADIR%%-test/queries/0_stateless/01055_prewhere_bugs.sql
+%%DATADIR%%-test/queries/0_stateless/01508_partition_pruning_long.reference
+%%DATADIR%%-test/queries/0_stateless/01760_ddl_dictionary_use_current_database_name.sql
+%%DATADIR%%-test/queries/0_stateless/00736_disjunction_optimisation.reference
+%%DATADIR%%-test/queries/0_stateless/01070_mutations_with_dependencies.reference
+%%DATADIR%%-test/queries/0_stateless/02022_array_full_text_bloom_filter_index.reference
+%%DATADIR%%-test/queries/0_stateless/01054_window_view_proc_tumble_to.sh
+%%DATADIR%%-test/queries/0_stateless/01006_ttl_with_default_2.reference
 %%DATADIR%%-test/queries/0_stateless/00972_geohashesInBox.reference
-%%DATADIR%%-test/queries/0_stateless/00972_geohashesInBox.sql
-%%DATADIR%%-test/queries/0_stateless/00972_live_view_select_1.reference
-%%DATADIR%%-test/queries/0_stateless/00972_live_view_select_1.sql
-%%DATADIR%%-test/queries/0_stateless/00973_create_table_as_table_function.reference
-%%DATADIR%%-test/queries/0_stateless/00973_create_table_as_table_function.sql
-%%DATADIR%%-test/queries/0_stateless/00973_live_view_select.reference
-%%DATADIR%%-test/queries/0_stateless/00973_live_view_select.sql
-%%DATADIR%%-test/queries/0_stateless/00973_live_view_select_prewhere.reference
-%%DATADIR%%-test/queries/0_stateless/00973_live_view_select_prewhere.sql
-%%DATADIR%%-test/queries/0_stateless/00973_live_view_with_subquery_select.reference
-%%DATADIR%%-test/queries/0_stateless/00973_live_view_with_subquery_select.sql
-%%DATADIR%%-test/queries/0_stateless/00973_live_view_with_subquery_select_join.reference
-%%DATADIR%%-test/queries/0_stateless/00973_live_view_with_subquery_select_join.sql
-%%DATADIR%%-test/queries/0_stateless/00973_live_view_with_subquery_select_join_no_alias.reference
-%%DATADIR%%-test/queries/0_stateless/00973_live_view_with_subquery_select_join_no_alias.sql
-%%DATADIR%%-test/queries/0_stateless/00973_live_view_with_subquery_select_nested.reference
-%%DATADIR%%-test/queries/0_stateless/00973_live_view_with_subquery_select_nested.sql
-%%DATADIR%%-test/queries/0_stateless/00973_live_view_with_subquery_select_nested_with_aggregation.reference
-%%DATADIR%%-test/queries/0_stateless/00973_live_view_with_subquery_select_nested_with_aggregation.sql
-%%DATADIR%%-test/queries/0_stateless/00973_live_view_with_subquery_select_nested_with_aggregation_table_alias.reference
-%%DATADIR%%-test/queries/0_stateless/00973_live_view_with_subquery_select_nested_with_aggregation_table_alias.sql
-%%DATADIR%%-test/queries/0_stateless/00973_live_view_with_subquery_select_table_alias.reference
-%%DATADIR%%-test/queries/0_stateless/00973_live_view_with_subquery_select_table_alias.sql
-%%DATADIR%%-test/queries/0_stateless/00973_live_view_with_subquery_select_with_aggregation.reference
-%%DATADIR%%-test/queries/0_stateless/00973_live_view_with_subquery_select_with_aggregation.sql
-%%DATADIR%%-test/queries/0_stateless/00973_live_view_with_subquery_select_with_aggregation_in_subquery.reference
-%%DATADIR%%-test/queries/0_stateless/00973_live_view_with_subquery_select_with_aggregation_in_subquery.sql
-%%DATADIR%%-test/queries/0_stateless/00973_uniq_non_associativity.reference
-%%DATADIR%%-test/queries/0_stateless/00973_uniq_non_associativity.sql
-%%DATADIR%%-test/queries/0_stateless/00974_adaptive_granularity_secondary_index.reference
-%%DATADIR%%-test/queries/0_stateless/00974_adaptive_granularity_secondary_index.sql
-%%DATADIR%%-test/queries/0_stateless/00974_bitmapContains_with_primary_key.reference
-%%DATADIR%%-test/queries/0_stateless/00974_bitmapContains_with_primary_key.sql
-%%DATADIR%%-test/queries/0_stateless/00974_distributed_join_on.reference
-%%DATADIR%%-test/queries/0_stateless/00974_distributed_join_on.sql
-%%DATADIR%%-test/queries/0_stateless/00974_final_predicate_push_down.reference
-%%DATADIR%%-test/queries/0_stateless/00974_final_predicate_push_down.sql
-%%DATADIR%%-test/queries/0_stateless/00974_fix_join_on.reference
-%%DATADIR%%-test/queries/0_stateless/00974_fix_join_on.sql
-%%DATADIR%%-test/queries/0_stateless/00974_full_outer_join.reference
-%%DATADIR%%-test/queries/0_stateless/00974_full_outer_join.sql
-%%DATADIR%%-test/queries/0_stateless/00974_live_view_select_with_aggregation.reference
-%%DATADIR%%-test/queries/0_stateless/00974_live_view_select_with_aggregation.sql
-%%DATADIR%%-test/queries/0_stateless/00974_low_cardinality_cast.reference
-%%DATADIR%%-test/queries/0_stateless/00974_low_cardinality_cast.sql
-%%DATADIR%%-test/queries/0_stateless/00974_primary_key_for_lowCardinality.reference
-%%DATADIR%%-test/queries/0_stateless/00974_primary_key_for_lowCardinality.sh
-%%DATADIR%%-test/queries/0_stateless/00974_query_profiler.reference
-%%DATADIR%%-test/queries/0_stateless/00974_query_profiler.sql
-%%DATADIR%%-test/queries/0_stateless/00974_text_log_table_not_empty.reference
-%%DATADIR%%-test/queries/0_stateless/00974_text_log_table_not_empty.sh
-%%DATADIR%%-test/queries/0_stateless/00975_indices_mutation_replicated_zookeeper_long.reference
-%%DATADIR%%-test/queries/0_stateless/00975_indices_mutation_replicated_zookeeper_long.sh
-%%DATADIR%%-test/queries/0_stateless/00975_json_hang.reference
-%%DATADIR%%-test/queries/0_stateless/00975_json_hang.sql
-%%DATADIR%%-test/queries/0_stateless/00975_live_view_create.reference
-%%DATADIR%%-test/queries/0_stateless/00975_live_view_create.sql
-%%DATADIR%%-test/queries/0_stateless/00975_move_partition_merge_tree.reference
-%%DATADIR%%-test/queries/0_stateless/00975_move_partition_merge_tree.sql
-%%DATADIR%%-test/queries/0_stateless/00975_recursive_materialized_view.reference
-%%DATADIR%%-test/queries/0_stateless/00975_recursive_materialized_view.sql
-%%DATADIR%%-test/queries/0_stateless/00975_sample_prewhere_distributed.reference
-%%DATADIR%%-test/queries/0_stateless/00975_sample_prewhere_distributed.sql
-%%DATADIR%%-test/queries/0_stateless/00975_values_list.reference
-%%DATADIR%%-test/queries/0_stateless/00975_values_list.sql
-%%DATADIR%%-test/queries/0_stateless/00976_asof_join_on.reference
+%%DATADIR%%-test/queries/0_stateless/00810_in_operators_segfault.reference
+%%DATADIR%%-test/queries/0_stateless/00153_transform.sql
+%%DATADIR%%-test/queries/0_stateless/00803_xxhash.reference
+%%DATADIR%%-test/queries/0_stateless/02025_nested_func_for_if_combinator.reference
+%%DATADIR%%-test/queries/0_stateless/01606_git_import.sh
+%%DATADIR%%-test/queries/0_stateless/01278_variance_nonnegative.sql
+%%DATADIR%%-test/queries/0_stateless/01023_materialized_view_query_context.sql
+%%DATADIR%%-test/queries/0_stateless/01672_test_toSecond_mysql_dialect.reference
+%%DATADIR%%-test/queries/0_stateless/01888_bloom_filter_hasAny.sql
+%%DATADIR%%-test/queries/0_stateless/00999_nullable_nested_types_4877.sql
+%%DATADIR%%-test/queries/0_stateless/01255_geo_types_livace.sql
+%%DATADIR%%-test/queries/0_stateless/01670_neighbor_lc_bug.reference
 %%DATADIR%%-test/queries/0_stateless/00976_asof_join_on.sql
-%%DATADIR%%-test/queries/0_stateless/00976_live_view_select_version.reference
-%%DATADIR%%-test/queries/0_stateless/00976_live_view_select_version.sql
-%%DATADIR%%-test/queries/0_stateless/00976_max_execution_speed.reference
-%%DATADIR%%-test/queries/0_stateless/00976_max_execution_speed.sql
-%%DATADIR%%-test/queries/0_stateless/00976_shard_low_cardinality_achimbab.reference
-%%DATADIR%%-test/queries/0_stateless/00976_shard_low_cardinality_achimbab.sql
-%%DATADIR%%-test/queries/0_stateless/00976_system_stop_ttl_merges.reference
-%%DATADIR%%-test/queries/0_stateless/00976_system_stop_ttl_merges.sql
-%%DATADIR%%-test/queries/0_stateless/00976_ttl_with_old_parts.reference
-%%DATADIR%%-test/queries/0_stateless/00976_ttl_with_old_parts.sql
-%%DATADIR%%-test/queries/0_stateless/00977_int_div.reference
-%%DATADIR%%-test/queries/0_stateless/00977_int_div.sql
-%%DATADIR%%-test/queries/0_stateless/00977_join_use_nulls_denny_crane.reference
-%%DATADIR%%-test/queries/0_stateless/00977_join_use_nulls_denny_crane.sql
-%%DATADIR%%-test/queries/0_stateless/00977_live_view_watch_events.reference
-%%DATADIR%%-test/queries/0_stateless/00977_live_view_watch_events.sql
-%%DATADIR%%-test/queries/0_stateless/00978_live_view_watch.reference
-%%DATADIR%%-test/queries/0_stateless/00978_live_view_watch.sql
-%%DATADIR%%-test/queries/0_stateless/00978_ml_math.reference
-%%DATADIR%%-test/queries/0_stateless/00978_ml_math.sql
-%%DATADIR%%-test/queries/0_stateless/00978_sum_map_bugfix.reference
-%%DATADIR%%-test/queries/0_stateless/00978_sum_map_bugfix.sql
-%%DATADIR%%-test/queries/0_stateless/00978_table_function_values_alias.reference
-%%DATADIR%%-test/queries/0_stateless/00978_table_function_values_alias.sql
-%%DATADIR%%-test/queries/0_stateless/00979_live_view_watch_continuous_aggregates.py
-%%DATADIR%%-test/queries/0_stateless/00979_live_view_watch_continuous_aggregates.reference
-%%DATADIR%%-test/queries/0_stateless/00979_live_view_watch_live.py
-%%DATADIR%%-test/queries/0_stateless/00979_live_view_watch_live.reference
-%%DATADIR%%-test/queries/0_stateless/00979_live_view_watch_live_moving_avg.py.disabled
-%%DATADIR%%-test/queries/0_stateless/00979_live_view_watch_live_moving_avg.reference
-%%DATADIR%%-test/queries/0_stateless/00979_live_view_watch_live_with_subquery.py
-%%DATADIR%%-test/queries/0_stateless/00979_live_view_watch_live_with_subquery.reference
-%%DATADIR%%-test/queries/0_stateless/00979_quantileExcatExclusive_and_Inclusive.reference
-%%DATADIR%%-test/queries/0_stateless/00979_quantileExcatExclusive_and_Inclusive.sql
-%%DATADIR%%-test/queries/0_stateless/00979_set_index_not.reference
-%%DATADIR%%-test/queries/0_stateless/00979_set_index_not.sql
-%%DATADIR%%-test/queries/0_stateless/00979_toFloat_monotonicity.reference
-%%DATADIR%%-test/queries/0_stateless/00979_toFloat_monotonicity.sql
-%%DATADIR%%-test/queries/0_stateless/00979_yandex_consistent_hash_fpe.reference
-%%DATADIR%%-test/queries/0_stateless/00979_yandex_consistent_hash_fpe.sql
-%%DATADIR%%-test/queries/0_stateless/00980_alter_settings_race.reference
-%%DATADIR%%-test/queries/0_stateless/00980_alter_settings_race.sh
-%%DATADIR%%-test/queries/0_stateless/00980_crash_nullable_decimal.reference
-%%DATADIR%%-test/queries/0_stateless/00980_crash_nullable_decimal.sql
-%%DATADIR%%-test/queries/0_stateless/00980_create_temporary_live_view.reference
-%%DATADIR%%-test/queries/0_stateless/00980_create_temporary_live_view.sql
-%%DATADIR%%-test/queries/0_stateless/00980_full_join_crash_fancyqlx.reference
-%%DATADIR%%-test/queries/0_stateless/00980_full_join_crash_fancyqlx.sql
-%%DATADIR%%-test/queries/0_stateless/00980_merge_alter_settings.reference
-%%DATADIR%%-test/queries/0_stateless/00980_merge_alter_settings.sql
-%%DATADIR%%-test/queries/0_stateless/00980_shard_aggregation_state_deserialization.reference
-%%DATADIR%%-test/queries/0_stateless/00980_shard_aggregation_state_deserialization.sql
-%%DATADIR%%-test/queries/0_stateless/00980_skip_unused_shards_without_sharding_key.reference
-%%DATADIR%%-test/queries/0_stateless/00980_skip_unused_shards_without_sharding_key.sql
-%%DATADIR%%-test/queries/0_stateless/00980_zookeeper_merge_tree_alter_settings.reference
-%%DATADIR%%-test/queries/0_stateless/00980_zookeeper_merge_tree_alter_settings.sql
+%%DATADIR%%-test/queries/0_stateless/00728_json_each_row_parsing.sh
+%%DATADIR%%-test/queries/0_stateless/01677_array_enumerate_bug.sql
+%%DATADIR%%-test/queries/0_stateless/00592_union_all_different_aliases.sql
+%%DATADIR%%-test/queries/0_stateless/01552_dict_fixedstring.sql
+%%DATADIR%%-test/queries/0_stateless/00172_constexprs_in_set.reference
+%%DATADIR%%-test/queries/0_stateless/01514_input_format_json_enum_as_number.reference
+%%DATADIR%%-test/queries/0_stateless/00952_insert_into_distributed_with_materialized_column.sql
+%%DATADIR%%-test/queries/0_stateless/01882_scalar_subquery_exception.sql
+%%DATADIR%%-test/queries/0_stateless/00825_protobuf_format_skipped_column_in_nested.sh
+%%DATADIR%%-test/queries/0_stateless/01324_settings_documentation.reference
+%%DATADIR%%-test/queries/0_stateless/01412_optimize_deduplicate_bug.reference
+%%DATADIR%%-test/queries/0_stateless/00825_protobuf_format_array_3dim.sh
+%%DATADIR%%-test/queries/0_stateless/00725_quantiles_shard.sql
+%%DATADIR%%-test/queries/0_stateless/01259_combinator_distinct.reference
+%%DATADIR%%-test/queries/0_stateless/01114_materialize_clear_index_compact_parts.sql
+%%DATADIR%%-test/queries/0_stateless/01105_string_like.reference
+%%DATADIR%%-test/queries/0_stateless/01099_parallel_distributed_insert_select.sql
+%%DATADIR%%-test/queries/0_stateless/01916_lowcard_dict_type.reference
+%%DATADIR%%-test/queries/0_stateless/00927_asof_join_long.reference
+%%DATADIR%%-test/queries/0_stateless/01347_partition_date_vs_datetime.reference
+%%DATADIR%%-test/queries/0_stateless/00968_file_engine_in_subquery.sql
 %%DATADIR%%-test/queries/0_stateless/00981_in_subquery_with_tuple.reference
-%%DATADIR%%-test/queries/0_stateless/00981_in_subquery_with_tuple.sh
-%%DATADIR%%-test/queries/0_stateless/00981_no_virtual_columns.reference
-%%DATADIR%%-test/queries/0_stateless/00981_no_virtual_columns.sql
-%%DATADIR%%-test/queries/0_stateless/00981_topK_topKWeighted_long.reference
-%%DATADIR%%-test/queries/0_stateless/00981_topK_topKWeighted_long.sql
-%%DATADIR%%-test/queries/0_stateless/00982_array_enumerate_uniq_ranked.reference
-%%DATADIR%%-test/queries/0_stateless/00982_array_enumerate_uniq_ranked.sql
-%%DATADIR%%-test/queries/0_stateless/00982_low_cardinality_setting_in_mv.reference
-%%DATADIR%%-test/queries/0_stateless/00982_low_cardinality_setting_in_mv.sql
-%%DATADIR%%-test/queries/0_stateless/00983_summing_merge_tree_not_an_identifier.reference
-%%DATADIR%%-test/queries/0_stateless/00983_summing_merge_tree_not_an_identifier.sql
-%%DATADIR%%-test/queries/0_stateless/00984_materialized_view_to_columns.reference
-%%DATADIR%%-test/queries/0_stateless/00984_materialized_view_to_columns.sql
-%%DATADIR%%-test/queries/0_stateless/00984_parser_stack_overflow.reference
-%%DATADIR%%-test/queries/0_stateless/00984_parser_stack_overflow.sh
-%%DATADIR%%-test/queries/0_stateless/00985_merge_stack_overflow.reference
-%%DATADIR%%-test/queries/0_stateless/00985_merge_stack_overflow.sql
-%%DATADIR%%-test/queries/0_stateless/00986_materialized_view_stack_overflow.reference
-%%DATADIR%%-test/queries/0_stateless/00986_materialized_view_stack_overflow.sql
-%%DATADIR%%-test/queries/0_stateless/00987_distributed_stack_overflow.reference
-%%DATADIR%%-test/queries/0_stateless/00987_distributed_stack_overflow.sql
-%%DATADIR%%-test/queries/0_stateless/00988_constraints_replication_zookeeper.reference
-%%DATADIR%%-test/queries/0_stateless/00988_constraints_replication_zookeeper.sql
-%%DATADIR%%-test/queries/0_stateless/00988_expansion_aliases_limit.reference
-%%DATADIR%%-test/queries/0_stateless/00988_expansion_aliases_limit.sql
-%%DATADIR%%-test/queries/0_stateless/00988_parallel_parts_removal.reference
-%%DATADIR%%-test/queries/0_stateless/00988_parallel_parts_removal.sql
-%%DATADIR%%-test/queries/0_stateless/00989_parallel_parts_loading.reference
-%%DATADIR%%-test/queries/0_stateless/00989_parallel_parts_loading.sql
-%%DATADIR%%-test/queries/0_stateless/00990_function_current_user.reference
-%%DATADIR%%-test/queries/0_stateless/00990_function_current_user.sql
-%%DATADIR%%-test/queries/0_stateless/00990_hasToken.python
-%%DATADIR%%-test/queries/0_stateless/00990_hasToken.reference
-%%DATADIR%%-test/queries/0_stateless/00990_hasToken.sh
-%%DATADIR%%-test/queries/0_stateless/00990_hasToken_and_tokenbf.reference
-%%DATADIR%%-test/queries/0_stateless/00990_hasToken_and_tokenbf.sql
-%%DATADIR%%-test/queries/0_stateless/00990_metric_log_table_not_empty.reference
-%%DATADIR%%-test/queries/0_stateless/00990_metric_log_table_not_empty.sql
-%%DATADIR%%-test/queries/0_stateless/00990_request_splitting.reference
-%%DATADIR%%-test/queries/0_stateless/00990_request_splitting.sql
-%%DATADIR%%-test/queries/0_stateless/00991_live_view_watch_event_live.python
-%%DATADIR%%-test/queries/0_stateless/00991_live_view_watch_event_live.reference
-%%DATADIR%%-test/queries/0_stateless/00991_live_view_watch_event_live.sh.disabled
-%%DATADIR%%-test/queries/0_stateless/00991_live_view_watch_http.python
-%%DATADIR%%-test/queries/0_stateless/00991_live_view_watch_http.reference
-%%DATADIR%%-test/queries/0_stateless/00991_live_view_watch_http.sh.disabled
-%%DATADIR%%-test/queries/0_stateless/00991_system_parts_race_condition_long.reference
-%%DATADIR%%-test/queries/0_stateless/00991_system_parts_race_condition_long.sh
-%%DATADIR%%-test/queries/0_stateless/00991_temporary_live_view_watch_events_heartbeat.python
-%%DATADIR%%-test/queries/0_stateless/00991_temporary_live_view_watch_events_heartbeat.reference
-%%DATADIR%%-test/queries/0_stateless/00991_temporary_live_view_watch_events_heartbeat.sh.disabled
-%%DATADIR%%-test/queries/0_stateless/00991_temporary_live_view_watch_live.python
-%%DATADIR%%-test/queries/0_stateless/00991_temporary_live_view_watch_live.reference
-%%DATADIR%%-test/queries/0_stateless/00991_temporary_live_view_watch_live.sh.disabled
-%%DATADIR%%-test/queries/0_stateless/00992_system_parts_race_condition_zookeeper_long.reference
-%%DATADIR%%-test/queries/0_stateless/00992_system_parts_race_condition_zookeeper_long.sh
-%%DATADIR%%-test/queries/0_stateless/00993_system_parts_race_condition_drop_zookeeper.reference
-%%DATADIR%%-test/queries/0_stateless/00993_system_parts_race_condition_drop_zookeeper.sh
-%%DATADIR%%-test/queries/0_stateless/00994_table_function_numbers_mt.reference
-%%DATADIR%%-test/queries/0_stateless/00994_table_function_numbers_mt.sql
-%%DATADIR%%-test/queries/0_stateless/00995_exception_while_insert.reference
-%%DATADIR%%-test/queries/0_stateless/00995_exception_while_insert.sh
-%%DATADIR%%-test/queries/0_stateless/00995_optimize_read_in_order_with_aggregation.reference
-%%DATADIR%%-test/queries/0_stateless/00995_optimize_read_in_order_with_aggregation.sql
-%%DATADIR%%-test/queries/0_stateless/00995_order_by_with_fill.reference
-%%DATADIR%%-test/queries/0_stateless/00995_order_by_with_fill.sql
-%%DATADIR%%-test/queries/0_stateless/00996_limit_with_ties.reference
-%%DATADIR%%-test/queries/0_stateless/00996_limit_with_ties.sql
-%%DATADIR%%-test/queries/0_stateless/00996_neighbor.reference
-%%DATADIR%%-test/queries/0_stateless/00996_neighbor.sql
-%%DATADIR%%-test/queries/0_stateless/00997_extract_all_crash_6627.reference
-%%DATADIR%%-test/queries/0_stateless/00997_extract_all_crash_6627.sql
-%%DATADIR%%-test/queries/0_stateless/00997_set_index_array.reference
-%%DATADIR%%-test/queries/0_stateless/00997_set_index_array.sql
-%%DATADIR%%-test/queries/0_stateless/00997_trim.reference
-%%DATADIR%%-test/queries/0_stateless/00997_trim.sql
-%%DATADIR%%-test/queries/0_stateless/00998_constraints_all_tables.reference
-%%DATADIR%%-test/queries/0_stateless/00998_constraints_all_tables.sql
-%%DATADIR%%-test/queries/0_stateless/00999_full_join_dup_keys_crash.reference
-%%DATADIR%%-test/queries/0_stateless/00999_full_join_dup_keys_crash.sql
-%%DATADIR%%-test/queries/0_stateless/00999_join_not_nullable_types.reference
-%%DATADIR%%-test/queries/0_stateless/00999_join_not_nullable_types.sql
-%%DATADIR%%-test/queries/0_stateless/00999_join_on_expression.reference
-%%DATADIR%%-test/queries/0_stateless/00999_join_on_expression.sql
-%%DATADIR%%-test/queries/0_stateless/00999_nullable_nested_types_4877.reference
-%%DATADIR%%-test/queries/0_stateless/00999_nullable_nested_types_4877.sql
-%%DATADIR%%-test/queries/0_stateless/00999_settings_no_extra_quotes.reference
-%%DATADIR%%-test/queries/0_stateless/00999_settings_no_extra_quotes.sql
-%%DATADIR%%-test/queries/0_stateless/00999_test_skip_indices_with_alter_and_merge.reference
-%%DATADIR%%-test/queries/0_stateless/00999_test_skip_indices_with_alter_and_merge.sql
-%%DATADIR%%-test/queries/0_stateless/01000_bad_size_of_marks_skip_idx.reference
-%%DATADIR%%-test/queries/0_stateless/01000_bad_size_of_marks_skip_idx.sql
-%%DATADIR%%-test/queries/0_stateless/01000_subquery_requires_alias.reference
-%%DATADIR%%-test/queries/0_stateless/01000_subquery_requires_alias.sql
-%%DATADIR%%-test/queries/0_stateless/01000_unneeded_substitutions_client.reference
+%%DATADIR%%-test/queries/0_stateless/01527_bad_aggregation_in_lambda.reference
+%%DATADIR%%-test/queries/0_stateless/01165_lost_part_empty_partition.reference
+%%DATADIR%%-test/queries/0_stateless/01030_concatenate_equal_fixed_strings.reference
+%%DATADIR%%-test/queries/0_stateless/01852_map_combinator.sql
+%%DATADIR%%-test/queries/0_stateless/00717_low_cardinaliry_distributed_group_by.reference
+%%DATADIR%%-test/queries/0_stateless/00973_live_view_with_subquery_select_nested_with_aggregation_table_alias.sql
+%%DATADIR%%-test/queries/0_stateless/01854_HTTP_dict_decompression.sh
+%%DATADIR%%-test/queries/0_stateless/00298_enum_width_and_cast.sql
+%%DATADIR%%-test/queries/0_stateless/01293_client_interactive_vertical_singleline.expect
+%%DATADIR%%-test/queries/0_stateless/01254_dict_load_after_detach_attach.sql
+%%DATADIR%%-test/queries/0_stateless/01415_overlimiting_threads_for_repica_bug.reference
 %%DATADIR%%-test/queries/0_stateless/01000_unneeded_substitutions_client.sh
-%%DATADIR%%-test/queries/0_stateless/01001_enums_in_in_section.reference
-%%DATADIR%%-test/queries/0_stateless/01001_enums_in_in_section.sql
-%%DATADIR%%-test/queries/0_stateless/01001_rename_merge_race_condition.reference
-%%DATADIR%%-test/queries/0_stateless/01001_rename_merge_race_condition.sh
-%%DATADIR%%-test/queries/0_stateless/01002_alter_nullable_adaptive_granularity_long.reference
-%%DATADIR%%-test/queries/0_stateless/01002_alter_nullable_adaptive_granularity_long.sh
-%%DATADIR%%-test/queries/0_stateless/01003_kill_query_race_condition.reference
-%%DATADIR%%-test/queries/0_stateless/01003_kill_query_race_condition.sh
-%%DATADIR%%-test/queries/0_stateless/01004_rename_deadlock.reference
-%%DATADIR%%-test/queries/0_stateless/01004_rename_deadlock.sh
-%%DATADIR%%-test/queries/0_stateless/01005_rwr_shard_deadlock.reference
-%%DATADIR%%-test/queries/0_stateless/01005_rwr_shard_deadlock.sh
-%%DATADIR%%-test/queries/0_stateless/01006_simpod_empty_part_single_column_write.reference
-%%DATADIR%%-test/queries/0_stateless/01006_simpod_empty_part_single_column_write.sh
-%%DATADIR%%-test/queries/0_stateless/01006_ttl_with_default_2.reference
-%%DATADIR%%-test/queries/0_stateless/01006_ttl_with_default_2.sql
-%%DATADIR%%-test/queries/0_stateless/01007_r1r2_w_r2r1_deadlock.reference
-%%DATADIR%%-test/queries/0_stateless/01007_r1r2_w_r2r1_deadlock.sh
-%%DATADIR%%-test/queries/0_stateless/01008_materialized_view_henyihanwobushi.reference
-%%DATADIR%%-test/queries/0_stateless/01008_materialized_view_henyihanwobushi.sql
-%%DATADIR%%-test/queries/0_stateless/01009_global_array_join_names.reference
-%%DATADIR%%-test/queries/0_stateless/01009_global_array_join_names.sql
-%%DATADIR%%-test/queries/0_stateless/01009_insert_select_data_loss.reference
-%%DATADIR%%-test/queries/0_stateless/01009_insert_select_data_loss.sql
-%%DATADIR%%-test/queries/0_stateless/01009_insert_select_nicelulu.reference
-%%DATADIR%%-test/queries/0_stateless/01009_insert_select_nicelulu.sql
-%%DATADIR%%-test/queries/0_stateless/01010_low_cardinality_and_native_http.reference
-%%DATADIR%%-test/queries/0_stateless/01010_low_cardinality_and_native_http.sh
-%%DATADIR%%-test/queries/0_stateless/01010_partial_merge_join.reference
-%%DATADIR%%-test/queries/0_stateless/01010_partial_merge_join.sql
-%%DATADIR%%-test/queries/0_stateless/01010_partial_merge_join_const_and_lc.reference
-%%DATADIR%%-test/queries/0_stateless/01010_partial_merge_join_const_and_lc.sql
-%%DATADIR%%-test/queries/0_stateless/01010_partial_merge_join_negative.reference
-%%DATADIR%%-test/queries/0_stateless/01010_partial_merge_join_negative.sql
-%%DATADIR%%-test/queries/0_stateless/01010_pm_join_all_join_bug.reference
-%%DATADIR%%-test/queries/0_stateless/01010_pm_join_all_join_bug.sql
-%%DATADIR%%-test/queries/0_stateless/01010_pmj_on_disk.reference
+%%DATADIR%%-test/queries/0_stateless/01406_carriage_return_in_tsv_csv.sh
+%%DATADIR%%-test/queries/0_stateless/00108_shard_totals_after_having.sql
+%%DATADIR%%-test/queries/0_stateless/00229_prewhere_column_missing.sql
+%%DATADIR%%-test/queries/0_stateless/00702_join_with_using_dups.reference
+%%DATADIR%%-test/queries/0_stateless/01232_json_as_string_format.sh
+%%DATADIR%%-test/queries/0_stateless/00955_test_final_mark.reference
+%%DATADIR%%-test/queries/0_stateless/01772_intdiv_minus_one_ubsan.sql
+%%DATADIR%%-test/queries/0_stateless/00738_nested_merge_multidimensional_array.reference
+%%DATADIR%%-test/queries/0_stateless/00370_duplicate_columns_in_subqueries.sql
+%%DATADIR%%-test/queries/0_stateless/01249_flush_interactive.sh
+%%DATADIR%%-test/queries/0_stateless/01074_h3_range_check.sql
+%%DATADIR%%-test/queries/0_stateless/00009_array_join_subquery.reference
+%%DATADIR%%-test/queries/0_stateless/01083_log_family_disk_memory.sql
+%%DATADIR%%-test/queries/0_stateless/01822_union_and_constans_error.sql
+%%DATADIR%%-test/queries/0_stateless/01475_fix_bigint_shift.sql
+%%DATADIR%%-test/queries/0_stateless/00800_low_cardinality_empty_array.reference
+%%DATADIR%%-test/queries/0_stateless/01280_unicode_whitespaces_lexer.sql
+%%DATADIR%%-test/queries/0_stateless/01669_join_or_duplicates.sql
+%%DATADIR%%-test/queries/0_stateless/00688_low_cardinality_syntax.reference
+%%DATADIR%%-test/queries/0_stateless/01125_generate_random_qoega.sql
+%%DATADIR%%-test/queries/0_stateless/01459_manual_write_to_replicas.sh
 %%DATADIR%%-test/queries/0_stateless/01010_pmj_on_disk.sql
-%%DATADIR%%-test/queries/0_stateless/01010_pmj_one_row_blocks.reference
-%%DATADIR%%-test/queries/0_stateless/01010_pmj_one_row_blocks.sql
+%%DATADIR%%-test/queries/0_stateless/00630_arbitrary_csv_delimiter.reference
+%%DATADIR%%-test/queries/0_stateless/00168_buffer_defaults.sql
+%%DATADIR%%-test/queries/0_stateless/00943_materialize_index.sh
+%%DATADIR%%-test/queries/0_stateless/00640_endsWith.sql
+%%DATADIR%%-test/queries/0_stateless/01040_dictionary_invalidate_query_switchover_long.sh
+%%DATADIR%%-test/queries/0_stateless/01457_int256_hashing.reference
+%%DATADIR%%-test/queries/0_stateless/data_avro/nested_complex.avsc
+%%DATADIR%%-test/queries/0_stateless/data_avro/logical_types.avro
+%%DATADIR%%-test/queries/0_stateless/data_avro/simple.null.avro
+%%DATADIR%%-test/queries/0_stateless/data_avro/simple.avsc
+%%DATADIR%%-test/queries/0_stateless/data_avro/logical_types.json
+%%DATADIR%%-test/queries/0_stateless/data_avro/nested_complex_incorrect_data.avro
+%%DATADIR%%-test/queries/0_stateless/data_avro/simple.deflate.avro
+%%DATADIR%%-test/queries/0_stateless/data_avro/complex.json
+%%DATADIR%%-test/queries/0_stateless/data_avro/references.avro
+%%DATADIR%%-test/queries/0_stateless/data_avro/simple.snappy.avro
+%%DATADIR%%-test/queries/0_stateless/data_avro/nested.avsc
+%%DATADIR%%-test/queries/0_stateless/data_avro/complex.avro
+%%DATADIR%%-test/queries/0_stateless/data_avro/references.json
+%%DATADIR%%-test/queries/0_stateless/data_avro/empty.avsc
+%%DATADIR%%-test/queries/0_stateless/data_avro/primitive.avsc
+%%DATADIR%%-test/queries/0_stateless/data_avro/generate_avro.sh
+%%DATADIR%%-test/queries/0_stateless/data_avro/nested.avro
+%%DATADIR%%-test/queries/0_stateless/data_avro/complex.avsc
+%%DATADIR%%-test/queries/0_stateless/data_avro/empty.avro
+%%DATADIR%%-test/queries/0_stateless/data_avro/empty.json
+%%DATADIR%%-test/queries/0_stateless/data_avro/nested.json
+%%DATADIR%%-test/queries/0_stateless/data_avro/references.avsc
+%%DATADIR%%-test/queries/0_stateless/data_avro/primitive.avro
+%%DATADIR%%-test/queries/0_stateless/data_avro/primitive.json
+%%DATADIR%%-test/queries/0_stateless/data_avro/nested_complex.json
+%%DATADIR%%-test/queries/0_stateless/data_avro/simple.json
+%%DATADIR%%-test/queries/0_stateless/data_avro/nested_complex.avro
+%%DATADIR%%-test/queries/0_stateless/data_avro/logical_types.avsc
+%%DATADIR%%-test/queries/0_stateless/02099_hashed_array_dictionary_complex_key.sql
+%%DATADIR%%-test/queries/0_stateless/00161_rounding_functions.reference
+%%DATADIR%%-test/queries/0_stateless/01600_parts_states_metrics_long.reference
+%%DATADIR%%-test/queries/0_stateless/01311_comparison_with_constant_string.sql
+%%DATADIR%%-test/queries/0_stateless/01730_distributed_group_by_no_merge_order_by_long.reference
+%%DATADIR%%-test/queries/0_stateless/01035_prewhere_with_alias.reference
+%%DATADIR%%-test/queries/0_stateless/01710_projection_with_joins.sql
+%%DATADIR%%-test/queries/0_stateless/01062_pm_multiple_all_join_same_value.sql
+%%DATADIR%%-test/queries/0_stateless/02021_exponential_sum_shard.reference
+%%DATADIR%%-test/queries/0_stateless/00593_union_all_assert_columns_removed.reference
+%%DATADIR%%-test/queries/0_stateless/00552_logical_functions_simple.sql
+%%DATADIR%%-test/queries/0_stateless/00425_count_nullable.reference
+%%DATADIR%%-test/queries/0_stateless/00186_very_long_arrays.reference
+%%DATADIR%%-test/queries/0_stateless/00152_totals_in_subquery.reference
+%%DATADIR%%-test/queries/0_stateless/01018_ddl_dictionaries_select.reference
+%%DATADIR%%-test/queries/0_stateless/01668_test_toMonth_mysql_dialect.reference
+%%DATADIR%%-test/queries/0_stateless/00960_eval_ml_method_const.sql
+%%DATADIR%%-test/queries/0_stateless/00258_materializing_tuples.sql
+%%DATADIR%%-test/queries/0_stateless/01562_optimize_monotonous_functions_in_order_by.sql
+%%DATADIR%%-test/queries/0_stateless/00146_summing_merge_tree_nested_map.reference
+%%DATADIR%%-test/queries/0_stateless/01049_window_view_window_functions.sql
+%%DATADIR%%-test/queries/0_stateless/00279_quantiles_permuted_args.sql
+%%DATADIR%%-test/queries/0_stateless/01471_with_format.sql
+%%DATADIR%%-test/queries/0_stateless/01665_merge_tree_min_for_concurrent_read.sql
+%%DATADIR%%-test/queries/0_stateless/01882_total_rows_approx.reference
+%%DATADIR%%-test/queries/0_stateless/01051_new_any_join_engine.reference
+%%DATADIR%%-test/queries/0_stateless/01780_column_sparse_pk.sql
+%%DATADIR%%-test/queries/0_stateless/00285_not_all_data_in_totals.sql
+%%DATADIR%%-test/queries/0_stateless/00100_subquery_table_identifier.reference
+%%DATADIR%%-test/queries/0_stateless/01054_cache_dictionary_bunch_update.reference
+%%DATADIR%%-test/queries/0_stateless/01580_column_const_comparision.reference
+%%DATADIR%%-test/queries/0_stateless/01087_index_set_ubsan.reference
+%%DATADIR%%-test/queries/0_stateless/00156_array_map_to_constant.sql
+%%DATADIR%%-test/queries/0_stateless/00853_join_with_nulls_crash.sql
+%%DATADIR%%-test/queries/0_stateless/02001_hostname_test.sql
+%%DATADIR%%-test/queries/0_stateless/02148_issue_32737.sql
+%%DATADIR%%-test/queries/0_stateless/02021_map_bloom_filter_index.reference
+%%DATADIR%%-test/queries/0_stateless/01596_null_as_default_nullable.reference
+%%DATADIR%%-test/queries/0_stateless/00688_low_cardinality_dictionary_deserialization.sql
+%%DATADIR%%-test/queries/0_stateless/01054_random_printable_ascii_ubsan.reference
+%%DATADIR%%-test/queries/0_stateless/01670_log_comment.reference
+%%DATADIR%%-test/queries/0_stateless/01601_accurate_cast.reference
+%%DATADIR%%-test/queries/0_stateless/02011_normalize_utf8.reference
+%%DATADIR%%-test/queries/0_stateless/01272_suspicious_codecs.sql
+%%DATADIR%%-test/queries/0_stateless/01940_pad_string.sql
+%%DATADIR%%-test/queries/0_stateless/01073_crlf_end_of_line.reference
+%%DATADIR%%-test/queries/0_stateless/01926_date_date_time_supertype.sql
+%%DATADIR%%-test/queries/0_stateless/02151_http_s_structure_set_eof.reference
+%%DATADIR%%-test/queries/0_stateless/01856_create_function.sql
+%%DATADIR%%-test/queries/0_stateless/02096_totals_global_in_bug.reference
+%%DATADIR%%-test/queries/0_stateless/02160_untuple_exponential_growth.sh
+%%DATADIR%%-test/queries/0_stateless/01560_mann_whitney.sql
+%%DATADIR%%-test/queries/0_stateless/00732_quorum_insert_have_data_before_quorum_zookeeper_long.reference
+%%DATADIR%%-test/queries/0_stateless/02162_array_first_last_index.sql
+%%DATADIR%%-test/queries/0_stateless/01314_position_in_system_columns.sql
+%%DATADIR%%-test/queries/0_stateless/00489_pk_subexpression.reference
+%%DATADIR%%-test/queries/0_stateless/00834_date_datetime_cmp.sql
+%%DATADIR%%-test/queries/0_stateless/01098_msgpack_format.sh
+%%DATADIR%%-test/queries/0_stateless/01299_alter_merge_tree.reference
+%%DATADIR%%-test/queries/0_stateless/01034_order_by_pk_prefix.sql
+%%DATADIR%%-test/queries/0_stateless/02104_clickhouse_local_columns_description.reference
+%%DATADIR%%-test/queries/0_stateless/01674_htm_xml_coarse_parse.reference
+%%DATADIR%%-test/queries/0_stateless/01092_base64.reference
+%%DATADIR%%-test/queries/0_stateless/02019_multiple_weird_with_fill.sql
+%%DATADIR%%-test/queries/0_stateless/01337_mysql_global_variables.reference
+%%DATADIR%%-test/queries/0_stateless/00947_ml_test.sql
+%%DATADIR%%-test/queries/0_stateless/01710_projection_optimize_materialize.sql
+%%DATADIR%%-test/queries/0_stateless/01642_if_nullable_regression.reference
+%%DATADIR%%-test/queries/0_stateless/00417_kill_query.sh
+%%DATADIR%%-test/queries/0_stateless/00045_sorting_by_fixed_string_descending.reference
+%%DATADIR%%-test/queries/0_stateless/02023_nullable_int_uint_where.sql
+%%DATADIR%%-test/queries/0_stateless/02152_http_external_tables_memory_tracking.sh
+%%DATADIR%%-test/queries/0_stateless/02024_join_on_or_long.sql.j2
+%%DATADIR%%-test/queries/0_stateless/00392_enum_nested_alter.reference
+%%DATADIR%%-test/queries/0_stateless/01376_array_fill_empty.reference
+%%DATADIR%%-test/queries/0_stateless/00902_entropy.sql
+%%DATADIR%%-test/queries/0_stateless/02051_symlinks_to_user_files.reference
+%%DATADIR%%-test/queries/0_stateless/01018_ddl_dictionaries_special.reference
+%%DATADIR%%-test/queries/0_stateless/00758_array_reverse.reference
+%%DATADIR%%-test/queries/0_stateless/00295_global_in_one_shard_rows_before_limit.sql
+%%DATADIR%%-test/queries/0_stateless/02030_tuple_filter.sql
+%%DATADIR%%-test/queries/0_stateless/00345_index_accurate_comparison.reference
+%%DATADIR%%-test/queries/0_stateless/01555_or_fill.reference
+%%DATADIR%%-test/queries/0_stateless/01325_freeze_mutation_stuck.reference
+%%DATADIR%%-test/queries/0_stateless/01822_union_and_constans_error.reference
+%%DATADIR%%-test/queries/0_stateless/02136_scalar_progress.reference
+%%DATADIR%%-test/queries/0_stateless/01515_logtrace_function.reference
+%%DATADIR%%-test/queries/0_stateless/01651_map_functions.sql
+%%DATADIR%%-test/queries/0_stateless/01435_lcm_overflow.reference
+%%DATADIR%%-test/queries/0_stateless/01702_rewrite_avg_for_algebraic_optimization.reference
+%%DATADIR%%-test/queries/0_stateless/00300_csv.sql
+%%DATADIR%%-test/queries/0_stateless/01097_cyclic_defaults.reference
+%%DATADIR%%-test/queries/0_stateless/01052_array_reduce_exception.reference
+%%DATADIR%%-test/queries/0_stateless/01752_distributed_query_sigsegv.sql
+%%DATADIR%%-test/queries/0_stateless/00049_any_left_join.sql
+%%DATADIR%%-test/queries/0_stateless/01852_cast_operator_3.sql
+%%DATADIR%%-test/queries/0_stateless/01079_parallel_alter_detach_table_zookeeper.sh
+%%DATADIR%%-test/queries/0_stateless/01142_with_ties_and_aliases.reference
+%%DATADIR%%-test/queries/0_stateless/01065_if_not_finite.reference
+%%DATADIR%%-test/queries/0_stateless/01460_mark_inclusion_search_crash.reference
+%%DATADIR%%-test/queries/0_stateless/02009_mysql_client_empty_result.sh
+%%DATADIR%%-test/queries/0_stateless/01280_ttl_where_group_by_negative.reference
+%%DATADIR%%-test/queries/0_stateless/01070_modify_ttl_recalc_only.reference
+%%DATADIR%%-test/queries/0_stateless/00825_protobuf_format_map.reference
+%%DATADIR%%-test/queries/0_stateless/00607_index_in_in.sql
+%%DATADIR%%-test/queries/0_stateless/00587_union_all_type_conversions.reference
+%%DATADIR%%-test/queries/0_stateless/00490_special_line_separators_and_characters_outside_of_bmp.sql
+%%DATADIR%%-test/queries/0_stateless/00990_hasToken.reference
+%%DATADIR%%-test/queries/0_stateless/02133_issue_32458.sql
+%%DATADIR%%-test/queries/0_stateless/01074_partial_revokes.reference
+%%DATADIR%%-test/queries/0_stateless/01443_merge_truncate_long.reference
+%%DATADIR%%-test/queries/0_stateless/01640_marks_corruption_regression.sql
+%%DATADIR%%-test/queries/0_stateless/02026_arrayDifference_const.reference
+%%DATADIR%%-test/queries/0_stateless/00836_indices_alter_replicated_zookeeper_long.reference
+%%DATADIR%%-test/queries/0_stateless/01281_parseDateTime64BestEffort.reference
+%%DATADIR%%-test/queries/0_stateless/01054_cache_dictionary_bunch_update.sh
+%%DATADIR%%-test/queries/0_stateless/00670_truncate_temporary_table.sql
+%%DATADIR%%-test/queries/0_stateless/00825_protobuf_format_enum_mapping.reference
+%%DATADIR%%-test/queries/0_stateless/00229_prewhere_column_missing.reference
+%%DATADIR%%-test/queries/0_stateless/01656_test_hex_mysql_dialect.sql
 %%DATADIR%%-test/queries/0_stateless/01010_pmj_right_table_memory_limits.reference
-%%DATADIR%%-test/queries/0_stateless/01010_pmj_right_table_memory_limits.sql
-%%DATADIR%%-test/queries/0_stateless/01010_pmj_skip_blocks.reference
-%%DATADIR%%-test/queries/0_stateless/01010_pmj_skip_blocks.sql
-%%DATADIR%%-test/queries/0_stateless/01011_group_uniq_array_memsan.reference
-%%DATADIR%%-test/queries/0_stateless/01011_group_uniq_array_memsan.sql
-%%DATADIR%%-test/queries/0_stateless/01011_test_create_as_skip_indices.reference
-%%DATADIR%%-test/queries/0_stateless/01011_test_create_as_skip_indices.sql
-%%DATADIR%%-test/queries/0_stateless/01012_reset_running_accumulate.reference
-%%DATADIR%%-test/queries/0_stateless/01012_reset_running_accumulate.sql
-%%DATADIR%%-test/queries/0_stateless/01012_select_limit_x_0.reference
-%%DATADIR%%-test/queries/0_stateless/01012_select_limit_x_0.sql
-%%DATADIR%%-test/queries/0_stateless/01012_serialize_array_memory_usage.reference
-%%DATADIR%%-test/queries/0_stateless/01012_serialize_array_memory_usage.sql
-%%DATADIR%%-test/queries/0_stateless/01012_show_tables_limit.reference
-%%DATADIR%%-test/queries/0_stateless/01012_show_tables_limit.sql
-%%DATADIR%%-test/queries/0_stateless/01013_hex_decimal.reference
-%%DATADIR%%-test/queries/0_stateless/01013_hex_decimal.sql
-%%DATADIR%%-test/queries/0_stateless/01013_hex_float.reference
-%%DATADIR%%-test/queries/0_stateless/01013_hex_float.sql
-%%DATADIR%%-test/queries/0_stateless/01013_repeat_function.reference
-%%DATADIR%%-test/queries/0_stateless/01013_repeat_function.sql
-%%DATADIR%%-test/queries/0_stateless/01013_sync_replica_timeout_zookeeper.reference
-%%DATADIR%%-test/queries/0_stateless/01013_sync_replica_timeout_zookeeper.sh
-%%DATADIR%%-test/queries/0_stateless/01013_totals_without_aggregation.reference
-%%DATADIR%%-test/queries/0_stateless/01013_totals_without_aggregation.sql
-%%DATADIR%%-test/queries/0_stateless/01014_count_of_merges_metrics.reference
-%%DATADIR%%-test/queries/0_stateless/01014_count_of_merges_metrics.sql
-%%DATADIR%%-test/queries/0_stateless/01014_format_custom_separated.reference
+%%DATADIR%%-test/queries/0_stateless/01456_low_cardinality_sorting_bugfix.sql
+%%DATADIR%%-test/queries/0_stateless/02096_rename_atomic_hang.sql
+%%DATADIR%%-test/queries/0_stateless/00411_merge_tree_where_const_in_set.sql
+%%DATADIR%%-test/queries/0_stateless/00474_readonly_settings.reference
+%%DATADIR%%-test/queries/0_stateless/00680_duplicate_columns_inside_union_all.sql
+%%DATADIR%%-test/queries/0_stateless/01131_max_rows_to_sort.reference
+%%DATADIR%%-test/queries/0_stateless/01062_max_parser_depth.reference
+%%DATADIR%%-test/queries/0_stateless/00483_reading_from_array_structure.sql
+%%DATADIR%%-test/queries/0_stateless/01273_arrow_stream.sh
+%%DATADIR%%-test/queries/0_stateless/02049_clickhouse_local_merge_tree.reference
+%%DATADIR%%-test/queries/0_stateless/00880_decimal_in_key.sql
+%%DATADIR%%-test/queries/0_stateless/01310_enum_comparison.sql
+%%DATADIR%%-test/queries/0_stateless/01701_if_tuple_segfault.sql
+%%DATADIR%%-test/queries/0_stateless/01902_table_function_merge_db_repr.reference
+%%DATADIR%%-test/queries/0_stateless/01300_client_save_history_when_terminated_long.reference
+%%DATADIR%%-test/queries/0_stateless/02158_interval_length_sum.sql
+%%DATADIR%%-test/queries/0_stateless/02155_dictionary_comment.reference
+%%DATADIR%%-test/queries/0_stateless/00836_indices_alter.reference
+%%DATADIR%%-test/queries/0_stateless/01374_if_nullable_filimonov.reference
+%%DATADIR%%-test/queries/0_stateless/00900_long_parquet_decimal.reference
+%%DATADIR%%-test/queries/0_stateless/01851_s2_to_geo.reference
+%%DATADIR%%-test/queries/0_stateless/01833_test_collation_alvarotuso.sql
+%%DATADIR%%-test/queries/0_stateless/01224_no_superfluous_dict_reload.reference
+%%DATADIR%%-test/queries/0_stateless/02002_parse_map_int_key.sql
+%%DATADIR%%-test/queries/0_stateless/00552_or_nullable.reference
+%%DATADIR%%-test/queries/0_stateless/01532_collate_in_low_cardinality.reference
+%%DATADIR%%-test/queries/0_stateless/00577_full_join_segfault.reference
+%%DATADIR%%-test/queries/0_stateless/00475_in_join_db_table.sql
+%%DATADIR%%-test/queries/0_stateless/00365_statistics_in_formats.reference
+%%DATADIR%%-test/queries/0_stateless/01787_map_remote.sql
+%%DATADIR%%-test/queries/0_stateless/01135_default_and_alter_zookeeper.reference
+%%DATADIR%%-test/queries/0_stateless/00844_join_lightee2.reference
+%%DATADIR%%-test/queries/0_stateless/01292_create_user.sql
+%%DATADIR%%-test/queries/0_stateless/01855_jit_comparison_constant_result.reference
+%%DATADIR%%-test/queries/0_stateless/00098_5_union_all.reference
+%%DATADIR%%-test/queries/0_stateless/01925_json_as_string_data_in_square_brackets.sql
+%%DATADIR%%-test/queries/0_stateless/00980_alter_settings_race.reference
+%%DATADIR%%-test/queries/0_stateless/00715_json_each_row_input_nested.sh
+%%DATADIR%%-test/queries/0_stateless/01658_read_file_to_stringcolumn.reference
+%%DATADIR%%-test/queries/0_stateless/00334_column_aggregate_function_limit.reference
+%%DATADIR%%-test/queries/0_stateless/01533_collate_in_nullable.reference
+%%DATADIR%%-test/queries/0_stateless/00764_max_query_size_allocation.reference
+%%DATADIR%%-test/queries/0_stateless/01546_log_queries_min_query_duration_ms.reference
+%%DATADIR%%-test/queries/0_stateless/00712_prewhere_with_sampling.reference
+%%DATADIR%%-test/queries/0_stateless/01096_block_serialized_state.reference
+%%DATADIR%%-test/queries/0_stateless/01881_total_bytes_storage_buffer.reference
+%%DATADIR%%-test/queries/0_stateless/01683_flat_dictionary.reference
+%%DATADIR%%-test/queries/0_stateless/00733_if_datetime.sql
+%%DATADIR%%-test/queries/0_stateless/01246_least_greatest_generic.reference
+%%DATADIR%%-test/queries/0_stateless/00171_shard_array_of_tuple_remote.sql
+%%DATADIR%%-test/queries/0_stateless/00002_system_numbers.reference
+%%DATADIR%%-test/queries/0_stateless/01294_lazy_database_concurrent_recreate_reattach_and_show_tables_long.sh
+%%DATADIR%%-test/queries/0_stateless/01753_direct_dictionary_simple_key.reference
+%%DATADIR%%-test/queries/0_stateless/01016_uniqCombined64.sql
+%%DATADIR%%-test/queries/0_stateless/00545_weird_aggregate_functions.reference
+%%DATADIR%%-test/queries/0_stateless/00411_long_accurate_number_comparison_int1.sh
+%%DATADIR%%-test/queries/0_stateless/00905_field_with_aggregate_function_state.reference
+%%DATADIR%%-test/queries/0_stateless/02160_special_functions.sql
+%%DATADIR%%-test/queries/0_stateless/01401_FORMAT_SETTINGS.reference
+%%DATADIR%%-test/queries/0_stateless/00378_json_quote_64bit_integers.reference
+%%DATADIR%%-test/queries/0_stateless/01733_transform_ubsan.sql
+%%DATADIR%%-test/queries/0_stateless/00908_analyze_query.reference
+%%DATADIR%%-test/queries/0_stateless/00965_logs_level_bugfix.reference
+%%DATADIR%%-test/queries/0_stateless/01359_codeql.reference
+%%DATADIR%%-test/queries/0_stateless/01780_column_sparse_full.sql
+%%DATADIR%%-test/queries/0_stateless/00544_insert_with_select.reference
+%%DATADIR%%-test/queries/0_stateless/00872_t64_bit_codec.sql
+%%DATADIR%%-test/queries/0_stateless/01551_context_uaf.reference
+%%DATADIR%%-test/queries/0_stateless/01528_allow_nondeterministic_optimize_skip_unused_shards.reference
+%%DATADIR%%-test/queries/0_stateless/01700_point_in_polygon_ubsan.sql
+%%DATADIR%%-test/queries/0_stateless/00040_array_enumerate_uniq.sql
+%%DATADIR%%-test/queries/0_stateless/00942_mv_rename_table.sql
+%%DATADIR%%-test/queries/0_stateless/00149_function_url_hash.sql
+%%DATADIR%%-test/queries/0_stateless/00406_tuples_with_nulls.reference
+%%DATADIR%%-test/queries/0_stateless/00453_top_k.reference
+%%DATADIR%%-test/queries/0_stateless/02015_async_inserts_5.sh
+%%DATADIR%%-test/queries/0_stateless/01522_validate_alter_default.reference
+%%DATADIR%%-test/queries/0_stateless/01852_hints_enum_name.sh
+%%DATADIR%%-test/queries/0_stateless/01321_monotonous_functions_in_order_by.reference
+%%DATADIR%%-test/queries/0_stateless/00129_quantile_timing_weighted.reference
+%%DATADIR%%-test/queries/0_stateless/00744_join_not_found_column.reference
+%%DATADIR%%-test/queries/0_stateless/01591_window_functions.sql
+%%DATADIR%%-test/queries/0_stateless/01764_collapsing_merge_adaptive_granularity.sql
+%%DATADIR%%-test/queries/0_stateless/02151_replace_regexp_all_empty_match_alternative.reference
+%%DATADIR%%-test/queries/0_stateless/02126_fix_filelog.sh
+%%DATADIR%%-test/queries/0_stateless/01528_setting_aggregate_functions_null_for_empty.reference
+%%DATADIR%%-test/queries/0_stateless/01478_not_equi-join_on.sql
+%%DATADIR%%-test/queries/0_stateless/02125_fix_storage_filelog.reference
+%%DATADIR%%-test/queries/0_stateless/01710_projection_part_check.reference
+%%DATADIR%%-test/queries/0_stateless/01037_zookeeper_check_table_empty_pk.reference
+%%DATADIR%%-test/queries/0_stateless/00569_parse_date_time_best_effort.sql
+%%DATADIR%%-test/queries/0_stateless/00725_quantiles_shard.reference
+%%DATADIR%%-test/queries/0_stateless/00726_length_aliases.sql
+%%DATADIR%%-test/queries/0_stateless/01362_year_of_ISO8601_week_modificators_for_formatDateTime.reference
+%%DATADIR%%-test/queries/0_stateless/00705_aggregate_states_addition.sql
+%%DATADIR%%-test/queries/0_stateless/01674_unicode_asan.sql
+%%DATADIR%%-test/queries/0_stateless/00270_views_query_processing_stage.sql
+%%DATADIR%%-test/queries/0_stateless/00529_orantius.reference
+%%DATADIR%%-test/queries/0_stateless/01760_system_dictionaries.reference
+%%DATADIR%%-test/queries/0_stateless/01542_collate_in_array.reference
+%%DATADIR%%-test/queries/0_stateless/00961_checksums_in_system_parts_columns_table.sql
+%%DATADIR%%-test/queries/0_stateless/00970_substring_arg_validation.reference
+%%DATADIR%%-test/queries/0_stateless/01665_running_difference_ubsan.reference
+%%DATADIR%%-test/queries/0_stateless/02015_column_default_dict_get_identifier.sql
+%%DATADIR%%-test/queries/0_stateless/00753_comment_columns_zookeeper.sql
+%%DATADIR%%-test/queries/0_stateless/00098_4_union_all.sql
+%%DATADIR%%-test/queries/0_stateless/01717_int_div_float_too_large_ubsan.sql
+%%DATADIR%%-test/queries/0_stateless/01280_min_map_max_map.sql
+%%DATADIR%%-test/queries/0_stateless/01254_dict_load_after_detach_attach.reference
+%%DATADIR%%-test/queries/0_stateless/01925_broken_partition_id_zookeeper.sql
+%%DATADIR%%-test/queries/0_stateless/01526_complex_key_dict_direct_layout.sql
+%%DATADIR%%-test/queries/0_stateless/00939_limit_by_offset.reference
+%%DATADIR%%-test/queries/0_stateless/01596_setting_limit_offset.sql
+%%DATADIR%%-test/queries/0_stateless/00630_arbitrary_csv_delimiter.sh
+%%DATADIR%%-test/queries/0_stateless/00005_shard_format_ast_and_remote_table_lambda.reference
 %%DATADIR%%-test/queries/0_stateless/01014_format_custom_separated.sh
-%%DATADIR%%-test/queries/0_stateless/01014_function_repeat_corner_cases.reference
-%%DATADIR%%-test/queries/0_stateless/01014_function_repeat_corner_cases.sql
+%%DATADIR%%-test/queries/0_stateless/01293_pretty_max_value_width.sql
+%%DATADIR%%-test/queries/0_stateless/02097_default_dict_get_add_database.reference
+%%DATADIR%%-test/queries/0_stateless/01472_toStartOfInterval_disallow_empty_tz_field.sql
+%%DATADIR%%-test/queries/0_stateless/01528_to_uuid_or_null_or_zero.sql
+%%DATADIR%%-test/queries/0_stateless/00429_point_in_ellipses.sql
+%%DATADIR%%-test/queries/0_stateless/02112_delayed_clickhouse_local_with_queries_file.reference
+%%DATADIR%%-test/queries/0_stateless/01254_dict_create_without_db.sql
+%%DATADIR%%-test/queries/0_stateless/02017_create_distributed_table_coredump.reference
+%%DATADIR%%-test/queries/0_stateless/01069_database_memory.sql
+%%DATADIR%%-test/queries/0_stateless/01554_interpreter_integer_float.reference
+%%DATADIR%%-test/queries/0_stateless/01018_ip_dictionary_long.sql
+%%DATADIR%%-test/queries/0_stateless/00534_client_ignore_error.reference
+%%DATADIR%%-test/queries/0_stateless/01303_polygons_equals.sql
+%%DATADIR%%-test/queries/0_stateless/00933_ttl_replicated_zookeeper_long.sql
+%%DATADIR%%-test/queries/0_stateless/00849_multiple_comma_join_2.reference
+%%DATADIR%%-test/queries/0_stateless/01889_sqlite_read_write.reference
+%%DATADIR%%-test/queries/0_stateless/01944_insert_partition_by.sql
+%%DATADIR%%-test/queries/0_stateless/01344_min_bytes_to_use_mmap_io_index.sql
+%%DATADIR%%-test/queries/0_stateless/00485_http_insert_format.reference
+%%DATADIR%%-test/queries/0_stateless/01192_rename_database_zookeeper.reference
+%%DATADIR%%-test/queries/0_stateless/00832_storage_file_lock.reference
+%%DATADIR%%-test/queries/0_stateless/02029_test_implemented_methods.sh
+%%DATADIR%%-test/queries/0_stateless/01561_mann_whitney_scipy.reference
+%%DATADIR%%-test/queries/0_stateless/01090_zookeeper_mutations_and_insert_quorum_long.sql
+%%DATADIR%%-test/queries/0_stateless/01293_optimize_final_force.sh
+%%DATADIR%%-test/queries/0_stateless/00712_prewhere_with_missing_columns.reference
+%%DATADIR%%-test/queries/0_stateless/01847_bad_like.reference
+%%DATADIR%%-test/queries/0_stateless/01652_ignore_and_low_cardinality.reference
+%%DATADIR%%-test/queries/0_stateless/00018_distinct_in_subquery.reference
+%%DATADIR%%-test/queries/0_stateless/00604_shard_remote_and_columns_with_defaults.sql
+%%DATADIR%%-test/queries/0_stateless/02026_storage_filelog_largefile.sh
+%%DATADIR%%-test/queries/0_stateless/00226_zookeeper_deduplication_and_unexpected_parts_long.reference
+%%DATADIR%%-test/queries/0_stateless/00038_totals_limit.reference
+%%DATADIR%%-test/queries/0_stateless/01915_json_extract_raw_string.reference
+%%DATADIR%%-test/queries/0_stateless/01472_obfuscator_uuid.reference
+%%DATADIR%%-test/queries/0_stateless/00612_count.reference
+%%DATADIR%%-test/queries/0_stateless/01860_Distributed__shard_num_GROUP_BY.reference
+%%DATADIR%%-test/queries/0_stateless/01355_CSV_input_format_allow_errors.sh
+%%DATADIR%%-test/queries/0_stateless/01710_aggregate_projections.sh
+%%DATADIR%%-test/queries/0_stateless/01018_ddl_dictionaries_concurrent_requrests.sh
+%%DATADIR%%-test/queries/0_stateless/00158_buffer_and_nonexistent_table.reference
+%%DATADIR%%-test/queries/0_stateless/01311_comparison_with_constant_string.reference
+%%DATADIR%%-test/queries/0_stateless/data_csv/csv_with_slash.csv
+%%DATADIR%%-test/queries/0_stateless/01946_test_wrong_host_name_access.reference
+%%DATADIR%%-test/queries/0_stateless/01686_event_time_microseconds_part_log.reference
+%%DATADIR%%-test/queries/0_stateless/00938_dataset_test.reference
+%%DATADIR%%-test/queries/0_stateless/02101_avro_union_index_out_of_boundary.sh
+%%DATADIR%%-test/queries/0_stateless/00578_merge_trees_without_primary_key.sql
+%%DATADIR%%-test/queries/0_stateless/00732_quorum_insert_lost_part_zookeeper_long.sql
+%%DATADIR%%-test/queries/0_stateless/01561_clickhouse_client_stage.sh
+%%DATADIR%%-test/queries/0_stateless/01061_alter_codec_with_type.reference
+%%DATADIR%%-test/queries/0_stateless/01508_race_condition_rename_clear_zookeeper_long.sh
+%%DATADIR%%-test/queries/0_stateless/01903_csvwithnames_subset_of_columns.sh
+%%DATADIR%%-test/queries/0_stateless/01665_substring_ubsan.reference
+%%DATADIR%%-test/queries/0_stateless/01675_data_type_coroutine.sh
+%%DATADIR%%-test/queries/0_stateless/00282_merging.reference
+%%DATADIR%%-test/queries/0_stateless/00949_format.reference
+%%DATADIR%%-test/queries/0_stateless/01132_max_rows_to_read.reference
+%%DATADIR%%-test/queries/0_stateless/01035_lc_empty_part_bug.reference
+%%DATADIR%%-test/queries/0_stateless/01732_race_condition_storage_join_long.reference
+%%DATADIR%%-test/queries/0_stateless/01302_aggregate_state_exception_memory_leak.reference
+%%DATADIR%%-test/queries/0_stateless/00199_ternary_operator_type_check.reference
+%%DATADIR%%-test/queries/0_stateless/02104_json_strings_nullable_string.sh
+%%DATADIR%%-test/queries/0_stateless/02157_readonly_system_suspend.reference
+%%DATADIR%%-test/queries/0_stateless/01043_geo_distance.reference
+%%DATADIR%%-test/queries/0_stateless/00306_insert_values_and_expressions.sql
+%%DATADIR%%-test/queries/0_stateless/00940_order_by_read_in_order.reference
+%%DATADIR%%-test/queries/0_stateless/01493_storage_set_persistency.sql
+%%DATADIR%%-test/queries/0_stateless/02048_alter_command_format.reference
+%%DATADIR%%-test/queries/0_stateless/02008_aliased_column_distributed_bug.reference
+%%DATADIR%%-test/queries/0_stateless/00646_weird_mmx.reference
+%%DATADIR%%-test/queries/0_stateless/01849_geoToS2.sql
+%%DATADIR%%-test/queries/0_stateless/02025_storage_filelog_virtual_col.sh
+%%DATADIR%%-test/queries/0_stateless/01357_version_collapsing_attach_detach_zookeeper.sql
+%%DATADIR%%-test/queries/0_stateless/00911_tautological_compare.sql
+%%DATADIR%%-test/queries/0_stateless/00699_materialized_view_mutations.sh
+%%DATADIR%%-test/queries/0_stateless/00110_external_sort.reference
+%%DATADIR%%-test/queries/0_stateless/00274_shard_group_array.reference
+%%DATADIR%%-test/queries/0_stateless/00957_coalesce_const_nullable_crash.reference
+%%DATADIR%%-test/queries/0_stateless/01281_group_by_limit_memory_tracking.reference
+%%DATADIR%%-test/queries/0_stateless/02103_with_names_and_types_parallel_parsing.reference
+%%DATADIR%%-test/queries/0_stateless/02113_base64encode_trailing_bytes.sql
+%%DATADIR%%-test/queries/0_stateless/00906_low_cardinality_const_argument.sql
+%%DATADIR%%-test/queries/0_stateless/00048_b_stored_aggregates_merge.sql
+%%DATADIR%%-test/queries/0_stateless/01780_clickhouse_dictionary_source_loop.reference
+%%DATADIR%%-test/queries/0_stateless/01475_read_subcolumns_3.sql
+%%DATADIR%%-test/queries/0_stateless/01460_line_as_string_format.sh
+%%DATADIR%%-test/queries/0_stateless/01891_not_like_partition_prune.sql
+%%DATADIR%%-test/queries/0_stateless/02024_merge_regexp_assert.reference
+%%DATADIR%%-test/queries/0_stateless/00187_like_regexp_prefix.reference
+%%DATADIR%%-test/queries/0_stateless/01502_jemalloc_percpu_arena.sh
+%%DATADIR%%-test/queries/0_stateless/01254_dict_create_without_db.reference
+%%DATADIR%%-test/queries/0_stateless/01913_summing_mt_and_simple_agg_function_with_lc.reference
+%%DATADIR%%-test/queries/0_stateless/02155_parse_date_lowcard_default_throw.reference
+%%DATADIR%%-test/queries/0_stateless/01506_buffer_table_alter_block_structure.sql
 %%DATADIR%%-test/queries/0_stateless/01014_lazy_database_basic.reference
-%%DATADIR%%-test/queries/0_stateless/01014_lazy_database_basic.sh
-%%DATADIR%%-test/queries/0_stateless/01014_lazy_database_concurrent_recreate_reattach_and_show_tables.reference
-%%DATADIR%%-test/queries/0_stateless/01014_lazy_database_concurrent_recreate_reattach_and_show_tables.sh
-%%DATADIR%%-test/queries/0_stateless/01015_array_split.reference
-%%DATADIR%%-test/queries/0_stateless/01015_array_split.sql
-%%DATADIR%%-test/queries/0_stateless/01015_attach_part.reference
-%%DATADIR%%-test/queries/0_stateless/01015_attach_part.sql
-%%DATADIR%%-test/queries/0_stateless/01015_database_bad_tables.reference
-%%DATADIR%%-test/queries/0_stateless/01015_database_bad_tables.sql
-%%DATADIR%%-test/queries/0_stateless/01015_empty_in_inner_right_join.reference
-%%DATADIR%%-test/queries/0_stateless/01015_empty_in_inner_right_join.sql
-%%DATADIR%%-test/queries/0_stateless/01015_insert_values_parametrized.reference
-%%DATADIR%%-test/queries/0_stateless/01015_insert_values_parametrized.sh
-%%DATADIR%%-test/queries/0_stateless/01015_random_constant.reference
-%%DATADIR%%-test/queries/0_stateless/01015_random_constant.sql
-%%DATADIR%%-test/queries/0_stateless/01016_index_tuple_field_type.reference
-%%DATADIR%%-test/queries/0_stateless/01016_index_tuple_field_type.sql
-%%DATADIR%%-test/queries/0_stateless/01016_input_null_as_default.reference
-%%DATADIR%%-test/queries/0_stateless/01016_input_null_as_default.sh
-%%DATADIR%%-test/queries/0_stateless/01016_macros.reference
+%%DATADIR%%-test/queries/0_stateless/01676_reinterpret_as.reference
+%%DATADIR%%-test/queries/0_stateless/data_parquet/nested_maps.snappy.parquet.columns
+%%DATADIR%%-test/queries/0_stateless/data_parquet/userdata3.parquet
+%%DATADIR%%-test/queries/0_stateless/data_parquet/fixed_length_decimal.parquet
+%%DATADIR%%-test/queries/0_stateless/data_parquet/alltypes_list.parquet
+%%DATADIR%%-test/queries/0_stateless/data_parquet/alltypes_plain.snappy.parquet.columns
+%%DATADIR%%-test/queries/0_stateless/data_parquet/userdata4.parquet.columns
+%%DATADIR%%-test/queries/0_stateless/data_parquet/array_string.parquet.columns
+%%DATADIR%%-test/queries/0_stateless/data_parquet/v0.7.1.all-named-index.parquet.columns
+%%DATADIR%%-test/queries/0_stateless/data_parquet/dict-page-offset-zero.parquet.columns
+%%DATADIR%%-test/queries/0_stateless/data_parquet/datapage_v2.snappy.parquet
+%%DATADIR%%-test/queries/0_stateless/data_parquet/array_int.parquet.columns
+%%DATADIR%%-test/queries/0_stateless/data_parquet/fixed_length_decimal_1.parquet.columns
+%%DATADIR%%-test/queries/0_stateless/data_parquet/nested_lists.snappy.parquet
+%%DATADIR%%-test/queries/0_stateless/data_parquet/int64_decimal.parquet.columns
+%%DATADIR%%-test/queries/0_stateless/data_parquet/non_hadoop_lz4_compressed.parquet.columns
+%%DATADIR%%-test/queries/0_stateless/data_parquet/alltypes_plain.parquet.columns
+%%DATADIR%%-test/queries/0_stateless/data_parquet/dict-page-offset-zero.parquet
+%%DATADIR%%-test/queries/0_stateless/data_parquet/nested_maps.snappy.parquet
+%%DATADIR%%-test/queries/0_stateless/data_parquet/userdata5.parquet.columns
+%%DATADIR%%-test/queries/0_stateless/data_parquet/nulls.snappy.parquet
+%%DATADIR%%-test/queries/0_stateless/data_parquet/datapage_v2.snappy.parquet.columns
+%%DATADIR%%-test/queries/0_stateless/data_parquet/list_columns.parquet
+%%DATADIR%%-test/queries/0_stateless/data_parquet/int64_decimal.parquet
+%%DATADIR%%-test/queries/0_stateless/data_parquet/datatype-date32.parquet
+%%DATADIR%%-test/queries/0_stateless/data_parquet/alltypes_dictionary.parquet
+%%DATADIR%%-test/queries/0_stateless/data_parquet/byte_array_decimal.parquet
+%%DATADIR%%-test/queries/0_stateless/data_parquet/userdata2.parquet
+%%DATADIR%%-test/queries/0_stateless/data_parquet/array_int.parquet
+%%DATADIR%%-test/queries/0_stateless/data_parquet/nation.dict-malformed.parquet.columns
+%%DATADIR%%-test/queries/0_stateless/data_parquet/datatype-date32.parquet.columns
+%%DATADIR%%-test/queries/0_stateless/data_parquet/nested_lists.snappy.parquet.columns
+%%DATADIR%%-test/queries/0_stateless/data_parquet/hadoop_lz4_compressed.parquet
+%%DATADIR%%-test/queries/0_stateless/data_parquet/binary.parquet
+%%DATADIR%%-test/queries/0_stateless/data_parquet/fixed_length_decimal.parquet.columns
+%%DATADIR%%-test/queries/0_stateless/data_parquet/nullable.impala.parquet
+%%DATADIR%%-test/queries/0_stateless/data_parquet/nulls.snappy.parquet.columns
+%%DATADIR%%-test/queries/0_stateless/data_parquet/single_nan.parquet.columns
+%%DATADIR%%-test/queries/0_stateless/data_parquet/nation.dict-malformed.parquet
+%%DATADIR%%-test/queries/0_stateless/data_parquet/fixed_length_decimal_legacy.parquet.columns
+%%DATADIR%%-test/queries/0_stateless/data_parquet/fixed_length_decimal_1.parquet
+%%DATADIR%%-test/queries/0_stateless/data_parquet/fixed_length_decimal_legacy.parquet
+%%DATADIR%%-test/queries/0_stateless/data_parquet/array_float.parquet
+%%DATADIR%%-test/queries/0_stateless/data_parquet/alltypes_list.parquet.columns
+%%DATADIR%%-test/queries/0_stateless/data_parquet/non_hadoop_lz4_compressed.parquet
+%%DATADIR%%-test/queries/0_stateless/data_parquet/v0.7.1.some-named-index.parquet.columns
+%%DATADIR%%-test/queries/0_stateless/data_parquet/nullable_list.parquet.columns
+%%DATADIR%%-test/queries/0_stateless/data_parquet/userdata1.parquet.columns
+%%DATADIR%%-test/queries/0_stateless/data_parquet/alltypes_dictionary.parquet.columns
+%%DATADIR%%-test/queries/0_stateless/data_parquet/single_nan.parquet
+%%DATADIR%%-test/queries/0_stateless/data_parquet/alltypes_plain.parquet
+%%DATADIR%%-test/queries/0_stateless/data_parquet/alltypes_plain.snappy.parquet
+%%DATADIR%%-test/queries/0_stateless/data_parquet/v0.7.1.column-metadata-handling.parquet
+%%DATADIR%%-test/queries/0_stateless/data_parquet/nested_lists.parquet.columns
+%%DATADIR%%-test/queries/0_stateless/data_parquet/array_float.parquet.columns
+%%DATADIR%%-test/queries/0_stateless/data_parquet/v0.7.1.column-metadata-handling.parquet.columns
+%%DATADIR%%-test/queries/0_stateless/data_parquet/binary.parquet.columns
+%%DATADIR%%-test/queries/0_stateless/data_parquet/byte_array_decimal.parquet.columns
+%%DATADIR%%-test/queries/0_stateless/data_parquet/nullable_list.parquet
+%%DATADIR%%-test/queries/0_stateless/data_parquet/userdata4.parquet
+%%DATADIR%%-test/queries/0_stateless/data_parquet/v0.7.1.all-named-index.parquet
+%%DATADIR%%-test/queries/0_stateless/data_parquet/list_columns.parquet.columns
+%%DATADIR%%-test/queries/0_stateless/data_parquet/repeated_no_annotation.parquet.disabled
+%%DATADIR%%-test/queries/0_stateless/data_parquet/userdata1.parquet
+%%DATADIR%%-test/queries/0_stateless/data_parquet/int32_decimal.parquet.columns
+%%DATADIR%%-test/queries/0_stateless/data_parquet/userdata5.parquet
+%%DATADIR%%-test/queries/0_stateless/data_parquet/userdata3.parquet.columns
+%%DATADIR%%-test/queries/0_stateless/data_parquet/v0.7.1.parquet.columns
+%%DATADIR%%-test/queries/0_stateless/data_parquet/array_string.parquet
+%%DATADIR%%-test/queries/0_stateless/data_parquet/nullable.impala.parquet.columns
+%%DATADIR%%-test/queries/0_stateless/data_parquet/nonnullable.impala.parquet
+%%DATADIR%%-test/queries/0_stateless/data_parquet/v0.7.1.parquet
+%%DATADIR%%-test/queries/0_stateless/data_parquet/int32_decimal.parquet
+%%DATADIR%%-test/queries/0_stateless/data_parquet/hadoop_lz4_compressed.parquet.columns
+%%DATADIR%%-test/queries/0_stateless/data_parquet/v0.7.1.some-named-index.parquet
+%%DATADIR%%-test/queries/0_stateless/data_parquet/nonnullable.impala.parquet.columns
+%%DATADIR%%-test/queries/0_stateless/data_parquet/nested_lists.parquet
+%%DATADIR%%-test/queries/0_stateless/data_parquet/userdata2.parquet.columns
+%%DATADIR%%-test/queries/0_stateless/01471_top_k_range_check.reference
+%%DATADIR%%-test/queries/0_stateless/00702_join_with_using_dups.sql
+%%DATADIR%%-test/queries/0_stateless/00650_array_enumerate_uniq_with_tuples.reference
+%%DATADIR%%-test/queries/0_stateless/00109_shard_totals_after_having.reference
+%%DATADIR%%-test/queries/0_stateless/01142_with_ties_and_aliases.sql
+%%DATADIR%%-test/queries/0_stateless/00975_move_partition_merge_tree.sql
+%%DATADIR%%-test/queries/0_stateless/00220_shard_with_totals_in_subquery_remote_and_limit.sql
+%%DATADIR%%-test/queries/0_stateless/00933_ttl_with_default.reference
+%%DATADIR%%-test/queries/0_stateless/01514_distributed_cancel_query_on_error.sh
+%%DATADIR%%-test/queries/0_stateless/00405_pretty_formats.sql
+%%DATADIR%%-test/queries/0_stateless/01508_partition_pruning_long.queries
+%%DATADIR%%-test/queries/0_stateless/00084_summing_merge_tree.sql
+%%DATADIR%%-test/queries/0_stateless/00344_row_number_in_all_blocks.sql
+%%DATADIR%%-test/queries/0_stateless/00649_quantile_tdigest_negative.sql
+%%DATADIR%%-test/queries/0_stateless/00958_format_of_tuple_array_element.reference
+%%DATADIR%%-test/queries/0_stateless/01065_window_view_event_hop_watch_bounded.py
+%%DATADIR%%-test/queries/0_stateless/01700_mod_negative_type_promotion.sql
+%%DATADIR%%-test/queries/0_stateless/00394_new_nested_column_keeps_offsets.reference
+%%DATADIR%%-test/queries/0_stateless/00351_select_distinct_arrays_tuples.reference
+%%DATADIR%%-test/queries/0_stateless/00971_merge_tree_uniform_read_distribution_and_max_rows_to_read.reference
+%%DATADIR%%-test/queries/0_stateless/01019_alter_materialized_view_atomic.sh
+%%DATADIR%%-test/queries/0_stateless/01559_misplaced_codec_diagnostics.sh
+%%DATADIR%%-test/queries/0_stateless/01514_distributed_cancel_query_on_error.reference
+%%DATADIR%%-test/queries/0_stateless/02012_compress_lz4.sh
+%%DATADIR%%-test/queries/0_stateless/00809_add_days_segfault.sql
+%%DATADIR%%-test/queries/0_stateless/00578_merge_table_and_table_virtual_column.reference
+%%DATADIR%%-test/queries/0_stateless/01610_client_spawn_editor.reference
+%%DATADIR%%-test/queries/0_stateless/00213_multiple_global_in.sql
+%%DATADIR%%-test/queries/0_stateless/01720_constraints_complex_types.reference
+%%DATADIR%%-test/queries/0_stateless/01085_simdjson_uint64.reference
+%%DATADIR%%-test/queries/0_stateless/01069_set_in_group_by.reference
+%%DATADIR%%-test/queries/0_stateless/01605_key_condition_enum_int.sql
+%%DATADIR%%-test/queries/0_stateless/02002_parse_map_int_key.reference
+%%DATADIR%%-test/queries/0_stateless/01586_storage_join_low_cardinality_key.sql
+%%DATADIR%%-test/queries/0_stateless/01632_group_array_msan.sql
+%%DATADIR%%-test/queries/0_stateless/01358_mutation_delete_null_rows.sql
+%%DATADIR%%-test/queries/0_stateless/02096_bad_options_in_client_and_local.sh
+%%DATADIR%%-test/queries/0_stateless/00172_constexprs_in_set.sql
+%%DATADIR%%-test/queries/0_stateless/00926_adaptive_index_granularity_collapsing_merge_tree.sql
+%%DATADIR%%-test/queries/0_stateless/01891_jit_aggregation_function_any_long.sql
+%%DATADIR%%-test/queries/0_stateless/00944_create_bloom_filter_index_with_merge_tree.reference
+%%DATADIR%%-test/queries/0_stateless/01945_show_debug_warning.reference
+%%DATADIR%%-test/queries/0_stateless/00921_datetime64_basic.sql
+%%DATADIR%%-test/queries/0_stateless/01134_set_overflow_mode.sql
+%%DATADIR%%-test/queries/0_stateless/01690_quantilesTiming_ubsan.reference
+%%DATADIR%%-test/queries/0_stateless/01660_system_parts_smoke.reference
+%%DATADIR%%-test/queries/0_stateless/01220_scalar_optimization_in_alter.sql
+%%DATADIR%%-test/queries/0_stateless/02047_alias_for_table_and_database_name.sql
+%%DATADIR%%-test/queries/0_stateless/01760_modulo_negative.reference
+%%DATADIR%%-test/queries/0_stateless/01890_cross_join_explain_crash.sql
+%%DATADIR%%-test/queries/0_stateless/01893_jit_aggregation_function_min_long.reference
+%%DATADIR%%-test/queries/0_stateless/01754_cluster_all_replicas_shard_num.sql
+%%DATADIR%%-test/queries/0_stateless/00619_union_highlite.sql
+%%DATADIR%%-test/queries/0_stateless/00553_buff_exists_materlized_column.sql
+%%DATADIR%%-test/queries/0_stateless/00965_live_view_watch_heartbeat.py
+%%DATADIR%%-test/queries/0_stateless/02140_clickhouse_local_queries_file_table.reference
+%%DATADIR%%-test/queries/0_stateless/01376_null_logical.reference
+%%DATADIR%%-test/queries/0_stateless/01410_nullable_key_and_index_negate_cond.sql
+%%DATADIR%%-test/queries/0_stateless/01497_now_support_timezone.reference
+%%DATADIR%%-test/queries/0_stateless/01054_cache_dictionary_overflow_cell.reference
+%%DATADIR%%-test/queries/0_stateless/00709_virtual_column_partition_id.reference
+%%DATADIR%%-test/queries/0_stateless/00007_array.reference
+%%DATADIR%%-test/queries/0_stateless/01710_projection_drop_if_exists.sql
+%%DATADIR%%-test/queries/0_stateless/00361_shared_array_offsets_and_squash_blocks.reference
+%%DATADIR%%-test/queries/0_stateless/01780_column_sparse_pk.reference
+%%DATADIR%%-test/queries/0_stateless/01268_DateTime64_in_WHERE.sql
+%%DATADIR%%-test/queries/0_stateless/00962_live_view_periodic_refresh_and_timeout.py
+%%DATADIR%%-test/queries/0_stateless/00980_shard_aggregation_state_deserialization.reference
+%%DATADIR%%-test/queries/0_stateless/00937_ipv4_cidr_range.sql
+%%DATADIR%%-test/queries/0_stateless/00323_quantiles_timing_bug.sql
+%%DATADIR%%-test/queries/0_stateless/01442_date_time_with_params.reference
+%%DATADIR%%-test/queries/0_stateless/01622_byte_size.reference
+%%DATADIR%%-test/queries/0_stateless/01518_filtering_aliased_materialized_column.reference
+%%DATADIR%%-test/queries/0_stateless/00859_distinct_with_join.reference
+%%DATADIR%%-test/queries/0_stateless/00747_contributors.reference
+%%DATADIR%%-test/queries/0_stateless/00698_validate_array_sizes_for_nested.sql
+%%DATADIR%%-test/queries/0_stateless/01761_round_year_bounds.sql
+%%DATADIR%%-test/queries/0_stateless/01601_detach_permanently.reference
+%%DATADIR%%-test/queries/0_stateless/00205_emptyscalar_subquery_type_mismatch_bug.reference
+%%DATADIR%%-test/queries/0_stateless/01157_replace_table.reference
+%%DATADIR%%-test/queries/0_stateless/01128_generate_random_nested.sql
+%%DATADIR%%-test/queries/0_stateless/00652_replicated_mutations_zookeeper.sh
+%%DATADIR%%-test/queries/0_stateless/01047_window_view_parser_inner_table.sql
+%%DATADIR%%-test/queries/0_stateless/00932_geohash_support.reference
+%%DATADIR%%-test/queries/0_stateless/01412_group_array_moving_shard.sql
+%%DATADIR%%-test/queries/0_stateless/01053_ssd_dictionary.sh
+%%DATADIR%%-test/queries/0_stateless/00926_geo_to_h3.sql
+%%DATADIR%%-test/queries/0_stateless/00500_point_in_polygon_bug_3_linestring_rotation_precision.reference
 %%DATADIR%%-test/queries/0_stateless/01016_macros.sql
-%%DATADIR%%-test/queries/0_stateless/01016_null_part_minmax.reference
-%%DATADIR%%-test/queries/0_stateless/01016_null_part_minmax.sql
-%%DATADIR%%-test/queries/0_stateless/01016_simhash_minhash.reference
-%%DATADIR%%-test/queries/0_stateless/01016_simhash_minhash.sql
-%%DATADIR%%-test/queries/0_stateless/01016_uniqCombined64.reference
-%%DATADIR%%-test/queries/0_stateless/01016_uniqCombined64.sql
-%%DATADIR%%-test/queries/0_stateless/01017_bithamming_distance.reference
+%%DATADIR%%-test/queries/0_stateless/00746_sql_fuzzy.pl
+%%DATADIR%%-test/queries/0_stateless/02006_client_test_hint_error_name.sql
+%%DATADIR%%-test/queries/0_stateless/01273_lc_fixed_string_field.sql
+%%DATADIR%%-test/queries/0_stateless/00760_url_functions_overflow.reference
+%%DATADIR%%-test/queries/0_stateless/01065_window_view_event_hop_watch_bounded.reference
+%%DATADIR%%-test/queries/0_stateless/00515_enhanced_time_zones.sql
+%%DATADIR%%-test/queries/0_stateless/00466_comments_in_keyword.reference
+%%DATADIR%%-test/queries/0_stateless/01651_group_uniq_array_enum.sql
+%%DATADIR%%-test/queries/0_stateless/00634_rename_view.reference
+%%DATADIR%%-test/queries/0_stateless/00483_cast_syntax.reference
+%%DATADIR%%-test/queries/0_stateless/02003_memory_limit_in_client.reference
+%%DATADIR%%-test/queries/0_stateless/01533_multiple_nested.reference
+%%DATADIR%%-test/queries/0_stateless/01213_alter_rename_nested.reference
+%%DATADIR%%-test/queries/0_stateless/01548_create_table_compound_column_format.sh
+%%DATADIR%%-test/queries/0_stateless/00799_function_dry_run.sql
+%%DATADIR%%-test/queries/0_stateless/00689_file.txt
+%%DATADIR%%-test/queries/0_stateless/00701_rollup.sql
+%%DATADIR%%-test/queries/0_stateless/02114_bool_type.reference
+%%DATADIR%%-test/queries/0_stateless/01720_type_map_and_casts.reference
+%%DATADIR%%-test/queries/0_stateless/00581_limit_on_result_and_subquery_and_insert.reference
+%%DATADIR%%-test/queries/0_stateless/00818_join_bug_4271.sql
+%%DATADIR%%-test/queries/0_stateless/00098_2_union_all.reference
+%%DATADIR%%-test/queries/0_stateless/01526_initial_query_id.reference
+%%DATADIR%%-test/queries/0_stateless/01568_window_functions_distributed.reference
+%%DATADIR%%-test/queries/0_stateless/01181_db_atomic_drop_on_cluster.reference
+%%DATADIR%%-test/queries/0_stateless/02112_parse_date_yyyymmdd.reference
+%%DATADIR%%-test/queries/0_stateless/01544_errorCodeToName.reference
+%%DATADIR%%-test/queries/0_stateless/01926_json_as_string_array.reference
+%%DATADIR%%-test/queries/0_stateless/01181_db_atomic_drop_on_cluster.sql
+%%DATADIR%%-test/queries/0_stateless/02006_client_test_hint_no_such_error_name.reference
+%%DATADIR%%-test/queries/0_stateless/02110_clickhouse_local_custom_tld.config.xml
+%%DATADIR%%-test/queries/0_stateless/01060_substring_negative_size.reference
+%%DATADIR%%-test/queries/0_stateless/00979_live_view_watch_live.py
+%%DATADIR%%-test/queries/0_stateless/01576_if_null_external_aggregation.sql
+%%DATADIR%%-test/queries/0_stateless/01043_dictionary_attribute_properties_values.sql
+%%DATADIR%%-test/queries/0_stateless/01272_offset_without_limit.sql
+%%DATADIR%%-test/queries/0_stateless/00634_rename_view.sql
+%%DATADIR%%-test/queries/0_stateless/00995_exception_while_insert.sh
+%%DATADIR%%-test/queries/0_stateless/02124_comparison_betwwen_decimal_and_float.sql
+%%DATADIR%%-test/queries/0_stateless/00965_set_index_string_functions.reference
+%%DATADIR%%-test/queries/0_stateless/01155_rename_move_materialized_view.reference
+%%DATADIR%%-test/queries/0_stateless/00507_sumwithoverflow.reference
 %%DATADIR%%-test/queries/0_stateless/01017_bithamming_distance.sql
-%%DATADIR%%-test/queries/0_stateless/01017_in_unconvertible_complex_type.reference
-%%DATADIR%%-test/queries/0_stateless/01017_in_unconvertible_complex_type.sql
-%%DATADIR%%-test/queries/0_stateless/01017_mutations_with_nondeterministic_functions_zookeeper.reference
-%%DATADIR%%-test/queries/0_stateless/01017_mutations_with_nondeterministic_functions_zookeeper.sh
-%%DATADIR%%-test/queries/0_stateless/01017_tsv_empty_as_default.reference
-%%DATADIR%%-test/queries/0_stateless/01017_tsv_empty_as_default.sh
-%%DATADIR%%-test/queries/0_stateless/01017_tuplehamming_distance.reference
-%%DATADIR%%-test/queries/0_stateless/01017_tuplehamming_distance.sql
-%%DATADIR%%-test/queries/0_stateless/01017_uniqCombined_memory_usage.reference
-%%DATADIR%%-test/queries/0_stateless/01017_uniqCombined_memory_usage.sql
-%%DATADIR%%-test/queries/0_stateless/01018_Distributed__shard_num.reference
-%%DATADIR%%-test/queries/0_stateless/01018_Distributed__shard_num.sql
-%%DATADIR%%-test/queries/0_stateless/01018_ambiguous_column.reference
-%%DATADIR%%-test/queries/0_stateless/01018_ambiguous_column.sql
-%%DATADIR%%-test/queries/0_stateless/01018_ddl_dictionaries_bad_queries.reference
-%%DATADIR%%-test/queries/0_stateless/01018_ddl_dictionaries_bad_queries.sh
-%%DATADIR%%-test/queries/0_stateless/01018_ddl_dictionaries_concurrent_requrests.reference
-%%DATADIR%%-test/queries/0_stateless/01018_ddl_dictionaries_concurrent_requrests.sh
-%%DATADIR%%-test/queries/0_stateless/01018_ddl_dictionaries_create.reference
-%%DATADIR%%-test/queries/0_stateless/01018_ddl_dictionaries_create.sql
-%%DATADIR%%-test/queries/0_stateless/01018_ddl_dictionaries_select.reference
-%%DATADIR%%-test/queries/0_stateless/01018_ddl_dictionaries_select.sql
-%%DATADIR%%-test/queries/0_stateless/01018_ddl_dictionaries_special.reference
-%%DATADIR%%-test/queries/0_stateless/01018_ddl_dictionaries_special.sql
-%%DATADIR%%-test/queries/0_stateless/01018_dictionaries_from_dictionaries.reference
-%%DATADIR%%-test/queries/0_stateless/01018_dictionaries_from_dictionaries.sql
-%%DATADIR%%-test/queries/0_stateless/01018_empty_aggregation_filling.reference
-%%DATADIR%%-test/queries/0_stateless/01018_empty_aggregation_filling.sql
-%%DATADIR%%-test/queries/0_stateless/01018_insert_multiple_blocks_with_defaults.reference
-%%DATADIR%%-test/queries/0_stateless/01018_insert_multiple_blocks_with_defaults.sh
-%%DATADIR%%-test/queries/0_stateless/01018_ip_dictionary_long.reference
-%%DATADIR%%-test/queries/0_stateless/01018_ip_dictionary_long.sql
-%%DATADIR%%-test/queries/0_stateless/01018_optimize_read_in_order_with_in_subquery.reference
-%%DATADIR%%-test/queries/0_stateless/01018_optimize_read_in_order_with_in_subquery.sql
-%%DATADIR%%-test/queries/0_stateless/01019_Buffer_and_max_memory_usage.reference
-%%DATADIR%%-test/queries/0_stateless/01019_Buffer_and_max_memory_usage.sql
-%%DATADIR%%-test/queries/0_stateless/01019_alter_materialized_view_atomic.reference
-%%DATADIR%%-test/queries/0_stateless/01019_alter_materialized_view_atomic.sh
-%%DATADIR%%-test/queries/0_stateless/01019_alter_materialized_view_consistent.reference
-%%DATADIR%%-test/queries/0_stateless/01019_alter_materialized_view_consistent.sh
-%%DATADIR%%-test/queries/0_stateless/01019_alter_materialized_view_query.reference
-%%DATADIR%%-test/queries/0_stateless/01019_alter_materialized_view_query.sql
-%%DATADIR%%-test/queries/0_stateless/01019_array_fill.reference
-%%DATADIR%%-test/queries/0_stateless/01019_array_fill.sql
-%%DATADIR%%-test/queries/0_stateless/01019_materialized_view_select_extra_columns.reference
-%%DATADIR%%-test/queries/0_stateless/01019_materialized_view_select_extra_columns.sql
-%%DATADIR%%-test/queries/0_stateless/01019_parallel_parsing_cancel.reference
-%%DATADIR%%-test/queries/0_stateless/01019_parallel_parsing_cancel.sh
-%%DATADIR%%-test/queries/0_stateless/01020_function_array_compact.reference
-%%DATADIR%%-test/queries/0_stateless/01020_function_array_compact.sql
-%%DATADIR%%-test/queries/0_stateless/01020_function_char.reference
-%%DATADIR%%-test/queries/0_stateless/01020_function_char.sql
-%%DATADIR%%-test/queries/0_stateless/01020_having_without_group_by.reference
-%%DATADIR%%-test/queries/0_stateless/01020_having_without_group_by.sql
-%%DATADIR%%-test/queries/0_stateless/01021_create_as_select.reference
-%%DATADIR%%-test/queries/0_stateless/01021_create_as_select.sql
-%%DATADIR%%-test/queries/0_stateless/01021_only_tuple_columns.reference
-%%DATADIR%%-test/queries/0_stateless/01021_only_tuple_columns.sql
-%%DATADIR%%-test/queries/0_stateless/01021_tuple_parser.reference
-%%DATADIR%%-test/queries/0_stateless/01021_tuple_parser.sql
-%%DATADIR%%-test/queries/0_stateless/01023_materialized_view_query_context.reference
-%%DATADIR%%-test/queries/0_stateless/01023_materialized_view_query_context.sql
-%%DATADIR%%-test/queries/0_stateless/01024__getScalar.reference
-%%DATADIR%%-test/queries/0_stateless/01024__getScalar.sql
-%%DATADIR%%-test/queries/0_stateless/01025_array_compact_generic.reference
-%%DATADIR%%-test/queries/0_stateless/01025_array_compact_generic.sql
+%%DATADIR%%-test/queries/0_stateless/00511_get_size_of_enum.reference
+%%DATADIR%%-test/queries/0_stateless/01320_create_sync_race_condition_zookeeper.reference
+%%DATADIR%%-test/queries/0_stateless/01622_constraints_simple_optimization.reference
+%%DATADIR%%-test/queries/0_stateless/00719_parallel_ddl_db.sh
+%%DATADIR%%-test/queries/0_stateless/01510_format_regexp_raw_low_cardinality.sh
+%%DATADIR%%-test/queries/0_stateless/01783_parallel_formatting_memory.reference
+%%DATADIR%%-test/queries/0_stateless/00562_in_subquery_merge_tree.reference
+%%DATADIR%%-test/queries/0_stateless/02160_h3_cell_area_rads2.reference
+%%DATADIR%%-test/queries/0_stateless/01710_projections_group_by_no_key.reference
+%%DATADIR%%-test/queries/0_stateless/01013_repeat_function.sql
+%%DATADIR%%-test/queries/0_stateless/00680_duplicate_columns_inside_union_all.reference
+%%DATADIR%%-test/queries/0_stateless/00927_asof_join_noninclusive.sql
+%%DATADIR%%-test/queries/0_stateless/01279_dist_group_by.reference
+%%DATADIR%%-test/queries/0_stateless/00910_zookeeper_test_alter_compression_codecs_long.reference
+%%DATADIR%%-test/queries/0_stateless/01658_substring_ubsan.sql
+%%DATADIR%%-test/queries/0_stateless/01201_drop_column_compact_part_replicated_zookeeper_long.sql
+%%DATADIR%%-test/queries/0_stateless/01922_sum_null_for_remote.sql
+%%DATADIR%%-test/queries/0_stateless/00933_test_fix_extra_seek_on_compressed_cache.sh
+%%DATADIR%%-test/queries/0_stateless/01188_attach_table_from_path.reference
+%%DATADIR%%-test/queries/0_stateless/00439_fixed_string_filter.reference
+%%DATADIR%%-test/queries/0_stateless/00700_decimal_in_keys.sql
+%%DATADIR%%-test/queries/0_stateless/01079_bit_operations_using_bitset.sql
+%%DATADIR%%-test/queries/0_stateless/01358_constexpr_constraint.sql
+%%DATADIR%%-test/queries/0_stateless/01747_transform_empty_arrays.reference
+%%DATADIR%%-test/queries/0_stateless/00601_kill_running_query.reference
+%%DATADIR%%-test/queries/0_stateless/00916_add_materialized_column_after.reference
+%%DATADIR%%-test/queries/0_stateless/00027_argMinMax.reference
+%%DATADIR%%-test/queries/0_stateless/02051_symlinks_to_user_files.sh
+%%DATADIR%%-test/queries/0_stateless/01245_distributed_group_by_no_merge_with-extremes_and_totals.reference
+%%DATADIR%%-test/queries/0_stateless/01655_plan_optimizations.reference
+%%DATADIR%%-test/queries/0_stateless/01414_mutations_and_errors.sql
+%%DATADIR%%-test/queries/0_stateless/02133_final_prewhere_where_lowcardinality_replacing.sql
+%%DATADIR%%-test/queries/0_stateless/00960_live_view_watch_events_live.reference
+%%DATADIR%%-test/queries/0_stateless/01422_map_skip_null.sql
+%%DATADIR%%-test/queries/0_stateless/00980_alter_settings_race.sh
+%%DATADIR%%-test/queries/0_stateless/00150_with_totals_and_join.sql
+%%DATADIR%%-test/queries/0_stateless/01860_Distributed__shard_num_GROUP_BY.sql
+%%DATADIR%%-test/queries/0_stateless/02000_join_on_const.sql
+%%DATADIR%%-test/queries/0_stateless/01039_row_policy_dcl.reference
+%%DATADIR%%-test/queries/0_stateless/01508_explain_header.reference
+%%DATADIR%%-test/queries/0_stateless/00004_shard_format_ast_and_remote_table.sql
 %%DATADIR%%-test/queries/0_stateless/01026_char_utf8.reference
-%%DATADIR%%-test/queries/0_stateless/01026_char_utf8.sql
-%%DATADIR%%-test/queries/0_stateless/01029_early_constant_folding.reference
-%%DATADIR%%-test/queries/0_stateless/01029_early_constant_folding.sql
-%%DATADIR%%-test/queries/0_stateless/01030_concatenate_equal_fixed_strings.reference
-%%DATADIR%%-test/queries/0_stateless/01030_concatenate_equal_fixed_strings.sql
-%%DATADIR%%-test/queries/0_stateless/01030_final_mark_empty_primary_key.reference
-%%DATADIR%%-test/queries/0_stateless/01030_final_mark_empty_primary_key.sql
-%%DATADIR%%-test/queries/0_stateless/01030_incorrect_count_summing_merge_tree.reference
-%%DATADIR%%-test/queries/0_stateless/01030_incorrect_count_summing_merge_tree.sql
-%%DATADIR%%-test/queries/0_stateless/01030_limit_by_with_ties_error.reference
-%%DATADIR%%-test/queries/0_stateless/01030_limit_by_with_ties_error.sh
-%%DATADIR%%-test/queries/0_stateless/01030_storage_hdfs_syntax.reference
-%%DATADIR%%-test/queries/0_stateless/01030_storage_hdfs_syntax.sql
-%%DATADIR%%-test/queries/0_stateless/01030_storage_set_supports_read.reference
-%%DATADIR%%-test/queries/0_stateless/01030_storage_set_supports_read.sql
-%%DATADIR%%-test/queries/0_stateless/01030_storage_url_syntax.reference
-%%DATADIR%%-test/queries/0_stateless/01030_storage_url_syntax.sql
-%%DATADIR%%-test/queries/0_stateless/01031_mutations_interpreter_and_context.reference
-%%DATADIR%%-test/queries/0_stateless/01031_mutations_interpreter_and_context.sh
-%%DATADIR%%-test/queries/0_stateless/01031_new_any_join.reference
-%%DATADIR%%-test/queries/0_stateless/01031_new_any_join.sql
-%%DATADIR%%-test/queries/0_stateless/01031_pmj_new_any_semi_join.reference
-%%DATADIR%%-test/queries/0_stateless/01031_pmj_new_any_semi_join.sql
-%%DATADIR%%-test/queries/0_stateless/01031_semi_anti_join.reference
-%%DATADIR%%-test/queries/0_stateless/01031_semi_anti_join.sql
-%%DATADIR%%-test/queries/0_stateless/01032_cityHash64_for_UUID.reference
-%%DATADIR%%-test/queries/0_stateless/01032_cityHash64_for_UUID.sql
-%%DATADIR%%-test/queries/0_stateless/01032_cityHash64_for_decimal.reference
-%%DATADIR%%-test/queries/0_stateless/01032_cityHash64_for_decimal.sql
-%%DATADIR%%-test/queries/0_stateless/01032_duplicate_column_insert_query.reference
-%%DATADIR%%-test/queries/0_stateless/01032_duplicate_column_insert_query.sql
+%%DATADIR%%-test/queries/0_stateless/00962_live_view_periodic_refresh.reference
+%%DATADIR%%-test/queries/0_stateless/01115_join_with_dictionary.reference
+%%DATADIR%%-test/queries/0_stateless/01801_dateDiff_DateTime64.reference
+%%DATADIR%%-test/queries/0_stateless/01017_tsv_empty_as_default.reference
+%%DATADIR%%-test/queries/0_stateless/01671_ddl_hang_timeout_long.reference
+%%DATADIR%%-test/queries/0_stateless/01657_test_toHour_mysql_compatibility.sql
+%%DATADIR%%-test/queries/0_stateless/00740_database_in_nested_view.reference
+%%DATADIR%%-test/queries/0_stateless/00808_array_enumerate_segfault.sql
+%%DATADIR%%-test/queries/0_stateless/00612_shard_count.reference
+%%DATADIR%%-test/queries/0_stateless/00754_first_significant_subdomain_more.sql
+%%DATADIR%%-test/queries/0_stateless/00710_array_enumerate_dense.reference
+%%DATADIR%%-test/queries/0_stateless/00973_uniq_non_associativity.sql
+%%DATADIR%%-test/queries/0_stateless/00394_replaceall_vector_fixed.sql
+%%DATADIR%%-test/queries/0_stateless/00131_set_hashed.reference
+%%DATADIR%%-test/queries/0_stateless/00955_complex_prepared_statements.sh
+%%DATADIR%%-test/queries/0_stateless/01518_nullable_aggregate_states2.reference
+%%DATADIR%%-test/queries/0_stateless/01592_toUnixTimestamp_Date.reference
+%%DATADIR%%-test/queries/0_stateless/00343_array_element_generic.sql
+%%DATADIR%%-test/queries/0_stateless/01070_modify_ttl_recalc_only.sql
+%%DATADIR%%-test/queries/0_stateless/01281_alter_rename_and_other_renames.reference
+%%DATADIR%%-test/queries/0_stateless/00844_join_lightee2.sql
+%%DATADIR%%-test/queries/0_stateless/01661_extract_all_groups_throw_fast.reference
+%%DATADIR%%-test/queries/0_stateless/00731_long_merge_tree_select_opened_files.sh
+%%DATADIR%%-test/queries/0_stateless/00585_union_all_subquery_aggregation_column_removal.sql
+%%DATADIR%%-test/queries/0_stateless/00979_live_view_watch_continuous_aggregates.reference
+%%DATADIR%%-test/queries/0_stateless/01621_summap_check_types.sql
+%%DATADIR%%-test/queries/0_stateless/00467_qualified_names.sql
+%%DATADIR%%-test/queries/0_stateless/00413_least_greatest_new_behavior.reference
+%%DATADIR%%-test/queries/0_stateless/02014_dict_get_nullable_key.reference
+%%DATADIR%%-test/queries/0_stateless/00374_any_last_if_merge.reference
+%%DATADIR%%-test/queries/0_stateless/01732_more_consistent_datetime64_parsing.reference
 %%DATADIR%%-test/queries/0_stateless/01033_dictionaries_lifetime.reference
-%%DATADIR%%-test/queries/0_stateless/01033_dictionaries_lifetime.sql
-%%DATADIR%%-test/queries/0_stateless/01033_quota_dcl.reference
-%%DATADIR%%-test/queries/0_stateless/01033_quota_dcl.sql
-%%DATADIR%%-test/queries/0_stateless/01033_storage_odbc_parsing_exception_check.reference
-%%DATADIR%%-test/queries/0_stateless/01033_storage_odbc_parsing_exception_check.sql
-%%DATADIR%%-test/queries/0_stateless/01033_substr_negative_size_arg.reference
-%%DATADIR%%-test/queries/0_stateless/01033_substr_negative_size_arg.sql
-%%DATADIR%%-test/queries/0_stateless/01034_JSONCompactEachRow.reference
-%%DATADIR%%-test/queries/0_stateless/01034_JSONCompactEachRow.sql
-%%DATADIR%%-test/queries/0_stateless/01034_move_partition_from_table_zookeeper.reference
-%%DATADIR%%-test/queries/0_stateless/01034_move_partition_from_table_zookeeper.sh
-%%DATADIR%%-test/queries/0_stateless/01034_order_by_pk_prefix.reference
-%%DATADIR%%-test/queries/0_stateless/01034_order_by_pk_prefix.sql
-%%DATADIR%%-test/queries/0_stateless/01034_prewhere_max_parallel_replicas_distributed.reference
-%%DATADIR%%-test/queries/0_stateless/01034_prewhere_max_parallel_replicas_distributed.sql
-%%DATADIR%%-test/queries/0_stateless/01034_sample_final_distributed.reference
-%%DATADIR%%-test/queries/0_stateless/01034_sample_final_distributed.sql
-%%DATADIR%%-test/queries/0_stateless/01034_unknown_qualified_column_in_join.reference
-%%DATADIR%%-test/queries/0_stateless/01034_unknown_qualified_column_in_join.sql
-%%DATADIR%%-test/queries/0_stateless/01034_values_parse_float_bug.reference
-%%DATADIR%%-test/queries/0_stateless/01034_values_parse_float_bug.sh
-%%DATADIR%%-test/queries/0_stateless/01034_with_fill_and_push_down_predicate.reference
-%%DATADIR%%-test/queries/0_stateless/01034_with_fill_and_push_down_predicate.sql
-%%DATADIR%%-test/queries/0_stateless/01035_avg.reference
-%%DATADIR%%-test/queries/0_stateless/01035_avg.sql
-%%DATADIR%%-test/queries/0_stateless/01035_avg_weighted_long.reference
-%%DATADIR%%-test/queries/0_stateless/01035_avg_weighted_long.sh
-%%DATADIR%%-test/queries/0_stateless/01035_concurrent_move_partition_from_table_zookeeper.reference
-%%DATADIR%%-test/queries/0_stateless/01035_concurrent_move_partition_from_table_zookeeper.sh
-%%DATADIR%%-test/queries/0_stateless/01035_enum_conversion_native_format.reference
-%%DATADIR%%-test/queries/0_stateless/01035_enum_conversion_native_format.sh
-%%DATADIR%%-test/queries/0_stateless/01035_lc_empty_part_bug.reference
-%%DATADIR%%-test/queries/0_stateless/01035_lc_empty_part_bug.sh
-%%DATADIR%%-test/queries/0_stateless/01035_prewhere_with_alias.reference
-%%DATADIR%%-test/queries/0_stateless/01035_prewhere_with_alias.sql
-%%DATADIR%%-test/queries/0_stateless/01036_no_superfluous_dict_reload_on_create_database.reference
-%%DATADIR%%-test/queries/0_stateless/01036_no_superfluous_dict_reload_on_create_database.sql
-%%DATADIR%%-test/queries/0_stateless/01036_no_superfluous_dict_reload_on_create_database_2.reference
-%%DATADIR%%-test/queries/0_stateless/01036_no_superfluous_dict_reload_on_create_database_2.sql
-%%DATADIR%%-test/queries/0_stateless/01036_union_different_columns.reference
-%%DATADIR%%-test/queries/0_stateless/01036_union_different_columns.sql
-%%DATADIR%%-test/queries/0_stateless/01037_polygon_dicts_correctness_all.ans
-%%DATADIR%%-test/queries/0_stateless/01037_polygon_dicts_correctness_all.reference
-%%DATADIR%%-test/queries/0_stateless/01037_polygon_dicts_correctness_all.sh
-%%DATADIR%%-test/queries/0_stateless/01037_polygon_dicts_correctness_fast.ans
-%%DATADIR%%-test/queries/0_stateless/01037_polygon_dicts_correctness_fast.reference
-%%DATADIR%%-test/queries/0_stateless/01037_polygon_dicts_correctness_fast.sh
-%%DATADIR%%-test/queries/0_stateless/01037_polygon_dicts_simple_functions.ans
-%%DATADIR%%-test/queries/0_stateless/01037_polygon_dicts_simple_functions.reference
-%%DATADIR%%-test/queries/0_stateless/01037_polygon_dicts_simple_functions.sh
-%%DATADIR%%-test/queries/0_stateless/01037_test_data_perf.tar.gz
-%%DATADIR%%-test/queries/0_stateless/01037_test_data_search.tar.gz
-%%DATADIR%%-test/queries/0_stateless/01037_zookeeper_check_table_empty_pk.reference
-%%DATADIR%%-test/queries/0_stateless/01037_zookeeper_check_table_empty_pk.sql
-%%DATADIR%%-test/queries/0_stateless/01038_array_of_unnamed_tuples.reference
-%%DATADIR%%-test/queries/0_stateless/01038_array_of_unnamed_tuples.sql
-%%DATADIR%%-test/queries/0_stateless/01038_dictionary_lifetime_min_zero_sec.reference
-%%DATADIR%%-test/queries/0_stateless/01038_dictionary_lifetime_min_zero_sec.sh
-%%DATADIR%%-test/queries/0_stateless/01039_mergetree_exec_time.reference
-%%DATADIR%%-test/queries/0_stateless/01039_mergetree_exec_time.sql
-%%DATADIR%%-test/queries/0_stateless/01039_row_policy_dcl.reference
-%%DATADIR%%-test/queries/0_stateless/01039_row_policy_dcl.sh
-%%DATADIR%%-test/queries/0_stateless/01039_test_setting_parse.reference
-%%DATADIR%%-test/queries/0_stateless/01039_test_setting_parse.sql
-%%DATADIR%%-test/queries/0_stateless/01040_dictionary_invalidate_query_switchover_long.reference
-%%DATADIR%%-test/queries/0_stateless/01040_dictionary_invalidate_query_switchover_long.sh
-%%DATADIR%%-test/queries/0_stateless/01040_distributed_directory_monitor_batch_inserts.reference
-%%DATADIR%%-test/queries/0_stateless/01040_distributed_directory_monitor_batch_inserts.sql
-%%DATADIR%%-test/queries/0_stateless/01040_h3_get_resolution.reference
-%%DATADIR%%-test/queries/0_stateless/01040_h3_get_resolution.sql
-%%DATADIR%%-test/queries/0_stateless/01041_create_dictionary_if_not_exists.reference
-%%DATADIR%%-test/queries/0_stateless/01041_create_dictionary_if_not_exists.sql
-%%DATADIR%%-test/queries/0_stateless/01041_h3_is_valid.reference
-%%DATADIR%%-test/queries/0_stateless/01041_h3_is_valid.sql
-%%DATADIR%%-test/queries/0_stateless/01042_check_query_and_last_granule_size.reference
-%%DATADIR%%-test/queries/0_stateless/01042_check_query_and_last_granule_size.sql
-%%DATADIR%%-test/queries/0_stateless/01042_h3_k_ring.reference
-%%DATADIR%%-test/queries/0_stateless/01042_h3_k_ring.sql
-%%DATADIR%%-test/queries/0_stateless/01042_system_reload_dictionary_reloads_completely.reference
-%%DATADIR%%-test/queries/0_stateless/01042_system_reload_dictionary_reloads_completely.sh
-%%DATADIR%%-test/queries/0_stateless/01043_categorical_iv.reference
-%%DATADIR%%-test/queries/0_stateless/01043_categorical_iv.sql
-%%DATADIR%%-test/queries/0_stateless/01043_dictionary_attribute_properties_values.reference
-%%DATADIR%%-test/queries/0_stateless/01043_dictionary_attribute_properties_values.sql
-%%DATADIR%%-test/queries/0_stateless/01043_geo_distance.reference
-%%DATADIR%%-test/queries/0_stateless/01043_geo_distance.sql
-%%DATADIR%%-test/queries/0_stateless/01043_h3_edge_length_m.reference
-%%DATADIR%%-test/queries/0_stateless/01043_h3_edge_length_m.sql
-%%DATADIR%%-test/queries/0_stateless/01044_great_circle_angle.reference
-%%DATADIR%%-test/queries/0_stateless/01044_great_circle_angle.sql
-%%DATADIR%%-test/queries/0_stateless/01044_h3_edge_angle.reference
+%%DATADIR%%-test/queries/0_stateless/00253_insert_recursive_defaults.reference
+%%DATADIR%%-test/queries/0_stateless/00583_limit_by_expressions.reference
+%%DATADIR%%-test/queries/0_stateless/01543_avro_deserialization_with_lc.sh
+%%DATADIR%%-test/queries/0_stateless/01009_insert_select_data_loss.reference
+%%DATADIR%%-test/queries/0_stateless/01585_use_index_for_global_in.sql
+%%DATADIR%%-test/queries/0_stateless/01455_shard_leaf_max_rows_bytes_to_read.reference
+%%DATADIR%%-test/queries/0_stateless/00691_array_distinct.sql
+%%DATADIR%%-test/queries/0_stateless/01657_array_element_ubsan.reference
+%%DATADIR%%-test/queries/0_stateless/01101_literal_column_clash.reference
+%%DATADIR%%-test/queries/0_stateless/01428_nullable_asof_join.sql
+%%DATADIR%%-test/queries/0_stateless/00405_pretty_formats.reference
+%%DATADIR%%-test/queries/0_stateless/01084_defaults_on_aliases.reference
+%%DATADIR%%-test/queries/0_stateless/00324_hashing_enums.sql
+%%DATADIR%%-test/queries/0_stateless/01667_aes_args_check.sql
+%%DATADIR%%-test/queries/0_stateless/01030_incorrect_count_summing_merge_tree.reference
+%%DATADIR%%-test/queries/0_stateless/01106_const_fixed_string_like.sql
+%%DATADIR%%-test/queries/0_stateless/00452_left_array_join_and_nullable.reference
+%%DATADIR%%-test/queries/0_stateless/00679_uuid_in_key.sql
+%%DATADIR%%-test/queries/0_stateless/01280_ttl_where_group_by.reference
+%%DATADIR%%-test/queries/0_stateless/01465_ttl_recompression.sql
+%%DATADIR%%-test/queries/0_stateless/00349_visible_width.reference
+%%DATADIR%%-test/queries/0_stateless/00964_live_view_watch_events_heartbeat.reference
+%%DATADIR%%-test/queries/0_stateless/00451_left_array_join_and_constants.reference
+%%DATADIR%%-test/queries/0_stateless/01154_move_partition_long.reference
+%%DATADIR%%-test/queries/0_stateless/00900_entropy_shard.sql
+%%DATADIR%%-test/queries/0_stateless/01020_having_without_group_by.reference
+%%DATADIR%%-test/queries/0_stateless/00260_like_and_curly_braces.reference
+%%DATADIR%%-test/queries/0_stateless/01763_long_ttl_group_by.reference
 %%DATADIR%%-test/queries/0_stateless/01044_h3_edge_angle.sql
-%%DATADIR%%-test/queries/0_stateless/01045_array_zip.reference
-%%DATADIR%%-test/queries/0_stateless/01045_array_zip.sql
-%%DATADIR%%-test/queries/0_stateless/01045_bloom_filter_null_array.reference
-%%DATADIR%%-test/queries/0_stateless/01045_bloom_filter_null_array.sql
-%%DATADIR%%-test/queries/0_stateless/01045_dictionaries_restrictions.reference
-%%DATADIR%%-test/queries/0_stateless/01045_dictionaries_restrictions.sql
-%%DATADIR%%-test/queries/0_stateless/01045_order_by_pk_special_storages.reference
-%%DATADIR%%-test/queries/0_stateless/01045_order_by_pk_special_storages.sh
-%%DATADIR%%-test/queries/0_stateless/01045_zookeeper_system_mutations_with_parts_names.reference
-%%DATADIR%%-test/queries/0_stateless/01045_zookeeper_system_mutations_with_parts_names.sh
-%%DATADIR%%-test/queries/0_stateless/01046_materialized_view_with_join_over_distributed.reference
-%%DATADIR%%-test/queries/0_stateless/01046_materialized_view_with_join_over_distributed.sql
-%%DATADIR%%-test/queries/0_stateless/01046_trivial_count_query_distributed.reference
-%%DATADIR%%-test/queries/0_stateless/01046_trivial_count_query_distributed.sql
-%%DATADIR%%-test/queries/0_stateless/01047_no_alias_columns_with_table_aliases.reference
-%%DATADIR%%-test/queries/0_stateless/01047_no_alias_columns_with_table_aliases.sql
-%%DATADIR%%-test/queries/0_stateless/01047_nullable_rand.reference
-%%DATADIR%%-test/queries/0_stateless/01047_nullable_rand.sql
-%%DATADIR%%-test/queries/0_stateless/01047_simple_aggregate_sizes_of_columns_bug.reference
-%%DATADIR%%-test/queries/0_stateless/01047_simple_aggregate_sizes_of_columns_bug.sql
-%%DATADIR%%-test/queries/0_stateless/01048_exists_query.reference
-%%DATADIR%%-test/queries/0_stateless/01048_exists_query.sql
-%%DATADIR%%-test/queries/0_stateless/01049_join_low_card_bug_long.reference
-%%DATADIR%%-test/queries/0_stateless/01049_join_low_card_bug_long.sql
-%%DATADIR%%-test/queries/0_stateless/01049_join_low_card_crash.reference
-%%DATADIR%%-test/queries/0_stateless/01049_join_low_card_crash.sql
-%%DATADIR%%-test/queries/0_stateless/01049_zookeeper_synchronous_mutations.reference
-%%DATADIR%%-test/queries/0_stateless/01049_zookeeper_synchronous_mutations.sql
-%%DATADIR%%-test/queries/0_stateless/01050_clickhouse_dict_source_with_subquery.reference
-%%DATADIR%%-test/queries/0_stateless/01050_clickhouse_dict_source_with_subquery.sql
-%%DATADIR%%-test/queries/0_stateless/01050_engine_join_crash.reference
-%%DATADIR%%-test/queries/0_stateless/01050_engine_join_crash.sql
-%%DATADIR%%-test/queries/0_stateless/01050_engine_join_view_crash.reference
-%%DATADIR%%-test/queries/0_stateless/01050_engine_join_view_crash.sql
-%%DATADIR%%-test/queries/0_stateless/01050_group_array_sample.reference
-%%DATADIR%%-test/queries/0_stateless/01050_group_array_sample.sql
-%%DATADIR%%-test/queries/0_stateless/01051_aggregate_function_crash.reference
-%%DATADIR%%-test/queries/0_stateless/01051_aggregate_function_crash.sql
-%%DATADIR%%-test/queries/0_stateless/01051_all_join_engine.reference
-%%DATADIR%%-test/queries/0_stateless/01051_all_join_engine.sql
-%%DATADIR%%-test/queries/0_stateless/01051_new_any_join_engine.reference
-%%DATADIR%%-test/queries/0_stateless/01051_new_any_join_engine.sql
-%%DATADIR%%-test/queries/0_stateless/01051_random_printable_ascii.reference
-%%DATADIR%%-test/queries/0_stateless/01051_random_printable_ascii.sql
-%%DATADIR%%-test/queries/0_stateless/01051_same_name_alias_with_joins.reference
-%%DATADIR%%-test/queries/0_stateless/01051_same_name_alias_with_joins.sql
-%%DATADIR%%-test/queries/0_stateless/01051_scalar_optimization.reference
-%%DATADIR%%-test/queries/0_stateless/01051_scalar_optimization.sql
-%%DATADIR%%-test/queries/0_stateless/01051_system_stack_trace.reference
-%%DATADIR%%-test/queries/0_stateless/01051_system_stack_trace.sql
-%%DATADIR%%-test/queries/0_stateless/01052_array_reduce_exception.reference
-%%DATADIR%%-test/queries/0_stateless/01052_array_reduce_exception.sql
-%%DATADIR%%-test/queries/0_stateless/01052_compression_buffer_overrun.reference
-%%DATADIR%%-test/queries/0_stateless/01052_compression_buffer_overrun.sh
-%%DATADIR%%-test/queries/0_stateless/01053_drop_database_mat_view.reference
-%%DATADIR%%-test/queries/0_stateless/01053_drop_database_mat_view.sql
-%%DATADIR%%-test/queries/0_stateless/01053_if_chain_check.reference
-%%DATADIR%%-test/queries/0_stateless/01053_if_chain_check.sql
-%%DATADIR%%-test/queries/0_stateless/01053_ssd_dictionary.reference
-%%DATADIR%%-test/queries/0_stateless/01053_ssd_dictionary.sh
-%%DATADIR%%-test/queries/0_stateless/01054_cache_dictionary_bunch_update.reference
-%%DATADIR%%-test/queries/0_stateless/01054_cache_dictionary_bunch_update.sh
-%%DATADIR%%-test/queries/0_stateless/01054_cache_dictionary_overflow_cell.reference
-%%DATADIR%%-test/queries/0_stateless/01054_cache_dictionary_overflow_cell.sql
-%%DATADIR%%-test/queries/0_stateless/01054_random_printable_ascii_ubsan.reference
-%%DATADIR%%-test/queries/0_stateless/01054_random_printable_ascii_ubsan.sh
-%%DATADIR%%-test/queries/0_stateless/01055_compact_parts.reference
-%%DATADIR%%-test/queries/0_stateless/01055_compact_parts.sql
-%%DATADIR%%-test/queries/0_stateless/01055_compact_parts_1.reference
-%%DATADIR%%-test/queries/0_stateless/01055_compact_parts_1.sql
-%%DATADIR%%-test/queries/0_stateless/01055_compact_parts_granularity.reference
-%%DATADIR%%-test/queries/0_stateless/01055_compact_parts_granularity.sh
-%%DATADIR%%-test/queries/0_stateless/01055_minmax_index_compact_parts.reference
-%%DATADIR%%-test/queries/0_stateless/01055_minmax_index_compact_parts.sh
-%%DATADIR%%-test/queries/0_stateless/01055_prewhere_bugs.reference
-%%DATADIR%%-test/queries/0_stateless/01055_prewhere_bugs.sql
-%%DATADIR%%-test/queries/0_stateless/01056_create_table_as.reference
-%%DATADIR%%-test/queries/0_stateless/01056_create_table_as.sql
-%%DATADIR%%-test/queries/0_stateless/01056_negative_with_bloom_filter.reference
-%%DATADIR%%-test/queries/0_stateless/01056_negative_with_bloom_filter.sql
-%%DATADIR%%-test/queries/0_stateless/01056_predicate_optimizer_bugs.reference
-%%DATADIR%%-test/queries/0_stateless/01056_predicate_optimizer_bugs.sql
-%%DATADIR%%-test/queries/0_stateless/01056_prepared_statements_null_and_escaping.reference
-%%DATADIR%%-test/queries/0_stateless/01056_prepared_statements_null_and_escaping.sh
-%%DATADIR%%-test/queries/0_stateless/01057_http_compression_prefer_brotli.reference
-%%DATADIR%%-test/queries/0_stateless/01057_http_compression_prefer_brotli.sh
-%%DATADIR%%-test/queries/0_stateless/01058_zlib_ng_level1_bug.reference
-%%DATADIR%%-test/queries/0_stateless/01058_zlib_ng_level1_bug.sh
-%%DATADIR%%-test/queries/0_stateless/01059_storage_file_brotli.reference
-%%DATADIR%%-test/queries/0_stateless/01059_storage_file_brotli.sql
-%%DATADIR%%-test/queries/0_stateless/01060_avro.reference
-%%DATADIR%%-test/queries/0_stateless/01060_avro.sh
-%%DATADIR%%-test/queries/0_stateless/01060_defaults_all_columns.reference
-%%DATADIR%%-test/queries/0_stateless/01060_defaults_all_columns.sql
-%%DATADIR%%-test/queries/0_stateless/01060_shutdown_table_after_detach.reference
-%%DATADIR%%-test/queries/0_stateless/01060_shutdown_table_after_detach.sql
-%%DATADIR%%-test/queries/0_stateless/01060_substring_negative_size.reference
-%%DATADIR%%-test/queries/0_stateless/01060_substring_negative_size.sql
-%%DATADIR%%-test/queries/0_stateless/01061_alter_codec_with_type.reference
-%%DATADIR%%-test/queries/0_stateless/01061_alter_codec_with_type.sql
-%%DATADIR%%-test/queries/0_stateless/01062_alter_on_mutataion_zookeeper.reference
-%%DATADIR%%-test/queries/0_stateless/01062_alter_on_mutataion_zookeeper.sql
-%%DATADIR%%-test/queries/0_stateless/01062_max_parser_depth.reference
-%%DATADIR%%-test/queries/0_stateless/01062_max_parser_depth.sh
-%%DATADIR%%-test/queries/0_stateless/01062_pm_all_join_with_block_continuation.reference
-%%DATADIR%%-test/queries/0_stateless/01062_pm_all_join_with_block_continuation.sql
-%%DATADIR%%-test/queries/0_stateless/01062_pm_multiple_all_join_same_value.reference
-%%DATADIR%%-test/queries/0_stateless/01062_pm_multiple_all_join_same_value.sql
-%%DATADIR%%-test/queries/0_stateless/01063_create_column_set.reference
-%%DATADIR%%-test/queries/0_stateless/01063_create_column_set.sql
-%%DATADIR%%-test/queries/0_stateless/01064_array_auc.reference
-%%DATADIR%%-test/queries/0_stateless/01064_array_auc.sql
-%%DATADIR%%-test/queries/0_stateless/01064_incremental_streaming_from_2_src_with_feedback.reference
-%%DATADIR%%-test/queries/0_stateless/01064_incremental_streaming_from_2_src_with_feedback.sql
-%%DATADIR%%-test/queries/0_stateless/01064_pm_all_join_const_and_nullable.reference
-%%DATADIR%%-test/queries/0_stateless/01064_pm_all_join_const_and_nullable.sql
-%%DATADIR%%-test/queries/0_stateless/01065_array_zip_mixed_const.reference
-%%DATADIR%%-test/queries/0_stateless/01065_array_zip_mixed_const.sql
-%%DATADIR%%-test/queries/0_stateless/01065_if_not_finite.reference
-%%DATADIR%%-test/queries/0_stateless/01065_if_not_finite.sql
-%%DATADIR%%-test/queries/0_stateless/01066_bit_count.reference
-%%DATADIR%%-test/queries/0_stateless/01066_bit_count.sql
-%%DATADIR%%-test/queries/0_stateless/01067_join_null.reference
-%%DATADIR%%-test/queries/0_stateless/01067_join_null.sql
-%%DATADIR%%-test/queries/0_stateless/01068_parens.reference
-%%DATADIR%%-test/queries/0_stateless/01068_parens.sql
-%%DATADIR%%-test/queries/0_stateless/01069_database_memory.reference
-%%DATADIR%%-test/queries/0_stateless/01069_database_memory.sql
-%%DATADIR%%-test/queries/0_stateless/01069_insert_float_as_nullable_unit8.reference
-%%DATADIR%%-test/queries/0_stateless/01069_insert_float_as_nullable_unit8.sql
-%%DATADIR%%-test/queries/0_stateless/01069_materialized_view_alter_target_table.reference
-%%DATADIR%%-test/queries/0_stateless/01069_materialized_view_alter_target_table.sql
-%%DATADIR%%-test/queries/0_stateless/01069_materialized_view_alter_target_table_with_default_expression.reference
-%%DATADIR%%-test/queries/0_stateless/01069_materialized_view_alter_target_table_with_default_expression.sql
-%%DATADIR%%-test/queries/0_stateless/01069_set_in_group_by.reference
-%%DATADIR%%-test/queries/0_stateless/01069_set_in_group_by.sql
-%%DATADIR%%-test/queries/0_stateless/01070_alter_with_ttl.reference
-%%DATADIR%%-test/queries/0_stateless/01070_alter_with_ttl.sql
-%%DATADIR%%-test/queries/0_stateless/01070_exception_code_in_query_log_table.reference
+%%DATADIR%%-test/queries/0_stateless/02032_short_circuit_least_greatest_bug.sql
+%%DATADIR%%-test/queries/0_stateless/02025_having_filter_column.sql
+%%DATADIR%%-test/queries/0_stateless/00129_quantile_timing_weighted.sql
+%%DATADIR%%-test/queries/0_stateless/01925_json_as_string_data_in_square_brackets.reference
+%%DATADIR%%-test/queries/0_stateless/00397_tsv_format_synonym.sql
+%%DATADIR%%-test/queries/0_stateless/01851_hedged_connections_external_tables.sql
+%%DATADIR%%-test/queries/0_stateless/02116_clickhouse_stderr.reference
+%%DATADIR%%-test/queries/0_stateless/00976_ttl_with_old_parts.sql
+%%DATADIR%%-test/queries/0_stateless/00974_final_predicate_push_down.reference
+%%DATADIR%%-test/queries/0_stateless/01323_too_many_threads_bug.reference
+%%DATADIR%%-test/queries/0_stateless/01620_fix_simple_state_arg_type.sql
+%%DATADIR%%-test/queries/0_stateless/01560_optimize_on_insert_long.reference
+%%DATADIR%%-test/queries/0_stateless/00212_long_shard_aggregate_function_uniq.reference
+%%DATADIR%%-test/queries/0_stateless/01019_array_fill.sql
+%%DATADIR%%-test/queries/0_stateless/00837_insert_select_and_read_prefix.sql
+%%DATADIR%%-test/queries/0_stateless/00933_reserved_word.sql
+%%DATADIR%%-test/queries/0_stateless/02115_write_buffers_finalize.reference
+%%DATADIR%%-test/queries/0_stateless/01602_temporary_table_in_system_tables.reference
+%%DATADIR%%-test/queries/0_stateless/01313_parse_date_time_best_effort_null_zero.reference
+%%DATADIR%%-test/queries/0_stateless/01253_subquery_in_aggregate_function_JustStranger.sql
+%%DATADIR%%-test/queries/0_stateless/00746_compile_non_deterministic_function.reference
+%%DATADIR%%-test/queries/0_stateless/01945_system_warnings.reference
+%%DATADIR%%-test/queries/0_stateless/00961_checksums_in_system_parts_columns_table.reference
+%%DATADIR%%-test/queries/0_stateless/01528_clickhouse_local_prepare_parts.reference
+%%DATADIR%%-test/queries/0_stateless/00222_sequence_aggregate_function_family.sql
+%%DATADIR%%-test/queries/0_stateless/01861_explain_pipeline.reference
+%%DATADIR%%-test/queries/0_stateless/01586_storage_join_low_cardinality_key.reference
+%%DATADIR%%-test/queries/0_stateless/00195_shard_union_all_and_global_in.reference
+%%DATADIR%%-test/queries/0_stateless/02012_compress_lz4.reference
+%%DATADIR%%-test/queries/0_stateless/01582_any_join_supertype.reference
+%%DATADIR%%-test/queries/0_stateless/02113_format_row.reference
+%%DATADIR%%-test/queries/0_stateless/00595_insert_into_view.sh
+%%DATADIR%%-test/queries/0_stateless/01501_clickhouse_client_INSERT_exception.sh
+%%DATADIR%%-test/queries/0_stateless/00984_parser_stack_overflow.reference
+%%DATADIR%%-test/queries/0_stateless/02014_dict_get_nullable_key.sql
+%%DATADIR%%-test/queries/0_stateless/00909_arrayEnumerateUniq.reference
+%%DATADIR%%-test/queries/0_stateless/00609_distributed_with_case_when_then.reference
 %%DATADIR%%-test/queries/0_stateless/01070_exception_code_in_query_log_table.sql
-%%DATADIR%%-test/queries/0_stateless/01070_h3_get_base_cell.reference
-%%DATADIR%%-test/queries/0_stateless/01070_h3_get_base_cell.sql
-%%DATADIR%%-test/queries/0_stateless/01070_h3_hex_area_m2.reference
-%%DATADIR%%-test/queries/0_stateless/01070_h3_hex_area_m2.sql
-%%DATADIR%%-test/queries/0_stateless/01070_h3_indexes_are_neighbors.reference
-%%DATADIR%%-test/queries/0_stateless/01070_h3_indexes_are_neighbors.sql
-%%DATADIR%%-test/queries/0_stateless/01070_h3_to_children.reference
-%%DATADIR%%-test/queries/0_stateless/01070_h3_to_children.sql
-%%DATADIR%%-test/queries/0_stateless/01070_h3_to_parent.reference
-%%DATADIR%%-test/queries/0_stateless/01070_h3_to_parent.sql
-%%DATADIR%%-test/queries/0_stateless/01070_h3_to_string.reference
-%%DATADIR%%-test/queries/0_stateless/01070_h3_to_string.sql
-%%DATADIR%%-test/queries/0_stateless/01070_materialize_ttl.reference
-%%DATADIR%%-test/queries/0_stateless/01070_materialize_ttl.sql
-%%DATADIR%%-test/queries/0_stateless/01070_modify_ttl.reference
-%%DATADIR%%-test/queries/0_stateless/01070_modify_ttl.sql
-%%DATADIR%%-test/queries/0_stateless/01070_mutations_with_dependencies.reference
-%%DATADIR%%-test/queries/0_stateless/01070_mutations_with_dependencies.sql
-%%DATADIR%%-test/queries/0_stateless/01070_string_to_h3.reference
-%%DATADIR%%-test/queries/0_stateless/01070_string_to_h3.sql
-%%DATADIR%%-test/queries/0_stateless/01070_template_empty_file.reference
-%%DATADIR%%-test/queries/0_stateless/01070_template_empty_file.sql
-%%DATADIR%%-test/queries/0_stateless/01070_to_decimal_or_null_exception.reference
-%%DATADIR%%-test/queries/0_stateless/01070_to_decimal_or_null_exception.sql
-%%DATADIR%%-test/queries/0_stateless/01071_force_optimize_skip_unused_shards.reference
-%%DATADIR%%-test/queries/0_stateless/01071_force_optimize_skip_unused_shards.sql
-%%DATADIR%%-test/queries/0_stateless/01071_http_header_exception_code.reference
-%%DATADIR%%-test/queries/0_stateless/01071_http_header_exception_code.sh
-%%DATADIR%%-test/queries/0_stateless/01071_in_array.reference
-%%DATADIR%%-test/queries/0_stateless/01071_in_array.sql
-%%DATADIR%%-test/queries/0_stateless/01071_live_view_detach_dependency.reference
-%%DATADIR%%-test/queries/0_stateless/01071_live_view_detach_dependency.sql
-%%DATADIR%%-test/queries/0_stateless/01071_prohibition_secondary_index_with_old_format_merge_tree.reference
-%%DATADIR%%-test/queries/0_stateless/01071_prohibition_secondary_index_with_old_format_merge_tree.sql
-%%DATADIR%%-test/queries/0_stateless/01072_drop_temporary_table_with_same_name.reference
-%%DATADIR%%-test/queries/0_stateless/01072_drop_temporary_table_with_same_name.sql
-%%DATADIR%%-test/queries/0_stateless/01072_json_each_row_data_in_square_brackets.reference
-%%DATADIR%%-test/queries/0_stateless/01072_json_each_row_data_in_square_brackets.sql
-%%DATADIR%%-test/queries/0_stateless/01072_nullable_jit.reference
-%%DATADIR%%-test/queries/0_stateless/01072_nullable_jit.sql
-%%DATADIR%%-test/queries/0_stateless/01072_optimize_skip_unused_shards_const_expr_eval.reference
-%%DATADIR%%-test/queries/0_stateless/01072_optimize_skip_unused_shards_const_expr_eval.sql
-%%DATADIR%%-test/queries/0_stateless/01072_select_constant_limit.reference
-%%DATADIR%%-test/queries/0_stateless/01072_select_constant_limit.sql
-%%DATADIR%%-test/queries/0_stateless/01073_attach_if_not_exists.reference
-%%DATADIR%%-test/queries/0_stateless/01073_attach_if_not_exists.sql
-%%DATADIR%%-test/queries/0_stateless/01073_bad_alter_partition.reference
-%%DATADIR%%-test/queries/0_stateless/01073_bad_alter_partition.sql
-%%DATADIR%%-test/queries/0_stateless/01073_blockSerializedSize.reference
-%%DATADIR%%-test/queries/0_stateless/01073_blockSerializedSize.sql
-%%DATADIR%%-test/queries/0_stateless/01073_crlf_end_of_line.reference
-%%DATADIR%%-test/queries/0_stateless/01073_crlf_end_of_line.sql
-%%DATADIR%%-test/queries/0_stateless/01073_grant_and_revoke.reference
-%%DATADIR%%-test/queries/0_stateless/01073_grant_and_revoke.sql
-%%DATADIR%%-test/queries/0_stateless/01073_show_tables_not_like.reference
-%%DATADIR%%-test/queries/0_stateless/01073_show_tables_not_like.sql
-%%DATADIR%%-test/queries/0_stateless/01074_h3_range_check.reference
-%%DATADIR%%-test/queries/0_stateless/01074_h3_range_check.sql
-%%DATADIR%%-test/queries/0_stateless/01074_partial_revokes.reference
-%%DATADIR%%-test/queries/0_stateless/01074_partial_revokes.sql
-%%DATADIR%%-test/queries/0_stateless/01075_allowed_client_hosts.reference
-%%DATADIR%%-test/queries/0_stateless/01075_allowed_client_hosts.sql
-%%DATADIR%%-test/queries/0_stateless/01075_in_arrays_enmk.reference
-%%DATADIR%%-test/queries/0_stateless/01075_in_arrays_enmk.sql
-%%DATADIR%%-test/queries/0_stateless/01076_array_join_prewhere_const_folding.reference
-%%DATADIR%%-test/queries/0_stateless/01076_array_join_prewhere_const_folding.sql
-%%DATADIR%%-test/queries/0_stateless/01076_cache_dictionary_datarace_exception_ptr.reference
-%%DATADIR%%-test/queries/0_stateless/01076_cache_dictionary_datarace_exception_ptr.sh
-%%DATADIR%%-test/queries/0_stateless/01076_json_each_row_array.reference
-%%DATADIR%%-test/queries/0_stateless/01076_json_each_row_array.sh
-%%DATADIR%%-test/queries/0_stateless/01076_parallel_alter_replicated_zookeeper.reference
-%%DATADIR%%-test/queries/0_stateless/01076_parallel_alter_replicated_zookeeper.sh
-%%DATADIR%%-test/queries/0_stateless/01076_predicate_optimizer_with_view.reference
-%%DATADIR%%-test/queries/0_stateless/01076_predicate_optimizer_with_view.sql
-%%DATADIR%%-test/queries/0_stateless/01076_range_reader_segfault.reference
-%%DATADIR%%-test/queries/0_stateless/01076_range_reader_segfault.sql
-%%DATADIR%%-test/queries/0_stateless/01077_mutations_index_consistency.reference
-%%DATADIR%%-test/queries/0_stateless/01077_mutations_index_consistency.sh
-%%DATADIR%%-test/queries/0_stateless/01077_yet_another_prewhere_test.reference
-%%DATADIR%%-test/queries/0_stateless/01077_yet_another_prewhere_test.sql
-%%DATADIR%%-test/queries/0_stateless/01078_bloom_filter_operator_not_has.reference
-%%DATADIR%%-test/queries/0_stateless/01078_bloom_filter_operator_not_has.sql
-%%DATADIR%%-test/queries/0_stateless/01078_merge_tree_read_one_thread.reference
-%%DATADIR%%-test/queries/0_stateless/01078_merge_tree_read_one_thread.sql
-%%DATADIR%%-test/queries/0_stateless/01079_alter_default_zookeeper.reference
-%%DATADIR%%-test/queries/0_stateless/01079_alter_default_zookeeper.sql
-%%DATADIR%%-test/queries/0_stateless/01079_bad_alters_zookeeper_long.reference
-%%DATADIR%%-test/queries/0_stateless/01079_bad_alters_zookeeper_long.sh
-%%DATADIR%%-test/queries/0_stateless/01079_bit_operations_using_bitset.reference
-%%DATADIR%%-test/queries/0_stateless/01079_bit_operations_using_bitset.sql
-%%DATADIR%%-test/queries/0_stateless/01079_new_range_reader_segfault.reference
-%%DATADIR%%-test/queries/0_stateless/01079_new_range_reader_segfault.sql
-%%DATADIR%%-test/queries/0_stateless/01079_order_by_pk.reference
-%%DATADIR%%-test/queries/0_stateless/01079_order_by_pk.sql
-%%DATADIR%%-test/queries/0_stateless/01079_parallel_alter_add_drop_column_zookeeper.reference
-%%DATADIR%%-test/queries/0_stateless/01079_parallel_alter_add_drop_column_zookeeper.sh
-%%DATADIR%%-test/queries/0_stateless/01079_parallel_alter_detach_table_zookeeper.reference
-%%DATADIR%%-test/queries/0_stateless/01079_parallel_alter_detach_table_zookeeper.sh
-%%DATADIR%%-test/queries/0_stateless/01079_parallel_alter_modify_zookeeper_long.reference
-%%DATADIR%%-test/queries/0_stateless/01079_parallel_alter_modify_zookeeper_long.sh
-%%DATADIR%%-test/queries/0_stateless/01079_reinterpret_as_fixed_string.reference
-%%DATADIR%%-test/queries/0_stateless/01079_reinterpret_as_fixed_string.sql
-%%DATADIR%%-test/queries/0_stateless/01080_check_for_error_incorrect_size_of_nested_column.reference
-%%DATADIR%%-test/queries/0_stateless/01080_check_for_error_incorrect_size_of_nested_column.sql
-%%DATADIR%%-test/queries/0_stateless/01080_engine_merge_prewhere_tupleelement_error.reference
-%%DATADIR%%-test/queries/0_stateless/01080_engine_merge_prewhere_tupleelement_error.sql
-%%DATADIR%%-test/queries/0_stateless/01080_join_get_null.reference
-%%DATADIR%%-test/queries/0_stateless/01080_join_get_null.sql
-%%DATADIR%%-test/queries/0_stateless/01081_PartialSortingTransform_full_column.reference
-%%DATADIR%%-test/queries/0_stateless/01081_PartialSortingTransform_full_column.sql
-%%DATADIR%%-test/queries/0_stateless/01081_demangle.reference
-%%DATADIR%%-test/queries/0_stateless/01081_demangle.sql
-%%DATADIR%%-test/queries/0_stateless/01081_keywords_formatting.reference
-%%DATADIR%%-test/queries/0_stateless/01081_keywords_formatting.sql
-%%DATADIR%%-test/queries/0_stateless/01082_bit_test_out_of_bound.reference
-%%DATADIR%%-test/queries/0_stateless/01082_bit_test_out_of_bound.sql
-%%DATADIR%%-test/queries/0_stateless/01083_aggregation_memory_efficient_bug.reference
-%%DATADIR%%-test/queries/0_stateless/01083_aggregation_memory_efficient_bug.sql
-%%DATADIR%%-test/queries/0_stateless/01083_cross_to_inner_with_in_bug.reference
-%%DATADIR%%-test/queries/0_stateless/01083_cross_to_inner_with_in_bug.sql
-%%DATADIR%%-test/queries/0_stateless/01083_cross_to_inner_with_like.reference
-%%DATADIR%%-test/queries/0_stateless/01083_cross_to_inner_with_like.sql
-%%DATADIR%%-test/queries/0_stateless/01083_expressions_in_engine_arguments.reference
+%%DATADIR%%-test/queries/0_stateless/00374_any_last_if_merge.sql
+%%DATADIR%%-test/queries/0_stateless/01457_order_by_nulls_first.reference
+%%DATADIR%%-test/queries/0_stateless/01916_low_cardinality_interval.reference
+%%DATADIR%%-test/queries/0_stateless/02018_multiple_with_fill_for_the_same_column.sql
+%%DATADIR%%-test/queries/0_stateless/01768_extended_range.sql
+%%DATADIR%%-test/queries/0_stateless/02053_INSERT_SELECT_MATERIALIZED.reference
+%%DATADIR%%-test/queries/0_stateless/01355_if_fixed_string.sql
+%%DATADIR%%-test/queries/0_stateless/00845_join_on_aliases.reference
+%%DATADIR%%-test/queries/0_stateless/00996_neighbor.reference
+%%DATADIR%%-test/queries/0_stateless/02021_h3_get_faces.sql
+%%DATADIR%%-test/queries/0_stateless/00541_to_start_of_fifteen_minutes.sql
+%%DATADIR%%-test/queries/0_stateless/00138_table_aliases.reference
+%%DATADIR%%-test/queries/0_stateless/00338_replicate_array_of_strings.reference
+%%DATADIR%%-test/queries/0_stateless/00362_great_circle_distance.reference
+%%DATADIR%%-test/queries/0_stateless/00404_null_literal.reference
+%%DATADIR%%-test/queries/0_stateless/02130_parse_quoted_null.sh
+%%DATADIR%%-test/queries/0_stateless/01684_insert_specify_shard_id.reference
+%%DATADIR%%-test/queries/0_stateless/00979_yandex_consistent_hash_fpe.sql
+%%DATADIR%%-test/queries/0_stateless/02155_create_table_w_timezone.reference
+%%DATADIR%%-test/queries/0_stateless/00062_replicated_merge_tree_alter_zookeeper_long.reference
+%%DATADIR%%-test/queries/0_stateless/00703_join_crash.sql
+%%DATADIR%%-test/queries/0_stateless/01471_limit_by_format.reference
+%%DATADIR%%-test/queries/0_stateless/00994_table_function_numbers_mt.sql
+%%DATADIR%%-test/queries/0_stateless/00336_shard_stack_trace.reference
+%%DATADIR%%-test/queries/0_stateless/00963_achimbab.reference
+%%DATADIR%%-test/queries/0_stateless/00910_zookeeper_custom_compression_codecs_replicated_long.sql
+%%DATADIR%%-test/queries/0_stateless/01291_geo_types.reference
+%%DATADIR%%-test/queries/0_stateless/01455_time_zones.sql
 %%DATADIR%%-test/queries/0_stateless/01083_expressions_in_engine_arguments.sql
-%%DATADIR%%-test/queries/0_stateless/01083_functional_index_in_mergetree.reference
-%%DATADIR%%-test/queries/0_stateless/01083_functional_index_in_mergetree.sql
-%%DATADIR%%-test/queries/0_stateless/01083_log_family_disk_memory.reference
-%%DATADIR%%-test/queries/0_stateless/01083_log_family_disk_memory.sql
-%%DATADIR%%-test/queries/0_stateless/01083_log_first_column_alias.reference
-%%DATADIR%%-test/queries/0_stateless/01083_log_first_column_alias.sql
-%%DATADIR%%-test/queries/0_stateless/01083_match_zero_byte.reference
-%%DATADIR%%-test/queries/0_stateless/01083_match_zero_byte.sql
-%%DATADIR%%-test/queries/0_stateless/01084_defaults_on_aliases.reference
+%%DATADIR%%-test/queries/0_stateless/00189_time_zones_long.sql
+%%DATADIR%%-test/queries/0_stateless/02101_empty_as_default_and_omitted_fields.sh
+%%DATADIR%%-test/queries/0_stateless/00500_point_in_polygon_nan.reference
+%%DATADIR%%-test/queries/0_stateless/00804_test_delta_codec_no_type_alter.sql
+%%DATADIR%%-test/queries/0_stateless/02013_emptystring_cast.sql
+%%DATADIR%%-test/queries/0_stateless/01246_buffer_flush.reference
+%%DATADIR%%-test/queries/0_stateless/00811_garbage.reference
+%%DATADIR%%-test/queries/0_stateless/00372_cors_header.sh
+%%DATADIR%%-test/queries/0_stateless/00972_live_view_select_1.sql
+%%DATADIR%%-test/queries/0_stateless/01046_materialized_view_with_join_over_distributed.reference
 %%DATADIR%%-test/queries/0_stateless/01084_defaults_on_aliases.sql
-%%DATADIR%%-test/queries/0_stateless/01084_regexp_empty.reference
-%%DATADIR%%-test/queries/0_stateless/01084_regexp_empty.sql
-%%DATADIR%%-test/queries/0_stateless/01085_datetime_arithmetic_preserve_timezone.reference
-%%DATADIR%%-test/queries/0_stateless/01085_datetime_arithmetic_preserve_timezone.sql
-%%DATADIR%%-test/queries/0_stateless/01085_extract_all_empty.reference
-%%DATADIR%%-test/queries/0_stateless/01085_extract_all_empty.sql
-%%DATADIR%%-test/queries/0_stateless/01085_max_distributed_connections.reference
-%%DATADIR%%-test/queries/0_stateless/01085_max_distributed_connections.sh
-%%DATADIR%%-test/queries/0_stateless/01085_max_distributed_connections_http.reference
-%%DATADIR%%-test/queries/0_stateless/01085_max_distributed_connections_http.sh
-%%DATADIR%%-test/queries/0_stateless/01085_regexp_input_format.reference
-%%DATADIR%%-test/queries/0_stateless/01085_regexp_input_format.sh
-%%DATADIR%%-test/queries/0_stateless/01085_simdjson_uint64.reference
-%%DATADIR%%-test/queries/0_stateless/01085_simdjson_uint64.sql
-%%DATADIR%%-test/queries/0_stateless/01086_modulo_or_zero.reference
-%%DATADIR%%-test/queries/0_stateless/01086_modulo_or_zero.sql
-%%DATADIR%%-test/queries/0_stateless/01086_odbc_roundtrip.reference
-%%DATADIR%%-test/queries/0_stateless/01086_odbc_roundtrip.sh
-%%DATADIR%%-test/queries/0_stateless/01086_regexp_input_format_skip_unmatched.reference
-%%DATADIR%%-test/queries/0_stateless/01086_regexp_input_format_skip_unmatched.sh
-%%DATADIR%%-test/queries/0_stateless/01087_index_set_ubsan.reference
-%%DATADIR%%-test/queries/0_stateless/01087_index_set_ubsan.sql
-%%DATADIR%%-test/queries/0_stateless/01087_storage_generate.reference
-%%DATADIR%%-test/queries/0_stateless/01087_storage_generate.sql
-%%DATADIR%%-test/queries/0_stateless/01087_table_function_generate.reference
-%%DATADIR%%-test/queries/0_stateless/01087_table_function_generate.sql
-%%DATADIR%%-test/queries/0_stateless/01088_array_slice_of_aggregate_functions.reference
-%%DATADIR%%-test/queries/0_stateless/01088_array_slice_of_aggregate_functions.sql
-%%DATADIR%%-test/queries/0_stateless/01088_benchmark_query_id.reference
-%%DATADIR%%-test/queries/0_stateless/01088_benchmark_query_id.sh
-%%DATADIR%%-test/queries/0_stateless/01089_alter_settings_old_format.reference
-%%DATADIR%%-test/queries/0_stateless/01089_alter_settings_old_format.sql
-%%DATADIR%%-test/queries/0_stateless/01090_fixed_string_bit_ops.reference
-%%DATADIR%%-test/queries/0_stateless/01090_fixed_string_bit_ops.sql
-%%DATADIR%%-test/queries/0_stateless/01090_zookeeper_mutations_and_insert_quorum.reference
-%%DATADIR%%-test/queries/0_stateless/01090_zookeeper_mutations_and_insert_quorum.sql
-%%DATADIR%%-test/queries/0_stateless/01091_insert_with_default_json.reference
-%%DATADIR%%-test/queries/0_stateless/01091_insert_with_default_json.sql
-%%DATADIR%%-test/queries/0_stateless/01091_num_threads.reference
-%%DATADIR%%-test/queries/0_stateless/01091_num_threads.sql
-%%DATADIR%%-test/queries/0_stateless/01091_query_profiler_does_not_hang.reference
-%%DATADIR%%-test/queries/0_stateless/01091_query_profiler_does_not_hang.sql
-%%DATADIR%%-test/queries/0_stateless/01092_base64.reference
-%%DATADIR%%-test/queries/0_stateless/01092_base64.sql
-%%DATADIR%%-test/queries/0_stateless/01092_memory_profiler.reference
-%%DATADIR%%-test/queries/0_stateless/01092_memory_profiler.sql
-%%DATADIR%%-test/queries/0_stateless/01093_cyclic_defaults_filimonov.reference
-%%DATADIR%%-test/queries/0_stateless/01093_cyclic_defaults_filimonov.sql
-%%DATADIR%%-test/queries/0_stateless/01095_tpch_like_smoke.reference
-%%DATADIR%%-test/queries/0_stateless/01095_tpch_like_smoke.sql
-%%DATADIR%%-test/queries/0_stateless/01096_array_reduce_in_ranges.reference
-%%DATADIR%%-test/queries/0_stateless/01096_array_reduce_in_ranges.sql
-%%DATADIR%%-test/queries/0_stateless/01096_block_serialized_state.reference
-%%DATADIR%%-test/queries/0_stateless/01096_block_serialized_state.sql
-%%DATADIR%%-test/queries/0_stateless/01096_zeros.reference
-%%DATADIR%%-test/queries/0_stateless/01096_zeros.sql
-%%DATADIR%%-test/queries/0_stateless/01097_cyclic_defaults.reference
-%%DATADIR%%-test/queries/0_stateless/01097_cyclic_defaults.sql
-%%DATADIR%%-test/queries/0_stateless/01097_one_more_range_reader_test.reference
-%%DATADIR%%-test/queries/0_stateless/01097_one_more_range_reader_test.sql
-%%DATADIR%%-test/queries/0_stateless/01097_pre_limit.reference
-%%DATADIR%%-test/queries/0_stateless/01097_pre_limit.sql
-%%DATADIR%%-test/queries/0_stateless/01098_msgpack_format.reference
-%%DATADIR%%-test/queries/0_stateless/01098_msgpack_format.sh
-%%DATADIR%%-test/queries/0_stateless/01098_sum.reference
-%%DATADIR%%-test/queries/0_stateless/01098_sum.sql
-%%DATADIR%%-test/queries/0_stateless/01098_temporary_and_external_tables.reference
-%%DATADIR%%-test/queries/0_stateless/01098_temporary_and_external_tables.sh
-%%DATADIR%%-test/queries/0_stateless/01099_operators_date_and_timestamp.reference
-%%DATADIR%%-test/queries/0_stateless/01099_operators_date_and_timestamp.sql
-%%DATADIR%%-test/queries/0_stateless/01099_parallel_distributed_insert_select.reference
-%%DATADIR%%-test/queries/0_stateless/01099_parallel_distributed_insert_select.sql
-%%DATADIR%%-test/queries/0_stateless/01100_split_by_string.reference
-%%DATADIR%%-test/queries/0_stateless/01100_split_by_string.sql
-%%DATADIR%%-test/queries/0_stateless/01101_literal_column_clash.reference
-%%DATADIR%%-test/queries/0_stateless/01101_literal_column_clash.sql
-%%DATADIR%%-test/queries/0_stateless/01101_prewhere_after_alter.reference
-%%DATADIR%%-test/queries/0_stateless/01101_prewhere_after_alter.sql
-%%DATADIR%%-test/queries/0_stateless/01102_distributed_local_in_bug.reference
-%%DATADIR%%-test/queries/0_stateless/01102_distributed_local_in_bug.sql
-%%DATADIR%%-test/queries/0_stateless/01103_check_cpu_instructions_at_startup.reference
+%%DATADIR%%-test/queries/0_stateless/01940_point_in_polygon_ubsan.reference
+%%DATADIR%%-test/queries/0_stateless/01934_constexpr_aggregate_function_parameters.reference
+%%DATADIR%%-test/queries/0_stateless/02017_bit_shift_left_for_string_integer.sql
+%%DATADIR%%-test/queries/0_stateless/02051_read_settings.sql.j2
+%%DATADIR%%-test/queries/0_stateless/01720_country_perimeter_and_area.reference
+%%DATADIR%%-test/queries/0_stateless/01057_window_view_event_tumble_to_strict_asc.reference
+%%DATADIR%%-test/queries/0_stateless/01875_ssd_cache_dictionary_decimal256_type.reference
+%%DATADIR%%-test/queries/0_stateless/01037_polygon_dicts_simple_functions.ans
+%%DATADIR%%-test/queries/0_stateless/01069_materialized_view_alter_target_table_with_default_expression.sql
+%%DATADIR%%-test/queries/0_stateless/01055_window_view_proc_hop_to.reference
+%%DATADIR%%-test/queries/0_stateless/00899_long_attach_memory_limit.sql
+%%DATADIR%%-test/queries/0_stateless/00059_shard_global_in.sql
+%%DATADIR%%-test/queries/0_stateless/01676_range_hashed_dictionary.sql
+%%DATADIR%%-test/queries/0_stateless/00698_validate_array_sizes_for_nested_kshvakov.reference
+%%DATADIR%%-test/queries/0_stateless/00936_function_result_with_operator_in.reference
+%%DATADIR%%-test/queries/0_stateless/00098_c_union_all.reference
+%%DATADIR%%-test/queries/0_stateless/00759_kodieg.reference
+%%DATADIR%%-test/queries/0_stateless/00633_materialized_view_and_too_many_parts_zookeeper.reference
+%%DATADIR%%-test/queries/0_stateless/01598_memory_limit_zeros.sql
+%%DATADIR%%-test/queries/0_stateless/01560_optimize_on_insert_long.sql
+%%DATADIR%%-test/queries/0_stateless/01161_all_system_tables.reference
+%%DATADIR%%-test/queries/0_stateless/01237_live_view_over_distributed_with_subquery_select_table_alias.reference
+%%DATADIR%%-test/queries/0_stateless/00484_preferred_max_column_in_block_size_bytes.reference
+%%DATADIR%%-test/queries/0_stateless/00066_group_by_in.reference
+%%DATADIR%%-test/queries/0_stateless/00967_insert_into_distributed_different_types.sql
+%%DATADIR%%-test/queries/0_stateless/02021_prewhere_always_true_where.sql
+%%DATADIR%%-test/queries/0_stateless/00904_array_with_constant_2.sql
+%%DATADIR%%-test/queries/0_stateless/01356_state_resample.sql
+%%DATADIR%%-test/queries/0_stateless/01280_ssd_complex_key_dictionary.reference
+%%DATADIR%%-test/queries/0_stateless/00410_aggregation_combinators_with_arenas.reference
+%%DATADIR%%-test/queries/0_stateless/00227_quantiles_timing_arbitrary_order.reference
+%%DATADIR%%-test/queries/0_stateless/01892_jit_aggregation_function_any_last_long.sql
+%%DATADIR%%-test/queries/0_stateless/01925_join_materialized_columns.sql
+%%DATADIR%%-test/queries/0_stateless/01291_aggregation_in_order.sql
+%%DATADIR%%-test/queries/0_stateless/01902_self_aliases_in_columns.reference
+%%DATADIR%%-test/queries/0_stateless/01057_window_view_event_tumble_to_strict_asc.sh
+%%DATADIR%%-test/queries/0_stateless/01503_fixed_string_primary_key.sql
+%%DATADIR%%-test/queries/0_stateless/00134_aggregation_by_fixed_string_of_size_1_2_4_8.reference
+%%DATADIR%%-test/queries/0_stateless/01067_join_null.sql
+%%DATADIR%%-test/queries/0_stateless/01656_ipv4_bad_formatting.sql
+%%DATADIR%%-test/queries/0_stateless/01638_div_mod_ambiguities.sql
+%%DATADIR%%-test/queries/0_stateless/01139_asof_join_types.sql
+%%DATADIR%%-test/queries/0_stateless/01926_date_date_time_supertype.reference
+%%DATADIR%%-test/queries/0_stateless/01060_substring_negative_size.sql
+%%DATADIR%%-test/queries/0_stateless/00700_decimal_complex_types.sql
+%%DATADIR%%-test/queries/0_stateless/01077_mutations_index_consistency.sh
+%%DATADIR%%-test/queries/0_stateless/01560_DateTime_and_DateTime64_comparision.reference
+%%DATADIR%%-test/queries/0_stateless/01854_dictionary_range_hashed_min_max_attr.reference
+%%DATADIR%%-test/queries/0_stateless/00998_constraints_all_tables.reference
+%%DATADIR%%-test/queries/0_stateless/01056_prepared_statements_null_and_escaping.sh
+%%DATADIR%%-test/queries/0_stateless/02042_map_get_non_const_key.sql
+%%DATADIR%%-test/queries/0_stateless/01576_alter_low_cardinality_and_select.sh
+%%DATADIR%%-test/queries/0_stateless/00126_buffer.sql
+%%DATADIR%%-test/queries/0_stateless/01259_dictionary_custom_settings_ddl.sql
+%%DATADIR%%-test/queries/0_stateless/01454_storagememory_data_race_challenge.sh
 %%DATADIR%%-test/queries/0_stateless/01103_check_cpu_instructions_at_startup.sh
-%%DATADIR%%-test/queries/0_stateless/01103_distributed_product_mode_local_column_renames.reference
-%%DATADIR%%-test/queries/0_stateless/01103_distributed_product_mode_local_column_renames.sql
-%%DATADIR%%-test/queries/0_stateless/01103_optimize_drop_race_zookeeper.reference
-%%DATADIR%%-test/queries/0_stateless/01103_optimize_drop_race_zookeeper.sh
-%%DATADIR%%-test/queries/0_stateless/01104_distributed_numbers_test.reference
-%%DATADIR%%-test/queries/0_stateless/01104_distributed_numbers_test.sql
-%%DATADIR%%-test/queries/0_stateless/01104_distributed_one_test.reference
-%%DATADIR%%-test/queries/0_stateless/01104_distributed_one_test.sql
-%%DATADIR%%-test/queries/0_stateless/01104_fixed_string_like.reference
-%%DATADIR%%-test/queries/0_stateless/01104_fixed_string_like.sql
-%%DATADIR%%-test/queries/0_stateless/01105_string_like.reference
-%%DATADIR%%-test/queries/0_stateless/01105_string_like.sql
-%%DATADIR%%-test/queries/0_stateless/01106_const_fixed_string_like.reference
-%%DATADIR%%-test/queries/0_stateless/01106_const_fixed_string_like.sql
-%%DATADIR%%-test/queries/0_stateless/01107_atomic_db_detach_attach.reference
-%%DATADIR%%-test/queries/0_stateless/01107_atomic_db_detach_attach.sh
-%%DATADIR%%-test/queries/0_stateless/01107_join_right_table_totals.reference
-%%DATADIR%%-test/queries/0_stateless/01107_join_right_table_totals.sql
-%%DATADIR%%-test/queries/0_stateless/01107_tuples_arrays_parsing_exceptions.reference
-%%DATADIR%%-test/queries/0_stateless/01107_tuples_arrays_parsing_exceptions.sh
-%%DATADIR%%-test/queries/0_stateless/01108_restart_replicas_rename_deadlock_zookeeper.reference
-%%DATADIR%%-test/queries/0_stateless/01108_restart_replicas_rename_deadlock_zookeeper.sh
-%%DATADIR%%-test/queries/0_stateless/01109_exchange_tables.reference
-%%DATADIR%%-test/queries/0_stateless/01109_exchange_tables.sql
+%%DATADIR%%-test/queries/0_stateless/01533_distinct_nullable_uuid.sql
+%%DATADIR%%-test/queries/0_stateless/01926_bin_unbin.sql
+%%DATADIR%%-test/queries/0_stateless/01456_min_negative_decimal_formatting.reference
+%%DATADIR%%-test/queries/0_stateless/00718_format_datetime.reference
+%%DATADIR%%-test/queries/0_stateless/00829_bitmap64_function.sql
+%%DATADIR%%-test/queries/0_stateless/00804_rollup_with_having.sql
+%%DATADIR%%-test/queries/0_stateless/01505_distributed_local_type_conversion_enum.sql
+%%DATADIR%%-test/queries/0_stateless/00176_if_string_arrays.sql
+%%DATADIR%%-test/queries/0_stateless/01016_simhash_minhash.sql
+%%DATADIR%%-test/queries/0_stateless/01659_h3_buffer_overflow.sql
+%%DATADIR%%-test/queries/0_stateless/00973_live_view_select_prewhere.reference
+%%DATADIR%%-test/queries/0_stateless/00757_enum_defaults.reference
+%%DATADIR%%-test/queries/0_stateless/01441_low_cardinality_array_index.reference
+%%DATADIR%%-test/queries/0_stateless/00421_storage_merge__table_index.sh
+%%DATADIR%%-test/queries/0_stateless/00742_require_join_strictness.reference
+%%DATADIR%%-test/queries/0_stateless/01049_zookeeper_synchronous_mutations_long.reference
+%%DATADIR%%-test/queries/0_stateless/00262_alter_alias.sql
+%%DATADIR%%-test/queries/0_stateless/00322_disable_checksumming.sh
+%%DATADIR%%-test/queries/0_stateless/01932_remote_sharding_key_column.reference
+%%DATADIR%%-test/queries/0_stateless/01867_support_datetime64_version_column.reference
+%%DATADIR%%-test/queries/0_stateless/01722_long_brotli_http_compression_json_format.sh
+%%DATADIR%%-test/queries/0_stateless/01960_lambda_precedence.sql
+%%DATADIR%%-test/queries/0_stateless/00301_csv.sh
+%%DATADIR%%-test/queries/0_stateless/01785_parallel_formatting_memory.sh
+%%DATADIR%%-test/queries/0_stateless/01716_decimal_comparison_ubsan.reference
+%%DATADIR%%-test/queries/0_stateless/01710_normal_projections.sh
+%%DATADIR%%-test/queries/0_stateless/01013_sync_replica_timeout_zookeeper.sh
+%%DATADIR%%-test/queries/0_stateless/01812_has_generic.sql
+%%DATADIR%%-test/queries/0_stateless/01675_distributed_bytes_to_delay_insert.sh
+%%DATADIR%%-test/queries/0_stateless/01891_partition_by_uuid.reference
 %%DATADIR%%-test/queries/0_stateless/01109_inflating_cross_join.reference
-%%DATADIR%%-test/queries/0_stateless/01109_inflating_cross_join.sql
-%%DATADIR%%-test/queries/0_stateless/01109_sc0rp10_string_hash_map_zero_bytes.reference
-%%DATADIR%%-test/queries/0_stateless/01109_sc0rp10_string_hash_map_zero_bytes.sql
-%%DATADIR%%-test/queries/0_stateless/01110_dictionary_layout_without_arguments.reference
-%%DATADIR%%-test/queries/0_stateless/01110_dictionary_layout_without_arguments.sql
-%%DATADIR%%-test/queries/0_stateless/01112_check_table_with_index.reference
-%%DATADIR%%-test/queries/0_stateless/01112_check_table_with_index.sql
+%%DATADIR%%-test/queries/0_stateless/02113_base64encode_trailing_bytes.reference
+%%DATADIR%%-test/queries/0_stateless/00819_ast_refactoring_bugs.reference
+%%DATADIR%%-test/queries/0_stateless/01717_int_div_float_too_large_ubsan.reference
+%%DATADIR%%-test/queries/0_stateless/00342_escape_sequences.reference
+%%DATADIR%%-test/queries/0_stateless/00544_insert_with_select.sql
+%%DATADIR%%-test/queries/0_stateless/01184_long_insert_values_huge_strings.sh
+%%DATADIR%%-test/queries/0_stateless/01471_calculate_ttl_during_merge.reference
+%%DATADIR%%-test/queries/0_stateless/01676_range_hashed_dictionary.reference
+%%DATADIR%%-test/queries/0_stateless/00900_orc_nested_arrays_load.reference
+%%DATADIR%%-test/queries/0_stateless/00044_sorting_by_string_descending.sql
+%%DATADIR%%-test/queries/0_stateless/00187_like_regexp_prefix.sql
+%%DATADIR%%-test/queries/0_stateless/00661_array_has_silviucpp.sql
+%%DATADIR%%-test/queries/0_stateless/01037_polygon_dicts_correctness_fast.ans
+%%DATADIR%%-test/queries/0_stateless/02159_left_right.reference
+%%DATADIR%%-test/queries/0_stateless/01083_aggregation_memory_efficient_bug.reference
+%%DATADIR%%-test/queries/0_stateless/00979_yandex_consistent_hash_fpe.reference
+%%DATADIR%%-test/queries/0_stateless/01746_extract_text_from_html.reference
+%%DATADIR%%-test/queries/0_stateless/01064_array_auc.sql
+%%DATADIR%%-test/queries/0_stateless/01905_to_json_string.reference
+%%DATADIR%%-test/queries/0_stateless/01213_optimize_skip_unused_shards_DISTINCT.sql
+%%DATADIR%%-test/queries/0_stateless/01601_temporary_table_session_scope.sh
+%%DATADIR%%-test/queries/0_stateless/00448_to_string_cut_to_zero.reference
+%%DATADIR%%-test/queries/0_stateless/01451_dist_logs.reference
+%%DATADIR%%-test/queries/0_stateless/helpers/httpexpect.py
+%%DATADIR%%-test/queries/0_stateless/helpers/00900_parquet_create_table_columns.py
+%%DATADIR%%-test/queries/0_stateless/helpers/protobuf_length_delimited_encoder.py
+%%DATADIR%%-test/queries/0_stateless/helpers/client.py
+%%DATADIR%%-test/queries/0_stateless/helpers/02112_prepare.sh
+%%DATADIR%%-test/queries/0_stateless/helpers/uexpect.py
+%%DATADIR%%-test/queries/0_stateless/helpers/02112_clean.sh
+%%DATADIR%%-test/queries/0_stateless/helpers/shell.py
+%%DATADIR%%-test/queries/0_stateless/helpers/httpclient.py
+%%DATADIR%%-test/queries/0_stateless/helpers/pure_http_client.py
+%%DATADIR%%-test/queries/0_stateless/00854_multiple_join_asterisks.sql
+%%DATADIR%%-test/queries/0_stateless/01680_date_time_add_ubsan.reference
+%%DATADIR%%-test/queries/0_stateless/00393_if_with_constant_condition.reference
 %%DATADIR%%-test/queries/0_stateless/01113_local_dictionary_type_conversion.reference
-%%DATADIR%%-test/queries/0_stateless/01113_local_dictionary_type_conversion.sql
-%%DATADIR%%-test/queries/0_stateless/01114_alter_modify_compact_parts.reference
-%%DATADIR%%-test/queries/0_stateless/01114_alter_modify_compact_parts.sql
-%%DATADIR%%-test/queries/0_stateless/01114_clear_column_compact_parts.reference
-%%DATADIR%%-test/queries/0_stateless/01114_clear_column_compact_parts.sql
-%%DATADIR%%-test/queries/0_stateless/01114_database_atomic.reference
-%%DATADIR%%-test/queries/0_stateless/01114_database_atomic.sh
-%%DATADIR%%-test/queries/0_stateless/01114_materialize_clear_index_compact_parts.reference
-%%DATADIR%%-test/queries/0_stateless/01114_materialize_clear_index_compact_parts.sql
-%%DATADIR%%-test/queries/0_stateless/01114_mysql_database_engine_segfault.reference
-%%DATADIR%%-test/queries/0_stateless/01114_mysql_database_engine_segfault.sql
-%%DATADIR%%-test/queries/0_stateless/01115_join_with_dictionary.reference
-%%DATADIR%%-test/queries/0_stateless/01115_join_with_dictionary.sql
-%%DATADIR%%-test/queries/0_stateless/01115_prewhere_array_join.reference
-%%DATADIR%%-test/queries/0_stateless/01115_prewhere_array_join.sql
-%%DATADIR%%-test/queries/0_stateless/01116_asof_join_dolbyzerr.reference
-%%DATADIR%%-test/queries/0_stateless/01116_asof_join_dolbyzerr.sql
-%%DATADIR%%-test/queries/0_stateless/01116_cross_count_asterisks.reference
-%%DATADIR%%-test/queries/0_stateless/01116_cross_count_asterisks.sql
-%%DATADIR%%-test/queries/0_stateless/01117_chain_finalize_bug.reference
-%%DATADIR%%-test/queries/0_stateless/01117_chain_finalize_bug.sql
-%%DATADIR%%-test/queries/0_stateless/01117_comma_and_others_join_mix.reference
-%%DATADIR%%-test/queries/0_stateless/01117_comma_and_others_join_mix.sql
-%%DATADIR%%-test/queries/0_stateless/01117_greatest_least_case.reference
-%%DATADIR%%-test/queries/0_stateless/01117_greatest_least_case.sql
-%%DATADIR%%-test/queries/0_stateless/01118_is_constant.reference
-%%DATADIR%%-test/queries/0_stateless/01118_is_constant.sql
-%%DATADIR%%-test/queries/0_stateless/01120_join_constants.reference
-%%DATADIR%%-test/queries/0_stateless/01120_join_constants.sql
-%%DATADIR%%-test/queries/0_stateless/01121_remote_scalar_subquery.reference
-%%DATADIR%%-test/queries/0_stateless/01121_remote_scalar_subquery.sql
-%%DATADIR%%-test/queries/0_stateless/01122_totals_rollup_having_block_header.reference
-%%DATADIR%%-test/queries/0_stateless/01122_totals_rollup_having_block_header.sql
-%%DATADIR%%-test/queries/0_stateless/01123_parse_date_time_best_effort_even_more.reference
-%%DATADIR%%-test/queries/0_stateless/01123_parse_date_time_best_effort_even_more.sql
-%%DATADIR%%-test/queries/0_stateless/01124_view_bad_types.reference
-%%DATADIR%%-test/queries/0_stateless/01124_view_bad_types.sql
-%%DATADIR%%-test/queries/0_stateless/01125_dict_ddl_cannot_add_column.reference
-%%DATADIR%%-test/queries/0_stateless/01125_dict_ddl_cannot_add_column.sql
-%%DATADIR%%-test/queries/0_stateless/01125_generate_random_qoega.reference
-%%DATADIR%%-test/queries/0_stateless/01125_generate_random_qoega.sql
-%%DATADIR%%-test/queries/0_stateless/01126_month_partitioning_consistent_code.reference
-%%DATADIR%%-test/queries/0_stateless/01126_month_partitioning_consistent_code.sql
-%%DATADIR%%-test/queries/0_stateless/01127_month_partitioning_consistency_select.reference
-%%DATADIR%%-test/queries/0_stateless/01127_month_partitioning_consistency_select.sql
-%%DATADIR%%-test/queries/0_stateless/01128_generate_random_nested.reference
-%%DATADIR%%-test/queries/0_stateless/01128_generate_random_nested.sql
-%%DATADIR%%-test/queries/0_stateless/01129_dict_get_join_lose_constness.reference
-%%DATADIR%%-test/queries/0_stateless/01129_dict_get_join_lose_constness.sql
-%%DATADIR%%-test/queries/0_stateless/01130_in_memory_parts.reference
-%%DATADIR%%-test/queries/0_stateless/01130_in_memory_parts.sql
-%%DATADIR%%-test/queries/0_stateless/01130_in_memory_parts_check.reference
-%%DATADIR%%-test/queries/0_stateless/01130_in_memory_parts_check.sql
-%%DATADIR%%-test/queries/0_stateless/01130_in_memory_parts_default.reference
-%%DATADIR%%-test/queries/0_stateless/01130_in_memory_parts_default.sql
-%%DATADIR%%-test/queries/0_stateless/01130_in_memory_parts_nested.reference
-%%DATADIR%%-test/queries/0_stateless/01130_in_memory_parts_nested.sql
+%%DATADIR%%-test/queries/0_stateless/02029_test_options_requests.reference
+%%DATADIR%%-test/queries/0_stateless/01599_mutation_query_params.reference
+%%DATADIR%%-test/queries/0_stateless/01603_read_with_backoff_bug.sql
+%%DATADIR%%-test/queries/0_stateless/02141_clickhouse_local_interactive_table.reference
+%%DATADIR%%-test/queries/0_stateless/01049_join_low_card_bug_long.sql.j2
+%%DATADIR%%-test/queries/0_stateless/02128_cast_nullable.reference
+%%DATADIR%%-test/queries/0_stateless/01112_check_table_with_index.sql
+%%DATADIR%%-test/queries/0_stateless/00304_http_external_data.reference
+%%DATADIR%%-test/queries/0_stateless/01329_compare_tuple_string_constant.reference
+%%DATADIR%%-test/queries/0_stateless/02014_map_different_keys.reference
+%%DATADIR%%-test/queries/0_stateless/01473_system_events_zeroes.reference
+%%DATADIR%%-test/queries/0_stateless/00209_insert_select_extremes.sql
+%%DATADIR%%-test/queries/0_stateless/00750_merge_tree_merge_with_o_direct.reference
+%%DATADIR%%-test/queries/0_stateless/01422_map_skip_null.reference
+%%DATADIR%%-test/queries/0_stateless/00050_any_left_join.reference
+%%DATADIR%%-test/queries/0_stateless/01611_string_to_low_cardinality_key_alter.sql
+%%DATADIR%%-test/queries/0_stateless/00800_low_cardinality_distinct_numeric.sql
+%%DATADIR%%-test/queries/0_stateless/00500_point_in_polygon_non_const_poly.sql
+%%DATADIR%%-test/queries/0_stateless/01762_datetime64_extended_parsing.reference
+%%DATADIR%%-test/queries/0_stateless/02012_low_cardinality_uuid_with_extremes.reference
+%%DATADIR%%-test/queries/0_stateless/01493_alter_remove_wrong_default.sql
+%%DATADIR%%-test/queries/0_stateless/00761_lower_utf8_bug.sql
+%%DATADIR%%-test/queries/0_stateless/01457_min_index_granularity_bytes_setting.reference
+%%DATADIR%%-test/queries/0_stateless/00470_identifiers_in_double_quotes.sql
+%%DATADIR%%-test/queries/0_stateless/01359_geodistance_loop.sql
+%%DATADIR%%-test/queries/0_stateless/00520_tuple_values_interpreter.reference
+%%DATADIR%%-test/queries/0_stateless/01669_columns_declaration_serde_long.reference
+%%DATADIR%%-test/queries/0_stateless/01064_incremental_streaming_from_2_src_with_feedback.reference
+%%DATADIR%%-test/queries/0_stateless/01748_partition_id_pruning.reference
+%%DATADIR%%-test/queries/0_stateless/02111_function_mapExtractKeyLike.sql
+%%DATADIR%%-test/queries/0_stateless/02043_user_defined_executable_function_implicit_cast.reference
+%%DATADIR%%-test/queries/0_stateless/00725_memory_tracking.sql
+%%DATADIR%%-test/queries/0_stateless/01416_clear_column_pk.reference
+%%DATADIR%%-test/queries/0_stateless/01305_duplicate_order_by_and_distinct.sql
+%%DATADIR%%-test/queries/0_stateless/01273_extractGroups.reference
+%%DATADIR%%-test/queries/0_stateless/01034_sample_final_distributed.reference
+%%DATADIR%%-test/queries/0_stateless/01623_byte_size_const.reference
+%%DATADIR%%-test/queries/0_stateless/00753_system_columns_and_system_tables_long.reference
+%%DATADIR%%-test/queries/0_stateless/02023_nullable_int_uint_where.reference
+%%DATADIR%%-test/queries/0_stateless/01110_dictionary_layout_without_arguments.reference
+%%DATADIR%%-test/queries/0_stateless/01596_full_join_chertus.sql
+%%DATADIR%%-test/queries/0_stateless/01502_long_log_tinylog_deadlock_race.reference
+%%DATADIR%%-test/queries/0_stateless/01882_scalar_subquery_exception.reference
+%%DATADIR%%-test/queries/0_stateless/00979_live_view_watch_live_moving_avg.reference
+%%DATADIR%%-test/queries/0_stateless/01509_check_parallel_quorum_inserts_long.sh
+%%DATADIR%%-test/queries/0_stateless/00820_multiple_joins.sql
+%%DATADIR%%-test/queries/0_stateless/01010_partial_merge_join.sql
+%%DATADIR%%-test/queries/0_stateless/01653_tuple_hamming_distance_2.sql
 %%DATADIR%%-test/queries/0_stateless/01130_in_memory_parts_partitons.reference
-%%DATADIR%%-test/queries/0_stateless/01130_in_memory_parts_partitons.sql
-%%DATADIR%%-test/queries/0_stateless/01131_max_rows_to_sort.reference
-%%DATADIR%%-test/queries/0_stateless/01131_max_rows_to_sort.sql
-%%DATADIR%%-test/queries/0_stateless/01132_max_rows_to_read.reference
-%%DATADIR%%-test/queries/0_stateless/01132_max_rows_to_read.sql
-%%DATADIR%%-test/queries/0_stateless/01134_max_rows_to_group_by.reference
-%%DATADIR%%-test/queries/0_stateless/01134_max_rows_to_group_by.sql
-%%DATADIR%%-test/queries/0_stateless/01134_set_overflow_mode.reference
-%%DATADIR%%-test/queries/0_stateless/01134_set_overflow_mode.sql
-%%DATADIR%%-test/queries/0_stateless/01135_default_and_alter_zookeeper.reference
-%%DATADIR%%-test/queries/0_stateless/01135_default_and_alter_zookeeper.sql
-%%DATADIR%%-test/queries/0_stateless/01136_multiple_sets.reference
-%%DATADIR%%-test/queries/0_stateless/01136_multiple_sets.sql
-%%DATADIR%%-test/queries/0_stateless/01137_order_by_func.reference
-%%DATADIR%%-test/queries/0_stateless/01137_order_by_func.sql
-%%DATADIR%%-test/queries/0_stateless/01137_order_by_func_final.reference
-%%DATADIR%%-test/queries/0_stateless/01137_order_by_func_final.sql
-%%DATADIR%%-test/queries/0_stateless/01137_sample_final.reference
-%%DATADIR%%-test/queries/0_stateless/01137_sample_final.sql
-%%DATADIR%%-test/queries/0_stateless/01138_join_on_distributed_and_tmp.reference
-%%DATADIR%%-test/queries/0_stateless/01138_join_on_distributed_and_tmp.sql
-%%DATADIR%%-test/queries/0_stateless/01139_asof_join_types.reference
-%%DATADIR%%-test/queries/0_stateless/01139_asof_join_types.sql
-%%DATADIR%%-test/queries/0_stateless/01140_select_from_storage_join_fix.reference
-%%DATADIR%%-test/queries/0_stateless/01140_select_from_storage_join_fix.sql
-%%DATADIR%%-test/queries/0_stateless/01141_join_get_negative.reference
-%%DATADIR%%-test/queries/0_stateless/01141_join_get_negative.sql
-%%DATADIR%%-test/queries/0_stateless/01142_join_lc_and_nullable_in_key.reference
-%%DATADIR%%-test/queries/0_stateless/01142_join_lc_and_nullable_in_key.sql
-%%DATADIR%%-test/queries/0_stateless/01142_merge_join_lc_and_nullable_in_key.reference
-%%DATADIR%%-test/queries/0_stateless/01142_merge_join_lc_and_nullable_in_key.sql
-%%DATADIR%%-test/queries/0_stateless/01142_with_ties_and_aliases.reference
-%%DATADIR%%-test/queries/0_stateless/01142_with_ties_and_aliases.sql
-%%DATADIR%%-test/queries/0_stateless/01143_trivial_count_with_join.reference
-%%DATADIR%%-test/queries/0_stateless/01143_trivial_count_with_join.sql
-%%DATADIR%%-test/queries/0_stateless/01144_join_rewrite_with_ambiguous_column_and_view.reference
-%%DATADIR%%-test/queries/0_stateless/01144_join_rewrite_with_ambiguous_column_and_view.sql
-%%DATADIR%%-test/queries/0_stateless/01144_multiple_joins_rewriter_v2_and_lambdas.reference
-%%DATADIR%%-test/queries/0_stateless/01144_multiple_joins_rewriter_v2_and_lambdas.sql
-%%DATADIR%%-test/queries/0_stateless/01144_multiword_data_types.reference
-%%DATADIR%%-test/queries/0_stateless/01144_multiword_data_types.sql
-%%DATADIR%%-test/queries/0_stateless/01145_with_fill_const.reference
-%%DATADIR%%-test/queries/0_stateless/01145_with_fill_const.sql
-%%DATADIR%%-test/queries/0_stateless/01146_clickhouse_local_data.reference
-%%DATADIR%%-test/queries/0_stateless/01146_clickhouse_local_data.sh
-%%DATADIR%%-test/queries/0_stateless/01147_partial_merge_full_join.reference
-%%DATADIR%%-test/queries/0_stateless/01147_partial_merge_full_join.sql
-%%DATADIR%%-test/queries/0_stateless/01148_zookeeper_path_macros_unfolding.reference
-%%DATADIR%%-test/queries/0_stateless/01148_zookeeper_path_macros_unfolding.sql
-%%DATADIR%%-test/queries/0_stateless/01149_zookeeper_mutation_stuck_after_replace_partition.reference
-%%DATADIR%%-test/queries/0_stateless/01149_zookeeper_mutation_stuck_after_replace_partition.sql
-%%DATADIR%%-test/queries/0_stateless/01150_ddl_guard_rwr.reference
-%%DATADIR%%-test/queries/0_stateless/01150_ddl_guard_rwr.sh
-%%DATADIR%%-test/queries/0_stateless/01151_storage_merge_filter_tables_by_virtual_column.reference
-%%DATADIR%%-test/queries/0_stateless/01151_storage_merge_filter_tables_by_virtual_column.sql
-%%DATADIR%%-test/queries/0_stateless/01152_cross_replication.reference
-%%DATADIR%%-test/queries/0_stateless/01152_cross_replication.sql
-%%DATADIR%%-test/queries/0_stateless/01153_attach_mv_uuid.reference
-%%DATADIR%%-test/queries/0_stateless/01153_attach_mv_uuid.sql
-%%DATADIR%%-test/queries/0_stateless/01154_move_partition_long.reference
-%%DATADIR%%-test/queries/0_stateless/01154_move_partition_long.sh
-%%DATADIR%%-test/queries/0_stateless/01155_old_mutation_parts_to_do.reference
-%%DATADIR%%-test/queries/0_stateless/01155_old_mutation_parts_to_do.sh
-%%DATADIR%%-test/queries/0_stateless/01155_rename_move_materialized_view.reference
-%%DATADIR%%-test/queries/0_stateless/01155_rename_move_materialized_view.sql
-%%DATADIR%%-test/queries/0_stateless/01156_pcg_deserialization.reference
-%%DATADIR%%-test/queries/0_stateless/01156_pcg_deserialization.sh
-%%DATADIR%%-test/queries/0_stateless/01175_distributed_ddl_output_mode_long.reference
-%%DATADIR%%-test/queries/0_stateless/01175_distributed_ddl_output_mode_long.sh
-%%DATADIR%%-test/queries/0_stateless/01176_mysql_client_interactive.expect
-%%DATADIR%%-test/queries/0_stateless/01176_mysql_client_interactive.reference
-%%DATADIR%%-test/queries/0_stateless/01177_group_array_moving.reference
-%%DATADIR%%-test/queries/0_stateless/01177_group_array_moving.sql
-%%DATADIR%%-test/queries/0_stateless/01178_int_field_to_decimal.reference
-%%DATADIR%%-test/queries/0_stateless/01178_int_field_to_decimal.sql
-%%DATADIR%%-test/queries/0_stateless/01179_insert_values_semicolon.expect
-%%DATADIR%%-test/queries/0_stateless/01179_insert_values_semicolon.reference
-%%DATADIR%%-test/queries/0_stateless/01180_client_syntax_errors.expect
-%%DATADIR%%-test/queries/0_stateless/01180_client_syntax_errors.reference
-%%DATADIR%%-test/queries/0_stateless/01181_db_atomic_drop_on_cluster.reference
-%%DATADIR%%-test/queries/0_stateless/01181_db_atomic_drop_on_cluster.sql
-%%DATADIR%%-test/queries/0_stateless/01182_materialized_view_different_structure.reference
-%%DATADIR%%-test/queries/0_stateless/01182_materialized_view_different_structure.sql
-%%DATADIR%%-test/queries/0_stateless/01183_custom_separated_format_http.reference
-%%DATADIR%%-test/queries/0_stateless/01183_custom_separated_format_http.sh
-%%DATADIR%%-test/queries/0_stateless/01184_long_insert_values_huge_strings.reference
-%%DATADIR%%-test/queries/0_stateless/01184_long_insert_values_huge_strings.sh
-%%DATADIR%%-test/queries/0_stateless/01185_create_or_replace_table.reference
-%%DATADIR%%-test/queries/0_stateless/01185_create_or_replace_table.sql
-%%DATADIR%%-test/queries/0_stateless/01186_conversion_to_nullable.reference
-%%DATADIR%%-test/queries/0_stateless/01186_conversion_to_nullable.sql
-%%DATADIR%%-test/queries/0_stateless/01187_set_profile_as_setting.reference
-%%DATADIR%%-test/queries/0_stateless/01187_set_profile_as_setting.sh
-%%DATADIR%%-test/queries/0_stateless/01188_attach_table_from_path.reference
-%%DATADIR%%-test/queries/0_stateless/01188_attach_table_from_path.sql
-%%DATADIR%%-test/queries/0_stateless/01189_create_as_table_as_table_function.reference
-%%DATADIR%%-test/queries/0_stateless/01189_create_as_table_as_table_function.sql
-%%DATADIR%%-test/queries/0_stateless/01190_full_attach_syntax.reference
-%%DATADIR%%-test/queries/0_stateless/01190_full_attach_syntax.sql
-%%DATADIR%%-test/queries/0_stateless/01191_rename_dictionary.reference
-%%DATADIR%%-test/queries/0_stateless/01191_rename_dictionary.sql
-%%DATADIR%%-test/queries/0_stateless/01192_rename_database_zookeeper.reference
+%%DATADIR%%-test/queries/0_stateless/01383_log_broken_table.reference
+%%DATADIR%%-test/queries/0_stateless/01616_untuple_access_field.sql
+%%DATADIR%%-test/queries/0_stateless/01285_data_skip_index_over_aggregation.sql
+%%DATADIR%%-test/queries/0_stateless/00086_concat_nary_const_with_nonconst_segfault.sql
+%%DATADIR%%-test/queries/0_stateless/01553_datetime64_comparison.sql
+%%DATADIR%%-test/queries/0_stateless/01781_merge_tree_deduplication.sql
+%%DATADIR%%-test/queries/0_stateless/01015_empty_in_inner_right_join.sql.j2
+%%DATADIR%%-test/queries/0_stateless/00968_roundAge.reference
+%%DATADIR%%-test/queries/0_stateless/00910_decimal_group_array_crash_3783.reference
+%%DATADIR%%-test/queries/0_stateless/02017_bit_shift_left_for_string_integer.reference
+%%DATADIR%%-test/queries/0_stateless/02000_table_function_cluster_macros.sql
+%%DATADIR%%-test/queries/0_stateless/00098_d_union_all.reference
+%%DATADIR%%-test/queries/0_stateless/01825_replacing_vertical_merge.reference
+%%DATADIR%%-test/queries/0_stateless/01355_alter_column_with_order.reference
+%%DATADIR%%-test/queries/0_stateless/00900_orc_arrow_parquet_tuples.reference
+%%DATADIR%%-test/queries/0_stateless/01473_event_time_microseconds.reference
+%%DATADIR%%-test/queries/0_stateless/01701_parallel_parsing_infinite_segmentation.reference
+%%DATADIR%%-test/queries/0_stateless/02156_async_insert_query_log.sh
 %%DATADIR%%-test/queries/0_stateless/01192_rename_database_zookeeper.sh
-%%DATADIR%%-test/queries/0_stateless/01193_metadata_loading.reference
-%%DATADIR%%-test/queries/0_stateless/01193_metadata_loading.sh
-%%DATADIR%%-test/queries/0_stateless/01194_http_query_id.reference
-%%DATADIR%%-test/queries/0_stateless/01194_http_query_id.sh
-%%DATADIR%%-test/queries/0_stateless/01195_formats_diagnostic_info.reference
-%%DATADIR%%-test/queries/0_stateless/01195_formats_diagnostic_info.sh
+%%DATADIR%%-test/queries/0_stateless/01798_having_push_down.reference
+%%DATADIR%%-test/queries/0_stateless/00506_shard_global_in_union.reference
+%%DATADIR%%-test/queries/0_stateless/00987_distributed_stack_overflow.reference
+%%DATADIR%%-test/queries/0_stateless/02123_MySQLWire_regression.reference
+%%DATADIR%%-test/queries/0_stateless/01018_empty_aggregation_filling.sql
+%%DATADIR%%-test/queries/0_stateless/00227_quantiles_timing_arbitrary_order.sql
+%%DATADIR%%-test/queries/0_stateless/00287_column_const_with_nan.reference
+%%DATADIR%%-test/queries/0_stateless/01265_datetime_string_comparison_felix_mueller.sql
+%%DATADIR%%-test/queries/0_stateless/00701_join_default_strictness.sql
+%%DATADIR%%-test/queries/0_stateless/00898_quantile_timing_parameter_check.reference
+%%DATADIR%%-test/queries/0_stateless/01667_aes_args_check.reference
+%%DATADIR%%-test/queries/0_stateless/01453_normalize_query_alias_uuid.sql
+%%DATADIR%%-test/queries/0_stateless/00087_math_functions.reference
+%%DATADIR%%-test/queries/0_stateless/01960_lambda_precedence.reference
+%%DATADIR%%-test/queries/0_stateless/01414_mutations_and_errors.reference
+%%DATADIR%%-test/queries/0_stateless/01461_alter_table_function.sql
+%%DATADIR%%-test/queries/0_stateless/01811_storage_buffer_flush_parameters.reference
+%%DATADIR%%-test/queries/0_stateless/00978_live_view_watch.reference
+%%DATADIR%%-test/queries/0_stateless/00551_parse_or_null.reference
+%%DATADIR%%-test/queries/0_stateless/01350_intdiv_nontrivial_fpe.reference
+%%DATADIR%%-test/queries/0_stateless/02010_array_index_bad_cast.sql
+%%DATADIR%%-test/queries/0_stateless/01560_optimize_on_insert_zookeeper.reference
+%%DATADIR%%-test/queries/0_stateless/01646_system_restart_replicas_smoke.sql
+%%DATADIR%%-test/queries/0_stateless/00578_merge_table_shadow_virtual_column.reference
+%%DATADIR%%-test/queries/0_stateless/01237_live_view_over_distributed_with_subquery_select_table_alias.sql
+%%DATADIR%%-test/queries/0_stateless/01338_long_select_and_alter_zookeeper.reference
+%%DATADIR%%-test/queries/0_stateless/02015_async_inserts_7.sh
+%%DATADIR%%-test/queries/0_stateless/01015_random_constant.reference
+%%DATADIR%%-test/queries/0_stateless/01285_date_datetime_key_condition.reference
+%%DATADIR%%-test/queries/0_stateless/00940_order_by_read_in_order.sql
+%%DATADIR%%-test/queries/0_stateless/01456_modify_column_type_via_add_drop_update.sql
+%%DATADIR%%-test/queries/0_stateless/01404_roundUpToPowerOfTwoOrZero_safety.reference
+%%DATADIR%%-test/queries/0_stateless/02096_totals_global_in_bug.sql
+%%DATADIR%%-test/queries/0_stateless/01732_union_and_union_all.reference
+%%DATADIR%%-test/queries/0_stateless/02125_transform_decimal_bug.sql
+%%DATADIR%%-test/queries/0_stateless/01060_avro.sh
+%%DATADIR%%-test/queries/0_stateless/01459_decimal_casts.reference
+%%DATADIR%%-test/queries/0_stateless/02032_short_circuit_least_greatest_bug.reference
+%%DATADIR%%-test/queries/0_stateless/01936_quantiles_cannot_return_null.sql
+%%DATADIR%%-test/queries/0_stateless/00034_fixed_string_to_number.sql
+%%DATADIR%%-test/queries/0_stateless/01434_netloc_fuzz.reference
+%%DATADIR%%-test/queries/0_stateless/00702_where_with_quailified_names.reference
+%%DATADIR%%-test/queries/0_stateless/02047_client_exception.expect
+%%DATADIR%%-test/queries/0_stateless/01255_geo_types_livace.reference
+%%DATADIR%%-test/queries/0_stateless/00411_long_accurate_number_comparison_int3.sh
+%%DATADIR%%-test/queries/0_stateless/00414_time_zones_direct_conversion.reference
+%%DATADIR%%-test/queries/0_stateless/00174_compare_date_time_with_constant_string_in_in.reference
+%%DATADIR%%-test/queries/0_stateless/01533_optimize_skip_merged_partitions.reference
+%%DATADIR%%-test/queries/0_stateless/01958_partial_hour_timezone.reference
+%%DATADIR%%-test/queries/0_stateless/02020_cast_integer_overflow.sql
+%%DATADIR%%-test/queries/0_stateless/00800_low_cardinality_merge_join.sql
+%%DATADIR%%-test/queries/0_stateless/01523_client_local_queries_file_parameter.reference
+%%DATADIR%%-test/queries/0_stateless/01415_inconsistent_merge_tree_settings.reference
+%%DATADIR%%-test/queries/0_stateless/00147_alter_nested_default.reference
+%%DATADIR%%-test/queries/0_stateless/00056_join_number_string.reference
+%%DATADIR%%-test/queries/0_stateless/02050_clickhouse_client_local_exception.sh
+%%DATADIR%%-test/queries/0_stateless/01471_with_format.reference
+%%DATADIR%%-test/queries/0_stateless/01533_multiple_nested.sql
+%%DATADIR%%-test/queries/0_stateless/01709_inactive_parts_to_throw_insert.sql
+%%DATADIR%%-test/queries/0_stateless/00553_buff_exists_materlized_column.reference
 %%DATADIR%%-test/queries/0_stateless/01196_max_parser_depth.reference
-%%DATADIR%%-test/queries/0_stateless/01196_max_parser_depth.sh
-%%DATADIR%%-test/queries/0_stateless/01197_summing_enum.reference
-%%DATADIR%%-test/queries/0_stateless/01197_summing_enum.sql
-%%DATADIR%%-test/queries/0_stateless/01198_client_quota_key.reference
+%%DATADIR%%-test/queries/0_stateless/01009_insert_select_nicelulu.sql
+%%DATADIR%%-test/queries/0_stateless/01710_projections_in_distributed_query.reference
+%%DATADIR%%-test/queries/0_stateless/01091_insert_with_default_json.sql
+%%DATADIR%%-test/queries/0_stateless/01062_max_parser_depth.sh
+%%DATADIR%%-test/queries/0_stateless/02164_materialized_view_support_virtual_column.sql
+%%DATADIR%%-test/queries/0_stateless/02014_map_different_keys.sql
+%%DATADIR%%-test/queries/0_stateless/00170_lower_upper_utf8.reference
+%%DATADIR%%-test/queries/0_stateless/00364_java_style_denormals.sql
+%%DATADIR%%-test/queries/0_stateless/00431_if_nulls.sql
+%%DATADIR%%-test/queries/0_stateless/01010_partial_merge_join_negative.sql
+%%DATADIR%%-test/queries/0_stateless/00978_ml_math.reference
+%%DATADIR%%-test/queries/0_stateless/01746_convert_type_with_default.reference
+%%DATADIR%%-test/queries/0_stateless/00181_aggregate_functions_statistics_stable.reference
+%%DATADIR%%-test/queries/0_stateless/01037_polygon_dicts_correctness_all.ans
+%%DATADIR%%-test/queries/0_stateless/00089_group_by_arrays_of_fixed.reference
+%%DATADIR%%-test/queries/0_stateless/00135_duplicate_group_by_keys_segfault.reference
+%%DATADIR%%-test/queries/0_stateless/00928_multi_match_constant_constant.sql
+%%DATADIR%%-test/queries/0_stateless/01508_query_obfuscator.reference
+%%DATADIR%%-test/queries/0_stateless/00975_live_view_create.sql
+%%DATADIR%%-test/queries/0_stateless/01913_join_push_down_bug.sql
+%%DATADIR%%-test/queries/0_stateless/00089_group_by_arrays_of_fixed.sql
+%%DATADIR%%-test/queries/0_stateless/01274_alter_rename_column_distributed.reference
+%%DATADIR%%-test/queries/0_stateless/01674_executable_dictionary_implicit_key.sql
+%%DATADIR%%-test/queries/0_stateless/00632_get_sample_block_cache.reference
+%%DATADIR%%-test/queries/0_stateless/01514_input_format_csv_enum_as_number_setting.reference
+%%DATADIR%%-test/queries/0_stateless/00700_decimal_aggregates.reference
+%%DATADIR%%-test/queries/0_stateless/00945_bloom_filter_index.sql
+%%DATADIR%%-test/queries/0_stateless/01676_long_clickhouse_client_autocomplete.sh
+%%DATADIR%%-test/queries/0_stateless/01122_totals_rollup_having_block_header.sql
+%%DATADIR%%-test/queries/0_stateless/00954_resample_combinator.sql
+%%DATADIR%%-test/queries/0_stateless/01462_test_codec_on_alias.reference
+%%DATADIR%%-test/queries/0_stateless/00996_limit_with_ties.reference
+%%DATADIR%%-test/queries/0_stateless/00239_type_conversion_in_in.sql
+%%DATADIR%%-test/queries/0_stateless/00063_check_query.sql
+%%DATADIR%%-test/queries/0_stateless/01300_wkt.sql
+%%DATADIR%%-test/queries/0_stateless/00411_long_accurate_number_comparison_int2.sh
+%%DATADIR%%-test/queries/0_stateless/02104_json_strings_nullable_string.reference
+%%DATADIR%%-test/queries/0_stateless/01017_mutations_with_nondeterministic_functions_zookeeper.sh
+%%DATADIR%%-test/queries/0_stateless/00910_crash_when_distributed_modify_order_by.sql
+%%DATADIR%%-test/queries/0_stateless/01891_echo.sql
+%%DATADIR%%-test/queries/0_stateless/01555_system_distribution_queue_mask.sql
+%%DATADIR%%-test/queries/0_stateless/01318_encrypt.reference
+%%DATADIR%%-test/queries/0_stateless/01278_alter_rename_combination.reference
+%%DATADIR%%-test/queries/0_stateless/01532_collate_in_low_cardinality.sql
+%%DATADIR%%-test/queries/0_stateless/01349_mutation_datetime_key.sql
+%%DATADIR%%-test/queries/0_stateless/01124_view_bad_types.reference
+%%DATADIR%%-test/queries/0_stateless/02002_row_level_filter_bug.reference
+%%DATADIR%%-test/queries/0_stateless/00386_long_in_pk.reference
+%%DATADIR%%-test/queries/0_stateless/00914_replicate.sql
+%%DATADIR%%-test/queries/0_stateless/00700_decimal_compare.reference
+%%DATADIR%%-test/queries/0_stateless/01360_division_overflow.reference
+%%DATADIR%%-test/queries/0_stateless/00578_merge_table_sampling.sql
+%%DATADIR%%-test/queries/0_stateless/00927_asof_join_other_types.sh
+%%DATADIR%%-test/queries/0_stateless/00814_parsing_ub.sql
+%%DATADIR%%-test/queries/0_stateless/00995_order_by_with_fill.reference
+%%DATADIR%%-test/queries/0_stateless/01518_nullable_aggregate_states1.sql
+%%DATADIR%%-test/queries/0_stateless/02015_async_inserts_6.sh
+%%DATADIR%%-test/queries/0_stateless/00134_aggregation_by_fixed_string_of_size_1_2_4_8.sql
 %%DATADIR%%-test/queries/0_stateless/01198_client_quota_key.sh
-%%DATADIR%%-test/queries/0_stateless/01198_plus_inf.reference
-%%DATADIR%%-test/queries/0_stateless/01198_plus_inf.sql
-%%DATADIR%%-test/queries/0_stateless/01199_url_functions_path_without_schema_yiurule.reference
-%%DATADIR%%-test/queries/0_stateless/01199_url_functions_path_without_schema_yiurule.sql
-%%DATADIR%%-test/queries/0_stateless/01200_mutations_memory_consumption.reference
-%%DATADIR%%-test/queries/0_stateless/01200_mutations_memory_consumption.sql
-%%DATADIR%%-test/queries/0_stateless/01201_drop_column_compact_part_replicated_zookeeper.reference
-%%DATADIR%%-test/queries/0_stateless/01201_drop_column_compact_part_replicated_zookeeper.sql
-%%DATADIR%%-test/queries/0_stateless/01201_read_single_thread_in_order.reference
-%%DATADIR%%-test/queries/0_stateless/01201_read_single_thread_in_order.sql
-%%DATADIR%%-test/queries/0_stateless/01202_array_auc_special.reference
-%%DATADIR%%-test/queries/0_stateless/01202_array_auc_special.sql
-%%DATADIR%%-test/queries/0_stateless/01210_drop_view.reference
+%%DATADIR%%-test/queries/0_stateless/00648_replacing_empty_set_from_prewhere.sql
+%%DATADIR%%-test/queries/0_stateless/01611_string_to_low_cardinality_key_alter.reference
+%%DATADIR%%-test/queries/0_stateless/02160_untuple_exponential_growth.reference
+%%DATADIR%%-test/queries/0_stateless/01763_max_distributed_depth.reference
+%%DATADIR%%-test/queries/0_stateless/01672_test_toSecond_mysql_dialect.sql
+%%DATADIR%%-test/queries/0_stateless/00968_live_view_select_format_jsoneachrowwithprogress.sql
+%%DATADIR%%-test/queries/0_stateless/01747_executable_pool_dictionary_implicit_key.sql
+%%DATADIR%%-test/queries/0_stateless/02151_invalid_setting_with_hints_in_query.sh
+%%DATADIR%%-test/queries/0_stateless/00647_select_numbers_with_offset.sql
+%%DATADIR%%-test/queries/0_stateless/00164_not_chain.sql
+%%DATADIR%%-test/queries/0_stateless/01411_from_unixtime.sql
+%%DATADIR%%-test/queries/0_stateless/00623_replicated_truncate_table_zookeeper_long.sql
+%%DATADIR%%-test/queries/0_stateless/02098_with_types_use_header.reference
+%%DATADIR%%-test/queries/0_stateless/01602_temporary_table_in_system_tables.sql
+%%DATADIR%%-test/queries/0_stateless/00350_count_distinct.reference
+%%DATADIR%%-test/queries/0_stateless/00441_nulls_in.sql
+%%DATADIR%%-test/queries/0_stateless/01783_parallel_formatting_memory.sh
+%%DATADIR%%-test/queries/0_stateless/00961_visit_param_buffer_underflow.sql
+%%DATADIR%%-test/queries/0_stateless/01085_extract_all_empty.sql
+%%DATADIR%%-test/queries/0_stateless/00738_nested_merge_multidimensional_array.sql
+%%DATADIR%%-test/queries/0_stateless/01903_http_fields.reference
+%%DATADIR%%-test/queries/0_stateless/00534_filimonov.data
+%%DATADIR%%-test/queries/0_stateless/01080_check_for_error_incorrect_size_of_nested_column.sql
+%%DATADIR%%-test/queries/0_stateless/00275_shard_quantiles_weighted.reference
+%%DATADIR%%-test/queries/0_stateless/00320_between.sql
+%%DATADIR%%-test/queries/0_stateless/00436_convert_charset.sql
+%%DATADIR%%-test/queries/0_stateless/02029_test_implemented_methods.reference
+%%DATADIR%%-test/queries/0_stateless/01668_avg_weighted_ubsan.reference
+%%DATADIR%%-test/queries/0_stateless/01082_bit_test_out_of_bound.reference
+%%DATADIR%%-test/queries/0_stateless/02024_create_dictionary_with_comment.reference
+%%DATADIR%%-test/queries/0_stateless/02013_json_function_null_column.reference
+%%DATADIR%%-test/queries/0_stateless/00612_pk_in_tuple_perf.reference
+%%DATADIR%%-test/queries/0_stateless/01269_alias_type_differs.sql
+%%DATADIR%%-test/queries/0_stateless/01054_window_view_proc_tumble_to.reference
+%%DATADIR%%-test/queries/0_stateless/00427_alter_primary_key.sh
+%%DATADIR%%-test/queries/0_stateless/00156_array_map_to_constant.reference
+%%DATADIR%%-test/queries/0_stateless/00032_fixed_string_to_string.reference
+%%DATADIR%%-test/queries/0_stateless/01904_dictionary_default_nullable_type.reference
+%%DATADIR%%-test/queries/0_stateless/01902_dictionary_array_type.reference
+%%DATADIR%%-test/queries/0_stateless/00823_capnproto_input.reference
+%%DATADIR%%-test/queries/0_stateless/02113_base64encode_trailing_bytes_1.reference
+%%DATADIR%%-test/queries/0_stateless/00426_nulls_sorting.reference
+%%DATADIR%%-test/queries/0_stateless/00944_clear_index_in_partition.reference
+%%DATADIR%%-test/queries/0_stateless/01903_csvwithnames_subset_of_columns.reference
+%%DATADIR%%-test/queries/0_stateless/01088_array_slice_of_aggregate_functions.reference
+%%DATADIR%%-test/queries/0_stateless/00900_long_parquet.sh
+%%DATADIR%%-test/queries/0_stateless/02126_lc_window_functions.reference
+%%DATADIR%%-test/queries/0_stateless/00939_test_null_in.sql
+%%DATADIR%%-test/queries/0_stateless/00950_test_double_delta_codec.reference
+%%DATADIR%%-test/queries/0_stateless/00424_shard_aggregate_functions_of_nullable.sql
+%%DATADIR%%-test/queries/0_stateless/01501_clickhouse_client_INSERT_exception.reference
+%%DATADIR%%-test/queries/0_stateless/01797_StripeLog_rwlock_ub.sql
+%%DATADIR%%-test/queries/0_stateless/00749_inner_join_of_unnamed_subqueries.sql
+%%DATADIR%%-test/queries/0_stateless/01070_window_view_watch_events.reference
+%%DATADIR%%-test/queries/0_stateless/01306_benchmark_json.sh
+%%DATADIR%%-test/queries/0_stateless/02163_operators.reference
+%%DATADIR%%-test/queries/0_stateless/01085_max_distributed_connections.sh
+%%DATADIR%%-test/queries/0_stateless/00763_long_lock_buffer_alter_destination_table.reference
+%%DATADIR%%-test/queries/0_stateless/01232_untuple.reference
+%%DATADIR%%-test/queries/0_stateless/00647_select_numbers_with_offset.reference
+%%DATADIR%%-test/queries/0_stateless/01533_sum_if_nullable_bug.sql
+%%DATADIR%%-test/queries/0_stateless/01046_trivial_count_query_distributed.sql
+%%DATADIR%%-test/queries/0_stateless/01582_deterministic_function_with_predicate.sql
+%%DATADIR%%-test/queries/0_stateless/00612_union_query_with_subquery.reference
+%%DATADIR%%-test/queries/0_stateless/00589_removal_unused_columns_aggregation.reference
+%%DATADIR%%-test/queries/0_stateless/01700_deltasum.reference
+%%DATADIR%%-test/queries/0_stateless/00232_format_readable_size.reference
+%%DATADIR%%-test/queries/0_stateless/01747_executable_pool_dictionary_implicit_key.reference
+%%DATADIR%%-test/queries/0_stateless/00921_datetime64_compatibility_long.reference
+%%DATADIR%%-test/queries/0_stateless/00765_sql_compatibility_aliases.reference
+%%DATADIR%%-test/queries/0_stateless/00389_concat_operator.sql
+%%DATADIR%%-test/queries/0_stateless/01014_lazy_database_basic.sh
+%%DATADIR%%-test/queries/0_stateless/01600_detach_permanently.reference
+%%DATADIR%%-test/queries/0_stateless/02139_MV_with_scalar_subquery.reference
+%%DATADIR%%-test/queries/0_stateless/01403_datetime64_constant_arg.reference
+%%DATADIR%%-test/queries/0_stateless/00593_union_all_assert_columns_removed.sql
+%%DATADIR%%-test/queries/0_stateless/02028_add_default_database_for_alterquery_on_cluster.sql
+%%DATADIR%%-test/queries/0_stateless/01943_pmj_non_joined_stuck.reference.j2
+%%DATADIR%%-test/queries/0_stateless/01939_user_with_default_database.reference
+%%DATADIR%%-test/queries/0_stateless/01492_format_readable_quantity.sql
+%%DATADIR%%-test/queries/0_stateless/01821_table_comment.reference
+%%DATADIR%%-test/queries/0_stateless/01271_http_code_parse_error.reference
+%%DATADIR%%-test/queries/0_stateless/00763_lock_buffer_long.sh
+%%DATADIR%%-test/queries/0_stateless/01950_aliases_bad_cast.sql
+%%DATADIR%%-test/queries/0_stateless/00438_bit_rotate.sql
+%%DATADIR%%-test/queries/0_stateless/00533_uniq_array.reference
+%%DATADIR%%-test/queries/0_stateless/01781_token_extractor_buffer_overflow.reference
+%%DATADIR%%-test/queries/0_stateless/01092_base64.sql
+%%DATADIR%%-test/queries/0_stateless/01324_if_transform_strings_to_enum.sql
+%%DATADIR%%-test/queries/0_stateless/01656_ipv4_bad_formatting.reference
+%%DATADIR%%-test/queries/0_stateless/01491_nested_multiline_comments.sql
+%%DATADIR%%-test/queries/0_stateless/00310_tskv.reference
+%%DATADIR%%-test/queries/0_stateless/00390_array_sort.sql
+%%DATADIR%%-test/queries/0_stateless/00973_live_view_with_subquery_select_nested.sql
+%%DATADIR%%-test/queries/0_stateless/01831_max_streams.reference
+%%DATADIR%%-test/queries/0_stateless/01869_function_modulo_legacy.reference
+%%DATADIR%%-test/queries/0_stateless/01774_case_sensitive_connection_id.reference
+%%DATADIR%%-test/queries/0_stateless/01861_explain_pipeline.sql
+%%DATADIR%%-test/queries/0_stateless/01913_replace_dictionary.reference
+%%DATADIR%%-test/queries/0_stateless/01071_http_header_exception_code.reference
+%%DATADIR%%-test/queries/0_stateless/01676_round_int_ubsan.reference
+%%DATADIR%%-test/queries/0_stateless/01698_map_populate_overflow.reference
+%%DATADIR%%-test/queries/0_stateless/02127_storage_join_settings_with_persistency.sql
+%%DATADIR%%-test/queries/0_stateless/00410_aggregation_combinators_with_arenas.sql
+%%DATADIR%%-test/queries/0_stateless/01515_mv_and_array_join_optimisation_bag.sql
+%%DATADIR%%-test/queries/0_stateless/00918_has_unsufficient_type_check.sql
+%%DATADIR%%-test/queries/0_stateless/01079_bad_alters_zookeeper_long.reference
+%%DATADIR%%-test/queries/0_stateless/00331_final_and_prewhere.sql
+%%DATADIR%%-test/queries/0_stateless/00732_quorum_insert_simple_test_2_parts_zookeeper_long.reference
+%%DATADIR%%-test/queries/0_stateless/00016_totals_having_constants.sql
+%%DATADIR%%-test/queries/0_stateless/00407_parsing_nulls.sh
+%%DATADIR%%-test/queries/0_stateless/01419_materialize_null.sql
+%%DATADIR%%-test/queries/0_stateless/00197_if_fixed_string.reference
+%%DATADIR%%-test/queries/0_stateless/01151_storage_merge_filter_tables_by_virtual_column.sql
+%%DATADIR%%-test/queries/0_stateless/00006_extremes_and_subquery_from.sql
+%%DATADIR%%-test/queries/0_stateless/01823_explain_json.reference
+%%DATADIR%%-test/queries/0_stateless/02048_views_with_comment.reference
+%%DATADIR%%-test/queries/0_stateless/01527_materialized_view_stack_overflow.reference
+%%DATADIR%%-test/queries/0_stateless/00604_show_create_database.sql
+%%DATADIR%%-test/queries/0_stateless/01633_limit_fuzz.sql
+%%DATADIR%%-test/queries/0_stateless/01544_file_engine_settings.reference
+%%DATADIR%%-test/queries/0_stateless/00061_merge_tree_alter.reference
 %%DATADIR%%-test/queries/0_stateless/01210_drop_view.sql
-%%DATADIR%%-test/queries/0_stateless/01211_optimize_skip_unused_shards_type_mismatch.reference
-%%DATADIR%%-test/queries/0_stateless/01211_optimize_skip_unused_shards_type_mismatch.sql
-%%DATADIR%%-test/queries/0_stateless/01212_empty_join_and_totals.reference
-%%DATADIR%%-test/queries/0_stateless/01212_empty_join_and_totals.sql
-%%DATADIR%%-test/queries/0_stateless/01213_alter_rename_column.reference
-%%DATADIR%%-test/queries/0_stateless/01213_alter_rename_column.sql
-%%DATADIR%%-test/queries/0_stateless/01213_alter_rename_column_zookeeper_long.reference
-%%DATADIR%%-test/queries/0_stateless/01213_alter_rename_column_zookeeper_long.sh
-%%DATADIR%%-test/queries/0_stateless/01213_alter_rename_compact_part.reference
-%%DATADIR%%-test/queries/0_stateless/01213_alter_rename_compact_part.sql
-%%DATADIR%%-test/queries/0_stateless/01213_alter_rename_nested.reference
-%%DATADIR%%-test/queries/0_stateless/01213_alter_rename_nested.sql
-%%DATADIR%%-test/queries/0_stateless/01213_alter_rename_primary_key_zookeeper.reference
-%%DATADIR%%-test/queries/0_stateless/01213_alter_rename_primary_key_zookeeper.sql
-%%DATADIR%%-test/queries/0_stateless/01213_alter_rename_with_default_zookeeper.reference
-%%DATADIR%%-test/queries/0_stateless/01213_alter_rename_with_default_zookeeper.sql
-%%DATADIR%%-test/queries/0_stateless/01213_alter_table_rename_nested.reference
-%%DATADIR%%-test/queries/0_stateless/01213_alter_table_rename_nested.sql
-%%DATADIR%%-test/queries/0_stateless/01213_optimize_skip_unused_shards_DISTINCT.reference
-%%DATADIR%%-test/queries/0_stateless/01213_optimize_skip_unused_shards_DISTINCT.sql
-%%DATADIR%%-test/queries/0_stateless/01213_point_in_Myanmar.reference
-%%DATADIR%%-test/queries/0_stateless/01213_point_in_Myanmar.sql
-%%DATADIR%%-test/queries/0_stateless/01214_point_in_Mecca.reference
-%%DATADIR%%-test/queries/0_stateless/01214_point_in_Mecca.sql
-%%DATADIR%%-test/queries/0_stateless/01220_scalar_optimization_in_alter.reference
-%%DATADIR%%-test/queries/0_stateless/01220_scalar_optimization_in_alter.sql
-%%DATADIR%%-test/queries/0_stateless/01221_system_settings.reference
-%%DATADIR%%-test/queries/0_stateless/01221_system_settings.sql
-%%DATADIR%%-test/queries/0_stateless/01223_dist_on_dist.reference
-%%DATADIR%%-test/queries/0_stateless/01223_dist_on_dist.sql
-%%DATADIR%%-test/queries/0_stateless/01224_no_superfluous_dict_reload.reference
-%%DATADIR%%-test/queries/0_stateless/01224_no_superfluous_dict_reload.sql
-%%DATADIR%%-test/queries/0_stateless/01225_drop_dictionary_as_table.reference
-%%DATADIR%%-test/queries/0_stateless/01225_drop_dictionary_as_table.sql
-%%DATADIR%%-test/queries/0_stateless/01225_show_create_table_from_dictionary.reference
-%%DATADIR%%-test/queries/0_stateless/01225_show_create_table_from_dictionary.sql
-%%DATADIR%%-test/queries/0_stateless/01226_dist_on_dist_global_in.reference
-%%DATADIR%%-test/queries/0_stateless/01226_dist_on_dist_global_in.sql
-%%DATADIR%%-test/queries/0_stateless/01227_distributed_global_in_issue_2610.reference
-%%DATADIR%%-test/queries/0_stateless/01227_distributed_global_in_issue_2610.sql
-%%DATADIR%%-test/queries/0_stateless/01230_join_get_truncate.reference
-%%DATADIR%%-test/queries/0_stateless/01230_join_get_truncate.sql
-%%DATADIR%%-test/queries/0_stateless/01231_distributed_aggregation_memory_efficient_mix_levels.reference
-%%DATADIR%%-test/queries/0_stateless/01231_distributed_aggregation_memory_efficient_mix_levels.sql
-%%DATADIR%%-test/queries/0_stateless/01231_log_queries_min_type.reference
-%%DATADIR%%-test/queries/0_stateless/01231_log_queries_min_type.sql
-%%DATADIR%%-test/queries/0_stateless/01231_markdown_format.reference
-%%DATADIR%%-test/queries/0_stateless/01231_markdown_format.sql
-%%DATADIR%%-test/queries/0_stateless/01231_operator_null_in.reference
+%%DATADIR%%-test/queries/0_stateless/00610_materialized_view_forward_alter_partition_statements.sql
+%%DATADIR%%-test/queries/0_stateless/01258_wrong_cast_filimonov.sql
+%%DATADIR%%-test/queries/0_stateless/02113_base64encode_trailing_bytes_1.sql
+%%DATADIR%%-test/queries/0_stateless/01458_is_decimal_overflow.reference
+%%DATADIR%%-test/queries/0_stateless/01682_gather_utils_ubsan.sql
+%%DATADIR%%-test/queries/0_stateless/01297_create_quota.reference
+%%DATADIR%%-test/queries/0_stateless/02125_low_cardinality_int256.sql
+%%DATADIR%%-test/queries/0_stateless/00398_url_functions.sql
+%%DATADIR%%-test/queries/0_stateless/02098_hashed_array_dictionary_simple_key.sql
+%%DATADIR%%-test/queries/0_stateless/00470_identifiers_in_double_quotes.reference
+%%DATADIR%%-test/queries/0_stateless/01521_alter_enum_and_reverse_read.reference
+%%DATADIR%%-test/queries/0_stateless/01946_test_zstd_decompression_with_escape_sequence_at_the_end_of_buffer.sh
+%%DATADIR%%-test/queries/0_stateless/00386_long_in_pk.sh
+%%DATADIR%%-test/queries/0_stateless/01070_h3_get_base_cell.sql
+%%DATADIR%%-test/queries/0_stateless/00345_index_accurate_comparison.sql
+%%DATADIR%%-test/queries/0_stateless/00972_desc_table_virtual_columns.reference
+%%DATADIR%%-test/queries/0_stateless/00521_multidimensional.sql
+%%DATADIR%%-test/queries/0_stateless/01890_stem.sql
+%%DATADIR%%-test/queries/0_stateless/01246_insert_into_watch_live_view.py
+%%DATADIR%%-test/queries/0_stateless/00287_column_const_with_nan.sql
+%%DATADIR%%-test/queries/0_stateless/01802_formatDateTime_DateTime64_century.reference
+%%DATADIR%%-test/queries/0_stateless/00964_os_thread_priority.sql
+%%DATADIR%%-test/queries/0_stateless/02102_sql_user_defined_functions_create_if_not_exists.sql
 %%DATADIR%%-test/queries/0_stateless/01231_operator_null_in.sql
-%%DATADIR%%-test/queries/0_stateless/01232_extremes.reference
-%%DATADIR%%-test/queries/0_stateless/01232_extremes.sql
-%%DATADIR%%-test/queries/0_stateless/01232_json_as_string_format.reference
-%%DATADIR%%-test/queries/0_stateless/01232_json_as_string_format.sh
-%%DATADIR%%-test/queries/0_stateless/01232_preparing_sets_race_condition_long.reference
-%%DATADIR%%-test/queries/0_stateless/01232_preparing_sets_race_condition_long.sh
-%%DATADIR%%-test/queries/0_stateless/01232_untuple.reference
-%%DATADIR%%-test/queries/0_stateless/01232_untuple.sql
-%%DATADIR%%-test/queries/0_stateless/01234_to_string_monotonic.reference
-%%DATADIR%%-test/queries/0_stateless/01234_to_string_monotonic.sql
-%%DATADIR%%-test/queries/0_stateless/01235_live_view_over_distributed.reference
-%%DATADIR%%-test/queries/0_stateless/01235_live_view_over_distributed.sql
-%%DATADIR%%-test/queries/0_stateless/01236_distributed_over_live_view_over_distributed.reference
-%%DATADIR%%-test/queries/0_stateless/01236_distributed_over_live_view_over_distributed.sql
-%%DATADIR%%-test/queries/0_stateless/01236_graphite_mt.reference
-%%DATADIR%%-test/queries/0_stateless/01236_graphite_mt.sql
-%%DATADIR%%-test/queries/0_stateless/01237_live_view_over_distributed_with_subquery_select_table_alias.reference
-%%DATADIR%%-test/queries/0_stateless/01237_live_view_over_distributed_with_subquery_select_table_alias.sql
-%%DATADIR%%-test/queries/0_stateless/01238_http_memory_tracking.reference
-%%DATADIR%%-test/queries/0_stateless/01238_http_memory_tracking.sh
-%%DATADIR%%-test/queries/0_stateless/01240_join_get_or_null.reference
-%%DATADIR%%-test/queries/0_stateless/01240_join_get_or_null.sql
-%%DATADIR%%-test/queries/0_stateless/01244_optimize_distributed_group_by_sharding_key.reference
-%%DATADIR%%-test/queries/0_stateless/01244_optimize_distributed_group_by_sharding_key.sql
-%%DATADIR%%-test/queries/0_stateless/01245_distributed_group_by_no_merge_with-extremes_and_totals.reference
-%%DATADIR%%-test/queries/0_stateless/01245_distributed_group_by_no_merge_with-extremes_and_totals.sql
-%%DATADIR%%-test/queries/0_stateless/01245_limit_infinite_sources.reference
-%%DATADIR%%-test/queries/0_stateless/01245_limit_infinite_sources.sql
-%%DATADIR%%-test/queries/0_stateless/01246_buffer_flush.reference
-%%DATADIR%%-test/queries/0_stateless/01246_buffer_flush.sql
-%%DATADIR%%-test/queries/0_stateless/01246_extractAllGroupsHorizontal.reference
+%%DATADIR%%-test/queries/0_stateless/01707_join_use_nulls.sql
+%%DATADIR%%-test/queries/0_stateless/01096_array_reduce_in_ranges.reference
+%%DATADIR%%-test/queries/0_stateless/01154_move_partition_long.sh
+%%DATADIR%%-test/queries/0_stateless/01458_named_tuple_millin.sql
+%%DATADIR%%-test/queries/0_stateless/00054_join_string.sql
+%%DATADIR%%-test/queries/0_stateless/01951_distributed_push_down_limit.reference
 %%DATADIR%%-test/queries/0_stateless/01246_extractAllGroupsHorizontal.sql
-%%DATADIR%%-test/queries/0_stateless/01246_extractAllGroupsVertical.reference
-%%DATADIR%%-test/queries/0_stateless/01246_extractAllGroupsVertical.sql
-%%DATADIR%%-test/queries/0_stateless/01246_finalize_aggregation_race.reference
-%%DATADIR%%-test/queries/0_stateless/01246_finalize_aggregation_race.sql
-%%DATADIR%%-test/queries/0_stateless/01246_insert_into_watch_live_view.py
-%%DATADIR%%-test/queries/0_stateless/01246_insert_into_watch_live_view.reference
-%%DATADIR%%-test/queries/0_stateless/01246_least_greatest_generic.reference
+%%DATADIR%%-test/queries/0_stateless/01355_defaultValueOfArgumentType_bug.reference
+%%DATADIR%%-test/queries/0_stateless/01710_normal_projection_fix1.reference
 %%DATADIR%%-test/queries/0_stateless/01246_least_greatest_generic.sql
-%%DATADIR%%-test/queries/0_stateless/01247_least_greatest_filimonov.reference
-%%DATADIR%%-test/queries/0_stateless/01247_least_greatest_filimonov.sql
-%%DATADIR%%-test/queries/0_stateless/01247_optimize_distributed_group_by_sharding_key_dist_on_dist.reference
-%%DATADIR%%-test/queries/0_stateless/01247_optimize_distributed_group_by_sharding_key_dist_on_dist.sql
-%%DATADIR%%-test/queries/0_stateless/01247_some_msan_crashs_from_22517.reference
-%%DATADIR%%-test/queries/0_stateless/01247_some_msan_crashs_from_22517.sql
-%%DATADIR%%-test/queries/0_stateless/01248_least_greatest_mixed_const.reference
-%%DATADIR%%-test/queries/0_stateless/01248_least_greatest_mixed_const.sql
-%%DATADIR%%-test/queries/0_stateless/01249_bad_arguments_for_bloom_filter.reference
-%%DATADIR%%-test/queries/0_stateless/01249_bad_arguments_for_bloom_filter.sql
-%%DATADIR%%-test/queries/0_stateless/01249_flush_interactive.reference
-%%DATADIR%%-test/queries/0_stateless/01249_flush_interactive.sh
-%%DATADIR%%-test/queries/0_stateless/01250_fixed_string_comparison.reference
-%%DATADIR%%-test/queries/0_stateless/01250_fixed_string_comparison.sql
-%%DATADIR%%-test/queries/0_stateless/01251_dict_is_in_infinite_loop.reference
-%%DATADIR%%-test/queries/0_stateless/01251_dict_is_in_infinite_loop.sql
-%%DATADIR%%-test/queries/0_stateless/01251_string_comparison.reference
-%%DATADIR%%-test/queries/0_stateless/01251_string_comparison.sql
-%%DATADIR%%-test/queries/0_stateless/01252_weird_time_zone.reference
-%%DATADIR%%-test/queries/0_stateless/01252_weird_time_zone.sql
-%%DATADIR%%-test/queries/0_stateless/01253_subquery_in_aggregate_function_JustStranger.reference
-%%DATADIR%%-test/queries/0_stateless/01253_subquery_in_aggregate_function_JustStranger.sql
-%%DATADIR%%-test/queries/0_stateless/01254_array_of_unnamed_tuples.reference
-%%DATADIR%%-test/queries/0_stateless/01254_array_of_unnamed_tuples.sql
-%%DATADIR%%-test/queries/0_stateless/01254_dict_create_without_db.reference
-%%DATADIR%%-test/queries/0_stateless/01254_dict_create_without_db.sql
-%%DATADIR%%-test/queries/0_stateless/01254_dict_load_after_detach_attach.reference
-%%DATADIR%%-test/queries/0_stateless/01254_dict_load_after_detach_attach.sql
-%%DATADIR%%-test/queries/0_stateless/01255_geo_types_livace.reference
-%%DATADIR%%-test/queries/0_stateless/01255_geo_types_livace.sql
-%%DATADIR%%-test/queries/0_stateless/01256_misspell_layout_name_podshumok.reference
-%%DATADIR%%-test/queries/0_stateless/01256_misspell_layout_name_podshumok.sql
-%%DATADIR%%-test/queries/0_stateless/01256_negative_generate_random.reference
-%%DATADIR%%-test/queries/0_stateless/01256_negative_generate_random.sql
+%%DATADIR%%-test/queries/0_stateless/00273_quantiles.sql
+%%DATADIR%%-test/queries/0_stateless/01660_join_or_all.sql
+%%DATADIR%%-test/queries/0_stateless/00918_json_functions.reference
+%%DATADIR%%-test/queries/0_stateless/01585_use_index_for_global_in_with_null.sql
+%%DATADIR%%-test/queries/0_stateless/01851_array_difference_decimal_overflow_ubsan.reference
+%%DATADIR%%-test/queries/0_stateless/02157_line_as_string_output_format.reference
+%%DATADIR%%-test/queries/0_stateless/02134_async_inserts_formats.reference
+%%DATADIR%%-test/queries/0_stateless/02021_exponential_sum.sql
+%%DATADIR%%-test/queries/0_stateless/01500_StorageFile_write_to_fd.reference
+%%DATADIR%%-test/queries/0_stateless/01881_union_header_mismatch_bug.reference
+%%DATADIR%%-test/queries/0_stateless/01440_big_int_arithm.sql
+%%DATADIR%%-test/queries/0_stateless/01670_log_comment.sql
+%%DATADIR%%-test/queries/0_stateless/01321_monotonous_functions_in_order_by.sql
+%%DATADIR%%-test/queries/0_stateless/00291_array_reduce.reference
+%%DATADIR%%-test/queries/0_stateless/00752_low_cardinality_array_result.sql
+%%DATADIR%%-test/queries/0_stateless/01042_h3_k_ring.sql
+%%DATADIR%%-test/queries/0_stateless/00551_parse_or_null.sql
+%%DATADIR%%-test/queries/0_stateless/01524_do_not_merge_across_partitions_select_final.sql
+%%DATADIR%%-test/queries/0_stateless/02142_http_with_query_parameters.sh
+%%DATADIR%%-test/queries/0_stateless/00617_array_in.sql
+%%DATADIR%%-test/queries/0_stateless/01457_min_index_granularity_bytes_setting.sql
+%%DATADIR%%-test/queries/0_stateless/00283_column_cut.sql
+%%DATADIR%%-test/queries/0_stateless/00561_storage_join.reference
+%%DATADIR%%-test/queries/0_stateless/00612_pk_in_tuple.sql
+%%DATADIR%%-test/queries/0_stateless/01499_log_deadlock.reference
+%%DATADIR%%-test/queries/0_stateless/00078_string_concat.sql
+%%DATADIR%%-test/queries/0_stateless/01344_min_bytes_to_use_mmap_io_index.reference
+%%DATADIR%%-test/queries/0_stateless/01317_no_password_in_command_line.sh
+%%DATADIR%%-test/queries/0_stateless/00210_insert_select_extremes_http.reference
+%%DATADIR%%-test/queries/0_stateless/00200_shard_distinct_order_by_limit_distributed.reference
+%%DATADIR%%-test/queries/0_stateless/01913_replace_dictionary.sql
+%%DATADIR%%-test/queries/0_stateless/01710_projection_drop_if_exists.reference
+%%DATADIR%%-test/queries/0_stateless/01045_bloom_filter_null_array.sql
+%%DATADIR%%-test/queries/0_stateless/01064_window_view_event_hop_to_bounded.sh
+%%DATADIR%%-test/queries/0_stateless/00687_top_and_offset.sh
+%%DATADIR%%-test/queries/0_stateless/01942_dateTimeToSnowflake.sql
+%%DATADIR%%-test/queries/0_stateless/01391_join_on_dict_crash.reference
+%%DATADIR%%-test/queries/0_stateless/01414_mutations_and_errors_zookeeper.sh
+%%DATADIR%%-test/queries/0_stateless/01361_buffer_table_flush_with_materialized_view.reference
+%%DATADIR%%-test/queries/0_stateless/01821_join_table_mutation.reference
+%%DATADIR%%-test/queries/0_stateless/00254_tuple_extremes.sql
+%%DATADIR%%-test/queries/0_stateless/01275_extract_groups_check.sql
+%%DATADIR%%-test/queries/0_stateless/01769_extended_range_2.sql
+%%DATADIR%%-test/queries/0_stateless/00415_into_outfile.reference
+%%DATADIR%%-test/queries/0_stateless/00335_bom.sh
+%%DATADIR%%-test/queries/0_stateless/00691_array_distinct.reference
+%%DATADIR%%-test/queries/0_stateless/00082_append_trailing_char_if_absent.reference
+%%DATADIR%%-test/queries/0_stateless/00678_shard_funnel_window.reference
+%%DATADIR%%-test/queries/0_stateless/01746_test_for_tupleElement_must_be_constant_issue.reference
+%%DATADIR%%-test/queries/0_stateless/00804_test_alter_compression_codecs.sql
+%%DATADIR%%-test/queries/0_stateless/01083_functional_index_in_mergetree.sql
+%%DATADIR%%-test/queries/0_stateless/00151_tuple_with_array.reference
+%%DATADIR%%-test/queries/0_stateless/00233_position_function_family.reference
+%%DATADIR%%-test/queries/0_stateless/01735_to_datetime64.sql
+%%DATADIR%%-test/queries/0_stateless/01814_distributed_push_down_limit.reference
+%%DATADIR%%-test/queries/0_stateless/01017_uniqCombined_memory_usage.sql
+%%DATADIR%%-test/queries/0_stateless/00077_set_keys_fit_128_bits_many_blocks.reference
+%%DATADIR%%-test/queries/0_stateless/01390_remove_injective_in_uniq.sql
+%%DATADIR%%-test/queries/0_stateless/00179_lambdas_with_common_expressions_and_filter.reference
+%%DATADIR%%-test/queries/0_stateless/00990_hasToken_and_tokenbf.reference
+%%DATADIR%%-test/queries/0_stateless/01533_distinct_depends_on_max_threads.sql
+%%DATADIR%%-test/queries/0_stateless/00731_long_merge_tree_select_opened_files.reference
+%%DATADIR%%-test/queries/0_stateless/00650_array_enumerate_uniq_with_tuples.sql
+%%DATADIR%%-test/queries/0_stateless/02003_memory_limit_in_client.expect
+%%DATADIR%%-test/queries/0_stateless/01865_aggregator_overflow_row.reference
+%%DATADIR%%-test/queries/0_stateless/02127_connection_drain.sh
+%%DATADIR%%-test/queries/0_stateless/00846_join_using_tuple_crash.reference
+%%DATADIR%%-test/queries/0_stateless/02113_hdfs_assert.sh
+%%DATADIR%%-test/queries/0_stateless/01600_log_queries_with_extensive_info.sh
+%%DATADIR%%-test/queries/0_stateless/01653_tuple_hamming_distance_2.reference
+%%DATADIR%%-test/queries/0_stateless/01283_max_threads_simple_query_optimization.reference
+%%DATADIR%%-test/queries/0_stateless/00235_create_temporary_table_as.reference
 %%DATADIR%%-test/queries/0_stateless/01257_dictionary_mismatch_types.reference
-%%DATADIR%%-test/queries/0_stateless/01257_dictionary_mismatch_types.sql
-%%DATADIR%%-test/queries/0_stateless/01258_bom_tsv.reference
-%%DATADIR%%-test/queries/0_stateless/01258_bom_tsv.sh
-%%DATADIR%%-test/queries/0_stateless/01258_wrong_cast_filimonov.reference
-%%DATADIR%%-test/queries/0_stateless/01258_wrong_cast_filimonov.sql
-%%DATADIR%%-test/queries/0_stateless/01259_combinator_distinct.reference
-%%DATADIR%%-test/queries/0_stateless/01259_combinator_distinct.sql
-%%DATADIR%%-test/queries/0_stateless/01259_combinator_distinct_distributed.reference
+%%DATADIR%%-test/queries/0_stateless/01048_exists_query.sql
+%%DATADIR%%-test/queries/0_stateless/01280_opencl_bitonic_order_by.sql
+%%DATADIR%%-test/queries/0_stateless/01451_replicated_detach_drop_part_long.reference
+%%DATADIR%%-test/queries/0_stateless/02050_clickhouse_local_parsing_exception.reference
+%%DATADIR%%-test/queries/0_stateless/01565_reconnect_after_client_error.reference
+%%DATADIR%%-test/queries/0_stateless/00907_set_index_with_nullable_and_low_cardinality.reference
+%%DATADIR%%-test/queries/0_stateless/01040_dictionary_invalidate_query_switchover_long.reference
+%%DATADIR%%-test/queries/0_stateless/00400_client_external_options.reference
+%%DATADIR%%-test/queries/0_stateless/00712_nan_comparison.reference
+%%DATADIR%%-test/queries/0_stateless/01661_test_toDayOfWeek_mysql_compatibility.reference
+%%DATADIR%%-test/queries/0_stateless/01015_database_bad_tables.reference
+%%DATADIR%%-test/queries/0_stateless/01916_multiple_join_view_optimize_predicate_chertus.reference
+%%DATADIR%%-test/queries/0_stateless/01518_nullable_aggregate_states1.reference
+%%DATADIR%%-test/queries/0_stateless/00119_storage_join.reference
+%%DATADIR%%-test/queries/0_stateless/00180_attach_materialized_view.sql
+%%DATADIR%%-test/queries/0_stateless/01780_column_sparse_alter.sql
+%%DATADIR%%-test/queries/0_stateless/00984_materialized_view_to_columns.sql
+%%DATADIR%%-test/queries/0_stateless/01480_binary_operator_monotonicity.sql
+%%DATADIR%%-test/queries/0_stateless/01386_negative_float_constant_key_condition.reference
 %%DATADIR%%-test/queries/0_stateless/01259_combinator_distinct_distributed.sql
-%%DATADIR%%-test/queries/0_stateless/01259_datetime64_ubsan.reference
-%%DATADIR%%-test/queries/0_stateless/01259_datetime64_ubsan.sql
-%%DATADIR%%-test/queries/0_stateless/01259_dictionary_custom_settings_ddl.reference
-%%DATADIR%%-test/queries/0_stateless/01259_dictionary_custom_settings_ddl.sql
-%%DATADIR%%-test/queries/0_stateless/01260_ubsan_decimal_parse.reference
-%%DATADIR%%-test/queries/0_stateless/01260_ubsan_decimal_parse.sql
+%%DATADIR%%-test/queries/0_stateless/00957_neighbor.reference
+%%DATADIR%%-test/queries/0_stateless/00367_visible_width_of_array_tuple_enum.sql
+%%DATADIR%%-test/queries/0_stateless/00493_substring_of_fixedstring.reference
+%%DATADIR%%-test/queries/0_stateless/01601_proxy_protocol.reference
+%%DATADIR%%-test/queries/0_stateless/01370_client_autocomplete_word_break_characters.expect
+%%DATADIR%%-test/queries/0_stateless/00337_shard_any_heavy.sql
+%%DATADIR%%-test/queries/0_stateless/00628_in_lambda_on_merge_table_bug.sql
+%%DATADIR%%-test/queries/0_stateless/00973_live_view_select.sql
+%%DATADIR%%-test/queries/0_stateless/01890_cross_join_explain_crash.reference
+%%DATADIR%%-test/queries/0_stateless/01211_optimize_skip_unused_shards_type_mismatch.sql
+%%DATADIR%%-test/queries/0_stateless/01056_predicate_optimizer_bugs.sql
+%%DATADIR%%-test/queries/0_stateless/01593_concurrent_alter_mutations_kill.sh
+%%DATADIR%%-test/queries/0_stateless/01231_distributed_aggregation_memory_efficient_mix_levels.reference
+%%DATADIR%%-test/queries/0_stateless/01012_reset_running_accumulate.sql
+%%DATADIR%%-test/queries/0_stateless/01320_optimize_skip_unused_shards_no_non_deterministic.reference
+%%DATADIR%%-test/queries/0_stateless/01056_predicate_optimizer_bugs.reference
+%%DATADIR%%-test/queries/0_stateless/00857_global_joinsavel_table_alias.sql
+%%DATADIR%%-test/queries/0_stateless/02101_empty_as_default_and_omitted_fields.reference
+%%DATADIR%%-test/queries/0_stateless/01294_create_settings_profile.sql
+%%DATADIR%%-test/queries/0_stateless/00579_merge_tree_partition_and_primary_keys_using_same_expression.reference
+%%DATADIR%%-test/queries/0_stateless/02030_function_mapContainsKeyLike.sql
+%%DATADIR%%-test/queries/0_stateless/00927_disable_hyperscan.reference
+%%DATADIR%%-test/queries/0_stateless/00067_replicate_segfault.reference
+%%DATADIR%%-test/queries/0_stateless/00088_distinct_of_arrays_of_strings.reference
+%%DATADIR%%-test/queries/0_stateless/02114_hdfs_bad_url.reference
+%%DATADIR%%-test/queries/0_stateless/01231_markdown_format.reference
+%%DATADIR%%-test/queries/0_stateless/01815_with_mergeable_state_after_aggregation_and_limit.sh
+%%DATADIR%%-test/queries/0_stateless/01481_join_with_materialized.reference
+%%DATADIR%%-test/queries/0_stateless/01817_storage_buffer_parameters.sql
+%%DATADIR%%-test/queries/0_stateless/01594_storage_join_uuid.reference
+%%DATADIR%%-test/queries/0_stateless/01390_check_table_codec.reference
+%%DATADIR%%-test/queries/0_stateless/01332_join_type_syntax_position.sql
+%%DATADIR%%-test/queries/0_stateless/00098_j_union_all.reference
+%%DATADIR%%-test/queries/0_stateless/01666_gcd_ubsan.reference
+%%DATADIR%%-test/queries/0_stateless/00728_json_each_row_parsing.reference
+%%DATADIR%%-test/queries/0_stateless/00941_system_columns_race_condition.sh
+%%DATADIR%%-test/queries/0_stateless/01475_read_subcolumns.sql
+%%DATADIR%%-test/queries/0_stateless/02011_tuple_vector_functions.sql
+%%DATADIR%%-test/queries/0_stateless/00039_inserts_through_http.sh
+%%DATADIR%%-test/queries/0_stateless/00514_interval_operators.reference
+%%DATADIR%%-test/queries/0_stateless/00740_optimize_predicate_expression.sql
+%%DATADIR%%-test/queries/0_stateless/01634_summap_nullable.reference
+%%DATADIR%%-test/queries/0_stateless/01576_alias_column_rewrite.reference
+%%DATADIR%%-test/queries/0_stateless/00148_summing_merge_tree_aggregate_function.reference
+%%DATADIR%%-test/queries/0_stateless/00906_low_cardinality_rollup.reference
+%%DATADIR%%-test/queries/0_stateless/00916_join_using_duplicate_columns.sql
+%%DATADIR%%-test/queries/0_stateless/02102_sql_user_defined_functions_create_if_not_exists.reference
+%%DATADIR%%-test/queries/0_stateless/01319_optimize_skip_unused_shards_nesting.reference
+%%DATADIR%%-test/queries/0_stateless/02124_buffer_with_type_map_long.reference
+%%DATADIR%%-test/queries/0_stateless/00575_illegal_column_exception_when_drop_depen_column.sh
+%%DATADIR%%-test/queries/0_stateless/02129_skip_quoted_fields.sh
+%%DATADIR%%-test/queries/0_stateless/02019_multiple_weird_with_fill.reference
+%%DATADIR%%-test/queries/0_stateless/01509_dictionary_preallocate.reference
+%%DATADIR%%-test/queries/0_stateless/01600_encode_XML.sql
+%%DATADIR%%-test/queries/0_stateless/00800_low_cardinality_join.reference
+%%DATADIR%%-test/queries/0_stateless/02015_async_inserts_stress_long.sh
+%%DATADIR%%-test/queries/0_stateless/01569_query_profiler_big_query_id.reference
+%%DATADIR%%-test/queries/0_stateless/00368_format_option_collision.sh
+%%DATADIR%%-test/queries/0_stateless/00999_test_skip_indices_with_alter_and_merge.sql
+%%DATADIR%%-test/queries/0_stateless/00188_constants_as_arguments_of_aggregate_functions.reference
+%%DATADIR%%-test/queries/0_stateless/01120_join_constants.reference
+%%DATADIR%%-test/queries/0_stateless/00262_alter_alias.reference
+%%DATADIR%%-test/queries/0_stateless/01458_named_tuple_millin.reference
+%%DATADIR%%-test/queries/0_stateless/00945_ml_test.sql
+%%DATADIR%%-test/queries/0_stateless/01213_alter_table_rename_nested.reference
+%%DATADIR%%-test/queries/0_stateless/00371_union_all.reference
+%%DATADIR%%-test/queries/0_stateless/01425_decimal_parse_big_negative_exponent.sql
+%%DATADIR%%-test/queries/0_stateless/00275_shard_quantiles_weighted.sql
+%%DATADIR%%-test/queries/0_stateless/01096_zeros.sql
+%%DATADIR%%-test/queries/0_stateless/01512_create_replicate_merge_tree_one_arg.sql
+%%DATADIR%%-test/queries/0_stateless/00961_check_table.sql
+%%DATADIR%%-test/queries/0_stateless/02131_materialize_column_cast.reference
+%%DATADIR%%-test/queries/0_stateless/01522_validate_alter_default.sql
+%%DATADIR%%-test/queries/0_stateless/00384_column_aggregate_function_insert_from.reference
+%%DATADIR%%-test/queries/0_stateless/00582_not_aliasing_functions.reference
+%%DATADIR%%-test/queries/0_stateless/01375_compact_parts_codecs.sql
+%%DATADIR%%-test/queries/0_stateless/00201_array_uniq.sql
+%%DATADIR%%-test/queries/0_stateless/02152_bool_type_parsing.sh
+%%DATADIR%%-test/queries/0_stateless/01909_mbtolou.reference
+%%DATADIR%%-test/queries/0_stateless/00098_e_union_all.sql
+%%DATADIR%%-test/queries/0_stateless/00073_merge_sorting_empty_array_joined.reference
+%%DATADIR%%-test/queries/0_stateless/01881_union_header_mismatch_bug.sql
+%%DATADIR%%-test/queries/0_stateless/00988_constraints_replication_zookeeper_long.reference
+%%DATADIR%%-test/queries/0_stateless/01803_const_nullable_map.reference
 %%DATADIR%%-test/queries/0_stateless/01262_fractional_timezone_near_start_of_epoch.reference
-%%DATADIR%%-test/queries/0_stateless/01262_fractional_timezone_near_start_of_epoch.sql
-%%DATADIR%%-test/queries/0_stateless/01262_low_cardinality_remove.reference
-%%DATADIR%%-test/queries/0_stateless/01262_low_cardinality_remove.sql
-%%DATADIR%%-test/queries/0_stateless/01263_type_conversion_nvartolomei.reference
-%%DATADIR%%-test/queries/0_stateless/01263_type_conversion_nvartolomei.sql
-%%DATADIR%%-test/queries/0_stateless/01264_nested_baloo_bear.reference
-%%DATADIR%%-test/queries/0_stateless/01264_nested_baloo_bear.sql
-%%DATADIR%%-test/queries/0_stateless/01265_datetime_string_comparison_felix_mueller.reference
-%%DATADIR%%-test/queries/0_stateless/01265_datetime_string_comparison_felix_mueller.sql
-%%DATADIR%%-test/queries/0_stateless/01266_default_prewhere_reqq.reference
-%%DATADIR%%-test/queries/0_stateless/01266_default_prewhere_reqq.sql
-%%DATADIR%%-test/queries/0_stateless/01267_alter_default_key_columns_zookeeper.reference
-%%DATADIR%%-test/queries/0_stateless/01267_alter_default_key_columns_zookeeper.sql
-%%DATADIR%%-test/queries/0_stateless/01268_DateTime64_in_WHERE.reference
-%%DATADIR%%-test/queries/0_stateless/01268_DateTime64_in_WHERE.sql
-%%DATADIR%%-test/queries/0_stateless/01268_data_numeric_parameters.reference
-%%DATADIR%%-test/queries/0_stateless/01268_data_numeric_parameters.sql
-%%DATADIR%%-test/queries/0_stateless/01268_dictionary_direct_layout.reference
-%%DATADIR%%-test/queries/0_stateless/01268_dictionary_direct_layout.sql
-%%DATADIR%%-test/queries/0_stateless/01268_mergine_sorted_limit.reference
-%%DATADIR%%-test/queries/0_stateless/01268_mergine_sorted_limit.sql
-%%DATADIR%%-test/queries/0_stateless/01268_mv_scalars.reference
-%%DATADIR%%-test/queries/0_stateless/01268_mv_scalars.sql
-%%DATADIR%%-test/queries/0_stateless/01268_procfs_metrics.reference
-%%DATADIR%%-test/queries/0_stateless/01268_procfs_metrics.sh
-%%DATADIR%%-test/queries/0_stateless/01268_shard_avgweighted.reference
-%%DATADIR%%-test/queries/0_stateless/01268_shard_avgweighted.sql
-%%DATADIR%%-test/queries/0_stateless/01269_alias_type_differs.reference
-%%DATADIR%%-test/queries/0_stateless/01269_alias_type_differs.sql
-%%DATADIR%%-test/queries/0_stateless/01269_create_with_null.reference
-%%DATADIR%%-test/queries/0_stateless/01269_create_with_null.sql
-%%DATADIR%%-test/queries/0_stateless/01269_toStartOfSecond.reference
-%%DATADIR%%-test/queries/0_stateless/01269_toStartOfSecond.sql
-%%DATADIR%%-test/queries/0_stateless/01270_optimize_skip_unused_shards_low_cardinality.reference
-%%DATADIR%%-test/queries/0_stateless/01270_optimize_skip_unused_shards_low_cardinality.sql
-%%DATADIR%%-test/queries/0_stateless/01271_http_code_parse_error.reference
-%%DATADIR%%-test/queries/0_stateless/01271_http_code_parse_error.sh
-%%DATADIR%%-test/queries/0_stateless/01271_optimize_arithmetic_operations_in_aggr_func_long.reference
+%%DATADIR%%-test/queries/0_stateless/00585_union_all_subquery_aggregation_column_removal.reference
+%%DATADIR%%-test/queries/0_stateless/00609_distributed_with_case_when_then.sql
+%%DATADIR%%-test/queries/0_stateless/01768_extended_range.reference
+%%DATADIR%%-test/queries/0_stateless/01015_random_constant.sql
+%%DATADIR%%-test/queries/0_stateless/02131_remove_columns_in_subquery.sql
+%%DATADIR%%-test/queries/0_stateless/01597_columns_list_ignored.reference
+%%DATADIR%%-test/queries/0_stateless/01390_check_table_codec.sql
+%%DATADIR%%-test/queries/0_stateless/00978_live_view_watch.sql
+%%DATADIR%%-test/queries/0_stateless/01600_benchmark_query.reference
+%%DATADIR%%-test/queries/0_stateless/00938_template_input_format.reference
+%%DATADIR%%-test/queries/0_stateless/01002_alter_nullable_adaptive_granularity_long.sh
+%%DATADIR%%-test/queries/0_stateless/00406_tuples_with_nulls.sql
+%%DATADIR%%-test/queries/0_stateless/01361_buffer_table_flush_with_materialized_view.sql
+%%DATADIR%%-test/queries/0_stateless/01475_mutation_with_if.sql
+%%DATADIR%%-test/queries/0_stateless/01783_merge_engine_join_key_condition.sql
+%%DATADIR%%-test/queries/0_stateless/00524_time_intervals_months_underflow.sql
+%%DATADIR%%-test/queries/0_stateless/01739_index_hint.reference
+%%DATADIR%%-test/queries/0_stateless/02103_tsv_csv_custom_null_representation.reference
+%%DATADIR%%-test/queries/0_stateless/01932_global_in_function.reference
+%%DATADIR%%-test/queries/0_stateless/01030_storage_url_syntax.sql
+%%DATADIR%%-test/queries/0_stateless/00647_multiply_aggregation_state.sql
+%%DATADIR%%-test/queries/0_stateless/01890_stem.reference
+%%DATADIR%%-test/queries/0_stateless/01410_nullable_key_and_index.reference
+%%DATADIR%%-test/queries/0_stateless/01419_skip_index_compact_parts.reference
+%%DATADIR%%-test/queries/0_stateless/01710_projection_materialize_with_missing_columns.reference
+%%DATADIR%%-test/queries/0_stateless/00564_temporary_table_management.reference
+%%DATADIR%%-test/queries/0_stateless/01213_point_in_Myanmar.reference
+%%DATADIR%%-test/queries/0_stateless/01277_fromUnixTimestamp64.reference
+%%DATADIR%%-test/queries/0_stateless/02105_backslash_letter_commands.reference
+%%DATADIR%%-test/queries/0_stateless/01414_optimize_any_bug.reference
+%%DATADIR%%-test/queries/0_stateless/00972_geohashesInBox.sql
+%%DATADIR%%-test/queries/0_stateless/01441_array_combinator.reference
+%%DATADIR%%-test/queries/0_stateless/02168_avro_bug.reference
+%%DATADIR%%-test/queries/0_stateless/02004_max_hyperscan_regex_length.reference
+%%DATADIR%%-test/queries/0_stateless/00240_replace_substring_loop.sql
+%%DATADIR%%-test/queries/0_stateless/00097_long_storage_buffer_race_condition.sh
+%%DATADIR%%-test/queries/0_stateless/01513_count_without_select_sequence_consistency_zookeeper_long.reference
+%%DATADIR%%-test/queries/0_stateless/00278_insert_already_sorted.reference
+%%DATADIR%%-test/queries/0_stateless/01277_buffer_column_order.sql
+%%DATADIR%%-test/queries/0_stateless/00760_insert_json_with_defaults.reference
+%%DATADIR%%-test/queries/0_stateless/02163_operators.sql
+%%DATADIR%%-test/queries/0_stateless/01889_postgresql_protocol_null_fields.sh
+%%DATADIR%%-test/queries/0_stateless/01714_alter_drop_version.sql
+%%DATADIR%%-test/queries/0_stateless/01375_storage_file_write_prefix_tsv_with_names.sql
+%%DATADIR%%-test/queries/0_stateless/01460_allow_dollar_and_number_in_identifier.sql
+%%DATADIR%%-test/queries/0_stateless/01033_storage_odbc_parsing_exception_check.reference
+%%DATADIR%%-test/queries/0_stateless/02012_changed_enum_type_non_replicated.reference
+%%DATADIR%%-test/queries/0_stateless/01100_split_by_string.reference
+%%DATADIR%%-test/queries/0_stateless/01679_format_readable_time_delta_inf.sql
+%%DATADIR%%-test/queries/0_stateless/00268_aliases_without_as_keyword.sql
+%%DATADIR%%-test/queries/0_stateless/00938_ipv6_cidr_range.reference
+%%DATADIR%%-test/queries/0_stateless/00700_decimal_round.sql
+%%DATADIR%%-test/queries/0_stateless/01304_direct_io_long.sh
+%%DATADIR%%-test/queries/0_stateless/01521_global_in_prewhere_15792.sql
+%%DATADIR%%-test/queries/0_stateless/02020_exponential_smoothing_cross_block.reference
+%%DATADIR%%-test/queries/0_stateless/02013_lc_nullable_and_infinity.reference
 %%DATADIR%%-test/queries/0_stateless/01271_optimize_arithmetic_operations_in_aggr_func_long.sql
-%%DATADIR%%-test/queries/0_stateless/01271_show_privileges.reference
+%%DATADIR%%-test/queries/0_stateless/00031_parser_number.reference
+%%DATADIR%%-test/queries/0_stateless/01230_join_get_truncate.reference
+%%DATADIR%%-test/queries/0_stateless/01021_tuple_parser.reference
+%%DATADIR%%-test/queries/0_stateless/01889_tokenize.sql
+%%DATADIR%%-test/queries/0_stateless/01281_sum_nullable.sql
+%%DATADIR%%-test/queries/0_stateless/00980_crash_nullable_decimal.sql
+%%DATADIR%%-test/queries/0_stateless/01660_test_toDayOfYear_mysql_compatibility.reference
+%%DATADIR%%-test/queries/0_stateless/02096_sql_user_defined_function_alias.sql
+%%DATADIR%%-test/queries/0_stateless/00140_prewhere_column_order.reference
+%%DATADIR%%-test/queries/0_stateless/00536_int_exp.reference
+%%DATADIR%%-test/queries/0_stateless/02027_arrayCumSumNonNegative_const.sql
+%%DATADIR%%-test/queries/0_stateless/02142_http_with_query_parameters.reference
+%%DATADIR%%-test/queries/0_stateless/00637_sessions_in_http_interface_and_settings.reference
+%%DATADIR%%-test/queries/0_stateless/00701_context_use_after_free.reference
+%%DATADIR%%-test/queries/0_stateless/02008_test_union_distinct_in_subquery.reference
+%%DATADIR%%-test/queries/0_stateless/01051_aggregate_function_crash.sql
+%%DATADIR%%-test/queries/0_stateless/00486_if_fixed_string.sql
+%%DATADIR%%-test/queries/0_stateless/01846_alter_column_without_type_bugfix.reference
+%%DATADIR%%-test/queries/0_stateless/01291_unsupported_conversion_from_decimal.reference
+%%DATADIR%%-test/queries/0_stateless/02125_query_views_log.reference
+%%DATADIR%%-test/queries/0_stateless/01470_explain.sql
+%%DATADIR%%-test/queries/0_stateless/01942_untuple_transformers_msan.sql
+%%DATADIR%%-test/queries/0_stateless/01125_dict_ddl_cannot_add_column.sql
+%%DATADIR%%-test/queries/0_stateless/00514_interval_operators.sql
+%%DATADIR%%-test/queries/0_stateless/00926_zookeeper_adaptive_index_granularity_replicated_merge_tree_long.sql
+%%DATADIR%%-test/queries/0_stateless/01560_mann_whitney.reference
+%%DATADIR%%-test/queries/0_stateless/01719_join_timezone.sql
+%%DATADIR%%-test/queries/0_stateless/01940_pad_string.reference
+%%DATADIR%%-test/queries/0_stateless/00359_convert_or_zero_functions.sql
+%%DATADIR%%-test/queries/0_stateless/01010_pm_join_all_join_bug.sql
+%%DATADIR%%-test/queries/0_stateless/01910_client_replxx_container_overflow_long.reference
+%%DATADIR%%-test/queries/0_stateless/00001_select_1.reference
+%%DATADIR%%-test/queries/0_stateless/00543_null_and_prewhere.reference
+%%DATADIR%%-test/queries/0_stateless/01280_ttl_where_group_by.sh
+%%DATADIR%%-test/queries/0_stateless/00535_parse_float_scientific.reference
+%%DATADIR%%-test/queries/0_stateless/02166_arrow_dictionary_inference.sh
+%%DATADIR%%-test/queries/0_stateless/01318_alter_add_constraint_format.reference
+%%DATADIR%%-test/queries/0_stateless/00970_live_view_watch_events_http_heartbeat.py
+%%DATADIR%%-test/queries/0_stateless/00926_adaptive_index_granularity_collapsing_merge_tree.reference
+%%DATADIR%%-test/queries/0_stateless/00124_shard_distributed_with_many_replicas.sql
+%%DATADIR%%-test/queries/0_stateless/01414_bloom_filter_index_with_const_column.reference
+%%DATADIR%%-test/queries/0_stateless/00218_like_regexp_newline.reference
+%%DATADIR%%-test/queries/0_stateless/01030_concatenate_equal_fixed_strings.sql
+%%DATADIR%%-test/queries/0_stateless/00320_between.reference
+%%DATADIR%%-test/queries/0_stateless/01594_storage_join_uuid.sql
+%%DATADIR%%-test/queries/0_stateless/02167_format_from_file_extension.sh
+%%DATADIR%%-test/queries/0_stateless/00956_join_use_nulls_with_array_column.sql
+%%DATADIR%%-test/queries/0_stateless/01721_engine_file_truncate_on_insert.reference
+%%DATADIR%%-test/queries/0_stateless/01641_memory_tracking_insert_optimize.sql
+%%DATADIR%%-test/queries/0_stateless/00875_join_right_nulls.sql
+%%DATADIR%%-test/queries/0_stateless/01252_weird_time_zone.reference
+%%DATADIR%%-test/queries/0_stateless/00695_pretty_max_column_pad_width.sql
+%%DATADIR%%-test/queries/0_stateless/00114_float_type_result_of_division.reference
+%%DATADIR%%-test/queries/0_stateless/01457_int256_hashing.sql
+%%DATADIR%%-test/queries/0_stateless/00804_test_custom_compression_codecs.sql
+%%DATADIR%%-test/queries/0_stateless/00760_url_functions_overflow.sql
+%%DATADIR%%-test/queries/0_stateless/01504_compression_multiple_streams.sql
+%%DATADIR%%-test/queries/0_stateless/00425_count_nullable.sql
+%%DATADIR%%-test/queries/0_stateless/02158_contingency.sql
+%%DATADIR%%-test/queries/0_stateless/00826_cross_to_inner_join.sql
+%%DATADIR%%-test/queries/0_stateless/01553_datetime64_comparison.reference
+%%DATADIR%%-test/queries/0_stateless/00751_low_cardinality_nullable_group_by.sql
+%%DATADIR%%-test/queries/0_stateless/00957_format_with_clashed_aliases.reference
+%%DATADIR%%-test/queries/0_stateless/01300_group_by_other_keys_having.sql
+%%DATADIR%%-test/queries/0_stateless/01017_tuplehamming_distance.reference
+%%DATADIR%%-test/queries/0_stateless/00505_distributed_secure.data
+%%DATADIR%%-test/queries/0_stateless/01835_alias_to_primary_key_cyfdecyf.sql
+%%DATADIR%%-test/queries/0_stateless/02105_backslash_letter_commands.expect
+%%DATADIR%%-test/queries/0_stateless/01030_limit_by_with_ties_error.sh
+%%DATADIR%%-test/queries/0_stateless/00639_startsWith.reference
+%%DATADIR%%-test/queries/0_stateless/01925_date_date_time_comparison.sql
+%%DATADIR%%-test/queries/0_stateless/01095_tpch_like_smoke.reference
+%%DATADIR%%-test/queries/0_stateless/00020_sorting_arrays.sql
+%%DATADIR%%-test/queries/0_stateless/02179_sparse_columns_detach.reference
+%%DATADIR%%-test/queries/0_stateless/00499_json_enum_insert.sql
+%%DATADIR%%-test/queries/0_stateless/00646_url_engine.reference
+%%DATADIR%%-test/queries/0_stateless/01079_parallel_alter_modify_zookeeper_long.sh
+%%DATADIR%%-test/queries/0_stateless/01610_client_spawn_editor.sh
+%%DATADIR%%-test/queries/0_stateless/01881_negate_formatting.sql
+%%DATADIR%%-test/queries/0_stateless/01531_query_log_query_comment.reference
+%%DATADIR%%-test/queries/0_stateless/00754_alter_modify_order_by_replicated_zookeeper_long.sql
+%%DATADIR%%-test/queries/0_stateless/01188_attach_table_from_path.sql
+%%DATADIR%%-test/queries/0_stateless/01492_array_join_crash_13829.reference
+%%DATADIR%%-test/queries/0_stateless/01079_bad_alters_zookeeper_long.sh
+%%DATADIR%%-test/queries/0_stateless/00834_kill_mutation.reference
+%%DATADIR%%-test/queries/0_stateless/01279_empty_external_table.reference
+%%DATADIR%%-test/queries/0_stateless/01602_runningConcurrency.reference
+%%DATADIR%%-test/queries/0_stateless/01513_count_without_select_sequence_consistency_zookeeper_long.sql
+%%DATADIR%%-test/queries/0_stateless/02048_parallel_reading_from_infile.reference
+%%DATADIR%%-test/queries/0_stateless/02022_storage_filelog_one_file.sh
+%%DATADIR%%-test/queries/0_stateless/01773_min_max_time_system_parts_datetime64.reference
+%%DATADIR%%-test/queries/0_stateless/01115_prewhere_array_join.sql
+%%DATADIR%%-test/queries/0_stateless/02030_rocksdb_race_long.reference
+%%DATADIR%%-test/queries/0_stateless/01086_odbc_roundtrip.sh
+%%DATADIR%%-test/queries/0_stateless/01904_dictionary_default_nullable_type.sql
+%%DATADIR%%-test/queries/0_stateless/02015_division_by_nullable.reference
+%%DATADIR%%-test/queries/0_stateless/01418_index_analysis_bug.sql
+%%DATADIR%%-test/queries/0_stateless/02102_row_binary_with_names_and_types.sh
+%%DATADIR%%-test/queries/0_stateless/01801_approx_total_rows_mergetree_reverse.reference
+%%DATADIR%%-test/queries/0_stateless/02021_exponential_sum_shard.sql
+%%DATADIR%%-test/queries/0_stateless/00154_shard_distributed_with_distinct.reference
+%%DATADIR%%-test/queries/0_stateless/01646_fix_window_funnel_inconistency.sql
+%%DATADIR%%-test/queries/0_stateless/01710_projection_part_check.sql
+%%DATADIR%%-test/queries/0_stateless/00075_shard_formatting_negate_of_negative_literal.reference
+%%DATADIR%%-test/queries/0_stateless/02128_apply_lambda_parsing.sql
+%%DATADIR%%-test/queries/0_stateless/00411_long_accurate_number_comparison_int2.reference
+%%DATADIR%%-test/queries/0_stateless/00007_array.sql
+%%DATADIR%%-test/queries/0_stateless/01600_parts_types_metrics_long.reference
+%%DATADIR%%-test/queries/0_stateless/01164_detach_attach_partition_race.sh
+%%DATADIR%%-test/queries/0_stateless/01592_window_functions.sql
+%%DATADIR%%-test/queries/0_stateless/02024_storage_filelog_mv.sh
+%%DATADIR%%-test/queries/0_stateless/00534_functions_bad_arguments5.sh
+%%DATADIR%%-test/queries/0_stateless/01457_create_as_table_function_structure.reference
+%%DATADIR%%-test/queries/0_stateless/01710_force_use_projection.sql
+%%DATADIR%%-test/queries/0_stateless/00993_system_parts_race_condition_drop_zookeeper.reference
+%%DATADIR%%-test/queries/0_stateless/00710_array_enumerate_dense.sql
+%%DATADIR%%-test/queries/0_stateless/00950_default_prewhere.sql
+%%DATADIR%%-test/queries/0_stateless/00568_empty_function_with_fixed_string.sql
+%%DATADIR%%-test/queries/0_stateless/01019_parallel_parsing_cancel.reference
+%%DATADIR%%-test/queries/0_stateless/01766_todatetime64_no_timezone_arg.reference
+%%DATADIR%%-test/queries/0_stateless/00516_is_inf_nan.reference
+%%DATADIR%%-test/queries/0_stateless/00562_rewrite_select_expression_with_union.reference
+%%DATADIR%%-test/queries/0_stateless/01774_bar_with_illegal_value.sql
+%%DATADIR%%-test/queries/0_stateless/01656_join_defaul_enum.sql
+%%DATADIR%%-test/queries/0_stateless/01301_aggregate_state_exception_memory_leak.reference
+%%DATADIR%%-test/queries/0_stateless/02150_replace_regexp_all_empty_match.reference
+%%DATADIR%%-test/queries/0_stateless/01665_merge_tree_min_for_concurrent_read.reference
+%%DATADIR%%-test/queries/0_stateless/00504_insert_miss_columns.reference
+%%DATADIR%%-test/queries/0_stateless/02001_shard_num_shard_count.sql
+%%DATADIR%%-test/queries/0_stateless/01397_in_bad_arguments.sql
+%%DATADIR%%-test/queries/0_stateless/01072_select_constant_limit.reference
+%%DATADIR%%-test/queries/0_stateless/00755_avg_value_size_hint_passing.sql
+%%DATADIR%%-test/queries/0_stateless/01837_cast_to_array_from_empty_array.sql
+%%DATADIR%%-test/queries/0_stateless/02147_order_by_optimizations.sql
+%%DATADIR%%-test/queries/0_stateless/02130_parse_quoted_null.reference
+%%DATADIR%%-test/queries/0_stateless/01600_quota_by_forwarded_ip.sh
+%%DATADIR%%-test/queries/0_stateless/01750_parsing_exception.sh
+%%DATADIR%%-test/queries/0_stateless/01945_show_debug_warning.expect
+%%DATADIR%%-test/queries/0_stateless/00834_hints_for_type_function_typos.reference
+%%DATADIR%%-test/queries/0_stateless/00411_long_accurate_number_comparison_float.reference
+%%DATADIR%%-test/queries/0_stateless/00516_modulo.reference
+%%DATADIR%%-test/queries/0_stateless/01391_limit_overflow.sql
+%%DATADIR%%-test/queries/0_stateless/01831_max_streams.sql
+%%DATADIR%%-test/queries/0_stateless/00927_asof_join_long.sql
+%%DATADIR%%-test/queries/0_stateless/01866_bit_positions_to_array.reference
+%%DATADIR%%-test/queries/0_stateless/01041_h3_is_valid.reference
+%%DATADIR%%-test/queries/0_stateless/01358_union_threads_bug.reference
+%%DATADIR%%-test/queries/0_stateless/01621_bar_nan_arguments.reference
+%%DATADIR%%-test/queries/0_stateless/00355_array_of_non_const_convertible_types.sql
+%%DATADIR%%-test/queries/0_stateless/00141_parse_timestamp_as_datetime.sql
+%%DATADIR%%-test/queries/0_stateless/01306_polygons_intersection.reference
+%%DATADIR%%-test/queries/0_stateless/01016_input_null_as_default.sh
+%%DATADIR%%-test/queries/0_stateless/01514_tid_function.sql
+%%DATADIR%%-test/queries/0_stateless/01079_alter_default_zookeeper_long.reference
+%%DATADIR%%-test/queries/0_stateless/00737_decimal_group_by.sql
+%%DATADIR%%-test/queries/0_stateless/00413_distinct.sql
+%%DATADIR%%-test/queries/0_stateless/01011_group_uniq_array_memsan.reference
+%%DATADIR%%-test/queries/0_stateless/00957_coalesce_const_nullable_crash.sql
+%%DATADIR%%-test/queries/0_stateless/00855_join_with_array_join.sql
+%%DATADIR%%-test/queries/0_stateless/00780_unaligned_array_join.reference
+%%DATADIR%%-test/queries/0_stateless/01020_having_without_group_by.sql
+%%DATADIR%%-test/queries/0_stateless/01508_explain_header.sql
+%%DATADIR%%-test/queries/0_stateless/01390_remove_injective_in_uniq.reference
+%%DATADIR%%-test/queries/0_stateless/01107_join_right_table_totals.reference
+%%DATADIR%%-test/queries/0_stateless/01543_collate_in_tuple.sql
+%%DATADIR%%-test/queries/0_stateless/01459_manual_write_to_replicas.reference
+%%DATADIR%%-test/queries/0_stateless/00882_multiple_join_no_alias.reference
+%%DATADIR%%-test/queries/0_stateless/01387_clear_column_default_depends.sql
+%%DATADIR%%-test/queries/0_stateless/00120_join_and_group_by.reference
+%%DATADIR%%-test/queries/0_stateless/00082_append_trailing_char_if_absent.sql
+%%DATADIR%%-test/queries/0_stateless/01455_nullable_type_with_if_agg_combinator.reference
+%%DATADIR%%-test/queries/0_stateless/00159_whitespace_in_columns_list.reference
+%%DATADIR%%-test/queries/0_stateless/02112_parse_date_yyyymmdd.sh
+%%DATADIR%%-test/queries/0_stateless/00999_test_skip_indices_with_alter_and_merge.reference
+%%DATADIR%%-test/queries/0_stateless/00055_join_two_numbers.reference
+%%DATADIR%%-test/queries/0_stateless/00735_long_conditional.reference
+%%DATADIR%%-test/queries/0_stateless/00340_squashing_insert_select.sql
+%%DATADIR%%-test/queries/0_stateless/00102_insert_into_temporary_table.reference
+%%DATADIR%%-test/queries/0_stateless/00104_totals_having_mode.reference
+%%DATADIR%%-test/queries/0_stateless/01019_alter_materialized_view_consistent.sh
+%%DATADIR%%-test/queries/0_stateless/01302_polygons_distance.reference
+%%DATADIR%%-test/queries/0_stateless/01656_test_query_log_factories_info.sql
+%%DATADIR%%-test/queries/0_stateless/01414_freeze_does_not_prevent_alters.sql
+%%DATADIR%%-test/queries/0_stateless/01933_invalid_date.sql
+%%DATADIR%%-test/queries/0_stateless/01940_totimezone_operator_monotonicity.sql
+%%DATADIR%%-test/queries/0_stateless/00368_format_option_collision.reference
+%%DATADIR%%-test/queries/0_stateless/01560_monotonicity_check_multiple_args_bug.reference
+%%DATADIR%%-test/queries/0_stateless/00556_array_intersect.sql
+%%DATADIR%%-test/queries/0_stateless/01891_partition_hash.reference
+%%DATADIR%%-test/queries/0_stateless/02129_window_functions_disable_optimizations.sql
+%%DATADIR%%-test/queries/0_stateless/00951_ngram_search.sql
+%%DATADIR%%-test/queries/0_stateless/01277_alter_rename_column_constraint.sql
+%%DATADIR%%-test/queries/0_stateless/01497_mutation_support_for_storage_memory.sql
+%%DATADIR%%-test/queries/0_stateless/00733_if_datetime.reference
+%%DATADIR%%-test/queries/0_stateless/01025_array_compact_generic.reference
+%%DATADIR%%-test/queries/0_stateless/01326_hostname_alias.sql
+%%DATADIR%%-test/queries/0_stateless/01324_insert_tsv_raw.reference
+%%DATADIR%%-test/queries/0_stateless/00646_url_engine.python
+%%DATADIR%%-test/queries/0_stateless/01414_push_predicate_when_contains_with_clause.sql
+%%DATADIR%%-test/queries/0_stateless/01910_view_dictionary.sql
+%%DATADIR%%-test/queries/0_stateless/01621_sort_after_join_pipeline_stuck.reference
+%%DATADIR%%-test/queries/0_stateless/00900_orc_arrays_load.sh
+%%DATADIR%%-test/queries/0_stateless/01077_yet_another_prewhere_test.sql
+%%DATADIR%%-test/queries/0_stateless/01652_ignore_and_low_cardinality.sql
+%%DATADIR%%-test/queries/0_stateless/01470_columns_transformers2.sql
+%%DATADIR%%-test/queries/0_stateless/01552_impl_aggfunc_cloneresize.reference
+%%DATADIR%%-test/queries/0_stateless/00531_client_ignore_error.reference
+%%DATADIR%%-test/queries/0_stateless/01427_pk_and_expression_with_different_type.sql
+%%DATADIR%%-test/queries/0_stateless/01457_order_by_limit.sql
+%%DATADIR%%-test/queries/0_stateless/01263_type_conversion_nvartolomei.reference
+%%DATADIR%%-test/queries/0_stateless/00969_columns_clause.sql
 %%DATADIR%%-test/queries/0_stateless/01271_show_privileges.sql
-%%DATADIR%%-test/queries/0_stateless/01272_offset_without_limit.reference
-%%DATADIR%%-test/queries/0_stateless/01272_offset_without_limit.sql
-%%DATADIR%%-test/queries/0_stateless/01272_suspicious_codecs.reference
-%%DATADIR%%-test/queries/0_stateless/01272_suspicious_codecs.sql
-%%DATADIR%%-test/queries/0_stateless/01272_totals_and_filter_bug.reference
-%%DATADIR%%-test/queries/0_stateless/01272_totals_and_filter_bug.sql
-%%DATADIR%%-test/queries/0_stateless/01273_arrow.reference
-%%DATADIR%%-test/queries/0_stateless/01273_arrow.sh
-%%DATADIR%%-test/queries/0_stateless/01273_arrow_arrays_load.reference
-%%DATADIR%%-test/queries/0_stateless/01273_arrow_arrays_load.sh
-%%DATADIR%%-test/queries/0_stateless/01273_arrow_decimal.reference
+%%DATADIR%%-test/queries/0_stateless/00443_preferred_block_size_bytes.reference
+%%DATADIR%%-test/queries/0_stateless/01786_explain_merge_tree.reference
+%%DATADIR%%-test/queries/0_stateless/02152_short_circuit_throw_if.reference
+%%DATADIR%%-test/queries/0_stateless/01785_dictionary_element_count.sql
+%%DATADIR%%-test/queries/0_stateless/01083_cross_to_inner_with_in_bug.sql
+%%DATADIR%%-test/queries/0_stateless/01681_hyperscan_debug_assertion.reference
+%%DATADIR%%-test/queries/0_stateless/01773_datetime64_add_ubsan.sql
+%%DATADIR%%-test/queries/0_stateless/01418_custom_settings.reference
+%%DATADIR%%-test/queries/0_stateless/01417_freeze_partition_verbose.reference
+%%DATADIR%%-test/queries/0_stateless/00962_temporary_live_view_watch_live.py
+%%DATADIR%%-test/queries/0_stateless/00369_int_div_of_float.reference
+%%DATADIR%%-test/queries/0_stateless/01134_max_rows_to_group_by.reference
+%%DATADIR%%-test/queries/0_stateless/data_minio/tsv_with_header.tsv
+%%DATADIR%%-test/queries/0_stateless/data_minio/a.tsv
+%%DATADIR%%-test/queries/0_stateless/data_minio/b.tsv
+%%DATADIR%%-test/queries/0_stateless/data_minio/c.tsv
+%%DATADIR%%-test/queries/0_stateless/00906_low_cardinality_cache.reference
+%%DATADIR%%-test/queries/0_stateless/00734_timeslot.sql
+%%DATADIR%%-test/queries/0_stateless/00990_hasToken.python
+%%DATADIR%%-test/queries/0_stateless/01107_tuples_arrays_parsing_exceptions.sh
+%%DATADIR%%-test/queries/0_stateless/01019_alter_materialized_view_consistent.reference
+%%DATADIR%%-test/queries/0_stateless/00872_t64_bit_codec.reference
+%%DATADIR%%-test/queries/0_stateless/00801_daylight_saving_time_hour_underflow.reference
+%%DATADIR%%-test/queries/0_stateless/00557_alter_null_storage_tables.sql
+%%DATADIR%%-test/queries/0_stateless/01528_play.reference
+%%DATADIR%%-test/queries/0_stateless/00022_func_higher_order_and_constants.sql
+%%DATADIR%%-test/queries/0_stateless/02125_constant_if_condition_and_not_existing_column.sql
+%%DATADIR%%-test/queries/0_stateless/01516_drop_table_stress_long.reference
+%%DATADIR%%-test/queries/0_stateless/02128_apply_lambda_parsing.reference
+%%DATADIR%%-test/queries/0_stateless/01745_alter_delete_view.sql
+%%DATADIR%%-test/queries/0_stateless/00676_group_by_in.reference
+%%DATADIR%%-test/queries/0_stateless/00979_set_index_not.sql
+%%DATADIR%%-test/queries/0_stateless/01462_test_codec_on_alias.sql
+%%DATADIR%%-test/queries/0_stateless/00964_bloom_index_string_functions.reference
+%%DATADIR%%-test/queries/0_stateless/01328_bad_peephole_optimization.sql
+%%DATADIR%%-test/queries/0_stateless/00753_quantile_format.sql
+%%DATADIR%%-test/queries/0_stateless/01684_geohash_ubsan.reference
+%%DATADIR%%-test/queries/0_stateless/02012_get_server_port.reference
+%%DATADIR%%-test/queries/0_stateless/01495_subqueries_in_with_statement.sql
+%%DATADIR%%-test/queries/0_stateless/01605_adaptive_granularity_block_borders.reference
+%%DATADIR%%-test/queries/0_stateless/02017_create_distributed_table_coredump.sql
+%%DATADIR%%-test/queries/0_stateless/01780_range_msan.sql
+%%DATADIR%%-test/queries/0_stateless/01083_cross_to_inner_with_like.reference
+%%DATADIR%%-test/queries/0_stateless/00098_a_union_all.reference
+%%DATADIR%%-test/queries/0_stateless/01072_json_each_row_data_in_square_brackets.sql
+%%DATADIR%%-test/queries/0_stateless/02014_storage_merge_order_by.sql
+%%DATADIR%%-test/queries/0_stateless/01013_hex_float.reference
+%%DATADIR%%-test/queries/0_stateless/00914_replicate.reference
+%%DATADIR%%-test/queries/0_stateless/01666_lcm_ubsan.sql
+%%DATADIR%%-test/queries/0_stateless/01072_drop_temporary_table_with_same_name.sql
+%%DATADIR%%-test/queries/0_stateless/01269_alias_type_differs.reference
+%%DATADIR%%-test/queries/0_stateless/02006_h3_to_geo_boundary.reference
+%%DATADIR%%-test/queries/0_stateless/01621_clickhouse_compressor.sh
+%%DATADIR%%-test/queries/0_stateless/01238_http_memory_tracking.reference
+%%DATADIR%%-test/queries/0_stateless/00217_shard_global_subquery_columns_with_same_name.sql
+%%DATADIR%%-test/queries/0_stateless/02158_contingency.reference
+%%DATADIR%%-test/queries/0_stateless/01936_empty_function_support_uuid.sql
+%%DATADIR%%-test/queries/0_stateless/01043_categorical_iv.sql
+%%DATADIR%%-test/queries/0_stateless/01528_to_uuid_or_null_or_zero.reference
+%%DATADIR%%-test/queries/0_stateless/00862_decimal_in.reference
+%%DATADIR%%-test/queries/0_stateless/02021_h3_is_res_classIII.sql
+%%DATADIR%%-test/queries/0_stateless/01293_external_sorting_limit_bug.sql
+%%DATADIR%%-test/queries/0_stateless/01413_rows_events.sql
+%%DATADIR%%-test/queries/0_stateless/02136_kill_scalar_queries.sh
+%%DATADIR%%-test/queries/0_stateless/01825_replacing_vertical_merge.sql
+%%DATADIR%%-test/queries/0_stateless/00430_https_server.sh
+%%DATADIR%%-test/queries/0_stateless/02012_sha512_fixedstring.sql
+%%DATADIR%%-test/queries/0_stateless/01837_database_memory_ddl_dictionaries.sql
+%%DATADIR%%-test/queries/0_stateless/00700_decimal_formats.sql
+%%DATADIR%%-test/queries/0_stateless/00705_aggregate_states_addition.reference
+%%DATADIR%%-test/queries/0_stateless/01370_client_autocomplete_word_break_characters.reference
+%%DATADIR%%-test/queries/0_stateless/02026_accurate_cast_or_default.sql
+%%DATADIR%%-test/queries/0_stateless/00614_array_nullable.reference
+%%DATADIR%%-test/queries/0_stateless/01083_log_first_column_alias.reference
+%%DATADIR%%-test/queries/0_stateless/01896_jit_aggregation_function_if_long.sql
+%%DATADIR%%-test/queries/0_stateless/01954_clickhouse_benchmark_multiple_long.config.xml
+%%DATADIR%%-test/queries/0_stateless/01000_bad_size_of_marks_skip_idx.reference
+%%DATADIR%%-test/queries/0_stateless/01526_client_start_and_exit.expect-not-a-test-case
+%%DATADIR%%-test/queries/0_stateless/01418_query_scope_constants_and_remote.sql
+%%DATADIR%%-test/queries/0_stateless/01504_view_type_conversion.sql
+%%DATADIR%%-test/queries/0_stateless/02129_skip_quoted_fields.reference
+%%DATADIR%%-test/queries/0_stateless/00963_startsWith_force_primary_key.reference
+%%DATADIR%%-test/queries/0_stateless/01010_pmj_on_disk.reference
+%%DATADIR%%-test/queries/0_stateless/00417_system_build_options.reference
+%%DATADIR%%-test/queries/0_stateless/00390_array_sort.reference
+%%DATADIR%%-test/queries/0_stateless/00452_left_array_join_and_nullable.sql
+%%DATADIR%%-test/queries/0_stateless/00572_aggregation_by_empty_set.reference
+%%DATADIR%%-test/queries/0_stateless/01052_compression_buffer_overrun.reference
+%%DATADIR%%-test/queries/0_stateless/00290_shard_aggregation_memory_efficient.sql
+%%DATADIR%%-test/queries/0_stateless/00445_join_nullable_keys.sql
+%%DATADIR%%-test/queries/0_stateless/00573_shard_aggregation_by_empty_set.sql
+%%DATADIR%%-test/queries/0_stateless/01050_clickhouse_dict_source_with_subquery.sql
+%%DATADIR%%-test/queries/0_stateless/01012_show_tables_limit.reference
+%%DATADIR%%-test/queries/0_stateless/01686_event_time_microseconds_part_log.sql
+%%DATADIR%%-test/queries/0_stateless/01354_tuple_low_cardinality_array_mapped_bug.reference
+%%DATADIR%%-test/queries/0_stateless/01455_default_compression.sql
+%%DATADIR%%-test/queries/0_stateless/00704_drop_truncate_memory_table.sh
+%%DATADIR%%-test/queries/0_stateless/00704_arrayCumSumLimited_arrayDifference.sql
+%%DATADIR%%-test/queries/0_stateless/01650_drop_part_and_deduplication_zookeeper_long.sql
+%%DATADIR%%-test/queries/0_stateless/02118_show_create_table_rocksdb.sql
+%%DATADIR%%-test/queries/0_stateless/00502_custom_partitioning_replicated_zookeeper_long.reference
+%%DATADIR%%-test/queries/0_stateless/00802_system_parts_with_datetime_partition.sql
+%%DATADIR%%-test/queries/0_stateless/00700_decimal_compare.sql
+%%DATADIR%%-test/queries/0_stateless/02030_capnp_format.reference
+%%DATADIR%%-test/queries/0_stateless/01268_shard_avgweighted.reference
+%%DATADIR%%-test/queries/0_stateless/00173_compare_date_time_with_constant_string.reference
+%%DATADIR%%-test/queries/0_stateless/02012_settings_clause_for_s3.reference
+%%DATADIR%%-test/queries/0_stateless/01710_aggregate_projections.reference
+%%DATADIR%%-test/queries/0_stateless/01535_decimal_round_scale_overflow_check.sql
+%%DATADIR%%-test/queries/0_stateless/01098_sum.sql
+%%DATADIR%%-test/queries/0_stateless/00377_shard_group_uniq_array_of_string_array.reference
+%%DATADIR%%-test/queries/0_stateless/01914_ubsan_quantile_timing.reference
+%%DATADIR%%-test/queries/0_stateless/00563_insert_into_remote_and_zookeeper_long.sql
+%%DATADIR%%-test/queries/0_stateless/00991_temporary_live_view_watch_live.python
+%%DATADIR%%-test/queries/0_stateless/00476_pretty_formats_and_widths.reference
+%%DATADIR%%-test/queries/0_stateless/01278_format_multiple_queries.sh
+%%DATADIR%%-test/queries/0_stateless/01053_window_view_proc_hop_to_now.reference
+%%DATADIR%%-test/queries/0_stateless/01821_join_table_race_long.sh
+%%DATADIR%%-test/queries/0_stateless/00411_long_accurate_number_comparison_int3.reference
+%%DATADIR%%-test/queries/0_stateless/01430_modify_sample_by_zookeeper_long.sql
+%%DATADIR%%-test/queries/0_stateless/01888_read_int_safe.reference
+%%DATADIR%%-test/queries/0_stateless/01351_parse_date_time_best_effort_us.reference
+%%DATADIR%%-test/queries/0_stateless/00261_storage_aliases_and_array_join.sql
+%%DATADIR%%-test/queries/0_stateless/01854_dictionary_range_hashed_min_max_attr.sql
+%%DATADIR%%-test/queries/0_stateless/01073_show_tables_not_like.sql
+%%DATADIR%%-test/queries/0_stateless/01710_projections.sql
+%%DATADIR%%-test/queries/0_stateless/01602_insert_into_table_function_cluster.reference
+%%DATADIR%%-test/queries/0_stateless/01961_roaring_memory_tracking.sql
+%%DATADIR%%-test/queries/0_stateless/01059_window_view_event_hop_watch_strict_asc.py
+%%DATADIR%%-test/queries/0_stateless/02124_uncompressed_cache.sql
+%%DATADIR%%-test/queries/0_stateless/00964_os_thread_priority.reference
+%%DATADIR%%-test/queries/0_stateless/00842_array_with_constant_overflow.sql
+%%DATADIR%%-test/queries/0_stateless/00267_tuple_array_access_operators_priority.sql
+%%DATADIR%%-test/queries/0_stateless/00039_inserts_through_http.reference
+%%DATADIR%%-test/queries/0_stateless/01603_remove_column_ttl.reference
+%%DATADIR%%-test/queries/0_stateless/01553_settings_early_apply.sql
+%%DATADIR%%-test/queries/0_stateless/01913_quantile_deterministic.reference
+%%DATADIR%%-test/queries/0_stateless/01555_or_fill.sql
+%%DATADIR%%-test/queries/0_stateless/02114_offset_fetch_without_order_by.reference
+%%DATADIR%%-test/queries/0_stateless/00481_reading_from_last_granula.sql
+%%DATADIR%%-test/queries/0_stateless/00713_collapsing_merge_tree.sql
+%%DATADIR%%-test/queries/0_stateless/01780_column_sparse_alter.reference
+%%DATADIR%%-test/queries/0_stateless/01702_system_numbers_scientific_notation.sql
+%%DATADIR%%-test/queries/0_stateless/01185_create_or_replace_table.reference
+%%DATADIR%%-test/queries/0_stateless/01018_optimize_read_in_order_with_in_subquery.sql
+%%DATADIR%%-test/queries/0_stateless/02029_quantile_sanitizer.reference
+%%DATADIR%%-test/queries/0_stateless/01043_geo_distance.sql
+%%DATADIR%%-test/queries/0_stateless/01950_kill_large_group_by_query.sh
+%%DATADIR%%-test/queries/0_stateless/01342_query_parameters_alias.reference
+%%DATADIR%%-test/queries/0_stateless/00825_protobuf_format_no_length_delimiter.sh
+%%DATADIR%%-test/queries/0_stateless/01227_distributed_global_in_issue_2610.reference
+%%DATADIR%%-test/queries/0_stateless/00974_low_cardinality_cast.sql
+%%DATADIR%%-test/queries/0_stateless/01532_tuple_with_name_type.reference
+%%DATADIR%%-test/queries/0_stateless/01225_show_create_table_from_dictionary.reference
+%%DATADIR%%-test/queries/0_stateless/01765_tehran_dst.sql
+%%DATADIR%%-test/queries/0_stateless/02121_pager.reference
+%%DATADIR%%-test/queries/0_stateless/00848_join_use_nulls_segfault.sql
+%%DATADIR%%-test/queries/0_stateless/00652_replicated_mutations_zookeeper.reference
+%%DATADIR%%-test/queries/0_stateless/02011_normalize_utf8.sql
+%%DATADIR%%-test/queries/0_stateless/01679_incorrect_data_on_insert_collapsing.reference
+%%DATADIR%%-test/queries/0_stateless/01156_pcg_deserialization.sh
+%%DATADIR%%-test/queries/0_stateless/01602_runningConcurrency.sql
+%%DATADIR%%-test/queries/0_stateless/00725_join_on_bug_1.reference
+%%DATADIR%%-test/queries/0_stateless/01097_pre_limit.sql
+%%DATADIR%%-test/queries/0_stateless/01545_system_errors.reference
+%%DATADIR%%-test/queries/0_stateless/01440_big_int_shift.sql
+%%DATADIR%%-test/queries/0_stateless/00625_arrays_in_nested.reference
+%%DATADIR%%-test/queries/0_stateless/01413_allow_non_metadata_alters.sql
+%%DATADIR%%-test/queries/0_stateless/02169_fix_view_offset_limit_setting.reference
+%%DATADIR%%-test/queries/0_stateless/02160_h3_cell_area_rads2.sql
+%%DATADIR%%-test/queries/0_stateless/01318_parallel_final_stuck.reference
+%%DATADIR%%-test/queries/0_stateless/01520_client_print_query_id.reference
+%%DATADIR%%-test/queries/0_stateless/01055_compact_parts_1.sql
+%%DATADIR%%-test/queries/0_stateless/01071_http_header_exception_code.sh
+%%DATADIR%%-test/queries/0_stateless/01710_normal_projections.reference
+%%DATADIR%%-test/queries/0_stateless/01312_comparison_with_constant_string_in_index_analysis.sql
+%%DATADIR%%-test/queries/0_stateless/01326_fixed_string_comparison_denny_crane.sql
+%%DATADIR%%-test/queries/0_stateless/00758_array_reverse.sql
+%%DATADIR%%-test/queries/0_stateless/01785_parallel_formatting_memory.reference
+%%DATADIR%%-test/queries/0_stateless/01680_date_time_add_ubsan.sql
+%%DATADIR%%-test/queries/0_stateless/01813_quantileBfloat16_nans.sql
+%%DATADIR%%-test/queries/0_stateless/02025_subcolumns_compact_parts.reference
+%%DATADIR%%-test/queries/0_stateless/01889_sqlite_read_write.sh
+%%DATADIR%%-test/queries/0_stateless/01548_parallel_parsing_max_memory.sh
+%%DATADIR%%-test/queries/0_stateless/00839_bitmask_negative.sql
+%%DATADIR%%-test/queries/0_stateless/00292_parser_tuple_element.sql
+%%DATADIR%%-test/queries/0_stateless/00706_iso_week_and_day_of_year.sql
+%%DATADIR%%-test/queries/0_stateless/01037_polygon_dicts_simple_functions.sh
+%%DATADIR%%-test/queries/0_stateless/00938_test_retention_function.sql
+%%DATADIR%%-test/queries/0_stateless/01096_zeros.reference
+%%DATADIR%%-test/queries/0_stateless/01523_date_time_compare_with_date_literal.reference
+%%DATADIR%%-test/queries/0_stateless/00479_date_and_datetime_to_number.reference
+%%DATADIR%%-test/queries/0_stateless/00978_ml_math.sql
+%%DATADIR%%-test/queries/0_stateless/01017_uniqCombined_memory_usage.reference
+%%DATADIR%%-test/queries/0_stateless/01056_negative_with_bloom_filter.sql
+%%DATADIR%%-test/queries/0_stateless/02155_create_table_w_timezone.sql
+%%DATADIR%%-test/queries/0_stateless/00557_array_resize.reference
+%%DATADIR%%-test/queries/0_stateless/01357_version_collapsing_attach_detach_zookeeper.reference
+%%DATADIR%%-test/queries/0_stateless/01130_in_memory_parts_check.reference
+%%DATADIR%%-test/queries/0_stateless/01072_drop_temporary_table_with_same_name.reference
+%%DATADIR%%-test/queries/0_stateless/02165_insert_from_infile.sql
+%%DATADIR%%-test/queries/0_stateless/00070_insert_fewer_columns_http.sh
+%%DATADIR%%-test/queries/0_stateless/00098_d_union_all.sql
+%%DATADIR%%-test/queries/0_stateless/01561_aggregate_functions_of_key_with_join.reference
+%%DATADIR%%-test/queries/0_stateless/00547_named_tuples.reference
+%%DATADIR%%-test/queries/0_stateless/01318_alter_add_column_exists.reference
+%%DATADIR%%-test/queries/0_stateless/01600_encode_XML.reference
+%%DATADIR%%-test/queries/0_stateless/00735_long_conditional.sql
+%%DATADIR%%-test/queries/0_stateless/01114_materialize_clear_index_compact_parts.reference
+%%DATADIR%%-test/queries/0_stateless/01911_logical_error_minus.reference
+%%DATADIR%%-test/queries/0_stateless/01534_lambda_array_join.reference
+%%DATADIR%%-test/queries/0_stateless/02012_zookeeper_changed_enum_type_incompatible.sql
+%%DATADIR%%-test/queries/0_stateless/01098_msgpack_format.reference
+%%DATADIR%%-test/queries/0_stateless/00269_database_table_whitespace.sql
+%%DATADIR%%-test/queries/0_stateless/00794_materialized_view_with_column_defaults.sql
+%%DATADIR%%-test/queries/0_stateless/01051_random_printable_ascii.reference
+%%DATADIR%%-test/queries/0_stateless/01954_clickhouse_benchmark_multiple_long.reference
+%%DATADIR%%-test/queries/0_stateless/00420_null_in_scalar_subqueries.sql
+%%DATADIR%%-test/queries/0_stateless/01710_projections_group_by_no_key.sql
+%%DATADIR%%-test/queries/0_stateless/00250_tuple_comparison.sql
+%%DATADIR%%-test/queries/0_stateless/01630_disallow_floating_point_as_partition_key.reference
+%%DATADIR%%-test/queries/0_stateless/01398_in_tuple_func.sql
+%%DATADIR%%-test/queries/0_stateless/01640_distributed_async_insert_compression.sql
+%%DATADIR%%-test/queries/0_stateless/01383_remote_ambiguous_column_shard.reference
+%%DATADIR%%-test/queries/0_stateless/01559_aggregate_null_for_empty_fix.sql
+%%DATADIR%%-test/queries/0_stateless/00953_indices_alter_exceptions.sh
 %%DATADIR%%-test/queries/0_stateless/01273_arrow_decimal.sh
-%%DATADIR%%-test/queries/0_stateless/01273_arrow_dictionaries_load.reference
-%%DATADIR%%-test/queries/0_stateless/01273_arrow_dictionaries_load.sh
-%%DATADIR%%-test/queries/0_stateless/01273_arrow_load.reference
-%%DATADIR%%-test/queries/0_stateless/01273_arrow_load.sh
-%%DATADIR%%-test/queries/0_stateless/01273_arrow_nested_arrays_load.reference
-%%DATADIR%%-test/queries/0_stateless/01273_arrow_nested_arrays_load.sh
-%%DATADIR%%-test/queries/0_stateless/01273_arrow_nullable_arrays_load.reference
-%%DATADIR%%-test/queries/0_stateless/01273_arrow_nullable_arrays_load.sh
-%%DATADIR%%-test/queries/0_stateless/01273_arrow_stream.reference
-%%DATADIR%%-test/queries/0_stateless/01273_arrow_stream.sh
-%%DATADIR%%-test/queries/0_stateless/01273_extractGroups.reference
-%%DATADIR%%-test/queries/0_stateless/01273_extractGroups.sql
-%%DATADIR%%-test/queries/0_stateless/01273_h3EdgeAngle_range_check.reference
+%%DATADIR%%-test/queries/0_stateless/00304_http_external_data.sh
+%%DATADIR%%-test/queries/0_stateless/00450_higher_order_and_nullable.reference
+%%DATADIR%%-test/queries/0_stateless/00759_kodieg.sql
+%%DATADIR%%-test/queries/0_stateless/01292_quantile_array_bug.reference
+%%DATADIR%%-test/queries/0_stateless/00098_f_union_all.reference
+%%DATADIR%%-test/queries/0_stateless/02015_division_by_nullable.sql
+%%DATADIR%%-test/queries/0_stateless/00436_fixed_string_16_comparisons.reference
+%%DATADIR%%-test/queries/0_stateless/01710_projection_optimize_materialize.reference
+%%DATADIR%%-test/queries/0_stateless/02021_h3_is_res_classIII.reference
+%%DATADIR%%-test/queries/0_stateless/01272_offset_without_limit.reference
+%%DATADIR%%-test/queries/0_stateless/01852_jit_if.sql
+%%DATADIR%%-test/queries/0_stateless/00203_full_join.sql
+%%DATADIR%%-test/queries/0_stateless/00705_drop_create_merge_tree.sh
+%%DATADIR%%-test/queries/0_stateless/01453_fixsed_string_sort.reference
+%%DATADIR%%-test/queries/0_stateless/01543_toModifiedJulianDay.sql
+%%DATADIR%%-test/queries/0_stateless/01182_materialized_view_different_structure.reference
+%%DATADIR%%-test/queries/0_stateless/01213_alter_rename_with_default_zookeeper_long.sql
+%%DATADIR%%-test/queries/0_stateless/00354_host_command_line_option.reference
+%%DATADIR%%-test/queries/0_stateless/02112_delayed_clickhouse_local.expect
+%%DATADIR%%-test/queries/0_stateless/01457_compile_expressions_fuzzer.sql
+%%DATADIR%%-test/queries/0_stateless/01392_column_resolve.reference
+%%DATADIR%%-test/queries/0_stateless/00133_long_shard_memory_tracker_and_exception_safety.reference
+%%DATADIR%%-test/queries/0_stateless/02125_many_mutations.sh
+%%DATADIR%%-test/queries/0_stateless/00986_materialized_view_stack_overflow.sql
+%%DATADIR%%-test/queries/0_stateless/01050_clickhouse_dict_source_with_subquery.reference
+%%DATADIR%%-test/queries/0_stateless/00974_adaptive_granularity_secondary_index.sql
+%%DATADIR%%-test/queries/0_stateless/01952_optimize_distributed_group_by_sharding_key.sql
+%%DATADIR%%-test/queries/0_stateless/format_schemas/00825_protobuf_format_map.proto
+%%DATADIR%%-test/queries/0_stateless/format_schemas/02030_capnp_enum.capnp
+%%DATADIR%%-test/queries/0_stateless/format_schemas/00825_protobuf_format_table_default.proto
+%%DATADIR%%-test/queries/0_stateless/format_schemas/02030_capnp_nullable.capnp
+%%DATADIR%%-test/queries/0_stateless/format_schemas/02030_capnp_nested_table.capnp
+%%DATADIR%%-test/queries/0_stateless/format_schemas/00825_protobuf_format_persons.proto
+%%DATADIR%%-test/queries/0_stateless/format_schemas/00825_protobuf_format_syntax2.proto
+%%DATADIR%%-test/queries/0_stateless/format_schemas/00825_protobuf_format_array_of_arrays.proto
+%%DATADIR%%-test/queries/0_stateless/format_schemas/00825_protobuf_format_nested_optional.proto
+%%DATADIR%%-test/queries/0_stateless/format_schemas/00825_protobuf_format_nested_in_nested.proto
+%%DATADIR%%-test/queries/0_stateless/format_schemas/00825_protobuf_format_splitted_nested.proto
+%%DATADIR%%-test/queries/0_stateless/format_schemas/00825_protobuf_format_skipped_column_in_nested.proto
+%%DATADIR%%-test/queries/0_stateless/format_schemas/02030_capnp_tuples.capnp
+%%DATADIR%%-test/queries/0_stateless/format_schemas/00825_protobuf_format_squares.proto
+%%DATADIR%%-test/queries/0_stateless/format_schemas/02030_capnp_low_cardinality.capnp
+%%DATADIR%%-test/queries/0_stateless/format_schemas/00825_protobuf_format_persons_syntax2.proto
+%%DATADIR%%-test/queries/0_stateless/format_schemas/00825_protobuf_format_no_length_delimiter.proto
+%%DATADIR%%-test/queries/0_stateless/format_schemas/00825_protobuf_format_array_3dim.proto
+%%DATADIR%%-test/queries/0_stateless/format_schemas/00825_protobuf_format_enum_mapping.proto
+%%DATADIR%%-test/queries/0_stateless/format_schemas/02030_capnp_simple_types.capnp
+%%DATADIR%%-test/queries/0_stateless/format_schemas/02030_capnp_fake_nullable.capnp
+%%DATADIR%%-test/queries/0_stateless/format_schemas/02030_capnp_nested_lists_and_tuples.capnp
+%%DATADIR%%-test/queries/0_stateless/format_schemas/02030_capnp_lists.capnp
+%%DATADIR%%-test/queries/0_stateless/format_schemas/02030_capnp_nested_tuples.capnp
+%%DATADIR%%-test/queries/0_stateless/format_schemas/02030_capnp_unnamed_union.capnp
+%%DATADIR%%-test/queries/0_stateless/01868_order_by_fill_with_datetime64.sql
+%%DATADIR%%-test/queries/0_stateless/01475_read_subcolumns_storages.sh
+%%DATADIR%%-test/queries/0_stateless/01776_decrypt_aead_size_check.sql
+%%DATADIR%%-test/queries/0_stateless/00572_aggregation_by_empty_set.sql
+%%DATADIR%%-test/queries/0_stateless/01112_check_table_with_index.reference
+%%DATADIR%%-test/queries/0_stateless/00152_totals_in_subquery.sql
+%%DATADIR%%-test/queries/0_stateless/01256_negative_generate_random.sql
+%%DATADIR%%-test/queries/0_stateless/01532_min_max_with_modifiers.sql
+%%DATADIR%%-test/queries/0_stateless/02021_map_has.reference
+%%DATADIR%%-test/queries/0_stateless/01552_impl_aggfunc_cloneresize.sql
+%%DATADIR%%-test/queries/0_stateless/01684_ssd_cache_dictionary_simple_key.reference
+%%DATADIR%%-test/queries/0_stateless/01519_topK_distributed_parametrized.reference
+%%DATADIR%%-test/queries/0_stateless/01651_bugs_from_15889.reference
+%%DATADIR%%-test/queries/0_stateless/02098_date32_comparison.sql
+%%DATADIR%%-test/queries/0_stateless/00527_totals_having_nullable.reference
+%%DATADIR%%-test/queries/0_stateless/01852_hints_enum_name.reference
+%%DATADIR%%-test/queries/0_stateless/01939_type_map_json.reference
+%%DATADIR%%-test/queries/0_stateless/01824_prefer_global_in_and_join.reference
+%%DATADIR%%-test/queries/0_stateless/00171_shard_array_of_tuple_remote.reference
+%%DATADIR%%-test/queries/0_stateless/00148_summing_merge_tree_aggregate_function.sql
+%%DATADIR%%-test/queries/0_stateless/01818_input_format_with_names_use_header.reference
+%%DATADIR%%-test/queries/0_stateless/01057_http_compression_prefer_brotli.reference
+%%DATADIR%%-test/queries/0_stateless/00399_group_uniq_array_date_datetime.sql
+%%DATADIR%%-test/queries/0_stateless/01536_fuzz_cast.sql
+%%DATADIR%%-test/queries/0_stateless/01493_alter_remove_properties.reference
+%%DATADIR%%-test/queries/0_stateless/00836_indices_alter.sql
+%%DATADIR%%-test/queries/0_stateless/01549_low_cardinality_materialized_view.sql
+%%DATADIR%%-test/queries/0_stateless/00946_ml_test.sql
+%%DATADIR%%-test/queries/0_stateless/01417_freeze_partition_verbose_zookeeper.reference
+%%DATADIR%%-test/queries/0_stateless/00490_special_line_separators_and_characters_outside_of_bmp.reference
+%%DATADIR%%-test/queries/0_stateless/01343_min_bytes_to_use_mmap_io.reference
+%%DATADIR%%-test/queries/0_stateless/01451_normalize_query.sql
+%%DATADIR%%-test/queries/0_stateless/02035_isNull_isNotNull_format.reference
+%%DATADIR%%-test/queries/0_stateless/01293_client_interactive_vertical_singleline.reference
+%%DATADIR%%-test/queries/0_stateless/01502_bar_overflow.reference
+%%DATADIR%%-test/queries/0_stateless/00299_stripe_log_multiple_inserts.sql
+%%DATADIR%%-test/queries/0_stateless/00357_to_string_complex_types.reference
+%%DATADIR%%-test/queries/0_stateless/01214_point_in_Mecca.sql
 %%DATADIR%%-test/queries/0_stateless/01273_h3EdgeAngle_range_check.sql
-%%DATADIR%%-test/queries/0_stateless/01273_lc_fixed_string_field.reference
-%%DATADIR%%-test/queries/0_stateless/01273_lc_fixed_string_field.sql
-%%DATADIR%%-test/queries/0_stateless/01274_alter_rename_column_distributed.reference
+%%DATADIR%%-test/queries/0_stateless/01544_fromModifiedJulianDay.reference
+%%DATADIR%%-test/queries/0_stateless/01355_CSV_input_format_allow_errors.reference
+%%DATADIR%%-test/queries/0_stateless/01090_zookeeper_mutations_and_insert_quorum_long.reference
+%%DATADIR%%-test/queries/0_stateless/01780_column_sparse_tuple.sql
+%%DATADIR%%-test/queries/0_stateless/00578_merge_table_shadow_virtual_column.sql
+%%DATADIR%%-test/queries/0_stateless/00633_func_or_in.reference
+%%DATADIR%%-test/queries/0_stateless/02115_map_contains.reference
+%%DATADIR%%-test/queries/0_stateless/00534_exp10.reference
+%%DATADIR%%-test/queries/0_stateless/00373_group_by_tuple.reference
+%%DATADIR%%-test/queries/0_stateless/01290_empty_array_index_analysis.reference
+%%DATADIR%%-test/queries/0_stateless/00944_ml_test.reference
+%%DATADIR%%-test/queries/0_stateless/02149_issue_32487.sql
+%%DATADIR%%-test/queries/0_stateless/00405_PrettyCompactMonoBlock.sh
+%%DATADIR%%-test/queries/0_stateless/00397_tsv_format_synonym.reference
+%%DATADIR%%-test/queries/0_stateless/01681_arg_min_max_if_fix.sql
+%%DATADIR%%-test/queries/0_stateless/00075_shard_formatting_negate_of_negative_literal.sql
+%%DATADIR%%-test/queries/0_stateless/00441_nulls_in.reference
+%%DATADIR%%-test/queries/0_stateless/01605_skip_idx_compact_parts.sql
+%%DATADIR%%-test/queries/0_stateless/00725_join_on_bug_2.reference
+%%DATADIR%%-test/queries/0_stateless/01288_shard_max_network_bandwidth.sql
+%%DATADIR%%-test/queries/0_stateless/01402_cast_nullable_string_to_enum.sql
+%%DATADIR%%-test/queries/0_stateless/01495_subqueries_in_with_statement_2.sql
+%%DATADIR%%-test/queries/0_stateless/00700_decimal_arithm.sql
+%%DATADIR%%-test/queries/0_stateless/02153_native_bounds_check.reference
+%%DATADIR%%-test/queries/0_stateless/01292_quantile_array_bug.sql
+%%DATADIR%%-test/queries/0_stateless/00352_external_sorting_and_constants.reference
+%%DATADIR%%-test/queries/0_stateless/01666_gcd_ubsan.sql
+%%DATADIR%%-test/queries/0_stateless/01341_datetime64_wrong_supertype.sql
+%%DATADIR%%-test/queries/0_stateless/00732_quorum_insert_lost_part_zookeeper_long.reference
+%%DATADIR%%-test/queries/0_stateless/01474_decimal_scale_bug.sql
+%%DATADIR%%-test/queries/0_stateless/00148_summing_merge_tree_nested_map_multiple_values.sql
+%%DATADIR%%-test/queries/0_stateless/00954_client_prepared_statements.reference
+%%DATADIR%%-test/queries/0_stateless/01039_mergetree_exec_time.reference
+%%DATADIR%%-test/queries/0_stateless/01575_disable_detach_table_of_dictionary.sql
+%%DATADIR%%-test/queries/0_stateless/00998_constraints_all_tables.sql
+%%DATADIR%%-test/queries/0_stateless/00534_functions_bad_arguments.lib
+%%DATADIR%%-test/queries/0_stateless/01585_use_index_for_global_in.reference
+%%DATADIR%%-test/queries/0_stateless/00932_array_intersect_bug.reference
+%%DATADIR%%-test/queries/0_stateless/01079_parallel_alter_add_drop_column_zookeeper.reference
+%%DATADIR%%-test/queries/0_stateless/00906_low_cardinality_cache.sql
+%%DATADIR%%-test/queries/0_stateless/01509_check_many_parallel_quorum_inserts_long.reference
+%%DATADIR%%-test/queries/0_stateless/00167_settings_inside_query.reference
+%%DATADIR%%-test/queries/0_stateless/02095_function_get_os_kernel_version.sql
+%%DATADIR%%-test/queries/0_stateless/01505_distributed_local_type_conversion_enum.reference
+%%DATADIR%%-test/queries/0_stateless/00060_date_lut.sql
+%%DATADIR%%-test/queries/0_stateless/00556_remove_columns_from_subquery.reference
+%%DATADIR%%-test/queries/0_stateless/00675_shard_remote_with_table_function.sql
+%%DATADIR%%-test/queries/0_stateless/01283_max_threads_simple_query_optimization.sql
+%%DATADIR%%-test/queries/0_stateless/01073_bad_alter_partition.reference
+%%DATADIR%%-test/queries/0_stateless/01223_dist_on_dist.reference
+%%DATADIR%%-test/queries/0_stateless/01602_array_aggregation.sql
+%%DATADIR%%-test/queries/0_stateless/00751_default_databasename_for_view.sql
+%%DATADIR%%-test/queries/0_stateless/01509_output_format_pretty_row_numbers.reference
+%%DATADIR%%-test/queries/0_stateless/00752_low_cardinality_permute.sql
+%%DATADIR%%-test/queries/0_stateless/01000_subquery_requires_alias.reference
+%%DATADIR%%-test/queries/0_stateless/00754_distributed_optimize_skip_select_on_unused_shards.reference
+%%DATADIR%%-test/queries/0_stateless/01921_concurrent_ttl_and_normal_merges_zookeeper_long.sh
+%%DATADIR%%-test/queries/0_stateless/00556_remove_columns_from_subquery.sql
+%%DATADIR%%-test/queries/0_stateless/01779_quantile_deterministic_msan.reference
+%%DATADIR%%-test/queries/0_stateless/00975_recursive_materialized_view.sql
+%%DATADIR%%-test/queries/0_stateless/01669_join_or_duplicates.reference
+%%DATADIR%%-test/queries/0_stateless/00712_prewhere_with_missing_columns_2.reference
+%%DATADIR%%-test/queries/0_stateless/00871_t64_codec_signed.reference
+%%DATADIR%%-test/queries/0_stateless/01640_marks_corruption_regression.reference
+%%DATADIR%%-test/queries/0_stateless/01800_log_nested.sql
+%%DATADIR%%-test/queries/0_stateless/01247_least_greatest_filimonov.sql
+%%DATADIR%%-test/queries/0_stateless/00926_adaptive_index_granularity_merge_tree.reference
+%%DATADIR%%-test/queries/0_stateless/02148_cast_type_parsing.reference
+%%DATADIR%%-test/queries/0_stateless/02126_dist_desc.reference
+%%DATADIR%%-test/queries/0_stateless/01820_unhex_case_insensitive.reference
+%%DATADIR%%-test/queries/0_stateless/00132_sets.reference
+%%DATADIR%%-test/queries/0_stateless/02029_quantile_sanitizer.sql
+%%DATADIR%%-test/queries/0_stateless/00612_http_max_query_size.sh
+%%DATADIR%%-test/queries/0_stateless/00717_merge_and_distributed.sql
+%%DATADIR%%-test/queries/0_stateless/02011_http_parsing.reference
+%%DATADIR%%-test/queries/0_stateless/01946_profile_sleep.sql
+%%DATADIR%%-test/queries/0_stateless/01526_client_start_and_exit.reference
+%%DATADIR%%-test/queries/0_stateless/00881_unknown_identifier_in_in.sql
+%%DATADIR%%-test/queries/0_stateless/00093_union_race_conditions_4.reference
+%%DATADIR%%-test/queries/0_stateless/01073_attach_if_not_exists.reference
+%%DATADIR%%-test/queries/0_stateless/00723_remerge_sort.sql
+%%DATADIR%%-test/queries/0_stateless/00033_fixed_string_to_string.sql
+%%DATADIR%%-test/queries/0_stateless/01917_prewhere_column_type.sql
+%%DATADIR%%-test/queries/0_stateless/00311_array_primary_key.sql
+%%DATADIR%%-test/queries/0_stateless/00989_parallel_parts_loading.reference
+%%DATADIR%%-test/queries/0_stateless/02016_summing_mt_aggregating_column.reference
+%%DATADIR%%-test/queries/0_stateless/01854_s2_cap_contains.reference
+%%DATADIR%%-test/queries/0_stateless/01642_if_nullable_regression.sql
+%%DATADIR%%-test/queries/0_stateless/01109_inflating_cross_join.sql
+%%DATADIR%%-test/queries/0_stateless/00704_arrayCumSumLimited_arrayDifference.reference
+%%DATADIR%%-test/queries/0_stateless/01821_dictionary_primary_key_wrong_order.sql
+%%DATADIR%%-test/queries/0_stateless/01712_no_adaptive_granularity_vertical_merge.sql
+%%DATADIR%%-test/queries/0_stateless/00466_comments_in_keyword.sql
+%%DATADIR%%-test/queries/0_stateless/00842_array_with_constant_overflow.reference
+%%DATADIR%%-test/queries/0_stateless/01912_bad_cast_join_fuzz.reference
+%%DATADIR%%-test/queries/0_stateless/00261_storage_aliases_and_array_join.reference
+%%DATADIR%%-test/queries/0_stateless/01812_optimize_skip_unused_shards_single_node.reference
+%%DATADIR%%-test/queries/0_stateless/00067_replicate_segfault.sql
+%%DATADIR%%-test/queries/0_stateless/01592_length_map.sql
+%%DATADIR%%-test/queries/0_stateless/00905_field_with_aggregate_function_state.sql
+%%DATADIR%%-test/queries/0_stateless/02021_prewhere_column_optimization.sql
+%%DATADIR%%-test/queries/0_stateless/02043_query_obfuscator_embedded_dictionaries.reference
+%%DATADIR%%-test/queries/0_stateless/00813_parse_date_time_best_effort_more.sql
+%%DATADIR%%-test/queries/0_stateless/01710_projection_with_joins.reference
+%%DATADIR%%-test/queries/0_stateless/01517_drop_mv_with_inner_table.sql
+%%DATADIR%%-test/queries/0_stateless/01594_too_low_memory_limits.reference
+%%DATADIR%%-test/queries/0_stateless/01602_show_create_view.reference
+%%DATADIR%%-test/queries/0_stateless/00571_non_exist_database_when_create_materializ_view.reference
+%%DATADIR%%-test/queries/0_stateless/01305_polygons_union.reference
+%%DATADIR%%-test/queries/0_stateless/01746_forbid_drop_column_referenced_by_mv.reference
+%%DATADIR%%-test/queries/0_stateless/01801_s3_cluster.sql
+%%DATADIR%%-test/queries/0_stateless/01012_reset_running_accumulate.reference
+%%DATADIR%%-test/queries/0_stateless/00500_point_in_polygon.sql
+%%DATADIR%%-test/queries/0_stateless/00569_parse_date_time_best_effort.reference
+%%DATADIR%%-test/queries/0_stateless/01936_three_parts_identifiers_in_wrong_places.sql
+%%DATADIR%%-test/queries/0_stateless/00020_sorting_arrays.reference
+%%DATADIR%%-test/queries/0_stateless/02002_system_table_with_tuple.reference
+%%DATADIR%%-test/queries/0_stateless/02152_short_circuit_throw_if.sql
+%%DATADIR%%-test/queries/0_stateless/00548_slice_of_nested.reference
+%%DATADIR%%-test/queries/0_stateless/01287_max_execution_speed.sql
+%%DATADIR%%-test/queries/0_stateless/00977_join_use_nulls_denny_crane.sql
+%%DATADIR%%-test/queries/0_stateless/01771_bloom_filter_not_has.reference
+%%DATADIR%%-test/queries/0_stateless/01143_trivial_count_with_join.sql
+%%DATADIR%%-test/queries/0_stateless/01069_window_view_proc_tumble_watch.reference
+%%DATADIR%%-test/queries/0_stateless/00926_adaptive_index_granularity_merge_tree.sql
+%%DATADIR%%-test/queries/0_stateless/00980_merge_alter_settings.sql
+%%DATADIR%%-test/queries/0_stateless/00952_insert_into_distributed_with_materialized_column.reference
+%%DATADIR%%-test/queries/0_stateless/01780_dict_get_or_null.reference
+%%DATADIR%%-test/queries/0_stateless/00968_roundAge.sql
+%%DATADIR%%-test/queries/0_stateless/00688_case_without_else.reference
+%%DATADIR%%-test/queries/0_stateless/02030_client_unknown_database.reference
+%%DATADIR%%-test/queries/0_stateless/00251_has_types.sql
+%%DATADIR%%-test/queries/0_stateless/01518_nullable_aggregate_states2.sql
+%%DATADIR%%-test/queries/0_stateless/01144_multiple_joins_rewriter_v2_and_lambdas.sql
+%%DATADIR%%-test/queries/0_stateless/00973_live_view_with_subquery_select_join_no_alias.reference
+%%DATADIR%%-test/queries/0_stateless/00592_union_all_different_aliases.reference
+%%DATADIR%%-test/queries/0_stateless/01284_fuzz_bits.reference
+%%DATADIR%%-test/queries/0_stateless/00800_low_cardinality_distributed_insert.reference
+%%DATADIR%%-test/queries/0_stateless/01603_rename_overwrite_bug.sql
+%%DATADIR%%-test/queries/0_stateless/00678_murmurhash.reference
+%%DATADIR%%-test/queries/0_stateless/00576_nested_and_prewhere.reference
+%%DATADIR%%-test/queries/0_stateless/01079_alter_default_zookeeper_long.sql
+%%DATADIR%%-test/queries/0_stateless/00623_in_partition_key.sql
+%%DATADIR%%-test/queries/0_stateless/00605_intersections_aggregate_functions.sql
+%%DATADIR%%-test/queries/0_stateless/01523_interval_operator_support_string_literal.reference
+%%DATADIR%%-test/queries/0_stateless/01318_map_add_map_subtract.reference
+%%DATADIR%%-test/queries/0_stateless/00700_decimal_aggregates.sql
+%%DATADIR%%-test/queries/0_stateless/01300_group_by_other_keys.reference
+%%DATADIR%%-test/queries/0_stateless/02112_delayed_clickhouse_local_with_queries_file.expect
+%%DATADIR%%-test/queries/0_stateless/01281_join_with_prewhere_fix.sql
+%%DATADIR%%-test/queries/0_stateless/02021_h3_is_pentagon.reference
+%%DATADIR%%-test/queries/0_stateless/01504_compression_multiple_streams.reference
+%%DATADIR%%-test/queries/0_stateless/01527_clickhouse_local_optimize.sh
+%%DATADIR%%-test/queries/0_stateless/02044_url_glob_parallel.sh
+%%DATADIR%%-test/queries/0_stateless/00048_a_stored_aggregates_merge.sql
+%%DATADIR%%-test/queries/0_stateless/01548_lzy305.reference
+%%DATADIR%%-test/queries/0_stateless/01739_index_hint.sql
+%%DATADIR%%-test/queries/0_stateless/01515_force_data_skipping_indices.sql
+%%DATADIR%%-test/queries/0_stateless/00973_live_view_select.reference
+%%DATADIR%%-test/queries/0_stateless/01531_query_log_query_comment.sql
+%%DATADIR%%-test/queries/0_stateless/01220_scalar_optimization_in_alter.reference
+%%DATADIR%%-test/queries/0_stateless/02116_tuple_element.reference
+%%DATADIR%%-test/queries/0_stateless/01940_custom_tld_sharding_key.sql
+%%DATADIR%%-test/queries/0_stateless/00165_transform_non_const_default.reference
+%%DATADIR%%-test/queries/0_stateless/01881_aggregate_functions_versioning.reference
+%%DATADIR%%-test/queries/0_stateless/01580_column_const_comparision.sql
+%%DATADIR%%-test/queries/0_stateless/01721_dictionary_decimal_p_s.reference
+%%DATADIR%%-test/queries/0_stateless/00505_shard_secure.sh
+%%DATADIR%%-test/queries/0_stateless/01557_max_parallel_replicas_no_sample.sql
+%%DATADIR%%-test/queries/0_stateless/01281_alter_rename_and_other_renames.sql
+%%DATADIR%%-test/queries/0_stateless/02131_materialize_column_cast.sql
+%%DATADIR%%-test/queries/0_stateless/00313_const_totals_extremes.sh
+%%DATADIR%%-test/queries/0_stateless/01662_test_toDayOfMonth_mysql_compatibility.sql
+%%DATADIR%%-test/queries/0_stateless/01778_mmap_cache_infra.reference
+%%DATADIR%%-test/queries/0_stateless/02164_clickhouse_local_interactive_exception.reference
+%%DATADIR%%-test/queries/0_stateless/02160_monthname.sql
+%%DATADIR%%-test/queries/0_stateless/00752_low_cardinality_array_result.reference
+%%DATADIR%%-test/queries/0_stateless/01758_optimize_skip_unused_shards_once.sh
+%%DATADIR%%-test/queries/0_stateless/00952_basic_constraints.sh
+%%DATADIR%%-test/queries/0_stateless/00305_http_and_readonly.reference
+%%DATADIR%%-test/queries/0_stateless/01284_port.sql
+%%DATADIR%%-test/queries/0_stateless/01897_jit_aggregation_function_avg_weighted_long.sql
+%%DATADIR%%-test/queries/0_stateless/02013_bloom_filter_hasAll.reference
+%%DATADIR%%-test/queries/0_stateless/01773_case_sensitive_version.sql
+%%DATADIR%%-test/queries/0_stateless/01652_ttl_old_syntax.sql
+%%DATADIR%%-test/queries/0_stateless/01547_query_log_current_database.reference
+%%DATADIR%%-test/queries/0_stateless/01527_bad_aggregation_in_lambda.sql
+%%DATADIR%%-test/queries/0_stateless/00965_shard_unresolvable_addresses.sql
+%%DATADIR%%-test/queries/0_stateless/01278_format_multiple_queries.reference
+%%DATADIR%%-test/queries/0_stateless/01045_array_zip.sql
+%%DATADIR%%-test/queries/0_stateless/01901_test_attach_partition_from.reference
+%%DATADIR%%-test/queries/0_stateless/01012_serialize_array_memory_usage.reference
+%%DATADIR%%-test/queries/0_stateless/00029_test_zookeeper_optimize_exception.sh
+%%DATADIR%%-test/queries/0_stateless/01093_cyclic_defaults_filimonov.reference
+%%DATADIR%%-test/queries/0_stateless/00190_non_constant_array_of_constant_data.sql
+%%DATADIR%%-test/queries/0_stateless/01319_manual_write_to_replicas_long.reference
+%%DATADIR%%-test/queries/0_stateless/01225_drop_dictionary_as_table.sql
+%%DATADIR%%-test/queries/0_stateless/01622_defaults_for_file_engine.reference
+%%DATADIR%%-test/queries/0_stateless/00271_agg_state_and_totals.sql
+%%DATADIR%%-test/queries/0_stateless/02001_shard_num_shard_count.reference
+%%DATADIR%%-test/queries/0_stateless/00140_prewhere_column_order.sql
+%%DATADIR%%-test/queries/0_stateless/01939_network_receive_bytes_metrics.reference
+%%DATADIR%%-test/queries/0_stateless/00534_functions_bad_arguments9.reference
+%%DATADIR%%-test/queries/0_stateless/02008_complex_key_range_hashed_dictionary.sql
+%%DATADIR%%-test/queries/0_stateless/00110_external_sort.sql
+%%DATADIR%%-test/queries/0_stateless/00542_access_to_temporary_table_in_readonly_mode.reference
+%%DATADIR%%-test/queries/0_stateless/00983_summing_merge_tree_not_an_identifier.reference
 %%DATADIR%%-test/queries/0_stateless/01274_alter_rename_column_distributed.sql
-%%DATADIR%%-test/queries/0_stateless/01274_generate_random_nested.reference
-%%DATADIR%%-test/queries/0_stateless/01274_generate_random_nested.sh
-%%DATADIR%%-test/queries/0_stateless/01275_alter_rename_column_default_expr.reference
-%%DATADIR%%-test/queries/0_stateless/01275_alter_rename_column_default_expr.sql
-%%DATADIR%%-test/queries/0_stateless/01275_extract_groups_check.reference
-%%DATADIR%%-test/queries/0_stateless/01275_extract_groups_check.sql
-%%DATADIR%%-test/queries/0_stateless/01275_parallel_mv.reference
-%%DATADIR%%-test/queries/0_stateless/01275_parallel_mv.sql
-%%DATADIR%%-test/queries/0_stateless/01276_alter_rename_column_materialized_expr.reference
-%%DATADIR%%-test/queries/0_stateless/01276_alter_rename_column_materialized_expr.sql
-%%DATADIR%%-test/queries/0_stateless/01276_random_string.reference
+%%DATADIR%%-test/queries/0_stateless/01560_optimize_on_insert_zookeeper.sql
+%%DATADIR%%-test/queries/0_stateless/01479_cross_join_9855.sql
+%%DATADIR%%-test/queries/0_stateless/01924_argmax_bitmap_state.reference
+%%DATADIR%%-test/queries/0_stateless/00384_column_aggregate_function_insert_from.sql
+%%DATADIR%%-test/queries/0_stateless/00179_lambdas_with_common_expressions_and_filter.sql
+%%DATADIR%%-test/queries/0_stateless/00150_with_totals_and_join.reference
+%%DATADIR%%-test/queries/0_stateless/00705_drop_create_merge_tree.reference
+%%DATADIR%%-test/queries/0_stateless/01514_input_format_csv_enum_as_number_setting.sql
+%%DATADIR%%-test/queries/0_stateless/00825_protobuf_format_array_of_arrays.sh
+%%DATADIR%%-test/queries/0_stateless/01536_fuzz_cast.reference
+%%DATADIR%%-test/queries/0_stateless/01041_create_dictionary_if_not_exists.sql
+%%DATADIR%%-test/queries/0_stateless/00962_live_view_periodic_refresh.py
+%%DATADIR%%-test/queries/0_stateless/00021_sorting_arrays.sql
+%%DATADIR%%-test/queries/0_stateless/00456_alter_nullable.sql
+%%DATADIR%%-test/queries/0_stateless/01566_negate_formatting.sql
+%%DATADIR%%-test/queries/0_stateless/00290_shard_aggregation_memory_efficient.reference
+%%DATADIR%%-test/queries/0_stateless/01999_grant_with_replace.sql
+%%DATADIR%%-test/queries/0_stateless/01934_constexpr_aggregate_function_parameters.sql
+%%DATADIR%%-test/queries/0_stateless/00412_logical_expressions_optimizer.reference
+%%DATADIR%%-test/queries/0_stateless/01779_quantile_deterministic_msan.sql
+%%DATADIR%%-test/queries/0_stateless/01710_minmax_count_projection.reference
+%%DATADIR%%-test/queries/0_stateless/00911_tautological_compare.reference
+%%DATADIR%%-test/queries/0_stateless/00266_read_overflow_mode.sql
+%%DATADIR%%-test/queries/0_stateless/00302_http_compression.reference
+%%DATADIR%%-test/queries/0_stateless/02151_clickhouse_client_hints.reference
+%%DATADIR%%-test/queries/0_stateless/01177_group_array_moving.reference
+%%DATADIR%%-test/queries/0_stateless/01710_aggregate_projection_with_hashing.sql
+%%DATADIR%%-test/queries/0_stateless/01072_optimize_skip_unused_shards_const_expr_eval.reference
+%%DATADIR%%-test/queries/0_stateless/01503_if_const_optimization.reference
+%%DATADIR%%-test/queries/0_stateless/00858_issue_4756.sql
+%%DATADIR%%-test/queries/0_stateless/00746_hashing_tuples.reference
+%%DATADIR%%-test/queries/0_stateless/00724_insert_values_datetime_conversion.reference
+%%DATADIR%%-test/queries/0_stateless/01509_format_raw_blob.reference
+%%DATADIR%%-test/queries/0_stateless/01710_projections_in_distributed_query.sql
+%%DATADIR%%-test/queries/0_stateless/01655_quarter_modificator_for_formatDateTime.reference
+%%DATADIR%%-test/queries/0_stateless/00021_sorting_arrays.reference
+%%DATADIR%%-test/queries/0_stateless/00266_shard_global_subquery_and_aliases.sql
+%%DATADIR%%-test/queries/0_stateless/01359_codeql.sql
+%%DATADIR%%-test/queries/0_stateless/02156_storage_merge_prewhere.sql
+%%DATADIR%%-test/queries/0_stateless/01415_table_function_view.reference
+%%DATADIR%%-test/queries/0_stateless/00836_numbers_table_function_zero.reference
+%%DATADIR%%-test/queries/0_stateless/00309_formats.sql
+%%DATADIR%%-test/queries/0_stateless/01720_engine_file_empty_if_not_exists.reference
+%%DATADIR%%-test/queries/0_stateless/02008_tuple_to_name_value_pairs.sql
+%%DATADIR%%-test/queries/0_stateless/00597_with_totals_on_empty_set.reference
+%%DATADIR%%-test/queries/0_stateless/01137_order_by_func.reference
+%%DATADIR%%-test/queries/0_stateless/00979_set_index_not.reference
+%%DATADIR%%-test/queries/0_stateless/01710_aggregate_projection_with_hashing.reference
+%%DATADIR%%-test/queries/0_stateless/01292_optimize_data_skip_idx_order_by_expr.sql
+%%DATADIR%%-test/queries/0_stateless/02096_sample_by_tuple.reference
+%%DATADIR%%-test/queries/0_stateless/01038_array_of_unnamed_tuples.sql
 %%DATADIR%%-test/queries/0_stateless/01276_random_string.sql
-%%DATADIR%%-test/queries/0_stateless/01276_system_licenses.reference
-%%DATADIR%%-test/queries/0_stateless/01276_system_licenses.sql
-%%DATADIR%%-test/queries/0_stateless/01277_alter_rename_column_constraint.reference
-%%DATADIR%%-test/queries/0_stateless/01277_alter_rename_column_constraint.sql
-%%DATADIR%%-test/queries/0_stateless/01277_alter_rename_column_constraint_zookeeper.reference
-%%DATADIR%%-test/queries/0_stateless/01277_alter_rename_column_constraint_zookeeper.sql
-%%DATADIR%%-test/queries/0_stateless/01277_buffer_column_order.reference
-%%DATADIR%%-test/queries/0_stateless/01277_buffer_column_order.sql
-%%DATADIR%%-test/queries/0_stateless/01277_convert_field_to_type_logical_error.reference
-%%DATADIR%%-test/queries/0_stateless/01277_convert_field_to_type_logical_error.sql
-%%DATADIR%%-test/queries/0_stateless/01277_fromUnixTimestamp64.reference
-%%DATADIR%%-test/queries/0_stateless/01277_fromUnixTimestamp64.sql
-%%DATADIR%%-test/queries/0_stateless/01277_large_tuples.reference
+%%DATADIR%%-test/queries/0_stateless/00363_defaults.reference
+%%DATADIR%%-test/queries/0_stateless/01158_zookeeper_log_long.sql
+%%DATADIR%%-test/queries/0_stateless/00522_multidimensional.reference
+%%DATADIR%%-test/queries/0_stateless/01320_optimize_skip_unused_shards_no_non_deterministic.sql
+%%DATADIR%%-test/queries/0_stateless/01802_rank_corr_mann_whitney_over_window.sql
+%%DATADIR%%-test/queries/0_stateless/01039_mergetree_exec_time.sql
+%%DATADIR%%-test/queries/0_stateless/00098_h_union_all.reference
+%%DATADIR%%-test/queries/0_stateless/01849_geoToS2.reference
+%%DATADIR%%-test/queries/0_stateless/00128_group_by_number_and_fixed_string.sql
+%%DATADIR%%-test/queries/0_stateless/01656_sequence_next_node_long.reference
+%%DATADIR%%-test/queries/0_stateless/00725_join_on_bug_3.reference
+%%DATADIR%%-test/queries/0_stateless/01417_update_permutation_crash.reference
+%%DATADIR%%-test/queries/0_stateless/00004_shard_format_ast_and_remote_table.reference
+%%DATADIR%%-test/queries/0_stateless/01872_functions_to_subcolumns.reference
+%%DATADIR%%-test/queries/0_stateless/00160_merge_and_index_in_in.sql
+%%DATADIR%%-test/queries/0_stateless/01710_projection_in_index.reference
+%%DATADIR%%-test/queries/0_stateless/01450_set_null_const.sql
+%%DATADIR%%-test/queries/0_stateless/01164_alter_memory_database.sql
+%%DATADIR%%-test/queries/0_stateless/00825_protobuf_format_nested_optional.reference
+%%DATADIR%%-test/queries/0_stateless/01599_multiline_input_and_singleline_comments.reference
+%%DATADIR%%-test/queries/0_stateless/00600_create_temporary_table_if_not_exists.sql
+%%DATADIR%%-test/queries/0_stateless/01543_parse_datetime_besteffort_or_null_empty_string.sql
+%%DATADIR%%-test/queries/0_stateless/02022_bzip2_truncated.sh
+%%DATADIR%%-test/queries/0_stateless/00566_enum_min_max.sql
+%%DATADIR%%-test/queries/0_stateless/00022_func_higher_order_and_constants.reference
+%%DATADIR%%-test/queries/0_stateless/01902_dictionary_array_type.sql
+%%DATADIR%%-test/queries/0_stateless/00552_logical_functions_uint8_as_bool.sql
+%%DATADIR%%-test/queries/0_stateless/01660_second_extremes_bug.reference
+%%DATADIR%%-test/queries/0_stateless/00990_request_splitting.sql
+%%DATADIR%%-test/queries/0_stateless/00707_float_csv_delimiter.reference
+%%DATADIR%%-test/queries/0_stateless/00663_tiny_log_empty_insert.sql
+%%DATADIR%%-test/queries/0_stateless/01881_to_week_monotonic_fix.reference
+%%DATADIR%%-test/queries/0_stateless/00453_cast_enum.reference
+%%DATADIR%%-test/queries/0_stateless/01433_hex_float.reference
+%%DATADIR%%-test/queries/0_stateless/01746_test_for_tupleElement_must_be_constant_issue.sql
+%%DATADIR%%-test/queries/0_stateless/02152_bool_type.sql
+%%DATADIR%%-test/queries/0_stateless/01937_nested_chinese.reference
+%%DATADIR%%-test/queries/0_stateless/data_orc_arrow_parquet_nested/nested_table.arrow
+%%DATADIR%%-test/queries/0_stateless/data_orc_arrow_parquet_nested/nested_nested_table.parquet
+%%DATADIR%%-test/queries/0_stateless/data_orc_arrow_parquet_nested/nested_table.parquet
+%%DATADIR%%-test/queries/0_stateless/data_orc_arrow_parquet_nested/nested_nested_table.arrow
+%%DATADIR%%-test/queries/0_stateless/data_orc_arrow_parquet_nested/nested_nested_table.orc
+%%DATADIR%%-test/queries/0_stateless/data_orc_arrow_parquet_nested/nested_table.orc
+%%DATADIR%%-test/queries/0_stateless/01671_ddl_hang_timeout_long.sh
+%%DATADIR%%-test/queries/0_stateless/00834_hints_for_type_function_typos.sh
+%%DATADIR%%-test/queries/0_stateless/01923_ttl_with_modify_column.sql
+%%DATADIR%%-test/queries/0_stateless/01002_alter_nullable_adaptive_granularity_long.reference
+%%DATADIR%%-test/queries/0_stateless/01678_great_circle_angle.reference
+%%DATADIR%%-test/queries/0_stateless/01058_zlib_ng_level1_bug.reference
+%%DATADIR%%-test/queries/0_stateless/01528_clickhouse_local_prepare_parts.sh
+%%DATADIR%%-test/queries/0_stateless/01291_unsupported_conversion_from_decimal.sql
+%%DATADIR%%-test/queries/0_stateless/01087_storage_generate.sql
+%%DATADIR%%-test/queries/0_stateless/01661_arraySlice_ubsan.reference
+%%DATADIR%%-test/queries/0_stateless/00610_materialized_view_forward_alter_partition_statements.reference
+%%DATADIR%%-test/queries/0_stateless/00401_merge_and_stripelog.sql
+%%DATADIR%%-test/queries/0_stateless/01778_mmap_cache_infra.sql
+%%DATADIR%%-test/queries/0_stateless/01006_ttl_with_default_2.sql
+%%DATADIR%%-test/queries/0_stateless/00701_rollup.reference
+%%DATADIR%%-test/queries/0_stateless/00159_whitespace_in_columns_list.sql
+%%DATADIR%%-test/queries/0_stateless/01083_log_family_disk_memory.reference
+%%DATADIR%%-test/queries/0_stateless/01683_text_log_deadlock.reference
+%%DATADIR%%-test/queries/0_stateless/01249_bad_arguments_for_bloom_filter.sql
+%%DATADIR%%-test/queries/0_stateless/01881_create_as_tuple.sql
+%%DATADIR%%-test/queries/0_stateless/00909_kill_not_initialized_query.reference
+%%DATADIR%%-test/queries/0_stateless/01414_freeze_does_not_prevent_alters.reference
+%%DATADIR%%-test/queries/0_stateless/00806_alter_update.sql
+%%DATADIR%%-test/queries/0_stateless/01072_optimize_skip_unused_shards_const_expr_eval.sql
+%%DATADIR%%-test/queries/0_stateless/01671_merge_join_and_constants.reference
+%%DATADIR%%-test/queries/0_stateless/00957_neighbor.sql
+%%DATADIR%%-test/queries/0_stateless/01511_alter_version_versioned_collapsing_merge_tree.reference
+%%DATADIR%%-test/queries/0_stateless/00472_create_view_if_not_exists.sql
+%%DATADIR%%-test/queries/0_stateless/00084_summing_merge_tree.reference
+%%DATADIR%%-test/queries/0_stateless/00473_output_format_json_quote_denormals.sh
+%%DATADIR%%-test/queries/0_stateless/00237_group_by_arrays.reference
+%%DATADIR%%-test/queries/0_stateless/00700_decimal_formats.reference
+%%DATADIR%%-test/queries/0_stateless/00714_create_temporary_table_with_in_clause.reference
+%%DATADIR%%-test/queries/0_stateless/01358_mutation_delete_null_rows.reference
+%%DATADIR%%-test/queries/0_stateless/00411_long_accurate_number_comparison_int1.reference
+%%DATADIR%%-test/queries/0_stateless/00193_parallel_replicas.sql
+%%DATADIR%%-test/queries/0_stateless/00811_garbage.sql
+%%DATADIR%%-test/queries/0_stateless/01818_move_partition_simple.sql
+%%DATADIR%%-test/queries/0_stateless/01293_external_sorting_limit_bug.reference
+%%DATADIR%%-test/queries/0_stateless/01050_group_array_sample.sql
+%%DATADIR%%-test/queries/0_stateless/01291_geo_types.sql
+%%DATADIR%%-test/queries/0_stateless/01761_alter_decimal_zookeeper_long.reference
+%%DATADIR%%-test/queries/0_stateless/01062_alter_on_mutataion_zookeeper_long.reference
+%%DATADIR%%-test/queries/0_stateless/01663_aes_msan.reference
+%%DATADIR%%-test/queries/0_stateless/00950_bad_alloc_when_truncate_join_storage.sql
+%%DATADIR%%-test/queries/0_stateless/01538_fuzz_aggregate.sql
+%%DATADIR%%-test/queries/0_stateless/01032_duplicate_column_insert_query.reference
+%%DATADIR%%-test/queries/0_stateless/00565_enum_order.reference
+%%DATADIR%%-test/queries/0_stateless/01130_in_memory_parts_nested.reference
+%%DATADIR%%-test/queries/0_stateless/02117_custom_separated_with_names_and_types.reference
+%%DATADIR%%-test/queries/0_stateless/02036_jit_short_circuit.reference
+%%DATADIR%%-test/queries/0_stateless/01440_big_int_shift.reference
+%%DATADIR%%-test/queries/0_stateless/00330_view_subqueries.reference
+%%DATADIR%%-test/queries/0_stateless/01045_order_by_pk_special_storages.sh
+%%DATADIR%%-test/queries/0_stateless/00661_optimize_final_replicated_without_partition_zookeeper.sql
+%%DATADIR%%-test/queries/0_stateless/01896_jit_aggregation_function_if_long.reference
+%%DATADIR%%-test/queries/0_stateless/00213_multiple_global_in.reference
+%%DATADIR%%-test/queries/0_stateless/01550_type_map_formats_input.sh
+%%DATADIR%%-test/queries/0_stateless/02053_INSERT_SELECT_MATERIALIZED.sql
+%%DATADIR%%-test/queries/0_stateless/00730_unicode_terminal_format.sql
+%%DATADIR%%-test/queries/0_stateless/00999_join_not_nullable_types.sql
+%%DATADIR%%-test/queries/0_stateless/02001_compress_output_file.sh
+%%DATADIR%%-test/queries/0_stateless/00318_pk_tuple_order.sql
+%%DATADIR%%-test/queries/0_stateless/00483_cast_syntax.sql
+%%DATADIR%%-test/queries/0_stateless/01487_distributed_in_not_default_db.sql
+%%DATADIR%%-test/queries/0_stateless/01851_clear_column_referenced_by_mv.reference
+%%DATADIR%%-test/queries/0_stateless/01012_show_tables_limit.sql
+%%DATADIR%%-test/queries/0_stateless/01305_buffer_final_bug.sql
+%%DATADIR%%-test/queries/0_stateless/00346_if_tuple.sql
+%%DATADIR%%-test/queries/0_stateless/01263_type_conversion_nvartolomei.sql
+%%DATADIR%%-test/queries/0_stateless/00975_sample_prewhere_distributed.sql
+%%DATADIR%%-test/queries/0_stateless/00358_from_string_complex_types.sql
+%%DATADIR%%-test/queries/0_stateless/00306_insert_values_and_expressions.reference
+%%DATADIR%%-test/queries/0_stateless/00148_summing_merge_tree_nested_map_multiple_values.reference
+%%DATADIR%%-test/queries/0_stateless/00981_no_virtual_columns.reference
+%%DATADIR%%-test/queries/0_stateless/01187_set_profile_as_setting.sh
+%%DATADIR%%-test/queries/0_stateless/01114_clear_column_compact_parts.reference
+%%DATADIR%%-test/queries/0_stateless/00143_number_classification_functions.reference
+%%DATADIR%%-test/queries/0_stateless/01180_client_syntax_errors.reference
+%%DATADIR%%-test/queries/0_stateless/00997_extract_all_crash_6627.sql
+%%DATADIR%%-test/queries/0_stateless/00812_prewhere_alias_array.reference
+%%DATADIR%%-test/queries/0_stateless/01476_right_full_join_switch.sql
+%%DATADIR%%-test/queries/0_stateless/01185_create_or_replace_table.sql
+%%DATADIR%%-test/queries/0_stateless/00502_string_concat_with_array.sql
+%%DATADIR%%-test/queries/0_stateless/00933_reserved_word.reference
+%%DATADIR%%-test/queries/0_stateless/00648_replacing_empty_set_from_prewhere.reference
+%%DATADIR%%-test/queries/0_stateless/01543_avro_deserialization_with_lc.reference
+%%DATADIR%%-test/queries/0_stateless/01801_nullable_low_cardinality_tsv.reference
+%%DATADIR%%-test/queries/0_stateless/01881_negate_formatting.reference
+%%DATADIR%%-test/queries/0_stateless/01013_hex_decimal.reference
+%%DATADIR%%-test/queries/0_stateless/01031_semi_anti_join.sql
+%%DATADIR%%-test/queries/0_stateless/00999_full_join_dup_keys_crash.reference
+%%DATADIR%%-test/queries/0_stateless/00804_test_custom_compression_codecs.reference
+%%DATADIR%%-test/queries/0_stateless/00908_long_http_insert.sh
+%%DATADIR%%-test/queries/0_stateless/01813_distributed_scalar_subqueries_alias.sql
+%%DATADIR%%-test/queries/0_stateless/01670_sign_function.reference
+%%DATADIR%%-test/queries/0_stateless/01582_distinct_subquery_groupby.reference
+%%DATADIR%%-test/queries/0_stateless/00042_set.reference
+%%DATADIR%%-test/queries/0_stateless/01131_max_rows_to_sort.sql
+%%DATADIR%%-test/queries/0_stateless/01746_long_zlib_http_compression_json_format.sh
+%%DATADIR%%-test/queries/0_stateless/00625_query_in_form_data.sh
+%%DATADIR%%-test/queries/0_stateless/01109_sc0rp10_string_hash_map_zero_bytes.sql
+%%DATADIR%%-test/queries/0_stateless/01474_bad_global_join.sql
+%%DATADIR%%-test/queries/0_stateless/00717_merge_and_distributed.reference
+%%DATADIR%%-test/queries/0_stateless/01719_join_timezone.reference
+%%DATADIR%%-test/queries/0_stateless/01715_table_function_view_fix.sql
+%%DATADIR%%-test/queries/0_stateless/00017_in_subquery_with_empty_result.sql
+%%DATADIR%%-test/queries/0_stateless/01661_extract_all_groups_throw_fast.sql
+%%DATADIR%%-test/queries/0_stateless/00097_long_storage_buffer_race_condition.reference
+%%DATADIR%%-test/queries/0_stateless/01459_default_value_of_argument_type_nullptr_dereference.sql
+%%DATADIR%%-test/queries/0_stateless/00712_prewhere_with_alias_bug.sql
+%%DATADIR%%-test/queries/0_stateless/01670_sign_function.sql
+%%DATADIR%%-test/queries/0_stateless/01502_log_tinylog_deadlock_race.reference
+%%DATADIR%%-test/queries/0_stateless/02030_rocksdb_race_long.sh
+%%DATADIR%%-test/queries/0_stateless/00991_live_view_watch_http.reference
+%%DATADIR%%-test/queries/0_stateless/00623_truncate_table_throw_exception.sh
+%%DATADIR%%-test/queries/0_stateless/01621_decode_XML.sql
+%%DATADIR%%-test/queries/0_stateless/02122_4letter_words_stress_zookeeper.sh
+%%DATADIR%%-test/queries/0_stateless/01691_DateTime64_clamp.reference
+%%DATADIR%%-test/queries/0_stateless/01715_table_function_view_fix.reference
+%%DATADIR%%-test/queries/0_stateless/01854_s2_cap_contains.sql
+%%DATADIR%%-test/queries/0_stateless/01576_alias_column_rewrite.sql
+%%DATADIR%%-test/queries/0_stateless/00482_subqueries_and_aliases.sql
+%%DATADIR%%-test/queries/0_stateless/00544_agg_foreach_of_two_arg.reference
+%%DATADIR%%-test/queries/0_stateless/01505_log_distributed_deadlock.reference
+%%DATADIR%%-test/queries/0_stateless/00307_format_xml.sql
+%%DATADIR%%-test/queries/0_stateless/01296_create_row_policy_in_current_database.reference
+%%DATADIR%%-test/queries/0_stateless/01012_select_limit_x_0.reference
+%%DATADIR%%-test/queries/0_stateless/01507_transform_null_in.reference
+%%DATADIR%%-test/queries/0_stateless/00161_rounding_functions.sql
+%%DATADIR%%-test/queries/0_stateless/01232_json_as_string_format.reference
+%%DATADIR%%-test/queries/0_stateless/02147_order_by_optimizations.reference
+%%DATADIR%%-test/queries/0_stateless/00800_low_cardinality_distributed_insert.sql
+%%DATADIR%%-test/queries/0_stateless/01685_json_extract_double_as_float.reference
+%%DATADIR%%-test/queries/0_stateless/01711_decimal_multiplication.reference
+%%DATADIR%%-test/queries/0_stateless/00875_join_right_nulls_ors.reference
+%%DATADIR%%-test/queries/0_stateless/01493_table_function_null.sql
+%%DATADIR%%-test/queries/0_stateless/02016_order_by_with_fill_monotonic_functions_removal.reference
+%%DATADIR%%-test/queries/0_stateless/00900_orc_arrow_parquet_nested.sh
+%%DATADIR%%-test/queries/0_stateless/01883_subcolumns_distributed.reference
+%%DATADIR%%-test/queries/0_stateless/01098_temporary_and_external_tables.reference
+%%DATADIR%%-test/queries/0_stateless/00997_set_index_array.reference
+%%DATADIR%%-test/queries/0_stateless/01870_buffer_flush.sql
+%%DATADIR%%-test/queries/0_stateless/00534_functions_bad_arguments8.reference
+%%DATADIR%%-test/queries/0_stateless/01011_test_create_as_skip_indices.reference
+%%DATADIR%%-test/queries/0_stateless/00520_http_nullable.reference
+%%DATADIR%%-test/queries/0_stateless/01009_global_array_join_names.reference
+%%DATADIR%%-test/queries/0_stateless/00051_any_inner_join.sql
+%%DATADIR%%-test/queries/0_stateless/00267_tuple_array_access_operators_priority.reference
+%%DATADIR%%-test/queries/0_stateless/00409_shard_limit_by.sql
+%%DATADIR%%-test/queries/0_stateless/01268_mergine_sorted_limit.sql
+%%DATADIR%%-test/queries/0_stateless/01784_parallel_formatting_memory.sql
+%%DATADIR%%-test/queries/0_stateless/00498_bitwise_aggregate_functions.sql
+%%DATADIR%%-test/queries/0_stateless/00991_system_parts_race_condition_long.sh
+%%DATADIR%%-test/queries/0_stateless/01455_rank_correlation_spearman.reference
+%%DATADIR%%-test/queries/0_stateless/01050_engine_join_crash.reference
+%%DATADIR%%-test/queries/0_stateless/00653_running_difference.reference
+%%DATADIR%%-test/queries/0_stateless/01710_projection_in_set.reference
+%%DATADIR%%-test/queries/0_stateless/00712_prewhere_with_alias_bug_2.reference
+%%DATADIR%%-test/queries/0_stateless/00647_histogram.sql
+%%DATADIR%%-test/queries/0_stateless/01058_zlib_ng_level1_bug.sh
+%%DATADIR%%-test/queries/0_stateless/01851_s2_to_geo.sql
+%%DATADIR%%-test/queries/0_stateless/02050_clickhouse_local_parsing_exception.sh
+%%DATADIR%%-test/queries/0_stateless/00098_a_union_all.sql
+%%DATADIR%%-test/queries/0_stateless/01445_create_table_as_table_function.reference
+%%DATADIR%%-test/queries/0_stateless/01019_alter_materialized_view_atomic.reference
+%%DATADIR%%-test/queries/0_stateless/00626_replace_partition_from_table_zookeeper.reference
+%%DATADIR%%-test/queries/0_stateless/00944_clear_index_in_partition.sh
+%%DATADIR%%-test/queries/0_stateless/01753_direct_dictionary_simple_key.sql
+%%DATADIR%%-test/queries/0_stateless/00104_totals_having_mode.sql
+%%DATADIR%%-test/queries/0_stateless/02010_array_index_bad_cast.reference
+%%DATADIR%%-test/queries/0_stateless/00061_merge_tree_alter.sql
+%%DATADIR%%-test/queries/0_stateless/00364_java_style_denormals.reference
+%%DATADIR%%-test/queries/0_stateless/00942_dataparts_500.reference
+%%DATADIR%%-test/queries/0_stateless/00647_histogram.reference
+%%DATADIR%%-test/queries/0_stateless/00999_join_not_nullable_types.reference
+%%DATADIR%%-test/queries/0_stateless/00098_9_union_all.reference
+%%DATADIR%%-test/queries/0_stateless/01079_order_by_pk.sql
+%%DATADIR%%-test/queries/0_stateless/01943_pmj_non_joined_stuck.sql.j2
+%%DATADIR%%-test/queries/0_stateless/01051_system_stack_trace.reference
+%%DATADIR%%-test/queries/0_stateless/00322_disable_checksumming.reference
+%%DATADIR%%-test/queries/0_stateless/00380_client_break_at_exception_in_batch_mode.sh
+%%DATADIR%%-test/queries/0_stateless/01194_http_query_id.sh
+%%DATADIR%%-test/queries/0_stateless/01761_alter_decimal_zookeeper_long.sql
+%%DATADIR%%-test/queries/0_stateless/00537_quarters.reference
+%%DATADIR%%-test/queries/0_stateless/00106_totals_after_having.sql
+%%DATADIR%%-test/queries/0_stateless/01592_window_functions.reference
+%%DATADIR%%-test/queries/0_stateless/00239_type_conversion_in_in.reference
+%%DATADIR%%-test/queries/0_stateless/00459_group_array_insert_at.sql
+%%DATADIR%%-test/queries/0_stateless/00938_ipv6_cidr_range.sql
 %%DATADIR%%-test/queries/0_stateless/01277_large_tuples.sql
-%%DATADIR%%-test/queries/0_stateless/01277_random_fixed_string.reference
-%%DATADIR%%-test/queries/0_stateless/01277_random_fixed_string.sql
-%%DATADIR%%-test/queries/0_stateless/01277_toUnixTimestamp64.reference
-%%DATADIR%%-test/queries/0_stateless/01277_toUnixTimestamp64.sql
-%%DATADIR%%-test/queries/0_stateless/01277_unixTimestamp64_compatibility.reference
-%%DATADIR%%-test/queries/0_stateless/01277_unixTimestamp64_compatibility.sql
-%%DATADIR%%-test/queries/0_stateless/01278_alter_rename_combination.reference
-%%DATADIR%%-test/queries/0_stateless/01278_alter_rename_combination.sql
-%%DATADIR%%-test/queries/0_stateless/01278_format_multiple_queries.reference
-%%DATADIR%%-test/queries/0_stateless/01278_format_multiple_queries.sh
-%%DATADIR%%-test/queries/0_stateless/01278_min_insert_block_size_rows_for_materialized_views.reference
-%%DATADIR%%-test/queries/0_stateless/01278_min_insert_block_size_rows_for_materialized_views.sh
-%%DATADIR%%-test/queries/0_stateless/01278_random_string_utf8.reference
-%%DATADIR%%-test/queries/0_stateless/01278_random_string_utf8.sql
-%%DATADIR%%-test/queries/0_stateless/01278_variance_nonnegative.reference
-%%DATADIR%%-test/queries/0_stateless/01278_variance_nonnegative.sql
-%%DATADIR%%-test/queries/0_stateless/01279_dist_group_by.reference
-%%DATADIR%%-test/queries/0_stateless/01279_dist_group_by.sql
-%%DATADIR%%-test/queries/0_stateless/01279_empty_external_table.reference
-%%DATADIR%%-test/queries/0_stateless/01279_empty_external_table.sh
-%%DATADIR%%-test/queries/0_stateless/01280_min_map_max_map.reference
-%%DATADIR%%-test/queries/0_stateless/01280_min_map_max_map.sql
-%%DATADIR%%-test/queries/0_stateless/01280_null_in.reference
-%%DATADIR%%-test/queries/0_stateless/01280_null_in.sql
-%%DATADIR%%-test/queries/0_stateless/01280_opencl_bitonic_order_by.reference
-%%DATADIR%%-test/queries/0_stateless/01280_opencl_bitonic_order_by.sql
-%%DATADIR%%-test/queries/0_stateless/01280_ssd_complex_key_dictionary.reference
-%%DATADIR%%-test/queries/0_stateless/01280_ssd_complex_key_dictionary.sh
-%%DATADIR%%-test/queries/0_stateless/01280_ttl_where_group_by.reference
-%%DATADIR%%-test/queries/0_stateless/01280_ttl_where_group_by.sh
-%%DATADIR%%-test/queries/0_stateless/01280_ttl_where_group_by_negative.reference
-%%DATADIR%%-test/queries/0_stateless/01280_ttl_where_group_by_negative.sql
-%%DATADIR%%-test/queries/0_stateless/01280_unicode_whitespaces_lexer.reference
-%%DATADIR%%-test/queries/0_stateless/01280_unicode_whitespaces_lexer.sql
-%%DATADIR%%-test/queries/0_stateless/01281_alter_rename_and_other_renames.reference
-%%DATADIR%%-test/queries/0_stateless/01281_alter_rename_and_other_renames.sql
-%%DATADIR%%-test/queries/0_stateless/01281_group_by_limit_memory_tracking.reference
-%%DATADIR%%-test/queries/0_stateless/01281_group_by_limit_memory_tracking.sh
-%%DATADIR%%-test/queries/0_stateless/01281_join_with_prewhere_fix.reference
-%%DATADIR%%-test/queries/0_stateless/01281_join_with_prewhere_fix.sql
-%%DATADIR%%-test/queries/0_stateless/01281_parseDateTime64BestEffort.reference
-%%DATADIR%%-test/queries/0_stateless/01281_parseDateTime64BestEffort.sql
-%%DATADIR%%-test/queries/0_stateless/01281_sum_nullable.reference
-%%DATADIR%%-test/queries/0_stateless/01281_sum_nullable.sql
-%%DATADIR%%-test/queries/0_stateless/01281_unsucceeded_insert_select_queries_counter.reference
-%%DATADIR%%-test/queries/0_stateless/01281_unsucceeded_insert_select_queries_counter.sql
-%%DATADIR%%-test/queries/0_stateless/01282_system_parts_ttl_info.reference
+%%DATADIR%%-test/queries/0_stateless/00041_big_array_join.sql
+%%DATADIR%%-test/queries/0_stateless/01902_self_aliases_in_columns.sql
+%%DATADIR%%-test/queries/0_stateless/01380_coded_delta_exception_code.reference
+%%DATADIR%%-test/queries/0_stateless/00807_regexp_quote_meta.sql
+%%DATADIR%%-test/queries/0_stateless/01532_having_with_totals.reference
+%%DATADIR%%-test/queries/0_stateless/02009_body_query_params.reference
+%%DATADIR%%-test/queries/0_stateless/00347_has_tuple.sql
+%%DATADIR%%-test/queries/0_stateless/00056_join_number_string.sql
+%%DATADIR%%-test/queries/0_stateless/01269_toStartOfSecond.reference
+%%DATADIR%%-test/queries/0_stateless/00092_union_race_conditions_3.sh
+%%DATADIR%%-test/queries/0_stateless/01904_ssd_cache_dictionary_default_nullable_type.sh
+%%DATADIR%%-test/queries/0_stateless/01271_http_code_parse_error.sh
+%%DATADIR%%-test/queries/0_stateless/01277_convert_field_to_type_logical_error.sql
+%%DATADIR%%-test/queries/0_stateless/01102_distributed_local_in_bug.sql
+%%DATADIR%%-test/queries/0_stateless/00840_long_concurrent_select_and_drop_deadlock.sh
+%%DATADIR%%-test/queries/0_stateless/01352_generate_random_overflow.sql
+%%DATADIR%%-test/queries/0_stateless/01451_detach_drop_part.reference
+%%DATADIR%%-test/queries/0_stateless/01931_storage_merge_no_columns.reference
+%%DATADIR%%-test/queries/0_stateless/01692_DateTime64_from_DateTime.sql
+%%DATADIR%%-test/queries/0_stateless/00825_protobuf_format_enum_mapping.yaodzJ.binary
+%%DATADIR%%-test/queries/0_stateless/00689_join_table_function.reference
+%%DATADIR%%-test/queries/0_stateless/01508_query_obfuscator.sh
+%%DATADIR%%-test/queries/0_stateless/00905_compile_expressions_compare_big_dates.sql
+%%DATADIR%%-test/queries/0_stateless/01041_create_dictionary_if_not_exists.reference
+%%DATADIR%%-test/queries/0_stateless/00252_shard_global_in_aggregate_function.sql
+%%DATADIR%%-test/queries/0_stateless/01000_bad_size_of_marks_skip_idx.sql
+%%DATADIR%%-test/queries/0_stateless/01682_cache_dictionary_complex_key.sql
+%%DATADIR%%-test/queries/0_stateless/00638_remote_ssrf.sh.disabled
+%%DATADIR%%-test/queries/0_stateless/00666_uniq_complex_types.sql
+%%DATADIR%%-test/queries/0_stateless/00847_multiple_join_same_column.reference
+%%DATADIR%%-test/queries/0_stateless/01319_optimize_skip_unused_shards_nesting.sql
+%%DATADIR%%-test/queries/0_stateless/01016_null_part_minmax.reference
+%%DATADIR%%-test/queries/0_stateless/00682_empty_parts_merge.sh
+%%DATADIR%%-test/queries/0_stateless/01353_low_cardinality_join_types.reference
+%%DATADIR%%-test/queries/0_stateless/01891_not_in_partition_prune.sql
+%%DATADIR%%-test/queries/0_stateless/00308_write_buffer_valid_utf8.reference
+%%DATADIR%%-test/queries/0_stateless/01400_join_get_with_multi_keys.sql
+%%DATADIR%%-test/queries/0_stateless/00503_cast_const_nullable.sql
+%%DATADIR%%-test/queries/0_stateless/00136_duplicate_order_by_elems.sql
+%%DATADIR%%-test/queries/0_stateless/01444_create_table_drop_database_race.sh
+%%DATADIR%%-test/queries/0_stateless/00697_in_subquery_shard.reference
+%%DATADIR%%-test/queries/0_stateless/01498_alter_column_storage_memory.sql
+%%DATADIR%%-test/queries/0_stateless/02124_encrypt_decrypt_nullable.reference
+%%DATADIR%%-test/queries/0_stateless/00549_join_use_nulls.sql
+%%DATADIR%%-test/queries/0_stateless/00700_decimal_array_functions.sql
+%%DATADIR%%-test/queries/0_stateless/01913_names_of_tuple_literal.reference
+%%DATADIR%%-test/queries/0_stateless/00297_attach_negative_numbers_zookeeper.reference
+%%DATADIR%%-test/queries/0_stateless/00123_shard_unmerged_result_when_max_distributed_connections_is_one.sql
+%%DATADIR%%-test/queries/0_stateless/00464_array_element_out_of_range.reference
+%%DATADIR%%-test/queries/0_stateless/02000_map_full_text_bloom_filter_index.sql
+%%DATADIR%%-test/queries/0_stateless/00700_decimal_null.reference
+%%DATADIR%%-test/queries/0_stateless/01869_reinterpret_as_fixed_string_uuid.reference
+%%DATADIR%%-test/queries/0_stateless/01511_alter_version_versioned_collapsing_merge_tree_zookeeper.reference
+%%DATADIR%%-test/queries/0_stateless/00937_ipv4_cidr_range.reference
+%%DATADIR%%-test/queries/0_stateless/01537_fuzz_count_equal.reference
+%%DATADIR%%-test/queries/0_stateless/01270_optimize_skip_unused_shards_low_cardinality.reference
+%%DATADIR%%-test/queries/0_stateless/01085_regexp_input_format.sh
+%%DATADIR%%-test/queries/0_stateless/00010_big_array_join.sql
+%%DATADIR%%-test/queries/0_stateless/00935_to_iso_week_first_year.reference
+%%DATADIR%%-test/queries/0_stateless/01051_window_view_parser_hop.reference
+%%DATADIR%%-test/queries/0_stateless/01552_alter_name_collision.sql
+%%DATADIR%%-test/queries/0_stateless/01097_one_more_range_reader_test.sql
+%%DATADIR%%-test/queries/0_stateless/01030_storage_hdfs_syntax.reference
+%%DATADIR%%-test/queries/0_stateless/01682_cache_dictionary_complex_key.reference
+%%DATADIR%%-test/queries/0_stateless/01837_database_memory_ddl_dictionaries.reference
+%%DATADIR%%-test/queries/0_stateless/01494_storage_join_persistency.reference
+%%DATADIR%%-test/queries/0_stateless/01745_alter_delete_view.reference
+%%DATADIR%%-test/queries/0_stateless/01396_low_cardinality_fixed_string_default.sql
+%%DATADIR%%-test/queries/0_stateless/01526_client_start_and_exit.sh
+%%DATADIR%%-test/queries/0_stateless/01615_two_args_function_index_fix.sql
+%%DATADIR%%-test/queries/0_stateless/01951_distributed_push_down_limit.sql
+%%DATADIR%%-test/queries/0_stateless/01655_sleep_infinite_float.reference
+%%DATADIR%%-test/queries/0_stateless/02128_wait_end_of_query_fix.reference
+%%DATADIR%%-test/queries/0_stateless/01130_in_memory_parts_nested.sql
+%%DATADIR%%-test/queries/0_stateless/00522_multidimensional.sql
+%%DATADIR%%-test/queries/0_stateless/00032_fixed_string_to_string.sql
+%%DATADIR%%-test/queries/0_stateless/01046_trivial_count_query_distributed.reference
+%%DATADIR%%-test/queries/0_stateless/02149_issue_32487.reference
+%%DATADIR%%-test/queries/0_stateless/00980_create_temporary_live_view.reference
+%%DATADIR%%-test/queries/0_stateless/01001_rename_merge_race_condition.reference
+%%DATADIR%%-test/queries/0_stateless/01013_repeat_function.reference
+%%DATADIR%%-test/queries/0_stateless/01914_index_bgranvea.reference
+%%DATADIR%%-test/queries/0_stateless/01017_in_unconvertible_complex_type.sql
+%%DATADIR%%-test/queries/0_stateless/00059_shard_global_in.reference
+%%DATADIR%%-test/queries/0_stateless/01714_alter_drop_version.reference
+%%DATADIR%%-test/queries/0_stateless/00701_context_use_after_free.sql
+%%DATADIR%%-test/queries/0_stateless/00568_empty_function_with_fixed_string.reference
 %%DATADIR%%-test/queries/0_stateless/01282_system_parts_ttl_info.sql
-%%DATADIR%%-test/queries/0_stateless/01283_max_threads_simple_query_optimization.reference
-%%DATADIR%%-test/queries/0_stateless/01283_max_threads_simple_query_optimization.sql
-%%DATADIR%%-test/queries/0_stateless/01283_strict_resize_bug.reference
-%%DATADIR%%-test/queries/0_stateless/01283_strict_resize_bug.sql
-%%DATADIR%%-test/queries/0_stateless/01284_escape_sequences_php_mysql_style.reference
-%%DATADIR%%-test/queries/0_stateless/01284_escape_sequences_php_mysql_style.sql
-%%DATADIR%%-test/queries/0_stateless/01284_fuzz_bits.reference
-%%DATADIR%%-test/queries/0_stateless/01284_fuzz_bits.sql
-%%DATADIR%%-test/queries/0_stateless/01284_port.reference
-%%DATADIR%%-test/queries/0_stateless/01284_port.sql
-%%DATADIR%%-test/queries/0_stateless/01284_view_and_extremes_bug.reference
-%%DATADIR%%-test/queries/0_stateless/01284_view_and_extremes_bug.sql
-%%DATADIR%%-test/queries/0_stateless/01285_data_skip_index_over_aggregation.reference
-%%DATADIR%%-test/queries/0_stateless/01285_data_skip_index_over_aggregation.sql
-%%DATADIR%%-test/queries/0_stateless/01285_date_datetime_key_condition.reference
-%%DATADIR%%-test/queries/0_stateless/01285_date_datetime_key_condition.sql
-%%DATADIR%%-test/queries/0_stateless/01285_engine_join_donmikel.reference
-%%DATADIR%%-test/queries/0_stateless/01285_engine_join_donmikel.sh
+%%DATADIR%%-test/queries/0_stateless/01034_JSONCompactEachRow.sql
+%%DATADIR%%-test/queries/0_stateless/01018_ddl_dictionaries_special.sql
+%%DATADIR%%-test/queries/0_stateless/00815_left_join_on_stepanel.reference
+%%DATADIR%%-test/queries/0_stateless/01086_odbc_roundtrip.reference
+%%DATADIR%%-test/queries/0_stateless/01031_mutations_interpreter_and_context.sh
+%%DATADIR%%-test/queries/0_stateless/00571_alter_nullable.reference
+%%DATADIR%%-test/queries/0_stateless/02112_delayed_clickhouse_client_with_queries_file.expect
+%%DATADIR%%-test/queries/0_stateless/01300_svg.sql
+%%DATADIR%%-test/queries/0_stateless/01140_select_from_storage_join_fix.reference
+%%DATADIR%%-test/queries/0_stateless/01666_lcm_ubsan.reference
+%%DATADIR%%-test/queries/0_stateless/00825_protobuf_format_enum_mapping.sh
+%%DATADIR%%-test/queries/0_stateless/02050_client_profile_events.sh
+%%DATADIR%%-test/queries/0_stateless/00500_point_in_polygon_bug.reference
+%%DATADIR%%-test/queries/0_stateless/00621_regression_for_in_operator.sql
+%%DATADIR%%-test/queries/0_stateless/01671_test_toQuarter_mysql_dialect.sql
+%%DATADIR%%-test/queries/0_stateless/00907_set_index_with_nullable_and_low_cardinality_bug.reference
+%%DATADIR%%-test/queries/0_stateless/00142_parse_timestamp_as_datetime.sql
+%%DATADIR%%-test/queries/0_stateless/01583_const_column_in_set_index.sql
+%%DATADIR%%-test/queries/0_stateless/01213_alter_rename_column_zookeeper_long.sh
+%%DATADIR%%-test/queries/0_stateless/01532_primary_key_without_order_by_zookeeper.sql
+%%DATADIR%%-test/queries/0_stateless/00499_json_enum_insert.reference
+%%DATADIR%%-test/queries/0_stateless/01109_exchange_tables.sql
+%%DATADIR%%-test/queries/0_stateless/01091_insert_with_default_json.reference
+%%DATADIR%%-test/queries/0_stateless/02024_storage_filelog_mv.reference
+%%DATADIR%%-test/queries/0_stateless/00100_subquery_table_identifier.sh
+%%DATADIR%%-test/queries/0_stateless/01914_ubsan_quantile_timing.sql
+%%DATADIR%%-test/queries/0_stateless/01635_sum_map_fuzz.reference
+%%DATADIR%%-test/queries/0_stateless/00432_aggregate_function_scalars_and_constants.sql
+%%DATADIR%%-test/queries/0_stateless/00069_date_arithmetic.reference
+%%DATADIR%%-test/queries/0_stateless/00340_squashing_insert_select.reference
+%%DATADIR%%-test/queries/0_stateless/00746_compile_non_deterministic_function.sql
+%%DATADIR%%-test/queries/0_stateless/00225_join_duplicate_columns.sql
+%%DATADIR%%-test/queries/0_stateless/00717_default_join_type.sql
+%%DATADIR%%-test/queries/0_stateless/01660_join_or_any.sql
+%%DATADIR%%-test/queries/0_stateless/00353_join_by_tuple.reference
+%%DATADIR%%-test/queries/0_stateless/01107_atomic_db_detach_attach.sh
+%%DATADIR%%-test/queries/0_stateless/00909_ngram_distance.reference
+%%DATADIR%%-test/queries/0_stateless/01890_jit_aggregation_function_sum_long.sql
+%%DATADIR%%-test/queries/0_stateless/01870_modulo_partition_key.sql
+%%DATADIR%%-test/queries/0_stateless/00694_max_block_size_zero.sql
+%%DATADIR%%-test/queries/0_stateless/00977_int_div.reference
+%%DATADIR%%-test/queries/0_stateless/00068_empty_tiny_log.reference
+%%DATADIR%%-test/queries/0_stateless/01662_date_ubsan.sql
+%%DATADIR%%-test/queries/0_stateless/01927_query_views_log_current_database.reference
+%%DATADIR%%-test/queries/0_stateless/02001_compress_output_file.reference
+%%DATADIR%%-test/queries/0_stateless/01521_distributed_query_hang.reference
+%%DATADIR%%-test/queries/0_stateless/01104_distributed_one_test.sql
+%%DATADIR%%-test/queries/0_stateless/01121_remote_scalar_subquery.reference
+%%DATADIR%%-test/queries/0_stateless/00725_join_on_bug_4.reference
+%%DATADIR%%-test/queries/0_stateless/01144_multiple_joins_rewriter_v2_and_lambdas.reference
+%%DATADIR%%-test/queries/0_stateless/01493_table_function_null.reference
+%%DATADIR%%-test/queries/0_stateless/00952_input_function.sh
+%%DATADIR%%-test/queries/0_stateless/02155_nested_lc_defalut_bug.reference
+%%DATADIR%%-test/queries/0_stateless/00969_columns_clause.reference
+%%DATADIR%%-test/queries/0_stateless/00973_create_table_as_table_function.reference
+%%DATADIR%%-test/queries/0_stateless/00949_format.sql
+%%DATADIR%%-test/queries/0_stateless/01852_multiple_joins_with_union_join.reference
+%%DATADIR%%-test/queries/0_stateless/01421_assert_in_in.sql
+%%DATADIR%%-test/queries/0_stateless/01123_parse_date_time_best_effort_even_more.reference
+%%DATADIR%%-test/queries/0_stateless/00904_array_with_constant_2.reference
+%%DATADIR%%-test/queries/0_stateless/00743_limit_by_not_found_column.sql
+%%DATADIR%%-test/queries/0_stateless/01072_nullable_jit.reference
+%%DATADIR%%-test/queries/0_stateless/01656_join_defaul_enum.reference
+%%DATADIR%%-test/queries/0_stateless/01832_memory_write_suffix.reference
+%%DATADIR%%-test/queries/0_stateless/01429_empty_arrow_and_parquet.sh
+%%DATADIR%%-test/queries/0_stateless/00821_distributed_storage_with_join_on.reference
+%%DATADIR%%-test/queries/0_stateless/01784_parallel_formatting_memory.reference
+%%DATADIR%%-test/queries/0_stateless/00824_filesystem.sql
+%%DATADIR%%-test/queries/0_stateless/01416_join_totals_header_bug.reference
+%%DATADIR%%-test/queries/0_stateless/01485_256_bit_multiply.reference
+%%DATADIR%%-test/queries/0_stateless/00286_format_long_negative_float.sql
+%%DATADIR%%-test/queries/0_stateless/02165_insert_from_infile.reference
+%%DATADIR%%-test/queries/0_stateless/00927_asof_join_other_types.reference
+%%DATADIR%%-test/queries/0_stateless/01659_test_base64Decode_mysql_compatibility.reference
+%%DATADIR%%-test/queries/0_stateless/01323_add_scalars_in_time.reference
+%%DATADIR%%-test/queries/0_stateless/00481_create_view_for_null.reference
+%%DATADIR%%-test/queries/0_stateless/00202_cross_join.reference
+%%DATADIR%%-test/queries/0_stateless/00665_alter_nullable_string_to_nullable_uint8.reference
+%%DATADIR%%-test/queries/0_stateless/02009_array_join_partition.reference
+%%DATADIR%%-test/queries/0_stateless/00875_join_right_nulls_ors.sql
+%%DATADIR%%-test/queries/0_stateless/00944_ml_test.sql
+%%DATADIR%%-test/queries/0_stateless/01639_distributed_sync_insert_zero_rows.reference
+%%DATADIR%%-test/queries/0_stateless/01010_pmj_one_row_blocks.reference
+%%DATADIR%%-test/queries/0_stateless/00854_multiple_join_asterisks.reference
+%%DATADIR%%-test/queries/0_stateless/00575_illegal_column_exception_when_drop_depen_column.reference
+%%DATADIR%%-test/queries/0_stateless/00619_extract.reference
+%%DATADIR%%-test/queries/0_stateless/01651_group_uniq_array_enum.reference
+%%DATADIR%%-test/queries/0_stateless/00259_hashing_tuples.reference
+%%DATADIR%%-test/queries/0_stateless/01440_to_date_monotonicity.sql
+%%DATADIR%%-test/queries/0_stateless/01634_sum_map_nulls.sql
+%%DATADIR%%-test/queries/0_stateless/00308_write_buffer_valid_utf8.sql
+%%DATADIR%%-test/queries/0_stateless/00517_date_parsing.sql
+%%DATADIR%%-test/queries/0_stateless/01020_function_array_compact.reference
+%%DATADIR%%-test/queries/0_stateless/02117_show_create_table_system.reference
+%%DATADIR%%-test/queries/0_stateless/00907_set_index_with_nullable_and_low_cardinality.sql
+%%DATADIR%%-test/queries/0_stateless/02025_dictionary_array_nested_map.sql
+%%DATADIR%%-test/queries/0_stateless/01103_optimize_drop_race_zookeeper.sh
+%%DATADIR%%-test/queries/0_stateless/00534_functions_bad_arguments6.sh
+%%DATADIR%%-test/queries/0_stateless/01003_kill_query_race_condition.reference
+%%DATADIR%%-test/queries/0_stateless/00014_select_from_table_with_nested.reference
+%%DATADIR%%-test/queries/0_stateless/01019_array_fill.reference
+%%DATADIR%%-test/queries/0_stateless/00606_quantiles_and_nans.sql
+%%DATADIR%%-test/queries/0_stateless/00800_low_cardinality_array_group_by_arg.reference
+%%DATADIR%%-test/queries/0_stateless/00530_arrays_of_nothing.sql
+%%DATADIR%%-test/queries/0_stateless/01295_aggregation_bug_11413.sql
+%%DATADIR%%-test/queries/0_stateless/00230_array_functions_has_count_equal_index_of_non_const_second_arg.reference
+%%DATADIR%%-test/queries/0_stateless/01492_array_join_crash_13829.sql
+%%DATADIR%%-test/queries/0_stateless/00950_test_gorilla_codec.reference
+%%DATADIR%%-test/queries/0_stateless/01413_allow_non_metadata_alters.reference
+%%DATADIR%%-test/queries/0_stateless/00351_select_distinct_arrays_tuples.sql
+%%DATADIR%%-test/queries/0_stateless/01583_parallel_parsing_exception_with_offset.sh
+%%DATADIR%%-test/queries/0_stateless/01747_join_view_filter_dictionary.sql
+%%DATADIR%%-test/queries/0_stateless/00346_if_tuple.reference
+%%DATADIR%%-test/queries/0_stateless/02133_issue_32458.reference
+%%DATADIR%%-test/queries/0_stateless/01224_no_superfluous_dict_reload.sql
+%%DATADIR%%-test/queries/0_stateless/01507_multiversion_storage_for_storagememory.sql
+%%DATADIR%%-test/queries/0_stateless/00219_full_right_join_column_order.reference
+%%DATADIR%%-test/queries/0_stateless/02006_client_test_hint_no_such_error_name.sh
+%%DATADIR%%-test/queries/0_stateless/00649_quantile_tdigest_negative.reference
 %%DATADIR%%-test/queries/0_stateless/01285_engine_join_donmikel.tsv
+%%DATADIR%%-test/queries/0_stateless/01706_optimize_normalize_count_variants.sql
+%%DATADIR%%-test/queries/0_stateless/01281_join_with_prewhere_fix.reference
+%%DATADIR%%-test/queries/0_stateless/00027_simple_argMinArray.sql
+%%DATADIR%%-test/queries/0_stateless/00926_adaptive_index_granularity_pk.sql
+%%DATADIR%%-test/queries/0_stateless/01104_fixed_string_like.reference
+%%DATADIR%%-test/queries/0_stateless/01650_expressions_merge_bug.reference
+%%DATADIR%%-test/queries/0_stateless/01621_decode_XML.reference
+%%DATADIR%%-test/queries/0_stateless/00933_test_fix_extra_seek_on_compressed_cache.reference
+%%DATADIR%%-test/queries/0_stateless/01914_exchange_dictionaries.reference
+%%DATADIR%%-test/queries/0_stateless/00325_replacing_merge_tree.reference
+%%DATADIR%%-test/queries/0_stateless/02016_bit_shift_right_for_string_integer.reference
+%%DATADIR%%-test/queries/0_stateless/00983_summing_merge_tree_not_an_identifier.sql
+%%DATADIR%%-test/queries/0_stateless/00804_test_delta_codec_no_type_alter.reference
+%%DATADIR%%-test/queries/0_stateless/01760_polygon_dictionaries.reference
+%%DATADIR%%-test/queries/0_stateless/00974_live_view_select_with_aggregation.reference
+%%DATADIR%%-test/queries/0_stateless/00546_shard_tuple_element_formatting.sql
+%%DATADIR%%-test/queries/0_stateless/00098_5_union_all.sql
+%%DATADIR%%-test/queries/0_stateless/00026_shard_something_distributed.sql
+%%DATADIR%%-test/queries/0_stateless/00926_zookeeper_adaptive_index_granularity_replicated_merge_tree_long.reference
+%%DATADIR%%-test/queries/0_stateless/00910_crash_when_distributed_modify_order_by.reference
+%%DATADIR%%-test/queries/0_stateless/01562_agg_null_for_empty_ahead.sql
+%%DATADIR%%-test/queries/0_stateless/00512_fractional_time_zones.sh
+%%DATADIR%%-test/queries/0_stateless/01783_merge_engine_join_key_condition.reference
+%%DATADIR%%-test/queries/0_stateless/00002_system_numbers.sql
+%%DATADIR%%-test/queries/0_stateless/01247_some_msan_crashs_from_22517.sql
+%%DATADIR%%-test/queries/0_stateless/01666_merge_tree_max_query_limit.sh
+%%DATADIR%%-test/queries/0_stateless/00978_sum_map_bugfix.reference
+%%DATADIR%%-test/queries/0_stateless/01767_timezoneOf.sh
+%%DATADIR%%-test/queries/0_stateless/01673_test_toMinute_mysql_dialect.sql
+%%DATADIR%%-test/queries/0_stateless/00974_full_outer_join.sql
+%%DATADIR%%-test/queries/0_stateless/02047_log_family_complex_structs_data_file_dumps.reference
+%%DATADIR%%-test/queries/0_stateless/02114_bool_type.sql
+%%DATADIR%%-test/queries/0_stateless/01632_nullable_string_type_convert_to_decimal_type.sql
+%%DATADIR%%-test/queries/0_stateless/00919_sum_aggregate_states_constants.sql
+%%DATADIR%%-test/queries/0_stateless/00542_materialized_view_and_time_zone_tag.reference
+%%DATADIR%%-test/queries/0_stateless/00145_empty_likes.reference
+%%DATADIR%%-test/queries/0_stateless/02131_multiply_row_policies_on_same_column.reference
+%%DATADIR%%-test/queries/0_stateless/02007_join_use_nulls.reference
+%%DATADIR%%-test/queries/0_stateless/00352_external_sorting_and_constants.sql
+%%DATADIR%%-test/queries/0_stateless/00483_reading_from_array_structure.reference
+%%DATADIR%%-test/queries/0_stateless/02122_parallel_formatting.sh
+%%DATADIR%%-test/queries/0_stateless/01195_formats_diagnostic_info.reference
+%%DATADIR%%-test/queries/0_stateless/01355_alter_column_with_order.sql
+%%DATADIR%%-test/queries/0_stateless/01015_array_split.sql
+%%DATADIR%%-test/queries/0_stateless/00882_multiple_join_no_alias.sql
+%%DATADIR%%-test/queries/0_stateless/01622_codec_zstd_long.reference
+%%DATADIR%%-test/queries/0_stateless/02000_table_function_cluster_macros.reference
+%%DATADIR%%-test/queries/0_stateless/02002_global_subqueries_subquery_or_table_name.reference
+%%DATADIR%%-test/queries/0_stateless/01763_filter_push_down_bugs.sql
+%%DATADIR%%-test/queries/0_stateless/01047_nullable_rand.sql
+%%DATADIR%%-test/queries/0_stateless/00700_decimal_math.sql
+%%DATADIR%%-test/queries/0_stateless/00930_arrayIntersect.reference
+%%DATADIR%%-test/queries/0_stateless/01889_key_condition_function_chains.sql
+%%DATADIR%%-test/queries/0_stateless/00235_create_temporary_table_as.sql
+%%DATADIR%%-test/queries/0_stateless/00263_merge_aggregates_and_overflow.sql
+%%DATADIR%%-test/queries/0_stateless/01414_push_predicate_when_contains_with_clause.reference
+%%DATADIR%%-test/queries/0_stateless/02125_many_mutations.reference
+%%DATADIR%%-test/queries/0_stateless/01517_drop_mv_with_inner_table.reference
+%%DATADIR%%-test/queries/0_stateless/00211_shard_query_formatting_aliases.sql
+%%DATADIR%%-test/queries/0_stateless/01277_unixTimestamp64_compatibility.sql
+%%DATADIR%%-test/queries/0_stateless/00626_replace_partition_from_table.reference
+%%DATADIR%%-test/queries/0_stateless/02152_http_external_tables_memory_tracking.reference
+%%DATADIR%%-test/queries/0_stateless/01277_alter_rename_column_constraint.reference
+%%DATADIR%%-test/queries/0_stateless/01535_decimal_round_scale_overflow_check.reference
 %%DATADIR%%-test/queries/0_stateless/01286_constraints_on_default.reference
-%%DATADIR%%-test/queries/0_stateless/01286_constraints_on_default.sql
-%%DATADIR%%-test/queries/0_stateless/01287_max_execution_speed.reference
-%%DATADIR%%-test/queries/0_stateless/01287_max_execution_speed.sql
-%%DATADIR%%-test/queries/0_stateless/01288_shard_max_network_bandwidth.reference
-%%DATADIR%%-test/queries/0_stateless/01288_shard_max_network_bandwidth.sql
-%%DATADIR%%-test/queries/0_stateless/01289_min_execution_speed_not_too_early.reference
-%%DATADIR%%-test/queries/0_stateless/01289_min_execution_speed_not_too_early.sql
-%%DATADIR%%-test/queries/0_stateless/01290_empty_array_index_analysis.reference
-%%DATADIR%%-test/queries/0_stateless/01290_empty_array_index_analysis.sql
-%%DATADIR%%-test/queries/0_stateless/01290_max_execution_speed_distributed.reference
-%%DATADIR%%-test/queries/0_stateless/01290_max_execution_speed_distributed.sql
-%%DATADIR%%-test/queries/0_stateless/01291_aggregation_in_order.reference
-%%DATADIR%%-test/queries/0_stateless/01291_aggregation_in_order.sql
-%%DATADIR%%-test/queries/0_stateless/01291_distributed_low_cardinality_memory_efficient.reference
-%%DATADIR%%-test/queries/0_stateless/01291_distributed_low_cardinality_memory_efficient.sql
-%%DATADIR%%-test/queries/0_stateless/01291_geo_types.reference
-%%DATADIR%%-test/queries/0_stateless/01291_geo_types.sql
-%%DATADIR%%-test/queries/0_stateless/01291_unsupported_conversion_from_decimal.reference
-%%DATADIR%%-test/queries/0_stateless/01291_unsupported_conversion_from_decimal.sql
-%%DATADIR%%-test/queries/0_stateless/01292_create_user.reference
-%%DATADIR%%-test/queries/0_stateless/01292_create_user.sql
-%%DATADIR%%-test/queries/0_stateless/01292_optimize_data_skip_idx_order_by_expr.reference
-%%DATADIR%%-test/queries/0_stateless/01292_optimize_data_skip_idx_order_by_expr.sql
-%%DATADIR%%-test/queries/0_stateless/01292_quantile_array_bug.reference
-%%DATADIR%%-test/queries/0_stateless/01292_quantile_array_bug.sql
-%%DATADIR%%-test/queries/0_stateless/01293_client_interactive_vertical_multiline_long.expect
-%%DATADIR%%-test/queries/0_stateless/01293_client_interactive_vertical_multiline_long.reference
-%%DATADIR%%-test/queries/0_stateless/01293_client_interactive_vertical_singleline.expect
-%%DATADIR%%-test/queries/0_stateless/01293_client_interactive_vertical_singleline.reference
-%%DATADIR%%-test/queries/0_stateless/01293_create_role.reference
-%%DATADIR%%-test/queries/0_stateless/01293_create_role.sql
-%%DATADIR%%-test/queries/0_stateless/01293_external_sorting_limit_bug.reference
-%%DATADIR%%-test/queries/0_stateless/01293_external_sorting_limit_bug.sql
+%%DATADIR%%-test/queries/0_stateless/00995_optimize_read_in_order_with_aggregation.reference
+%%DATADIR%%-test/queries/0_stateless/01124_view_bad_types.sql
+%%DATADIR%%-test/queries/0_stateless/01245_distributed_group_by_no_merge_with-extremes_and_totals.sql
+%%DATADIR%%-test/queries/0_stateless/01396_negative_datetime_saturate_to_zero.reference
+%%DATADIR%%-test/queries/0_stateless/01948_dictionary_quoted_database_name.sql
+%%DATADIR%%-test/queries/0_stateless/01603_decimal_mult_float.sql
+%%DATADIR%%-test/queries/0_stateless/00402_nan_and_extremes.reference
+%%DATADIR%%-test/queries/0_stateless/00779_all_right_join_max_block_size.reference
+%%DATADIR%%-test/queries/0_stateless/01659_test_base64Decode_mysql_compatibility.sql
+%%DATADIR%%-test/queries/0_stateless/01267_alter_default_key_columns_zookeeper_long.reference
+%%DATADIR%%-test/queries/0_stateless/02132_client_history_navigation.expect
+%%DATADIR%%-test/queries/0_stateless/00582_not_aliasing_functions.sql
+%%DATADIR%%-test/queries/0_stateless/02011_http_parsing.sh
+%%DATADIR%%-test/queries/0_stateless/00202_cross_join.sql
+%%DATADIR%%-test/queries/0_stateless/01107_tuples_arrays_parsing_exceptions.reference
+%%DATADIR%%-test/queries/0_stateless/01431_utf8_ubsan.sql
+%%DATADIR%%-test/queries/0_stateless/00979_toFloat_monotonicity.sql
+%%DATADIR%%-test/queries/0_stateless/02012_sha512_fixedstring.reference
+%%DATADIR%%-test/queries/0_stateless/00700_to_decimal_or_something.reference
+%%DATADIR%%-test/queries/0_stateless/02010_lc_native.python
+%%DATADIR%%-test/queries/0_stateless/00753_quantile_format.reference
+%%DATADIR%%-test/queries/0_stateless/00557_array_resize.sql
+%%DATADIR%%-test/queries/0_stateless/01225_show_create_table_from_dictionary.sql
+%%DATADIR%%-test/queries/0_stateless/00973_live_view_with_subquery_select_table_alias.sql
+%%DATADIR%%-test/queries/0_stateless/01523_date_time_compare_with_date_literal.sql
+%%DATADIR%%-test/queries/0_stateless/01037_polygon_dicts_correctness_all.sh
+%%DATADIR%%-test/queries/0_stateless/01821_to_date_time_ubsan.reference
+%%DATADIR%%-test/queries/0_stateless/01106_const_fixed_string_like.reference
+%%DATADIR%%-test/queries/0_stateless/00646_weird_mmx.sql
+%%DATADIR%%-test/queries/0_stateless/00426_nulls_sorting.sql
+%%DATADIR%%-test/queries/0_stateless/01948_group_bitmap_and_or_xor_fix.sql
+%%DATADIR%%-test/queries/0_stateless/02132_empty_mutation_livelock.sql
+%%DATADIR%%-test/queries/0_stateless/00703_join_crash.reference
+%%DATADIR%%-test/queries/0_stateless/01246_finalize_aggregation_race.sql
+%%DATADIR%%-test/queries/0_stateless/01079_parallel_alter_add_drop_column_zookeeper.sh
+%%DATADIR%%-test/queries/0_stateless/00931_low_cardinality_read_with_empty_array.sql
+%%DATADIR%%-test/queries/0_stateless/01088_benchmark_query_id.sh
+%%DATADIR%%-test/queries/0_stateless/00697_in_subquery_shard.sql
+%%DATADIR%%-test/queries/0_stateless/01476_right_full_join_switch.reference
+%%DATADIR%%-test/queries/0_stateless/01099_operators_date_and_timestamp.sql
+%%DATADIR%%-test/queries/0_stateless/01070_h3_to_string.reference
+%%DATADIR%%-test/queries/0_stateless/01197_summing_enum.sql
+%%DATADIR%%-test/queries/0_stateless/00670_truncate_temporary_table.reference
+%%DATADIR%%-test/queries/0_stateless/00625_summing_merge_tree_merge.reference
+%%DATADIR%%-test/queries/0_stateless/01419_merge_tree_settings_sanity_check.reference
+%%DATADIR%%-test/queries/0_stateless/01162_strange_mutations.sh
+%%DATADIR%%-test/queries/0_stateless/01774_case_sensitive_connection_id.sql
+%%DATADIR%%-test/queries/0_stateless/00181_aggregate_functions_statistics.reference
+%%DATADIR%%-test/queries/0_stateless/02049_lowcardinality_shortcircuit_crash.reference
+%%DATADIR%%-test/queries/0_stateless/00054_join_string.reference
+%%DATADIR%%-test/queries/0_stateless/01605_drop_settings_profile_while_assigned.reference
+%%DATADIR%%-test/queries/0_stateless/01086_regexp_input_format_skip_unmatched.sh
+%%DATADIR%%-test/queries/0_stateless/02007_test_any_all_operators.reference
+%%DATADIR%%-test/queries/0_stateless/01600_min_max_compress_block_size.sql
+%%DATADIR%%-test/queries/0_stateless/02040_clickhouse_benchmark_query_id_pass_through.reference
+%%DATADIR%%-test/queries/0_stateless/01770_extended_range_3.reference
+%%DATADIR%%-test/queries/0_stateless/01092_memory_profiler.sql
+%%DATADIR%%-test/queries/0_stateless/01251_string_comparison.reference
+%%DATADIR%%-test/queries/0_stateless/02126_lc_window_functions.sql
+%%DATADIR%%-test/queries/0_stateless/00013_create_table_with_arrays.sql
+%%DATADIR%%-test/queries/0_stateless/01428_nullable_asof_join.reference
+%%DATADIR%%-test/queries/0_stateless/01811_filter_by_null.sql
+%%DATADIR%%-test/queries/0_stateless/02150_index_hypothesis_race_long.reference
+%%DATADIR%%-test/queries/0_stateless/00579_virtual_column_and_lazy.sql
+%%DATADIR%%-test/queries/0_stateless/00643_cast_zookeeper_long.sql
+%%DATADIR%%-test/queries/0_stateless/00475_in_join_db_table.reference
+%%DATADIR%%-test/queries/0_stateless/00422_hash_function_constexpr.sql
+%%DATADIR%%-test/queries/0_stateless/01051_all_join_engine.reference
+%%DATADIR%%-test/queries/0_stateless/01276_alter_rename_column_materialized_expr.reference
+%%DATADIR%%-test/queries/0_stateless/01605_dictinct_two_level.reference
+%%DATADIR%%-test/queries/0_stateless/00385_storage_file_and_clickhouse-local_app_long.sh
+%%DATADIR%%-test/queries/0_stateless/01033_quota_dcl.reference
+%%DATADIR%%-test/queries/0_stateless/01570_aggregator_combinator_simple_state.reference
+%%DATADIR%%-test/queries/0_stateless/02026_storage_filelog_largefile.reference
+%%DATADIR%%-test/queries/0_stateless/01556_if_null.reference
+%%DATADIR%%-test/queries/0_stateless/01068_window_view_event_tumble_to_bounded_lateness.reference
+%%DATADIR%%-test/queries/0_stateless/01922_sum_null_for_remote.reference
+%%DATADIR%%-test/queries/0_stateless/01178_int_field_to_decimal.reference
 %%DATADIR%%-test/queries/0_stateless/01293_optimize_final_force.reference
-%%DATADIR%%-test/queries/0_stateless/01293_optimize_final_force.sh
-%%DATADIR%%-test/queries/0_stateless/01293_pretty_max_value_width.reference
-%%DATADIR%%-test/queries/0_stateless/01293_pretty_max_value_width.sql
-%%DATADIR%%-test/queries/0_stateless/01293_show_clusters.reference
-%%DATADIR%%-test/queries/0_stateless/01293_show_clusters.sql
-%%DATADIR%%-test/queries/0_stateless/01293_show_settings.reference
-%%DATADIR%%-test/queries/0_stateless/01293_show_settings.sql
-%%DATADIR%%-test/queries/0_stateless/01293_system_distribution_queue.reference
-%%DATADIR%%-test/queries/0_stateless/01293_system_distribution_queue.sql
-%%DATADIR%%-test/queries/0_stateless/01294_create_settings_profile.reference
-%%DATADIR%%-test/queries/0_stateless/01294_create_settings_profile.sql
-%%DATADIR%%-test/queries/0_stateless/01294_lazy_database_concurrent_recreate_reattach_and_show_tables_long.reference
-%%DATADIR%%-test/queries/0_stateless/01294_lazy_database_concurrent_recreate_reattach_and_show_tables_long.sh
-%%DATADIR%%-test/queries/0_stateless/01294_system_distributed_on_cluster.reference
-%%DATADIR%%-test/queries/0_stateless/01294_system_distributed_on_cluster.sql
-%%DATADIR%%-test/queries/0_stateless/01295_aggregation_bug_11413.reference
-%%DATADIR%%-test/queries/0_stateless/01295_aggregation_bug_11413.sql
-%%DATADIR%%-test/queries/0_stateless/01295_create_row_policy.reference
-%%DATADIR%%-test/queries/0_stateless/01295_create_row_policy.sql
-%%DATADIR%%-test/queries/0_stateless/01296_codecs_bad_arguments.reference
-%%DATADIR%%-test/queries/0_stateless/01296_codecs_bad_arguments.sql
-%%DATADIR%%-test/queries/0_stateless/01296_create_row_policy_in_current_database.reference
-%%DATADIR%%-test/queries/0_stateless/01296_create_row_policy_in_current_database.sql
-%%DATADIR%%-test/queries/0_stateless/01296_pipeline_stuck.reference
-%%DATADIR%%-test/queries/0_stateless/01296_pipeline_stuck.sql
+%%DATADIR%%-test/queries/0_stateless/00101_materialized_views_and_insert_without_explicit_database.reference
+%%DATADIR%%-test/queries/0_stateless/01626_cnf_fuzz_long.reference
+%%DATADIR%%-test/queries/0_stateless/00843_optimize_predicate_and_rename_table.reference
+%%DATADIR%%-test/queries/0_stateless/01686_rocksdb.reference
+%%DATADIR%%-test/queries/0_stateless/01306_disable_duplicate_order_by_and_distinct_optimize_for_distributed_table.reference
+%%DATADIR%%-test/queries/0_stateless/01915_create_or_replace_dictionary.sql
+%%DATADIR%%-test/queries/0_stateless/01080_engine_merge_prewhere_tupleelement_error.reference
+%%DATADIR%%-test/queries/0_stateless/01903_ssd_cache_dictionary_array_type.reference
+%%DATADIR%%-test/queries/0_stateless/00023_agg_select_agg_subquery.reference
+%%DATADIR%%-test/queries/0_stateless/00523_aggregate_functions_in_group_array.reference
+%%DATADIR%%-test/queries/0_stateless/01702_bitmap_native_integers.reference
+%%DATADIR%%-test/queries/0_stateless/00756_power_alias.sql
+%%DATADIR%%-test/queries/0_stateless/00549_join_use_nulls.reference
+%%DATADIR%%-test/queries/0_stateless/01560_merge_distributed_join.reference
+%%DATADIR%%-test/queries/0_stateless/01285_engine_join_donmikel.reference
+%%DATADIR%%-test/queries/0_stateless/01275_extract_groups_check.reference
+%%DATADIR%%-test/queries/0_stateless/01925_jit_aggregation_function_count_long.sql
+%%DATADIR%%-test/queries/0_stateless/01326_build_id.sql
+%%DATADIR%%-test/queries/0_stateless/01605_adaptive_granularity_block_borders.sql
+%%DATADIR%%-test/queries/0_stateless/00688_low_cardinality_dictionary_deserialization.reference
+%%DATADIR%%-test/queries/0_stateless/01307_polygon_perimeter.sql
+%%DATADIR%%-test/queries/0_stateless/01037_polygon_dicts_correctness_all.reference
 %%DATADIR%%-test/queries/0_stateless/01297_alter_distributed.reference
-%%DATADIR%%-test/queries/0_stateless/01297_alter_distributed.sql
-%%DATADIR%%-test/queries/0_stateless/01297_create_quota.reference
-%%DATADIR%%-test/queries/0_stateless/01297_create_quota.sql
+%%DATADIR%%-test/queries/0_stateless/01421_assert_in_in.reference
+%%DATADIR%%-test/queries/0_stateless/01890_state_of_state.reference
+%%DATADIR%%-test/queries/0_stateless/01045_array_zip.reference
+%%DATADIR%%-test/queries/0_stateless/01949_heredoc_unfinished.sh
+%%DATADIR%%-test/queries/0_stateless/01889_clickhouse_client_config_format.sh
+%%DATADIR%%-test/queries/0_stateless/01101_prewhere_after_alter.sql
+%%DATADIR%%-test/queries/0_stateless/00515_gcd_lcm.reference
+%%DATADIR%%-test/queries/0_stateless/01051_scalar_optimization.sql
+%%DATADIR%%-test/queries/0_stateless/00729_prewhere_array_join.sql
+%%DATADIR%%-test/queries/0_stateless/01354_order_by_tuple_collate_const.sql
+%%DATADIR%%-test/queries/0_stateless/01936_quantiles_cannot_return_null.reference
+%%DATADIR%%-test/queries/0_stateless/02165_auto_format_by_file_extension.reference
+%%DATADIR%%-test/queries/0_stateless/00652_mutations_default_database.sh
+%%DATADIR%%-test/queries/0_stateless/00207_left_array_join.reference
+%%DATADIR%%-test/queries/0_stateless/01281_parseDateTime64BestEffort.sql
+%%DATADIR%%-test/queries/0_stateless/01098_temporary_and_external_tables.sh
+%%DATADIR%%-test/queries/0_stateless/00080_show_tables_and_system_tables.reference
+%%DATADIR%%-test/queries/0_stateless/00825_protobuf_format_skipped_column_in_nested.reference
+%%DATADIR%%-test/queries/0_stateless/01581_to_int_inf_nan.reference
+%%DATADIR%%-test/queries/0_stateless/01720_constraints_complex_types.sql
+%%DATADIR%%-test/queries/0_stateless/01142_join_lc_and_nullable_in_key.reference
+%%DATADIR%%-test/queries/0_stateless/02105_table_function_file_partiotion_by.sh
+%%DATADIR%%-test/queries/0_stateless/01804_dictionary_decimal256_type.sql
+%%DATADIR%%-test/queries/0_stateless/02119_sumcount.reference
+%%DATADIR%%-test/queries/0_stateless/00997_set_index_array.sql
+%%DATADIR%%-test/queries/0_stateless/00274_shard_group_array.sql
+%%DATADIR%%-test/queries/0_stateless/02151_lc_prefetch.sql
+%%DATADIR%%-test/queries/0_stateless/01418_query_scope_constants_and_remote.reference
+%%DATADIR%%-test/queries/0_stateless/01600_detach_permanently.sh
+%%DATADIR%%-test/queries/0_stateless/01925_jit_aggregation_function_count_long.reference
+%%DATADIR%%-test/queries/0_stateless/00995_optimize_read_in_order_with_aggregation.sql
+%%DATADIR%%-test/queries/0_stateless/01548_query_log_query_execution_ms.reference
+%%DATADIR%%-test/queries/0_stateless/01378_alter_rename_with_ttl_zookeeper.sql
+%%DATADIR%%-test/queries/0_stateless/01503_if_const_optimization.sql
+%%DATADIR%%-test/queries/0_stateless/01455_opentelemetry_distributed.sh
+%%DATADIR%%-test/queries/0_stateless/01507_multiversion_storage_for_storagememory.reference
+%%DATADIR%%-test/queries/0_stateless/01076_range_reader_segfault.sql
+%%DATADIR%%-test/queries/0_stateless/00987_distributed_stack_overflow.sql
+%%DATADIR%%-test/queries/0_stateless/00813_parse_date_time_best_effort_more.reference
+%%DATADIR%%-test/queries/0_stateless/02160_special_functions.reference
+%%DATADIR%%-test/queries/0_stateless/01412_cache_dictionary_race.reference
+%%DATADIR%%-test/queries/0_stateless/01800_log_nested.reference
 %%DATADIR%%-test/queries/0_stateless/01298_alter_merge.reference
-%%DATADIR%%-test/queries/0_stateless/01298_alter_merge.sql
-%%DATADIR%%-test/queries/0_stateless/01299_alter_merge_tree.reference
-%%DATADIR%%-test/queries/0_stateless/01299_alter_merge_tree.sql
-%%DATADIR%%-test/queries/0_stateless/01300_client_save_history_when_terminated_long.expect
-%%DATADIR%%-test/queries/0_stateless/01300_client_save_history_when_terminated_long.reference
-%%DATADIR%%-test/queries/0_stateless/01300_group_by_other_keys.reference
-%%DATADIR%%-test/queries/0_stateless/01300_group_by_other_keys.sql
-%%DATADIR%%-test/queries/0_stateless/01300_group_by_other_keys_having.reference
-%%DATADIR%%-test/queries/0_stateless/01300_group_by_other_keys_having.sql
-%%DATADIR%%-test/queries/0_stateless/01300_polygon_convex_hull.reference
-%%DATADIR%%-test/queries/0_stateless/01300_polygon_convex_hull.sql
-%%DATADIR%%-test/queries/0_stateless/01300_read_wkt.reference
-%%DATADIR%%-test/queries/0_stateless/01300_read_wkt.sql
-%%DATADIR%%-test/queries/0_stateless/01300_svg.reference
-%%DATADIR%%-test/queries/0_stateless/01300_svg.sql
-%%DATADIR%%-test/queries/0_stateless/01300_wkt.reference
-%%DATADIR%%-test/queries/0_stateless/01300_wkt.sql
-%%DATADIR%%-test/queries/0_stateless/01301_aggregate_state_exception_memory_leak.reference
-%%DATADIR%%-test/queries/0_stateless/01301_aggregate_state_exception_memory_leak.sh
-%%DATADIR%%-test/queries/0_stateless/01301_polygons_within.reference
-%%DATADIR%%-test/queries/0_stateless/01301_polygons_within.sql
-%%DATADIR%%-test/queries/0_stateless/01302_aggregate_state_exception_memory_leak.reference
-%%DATADIR%%-test/queries/0_stateless/01302_aggregate_state_exception_memory_leak.sh
-%%DATADIR%%-test/queries/0_stateless/01302_polygons_distance.reference
-%%DATADIR%%-test/queries/0_stateless/01302_polygons_distance.sql
-%%DATADIR%%-test/queries/0_stateless/01303_polygons_equals.reference
-%%DATADIR%%-test/queries/0_stateless/01303_polygons_equals.sql
-%%DATADIR%%-test/queries/0_stateless/01304_direct_io_long.reference
-%%DATADIR%%-test/queries/0_stateless/01304_direct_io_long.sh
-%%DATADIR%%-test/queries/0_stateless/01304_polygons_sym_difference.reference
-%%DATADIR%%-test/queries/0_stateless/01304_polygons_sym_difference.sql
-%%DATADIR%%-test/queries/0_stateless/01305_array_join_prewhere_in_subquery.reference
-%%DATADIR%%-test/queries/0_stateless/01305_array_join_prewhere_in_subquery.sql
-%%DATADIR%%-test/queries/0_stateless/01305_buffer_final_bug.reference
-%%DATADIR%%-test/queries/0_stateless/01305_buffer_final_bug.sql
-%%DATADIR%%-test/queries/0_stateless/01305_duplicate_order_by_and_distinct.reference
-%%DATADIR%%-test/queries/0_stateless/01305_duplicate_order_by_and_distinct.sql
-%%DATADIR%%-test/queries/0_stateless/01305_nullable-prewhere_bug.reference
-%%DATADIR%%-test/queries/0_stateless/01305_nullable-prewhere_bug.sql
-%%DATADIR%%-test/queries/0_stateless/01305_polygons_union.reference
-%%DATADIR%%-test/queries/0_stateless/01305_polygons_union.sql
-%%DATADIR%%-test/queries/0_stateless/01305_replica_create_drop_zookeeper.reference
-%%DATADIR%%-test/queries/0_stateless/01305_replica_create_drop_zookeeper.sh
-%%DATADIR%%-test/queries/0_stateless/01306_benchmark_json.reference
-%%DATADIR%%-test/queries/0_stateless/01306_benchmark_json.sh
-%%DATADIR%%-test/queries/0_stateless/01306_disable_duplicate_order_by_and_distinct_optimize_for_distributed_table.reference
-%%DATADIR%%-test/queries/0_stateless/01306_disable_duplicate_order_by_and_distinct_optimize_for_distributed_table.sql
-%%DATADIR%%-test/queries/0_stateless/01306_polygons_intersection.reference
+%%DATADIR%%-test/queries/0_stateless/01456_ast_optimizations_over_distributed.sql
+%%DATADIR%%-test/queries/0_stateless/00725_join_on_bug_1.sql
+%%DATADIR%%-test/queries/0_stateless/00561_storage_join.sql
+%%DATADIR%%-test/queries/0_stateless/00991_temporary_live_view_watch_events_heartbeat.reference
+%%DATADIR%%-test/queries/0_stateless/00404_null_literal.sql
+%%DATADIR%%-test/queries/0_stateless/00820_multiple_joins.reference
+%%DATADIR%%-test/queries/0_stateless/00576_nested_and_prewhere.sql
+%%DATADIR%%-test/queries/0_stateless/01753_fix_clickhouse_format.reference
+%%DATADIR%%-test/queries/0_stateless/01360_division_overflow.sql
+%%DATADIR%%-test/queries/0_stateless/01623_constraints_column_swap.sql
+%%DATADIR%%-test/queries/0_stateless/01463_test_alter_live_view_refresh.reference
+%%DATADIR%%-test/queries/0_stateless/01193_metadata_loading.reference
+%%DATADIR%%-test/queries/0_stateless/01821_join_table_mutation.sql
+%%DATADIR%%-test/queries/0_stateless/00162_shard_global_join.reference
+%%DATADIR%%-test/queries/0_stateless/01273_arrow_load.sh
+%%DATADIR%%-test/queries/0_stateless/00974_query_profiler.sql
+%%DATADIR%%-test/queries/0_stateless/01766_todatetime64_no_timezone_arg.sql
+%%DATADIR%%-test/queries/0_stateless/01461_query_start_time_microseconds.sql
+%%DATADIR%%-test/queries/0_stateless/01799_long_uniq_theta_sketch.reference
+%%DATADIR%%-test/queries/0_stateless/00967_live_view_watch_http.py
+%%DATADIR%%-test/queries/0_stateless/01273_arrow_dictionaries_load.sh
+%%DATADIR%%-test/queries/0_stateless/01592_toUnixTimestamp_Date.sql
+%%DATADIR%%-test/queries/0_stateless/01711_decimal_multiplication.sql
+%%DATADIR%%-test/queries/0_stateless/00186_very_long_arrays.sh
+%%DATADIR%%-test/queries/0_stateless/01011_test_create_as_skip_indices.sql
+%%DATADIR%%-test/queries/0_stateless/01470_columns_transformers.sql
+%%DATADIR%%-test/queries/0_stateless/00960_eval_ml_method_const.reference
+%%DATADIR%%-test/queries/0_stateless/01036_union_different_columns.sql
+%%DATADIR%%-test/queries/0_stateless/00753_alter_attach.sql
+%%DATADIR%%-test/queries/0_stateless/01322_any_input_optimize.reference
+%%DATADIR%%-test/queries/0_stateless/00652_mergetree_mutations.sh
+%%DATADIR%%-test/queries/0_stateless/01029_early_constant_folding.sql
+%%DATADIR%%-test/queries/0_stateless/01447_json_strings.reference
+%%DATADIR%%-test/queries/0_stateless/00834_kill_mutation.sh
+%%DATADIR%%-test/queries/0_stateless/00976_max_execution_speed.sql
+%%DATADIR%%-test/queries/0_stateless/02131_skip_index_not_materialized.sql
+%%DATADIR%%-test/queries/0_stateless/00914_join_bgranvea.sql
+%%DATADIR%%-test/queries/0_stateless/01852_s2_get_neighbors.reference
+%%DATADIR%%-test/queries/0_stateless/01400_join_get_with_multi_keys.reference
+%%DATADIR%%-test/queries/0_stateless/01508_partition_pruning_long.sh
+%%DATADIR%%-test/queries/0_stateless/01513_defaults_on_defaults_no_column.sql
+%%DATADIR%%-test/queries/0_stateless/01037_test_data_search.tar.gz
+%%DATADIR%%-test/queries/0_stateless/01647_clickhouse_local_hung.reference
+%%DATADIR%%-test/queries/0_stateless/01258_wrong_cast_filimonov.reference
+%%DATADIR%%-test/queries/0_stateless/00627_recursive_alias.reference
+%%DATADIR%%-test/queries/0_stateless/01341_datetime64_wrong_supertype.reference
+%%DATADIR%%-test/queries/0_stateless/01802_test_postgresql_protocol_with_row_policy.sh
+%%DATADIR%%-test/queries/0_stateless/00953_zookeeper_suetin_deduplication_bug.sh
+%%DATADIR%%-test/queries/0_stateless/01034_order_by_pk_prefix.reference
+%%DATADIR%%-test/queries/0_stateless/00991_temporary_live_view_watch_events_heartbeat.sh.disabled
+%%DATADIR%%-test/queries/0_stateless/00528_const_of_nullable.reference
+%%DATADIR%%-test/queries/0_stateless/00992_system_parts_race_condition_zookeeper_long.reference
+%%DATADIR%%-test/queries/0_stateless/01419_merge_tree_settings_sanity_check.sql
+%%DATADIR%%-test/queries/0_stateless/00900_orc_nullable_arrays_load.reference
+%%DATADIR%%-test/queries/0_stateless/01744_fuse_sum_count_aggregate.reference
+%%DATADIR%%-test/queries/0_stateless/00837_minmax_index.reference
+%%DATADIR%%-test/queries/0_stateless/01654_test_writer_block_sequence.python
+%%DATADIR%%-test/queries/0_stateless/02146_mv_non_phys.reference
+%%DATADIR%%-test/queries/0_stateless/01582_move_to_prewhere_compact_parts.sql
+%%DATADIR%%-test/queries/0_stateless/02001_select_with_filter.reference
+%%DATADIR%%-test/queries/0_stateless/01947_multiple_pipe_read.reference
+%%DATADIR%%-test/queries/0_stateless/00339_parsing_bad_arrays.sh
+%%DATADIR%%-test/queries/0_stateless/00374_json_each_row_input_with_noisy_fields.reference
+%%DATADIR%%-test/queries/0_stateless/01550_create_map_type.reference
+%%DATADIR%%-test/queries/0_stateless/01755_shard_pruning_with_literal.reference
+%%DATADIR%%-test/queries/0_stateless/00200_shard_distinct_order_by_limit_distributed.sql
+%%DATADIR%%-test/queries/0_stateless/01285_data_skip_index_over_aggregation.reference
+%%DATADIR%%-test/queries/0_stateless/00720_combinations_of_aggregate_combinators.reference
+%%DATADIR%%-test/queries/0_stateless/01458_count_digits.sql
 %%DATADIR%%-test/queries/0_stateless/01306_polygons_intersection.sql
-%%DATADIR%%-test/queries/0_stateless/01307_bloom_filter_index_string_multi_granulas.reference
-%%DATADIR%%-test/queries/0_stateless/01307_bloom_filter_index_string_multi_granulas.sql
-%%DATADIR%%-test/queries/0_stateless/01307_multiple_leaders_zookeeper.reference
-%%DATADIR%%-test/queries/0_stateless/01307_multiple_leaders_zookeeper.sh
-%%DATADIR%%-test/queries/0_stateless/01307_orc_output_format.reference
-%%DATADIR%%-test/queries/0_stateless/01307_orc_output_format.sh
-%%DATADIR%%-test/queries/0_stateless/01307_polygon_perimeter.reference
-%%DATADIR%%-test/queries/0_stateless/01307_polygon_perimeter.sql
 %%DATADIR%%-test/queries/0_stateless/01308_orc_output_format_arrays.reference
-%%DATADIR%%-test/queries/0_stateless/01308_orc_output_format_arrays.sh
-%%DATADIR%%-test/queries/0_stateless/01308_polygon_area.reference
-%%DATADIR%%-test/queries/0_stateless/01308_polygon_area.sql
-%%DATADIR%%-test/queries/0_stateless/01308_row_policy_and_trivial_count_query.reference
-%%DATADIR%%-test/queries/0_stateless/01308_row_policy_and_trivial_count_query.sql
-%%DATADIR%%-test/queries/0_stateless/01310_enum_comparison.reference
-%%DATADIR%%-test/queries/0_stateless/01310_enum_comparison.sql
-%%DATADIR%%-test/queries/0_stateless/01311_comparison_with_constant_string.reference
-%%DATADIR%%-test/queries/0_stateless/01311_comparison_with_constant_string.sql
-%%DATADIR%%-test/queries/0_stateless/01312_case_insensitive_regexp.reference
-%%DATADIR%%-test/queries/0_stateless/01312_case_insensitive_regexp.sql
-%%DATADIR%%-test/queries/0_stateless/01312_comparison_with_constant_string_in_index_analysis.reference
-%%DATADIR%%-test/queries/0_stateless/01312_comparison_with_constant_string_in_index_analysis.sql
-%%DATADIR%%-test/queries/0_stateless/01312_skip_empty_params.reference
-%%DATADIR%%-test/queries/0_stateless/01312_skip_empty_params.sh
-%%DATADIR%%-test/queries/0_stateless/01313_parse_date_time_best_effort_null_zero.reference
-%%DATADIR%%-test/queries/0_stateless/01313_parse_date_time_best_effort_null_zero.sql
-%%DATADIR%%-test/queries/0_stateless/01314_position_in_system_columns.reference
-%%DATADIR%%-test/queries/0_stateless/01314_position_in_system_columns.sql
-%%DATADIR%%-test/queries/0_stateless/01315_count_distinct_return_not_nullable.reference
-%%DATADIR%%-test/queries/0_stateless/01315_count_distinct_return_not_nullable.sql
-%%DATADIR%%-test/queries/0_stateless/01316_create_user_syntax_hilite.reference
-%%DATADIR%%-test/queries/0_stateless/01316_create_user_syntax_hilite.sh
-%%DATADIR%%-test/queries/0_stateless/01317_no_password_in_command_line.reference
-%%DATADIR%%-test/queries/0_stateless/01317_no_password_in_command_line.sh
-%%DATADIR%%-test/queries/0_stateless/01318_alter_add_column_exists.reference
-%%DATADIR%%-test/queries/0_stateless/01318_alter_add_column_exists.sql
-%%DATADIR%%-test/queries/0_stateless/01318_alter_add_constraint_format.reference
-%%DATADIR%%-test/queries/0_stateless/01318_alter_add_constraint_format.sh
-%%DATADIR%%-test/queries/0_stateless/01318_decrypt.reference
-%%DATADIR%%-test/queries/0_stateless/01318_decrypt.sql
-%%DATADIR%%-test/queries/0_stateless/01318_encrypt.reference
-%%DATADIR%%-test/queries/0_stateless/01318_encrypt.sql
-%%DATADIR%%-test/queries/0_stateless/01318_long_unsuccessful_mutation_zookeeper.reference
-%%DATADIR%%-test/queries/0_stateless/01318_long_unsuccessful_mutation_zookeeper.sh
-%%DATADIR%%-test/queries/0_stateless/01318_map_add_map_subtract.reference
-%%DATADIR%%-test/queries/0_stateless/01318_map_add_map_subtract.sql
-%%DATADIR%%-test/queries/0_stateless/01318_map_populate_series.reference
-%%DATADIR%%-test/queries/0_stateless/01318_map_populate_series.sql
-%%DATADIR%%-test/queries/0_stateless/01318_parallel_final_stuck.reference
-%%DATADIR%%-test/queries/0_stateless/01318_parallel_final_stuck.sql
-%%DATADIR%%-test/queries/0_stateless/01319_manual_write_to_replicas.reference
-%%DATADIR%%-test/queries/0_stateless/01319_manual_write_to_replicas.sql
-%%DATADIR%%-test/queries/0_stateless/01319_mv_constants_bug.reference
-%%DATADIR%%-test/queries/0_stateless/01319_mv_constants_bug.sql
-%%DATADIR%%-test/queries/0_stateless/01319_optimize_skip_unused_shards_nesting.reference
-%%DATADIR%%-test/queries/0_stateless/01319_optimize_skip_unused_shards_nesting.sql
-%%DATADIR%%-test/queries/0_stateless/01319_query_formatting_in_server_log.reference
-%%DATADIR%%-test/queries/0_stateless/01319_query_formatting_in_server_log.sql
-%%DATADIR%%-test/queries/0_stateless/01320_create_sync_race_condition_zookeeper.reference
-%%DATADIR%%-test/queries/0_stateless/01320_create_sync_race_condition_zookeeper.sh
-%%DATADIR%%-test/queries/0_stateless/01320_optimize_skip_unused_shards_no_non_deterministic.reference
-%%DATADIR%%-test/queries/0_stateless/01320_optimize_skip_unused_shards_no_non_deterministic.sql
-%%DATADIR%%-test/queries/0_stateless/01321_aggregate_functions_of_group_by_keys.reference
-%%DATADIR%%-test/queries/0_stateless/01321_aggregate_functions_of_group_by_keys.sql
-%%DATADIR%%-test/queries/0_stateless/01321_monotonous_functions_in_order_by.reference
-%%DATADIR%%-test/queries/0_stateless/01321_monotonous_functions_in_order_by.sql
-%%DATADIR%%-test/queries/0_stateless/01322_any_input_optimize.reference
-%%DATADIR%%-test/queries/0_stateless/01322_any_input_optimize.sql
-%%DATADIR%%-test/queries/0_stateless/01322_cast_keep_nullable.reference
-%%DATADIR%%-test/queries/0_stateless/01322_cast_keep_nullable.sql
-%%DATADIR%%-test/queries/0_stateless/01322_monotonous_order_by_with_different_variables.reference
-%%DATADIR%%-test/queries/0_stateless/01322_monotonous_order_by_with_different_variables.sql
-%%DATADIR%%-test/queries/0_stateless/01322_student_ttest.reference
-%%DATADIR%%-test/queries/0_stateless/01322_welch_ttest.reference
-%%DATADIR%%-test/queries/0_stateless/01323_add_scalars_in_time.reference
+%%DATADIR%%-test/queries/0_stateless/01926_union_all_schmak.reference
+%%DATADIR%%-test/queries/0_stateless/00732_quorum_insert_lost_part_and_alive_part_zookeeper_long.reference
+%%DATADIR%%-test/queries/0_stateless/00424_shard_aggregate_functions_of_nullable.reference
+%%DATADIR%%-test/queries/0_stateless/02030_client_unknown_database.sh
+%%DATADIR%%-test/queries/0_stateless/01732_union_and_union_all.sql
+%%DATADIR%%-test/queries/0_stateless/01852_cast_operator_3.reference
+%%DATADIR%%-test/queries/0_stateless/00396_uuid.sql
+%%DATADIR%%-test/queries/0_stateless/00964_live_view_watch_events_heartbeat.py
+%%DATADIR%%-test/queries/0_stateless/00515_enhanced_time_zones.reference
+%%DATADIR%%-test/queries/0_stateless/01521_alter_enum_and_reverse_read.sql
+%%DATADIR%%-test/queries/0_stateless/00913_many_threads.reference
+%%DATADIR%%-test/queries/0_stateless/02097_initializeAggregationNullable.reference
+%%DATADIR%%-test/queries/0_stateless/01471_limit_by_format.sql
+%%DATADIR%%-test/queries/0_stateless/01946_test_wrong_host_name_access.sh
+%%DATADIR%%-test/queries/0_stateless/01231_log_queries_min_type.sql
 %%DATADIR%%-test/queries/0_stateless/01323_add_scalars_in_time.sql
-%%DATADIR%%-test/queries/0_stateless/01323_bad_arg_in_arithmetic_operations.reference
-%%DATADIR%%-test/queries/0_stateless/01323_bad_arg_in_arithmetic_operations.sql
-%%DATADIR%%-test/queries/0_stateless/01323_if_with_nulls.reference
-%%DATADIR%%-test/queries/0_stateless/01323_if_with_nulls.sql
-%%DATADIR%%-test/queries/0_stateless/01323_redundant_functions_in_order_by.reference
-%%DATADIR%%-test/queries/0_stateless/01323_redundant_functions_in_order_by.sql
-%%DATADIR%%-test/queries/0_stateless/01323_too_many_threads_bug.reference
-%%DATADIR%%-test/queries/0_stateless/01323_too_many_threads_bug.sql
-%%DATADIR%%-test/queries/0_stateless/01324_if_transform_strings_to_enum.reference
-%%DATADIR%%-test/queries/0_stateless/01324_if_transform_strings_to_enum.sql
-%%DATADIR%%-test/queries/0_stateless/01324_insert_tsv_raw.reference
-%%DATADIR%%-test/queries/0_stateless/01324_insert_tsv_raw.sql
-%%DATADIR%%-test/queries/0_stateless/01324_settings_documentation.reference
-%%DATADIR%%-test/queries/0_stateless/01324_settings_documentation.sql
-%%DATADIR%%-test/queries/0_stateless/01325_freeze_mutation_stuck.reference
-%%DATADIR%%-test/queries/0_stateless/01325_freeze_mutation_stuck.sql
-%%DATADIR%%-test/queries/0_stateless/01326_build_id.reference
-%%DATADIR%%-test/queries/0_stateless/01326_build_id.sql
-%%DATADIR%%-test/queries/0_stateless/01326_fixed_string_comparison_denny_crane.reference
-%%DATADIR%%-test/queries/0_stateless/01326_fixed_string_comparison_denny_crane.sql
-%%DATADIR%%-test/queries/0_stateless/01326_hostname_alias.reference
-%%DATADIR%%-test/queries/0_stateless/01326_hostname_alias.sql
-%%DATADIR%%-test/queries/0_stateless/01327_decimal_cut_extra_digits_after_point.reference
-%%DATADIR%%-test/queries/0_stateless/01327_decimal_cut_extra_digits_after_point.sql
-%%DATADIR%%-test/queries/0_stateless/01328_bad_peephole_optimization.reference
-%%DATADIR%%-test/queries/0_stateless/01328_bad_peephole_optimization.sql
-%%DATADIR%%-test/queries/0_stateless/01329_compare_tuple_string_constant.reference
-%%DATADIR%%-test/queries/0_stateless/01329_compare_tuple_string_constant.sql
-%%DATADIR%%-test/queries/0_stateless/01330_array_join_in_higher_order_function.reference
-%%DATADIR%%-test/queries/0_stateless/01330_array_join_in_higher_order_function.sql
-%%DATADIR%%-test/queries/0_stateless/01332_join_type_syntax_position.reference
-%%DATADIR%%-test/queries/0_stateless/01332_join_type_syntax_position.sql
-%%DATADIR%%-test/queries/0_stateless/01333_select_abc_asterisk.reference
-%%DATADIR%%-test/queries/0_stateless/01333_select_abc_asterisk.sql
-%%DATADIR%%-test/queries/0_stateless/01337_mysql_global_variables.reference
-%%DATADIR%%-test/queries/0_stateless/01337_mysql_global_variables.sql
-%%DATADIR%%-test/queries/0_stateless/01338_long_select_and_alter.reference
-%%DATADIR%%-test/queries/0_stateless/01338_long_select_and_alter.sh
-%%DATADIR%%-test/queries/0_stateless/01338_long_select_and_alter_zookeeper.reference
-%%DATADIR%%-test/queries/0_stateless/01338_long_select_and_alter_zookeeper.sh
-%%DATADIR%%-test/queries/0_stateless/01338_sha256_fixedstring.reference
-%%DATADIR%%-test/queries/0_stateless/01338_sha256_fixedstring.sql
-%%DATADIR%%-test/queries/0_stateless/01338_uuid_without_separator.reference
-%%DATADIR%%-test/queries/0_stateless/01338_uuid_without_separator.sql
-%%DATADIR%%-test/queries/0_stateless/01339_client_unrecognized_option.reference
-%%DATADIR%%-test/queries/0_stateless/01339_client_unrecognized_option.sh
-%%DATADIR%%-test/queries/0_stateless/01340_datetime64_fpe.reference
-%%DATADIR%%-test/queries/0_stateless/01340_datetime64_fpe.sql
-%%DATADIR%%-test/queries/0_stateless/01341_datetime64_wrong_supertype.reference
-%%DATADIR%%-test/queries/0_stateless/01341_datetime64_wrong_supertype.sql
-%%DATADIR%%-test/queries/0_stateless/01342_query_parameters_alias.reference
-%%DATADIR%%-test/queries/0_stateless/01342_query_parameters_alias.sh
-%%DATADIR%%-test/queries/0_stateless/01343_min_bytes_to_use_mmap_io.reference
-%%DATADIR%%-test/queries/0_stateless/01343_min_bytes_to_use_mmap_io.sql
-%%DATADIR%%-test/queries/0_stateless/01344_alter_enum_partition_key.reference
-%%DATADIR%%-test/queries/0_stateless/01344_alter_enum_partition_key.sql
-%%DATADIR%%-test/queries/0_stateless/01344_min_bytes_to_use_mmap_io_index.reference
-%%DATADIR%%-test/queries/0_stateless/01344_min_bytes_to_use_mmap_io_index.sql
-%%DATADIR%%-test/queries/0_stateless/01345_array_join_LittleMaverick.reference
-%%DATADIR%%-test/queries/0_stateless/01345_array_join_LittleMaverick.sql
-%%DATADIR%%-test/queries/0_stateless/01345_index_date_vs_datetime.reference
-%%DATADIR%%-test/queries/0_stateless/01345_index_date_vs_datetime.sql
-%%DATADIR%%-test/queries/0_stateless/01346_alter_enum_partition_key_replicated_zookeeper.reference
-%%DATADIR%%-test/queries/0_stateless/01346_alter_enum_partition_key_replicated_zookeeper.sql
-%%DATADIR%%-test/queries/0_stateless/01346_array_join_mrxotey.reference
-%%DATADIR%%-test/queries/0_stateless/01346_array_join_mrxotey.sql
-%%DATADIR%%-test/queries/0_stateless/01347_partition_date_vs_datetime.reference
-%%DATADIR%%-test/queries/0_stateless/01347_partition_date_vs_datetime.sql
-%%DATADIR%%-test/queries/0_stateless/01349_mutation_datetime_key.reference
-%%DATADIR%%-test/queries/0_stateless/01349_mutation_datetime_key.sql
-%%DATADIR%%-test/queries/0_stateless/01350_intdiv_nontrivial_fpe.reference
-%%DATADIR%%-test/queries/0_stateless/01350_intdiv_nontrivial_fpe.sql
-%%DATADIR%%-test/queries/0_stateless/01351_geohash_assert.reference
-%%DATADIR%%-test/queries/0_stateless/01351_geohash_assert.sql
-%%DATADIR%%-test/queries/0_stateless/01351_parse_date_time_best_effort_us.reference
-%%DATADIR%%-test/queries/0_stateless/01351_parse_date_time_best_effort_us.sql
-%%DATADIR%%-test/queries/0_stateless/01352_add_datetime_bad_get.reference
-%%DATADIR%%-test/queries/0_stateless/01352_add_datetime_bad_get.sql
-%%DATADIR%%-test/queries/0_stateless/01352_generate_random_overflow.reference
-%%DATADIR%%-test/queries/0_stateless/01352_generate_random_overflow.sql
-%%DATADIR%%-test/queries/0_stateless/01353_low_cardinality_join_types.reference
-%%DATADIR%%-test/queries/0_stateless/01353_low_cardinality_join_types.sql
-%%DATADIR%%-test/queries/0_stateless/01353_neighbor_overflow.reference
-%%DATADIR%%-test/queries/0_stateless/01353_neighbor_overflow.sql
-%%DATADIR%%-test/queries/0_stateless/01353_nullable_tuple.reference
-%%DATADIR%%-test/queries/0_stateless/01353_nullable_tuple.sql
-%%DATADIR%%-test/queries/0_stateless/01353_topk_enum.reference
-%%DATADIR%%-test/queries/0_stateless/01353_topk_enum.sql
-%%DATADIR%%-test/queries/0_stateless/01354_order_by_tuple_collate_const.reference
-%%DATADIR%%-test/queries/0_stateless/01354_order_by_tuple_collate_const.sql
-%%DATADIR%%-test/queries/0_stateless/01354_tuple_low_cardinality_array_mapped_bug.reference
-%%DATADIR%%-test/queries/0_stateless/01354_tuple_low_cardinality_array_mapped_bug.sql
-%%DATADIR%%-test/queries/0_stateless/01355_CSV_input_format_allow_errors.reference
-%%DATADIR%%-test/queries/0_stateless/01355_CSV_input_format_allow_errors.sh
-%%DATADIR%%-test/queries/0_stateless/01355_alter_column_with_order.reference
-%%DATADIR%%-test/queries/0_stateless/01355_alter_column_with_order.sql
-%%DATADIR%%-test/queries/0_stateless/01355_defaultValueOfArgumentType_bug.reference
-%%DATADIR%%-test/queries/0_stateless/01355_defaultValueOfArgumentType_bug.sql
-%%DATADIR%%-test/queries/0_stateless/01355_if_fixed_string.reference
-%%DATADIR%%-test/queries/0_stateless/01355_if_fixed_string.sql
-%%DATADIR%%-test/queries/0_stateless/01355_ilike.reference
-%%DATADIR%%-test/queries/0_stateless/01355_ilike.sql
-%%DATADIR%%-test/queries/0_stateless/01356_initialize_aggregation.reference
-%%DATADIR%%-test/queries/0_stateless/01356_initialize_aggregation.sql
-%%DATADIR%%-test/queries/0_stateless/01356_state_resample.reference
-%%DATADIR%%-test/queries/0_stateless/01356_state_resample.sql
-%%DATADIR%%-test/queries/0_stateless/01356_view_threads.reference
-%%DATADIR%%-test/queries/0_stateless/01356_view_threads.sql
-%%DATADIR%%-test/queries/0_stateless/01356_wrong_filter-type_bug.reference
-%%DATADIR%%-test/queries/0_stateless/01356_wrong_filter-type_bug.sql
-%%DATADIR%%-test/queries/0_stateless/01357_result_rows.reference
-%%DATADIR%%-test/queries/0_stateless/01357_result_rows.sql
-%%DATADIR%%-test/queries/0_stateless/01357_version_collapsing_attach_detach_zookeeper.reference
-%%DATADIR%%-test/queries/0_stateless/01357_version_collapsing_attach_detach_zookeeper.sql
-%%DATADIR%%-test/queries/0_stateless/01358_constexpr_constraint.reference
-%%DATADIR%%-test/queries/0_stateless/01358_constexpr_constraint.sql
-%%DATADIR%%-test/queries/0_stateless/01358_lc_parquet.reference
-%%DATADIR%%-test/queries/0_stateless/01358_lc_parquet.sh
-%%DATADIR%%-test/queries/0_stateless/01358_mutation_delete_null_rows.reference
-%%DATADIR%%-test/queries/0_stateless/01358_mutation_delete_null_rows.sql
-%%DATADIR%%-test/queries/0_stateless/01358_union_threads_bug.reference
-%%DATADIR%%-test/queries/0_stateless/01358_union_threads_bug.sql
-%%DATADIR%%-test/queries/0_stateless/01359_codeql.reference
-%%DATADIR%%-test/queries/0_stateless/01359_codeql.sql
-%%DATADIR%%-test/queries/0_stateless/01359_geodistance_loop.reference
-%%DATADIR%%-test/queries/0_stateless/01359_geodistance_loop.sql
-%%DATADIR%%-test/queries/0_stateless/01360_division_overflow.reference
-%%DATADIR%%-test/queries/0_stateless/01360_division_overflow.sql
-%%DATADIR%%-test/queries/0_stateless/01360_materialized_view_with_join_on_query_log.reference
-%%DATADIR%%-test/queries/0_stateless/01360_materialized_view_with_join_on_query_log.sql
-%%DATADIR%%-test/queries/0_stateless/01361_buffer_table_flush_with_materialized_view.reference
-%%DATADIR%%-test/queries/0_stateless/01361_buffer_table_flush_with_materialized_view.sql
-%%DATADIR%%-test/queries/0_stateless/01361_fover_remote_num_tries.reference
-%%DATADIR%%-test/queries/0_stateless/01361_fover_remote_num_tries.sh
-%%DATADIR%%-test/queries/0_stateless/01362_year_of_ISO8601_week_modificators_for_formatDateTime.reference
-%%DATADIR%%-test/queries/0_stateless/01362_year_of_ISO8601_week_modificators_for_formatDateTime.sql
-%%DATADIR%%-test/queries/0_stateless/01370_client_autocomplete_word_break_characters.expect
-%%DATADIR%%-test/queries/0_stateless/01370_client_autocomplete_word_break_characters.reference
-%%DATADIR%%-test/queries/0_stateless/01372_remote_table_function_empty_table.reference
-%%DATADIR%%-test/queries/0_stateless/01372_remote_table_function_empty_table.sql
+%%DATADIR%%-test/queries/0_stateless/00165_transform_non_const_default.sql
+%%DATADIR%%-test/queries/0_stateless/01102_distributed_local_in_bug.reference
+%%DATADIR%%-test/queries/0_stateless/01771_bloom_filter_not_has.sql
+%%DATADIR%%-test/queries/0_stateless/00732_decimal_summing_merge_tree.reference
+%%DATADIR%%-test/queries/0_stateless/02000_default_from_default_empty_column.reference
+%%DATADIR%%-test/queries/0_stateless/01125_dict_ddl_cannot_add_column.reference
+%%DATADIR%%-test/queries/0_stateless/00653_monotonic_integer_cast.sql
+%%DATADIR%%-test/queries/0_stateless/00675_shard_remote_with_table_function.reference
+%%DATADIR%%-test/queries/0_stateless/02027_ngrams.sql
+%%DATADIR%%-test/queries/0_stateless/00700_decimal_bounds.sql
+%%DATADIR%%-test/queries/0_stateless/01915_merge_prewhere_virtual_column_rand_chao_wang.sql
+%%DATADIR%%-test/queries/0_stateless/01721_join_implicit_cast_long.sql.j2
+%%DATADIR%%-test/queries/0_stateless/02146_mv_non_phys.sql
+%%DATADIR%%-test/queries/0_stateless/01284_escape_sequences_php_mysql_style.sql
+%%DATADIR%%-test/queries/0_stateless/01411_from_unixtime.reference
+%%DATADIR%%-test/queries/0_stateless/00973_live_view_with_subquery_select_join.sql
+%%DATADIR%%-test/queries/0_stateless/02099_sql_user_defined_functions_lambda.reference
+%%DATADIR%%-test/queries/0_stateless/00051_any_inner_join.reference
+%%DATADIR%%-test/queries/0_stateless/01671_aggregate_function_group_bitmap_data.reference
+%%DATADIR%%-test/queries/0_stateless/01069_set_in_group_by.sql
+%%DATADIR%%-test/queries/0_stateless/00377_shard_group_uniq_array_of_string_array.sql
+%%DATADIR%%-test/queries/0_stateless/00297_attach_negative_numbers_zookeeper.sql.disabled
+%%DATADIR%%-test/queries/0_stateless/01681_hyperscan_debug_assertion.sh
+%%DATADIR%%-test/queries/0_stateless/00489_pk_subexpression.sql
+%%DATADIR%%-test/queries/0_stateless/00692_if_exception_code.sql
+%%DATADIR%%-test/queries/0_stateless/01268_shard_avgweighted.sql
+%%DATADIR%%-test/queries/0_stateless/00985_merge_stack_overflow.sql
+%%DATADIR%%-test/queries/0_stateless/00194_identity.sql
+%%DATADIR%%-test/queries/0_stateless/01322_student_ttest.reference
+%%DATADIR%%-test/queries/0_stateless/01666_blns_long.reference
+%%DATADIR%%-test/queries/0_stateless/01999_grant_with_replace.reference
+%%DATADIR%%-test/queries/0_stateless/01317_no_password_in_command_line.reference
+%%DATADIR%%-test/queries/0_stateless/01300_group_by_other_keys_having.reference
+%%DATADIR%%-test/queries/0_stateless/00034_fixed_string_to_number.reference
+%%DATADIR%%-test/queries/0_stateless/01425_decimal_parse_big_negative_exponent.reference
+%%DATADIR%%-test/queries/0_stateless/01923_ttl_with_modify_column.reference
+%%DATADIR%%-test/queries/0_stateless/01000_unneeded_substitutions_client.reference
+%%DATADIR%%-test/queries/0_stateless/01314_position_in_system_columns.reference
+%%DATADIR%%-test/queries/0_stateless/00435_coalesce.sql
+%%DATADIR%%-test/queries/0_stateless/00956_http_prepared_statements.reference
+%%DATADIR%%-test/queries/0_stateless/01073_crlf_end_of_line.sql
+%%DATADIR%%-test/queries/0_stateless/00807_regexp_quote_meta.reference
+%%DATADIR%%-test/queries/0_stateless/01035_concurrent_move_partition_from_table_zookeeper.sh
+%%DATADIR%%-test/queries/0_stateless/00978_table_function_values_alias.reference
+%%DATADIR%%-test/queries/0_stateless/00449_filter_array_nullable_tuple.reference
+%%DATADIR%%-test/queries/0_stateless/01448_json_compact_strings_each_row.sql
+%%DATADIR%%-test/queries/0_stateless/01458_is_decimal_overflow.sql
+%%DATADIR%%-test/queries/0_stateless/00903_array_with_constant_function.sql
+%%DATADIR%%-test/queries/0_stateless/02100_replaceRegexpAll_bug.reference
+%%DATADIR%%-test/queries/0_stateless/01744_fuse_sum_count_aggregate.sql
+%%DATADIR%%-test/queries/0_stateless/00189_time_zones_long.reference
+%%DATADIR%%-test/queries/0_stateless/01147_partial_merge_full_join.sql
+%%DATADIR%%-test/queries/0_stateless/01561_clickhouse_client_stage.reference
+%%DATADIR%%-test/queries/0_stateless/01272_totals_and_filter_bug.sql
+%%DATADIR%%-test/queries/0_stateless/01151_storage_merge_filter_tables_by_virtual_column.reference
+%%DATADIR%%-test/queries/0_stateless/00653_monotonic_integer_cast.reference
+%%DATADIR%%-test/queries/0_stateless/01049_join_low_card_bug_long.reference
+%%DATADIR%%-test/queries/0_stateless/01177_group_array_moving.sql
+%%DATADIR%%-test/queries/0_stateless/01839_join_to_subqueries_rewriter_columns_matcher.sql
+%%DATADIR%%-test/queries/0_stateless/00687_top_and_offset.reference
+%%DATADIR%%-test/queries/0_stateless/01377_supertype_low_cardinality.sql
+%%DATADIR%%-test/queries/0_stateless/01774_tuple_null_in.sql
+%%DATADIR%%-test/queries/0_stateless/02144_avg_ubsan.sql
+%%DATADIR%%-test/queries/0_stateless/01455_duplicate_distinct_optimization.sql
+%%DATADIR%%-test/queries/0_stateless/00850_global_join_dups.reference
+%%DATADIR%%-test/queries/0_stateless/01044_h3_edge_angle.reference
+%%DATADIR%%-test/queries/0_stateless/00090_union_race_conditions_1.reference
+%%DATADIR%%-test/queries/0_stateless/00504_mergetree_arrays_rw.reference
+%%DATADIR%%-test/queries/0_stateless/00700_decimal_empty_aggregates.sql
+%%DATADIR%%-test/queries/0_stateless/01852_dictionary_found_rate_long.sql
 %%DATADIR%%-test/queries/0_stateless/01372_wrong_order_by_removal.reference
-%%DATADIR%%-test/queries/0_stateless/01372_wrong_order_by_removal.sql
+%%DATADIR%%-test/queries/0_stateless/00411_long_accurate_number_comparison_int4.reference
+%%DATADIR%%-test/queries/0_stateless/01087_table_function_generate.reference
+%%DATADIR%%-test/queries/0_stateless/00498_bitwise_aggregate_functions.reference
+%%DATADIR%%-test/queries/0_stateless/01330_array_join_in_higher_order_function.sql
+%%DATADIR%%-test/queries/0_stateless/01602_modified_julian_day_msan.sql
+%%DATADIR%%-test/queries/0_stateless/01452_normalized_query_hash.sql
+%%DATADIR%%-test/queries/0_stateless/00950_test_double_delta_codec.sql
+%%DATADIR%%-test/queries/0_stateless/00816_long_concurrent_alter_column.reference
+%%DATADIR%%-test/queries/0_stateless/00604_show_create_database.reference
+%%DATADIR%%-test/queries/0_stateless/01700_system_zookeeper_path_in.sql
+%%DATADIR%%-test/queries/0_stateless/00907_set_index_max_rows.sh
+%%DATADIR%%-test/queries/0_stateless/01889_check_row_policy_defined_using_user_function.sh
+%%DATADIR%%-test/queries/0_stateless/01810_max_part_removal_threads_long.sh
+%%DATADIR%%-test/queries/0_stateless/00829_bitmap_function.reference
+%%DATADIR%%-test/queries/0_stateless/00991_system_parts_race_condition_long.reference
+%%DATADIR%%-test/queries/0_stateless/01096_array_reduce_in_ranges.sql
+%%DATADIR%%-test/queries/0_stateless/00900_null_array_orc_load.reference
+%%DATADIR%%-test/queries/0_stateless/01490_nullable_string_to_enum.reference
+%%DATADIR%%-test/queries/0_stateless/01497_extract_all_groups_empty_match.sql
+%%DATADIR%%-test/queries/0_stateless/02147_arrow_duplicate_columns.reference
+%%DATADIR%%-test/queries/0_stateless/02033_join_engine_deadlock_long.reference
+%%DATADIR%%-test/queries/0_stateless/00837_insert_select_and_read_prefix.reference
+%%DATADIR%%-test/queries/0_stateless/00541_to_start_of_fifteen_minutes.reference
+%%DATADIR%%-test/queries/0_stateless/00975_live_view_create.reference
+%%DATADIR%%-test/queries/0_stateless/00584_view_union_all.reference
+%%DATADIR%%-test/queries/0_stateless/00843_optimize_predicate_and_rename_table.sql
+%%DATADIR%%-test/queries/0_stateless/00700_decimal_bounds.reference
+%%DATADIR%%-test/queries/0_stateless/00990_function_current_user.sql
+%%DATADIR%%-test/queries/0_stateless/00098_7_union_all.reference
+%%DATADIR%%-test/queries/0_stateless/01645_system_table_engines.reference
+%%DATADIR%%-test/queries/0_stateless/01318_parallel_final_stuck.sql
+%%DATADIR%%-test/queries/0_stateless/01287_max_execution_speed.reference
+%%DATADIR%%-test/queries/0_stateless/00393_if_with_constant_condition.sql
+%%DATADIR%%-test/queries/0_stateless/01560_cancel_agg_func_combinator_native_name_constraint.reference
+%%DATADIR%%-test/queries/0_stateless/01710_projection_array_join.sql
+%%DATADIR%%-test/queries/0_stateless/01211_optimize_skip_unused_shards_type_mismatch.reference
+%%DATADIR%%-test/queries/0_stateless/02016_summing_mt_aggregating_column.sql
+%%DATADIR%%-test/queries/0_stateless/01056_create_table_as.reference
+%%DATADIR%%-test/queries/0_stateless/01513_defaults_on_defaults_no_column.reference
+%%DATADIR%%-test/queries/0_stateless/00113_shard_group_array.reference
+%%DATADIR%%-test/queries/0_stateless/01676_round_int_ubsan.sql
+%%DATADIR%%-test/queries/0_stateless/00114_float_type_result_of_division.sql
+%%DATADIR%%-test/queries/0_stateless/00712_prewhere_with_alias_and_virtual_column.reference
+%%DATADIR%%-test/queries/0_stateless/00534_filimonov.sh
 %%DATADIR%%-test/queries/0_stateless/01373_is_zero_or_null.reference
-%%DATADIR%%-test/queries/0_stateless/01373_is_zero_or_null.sql
-%%DATADIR%%-test/queries/0_stateless/01373_summing_merge_tree_exclude_partition_key.reference
-%%DATADIR%%-test/queries/0_stateless/01373_summing_merge_tree_exclude_partition_key.sql
-%%DATADIR%%-test/queries/0_stateless/01373_summing_merge_tree_explicit_columns_definition.reference
+%%DATADIR%%-test/queries/0_stateless/00702_join_with_using.sql
+%%DATADIR%%-test/queries/0_stateless/00386_enum_in_pk.reference
+%%DATADIR%%-test/queries/0_stateless/00974_bitmapContains_with_primary_key.sql
+%%DATADIR%%-test/queries/0_stateless/01067_window_view_event_tumble_to_asc_lateness.reference
+%%DATADIR%%-test/queries/0_stateless/01757_optimize_skip_unused_shards_limit.reference
+%%DATADIR%%-test/queries/0_stateless/00991_live_view_watch_http.python
+%%DATADIR%%-test/queries/0_stateless/00498_array_functions_concat_slice_push_pop.sql
+%%DATADIR%%-test/queries/0_stateless/00559_filter_array_generic.sql
+%%DATADIR%%-test/queries/0_stateless/01420_logical_functions_materialized_null.sql
+%%DATADIR%%-test/queries/0_stateless/02026_describe_include_subcolumns.sql
+%%DATADIR%%-test/queries/0_stateless/01052_compression_buffer_overrun.sh
+%%DATADIR%%-test/queries/0_stateless/00374_json_each_row_input_with_noisy_fields.sh
+%%DATADIR%%-test/queries/0_stateless/01772_intdiv_minus_one_ubsan.reference
+%%DATADIR%%-test/queries/0_stateless/00233_position_function_sql_comparibilty.sql
+%%DATADIR%%-test/queries/0_stateless/01753_system_zookeeper_query_param_path_long.sh
+%%DATADIR%%-test/queries/0_stateless/01502_bar_overflow.sql
+%%DATADIR%%-test/queries/0_stateless/00216_bit_test_function_family.reference
 %%DATADIR%%-test/queries/0_stateless/01373_summing_merge_tree_explicit_columns_definition.sql
-%%DATADIR%%-test/queries/0_stateless/01374_if_nullable_filimonov.reference
-%%DATADIR%%-test/queries/0_stateless/01374_if_nullable_filimonov.sql
-%%DATADIR%%-test/queries/0_stateless/01375_GROUP_BY_injective_elimination_dictGet_BAD_ARGUMENTS.reference
-%%DATADIR%%-test/queries/0_stateless/01375_GROUP_BY_injective_elimination_dictGet_BAD_ARGUMENTS.sql
-%%DATADIR%%-test/queries/0_stateless/01375_compact_parts_codecs.reference
-%%DATADIR%%-test/queries/0_stateless/01375_compact_parts_codecs.sql
+%%DATADIR%%-test/queries/0_stateless/00824_filesystem.reference
+%%DATADIR%%-test/queries/0_stateless/00359_convert_or_zero_functions.reference
+%%DATADIR%%-test/queries/0_stateless/00642_cast.sql
+%%DATADIR%%-test/queries/0_stateless/00335_bom.reference
+%%DATADIR%%-test/queries/0_stateless/00028_shard_big_agg_aj_distributed.reference
+%%DATADIR%%-test/queries/0_stateless/01214_point_in_Mecca.reference
+%%DATADIR%%-test/queries/0_stateless/01281_unsucceeded_insert_select_queries_counter.reference
+%%DATADIR%%-test/queries/0_stateless/00752_low_cardinality_left_array_join.sql
+%%DATADIR%%-test/queries/0_stateless/00718_low_cardinaliry_alter.reference
+%%DATADIR%%-test/queries/0_stateless/00918_json_functions.sql
+%%DATADIR%%-test/queries/0_stateless/01018_ip_dictionary_long.reference
+%%DATADIR%%-test/queries/0_stateless/00753_alter_destination_for_storage_buffer.sql
+%%DATADIR%%-test/queries/0_stateless/00694_max_block_size_zero.reference
+%%DATADIR%%-test/queries/0_stateless/00157_aliases_and_lambda_formal_parameters.reference
+%%DATADIR%%-test/queries/0_stateless/00825_http_header_query_id.reference
+%%DATADIR%%-test/queries/0_stateless/01759_dictionary_unique_attribute_names.reference
+%%DATADIR%%-test/queries/0_stateless/00909_kill_not_initialized_query.sh
+%%DATADIR%%-test/queries/0_stateless/01601_custom_tld.reference
+%%DATADIR%%-test/queries/0_stateless/01548_parallel_parsing_max_memory.reference
+%%DATADIR%%-test/queries/0_stateless/00936_crc_functions.sql
+%%DATADIR%%-test/queries/0_stateless/01278_variance_nonnegative.reference
+%%DATADIR%%-test/queries/0_stateless/00098_k_union_all.sql
+%%DATADIR%%-test/queries/0_stateless/01267_alter_default_key_columns_zookeeper_long.sql
 %%DATADIR%%-test/queries/0_stateless/01375_null_issue_3767.reference
-%%DATADIR%%-test/queries/0_stateless/01375_null_issue_3767.sql
-%%DATADIR%%-test/queries/0_stateless/01375_output_format_tsv_csv_with_names.reference
-%%DATADIR%%-test/queries/0_stateless/01375_output_format_tsv_csv_with_names.sh
-%%DATADIR%%-test/queries/0_stateless/01375_storage_file_tsv_csv_with_names_write_prefix.reference
-%%DATADIR%%-test/queries/0_stateless/01375_storage_file_tsv_csv_with_names_write_prefix.sh
-%%DATADIR%%-test/queries/0_stateless/01375_storage_file_write_prefix_csv_with_names.reference
-%%DATADIR%%-test/queries/0_stateless/01375_storage_file_write_prefix_csv_with_names.sql
-%%DATADIR%%-test/queries/0_stateless/01375_storage_file_write_prefix_tsv_with_names.reference
-%%DATADIR%%-test/queries/0_stateless/01375_storage_file_write_prefix_tsv_with_names.sql
+%%DATADIR%%-test/queries/0_stateless/00037_totals_limit.reference
+%%DATADIR%%-test/queries/0_stateless/01817_storage_buffer_parameters.reference
+%%DATADIR%%-test/queries/0_stateless/01734_datetime64_from_float.reference
+%%DATADIR%%-test/queries/0_stateless/01198_plus_inf.reference
+%%DATADIR%%-test/queries/0_stateless/00942_mutate_index.reference
+%%DATADIR%%-test/queries/0_stateless/01010_partial_merge_join_const_and_lc.sql
+%%DATADIR%%-test/queries/0_stateless/01606_merge_from_wide_to_compact.sql
+%%DATADIR%%-test/queries/0_stateless/01043_h3_edge_length_m.reference
+%%DATADIR%%-test/queries/0_stateless/01493_alter_remove_no_property_zookeeper_long.reference
+%%DATADIR%%-test/queries/0_stateless/01676_reinterpret_as.sql
+%%DATADIR%%-test/queries/0_stateless/02101_sql_user_defined_functions_drop_if_exists.sql
+%%DATADIR%%-test/queries/0_stateless/00103_ipv4_num_to_string_class_c.sql
+%%DATADIR%%-test/queries/0_stateless/00905_compile_expressions_compare_big_dates.reference
+%%DATADIR%%-test/queries/0_stateless/01637_nullable_fuzz3.sql
+%%DATADIR%%-test/queries/0_stateless/01532_primary_key_without_order_by_zookeeper.reference
+%%DATADIR%%-test/queries/0_stateless/00961_visit_param_buffer_underflow.reference
+%%DATADIR%%-test/queries/0_stateless/00626_replace_partition_from_table_zookeeper.sh
+%%DATADIR%%-test/queries/0_stateless/01900_kill_mutation_parallel_long.sh
+%%DATADIR%%-test/queries/0_stateless/01933_client_replxx_convert_history.reference
+%%DATADIR%%-test/queries/0_stateless/01705_normalize_case_insensitive_function_names.reference
+%%DATADIR%%-test/queries/0_stateless/02021_exponential_sum.reference
+%%DATADIR%%-test/queries/0_stateless/01324_settings_documentation.sql
+%%DATADIR%%-test/queries/0_stateless/00752_low_cardinality_left_array_join.reference
+%%DATADIR%%-test/queries/0_stateless/01440_big_int_exotic_casts.reference
+%%DATADIR%%-test/queries/0_stateless/00099_join_many_blocks_segfault.sql
+%%DATADIR%%-test/queries/0_stateless/01201_read_single_thread_in_order.reference
+%%DATADIR%%-test/queries/0_stateless/01766_hashed_dictionary_complex_key.sql
+%%DATADIR%%-test/queries/0_stateless/01010_partial_merge_join_const_and_lc.reference
+%%DATADIR%%-test/queries/0_stateless/02124_comparison_betwwen_decimal_and_float.reference
+%%DATADIR%%-test/queries/0_stateless/01852_cast_operator_2.reference
+%%DATADIR%%-test/queries/0_stateless/01681_bloom_filter_nullable_column.sql
+%%DATADIR%%-test/queries/0_stateless/01430_moving_sum_empty_state.reference
+%%DATADIR%%-test/queries/0_stateless/01787_arena_assert_column_nothing.sql
+%%DATADIR%%-test/queries/0_stateless/01059_storage_file_compression.sh
+%%DATADIR%%-test/queries/0_stateless/00558_parse_floats.sql
+%%DATADIR%%-test/queries/0_stateless/00539_functions_for_working_with_json.sql
+%%DATADIR%%-test/queries/0_stateless/01635_nullable_fuzz.sql
+%%DATADIR%%-test/queries/0_stateless/01114_clear_column_compact_parts.sql
+%%DATADIR%%-test/queries/0_stateless/00284_external_aggregation.reference
+%%DATADIR%%-test/queries/0_stateless/02024_compression_in_query.reference
+%%DATADIR%%-test/queries/0_stateless/00072_in_types.sql
+%%DATADIR%%-test/queries/0_stateless/00317_in_tuples_and_out_of_range_values.sql
 %%DATADIR%%-test/queries/0_stateless/01376_GROUP_BY_injective_elimination_dictGet.reference
-%%DATADIR%%-test/queries/0_stateless/01376_GROUP_BY_injective_elimination_dictGet.sql
-%%DATADIR%%-test/queries/0_stateless/01376_array_fill_empty.reference
-%%DATADIR%%-test/queries/0_stateless/01376_array_fill_empty.sql
-%%DATADIR%%-test/queries/0_stateless/01376_null_logical.reference
-%%DATADIR%%-test/queries/0_stateless/01376_null_logical.sql
-%%DATADIR%%-test/queries/0_stateless/01377_supertype_low_cardinality.reference
-%%DATADIR%%-test/queries/0_stateless/01377_supertype_low_cardinality.sql
-%%DATADIR%%-test/queries/0_stateless/01378_alter_rename_with_ttl_zookeeper.reference
-%%DATADIR%%-test/queries/0_stateless/01378_alter_rename_with_ttl_zookeeper.sql
-%%DATADIR%%-test/queries/0_stateless/01379_with_fill_several_columns.reference
-%%DATADIR%%-test/queries/0_stateless/01379_with_fill_several_columns.sql
-%%DATADIR%%-test/queries/0_stateless/01380_coded_delta_exception_code.reference
-%%DATADIR%%-test/queries/0_stateless/01380_coded_delta_exception_code.sql
-%%DATADIR%%-test/queries/0_stateless/01380_nullable_state.reference
-%%DATADIR%%-test/queries/0_stateless/01380_nullable_state.sql
-%%DATADIR%%-test/queries/0_stateless/01381_for_each_with_states.reference
-%%DATADIR%%-test/queries/0_stateless/01381_for_each_with_states.sql
-%%DATADIR%%-test/queries/0_stateless/01383_log_broken_table.reference
-%%DATADIR%%-test/queries/0_stateless/01383_log_broken_table.sh
-%%DATADIR%%-test/queries/0_stateless/01383_remote_ambiguous_column_shard.reference
-%%DATADIR%%-test/queries/0_stateless/01383_remote_ambiguous_column_shard.sql
-%%DATADIR%%-test/queries/0_stateless/01384_bloom_filter_bad_arguments.reference
-%%DATADIR%%-test/queries/0_stateless/01384_bloom_filter_bad_arguments.sql
-%%DATADIR%%-test/queries/0_stateless/01385_not_function.reference
-%%DATADIR%%-test/queries/0_stateless/01385_not_function.sql
-%%DATADIR%%-test/queries/0_stateless/01386_negative_float_constant_key_condition.reference
-%%DATADIR%%-test/queries/0_stateless/01386_negative_float_constant_key_condition.sql
-%%DATADIR%%-test/queries/0_stateless/01387_clear_column_default_depends.reference
-%%DATADIR%%-test/queries/0_stateless/01387_clear_column_default_depends.sql
-%%DATADIR%%-test/queries/0_stateless/01388_clear_all_columns.reference
-%%DATADIR%%-test/queries/0_stateless/01388_clear_all_columns.sql
-%%DATADIR%%-test/queries/0_stateless/01388_multi_if_optimization.reference
-%%DATADIR%%-test/queries/0_stateless/01388_multi_if_optimization.sql
-%%DATADIR%%-test/queries/0_stateless/01389_filter_by_virtual_columns.reference
-%%DATADIR%%-test/queries/0_stateless/01389_filter_by_virtual_columns.sql
-%%DATADIR%%-test/queries/0_stateless/01390_check_table_codec.reference
-%%DATADIR%%-test/queries/0_stateless/01390_check_table_codec.sql
-%%DATADIR%%-test/queries/0_stateless/01390_remove_injective_in_uniq.reference
-%%DATADIR%%-test/queries/0_stateless/01390_remove_injective_in_uniq.sql
-%%DATADIR%%-test/queries/0_stateless/01391_join_on_dict_crash.reference
-%%DATADIR%%-test/queries/0_stateless/01391_join_on_dict_crash.sql
-%%DATADIR%%-test/queries/0_stateless/01391_limit_overflow.reference
-%%DATADIR%%-test/queries/0_stateless/01391_limit_overflow.sql
-%%DATADIR%%-test/queries/0_stateless/01392_column_resolve.reference
-%%DATADIR%%-test/queries/0_stateless/01392_column_resolve.sql
-%%DATADIR%%-test/queries/0_stateless/01393_benchmark_secure_port.reference
-%%DATADIR%%-test/queries/0_stateless/01393_benchmark_secure_port.sh
-%%DATADIR%%-test/queries/0_stateless/01395_limit_more_cases.reference
-%%DATADIR%%-test/queries/0_stateless/01395_limit_more_cases.sh
-%%DATADIR%%-test/queries/0_stateless/01396_inactive_replica_cleanup_nodes_zookeeper.reference
-%%DATADIR%%-test/queries/0_stateless/01396_inactive_replica_cleanup_nodes_zookeeper.sh
-%%DATADIR%%-test/queries/0_stateless/01396_low_cardinality_fixed_string_default.reference
-%%DATADIR%%-test/queries/0_stateless/01396_low_cardinality_fixed_string_default.sql
-%%DATADIR%%-test/queries/0_stateless/01396_negative_datetime_saturate_to_zero.reference
-%%DATADIR%%-test/queries/0_stateless/01396_negative_datetime_saturate_to_zero.sql
+%%DATADIR%%-test/queries/0_stateless/01070_h3_to_children.reference
+%%DATADIR%%-test/queries/0_stateless/01415_overlimiting_threads_for_repica_bug.sql
+%%DATADIR%%-test/queries/0_stateless/01117_greatest_least_case.reference
+%%DATADIR%%-test/queries/0_stateless/01532_min_max_with_modifiers.reference
+%%DATADIR%%-test/queries/0_stateless/01460_allow_dollar_and_number_in_identifier.reference
+%%DATADIR%%-test/queries/0_stateless/01015_insert_values_parametrized.sh
+%%DATADIR%%-test/queries/0_stateless/00083_create_merge_tree_zookeeper_long.sql
+%%DATADIR%%-test/queries/0_stateless/00529_orantius.sql
+%%DATADIR%%-test/queries/0_stateless/01921_with_fill_with_totals.reference
+%%DATADIR%%-test/queries/0_stateless/00531_aggregate_over_nullable.reference
+%%DATADIR%%-test/queries/0_stateless/00834_date_datetime_cmp.reference
+%%DATADIR%%-test/queries/0_stateless/00837_minmax_index_replicated_zookeeper_long.reference
+%%DATADIR%%-test/queries/0_stateless/01033_substr_negative_size_arg.reference
+%%DATADIR%%-test/queries/0_stateless/01945_system_warnings.sh
+%%DATADIR%%-test/queries/0_stateless/00076_ip_coding_functions.reference
+%%DATADIR%%-test/queries/0_stateless/02041_openssl_hash_functions_test.sql
+%%DATADIR%%-test/queries/0_stateless/00210_insert_select_extremes_http.sh
+%%DATADIR%%-test/queries/0_stateless/01144_multiword_data_types.sql
+%%DATADIR%%-test/queries/0_stateless/00591_columns_removal_union_all.sql
+%%DATADIR%%-test/queries/0_stateless/00751_default_databasename_for_view.reference
+%%DATADIR%%-test/queries/0_stateless/00616_final_single_part.reference
+%%DATADIR%%-test/queries/0_stateless/00963_temporary_live_view_watch_live_timeout.reference
+%%DATADIR%%-test/queries/0_stateless/00955_test_final_mark.sql
+%%DATADIR%%-test/queries/0_stateless/00976_system_stop_ttl_merges.sql
+%%DATADIR%%-test/queries/0_stateless/01076_parallel_alter_replicated_zookeeper.sh
 %%DATADIR%%-test/queries/0_stateless/01397_in_bad_arguments.reference
-%%DATADIR%%-test/queries/0_stateless/01397_in_bad_arguments.sql
-%%DATADIR%%-test/queries/0_stateless/01398_any_with_alias.reference
-%%DATADIR%%-test/queries/0_stateless/01398_any_with_alias.sql
-%%DATADIR%%-test/queries/0_stateless/01398_in_tuple_func.reference
-%%DATADIR%%-test/queries/0_stateless/01398_in_tuple_func.sql
+%%DATADIR%%-test/queries/0_stateless/01681_cache_dictionary_simple_key.reference
+%%DATADIR%%-test/queries/0_stateless/00877_memory_limit_for_new_delete.sql
+%%DATADIR%%-test/queries/0_stateless/01764_prefer_column_name_to_alias.reference
+%%DATADIR%%-test/queries/0_stateless/01250_fixed_string_comparison.reference
+%%DATADIR%%-test/queries/0_stateless/01558_ttest_scipy.reference
+%%DATADIR%%-test/queries/0_stateless/02111_json_column_name_encoding.reference
+%%DATADIR%%-test/queries/0_stateless/01234_to_string_monotonic.reference
+%%DATADIR%%-test/queries/0_stateless/00534_functions_bad_arguments7.sh
+%%DATADIR%%-test/queries/0_stateless/00642_cast.reference
+%%DATADIR%%-test/queries/0_stateless/00041_aggregation_remap.sql
+%%DATADIR%%-test/queries/0_stateless/00080_show_tables_and_system_tables.sql
+%%DATADIR%%-test/queries/0_stateless/00015_totals_having_constants.sql
+%%DATADIR%%-test/queries/0_stateless/01250_fixed_string_comparison.sql
+%%DATADIR%%-test/queries/0_stateless/01774_tuple_null_in.reference
+%%DATADIR%%-test/queries/0_stateless/00543_null_and_prewhere.sql
+%%DATADIR%%-test/queries/0_stateless/01913_summing_mt_and_simple_agg_function_with_lc.sql
+%%DATADIR%%-test/queries/0_stateless/02113_format_row.sql
+%%DATADIR%%-test/queries/0_stateless/01436_storage_merge_with_join_push_down.sql
+%%DATADIR%%-test/queries/0_stateless/00950_dict_get.reference
+%%DATADIR%%-test/queries/0_stateless/00331_final_and_prewhere.reference
+%%DATADIR%%-test/queries/0_stateless/01511_different_expression_with_same_alias.reference
+%%DATADIR%%-test/queries/0_stateless/01720_join_implicit_cast.reference.j2
+%%DATADIR%%-test/queries/0_stateless/01710_projection_group_by_order_by.sql
+%%DATADIR%%-test/queries/0_stateless/01472_toStartOfInterval_disallow_empty_tz_field.reference
+%%DATADIR%%-test/queries/0_stateless/01931_storage_merge_no_columns.sql
 %%DATADIR%%-test/queries/0_stateless/01399_http_request_headers.reference
-%%DATADIR%%-test/queries/0_stateless/01399_http_request_headers.sh
-%%DATADIR%%-test/queries/0_stateless/01400_join_get_with_multi_keys.reference
-%%DATADIR%%-test/queries/0_stateless/01400_join_get_with_multi_keys.sql
-%%DATADIR%%-test/queries/0_stateless/01401_FORMAT_SETTINGS.reference
-%%DATADIR%%-test/queries/0_stateless/01401_FORMAT_SETTINGS.sh
-%%DATADIR%%-test/queries/0_stateless/01402_cast_nullable_string_to_enum.reference
-%%DATADIR%%-test/queries/0_stateless/01402_cast_nullable_string_to_enum.sql
-%%DATADIR%%-test/queries/0_stateless/01403_datetime64_constant_arg.reference
-%%DATADIR%%-test/queries/0_stateless/01403_datetime64_constant_arg.sql
-%%DATADIR%%-test/queries/0_stateless/01404_roundUpToPowerOfTwoOrZero_safety.reference
-%%DATADIR%%-test/queries/0_stateless/01404_roundUpToPowerOfTwoOrZero_safety.sql
-%%DATADIR%%-test/queries/0_stateless/01406_carriage_return_in_tsv_csv.reference
-%%DATADIR%%-test/queries/0_stateless/01406_carriage_return_in_tsv_csv.sh
-%%DATADIR%%-test/queries/0_stateless/01407_lambda_arrayJoin.reference
-%%DATADIR%%-test/queries/0_stateless/01407_lambda_arrayJoin.sql
-%%DATADIR%%-test/queries/0_stateless/01408_range_overflow.reference
-%%DATADIR%%-test/queries/0_stateless/01408_range_overflow.sql
-%%DATADIR%%-test/queries/0_stateless/01409_topK_merge.reference
+%%DATADIR%%-test/queries/0_stateless/00558_aggregate_merge_totals_with_arenas.sql
+%%DATADIR%%-test/queries/0_stateless/01517_select_final_distributed.reference
+%%DATADIR%%-test/queries/0_stateless/01650_any_null_if.reference
+%%DATADIR%%-test/queries/0_stateless/01384_bloom_filter_bad_arguments.reference
+%%DATADIR%%-test/queries/0_stateless/00700_decimal_gathers.reference
+%%DATADIR%%-test/queries/0_stateless/00907_set_index_max_rows.reference
+%%DATADIR%%-test/queries/0_stateless/00599_create_view_with_subquery.reference
+%%DATADIR%%-test/queries/0_stateless/01506_buffer_table_alter_block_structure_2.sql
+%%DATADIR%%-test/queries/0_stateless/01513_optimize_aggregation_in_order_memory_long.sql
+%%DATADIR%%-test/queries/0_stateless/01284_fuzz_bits.sql
+%%DATADIR%%-test/queries/0_stateless/02023_parser_number_binary_literal.sql
+%%DATADIR%%-test/queries/0_stateless/01460_line_as_string_format.reference
+%%DATADIR%%-test/queries/0_stateless/02149_external_schema_inference.reference
+%%DATADIR%%-test/queries/0_stateless/01162_strange_mutations.reference
+%%DATADIR%%-test/queries/0_stateless/00255_array_concat_string.reference
+%%DATADIR%%-test/queries/0_stateless/01428_h3_range_check.reference
+%%DATADIR%%-test/queries/0_stateless/00330_view_subqueries.sql
+%%DATADIR%%-test/queries/0_stateless/02129_add_column_add_ttl.sql
+%%DATADIR%%-test/queries/0_stateless/00516_modulo.sql
+%%DATADIR%%-test/queries/0_stateless/01502_log_tinylog_deadlock_race.sh
+%%DATADIR%%-test/queries/0_stateless/00900_long_parquet_load.sh
+%%DATADIR%%-test/queries/0_stateless/01720_union_distinct_with_limit.sql
+%%DATADIR%%-test/queries/0_stateless/00578_merge_table_and_table_virtual_column.sql
+%%DATADIR%%-test/queries/0_stateless/01658_values_ubsan.reference
+%%DATADIR%%-test/queries/0_stateless/01765_tehran_dst.reference
+%%DATADIR%%-test/queries/0_stateless/01278_min_insert_block_size_rows_for_materialized_views.reference
+%%DATADIR%%-test/queries/0_stateless/01313_parse_date_time_best_effort_null_zero.sql
+%%DATADIR%%-test/queries/0_stateless/00653_verification_monotonic_data_load.sh
+%%DATADIR%%-test/queries/0_stateless/02128_wait_end_of_query_fix.sh
+%%DATADIR%%-test/queries/0_stateless/01423_if_nullable_cond.reference
+%%DATADIR%%-test/queries/0_stateless/01042_h3_k_ring.reference
+%%DATADIR%%-test/queries/0_stateless/01079_reinterpret_as_fixed_string.reference
+%%DATADIR%%-test/queries/0_stateless/01069_database_memory.reference
+%%DATADIR%%-test/queries/0_stateless/02160_h3_rads_to_degs_degs_to_rads.reference
+%%DATADIR%%-test/queries/0_stateless/01010_low_cardinality_and_native_http.reference
+%%DATADIR%%-test/queries/0_stateless/01683_text_log_deadlock.sh
+%%DATADIR%%-test/queries/0_stateless/01903_ssd_cache_dictionary_array_type.sh
+%%DATADIR%%-test/queries/0_stateless/00804_test_alter_compression_codecs.reference
+%%DATADIR%%-test/queries/0_stateless/01079_reinterpret_as_fixed_string.sql
+%%DATADIR%%-test/queries/0_stateless/00752_low_cardinality_lambda_argument.sql
+%%DATADIR%%-test/queries/0_stateless/00900_orc_arrow_parquet_nested.reference
+%%DATADIR%%-test/queries/0_stateless/01416_clear_column_pk.sql
+%%DATADIR%%-test/queries/0_stateless/00185_array_literals.reference
+%%DATADIR%%-test/queries/0_stateless/01867_fix_storage_memory_mutation.reference
+%%DATADIR%%-test/queries/0_stateless/01670_distributed_bytes_to_throw_insert.reference
+%%DATADIR%%-test/queries/0_stateless/01346_array_join_mrxotey.sql
+%%DATADIR%%-test/queries/0_stateless/02003_WithMergeableStateAfterAggregationAndLimit_LIMIT_BY_LIMIT_OFFSET.sql
+%%DATADIR%%-test/queries/0_stateless/00344_row_number_in_all_blocks.reference
+%%DATADIR%%-test/queries/0_stateless/01674_clickhouse_client_query_param_cte.reference
+%%DATADIR%%-test/queries/0_stateless/01076_range_reader_segfault.reference
+%%DATADIR%%-test/queries/0_stateless/01872_functions_to_subcolumns.sql
+%%DATADIR%%-test/queries/0_stateless/00991_live_view_watch_event_live.python
+%%DATADIR%%-test/queries/0_stateless/00564_temporary_table_management.sql
+%%DATADIR%%-test/queries/0_stateless/02124_json_each_row_with_progress.sh
+%%DATADIR%%-test/queries/0_stateless/00933_ttl_replicated_zookeeper_long.reference
+%%DATADIR%%-test/queries/0_stateless/01463_resample_overflow.sql
+%%DATADIR%%-test/queries/0_stateless/01601_proxy_protocol.sh
+%%DATADIR%%-test/queries/0_stateless/00492_drop_temporary_table.reference
+%%DATADIR%%-test/queries/0_stateless/00973_live_view_with_subquery_select_join_no_alias.sql
+%%DATADIR%%-test/queries/0_stateless/02103_sql_user_defined_functions_composition.sql
+%%DATADIR%%-test/queries/0_stateless/01019_materialized_view_select_extra_columns.sql
+%%DATADIR%%-test/queries/0_stateless/01735_to_datetime64.reference
+%%DATADIR%%-test/queries/0_stateless/00939_test_null_in.reference
+%%DATADIR%%-test/queries/0_stateless/00957_format_with_clashed_aliases.sh
+%%DATADIR%%-test/queries/0_stateless/01720_country_intersection.reference
+%%DATADIR%%-test/queries/0_stateless/01851_fix_row_policy_empty_result.reference
+%%DATADIR%%-test/queries/0_stateless/00980_merge_alter_settings.reference
+%%DATADIR%%-test/queries/0_stateless/02006_use_constants_in_with_and_select.sql
+%%DATADIR%%-test/queries/0_stateless/02124_empty_uuid.sql
+%%DATADIR%%-test/queries/0_stateless/01765_move_to_table_overlapping_block_number.reference
+%%DATADIR%%-test/queries/0_stateless/02136_scalar_progress.sh
+%%DATADIR%%-test/queries/0_stateless/01809_inactive_parts_to_delay_throw_insert.sql
+%%DATADIR%%-test/queries/0_stateless/00440_nulls_merge_tree.sql
+%%DATADIR%%-test/queries/0_stateless/00423_storage_log_single_thread.sql
+%%DATADIR%%-test/queries/0_stateless/02116_clickhouse_stderr.sh
+%%DATADIR%%-test/queries/0_stateless/00810_in_operators_segfault.sql
+%%DATADIR%%-test/queries/0_stateless/01056_create_table_as.sql
+%%DATADIR%%-test/queries/0_stateless/01666_blns_long.sql
+%%DATADIR%%-test/queries/0_stateless/00504_insert_miss_columns.sh
+%%DATADIR%%-test/queries/0_stateless/01004_rename_deadlock.sh
+%%DATADIR%%-test/queries/0_stateless/01304_polygons_sym_difference.sql
+%%DATADIR%%-test/queries/0_stateless/01080_join_get_null.reference
+%%DATADIR%%-test/queries/0_stateless/02001_select_with_filter.sql
+%%DATADIR%%-test/queries/0_stateless/01660_join_or_all.reference
+%%DATADIR%%-test/queries/0_stateless/00375_shard_group_uniq_array_of_string.sql
+%%DATADIR%%-test/queries/0_stateless/01778_test_LowCardinality_FixedString_pk.sql
+%%DATADIR%%-test/queries/0_stateless/02100_now64_types_bug.reference
+%%DATADIR%%-test/queries/0_stateless/01030_final_mark_empty_primary_key.sql
+%%DATADIR%%-test/queries/0_stateless/01836_date_time_keep_default_timezone_on_operations_den_crane.reference
+%%DATADIR%%-test/queries/0_stateless/01509_parallel_quorum_and_merge_long.sh
+%%DATADIR%%-test/queries/0_stateless/01036_no_superfluous_dict_reload_on_create_database_2.reference
+%%DATADIR%%-test/queries/0_stateless/01942_create_table_with_sample.sql
+%%DATADIR%%-test/queries/0_stateless/country_rings.tsv
+%%DATADIR%%-test/queries/0_stateless/01921_datatype_date32.sql
+%%DATADIR%%-test/queries/0_stateless/00952_basic_constraints.reference
+%%DATADIR%%-test/queries/0_stateless/01134_max_rows_to_group_by.sql
+%%DATADIR%%-test/queries/0_stateless/01021_only_tuple_columns.reference
+%%DATADIR%%-test/queries/0_stateless/01045_bloom_filter_null_array.reference
+%%DATADIR%%-test/queries/0_stateless/00823_capnproto_input.sh
+%%DATADIR%%-test/queries/0_stateless/00973_live_view_with_subquery_select.sql
+%%DATADIR%%-test/queries/0_stateless/01600_parts_types_metrics_long.sh
+%%DATADIR%%-test/queries/0_stateless/01939_network_receive_bytes_metrics.sh
+%%DATADIR%%-test/queries/0_stateless/01293_create_role.sql
+%%DATADIR%%-test/queries/0_stateless/01307_bloom_filter_index_string_multi_granulas.reference
 %%DATADIR%%-test/queries/0_stateless/01409_topK_merge.sql
-%%DATADIR%%-test/queries/0_stateless/01410_nullable_key.reference
-%%DATADIR%%-test/queries/0_stateless/01410_nullable_key.sql
-%%DATADIR%%-test/queries/0_stateless/01411_bayesian_ab_testing.reference
-%%DATADIR%%-test/queries/0_stateless/01411_bayesian_ab_testing.sql
-%%DATADIR%%-test/queries/0_stateless/01411_from_unixtime.reference
-%%DATADIR%%-test/queries/0_stateless/01411_from_unixtime.sql
-%%DATADIR%%-test/queries/0_stateless/01411_xor_itai_shirav.reference
-%%DATADIR%%-test/queries/0_stateless/01411_xor_itai_shirav.sql
-%%DATADIR%%-test/queries/0_stateless/01412_cache_dictionary_race.reference
-%%DATADIR%%-test/queries/0_stateless/01412_cache_dictionary_race.sh
+%%DATADIR%%-test/queries/0_stateless/01621_bar_nan_arguments.sql
+%%DATADIR%%-test/queries/0_stateless/01889_postgresql_protocol_null_fields.reference
+%%DATADIR%%-test/queries/0_stateless/01773_case_sensitive_version.reference
+%%DATADIR%%-test/queries/0_stateless/01600_benchmark_query.sh
+%%DATADIR%%-test/queries/0_stateless/01456_modify_column_type_via_add_drop_update.reference
+%%DATADIR%%-test/queries/0_stateless/01396_inactive_replica_cleanup_nodes_zookeeper.sh
+%%DATADIR%%-test/queries/0_stateless/01410_nullable_key_and_index_negate_cond.reference
+%%DATADIR%%-test/queries/0_stateless/00874_issue_3495.sql
+%%DATADIR%%-test/queries/0_stateless/00838_system_tables_drop_table_race.sh
+%%DATADIR%%-test/queries/0_stateless/01746_executable_pool_dictionary.sql
+%%DATADIR%%-test/queries/0_stateless/01590_countSubstrings.reference
+%%DATADIR%%-test/queries/0_stateless/00314_sample_factor_virtual_column.reference
+%%DATADIR%%-test/queries/0_stateless/02122_join_group_by_timeout.reference
+%%DATADIR%%-test/queries/0_stateless/00563_shard_insert_into_remote.reference
+%%DATADIR%%-test/queries/0_stateless/00900_long_parquet_load.reference
+%%DATADIR%%-test/queries/0_stateless/00228_shard_quantiles_deterministic_merge_overflow.sql
+%%DATADIR%%-test/queries/0_stateless/00975_json_hang.sql
+%%DATADIR%%-test/queries/0_stateless/01161_information_schema.reference
+%%DATADIR%%-test/queries/0_stateless/01031_pmj_new_any_semi_join.reference
+%%DATADIR%%-test/queries/0_stateless/00688_low_cardinality_prewhere.reference
+%%DATADIR%%-test/queries/0_stateless/01505_trivial_count_with_partition_predicate.reference
+%%DATADIR%%-test/queries/0_stateless/01213_optimize_skip_unused_shards_DISTINCT.reference
+%%DATADIR%%-test/queries/0_stateless/00943_materialize_index.reference
+%%DATADIR%%-test/queries/0_stateless/01720_type_map_and_casts.sql
+%%DATADIR%%-test/queries/0_stateless/01085_regexp_input_format.reference
+%%DATADIR%%-test/queries/0_stateless/00743_limit_by_not_found_column.reference
+%%DATADIR%%-test/queries/0_stateless/01060_avro.reference
+%%DATADIR%%-test/queries/0_stateless/01521_format_readable_time_delta2.sql
+%%DATADIR%%-test/queries/0_stateless/01114_alter_modify_compact_parts.reference
+%%DATADIR%%-test/queries/0_stateless/01018_ddl_dictionaries_bad_queries.sh
+%%DATADIR%%-test/queries/0_stateless/00055_join_two_numbers.sql
+%%DATADIR%%-test/queries/0_stateless/01189_create_as_table_as_table_function.sql
+%%DATADIR%%-test/queries/0_stateless/02017_order_by_with_fill_redundant_functions.reference
+%%DATADIR%%-test/queries/0_stateless/00370_duplicate_columns_in_subqueries.reference
+%%DATADIR%%-test/queries/0_stateless/01669_test_toYear_mysql_dialect.reference
+%%DATADIR%%-test/queries/0_stateless/01802_toDateTime64_large_values.sql
+%%DATADIR%%-test/queries/0_stateless/01681_arg_min_max_if_fix.reference
+%%DATADIR%%-test/queries/0_stateless/02111_with_fill_no_rows.sql
+%%DATADIR%%-test/queries/0_stateless/01375_output_format_tsv_csv_with_names.reference
+%%DATADIR%%-test/queries/0_stateless/01498_alter_column_storage_memory.reference
+%%DATADIR%%-test/queries/0_stateless/01955_clickhouse_benchmark_connection_hang.sh
+%%DATADIR%%-test/queries/0_stateless/00305_http_and_readonly.sh
+%%DATADIR%%-test/queries/0_stateless/00338_replicate_array_of_strings.sql
+%%DATADIR%%-test/queries/0_stateless/02009_decimal_no_trailing_zeros.sql
+%%DATADIR%%-test/queries/0_stateless/00098_k_union_all.reference
+%%DATADIR%%-test/queries/0_stateless/01710_projection_vertical_merges.sql
+%%DATADIR%%-test/queries/0_stateless/00169_join_constant_keys.reference
+%%DATADIR%%-test/queries/0_stateless/01427_pk_and_expression_with_different_type.reference
+%%DATADIR%%-test/queries/0_stateless/01521_distributed_query_hang.sql
+%%DATADIR%%-test/queries/0_stateless/00271_agg_state_and_totals.reference
+%%DATADIR%%-test/queries/0_stateless/01904_ssd_cache_dictionary_default_nullable_type.reference
 %%DATADIR%%-test/queries/0_stateless/01412_group_array_moving_shard.reference
-%%DATADIR%%-test/queries/0_stateless/01412_group_array_moving_shard.sql
-%%DATADIR%%-test/queries/0_stateless/01412_mod_float.reference
-%%DATADIR%%-test/queries/0_stateless/01412_mod_float.sql
-%%DATADIR%%-test/queries/0_stateless/01412_optimize_deduplicate_bug.reference
-%%DATADIR%%-test/queries/0_stateless/01412_optimize_deduplicate_bug.sql
+%%DATADIR%%-test/queries/0_stateless/02099_tsv_raw_format.sh
+%%DATADIR%%-test/queries/0_stateless/01258_bom_tsv.sh
+%%DATADIR%%-test/queries/0_stateless/01213_alter_rename_column_zookeeper_long.reference
+%%DATADIR%%-test/queries/0_stateless/01621_summap_check_types.reference
+%%DATADIR%%-test/queries/0_stateless/02005_log_formatted_queries.sql
+%%DATADIR%%-test/queries/0_stateless/00902_entropy.reference
+%%DATADIR%%-test/queries/0_stateless/01085_max_distributed_connections_http.reference
+%%DATADIR%%-test/queries/0_stateless/01958_partial_hour_timezone.sql
+%%DATADIR%%-test/queries/0_stateless/00534_functions_bad_arguments2.reference
+%%DATADIR%%-test/queries/0_stateless/01457_order_by_limit.reference
+%%DATADIR%%-test/queries/0_stateless/00753_with_with_single_alias.reference
+%%DATADIR%%-test/queries/0_stateless/01645_system_table_engines.sql
+%%DATADIR%%-test/queries/0_stateless/01305_duplicate_order_by_and_distinct.reference
+%%DATADIR%%-test/queries/0_stateless/01081_PartialSortingTransform_full_column.reference
+%%DATADIR%%-test/queries/0_stateless/00093_union_race_conditions_4.sh
+%%DATADIR%%-test/queries/0_stateless/00446_clear_column_in_partition_concurrent_zookeeper.reference
+%%DATADIR%%-test/queries/0_stateless/00444_join_use_nulls.reference
+%%DATADIR%%-test/queries/0_stateless/01654_test_writer_block_sequence.reference
+%%DATADIR%%-test/queries/0_stateless/01193_metadata_loading.sh
+%%DATADIR%%-test/queries/0_stateless/01306_benchmark_json.reference
+%%DATADIR%%-test/queries/0_stateless/01686_rocksdb.sql
+%%DATADIR%%-test/queries/0_stateless/01511_prewhere_with_virtuals.sql
+%%DATADIR%%-test/queries/0_stateless/01593_concurrent_alter_mutations_kill_many_replicas_long.sh
+%%DATADIR%%-test/queries/0_stateless/01746_lc_values_format_bug.reference
+%%DATADIR%%-test/queries/0_stateless/00140_parse_unix_timestamp_as_datetime.reference
+%%DATADIR%%-test/queries/0_stateless/00953_moving_functions.sql
+%%DATADIR%%-test/queries/0_stateless/00963_temporary_live_view_watch_live_timeout.py.disabled
 %%DATADIR%%-test/queries/0_stateless/01412_row_from_totals.reference
-%%DATADIR%%-test/queries/0_stateless/01412_row_from_totals.sql
-%%DATADIR%%-test/queries/0_stateless/01413_allow_non_metadata_alters.reference
-%%DATADIR%%-test/queries/0_stateless/01413_allow_non_metadata_alters.sql
-%%DATADIR%%-test/queries/0_stateless/01413_alter_update_supertype.reference
-%%DATADIR%%-test/queries/0_stateless/01413_alter_update_supertype.sql
-%%DATADIR%%-test/queries/0_stateless/01413_if_array_uuid.reference
-%%DATADIR%%-test/queries/0_stateless/01413_if_array_uuid.sql
-%%DATADIR%%-test/queries/0_stateless/01413_rows_events.reference
-%%DATADIR%%-test/queries/0_stateless/01413_rows_events.sql
-%%DATADIR%%-test/queries/0_stateless/01413_truncate_without_table_keyword.reference
-%%DATADIR%%-test/queries/0_stateless/01413_truncate_without_table_keyword.sql
-%%DATADIR%%-test/queries/0_stateless/01414_bloom_filter_index_with_const_column.reference
+%%DATADIR%%-test/queries/0_stateless/00451_left_array_join_and_constants.sql
+%%DATADIR%%-test/queries/0_stateless/00252_shard_global_in_aggregate_function.reference
+%%DATADIR%%-test/queries/0_stateless/01526_initial_query_id.sh
+%%DATADIR%%-test/queries/0_stateless/00012_array_join_alias_2.sql
+%%DATADIR%%-test/queries/0_stateless/02151_http_s_structure_set_eof.sh
+%%DATADIR%%-test/queries/0_stateless/00973_create_table_as_table_function.sql
+%%DATADIR%%-test/queries/0_stateless/00744_join_not_found_column.sql
+%%DATADIR%%-test/queries/0_stateless/01081_demangle.sql
+%%DATADIR%%-test/queries/0_stateless/01430_fix_any_rewrite_aliases.sql
+%%DATADIR%%-test/queries/0_stateless/00968_live_view_select_format_jsoneachrowwithprogress.reference
+%%DATADIR%%-test/queries/0_stateless/01895_jit_aggregation_function_avg_long.reference
+%%DATADIR%%-test/queries/0_stateless/00666_uniq_complex_types.reference
+%%DATADIR%%-test/queries/0_stateless/01293_show_settings.reference
+%%DATADIR%%-test/queries/0_stateless/01940_totimezone_operator_monotonicity.reference
+%%DATADIR%%-test/queries/0_stateless/01262_low_cardinality_remove.sql
+%%DATADIR%%-test/queries/0_stateless/01001_enums_in_in_section.sql
+%%DATADIR%%-test/queries/0_stateless/00927_asof_join_correct_bt.sql
+%%DATADIR%%-test/queries/0_stateless/00062_replicated_merge_tree_alter_zookeeper_long.sql
+%%DATADIR%%-test/queries/0_stateless/01470_test_insert_select_asterisk.reference
+%%DATADIR%%-test/queries/0_stateless/02029_orc_low_cardinality.sh
+%%DATADIR%%-test/queries/0_stateless/00688_case_without_else.sql
+%%DATADIR%%-test/queries/0_stateless/00836_indices_alter_replicated_zookeeper_long.sql
+%%DATADIR%%-test/queries/0_stateless/01125_generate_random_qoega.reference
+%%DATADIR%%-test/queries/0_stateless/01882_check_max_parts_to_merge_at_once.reference
+%%DATADIR%%-test/queries/0_stateless/02015_async_inserts_3.reference
+%%DATADIR%%-test/queries/0_stateless/01434_netloc_fuzz.sql
+%%DATADIR%%-test/queries/0_stateless/01710_normal_projection_fix1.sql
+%%DATADIR%%-test/queries/0_stateless/00961_temporary_live_view_watch.reference
+%%DATADIR%%-test/queries/0_stateless/01033_dictionaries_lifetime.sql
+%%DATADIR%%-test/queries/0_stateless/01273_lc_fixed_string_field.reference
+%%DATADIR%%-test/queries/0_stateless/00143_number_classification_functions.sql
+%%DATADIR%%-test/queries/0_stateless/00265_http_content_type_format_timezone.reference
+%%DATADIR%%-test/queries/0_stateless/00688_low_cardinality_defaults.sql
+%%DATADIR%%-test/queries/0_stateless/01487_distributed_in_not_default_db.reference
+%%DATADIR%%-test/queries/0_stateless/00312_position_case_insensitive_utf8.sql
+%%DATADIR%%-test/queries/0_stateless/01080_engine_merge_prewhere_tupleelement_error.sql
+%%DATADIR%%-test/queries/0_stateless/00974_final_predicate_push_down.sql
+%%DATADIR%%-test/queries/0_stateless/01458_count_digits.reference
+%%DATADIR%%-test/queries/0_stateless/02002_row_level_filter_bug.sh
+%%DATADIR%%-test/queries/0_stateless/00599_create_view_with_subquery.sql
+%%DATADIR%%-test/queries/0_stateless/01922_array_join_with_index.sql
+%%DATADIR%%-test/queries/0_stateless/00681_duplicate_columns_inside_union_all_stas_sviridov.reference
+%%DATADIR%%-test/queries/0_stateless/00668_compare_arrays_silviucpp.reference
+%%DATADIR%%-test/queries/0_stateless/01525_select_with_offset_fetch_clause.reference
+%%DATADIR%%-test/queries/0_stateless/00447_foreach_modifier.reference
+%%DATADIR%%-test/queries/0_stateless/01499_json_named_tuples.reference
+%%DATADIR%%-test/queries/0_stateless/02023_storage_filelog.reference
+%%DATADIR%%-test/queries/0_stateless/01632_select_all_syntax.reference
+%%DATADIR%%-test/queries/0_stateless/01854_HTTP_dict_decompression.reference
+%%DATADIR%%-test/queries/0_stateless/00991_live_view_watch_event_live.reference
+%%DATADIR%%-test/queries/0_stateless/01594_too_low_memory_limits.sh
+%%DATADIR%%-test/queries/0_stateless/02137_mv_into_join.reference
+%%DATADIR%%-test/queries/0_stateless/01070_h3_hex_area_m2.reference
+%%DATADIR%%-test/queries/0_stateless/01034_values_parse_float_bug.sh
+%%DATADIR%%-test/queries/0_stateless/01079_bit_operations_using_bitset.reference
+%%DATADIR%%-test/queries/0_stateless/00500_point_in_polygon_bug_3_linestring_rotation_precision.sql
+%%DATADIR%%-test/queries/0_stateless/00815_left_join_on_stepanel.sql
+%%DATADIR%%-test/queries/0_stateless/01765_hashed_dictionary_simple_key.sql
+%%DATADIR%%-test/queries/0_stateless/00411_long_accurate_number_comparison_float.sql
+%%DATADIR%%-test/queries/0_stateless/01010_partial_merge_join_negative.reference
+%%DATADIR%%-test/queries/0_stateless/00030_alter_table.sql
+%%DATADIR%%-test/queries/0_stateless/01920_not_chain_format.sql
+%%DATADIR%%-test/queries/0_stateless/01227_distributed_global_in_issue_2610.sql
+%%DATADIR%%-test/queries/0_stateless/00142_parse_timestamp_as_datetime.reference
+%%DATADIR%%-test/queries/0_stateless/00820_multiple_joins_subquery_requires_alias.reference
 %%DATADIR%%-test/queries/0_stateless/01414_bloom_filter_index_with_const_column.sql
-%%DATADIR%%-test/queries/0_stateless/01414_freeze_does_not_prevent_alters.reference
-%%DATADIR%%-test/queries/0_stateless/01414_freeze_does_not_prevent_alters.sql
-%%DATADIR%%-test/queries/0_stateless/01414_low_cardinality_nullable.reference
-%%DATADIR%%-test/queries/0_stateless/01414_low_cardinality_nullable.sql
-%%DATADIR%%-test/queries/0_stateless/01414_mutations_and_errors.reference
-%%DATADIR%%-test/queries/0_stateless/01414_mutations_and_errors.sql
-%%DATADIR%%-test/queries/0_stateless/01414_mutations_and_errors_zookeeper.reference
-%%DATADIR%%-test/queries/0_stateless/01414_mutations_and_errors_zookeeper.sh
-%%DATADIR%%-test/queries/0_stateless/01414_optimize_any_bug.reference
-%%DATADIR%%-test/queries/0_stateless/01414_optimize_any_bug.sql
-%%DATADIR%%-test/queries/0_stateless/01414_push_predicate_when_contains_with_clause.reference
-%%DATADIR%%-test/queries/0_stateless/01414_push_predicate_when_contains_with_clause.sql
-%%DATADIR%%-test/queries/0_stateless/01415_inconsistent_merge_tree_settings.reference
-%%DATADIR%%-test/queries/0_stateless/01415_inconsistent_merge_tree_settings.sql
-%%DATADIR%%-test/queries/0_stateless/01415_overlimiting_threads_for_repica_bug.reference
-%%DATADIR%%-test/queries/0_stateless/01415_overlimiting_threads_for_repica_bug.sql
-%%DATADIR%%-test/queries/0_stateless/01415_sticking_mutations.reference
-%%DATADIR%%-test/queries/0_stateless/01415_sticking_mutations.sh
-%%DATADIR%%-test/queries/0_stateless/01415_table_function_view.reference
-%%DATADIR%%-test/queries/0_stateless/01415_table_function_view.sql
-%%DATADIR%%-test/queries/0_stateless/01416_clear_column_pk.reference
-%%DATADIR%%-test/queries/0_stateless/01416_clear_column_pk.sql
-%%DATADIR%%-test/queries/0_stateless/01416_join_totals_header_bug.reference
-%%DATADIR%%-test/queries/0_stateless/01416_join_totals_header_bug.sql
-%%DATADIR%%-test/queries/0_stateless/01417_freeze_partition_verbose.reference
-%%DATADIR%%-test/queries/0_stateless/01417_freeze_partition_verbose.sh
-%%DATADIR%%-test/queries/0_stateless/01417_freeze_partition_verbose_zookeeper.reference
-%%DATADIR%%-test/queries/0_stateless/01417_freeze_partition_verbose_zookeeper.sh
-%%DATADIR%%-test/queries/0_stateless/01417_query_time_in_system_events.reference
-%%DATADIR%%-test/queries/0_stateless/01417_query_time_in_system_events.sh
-%%DATADIR%%-test/queries/0_stateless/01417_update_permutation_crash.reference
-%%DATADIR%%-test/queries/0_stateless/01417_update_permutation_crash.sql
-%%DATADIR%%-test/queries/0_stateless/01418_custom_settings.reference
-%%DATADIR%%-test/queries/0_stateless/01418_custom_settings.sql
-%%DATADIR%%-test/queries/0_stateless/01418_index_analysis_bug.reference
-%%DATADIR%%-test/queries/0_stateless/01418_index_analysis_bug.sql
-%%DATADIR%%-test/queries/0_stateless/01418_query_scope_constants_and_remote.reference
-%%DATADIR%%-test/queries/0_stateless/01418_query_scope_constants_and_remote.sql
-%%DATADIR%%-test/queries/0_stateless/01419_materialize_null.reference
-%%DATADIR%%-test/queries/0_stateless/01419_materialize_null.sql
-%%DATADIR%%-test/queries/0_stateless/01419_merge_tree_settings_sanity_check.reference
-%%DATADIR%%-test/queries/0_stateless/01419_merge_tree_settings_sanity_check.sql
-%%DATADIR%%-test/queries/0_stateless/01419_skip_index_compact_parts.reference
-%%DATADIR%%-test/queries/0_stateless/01419_skip_index_compact_parts.sql
+%%DATADIR%%-test/queries/0_stateless/02047_client_exception.reference
+%%DATADIR%%-test/queries/0_stateless/01070_h3_hex_area_m2.sql
+%%DATADIR%%-test/queries/0_stateless/02136_scalar_subquery_metrics.sql
+%%DATADIR%%-test/queries/0_stateless/01666_merge_tree_max_query_limit.reference
+%%DATADIR%%-test/queries/0_stateless/00900_orc_arrays_load.reference
+%%DATADIR%%-test/queries/0_stateless/01781_map_op_ubsan.sql
+%%DATADIR%%-test/queries/0_stateless/01277_convert_field_to_type_logical_error.reference
+%%DATADIR%%-test/queries/0_stateless/00173_compare_date_time_with_constant_string.sql
+%%DATADIR%%-test/queries/0_stateless/00706_iso_week_and_day_of_year.reference
+%%DATADIR%%-test/queries/0_stateless/00534_functions_bad_arguments13.reference
+%%DATADIR%%-test/queries/0_stateless/01716_array_difference_overflow.sql
+%%DATADIR%%-test/queries/0_stateless/01355_ilike.sql
+%%DATADIR%%-test/queries/0_stateless/01455_opentelemetry_distributed.reference
+%%DATADIR%%-test/queries/0_stateless/01245_limit_infinite_sources.reference
+%%DATADIR%%-test/queries/0_stateless/00712_prewhere_with_sampling_and_alias.reference
+%%DATADIR%%-test/queries/0_stateless/01442_date_time_with_params.sql
+%%DATADIR%%-test/queries/0_stateless/00803_odbc_driver_2_format.reference
+%%DATADIR%%-test/queries/0_stateless/01902_table_function_merge_db_repr.sql
+%%DATADIR%%-test/queries/0_stateless/01623_byte_size_const.sql
+%%DATADIR%%-test/queries/0_stateless/01654_test_writer_block_sequence.sh
+%%DATADIR%%-test/queries/0_stateless/00175_if_num_arrays.reference
+%%DATADIR%%-test/queries/0_stateless/01273_arrow_nullable_arrays_load.reference
+%%DATADIR%%-test/queries/0_stateless/00688_low_cardinality_serialization.sql
+%%DATADIR%%-test/queries/0_stateless/00151_tuple_with_array.sql
+%%DATADIR%%-test/queries/0_stateless/00515_shard_desc_table_functions_and_subqueries.sql
+%%DATADIR%%-test/queries/0_stateless/00277_array_filter.sql
+%%DATADIR%%-test/queries/0_stateless/00991_temporary_live_view_watch_live.sh.disabled
+%%DATADIR%%-test/queries/0_stateless/00973_live_view_with_subquery_select.reference
+%%DATADIR%%-test/queries/0_stateless/00941_to_custom_week.reference
+%%DATADIR%%-test/queries/0_stateless/00327_summing_composite_nested.sql
+%%DATADIR%%-test/queries/0_stateless/02007_ipv4_and_ipv6_to_and_from_string.sql
+%%DATADIR%%-test/queries/0_stateless/01030_storage_set_supports_read.sql
+%%DATADIR%%-test/queries/0_stateless/02110_clickhouse_local_custom_tld.sh
+%%DATADIR%%-test/queries/0_stateless/01680_predicate_pushdown_union_distinct_subquery.sql
+%%DATADIR%%-test/queries/0_stateless/01072_nullable_jit.sql
+%%DATADIR%%-test/queries/0_stateless/00950_dict_get.sql
+%%DATADIR%%-test/queries/0_stateless/00557_alter_null_storage_tables.reference
+%%DATADIR%%-test/queries/0_stateless/01352_add_datetime_bad_get.sql
+%%DATADIR%%-test/queries/0_stateless/02155_dictionary_comment.sql
+%%DATADIR%%-test/queries/0_stateless/00233_position_function_family.sql
+%%DATADIR%%-test/queries/0_stateless/01890_materialized_distributed_join.sh
+%%DATADIR%%-test/queries/0_stateless/01015_empty_in_inner_right_join.reference
+%%DATADIR%%-test/queries/0_stateless/00632_get_sample_block_cache.sql
+%%DATADIR%%-test/queries/0_stateless/00713_collapsing_merge_tree.reference
+%%DATADIR%%-test/queries/0_stateless/01778_where_with_column_name.reference
+%%DATADIR%%-test/queries/0_stateless/01923_different_expression_name_alias.sql
+%%DATADIR%%-test/queries/0_stateless/00635_shard_distinct_order_by.sql
+%%DATADIR%%-test/queries/0_stateless/01430_fix_any_rewrite_aliases.reference
+%%DATADIR%%-test/queries/0_stateless/01388_multi_if_optimization.sql
+%%DATADIR%%-test/queries/0_stateless/00463_long_sessions_in_http_interface.sh
+%%DATADIR%%-test/queries/0_stateless/02005_log_formatted_queries.reference
+%%DATADIR%%-test/queries/0_stateless/02144_avg_ubsan.reference
+%%DATADIR%%-test/queries/0_stateless/01882_total_rows_approx.sh
+%%DATADIR%%-test/queries/0_stateless/01146_clickhouse_local_data.reference
+%%DATADIR%%-test/queries/0_stateless/00192_least_greatest.sql
+%%DATADIR%%-test/queries/0_stateless/00717_default_join_type.reference
+%%DATADIR%%-test/queries/0_stateless/00594_alias_in_distributed.sql
+%%DATADIR%%-test/queries/0_stateless/00661_array_has_silviucpp.reference
+%%DATADIR%%-test/queries/0_stateless/00207_left_array_join.sql
+%%DATADIR%%-test/queries/0_stateless/01269_create_with_null.sql
+%%DATADIR%%-test/queries/0_stateless/01289_min_execution_speed_not_too_early.reference
+%%DATADIR%%-test/queries/0_stateless/01431_finish_sorting_with_consts.sql
+%%DATADIR%%-test/queries/0_stateless/01892_setting_limit_offset_distributed.sql
+%%DATADIR%%-test/queries/0_stateless/01875_ssd_cache_dictionary_decimal256_type.sh
+%%DATADIR%%-test/queries/0_stateless/01475_read_subcolumns_3.reference
+%%DATADIR%%-test/queries/0_stateless/00931_low_cardinality_read_with_empty_array.reference
 %%DATADIR%%-test/queries/0_stateless/01420_format_row.reference
-%%DATADIR%%-test/queries/0_stateless/01420_format_row.sql
-%%DATADIR%%-test/queries/0_stateless/01420_logical_functions_materialized_null.reference
-%%DATADIR%%-test/queries/0_stateless/01420_logical_functions_materialized_null.sql
-%%DATADIR%%-test/queries/0_stateless/01421_array_nullable_element_nullable_index.reference
-%%DATADIR%%-test/queries/0_stateless/01421_array_nullable_element_nullable_index.sql
-%%DATADIR%%-test/queries/0_stateless/01421_assert_in_in.reference
-%%DATADIR%%-test/queries/0_stateless/01421_assert_in_in.sql
-%%DATADIR%%-test/queries/0_stateless/01422_array_nullable_element_nullable_index.reference
-%%DATADIR%%-test/queries/0_stateless/01422_array_nullable_element_nullable_index.sql
-%%DATADIR%%-test/queries/0_stateless/01422_map_skip_null.reference
-%%DATADIR%%-test/queries/0_stateless/01422_map_skip_null.sql
-%%DATADIR%%-test/queries/0_stateless/01423_if_nullable_cond.reference
-%%DATADIR%%-test/queries/0_stateless/01423_if_nullable_cond.sql
-%%DATADIR%%-test/queries/0_stateless/01424_parse_date_time_bad_date.reference
-%%DATADIR%%-test/queries/0_stateless/01424_parse_date_time_bad_date.sql
-%%DATADIR%%-test/queries/0_stateless/01425_decimal_parse_big_negative_exponent.reference
-%%DATADIR%%-test/queries/0_stateless/01425_decimal_parse_big_negative_exponent.sql
-%%DATADIR%%-test/queries/0_stateless/01425_default_value_of_type_name.reference
 %%DATADIR%%-test/queries/0_stateless/01425_default_value_of_type_name.sql
+%%DATADIR%%-test/queries/0_stateless/01073_grant_and_revoke.reference
+%%DATADIR%%-test/queries/0_stateless/00578_merge_table_sampling.reference
+%%DATADIR%%-test/queries/0_stateless/02162_range_hashed_dictionary_ddl_expression.reference
+%%DATADIR%%-test/queries/0_stateless/01655_test_isnull_mysql_dialect.reference
+%%DATADIR%%-test/queries/0_stateless/01392_column_resolve.sql
+%%DATADIR%%-test/queries/0_stateless/01581_deduplicate_by_columns_local.sql
+%%DATADIR%%-test/queries/0_stateless/01232_extremes.reference
+%%DATADIR%%-test/queries/0_stateless/00917_least_sqr.reference
+%%DATADIR%%-test/queries/0_stateless/01280_ttl_where_group_by_negative.sql
+%%DATADIR%%-test/queries/0_stateless/01018_insert_multiple_blocks_with_defaults.reference
+%%DATADIR%%-test/queries/0_stateless/01540_verbatim_partition_pruning.sql
+%%DATADIR%%-test/queries/0_stateless/01007_r1r2_w_r2r1_deadlock.reference
+%%DATADIR%%-test/queries/0_stateless/00543_access_to_temporary_table_in_readonly_mode.sh
+%%DATADIR%%-test/queries/0_stateless/00948_values_interpreter_template.sql
+%%DATADIR%%-test/queries/0_stateless/01533_quantile_deterministic_assert.sql
+%%DATADIR%%-test/queries/0_stateless/01747_alter_partition_key_enum_zookeeper_long.sql
+%%DATADIR%%-test/queries/0_stateless/00116_storage_set.sql
+%%DATADIR%%-test/queries/0_stateless/01153_attach_mv_uuid.reference
+%%DATADIR%%-test/queries/0_stateless/01823_array_low_cardinality_KuliginStepan.sql
+%%DATADIR%%-test/queries/0_stateless/01614_with_fill_with_limit.sql
+%%DATADIR%%-test/queries/0_stateless/02128_cast_nullable.sql
+%%DATADIR%%-test/queries/0_stateless/01824_move_to_prewhere_many_columns.sql
+%%DATADIR%%-test/queries/0_stateless/01832_memory_write_suffix.sql
+%%DATADIR%%-test/queries/0_stateless/00757_enum_defaults.sql
+%%DATADIR%%-test/queries/0_stateless/02149_schema_inference_formats_with_schema.sh
+%%DATADIR%%-test/queries/0_stateless/01852_dictionary_found_rate_long.reference
+%%DATADIR%%-test/queries/0_stateless/00447_foreach_modifier.sql
+%%DATADIR%%-test/queries/0_stateless/00976_system_stop_ttl_merges.reference
+%%DATADIR%%-test/queries/0_stateless/02149_schema_inference.sh
+%%DATADIR%%-test/queries/0_stateless/01015_database_bad_tables.sh
+%%DATADIR%%-test/queries/0_stateless/00411_long_accurate_number_comparison.python
+%%DATADIR%%-test/queries/0_stateless/01529_bad_memory_tracking.sh
+%%DATADIR%%-test/queries/0_stateless/01891_echo.reference
+%%DATADIR%%-test/queries/0_stateless/00977_live_view_watch_events.reference
+%%DATADIR%%-test/queries/0_stateless/01576_if_null_external_aggregation.reference
+%%DATADIR%%-test/queries/0_stateless/01260_ubsan_decimal_parse.sql
+%%DATADIR%%-test/queries/0_stateless/01867_fix_storage_memory_mutation.sql
+%%DATADIR%%-test/queries/0_stateless/02096_rename_atomic_hang.reference
+%%DATADIR%%-test/queries/0_stateless/01732_explain_syntax_union_query.sql
+%%DATADIR%%-test/queries/0_stateless/01703_rewrite_aggregate_function_case_insensitive.sql
+%%DATADIR%%-test/queries/0_stateless/02148_in_memory_part_flush.sql
+%%DATADIR%%-test/queries/0_stateless/02031_format_query_option.reference
+%%DATADIR%%-test/queries/0_stateless/00687_insert_into_mv.reference
+%%DATADIR%%-test/queries/0_stateless/01906_h3_to_geo.reference
+%%DATADIR%%-test/queries/0_stateless/01514_empty_buffer_different_types.reference
+%%DATADIR%%-test/queries/0_stateless/00102_insert_into_temporary_table.sql
+%%DATADIR%%-test/queries/0_stateless/00048_a_stored_aggregates_merge.reference
+%%DATADIR%%-test/queries/0_stateless/00986_materialized_view_stack_overflow.reference
+%%DATADIR%%-test/queries/0_stateless/00500_point_in_polygon.reference
+%%DATADIR%%-test/queries/0_stateless/01420_logical_functions_materialized_null.reference
+%%DATADIR%%-test/queries/0_stateless/01585_fuzz_bits_with_bugfix.sql
+%%DATADIR%%-test/queries/0_stateless/00645_date_time_input_format.sql
+%%DATADIR%%-test/queries/0_stateless/02009_from_infile.sh
+%%DATADIR%%-test/queries/0_stateless/00822_array_insert_default.sql
+%%DATADIR%%-test/queries/0_stateless/01149_zookeeper_mutation_stuck_after_replace_partition.sql
+%%DATADIR%%-test/queries/0_stateless/00263_merge_aggregates_and_overflow.reference
+%%DATADIR%%-test/queries/0_stateless/01772_to_start_of_hour_align.sql
+%%DATADIR%%-test/queries/0_stateless/01284_view_and_extremes_bug.sql
+%%DATADIR%%-test/queries/0_stateless/01558_enum_as_num_in_tsv_csv_input.reference
+%%DATADIR%%-test/queries/0_stateless/02161_array_first_last.reference
+%%DATADIR%%-test/queries/0_stateless/01044_great_circle_angle.reference
+%%DATADIR%%-test/queries/0_stateless/01550_mutation_subquery.sql
+%%DATADIR%%-test/queries/0_stateless/00753_alter_attach.reference
+%%DATADIR%%-test/queries/0_stateless/01018_ddl_dictionaries_create.sql
+%%DATADIR%%-test/queries/0_stateless/01273_arrow_dictionaries_load.reference
+%%DATADIR%%-test/queries/0_stateless/01961_roaring_memory_tracking.reference
+%%DATADIR%%-test/queries/0_stateless/01360_materialized_view_with_join_on_query_log.sql
+%%DATADIR%%-test/queries/0_stateless/01050_engine_join_crash.sql
+%%DATADIR%%-test/queries/0_stateless/00296_url_parameters.reference
+%%DATADIR%%-test/queries/0_stateless/01455_time_zones.reference
+%%DATADIR%%-test/queries/0_stateless/01913_join_push_down_bug.reference
+%%DATADIR%%-test/queries/0_stateless/01600_select_in_different_types.sql
+%%DATADIR%%-test/queries/0_stateless/01568_window_functions_distributed.sql
+%%DATADIR%%-test/queries/0_stateless/00618_nullable_in.sql
+%%DATADIR%%-test/queries/0_stateless/00070_insert_fewer_columns_http.reference
+%%DATADIR%%-test/queries/0_stateless/01571_window_functions.sql
+%%DATADIR%%-test/queries/0_stateless/01917_prewhere_column_type.reference
+%%DATADIR%%-test/queries/0_stateless/00737_decimal_group_by.reference
+%%DATADIR%%-test/queries/0_stateless/00712_prewhere_with_alias.sql
+%%DATADIR%%-test/queries/0_stateless/00543_access_to_temporary_table_in_readonly_mode.reference
+%%DATADIR%%-test/queries/0_stateless/00969_roundDuration.sql
+%%DATADIR%%-test/queries/0_stateless/01035_avg.reference
+%%DATADIR%%-test/queries/0_stateless/00464_array_element_out_of_range.sql
+%%DATADIR%%-test/queries/0_stateless/01305_nullable-prewhere_bug.reference
+%%DATADIR%%-test/queries/0_stateless/00932_array_intersect_bug.sql
+%%DATADIR%%-test/queries/0_stateless/01848_http_insert_segfault.sh
+%%DATADIR%%-test/queries/0_stateless/01083_cross_to_inner_with_like.sql
+%%DATADIR%%-test/queries/0_stateless/01891_partition_hash_no_long_int.reference
+%%DATADIR%%-test/queries/0_stateless/00937_template_output_format.sh
+%%DATADIR%%-test/queries/0_stateless/01067_join_null.reference
+%%DATADIR%%-test/queries/0_stateless/00206_empty_array_to_single.reference
+%%DATADIR%%-test/queries/0_stateless/00509_extended_storage_definition_syntax_zookeeper.sql
+%%DATADIR%%-test/queries/0_stateless/01838_system_dictionaries_virtual_key_column.sql
+%%DATADIR%%-test/queries/0_stateless/01773_datetime64_add_ubsan.reference
+%%DATADIR%%-test/queries/0_stateless/00591_columns_removal_union_all.reference
+%%DATADIR%%-test/queries/0_stateless/01347_partition_date_vs_datetime.sql
+%%DATADIR%%-test/queries/0_stateless/00302_http_compression.sh
+%%DATADIR%%-test/queries/0_stateless/01463_resample_overflow.reference
+%%DATADIR%%-test/queries/0_stateless/01840_tupleElement_formatting_fuzzer.sql
+%%DATADIR%%-test/queries/0_stateless/01761_round_year_bounds.reference
+%%DATADIR%%-test/queries/0_stateless/00881_unknown_identifier_in_in.reference
+%%DATADIR%%-test/queries/0_stateless/01957_heredoc_more.sql
+%%DATADIR%%-test/queries/0_stateless/01515_force_data_skipping_indices.reference
+%%DATADIR%%-test/queries/0_stateless/00534_functions_bad_arguments3.reference
+%%DATADIR%%-test/queries/0_stateless/00577_replacing_merge_tree_vertical_merge.sql
 %%DATADIR%%-test/queries/0_stateless/01426_geohash_constants.reference
-%%DATADIR%%-test/queries/0_stateless/01426_geohash_constants.sql
-%%DATADIR%%-test/queries/0_stateless/01427_pk_and_expression_with_different_type.reference
-%%DATADIR%%-test/queries/0_stateless/01427_pk_and_expression_with_different_type.sql
-%%DATADIR%%-test/queries/0_stateless/01428_h3_range_check.reference
-%%DATADIR%%-test/queries/0_stateless/01428_h3_range_check.sql
-%%DATADIR%%-test/queries/0_stateless/01428_hash_set_nan_key.reference
-%%DATADIR%%-test/queries/0_stateless/01428_hash_set_nan_key.sql
-%%DATADIR%%-test/queries/0_stateless/01428_nullable_asof_join.reference
-%%DATADIR%%-test/queries/0_stateless/01428_nullable_asof_join.sql
-%%DATADIR%%-test/queries/0_stateless/01429_empty_arrow_and_parquet.reference
-%%DATADIR%%-test/queries/0_stateless/01429_empty_arrow_and_parquet.sh
-%%DATADIR%%-test/queries/0_stateless/01429_join_on_error_messages.reference
-%%DATADIR%%-test/queries/0_stateless/01429_join_on_error_messages.sql
-%%DATADIR%%-test/queries/0_stateless/01430_fix_any_rewrite_aliases.reference
-%%DATADIR%%-test/queries/0_stateless/01430_fix_any_rewrite_aliases.sql
-%%DATADIR%%-test/queries/0_stateless/01430_modify_sample_by_zookeeper.reference
-%%DATADIR%%-test/queries/0_stateless/01430_modify_sample_by_zookeeper.sql
-%%DATADIR%%-test/queries/0_stateless/01430_moving_sum_empty_state.reference
-%%DATADIR%%-test/queries/0_stateless/01430_moving_sum_empty_state.sql
-%%DATADIR%%-test/queries/0_stateless/01431_finish_sorting_with_consts.reference
-%%DATADIR%%-test/queries/0_stateless/01431_finish_sorting_with_consts.sql
-%%DATADIR%%-test/queries/0_stateless/01431_utf8_ubsan.reference
-%%DATADIR%%-test/queries/0_stateless/01431_utf8_ubsan.sql
-%%DATADIR%%-test/queries/0_stateless/01432_parse_date_time_best_effort_timestamp.reference
-%%DATADIR%%-test/queries/0_stateless/01432_parse_date_time_best_effort_timestamp.sql
-%%DATADIR%%-test/queries/0_stateless/01433_hex_float.reference
-%%DATADIR%%-test/queries/0_stateless/01433_hex_float.sql
-%%DATADIR%%-test/queries/0_stateless/01434_netloc_fuzz.reference
-%%DATADIR%%-test/queries/0_stateless/01434_netloc_fuzz.sql
-%%DATADIR%%-test/queries/0_stateless/01435_lcm_overflow.reference
-%%DATADIR%%-test/queries/0_stateless/01435_lcm_overflow.sql
-%%DATADIR%%-test/queries/0_stateless/01436_storage_merge_with_join_push_down.reference
-%%DATADIR%%-test/queries/0_stateless/01436_storage_merge_with_join_push_down.sql
-%%DATADIR%%-test/queries/0_stateless/01440_big_int_arithm.reference
-%%DATADIR%%-test/queries/0_stateless/01440_big_int_arithm.sql
-%%DATADIR%%-test/queries/0_stateless/01440_big_int_exotic_casts.reference
-%%DATADIR%%-test/queries/0_stateless/01440_big_int_exotic_casts.sql
+%%DATADIR%%-test/queries/0_stateless/01585_use_index_for_global_in_with_null.reference
+%%DATADIR%%-test/queries/0_stateless/00623_replicated_truncate_table_zookeeper_long.reference
+%%DATADIR%%-test/queries/0_stateless/00064_negate_bug.sql
+%%DATADIR%%-test/queries/0_stateless/00974_adaptive_granularity_secondary_index.reference
+%%DATADIR%%-test/queries/0_stateless/01213_alter_rename_primary_key_zookeeper_long.reference
+%%DATADIR%%-test/queries/0_stateless/01557_field_infinite_convert_to_number.sql
+%%DATADIR%%-test/queries/0_stateless/02115_rewrite_local_join_right_distribute_table.sql
+%%DATADIR%%-test/queries/0_stateless/01684_ssd_cache_dictionary_simple_key.sh
+%%DATADIR%%-test/queries/0_stateless/01874_select_from_trailing_whitespaces.sh
+%%DATADIR%%-test/queries/0_stateless/01596_full_join_chertus.reference
+%%DATADIR%%-test/queries/0_stateless/02015_order_by_with_fill_misoptimization.reference
+%%DATADIR%%-test/queries/0_stateless/00490_with_select.reference
+%%DATADIR%%-test/queries/0_stateless/01954_clickhouse_benchmark_multiple_long.sh
+%%DATADIR%%-test/queries/0_stateless/01656_test_query_log_factories_info.reference
+%%DATADIR%%-test/queries/0_stateless/02020_alter_table_modify_comment.sh
+%%DATADIR%%-test/queries/0_stateless/00963_achimbab.sql
+%%DATADIR%%-test/queries/0_stateless/00965_set_index_string_functions.sh
+%%DATADIR%%-test/queries/0_stateless/01907_multiple_aliases.sql
+%%DATADIR%%-test/queries/0_stateless/01345_index_date_vs_datetime.reference
+%%DATADIR%%-test/queries/0_stateless/01822_short_circuit.reference
+%%DATADIR%%-test/queries/0_stateless/00487_if_array_fixed_string.sql
+%%DATADIR%%-test/queries/0_stateless/02022_array_full_text_bloom_filter_index.sql
+%%DATADIR%%-test/queries/0_stateless/01470_show_databases_like.reference
+%%DATADIR%%-test/queries/0_stateless/01526_alter_add_and_modify_order_zookeeper.sql
+%%DATADIR%%-test/queries/0_stateless/01493_alter_remove_properties_zookeeper.sql
+%%DATADIR%%-test/queries/0_stateless/01700_deltasum.sql
+%%DATADIR%%-test/queries/0_stateless/01183_custom_separated_format_http.sh
+%%DATADIR%%-test/queries/0_stateless/01415_inconsistent_merge_tree_settings.sql
+%%DATADIR%%-test/queries/0_stateless/01375_GROUP_BY_injective_elimination_dictGet_BAD_ARGUMENTS.sql
+%%DATADIR%%-test/queries/0_stateless/02007_join_use_nulls.sql
+%%DATADIR%%-test/queries/0_stateless/00321_pk_set.reference
+%%DATADIR%%-test/queries/0_stateless/01529_bad_memory_tracking.reference
+%%DATADIR%%-test/queries/0_stateless/00635_shard_distinct_order_by.reference
 %%DATADIR%%-test/queries/0_stateless/01440_big_int_least_greatest.reference
-%%DATADIR%%-test/queries/0_stateless/01440_big_int_least_greatest.sql
-%%DATADIR%%-test/queries/0_stateless/01440_big_int_shift.reference
-%%DATADIR%%-test/queries/0_stateless/01440_big_int_shift.sql
-%%DATADIR%%-test/queries/0_stateless/01440_to_date_monotonicity.reference
-%%DATADIR%%-test/queries/0_stateless/01440_to_date_monotonicity.sql
-%%DATADIR%%-test/queries/0_stateless/01441_array_combinator.reference
-%%DATADIR%%-test/queries/0_stateless/01441_array_combinator.sql
-%%DATADIR%%-test/queries/0_stateless/01441_low_cardinality_array_index.reference
-%%DATADIR%%-test/queries/0_stateless/01441_low_cardinality_array_index.sql
-%%DATADIR%%-test/queries/0_stateless/01442_date_time_with_params.reference
-%%DATADIR%%-test/queries/0_stateless/01442_date_time_with_params.sql
-%%DATADIR%%-test/queries/0_stateless/01442_h3kring_range_check.reference
-%%DATADIR%%-test/queries/0_stateless/01442_h3kring_range_check.sql
-%%DATADIR%%-test/queries/0_stateless/01442_merge_detach_attach.reference
-%%DATADIR%%-test/queries/0_stateless/01442_merge_detach_attach.sh
-%%DATADIR%%-test/queries/0_stateless/01443_merge_truncate_long.reference
 %%DATADIR%%-test/queries/0_stateless/01443_merge_truncate_long.sh
-%%DATADIR%%-test/queries/0_stateless/01444_create_table_drop_database_race.reference
-%%DATADIR%%-test/queries/0_stateless/01444_create_table_drop_database_race.sh
-%%DATADIR%%-test/queries/0_stateless/01445_create_table_as_table_function.reference
-%%DATADIR%%-test/queries/0_stateless/01445_create_table_as_table_function.sh
-%%DATADIR%%-test/queries/0_stateless/01446_json_strings_each_row.reference
+%%DATADIR%%-test/queries/0_stateless/01664_ntoa_aton_mysql_compatibility.sql
+%%DATADIR%%-test/queries/0_stateless/02126_identity_user_defined_function.reference
+%%DATADIR%%-test/queries/0_stateless/00098_l_union_all.reference
+%%DATADIR%%-test/queries/0_stateless/01704_transform_with_float_key.sql
+%%DATADIR%%-test/queries/0_stateless/01021_tuple_parser.sql
+%%DATADIR%%-test/queries/0_stateless/02017_columns_with_dot_2.reference
+%%DATADIR%%-test/queries/0_stateless/01906_lc_in_bug.reference
+%%DATADIR%%-test/queries/0_stateless/00163_shard_join_with_empty_table.reference
+%%DATADIR%%-test/queries/0_stateless/01582_any_join_supertype.sql
+%%DATADIR%%-test/queries/0_stateless/01715_tuple_insert_null_as_default.reference
+%%DATADIR%%-test/queries/0_stateless/00497_whitespaces_in_insert.reference
+%%DATADIR%%-test/queries/0_stateless/00534_functions_bad_arguments12.reference
 %%DATADIR%%-test/queries/0_stateless/01446_json_strings_each_row.sh
-%%DATADIR%%-test/queries/0_stateless/01447_json_strings.reference
-%%DATADIR%%-test/queries/0_stateless/01447_json_strings.sql
+%%DATADIR%%-test/queries/0_stateless/01030_limit_by_with_ties_error.reference
+%%DATADIR%%-test/queries/0_stateless/00915_simple_aggregate_function.reference
+%%DATADIR%%-test/queries/0_stateless/00064_negate_bug.reference
+%%DATADIR%%-test/queries/0_stateless/02006_client_test_hint_error_name.reference
+%%DATADIR%%-test/queries/0_stateless/02048_views_with_comment.sql
+%%DATADIR%%-test/queries/0_stateless/00633_func_or_in.sql
+%%DATADIR%%-test/queries/0_stateless/01495_subqueries_in_with_statement_4.sql
+%%DATADIR%%-test/queries/0_stateless/01780_range_msan.reference
+%%DATADIR%%-test/queries/0_stateless/01575_disable_detach_table_of_dictionary.reference
+%%DATADIR%%-test/queries/0_stateless/00942_mutate_index.sh
+%%DATADIR%%-test/queries/0_stateless/00533_uniq_array.sql
+%%DATADIR%%-test/queries/0_stateless/00861_decimal_quoted_csv.reference
+%%DATADIR%%-test/queries/0_stateless/02114_offset_fetch_without_order_by.sh
+%%DATADIR%%-test/queries/0_stateless/01138_join_on_distributed_and_tmp.sql
+%%DATADIR%%-test/queries/0_stateless/00819_ast_refactoring_bugs.sql
+%%DATADIR%%-test/queries/0_stateless/00926_geo_to_h3.reference
+%%DATADIR%%-test/queries/0_stateless/00521_multidimensional.reference
+%%DATADIR%%-test/queries/0_stateless/01651_map_functions.reference
 %%DATADIR%%-test/queries/0_stateless/01448_json_compact_strings_each_row.reference
-%%DATADIR%%-test/queries/0_stateless/01448_json_compact_strings_each_row.sql
-%%DATADIR%%-test/queries/0_stateless/01449_json_compact_strings.reference
-%%DATADIR%%-test/queries/0_stateless/01449_json_compact_strings.sql
-%%DATADIR%%-test/queries/0_stateless/01450_set_null_const.reference
-%%DATADIR%%-test/queries/0_stateless/01450_set_null_const.sql
-%%DATADIR%%-test/queries/0_stateless/01451_detach_drop_part.reference
-%%DATADIR%%-test/queries/0_stateless/01451_detach_drop_part.sql
-%%DATADIR%%-test/queries/0_stateless/01451_dist_logs.reference
-%%DATADIR%%-test/queries/0_stateless/01451_dist_logs.sh
-%%DATADIR%%-test/queries/0_stateless/01451_normalize_query.reference
-%%DATADIR%%-test/queries/0_stateless/01451_normalize_query.sql
-%%DATADIR%%-test/queries/0_stateless/01451_replicated_detach_drop_and_quorum.reference
-%%DATADIR%%-test/queries/0_stateless/01451_replicated_detach_drop_and_quorum.sql
-%%DATADIR%%-test/queries/0_stateless/01451_replicated_detach_drop_part_long.reference
-%%DATADIR%%-test/queries/0_stateless/01451_replicated_detach_drop_part_long.sql
-%%DATADIR%%-test/queries/0_stateless/01451_wrong_error_long_query.reference
-%%DATADIR%%-test/queries/0_stateless/01451_wrong_error_long_query.sh
-%%DATADIR%%-test/queries/0_stateless/01452_normalized_query_hash.reference
-%%DATADIR%%-test/queries/0_stateless/01452_normalized_query_hash.sql
-%%DATADIR%%-test/queries/0_stateless/01453_fixsed_string_sort.reference
-%%DATADIR%%-test/queries/0_stateless/01453_fixsed_string_sort.sql
-%%DATADIR%%-test/queries/0_stateless/01453_normalize_query_alias_uuid.reference
-%%DATADIR%%-test/queries/0_stateless/01453_normalize_query_alias_uuid.sql
-%%DATADIR%%-test/queries/0_stateless/01454_storagememory_data_race_challenge.reference
-%%DATADIR%%-test/queries/0_stateless/01454_storagememory_data_race_challenge.sh
-%%DATADIR%%-test/queries/0_stateless/01455_default_compression.reference
-%%DATADIR%%-test/queries/0_stateless/01455_default_compression.sql
-%%DATADIR%%-test/queries/0_stateless/01455_duplicate_distinct_optimization.reference
-%%DATADIR%%-test/queries/0_stateless/01455_duplicate_distinct_optimization.sql
-%%DATADIR%%-test/queries/0_stateless/01455_nullable_type_with_if_agg_combinator.reference
-%%DATADIR%%-test/queries/0_stateless/01455_nullable_type_with_if_agg_combinator.sql
-%%DATADIR%%-test/queries/0_stateless/01455_opentelemetry_distributed.reference
-%%DATADIR%%-test/queries/0_stateless/01455_opentelemetry_distributed.sh
-%%DATADIR%%-test/queries/0_stateless/01455_optimize_trivial_insert_select.reference
-%%DATADIR%%-test/queries/0_stateless/01455_optimize_trivial_insert_select.sql
-%%DATADIR%%-test/queries/0_stateless/01455_rank_correlation_spearman.reference
-%%DATADIR%%-test/queries/0_stateless/01455_rank_correlation_spearman.sql
-%%DATADIR%%-test/queries/0_stateless/01455_shard_leaf_max_rows_bytes_to_read.reference
-%%DATADIR%%-test/queries/0_stateless/01455_shard_leaf_max_rows_bytes_to_read.sql
-%%DATADIR%%-test/queries/0_stateless/01455_time_zones.reference
-%%DATADIR%%-test/queries/0_stateless/01455_time_zones.sql
-%%DATADIR%%-test/queries/0_stateless/01456_ast_optimizations_over_distributed.reference
-%%DATADIR%%-test/queries/0_stateless/01456_ast_optimizations_over_distributed.sql
-%%DATADIR%%-test/queries/0_stateless/01456_low_cardinality_sorting_bugfix.reference
-%%DATADIR%%-test/queries/0_stateless/01456_low_cardinality_sorting_bugfix.sql
-%%DATADIR%%-test/queries/0_stateless/01456_min_negative_decimal_formatting.reference
-%%DATADIR%%-test/queries/0_stateless/01456_min_negative_decimal_formatting.sql
-%%DATADIR%%-test/queries/0_stateless/01456_modify_column_type_via_add_drop_update.reference
-%%DATADIR%%-test/queries/0_stateless/01456_modify_column_type_via_add_drop_update.sql
-%%DATADIR%%-test/queries/0_stateless/01457_compile_expressions_fuzzer.reference
-%%DATADIR%%-test/queries/0_stateless/01457_compile_expressions_fuzzer.sql
-%%DATADIR%%-test/queries/0_stateless/01457_create_as_table_function_structure.reference
-%%DATADIR%%-test/queries/0_stateless/01457_create_as_table_function_structure.sql
-%%DATADIR%%-test/queries/0_stateless/01457_int256_hashing.reference
-%%DATADIR%%-test/queries/0_stateless/01457_int256_hashing.sql
-%%DATADIR%%-test/queries/0_stateless/01457_min_index_granularity_bytes_setting.reference
-%%DATADIR%%-test/queries/0_stateless/01457_min_index_granularity_bytes_setting.sql
-%%DATADIR%%-test/queries/0_stateless/01457_order_by_limit.reference
-%%DATADIR%%-test/queries/0_stateless/01457_order_by_limit.sql
-%%DATADIR%%-test/queries/0_stateless/01457_order_by_nulls_first.reference
-%%DATADIR%%-test/queries/0_stateless/01457_order_by_nulls_first.sql
-%%DATADIR%%-test/queries/0_stateless/01458_count_digits.reference
-%%DATADIR%%-test/queries/0_stateless/01458_count_digits.sql
-%%DATADIR%%-test/queries/0_stateless/01458_is_decimal_overflow.reference
-%%DATADIR%%-test/queries/0_stateless/01458_is_decimal_overflow.sql
-%%DATADIR%%-test/queries/0_stateless/01458_named_tuple_millin.reference
-%%DATADIR%%-test/queries/0_stateless/01458_named_tuple_millin.sql
-%%DATADIR%%-test/queries/0_stateless/01459_decimal_casts.reference
-%%DATADIR%%-test/queries/0_stateless/01459_decimal_casts.sql
+%%DATADIR%%-test/queries/0_stateless/01030_storage_url_syntax.reference
+%%DATADIR%%-test/queries/0_stateless/00288_empty_stripelog.reference
 %%DATADIR%%-test/queries/0_stateless/01459_default_value_of_argument_type_nullptr_dereference.reference
-%%DATADIR%%-test/queries/0_stateless/01459_default_value_of_argument_type_nullptr_dereference.sql
-%%DATADIR%%-test/queries/0_stateless/01459_manual_write_to_replicas.reference
-%%DATADIR%%-test/queries/0_stateless/01459_manual_write_to_replicas.sh
-%%DATADIR%%-test/queries/0_stateless/01459_manual_write_to_replicas_quorum.reference
-%%DATADIR%%-test/queries/0_stateless/01459_manual_write_to_replicas_quorum.sh
-%%DATADIR%%-test/queries/0_stateless/01460_DistributedFilesToInsert.reference
-%%DATADIR%%-test/queries/0_stateless/01460_DistributedFilesToInsert.sql
-%%DATADIR%%-test/queries/0_stateless/01460_allow_dollar_and_number_in_identifier.reference
-%%DATADIR%%-test/queries/0_stateless/01460_allow_dollar_and_number_in_identifier.sql
-%%DATADIR%%-test/queries/0_stateless/01460_line_as_string_format.reference
-%%DATADIR%%-test/queries/0_stateless/01460_line_as_string_format.sh
-%%DATADIR%%-test/queries/0_stateless/01460_mark_inclusion_search_crash.reference
-%%DATADIR%%-test/queries/0_stateless/01460_mark_inclusion_search_crash.sql
-%%DATADIR%%-test/queries/0_stateless/01461_alter_table_function.reference
-%%DATADIR%%-test/queries/0_stateless/01461_alter_table_function.sql
-%%DATADIR%%-test/queries/0_stateless/01461_query_start_time_microseconds.reference
-%%DATADIR%%-test/queries/0_stateless/01461_query_start_time_microseconds.sql
-%%DATADIR%%-test/queries/0_stateless/01462_test_codec_on_alias.reference
-%%DATADIR%%-test/queries/0_stateless/01462_test_codec_on_alias.sql
-%%DATADIR%%-test/queries/0_stateless/01463_resample_overflow.reference
-%%DATADIR%%-test/queries/0_stateless/01463_resample_overflow.sql
-%%DATADIR%%-test/queries/0_stateless/01463_test_alter_live_view_refresh.reference
-%%DATADIR%%-test/queries/0_stateless/01463_test_alter_live_view_refresh.sql
-%%DATADIR%%-test/queries/0_stateless/01465_ttl_recompression.reference
-%%DATADIR%%-test/queries/0_stateless/01465_ttl_recompression.sql
-%%DATADIR%%-test/queries/0_stateless/01470_columns_transformers.reference
-%%DATADIR%%-test/queries/0_stateless/01470_columns_transformers.sql
-%%DATADIR%%-test/queries/0_stateless/01470_columns_transformers2.reference
-%%DATADIR%%-test/queries/0_stateless/01470_columns_transformers2.sql
-%%DATADIR%%-test/queries/0_stateless/01470_explain.reference
-%%DATADIR%%-test/queries/0_stateless/01470_explain.sql
-%%DATADIR%%-test/queries/0_stateless/01470_show_databases_like.reference
-%%DATADIR%%-test/queries/0_stateless/01470_show_databases_like.sql
-%%DATADIR%%-test/queries/0_stateless/01470_test_insert_select_asterisk.reference
-%%DATADIR%%-test/queries/0_stateless/01470_test_insert_select_asterisk.sql
-%%DATADIR%%-test/queries/0_stateless/01471_calculate_ttl_during_merge.reference
-%%DATADIR%%-test/queries/0_stateless/01471_calculate_ttl_during_merge.sql
-%%DATADIR%%-test/queries/0_stateless/01471_limit_by_format.reference
-%%DATADIR%%-test/queries/0_stateless/01471_limit_by_format.sql
-%%DATADIR%%-test/queries/0_stateless/01471_top_k_range_check.reference
-%%DATADIR%%-test/queries/0_stateless/01471_top_k_range_check.sql
-%%DATADIR%%-test/queries/0_stateless/01471_with_format.reference
-%%DATADIR%%-test/queries/0_stateless/01471_with_format.sql
-%%DATADIR%%-test/queries/0_stateless/01472_many_rows_in_totals.reference
-%%DATADIR%%-test/queries/0_stateless/01472_many_rows_in_totals.sql
-%%DATADIR%%-test/queries/0_stateless/01472_obfuscator_uuid.reference
-%%DATADIR%%-test/queries/0_stateless/01472_obfuscator_uuid.sh
-%%DATADIR%%-test/queries/0_stateless/01472_toStartOfInterval_disallow_empty_tz_field.reference
-%%DATADIR%%-test/queries/0_stateless/01472_toStartOfInterval_disallow_empty_tz_field.sql
-%%DATADIR%%-test/queries/0_stateless/01473_event_time_microseconds.reference
-%%DATADIR%%-test/queries/0_stateless/01473_event_time_microseconds.sql
-%%DATADIR%%-test/queries/0_stateless/01473_system_events_zeroes.reference
-%%DATADIR%%-test/queries/0_stateless/01473_system_events_zeroes.sql
-%%DATADIR%%-test/queries/0_stateless/01474_bad_global_join.reference
-%%DATADIR%%-test/queries/0_stateless/01474_bad_global_join.sql
-%%DATADIR%%-test/queries/0_stateless/01474_custom_null_tsv.reference
-%%DATADIR%%-test/queries/0_stateless/01474_custom_null_tsv.sh
-%%DATADIR%%-test/queries/0_stateless/01474_decimal_scale_bug.reference
-%%DATADIR%%-test/queries/0_stateless/01474_decimal_scale_bug.sql
-%%DATADIR%%-test/queries/0_stateless/01474_executable_dictionary.reference
-%%DATADIR%%-test/queries/0_stateless/01474_executable_dictionary.sql
-%%DATADIR%%-test/queries/0_stateless/01475_fix_bigint_shift.reference
-%%DATADIR%%-test/queries/0_stateless/01475_fix_bigint_shift.sql
-%%DATADIR%%-test/queries/0_stateless/01475_mutation_with_if.reference
-%%DATADIR%%-test/queries/0_stateless/01475_mutation_with_if.sql
-%%DATADIR%%-test/queries/0_stateless/01475_read_subcolumns.reference
-%%DATADIR%%-test/queries/0_stateless/01475_read_subcolumns.sql
+%%DATADIR%%-test/queries/0_stateless/00137_in_constants.sql
+%%DATADIR%%-test/queries/0_stateless/00371_union_all.sql
+%%DATADIR%%-test/queries/0_stateless/02152_csv_tuple.reference
+%%DATADIR%%-test/queries/0_stateless/00752_low_cardinality_mv_2.sql
+%%DATADIR%%-test/queries/0_stateless/01634_uuid_fuzz.reference
+%%DATADIR%%-test/queries/0_stateless/02015_async_inserts_2.reference
+%%DATADIR%%-test/queries/0_stateless/00653_running_difference.sql
+%%DATADIR%%-test/queries/0_stateless/00725_comment_columns_long.sql
+%%DATADIR%%-test/queries/0_stateless/01455_duplicate_distinct_optimization.reference
+%%DATADIR%%-test/queries/0_stateless/01338_long_select_and_alter.reference
+%%DATADIR%%-test/queries/0_stateless/00453_cast_enum.sql
+%%DATADIR%%-test/queries/0_stateless/01322_cast_keep_nullable.sql
+%%DATADIR%%-test/queries/0_stateless/00900_entropy_shard.reference
+%%DATADIR%%-test/queries/0_stateless/00598_create_as_select_http.sh
+%%DATADIR%%-test/queries/0_stateless/01948_dictionary_quoted_database_name.reference
+%%DATADIR%%-test/queries/0_stateless/00739_array_element_nullable_string_mattrobenolt.sql
+%%DATADIR%%-test/queries/0_stateless/01780_dict_get_or_null.sql
+%%DATADIR%%-test/queries/0_stateless/00825_protobuf_format_array_3dim.reference
+%%DATADIR%%-test/queries/0_stateless/01606_merge_from_wide_to_compact.reference
+%%DATADIR%%-test/queries/0_stateless/00975_values_list.reference
+%%DATADIR%%-test/queries/0_stateless/01039_test_setting_parse.sql
+%%DATADIR%%-test/queries/0_stateless/01302_polygons_distance.sql
+%%DATADIR%%-test/queries/0_stateless/00999_settings_no_extra_quotes.sql
+%%DATADIR%%-test/queries/0_stateless/02131_skip_index_not_materialized.reference
+%%DATADIR%%-test/queries/0_stateless/01062_alter_on_mutataion_zookeeper_long.sql
+%%DATADIR%%-test/queries/0_stateless/01035_enum_conversion_native_format.sh
+%%DATADIR%%-test/queries/0_stateless/01060_shutdown_table_after_detach.sql
+%%DATADIR%%-test/queries/0_stateless/00653_verification_monotonic_data_load.reference
+%%DATADIR%%-test/queries/0_stateless/01586_replicated_mutations_empty_partition.reference
+%%DATADIR%%-test/queries/0_stateless/01622_defaults_for_file_engine.sql
 %%DATADIR%%-test/queries/0_stateless/01475_read_subcolumns_2.reference
-%%DATADIR%%-test/queries/0_stateless/01475_read_subcolumns_2.sql
-%%DATADIR%%-test/queries/0_stateless/01475_read_subcolumns_3.reference
-%%DATADIR%%-test/queries/0_stateless/01475_read_subcolumns_3.sql
-%%DATADIR%%-test/queries/0_stateless/01475_read_subcolumns_storages.reference
-%%DATADIR%%-test/queries/0_stateless/01475_read_subcolumns_storages.sh
-%%DATADIR%%-test/queries/0_stateless/01476_right_full_join_switch.reference
-%%DATADIR%%-test/queries/0_stateless/01476_right_full_join_switch.sql
-%%DATADIR%%-test/queries/0_stateless/01477_lc_in_merge_join_left_key.reference
-%%DATADIR%%-test/queries/0_stateless/01477_lc_in_merge_join_left_key.sql
-%%DATADIR%%-test/queries/0_stateless/01478_not_equi-join_on.reference
-%%DATADIR%%-test/queries/0_stateless/01478_not_equi-join_on.sql
-%%DATADIR%%-test/queries/0_stateless/01479_cross_join_9855.reference
-%%DATADIR%%-test/queries/0_stateless/01479_cross_join_9855.sql
-%%DATADIR%%-test/queries/0_stateless/01480_binary_operator_monotonicity.reference
-%%DATADIR%%-test/queries/0_stateless/01480_binary_operator_monotonicity.sql
-%%DATADIR%%-test/queries/0_stateless/01481_join_with_materialized.reference
-%%DATADIR%%-test/queries/0_stateless/01481_join_with_materialized.sql
-%%DATADIR%%-test/queries/0_stateless/01483_merge_table_join_and_group_by.reference
-%%DATADIR%%-test/queries/0_stateless/01483_merge_table_join_and_group_by.sql
-%%DATADIR%%-test/queries/0_stateless/01485_256_bit_multiply.reference
-%%DATADIR%%-test/queries/0_stateless/01485_256_bit_multiply.sql
-%%DATADIR%%-test/queries/0_stateless/01486_json_array_output.reference
-%%DATADIR%%-test/queries/0_stateless/01486_json_array_output.sql
-%%DATADIR%%-test/queries/0_stateless/01487_distributed_in_not_default_db.reference
-%%DATADIR%%-test/queries/0_stateless/01487_distributed_in_not_default_db.sql
-%%DATADIR%%-test/queries/0_stateless/01490_nullable_string_to_enum.reference
-%%DATADIR%%-test/queries/0_stateless/01490_nullable_string_to_enum.sql
-%%DATADIR%%-test/queries/0_stateless/01491_nested_multiline_comments.reference
-%%DATADIR%%-test/queries/0_stateless/01491_nested_multiline_comments.sql
-%%DATADIR%%-test/queries/0_stateless/01492_array_join_crash_13829.reference
-%%DATADIR%%-test/queries/0_stateless/01492_array_join_crash_13829.sql
-%%DATADIR%%-test/queries/0_stateless/01492_format_readable_quantity.reference
-%%DATADIR%%-test/queries/0_stateless/01492_format_readable_quantity.sql
-%%DATADIR%%-test/queries/0_stateless/01493_alter_remove_no_property_zookeeper.reference
-%%DATADIR%%-test/queries/0_stateless/01493_alter_remove_no_property_zookeeper.sql
-%%DATADIR%%-test/queries/0_stateless/01493_alter_remove_properties.reference
-%%DATADIR%%-test/queries/0_stateless/01493_alter_remove_properties.sql
-%%DATADIR%%-test/queries/0_stateless/01493_alter_remove_properties_zookeeper.reference
-%%DATADIR%%-test/queries/0_stateless/01493_alter_remove_properties_zookeeper.sql
-%%DATADIR%%-test/queries/0_stateless/01493_alter_remove_wrong_default.reference
-%%DATADIR%%-test/queries/0_stateless/01493_alter_remove_wrong_default.sql
-%%DATADIR%%-test/queries/0_stateless/01493_storage_set_persistency.reference
-%%DATADIR%%-test/queries/0_stateless/01493_storage_set_persistency.sql
-%%DATADIR%%-test/queries/0_stateless/01493_table_function_null.reference
-%%DATADIR%%-test/queries/0_stateless/01493_table_function_null.sql
-%%DATADIR%%-test/queries/0_stateless/01494_storage_join_persistency.reference
-%%DATADIR%%-test/queries/0_stateless/01494_storage_join_persistency.sql
-%%DATADIR%%-test/queries/0_stateless/01495_subqueries_in_with_statement.reference
-%%DATADIR%%-test/queries/0_stateless/01495_subqueries_in_with_statement.sql
-%%DATADIR%%-test/queries/0_stateless/01495_subqueries_in_with_statement_2.reference
-%%DATADIR%%-test/queries/0_stateless/01495_subqueries_in_with_statement_2.sql
-%%DATADIR%%-test/queries/0_stateless/01495_subqueries_in_with_statement_3.reference
+%%DATADIR%%-test/queries/0_stateless/00534_exp10.sql
+%%DATADIR%%-test/queries/0_stateless/00845_join_on_aliases.sql
+%%DATADIR%%-test/queries/0_stateless/00990_hasToken.sh
+%%DATADIR%%-test/queries/0_stateless/01109_sc0rp10_string_hash_map_zero_bytes.reference
+%%DATADIR%%-test/queries/0_stateless/01327_decimal_cut_extra_digits_after_point.reference
+%%DATADIR%%-test/queries/0_stateless/02096_sql_user_defined_function_alias.reference
+%%DATADIR%%-test/queries/0_stateless/00753_distributed_system_columns_and_system_tables.sql
+%%DATADIR%%-test/queries/0_stateless/01556_if_null.sql
+%%DATADIR%%-test/queries/0_stateless/01615_random_one_shard_insertion.reference
+%%DATADIR%%-test/queries/0_stateless/00626_in_syntax.sql
+%%DATADIR%%-test/queries/0_stateless/00746_hashing_tuples.sql
+%%DATADIR%%-test/queries/0_stateless/01409_topK_merge.reference
+%%DATADIR%%-test/queries/0_stateless/01277_buffer_column_order.reference
+%%DATADIR%%-test/queries/0_stateless/01646_fix_window_funnel_inconistency.reference
 %%DATADIR%%-test/queries/0_stateless/01495_subqueries_in_with_statement_3.sql
-%%DATADIR%%-test/queries/0_stateless/01495_subqueries_in_with_statement_4.reference
-%%DATADIR%%-test/queries/0_stateless/01495_subqueries_in_with_statement_4.sql
-%%DATADIR%%-test/queries/0_stateless/01496_signedness_conversion_monotonicity.reference
-%%DATADIR%%-test/queries/0_stateless/01496_signedness_conversion_monotonicity.sql
-%%DATADIR%%-test/queries/0_stateless/01497_alias_on_default_array.reference
-%%DATADIR%%-test/queries/0_stateless/01497_alias_on_default_array.sql
+%%DATADIR%%-test/queries/0_stateless/00988_parallel_parts_removal.reference
+%%DATADIR%%-test/queries/0_stateless/00973_live_view_with_subquery_select_nested_with_aggregation.sql
+%%DATADIR%%-test/queries/0_stateless/00003_reinterpret_as_string.sql
+%%DATADIR%%-test/queries/0_stateless/01110_dictionary_layout_without_arguments.sql
+%%DATADIR%%-test/queries/0_stateless/01881_aggregate_functions_versioning.sql
+%%DATADIR%%-test/queries/0_stateless/00112_shard_totals_after_having.reference
+%%DATADIR%%-test/queries/0_stateless/01564_test_hint_woes.sql
+%%DATADIR%%-test/queries/0_stateless/01070_modify_ttl.reference
+%%DATADIR%%-test/queries/0_stateless/02113_format_row_bug.sql
+%%DATADIR%%-test/queries/0_stateless/00025_implicitly_used_subquery_column.reference
+%%DATADIR%%-test/queries/0_stateless/01158_zookeeper_log_long.reference
+%%DATADIR%%-test/queries/0_stateless/01070_materialize_ttl.sql
+%%DATADIR%%-test/queries/0_stateless/00975_recursive_materialized_view.reference
+%%DATADIR%%-test/queries/0_stateless/00534_functions_bad_arguments3.sh
+%%DATADIR%%-test/queries/0_stateless/00823_sequence_match_dfa.reference
+%%DATADIR%%-test/queries/0_stateless/01632_tinylog_read_write.reference
+%%DATADIR%%-test/queries/0_stateless/01305_array_join_prewhere_in_subquery.reference
+%%DATADIR%%-test/queries/0_stateless/00266_read_overflow_mode.reference
+%%DATADIR%%-test/queries/0_stateless/01895_jit_aggregation_function_avg_long.sql
+%%DATADIR%%-test/queries/0_stateless/00396_uuid.reference
+%%DATADIR%%-test/queries/0_stateless/00182_functions_higher_order_and_consts.reference
+%%DATADIR%%-test/queries/0_stateless/01338_long_select_and_alter_zookeeper.sh
+%%DATADIR%%-test/queries/0_stateless/01070_h3_to_parent.reference
+%%DATADIR%%-test/queries/0_stateless/00036_array_element.sql
+%%DATADIR%%-test/queries/0_stateless/01058_window_view_event_hop_to_strict_asc.sh
+%%DATADIR%%-test/queries/0_stateless/01134_set_overflow_mode.reference
+%%DATADIR%%-test/queries/0_stateless/01551_mergetree_read_in_order_spread.reference
+%%DATADIR%%-test/queries/0_stateless/01304_direct_io_long.reference
+%%DATADIR%%-test/queries/0_stateless/01018_ambiguous_column.sql
+%%DATADIR%%-test/queries/0_stateless/00198_group_by_empty_arrays.reference
+%%DATADIR%%-test/queries/0_stateless/01754_cluster_all_replicas_shard_num.reference
+%%DATADIR%%-test/queries/0_stateless/00751_hashing_ints.sql
+%%DATADIR%%-test/queries/0_stateless/00121_drop_column_zookeeper.sql
+%%DATADIR%%-test/queries/0_stateless/01032_cityHash64_for_UUID.sql
+%%DATADIR%%-test/queries/0_stateless/00300_csv.reference
+%%DATADIR%%-test/queries/0_stateless/01933_client_replxx_convert_history.expect
+%%DATADIR%%-test/queries/0_stateless/01622_multiple_ttls.sql
+%%DATADIR%%-test/queries/0_stateless/02097_initializeAggregationNullable.sql
+%%DATADIR%%-test/queries/0_stateless/01515_logtrace_function.sh
+%%DATADIR%%-test/queries/0_stateless/02013_emptystring_cast.reference
+%%DATADIR%%-test/queries/0_stateless/00558_parse_floats.reference
+%%DATADIR%%-test/queries/0_stateless/02003_WithMergeableStateAfterAggregationAndLimit_LIMIT_BY_LIMIT_OFFSET.reference
+%%DATADIR%%-test/queries/0_stateless/01622_constraints_simple_optimization.sql
+%%DATADIR%%-test/queries/0_stateless/01073_grant_and_revoke.sql
+%%DATADIR%%-test/queries/0_stateless/01763_support_map_lowcardinality_type.reference
+%%DATADIR%%-test/queries/0_stateless/00837_minmax_index.sh
+%%DATADIR%%-test/queries/0_stateless/01943_non_deterministic_order_key.reference
+%%DATADIR%%-test/queries/0_stateless/00748_insert_array_with_null.reference
+%%DATADIR%%-test/queries/0_stateless/01308_orc_output_format_arrays.sh
+%%DATADIR%%-test/queries/0_stateless/01034_with_fill_and_push_down_predicate.reference
+%%DATADIR%%-test/queries/0_stateless/00098_2_union_all.sql
+%%DATADIR%%-test/queries/0_stateless/00048_b_stored_aggregates_merge.reference
+%%DATADIR%%-test/queries/0_stateless/00952_part_frozen_info.sql
+%%DATADIR%%-test/queries/0_stateless/00616_final_single_part.sql
+%%DATADIR%%-test/queries/0_stateless/01554_interpreter_integer_float.sql
+%%DATADIR%%-test/queries/0_stateless/01431_utf8_ubsan.reference
+%%DATADIR%%-test/queries/0_stateless/01670_neighbor_lc_bug.sql
+%%DATADIR%%-test/queries/0_stateless/00953_constraints_operations.reference
+%%DATADIR%%-test/queries/0_stateless/00565_enum_order.sh
+%%DATADIR%%-test/queries/0_stateless/01518_cast_nullable_virtual_system_column.reference
+%%DATADIR%%-test/queries/0_stateless/01247_optimize_distributed_group_by_sharding_key_dist_on_dist.reference
+%%DATADIR%%-test/queries/0_stateless/data_zstd/test_01946.zstd
+%%DATADIR%%-test/queries/0_stateless/00278_insert_already_sorted.sql
+%%DATADIR%%-test/queries/0_stateless/01733_transform_ubsan.reference
+%%DATADIR%%-test/queries/0_stateless/00269_database_table_whitespace.reference
+%%DATADIR%%-test/queries/0_stateless/01798_uniq_theta_sketch.sql
+%%DATADIR%%-test/queries/0_stateless/00834_limit_with_constant_expressions.reference
+%%DATADIR%%-test/queries/0_stateless/00013_create_table_with_arrays.reference
+%%DATADIR%%-test/queries/0_stateless/01455_nullable_type_with_if_agg_combinator.sql
+%%DATADIR%%-test/queries/0_stateless/02158_interval_length_sum.reference
+%%DATADIR%%-test/queries/0_stateless/00875_join_right_nulls.reference
+%%DATADIR%%-test/queries/0_stateless/00560_float_leading_plus_in_exponent.reference
+%%DATADIR%%-test/queries/0_stateless/02014_storage_merge_order_by.reference
+%%DATADIR%%-test/queries/0_stateless/01716_drop_rename_sign_column.sql
+%%DATADIR%%-test/queries/0_stateless/01212_empty_join_and_totals.reference
+%%DATADIR%%-test/queries/0_stateless/00555_hasAll_hasAny.sql
+%%DATADIR%%-test/queries/0_stateless/01076_cache_dictionary_datarace_exception_ptr.reference
+%%DATADIR%%-test/queries/0_stateless/01661_test_toDayOfWeek_mysql_compatibility.sql
+%%DATADIR%%-test/queries/0_stateless/00534_functions_bad_arguments13.sh
+%%DATADIR%%-test/queries/0_stateless/01080_check_for_error_incorrect_size_of_nested_column.reference
+%%DATADIR%%-test/queries/0_stateless/00995_order_by_with_fill.sql
+%%DATADIR%%-test/queries/0_stateless/00741_client_comment_multiline.reference
+%%DATADIR%%-test/queries/0_stateless/01802_test_postgresql_protocol_with_row_policy.reference
+%%DATADIR%%-test/queries/0_stateless/00350_count_distinct.sql
+%%DATADIR%%-test/queries/0_stateless/00996_limit_with_ties.sql
+%%DATADIR%%-test/queries/0_stateless/02004_invalid_partition_mutation_stuck.reference
+%%DATADIR%%-test/queries/0_stateless/01674_htm_xml_coarse_parse.sql
+%%DATADIR%%-test/queries/0_stateless/00712_prewhere_with_alias_bug_2.sql
+%%DATADIR%%-test/queries/0_stateless/00612_count.sql
+%%DATADIR%%-test/queries/0_stateless/00534_functions_bad_arguments4_long.sh
+%%DATADIR%%-test/queries/0_stateless/00177_inserts_through_http_parts.sh
+%%DATADIR%%-test/queries/0_stateless/01073_blockSerializedSize.reference
+%%DATADIR%%-test/queries/0_stateless/02175_distributed_join_current_database.sql
+%%DATADIR%%-test/queries/0_stateless/00462_json_true_false_literals.reference
+%%DATADIR%%-test/queries/0_stateless/01913_fix_column_transformer_replace_format.sql
+%%DATADIR%%-test/queries/0_stateless/01277_random_fixed_string.reference
+%%DATADIR%%-test/queries/0_stateless/00849_multiple_comma_join_2.sql
+%%DATADIR%%-test/queries/0_stateless/00937_test_use_header_csv.sh
+%%DATADIR%%-test/queries/0_stateless/00496_substring_negative_offset.reference
+%%DATADIR%%-test/queries/0_stateless/00009_array_join_subquery.sql
+%%DATADIR%%-test/queries/0_stateless/00667_compare_arrays_of_different_types.reference
+%%DATADIR%%-test/queries/0_stateless/00158_buffer_and_nonexistent_table.sql
+%%DATADIR%%-test/queries/0_stateless/01774_ip_address_in_range.sql
+%%DATADIR%%-test/queries/0_stateless/00260_like_and_curly_braces.sql
+%%DATADIR%%-test/queries/0_stateless/01906_lc_in_bug.sql
+%%DATADIR%%-test/queries/0_stateless/01506_ttl_same_with_order_by.sql
+%%DATADIR%%-test/queries/0_stateless/01246_extractAllGroupsVertical.reference
+%%DATADIR%%-test/queries/0_stateless/00045_sorting_by_fixed_string_descending.sql
+%%DATADIR%%-test/queries/0_stateless/01429_empty_arrow_and_parquet.reference
+%%DATADIR%%-test/queries/0_stateless/02021_h3_is_pentagon.sql
+%%DATADIR%%-test/queries/0_stateless/02179_sparse_columns_detach.sql
+%%DATADIR%%-test/queries/0_stateless/01657_test_toHour_mysql_compatibility.reference
+%%DATADIR%%-test/queries/0_stateless/00764_max_query_size_allocation.sh
+%%DATADIR%%-test/queries/0_stateless/01942_untuple_transformers_msan.reference
+%%DATADIR%%-test/queries/0_stateless/01308_row_policy_and_trivial_count_query.reference
+%%DATADIR%%-test/queries/0_stateless/01186_conversion_to_nullable.reference
+%%DATADIR%%-test/queries/0_stateless/01318_decrypt.sql
+%%DATADIR%%-test/queries/0_stateless/00196_float32_formatting.sql
+%%DATADIR%%-test/queries/0_stateless/00534_functions_bad_arguments11.reference
+%%DATADIR%%-test/queries/0_stateless/00041_big_array_join.reference
+%%DATADIR%%-test/queries/0_stateless/01296_codecs_bad_arguments.reference
+%%DATADIR%%-test/queries/0_stateless/01620_fix_simple_state_arg_type.reference
+%%DATADIR%%-test/queries/0_stateless/01747_join_view_filter_dictionary.reference
+%%DATADIR%%-test/queries/0_stateless/01777_map_populate_series_ubsan.reference
+%%DATADIR%%-test/queries/0_stateless/00976_max_execution_speed.reference
+%%DATADIR%%-test/queries/0_stateless/00468_array_join_multiple_arrays_and_use_original_column.reference
+%%DATADIR%%-test/queries/0_stateless/00534_functions_bad_arguments2.sh
+%%DATADIR%%-test/queries/0_stateless/01474_bad_global_join.reference
+%%DATADIR%%-test/queries/0_stateless/01417_update_permutation_crash.sql
+%%DATADIR%%-test/queries/0_stateless/00993_system_parts_race_condition_drop_zookeeper.sh
+%%DATADIR%%-test/queries/0_stateless/00976_shard_low_cardinality_achimbab.reference
 %%DATADIR%%-test/queries/0_stateless/01497_extract_all_groups_empty_match.reference
-%%DATADIR%%-test/queries/0_stateless/01497_extract_all_groups_empty_match.sql
-%%DATADIR%%-test/queries/0_stateless/01497_mutation_support_for_storage_memory.reference
-%%DATADIR%%-test/queries/0_stateless/01497_mutation_support_for_storage_memory.sql
-%%DATADIR%%-test/queries/0_stateless/01497_now_support_timezone.reference
-%%DATADIR%%-test/queries/0_stateless/01497_now_support_timezone.sql
-%%DATADIR%%-test/queries/0_stateless/01498_alter_column_storage_memory.reference
-%%DATADIR%%-test/queries/0_stateless/01498_alter_column_storage_memory.sql
-%%DATADIR%%-test/queries/0_stateless/01499_json_named_tuples.reference
-%%DATADIR%%-test/queries/0_stateless/01499_json_named_tuples.sql
-%%DATADIR%%-test/queries/0_stateless/01499_log_deadlock.reference
-%%DATADIR%%-test/queries/0_stateless/01499_log_deadlock.sql
-%%DATADIR%%-test/queries/0_stateless/01500_StorageFile_write_to_fd.reference
+%%DATADIR%%-test/queries/0_stateless/00818_inner_join_bug_3567.reference
+%%DATADIR%%-test/queries/0_stateless/00298_enum_width_and_cast.reference
+%%DATADIR%%-test/queries/0_stateless/00279_quantiles_permuted_args.reference
+%%DATADIR%%-test/queries/0_stateless/01078_merge_tree_read_one_thread.reference
+%%DATADIR%%-test/queries/0_stateless/02097_polygon_dictionary_store_key.reference
+%%DATADIR%%-test/queries/0_stateless/01700_mod_negative_type_promotion.reference
+%%DATADIR%%-test/queries/0_stateless/01137_sample_final.reference
+%%DATADIR%%-test/queries/0_stateless/01761_cast_to_enum_nullable.reference
+%%DATADIR%%-test/queries/0_stateless/02114_hdfs_bad_url.sh
+%%DATADIR%%-test/queries/0_stateless/02151_client_option_echo.reference
+%%DATADIR%%-test/queries/0_stateless/00105_shard_collations.reference
+%%DATADIR%%-test/queries/0_stateless/01593_insert_settings.sql
+%%DATADIR%%-test/queries/0_stateless/01398_any_with_alias.sql
+%%DATADIR%%-test/queries/0_stateless/01176_mysql_client_interactive.reference
+%%DATADIR%%-test/queries/0_stateless/00596_limit_on_expanded_ast.reference
+%%DATADIR%%-test/queries/0_stateless/00079_defaulted_columns.reference
+%%DATADIR%%-test/queries/0_stateless/01083_match_zero_byte.sql
+%%DATADIR%%-test/queries/0_stateless/01130_in_memory_parts_check.sql
+%%DATADIR%%-test/queries/0_stateless/00975_sample_prewhere_distributed.reference
+%%DATADIR%%-test/queries/0_stateless/00564_enum_order.reference
+%%DATADIR%%-test/queries/0_stateless/01544_file_engine_settings.sh
+%%DATADIR%%-test/queries/0_stateless/02136_scalar_subquery_metrics.reference
+%%DATADIR%%-test/queries/0_stateless/02013_lc_nullable_and_infinity.sql
+%%DATADIR%%-test/queries/0_stateless/01376_null_logical.sql
+%%DATADIR%%-test/queries/0_stateless/01765_hashed_dictionary_simple_key.reference
+%%DATADIR%%-test/queries/0_stateless/00564_versioned_collapsing_merge_tree.sql
+%%DATADIR%%-test/queries/0_stateless/01910_memory_tracking_topk.sql
+%%DATADIR%%-test/queries/0_stateless/00973_live_view_with_subquery_select_table_alias.reference
+%%DATADIR%%-test/queries/0_stateless/02015_async_inserts_1.reference
+%%DATADIR%%-test/queries/0_stateless/00369_int_div_of_float.sql
+%%DATADIR%%-test/queries/0_stateless/01906_partition_by_multiply_by_zero.sql
+%%DATADIR%%-test/queries/0_stateless/01019_Buffer_and_max_memory_usage.sql
+%%DATADIR%%-test/queries/0_stateless/00749_inner_join_of_unnamed_subqueries.reference
+%%DATADIR%%-test/queries/0_stateless/00948_format_in_with_single_element.sh
+%%DATADIR%%-test/queries/0_stateless/00098_l_union_all.sql
+%%DATADIR%%-test/queries/0_stateless/00638_remote_ssrf.reference
+%%DATADIR%%-test/queries/0_stateless/00580_cast_nullable_to_non_nullable.reference
+%%DATADIR%%-test/queries/0_stateless/00077_set_keys_fit_128_bits_many_blocks.sql
+%%DATADIR%%-test/queries/0_stateless/01750_parsing_exception.reference
+%%DATADIR%%-test/queries/0_stateless/01632_max_partitions_to_read.sql
+%%DATADIR%%-test/queries/0_stateless/01073_bad_alter_partition.sql
+%%DATADIR%%-test/queries/0_stateless/01670_dictionary_create_key_expression.sql
+%%DATADIR%%-test/queries/0_stateless/00660_optimize_final_without_partition.reference
+%%DATADIR%%-test/queries/0_stateless/01295_create_row_policy.reference
+%%DATADIR%%-test/queries/0_stateless/01548_lzy305.sql
+%%DATADIR%%-test/queries/0_stateless/00600_create_temporary_table_if_not_exists.reference
+%%DATADIR%%-test/queries/0_stateless/01196_max_parser_depth.sh
+%%DATADIR%%-test/queries/0_stateless/01328_bad_peephole_optimization.reference
+%%DATADIR%%-test/queries/0_stateless/01327_decimal_cut_extra_digits_after_point.sql
+%%DATADIR%%-test/queries/0_stateless/00217_shard_global_subquery_columns_with_same_name.reference
+%%DATADIR%%-test/queries/0_stateless/00825_protobuf_format_table_default.reference
+%%DATADIR%%-test/queries/0_stateless/01716_decimal_comparison_ubsan.sql
+%%DATADIR%%-test/queries/0_stateless/00988_parallel_parts_removal.sql
+%%DATADIR%%-test/queries/0_stateless/00651_default_database_on_client_reconnect.sh
+%%DATADIR%%-test/queries/0_stateless/01079_parallel_alter_detach_table_zookeeper.reference
+%%DATADIR%%-test/queries/0_stateless/01232_untuple.sql
+%%DATADIR%%-test/queries/0_stateless/02098_with_types_use_header.sh
+%%DATADIR%%-test/queries/0_stateless/00557_remote_port.sh
+%%DATADIR%%-test/queries/0_stateless/02013_zlib_read_after_eof.sh
+%%DATADIR%%-test/queries/0_stateless/01078_bloom_filter_operator_not_has.sql
+%%DATADIR%%-test/queries/0_stateless/00534_functions_bad_arguments12.sh
+%%DATADIR%%-test/queries/0_stateless/01281_sum_nullable.reference
+%%DATADIR%%-test/queries/0_stateless/01266_default_prewhere_reqq.sql
+%%DATADIR%%-test/queries/0_stateless/00730_unicode_terminal_format.reference
+%%DATADIR%%-test/queries/0_stateless/00433_ifnull.reference
+%%DATADIR%%-test/queries/0_stateless/00719_insert_block_without_column.reference
+%%DATADIR%%-test/queries/0_stateless/02041_conversion_between_date32_and_datetime64.reference
+%%DATADIR%%-test/queries/0_stateless/01414_optimize_any_bug.sql
+%%DATADIR%%-test/queries/0_stateless/00392_enum_nested_alter.sql
+%%DATADIR%%-test/queries/0_stateless/01581_to_int_inf_nan.sql
+%%DATADIR%%-test/queries/0_stateless/01507_clickhouse_server_start_with_embedded_config.reference
+%%DATADIR%%-test/queries/0_stateless/00580_consistent_hashing_functions.reference
+%%DATADIR%%-test/queries/0_stateless/01603_insert_select_too_many_parts.reference
+%%DATADIR%%-test/queries/0_stateless/00562_in_subquery_merge_tree.sql
+%%DATADIR%%-test/queries/0_stateless/01277_unixTimestamp64_compatibility.reference
+%%DATADIR%%-test/queries/0_stateless/01019_alter_materialized_view_query.sql
+%%DATADIR%%-test/queries/0_stateless/01528_play.sh
+%%DATADIR%%-test/queries/0_stateless/00715_bounding_ratio.reference
+%%DATADIR%%-test/queries/0_stateless/00634_logging_shard.sh
+%%DATADIR%%-test/queries/0_stateless/00941_to_custom_week.sql
+%%DATADIR%%-test/queries/0_stateless/01579_date_datetime_index_comparison.sql
+%%DATADIR%%-test/queries/0_stateless/01408_range_overflow.sql
+%%DATADIR%%-test/queries/0_stateless/01561_mann_whitney_scipy.sh
+%%DATADIR%%-test/queries/0_stateless/01062_pm_all_join_with_block_continuation.sql
+%%DATADIR%%-test/queries/0_stateless/00232_format_readable_size.sql
+%%DATADIR%%-test/queries/0_stateless/00980_create_temporary_live_view.sql
+%%DATADIR%%-test/queries/0_stateless/00944_minmax_null.reference
+%%DATADIR%%-test/queries/0_stateless/01710_projection_fetch_long.reference
+%%DATADIR%%-test/queries/0_stateless/00851_http_insert_json_defaults.reference
+%%DATADIR%%-test/queries/0_stateless/01053_drop_database_mat_view.sql
+%%DATADIR%%-test/queries/0_stateless/02126_alter_table_alter_column.sql
+%%DATADIR%%-test/queries/0_stateless/01798_uniq_theta_sketch.reference
+%%DATADIR%%-test/queries/0_stateless/01316_create_user_syntax_hilite.reference
+%%DATADIR%%-test/queries/0_stateless/01052_window_view_proc_tumble_to_now.reference
+%%DATADIR%%-test/queries/0_stateless/00682_empty_parts_merge.reference
+%%DATADIR%%-test/queries/0_stateless/00598_create_as_select_http.reference
+%%DATADIR%%-test/queries/0_stateless/00540_bad_data_types.reference
+%%DATADIR%%-test/queries/0_stateless/01930_optimize_skip_unused_shards_rewrite_in.sql
+%%DATADIR%%-test/queries/0_stateless/01272_suspicious_codecs.reference
+%%DATADIR%%-test/queries/0_stateless/00366_multi_statements.reference
+%%DATADIR%%-test/queries/0_stateless/01078_merge_tree_read_one_thread.sql
+%%DATADIR%%-test/queries/0_stateless/02041_test_fuzzy_alter.reference
+%%DATADIR%%-test/queries/0_stateless/01685_ssd_cache_dictionary_complex_key.reference
+%%DATADIR%%-test/queries/0_stateless/00929_multi_match_edit_distance.reference
+%%DATADIR%%-test/queries/0_stateless/01513_ilike_like_cache.reference
+%%DATADIR%%-test/queries/0_stateless/01013_hex_float.sql
+%%DATADIR%%-test/queries/0_stateless/00057_join_aliases.sql
+%%DATADIR%%-test/queries/0_stateless/01273_arrow.sh
+%%DATADIR%%-test/queries/0_stateless/02026_describe_include_subcolumns.reference
+%%DATADIR%%-test/queries/0_stateless/00293_shard_max_subquery_depth.sql
+%%DATADIR%%-test/queries/0_stateless/01558_transform_null_in.reference
+%%DATADIR%%-test/queries/0_stateless/02021_prewhere_always_true_where.reference
+%%DATADIR%%-test/queries/0_stateless/00740_database_in_nested_view.sql
+%%DATADIR%%-test/queries/0_stateless/01650_fetch_patition_with_macro_in_zk_path_long.reference
+%%DATADIR%%-test/queries/0_stateless/00544_agg_foreach_of_two_arg.sql
+%%DATADIR%%-test/queries/0_stateless/01737_clickhouse_server_wait_server_pool_long.config.xml
+%%DATADIR%%-test/queries/0_stateless/00732_quorum_insert_simple_test_1_parts_zookeeper_long.reference
+%%DATADIR%%-test/queries/0_stateless/01682_gather_utils_ubsan.reference
+%%DATADIR%%-test/queries/0_stateless/00564_initial_column_values_with_default_expression.reference
+%%DATADIR%%-test/queries/0_stateless/01780_column_sparse_distinct.sql
+%%DATADIR%%-test/queries/0_stateless/01549_low_cardinality_materialized_view.reference
+%%DATADIR%%-test/queries/0_stateless/01451_normalize_query.reference
+%%DATADIR%%-test/queries/0_stateless/00209_insert_select_extremes.reference
+%%DATADIR%%-test/queries/0_stateless/00597_push_down_predicate_long.sql
+%%DATADIR%%-test/queries/0_stateless/02048_clickhouse_local_stage.sh
+%%DATADIR%%-test/queries/0_stateless/01000_subquery_requires_alias.sql
+%%DATADIR%%-test/queries/0_stateless/00800_low_cardinality_merge_join.reference
+%%DATADIR%%-test/queries/0_stateless/01721_engine_file_truncate_on_insert.sql
+%%DATADIR%%-test/queries/0_stateless/00170_lower_upper_utf8.sql
+%%DATADIR%%-test/queries/0_stateless/01821_table_comment.sql
+%%DATADIR%%-test/queries/0_stateless/01276_random_string.reference
+%%DATADIR%%-test/queries/0_stateless/01045_dictionaries_restrictions.reference
+%%DATADIR%%-test/queries/0_stateless/01104_distributed_numbers_test.sql
+%%DATADIR%%-test/queries/0_stateless/02155_csv_with_strings_with_slash.sh
+%%DATADIR%%-test/queries/0_stateless/00612_pk_in_tuple_perf.sh
+%%DATADIR%%-test/queries/0_stateless/01600_select_in_different_types.reference
+%%DATADIR%%-test/queries/0_stateless/01018_ddl_dictionaries_create.reference
+%%DATADIR%%-test/queries/0_stateless/02111_with_fill_no_rows.reference
+%%DATADIR%%-test/queries/0_stateless/01702_bitmap_native_integers.sql
+%%DATADIR%%-test/queries/0_stateless/01715_background_checker_blather_zookeeper_long.reference
+%%DATADIR%%-test/queries/0_stateless/00098_e_union_all.reference
+%%DATADIR%%-test/queries/0_stateless/01835_alias_to_primary_key_cyfdecyf.reference
+%%DATADIR%%-test/queries/0_stateless/01459_decimal_casts.sql
+%%DATADIR%%-test/queries/0_stateless/00973_live_view_with_subquery_select_nested_with_aggregation_table_alias.reference
+%%DATADIR%%-test/queries/0_stateless/00943_mv_rename_without_inner_table.reference
+%%DATADIR%%-test/queries/0_stateless/01675_distributed_bytes_to_delay_insert.reference
+%%DATADIR%%-test/queries/0_stateless/00280_hex_escape_sequence.reference
+%%DATADIR%%-test/queries/0_stateless/01881_to_week_monotonic_fix.sql
+%%DATADIR%%-test/queries/0_stateless/01946_tskv.reference
+%%DATADIR%%-test/queries/0_stateless/01905_to_json_string.sql
+%%DATADIR%%-test/queries/0_stateless/00752_low_cardinality_permute.reference
+%%DATADIR%%-test/queries/0_stateless/01063_window_view_event_tumble_to_bounded.reference
+%%DATADIR%%-test/queries/0_stateless/00956_sensitive_data_masking.sh
+%%DATADIR%%-test/queries/0_stateless/02160_h3_hex_area_Km2.sql
+%%DATADIR%%-test/queries/0_stateless/01024__getScalar.sql
+%%DATADIR%%-test/queries/0_stateless/00555_right_join_excessive_rows.sql
+%%DATADIR%%-test/queries/0_stateless/01252_weird_time_zone.sql
+%%DATADIR%%-test/queries/0_stateless/00534_filimonov.reference
+%%DATADIR%%-test/queries/0_stateless/00407_parsing_nulls.reference
+%%DATADIR%%-test/queries/0_stateless/01955_clickhouse_benchmark_connection_hang.reference
+%%DATADIR%%-test/queries/0_stateless/01011_group_uniq_array_memsan.sql
+%%DATADIR%%-test/queries/0_stateless/01247_least_greatest_filimonov.reference
+%%DATADIR%%-test/queries/0_stateless/00513_fractional_time_zones.sql
+%%DATADIR%%-test/queries/0_stateless/00012_array_join_alias_2.reference
+%%DATADIR%%-test/queries/0_stateless/01096_block_serialized_state.sql
+%%DATADIR%%-test/queries/0_stateless/01441_array_combinator.sql
+%%DATADIR%%-test/queries/0_stateless/01268_mergine_sorted_limit.reference
+%%DATADIR%%-test/queries/0_stateless/00825_protobuf_format_map.sh
+%%DATADIR%%-test/queries/0_stateless/00898_parsing_bad_diagnostic_message.reference
+%%DATADIR%%-test/queries/0_stateless/00459_group_array_insert_at.reference
+%%DATADIR%%-test/queries/0_stateless/01097_pre_limit.reference
+%%DATADIR%%-test/queries/0_stateless/01561_Date_and_DateTime64_comparision.sql
+%%DATADIR%%-test/queries/0_stateless/00863_comma_join_in.sql
+%%DATADIR%%-test/queries/0_stateless/01114_mysql_database_engine_segfault.sql
+%%DATADIR%%-test/queries/0_stateless/01533_distinct_depends_on_max_threads.reference
+%%DATADIR%%-test/queries/0_stateless/01055_compact_parts_granularity.reference
+%%DATADIR%%-test/queries/0_stateless/00527_totals_having_nullable.sql
+%%DATADIR%%-test/queries/0_stateless/01917_distinct_on.reference
+%%DATADIR%%-test/queries/0_stateless/01118_is_constant.reference
+%%DATADIR%%-test/queries/0_stateless/01283_strict_resize_bug.reference
+%%DATADIR%%-test/queries/0_stateless/02159_left_right.sql
+%%DATADIR%%-test/queries/0_stateless/01070_alter_with_ttl.reference
+%%DATADIR%%-test/queries/0_stateless/01702_system_query_log.sql
+%%DATADIR%%-test/queries/0_stateless/01763_max_distributed_depth.sql
 %%DATADIR%%-test/queries/0_stateless/01500_StorageFile_write_to_fd.sh
-%%DATADIR%%-test/queries/0_stateless/01501_cache_dictionary_all_fields.reference
-%%DATADIR%%-test/queries/0_stateless/01501_cache_dictionary_all_fields.sql
-%%DATADIR%%-test/queries/0_stateless/01501_clickhouse_client_INSERT_exception.reference
-%%DATADIR%%-test/queries/0_stateless/01501_clickhouse_client_INSERT_exception.sh
-%%DATADIR%%-test/queries/0_stateless/01502_bar_overflow.reference
-%%DATADIR%%-test/queries/0_stateless/01502_bar_overflow.sql
-%%DATADIR%%-test/queries/0_stateless/01502_jemalloc_percpu_arena.reference
-%%DATADIR%%-test/queries/0_stateless/01502_jemalloc_percpu_arena.sh
-%%DATADIR%%-test/queries/0_stateless/01502_log_tinylog_deadlock_race.reference
-%%DATADIR%%-test/queries/0_stateless/01502_log_tinylog_deadlock_race.sh
-%%DATADIR%%-test/queries/0_stateless/01502_long_log_tinylog_deadlock_race.reference
-%%DATADIR%%-test/queries/0_stateless/01502_long_log_tinylog_deadlock_race.sh
-%%DATADIR%%-test/queries/0_stateless/01503_fixed_string_primary_key.reference
-%%DATADIR%%-test/queries/0_stateless/01503_fixed_string_primary_key.sql
-%%DATADIR%%-test/queries/0_stateless/01503_if_const_optimization.reference
-%%DATADIR%%-test/queries/0_stateless/01503_if_const_optimization.sql
-%%DATADIR%%-test/queries/0_stateless/01504_compression_multiple_streams.reference
-%%DATADIR%%-test/queries/0_stateless/01504_compression_multiple_streams.sql
-%%DATADIR%%-test/queries/0_stateless/01504_rocksdb.reference
-%%DATADIR%%-test/queries/0_stateless/01504_rocksdb.sql
-%%DATADIR%%-test/queries/0_stateless/01504_view_type_conversion.reference
-%%DATADIR%%-test/queries/0_stateless/01504_view_type_conversion.sql
-%%DATADIR%%-test/queries/0_stateless/01505_distributed_local_type_conversion_enum.reference
-%%DATADIR%%-test/queries/0_stateless/01505_distributed_local_type_conversion_enum.sql
-%%DATADIR%%-test/queries/0_stateless/01505_log_distributed_deadlock.reference
-%%DATADIR%%-test/queries/0_stateless/01505_log_distributed_deadlock.sql
-%%DATADIR%%-test/queries/0_stateless/01505_pipeline_executor_UAF.reference
+%%DATADIR%%-test/queries/0_stateless/01142_merge_join_lc_and_nullable_in_key.reference
+%%DATADIR%%-test/queries/0_stateless/01548_uncomparable_columns_in_keys.sql
+%%DATADIR%%-test/queries/0_stateless/00614_shard_same_header_for_local_and_remote_node_in_distributed_query.sql
+%%DATADIR%%-test/queries/0_stateless/00919_histogram_merge.reference
+%%DATADIR%%-test/queries/0_stateless/01852_map_combinator.reference
 %%DATADIR%%-test/queries/0_stateless/01505_pipeline_executor_UAF.sh
-%%DATADIR%%-test/queries/0_stateless/01505_trivial_count_with_partition_predicate.reference
-%%DATADIR%%-test/queries/0_stateless/01505_trivial_count_with_partition_predicate.sql
-%%DATADIR%%-test/queries/0_stateless/01506_buffer_table_alter_block_structure.reference
-%%DATADIR%%-test/queries/0_stateless/01506_buffer_table_alter_block_structure.sql
-%%DATADIR%%-test/queries/0_stateless/01506_ttl_same_with_order_by.reference
-%%DATADIR%%-test/queries/0_stateless/01506_ttl_same_with_order_by.sql
-%%DATADIR%%-test/queries/0_stateless/01507_clickhouse_server_start_with_embedded_config.reference
-%%DATADIR%%-test/queries/0_stateless/01507_clickhouse_server_start_with_embedded_config.sh
-%%DATADIR%%-test/queries/0_stateless/01507_multiversion_storage_for_storagememory.reference
-%%DATADIR%%-test/queries/0_stateless/01507_multiversion_storage_for_storagememory.sql
-%%DATADIR%%-test/queries/0_stateless/01507_transform_null_in.reference
-%%DATADIR%%-test/queries/0_stateless/01507_transform_null_in.sql
-%%DATADIR%%-test/queries/0_stateless/01508_explain_header.reference
-%%DATADIR%%-test/queries/0_stateless/01508_explain_header.sql
-%%DATADIR%%-test/queries/0_stateless/01508_format_regexp_raw.reference
-%%DATADIR%%-test/queries/0_stateless/01508_format_regexp_raw.sh
-%%DATADIR%%-test/queries/0_stateless/01508_partition_pruning_long.queries
-%%DATADIR%%-test/queries/0_stateless/01508_partition_pruning_long.reference
-%%DATADIR%%-test/queries/0_stateless/01508_partition_pruning_long.sh
-%%DATADIR%%-test/queries/0_stateless/01508_query_obfuscator.reference
-%%DATADIR%%-test/queries/0_stateless/01508_query_obfuscator.sh
-%%DATADIR%%-test/queries/0_stateless/01508_race_condition_rename_clear_zookeeper_long.reference
-%%DATADIR%%-test/queries/0_stateless/01508_race_condition_rename_clear_zookeeper_long.sh
-%%DATADIR%%-test/queries/0_stateless/01509_check_many_parallel_quorum_inserts_long.reference
-%%DATADIR%%-test/queries/0_stateless/01509_check_many_parallel_quorum_inserts_long.sh
-%%DATADIR%%-test/queries/0_stateless/01509_check_parallel_quorum_inserts_long.reference
-%%DATADIR%%-test/queries/0_stateless/01509_check_parallel_quorum_inserts_long.sh
-%%DATADIR%%-test/queries/0_stateless/01509_dictionary_preallocate.reference
-%%DATADIR%%-test/queries/0_stateless/01509_dictionary_preallocate.sh
-%%DATADIR%%-test/queries/0_stateless/01509_format_raw_blob.reference
-%%DATADIR%%-test/queries/0_stateless/01509_format_raw_blob.sh
-%%DATADIR%%-test/queries/0_stateless/01509_output_format_pretty_row_numbers.reference
-%%DATADIR%%-test/queries/0_stateless/01509_output_format_pretty_row_numbers.sql
-%%DATADIR%%-test/queries/0_stateless/01509_parallel_quorum_and_merge_long.reference
-%%DATADIR%%-test/queries/0_stateless/01509_parallel_quorum_and_merge_long.sh
-%%DATADIR%%-test/queries/0_stateless/01509_parallel_quorum_insert_no_replicas.reference
-%%DATADIR%%-test/queries/0_stateless/01509_parallel_quorum_insert_no_replicas.sql
-%%DATADIR%%-test/queries/0_stateless/01510_format_regexp_raw_low_cardinality.reference
-%%DATADIR%%-test/queries/0_stateless/01510_format_regexp_raw_low_cardinality.sh
-%%DATADIR%%-test/queries/0_stateless/01511_alter_version_versioned_collapsing_merge_tree.reference
-%%DATADIR%%-test/queries/0_stateless/01511_alter_version_versioned_collapsing_merge_tree.sql
-%%DATADIR%%-test/queries/0_stateless/01511_alter_version_versioned_collapsing_merge_tree_zookeeper.reference
-%%DATADIR%%-test/queries/0_stateless/01511_alter_version_versioned_collapsing_merge_tree_zookeeper.sql
-%%DATADIR%%-test/queries/0_stateless/01511_different_expression_with_same_alias.reference
-%%DATADIR%%-test/queries/0_stateless/01511_different_expression_with_same_alias.sql
-%%DATADIR%%-test/queries/0_stateless/01511_format_readable_timedelta.reference
-%%DATADIR%%-test/queries/0_stateless/01511_format_readable_timedelta.sql
-%%DATADIR%%-test/queries/0_stateless/01511_prewhere_with_virtuals.reference
-%%DATADIR%%-test/queries/0_stateless/01511_prewhere_with_virtuals.sql
+%%DATADIR%%-test/queries/0_stateless/01786_nullable_string_tsv_at_eof.reference
+%%DATADIR%%-test/queries/0_stateless/00800_low_cardinality_join.sql
+%%DATADIR%%-test/queries/0_stateless/02003_compress_bz2.sh
+%%DATADIR%%-test/queries/0_stateless/01506_buffer_table_alter_block_structure_2.reference
+%%DATADIR%%-test/queries/0_stateless/01603_decimal_mult_float.reference
+%%DATADIR%%-test/queries/0_stateless/01380_coded_delta_exception_code.sql
+%%DATADIR%%-test/queries/0_stateless/02161_array_first_last.sql
+%%DATADIR%%-test/queries/0_stateless/00519_create_as_select_from_temporary_table.sql
 %%DATADIR%%-test/queries/0_stateless/01512_create_replicate_merge_tree_one_arg.reference
-%%DATADIR%%-test/queries/0_stateless/01512_create_replicate_merge_tree_one_arg.sql
-%%DATADIR%%-test/queries/0_stateless/01513_count_without_select_sequence_consistency_zookeeper.reference
-%%DATADIR%%-test/queries/0_stateless/01513_count_without_select_sequence_consistency_zookeeper.sql
-%%DATADIR%%-test/queries/0_stateless/01513_defaults_on_defaults_no_column.reference
-%%DATADIR%%-test/queries/0_stateless/01513_defaults_on_defaults_no_column.sql
-%%DATADIR%%-test/queries/0_stateless/01513_ilike_like_cache.reference
-%%DATADIR%%-test/queries/0_stateless/01513_ilike_like_cache.sql
-%%DATADIR%%-test/queries/0_stateless/01513_optimize_aggregation_in_order_memory_long.reference
-%%DATADIR%%-test/queries/0_stateless/01513_optimize_aggregation_in_order_memory_long.sql
-%%DATADIR%%-test/queries/0_stateless/01514_distributed_cancel_query_on_error.reference
-%%DATADIR%%-test/queries/0_stateless/01514_distributed_cancel_query_on_error.sh
-%%DATADIR%%-test/queries/0_stateless/01514_empty_buffer_different_types.reference
-%%DATADIR%%-test/queries/0_stateless/01514_empty_buffer_different_types.sql
-%%DATADIR%%-test/queries/0_stateless/01514_input_format_csv_enum_as_number_setting.reference
-%%DATADIR%%-test/queries/0_stateless/01514_input_format_csv_enum_as_number_setting.sql
-%%DATADIR%%-test/queries/0_stateless/01514_input_format_json_enum_as_number.reference
-%%DATADIR%%-test/queries/0_stateless/01514_input_format_json_enum_as_number.sql
-%%DATADIR%%-test/queries/0_stateless/01514_input_format_tsv_enum_as_number_setting.reference
-%%DATADIR%%-test/queries/0_stateless/01514_input_format_tsv_enum_as_number_setting.sql
-%%DATADIR%%-test/queries/0_stateless/01514_parallel_formatting.reference
-%%DATADIR%%-test/queries/0_stateless/01514_parallel_formatting.sql
-%%DATADIR%%-test/queries/0_stateless/01514_tid_function.reference
-%%DATADIR%%-test/queries/0_stateless/01514_tid_function.sql
-%%DATADIR%%-test/queries/0_stateless/01515_force_data_skipping_indices.reference
-%%DATADIR%%-test/queries/0_stateless/01515_force_data_skipping_indices.sql
-%%DATADIR%%-test/queries/0_stateless/01515_logtrace_function.reference
-%%DATADIR%%-test/queries/0_stateless/01515_logtrace_function.sh
+%%DATADIR%%-test/queries/0_stateless/01481_join_with_materialized.sql
+%%DATADIR%%-test/queries/0_stateless/01671_merge_join_and_constants.sql
+%%DATADIR%%-test/queries/0_stateless/00688_low_cardinality_in.reference
+%%DATADIR%%-test/queries/0_stateless/01717_global_with_subquery_fix.sql
+%%DATADIR%%-test/queries/0_stateless/01592_length_map.reference
+%%DATADIR%%-test/queries/0_stateless/01720_dictionary_create_source_with_functions.reference
+%%DATADIR%%-test/queries/0_stateless/02096_join_unusual_identifier_begin.reference
+%%DATADIR%%-test/queries/0_stateless/01031_new_any_join.reference
+%%DATADIR%%-test/queries/0_stateless/00925_zookeeper_empty_replicated_merge_tree_optimize_final_long.sh
+%%DATADIR%%-test/queries/0_stateless/01015_insert_values_parametrized.reference
+%%DATADIR%%-test/queries/0_stateless/02098_date32_comparison.reference
+%%DATADIR%%-test/queries/0_stateless/02110_clickhouse_local_custom_tld.tld.dat
+%%DATADIR%%-test/queries/0_stateless/01280_opencl_bitonic_order_by.reference
+%%DATADIR%%-test/queries/0_stateless/01674_unicode_asan.reference
+%%DATADIR%%-test/queries/0_stateless/00754_first_significant_subdomain_more.reference
+%%DATADIR%%-test/queries/0_stateless/01700_point_in_polygon_ubsan.reference
+%%DATADIR%%-test/queries/0_stateless/01273_extractGroups.sql
+%%DATADIR%%-test/queries/0_stateless/01415_table_function_view.sql
+%%DATADIR%%-test/queries/0_stateless/00804_test_custom_compression_codes_log_storages.sql
+%%DATADIR%%-test/queries/0_stateless/00644_different_expressions_with_same_alias.reference
+%%DATADIR%%-test/queries/0_stateless/00732_quorum_insert_select_with_old_data_and_without_quorum_zookeeper_long.reference
+%%DATADIR%%-test/queries/0_stateless/00805_round_down.sql
+%%DATADIR%%-test/queries/0_stateless/00674_has_array_enum.sql
+%%DATADIR%%-test/queries/0_stateless/01948_heredoc.reference
+%%DATADIR%%-test/queries/0_stateless/00153_transform.reference
+%%DATADIR%%-test/queries/0_stateless/01698_map_populate_overflow.sql
+%%DATADIR%%-test/queries/0_stateless/01037_polygon_dicts_correctness_fast.sh
+%%DATADIR%%-test/queries/0_stateless/01213_alter_rename_column.sql
+%%DATADIR%%-test/queries/0_stateless/02001_add_default_database_to_system_users.sql
+%%DATADIR%%-test/queries/0_stateless/01083_match_zero_byte.reference
+%%DATADIR%%-test/queries/0_stateless/01089_alter_settings_old_format.reference
+%%DATADIR%%-test/queries/0_stateless/01661_join_complex.sql
+%%DATADIR%%-test/queries/0_stateless/01632_max_partitions_to_read.reference
+%%DATADIR%%-test/queries/0_stateless/00367_visible_width_of_array_tuple_enum.reference
+%%DATADIR%%-test/queries/0_stateless/00125_array_element_of_array_of_tuple.sql
+%%DATADIR%%-test/queries/0_stateless/02028_system_data_skipping_indices_size.sql
+%%DATADIR%%-test/queries/0_stateless/01050_engine_join_view_crash.sql
+%%DATADIR%%-test/queries/0_stateless/00688_low_cardinality_nullable_cast.sql
+%%DATADIR%%-test/queries/0_stateless/02047_log_family_complex_structs_data_file_dumps.sh
+%%DATADIR%%-test/queries/0_stateless/00316_rounding_functions_and_empty_block.sql
+%%DATADIR%%-test/queries/0_stateless/01056_prepared_statements_null_and_escaping.reference
+%%DATADIR%%-test/queries/0_stateless/01802_rank_corr_mann_whitney_over_window.reference
+%%DATADIR%%-test/queries/0_stateless/01660_join_or_subqueries.reference
+%%DATADIR%%-test/queries/0_stateless/01523_interval_operator_support_string_literal.sql
+%%DATADIR%%-test/queries/0_stateless/00417_system_build_options.sh
+%%DATADIR%%-test/queries/0_stateless/02046_remote_table_function_named_collections.sql
+%%DATADIR%%-test/queries/0_stateless/01071_live_view_detach_dependency.sql
+%%DATADIR%%-test/queries/0_stateless/01497_alias_on_default_array.sql
+%%DATADIR%%-test/queries/0_stateless/01356_view_threads.sql
+%%DATADIR%%-test/queries/0_stateless/00472_compare_uuid_with_constant_string.sql
+%%DATADIR%%-test/queries/0_stateless/00311_array_primary_key.reference
+%%DATADIR%%-test/queries/0_stateless/01376_GROUP_BY_injective_elimination_dictGet.sql
+%%DATADIR%%-test/queries/0_stateless/01137_order_by_func_final.reference
+%%DATADIR%%-test/queries/0_stateless/00980_zookeeper_merge_tree_alter_settings.sql
+%%DATADIR%%-test/queries/0_stateless/01939_type_map_json.sql
+%%DATADIR%%-test/queries/0_stateless/01630_simple_aggregate_all_functions_in_summing_merge_tree.reference
+%%DATADIR%%-test/queries/0_stateless/01541_max_memory_usage_for_user_long.sh
+%%DATADIR%%-test/queries/0_stateless/01424_parse_date_time_bad_date.reference
+%%DATADIR%%-test/queries/0_stateless/00208_agg_state_merge.sql
+%%DATADIR%%-test/queries/0_stateless/01526_max_untracked_memory.sh
+%%DATADIR%%-test/queries/0_stateless/00133_long_shard_memory_tracker_and_exception_safety.sh
+%%DATADIR%%-test/queries/0_stateless/01073_attach_if_not_exists.sql
+%%DATADIR%%-test/queries/0_stateless/00944_create_bloom_filter_index_with_merge_tree.sh
+%%DATADIR%%-test/queries/0_stateless/00927_asof_joins.sql
+%%DATADIR%%-test/queries/0_stateless/00927_asof_join_correct_bt.reference
+%%DATADIR%%-test/queries/0_stateless/00534_functions_bad_arguments10.reference
+%%DATADIR%%-test/queries/0_stateless/00825_protobuf_format_table_default.sh
+%%DATADIR%%-test/queries/0_stateless/00693_max_block_size_system_tables_columns.reference
+%%DATADIR%%-test/queries/0_stateless/01710_projection_materialize_with_missing_columns.sql
+%%DATADIR%%-test/queries/0_stateless/01070_mutations_with_dependencies.sql
+%%DATADIR%%-test/queries/0_stateless/00978_table_function_values_alias.sql
+%%DATADIR%%-test/queries/0_stateless/01710_projection_group_by_order_by.reference
+%%DATADIR%%-test/queries/0_stateless/01213_alter_rename_nested.sql
+%%DATADIR%%-test/queries/0_stateless/00688_aggregation_retention.reference
+%%DATADIR%%-test/queries/0_stateless/01056_negative_with_bloom_filter.reference
+%%DATADIR%%-test/queries/0_stateless/01360_materialized_view_with_join_on_query_log.reference
+%%DATADIR%%-test/queries/0_stateless/02154_bitmap_contains.reference
+%%DATADIR%%-test/queries/0_stateless/01669_columns_declaration_serde_long.sql
+%%DATADIR%%-test/queries/0_stateless/00910_buffer_prewhere.sql
+%%DATADIR%%-test/queries/0_stateless/00516_deduplication_after_drop_partition_zookeeper.reference
+%%DATADIR%%-test/queries/0_stateless/01731_async_task_queue_wait.sh
+%%DATADIR%%-test/queries/0_stateless/01321_aggregate_functions_of_group_by_keys.reference
+%%DATADIR%%-test/queries/0_stateless/02137_mv_into_join.sql
+%%DATADIR%%-test/queries/0_stateless/01640_distributed_async_insert_compression.reference
+%%DATADIR%%-test/queries/0_stateless/01063_create_column_set.sql
+%%DATADIR%%-test/queries/0_stateless/01881_create_as_tuple.reference
+%%DATADIR%%-test/queries/0_stateless/01701_parallel_parsing_infinite_segmentation.sh
+%%DATADIR%%-test/queries/0_stateless/02115_rewrite_local_join_right_distribute_table.reference
+%%DATADIR%%-test/queries/0_stateless/02156_async_insert_query_log.reference
+%%DATADIR%%-test/queries/0_stateless/00957_delta_diff_bug.sql
+%%DATADIR%%-test/queries/0_stateless/00623_truncate_table.reference
+%%DATADIR%%-test/queries/0_stateless/01273_arrow_stream.reference
+%%DATADIR%%-test/queries/0_stateless/00510_materizlized_view_and_deduplication_zookeeper.sql
+%%DATADIR%%-test/queries/0_stateless/01272_totals_and_filter_bug.reference
+%%DATADIR%%-test/queries/0_stateless/02013_zlib_read_after_eof.reference
+%%DATADIR%%-test/queries/0_stateless/01668_avg_weighted_ubsan.sql
+%%DATADIR%%-test/queries/0_stateless/00746_sql_fuzzy.sh
+%%DATADIR%%-test/queries/0_stateless/01611_constant_folding_subqueries.sql
+%%DATADIR%%-test/queries/0_stateless/02098_sql_user_defined_functions_aliases.reference
+%%DATADIR%%-test/queries/0_stateless/01201_read_single_thread_in_order.sql
+%%DATADIR%%-test/queries/0_stateless/02029_output_csv_null_representation.reference
+%%DATADIR%%-test/queries/0_stateless/01018_empty_aggregation_filling.reference
+%%DATADIR%%-test/queries/0_stateless/00738_lock_for_inner_table.reference
+%%DATADIR%%-test/queries/0_stateless/02124_uncompressed_cache.reference
+%%DATADIR%%-test/queries/0_stateless/01782_field_oom.sql
+%%DATADIR%%-test/queries/0_stateless/00712_prewhere_with_sampling_and_alias.sql
+%%DATADIR%%-test/queries/0_stateless/01503_fixed_string_primary_key.reference
+%%DATADIR%%-test/queries/0_stateless/01804_dictionary_decimal256_type.reference
+%%DATADIR%%-test/queries/0_stateless/01658_substring_ubsan.reference
+%%DATADIR%%-test/queries/0_stateless/00098_7_union_all.sql
+%%DATADIR%%-test/queries/0_stateless/00334_column_aggregate_function_limit.sql
+%%DATADIR%%-test/queries/0_stateless/01720_join_implicit_cast.sql.j2
+%%DATADIR%%-test/queries/0_stateless/00088_distinct_of_arrays_of_strings.sql
+%%DATADIR%%-test/queries/0_stateless/02160_monthname.reference
+%%DATADIR%%-test/queries/0_stateless/00063_check_query.reference
+%%DATADIR%%-test/queries/0_stateless/01339_client_unrecognized_option.sh
+%%DATADIR%%-test/queries/0_stateless/01300_client_save_history_when_terminated_long.expect
+%%DATADIR%%-test/queries/0_stateless/00623_truncate_table.sql
+%%DATADIR%%-test/queries/0_stateless/01605_key_condition_enum_int.reference
+%%DATADIR%%-test/queries/0_stateless/01770_add_months_ubsan.reference
+%%DATADIR%%-test/queries/0_stateless/01180_client_syntax_errors.expect
+%%DATADIR%%-test/queries/0_stateless/00971_merge_tree_uniform_read_distribution_and_max_rows_to_read.sql
+%%DATADIR%%-test/queries/0_stateless/01428_hash_set_nan_key.sql
+%%DATADIR%%-test/queries/0_stateless/00445_join_nullable_keys.reference
+%%DATADIR%%-test/queries/0_stateless/00443_preferred_block_size_bytes.sh
+%%DATADIR%%-test/queries/0_stateless/01691_parser_data_type_exponential.sh
+%%DATADIR%%-test/queries/0_stateless/01676_long_clickhouse_client_autocomplete.reference
+%%DATADIR%%-test/queries/0_stateless/01602_max_distributed_connections.sh
+%%DATADIR%%-test/queries/0_stateless/01890_state_of_state.sql
+%%DATADIR%%-test/queries/0_stateless/00644_different_expressions_with_same_alias.sql
+%%DATADIR%%-test/queries/0_stateless/00296_url_parameters.sql
+%%DATADIR%%-test/queries/0_stateless/00388_enum_with_totals.reference
+%%DATADIR%%-test/queries/0_stateless/01732_explain_syntax_union_query.reference
+%%DATADIR%%-test/queries/0_stateless/01073_blockSerializedSize.sql
+%%DATADIR%%-test/queries/0_stateless/01305_array_join_prewhere_in_subquery.sql
+%%DATADIR%%-test/queries/0_stateless/00264_uniq_many_args.reference
+%%DATADIR%%-test/queries/0_stateless/01768_array_product.reference
+%%DATADIR%%-test/queries/0_stateless/01316_create_user_syntax_hilite.sh
+%%DATADIR%%-test/queries/0_stateless/00184_shard_distributed_group_by_no_merge.sql
+%%DATADIR%%-test/queries/0_stateless/02001_dist_on_dist_WithMergeableStateAfterAggregation.sql
+%%DATADIR%%-test/queries/0_stateless/01648_normalize_query_keep_names.sql
+%%DATADIR%%-test/queries/0_stateless/00816_long_concurrent_alter_column.sh
+%%DATADIR%%-test/queries/0_stateless/00191_aggregating_merge_tree_and_final.reference
+%%DATADIR%%-test/queries/0_stateless/00525_aggregate_functions_of_nullable_that_return_non_nullable.sql
+%%DATADIR%%-test/queries/0_stateless/00534_functions_bad_arguments1.reference
+%%DATADIR%%-test/queries/0_stateless/01010_partial_merge_join.reference
+%%DATADIR%%-test/queries/0_stateless/01048_exists_query.reference
+%%DATADIR%%-test/queries/0_stateless/00437_nulls_first_last.reference
+%%DATADIR%%-test/queries/0_stateless/00912_string_comparison.reference
+%%DATADIR%%-test/queries/0_stateless/01957_heredoc_more.reference
+%%DATADIR%%-test/queries/0_stateless/01913_names_of_tuple_literal.sql
+%%DATADIR%%-test/queries/0_stateless/02104_clickhouse_local_columns_description.sh
+%%DATADIR%%-test/queries/0_stateless/00183_skip_unavailable_shards.sql
+%%DATADIR%%-test/queries/0_stateless/00725_comment_columns_long.reference
+%%DATADIR%%-test/queries/0_stateless/00930_arrayIntersect.sql
+%%DATADIR%%-test/queries/0_stateless/01083_cross_to_inner_with_in_bug.reference
+%%DATADIR%%-test/queries/0_stateless/00716_allow_ddl.reference
+%%DATADIR%%-test/queries/0_stateless/00817_with_simple.sql
+%%DATADIR%%-test/queries/0_stateless/01276_system_licenses.reference
+%%DATADIR%%-test/queries/0_stateless/01460_DistributedFilesToInsert.sql
+%%DATADIR%%-test/queries/0_stateless/00223_shard_distributed_aggregation_memory_efficient.reference
+%%DATADIR%%-test/queries/0_stateless/00567_parse_datetime_as_unix_timestamp.sql
+%%DATADIR%%-test/queries/0_stateless/01674_where_prewhere_array_crash.reference
+%%DATADIR%%-test/queries/0_stateless/00043_summing_empty_part.sql
+%%DATADIR%%-test/queries/0_stateless/01764_table_function_dictionary.sql
+%%DATADIR%%-test/queries/0_stateless/02156_storage_merge_prewhere.reference
+%%DATADIR%%-test/queries/0_stateless/02008_materialize_column.sql
+%%DATADIR%%-test/queries/0_stateless/02122_join_group_by_timeout.sh
+%%DATADIR%%-test/queries/0_stateless/00206_empty_array_to_single.sql
+%%DATADIR%%-test/queries/0_stateless/01104_fixed_string_like.sql
 %%DATADIR%%-test/queries/0_stateless/01515_mv_and_array_join_optimisation_bag.reference
-%%DATADIR%%-test/queries/0_stateless/01515_mv_and_array_join_optimisation_bag.sql
-%%DATADIR%%-test/queries/0_stateless/01515_with_global_and_with_propagation.reference
-%%DATADIR%%-test/queries/0_stateless/01515_with_global_and_with_propagation.sql
-%%DATADIR%%-test/queries/0_stateless/01516_create_table_primary_key.reference
+%%DATADIR%%-test/queries/0_stateless/01413_alter_update_supertype.sql
+%%DATADIR%%-test/queries/0_stateless/00938_basename.reference
+%%DATADIR%%-test/queries/0_stateless/01030_storage_set_supports_read.reference
+%%DATADIR%%-test/queries/0_stateless/01478_not_equi-join_on.reference
+%%DATADIR%%-test/queries/0_stateless/01322_any_input_optimize.sql
+%%DATADIR%%-test/queries/0_stateless/00652_mutations_alter_update.reference
+%%DATADIR%%-test/queries/0_stateless/01055_minmax_index_compact_parts.reference
+%%DATADIR%%-test/queries/0_stateless/02002_sampling_and_unknown_column_bug.sql
+%%DATADIR%%-test/queries/0_stateless/01509_parallel_quorum_and_merge_long.reference
+%%DATADIR%%-test/queries/0_stateless/01015_attach_part.reference
+%%DATADIR%%-test/queries/0_stateless/01600_min_max_compress_block_size.reference
+%%DATADIR%%-test/queries/0_stateless/01648_normalize_query_keep_names.reference
+%%DATADIR%%-test/queries/0_stateless/00365_statistics_in_formats.sh
+%%DATADIR%%-test/queries/0_stateless/01505_pipeline_executor_UAF.reference
+%%DATADIR%%-test/queries/0_stateless/00612_pk_in_tuple.reference
+%%DATADIR%%-test/queries/0_stateless/01070_alter_with_ttl.sql
+%%DATADIR%%-test/queries/0_stateless/01732_bigint_ubsan.sql
+%%DATADIR%%-test/queries/0_stateless/00973_live_view_with_subquery_select_nested_with_aggregation.reference
+%%DATADIR%%-test/queries/0_stateless/00510_materizlized_view_and_deduplication_zookeeper.reference
+%%DATADIR%%-test/queries/0_stateless/00945_ml_test.reference
+%%DATADIR%%-test/queries/0_stateless/00975_move_partition_merge_tree.reference
 %%DATADIR%%-test/queries/0_stateless/01516_create_table_primary_key.sql
-%%DATADIR%%-test/queries/0_stateless/01516_date_time_output_format.reference
-%%DATADIR%%-test/queries/0_stateless/01516_date_time_output_format.sql
-%%DATADIR%%-test/queries/0_stateless/01516_drop_table_stress.reference
-%%DATADIR%%-test/queries/0_stateless/01516_drop_table_stress.sh
-%%DATADIR%%-test/queries/0_stateless/01517_drop_mv_with_inner_table.reference
-%%DATADIR%%-test/queries/0_stateless/01517_drop_mv_with_inner_table.sql
-%%DATADIR%%-test/queries/0_stateless/01517_select_final_distributed.reference
-%%DATADIR%%-test/queries/0_stateless/01517_select_final_distributed.sql
-%%DATADIR%%-test/queries/0_stateless/01518_cast_nullable_virtual_system_column.reference
-%%DATADIR%%-test/queries/0_stateless/01518_cast_nullable_virtual_system_column.sql
-%%DATADIR%%-test/queries/0_stateless/01518_filtering_aliased_materialized_column.reference
-%%DATADIR%%-test/queries/0_stateless/01518_filtering_aliased_materialized_column.sql
-%%DATADIR%%-test/queries/0_stateless/01518_nullable_aggregate_states1.reference
-%%DATADIR%%-test/queries/0_stateless/01518_nullable_aggregate_states1.sql
-%%DATADIR%%-test/queries/0_stateless/01518_nullable_aggregate_states2.reference
-%%DATADIR%%-test/queries/0_stateless/01518_nullable_aggregate_states2.sql
-%%DATADIR%%-test/queries/0_stateless/01518_select_in_null.reference
-%%DATADIR%%-test/queries/0_stateless/01518_select_in_null.sql
-%%DATADIR%%-test/queries/0_stateless/01519_topK_distributed_parametrized.reference
-%%DATADIR%%-test/queries/0_stateless/01519_topK_distributed_parametrized.sql
-%%DATADIR%%-test/queries/0_stateless/01520_client_print_query_id.expect
-%%DATADIR%%-test/queries/0_stateless/01520_client_print_query_id.reference
-%%DATADIR%%-test/queries/0_stateless/01521_alter_enum_and_reverse_read.reference
-%%DATADIR%%-test/queries/0_stateless/01521_alter_enum_and_reverse_read.sql
-%%DATADIR%%-test/queries/0_stateless/01521_distributed_query_hang.reference
-%%DATADIR%%-test/queries/0_stateless/01521_distributed_query_hang.sql
-%%DATADIR%%-test/queries/0_stateless/01521_format_readable_time_delta2.reference
-%%DATADIR%%-test/queries/0_stateless/01521_format_readable_time_delta2.sql
-%%DATADIR%%-test/queries/0_stateless/01521_global_in_prewhere_15792.reference
-%%DATADIR%%-test/queries/0_stateless/01521_global_in_prewhere_15792.sql
-%%DATADIR%%-test/queries/0_stateless/01521_max_length_alias.reference
-%%DATADIR%%-test/queries/0_stateless/01521_max_length_alias.sql
-%%DATADIR%%-test/queries/0_stateless/01522_validate_alter_default.reference
-%%DATADIR%%-test/queries/0_stateless/01522_validate_alter_default.sql
-%%DATADIR%%-test/queries/0_stateless/01523_client_local_queries_file_parameter.reference
-%%DATADIR%%-test/queries/0_stateless/01523_client_local_queries_file_parameter.sh
-%%DATADIR%%-test/queries/0_stateless/01523_date_time_compare_with_date_literal.reference
-%%DATADIR%%-test/queries/0_stateless/01523_date_time_compare_with_date_literal.sql
-%%DATADIR%%-test/queries/0_stateless/01523_interval_operator_support_string_literal.reference
-%%DATADIR%%-test/queries/0_stateless/01523_interval_operator_support_string_literal.sql
+%%DATADIR%%-test/queries/0_stateless/00685_output_format_json_escape_forward_slashes.reference
+%%DATADIR%%-test/queries/0_stateless/01602_array_aggregation.reference
+%%DATADIR%%-test/queries/0_stateless/01356_initialize_aggregation.reference
+%%DATADIR%%-test/queries/0_stateless/01925_test_storage_merge_aliases.sql
+%%DATADIR%%-test/queries/0_stateless/00607_index_in_in.reference
+%%DATADIR%%-test/queries/0_stateless/01300_polygon_convex_hull.sql
+%%DATADIR%%-test/queries/0_stateless/01232_extremes.sql
+%%DATADIR%%-test/queries/0_stateless/00625_arrays_in_nested.sql
+%%DATADIR%%-test/queries/0_stateless/00825_protobuf_format_splitted_nested.reference
+%%DATADIR%%-test/queries/0_stateless/00336_shard_stack_trace.sh
+%%DATADIR%%-test/queries/0_stateless/01560_ttl_remove_empty_parts.reference
+%%DATADIR%%-test/queries/0_stateless/00314_sample_factor_virtual_column.sql
+%%DATADIR%%-test/queries/0_stateless/01246_extractAllGroupsVertical.sql
+%%DATADIR%%-test/queries/0_stateless/02001_add_default_database_to_system_users.reference
+%%DATADIR%%-test/queries/0_stateless/02131_mv_many_chunks_bug.sql
+%%DATADIR%%-test/queries/0_stateless/01748_dictionary_table_dot.reference
+%%DATADIR%%-test/queries/0_stateless/01891_jit_aggregation_function_any_long.reference
+%%DATADIR%%-test/queries/0_stateless/01506_ttl_same_with_order_by.reference
+%%DATADIR%%-test/queries/0_stateless/00829_bitmap_function.sql
+%%DATADIR%%-test/queries/0_stateless/00818_alias_bug_4110.reference
+%%DATADIR%%-test/queries/0_stateless/00927_asof_joins.reference
+%%DATADIR%%-test/queries/0_stateless/01551_context_uaf.sql
+%%DATADIR%%-test/queries/0_stateless/00962_live_view_periodic_refresh_dictionary.py
+%%DATADIR%%-test/queries/0_stateless/00701_join_default_strictness.reference
+%%DATADIR%%-test/queries/0_stateless/01916_lowcard_dict_type.sql
+%%DATADIR%%-test/queries/0_stateless/00973_uniq_non_associativity.reference
+%%DATADIR%%-test/queries/0_stateless/01413_alter_update_supertype.reference
+%%DATADIR%%-test/queries/0_stateless/00552_logical_functions_simple.reference
+%%DATADIR%%-test/queries/0_stateless/00609_mv_index_in_in.reference
+%%DATADIR%%-test/queries/0_stateless/00979_live_view_watch_live_with_subquery.py
+%%DATADIR%%-test/queries/0_stateless/00541_kahan_sum.sql
+%%DATADIR%%-test/queries/0_stateless/01881_join_on_conditions_merge.reference.j2
+%%DATADIR%%-test/queries/0_stateless/01801_s3_cluster.reference
+%%DATADIR%%-test/queries/0_stateless/01344_alter_enum_partition_key.sql
+%%DATADIR%%-test/queries/0_stateless/00073_merge_sorting_empty_array_joined.sql
+%%DATADIR%%-test/queries/0_stateless/00972_desc_table_virtual_columns.sql
 %%DATADIR%%-test/queries/0_stateless/01524_do_not_merge_across_partitions_select_final.reference
-%%DATADIR%%-test/queries/0_stateless/01524_do_not_merge_across_partitions_select_final.sql
-%%DATADIR%%-test/queries/0_stateless/01525_select_with_offset_fetch_clause.reference
-%%DATADIR%%-test/queries/0_stateless/01525_select_with_offset_fetch_clause.sql
-%%DATADIR%%-test/queries/0_stateless/01526_alter_add_and_modify_order_zookeeper.reference
-%%DATADIR%%-test/queries/0_stateless/01526_alter_add_and_modify_order_zookeeper.sql
-%%DATADIR%%-test/queries/0_stateless/01526_client_start_and_exit.expect-not-a-test-case
-%%DATADIR%%-test/queries/0_stateless/01526_client_start_and_exit.reference
-%%DATADIR%%-test/queries/0_stateless/01526_client_start_and_exit.sh
-%%DATADIR%%-test/queries/0_stateless/01526_complex_key_dict_direct_layout.reference
-%%DATADIR%%-test/queries/0_stateless/01526_complex_key_dict_direct_layout.sql
-%%DATADIR%%-test/queries/0_stateless/01526_initial_query_id.reference
-%%DATADIR%%-test/queries/0_stateless/01526_initial_query_id.sh
-%%DATADIR%%-test/queries/0_stateless/01526_max_untracked_memory.reference
-%%DATADIR%%-test/queries/0_stateless/01526_max_untracked_memory.sh
-%%DATADIR%%-test/queries/0_stateless/01526_param_uuid.reference
-%%DATADIR%%-test/queries/0_stateless/01526_param_uuid.sh
-%%DATADIR%%-test/queries/0_stateless/01527_bad_aggregation_in_lambda.reference
-%%DATADIR%%-test/queries/0_stateless/01527_bad_aggregation_in_lambda.sql
-%%DATADIR%%-test/queries/0_stateless/01527_clickhouse_local_optimize.reference
-%%DATADIR%%-test/queries/0_stateless/01527_clickhouse_local_optimize.sh
-%%DATADIR%%-test/queries/0_stateless/01527_dist_sharding_key_dictGet_reload.reference
-%%DATADIR%%-test/queries/0_stateless/01527_dist_sharding_key_dictGet_reload.sql
-%%DATADIR%%-test/queries/0_stateless/01527_materialized_view_stack_overflow.reference
-%%DATADIR%%-test/queries/0_stateless/01527_materialized_view_stack_overflow.sql
-%%DATADIR%%-test/queries/0_stateless/01528_allow_nondeterministic_optimize_skip_unused_shards.reference
-%%DATADIR%%-test/queries/0_stateless/01528_allow_nondeterministic_optimize_skip_unused_shards.sql
-%%DATADIR%%-test/queries/0_stateless/01528_clickhouse_local_prepare_parts.reference
-%%DATADIR%%-test/queries/0_stateless/01528_clickhouse_local_prepare_parts.sh
-%%DATADIR%%-test/queries/0_stateless/01528_play.reference
-%%DATADIR%%-test/queries/0_stateless/01528_play.sh
-%%DATADIR%%-test/queries/0_stateless/01528_setting_aggregate_functions_null_for_empty.reference
-%%DATADIR%%-test/queries/0_stateless/01528_setting_aggregate_functions_null_for_empty.sql
-%%DATADIR%%-test/queries/0_stateless/01528_to_uuid_or_null_or_zero.reference
-%%DATADIR%%-test/queries/0_stateless/01528_to_uuid_or_null_or_zero.sql
-%%DATADIR%%-test/queries/0_stateless/01529_bad_memory_tracking.reference
-%%DATADIR%%-test/queries/0_stateless/01529_bad_memory_tracking.sh
-%%DATADIR%%-test/queries/0_stateless/01529_union_distinct_and_setting_union_default_mode.reference
-%%DATADIR%%-test/queries/0_stateless/01529_union_distinct_and_setting_union_default_mode.sql
-%%DATADIR%%-test/queries/0_stateless/01530_drop_database_atomic_sync.reference
-%%DATADIR%%-test/queries/0_stateless/01530_drop_database_atomic_sync.sql
-%%DATADIR%%-test/queries/0_stateless/01531_query_log_query_comment.reference
-%%DATADIR%%-test/queries/0_stateless/01531_query_log_query_comment.sql
-%%DATADIR%%-test/queries/0_stateless/01532_clickhouse_local_tmp_folder.reference
-%%DATADIR%%-test/queries/0_stateless/01532_clickhouse_local_tmp_folder.sh
-%%DATADIR%%-test/queries/0_stateless/01532_collate_in_low_cardinality.reference
-%%DATADIR%%-test/queries/0_stateless/01532_collate_in_low_cardinality.sql
-%%DATADIR%%-test/queries/0_stateless/01532_execute_merges_on_single_replica.reference
-%%DATADIR%%-test/queries/0_stateless/01532_execute_merges_on_single_replica.sql
-%%DATADIR%%-test/queries/0_stateless/01532_having_with_totals.reference
-%%DATADIR%%-test/queries/0_stateless/01532_having_with_totals.sql
-%%DATADIR%%-test/queries/0_stateless/01532_min_max_with_modifiers.reference
-%%DATADIR%%-test/queries/0_stateless/01532_min_max_with_modifiers.sql
-%%DATADIR%%-test/queries/0_stateless/01532_primary_key_without_order_by_zookeeper.reference
-%%DATADIR%%-test/queries/0_stateless/01532_primary_key_without_order_by_zookeeper.sql
-%%DATADIR%%-test/queries/0_stateless/01532_tuple_with_name_type.reference
-%%DATADIR%%-test/queries/0_stateless/01532_tuple_with_name_type.sql
-%%DATADIR%%-test/queries/0_stateless/01533_collate_in_nullable.reference
-%%DATADIR%%-test/queries/0_stateless/01533_collate_in_nullable.sql
-%%DATADIR%%-test/queries/0_stateless/01533_distinct_depends_on_max_threads.reference
-%%DATADIR%%-test/queries/0_stateless/01533_distinct_depends_on_max_threads.sql
-%%DATADIR%%-test/queries/0_stateless/01533_distinct_nullable_uuid.reference
-%%DATADIR%%-test/queries/0_stateless/01533_distinct_nullable_uuid.sql
-%%DATADIR%%-test/queries/0_stateless/01533_multiple_nested.reference
-%%DATADIR%%-test/queries/0_stateless/01533_multiple_nested.sql
-%%DATADIR%%-test/queries/0_stateless/01533_optimize_skip_merged_partitions.reference
-%%DATADIR%%-test/queries/0_stateless/01533_optimize_skip_merged_partitions.sql
-%%DATADIR%%-test/queries/0_stateless/01533_quantile_deterministic_assert.reference
-%%DATADIR%%-test/queries/0_stateless/01533_quantile_deterministic_assert.sql
-%%DATADIR%%-test/queries/0_stateless/01533_sum_if_nullable_bug.reference
-%%DATADIR%%-test/queries/0_stateless/01533_sum_if_nullable_bug.sql
-%%DATADIR%%-test/queries/0_stateless/01534_lambda_array_join.reference
-%%DATADIR%%-test/queries/0_stateless/01534_lambda_array_join.sql
-%%DATADIR%%-test/queries/0_stateless/01535_decimal_round_scale_overflow_check.reference
-%%DATADIR%%-test/queries/0_stateless/01535_decimal_round_scale_overflow_check.sql
-%%DATADIR%%-test/queries/0_stateless/01536_fuzz_cast.reference
-%%DATADIR%%-test/queries/0_stateless/01536_fuzz_cast.sql
-%%DATADIR%%-test/queries/0_stateless/01537_fuzz_count_equal.reference
-%%DATADIR%%-test/queries/0_stateless/01537_fuzz_count_equal.sql
-%%DATADIR%%-test/queries/0_stateless/01538_fuzz_aggregate.reference
-%%DATADIR%%-test/queries/0_stateless/01538_fuzz_aggregate.sql
-%%DATADIR%%-test/queries/0_stateless/01540_verbatim_partition_pruning.reference
-%%DATADIR%%-test/queries/0_stateless/01540_verbatim_partition_pruning.sql
-%%DATADIR%%-test/queries/0_stateless/01541_max_memory_usage_for_user_long.reference
-%%DATADIR%%-test/queries/0_stateless/01541_max_memory_usage_for_user_long.sh
-%%DATADIR%%-test/queries/0_stateless/01542_collate_in_array.reference
-%%DATADIR%%-test/queries/0_stateless/01542_collate_in_array.sql
+%%DATADIR%%-test/queries/0_stateless/01691_parser_data_type_exponential.reference
+%%DATADIR%%-test/queries/0_stateless/00554_nested_and_table_engines.sql
+%%DATADIR%%-test/queries/0_stateless/01496_signedness_conversion_monotonicity.sql
+%%DATADIR%%-test/queries/0_stateless/00124_shard_distributed_with_many_replicas.reference
+%%DATADIR%%-test/queries/0_stateless/01356_state_resample.reference
+%%DATADIR%%-test/queries/0_stateless/01450_set_null_const.reference
+%%DATADIR%%-test/queries/0_stateless/01137_order_by_func_final.sql
+%%DATADIR%%-test/queries/0_stateless/00833_sleep_overflow.reference
+%%DATADIR%%-test/queries/0_stateless/00980_shard_aggregation_state_deserialization.sql
+%%DATADIR%%-test/queries/0_stateless/01375_storage_file_write_prefix_csv_with_names.sql
+%%DATADIR%%-test/queries/0_stateless/00972_live_view_select_1.reference
+%%DATADIR%%-test/queries/0_stateless/01572_kill_window_function.reference
+%%DATADIR%%-test/queries/0_stateless/00700_decimal_null.sql
+%%DATADIR%%-test/queries/0_stateless/02125_dict_get_type_nullable_fix.reference
+%%DATADIR%%-test/queries/0_stateless/01323_if_with_nulls.reference
 %%DATADIR%%-test/queries/0_stateless/01542_dictionary_load_exception_race.reference
-%%DATADIR%%-test/queries/0_stateless/01542_dictionary_load_exception_race.sh
-%%DATADIR%%-test/queries/0_stateless/01543_avro_deserialization_with_lc.reference
-%%DATADIR%%-test/queries/0_stateless/01543_avro_deserialization_with_lc.sh
-%%DATADIR%%-test/queries/0_stateless/01543_collate_in_tuple.reference
-%%DATADIR%%-test/queries/0_stateless/01543_collate_in_tuple.sql
-%%DATADIR%%-test/queries/0_stateless/01543_parse_datetime_besteffort_or_null_empty_string.reference
-%%DATADIR%%-test/queries/0_stateless/01543_parse_datetime_besteffort_or_null_empty_string.sql
-%%DATADIR%%-test/queries/0_stateless/01543_toModifiedJulianDay.reference
-%%DATADIR%%-test/queries/0_stateless/01543_toModifiedJulianDay.sql
-%%DATADIR%%-test/queries/0_stateless/01544_errorCodeToName.reference
-%%DATADIR%%-test/queries/0_stateless/01544_errorCodeToName.sql
-%%DATADIR%%-test/queries/0_stateless/01544_file_engine_settings.reference
-%%DATADIR%%-test/queries/0_stateless/01544_file_engine_settings.sh
-%%DATADIR%%-test/queries/0_stateless/01544_fromModifiedJulianDay.reference
-%%DATADIR%%-test/queries/0_stateless/01544_fromModifiedJulianDay.sql
-%%DATADIR%%-test/queries/0_stateless/01545_system_errors.reference
-%%DATADIR%%-test/queries/0_stateless/01545_system_errors.sh
-%%DATADIR%%-test/queries/0_stateless/01545_url_file_format_settings.reference
-%%DATADIR%%-test/queries/0_stateless/01545_url_file_format_settings.sql
-%%DATADIR%%-test/queries/0_stateless/01546_log_queries_min_query_duration_ms.reference
-%%DATADIR%%-test/queries/0_stateless/01546_log_queries_min_query_duration_ms.sql
-%%DATADIR%%-test/queries/0_stateless/01547_query_log_current_database.reference
-%%DATADIR%%-test/queries/0_stateless/01547_query_log_current_database.sql
-%%DATADIR%%-test/queries/0_stateless/01548_create_table_compound_column_format.reference
-%%DATADIR%%-test/queries/0_stateless/01548_create_table_compound_column_format.sh
-%%DATADIR%%-test/queries/0_stateless/01548_lzy305.reference
-%%DATADIR%%-test/queries/0_stateless/01548_lzy305.sql
-%%DATADIR%%-test/queries/0_stateless/01548_parallel_parsing_max_memory.reference
-%%DATADIR%%-test/queries/0_stateless/01548_parallel_parsing_max_memory.sh
-%%DATADIR%%-test/queries/0_stateless/01548_query_log_query_execution_ms.reference
-%%DATADIR%%-test/queries/0_stateless/01548_query_log_query_execution_ms.sh
+%%DATADIR%%-test/queries/0_stateless/01621_clickhouse_compressor.reference
+%%DATADIR%%-test/queries/0_stateless/01754_direct_dictionary_complex_key.sql
+%%DATADIR%%-test/queries/0_stateless/01026_char_utf8.sql
+%%DATADIR%%-test/queries/0_stateless/00962_visit_param_various.sql
+%%DATADIR%%-test/queries/0_stateless/01935_parametrized_query_parametric_aggregate_function.sh
+%%DATADIR%%-test/queries/0_stateless/00645_date_time_input_format.reference
+%%DATADIR%%-test/queries/0_stateless/00700_decimal_casts_2.sql
+%%DATADIR%%-test/queries/0_stateless/01710_projection_with_mixed_pipeline.reference
+%%DATADIR%%-test/queries/0_stateless/00836_numbers_table_function_zero.sql
+%%DATADIR%%-test/queries/0_stateless/01108_restart_replicas_rename_deadlock_zookeeper.reference
+%%DATADIR%%-test/queries/0_stateless/01036_no_superfluous_dict_reload_on_create_database.reference
+%%DATADIR%%-test/queries/0_stateless/00047_stored_aggregates_complex.reference
+%%DATADIR%%-test/queries/0_stateless/00001_select_1.sql
+%%DATADIR%%-test/queries/0_stateless/01038_dictionary_lifetime_min_zero_sec.sh
+%%DATADIR%%-test/queries/0_stateless/00354_host_command_line_option.sh
+%%DATADIR%%-test/queries/0_stateless/00432_aggregate_function_scalars_and_constants.reference
+%%DATADIR%%-test/queries/0_stateless/01865_aggregator_overflow_row.sql
+%%DATADIR%%-test/queries/0_stateless/00942_mv_rename_table.reference
+%%DATADIR%%-test/queries/0_stateless/01329_compare_tuple_string_constant.sql
+%%DATADIR%%-test/queries/0_stateless/01070_to_decimal_or_null_exception.reference
+%%DATADIR%%-test/queries/0_stateless/01848_partition_value_column.reference
+%%DATADIR%%-test/queries/0_stateless/00501_http_head.sh
+%%DATADIR%%-test/queries/0_stateless/01356_view_threads.reference
+%%DATADIR%%-test/queries/0_stateless/mergetree_mutations.lib
+%%DATADIR%%-test/queries/0_stateless/01103_distributed_product_mode_local_column_renames.sql
+%%DATADIR%%-test/queries/0_stateless/00586_removing_unused_columns_from_subquery.sql
+%%DATADIR%%-test/queries/0_stateless/01925_test_group_by_const_consistency.sql
+%%DATADIR%%-test/queries/0_stateless/01407_lambda_arrayJoin.reference
+%%DATADIR%%-test/queries/0_stateless/01866_datetime64_cmp_with_constant.reference
+%%DATADIR%%-test/queries/0_stateless/00700_decimal_gathers.sql
+%%DATADIR%%-test/queries/0_stateless/01398_in_tuple_func.reference
+%%DATADIR%%-test/queries/0_stateless/01413_rows_events.reference
+%%DATADIR%%-test/queries/0_stateless/01451_replicated_detach_drop_part_long.sql
+%%DATADIR%%-test/queries/0_stateless/02001_join_on_const_bs_long.reference
+%%DATADIR%%-test/queries/0_stateless/01664_array_slice_ubsan.sql
+%%DATADIR%%-test/queries/0_stateless/01085_max_distributed_connections_http.sh
+%%DATADIR%%-test/queries/0_stateless/00908_bloom_filter_index.sh
+%%DATADIR%%-test/queries/0_stateless/01451_dist_logs.sh
+%%DATADIR%%-test/queries/0_stateless/00098_b_union_all.reference
+%%DATADIR%%-test/queries/0_stateless/02012_settings_clause_for_s3.sql
+%%DATADIR%%-test/queries/0_stateless/01013_hex_decimal.sql
+%%DATADIR%%-test/queries/0_stateless/01625_constraints_index_append.reference
+%%DATADIR%%-test/queries/0_stateless/00386_has_column_in_table.reference
+%%DATADIR%%-test/queries/0_stateless/01855_jit_comparison_constant_result.sql
 %%DATADIR%%-test/queries/0_stateless/01548_uncomparable_columns_in_keys.reference
-%%DATADIR%%-test/queries/0_stateless/01548_uncomparable_columns_in_keys.sql
-%%DATADIR%%-test/queries/0_stateless/01548_with_totals_having.reference
-%%DATADIR%%-test/queries/0_stateless/01548_with_totals_having.sql
-%%DATADIR%%-test/queries/0_stateless/01549_low_cardinality_materialized_view.reference
-%%DATADIR%%-test/queries/0_stateless/01549_low_cardinality_materialized_view.sql
-%%DATADIR%%-test/queries/0_stateless/01550_create_map_type.reference
-%%DATADIR%%-test/queries/0_stateless/01550_create_map_type.sql
-%%DATADIR%%-test/queries/0_stateless/01550_mutation_subquery.reference
-%%DATADIR%%-test/queries/0_stateless/01550_mutation_subquery.sql
-%%DATADIR%%-test/queries/0_stateless/01550_query_identifier_parameters.reference
-%%DATADIR%%-test/queries/0_stateless/01550_query_identifier_parameters.sh
-%%DATADIR%%-test/queries/0_stateless/01550_type_map_formats.reference
-%%DATADIR%%-test/queries/0_stateless/01550_type_map_formats.sql
-%%DATADIR%%-test/queries/0_stateless/01550_type_map_formats_input.reference
-%%DATADIR%%-test/queries/0_stateless/01550_type_map_formats_input.sh
-%%DATADIR%%-test/queries/0_stateless/01551_context_uaf.reference
-%%DATADIR%%-test/queries/0_stateless/01551_context_uaf.sql
-%%DATADIR%%-test/queries/0_stateless/01551_mergetree_read_in_order_spread.reference
-%%DATADIR%%-test/queries/0_stateless/01551_mergetree_read_in_order_spread.sql
+%%DATADIR%%-test/queries/0_stateless/00295_global_in_one_shard_rows_before_limit.reference
+%%DATADIR%%-test/queries/0_stateless/01442_h3kring_range_check.sql
+%%DATADIR%%-test/queries/0_stateless/01047_no_alias_columns_with_table_aliases.sql
+%%DATADIR%%-test/queries/0_stateless/01937_nested_chinese.sql
+%%DATADIR%%-test/queries/0_stateless/00347_has_tuple.reference
+%%DATADIR%%-test/queries/0_stateless/00857_global_joinsavel_table_alias.reference
+%%DATADIR%%-test/queries/0_stateless/01059_window_view_event_hop_watch_strict_asc.reference
+%%DATADIR%%-test/queries/0_stateless/01273_arrow_decimal.reference
+%%DATADIR%%-test/queries/0_stateless/01746_long_zstd_http_compression_json_format.reference
+%%DATADIR%%-test/queries/0_stateless/00037_totals_limit.sql
+%%DATADIR%%-test/queries/0_stateless/01654_bar_nan.reference
+%%DATADIR%%-test/queries/0_stateless/00515_gcd_lcm.sql
+%%DATADIR%%-test/queries/0_stateless/01755_client_highlight_multi_line_comment_regression.expect
+%%DATADIR%%-test/queries/0_stateless/00118_storage_join.sql
+%%DATADIR%%-test/queries/0_stateless/00590_limit_by_column_removal.reference
+%%DATADIR%%-test/queries/0_stateless/01060_window_view_event_tumble_to_asc.sh
+%%DATADIR%%-test/queries/0_stateless/01762_datetime64_extended_parsing.sql
+%%DATADIR%%-test/queries/0_stateless/00010_big_array_join.reference
+%%DATADIR%%-test/queries/0_stateless/01045_dictionaries_restrictions.sql
+%%DATADIR%%-test/queries/0_stateless/00991_temporary_live_view_watch_live.reference
+%%DATADIR%%-test/queries/0_stateless/01451_detach_drop_part.sql
+%%DATADIR%%-test/queries/0_stateless/01268_dictionary_direct_layout.sql
+%%DATADIR%%-test/queries/0_stateless/01747_system_session_log_long.reference
+%%DATADIR%%-test/queries/0_stateless/01679_format_readable_time_delta_inf.reference
+%%DATADIR%%-test/queries/0_stateless/00443_optimize_final_vertical_merge.reference
+%%DATADIR%%-test/queries/0_stateless/01226_dist_on_dist_global_in.reference
+%%DATADIR%%-test/queries/0_stateless/01790_dist_INSERT_block_structure_mismatch_types_and_names.sql
+%%DATADIR%%-test/queries/0_stateless/01005_rwr_shard_deadlock.reference
+%%DATADIR%%-test/queries/0_stateless/02004_intersect_except_operators.sql
+%%DATADIR%%-test/queries/0_stateless/01662_join_mixed.reference
+%%DATADIR%%-test/queries/0_stateless/01077_yet_another_prewhere_test.reference
+%%DATADIR%%-test/queries/0_stateless/00741_client_comment_multiline.sql
+%%DATADIR%%-test/queries/0_stateless/01429_join_on_error_messages.reference
+%%DATADIR%%-test/queries/0_stateless/01646_rewrite_sum_if.sql
+%%DATADIR%%-test/queries/0_stateless/00480_mac_addresses.sql
+%%DATADIR%%-test/queries/0_stateless/01532_tuple_with_name_type.sql
+%%DATADIR%%-test/queries/0_stateless/01710_projection_with_mixed_pipeline.sql
+%%DATADIR%%-test/queries/0_stateless/01852_cast_operator.reference
+%%DATADIR%%-test/queries/0_stateless/01307_bloom_filter_index_string_multi_granulas.sql
+%%DATADIR%%-test/queries/0_stateless/01088_benchmark_query_id.reference
+%%DATADIR%%-test/queries/0_stateless/01622_defaults_for_url_engine.sh
+%%DATADIR%%-test/queries/0_stateless/00700_decimal_complex_types.reference
+%%DATADIR%%-test/queries/0_stateless/00700_decimal_casts.reference
+%%DATADIR%%-test/queries/0_stateless/01040_distributed_directory_monitor_batch_inserts.sql
+%%DATADIR%%-test/queries/0_stateless/01634_uuid_fuzz.sql
+%%DATADIR%%-test/queries/0_stateless/00178_function_replicate.reference
+%%DATADIR%%-test/queries/0_stateless/00980_full_join_crash_fancyqlx.reference
+%%DATADIR%%-test/queries/0_stateless/01901_in_literal_shard_prune.reference
+%%DATADIR%%-test/queries/0_stateless/01247_some_msan_crashs_from_22517.reference
+%%DATADIR%%-test/queries/0_stateless/01035_enum_conversion_native_format.reference
+%%DATADIR%%-test/queries/0_stateless/01698_fix_toMinute.sql
+%%DATADIR%%-test/queries/0_stateless/00856_no_column_issue_4242.sql
+%%DATADIR%%-test/queries/0_stateless/02015_executable_user_defined_functions.sql
+%%DATADIR%%-test/queries/0_stateless/01921_datatype_date32.reference
+%%DATADIR%%-test/queries/0_stateless/00962_temporary_live_view_watch_live.reference
+%%DATADIR%%-test/queries/0_stateless/00834_kill_mutation_replicated_zookeeper.sh
+%%DATADIR%%-test/queries/0_stateless/01736_null_as_default.sql
+%%DATADIR%%-test/queries/0_stateless/01006_simpod_empty_part_single_column_write.sh
+%%DATADIR%%-test/queries/0_stateless/01385_not_function.reference
+%%DATADIR%%-test/queries/0_stateless/01023_materialized_view_query_context.reference
+%%DATADIR%%-test/queries/0_stateless/00861_decimal_quoted_csv.sql
+%%DATADIR%%-test/queries/0_stateless/02028_system_data_skipping_indices_size.reference
+%%DATADIR%%-test/queries/0_stateless/00852_any_join_nulls.sql
+%%DATADIR%%-test/queries/0_stateless/02148_sql_user_defined_function_subquery.reference
+%%DATADIR%%-test/queries/0_stateless/02017_columns_with_dot_2.sql
+%%DATADIR%%-test/queries/0_stateless/01079_parallel_alter_modify_zookeeper_long.reference
 %%DATADIR%%-test/queries/0_stateless/01552_alter_name_collision.reference
-%%DATADIR%%-test/queries/0_stateless/01552_alter_name_collision.sql
-%%DATADIR%%-test/queries/0_stateless/01552_dict_fixedstring.reference
-%%DATADIR%%-test/queries/0_stateless/01552_dict_fixedstring.sql
-%%DATADIR%%-test/queries/0_stateless/01552_impl_aggfunc_cloneresize.reference
-%%DATADIR%%-test/queries/0_stateless/01552_impl_aggfunc_cloneresize.sql
-%%DATADIR%%-test/queries/0_stateless/01553_datetime64_comparison.reference
-%%DATADIR%%-test/queries/0_stateless/01553_datetime64_comparison.sql
-%%DATADIR%%-test/queries/0_stateless/01553_settings_early_apply.reference
-%%DATADIR%%-test/queries/0_stateless/01553_settings_early_apply.sql
-%%DATADIR%%-test/queries/0_stateless/01554_bloom_filter_index_big_integer_uuid.reference
-%%DATADIR%%-test/queries/0_stateless/01554_bloom_filter_index_big_integer_uuid.sql
-%%DATADIR%%-test/queries/0_stateless/01554_interpreter_integer_float.reference
-%%DATADIR%%-test/queries/0_stateless/01554_interpreter_integer_float.sql
-%%DATADIR%%-test/queries/0_stateless/01554_row_number_after_cannot_read_all_data.reference
-%%DATADIR%%-test/queries/0_stateless/01554_row_number_after_cannot_read_all_data.sh
-%%DATADIR%%-test/queries/0_stateless/01555_or_fill.reference
-%%DATADIR%%-test/queries/0_stateless/01555_or_fill.sql
-%%DATADIR%%-test/queries/0_stateless/01555_system_distribution_queue_mask.reference
-%%DATADIR%%-test/queries/0_stateless/01555_system_distribution_queue_mask.sql
-%%DATADIR%%-test/queries/0_stateless/01556_accurate_cast_or_null.reference
-%%DATADIR%%-test/queries/0_stateless/01556_accurate_cast_or_null.sql
-%%DATADIR%%-test/queries/0_stateless/01556_explain_select_with_union_query.reference
-%%DATADIR%%-test/queries/0_stateless/01556_explain_select_with_union_query.sql
-%%DATADIR%%-test/queries/0_stateless/01556_if_null.reference
-%%DATADIR%%-test/queries/0_stateless/01556_if_null.sql
-%%DATADIR%%-test/queries/0_stateless/01557_field_infinite_convert_to_number.reference
-%%DATADIR%%-test/queries/0_stateless/01557_field_infinite_convert_to_number.sql
+%%DATADIR%%-test/queries/0_stateless/01270_optimize_skip_unused_shards_low_cardinality.sql
+%%DATADIR%%-test/queries/0_stateless/02025_dictionary_view_different_db.reference
+%%DATADIR%%-test/queries/0_stateless/01391_join_on_dict_crash.sql
+%%DATADIR%%-test/queries/0_stateless/01075_allowed_client_hosts.sql
+%%DATADIR%%-test/queries/0_stateless/00403_to_start_of_day.sql
+%%DATADIR%%-test/queries/0_stateless/00953_zookeeper_suetin_deduplication_bug.reference
+%%DATADIR%%-test/queries/0_stateless/00477_parsing_data_types.reference
+%%DATADIR%%-test/queries/0_stateless/00718_low_cardinaliry_alter.sql
+%%DATADIR%%-test/queries/0_stateless/00825_protobuf_format_nested_in_nested.sh
+%%DATADIR%%-test/queries/0_stateless/00071_insert_fewer_columns.sql
+%%DATADIR%%-test/queries/0_stateless/00538_datediff.sql
+%%DATADIR%%-test/queries/0_stateless/02135_local_create_db.sh
+%%DATADIR%%-test/queries/0_stateless/01097_cyclic_defaults.sql
+%%DATADIR%%-test/queries/0_stateless/01291_distributed_low_cardinality_memory_efficient.sql
+%%DATADIR%%-test/queries/0_stateless/01381_for_each_with_states.sql
+%%DATADIR%%-test/queries/0_stateless/00984_parser_stack_overflow.sh
+%%DATADIR%%-test/queries/0_stateless/00400_client_external_options.sh
+%%DATADIR%%-test/queries/0_stateless/01055_compact_parts_granularity.sh
+%%DATADIR%%-test/queries/0_stateless/01410_nullable_key_and_index.sql
+%%DATADIR%%-test/queries/0_stateless/00961_temporary_live_view_watch.sql
+%%DATADIR%%-test/queries/0_stateless/01754_direct_dictionary_complex_key.reference
+%%DATADIR%%-test/queries/0_stateless/01117_chain_finalize_bug.reference
+%%DATADIR%%-test/queries/0_stateless/00831_quantile_weighted_parameter_check.sql
+%%DATADIR%%-test/queries/0_stateless/01730_distributed_group_by_no_merge_order_by_long.sql
+%%DATADIR%%-test/queries/0_stateless/02149_schema_inference_create_table_syntax.sh
+%%DATADIR%%-test/queries/0_stateless/01494_storage_join_persistency.sql
+%%DATADIR%%-test/queries/0_stateless/01881_join_on_conditions_hash.sql.j2
+%%DATADIR%%-test/queries/0_stateless/01032_cityHash64_for_decimal.sql
+%%DATADIR%%-test/queries/0_stateless/01408_range_overflow.reference
+%%DATADIR%%-test/queries/0_stateless/01950_aliases_bad_cast.reference
+%%DATADIR%%-test/queries/0_stateless/01036_no_superfluous_dict_reload_on_create_database.sql
+%%DATADIR%%-test/queries/0_stateless/00238_removal_of_temporary_columns.sql
+%%DATADIR%%-test/queries/0_stateless/01909_mbtolou.sql
+%%DATADIR%%-test/queries/0_stateless/00031_parser_number.sql
+%%DATADIR%%-test/queries/0_stateless/02131_multiply_row_policies_on_same_column.sql
+%%DATADIR%%-test/queries/0_stateless/01511_format_readable_timedelta.reference
+%%DATADIR%%-test/queries/0_stateless/00925_zookeeper_empty_replicated_merge_tree_optimize_final_long.reference
+%%DATADIR%%-test/queries/0_stateless/00671_max_intersections.reference
+%%DATADIR%%-test/queries/0_stateless/01056_window_view_proc_hop_watch.py
+%%DATADIR%%-test/queries/0_stateless/01179_insert_values_semicolon.reference
+%%DATADIR%%-test/queries/0_stateless/01509_parallel_quorum_insert_no_replicas_long.sql
+%%DATADIR%%-test/queries/0_stateless/01834_alias_columns_laziness_filimonov.sh
+%%DATADIR%%-test/queries/0_stateless/01145_with_fill_const.reference
+%%DATADIR%%-test/queries/0_stateless/02099_tsv_raw_format.reference
+%%DATADIR%%-test/queries/0_stateless/01910_client_replxx_container_overflow_long.expect
+%%DATADIR%%-test/queries/0_stateless/00834_cancel_http_readonly_queries_on_client_close.sh
+%%DATADIR%%-test/queries/0_stateless/01248_least_greatest_mixed_const.reference
+%%DATADIR%%-test/queries/0_stateless/02015_async_inserts_7.reference
+%%DATADIR%%-test/queries/0_stateless/01416_join_totals_header_bug.sql
+%%DATADIR%%-test/queries/0_stateless/01163_search_case_insensetive_utf8.reference
+%%DATADIR%%-test/queries/0_stateless/01412_cache_dictionary_race.sh
+%%DATADIR%%-test/queries/0_stateless/01068_window_view_event_tumble_to_bounded_lateness.sh
+%%DATADIR%%-test/queries/0_stateless/01605_drop_settings_profile_while_assigned.sql
+%%DATADIR%%-test/queries/0_stateless/01685_json_extract_double_as_float.sql
+%%DATADIR%%-test/queries/0_stateless/01780_clickhouse_dictionary_source_loop.sql
+%%DATADIR%%-test/queries/0_stateless/01318_long_unsuccessful_mutation_zookeeper.sh
+%%DATADIR%%-test/queries/0_stateless/02016_agg_empty_result_bug_28880.reference
+%%DATADIR%%-test/queries/0_stateless/01010_pmj_right_table_memory_limits.sql
+%%DATADIR%%-test/queries/0_stateless/02008_aliased_column_distributed_bug.sql
+%%DATADIR%%-test/queries/0_stateless/00443_optimize_final_vertical_merge.sh
+%%DATADIR%%-test/queries/0_stateless/00076_ip_coding_functions.sql
+%%DATADIR%%-test/queries/0_stateless/01634_summap_nullable.sql
+%%DATADIR%%-test/queries/0_stateless/01520_client_print_query_id.expect
+%%DATADIR%%-test/queries/0_stateless/02153_clickhouse_local_profile_info.reference
+%%DATADIR%%-test/queries/0_stateless/01189_create_as_table_as_table_function.reference
+%%DATADIR%%-test/queries/0_stateless/01558_ttest_scipy.sh
+%%DATADIR%%-test/queries/0_stateless/00612_union_query_with_subquery.sql
+%%DATADIR%%-test/queries/0_stateless/01677_bit_float.sql
+%%DATADIR%%-test/queries/0_stateless/01256_misspell_layout_name_podshumok.sql
+%%DATADIR%%-test/queries/0_stateless/00355_array_of_non_const_convertible_types.reference
+%%DATADIR%%-test/queries/0_stateless/01413_if_array_uuid.sql
+%%DATADIR%%-test/queries/0_stateless/00688_low_cardinality_defaults.reference
+%%DATADIR%%-test/queries/0_stateless/00719_format_datetime_rand.reference
+%%DATADIR%%-test/queries/0_stateless/00877_memory_limit_for_new_delete.reference
+%%DATADIR%%-test/queries/0_stateless/01076_cache_dictionary_datarace_exception_ptr.sh
+%%DATADIR%%-test/queries/0_stateless/01338_uuid_without_separator.sql
+%%DATADIR%%-test/queries/0_stateless/01091_query_profiler_does_not_hang.reference
+%%DATADIR%%-test/queries/0_stateless/00555_hasSubstr.sql
+%%DATADIR%%-test/queries/0_stateless/02155_nested_lc_defalut_bug.sql
+%%DATADIR%%-test/queries/0_stateless/01614_with_fill_with_limit.reference
+%%DATADIR%%-test/queries/0_stateless/01358_constexpr_constraint.reference
+%%DATADIR%%-test/queries/0_stateless/00966_invalid_json_must_not_parse.reference
+%%DATADIR%%-test/queries/0_stateless/01043_categorical_iv.reference
+%%DATADIR%%-test/queries/0_stateless/00564_initial_column_values_with_default_expression.sql
+%%DATADIR%%-test/queries/0_stateless/01917_system_data_skipping_indices.sql
+%%DATADIR%%-test/queries/0_stateless/00276_sample.reference
+%%DATADIR%%-test/queries/0_stateless/01393_benchmark_secure_port.sh
+%%DATADIR%%-test/queries/0_stateless/01389_filter_by_virtual_columns.reference
+%%DATADIR%%-test/queries/0_stateless/01527_dist_sharding_key_dictGet_reload.reference
+%%DATADIR%%-test/queries/0_stateless/01655_plan_optimizations.sh
+%%DATADIR%%-test/queries/0_stateless/01069_window_view_proc_tumble_watch.py
+%%DATADIR%%-test/queries/0_stateless/01705_normalize_create_alter_function_names.reference
+%%DATADIR%%-test/queries/0_stateless/02124_clickhouse_dictionary_with_predefined_configuration.reference
+%%DATADIR%%-test/queries/0_stateless/02124_encrypt_decrypt_nullable.sql
+%%DATADIR%%-test/queries/0_stateless/00519_create_as_select_from_temporary_table.reference
+%%DATADIR%%-test/queries/0_stateless/01009_insert_select_data_loss.sql
+%%DATADIR%%-test/queries/0_stateless/02012_zookeeper_changed_enum_type.reference
+%%DATADIR%%-test/queries/0_stateless/01342_query_parameters_alias.sh
+%%DATADIR%%-test/queries/0_stateless/01019_parallel_parsing_cancel.sh
+%%DATADIR%%-test/queries/0_stateless/01043_dictionary_attribute_properties_values.reference
+%%DATADIR%%-test/queries/0_stateless/01624_soft_constraints.reference
+%%DATADIR%%-test/queries/0_stateless/00974_distributed_join_on.sql
+%%DATADIR%%-test/queries/0_stateless/02125_recursive_sql_user_defined_functions.sql
+%%DATADIR%%-test/queries/0_stateless/01889_sql_json_functions.sql
+%%DATADIR%%-test/queries/0_stateless/00934_is_valid_utf8.reference
+%%DATADIR%%-test/queries/0_stateless/00553_invalid_nested_name.sql
+%%DATADIR%%-test/queries/0_stateless/00372_cors_header.reference
+%%DATADIR%%-test/queries/0_stateless/01762_deltasumtimestamp.reference
+%%DATADIR%%-test/queries/0_stateless/01676_dictget_in_default_expression.reference
+%%DATADIR%%-test/queries/0_stateless/01717_global_with_subquery_fix.reference
+%%DATADIR%%-test/queries/0_stateless/01346_alter_enum_partition_key_replicated_zookeeper_long.sql
+%%DATADIR%%-test/queries/0_stateless/00926_adaptive_index_granularity_replacing_merge_tree.reference
+%%DATADIR%%-test/queries/0_stateless/01897_jit_aggregation_function_avg_weighted_long.reference
+%%DATADIR%%-test/queries/0_stateless/02040_clickhouse_benchmark_query_id_pass_through.sh
+%%DATADIR%%-test/queries/0_stateless/00740_optimize_predicate_expression.reference
+%%DATADIR%%-test/queries/0_stateless/00578_merge_trees_without_primary_key.reference
+%%DATADIR%%-test/queries/0_stateless/00098_8_union_all.sql
+%%DATADIR%%-test/queries/0_stateless/00532_topk_generic.sql
+%%DATADIR%%-test/queries/0_stateless/data_zlib/02013_zlib_read_after_eof_data
+%%DATADIR%%-test/queries/0_stateless/02166_arrow_dictionary_inference.reference
+%%DATADIR%%-test/queries/0_stateless/01801_approx_total_rows_mergetree_reverse.sql
+%%DATADIR%%-test/queries/0_stateless/01683_intdiv_ubsan.sql
+%%DATADIR%%-test/queries/0_stateless/00999_join_on_expression.reference
+%%DATADIR%%-test/queries/0_stateless/01511_different_expression_with_same_alias.sql
+%%DATADIR%%-test/queries/0_stateless/01032_cityHash64_for_UUID.reference
+%%DATADIR%%-test/queries/0_stateless/00746_sql_fuzzy.reference
+%%DATADIR%%-test/queries/0_stateless/01670_test_repeat_mysql_dialect.reference
+%%DATADIR%%-test/queries/0_stateless/00098_3_union_all.reference
+%%DATADIR%%-test/queries/0_stateless/01883_subcolumns_distributed.sql
+%%DATADIR%%-test/queries/0_stateless/01195_formats_diagnostic_info.sh
+%%DATADIR%%-test/queries/0_stateless/00900_orc_nullable_arrays_load.sh
+%%DATADIR%%-test/queries/0_stateless/00319_index_for_like.reference
+%%DATADIR%%-test/queries/0_stateless/02115_map_contains.sql
 %%DATADIR%%-test/queries/0_stateless/01557_max_parallel_replicas_no_sample.reference
-%%DATADIR%%-test/queries/0_stateless/01557_max_parallel_replicas_no_sample.sql
-%%DATADIR%%-test/queries/0_stateless/01558_enum_as_num_in_tsv_csv_input.reference
-%%DATADIR%%-test/queries/0_stateless/01558_enum_as_num_in_tsv_csv_input.sql
-%%DATADIR%%-test/queries/0_stateless/01558_transform_null_in.reference
-%%DATADIR%%-test/queries/0_stateless/01558_transform_null_in.sql
-%%DATADIR%%-test/queries/0_stateless/01558_ttest.reference
-%%DATADIR%%-test/queries/0_stateless/01558_ttest.sql
+%%DATADIR%%-test/queries/0_stateless/01422_array_nullable_element_nullable_index.sql
+%%DATADIR%%-test/queries/0_stateless/00504_mergetree_arrays_rw.sql
+%%DATADIR%%-test/queries/0_stateless/01037_test_data_perf.tar.gz
+%%DATADIR%%-test/queries/0_stateless/01924_argmax_bitmap_state.sql
+%%DATADIR%%-test/queries/0_stateless/01284_port.reference
+%%DATADIR%%-test/queries/0_stateless/00053_all_inner_join.sql
+%%DATADIR%%-test/queries/0_stateless/00547_named_tuples.sql
+%%DATADIR%%-test/queries/0_stateless/00203_full_join.reference
+%%DATADIR%%-test/queries/0_stateless/00975_json_hang.reference
+%%DATADIR%%-test/queries/0_stateless/01683_dist_INSERT_block_structure_mismatch.reference
+%%DATADIR%%-test/queries/0_stateless/00434_tonullable.sql
+%%DATADIR%%-test/queries/0_stateless/01442_merge_detach_attach_long.sh
+%%DATADIR%%-test/queries/0_stateless/00834_dont_allow_to_set_two_configuration_files_in_client.reference
+%%DATADIR%%-test/queries/0_stateless/01049_join_low_card_crash.reference
+%%DATADIR%%-test/queries/0_stateless/00991_live_view_watch_event_live.sh.disabled
+%%DATADIR%%-test/queries/0_stateless/01319_manual_write_to_replicas_long.sql
+%%DATADIR%%-test/queries/0_stateless/01916_low_cardinality_interval.sql
+%%DATADIR%%-test/queries/0_stateless/00623_truncate_table_throw_exception.reference
+%%DATADIR%%-test/queries/0_stateless/00916_create_or_replace_view.reference
+%%DATADIR%%-test/queries/0_stateless/01528_setting_aggregate_functions_null_for_empty.sql
+%%DATADIR%%-test/queries/0_stateless/01922_client_param.reference
+%%DATADIR%%-test/queries/0_stateless/01754_clickhouse_format_backslash.reference
+%%DATADIR%%-test/queries/0_stateless/00712_prewhere_with_alias_and_virtual_column.sql
+%%DATADIR%%-test/queries/0_stateless/01277_alter_rename_column_constraint_zookeeper_long.reference
+%%DATADIR%%-test/queries/0_stateless/00974_fix_join_on.reference
+%%DATADIR%%-test/queries/0_stateless/00800_function_java_hash.sql
+%%DATADIR%%-test/queries/0_stateless/02022_bzip2_truncated.reference
+%%DATADIR%%-test/queries/0_stateless/00047_stored_aggregates_complex.sql
+%%DATADIR%%-test/queries/0_stateless/01890_materialized_distributed_join.reference
+%%DATADIR%%-test/queries/0_stateless/00205_scalar_subqueries.reference
+%%DATADIR%%-test/queries/0_stateless/01115_join_with_dictionary.sql
+%%DATADIR%%-test/queries/0_stateless/00541_kahan_sum.reference
+%%DATADIR%%-test/queries/0_stateless/00536_int_exp.sql
+%%DATADIR%%-test/queries/0_stateless/00534_functions_bad_arguments6.reference
+%%DATADIR%%-test/queries/0_stateless/00700_decimal_arithm.reference
+%%DATADIR%%-test/queries/0_stateless/01122_totals_rollup_having_block_header.reference
+%%DATADIR%%-test/queries/0_stateless/00618_nullable_in.reference
 %%DATADIR%%-test/queries/0_stateless/01558_ttest_scipy.python
-%%DATADIR%%-test/queries/0_stateless/01558_ttest_scipy.reference
-%%DATADIR%%-test/queries/0_stateless/01558_ttest_scipy.sh
-%%DATADIR%%-test/queries/0_stateless/01559_aggregate_null_for_empty_fix.reference
-%%DATADIR%%-test/queries/0_stateless/01559_aggregate_null_for_empty_fix.sql
-%%DATADIR%%-test/queries/0_stateless/01559_misplaced_codec_diagnostics.reference
-%%DATADIR%%-test/queries/0_stateless/01559_misplaced_codec_diagnostics.sh
-%%DATADIR%%-test/queries/0_stateless/01560_DateTime_and_DateTime64_comparision.reference
-%%DATADIR%%-test/queries/0_stateless/01560_DateTime_and_DateTime64_comparision.sql
-%%DATADIR%%-test/queries/0_stateless/01560_cancel_agg_func_combinator_native_name_constraint.reference
-%%DATADIR%%-test/queries/0_stateless/01560_cancel_agg_func_combinator_native_name_constraint.sql
-%%DATADIR%%-test/queries/0_stateless/01560_crash_in_agg_empty_arglist.reference
-%%DATADIR%%-test/queries/0_stateless/01560_crash_in_agg_empty_arglist.sql
-%%DATADIR%%-test/queries/0_stateless/01560_mann_whitney.reference
-%%DATADIR%%-test/queries/0_stateless/01560_mann_whitney.sql
-%%DATADIR%%-test/queries/0_stateless/01560_merge_distributed_join.reference
-%%DATADIR%%-test/queries/0_stateless/01560_merge_distributed_join.sql
-%%DATADIR%%-test/queries/0_stateless/01560_monotonicity_check_multiple_args_bug.reference
-%%DATADIR%%-test/queries/0_stateless/01560_monotonicity_check_multiple_args_bug.sql
-%%DATADIR%%-test/queries/0_stateless/01560_optimize_on_insert_long.reference
-%%DATADIR%%-test/queries/0_stateless/01560_optimize_on_insert_long.sql
-%%DATADIR%%-test/queries/0_stateless/01560_optimize_on_insert_zookeeper.reference
-%%DATADIR%%-test/queries/0_stateless/01560_optimize_on_insert_zookeeper.sql
-%%DATADIR%%-test/queries/0_stateless/01560_ttl_remove_empty_parts.reference
-%%DATADIR%%-test/queries/0_stateless/01560_ttl_remove_empty_parts.sql
-%%DATADIR%%-test/queries/0_stateless/01561_Date_and_DateTime64_comparision.reference
-%%DATADIR%%-test/queries/0_stateless/01561_Date_and_DateTime64_comparision.sql
-%%DATADIR%%-test/queries/0_stateless/01561_aggregate_functions_of_key_with_join.reference
-%%DATADIR%%-test/queries/0_stateless/01561_aggregate_functions_of_key_with_join.sql
-%%DATADIR%%-test/queries/0_stateless/01561_clickhouse_client_stage.reference
-%%DATADIR%%-test/queries/0_stateless/01561_clickhouse_client_stage.sh
-%%DATADIR%%-test/queries/0_stateless/01561_mann_whitney_scipy.python
-%%DATADIR%%-test/queries/0_stateless/01561_mann_whitney_scipy.reference
-%%DATADIR%%-test/queries/0_stateless/01561_mann_whitney_scipy.sh
-%%DATADIR%%-test/queries/0_stateless/01562_agg_null_for_empty_ahead.reference
-%%DATADIR%%-test/queries/0_stateless/01562_agg_null_for_empty_ahead.sql
-%%DATADIR%%-test/queries/0_stateless/01562_optimize_monotonous_functions_in_order_by.reference
-%%DATADIR%%-test/queries/0_stateless/01562_optimize_monotonous_functions_in_order_by.sql
-%%DATADIR%%-test/queries/0_stateless/01563_distributed_query_finish.reference
-%%DATADIR%%-test/queries/0_stateless/01563_distributed_query_finish.sh
-%%DATADIR%%-test/queries/0_stateless/01564_test_hint_woes.reference
-%%DATADIR%%-test/queries/0_stateless/01564_test_hint_woes.sql
-%%DATADIR%%-test/queries/0_stateless/01565_reconnect_after_client_error.expect
-%%DATADIR%%-test/queries/0_stateless/01565_reconnect_after_client_error.reference
-%%DATADIR%%-test/queries/0_stateless/01566_negate_formatting.reference
-%%DATADIR%%-test/queries/0_stateless/01566_negate_formatting.sql
-%%DATADIR%%-test/queries/0_stateless/01567_system_processes_current_database.reference
-%%DATADIR%%-test/queries/0_stateless/01567_system_processes_current_database.sql
-%%DATADIR%%-test/queries/0_stateless/01568_window_functions_distributed.reference
-%%DATADIR%%-test/queries/0_stateless/01568_window_functions_distributed.sql
-%%DATADIR%%-test/queries/0_stateless/01569_query_profiler_big_query_id.reference
-%%DATADIR%%-test/queries/0_stateless/01569_query_profiler_big_query_id.sh
-%%DATADIR%%-test/queries/0_stateless/01570_aggregator_combinator_simple_state.reference
-%%DATADIR%%-test/queries/0_stateless/01570_aggregator_combinator_simple_state.sql
+%%DATADIR%%-test/queries/0_stateless/00913_many_threads.sql
+%%DATADIR%%-test/queries/0_stateless/00513_fractional_time_zones.reference
+%%DATADIR%%-test/queries/0_stateless/00222_sequence_aggregate_function_family.reference
+%%DATADIR%%-test/queries/0_stateless/00005_shard_format_ast_and_remote_table_lambda.sql
+%%DATADIR%%-test/queries/0_stateless/00937_template_output_format.reference
+%%DATADIR%%-test/queries/0_stateless/01866_datetime64_cmp_with_constant.sql
+%%DATADIR%%-test/queries/0_stateless/01213_alter_rename_primary_key_zookeeper_long.sql
+%%DATADIR%%-test/queries/0_stateless/00333_parser_number_bug.sql
+%%DATADIR%%-test/queries/0_stateless/00955_test_final_mark_use.sh
+%%DATADIR%%-test/queries/0_stateless/01044_great_circle_angle.sql
+%%DATADIR%%-test/queries/0_stateless/00115_shard_in_incomplete_result.sh
+%%DATADIR%%-test/queries/0_stateless/00053_all_inner_join.reference
+%%DATADIR%%-test/queries/0_stateless/01289_min_execution_speed_not_too_early.sql
+%%DATADIR%%-test/queries/0_stateless/02003_bug_from_23515.reference
+%%DATADIR%%-test/queries/0_stateless/02002_global_subqueries_subquery_or_table_name.sql
+%%DATADIR%%-test/queries/0_stateless/01593_insert_settings.reference
+%%DATADIR%%-test/queries/0_stateless/00709_virtual_column_partition_id.sql
+%%DATADIR%%-test/queries/0_stateless/01710_projection_vertical_merges.reference
+%%DATADIR%%-test/queries/0_stateless/01518_select_in_null.reference
+%%DATADIR%%-test/queries/0_stateless/00816_join_column_names_sarg.reference
+%%DATADIR%%-test/queries/0_stateless/00961_check_table.reference
+%%DATADIR%%-test/queries/0_stateless/01319_mv_constants_bug.sql
+%%DATADIR%%-test/queries/0_stateless/00440_nulls_merge_tree.reference
+%%DATADIR%%-test/queries/0_stateless/00231_format_vertical_raw.sql
+%%DATADIR%%-test/queries/0_stateless/01780_column_sparse.reference
+%%DATADIR%%-test/queries/0_stateless/01380_nullable_state.reference
+%%DATADIR%%-test/queries/0_stateless/01778_hierarchical_dictionaries.reference
+%%DATADIR%%-test/queries/0_stateless/00967_live_view_watch_http.reference
+%%DATADIR%%-test/queries/0_stateless/01384_bloom_filter_bad_arguments.sql
+%%DATADIR%%-test/queries/0_stateless/00234_disjunctive_equality_chains_optimization.reference
+%%DATADIR%%-test/queries/0_stateless/00806_alter_update.reference
+%%DATADIR%%-test/queries/0_stateless/00534_functions_bad_arguments10.sh
+%%DATADIR%%-test/queries/0_stateless/01017_mutations_with_nondeterministic_functions_zookeeper.reference
+%%DATADIR%%-test/queries/0_stateless/01499_json_named_tuples.sql
 %%DATADIR%%-test/queries/0_stateless/01571_window_functions.reference
-%%DATADIR%%-test/queries/0_stateless/01571_window_functions.sql
-%%DATADIR%%-test/queries/0_stateless/01575_disable_detach_table_of_dictionary.reference
-%%DATADIR%%-test/queries/0_stateless/01575_disable_detach_table_of_dictionary.sql
-%%DATADIR%%-test/queries/0_stateless/01576_alias_column_rewrite.reference
-%%DATADIR%%-test/queries/0_stateless/01576_alias_column_rewrite.sql
-%%DATADIR%%-test/queries/0_stateless/01576_alter_low_cardinality_and_select.reference
-%%DATADIR%%-test/queries/0_stateless/01576_alter_low_cardinality_and_select.sh
-%%DATADIR%%-test/queries/0_stateless/01576_if_null_external_aggregation.reference
-%%DATADIR%%-test/queries/0_stateless/01576_if_null_external_aggregation.sql
-%%DATADIR%%-test/queries/0_stateless/01579_date_datetime_index_comparison.reference
-%%DATADIR%%-test/queries/0_stateless/01579_date_datetime_index_comparison.sql
-%%DATADIR%%-test/queries/0_stateless/01580_column_const_comparision.reference
-%%DATADIR%%-test/queries/0_stateless/01580_column_const_comparision.sql
-%%DATADIR%%-test/queries/0_stateless/01581_deduplicate_by_columns_local.reference
-%%DATADIR%%-test/queries/0_stateless/01581_deduplicate_by_columns_local.sql
-%%DATADIR%%-test/queries/0_stateless/01581_deduplicate_by_columns_replicated.reference
-%%DATADIR%%-test/queries/0_stateless/01581_deduplicate_by_columns_replicated.sql
-%%DATADIR%%-test/queries/0_stateless/01581_to_int_inf_nan.reference
-%%DATADIR%%-test/queries/0_stateless/01581_to_int_inf_nan.sql
-%%DATADIR%%-test/queries/0_stateless/01582_any_join_supertype.reference
-%%DATADIR%%-test/queries/0_stateless/01582_any_join_supertype.sql
-%%DATADIR%%-test/queries/0_stateless/01582_deterministic_function_with_predicate.reference
-%%DATADIR%%-test/queries/0_stateless/01582_deterministic_function_with_predicate.sql
-%%DATADIR%%-test/queries/0_stateless/01582_distinct_optimization.reference
-%%DATADIR%%-test/queries/0_stateless/01582_distinct_optimization.sh
-%%DATADIR%%-test/queries/0_stateless/01582_distinct_subquery_groupby.reference
-%%DATADIR%%-test/queries/0_stateless/01582_distinct_subquery_groupby.sql
-%%DATADIR%%-test/queries/0_stateless/01582_move_to_prewhere_compact_parts.reference
-%%DATADIR%%-test/queries/0_stateless/01582_move_to_prewhere_compact_parts.sql
-%%DATADIR%%-test/queries/0_stateless/01583_const_column_in_set_index.reference
-%%DATADIR%%-test/queries/0_stateless/01583_const_column_in_set_index.sql
-%%DATADIR%%-test/queries/0_stateless/01583_parallel_parsing_exception_with_offset.reference
-%%DATADIR%%-test/queries/0_stateless/01583_parallel_parsing_exception_with_offset.sh
-%%DATADIR%%-test/queries/0_stateless/01584_distributed_buffer_cannot_find_column.reference
-%%DATADIR%%-test/queries/0_stateless/01584_distributed_buffer_cannot_find_column.sql
-%%DATADIR%%-test/queries/0_stateless/01585_fuzz_bits_with_bugfix.reference
-%%DATADIR%%-test/queries/0_stateless/01585_fuzz_bits_with_bugfix.sql
-%%DATADIR%%-test/queries/0_stateless/01585_use_index_for_global_in.reference
-%%DATADIR%%-test/queries/0_stateless/01585_use_index_for_global_in.sql
-%%DATADIR%%-test/queries/0_stateless/01586_columns_pruning.reference
-%%DATADIR%%-test/queries/0_stateless/01586_columns_pruning.sql
-%%DATADIR%%-test/queries/0_stateless/01586_replicated_mutations_empty_partition.reference
-%%DATADIR%%-test/queries/0_stateless/01586_replicated_mutations_empty_partition.sql
-%%DATADIR%%-test/queries/0_stateless/01586_storage_join_low_cardinality_key.reference
-%%DATADIR%%-test/queries/0_stateless/01586_storage_join_low_cardinality_key.sql
-%%DATADIR%%-test/queries/0_stateless/01590_countSubstrings.reference
-%%DATADIR%%-test/queries/0_stateless/01590_countSubstrings.sql
-%%DATADIR%%-test/queries/0_stateless/01591_window_functions.reference
-%%DATADIR%%-test/queries/0_stateless/01591_window_functions.sql
-%%DATADIR%%-test/queries/0_stateless/01592_length_map.reference
-%%DATADIR%%-test/queries/0_stateless/01592_length_map.sql
-%%DATADIR%%-test/queries/0_stateless/01592_long_window_functions1.reference
+%%DATADIR%%-test/queries/0_stateless/00087_distinct_of_empty_arrays.reference
+%%DATADIR%%-test/queries/0_stateless/00144_empty_regexp.reference
+%%DATADIR%%-test/queries/0_stateless/01440_big_int_arithm.reference
+%%DATADIR%%-test/queries/0_stateless/00601_kill_running_query.sh
+%%DATADIR%%-test/queries/0_stateless/00939_limit_by_offset.sql
+%%DATADIR%%-test/queries/0_stateless/01914_exchange_dictionaries.sql
+%%DATADIR%%-test/queries/0_stateless/00970_live_view_watch_events_http_heartbeat.reference
+%%DATADIR%%-test/queries/0_stateless/01532_execute_merges_on_single_replica_long.sql
+%%DATADIR%%-test/queries/0_stateless/01086_modulo_or_zero.reference
+%%DATADIR%%-test/queries/0_stateless/00542_access_to_temporary_table_in_readonly_mode.sql
+%%DATADIR%%-test/queries/0_stateless/01720_union_distinct_with_limit.reference
+%%DATADIR%%-test/queries/0_stateless/01681_bloom_filter_nullable_column.reference
+%%DATADIR%%-test/queries/0_stateless/00975_indices_mutation_replicated_zookeeper_long.sh
+%%DATADIR%%-test/queries/0_stateless/00185_array_literals.sql
+%%DATADIR%%-test/queries/0_stateless/01550_create_map_type.sql
+%%DATADIR%%-test/queries/0_stateless/00700_decimal_defaults.sql
+%%DATADIR%%-test/queries/0_stateless/01333_select_abc_asterisk.reference
+%%DATADIR%%-test/queries/0_stateless/02043_query_obfuscator_embedded_dictionaries.sh
+%%DATADIR%%-test/queries/0_stateless/00500_point_in_polygon_non_const_poly.reference
+%%DATADIR%%-test/queries/0_stateless/00285_not_all_data_in_totals.reference
+%%DATADIR%%-test/queries/0_stateless/01075_in_arrays_enmk.reference
+%%DATADIR%%-test/queries/0_stateless/01417_freeze_partition_verbose.sh
+%%DATADIR%%-test/queries/0_stateless/01152_cross_replication.sql
+%%DATADIR%%-test/queries/0_stateless/00667_compare_arrays_of_different_types.sql
+%%DATADIR%%-test/queries/0_stateless/00603_system_parts_nonexistent_database.sql
+%%DATADIR%%-test/queries/0_stateless/01601_detach_permanently.sql
+%%DATADIR%%-test/queries/0_stateless/01912_bad_cast_join_fuzz.sql
+%%DATADIR%%-test/queries/0_stateless/01129_dict_get_join_lose_constness.sql
+%%DATADIR%%-test/queries/0_stateless/01818_move_partition_simple.reference
+%%DATADIR%%-test/queries/0_stateless/00431_if_nulls.reference
+%%DATADIR%%-test/queries/0_stateless/00463_long_sessions_in_http_interface.reference
+%%DATADIR%%-test/queries/0_stateless/01083_expressions_in_engine_arguments.reference
+%%DATADIR%%-test/queries/0_stateless/01076_json_each_row_array.sh
+%%DATADIR%%-test/queries/0_stateless/00720_combinations_of_aggregate_combinators.sql
+%%DATADIR%%-test/queries/0_stateless/01671_test_toQuarter_mysql_dialect.reference
+%%DATADIR%%-test/queries/0_stateless/00398_url_functions.reference
+%%DATADIR%%-test/queries/0_stateless/00716_allow_ddl.sql
+%%DATADIR%%-test/queries/0_stateless/01307_orc_output_format.sh
+%%DATADIR%%-test/queries/0_stateless/01079_new_range_reader_segfault.sql
+%%DATADIR%%-test/queries/0_stateless/00608_uniq_array.sql
+%%DATADIR%%-test/queries/0_stateless/01851_fix_row_policy_empty_result.sql
+%%DATADIR%%-test/queries/0_stateless/00408_http_keep_alive.reference
+%%DATADIR%%-test/queries/0_stateless/01418_index_analysis_bug.reference
+%%DATADIR%%-test/queries/0_stateless/01420_format_row.sql
+%%DATADIR%%-test/queries/0_stateless/00979_live_view_watch_live_with_subquery.reference
+%%DATADIR%%-test/queries/0_stateless/02046_remote_table_function_named_collections.reference
+%%DATADIR%%-test/queries/0_stateless/01496_signedness_conversion_monotonicity.reference
+%%DATADIR%%-test/queries/0_stateless/00804_rollup_with_having.reference
+%%DATADIR%%-test/queries/0_stateless/01323_if_with_nulls.sql
+%%DATADIR%%-test/queries/0_stateless/01198_plus_inf.sql
+%%DATADIR%%-test/queries/0_stateless/01753_mutate_table_predicated_with_table.sql
+%%DATADIR%%-test/queries/0_stateless/00495_reading_const_zero_column.sql
+%%DATADIR%%-test/queries/0_stateless/00990_metric_log_table_not_empty.reference
+%%DATADIR%%-test/queries/0_stateless/00803_odbc_driver_2_format.sql
+%%DATADIR%%-test/queries/0_stateless/01291_aggregation_in_order.reference
+%%DATADIR%%-test/queries/0_stateless/01870_buffer_flush.reference
+%%DATADIR%%-test/queries/0_stateless/00906_low_cardinality_const_argument.reference
+%%DATADIR%%-test/queries/0_stateless/01562_optimize_monotonous_functions_in_order_by.reference
+%%DATADIR%%-test/queries/0_stateless/00932_geohash_support.sql
+%%DATADIR%%-test/queries/0_stateless/01061_alter_codec_with_type.sql
+%%DATADIR%%-test/queries/0_stateless/01246_buffer_flush.sql
+%%DATADIR%%-test/queries/0_stateless/01338_sha256_fixedstring.sql
+%%DATADIR%%-test/queries/0_stateless/00973_live_view_with_subquery_select_with_aggregation.sql
+%%DATADIR%%-test/queries/0_stateless/01268_procfs_metrics.sh
 %%DATADIR%%-test/queries/0_stateless/01592_long_window_functions1.sql
-%%DATADIR%%-test/queries/0_stateless/01592_toUnixTimestamp_Date.reference
-%%DATADIR%%-test/queries/0_stateless/01592_toUnixTimestamp_Date.sql
-%%DATADIR%%-test/queries/0_stateless/01592_window_functions.reference
-%%DATADIR%%-test/queries/0_stateless/01592_window_functions.sql
-%%DATADIR%%-test/queries/0_stateless/01593_concurrent_alter_mutations_kill.reference
-%%DATADIR%%-test/queries/0_stateless/01593_concurrent_alter_mutations_kill.sh
-%%DATADIR%%-test/queries/0_stateless/01593_concurrent_alter_mutations_kill_many_replicas_long.reference
-%%DATADIR%%-test/queries/0_stateless/01593_concurrent_alter_mutations_kill_many_replicas_long.sh
-%%DATADIR%%-test/queries/0_stateless/01593_functions_in_order_by.reference
-%%DATADIR%%-test/queries/0_stateless/01593_functions_in_order_by.sql
-%%DATADIR%%-test/queries/0_stateless/01593_insert_settings.reference
-%%DATADIR%%-test/queries/0_stateless/01593_insert_settings.sql
-%%DATADIR%%-test/queries/0_stateless/01594_storage_join_uuid.reference
-%%DATADIR%%-test/queries/0_stateless/01594_storage_join_uuid.sql
-%%DATADIR%%-test/queries/0_stateless/01594_too_low_memory_limits.config.xml
-%%DATADIR%%-test/queries/0_stateless/01594_too_low_memory_limits.reference
-%%DATADIR%%-test/queries/0_stateless/01594_too_low_memory_limits.sh
-%%DATADIR%%-test/queries/0_stateless/01595_countMatches.reference
-%%DATADIR%%-test/queries/0_stateless/01595_countMatches.sql
-%%DATADIR%%-test/queries/0_stateless/01596_full_join_chertus.reference
-%%DATADIR%%-test/queries/0_stateless/01596_full_join_chertus.sql
-%%DATADIR%%-test/queries/0_stateless/01596_null_as_default_nullable.reference
-%%DATADIR%%-test/queries/0_stateless/01596_null_as_default_nullable.sql
-%%DATADIR%%-test/queries/0_stateless/01596_setting_limit_offset.reference
-%%DATADIR%%-test/queries/0_stateless/01596_setting_limit_offset.sql
-%%DATADIR%%-test/queries/0_stateless/01597_columns_list_ignored.reference
-%%DATADIR%%-test/queries/0_stateless/01597_columns_list_ignored.sh
-%%DATADIR%%-test/queries/0_stateless/01598_memory_limit_zeros.reference
-%%DATADIR%%-test/queries/0_stateless/01598_memory_limit_zeros.sql
-%%DATADIR%%-test/queries/0_stateless/01599_multiline_input_and_singleline_comments.reference
-%%DATADIR%%-test/queries/0_stateless/01599_multiline_input_and_singleline_comments.sh
-%%DATADIR%%-test/queries/0_stateless/01599_mutation_query_params.reference
-%%DATADIR%%-test/queries/0_stateless/01599_mutation_query_params.sh
-%%DATADIR%%-test/queries/0_stateless/01600_benchmark_query.reference
-%%DATADIR%%-test/queries/0_stateless/01600_benchmark_query.sh
-%%DATADIR%%-test/queries/0_stateless/01600_detach_permanently.reference
-%%DATADIR%%-test/queries/0_stateless/01600_detach_permanently.sh
-%%DATADIR%%-test/queries/0_stateless/01600_encode_XML.reference
-%%DATADIR%%-test/queries/0_stateless/01600_encode_XML.sql
-%%DATADIR%%-test/queries/0_stateless/01600_log_queries_with_extensive_info.reference
-%%DATADIR%%-test/queries/0_stateless/01600_log_queries_with_extensive_info.sh
-%%DATADIR%%-test/queries/0_stateless/01600_min_max_compress_block_size.reference
-%%DATADIR%%-test/queries/0_stateless/01600_min_max_compress_block_size.sql
-%%DATADIR%%-test/queries/0_stateless/01600_multiple_left_join_with_aliases.reference
+%%DATADIR%%-test/queries/0_stateless/00819_full_join_wrong_columns_in_block.reference
+%%DATADIR%%-test/queries/0_stateless/00325_replacing_merge_tree.sql.disabled
+%%DATADIR%%-test/queries/0_stateless/02098_hashed_array_dictionary_simple_key.reference
+%%DATADIR%%-test/queries/0_stateless/01814_distributed_push_down_limit.sh
+%%DATADIR%%-test/queries/0_stateless/01716_array_difference_overflow.reference
+%%DATADIR%%-test/queries/0_stateless/01254_array_of_unnamed_tuples.sql
+%%DATADIR%%-test/queries/0_stateless/01821_join_table_race_long.reference
+%%DATADIR%%-test/queries/0_stateless/00098_4_union_all.reference
+%%DATADIR%%-test/queries/0_stateless/01147_partial_merge_full_join.reference
+%%DATADIR%%-test/queries/0_stateless/00502_custom_partitioning_local.sql
+%%DATADIR%%-test/queries/0_stateless/00712_prewhere_with_missing_columns.sql
+%%DATADIR%%-test/queries/0_stateless/01732_alters_bad_conversions.reference
+%%DATADIR%%-test/queries/0_stateless/01352_generate_random_overflow.reference
+%%DATADIR%%-test/queries/0_stateless/01246_finalize_aggregation_race.reference
+%%DATADIR%%-test/queries/0_stateless/00698_validate_array_sizes_for_nested.reference
+%%DATADIR%%-test/queries/0_stateless/01273_arrow.reference
+%%DATADIR%%-test/queries/0_stateless/01471_calculate_ttl_during_merge.sql
+%%DATADIR%%-test/queries/0_stateless/02002_system_table_with_tuple.sh
+%%DATADIR%%-test/queries/0_stateless/00663_tiny_log_empty_insert.reference
+%%DATADIR%%-test/queries/0_stateless/01713_table_ttl_old_syntax_zookeeper.sql
+%%DATADIR%%-test/queries/0_stateless/00686_client_exit_code.reference
 %%DATADIR%%-test/queries/0_stateless/01600_multiple_left_join_with_aliases.sql
-%%DATADIR%%-test/queries/0_stateless/01600_parts_states_metrics_long.reference
-%%DATADIR%%-test/queries/0_stateless/01600_parts_states_metrics_long.sh
-%%DATADIR%%-test/queries/0_stateless/01600_parts_types_metrics_long.reference
-%%DATADIR%%-test/queries/0_stateless/01600_parts_types_metrics_long.sh
-%%DATADIR%%-test/queries/0_stateless/01600_quota_by_forwarded_ip.reference
-%%DATADIR%%-test/queries/0_stateless/01600_quota_by_forwarded_ip.sh
-%%DATADIR%%-test/queries/0_stateless/01600_remerge_sort_lowered_memory_bytes_ratio.reference
-%%DATADIR%%-test/queries/0_stateless/01600_remerge_sort_lowered_memory_bytes_ratio.sql
-%%DATADIR%%-test/queries/0_stateless/01600_select_in_different_types.reference
-%%DATADIR%%-test/queries/0_stateless/01600_select_in_different_types.sql
-%%DATADIR%%-test/queries/0_stateless/01601_accurate_cast.reference
-%%DATADIR%%-test/queries/0_stateless/01601_accurate_cast.sql
-%%DATADIR%%-test/queries/0_stateless/01601_custom_tld.reference
-%%DATADIR%%-test/queries/0_stateless/01601_custom_tld.sql
-%%DATADIR%%-test/queries/0_stateless/01601_detach_permanently.reference
-%%DATADIR%%-test/queries/0_stateless/01601_detach_permanently.sql
-%%DATADIR%%-test/queries/0_stateless/01601_proxy_protocol.reference
-%%DATADIR%%-test/queries/0_stateless/01601_proxy_protocol.sh
-%%DATADIR%%-test/queries/0_stateless/01601_temporary_table_session_scope.reference
-%%DATADIR%%-test/queries/0_stateless/01601_temporary_table_session_scope.sh
-%%DATADIR%%-test/queries/0_stateless/01602_array_aggregation.reference
-%%DATADIR%%-test/queries/0_stateless/01602_array_aggregation.sql
-%%DATADIR%%-test/queries/0_stateless/01602_insert_into_table_function_cluster.reference
-%%DATADIR%%-test/queries/0_stateless/01602_insert_into_table_function_cluster.sql
-%%DATADIR%%-test/queries/0_stateless/01602_max_distributed_connections.reference
-%%DATADIR%%-test/queries/0_stateless/01602_max_distributed_connections.sh
-%%DATADIR%%-test/queries/0_stateless/01602_modified_julian_day_msan.reference
-%%DATADIR%%-test/queries/0_stateless/01602_modified_julian_day_msan.sql
-%%DATADIR%%-test/queries/0_stateless/01602_runningConcurrency.reference
-%%DATADIR%%-test/queries/0_stateless/01602_runningConcurrency.sql
-%%DATADIR%%-test/queries/0_stateless/01602_show_create_view.reference
-%%DATADIR%%-test/queries/0_stateless/01602_show_create_view.sql
-%%DATADIR%%-test/queries/0_stateless/01602_temporary_table_in_system_tables.reference
-%%DATADIR%%-test/queries/0_stateless/01602_temporary_table_in_system_tables.sql
-%%DATADIR%%-test/queries/0_stateless/01603_decimal_mult_float.reference
-%%DATADIR%%-test/queries/0_stateless/01603_decimal_mult_float.sql
-%%DATADIR%%-test/queries/0_stateless/01603_insert_select_too_many_parts.reference
-%%DATADIR%%-test/queries/0_stateless/01603_insert_select_too_many_parts.sql
-%%DATADIR%%-test/queries/0_stateless/01603_read_with_backoff_bug.reference
-%%DATADIR%%-test/queries/0_stateless/01603_read_with_backoff_bug.sql
-%%DATADIR%%-test/queries/0_stateless/01603_remove_column_ttl.reference
-%%DATADIR%%-test/queries/0_stateless/01603_remove_column_ttl.sql
-%%DATADIR%%-test/queries/0_stateless/01603_rename_overwrite_bug.reference
-%%DATADIR%%-test/queries/0_stateless/01603_rename_overwrite_bug.sql
-%%DATADIR%%-test/queries/0_stateless/01604_explain_ast_of_nonselect_query.reference
-%%DATADIR%%-test/queries/0_stateless/01604_explain_ast_of_nonselect_query.sql
-%%DATADIR%%-test/queries/0_stateless/01605_adaptive_granularity_block_borders.reference
-%%DATADIR%%-test/queries/0_stateless/01605_adaptive_granularity_block_borders.sql
-%%DATADIR%%-test/queries/0_stateless/01605_dictinct_two_level.reference
-%%DATADIR%%-test/queries/0_stateless/01605_dictinct_two_level.sql
-%%DATADIR%%-test/queries/0_stateless/01605_drop_settings_profile_while_assigned.reference
-%%DATADIR%%-test/queries/0_stateless/01605_drop_settings_profile_while_assigned.sql
-%%DATADIR%%-test/queries/0_stateless/01605_key_condition_enum_int.reference
-%%DATADIR%%-test/queries/0_stateless/01605_key_condition_enum_int.sql
-%%DATADIR%%-test/queries/0_stateless/01605_skip_idx_compact_parts.reference
-%%DATADIR%%-test/queries/0_stateless/01605_skip_idx_compact_parts.sql
-%%DATADIR%%-test/queries/0_stateless/01606_git_import.reference
-%%DATADIR%%-test/queries/0_stateless/01606_git_import.sh
-%%DATADIR%%-test/queries/0_stateless/01606_merge_from_wide_to_compact.reference
-%%DATADIR%%-test/queries/0_stateless/01606_merge_from_wide_to_compact.sql
-%%DATADIR%%-test/queries/0_stateless/01607_arrays_as_nested_csv.reference
-%%DATADIR%%-test/queries/0_stateless/01607_arrays_as_nested_csv.sh
-%%DATADIR%%-test/queries/0_stateless/01610_client_spawn_editor.reference
-%%DATADIR%%-test/queries/0_stateless/01610_client_spawn_editor.sh
-%%DATADIR%%-test/queries/0_stateless/01610_client_spawn_editor_open.editor
-%%DATADIR%%-test/queries/0_stateless/01611_constant_folding_subqueries.reference
-%%DATADIR%%-test/queries/0_stateless/01611_constant_folding_subqueries.sql
-%%DATADIR%%-test/queries/0_stateless/01611_string_to_low_cardinality_key_alter.reference
-%%DATADIR%%-test/queries/0_stateless/01611_string_to_low_cardinality_key_alter.sql
-%%DATADIR%%-test/queries/0_stateless/01614_with_fill_with_limit.reference
-%%DATADIR%%-test/queries/0_stateless/01614_with_fill_with_limit.sql
-%%DATADIR%%-test/queries/0_stateless/01615_random_one_shard_insertion.reference
-%%DATADIR%%-test/queries/0_stateless/01615_random_one_shard_insertion.sql
-%%DATADIR%%-test/queries/0_stateless/01615_two_args_function_index_fix.reference
-%%DATADIR%%-test/queries/0_stateless/01615_two_args_function_index_fix.sql
-%%DATADIR%%-test/queries/0_stateless/01616_untuple_access_field.reference
-%%DATADIR%%-test/queries/0_stateless/01616_untuple_access_field.sql
-%%DATADIR%%-test/queries/0_stateless/01620_fix_simple_state_arg_type.reference
-%%DATADIR%%-test/queries/0_stateless/01620_fix_simple_state_arg_type.sql
-%%DATADIR%%-test/queries/0_stateless/01621_bar_nan_arguments.reference
-%%DATADIR%%-test/queries/0_stateless/01621_bar_nan_arguments.sql
-%%DATADIR%%-test/queries/0_stateless/01621_clickhouse_compressor.reference
-%%DATADIR%%-test/queries/0_stateless/01621_clickhouse_compressor.sh
-%%DATADIR%%-test/queries/0_stateless/01621_decode_XML.reference
-%%DATADIR%%-test/queries/0_stateless/01621_decode_XML.sql
-%%DATADIR%%-test/queries/0_stateless/01621_sort_after_join_pipeline_stuck.reference
-%%DATADIR%%-test/queries/0_stateless/01621_sort_after_join_pipeline_stuck.sql
-%%DATADIR%%-test/queries/0_stateless/01621_summap_check_types.reference
-%%DATADIR%%-test/queries/0_stateless/01621_summap_check_types.sql
-%%DATADIR%%-test/queries/0_stateless/01622_byte_size.reference
-%%DATADIR%%-test/queries/0_stateless/01622_byte_size.sql
-%%DATADIR%%-test/queries/0_stateless/01622_codec_zstd_long.reference
-%%DATADIR%%-test/queries/0_stateless/01622_codec_zstd_long.sql
-%%DATADIR%%-test/queries/0_stateless/01622_defaults_for_file_engine.reference
-%%DATADIR%%-test/queries/0_stateless/01622_defaults_for_file_engine.sql
-%%DATADIR%%-test/queries/0_stateless/01622_defaults_for_url_engine.reference
-%%DATADIR%%-test/queries/0_stateless/01622_defaults_for_url_engine.sh
-%%DATADIR%%-test/queries/0_stateless/01622_multiple_ttls.reference
-%%DATADIR%%-test/queries/0_stateless/01622_multiple_ttls.sql
-%%DATADIR%%-test/queries/0_stateless/01623_byte_size_const.reference
-%%DATADIR%%-test/queries/0_stateless/01623_byte_size_const.sql
-%%DATADIR%%-test/queries/0_stateless/01630_disallow_floating_point_as_partition_key.reference
-%%DATADIR%%-test/queries/0_stateless/01630_disallow_floating_point_as_partition_key.sql
-%%DATADIR%%-test/queries/0_stateless/01630_simple_aggregate_all_functions_in_aggregating_merge_tree.reference
-%%DATADIR%%-test/queries/0_stateless/01630_simple_aggregate_all_functions_in_aggregating_merge_tree.sql
-%%DATADIR%%-test/queries/0_stateless/01630_simple_aggregate_all_functions_in_summing_merge_tree.reference
-%%DATADIR%%-test/queries/0_stateless/01630_simple_aggregate_all_functions_in_summing_merge_tree.sql
-%%DATADIR%%-test/queries/0_stateless/01630_simple_aggregate_function_in_summing_merge_tree.reference
-%%DATADIR%%-test/queries/0_stateless/01630_simple_aggregate_function_in_summing_merge_tree.sql
-%%DATADIR%%-test/queries/0_stateless/01631_date_overflow_as_partition_key.reference
-%%DATADIR%%-test/queries/0_stateless/01631_date_overflow_as_partition_key.sql
-%%DATADIR%%-test/queries/0_stateless/01632_group_array_msan.reference
-%%DATADIR%%-test/queries/0_stateless/01632_group_array_msan.sql
-%%DATADIR%%-test/queries/0_stateless/01632_max_partitions_to_read.reference
-%%DATADIR%%-test/queries/0_stateless/01632_max_partitions_to_read.sql
-%%DATADIR%%-test/queries/0_stateless/01632_nullable_string_type_convert_to_decimal_type.reference
-%%DATADIR%%-test/queries/0_stateless/01632_nullable_string_type_convert_to_decimal_type.sql
-%%DATADIR%%-test/queries/0_stateless/01632_select_all_syntax.reference
-%%DATADIR%%-test/queries/0_stateless/01632_select_all_syntax.sql
-%%DATADIR%%-test/queries/0_stateless/01632_tinylog_read_write.reference
-%%DATADIR%%-test/queries/0_stateless/01632_tinylog_read_write.sh
-%%DATADIR%%-test/queries/0_stateless/01633_limit_fuzz.reference
-%%DATADIR%%-test/queries/0_stateless/01633_limit_fuzz.sql
-%%DATADIR%%-test/queries/0_stateless/01634_sum_map_nulls.reference
-%%DATADIR%%-test/queries/0_stateless/01634_sum_map_nulls.sql
-%%DATADIR%%-test/queries/0_stateless/01634_uuid_fuzz.reference
-%%DATADIR%%-test/queries/0_stateless/01634_uuid_fuzz.sql
-%%DATADIR%%-test/queries/0_stateless/01635_nullable_fuzz.reference
-%%DATADIR%%-test/queries/0_stateless/01635_nullable_fuzz.sql
-%%DATADIR%%-test/queries/0_stateless/01635_sum_map_fuzz.reference
-%%DATADIR%%-test/queries/0_stateless/01635_sum_map_fuzz.sql
-%%DATADIR%%-test/queries/0_stateless/01636_nullable_fuzz2.reference
-%%DATADIR%%-test/queries/0_stateless/01636_nullable_fuzz2.sql
-%%DATADIR%%-test/queries/0_stateless/01637_nullable_fuzz3.reference
-%%DATADIR%%-test/queries/0_stateless/01637_nullable_fuzz3.sql
-%%DATADIR%%-test/queries/0_stateless/01638_div_mod_ambiguities.reference
-%%DATADIR%%-test/queries/0_stateless/01638_div_mod_ambiguities.sql
-%%DATADIR%%-test/queries/0_stateless/01639_distributed_sync_insert_zero_rows.reference
-%%DATADIR%%-test/queries/0_stateless/01639_distributed_sync_insert_zero_rows.sql
-%%DATADIR%%-test/queries/0_stateless/01640_distributed_async_insert_compression.reference
-%%DATADIR%%-test/queries/0_stateless/01640_distributed_async_insert_compression.sql
-%%DATADIR%%-test/queries/0_stateless/01640_marks_corruption_regression.reference
-%%DATADIR%%-test/queries/0_stateless/01640_marks_corruption_regression.sql
-%%DATADIR%%-test/queries/0_stateless/01642_if_nullable_regression.reference
-%%DATADIR%%-test/queries/0_stateless/01642_if_nullable_regression.sql
-%%DATADIR%%-test/queries/0_stateless/01643_merge_tree_fsync_smoke.reference
-%%DATADIR%%-test/queries/0_stateless/01643_merge_tree_fsync_smoke.sql
-%%DATADIR%%-test/queries/0_stateless/01643_system_suspend.reference
-%%DATADIR%%-test/queries/0_stateless/01643_system_suspend.sql
-%%DATADIR%%-test/queries/0_stateless/01644_distributed_async_insert_fsync_smoke.reference
-%%DATADIR%%-test/queries/0_stateless/01644_distributed_async_insert_fsync_smoke.sql
-%%DATADIR%%-test/queries/0_stateless/01645_system_table_engines.reference
-%%DATADIR%%-test/queries/0_stateless/01645_system_table_engines.sql
-%%DATADIR%%-test/queries/0_stateless/01646_fix_window_funnel_inconistency.reference
-%%DATADIR%%-test/queries/0_stateless/01646_fix_window_funnel_inconistency.sql
-%%DATADIR%%-test/queries/0_stateless/01646_rewrite_sum_if.reference
-%%DATADIR%%-test/queries/0_stateless/01646_rewrite_sum_if.sql
-%%DATADIR%%-test/queries/0_stateless/01646_system_restart_replicas_smoke.reference
-%%DATADIR%%-test/queries/0_stateless/01646_system_restart_replicas_smoke.sql
-%%DATADIR%%-test/queries/0_stateless/01647_clickhouse_local_hung.reference
-%%DATADIR%%-test/queries/0_stateless/01647_clickhouse_local_hung.sh
-%%DATADIR%%-test/queries/0_stateless/01648_mutations_and_escaping.reference
-%%DATADIR%%-test/queries/0_stateless/01648_mutations_and_escaping.sql
-%%DATADIR%%-test/queries/0_stateless/01648_normalize_query_keep_names.reference
-%%DATADIR%%-test/queries/0_stateless/01648_normalize_query_keep_names.sql
-%%DATADIR%%-test/queries/0_stateless/01649_with_alias_key_condition.reference
-%%DATADIR%%-test/queries/0_stateless/01649_with_alias_key_condition.sql
-%%DATADIR%%-test/queries/0_stateless/01650_any_null_if.reference
-%%DATADIR%%-test/queries/0_stateless/01650_any_null_if.sql
-%%DATADIR%%-test/queries/0_stateless/01650_drop_part_and_deduplication_zookeeper.reference
-%%DATADIR%%-test/queries/0_stateless/01650_drop_part_and_deduplication_zookeeper.sql
-%%DATADIR%%-test/queries/0_stateless/01650_expressions_merge_bug.reference
-%%DATADIR%%-test/queries/0_stateless/01650_expressions_merge_bug.sql
-%%DATADIR%%-test/queries/0_stateless/01650_fetch_patition_with_macro_in_zk_path.reference
-%%DATADIR%%-test/queries/0_stateless/01650_fetch_patition_with_macro_in_zk_path.sql
-%%DATADIR%%-test/queries/0_stateless/01651_bugs_from_15889.reference
-%%DATADIR%%-test/queries/0_stateless/01651_bugs_from_15889.sql
-%%DATADIR%%-test/queries/0_stateless/01651_group_uniq_array_enum.reference
-%%DATADIR%%-test/queries/0_stateless/01651_group_uniq_array_enum.sql
-%%DATADIR%%-test/queries/0_stateless/01651_lc_insert_tiny_log.reference
-%%DATADIR%%-test/queries/0_stateless/01651_lc_insert_tiny_log.sql
-%%DATADIR%%-test/queries/0_stateless/01651_map_functions.reference
-%%DATADIR%%-test/queries/0_stateless/01651_map_functions.sql
-%%DATADIR%%-test/queries/0_stateless/01652_ignore_and_low_cardinality.reference
-%%DATADIR%%-test/queries/0_stateless/01652_ignore_and_low_cardinality.sql
-%%DATADIR%%-test/queries/0_stateless/01652_ttl_old_syntax.reference
-%%DATADIR%%-test/queries/0_stateless/01652_ttl_old_syntax.sql
-%%DATADIR%%-test/queries/0_stateless/01653_tuple_hamming_distance_2.reference
-%%DATADIR%%-test/queries/0_stateless/01653_tuple_hamming_distance_2.sql
-%%DATADIR%%-test/queries/0_stateless/01654_bar_nan.reference
-%%DATADIR%%-test/queries/0_stateless/01654_bar_nan.sql
-%%DATADIR%%-test/queries/0_stateless/01654_test_writer_block_sequence.python
-%%DATADIR%%-test/queries/0_stateless/01654_test_writer_block_sequence.reference
-%%DATADIR%%-test/queries/0_stateless/01654_test_writer_block_sequence.sh
-%%DATADIR%%-test/queries/0_stateless/01655_agg_if_nullable.reference
-%%DATADIR%%-test/queries/0_stateless/01655_agg_if_nullable.sql
-%%DATADIR%%-test/queries/0_stateless/01655_plan_optimizations.reference
-%%DATADIR%%-test/queries/0_stateless/01655_plan_optimizations.sh
-%%DATADIR%%-test/queries/0_stateless/01655_quarter_modificator_for_formatDateTime.reference
-%%DATADIR%%-test/queries/0_stateless/01655_quarter_modificator_for_formatDateTime.sql
-%%DATADIR%%-test/queries/0_stateless/01655_sleep_infinite_float.reference
-%%DATADIR%%-test/queries/0_stateless/01655_sleep_infinite_float.sql
-%%DATADIR%%-test/queries/0_stateless/01655_test_isnull_mysql_dialect.reference
-%%DATADIR%%-test/queries/0_stateless/01655_test_isnull_mysql_dialect.sql
-%%DATADIR%%-test/queries/0_stateless/01656_ipv4_bad_formatting.reference
-%%DATADIR%%-test/queries/0_stateless/01656_ipv4_bad_formatting.sql
-%%DATADIR%%-test/queries/0_stateless/01656_join_defaul_enum.reference
-%%DATADIR%%-test/queries/0_stateless/01656_join_defaul_enum.sql
-%%DATADIR%%-test/queries/0_stateless/01656_sequence_next_node_long.reference
-%%DATADIR%%-test/queries/0_stateless/01656_sequence_next_node_long.sql
-%%DATADIR%%-test/queries/0_stateless/01656_test_hex_mysql_dialect.reference
-%%DATADIR%%-test/queries/0_stateless/01656_test_hex_mysql_dialect.sql
-%%DATADIR%%-test/queries/0_stateless/01656_test_query_log_factories_info.reference
-%%DATADIR%%-test/queries/0_stateless/01656_test_query_log_factories_info.sql
-%%DATADIR%%-test/queries/0_stateless/01657_array_element_ubsan.reference
-%%DATADIR%%-test/queries/0_stateless/01657_array_element_ubsan.sql
-%%DATADIR%%-test/queries/0_stateless/01657_test_toHour_mysql_compatibility.reference
-%%DATADIR%%-test/queries/0_stateless/01657_test_toHour_mysql_compatibility.sql
-%%DATADIR%%-test/queries/0_stateless/01658_read_file_to_stringcolumn.reference
-%%DATADIR%%-test/queries/0_stateless/01658_read_file_to_stringcolumn.sh
-%%DATADIR%%-test/queries/0_stateless/01658_substring_ubsan.reference
-%%DATADIR%%-test/queries/0_stateless/01658_substring_ubsan.sql
+%%DATADIR%%-test/queries/0_stateless/01349_mutation_datetime_key.reference
+%%DATADIR%%-test/queries/0_stateless/00516_is_inf_nan.sql
+%%DATADIR%%-test/queries/0_stateless/01037_polygon_dicts_simple_functions.reference
+%%DATADIR%%-test/queries/0_stateless/00313_const_totals_extremes.reference
+%%DATADIR%%-test/queries/0_stateless/01060_defaults_all_columns.sql
+%%DATADIR%%-test/queries/0_stateless/00383_utf8_validation.reference
+%%DATADIR%%-test/queries/0_stateless/00272_union_all_and_in_subquery.reference
+%%DATADIR%%-test/queries/0_stateless/01293_pretty_max_value_width.reference
+%%DATADIR%%-test/queries/0_stateless/00199_ternary_operator_type_check.sql
+%%DATADIR%%-test/queries/0_stateless/02136_scalar_read_rows_json.reference
+%%DATADIR%%-test/queries/0_stateless/01352_add_datetime_bad_get.reference
+%%DATADIR%%-test/queries/0_stateless/02011_dictionary_empty_attribute_list.reference
+%%DATADIR%%-test/queries/0_stateless/02152_bool_type_parsing.reference
+%%DATADIR%%-test/queries/0_stateless/00712_prewhere_with_final.sql
+%%DATADIR%%-test/queries/0_stateless/00135_duplicate_group_by_keys_segfault.sql
+%%DATADIR%%-test/queries/0_stateless/00908_long_http_insert.reference
+%%DATADIR%%-test/queries/0_stateless/00673_subquery_prepared_set_performance.reference
+%%DATADIR%%-test/queries/0_stateless/01116_asof_join_dolbyzerr.sql
+%%DATADIR%%-test/queries/0_stateless/01413_truncate_without_table_keyword.sql
+%%DATADIR%%-test/queries/0_stateless/00257_shard_no_aggregates_and_constant_keys.reference
+%%DATADIR%%-test/queries/0_stateless/00600_replace_running_query.reference
+%%DATADIR%%-test/queries/0_stateless/01780_column_sparse_distinct.reference
+%%DATADIR%%-test/queries/0_stateless/02015_async_inserts_6.reference
 %%DATADIR%%-test/queries/0_stateless/01658_test_base64Encode_mysql_compatibility.reference
-%%DATADIR%%-test/queries/0_stateless/01658_test_base64Encode_mysql_compatibility.sql
-%%DATADIR%%-test/queries/0_stateless/01658_values_ubsan.reference
-%%DATADIR%%-test/queries/0_stateless/01658_values_ubsan.sql
-%%DATADIR%%-test/queries/0_stateless/01659_array_aggregation_ubsan.reference
-%%DATADIR%%-test/queries/0_stateless/01659_array_aggregation_ubsan.sql
-%%DATADIR%%-test/queries/0_stateless/01659_h3_buffer_overflow.reference
-%%DATADIR%%-test/queries/0_stateless/01659_h3_buffer_overflow.sql
-%%DATADIR%%-test/queries/0_stateless/01659_test_base64Decode_mysql_compatibility.reference
-%%DATADIR%%-test/queries/0_stateless/01659_test_base64Decode_mysql_compatibility.sql
-%%DATADIR%%-test/queries/0_stateless/01660_second_extremes_bug.reference
-%%DATADIR%%-test/queries/0_stateless/01660_second_extremes_bug.sql
-%%DATADIR%%-test/queries/0_stateless/01660_sum_ubsan.reference
-%%DATADIR%%-test/queries/0_stateless/01660_sum_ubsan.sql
-%%DATADIR%%-test/queries/0_stateless/01660_system_parts_smoke.reference
-%%DATADIR%%-test/queries/0_stateless/01660_system_parts_smoke.sql
-%%DATADIR%%-test/queries/0_stateless/01660_test_toDayOfYear_mysql_compatibility.reference
-%%DATADIR%%-test/queries/0_stateless/01660_test_toDayOfYear_mysql_compatibility.sql
-%%DATADIR%%-test/queries/0_stateless/01661_arraySlice_ubsan.reference
-%%DATADIR%%-test/queries/0_stateless/01661_arraySlice_ubsan.sql
-%%DATADIR%%-test/queries/0_stateless/01661_extract_all_groups_throw_fast.reference
-%%DATADIR%%-test/queries/0_stateless/01661_extract_all_groups_throw_fast.sql
-%%DATADIR%%-test/queries/0_stateless/01661_referer.reference
-%%DATADIR%%-test/queries/0_stateless/01661_referer.sh
-%%DATADIR%%-test/queries/0_stateless/01661_test_toDayOfWeek_mysql_compatibility.reference
-%%DATADIR%%-test/queries/0_stateless/01661_test_toDayOfWeek_mysql_compatibility.sql
-%%DATADIR%%-test/queries/0_stateless/01662_date_ubsan.reference
-%%DATADIR%%-test/queries/0_stateless/01662_date_ubsan.sql
-%%DATADIR%%-test/queries/0_stateless/01662_test_toDayOfMonth_mysql_compatibility.reference
-%%DATADIR%%-test/queries/0_stateless/01662_test_toDayOfMonth_mysql_compatibility.sql
-%%DATADIR%%-test/queries/0_stateless/01663_aes_msan.reference
-%%DATADIR%%-test/queries/0_stateless/01663_aes_msan.sql
-%%DATADIR%%-test/queries/0_stateless/01663_quantile_weighted_overflow.reference
-%%DATADIR%%-test/queries/0_stateless/01663_quantile_weighted_overflow.sql
-%%DATADIR%%-test/queries/0_stateless/01663_test_toDate_mysql_compatibility.reference
-%%DATADIR%%-test/queries/0_stateless/01663_test_toDate_mysql_compatibility.sql
-%%DATADIR%%-test/queries/0_stateless/01664_array_slice_ubsan.reference
-%%DATADIR%%-test/queries/0_stateless/01664_array_slice_ubsan.sql
-%%DATADIR%%-test/queries/0_stateless/01664_decimal_ubsan.reference
-%%DATADIR%%-test/queries/0_stateless/01664_decimal_ubsan.sql
-%%DATADIR%%-test/queries/0_stateless/01664_test_FunctionIPv6NumToString_mysql_compatibility.reference
-%%DATADIR%%-test/queries/0_stateless/01664_test_FunctionIPv6NumToString_mysql_compatibility.sql
-%%DATADIR%%-test/queries/0_stateless/01665_merge_tree_min_for_concurrent_read.reference
-%%DATADIR%%-test/queries/0_stateless/01665_merge_tree_min_for_concurrent_read.sql
-%%DATADIR%%-test/queries/0_stateless/01665_running_difference_ubsan.reference
-%%DATADIR%%-test/queries/0_stateless/01665_running_difference_ubsan.sql
-%%DATADIR%%-test/queries/0_stateless/01665_substring_ubsan.reference
-%%DATADIR%%-test/queries/0_stateless/01665_substring_ubsan.sql
-%%DATADIR%%-test/queries/0_stateless/01665_test_FunctionIPv6StringToNum_mysql_compatibility.reference
-%%DATADIR%%-test/queries/0_stateless/01665_test_FunctionIPv6StringToNum_mysql_compatibility.sql
-%%DATADIR%%-test/queries/0_stateless/01666_blns.reference
-%%DATADIR%%-test/queries/0_stateless/01666_blns.sql
-%%DATADIR%%-test/queries/0_stateless/01666_date_lut_buffer_overflow.reference
-%%DATADIR%%-test/queries/0_stateless/01666_date_lut_buffer_overflow.sql
-%%DATADIR%%-test/queries/0_stateless/01666_gcd_ubsan.reference
-%%DATADIR%%-test/queries/0_stateless/01666_gcd_ubsan.sql
-%%DATADIR%%-test/queries/0_stateless/01666_great_circle_distance_ubsan.reference
-%%DATADIR%%-test/queries/0_stateless/01666_great_circle_distance_ubsan.sql
-%%DATADIR%%-test/queries/0_stateless/01666_lcm_ubsan.reference
-%%DATADIR%%-test/queries/0_stateless/01666_lcm_ubsan.sql
-%%DATADIR%%-test/queries/0_stateless/01666_merge_tree_max_query_limit.reference
-%%DATADIR%%-test/queries/0_stateless/01666_merge_tree_max_query_limit.sh
-%%DATADIR%%-test/queries/0_stateless/01666_test_FunctionIPv4NumToString_mysql_compatibility.reference
-%%DATADIR%%-test/queries/0_stateless/01666_test_FunctionIPv4NumToString_mysql_compatibility.sql
-%%DATADIR%%-test/queries/0_stateless/01667_aes_args_check.reference
-%%DATADIR%%-test/queries/0_stateless/01667_aes_args_check.sql
-%%DATADIR%%-test/queries/0_stateless/01667_test_FunctionIPv4StringToNum_mysql_compatibility.reference
-%%DATADIR%%-test/queries/0_stateless/01667_test_FunctionIPv4StringToNum_mysql_compatibility.sql
-%%DATADIR%%-test/queries/0_stateless/01668_avg_weighted_ubsan.reference
-%%DATADIR%%-test/queries/0_stateless/01668_avg_weighted_ubsan.sql
-%%DATADIR%%-test/queries/0_stateless/01668_test_toMonth_mysql_dialect.reference
-%%DATADIR%%-test/queries/0_stateless/01668_test_toMonth_mysql_dialect.sql
-%%DATADIR%%-test/queries/0_stateless/01669_columns_declaration_serde.reference
-%%DATADIR%%-test/queries/0_stateless/01669_columns_declaration_serde.sql
-%%DATADIR%%-test/queries/0_stateless/01669_test_toYear_mysql_dialect.reference
+%%DATADIR%%-test/queries/0_stateless/01528_allow_nondeterministic_optimize_skip_unused_shards.sql
+%%DATADIR%%-test/queries/0_stateless/00098_c_union_all.sql
+%%DATADIR%%-test/queries/0_stateless/00556_array_intersect.reference
+%%DATADIR%%-test/queries/0_stateless/01889_tokenize.reference
+%%DATADIR%%-test/queries/0_stateless/01373_summing_merge_tree_exclude_partition_key.reference
+%%DATADIR%%-test/queries/0_stateless/00469_comparison_of_strings_containing_null_char.reference
+%%DATADIR%%-test/queries/0_stateless/00693_max_block_size_system_tables_columns.sql
+%%DATADIR%%-test/queries/0_stateless/01472_obfuscator_uuid.sh
+%%DATADIR%%-test/queries/0_stateless/01509_output_format_pretty_row_numbers.sql
+%%DATADIR%%-test/queries/0_stateless/00065_shard_float_literals_formatting.sql
+%%DATADIR%%-test/queries/0_stateless/01956_skip_unavailable_shards_excessive_attempts.reference
+%%DATADIR%%-test/queries/0_stateless/01047_no_alias_columns_with_table_aliases.reference
+%%DATADIR%%-test/queries/0_stateless/02024_create_dictionary_with_comment.sql
+%%DATADIR%%-test/queries/0_stateless/00534_functions_bad_arguments7.reference
+%%DATADIR%%-test/queries/0_stateless/00662_array_has_nullable.reference
+%%DATADIR%%-test/queries/0_stateless/00753_distributed_system_columns_and_system_tables.reference
+%%DATADIR%%-test/queries/0_stateless/01599_multiline_input_and_singleline_comments.sh
 %%DATADIR%%-test/queries/0_stateless/01669_test_toYear_mysql_dialect.sql
-%%DATADIR%%-test/queries/0_stateless/01670_dictionary_create_key_expression.reference
-%%DATADIR%%-test/queries/0_stateless/01670_dictionary_create_key_expression.sql
-%%DATADIR%%-test/queries/0_stateless/01670_distributed_bytes_to_throw_insert.reference
-%%DATADIR%%-test/queries/0_stateless/01670_distributed_bytes_to_throw_insert.sql
-%%DATADIR%%-test/queries/0_stateless/01670_log_comment.reference
-%%DATADIR%%-test/queries/0_stateless/01670_log_comment.sql
-%%DATADIR%%-test/queries/0_stateless/01670_neighbor_lc_bug.reference
-%%DATADIR%%-test/queries/0_stateless/01670_neighbor_lc_bug.sql
-%%DATADIR%%-test/queries/0_stateless/01670_sign_function.reference
-%%DATADIR%%-test/queries/0_stateless/01670_sign_function.sql
-%%DATADIR%%-test/queries/0_stateless/01670_test_repeat_mysql_dialect.reference
-%%DATADIR%%-test/queries/0_stateless/01670_test_repeat_mysql_dialect.sql
-%%DATADIR%%-test/queries/0_stateless/01671_aggregate_function_group_bitmap_data.reference
-%%DATADIR%%-test/queries/0_stateless/01671_aggregate_function_group_bitmap_data.sql
-%%DATADIR%%-test/queries/0_stateless/01671_ddl_hang_timeout_long.reference
-%%DATADIR%%-test/queries/0_stateless/01671_ddl_hang_timeout_long.sh
-%%DATADIR%%-test/queries/0_stateless/01671_merge_join_and_constants.reference
-%%DATADIR%%-test/queries/0_stateless/01671_merge_join_and_constants.sql
-%%DATADIR%%-test/queries/0_stateless/01671_test_toQuarter_mysql_dialect.reference
-%%DATADIR%%-test/queries/0_stateless/01671_test_toQuarter_mysql_dialect.sql
-%%DATADIR%%-test/queries/0_stateless/01672_actions_dag_merge_crash.reference
-%%DATADIR%%-test/queries/0_stateless/01672_actions_dag_merge_crash.sql
-%%DATADIR%%-test/queries/0_stateless/01672_test_toSecond_mysql_dialect.reference
-%%DATADIR%%-test/queries/0_stateless/01672_test_toSecond_mysql_dialect.sql
-%%DATADIR%%-test/queries/0_stateless/01673_test_toMinute_mysql_dialect.reference
-%%DATADIR%%-test/queries/0_stateless/01673_test_toMinute_mysql_dialect.sql
-%%DATADIR%%-test/queries/0_stateless/01674_clickhouse_client_query_param_cte.reference
+%%DATADIR%%-test/queries/0_stateless/01920_async_drain_connections.reference
+%%DATADIR%%-test/queries/0_stateless/01101_literal_column_clash.sql
+%%DATADIR%%-test/queries/0_stateless/01764_collapsing_merge_adaptive_granularity.reference
+%%DATADIR%%-test/queries/0_stateless/01658_read_file_to_stringcolumn.sh
+%%DATADIR%%-test/queries/0_stateless/00627_recursive_alias.sql
+%%DATADIR%%-test/queries/0_stateless/01460_mark_inclusion_search_crash.sql
+%%DATADIR%%-test/queries/0_stateless/01853_dictionary_cache_duplicates.sh
+%%DATADIR%%-test/queries/0_stateless/02009_array_join_partition.sql
+%%DATADIR%%-test/queries/0_stateless/02100_now64_types_bug.sql
+%%DATADIR%%-test/queries/0_stateless/01529_union_distinct_and_setting_union_default_mode.reference
+%%DATADIR%%-test/queries/0_stateless/01683_codec_encrypted.reference
+%%DATADIR%%-test/queries/0_stateless/01070_string_to_h3.sql
+%%DATADIR%%-test/queries/0_stateless/00087_distinct_of_empty_arrays.sql
+%%DATADIR%%-test/queries/0_stateless/01563_distributed_query_finish.reference
+%%DATADIR%%-test/queries/0_stateless/00091_union_race_conditions_2.sh
+%%DATADIR%%-test/queries/0_stateless/00917_least_sqr.sql
 %%DATADIR%%-test/queries/0_stateless/01674_clickhouse_client_query_param_cte.sh
-%%DATADIR%%-test/queries/0_stateless/01674_executable_dictionary_implicit_key.reference
-%%DATADIR%%-test/queries/0_stateless/01674_executable_dictionary_implicit_key.sql
-%%DATADIR%%-test/queries/0_stateless/01674_filter_by_uint8.reference
-%%DATADIR%%-test/queries/0_stateless/01674_filter_by_uint8.sql
-%%DATADIR%%-test/queries/0_stateless/01674_htm_xml_coarse_parse.reference
-%%DATADIR%%-test/queries/0_stateless/01674_htm_xml_coarse_parse.sql
-%%DATADIR%%-test/queries/0_stateless/01674_unicode_asan.reference
-%%DATADIR%%-test/queries/0_stateless/01674_unicode_asan.sql
-%%DATADIR%%-test/queries/0_stateless/01674_where_prewhere_array_crash.reference
-%%DATADIR%%-test/queries/0_stateless/01674_where_prewhere_array_crash.sql
-%%DATADIR%%-test/queries/0_stateless/01675_data_type_coroutine.reference
-%%DATADIR%%-test/queries/0_stateless/01675_data_type_coroutine.sh
-%%DATADIR%%-test/queries/0_stateless/01675_distributed_bytes_to_delay_insert_long.reference
-%%DATADIR%%-test/queries/0_stateless/01675_distributed_bytes_to_delay_insert_long.sh
-%%DATADIR%%-test/queries/0_stateless/01676_dictget_in_default_expression.reference
-%%DATADIR%%-test/queries/0_stateless/01676_dictget_in_default_expression.sql
-%%DATADIR%%-test/queries/0_stateless/01676_long_clickhouse_client_autocomplete.reference
-%%DATADIR%%-test/queries/0_stateless/01676_long_clickhouse_client_autocomplete.sh
-%%DATADIR%%-test/queries/0_stateless/01676_range_hashed_dictionary.reference
-%%DATADIR%%-test/queries/0_stateless/01676_range_hashed_dictionary.sql
-%%DATADIR%%-test/queries/0_stateless/01676_reinterpret_as.reference
-%%DATADIR%%-test/queries/0_stateless/01676_reinterpret_as.sql
-%%DATADIR%%-test/queries/0_stateless/01676_round_int_ubsan.reference
-%%DATADIR%%-test/queries/0_stateless/01676_round_int_ubsan.sql
-%%DATADIR%%-test/queries/0_stateless/01677_array_enumerate_bug.reference
-%%DATADIR%%-test/queries/0_stateless/01677_array_enumerate_bug.sql
-%%DATADIR%%-test/queries/0_stateless/01677_bit_float.reference
-%%DATADIR%%-test/queries/0_stateless/01677_bit_float.sql
-%%DATADIR%%-test/queries/0_stateless/01678_great_circle_angle.reference
-%%DATADIR%%-test/queries/0_stateless/01678_great_circle_angle.sql
-%%DATADIR%%-test/queries/0_stateless/01679_format_readable_time_delta_inf.reference
-%%DATADIR%%-test/queries/0_stateless/01679_format_readable_time_delta_inf.sql
-%%DATADIR%%-test/queries/0_stateless/01679_incorrect_data_on_insert_collapsing.reference
-%%DATADIR%%-test/queries/0_stateless/01679_incorrect_data_on_insert_collapsing.sh
-%%DATADIR%%-test/queries/0_stateless/01680_date_time_add_ubsan.reference
-%%DATADIR%%-test/queries/0_stateless/01680_date_time_add_ubsan.sql
-%%DATADIR%%-test/queries/0_stateless/01680_predicate_pushdown_union_distinct_subquery.reference
-%%DATADIR%%-test/queries/0_stateless/01680_predicate_pushdown_union_distinct_subquery.sql
-%%DATADIR%%-test/queries/0_stateless/01681_arg_min_max_if_fix.reference
-%%DATADIR%%-test/queries/0_stateless/01681_arg_min_max_if_fix.sql
-%%DATADIR%%-test/queries/0_stateless/01681_bloom_filter_nullable_column.reference
-%%DATADIR%%-test/queries/0_stateless/01681_bloom_filter_nullable_column.sql
-%%DATADIR%%-test/queries/0_stateless/01681_cache_dictionary_simple_key.reference
-%%DATADIR%%-test/queries/0_stateless/01681_cache_dictionary_simple_key.sql
-%%DATADIR%%-test/queries/0_stateless/01681_hyperscan_debug_assertion.reference
-%%DATADIR%%-test/queries/0_stateless/01681_hyperscan_debug_assertion.sh
-%%DATADIR%%-test/queries/0_stateless/01682_cache_dictionary_complex_key.reference
-%%DATADIR%%-test/queries/0_stateless/01682_cache_dictionary_complex_key.sql
-%%DATADIR%%-test/queries/0_stateless/01682_gather_utils_ubsan.reference
-%%DATADIR%%-test/queries/0_stateless/01682_gather_utils_ubsan.sql
-%%DATADIR%%-test/queries/0_stateless/01683_dist_INSERT_block_structure_mismatch.reference
-%%DATADIR%%-test/queries/0_stateless/01683_dist_INSERT_block_structure_mismatch.sql
-%%DATADIR%%-test/queries/0_stateless/01683_flat_dictionary.reference
+%%DATADIR%%-test/queries/0_stateless/00752_low_cardinality_mv_1.reference
+%%DATADIR%%-test/queries/0_stateless/00712_prewhere_with_final.reference
+%%DATADIR%%-test/queries/0_stateless/02126_url_auth.python
+%%DATADIR%%-test/queries/0_stateless/01020_function_char.sql
+%%DATADIR%%-test/queries/0_stateless/01175_distributed_ddl_output_mode_long.reference
+%%DATADIR%%-test/queries/0_stateless/01763_support_map_lowcardinality_type.sql
+%%DATADIR%%-test/queries/0_stateless/00916_create_or_replace_view.sql
+%%DATADIR%%-test/queries/0_stateless/01746_forbid_drop_column_referenced_by_mv.sql
+%%DATADIR%%-test/queries/0_stateless/01300_read_wkt.sql
+%%DATADIR%%-test/queries/0_stateless/02018_multiple_with_fill_for_the_same_column.reference
+%%DATADIR%%-test/queries/0_stateless/01778_hierarchical_dictionaries.sql
+%%DATADIR%%-test/queries/0_stateless/01533_sum_if_nullable_bug.reference
+%%DATADIR%%-test/queries/0_stateless/00116_storage_set.reference
+%%DATADIR%%-test/queries/0_stateless/01300_svg.reference
+%%DATADIR%%-test/queries/0_stateless/01760_system_dictionaries.sql
+%%DATADIR%%-test/queries/0_stateless/01273_arrow_arrays_load.sh
+%%DATADIR%%-test/queries/0_stateless/01034_sample_final_distributed.sql
+%%DATADIR%%-test/queries/0_stateless/01113_local_dictionary_type_conversion.sql
+%%DATADIR%%-test/queries/0_stateless/00273_quantiles.reference
+%%DATADIR%%-test/queries/0_stateless/01018_ddl_dictionaries_select.sql
+%%DATADIR%%-test/queries/0_stateless/01034_JSONCompactEachRow.reference
+%%DATADIR%%-test/queries/0_stateless/00979_live_view_watch_live_moving_avg.py.disabled
+%%DATADIR%%-test/queries/0_stateless/00945_bloom_filter_index.reference
+%%DATADIR%%-test/queries/0_stateless/01542_dictionary_load_exception_race.sh
+%%DATADIR%%-test/queries/0_stateless/00310_tskv.sh
+%%DATADIR%%-test/queries/0_stateless/00735_or_expr_optimize_bug.reference
+%%DATADIR%%-test/queries/0_stateless/00639_startsWith.sql
+%%DATADIR%%-test/queries/0_stateless/00024_unused_array_join_in_subquery.sql
+%%DATADIR%%-test/queries/0_stateless/00950_test_gorilla_codec.sql
+%%DATADIR%%-test/queries/0_stateless/01146_clickhouse_local_data.sh
+%%DATADIR%%-test/queries/0_stateless/01152_cross_replication.reference
+%%DATADIR%%-test/queries/0_stateless/02025_subcolumns_compact_parts.sql
+%%DATADIR%%-test/queries/0_stateless/00804_test_delta_codec_compression.sql
+%%DATADIR%%-test/queries/0_stateless/01901_test_attach_partition_from.sql
+%%DATADIR%%-test/queries/0_stateless/00974_full_outer_join.reference
+%%DATADIR%%-test/queries/0_stateless/01055_compact_parts_1.reference
+%%DATADIR%%-test/queries/0_stateless/00141_parse_timestamp_as_datetime.reference
+%%DATADIR%%-test/queries/0_stateless/00834_not_between.sql
+%%DATADIR%%-test/queries/0_stateless/01852_cast_operator_bad_cases.reference
+%%DATADIR%%-test/queries/0_stateless/02015_shard_crash_clang_12_build.sh
+%%DATADIR%%-test/queries/0_stateless/00507_array_no_params.reference
+%%DATADIR%%-test/queries/0_stateless/00838_system_tables_drop_table_race.reference
+%%DATADIR%%-test/queries/0_stateless/01744_tuple_cast_to_map_bugfix.reference
+%%DATADIR%%-test/queries/0_stateless/01906_h3_to_geo.sql
+%%DATADIR%%-test/queries/0_stateless/00162_shard_global_join.sql
+%%DATADIR%%-test/queries/0_stateless/01514_input_format_tsv_enum_as_number_setting.reference
 %%DATADIR%%-test/queries/0_stateless/01683_flat_dictionary.sql
-%%DATADIR%%-test/queries/0_stateless/01683_intdiv_ubsan.reference
-%%DATADIR%%-test/queries/0_stateless/01683_intdiv_ubsan.sql
-%%DATADIR%%-test/queries/0_stateless/01683_text_log_deadlock.reference
-%%DATADIR%%-test/queries/0_stateless/01683_text_log_deadlock.sh
-%%DATADIR%%-test/queries/0_stateless/01684_geohash_ubsan.reference
-%%DATADIR%%-test/queries/0_stateless/01684_geohash_ubsan.sql
-%%DATADIR%%-test/queries/0_stateless/01684_insert_specify_shard_id.reference
-%%DATADIR%%-test/queries/0_stateless/01684_insert_specify_shard_id.sql
-%%DATADIR%%-test/queries/0_stateless/01684_ssd_cache_dictionary_simple_key.reference
-%%DATADIR%%-test/queries/0_stateless/01684_ssd_cache_dictionary_simple_key.sh
-%%DATADIR%%-test/queries/0_stateless/01685_json_extract_double_as_float.reference
-%%DATADIR%%-test/queries/0_stateless/01685_json_extract_double_as_float.sql
-%%DATADIR%%-test/queries/0_stateless/01685_ssd_cache_dictionary_complex_key.reference
-%%DATADIR%%-test/queries/0_stateless/01685_ssd_cache_dictionary_complex_key.sh
-%%DATADIR%%-test/queries/0_stateless/01686_event_time_microseconds_part_log.reference
-%%DATADIR%%-test/queries/0_stateless/01686_event_time_microseconds_part_log.sql
-%%DATADIR%%-test/queries/0_stateless/01686_rocksdb.reference
-%%DATADIR%%-test/queries/0_stateless/01686_rocksdb.sql
-%%DATADIR%%-test/queries/0_stateless/01690_quantilesTiming_ubsan.reference
-%%DATADIR%%-test/queries/0_stateless/01690_quantilesTiming_ubsan.sql
-%%DATADIR%%-test/queries/0_stateless/01691_DateTime64_clamp.reference
-%%DATADIR%%-test/queries/0_stateless/01691_DateTime64_clamp.sql
-%%DATADIR%%-test/queries/0_stateless/01691_parser_data_type_exponential.reference
-%%DATADIR%%-test/queries/0_stateless/01691_parser_data_type_exponential.sh
-%%DATADIR%%-test/queries/0_stateless/01692_DateTime64_from_DateTime.reference
-%%DATADIR%%-test/queries/0_stateless/01692_DateTime64_from_DateTime.sql
-%%DATADIR%%-test/queries/0_stateless/01698_fix_toMinute.reference
-%%DATADIR%%-test/queries/0_stateless/01698_fix_toMinute.sql
-%%DATADIR%%-test/queries/0_stateless/01698_map_populate_overflow.reference
-%%DATADIR%%-test/queries/0_stateless/01698_map_populate_overflow.sql
-%%DATADIR%%-test/queries/0_stateless/01699_timezoneOffset.reference
-%%DATADIR%%-test/queries/0_stateless/01699_timezoneOffset.sql
-%%DATADIR%%-test/queries/0_stateless/01700_deltasum.reference
-%%DATADIR%%-test/queries/0_stateless/01700_deltasum.sql
-%%DATADIR%%-test/queries/0_stateless/01700_mod_negative_type_promotion.reference
-%%DATADIR%%-test/queries/0_stateless/01700_mod_negative_type_promotion.sql
-%%DATADIR%%-test/queries/0_stateless/01700_point_in_polygon_ubsan.reference
-%%DATADIR%%-test/queries/0_stateless/01700_point_in_polygon_ubsan.sql
-%%DATADIR%%-test/queries/0_stateless/01700_system_zookeeper_path_in.reference
-%%DATADIR%%-test/queries/0_stateless/01700_system_zookeeper_path_in.sql
-%%DATADIR%%-test/queries/0_stateless/01701_if_tuple_segfault.reference
-%%DATADIR%%-test/queries/0_stateless/01701_if_tuple_segfault.sql
-%%DATADIR%%-test/queries/0_stateless/01701_parallel_parsing_infinite_segmentation.reference
-%%DATADIR%%-test/queries/0_stateless/01701_parallel_parsing_infinite_segmentation.sh
-%%DATADIR%%-test/queries/0_stateless/01702_bitmap_native_integers.reference
-%%DATADIR%%-test/queries/0_stateless/01702_bitmap_native_integers.sql
-%%DATADIR%%-test/queries/0_stateless/01702_rewrite_avg_for_algebraic_optimization.reference
-%%DATADIR%%-test/queries/0_stateless/01702_rewrite_avg_for_algebraic_optimization.sql
-%%DATADIR%%-test/queries/0_stateless/01702_system_numbers_scientific_notation.reference
-%%DATADIR%%-test/queries/0_stateless/01702_system_numbers_scientific_notation.sql
-%%DATADIR%%-test/queries/0_stateless/01702_system_query_log.reference
-%%DATADIR%%-test/queries/0_stateless/01702_system_query_log.sql
-%%DATADIR%%-test/queries/0_stateless/01702_toDateTime_from_string_clamping.reference
-%%DATADIR%%-test/queries/0_stateless/01702_toDateTime_from_string_clamping.sql
-%%DATADIR%%-test/queries/0_stateless/01703_rewrite_aggregate_function_case_insensitive.reference
-%%DATADIR%%-test/queries/0_stateless/01703_rewrite_aggregate_function_case_insensitive.sql
-%%DATADIR%%-test/queries/0_stateless/01704_transform_with_float_key.reference
-%%DATADIR%%-test/queries/0_stateless/01704_transform_with_float_key.sql
-%%DATADIR%%-test/queries/0_stateless/01705_normalize_case_insensitive_function_names.reference
-%%DATADIR%%-test/queries/0_stateless/01705_normalize_case_insensitive_function_names.sql
-%%DATADIR%%-test/queries/0_stateless/01706_optimize_normalize_count_variants.reference
-%%DATADIR%%-test/queries/0_stateless/01706_optimize_normalize_count_variants.sql
-%%DATADIR%%-test/queries/0_stateless/01709_inactive_parts_to_throw_insert.reference
-%%DATADIR%%-test/queries/0_stateless/01709_inactive_parts_to_throw_insert.sql
-%%DATADIR%%-test/queries/0_stateless/01710_aggregate_projections.reference
-%%DATADIR%%-test/queries/0_stateless/01710_aggregate_projections.sh
-%%DATADIR%%-test/queries/0_stateless/01710_force_use_projection.reference
-%%DATADIR%%-test/queries/0_stateless/01710_force_use_projection.sql
-%%DATADIR%%-test/queries/0_stateless/01710_join_use_nulls.reference
-%%DATADIR%%-test/queries/0_stateless/01710_join_use_nulls.sql
-%%DATADIR%%-test/queries/0_stateless/01710_normal_projections.reference
-%%DATADIR%%-test/queries/0_stateless/01710_normal_projections.sh
-%%DATADIR%%-test/queries/0_stateless/01710_projection_drop_if_exists.reference
-%%DATADIR%%-test/queries/0_stateless/01710_projection_drop_if_exists.sql
-%%DATADIR%%-test/queries/0_stateless/01710_projection_fetch.reference
-%%DATADIR%%-test/queries/0_stateless/01710_projection_fetch.sql
-%%DATADIR%%-test/queries/0_stateless/01710_projection_group_by_order_by.reference
-%%DATADIR%%-test/queries/0_stateless/01710_projection_group_by_order_by.sql
-%%DATADIR%%-test/queries/0_stateless/01710_projection_part_check.reference
-%%DATADIR%%-test/queries/0_stateless/01710_projection_part_check.sql
-%%DATADIR%%-test/queries/0_stateless/01710_projections.reference
-%%DATADIR%%-test/queries/0_stateless/01710_projections.sql
-%%DATADIR%%-test/queries/0_stateless/01710_projections_group_by_no_key.reference
-%%DATADIR%%-test/queries/0_stateless/01710_projections_group_by_no_key.sql
-%%DATADIR%%-test/queries/0_stateless/01710_projections_in_distributed_query.reference
-%%DATADIR%%-test/queries/0_stateless/01710_projections_in_distributed_query.sql
-%%DATADIR%%-test/queries/0_stateless/01711_cte_subquery_fix.reference
-%%DATADIR%%-test/queries/0_stateless/01711_cte_subquery_fix.sql
-%%DATADIR%%-test/queries/0_stateless/01711_decimal_multiplication.reference
-%%DATADIR%%-test/queries/0_stateless/01711_decimal_multiplication.sql
-%%DATADIR%%-test/queries/0_stateless/01712_no_adaptive_granularity_vertical_merge.reference
-%%DATADIR%%-test/queries/0_stateless/01712_no_adaptive_granularity_vertical_merge.sql
-%%DATADIR%%-test/queries/0_stateless/01713_table_ttl_old_syntax_zookeeper.reference
-%%DATADIR%%-test/queries/0_stateless/01713_table_ttl_old_syntax_zookeeper.sql
-%%DATADIR%%-test/queries/0_stateless/01714_alter_drop_version.reference
-%%DATADIR%%-test/queries/0_stateless/01714_alter_drop_version.sql
-%%DATADIR%%-test/queries/0_stateless/01715_background_checker_blather_zookeeper.reference
-%%DATADIR%%-test/queries/0_stateless/01715_background_checker_blather_zookeeper.sql
-%%DATADIR%%-test/queries/0_stateless/01715_table_function_view_fix.reference
-%%DATADIR%%-test/queries/0_stateless/01715_table_function_view_fix.sql
-%%DATADIR%%-test/queries/0_stateless/01715_tuple_insert_null_as_default.reference
-%%DATADIR%%-test/queries/0_stateless/01715_tuple_insert_null_as_default.sql
-%%DATADIR%%-test/queries/0_stateless/01716_array_difference_overflow.reference
-%%DATADIR%%-test/queries/0_stateless/01716_array_difference_overflow.sql
-%%DATADIR%%-test/queries/0_stateless/01716_decimal_comparison_ubsan.reference
-%%DATADIR%%-test/queries/0_stateless/01716_decimal_comparison_ubsan.sql
-%%DATADIR%%-test/queries/0_stateless/01716_drop_rename_sign_column.reference
-%%DATADIR%%-test/queries/0_stateless/01716_drop_rename_sign_column.sql
-%%DATADIR%%-test/queries/0_stateless/01717_global_with_subquery_fix.reference
-%%DATADIR%%-test/queries/0_stateless/01717_global_with_subquery_fix.sql
-%%DATADIR%%-test/queries/0_stateless/01717_int_div_float_too_large_ubsan.reference
-%%DATADIR%%-test/queries/0_stateless/01717_int_div_float_too_large_ubsan.sql
-%%DATADIR%%-test/queries/0_stateless/01718_subtract_seconds_date.reference
-%%DATADIR%%-test/queries/0_stateless/01718_subtract_seconds_date.sql
-%%DATADIR%%-test/queries/0_stateless/01719_join_timezone.reference
-%%DATADIR%%-test/queries/0_stateless/01719_join_timezone.sql
-%%DATADIR%%-test/queries/0_stateless/01720_constraints_complex_types.reference
-%%DATADIR%%-test/queries/0_stateless/01720_constraints_complex_types.sql
-%%DATADIR%%-test/queries/0_stateless/01720_country_intersection.reference
-%%DATADIR%%-test/queries/0_stateless/01720_country_intersection.sh
-%%DATADIR%%-test/queries/0_stateless/01720_country_perimeter_and_area.reference
-%%DATADIR%%-test/queries/0_stateless/01720_country_perimeter_and_area.sh
-%%DATADIR%%-test/queries/0_stateless/01720_dictionary_create_source_with_functions.reference
-%%DATADIR%%-test/queries/0_stateless/01720_dictionary_create_source_with_functions.sql
-%%DATADIR%%-test/queries/0_stateless/01720_engine_file_empty_if_not_exists.reference
-%%DATADIR%%-test/queries/0_stateless/01720_engine_file_empty_if_not_exists.sql
-%%DATADIR%%-test/queries/0_stateless/01720_join_implicit_cast.reference
-%%DATADIR%%-test/queries/0_stateless/01720_join_implicit_cast.sql
-%%DATADIR%%-test/queries/0_stateless/01720_type_map_and_casts.reference
-%%DATADIR%%-test/queries/0_stateless/01720_type_map_and_casts.sql
-%%DATADIR%%-test/queries/0_stateless/01720_union_distinct_with_limit.reference
-%%DATADIR%%-test/queries/0_stateless/01720_union_distinct_with_limit.sql
-%%DATADIR%%-test/queries/0_stateless/01721_constraints_constant_expressions.reference
-%%DATADIR%%-test/queries/0_stateless/01721_constraints_constant_expressions.sql
-%%DATADIR%%-test/queries/0_stateless/01721_dictionary_decimal_p_s.reference
-%%DATADIR%%-test/queries/0_stateless/01721_dictionary_decimal_p_s.sql
-%%DATADIR%%-test/queries/0_stateless/01721_engine_file_truncate_on_insert.reference
-%%DATADIR%%-test/queries/0_stateless/01721_engine_file_truncate_on_insert.sql
+%%DATADIR%%-test/queries/0_stateless/01564_test_hint_woes.reference
+%%DATADIR%%-test/queries/0_stateless/02046_low_cardinality_parallel_group_by.reference
+%%DATADIR%%-test/queries/0_stateless/00898_parsing_bad_diagnostic_message.sh
+%%DATADIR%%-test/queries/0_stateless/00982_array_enumerate_uniq_ranked.sql
+%%DATADIR%%-test/queries/0_stateless/00938_fix_rwlock_segfault_long.sh
+%%DATADIR%%-test/queries/0_stateless/01626_cnf_fuzz_long.sh
+%%DATADIR%%-test/queries/0_stateless/00679_replace_asterisk.reference
+%%DATADIR%%-test/queries/0_stateless/01278_alter_rename_combination.sql
+%%DATADIR%%-test/queries/0_stateless/01622_constraints_where_optimization.sql
+%%DATADIR%%-test/queries/0_stateless/00878_join_unexpected_results.reference
+%%DATADIR%%-test/queries/0_stateless/00326_long_function_multi_if.sql
+%%DATADIR%%-test/queries/0_stateless/01947_mv_subquery.sql
+%%DATADIR%%-test/queries/0_stateless/01845_add_testcase_for_arrayElement.sql
+%%DATADIR%%-test/queries/0_stateless/01915_json_extract_raw_string.sql
+%%DATADIR%%-test/queries/0_stateless/01271_optimize_arithmetic_operations_in_aggr_func_with_alias.reference
+%%DATADIR%%-test/queries/0_stateless/00442_filter_by_nullable.sql
+%%DATADIR%%-test/queries/0_stateless/01019_materialized_view_select_extra_columns.reference
+%%DATADIR%%-test/queries/0_stateless/02008_test_union_distinct_in_subquery.sql
+%%DATADIR%%-test/queries/0_stateless/01213_alter_rename_with_default_zookeeper_long.reference
+%%DATADIR%%-test/queries/0_stateless/01067_window_view_event_tumble_to_asc_lateness.sh
+%%DATADIR%%-test/queries/0_stateless/01085_max_distributed_connections.reference
+%%DATADIR%%-test/queries/0_stateless/01303_polygons_equals.reference
+%%DATADIR%%-test/queries/0_stateless/01636_nullable_fuzz2.reference
+%%DATADIR%%-test/queries/0_stateless/00966_live_view_watch_events_http.py
+%%DATADIR%%-test/queries/0_stateless/01938_joins_identifiers.reference
+%%DATADIR%%-test/queries/0_stateless/02152_csv_tuple.sql
+%%DATADIR%%-test/queries/0_stateless/01156_pcg_deserialization.reference
 %%DATADIR%%-test/queries/0_stateless/01721_join_implicit_cast_long.reference
-%%DATADIR%%-test/queries/0_stateless/01721_join_implicit_cast_long.sql
-%%DATADIR%%-test/queries/0_stateless/01722_long_brotli_http_compression_json_format.reference
-%%DATADIR%%-test/queries/0_stateless/01722_long_brotli_http_compression_json_format.sh
-%%DATADIR%%-test/queries/0_stateless/01730_distributed_group_by_no_merge_order_by_long.reference
-%%DATADIR%%-test/queries/0_stateless/01730_distributed_group_by_no_merge_order_by_long.sql
-%%DATADIR%%-test/queries/0_stateless/01731_async_task_queue_wait.reference
-%%DATADIR%%-test/queries/0_stateless/01731_async_task_queue_wait.sh
-%%DATADIR%%-test/queries/0_stateless/01732_alters_bad_conversions.reference
-%%DATADIR%%-test/queries/0_stateless/01732_alters_bad_conversions.sql
-%%DATADIR%%-test/queries/0_stateless/01732_bigint_ubsan.reference
-%%DATADIR%%-test/queries/0_stateless/01732_bigint_ubsan.sql
-%%DATADIR%%-test/queries/0_stateless/01732_explain_syntax_union_query.reference
-%%DATADIR%%-test/queries/0_stateless/01732_explain_syntax_union_query.sql
-%%DATADIR%%-test/queries/0_stateless/01732_more_consistent_datetime64_parsing.reference
-%%DATADIR%%-test/queries/0_stateless/01732_more_consistent_datetime64_parsing.sql
-%%DATADIR%%-test/queries/0_stateless/01732_race_condition_storage_join_long.reference
-%%DATADIR%%-test/queries/0_stateless/01732_race_condition_storage_join_long.sh
-%%DATADIR%%-test/queries/0_stateless/01732_union_and_union_all.reference
-%%DATADIR%%-test/queries/0_stateless/01732_union_and_union_all.sql
-%%DATADIR%%-test/queries/0_stateless/01733_transform_ubsan.reference
-%%DATADIR%%-test/queries/0_stateless/01733_transform_ubsan.sql
-%%DATADIR%%-test/queries/0_stateless/01734_datetime64_from_float.reference
-%%DATADIR%%-test/queries/0_stateless/01734_datetime64_from_float.sql
+%%DATADIR%%-test/queries/0_stateless/00011_array_join_alias.sql
+%%DATADIR%%-test/queries/0_stateless/01324_if_transform_strings_to_enum.reference
 %%DATADIR%%-test/queries/0_stateless/01735_join_get_low_card_fix.reference
-%%DATADIR%%-test/queries/0_stateless/01735_join_get_low_card_fix.sql
-%%DATADIR%%-test/queries/0_stateless/01735_to_datetime64.reference
-%%DATADIR%%-test/queries/0_stateless/01735_to_datetime64.sql
-%%DATADIR%%-test/queries/0_stateless/01736_null_as_default.reference
-%%DATADIR%%-test/queries/0_stateless/01736_null_as_default.sql
-%%DATADIR%%-test/queries/0_stateless/01737_clickhouse_server_wait_server_pool_long.config.xml
-%%DATADIR%%-test/queries/0_stateless/01737_clickhouse_server_wait_server_pool_long.reference
-%%DATADIR%%-test/queries/0_stateless/01737_clickhouse_server_wait_server_pool_long.sh
-%%DATADIR%%-test/queries/0_stateless/01737_move_order_key_to_prewhere_select_final.reference
-%%DATADIR%%-test/queries/0_stateless/01737_move_order_key_to_prewhere_select_final.sql
-%%DATADIR%%-test/queries/0_stateless/01739_index_hint.reference
-%%DATADIR%%-test/queries/0_stateless/01739_index_hint.sql
-%%DATADIR%%-test/queries/0_stateless/01744_fuse_sum_count_aggregate.reference
-%%DATADIR%%-test/queries/0_stateless/01744_fuse_sum_count_aggregate.sql
-%%DATADIR%%-test/queries/0_stateless/01744_tuple_cast_to_map_bugfix.reference
-%%DATADIR%%-test/queries/0_stateless/01744_tuple_cast_to_map_bugfix.sql
-%%DATADIR%%-test/queries/0_stateless/01745_alter_delete_view.reference
-%%DATADIR%%-test/queries/0_stateless/01745_alter_delete_view.sql
-%%DATADIR%%-test/queries/0_stateless/01746_executable_pool_dictionary.reference
-%%DATADIR%%-test/queries/0_stateless/01746_executable_pool_dictionary.sql
-%%DATADIR%%-test/queries/0_stateless/01746_extract_text_from_html.reference
-%%DATADIR%%-test/queries/0_stateless/01746_extract_text_from_html.sql
-%%DATADIR%%-test/queries/0_stateless/01746_forbid_drop_column_referenced_by_mv.reference
-%%DATADIR%%-test/queries/0_stateless/01746_forbid_drop_column_referenced_by_mv.sql
-%%DATADIR%%-test/queries/0_stateless/01746_lc_values_format_bug.reference
-%%DATADIR%%-test/queries/0_stateless/01746_lc_values_format_bug.sql
-%%DATADIR%%-test/queries/0_stateless/01746_long_zlib_http_compression_json_format.reference
-%%DATADIR%%-test/queries/0_stateless/01746_long_zlib_http_compression_json_format.sh
-%%DATADIR%%-test/queries/0_stateless/01746_long_zstd_http_compression_json_format.reference
-%%DATADIR%%-test/queries/0_stateless/01746_long_zstd_http_compression_json_format.sh
-%%DATADIR%%-test/queries/0_stateless/01746_test_for_tupleElement_must_be_constant_issue.reference
-%%DATADIR%%-test/queries/0_stateless/01746_test_for_tupleElement_must_be_constant_issue.sql
-%%DATADIR%%-test/queries/0_stateless/01747_alter_partition_key_enum_zookeeper.reference
-%%DATADIR%%-test/queries/0_stateless/01747_alter_partition_key_enum_zookeeper.sql
-%%DATADIR%%-test/queries/0_stateless/01747_executable_pool_dictionary_implicit_key.reference
-%%DATADIR%%-test/queries/0_stateless/01747_executable_pool_dictionary_implicit_key.sql
-%%DATADIR%%-test/queries/0_stateless/01747_join_view_filter_dictionary.reference
-%%DATADIR%%-test/queries/0_stateless/01747_join_view_filter_dictionary.sql
-%%DATADIR%%-test/queries/0_stateless/01747_transform_empty_arrays.reference
-%%DATADIR%%-test/queries/0_stateless/01747_transform_empty_arrays.sql
-%%DATADIR%%-test/queries/0_stateless/01748_dictionary_table_dot.reference
-%%DATADIR%%-test/queries/0_stateless/01748_dictionary_table_dot.sql
-%%DATADIR%%-test/queries/0_stateless/01748_partition_id_pruning.reference
-%%DATADIR%%-test/queries/0_stateless/01748_partition_id_pruning.sql
-%%DATADIR%%-test/queries/0_stateless/01750_parsing_exception.reference
-%%DATADIR%%-test/queries/0_stateless/01750_parsing_exception.sh
-%%DATADIR%%-test/queries/0_stateless/01752_distributed_query_sigsegv.reference
-%%DATADIR%%-test/queries/0_stateless/01752_distributed_query_sigsegv.sql
-%%DATADIR%%-test/queries/0_stateless/01753_direct_dictionary_simple_key.reference
-%%DATADIR%%-test/queries/0_stateless/01753_direct_dictionary_simple_key.sql
-%%DATADIR%%-test/queries/0_stateless/01753_fix_clickhouse_format.reference
-%%DATADIR%%-test/queries/0_stateless/01753_fix_clickhouse_format.sh
-%%DATADIR%%-test/queries/0_stateless/01753_max_uri_size.reference
-%%DATADIR%%-test/queries/0_stateless/01753_max_uri_size.sh
-%%DATADIR%%-test/queries/0_stateless/01753_mutate_table_predicated_with_table.reference
-%%DATADIR%%-test/queries/0_stateless/01753_mutate_table_predicated_with_table.sql
-%%DATADIR%%-test/queries/0_stateless/01753_optimize_aggregation_in_order.reference
-%%DATADIR%%-test/queries/0_stateless/01753_optimize_aggregation_in_order.sh
-%%DATADIR%%-test/queries/0_stateless/01753_system_zookeeper_query_param_path_long.reference
-%%DATADIR%%-test/queries/0_stateless/01753_system_zookeeper_query_param_path_long.sh
-%%DATADIR%%-test/queries/0_stateless/01754_clickhouse_format_backslash.reference
-%%DATADIR%%-test/queries/0_stateless/01754_clickhouse_format_backslash.sh
-%%DATADIR%%-test/queries/0_stateless/01754_cluster_all_replicas_shard_num.reference
-%%DATADIR%%-test/queries/0_stateless/01754_cluster_all_replicas_shard_num.sql
-%%DATADIR%%-test/queries/0_stateless/01754_direct_dictionary_complex_key.reference
-%%DATADIR%%-test/queries/0_stateless/01754_direct_dictionary_complex_key.sql
-%%DATADIR%%-test/queries/0_stateless/01755_client_highlight_multi_line_comment_regression.expect
-%%DATADIR%%-test/queries/0_stateless/01755_client_highlight_multi_line_comment_regression.reference
-%%DATADIR%%-test/queries/0_stateless/01755_shard_pruning_with_literal.reference
-%%DATADIR%%-test/queries/0_stateless/01755_shard_pruning_with_literal.sql
-%%DATADIR%%-test/queries/0_stateless/01756_optimize_skip_unused_shards_rewrite_in.reference
-%%DATADIR%%-test/queries/0_stateless/01756_optimize_skip_unused_shards_rewrite_in.sql
-%%DATADIR%%-test/queries/0_stateless/01757_optimize_skip_unused_shards_limit.reference
-%%DATADIR%%-test/queries/0_stateless/01757_optimize_skip_unused_shards_limit.sql
-%%DATADIR%%-test/queries/0_stateless/01758_optimize_skip_unused_shards_once.reference
-%%DATADIR%%-test/queries/0_stateless/01758_optimize_skip_unused_shards_once.sh
-%%DATADIR%%-test/queries/0_stateless/01759_dictionary_unique_attribute_names.reference
-%%DATADIR%%-test/queries/0_stateless/01759_dictionary_unique_attribute_names.sql
-%%DATADIR%%-test/queries/0_stateless/01759_optimize_skip_unused_shards_zero_shards.reference
-%%DATADIR%%-test/queries/0_stateless/01759_optimize_skip_unused_shards_zero_shards.sql
-%%DATADIR%%-test/queries/0_stateless/01760_ddl_dictionary_use_current_database_name.reference
-%%DATADIR%%-test/queries/0_stateless/01760_ddl_dictionary_use_current_database_name.sql
-%%DATADIR%%-test/queries/0_stateless/01760_modulo_negative.reference
-%%DATADIR%%-test/queries/0_stateless/01760_modulo_negative.sql
-%%DATADIR%%-test/queries/0_stateless/01760_polygon_dictionaries.reference
-%%DATADIR%%-test/queries/0_stateless/01760_polygon_dictionaries.sql
-%%DATADIR%%-test/queries/0_stateless/01760_system_dictionaries.reference
-%%DATADIR%%-test/queries/0_stateless/01760_system_dictionaries.sql
-%%DATADIR%%-test/queries/0_stateless/01761_alter_decimal_zookeeper.reference
-%%DATADIR%%-test/queries/0_stateless/01761_alter_decimal_zookeeper.sql
-%%DATADIR%%-test/queries/0_stateless/01761_cast_to_enum_nullable.reference
-%%DATADIR%%-test/queries/0_stateless/01761_cast_to_enum_nullable.sql
-%%DATADIR%%-test/queries/0_stateless/01761_round_year_bounds.reference
-%%DATADIR%%-test/queries/0_stateless/01761_round_year_bounds.sql
-%%DATADIR%%-test/queries/0_stateless/01762_datetime64_extended_parsing.reference
-%%DATADIR%%-test/queries/0_stateless/01762_datetime64_extended_parsing.sql
-%%DATADIR%%-test/queries/0_stateless/01762_deltasumtimestamp.reference
-%%DATADIR%%-test/queries/0_stateless/01762_deltasumtimestamp.sql
-%%DATADIR%%-test/queries/0_stateless/01762_deltasumtimestamp_datetime64.reference
-%%DATADIR%%-test/queries/0_stateless/01762_deltasumtimestamp_datetime64.sh
-%%DATADIR%%-test/queries/0_stateless/01763_filter_push_down_bugs.reference
-%%DATADIR%%-test/queries/0_stateless/01763_filter_push_down_bugs.sql
-%%DATADIR%%-test/queries/0_stateless/01763_long_ttl_group_by.reference
-%%DATADIR%%-test/queries/0_stateless/01763_long_ttl_group_by.sql
-%%DATADIR%%-test/queries/0_stateless/01763_max_distributed_depth.reference
-%%DATADIR%%-test/queries/0_stateless/01763_max_distributed_depth.sql
-%%DATADIR%%-test/queries/0_stateless/01764_collapsing_merge_adaptive_granularity.reference
-%%DATADIR%%-test/queries/0_stateless/01764_collapsing_merge_adaptive_granularity.sql
-%%DATADIR%%-test/queries/0_stateless/01764_prefer_column_name_to_alias.reference
-%%DATADIR%%-test/queries/0_stateless/01764_prefer_column_name_to_alias.sql
-%%DATADIR%%-test/queries/0_stateless/01764_table_function_dictionary.reference
-%%DATADIR%%-test/queries/0_stateless/01764_table_function_dictionary.sql
-%%DATADIR%%-test/queries/0_stateless/01765_hashed_dictionary_simple_key.reference
-%%DATADIR%%-test/queries/0_stateless/01765_hashed_dictionary_simple_key.sql
-%%DATADIR%%-test/queries/0_stateless/01765_move_to_table_overlapping_block_number.reference
-%%DATADIR%%-test/queries/0_stateless/01765_move_to_table_overlapping_block_number.sql
-%%DATADIR%%-test/queries/0_stateless/01765_tehran_dst.reference
-%%DATADIR%%-test/queries/0_stateless/01765_tehran_dst.sql
-%%DATADIR%%-test/queries/0_stateless/01766_hashed_dictionary_complex_key.reference
-%%DATADIR%%-test/queries/0_stateless/01766_hashed_dictionary_complex_key.sql
-%%DATADIR%%-test/queries/0_stateless/01766_todatetime64_no_timezone_arg.reference
-%%DATADIR%%-test/queries/0_stateless/01766_todatetime64_no_timezone_arg.sql
-%%DATADIR%%-test/queries/0_stateless/01767_timezoneOf.reference
-%%DATADIR%%-test/queries/0_stateless/01767_timezoneOf.sh
-%%DATADIR%%-test/queries/0_stateless/01768_array_product.reference
-%%DATADIR%%-test/queries/0_stateless/01768_array_product.sql
-%%DATADIR%%-test/queries/0_stateless/01768_extended_range.reference
-%%DATADIR%%-test/queries/0_stateless/01768_extended_range.sql
-%%DATADIR%%-test/queries/0_stateless/01769_extended_range_2.reference
-%%DATADIR%%-test/queries/0_stateless/01769_extended_range_2.sql
-%%DATADIR%%-test/queries/0_stateless/01770_add_months_ubsan.reference
-%%DATADIR%%-test/queries/0_stateless/01770_add_months_ubsan.sql
-%%DATADIR%%-test/queries/0_stateless/01770_extended_range_3.reference
-%%DATADIR%%-test/queries/0_stateless/01770_extended_range_3.sql
-%%DATADIR%%-test/queries/0_stateless/01771_bloom_filter_not_has.reference
-%%DATADIR%%-test/queries/0_stateless/01771_bloom_filter_not_has.sql
-%%DATADIR%%-test/queries/0_stateless/01771_datetime64_no_time_part.reference
-%%DATADIR%%-test/queries/0_stateless/01771_datetime64_no_time_part.sql
-%%DATADIR%%-test/queries/0_stateless/01772_intdiv_minus_one_ubsan.reference
-%%DATADIR%%-test/queries/0_stateless/01772_intdiv_minus_one_ubsan.sql
-%%DATADIR%%-test/queries/0_stateless/01772_to_start_of_hour_align.reference
-%%DATADIR%%-test/queries/0_stateless/01772_to_start_of_hour_align.sql
-%%DATADIR%%-test/queries/0_stateless/01773_case_sensitive_version.reference
-%%DATADIR%%-test/queries/0_stateless/01773_case_sensitive_version.sql
-%%DATADIR%%-test/queries/0_stateless/01773_datetime64_add_ubsan.reference
-%%DATADIR%%-test/queries/0_stateless/01773_datetime64_add_ubsan.sql
-%%DATADIR%%-test/queries/0_stateless/01773_min_max_time_system_parts_datetime64.reference
-%%DATADIR%%-test/queries/0_stateless/01773_min_max_time_system_parts_datetime64.sql
-%%DATADIR%%-test/queries/0_stateless/01774_bar_with_illegal_value.reference
-%%DATADIR%%-test/queries/0_stateless/01774_bar_with_illegal_value.sql
-%%DATADIR%%-test/queries/0_stateless/01774_case_sensitive_connection_id.reference
-%%DATADIR%%-test/queries/0_stateless/01774_case_sensitive_connection_id.sql
+%%DATADIR%%-test/queries/0_stateless/00140_parse_unix_timestamp_as_datetime.sql
+%%DATADIR%%-test/queries/0_stateless/01472_many_rows_in_totals.sql
+%%DATADIR%%-test/queries/0_stateless/00072_in_types.reference
+%%DATADIR%%-test/queries/0_stateless/00361_shared_array_offsets_and_squash_blocks.sql
+%%DATADIR%%-test/queries/0_stateless/01266_default_prewhere_reqq.reference
+%%DATADIR%%-test/queries/0_stateless/01076_array_join_prewhere_const_folding.reference
+%%DATADIR%%-test/queries/0_stateless/00472_create_view_if_not_exists.reference
+%%DATADIR%%-test/queries/0_stateless/00919_sum_aggregate_states_constants.reference
+%%DATADIR%%-test/queries/0_stateless/00160_merge_and_index_in_in.reference
+%%DATADIR%%-test/queries/0_stateless/01922_array_join_with_index.reference
+%%DATADIR%%-test/queries/0_stateless/01633_limit_fuzz.reference
+%%DATADIR%%-test/queries/0_stateless/00121_drop_column_zookeeper.reference
+%%DATADIR%%-test/queries/0_stateless/01661_referer.reference
+%%DATADIR%%-test/queries/0_stateless/01095_tpch_like_smoke.sql
+%%DATADIR%%-test/queries/0_stateless/01190_full_attach_syntax.sql
+%%DATADIR%%-test/queries/0_stateless/02096_bad_options_in_client_and_local.reference
+%%DATADIR%%-test/queries/0_stateless/00555_hasAll_hasAny.reference
+%%DATADIR%%-test/queries/0_stateless/01664_decimal_ubsan.sql
+%%DATADIR%%-test/queries/0_stateless/00531_client_ignore_error.sh
+%%DATADIR%%-test/queries/0_stateless/00401_merge_and_stripelog.reference
+%%DATADIR%%-test/queries/0_stateless/00981_no_virtual_columns.sql
+%%DATADIR%%-test/queries/0_stateless/00462_json_true_false_literals.sql
+%%DATADIR%%-test/queries/0_stateless/00812_prewhere_alias_array.sql
+%%DATADIR%%-test/queries/0_stateless/00436_fixed_string_16_comparisons.sql
+%%DATADIR%%-test/queries/0_stateless/00900_orc_nested_arrays_load.sh
+%%DATADIR%%-test/queries/0_stateless/01312_case_insensitive_regexp.sql
+%%DATADIR%%-test/queries/0_stateless/00040_array_enumerate_uniq.reference
+%%DATADIR%%-test/queries/0_stateless/00574_empty_strings_deserialization.reference
+%%DATADIR%%-test/queries/0_stateless/01504_rocksdb.reference
+%%DATADIR%%-test/queries/0_stateless/01644_distributed_async_insert_fsync_smoke.reference
+%%DATADIR%%-test/queries/0_stateless/01707_join_use_nulls.reference
+%%DATADIR%%-test/queries/0_stateless/00362_great_circle_distance.sql
+%%DATADIR%%-test/queries/0_stateless/01419_materialize_null.reference
+%%DATADIR%%-test/queries/0_stateless/01053_ssd_dictionary.reference
 %%DATADIR%%-test/queries/0_stateless/01774_ip_address_in_range.reference
-%%DATADIR%%-test/queries/0_stateless/01774_ip_address_in_range.sql
-%%DATADIR%%-test/queries/0_stateless/01774_tuple_null_in.reference
-%%DATADIR%%-test/queries/0_stateless/01774_tuple_null_in.sql
-%%DATADIR%%-test/queries/0_stateless/01776_decrypt_aead_size_check.reference
-%%DATADIR%%-test/queries/0_stateless/01776_decrypt_aead_size_check.sql
-%%DATADIR%%-test/queries/0_stateless/01777_map_populate_series_ubsan.reference
-%%DATADIR%%-test/queries/0_stateless/01777_map_populate_series_ubsan.sql
-%%DATADIR%%-test/queries/0_stateless/01778_hierarchical_dictionaries.reference
-%%DATADIR%%-test/queries/0_stateless/01778_hierarchical_dictionaries.sql
-%%DATADIR%%-test/queries/0_stateless/01778_mmap_cache_infra.reference
-%%DATADIR%%-test/queries/0_stateless/01778_mmap_cache_infra.sql
-%%DATADIR%%-test/queries/0_stateless/01778_test_LowCardinality_FixedString_pk.reference
-%%DATADIR%%-test/queries/0_stateless/01778_test_LowCardinality_FixedString_pk.sql
-%%DATADIR%%-test/queries/0_stateless/01778_where_with_column_name.reference
-%%DATADIR%%-test/queries/0_stateless/01778_where_with_column_name.sql
-%%DATADIR%%-test/queries/0_stateless/01779_quantile_deterministic_msan.reference
-%%DATADIR%%-test/queries/0_stateless/01779_quantile_deterministic_msan.sql
-%%DATADIR%%-test/queries/0_stateless/01780_clickhouse_dictionary_source_loop.reference
-%%DATADIR%%-test/queries/0_stateless/01780_clickhouse_dictionary_source_loop.sql
-%%DATADIR%%-test/queries/0_stateless/01780_dict_get_or_null.reference
-%%DATADIR%%-test/queries/0_stateless/01780_dict_get_or_null.sql
-%%DATADIR%%-test/queries/0_stateless/01780_range_msan.reference
-%%DATADIR%%-test/queries/0_stateless/01780_range_msan.sql
-%%DATADIR%%-test/queries/0_stateless/01781_map_op_ubsan.reference
-%%DATADIR%%-test/queries/0_stateless/01781_map_op_ubsan.sql
-%%DATADIR%%-test/queries/0_stateless/01781_merge_tree_deduplication.reference
-%%DATADIR%%-test/queries/0_stateless/01781_merge_tree_deduplication.sql
-%%DATADIR%%-test/queries/0_stateless/01781_token_extractor_buffer_overflow.reference
+%%DATADIR%%-test/queries/0_stateless/02050_clickhouse_client_local_exception.reference
+%%DATADIR%%-test/queries/0_stateless/01630_simple_aggregate_function_in_summing_merge_tree.sql
+%%DATADIR%%-test/queries/0_stateless/00841_temporary_table_database.reference
+%%DATADIR%%-test/queries/0_stateless/00383_utf8_validation.sql
 %%DATADIR%%-test/queries/0_stateless/01781_token_extractor_buffer_overflow.sql
-%%DATADIR%%-test/queries/0_stateless/01782_field_oom.reference
-%%DATADIR%%-test/queries/0_stateless/01782_field_oom.sql
-%%DATADIR%%-test/queries/0_stateless/01783_http_chunk_size.reference
-%%DATADIR%%-test/queries/0_stateless/01783_http_chunk_size.sh
-%%DATADIR%%-test/queries/0_stateless/01783_merge_engine_join_key_condition.reference
-%%DATADIR%%-test/queries/0_stateless/01783_merge_engine_join_key_condition.sql
-%%DATADIR%%-test/queries/0_stateless/01783_parallel_formatting_memory.reference
-%%DATADIR%%-test/queries/0_stateless/01783_parallel_formatting_memory.sh
-%%DATADIR%%-test/queries/0_stateless/01784_parallel_formatting_memory.reference
-%%DATADIR%%-test/queries/0_stateless/01784_parallel_formatting_memory.sql
-%%DATADIR%%-test/queries/0_stateless/01785_dictionary_element_count.reference
-%%DATADIR%%-test/queries/0_stateless/01785_dictionary_element_count.sql
-%%DATADIR%%-test/queries/0_stateless/01785_parallel_formatting_memory.reference
-%%DATADIR%%-test/queries/0_stateless/01785_parallel_formatting_memory.sh
-%%DATADIR%%-test/queries/0_stateless/01785_pmj_lc_bug.reference
-%%DATADIR%%-test/queries/0_stateless/01785_pmj_lc_bug.sql
-%%DATADIR%%-test/queries/0_stateless/01786_explain_merge_tree.reference
-%%DATADIR%%-test/queries/0_stateless/01786_explain_merge_tree.sh
-%%DATADIR%%-test/queries/0_stateless/01786_group_by_pk_many_streams.reference
-%%DATADIR%%-test/queries/0_stateless/01786_group_by_pk_many_streams.sql
-%%DATADIR%%-test/queries/0_stateless/01786_nullable_string_tsv_at_eof.reference
-%%DATADIR%%-test/queries/0_stateless/01786_nullable_string_tsv_at_eof.sh
+%%DATADIR%%-test/queries/0_stateless/01755_shard_pruning_with_literal.sql
+%%DATADIR%%-test/queries/0_stateless/02008_complex_key_range_hashed_dictionary.reference
+%%DATADIR%%-test/queries/0_stateless/01660_sum_ubsan.sql
+%%DATADIR%%-test/queries/0_stateless/01591_window_functions.reference
+%%DATADIR%%-test/queries/0_stateless/01901_in_literal_shard_prune.sql
+%%DATADIR%%-test/queries/0_stateless/00971_live_view_watch_http_heartbeat.reference
+%%DATADIR%%-test/queries/0_stateless/01070_materialize_ttl.reference
+%%DATADIR%%-test/queries/0_stateless/01509_check_many_parallel_quorum_inserts_long.sh
+%%DATADIR%%-test/queries/0_stateless/00754_alter_modify_order_by.reference
+%%DATADIR%%-test/queries/0_stateless/00600_replace_running_query.sh
+%%DATADIR%%-test/queries/0_stateless/01035_avg_weighted_long.reference
+%%DATADIR%%-test/queries/0_stateless/00520_tuple_values_interpreter.sql
+%%DATADIR%%-test/queries/0_stateless/01016_index_tuple_field_type.reference
+%%DATADIR%%-test/queries/0_stateless/01079_new_range_reader_segfault.reference
+%%DATADIR%%-test/queries/0_stateless/01269_create_with_null.reference
+%%DATADIR%%-test/queries/0_stateless/01516_create_table_primary_key.reference
+%%DATADIR%%-test/queries/0_stateless/00900_orc_arrow_parquet_tuples.sh
+%%DATADIR%%-test/queries/0_stateless/01198_client_quota_key.reference
+%%DATADIR%%-test/queries/0_stateless/00316_rounding_functions_and_empty_block.reference
+%%DATADIR%%-test/queries/0_stateless/02031_format_query_option.sh
+%%DATADIR%%-test/queries/0_stateless/00571_non_exist_database_when_create_materializ_view.sql
+%%DATADIR%%-test/queries/0_stateless/00727_concat.reference
+%%DATADIR%%-test/queries/0_stateless/01548_with_totals_having.sql
+%%DATADIR%%-test/queries/0_stateless/00509_extended_storage_definition_syntax_zookeeper.reference
+%%DATADIR%%-test/queries/0_stateless/01436_storage_merge_with_join_push_down.reference
+%%DATADIR%%-test/queries/0_stateless/02026_arrayDifference_const.sql
+%%DATADIR%%-test/queries/0_stateless/00493_substring_of_fixedstring.sql
+%%DATADIR%%-test/queries/0_stateless/00049_any_left_join.reference
+%%DATADIR%%-test/queries/0_stateless/00853_join_with_nulls_crash.reference
+%%DATADIR%%-test/queries/0_stateless/02124_clickhouse_dictionary_with_predefined_configuration.sql
+%%DATADIR%%-test/queries/0_stateless/01519_topK_distributed_parametrized.sql
+%%DATADIR%%-test/queries/0_stateless/01120_join_constants.sql
+%%DATADIR%%-test/queries/0_stateless/00498_array_functions_concat_slice_push_pop.reference
+%%DATADIR%%-test/queries/0_stateless/00602_throw_if.sh
+%%DATADIR%%-test/queries/0_stateless/01656_sequence_next_node_long.sql
+%%DATADIR%%-test/queries/0_stateless/00929_multi_match_edit_distance.sql
+%%DATADIR%%-test/queries/0_stateless/01777_map_populate_series_ubsan.sql
+%%DATADIR%%-test/queries/0_stateless/01074_partial_revokes.sql
+%%DATADIR%%-test/queries/0_stateless/00579_virtual_column_and_lazy.reference
+%%DATADIR%%-test/queries/0_stateless/01526_max_untracked_memory.reference
+%%DATADIR%%-test/queries/0_stateless/01324_insert_tsv_raw.sql
+%%DATADIR%%-test/queries/0_stateless/01271_optimize_arithmetic_operations_in_aggr_func_long.reference
+%%DATADIR%%-test/queries/0_stateless/00526_array_join_with_arrays_of_nullable.sql
+%%DATADIR%%-test/queries/0_stateless/00164_not_chain.reference
+%%DATADIR%%-test/queries/0_stateless/01630_simple_aggregate_function_in_summing_merge_tree.reference
+%%DATADIR%%-test/queries/0_stateless/00800_versatile_storage_join.reference
+%%DATADIR%%-test/queries/0_stateless/00363_defaults.sql
+%%DATADIR%%-test/queries/0_stateless/01071_prohibition_secondary_index_with_old_format_merge_tree.sql
+%%DATADIR%%-test/queries/0_stateless/00418_input_format_allow_errors.reference
+%%DATADIR%%-test/queries/0_stateless/00652_replicated_mutations_default_database_zookeeper.reference
+%%DATADIR%%-test/queries/0_stateless/00763_create_query_as_table_engine_bug.reference
+%%DATADIR%%-test/queries/0_stateless/00434_tonullable.reference
+%%DATADIR%%-test/queries/0_stateless/01164_alter_memory_database.reference
+%%DATADIR%%-test/queries/0_stateless/00579_merge_tree_partition_and_primary_keys_using_same_expression.sql
+%%DATADIR%%-test/queries/0_stateless/01920_not_chain_format.reference
+%%DATADIR%%-test/queries/0_stateless/01461_alter_table_function.reference
+%%DATADIR%%-test/queries/0_stateless/01065_array_zip_mixed_const.reference
+%%DATADIR%%-test/queries/0_stateless/01300_read_wkt.reference
+%%DATADIR%%-test/queries/0_stateless/00096_aggregation_min_if.reference
+%%DATADIR%%-test/queries/0_stateless/01943_non_deterministic_order_key.sql
+%%DATADIR%%-test/queries/0_stateless/01906_bigint_accurate_cast_ubsan.reference
+%%DATADIR%%-test/queries/0_stateless/00534_functions_bad_arguments11.sh
+%%DATADIR%%-test/queries/0_stateless/01138_join_on_distributed_and_tmp.reference
+%%DATADIR%%-test/queries/0_stateless/01322_monotonous_order_by_with_different_variables.sql
+%%DATADIR%%-test/queries/0_stateless/01630_disallow_floating_point_as_partition_key.sql
+%%DATADIR%%-test/queries/0_stateless/01680_predicate_pushdown_union_distinct_subquery.reference
+%%DATADIR%%-test/queries/0_stateless/01412_mod_float.reference
+%%DATADIR%%-test/queries/0_stateless/00927_asof_join_noninclusive.reference
+%%DATADIR%%-test/queries/0_stateless/01072_select_constant_limit.sql
+%%DATADIR%%-test/queries/0_stateless/01673_test_toMinute_mysql_dialect.reference
+%%DATADIR%%-test/queries/0_stateless/00755_avg_value_size_hint_passing.reference
+%%DATADIR%%-test/queries/0_stateless/00265_http_content_type_format_timezone.sh
+%%DATADIR%%-test/queries/0_stateless/01600_remerge_sort_lowered_memory_bytes_ratio.reference
+%%DATADIR%%-test/queries/0_stateless/02134_async_inserts_formats.sh
+%%DATADIR%%-test/queries/0_stateless/02124_json_each_row_with_progress.reference
+%%DATADIR%%-test/queries/0_stateless/00971_query_id_in_logs.sh
+%%DATADIR%%-test/queries/0_stateless/00974_live_view_select_with_aggregation.sql
+%%DATADIR%%-test/queries/0_stateless/02097_json_strings_deserialization.reference
+%%DATADIR%%-test/queries/0_stateless/01622_multiple_ttls.reference
+%%DATADIR%%-test/queries/0_stateless/01070_h3_to_parent.sql
+%%DATADIR%%-test/queries/0_stateless/00119_storage_join.sql
+%%DATADIR%%-test/queries/0_stateless/00588_shard_distributed_prewhere.sql
 %%DATADIR%%-test/queries/0_stateless/01787_arena_assert_column_nothing.reference
-%%DATADIR%%-test/queries/0_stateless/01787_arena_assert_column_nothing.sql
-%%DATADIR%%-test/queries/0_stateless/01787_map_remote.reference
-%%DATADIR%%-test/queries/0_stateless/01787_map_remote.sql
-%%DATADIR%%-test/queries/0_stateless/01788_update_nested_type_subcolumn_check.reference
-%%DATADIR%%-test/queries/0_stateless/01788_update_nested_type_subcolumn_check.sql
-%%DATADIR%%-test/queries/0_stateless/01790_dist_INSERT_block_structure_mismatch_types_and_names.reference
-%%DATADIR%%-test/queries/0_stateless/01790_dist_INSERT_block_structure_mismatch_types_and_names.sql
+%%DATADIR%%-test/queries/0_stateless/02125_dict_get_type_nullable_fix.sql
+%%DATADIR%%-test/queries/0_stateless/01710_force_use_projection.reference
+%%DATADIR%%-test/queries/0_stateless/00500_point_in_polygon_2d_const.reference
+%%DATADIR%%-test/queries/0_stateless/00915_tuple_orantius.reference
+%%DATADIR%%-test/queries/0_stateless/01663_quantile_weighted_overflow.reference
+%%DATADIR%%-test/queries/0_stateless/01637_nullable_fuzz3.reference
+%%DATADIR%%-test/queries/0_stateless/00718_format_datetime.sql
+%%DATADIR%%-test/queries/0_stateless/01142_join_lc_and_nullable_in_key.sql
+%%DATADIR%%-test/queries/0_stateless/01182_materialized_view_different_structure.sql
+%%DATADIR%%-test/queries/0_stateless/02133_final_prewhere_where_lowcardinality_replacing.reference
+%%DATADIR%%-test/queries/0_stateless/01013_totals_without_aggregation.reference
+%%DATADIR%%-test/queries/0_stateless/01701_if_tuple_segfault.reference
+%%DATADIR%%-test/queries/0_stateless/01493_alter_remove_no_property_zookeeper_long.sql
+%%DATADIR%%-test/queries/0_stateless/01282_system_parts_ttl_info.reference
+%%DATADIR%%-test/queries/0_stateless/01721_constraints_constant_expressions.reference
+%%DATADIR%%-test/queries/0_stateless/00915_simple_aggregate_function.sql
+%%DATADIR%%-test/queries/0_stateless/01305_buffer_final_bug.reference
+%%DATADIR%%-test/queries/0_stateless/01632_group_array_msan.reference
+%%DATADIR%%-test/queries/0_stateless/01579_date_datetime_index_comparison.reference
+%%DATADIR%%-test/queries/0_stateless/00315_quantile_off_by_one.reference
+%%DATADIR%%-test/queries/0_stateless/00752_low_cardinality_mv_2.reference
+%%DATADIR%%-test/queries/0_stateless/01593_concurrent_alter_mutations_kill.reference
+%%DATADIR%%-test/queries/0_stateless/01053_window_view_proc_hop_to_now.sh
+%%DATADIR%%-test/queries/0_stateless/01926_union_all_schmak.sql
+%%DATADIR%%-test/queries/0_stateless/01710_projection_fetch_long.sql
+%%DATADIR%%-test/queries/0_stateless/02015_executable_user_defined_functions.reference
+%%DATADIR%%-test/queries/0_stateless/01508_race_condition_rename_clear_zookeeper_long.reference
+%%DATADIR%%-test/queries/0_stateless/01035_avg.sql
+%%DATADIR%%-test/queries/0_stateless/00035_function_array_return_type.sql
+%%DATADIR%%-test/queries/0_stateless/00967_ubsan_bit_test.reference
+%%DATADIR%%-test/queries/0_stateless/01033_quota_dcl.sql
+%%DATADIR%%-test/queries/0_stateless/00534_functions_bad_arguments4_long.reference
+%%DATADIR%%-test/queries/0_stateless/01939_user_with_default_database.sh
+%%DATADIR%%-test/queries/0_stateless/00563_complex_in_expression.reference
+%%DATADIR%%-test/queries/0_stateless/01008_materialized_view_henyihanwobushi.sql
+%%DATADIR%%-test/queries/0_stateless/02131_remove_columns_in_subquery.reference
+%%DATADIR%%-test/queries/0_stateless/00460_vertical_and_totals_extremes.reference
+%%DATADIR%%-test/queries/0_stateless/01041_h3_is_valid.sql
+%%DATADIR%%-test/queries/0_stateless/01525_select_with_offset_fetch_clause.sql
+%%DATADIR%%-test/queries/0_stateless/01648_mutations_and_escaping.sql
+%%DATADIR%%-test/queries/0_stateless/00534_functions_bad_arguments1.sh
+%%DATADIR%%-test/queries/0_stateless/01153_attach_mv_uuid.sql
+%%DATADIR%%-test/queries/0_stateless/01036_no_superfluous_dict_reload_on_create_database_2.sql
+%%DATADIR%%-test/queries/0_stateless/01071_prohibition_secondary_index_with_old_format_merge_tree.reference
+%%DATADIR%%-test/queries/0_stateless/01710_projection_detach_part.sql
+%%DATADIR%%-test/queries/0_stateless/01053_drop_database_mat_view.reference
+%%DATADIR%%-test/queries/0_stateless/01913_fix_column_transformer_replace_format.reference
+%%DATADIR%%-test/queries/0_stateless/00488_non_ascii_column_names.sql
+%%DATADIR%%-test/queries/0_stateless/01087_index_set_ubsan.sql
+%%DATADIR%%-test/queries/0_stateless/01866_aggregate_function_interval_length_sum.reference
+%%DATADIR%%-test/queries/0_stateless/00026_shard_something_distributed.reference
+%%DATADIR%%-test/queries/0_stateless/00563_insert_into_remote_and_zookeeper_long.reference
+%%DATADIR%%-test/queries/0_stateless/00512_fractional_time_zones.reference
+%%DATADIR%%-test/queries/0_stateless/00494_shard_alias_substitution_bug.reference
+%%DATADIR%%-test/queries/0_stateless/02015_async_inserts_5.reference
+%%DATADIR%%-test/queries/0_stateless/01690_quantilesTiming_ubsan.sql
+%%DATADIR%%-test/queries/0_stateless/00802_daylight_saving_time_shift_backwards_at_midnight.sql
+%%DATADIR%%-test/queries/0_stateless/01107_atomic_db_detach_attach.reference
+%%DATADIR%%-test/queries/0_stateless/01048_window_view_parser.reference
+%%DATADIR%%-test/queries/0_stateless/01561_aggregate_functions_of_key_with_join.sql
+%%DATADIR%%-test/queries/0_stateless/01415_sticking_mutations.sh
+%%DATADIR%%-test/queries/0_stateless/00500_point_in_polygon_bug_2.sql
+%%DATADIR%%-test/queries/0_stateless/01556_explain_select_with_union_query.sql
+%%DATADIR%%-test/queries/0_stateless/01320_create_sync_race_condition_zookeeper.sh
+%%DATADIR%%-test/queries/0_stateless/01051_scalar_optimization.reference
+%%DATADIR%%-test/queries/0_stateless/00974_primary_key_for_lowCardinality.sh
+%%DATADIR%%-test/queries/0_stateless/02047_log_family_data_file_sizes.reference
+%%DATADIR%%-test/queries/0_stateless/01674_filter_by_uint8.sql
+%%DATADIR%%-test/queries/0_stateless/00990_function_current_user.reference
+%%DATADIR%%-test/queries/0_stateless/00637_sessions_in_http_interface_and_settings.sh
+%%DATADIR%%-test/queries/0_stateless/01200_mutations_memory_consumption.reference
+%%DATADIR%%-test/queries/0_stateless/01662_date_ubsan.reference
+%%DATADIR%%-test/queries/0_stateless/02152_invalid_setting_with_hints_in_http_request.reference
+%%DATADIR%%-test/queries/0_stateless/00753_comment_columns_zookeeper.reference
 %%DATADIR%%-test/queries/0_stateless/01791_dist_INSERT_block_structure_mismatch.reference
-%%DATADIR%%-test/queries/0_stateless/01791_dist_INSERT_block_structure_mismatch.sh
-%%DATADIR%%-test/queries/0_stateless/01795_TinyLog_rwlock_ub.reference
-%%DATADIR%%-test/queries/0_stateless/01795_TinyLog_rwlock_ub.sql
-%%DATADIR%%-test/queries/0_stateless/01796_Log_rwlock_ub.reference
-%%DATADIR%%-test/queries/0_stateless/01796_Log_rwlock_ub.sql
-%%DATADIR%%-test/queries/0_stateless/01797_StripeLog_rwlock_ub.reference
-%%DATADIR%%-test/queries/0_stateless/01797_StripeLog_rwlock_ub.sql
-%%DATADIR%%-test/queries/0_stateless/01798_having_push_down.reference
-%%DATADIR%%-test/queries/0_stateless/01798_having_push_down.sql
-%%DATADIR%%-test/queries/0_stateless/01798_uniq_theta_sketch.reference
-%%DATADIR%%-test/queries/0_stateless/01798_uniq_theta_sketch.sql
-%%DATADIR%%-test/queries/0_stateless/01799_long_uniq_theta_sketch.reference
-%%DATADIR%%-test/queries/0_stateless/01799_long_uniq_theta_sketch.sql
-%%DATADIR%%-test/queries/0_stateless/01800_log_nested.reference
-%%DATADIR%%-test/queries/0_stateless/01800_log_nested.sql
-%%DATADIR%%-test/queries/0_stateless/01801_approx_total_rows_mergetree_reverse.reference
-%%DATADIR%%-test/queries/0_stateless/01801_approx_total_rows_mergetree_reverse.sql
-%%DATADIR%%-test/queries/0_stateless/01801_dateDiff_DateTime64.reference
-%%DATADIR%%-test/queries/0_stateless/01801_dateDiff_DateTime64.sql
-%%DATADIR%%-test/queries/0_stateless/01801_distinct_group_by_shard.reference
-%%DATADIR%%-test/queries/0_stateless/01801_distinct_group_by_shard.sql
-%%DATADIR%%-test/queries/0_stateless/01801_nullable_low_cardinality_tsv.reference
-%%DATADIR%%-test/queries/0_stateless/01801_nullable_low_cardinality_tsv.sh
-%%DATADIR%%-test/queries/0_stateless/01801_s3_cluster.reference
-%%DATADIR%%-test/queries/0_stateless/01801_s3_cluster.sh
-%%DATADIR%%-test/queries/0_stateless/01802_formatDateTime_DateTime64_century.reference
-%%DATADIR%%-test/queries/0_stateless/01802_formatDateTime_DateTime64_century.sql
-%%DATADIR%%-test/queries/0_stateless/01802_rank_corr_mann_whitney_over_window.reference
-%%DATADIR%%-test/queries/0_stateless/01802_rank_corr_mann_whitney_over_window.sql
-%%DATADIR%%-test/queries/0_stateless/01802_test_postgresql_protocol_with_row_policy.reference
-%%DATADIR%%-test/queries/0_stateless/01802_test_postgresql_protocol_with_row_policy.sh
-%%DATADIR%%-test/queries/0_stateless/01802_toDateTime64_large_values.reference
-%%DATADIR%%-test/queries/0_stateless/01802_toDateTime64_large_values.sql
-%%DATADIR%%-test/queries/0_stateless/01803_const_nullable_map.reference
-%%DATADIR%%-test/queries/0_stateless/01803_const_nullable_map.sql
-%%DATADIR%%-test/queries/0_stateless/01803_untuple_subquery.reference
-%%DATADIR%%-test/queries/0_stateless/01803_untuple_subquery.sql
-%%DATADIR%%-test/queries/0_stateless/01804_dictionary_decimal256_type.reference
-%%DATADIR%%-test/queries/0_stateless/01804_dictionary_decimal256_type.sql
+%%DATADIR%%-test/queries/0_stateless/00678_shard_funnel_window.sql
+%%DATADIR%%-test/queries/0_stateless/01039_row_policy_dcl.sh
+%%DATADIR%%-test/queries/0_stateless/00870_t64_codec.reference
+%%DATADIR%%-test/queries/0_stateless/00696_system_columns_limit.reference
+%%DATADIR%%-test/queries/0_stateless/01852_jit_if.reference
+%%DATADIR%%-test/queries/0_stateless/00215_primary_key_order_zookeeper_long.reference
+%%DATADIR%%-test/queries/0_stateless/01300_polygon_convex_hull.reference
+%%DATADIR%%-test/queries/0_stateless/01921_with_fill_with_totals.sql
+%%DATADIR%%-test/queries/0_stateless/01318_map_add_map_subtract.sql
+%%DATADIR%%-test/queries/0_stateless/02096_date_time_1970_saturation.reference
+%%DATADIR%%-test/queries/0_stateless/01788_update_nested_type_subcolumn_check.reference
+%%DATADIR%%-test/queries/0_stateless/01298_alter_merge.sql
+%%DATADIR%%-test/queries/0_stateless/02111_json_column_name_encoding.sql
+%%DATADIR%%-test/queries/0_stateless/02015_order_by_with_fill_misoptimization.sql
+%%DATADIR%%-test/queries/0_stateless/01582_move_to_prewhere_compact_parts.reference
+%%DATADIR%%-test/queries/0_stateless/01518_filtering_aliased_materialized_column.sql
+%%DATADIR%%-test/queries/0_stateless/01471_top_k_range_check.sql
+%%DATADIR%%-test/queries/0_stateless/01846_null_as_default_for_insert_select.reference
+%%DATADIR%%-test/queries/0_stateless/01759_optimize_skip_unused_shards_zero_shards.sql
+%%DATADIR%%-test/queries/0_stateless/01136_multiple_sets.sql
+%%DATADIR%%-test/queries/0_stateless/02127_storage_join_settings_with_persistency.reference
+%%DATADIR%%-test/queries/0_stateless/00027_argMinMax.sql
+%%DATADIR%%-test/queries/0_stateless/01005_rwr_shard_deadlock.sh
+%%DATADIR%%-test/queries/0_stateless/01538_fuzz_aggregate.reference
+%%DATADIR%%-test/queries/0_stateless/00720_with_cube.reference
+%%DATADIR%%-test/queries/0_stateless/01732_more_consistent_datetime64_parsing.sql
+%%DATADIR%%-test/queries/0_stateless/00878_join_unexpected_results.sql
+%%DATADIR%%-test/queries/0_stateless/00977_int_div.sql
+%%DATADIR%%-test/queries/0_stateless/02126_alter_table_alter_column.reference
+%%DATADIR%%-test/queries/0_stateless/01643_merge_tree_fsync_smoke.reference
+%%DATADIR%%-test/queries/0_stateless/01442_h3kring_range_check.reference
+%%DATADIR%%-test/queries/0_stateless/00862_decimal_in.sql
+%%DATADIR%%-test/queries/0_stateless/00090_union_race_conditions_1.sh
+%%DATADIR%%-test/queries/0_stateless/01541_max_memory_usage_for_user_long.reference
+%%DATADIR%%-test/queries/0_stateless/00938_test_retention_function.reference
+%%DATADIR%%-test/queries/0_stateless/01326_hostname_alias.reference
+%%DATADIR%%-test/queries/0_stateless/00042_set.sql
+%%DATADIR%%-test/queries/0_stateless/00751_hashing_ints.reference
+%%DATADIR%%-test/queries/0_stateless/02045_like_function.reference
+%%DATADIR%%-test/queries/0_stateless/02048_clickhouse_local_stage.reference
+%%DATADIR%%-test/queries/0_stateless/01296_create_row_policy_in_current_database.sql
+%%DATADIR%%-test/queries/0_stateless/01399_http_request_headers.sh
+%%DATADIR%%-test/queries/0_stateless/02133_distributed_queries_formatting.sql
+%%DATADIR%%-test/queries/0_stateless/00818_join_bug_4271.reference
+%%DATADIR%%-test/queries/0_stateless/00850_global_join_dups.sql
+%%DATADIR%%-test/queries/0_stateless/01474_decimal_scale_bug.reference
+%%DATADIR%%-test/queries/0_stateless/01032_duplicate_column_insert_query.sql
+%%DATADIR%%-test/queries/0_stateless/01545_system_errors.sh
+%%DATADIR%%-test/queries/0_stateless/01259_datetime64_ubsan.sql
+%%DATADIR%%-test/queries/0_stateless/01025_array_compact_generic.sql
+%%DATADIR%%-test/queries/0_stateless/01936_empty_function_support_uuid.reference
+%%DATADIR%%-test/queries/0_stateless/01277_toUnixTimestamp64.reference
+%%DATADIR%%-test/queries/0_stateless/01721_constraints_constant_expressions.sql
+%%DATADIR%%-test/queries/0_stateless/01949_clickhouse_local_with_remote_localhost.sh
+%%DATADIR%%-test/queries/0_stateless/01395_limit_more_cases.sh
+%%DATADIR%%-test/queries/0_stateless/00251_has_types.reference
+%%DATADIR%%-test/queries/0_stateless/01595_countMatches.sql
+%%DATADIR%%-test/queries/0_stateless/01650_fetch_patition_with_macro_in_zk_path_long.sql
+%%DATADIR%%-test/queries/0_stateless/00098_f_union_all.sql
+%%DATADIR%%-test/queries/0_stateless/01322_cast_keep_nullable.reference
+%%DATADIR%%-test/queries/0_stateless/01946_test_zstd_decompression_with_escape_sequence_at_the_end_of_buffer.reference
+%%DATADIR%%-test/queries/0_stateless/01281_unsucceeded_insert_select_queries_counter.sql
+%%DATADIR%%-test/queries/0_stateless/00825_protobuf_format_squares.reference
+%%DATADIR%%-test/queries/0_stateless/00083_create_merge_tree_zookeeper_long.reference
+%%DATADIR%%-test/queries/0_stateless/01414_low_cardinality_nullable.reference
+%%DATADIR%%-test/queries/0_stateless/01396_negative_datetime_saturate_to_zero.sql
+%%DATADIR%%-test/queries/0_stateless/01413_if_array_uuid.reference
+%%DATADIR%%-test/queries/0_stateless/01353_low_cardinality_join_types.sql
+%%DATADIR%%-test/queries/0_stateless/01375_null_issue_3767.sql
+%%DATADIR%%-test/queries/0_stateless/00474_readonly_settings.sh
+%%DATADIR%%-test/queries/0_stateless/01264_nested_baloo_bear.reference
+%%DATADIR%%-test/queries/0_stateless/01076_predicate_optimizer_with_view.reference
+%%DATADIR%%-test/queries/0_stateless/00373_group_by_tuple.sql
+%%DATADIR%%-test/queries/0_stateless/01852_multiple_joins_with_union_join.sql
+%%DATADIR%%-test/queries/0_stateless/01099_parallel_distributed_insert_select.reference
+%%DATADIR%%-test/queries/0_stateless/01401_FORMAT_SETTINGS.sh
+%%DATADIR%%-test/queries/0_stateless/00965_live_view_watch_heartbeat.reference
+%%DATADIR%%-test/queries/0_stateless/00442_filter_by_nullable.reference
+%%DATADIR%%-test/queries/0_stateless/01414_mutations_and_errors_zookeeper.reference
+%%DATADIR%%-test/queries/0_stateless/01665_substring_ubsan.sql
+%%DATADIR%%-test/queries/0_stateless/01411_xor_itai_shirav.sql
+%%DATADIR%%-test/queries/0_stateless/01582_distinct_optimization.sh
+%%DATADIR%%-test/queries/0_stateless/00105_shard_collations.sql
+%%DATADIR%%-test/queries/0_stateless/02006_todatetime64_from_string.sql
+%%DATADIR%%-test/queries/0_stateless/01766_hashed_dictionary_complex_key.reference
+%%DATADIR%%-test/queries/0_stateless/01770_extended_range_3.sql
+%%DATADIR%%-test/queries/0_stateless/01040_h3_get_resolution.sql
+%%DATADIR%%-test/queries/0_stateless/01183_custom_separated_format_http.reference
+%%DATADIR%%-test/queries/0_stateless/00688_aggregation_retention.sql
+%%DATADIR%%-test/queries/0_stateless/00799_function_dry_run.reference
+%%DATADIR%%-test/queries/0_stateless/01021_only_tuple_columns.sql
+%%DATADIR%%-test/queries/0_stateless/01746_long_zstd_http_compression_json_format.sh
+%%DATADIR%%-test/queries/0_stateless/01509_dictionary_preallocate.sh
+%%DATADIR%%-test/queries/0_stateless/01560_crash_in_agg_empty_arglist.reference
+%%DATADIR%%-test/queries/0_stateless/00240_replace_substring_loop.reference
+%%DATADIR%%-test/queries/0_stateless/01035_lc_empty_part_bug.sh
+%%DATADIR%%-test/queries/0_stateless/02017_order_by_with_fill_redundant_functions.sql
+%%DATADIR%%-test/queries/0_stateless/01297_create_quota.sql
+%%DATADIR%%-test/queries/0_stateless/00909_ngram_distance.sql
+%%DATADIR%%-test/queries/0_stateless/02101_sql_user_defined_functions_create_or_replace.sql
+%%DATADIR%%-test/queries/0_stateless/01621_sort_after_join_pipeline_stuck.sql
+%%DATADIR%%-test/queries/0_stateless/01660_join_or_inner.sql
+%%DATADIR%%-test/queries/0_stateless/00863_comma_join_in.reference
+%%DATADIR%%-test/queries/0_stateless/02042_map_get_non_const_key.reference
 %%DATADIR%%-test/queries/0_stateless/01804_uniq_up_to_ubsan.reference
-%%DATADIR%%-test/queries/0_stateless/01804_uniq_up_to_ubsan.sql
-%%DATADIR%%-test/queries/0_stateless/01809_inactive_parts_to_delay_throw_insert.reference
-%%DATADIR%%-test/queries/0_stateless/01809_inactive_parts_to_delay_throw_insert.sql
-%%DATADIR%%-test/queries/0_stateless/01810_max_part_removal_threads_long.reference
-%%DATADIR%%-test/queries/0_stateless/01810_max_part_removal_threads_long.sh
-%%DATADIR%%-test/queries/0_stateless/01811_datename.reference
-%%DATADIR%%-test/queries/0_stateless/01811_datename.sql
-%%DATADIR%%-test/queries/0_stateless/01811_filter_by_null.reference
-%%DATADIR%%-test/queries/0_stateless/01811_filter_by_null.sql
-%%DATADIR%%-test/queries/0_stateless/01811_storage_buffer_flush_parameters.reference
-%%DATADIR%%-test/queries/0_stateless/01811_storage_buffer_flush_parameters.sql
-%%DATADIR%%-test/queries/0_stateless/01812_basic_auth_http_server.reference
-%%DATADIR%%-test/queries/0_stateless/01812_basic_auth_http_server.sh
-%%DATADIR%%-test/queries/0_stateless/01812_has_generic.reference
-%%DATADIR%%-test/queries/0_stateless/01812_has_generic.sql
-%%DATADIR%%-test/queries/0_stateless/01812_optimize_skip_unused_shards_single_node.reference
-%%DATADIR%%-test/queries/0_stateless/01812_optimize_skip_unused_shards_single_node.sql
-%%DATADIR%%-test/queries/0_stateless/01813_distributed_scalar_subqueries_alias.reference
-%%DATADIR%%-test/queries/0_stateless/01813_distributed_scalar_subqueries_alias.sql
-%%DATADIR%%-test/queries/0_stateless/01813_quantileBfloat16_nans.reference
-%%DATADIR%%-test/queries/0_stateless/01813_quantileBfloat16_nans.sql
-%%DATADIR%%-test/queries/0_stateless/01814_distributed_push_down_limit.reference
-%%DATADIR%%-test/queries/0_stateless/01814_distributed_push_down_limit.sh
-%%DATADIR%%-test/queries/0_stateless/01815_with_mergeable_state_after_aggregation_and_limit.reference
-%%DATADIR%%-test/queries/0_stateless/01815_with_mergeable_state_after_aggregation_and_limit.sh
-%%DATADIR%%-test/queries/0_stateless/01817_storage_buffer_parameters.reference
-%%DATADIR%%-test/queries/0_stateless/01817_storage_buffer_parameters.sql
-%%DATADIR%%-test/queries/0_stateless/01818_case_float_value_fangyc.reference
-%%DATADIR%%-test/queries/0_stateless/01818_case_float_value_fangyc.sql
-%%DATADIR%%-test/queries/0_stateless/01818_input_format_with_names_use_header.reference
-%%DATADIR%%-test/queries/0_stateless/01818_input_format_with_names_use_header.sh
-%%DATADIR%%-test/queries/0_stateless/01818_move_partition_simple.reference
-%%DATADIR%%-test/queries/0_stateless/01818_move_partition_simple.sql
-%%DATADIR%%-test/queries/0_stateless/01820_unhex_case_insensitive.reference
-%%DATADIR%%-test/queries/0_stateless/01820_unhex_case_insensitive.sql
-%%DATADIR%%-test/queries/0_stateless/01821_dictionary_primary_key_wrong_order.reference
-%%DATADIR%%-test/queries/0_stateless/01821_dictionary_primary_key_wrong_order.sql
-%%DATADIR%%-test/queries/0_stateless/01821_join_table_mutation.reference
-%%DATADIR%%-test/queries/0_stateless/01821_join_table_mutation.sql
-%%DATADIR%%-test/queries/0_stateless/01821_join_table_race_long.reference
-%%DATADIR%%-test/queries/0_stateless/01821_join_table_race_long.sh
-%%DATADIR%%-test/queries/0_stateless/01821_table_comment.reference
-%%DATADIR%%-test/queries/0_stateless/01821_table_comment.sql
-%%DATADIR%%-test/queries/0_stateless/01821_to_date_time_ubsan.reference
-%%DATADIR%%-test/queries/0_stateless/01821_to_date_time_ubsan.sql
-%%DATADIR%%-test/queries/0_stateless/01822_async_read_from_socket_crash.reference
-%%DATADIR%%-test/queries/0_stateless/01822_async_read_from_socket_crash.sh
-%%DATADIR%%-test/queries/0_stateless/01822_union_and_constans_error.reference
-%%DATADIR%%-test/queries/0_stateless/01822_union_and_constans_error.sql
-%%DATADIR%%-test/queries/0_stateless/01823_array_low_cardinality_KuliginStepan.reference
-%%DATADIR%%-test/queries/0_stateless/01823_array_low_cardinality_KuliginStepan.sql
-%%DATADIR%%-test/queries/0_stateless/01823_explain_json.reference
-%%DATADIR%%-test/queries/0_stateless/01823_explain_json.sh
-%%DATADIR%%-test/queries/0_stateless/01824_move_to_prewhere_many_columns.reference
-%%DATADIR%%-test/queries/0_stateless/01824_move_to_prewhere_many_columns.sql
-%%DATADIR%%-test/queries/0_stateless/01824_prefer_global_in_and_join.reference
-%%DATADIR%%-test/queries/0_stateless/01824_prefer_global_in_and_join.sql
-%%DATADIR%%-test/queries/0_stateless/01825_replacing_vertical_merge.reference
-%%DATADIR%%-test/queries/0_stateless/01825_replacing_vertical_merge.sql
-%%DATADIR%%-test/queries/0_stateless/01831_max_streams.reference
-%%DATADIR%%-test/queries/0_stateless/01831_max_streams.sql
-%%DATADIR%%-test/queries/0_stateless/01832_memory_write_suffix.reference
-%%DATADIR%%-test/queries/0_stateless/01832_memory_write_suffix.sql
-%%DATADIR%%-test/queries/0_stateless/01833_test_collation_alvarotuso.reference
-%%DATADIR%%-test/queries/0_stateless/01833_test_collation_alvarotuso.sql
-%%DATADIR%%-test/queries/0_stateless/01834_alias_columns_laziness_filimonov.reference
-%%DATADIR%%-test/queries/0_stateless/01834_alias_columns_laziness_filimonov.sh
-%%DATADIR%%-test/queries/0_stateless/01835_alias_to_primary_key_cyfdecyf.reference
-%%DATADIR%%-test/queries/0_stateless/01835_alias_to_primary_key_cyfdecyf.sql
-%%DATADIR%%-test/queries/0_stateless/01836_date_time_keep_default_timezone_on_operations_den_crane.reference
+%%DATADIR%%-test/queries/0_stateless/00446_clear_column_in_partition_concurrent_zookeeper.sh
+%%DATADIR%%-test/queries/0_stateless/00901_joint_entropy.sql
+%%DATADIR%%-test/queries/0_stateless/01273_arrow_nullable_arrays_load.sh
+%%DATADIR%%-test/queries/0_stateless/01315_count_distinct_return_not_nullable.sql
+%%DATADIR%%-test/queries/0_stateless/00523_aggregate_functions_in_group_array.sql
+%%DATADIR%%-test/queries/0_stateless/02001_join_on_const_bs_long.sql.j2
+%%DATADIR%%-test/queries/0_stateless/01383_log_broken_table.sh
+%%DATADIR%%-test/queries/0_stateless/01561_mann_whitney_scipy.python
+%%DATADIR%%-test/queries/0_stateless/00926_adaptive_index_granularity_versioned_collapsing_merge_tree.reference
+%%DATADIR%%-test/queries/0_stateless/01075_allowed_client_hosts.reference
+%%DATADIR%%-test/queries/0_stateless/00687_insert_into_mv.sql
+%%DATADIR%%-test/queries/0_stateless/01097_one_more_range_reader_test.reference
+%%DATADIR%%-test/queries/0_stateless/02132_client_history_navigation.reference
+%%DATADIR%%-test/queries/0_stateless/02021_map_has.sql
+%%DATADIR%%-test/queries/0_stateless/01034_unknown_qualified_column_in_join.sql
+%%DATADIR%%-test/queries/0_stateless/00416_pocopatch_progress_in_http_headers.reference
+%%DATADIR%%-test/queries/0_stateless/00458_merge_type_cast.sql
+%%DATADIR%%-test/queries/0_stateless/01641_memory_tracking_insert_optimize.reference
+%%DATADIR%%-test/queries/0_stateless/02001_hostname_test.reference
+%%DATADIR%%-test/queries/0_stateless/01051_window_view_parser_hop.sql
+%%DATADIR%%-test/queries/0_stateless/00729_prewhere_array_join.reference
+%%DATADIR%%-test/queries/0_stateless/01854_s2_cap_union.reference
+%%DATADIR%%-test/queries/0_stateless/01293_create_role.reference
+%%DATADIR%%-test/queries/0_stateless/02096_sample_by_tuple.sql
+%%DATADIR%%-test/queries/0_stateless/00926_multimatch.reference
+%%DATADIR%%-test/queries/0_stateless/00722_inner_join.sql
+%%DATADIR%%-test/queries/0_stateless/00934_is_valid_utf8.sql
 %%DATADIR%%-test/queries/0_stateless/01836_date_time_keep_default_timezone_on_operations_den_crane.sql
-%%DATADIR%%-test/queries/0_stateless/01837_cast_to_array_from_empty_array.reference
-%%DATADIR%%-test/queries/0_stateless/01837_cast_to_array_from_empty_array.sql
-%%DATADIR%%-test/queries/0_stateless/01837_database_memory_ddl_dictionaries.reference
-%%DATADIR%%-test/queries/0_stateless/01837_database_memory_ddl_dictionaries.sql
-%%DATADIR%%-test/queries/0_stateless/01838_system_dictionaries_virtual_key_column.reference
-%%DATADIR%%-test/queries/0_stateless/01838_system_dictionaries_virtual_key_column.sql
-%%DATADIR%%-test/queries/0_stateless/01839_join_to_subqueries_rewriter_columns_matcher.reference
-%%DATADIR%%-test/queries/0_stateless/01839_join_to_subqueries_rewriter_columns_matcher.sql
-%%DATADIR%%-test/queries/0_stateless/01840_tupleElement_formatting_fuzzer.reference
-%%DATADIR%%-test/queries/0_stateless/01840_tupleElement_formatting_fuzzer.sql
-%%DATADIR%%-test/queries/0_stateless/01845_add_testcase_for_arrayElement.reference
-%%DATADIR%%-test/queries/0_stateless/01845_add_testcase_for_arrayElement.sql
-%%DATADIR%%-test/queries/0_stateless/01846_alter_column_without_type_bugfix.reference
-%%DATADIR%%-test/queries/0_stateless/01846_alter_column_without_type_bugfix.sql
-%%DATADIR%%-test/queries/0_stateless/01846_null_as_default_for_insert_select.reference
-%%DATADIR%%-test/queries/0_stateless/01846_null_as_default_for_insert_select.sql
-%%DATADIR%%-test/queries/0_stateless/01847_bad_like.reference
-%%DATADIR%%-test/queries/0_stateless/01847_bad_like.sql
-%%DATADIR%%-test/queries/0_stateless/01848_http_insert_segfault.reference
-%%DATADIR%%-test/queries/0_stateless/01848_http_insert_segfault.sh
-%%DATADIR%%-test/queries/0_stateless/01848_partition_value_column.reference
-%%DATADIR%%-test/queries/0_stateless/01848_partition_value_column.sql
-%%DATADIR%%-test/queries/0_stateless/01850_dist_INSERT_preserve_error.reference
-%%DATADIR%%-test/queries/0_stateless/01850_dist_INSERT_preserve_error.sql
-%%DATADIR%%-test/queries/0_stateless/01851_array_difference_decimal_overflow_ubsan.reference
-%%DATADIR%%-test/queries/0_stateless/01851_array_difference_decimal_overflow_ubsan.sql
-%%DATADIR%%-test/queries/0_stateless/01851_clear_column_referenced_by_mv.reference
-%%DATADIR%%-test/queries/0_stateless/01851_clear_column_referenced_by_mv.sql
-%%DATADIR%%-test/queries/0_stateless/01851_fix_row_policy_empty_result.reference
-%%DATADIR%%-test/queries/0_stateless/01851_fix_row_policy_empty_result.sql
-%%DATADIR%%-test/queries/0_stateless/01851_hedged_connections_external_tables.reference
-%%DATADIR%%-test/queries/0_stateless/01851_hedged_connections_external_tables.sql
-%%DATADIR%%-test/queries/0_stateless/01852_cast_operator.reference
-%%DATADIR%%-test/queries/0_stateless/01852_cast_operator.sql
-%%DATADIR%%-test/queries/0_stateless/01852_cast_operator_2.reference
-%%DATADIR%%-test/queries/0_stateless/01852_cast_operator_2.sql
-%%DATADIR%%-test/queries/0_stateless/01852_cast_operator_bad_cases.reference
-%%DATADIR%%-test/queries/0_stateless/01852_cast_operator_bad_cases.sh
-%%DATADIR%%-test/queries/0_stateless/01852_dictionary_found_rate_long.reference
-%%DATADIR%%-test/queries/0_stateless/01852_dictionary_found_rate_long.sql
-%%DATADIR%%-test/queries/0_stateless/01852_hints_enum_name.reference
-%%DATADIR%%-test/queries/0_stateless/01852_hints_enum_name.sh
-%%DATADIR%%-test/queries/0_stateless/01852_jit_if.reference
-%%DATADIR%%-test/queries/0_stateless/01852_jit_if.sql
-%%DATADIR%%-test/queries/0_stateless/01853_dictionary_cache_duplicates.reference
-%%DATADIR%%-test/queries/0_stateless/01853_dictionary_cache_duplicates.sh
-%%DATADIR%%-test/queries/0_stateless/01854_HTTP_dict_decompression.python
-%%DATADIR%%-test/queries/0_stateless/01854_HTTP_dict_decompression.reference
-%%DATADIR%%-test/queries/0_stateless/01854_HTTP_dict_decompression.sh
-%%DATADIR%%-test/queries/0_stateless/01854_dictionary_range_hashed_min_max_attr.reference
-%%DATADIR%%-test/queries/0_stateless/01854_dictionary_range_hashed_min_max_attr.sql
-%%DATADIR%%-test/queries/0_stateless/01855_jit_comparison_constant_result.reference
-%%DATADIR%%-test/queries/0_stateless/01855_jit_comparison_constant_result.sql
-%%DATADIR%%-test/queries/0_stateless/01860_Distributed__shard_num_GROUP_BY.reference
-%%DATADIR%%-test/queries/0_stateless/01860_Distributed__shard_num_GROUP_BY.sql
-%%DATADIR%%-test/queries/0_stateless/01861_explain_pipeline.reference
-%%DATADIR%%-test/queries/0_stateless/01861_explain_pipeline.sql
-%%DATADIR%%-test/queries/0_stateless/01865_aggregator_overflow_row.reference
-%%DATADIR%%-test/queries/0_stateless/01865_aggregator_overflow_row.sql
-%%DATADIR%%-test/queries/0_stateless/01866_aggregate_function_interval_length_sum.reference
-%%DATADIR%%-test/queries/0_stateless/01866_aggregate_function_interval_length_sum.sql
-%%DATADIR%%-test/queries/0_stateless/01866_bit_positions_to_array.reference
-%%DATADIR%%-test/queries/0_stateless/01866_bit_positions_to_array.sql
-%%DATADIR%%-test/queries/0_stateless/01866_datetime64_cmp_with_constant.reference
-%%DATADIR%%-test/queries/0_stateless/01866_datetime64_cmp_with_constant.sql
-%%DATADIR%%-test/queries/0_stateless/01866_split_by_regexp.reference
-%%DATADIR%%-test/queries/0_stateless/01866_split_by_regexp.sql
-%%DATADIR%%-test/queries/0_stateless/01866_view_persist_settings.reference
-%%DATADIR%%-test/queries/0_stateless/01866_view_persist_settings.sql
-%%DATADIR%%-test/queries/0_stateless/01867_fix_storage_memory_mutation.reference
-%%DATADIR%%-test/queries/0_stateless/01867_fix_storage_memory_mutation.sql
-%%DATADIR%%-test/queries/0_stateless/01867_support_datetime64_version_column.reference
-%%DATADIR%%-test/queries/0_stateless/01867_support_datetime64_version_column.sql
-%%DATADIR%%-test/queries/0_stateless/01868_order_by_fill_with_datetime64.reference
-%%DATADIR%%-test/queries/0_stateless/01868_order_by_fill_with_datetime64.sql
-%%DATADIR%%-test/queries/0_stateless/01869_function_modulo_legacy.reference
-%%DATADIR%%-test/queries/0_stateless/01869_function_modulo_legacy.sql
-%%DATADIR%%-test/queries/0_stateless/01869_reinterpret_as_fixed_string_uuid.reference
-%%DATADIR%%-test/queries/0_stateless/01869_reinterpret_as_fixed_string_uuid.sql
-%%DATADIR%%-test/queries/0_stateless/01870_buffer_flush.reference
-%%DATADIR%%-test/queries/0_stateless/01870_buffer_flush.sql
-%%DATADIR%%-test/queries/0_stateless/01870_modulo_partition_key.reference
-%%DATADIR%%-test/queries/0_stateless/01870_modulo_partition_key.sql
-%%DATADIR%%-test/queries/0_stateless/01871_merge_tree_compile_expressions.reference
-%%DATADIR%%-test/queries/0_stateless/01871_merge_tree_compile_expressions.sql
-%%DATADIR%%-test/queries/0_stateless/01872_functions_to_subcolumns.reference
-%%DATADIR%%-test/queries/0_stateless/01872_functions_to_subcolumns.sql
-%%DATADIR%%-test/queries/0_stateless/01872_initial_query_start_time.reference
-%%DATADIR%%-test/queries/0_stateless/01872_initial_query_start_time.sh
-%%DATADIR%%-test/queries/0_stateless/01874_select_from_trailing_whitespaces.reference
-%%DATADIR%%-test/queries/0_stateless/01874_select_from_trailing_whitespaces.sh
-%%DATADIR%%-test/queries/0_stateless/01875_ssd_cache_dictionary_decimal256_type.reference
-%%DATADIR%%-test/queries/0_stateless/01875_ssd_cache_dictionary_decimal256_type.sh
-%%DATADIR%%-test/queries/0_stateless/01880_remote_ipv6.reference
-%%DATADIR%%-test/queries/0_stateless/01880_remote_ipv6.sql
-%%DATADIR%%-test/queries/0_stateless/01881_create_as_tuple.reference
-%%DATADIR%%-test/queries/0_stateless/01881_create_as_tuple.sql
-%%DATADIR%%-test/queries/0_stateless/01881_negate_formatting.reference
-%%DATADIR%%-test/queries/0_stateless/01881_negate_formatting.sql
-%%DATADIR%%-test/queries/0_stateless/01881_to_week_monotonic_fix.reference
-%%DATADIR%%-test/queries/0_stateless/01881_to_week_monotonic_fix.sql
-%%DATADIR%%-test/queries/0_stateless/01881_total_bytes_storage_buffer.reference
-%%DATADIR%%-test/queries/0_stateless/01881_total_bytes_storage_buffer.sql
-%%DATADIR%%-test/queries/0_stateless/01881_union_header_mismatch_bug.reference
-%%DATADIR%%-test/queries/0_stateless/01881_union_header_mismatch_bug.sql
-%%DATADIR%%-test/queries/0_stateless/01882_check_max_parts_to_merge_at_once.reference
-%%DATADIR%%-test/queries/0_stateless/01882_check_max_parts_to_merge_at_once.sql
-%%DATADIR%%-test/queries/0_stateless/01882_scalar_subquery_exception.reference
-%%DATADIR%%-test/queries/0_stateless/01882_scalar_subquery_exception.sql
-%%DATADIR%%-test/queries/0_stateless/01882_total_rows_approx.reference
-%%DATADIR%%-test/queries/0_stateless/01882_total_rows_approx.sh
-%%DATADIR%%-test/queries/0_stateless/01883_subcolumns_distributed.reference
-%%DATADIR%%-test/queries/0_stateless/01883_subcolumns_distributed.sql
-%%DATADIR%%-test/queries/0_stateless/01888_bloom_filter_hasAny.reference
-%%DATADIR%%-test/queries/0_stateless/01888_bloom_filter_hasAny.sql
-%%DATADIR%%-test/queries/0_stateless/01888_read_int_safe.reference
-%%DATADIR%%-test/queries/0_stateless/01888_read_int_safe.sql
-%%DATADIR%%-test/queries/0_stateless/01889_check_row_policy_defined_using_user_function.reference
-%%DATADIR%%-test/queries/0_stateless/01889_check_row_policy_defined_using_user_function.sh
-%%DATADIR%%-test/queries/0_stateless/01889_clickhouse_client_config_format.reference
-%%DATADIR%%-test/queries/0_stateless/01889_clickhouse_client_config_format.sh
-%%DATADIR%%-test/queries/0_stateless/01889_key_condition_function_chains.reference
-%%DATADIR%%-test/queries/0_stateless/01889_key_condition_function_chains.sql
-%%DATADIR%%-test/queries/0_stateless/01889_postgresql_protocol_null_fields.reference
-%%DATADIR%%-test/queries/0_stateless/01889_postgresql_protocol_null_fields.sh
-%%DATADIR%%-test/queries/0_stateless/01890_cross_join_explain_crash.reference
-%%DATADIR%%-test/queries/0_stateless/01890_cross_join_explain_crash.sql
-%%DATADIR%%-test/queries/0_stateless/01890_materialized_distributed_join.reference
-%%DATADIR%%-test/queries/0_stateless/01890_materialized_distributed_join.sh
-%%DATADIR%%-test/queries/0_stateless/01890_state_of_state.reference
-%%DATADIR%%-test/queries/0_stateless/01890_state_of_state.sql
-%%DATADIR%%-test/queries/0_stateless/01891_echo.reference
-%%DATADIR%%-test/queries/0_stateless/01891_echo.sql
-%%DATADIR%%-test/queries/0_stateless/01891_not_in_partition_prune.reference
-%%DATADIR%%-test/queries/0_stateless/01891_not_in_partition_prune.sql
-%%DATADIR%%-test/queries/0_stateless/01891_partition_by_uuid.reference
-%%DATADIR%%-test/queries/0_stateless/01891_partition_by_uuid.sql
-%%DATADIR%%-test/queries/0_stateless/01891_partition_hash.reference
-%%DATADIR%%-test/queries/0_stateless/01891_partition_hash.sql
-%%DATADIR%%-test/queries/0_stateless/01891_partition_hash_no_long_int.reference
-%%DATADIR%%-test/queries/0_stateless/01891_partition_hash_no_long_int.sql
-%%DATADIR%%-test/queries/0_stateless/01892_setting_limit_offset_distributed.reference
-%%DATADIR%%-test/queries/0_stateless/01892_setting_limit_offset_distributed.sql
-%%DATADIR%%-test/queries/0_stateless/01900_kill_mutation_parallel_long.reference
-%%DATADIR%%-test/queries/0_stateless/01900_kill_mutation_parallel_long.sh
-%%DATADIR%%-test/queries/0_stateless/01901_in_literal_shard_prune.reference
-%%DATADIR%%-test/queries/0_stateless/01901_in_literal_shard_prune.sql
-%%DATADIR%%-test/queries/0_stateless/01901_test_attach_partition_from.reference
-%%DATADIR%%-test/queries/0_stateless/01901_test_attach_partition_from.sql
-%%DATADIR%%-test/queries/0_stateless/01902_dictionary_array_type.reference
-%%DATADIR%%-test/queries/0_stateless/01902_dictionary_array_type.sql
-%%DATADIR%%-test/queries/0_stateless/01902_self_aliases_in_columns.reference
-%%DATADIR%%-test/queries/0_stateless/01902_self_aliases_in_columns.sql
-%%DATADIR%%-test/queries/0_stateless/01903_csvwithnames_subset_of_columns.reference
-%%DATADIR%%-test/queries/0_stateless/01903_csvwithnames_subset_of_columns.sh
-%%DATADIR%%-test/queries/0_stateless/01903_http_fields.reference
-%%DATADIR%%-test/queries/0_stateless/01903_http_fields.sh
-%%DATADIR%%-test/queries/0_stateless/01903_ssd_cache_dictionary_array_type.reference
-%%DATADIR%%-test/queries/0_stateless/01903_ssd_cache_dictionary_array_type.sh
-%%DATADIR%%-test/queries/0_stateless/01904_dictionary_default_nullable_type.reference
-%%DATADIR%%-test/queries/0_stateless/01904_dictionary_default_nullable_type.sql
-%%DATADIR%%-test/queries/0_stateless/01904_ssd_cache_dictionary_default_nullable_type.reference
-%%DATADIR%%-test/queries/0_stateless/01904_ssd_cache_dictionary_default_nullable_type.sh
-%%DATADIR%%-test/queries/0_stateless/01905_to_json_string.reference
-%%DATADIR%%-test/queries/0_stateless/01905_to_json_string.sql
-%%DATADIR%%-test/queries/0_stateless/01906_bigint_accurate_cast_ubsan.reference
-%%DATADIR%%-test/queries/0_stateless/01906_bigint_accurate_cast_ubsan.sql
-%%DATADIR%%-test/queries/0_stateless/01906_lc_in_bug.reference
-%%DATADIR%%-test/queries/0_stateless/01906_lc_in_bug.sql
-%%DATADIR%%-test/queries/0_stateless/01906_partition_by_multiply_by_zero.reference
-%%DATADIR%%-test/queries/0_stateless/01906_partition_by_multiply_by_zero.sql
-%%DATADIR%%-test/queries/0_stateless/01907_multiple_aliases.reference
-%%DATADIR%%-test/queries/0_stateless/01907_multiple_aliases.sql
-%%DATADIR%%-test/queries/0_stateless/01908_with_unknown_column.reference
-%%DATADIR%%-test/queries/0_stateless/01908_with_unknown_column.sql
-%%DATADIR%%-test/queries/0_stateless/01910_client_replxx_container_overflow_long.expect
-%%DATADIR%%-test/queries/0_stateless/01910_client_replxx_container_overflow_long.reference
-%%DATADIR%%-test/queries/0_stateless/01910_memory_tracking_topk.reference
-%%DATADIR%%-test/queries/0_stateless/01910_memory_tracking_topk.sql
-%%DATADIR%%-test/queries/0_stateless/01910_view_dictionary.reference
-%%DATADIR%%-test/queries/0_stateless/01910_view_dictionary.sql
-%%DATADIR%%-test/queries/0_stateless/01912_bad_cast_join_fuzz.reference
-%%DATADIR%%-test/queries/0_stateless/01912_bad_cast_join_fuzz.sql
-%%DATADIR%%-test/queries/0_stateless/01913_fix_column_transformer_replace_format.reference
-%%DATADIR%%-test/queries/0_stateless/01913_fix_column_transformer_replace_format.sql
+%%DATADIR%%-test/queries/0_stateless/00516_deduplication_after_drop_partition_zookeeper.sql
+%%DATADIR%%-test/queries/0_stateless/00277_array_filter.reference
+%%DATADIR%%-test/queries/0_stateless/01515_with_global_and_with_propagation.reference
+%%DATADIR%%-test/queries/0_stateless/00948_to_valid_utf8.sql
+%%DATADIR%%-test/queries/0_stateless/02113_untuple_func_alias.sql
+%%DATADIR%%-test/queries/0_stateless/00215_primary_key_order_zookeeper_long.sql
+%%DATADIR%%-test/queries/0_stateless/01554_row_number_after_cannot_read_all_data.sh
+%%DATADIR%%-test/queries/0_stateless/01164_detach_attach_partition_race.reference
+%%DATADIR%%-test/queries/0_stateless/01510_format_regexp_raw_low_cardinality.reference
+%%DATADIR%%-test/queries/0_stateless/01268_data_numeric_parameters.sql
+%%DATADIR%%-test/queries/0_stateless/00469_comparison_of_strings_containing_null_char.sql
+%%DATADIR%%-test/queries/0_stateless/01768_array_product.sql
+%%DATADIR%%-test/queries/0_stateless/01265_datetime_string_comparison_felix_mueller.reference
+%%DATADIR%%-test/queries/0_stateless/00023_agg_select_agg_subquery.sql
+%%DATADIR%%-test/queries/0_stateless/01544_errorCodeToName.sql
+%%DATADIR%%-test/queries/0_stateless/00910_zookeeper_custom_compression_codecs_replicated_long.reference
+%%DATADIR%%-test/queries/0_stateless/00950_bad_alloc_when_truncate_join_storage.reference
+%%DATADIR%%-test/queries/0_stateless/00534_functions_bad_arguments5.reference
+%%DATADIR%%-test/queries/0_stateless/01758_optimize_skip_unused_shards_once.reference
+%%DATADIR%%-test/queries/0_stateless/01702_toDateTime_from_string_clamping.sql
+%%DATADIR%%-test/queries/0_stateless/01353_topk_enum.reference
+%%DATADIR%%-test/queries/0_stateless/02009_mysql_client_empty_result.reference
+%%DATADIR%%-test/queries/0_stateless/00238_removal_of_temporary_columns.reference
+%%DATADIR%%-test/queries/0_stateless/02160_h3_cell_area_m2.sql
+%%DATADIR%%-test/queries/0_stateless/01516_date_time_output_format.reference
+%%DATADIR%%-test/queries/0_stateless/00508_materialized_view_to.sql
+%%DATADIR%%-test/queries/0_stateless/01926_order_by_desc_limit.reference
+%%DATADIR%%-test/queries/0_stateless/01930_optimize_skip_unused_shards_rewrite_in.reference
+%%DATADIR%%-test/queries/0_stateless/02052_last_granula_adjust_LOGICAL_ERROR.sql.j2
+%%DATADIR%%-test/queries/0_stateless/02153_clickhouse_local_profile_info.sh
+%%DATADIR%%-test/queries/0_stateless/01389_filter_by_virtual_columns.sql
+%%DATADIR%%-test/queries/0_stateless/01283_strict_resize_bug.sql
+%%DATADIR%%-test/queries/0_stateless/02139_MV_with_scalar_subquery.sql
+%%DATADIR%%-test/queries/0_stateless/02118_show_create_table_rocksdb.reference
+%%DATADIR%%-test/queries/0_stateless/01083_log_first_column_alias.sql
+%%DATADIR%%-test/queries/0_stateless/01284_view_and_extremes_bug.reference
+%%DATADIR%%-test/queries/0_stateless/01526_complex_key_dict_direct_layout.reference
+%%DATADIR%%-test/queries/0_stateless/02001_dist_on_dist_WithMergeableStateAfterAggregation.reference
+%%DATADIR%%-test/queries/0_stateless/01453_normalize_query_alias_uuid.reference
+%%DATADIR%%-test/queries/0_stateless/00264_uniq_many_args.sql
+%%DATADIR%%-test/queries/0_stateless/01926_json_as_string_array.sh
+%%DATADIR%%-test/queries/0_stateless/01114_database_atomic.sh
+%%DATADIR%%-test/queries/0_stateless/01474_custom_null_tsv.reference
+%%DATADIR%%-test/queries/0_stateless/01280_ssd_complex_key_dictionary.sh
+%%DATADIR%%-test/queries/0_stateless/01051_same_name_alias_with_joins.sql
+%%DATADIR%%-test/queries/0_stateless/00936_function_result_with_operator_in.sql
+%%DATADIR%%-test/queries/0_stateless/01660_second_extremes_bug.sql
+%%DATADIR%%-test/queries/0_stateless/00760_insert_json_with_defaults.sql
+%%DATADIR%%-test/queries/0_stateless/00028_shard_big_agg_aj_distributed.sql
+%%DATADIR%%-test/queries/0_stateless/00429_long_http_bufferization.sh
+%%DATADIR%%-test/queries/0_stateless/00897_flatten.reference
+%%DATADIR%%-test/queries/0_stateless/00926_adaptive_index_granularity_pk.reference
+%%DATADIR%%-test/queries/0_stateless/00952_part_frozen_info.reference
+%%DATADIR%%-test/queries/0_stateless/02009_body_query_params.sh
+%%DATADIR%%-test/queries/0_stateless/00870_t64_codec.sql
+%%DATADIR%%-test/queries/0_stateless/01526_param_uuid.reference
+%%DATADIR%%-test/queries/0_stateless/02015_global_in_threads.reference
+%%DATADIR%%-test/queries/0_stateless/01543_collate_in_tuple.reference
+%%DATADIR%%-test/queries/0_stateless/00603_system_parts_nonexistent_database.reference
 %%DATADIR%%-test/queries/0_stateless/01913_if_int_decimal.reference
-%%DATADIR%%-test/queries/0_stateless/01913_if_int_decimal.sql
-%%DATADIR%%-test/queries/0_stateless/01913_join_push_down_bug.reference
-%%DATADIR%%-test/queries/0_stateless/01913_join_push_down_bug.sql
-%%DATADIR%%-test/queries/0_stateless/01913_names_of_tuple_literal.reference
-%%DATADIR%%-test/queries/0_stateless/01913_names_of_tuple_literal.sql
-%%DATADIR%%-test/queries/0_stateless/01913_quantile_deterministic.reference
-%%DATADIR%%-test/queries/0_stateless/01913_quantile_deterministic.sh
-%%DATADIR%%-test/queries/0_stateless/01913_replace_dictionary.reference
-%%DATADIR%%-test/queries/0_stateless/01913_replace_dictionary.sql
-%%DATADIR%%-test/queries/0_stateless/01913_summing_mt_and_simple_agg_function_with_lc.reference
-%%DATADIR%%-test/queries/0_stateless/01913_summing_mt_and_simple_agg_function_with_lc.sql
-%%DATADIR%%-test/queries/0_stateless/01914_exchange_dictionaries.reference
-%%DATADIR%%-test/queries/0_stateless/01914_exchange_dictionaries.sql
-%%DATADIR%%-test/queries/0_stateless/01914_index_bgranvea.reference
-%%DATADIR%%-test/queries/0_stateless/01914_index_bgranvea.sql
-%%DATADIR%%-test/queries/0_stateless/01914_ubsan_quantile_timing.reference
-%%DATADIR%%-test/queries/0_stateless/01914_ubsan_quantile_timing.sql
-%%DATADIR%%-test/queries/0_stateless/01915_create_or_replace_dictionary.reference
-%%DATADIR%%-test/queries/0_stateless/01915_create_or_replace_dictionary.sql
-%%DATADIR%%-test/queries/0_stateless/01915_for_each_crakjie.reference
-%%DATADIR%%-test/queries/0_stateless/01915_for_each_crakjie.sql
-%%DATADIR%%-test/queries/0_stateless/01915_merge_prewhere_virtual_column_rand_chao_wang.reference
-%%DATADIR%%-test/queries/0_stateless/01915_merge_prewhere_virtual_column_rand_chao_wang.sql
-%%DATADIR%%-test/queries/0_stateless/01916_low_cardinality_interval.reference
-%%DATADIR%%-test/queries/0_stateless/01916_low_cardinality_interval.sql
-%%DATADIR%%-test/queries/0_stateless/01916_lowcard_dict_type.reference
-%%DATADIR%%-test/queries/0_stateless/01916_lowcard_dict_type.sql
-%%DATADIR%%-test/queries/0_stateless/01916_multiple_join_view_optimize_predicate_chertus.reference
-%%DATADIR%%-test/queries/0_stateless/01916_multiple_join_view_optimize_predicate_chertus.sql
-%%DATADIR%%-test/queries/0_stateless/01917_prewhere_column_type.reference
-%%DATADIR%%-test/queries/0_stateless/01917_prewhere_column_type.sql
-%%DATADIR%%-test/queries/0_stateless/01920_not_chain_format.reference
-%%DATADIR%%-test/queries/0_stateless/01920_not_chain_format.sql
-%%DATADIR%%-test/queries/0_stateless/01921_concurrent_ttl_and_normal_merges_zookeeper_long.reference
-%%DATADIR%%-test/queries/0_stateless/01921_concurrent_ttl_and_normal_merges_zookeeper_long.sh
-%%DATADIR%%-test/queries/0_stateless/01921_not_chain.reference
-%%DATADIR%%-test/queries/0_stateless/01921_not_chain.sql
-%%DATADIR%%-test/queries/0_stateless/01921_test_progress_bar.py
-%%DATADIR%%-test/queries/0_stateless/01921_test_progress_bar.reference
-%%DATADIR%%-test/queries/0_stateless/01921_with_fill_with_totals.reference
-%%DATADIR%%-test/queries/0_stateless/01921_with_fill_with_totals.sql
-%%DATADIR%%-test/queries/0_stateless/01922_array_join_with_index.reference
-%%DATADIR%%-test/queries/0_stateless/01922_array_join_with_index.sql
-%%DATADIR%%-test/queries/0_stateless/01922_client_param.reference
-%%DATADIR%%-test/queries/0_stateless/01922_client_param.sh
-%%DATADIR%%-test/queries/0_stateless/01923_different_expression_name_alias.reference
-%%DATADIR%%-test/queries/0_stateless/01923_different_expression_name_alias.sql
-%%DATADIR%%-test/queries/0_stateless/01923_ttl_with_modify_column.reference
-%%DATADIR%%-test/queries/0_stateless/01923_ttl_with_modify_column.sql
-%%DATADIR%%-test/queries/0_stateless/01924_argmax_bitmap_state.reference
-%%DATADIR%%-test/queries/0_stateless/01924_argmax_bitmap_state.sql
-%%DATADIR%%-test/queries/0_stateless/01925_date_date_time_comparison.reference
-%%DATADIR%%-test/queries/0_stateless/01925_date_date_time_comparison.sql
-%%DATADIR%%-test/queries/0_stateless/01926_date_date_time_supertype.reference
-%%DATADIR%%-test/queries/0_stateless/01926_date_date_time_supertype.sql
-%%DATADIR%%-test/queries/0_stateless/01932_remote_sharding_key_column.reference
-%%DATADIR%%-test/queries/0_stateless/01932_remote_sharding_key_column.sql
-%%DATADIR%%-test/queries/0_stateless/01936_three_parts_identifiers_in_wrong_places.reference
-%%DATADIR%%-test/queries/0_stateless/01936_three_parts_identifiers_in_wrong_places.sql
-%%DATADIR%%-test/queries/0_stateless/01939_type_map_json.reference
-%%DATADIR%%-test/queries/0_stateless/01939_type_map_json.sql
-%%DATADIR%%-test/queries/0_stateless/01940_point_in_polygon_ubsan.reference
-%%DATADIR%%-test/queries/0_stateless/01940_point_in_polygon_ubsan.sql
-%%DATADIR%%-test/queries/0_stateless/01942_untuple_transformers_msan.reference
-%%DATADIR%%-test/queries/0_stateless/01942_untuple_transformers_msan.sql
-%%DATADIR%%-test/queries/0_stateless/01943_pmj_non_joined_stuck.reference
-%%DATADIR%%-test/queries/0_stateless/01943_pmj_non_joined_stuck.sql
-%%DATADIR%%-test/queries/0_stateless/arcadia_skip_list.txt
-%%DATADIR%%-test/queries/0_stateless/country_polygons.tsv
-%%DATADIR%%-test/queries/0_stateless/country_rings.tsv
-%%DATADIR%%-test/queries/0_stateless/data_arrow/test.arrow
-%%DATADIR%%-test/queries/0_stateless/data_avro/complex.avro
-%%DATADIR%%-test/queries/0_stateless/data_avro/complex.avsc
-%%DATADIR%%-test/queries/0_stateless/data_avro/complex.json
-%%DATADIR%%-test/queries/0_stateless/data_avro/empty.avro
-%%DATADIR%%-test/queries/0_stateless/data_avro/empty.avsc
-%%DATADIR%%-test/queries/0_stateless/data_avro/empty.json
-%%DATADIR%%-test/queries/0_stateless/data_avro/generate_avro.sh
-%%DATADIR%%-test/queries/0_stateless/data_avro/logical_types.avro
-%%DATADIR%%-test/queries/0_stateless/data_avro/logical_types.avsc
-%%DATADIR%%-test/queries/0_stateless/data_avro/logical_types.json
-%%DATADIR%%-test/queries/0_stateless/data_avro/nested.avro
-%%DATADIR%%-test/queries/0_stateless/data_avro/nested.avsc
-%%DATADIR%%-test/queries/0_stateless/data_avro/nested.json
-%%DATADIR%%-test/queries/0_stateless/data_avro/nested_complex.avro
-%%DATADIR%%-test/queries/0_stateless/data_avro/nested_complex.avsc
-%%DATADIR%%-test/queries/0_stateless/data_avro/nested_complex.json
-%%DATADIR%%-test/queries/0_stateless/data_avro/primitive.avro
-%%DATADIR%%-test/queries/0_stateless/data_avro/primitive.avsc
-%%DATADIR%%-test/queries/0_stateless/data_avro/primitive.json
-%%DATADIR%%-test/queries/0_stateless/data_avro/references.avro
-%%DATADIR%%-test/queries/0_stateless/data_avro/references.avsc
-%%DATADIR%%-test/queries/0_stateless/data_avro/references.json
-%%DATADIR%%-test/queries/0_stateless/data_avro/simple.avsc
-%%DATADIR%%-test/queries/0_stateless/data_avro/simple.deflate.avro
-%%DATADIR%%-test/queries/0_stateless/data_avro/simple.json
-%%DATADIR%%-test/queries/0_stateless/data_avro/simple.null.avro
-%%DATADIR%%-test/queries/0_stateless/data_avro/simple.snappy.avro
-%%DATADIR%%-test/queries/0_stateless/data_orc/test.orc
-%%DATADIR%%-test/queries/0_stateless/data_orc/test_null_array.orc
-%%DATADIR%%-test/queries/0_stateless/data_parquet/alltypes_dictionary.parquet
-%%DATADIR%%-test/queries/0_stateless/data_parquet/alltypes_dictionary.parquet.columns
-%%DATADIR%%-test/queries/0_stateless/data_parquet/alltypes_list.parquet
-%%DATADIR%%-test/queries/0_stateless/data_parquet/alltypes_list.parquet.columns
-%%DATADIR%%-test/queries/0_stateless/data_parquet/alltypes_plain.parquet
-%%DATADIR%%-test/queries/0_stateless/data_parquet/alltypes_plain.parquet.columns
-%%DATADIR%%-test/queries/0_stateless/data_parquet/alltypes_plain.snappy.parquet
-%%DATADIR%%-test/queries/0_stateless/data_parquet/alltypes_plain.snappy.parquet.columns
-%%DATADIR%%-test/queries/0_stateless/data_parquet/array_float.parquet
-%%DATADIR%%-test/queries/0_stateless/data_parquet/array_float.parquet.columns
-%%DATADIR%%-test/queries/0_stateless/data_parquet/array_int.parquet
-%%DATADIR%%-test/queries/0_stateless/data_parquet/array_int.parquet.columns
-%%DATADIR%%-test/queries/0_stateless/data_parquet/array_string.parquet
-%%DATADIR%%-test/queries/0_stateless/data_parquet/array_string.parquet.columns
-%%DATADIR%%-test/queries/0_stateless/data_parquet/binary.parquet
-%%DATADIR%%-test/queries/0_stateless/data_parquet/binary.parquet.columns
-%%DATADIR%%-test/queries/0_stateless/data_parquet/byte_array_decimal.parquet
-%%DATADIR%%-test/queries/0_stateless/data_parquet/byte_array_decimal.parquet.columns
-%%DATADIR%%-test/queries/0_stateless/data_parquet/datapage_v2.snappy.parquet
-%%DATADIR%%-test/queries/0_stateless/data_parquet/datapage_v2.snappy.parquet.columns
-%%DATADIR%%-test/queries/0_stateless/data_parquet/dict-page-offset-zero.parquet
-%%DATADIR%%-test/queries/0_stateless/data_parquet/dict-page-offset-zero.parquet.columns
-%%DATADIR%%-test/queries/0_stateless/data_parquet/fixed_length_decimal.parquet
-%%DATADIR%%-test/queries/0_stateless/data_parquet/fixed_length_decimal.parquet.columns
-%%DATADIR%%-test/queries/0_stateless/data_parquet/fixed_length_decimal_1.parquet
-%%DATADIR%%-test/queries/0_stateless/data_parquet/fixed_length_decimal_1.parquet.columns
-%%DATADIR%%-test/queries/0_stateless/data_parquet/fixed_length_decimal_legacy.parquet
-%%DATADIR%%-test/queries/0_stateless/data_parquet/fixed_length_decimal_legacy.parquet.columns
-%%DATADIR%%-test/queries/0_stateless/data_parquet/hadoop_lz4_compressed.parquet
-%%DATADIR%%-test/queries/0_stateless/data_parquet/hadoop_lz4_compressed.parquet.columns
-%%DATADIR%%-test/queries/0_stateless/data_parquet/int32_decimal.parquet
-%%DATADIR%%-test/queries/0_stateless/data_parquet/int32_decimal.parquet.columns
-%%DATADIR%%-test/queries/0_stateless/data_parquet/int64_decimal.parquet
-%%DATADIR%%-test/queries/0_stateless/data_parquet/int64_decimal.parquet.columns
-%%DATADIR%%-test/queries/0_stateless/data_parquet/list_columns.parquet
-%%DATADIR%%-test/queries/0_stateless/data_parquet/list_columns.parquet.columns
-%%DATADIR%%-test/queries/0_stateless/data_parquet/nation.dict-malformed.parquet
-%%DATADIR%%-test/queries/0_stateless/data_parquet/nation.dict-malformed.parquet.columns
-%%DATADIR%%-test/queries/0_stateless/data_parquet/nested_lists.parquet
-%%DATADIR%%-test/queries/0_stateless/data_parquet/nested_lists.parquet.columns
-%%DATADIR%%-test/queries/0_stateless/data_parquet/nested_lists.snappy.parquet
-%%DATADIR%%-test/queries/0_stateless/data_parquet/nested_lists.snappy.parquet.columns
-%%DATADIR%%-test/queries/0_stateless/data_parquet/nested_maps.snappy.parquet
-%%DATADIR%%-test/queries/0_stateless/data_parquet/nested_maps.snappy.parquet.columns
-%%DATADIR%%-test/queries/0_stateless/data_parquet/non_hadoop_lz4_compressed.parquet
-%%DATADIR%%-test/queries/0_stateless/data_parquet/non_hadoop_lz4_compressed.parquet.columns
-%%DATADIR%%-test/queries/0_stateless/data_parquet/nonnullable.impala.parquet
-%%DATADIR%%-test/queries/0_stateless/data_parquet/nonnullable.impala.parquet.columns
-%%DATADIR%%-test/queries/0_stateless/data_parquet/nullable.impala.parquet
-%%DATADIR%%-test/queries/0_stateless/data_parquet/nullable.impala.parquet.columns
-%%DATADIR%%-test/queries/0_stateless/data_parquet/nullable_list.parquet
-%%DATADIR%%-test/queries/0_stateless/data_parquet/nullable_list.parquet.columns
-%%DATADIR%%-test/queries/0_stateless/data_parquet/nulls.snappy.parquet
-%%DATADIR%%-test/queries/0_stateless/data_parquet/nulls.snappy.parquet.columns
-%%DATADIR%%-test/queries/0_stateless/data_parquet/repeated_no_annotation.parquet.disabled
-%%DATADIR%%-test/queries/0_stateless/data_parquet/single_nan.parquet
-%%DATADIR%%-test/queries/0_stateless/data_parquet/single_nan.parquet.columns
-%%DATADIR%%-test/queries/0_stateless/data_parquet/userdata1.parquet
-%%DATADIR%%-test/queries/0_stateless/data_parquet/userdata1.parquet.columns
-%%DATADIR%%-test/queries/0_stateless/data_parquet/userdata2.parquet
-%%DATADIR%%-test/queries/0_stateless/data_parquet/userdata2.parquet.columns
-%%DATADIR%%-test/queries/0_stateless/data_parquet/userdata3.parquet
-%%DATADIR%%-test/queries/0_stateless/data_parquet/userdata3.parquet.columns
-%%DATADIR%%-test/queries/0_stateless/data_parquet/userdata4.parquet
-%%DATADIR%%-test/queries/0_stateless/data_parquet/userdata4.parquet.columns
-%%DATADIR%%-test/queries/0_stateless/data_parquet/userdata5.parquet
-%%DATADIR%%-test/queries/0_stateless/data_parquet/userdata5.parquet.columns
-%%DATADIR%%-test/queries/0_stateless/data_parquet/v0.7.1.all-named-index.parquet
-%%DATADIR%%-test/queries/0_stateless/data_parquet/v0.7.1.all-named-index.parquet.columns
-%%DATADIR%%-test/queries/0_stateless/data_parquet/v0.7.1.column-metadata-handling.parquet
-%%DATADIR%%-test/queries/0_stateless/data_parquet/v0.7.1.column-metadata-handling.parquet.columns
-%%DATADIR%%-test/queries/0_stateless/data_parquet/v0.7.1.parquet
-%%DATADIR%%-test/queries/0_stateless/data_parquet/v0.7.1.parquet.columns
-%%DATADIR%%-test/queries/0_stateless/data_parquet/v0.7.1.some-named-index.parquet
-%%DATADIR%%-test/queries/0_stateless/data_parquet/v0.7.1.some-named-index.parquet.columns
-%%DATADIR%%-test/queries/0_stateless/format_schemas/00825_protobuf_format_array_3dim.proto
-%%DATADIR%%-test/queries/0_stateless/format_schemas/00825_protobuf_format_array_of_arrays.proto
-%%DATADIR%%-test/queries/0_stateless/format_schemas/00825_protobuf_format_enum_mapping.proto
-%%DATADIR%%-test/queries/0_stateless/format_schemas/00825_protobuf_format_map.proto
-%%DATADIR%%-test/queries/0_stateless/format_schemas/00825_protobuf_format_nested_in_nested.proto
-%%DATADIR%%-test/queries/0_stateless/format_schemas/00825_protobuf_format_nested_optional.proto
-%%DATADIR%%-test/queries/0_stateless/format_schemas/00825_protobuf_format_no_length_delimiter.proto
-%%DATADIR%%-test/queries/0_stateless/format_schemas/00825_protobuf_format_persons.proto
-%%DATADIR%%-test/queries/0_stateless/format_schemas/00825_protobuf_format_persons_syntax2.proto
-%%DATADIR%%-test/queries/0_stateless/format_schemas/00825_protobuf_format_splitted_nested.proto
-%%DATADIR%%-test/queries/0_stateless/format_schemas/00825_protobuf_format_squares.proto
-%%DATADIR%%-test/queries/0_stateless/format_schemas/00825_protobuf_format_syntax2.proto
-%%DATADIR%%-test/queries/0_stateless/format_schemas/00825_protobuf_format_table_default.proto
-%%DATADIR%%-test/queries/0_stateless/helpers/00900_parquet_create_table_columns.py
-%%DATADIR%%-test/queries/0_stateless/helpers/client.py
-%%DATADIR%%-test/queries/0_stateless/helpers/httpclient.py
-%%DATADIR%%-test/queries/0_stateless/helpers/httpexpect.py
-%%DATADIR%%-test/queries/0_stateless/helpers/protobuf_length_delimited_encoder.py
-%%DATADIR%%-test/queries/0_stateless/helpers/pure_http_client.py
-%%DATADIR%%-test/queries/0_stateless/helpers/shell.py
-%%DATADIR%%-test/queries/0_stateless/helpers/uexpect.py
-%%DATADIR%%-test/queries/0_stateless/mergetree_mutations.lib
-%%DATADIR%%-test/queries/1_stateful/00001_count_hits.reference
-%%DATADIR%%-test/queries/1_stateful/00001_count_hits.sql
-%%DATADIR%%-test/queries/1_stateful/00002_count_visits.reference
-%%DATADIR%%-test/queries/1_stateful/00002_count_visits.sql
-%%DATADIR%%-test/queries/1_stateful/00004_top_counters.reference
-%%DATADIR%%-test/queries/1_stateful/00004_top_counters.sql
-%%DATADIR%%-test/queries/1_stateful/00005_filtering.reference
-%%DATADIR%%-test/queries/1_stateful/00005_filtering.sql
-%%DATADIR%%-test/queries/1_stateful/00006_agregates.reference
-%%DATADIR%%-test/queries/1_stateful/00006_agregates.sql
-%%DATADIR%%-test/queries/1_stateful/00007_uniq.reference
-%%DATADIR%%-test/queries/1_stateful/00007_uniq.sql
-%%DATADIR%%-test/queries/1_stateful/00008_uniq.reference
-%%DATADIR%%-test/queries/1_stateful/00008_uniq.sql
-%%DATADIR%%-test/queries/1_stateful/00009_uniq_distributed.reference
-%%DATADIR%%-test/queries/1_stateful/00009_uniq_distributed.sql
-%%DATADIR%%-test/queries/1_stateful/00010_quantiles_segfault.reference
-%%DATADIR%%-test/queries/1_stateful/00010_quantiles_segfault.sql
-%%DATADIR%%-test/queries/1_stateful/00011_sorting.reference
-%%DATADIR%%-test/queries/1_stateful/00011_sorting.sql
-%%DATADIR%%-test/queries/1_stateful/00012_sorting_distributed.reference
-%%DATADIR%%-test/queries/1_stateful/00012_sorting_distributed.sql
-%%DATADIR%%-test/queries/1_stateful/00013_sorting_of_nested.reference
-%%DATADIR%%-test/queries/1_stateful/00013_sorting_of_nested.sql
-%%DATADIR%%-test/queries/1_stateful/00014_filtering_arrays.reference
-%%DATADIR%%-test/queries/1_stateful/00014_filtering_arrays.sql
-%%DATADIR%%-test/queries/1_stateful/00015_totals_and_no_aggregate_functions.reference
-%%DATADIR%%-test/queries/1_stateful/00015_totals_and_no_aggregate_functions.sql
-%%DATADIR%%-test/queries/1_stateful/00016_any_if_distributed_cond_always_false.reference
-%%DATADIR%%-test/queries/1_stateful/00016_any_if_distributed_cond_always_false.sql
-%%DATADIR%%-test/queries/1_stateful/00017_aggregation_uninitialized_memory.reference
-%%DATADIR%%-test/queries/1_stateful/00017_aggregation_uninitialized_memory.sql
-%%DATADIR%%-test/queries/1_stateful/00020_distinct_order_by_distributed.reference
-%%DATADIR%%-test/queries/1_stateful/00020_distinct_order_by_distributed.sql
-%%DATADIR%%-test/queries/1_stateful/00021_1_select_with_in.reference
-%%DATADIR%%-test/queries/1_stateful/00021_1_select_with_in.sql
-%%DATADIR%%-test/queries/1_stateful/00021_2_select_with_in.reference
-%%DATADIR%%-test/queries/1_stateful/00021_2_select_with_in.sql
-%%DATADIR%%-test/queries/1_stateful/00021_3_select_with_in.reference
-%%DATADIR%%-test/queries/1_stateful/00021_3_select_with_in.sql
-%%DATADIR%%-test/queries/1_stateful/00022_merge_prewhere.reference
-%%DATADIR%%-test/queries/1_stateful/00022_merge_prewhere.sql
-%%DATADIR%%-test/queries/1_stateful/00023_totals_limit.reference
-%%DATADIR%%-test/queries/1_stateful/00023_totals_limit.sql
-%%DATADIR%%-test/queries/1_stateful/00024_random_counters.reference
-%%DATADIR%%-test/queries/1_stateful/00024_random_counters.sql
-%%DATADIR%%-test/queries/1_stateful/00030_array_enumerate_uniq.reference
-%%DATADIR%%-test/queries/1_stateful/00030_array_enumerate_uniq.sql
-%%DATADIR%%-test/queries/1_stateful/00031_array_enumerate_uniq.reference
-%%DATADIR%%-test/queries/1_stateful/00031_array_enumerate_uniq.sql
-%%DATADIR%%-test/queries/1_stateful/00032_aggregate_key64.reference
-%%DATADIR%%-test/queries/1_stateful/00032_aggregate_key64.sql
-%%DATADIR%%-test/queries/1_stateful/00033_aggregate_key_string.reference
-%%DATADIR%%-test/queries/1_stateful/00033_aggregate_key_string.sql
-%%DATADIR%%-test/queries/1_stateful/00034_aggregate_key_fixed_string.reference
-%%DATADIR%%-test/queries/1_stateful/00034_aggregate_key_fixed_string.sql
-%%DATADIR%%-test/queries/1_stateful/00035_aggregate_keys128.reference
-%%DATADIR%%-test/queries/1_stateful/00035_aggregate_keys128.sql
-%%DATADIR%%-test/queries/1_stateful/00036_aggregate_hashed.reference
-%%DATADIR%%-test/queries/1_stateful/00036_aggregate_hashed.sql
-%%DATADIR%%-test/queries/1_stateful/00037_uniq_state_merge1.reference
-%%DATADIR%%-test/queries/1_stateful/00037_uniq_state_merge1.sql
-%%DATADIR%%-test/queries/1_stateful/00038_uniq_state_merge2.reference
-%%DATADIR%%-test/queries/1_stateful/00038_uniq_state_merge2.sql
-%%DATADIR%%-test/queries/1_stateful/00039_primary_key.reference
-%%DATADIR%%-test/queries/1_stateful/00039_primary_key.sql
-%%DATADIR%%-test/queries/1_stateful/00040_aggregating_materialized_view.reference
-%%DATADIR%%-test/queries/1_stateful/00040_aggregating_materialized_view.sql
-%%DATADIR%%-test/queries/1_stateful/00041_aggregating_materialized_view.reference
-%%DATADIR%%-test/queries/1_stateful/00041_aggregating_materialized_view.sql
-%%DATADIR%%-test/queries/1_stateful/00042_any_left_join.reference
-%%DATADIR%%-test/queries/1_stateful/00042_any_left_join.sql
-%%DATADIR%%-test/queries/1_stateful/00043_any_left_join.reference
-%%DATADIR%%-test/queries/1_stateful/00043_any_left_join.sql
-%%DATADIR%%-test/queries/1_stateful/00044_any_left_join_string.reference
-%%DATADIR%%-test/queries/1_stateful/00044_any_left_join_string.sql
-%%DATADIR%%-test/queries/1_stateful/00045_uniq_upto.reference
-%%DATADIR%%-test/queries/1_stateful/00045_uniq_upto.sql
-%%DATADIR%%-test/queries/1_stateful/00046_uniq_upto_distributed.reference
-%%DATADIR%%-test/queries/1_stateful/00046_uniq_upto_distributed.sql
-%%DATADIR%%-test/queries/1_stateful/00047_bar.reference
-%%DATADIR%%-test/queries/1_stateful/00047_bar.sql
-%%DATADIR%%-test/queries/1_stateful/00048_min_max.reference
-%%DATADIR%%-test/queries/1_stateful/00048_min_max.sql
-%%DATADIR%%-test/queries/1_stateful/00049_max_string_if.reference
-%%DATADIR%%-test/queries/1_stateful/00049_max_string_if.sql
-%%DATADIR%%-test/queries/1_stateful/00050_min_max.reference
-%%DATADIR%%-test/queries/1_stateful/00050_min_max.sql
-%%DATADIR%%-test/queries/1_stateful/00051_min_max_array.reference
-%%DATADIR%%-test/queries/1_stateful/00051_min_max_array.sql
-%%DATADIR%%-test/queries/1_stateful/00052_group_by_in.reference
-%%DATADIR%%-test/queries/1_stateful/00052_group_by_in.sql
-%%DATADIR%%-test/queries/1_stateful/00053_replicate_segfault.reference
-%%DATADIR%%-test/queries/1_stateful/00053_replicate_segfault.sql
-%%DATADIR%%-test/queries/1_stateful/00054_merge_tree_partitions.reference
-%%DATADIR%%-test/queries/1_stateful/00054_merge_tree_partitions.sql
-%%DATADIR%%-test/queries/1_stateful/00055_index_and_not.reference
-%%DATADIR%%-test/queries/1_stateful/00055_index_and_not.sql
-%%DATADIR%%-test/queries/1_stateful/00056_view.reference
-%%DATADIR%%-test/queries/1_stateful/00056_view.sql
-%%DATADIR%%-test/queries/1_stateful/00059_merge_sorting_empty_array_joined.reference
-%%DATADIR%%-test/queries/1_stateful/00059_merge_sorting_empty_array_joined.sql
-%%DATADIR%%-test/queries/1_stateful/00060_move_to_prewhere_and_sets.reference
-%%DATADIR%%-test/queries/1_stateful/00060_move_to_prewhere_and_sets.sql
-%%DATADIR%%-test/queries/1_stateful/00061_storage_buffer.reference
-%%DATADIR%%-test/queries/1_stateful/00061_storage_buffer.sql
-%%DATADIR%%-test/queries/1_stateful/00062_loyalty.reference
-%%DATADIR%%-test/queries/1_stateful/00062_loyalty.sql
-%%DATADIR%%-test/queries/1_stateful/00063_loyalty_joins.reference
-%%DATADIR%%-test/queries/1_stateful/00063_loyalty_joins.sql
-%%DATADIR%%-test/queries/1_stateful/00065_loyalty_with_storage_join.reference
-%%DATADIR%%-test/queries/1_stateful/00065_loyalty_with_storage_join.sql
-%%DATADIR%%-test/queries/1_stateful/00066_sorting_distributed_many_replicas.reference
-%%DATADIR%%-test/queries/1_stateful/00066_sorting_distributed_many_replicas.sql
-%%DATADIR%%-test/queries/1_stateful/00067_union_all.reference
-%%DATADIR%%-test/queries/1_stateful/00067_union_all.sql
-%%DATADIR%%-test/queries/1_stateful/00068_subquery_in_prewhere.reference
-%%DATADIR%%-test/queries/1_stateful/00068_subquery_in_prewhere.sql
-%%DATADIR%%-test/queries/1_stateful/00069_duplicate_aggregation_keys.reference
-%%DATADIR%%-test/queries/1_stateful/00069_duplicate_aggregation_keys.sql
-%%DATADIR%%-test/queries/1_stateful/00071_merge_tree_optimize_aio.reference
-%%DATADIR%%-test/queries/1_stateful/00071_merge_tree_optimize_aio.sql
-%%DATADIR%%-test/queries/1_stateful/00072_compare_date_and_string_index.reference
-%%DATADIR%%-test/queries/1_stateful/00072_compare_date_and_string_index.sql
-%%DATADIR%%-test/queries/1_stateful/00073_uniq_array.reference
-%%DATADIR%%-test/queries/1_stateful/00073_uniq_array.sql
-%%DATADIR%%-test/queries/1_stateful/00074_full_join.reference
-%%DATADIR%%-test/queries/1_stateful/00074_full_join.sql
-%%DATADIR%%-test/queries/1_stateful/00075_left_array_join.reference
-%%DATADIR%%-test/queries/1_stateful/00075_left_array_join.sql
-%%DATADIR%%-test/queries/1_stateful/00076_system_columns_bytes.reference
-%%DATADIR%%-test/queries/1_stateful/00076_system_columns_bytes.sql
-%%DATADIR%%-test/queries/1_stateful/00077_log_tinylog_stripelog.reference
-%%DATADIR%%-test/queries/1_stateful/00077_log_tinylog_stripelog.sql
-%%DATADIR%%-test/queries/1_stateful/00078_group_by_arrays.reference
-%%DATADIR%%-test/queries/1_stateful/00078_group_by_arrays.sql
-%%DATADIR%%-test/queries/1_stateful/00079_array_join_not_used_joined_column.reference
-%%DATADIR%%-test/queries/1_stateful/00079_array_join_not_used_joined_column.sql
-%%DATADIR%%-test/queries/1_stateful/00080_array_join_and_union.reference
-%%DATADIR%%-test/queries/1_stateful/00080_array_join_and_union.sql
-%%DATADIR%%-test/queries/1_stateful/00081_group_by_without_key_and_totals.reference
-%%DATADIR%%-test/queries/1_stateful/00081_group_by_without_key_and_totals.sql
-%%DATADIR%%-test/queries/1_stateful/00082_quantiles.reference
-%%DATADIR%%-test/queries/1_stateful/00082_quantiles.sql
-%%DATADIR%%-test/queries/1_stateful/00083_array_filter.reference
-%%DATADIR%%-test/queries/1_stateful/00083_array_filter.sql
-%%DATADIR%%-test/queries/1_stateful/00084_external_aggregation.reference
-%%DATADIR%%-test/queries/1_stateful/00084_external_aggregation.sql
-%%DATADIR%%-test/queries/1_stateful/00085_monotonic_evaluation_segfault.reference
-%%DATADIR%%-test/queries/1_stateful/00085_monotonic_evaluation_segfault.sql
-%%DATADIR%%-test/queries/1_stateful/00086_array_reduce.reference
-%%DATADIR%%-test/queries/1_stateful/00086_array_reduce.sql
-%%DATADIR%%-test/queries/1_stateful/00087_where_0.reference
-%%DATADIR%%-test/queries/1_stateful/00087_where_0.sql
-%%DATADIR%%-test/queries/1_stateful/00088_global_in_one_shard_and_rows_before_limit.reference
-%%DATADIR%%-test/queries/1_stateful/00088_global_in_one_shard_and_rows_before_limit.sql
-%%DATADIR%%-test/queries/1_stateful/00089_position_functions_with_non_constant_arg.reference
-%%DATADIR%%-test/queries/1_stateful/00089_position_functions_with_non_constant_arg.sql
-%%DATADIR%%-test/queries/1_stateful/00090_thread_pool_deadlock.reference
-%%DATADIR%%-test/queries/1_stateful/00090_thread_pool_deadlock.sh
-%%DATADIR%%-test/queries/1_stateful/00091_prewhere_two_conditions.reference
-%%DATADIR%%-test/queries/1_stateful/00091_prewhere_two_conditions.sql
-%%DATADIR%%-test/queries/1_stateful/00092_obfuscator.reference
-%%DATADIR%%-test/queries/1_stateful/00092_obfuscator.sh
-%%DATADIR%%-test/queries/1_stateful/00093_prewhere_array_join.reference
-%%DATADIR%%-test/queries/1_stateful/00093_prewhere_array_join.sql
-%%DATADIR%%-test/queries/1_stateful/00094_order_by_array_join_limit.reference
-%%DATADIR%%-test/queries/1_stateful/00094_order_by_array_join_limit.sql
-%%DATADIR%%-test/queries/1_stateful/00095_hyperscan_profiler.reference
-%%DATADIR%%-test/queries/1_stateful/00095_hyperscan_profiler.sql
-%%DATADIR%%-test/queries/1_stateful/00139_like.reference
-%%DATADIR%%-test/queries/1_stateful/00139_like.sql
-%%DATADIR%%-test/queries/1_stateful/00140_rename.reference
-%%DATADIR%%-test/queries/1_stateful/00140_rename.sql
-%%DATADIR%%-test/queries/1_stateful/00141_transform.reference
-%%DATADIR%%-test/queries/1_stateful/00141_transform.sql
-%%DATADIR%%-test/queries/1_stateful/00142_system_columns.reference
-%%DATADIR%%-test/queries/1_stateful/00142_system_columns.sql
-%%DATADIR%%-test/queries/1_stateful/00143_transform_non_const_default.reference
-%%DATADIR%%-test/queries/1_stateful/00143_transform_non_const_default.sql
-%%DATADIR%%-test/queries/1_stateful/00144_functions_of_aggregation_states.reference
-%%DATADIR%%-test/queries/1_stateful/00144_functions_of_aggregation_states.sql
-%%DATADIR%%-test/queries/1_stateful/00145_aggregate_functions_statistics.reference
-%%DATADIR%%-test/queries/1_stateful/00145_aggregate_functions_statistics.sql
-%%DATADIR%%-test/queries/1_stateful/00146_aggregate_function_uniq.reference
-%%DATADIR%%-test/queries/1_stateful/00146_aggregate_function_uniq.sql
-%%DATADIR%%-test/queries/1_stateful/00147_global_in_aggregate_function.reference
-%%DATADIR%%-test/queries/1_stateful/00147_global_in_aggregate_function.sql
-%%DATADIR%%-test/queries/1_stateful/00148_monotonic_functions_and_index.reference
-%%DATADIR%%-test/queries/1_stateful/00148_monotonic_functions_and_index.sql
-%%DATADIR%%-test/queries/1_stateful/00149_quantiles_timing_distributed.reference
-%%DATADIR%%-test/queries/1_stateful/00149_quantiles_timing_distributed.sql
-%%DATADIR%%-test/queries/1_stateful/00150_quantiles_timing_precision.reference
-%%DATADIR%%-test/queries/1_stateful/00150_quantiles_timing_precision.sql
-%%DATADIR%%-test/queries/1_stateful/00151_order_by_read_in_order.reference
-%%DATADIR%%-test/queries/1_stateful/00151_order_by_read_in_order.sql
-%%DATADIR%%-test/queries/1_stateful/00151_replace_partition_with_different_granularity.reference
-%%DATADIR%%-test/queries/1_stateful/00151_replace_partition_with_different_granularity.sql
-%%DATADIR%%-test/queries/1_stateful/00152_insert_different_granularity.reference
-%%DATADIR%%-test/queries/1_stateful/00152_insert_different_granularity.sql
-%%DATADIR%%-test/queries/1_stateful/00153_aggregate_arena_race.reference
-%%DATADIR%%-test/queries/1_stateful/00153_aggregate_arena_race.sql
-%%DATADIR%%-test/queries/1_stateful/00154_avro.reference
-%%DATADIR%%-test/queries/1_stateful/00154_avro.sql
-%%DATADIR%%-test/queries/1_stateful/00156_max_execution_speed_sample_merge.reference
-%%DATADIR%%-test/queries/1_stateful/00156_max_execution_speed_sample_merge.sql
-%%DATADIR%%-test/queries/1_stateful/00157_cache_dictionary.reference
-%%DATADIR%%-test/queries/1_stateful/00157_cache_dictionary.sql
-%%DATADIR%%-test/queries/1_stateful/00158_cache_dictionary_has.reference
-%%DATADIR%%-test/queries/1_stateful/00158_cache_dictionary_has.sql
-%%DATADIR%%-test/queries/1_stateful/00159_parallel_formatting_csv_and_friends.reference
-%%DATADIR%%-test/queries/1_stateful/00159_parallel_formatting_csv_and_friends.sh
-%%DATADIR%%-test/queries/1_stateful/00159_parallel_formatting_http.reference
-%%DATADIR%%-test/queries/1_stateful/00159_parallel_formatting_http.sh
-%%DATADIR%%-test/queries/1_stateful/00159_parallel_formatting_json_and_friends.reference
-%%DATADIR%%-test/queries/1_stateful/00159_parallel_formatting_json_and_friends.sh
-%%DATADIR%%-test/queries/1_stateful/00159_parallel_formatting_tsv_and_friends.reference
-%%DATADIR%%-test/queries/1_stateful/00159_parallel_formatting_tsv_and_friends.sh
-%%DATADIR%%-test/queries/1_stateful/00160_decode_xml_component.reference
-%%DATADIR%%-test/queries/1_stateful/00160_decode_xml_component.sql
-%%DATADIR%%-test/queries/1_stateful/00161_parallel_parsing_with_names.reference
-%%DATADIR%%-test/queries/1_stateful/00161_parallel_parsing_with_names.sh
-%%DATADIR%%-test/queries/1_stateful/00162_mmap_compression_none.reference
-%%DATADIR%%-test/queries/1_stateful/00162_mmap_compression_none.sql
-%%DATADIR%%-test/queries/1_stateful/00163_column_oriented_formats.reference
-%%DATADIR%%-test/queries/1_stateful/00163_column_oriented_formats.sh
-%%DATADIR%%-test/queries/1_stateful/00164_quantileBfloat16.reference
-%%DATADIR%%-test/queries/1_stateful/00164_quantileBfloat16.sql
-%%DATADIR%%-test/queries/__init__.py
-%%DATADIR%%-test/queries/bugs/01060_defaults_all_columns.reference
-%%DATADIR%%-test/queries/bugs/01133_max_result_rows.reference
-%%DATADIR%%-test/queries/bugs/01133_max_result_rows.sql
-%%DATADIR%%-test/queries/bugs/01482_move_to_prewhere_and_cast.reference
-%%DATADIR%%-test/queries/bugs/01482_move_to_prewhere_and_cast.sql
-%%DATADIR%%-test/queries/bugs/missing_scalar_subquery_removal.sql
-%%DATADIR%%-test/queries/bugs/position_case_insensitive_utf8.sql
-%%DATADIR%%-test/queries/conftest.py
-%%DATADIR%%-test/queries/pytest.ini
-%%DATADIR%%-test/queries/query_test.py
-%%DATADIR%%-test/queries/server.py
+%%DATADIR%%-test/queries/0_stateless/02015_async_inserts_4.reference
+%%DATADIR%%-test/queries/0_stateless/01001_rename_merge_race_condition.sh
+%%DATADIR%%-test/queries/0_stateless/01802_formatDateTime_DateTime64_century.sql
+%%DATADIR%%-test/queries/0_stateless/00608_uniq_array.reference
+%%DATADIR%%-test/queries/0_stateless/00712_prewhere_with_alias.reference
+%%DATADIR%%-test/queries/0_stateless/00919_histogram_merge.sql
+%%DATADIR%%-test/queries/0_stateless/01160_table_dependencies.reference
+%%DATADIR%%-test/queries/0_stateless/00900_long_parquet.reference
+%%DATADIR%%-test/queries/0_stateless/00502_sum_map.reference
+%%DATADIR%%-test/queries/0_stateless/01514_empty_buffer_different_types.sql
+%%DATADIR%%-test/queries/0_stateless/00101_materialized_views_and_insert_without_explicit_database.sql
+%%DATADIR%%-test/queries/0_stateless/00698_validate_array_sizes_for_nested_kshvakov.sql
+%%DATADIR%%-test/queries/0_stateless/01709_inactive_parts_to_throw_insert.reference
+%%DATADIR%%-test/queries/0_stateless/02097_json_strings_deserialization.sh
+%%DATADIR%%-test/queries/0_stateless/01632_tinylog_read_write.sh
+%%DATADIR%%-test/queries/0_stateless/00968_file_engine_in_subquery.reference
+%%DATADIR%%-test/queries/0_stateless/00652_mergetree_mutations.reference
+%%DATADIR%%-test/queries/0_stateless/01600_remerge_sort_lowered_memory_bytes_ratio.sql
+%%DATADIR%%-test/queries/0_stateless/01256_negative_generate_random.reference
+%%DATADIR%%-test/queries/0_stateless/01034_prewhere_max_parallel_replicas_distributed.reference
+%%DATADIR%%-test/queries/0_stateless/01271_show_privileges.reference
+%%DATADIR%%-test/queries/0_stateless/01213_alter_rename_compact_part.reference
+%%DATADIR%%-test/queries/0_stateless/01911_logical_error_minus.sql
+%%DATADIR%%-test/queries/0_stateless/00349_visible_width.sql
+%%DATADIR%%-test/queries/0_stateless/01354_order_by_tuple_collate_const.reference
+%%DATADIR%%-test/queries/0_stateless/00982_array_enumerate_uniq_ranked.reference
+%%DATADIR%%-test/queries/0_stateless/02176_toStartOfWeek_overflow_pruning.reference
+%%DATADIR%%-test/queries/0_stateless/00974_distributed_join_on.reference
+%%DATADIR%%-test/queries/0_stateless/01442_merge_detach_attach_long.reference
+%%DATADIR%%-test/queries/0_stateless/01820_unhex_case_insensitive.sql
+%%DATADIR%%-test/queries/0_stateless/02014_query_parameters.reference
+%%DATADIR%%-test/queries/0_stateless/00953_moving_functions.reference
+%%DATADIR%%-test/queries/0_stateless/01421_array_nullable_element_nullable_index.reference
+%%DATADIR%%-test/queries/0_stateless/01398_any_with_alias.reference
+%%DATADIR%%-test/queries/0_stateless/00041_aggregation_remap.reference
+%%DATADIR%%-test/queries/0_stateless/02112_delayed_clickhouse_local.reference
+%%DATADIR%%-test/config/test_function.xml
+%%DATADIR%%-test/config/top_level_domains/no_new_line_list.dat
+%%DATADIR%%-test/config/users.d/filelog.xml
+%%DATADIR%%-test/config/users.d/memory_profiler.xml
+%%DATADIR%%-test/config/users.d/no_fsync_metadata.xml
+%%DATADIR%%-test/config/users.d/session_log_test.xml
+%%DATADIR%%-test/performance/aggregation_in_order_2.xml
+%%DATADIR%%-test/performance/decimal_format.xml
+%%DATADIR%%-test/performance/dict_join.xml
+%%DATADIR%%-test/performance/explain_ast.xml
+%%DATADIR%%-test/performance/hashed_array_dictionary.xml
+%%DATADIR%%-test/performance/jit_aggregate_functions.xml
+%%DATADIR%%-test/performance/lot_of_subcolumns.xml
+%%DATADIR%%-test/performance/nlp.xml
+%%DATADIR%%-test/performance/normalize_utf8.xml
+%%DATADIR%%-test/performance/sequence_match.xml
+%%DATADIR%%-test/performance/short_circuit_functions.xml
+%%DATADIR%%-test/performance/sparse_column.xml
+%%DATADIR%%-test/performance/tsv_csv_nullable_parsing.xml
+%%DATADIR%%-test/performance/writing_valid_utf8.xml
 %%DATADIR%%-test/queries/shell_config.sh
-%%DATADIR%%-test/queries/skip_list.json
 @dir /var/db/clickhouse
 @dir /var/log/clickhouse
 @dir /var/run/clickhouse
diff --git a/databases/closql-devel/Makefile b/databases/closql-devel/Makefile
new file mode 100644
index 000000000000..25d795ab4830
--- /dev/null
+++ b/databases/closql-devel/Makefile
@@ -0,0 +1,47 @@
+PORTNAME=	closql
+DISTVERSIONPREFIX=	v
+DISTVERSION=	1.2.1-39
+PORTREVISION=	1
+DISTVERSIONSUFFIX=	-g81f04f6
+CATEGORIES=	databases elisp
+PKGNAMESUFFIX=	-devel${EMACS_PKGNAMESUFFIX}
+
+MAINTAINER=	yasu@FreeBSD.org
+COMMENT=	Store EIEIO objects using EmacSQL
+WWW=		https://github.com/magit/closql
+
+LICENSE=	GPLv3+
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
+BUILD_DEPENDS=	compat.el${EMACS_PKGNAMESUFFIX}>=29.1.4.2:misc/compat.el@${EMACS_FLAVOR} \
+		emacsql-devel${EMACS_PKGNAMESUFFIX}>=3.1.1:databases/emacsql-devel@${EMACS_FLAVOR}
+RUN_DEPENDS=	compat.el${EMACS_PKGNAMESUFFIX}>=29.1.4.2:misc/compat.el@${EMACS_FLAVOR} \
+		emacsql-devel${EMACS_PKGNAMESUFFIX}>=3.1.1:databases/emacsql-devel@${EMACS_FLAVOR}
+
+USES=		emacs gmake
+USE_GITHUB=	yes
+GH_ACCOUNT=	magit
+
+MAKE_ENV+=	LOAD_PATH="${LOAD_PATH}"
+
+CONFLICTS_INSTALL=	closql closql-emacs_* # share/doc/closql/README.md
+
+NO_ARCH=	yes
+
+PORTDOCS=	README.org
+
+OPTIONS_DEFINE=	DOCS
+
+LOAD_PATH=	-L ${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/compat -L \
+		${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/emacsql
+
+do-install:
+	${MKDIR} ${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}
+	(cd ${WRKSRC} && ${INSTALL_DATA} *.el* \
+	   ${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR})
+
+do-install-DOCS-on:
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/README.org ${STAGEDIR}${DOCSDIR}
+
+.include <bsd.port.mk>
diff --git a/databases/closql-devel/distinfo b/databases/closql-devel/distinfo
new file mode 100644
index 000000000000..0a38f83ff338
--- /dev/null
+++ b/databases/closql-devel/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1709244722
+SHA256 (magit-closql-v1.2.1-39-g81f04f6_GH0.tar.gz) = 40de1fc820181c9fade61bddbbd4e2e51394b84de4f2f4d173a39d97c9e92a62
+SIZE (magit-closql-v1.2.1-39-g81f04f6_GH0.tar.gz) = 21786
diff --git a/databases/closql-devel/pkg-descr b/databases/closql-devel/pkg-descr
new file mode 100644
index 000000000000..a659e7d8aa15
--- /dev/null
+++ b/databases/closql-devel/pkg-descr
@@ -0,0 +1,5 @@
+Store uniform EIEIO objects in an EmacSQL database. SQLite is used as
+backend. This library imposes some restrictions on what kind of
+objects can be stored; it isn't intended to store arbitrary
+objects. All objects have to share a common superclass and subclasses
+cannot add any additional instance slots.
diff --git a/databases/closql-devel/pkg-plist b/databases/closql-devel/pkg-plist
new file mode 100644
index 000000000000..34f8553a160e
--- /dev/null
+++ b/databases/closql-devel/pkg-plist
@@ -0,0 +1,3 @@
+%%EMACS_VERSION_SITE_LISPDIR%%/closql-autoloads.el
+%%EMACS_VERSION_SITE_LISPDIR%%/closql.el
+%%EMACS_VERSION_SITE_LISPDIR%%/closql.elc
diff --git a/databases/closql/Makefile b/databases/closql/Makefile
index ee9061110df7..4a439a818034 100644
--- a/databases/closql/Makefile
+++ b/databases/closql/Makefile
@@ -1,11 +1,13 @@
 PORTNAME=	closql
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.0.6
+DISTVERSION=	1.2.1
+PORTREVISION=	8
 CATEGORIES=	databases elisp
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
-MAINTAINER=	yasu@utahime.org
+MAINTAINER=	yasu@FreeBSD.org
 COMMENT=	Store EIEIO objects using EmacSQL
+WWW=		https://github.com/magit/closql
 
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/LICENSE
@@ -15,7 +17,9 @@ RUN_DEPENDS=	emacsql${EMACS_PKGNAMESUFFIX}>=3.0.0:databases/emacsql@${EMACS_FLAV
 
 USES=		emacs
 USE_GITHUB=	yes
-GH_ACCOUNT=	emacscollective
+GH_ACCOUNT=	magit
+
+CONFLICTS_INSTALL=	closql closql-devel* closql-emacs_*
 
 NO_ARCH=	yes
 
diff --git a/databases/closql/distinfo b/databases/closql/distinfo
index 3b284cc9c6b9..9f0d227def69 100644
--- a/databases/closql/distinfo
+++ b/databases/closql/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1623898447
-SHA256 (emacscollective-closql-v1.0.6_GH0.tar.gz) = 7fadcadd52f86c30189372b5d07f4d1dde108e25158c5e1d422d37ef7414597d
-SIZE (emacscollective-closql-v1.0.6_GH0.tar.gz) = 20680
+TIMESTAMP = 1663525345
+SHA256 (magit-closql-v1.2.1_GH0.tar.gz) = 3f058e21c1b381b28f45b39da15df48a55a59200252df9c3aa55a060625b2e6b
+SIZE (magit-closql-v1.2.1_GH0.tar.gz) = 20830
diff --git a/databases/closql/pkg-descr b/databases/closql/pkg-descr
index e6f2d6731b5c..a659e7d8aa15 100644
--- a/databases/closql/pkg-descr
+++ b/databases/closql/pkg-descr
@@ -3,5 +3,3 @@ backend. This library imposes some restrictions on what kind of
 objects can be stored; it isn't intended to store arbitrary
 objects. All objects have to share a common superclass and subclasses
 cannot add any additional instance slots.
-
-WWW: https://github.com/emacscollective/closql
diff --git a/databases/cockroach/Makefile b/databases/cockroach/Makefile
index c4576b2646ec..65e456d9af8b 100644
--- a/databases/cockroach/Makefile
+++ b/databases/cockroach/Makefile
@@ -1,22 +1,24 @@
 PORTNAME=	cockroach
 DISTVERSIONPREFIX=	v
 DISTVERSION=	19.1.11
+PORTREVISION=	19
 CATEGORIES=	databases
 MASTER_SITES=	https://binaries.cockroachdb.com/
 EXTRACT_SUFX=	.src.tgz
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	vishwin@FreeBSD.org
 COMMENT=	Cloud-native SQL database that survive disasters
+WWW=		https://www.cockroachlabs.com/
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/src/github.com/cockroachdb/cockroach/LICENSE
 
 ONLY_FOR_ARCHS=	amd64
-ONLY_FOR_ARCHS_REASON=	"A 64-bit system is strongly recommended"
+ONLY_FOR_ARCHS_REASON=	64-bit system is strongly recommended
 
 BUILD_DEPENDS=	autoconf:devel/autoconf \
 		bash:shells/bash \
-		cmake:devel/cmake
+		cmake:devel/cmake-core
 
 USES=		gmake go libedit
 
diff --git a/databases/cockroach/files/patch-src_github.com_cockroachdb_cockroach_c-deps_rocksdb_db_compaction__iteration__stats.h b/databases/cockroach/files/patch-src_github.com_cockroachdb_cockroach_c-deps_rocksdb_db_compaction__iteration__stats.h
new file mode 100644
index 000000000000..972eb51150c9
--- /dev/null
+++ b/databases/cockroach/files/patch-src_github.com_cockroachdb_cockroach_c-deps_rocksdb_db_compaction__iteration__stats.h
@@ -0,0 +1,8 @@
+--- src/github.com/cockroachdb/cockroach/c-deps/rocksdb/db/compaction_iteration_stats.h.orig	2020-06-29 21:13:41 UTC
++++ src/github.com/cockroachdb/cockroach/c-deps/rocksdb/db/compaction_iteration_stats.h
+@@ -1,3 +1,5 @@
++#include <cstdint>
++
+ //  Copyright (c) 2016-present, Facebook, Inc.  All rights reserved.
+ //  This source code is licensed under both the GPLv2 (found in the
+ //  COPYING file in the root directory) and Apache 2.0 License
diff --git a/databases/cockroach/files/patch-src_github.com_cockroachdb_cockroach_c-deps_rocksdb_include_rocksdb_utilities_checkpoint.h b/databases/cockroach/files/patch-src_github.com_cockroachdb_cockroach_c-deps_rocksdb_include_rocksdb_utilities_checkpoint.h
new file mode 100644
index 000000000000..8bdff4892d2d
--- /dev/null
+++ b/databases/cockroach/files/patch-src_github.com_cockroachdb_cockroach_c-deps_rocksdb_include_rocksdb_utilities_checkpoint.h
@@ -0,0 +1,10 @@
+--- src/github.com/cockroachdb/cockroach/c-deps/rocksdb/include/rocksdb/utilities/checkpoint.h.orig	2020-06-29 21:13:41 UTC
++++ src/github.com/cockroachdb/cockroach/c-deps/rocksdb/include/rocksdb/utilities/checkpoint.h
+@@ -9,6 +9,7 @@
+ #ifndef ROCKSDB_LITE
+ 
+ #include <string>
++#include <cstdint>
+ #include "rocksdb/status.h"
+ 
+ namespace rocksdb {
diff --git a/databases/cockroach/files/patch-src_github.com_cockroachdb_cockroach_c-deps_rocksdb_table_data__block__hash__index.h b/databases/cockroach/files/patch-src_github.com_cockroachdb_cockroach_c-deps_rocksdb_table_data__block__hash__index.h
new file mode 100644
index 000000000000..322ac1f1de5d
--- /dev/null
+++ b/databases/cockroach/files/patch-src_github.com_cockroachdb_cockroach_c-deps_rocksdb_table_data__block__hash__index.h
@@ -0,0 +1,10 @@
+--- src/github.com/cockroachdb/cockroach/c-deps/rocksdb/table/data_block_hash_index.h.orig	2020-06-29 21:13:41 UTC
++++ src/github.com/cockroachdb/cockroach/c-deps/rocksdb/table/data_block_hash_index.h
+@@ -7,6 +7,7 @@
+ 
+ #include <string>
+ #include <vector>
++#include <cstdint>
+ 
+ #include "rocksdb/slice.h"
+ 
diff --git a/databases/cockroach/pkg-descr b/databases/cockroach/pkg-descr
index ae9643d6b04a..d20f71e42a07 100644
--- a/databases/cockroach/pkg-descr
+++ b/databases/cockroach/pkg-descr
@@ -7,5 +7,3 @@ API for structuring, manipulating, and querying data.
 
 CockroachDB is inspired by Google's Spanner and F1 technologies, and
 it's completely open source.
-
-WWW: https://www.cockroachlabs.com/
diff --git a/databases/couchdb3/Makefile b/databases/couchdb3/Makefile
index 9483ebc41aff..7f02129a4245 100644
--- a/databases/couchdb3/Makefile
+++ b/databases/couchdb3/Makefile
@@ -1,60 +1,61 @@
 PORTNAME=	couchdb3
-DISTVERSION=	3.1.1
-PORTREVISION=	4
+DISTVERSION=	3.3.3
+PORTREVISION=	1
 CATEGORIES=	databases
 MASTER_SITES=	APACHE/couchdb/source/${DISTVERSION}
 DISTNAME=	apache-couchdb-${DISTVERSION}
 
 MAINTAINER=	dch@FreeBSD.org
-COMMENT=	JSON document database with HTTP API and scalable multi-master sync
+COMMENT=	JSON document database with HTTP API and scalable cluster mesh sync
+WWW=		https://couchdb.apache.org/
 
-LICENSE=	APACHE20 BSD3CLAUSE ISCL WTFPL OFL11
+LICENSE=	APACHE20 BSD3CLAUSE ISCL OFL11 WTFPL
 LICENSE_COMB=	multi
 
-DEPRECATED=	Uses EOL Python 2.7 via lang/spidermonkey60
-EXPIRATION_DATE=2021-06-23
-
-BUILD_DEPENDS=	rebar:devel/rebar \
-		erlang-runtime22>=22.0:lang/erlang-runtime22
+BUILD_DEPENDS=	erlang-runtime${_ERLVER}>=${_ERLVER}.0:lang/erlang-runtime${_ERLVER} \
+		rebar:devel/rebar
 LIB_DEPENDS=	libicudata.so:devel/icu \
-		libmozjs-60.so:lang/spidermonkey60
-RUN_DEPENDS=	erlang-runtime22>=22.0:lang/erlang-runtime22
+		libmozjs-91.so:lang/spidermonkey91
+RUN_DEPENDS=	erlang-runtime${_ERLVER}>=${_ERLVER}.0:lang/erlang-runtime${_ERLVER}
 
-USES=		compiler:c++14-lang cpe gmake libtool ncurses
+USES=		compiler:c++17-lang cpe gmake libtool ncurses
+CPE_VENDOR=	apache
+CPE_PRODUCT=	couchdb
 USE_RC_SUBR=	${PORTNAME}
 
-CONFLICTS=	couchdb[24]*
+HAS_CONFIGURE=	yes
+CONFIGURE_ARGS=	--skip-deps \
+		--user ${USERS} \
+		--rebar ${LOCALBASE}/bin/rebar \
+		--spidermonkey-version 91
 
-CPE_VENDOR=	apache
-CPE_PRODUCT=	couchdb
+MAKE_ENV=	PATH=${LOCALBASE}/lib/erlang${_ERLVER}/bin:${PATH}
+ALL_TARGET=	release
 
-USERS=		couchdb
-GROUPS=		couchdb
+CONFLICTS=	couchdb[24]*
 
 SUB_FILES=	pkg-message
-SUB_LIST=	APPDIR=${APPDIR} \
-		ERL_PATH=${LOCALBASE}/lib/erlang22/bin/erl \
+SUB_LIST=	APPDIR=${_APPDIR} \
+		ERL_PATH=${LOCALBASE}/lib/erlang${_ERLVER}/bin/erl \
 		PORTNAME=${PORTNAME} \
-		RELDIR=${RELDIR} \
+		RELDIR=${_RELDIR} \
 		WWWDIR=${WWWDIR}
-PLIST_SUB=	VERSION=${DISTVERSION}
-
-HAS_CONFIGURE=	yes
-CONFIGURE_ARGS=	--skip-deps --user ${USERS} --rebar ${LOCALBASE}/bin/rebar \
-		--spidermonkey-version 60
 
-ALL_TARGET=	release
+USERS=		couchdb
+GROUPS=		couchdb
 
-MAKE_ENV=	PATH=${LOCALBASE}/lib/erlang22/bin:${PATH}
+PLIST_SUB=	VERSION=${DISTVERSION}
 
 OPTIONS_DEFINE=	DOCS
 OPTIONS_SUB=	yes
 
-DBDIR?=		/var/db/${PORTNAME}
-LOGDIR?=	/var/log/${PORTNAME}
-LOGFILE?=	${LOGDIR}/couch.log
-APPDIR=		${LOCALBASE}/libexec/${PORTNAME}
-RELDIR=		${APPDIR}/releases/${DISTVERSION}
+_APPDIR=	${LOCALBASE}/libexec/${PORTNAME}
+_DBDIR?=	/var/db/${PORTNAME}
+_ERLVER?=	25
+_LOGDIR?=	/var/log/${PORTNAME}
+_LOGFILE?=	${_LOGDIR}/couch.log
+_RELDIR=	${_APPDIR}/releases/${DISTVERSION}
+_RUNDIR=	/var/run/${PORTNAME}
 
 .include <bsd.port.options.mk>
 
@@ -64,52 +65,57 @@ EXTRA_PATCHES=	${PATCHDIR}/extra-patch-src_jiffy_c__src_double-conversion_strtod
 
 post-patch:
 	@${REINPLACE_CMD} \
-	    -e 's,%%APPDIR%%,${APPDIR},g' \
-	    -e 's,%%DATADIR%%,${DATADIR},g' \
-	    -e 's,%%DBDIR%%,${DBDIR},g' \
+	    -e 's,%%COUCHDB_USER%%,${USERS},g' \
+	    -e 's,%%LOG_FILE%%,${_LOGFILE},g' \
+	    -e 's,%%APPDIR%%,${_APPDIR},g' \
+	    -e 's,%%DATADIR%%,${_DATADIR},g' \
+	    -e 's,%%DBDIR%%,${_DBDIR},g' \
+	    -e 's,%%ERLVER%%,${_ERLVER},g' \
 	    -e 's,%%LOCALBASE%%,${LOCALBASE},g' \
 	    -e 's,%%PORTNAME%%,${PORTNAME},g' \
 	    -e 's,%%WWWDIR%%,${WWWDIR},g' \
-	    -e 's,$$COUCHDB_USER,${USERS},g' \
-	    -e 's,$$LOG_FILE,${LOGFILE},g' \
 	    ${WRKSRC}/configure
 # https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=238514
-.if ${OPSYS} == FreeBSD && (${OSVERSION} < 1200000 || ${ARCH} == i386)
+.if ${OPSYS} == FreeBSD && ${ARCH} == i386
 	@${REINPLACE_CMD} \
 	    -e 's,$$FLTO_FLAG ,,g' \
 	    ${WRKSRC}/src/jiffy/rebar.config
 .endif
 
 pre-install:
-	# relocate user-modifiable runtime configs to match hier(7)
+# relocate user-modifiable runtime configs to match hier(7)
 	${MKDIR} ${STAGEDIR}${ETCDIR}
 	${INSTALL_DATA} ${WRKSRC}/rel/couchdb/etc/local.ini \
 		${STAGEDIR}${ETCDIR}/local.ini.sample
 	${INSTALL_DATA} ${WRKSRC}/rel/couchdb/etc/vm.args \
 		${STAGEDIR}${ETCDIR}/vm.args.sample
 	${INSTALL_MAN} ${WRKSRC}/share/docs/man/apachecouchdb.1 \
-		${STAGEDIR}${MANPREFIX}/man/man1
-	# prune build artefacts and surplus headers
+		${STAGEDIR}${PREFIX}/share/man/man1
+# prune build artefacts and surplus headers
 	${FIND} -E ${WRKSRC} -type f \
 		-regex '.*\.(a|buildinfo|c|cc|cmd|d|o|orig|h|cpp)' -print -delete
-	# remove runtime dirs and files that were moved to match hier(7)
-	${RM} -rv ${WRKSRC}/rel/couchdb/var \
+	@${CP} ${WRKSRC}/src/docs/images/favicon.ico ${WRKSRC}/share/www/
+# remove runtime dirs and files that were moved to match hier(7)
+	${RM} -rv \
 		${WRKSRC}/rel/couchdb/etc/*.d \
 		${WRKSRC}/rel/couchdb/etc/local.ini \
 		${WRKSRC}/rel/couchdb/etc/vm.args \
+		${WRKSRC}/rel/couchdb/lib/couch-*/priv/couch*js \
 		${WRKSRC}/rel/couchdb/releases/*/vm.args \
-		${WRKSRC}/rel/couchdb/lib/couch-*/priv/couch*js
-	@${CP} ${WRKSRC}/src/docs/images/favicon.ico ${WRKSRC}/share/www/
-	(cd ${WRKSRC}/rel/couchdb && ${COPYTREE_SHARE} . ${STAGEDIR}${APPDIR})
+		${WRKSRC}/rel/couchdb/share/docs \
+		${WRKSRC}/rel/couchdb/share/www \
+		${WRKSRC}/rel/couchdb/var
+	(cd ${WRKSRC}/rel/couchdb && ${COPYTREE_SHARE} . ${STAGEDIR}${_APPDIR})
 
 post-install:
 	@${FIND} -E ${STAGEDIR} -type f \
 		\( -name couchjs -o -name *.so \) \
 		-exec ${STRIP_CMD} {} +
 	@${MKDIR} \
-		${STAGEDIR}${DBDIR} \
-		${STAGEDIR}${LOGDIR}
-	# fauxton UI is a required component
+		${STAGEDIR}${_DBDIR} \
+		${STAGEDIR}${_LOGDIR} \
+		${STAGEDIR}${_RUNDIR}
+# fauxton UI is a required component
 	(cd ${WRKSRC}/share/www && ${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR})
 
 post-install-DOCS-on:
diff --git a/databases/couchdb3/distinfo b/databases/couchdb3/distinfo
index 06b045cc3375..8725b694427a 100644
--- a/databases/couchdb3/distinfo
+++ b/databases/couchdb3/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1602945571
-SHA256 (apache-couchdb-3.1.1.tar.gz) = 8ffe766bba2ba39a7b49689a0732afacf69caffdf8e2d95447e82fb173c78ca3
-SIZE (apache-couchdb-3.1.1.tar.gz) = 19991861
+TIMESTAMP = 1702805372
+SHA256 (apache-couchdb-3.3.3.tar.gz) = 7a2007b5f673d4be22a25c9a111d9066919d872ddb9135a7dcec0122299bd39e
+SIZE (apache-couchdb-3.3.3.tar.gz) = 18899763
diff --git a/databases/couchdb3/files/couchdb3.in b/databases/couchdb3/files/couchdb3.in
index 5d59c21f7f87..af3f2e27bea2 100644
--- a/databases/couchdb3/files/couchdb3.in
+++ b/databases/couchdb3/files/couchdb3.in
@@ -44,8 +44,8 @@ erl_flags="${erl_sasl} ${erl_boot} ${erl_args} ${%%PORTNAME%%_erl_flags}"
         -t ${name} \
         -u ${%%PORTNAME%%_user} \
         env ERL_FLAGS="${erl_flags}" \
-        HOME=/var/run/couchdb \
-        ERL_CRASH_DUMP=/var/run/couchdb/erl_crash.dump \
+        HOME=/var/run/%%PORTNAME%% \
+        ERL_CRASH_DUMP=/var/run/%%PORTNAME%%/erl_crash.dump \
         COUCHDB_FAUXTON_DOCROOT=%%WWWDIR%% \
         COUCHDB_QUERY_SERVER_JAVASCRIPT="%%APPDIR%%/bin/couchjs %%APPDIR%%/share/server/main.js" \
         COUCHDB_QUERY_SERVER_COFFEESCRIPT="%%APPDIR%%/bin/couchjs %%APPDIR%%/share/server/main-coffee.js" \
diff --git a/databases/couchdb3/files/patch-configure b/databases/couchdb3/files/patch-configure
index 8895c7beadb2..c5547bc639c2 100644
--- a/databases/couchdb3/files/patch-configure
+++ b/databases/couchdb3/files/patch-configure
@@ -1,26 +1,30 @@
---- configure.orig	2018-08-18 17:55:47 UTC
+--- configure.orig	2023-01-08 13:30:40 UTC
 +++ configure
-@@ -19,7 +19,7 @@
+@@ -19,7 +19,7 @@ basename=`basename $0`
  rootdir="$(cd "${0%/*}" 2>/dev/null; echo "$PWD")"
  basename=`basename $0`
  
 -PACKAGE_AUTHOR_NAME="The Apache Software Foundation"
 +PACKAGE_AUTHOR_NAME="FreeBSD"
  
- # TEST=0
- WITH_CURL="false"
-@@ -168,10 +168,10 @@ cat > rel/couchdb.config << EOF
+ REBAR3_BRANCH="main"
+ 
+@@ -247,12 +247,12 @@ cat > rel/couchdb.config << EOF
+ % The contents of this file are auto-generated by configure
  %
  {package_author_name, "$PACKAGE_AUTHOR_NAME"}.
 -{prefix, "."}.
-+{prefix, "%%APPDIR%%"}.
 -{data_dir, "./data"}.
 -{view_index_dir, "./data"}.
+-{state_dir, "./data"}.
+-{log_file, "$LOG_FILE"}.
+-{fauxton_root, "./share/www"}.
++{prefix, "%%APPDIR%%"}.
 +{data_dir, "%%DBDIR%%"}.
 +{view_index_dir, "%%DBDIR%%"}.
- {log_file, "$LOG_FILE"}.
--{fauxton_root, "./share/www"}.
++{state_dir, "%%DBDIR%%"}.
++{log_file, "%%LOG_FILE%%"}.
 +{fauxton_root, "%%WWWDIR%%"}.
  {user, "$COUCHDB_USER"}.
+ {spidermonkey_version, "$SM_VSN"}.
  {node_name, "-name couchdb@127.0.0.1"}.
- {cluster_port, 5984}.
diff --git a/databases/couchdb3/files/patch-rel_overlay_etc_vm.args b/databases/couchdb3/files/patch-rel_overlay_etc_vm.args
index e0181bad9d9b..2cc2ce50553d 100644
--- a/databases/couchdb3/files/patch-rel_overlay_etc_vm.args
+++ b/databases/couchdb3/files/patch-rel_overlay_etc_vm.args
@@ -1,14 +1,11 @@
---- rel/overlay/etc/vm.args.orig	2018-12-19 09:30:35 UTC
+--- rel/overlay/etc/vm.args.orig	2022-12-22 07:53:22 UTC
 +++ rel/overlay/etc/vm.args
-@@ -43,9 +43,9 @@
- # Start a pool of asynchronous IO threads
- +A 16
+@@ -63,7 +63,7 @@ +Bd -noinput
  
--# Comment this line out to enable the interactive Erlang shell on startup
-+# Comment these lines out to enable the interactive Erlang shell on startup
+ # Comment this line out to enable the interactive Erlang shell on startup
  +Bd -noinput
 -
 +-detached
- # Force use of the smp scheduler, fixes #1296
- -smp enable
+ # Set maximum SSL session lifetime to reap terminated replication readers
+ -ssl session_lifetime 300
  
diff --git a/databases/couchdb3/files/patch-rel_reltool.config b/databases/couchdb3/files/patch-rel_reltool.config
index 502e362492cf..9f377c4de794 100644
--- a/databases/couchdb3/files/patch-rel_reltool.config
+++ b/databases/couchdb3/files/patch-rel_reltool.config
@@ -6,5 +6,5 @@
  {sys, [
 +    {excl_lib, otp_root}, %% require erts runtime from FreeBSD ports
      {lib_dirs, ["../src"]},
-     {rel, "couchdb", "3.1.1", [
+     {rel, "couchdb", "3.3.2", [
          %% stdlib
diff --git a/databases/couchdb3/files/patch-src_ibrowse_src_ibrowse__http__client.erl b/databases/couchdb3/files/patch-src_ibrowse_src_ibrowse__http__client.erl
deleted file mode 100644
index bfc1f0d78488..000000000000
--- a/databases/couchdb3/files/patch-src_ibrowse_src_ibrowse__http__client.erl
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/ibrowse/src/ibrowse_http_client.erl.orig	2018-09-19 11:50:56 UTC
-+++ src/ibrowse/src/ibrowse_http_client.erl
-@@ -532,7 +532,7 @@ is_ipv6_host(Host) ->
-         {ok, {_, _, _, _}} ->
-             false;
-         _  ->
--            case inet:gethostbyname(Host) of
-+            case inet:gethostbyname(Host, inet6) of
-                 {ok, #hostent{h_addrtype = inet6}} ->
-                     true;
-                 _ ->
diff --git a/databases/couchdb3/files/patch-src_jwtf_src_jwtf.app.src b/databases/couchdb3/files/patch-src_jwtf_src_jwtf.app.src
deleted file mode 100644
index ccf78aa932b8..000000000000
--- a/databases/couchdb3/files/patch-src_jwtf_src_jwtf.app.src
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/jwtf/src/jwtf.app.src.orig	2021-03-31 15:23:39 UTC
-+++ src/jwtf/src/jwtf.app.src
-@@ -12,7 +12,7 @@
- 
- {application, jwtf, [
-     {description, "JSON Web Token Functions"},
--    {vsn, "3.1.1"},
-+    {vsn, "3.1.2"},
-     {registered, []},
-     {applications, [
-         kernel,
diff --git a/databases/couchdb3/files/patch-src_jwtf_src_jwtf.erl b/databases/couchdb3/files/patch-src_jwtf_src_jwtf.erl
deleted file mode 100644
index 2c6e4809eaf0..000000000000
--- a/databases/couchdb3/files/patch-src_jwtf_src_jwtf.erl
+++ /dev/null
@@ -1,86 +0,0 @@
---- src/jwtf/src/jwtf.erl.orig	2021-03-31 15:23:39 UTC
-+++ src/jwtf/src/jwtf.erl
-@@ -188,8 +188,7 @@ validate_alg(Props, Checks) ->
-     end.
- 
- 
--%% Not all these fields have to be present, but if they _are_ present
--%% they must be valid.
-+%% Only validate required checks.
- validate_payload(Props, Checks) ->
-     validate_iss(Props, Checks),
-     validate_iat(Props, Checks),
-@@ -202,7 +201,7 @@ validate_iss(Props, Checks) ->
-     ActualISS = prop(<<"iss">>, Props),
- 
-     case {ExpectedISS, ActualISS} of
--        {undefined, undefined} ->
-+        {undefined, _} -> % ignore unrequired check
-             ok;
-         {ISS, undefined} when ISS /= undefined ->
-             throw({bad_request, <<"Missing iss claim">>});
-@@ -218,11 +217,11 @@ validate_iat(Props, Checks) ->
-     IAT = prop(<<"iat">>, Props),
- 
-     case {Required, IAT} of
--        {undefined, undefined} ->
-+        {undefined, _} -> % ignore unrequired check
-             ok;
-         {true, undefined} ->
-             throw({bad_request, <<"Missing iat claim">>});
--        {_, IAT} when is_integer(IAT) ->
-+        {true, IAT} when is_integer(IAT) ->
-             ok;
-         {true, _} ->
-             throw({bad_request, <<"Invalid iat claim">>})
-@@ -234,12 +233,12 @@ validate_nbf(Props, Checks) ->
-     NBF = prop(<<"nbf">>, Props),
- 
-     case {Required, NBF} of
--        {undefined, undefined} ->
-+        {undefined, _} -> % ignore unrequired check
-             ok;
-         {true, undefined} ->
-             throw({bad_request, <<"Missing nbf claim">>});
--        {_, IAT} ->
--            assert_past(<<"nbf">>, IAT)
-+        {true, NBF} ->
-+            assert_past(<<"nbf">>, NBF)
-     end.
- 
- 
-@@ -248,11 +247,11 @@ validate_exp(Props, Checks) ->
-     EXP = prop(<<"exp">>, Props),
- 
-     case {Required, EXP} of
--        {undefined, undefined} ->
-+        {undefined, _} -> % ignore unrequired check
-             ok;
-         {true, undefined} ->
-             throw({bad_request, <<"Missing exp claim">>});
--        {_, EXP} ->
-+        {true, EXP} ->
-             assert_future(<<"exp">>, EXP)
-     end.
- 
-@@ -351,3 +350,20 @@ now_seconds() ->
- 
- prop(Prop, Props) ->
-     proplists:get_value(Prop, Props).
-+
-+
-+-ifdef(TEST).
-+-include_lib("eunit/include/eunit.hrl").
-+
-+validate_payload_ignore_unchecked_props_test() ->
-+    ?assertEqual(ok, validate_payload(_Props = [], _Checks = [])),
-+    BogusProps = [
-+        {iss, bogus},
-+        {iat, bogus},
-+        {nbf, bogus},
-+        {exp, bogus}
-+    ],
-+    ?assertEqual(ok, validate_payload(BogusProps, _Checks = [])),
-+    ok.
-+
-+-endif.
diff --git a/databases/couchdb3/files/patch-src_jwtf_src_jwtf__keystore.erl b/databases/couchdb3/files/patch-src_jwtf_src_jwtf__keystore.erl
deleted file mode 100644
index 6f765c384342..000000000000
--- a/databases/couchdb3/files/patch-src_jwtf_src_jwtf__keystore.erl
+++ /dev/null
@@ -1,28 +0,0 @@
---- src/jwtf/src/jwtf_keystore.erl.orig	2021-03-31 15:23:39 UTC
-+++ src/jwtf/src/jwtf_keystore.erl
-@@ -140,13 +140,18 @@ get_from_config(Kty, KID) ->
-     end.
- 
- pem_decode(PEM) ->
--    BinPEM = iolist_to_binary(string:replace(PEM, "\\n", "\n", all)),
--    case public_key:pem_decode(BinPEM) of
--        [PEMEntry] ->
--            public_key:pem_entry_decode(PEMEntry);
--        [] ->
--            throw({bad_request, <<"Not a valid key">>})
--    end.
-+    BinPEM = re:replace(PEM, "\\\\n", "\n", [global, {return, binary}]),
-+    try
-+        case public_key:pem_decode(BinPEM) of
-+            [PEMEntry] ->
-+                public_key:pem_entry_decode(PEMEntry);
-+            _ ->
-+                throw({bad_request, <<"Not a valid key">>})
-+        end
-+   catch
-+       error:_ ->
-+           throw({bad_request, <<"Not a valid key">>})
-+   end.
- 
- kty(<<"HS", _/binary>>) ->
-     "hmac";
diff --git a/databases/couchdb3/files/pkg-message.in b/databases/couchdb3/files/pkg-message.in
index 94921a0f3745..ff92f21a9a69 100644
--- a/databases/couchdb3/files/pkg-message.in
+++ b/databases/couchdb3/files/pkg-message.in
@@ -48,7 +48,7 @@ curl -X PUT http://admin:passwd@127.0.0.1:5984/_global_changes
 Then use the admin interface at http://127.0.0.1:5984/_utils/# as usual.
 
 For more information see
-http://docs.couchdb.org/en/latest/install/setup.html
+http://docs.couchdb.org/en/latest/setup/index.html
 EOM
 }
 ]
diff --git a/databases/couchdb3/pkg-descr b/databases/couchdb3/pkg-descr
index 3c2aa38c8521..ad3f16abf5cf 100644
--- a/databases/couchdb3/pkg-descr
+++ b/databases/couchdb3/pkg-descr
@@ -2,5 +2,3 @@ Apache CouchDB lets you access your data where you need it by defining the
 Couch Replication Protocol that is implemented by a variety of projects and
 products that span every imaginable computing environment from globally
 distributed server-clusters, over mobile phones to web browsers.
-
-WWW: http://couchdb.apache.org/
diff --git a/databases/couchdb3/pkg-plist b/databases/couchdb3/pkg-plist
index 108dda00ea8a..782a4e62284b 100644
--- a/databases/couchdb3/pkg-plist
+++ b/databases/couchdb3/pkg-plist
@@ -1,7 +1,7 @@
 @dir libexec/couchdb3/lib/couch-%%VERSION%%/priv/couch_ejson_compare
-@dir libexec/couchdb3/lib/couch-%%VERSION%%/priv/icu_driver
 @dir(couchdb,couchdb,700) /var/db/couchdb3
 @dir(couchdb,couchdb,700) /var/log/couchdb3
+@dir(couchdb,couchdb,700) /var/run/couchdb3
 @sample(couchdb,couchdb,640) %%ETCDIR%%/local.ini.sample
 @sample(couchdb,couchdb,640) %%ETCDIR%%/vm.args.sample
 libexec/couchdb3/LICENSE
@@ -9,6 +9,9 @@ libexec/couchdb3/LICENSE
 libexec/couchdb3/bin/couchdb
 libexec/couchdb3/bin/couchjs
 libexec/couchdb3/bin/remsh
+libexec/couchdb3/bin/weatherreport
+libexec/couchdb3/lib/couch-%%VERSION%%/priv/couchspawnkillable
+libexec/couchdb3/lib/couch-%%VERSION%%/priv/spawnkillable/couchspawnkillable.sh
 @mode
 libexec/couchdb3/etc/default.ini
 libexec/couchdb3/lib/b64url-%%VERSION%%/ebin/b64url.app
@@ -37,6 +40,7 @@ libexec/couchdb3/lib/chttpd-%%VERSION%%/ebin/chttpd_show.beam
 libexec/couchdb3/lib/chttpd-%%VERSION%%/ebin/chttpd_stats.beam
 libexec/couchdb3/lib/chttpd-%%VERSION%%/ebin/chttpd_sup.beam
 libexec/couchdb3/lib/chttpd-%%VERSION%%/ebin/chttpd_test_util.beam
+libexec/couchdb3/lib/chttpd-%%VERSION%%/ebin/chttpd_util.beam
 libexec/couchdb3/lib/chttpd-%%VERSION%%/ebin/chttpd_view.beam
 libexec/couchdb3/lib/chttpd-%%VERSION%%/ebin/chttpd_xframe_options.beam
 libexec/couchdb3/lib/chttpd-%%VERSION%%/include/chttpd.hrl
@@ -73,7 +77,6 @@ libexec/couchdb3/lib/couch-%%VERSION%%/ebin/couch_db_split.beam
 libexec/couchdb3/lib/couch-%%VERSION%%/ebin/couch_db_updater.beam
 libexec/couchdb3/lib/couch-%%VERSION%%/ebin/couch_debug.beam
 libexec/couchdb3/lib/couch-%%VERSION%%/ebin/couch_doc.beam
-libexec/couchdb3/lib/couch-%%VERSION%%/ebin/couch_drv.beam
 libexec/couchdb3/lib/couch-%%VERSION%%/ebin/couch_ejson_compare.beam
 libexec/couchdb3/lib/couch-%%VERSION%%/ebin/couch_ejson_size.beam
 libexec/couchdb3/lib/couch-%%VERSION%%/ebin/couch_emsort.beam
@@ -86,7 +89,6 @@ libexec/couchdb3/lib/couch-%%VERSION%%/ebin/couch_hotp.beam
 libexec/couchdb3/lib/couch-%%VERSION%%/ebin/couch_httpd.beam
 libexec/couchdb3/lib/couch-%%VERSION%%/ebin/couch_httpd_auth.beam
 libexec/couchdb3/lib/couch-%%VERSION%%/ebin/couch_httpd_db.beam
-libexec/couchdb3/lib/couch-%%VERSION%%/ebin/couch_httpd_external.beam
 libexec/couchdb3/lib/couch-%%VERSION%%/ebin/couch_httpd_handlers.beam
 libexec/couchdb3/lib/couch-%%VERSION%%/ebin/couch_httpd_misc_handlers.beam
 libexec/couchdb3/lib/couch-%%VERSION%%/ebin/couch_httpd_multipart.beam
@@ -99,6 +101,7 @@ libexec/couchdb3/lib/couch-%%VERSION%%/ebin/couch_multidb_changes.beam
 libexec/couchdb3/lib/couch-%%VERSION%%/ebin/couch_native_process.beam
 libexec/couchdb3/lib/couch-%%VERSION%%/ebin/couch_os_process.beam
 libexec/couchdb3/lib/couch-%%VERSION%%/ebin/couch_partition.beam
+libexec/couchdb3/lib/couch-%%VERSION%%/ebin/couch_password_hasher.beam
 libexec/couchdb3/lib/couch-%%VERSION%%/ebin/couch_passwords.beam
 libexec/couchdb3/lib/couch-%%VERSION%%/ebin/couch_primary_sup.beam
 libexec/couchdb3/lib/couch-%%VERSION%%/ebin/couch_proc_manager.beam
@@ -121,68 +124,9 @@ libexec/couchdb3/lib/couch-%%VERSION%%/include/couch_eunit.hrl
 libexec/couchdb3/lib/couch-%%VERSION%%/include/couch_eunit_proper.hrl
 libexec/couchdb3/lib/couch-%%VERSION%%/include/couch_js_functions.hrl
 libexec/couchdb3/lib/couch-%%VERSION%%/priv/couch_ejson_compare.so
-libexec/couchdb3/lib/couch-%%VERSION%%/priv/couch_icu_driver.so
 libexec/couchdb3/lib/couch-%%VERSION%%/priv/stats_descriptions.cfg
-@mode 0755
-libexec/couchdb3/lib/couch-%%VERSION%%/priv/couchspawnkillable
-libexec/couchdb3/lib/couch-%%VERSION%%/priv/spawnkillable/couchspawnkillable.sh
-@mode
-libexec/couchdb3/lib/dreyfus-%%VERSION%%/ebin/clouseau_rpc.beam
-libexec/couchdb3/lib/dreyfus-%%VERSION%%/ebin/dreyfus.app
-libexec/couchdb3/lib/dreyfus-%%VERSION%%/ebin/dreyfus_app.beam
-libexec/couchdb3/lib/dreyfus-%%VERSION%%/ebin/dreyfus_bookmark.beam
-libexec/couchdb3/lib/dreyfus-%%VERSION%%/ebin/dreyfus_config.beam
-libexec/couchdb3/lib/dreyfus-%%VERSION%%/ebin/dreyfus_epi.beam
-libexec/couchdb3/lib/dreyfus-%%VERSION%%/ebin/dreyfus_fabric.beam
-libexec/couchdb3/lib/dreyfus-%%VERSION%%/ebin/dreyfus_fabric_cleanup.beam
-libexec/couchdb3/lib/dreyfus-%%VERSION%%/ebin/dreyfus_fabric_group1.beam
-libexec/couchdb3/lib/dreyfus-%%VERSION%%/ebin/dreyfus_fabric_group2.beam
-libexec/couchdb3/lib/dreyfus-%%VERSION%%/ebin/dreyfus_fabric_info.beam
-libexec/couchdb3/lib/dreyfus-%%VERSION%%/ebin/dreyfus_fabric_search.beam
-libexec/couchdb3/lib/dreyfus-%%VERSION%%/ebin/dreyfus_httpd.beam
-libexec/couchdb3/lib/dreyfus-%%VERSION%%/ebin/dreyfus_httpd_handlers.beam
-libexec/couchdb3/lib/dreyfus-%%VERSION%%/ebin/dreyfus_index.beam
-libexec/couchdb3/lib/dreyfus-%%VERSION%%/ebin/dreyfus_index_manager.beam
-libexec/couchdb3/lib/dreyfus-%%VERSION%%/ebin/dreyfus_index_updater.beam
-libexec/couchdb3/lib/dreyfus-%%VERSION%%/ebin/dreyfus_plugin_couch_db.beam
-libexec/couchdb3/lib/dreyfus-%%VERSION%%/ebin/dreyfus_rpc.beam
-libexec/couchdb3/lib/dreyfus-%%VERSION%%/ebin/dreyfus_sup.beam
-libexec/couchdb3/lib/dreyfus-%%VERSION%%/ebin/dreyfus_util.beam
-libexec/couchdb3/lib/dreyfus-%%VERSION%%/include/dreyfus.hrl
-libexec/couchdb3/lib/dreyfus-%%VERSION%%/priv/stats_descriptions.cfg
-libexec/couchdb3/lib/fabric-%%VERSION%%/ebin/fabric_db_partition_info.beam
-libexec/couchdb3/lib/fabric-%%VERSION%%/ebin/fabric_ring.beam
-libexec/couchdb3/lib/fabric-%%VERSION%%/ebin/fabric_streams.beam
-libexec/couchdb3/lib/jwtf-3.1.2/ebin/jwtf.app
-libexec/couchdb3/lib/jwtf-3.1.2/ebin/jwtf.beam
-libexec/couchdb3/lib/jwtf-3.1.2/ebin/jwtf_app.beam
-libexec/couchdb3/lib/jwtf-3.1.2/ebin/jwtf_keystore.beam
-libexec/couchdb3/lib/jwtf-3.1.2/ebin/jwtf_sup.beam
-libexec/couchdb3/lib/ken-%%VERSION%%/ebin/ken.app
-libexec/couchdb3/lib/ken-%%VERSION%%/ebin/ken.beam
-libexec/couchdb3/lib/ken-%%VERSION%%/ebin/ken_app.beam
-libexec/couchdb3/lib/ken-%%VERSION%%/ebin/ken_event_handler.beam
-libexec/couchdb3/lib/ken-%%VERSION%%/ebin/ken_server.beam
-libexec/couchdb3/lib/ken-%%VERSION%%/ebin/ken_sup.beam
-libexec/couchdb3/lib/mem3-%%VERSION%%/ebin/mem3_hash.beam
-libexec/couchdb3/lib/mem3-%%VERSION%%/ebin/mem3_reshard.beam
-libexec/couchdb3/lib/mem3-%%VERSION%%/ebin/mem3_reshard_api.beam
-libexec/couchdb3/lib/mem3-%%VERSION%%/ebin/mem3_reshard_dbdoc.beam
-libexec/couchdb3/lib/mem3-%%VERSION%%/ebin/mem3_reshard_httpd.beam
-libexec/couchdb3/lib/mem3-%%VERSION%%/ebin/mem3_reshard_index.beam
-libexec/couchdb3/lib/mem3-%%VERSION%%/ebin/mem3_reshard_job.beam
-libexec/couchdb3/lib/mem3-%%VERSION%%/ebin/mem3_reshard_job_sup.beam
-libexec/couchdb3/lib/mem3-%%VERSION%%/ebin/mem3_reshard_store.beam
-libexec/couchdb3/lib/mem3-%%VERSION%%/ebin/mem3_reshard_sup.beam
-libexec/couchdb3/lib/mem3-%%VERSION%%/ebin/mem3_reshard_validate.beam
-libexec/couchdb3/lib/smoosh-%%VERSION%%/ebin/smoosh.app
-libexec/couchdb3/lib/smoosh-%%VERSION%%/ebin/smoosh.beam
-libexec/couchdb3/lib/smoosh-%%VERSION%%/ebin/smoosh_app.beam
-libexec/couchdb3/lib/smoosh-%%VERSION%%/ebin/smoosh_channel.beam
-libexec/couchdb3/lib/smoosh-%%VERSION%%/ebin/smoosh_priority_queue.beam
-libexec/couchdb3/lib/smoosh-%%VERSION%%/ebin/smoosh_server.beam
-libexec/couchdb3/lib/smoosh-%%VERSION%%/ebin/smoosh_sup.beam
-libexec/couchdb3/lib/smoosh-%%VERSION%%/ebin/smoosh_utils.beam
+libexec/couchdb3/lib/couch_dist-%%VERSION%%/ebin/couch_dist.app
+libexec/couchdb3/lib/couch_dist-%%VERSION%%/ebin/couch_dist.beam
 libexec/couchdb3/lib/couch_epi-%%VERSION%%/ebin/couch_epi.app
 libexec/couchdb3/lib/couch_epi-%%VERSION%%/ebin/couch_epi.beam
 libexec/couchdb3/lib/couch_epi-%%VERSION%%/ebin/couch_epi_app.beam
@@ -208,6 +152,7 @@ libexec/couchdb3/lib/couch_index-%%VERSION%%/ebin/couch_index.app
 libexec/couchdb3/lib/couch_index-%%VERSION%%/ebin/couch_index.beam
 libexec/couchdb3/lib/couch_index-%%VERSION%%/ebin/couch_index_app.beam
 libexec/couchdb3/lib/couch_index-%%VERSION%%/ebin/couch_index_compactor.beam
+libexec/couchdb3/lib/couch_index-%%VERSION%%/ebin/couch_index_debug.beam
 libexec/couchdb3/lib/couch_index-%%VERSION%%/ebin/couch_index_epi.beam
 libexec/couchdb3/lib/couch_index-%%VERSION%%/ebin/couch_index_plugin.beam
 libexec/couchdb3/lib/couch_index-%%VERSION%%/ebin/couch_index_plugin_couch_db.beam
@@ -239,6 +184,7 @@ libexec/couchdb3/lib/couch_mrview-%%VERSION%%/ebin/couch_mrview.app
 libexec/couchdb3/lib/couch_mrview-%%VERSION%%/ebin/couch_mrview.beam
 libexec/couchdb3/lib/couch_mrview-%%VERSION%%/ebin/couch_mrview_cleanup.beam
 libexec/couchdb3/lib/couch_mrview-%%VERSION%%/ebin/couch_mrview_compactor.beam
+libexec/couchdb3/lib/couch_mrview-%%VERSION%%/ebin/couch_mrview_debug.beam
 libexec/couchdb3/lib/couch_mrview-%%VERSION%%/ebin/couch_mrview_http.beam
 libexec/couchdb3/lib/couch_mrview-%%VERSION%%/ebin/couch_mrview_index.beam
 libexec/couchdb3/lib/couch_mrview-%%VERSION%%/ebin/couch_mrview_show.beam
@@ -252,9 +198,12 @@ libexec/couchdb3/lib/couch_peruser-%%VERSION%%/ebin/couch_peruser.app
 libexec/couchdb3/lib/couch_peruser-%%VERSION%%/ebin/couch_peruser.beam
 libexec/couchdb3/lib/couch_peruser-%%VERSION%%/ebin/couch_peruser_app.beam
 libexec/couchdb3/lib/couch_peruser-%%VERSION%%/ebin/couch_peruser_sup.beam
-libexec/couchdb3/lib/couch_plugins-%%VERSION%%/ebin/couch_plugins.app
-libexec/couchdb3/lib/couch_plugins-%%VERSION%%/ebin/couch_plugins.beam
-libexec/couchdb3/lib/couch_plugins-%%VERSION%%/ebin/couch_plugins_httpd.beam
+libexec/couchdb3/lib/couch_prometheus-%%VERSION%%/ebin/couch_prometheus.app
+libexec/couchdb3/lib/couch_prometheus-%%VERSION%%/ebin/couch_prometheus_app.beam
+libexec/couchdb3/lib/couch_prometheus-%%VERSION%%/ebin/couch_prometheus_http.beam
+libexec/couchdb3/lib/couch_prometheus-%%VERSION%%/ebin/couch_prometheus_server.beam
+libexec/couchdb3/lib/couch_prometheus-%%VERSION%%/ebin/couch_prometheus_sup.beam
+libexec/couchdb3/lib/couch_prometheus-%%VERSION%%/ebin/couch_prometheus_util.beam
 libexec/couchdb3/lib/couch_replicator-%%VERSION%%/ebin/couch_replicator.app
 libexec/couchdb3/lib/couch_replicator-%%VERSION%%/ebin/couch_replicator.beam
 libexec/couchdb3/lib/couch_replicator-%%VERSION%%/ebin/couch_replicator_api_wrap.beam
@@ -279,11 +228,14 @@ libexec/couchdb3/lib/couch_replicator-%%VERSION%%/ebin/couch_replicator_httpd_ut
 libexec/couchdb3/lib/couch_replicator-%%VERSION%%/ebin/couch_replicator_ids.beam
 libexec/couchdb3/lib/couch_replicator-%%VERSION%%/ebin/couch_replicator_job_sup.beam
 libexec/couchdb3/lib/couch_replicator-%%VERSION%%/ebin/couch_replicator_notifier.beam
+libexec/couchdb3/lib/couch_replicator-%%VERSION%%/ebin/couch_replicator_parse.beam
+libexec/couchdb3/lib/couch_replicator-%%VERSION%%/ebin/couch_replicator_pg.beam
 libexec/couchdb3/lib/couch_replicator-%%VERSION%%/ebin/couch_replicator_rate_limiter.beam
 libexec/couchdb3/lib/couch_replicator-%%VERSION%%/ebin/couch_replicator_rate_limiter_tables.beam
 libexec/couchdb3/lib/couch_replicator-%%VERSION%%/ebin/couch_replicator_scheduler.beam
 libexec/couchdb3/lib/couch_replicator-%%VERSION%%/ebin/couch_replicator_scheduler_job.beam
 libexec/couchdb3/lib/couch_replicator-%%VERSION%%/ebin/couch_replicator_scheduler_sup.beam
+libexec/couchdb3/lib/couch_replicator-%%VERSION%%/ebin/couch_replicator_share.beam
 libexec/couchdb3/lib/couch_replicator-%%VERSION%%/ebin/couch_replicator_stats.beam
 libexec/couchdb3/lib/couch_replicator-%%VERSION%%/ebin/couch_replicator_sup.beam
 libexec/couchdb3/lib/couch_replicator-%%VERSION%%/ebin/couch_replicator_utils.beam
@@ -299,6 +251,15 @@ libexec/couchdb3/lib/couch_stats-%%VERSION%%/ebin/couch_stats_httpd.beam
 libexec/couchdb3/lib/couch_stats-%%VERSION%%/ebin/couch_stats_process_tracker.beam
 libexec/couchdb3/lib/couch_stats-%%VERSION%%/ebin/couch_stats_sup.beam
 libexec/couchdb3/lib/couch_stats-%%VERSION%%/priv/sample_descriptions.cfg
+libexec/couchdb3/lib/custodian-%%VERSION%%/ebin/custodian.app
+libexec/couchdb3/lib/custodian-%%VERSION%%/ebin/custodian.beam
+libexec/couchdb3/lib/custodian-%%VERSION%%/ebin/custodian_app.beam
+libexec/couchdb3/lib/custodian-%%VERSION%%/ebin/custodian_db_checker.beam
+libexec/couchdb3/lib/custodian-%%VERSION%%/ebin/custodian_monitor.beam
+libexec/couchdb3/lib/custodian-%%VERSION%%/ebin/custodian_noop_monitor.beam
+libexec/couchdb3/lib/custodian-%%VERSION%%/ebin/custodian_server.beam
+libexec/couchdb3/lib/custodian-%%VERSION%%/ebin/custodian_sup.beam
+libexec/couchdb3/lib/custodian-%%VERSION%%/ebin/custodian_util.beam
 libexec/couchdb3/lib/ddoc_cache-%%VERSION%%/ebin/ddoc_cache.app
 libexec/couchdb3/lib/ddoc_cache-%%VERSION%%/ebin/ddoc_cache.beam
 libexec/couchdb3/lib/ddoc_cache-%%VERSION%%/ebin/ddoc_cache_app.beam
@@ -308,10 +269,33 @@ libexec/couchdb3/lib/ddoc_cache-%%VERSION%%/ebin/ddoc_cache_entry_ddocid.beam
 libexec/couchdb3/lib/ddoc_cache-%%VERSION%%/ebin/ddoc_cache_entry_ddocid_rev.beam
 libexec/couchdb3/lib/ddoc_cache-%%VERSION%%/ebin/ddoc_cache_entry_validation_funs.beam
 libexec/couchdb3/lib/ddoc_cache-%%VERSION%%/ebin/ddoc_cache_lru.beam
-libexec/couchdb3/lib/ddoc_cache-%%VERSION%%/ebin/ddoc_cache_opener.beam
 libexec/couchdb3/lib/ddoc_cache-%%VERSION%%/ebin/ddoc_cache_sup.beam
 libexec/couchdb3/lib/ddoc_cache-%%VERSION%%/ebin/ddoc_cache_value.beam
 libexec/couchdb3/lib/ddoc_cache-%%VERSION%%/priv/stats_descriptions.cfg
+libexec/couchdb3/lib/dreyfus-%%VERSION%%/ebin/clouseau_rpc.beam
+libexec/couchdb3/lib/dreyfus-%%VERSION%%/ebin/dreyfus.app
+libexec/couchdb3/lib/dreyfus-%%VERSION%%/ebin/dreyfus.beam
+libexec/couchdb3/lib/dreyfus-%%VERSION%%/ebin/dreyfus_app.beam
+libexec/couchdb3/lib/dreyfus-%%VERSION%%/ebin/dreyfus_bookmark.beam
+libexec/couchdb3/lib/dreyfus-%%VERSION%%/ebin/dreyfus_config.beam
+libexec/couchdb3/lib/dreyfus-%%VERSION%%/ebin/dreyfus_epi.beam
+libexec/couchdb3/lib/dreyfus-%%VERSION%%/ebin/dreyfus_fabric.beam
+libexec/couchdb3/lib/dreyfus-%%VERSION%%/ebin/dreyfus_fabric_cleanup.beam
+libexec/couchdb3/lib/dreyfus-%%VERSION%%/ebin/dreyfus_fabric_group1.beam
+libexec/couchdb3/lib/dreyfus-%%VERSION%%/ebin/dreyfus_fabric_group2.beam
+libexec/couchdb3/lib/dreyfus-%%VERSION%%/ebin/dreyfus_fabric_info.beam
+libexec/couchdb3/lib/dreyfus-%%VERSION%%/ebin/dreyfus_fabric_search.beam
+libexec/couchdb3/lib/dreyfus-%%VERSION%%/ebin/dreyfus_httpd.beam
+libexec/couchdb3/lib/dreyfus-%%VERSION%%/ebin/dreyfus_httpd_handlers.beam
+libexec/couchdb3/lib/dreyfus-%%VERSION%%/ebin/dreyfus_index.beam
+libexec/couchdb3/lib/dreyfus-%%VERSION%%/ebin/dreyfus_index_manager.beam
+libexec/couchdb3/lib/dreyfus-%%VERSION%%/ebin/dreyfus_index_updater.beam
+libexec/couchdb3/lib/dreyfus-%%VERSION%%/ebin/dreyfus_plugin_couch_db.beam
+libexec/couchdb3/lib/dreyfus-%%VERSION%%/ebin/dreyfus_rpc.beam
+libexec/couchdb3/lib/dreyfus-%%VERSION%%/ebin/dreyfus_sup.beam
+libexec/couchdb3/lib/dreyfus-%%VERSION%%/ebin/dreyfus_util.beam
+libexec/couchdb3/lib/dreyfus-%%VERSION%%/include/dreyfus.hrl
+libexec/couchdb3/lib/dreyfus-%%VERSION%%/priv/stats_descriptions.cfg
 libexec/couchdb3/lib/ets_lru-%%VERSION%%/ebin/ets_lru.app
 libexec/couchdb3/lib/ets_lru-%%VERSION%%/ebin/ets_lru.beam
 libexec/couchdb3/lib/fabric-%%VERSION%%/ebin/fabric.app
@@ -321,10 +305,11 @@ libexec/couchdb3/lib/fabric-%%VERSION%%/ebin/fabric_db_delete.beam
 libexec/couchdb3/lib/fabric-%%VERSION%%/ebin/fabric_db_doc_count.beam
 libexec/couchdb3/lib/fabric-%%VERSION%%/ebin/fabric_db_info.beam
 libexec/couchdb3/lib/fabric-%%VERSION%%/ebin/fabric_db_meta.beam
+libexec/couchdb3/lib/fabric-%%VERSION%%/ebin/fabric_db_partition_info.beam
 libexec/couchdb3/lib/fabric-%%VERSION%%/ebin/fabric_db_update_listener.beam
+libexec/couchdb3/lib/fabric-%%VERSION%%/ebin/fabric_db_uuids.beam
 libexec/couchdb3/lib/fabric-%%VERSION%%/ebin/fabric_design_doc_count.beam
 libexec/couchdb3/lib/fabric-%%VERSION%%/ebin/fabric_dict.beam
-libexec/couchdb3/lib/fabric-%%VERSION%%/ebin/fabric_doc_attachments.beam
 libexec/couchdb3/lib/fabric-%%VERSION%%/ebin/fabric_doc_atts.beam
 libexec/couchdb3/lib/fabric-%%VERSION%%/ebin/fabric_doc_missing_revs.beam
 libexec/couchdb3/lib/fabric-%%VERSION%%/ebin/fabric_doc_open.beam
@@ -332,7 +317,10 @@ libexec/couchdb3/lib/fabric-%%VERSION%%/ebin/fabric_doc_open_revs.beam
 libexec/couchdb3/lib/fabric-%%VERSION%%/ebin/fabric_doc_purge.beam
 libexec/couchdb3/lib/fabric-%%VERSION%%/ebin/fabric_doc_update.beam
 libexec/couchdb3/lib/fabric-%%VERSION%%/ebin/fabric_group_info.beam
+libexec/couchdb3/lib/fabric-%%VERSION%%/ebin/fabric_open_revs.beam
+libexec/couchdb3/lib/fabric-%%VERSION%%/ebin/fabric_ring.beam
 libexec/couchdb3/lib/fabric-%%VERSION%%/ebin/fabric_rpc.beam
+libexec/couchdb3/lib/fabric-%%VERSION%%/ebin/fabric_streams.beam
 libexec/couchdb3/lib/fabric-%%VERSION%%/ebin/fabric_util.beam
 libexec/couchdb3/lib/fabric-%%VERSION%%/ebin/fabric_view.beam
 libexec/couchdb3/lib/fabric-%%VERSION%%/ebin/fabric_view_all_docs.beam
@@ -391,24 +379,35 @@ libexec/couchdb3/lib/hyper-1.0/ebin/hyper_gb.beam
 libexec/couchdb3/lib/hyper-1.0/ebin/hyper_register.beam
 libexec/couchdb3/lib/hyper-1.0/priv/.keep
 libexec/couchdb3/lib/hyper-1.0/priv/hyper_carray.so
-libexec/couchdb3/lib/ibrowse-4.0.1/ebin/ibrowse.app
-libexec/couchdb3/lib/ibrowse-4.0.1/ebin/ibrowse.beam
-libexec/couchdb3/lib/ibrowse-4.0.1/ebin/ibrowse_app.beam
-libexec/couchdb3/lib/ibrowse-4.0.1/ebin/ibrowse_http_client.beam
-libexec/couchdb3/lib/ibrowse-4.0.1/ebin/ibrowse_lb.beam
-libexec/couchdb3/lib/ibrowse-4.0.1/ebin/ibrowse_lib.beam
-libexec/couchdb3/lib/ibrowse-4.0.1/ebin/ibrowse_socks5.beam
-libexec/couchdb3/lib/ibrowse-4.0.1/ebin/ibrowse_sup.beam
-libexec/couchdb3/lib/ibrowse-4.0.1/ebin/ibrowse_test.beam
-libexec/couchdb3/lib/ibrowse-4.0.1/include/ibrowse.hrl
+libexec/couchdb3/lib/ibrowse-4.4.2/ebin/ibrowse.app
+libexec/couchdb3/lib/ibrowse-4.4.2/ebin/ibrowse.beam
+libexec/couchdb3/lib/ibrowse-4.4.2/ebin/ibrowse_app.beam
+libexec/couchdb3/lib/ibrowse-4.4.2/ebin/ibrowse_http_client.beam
+libexec/couchdb3/lib/ibrowse-4.4.2/ebin/ibrowse_lb.beam
+libexec/couchdb3/lib/ibrowse-4.4.2/ebin/ibrowse_lib.beam
+libexec/couchdb3/lib/ibrowse-4.4.2/ebin/ibrowse_socks5.beam
+libexec/couchdb3/lib/ibrowse-4.4.2/ebin/ibrowse_sup.beam
+libexec/couchdb3/lib/ibrowse-4.4.2/include/ibrowse.hrl
+libexec/couchdb3/lib/ibrowse-4.4.2/priv/ibrowse.conf
 libexec/couchdb3/lib/ioq-%%VERSION%%/ebin/ioq.app
 libexec/couchdb3/lib/ioq-%%VERSION%%/ebin/ioq.beam
 libexec/couchdb3/lib/ioq-%%VERSION%%/ebin/ioq_app.beam
 libexec/couchdb3/lib/ioq-%%VERSION%%/ebin/ioq_sup.beam
-libexec/couchdb3/lib/jiffy-1.0.4/ebin/jiffy.app
-libexec/couchdb3/lib/jiffy-1.0.4/ebin/jiffy.beam
-libexec/couchdb3/lib/jiffy-1.0.4/ebin/jiffy_utf8.beam
-libexec/couchdb3/lib/jiffy-1.0.4/priv/jiffy.so
+libexec/couchdb3/lib/jiffy-1.0.9/ebin/jiffy.app
+libexec/couchdb3/lib/jiffy-1.0.9/ebin/jiffy.beam
+libexec/couchdb3/lib/jiffy-1.0.9/ebin/jiffy_utf8.beam
+libexec/couchdb3/lib/jiffy-1.0.9/priv/jiffy.so
+libexec/couchdb3/lib/jwtf-%%VERSION%%/ebin/jwtf.app
+libexec/couchdb3/lib/jwtf-%%VERSION%%/ebin/jwtf.beam
+libexec/couchdb3/lib/jwtf-%%VERSION%%/ebin/jwtf_app.beam
+libexec/couchdb3/lib/jwtf-%%VERSION%%/ebin/jwtf_keystore.beam
+libexec/couchdb3/lib/jwtf-%%VERSION%%/ebin/jwtf_sup.beam
+libexec/couchdb3/lib/ken-%%VERSION%%/ebin/ken.app
+libexec/couchdb3/lib/ken-%%VERSION%%/ebin/ken.beam
+libexec/couchdb3/lib/ken-%%VERSION%%/ebin/ken_app.beam
+libexec/couchdb3/lib/ken-%%VERSION%%/ebin/ken_event_handler.beam
+libexec/couchdb3/lib/ken-%%VERSION%%/ebin/ken_server.beam
+libexec/couchdb3/lib/ken-%%VERSION%%/ebin/ken_sup.beam
 libexec/couchdb3/lib/khash-%%VERSION%%/ebin/khash.app
 libexec/couchdb3/lib/khash-%%VERSION%%/ebin/khash.beam
 libexec/couchdb3/lib/khash-%%VERSION%%/priv/khash.so
@@ -442,13 +441,26 @@ libexec/couchdb3/lib/mango-%%VERSION%%/ebin/mango_util.beam
 libexec/couchdb3/lib/mem3-%%VERSION%%/ebin/mem3.app
 libexec/couchdb3/lib/mem3-%%VERSION%%/ebin/mem3.beam
 libexec/couchdb3/lib/mem3-%%VERSION%%/ebin/mem3_app.beam
+libexec/couchdb3/lib/mem3-%%VERSION%%/ebin/mem3_bdu.beam
 libexec/couchdb3/lib/mem3-%%VERSION%%/ebin/mem3_cluster.beam
+libexec/couchdb3/lib/mem3-%%VERSION%%/ebin/mem3_distribution.beam
 libexec/couchdb3/lib/mem3-%%VERSION%%/ebin/mem3_epi.beam
+libexec/couchdb3/lib/mem3-%%VERSION%%/ebin/mem3_hash.beam
 libexec/couchdb3/lib/mem3-%%VERSION%%/ebin/mem3_httpd.beam
 libexec/couchdb3/lib/mem3-%%VERSION%%/ebin/mem3_httpd_handlers.beam
 libexec/couchdb3/lib/mem3-%%VERSION%%/ebin/mem3_nodes.beam
 libexec/couchdb3/lib/mem3-%%VERSION%%/ebin/mem3_plugin_couch_db.beam
 libexec/couchdb3/lib/mem3-%%VERSION%%/ebin/mem3_rep.beam
+libexec/couchdb3/lib/mem3-%%VERSION%%/ebin/mem3_reshard.beam
+libexec/couchdb3/lib/mem3-%%VERSION%%/ebin/mem3_reshard_api.beam
+libexec/couchdb3/lib/mem3-%%VERSION%%/ebin/mem3_reshard_dbdoc.beam
+libexec/couchdb3/lib/mem3-%%VERSION%%/ebin/mem3_reshard_httpd.beam
+libexec/couchdb3/lib/mem3-%%VERSION%%/ebin/mem3_reshard_index.beam
+libexec/couchdb3/lib/mem3-%%VERSION%%/ebin/mem3_reshard_job.beam
+libexec/couchdb3/lib/mem3-%%VERSION%%/ebin/mem3_reshard_job_sup.beam
+libexec/couchdb3/lib/mem3-%%VERSION%%/ebin/mem3_reshard_store.beam
+libexec/couchdb3/lib/mem3-%%VERSION%%/ebin/mem3_reshard_sup.beam
+libexec/couchdb3/lib/mem3-%%VERSION%%/ebin/mem3_reshard_validate.beam
 libexec/couchdb3/lib/mem3-%%VERSION%%/ebin/mem3_rpc.beam
 libexec/couchdb3/lib/mem3-%%VERSION%%/ebin/mem3_seeds.beam
 libexec/couchdb3/lib/mem3-%%VERSION%%/ebin/mem3_shards.beam
@@ -461,49 +473,49 @@ libexec/couchdb3/lib/mem3-%%VERSION%%/ebin/mem3_sync_security.beam
 libexec/couchdb3/lib/mem3-%%VERSION%%/ebin/mem3_util.beam
 libexec/couchdb3/lib/mem3-%%VERSION%%/include/mem3.hrl
 libexec/couchdb3/lib/mem3-%%VERSION%%/priv/stats_descriptions.cfg
-libexec/couchdb3/lib/mochiweb-2.20.0/ebin/mochifmt.beam
-libexec/couchdb3/lib/mochiweb-2.20.0/ebin/mochifmt_records.beam
-libexec/couchdb3/lib/mochiweb-2.20.0/ebin/mochifmt_std.beam
-libexec/couchdb3/lib/mochiweb-2.20.0/ebin/mochiglobal.beam
-libexec/couchdb3/lib/mochiweb-2.20.0/ebin/mochihex.beam
-libexec/couchdb3/lib/mochiweb-2.20.0/ebin/mochijson.beam
-libexec/couchdb3/lib/mochiweb-2.20.0/ebin/mochijson2.beam
-libexec/couchdb3/lib/mochiweb-2.20.0/ebin/mochilists.beam
-libexec/couchdb3/lib/mochiweb-2.20.0/ebin/mochilogfile2.beam
-libexec/couchdb3/lib/mochiweb-2.20.0/ebin/mochinum.beam
-libexec/couchdb3/lib/mochiweb-2.20.0/ebin/mochitemp.beam
-libexec/couchdb3/lib/mochiweb-2.20.0/ebin/mochiutf8.beam
-libexec/couchdb3/lib/mochiweb-2.20.0/ebin/mochiweb.app
-libexec/couchdb3/lib/mochiweb-2.20.0/ebin/mochiweb.beam
-libexec/couchdb3/lib/mochiweb-2.20.0/ebin/mochiweb_acceptor.beam
-libexec/couchdb3/lib/mochiweb-2.20.0/ebin/mochiweb_base64url.beam
-libexec/couchdb3/lib/mochiweb-2.20.0/ebin/mochiweb_charref.beam
-libexec/couchdb3/lib/mochiweb-2.20.0/ebin/mochiweb_clock.beam
-libexec/couchdb3/lib/mochiweb-2.20.0/ebin/mochiweb_cookies.beam
-libexec/couchdb3/lib/mochiweb-2.20.0/ebin/mochiweb_cover.beam
-libexec/couchdb3/lib/mochiweb-2.20.0/ebin/mochiweb_echo.beam
-libexec/couchdb3/lib/mochiweb-2.20.0/ebin/mochiweb_headers.beam
-libexec/couchdb3/lib/mochiweb-2.20.0/ebin/mochiweb_html.beam
-libexec/couchdb3/lib/mochiweb-2.20.0/ebin/mochiweb_http.beam
-libexec/couchdb3/lib/mochiweb-2.20.0/ebin/mochiweb_io.beam
-libexec/couchdb3/lib/mochiweb-2.20.0/ebin/mochiweb_mime.beam
-libexec/couchdb3/lib/mochiweb-2.20.0/ebin/mochiweb_multipart.beam
-libexec/couchdb3/lib/mochiweb-2.20.0/ebin/mochiweb_request.beam
-libexec/couchdb3/lib/mochiweb-2.20.0/ebin/mochiweb_response.beam
-libexec/couchdb3/lib/mochiweb-2.20.0/ebin/mochiweb_session.beam
-libexec/couchdb3/lib/mochiweb-2.20.0/ebin/mochiweb_socket.beam
-libexec/couchdb3/lib/mochiweb-2.20.0/ebin/mochiweb_socket_server.beam
-libexec/couchdb3/lib/mochiweb-2.20.0/ebin/mochiweb_util.beam
-libexec/couchdb3/lib/mochiweb-2.20.0/ebin/mochiweb_websocket.beam
-libexec/couchdb3/lib/mochiweb-2.20.0/ebin/reloader.beam
-libexec/couchdb3/lib/mochiweb-2.20.0/include/internal.hrl
-libexec/couchdb3/lib/recon-2.5.0/ebin/recon.app
-libexec/couchdb3/lib/recon-2.5.0/ebin/recon.beam
-libexec/couchdb3/lib/recon-2.5.0/ebin/recon_alloc.beam
-libexec/couchdb3/lib/recon-2.5.0/ebin/recon_lib.beam
-libexec/couchdb3/lib/recon-2.5.0/ebin/recon_map.beam
-libexec/couchdb3/lib/recon-2.5.0/ebin/recon_rec.beam
-libexec/couchdb3/lib/recon-2.5.0/ebin/recon_trace.beam
+libexec/couchdb3/lib/mochiweb-3.2.0/ebin/mochifmt.beam
+libexec/couchdb3/lib/mochiweb-3.2.0/ebin/mochifmt_records.beam
+libexec/couchdb3/lib/mochiweb-3.2.0/ebin/mochifmt_std.beam
+libexec/couchdb3/lib/mochiweb-3.2.0/ebin/mochiglobal.beam
+libexec/couchdb3/lib/mochiweb-3.2.0/ebin/mochihex.beam
+libexec/couchdb3/lib/mochiweb-3.2.0/ebin/mochijson.beam
+libexec/couchdb3/lib/mochiweb-3.2.0/ebin/mochijson2.beam
+libexec/couchdb3/lib/mochiweb-3.2.0/ebin/mochilists.beam
+libexec/couchdb3/lib/mochiweb-3.2.0/ebin/mochilogfile2.beam
+libexec/couchdb3/lib/mochiweb-3.2.0/ebin/mochinum.beam
+libexec/couchdb3/lib/mochiweb-3.2.0/ebin/mochitemp.beam
+libexec/couchdb3/lib/mochiweb-3.2.0/ebin/mochiutf8.beam
+libexec/couchdb3/lib/mochiweb-3.2.0/ebin/mochiweb.app
+libexec/couchdb3/lib/mochiweb-3.2.0/ebin/mochiweb.beam
+libexec/couchdb3/lib/mochiweb-3.2.0/ebin/mochiweb_acceptor.beam
+libexec/couchdb3/lib/mochiweb-3.2.0/ebin/mochiweb_base64url.beam
+libexec/couchdb3/lib/mochiweb-3.2.0/ebin/mochiweb_charref.beam
+libexec/couchdb3/lib/mochiweb-3.2.0/ebin/mochiweb_clock.beam
+libexec/couchdb3/lib/mochiweb-3.2.0/ebin/mochiweb_cookies.beam
+libexec/couchdb3/lib/mochiweb-3.2.0/ebin/mochiweb_cover.beam
+libexec/couchdb3/lib/mochiweb-3.2.0/ebin/mochiweb_echo.beam
+libexec/couchdb3/lib/mochiweb-3.2.0/ebin/mochiweb_headers.beam
+libexec/couchdb3/lib/mochiweb-3.2.0/ebin/mochiweb_html.beam
+libexec/couchdb3/lib/mochiweb-3.2.0/ebin/mochiweb_http.beam
+libexec/couchdb3/lib/mochiweb-3.2.0/ebin/mochiweb_io.beam
+libexec/couchdb3/lib/mochiweb-3.2.0/ebin/mochiweb_mime.beam
+libexec/couchdb3/lib/mochiweb-3.2.0/ebin/mochiweb_multipart.beam
+libexec/couchdb3/lib/mochiweb-3.2.0/ebin/mochiweb_request.beam
+libexec/couchdb3/lib/mochiweb-3.2.0/ebin/mochiweb_response.beam
+libexec/couchdb3/lib/mochiweb-3.2.0/ebin/mochiweb_session.beam
+libexec/couchdb3/lib/mochiweb-3.2.0/ebin/mochiweb_socket.beam
+libexec/couchdb3/lib/mochiweb-3.2.0/ebin/mochiweb_socket_server.beam
+libexec/couchdb3/lib/mochiweb-3.2.0/ebin/mochiweb_util.beam
+libexec/couchdb3/lib/mochiweb-3.2.0/ebin/mochiweb_websocket.beam
+libexec/couchdb3/lib/mochiweb-3.2.0/ebin/reloader.beam
+libexec/couchdb3/lib/mochiweb-3.2.0/include/internal.hrl
+libexec/couchdb3/lib/recon-2.5.3/ebin/recon.app
+libexec/couchdb3/lib/recon-2.5.3/ebin/recon.beam
+libexec/couchdb3/lib/recon-2.5.3/ebin/recon_alloc.beam
+libexec/couchdb3/lib/recon-2.5.3/ebin/recon_lib.beam
+libexec/couchdb3/lib/recon-2.5.3/ebin/recon_map.beam
+libexec/couchdb3/lib/recon-2.5.3/ebin/recon_rec.beam
+libexec/couchdb3/lib/recon-2.5.3/ebin/recon_trace.beam
 libexec/couchdb3/lib/rexi-%%VERSION%%/ebin/rexi.app
 libexec/couchdb3/lib/rexi-%%VERSION%%/ebin/rexi.beam
 libexec/couchdb3/lib/rexi-%%VERSION%%/ebin/rexi_app.beam
@@ -523,9 +535,42 @@ libexec/couchdb3/lib/setup-1/ebin/setup_epi.beam
 libexec/couchdb3/lib/setup-1/ebin/setup_httpd.beam
 libexec/couchdb3/lib/setup-1/ebin/setup_httpd_handlers.beam
 libexec/couchdb3/lib/setup-1/ebin/setup_sup.beam
+libexec/couchdb3/lib/smoosh-%%VERSION%%/ebin/smoosh.app
+libexec/couchdb3/lib/smoosh-%%VERSION%%/ebin/smoosh.beam
+libexec/couchdb3/lib/smoosh-%%VERSION%%/ebin/smoosh_app.beam
+libexec/couchdb3/lib/smoosh-%%VERSION%%/ebin/smoosh_channel.beam
+libexec/couchdb3/lib/smoosh-%%VERSION%%/ebin/smoosh_persist.beam
+libexec/couchdb3/lib/smoosh-%%VERSION%%/ebin/smoosh_priority_queue.beam
+libexec/couchdb3/lib/smoosh-%%VERSION%%/ebin/smoosh_server.beam
+libexec/couchdb3/lib/smoosh-%%VERSION%%/ebin/smoosh_sup.beam
+libexec/couchdb3/lib/smoosh-%%VERSION%%/ebin/smoosh_utils.beam
 libexec/couchdb3/lib/snappy-1.0.5/ebin/snappy.app
 libexec/couchdb3/lib/snappy-1.0.5/ebin/snappy.beam
 libexec/couchdb3/lib/snappy-1.0.5/priv/snappy_nif.so
+libexec/couchdb3/lib/weatherreport-%%VERSION%%/ebin/weatherreport.app
+libexec/couchdb3/lib/weatherreport-%%VERSION%%/ebin/weatherreport.beam
+libexec/couchdb3/lib/weatherreport-%%VERSION%%/ebin/weatherreport_check.beam
+libexec/couchdb3/lib/weatherreport-%%VERSION%%/ebin/weatherreport_check_custodian.beam
+libexec/couchdb3/lib/weatherreport-%%VERSION%%/ebin/weatherreport_check_disk.beam
+libexec/couchdb3/lib/weatherreport-%%VERSION%%/ebin/weatherreport_check_internal_replication.beam
+libexec/couchdb3/lib/weatherreport-%%VERSION%%/ebin/weatherreport_check_ioq.beam
+libexec/couchdb3/lib/weatherreport-%%VERSION%%/ebin/weatherreport_check_mem3_sync.beam
+libexec/couchdb3/lib/weatherreport-%%VERSION%%/ebin/weatherreport_check_membership.beam
+libexec/couchdb3/lib/weatherreport-%%VERSION%%/ebin/weatherreport_check_memory_use.beam
+libexec/couchdb3/lib/weatherreport-%%VERSION%%/ebin/weatherreport_check_message_queues.beam
+libexec/couchdb3/lib/weatherreport-%%VERSION%%/ebin/weatherreport_check_node_stats.beam
+libexec/couchdb3/lib/weatherreport-%%VERSION%%/ebin/weatherreport_check_nodes_connected.beam
+libexec/couchdb3/lib/weatherreport-%%VERSION%%/ebin/weatherreport_check_process_calls.beam
+libexec/couchdb3/lib/weatherreport-%%VERSION%%/ebin/weatherreport_check_process_memory.beam
+libexec/couchdb3/lib/weatherreport-%%VERSION%%/ebin/weatherreport_check_safe_to_rebuild.beam
+libexec/couchdb3/lib/weatherreport-%%VERSION%%/ebin/weatherreport_check_search.beam
+libexec/couchdb3/lib/weatherreport-%%VERSION%%/ebin/weatherreport_check_tcp_queues.beam
+libexec/couchdb3/lib/weatherreport-%%VERSION%%/ebin/weatherreport_config.beam
+libexec/couchdb3/lib/weatherreport-%%VERSION%%/ebin/weatherreport_getopt.beam
+libexec/couchdb3/lib/weatherreport-%%VERSION%%/ebin/weatherreport_log.beam
+libexec/couchdb3/lib/weatherreport-%%VERSION%%/ebin/weatherreport_node.beam
+libexec/couchdb3/lib/weatherreport-%%VERSION%%/ebin/weatherreport_runner.beam
+libexec/couchdb3/lib/weatherreport-%%VERSION%%/ebin/weatherreport_util.beam
 @comment erlang release
 libexec/couchdb3/releases/%%VERSION%%/couchdb.boot
 libexec/couchdb3/releases/%%VERSION%%/couchdb.rel
@@ -537,10 +582,14 @@ libexec/couchdb3/releases/%%VERSION%%/start_clean.script
 libexec/couchdb3/releases/%%VERSION%%/sys.config
 libexec/couchdb3/releases/RELEASES
 libexec/couchdb3/releases/start_erl.data
+libexec/couchdb3/share/server/main-ast-bypass.js
 libexec/couchdb3/share/server/main-coffee.js
 libexec/couchdb3/share/server/main.js
-man/man1/apachecouchdb.1.gz
+share/man/man1/apachecouchdb.1.gz
 %%PORTDOCS%%%%WWWDIR%%/docs/_images/23379351593_0c480537de_q.jpg
+%%PORTDOCS%%%%WWWDIR%%/docs/_images/TLS-Handshake.png
+%%PORTDOCS%%%%WWWDIR%%/docs/_images/fair-enough.png
+%%PORTDOCS%%%%WWWDIR%%/docs/_images/gf-gnome-rainbows.png
 %%PORTDOCS%%%%WWWDIR%%/docs/_images/intro-consistency-01.png
 %%PORTDOCS%%%%WWWDIR%%/docs/_images/intro-consistency-02.png
 %%PORTDOCS%%%%WWWDIR%%/docs/_images/intro-consistency-03.png
@@ -556,6 +605,7 @@ man/man1/apachecouchdb.1.gz
 %%PORTDOCS%%%%WWWDIR%%/docs/_images/rev-tree1.png
 %%PORTDOCS%%%%WWWDIR%%/docs/_images/rev-tree2.png
 %%PORTDOCS%%%%WWWDIR%%/docs/_images/rev-tree3.png
+%%PORTDOCS%%%%WWWDIR%%/docs/_images/tea-erl-grey-hot-replicator.png
 %%PORTDOCS%%%%WWWDIR%%/docs/_images/views-intro-01.png
 %%PORTDOCS%%%%WWWDIR%%/docs/_images/views-intro-02.png
 %%PORTDOCS%%%%WWWDIR%%/docs/_images/views-intro-03.png
@@ -600,6 +650,8 @@ man/man1/apachecouchdb.1.gz
 %%PORTDOCS%%%%WWWDIR%%/docs/_sources/cluster/purging.rst.txt
 %%PORTDOCS%%%%WWWDIR%%/docs/_sources/cluster/sharding.rst.txt
 %%PORTDOCS%%%%WWWDIR%%/docs/_sources/cluster/theory.rst.txt
+%%PORTDOCS%%%%WWWDIR%%/docs/_sources/cluster/tls_erlang_distribution.rst.txt
+%%PORTDOCS%%%%WWWDIR%%/docs/_sources/cluster/troubleshooting.rst.txt
 %%PORTDOCS%%%%WWWDIR%%/docs/_sources/config/auth.rst.txt
 %%PORTDOCS%%%%WWWDIR%%/docs/_sources/config/cluster.rst.txt
 %%PORTDOCS%%%%WWWDIR%%/docs/_sources/config/compaction.rst.txt
@@ -628,6 +680,10 @@ man/man1/apachecouchdb.1.gz
 %%PORTDOCS%%%%WWWDIR%%/docs/_sources/cve/2018-11769.rst.txt
 %%PORTDOCS%%%%WWWDIR%%/docs/_sources/cve/2018-17188.rst.txt
 %%PORTDOCS%%%%WWWDIR%%/docs/_sources/cve/2018-8007.rst.txt
+%%PORTDOCS%%%%WWWDIR%%/docs/_sources/cve/2020-1955.rst.txt
+%%PORTDOCS%%%%WWWDIR%%/docs/_sources/cve/2021-38295.rst.txt
+%%PORTDOCS%%%%WWWDIR%%/docs/_sources/cve/2022-24706.rst.txt
+%%PORTDOCS%%%%WWWDIR%%/docs/_sources/cve/2023-26268.rst.txt
 %%PORTDOCS%%%%WWWDIR%%/docs/_sources/cve/index.rst.txt
 %%PORTDOCS%%%%WWWDIR%%/docs/_sources/ddocs/ddocs.rst.txt
 %%PORTDOCS%%%%WWWDIR%%/docs/_sources/ddocs/index.rst.txt
@@ -697,52 +753,40 @@ man/man1/apachecouchdb.1.gz
 %%PORTDOCS%%%%WWWDIR%%/docs/_sources/whatsnew/2.3.rst.txt
 %%PORTDOCS%%%%WWWDIR%%/docs/_sources/whatsnew/3.0.rst.txt
 %%PORTDOCS%%%%WWWDIR%%/docs/_sources/whatsnew/3.1.rst.txt
+%%PORTDOCS%%%%WWWDIR%%/docs/_sources/whatsnew/3.2.rst.txt
+%%PORTDOCS%%%%WWWDIR%%/docs/_sources/whatsnew/3.3.rst.txt
 %%PORTDOCS%%%%WWWDIR%%/docs/_sources/whatsnew/index.rst.txt
+%%PORTDOCS%%%%WWWDIR%%/docs/_static/_sphinx_javascript_frameworks_compat.js
 %%PORTDOCS%%%%WWWDIR%%/docs/_static/basic.css
 %%PORTDOCS%%%%WWWDIR%%/docs/_static/css/badge_only.css
+%%PORTDOCS%%%%WWWDIR%%/docs/_static/css/fonts/Roboto-Slab-Bold.woff
+%%PORTDOCS%%%%WWWDIR%%/docs/_static/css/fonts/Roboto-Slab-Bold.woff2
+%%PORTDOCS%%%%WWWDIR%%/docs/_static/css/fonts/Roboto-Slab-Regular.woff
+%%PORTDOCS%%%%WWWDIR%%/docs/_static/css/fonts/Roboto-Slab-Regular.woff2
+%%PORTDOCS%%%%WWWDIR%%/docs/_static/css/fonts/fontawesome-webfont.eot
+%%PORTDOCS%%%%WWWDIR%%/docs/_static/css/fonts/fontawesome-webfont.svg
+%%PORTDOCS%%%%WWWDIR%%/docs/_static/css/fonts/fontawesome-webfont.ttf
+%%PORTDOCS%%%%WWWDIR%%/docs/_static/css/fonts/fontawesome-webfont.woff
+%%PORTDOCS%%%%WWWDIR%%/docs/_static/css/fonts/fontawesome-webfont.woff2
+%%PORTDOCS%%%%WWWDIR%%/docs/_static/css/fonts/lato-bold-italic.woff
+%%PORTDOCS%%%%WWWDIR%%/docs/_static/css/fonts/lato-bold-italic.woff2
+%%PORTDOCS%%%%WWWDIR%%/docs/_static/css/fonts/lato-bold.woff
+%%PORTDOCS%%%%WWWDIR%%/docs/_static/css/fonts/lato-bold.woff2
+%%PORTDOCS%%%%WWWDIR%%/docs/_static/css/fonts/lato-normal-italic.woff
+%%PORTDOCS%%%%WWWDIR%%/docs/_static/css/fonts/lato-normal-italic.woff2
+%%PORTDOCS%%%%WWWDIR%%/docs/_static/css/fonts/lato-normal.woff
+%%PORTDOCS%%%%WWWDIR%%/docs/_static/css/fonts/lato-normal.woff2
 %%PORTDOCS%%%%WWWDIR%%/docs/_static/css/rtd_theme.css
 %%PORTDOCS%%%%WWWDIR%%/docs/_static/css/theme.css
 %%PORTDOCS%%%%WWWDIR%%/docs/_static/doctools.js
 %%PORTDOCS%%%%WWWDIR%%/docs/_static/documentation_options.js
+%%PORTDOCS%%%%WWWDIR%%/docs/_static/favicon.ico
 %%PORTDOCS%%%%WWWDIR%%/docs/_static/file.png
-%%PORTDOCS%%%%WWWDIR%%/docs/_static/fonts/Inconsolata-Bold.ttf
-%%PORTDOCS%%%%WWWDIR%%/docs/_static/fonts/Inconsolata-Regular.ttf
-%%PORTDOCS%%%%WWWDIR%%/docs/_static/fonts/Inconsolata.ttf
-%%PORTDOCS%%%%WWWDIR%%/docs/_static/fonts/Lato-Bold.ttf
-%%PORTDOCS%%%%WWWDIR%%/docs/_static/fonts/Lato-Regular.ttf
-%%PORTDOCS%%%%WWWDIR%%/docs/_static/fonts/Lato/lato-bold.eot
-%%PORTDOCS%%%%WWWDIR%%/docs/_static/fonts/Lato/lato-bold.ttf
-%%PORTDOCS%%%%WWWDIR%%/docs/_static/fonts/Lato/lato-bold.woff
-%%PORTDOCS%%%%WWWDIR%%/docs/_static/fonts/Lato/lato-bold.woff2
-%%PORTDOCS%%%%WWWDIR%%/docs/_static/fonts/Lato/lato-bolditalic.eot
-%%PORTDOCS%%%%WWWDIR%%/docs/_static/fonts/Lato/lato-bolditalic.ttf
-%%PORTDOCS%%%%WWWDIR%%/docs/_static/fonts/Lato/lato-bolditalic.woff
-%%PORTDOCS%%%%WWWDIR%%/docs/_static/fonts/Lato/lato-bolditalic.woff2
-%%PORTDOCS%%%%WWWDIR%%/docs/_static/fonts/Lato/lato-italic.eot
-%%PORTDOCS%%%%WWWDIR%%/docs/_static/fonts/Lato/lato-italic.ttf
-%%PORTDOCS%%%%WWWDIR%%/docs/_static/fonts/Lato/lato-italic.woff
-%%PORTDOCS%%%%WWWDIR%%/docs/_static/fonts/Lato/lato-italic.woff2
-%%PORTDOCS%%%%WWWDIR%%/docs/_static/fonts/Lato/lato-regular.eot
-%%PORTDOCS%%%%WWWDIR%%/docs/_static/fonts/Lato/lato-regular.ttf
-%%PORTDOCS%%%%WWWDIR%%/docs/_static/fonts/Lato/lato-regular.woff
-%%PORTDOCS%%%%WWWDIR%%/docs/_static/fonts/Lato/lato-regular.woff2
-%%PORTDOCS%%%%WWWDIR%%/docs/_static/fonts/RobotoSlab-Bold.ttf
-%%PORTDOCS%%%%WWWDIR%%/docs/_static/fonts/RobotoSlab-Regular.ttf
-%%PORTDOCS%%%%WWWDIR%%/docs/_static/fonts/RobotoSlab/roboto-slab-v7-bold.eot
-%%PORTDOCS%%%%WWWDIR%%/docs/_static/fonts/RobotoSlab/roboto-slab-v7-bold.ttf
-%%PORTDOCS%%%%WWWDIR%%/docs/_static/fonts/RobotoSlab/roboto-slab-v7-bold.woff
-%%PORTDOCS%%%%WWWDIR%%/docs/_static/fonts/RobotoSlab/roboto-slab-v7-bold.woff2
-%%PORTDOCS%%%%WWWDIR%%/docs/_static/fonts/RobotoSlab/roboto-slab-v7-regular.eot
-%%PORTDOCS%%%%WWWDIR%%/docs/_static/fonts/RobotoSlab/roboto-slab-v7-regular.ttf
-%%PORTDOCS%%%%WWWDIR%%/docs/_static/fonts/RobotoSlab/roboto-slab-v7-regular.woff
-%%PORTDOCS%%%%WWWDIR%%/docs/_static/fonts/RobotoSlab/roboto-slab-v7-regular.woff2
-%%PORTDOCS%%%%WWWDIR%%/docs/_static/fonts/fontawesome-webfont.eot
-%%PORTDOCS%%%%WWWDIR%%/docs/_static/fonts/fontawesome-webfont.svg
-%%PORTDOCS%%%%WWWDIR%%/docs/_static/fonts/fontawesome-webfont.ttf
-%%PORTDOCS%%%%WWWDIR%%/docs/_static/fonts/fontawesome-webfont.woff
-%%PORTDOCS%%%%WWWDIR%%/docs/_static/fonts/fontawesome-webfont.woff2
+%%PORTDOCS%%%%WWWDIR%%/docs/_static/jquery-3.6.0.js
 %%PORTDOCS%%%%WWWDIR%%/docs/_static/jquery.js
-%%PORTDOCS%%%%WWWDIR%%/docs/_static/js/modernizr.min.js
+%%PORTDOCS%%%%WWWDIR%%/docs/_static/js/badge_only.js
+%%PORTDOCS%%%%WWWDIR%%/docs/_static/js/html5shiv-printshiv.min.js
+%%PORTDOCS%%%%WWWDIR%%/docs/_static/js/html5shiv.min.js
 %%PORTDOCS%%%%WWWDIR%%/docs/_static/js/theme.js
 %%PORTDOCS%%%%WWWDIR%%/docs/_static/language_data.js
 %%PORTDOCS%%%%WWWDIR%%/docs/_static/logo.png
@@ -750,6 +794,8 @@ man/man1/apachecouchdb.1.gz
 %%PORTDOCS%%%%WWWDIR%%/docs/_static/plus.png
 %%PORTDOCS%%%%WWWDIR%%/docs/_static/pygments.css
 %%PORTDOCS%%%%WWWDIR%%/docs/_static/searchtools.js
+%%PORTDOCS%%%%WWWDIR%%/docs/_static/sphinx_highlight.js
+%%PORTDOCS%%%%WWWDIR%%/docs/_static/underscore-1.13.1.js
 %%PORTDOCS%%%%WWWDIR%%/docs/_static/underscore.js
 %%PORTDOCS%%%%WWWDIR%%/docs/about.html
 %%PORTDOCS%%%%WWWDIR%%/docs/api/basics.html
@@ -791,6 +837,8 @@ man/man1/apachecouchdb.1.gz
 %%PORTDOCS%%%%WWWDIR%%/docs/cluster/purging.html
 %%PORTDOCS%%%%WWWDIR%%/docs/cluster/sharding.html
 %%PORTDOCS%%%%WWWDIR%%/docs/cluster/theory.html
+%%PORTDOCS%%%%WWWDIR%%/docs/cluster/tls_erlang_distribution.html
+%%PORTDOCS%%%%WWWDIR%%/docs/cluster/troubleshooting.html
 %%PORTDOCS%%%%WWWDIR%%/docs/config-ref.html
 %%PORTDOCS%%%%WWWDIR%%/docs/config/auth.html
 %%PORTDOCS%%%%WWWDIR%%/docs/config/cluster.html
@@ -820,6 +868,10 @@ man/man1/apachecouchdb.1.gz
 %%PORTDOCS%%%%WWWDIR%%/docs/cve/2018-11769.html
 %%PORTDOCS%%%%WWWDIR%%/docs/cve/2018-17188.html
 %%PORTDOCS%%%%WWWDIR%%/docs/cve/2018-8007.html
+%%PORTDOCS%%%%WWWDIR%%/docs/cve/2020-1955.html
+%%PORTDOCS%%%%WWWDIR%%/docs/cve/2021-38295.html
+%%PORTDOCS%%%%WWWDIR%%/docs/cve/2022-24706.html
+%%PORTDOCS%%%%WWWDIR%%/docs/cve/2023-26268.html
 %%PORTDOCS%%%%WWWDIR%%/docs/cve/index.html
 %%PORTDOCS%%%%WWWDIR%%/docs/ddocs/ddocs.html
 %%PORTDOCS%%%%WWWDIR%%/docs/ddocs/index.html
@@ -834,7 +886,7 @@ man/man1/apachecouchdb.1.gz
 %%PORTDOCS%%%%WWWDIR%%/docs/experimental.html
 %%PORTDOCS%%%%WWWDIR%%/docs/fauxton/index.html
 %%PORTDOCS%%%%WWWDIR%%/docs/fauxton/install.html
-%%PORTDOCS%%%%WWWDIR%%/docs/http-api.html
+%%PORTDOCS%%%%WWWDIR%%/docs/http-routingtable.html
 %%PORTDOCS%%%%WWWDIR%%/docs/index.html
 %%PORTDOCS%%%%WWWDIR%%/docs/install/docker.html
 %%PORTDOCS%%%%WWWDIR%%/docs/install/freebsd.html
@@ -894,10 +946,14 @@ man/man1/apachecouchdb.1.gz
 %%PORTDOCS%%%%WWWDIR%%/docs/whatsnew/2.3.html
 %%PORTDOCS%%%%WWWDIR%%/docs/whatsnew/3.0.html
 %%PORTDOCS%%%%WWWDIR%%/docs/whatsnew/3.1.html
+%%PORTDOCS%%%%WWWDIR%%/docs/whatsnew/3.2.html
+%%PORTDOCS%%%%WWWDIR%%/docs/whatsnew/3.3.html
 %%PORTDOCS%%%%WWWDIR%%/docs/whatsnew/index.html
+%%PORTDOCS%%%%WWWDIR%%/favicon.ico
+%%PORTDOCS%%%%WWWDIR%%/index.html
 @comment fauxton core UI
-%%WWWDIR%%/dashboard.assets/css/styles.2ca2557452a177700f4c.css
-%%WWWDIR%%/dashboard.assets/css/styles.bdfacd9ba862d16e41b9.css
+%%WWWDIR%%/dashboard.assets/css/styles.2fe6f2383b82d9a7610a.css
+%%WWWDIR%%/dashboard.assets/css/styles.5bda604c70f688307c36.css
 %%WWWDIR%%/dashboard.assets/fonts/fauxtonicon5.eot
 %%WWWDIR%%/dashboard.assets/fonts/fauxtonicon5.ttf
 %%WWWDIR%%/dashboard.assets/fonts/fauxtonicon5.woff
@@ -908,15 +964,44 @@ man/man1/apachecouchdb.1.gz
 %%WWWDIR%%/dashboard.assets/img/asf-feather-logo.png
 %%WWWDIR%%/dashboard.assets/img/couch-watermark.png
 %%WWWDIR%%/dashboard.assets/img/couchdb-logo.png
+%%WWWDIR%%/dashboard.assets/img/dawn-1.png
+%%WWWDIR%%/dashboard.assets/img/dawn-2.png
 %%WWWDIR%%/dashboard.assets/img/fauxtonicon5.svg
 %%WWWDIR%%/dashboard.assets/img/fontawesome-webfont.svg
 %%WWWDIR%%/dashboard.assets/img/github.png
-%%WWWDIR%%/dashboard.assets/img/googleplus.png
+%%WWWDIR%%/dashboard.assets/img/idle_fingers-1.png
+%%WWWDIR%%/dashboard.assets/img/idle_fingers-2.png
 %%WWWDIR%%/dashboard.assets/img/linkedin.png
 %%WWWDIR%%/dashboard.assets/img/loader.gif
+%%WWWDIR%%/dashboard.assets/img/main-1.png
+%%WWWDIR%%/dashboard.assets/img/main-10.png
+%%WWWDIR%%/dashboard.assets/img/main-11.png
+%%WWWDIR%%/dashboard.assets/img/main-12.png
+%%WWWDIR%%/dashboard.assets/img/main-13.png
+%%WWWDIR%%/dashboard.assets/img/main-14.png
+%%WWWDIR%%/dashboard.assets/img/main-15.png
+%%WWWDIR%%/dashboard.assets/img/main-16.png
+%%WWWDIR%%/dashboard.assets/img/main-17.png
+%%WWWDIR%%/dashboard.assets/img/main-2.png
+%%WWWDIR%%/dashboard.assets/img/main-3.png
+%%WWWDIR%%/dashboard.assets/img/main-4.png
+%%WWWDIR%%/dashboard.assets/img/main-5.png
+%%WWWDIR%%/dashboard.assets/img/main-6.png
+%%WWWDIR%%/dashboard.assets/img/main-7.png
+%%WWWDIR%%/dashboard.assets/img/main-8.png
+%%WWWDIR%%/dashboard.assets/img/main-9.png
 %%WWWDIR%%/dashboard.assets/img/twitter.png
-%%WWWDIR%%/dashboard.assets/js/bundle.bdfacd9ba862d16e41b9.js
-%%WWWDIR%%/dashboard.assets/js/manifest.583577db79221d5ae84e.js
-%%WWWDIR%%/dashboard.assets/js/vendor.2ca2557452a177700f4c.js
-%%WWWDIR%%/favicon.ico
-%%WWWDIR%%/index.html
+%%WWWDIR%%/dashboard.assets/js/0fd8f6ec45ed7274dd177deffbe37e01.js
+%%WWWDIR%%/dashboard.assets/js/10f3888025f06864384f3344ff3fb4ee.js
+%%WWWDIR%%/dashboard.assets/js/1ca975b7393e70f15fbec7e5ae50cb4d.js
+%%WWWDIR%%/dashboard.assets/js/61afad92d1f60d84915d4641b8cac704.js
+%%WWWDIR%%/dashboard.assets/js/6b7557f2290a81cf153c6165770c4c6f.js
+%%WWWDIR%%/dashboard.assets/js/997640c55a6ded9da7e02f7f9d5a6999.js
+%%WWWDIR%%/dashboard.assets/js/ac536bd808e2ead2bbecdb8bfa694b76.js
+%%WWWDIR%%/dashboard.assets/js/bundle.2fe6f2383b82d9a7610a.js
+%%WWWDIR%%/dashboard.assets/js/bundle.2fe6f2383b82d9a7610a.js.LICENSE.txt
+%%WWWDIR%%/dashboard.assets/js/eb8be84d5cbcf3648f0c6c73515ddc74.js
+%%WWWDIR%%/dashboard.assets/js/manifest.f9cde0db85e3cd97708e.js
+%%WWWDIR%%/dashboard.assets/js/vendor.5bda604c70f688307c36.js
+%%WWWDIR%%/dashboard.assets/js/vendor.5bda604c70f688307c36.js.LICENSE.txt
+
diff --git a/databases/courier-authlib-mysql/Makefile b/databases/courier-authlib-mysql/Makefile
index 2a5834ab11b9..496f19319021 100644
--- a/databases/courier-authlib-mysql/Makefile
+++ b/databases/courier-authlib-mysql/Makefile
@@ -1,6 +1,3 @@
-# Created by: Yarema <yds@CoolRat.org>
-
-PORTREVISION=	0
 PKGNAMESUFFIX=	-mysql
 
 COMMENT=	MySQL support for the Courier authentication library
diff --git a/databases/courier-authlib-pgsql/Makefile b/databases/courier-authlib-pgsql/Makefile
index 19774b828c37..58c6f3042856 100644
--- a/databases/courier-authlib-pgsql/Makefile
+++ b/databases/courier-authlib-pgsql/Makefile
@@ -1,6 +1,3 @@
-# Created by: Yarema <yds@CoolRat.org>
-
-PORTREVISION=	0
 PKGNAMESUFFIX=	-pgsql
 
 COMMENT=	PostgreSQL support for the Courier authentication library
diff --git a/databases/courier-authlib-sqlite/Makefile b/databases/courier-authlib-sqlite/Makefile
index e2262397688a..43ab74a98a31 100644
--- a/databases/courier-authlib-sqlite/Makefile
+++ b/databases/courier-authlib-sqlite/Makefile
@@ -1,6 +1,3 @@
-# Created by: Yarema <yds@CoolRat.org>
-
-PORTREVISION=	0
 PKGNAMESUFFIX=	-sqlite
 
 COMMENT=	SQLite support for the Courier authentication library
diff --git a/databases/courier-authlib-userdb/Makefile b/databases/courier-authlib-userdb/Makefile
index 470b067a8e77..fa4afcaed494 100644
--- a/databases/courier-authlib-userdb/Makefile
+++ b/databases/courier-authlib-userdb/Makefile
@@ -1,11 +1,10 @@
-# Created by: Yarema <yds@CoolRat.org>
-
-PORTREVISION=	0
 PKGNAMESUFFIX=	-userdb
 
 COMMENT=	Userdb support for the Courier authentication library
 CATEGORIES=	databases mail
 
+CONFLICTS_INSTALL=	courier-authlib-usergdbm # lib/courier-authlib/libauthuserdb.so
+
 MASTERDIR=	${.CURDIR}/../../security/courier-authlib
 
 .include "${MASTERDIR}/Makefile"
diff --git a/databases/courier-authlib-usergdbm/Makefile b/databases/courier-authlib-usergdbm/Makefile
index bec00406355f..36e101a00423 100644
--- a/databases/courier-authlib-usergdbm/Makefile
+++ b/databases/courier-authlib-usergdbm/Makefile
@@ -1,11 +1,10 @@
-# Created by: Yarema <yds@CoolRat.org>
-
-PORTREVISION=	0
 PKGNAMESUFFIX=	-usergdbm
 
 COMMENT=	Userdb support for the Courier authentication library
 CATEGORIES=	databases mail
 
+CONFLICTS_INSTALL=	courier-authlib-userdb # lib/courier-authlib/libauthuserdb.so
+
 MASTERDIR=	${.CURDIR}/../../security/courier-authlib
 
 .include "${MASTERDIR}/Makefile"
diff --git a/databases/cppdb/Makefile b/databases/cppdb/Makefile
index f386a5e22b30..f4cacbc35aa6 100644
--- a/databases/cppdb/Makefile
+++ b/databases/cppdb/Makefile
@@ -1,5 +1,3 @@
-# Created by: Mohammad S. Babaei <info@babaei.net>
-
 PORTNAME=	cppdb
 PORTVERSION=	0.3.1
 PORTREVISION=	2
@@ -8,11 +6,16 @@ MASTER_SITES=	SF/cppcms/${PORTNAME}/${PORTVERSION}
 
 MAINTAINER=	info@babaei.net
 COMMENT=	Platform and database independent SQL connectivity library
+WWW=		http://cppcms.com/sql/cppdb/
 
 LICENSE=	BSL MIT
 LICENSE_COMB=	dual
 LICENSE_FILE=	${WRKSRC}/copyright.txt
 
+USES=		cmake tar:bzip2
+USE_CXXSTD=	c++14
+USE_LDCONFIG=	yes
+
 NO_OPTIONS_SORT=	yes
 OPTIONS_SINGLE=		SQLITE3 PGSQL MYSQL ODBC
 OPTIONS_SINGLE_MYSQL=	MYSQL_DISABLE MYSQL_INTERNAL MYSQL_MODULE
@@ -39,9 +42,6 @@ SQLITE3_DISABLE_DESC=	Disable SQLite 3 backend
 SQLITE3_INTERNAL_DESC=	Link SQLite 3 backend into CppDB
 SQLITE3_MODULE_DESC=	Build SQLite 3 backend as a CppDB module
 
-USE_LDCONFIG=	yes
-USES=		cmake tar:bzip2
-
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MMYSQL_DISABLE}
diff --git a/databases/cppdb/pkg-descr b/databases/cppdb/pkg-descr
index c09407e00974..eee020ace6e2 100644
--- a/databases/cppdb/pkg-descr
+++ b/databases/cppdb/pkg-descr
@@ -6,5 +6,3 @@ RDBMSs as possible via cppdb-odbc bridge.
 It was written with performance, simplicity in use and locale safety as the
 primary goals in mind. It also provides both explicit verbose API and brief
 and nice syntactic sugar.
-
-WWW: http://cppcms.com/sql/cppdb/
diff --git a/databases/credis/Makefile b/databases/credis/Makefile
index 232c4b02cce0..3d79974ca38e 100644
--- a/databases/credis/Makefile
+++ b/databases/credis/Makefile
@@ -1,5 +1,3 @@
-# Created by: Steven Kreuzer <skreuzer@FreeBSD.org>
-
 PORTNAME=	credis
 PORTVERSION=	0.2.3
 DISTVERSIONPREFIX=	v
@@ -7,6 +5,7 @@ CATEGORIES=	databases
 
 MAINTAINER=	skreuzer@FreeBSD.org
 COMMENT=	Library for communicating with Redis servers
+WWW=		https://code.google.com/p/credis/
 
 LICENSE=	BSD3CLAUSE
 
diff --git a/databases/credis/pkg-descr b/databases/credis/pkg-descr
index 5ed030ce8d38..8496074a964f 100644
--- a/databases/credis/pkg-descr
+++ b/databases/credis/pkg-descr
@@ -1,3 +1 @@
 Credis is a client library in plain C for communicating with Redis servers.
-
-WWW: http://code.google.com/p/credis/
diff --git a/databases/cutelyst-asql/Makefile b/databases/cutelyst-asql/Makefile
index 2ac32cb62616..e8691d75e01b 100644
--- a/databases/cutelyst-asql/Makefile
+++ b/databases/cutelyst-asql/Makefile
@@ -1,11 +1,12 @@
 PORTNAME=	asql
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.43.0
+DISTVERSION=	0.80.0
 CATEGORIES=	databases
 PKGNAMEPREFIX=	cutelyst-
 
 MAINTAINER=	adridg@FreeBSD.org
 COMMENT=	Qt async SQL library (for Postgres)
+WWW=		https://github.com/cutelyst/asql
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
@@ -15,7 +16,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 USES=		cmake compiler:c++11-lang localbase pgsql qt:5
 USE_GITHUB=	yes
 USE_LDCONFIG=	yes
-USE_QT=		qmake_build buildtools_build \
+USE_QT=		qmake:build buildtools:build \
 		core
 
 GH_ACCOUNT=	cutelyst
diff --git a/databases/cutelyst-asql/distinfo b/databases/cutelyst-asql/distinfo
index 3ac7de9a6e7f..7b066792a0eb 100644
--- a/databases/cutelyst-asql/distinfo
+++ b/databases/cutelyst-asql/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1625653795
-SHA256 (cutelyst-asql-v0.43.0_GH0.tar.gz) = 77eb209f663d9d6cca448064c1167d16b43e14e435eb04e4fc13cfe6d01564df
-SIZE (cutelyst-asql-v0.43.0_GH0.tar.gz) = 33998
+TIMESTAMP = 1687121212
+SHA256 (cutelyst-asql-v0.80.0_GH0.tar.gz) = 266ca4043822cc69504c3adfab3d4e3a43b0dbb7d7aa55510cf9175d75a03f9e
+SIZE (cutelyst-asql-v0.80.0_GH0.tar.gz) = 42007
diff --git a/databases/cutelyst-asql/pkg-descr b/databases/cutelyst-asql/pkg-descr
index 7018b4d5ea7b..a7b81bb7e0e8 100644
--- a/databases/cutelyst-asql/pkg-descr
+++ b/databases/cutelyst-asql/pkg-descr
@@ -8,5 +8,3 @@ Qt Async Sql library
 * Notifications
 
 Supports database migrations and queries both as JSON and QVariantHash.
-
-WWW: https://github.com/cutelyst/asql
diff --git a/databases/cutelyst-asql/pkg-plist b/databases/cutelyst-asql/pkg-plist
index 834ae0044267..17f620d8f125 100644
--- a/databases/cutelyst-asql/pkg-plist
+++ b/databases/cutelyst-asql/pkg-plist
@@ -1,11 +1,13 @@
-bin/asql-migration
+bin/asql-migration0-qt5
 include/asql-qt5/ASql/acache.h
 include/asql-qt5/ASql/adatabase.h
 include/asql-qt5/ASql/adriver.h
+include/asql-qt5/ASql/adriverfactory.h
 include/asql-qt5/ASql/amigrations.h
+include/asql-qt5/ASql/apg.h
 include/asql-qt5/ASql/apool.h
 include/asql-qt5/ASql/apreparedquery.h
-include/asql-qt5/ASql/aqsqlexports.h
+include/asql-qt5/ASql/asqlexports.h
 include/asql-qt5/ASql/aresult.h
 include/asql-qt5/ASql/atransaction.h
 lib/cmake/ASqlQt5/ASql0Qt5Targets-%%CMAKE_BUILD_TYPE%%.cmake
@@ -15,4 +17,10 @@ lib/cmake/ASqlQt5/ASqlQt5ConfigVersion.cmake
 lib/libASqlQt5.so
 lib/libASqlQt5.so.0
 lib/libASqlQt5.so.%%SOVER%%
+lib/libASqlQt5Migrations.so
+lib/libASqlQt5Migrations.so.0
+lib/libASqlQt5Migrations.so.%%SOVER%%
+lib/libASqlQt5Pg.so
+lib/libASqlQt5Pg.so.0
+lib/libASqlQt5Pg.so.%%SOVER%%
 libdata/pkgconfig/ASqlQt5.pc
diff --git a/databases/dalmp/Makefile b/databases/dalmp/Makefile
index cb75eebf3e19..b73a5e3237d1 100644
--- a/databases/dalmp/Makefile
+++ b/databases/dalmp/Makefile
@@ -1,11 +1,10 @@
-# Created by: Nicolas de Bari Embriz <nbari@dalmp.com>
-
 PORTNAME=	dalmp
 PORTVERSION=	3.1.0
 CATEGORIES=	databases
 
 MAINTAINER=	nbari@tequila.io
 COMMENT=	Database Abstraction Layer for MySQL using PHP
+WWW=		https://docs.dalmp.com/
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
@@ -18,7 +17,7 @@ USES=		php
 
 NO_BUILD=	yes
 NO_ARCH=	yes
-USE_PHP=	pcre mysqli session memcache sqlite3 curl redis
+USE_PHP=	mysqli session memcache sqlite3 curl redis
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${DATADIR}
diff --git a/databases/dalmp/pkg-descr b/databases/dalmp/pkg-descr
index 564141b51397..0bd9f3ad8dd5 100644
--- a/databases/dalmp/pkg-descr
+++ b/databases/dalmp/pkg-descr
@@ -20,5 +20,3 @@ Details
 * Works out of the box with Cloud databases like Amazon RDS or Google cloud.
 * Lazy database connection. Connect only when needed.
 * PSR-0 compliance.
-
-WWW: http://docs.dalmp.com/
diff --git a/databases/datasette/Makefile b/databases/datasette/Makefile
new file mode 100644
index 000000000000..069f94fcb475
--- /dev/null
+++ b/databases/datasette/Makefile
@@ -0,0 +1,40 @@
+PORTNAME=	datasette
+DISTVERSION=	0.63.3
+CATEGORIES=	databases www
+MASTER_SITES=	PYPI
+
+MAINTAINER=	yuri@FreeBSD.org
+COMMENT=	Multi-tool for exploring and publishing data
+WWW=		https://datasette.io/
+
+LICENSE=	APACHE20
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
+PY_DEPENDS=	\
+		${PYTHON_PKGNAMEPREFIX}aiofiles>=0.4:devel/py-aiofiles@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}asgi-csrf>=0.9:www/py-asgi-csrf@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}asgiref>=3.2.10:www/py-asgiref@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}click>=7.1.1:devel/py-click@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}click-default-group-wheel>=1.2.2:devel/py-click-default-group-wheel@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}hupper>=1.9:devel/py-hupper@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}janus>=0.6.2:devel/py-janus@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}Jinja2>=2.10.3:devel/py-Jinja2@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}httpx>=0.20:www/py-httpx@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}itsdangerous>=1.1:security/py-itsdangerous@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}mergedeep>=1.1.1:devel/py-mergedeep@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pint>=0.9:devel/py-pint@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pluggy>=1.0:devel/py-pluggy@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}uvicorn>=0.11:www/py-uvicorn@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}yaml>=5.3:devel/py-yaml@${PY_FLAVOR}
+BUILD_DEPENDS=	${PY_DEPENDS} \
+		${PYTHON_PKGNAMEPREFIX}pip>0:devel/py-pip@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pytest-runner>0:devel/py-pytest-runner@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR}
+RUN_DEPENDS=	${PY_DEPENDS}
+
+USES=		python
+USE_PYTHON=	distutils autoplist
+
+NO_ARCH=	yes
+
+.include <bsd.port.mk>
diff --git a/databases/datasette/distinfo b/databases/datasette/distinfo
new file mode 100644
index 000000000000..9ceaaa3fa8fb
--- /dev/null
+++ b/databases/datasette/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1671400720
+SHA256 (datasette-0.63.3.tar.gz) = fc6a37c73d0d08e9240211a24893eb09886b84427be1ad2295a67be231175af3
+SIZE (datasette-0.63.3.tar.gz) = 210736
diff --git a/databases/datasette/pkg-descr b/databases/datasette/pkg-descr
new file mode 100644
index 000000000000..af026eff19d4
--- /dev/null
+++ b/databases/datasette/pkg-descr
@@ -0,0 +1,7 @@
+Datasette is a tool for exploring and publishing data. It helps people take
+data of any shape or size and publish that as an interactive, explorable
+website and accompanying API.
+
+Datasette is aimed at data journalists, museum curators, archivists, local
+governments, scientists, researchers and anyone else who has data that they
+wish to share with the world.
diff --git a/databases/db/Makefile b/databases/db/Makefile
index 2b815ab56b59..3bb0aadafbfb 100644
--- a/databases/db/Makefile
+++ b/databases/db/Makefile
@@ -1,7 +1,5 @@
-# Created by: Edwin Groothuis (edwin@mavetju.org)
-
 PORTNAME=	db
-PORTVERSION=	1.26
+PORTVERSION=	1.27
 PORTEPOCH=	2
 CATEGORIES=	databases
 MASTER_SITES=	https://ftp.netbsd.org/pub/NetBSD/NetBSD-current/src/usr.bin/db/
@@ -10,6 +8,7 @@ DIST_SUBDIR=	${PKGNAME}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Manipulate db(3)'s btree(3) and hash(3) databases - NetBSD port
+WWW=		http://cvsweb.netbsd.org/bsdweb.cgi/src/usr.bin/db/
 
 LICENSE=	BSD4CLAUSE
 
@@ -18,7 +17,7 @@ CFLAGS+=	-D__dead=""
 NO_WRKSUBDIR=	yes
 
 PLIST_FILES=	bin/db \
-		man/man1/db.1.gz
+		share/man/man1/db.1.gz
 
 do-extract:
 	${MKDIR} ${WRKSRC}
@@ -28,6 +27,6 @@ do-extract:
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/db ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/db.1 ${STAGEDIR}${PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/db.1 ${STAGEDIR}${PREFIX}/share/man/man1
 
 .include <bsd.port.mk>
diff --git a/databases/db/distinfo b/databases/db/distinfo
index 948fedf36125..de4555f12c15 100644
--- a/databases/db/distinfo
+++ b/databases/db/distinfo
@@ -1,7 +1,7 @@
-TIMESTAMP = 1629369890
-SHA256 (db-1.26,2/Makefile) = fd19fa7f61662f92826dd7bdb734767f28e82634746363bf84db3a395b4064d9
-SIZE (db-1.26,2/Makefile) = 128
-SHA256 (db-1.26,2/db.c) = afcba6fe3bccc2fd14f9525ad386847a0f689f643fe22ebd7d598d5a5b1be44b
-SIZE (db-1.26,2/db.c) = 16971
-SHA256 (db-1.26,2/db.1) = dc6a135fa61041700b2889b8bbea286ebdbd452535eb63b6c359e51cd16e9f80
-SIZE (db-1.26,2/db.1) = 7257
+TIMESTAMP = 1636875813
+SHA256 (db-1.27,2/Makefile) = fd19fa7f61662f92826dd7bdb734767f28e82634746363bf84db3a395b4064d9
+SIZE (db-1.27,2/Makefile) = 128
+SHA256 (db-1.27,2/db.c) = 3cb6112db48070dd0ea01ea23b2c8f278780852a3e255faf5516b53a2f0bda6f
+SIZE (db-1.27,2/db.c) = 16996
+SHA256 (db-1.27,2/db.1) = dc6a135fa61041700b2889b8bbea286ebdbd452535eb63b6c359e51cd16e9f80
+SIZE (db-1.27,2/db.1) = 7257
diff --git a/databases/db/pkg-descr b/databases/db/pkg-descr
index 13c55d87a341..9c3fd4371a1f 100644
--- a/databases/db/pkg-descr
+++ b/databases/db/pkg-descr
@@ -1,3 +1 @@
 db allows manipulation of btree(3) and hash(3) (db(3)) databases.
-
-WWW: http://cvsweb.netbsd.org/bsdweb.cgi/src/usr.bin/db/
diff --git a/databases/db18/Makefile b/databases/db18/Makefile
index 22356cbfd9ca..8b6ddb72707f 100644
--- a/databases/db18/Makefile
+++ b/databases/db18/Makefile
@@ -1,5 +1,3 @@
-# Created by: Matthias Andree <mandree@FreeBSD.org>
-
 PORTNAME=	db18
 PORTVERSION=	18.1.40
 CATEGORIES=	databases java
@@ -10,58 +8,76 @@ PKGNAMEPREFIX?=
 DISTNAME=	db-${PORTVERSION}
 DIST_SUBDIR=	bdb
 
-MAINTAINER=	yasu@utahime.org
+MAINTAINER=	yasu@FreeBSD.org
 COMMENT=	Oracle Berkeley DB, Release ${BDBVER}
+WWW=		https://www.oracle.com/database/berkeley-db/
 
 LICENSE=	AGPLv3 BSD3CLAUSE UPL10
 LICENSE_COMB=	multi
 LICENSE_NAME_UPL10=	The Universal Permissive License (UPL), Version 1.0
-LICENSE_FILE=	${WRKSRC}/../LICENSE
 LICENSE_FILE_UPL10=	${WRKSRC}/../EXAMPLES-LICENSE
+LICENSE_FILE=	${WRKSRC}/../LICENSE
 LICENSE_PERMS_UPL10=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 BROKEN_mips64=	no usable MUTEX implementation, assy works only for MIPS32, POSIX mutexes are unshared
 
-BDBVER=		${PORTVERSION:R}
-BDBMAJ=		${BDBVER:R}
-CONFIGURE_ARGS=	--enable-cxx --enable-stl --enable-dbm \
-		--enable-compat185 --enable-dump185 \
-		--includedir=${PREFIX}/include/${PORTNAME} \
-		--libdir=${PREFIX}/lib/${PORTNAME} \
-		--bindir=${PREFIX}/bin/${PORTNAME}
-CONFIGURE_SCRIPT=	../dist/configure
-GNU_CONFIGURE=	yes
 USES=		gmake libtool ssl
-INSTALL_TARGET=	install_include install_lib install_utilities
-WRKSRC=		${WRKDIR}/${DISTNAME}/build_unix
-PATCH_WRKSRC=	${WRKDIR}/${DISTNAME}
 USE_LDCONFIG=	yes
-PLIST_SUB=	BDBMAJ=${BDBMAJ} BDBVER=${BDBVER}
+
+GNU_CONFIGURE=		yes
+CONFIGURE_SCRIPT=	../dist/configure
+CONFIGURE_ARGS=		--bindir=${PREFIX}/bin/${PORTNAME} \
+			--enable-compat185 \
+			--enable-cxx \
+			--enable-dbm \
+			--enable-dump185 \
+			--enable-stl \
+			--includedir=${PREFIX}/include/${PORTNAME} \
+			--libdir=${PREFIX}/lib/${PORTNAME}
+
 MAKE_ARGS+=	docdir=${DOCSDIR}
+INSTALL_TARGET=	install_include install_lib install_utilities
 
-OPTIONS_DEFINE=	CRYPTO DEBUG L10N JAVA TCL DOCS
-OPTIONS_DEFAULT=CRYPTO
-OPTIONS_SUB=	yes
-CRYPTO_DESC=	Cryptography support
-L10N_DESC=	Localization support (EXPERIMENTAL)
+CFLAGS+=	-I${OPENSSLINC} -Wno-deprecated-non-prototype \
+		-Wno-incompatible-library-redeclaration -Wno-int-conversion
+CPPFLAGS+=	-I${OPENSSLINC}
+LDFLAGS+=	-L${OPENSSLLIB}
 
+PATCH_WRKSRC=	${WRKDIR}/${DISTNAME}
+WRKSRC=		${WRKDIR}/${DISTNAME}/build_unix
+
+PLIST_SUB=	BDBMAJ=${BDBMAJ} \
+		BDBVER=${BDBVER}
 PORTDOCS=	*
 
-DBLIBS=	libdb libdb_cxx libdb_stl
+OPTIONS_DEFINE=		CRYPTO DEBUG DOCS JAVA L10N TCL
+OPTIONS_DEFAULT=	CRYPTO
+OPTIONS_SUB=		yes
+
+CRYPTO_DESC=	Cryptography support
+L10N_DESC=	Localization support (EXPERIMENTAL)
 
-DEBUG_CONFIGURE_ENABLE=	debug umrw
 CRYPTO_CONFIGURE_WITH=	cryptography=yes
-L10N_CONFIGURE_ENABLE=	localization
+DEBUG_CONFIGURE_ENABLE=	debug umrw
+DOCS_INSTALL_TARGET=	install_docs
 JAVA_USE=		java
-JAVA_VARS=		DBLIBS+=libdb_java JAVA_VERSION="7+"
 JAVA_CONFIGURE_ENABLE=	java
+JAVA_CONFIGURE_ENV=	JAR="${JAR}" \
+			JAVA="${JAVA}" \
+			JAVAC="${JAVAC}"
 JAVA_CPPFLAGS=		-I"${JAVA_HOME}/include"
-JAVA_CONFIGURE_ENV=	JAVAC="${JAVAC}" JAR="${JAR}" JAVA="${JAVA}"
-TCL_CONFIGURE_ENABLE=	tcl
+JAVA_VARS=		DBLIBS+=libdb_java \
+			JAVA_VERSION="8+"
+L10N_CONFIGURE_ENABLE=	localization
 TCL_USES=		tcl
+TCL_CONFIGURE_ENABLE=	tcl
 TCL_CONFIGURE_WITH=	tcl=${TCL_LIBDIR}
-TCL_VARS=		DBLIBS+=libdb_tcl 
-DOCS_INSTALL_TARGET=	install_docs
+TCL_VARS=		DBLIBS+=libdb_tcl
+
+BDBVER=		${PORTVERSION:R}
+BDBMAJ=		${BDBVER:R}
+
+DBLIBS=		libdb libdb_cxx libdb_stl
 
 .include <bsd.port.options.mk>
 
diff --git a/databases/db18/pkg-descr b/databases/db18/pkg-descr
index 9b21659e3894..c4ab52726884 100644
--- a/databases/db18/pkg-descr
+++ b/databases/db18/pkg-descr
@@ -7,5 +7,3 @@ data, can scale under extreme load, but requires no ongoing database
 administration. As a developer, you can focus on your application and
 be confident that Oracle Berkeley DB will manage your persistence
 needs.
-
-WWW: https://www.oracle.com/database/berkeley-db/
diff --git a/databases/db5/Makefile b/databases/db5/Makefile
index 61ee4f591985..23cfb01cbb64 100644
--- a/databases/db5/Makefile
+++ b/databases/db5/Makefile
@@ -1,8 +1,6 @@
-# Created by: Matthias Andree <mandree@FreeBSD.org>
-
 PORTNAME=	db5
 PORTVERSION=	5.3.28
-PORTREVISION=	7
+PORTREVISION=	9
 CATEGORIES=	databases java
 MASTER_SITES=	https://download.oracle.com/berkeley-db/
 PKGNAMEPREFIX?=
@@ -11,8 +9,12 @@ PKGNAMEPREFIX?=
 DISTNAME=	db-${PORTVERSION}
 DIST_SUBDIR=	bdb
 
-MAINTAINER=	mandree@FreeBSD.org
+DEPRECATED=	EOLd, potential security issues, maybe use db18 instead
+EXPIRATION_DATE=2022-06-30
+
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Oracle Berkeley DB, revision ${BDBVER}
+WWW=		https://www.oracle.com/database/berkeley-db/db.html
 
 LICENSE=	SLEEPYCAT
 LICENSE_GROUPS=	FSF GPL OSI
@@ -38,12 +40,11 @@ PLIST_SUB=	BDBMAJ=${BDBMAJ} BDBVER=${BDBVER}
 MAKE_ARGS+=	docdir=${DOCSDIR}
 CFLAGS+=	-Wall -Wextra
 
-OPTIONS_DEFINE=	CRYPTO DEBUG L10N SQL JAVA TCL DOCS
+OPTIONS_DEFINE=	CRYPTO DEBUG L10N JAVA TCL DOCS
 OPTIONS_DEFAULT=CRYPTO
 OPTIONS_SUB=	yes
 CRYPTO_DESC=	Cryptography support
 L10N_DESC=	Localization support (EXPERIMENTAL)
-SQL_DESC=	Enable SQL API (EXPERIMENTAL)
 
 PORTDOCS=	*
 
@@ -52,12 +53,10 @@ DBLIBS=	libdb libdb_cxx libdb_stl
 DEBUG_CONFIGURE_ENABLE=	debug umrw
 CRYPTO_CONFIGURE_WITH=	cryptography=yes
 L10N_CONFIGURE_ENABLE=	localization
-SQL_CONFIGURE_ENABLE=	sql sql_codegen
-SQL_VARS=		DBLIBS+=libdb_sql
 JAVA_USE=		java
 # db5 is incompatible with openjdk8 and causes IllegalArgument
 # exceptions during build
-JAVA_VARS=		DBLIBS+=libdb_java JAVA_VERSION="1.7"
+JAVA_VARS=		DBLIBS+=libdb_java JAVA_VERSION="8"
 JAVA_CONFIGURE_ENABLE=	java
 JAVA_CPPFLAGS=		-I"${JAVA_HOME}/include"
 JAVA_CONFIGURE_ENV=	JAVAC="${JAVAC}" JAR="${JAR}" JAVA="${JAVA}" JAVACFLAGS="-Xlint:unchecked"
@@ -78,10 +77,12 @@ CONFIGURE_ARGS+=	--with-mutex=POSIX/pthreads
 .endif
 
 post-patch:
-	${REINPLACE_CMD} -e '/^DOCLIST/{s/csharp//;}' ${WRKSRC}/../dist/Makefile.in
-	${REINPLACE_CMD} -Ee 's/[[:<:]]atomic_init[[:>:]]/db_atomic_init/g' ${WRKSRC}/../src/mp/mp* ${WRKSRC}/../src/mutex/mut_*
+	${REINPLACE_CMD} -i '' -e '/^DOCLIST/{s/csharp//;}' ${WRKSRC}/../dist/Makefile.in
+	${REINPLACE_CMD} -i '' -Ee 's/[[:<:]]atomic_init[[:>:]]/db_atomic_init/g' ${WRKSRC}/../src/mp/mp* ${WRKSRC}/../src/mutex/mut_*
 
 post-install:
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/db5/db_*
+	${RM} -r ${STAGEDIR}${DOCSDIR}/bdb-sql
 .for i in ${DBLIBS}
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/${i}-${BDBVER}.so.0
 	${LN} -s -f ${PORTNAME}/${i}-${BDBVER}.so.0 ${STAGEDIR}${PREFIX}/lib
@@ -100,9 +101,6 @@ post-install-JAVA-off:
 	${RM} -r ${STAGEDIR}${DOCSDIR}/${i}/JAVA
 .endfor
 
-post-install-SQL-off:
-	${RM} -r ${STAGEDIR}${DOCSDIR}/bdb-sql
-
 post-install-TCL-on:
 	echo "package ifneeded Db_tcl ${BDBVER} \
 	      [list load [file join $$dir libdb_tcl-${BDBVER}.so]] \
diff --git a/databases/db5/files/patch-dist_configure b/databases/db5/files/patch-dist_configure
index 830bc1f487ef..1243a1117aaf 100644
--- a/databases/db5/files/patch-dist_configure
+++ b/databases/db5/files/patch-dist_configure
@@ -13,3 +13,11 @@
  MAKEFILE_CXXLINK="\$(LIBTOOL) --mode=link ${MAKEFILE_CXXLINK}"
  
  
+@@ -19144,6 +19144,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+               test -z "$ax_tls_defn_keyword" && continue
+           cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
++#include <stddef.h>
+ template <typename T>class TLSClass {
+               public: static  $ax_tls_decl_keyword  T *tlsvar;
+               };
diff --git a/databases/db5/pkg-descr b/databases/db5/pkg-descr
index 101e0d20d451..c4ab52726884 100644
--- a/databases/db5/pkg-descr
+++ b/databases/db5/pkg-descr
@@ -7,5 +7,3 @@ data, can scale under extreme load, but requires no ongoing database
 administration. As a developer, you can focus on your application and
 be confident that Oracle Berkeley DB will manage your persistence
 needs.
-
-WWW: https://www.oracle.com/database/berkeley-db/db.html
diff --git a/databases/db5/pkg-plist b/databases/db5/pkg-plist
index 4786815e655c..2a94abad7208 100644
--- a/databases/db5/pkg-plist
+++ b/databases/db5/pkg-plist
@@ -9,12 +9,10 @@ bin/db5/db_log_verify
 bin/db5/db_printlog
 bin/db5/db_recover
 bin/db5/db_replicate
-%%SQL%%bin/db5/db_sql_codegen
 bin/db5/db_stat
 bin/db5/db_tuner
 bin/db5/db_upgrade
 bin/db5/db_verify
-%%SQL%%bin/db5/dbsql
 bin/db_archive-%%BDBMAJ%%
 bin/db_archive-%%BDBVER%%
 bin/db_checkpoint-%%BDBMAJ%%
@@ -37,8 +35,6 @@ bin/db_recover-%%BDBMAJ%%
 bin/db_recover-%%BDBVER%%
 bin/db_replicate-%%BDBMAJ%%
 bin/db_replicate-%%BDBVER%%
-%%SQL%%bin/db_sql_codegen-%%BDBMAJ%%
-%%SQL%%bin/db_sql_codegen-%%BDBVER%%
 bin/db_stat-%%BDBMAJ%%
 bin/db_stat-%%BDBVER%%
 bin/db_tuner-%%BDBMAJ%%
@@ -47,12 +43,9 @@ bin/db_upgrade-%%BDBMAJ%%
 bin/db_upgrade-%%BDBVER%%
 bin/db_verify-%%BDBMAJ%%
 bin/db_verify-%%BDBVER%%
-%%SQL%%bin/dbsql-%%BDBMAJ%%
-%%SQL%%bin/dbsql-%%BDBVER%%
 include/db5/db.h
 include/db5/db_185.h
 include/db5/db_cxx.h
-%%SQL%%include/db5/dbsql.h
 include/db5/dbstl_base_iterator.h
 include/db5/dbstl_common.h
 include/db5/dbstl_container.h
@@ -89,13 +82,6 @@ lib/db5/libdb_cxx.so
 %%JAVA%%lib/db5/libdb_java.a
 %%JAVA%%lib/db5/libdb_java.so
 %%JAVA%%lib/db5/libdb_java-%%BDBMAJ%%.so
-%%SQL%%lib/db5/libdb_sql-%%BDBVER%%.a
-%%SQL%%lib/db5/libdb_sql-%%BDBVER%%.so
-%%SQL%%lib/db5/libdb_sql-%%BDBVER%%.so.0
-%%SQL%%lib/db5/libdb_sql-%%BDBVER%%.so.0.0.0
-%%SQL%%lib/db5/libdb_sql.a
-%%SQL%%lib/db5/libdb_sql.so
-%%SQL%%lib/db5/libdb_sql-%%BDBMAJ%%.so
 lib/db5/libdb_stl-%%BDBVER%%.a
 lib/db5/libdb_stl-%%BDBVER%%.so
 lib/db5/libdb_stl-%%BDBVER%%.so.0
@@ -115,10 +101,6 @@ lib/libdb_cxx-%%BDBVER%%.so.0
 %%JAVA%%lib/libdb_java-%%BDBMAJ%%.so.0
 %%JAVA%%lib/libdb_java-%%BDBVER%%.so
 %%JAVA%%lib/libdb_java-%%BDBVER%%.so.0
-%%SQL%%lib/libdb_sql-%%BDBMAJ%%.so
-%%SQL%%lib/libdb_sql-%%BDBMAJ%%.so.0
-%%SQL%%lib/libdb_sql-%%BDBVER%%.so
-%%SQL%%lib/libdb_sql-%%BDBVER%%.so.0
 lib/libdb_stl-%%BDBMAJ%%.so
 lib/libdb_stl-%%BDBMAJ%%.so.0
 lib/libdb_stl-%%BDBVER%%.so
diff --git a/databases/dbf/Makefile b/databases/dbf/Makefile
index 90d9171f415a..be9555f62b71 100644
--- a/databases/dbf/Makefile
+++ b/databases/dbf/Makefile
@@ -1,5 +1,3 @@
-# Created by: ijliao
-
 PORTNAME=	dbf
 PORTVERSION=	0.9.0
 PORTREVISION=	3
@@ -10,6 +8,7 @@ DISTFILES=	${PORTNAME}-core-${PORTVERSION}.src.zip \
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Show and convert the content of dBASE III, IV, and 5.0 files
+WWW=		http://dbf.berlios.de/
 
 OPTIONS_DEFINE=	NLS
 OPTIONS_SUB=	yes
@@ -22,6 +21,8 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	ac_cv_prog_DOC_TO_MAN=""
 USE_LDCONFIG=	yes
 
+CONFLICTS_INSTALL=	rubygem-dbf
+
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MNLS}
diff --git a/databases/dbf/pkg-descr b/databases/dbf/pkg-descr
index c09deb92f01e..25424c0c4fb0 100644
--- a/databases/dbf/pkg-descr
+++ b/databases/dbf/pkg-descr
@@ -3,5 +3,3 @@ dBASE III, IV, and 5.0 files. It reads dBASE databases and prints the content
 to the screen or converts it to comma-separated (*.csv) files which can be
 opened in Excel, StarOffice, and most other spread sheets. It can also be
 used to show some statistics about the content.
-
-WWW: http://dbf.berlios.de/
diff --git a/databases/dbh/Makefile b/databases/dbh/Makefile
index 76359d83864f..e5ca265983b3 100644
--- a/databases/dbh/Makefile
+++ b/databases/dbh/Makefile
@@ -1,14 +1,13 @@
-# Created by: Ying-Chieh Liao <ijliao@FreeBSD.org>
-
 PORTNAME=	dbh
 PORTVERSION=	5.0.22
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	databases
 MASTER_SITES=	SF
 DISTNAME=	libdbh2-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Disk Based Hashtables
+WWW=		https://www.gnu.org/software/libdbh/
 
 LICENSE=	GPLv3
 
@@ -16,6 +15,7 @@ CONFLICTS=	dbh-[0-4]*
 
 USES=		libtool pkgconfig
 GNU_CONFIGURE=	yes
+GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
 CONFIGURE_ARGS=	--with-pkglibdata
 USE_LDCONFIG=	yes
 
diff --git a/databases/dbh/pkg-descr b/databases/dbh/pkg-descr
index b9a2be896ff4..ffc0d0d5c1b7 100644
--- a/databases/dbh/pkg-descr
+++ b/databases/dbh/pkg-descr
@@ -3,5 +3,3 @@ records. Any kind of digital information can go into the data record, such
 as text, graphic information, database structures, you name it. The idea
 behind using a DBH is to get rid of what is known as an index file in the
 database world. In the DBH world, the index is built into the file format.
-
-WWW: http://www.gnu.org/software/libdbh/
diff --git a/databases/dbh/pkg-plist b/databases/dbh/pkg-plist
index 26335151b3b0..574ecdc9fd6c 100644
--- a/databases/dbh/pkg-plist
+++ b/databases/dbh/pkg-plist
@@ -4,41 +4,41 @@ lib/libdbh.so
 lib/libdbh.so.2
 lib/libdbh.so.2.0.3
 libdata/pkgconfig/dbh2.pc
-man/man3/dbh.3.gz
-man/man3/dbh.h.3.gz
-man/man3/dbh_close.3.gz
-man/man3/dbh_create.3.gz
-man/man3/dbh_destroy.3.gz
-man/man3/dbh_erase.3.gz
-man/man3/dbh_exit_fanout.3.gz
-man/man3/dbh_exit_sweep.3.gz
-man/man3/dbh_fanout.3.gz
-man/man3/dbh_find.3.gz
-man/man3/dbh_foreach_fanout.3.gz
-man/man3/dbh_foreach_sweep.3.gz
-man/man3/dbh_genkey.3.gz
-man/man3/dbh_genkey2.3.gz
-man/man3/dbh_load.3.gz
-man/man3/dbh_load_address.3.gz
-man/man3/dbh_load_child.3.gz
-man/man3/dbh_load_parent.3.gz
-man/man3/dbh_macros.3.gz
-man/man3/dbh_open.3.gz
-man/man3/dbh_open_ro.3.gz
-man/man3/dbh_orderkey.3.gz
-man/man3/dbh_prune.3.gz
-man/man3/dbh_regen_fanout.3.gz
-man/man3/dbh_regen_sweep.3.gz
-man/man3/dbh_set_data.3.gz
-man/man3/dbh_set_key.3.gz
-man/man3/dbh_set_recordsize.3.gz
-man/man3/dbh_set_size.3.gz
-man/man3/dbh_settempdir.3.gz
-man/man3/dbh_sweep.3.gz
-man/man3/dbh_unerase.3.gz
-man/man3/dbh_unprune.3.gz
-man/man3/dbh_update.3.gz
-man/man3/dbh_writeheader.3.gz
+share/man/man3/dbh.3.gz
+share/man/man3/dbh.h.3.gz
+share/man/man3/dbh_close.3.gz
+share/man/man3/dbh_create.3.gz
+share/man/man3/dbh_destroy.3.gz
+share/man/man3/dbh_erase.3.gz
+share/man/man3/dbh_exit_fanout.3.gz
+share/man/man3/dbh_exit_sweep.3.gz
+share/man/man3/dbh_fanout.3.gz
+share/man/man3/dbh_find.3.gz
+share/man/man3/dbh_foreach_fanout.3.gz
+share/man/man3/dbh_foreach_sweep.3.gz
+share/man/man3/dbh_genkey.3.gz
+share/man/man3/dbh_genkey2.3.gz
+share/man/man3/dbh_load.3.gz
+share/man/man3/dbh_load_address.3.gz
+share/man/man3/dbh_load_child.3.gz
+share/man/man3/dbh_load_parent.3.gz
+share/man/man3/dbh_macros.3.gz
+share/man/man3/dbh_open.3.gz
+share/man/man3/dbh_open_ro.3.gz
+share/man/man3/dbh_orderkey.3.gz
+share/man/man3/dbh_prune.3.gz
+share/man/man3/dbh_regen_fanout.3.gz
+share/man/man3/dbh_regen_sweep.3.gz
+share/man/man3/dbh_set_data.3.gz
+share/man/man3/dbh_set_key.3.gz
+share/man/man3/dbh_set_recordsize.3.gz
+share/man/man3/dbh_set_size.3.gz
+share/man/man3/dbh_settempdir.3.gz
+share/man/man3/dbh_sweep.3.gz
+share/man/man3/dbh_unerase.3.gz
+share/man/man3/dbh_unprune.3.gz
+share/man/man3/dbh_update.3.gz
+share/man/man3/dbh_writeheader.3.gz
 %%DATADIR%%/Makefile.am
 %%DATADIR%%/dbh.vim
 %%DATADIR%%/filesystem.c
diff --git a/databases/dbixx/Makefile b/databases/dbixx/Makefile
index f9ca3f4ee197..9473ec4b3d46 100644
--- a/databases/dbixx/Makefile
+++ b/databases/dbixx/Makefile
@@ -1,13 +1,12 @@
-# Created by: Mohammad S. Babaei <info@babaei.net>
-
 PORTNAME=	dbixx
 PORTVERSION=	0.0.4
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	databases
 MASTER_SITES=	SF/cppcms/${PORTNAME}/${PORTVERSION}
 
 MAINTAINER=	info@babaei.net
 COMMENT=	Tiny C++ wrapper around libdbi for database and SQL connectivity
+WWW=		http://cppcms.com/wikipp/en/page/ref_dbixx
 
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/COPYING
diff --git a/databases/dbixx/pkg-descr b/databases/dbixx/pkg-descr
index 7191a94ebc11..22d5ff86cb77 100644
--- a/databases/dbixx/pkg-descr
+++ b/databases/dbixx/pkg-descr
@@ -3,5 +3,3 @@ provides an object oriented, C++ friendly, exception safe interface to execute
 SQL queries in a safe manner.
 
 It is licensed under LGPL v2.1.
-
-WWW: http://cppcms.com/wikipp/en/page/ref_dbixx
diff --git a/databases/dbow/Makefile b/databases/dbow/Makefile
index c406737783bd..14f4114cfa36 100644
--- a/databases/dbow/Makefile
+++ b/databases/dbow/Makefile
@@ -1,13 +1,12 @@
-# Created by: Dermot Tynan <dtynan@kalopa.com>
-
 PORTNAME=	dbow
 PORTVERSION=	0.7
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	databases devel
 MASTER_SITES=	SF
 
 MAINTAINER=	dtynan@kalopa.com
 COMMENT=	Database object generator for C, Perl, PHP, etc.
+WWW=		http://dbow.sf.net/
 
 USES=		mysql
 MAKE_ENV+=	MYSQL_INC=${LOCALBASE}/include/mysql \
diff --git a/databases/dbow/files/patch-doc__Makefile b/databases/dbow/files/patch-doc__Makefile
index eaa4cb2240c2..4974bc8ddcbf 100644
--- a/databases/dbow/files/patch-doc__Makefile
+++ b/databases/dbow/files/patch-doc__Makefile
@@ -5,6 +5,6 @@
  
  install:
 -	install -C -m 444 dbow.1 $(PREFIX)/man/man1
-+	install -C -m 444 dbow.1 $(DESTDIR)$(PREFIX)/man/man1
++	install -C -m 444 dbow.1 $(DESTDIR)$(PREFIX)/share/man/man1
  
  clean:
diff --git a/databases/dbow/pkg-descr b/databases/dbow/pkg-descr
index dda982d44a1e..ed15401540ba 100644
--- a/databases/dbow/pkg-descr
+++ b/databases/dbow/pkg-descr
@@ -2,5 +2,3 @@ DBOW is a database compiler-compiler or front-end.  It takes table
 definitions in a relatively high-level language and prepares C,
 C++, PHP, Perl (etc) functions for manipulating the database.  It
 will also produce SQL table data for MySQL.
-
-WWW: http://dbow.sf.net/
diff --git a/databases/dbow/pkg-plist b/databases/dbow/pkg-plist
index 73fb6bc7122c..9067d0ff8eca 100644
--- a/databases/dbow/pkg-plist
+++ b/databases/dbow/pkg-plist
@@ -1,7 +1,7 @@
 bin/dbow
 include/dbow.h
 lib/libdbow.a
-man/man1/dbow.1.gz
+share/man/man1/dbow.1.gz
 %%DATADIR%%/c.m4
 %%DATADIR%%/mysql.m4
 %%DATADIR%%/perl.m4
diff --git a/databases/dbtool/Makefile b/databases/dbtool/Makefile
index 26a5cab510ba..225764da069c 100644
--- a/databases/dbtool/Makefile
+++ b/databases/dbtool/Makefile
@@ -1,13 +1,12 @@
-# Created by: ijliao
-
 PORTNAME=	dbtool
 PORTVERSION=	1.9.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	databases
 MASTER_SITES=	http://www.daemon.de/idisk/Apps/dbtool/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Store and retrieve data in a key/value format in a hash database
+WWW=		https://www.daemon.de/DBTOOL
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
@@ -18,9 +17,10 @@ USES=		gmake localbase shebangfix
 SHEBANG_FILES=	samples/account-db/accdb
 bash_OLD_CMD=	/bin/sh
 GNU_CONFIGURE=	yes
+GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
 
 PORTEXAMPLES=	*
-PLIST_FILES=	bin/dbtool man/man1/dbtool.1.gz
+PLIST_FILES=	bin/dbtool share/man/man1/dbtool.1.gz
 
 OPTIONS_DEFINE=		EXAMPLES
 OPTIONS_SINGLE=		BACKEND
diff --git a/databases/dbtool/pkg-descr b/databases/dbtool/pkg-descr
index b95f6ef62bbf..bfc407abf2a8 100644
--- a/databases/dbtool/pkg-descr
+++ b/databases/dbtool/pkg-descr
@@ -2,5 +2,3 @@ dbtool can be used to store and retrieve data in a key/value format in a
 hash database. Perl compatible regular expressions are supported both for
 storing and retrieving of data. It's main advantages are the ability to
 maintain huge amounts of data and speed.
-
-WWW: http://www.daemon.de/DBTOOL
diff --git a/databases/dbview/Makefile b/databases/dbview/Makefile
index 49112a08c7e0..b873f502dbe2 100644
--- a/databases/dbview/Makefile
+++ b/databases/dbview/Makefile
@@ -1,16 +1,16 @@
-# Created by: Andrey Zakhvatov
-
 PORTNAME=	dbview
 PORTVERSION=	1.0.4
+PORTREVISION=	1
 CATEGORIES=	databases
 MASTER_SITES=	SUNSITE/apps/database/proprietary
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	View dBase III files
+WWW=		https://www.infodrom.org/projects/dbview/
 
 LICENSE=	GPLv2+
 
-PLIST_FILES=	bin/dbview man/man1/dbview.1.gz
+PLIST_FILES=	bin/dbview share/man/man1/dbview.1.gz
 PORTDOCS=	README dBASE
 
 OPTIONS_DEFINE=	DOCS
@@ -23,7 +23,7 @@ post-patch:
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/dbview ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/dbview.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/dbview.1 ${STAGEDIR}${PREFIX}/share/man/man1
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
diff --git a/databases/dbview/pkg-descr b/databases/dbview/pkg-descr
index 5e4e5052221e..edb843d00b59 100644
--- a/databases/dbview/pkg-descr
+++ b/databases/dbview/pkg-descr
@@ -5,5 +5,3 @@ also work with dBase IV files, but this is mostly untested.
 dbview displays the contents of a dBase III or IV database file.  This is
 done by displaying both the name of the field itself and its value.  At
 the end of every record a newline is appended.
-
-WWW: http://www.infodrom.org/projects/dbview/
diff --git a/databases/diesel/Makefile b/databases/diesel/Makefile
new file mode 100644
index 000000000000..0872b3dfcc23
--- /dev/null
+++ b/databases/diesel/Makefile
@@ -0,0 +1,182 @@
+PORTNAME=	diesel
+DISTVERSIONPREFIX=	v
+DISTVERSION=	2.1.6
+CATEGORIES=	databases
+PKGNAMESUFFIX=	-cli
+
+MAINTAINER=	yuri@FreeBSD.org
+COMMENT=	Extensible ORM and Query Builder for Rust
+WWW=		https://diesel.rs
+
+LICENSE=	APACHE20 MIT
+LICENSE_COMB=	dual
+LICENSE_FILE_APACHE20=	${WRKSRC}/LICENSE-APACHE
+LICENSE_FILE_MIT=	${WRKSRC}/LICENSE-MIT
+
+USES=		cargo mysql pgsql sqlite
+
+USE_GITHUB=	yes
+GH_ACCOUNT=	diesel-rs
+
+CARGO_BUILD_ARGS=	--package=diesel_cli
+CARGO_INSTALL_PATH=	diesel_cli
+CARGO_CRATES=	aho-corasick-1.1.3 \
+		android-tzdata-0.1.1 \
+		android_system_properties-0.1.5 \
+		anstream-0.6.13 \
+		anstyle-1.0.6 \
+		anstyle-parse-0.2.3 \
+		anstyle-query-1.0.2 \
+		anstyle-wincon-3.0.2 \
+		argon2-0.5.3 \
+		assert_matches-1.5.0 \
+		autocfg-1.2.0 \
+		base64ct-1.6.0 \
+		bigdecimal-0.4.3 \
+		bitflags-1.3.2 \
+		bitflags-2.5.0 \
+		blake2-0.10.6 \
+		block-buffer-0.10.4 \
+		bumpalo-3.16.0 \
+		byteorder-1.5.0 \
+		cc-1.0.94 \
+		cfg-if-1.0.0 \
+		chrono-0.4.38 \
+		clap-4.5.4 \
+		clap_builder-4.5.2 \
+		clap_complete-4.5.2 \
+		clap_derive-4.5.4 \
+		clap_lex-0.7.0 \
+		colorchoice-1.0.0 \
+		console-0.15.8 \
+		core-foundation-sys-0.8.6 \
+		cpufeatures-0.2.12 \
+		crypto-common-0.1.6 \
+		deranged-0.3.11 \
+		diffy-0.3.0 \
+		digest-0.10.7 \
+		dotenvy-0.15.7 \
+		encode_unicode-0.3.6 \
+		env_logger-0.8.4 \
+		equivalent-1.0.1 \
+		errno-0.3.8 \
+		fastrand-2.0.2 \
+		form_urlencoded-1.2.1 \
+		generic-array-0.14.7 \
+		getrandom-0.2.14 \
+		hashbrown-0.14.3 \
+		heck-0.4.1 \
+		heck-0.5.0 \
+		iana-time-zone-0.1.60 \
+		iana-time-zone-haiku-0.1.2 \
+		idna-0.5.0 \
+		indexmap-2.2.6 \
+		insta-1.38.0 \
+		ipnet-2.9.0 \
+		ipnetwork-0.20.0 \
+		itoa-1.0.11 \
+		js-sys-0.3.69 \
+		lazy_static-1.4.0 \
+		libc-0.2.153 \
+		libm-0.2.8 \
+		libsqlite3-sys-0.28.0 \
+		linked-hash-map-0.5.6 \
+		linux-raw-sys-0.4.13 \
+		lock_api-0.4.11 \
+		log-0.4.21 \
+		memchr-2.7.2 \
+		mysqlclient-sys-0.2.5 \
+		nu-ansi-term-0.46.0 \
+		num-bigint-0.4.4 \
+		num-conv-0.1.0 \
+		num-integer-0.1.46 \
+		num-traits-0.2.18 \
+		once_cell-1.19.0 \
+		overload-0.1.1 \
+		parking_lot-0.12.1 \
+		parking_lot_core-0.9.9 \
+		password-hash-0.5.0 \
+		percent-encoding-2.3.1 \
+		pkg-config-0.3.30 \
+		powerfmt-0.2.0 \
+		ppv-lite86-0.2.17 \
+		pq-sys-0.4.8 \
+		proc-macro2-1.0.81 \
+		quickcheck-1.0.3 \
+		quote-1.0.36 \
+		r2d2-0.8.10 \
+		rand-0.8.5 \
+		rand_chacha-0.3.1 \
+		rand_core-0.6.4 \
+		redox_syscall-0.4.1 \
+		regex-1.10.4 \
+		regex-automata-0.4.6 \
+		regex-syntax-0.8.3 \
+		rustix-0.38.32 \
+		ryu-1.0.17 \
+		scheduled-thread-pool-0.2.7 \
+		scopeguard-1.2.0 \
+		serde-1.0.198 \
+		serde_derive-1.0.198 \
+		serde_json-1.0.116 \
+		serde_regex-1.1.0 \
+		serde_spanned-0.6.5 \
+		similar-2.5.0 \
+		smallvec-1.13.2 \
+		strsim-0.11.1 \
+		subtle-2.5.0 \
+		syn-2.0.60 \
+		tempfile-3.10.1 \
+		time-0.3.36 \
+		time-core-0.1.2 \
+		time-macros-0.2.18 \
+		tinyvec-1.6.0 \
+		tinyvec_macros-0.1.1 \
+		toml-0.7.8 \
+		toml_datetime-0.6.5 \
+		toml_edit-0.19.15 \
+		typenum-1.17.0 \
+		unicode-bidi-0.3.15 \
+		unicode-ident-1.0.12 \
+		unicode-normalization-0.1.23 \
+		url-2.5.0 \
+		utf8parse-0.2.1 \
+		uuid-1.8.0 \
+		vcpkg-0.2.15 \
+		version_check-0.9.4 \
+		wasi-0.11.0+wasi-snapshot-preview1 \
+		wasm-bindgen-0.2.92 \
+		wasm-bindgen-backend-0.2.92 \
+		wasm-bindgen-macro-0.2.92 \
+		wasm-bindgen-macro-support-0.2.92 \
+		wasm-bindgen-shared-0.2.92 \
+		winapi-0.3.9 \
+		winapi-i686-pc-windows-gnu-0.4.0 \
+		winapi-x86_64-pc-windows-gnu-0.4.0 \
+		windows-core-0.52.0 \
+		windows-sys-0.52.0 \
+		windows-targets-0.48.5 \
+		windows-targets-0.52.5 \
+		windows_aarch64_gnullvm-0.48.5 \
+		windows_aarch64_gnullvm-0.52.5 \
+		windows_aarch64_msvc-0.48.5 \
+		windows_aarch64_msvc-0.52.5 \
+		windows_i686_gnu-0.48.5 \
+		windows_i686_gnu-0.52.5 \
+		windows_i686_gnullvm-0.52.5 \
+		windows_i686_msvc-0.48.5 \
+		windows_i686_msvc-0.52.5 \
+		windows_x86_64_gnu-0.48.5 \
+		windows_x86_64_gnu-0.52.5 \
+		windows_x86_64_gnullvm-0.48.5 \
+		windows_x86_64_gnullvm-0.52.5 \
+		windows_x86_64_msvc-0.48.5 \
+		windows_x86_64_msvc-0.52.5 \
+		winnow-0.5.40
+
+PLIST_FILES=	bin/${PORTNAME}
+
+post-install:
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
+
+.include <bsd.port.mk>
diff --git a/databases/diesel/distinfo b/databases/diesel/distinfo
new file mode 100644
index 000000000000..250ebde5fd3b
--- /dev/null
+++ b/databases/diesel/distinfo
@@ -0,0 +1,309 @@
+TIMESTAMP = 1713585750
+SHA256 (rust/crates/aho-corasick-1.1.3.crate) = 8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916
+SIZE (rust/crates/aho-corasick-1.1.3.crate) = 183311
+SHA256 (rust/crates/android-tzdata-0.1.1.crate) = e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0
+SIZE (rust/crates/android-tzdata-0.1.1.crate) = 7674
+SHA256 (rust/crates/android_system_properties-0.1.5.crate) = 819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311
+SIZE (rust/crates/android_system_properties-0.1.5.crate) = 5243
+SHA256 (rust/crates/anstream-0.6.13.crate) = d96bd03f33fe50a863e394ee9718a706f988b9079b20c3784fb726e7678b62fb
+SIZE (rust/crates/anstream-0.6.13.crate) = 30928
+SHA256 (rust/crates/anstyle-1.0.6.crate) = 8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc
+SIZE (rust/crates/anstyle-1.0.6.crate) = 14604
+SHA256 (rust/crates/anstyle-parse-0.2.3.crate) = c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c
+SIZE (rust/crates/anstyle-parse-0.2.3.crate) = 24699
+SHA256 (rust/crates/anstyle-query-1.0.2.crate) = e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648
+SIZE (rust/crates/anstyle-query-1.0.2.crate) = 8739
+SHA256 (rust/crates/anstyle-wincon-3.0.2.crate) = 1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7
+SIZE (rust/crates/anstyle-wincon-3.0.2.crate) = 11272
+SHA256 (rust/crates/argon2-0.5.3.crate) = 3c3610892ee6e0cbce8ae2700349fcf8f98adb0dbfbee85aec3c9179d29cc072
+SIZE (rust/crates/argon2-0.5.3.crate) = 28795
+SHA256 (rust/crates/assert_matches-1.5.0.crate) = 9b34d609dfbaf33d6889b2b7106d3ca345eacad44200913df5ba02bfd31d2ba9
+SIZE (rust/crates/assert_matches-1.5.0.crate) = 7761
+SHA256 (rust/crates/autocfg-1.2.0.crate) = f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80
+SIZE (rust/crates/autocfg-1.2.0.crate) = 14808
+SHA256 (rust/crates/base64ct-1.6.0.crate) = 8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b
+SIZE (rust/crates/base64ct-1.6.0.crate) = 28870
+SHA256 (rust/crates/bigdecimal-0.4.3.crate) = 9324c8014cd04590682b34f1e9448d38f0674d0f7b2dc553331016ef0e4e9ebc
+SIZE (rust/crates/bigdecimal-0.4.3.crate) = 69788
+SHA256 (rust/crates/bitflags-1.3.2.crate) = bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a
+SIZE (rust/crates/bitflags-1.3.2.crate) = 23021
+SHA256 (rust/crates/bitflags-2.5.0.crate) = cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1
+SIZE (rust/crates/bitflags-2.5.0.crate) = 43821
+SHA256 (rust/crates/blake2-0.10.6.crate) = 46502ad458c9a52b69d4d4d32775c788b7a1b85e8bc9d482d92250fc0e3f8efe
+SIZE (rust/crates/blake2-0.10.6.crate) = 47234
+SHA256 (rust/crates/block-buffer-0.10.4.crate) = 3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71
+SIZE (rust/crates/block-buffer-0.10.4.crate) = 10538
+SHA256 (rust/crates/bumpalo-3.16.0.crate) = 79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c
+SIZE (rust/crates/bumpalo-3.16.0.crate) = 85677
+SHA256 (rust/crates/byteorder-1.5.0.crate) = 1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b
+SIZE (rust/crates/byteorder-1.5.0.crate) = 23288
+SHA256 (rust/crates/cc-1.0.94.crate) = 17f6e324229dc011159fcc089755d1e2e216a90d43a7dea6853ca740b84f35e7
+SIZE (rust/crates/cc-1.0.94.crate) = 76456
+SHA256 (rust/crates/cfg-if-1.0.0.crate) = baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd
+SIZE (rust/crates/cfg-if-1.0.0.crate) = 7934
+SHA256 (rust/crates/chrono-0.4.38.crate) = a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401
+SIZE (rust/crates/chrono-0.4.38.crate) = 220559
+SHA256 (rust/crates/clap-4.5.4.crate) = 90bc066a67923782aa8515dbaea16946c5bcc5addbd668bb80af688e53e548a0
+SIZE (rust/crates/clap-4.5.4.crate) = 55401
+SHA256 (rust/crates/clap_builder-4.5.2.crate) = ae129e2e766ae0ec03484e609954119f123cc1fe650337e155d03b022f24f7b4
+SIZE (rust/crates/clap_builder-4.5.2.crate) = 163566
+SHA256 (rust/crates/clap_complete-4.5.2.crate) = dd79504325bf38b10165b02e89b4347300f855f273c4cb30c4a3209e6583275e
+SIZE (rust/crates/clap_complete-4.5.2.crate) = 37850
+SHA256 (rust/crates/clap_derive-4.5.4.crate) = 528131438037fd55894f62d6e9f068b8f45ac57ffa77517819645d10aed04f64
+SIZE (rust/crates/clap_derive-4.5.4.crate) = 29159
+SHA256 (rust/crates/clap_lex-0.7.0.crate) = 98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce
+SIZE (rust/crates/clap_lex-0.7.0.crate) = 11915
+SHA256 (rust/crates/colorchoice-1.0.0.crate) = acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7
+SIZE (rust/crates/colorchoice-1.0.0.crate) = 6857
+SHA256 (rust/crates/console-0.15.8.crate) = 0e1f83fc076bd6dd27517eacdf25fef6c4dfe5f1d7448bafaaf3a26f13b5e4eb
+SIZE (rust/crates/console-0.15.8.crate) = 36364
+SHA256 (rust/crates/core-foundation-sys-0.8.6.crate) = 06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f
+SIZE (rust/crates/core-foundation-sys-0.8.6.crate) = 37629
+SHA256 (rust/crates/cpufeatures-0.2.12.crate) = 53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504
+SIZE (rust/crates/cpufeatures-0.2.12.crate) = 12837
+SHA256 (rust/crates/crypto-common-0.1.6.crate) = 1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3
+SIZE (rust/crates/crypto-common-0.1.6.crate) = 8760
+SHA256 (rust/crates/deranged-0.3.11.crate) = b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4
+SIZE (rust/crates/deranged-0.3.11.crate) = 18043
+SHA256 (rust/crates/diffy-0.3.0.crate) = e616e59155c92257e84970156f506287853355f58cd4a6eb167385722c32b790
+SIZE (rust/crates/diffy-0.3.0.crate) = 35374
+SHA256 (rust/crates/digest-0.10.7.crate) = 9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292
+SIZE (rust/crates/digest-0.10.7.crate) = 19557
+SHA256 (rust/crates/dotenvy-0.15.7.crate) = 1aaf95b3e5c8f23aa320147307562d361db0ae0d51242340f558153b4eb2439b
+SIZE (rust/crates/dotenvy-0.15.7.crate) = 20293
+SHA256 (rust/crates/encode_unicode-0.3.6.crate) = a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f
+SIZE (rust/crates/encode_unicode-0.3.6.crate) = 45741
+SHA256 (rust/crates/env_logger-0.8.4.crate) = a19187fea3ac7e84da7dacf48de0c45d63c6a76f9490dae389aead16c243fce3
+SIZE (rust/crates/env_logger-0.8.4.crate) = 33342
+SHA256 (rust/crates/equivalent-1.0.1.crate) = 5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5
+SIZE (rust/crates/equivalent-1.0.1.crate) = 6615
+SHA256 (rust/crates/errno-0.3.8.crate) = a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245
+SIZE (rust/crates/errno-0.3.8.crate) = 10645
+SHA256 (rust/crates/fastrand-2.0.2.crate) = 658bd65b1cf4c852a3cc96f18a8ce7b5640f6b703f905c7d74532294c2a63984
+SIZE (rust/crates/fastrand-2.0.2.crate) = 14674
+SHA256 (rust/crates/form_urlencoded-1.2.1.crate) = e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456
+SIZE (rust/crates/form_urlencoded-1.2.1.crate) = 8969
+SHA256 (rust/crates/generic-array-0.14.7.crate) = 85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a
+SIZE (rust/crates/generic-array-0.14.7.crate) = 15950
+SHA256 (rust/crates/getrandom-0.2.14.crate) = 94b22e06ecb0110981051723910cbf0b5f5e09a2062dd7663334ee79a9d1286c
+SIZE (rust/crates/getrandom-0.2.14.crate) = 37307
+SHA256 (rust/crates/hashbrown-0.14.3.crate) = 290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604
+SIZE (rust/crates/hashbrown-0.14.3.crate) = 141425
+SHA256 (rust/crates/heck-0.4.1.crate) = 95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8
+SIZE (rust/crates/heck-0.4.1.crate) = 11567
+SHA256 (rust/crates/heck-0.5.0.crate) = 2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea
+SIZE (rust/crates/heck-0.5.0.crate) = 11517
+SHA256 (rust/crates/iana-time-zone-0.1.60.crate) = e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141
+SIZE (rust/crates/iana-time-zone-0.1.60.crate) = 27074
+SHA256 (rust/crates/iana-time-zone-haiku-0.1.2.crate) = f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f
+SIZE (rust/crates/iana-time-zone-haiku-0.1.2.crate) = 7185
+SHA256 (rust/crates/idna-0.5.0.crate) = 634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6
+SIZE (rust/crates/idna-0.5.0.crate) = 271940
+SHA256 (rust/crates/indexmap-2.2.6.crate) = 168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26
+SIZE (rust/crates/indexmap-2.2.6.crate) = 82420
+SHA256 (rust/crates/insta-1.38.0.crate) = 3eab73f58e59ca6526037208f0e98851159ec1633cf17b6cd2e1f2c3fd5d53cc
+SIZE (rust/crates/insta-1.38.0.crate) = 86379
+SHA256 (rust/crates/ipnet-2.9.0.crate) = 8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3
+SIZE (rust/crates/ipnet-2.9.0.crate) = 27627
+SHA256 (rust/crates/ipnetwork-0.20.0.crate) = bf466541e9d546596ee94f9f69590f89473455f88372423e0008fc1a7daf100e
+SIZE (rust/crates/ipnetwork-0.20.0.crate) = 16556
+SHA256 (rust/crates/itoa-1.0.11.crate) = 49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b
+SIZE (rust/crates/itoa-1.0.11.crate) = 10563
+SHA256 (rust/crates/js-sys-0.3.69.crate) = 29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d
+SIZE (rust/crates/js-sys-0.3.69.crate) = 81083
+SHA256 (rust/crates/lazy_static-1.4.0.crate) = e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646
+SIZE (rust/crates/lazy_static-1.4.0.crate) = 10443
+SHA256 (rust/crates/libc-0.2.153.crate) = 9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd
+SIZE (rust/crates/libc-0.2.153.crate) = 740614
+SHA256 (rust/crates/libm-0.2.8.crate) = 4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058
+SIZE (rust/crates/libm-0.2.8.crate) = 113450
+SHA256 (rust/crates/libsqlite3-sys-0.28.0.crate) = 0c10584274047cb335c23d3e61bcef8e323adae7c5c8c760540f73610177fc3f
+SIZE (rust/crates/libsqlite3-sys-0.28.0.crate) = 4975624
+SHA256 (rust/crates/linked-hash-map-0.5.6.crate) = 0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f
+SIZE (rust/crates/linked-hash-map-0.5.6.crate) = 15049
+SHA256 (rust/crates/linux-raw-sys-0.4.13.crate) = 01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c
+SIZE (rust/crates/linux-raw-sys-0.4.13.crate) = 1493855
+SHA256 (rust/crates/lock_api-0.4.11.crate) = 3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45
+SIZE (rust/crates/lock_api-0.4.11.crate) = 27487
+SHA256 (rust/crates/log-0.4.21.crate) = 90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c
+SIZE (rust/crates/log-0.4.21.crate) = 43442
+SHA256 (rust/crates/memchr-2.7.2.crate) = 6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d
+SIZE (rust/crates/memchr-2.7.2.crate) = 96220
+SHA256 (rust/crates/mysqlclient-sys-0.2.5.crate) = f61b381528ba293005c42a409dd73d034508e273bf90481f17ec2e964a6e969b
+SIZE (rust/crates/mysqlclient-sys-0.2.5.crate) = 27493
+SHA256 (rust/crates/nu-ansi-term-0.46.0.crate) = 77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84
+SIZE (rust/crates/nu-ansi-term-0.46.0.crate) = 24311
+SHA256 (rust/crates/num-bigint-0.4.4.crate) = 608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0
+SIZE (rust/crates/num-bigint-0.4.4.crate) = 99369
+SHA256 (rust/crates/num-conv-0.1.0.crate) = 51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9
+SIZE (rust/crates/num-conv-0.1.0.crate) = 7444
+SHA256 (rust/crates/num-integer-0.1.46.crate) = 7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f
+SIZE (rust/crates/num-integer-0.1.46.crate) = 22331
+SHA256 (rust/crates/num-traits-0.2.18.crate) = da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a
+SIZE (rust/crates/num-traits-0.2.18.crate) = 51930
+SHA256 (rust/crates/once_cell-1.19.0.crate) = 3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92
+SIZE (rust/crates/once_cell-1.19.0.crate) = 33046
+SHA256 (rust/crates/overload-0.1.1.crate) = b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39
+SIZE (rust/crates/overload-0.1.1.crate) = 24439
+SHA256 (rust/crates/parking_lot-0.12.1.crate) = 3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f
+SIZE (rust/crates/parking_lot-0.12.1.crate) = 40967
+SHA256 (rust/crates/parking_lot_core-0.9.9.crate) = 4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e
+SIZE (rust/crates/parking_lot_core-0.9.9.crate) = 32445
+SHA256 (rust/crates/password-hash-0.5.0.crate) = 346f04948ba92c43e8469c1ee6736c7563d71012b17d40745260fe106aac2166
+SIZE (rust/crates/password-hash-0.5.0.crate) = 26884
+SHA256 (rust/crates/percent-encoding-2.3.1.crate) = e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e
+SIZE (rust/crates/percent-encoding-2.3.1.crate) = 10235
+SHA256 (rust/crates/pkg-config-0.3.30.crate) = d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec
+SIZE (rust/crates/pkg-config-0.3.30.crate) = 20613
+SHA256 (rust/crates/powerfmt-0.2.0.crate) = 439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391
+SIZE (rust/crates/powerfmt-0.2.0.crate) = 15165
+SHA256 (rust/crates/ppv-lite86-0.2.17.crate) = 5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de
+SIZE (rust/crates/ppv-lite86-0.2.17.crate) = 22242
+SHA256 (rust/crates/pq-sys-0.4.8.crate) = 31c0052426df997c0cbd30789eb44ca097e3541717a7b8fa36b1c464ee7edebd
+SIZE (rust/crates/pq-sys-0.4.8.crate) = 13807
+SHA256 (rust/crates/proc-macro2-1.0.81.crate) = 3d1597b0c024618f09a9c3b8655b7e430397a36d23fdafec26d6965e9eec3eba
+SIZE (rust/crates/proc-macro2-1.0.81.crate) = 48233
+SHA256 (rust/crates/quickcheck-1.0.3.crate) = 588f6378e4dd99458b60ec275b4477add41ce4fa9f64dcba6f15adccb19b50d6
+SIZE (rust/crates/quickcheck-1.0.3.crate) = 28069
+SHA256 (rust/crates/quote-1.0.36.crate) = 0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7
+SIZE (rust/crates/quote-1.0.36.crate) = 28507
+SHA256 (rust/crates/r2d2-0.8.10.crate) = 51de85fb3fb6524929c8a2eb85e6b6d363de4e8c48f9e2c2eac4944abc181c93
+SIZE (rust/crates/r2d2-0.8.10.crate) = 17888
+SHA256 (rust/crates/rand-0.8.5.crate) = 34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404
+SIZE (rust/crates/rand-0.8.5.crate) = 87113
+SHA256 (rust/crates/rand_chacha-0.3.1.crate) = e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88
+SIZE (rust/crates/rand_chacha-0.3.1.crate) = 15251
+SHA256 (rust/crates/rand_core-0.6.4.crate) = ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c
+SIZE (rust/crates/rand_core-0.6.4.crate) = 22666
+SHA256 (rust/crates/redox_syscall-0.4.1.crate) = 4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa
+SIZE (rust/crates/redox_syscall-0.4.1.crate) = 24858
+SHA256 (rust/crates/regex-1.10.4.crate) = c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c
+SIZE (rust/crates/regex-1.10.4.crate) = 253191
+SHA256 (rust/crates/regex-automata-0.4.6.crate) = 86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea
+SIZE (rust/crates/regex-automata-0.4.6.crate) = 617565
+SHA256 (rust/crates/regex-syntax-0.8.3.crate) = adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56
+SIZE (rust/crates/regex-syntax-0.8.3.crate) = 347497
+SHA256 (rust/crates/rustix-0.38.32.crate) = 65e04861e65f21776e67888bfbea442b3642beaa0138fdb1dd7a84a52dffdb89
+SIZE (rust/crates/rustix-0.38.32.crate) = 376999
+SHA256 (rust/crates/ryu-1.0.17.crate) = e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1
+SIZE (rust/crates/ryu-1.0.17.crate) = 47537
+SHA256 (rust/crates/scheduled-thread-pool-0.2.7.crate) = 3cbc66816425a074528352f5789333ecff06ca41b36b0b0efdfbb29edc391a19
+SIZE (rust/crates/scheduled-thread-pool-0.2.7.crate) = 10554
+SHA256 (rust/crates/scopeguard-1.2.0.crate) = 94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49
+SIZE (rust/crates/scopeguard-1.2.0.crate) = 11619
+SHA256 (rust/crates/serde-1.0.198.crate) = 9846a40c979031340571da2545a4e5b7c4163bdae79b301d5f86d03979451fcc
+SIZE (rust/crates/serde-1.0.198.crate) = 77577
+SHA256 (rust/crates/serde_derive-1.0.198.crate) = e88edab869b01783ba905e7d0153f9fc1a6505a96e4ad3018011eedb838566d9
+SIZE (rust/crates/serde_derive-1.0.198.crate) = 55787
+SHA256 (rust/crates/serde_json-1.0.116.crate) = 3e17db7126d17feb94eb3fad46bf1a96b034e8aacbc2e775fe81505f8b0b2813
+SIZE (rust/crates/serde_json-1.0.116.crate) = 146790
+SHA256 (rust/crates/serde_regex-1.1.0.crate) = a8136f1a4ea815d7eac4101cfd0b16dc0cb5e1fe1b8609dfd728058656b7badf
+SIZE (rust/crates/serde_regex-1.1.0.crate) = 9710
+SHA256 (rust/crates/serde_spanned-0.6.5.crate) = eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1
+SIZE (rust/crates/serde_spanned-0.6.5.crate) = 8349
+SHA256 (rust/crates/similar-2.5.0.crate) = fa42c91313f1d05da9b26f267f931cf178d4aba455b4c4622dd7355eb80c6640
+SIZE (rust/crates/similar-2.5.0.crate) = 51648
+SHA256 (rust/crates/smallvec-1.13.2.crate) = 3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67
+SIZE (rust/crates/smallvec-1.13.2.crate) = 35216
+SHA256 (rust/crates/strsim-0.11.1.crate) = 7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f
+SIZE (rust/crates/strsim-0.11.1.crate) = 14266
+SHA256 (rust/crates/subtle-2.5.0.crate) = 81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc
+SIZE (rust/crates/subtle-2.5.0.crate) = 13909
+SHA256 (rust/crates/syn-2.0.60.crate) = 909518bc7b1c9b779f1bbf07f2929d35af9f0f37e47c6e9ef7f9dddc1e1821f3
+SIZE (rust/crates/syn-2.0.60.crate) = 255808
+SHA256 (rust/crates/tempfile-3.10.1.crate) = 85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1
+SIZE (rust/crates/tempfile-3.10.1.crate) = 33653
+SHA256 (rust/crates/time-0.3.36.crate) = 5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885
+SIZE (rust/crates/time-0.3.36.crate) = 119805
+SHA256 (rust/crates/time-core-0.1.2.crate) = ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3
+SIZE (rust/crates/time-core-0.1.2.crate) = 7191
+SHA256 (rust/crates/time-macros-0.2.18.crate) = 3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf
+SIZE (rust/crates/time-macros-0.2.18.crate) = 24361
+SHA256 (rust/crates/tinyvec-1.6.0.crate) = 87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50
+SIZE (rust/crates/tinyvec-1.6.0.crate) = 45991
+SHA256 (rust/crates/tinyvec_macros-0.1.1.crate) = 1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20
+SIZE (rust/crates/tinyvec_macros-0.1.1.crate) = 5865
+SHA256 (rust/crates/toml-0.7.8.crate) = dd79e69d3b627db300ff956027cc6c3798cef26d22526befdfcd12feeb6d2257
+SIZE (rust/crates/toml-0.7.8.crate) = 49671
+SHA256 (rust/crates/toml_datetime-0.6.5.crate) = 3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1
+SIZE (rust/crates/toml_datetime-0.6.5.crate) = 10910
+SHA256 (rust/crates/toml_edit-0.19.15.crate) = 1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421
+SIZE (rust/crates/toml_edit-0.19.15.crate) = 95324
+SHA256 (rust/crates/typenum-1.17.0.crate) = 42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825
+SIZE (rust/crates/typenum-1.17.0.crate) = 42849
+SHA256 (rust/crates/unicode-bidi-0.3.15.crate) = 08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75
+SIZE (rust/crates/unicode-bidi-0.3.15.crate) = 56811
+SHA256 (rust/crates/unicode-ident-1.0.12.crate) = 3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b
+SIZE (rust/crates/unicode-ident-1.0.12.crate) = 42168
+SHA256 (rust/crates/unicode-normalization-0.1.23.crate) = a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5
+SIZE (rust/crates/unicode-normalization-0.1.23.crate) = 122649
+SHA256 (rust/crates/url-2.5.0.crate) = 31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633
+SIZE (rust/crates/url-2.5.0.crate) = 78605
+SHA256 (rust/crates/utf8parse-0.2.1.crate) = 711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a
+SIZE (rust/crates/utf8parse-0.2.1.crate) = 13435
+SHA256 (rust/crates/uuid-1.8.0.crate) = a183cf7feeba97b4dd1c0d46788634f6221d87fa961b305bed08c851829efcc0
+SIZE (rust/crates/uuid-1.8.0.crate) = 44043
+SHA256 (rust/crates/vcpkg-0.2.15.crate) = accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426
+SIZE (rust/crates/vcpkg-0.2.15.crate) = 228735
+SHA256 (rust/crates/version_check-0.9.4.crate) = 49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f
+SIZE (rust/crates/version_check-0.9.4.crate) = 14895
+SHA256 (rust/crates/wasi-0.11.0+wasi-snapshot-preview1.crate) = 9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423
+SIZE (rust/crates/wasi-0.11.0+wasi-snapshot-preview1.crate) = 28131
+SHA256 (rust/crates/wasm-bindgen-0.2.92.crate) = 4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8
+SIZE (rust/crates/wasm-bindgen-0.2.92.crate) = 184119
+SHA256 (rust/crates/wasm-bindgen-backend-0.2.92.crate) = 614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da
+SIZE (rust/crates/wasm-bindgen-backend-0.2.92.crate) = 28348
+SHA256 (rust/crates/wasm-bindgen-macro-0.2.92.crate) = a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726
+SIZE (rust/crates/wasm-bindgen-macro-0.2.92.crate) = 13835
+SHA256 (rust/crates/wasm-bindgen-macro-support-0.2.92.crate) = e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7
+SIZE (rust/crates/wasm-bindgen-macro-support-0.2.92.crate) = 20092
+SHA256 (rust/crates/wasm-bindgen-shared-0.2.92.crate) = af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96
+SIZE (rust/crates/wasm-bindgen-shared-0.2.92.crate) = 7263
+SHA256 (rust/crates/winapi-0.3.9.crate) = 5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419
+SIZE (rust/crates/winapi-0.3.9.crate) = 1200382
+SHA256 (rust/crates/winapi-i686-pc-windows-gnu-0.4.0.crate) = ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6
+SIZE (rust/crates/winapi-i686-pc-windows-gnu-0.4.0.crate) = 2918815
+SHA256 (rust/crates/winapi-x86_64-pc-windows-gnu-0.4.0.crate) = 712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f
+SIZE (rust/crates/winapi-x86_64-pc-windows-gnu-0.4.0.crate) = 2947998
+SHA256 (rust/crates/windows-core-0.52.0.crate) = 33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9
+SIZE (rust/crates/windows-core-0.52.0.crate) = 42154
+SHA256 (rust/crates/windows-sys-0.52.0.crate) = 282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d
+SIZE (rust/crates/windows-sys-0.52.0.crate) = 2576877
+SHA256 (rust/crates/windows-targets-0.48.5.crate) = 9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c
+SIZE (rust/crates/windows-targets-0.48.5.crate) = 6904
+SHA256 (rust/crates/windows-targets-0.52.5.crate) = 6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb
+SIZE (rust/crates/windows-targets-0.52.5.crate) = 6376
+SHA256 (rust/crates/windows_aarch64_gnullvm-0.48.5.crate) = 2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8
+SIZE (rust/crates/windows_aarch64_gnullvm-0.48.5.crate) = 418492
+SHA256 (rust/crates/windows_aarch64_gnullvm-0.52.5.crate) = 7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263
+SIZE (rust/crates/windows_aarch64_gnullvm-0.52.5.crate) = 433266
+SHA256 (rust/crates/windows_aarch64_msvc-0.48.5.crate) = dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc
+SIZE (rust/crates/windows_aarch64_msvc-0.48.5.crate) = 798483
+SHA256 (rust/crates/windows_aarch64_msvc-0.52.5.crate) = 9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6
+SIZE (rust/crates/windows_aarch64_msvc-0.52.5.crate) = 827944
+SHA256 (rust/crates/windows_i686_gnu-0.48.5.crate) = a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e
+SIZE (rust/crates/windows_i686_gnu-0.48.5.crate) = 844891
+SHA256 (rust/crates/windows_i686_gnu-0.52.5.crate) = 88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670
+SIZE (rust/crates/windows_i686_gnu-0.52.5.crate) = 875699
+SHA256 (rust/crates/windows_i686_gnullvm-0.52.5.crate) = 87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9
+SIZE (rust/crates/windows_i686_gnullvm-0.52.5.crate) = 473064
+SHA256 (rust/crates/windows_i686_msvc-0.48.5.crate) = 8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406
+SIZE (rust/crates/windows_i686_msvc-0.48.5.crate) = 864300
+SHA256 (rust/crates/windows_i686_msvc-0.52.5.crate) = db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf
+SIZE (rust/crates/windows_i686_msvc-0.52.5.crate) = 895404
+SHA256 (rust/crates/windows_x86_64_gnu-0.48.5.crate) = 53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e
+SIZE (rust/crates/windows_x86_64_gnu-0.48.5.crate) = 801619
+SHA256 (rust/crates/windows_x86_64_gnu-0.52.5.crate) = 4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9
+SIZE (rust/crates/windows_x86_64_gnu-0.52.5.crate) = 831539
+SHA256 (rust/crates/windows_x86_64_gnullvm-0.48.5.crate) = 0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc
+SIZE (rust/crates/windows_x86_64_gnullvm-0.48.5.crate) = 418486
+SHA256 (rust/crates/windows_x86_64_gnullvm-0.52.5.crate) = 852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596
+SIZE (rust/crates/windows_x86_64_gnullvm-0.52.5.crate) = 433246
+SHA256 (rust/crates/windows_x86_64_msvc-0.48.5.crate) = ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538
+SIZE (rust/crates/windows_x86_64_msvc-0.48.5.crate) = 798412
+SHA256 (rust/crates/windows_x86_64_msvc-0.52.5.crate) = bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0
+SIZE (rust/crates/windows_x86_64_msvc-0.52.5.crate) = 827905
+SHA256 (rust/crates/winnow-0.5.40.crate) = f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876
+SIZE (rust/crates/winnow-0.5.40.crate) = 159316
+SHA256 (diesel-rs-diesel-v2.1.6_GH0.tar.gz) = 60775915f615d41b65f31861ed01e467961677b7e430c6cc58d22c0b9bc17baf
+SIZE (diesel-rs-diesel-v2.1.6_GH0.tar.gz) = 739412
diff --git a/databases/diesel/pkg-descr b/databases/diesel/pkg-descr
new file mode 100644
index 000000000000..d1541373a5b4
--- /dev/null
+++ b/databases/diesel/pkg-descr
@@ -0,0 +1,9 @@
+Diesel gets rid of the boilerplate for database interaction and eliminates
+runtime errors without sacrificing performance. It takes full advantage of
+Rust's type system to create a low overhead query builder that "feels like
+Rust."
+
+Supported databases:
+1. PostgreSQL
+2. MySQL
+3. SQLite
diff --git a/databases/duckdb/Makefile b/databases/duckdb/Makefile
new file mode 100644
index 000000000000..abde3f96cb27
--- /dev/null
+++ b/databases/duckdb/Makefile
@@ -0,0 +1,55 @@
+PORTNAME=	duckdb
+DISTVERSIONPREFIX=	v
+DISTVERSION=	0.10.2
+CATEGORIES=	databases
+
+MAINTAINER=	yuri@FreeBSD.org
+COMMENT=	In-process SQL OLAP database management system
+WWW=		https://duckdb.org/
+
+LICENSE=	MIT
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
+USES=		cmake:testing compiler:c++11-lang ssl
+USE_GITHUB=	yes
+GH_TUPLE=	duckdb:sqlite_scanner:091197e:sqlite/extension/sqlite_scanner
+
+CMAKE_ON=	BUILD_SHARED_LIBS
+CMAKE_OFF=	BUILD_UNITTESTS
+CMAKE_ARGS=	-DOVERRIDE_GIT_DESCRIBE=v${DISTVERSION}-0-g0000000000
+CMAKE_TESTING_ON=	BUILD_UNITTESTS # 2 tests fail, see https://github.com/duckdb/duckdb/issues/11744
+CMAKE_TESTING_TARGET=	${ALL_TARGET} # hack: works as empty target
+
+BINARY_ALIAS=	git=false
+
+OPTIONS_DEFINE=			TPCE
+OPTIONS_DEFAULT=		TPCE
+OPTIONS_GROUP=			EXTENSIONS
+OPTIONS_GROUP_EXTENSIONS=	AUTOCOMPLETE EXCEL FTS HTTPFS ICU INET JEMALLOC JSON PARQUET SQLSMITH TPCDS TPCH \
+				SQLITE_SCANNER
+
+EXTENSIONS_DESC=		Extensions:
+
+.for opt in ${OPTIONS_GROUP_EXTENSIONS}
+.  if "${${opt}_BROKEN}" == ""
+OPTIONS_DEFAULT+=	${opt}
+.  endif
+${opt}_DESC=		Build the ${opt} extension
+DUCKDB_EXTENSIONS+=	;${opt:tl}
+${opt}_PLIST_FILES=	lib/lib${opt:tl}_extension.a
+.endfor
+
+CMAKE_ARGS+=	-DBUILD_EXTENSIONS="${DUCKDB_EXTENSIONS:tW:S/ //g:S/^;//}" \
+		-DDUCKDB_MAJOR_VERSION=${PORTVERSION:R:R} \
+		-DDUCKDB_MINOR_VERSION=${PORTVERSION:R:E} \
+		-DDUCKDB_PATCH_VERSION=${PORTVERSION:E}
+
+SQLITE_SCANNER_CXXFLAGS=	-I${WRKSRC}/extension/sqlite_scanner/src/include # workaround for the header not being found
+
+TPCE_DESC=			Enable building of the TPC-E tool
+TPCE_CMAKE_BOOL=		BUILD_TPCE
+
+post-test: # run tests
+	@cd ${TEST_WRKSRC} && test/unittest
+
+.include <bsd.port.mk>
diff --git a/databases/duckdb/distinfo b/databases/duckdb/distinfo
new file mode 100644
index 000000000000..96eb9b75c08c
--- /dev/null
+++ b/databases/duckdb/distinfo
@@ -0,0 +1,5 @@
+TIMESTAMP = 1713472441
+SHA256 (duckdb-duckdb-v0.10.2_GH0.tar.gz) = 662a0ba5c35d678ab6870db8f65ffa1c72e6096ad525a35b41b275139684cea6
+SIZE (duckdb-duckdb-v0.10.2_GH0.tar.gz) = 80028898
+SHA256 (duckdb-sqlite_scanner-091197e_GH0.tar.gz) = 213604e86866dd835bea6471906e250a448d3d0d6f9b06e9d2c76f227a3fd688
+SIZE (duckdb-sqlite_scanner-091197e_GH0.tar.gz) = 4647658
diff --git a/databases/duckdb/pkg-descr b/databases/duckdb/pkg-descr
new file mode 100644
index 000000000000..5220ad7c3441
--- /dev/null
+++ b/databases/duckdb/pkg-descr
@@ -0,0 +1,5 @@
+DuckDB is a high-performance analytical database system. It is
+designed to be fast, reliable and easy to use. DuckDB provides a rich
+SQL dialect, with support far beyond basic SQL. DuckDB supports
+arbitrary and nested correlated subqueries, window functions,
+collations, complex types (arrays, structs), and more.
diff --git a/databases/duckdb/pkg-plist b/databases/duckdb/pkg-plist
new file mode 100644
index 000000000000..a7576107affd
--- /dev/null
+++ b/databases/duckdb/pkg-plist
@@ -0,0 +1,1083 @@
+bin/duckdb
+include/duckdb.h
+include/duckdb.hpp
+include/duckdb/catalog/catalog.hpp
+include/duckdb/catalog/catalog_entry.hpp
+include/duckdb/catalog/catalog_entry/aggregate_function_catalog_entry.hpp
+include/duckdb/catalog/catalog_entry/collate_catalog_entry.hpp
+include/duckdb/catalog/catalog_entry/column_dependency_manager.hpp
+include/duckdb/catalog/catalog_entry/copy_function_catalog_entry.hpp
+include/duckdb/catalog/catalog_entry/dependency/dependency_dependent_entry.hpp
+include/duckdb/catalog/catalog_entry/dependency/dependency_entry.hpp
+include/duckdb/catalog/catalog_entry/dependency/dependency_subject_entry.hpp
+include/duckdb/catalog/catalog_entry/duck_index_entry.hpp
+include/duckdb/catalog/catalog_entry/duck_schema_entry.hpp
+include/duckdb/catalog/catalog_entry/duck_table_entry.hpp
+include/duckdb/catalog/catalog_entry/function_entry.hpp
+include/duckdb/catalog/catalog_entry/index_catalog_entry.hpp
+include/duckdb/catalog/catalog_entry/list.hpp
+include/duckdb/catalog/catalog_entry/macro_catalog_entry.hpp
+include/duckdb/catalog/catalog_entry/pragma_function_catalog_entry.hpp
+include/duckdb/catalog/catalog_entry/scalar_function_catalog_entry.hpp
+include/duckdb/catalog/catalog_entry/scalar_macro_catalog_entry.hpp
+include/duckdb/catalog/catalog_entry/schema_catalog_entry.hpp
+include/duckdb/catalog/catalog_entry/sequence_catalog_entry.hpp
+include/duckdb/catalog/catalog_entry/table_catalog_entry.hpp
+include/duckdb/catalog/catalog_entry/table_column_type.hpp
+include/duckdb/catalog/catalog_entry/table_function_catalog_entry.hpp
+include/duckdb/catalog/catalog_entry/table_macro_catalog_entry.hpp
+include/duckdb/catalog/catalog_entry/type_catalog_entry.hpp
+include/duckdb/catalog/catalog_entry/view_catalog_entry.hpp
+include/duckdb/catalog/catalog_entry_map.hpp
+include/duckdb/catalog/catalog_search_path.hpp
+include/duckdb/catalog/catalog_set.hpp
+include/duckdb/catalog/catalog_transaction.hpp
+include/duckdb/catalog/default/builtin_types/types.hpp
+include/duckdb/catalog/default/default_functions.hpp
+include/duckdb/catalog/default/default_generator.hpp
+include/duckdb/catalog/default/default_schemas.hpp
+include/duckdb/catalog/default/default_types.hpp
+include/duckdb/catalog/default/default_views.hpp
+include/duckdb/catalog/dependency.hpp
+include/duckdb/catalog/dependency_catalog_set.hpp
+include/duckdb/catalog/dependency_list.hpp
+include/duckdb/catalog/dependency_manager.hpp
+include/duckdb/catalog/duck_catalog.hpp
+include/duckdb/catalog/similar_catalog_entry.hpp
+include/duckdb/catalog/standard_entry.hpp
+include/duckdb/common/adbc/adbc-init.hpp
+include/duckdb/common/adbc/adbc.hpp
+include/duckdb/common/adbc/single_batch_array_stream.hpp
+include/duckdb/common/algorithm.hpp
+include/duckdb/common/allocator.hpp
+include/duckdb/common/array.hpp
+include/duckdb/common/arrow/appender/append_data.hpp
+include/duckdb/common/arrow/appender/bool_data.hpp
+include/duckdb/common/arrow/appender/enum_data.hpp
+include/duckdb/common/arrow/appender/fixed_size_list_data.hpp
+include/duckdb/common/arrow/appender/list.hpp
+include/duckdb/common/arrow/appender/list_data.hpp
+include/duckdb/common/arrow/appender/map_data.hpp
+include/duckdb/common/arrow/appender/scalar_data.hpp
+include/duckdb/common/arrow/appender/struct_data.hpp
+include/duckdb/common/arrow/appender/union_data.hpp
+include/duckdb/common/arrow/appender/varchar_data.hpp
+include/duckdb/common/arrow/arrow.hpp
+include/duckdb/common/arrow/arrow_appender.hpp
+include/duckdb/common/arrow/arrow_buffer.hpp
+include/duckdb/common/arrow/arrow_converter.hpp
+include/duckdb/common/arrow/arrow_wrapper.hpp
+include/duckdb/common/arrow/nanoarrow/nanoarrow.hpp
+include/duckdb/common/arrow/result_arrow_wrapper.hpp
+include/duckdb/common/assert.hpp
+include/duckdb/common/atomic.hpp
+include/duckdb/common/bind_helpers.hpp
+include/duckdb/common/bit_utils.hpp
+include/duckdb/common/bitpacking.hpp
+include/duckdb/common/bitset.hpp
+include/duckdb/common/box_renderer.hpp
+include/duckdb/common/bswap.hpp
+include/duckdb/common/case_insensitive_map.hpp
+include/duckdb/common/checksum.hpp
+include/duckdb/common/chrono.hpp
+include/duckdb/common/common.hpp
+include/duckdb/common/compressed_file_system.hpp
+include/duckdb/common/constants.hpp
+include/duckdb/common/crypto/md5.hpp
+include/duckdb/common/deque.hpp
+include/duckdb/common/dl.hpp
+include/duckdb/common/enum_class_hash.hpp
+include/duckdb/common/enum_util.hpp
+include/duckdb/common/enums/access_mode.hpp
+include/duckdb/common/enums/aggregate_handling.hpp
+include/duckdb/common/enums/catalog_lookup_behavior.hpp
+include/duckdb/common/enums/catalog_type.hpp
+include/duckdb/common/enums/compression_type.hpp
+include/duckdb/common/enums/cte_materialize.hpp
+include/duckdb/common/enums/date_part_specifier.hpp
+include/duckdb/common/enums/debug_initialize.hpp
+include/duckdb/common/enums/expression_type.hpp
+include/duckdb/common/enums/file_compression_type.hpp
+include/duckdb/common/enums/file_glob_options.hpp
+include/duckdb/common/enums/filter_propagate_result.hpp
+include/duckdb/common/enums/index_constraint_type.hpp
+include/duckdb/common/enums/join_type.hpp
+include/duckdb/common/enums/joinref_type.hpp
+include/duckdb/common/enums/logical_operator_type.hpp
+include/duckdb/common/enums/memory_tag.hpp
+include/duckdb/common/enums/on_create_conflict.hpp
+include/duckdb/common/enums/on_entry_not_found.hpp
+include/duckdb/common/enums/operator_result_type.hpp
+include/duckdb/common/enums/optimizer_type.hpp
+include/duckdb/common/enums/order_preservation_type.hpp
+include/duckdb/common/enums/order_type.hpp
+include/duckdb/common/enums/output_type.hpp
+include/duckdb/common/enums/pending_execution_result.hpp
+include/duckdb/common/enums/physical_operator_type.hpp
+include/duckdb/common/enums/prepared_statement_mode.hpp
+include/duckdb/common/enums/profiler_format.hpp
+include/duckdb/common/enums/relation_type.hpp
+include/duckdb/common/enums/scan_options.hpp
+include/duckdb/common/enums/set_operation_type.hpp
+include/duckdb/common/enums/set_scope.hpp
+include/duckdb/common/enums/set_type.hpp
+include/duckdb/common/enums/statement_type.hpp
+include/duckdb/common/enums/subquery_type.hpp
+include/duckdb/common/enums/tableref_type.hpp
+include/duckdb/common/enums/undo_flags.hpp
+include/duckdb/common/enums/vector_type.hpp
+include/duckdb/common/enums/wal_type.hpp
+include/duckdb/common/enums/window_aggregation_mode.hpp
+include/duckdb/common/error_data.hpp
+include/duckdb/common/exception.hpp
+include/duckdb/common/exception/binder_exception.hpp
+include/duckdb/common/exception/catalog_exception.hpp
+include/duckdb/common/exception/conversion_exception.hpp
+include/duckdb/common/exception/http_exception.hpp
+include/duckdb/common/exception/list.hpp
+include/duckdb/common/exception/parser_exception.hpp
+include/duckdb/common/exception/transaction_exception.hpp
+include/duckdb/common/exception_format_value.hpp
+include/duckdb/common/extra_operator_info.hpp
+include/duckdb/common/extra_type_info.hpp
+include/duckdb/common/fast_mem.hpp
+include/duckdb/common/file_buffer.hpp
+include/duckdb/common/file_open_flags.hpp
+include/duckdb/common/file_opener.hpp
+include/duckdb/common/file_system.hpp
+include/duckdb/common/filename_pattern.hpp
+include/duckdb/common/fixed_size_map.hpp
+include/duckdb/common/fsst.hpp
+include/duckdb/common/fstream.hpp
+include/duckdb/common/gzip_file_system.hpp
+include/duckdb/common/helper.hpp
+include/duckdb/common/hive_partitioning.hpp
+include/duckdb/common/http_state.hpp
+include/duckdb/common/hugeint.hpp
+include/duckdb/common/index_map.hpp
+include/duckdb/common/index_vector.hpp
+include/duckdb/common/likely.hpp
+include/duckdb/common/limits.hpp
+include/duckdb/common/list.hpp
+include/duckdb/common/local_file_system.hpp
+include/duckdb/common/map.hpp
+include/duckdb/common/memory_safety.hpp
+include/duckdb/common/multi_file_reader.hpp
+include/duckdb/common/multi_file_reader_options.hpp
+include/duckdb/common/mutex.hpp
+include/duckdb/common/named_parameter_map.hpp
+include/duckdb/common/numeric_utils.hpp
+include/duckdb/common/opener_file_system.hpp
+include/duckdb/common/operator/abs.hpp
+include/duckdb/common/operator/add.hpp
+include/duckdb/common/operator/aggregate_operators.hpp
+include/duckdb/common/operator/cast_operators.hpp
+include/duckdb/common/operator/comparison_operators.hpp
+include/duckdb/common/operator/constant_operators.hpp
+include/duckdb/common/operator/convert_to_string.hpp
+include/duckdb/common/operator/decimal_cast_operators.hpp
+include/duckdb/common/operator/double_cast_operator.hpp
+include/duckdb/common/operator/integer_cast_operator.hpp
+include/duckdb/common/operator/multiply.hpp
+include/duckdb/common/operator/numeric_binary_operators.hpp
+include/duckdb/common/operator/numeric_cast.hpp
+include/duckdb/common/operator/string_cast.hpp
+include/duckdb/common/operator/subtract.hpp
+include/duckdb/common/optional_idx.hpp
+include/duckdb/common/optional_ptr.hpp
+include/duckdb/common/pair.hpp
+include/duckdb/common/perfect_map_set.hpp
+include/duckdb/common/pipe_file_system.hpp
+include/duckdb/common/printer.hpp
+include/duckdb/common/profiler.hpp
+include/duckdb/common/progress_bar/display/terminal_progress_bar_display.hpp
+include/duckdb/common/progress_bar/progress_bar.hpp
+include/duckdb/common/progress_bar/progress_bar_display.hpp
+include/duckdb/common/queue.hpp
+include/duckdb/common/radix.hpp
+include/duckdb/common/radix_partitioning.hpp
+include/duckdb/common/random_engine.hpp
+include/duckdb/common/re2_regex.hpp
+include/duckdb/common/reference_map.hpp
+include/duckdb/common/row_operations/row_matcher.hpp
+include/duckdb/common/row_operations/row_operations.hpp
+include/duckdb/common/serializer/binary_deserializer.hpp
+include/duckdb/common/serializer/binary_serializer.hpp
+include/duckdb/common/serializer/buffered_file_reader.hpp
+include/duckdb/common/serializer/buffered_file_writer.hpp
+include/duckdb/common/serializer/deserialization_data.hpp
+include/duckdb/common/serializer/deserializer.hpp
+include/duckdb/common/serializer/encoding_util.hpp
+include/duckdb/common/serializer/memory_stream.hpp
+include/duckdb/common/serializer/read_stream.hpp
+include/duckdb/common/serializer/serialization_traits.hpp
+include/duckdb/common/serializer/serializer.hpp
+include/duckdb/common/serializer/write_stream.hpp
+include/duckdb/common/set.hpp
+include/duckdb/common/shared_ptr.hpp
+include/duckdb/common/sort/comparators.hpp
+include/duckdb/common/sort/duckdb_pdqsort.hpp
+include/duckdb/common/sort/partition_state.hpp
+include/duckdb/common/sort/sort.hpp
+include/duckdb/common/sort/sorted_block.hpp
+include/duckdb/common/stack.hpp
+include/duckdb/common/stack_checker.hpp
+include/duckdb/common/string.hpp
+include/duckdb/common/string_map_set.hpp
+include/duckdb/common/string_util.hpp
+include/duckdb/common/swap.hpp
+include/duckdb/common/thread.hpp
+include/duckdb/common/to_string.hpp
+include/duckdb/common/tree_renderer.hpp
+include/duckdb/common/type_util.hpp
+include/duckdb/common/typedefs.hpp
+include/duckdb/common/types.hpp
+include/duckdb/common/types/arrow_aux_data.hpp
+include/duckdb/common/types/batched_data_collection.hpp
+include/duckdb/common/types/bit.hpp
+include/duckdb/common/types/blob.hpp
+include/duckdb/common/types/cast_helpers.hpp
+include/duckdb/common/types/column/column_data_allocator.hpp
+include/duckdb/common/types/column/column_data_collection.hpp
+include/duckdb/common/types/column/column_data_collection_iterators.hpp
+include/duckdb/common/types/column/column_data_collection_segment.hpp
+include/duckdb/common/types/column/column_data_consumer.hpp
+include/duckdb/common/types/column/column_data_scan_states.hpp
+include/duckdb/common/types/column/partitioned_column_data.hpp
+include/duckdb/common/types/conflict_manager.hpp
+include/duckdb/common/types/constraint_conflict_info.hpp
+include/duckdb/common/types/data_chunk.hpp
+include/duckdb/common/types/date.hpp
+include/duckdb/common/types/datetime.hpp
+include/duckdb/common/types/decimal.hpp
+include/duckdb/common/types/hash.hpp
+include/duckdb/common/types/hugeint.hpp
+include/duckdb/common/types/hyperloglog.hpp
+include/duckdb/common/types/interval.hpp
+include/duckdb/common/types/list_segment.hpp
+include/duckdb/common/types/null_value.hpp
+include/duckdb/common/types/row/partitioned_tuple_data.hpp
+include/duckdb/common/types/row/row_data_collection.hpp
+include/duckdb/common/types/row/row_data_collection_scanner.hpp
+include/duckdb/common/types/row/row_layout.hpp
+include/duckdb/common/types/row/tuple_data_allocator.hpp
+include/duckdb/common/types/row/tuple_data_collection.hpp
+include/duckdb/common/types/row/tuple_data_iterator.hpp
+include/duckdb/common/types/row/tuple_data_layout.hpp
+include/duckdb/common/types/row/tuple_data_segment.hpp
+include/duckdb/common/types/row/tuple_data_states.hpp
+include/duckdb/common/types/sel_cache.hpp
+include/duckdb/common/types/selection_vector.hpp
+include/duckdb/common/types/string_heap.hpp
+include/duckdb/common/types/string_type.hpp
+include/duckdb/common/types/time.hpp
+include/duckdb/common/types/timestamp.hpp
+include/duckdb/common/types/type_map.hpp
+include/duckdb/common/types/uhugeint.hpp
+include/duckdb/common/types/uuid.hpp
+include/duckdb/common/types/validity_mask.hpp
+include/duckdb/common/types/value.hpp
+include/duckdb/common/types/value_map.hpp
+include/duckdb/common/types/vector.hpp
+include/duckdb/common/types/vector_buffer.hpp
+include/duckdb/common/types/vector_cache.hpp
+include/duckdb/common/uhugeint.hpp
+include/duckdb/common/unicode_bar.hpp
+include/duckdb/common/union_by_name.hpp
+include/duckdb/common/unique_ptr.hpp
+include/duckdb/common/unordered_map.hpp
+include/duckdb/common/unordered_set.hpp
+include/duckdb/common/value_operations/value_operations.hpp
+include/duckdb/common/vector.hpp
+include/duckdb/common/vector_operations/aggregate_executor.hpp
+include/duckdb/common/vector_operations/binary_executor.hpp
+include/duckdb/common/vector_operations/general_cast.hpp
+include/duckdb/common/vector_operations/generic_executor.hpp
+include/duckdb/common/vector_operations/senary_executor.hpp
+include/duckdb/common/vector_operations/septenary_executor.hpp
+include/duckdb/common/vector_operations/ternary_executor.hpp
+include/duckdb/common/vector_operations/unary_executor.hpp
+include/duckdb/common/vector_operations/vector_operations.hpp
+include/duckdb/common/vector_size.hpp
+include/duckdb/common/virtual_file_system.hpp
+include/duckdb/common/winapi.hpp
+include/duckdb/common/windows.hpp
+include/duckdb/common/windows_undefs.hpp
+include/duckdb/common/windows_util.hpp
+include/duckdb/core_functions/aggregate/algebraic/corr.hpp
+include/duckdb/core_functions/aggregate/algebraic/covar.hpp
+include/duckdb/core_functions/aggregate/algebraic/stddev.hpp
+include/duckdb/core_functions/aggregate/algebraic_functions.hpp
+include/duckdb/core_functions/aggregate/distributive_functions.hpp
+include/duckdb/core_functions/aggregate/holistic_functions.hpp
+include/duckdb/core_functions/aggregate/nested_functions.hpp
+include/duckdb/core_functions/aggregate/quantile_enum.hpp
+include/duckdb/core_functions/aggregate/regression/regr_count.hpp
+include/duckdb/core_functions/aggregate/regression/regr_slope.hpp
+include/duckdb/core_functions/aggregate/regression_functions.hpp
+include/duckdb/core_functions/aggregate/sum_helpers.hpp
+include/duckdb/core_functions/core_functions.hpp
+include/duckdb/core_functions/function_list.hpp
+include/duckdb/core_functions/lambda_functions.hpp
+include/duckdb/core_functions/scalar/array_functions.hpp
+include/duckdb/core_functions/scalar/bit_functions.hpp
+include/duckdb/core_functions/scalar/blob_functions.hpp
+include/duckdb/core_functions/scalar/date_functions.hpp
+include/duckdb/core_functions/scalar/debug_functions.hpp
+include/duckdb/core_functions/scalar/enum_functions.hpp
+include/duckdb/core_functions/scalar/generic_functions.hpp
+include/duckdb/core_functions/scalar/list_functions.hpp
+include/duckdb/core_functions/scalar/map_functions.hpp
+include/duckdb/core_functions/scalar/math_functions.hpp
+include/duckdb/core_functions/scalar/operators_functions.hpp
+include/duckdb/core_functions/scalar/random_functions.hpp
+include/duckdb/core_functions/scalar/secret_functions.hpp
+include/duckdb/core_functions/scalar/string_functions.hpp
+include/duckdb/core_functions/scalar/struct_functions.hpp
+include/duckdb/core_functions/scalar/union_functions.hpp
+include/duckdb/core_functions/to_interval.hpp
+include/duckdb/execution/adaptive_filter.hpp
+include/duckdb/execution/aggregate_hashtable.hpp
+include/duckdb/execution/base_aggregate_hashtable.hpp
+include/duckdb/execution/column_binding_resolver.hpp
+include/duckdb/execution/execution_context.hpp
+include/duckdb/execution/executor.hpp
+include/duckdb/execution/expression_executor.hpp
+include/duckdb/execution/expression_executor_state.hpp
+include/duckdb/execution/index/art/art.hpp
+include/duckdb/execution/index/art/art_key.hpp
+include/duckdb/execution/index/art/iterator.hpp
+include/duckdb/execution/index/art/leaf.hpp
+include/duckdb/execution/index/art/node.hpp
+include/duckdb/execution/index/art/node16.hpp
+include/duckdb/execution/index/art/node256.hpp
+include/duckdb/execution/index/art/node4.hpp
+include/duckdb/execution/index/art/node48.hpp
+include/duckdb/execution/index/art/prefix.hpp
+include/duckdb/execution/index/fixed_size_allocator.hpp
+include/duckdb/execution/index/fixed_size_buffer.hpp
+include/duckdb/execution/index/index_pointer.hpp
+include/duckdb/execution/index/index_type.hpp
+include/duckdb/execution/index/index_type_set.hpp
+include/duckdb/execution/index/unknown_index.hpp
+include/duckdb/execution/join_hashtable.hpp
+include/duckdb/execution/merge_sort_tree.hpp
+include/duckdb/execution/nested_loop_join.hpp
+include/duckdb/execution/operator/aggregate/aggregate_object.hpp
+include/duckdb/execution/operator/aggregate/distinct_aggregate_data.hpp
+include/duckdb/execution/operator/aggregate/grouped_aggregate_data.hpp
+include/duckdb/execution/operator/aggregate/physical_hash_aggregate.hpp
+include/duckdb/execution/operator/aggregate/physical_perfecthash_aggregate.hpp
+include/duckdb/execution/operator/aggregate/physical_streaming_window.hpp
+include/duckdb/execution/operator/aggregate/physical_ungrouped_aggregate.hpp
+include/duckdb/execution/operator/aggregate/physical_window.hpp
+include/duckdb/execution/operator/csv_scanner/base_scanner.hpp
+include/duckdb/execution/operator/csv_scanner/column_count_scanner.hpp
+include/duckdb/execution/operator/csv_scanner/csv_buffer.hpp
+include/duckdb/execution/operator/csv_scanner/csv_buffer_manager.hpp
+include/duckdb/execution/operator/csv_scanner/csv_casting.hpp
+include/duckdb/execution/operator/csv_scanner/csv_error.hpp
+include/duckdb/execution/operator/csv_scanner/csv_file_handle.hpp
+include/duckdb/execution/operator/csv_scanner/csv_file_scanner.hpp
+include/duckdb/execution/operator/csv_scanner/csv_option.hpp
+include/duckdb/execution/operator/csv_scanner/csv_reader_options.hpp
+include/duckdb/execution/operator/csv_scanner/csv_sniffer.hpp
+include/duckdb/execution/operator/csv_scanner/csv_state.hpp
+include/duckdb/execution/operator/csv_scanner/csv_state_machine.hpp
+include/duckdb/execution/operator/csv_scanner/csv_state_machine_cache.hpp
+include/duckdb/execution/operator/csv_scanner/global_csv_state.hpp
+include/duckdb/execution/operator/csv_scanner/quote_rules.hpp
+include/duckdb/execution/operator/csv_scanner/scanner_boundary.hpp
+include/duckdb/execution/operator/csv_scanner/skip_scanner.hpp
+include/duckdb/execution/operator/csv_scanner/state_machine_options.hpp
+include/duckdb/execution/operator/csv_scanner/string_value_scanner.hpp
+include/duckdb/execution/operator/filter/physical_filter.hpp
+include/duckdb/execution/operator/helper/physical_batch_collector.hpp
+include/duckdb/execution/operator/helper/physical_buffered_collector.hpp
+include/duckdb/execution/operator/helper/physical_create_secret.hpp
+include/duckdb/execution/operator/helper/physical_execute.hpp
+include/duckdb/execution/operator/helper/physical_explain_analyze.hpp
+include/duckdb/execution/operator/helper/physical_limit.hpp
+include/duckdb/execution/operator/helper/physical_limit_percent.hpp
+include/duckdb/execution/operator/helper/physical_load.hpp
+include/duckdb/execution/operator/helper/physical_materialized_collector.hpp
+include/duckdb/execution/operator/helper/physical_pragma.hpp
+include/duckdb/execution/operator/helper/physical_prepare.hpp
+include/duckdb/execution/operator/helper/physical_reservoir_sample.hpp
+include/duckdb/execution/operator/helper/physical_reset.hpp
+include/duckdb/execution/operator/helper/physical_result_collector.hpp
+include/duckdb/execution/operator/helper/physical_set.hpp
+include/duckdb/execution/operator/helper/physical_streaming_limit.hpp
+include/duckdb/execution/operator/helper/physical_streaming_sample.hpp
+include/duckdb/execution/operator/helper/physical_transaction.hpp
+include/duckdb/execution/operator/helper/physical_vacuum.hpp
+include/duckdb/execution/operator/helper/physical_verify_vector.hpp
+include/duckdb/execution/operator/join/outer_join_marker.hpp
+include/duckdb/execution/operator/join/perfect_hash_join_executor.hpp
+include/duckdb/execution/operator/join/physical_asof_join.hpp
+include/duckdb/execution/operator/join/physical_blockwise_nl_join.hpp
+include/duckdb/execution/operator/join/physical_comparison_join.hpp
+include/duckdb/execution/operator/join/physical_cross_product.hpp
+include/duckdb/execution/operator/join/physical_delim_join.hpp
+include/duckdb/execution/operator/join/physical_hash_join.hpp
+include/duckdb/execution/operator/join/physical_iejoin.hpp
+include/duckdb/execution/operator/join/physical_join.hpp
+include/duckdb/execution/operator/join/physical_left_delim_join.hpp
+include/duckdb/execution/operator/join/physical_nested_loop_join.hpp
+include/duckdb/execution/operator/join/physical_piecewise_merge_join.hpp
+include/duckdb/execution/operator/join/physical_positional_join.hpp
+include/duckdb/execution/operator/join/physical_range_join.hpp
+include/duckdb/execution/operator/join/physical_right_delim_join.hpp
+include/duckdb/execution/operator/order/physical_order.hpp
+include/duckdb/execution/operator/order/physical_top_n.hpp
+include/duckdb/execution/operator/persistent/batch_memory_manager.hpp
+include/duckdb/execution/operator/persistent/batch_task_manager.hpp
+include/duckdb/execution/operator/persistent/csv_rejects_table.hpp
+include/duckdb/execution/operator/persistent/physical_batch_copy_to_file.hpp
+include/duckdb/execution/operator/persistent/physical_batch_insert.hpp
+include/duckdb/execution/operator/persistent/physical_copy_database.hpp
+include/duckdb/execution/operator/persistent/physical_copy_to_file.hpp
+include/duckdb/execution/operator/persistent/physical_delete.hpp
+include/duckdb/execution/operator/persistent/physical_export.hpp
+include/duckdb/execution/operator/persistent/physical_insert.hpp
+include/duckdb/execution/operator/persistent/physical_update.hpp
+include/duckdb/execution/operator/projection/physical_pivot.hpp
+include/duckdb/execution/operator/projection/physical_projection.hpp
+include/duckdb/execution/operator/projection/physical_tableinout_function.hpp
+include/duckdb/execution/operator/projection/physical_unnest.hpp
+include/duckdb/execution/operator/scan/physical_column_data_scan.hpp
+include/duckdb/execution/operator/scan/physical_dummy_scan.hpp
+include/duckdb/execution/operator/scan/physical_empty_result.hpp
+include/duckdb/execution/operator/scan/physical_expression_scan.hpp
+include/duckdb/execution/operator/scan/physical_positional_scan.hpp
+include/duckdb/execution/operator/scan/physical_table_scan.hpp
+include/duckdb/execution/operator/schema/physical_alter.hpp
+include/duckdb/execution/operator/schema/physical_attach.hpp
+include/duckdb/execution/operator/schema/physical_create_art_index.hpp
+include/duckdb/execution/operator/schema/physical_create_function.hpp
+include/duckdb/execution/operator/schema/physical_create_schema.hpp
+include/duckdb/execution/operator/schema/physical_create_sequence.hpp
+include/duckdb/execution/operator/schema/physical_create_table.hpp
+include/duckdb/execution/operator/schema/physical_create_type.hpp
+include/duckdb/execution/operator/schema/physical_create_view.hpp
+include/duckdb/execution/operator/schema/physical_detach.hpp
+include/duckdb/execution/operator/schema/physical_drop.hpp
+include/duckdb/execution/operator/set/physical_cte.hpp
+include/duckdb/execution/operator/set/physical_recursive_cte.hpp
+include/duckdb/execution/operator/set/physical_union.hpp
+include/duckdb/execution/perfect_aggregate_hashtable.hpp
+include/duckdb/execution/physical_operator.hpp
+include/duckdb/execution/physical_operator_states.hpp
+include/duckdb/execution/physical_plan_generator.hpp
+include/duckdb/execution/radix_partitioned_hashtable.hpp
+include/duckdb/execution/reservoir_sample.hpp
+include/duckdb/execution/task_error_manager.hpp
+include/duckdb/execution/window_executor.hpp
+include/duckdb/execution/window_segment_tree.hpp
+include/duckdb/function/aggregate/distributive_functions.hpp
+include/duckdb/function/aggregate_function.hpp
+include/duckdb/function/aggregate_state.hpp
+include/duckdb/function/built_in_functions.hpp
+include/duckdb/function/cast/bound_cast_data.hpp
+include/duckdb/function/cast/cast_function_set.hpp
+include/duckdb/function/cast/default_casts.hpp
+include/duckdb/function/cast/vector_cast_helpers.hpp
+include/duckdb/function/cast_rules.hpp
+include/duckdb/function/compression/compression.hpp
+include/duckdb/function/compression_function.hpp
+include/duckdb/function/copy_function.hpp
+include/duckdb/function/function.hpp
+include/duckdb/function/function_binder.hpp
+include/duckdb/function/function_serialization.hpp
+include/duckdb/function/function_set.hpp
+include/duckdb/function/macro_function.hpp
+include/duckdb/function/pragma/pragma_functions.hpp
+include/duckdb/function/pragma_function.hpp
+include/duckdb/function/replacement_scan.hpp
+include/duckdb/function/scalar/compressed_materialization_functions.hpp
+include/duckdb/function/scalar/generic_functions.hpp
+include/duckdb/function/scalar/list/contains_or_position.hpp
+include/duckdb/function/scalar/nested_functions.hpp
+include/duckdb/function/scalar/operators.hpp
+include/duckdb/function/scalar/regexp.hpp
+include/duckdb/function/scalar/sequence_functions.hpp
+include/duckdb/function/scalar/strftime_format.hpp
+include/duckdb/function/scalar/string_functions.hpp
+include/duckdb/function/scalar_function.hpp
+include/duckdb/function/scalar_macro_function.hpp
+include/duckdb/function/table/arrow.hpp
+include/duckdb/function/table/arrow/arrow_duck_schema.hpp
+include/duckdb/function/table/list.hpp
+include/duckdb/function/table/range.hpp
+include/duckdb/function/table/read_csv.hpp
+include/duckdb/function/table/summary.hpp
+include/duckdb/function/table/system_functions.hpp
+include/duckdb/function/table/table_scan.hpp
+include/duckdb/function/table_function.hpp
+include/duckdb/function/table_macro_function.hpp
+include/duckdb/function/udf_function.hpp
+include/duckdb/main/appender.hpp
+include/duckdb/main/attached_database.hpp
+include/duckdb/main/buffered_data/buffered_data.hpp
+include/duckdb/main/buffered_data/simple_buffered_data.hpp
+include/duckdb/main/capi/capi_internal.hpp
+include/duckdb/main/capi/cast/from_decimal.hpp
+include/duckdb/main/capi/cast/generic.hpp
+include/duckdb/main/capi/cast/to_decimal.hpp
+include/duckdb/main/capi/cast/utils.hpp
+include/duckdb/main/chunk_scan_state.hpp
+include/duckdb/main/chunk_scan_state/query_result.hpp
+include/duckdb/main/client_config.hpp
+include/duckdb/main/client_context.hpp
+include/duckdb/main/client_context_file_opener.hpp
+include/duckdb/main/client_context_state.hpp
+include/duckdb/main/client_data.hpp
+include/duckdb/main/client_properties.hpp
+include/duckdb/main/config.hpp
+include/duckdb/main/connection.hpp
+include/duckdb/main/connection_manager.hpp
+include/duckdb/main/database.hpp
+include/duckdb/main/database_file_opener.hpp
+include/duckdb/main/database_manager.hpp
+include/duckdb/main/database_path_and_type.hpp
+include/duckdb/main/db_instance_cache.hpp
+include/duckdb/main/error_manager.hpp
+include/duckdb/main/extension.hpp
+include/duckdb/main/extension/generated_extension_loader.hpp
+include/duckdb/main/extension_entries.hpp
+include/duckdb/main/extension_helper.hpp
+include/duckdb/main/extension_util.hpp
+include/duckdb/main/external_dependencies.hpp
+include/duckdb/main/materialized_query_result.hpp
+include/duckdb/main/pending_query_result.hpp
+include/duckdb/main/prepared_statement.hpp
+include/duckdb/main/prepared_statement_data.hpp
+include/duckdb/main/query_profiler.hpp
+include/duckdb/main/query_result.hpp
+include/duckdb/main/relation.hpp
+include/duckdb/main/relation/aggregate_relation.hpp
+include/duckdb/main/relation/create_table_relation.hpp
+include/duckdb/main/relation/create_view_relation.hpp
+include/duckdb/main/relation/cross_product_relation.hpp
+include/duckdb/main/relation/delete_relation.hpp
+include/duckdb/main/relation/distinct_relation.hpp
+include/duckdb/main/relation/explain_relation.hpp
+include/duckdb/main/relation/filter_relation.hpp
+include/duckdb/main/relation/insert_relation.hpp
+include/duckdb/main/relation/join_relation.hpp
+include/duckdb/main/relation/limit_relation.hpp
+include/duckdb/main/relation/order_relation.hpp
+include/duckdb/main/relation/projection_relation.hpp
+include/duckdb/main/relation/query_relation.hpp
+include/duckdb/main/relation/read_csv_relation.hpp
+include/duckdb/main/relation/read_json_relation.hpp
+include/duckdb/main/relation/setop_relation.hpp
+include/duckdb/main/relation/subquery_relation.hpp
+include/duckdb/main/relation/table_function_relation.hpp
+include/duckdb/main/relation/table_relation.hpp
+include/duckdb/main/relation/update_relation.hpp
+include/duckdb/main/relation/value_relation.hpp
+include/duckdb/main/relation/view_relation.hpp
+include/duckdb/main/relation/write_csv_relation.hpp
+include/duckdb/main/relation/write_parquet_relation.hpp
+include/duckdb/main/secret/secret.hpp
+include/duckdb/main/secret/secret_manager.hpp
+include/duckdb/main/secret/secret_storage.hpp
+include/duckdb/main/settings.hpp
+include/duckdb/main/stream_query_result.hpp
+include/duckdb/main/table_description.hpp
+include/duckdb/main/valid_checker.hpp
+include/duckdb/optimizer/column_binding_replacer.hpp
+include/duckdb/optimizer/column_lifetime_analyzer.hpp
+include/duckdb/optimizer/common_aggregate_optimizer.hpp
+include/duckdb/optimizer/compressed_materialization.hpp
+include/duckdb/optimizer/cse_optimizer.hpp
+include/duckdb/optimizer/deliminator.hpp
+include/duckdb/optimizer/expression_heuristics.hpp
+include/duckdb/optimizer/expression_rewriter.hpp
+include/duckdb/optimizer/filter_combiner.hpp
+include/duckdb/optimizer/filter_pullup.hpp
+include/duckdb/optimizer/filter_pushdown.hpp
+include/duckdb/optimizer/in_clause_rewriter.hpp
+include/duckdb/optimizer/join_order/cardinality_estimator.hpp
+include/duckdb/optimizer/join_order/cost_model.hpp
+include/duckdb/optimizer/join_order/estimated_properties.hpp
+include/duckdb/optimizer/join_order/join_node.hpp
+include/duckdb/optimizer/join_order/join_order_optimizer.hpp
+include/duckdb/optimizer/join_order/join_relation.hpp
+include/duckdb/optimizer/join_order/plan_enumerator.hpp
+include/duckdb/optimizer/join_order/query_graph.hpp
+include/duckdb/optimizer/join_order/query_graph_manager.hpp
+include/duckdb/optimizer/join_order/relation_manager.hpp
+include/duckdb/optimizer/join_order/relation_statistics_helper.hpp
+include/duckdb/optimizer/matcher/expression_matcher.hpp
+include/duckdb/optimizer/matcher/expression_type_matcher.hpp
+include/duckdb/optimizer/matcher/function_matcher.hpp
+include/duckdb/optimizer/matcher/logical_operator_matcher.hpp
+include/duckdb/optimizer/matcher/set_matcher.hpp
+include/duckdb/optimizer/matcher/type_matcher.hpp
+include/duckdb/optimizer/matcher/type_matcher_id.hpp
+include/duckdb/optimizer/optimizer.hpp
+include/duckdb/optimizer/optimizer_extension.hpp
+include/duckdb/optimizer/regex_range_filter.hpp
+include/duckdb/optimizer/remove_duplicate_groups.hpp
+include/duckdb/optimizer/remove_unused_columns.hpp
+include/duckdb/optimizer/rule.hpp
+include/duckdb/optimizer/rule/arithmetic_simplification.hpp
+include/duckdb/optimizer/rule/case_simplification.hpp
+include/duckdb/optimizer/rule/comparison_simplification.hpp
+include/duckdb/optimizer/rule/conjunction_simplification.hpp
+include/duckdb/optimizer/rule/constant_folding.hpp
+include/duckdb/optimizer/rule/date_part_simplification.hpp
+include/duckdb/optimizer/rule/distributivity.hpp
+include/duckdb/optimizer/rule/empty_needle_removal.hpp
+include/duckdb/optimizer/rule/enum_comparison.hpp
+include/duckdb/optimizer/rule/equal_or_null_simplification.hpp
+include/duckdb/optimizer/rule/in_clause_simplification.hpp
+include/duckdb/optimizer/rule/like_optimizations.hpp
+include/duckdb/optimizer/rule/list.hpp
+include/duckdb/optimizer/rule/move_constants.hpp
+include/duckdb/optimizer/rule/ordered_aggregate_optimizer.hpp
+include/duckdb/optimizer/rule/regex_optimizations.hpp
+include/duckdb/optimizer/statistics_propagator.hpp
+include/duckdb/optimizer/topn_optimizer.hpp
+include/duckdb/optimizer/unnest_rewriter.hpp
+include/duckdb/parallel/base_pipeline_event.hpp
+include/duckdb/parallel/concurrentqueue.hpp
+include/duckdb/parallel/event.hpp
+include/duckdb/parallel/executor_task.hpp
+include/duckdb/parallel/interrupt.hpp
+include/duckdb/parallel/meta_pipeline.hpp
+include/duckdb/parallel/pipeline.hpp
+include/duckdb/parallel/pipeline_complete_event.hpp
+include/duckdb/parallel/pipeline_event.hpp
+include/duckdb/parallel/pipeline_executor.hpp
+include/duckdb/parallel/pipeline_finish_event.hpp
+include/duckdb/parallel/pipeline_initialize_event.hpp
+include/duckdb/parallel/task.hpp
+include/duckdb/parallel/task_counter.hpp
+include/duckdb/parallel/task_scheduler.hpp
+include/duckdb/parallel/thread_context.hpp
+include/duckdb/parser/base_expression.hpp
+include/duckdb/parser/column_definition.hpp
+include/duckdb/parser/column_list.hpp
+include/duckdb/parser/common_table_expression_info.hpp
+include/duckdb/parser/constraint.hpp
+include/duckdb/parser/constraints/check_constraint.hpp
+include/duckdb/parser/constraints/foreign_key_constraint.hpp
+include/duckdb/parser/constraints/list.hpp
+include/duckdb/parser/constraints/not_null_constraint.hpp
+include/duckdb/parser/constraints/unique_constraint.hpp
+include/duckdb/parser/expression/between_expression.hpp
+include/duckdb/parser/expression/bound_expression.hpp
+include/duckdb/parser/expression/case_expression.hpp
+include/duckdb/parser/expression/cast_expression.hpp
+include/duckdb/parser/expression/collate_expression.hpp
+include/duckdb/parser/expression/columnref_expression.hpp
+include/duckdb/parser/expression/comparison_expression.hpp
+include/duckdb/parser/expression/conjunction_expression.hpp
+include/duckdb/parser/expression/constant_expression.hpp
+include/duckdb/parser/expression/default_expression.hpp
+include/duckdb/parser/expression/function_expression.hpp
+include/duckdb/parser/expression/lambda_expression.hpp
+include/duckdb/parser/expression/lambdaref_expression.hpp
+include/duckdb/parser/expression/list.hpp
+include/duckdb/parser/expression/operator_expression.hpp
+include/duckdb/parser/expression/parameter_expression.hpp
+include/duckdb/parser/expression/positional_reference_expression.hpp
+include/duckdb/parser/expression/star_expression.hpp
+include/duckdb/parser/expression/subquery_expression.hpp
+include/duckdb/parser/expression/window_expression.hpp
+include/duckdb/parser/expression_map.hpp
+include/duckdb/parser/expression_util.hpp
+include/duckdb/parser/group_by_node.hpp
+include/duckdb/parser/keyword_helper.hpp
+include/duckdb/parser/parsed_data/alter_info.hpp
+include/duckdb/parser/parsed_data/alter_scalar_function_info.hpp
+include/duckdb/parser/parsed_data/alter_table_function_info.hpp
+include/duckdb/parser/parsed_data/alter_table_info.hpp
+include/duckdb/parser/parsed_data/attach_info.hpp
+include/duckdb/parser/parsed_data/bound_pragma_info.hpp
+include/duckdb/parser/parsed_data/comment_on_column_info.hpp
+include/duckdb/parser/parsed_data/copy_database_info.hpp
+include/duckdb/parser/parsed_data/copy_info.hpp
+include/duckdb/parser/parsed_data/create_aggregate_function_info.hpp
+include/duckdb/parser/parsed_data/create_collation_info.hpp
+include/duckdb/parser/parsed_data/create_copy_function_info.hpp
+include/duckdb/parser/parsed_data/create_function_info.hpp
+include/duckdb/parser/parsed_data/create_index_info.hpp
+include/duckdb/parser/parsed_data/create_info.hpp
+include/duckdb/parser/parsed_data/create_macro_info.hpp
+include/duckdb/parser/parsed_data/create_pragma_function_info.hpp
+include/duckdb/parser/parsed_data/create_scalar_function_info.hpp
+include/duckdb/parser/parsed_data/create_schema_info.hpp
+include/duckdb/parser/parsed_data/create_secret_info.hpp
+include/duckdb/parser/parsed_data/create_sequence_info.hpp
+include/duckdb/parser/parsed_data/create_table_function_info.hpp
+include/duckdb/parser/parsed_data/create_table_info.hpp
+include/duckdb/parser/parsed_data/create_type_info.hpp
+include/duckdb/parser/parsed_data/create_view_info.hpp
+include/duckdb/parser/parsed_data/detach_info.hpp
+include/duckdb/parser/parsed_data/drop_info.hpp
+include/duckdb/parser/parsed_data/exported_table_data.hpp
+include/duckdb/parser/parsed_data/extra_drop_info.hpp
+include/duckdb/parser/parsed_data/load_info.hpp
+include/duckdb/parser/parsed_data/parse_info.hpp
+include/duckdb/parser/parsed_data/pragma_info.hpp
+include/duckdb/parser/parsed_data/sample_options.hpp
+include/duckdb/parser/parsed_data/show_select_info.hpp
+include/duckdb/parser/parsed_data/transaction_info.hpp
+include/duckdb/parser/parsed_data/vacuum_info.hpp
+include/duckdb/parser/parsed_expression.hpp
+include/duckdb/parser/parsed_expression_iterator.hpp
+include/duckdb/parser/parser.hpp
+include/duckdb/parser/parser_extension.hpp
+include/duckdb/parser/parser_options.hpp
+include/duckdb/parser/qualified_name.hpp
+include/duckdb/parser/qualified_name_set.hpp
+include/duckdb/parser/query_error_context.hpp
+include/duckdb/parser/query_node.hpp
+include/duckdb/parser/query_node/cte_node.hpp
+include/duckdb/parser/query_node/list.hpp
+include/duckdb/parser/query_node/recursive_cte_node.hpp
+include/duckdb/parser/query_node/select_node.hpp
+include/duckdb/parser/query_node/set_operation_node.hpp
+include/duckdb/parser/result_modifier.hpp
+include/duckdb/parser/simplified_token.hpp
+include/duckdb/parser/sql_statement.hpp
+include/duckdb/parser/statement/alter_statement.hpp
+include/duckdb/parser/statement/attach_statement.hpp
+include/duckdb/parser/statement/call_statement.hpp
+include/duckdb/parser/statement/copy_database_statement.hpp
+include/duckdb/parser/statement/copy_statement.hpp
+include/duckdb/parser/statement/create_statement.hpp
+include/duckdb/parser/statement/delete_statement.hpp
+include/duckdb/parser/statement/detach_statement.hpp
+include/duckdb/parser/statement/drop_statement.hpp
+include/duckdb/parser/statement/execute_statement.hpp
+include/duckdb/parser/statement/explain_statement.hpp
+include/duckdb/parser/statement/export_statement.hpp
+include/duckdb/parser/statement/extension_statement.hpp
+include/duckdb/parser/statement/insert_statement.hpp
+include/duckdb/parser/statement/list.hpp
+include/duckdb/parser/statement/load_statement.hpp
+include/duckdb/parser/statement/logical_plan_statement.hpp
+include/duckdb/parser/statement/multi_statement.hpp
+include/duckdb/parser/statement/pragma_statement.hpp
+include/duckdb/parser/statement/prepare_statement.hpp
+include/duckdb/parser/statement/relation_statement.hpp
+include/duckdb/parser/statement/select_statement.hpp
+include/duckdb/parser/statement/set_statement.hpp
+include/duckdb/parser/statement/transaction_statement.hpp
+include/duckdb/parser/statement/update_statement.hpp
+include/duckdb/parser/statement/vacuum_statement.hpp
+include/duckdb/parser/tableref.hpp
+include/duckdb/parser/tableref/basetableref.hpp
+include/duckdb/parser/tableref/emptytableref.hpp
+include/duckdb/parser/tableref/expressionlistref.hpp
+include/duckdb/parser/tableref/joinref.hpp
+include/duckdb/parser/tableref/list.hpp
+include/duckdb/parser/tableref/pivotref.hpp
+include/duckdb/parser/tableref/showref.hpp
+include/duckdb/parser/tableref/subqueryref.hpp
+include/duckdb/parser/tableref/table_function_ref.hpp
+include/duckdb/parser/tokens.hpp
+include/duckdb/parser/transformer.hpp
+include/duckdb/planner/bind_context.hpp
+include/duckdb/planner/binder.hpp
+include/duckdb/planner/bound_constraint.hpp
+include/duckdb/planner/bound_parameter_map.hpp
+include/duckdb/planner/bound_query_node.hpp
+include/duckdb/planner/bound_result_modifier.hpp
+include/duckdb/planner/bound_statement.hpp
+include/duckdb/planner/bound_tableref.hpp
+include/duckdb/planner/bound_tokens.hpp
+include/duckdb/planner/column_binding.hpp
+include/duckdb/planner/column_binding_map.hpp
+include/duckdb/planner/constraints/bound_check_constraint.hpp
+include/duckdb/planner/constraints/bound_foreign_key_constraint.hpp
+include/duckdb/planner/constraints/bound_not_null_constraint.hpp
+include/duckdb/planner/constraints/bound_unique_constraint.hpp
+include/duckdb/planner/constraints/list.hpp
+include/duckdb/planner/expression.hpp
+include/duckdb/planner/expression/bound_aggregate_expression.hpp
+include/duckdb/planner/expression/bound_between_expression.hpp
+include/duckdb/planner/expression/bound_case_expression.hpp
+include/duckdb/planner/expression/bound_cast_expression.hpp
+include/duckdb/planner/expression/bound_columnref_expression.hpp
+include/duckdb/planner/expression/bound_comparison_expression.hpp
+include/duckdb/planner/expression/bound_conjunction_expression.hpp
+include/duckdb/planner/expression/bound_constant_expression.hpp
+include/duckdb/planner/expression/bound_default_expression.hpp
+include/duckdb/planner/expression/bound_expanded_expression.hpp
+include/duckdb/planner/expression/bound_function_expression.hpp
+include/duckdb/planner/expression/bound_lambda_expression.hpp
+include/duckdb/planner/expression/bound_lambdaref_expression.hpp
+include/duckdb/planner/expression/bound_operator_expression.hpp
+include/duckdb/planner/expression/bound_parameter_data.hpp
+include/duckdb/planner/expression/bound_parameter_expression.hpp
+include/duckdb/planner/expression/bound_reference_expression.hpp
+include/duckdb/planner/expression/bound_subquery_expression.hpp
+include/duckdb/planner/expression/bound_unnest_expression.hpp
+include/duckdb/planner/expression/bound_window_expression.hpp
+include/duckdb/planner/expression/list.hpp
+include/duckdb/planner/expression_binder.hpp
+include/duckdb/planner/expression_binder/aggregate_binder.hpp
+include/duckdb/planner/expression_binder/alter_binder.hpp
+include/duckdb/planner/expression_binder/base_select_binder.hpp
+include/duckdb/planner/expression_binder/check_binder.hpp
+include/duckdb/planner/expression_binder/column_alias_binder.hpp
+include/duckdb/planner/expression_binder/constant_binder.hpp
+include/duckdb/planner/expression_binder/group_binder.hpp
+include/duckdb/planner/expression_binder/having_binder.hpp
+include/duckdb/planner/expression_binder/index_binder.hpp
+include/duckdb/planner/expression_binder/insert_binder.hpp
+include/duckdb/planner/expression_binder/lateral_binder.hpp
+include/duckdb/planner/expression_binder/order_binder.hpp
+include/duckdb/planner/expression_binder/qualify_binder.hpp
+include/duckdb/planner/expression_binder/relation_binder.hpp
+include/duckdb/planner/expression_binder/returning_binder.hpp
+include/duckdb/planner/expression_binder/select_bind_state.hpp
+include/duckdb/planner/expression_binder/select_binder.hpp
+include/duckdb/planner/expression_binder/table_function_binder.hpp
+include/duckdb/planner/expression_binder/update_binder.hpp
+include/duckdb/planner/expression_binder/where_binder.hpp
+include/duckdb/planner/expression_iterator.hpp
+include/duckdb/planner/extension_callback.hpp
+include/duckdb/planner/filter/conjunction_filter.hpp
+include/duckdb/planner/filter/constant_filter.hpp
+include/duckdb/planner/filter/null_filter.hpp
+include/duckdb/planner/filter/struct_filter.hpp
+include/duckdb/planner/joinside.hpp
+include/duckdb/planner/logical_operator.hpp
+include/duckdb/planner/logical_operator_visitor.hpp
+include/duckdb/planner/logical_tokens.hpp
+include/duckdb/planner/operator/list.hpp
+include/duckdb/planner/operator/logical_aggregate.hpp
+include/duckdb/planner/operator/logical_any_join.hpp
+include/duckdb/planner/operator/logical_column_data_get.hpp
+include/duckdb/planner/operator/logical_comparison_join.hpp
+include/duckdb/planner/operator/logical_copy_database.hpp
+include/duckdb/planner/operator/logical_copy_to_file.hpp
+include/duckdb/planner/operator/logical_create.hpp
+include/duckdb/planner/operator/logical_create_index.hpp
+include/duckdb/planner/operator/logical_create_secret.hpp
+include/duckdb/planner/operator/logical_create_table.hpp
+include/duckdb/planner/operator/logical_cross_product.hpp
+include/duckdb/planner/operator/logical_cteref.hpp
+include/duckdb/planner/operator/logical_delete.hpp
+include/duckdb/planner/operator/logical_delim_get.hpp
+include/duckdb/planner/operator/logical_dependent_join.hpp
+include/duckdb/planner/operator/logical_distinct.hpp
+include/duckdb/planner/operator/logical_dummy_scan.hpp
+include/duckdb/planner/operator/logical_empty_result.hpp
+include/duckdb/planner/operator/logical_execute.hpp
+include/duckdb/planner/operator/logical_explain.hpp
+include/duckdb/planner/operator/logical_export.hpp
+include/duckdb/planner/operator/logical_expression_get.hpp
+include/duckdb/planner/operator/logical_extension_operator.hpp
+include/duckdb/planner/operator/logical_filter.hpp
+include/duckdb/planner/operator/logical_get.hpp
+include/duckdb/planner/operator/logical_insert.hpp
+include/duckdb/planner/operator/logical_join.hpp
+include/duckdb/planner/operator/logical_limit.hpp
+include/duckdb/planner/operator/logical_materialized_cte.hpp
+include/duckdb/planner/operator/logical_order.hpp
+include/duckdb/planner/operator/logical_pivot.hpp
+include/duckdb/planner/operator/logical_positional_join.hpp
+include/duckdb/planner/operator/logical_pragma.hpp
+include/duckdb/planner/operator/logical_prepare.hpp
+include/duckdb/planner/operator/logical_projection.hpp
+include/duckdb/planner/operator/logical_recursive_cte.hpp
+include/duckdb/planner/operator/logical_reset.hpp
+include/duckdb/planner/operator/logical_sample.hpp
+include/duckdb/planner/operator/logical_set.hpp
+include/duckdb/planner/operator/logical_set_operation.hpp
+include/duckdb/planner/operator/logical_simple.hpp
+include/duckdb/planner/operator/logical_top_n.hpp
+include/duckdb/planner/operator/logical_unconditional_join.hpp
+include/duckdb/planner/operator/logical_unnest.hpp
+include/duckdb/planner/operator/logical_update.hpp
+include/duckdb/planner/operator/logical_vacuum.hpp
+include/duckdb/planner/operator/logical_window.hpp
+include/duckdb/planner/operator_extension.hpp
+include/duckdb/planner/parsed_data/bound_create_function_info.hpp
+include/duckdb/planner/parsed_data/bound_create_table_info.hpp
+include/duckdb/planner/planner.hpp
+include/duckdb/planner/pragma_handler.hpp
+include/duckdb/planner/query_node/bound_cte_node.hpp
+include/duckdb/planner/query_node/bound_recursive_cte_node.hpp
+include/duckdb/planner/query_node/bound_select_node.hpp
+include/duckdb/planner/query_node/bound_set_operation_node.hpp
+include/duckdb/planner/query_node/list.hpp
+include/duckdb/planner/subquery/flatten_dependent_join.hpp
+include/duckdb/planner/subquery/has_correlated_expressions.hpp
+include/duckdb/planner/subquery/recursive_dependent_join_planner.hpp
+include/duckdb/planner/subquery/rewrite_correlated_expressions.hpp
+include/duckdb/planner/subquery/rewrite_cte_scan.hpp
+include/duckdb/planner/table_binding.hpp
+include/duckdb/planner/table_filter.hpp
+include/duckdb/planner/tableref/bound_basetableref.hpp
+include/duckdb/planner/tableref/bound_cteref.hpp
+include/duckdb/planner/tableref/bound_dummytableref.hpp
+include/duckdb/planner/tableref/bound_expressionlistref.hpp
+include/duckdb/planner/tableref/bound_joinref.hpp
+include/duckdb/planner/tableref/bound_pivotref.hpp
+include/duckdb/planner/tableref/bound_pos_join_ref.hpp
+include/duckdb/planner/tableref/bound_subqueryref.hpp
+include/duckdb/planner/tableref/bound_table_function.hpp
+include/duckdb/planner/tableref/list.hpp
+include/duckdb/storage/arena_allocator.hpp
+include/duckdb/storage/block.hpp
+include/duckdb/storage/block_manager.hpp
+include/duckdb/storage/buffer/block_handle.hpp
+include/duckdb/storage/buffer/buffer_handle.hpp
+include/duckdb/storage/buffer/buffer_pool.hpp
+include/duckdb/storage/buffer/temporary_file_information.hpp
+include/duckdb/storage/buffer_manager.hpp
+include/duckdb/storage/checkpoint/row_group_writer.hpp
+include/duckdb/storage/checkpoint/string_checkpoint_state.hpp
+include/duckdb/storage/checkpoint/table_data_reader.hpp
+include/duckdb/storage/checkpoint/table_data_writer.hpp
+include/duckdb/storage/checkpoint/write_overflow_strings_to_disk.hpp
+include/duckdb/storage/checkpoint_manager.hpp
+include/duckdb/storage/compression/alp/algorithm/alp.hpp
+include/duckdb/storage/compression/alp/alp_analyze.hpp
+include/duckdb/storage/compression/alp/alp_compress.hpp
+include/duckdb/storage/compression/alp/alp_constants.hpp
+include/duckdb/storage/compression/alp/alp_fetch.hpp
+include/duckdb/storage/compression/alp/alp_scan.hpp
+include/duckdb/storage/compression/alp/alp_utils.hpp
+include/duckdb/storage/compression/alprd/algorithm/alprd.hpp
+include/duckdb/storage/compression/alprd/alprd_analyze.hpp
+include/duckdb/storage/compression/alprd/alprd_compress.hpp
+include/duckdb/storage/compression/alprd/alprd_constants.hpp
+include/duckdb/storage/compression/alprd/alprd_fetch.hpp
+include/duckdb/storage/compression/alprd/alprd_scan.hpp
+include/duckdb/storage/compression/bitpacking.hpp
+include/duckdb/storage/compression/chimp/algorithm/bit_reader.hpp
+include/duckdb/storage/compression/chimp/algorithm/bit_utils.hpp
+include/duckdb/storage/compression/chimp/algorithm/byte_reader.hpp
+include/duckdb/storage/compression/chimp/algorithm/byte_writer.hpp
+include/duckdb/storage/compression/chimp/algorithm/chimp128.hpp
+include/duckdb/storage/compression/chimp/algorithm/chimp_utils.hpp
+include/duckdb/storage/compression/chimp/algorithm/flag_buffer.hpp
+include/duckdb/storage/compression/chimp/algorithm/leading_zero_buffer.hpp
+include/duckdb/storage/compression/chimp/algorithm/output_bit_stream.hpp
+include/duckdb/storage/compression/chimp/algorithm/packed_data.hpp
+include/duckdb/storage/compression/chimp/algorithm/ring_buffer.hpp
+include/duckdb/storage/compression/chimp/chimp.hpp
+include/duckdb/storage/compression/chimp/chimp_analyze.hpp
+include/duckdb/storage/compression/chimp/chimp_compress.hpp
+include/duckdb/storage/compression/chimp/chimp_fetch.hpp
+include/duckdb/storage/compression/chimp/chimp_scan.hpp
+include/duckdb/storage/compression/patas/algorithm/patas.hpp
+include/duckdb/storage/compression/patas/patas.hpp
+include/duckdb/storage/compression/patas/patas_analyze.hpp
+include/duckdb/storage/compression/patas/patas_compress.hpp
+include/duckdb/storage/compression/patas/patas_fetch.hpp
+include/duckdb/storage/compression/patas/patas_scan.hpp
+include/duckdb/storage/compression/patas/shared.hpp
+include/duckdb/storage/data_pointer.hpp
+include/duckdb/storage/data_table.hpp
+include/duckdb/storage/database_size.hpp
+include/duckdb/storage/in_memory_block_manager.hpp
+include/duckdb/storage/index.hpp
+include/duckdb/storage/index_storage_info.hpp
+include/duckdb/storage/magic_bytes.hpp
+include/duckdb/storage/metadata/metadata_manager.hpp
+include/duckdb/storage/metadata/metadata_reader.hpp
+include/duckdb/storage/metadata/metadata_writer.hpp
+include/duckdb/storage/object_cache.hpp
+include/duckdb/storage/optimistic_data_writer.hpp
+include/duckdb/storage/partial_block_manager.hpp
+include/duckdb/storage/segment/uncompressed.hpp
+include/duckdb/storage/single_file_block_manager.hpp
+include/duckdb/storage/standard_buffer_manager.hpp
+include/duckdb/storage/statistics/array_stats.hpp
+include/duckdb/storage/statistics/base_statistics.hpp
+include/duckdb/storage/statistics/column_statistics.hpp
+include/duckdb/storage/statistics/distinct_statistics.hpp
+include/duckdb/storage/statistics/list_stats.hpp
+include/duckdb/storage/statistics/node_statistics.hpp
+include/duckdb/storage/statistics/numeric_stats.hpp
+include/duckdb/storage/statistics/numeric_stats_union.hpp
+include/duckdb/storage/statistics/segment_statistics.hpp
+include/duckdb/storage/statistics/string_stats.hpp
+include/duckdb/storage/statistics/struct_stats.hpp
+include/duckdb/storage/storage_extension.hpp
+include/duckdb/storage/storage_info.hpp
+include/duckdb/storage/storage_lock.hpp
+include/duckdb/storage/storage_manager.hpp
+include/duckdb/storage/string_uncompressed.hpp
+include/duckdb/storage/table/append_state.hpp
+include/duckdb/storage/table/array_column_data.hpp
+include/duckdb/storage/table/chunk_info.hpp
+include/duckdb/storage/table/column_checkpoint_state.hpp
+include/duckdb/storage/table/column_data.hpp
+include/duckdb/storage/table/column_data_checkpointer.hpp
+include/duckdb/storage/table/column_segment.hpp
+include/duckdb/storage/table/column_segment_tree.hpp
+include/duckdb/storage/table/data_table_info.hpp
+include/duckdb/storage/table/list_column_data.hpp
+include/duckdb/storage/table/persistent_table_data.hpp
+include/duckdb/storage/table/row_group.hpp
+include/duckdb/storage/table/row_group_collection.hpp
+include/duckdb/storage/table/row_group_segment_tree.hpp
+include/duckdb/storage/table/row_version_manager.hpp
+include/duckdb/storage/table/scan_state.hpp
+include/duckdb/storage/table/segment_base.hpp
+include/duckdb/storage/table/segment_lock.hpp
+include/duckdb/storage/table/segment_tree.hpp
+include/duckdb/storage/table/standard_column_data.hpp
+include/duckdb/storage/table/struct_column_data.hpp
+include/duckdb/storage/table/table_index_list.hpp
+include/duckdb/storage/table/table_statistics.hpp
+include/duckdb/storage/table/update_segment.hpp
+include/duckdb/storage/table/validity_column_data.hpp
+include/duckdb/storage/table_io_manager.hpp
+include/duckdb/storage/table_storage_info.hpp
+include/duckdb/storage/temporary_file_manager.hpp
+include/duckdb/storage/temporary_memory_manager.hpp
+include/duckdb/storage/write_ahead_log.hpp
+include/duckdb/transaction/append_info.hpp
+include/duckdb/transaction/cleanup_state.hpp
+include/duckdb/transaction/commit_state.hpp
+include/duckdb/transaction/delete_info.hpp
+include/duckdb/transaction/duck_transaction.hpp
+include/duckdb/transaction/duck_transaction_manager.hpp
+include/duckdb/transaction/local_storage.hpp
+include/duckdb/transaction/meta_transaction.hpp
+include/duckdb/transaction/rollback_state.hpp
+include/duckdb/transaction/transaction.hpp
+include/duckdb/transaction/transaction_context.hpp
+include/duckdb/transaction/transaction_data.hpp
+include/duckdb/transaction/transaction_manager.hpp
+include/duckdb/transaction/undo_buffer.hpp
+include/duckdb/transaction/update_info.hpp
+include/duckdb/verification/copied_statement_verifier.hpp
+include/duckdb/verification/deserialized_statement_verifier.hpp
+include/duckdb/verification/external_statement_verifier.hpp
+include/duckdb/verification/fetch_row_verifier.hpp
+include/duckdb/verification/no_operator_caching_verifier.hpp
+include/duckdb/verification/parsed_statement_verifier.hpp
+include/duckdb/verification/prepared_statement_verifier.hpp
+include/duckdb/verification/statement_verifier.hpp
+include/duckdb/verification/unoptimized_statement_verifier.hpp
+lib/cmake/DuckDB/DuckDBConfig.cmake
+lib/cmake/DuckDB/DuckDBConfigVersion.cmake
+lib/cmake/DuckDB/DuckDBExports-%%CMAKE_BUILD_TYPE%%.cmake
+lib/cmake/DuckDB/DuckDBExports.cmake
+lib/libduckdb.so
+lib/libduckdb_fastpforlib.a
+lib/libduckdb_fmt.a
+lib/libduckdb_fsst.a
+lib/libduckdb_hyperloglog.a
+lib/libduckdb_mbedtls.a
+lib/libduckdb_miniz.a
+lib/libduckdb_pg_query.a
+lib/libduckdb_re2.a
+lib/libduckdb_skiplistlib.a
+lib/libduckdb_static.a
+lib/libduckdb_utf8proc.a
+@dir include/duckdb/storage/serialization
diff --git a/databases/ejdb/Makefile b/databases/ejdb/Makefile
new file mode 100644
index 000000000000..a9d103cac571
--- /dev/null
+++ b/databases/ejdb/Makefile
@@ -0,0 +1,30 @@
+PORTNAME=	ejdb
+PORTVERSION=	2.73
+DISTVERSIONPREFIX=	v
+CATEGORIES=	databases
+
+MAINTAINER=	danfe@FreeBSD.org
+COMMENT=	Embeddable JSON database engine library
+WWW=		https://ejdb.org/
+
+LICENSE=	MIT
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
+LIB_DEPENDS=	libiowow.so:databases/iowow \
+		libiwnet.so:net/iwnet
+
+USES=		cmake compiler:c11
+USE_GITHUB=	yes
+GH_ACCOUNT=	Softmotions
+USE_LDCONFIG=	yes
+
+CMAKE_ARGS=	-DCMAKE_LOCALBASE:PATH="${LOCALBASE}" \
+		-DBUILD_EXAMPLES:BOOL=OFF
+
+OPTIONS_DEFINE=	DOCS
+
+post-patch:
+	@${GREP} -Rl --null '#include <ejdb2/iowow/' ${WRKSRC}/src | \
+		${XARGS} -0 ${REINPLACE_CMD} -e 's,ejdb2/iowow,iowow,'
+
+.include <bsd.port.mk>
diff --git a/databases/ejdb/distinfo b/databases/ejdb/distinfo
new file mode 100644
index 000000000000..a2255b5bcdbb
--- /dev/null
+++ b/databases/ejdb/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1668444172
+SHA256 (Softmotions-ejdb-v2.73_GH0.tar.gz) = 1381af7790ce67f8005c380de2c90a1811619250d9d62e7cdb64547f27878484
+SIZE (Softmotions-ejdb-v2.73_GH0.tar.gz) = 812748
diff --git a/databases/ejdb/files/patch-src_CMakeLists.txt b/databases/ejdb/files/patch-src_CMakeLists.txt
new file mode 100644
index 000000000000..0df91193799e
--- /dev/null
+++ b/databases/ejdb/files/patch-src_CMakeLists.txt
@@ -0,0 +1,42 @@
+--- src/CMakeLists.txt.orig	2022-02-23 10:00:23 UTC
++++ src/CMakeLists.txt
+@@ -15,6 +15,7 @@ set(PROJECT_GENERATED_DIR ${CMAKE_CURRENT_BINARY_DIR}/
+ 
+ list(APPEND PROJECT_INCLUDE_DIRS "${PROJECT_GENERATED_DIR}"
+      "${CMAKE_CURRENT_SOURCE_DIR}" "${CMAKE_BINARY_DIR}/include")
++list(APPEND PROJECT_INCLUDE_DIRS "${CMAKE_LOCALBASE}/include")
+ 
+ if(APPLE)
+   option(BUILD_FRAMEWORK "Build an OS X framework" OFF)
+@@ -34,13 +35,10 @@ include(CheckIncludeFiles)
+ include(CheckLibraryExists)
+ include(TestBigEndian)
+ 
+-include(AddIOWOW)
+-
+ if(ENABLE_HTTP)
+   if(WIN32)
+     message(FATAL_ERROR "ENABLE_HTTP option cannot be used in Windows build")
+   endif()
+-  include(AddIWNET)
+   add_definitions(-DJB_HTTP)
+   list(APPEND MODULES jbr)
+ endif()
+@@ -160,7 +158,7 @@ endif()
+ set(CMAKE_C_FLAGS_DEBUG
+     "${CMAKE_C_ASAN} -O0 -g -ggdb -Werror -DDEBUG -D_DEBUG -UNDEBUG -Wno-unused-variable"
+ )
+-set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_ASAN} -O3 -DNDEBUG")
++set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_ASAN} -DNDEBUG")
+ # set(CMAKE_EXE_LINKER_FLAGS_RELEASE "-Wl,-s")
+ set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELEASE} -g")
+ set(CMAKE_C_FLAGS_RELEASEWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO}")
+@@ -174,7 +172,7 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/tmpl/ejdb2c
+ file(GLOB PROJECT_GENERATED_HDRS ${PROJECT_GENERATED_DIR}/*.h)
+ list(APPEND ALL_HDRS ${PROJECT_GENERATED_HDRS})
+ 
+-set(PCLIBS "-liowow -lm")
++set(PCLIBS "-liwnet -liowow -lm")
+ if(DEFINED IWNET_INCLUDE_DIR)
+   set(PCLIBS "-liwnet ${PCLIBS}")
+ endif()
diff --git a/databases/ejdb/files/patch-src_jbs_CMakeLists.txt b/databases/ejdb/files/patch-src_jbs_CMakeLists.txt
new file mode 100644
index 000000000000..af4b9e4c37e0
--- /dev/null
+++ b/databases/ejdb/files/patch-src_jbs_CMakeLists.txt
@@ -0,0 +1,11 @@
+--- src/jbs/CMakeLists.txt.orig	2022-02-23 10:00:23 UTC
++++ src/jbs/CMakeLists.txt
+@@ -1,6 +1,7 @@
+ # Executables
+ add_executable(jbs jbs.c)
+-target_link_libraries(jbs ejdb2_s)
++target_link_libraries(jbs ejdb2_s iowow iwnet)
++target_link_directories(jbs PRIVATE "${CMAKE_LOCALBASE}/lib")
+ 
+ if(CMAKE_BUILD_TYPE STREQUAL "Release")
+   add_custom_command(
diff --git a/databases/ejdb/files/patch-src_util_sort__r.h b/databases/ejdb/files/patch-src_util_sort__r.h
new file mode 100644
index 000000000000..405b3283a342
--- /dev/null
+++ b/databases/ejdb/files/patch-src_util_sort__r.h
@@ -0,0 +1,34 @@
+--- src/jbi/sort_r.h.orig	2022-02-23 10:00:23 UTC
++++ src/jbi/sort_r.h
+@@ -25,10 +25,11 @@
+ #define _SORT_R_INLINE inline
+ 
+ #if (  defined __APPLE__ || defined __MACH__ || defined __DARWIN__    \
+-    || defined __FreeBSD__ || defined __DragonFly__) && defined JB_HAVE_QSORT_R
++    || (defined __FreeBSD__ && !defined(qsort_r)) || defined __DragonFly__) && defined JB_HAVE_QSORT_R
+ #  define _SORT_R_BSD
+ #elif (  defined _GNU_SOURCE || defined __gnu_hurd__ || defined __GNU__    \
+-      || defined __linux__ || defined __MINGW32__ || defined __GLIBC__) && defined JB_HAVE_QSORT_R
++      || defined __linux__ || defined __MINGW32__ || defined __GLIBC__ \
++      || (defined (__FreeBSD__) && defined(qsort_r))) && defined JB_HAVE_QSORT_R
+ #  define _SORT_R_LINUX
+ #elif (defined _WIN32 || defined _WIN64 || defined __WINDOWS__)
+ #  define _SORT_R_WINDOWS
+@@ -255,7 +256,7 @@ static _SORT_R_INLINE void sort_r(
+   #if defined _SORT_R_BSD
+ 
+ /* Ensure qsort_r is defined */
+-extern void qsort_r(
++extern void (qsort_r)(
+   void *base, size_t nel, size_t width, void *thunk,
+   int (*compar)(void *_thunk,
+                 const void *_a, const void *_b));
+@@ -283,7 +284,7 @@ typedef int (*__compar_d_fn_t)(const void*, const void
+   #if defined _SORT_R_LINUX
+ 
+ typedef int (*__compar_d_fn_t)(const void*, const void*, void*);
+-extern void qsort_r(
++extern void (qsort_r)(
+   void *base, size_t nel, size_t width,
+   __compar_d_fn_t __compar, void *arg)
+ __attribute__((nonnull(1, 4)));
diff --git a/databases/ejdb/pkg-descr b/databases/ejdb/pkg-descr
new file mode 100644
index 000000000000..f357ef2c36e1
--- /dev/null
+++ b/databases/ejdb/pkg-descr
@@ -0,0 +1,2 @@
+Embeddable JSON database engine C library which supports simple XPath-like
+query language (JQL).
diff --git a/databases/ejdb/pkg-plist b/databases/ejdb/pkg-plist
new file mode 100644
index 000000000000..6d5d6f603140
--- /dev/null
+++ b/databases/ejdb/pkg-plist
@@ -0,0 +1,18 @@
+bin/jbs
+include/ejdb2/ejdb2.h
+include/ejdb2/jbr.h
+include/ejdb2/jql.h
+lib/libejdb2-2.a
+lib/libejdb2.so
+lib/libejdb2.so.2
+lib/libejdb2.so.2.73
+libdata/pkgconfig/libejdb2.pc
+share/man/man1/jbs.1.gz
+share/man/man3/ejdb2.3.gz
+%%PORTDOCS%%%%DOCSDIR%%2/Changelog
+%%PORTDOCS%%%%DOCSDIR%%2/LICENSE
+%%PORTDOCS%%%%DOCSDIR%%2/README
+%%DATADIR%%2/ejdb2-exports-%%CMAKE_BUILD_TYPE%%.cmake
+%%DATADIR%%2/ejdb2-exports.cmake
+%%DATADIR%%2/ejdb2-static-exports-%%CMAKE_BUILD_TYPE%%.cmake
+%%DATADIR%%2/ejdb2-static-exports.cmake
diff --git a/databases/elixir-calecto/Makefile b/databases/elixir-calecto/Makefile
deleted file mode 100644
index 1ade77101838..000000000000
--- a/databases/elixir-calecto/Makefile
+++ /dev/null
@@ -1,22 +0,0 @@
-PORTNAME=	calecto
-PORTVERSION=	0.16.0
-DISTVERSIONPREFIX=	v
-CATEGORIES=	databases
-PKGNAMEPREFIX=	elixir-
-
-MAINTAINER=	erlang@FreeBSD.org
-COMMENT=	Adapter for the Calendar library in Ecto
-
-LICENSE=	MIT
-
-USES=		elixir
-USE_GITHUB=	yes
-GH_ACCOUNT=	lau
-
-MIX_BUILD_DEPS= databases/elixir-ecto \
-		devel/elixir-calendar
-MIX_RUN_DEPS:=	${MIX_BUILD_DEPS}
-
-OPTIONS_DEFINE=	DOCS
-
-.include <bsd.port.mk>
diff --git a/databases/elixir-calecto/distinfo b/databases/elixir-calecto/distinfo
deleted file mode 100644
index 10802afb7222..000000000000
--- a/databases/elixir-calecto/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1466855916
-SHA256 (lau-calecto-v0.16.0_GH0.tar.gz) = 917fe9552fb84bac2768bde192311bce3cdd215ac9ebbf9bd39df39eebd450f0
-SIZE (lau-calecto-v0.16.0_GH0.tar.gz) = 11961
diff --git a/databases/elixir-calecto/files/patch-mix.exs b/databases/elixir-calecto/files/patch-mix.exs
deleted file mode 100644
index 9372193918d8..000000000000
--- a/databases/elixir-calecto/files/patch-mix.exs
+++ /dev/null
@@ -1,14 +0,0 @@
---- mix.exs.orig	2016-07-07 13:38:54 UTC
-+++ mix.exs
-@@ -16,11 +16,6 @@ defmodule Calecto.Mixfile do
- 
-   defp deps do
-     [
--      {:ecto, "~> 1.1.3 or ~> 2.0.0 or ~> 2.0.0-rc5"},
--      {:calendar, "~> 0.16.0"},
--
--      {:earmark, "~> 0.2.1", only: :dev},
--      {:ex_doc, "~> 0.11.3", only: :dev},
-     ]
-   end
- 
diff --git a/databases/elixir-calecto/pkg-descr b/databases/elixir-calecto/pkg-descr
deleted file mode 100644
index 83252527197c..000000000000
--- a/databases/elixir-calecto/pkg-descr
+++ /dev/null
@@ -1,6 +0,0 @@
-Glue between Calendar and Ecto. For saving dates, times and datetimes
-in Ecto. Instead of using the Ecto types for Date, Time and DateTime,
-you can access the features of the Calendar library. With timezone
-awareness, parsing, and formatting functionality.
-
-WWW: https://github.com/lau/calecto
diff --git a/databases/elixir-calecto/pkg-plist b/databases/elixir-calecto/pkg-plist
deleted file mode 100644
index c48465f87ee1..000000000000
--- a/databases/elixir-calecto/pkg-plist
+++ /dev/null
@@ -1,33 +0,0 @@
-lib/elixir/lib/calecto/ebin/Elixir.Calecto.Date.beam
-lib/elixir/lib/calecto/ebin/Elixir.Calecto.DateTime.beam
-lib/elixir/lib/calecto/ebin/Elixir.Calecto.DateTimeUTC.beam
-lib/elixir/lib/calecto/ebin/Elixir.Calecto.Model.beam
-lib/elixir/lib/calecto/ebin/Elixir.Calecto.NaiveDateTime.beam
-lib/elixir/lib/calecto/ebin/Elixir.Calecto.Schema.beam
-lib/elixir/lib/calecto/ebin/Elixir.Calecto.Time.beam
-lib/elixir/lib/calecto/ebin/Elixir.Calecto.Utils.beam
-lib/elixir/lib/calecto/ebin/Elixir.Calecto.beam
-lib/elixir/lib/calecto/ebin/Elixir.Calendar.ContainsDate.Ecto.Date.beam
-lib/elixir/lib/calecto/ebin/Elixir.Calendar.ContainsDate.Ecto.DateTime.beam
-lib/elixir/lib/calecto/ebin/Elixir.Calendar.ContainsNaiveDateTime.Ecto.DateTime.beam
-lib/elixir/lib/calecto/ebin/Elixir.Calendar.ContainsTime.Ecto.DateTime.beam
-lib/elixir/lib/calecto/ebin/Elixir.Calendar.ContainsTime.Ecto.Time.beam
-lib/elixir/lib/calecto/ebin/Elixir.Ecto.DataType.Date.beam
-lib/elixir/lib/calecto/ebin/Elixir.Ecto.DataType.DateTime.beam
-lib/elixir/lib/calecto/ebin/Elixir.Ecto.DataType.NaiveDateTime.beam
-lib/elixir/lib/calecto/ebin/Elixir.Ecto.DataType.Time.beam
-lib/elixir/lib/calecto/ebin/Elixir.Mix.Tasks.Calecto.AddTypeMigration.beam
-lib/elixir/lib/calecto/ebin/calecto.app
-lib/elixir/lib/calecto/lib/calecto.ex
-lib/elixir/lib/calecto/lib/calecto/date.ex
-lib/elixir/lib/calecto/lib/calecto/date_time.ex
-lib/elixir/lib/calecto/lib/calecto/date_time_utc.ex
-lib/elixir/lib/calecto/lib/calecto/ecto_data_type.ex
-lib/elixir/lib/calecto/lib/calecto/ecto_types.ex
-lib/elixir/lib/calecto/lib/calecto/model.ex
-lib/elixir/lib/calecto/lib/calecto/naive_date_time.ex
-lib/elixir/lib/calecto/lib/calecto/schema.ex
-lib/elixir/lib/calecto/lib/calecto/time.ex
-lib/elixir/lib/calecto/lib/calecto/utils.ex
-lib/elixir/lib/calecto/lib/mix/tasks/calecto.add_type_migration.ex
-%%PORTDOCS%%%%DOCSDIR%%/README.md
diff --git a/databases/elixir-db_connection/Makefile b/databases/elixir-db_connection/Makefile
deleted file mode 100644
index faa30935f093..000000000000
--- a/databases/elixir-db_connection/Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
-PORTNAME=	db_connection
-DISTVERSION=	1.1.3
-DISTVERSIONPREFIX=	v
-CATEGORIES=	databases
-PKGNAMEPREFIX=	elixir-
-
-MAINTAINER=	erlang@FreeBSD.org
-COMMENT=	Database connection behaviour for Elixir
-
-LICENSE=	APACHE20
-
-USES=		elixir
-USE_GITHUB=	yes
-GH_ACCOUNT=	elixir-ecto
-
-MIX_BUILD_NAME=	shared
-MIX_BUILD_DEPS=	devel/elixir-connection \
-		devel/erlang-backoff
-MIX_RUN_DEPS:=	${MIX_BUILD_DEPS}
-MIX_REWRITE=	yes
-
-OPTIONS_DEFINE=	DOCS
-
-.include <bsd.port.mk>
diff --git a/databases/elixir-db_connection/distinfo b/databases/elixir-db_connection/distinfo
deleted file mode 100644
index 4f5496e5b493..000000000000
--- a/databases/elixir-db_connection/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1515972502
-SHA256 (elixir-ecto-db_connection-v1.1.3_GH0.tar.gz) = f45efef157ea73b0d092ffc1ba92b4956969bbcc189c976a1832de6a3ce5864f
-SIZE (elixir-ecto-db_connection-v1.1.3_GH0.tar.gz) = 45313
diff --git a/databases/elixir-db_connection/pkg-descr b/databases/elixir-db_connection/pkg-descr
deleted file mode 100644
index c9c03bc310ec..000000000000
--- a/databases/elixir-db_connection/pkg-descr
+++ /dev/null
@@ -1,5 +0,0 @@
-Database connection behaviour and database connection pool designed
-for handling transaction, prepare/execute and client process
-prepare/encode/decode.
-
-WWW: https://github.com/fishcakez/db_connection
diff --git a/databases/elixir-db_connection/pkg-plist b/databases/elixir-db_connection/pkg-plist
deleted file mode 100644
index 102f55d54c2b..000000000000
--- a/databases/elixir-db_connection/pkg-plist
+++ /dev/null
@@ -1,55 +0,0 @@
-lib/elixir/lib/db_connection/ebin/Elixir.DBConnection.App.beam
-lib/elixir/lib/db_connection/ebin/Elixir.DBConnection.Backoff.beam
-lib/elixir/lib/db_connection/ebin/Elixir.DBConnection.Connection.beam
-lib/elixir/lib/db_connection/ebin/Elixir.DBConnection.ConnectionError.beam
-lib/elixir/lib/db_connection/ebin/Elixir.DBConnection.LogEntry.beam
-lib/elixir/lib/db_connection/ebin/Elixir.DBConnection.Ownership.Manager.beam
-lib/elixir/lib/db_connection/ebin/Elixir.DBConnection.Ownership.Pool.beam
-lib/elixir/lib/db_connection/ebin/Elixir.DBConnection.Ownership.PoolSupervisor.beam
-lib/elixir/lib/db_connection/ebin/Elixir.DBConnection.Ownership.Proxy.beam
-lib/elixir/lib/db_connection/ebin/Elixir.DBConnection.Ownership.ProxySupervisor.beam
-lib/elixir/lib/db_connection/ebin/Elixir.DBConnection.Ownership.beam
-lib/elixir/lib/db_connection/ebin/Elixir.DBConnection.OwnershipError.beam
-lib/elixir/lib/db_connection/ebin/Elixir.DBConnection.Pool.beam
-lib/elixir/lib/db_connection/ebin/Elixir.DBConnection.Poolboy.Worker.beam
-lib/elixir/lib/db_connection/ebin/Elixir.DBConnection.Poolboy.beam
-lib/elixir/lib/db_connection/ebin/Elixir.DBConnection.PrepareStream.beam
-lib/elixir/lib/db_connection/ebin/Elixir.DBConnection.Query.beam
-lib/elixir/lib/db_connection/ebin/Elixir.DBConnection.Sojourn.Broker.beam
-lib/elixir/lib/db_connection/ebin/Elixir.DBConnection.Sojourn.Pool.beam
-lib/elixir/lib/db_connection/ebin/Elixir.DBConnection.Sojourn.Regulator.beam
-lib/elixir/lib/db_connection/ebin/Elixir.DBConnection.Sojourn.Starter.beam
-lib/elixir/lib/db_connection/ebin/Elixir.DBConnection.Sojourn.Supervisor.beam
-lib/elixir/lib/db_connection/ebin/Elixir.DBConnection.Sojourn.beam
-lib/elixir/lib/db_connection/ebin/Elixir.DBConnection.SojournError.beam
-lib/elixir/lib/db_connection/ebin/Elixir.DBConnection.Stream.beam
-lib/elixir/lib/db_connection/ebin/Elixir.DBConnection.Task.beam
-lib/elixir/lib/db_connection/ebin/Elixir.DBConnection.Watcher.beam
-lib/elixir/lib/db_connection/ebin/Elixir.DBConnection.beam
-lib/elixir/lib/db_connection/ebin/Elixir.Enumerable.DBConnection.PrepareStream.beam
-lib/elixir/lib/db_connection/ebin/Elixir.Enumerable.DBConnection.Stream.beam
-lib/elixir/lib/db_connection/ebin/db_connection.app
-lib/elixir/lib/db_connection/lib/db_connection.ex
-lib/elixir/lib/db_connection/lib/db_connection/app.ex
-lib/elixir/lib/db_connection/lib/db_connection/backoff.ex
-lib/elixir/lib/db_connection/lib/db_connection/connection.ex
-lib/elixir/lib/db_connection/lib/db_connection/log_entry.ex
-lib/elixir/lib/db_connection/lib/db_connection/ownership.ex
-lib/elixir/lib/db_connection/lib/db_connection/ownership/manager.ex
-lib/elixir/lib/db_connection/lib/db_connection/ownership/pool.ex
-lib/elixir/lib/db_connection/lib/db_connection/ownership/pool_supervisor.ex
-lib/elixir/lib/db_connection/lib/db_connection/ownership/proxy.ex
-lib/elixir/lib/db_connection/lib/db_connection/ownership/proxy_supervisor.ex
-lib/elixir/lib/db_connection/lib/db_connection/pool.ex
-lib/elixir/lib/db_connection/lib/db_connection/poolboy.ex
-lib/elixir/lib/db_connection/lib/db_connection/poolboy/worker.ex
-lib/elixir/lib/db_connection/lib/db_connection/query.ex
-lib/elixir/lib/db_connection/lib/db_connection/sojourn.ex
-lib/elixir/lib/db_connection/lib/db_connection/sojourn/broker.ex
-lib/elixir/lib/db_connection/lib/db_connection/sojourn/pool.ex
-lib/elixir/lib/db_connection/lib/db_connection/sojourn/regulator.ex
-lib/elixir/lib/db_connection/lib/db_connection/sojourn/starter.ex
-lib/elixir/lib/db_connection/lib/db_connection/sojourn/supervisor.ex
-lib/elixir/lib/db_connection/lib/db_connection/task.ex
-lib/elixir/lib/db_connection/lib/db_connection/watcher.ex
-%%PORTDOCS%%%%DOCSDIR%%/README.md
diff --git a/databases/elixir-ecto/Makefile b/databases/elixir-ecto/Makefile
deleted file mode 100644
index fdd6ff7f738a..000000000000
--- a/databases/elixir-ecto/Makefile
+++ /dev/null
@@ -1,39 +0,0 @@
-PORTNAME=	ecto
-PORTVERSION=	2.2.10
-DISTVERSIONPREFIX=	v
-CATEGORIES=	databases
-PKGNAMEPREFIX=	elixir-
-
-MAINTAINER=	erlang@FreeBSD.org
-COMMENT=	Database wrapper and language integrated query for Elixir
-
-LICENSE=	APACHE20
-
-USES=		elixir
-USE_GITHUB=	yes
-GH_ACCOUNT=	elixir-ecto
-
-OPTIONS_DEFINE=	POSTGREX MARIAEX DOCS
-OPTIONS_SUB=	yes
-POSTGREX_DESC=	PostgreSQL adapter support
-MARIAEX_DESC=	MySQL adapter support
-
-MIX_BUILD_NAME=	shared
-MIX_BUILD_DEPS=	devel/elixir-decimal \
-		devel/elixir-poison \
-		devel/erlang-poolboy
-
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MPOSTGREX}
-MIX_BUILD_DEPS+=databases/elixir-postgrex
-.endif
-
-.if ${PORT_OPTIONS:MMARIAEX}
-MIX_BUILD_DEPS+=databases/elixir-mariaex
-.endif
-
-MIX_RUN_DEPS:=	${MIX_BUILD_DEPS}
-MIX_REWRITE=	yes
-
-.include <bsd.port.mk>
diff --git a/databases/elixir-ecto/distinfo b/databases/elixir-ecto/distinfo
deleted file mode 100644
index d47c82526984..000000000000
--- a/databases/elixir-ecto/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1530991291
-SHA256 (elixir-ecto-ecto-v2.2.10_GH0.tar.gz) = ab9591824c14bd2ad80cbd8fbfd7400981ac26d77e19b7a464ff4fb81a1171fb
-SIZE (elixir-ecto-ecto-v2.2.10_GH0.tar.gz) = 363208
diff --git a/databases/elixir-ecto/pkg-descr b/databases/elixir-ecto/pkg-descr
deleted file mode 100644
index 89ec1c1f2b68..000000000000
--- a/databases/elixir-ecto/pkg-descr
+++ /dev/null
@@ -1,4 +0,0 @@
-Ecto is a domain specific language for writing queries and interacting
-with databases in Elixir.
-
-WWW: https://github.com/elixir-lang/ecto
diff --git a/databases/elixir-ecto/pkg-plist b/databases/elixir-ecto/pkg-plist
deleted file mode 100644
index bce69e20d4d5..000000000000
--- a/databases/elixir-ecto/pkg-plist
+++ /dev/null
@@ -1,207 +0,0 @@
-lib/elixir/lib/ecto/ebin/Elixir.Collectable.Ecto.Adapters.SQL.Stream.beam
-lib/elixir/lib/ecto/ebin/Elixir.Ecto.Adapter.Migration.beam
-lib/elixir/lib/ecto/ebin/Elixir.Ecto.Adapter.Storage.beam
-lib/elixir/lib/ecto/ebin/Elixir.Ecto.Adapter.Structure.beam
-lib/elixir/lib/ecto/ebin/Elixir.Ecto.Adapter.Transaction.beam
-lib/elixir/lib/ecto/ebin/Elixir.Ecto.Adapter.beam
-lib/elixir/lib/ecto/ebin/Elixir.Ecto.Adapters.MySQL.beam
-lib/elixir/lib/ecto/ebin/Elixir.Ecto.Adapters.Postgres.beam
-lib/elixir/lib/ecto/ebin/Elixir.Ecto.Adapters.SQL.Connection.beam
-lib/elixir/lib/ecto/ebin/Elixir.Ecto.Adapters.SQL.Sandbox.Connection.beam
-lib/elixir/lib/ecto/ebin/Elixir.Ecto.Adapters.SQL.Sandbox.Pool.beam
-lib/elixir/lib/ecto/ebin/Elixir.Ecto.Adapters.SQL.Sandbox.beam
-lib/elixir/lib/ecto/ebin/Elixir.Ecto.Adapters.SQL.Stream.beam
-lib/elixir/lib/ecto/ebin/Elixir.Ecto.Adapters.SQL.beam
-lib/elixir/lib/ecto/ebin/Elixir.Ecto.Application.beam
-lib/elixir/lib/ecto/ebin/Elixir.Ecto.Association.BelongsTo.beam
-lib/elixir/lib/ecto/ebin/Elixir.Ecto.Association.Has.beam
-lib/elixir/lib/ecto/ebin/Elixir.Ecto.Association.HasThrough.beam
-lib/elixir/lib/ecto/ebin/Elixir.Ecto.Association.ManyToMany.beam
-lib/elixir/lib/ecto/ebin/Elixir.Ecto.Association.NotLoaded.beam
-lib/elixir/lib/ecto/ebin/Elixir.Ecto.Association.beam
-lib/elixir/lib/ecto/ebin/Elixir.Ecto.CastError.beam
-lib/elixir/lib/ecto/ebin/Elixir.Ecto.ChangeError.beam
-lib/elixir/lib/ecto/ebin/Elixir.Ecto.Changeset.Relation.beam
-lib/elixir/lib/ecto/ebin/Elixir.Ecto.Changeset.beam
-lib/elixir/lib/ecto/ebin/Elixir.Ecto.ConstraintError.beam
-lib/elixir/lib/ecto/ebin/Elixir.Ecto.DataType.Any.beam
-lib/elixir/lib/ecto/ebin/Elixir.Ecto.DataType.Date.beam
-lib/elixir/lib/ecto/ebin/Elixir.Ecto.DataType.DateTime.beam
-lib/elixir/lib/ecto/ebin/Elixir.Ecto.DataType.Ecto.Date.beam
-lib/elixir/lib/ecto/ebin/Elixir.Ecto.DataType.Ecto.DateTime.beam
-lib/elixir/lib/ecto/ebin/Elixir.Ecto.DataType.Ecto.Time.beam
-lib/elixir/lib/ecto/ebin/Elixir.Ecto.DataType.List.beam
-lib/elixir/lib/ecto/ebin/Elixir.Ecto.DataType.NaiveDateTime.beam
-lib/elixir/lib/ecto/ebin/Elixir.Ecto.DataType.Time.beam
-lib/elixir/lib/ecto/ebin/Elixir.Ecto.DataType.beam
-lib/elixir/lib/ecto/ebin/Elixir.Ecto.Date.beam
-lib/elixir/lib/ecto/ebin/Elixir.Ecto.DateTime.Utils.beam
-lib/elixir/lib/ecto/ebin/Elixir.Ecto.DateTime.beam
-lib/elixir/lib/ecto/ebin/Elixir.Ecto.Embedded.beam
-lib/elixir/lib/ecto/ebin/Elixir.Ecto.InvalidChangesetError.beam
-lib/elixir/lib/ecto/ebin/Elixir.Ecto.InvalidURLError.beam
-lib/elixir/lib/ecto/ebin/Elixir.Ecto.LogEntry.beam
-lib/elixir/lib/ecto/ebin/Elixir.Ecto.Migration.Command.beam
-lib/elixir/lib/ecto/ebin/Elixir.Ecto.Migration.Constraint.beam
-lib/elixir/lib/ecto/ebin/Elixir.Ecto.Migration.Index.beam
-lib/elixir/lib/ecto/ebin/Elixir.Ecto.Migration.Reference.beam
-lib/elixir/lib/ecto/ebin/Elixir.Ecto.Migration.Runner.beam
-lib/elixir/lib/ecto/ebin/Elixir.Ecto.Migration.SchemaMigration.beam
-lib/elixir/lib/ecto/ebin/Elixir.Ecto.Migration.Supervisor.beam
-lib/elixir/lib/ecto/ebin/Elixir.Ecto.Migration.Table.beam
-lib/elixir/lib/ecto/ebin/Elixir.Ecto.Migration.beam
-lib/elixir/lib/ecto/ebin/Elixir.Ecto.MigrationError.beam
-lib/elixir/lib/ecto/ebin/Elixir.Ecto.Migrator.beam
-lib/elixir/lib/ecto/ebin/Elixir.Ecto.Multi.beam
-lib/elixir/lib/ecto/ebin/Elixir.Ecto.MultiplePrimaryKeyError.beam
-lib/elixir/lib/ecto/ebin/Elixir.Ecto.MultipleResultsError.beam
-lib/elixir/lib/ecto/ebin/Elixir.Ecto.NoPrimaryKeyFieldError.beam
-lib/elixir/lib/ecto/ebin/Elixir.Ecto.NoPrimaryKeyValueError.beam
-lib/elixir/lib/ecto/ebin/Elixir.Ecto.NoResultsError.beam
-lib/elixir/lib/ecto/ebin/Elixir.Ecto.Query.API.beam
-lib/elixir/lib/ecto/ebin/Elixir.Ecto.Query.BooleanExpr.beam
-lib/elixir/lib/ecto/ebin/Elixir.Ecto.Query.Builder.Distinct.beam
-lib/elixir/lib/ecto/ebin/Elixir.Ecto.Query.Builder.Dynamic.beam
-lib/elixir/lib/ecto/ebin/Elixir.Ecto.Query.Builder.Filter.beam
-lib/elixir/lib/ecto/ebin/Elixir.Ecto.Query.Builder.From.beam
-lib/elixir/lib/ecto/ebin/Elixir.Ecto.Query.Builder.GroupBy.beam
-lib/elixir/lib/ecto/ebin/Elixir.Ecto.Query.Builder.Join.beam
-lib/elixir/lib/ecto/ebin/Elixir.Ecto.Query.Builder.LimitOffset.beam
-lib/elixir/lib/ecto/ebin/Elixir.Ecto.Query.Builder.Lock.beam
-lib/elixir/lib/ecto/ebin/Elixir.Ecto.Query.Builder.OrderBy.beam
-lib/elixir/lib/ecto/ebin/Elixir.Ecto.Query.Builder.Preload.beam
-lib/elixir/lib/ecto/ebin/Elixir.Ecto.Query.Builder.Select.beam
-lib/elixir/lib/ecto/ebin/Elixir.Ecto.Query.Builder.Update.beam
-lib/elixir/lib/ecto/ebin/Elixir.Ecto.Query.Builder.beam
-lib/elixir/lib/ecto/ebin/Elixir.Ecto.Query.CastError.beam
-lib/elixir/lib/ecto/ebin/Elixir.Ecto.Query.CompileError.beam
-lib/elixir/lib/ecto/ebin/Elixir.Ecto.Query.DynamicExpr.beam
-lib/elixir/lib/ecto/ebin/Elixir.Ecto.Query.JoinExpr.beam
-lib/elixir/lib/ecto/ebin/Elixir.Ecto.Query.Planner.beam
-lib/elixir/lib/ecto/ebin/Elixir.Ecto.Query.QueryExpr.beam
-lib/elixir/lib/ecto/ebin/Elixir.Ecto.Query.SelectExpr.beam
-lib/elixir/lib/ecto/ebin/Elixir.Ecto.Query.Tagged.beam
-lib/elixir/lib/ecto/ebin/Elixir.Ecto.Query.beam
-lib/elixir/lib/ecto/ebin/Elixir.Ecto.QueryError.beam
-lib/elixir/lib/ecto/ebin/Elixir.Ecto.Queryable.Atom.beam
-lib/elixir/lib/ecto/ebin/Elixir.Ecto.Queryable.BitString.beam
-lib/elixir/lib/ecto/ebin/Elixir.Ecto.Queryable.Ecto.Query.beam
-lib/elixir/lib/ecto/ebin/Elixir.Ecto.Queryable.Ecto.SubQuery.beam
-lib/elixir/lib/ecto/ebin/Elixir.Ecto.Queryable.Tuple.beam
-lib/elixir/lib/ecto/ebin/Elixir.Ecto.Queryable.beam
-lib/elixir/lib/ecto/ebin/Elixir.Ecto.Registry.beam
-lib/elixir/lib/ecto/ebin/Elixir.Ecto.Repo.Assoc.beam
-lib/elixir/lib/ecto/ebin/Elixir.Ecto.Repo.Preloader.beam
-lib/elixir/lib/ecto/ebin/Elixir.Ecto.Repo.Queryable.beam
-lib/elixir/lib/ecto/ebin/Elixir.Ecto.Repo.Schema.beam
-lib/elixir/lib/ecto/ebin/Elixir.Ecto.Repo.Supervisor.beam
-lib/elixir/lib/ecto/ebin/Elixir.Ecto.Repo.beam
-lib/elixir/lib/ecto/ebin/Elixir.Ecto.Schema.Metadata.beam
-lib/elixir/lib/ecto/ebin/Elixir.Ecto.Schema.beam
-lib/elixir/lib/ecto/ebin/Elixir.Ecto.StaleEntryError.beam
-lib/elixir/lib/ecto/ebin/Elixir.Ecto.SubQuery.beam
-lib/elixir/lib/ecto/ebin/Elixir.Ecto.SubQueryError.beam
-lib/elixir/lib/ecto/ebin/Elixir.Ecto.Time.beam
-lib/elixir/lib/ecto/ebin/Elixir.Ecto.Type.beam
-lib/elixir/lib/ecto/ebin/Elixir.Ecto.UUID.beam
-lib/elixir/lib/ecto/ebin/Elixir.Ecto.beam
-lib/elixir/lib/ecto/ebin/Elixir.Enumerable.Ecto.Adapters.SQL.Stream.beam
-lib/elixir/lib/ecto/ebin/Elixir.Inspect.Ecto.Association.NotLoaded.beam
-lib/elixir/lib/ecto/ebin/Elixir.Inspect.Ecto.Changeset.beam
-lib/elixir/lib/ecto/ebin/Elixir.Inspect.Ecto.Date.beam
-lib/elixir/lib/ecto/ebin/Elixir.Inspect.Ecto.DateTime.beam
-lib/elixir/lib/ecto/ebin/Elixir.Inspect.Ecto.Query.DynamicExpr.beam
-lib/elixir/lib/ecto/ebin/Elixir.Inspect.Ecto.Query.beam
-lib/elixir/lib/ecto/ebin/Elixir.Inspect.Ecto.Schema.Metadata.beam
-lib/elixir/lib/ecto/ebin/Elixir.Inspect.Ecto.Time.beam
-lib/elixir/lib/ecto/ebin/Elixir.Mix.Ecto.beam
-lib/elixir/lib/ecto/ebin/Elixir.Mix.Tasks.Ecto.Create.beam
-lib/elixir/lib/ecto/ebin/Elixir.Mix.Tasks.Ecto.Drop.beam
-lib/elixir/lib/ecto/ebin/Elixir.Mix.Tasks.Ecto.Dump.beam
-lib/elixir/lib/ecto/ebin/Elixir.Mix.Tasks.Ecto.Gen.Migration.beam
-lib/elixir/lib/ecto/ebin/Elixir.Mix.Tasks.Ecto.Gen.Repo.beam
-lib/elixir/lib/ecto/ebin/Elixir.Mix.Tasks.Ecto.Load.beam
-lib/elixir/lib/ecto/ebin/Elixir.Mix.Tasks.Ecto.Migrate.beam
-lib/elixir/lib/ecto/ebin/Elixir.Mix.Tasks.Ecto.Migrations.beam
-lib/elixir/lib/ecto/ebin/Elixir.Mix.Tasks.Ecto.Rollback.beam
-lib/elixir/lib/ecto/ebin/Elixir.Mix.Tasks.Ecto.beam
-lib/elixir/lib/ecto/ebin/Elixir.Poison.Encoder.Decimal.beam
-lib/elixir/lib/ecto/ebin/Elixir.Poison.Encoder.Ecto.Association.NotLoaded.beam
-lib/elixir/lib/ecto/ebin/Elixir.Poison.Encoder.Ecto.Date.beam
-lib/elixir/lib/ecto/ebin/Elixir.Poison.Encoder.Ecto.DateTime.beam
-lib/elixir/lib/ecto/ebin/Elixir.Poison.Encoder.Ecto.Time.beam
-lib/elixir/lib/ecto/ebin/Elixir.String.Chars.Ecto.Date.beam
-lib/elixir/lib/ecto/ebin/Elixir.String.Chars.Ecto.DateTime.beam
-lib/elixir/lib/ecto/ebin/Elixir.String.Chars.Ecto.Time.beam
-lib/elixir/lib/ecto/ebin/ecto.app
-lib/elixir/lib/ecto/lib/ecto.ex
-lib/elixir/lib/ecto/lib/ecto/adapter.ex
-lib/elixir/lib/ecto/lib/ecto/adapter/migration.ex
-lib/elixir/lib/ecto/lib/ecto/adapter/storage.ex
-lib/elixir/lib/ecto/lib/ecto/adapter/structure.ex
-lib/elixir/lib/ecto/lib/ecto/adapter/transaction.ex
-lib/elixir/lib/ecto/lib/ecto/adapters/mysql.ex
-lib/elixir/lib/ecto/lib/ecto/adapters/mysql/connection.ex
-lib/elixir/lib/ecto/lib/ecto/adapters/postgres.ex
-lib/elixir/lib/ecto/lib/ecto/adapters/postgres/connection.ex
-lib/elixir/lib/ecto/lib/ecto/adapters/postgres/datetime.ex
-lib/elixir/lib/ecto/lib/ecto/adapters/sql.ex
-lib/elixir/lib/ecto/lib/ecto/adapters/sql/connection.ex
-lib/elixir/lib/ecto/lib/ecto/adapters/sql/sandbox.ex
-lib/elixir/lib/ecto/lib/ecto/adapters/sql/stream.ex
-lib/elixir/lib/ecto/lib/ecto/application.ex
-lib/elixir/lib/ecto/lib/ecto/association.ex
-lib/elixir/lib/ecto/lib/ecto/changeset.ex
-lib/elixir/lib/ecto/lib/ecto/changeset/relation.ex
-lib/elixir/lib/ecto/lib/ecto/data_type.ex
-lib/elixir/lib/ecto/lib/ecto/date_time.ex
-lib/elixir/lib/ecto/lib/ecto/embedded.ex
-lib/elixir/lib/ecto/lib/ecto/exceptions.ex
-lib/elixir/lib/ecto/lib/ecto/log_entry.ex
-lib/elixir/lib/ecto/lib/ecto/migration.ex
-lib/elixir/lib/ecto/lib/ecto/migration/runner.ex
-lib/elixir/lib/ecto/lib/ecto/migration/schema_migration.ex
-lib/elixir/lib/ecto/lib/ecto/migration/supervisor.ex
-lib/elixir/lib/ecto/lib/ecto/migrator.ex
-lib/elixir/lib/ecto/lib/ecto/multi.ex
-lib/elixir/lib/ecto/lib/ecto/poison.ex
-lib/elixir/lib/ecto/lib/ecto/query.ex
-lib/elixir/lib/ecto/lib/ecto/query/api.ex
-lib/elixir/lib/ecto/lib/ecto/query/builder.ex
-lib/elixir/lib/ecto/lib/ecto/query/builder/distinct.ex
-lib/elixir/lib/ecto/lib/ecto/query/builder/dynamic.ex
-lib/elixir/lib/ecto/lib/ecto/query/builder/filter.ex
-lib/elixir/lib/ecto/lib/ecto/query/builder/from.ex
-lib/elixir/lib/ecto/lib/ecto/query/builder/group_by.ex
-lib/elixir/lib/ecto/lib/ecto/query/builder/join.ex
-lib/elixir/lib/ecto/lib/ecto/query/builder/limit_offset.ex
-lib/elixir/lib/ecto/lib/ecto/query/builder/lock.ex
-lib/elixir/lib/ecto/lib/ecto/query/builder/order_by.ex
-lib/elixir/lib/ecto/lib/ecto/query/builder/preload.ex
-lib/elixir/lib/ecto/lib/ecto/query/builder/select.ex
-lib/elixir/lib/ecto/lib/ecto/query/builder/update.ex
-lib/elixir/lib/ecto/lib/ecto/query/inspect.ex
-lib/elixir/lib/ecto/lib/ecto/query/planner.ex
-lib/elixir/lib/ecto/lib/ecto/queryable.ex
-lib/elixir/lib/ecto/lib/ecto/registry.ex
-lib/elixir/lib/ecto/lib/ecto/repo.ex
-lib/elixir/lib/ecto/lib/ecto/repo/assoc.ex
-lib/elixir/lib/ecto/lib/ecto/repo/preloader.ex
-lib/elixir/lib/ecto/lib/ecto/repo/queryable.ex
-lib/elixir/lib/ecto/lib/ecto/repo/schema.ex
-lib/elixir/lib/ecto/lib/ecto/repo/supervisor.ex
-lib/elixir/lib/ecto/lib/ecto/schema.ex
-lib/elixir/lib/ecto/lib/ecto/type.ex
-lib/elixir/lib/ecto/lib/ecto/uuid.ex
-lib/elixir/lib/ecto/lib/mix/ecto.ex
-lib/elixir/lib/ecto/lib/mix/tasks/ecto.create.ex
-lib/elixir/lib/ecto/lib/mix/tasks/ecto.drop.ex
-lib/elixir/lib/ecto/lib/mix/tasks/ecto.dump.ex
-lib/elixir/lib/ecto/lib/mix/tasks/ecto.ex
-lib/elixir/lib/ecto/lib/mix/tasks/ecto.gen.migration.ex
-lib/elixir/lib/ecto/lib/mix/tasks/ecto.gen.repo.ex
-lib/elixir/lib/ecto/lib/mix/tasks/ecto.load.ex
-lib/elixir/lib/ecto/lib/mix/tasks/ecto.migrate.ex
-lib/elixir/lib/ecto/lib/mix/tasks/ecto.migrations.ex
-lib/elixir/lib/ecto/lib/mix/tasks/ecto.rollback.ex
-%%PORTDOCS%%%%DOCSDIR%%/README.md
diff --git a/databases/elixir-geo/Makefile b/databases/elixir-geo/Makefile
deleted file mode 100644
index b27ef8d7779d..000000000000
--- a/databases/elixir-geo/Makefile
+++ /dev/null
@@ -1,26 +0,0 @@
-PORTNAME=	geo
-PORTVERSION=	2.1.0
-DISTVERSIONPREFIX=	v
-CATEGORIES=	databases
-PKGNAMEPREFIX=	elixir-
-
-MAINTAINER=	erlang@FreeBSD.org
-COMMENT=	Collection of GIS functions for Elixir
-
-LICENSE=	MIT
-
-OPTIONS_SUB=	yes
-USES=		elixir
-USE_GITHUB=	yes
-GH_ACCOUNT=	bryanjos
-
-MIX_BUILD_DEPS=	databases/elixir-ecto \
-		databases/elixir-postgrex \
-		devel/elixir-poison
-
-MIX_RUN_DEPS:=	${MIX_BUILD_DEPS}
-MIX_REWRITE=	yes
-
-OPTIONS_DEFINE=	DOCS
-
-.include <bsd.port.mk>
diff --git a/databases/elixir-geo/distinfo b/databases/elixir-geo/distinfo
deleted file mode 100644
index 7c152446e82c..000000000000
--- a/databases/elixir-geo/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1517217189
-SHA256 (bryanjos-geo-v2.1.0_GH0.tar.gz) = 1ee0d3015eb22c6a454f9d5efd9f2ca0ed734fa93c33121e2e64188c67cf7e3e
-SIZE (bryanjos-geo-v2.1.0_GH0.tar.gz) = 15725
diff --git a/databases/elixir-geo/pkg-descr b/databases/elixir-geo/pkg-descr
deleted file mode 100644
index 5ad94b84ca9c..000000000000
--- a/databases/elixir-geo/pkg-descr
+++ /dev/null
@@ -1,4 +0,0 @@
-A collection of GIS functions for Elixir. Handles conversions to and from
-WKT, WKB, and GeoJSON.
-
-WWW: https://github.com/bryanjos/geo
diff --git a/databases/elixir-geo/pkg-plist b/databases/elixir-geo/pkg-plist
deleted file mode 100644
index ceac0ea542cf..000000000000
--- a/databases/elixir-geo/pkg-plist
+++ /dev/null
@@ -1,50 +0,0 @@
-lib/elixir/lib/geo/ebin/Elixir.Geo.Geometry.beam
-lib/elixir/lib/geo/ebin/Elixir.Geo.GeometryCollection.beam
-lib/elixir/lib/geo/ebin/Elixir.Geo.JSON.DecodeError.beam
-lib/elixir/lib/geo/ebin/Elixir.Geo.JSON.EncodeError.beam
-lib/elixir/lib/geo/ebin/Elixir.Geo.JSON.beam
-lib/elixir/lib/geo/ebin/Elixir.Geo.LineString.beam
-lib/elixir/lib/geo/ebin/Elixir.Geo.MultiLineString.beam
-lib/elixir/lib/geo/ebin/Elixir.Geo.MultiPoint.beam
-lib/elixir/lib/geo/ebin/Elixir.Geo.MultiPolygon.beam
-lib/elixir/lib/geo/ebin/Elixir.Geo.Point.beam
-lib/elixir/lib/geo/ebin/Elixir.Geo.PointM.beam
-lib/elixir/lib/geo/ebin/Elixir.Geo.PointZ.beam
-lib/elixir/lib/geo/ebin/Elixir.Geo.PointZM.beam
-lib/elixir/lib/geo/ebin/Elixir.Geo.Polygon.beam
-lib/elixir/lib/geo/ebin/Elixir.Geo.Utils.beam
-lib/elixir/lib/geo/ebin/Elixir.Geo.WKB.Reader.beam
-lib/elixir/lib/geo/ebin/Elixir.Geo.WKB.Writer.beam
-lib/elixir/lib/geo/ebin/Elixir.Geo.WKB.beam
-lib/elixir/lib/geo/ebin/Elixir.Geo.WKT.beam
-lib/elixir/lib/geo/ebin/Elixir.Geo.beam
-lib/elixir/lib/geo/ebin/Elixir.String.Chars.Geo.GeometryCollection.beam
-lib/elixir/lib/geo/ebin/Elixir.String.Chars.Geo.LineString.beam
-lib/elixir/lib/geo/ebin/Elixir.String.Chars.Geo.MultiLineString.beam
-lib/elixir/lib/geo/ebin/Elixir.String.Chars.Geo.MultiPoint.beam
-lib/elixir/lib/geo/ebin/Elixir.String.Chars.Geo.MultiPolygon.beam
-lib/elixir/lib/geo/ebin/Elixir.String.Chars.Geo.Point.beam
-lib/elixir/lib/geo/ebin/Elixir.String.Chars.Geo.PointM.beam
-lib/elixir/lib/geo/ebin/Elixir.String.Chars.Geo.PointZ.beam
-lib/elixir/lib/geo/ebin/Elixir.String.Chars.Geo.PointZM.beam
-lib/elixir/lib/geo/ebin/Elixir.String.Chars.Geo.Polygon.beam
-lib/elixir/lib/geo/ebin/geo.app
-lib/elixir/lib/geo/lib/geo.ex
-lib/elixir/lib/geo/lib/geo/geo_json.ex
-lib/elixir/lib/geo/lib/geo/geometry.ex
-lib/elixir/lib/geo/lib/geo/geometry_collection.ex
-lib/elixir/lib/geo/lib/geo/line_string.ex
-lib/elixir/lib/geo/lib/geo/multi_line_string.ex
-lib/elixir/lib/geo/lib/geo/multi_point.ex
-lib/elixir/lib/geo/lib/geo/multi_polygon.ex
-lib/elixir/lib/geo/lib/geo/point.ex
-lib/elixir/lib/geo/lib/geo/pointm.ex
-lib/elixir/lib/geo/lib/geo/pointz.ex
-lib/elixir/lib/geo/lib/geo/pointzm.ex
-lib/elixir/lib/geo/lib/geo/polygon.ex
-lib/elixir/lib/geo/lib/geo/utils.ex
-lib/elixir/lib/geo/lib/geo/wkb.ex
-lib/elixir/lib/geo/lib/geo/wkb/reader.ex
-lib/elixir/lib/geo/lib/geo/wkb/writer.ex
-lib/elixir/lib/geo/lib/geo/wkt.ex
-%%PORTDOCS%%%%DOCSDIR%%/README.md
diff --git a/databases/elixir-mariaex/Makefile b/databases/elixir-mariaex/Makefile
deleted file mode 100644
index a66b7e2a1f52..000000000000
--- a/databases/elixir-mariaex/Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
-PORTNAME=	mariaex
-PORTVERSION=	0.8.4
-DISTVERSIONPREFIX=	v
-CATEGORIES=	databases
-PKGNAMEPREFIX=	elixir-
-
-MAINTAINER=	erlang@FreeBSD.org
-COMMENT=	Database driver for MariaDB and MySQL written in Elixir
-
-LICENSE=	APACHE20
-
-USES=		elixir
-USE_GITHUB=	yes
-GH_ACCOUNT=	xerions
-
-MIX_BUILD_DEPS=	devel/elixir-connection \
-		devel/elixir-decimal \
-		databases/elixir-db_connection
-MIX_RUN_DEPS:=	${MIX_BUILD_DEPS}
-MIX_REWRITE=	yes
-
-OPTIONS_DEFINE=	DOCS
-
-.include <bsd.port.mk>
diff --git a/databases/elixir-mariaex/distinfo b/databases/elixir-mariaex/distinfo
deleted file mode 100644
index f60274b9f104..000000000000
--- a/databases/elixir-mariaex/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1517836032
-SHA256 (xerions-mariaex-v0.8.4_GH0.tar.gz) = 3edb4b6a1dfff8c8a05f422c5daf07c930784bc92cdae225b3c703fca743fe23
-SIZE (xerions-mariaex-v0.8.4_GH0.tar.gz) = 34695
diff --git a/databases/elixir-mariaex/pkg-descr b/databases/elixir-mariaex/pkg-descr
deleted file mode 100644
index 3e49f08e132d..000000000000
--- a/databases/elixir-mariaex/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-A database driver for MariaDB and MySQL written in pure Elixir.
-
-WWW: https://github.com/xerions/mariaex
diff --git a/databases/elixir-mariaex/pkg-plist b/databases/elixir-mariaex/pkg-plist
deleted file mode 100644
index 14c322df9676..000000000000
--- a/databases/elixir-mariaex/pkg-plist
+++ /dev/null
@@ -1,35 +0,0 @@
-lib/elixir/lib/mariaex/ebin/Elixir.DBConnection.Query.Mariaex.Query.beam
-lib/elixir/lib/mariaex/ebin/Elixir.Mariaex.Cache.beam
-lib/elixir/lib/mariaex/ebin/Elixir.Mariaex.Coder.Utils.beam
-lib/elixir/lib/mariaex/ebin/Elixir.Mariaex.Coder.beam
-lib/elixir/lib/mariaex/ebin/Elixir.Mariaex.Column.beam
-lib/elixir/lib/mariaex/ebin/Elixir.Mariaex.Connection.Ssl.beam
-lib/elixir/lib/mariaex/ebin/Elixir.Mariaex.Connection.Tcp.beam
-lib/elixir/lib/mariaex/ebin/Elixir.Mariaex.Connection.beam
-lib/elixir/lib/mariaex/ebin/Elixir.Mariaex.Cursor.beam
-lib/elixir/lib/mariaex/ebin/Elixir.Mariaex.Error.beam
-lib/elixir/lib/mariaex/ebin/Elixir.Mariaex.LruCache.beam
-lib/elixir/lib/mariaex/ebin/Elixir.Mariaex.Messages.beam
-lib/elixir/lib/mariaex/ebin/Elixir.Mariaex.Protocol.beam
-lib/elixir/lib/mariaex/ebin/Elixir.Mariaex.ProtocolHelper.beam
-lib/elixir/lib/mariaex/ebin/Elixir.Mariaex.Query.beam
-lib/elixir/lib/mariaex/ebin/Elixir.Mariaex.Result.beam
-lib/elixir/lib/mariaex/ebin/Elixir.Mariaex.RowParser.beam
-lib/elixir/lib/mariaex/ebin/Elixir.Mariaex.beam
-lib/elixir/lib/mariaex/ebin/Elixir.String.Chars.Mariaex.Query.beam
-lib/elixir/lib/mariaex/ebin/mariaex.app
-lib/elixir/lib/mariaex/lib/mariaex.ex
-lib/elixir/lib/mariaex/lib/mariaex/cache.ex
-lib/elixir/lib/mariaex/lib/mariaex/coder.ex
-lib/elixir/lib/mariaex/lib/mariaex/column.ex
-lib/elixir/lib/mariaex/lib/mariaex/connection.ex
-lib/elixir/lib/mariaex/lib/mariaex/connection/ssl.ex
-lib/elixir/lib/mariaex/lib/mariaex/connection/tcp.ex
-lib/elixir/lib/mariaex/lib/mariaex/lru_cache.ex
-lib/elixir/lib/mariaex/lib/mariaex/messages.ex
-lib/elixir/lib/mariaex/lib/mariaex/protocol.ex
-lib/elixir/lib/mariaex/lib/mariaex/protocol_helper.ex
-lib/elixir/lib/mariaex/lib/mariaex/query.ex
-lib/elixir/lib/mariaex/lib/mariaex/row_parser.ex
-lib/elixir/lib/mariaex/lib/mariaex/structs.ex
-%%PORTDOCS%%%%DOCSDIR%%/README.md
diff --git a/databases/elixir-postgrex/Makefile b/databases/elixir-postgrex/Makefile
deleted file mode 100644
index 25a466e8e6ae..000000000000
--- a/databases/elixir-postgrex/Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
-PORTNAME=	postgrex
-PORTVERSION=	0.13.5
-DISTVERSIONPREFIX=	v
-CATEGORIES=	databases
-PKGNAMEPREFIX=	elixir-
-
-MAINTAINER=	erlang@FreeBSD.org
-COMMENT=	Database driver for PostgreSQL written in Elixir
-
-LICENSE=	APACHE20
-
-USES=		elixir
-USE_GITHUB=	yes
-GH_ACCOUNT=	elixir-ecto
-
-MIX_BUILD_DEPS=	databases/elixir-db_connection \
-		devel/elixir-connection \
-		devel/elixir-decimal
-MIX_RUN_DEPS:=	${MIX_BUILD_DEPS}
-MIX_REWRITE=	yes
-
-OPTIONS_DEFINE=	DOCS
-
-.include <bsd.port.mk>
diff --git a/databases/elixir-postgrex/distinfo b/databases/elixir-postgrex/distinfo
deleted file mode 100644
index 1b86f7a4ca75..000000000000
--- a/databases/elixir-postgrex/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1518203005
-SHA256 (elixir-ecto-postgrex-v0.13.5_GH0.tar.gz) = 0c0e5c6fe79220324bb92ff6c04cc6f4c05177314548183614e3b390bd3e9409
-SIZE (elixir-ecto-postgrex-v0.13.5_GH0.tar.gz) = 84611
diff --git a/databases/elixir-postgrex/pkg-descr b/databases/elixir-postgrex/pkg-descr
deleted file mode 100644
index 4e86625d9e16..000000000000
--- a/databases/elixir-postgrex/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-A database driver for PostgreSQL written in pure Elixir.
-
-WWW: https://github.com/ericmj/postgrex
diff --git a/databases/elixir-postgrex/pkg-plist b/databases/elixir-postgrex/pkg-plist
deleted file mode 100644
index 927c932e33f9..000000000000
--- a/databases/elixir-postgrex/pkg-plist
+++ /dev/null
@@ -1,155 +0,0 @@
-lib/elixir/lib/postgrex/ebin/Elixir.Collectable.Postgrex.Stream.beam
-lib/elixir/lib/postgrex/ebin/Elixir.DBConnection.Query.Postgrex.Copy.beam
-lib/elixir/lib/postgrex/ebin/Elixir.DBConnection.Query.Postgrex.Parameters.beam
-lib/elixir/lib/postgrex/ebin/Elixir.DBConnection.Query.Postgrex.Query.beam
-lib/elixir/lib/postgrex/ebin/Elixir.DBConnection.Query.Postgrex.Stream.beam
-lib/elixir/lib/postgrex/ebin/Elixir.Enumerable.Postgrex.Stream.beam
-lib/elixir/lib/postgrex/ebin/Elixir.Postgrex.App.beam
-lib/elixir/lib/postgrex/ebin/Elixir.Postgrex.BinaryExtension.beam
-lib/elixir/lib/postgrex/ebin/Elixir.Postgrex.BinaryUtils.beam
-lib/elixir/lib/postgrex/ebin/Elixir.Postgrex.Box.beam
-lib/elixir/lib/postgrex/ebin/Elixir.Postgrex.CIDR.beam
-lib/elixir/lib/postgrex/ebin/Elixir.Postgrex.Circle.beam
-lib/elixir/lib/postgrex/ebin/Elixir.Postgrex.Copy.beam
-lib/elixir/lib/postgrex/ebin/Elixir.Postgrex.CopyData.beam
-lib/elixir/lib/postgrex/ebin/Elixir.Postgrex.CopyDone.beam
-lib/elixir/lib/postgrex/ebin/Elixir.Postgrex.Cursor.beam
-lib/elixir/lib/postgrex/ebin/Elixir.Postgrex.Date.beam
-lib/elixir/lib/postgrex/ebin/Elixir.Postgrex.DefaultTypes.beam
-lib/elixir/lib/postgrex/ebin/Elixir.Postgrex.Error.beam
-lib/elixir/lib/postgrex/ebin/Elixir.Postgrex.ErrorCode.beam
-lib/elixir/lib/postgrex/ebin/Elixir.Postgrex.Extension.beam
-lib/elixir/lib/postgrex/ebin/Elixir.Postgrex.Extensions.Array.beam
-lib/elixir/lib/postgrex/ebin/Elixir.Postgrex.Extensions.BitString.beam
-lib/elixir/lib/postgrex/ebin/Elixir.Postgrex.Extensions.Bool.beam
-lib/elixir/lib/postgrex/ebin/Elixir.Postgrex.Extensions.Box.beam
-lib/elixir/lib/postgrex/ebin/Elixir.Postgrex.Extensions.CIDR.beam
-lib/elixir/lib/postgrex/ebin/Elixir.Postgrex.Extensions.Circle.beam
-lib/elixir/lib/postgrex/ebin/Elixir.Postgrex.Extensions.Date.beam
-lib/elixir/lib/postgrex/ebin/Elixir.Postgrex.Extensions.Float4.beam
-lib/elixir/lib/postgrex/ebin/Elixir.Postgrex.Extensions.Float8.beam
-lib/elixir/lib/postgrex/ebin/Elixir.Postgrex.Extensions.HStore.beam
-lib/elixir/lib/postgrex/ebin/Elixir.Postgrex.Extensions.INET.beam
-lib/elixir/lib/postgrex/ebin/Elixir.Postgrex.Extensions.Int2.beam
-lib/elixir/lib/postgrex/ebin/Elixir.Postgrex.Extensions.Int4.beam
-lib/elixir/lib/postgrex/ebin/Elixir.Postgrex.Extensions.Int8.beam
-lib/elixir/lib/postgrex/ebin/Elixir.Postgrex.Extensions.Interval.beam
-lib/elixir/lib/postgrex/ebin/Elixir.Postgrex.Extensions.JSON.beam
-lib/elixir/lib/postgrex/ebin/Elixir.Postgrex.Extensions.JSONB.beam
-lib/elixir/lib/postgrex/ebin/Elixir.Postgrex.Extensions.Line.beam
-lib/elixir/lib/postgrex/ebin/Elixir.Postgrex.Extensions.LineSegment.beam
-lib/elixir/lib/postgrex/ebin/Elixir.Postgrex.Extensions.MACADDR.beam
-lib/elixir/lib/postgrex/ebin/Elixir.Postgrex.Extensions.Name.beam
-lib/elixir/lib/postgrex/ebin/Elixir.Postgrex.Extensions.Numeric.beam
-lib/elixir/lib/postgrex/ebin/Elixir.Postgrex.Extensions.OID.beam
-lib/elixir/lib/postgrex/ebin/Elixir.Postgrex.Extensions.Path.beam
-lib/elixir/lib/postgrex/ebin/Elixir.Postgrex.Extensions.Point.beam
-lib/elixir/lib/postgrex/ebin/Elixir.Postgrex.Extensions.Polygon.beam
-lib/elixir/lib/postgrex/ebin/Elixir.Postgrex.Extensions.Range.beam
-lib/elixir/lib/postgrex/ebin/Elixir.Postgrex.Extensions.Raw.beam
-lib/elixir/lib/postgrex/ebin/Elixir.Postgrex.Extensions.Record.beam
-lib/elixir/lib/postgrex/ebin/Elixir.Postgrex.Extensions.TID.beam
-lib/elixir/lib/postgrex/ebin/Elixir.Postgrex.Extensions.TSVector.beam
-lib/elixir/lib/postgrex/ebin/Elixir.Postgrex.Extensions.Time.beam
-lib/elixir/lib/postgrex/ebin/Elixir.Postgrex.Extensions.TimeTZ.beam
-lib/elixir/lib/postgrex/ebin/Elixir.Postgrex.Extensions.Timestamp.beam
-lib/elixir/lib/postgrex/ebin/Elixir.Postgrex.Extensions.TimestampTZ.beam
-lib/elixir/lib/postgrex/ebin/Elixir.Postgrex.Extensions.UUID.beam
-lib/elixir/lib/postgrex/ebin/Elixir.Postgrex.Extensions.VoidBinary.beam
-lib/elixir/lib/postgrex/ebin/Elixir.Postgrex.Extensions.VoidText.beam
-lib/elixir/lib/postgrex/ebin/Elixir.Postgrex.INET.beam
-lib/elixir/lib/postgrex/ebin/Elixir.Postgrex.Interval.beam
-lib/elixir/lib/postgrex/ebin/Elixir.Postgrex.Lexeme.beam
-lib/elixir/lib/postgrex/ebin/Elixir.Postgrex.Line.beam
-lib/elixir/lib/postgrex/ebin/Elixir.Postgrex.LineSegment.beam
-lib/elixir/lib/postgrex/ebin/Elixir.Postgrex.MACADDR.beam
-lib/elixir/lib/postgrex/ebin/Elixir.Postgrex.Messages.beam
-lib/elixir/lib/postgrex/ebin/Elixir.Postgrex.Notifications.beam
-lib/elixir/lib/postgrex/ebin/Elixir.Postgrex.Parameters.beam
-lib/elixir/lib/postgrex/ebin/Elixir.Postgrex.Path.beam
-lib/elixir/lib/postgrex/ebin/Elixir.Postgrex.Point.beam
-lib/elixir/lib/postgrex/ebin/Elixir.Postgrex.Polygon.beam
-lib/elixir/lib/postgrex/ebin/Elixir.Postgrex.Protocol.beam
-lib/elixir/lib/postgrex/ebin/Elixir.Postgrex.Query.beam
-lib/elixir/lib/postgrex/ebin/Elixir.Postgrex.Range.beam
-lib/elixir/lib/postgrex/ebin/Elixir.Postgrex.Result.beam
-lib/elixir/lib/postgrex/ebin/Elixir.Postgrex.Stream.beam
-lib/elixir/lib/postgrex/ebin/Elixir.Postgrex.SuperExtension.beam
-lib/elixir/lib/postgrex/ebin/Elixir.Postgrex.Time.beam
-lib/elixir/lib/postgrex/ebin/Elixir.Postgrex.Timestamp.beam
-lib/elixir/lib/postgrex/ebin/Elixir.Postgrex.TypeInfo.beam
-lib/elixir/lib/postgrex/ebin/Elixir.Postgrex.TypeManager.beam
-lib/elixir/lib/postgrex/ebin/Elixir.Postgrex.TypeModule.beam
-lib/elixir/lib/postgrex/ebin/Elixir.Postgrex.TypeServer.beam
-lib/elixir/lib/postgrex/ebin/Elixir.Postgrex.TypeSupervisor.beam
-lib/elixir/lib/postgrex/ebin/Elixir.Postgrex.Types.beam
-lib/elixir/lib/postgrex/ebin/Elixir.Postgrex.Utils.beam
-lib/elixir/lib/postgrex/ebin/Elixir.Postgrex.beam
-lib/elixir/lib/postgrex/ebin/Elixir.String.Chars.Postgrex.Copy.beam
-lib/elixir/lib/postgrex/ebin/Elixir.String.Chars.Postgrex.Query.beam
-lib/elixir/lib/postgrex/ebin/Elixir.String.Chars.Postgrex.Stream.beam
-lib/elixir/lib/postgrex/ebin/postgrex.app
-lib/elixir/lib/postgrex/lib/postgrex.ex
-lib/elixir/lib/postgrex/lib/postgrex/app.ex
-lib/elixir/lib/postgrex/lib/postgrex/binary_extension.ex
-lib/elixir/lib/postgrex/lib/postgrex/binary_utils.ex
-lib/elixir/lib/postgrex/lib/postgrex/builtins.ex
-lib/elixir/lib/postgrex/lib/postgrex/default_types.ex
-lib/elixir/lib/postgrex/lib/postgrex/errcodes.txt
-lib/elixir/lib/postgrex/lib/postgrex/error.ex
-lib/elixir/lib/postgrex/lib/postgrex/error_code.ex
-lib/elixir/lib/postgrex/lib/postgrex/extension.ex
-lib/elixir/lib/postgrex/lib/postgrex/extensions/array.ex
-lib/elixir/lib/postgrex/lib/postgrex/extensions/bit_string.ex
-lib/elixir/lib/postgrex/lib/postgrex/extensions/bool.ex
-lib/elixir/lib/postgrex/lib/postgrex/extensions/box.ex
-lib/elixir/lib/postgrex/lib/postgrex/extensions/cidr.ex
-lib/elixir/lib/postgrex/lib/postgrex/extensions/circle.ex
-lib/elixir/lib/postgrex/lib/postgrex/extensions/date.ex
-lib/elixir/lib/postgrex/lib/postgrex/extensions/float4.ex
-lib/elixir/lib/postgrex/lib/postgrex/extensions/float8.ex
-lib/elixir/lib/postgrex/lib/postgrex/extensions/hstore.ex
-lib/elixir/lib/postgrex/lib/postgrex/extensions/inet.ex
-lib/elixir/lib/postgrex/lib/postgrex/extensions/int2.ex
-lib/elixir/lib/postgrex/lib/postgrex/extensions/int4.ex
-lib/elixir/lib/postgrex/lib/postgrex/extensions/int8.ex
-lib/elixir/lib/postgrex/lib/postgrex/extensions/interval.ex
-lib/elixir/lib/postgrex/lib/postgrex/extensions/json.ex
-lib/elixir/lib/postgrex/lib/postgrex/extensions/jsonb.ex
-lib/elixir/lib/postgrex/lib/postgrex/extensions/line.ex
-lib/elixir/lib/postgrex/lib/postgrex/extensions/line_segment.ex
-lib/elixir/lib/postgrex/lib/postgrex/extensions/macaddr.ex
-lib/elixir/lib/postgrex/lib/postgrex/extensions/name.ex
-lib/elixir/lib/postgrex/lib/postgrex/extensions/numeric.ex
-lib/elixir/lib/postgrex/lib/postgrex/extensions/oid.ex
-lib/elixir/lib/postgrex/lib/postgrex/extensions/path.ex
-lib/elixir/lib/postgrex/lib/postgrex/extensions/point.ex
-lib/elixir/lib/postgrex/lib/postgrex/extensions/polygon.ex
-lib/elixir/lib/postgrex/lib/postgrex/extensions/range.ex
-lib/elixir/lib/postgrex/lib/postgrex/extensions/raw.ex
-lib/elixir/lib/postgrex/lib/postgrex/extensions/record.ex
-lib/elixir/lib/postgrex/lib/postgrex/extensions/tid.ex
-lib/elixir/lib/postgrex/lib/postgrex/extensions/time.ex
-lib/elixir/lib/postgrex/lib/postgrex/extensions/timestamp.ex
-lib/elixir/lib/postgrex/lib/postgrex/extensions/timestamptz.ex
-lib/elixir/lib/postgrex/lib/postgrex/extensions/timetz.ex
-lib/elixir/lib/postgrex/lib/postgrex/extensions/tsvector.ex
-lib/elixir/lib/postgrex/lib/postgrex/extensions/uuid.ex
-lib/elixir/lib/postgrex/lib/postgrex/extensions/void_binary.ex
-lib/elixir/lib/postgrex/lib/postgrex/extensions/void_text.ex
-lib/elixir/lib/postgrex/lib/postgrex/messages.ex
-lib/elixir/lib/postgrex/lib/postgrex/notifications.ex
-lib/elixir/lib/postgrex/lib/postgrex/parameters.ex
-lib/elixir/lib/postgrex/lib/postgrex/protocol.ex
-lib/elixir/lib/postgrex/lib/postgrex/query.ex
-lib/elixir/lib/postgrex/lib/postgrex/result.ex
-lib/elixir/lib/postgrex/lib/postgrex/stream.ex
-lib/elixir/lib/postgrex/lib/postgrex/super_extension.ex
-lib/elixir/lib/postgrex/lib/postgrex/type_info.ex
-lib/elixir/lib/postgrex/lib/postgrex/type_manager.ex
-lib/elixir/lib/postgrex/lib/postgrex/type_module.ex
-lib/elixir/lib/postgrex/lib/postgrex/type_server.ex
-lib/elixir/lib/postgrex/lib/postgrex/type_supervisor.ex
-lib/elixir/lib/postgrex/lib/postgrex/types.ex
-lib/elixir/lib/postgrex/lib/postgrex/utils.ex
-%%PORTDOCS%%%%DOCSDIR%%/README.md
diff --git a/databases/elixir-timex_ecto/Makefile b/databases/elixir-timex_ecto/Makefile
deleted file mode 100644
index c9ebd4218d1f..000000000000
--- a/databases/elixir-timex_ecto/Makefile
+++ /dev/null
@@ -1,22 +0,0 @@
-PORTNAME=	timex_ecto
-PORTVERSION=	3.3.0
-CATEGORIES=	databases
-PKGNAMEPREFIX=	elixir-
-
-MAINTAINER=	erlang@FreeBSD.org
-COMMENT=	Adapter for using Timex DateTimes with Ecto
-
-LICENSE=	MIT
-
-USES=		elixir
-USE_GITHUB=	yes
-GH_ACCOUNT=	bitwalker
-
-MIX_BUILD_DEPS=	databases/elixir-ecto \
-		devel/elixir-timex
-MIX_RUN_DEPS:=	${MIX_BUILD_DEPS}
-MIX_REWRITE=	yes
-
-OPTIONS_DEFINE=	DOCS
-
-.include <bsd.port.mk>
diff --git a/databases/elixir-timex_ecto/distinfo b/databases/elixir-timex_ecto/distinfo
deleted file mode 100644
index 6892ad9be67c..000000000000
--- a/databases/elixir-timex_ecto/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1526218576
-SHA256 (bitwalker-timex_ecto-3.3.0_GH0.tar.gz) = f10d3b50eba059d2f9fc1e0ac3d1d9eab7b166cf92a21b8ba2f7105c91206a0b
-SIZE (bitwalker-timex_ecto-3.3.0_GH0.tar.gz) = 11950
diff --git a/databases/elixir-timex_ecto/pkg-descr b/databases/elixir-timex_ecto/pkg-descr
deleted file mode 100644
index 1ecc62d83ff8..000000000000
--- a/databases/elixir-timex_ecto/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-An adapter for using Timex DateTimes with Ecto.
-
-WWW: https://github.com/bitwalker/timex_ecto
diff --git a/databases/elixir-timex_ecto/pkg-plist b/databases/elixir-timex_ecto/pkg-plist
deleted file mode 100644
index 581ebcd7a593..000000000000
--- a/databases/elixir-timex_ecto/pkg-plist
+++ /dev/null
@@ -1,18 +0,0 @@
-lib/elixir/lib/timex_ecto/ebin/Elixir.Timex.Ecto.Date.beam
-lib/elixir/lib/timex_ecto/ebin/Elixir.Timex.Ecto.DateTime.beam
-lib/elixir/lib/timex_ecto/ebin/Elixir.Timex.Ecto.DateTimeWithTimezone.beam
-lib/elixir/lib/timex_ecto/ebin/Elixir.Timex.Ecto.Helpers.beam
-lib/elixir/lib/timex_ecto/ebin/Elixir.Timex.Ecto.Time.beam
-lib/elixir/lib/timex_ecto/ebin/Elixir.Timex.Ecto.TimestampWithTimezone.beam
-lib/elixir/lib/timex_ecto/ebin/Elixir.Timex.Ecto.Timestamps.beam
-lib/elixir/lib/timex_ecto/ebin/Elixir.Timex.Ecto.beam
-lib/elixir/lib/timex_ecto/ebin/timex_ecto.app
-lib/elixir/lib/timex_ecto/lib/helpers.ex
-lib/elixir/lib/timex_ecto/lib/model.ex
-lib/elixir/lib/timex_ecto/lib/timex_ecto.ex
-lib/elixir/lib/timex_ecto/lib/types/date.ex
-lib/elixir/lib/timex_ecto/lib/types/datetime.ex
-lib/elixir/lib/timex_ecto/lib/types/datetimetz.ex
-lib/elixir/lib/timex_ecto/lib/types/time.ex
-lib/elixir/lib/timex_ecto/lib/types/timestamptz.ex
-%%PORTDOCS%%%%DOCSDIR%%/README.md
diff --git a/databases/emacs-sqlite3-api/Makefile b/databases/emacs-sqlite3-api/Makefile
new file mode 100644
index 000000000000..41bbb6106544
--- /dev/null
+++ b/databases/emacs-sqlite3-api/Makefile
@@ -0,0 +1,42 @@
+PORTNAME=	emacs-sqlite3-api
+DISTVERSIONPREFIX=	v
+DISTVERSION=	0.18
+PORTREVISION=	1
+CATEGORIES=	databases elisp
+PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
+
+MAINTAINER=	yasu@FreeBSD.org
+COMMENT=	SQLite3 API for Emacs 25+
+WWW=		https://github.com/pekingduck/emacs-sqlite3-api
+
+LICENSE=	GPLv3+
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
+LIB_DEPENDS=	libsqlite3.so:databases/sqlite3
+
+USES=		emacs gmake
+USE_GITHUB=	yes
+GH_ACCOUNT=	pekingduck
+
+MAKE_ENV+=	LIB="-L${LOCALBASE}/lib -lsqlite3"
+
+CFLAGS+=	-I${LOCALBASE}/include
+
+PORTDOCS=	README.org
+
+OPTIONS_DEFINE=	DOCS
+
+post-build:
+	(cd ${WRKSRC} \
+	&& ${EMACS_CMD} -Q -batch -f batch-byte-compile sqlite3.el)
+
+do-install:
+	${MKDIR} ${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}
+	${INSTALL_PROGRAM} ${WRKSRC}/sqlite3-api.so ${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}
+	${INSTALL_DATA} ${WRKSRC}/sqlite3.el* ${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}
+
+do-install-DOCS-on:
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/README.org ${STAGEDIR}${DOCSDIR}
+
+.include <bsd.port.mk>
diff --git a/databases/emacs-sqlite3-api/distinfo b/databases/emacs-sqlite3-api/distinfo
new file mode 100644
index 000000000000..87ee37e3fd34
--- /dev/null
+++ b/databases/emacs-sqlite3-api/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1707349007
+SHA256 (pekingduck-emacs-sqlite3-api-v0.18_GH0.tar.gz) = 96d7cd903c436798476429f644709741547f8e5bae3948b3f014bb16888d8ca9
+SIZE (pekingduck-emacs-sqlite3-api-v0.18_GH0.tar.gz) = 37358
diff --git a/databases/emacs-sqlite3-api/pkg-descr b/databases/emacs-sqlite3-api/pkg-descr
new file mode 100644
index 000000000000..16fdb403bf4b
--- /dev/null
+++ b/databases/emacs-sqlite3-api/pkg-descr
@@ -0,0 +1,2 @@
+emacs-sqlite3-api is a dynamic module for GNU Emacs 25+ that provides
+direct access to the core SQLite3 C API from Emacs Lisp.
diff --git a/databases/emacs-sqlite3-api/pkg-plist b/databases/emacs-sqlite3-api/pkg-plist
new file mode 100644
index 000000000000..b91ff6b250f9
--- /dev/null
+++ b/databases/emacs-sqlite3-api/pkg-plist
@@ -0,0 +1,3 @@
+%%EMACS_VERSION_SITE_LISPDIR%%/sqlite3-api.so
+%%EMACS_VERSION_SITE_LISPDIR%%/sqlite3.el
+%%EMACS_VERSION_SITE_LISPDIR%%/sqlite3.elc
diff --git a/databases/emacsql-devel/Makefile b/databases/emacsql-devel/Makefile
new file mode 100644
index 000000000000..9c1623da8995
--- /dev/null
+++ b/databases/emacsql-devel/Makefile
@@ -0,0 +1,52 @@
+PORTNAME=	emacsql
+DISTVERSION=	3.1.1-64
+PORTREVISION=	1
+DISTVERSIONSUFFIX=	-gfdcf447
+CATEGORIES=	databases elisp
+PKGNAMESUFFIX=	-devel${EMACS_PKGNAMESUFFIX}
+
+MAINTAINER=	yasu@FreeBSD.org
+COMMENT=	High-level Emacs Lisp RDBMS front-end (Development Version)
+WWW=		https://github.com/magit/emacsql
+
+LICENSE=	UNLICENSE
+LICENSE_FILE=	${WRKSRC}/UNLICENSE
+
+BUILD_DEPENDS=	emacs-sqlite3-api${EMACS_PKGNAMESUFFIX}>=0.16:databases/emacs-sqlite3-api@${EMACS_FLAVOR} \
+		pg.el${EMACS_PKGNAMESUFFIX}>=0.16:databases/pg.el@${EMACS_FLAVOR}
+LIB_DEPENDS=	libsqlite3.so:databases/sqlite3
+RUN_DEPENDS=	emacs-sqlite3-api${EMACS_PKGNAMESUFFIX}>=0.16:databases/emacs-sqlite3-api@${EMACS_FLAVOR} \
+		pg.el${EMACS_PKGNAMESUFFIX}>=0.16:databases/pg.el@${EMACS_FLAVOR}
+
+USES=		emacs gmake localbase:ldflags
+
+USE_GITHUB=	yes
+GH_ACCOUNT=	magit
+
+MAKE_ENV+=	LOAD_PATH="-L ${PREFIX}/${EMACS_SITE_LISPDIR} -L ${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}"
+MAKE_JOBS_UNSAFE=	yes
+TEST_TARGET=	test
+
+CONFLICTS_INSTALL=	emacsql emacsql-emacs_*
+
+PORTDOCS=	README.md
+
+OPTIONS_DEFINE=	DOCS
+
+post-patch:
+	${RM} ${WRKSRC}/sqlite/sqlite3.[ch]
+	${REINPLACE_CMD} 's,%%PREFIX%%,${PREFIX},g' ${WRKSRC}/emacsql-sqlite.el
+
+do-install:
+	@${MKDIR} ${STAGEDIR}${PREFIX}/bin \
+		${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/${PORTNAME}
+	${INSTALL_PROGRAM} ${WRKSRC}/sqlite/emacsql-sqlite \
+		${STAGEDIR}${PREFIX}/bin
+	${INSTALL_DATA} ${WRKSRC}/*.el ${WRKSRC}/*.elc \
+		${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/${PORTNAME}
+
+do-install-DOCS-on:
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR}
+
+.include <bsd.port.mk>
diff --git a/databases/emacsql-devel/distinfo b/databases/emacsql-devel/distinfo
new file mode 100644
index 000000000000..944d7d47c4ee
--- /dev/null
+++ b/databases/emacsql-devel/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1707356481
+SHA256 (magit-emacsql-3.1.1-64-gfdcf447_GH0.tar.gz) = ed93b61eaca6990aab42fcf3a934ab82be3050126d624120daf4b1b9e85c7b73
+SIZE (magit-emacsql-3.1.1-64-gfdcf447_GH0.tar.gz) = 2398796
diff --git a/databases/emacsql-devel/files/patch-emacsql-sqlite.el b/databases/emacsql-devel/files/patch-emacsql-sqlite.el
new file mode 100644
index 000000000000..8ddae08ac1fe
--- /dev/null
+++ b/databases/emacsql-devel/files/patch-emacsql-sqlite.el
@@ -0,0 +1,44 @@
+--- emacsql-sqlite.el.orig	2022-02-18 15:43:25 UTC
++++ emacsql-sqlite.el
+@@ -33,16 +33,7 @@
+     "sqlite/emacsql-sqlite")
+   "Relative path to emacsql executable.")
+ 
+-(defvar emacsql-sqlite-executable
+-  (expand-file-name emacsql-sqlite-executable-path
+-                    (if (or (file-writable-p emacsql-sqlite-data-root)
+-                            (file-exists-p (expand-file-name
+-                                            emacsql-sqlite-executable-path
+-                                            emacsql-sqlite-data-root)))
+-                        emacsql-sqlite-data-root
+-                      (expand-file-name
+-                       (concat "emacsql/" emacsql-version)
+-                       user-emacs-directory)))
++(defvar emacsql-sqlite-executable "%%PREFIX%%/bin/emacsql-sqlite"
+   "Path to the EmacSQL backend (this is not the sqlite3 shell).")
+ 
+ (defvar emacsql-sqlite-reserved
+@@ -100,6 +91,7 @@ used.")
+     (emacsql-wait connection)
+     (emacsql connection [:pragma (= busy-timeout $s1)]
+              (/ (* emacsql-global-timeout 1000) 2))
++    (emacsql connection [:pragma (= foreign_keys 1)])
+     (emacsql-register connection)))
+ 
+ (cl-defun emacsql-sqlite (file &key debug)
+@@ -163,12 +155,12 @@ If called with non-nil ASYNC the return value is meani
+                       if path return it))
+          (src (expand-file-name "sqlite" emacsql-sqlite-data-root))
+          (files (mapcar (lambda (f) (expand-file-name f src))
+-                        '("sqlite3.c" "emacsql.c")))
++                        '("emacsql.c")))
+          (cflags (list (format "-I%s" src) (format "-O%d" (or o-level 2))))
+          (ldlibs (cl-case system-type
+                    (windows-nt (list))
+-                   (berkeley-unix (list "-lm"))
+-                   (otherwise (list "-lm" "-ldl"))))
++                   (berkeley-unix (list "-lm" "-lsqlite3"))
++                   (otherwise (list "-lm" "-ldl" "-lsqlite3"))))
+          (options (emacsql-sqlite-compile-switches))
+          (output (list "-o" emacsql-sqlite-executable))
+          (arguments (nconc cflags options files ldlibs output)))
diff --git a/databases/emacsql-devel/files/patch-sqlite_Makefile b/databases/emacsql-devel/files/patch-sqlite_Makefile
new file mode 100644
index 000000000000..7408786dead2
--- /dev/null
+++ b/databases/emacsql-devel/files/patch-sqlite_Makefile
@@ -0,0 +1,24 @@
+--- sqlite/Makefile.orig	2022-10-11 15:22:51 UTC
++++ sqlite/Makefile
+@@ -1,8 +1,8 @@
+ -include ../.config.mk
+ 
+ .POSIX:
+-LDLIBS = -ldl -lm
+-CFLAGS = -O2 -Wall -Wextra -Wno-implicit-fallthrough \
++LDLIBS = -lsqlite3
++CFLAGS += \
+     -DSQLITE_THREADSAFE=0 \
+     -DSQLITE_DEFAULT_FOREIGN_KEYS=1 \
+     -DSQLITE_ENABLE_FTS5 \
+@@ -12,8 +12,8 @@ CFLAGS = -O2 -Wall -Wextra -Wno-implicit-fallthrough \
+     -DSQLITE_ENABLE_JSON1 \
+     -DSQLITE_SOUNDEX
+ 
+-emacsql-sqlite: emacsql.c sqlite3.c
+-	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ emacsql.c sqlite3.c $(LDLIBS)
++emacsql-sqlite: emacsql.c
++	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ emacsql.c $(LDLIBS)
+ 
+ clean:
+ 	rm -f emacsql-sqlite
diff --git a/databases/emacsql-devel/files/patch-sqlite_emacsql.c b/databases/emacsql-devel/files/patch-sqlite_emacsql.c
new file mode 100644
index 000000000000..24590656df22
--- /dev/null
+++ b/databases/emacsql-devel/files/patch-sqlite_emacsql.c
@@ -0,0 +1,11 @@
+--- sqlite/emacsql.c.orig	2020-07-14 00:28:59 UTC
++++ sqlite/emacsql.c
+@@ -1,7 +1,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
+-#include "sqlite3.h"
++#include <sqlite3.h>
+ 
+ #define TRUE 1
+ #define FALSE 0
diff --git a/databases/emacsql-devel/pkg-descr b/databases/emacsql-devel/pkg-descr
new file mode 100644
index 000000000000..172b572e6c59
--- /dev/null
+++ b/databases/emacsql-devel/pkg-descr
@@ -0,0 +1,12 @@
+EmacSQL is a high-level Emacs Lisp front-end for SQLite (primarily),
+PostgreSQL, MySQL, and potentially other SQL databases.
+
+It works by maintaining a inferior process running (a "connection")
+for interacting with the back-end database. Connections are
+automatically cleaned up if they are garbage collected. All requests
+are synchronous.
+
+Any readable lisp value can be stored as a value in EmacSQL, including
+numbers, strings, symbols, lists, vectors, and closures. EmacSQL has
+no concept of "TEXT" values; it's all just lisp objects. The lisp
+object nil corresponds 1:1 with NULL in the database.
diff --git a/databases/emacsql-devel/pkg-plist b/databases/emacsql-devel/pkg-plist
new file mode 100644
index 000000000000..034968dd773c
--- /dev/null
+++ b/databases/emacsql-devel/pkg-plist
@@ -0,0 +1,20 @@
+bin/emacsql-sqlite
+%%EMACS_VERSION_SITE_LISPDIR%%/emacsql/emacsql-autoloads.el
+%%EMACS_VERSION_SITE_LISPDIR%%/emacsql/emacsql-compiler.el
+%%EMACS_VERSION_SITE_LISPDIR%%/emacsql/emacsql-compiler.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/emacsql/emacsql-mysql.el
+%%EMACS_VERSION_SITE_LISPDIR%%/emacsql/emacsql-mysql.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/emacsql/emacsql-pg.el
+%%EMACS_VERSION_SITE_LISPDIR%%/emacsql/emacsql-pg.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/emacsql/emacsql-psql.el
+%%EMACS_VERSION_SITE_LISPDIR%%/emacsql/emacsql-psql.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/emacsql/emacsql-sqlite-builtin.el
+%%EMACS_VERSION_SITE_LISPDIR%%/emacsql/emacsql-sqlite-builtin.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/emacsql/emacsql-sqlite-common.el
+%%EMACS_VERSION_SITE_LISPDIR%%/emacsql/emacsql-sqlite-common.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/emacsql/emacsql-sqlite-module.el
+%%EMACS_VERSION_SITE_LISPDIR%%/emacsql/emacsql-sqlite-module.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/emacsql/emacsql-sqlite.el
+%%EMACS_VERSION_SITE_LISPDIR%%/emacsql/emacsql-sqlite.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/emacsql/emacsql.el
+%%EMACS_VERSION_SITE_LISPDIR%%/emacsql/emacsql.elc
diff --git a/databases/emacsql/Makefile b/databases/emacsql/Makefile
index cbc836e55e49..4929a129c788 100644
--- a/databases/emacsql/Makefile
+++ b/databases/emacsql/Makefile
@@ -1,10 +1,15 @@
 PORTNAME=	emacsql
-DISTVERSION=	3.0.0
+DISTVERSION=	3.1.1
+PORTREVISION=	7
 CATEGORIES=	databases elisp
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
-MAINTAINER=	yasu@utahime.org
+PATCH_SITES=	https://github.com/magit/emacsql/commit/
+PATCHFILES=	3cec7dcb201568a09ee9cebf0ea1e43cba9d334a.patch:-p1
+
+MAINTAINER=	yasu@FreeBSD.org
 COMMENT=	High-level Emacs Lisp RDBMS front-end
+WWW=		https://github.com/magit/emacsql
 
 LICENSE=	UNLICENSE
 LICENSE_FILE=	${WRKSRC}/UNLICENSE
@@ -13,14 +18,16 @@ BUILD_DEPENDS=	pg.el${EMACS_PKGNAMESUFFIX}>=0.13:databases/pg.el@${EMACS_FLAVOR}
 LIB_DEPENDS=	libsqlite3.so:databases/sqlite3
 RUN_DEPENDS=	pg.el${EMACS_PKGNAMESUFFIX}>=0.13:databases/pg.el@${EMACS_FLAVOR}
 
-USES=		emacs localbase:ldflags
+USES=		emacs gmake localbase:ldflags
 
 USE_GITHUB=	yes
-GH_ACCOUNT=	skeeto
+GH_ACCOUNT=	magit
 
 MAKE_ENV+=	LOAD_PATH="-L ${PREFIX}/${EMACS_SITE_LISPDIR} -L ${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}"
-ALL_TARGET=	binary compile
-TEST_TARGET=	check
+MAKE_JOBS_UNSAFE=	yes
+TEST_TARGET=	test
+
+CONFLICTS_INSTALL=	emacsql emacsql-devel* emacsql-emacs_*
 
 PORTDOCS=	README.md
 
diff --git a/databases/emacsql/distinfo b/databases/emacsql/distinfo
index 6322881961df..d8772162e169 100644
--- a/databases/emacsql/distinfo
+++ b/databases/emacsql/distinfo
@@ -1,3 +1,5 @@
-TIMESTAMP = 1621390677
-SHA256 (skeeto-emacsql-3.0.0_GH0.tar.gz) = 9d94be00518591c68cb0ed1de9dab885e35079f581fb0ae52af5af139a0f1088
-SIZE (skeeto-emacsql-3.0.0_GH0.tar.gz) = 2055251
+TIMESTAMP = 1674094021
+SHA256 (magit-emacsql-3.1.1_GH0.tar.gz) = 82620a6e3a4e9d56047e9b099e1c3070a5a6aa6828ccde4fb7c3f262a11803f1
+SIZE (magit-emacsql-3.1.1_GH0.tar.gz) = 2392710
+SHA256 (3cec7dcb201568a09ee9cebf0ea1e43cba9d334a.patch) = 488199703bcb8238742eb60583b815051c8d72d19513bf01093713d24bed34a5
+SIZE (3cec7dcb201568a09ee9cebf0ea1e43cba9d334a.patch) = 2164
diff --git a/databases/emacsql/files/patch-Makefile b/databases/emacsql/files/patch-Makefile
deleted file mode 100644
index f3ffc1349e85..000000000000
--- a/databases/emacsql/files/patch-Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
---- Makefile.orig	2021-05-17 18:22:23 UTC
-+++ Makefile
-@@ -7,8 +7,7 @@
- .POSIX:
- .SUFFIXES: .el .elc
- EMACS   = emacs
--LDFLAGS = -L ../pg
--BATCH   = $(EMACS) -batch -Q -L . -L tests $(LDFLAGS)
-+BATCH   = $(EMACS) -batch -Q -L . -L tests $(LOAD_PATH)
- 
- EL = emacsql-compiler.el \
-      emacsql.el \
diff --git a/databases/emacsql/files/patch-emacsql-sqlite.el b/databases/emacsql/files/patch-emacsql-sqlite.el
index 9c5d57f9e324..8ddae08ac1fe 100644
--- a/databases/emacsql/files/patch-emacsql-sqlite.el
+++ b/databases/emacsql/files/patch-emacsql-sqlite.el
@@ -1,19 +1,24 @@
---- emacsql-sqlite.el.orig	2018-10-31 17:50:07 UTC
+--- emacsql-sqlite.el.orig	2022-02-18 15:43:25 UTC
 +++ emacsql-sqlite.el
-@@ -27,11 +27,7 @@
-   (file-name-directory (or load-file-name buffer-file-name))
-   "Directory where EmacSQL is installed.")
+@@ -33,16 +33,7 @@
+     "sqlite/emacsql-sqlite")
+   "Relative path to emacsql executable.")
  
 -(defvar emacsql-sqlite-executable
--  (expand-file-name (if (memq system-type '(windows-nt cygwin ms-dos))
--                        "sqlite/emacsql-sqlite.exe"
--                      "sqlite/emacsql-sqlite")
--                    emacsql-sqlite-data-root)
+-  (expand-file-name emacsql-sqlite-executable-path
+-                    (if (or (file-writable-p emacsql-sqlite-data-root)
+-                            (file-exists-p (expand-file-name
+-                                            emacsql-sqlite-executable-path
+-                                            emacsql-sqlite-data-root)))
+-                        emacsql-sqlite-data-root
+-                      (expand-file-name
+-                       (concat "emacsql/" emacsql-version)
+-                       user-emacs-directory)))
 +(defvar emacsql-sqlite-executable "%%PREFIX%%/bin/emacsql-sqlite"
    "Path to the EmacSQL backend (this is not the sqlite3 shell).")
  
  (defvar emacsql-sqlite-reserved
-@@ -82,6 +78,7 @@ http://www.sqlite.org/lang_keywords.html")
+@@ -100,6 +91,7 @@ used.")
      (emacsql-wait connection)
      (emacsql connection [:pragma (= busy-timeout $s1)]
               (/ (* emacsql-global-timeout 1000) 2))
@@ -21,18 +26,19 @@
      (emacsql-register connection)))
  
  (cl-defun emacsql-sqlite (file &key debug)
-@@ -143,11 +140,11 @@ If called with non-nil ASYNC the return value is meani
-   (let* ((cc (executable-find "cc"))
+@@ -163,12 +155,12 @@ If called with non-nil ASYNC the return value is meani
+                       if path return it))
           (src (expand-file-name "sqlite" emacsql-sqlite-data-root))
           (files (mapcar (lambda (f) (expand-file-name f src))
 -                        '("sqlite3.c" "emacsql.c")))
 +                        '("emacsql.c")))
           (cflags (list (format "-I%s" src) (format "-O%d" (or o-level 2))))
-          (ldlibs (if (memq system-type '(windows-nt berkeley-unix))
--                     (list "-lm")
--                   (list "-lm" "-ldl")))
-+                     (list "-lm" "-lsqlite3")
-+                   (list "-lm" "-ldl" "-lsqlite3")))
+          (ldlibs (cl-case system-type
+                    (windows-nt (list))
+-                   (berkeley-unix (list "-lm"))
+-                   (otherwise (list "-lm" "-ldl"))))
++                   (berkeley-unix (list "-lm" "-lsqlite3"))
++                   (otherwise (list "-lm" "-ldl" "-lsqlite3"))))
           (options (emacsql-sqlite-compile-switches))
           (output (list "-o" emacsql-sqlite-executable))
           (arguments (nconc cflags options files ldlibs output)))
diff --git a/databases/emacsql/files/patch-sqlite_Makefile b/databases/emacsql/files/patch-sqlite_Makefile
index 463df817ee70..7408786dead2 100644
--- a/databases/emacsql/files/patch-sqlite_Makefile
+++ b/databases/emacsql/files/patch-sqlite_Makefile
@@ -1,15 +1,17 @@
---- sqlite/Makefile.orig	2020-07-14 00:28:59 UTC
+--- sqlite/Makefile.orig	2022-10-11 15:22:51 UTC
 +++ sqlite/Makefile
-@@ -1,6 +1,6 @@
+@@ -1,8 +1,8 @@
+ -include ../.config.mk
+ 
  .POSIX:
 -LDLIBS = -ldl -lm
--CFLAGS = -O2 -Wall -Wextra \
+-CFLAGS = -O2 -Wall -Wextra -Wno-implicit-fallthrough \
 +LDLIBS = -lsqlite3
 +CFLAGS += \
      -DSQLITE_THREADSAFE=0 \
      -DSQLITE_DEFAULT_FOREIGN_KEYS=1 \
      -DSQLITE_ENABLE_FTS5 \
-@@ -10,8 +10,8 @@ CFLAGS = -O2 -Wall -Wextra \
+@@ -12,8 +12,8 @@ CFLAGS = -O2 -Wall -Wextra -Wno-implicit-fallthrough \
      -DSQLITE_ENABLE_JSON1 \
      -DSQLITE_SOUNDEX
  
diff --git a/databases/emacsql/pkg-descr b/databases/emacsql/pkg-descr
index a5076f716a34..172b572e6c59 100644
--- a/databases/emacsql/pkg-descr
+++ b/databases/emacsql/pkg-descr
@@ -10,5 +10,3 @@ Any readable lisp value can be stored as a value in EmacSQL, including
 numbers, strings, symbols, lists, vectors, and closures. EmacSQL has
 no concept of "TEXT" values; it's all just lisp objects. The lisp
 object nil corresponds 1:1 with NULL in the database.
-
-WWW: https://github.com/skeeto/emacsql
diff --git a/databases/emacsql/pkg-plist b/databases/emacsql/pkg-plist
index c80325c828a1..afdd54299bac 100644
--- a/databases/emacsql/pkg-plist
+++ b/databases/emacsql/pkg-plist
@@ -1,4 +1,5 @@
 bin/emacsql-sqlite
+%%EMACS_VERSION_SITE_LISPDIR%%/emacsql/emacsql-autoloads.el
 %%EMACS_VERSION_SITE_LISPDIR%%/emacsql/emacsql-compiler.el
 %%EMACS_VERSION_SITE_LISPDIR%%/emacsql/emacsql-compiler.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/emacsql/emacsql-mysql.el
diff --git a/databases/erlang-couchbeam/Makefile b/databases/erlang-couchbeam/Makefile
deleted file mode 100644
index 7d67af4a8050..000000000000
--- a/databases/erlang-couchbeam/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-PORTNAME=	couchbeam
-PORTVERSION=	1.4.2
-CATEGORIES=	databases
-PKGNAMEPREFIX=	erlang-
-
-MAINTAINER=	erlang@FreeBSD.org
-COMMENT=	Apache CouchDB client in Erlang
-
-LICENSE=	MIT
-
-USES=		erlang:rebar
-USE_GITHUB=	yes
-GH_ACCOUNT=	benoitc
-
-ERL_BUILD_DEPS=	devel/erlang-jsx \
-		www/erlang-hackney
-ERL_RUN_DEPS:=  ${ERL_BUILD_DEPS}
-
-OPTIONS_DEFINE=	DOCS
-
-.include <bsd.port.mk>
diff --git a/databases/erlang-couchbeam/distinfo b/databases/erlang-couchbeam/distinfo
deleted file mode 100644
index 653d2c1bef26..000000000000
--- a/databases/erlang-couchbeam/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1483568148
-SHA256 (benoitc-couchbeam-1.4.2_GH0.tar.gz) = 8656ef3cd666b1186bdeb2cd3b6ce8c0cbb93988a89fb001de706bec09cb1cdf
-SIZE (benoitc-couchbeam-1.4.2_GH0.tar.gz) = 1110228
diff --git a/databases/erlang-couchbeam/files/patch-rebar.config b/databases/erlang-couchbeam/files/patch-rebar.config
deleted file mode 100644
index aca1c26ec1af..000000000000
--- a/databases/erlang-couchbeam/files/patch-rebar.config
+++ /dev/null
@@ -1,11 +0,0 @@
---- rebar.config.orig	2016-12-22 20:31:28 UTC
-+++ rebar.config
-@@ -3,8 +3,6 @@
- {erl_opts, [debug_info]}.
- 
- {deps, [
--    {jsx, "2.8.0"},
--    {hackney, "1.6.4"}
- ]}.
- 
- 
diff --git a/databases/erlang-couchbeam/files/patch-rebar.config.script b/databases/erlang-couchbeam/files/patch-rebar.config.script
deleted file mode 100644
index 94c75b9cd7f5..000000000000
--- a/databases/erlang-couchbeam/files/patch-rebar.config.script
+++ /dev/null
@@ -1,14 +0,0 @@
---- rebar.config.script.orig	2016-12-22 20:31:28 UTC
-+++ rebar.config.script
-@@ -1,11 +1,6 @@
- IsRebar3 = erlang:function_exported(rebar3, main, 1),
- 
- Rebar2Deps = [
--    {jsx, ".*", {git, "https://github.com/talentdeficit/jsx.git",
--                 {tag,"2.8.0"}}},
--
--    {hackney, ".*", {git, "https://github.com/benoitc/hackney.git",
--                     {tag, "1.6.4"}}}
- ],
- 
- case IsRebar3 of
diff --git a/databases/erlang-couchbeam/pkg-descr b/databases/erlang-couchbeam/pkg-descr
deleted file mode 100644
index 198ed562dcb2..000000000000
--- a/databases/erlang-couchbeam/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-Simple Barrel and Apache CouchDB client library for Erlang applications.
-
-WWW: https://github.com/benoitc/couchbeam
diff --git a/databases/erlang-couchbeam/pkg-plist b/databases/erlang-couchbeam/pkg-plist
deleted file mode 100644
index d937a4817504..000000000000
--- a/databases/erlang-couchbeam/pkg-plist
+++ /dev/null
@@ -1,36 +0,0 @@
-lib/erlang/lib/couchbeam-%%VERSION%%/ebin/couchbeam.app
-lib/erlang/lib/couchbeam-%%VERSION%%/ebin/couchbeam.beam
-lib/erlang/lib/couchbeam-%%VERSION%%/ebin/couchbeam_app.beam
-lib/erlang/lib/couchbeam-%%VERSION%%/ebin/couchbeam_attachments.beam
-lib/erlang/lib/couchbeam-%%VERSION%%/ebin/couchbeam_changes.beam
-lib/erlang/lib/couchbeam-%%VERSION%%/ebin/couchbeam_changes_stream.beam
-lib/erlang/lib/couchbeam-%%VERSION%%/ebin/couchbeam_changes_sup.beam
-lib/erlang/lib/couchbeam-%%VERSION%%/ebin/couchbeam_doc.beam
-lib/erlang/lib/couchbeam-%%VERSION%%/ebin/couchbeam_ejson.beam
-lib/erlang/lib/couchbeam-%%VERSION%%/ebin/couchbeam_httpc.beam
-lib/erlang/lib/couchbeam-%%VERSION%%/ebin/couchbeam_sup.beam
-lib/erlang/lib/couchbeam-%%VERSION%%/ebin/couchbeam_util.beam
-lib/erlang/lib/couchbeam-%%VERSION%%/ebin/couchbeam_uuids.beam
-lib/erlang/lib/couchbeam-%%VERSION%%/ebin/couchbeam_view.beam
-lib/erlang/lib/couchbeam-%%VERSION%%/ebin/couchbeam_view_stream.beam
-lib/erlang/lib/couchbeam-%%VERSION%%/ebin/couchbeam_view_sup.beam
-lib/erlang/lib/couchbeam-%%VERSION%%/ebin/gen_changes.beam
-lib/erlang/lib/couchbeam-%%VERSION%%/include/couchbeam.hrl
-lib/erlang/lib/couchbeam-%%VERSION%%/src/couchbeam.app.src
-lib/erlang/lib/couchbeam-%%VERSION%%/src/couchbeam.erl
-lib/erlang/lib/couchbeam-%%VERSION%%/src/couchbeam_app.erl
-lib/erlang/lib/couchbeam-%%VERSION%%/src/couchbeam_attachments.erl
-lib/erlang/lib/couchbeam-%%VERSION%%/src/couchbeam_changes.erl
-lib/erlang/lib/couchbeam-%%VERSION%%/src/couchbeam_changes_stream.erl
-lib/erlang/lib/couchbeam-%%VERSION%%/src/couchbeam_changes_sup.erl
-lib/erlang/lib/couchbeam-%%VERSION%%/src/couchbeam_doc.erl
-lib/erlang/lib/couchbeam-%%VERSION%%/src/couchbeam_ejson.erl
-lib/erlang/lib/couchbeam-%%VERSION%%/src/couchbeam_httpc.erl
-lib/erlang/lib/couchbeam-%%VERSION%%/src/couchbeam_sup.erl
-lib/erlang/lib/couchbeam-%%VERSION%%/src/couchbeam_util.erl
-lib/erlang/lib/couchbeam-%%VERSION%%/src/couchbeam_uuids.erl
-lib/erlang/lib/couchbeam-%%VERSION%%/src/couchbeam_view.erl
-lib/erlang/lib/couchbeam-%%VERSION%%/src/couchbeam_view_stream.erl
-lib/erlang/lib/couchbeam-%%VERSION%%/src/couchbeam_view_sup.erl
-lib/erlang/lib/couchbeam-%%VERSION%%/src/gen_changes.erl
-%%PORTDOCS%%%%DOCSDIR%%/README.md
diff --git a/databases/erlang-epgsql/Makefile b/databases/erlang-epgsql/Makefile
deleted file mode 100644
index 588b130a9068..000000000000
--- a/databases/erlang-epgsql/Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
-PORTNAME=	epgsql
-PORTVERSION=	4.1.0
-CATEGORIES=	databases
-PKGNAMEPREFIX=	erlang-
-
-MAINTAINER=	erlang@FreeBSD.org
-COMMENT=	Erlang PostgreSQL Database Client
-
-LICENSE=	BSD3CLAUSE
-
-USES=		erlang:rebar3
-USE_GITHUB=	yes
-
-OPTIONS_DEFINE=	DOCS
-
-.include <bsd.port.mk>
diff --git a/databases/erlang-epgsql/distinfo b/databases/erlang-epgsql/distinfo
deleted file mode 100644
index 236f333a3949..000000000000
--- a/databases/erlang-epgsql/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1530990701
-SHA256 (epgsql-epgsql-4.1.0_GH0.tar.gz) = f6e01b26367846d2bca1c7f24205ed548bb2a5e97d0d06f7a66af4abad981970
-SIZE (epgsql-epgsql-4.1.0_GH0.tar.gz) = 80293
diff --git a/databases/erlang-epgsql/pkg-descr b/databases/erlang-epgsql/pkg-descr
deleted file mode 100644
index b0ee9081eef5..000000000000
--- a/databases/erlang-epgsql/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-A PostgreSQL client library written in Erlang.
-
-WWW: https://github.com/wg/epgsql
diff --git a/databases/erlang-epgsql/pkg-plist b/databases/erlang-epgsql/pkg-plist
deleted file mode 100644
index ac4c6ca3f965..000000000000
--- a/databases/erlang-epgsql/pkg-plist
+++ /dev/null
@@ -1,91 +0,0 @@
-lib/erlang/lib/epgsql-%%VERSION%%/ebin/epgsql.app
-lib/erlang/lib/epgsql-%%VERSION%%/ebin/epgsql.beam
-lib/erlang/lib/epgsql-%%VERSION%%/ebin/epgsql_binary.beam
-lib/erlang/lib/epgsql-%%VERSION%%/ebin/epgsql_cmd_batch.beam
-lib/erlang/lib/epgsql-%%VERSION%%/ebin/epgsql_cmd_bind.beam
-lib/erlang/lib/epgsql-%%VERSION%%/ebin/epgsql_cmd_close.beam
-lib/erlang/lib/epgsql-%%VERSION%%/ebin/epgsql_cmd_connect.beam
-lib/erlang/lib/epgsql-%%VERSION%%/ebin/epgsql_cmd_describe_portal.beam
-lib/erlang/lib/epgsql-%%VERSION%%/ebin/epgsql_cmd_describe_statement.beam
-lib/erlang/lib/epgsql-%%VERSION%%/ebin/epgsql_cmd_equery.beam
-lib/erlang/lib/epgsql-%%VERSION%%/ebin/epgsql_cmd_execute.beam
-lib/erlang/lib/epgsql-%%VERSION%%/ebin/epgsql_cmd_parse.beam
-lib/erlang/lib/epgsql-%%VERSION%%/ebin/epgsql_cmd_prepared_query.beam
-lib/erlang/lib/epgsql-%%VERSION%%/ebin/epgsql_cmd_squery.beam
-lib/erlang/lib/epgsql-%%VERSION%%/ebin/epgsql_cmd_start_replication.beam
-lib/erlang/lib/epgsql-%%VERSION%%/ebin/epgsql_cmd_sync.beam
-lib/erlang/lib/epgsql-%%VERSION%%/ebin/epgsql_cmd_update_type_cache.beam
-lib/erlang/lib/epgsql-%%VERSION%%/ebin/epgsql_codec.beam
-lib/erlang/lib/epgsql-%%VERSION%%/ebin/epgsql_codec_boolean.beam
-lib/erlang/lib/epgsql-%%VERSION%%/ebin/epgsql_codec_bpchar.beam
-lib/erlang/lib/epgsql-%%VERSION%%/ebin/epgsql_codec_datetime.beam
-lib/erlang/lib/epgsql-%%VERSION%%/ebin/epgsql_codec_float.beam
-lib/erlang/lib/epgsql-%%VERSION%%/ebin/epgsql_codec_geometric.beam
-lib/erlang/lib/epgsql-%%VERSION%%/ebin/epgsql_codec_hstore.beam
-lib/erlang/lib/epgsql-%%VERSION%%/ebin/epgsql_codec_integer.beam
-lib/erlang/lib/epgsql-%%VERSION%%/ebin/epgsql_codec_intrange.beam
-lib/erlang/lib/epgsql-%%VERSION%%/ebin/epgsql_codec_json.beam
-lib/erlang/lib/epgsql-%%VERSION%%/ebin/epgsql_codec_net.beam
-lib/erlang/lib/epgsql-%%VERSION%%/ebin/epgsql_codec_noop.beam
-lib/erlang/lib/epgsql-%%VERSION%%/ebin/epgsql_codec_postgis.beam
-lib/erlang/lib/epgsql-%%VERSION%%/ebin/epgsql_codec_text.beam
-lib/erlang/lib/epgsql-%%VERSION%%/ebin/epgsql_codec_uuid.beam
-lib/erlang/lib/epgsql-%%VERSION%%/ebin/epgsql_command.beam
-lib/erlang/lib/epgsql-%%VERSION%%/ebin/epgsql_errcodes.beam
-lib/erlang/lib/epgsql-%%VERSION%%/ebin/epgsql_fdatetime.beam
-lib/erlang/lib/epgsql-%%VERSION%%/ebin/epgsql_idatetime.beam
-lib/erlang/lib/epgsql-%%VERSION%%/ebin/epgsql_oid_db.beam
-lib/erlang/lib/epgsql-%%VERSION%%/ebin/epgsql_scram.beam
-lib/erlang/lib/epgsql-%%VERSION%%/ebin/epgsql_sock.beam
-lib/erlang/lib/epgsql-%%VERSION%%/ebin/epgsql_wire.beam
-lib/erlang/lib/epgsql-%%VERSION%%/ebin/epgsqla.beam
-lib/erlang/lib/epgsql-%%VERSION%%/ebin/epgsqli.beam
-lib/erlang/lib/epgsql-%%VERSION%%/ebin/ewkb.beam
-lib/erlang/lib/epgsql-%%VERSION%%/include/epgsql.hrl
-lib/erlang/lib/epgsql-%%VERSION%%/include/epgsql_geometry.hrl
-lib/erlang/lib/epgsql-%%VERSION%%/include/protocol.hrl
-lib/erlang/lib/epgsql-%%VERSION%%/src/commands/epgsql_cmd_batch.erl
-lib/erlang/lib/epgsql-%%VERSION%%/src/commands/epgsql_cmd_bind.erl
-lib/erlang/lib/epgsql-%%VERSION%%/src/commands/epgsql_cmd_close.erl
-lib/erlang/lib/epgsql-%%VERSION%%/src/commands/epgsql_cmd_connect.erl
-lib/erlang/lib/epgsql-%%VERSION%%/src/commands/epgsql_cmd_describe_portal.erl
-lib/erlang/lib/epgsql-%%VERSION%%/src/commands/epgsql_cmd_describe_statement.erl
-lib/erlang/lib/epgsql-%%VERSION%%/src/commands/epgsql_cmd_equery.erl
-lib/erlang/lib/epgsql-%%VERSION%%/src/commands/epgsql_cmd_execute.erl
-lib/erlang/lib/epgsql-%%VERSION%%/src/commands/epgsql_cmd_parse.erl
-lib/erlang/lib/epgsql-%%VERSION%%/src/commands/epgsql_cmd_prepared_query.erl
-lib/erlang/lib/epgsql-%%VERSION%%/src/commands/epgsql_cmd_squery.erl
-lib/erlang/lib/epgsql-%%VERSION%%/src/commands/epgsql_cmd_start_replication.erl
-lib/erlang/lib/epgsql-%%VERSION%%/src/commands/epgsql_cmd_sync.erl
-lib/erlang/lib/epgsql-%%VERSION%%/src/commands/epgsql_cmd_update_type_cache.erl
-lib/erlang/lib/epgsql-%%VERSION%%/src/datatypes/epgsql_codec_boolean.erl
-lib/erlang/lib/epgsql-%%VERSION%%/src/datatypes/epgsql_codec_bpchar.erl
-lib/erlang/lib/epgsql-%%VERSION%%/src/datatypes/epgsql_codec_datetime.erl
-lib/erlang/lib/epgsql-%%VERSION%%/src/datatypes/epgsql_codec_float.erl
-lib/erlang/lib/epgsql-%%VERSION%%/src/datatypes/epgsql_codec_geometric.erl
-lib/erlang/lib/epgsql-%%VERSION%%/src/datatypes/epgsql_codec_hstore.erl
-lib/erlang/lib/epgsql-%%VERSION%%/src/datatypes/epgsql_codec_integer.erl
-lib/erlang/lib/epgsql-%%VERSION%%/src/datatypes/epgsql_codec_intrange.erl
-lib/erlang/lib/epgsql-%%VERSION%%/src/datatypes/epgsql_codec_json.erl
-lib/erlang/lib/epgsql-%%VERSION%%/src/datatypes/epgsql_codec_net.erl
-lib/erlang/lib/epgsql-%%VERSION%%/src/datatypes/epgsql_codec_noop.erl
-lib/erlang/lib/epgsql-%%VERSION%%/src/datatypes/epgsql_codec_postgis.erl
-lib/erlang/lib/epgsql-%%VERSION%%/src/datatypes/epgsql_codec_text.erl
-lib/erlang/lib/epgsql-%%VERSION%%/src/datatypes/epgsql_codec_uuid.erl
-lib/erlang/lib/epgsql-%%VERSION%%/src/epgsql.app.src
-lib/erlang/lib/epgsql-%%VERSION%%/src/epgsql.erl
-lib/erlang/lib/epgsql-%%VERSION%%/src/epgsql_binary.erl
-lib/erlang/lib/epgsql-%%VERSION%%/src/epgsql_codec.erl
-lib/erlang/lib/epgsql-%%VERSION%%/src/epgsql_command.erl
-lib/erlang/lib/epgsql-%%VERSION%%/src/epgsql_errcodes.erl
-lib/erlang/lib/epgsql-%%VERSION%%/src/epgsql_fdatetime.erl
-lib/erlang/lib/epgsql-%%VERSION%%/src/epgsql_idatetime.erl
-lib/erlang/lib/epgsql-%%VERSION%%/src/epgsql_oid_db.erl
-lib/erlang/lib/epgsql-%%VERSION%%/src/epgsql_replication.hrl
-lib/erlang/lib/epgsql-%%VERSION%%/src/epgsql_scram.erl
-lib/erlang/lib/epgsql-%%VERSION%%/src/epgsql_sock.erl
-lib/erlang/lib/epgsql-%%VERSION%%/src/epgsql_wire.erl
-lib/erlang/lib/epgsql-%%VERSION%%/src/epgsqla.erl
-lib/erlang/lib/epgsql-%%VERSION%%/src/epgsqli.erl
-lib/erlang/lib/epgsql-%%VERSION%%/src/ewkb.erl
-%%PORTDOCS%%%%DOCSDIR%%/README.md
diff --git a/databases/erlang-eredis/Makefile b/databases/erlang-eredis/Makefile
deleted file mode 100644
index 25a38665ab06..000000000000
--- a/databases/erlang-eredis/Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-PORTNAME=	eredis
-PORTVERSION=	1.1.0
-DISTVERSIONPREFIX=	v
-CATEGORIES=	databases
-PKGNAMEPREFIX=	erlang-
-
-MAINTAINER=	erlang@FreeBSD.org
-COMMENT=	Non-blocking Redis client for Erlang
-
-LICENSE=	MIT
-
-USES=		erlang:rebar
-USE_GITHUB=	yes
-GH_ACCOUNT=	wooga
-
-OPTIONS_DEFINE=	DOCS
-
-.include <bsd.port.mk>
diff --git a/databases/erlang-eredis/distinfo b/databases/erlang-eredis/distinfo
deleted file mode 100644
index 09bf8200679f..000000000000
--- a/databases/erlang-eredis/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1503995111
-SHA256 (wooga-eredis-v1.1.0_GH0.tar.gz) = 85557666315eac3c11baec37063a5d9f83057d9da8f99a5f6487584b0cb4ef6a
-SIZE (wooga-eredis-v1.1.0_GH0.tar.gz) = 28173
diff --git a/databases/erlang-eredis/files/patch-include_eredis.hrl b/databases/erlang-eredis/files/patch-include_eredis.hrl
deleted file mode 100644
index 6a31593f9c89..000000000000
--- a/databases/erlang-eredis/files/patch-include_eredis.hrl
+++ /dev/null
@@ -1,14 +0,0 @@
---- include/eredis.hrl.orig	2015-06-24 19:38:51 UTC
-+++ include/eredis.hrl
-@@ -18,11 +18,7 @@
- -type parser_state() :: status_continue | bulk_continue | multibulk_continue.
- 
- %% Internal types
---ifdef(namespaced_types).
- -type eredis_queue() :: queue:queue().
---else.
---type eredis_queue() :: queue().
---endif.
- 
- %% Internal parser state. Is returned from parse/2 and must be
- %% included on the next calls to parse/2.
diff --git a/databases/erlang-eredis/pkg-descr b/databases/erlang-eredis/pkg-descr
deleted file mode 100644
index 74335b50267c..000000000000
--- a/databases/erlang-eredis/pkg-descr
+++ /dev/null
@@ -1,12 +0,0 @@
-Non-blocking Redis client for Erlang with focus on performance and
-robustness.
-
-Supported Redis features:
-
-  - Any command, through eredis:q/2
-  - Transactions
-  - Pipelining
-  - Authentication & multiple dbs
-  - Pubsub
-
-WWW: https://github.com/wooga/eredis
diff --git a/databases/erlang-eredis/pkg-plist b/databases/erlang-eredis/pkg-plist
deleted file mode 100644
index 222ab72d4e5a..000000000000
--- a/databases/erlang-eredis/pkg-plist
+++ /dev/null
@@ -1,22 +0,0 @@
-lib/erlang/lib/eredis-%%VERSION%%/ebin/basho_bench_driver_eredis.beam
-lib/erlang/lib/eredis-%%VERSION%%/ebin/basho_bench_driver_erldis.beam
-lib/erlang/lib/eredis-%%VERSION%%/ebin/eredis.app
-lib/erlang/lib/eredis-%%VERSION%%/ebin/eredis.beam
-lib/erlang/lib/eredis-%%VERSION%%/ebin/eredis_client.beam
-lib/erlang/lib/eredis-%%VERSION%%/ebin/eredis_parser.beam
-lib/erlang/lib/eredis-%%VERSION%%/ebin/eredis_sub.beam
-lib/erlang/lib/eredis-%%VERSION%%/ebin/eredis_sub_client.beam
-lib/erlang/lib/eredis-%%VERSION%%/include/eredis.hrl
-lib/erlang/lib/eredis-%%VERSION%%/include/eredis_sub.hrl
-lib/erlang/lib/eredis-%%VERSION%%/priv/basho_bench_eredis.config
-lib/erlang/lib/eredis-%%VERSION%%/priv/basho_bench_eredis_pipeline.config
-lib/erlang/lib/eredis-%%VERSION%%/priv/basho_bench_erldis.config
-lib/erlang/lib/eredis-%%VERSION%%/src/basho_bench_driver_eredis.erl
-lib/erlang/lib/eredis-%%VERSION%%/src/basho_bench_driver_erldis.erl
-lib/erlang/lib/eredis-%%VERSION%%/src/eredis.app.src
-lib/erlang/lib/eredis-%%VERSION%%/src/eredis.erl
-lib/erlang/lib/eredis-%%VERSION%%/src/eredis_client.erl
-lib/erlang/lib/eredis-%%VERSION%%/src/eredis_parser.erl
-lib/erlang/lib/eredis-%%VERSION%%/src/eredis_sub.erl
-lib/erlang/lib/eredis-%%VERSION%%/src/eredis_sub_client.erl
-%%PORTDOCS%%%%DOCSDIR%%/README.md
diff --git a/databases/erlfdb/Makefile b/databases/erlfdb/Makefile
index 87d15dc30f7d..20c31d696d42 100644
--- a/databases/erlfdb/Makefile
+++ b/databases/erlfdb/Makefile
@@ -1,16 +1,17 @@
 PORTNAME=	erlfdb
+PORTVERSION=	1.3.6
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.3.4
 CATEGORIES=	databases
 
 MAINTAINER=	dch@FreeBSD.org
 COMMENT=	FoundationDB client in Erlang via FDB C bindings
+WWW=		https://github.com/apache/couchdb-erlfdb
 
 LICENSE=	APACHE20
 
 LIB_DEPENDS=	libfdb_c.so:databases/foundationdb
 
-USES=		erlang:rebar
+USES=		erlang:rebar3,enc
 USE_GITHUB=	yes
 GH_ACCOUNT=	apache
 GH_PROJECT=	couchdb-${PORTNAME}
diff --git a/databases/erlfdb/distinfo b/databases/erlfdb/distinfo
index e9137ba75afc..d9f9637006c3 100644
--- a/databases/erlfdb/distinfo
+++ b/databases/erlfdb/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1619172459
-SHA256 (apache-couchdb-erlfdb-v1.3.4_GH0.tar.gz) = 11a23e544048ccd3ddb655f79c556dcc6810d4d053d4496fba45047ebd39c737
-SIZE (apache-couchdb-erlfdb-v1.3.4_GH0.tar.gz) = 73976
+TIMESTAMP = 1699721252
+SHA256 (apache-couchdb-erlfdb-v1.3.6_GH0.tar.gz) = 1b3ee4c52c970a6429d8a78070caabcad89ce69beb8e24d967966e5e25d7e100
+SIZE (apache-couchdb-erlfdb-v1.3.6_GH0.tar.gz) = 53238
diff --git a/databases/erlfdb/files/patch-rebar.config b/databases/erlfdb/files/patch-rebar.config
new file mode 100644
index 000000000000..7360225fb8b4
--- /dev/null
+++ b/databases/erlfdb/files/patch-rebar.config
@@ -0,0 +1,23 @@
+--- rebar.config.orig	2022-01-25 23:33:52 UTC
++++ rebar.config
+@@ -1,18 +1,5 @@
+-{plugins, [
+-    coveralls,
+-    pc
+-]}.
+-
+-{project_plugins, [
+-    erlfmt
+-]}.
+-
+-{provider_hooks, [
+-    {pre, [
+-        {compile, {pc, compile}},
+-        {clean, {pc, clean}}
+-    ]}
+-]}.
++{pre_hooks, [{"", compile, "enc compile"}]}.
++{post_hooks, [{"", clean,  "enc clean"}]}.
+ 
+ {port_specs, [
+     {"priv/erlfdb_nif.so", ["c_src/*.c"]}
diff --git a/databases/erlfdb/pkg-descr b/databases/erlfdb/pkg-descr
index 1a2a28fb4ef9..9ca8987304ef 100644
--- a/databases/erlfdb/pkg-descr
+++ b/databases/erlfdb/pkg-descr
@@ -1,5 +1,3 @@
 FoundationDB native Erlang bindings, a NIF wrapper for the FoundationDB
 C API, this project also provides a conforming implementation of the
 Tuple and Directory layers.
-
-WWW: https://github.com/apache/couchdb-erlfdb
diff --git a/databases/evolution-data-server/Makefile b/databases/evolution-data-server/Makefile
index 6936a13f5284..e56f1c5cd37e 100644
--- a/databases/evolution-data-server/Makefile
+++ b/databases/evolution-data-server/Makefile
@@ -1,23 +1,23 @@
-# Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
-
 PORTNAME=	evolution-data-server
-DISTVERSION=	3.40.4
+DISTVERSION=	3.44.4
+PORTREVISION=	7
 CATEGORIES=	databases gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Data backends for the Evolution integrated mail/PIM suite
+WWW=		https://wiki.gnome.org/Apps/Evolution
 
 LICENSE=	LGPL20
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	vapigen:lang/vala
 LIB_DEPENDS=	libsoup-2.4.so:devel/libsoup \
 		libfribidi.so:converters/fribidi \
 		libgcr-base-3.so:security/gcr \
 		libgoa-1.0.so:net/gnome-online-accounts \
 		libgdata.so:devel/libgdata \
+		libharfbuzz.so:print/harfbuzz \
 		libical.so:devel/libical \
 		libnss3.so:security/nss \
 		libicudata.so:devel/icu \
@@ -32,15 +32,15 @@ LIB_DEPENDS=	libsoup-2.4.so:devel/libsoup \
 PORTSCOUT=	limitw:1,even
 
 USES=		bdb:5 cmake compiler:c++11-lib cpe gettext gnome gperf \
-		iconv localbase pathfix pkgconfig python:3.6+,build\
-		sqlite tar:xz
+		iconv:wchar_t localbase pathfix pkgconfig python:build\
+		sqlite tar:xz xorg
 USE_CXXSTD=	gnu++11
 USE_GNOME=	cairo gdkpixbuf2 gtk30 intltool introspection:build libxml2
+USE_XORG=	x11
 USE_LDCONFIG=	yes
 CPE_VENDOR=	gnome
 
-CMAKE_ARGS=	-DENABLE_VALA_BINDINGS=ON \
-		-DENABLE_INTROSPECTION=ON \
+CMAKE_ARGS=	-DENABLE_INTROSPECTION=ON \
 		-DENABLE_UOA=OFF
 
 CMAKE_ARGS+=	-DWITH_LIBDB_CFLAGS=-I${LOCALBASE}/include/db5 \
@@ -56,8 +56,8 @@ GLIB_SCHEMAS=	org.gnome.evolution-data-server.addressbook.gschema.xml \
 PLIST_SUB=	EVO_VERSION="1.2"
 
 OPTIONS_SUB=	yes
-OPTIONS_DEFINE=	WEATHER KERBEROS LDAP
-OPTIONS_DEFAULT=WEATHER KERBEROS LDAP
+OPTIONS_DEFINE=	WEATHER KERBEROS LDAP VAPI
+OPTIONS_DEFAULT=WEATHER KERBEROS LDAP VAPI
 
 KERBEROS_CMAKE_ON=	-DWITH_KRB5=/usr
 KERBEROS_CMAKE_OFF=	-DWITH_KRB5=OFF
@@ -65,7 +65,10 @@ KERBEROS_USES=		ssl
 
 LDAP_CMAKE_ON=		-DWITH_OPENLDAP=${LOCALBASE}
 LDAP_CMAKE_OFF=		-DWITH_OPENLDAP=OFF
-LDAP_USE=		openldap=yes
+LDAP_USES=		ldap
+
+VAPI_USES=		vala:build
+VAPI_CMAKE_BOOL=	ENABLE_VALA_BINDINGS
 
 WEATHER_DESC=	Weather calendar backend
 WEATHER_LIB_DEPENDS=	libgweather-3.so:net/libgweather
@@ -73,10 +76,6 @@ WEATHER_CMAKE_BOOL=	ENABLE_WEATHER
 
 .include <bsd.port.options.mk>
 
-post-patch:
-	@${REINPLACE_CMD} -e 's| python3| ${PYTHON_VERSION}|g' \
-		${WRKSRC}/CMakeLists.txt
-
 post-install:
 	@${RM} -rf ${STAGEDIR}${PREFIX}/lib/systemd
 
diff --git a/databases/evolution-data-server/distinfo b/databases/evolution-data-server/distinfo
index 142ad536a6a4..c2ea3323367a 100644
--- a/databases/evolution-data-server/distinfo
+++ b/databases/evolution-data-server/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1629299688
-SHA256 (gnome/evolution-data-server-3.40.4.tar.xz) = 87c185f18c37270e3611981f19bd9221ac974c807462c8dce90bea08712c5800
-SIZE (gnome/evolution-data-server-3.40.4.tar.xz) = 4622640
+TIMESTAMP = 1660527672
+SHA256 (gnome/evolution-data-server-3.44.4.tar.xz) = c0c6658838d58ba46042a4b9e50a3bb1129691e4cdb84b5eba0bf330b2ccb2eb
+SIZE (gnome/evolution-data-server-3.44.4.tar.xz) = 4784388
diff --git a/databases/evolution-data-server/files/patch-CMakeLists.txt b/databases/evolution-data-server/files/patch-CMakeLists.txt
index 6d57e68b65ac..498ca37305de 100644
--- a/databases/evolution-data-server/files/patch-CMakeLists.txt
+++ b/databases/evolution-data-server/files/patch-CMakeLists.txt
@@ -1,6 +1,6 @@
---- CMakeLists.txt.orig	2017-06-02 14:29:11 UTC
+--- CMakeLists.txt.orig	2021-11-05 17:23:17 UTC
 +++ CMakeLists.txt
-@@ -503,6 +503,7 @@ endif(WITH_LIBDB)
+@@ -521,6 +521,7 @@ endif(WITH_LIBDB)
  # ******************************
  
  set(CMAKE_REQUIRED_LIBRARIES "-liconv")
diff --git a/databases/evolution-data-server/files/patch-icu61 b/databases/evolution-data-server/files/patch-icu61
index 3d1b0082a633..e201fce291e3 100644
--- a/databases/evolution-data-server/files/patch-icu61
+++ b/databases/evolution-data-server/files/patch-icu61
@@ -1,6 +1,6 @@
---- src/libedataserver/e-alphabet-index-private.cpp.orig	2017-05-08 12:04:10 UTC
+--- src/libedataserver/e-alphabet-index-private.cpp.orig	2021-10-29 07:18:27 UTC
 +++ src/libedataserver/e-alphabet-index-private.cpp
-@@ -76,7 +76,7 @@ _e_alphabet_index_cxx_get_index (EAlphabetIndex  *alph
+@@ -77,7 +77,7 @@ _e_alphabet_index_cxx_get_index (EAlphabetIndex  *alph
  				 const gchar     *word)
  {
  	UErrorCode status = U_ZERO_ERROR;
@@ -9,7 +9,7 @@
  	gint index;
  
  	g_return_val_if_fail (alphabet_index != NULL, -1);
-@@ -129,7 +129,7 @@ _e_alphabet_index_cxx_get_labels (EAlphabetIndex  *alp
+@@ -130,7 +130,7 @@ _e_alphabet_index_cxx_get_labels (EAlphabetIndex  *alp
  
  	for (i = 0; alphabet_index->priv->nextBucket (status); i++) {
  		UAlphabeticIndexLabelType label_type;
@@ -18,9 +18,9 @@
  		std::string string;
  
  		label_type = alphabet_index->priv->getBucketLabelType ();
---- src/libedataserver/e-transliterator-private.cpp.orig	2017-05-08 12:04:10 UTC
+--- src/libedataserver/e-transliterator-private.cpp.orig	2021-10-29 07:18:27 UTC
 +++ src/libedataserver/e-transliterator-private.cpp
-@@ -74,7 +74,7 @@ gchar *
+@@ -75,7 +75,7 @@ gchar *
  _e_transliterator_cxx_transliterate (ETransliterator  *transliterator,
  				     const gchar      *str)
  {
diff --git a/databases/evolution-data-server/files/patch-src_camel_camel-db.c b/databases/evolution-data-server/files/patch-src_camel_camel-db.c
new file mode 100644
index 000000000000..2ff44c2cb5e8
--- /dev/null
+++ b/databases/evolution-data-server/files/patch-src_camel_camel-db.c
@@ -0,0 +1,36 @@
+Allow evolution to be used when databases/sqlite3 has been compiled
+with option DQS disabled.
+
+--- src/camel/camel-db.c.orig	2024-04-08 09:37:09 UTC
++++ src/camel/camel-db.c
+@@ -1823,8 +1823,8 @@ camel_db_migrate_folder_prepare (CamelDB *cdb,
+ 			"mail_to , mail_cc , mlist , followup_flag , "
+ 			"followup_completed_on , followup_due_by , "
+ 			"part , labels , usertags , cinfo , bdata , '', '', "
+-			"strftime(\"%%s\", 'now'), "
+-			"strftime(\"%%s\", 'now') FROM %Q",
++			"strftime('%%s', 'now'), "
++			"strftime('%%s', 'now') FROM %Q",
+ 			folder_name, folder_name);
+ 		ret = camel_db_add_to_transaction (cdb, table_creation_query, error);
+ 		sqlite3_free (table_creation_query);
+@@ -2093,8 +2093,8 @@ camel_db_write_message_info_record (CamelDB *cdb,
+ 		"%Q, %d, %d, %d, %d, %d, %d, %d, %d, %d, %d, "
+ 		"%lld, %lld, %Q, %Q, %Q, %Q, %Q, %Q, %Q, %Q, "
+ 		"%Q, %Q, %Q, %Q, %Q, %Q, %Q, "
+-		"strftime(\"%%s\", 'now'), "
+-		"strftime(\"%%s\", 'now') )",
++		"strftime('%%s', 'now'), "
++		"strftime('%%s', 'now') )",
+ 		folder_name,
+ 		record->uid,
+ 		record->flags,
+@@ -2578,7 +2578,7 @@ camel_db_rename_folder (CamelDB *cdb,
+ 	ret = camel_db_add_to_transaction (cdb, cmd, error);
+ 	sqlite3_free (cmd);
+ 
+-	cmd = sqlite3_mprintf ("UPDATE %Q SET modified=strftime(\"%%s\", 'now'), created=strftime(\"%%s\", 'now')", new_folder_name);
++	cmd = sqlite3_mprintf ("UPDATE %Q SET modified=strftime('%%s', 'now'), created=strftime('%%s', 'now')", new_folder_name);
+ 	ret = camel_db_add_to_transaction (cdb, cmd, error);
+ 	sqlite3_free (cmd);
+ 
diff --git a/databases/evolution-data-server/pkg-descr b/databases/evolution-data-server/pkg-descr
index 8de8da6a6b8c..22382fb53ec3 100644
--- a/databases/evolution-data-server/pkg-descr
+++ b/databases/evolution-data-server/pkg-descr
@@ -1,5 +1,3 @@
 Evolution-data-server provides the various backend components for the
 Evolution integrated mail/PIM suite, including the Berkeley database
 backend and the libical calendar components.
-
-WWW: https://wiki.gnome.org/Apps/Evolution
diff --git a/databases/evolution-data-server/pkg-plist b/databases/evolution-data-server/pkg-plist
index ed1690a5c9ba..030417dc1716 100644
--- a/databases/evolution-data-server/pkg-plist
+++ b/databases/evolution-data-server/pkg-plist
@@ -22,6 +22,7 @@ include/evolution-data-server/camel/camel-folder-summary.h
 include/evolution-data-server/camel/camel-folder-thread.h
 include/evolution-data-server/camel/camel-folder.h
 include/evolution-data-server/camel/camel-gpg-context.h
+include/evolution-data-server/camel/camel-hostname-utils.h
 include/evolution-data-server/camel/camel-html-parser.h
 include/evolution-data-server/camel/camel-iconv.h
 include/evolution-data-server/camel/camel-index.h
@@ -309,6 +310,7 @@ include/evolution-data-server/libedataserver/e-source-smime.h
 include/evolution-data-server/libedataserver/e-source-task-list.h
 include/evolution-data-server/libedataserver/e-source-uoa.h
 include/evolution-data-server/libedataserver/e-source-weather.h
+include/evolution-data-server/libedataserver/e-source-webdav-notes.h
 include/evolution-data-server/libedataserver/e-source-webdav.h
 include/evolution-data-server/libedataserver/e-source.h
 include/evolution-data-server/libedataserver/e-time-utils.h
@@ -333,7 +335,6 @@ include/evolution-data-server/libedataserverui/e-webdav-discover-widget.h
 include/evolution-data-server/libedataserverui/libedataserverui.h
 lib/evolution-data-server/addressbook-backends/libebookbackendcarddav.so
 lib/evolution-data-server/addressbook-backends/libebookbackendfile.so
-lib/evolution-data-server/addressbook-backends/libebookbackendgoogle.so
 %%LDAP%%lib/evolution-data-server/addressbook-backends/libebookbackendldap.so
 lib/evolution-data-server/calendar-backends/libecalbackendcaldav.so
 lib/evolution-data-server/calendar-backends/libecalbackendcontacts.so
@@ -375,8 +376,8 @@ lib/girepository-1.0/EDataCal-2.0.typelib
 lib/girepository-1.0/EDataServer-%%EVO_VERSION%%.typelib
 lib/girepository-1.0/EDataServerUI-%%EVO_VERSION%%.typelib
 lib/libcamel-%%EVO_VERSION%%.so
-lib/libcamel-%%EVO_VERSION%%.so.62
-lib/libcamel-%%EVO_VERSION%%.so.62.0.0
+lib/libcamel-%%EVO_VERSION%%.so.63
+lib/libcamel-%%EVO_VERSION%%.so.6%%GTK3_VERSION%%
 lib/libebackend-%%EVO_VERSION%%.so
 lib/libebackend-%%EVO_VERSION%%.so.10
 lib/libebackend-%%EVO_VERSION%%.so.10.0.0
@@ -385,7 +386,7 @@ lib/libebook-%%EVO_VERSION%%.so.20
 lib/libebook-%%EVO_VERSION%%.so.20.1.3
 lib/libebook-contacts-%%EVO_VERSION%%.so
 lib/libebook-contacts-%%EVO_VERSION%%.so.3
-lib/libebook-contacts-%%EVO_VERSION%%.so.3.0.0
+lib/libebook-contacts-%%EVO_VERSION%%.so.%%GTK3_VERSION%%
 lib/libecal-2.0.so
 lib/libecal-2.0.so.1
 lib/libecal-2.0.so.1.0.0
@@ -400,7 +401,7 @@ lib/libedataserver-%%EVO_VERSION%%.so.26
 lib/libedataserver-%%EVO_VERSION%%.so.26.0.0
 lib/libedataserverui-%%EVO_VERSION%%.so
 lib/libedataserverui-%%EVO_VERSION%%.so.3
-lib/libedataserverui-%%EVO_VERSION%%.so.3.0.0
+lib/libedataserverui-%%EVO_VERSION%%.so.%%GTK3_VERSION%%
 libdata/pkgconfig/camel-%%EVO_VERSION%%.pc
 libdata/pkgconfig/evolution-data-server-%%EVO_VERSION%%.pc
 libdata/pkgconfig/libebackend-%%EVO_VERSION%%.pc
@@ -432,6 +433,30 @@ share/dbus-1/services/org.gnome.evolution.dataserver.Calendar8.service
 share/dbus-1/services/org.gnome.evolution.dataserver.Sources5.service
 share/dbus-1/services/org.gnome.evolution.dataserver.UserPrompter0.service
 %%LDAP%%%%DATADIR%%/evolutionperson.schema
+%%DATADIR%%/icons/hicolor/16x16/status/appointment-missed.png
+%%DATADIR%%/icons/hicolor/16x16/status/appointment-soon.png
+%%DATADIR%%/icons/hicolor/16x16/status/dialog-password.png
+%%DATADIR%%/icons/hicolor/16x16/status/dialog-warning.png
+%%DATADIR%%/icons/hicolor/22x22/status/appointment-missed.png
+%%DATADIR%%/icons/hicolor/22x22/status/appointment-soon.png
+%%DATADIR%%/icons/hicolor/22x22/status/dialog-password.png
+%%DATADIR%%/icons/hicolor/22x22/status/dialog-warning.png
+%%DATADIR%%/icons/hicolor/24x24/status/appointment-missed.png
+%%DATADIR%%/icons/hicolor/24x24/status/appointment-soon.png
+%%DATADIR%%/icons/hicolor/24x24/status/dialog-password.png
+%%DATADIR%%/icons/hicolor/24x24/status/dialog-warning.png
+%%DATADIR%%/icons/hicolor/256x256/status/appointment-missed.png
+%%DATADIR%%/icons/hicolor/256x256/status/appointment-soon.png
+%%DATADIR%%/icons/hicolor/256x256/status/dialog-password.png
+%%DATADIR%%/icons/hicolor/256x256/status/dialog-warning.png
+%%DATADIR%%/icons/hicolor/32x32/status/appointment-missed.png
+%%DATADIR%%/icons/hicolor/32x32/status/appointment-soon.png
+%%DATADIR%%/icons/hicolor/32x32/status/dialog-password.png
+%%DATADIR%%/icons/hicolor/32x32/status/dialog-warning.png
+%%DATADIR%%/icons/hicolor/48x48/status/appointment-missed.png
+%%DATADIR%%/icons/hicolor/48x48/status/appointment-soon.png
+%%DATADIR%%/icons/hicolor/48x48/status/dialog-password.png
+%%DATADIR%%/icons/hicolor/48x48/status/dialog-warning.png
 share/gir-1.0/Camel-%%EVO_VERSION%%.gir
 share/gir-1.0/EBackend-%%EVO_VERSION%%.gir
 share/gir-1.0/EBook-%%EVO_VERSION%%.gir
@@ -547,21 +572,21 @@ share/pixmaps/evolution-data-server/category_status_16.png
 share/pixmaps/evolution-data-server/category_strategies_16.png
 share/pixmaps/evolution-data-server/category_suppliers_16.png
 share/pixmaps/evolution-data-server/category_time-and-expenses_16.png
-share/vala/vapi/camel-%%EVO_VERSION%%.deps
-share/vala/vapi/camel-%%EVO_VERSION%%.vapi
-share/vala/vapi/libebackend-%%EVO_VERSION%%.deps
-share/vala/vapi/libebackend-%%EVO_VERSION%%.vapi
-share/vala/vapi/libebook-%%EVO_VERSION%%.deps
-share/vala/vapi/libebook-%%EVO_VERSION%%.vapi
-share/vala/vapi/libebook-contacts-%%EVO_VERSION%%.deps
-share/vala/vapi/libebook-contacts-%%EVO_VERSION%%.vapi
-share/vala/vapi/libecal-2.0.deps
-share/vala/vapi/libecal-2.0.vapi
-share/vala/vapi/libedata-book-%%EVO_VERSION%%.deps
-share/vala/vapi/libedata-book-%%EVO_VERSION%%.vapi
-share/vala/vapi/libedata-cal-2.0.deps
-share/vala/vapi/libedata-cal-2.0.vapi
-share/vala/vapi/libedataserver-%%EVO_VERSION%%.deps
-share/vala/vapi/libedataserver-%%EVO_VERSION%%.vapi
-share/vala/vapi/libedataserverui-%%EVO_VERSION%%.deps
-share/vala/vapi/libedataserverui-%%EVO_VERSION%%.vapi
+%%VAPI%%share/vala/vapi/camel-%%EVO_VERSION%%.deps
+%%VAPI%%share/vala/vapi/camel-%%EVO_VERSION%%.vapi
+%%VAPI%%share/vala/vapi/libebackend-%%EVO_VERSION%%.deps
+%%VAPI%%share/vala/vapi/libebackend-%%EVO_VERSION%%.vapi
+%%VAPI%%share/vala/vapi/libebook-%%EVO_VERSION%%.deps
+%%VAPI%%share/vala/vapi/libebook-%%EVO_VERSION%%.vapi
+%%VAPI%%share/vala/vapi/libebook-contacts-%%EVO_VERSION%%.deps
+%%VAPI%%share/vala/vapi/libebook-contacts-%%EVO_VERSION%%.vapi
+%%VAPI%%share/vala/vapi/libecal-2.0.deps
+%%VAPI%%share/vala/vapi/libecal-2.0.vapi
+%%VAPI%%share/vala/vapi/libedata-book-%%EVO_VERSION%%.deps
+%%VAPI%%share/vala/vapi/libedata-book-%%EVO_VERSION%%.vapi
+%%VAPI%%share/vala/vapi/libedata-cal-2.0.deps
+%%VAPI%%share/vala/vapi/libedata-cal-2.0.vapi
+%%VAPI%%share/vala/vapi/libedataserver-%%EVO_VERSION%%.deps
+%%VAPI%%share/vala/vapi/libedataserver-%%EVO_VERSION%%.vapi
+%%VAPI%%share/vala/vapi/libedataserverui-%%EVO_VERSION%%.deps
+%%VAPI%%share/vala/vapi/libedataserverui-%%EVO_VERSION%%.vapi
diff --git a/databases/fastdb/Makefile b/databases/fastdb/Makefile
index 586c28e18d85..1ec61394d208 100644
--- a/databases/fastdb/Makefile
+++ b/databases/fastdb/Makefile
@@ -1,13 +1,12 @@
-# Created by: Ying-Chieh Liao <ijliao@FreeBSD.org>
-
 PORTNAME=	fastdb
 PORTVERSION=	3.75
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	databases
 MASTER_SITES=	SF
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Main Memory Relational Database Management System
+WWW=		https://sourceforge.net/projects/fastdb/
 
 LICENSE=	MIT
 
diff --git a/databases/fastdb/pkg-descr b/databases/fastdb/pkg-descr
index e33c817b7463..a213ecc2f5bf 100644
--- a/databases/fastdb/pkg-descr
+++ b/databases/fastdb/pkg-descr
@@ -6,5 +6,3 @@ Main Memory Relational Database Management System
    - Automatic scheme evaluation
    - Efficient log-less transactions
    - Zero time recovery
-
-WWW: https://sourceforge.net/projects/fastdb/
diff --git a/databases/firebird25-client/Makefile b/databases/firebird25-client/Makefile
deleted file mode 100644
index ecc5ea5b7ce4..000000000000
--- a/databases/firebird25-client/Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-PORTNAME=	firebird
-PKGNAMESUFFIX=	${PORTVERSION:R:S/.//}-client
-
-COMMENT=	Firebird-2 database client
-
-MASTERDIR=	${.CURDIR}/../firebird25-server
-
-PLIST=		${PKGDIR}/pkg-plist.client
-
-CLIENT_ONLY=	yes
-
-.include "${MASTERDIR}/Makefile"
diff --git a/databases/firebird25-server/Makefile b/databases/firebird25-server/Makefile
deleted file mode 100644
index ccd911a0d9d0..000000000000
--- a/databases/firebird25-server/Makefile
+++ /dev/null
@@ -1,215 +0,0 @@
-PORTNAME=	firebird
-PORTVERSION=	2.5.9
-CATEGORIES?=	databases
-MASTER_SITES=	https://github.com/FirebirdSQL/${PORTNAME}/releases/download/R2_5_9/
-PKGNAMESUFFIX?=	${PORTVERSION:R:S/.//}-server
-DISTNAME=	${PORTNAME:S/f/F/}-${PORTVERSION}.27139-0
-DIST_SUBDIR=	${PORTNAME}
-
-MAINTAINER=	acm@FreeBSD.org
-COMMENT?=	Firebird-2 relational database (server)
-
-LICENSE=	IDPL IPL
-LICENSE_COMB=	multi
-LICENSE_NAME_IDPL=	Initial Developer's Public License
-LICENSE_NAME_IPL=	InterBase Public License
-LICENSE_FILE_IDPL=	${WRKSRC}/builds/install/misc/IDPLicense.txt
-LICENSE_FILE_IPL=	${WRKSRC}/builds/install/misc/IPLicense.txt
-LICENSE_PERMS_IDPL=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
-LICENSE_PERMS_IPL=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
-
-LIB_DEPENDS=	libicuuc.so:devel/icu
-
-USES=		cpe gmake pkgconfig tar:bzip2
-USE_CXXSTD=	gnu++98
-GNU_CONFIGURE=	yes
-MAKE_JOBS_UNSAFE=	yes
-CPE_VENDOR=	firebirdsql
-
-CONFIGURE_ARGS=	--with-system-icu \
-		--prefix=${LOCALSTATEDIR} \
-		--exec-prefix=${PREFIX} \
-		--with-fbconf=${PREFIX}/${CONFDIR} \
-		--with-fbglock=${LOCALSTATEDIR} \
-		--with-fbhelp=${LOCALSTATEDIR}/help \
-		--with-fbintl=${LIBEXECDIR}/intl \
-		--with-fblog=${LOCALSTATEDIR} \
-		--with-fbmsg=${DATADIR} \
-		--with-fbplugins=${LIBEXECDIR}/plugins \
-		--with-fbsbin=${PREFIX}/sbin \
-		--with-fbsecure-db=${LOCALSTATEDIR} \
-		--with-fbudf=${LIBEXECDIR}/UDF
-CONFIGURE_ENV+=	PTHREAD_LIBS="-lpthread" \
-		ac_cv_header_atomic_ops_h="no" \
-		ac_cv_lib_atomic_ops_main="no"
-CPPFLAGS+=	-DU_NOEXCEPT= # For USE_CXXSTD=gnu++98
-
-LOCALSTATEDIR=	/var/db/firebird
-CONFDIR=	etc/firebird
-LIBEXECDIR=	${PREFIX}/libexec/firebird
-PLIST_SUB=	FIREBIRD_VERSION=${PORTVERSION} \
-		LOCALSTATEDIR="var/db/firebird" CONFDIR="${CONFDIR}"
-
-# Don't use ld for linking, use gcc
-LD=	${CC}
-
-# Don't strip binary files
-STRIP=
-
-ONLY_FOR_ARCHS=	i386 amd64
-# sparc64 fails due to lack of valid AtomicCounter implementation in
-# src/common/classes/fb_atomic.h; presumably other tier-2s would as well
-
-INSTALL_FB=	${INSTALL} ${COPY}
-IPCRM_CMD=	/usr/bin/ipcrm
-IPCS_CMD=	/usr/bin/ipcs
-
-IPCCHECK!=	${IPCRM_CMD} -q 0 2>&1 || true
-.if ${IPCCHECK:Mimplemented}
-IGNORE=		your system does not support sysvipc
-.endif
-
-.if !defined(CLIENT_ONLY)
-# Server part stuff
-USES+=		firebird
-
-CONFIGURE_ARGS+=--enable-superserver --without-editline
-
-ALL_TARGET=	firebird_embedded firebird_server
-
-USE_RC_SUBR=	firebird
-SUB_FILES=	pkg-message
-
-UTIL_SBIN=	fb_inet_server fb_lock_print fb_smp_server fbserver
-UTIL_BIN=	fbguard fbsplit fbstat fbsvcmgr fbtracemgr gbak gdef gfix gsec \
-		nbackup
-UDF_SO=		ib_udf.so fbudf.so
-UDF_SQL=	src/extlib/ib_udf2.sql src/extlib/fbudf/fbudf.sql
-
-PKGINSTALL?=	${PKGDIR}/pkg-install-server
-.else
-# Client part stuff
-USES+=		libedit
-
-CONFIGURE_ARGS+=	--with-system-editline
-CONFIGURE_ENV+=	ac_cv_lib_edit_readline="yes"
-
-ALL_TARGET=	firebird_basic libfbembed libfbclient embed_isql embed_gpre \
-		embed_gdef embed_qli extlib
-
-USE_LDCONFIG=	yes
-CLIENT_BIN=	gpre isql-fb qli
-
-OPTIONS_DEFINE=	DOCS
-
-DOCS_PORTDOCS=	*
-
-FB_DOCS_FILES=	WhatsNew README.* Firebird* ReleaseNotes.pdf ambiguity.txt \
-		ods11-index-structure.html
-FB_DOCS_DIRS=	sql.extensions license upgrade
-.endif
-
-MAKE_ENV+=	FIREBIRD_TMP="${WRKDIR}" FIREBIRD_LOCK="${WRKDIR}"
-MAKE_ARGS+=	PREFIX="${STAGEDIR}${PREFIX}"
-
-post-patch:
-	${FIND} ${WRKSRC} -name "*.sh" -exec ${CHMOD} +x {} \+
-	${REINPLACE_CMD} -e \
-			's|/isql|/isql-fb|g' -e \
-			's|/gstat|/fbstat|g' -e \
-			's|/gsplit|/fbsplit|g' ${WRKSRC}/builds/posix/make.defaults
-
-.include <bsd.port.pre.mk>
-
-.if ${ARCH} == "amd64"
-CFLAGS+=	-DAMD64
-.endif
-
-.if !defined(CLIENT_ONLY)
-USERS=	${PORTNAME}
-GROUPS=	${USERS}
-.endif
-
-.ifndef WITHOUT_IPC_CLEANUP
-pre-build:
-.if !defined(CLIENT_ONLY)
-	@${SETENV} PKG_PREFIX="${STAGEDIR}${PREFIX}" ${SH} ${PKGINSTALL} ${PORTNAME} PRE-INSTALL
-.endif
-
-	${MAKE} -C ${WRKSRC}/extern/btyacc
-	[ -f ${WRKDIR}/ipcs.pre.build ] || ${IPCS_CMD} -s | ${TAIL} -n +3 | \
-		${GREP} -F `${ID} -un` | ${CAT} > ${WRKDIR}/ipcs.pre.build
-
-post-build:
-	${IPCS_CMD} -s | ${TAIL} -n +3 | ${GREP} -F `${ID} -un` | ${CAT} > ${WRKDIR}/ipcs.post.build
-	${DIFF} -n ${WRKDIR}/ipcs.pre.build ${WRKDIR}/ipcs.post.build  | \
-		${TAIL} -n +2 | ${SED} -E 's/^s +([0-9]+).*$$/\/usr\/bin\/ipcrm -s \1/' > ${WRKDIR}/ipcrm.sh
-	${SH} ${WRKDIR}/ipcrm.sh
-.endif
-
-do-install:
-.if !defined(CLIENT_ONLY)
-
-	${INSTALL_PROGRAM} ${UTIL_BIN:S!^!${WRKSRC}/gen/firebird/bin/!} ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_PROGRAM} ${UTIL_SBIN:S!^!${WRKSRC}/gen/firebird/bin/!} ${STAGEDIR}${PREFIX}/sbin
-
-	@${MKDIR} ${STAGEDIR}${PREFIX}/${CONFDIR}
-	${INSTALL_DATA} ${WRKSRC}/gen/install/misc/aliases.conf ${STAGEDIR}${PREFIX}/${CONFDIR}/aliases.conf.sample
-	${INSTALL_DATA} ${WRKSRC}/gen/install/misc/fbtrace.conf ${STAGEDIR}${PREFIX}/${CONFDIR}/fbtrace.conf
-
-	${MKDIR} ${STAGEDIR}${LIBEXECDIR}/udf ${STAGEDIR}${LOCALSTATEDIR}/help ${STAGEDIR}${LIBEXECDIR}/intl \
-		${STAGEDIR}${LIBEXECDIR}/plugins
-
-	${INSTALL_DATA} ${WRKSRC}/gen/install/misc/fbintl.conf ${STAGEDIR}${LIBEXECDIR}/intl/fbintl.conf
-	${INSTALL_FB} -m 0555 ${UDF_SO:S!^!${WRKSRC}/gen/firebird/UDF/!} ${STAGEDIR}${LIBEXECDIR}/udf
-	${INSTALL_FB} -m 0444 ${UDF_SQL:S!^!${WRKSRC}/!} ${STAGEDIR}${LIBEXECDIR}/udf
-	${INSTALL_FB} -m 0555 ${WRKSRC}/gen/firebird/plugins/libfbtrace.so ${STAGEDIR}${LIBEXECDIR}/plugins
-
-	${INSTALL_FB} -m 0660 ${WRKSRC}/gen/firebird/security2.fdb ${STAGEDIR}${LOCALSTATEDIR}/security2.fdb.sample
-
-	${INSTALL_FB} -m 0440 ${WRKSRC}/gen/firebird/help/help.fdb ${STAGEDIR}${LOCALSTATEDIR}/help
-
-	${INSTALL_FB} -m 0555 ${WRKSRC}/gen/firebird/intl/libfbintl.so ${STAGEDIR}${LIBEXECDIR}/intl/fbintl.so
-.else
-# defined CLIENT_ONLY
-	${INSTALL_PROGRAM} ${CLIENT_BIN:S!^!${WRKSRC}/gen/firebird/bin/!} ${STAGEDIR}${PREFIX}/bin
-
-	${SED} -e "s=%%PREFIX%%=${PREFIX}=g" ${WRKSRC}/gen/install/misc/firebird.conf > ${WRKDIR}/firebird.conf
-
-	@${MKDIR} ${STAGEDIR}${PREFIX}/${CONFDIR}
-	${INSTALL_DATA} ${WRKDIR}/firebird.conf ${STAGEDIR}${PREFIX}/${CONFDIR}/firebird.conf.sample
-
-	${INSTALL_DATA} ${WRKSRC}/gen/firebird/lib/libib_util.so \
-		${WRKSRC}/gen/firebird/lib/libfbclient.so.${PORTVERSION} \
-		${WRKSRC}/gen/firebird/lib/libfbembed.so.${PORTVERSION} \
-		${STAGEDIR}${PREFIX}/lib
-
-	${LN} -fs libfbclient.so.${PORTVERSION} ${STAGEDIR}${PREFIX}/lib/libfbclient.so.2.5
-	${LN} -fs libfbclient.so.${PORTVERSION} ${STAGEDIR}${PREFIX}/lib/libfbclient.so.2
-	${LN} -fs libfbclient.so.${PORTVERSION} ${STAGEDIR}${PREFIX}/lib/libfbclient.so
-
-	${LN} -fs libfbembed.so.${PORTVERSION} ${STAGEDIR}${PREFIX}/lib/libfbembed.so.2.5
-	${LN} -fs libfbembed.so.${PORTVERSION} ${STAGEDIR}${PREFIX}/lib/libfbembed.so.2
-	${LN} -fs libfbembed.so.${PORTVERSION} ${STAGEDIR}${PREFIX}/lib/libfbembed.so
-
-	${LN} -fs libfbembed.so.${PORTVERSION} ${STAGEDIR}${PREFIX}/lib/libgds.so.2.5
-	${LN} -fs libfbembed.so.${PORTVERSION} ${STAGEDIR}${PREFIX}/lib/libgds.so.2
-	${LN} -fs libfbembed.so.${PORTVERSION} ${STAGEDIR}${PREFIX}/lib/libgds.so
-
-	@${MKDIR} ${STAGEDIR}${PREFIX}/include
-	${INSTALL_DATA} ${WRKSRC}/gen/firebird/include/*.h ${STAGEDIR}${PREFIX}/include
-
-	@${MKDIR} ${STAGEDIR}${DATADIR}
-	${INSTALL_DATA} ${WRKSRC}/gen/firebird/*.msg ${STAGEDIR}${DATADIR}
-
-post-install-DOCS-on:
-	@${ECHO_MSG} "===>   Installing documentation for ${PKGNAME}"
-	@${MKDIR} ${FB_DOCS_DIRS:S!^!${STAGEDIR}${DOCSDIR}/!}
-	${INSTALL_DATA} ${FB_DOCS_FILES:S!^!${WRKSRC}/doc/!} ${STAGEDIR}${DOCSDIR}
-	${LN} -sf README.user ${STAGEDIR}${DOCSDIR}/README
-	${INSTALL_DATA} ${WRKSRC}/doc/sql.extensions/* ${STAGEDIR}${DOCSDIR}/sql.extensions
-	${INSTALL_DATA} ${WRKSRC}/doc/license/* ${STAGEDIR}${DOCSDIR}/license
-	${INSTALL_DATA} ${WRKSRC}/src/misc/upgrade/v2/* ${STAGEDIR}${DOCSDIR}/upgrade
-.endif
-
-.include <bsd.port.post.mk>
diff --git a/databases/firebird25-server/distinfo b/databases/firebird25-server/distinfo
deleted file mode 100644
index 6bb3962962fb..000000000000
--- a/databases/firebird25-server/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1621470414
-SHA256 (firebird/Firebird-2.5.9.27139-0.tar.bz2) = 46ee37b14b44f3e45cd286b739f92e9366643f52bef51a131cc973a6980d9481
-SIZE (firebird/Firebird-2.5.9.27139-0.tar.bz2) = 13567295
diff --git a/databases/firebird25-server/files/firebird.in b/databases/firebird25-server/files/firebird.in
deleted file mode 100644
index 9d14f152f12b..000000000000
--- a/databases/firebird25-server/files/firebird.in
+++ /dev/null
@@ -1,80 +0,0 @@
-#!/bin/sh
-
-# PROVIDE: firebird
-# REQUIRE: LOGIN
-# KEYWORD: shutdown
-#
-# Add the following line to /etc/rc.conf to enable Firebird Database:
-#
-#
-# firebird_enable:	Set it to "YES" to enable firebird.
-#			Default is "NO".
-# firebird_mode:	Set it to "superclassic" or "superserver" to enable firebird.
-#			Default is "superclassic".
-# firebird_flags:	Set options to run fbserver or fb_smp_server.
-# 			Default is "-el /var/db/firebird".
-# firebird_pidfile:	Set full path to pid file.
-#			Default is "/var/run/firebird.pid".
-#
-
-. /etc/rc.subr
-
-name=firebird
-rcvar=firebird_enable
-
-load_rc_config $name
-
-firebird_enable=${firebird_enable:-"NO"}
-firebird_mode=${firebird_mode:-"superclassic"}
-firebird_flags=${firebird_flags:-"-el /var/db/firebird"}
-firebird_pidfile=${firebird_pidfile:-"/var/run/${name}.pid"}
-firebird_user=firebird
-
-command=%%PREFIX%%/sbin/fb_smp_server
-command_args="${firebird_flags} &"
-pidfile=${firebird_pidfile}
-start_precmd="start_precmd"
-start_postcmd="start_postcmd"
-stop_postcmd="stop_postcmd"
-reload_postcmd="reload_postcmd"
-
-start_precmd()
-{
-	touch ${firebird_pidfile}
-	chown "${firebird_user}:wheel" ${firebird_pidfile} ||
-		err 1 "Cannot chown ${firebird_pidfile}"
-}
-
-start_postcmd()
-{
-	pgrep -u ${firebird_user} ${command_app} > ${firebird_pidfile}
-	echo "Current firebird mode is $firebird_mode"
-}
-
-stop_postcmd()
-{
-        rm -f ${pidfile}
-}
-
-reload_postcmd()
-{
-        rm -f ${pidfile}
-        run_rc_command start
-}
-
-case "${firebird_mode}" in
-        superclassic)
-                command=%%PREFIX%%/sbin/fb_smp_server
-                command_app=fb_smp_server
-                ;;
-        superserver)
-                command=%%PREFIX%%/sbin/fbserver
-                command_app=fbserver
-                ;;
-        *)
-                warn "$firebird_mode is an invalid value for firebird_mode"
-                return 1
-                ;;
-esac
-
-run_rc_command "$1"
diff --git a/databases/firebird25-server/files/patch-builds_install_misc_firebird.conf.in b/databases/firebird25-server/files/patch-builds_install_misc_firebird.conf.in
deleted file mode 100644
index f80094d2063a..000000000000
--- a/databases/firebird25-server/files/patch-builds_install_misc_firebird.conf.in
+++ /dev/null
@@ -1,20 +0,0 @@
---- builds/install/misc/firebird.conf.in.orig	2016-06-30 09:34:53 UTC
-+++ builds/install/misc/firebird.conf.in
-@@ -60,7 +60,7 @@
- #
- # Type: string
- #
--#RootDirectory =
-+#RootDirectory = /var/db/firebird
- 
- 
- # ----------------------------
-@@ -137,7 +137,7 @@
- #
- # Type: string (special format)
- #
--#UdfAccess = Restrict UDF
-+UdfAccess = Restrict %%PREFIX%%/libexec/firebird/udf
- 
- 
- # ----------------------------
diff --git a/databases/firebird25-server/files/patch-builds_posix_empty.vers b/databases/firebird25-server/files/patch-builds_posix_empty.vers
deleted file mode 100644
index 7e0dc6cdce58..000000000000
--- a/databases/firebird25-server/files/patch-builds_posix_empty.vers
+++ /dev/null
@@ -1,11 +0,0 @@
---- builds/posix/empty.vers.orig	2016-06-30 09:34:53 UTC
-+++ builds/posix/empty.vers
-@@ -27,6 +27,8 @@
- {
- global:
- 	main;
-+	__progname;
-+	environ;
- 
- local:
- 	*;
diff --git a/databases/firebird25-server/files/patch-builds_posix_firebird.vers b/databases/firebird25-server/files/patch-builds_posix_firebird.vers
deleted file mode 100644
index e2d64ee58b14..000000000000
--- a/databases/firebird25-server/files/patch-builds_posix_firebird.vers
+++ /dev/null
@@ -1,11 +0,0 @@
---- builds/posix/firebird.vers.orig	2016-06-30 09:34:53 UTC
-+++ builds/posix/firebird.vers
-@@ -25,6 +25,8 @@
- 
- {
- global:
-+	__progname;
-+	environ;
- # private entrypoint for REMOTE server
- 	server_main;
- #-------------------
diff --git a/databases/firebird25-server/files/patch-builds_posix_make.defaults b/databases/firebird25-server/files/patch-builds_posix_make.defaults
deleted file mode 100644
index 0b20f83f1c51..000000000000
--- a/databases/firebird25-server/files/patch-builds_posix_make.defaults
+++ /dev/null
@@ -1,38 +0,0 @@
---- builds/posix/make.defaults.orig	2016-06-30 09:34:53 UTC
-+++ builds/posix/make.defaults
-@@ -126,7 +126,7 @@ RM_R=		rm -rf
- CHMOD=			chmod
- CHMOD_6=		chmod 666
- CHMOD_7=		chmod 777
--CHMOD_S7=		chmod 06777
-+CHMOD_S7=		chmod 04555
- MV=			mv -f
- TOUCH=			touch
- CP=			cp
-@@ -152,7 +152,7 @@ EXE_LINK:= @CXX@ $(GLOB_OPTIONS) $(CXXFL
- STATICEXE_LINK:= @CXX@ $(GLOB_OPTIONS) $(CXXFLAGS)
- 
- LINK_LIBS = @LIBS@
--ICU_LIBS = -licuuc -licudata -licui18n
-+ICU_LIBS = $(shell icu-config --ldflags)
- STATICLINK_LIBS = @LIBS@
- SO_LINK_LIBS = @LIBS@
- 
-@@ -223,16 +223,12 @@ LIBFBSTATIC_A = $(LIB)/libfbstatic.a
- 
- ifeq ($(EDITLINE_FLG),Y)
-   ifeq ($(STD_EDITLINE), true)
--	LIBEDITLINE := -l$(READLINE)
-+	LIBEDITLINE := $(shell pkgconf libedit --libs)
-   else
- 	LIBEDITLINE := $(LIB)/libedit.a
-   endif
- endif
- 
--LIBICU_SO = $(LIB)/$(LIB_PREFIX)icuuc*.$(SHRLIB_FOREIGN_EXT) \
--			$(LIB)/$(LIB_PREFIX)icudata*.$(SHRLIB_FOREIGN_EXT) \
--			$(LIB)/$(LIB_PREFIX)icui18n*.$(SHRLIB_FOREIGN_EXT)
--
- # Shared library name for usage inside of the UDF
- IbUtilLibraryName = $(LIB_PREFIX)ib_util.$(SHRLIB_EXT)
- LIBIBUTIL_SO = $(LIB)/$(IbUtilLibraryName)
diff --git a/databases/firebird25-server/files/patch-builds_posix_make.rules b/databases/firebird25-server/files/patch-builds_posix_make.rules
deleted file mode 100644
index 13bce7ec4bfb..000000000000
--- a/databases/firebird25-server/files/patch-builds_posix_make.rules
+++ /dev/null
@@ -1,11 +0,0 @@
---- builds/posix/make.rules.orig	2016-06-30 09:34:53 UTC
-+++ builds/posix/make.rules
-@@ -37,6 +37,8 @@ WFLAGS:=$(CPPFLAGS) -I$(SRC_ROOT)/includ
- 
- ifeq ($(STD_ICU),false)
-   WFLAGS:= $(WFLAGS) -I$(ROOT)/extern/icu/source/common -I$(ROOT)/extern/icu/source/i18n
-+else
-+  WFLAGS:= $(WFLAGS) $(shell icu-config --cppflags)
- endif
- 
- ifeq ($(IsProdTypeBuild),Y)
diff --git a/databases/firebird25-server/files/patch-src-common-classes_alloc.h b/databases/firebird25-server/files/patch-src-common-classes_alloc.h
deleted file mode 100644
index 7257d8ae10d3..000000000000
--- a/databases/firebird25-server/files/patch-src-common-classes_alloc.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/common/classes/alloc.h	2021-05-19 19:28:30.698498000 -0500
-+++ src/common/classes/alloc.h	2021-05-19 19:29:17.345552000 -0500
-@@ -92,7 +92,7 @@
- const int MAX_TREE_DEPTH = 4;
- 
- // Alignment for all memory blocks. Sizes of memory blocks in headers are measured in this units
--const size_t ALLOC_ALIGNMENT = FB_ALIGNMENT;
-+#define ALLOC_ALIGNMENT 16
- 
- static inline size_t MEM_ALIGN(size_t value)
- {
diff --git a/databases/firebird25-server/files/pkg-message.in b/databases/firebird25-server/files/pkg-message.in
deleted file mode 100644
index bcd4ee49e315..000000000000
--- a/databases/firebird25-server/files/pkg-message.in
+++ /dev/null
@@ -1,53 +0,0 @@
-[
-{ type: install
-  message: <<EOM
-Firebird was installed.
-
-1) Support for Super Server has been added
-
-2) Before start the server ensure that the following line exists in /etc/services:
-
-gds_db		3050/tcp  #InterBase Database Remote Protocol
-
-3) If you use inetd (Classic Server) then add the following line to /etc/inetd.conf
-
-gds_db	stream	tcp	nowait	firebird	%%PREFIX%%/sbin/fb_inet_server  fb_inet_server
-
-And finally restart inetd.
-
-4) If you want to use SuperClassic Server then you must add the following lines
-   to /etc/rc.conf file.
-
- firebird_enable="YES"
- firebird_mode="superclassic"
-
-5) If you want to use Super Server then you must add the following lines to
-   /etc/rc.conf file.
-
- firebird_enable="YES"
- firebird_mode="superserver"
-
- Note: Keep in mind that you only can add one of them but never both modes on
-       the same time
-
-6) It is STRONGLY recommended that you change the SYSDBA
-password with:
-
- # gsec -user SYSDBA -pass masterkey
- GSEC> modify SYSDBA -pw newpassword
- GSEC> quit
-
-before doing anything serious with Firebird.
-
-7) See documentation in %%DOCSDIR%%/ for more information.
-
-8) Some firebird tools were renamed for avoid conflicts with some other ports
-
-	%%PREFIX%%/bin/isql	-> 	%%PREFIX%%/bin/isql-fb
-	%%PREFIX%%/bin/gstat	->	%%PREFIX%%/bin/fbstat
-	%%PREFIX%%/bin/gsplit	->	%%PREFIX%%/bin/fbsplit
-
-9) Enjoy it ;)
-EOM
-}
-]
diff --git a/databases/firebird25-server/pkg-descr b/databases/firebird25-server/pkg-descr
deleted file mode 100644
index f57481ef1afe..000000000000
--- a/databases/firebird25-server/pkg-descr
+++ /dev/null
@@ -1,12 +0,0 @@
-Firebird is a relational database offering many ANSI SQL-99 features
-that runs on Linux, Windows, and a variety of Unix platforms.  Firebird
-offers excellent concurrency, high performance, and powerful language
-support for stored procedures and triggers.  It has been used in
-production systems, under a variety of names since 1981.
-
-Firebird is completely free of any registration, licensing or deployment
-fees.  It may be deployed freely for use with any third-party software,
-whether commercial or not.
-
-WWW: https://sourceforge.net/projects/firebird/
-WWW: http://www.firebirdsql.org/
diff --git a/databases/firebird25-server/pkg-install-server b/databases/firebird25-server/pkg-install-server
deleted file mode 100644
index e6a6d5b969fb..000000000000
--- a/databases/firebird25-server/pkg-install-server
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/bin/sh
-
-PATH=/bin:/usr/bin:/usr/sbin
-
-buildwarning() {
-cat <<EOF
-###############################################################################
-
-                             ** IMPORTANT **
-
-Keep in mind that if you build firebird server as 'root', this may cause
-conflicts with SysV semaphores of running services.
-
-If you want to cancel it, press ctrl-C now if you need check some things
-before of build it.
-
-###############################################################################
-EOF
-        sleep 5
-}
-
-case $2 in
-PRE-INSTALL)
-	buildwarning
-;;
-POST-INSTALL)
-cd /var/db/firebird
-
-# Lock files
-
-for i in isc_init1 isc_lock1 isc_event1
-do
-	FileName=$i.`hostname`
-	touch $FileName
-	chmod uga=rw $FileName
-	chown firebird:firebird $FileName
-done
-
-touch firebird.log
-chown firebird:firebird firebird.log security2.fdb
-
-;;
-
-esac
diff --git a/databases/firebird25-server/pkg-plist b/databases/firebird25-server/pkg-plist
deleted file mode 100644
index 20b48f72c9ed..000000000000
--- a/databases/firebird25-server/pkg-plist
+++ /dev/null
@@ -1,37 +0,0 @@
-bin/fbguard
-bin/fbsplit
-bin/fbstat
-bin/fbsvcmgr
-bin/fbtracemgr
-bin/gbak
-bin/gdef
-bin/gfix
-bin/gsec
-bin/nbackup
-sbin/fb_inet_server
-sbin/fb_lock_print
-sbin/fb_smp_server
-sbin/fbserver
-@group firebird
-libexec/firebird/udf/ib_udf.so
-libexec/firebird/udf/fbudf.so
-libexec/firebird/udf/ib_udf2.sql
-libexec/firebird/udf/fbudf.sql
-libexec/firebird/plugins/libfbtrace.so
-libexec/firebird/intl/fbintl.so
-libexec/firebird/intl/fbintl.conf
-@group
-@sample %%CONFDIR%%/aliases.conf.sample
-%%CONFDIR%%/fbtrace.conf
-@owner firebird
-@group firebird
-@sample /%%LOCALSTATEDIR%%/security2.fdb.sample
-/%%LOCALSTATEDIR%%/help/help.fdb
-@preunexec [ -s /%%LOCALSTATEDIR%%/firebird.log ] || rm -f /%%LOCALSTATEDIR%%/firebird.log
-@rmtry /%%LOCALSTATEDIR%%/isc_event1.`hostname`
-@rmtry /%%LOCALSTATEDIR%%/isc_init1.`hostname`
-@rmtry /%%LOCALSTATEDIR%%/isc_lock1.`hostname`
-@dir /%%LOCALSTATEDIR%%/help
-@dir /%%LOCALSTATEDIR%%
-@owner
-@group
diff --git a/databases/firebird25-server/pkg-plist.client b/databases/firebird25-server/pkg-plist.client
deleted file mode 100644
index eedf4c78372b..000000000000
--- a/databases/firebird25-server/pkg-plist.client
+++ /dev/null
@@ -1,23 +0,0 @@
-bin/gpre
-bin/isql-fb
-bin/qli
-include/ib_util.h
-include/ibase.h
-include/iberror.h
-include/perf.h
-lib/libfbclient.so
-lib/libfbclient.so.2
-lib/libfbclient.so.2.5
-lib/libfbclient.so.%%FIREBIRD_VERSION%%
-lib/libfbembed.so
-lib/libfbembed.so.2
-lib/libfbembed.so.2.5
-lib/libfbembed.so.%%FIREBIRD_VERSION%%
-lib/libgds.so
-lib/libgds.so.2
-lib/libgds.so.2.5
-lib/libib_util.so
-@sample %%CONFDIR%%/firebird.conf.sample
-%%DATADIR%%/de_DE.msg
-%%DATADIR%%/firebird.msg
-%%DATADIR%%/fr_FR.msg
diff --git a/databases/firebird30-server/Makefile b/databases/firebird30-server/Makefile
index 2932deb3dd74..279c24654646 100644
--- a/databases/firebird30-server/Makefile
+++ b/databases/firebird30-server/Makefile
@@ -1,13 +1,14 @@
 PORTNAME=	firebird
-PORTVERSION=	3.0.7
+PORTVERSION=	3.0.11
 CATEGORIES?=	databases
-MASTER_SITES=	https://github.com/FirebirdSQL/${PORTNAME}/releases/download/R3_0_7/
+MASTER_SITES=	https://github.com/FirebirdSQL/${PORTNAME}/releases/download/v${PORTVERSION}/
 PKGNAMESUFFIX?=	${PORTVERSION:R:S/.//}-server
-DISTNAME=	${PORTNAME:S/f/F/}-${PORTVERSION}.33374-0
+DISTNAME=	${PORTNAME:S/f/F/}-${PORTVERSION}.33703-0
 DIST_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	acm@FreeBSD.org
 COMMENT?=	Firebird-3 relational database (server)
+WWW=		https://www.firebirdsql.org/
 
 LICENSE=	IDPL IPL
 LICENSE_COMB=	multi
@@ -21,7 +22,7 @@ LICENSE_PERMS_IPL=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 LIB_DEPENDS=	libicuuc.so:devel/icu \
 		libtommath.so:math/libtommath
 
-CONFLICTS_INSTALL=	firebird25-* firebird40-*
+CONFLICTS_INSTALL=	firebird40
 
 USES=		cpe gmake pkgconfig localbase:ldflags libedit tar:bzip2
 USE_CXXSTD=	gnu++03
@@ -47,7 +48,7 @@ CONFIGURE_ARGS=	--prefix=${LOCALSTATEDIR} \
 CONFIGURE_ENV+=	PTHREAD_LIBS="-lpthread" \
 		ac_cv_header_atomic_ops_h="no" \
 		ac_cv_lib_atomic_ops_main="no"
-CPPFLAGS+=	-DU_NOEXCEPT= # For USE_CXXSTD=gnu++98
+CPPFLAGS+=	-DU_NOEXCEPT= -fno-delete-null-pointer-checks # For USE_CXXSTD=gnu++98
 
 LOCALSTATEDIR=	/var/db/firebird
 CONFDIR=	etc/firebird
@@ -62,8 +63,6 @@ LD=	${CC}
 STRIP=
 
 ONLY_FOR_ARCHS=	i386 amd64
-# sparc64 fails due to lack of valid AtomicCounter implementation in
-# src/common/classes/fb_atomic.h; presumably other tier-2s would as well
 
 INSTALL_FB=	${INSTALL} ${COPY}
 
@@ -94,7 +93,7 @@ CONFIGURE_ENV+=	ac_cv_lib_edit_readline="yes"
 
 USE_LDCONFIG=	yes
 CLIENT_BIN=	gpre isql-fb qli
-CLIENT_HEADER=	extlib/ib_util.h include/ibase.h include/iberror.h yvalve/perf.h
+CLIENT_HEADER=	ib_util.h ibase.h iberror.h perf.h
 
 OPTIONS_DEFINE=	DOCS
 
@@ -118,7 +117,7 @@ CFLAGS+=	-DAMD64
 USERS=	${PORTNAME}
 GROUPS=	${USERS}
 
-MAKE_ENV+=	IsServer=Y
+#MAKE_ENV+=	IsServer=Y
 .endif
 
 post-patch:
@@ -175,12 +174,12 @@ do-install:
 	${LN} -fs libfbclient.so.${PORTVERSION} ${STAGEDIR}${PREFIX}/lib/libfbclient.so
 
 	@${MKDIR} ${STAGEDIR}${PREFIX}/include/firebird
-	${INSTALL_DATA} ${CLIENT_HEADER:S!^!${WRKSRC}/src/!} ${STAGEDIR}${PREFIX}/include
+	${INSTALL_DATA} ${CLIENT_HEADER:S!^!${WRKSRC}/gen/Release/firebird/include/!} ${STAGEDIR}${PREFIX}/include
 
-	@cd ${WRKSRC}/src/include/firebird && \
+	@cd ${WRKSRC}/gen/Release/firebird/include/firebird && \
 		${FIND} * -type d -exec ${MKDIR} "${STAGEDIR}${PREFIX}/include/firebird/{}" \;
 
-	@cd ${WRKSRC}/src/include/firebird && \
+	@cd ${WRKSRC}/gen/Release/firebird/include/firebird && \
 		${FIND} * -type f -exec ${INSTALL_DATA} "{}" "${STAGEDIR}${PREFIX}/include/firebird/{}" \;
 
 	@${MKDIR} ${STAGEDIR}${DATADIR}
diff --git a/databases/firebird30-server/distinfo b/databases/firebird30-server/distinfo
index e18a632d7439..763e6ad40185 100644
--- a/databases/firebird30-server/distinfo
+++ b/databases/firebird30-server/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1621726682
-SHA256 (firebird/Firebird-3.0.7.33374-0.tar.bz2) = acb85cedafa10ce106b1823fb236b1b3e5d942a5741e8f8435cc8ccfec0afe76
-SIZE (firebird/Firebird-3.0.7.33374-0.tar.bz2) = 9841457
+TIMESTAMP = 1705644395
+SHA256 (firebird/Firebird-3.0.11.33703-0.tar.bz2) = c716fc1c788ed614050f5469e1ba0ff442c2f1f7b907a2c808a8bac1dc3d6f83
+SIZE (firebird/Firebird-3.0.11.33703-0.tar.bz2) = 13066796
diff --git a/databases/firebird30-server/files/patch-builds-posix-prefix.freebsd b/databases/firebird30-server/files/patch-builds-posix-prefix.freebsd
deleted file mode 100644
index 3da3ac70283e..000000000000
--- a/databases/firebird30-server/files/patch-builds-posix-prefix.freebsd
+++ /dev/null
@@ -1,20 +0,0 @@
---- builds/posix/prefix.freebsd.orig	2021-03-27 18:59:05 UTC
-+++ builds/posix/prefix.freebsd
-@@ -20,5 +20,14 @@
- 
- EXE_LINK_OPTIONS+=-Wl,-rpath,../gen/firebird/lib
- 
--PROD_FLAGS=-O -fno-builtin -DFREEBSD -pipe -MMD -fPIC
--DEV_FLAGS=-ggdb -DFREEBSD -pipe -MMD -p -fPIC -Wall -Wno-non-virtual-dtor
-+COMMON_FLAGS=-DFREEBSD -pipe -MMD -fPIC
-+PROD_FLAGS=$(COMMON_FLAGS) -O0 -g -fno-builtin -Wno-deprecated
-+DEV_FLAGS=$(COMMON_FLAGS) -ggdb -p -Wall -Wno-non-virtual-dtor
-+
-+# This file must be compiled with SSE4.2 support
-+%/CRC32C.o: COMMON_FLAGS += -msse4
-+
-+# These files are generated incorrectly (e.g. array.epp => array.cpp)
-+%/array.o %/blob.o %/alice_meta.o %/restore.o %/backup.o: COMMON_FLAGS += -Wno-narrowing
-+%/OdsDetection.o %/dba.o: COMMON_FLAGS += -Wno-narrowing
-+
-
diff --git a/databases/firebird30-server/files/patch-builds-posix-prefix.freebsd_amd64 b/databases/firebird30-server/files/patch-builds-posix-prefix.freebsd_amd64
deleted file mode 100644
index dd0f1ae39223..000000000000
--- a/databases/firebird30-server/files/patch-builds-posix-prefix.freebsd_amd64
+++ /dev/null
@@ -1,19 +0,0 @@
---- builds/posix/prefix.freebsd_amd64.orig	2020-10-20 08:40:05 UTC
-+++ builds/posix/prefix.freebsd_amd64
-@@ -20,5 +20,13 @@
- 
- EXE_LINK_OPTIONS+=-Wl,-rpath,../gen/firebird/lib
- 
--PROD_FLAGS=-O -fno-builtin -DFREEBSD -DAMD64 -pipe -MMD -fPIC
--DEV_FLAGS=-ggdb -DFREEBSD -DAMD64 -pipe -MMD -p -fPIC -Wall -Wno-non-virtual-dtor
-+COMMON_FLAGS=-DFREEBSD -DAMD64 -pipe -MMD -fPIC 
-+PROD_FLAGS=$(COMMON_FLAGS) -O0 -g -fno-builtin -Wno-deprecated
-+DEV_FLAGS=$(COMMON_FLAGS) -ggdb -p -Wall -Wno-non-virtual-dtor
-+
-+# This file must be compiled with SSE4.2 support
-+%/CRC32C.o: COMMON_FLAGS += -msse4
-+
-+# These files are generated incorrectly (e.g. array.epp => array.cpp)
-+%/array.o %/blob.o %/alice_meta.o %/restore.o %/backup.o: COMMON_FLAGS += -Wno-narrowing
-+%/OdsDetection.o %/dba.o: COMMON_FLAGS += -Wno-narrowing
-
diff --git a/databases/firebird30-server/files/patch-builds-posix_Makefile.in b/databases/firebird30-server/files/patch-builds-posix_Makefile.in
deleted file mode 100644
index 3957c91179a9..000000000000
--- a/databases/firebird30-server/files/patch-builds-posix_Makefile.in
+++ /dev/null
@@ -1,34 +0,0 @@
---- builds/posix/Makefile.in	2020-10-20 03:40:05.000000000 -0500
-+++ builds/posix/Makefile.in	2021-06-25 00:25:25.389776000 -0500
-@@ -186,16 +186,18 @@
- 	$(MAKE) preliminaryCheck
- 	$(MAKE) boot
- 	$(MAKE) yvalve
-+	$(MAKE) engine
- ifeq ($(IsDeveloper), Y)
- # In developer mode we must regenerate various files in include/gen
- 	$(MAKE) ids
- endif
--	$(MAKE) engine
-+ifeq ($(IsServer), Y)
- 	$(MAKE) fbintl
- 	$(MAKE) utilities
-+endif
- # Now having ready such useful tools as gbak and isql, we may restore / create
- # required databases and switch to full-featured gpre
--	$(MAKE) gpre
-+	$(MAKE) gbak gfix gpre
- # Pay attention - after build force gpre_current to point to gpre
- # even if gpre itself was not rebuilt
- 	-$(RM) $(GPRE_CURRENT)
-@@ -204,8 +206,10 @@
- # In developer mode we must regenerate various files in include/gen
- 	$(MAKE) codes
- endif
-+ifeq ($(IsServer), Y)
- 	$(MAKE) plugins
- 	$(MAKE) examples
-+endif
- 	$(MAKE) rest
- 
- 
diff --git a/databases/firebird30-server/files/patch-builds-posix_Makefile.in.plugins_examples b/databases/firebird30-server/files/patch-builds-posix_Makefile.in.plugins_examples
deleted file mode 100644
index 4a58a2a2fe22..000000000000
--- a/databases/firebird30-server/files/patch-builds-posix_Makefile.in.plugins_examples
+++ /dev/null
@@ -1,12 +0,0 @@
---- builds/posix/Makefile.in.plugins_examples.orig	2021-03-27 11:14:37 UTC
-+++ builds/posix/Makefile.in.plugins_examples
-@@ -99,7 +99,7 @@ AllObjects += $(CA_Objects)
- crypt_app: $(CRYPT_APP)
- 
- $(CRYPT_APP):	$(CA_Objects)
--	$(EXE_LINK) $^ -o $@ $(FIREBIRD_LIBRARY_LINK)
-+	$(EXE_LINK) $^ -o $@ $(LDFLAGS) $(FIREBIRD_LIBRARY_LINK)
- 
- 
- include $(ROOT)/gen/make.shared.targets
-
diff --git a/databases/firebird30-server/files/patch-builds_install_misc_firebird.conf.in b/databases/firebird30-server/files/patch-builds_install_misc_firebird.conf.in
index 953e438de696..ac685450a0b5 100644
--- a/databases/firebird30-server/files/patch-builds_install_misc_firebird.conf.in
+++ b/databases/firebird30-server/files/patch-builds_install_misc_firebird.conf.in
@@ -1,12 +1,11 @@
---- builds/install/misc/firebird.conf.in.orig	2020-10-12 00:02:22 UTC
+--- builds/install/misc/firebird.conf.in.orig	2022-06-07 08:18:52 UTC
 +++ builds/install/misc/firebird.conf.in
 @@ -189,7 +189,7 @@
  #
  # Type: string (special format)
  #
 -#UdfAccess = Restrict UDF
-+UdfAccess = Restrict %%PREFIX%%/libexec/firebird/udf
++UdfAccess = Restrict /usr/local/libexec/firebird/udf
  
  
  # ----------------------------
-
diff --git a/databases/firebird30-server/files/patch-builds_posix_Makefile.in b/databases/firebird30-server/files/patch-builds_posix_Makefile.in
new file mode 100644
index 000000000000..8092243be081
--- /dev/null
+++ b/databases/firebird30-server/files/patch-builds_posix_Makefile.in
@@ -0,0 +1,21 @@
+--- builds/posix/Makefile.in.orig	2022-06-07 08:18:52 UTC
++++ builds/posix/Makefile.in
+@@ -191,16 +191,16 @@ master_process:
+ 	$(MAKE) preliminaryCheck
+ 	$(MAKE) boot
+ 	$(MAKE) yvalve
++	$(MAKE) engine
+ ifeq ($(IsDeveloper), Y)
+ # In developer mode we must regenerate various files in include/gen
+ 	$(MAKE) ids
+ endif
+-	$(MAKE) engine
+ 	$(MAKE) fbintl
+ 	$(MAKE) utilities
+ # Now having ready such useful tools as gbak and isql, we may restore / create
+ # required databases and switch to full-featured gpre
+-	$(MAKE) gpre
++	$(MAKE) gbak gfix gpre
+ # Pay attention - after build force gpre_current to point to gpre
+ # even if gpre itself was not rebuilt
+ 	-$(RM) $(GPRE_CURRENT)
diff --git a/databases/firebird30-server/files/patch-builds_posix_Makefile.in.plugins__examples b/databases/firebird30-server/files/patch-builds_posix_Makefile.in.plugins__examples
new file mode 100644
index 000000000000..a3cd068de57b
--- /dev/null
+++ b/databases/firebird30-server/files/patch-builds_posix_Makefile.in.plugins__examples
@@ -0,0 +1,11 @@
+--- builds/posix/Makefile.in.plugins_examples.orig	2022-06-07 08:18:52 UTC
++++ builds/posix/Makefile.in.plugins_examples
+@@ -99,7 +99,7 @@ AllObjects += $(CA_Objects)
+ crypt_app: $(CRYPT_APP)
+ 
+ $(CRYPT_APP):	$(CA_Objects)
+-	$(EXE_LINK) $^ -o $@ $(FIREBIRD_LIBRARY_LINK)
++	$(EXE_LINK) $^ -o $@ $(LDFLAGS) $(FIREBIRD_LIBRARY_LINK)
+ 
+ 
+ include $(ROOT)/gen/make.shared.targets
diff --git a/databases/firebird30-server/files/patch-builds_posix_empty.vers b/databases/firebird30-server/files/patch-builds_posix_empty.vers
index 598107119be9..8ca57ab7e436 100644
--- a/databases/firebird30-server/files/patch-builds_posix_empty.vers
+++ b/databases/firebird30-server/files/patch-builds_posix_empty.vers
@@ -1,4 +1,4 @@
---- builds/posix/empty.vers.orig	2020-10-12 00:02:22 UTC
+--- builds/posix/empty.vers.orig	2022-06-07 08:18:52 UTC
 +++ builds/posix/empty.vers
 @@ -21,3 +21,5 @@
  #  Contributor(s): ______________________________________.
@@ -6,4 +6,3 @@
  main
 +__progname
 +environ
-
diff --git a/databases/firebird30-server/files/patch-builds_posix_make.defaults b/databases/firebird30-server/files/patch-builds_posix_make.defaults
index b30b259a6848..79982d81f157 100644
--- a/databases/firebird30-server/files/patch-builds_posix_make.defaults
+++ b/databases/firebird30-server/files/patch-builds_posix_make.defaults
@@ -1,6 +1,6 @@
---- builds/posix/make.defaults	2020-10-20 03:40:05.000000000 -0500
-+++ builds/posix/make.defaults	2021-06-25 00:23:49.718147000 -0500
-@@ -134,7 +134,7 @@
+--- builds/posix/make.defaults.orig	2022-06-07 08:18:52 UTC
++++ builds/posix/make.defaults
+@@ -134,7 +134,7 @@ CAS_OPTIONS=@CAS_OPTIONS@
  MATHLIB=@MATHLIB@
  
  # switch to make sed edit files inplace
@@ -9,7 +9,7 @@
  
  # Default programs and tools to be used in the build process
  
-@@ -144,7 +144,7 @@
+@@ -144,7 +144,7 @@ RM_R=		rm -rf
  CHMOD=			chmod
  CHMOD_6=		chmod 666
  CHMOD_7=		chmod 777
@@ -18,7 +18,7 @@
  MV=			mv -f
  TOUCH=			touch
  CP=			cp
-@@ -219,7 +219,7 @@
+@@ -219,7 +219,7 @@ vpath %.dll $(LIB)
  #LibraryFileName=libfbclient
  LibraryFileName=libfbclient
  LibraryFullName=$(LibraryFileName).${SHRLIB_EXT}.${FirebirdVersion}
@@ -27,7 +27,7 @@
  LibraryBaseName=$(LibraryFileName).${SHRLIB_EXT}
  
  LIBFIREBIRD_FULLNAME = $(LIB)/$(LibraryFullName)
-@@ -240,7 +240,7 @@
+@@ -240,7 +240,7 @@ LIBFBINTL_SO = $(FB_BUILD)/intl/$(LIB_PREFIX)fbintl.$(
  
  ifeq ($(EDITLINE_FLG),Y)
    ifeq ($(STD_EDITLINE), true)
@@ -36,7 +36,7 @@
    else
  	LIBEDITLINE := $(LIB)/libedit.a
    endif
-@@ -362,7 +362,7 @@
+@@ -362,7 +362,7 @@ CREATE_DB	= $(RBIN)/create_db$(EXEC_EXT)
  GDS_DROP	= $(BIN)/gds_drop$(EXEC_EXT)
  FBSVCMGR	= $(BIN)/fbsvcmgr$(EXEC_EXT)
  FBTRACEMGR	= $(BIN)/fbtracemgr$(EXEC_EXT)
@@ -45,7 +45,7 @@
  NBACKUP		= $(BIN)/nbackup$(EXEC_EXT)
  LOCKPRINT	= $(BIN)/fb_lock_print$(EXEC_EXT)
  GSEC		= $(BIN)/gsec$(EXEC_EXT)
-@@ -383,13 +383,13 @@
+@@ -383,13 +383,13 @@ SECURITY_FDB	= $(FIREBIRD)/security3.fdb
  QLI            = $(BIN)/qli$(EXEC_EXT)
  
  # From isql
diff --git a/databases/firebird30-server/files/patch-builds_posix_prefix.freebsd b/databases/firebird30-server/files/patch-builds_posix_prefix.freebsd
new file mode 100644
index 000000000000..9734f4083aa3
--- /dev/null
+++ b/databases/firebird30-server/files/patch-builds_posix_prefix.freebsd
@@ -0,0 +1,19 @@
+--- builds/posix/prefix.freebsd.orig	2022-06-07 08:18:52 UTC
++++ builds/posix/prefix.freebsd
+@@ -20,5 +20,14 @@
+ 
+ EXE_LINK_OPTIONS+=-Wl,-rpath,../gen/firebird/lib
+ 
+-PROD_FLAGS=-O -fno-builtin -DFREEBSD -pipe -MMD -fPIC
+-DEV_FLAGS=-ggdb -DFREEBSD -pipe -MMD -p -fPIC -Wall -Wno-non-virtual-dtor
++COMMON_FLAGS=-DFREEBSD -pipe -MMD -fPIC
++PROD_FLAGS=$(COMMON_FLAGS) -O0 -g -fno-builtin -Wno-deprecated
++DEV_FLAGS=$(COMMON_FLAGS) -ggdb -p -Wall -Wno-non-virtual-dtor
++
++# This file must be compiled with SSE4.2 support
++%/CRC32C.o: COMMON_FLAGS += -msse4
++
++# These files are generated incorrectly (e.g. array.epp => array.cpp)
++%/array.o %/blob.o %/alice_meta.o %/restore.o %/backup.o: COMMON_FLAGS += -Wno-narrowing
++%/OdsDetection.o %/dba.o: COMMON_FLAGS += -Wno-narrowing
++
diff --git a/databases/firebird30-server/files/patch-builds_posix_prefix.freebsd__amd64 b/databases/firebird30-server/files/patch-builds_posix_prefix.freebsd__amd64
new file mode 100644
index 000000000000..d51c1af1e2d6
--- /dev/null
+++ b/databases/firebird30-server/files/patch-builds_posix_prefix.freebsd__amd64
@@ -0,0 +1,18 @@
+--- builds/posix/prefix.freebsd_amd64.orig	2022-06-07 08:18:52 UTC
++++ builds/posix/prefix.freebsd_amd64
+@@ -20,5 +20,13 @@
+ 
+ EXE_LINK_OPTIONS+=-Wl,-rpath,../gen/firebird/lib
+ 
+-PROD_FLAGS=-O -fno-builtin -DFREEBSD -DAMD64 -pipe -MMD -fPIC
+-DEV_FLAGS=-ggdb -DFREEBSD -DAMD64 -pipe -MMD -p -fPIC -Wall -Wno-non-virtual-dtor
++COMMON_FLAGS=-DFREEBSD -DAMD64 -pipe -MMD -fPIC 
++PROD_FLAGS=$(COMMON_FLAGS) -O0 -g -fno-builtin -Wno-deprecated
++DEV_FLAGS=$(COMMON_FLAGS) -ggdb -p -Wall -Wno-non-virtual-dtor
++
++# This file must be compiled with SSE4.2 support
++%/CRC32C.o: COMMON_FLAGS += -msse4
++
++# These files are generated incorrectly (e.g. array.epp => array.cpp)
++%/array.o %/blob.o %/alice_meta.o %/restore.o %/backup.o: COMMON_FLAGS += -Wno-narrowing
++%/OdsDetection.o %/dba.o: COMMON_FLAGS += -Wno-narrowing
diff --git a/databases/firebird30-server/files/patch-builds_posix_vers.sh.in b/databases/firebird30-server/files/patch-builds_posix_vers.sh.in
new file mode 100644
index 000000000000..da2abd316bb7
--- /dev/null
+++ b/databases/firebird30-server/files/patch-builds_posix_vers.sh.in
@@ -0,0 +1,10 @@
+--- builds/posix/vers.sh.in.orig	2022-06-07 08:18:52 UTC
++++ builds/posix/vers.sh.in
+@@ -57,7 +57,6 @@ platform_linux() {
+ 		echo "${TAB}$i;"
+ 	done
+ 
+-	echo "${TAB}_IO_stdin_used;"
+ 	echo 'local:'
+ 	echo "${TAB}*;"
+ 	echo '};'
diff --git a/databases/firebird30-server/files/patch-extern_btyacc_Makefile b/databases/firebird30-server/files/patch-extern_btyacc_Makefile
index defaa3243e5b..24cb5ddee87a 100644
--- a/databases/firebird30-server/files/patch-extern_btyacc_Makefile
+++ b/databases/firebird30-server/files/patch-extern_btyacc_Makefile
@@ -1,4 +1,4 @@
---- extern/btyacc/Makefile.orig	2020-10-12 00:02:22 UTC
+--- extern/btyacc/Makefile.orig	2022-06-07 08:18:52 UTC
 +++ extern/btyacc/Makefile
 @@ -42,7 +42,7 @@ OTHERS	      = README README.BYACC \
  all:		$(PROGRAM)
@@ -9,4 +9,3 @@
  
  clean:;		rm -f $(OBJS)
  
-
diff --git a/databases/firebird30-server/files/patch-extern_cloop_Makefile b/databases/firebird30-server/files/patch-extern_cloop_Makefile
index 8c4b33ba7dac..4f1e65880bbd 100644
--- a/databases/firebird30-server/files/patch-extern_cloop_Makefile
+++ b/databases/firebird30-server/files/patch-extern_cloop_Makefile
@@ -1,4 +1,4 @@
---- extern/cloop/Makefile	2020-10-12 00:02:22 UTC
+--- extern/cloop/Makefile.orig	2022-06-07 08:18:52 UTC
 +++ extern/cloop/Makefile
 @@ -6,7 +6,7 @@ TARGET	:= release
  
@@ -9,7 +9,7 @@
  
  SRC_DIR		:= src
  BUILD_DIR	:= build
-@@ -27,8 +27,9 @@ SRCS_CPP := $(foreach sdir,$(SRC_DIRS),$
+@@ -27,8 +27,9 @@ SRCS_CPP := $(foreach sdir,$(SRC_DIRS),$(wildcard $(sd
  OBJS_C := $(patsubst $(SRC_DIR)/%.c,$(OBJ_DIR)/%.o,$(SRCS_C))
  OBJS_CPP := $(patsubst $(SRC_DIR)/%.cpp,$(OBJ_DIR)/%.o,$(SRCS_CPP))
  
@@ -21,4 +21,3 @@
  FPC_FLAGS := -Mdelphi
  
  ifeq ($(TARGET),release)
-
diff --git a/databases/firebird30-server/files/patch-src-jrd-os-posix_unix.cpp b/databases/firebird30-server/files/patch-src-jrd-os-posix_unix.cpp
deleted file mode 100644
index 6c9dc50ba31d..000000000000
--- a/databases/firebird30-server/files/patch-src-jrd-os-posix_unix.cpp
+++ /dev/null
@@ -1,25 +0,0 @@
---- src/jrd/os/posix/unix.cpp	2021-06-22 00:38:07.434896000 -0500
-+++ src/jrd/os/posix/unix.cpp	2021-06-22 00:43:54.988645000 -0500
-@@ -56,6 +56,13 @@
- #include <linux/fs.h>
- #endif
- 
-+#ifdef FREEBSD
-+#include <sys/disk.h>
-+#define BLKGETSIZE64 DIOCGMEDIASIZE
-+#define BLKGETSIZE DIOCGMEDIASIZE
-+#define BLKSSZGET DIOCGSECTORSIZE
-+#endif
-+
- #endif //SUPPORT_RAW_DEVICES
- 
- #include "../jrd/jrd.h"
-@@ -495,7 +502,7 @@
- // Looks like any OS needs own ioctl() to determine raw device size
- #undef HAS_RAW_SIZE
- 
--#ifdef LINUX
-+#if defined(LINUX) || defined(FREEBSD)
- #ifdef BLKGETSIZE64
- 		if (ioctl(file->fil_desc, BLKGETSIZE64, &length) != 0)
- #endif /*BLKGETSIZE64*/
diff --git a/databases/firebird30-server/files/patch-src_common_os_posix_SyncSignals.cpp b/databases/firebird30-server/files/patch-src_common_os_posix_SyncSignals.cpp
index 159ee13a99c0..f24f4e93b82f 100644
--- a/databases/firebird30-server/files/patch-src_common_os_posix_SyncSignals.cpp
+++ b/databases/firebird30-server/files/patch-src_common_os_posix_SyncSignals.cpp
@@ -1,4 +1,4 @@
---- src/common/os/posix/SyncSignals.cpp.orig	2020-10-12 00:02:22 UTC
+--- src/common/os/posix/SyncSignals.cpp.orig	2022-06-07 08:18:52 UTC
 +++ src/common/os/posix/SyncSignals.cpp
 @@ -54,9 +54,6 @@
  #include <errno.h>
@@ -10,4 +10,3 @@
  
  namespace {
  
-
diff --git a/databases/firebird30-server/files/patch-src_jrd_os_posix_unix.cpp b/databases/firebird30-server/files/patch-src_jrd_os_posix_unix.cpp
new file mode 100644
index 000000000000..ffaecc74c81e
--- /dev/null
+++ b/databases/firebird30-server/files/patch-src_jrd_os_posix_unix.cpp
@@ -0,0 +1,25 @@
+--- src/jrd/os/posix/unix.cpp.orig	2022-06-07 08:18:52 UTC
++++ src/jrd/os/posix/unix.cpp
+@@ -56,6 +56,13 @@
+ #include <linux/fs.h>
+ #endif
+ 
++#ifdef FREEBSD
++#include <sys/disk.h>
++#define BLKGETSIZE64 DIOCGMEDIASIZE
++#define BLKGETSIZE DIOCGMEDIASIZE
++#define BLKSSZGET DIOCGSECTORSIZE
++#endif
++
+ #endif //SUPPORT_RAW_DEVICES
+ 
+ #include "../jrd/jrd.h"
+@@ -496,7 +503,7 @@ ULONG PIO_get_number_of_pages(const jrd_file* file, co
+ // Looks like any OS needs own ioctl() to determine raw device size
+ #undef HAS_RAW_SIZE
+ 
+-#ifdef LINUX
++#if defined(LINUX) || defined(FREEBSD)
+ #ifdef BLKGETSIZE64
+ 		if (ioctl(file->fil_desc, BLKGETSIZE64, &length) != 0)
+ #endif /*BLKGETSIZE64*/
diff --git a/databases/firebird30-server/files/patch-src_remote_SockAddr.h b/databases/firebird30-server/files/patch-src_remote_SockAddr.h
deleted file mode 100644
index 30297137c2c5..000000000000
--- a/databases/firebird30-server/files/patch-src_remote_SockAddr.h
+++ /dev/null
@@ -1,25 +0,0 @@
---- src/remote/SockAddr.h.orig	2020-10-12 00:02:22 UTC
-+++ src/remote/SockAddr.h
-@@ -112,11 +112,13 @@ public:
- 
- #define AF_INET6_POSIX		10
- #define AF_INET6_WINDOWS	23
-+#define AF_INET6_BSD		28
- #define AF_INET6_DARWIN		30
- 
- #if AF_INET6 == AF_INET6_POSIX
- #elif AF_INET6 == AF_INET6_WINDOWS
- #elif AF_INET6 == AF_INET6_DARWIN
-+#elif AF_INET6 == AF_INET6_BSD
- #else
- #error Unknown value of AF_INET6 !
- #endif
-@@ -132,6 +134,7 @@ inline void SockAddr::checkAndFixFamily(
- 	case AF_INET6_POSIX:
- 	case AF_INET6_WINDOWS:
- 	case AF_INET6_DARWIN:
-+	case AF_INET6_BSD:
- 		data.sock.sa_family = AF_INET6;
- 		fb_assert(len == sizeof(sockaddr_in6));
- 		break;
-
diff --git a/databases/firebird30-server/files/patch-src_remote_inet.cpp b/databases/firebird30-server/files/patch-src_remote_inet.cpp
index 6b45a4f61e75..269a80fd8457 100644
--- a/databases/firebird30-server/files/patch-src_remote_inet.cpp
+++ b/databases/firebird30-server/files/patch-src_remote_inet.cpp
@@ -1,6 +1,6 @@
---- src/remote/inet.cpp.orig	2020-10-20 08:40:05 UTC
+--- src/remote/inet.cpp.orig	2022-06-07 08:18:52 UTC
 +++ src/remote/inet.cpp
-@@ -962,7 +962,7 @@ rem_port* INET_connect(const TEXT* name,
+@@ -960,7 +960,7 @@ rem_port* INET_connect(const TEXT* name,
  		gai_hints.ai_family = ((host.hasData() || !ipv6) ? AF_UNSPEC : AF_INET6);
  	gai_hints.ai_socktype = SOCK_STREAM;
  
@@ -9,7 +9,7 @@
  	gai_hints.ai_protocol = SOL_TCP;
  #else
  	gai_hints.ai_protocol = IPPROTO_TCP;
-@@ -1176,6 +1176,12 @@ static rem_port* listener_socket(rem_port* port, USHOR
+@@ -1174,6 +1174,12 @@ static rem_port* listener_socket(rem_port* port, USHOR
  	setFastLoopbackOption(port);
  
  	inet_ports->registerPort(port);
@@ -22,4 +22,3 @@
  
  	if (flag & SRVR_multi_client)
  	{
-
diff --git a/databases/firebird30-server/pkg-descr b/databases/firebird30-server/pkg-descr
index f57481ef1afe..9bef30a4a164 100644
--- a/databases/firebird30-server/pkg-descr
+++ b/databases/firebird30-server/pkg-descr
@@ -8,5 +8,4 @@ Firebird is completely free of any registration, licensing or deployment
 fees.  It may be deployed freely for use with any third-party software,
 whether commercial or not.
 
-WWW: https://sourceforge.net/projects/firebird/
-WWW: http://www.firebirdsql.org/
+See also: https://sourceforge.net/projects/firebird/
diff --git a/databases/firebird40-server/Makefile b/databases/firebird40-server/Makefile
index 2ad75a3dd7cd..4b228bca2ee3 100644
--- a/databases/firebird40-server/Makefile
+++ b/databases/firebird40-server/Makefile
@@ -1,14 +1,14 @@
 PORTNAME=	firebird
-PORTVERSION=	4.0.0
-PORTREVISION=	1
+PORTVERSION=	4.0.4
 CATEGORIES?=	databases
 MASTER_SITES=	https://github.com/FirebirdSQL/${PORTNAME}/releases/download/v${PORTVERSION}/
 PKGNAMESUFFIX?=	${PORTVERSION:R:S/.//}-server
-DISTNAME=	${PORTNAME:S/f/F/}-${PORTVERSION}.2496-0
+DISTNAME=	${PORTNAME:S/f/F/}-${PORTVERSION}.3010-0
 DIST_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	acm@FreeBSD.org
 COMMENT?=	Firebird-4 relational database (server)
+WWW=		https://www.firebirdsql.org/
 
 LICENSE=	IDPL IPL
 LICENSE_COMB=	multi
@@ -23,7 +23,7 @@ LIB_DEPENDS=	libicuuc.so:devel/icu \
 		libtommath.so:math/libtommath \
 		libtomcrypt.so:security/libtomcrypt
 
-CONFLICTS_INSTALL=	firebird25-* firebird30-*
+CONFLICTS_INSTALL=	firebird30
 
 USES=		cpe gmake pkgconfig localbase:ldflags libedit tar:xz
 USE_CXXSTD=	c++11
@@ -63,9 +63,7 @@ LD=	${CC}
 # Don't strip binary files
 STRIP=
 
-ONLY_FOR_ARCHS=	i386 amd64
-# sparc64 fails due to lack of valid AtomicCounter implementation in
-# src/common/classes/fb_atomic.h; presumably other tier-2s would as well
+ONLY_FOR_ARCHS=	i386 amd64 powerpc64le
 
 INSTALL_FB=	${INSTALL} ${COPY}
 
diff --git a/databases/firebird40-server/distinfo b/databases/firebird40-server/distinfo
index f106b999cca5..802b94a3def2 100644
--- a/databases/firebird40-server/distinfo
+++ b/databases/firebird40-server/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1624676837
-SHA256 (firebird/Firebird-4.0.0.2496-0.tar.xz) = c155b8893e39d27c90f164d4865a7940749f47e971c7da6cf4828c980c708a57
-SIZE (firebird/Firebird-4.0.0.2496-0.tar.xz) = 30522192
+TIMESTAMP = 1705444780
+SHA256 (firebird/Firebird-4.0.4.3010-0.tar.xz) = 9ae13f9a1b5e9a36acfdd27b0dcd57b29d8d161f4f0199b18c6b8a183e9d4a75
+SIZE (firebird/Firebird-4.0.4.3010-0.tar.xz) = 30691012
diff --git a/databases/firebird40-server/files/patch-builds_posix_prefix.freebsd__powerpc64el b/databases/firebird40-server/files/patch-builds_posix_prefix.freebsd__powerpc64el
new file mode 100644
index 000000000000..dd3d616d4338
--- /dev/null
+++ b/databases/firebird40-server/files/patch-builds_posix_prefix.freebsd__powerpc64el
@@ -0,0 +1,32 @@
+--- builds/posix/prefix.freebsd_powerpc64el.orig	2022-12-12 01:03:21 UTC
++++ builds/posix/prefix.freebsd_powerpc64el
+@@ -0,0 +1,29 @@
++# The contents of this file are subject to the Interbase Public
++# License Version 1.0 (the "License"); you may not use this file
++# except in compliance with the License. You may obtain a copy
++# of the License at http://www.Inprise.com/IPL.html
++#
++# Software distributed under the License is distributed on an
++# "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either express
++# or implied. See the License for the specific language governing
++# rights and limitations under the License.
++#
++# The Original Code was created by Inprise Corporation
++# and its predecessors. Portions created by Inprise Corporation are
++#
++# Copyright (C) 2000 Inprise Corporation
++# All Rights Reserved.
++# Contributor(s): ______________________________________.
++# Start of file prefix.freebsd_powerpc64el:	$(VERSION)	@PLATFORM@
++#
++# 2 Oct 2002, Nickolay Samofatov - Major Cleanup
++
++EXE_LINK_OPTIONS := $(LDFLAGS) $(THR_FLAGS) $(UNDEF_FLAGS) $(LIB_PATH_OPTS) -Wl,-rpath,../gen/firebird/lib
++
++COMMON_FLAGS=-DFREEBSD -DPPC64EL -pipe -MMD -fPIC -fsigned-char
++PROD_FLAGS=$(COMMON_FLAGS) -O3 -g -fno-builtin -Wno-deprecated
++DEV_FLAGS=$(COMMON_FLAGS) -ggdb -p -Wall -Wno-non-virtual-dtor
++
++# These files are generated incorrectly (e.g. array.epp => array.cpp)
++%/array.o %/blob.o %/alice_meta.o %/restore.o %/backup.o: COMMON_FLAGS += -Wno-narrowing
++%/OdsDetection.o %/dba.o: COMMON_FLAGS += -Wno-narrowing
diff --git a/databases/firebird40-server/files/patch-builds_posix_vers.sh.in b/databases/firebird40-server/files/patch-builds_posix_vers.sh.in
new file mode 100644
index 000000000000..9bd98223e361
--- /dev/null
+++ b/databases/firebird40-server/files/patch-builds_posix_vers.sh.in
@@ -0,0 +1,10 @@
+--- builds/posix/vers.sh.in.orig	2022-08-10 09:04:28 UTC
++++ builds/posix/vers.sh.in
+@@ -57,7 +57,6 @@ platform_linux() {
+ 		echo "${TAB}$i;"
+ 	done
+ 
+-	echo "${TAB}_IO_stdin_used;"
+ 	echo 'local:'
+ 	echo "${TAB}*;"
+ 	echo '};'
diff --git a/databases/firebird40-server/files/patch-configure b/databases/firebird40-server/files/patch-configure
new file mode 100644
index 000000000000..2cd41f32a632
--- /dev/null
+++ b/databases/firebird40-server/files/patch-configure
@@ -0,0 +1,23 @@
+--- configure.orig	2022-07-28 00:58:22 UTC
++++ configure
+@@ -2985,6 +2985,20 @@ $as_echo "#define AMD64 1" >>confdefs.h
+     SHRLIB_EXT=so
+     ;;
+ 
++  powerpc64le-*-freebsd*)
++    MAKEFILE_PREFIX=freebsd_powerpc64el
++    PLATFORM=FREEBSD
++    INSTALL_PREFIX=freebsd
++
++$as_echo "#define FREEBSD 1" >>confdefs.h
++
++
++$as_echo "#define PPC64EL 1" >>confdefs.h
++
++    EDITLINE_FLG=Y
++    SHRLIB_EXT=so
++    ;;
++
+   *-gentoo-freebsd*)
+     MAKEFILE_PREFIX=freebsd
+     PLATFORM=GENTOOFREEBSD
diff --git a/databases/firebird40-server/files/patch-extern_cloop_Makefile b/databases/firebird40-server/files/patch-extern_cloop_Makefile
index ccc6f08bcc04..f5ca1c8dd566 100644
--- a/databases/firebird40-server/files/patch-extern_cloop_Makefile
+++ b/databases/firebird40-server/files/patch-extern_cloop_Makefile
@@ -1,6 +1,6 @@
---- extern/cloop/Makefile.orig	2020-10-12 00:02:22 UTC
-+++ extern/cloop/Makefile
-@@ -6,7 +6,7 @@ TARGET	:= release
+--- extern/cloop/Makefile.orig	2022-08-10 04:04:28.000000000 -0500
++++ extern/cloop/Makefile	2022-11-21 20:57:09.474150000 -0500
+@@ -6,7 +6,7 @@
  
  CC	:= $(CC)
  CXX	:= $(CXX)
@@ -9,16 +9,15 @@
  
  SRC_DIR		:= src
  BUILD_DIR	:= build
-@@ -27,8 +27,9 @@ SRCS_CPP := $(foreach sdir,$(SRC_DIRS),$
+@@ -27,8 +27,9 @@
  OBJS_C := $(patsubst $(SRC_DIR)/%.c,$(OBJ_DIR)/%.o,$(SRCS_C))
  OBJS_CPP := $(patsubst $(SRC_DIR)/%.cpp,$(OBJ_DIR)/%.o,$(SRCS_CPP))
  
 -C_FLAGS := -ggdb -fPIC -MMD -MP -W -Wall -Wno-unused-parameter
--CXX_FLAGS := $(C_FLAGS)
+-CXX_FLAGS := $(C_FLAGS) -std=c++11
 +COMMON_C_FLAGS := -ggdb -fPIC -MMD -MP -W -Wall -Wno-unused-parameter
 +C_FLAGS := $(COMMON_C_FLAGS) $(CFLAGS) $(CPPFLAGS)
-+CXX_FLAGS := $(COMMON_C_FLAGS) $(CXXFLAGS) $(CPPFLAGS)
- FPC_FLAGS := -Mdelphi
++CXX_FLAGS := $(COMMON_C_FLAGS) $(CXXFLAGS) $(CPPFLAGS) -std=c++11
+ FPC_FLAGS := -Mdelphi -Cg
  
- ifeq ($(TARGET),release)
-
+ ifeq ($(shell uname),FreeBSD)
diff --git a/databases/firebird40-server/files/patch-src_common_classes_DbImplementation.cpp b/databases/firebird40-server/files/patch-src_common_classes_DbImplementation.cpp
new file mode 100644
index 000000000000..d2a5780bbbfb
--- /dev/null
+++ b/databases/firebird40-server/files/patch-src_common_classes_DbImplementation.cpp
@@ -0,0 +1,11 @@
+--- src/common/classes/DbImplementation.cpp.orig	2022-12-12 01:04:38 UTC
++++ src/common/classes/DbImplementation.cpp
+@@ -126,7 +126,7 @@ const UCHAR backwardTable[FB_NELEM(hardware) * FB_NELE
+ /* HPUX */		0,		0,		0,		0,		0,		0,		0,		0,		0,		0,		0,		0,		0,		31,		0,		0,		0,		0,		0,
+ /* AIX */		0,		0,		0,		35,		0,		0,		0,		0,		0,		0,		0,		0,		0,		0,		0,		0,		0,		0,		0,
+ /* MVS */		0,		0,		0,		0,		0,		0,		0,		0,		0,		0,		0,		0,		0,		0,		0,		0,		0,		0,		0,
+-/* FreeBSD */	61,		67,		0,		0,		0,		0,		0,		0,		0,		0,		0,		0,		0,		0,		0,		0,		0,		0,		0,
++/* FreeBSD */	61,		67,		0,		0,		0,		0,		0,		0,		0,		0,		0,		0,		0,		0,		0,		0,		89,		0,		0,
+ /* NetBSD */	62,		0,		0,		0,		0,		0,		0,		0,		0,		0,		0,		0,		0,		0,		0,		0,		0,		0,		0
+ };
+ 
diff --git a/databases/firebird40-server/files/patch-src_include_firebird_impl_inf__pub.h b/databases/firebird40-server/files/patch-src_include_firebird_impl_inf__pub.h
new file mode 100644
index 000000000000..85f7739f4818
--- /dev/null
+++ b/databases/firebird40-server/files/patch-src_include_firebird_impl_inf__pub.h
@@ -0,0 +1,11 @@
+--- src/include/firebird/impl/inf_pub.h.orig	2022-12-12 01:05:33 UTC
++++ src/include/firebird/impl/inf_pub.h
+@@ -298,6 +298,8 @@ enum  info_db_implementations
+ 	isc_info_db_impl_linux_m68k = 87,
+ 	isc_info_db_impl_linux_riscv64 = 88,
+ 
++	isc_info_db_impl_freebsd_ppc64el = 89,
++
+ 	isc_info_db_impl_last_value   // Leave this LAST!
+ };
+ 
diff --git a/databases/firebird40-server/files/patch-src_remote_SockAddr.h b/databases/firebird40-server/files/patch-src_remote_SockAddr.h
deleted file mode 100644
index 30297137c2c5..000000000000
--- a/databases/firebird40-server/files/patch-src_remote_SockAddr.h
+++ /dev/null
@@ -1,25 +0,0 @@
---- src/remote/SockAddr.h.orig	2020-10-12 00:02:22 UTC
-+++ src/remote/SockAddr.h
-@@ -112,11 +112,13 @@ public:
- 
- #define AF_INET6_POSIX		10
- #define AF_INET6_WINDOWS	23
-+#define AF_INET6_BSD		28
- #define AF_INET6_DARWIN		30
- 
- #if AF_INET6 == AF_INET6_POSIX
- #elif AF_INET6 == AF_INET6_WINDOWS
- #elif AF_INET6 == AF_INET6_DARWIN
-+#elif AF_INET6 == AF_INET6_BSD
- #else
- #error Unknown value of AF_INET6 !
- #endif
-@@ -132,6 +134,7 @@ inline void SockAddr::checkAndFixFamily(
- 	case AF_INET6_POSIX:
- 	case AF_INET6_WINDOWS:
- 	case AF_INET6_DARWIN:
-+	case AF_INET6_BSD:
- 		data.sock.sa_family = AF_INET6;
- 		fb_assert(len == sizeof(sockaddr_in6));
- 		break;
-
diff --git a/databases/firebird40-server/pkg-descr b/databases/firebird40-server/pkg-descr
index f57481ef1afe..9bef30a4a164 100644
--- a/databases/firebird40-server/pkg-descr
+++ b/databases/firebird40-server/pkg-descr
@@ -8,5 +8,4 @@ Firebird is completely free of any registration, licensing or deployment
 fees.  It may be deployed freely for use with any third-party software,
 whether commercial or not.
 
-WWW: https://sourceforge.net/projects/firebird/
-WWW: http://www.firebirdsql.org/
+See also: https://sourceforge.net/projects/firebird/
diff --git a/databases/fortytwo-bdb/Makefile b/databases/fortytwo-bdb/Makefile
index eb452c37e5dc..a125bef5bb6b 100644
--- a/databases/fortytwo-bdb/Makefile
+++ b/databases/fortytwo-bdb/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	bdb
 PORTVERSION=	0.2.1
-PORTREVISION=	11
+PORTREVISION=	12
 CATEGORIES=	databases gnustep
 MASTER_SITES=	SF/fortytwo/Berkeley%20DB%20Wrapper%20%28BDB%29/${PORTVERSION}
 PKGNAMEPREFIX=	fortytwo-
@@ -9,6 +9,7 @@ DISTFILES=	BDB-${PORTVERSION}-src.tgz \
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Interface to Berkeley DB for GNUstep
+WWW=		https://fortytwo.sourceforge.net/
 
 LICENSE=	LGPL21+
 LICENSE_FILE=	${WRKSRC}/LICENSE
diff --git a/databases/fortytwo-bdb/pkg-descr b/databases/fortytwo-bdb/pkg-descr
index a06069ea3e18..75ef63c67916 100644
--- a/databases/fortytwo-bdb/pkg-descr
+++ b/databases/fortytwo-bdb/pkg-descr
@@ -6,5 +6,3 @@ classes and mechanisms offered by the Foundation library.
 
 In its present state BDB just offers a reduced set of functionality of
 Berkeley DB.
-
-WWW: http://fortytwo.sourceforge.net/
diff --git a/databases/foundationdb-devel/Makefile b/databases/foundationdb-devel/Makefile
deleted file mode 100644
index ddda28966943..000000000000
--- a/databases/foundationdb-devel/Makefile
+++ /dev/null
@@ -1,86 +0,0 @@
-PORTNAME=	foundationdb-devel
-DISTVERSION=	7.0.0.a.20210529
-CATEGORIES=	databases
-
-# PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/pull/
-
-MAINTAINER=	dch@FreeBSD.org
-COMMENT=	Distributed, transactional key-value store
-
-LICENSE=	APACHE20
-LICENSE_FILE=	${WRKSRC}/LICENSE
-
-BROKEN_FreeBSD_11=	requires newer OpenSSL
-ONLY_FOR_ARCHS=	aarch64 amd64
-ONLY_FOR_ARCHS_REASON=	not yet ported to anything else
-
-BUILD_DEPENDS=	${LOCALBASE}/include/doctest/doctest.h:devel/doctest \
-		${LOCALBASE}/include/toml.hpp:devel/toml11 \
-		bash:shells/bash \
-		git:devel/git
-
-LIB_DEPENDS=	libboost_system.so:devel/boost-libs \
-		libeio.so:devel/libeio
-
-USES=		cmake compiler:c++17-lang mono:build python:build shebangfix \
-		ssl
-USE_GITHUB=	yes
-GH_ACCOUNT=	apple
-GH_PROJECT=	foundationdb
-GH_TAGNAME=	d35da1a
-USE_LDCONFIG=	yes
-USE_RC_SUBR=	foundationdb
-
-SHEBANG_FILES=	bindings/c/generate_asm.py
-
-CMAKE_ARGS=	-DOPENSSL_ROOT_DIR=${OPENSSLLIB}
-CMAKE_OFF=	DISABLE_TLS USE_DTRACE USE_JEMALLOC
-
-USERS=		foundationdb
-GROUPS=		foundationdb
-DBDIR?=		/var/db/foundationdb
-LOGDIR?=	/var/log/foundationdb
-
-SUB_FDB=	DB_USER=${USERS} DB_GROUP=${GROUPS} DB_DIR=${DBDIR} \
-		LOG_DIR=${LOGDIR}
-SUB_FILES+=	foundationdb.conf
-SUB_LIST+=	${SUB_FDB}
-PLIST_SUB+=	${SUB_FDB}
-
-post-patch:
-		${REINPLACE_CMD} 's/OPENSSL_USE_STATIC_LIBS TRUE/OPENSSL_USE_STATIC_LIBS FALSE/' \
-		${WRKSRC}/cmake/FDBComponents.cmake
-
-do-install:
-# commands on first line, dev tools on next two
-.for f in fdbbackup fdbcli fdbmonitor fdbserver \
-	    actor_flamegraph fdb_c_performance_test fdb_c_ryw_benchmark \
-	    fdb_c_txn_size_test fdb_flow_tester fdbconvert fdbdecode mako tutorial
-	${INSTALL_PROGRAM} ${WRKDIR}/.build/bin/${f} ${STAGEDIR}${PREFIX}/bin/
-.endfor
-# confirm with upstream if these are actually needed
-.for s in backup_agent dr_agent fastrestore_agent fdbr fdbrestore
-	${RLN} ${STAGEDIR}${PREFIX}/bin/fdbbackup ${STAGEDIR}${PREFIX}/bin/${s}
-.endfor
-# exposed libraries - confirm with upstream
-.for l in libfdb_c.so libfdb_flow.a libfdb_sqlite.a libfdbclient.a \
-	    libfdbrpc.a libflow.a
-	${STRIP_CMD} ${WRKDIR}/.build/lib/${l}
-	${INSTALL_DATA} ${WRKDIR}/.build/lib/${l} ${STAGEDIR}/${PREFIX}/lib/
-.endfor
-# exposed headers - confirm with upstream
-	${MKDIR} ${STAGEDIR}${PREFIX}/include/foundationdb
-	${INSTALL_DATA} ${WRKSRC}/bindings/c/foundationdb/fdb_c.h \
-	    ${STAGEDIR}/${PREFIX}/include/foundationdb/
-	${INSTALL_DATA} ${WRKSRC}/fdbclient/vexillographer/fdb.options \
-	    ${STAGEDIR}/${PREFIX}/include/foundationdb/
-	${INSTALL_DATA} ${WRKDIR}/.build/bindings/c/foundationdb/fdb_c_options.g.h \
-	    ${STAGEDIR}/${PREFIX}/include/foundationdb/
-# runtime related
-	${MKDIR} ${STAGEDIR}${DBDIR} \
-	    ${STAGEDIR}${LOGDIR} \
-	    ${STAGEDIR}${PREFIX}/etc/foundationdb
-	${INSTALL_DATA} ${WRKDIR}/foundationdb.conf \
-	    ${STAGEDIR}${PREFIX}/etc/foundationdb/foundationdb.conf.sample
-
-.include <bsd.port.mk>
diff --git a/databases/foundationdb-devel/distinfo b/databases/foundationdb-devel/distinfo
deleted file mode 100644
index b8f5c558434c..000000000000
--- a/databases/foundationdb-devel/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1622455872
-SHA256 (apple-foundationdb-7.0.0.a.20210529-d35da1a_GH0.tar.gz) = a5cf720028a3d9e3b615c0343f0b2b0637824bff59e80fa809eba32f2b2428d5
-SIZE (apple-foundationdb-7.0.0.a.20210529-d35da1a_GH0.tar.gz) = 9855962
diff --git a/databases/foundationdb-devel/files/foundationdb.conf.in b/databases/foundationdb-devel/files/foundationdb.conf.in
deleted file mode 100644
index 5b47e46f2185..000000000000
--- a/databases/foundationdb-devel/files/foundationdb.conf.in
+++ /dev/null
@@ -1,47 +0,0 @@
-## foundationdb.conf
-##
-## Configuration file for FoundationDB server processes
-## Full documentation is available at
-## https://apple.github.io/foundationdb/configuration.html#the-configuration-file
-
-[fdbmonitor]
-user = %%DB_USER%%
-group = %%DB_GROUP%%
-
-[general]
-restart_delay = 60
-## by default, restart_backoff = restart_delay_reset_interval = restart_delay
-# initial_restart_delay = 0
-# restart_backoff = 60
-# restart_delay_reset_interval = 60
-cluster_file = %%PREFIX%%/etc/foundationdb/fdb.cluster
-# delete_envvars =
-# kill_on_configuration_change = true
-
-## Default parameters for individual fdbserver processes
-[fdbserver]
-command = %%PREFIX%%/bin/fdbserver
-public_address = auto:$ID
-listen_address = public
-datadir = %%DB_DIR%%/data/$ID
-logdir = %%LOG_DIR%%
-# logsize = 10MiB
-# maxlogssize = 100MiB
-# machine_id =
-# datacenter_id =
-# class =
-# memory = 8GiB
-# storage_memory = 1GiB
-# cache_memory = 2GiB
-# metrics_cluster =
-# metrics_prefix =
-
-## An individual fdbserver process with id 4500
-## Parameters set here override defaults from the [fdbserver] section
-[fdbserver.4500]
-
-[backup_agent]
-command = %%PREFIX%%/bin/backup_agent
-logdir = %%LOG_DIR%%
-
-[backup_agent.1]
diff --git a/databases/foundationdb-devel/files/foundationdb.in b/databases/foundationdb-devel/files/foundationdb.in
deleted file mode 100644
index 1bcd503816f8..000000000000
--- a/databases/foundationdb-devel/files/foundationdb.in
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/sh
-
-# PROVIDE: foundationdb
-# REQUIRE: LOGIN
-# BEFORE:  securelevel
-# KEYWORD: shutdown
-
-# Add the following line to /etc/rc.conf to enable `foundationdb':
-#
-#foundationdb_enable="YES"
-#
-# Define config file here to run with different config file:
-#
-#foundationdb_config="xxxxx"
-#
-
-. /etc/rc.subr
-
-name="foundationdb"
-rcvar="${name}_enable"
-foundationdb_enable=${foundationdb_enable:-"NO"}
-command=%%PREFIX%%/bin/fdbmonitor
-pidfile="/var/run/fdbmonitor.pid"
-
-load_rc_config "$name"
-: ${foundationdb_enable="NO"}
-: ${foundationdb_config="%%PREFIX%%/etc/foundationdb/foundationdb.conf"}
-
-command_args="--conffile ${foundationdb_config} --lockfile ${pidfile} --daemonize"
-run_rc_command $1
diff --git a/databases/foundationdb-devel/files/patch-CMakeLists.txt b/databases/foundationdb-devel/files/patch-CMakeLists.txt
deleted file mode 100644
index 0c56c01423fa..000000000000
--- a/databases/foundationdb-devel/files/patch-CMakeLists.txt
+++ /dev/null
@@ -1,12 +0,0 @@
---- CMakeLists.txt.orig	2020-12-28 05:52:45 UTC
-+++ CMakeLists.txt
-@@ -164,7 +164,9 @@ endif()
- add_subdirectory(fdbbackup)
- add_subdirectory(contrib)
- add_subdirectory(tests)
-+if(WITH_FLOWBENCH)
- add_subdirectory(flowbench EXCLUDE_FROM_ALL)
-+endif()
- if(WITH_PYTHON)
-   add_subdirectory(bindings)
- endif()
diff --git a/databases/foundationdb-devel/files/patch-bindings_c_CMakeLists.txt b/databases/foundationdb-devel/files/patch-bindings_c_CMakeLists.txt
deleted file mode 100644
index 37eb53835a66..000000000000
--- a/databases/foundationdb-devel/files/patch-bindings_c_CMakeLists.txt
+++ /dev/null
@@ -1,11 +0,0 @@
---- bindings/c/CMakeLists.txt.orig	2020-12-28 05:52:45 UTC
-+++ bindings/c/CMakeLists.txt
-@@ -100,8 +100,6 @@ if(NOT WIN32)
-   target_link_libraries(fdb_c_ryw_benchmark PRIVATE fdb_c)
-   target_link_libraries(fdb_c_txn_size_test PRIVATE fdb_c)
- 
--  add_dependencies(fdb_c_setup_tests doctest)
--  add_dependencies(fdb_c_unit_tests doctest)
-   target_include_directories(fdb_c_setup_tests PUBLIC ${DOCTEST_INCLUDE_DIR})
-   target_include_directories(fdb_c_unit_tests PUBLIC ${DOCTEST_INCLUDE_DIR})
-   target_link_libraries(fdb_c_setup_tests PRIVATE fdb_c Threads::Threads)
diff --git a/databases/foundationdb-devel/files/patch-bindings_c_test_unit_third__party_CMakeLists.txt b/databases/foundationdb-devel/files/patch-bindings_c_test_unit_third__party_CMakeLists.txt
deleted file mode 100644
index 52509e221e6b..000000000000
--- a/databases/foundationdb-devel/files/patch-bindings_c_test_unit_third__party_CMakeLists.txt
+++ /dev/null
@@ -1,22 +0,0 @@
---- bindings/c/test/unit/third_party/CMakeLists.txt.orig	2021-01-04 00:07:51 UTC
-+++ bindings/c/test/unit/third_party/CMakeLists.txt
-@@ -1,18 +1 @@
--# Download doctest repo.
--include(ExternalProject)
--find_package(Git REQUIRED)
--
--ExternalProject_Add(
--    doctest
--    PREFIX ${CMAKE_BINARY_DIR}/doctest
--    GIT_REPOSITORY https://github.com/onqtam/doctest.git
--    GIT_TAG 1c8da00c978c19e00a434b2b1f854fcffc9fba35 # v2.4.0
--    TIMEOUT 10
--    CONFIGURE_COMMAND ""
--    BUILD_COMMAND ""
--    INSTALL_COMMAND ""
--    LOG_DOWNLOAD ON
--)
--
--ExternalProject_Get_Property(doctest source_dir)
--set(DOCTEST_INCLUDE_DIR ${source_dir}/doctest CACHE INTERNAL "Path to include folder for doctest")
-+set(DOCTEST_INCLUDE_DIR /usr/local/include/doctest CACHE INTERNAL "Path to include folder for doctest")
diff --git a/databases/foundationdb-devel/pkg-descr b/databases/foundationdb-devel/pkg-descr
deleted file mode 100644
index 9c9b5e714097..000000000000
--- a/databases/foundationdb-devel/pkg-descr
+++ /dev/null
@@ -1,16 +0,0 @@
-A massively distributed, transactional key-value store, extensible by
-design, with unparalleled reliability and performance.
-
-FoundationDB is multi-model, meaning you can store many types of data in a
-single database. All data is safely stored, distributed, and replicated
-in the Key-Value Store component. It is easy to install, grow, and
-manage, with a distributed architecture that gracefully scales out, and
-handles faults while acting like a single ACID database. FoundationDB
-provides amazing performance on commodity hardware, allowing you to
-support very heavy loads at low cost. It has been running in production
-for years and been hardened with lessons learned in some of the world's
-largest database deployments. Backing FoundationDB up is an unmatched
-testing system based on a deterministic simulation engine that ensures
-optimal reliability of operations.
-
-WWW: https://www.foundationdb.org/
diff --git a/databases/foundationdb-devel/pkg-plist b/databases/foundationdb-devel/pkg-plist
deleted file mode 100644
index 3f01481e1157..000000000000
--- a/databases/foundationdb-devel/pkg-plist
+++ /dev/null
@@ -1,26 +0,0 @@
-@dir(%%DB_USER%%,%%DB_GROUP%%,) %%DB_DIR%%
-@dir(%%DB_USER%%,%%DB_GROUP%%,) %%LOG_DIR%%
-@sample etc/foundationdb/foundationdb.conf.sample
-bin/actor_flamegraph
-bin/backup_agent
-bin/dr_agent
-bin/fdb_c_performance_test
-bin/fdb_c_ryw_benchmark
-bin/fdb_c_txn_size_test
-bin/fdb_flow_tester
-bin/fdbbackup
-bin/fdbcli
-bin/fdbmonitor
-bin/fdbr
-bin/fdbrestore
-bin/fdbserver
-bin/mako
-include/foundationdb/fdb.options
-include/foundationdb/fdb_c.h
-include/foundationdb/fdb_c_options.g.h
-lib/libfdb_c.so
-lib/libfdb_flow.a
-lib/libfdb_sqlite.a
-lib/libfdbclient.a
-lib/libfdbrpc.a
-lib/libflow.a
diff --git a/databases/foundationdb/Makefile b/databases/foundationdb/Makefile
index 739120dfc3c8..4345514df1fc 100644
--- a/databases/foundationdb/Makefile
+++ b/databases/foundationdb/Makefile
@@ -1,78 +1,98 @@
 PORTNAME=	foundationdb
-DISTVERSION=	6.3.13
+DISTVERSION=	7.1.29
 CATEGORIES=	databases
 
-MAINTAINER=	dch@FreeBSD.org
+# PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/pull/
+
+MAINTAINER=	dmitry.wagin@ya.ru
 COMMENT=	Distributed, transactional key-value store
+WWW=		https://www.foundationdb.org/
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BROKEN_FreeBSD_11=	requires newer OpenSSL
+BROKEN_aarch64=	invalid asm rdtsc
 ONLY_FOR_ARCHS=	aarch64 amd64
 ONLY_FOR_ARCHS_REASON=	not yet ported to anything else
 
-BUILD_DEPENDS=	bash:shells/bash
+BUILD_DEPENDS=	${LOCALBASE}/include/msgpack.hpp:devel/msgpack-cxx \
+		${LOCALBASE}/include/toml.hpp:devel/toml11 \
+		bash:shells/bash \
+		git:devel/git
 LIB_DEPENDS=	libboost_system.so:devel/boost-libs \
 		libeio.so:devel/libeio
 
-USES=		compiler:c++17-lang cmake mono:build python:build shebangfix ssl
+USES=		cmake compiler:c++20-lang mono:build python:build shebangfix \
+		ssl
 USE_GITHUB=	yes
 GH_ACCOUNT=	apple
+GH_PROJECT=	foundationdb
 USE_LDCONFIG=	yes
 USE_RC_SUBR=	foundationdb
 
 SHEBANG_FILES=	bindings/c/generate_asm.py
 
 CMAKE_ARGS=	-DOPENSSL_ROOT_DIR=${OPENSSLLIB}
-CMAKE_OFF=	USE_DTRACE DISABLE_TLS
+CMAKE_OFF=	DISABLE_TLS USE_DTRACE USE_JEMALLOC WITH_CONTRIB WITH_FLOWBENCH
+
+MAKE_ENV=	MONO_REGISTRY_PATH=/tmp/registry
+
+SUB_FILES=	foundationdb.conf
+SUB_LIST=	${SUB_FDB}
 
 USERS=		foundationdb
 GROUPS=		foundationdb
-DBDIR?=		/var/db/foundationdb
-LOGDIR?=	/var/log/foundationdb
 
-SUB_FDB=	DB_USER=${USERS} \
-		DB_GROUP=${GROUPS} \
-		DB_DIR=${DBDIR} \
-		LOG_DIR=${LOGDIR}
-SUB_FILES+=	foundationdb.conf
-SUB_LIST+=	${SUB_FDB}
-PLIST_SUB+=	${SUB_FDB}
+PLIST_SUB=	${SUB_FDB}
+
+FOUNDATIONDB_DBDIR?=	/var/db/foundationdb
+FOUNDATIONDB_ETCDIR?=	${PREFIX}/etc/foundationdb
+FOUNDATIONDB_GROUP?=	foundationdb
+FOUNDATIONDB_LOGDIR?=	/var/log/foundationdb
+FOUNDATIONDB_USER?=	foundationdb
+
+SUB_FDB=	FOUNDATIONDB_DBDIR=${FOUNDATIONDB_DBDIR} \
+		FOUNDATIONDB_ETCDIR=${FOUNDATIONDB_ETCDIR} \
+		FOUNDATIONDB_GROUP=${FOUNDATIONDB_GROUP} \
+		FOUNDATIONDB_LOGDIR=${FOUNDATIONDB_LOGDIR} \
+		FOUNDATIONDB_USER=${FOUNDATIONDB_USER}
 
 post-patch:
 		${REINPLACE_CMD} 's/OPENSSL_USE_STATIC_LIBS TRUE/OPENSSL_USE_STATIC_LIBS FALSE/' \
 		${WRKSRC}/cmake/FDBComponents.cmake
+		${REINPLACE_CMD} 's|%%LOCALBASE%%|${LOCALBASE}|' \
+		${WRKSRC}/bindings/c/test/unit/third_party/CMakeLists.txt
+
 do-install:
-	# commands on first line, dev tools on next two
-.for f in fdbbackup fdbcli fdbmonitor fdbserver \
-	    actor_flamegraph fdb_c_performance_test fdb_c_ryw_benchmark \
-	    fdb_c_txn_size_test fdb_flow_tester fdbconvert fdbdecode mako tutorial
+# commands on first line, dev tools on next two
+.for f in fdbbackup fdbcli fdbmonitor fdbserver actor_flamegraph fdb_flow_tester \
+	fdbconvert fdbdecode tutorial
 	${INSTALL_PROGRAM} ${WRKDIR}/.build/bin/${f} ${STAGEDIR}${PREFIX}/bin/
 .endfor
-	# confirm with upstream if these are actually needed
 .for s in backup_agent dr_agent fastrestore_agent fdbr fdbrestore
 	${RLN} ${STAGEDIR}${PREFIX}/bin/fdbbackup ${STAGEDIR}${PREFIX}/bin/${s}
 .endfor
-	# exposed libraries - confirm with upstream
-.for l in libfdb_c.so libfdb_flow.a libfdb_sqlite.a libfdbclient.a \
-	    libfdbrpc.a libflow.a libthirdparty.a
+# exposed libraries - confirm with upstream
+.for l in libfdb_c.so libfdb_flow.a libfdb_sqlite.a libfdbclient.a libfdbrpc.a \
+	libflow.a
 	${STRIP_CMD} ${WRKDIR}/.build/lib/${l}
 	${INSTALL_DATA} ${WRKDIR}/.build/lib/${l} ${STAGEDIR}/${PREFIX}/lib/
 .endfor
-	# exposed headers - confirm with upstream
+# exposed headers - confirm with upstream
 	${MKDIR} ${STAGEDIR}${PREFIX}/include/foundationdb
 	${INSTALL_DATA} ${WRKSRC}/bindings/c/foundationdb/fdb_c.h \
 	    ${STAGEDIR}/${PREFIX}/include/foundationdb/
+	${INSTALL_DATA} ${WRKSRC}/bindings/c/foundationdb/fdb_c_types.h \
+	    ${STAGEDIR}/${PREFIX}/include/foundationdb/
 	${INSTALL_DATA} ${WRKSRC}/fdbclient/vexillographer/fdb.options \
 	    ${STAGEDIR}/${PREFIX}/include/foundationdb/
 	${INSTALL_DATA} ${WRKDIR}/.build/bindings/c/foundationdb/fdb_c_options.g.h \
 	    ${STAGEDIR}/${PREFIX}/include/foundationdb/
-	# runtime related
-	${MKDIR} ${STAGEDIR}${DBDIR} \
-	    ${STAGEDIR}${LOGDIR} \
-	    ${STAGEDIR}${PREFIX}/etc/foundationdb
+# runtime related
+	${MKDIR} ${STAGEDIR}${FOUNDATIONDB_ETCDIR}
+	${MKDIR} ${STAGEDIR}${FOUNDATIONDB_DBDIR}
+	${MKDIR} ${STAGEDIR}${FOUNDATIONDB_LOGDIR}
 	${INSTALL_DATA} ${WRKDIR}/foundationdb.conf \
-	    ${STAGEDIR}${PREFIX}/etc/foundationdb/foundationdb.conf.sample
+	    ${STAGEDIR}${FOUNDATIONDB_ETCDIR}/foundationdb.conf.sample
 
 .include <bsd.port.mk>
diff --git a/databases/foundationdb/distinfo b/databases/foundationdb/distinfo
index 0f2e6c2a357b..8315c830cce1 100644
--- a/databases/foundationdb/distinfo
+++ b/databases/foundationdb/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1622455453
-SHA256 (apple-foundationdb-6.3.13_GH0.tar.gz) = 1f4b9c84c6e488fd31c545f14f2e9c33ab75ce9e6bbf514e9f988d116f2010ad
-SIZE (apple-foundationdb-6.3.13_GH0.tar.gz) = 9709343
+TIMESTAMP = 1679567621
+SHA256 (apple-foundationdb-7.1.29_GH0.tar.gz) = ad608ddb781eea3ef4607ab9abb41282ca93383814d8149346bf3440cc9f46d5
+SIZE (apple-foundationdb-7.1.29_GH0.tar.gz) = 11676677
diff --git a/databases/foundationdb/files/foundationdb.conf.in b/databases/foundationdb/files/foundationdb.conf.in
index 5b47e46f2185..6fae1a863cb5 100644
--- a/databases/foundationdb/files/foundationdb.conf.in
+++ b/databases/foundationdb/files/foundationdb.conf.in
@@ -5,36 +5,36 @@
 ## https://apple.github.io/foundationdb/configuration.html#the-configuration-file
 
 [fdbmonitor]
-user = %%DB_USER%%
-group = %%DB_GROUP%%
+user = %%FOUNDATIONDB_USER%%
+group = %%FOUNDATIONDB_GROUP%%
 
 [general]
-restart_delay = 60
-## by default, restart_backoff = restart_delay_reset_interval = restart_delay
-# initial_restart_delay = 0
-# restart_backoff = 60
-# restart_delay_reset_interval = 60
-cluster_file = %%PREFIX%%/etc/foundationdb/fdb.cluster
-# delete_envvars =
-# kill_on_configuration_change = true
+restart-delay = 60
+## by default, restart-backoff = restart-delay-reset-interval = restart-delay
+# initial-restart-delay = 0
+# restart-backoff = 60
+# restart-delay-reset-interval = 60
+cluster-file = %%FOUNDATIONDB_ETCDIR%%/fdb.cluster
+# delete-envvars =
+# kill-on-configuration-change = true
 
 ## Default parameters for individual fdbserver processes
 [fdbserver]
 command = %%PREFIX%%/bin/fdbserver
-public_address = auto:$ID
-listen_address = public
-datadir = %%DB_DIR%%/data/$ID
-logdir = %%LOG_DIR%%
+public-address = auto:$ID
+listen-address = public
+datadir = %%FOUNDATIONDB_DBDIR%%/data/$ID
+logdir = %%FOUNDATIONDB_LOGDIR%%
 # logsize = 10MiB
 # maxlogssize = 100MiB
-# machine_id =
-# datacenter_id =
-# class =
+# machine-id =
+# datacenter-id =
+# class = 
 # memory = 8GiB
-# storage_memory = 1GiB
-# cache_memory = 2GiB
-# metrics_cluster =
-# metrics_prefix =
+# storage-memory = 1GiB
+# cache-memory = 2GiB
+# metrics-cluster =
+# metrics-prefix =
 
 ## An individual fdbserver process with id 4500
 ## Parameters set here override defaults from the [fdbserver] section
@@ -42,6 +42,6 @@ logdir = %%LOG_DIR%%
 
 [backup_agent]
 command = %%PREFIX%%/bin/backup_agent
-logdir = %%LOG_DIR%%
+logdir = %%FOUNDATIONDB_LOGDIR%%
 
 [backup_agent.1]
diff --git a/databases/foundationdb/files/foundationdb.in b/databases/foundationdb/files/foundationdb.in
index 1bcd503816f8..84e0a036a8ae 100644
--- a/databases/foundationdb/files/foundationdb.in
+++ b/databases/foundationdb/files/foundationdb.in
@@ -18,13 +18,25 @@
 
 name="foundationdb"
 rcvar="${name}_enable"
-foundationdb_enable=${foundationdb_enable:-"NO"}
-command=%%PREFIX%%/bin/fdbmonitor
-pidfile="/var/run/fdbmonitor.pid"
 
 load_rc_config "$name"
+
 : ${foundationdb_enable="NO"}
+: ${foundationdb_user="%%FOUNDATIONDB_USER%%"}
+: ${foundationdb_group="%%FOUNDATIONDB_GROUP%%"}
 : ${foundationdb_config="%%PREFIX%%/etc/foundationdb/foundationdb.conf"}
 
+start_precmd="foundationdb_start_precmd"
+
+pidfile="/var/run/fdbmonitor.pid"
+command=%%PREFIX%%/bin/fdbmonitor
 command_args="--conffile ${foundationdb_config} --lockfile ${pidfile} --daemonize"
+
+foundationdb_start_precmd()
+{
+	if [ ! -e "${pidfile}" ]; then
+		install -m 0600 -o "${foundationdb_user}" -g "${foundationdb_group}" /dev/null "${pidfile}"
+	fi
+}
+
 run_rc_command $1
diff --git a/databases/foundationdb/files/patch-CMakeLists.txt b/databases/foundationdb/files/patch-CMakeLists.txt
new file mode 100644
index 000000000000..78d6244a990c
--- /dev/null
+++ b/databases/foundationdb/files/patch-CMakeLists.txt
@@ -0,0 +1,18 @@
+--- CMakeLists.txt.orig	2022-09-19 11:42:41 UTC
++++ CMakeLists.txt
+@@ -183,9 +183,13 @@ add_subdirectory(fdbbackup)
+   add_subdirectory(fdbservice)
+ endif()
+ add_subdirectory(fdbbackup)
+-add_subdirectory(contrib)
++if(WITH_CONTRIB)
++  add_subdirectory(contrib)
++endif()
+ add_subdirectory(tests)
+-add_subdirectory(flowbench EXCLUDE_FROM_ALL)
++if(WITH_FLOWBENCH)
++  add_subdirectory(flowbench EXCLUDE_FROM_ALL)
++endif()
+ if(WITH_PYTHON AND WITH_C_BINDING)
+   add_subdirectory(bindings)
+ endif()
diff --git a/databases/foundationdb/files/patch-bindings_c_CMakeLists.txt b/databases/foundationdb/files/patch-bindings_c_CMakeLists.txt
new file mode 100644
index 000000000000..7c58fb132630
--- /dev/null
+++ b/databases/foundationdb/files/patch-bindings_c_CMakeLists.txt
@@ -0,0 +1,11 @@
+--- bindings/c/CMakeLists.txt.orig	2022-09-19 11:42:41 UTC
++++ bindings/c/CMakeLists.txt
+@@ -78,7 +78,7 @@ endif()
+ endif()
+ 
+ # The tests don't build on windows
+-if(NOT WIN32)
++if(NOT WIN32 AND NOT CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
+   set(MAKO_SRCS
+     test/mako/mako.c
+     test/mako/mako.h
diff --git a/databases/foundationdb/files/patch-cmake_CompileBoost.cmake b/databases/foundationdb/files/patch-cmake_CompileBoost.cmake
new file mode 100644
index 000000000000..c72e610786f0
--- /dev/null
+++ b/databases/foundationdb/files/patch-cmake_CompileBoost.cmake
@@ -0,0 +1,11 @@
+--- cmake/CompileBoost.cmake.orig	2022-09-19 11:42:41 UTC
++++ cmake/CompileBoost.cmake
+@@ -113,7 +113,7 @@ endif()
+   return()
+ endif()
+ 
+-find_package(Boost 1.78.0 EXACT QUIET COMPONENTS context CONFIG PATHS ${BOOST_HINT_PATHS})
++find_package(Boost 1.78.0 COMPONENTS context CONFIG PATHS ${BOOST_HINT_PATHS})
+ set(FORCE_BOOST_BUILD OFF CACHE BOOL "Forces cmake to build boost and ignores any installed boost")
+ 
+ if(Boost_FOUND AND NOT FORCE_BOOST_BUILD)
diff --git a/databases/foundationdb/files/patch-cmake_FDBComponents.cmake b/databases/foundationdb/files/patch-cmake_FDBComponents.cmake
new file mode 100644
index 000000000000..815778f2df3a
--- /dev/null
+++ b/databases/foundationdb/files/patch-cmake_FDBComponents.cmake
@@ -0,0 +1,34 @@
+--- cmake/FDBComponents.cmake.orig	2023-03-14 19:59:33 UTC
++++ cmake/FDBComponents.cmake
+@@ -24,7 +24,7 @@ set(DISABLE_TLS OFF CACHE BOOL "Don't try to find Open
+ if(DISABLE_TLS)
+   set(WITH_TLS OFF)
+ else()
+-  set(OPENSSL_USE_STATIC_LIBS TRUE)
++  set(OPENSSL_USE_STATIC_LIBS FALSE)
+   if(WIN32)
+     set(OPENSSL_MSVC_STATIC_RT ON)
+   endif()
+@@ -201,6 +201,13 @@ else()
+ endif()
+ 
+ ################################################################################
++# misc optional components
++################################################################################
++
++set(WITH_CONTRIB ON)
++set(WITH_FLOWBENCH OFF)
++
++################################################################################
+ # Coroutine implementation
+ ################################################################################
+ 
+@@ -245,6 +252,8 @@ function(print_components)
+   message(STATUS "Build Documentation (make html):      ${WITH_DOCUMENTATION}")
+   message(STATUS "Build Python sdist (make package):    ${WITH_PYTHON_BINDING}")
+   message(STATUS "Configure CTest (depends on Python):  ${WITH_PYTHON}")
++  message(STATUS "Build contrib:                        ${WITH_CONTRIB}")
++  message(STATUS "Build with FlowBench:                 ${WITH_FLOWBENCH}")
+   message(STATUS "Build with RocksDB:                   ${WITH_ROCKSDB_EXPERIMENTAL}")
+   message(STATUS "Build with AWS SDK:                   ${WITH_AWS_BACKUP}")
+   message(STATUS "=========================================")
diff --git a/databases/foundationdb/files/patch-cmake_GetMsgpack.cmake b/databases/foundationdb/files/patch-cmake_GetMsgpack.cmake
new file mode 100644
index 000000000000..a0bff5b82bf3
--- /dev/null
+++ b/databases/foundationdb/files/patch-cmake_GetMsgpack.cmake
@@ -0,0 +1,24 @@
+--- cmake/GetMsgpack.cmake.orig	2022-09-19 11:42:41 UTC
++++ cmake/GetMsgpack.cmake
+@@ -1,20 +1,7 @@
+-find_package(msgpack 3.3.0 EXACT QUIET CONFIG)
++find_package(msgpack-cxx REQUIRED QUIET CONFIG)
+ 
+ add_library(msgpack INTERFACE)
+ 
+ if(msgpack_FOUND)
+   target_link_libraries(msgpack INTERFACE msgpackc-cxx)
+-else()
+-  include(ExternalProject)
+-  ExternalProject_add(msgpackProject
+-    URL "https://github.com/msgpack/msgpack-c/releases/download/cpp-3.3.0/msgpack-3.3.0.tar.gz"
+-    URL_HASH SHA256=6e114d12a5ddb8cb11f669f83f32246e484a8addd0ce93f274996f1941c1f07b
+-    CONFIGURE_COMMAND ""
+-    BUILD_COMMAND ""
+-    INSTALL_COMMAND ""
+-  )
+-
+-  ExternalProject_Get_property(msgpackProject SOURCE_DIR)
+-  target_include_directories(msgpack SYSTEM INTERFACE "${SOURCE_DIR}/include")
+-  add_dependencies(msgpack msgpackProject)
+ endif()
diff --git a/databases/foundationdb/files/patch-fdbmonitor_CMakeLists.txt b/databases/foundationdb/files/patch-fdbmonitor_CMakeLists.txt
new file mode 100644
index 000000000000..2b5912204a6a
--- /dev/null
+++ b/databases/foundationdb/files/patch-fdbmonitor_CMakeLists.txt
@@ -0,0 +1,11 @@
+--- fdbmonitor/CMakeLists.txt.orig	2022-09-19 11:42:41 UTC
++++ fdbmonitor/CMakeLists.txt
+@@ -56,8 +56,3 @@ endif()
+   configure_file(${CMAKE_SOURCE_DIR}/contrib/generate_profile.sh
+     ${CMAKE_BINARY_DIR}/contrib/generate_profile.sh)
+ endif()
+-
+-add_custom_target(generate_profile
+-  COMMAND  ${CMAKE_BINARY_DIR}/contrib/generate_profile.sh ${CMAKE_BINARY_DIR})
+-
+-add_dependencies(generate_profile fdbmonitor fdbserver mako fdbcli)
diff --git a/databases/foundationdb/files/patch-fdbmonitor_fdbmonitor.cpp b/databases/foundationdb/files/patch-fdbmonitor_fdbmonitor.cpp
new file mode 100644
index 000000000000..862461539f53
--- /dev/null
+++ b/databases/foundationdb/files/patch-fdbmonitor_fdbmonitor.cpp
@@ -0,0 +1,42 @@
+--- fdbmonitor/fdbmonitor.cpp.orig	2022-09-19 11:42:41 UTC
++++ fdbmonitor/fdbmonitor.cpp
+@@ -27,6 +27,8 @@
+ 
+ #ifdef __linux__
+ #include <sys/prctl.h>
++#elif defined(__FreeBSD__)
++#include <sys/procctl.h>
+ #endif
+ 
+ #include <sys/wait.h>
+@@ -751,6 +753,10 @@ void start_process(Command* cmd, ProcessID id, uid_t u
+ 		signal(SIGHUP, SIG_DFL);
+ 		signal(SIGINT, SIG_DFL);
+ 		signal(SIGTERM, SIG_DFL);
++#ifdef __linux__
++		signal(SIGCHLD, SIG_DFL);
++#endif
++		sigprocmask(SIG_SETMASK, mask, nullptr);
+ 
+ 		/* All output in this block should be to stdout (for SevInfo messages) or stderr (for SevError messages) */
+ 		/* Using log_msg() or log_err() from the child will cause the logs to be written incorrectly */
+@@ -780,13 +786,15 @@ void start_process(Command* cmd, ProcessID id, uid_t u
+ 		}
+ 
+ #ifdef __linux__
+-		signal(SIGCHLD, SIG_DFL);
+-
+-		sigprocmask(SIG_SETMASK, mask, nullptr);
+-
+ 		/* death of our parent raises SIGHUP */
+ 		prctl(PR_SET_PDEATHSIG, SIGHUP);
+ 		if (getppid() == 1) /* parent already died before prctl */
++			exit(0);
++#elif defined(__FreeBSD__)
++		/* death of our parent raises SIGHUP */
++		const int sig = SIGHUP;
++		procctl(P_PID, 0, PROC_PDEATHSIG_CTL, (void*)&sig);
++		if (getppid() == 1) /* parent already died before procctl */
+ 			exit(0);
+ #endif
+ 
diff --git a/databases/foundationdb/files/patch-fdbserver_FDBExecHelper.actor.cpp b/databases/foundationdb/files/patch-fdbserver_FDBExecHelper.actor.cpp
new file mode 100644
index 000000000000..4950f7fd5e8b
--- /dev/null
+++ b/databases/foundationdb/files/patch-fdbserver_FDBExecHelper.actor.cpp
@@ -0,0 +1,32 @@
+--- fdbserver/FDBExecHelper.actor.cpp.orig	2022-09-19 11:42:41 UTC
++++ fdbserver/FDBExecHelper.actor.cpp
+@@ -18,6 +18,14 @@
+  * limitations under the License.
+  */
+ 
++#if !defined(_WIN32) && !defined(__APPLE__) && !defined(__INTEL_COMPILER)
++#define BOOST_SYSTEM_NO_LIB
++#define BOOST_DATE_TIME_NO_LIB
++#define BOOST_REGEX_NO_LIB
++#include <boost/process.hpp>
++#endif
++#include <boost/algorithm/string.hpp>
++
+ #include "flow/TLSConfig.actor.h"
+ #include "flow/Trace.h"
+ #include "flow/Platform.h"
+@@ -33,14 +41,6 @@
+ #include "fdbserver/FDBExecHelper.actor.h"
+ #include "fdbserver/Knobs.h"
+ #include "fdbserver/RemoteIKeyValueStore.actor.h"
+-
+-#if !defined(_WIN32) && !defined(__APPLE__) && !defined(__INTEL_COMPILER)
+-#define BOOST_SYSTEM_NO_LIB
+-#define BOOST_DATE_TIME_NO_LIB
+-#define BOOST_REGEX_NO_LIB
+-#include <boost/process.hpp>
+-#endif
+-#include <boost/algorithm/string.hpp>
+ 
+ #include "flow/actorcompiler.h" // This must be the last #include.
+ 
diff --git a/databases/foundationdb/files/patch-fdbserver_fdbserver.actor.cpp b/databases/foundationdb/files/patch-fdbserver_fdbserver.actor.cpp
new file mode 100644
index 000000000000..1720825f36ac
--- /dev/null
+++ b/databases/foundationdb/files/patch-fdbserver_fdbserver.actor.cpp
@@ -0,0 +1,30 @@
+--- fdbserver/fdbserver.actor.cpp.orig	2022-09-19 11:42:41 UTC
++++ fdbserver/fdbserver.actor.cpp
+@@ -84,7 +84,11 @@
+ #if defined(__linux__) || defined(__FreeBSD__)
+ #include <execinfo.h>
+ #include <signal.h>
++#if defined(__linux__)
+ #include <sys/prctl.h>
++#elif defined(__FreeBSD__)
++#include <sys/procctl.h>
++#endif
+ #ifdef ALLOC_INSTRUMENTATION
+ #include <cxxabi.h>
+ #endif
+@@ -2225,9 +2229,14 @@ int main(int argc, char* argv[]) {
+ 			f = result;
+ 		} else if (role == ServerRole::FlowProcess) {
+ 			TraceEvent(SevDebug, "StartingFlowProcess").detail("From", "fdbserver");
+-#if defined(__linux__) || defined(__FreeBSD__)
++#if defined(__linux__)
+ 			prctl(PR_SET_PDEATHSIG, SIGTERM);
+ 			if (getppid() == 1) /* parent already died before prctl */
++				flushAndExit(FDB_EXIT_SUCCESS);
++#elif defined(__FreeBSD__)
++			const int sig = SIGTERM;
++			procctl(P_PID, 0, PROC_PDEATHSIG_CTL, (void*)&sig);
++			if (getppid() == 1) /* parent already died before procctl */
+ 				flushAndExit(FDB_EXIT_SUCCESS);
+ #endif
+ 
diff --git a/databases/foundationdb/pkg-descr b/databases/foundationdb/pkg-descr
index 9c9b5e714097..d29a6335548a 100644
--- a/databases/foundationdb/pkg-descr
+++ b/databases/foundationdb/pkg-descr
@@ -12,5 +12,3 @@ for years and been hardened with lessons learned in some of the world's
 largest database deployments. Backing FoundationDB up is an unmatched
 testing system based on a deterministic simulation engine that ensures
 optimal reliability of operations.
-
-WWW: https://www.foundationdb.org/
diff --git a/databases/foundationdb/pkg-plist b/databases/foundationdb/pkg-plist
index 21278e3b27a2..d8047da25f25 100644
--- a/databases/foundationdb/pkg-plist
+++ b/databases/foundationdb/pkg-plist
@@ -1,22 +1,24 @@
-@dir(%%DB_USER%%,%%DB_GROUP%%,) %%DB_DIR%%
-@dir(%%DB_USER%%,%%DB_GROUP%%,) %%LOG_DIR%%
-@sample etc/foundationdb/foundationdb.conf.sample
+@dir(%%FOUNDATIONDB_USER%%,%%FOUNDATIONDB_GROUP%%,755) %%FOUNDATIONDB_ETCDIR%%
+@dir(%%FOUNDATIONDB_USER%%,%%FOUNDATIONDB_GROUP%%,755) %%FOUNDATIONDB_DBDIR%%
+@dir(%%FOUNDATIONDB_USER%%,%%FOUNDATIONDB_GROUP%%,755) %%FOUNDATIONDB_LOGDIR%%
+@sample %%FOUNDATIONDB_ETCDIR%%/foundationdb.conf.sample
 bin/actor_flamegraph
 bin/backup_agent
 bin/dr_agent
-bin/fdb_c_performance_test
-bin/fdb_c_ryw_benchmark
-bin/fdb_c_txn_size_test
+bin/fastrestore_agent
 bin/fdb_flow_tester
 bin/fdbbackup
 bin/fdbcli
+bin/fdbconvert
+bin/fdbdecode
 bin/fdbmonitor
 bin/fdbr
 bin/fdbrestore
 bin/fdbserver
-bin/mako
+bin/tutorial
 include/foundationdb/fdb.options
 include/foundationdb/fdb_c.h
+include/foundationdb/fdb_c_types.h
 include/foundationdb/fdb_c_options.g.h
 lib/libfdb_c.so
 lib/libfdb_flow.a
@@ -24,4 +26,3 @@ lib/libfdb_sqlite.a
 lib/libfdbclient.a
 lib/libfdbrpc.a
 lib/libflow.a
-lib/libthirdparty.a
diff --git a/databases/fpc-dblib/Makefile b/databases/fpc-dblib/Makefile
deleted file mode 100644
index 4073a4487161..000000000000
--- a/databases/fpc-dblib/Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-CATEGORIES=	databases lang
-PKGNAMESUFFIX=	-dblib
-
-COMMENT=	Free Pascal DB-Library and FreeTDS unit
-
-USES=		fpc
-
-MASTERDIR=	${.CURDIR}/../../lang/fpc
-WRKUNITDIR=	${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//}
-EXTRACTUNITDIR=	${WRKUNITDIR}
-
-.include "${MASTERDIR}/Makefile"
diff --git a/databases/fpc-dblib/pkg-plist b/databases/fpc-dblib/pkg-plist
deleted file mode 100644
index 62e6e45d7080..000000000000
--- a/databases/fpc-dblib/pkg-plist
+++ /dev/null
@@ -1,3 +0,0 @@
-lib/fpc/%%PORTVERSION%%/fpmkinst/%%BUILDNAME%%/dblib.fpm
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/dblib/dblib.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/dblib/dblib.ppu
diff --git a/databases/fpc-fpindexer/Makefile b/databases/fpc-fpindexer/Makefile
deleted file mode 100644
index 9d56a8f461f7..000000000000
--- a/databases/fpc-fpindexer/Makefile
+++ /dev/null
@@ -1,14 +0,0 @@
-CATEGORIES=	databases lang
-PKGNAMESUFFIX=	-fpindexer
-
-COMMENT=	Database indexer with database/flat file backend
-
-USES=		fpc
-USE_FPC=	chm dblib fcl-base fcl-db fcl-json fcl-xml ibase mysql odbc \
-		oracle postgres pxlib sqlite rtl-extra rtl-generics
-
-MASTERDIR=	${.CURDIR}/../../lang/fpc
-WRKUNITDIR=	${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//}
-EXTRACTUNITDIR=	${WRKUNITDIR}
-
-.include "${MASTERDIR}/Makefile"
diff --git a/databases/fpc-fpindexer/pkg-plist b/databases/fpc-fpindexer/pkg-plist
deleted file mode 100644
index 5e9b863444a0..000000000000
--- a/databases/fpc-fpindexer/pkg-plist
+++ /dev/null
@@ -1,25 +0,0 @@
-lib/fpc/%%PORTVERSION%%/fpmkinst/%%BUILDNAME%%/fpindexer.fpm
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fpindexer/dbindexer.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fpindexer/dbindexer.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fpindexer/fbindexdb.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fpindexer/fbindexdb.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fpindexer/fpindexer.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fpindexer/fpindexer.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fpindexer/fpindexer.rsj
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fpindexer/fpmasks.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fpindexer/fpmasks.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fpindexer/ireaderhtml.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fpindexer/ireaderhtml.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fpindexer/ireaderpas.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fpindexer/ireaderpas.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fpindexer/ireadertxt.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fpindexer/ireadertxt.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fpindexer/memindexdb.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fpindexer/memindexdb.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fpindexer/memindexdb.rsj
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fpindexer/pgindexdb.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fpindexer/pgindexdb.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fpindexer/sqldbindexdb.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fpindexer/sqldbindexdb.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fpindexer/sqliteindexdb.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fpindexer/sqliteindexdb.ppu
diff --git a/databases/fpc-gdbm/Makefile b/databases/fpc-gdbm/Makefile
deleted file mode 100644
index 6ee94644e505..000000000000
--- a/databases/fpc-gdbm/Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-CATEGORIES=	databases lang
-PKGNAMESUFFIX=	-gdbm
-
-COMMENT=	Free Pascal interface to the GNU database system
-
-USES=		fpc
-
-MASTERDIR=	${.CURDIR}/../../lang/fpc
-WRKUNITDIR=	${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//}
-EXTRACTUNITDIR=	${WRKUNITDIR}
-
-OPTIONS_DEFINE=	GDBM
-GDBM_DESC=	Install the GNU database manager
-OPTIONS_DEFAULT=	GDBM
-
-GDBM_LIB_DEPENDS=	libgdbm.so:databases/gdbm
-
-.include "${MASTERDIR}/Makefile"
diff --git a/databases/fpc-gdbm/pkg-plist b/databases/fpc-gdbm/pkg-plist
deleted file mode 100644
index 63f4bd1bc28a..000000000000
--- a/databases/fpc-gdbm/pkg-plist
+++ /dev/null
@@ -1,3 +0,0 @@
-lib/fpc/%%PORTVERSION%%/fpmkinst/%%BUILDNAME%%/gdbm.fpm
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gdbm/gdbm.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gdbm/gdbm.ppu
diff --git a/databases/fpc-ibase/Makefile b/databases/fpc-ibase/Makefile
deleted file mode 100644
index 9a056009b9aa..000000000000
--- a/databases/fpc-ibase/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-# Created by: John Merryweather Cooper
-
-CATEGORIES=	databases lang
-PKGNAMESUFFIX=	-ibase
-
-COMMENT=	Free Pascal interface to interbase
-
-USES=		fpc
-
-MASTERDIR=	${.CURDIR}/../../lang/fpc
-WRKUNITDIR=	${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//}
-EXTRACTUNITDIR=	${WRKUNITDIR}
-
-OPTIONS_DEFINE=	IBASE
-IBASE_DESC=	Install Interbase/Firebird client
-
-IBASE_USES=	firebird
-
-.include "${MASTERDIR}/Makefile"
diff --git a/databases/fpc-ibase/pkg-plist b/databases/fpc-ibase/pkg-plist
deleted file mode 100644
index a88e1df3b1b3..000000000000
--- a/databases/fpc-ibase/pkg-plist
+++ /dev/null
@@ -1,8 +0,0 @@
-lib/fpc/%%PORTVERSION%%/fpmkinst/%%BUILDNAME%%/ibase.fpm
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/ibase/ibase40.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/ibase/ibase40.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/ibase/ibase60.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/ibase/ibase60.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/ibase/ibase60dyn.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/ibase/ibase60dyn.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/ibase/ibase60dyn.rsj
diff --git a/databases/fpc-mysql/Makefile b/databases/fpc-mysql/Makefile
deleted file mode 100644
index 0d7289cf2d56..000000000000
--- a/databases/fpc-mysql/Makefile
+++ /dev/null
@@ -1,20 +0,0 @@
-# Created by: John Merryweather Cooper
-
-CATEGORIES=	databases lang
-PKGNAMESUFFIX=	-mysql
-
-COMMENT=	Free Pascal interface to MySQL
-
-USES=		fpc
-
-MASTERDIR=	${.CURDIR}/../../lang/fpc
-WRKUNITDIR=	${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//}
-EXTRACTUNITDIR=	${WRKUNITDIR}
-
-OPTIONS_DEFINE=	MYSQL
-MYSQL_DESC=	Install MySQL client
-OPTIONS_DEFAULT=	MYSQL
-
-MYSQL_USES=	mysql
-
-.include "${MASTERDIR}/Makefile"
diff --git a/databases/fpc-mysql/pkg-plist b/databases/fpc-mysql/pkg-plist
deleted file mode 100644
index 39259282b312..000000000000
--- a/databases/fpc-mysql/pkg-plist
+++ /dev/null
@@ -1,58 +0,0 @@
-lib/fpc/%%PORTVERSION%%/fpmkinst/%%BUILDNAME%%/mysql.fpm
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/my4_sys.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/my4_sys.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql3.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql3.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql3_com.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql3_com.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql3_comdyn.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql3_comdyn.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql3_version.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql3_version.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql3dyn.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql3dyn.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql4.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql4.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql40.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql40.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql40dyn.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql40dyn.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql40dyn.rsj
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql41.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql41.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql41dyn.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql41dyn.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql41dyn.rsj
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql4_com.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql4_com.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql4_comdyn.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql4_comdyn.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql4_version.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql4_version.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql4dyn.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql4dyn.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql4dyn.rsj
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql50.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql50.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql50dyn.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql50dyn.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql50dyn.rsj
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql51.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql51.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql51dyn.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql51dyn.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql51dyn.rsj
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql55.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql55.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql55dyn.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql55dyn.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql55dyn.rsj
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql56dyn.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql56dyn.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql56dyn.rsj
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql57dyn.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql57dyn.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql57dyn.rsj
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql80dyn.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql80dyn.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql80dyn.rsj
diff --git a/databases/fpc-odbc/Makefile b/databases/fpc-odbc/Makefile
deleted file mode 100644
index cbda9ab2d238..000000000000
--- a/databases/fpc-odbc/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-# Created by: John Merryweather Cooper
-
-CATEGORIES=	databases lang
-PKGNAMESUFFIX=	-odbc
-
-COMMENT=	Free Pascal interface to ODBC
-
-USES=		fpc
-
-MASTERDIR=	${.CURDIR}/../../lang/fpc
-WRKUNITDIR=	${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//}
-EXTRACTUNITDIR=	${WRKUNITDIR}
-
-OPTIONS_DEFINE=	ODBC
-ODBC_DESC=	Install ODBC library suite for Unix
-
-ODBC_LIB_DEPENDS=	libodbc.so:databases/unixODBC
-
-.include "${MASTERDIR}/Makefile"
diff --git a/databases/fpc-odbc/pkg-plist b/databases/fpc-odbc/pkg-plist
deleted file mode 100644
index 5ae1211db17a..000000000000
--- a/databases/fpc-odbc/pkg-plist
+++ /dev/null
@@ -1,5 +0,0 @@
-lib/fpc/%%PORTVERSION%%/fpmkinst/%%BUILDNAME%%/odbc.fpm
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/odbc/odbcsql.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/odbc/odbcsql.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/odbc/odbcsqldyn.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/odbc/odbcsqldyn.ppu
diff --git a/databases/fpc-oracle/Makefile b/databases/fpc-oracle/Makefile
deleted file mode 100644
index 6f2044195c7f..000000000000
--- a/databases/fpc-oracle/Makefile
+++ /dev/null
@@ -1,14 +0,0 @@
-# Created by: John Merryweather Cooper et al
-
-CATEGORIES=	databases lang
-PKGNAMESUFFIX=	-oracle
-
-COMMENT=	Free Pascal interface to Oracle
-
-USES=		fpc
-
-MASTERDIR=	${.CURDIR}/../../lang/fpc
-WRKUNITDIR=	${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//}
-EXTRACTUNITDIR=	${WRKUNITDIR}
-
-.include "${MASTERDIR}/Makefile"
diff --git a/databases/fpc-oracle/pkg-plist b/databases/fpc-oracle/pkg-plist
deleted file mode 100644
index ca4f22e82aa3..000000000000
--- a/databases/fpc-oracle/pkg-plist
+++ /dev/null
@@ -1,9 +0,0 @@
-lib/fpc/%%PORTVERSION%%/fpmkinst/%%BUILDNAME%%/oracle.fpm
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/oracle/oci.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/oracle/oci.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/oracle/ocidyn.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/oracle/ocidyn.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/oracle/oraoci.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/oracle/oraoci.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/oracle/oratypes.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/oracle/oratypes.ppu
diff --git a/databases/fpc-postgres/Makefile b/databases/fpc-postgres/Makefile
deleted file mode 100644
index 3bd71d124b1a..000000000000
--- a/databases/fpc-postgres/Makefile
+++ /dev/null
@@ -1,20 +0,0 @@
-# Created by: John Merryweather Cooper et al
-
-CATEGORIES=	databases lang
-PKGNAMESUFFIX=	-postgres
-
-COMMENT=	Free Pascal interface to PostGreSQL
-
-USES=		fpc
-
-MASTERDIR=	${.CURDIR}/../../lang/fpc
-WRKUNITDIR=	${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//}
-EXTRACTUNITDIR=	${WRKUNITDIR}
-
-OPTIONS_DEFINE=	PGSQL
-PGSQL_DESC=	Install PostgreSQL client
-OPTIONS_DEFAULT=	PGSQL
-
-PGSQL_USES=	pgsql
-
-.include "${MASTERDIR}/Makefile"
diff --git a/databases/fpc-postgres/pkg-plist b/databases/fpc-postgres/pkg-plist
deleted file mode 100644
index 483d8977088b..000000000000
--- a/databases/fpc-postgres/pkg-plist
+++ /dev/null
@@ -1,12 +0,0 @@
-lib/fpc/%%PORTVERSION%%/fpmkinst/%%BUILDNAME%%/postgres.fpm
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/postgres/dllist.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/postgres/dllist.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/postgres/dllistdyn.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/postgres/dllistdyn.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/postgres/postgres.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/postgres/postgres.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/postgres/postgres3.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/postgres/postgres3.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/postgres/postgres3dyn.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/postgres/postgres3dyn.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/postgres/postgres3dyn.rsj
diff --git a/databases/fpc-pxlib/Makefile b/databases/fpc-pxlib/Makefile
deleted file mode 100644
index 5d64d8c2581b..000000000000
--- a/databases/fpc-pxlib/Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-CATEGORIES=	databases lang
-PKGNAMESUFFIX=	-pxlib
-
-COMMENT=	Free Pascal unit to read various Paradox files
-
-USES=		fpc
-
-MASTERDIR=	${.CURDIR}/../../lang/fpc
-WRKUNITDIR=	${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//}
-EXTRACTUNITDIR=	${WRKUNITDIR}
-
-.include "${MASTERDIR}/Makefile"
diff --git a/databases/fpc-pxlib/pkg-plist b/databases/fpc-pxlib/pkg-plist
deleted file mode 100644
index ea5fb2c371ee..000000000000
--- a/databases/fpc-pxlib/pkg-plist
+++ /dev/null
@@ -1,3 +0,0 @@
-lib/fpc/%%PORTVERSION%%/fpmkinst/%%BUILDNAME%%/pxlib.fpm
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pxlib/pxlib.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pxlib/pxlib.ppu
diff --git a/databases/fpc-sqlite/Makefile b/databases/fpc-sqlite/Makefile
deleted file mode 100644
index a5aba95c0beb..000000000000
--- a/databases/fpc-sqlite/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-CATEGORIES=	databases lang
-PKGNAMESUFFIX=	-sqlite
-
-COMMENT=	Free Pascal interface to SQLite
-
-USES=		fpc
-
-MASTERDIR=	${.CURDIR}/../../lang/fpc
-WRKUNITDIR=	${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//}
-EXTRACTUNITDIR=	${WRKUNITDIR}
-
-OPTIONS_DEFINE=	SQLITE
-OPTIONS_DEFAULT=	SQLITE
-
-SQLITE_USES=	sqlite
-
-.include "${MASTERDIR}/Makefile"
diff --git a/databases/fpc-sqlite/pkg-plist b/databases/fpc-sqlite/pkg-plist
deleted file mode 100644
index b972b9056317..000000000000
--- a/databases/fpc-sqlite/pkg-plist
+++ /dev/null
@@ -1,14 +0,0 @@
-lib/fpc/%%PORTVERSION%%/fpmkinst/%%BUILDNAME%%/sqlite.fpm
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/sqlite/sqlite.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/sqlite/sqlite.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/sqlite/sqlite3.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/sqlite/sqlite3.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/sqlite/sqlite3db.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/sqlite/sqlite3db.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/sqlite/sqlite3dyn.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/sqlite/sqlite3dyn.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/sqlite/sqlite3dyn.rsj
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/sqlite/sqlite3ext.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/sqlite/sqlite3ext.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/sqlite/sqlitedb.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/sqlite/sqlitedb.ppu
diff --git a/databases/frece/Makefile b/databases/frece/Makefile
new file mode 100644
index 000000000000..3fc70a244d25
--- /dev/null
+++ b/databases/frece/Makefile
@@ -0,0 +1,61 @@
+PORTNAME=	frece
+DISTVERSIONPREFIX=	v
+DISTVERSION=	1.0.6
+PORTREVISION=	12
+CATEGORIES=	databases
+
+MAINTAINER=	yuri@FreeBSD.org
+COMMENT=	Maintain a database sorted by frecency (frequency + recency)
+WWW=		https://github.com/YodaEmbedding/frece
+
+LICENSE=	MIT
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
+USES=		cargo
+USE_GITHUB=	yes
+GH_ACCOUNT=	YodaEmbedding
+
+CARGO_CRATES=	addr2line-0.15.2 \
+		adler-1.0.2 \
+		ansi_term-0.11.0 \
+		atty-0.2.14 \
+		autocfg-1.0.1 \
+		backtrace-0.3.60 \
+		bitflags-1.2.1 \
+		cc-1.0.69 \
+		cfg-if-1.0.0 \
+		chrono-0.4.19 \
+		clap-2.33.3 \
+		failure-0.1.8 \
+		failure_derive-0.1.8 \
+		fs2-0.4.3 \
+		gimli-0.24.0 \
+		hermit-abi-0.1.19 \
+		libc-0.2.98 \
+		memchr-2.4.0 \
+		miniz_oxide-0.4.4 \
+		num-integer-0.1.44 \
+		num-traits-0.2.14 \
+		object-0.25.3 \
+		proc-macro2-1.0.28 \
+		quote-1.0.9 \
+		rustc-demangle-0.1.20 \
+		strsim-0.8.0 \
+		syn-1.0.74 \
+		synstructure-0.12.5 \
+		textwrap-0.11.0 \
+		time-0.1.44 \
+		unicode-width-0.1.8 \
+		unicode-xid-0.2.2 \
+		vec_map-0.8.2 \
+		wasi-0.10.0+wasi-snapshot-preview1 \
+		winapi-0.3.9 \
+		winapi-i686-pc-windows-gnu-0.4.0 \
+		winapi-x86_64-pc-windows-gnu-0.4.0
+
+PLIST_FILES=	bin/${PORTNAME}
+
+post-install:
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
+
+.include <bsd.port.mk>
diff --git a/databases/frece/distinfo b/databases/frece/distinfo
new file mode 100644
index 000000000000..74029fd955a1
--- /dev/null
+++ b/databases/frece/distinfo
@@ -0,0 +1,77 @@
+TIMESTAMP = 1672650355
+SHA256 (rust/crates/addr2line-0.15.2.crate) = e7a2e47a1fbe209ee101dd6d61285226744c6c8d3c21c8dc878ba6cb9f467f3a
+SIZE (rust/crates/addr2line-0.15.2.crate) = 32966
+SHA256 (rust/crates/adler-1.0.2.crate) = f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe
+SIZE (rust/crates/adler-1.0.2.crate) = 12778
+SHA256 (rust/crates/ansi_term-0.11.0.crate) = ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b
+SIZE (rust/crates/ansi_term-0.11.0.crate) = 17087
+SHA256 (rust/crates/atty-0.2.14.crate) = d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8
+SIZE (rust/crates/atty-0.2.14.crate) = 5470
+SHA256 (rust/crates/autocfg-1.0.1.crate) = cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a
+SIZE (rust/crates/autocfg-1.0.1.crate) = 12908
+SHA256 (rust/crates/backtrace-0.3.60.crate) = b7815ea54e4d821e791162e078acbebfd6d8c8939cd559c9335dceb1c8ca7282
+SIZE (rust/crates/backtrace-0.3.60.crate) = 70983
+SHA256 (rust/crates/bitflags-1.2.1.crate) = cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693
+SIZE (rust/crates/bitflags-1.2.1.crate) = 16745
+SHA256 (rust/crates/cc-1.0.69.crate) = e70cc2f62c6ce1868963827bd677764c62d07c3d9a3e1fb1177ee1a9ab199eb2
+SIZE (rust/crates/cc-1.0.69.crate) = 56044
+SHA256 (rust/crates/cfg-if-1.0.0.crate) = baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd
+SIZE (rust/crates/cfg-if-1.0.0.crate) = 7934
+SHA256 (rust/crates/chrono-0.4.19.crate) = 670ad68c9088c2a963aaa298cb369688cf3f9465ce5e2d4ca10e6e0098a1ce73
+SIZE (rust/crates/chrono-0.4.19.crate) = 155663
+SHA256 (rust/crates/clap-2.33.3.crate) = 37e58ac78573c40708d45522f0d80fa2f01cc4f9b4e2bf749807255454312002
+SIZE (rust/crates/clap-2.33.3.crate) = 201925
+SHA256 (rust/crates/failure-0.1.8.crate) = d32e9bd16cc02eae7db7ef620b392808b89f6a5e16bb3497d159c6b92a0f4f86
+SIZE (rust/crates/failure-0.1.8.crate) = 37582
+SHA256 (rust/crates/failure_derive-0.1.8.crate) = aa4da3c766cd7a0db8242e326e9e4e081edd567072893ed320008189715366a4
+SIZE (rust/crates/failure_derive-0.1.8.crate) = 4950
+SHA256 (rust/crates/fs2-0.4.3.crate) = 9564fc758e15025b46aa6643b1b77d047d1a56a1aea6e01002ac0c7026876213
+SIZE (rust/crates/fs2-0.4.3.crate) = 13138
+SHA256 (rust/crates/gimli-0.24.0.crate) = 0e4075386626662786ddb0ec9081e7c7eeb1ba31951f447ca780ef9f5d568189
+SIZE (rust/crates/gimli-0.24.0.crate) = 703534
+SHA256 (rust/crates/hermit-abi-0.1.19.crate) = 62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33
+SIZE (rust/crates/hermit-abi-0.1.19.crate) = 9979
+SHA256 (rust/crates/libc-0.2.98.crate) = 320cfe77175da3a483efed4bc0adc1968ca050b098ce4f2f1c13a56626128790
+SIZE (rust/crates/libc-0.2.98.crate) = 522087
+SHA256 (rust/crates/memchr-2.4.0.crate) = b16bd47d9e329435e309c58469fe0791c2d0d1ba96ec0954152a5ae2b04387dc
+SIZE (rust/crates/memchr-2.4.0.crate) = 63392
+SHA256 (rust/crates/miniz_oxide-0.4.4.crate) = a92518e98c078586bc6c934028adcca4c92a53d6a958196de835170a01d84e4b
+SIZE (rust/crates/miniz_oxide-0.4.4.crate) = 49938
+SHA256 (rust/crates/num-integer-0.1.44.crate) = d2cc698a63b549a70bc047073d2949cce27cd1c7b0a4a862d08a8031bc2801db
+SIZE (rust/crates/num-integer-0.1.44.crate) = 22216
+SHA256 (rust/crates/num-traits-0.2.14.crate) = 9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290
+SIZE (rust/crates/num-traits-0.2.14.crate) = 45476
+SHA256 (rust/crates/object-0.25.3.crate) = a38f2be3697a57b4060074ff41b44c16870d916ad7877c17696e063257482bc7
+SIZE (rust/crates/object-0.25.3.crate) = 230711
+SHA256 (rust/crates/proc-macro2-1.0.28.crate) = 5c7ed8b8c7b886ea3ed7dde405212185f423ab44682667c8c6dd14aa1d9f6612
+SIZE (rust/crates/proc-macro2-1.0.28.crate) = 38732
+SHA256 (rust/crates/quote-1.0.9.crate) = c3d0b9745dc2debf507c8422de05d7226cc1f0644216dfdfead988f9b1ab32a7
+SIZE (rust/crates/quote-1.0.9.crate) = 25042
+SHA256 (rust/crates/rustc-demangle-0.1.20.crate) = dead70b0b5e03e9c814bcb6b01e03e68f7c57a80aa48c72ec92152ab3e818d49
+SIZE (rust/crates/rustc-demangle-0.1.20.crate) = 23298
+SHA256 (rust/crates/strsim-0.8.0.crate) = 8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a
+SIZE (rust/crates/strsim-0.8.0.crate) = 9309
+SHA256 (rust/crates/syn-1.0.74.crate) = 1873d832550d4588c3dbc20f01361ab00bfe741048f71e3fecf145a7cc18b29c
+SIZE (rust/crates/syn-1.0.74.crate) = 232974
+SHA256 (rust/crates/synstructure-0.12.5.crate) = 474aaa926faa1603c40b7885a9eaea29b444d1cb2850cb7c0e37bb1a4182f4fa
+SIZE (rust/crates/synstructure-0.12.5.crate) = 18020
+SHA256 (rust/crates/textwrap-0.11.0.crate) = d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060
+SIZE (rust/crates/textwrap-0.11.0.crate) = 17322
+SHA256 (rust/crates/time-0.1.44.crate) = 6db9e6914ab8b1ae1c260a4ae7a49b6c5611b40328a735b21862567685e73255
+SIZE (rust/crates/time-0.1.44.crate) = 28885
+SHA256 (rust/crates/unicode-width-0.1.8.crate) = 9337591893a19b88d8d87f2cec1e73fad5cdfd10e5a6f349f498ad6ea2ffb1e3
+SIZE (rust/crates/unicode-width-0.1.8.crate) = 16732
+SHA256 (rust/crates/unicode-xid-0.2.2.crate) = 8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3
+SIZE (rust/crates/unicode-xid-0.2.2.crate) = 14955
+SHA256 (rust/crates/vec_map-0.8.2.crate) = f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191
+SIZE (rust/crates/vec_map-0.8.2.crate) = 14466
+SHA256 (rust/crates/wasi-0.10.0+wasi-snapshot-preview1.crate) = 1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f
+SIZE (rust/crates/wasi-0.10.0+wasi-snapshot-preview1.crate) = 26964
+SHA256 (rust/crates/winapi-0.3.9.crate) = 5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419
+SIZE (rust/crates/winapi-0.3.9.crate) = 1200382
+SHA256 (rust/crates/winapi-i686-pc-windows-gnu-0.4.0.crate) = ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6
+SIZE (rust/crates/winapi-i686-pc-windows-gnu-0.4.0.crate) = 2918815
+SHA256 (rust/crates/winapi-x86_64-pc-windows-gnu-0.4.0.crate) = 712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f
+SIZE (rust/crates/winapi-x86_64-pc-windows-gnu-0.4.0.crate) = 2947998
+SHA256 (YodaEmbedding-frece-v1.0.6_GH0.tar.gz) = d284a5d3d16047a8772b1f1523f8b8dde53e3c2f8a82760a89abbc3c492d8168
+SIZE (YodaEmbedding-frece-v1.0.6_GH0.tar.gz) = 11220
diff --git a/databases/frece/pkg-descr b/databases/frece/pkg-descr
new file mode 100644
index 000000000000..06d06f0f59f9
--- /dev/null
+++ b/databases/frece/pkg-descr
@@ -0,0 +1 @@
+frece maintains databases sorted by frecency (frequency + recency).
diff --git a/databases/freetds-devel/Makefile b/databases/freetds-devel/Makefile
index 8fb49155b324..86fe90473f70 100644
--- a/databases/freetds-devel/Makefile
+++ b/databases/freetds-devel/Makefile
@@ -1,7 +1,5 @@
-# Created by: Domas Mituzas <midom@dammit.lt>
-
 PORTNAME=	freetds
-PORTVERSION=	1.2.140
+PORTVERSION=	1.4.158
 PORTEPOCH=	1
 CATEGORIES=	databases
 MASTER_SITES=	https://www.freetds.org/files/current/ \
@@ -10,48 +8,53 @@ PKGNAMESUFFIX=	-devel
 DISTNAME=	${PORTNAME}-dev.${PORTVERSION}
 
 MAINTAINER=	bofh@FreeBSD.org
-COMMENT=	Sybase/Microsoft TDS protocol library
+COMMENT=	Sybase/Microsoft TDS protocol library - nightly snapshot
+WWW=		http://www.freetds.org/
 
 LICENSE=	LGPL20
 
-USES=		autoreconf compiler:c11 cpe gettext-tools gmake iconv \
-		libtool:keepla pkgconfig tar:bzip2
+USES=		compiler:c11 cpe gettext-tools gmake iconv \
+	libtool:keepla localbase:ldflags pkgconfig tar:bzip2
+USE_LDCONFIG=	yes
+
+HAS_CONFIGURE=	yes
+CONFIGURE_ARGS+=	--prefix=${PREFIX} \
+		--docdir=${DOCSDIR} \
+		--enable-msdblib \
+		--enable-sybase-compat \
+		--sysconfdir=${ETCDIR} \
+		--with-tdsver=${TDS_VER} \
+		--mandir=${PREFIX}/share/man
 
+INSTALL_TARGET=	install-strip
+
+CONFLICTS_INSTALL=	freetds # etc/freetds/freetds.conf.sample
+
+PORTSCOUT=	limit:^\d+\.\d+\.\d{3}$
+SUB_FILES=	pkg-message
 WRKSRC=		${WRKDIR}/${PORTNAME}-dev.${PORTVERSION}
+
+PORTDOCS=	*
+
 TDS_VER?=	7.4
-CPPFLAGS+=	"-I${LOCALBASE}/include"
-LDFLAGS+=	-L${LOCALBASE}/lib
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-tdsver=${TDS_VER} --sysconfdir=${ETCDIR} \
-		--enable-msdblib --enable-sybase-compat \
-		--docdir=${DOCSDIR}
-USE_LDCONFIG=	yes
-SUB_FILES=	pkg-message
-INSTALL_TARGET=	install-strip
 
 OPTIONS_DEFINE=		DOCS ODBCWIDE
-OPTIONS_SINGLE=		SSL
-OPTIONS_SINGLE_SSL=	OPENSSL GNUTLS
 OPTIONS_DEFAULT=	OPENSSL
 OPTIONS_RADIO=		ODBC
 OPTIONS_RADIO_ODBC=	IODBC UNIXODBC
+OPTIONS_SINGLE=		SSL
+OPTIONS_SINGLE_SSL=	GNUTLS OPENSSL
 ODBCWIDE_DESC=		Enable Wide ODBC Support
-OPENSSL_USES=		ssl
-OPENSSL_CONFIGURE_ON=	--with-openssl=${OPENSSLBASE}
 GNUTLS_LIB_DEPENDS=	libgnutls.so:security/gnutls
 GNUTLS_CONFIGURE_ON=	--with-gnutls
 IODBC_LIB_DEPENDS=	libiodbc.so:databases/libiodbc
 IODBC_CONFIGURE_ON=	--with-iodbc=${LOCALBASE}
 IODBC_CPPFLAGS=		-I${LOCALBASE}/include/libiodbc
+ODBCWIDE_CONFIGURE_ON=	--enable-odbc-wide
+OPENSSL_USES=		ssl
+OPENSSL_CONFIGURE_ON=	--with-openssl=${OPENSSLBASE}
 UNIXODBC_LIB_DEPENDS=	libodbc.so:databases/unixODBC
 UNIXODBC_CONFIGURE_ON=	--with-unixodbc=${LOCALBASE}
-ODBCWIDE_CONFIGURE_ON=	--enable-odbc-wide
-
-PORTDOCS=	*
-
-CONFLICTS=	freetds-1.*
-
-PORTSCOUT=	limit:^\d+\.\d+\.\d{3}$
 
 .include <bsd.port.options.mk>
 .if ${PORT_OPTIONS:MIODBC} || ${PORT_OPTIONS:MUNIXODBC}
@@ -66,17 +69,12 @@ post-extract:
 	@cd ${WRKSRC}/src/pool && ${LN} -s pool.conf pool.conf.sample
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|libgnutls-config|pkg-config gnutls|g' \
-		${WRKSRC}/configure
-	@${FIND} ${WRKSRC} -name "Makefile.am" | ${XARGS} ${REINPLACE_CMD} -e \
-		's|/pool.conf|/pool.conf.sample|g ; \
-		 s| common.h||g ; \
-		 s|%%DOCSDIR%%|${STAGEDIR}${DOCSDIR}|g ; \
-		 s|%%ICONV_LIB%%|${ICONV_LIB}|'
+	@${REINPLACE_CMD} -e 's|/pool.conf|/pool.conf.sample|g' \
+		${WRKSRC}/src/pool/Makefile.in
 	@${REINPLACE_CMD} -e 's|/freetds.conf|/freetds.conf.sample|g ; \
-		 s|/locales.conf|/locales.conf.sample|g' ${WRKSRC}/Makefile.am
-	@${REINPLACE_CMD} -e 's|$$ODBC_INC/isql.h|$$ODBC_INC/libiodbc/isql.h|g ; \
-		s|$$ODBC_INC/isqlext.h|$$ODBC_INC/libiodbc/isqlext.h|g' ${WRKSRC}/configure
+		s|/locales.conf|/locales.conf.sample|g' ${WRKSRC}/Makefile.in
+	@${REINPLACE_CMD} -e 's|@LIBS@|@LIBS@ ${ICONV_LIB}|g' \
+		${WRKSRC}/src/tds/Makefile.in
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/interfaces ${STAGEDIR}${ETCDIR}/interfaces.sample
diff --git a/databases/freetds-devel/distinfo b/databases/freetds-devel/distinfo
index 2ed46296a4b3..90aa2c8f6f80 100644
--- a/databases/freetds-devel/distinfo
+++ b/databases/freetds-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1622773101
-SHA256 (freetds-dev.1.2.140.tar.bz2) = f90e93d32bbcc5e15e087630daa40b8855cc6b91c922e677e2c6724a358a0138
-SIZE (freetds-dev.1.2.140.tar.bz2) = 2264983
+TIMESTAMP = 1712230716
+SHA256 (freetds-dev.1.4.158.tar.bz2) = 152b0ea18666fc196f97f237b04947bae6411674acfbee95f76175d7ce87e8ea
+SIZE (freetds-dev.1.4.158.tar.bz2) = 2424229
diff --git a/databases/freetds-devel/files/patch-configure b/databases/freetds-devel/files/patch-configure
new file mode 100644
index 000000000000..b0dd840ca7e0
--- /dev/null
+++ b/databases/freetds-devel/files/patch-configure
@@ -0,0 +1,59 @@
+--- configure.orig	2024-03-02 09:02:14 UTC
++++ configure
+@@ -19020,20 +19020,7 @@ fi
+   printf "%s\n" "#define HAVE_SQL_H 1" >>confdefs.h
+ 
+ fi
+-ac_fn_c_check_header_compile "$LINENO" "odbcss.h" "ac_cv_header_odbcss_h" "#ifdef HAVE_WINDOWS_H
+-# include <windows.h>
+-#endif
+-#ifdef HAVE_SQL_H
+-# include <sql.h>
+-#endif
+ 
+-"
+-if test "x$ac_cv_header_odbcss_h" = xyes
+-then :
+-  printf "%s\n" "#define HAVE_ODBCSS_H 1" >>confdefs.h
+-
+-fi
+-
+  if test "$ac_cv_header_odbcss_h" = "yes"; then
+   HAVE_ODBCSS_H_TRUE=
+   HAVE_ODBCSS_H_FALSE='#'
+@@ -21382,8 +21369,8 @@ elif test "x$with_iodbc" != "x" -a "x$with_iodbc" != "
+ 	fi
+ 	CPPFLAGS="$CPPFLAGS -DIODBC"
+ 	ODBC_INC="$with_iodbc/include"
+-	test -r "$ODBC_INC/isql.h" || as_fn_error $? "isql.h not found" "$LINENO" 5
+-	test -r "$ODBC_INC/isqlext.h" || as_fn_error $? "isqlext.h not found" "$LINENO" 5
++	test -r "$ODBC_INC/libiodbc/isql.h" || as_fn_error $? "isql.h not found" "$LINENO" 5
++	test -r "$ODBC_INC/libiodbc/isqlext.h" || as_fn_error $? "isqlext.h not found" "$LINENO" 5
+ 	ODBC_INC="-I$ODBC_INC"
+ 	ODBC_LDFLAGS="-L$with_iodbc/lib -liodbc"
+ 	odbc=true
+@@ -21983,14 +21970,14 @@ fi
+ 	# Put the nasty error message in config.log where it belongs
+ 	echo "$GNUTLS_PKG_ERRORS" >&5
+ 
+-	CPPFLAGS="$CPPFLAGS `libgnutls-config --cflags`"
+-		NETWORK_LIBS="$NETWORK_LIBS `libgnutls-config --libs`"
++	CPPFLAGS="$CPPFLAGS `pkg-config gnutls --cflags`"
++		NETWORK_LIBS="$NETWORK_LIBS `pkg-config gnutls --libs`"
+ 
+ elif test $pkg_failed = untried; then
+      	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ printf "%s\n" "no" >&6; }
+-	CPPFLAGS="$CPPFLAGS `libgnutls-config --cflags`"
+-		NETWORK_LIBS="$NETWORK_LIBS `libgnutls-config --libs`"
++	CPPFLAGS="$CPPFLAGS `pkg-config gnutls --cflags`"
++		NETWORK_LIBS="$NETWORK_LIBS `pkg-config gnutls --libs`"
+ 
+ else
+ 	GNUTLS_CFLAGS=$pkg_cv_GNUTLS_CFLAGS
+@@ -26085,5 +26072,3 @@ fi
+   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
+ printf "%s\n" "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
+ fi
+-
+-
diff --git a/databases/freetds-devel/files/patch-doc_Makefile.in b/databases/freetds-devel/files/patch-doc_Makefile.in
index 6977487ad8ee..0b08f21c3b85 100644
--- a/databases/freetds-devel/files/patch-doc_Makefile.in
+++ b/databases/freetds-devel/files/patch-doc_Makefile.in
@@ -1,6 +1,6 @@
---- doc/Makefile.in.orig	2019-03-30 09:02:39 UTC
+--- doc/Makefile.in.orig	2024-03-02 09:02:15 UTC
 +++ doc/Makefile.in
-@@ -740,16 +740,7 @@ $(INSTALLDIRS) $(DOCDIR):
+@@ -746,16 +746,7 @@ $(INSTALLDIRS) $(DOCDIR):
  
  # If we built the documentation ourselves, install that, 
  # else if we have access to distributed documentation, install that.  
diff --git a/databases/freetds-devel/files/patch-src_tds_Makefile.in b/databases/freetds-devel/files/patch-src_tds_Makefile.in
deleted file mode 100644
index ee7e9d3d1888..000000000000
--- a/databases/freetds-devel/files/patch-src_tds_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/tds/Makefile.in.orig	2015-05-24 09:01:31 UTC
-+++ src/tds/Makefile.in
-@@ -297,7 +297,7 @@ LIBADD_DLOPEN = @LIBADD_DLOPEN@
- LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
- LIBICONV = @LIBICONV@
- LIBOBJS = @LIBOBJS@
--LIBS = @LIBS@
-+LIBS = @LIBS@ %%ICONV_LIB%%
- LIBTOOL = @LIBTOOL@
- LIPO = @LIPO@
- LN_S = @LN_S@
diff --git a/databases/freetds-devel/files/patch-src_tds_tls.c b/databases/freetds-devel/files/patch-src_tds_tls.c
index 50a726fd5614..68f0fa2aad2c 100644
--- a/databases/freetds-devel/files/patch-src_tds_tls.c
+++ b/databases/freetds-devel/files/patch-src_tds_tls.c
@@ -1,13 +1,13 @@
---- src/tds/tls.c.orig	2015-05-16 09:00:33 UTC
+--- src/tds/tls.c.orig	2023-11-24 09:01:53 UTC
 +++ src/tds/tls.c
-@@ -46,6 +46,10 @@
- #include <sys/stat.h>
- #endif /* HAVE_SYS_STAT_H */
+@@ -53,6 +53,10 @@
+ #include <sys/socket.h>
+ #endif
  
 +#if defined(__FreeBSD__) || defined(__DragonFly__)
 +#include <sys/socket.h>
 +#endif
 +
  #include <freetds/tds.h>
- #include <freetds/string.h>
+ #include <freetds/utils/string.h>
  #include <freetds/tls.h>
diff --git a/databases/freetds-devel/pkg-descr b/databases/freetds-devel/pkg-descr
index c7edc70e6849..d854c2a9e423 100644
--- a/databases/freetds-devel/pkg-descr
+++ b/databases/freetds-devel/pkg-descr
@@ -1,5 +1,3 @@
 This is TDS protocol library (CTlib/DBlib) that is used to connect to
 Microsoft and Sybase SQL servers. This can be used instead of native
 libraries, that are shipped with commercial products.
-
-WWW: http://www.freetds.org/
diff --git a/databases/freetds-devel/pkg-plist b/databases/freetds-devel/pkg-plist
index a0980bcb75a6..b0eb285899d0 100644
--- a/databases/freetds-devel/pkg-plist
+++ b/databases/freetds-devel/pkg-plist
@@ -21,15 +21,15 @@ include/syberror.h
 include/sybfront.h
 include/tds_sysdep_public.h
 include/odbcss.h
-man/man1/datacopy.1.gz
-man/man1/freebcp.1.gz
-man/man1/tsql.1.gz
-man/man1/bsqldb.1.gz
-man/man1/bsqlodbc.1.gz
-man/man1/defncopy.1.gz
-man/man1/fisql.1.gz
-man/man1/osql.1.gz
-man/man5/freetds.conf.5.gz
+share/man/man1/datacopy.1.gz
+share/man/man1/freebcp.1.gz
+share/man/man1/tsql.1.gz
+share/man/man1/bsqldb.1.gz
+share/man/man1/bsqlodbc.1.gz
+share/man/man1/defncopy.1.gz
+share/man/man1/fisql.1.gz
+share/man/man1/osql.1.gz
+share/man/man5/freetds.conf.5.gz
 lib/libct.a
 lib/libct.la
 lib/libct.so
diff --git a/databases/freetds/Makefile b/databases/freetds/Makefile
index 9fad2460c26c..552acccb6f23 100644
--- a/databases/freetds/Makefile
+++ b/databases/freetds/Makefile
@@ -1,7 +1,5 @@
-# Created by: Domas Mituzas <midom@dammit.lt>
-
 PORTNAME=	freetds
-PORTVERSION=	1.2.21
+PORTVERSION=	1.4.12
 PORTEPOCH=	1
 CATEGORIES=	databases
 MASTER_SITES=	https://www.freetds.org/files/stable/ \
@@ -9,42 +7,51 @@ MASTER_SITES=	https://www.freetds.org/files/stable/ \
 
 MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	Sybase/Microsoft TDS protocol library
+WWW=		http://www.freetds.org/
 
 LICENSE=	GPLv2
 
 LIB_DEPENDS=	libgcrypt.so:security/libgcrypt
 
-USES=		autoreconf cpe gettext gmake iconv libtool:keepla pkgconfig readline tar:bzip2
-
-TDS_VER?=	7.4
+USES=		cpe gettext gmake iconv libtool:keepla localbase:ldflags \
+		pkgconfig readline tar:bzip2
+USE_LDCONFIG=	yes
 
 GNU_CONFIGURE=	yes
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
-LIBS+=		-lgcrypt -lpthread
-CONFIGURE_ARGS=	--with-tdsver=${TDS_VER} --sysconfdir=${ETCDIR} \
-		--enable-sybase-compat --enable-msdblib
-USE_LDCONFIG=	yes
+GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
+CONFIGURE_ARGS=	--enable-msdblib \
+		--enable-sybase-compat \
+		--sysconfdir=${ETCDIR} \
+		--with-tdsver=${TDS_VER}
+
 INSTALL_TARGET=	install-strip
 
+LIBS+=		-lgcrypt -lpthread
+
+CONFLICTS=	freetds-devel
+
 PORTDOCS=	*
 
 OPTIONS_DEFINE=		DOCS MARS
-OPTIONS_SINGLE=		SSL ODBC
-OPTIONS_SINGLE_SSL=	OPENSSL GNUTLS
-OPTIONS_DEFAULT=	OPENSSL MARS UNIXODBC
+OPTIONS_DEFAULT=	MARS OPENSSL UNIXODBC
+OPTIONS_SINGLE=		ODBC SSL
 OPTIONS_SINGLE_ODBC=	IODBC UNIXODBC
-OPENSSL_USES=		ssl
-OPENSSL_CONFIGURE_ON=	--with-openssl=${OPENSSLBASE}
+OPTIONS_SINGLE_SSL=	GNUTLS OPENSSL
+
+MARS_DESC=	Enable MARS code (Experimental)
+
 GNUTLS_LIB_DEPENDS=	libgnutls.so:security/gnutls
 GNUTLS_CONFIGURE_ON=	--with-gnutls
 IODBC_LIB_DEPENDS=	libiodbc.so:databases/libiodbc
 IODBC_CONFIGURE_ON=	--with-iodbc=${LOCALBASE}
 IODBC_CPPFLAGS=		-I${LOCALBASE}/include/libiodbc
+MARS_CONFIGURE_ON=	--enable-mars
+OPENSSL_USES=		ssl
+OPENSSL_CONFIGURE_ON=	--with-openssl=${OPENSSLBASE}
 UNIXODBC_LIB_DEPENDS=	libodbc.so:databases/unixODBC
 UNIXODBC_CONFIGURE_ON=	--with-unixodbc=${LOCALBASE}
-MARS_DESC=	Enable MARS code (Experimental)
-MARS_CONFIGURE_ON=	--enable-mars
+
+TDS_VER?=	7.4
 
 .include <bsd.port.options.mk>
 
@@ -60,13 +67,15 @@ post-extract:
 	@cd ${WRKSRC}/src/pool && ${LN} -s pool.conf pool.conf.sample
 
 post-patch:
-	@${FIND} ${WRKSRC} -name "Makefile.am" | ${XARGS} ${REINPLACE_CMD} -e \
-		's|/freetds.conf|/freetds.conf.sample|g ; \
-		 s|/locales.conf|/locales.conf.sample|g ; \
-		 s|/pool.conf|/pool.conf.sample|g ; \
-		 s| common.h||g'
-	@${REINPLACE_CMD} -e 's|\($$with_iodbc/include\)|\1/libiodbc|g' \
-		${WRKSRC}/configure.ac
+	@${REINPLACE_CMD} -e 's|/freetds.conf|/freetds.conf.sample|g ; \
+		s|/locales.conf|/locales.conf.sample|g ; \
+		s| common.h||g' \
+		${WRKSRC}/Makefile.in
+	@${REINPLACE_CMD} -e 's|/pool.conf|/pool.conf.sample|g' \
+		${WRKSRC}/src/pool/Makefile.in
+	@${REINPLACE_CMD} -e 's|\($$with_iodbc/include\)|\1/libiodbc|g ; \
+		s| odbcss.h||g' \
+		${WRKSRC}/configure
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/interfaces ${STAGEDIR}${ETCDIR}/interfaces.sample
diff --git a/databases/freetds/distinfo b/databases/freetds/distinfo
index dc1f004e17a2..0c66057b00a1 100644
--- a/databases/freetds/distinfo
+++ b/databases/freetds/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1620405579
-SHA256 (freetds-1.2.21.tar.bz2) = a5e6bbf6d6f3dc0816b19cbd08308d27a084b04926aaa05ac67f808ea07d3d8d
-SIZE (freetds-1.2.21.tar.bz2) = 2249434
+TIMESTAMP = 1712230586
+SHA256 (freetds-1.4.12.tar.bz2) = a2cb8993a46417e0503e7b8488463d91b8c5d9a4601d6ee2484d28f56d3a7075
+SIZE (freetds-1.4.12.tar.bz2) = 2401192
diff --git a/databases/freetds/files/patch-configure b/databases/freetds/files/patch-configure
new file mode 100644
index 000000000000..987a1c57c9f8
--- /dev/null
+++ b/databases/freetds/files/patch-configure
@@ -0,0 +1,38 @@
+--- configure.orig	2023-12-04 09:01:11 UTC
++++ configure
+@@ -19020,20 +19020,7 @@ fi
+   printf "%s\n" "#define HAVE_SQL_H 1" >>confdefs.h
+ 
+ fi
+-ac_fn_c_check_header_compile "$LINENO" "odbcss.h" "ac_cv_header_odbcss_h" "#ifdef HAVE_WINDOWS_H
+-# include <windows.h>
+-#endif
+-#ifdef HAVE_SQL_H
+-# include <sql.h>
+-#endif
+ 
+-"
+-if test "x$ac_cv_header_odbcss_h" = xyes
+-then :
+-  printf "%s\n" "#define HAVE_ODBCSS_H 1" >>confdefs.h
+-
+-fi
+-
+  if test "$ac_cv_header_odbcss_h" = "yes"; then
+   HAVE_ODBCSS_H_TRUE=
+   HAVE_ODBCSS_H_FALSE='#'
+@@ -21342,7 +21329,7 @@ elif test "x$with_iodbc" != "x" -a "x$with_iodbc" != "
+ 		with_iodbc="$PWD/$with_iodbc"
+ 	fi
+ 	CPPFLAGS="$CPPFLAGS -DIODBC"
+-	ODBC_INC="$with_iodbc/include"
++	ODBC_INC="$with_iodbc/include/libiodbc"
+ 	test -r "$ODBC_INC/isql.h" || as_fn_error $? "isql.h not found" "$LINENO" 5
+ 	test -r "$ODBC_INC/isqlext.h" || as_fn_error $? "isqlext.h not found" "$LINENO" 5
+ 	ODBC_INC="-I$ODBC_INC"
+@@ -26046,5 +26033,3 @@ fi
+   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
+ printf "%s\n" "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
+ fi
+-
+-
diff --git a/databases/freetds/files/patch-src_tds_sec__negotiate__openssl.h b/databases/freetds/files/patch-src_tds_sec__negotiate__openssl.h
deleted file mode 100644
index 301e80834bf7..000000000000
--- a/databases/freetds/files/patch-src_tds_sec__negotiate__openssl.h
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/tds/sec_negotiate_openssl.h.orig	2017-02-15 09:00:01 UTC
-+++ src/tds/sec_negotiate_openssl.h
-@@ -37,6 +37,11 @@
- #error HAVE_OPENSSL not defines, this file should not be included
- #endif
- 
-+#if defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL
-+#undef OPENSSL_VERSION_NUMBER
-+#define OPENSSL_VERSION_NUMBER 0x1000107fL
-+#endif
-+
- static inline const BIGNUM*
- rsa_get_n(const RSA *rsa)
- {
diff --git a/databases/freetds/files/patch-src_tds_tls.c b/databases/freetds/files/patch-src_tds_tls.c
index 07a8cb8ec5ac..e9b18a332258 100644
--- a/databases/freetds/files/patch-src_tds_tls.c
+++ b/databases/freetds/files/patch-src_tds_tls.c
@@ -1,6 +1,6 @@
---- src/tds/tls.c.orig	2017-11-30 09:00:01 UTC
+--- src/tds/tls.c.orig	2023-11-24 09:00:02 UTC
 +++ src/tds/tls.c
-@@ -50,6 +50,10 @@
+@@ -53,6 +53,10 @@
  #include <sys/socket.h>
  #endif
  
@@ -9,21 +9,23 @@
 +#endif
 +
  #include <freetds/tds.h>
- #include <freetds/string.h>
+ #include <freetds/utils/string.h>
  #include <freetds/tls.h>
-@@ -72,6 +76,15 @@
- #define SSL_PTR ptr
- #else
+@@ -600,7 +604,7 @@ tds_ssl_free(BIO *a)
+ 	return 1;
+ }
  
-+#ifdef LIBRESSL_VERSION_NUMBER
-+#if LIBRESSL_VERSION_NUMBER < 0x2070000FL
-+static pthread_mutex_t *openssllocks;
-+#undef OPENSSL_VERSION_NUMBER
-+#define OPENSSL_VERSION_NUMBER 0x1000107fL
-+#endif
-+#define TLS_ST_OK SSL_ST_OK
-+#endif
-+
- /* some compatibility layer */
- #if OPENSSL_VERSION_NUMBER < 0x1010000FL
- static inline void
+-#if OPENSSL_VERSION_NUMBER < 0x1010000FL || defined(LIBRESSL_VERSION_NUMBER)
++#if OPENSSL_VERSION_NUMBER < 0x1010000FL
+ static BIO_METHOD tds_method_login[1] = {
+ {
+ 	BIO_TYPE_MEM,
+@@ -665,7 +669,7 @@ tds_deinit_openssl_methods(void)
+ #  endif
+ #endif
+ 
+-#if OPENSSL_VERSION_NUMBER < 0x1010000FL || defined(LIBRESSL_VERSION_NUMBER)
++#if OPENSSL_VERSION_NUMBER < 0x1010000FL
+ static tds_mutex *openssl_locks;
+ 
+ static void
diff --git a/databases/freetds/pkg-descr b/databases/freetds/pkg-descr
index c7edc70e6849..d854c2a9e423 100644
--- a/databases/freetds/pkg-descr
+++ b/databases/freetds/pkg-descr
@@ -1,5 +1,3 @@
 This is TDS protocol library (CTlib/DBlib) that is used to connect to
 Microsoft and Sybase SQL servers. This can be used instead of native
 libraries, that are shipped with commercial products.
-
-WWW: http://www.freetds.org/
diff --git a/databases/freetds/pkg-plist b/databases/freetds/pkg-plist
index 277e7f237664..e7b2074e755e 100644
--- a/databases/freetds/pkg-plist
+++ b/databases/freetds/pkg-plist
@@ -31,15 +31,15 @@ lib/libsybdb.la
 lib/libsybdb.so
 lib/libsybdb.so.5
 lib/libsybdb.so.5.1.0
-man/man1/bsqldb.1.gz
-man/man1/bsqlodbc.1.gz
-man/man1/datacopy.1.gz
-man/man1/defncopy.1.gz
-man/man1/fisql.1.gz
-man/man1/freebcp.1.gz
-man/man1/osql.1.gz
-man/man1/tsql.1.gz
-man/man5/freetds.conf.5.gz
+share/man/man1/bsqldb.1.gz
+share/man/man1/bsqlodbc.1.gz
+share/man/man1/datacopy.1.gz
+share/man/man1/defncopy.1.gz
+share/man/man1/fisql.1.gz
+share/man/man1/freebcp.1.gz
+share/man/man1/osql.1.gz
+share/man/man1/tsql.1.gz
+share/man/man5/freetds.conf.5.gz
 %%ODBC%%bin/bsqlodbc
 %%ODBC%%lib/libtdsodbc.so
 %%ODBC%%lib/libtdsodbc.so.0
diff --git a/databases/frontbase-jdbc/Makefile b/databases/frontbase-jdbc/Makefile
index 041d5bb0b648..35987b670fdb 100644
--- a/databases/frontbase-jdbc/Makefile
+++ b/databases/frontbase-jdbc/Makefile
@@ -1,5 +1,3 @@
-# Created by: Quinton Dolan <q@onthenet.com.au>
-
 PORTNAME=	frontbase
 PORTVERSION=	2.5.6
 CATEGORIES=	databases java
@@ -10,6 +8,7 @@ EXTRACT_SUFX=	.tar
 
 MAINTAINER?=	ports@FreeBSD.org
 COMMENT=	The Java JDBC implementation for FrontBase
+WWW=		http://www.frontbase.com/
 
 USE_JAVA=	yes
 
diff --git a/databases/frontbase-jdbc/pkg-descr b/databases/frontbase-jdbc/pkg-descr
index 105c396e58cd..7758507204bc 100644
--- a/databases/frontbase-jdbc/pkg-descr
+++ b/databases/frontbase-jdbc/pkg-descr
@@ -1,4 +1,2 @@
 This is the official implementation of JDBC, the Java Database
 Connectivity API, for accessing FrontBase databases from Java.
-
-WWW: http://www.frontbase.com/
diff --git a/databases/futuresql/Makefile b/databases/futuresql/Makefile
new file mode 100644
index 000000000000..2098a65c2059
--- /dev/null
+++ b/databases/futuresql/Makefile
@@ -0,0 +1,17 @@
+PORTNAME=	futuresql
+DISTVERSION=	0.1.1
+PORTREVISION=	1
+CATEGORIES=	databases kde
+MASTER_SITES=	KDE/stable/${PORTNAME}/
+
+MAINTAINER=	kde@FreeBSD.org
+COMMENT=	Non-blocking database framework for Qt
+WWW=		https://api.kde.org/futuresql/html/index.html
+
+USES=		cmake kde:5 qt:5 tar:xz
+
+USE_KDE=	ecm:build
+USE_QT=		core sql \
+		buildtools:build qmake:build
+
+.include <bsd.port.mk>
diff --git a/databases/futuresql/distinfo b/databases/futuresql/distinfo
new file mode 100644
index 000000000000..165daff49a86
--- /dev/null
+++ b/databases/futuresql/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1691920947
+SHA256 (futuresql-0.1.1.tar.xz) = e44ed8d5a9618b3ca7ba2983ed9c5f7572e6e0a5b199f94868834b71ccbebd43
+SIZE (futuresql-0.1.1.tar.xz) = 27844
diff --git a/databases/futuresql/pkg-descr b/databases/futuresql/pkg-descr
new file mode 100644
index 000000000000..7fc9963c771a
--- /dev/null
+++ b/databases/futuresql/pkg-descr
@@ -0,0 +1,11 @@
+A non-blocking database framework for Qt.
+
+FutureSQL was in part inspired by Diesel, and provides a higher level of
+abstraction than QtSql. Its features include non-blocking database access by
+default, relatively boilderplate-free queries, automatic database migrations
+and simple mapping to objects.
+
+In order to make FutureSQL's use of templates less confusing, FutureSQL uses
+C++20 concepts, and requires a C++20 compiler.
+
+Warning: The API is not finalized yet.
diff --git a/databases/futuresql/pkg-plist b/databases/futuresql/pkg-plist
new file mode 100644
index 000000000000..6457ddacee70
--- /dev/null
+++ b/databases/futuresql/pkg-plist
@@ -0,0 +1,10 @@
+include/FutureSQL5/ThreadedDatabase
+include/FutureSQL5/futuresql_export.h
+include/FutureSQL5/threadeddatabase.h
+include/FutureSQL5/threadeddatabase_p.h
+lib/cmake/FutureSQL5/FutureSQL5Config.cmake
+lib/cmake/FutureSQL5/FutureSQL5ConfigVersion.cmake
+lib/cmake/FutureSQL5/FutureSQLTargets-%%CMAKE_BUILD_TYPE%%.cmake
+lib/cmake/FutureSQL5/FutureSQLTargets.cmake
+lib/libfuturesql5.so
+lib/libfuturesql5.so.0
diff --git a/databases/galera/Makefile b/databases/galera/Makefile
index 1178c3b04061..49c5f9a7fb18 100644
--- a/databases/galera/Makefile
+++ b/databases/galera/Makefile
@@ -1,12 +1,12 @@
-# Created by: Horia Racoviceanu <horia@racoviceanu.com>
-
 PORTNAME=	galera
-PORTVERSION?=	25.3.34
+PORTVERSION?=	25.3.37
+PORTREVISION=	5
 DISTVERSIONPREFIX?=	release_
 CATEGORIES=	databases
 
 MAINTAINER=	devel@galeracluster.com
 COMMENT=	Synchronous multi-master replication engine
+WWW=		https://galeracluster.com/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
@@ -14,7 +14,6 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 BROKEN_aarch64=		fails to compile: gu_int128.h: use of undeclared identifier '__bswap64_var'
 BROKEN_armv6=		fails to compile: gu_int128.h: use of undeclared identifier '__bswap64_var'
 BROKEN_armv7=		fails to compile: gu_int128.h: use of undeclared identifier '__bswap64_var'
-BROKEN_riscv64=		fails to compile: gu_int128.h: use of undeclared identifier '__bswap64_var'
 NOT_FOR_ARCHS=		i386 powerpc
 # On i386 older versions of clang produce:
 #   cannot compile this atomic library call yet ... __atomic_add_fetch
@@ -34,6 +33,7 @@ LIB_DEPENDS=	libboost_date_time.so:devel/boost-libs
 
 USES=		compiler:c++11-lang python:build cmake ssl
 
+USE_CXXSTD=	c++11
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
@@ -42,6 +42,8 @@ GH_TUPLE?=	codership:galera:${DISTVERSIONPREFIX}${PORTVERSION}${DISTVERSIONSUFFI
 
 CMAKE_ARGS+=	-DGALERA_REVISION=${GH_TAGNAME}
 
+CONFLICTS_INSTALL=	galera26
+
 USE_RC_SUBR=	garb.sh
 
 PLIST_FILES=	bin/garbd \
diff --git a/databases/galera/distinfo b/databases/galera/distinfo
index 0e1a3cf7b857..de1f2b70e41f 100644
--- a/databases/galera/distinfo
+++ b/databases/galera/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1627299446
-SHA256 (codership-galera-release_25.3.34_GH0.tar.gz) = 0a3c7d1b96c308172ab91a2a8fc597ca205bcc10b6710d354d5bad7b40fb1386
-SIZE (codership-galera-release_25.3.34_GH0.tar.gz) = 3338604
+TIMESTAMP = 1653386053
+SHA256 (codership-galera-release_25.3.37_GH0.tar.gz) = f149474c4f4840e7c986fe2028e32fbf92a0b86e1e219c76f8cb4795eb7962c8
+SIZE (codership-galera-release_25.3.37_GH0.tar.gz) = 3341396
 SHA256 (codership-wsrep-API-eab2d5d5a31672c0b7d116ef1629ff18392fd7d0_GH0.tar.gz) = 3c235868ed330d8d702e7b7541c24c1926b1fd9e6b8aa673b032a2318896e8a0
 SIZE (codership-wsrep-API-eab2d5d5a31672c0b7d116ef1629ff18392fd7d0_GH0.tar.gz) = 47032
diff --git a/databases/galera/files/garb.sh.in b/databases/galera/files/garb.sh.in
index 32191a41aced..97ba0b4c0b28 100644
--- a/databases/galera/files/garb.sh.in
+++ b/databases/galera/files/garb.sh.in
@@ -19,7 +19,7 @@
 #                              see http://www.codership.com/wiki/doku.php?id=galera_parameters
 #                              (default empty).
 #  garb_log_file (str):        Log file for garbd (default empty). Optional, by default logs to syslog
-#  garb_pid_file (str):        Custum PID file path and name.
+#  garb_pid_file (str):        Custom PID file path and name.
 #                              Default to "/var/run/garb.pid".
 #
 
diff --git a/databases/galera/pkg-descr b/databases/galera/pkg-descr
index 4cf15e8d108e..8034a9cfb653 100644
--- a/databases/galera/pkg-descr
+++ b/databases/galera/pkg-descr
@@ -1,5 +1,3 @@
 Galera wsrep provider library for Galera Cluster for MySQL, an easy-to-use
 high-availability solution with high system up-time, no data loss,
 and scalability for future growth.
-
-WWW: http://galeracluster.com/
diff --git a/databases/galera/pkg-message b/databases/galera/pkg-message
index ee97d9728fc1..ef615df77dc4 100644
--- a/databases/galera/pkg-message
+++ b/databases/galera/pkg-message
@@ -2,7 +2,7 @@
 { type: install
   message: <<EOM
 Find the Galera Cluster documentation at
-http://galeracluster.com/documentation-webpages/
+https://galeracluster.com/library/documentation/index.html
 EOM
 }
 ]
diff --git a/databases/galera26/Makefile b/databases/galera26/Makefile
index 899cdf1bb578..9d263dfa471e 100644
--- a/databases/galera26/Makefile
+++ b/databases/galera26/Makefile
@@ -1,13 +1,13 @@
-# Created by: Nicolas Embriz <nbari@tequila.io>
-
 PORTNAME=	galera
-PORTVERSION=	26.4.9
+PORTVERSION=	26.4.16
+PORTREVISION=	2
 DISTVERSIONPREFIX=	release_
 CATEGORIES=	databases
 PKGNAMESUFFIX=	26
 
 MAINTAINER=	devel@galeracluster.com
 COMMENT=	Synchronous multi-master replication engine
+WWW=		https://galeracluster.com/
 
 LICENSE=	GPLv2
 
@@ -32,13 +32,15 @@ USES=		compiler:c++11-lang python:build cmake ssl
 
 USE_GITHUB=	yes
 GH_TUPLE?=	codership:galera:${DISTVERSIONPREFIX}${PORTVERSION}${DISTVERSIONSUFFIX} \
-		codership:wsrep-API:76cf223c690845bbf561cb820a46e06a18ad80d1:dummy/wsrep/src
+		codership:wsrep-API:694d6ca47f5eec7873be99b7d6babccf633d1231:dummy/wsrep/src
 
 CMAKE_ARGS+=	-DGALERA_REVISION=${GH_TAGNAME}
 
 USE_LDCONFIG=	yes
 USE_RC_SUBR=	garb.sh
 
+CONFLICTS_INSTALL=      galera
+
 PLIST_FILES=	bin/garbd \
 		lib/libgalera.so \
 		lib/libgalera_smm.so
diff --git a/databases/galera26/distinfo b/databases/galera26/distinfo
index 5bc860ff0b05..c5d957f7e809 100644
--- a/databases/galera26/distinfo
+++ b/databases/galera26/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1627382288
-SHA256 (codership-galera-release_26.4.9_GH0.tar.gz) = d920ff3eb902f9b05534edfb4fabd57e6a355845ca271e48d6b37f9e380f545e
-SIZE (codership-galera-release_26.4.9_GH0.tar.gz) = 3490784
-SHA256 (codership-wsrep-API-76cf223c690845bbf561cb820a46e06a18ad80d1_GH0.tar.gz) = 214fb8701ae51bcdf8171475a93f2c28ddd56e642feb172ec5148b4d3c73d4a6
-SIZE (codership-wsrep-API-76cf223c690845bbf561cb820a46e06a18ad80d1_GH0.tar.gz) = 90155
+TIMESTAMP = 1692354123
+SHA256 (codership-galera-release_26.4.16_GH0.tar.gz) = ffa90cdbdbf18838de158db0a5a411aa959cf1074445a8cd267a1679daca354a
+SIZE (codership-galera-release_26.4.16_GH0.tar.gz) = 3588854
+SHA256 (codership-wsrep-API-694d6ca47f5eec7873be99b7d6babccf633d1231_GH0.tar.gz) = 31a63c1ddab88ba73f7f7c404c7f18e883236f9ed64e94e95d625a831c721089
+SIZE (codership-wsrep-API-694d6ca47f5eec7873be99b7d6babccf633d1231_GH0.tar.gz) = 91929
diff --git a/databases/galera26/files/garb.sh.in b/databases/galera26/files/garb.sh.in
index 32191a41aced..97ba0b4c0b28 100644
--- a/databases/galera26/files/garb.sh.in
+++ b/databases/galera26/files/garb.sh.in
@@ -19,7 +19,7 @@
 #                              see http://www.codership.com/wiki/doku.php?id=galera_parameters
 #                              (default empty).
 #  garb_log_file (str):        Log file for garbd (default empty). Optional, by default logs to syslog
-#  garb_pid_file (str):        Custum PID file path and name.
+#  garb_pid_file (str):        Custom PID file path and name.
 #                              Default to "/var/run/garb.pid".
 #
 
diff --git a/databases/galera26/files/patch-asio_asio_ssl_detail_openssl__types.hpp b/databases/galera26/files/patch-asio_asio_ssl_detail_openssl__types.hpp
new file mode 100644
index 000000000000..b45c9d68f745
--- /dev/null
+++ b/databases/galera26/files/patch-asio_asio_ssl_detail_openssl__types.hpp
@@ -0,0 +1,13 @@
+--- asio/asio/ssl/detail/openssl_types.hpp.orig	2021-11-15 21:19:46 UTC
++++ asio/asio/ssl/detail/openssl_types.hpp
+@@ -17,6 +17,10 @@
+ 
+ #include "asio/detail/config.hpp"
+ #include <openssl/conf.h>
++/* Workaround for libressl 3.4.1 and maybe earlier: The
++ * SSL_CTX gets only forward declared unless LIBRESSL_INTERNAL
++ * is defined before including ssl.h header. */
++#define LIBRESSL_INTERNAL
+ #include <openssl/ssl.h>
+ #if !defined(OPENSSL_NO_ENGINE)
+ # include <openssl/engine.h>
diff --git a/databases/galera26/files/patch-asio_asio_ssl_impl_context.ipp b/databases/galera26/files/patch-asio_asio_ssl_impl_context.ipp
new file mode 100644
index 000000000000..8e9c85ca711e
--- /dev/null
+++ b/databases/galera26/files/patch-asio_asio_ssl_impl_context.ipp
@@ -0,0 +1,143 @@
+--- asio/asio/ssl/impl/context.ipp.orig	2023-02-03 12:20:21 UTC
++++ asio/asio/ssl/impl/context.ipp
+@@ -87,7 +87,7 @@ context::context(context::method m)
+ #endif // (OPENSSL_VERSION_NUMBER >= 0x10100000L) || defined(OPENSSL_NO_SSL2)
+ 
+     // SSL v3.
+-#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER)
++#if (OPENSSL_VERSION_NUMBER >= 0x10100000L)
+   case context::sslv3:
+     handle_ = ::SSL_CTX_new(::TLS_method());
+     if (handle_)
+@@ -132,7 +132,7 @@ context::context(context::method m)
+ #endif // defined(OPENSSL_NO_SSL3)
+ 
+     // TLS v1.0.
+-#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER)
++#if (OPENSSL_VERSION_NUMBER >= 0x10100000L)
+   case context::tlsv1:
+     handle_ = ::SSL_CTX_new(::TLS_method());
+     if (handle_)
+@@ -177,7 +177,7 @@ context::context(context::method m)
+ #endif // defined(SSL_TXT_TLSV1)
+ 
+     // TLS v1.1.
+-#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER)
++#if (OPENSSL_VERSION_NUMBER >= 0x10100000L)
+   case context::tlsv11:
+     handle_ = ::SSL_CTX_new(::TLS_method());
+     if (handle_)
+@@ -222,7 +222,7 @@ context::context(context::method m)
+ #endif // defined(SSL_TXT_TLSV1_1)
+ 
+     // TLS v1.2.
+-#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER)
++#if (OPENSSL_VERSION_NUMBER >= 0x10100000L)
+   case context::tlsv12:
+     handle_ = ::SSL_CTX_new(::TLS_method());
+     if (handle_)
+@@ -267,8 +267,7 @@ context::context(context::method m)
+ #endif // defined(SSL_TXT_TLSV1_2)
+ 
+     // TLS v1.3.
+-#if (OPENSSL_VERSION_NUMBER >= 0x10101000L) \
+-    && !defined(LIBRESSL_VERSION_NUMBER)
++#if (OPENSSL_VERSION_NUMBER >= 0x10101000L)
+   case context::tlsv13:
+     handle_ = ::SSL_CTX_new(::TLS_method());
+     if (handle_)
+@@ -294,7 +293,6 @@ context::context(context::method m)
+     }
+     break;
+ #else // (OPENSSL_VERSION_NUMBER >= 0x10101000L)
+-      //   && !defined(LIBRESSL_VERSION_NUMBER)
+   case context::tlsv13:
+   case context::tlsv13_client:
+   case context::tlsv13_server:
+@@ -302,7 +300,6 @@ context::context(context::method m)
+         asio::error::invalid_argument, "context");
+     break;
+ #endif // (OPENSSL_VERSION_NUMBER >= 0x10101000L)
+-       //   && !defined(LIBRESSL_VERSION_NUMBER)
+ 
+     // Any supported SSL/TLS version.
+   case context::sslv23:
+@@ -316,7 +313,7 @@ context::context(context::method m)
+     break;
+ 
+     // Any supported TLS version.
+-#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER)
++#if (OPENSSL_VERSION_NUMBER >= 0x10100000L)
+   case context::tls:
+     handle_ = ::SSL_CTX_new(::TLS_method());
+     if (handle_)
+@@ -386,8 +383,7 @@ context::~context()
+ {
+   if (handle_)
+   {
+-#if ((OPENSSL_VERSION_NUMBER >= 0x10100000L) \
+-      && !defined(LIBRESSL_VERSION_NUMBER)) \
++#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) \
+     || defined(ASIO_USE_WOLFSSL)
+     void* cb_userdata = ::SSL_CTX_get_default_passwd_cb_userdata(handle_);
+ #else // (OPENSSL_VERSION_NUMBER >= 0x10100000L)
+@@ -399,8 +395,7 @@ context::~context()
+         static_cast<detail::password_callback_base*>(
+             cb_userdata);
+       delete callback;
+-#if ((OPENSSL_VERSION_NUMBER >= 0x10100000L) \
+-      && !defined(LIBRESSL_VERSION_NUMBER)) \
++#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) \
+     || defined(ASIO_USE_WOLFSSL)
+       ::SSL_CTX_set_default_passwd_cb_userdata(handle_, 0);
+ #else // (OPENSSL_VERSION_NUMBER >= 0x10100000L)
+@@ -738,8 +733,7 @@ ASIO_SYNC_OP_VOID context::use_certificate_chain(
+   bio_cleanup bio = { make_buffer_bio(chain) };
+   if (bio.p)
+   {
+-#if ((OPENSSL_VERSION_NUMBER >= 0x10100000L) \
+-      && !defined(LIBRESSL_VERSION_NUMBER)) \
++#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) \
+     || defined(ASIO_USE_WOLFSSL)
+     pem_password_cb* callback = ::SSL_CTX_get_default_passwd_cb(handle_);
+     void* cb_userdata = ::SSL_CTX_get_default_passwd_cb_userdata(handle_);
+@@ -767,8 +761,7 @@ ASIO_SYNC_OP_VOID context::use_certificate_chain(
+       ASIO_SYNC_OP_VOID_RETURN(ec);
+     }
+ 
+-#if ((OPENSSL_VERSION_NUMBER >= 0x10002000L) \
+-      && !defined(LIBRESSL_VERSION_NUMBER)) \
++#if (OPENSSL_VERSION_NUMBER >= 0x10002000L) \
+     || defined(ASIO_USE_WOLFSSL)
+     ::SSL_CTX_clear_chain_certs(handle_);
+ #else
+@@ -846,8 +839,7 @@ ASIO_SYNC_OP_VOID context::use_private_key(
+ {
+   ::ERR_clear_error();
+ 
+-#if ((OPENSSL_VERSION_NUMBER >= 0x10100000L) \
+-      && !defined(LIBRESSL_VERSION_NUMBER)) \
++#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) \
+     || defined(ASIO_USE_WOLFSSL)
+     pem_password_cb* callback = ::SSL_CTX_get_default_passwd_cb(handle_);
+     void* cb_userdata = ::SSL_CTX_get_default_passwd_cb_userdata(handle_);
+@@ -915,8 +907,7 @@ ASIO_SYNC_OP_VOID context::use_rsa_private_key(
+ {
+   ::ERR_clear_error();
+ 
+-#if ((OPENSSL_VERSION_NUMBER >= 0x10100000L) \
+-      && !defined(LIBRESSL_VERSION_NUMBER)) \
++#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) \
+     || defined(ASIO_USE_WOLFSSL)
+     pem_password_cb* callback = ::SSL_CTX_get_default_passwd_cb(handle_);
+     void* cb_userdata = ::SSL_CTX_get_default_passwd_cb_userdata(handle_);
+@@ -1156,8 +1147,7 @@ int context::verify_callback_function(int preverified,
+ ASIO_SYNC_OP_VOID context::do_set_password_callback(
+     detail::password_callback_base* callback, asio::error_code& ec)
+ {
+-#if ((OPENSSL_VERSION_NUMBER >= 0x10100000L) \
+-      && !defined(LIBRESSL_VERSION_NUMBER)) \
++#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) \
+     || defined(ASIO_USE_WOLFSSL)
+   void* old_callback = ::SSL_CTX_get_default_passwd_cb_userdata(handle_);
+   ::SSL_CTX_set_default_passwd_cb_userdata(handle_, callback);
diff --git a/databases/galera26/pkg-descr b/databases/galera26/pkg-descr
index 2c21687fe034..d63da6355e70 100644
--- a/databases/galera26/pkg-descr
+++ b/databases/galera26/pkg-descr
@@ -1,5 +1,3 @@
 Galera v26 wsrep provider library for Galera Cluster for MySQL, an
 easy-to-use high-availability solution with high system up-time,
 no data loss, and scalability for future growth.
-
-WWW: https://galeracluster.com/
diff --git a/databases/galera26/pkg-message b/databases/galera26/pkg-message
index ee97d9728fc1..ef615df77dc4 100644
--- a/databases/galera26/pkg-message
+++ b/databases/galera26/pkg-message
@@ -2,7 +2,7 @@
 { type: install
   message: <<EOM
 Find the Galera Cluster documentation at
-http://galeracluster.com/documentation-webpages/
+https://galeracluster.com/library/documentation/index.html
 EOM
 }
 ]
diff --git a/databases/gdbm/Makefile b/databases/gdbm/Makefile
index fffc8e56104f..8bc1aef8f393 100644
--- a/databases/gdbm/Makefile
+++ b/databases/gdbm/Makefile
@@ -1,17 +1,17 @@
-# Created by: Brent J. Nordquist <bjn@visi.com>
-
 PORTNAME=	gdbm
-PORTVERSION=	1.21
+PORTVERSION=	1.23
 CATEGORIES=	databases
 MASTER_SITES=	GNU
 
 MAINTAINER=	danfe@FreeBSD.org
 COMMENT=	GNU database manager
+WWW=		https://www.gnu.org.ua/software/gdbm/
 
 LICENSE=	GPLv3+
 
 USES=		gmake libtool:keepla readline
 GNU_CONFIGURE=	yes
+GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
 INSTALL_TARGET=	install-strip
 TEST_TARGET=	check
 USE_LDCONFIG=	yes
diff --git a/databases/gdbm/distinfo b/databases/gdbm/distinfo
index 8886ac57cc56..d4c2bbf69429 100644
--- a/databases/gdbm/distinfo
+++ b/databases/gdbm/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1630590585
-SHA256 (gdbm-1.21.tar.gz) = b0b7dbdefd798de7ddccdd8edf6693a30494f7789777838042991ef107339cc2
-SIZE (gdbm-1.21.tar.gz) = 1005982
+TIMESTAMP = 1643984005
+SHA256 (gdbm-1.23.tar.gz) = 74b1081d21fff13ae4bd7c16e5d6e504a4c26f7cde1dca0d963a484174bbcacd
+SIZE (gdbm-1.23.tar.gz) = 1115854
diff --git a/databases/gdbm/pkg-descr b/databases/gdbm/pkg-descr
index 234c80356b92..7244f3fe4333 100644
--- a/databases/gdbm/pkg-descr
+++ b/databases/gdbm/pkg-descr
@@ -4,5 +4,3 @@ provided to a programmer needing to create and manipulate a hashed database.
 
 This library exists in the FreeBSD base collection, but the GNU version has
 added functionality that is sometimes useful.
-
-WWW: https://www.gnu.org.ua/software/gdbm/
diff --git a/databases/gdbm/pkg-plist b/databases/gdbm/pkg-plist
index 58215a01feea..b6512e2d3ce4 100644
--- a/databases/gdbm/pkg-plist
+++ b/databases/gdbm/pkg-plist
@@ -14,10 +14,6 @@ lib/libgdbm.so.6.0.0
 %%COMPAT%%lib/libgdbm_compat.so
 %%COMPAT%%lib/libgdbm_compat.so.4
 %%COMPAT%%lib/libgdbm_compat.so.4.0.0
-man/man1/gdbm_dump.1.gz
-man/man1/gdbm_load.1.gz
-man/man1/gdbmtool.1.gz
-man/man3/gdbm.3.gz
 %%NLS%%share/locale/da/LC_MESSAGES/gdbm.mo
 %%NLS%%share/locale/de/LC_MESSAGES/gdbm.mo
 %%NLS%%share/locale/eo/LC_MESSAGES/gdbm.mo
@@ -32,3 +28,7 @@ man/man3/gdbm.3.gz
 %%NLS%%share/locale/sv/LC_MESSAGES/gdbm.mo
 %%NLS%%share/locale/uk/LC_MESSAGES/gdbm.mo
 %%NLS%%share/locale/vi/LC_MESSAGES/gdbm.mo
+share/man/man1/gdbm_dump.1.gz
+share/man/man1/gdbm_load.1.gz
+share/man/man1/gdbmtool.1.gz
+share/man/man3/gdbm.3.gz
diff --git a/databases/geoserver-mysql-plugin/Makefile b/databases/geoserver-mysql-plugin/Makefile
index b842230cebd5..09e92d1a609c 100644
--- a/databases/geoserver-mysql-plugin/Makefile
+++ b/databases/geoserver-mysql-plugin/Makefile
@@ -1,7 +1,5 @@
-# Created by: Alexander Logvinov <ports@logvinov.com>
-
 PORTNAME=	geoserver
-PORTVERSION=	2.19.1
+PORTVERSION=	2.25.0
 CATEGORIES=	databases geography java
 MASTER_SITES=	SF/${PORTNAME}/GeoServer/${PORTVERSION}/extensions
 PKGNAMESUFFIX=	-mysql-plugin
@@ -9,20 +7,23 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}${PKGNAMESUFFIX}
 
 MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	MySQL DataStore implementation for GeoServer
+WWW=		http://geoserver.org/display/GEOSDOC/MySQL+DataStore
 
 LICENSE=	LGPL21
 
 RUN_DEPENDS=	${LOCALBASE}/geoserver/start.jar:graphics/geoserver
 
-USES=		zip
+USES=		cpe zip
+
+CPE_VENDOR=	osgeo
 
-NO_BUILD=	yes
 NO_ARCH=	yes
+NO_BUILD=	yes
+SUB_FILES=	pkg-message
 
 GSLIBDIR=	geoserver/webapps/geoserver/WEB-INF/lib
-SUB_FILES=	pkg-message
-PLIST_FILES=	${GSLIBDIR}/gt-jdbc-mysql-25.1.jar \
-		${GSLIBDIR}/mysql-connector-java-8.0.23.jar
+PLIST_FILES=	${GSLIBDIR}/gt-jdbc-mysql-31.0.jar \
+		${GSLIBDIR}/mysql-connector-java-8.0.28.jar
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/${GSLIBDIR}
diff --git a/databases/geoserver-mysql-plugin/distinfo b/databases/geoserver-mysql-plugin/distinfo
index df6b1eebef19..d72fca248685 100644
--- a/databases/geoserver-mysql-plugin/distinfo
+++ b/databases/geoserver-mysql-plugin/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1621919872
-SHA256 (geoserver-2.19.1-mysql-plugin.zip) = a7c401211e36301c9e4f69aa04cc0b7dac85957e8f93f876a41ec4448ba70b28
-SIZE (geoserver-2.19.1-mysql-plugin.zip) = 2316838
+TIMESTAMP = 1710925527
+SHA256 (geoserver-2.25.0-mysql-plugin.zip) = 9fef356a3121d0b8b4fbd42b20cdba977852205d440c9f8f02490ae236658ae7
+SIZE (geoserver-2.25.0-mysql-plugin.zip) = 2401181
diff --git a/databases/geoserver-mysql-plugin/pkg-descr b/databases/geoserver-mysql-plugin/pkg-descr
index c562b975218a..00aee269a945 100644
--- a/databases/geoserver-mysql-plugin/pkg-descr
+++ b/databases/geoserver-mysql-plugin/pkg-descr
@@ -1,3 +1 @@
 This port contains a MySQL DataStore implementation for GeoServer.
-
-WWW: http://geoserver.org/display/GEOSDOC/MySQL+DataStore
diff --git a/databases/gigabase/Makefile b/databases/gigabase/Makefile
index 8969a4d71fcb..41b8ac1e4ee9 100644
--- a/databases/gigabase/Makefile
+++ b/databases/gigabase/Makefile
@@ -1,14 +1,13 @@
-# Created by: Sergey A. Osokin <osa@FreeBSD.org.ru>
-
 PORTNAME=	gigabase
 PORTVERSION=	3.91
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	databases
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-src/${PORTVERSION} \
 		http://www.garret.ru/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Object-Relational Database Management System
+WWW=		http://www.garret.ru/gigabase.html
 
 LICENSE=	MIT
 
diff --git a/databases/gigabase/pkg-descr b/databases/gigabase/pkg-descr
index e07a2541ffba..9b2ab0203c3a 100644
--- a/databases/gigabase/pkg-descr
+++ b/databases/gigabase/pkg-descr
@@ -18,5 +18,3 @@ exporting data from database. GigaBASE will perform automatic recovery
 after system or application crash, you should not worry about it. The
 only thing you can have to do manually is stopping all database
 application if one of them is crashed leaving database blocked.
-
-WWW: http://www.garret.ru/gigabase.html
diff --git a/databases/gmdb2/Makefile b/databases/gmdb2/Makefile
index d636d09af3e4..0158a6322517 100644
--- a/databases/gmdb2/Makefile
+++ b/databases/gmdb2/Makefile
@@ -1,12 +1,12 @@
-# Created by: Rainer Hurling <rhurlin@gwdg.de>
-
 PORTNAME=	gmdb2
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.9.1
+PORTREVISION=	5
 CATEGORIES=	databases
 
 MAINTAINER=	rhurlin@FreeBSD.org
 COMMENT=	Official GUI for mdbtools
+WWW=		https://github.com/mdbtools/gmdb2/
 
 LICENSE=	GPLv2
 
@@ -22,6 +22,7 @@ GH_ACCOUNT=	mdbtools
 USE_GNOME=	gdkpixbuf2 glib20 gtk30 libxml2
 GLIB_SCHEMAS=	mdbtools.gmdb2.gschema.xml
 GNU_CONFIGURE=	yes
+GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
 
 OPTIONS_DEFINE=	DOCS
 OPTIONS_SUB=	yes
diff --git a/databases/gmdb2/pkg-descr b/databases/gmdb2/pkg-descr
index 508b51a9e923..82b41c4b477c 100644
--- a/databases/gmdb2/pkg-descr
+++ b/databases/gmdb2/pkg-descr
@@ -1,4 +1,2 @@
 This is the official GUI for mdbtools. It is a standalone
 package that was ported to GTK+3.
-
-WWW: https://github.com/mdbtools/gmdb2/
diff --git a/databases/gmdb2/pkg-plist b/databases/gmdb2/pkg-plist
index 49b66d3dbc56..c703ae8e2757 100644
--- a/databases/gmdb2/pkg-plist
+++ b/databases/gmdb2/pkg-plist
@@ -1,6 +1,5 @@
 bin/gmdb2
 include/gmdb.h
-man/man1/gmdb2.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/CHANGELOG.md
 %%PORTDOCS%%%%DOCSDIR%%/README.md
@@ -35,3 +34,4 @@ share/help/C/gmdb2/figures/gmdb2_sql_window.png
 share/help/C/gmdb2/figures/gmdb2_window.png
 share/help/C/gmdb2/index.docbook
 share/help/C/gmdb2/legal.xml
+share/man/man1/gmdb2.1.gz
diff --git a/databases/gnats4/Makefile b/databases/gnats4/Makefile
index 207098da4a06..19836f195a62 100644
--- a/databases/gnats4/Makefile
+++ b/databases/gnats4/Makefile
@@ -1,29 +1,27 @@
-# Created by: Oliver Eikemeier <eikemeier@fillmore-labs.com>
-
 PORTNAME=	gnats
 PORTVERSION=	4.1.0
-PORTREVISION=	15
+PORTREVISION=	22
 CATEGORIES=	databases devel
 MASTER_SITES=	GNU
 PKGNAMESUFFIX=	4
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	GNATS, the GNU Problem Report Management System
+WWW=		https://www.gnu.org/software/gnats/
+
+LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/COPYING
 
 BROKEN_mips=		Does not build: error: conflicting types for yy_scan_string
 BROKEN_mips64=		Does not build: error: conflicting types for yy_scan_string
-BROKEN_FreeBSD_11_powerpc64=	fails to build on powerpc64 elfv1: conflicting types for yy_scan_string
-BROKEN_FreeBSD_12_powerpc64=	fails to build on powerpc64 elfv1: conflicting types for yy_scan_string
-
-GNU_CONFIGURE=	yes
-USES=		cpe gmake makeinfo
-USE_GCC=	yes
-USERS=		gnats
 
+USES=		cpe gettext-runtime gmake
 CPE_VENDOR=	gnu
+USE_GCC=	yes
 
-PKGMESSAGE=	${WRKDIR}/pkg-message
-PKGINSTALL=	${WRKDIR}/pkg-install
+GNU_CONFIGURE=	yes
+GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
+CONFIGURE_ARGS+=	--sharedstatedir=${GNATSDBDIR}
 
 .ifdef WANT_FREEFALL_CFG
 EXTRA_PATCHES+=		${PATCHDIR}/extrapatch-*
@@ -34,10 +32,6 @@ WITH_ORGANIZATION=	FreeBSD
 WITH_GNATSD_SERVICE=	support
 .endif
 
-GNATSDBDIR?=		/var/db/gnats
-
-CONFIGURE_ARGS+=	--sharedstatedir=${GNATSDBDIR}
-
 .ifdef WITH_SUBMITTER_ID
 CONFIGURE_ARGS+=	--with-submitter=${WITH_SUBMITTER_ID}
 .endif
@@ -50,30 +44,31 @@ CONFIGURE_ARGS+=	--with-organization=${WITH_ORGANIZATION:Q}
 CONFIGURE_ARGS+=	--with-gnats-service=${WITH_GNATSD_SERVICE}
 .endif
 
-PLIST_SUB=	GNATSDBDIR=${GNATSDBDIR}
+USERS=		gnats
+
+PKGINSTALL=	${WRKDIR}/pkg-install
+PKGMESSAGE=	${WRKDIR}/pkg-message
 INFO=		gnats-faq gnats
+PLIST_SUB=	GNATSDBDIR=${GNATSDBDIR}
 PORTDOCS=	NEWS UPGRADING
 
 OPTIONS_DEFINE=	DOCS EMACS SERVER
 OPTIONS_DEFAULT=SERVER
 OPTIONS_SUB=	yes
-EMACS_USES=	emacs
+
 EMACS_DESC=	Install Emacs Lisp support file
-EMACS_VARS=	EMACS_NO_DEPENDS=yes
 SERVER_DESC=	Install the gnats server too
 
-.include <bsd.port.options.mk>
+EMACS_USES=	emacs
+EMACS_CONFIGURE_ON=--with-lispdir=${LOCALBASE}/${EMACS_SITE_LISPDIR}
+EMACS_PLIST_SUB_OFF=	EMACS_SITE_LISPDIR="@comment "
+EMACS_VARS=	EMACS_NO_DEPENDS=yes
+SERVER_ALL_TARGET_OFF=	all-tools
+SERVER_INSTALL_TARGET_OFF=	install-tools
 
-.if ! ${PORT_OPTIONS:MSERVER}
-ALL_TARGET=	all-tools
-INSTALL_TARGET=	install-tools
-.endif
+GNATSDBDIR?=		/var/db/gnats
 
-.if ${PORT_OPTIONS:MEMACS}
-CONFIGURE_ARGS+=--with-lispdir=${LOCALBASE}/${EMACS_SITE_LISPDIR}
-.else
-PLIST_SUB+=	EMACS_SITE_LISPDIR="@comment "
-.endif
+.include <bsd.port.options.mk>
 
 pre-everything::
 .if !defined(PACKAGE_BUILDING) && !defined(WANT_FREEFALL_CFG)
@@ -89,6 +84,9 @@ pre-everything::
 	@${ECHO}
 .endif
 
+post-patch:
+	@${REINPLACE_CMD} -e 's|info man|man|g' ${WRKSRC}/doc/Makefile.in
+
 pre-configure:
 	@${ECHO_CMD} 'RELEASE_TAG="\`uname -srm\`"' > ${WRKSRC}/release-info
 
@@ -102,13 +100,13 @@ post-build:
 pre-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/libexec/gnats
 
-post-install:
-.if ${PORT_OPTIONS:MSERVER}
+post-install-SERVER-on:
 	${MV} ${STAGEDIR}${ETCDIR}/databases.default \
 		${STAGEDIR}${ETCDIR}/databases.sample
 	${MV} ${STAGEDIR}${ETCDIR}/gnatsd.host_access.default \
 		${STAGEDIR}${ETCDIR}/gnatsd.host_access.sample
-.endif
+
+post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	(cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR})
 
diff --git a/databases/gnats4/pkg-descr b/databases/gnats4/pkg-descr
index 931d51fe754d..ae86149405b3 100644
--- a/databases/gnats4/pkg-descr
+++ b/databases/gnats4/pkg-descr
@@ -4,5 +4,3 @@ with users through various means, including e-mail, Web and a network
 daemon.  GNATS stores all the information about problem reports in its
 databases, consisting of plain text files and it provides tools for
 querying, editing and maintaining these databases.
-
-WWW: http://www.gnu.org/software/gnats/
diff --git a/databases/gnats4/pkg-plist b/databases/gnats4/pkg-plist
index abb3a12ee2fc..2f5cb3b6325c 100644
--- a/databases/gnats4/pkg-plist
+++ b/databases/gnats4/pkg-plist
@@ -30,23 +30,23 @@ libexec/gnats/pr-age
 libexec/gnats/pr-edit
 %%SERVER%%libexec/gnats/queue-pr
 %%SERVER%%libexec/gnats/rmcat
-man/man1/edit-pr.1.gz
-man/man1/query-pr.1.gz
-man/man1/send-pr.1.gz
-man/man5/databases.5.gz
-man/man5/dbconfig.5.gz
-man/man7/gnats.7.gz
-man/man8/delete-pr.8.gz
-man/man8/getclose.8.gz
-man/man8/file-pr.8.gz
-man/man8/gen-index.8.gz
-man/man8/gnatsd.8.gz
-man/man8/install-sid.8.gz
-man/man8/mkcat.8.gz
-man/man8/mkdb.8.gz
-man/man8/pr-edit.8.gz
-man/man8/queue-pr.8.gz
-man/man8/rmcat.8.gz
+share/man/man1/edit-pr.1.gz
+share/man/man1/query-pr.1.gz
+share/man/man1/send-pr.1.gz
+share/man/man5/databases.5.gz
+share/man/man5/dbconfig.5.gz
+share/man/man7/gnats.7.gz
+share/man/man8/delete-pr.8.gz
+share/man/man8/getclose.8.gz
+share/man/man8/file-pr.8.gz
+share/man/man8/gen-index.8.gz
+share/man/man8/gnatsd.8.gz
+share/man/man8/install-sid.8.gz
+share/man/man8/mkcat.8.gz
+share/man/man8/mkdb.8.gz
+share/man/man8/pr-edit.8.gz
+share/man/man8/queue-pr.8.gz
+share/man/man8/rmcat.8.gz
 %%EMACS_SITE_LISPDIR%%/gnats.el
 @dir(gnats,,) %%GNATSDBDIR%%/gnats
 @dir %%GNATSDBDIR%%
diff --git a/databases/gnatsweb4/Makefile b/databases/gnatsweb4/Makefile
index 8cb4e562c9a8..ff476e0dc4c0 100644
--- a/databases/gnatsweb4/Makefile
+++ b/databases/gnatsweb4/Makefile
@@ -1,5 +1,3 @@
-# Created by: Oliver Eikemeier <eikemeier@fillmore-labs.com>
-
 PORTNAME=	gnatsweb
 PORTVERSION=	4.00
 PORTREVISION=	7
@@ -8,11 +6,12 @@ MASTER_SITES=	GNU
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Gnatsweb, a GNATS web interface
+WWW=		https://www.gnu.org/software/gnats/
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-USES=		apache:run,2.2+ perl5 shebangfix
+USES=		apache:run perl5 shebangfix
 SHEBANG_FILES=	gnatsweb.pl
 USE_PERL5=	run
 NO_BUILD=	yes
diff --git a/databases/gnatsweb4/pkg-descr b/databases/gnatsweb4/pkg-descr
index 9b78ac0b33ff..ade5af5334ad 100644
--- a/databases/gnatsweb4/pkg-descr
+++ b/databases/gnatsweb4/pkg-descr
@@ -1,5 +1,3 @@
 Gnatsweb is a web interface to GNATS, the GNU Problem Report
 Management System.  It is a Perl CGI script which runs on your
 web server.
-
-WWW: http://www.gnu.org/software/gnats/
diff --git a/databases/go-carbon/Makefile b/databases/go-carbon/Makefile
index c8a358707c7b..f742b24c1e0e 100644
--- a/databases/go-carbon/Makefile
+++ b/databases/go-carbon/Makefile
@@ -1,11 +1,12 @@
 PORTNAME=		go-carbon
 DISTVERSIONPREFIX=	v
 DISTVERSION=		0.12.0
-PORTREVISION=		2
+PORTREVISION=	19
 CATEGORIES=		databases
 
 MAINTAINER=		a.andersson.thn@gmail.com
 COMMENT=		Go implementation of carbon
+WWW=		https://github.com/lomik/go-carbon
 
 LICENSE=		MIT
 LICENSE_FILE=		${WRKSRC}/LICENSE.md
diff --git a/databases/go-carbon/pkg-descr b/databases/go-carbon/pkg-descr
index 09a40112866f..c5639a6834d1 100644
--- a/databases/go-carbon/pkg-descr
+++ b/databases/go-carbon/pkg-descr
@@ -1,4 +1,2 @@
 go-carbon is a go implementation of the carbon component of the graphite
 project. It has support for multiple cpu's and can achieve higher concurrency.
-
-WWW: https://github.com/lomik/go-carbon
diff --git a/databases/go-pgweb/Makefile b/databases/go-pgweb/Makefile
index b8113f84e8a0..bdcb5f39c44f 100644
--- a/databases/go-pgweb/Makefile
+++ b/databases/go-pgweb/Makefile
@@ -1,18 +1,31 @@
 PORTNAME=	pgweb
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.11.7
+PORTREVISION=	19
 CATEGORIES=	databases www
 PKGNAMEPREFIX=	go-
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	daniel@morante.net
 COMMENT=	Web-based database browser for PostgreSQL
+WWW=		https://github.com/sosedoff/pgweb
 
 LICENSE=	MIT
 
 USES=		go
 USE_GITHUB=	yes
 GH_ACCOUNT=	sosedoff
+USE_RC_SUBR=	${PORTNAME}
+
 GO_PKGNAME=	github.com/sosedoff/pgweb
+
+SUB_FILES+=	pkg-message
+SUB_LIST+=	PGWEBGROUP=${GROUPS} \
+		PGWEBUSER=${USERS} \
+		PORTNAME=${PORTNAME}
+
 PLIST_FILES=	bin/pgweb
 
+USERS=		www
+GROUPS=		www
+
 .include <bsd.port.mk>
diff --git a/databases/go-pgweb/files/pgweb.in b/databases/go-pgweb/files/pgweb.in
new file mode 100644
index 000000000000..e945d0de9c26
--- /dev/null
+++ b/databases/go-pgweb/files/pgweb.in
@@ -0,0 +1,50 @@
+#!/bin/sh
+#
+#
+# PROVIDE: %%PORTNAME%%
+# REQUIRE: NETWORKING
+# KEYWORD:
+#
+# Add the following lines to /etc/rc.conf to enable %%PORTNAME%%:
+# %%PORTNAME%%_enable="YES"
+#
+# %%PORTNAME%%_enable (bool):		Set to YES to enable %%PORTNAME%%
+#					Default: NO
+# %%PORTNAME%%_bind (str):		HTTP server host
+#					Default: localhost
+# %%PORTNAME%%_listen (str):	HTTP server listen port
+#					Default: 8081
+# %%PORTNAME%%_user (str):		%%PORTNAME%% daemon user
+#					Default: %%PGWEBUSER%%
+# %%PORTNAME%%_group (str):		%%PORTNAME%% daemon group
+#					Default: %%PGWEBGROUP%%
+
+. /etc/rc.subr
+
+name="%%PORTNAME%%"
+rcvar="%%PORTNAME%%_enable"
+load_rc_config $name
+
+: ${%%PORTNAME%%_user:="www"}
+: ${%%PORTNAME%%_group:="www"}
+: ${%%PORTNAME%%_enable:="NO"}
+: ${%%PORTNAME%%_bind:="localhost"}
+: ${%%PORTNAME%%_flags=""}
+: ${%%PORTNAME%%_facility:="daemon"}
+: ${%%PORTNAME%%_priority:="debug"}
+: ${%%PORTNAME%%_listen:="8081"}
+
+procname="%%PREFIX%%/bin/${name}"
+pidfile="/var/run/${name}.pid"
+start_precmd="${name}_precmd"
+command=/usr/sbin/daemon
+command_args="-S -l ${%%PORTNAME%%_facility} -s ${%%PORTNAME%%_priority} -T ${name} -t ${name} -p ${pidfile} \
+	${procname} --bind=${%%PORTNAME%%_bind} --listen=${%%PORTNAME%%_listen} ${%%PORTNAME%%_flags}"
+
+%%PORTNAME%%_precmd()
+{
+	install -o ${%%PORTNAME%%_user} /dev/null ${pidfile}
+}
+
+run_rc_command "$1"
+
diff --git a/databases/go-pgweb/files/pkg-message.in b/databases/go-pgweb/files/pkg-message.in
new file mode 100644
index 000000000000..c391e85d3cd2
--- /dev/null
+++ b/databases/go-pgweb/files/pkg-message.in
@@ -0,0 +1,22 @@
+[
+{ type: install
+  message: <<EOM
+
+To run Pgweb at startup, enable it in your /etc/rc.conf:
+sysrc pgweb_enable="YES"
+
+To start Pgweb:
+service pgweb start
+
+Pgweb will listen on port 8081 and bind to localhost.  
+This can be changed by setting "pgweb_bind" and "pgweb_listen" 
+in /etc/rc.conf.
+
+sysrc pgweb_bind="0.0.0.0" pgweb_listen="80"
+
+Additional options can be set using "pgweb_flags". See 'pgweb --help' for a list
+of all options.
+
+EOM
+}
+]
diff --git a/databases/go-pgweb/pkg-descr b/databases/go-pgweb/pkg-descr
index 0ae72d7fd038..161708ba8d58 100644
--- a/databases/go-pgweb/pkg-descr
+++ b/databases/go-pgweb/pkg-descr
@@ -4,5 +4,3 @@ development is to utilize ability of the compiler to produce zero-dependency
 binaries for multiple platforms. Pgweb was created as an attempt to build very
 simple and portable application to work with local or remote PostgreSQL
 databases.
-
-WWW: https://github.com/sosedoff/pgweb
diff --git a/databases/gobang/Makefile b/databases/gobang/Makefile
new file mode 100644
index 000000000000..663ae2e2dc8c
--- /dev/null
+++ b/databases/gobang/Makefile
@@ -0,0 +1,215 @@
+PORTNAME=	gobang
+DISTVERSIONPREFIX=	v
+DISTVERSION=	0.1.0-alpha.5
+PORTREVISION=	13
+CATEGORIES=	databases
+
+MAINTAINER=	yuri@FreeBSD.org
+COMMENT=	Cross-platform TUI database management tool written in Rust
+WWW=		https://github.com/tako8ki/gobang
+
+LICENSE=	MIT
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
+BROKEN_powerpc64le=	compilation failure: called `Option::unwrap()` on a `None` value in ring-0.16.20/build.rs: # see https://github.com/TaKO8Ki/gobang/issues/180
+
+USES=		cargo
+USE_GITHUB=	yes
+GH_ACCOUNT=	tako8ki
+
+CARGO_CRATES=	ahash-0.7.4 \
+		aho-corasick-0.7.18 \
+		ansi_term-0.11.0 \
+		anyhow-1.0.41 \
+		arrayvec-0.5.2 \
+		async-trait-0.1.50 \
+		atoi-0.4.0 \
+		atty-0.2.14 \
+		autocfg-0.1.7 \
+		autocfg-1.0.1 \
+		base64-0.13.0 \
+		bitflags-1.2.1 \
+		bitvec-0.19.5 \
+		block-buffer-0.9.0 \
+		bumpalo-3.7.0 \
+		byteorder-1.4.3 \
+		bytes-1.1.0 \
+		cassowary-0.3.0 \
+		cc-1.0.68 \
+		cfg-if-1.0.0 \
+		chrono-0.4.19 \
+		clap-2.33.3 \
+		cpufeatures-0.1.5 \
+		crossbeam-channel-0.5.1 \
+		crossbeam-queue-0.3.2 \
+		crossbeam-utils-0.8.5 \
+		crossterm-0.19.0 \
+		crossterm-0.20.0 \
+		crossterm_winapi-0.7.0 \
+		crossterm_winapi-0.8.0 \
+		crypto-mac-0.10.1 \
+		digest-0.9.0 \
+		dirs-3.0.2 \
+		dirs-next-2.0.0 \
+		dirs-sys-0.3.6 \
+		dirs-sys-next-0.1.2 \
+		dotenv-0.15.0 \
+		easy-cast-0.4.4 \
+		either-1.6.1 \
+		form_urlencoded-1.0.1 \
+		funty-1.1.0 \
+		futures-0.3.15 \
+		futures-channel-0.3.15 \
+		futures-core-0.3.15 \
+		futures-executor-0.3.15 \
+		futures-intrusive-0.4.0 \
+		futures-io-0.3.15 \
+		futures-macro-0.3.15 \
+		futures-sink-0.3.15 \
+		futures-task-0.3.15 \
+		futures-util-0.3.15 \
+		generic-array-0.14.4 \
+		getrandom-0.2.3 \
+		hashbrown-0.11.2 \
+		hashlink-0.7.0 \
+		heck-0.3.3 \
+		hermit-abi-0.1.18 \
+		hex-0.4.3 \
+		hmac-0.10.1 \
+		idna-0.2.3 \
+		indexmap-1.7.0 \
+		instant-0.1.9 \
+		itertools-0.10.1 \
+		itoa-0.4.7 \
+		js-sys-0.3.51 \
+		lazy_static-1.4.0 \
+		lexical-core-0.7.6 \
+		libc-0.2.97 \
+		libm-0.2.1 \
+		libsqlite3-sys-0.22.2 \
+		lock_api-0.4.4 \
+		log-0.4.14 \
+		maplit-1.0.2 \
+		matches-0.1.8 \
+		md-5-0.9.1 \
+		memchr-2.4.0 \
+		mio-0.7.13 \
+		miow-0.3.7 \
+		nom-6.1.2 \
+		ntapi-0.3.6 \
+		num-bigint-0.3.2 \
+		num-bigint-0.4.2 \
+		num-bigint-dig-0.7.0 \
+		num-integer-0.1.44 \
+		num-iter-0.1.42 \
+		num-traits-0.2.14 \
+		num_cpus-1.13.0 \
+		once_cell-1.8.0 \
+		opaque-debug-0.3.0 \
+		parking_lot-0.11.1 \
+		parking_lot_core-0.8.3 \
+		pem-0.8.3 \
+		percent-encoding-2.1.0 \
+		pin-project-lite-0.2.6 \
+		pin-utils-0.1.0 \
+		pkg-config-0.3.19 \
+		ppv-lite86-0.2.10 \
+		proc-macro-error-1.0.4 \
+		proc-macro-error-attr-1.0.4 \
+		proc-macro-hack-0.5.19 \
+		proc-macro-nested-0.1.7 \
+		proc-macro2-1.0.27 \
+		quote-1.0.9 \
+		radium-0.5.3 \
+		rand-0.8.4 \
+		rand_chacha-0.3.1 \
+		rand_core-0.6.3 \
+		rand_hc-0.3.1 \
+		redox_syscall-0.2.9 \
+		redox_users-0.4.0 \
+		regex-1.5.4 \
+		regex-syntax-0.6.25 \
+		ring-0.16.20 \
+		rsa-0.4.1 \
+		rust_decimal-1.15.0 \
+		rustls-0.19.1 \
+		ryu-1.0.5 \
+		scopeguard-1.1.0 \
+		sct-0.6.1 \
+		serde-1.0.126 \
+		serde_derive-1.0.126 \
+		serde_json-1.0.64 \
+		sha-1-0.9.6 \
+		sha2-0.9.5 \
+		signal-hook-0.1.17 \
+		signal-hook-0.3.10 \
+		signal-hook-mio-0.2.1 \
+		signal-hook-registry-1.4.0 \
+		simple_asn1-0.5.4 \
+		slab-0.4.3 \
+		smallvec-1.6.1 \
+		spin-0.5.2 \
+		sqlformat-0.1.6 \
+		sqlx-0.5.7 \
+		sqlx-core-0.5.7 \
+		sqlx-macros-0.5.7 \
+		sqlx-rt-0.5.7 \
+		static_assertions-1.1.0 \
+		stringprep-0.1.2 \
+		strsim-0.8.0 \
+		structopt-0.3.22 \
+		structopt-derive-0.4.15 \
+		strum-0.21.0 \
+		strum_macros-0.21.1 \
+		subtle-2.4.0 \
+		syn-1.0.73 \
+		synstructure-0.12.4 \
+		tap-1.0.1 \
+		textwrap-0.11.0 \
+		thiserror-1.0.25 \
+		thiserror-impl-1.0.25 \
+		time-0.1.43 \
+		tinyvec-1.2.0 \
+		tinyvec_macros-0.1.0 \
+		tokio-1.11.0 \
+		tokio-macros-1.3.0 \
+		tokio-rustls-0.22.0 \
+		tokio-stream-0.1.7 \
+		toml-0.4.10 \
+		tui-0.15.0 \
+		typenum-1.13.0 \
+		unicode-bidi-0.3.5 \
+		unicode-normalization-0.1.19 \
+		unicode-segmentation-1.7.1 \
+		unicode-width-0.1.8 \
+		unicode-xid-0.2.2 \
+		unicode_categories-0.1.1 \
+		untrusted-0.7.1 \
+		url-2.2.2 \
+		vcpkg-0.2.15 \
+		vec_map-0.8.2 \
+		version_check-0.9.3 \
+		wasi-0.10.2+wasi-snapshot-preview1 \
+		wasm-bindgen-0.2.74 \
+		wasm-bindgen-backend-0.2.74 \
+		wasm-bindgen-macro-0.2.74 \
+		wasm-bindgen-macro-support-0.2.74 \
+		wasm-bindgen-shared-0.2.74 \
+		web-sys-0.3.51 \
+		webpki-0.21.4 \
+		webpki-roots-0.21.1 \
+		which-4.2.2 \
+		whoami-1.1.2 \
+		winapi-0.3.9 \
+		winapi-i686-pc-windows-gnu-0.4.0 \
+		winapi-x86_64-pc-windows-gnu-0.4.0 \
+		wyz-0.2.0 \
+		zeroize-1.3.0 \
+		zeroize_derive-1.1.0
+
+PLIST_FILES=	bin/${PORTNAME}
+
+post-install:
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
+
+.include <bsd.port.mk>
diff --git a/databases/gobang/distinfo b/databases/gobang/distinfo
new file mode 100644
index 000000000000..348a2d899bfe
--- /dev/null
+++ b/databases/gobang/distinfo
@@ -0,0 +1,381 @@
+TIMESTAMP = 1672651552
+SHA256 (rust/crates/ahash-0.7.4.crate) = 43bb833f0bf979d8475d38fbf09ed3b8a55e1885fe93ad3f93239fc6a4f17b98
+SIZE (rust/crates/ahash-0.7.4.crate) = 37072
+SHA256 (rust/crates/aho-corasick-0.7.18.crate) = 1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f
+SIZE (rust/crates/aho-corasick-0.7.18.crate) = 112923
+SHA256 (rust/crates/ansi_term-0.11.0.crate) = ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b
+SIZE (rust/crates/ansi_term-0.11.0.crate) = 17087
+SHA256 (rust/crates/anyhow-1.0.41.crate) = 15af2628f6890fe2609a3b91bef4c83450512802e59489f9c1cb1fa5df064a61
+SIZE (rust/crates/anyhow-1.0.41.crate) = 34561
+SHA256 (rust/crates/arrayvec-0.5.2.crate) = 23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b
+SIZE (rust/crates/arrayvec-0.5.2.crate) = 27838
+SHA256 (rust/crates/async-trait-0.1.50.crate) = 0b98e84bbb4cbcdd97da190ba0c58a1bb0de2c1fdf67d159e192ed766aeca722
+SIZE (rust/crates/async-trait-0.1.50.crate) = 25321
+SHA256 (rust/crates/atoi-0.4.0.crate) = 616896e05fc0e2649463a93a15183c6a16bf03413a7af88ef1285ddedfa9cda5
+SIZE (rust/crates/atoi-0.4.0.crate) = 7106
+SHA256 (rust/crates/atty-0.2.14.crate) = d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8
+SIZE (rust/crates/atty-0.2.14.crate) = 5470
+SHA256 (rust/crates/autocfg-0.1.7.crate) = 1d49d90015b3c36167a20fe2810c5cd875ad504b39cff3d4eae7977e6b7c1cb2
+SIZE (rust/crates/autocfg-0.1.7.crate) = 12158
+SHA256 (rust/crates/autocfg-1.0.1.crate) = cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a
+SIZE (rust/crates/autocfg-1.0.1.crate) = 12908
+SHA256 (rust/crates/base64-0.13.0.crate) = 904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd
+SIZE (rust/crates/base64-0.13.0.crate) = 62070
+SHA256 (rust/crates/bitflags-1.2.1.crate) = cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693
+SIZE (rust/crates/bitflags-1.2.1.crate) = 16745
+SHA256 (rust/crates/bitvec-0.19.5.crate) = 8942c8d352ae1838c9dda0b0ca2ab657696ef2232a20147cf1b30ae1a9cb4321
+SIZE (rust/crates/bitvec-0.19.5.crate) = 148200
+SHA256 (rust/crates/block-buffer-0.9.0.crate) = 4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4
+SIZE (rust/crates/block-buffer-0.9.0.crate) = 7108
+SHA256 (rust/crates/bumpalo-3.7.0.crate) = 9c59e7af012c713f529e7a3ee57ce9b31ddd858d4b512923602f74608b009631
+SIZE (rust/crates/bumpalo-3.7.0.crate) = 134261
+SHA256 (rust/crates/byteorder-1.4.3.crate) = 14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610
+SIZE (rust/crates/byteorder-1.4.3.crate) = 22512
+SHA256 (rust/crates/bytes-1.1.0.crate) = c4872d67bab6358e59559027aa3b9157c53d9358c51423c17554809a8858e0f8
+SIZE (rust/crates/bytes-1.1.0.crate) = 49640
+SHA256 (rust/crates/cassowary-0.3.0.crate) = df8670b8c7b9dae1793364eafadf7239c40d669904660c5960d74cfd80b46a53
+SIZE (rust/crates/cassowary-0.3.0.crate) = 22876
+SHA256 (rust/crates/cc-1.0.68.crate) = 4a72c244c1ff497a746a7e1fb3d14bd08420ecda70c8f25c7112f2781652d787
+SIZE (rust/crates/cc-1.0.68.crate) = 55936
+SHA256 (rust/crates/cfg-if-1.0.0.crate) = baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd
+SIZE (rust/crates/cfg-if-1.0.0.crate) = 7934
+SHA256 (rust/crates/chrono-0.4.19.crate) = 670ad68c9088c2a963aaa298cb369688cf3f9465ce5e2d4ca10e6e0098a1ce73
+SIZE (rust/crates/chrono-0.4.19.crate) = 155663
+SHA256 (rust/crates/clap-2.33.3.crate) = 37e58ac78573c40708d45522f0d80fa2f01cc4f9b4e2bf749807255454312002
+SIZE (rust/crates/clap-2.33.3.crate) = 201925
+SHA256 (rust/crates/cpufeatures-0.1.5.crate) = 66c99696f6c9dd7f35d486b9d04d7e6e202aa3e8c40d553f2fdf5e7e0c6a71ef
+SIZE (rust/crates/cpufeatures-0.1.5.crate) = 10419
+SHA256 (rust/crates/crossbeam-channel-0.5.1.crate) = 06ed27e177f16d65f0f0c22a213e17c696ace5dd64b14258b52f9417ccb52db4
+SIZE (rust/crates/crossbeam-channel-0.5.1.crate) = 86919
+SHA256 (rust/crates/crossbeam-queue-0.3.2.crate) = 9b10ddc024425c88c2ad148c1b0fd53f4c6d38db9697c9f1588381212fa657c9
+SIZE (rust/crates/crossbeam-queue-0.3.2.crate) = 14993
+SHA256 (rust/crates/crossbeam-utils-0.8.5.crate) = d82cfc11ce7f2c3faef78d8a684447b40d503d9681acebed6cb728d45940c4db
+SIZE (rust/crates/crossbeam-utils-0.8.5.crate) = 38414
+SHA256 (rust/crates/crossterm-0.19.0.crate) = 7c36c10130df424b2f3552fcc2ddcd9b28a27b1e54b358b45874f88d1ca6888c
+SIZE (rust/crates/crossterm-0.19.0.crate) = 104572
+SHA256 (rust/crates/crossterm-0.20.0.crate) = c0ebde6a9dd5e331cd6c6f48253254d117642c31653baa475e394657c59c1f7d
+SIZE (rust/crates/crossterm-0.20.0.crate) = 103025
+SHA256 (rust/crates/crossterm_winapi-0.7.0.crate) = 0da8964ace4d3e4a044fd027919b2237000b24315a37c916f61809f1ff2140b9
+SIZE (rust/crates/crossterm_winapi-0.7.0.crate) = 15187
+SHA256 (rust/crates/crossterm_winapi-0.8.0.crate) = 3a6966607622438301997d3dac0d2f6e9a90c68bb6bc1785ea98456ab93c0507
+SIZE (rust/crates/crossterm_winapi-0.8.0.crate) = 15531
+SHA256 (rust/crates/crypto-mac-0.10.1.crate) = bff07008ec701e8028e2ceb8f83f0e4274ee62bd2dbdc4fefff2e9a91824081a
+SIZE (rust/crates/crypto-mac-0.10.1.crate) = 9531
+SHA256 (rust/crates/digest-0.9.0.crate) = d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066
+SIZE (rust/crates/digest-0.9.0.crate) = 13247
+SHA256 (rust/crates/dirs-3.0.2.crate) = 30baa043103c9d0c2a57cf537cc2f35623889dc0d405e6c3cccfadbc81c71309
+SIZE (rust/crates/dirs-3.0.2.crate) = 12184
+SHA256 (rust/crates/dirs-next-2.0.0.crate) = b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1
+SIZE (rust/crates/dirs-next-2.0.0.crate) = 11689
+SHA256 (rust/crates/dirs-sys-0.3.6.crate) = 03d86534ed367a67548dc68113a0f5db55432fdfbb6e6f9d77704397d95d5780
+SIZE (rust/crates/dirs-sys-0.3.6.crate) = 10626
+SHA256 (rust/crates/dirs-sys-next-0.1.2.crate) = 4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d
+SIZE (rust/crates/dirs-sys-next-0.1.2.crate) = 10681
+SHA256 (rust/crates/dotenv-0.15.0.crate) = 77c90badedccf4105eca100756a0b1289e191f6fcbdadd3cee1d2f614f97da8f
+SIZE (rust/crates/dotenv-0.15.0.crate) = 11668
+SHA256 (rust/crates/easy-cast-0.4.4.crate) = 4bd102ee8c418348759919b83b81cdbdc933ffe29740b903df448b4bafaa348e
+SIZE (rust/crates/easy-cast-0.4.4.crate) = 11814
+SHA256 (rust/crates/either-1.6.1.crate) = e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457
+SIZE (rust/crates/either-1.6.1.crate) = 13641
+SHA256 (rust/crates/form_urlencoded-1.0.1.crate) = 5fc25a87fa4fd2094bffb06925852034d90a17f0d1e05197d4956d3555752191
+SIZE (rust/crates/form_urlencoded-1.0.1.crate) = 8773
+SHA256 (rust/crates/funty-1.1.0.crate) = fed34cd105917e91daa4da6b3728c47b068749d6a62c59811f06ed2ac71d9da7
+SIZE (rust/crates/funty-1.1.0.crate) = 11631
+SHA256 (rust/crates/futures-0.3.15.crate) = 0e7e43a803dae2fa37c1f6a8fe121e1f7bf9548b4dfc0522a42f34145dadfc27
+SIZE (rust/crates/futures-0.3.15.crate) = 46425
+SHA256 (rust/crates/futures-channel-0.3.15.crate) = e682a68b29a882df0545c143dc3646daefe80ba479bcdede94d5a703de2871e2
+SIZE (rust/crates/futures-channel-0.3.15.crate) = 31867
+SHA256 (rust/crates/futures-core-0.3.15.crate) = 0402f765d8a89a26043b889b26ce3c4679d268fa6bb22cd7c6aad98340e179d1
+SIZE (rust/crates/futures-core-0.3.15.crate) = 14514
+SHA256 (rust/crates/futures-executor-0.3.15.crate) = badaa6a909fac9e7236d0620a2f57f7664640c56575b71a7552fbd68deafab79
+SIZE (rust/crates/futures-executor-0.3.15.crate) = 17166
+SHA256 (rust/crates/futures-intrusive-0.4.0.crate) = 62007592ac46aa7c2b6416f7deb9a8a8f63a01e0f1d6e1787d5630170db2b63e
+SIZE (rust/crates/futures-intrusive-0.4.0.crate) = 85596
+SHA256 (rust/crates/futures-io-0.3.15.crate) = acc499defb3b348f8d8f3f66415835a9131856ff7714bf10dadfc4ec4bdb29a1
+SIZE (rust/crates/futures-io-0.3.15.crate) = 9058
+SHA256 (rust/crates/futures-macro-0.3.15.crate) = a4c40298486cdf52cc00cd6d6987892ba502c7656a16a4192a9992b1ccedd121
+SIZE (rust/crates/futures-macro-0.3.15.crate) = 10872
+SHA256 (rust/crates/futures-sink-0.3.15.crate) = a57bead0ceff0d6dde8f465ecd96c9338121bb7717d3e7b108059531870c4282
+SIZE (rust/crates/futures-sink-0.3.15.crate) = 7672
+SHA256 (rust/crates/futures-task-0.3.15.crate) = 8a16bef9fc1a4dddb5bee51c989e3fbba26569cbb0e31f5b303c184e3dd33dae
+SIZE (rust/crates/futures-task-0.3.15.crate) = 11811
+SHA256 (rust/crates/futures-util-0.3.15.crate) = feb5c238d27e2bf94ffdfd27b2c29e3df4a68c4193bb6427384259e2bf191967
+SIZE (rust/crates/futures-util-0.3.15.crate) = 141962
+SHA256 (rust/crates/generic-array-0.14.4.crate) = 501466ecc8a30d1d3b7fc9229b122b2ce8ed6e9d9223f1138d4babb253e51817
+SIZE (rust/crates/generic-array-0.14.4.crate) = 28916
+SHA256 (rust/crates/getrandom-0.2.3.crate) = 7fcd999463524c52659517fe2cea98493cfe485d10565e7b0fb07dbba7ad2753
+SIZE (rust/crates/getrandom-0.2.3.crate) = 26261
+SHA256 (rust/crates/hashbrown-0.11.2.crate) = ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e
+SIZE (rust/crates/hashbrown-0.11.2.crate) = 85713
+SHA256 (rust/crates/hashlink-0.7.0.crate) = 7249a3129cbc1ffccd74857f81464a323a152173cdb134e0fd81bc803b29facf
+SIZE (rust/crates/hashlink-0.7.0.crate) = 25309
+SHA256 (rust/crates/heck-0.3.3.crate) = 6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c
+SIZE (rust/crates/heck-0.3.3.crate) = 10260
+SHA256 (rust/crates/hermit-abi-0.1.18.crate) = 322f4de77956e22ed0e5032c359a0f1273f1f7f0d79bfa3b8ffbc730d7fbcc5c
+SIZE (rust/crates/hermit-abi-0.1.18.crate) = 9936
+SHA256 (rust/crates/hex-0.4.3.crate) = 7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70
+SIZE (rust/crates/hex-0.4.3.crate) = 13299
+SHA256 (rust/crates/hmac-0.10.1.crate) = c1441c6b1e930e2817404b5046f1f989899143a12bf92de603b69f4e0aee1e15
+SIZE (rust/crates/hmac-0.10.1.crate) = 11120
+SHA256 (rust/crates/idna-0.2.3.crate) = 418a0a6fab821475f634efe3ccc45c013f742efe03d853e8d3355d5cb850ecf8
+SIZE (rust/crates/idna-0.2.3.crate) = 271023
+SHA256 (rust/crates/indexmap-1.7.0.crate) = bc633605454125dec4b66843673f01c7df2b89479b32e0ed634e43a91cff62a5
+SIZE (rust/crates/indexmap-1.7.0.crate) = 50363
+SHA256 (rust/crates/instant-0.1.9.crate) = 61124eeebbd69b8190558df225adf7e4caafce0d743919e5d6b19652314ec5ec
+SIZE (rust/crates/instant-0.1.9.crate) = 5213
+SHA256 (rust/crates/itertools-0.10.1.crate) = 69ddb889f9d0d08a67338271fa9b62996bc788c7796a5c18cf057420aaed5eaf
+SIZE (rust/crates/itertools-0.10.1.crate) = 116219
+SHA256 (rust/crates/itoa-0.4.7.crate) = dd25036021b0de88a0aff6b850051563c6516d0bf53f8638938edbb9de732736
+SIZE (rust/crates/itoa-0.4.7.crate) = 12099
+SHA256 (rust/crates/js-sys-0.3.51.crate) = 83bdfbace3a0e81a4253f73b49e960b053e396a11012cbd49b9b74d6a2b67062
+SIZE (rust/crates/js-sys-0.3.51.crate) = 67124
+SHA256 (rust/crates/lazy_static-1.4.0.crate) = e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646
+SIZE (rust/crates/lazy_static-1.4.0.crate) = 10443
+SHA256 (rust/crates/lexical-core-0.7.6.crate) = 6607c62aa161d23d17a9072cc5da0be67cdfc89d3afb1e8d9c842bebc2525ffe
+SIZE (rust/crates/lexical-core-0.7.6.crate) = 494385
+SHA256 (rust/crates/libc-0.2.97.crate) = 12b8adadd720df158f4d70dfe7ccc6adb0472d7c55ca83445f6a5ab3e36f8fb6
+SIZE (rust/crates/libc-0.2.97.crate) = 517712
+SHA256 (rust/crates/libm-0.2.1.crate) = c7d73b3f436185384286bd8098d17ec07c9a7d2388a6599f824d8502b529702a
+SIZE (rust/crates/libm-0.2.1.crate) = 111906
+SHA256 (rust/crates/libsqlite3-sys-0.22.2.crate) = 290b64917f8b0cb885d9de0f9959fe1f775d7fa12f1da2db9001c1c8ab60f89d
+SIZE (rust/crates/libsqlite3-sys-0.22.2.crate) = 2345859
+SHA256 (rust/crates/lock_api-0.4.4.crate) = 0382880606dff6d15c9476c416d18690b72742aa7b605bb6dd6ec9030fbf07eb
+SIZE (rust/crates/lock_api-0.4.4.crate) = 20356
+SHA256 (rust/crates/log-0.4.14.crate) = 51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710
+SIZE (rust/crates/log-0.4.14.crate) = 34582
+SHA256 (rust/crates/maplit-1.0.2.crate) = 3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d
+SIZE (rust/crates/maplit-1.0.2.crate) = 8871
+SHA256 (rust/crates/matches-0.1.8.crate) = 7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08
+SIZE (rust/crates/matches-0.1.8.crate) = 2216
+SHA256 (rust/crates/md-5-0.9.1.crate) = 7b5a279bb9607f9f53c22d496eade00d138d1bdcccd07d74650387cf94942a15
+SIZE (rust/crates/md-5-0.9.1.crate) = 15494
+SHA256 (rust/crates/memchr-2.4.0.crate) = b16bd47d9e329435e309c58469fe0791c2d0d1ba96ec0954152a5ae2b04387dc
+SIZE (rust/crates/memchr-2.4.0.crate) = 63392
+SHA256 (rust/crates/mio-0.7.13.crate) = 8c2bdb6314ec10835cd3293dd268473a835c02b7b352e788be788b3c6ca6bb16
+SIZE (rust/crates/mio-0.7.13.crate) = 87027
+SHA256 (rust/crates/miow-0.3.7.crate) = b9f1c5b025cda876f66ef43a113f91ebc9f4ccef34843000e0adf6ebbab84e21
+SIZE (rust/crates/miow-0.3.7.crate) = 24563
+SHA256 (rust/crates/nom-6.1.2.crate) = e7413f999671bd4745a7b624bd370a569fb6bc574b23c83a3c5ed2e453f3d5e2
+SIZE (rust/crates/nom-6.1.2.crate) = 147539
+SHA256 (rust/crates/ntapi-0.3.6.crate) = 3f6bb902e437b6d86e03cce10a7e2af662292c5dfef23b65899ea3ac9354ad44
+SIZE (rust/crates/ntapi-0.3.6.crate) = 127221
+SHA256 (rust/crates/num-bigint-0.3.2.crate) = 7d0a3d5e207573f948a9e5376662aa743a2ea13f7c50a554d7af443a73fbfeba
+SIZE (rust/crates/num-bigint-0.3.2.crate) = 89374
+SHA256 (rust/crates/num-bigint-0.4.2.crate) = 74e768dff5fb39a41b3bcd30bb25cf989706c90d028d1ad71971987aa309d535
+SIZE (rust/crates/num-bigint-0.4.2.crate) = 92154
+SHA256 (rust/crates/num-bigint-dig-0.7.0.crate) = 4547ee5541c18742396ae2c895d0717d0f886d8823b8399cdaf7b07d63ad0480
+SIZE (rust/crates/num-bigint-dig-0.7.0.crate) = 123930
+SHA256 (rust/crates/num-integer-0.1.44.crate) = d2cc698a63b549a70bc047073d2949cce27cd1c7b0a4a862d08a8031bc2801db
+SIZE (rust/crates/num-integer-0.1.44.crate) = 22216
+SHA256 (rust/crates/num-iter-0.1.42.crate) = b2021c8337a54d21aca0d59a92577a029af9431cb59b909b03252b9c164fad59
+SIZE (rust/crates/num-iter-0.1.42.crate) = 10450
+SHA256 (rust/crates/num-traits-0.2.14.crate) = 9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290
+SIZE (rust/crates/num-traits-0.2.14.crate) = 45476
+SHA256 (rust/crates/num_cpus-1.13.0.crate) = 05499f3756671c15885fee9034446956fff3f243d6077b91e5767df161f766b3
+SIZE (rust/crates/num_cpus-1.13.0.crate) = 14704
+SHA256 (rust/crates/once_cell-1.8.0.crate) = 692fcb63b64b1758029e0a96ee63e049ce8c5948587f2f7208df04625e5f6b56
+SIZE (rust/crates/once_cell-1.8.0.crate) = 28925
+SHA256 (rust/crates/opaque-debug-0.3.0.crate) = 624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5
+SIZE (rust/crates/opaque-debug-0.3.0.crate) = 5767
+SHA256 (rust/crates/parking_lot-0.11.1.crate) = 6d7744ac029df22dca6284efe4e898991d28e3085c706c972bcd7da4a27a15eb
+SIZE (rust/crates/parking_lot-0.11.1.crate) = 39854
+SHA256 (rust/crates/parking_lot_core-0.8.3.crate) = fa7a782938e745763fe6907fc6ba86946d72f49fe7e21de074e08128a99fb018
+SIZE (rust/crates/parking_lot_core-0.8.3.crate) = 32147
+SHA256 (rust/crates/pem-0.8.3.crate) = fd56cbd21fea48d0c440b41cd69c589faacade08c992d9a54e471b79d0fd13eb
+SIZE (rust/crates/pem-0.8.3.crate) = 9395
+SHA256 (rust/crates/percent-encoding-2.1.0.crate) = d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e
+SIZE (rust/crates/percent-encoding-2.1.0.crate) = 9748
+SHA256 (rust/crates/pin-project-lite-0.2.6.crate) = dc0e1f259c92177c30a4c9d177246edd0a3568b25756a977d0632cf8fa37e905
+SIZE (rust/crates/pin-project-lite-0.2.6.crate) = 25494
+SHA256 (rust/crates/pin-utils-0.1.0.crate) = 8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184
+SIZE (rust/crates/pin-utils-0.1.0.crate) = 7580
+SHA256 (rust/crates/pkg-config-0.3.19.crate) = 3831453b3449ceb48b6d9c7ad7c96d5ea673e9b470a1dc578c2ce6521230884c
+SIZE (rust/crates/pkg-config-0.3.19.crate) = 15451
+SHA256 (rust/crates/ppv-lite86-0.2.10.crate) = ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857
+SIZE (rust/crates/ppv-lite86-0.2.10.crate) = 20915
+SHA256 (rust/crates/proc-macro-error-1.0.4.crate) = da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c
+SIZE (rust/crates/proc-macro-error-1.0.4.crate) = 25293
+SHA256 (rust/crates/proc-macro-error-attr-1.0.4.crate) = a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869
+SIZE (rust/crates/proc-macro-error-attr-1.0.4.crate) = 7971
+SHA256 (rust/crates/proc-macro-hack-0.5.19.crate) = dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5
+SIZE (rust/crates/proc-macro-hack-0.5.19.crate) = 15556
+SHA256 (rust/crates/proc-macro-nested-0.1.7.crate) = bc881b2c22681370c6a780e47af9840ef841837bc98118431d4e1868bd0c1086
+SIZE (rust/crates/proc-macro-nested-0.1.7.crate) = 6495
+SHA256 (rust/crates/proc-macro2-1.0.27.crate) = f0d8caf72986c1a598726adc988bb5984792ef84f5ee5aa50209145ee8077038
+SIZE (rust/crates/proc-macro2-1.0.27.crate) = 38625
+SHA256 (rust/crates/quote-1.0.9.crate) = c3d0b9745dc2debf507c8422de05d7226cc1f0644216dfdfead988f9b1ab32a7
+SIZE (rust/crates/quote-1.0.9.crate) = 25042
+SHA256 (rust/crates/radium-0.5.3.crate) = 941ba9d78d8e2f7ce474c015eea4d9c6d25b6a3327f9832ee29a4de27f91bbb8
+SIZE (rust/crates/radium-0.5.3.crate) = 7588
+SHA256 (rust/crates/rand-0.8.4.crate) = 2e7573632e6454cf6b99d7aac4ccca54be06da05aca2ef7423d22d27d4d4bcd8
+SIZE (rust/crates/rand-0.8.4.crate) = 87406
+SHA256 (rust/crates/rand_chacha-0.3.1.crate) = e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88
+SIZE (rust/crates/rand_chacha-0.3.1.crate) = 15251
+SHA256 (rust/crates/rand_core-0.6.3.crate) = d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7
+SIZE (rust/crates/rand_core-0.6.3.crate) = 21938
+SHA256 (rust/crates/rand_hc-0.3.1.crate) = d51e9f596de227fda2ea6c84607f5558e196eeaf43c986b724ba4fb8fdf497e7
+SIZE (rust/crates/rand_hc-0.3.1.crate) = 11891
+SHA256 (rust/crates/redox_syscall-0.2.9.crate) = 5ab49abadf3f9e1c4bc499e8845e152ad87d2ad2d30371841171169e9d75feee
+SIZE (rust/crates/redox_syscall-0.2.9.crate) = 23533
+SHA256 (rust/crates/redox_users-0.4.0.crate) = 528532f3d801c87aec9def2add9ca802fe569e44a544afe633765267840abe64
+SIZE (rust/crates/redox_users-0.4.0.crate) = 13023
+SHA256 (rust/crates/regex-1.5.4.crate) = d07a8629359eb56f1e2fb1652bb04212c072a87ba68546a04065d525673ac461
+SIZE (rust/crates/regex-1.5.4.crate) = 236581
+SHA256 (rust/crates/regex-syntax-0.6.25.crate) = f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b
+SIZE (rust/crates/regex-syntax-0.6.25.crate) = 293293
+SHA256 (rust/crates/ring-0.16.20.crate) = 3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc
+SIZE (rust/crates/ring-0.16.20.crate) = 5082615
+SHA256 (rust/crates/rsa-0.4.1.crate) = 7b0aeddcca1082112a6eeb43bf25fd7820b066aaf6eaef776e19d0a1febe38fe
+SIZE (rust/crates/rsa-0.4.1.crate) = 45830
+SHA256 (rust/crates/rust_decimal-1.15.0.crate) = c5446d1cf2dfe2d6367c8b27f2082bdf011e60e76fa1fcd140047f535156d6e7
+SIZE (rust/crates/rust_decimal-1.15.0.crate) = 97295
+SHA256 (rust/crates/rustls-0.19.1.crate) = 35edb675feee39aec9c99fa5ff985081995a06d594114ae14cbe797ad7b7a6d7
+SIZE (rust/crates/rustls-0.19.1.crate) = 208143
+SHA256 (rust/crates/ryu-1.0.5.crate) = 71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e
+SIZE (rust/crates/ryu-1.0.5.crate) = 49570
+SHA256 (rust/crates/scopeguard-1.1.0.crate) = d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd
+SIZE (rust/crates/scopeguard-1.1.0.crate) = 11470
+SHA256 (rust/crates/sct-0.6.1.crate) = b362b83898e0e69f38515b82ee15aa80636befe47c3b6d3d89a911e78fc228ce
+SIZE (rust/crates/sct-0.6.1.crate) = 26825
+SHA256 (rust/crates/serde-1.0.126.crate) = ec7505abeacaec74ae4778d9d9328fe5a5d04253220a85c4ee022239fc996d03
+SIZE (rust/crates/serde-1.0.126.crate) = 75138
+SHA256 (rust/crates/serde_derive-1.0.126.crate) = 963a7dbc9895aeac7ac90e74f34a5d5261828f79df35cbed41e10189d3804d43
+SIZE (rust/crates/serde_derive-1.0.126.crate) = 54189
+SHA256 (rust/crates/serde_json-1.0.64.crate) = 799e97dc9fdae36a5c8b8f2cae9ce2ee9fdce2058c57a93e6099d919fd982f79
+SIZE (rust/crates/serde_json-1.0.64.crate) = 115138
+SHA256 (rust/crates/sha-1-0.9.6.crate) = 8c4cfa741c5832d0ef7fab46cabed29c2aae926db0b11bb2069edd8db5e64e16
+SIZE (rust/crates/sha-1-0.9.6.crate) = 13758
+SHA256 (rust/crates/sha2-0.9.5.crate) = b362ae5752fd2137731f9fa25fd4d9058af34666ca1966fb969119cc35719f12
+SIZE (rust/crates/sha2-0.9.5.crate) = 19912
+SHA256 (rust/crates/signal-hook-0.1.17.crate) = 7e31d442c16f047a671b5a71e2161d6e68814012b7f5379d269ebd915fac2729
+SIZE (rust/crates/signal-hook-0.1.17.crate) = 27085
+SHA256 (rust/crates/signal-hook-0.3.10.crate) = 9c98891d737e271a2954825ef19e46bd16bdb98e2746f2eec4f7a4ef7946efd1
+SIZE (rust/crates/signal-hook-0.3.10.crate) = 48491
+SHA256 (rust/crates/signal-hook-mio-0.2.1.crate) = 29fd5867f1c4f2c5be079aee7a2adf1152ebb04a4bc4d341f504b7dece607ed4
+SIZE (rust/crates/signal-hook-mio-0.2.1.crate) = 8893
+SHA256 (rust/crates/signal-hook-registry-1.4.0.crate) = e51e73328dc4ac0c7ccbda3a494dfa03df1de2f46018127f60c693f2648455b0
+SIZE (rust/crates/signal-hook-registry-1.4.0.crate) = 17912
+SHA256 (rust/crates/simple_asn1-0.5.4.crate) = 8eb4ea60fb301dc81dfc113df680571045d375ab7345d171c5dc7d7e13107a80
+SIZE (rust/crates/simple_asn1-0.5.4.crate) = 15679
+SHA256 (rust/crates/slab-0.4.3.crate) = f173ac3d1a7e3b28003f40de0b5ce7fe2710f9b9dc3fc38664cebee46b3b6527
+SIZE (rust/crates/slab-0.4.3.crate) = 15681
+SHA256 (rust/crates/smallvec-1.6.1.crate) = fe0f37c9e8f3c5a4a66ad655a93c74daac4ad00c441533bf5c6e7990bb42604e
+SIZE (rust/crates/smallvec-1.6.1.crate) = 26444
+SHA256 (rust/crates/spin-0.5.2.crate) = 6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d
+SIZE (rust/crates/spin-0.5.2.crate) = 12004
+SHA256 (rust/crates/sqlformat-0.1.6.crate) = 6d86e3c77ff882a828346ba401a7ef4b8e440df804491c6064fe8295765de71c
+SIZE (rust/crates/sqlformat-0.1.6.crate) = 20402
+SHA256 (rust/crates/sqlx-0.5.7.crate) = 0e4b94ab0f8c21ee4899b93b06451ef5d965f1a355982ee73684338228498440
+SIZE (rust/crates/sqlx-0.5.7.crate) = 88292
+SHA256 (rust/crates/sqlx-core-0.5.7.crate) = ec28b91a01e1fe286d6ba66f68289a2286df023fc97444e1fd86c2fd6d5dc026
+SIZE (rust/crates/sqlx-core-0.5.7.crate) = 235686
+SHA256 (rust/crates/sqlx-macros-0.5.7.crate) = 4dc33c35d54774eed73d54568d47a6ac099aed8af5e1556a017c131be88217d5
+SIZE (rust/crates/sqlx-macros-0.5.7.crate) = 22059
+SHA256 (rust/crates/sqlx-rt-0.5.7.crate) = 14302b678d9c76b28f2e60115211e25e0aabc938269991745a169753dc00e35c
+SIZE (rust/crates/sqlx-rt-0.5.7.crate) = 2403
+SHA256 (rust/crates/static_assertions-1.1.0.crate) = a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f
+SIZE (rust/crates/static_assertions-1.1.0.crate) = 18480
+SHA256 (rust/crates/stringprep-0.1.2.crate) = 8ee348cb74b87454fff4b551cbf727025810a004f88aeacae7f85b87f4e9a1c1
+SIZE (rust/crates/stringprep-0.1.2.crate) = 22021
+SHA256 (rust/crates/strsim-0.8.0.crate) = 8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a
+SIZE (rust/crates/strsim-0.8.0.crate) = 9309
+SHA256 (rust/crates/structopt-0.3.22.crate) = 69b041cdcb67226aca307e6e7be44c8806423d83e018bd662360a93dabce4d71
+SIZE (rust/crates/structopt-0.3.22.crate) = 51665
+SHA256 (rust/crates/structopt-derive-0.4.15.crate) = 7813934aecf5f51a54775e00068c237de98489463968231a51746bbbc03f9c10
+SIZE (rust/crates/structopt-derive-0.4.15.crate) = 20861
+SHA256 (rust/crates/strum-0.21.0.crate) = aaf86bbcfd1fa9670b7a129f64fc0c9fcbbfe4f1bc4210e9e98fe71ffc12cde2
+SIZE (rust/crates/strum-0.21.0.crate) = 5296
+SHA256 (rust/crates/strum_macros-0.21.1.crate) = d06aaeeee809dbc59eb4556183dd927df67db1540de5be8d3ec0b6636358a5ec
+SIZE (rust/crates/strum_macros-0.21.1.crate) = 16280
+SHA256 (rust/crates/subtle-2.4.0.crate) = 1e81da0851ada1f3e9d4312c704aa4f8806f0f9d69faaf8df2f3464b4a9437c2
+SIZE (rust/crates/subtle-2.4.0.crate) = 12411
+SHA256 (rust/crates/syn-1.0.73.crate) = f71489ff30030d2ae598524f61326b902466f72a0fb1a8564c001cc63425bcc7
+SIZE (rust/crates/syn-1.0.73.crate) = 232706
+SHA256 (rust/crates/synstructure-0.12.4.crate) = b834f2d66f734cb897113e34aaff2f1ab4719ca946f9a7358dba8f8064148701
+SIZE (rust/crates/synstructure-0.12.4.crate) = 18105
+SHA256 (rust/crates/tap-1.0.1.crate) = 55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369
+SIZE (rust/crates/tap-1.0.1.crate) = 11316
+SHA256 (rust/crates/textwrap-0.11.0.crate) = d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060
+SIZE (rust/crates/textwrap-0.11.0.crate) = 17322
+SHA256 (rust/crates/thiserror-1.0.25.crate) = fa6f76457f59514c7eeb4e59d891395fab0b2fd1d40723ae737d64153392e9c6
+SIZE (rust/crates/thiserror-1.0.25.crate) = 16690
+SHA256 (rust/crates/thiserror-impl-1.0.25.crate) = 8a36768c0fbf1bb15eca10defa29526bda730a2376c2ab4393ccfa16fb1a318d
+SIZE (rust/crates/thiserror-impl-1.0.25.crate) = 13364
+SHA256 (rust/crates/time-0.1.43.crate) = ca8a50ef2360fbd1eeb0ecd46795a87a19024eb4b53c5dc916ca1fd95fe62438
+SIZE (rust/crates/time-0.1.43.crate) = 28653
+SHA256 (rust/crates/tinyvec-1.2.0.crate) = 5b5220f05bb7de7f3f53c7c065e1199b3172696fe2db9f9c4d8ad9b4ee74c342
+SIZE (rust/crates/tinyvec-1.2.0.crate) = 41625
+SHA256 (rust/crates/tinyvec_macros-0.1.0.crate) = cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c
+SIZE (rust/crates/tinyvec_macros-0.1.0.crate) = 1817
+SHA256 (rust/crates/tokio-1.11.0.crate) = b4efe6fc2395938c8155973d7be49fe8d03a843726e285e100a8a383cc0154ce
+SIZE (rust/crates/tokio-1.11.0.crate) = 513247
+SHA256 (rust/crates/tokio-macros-1.3.0.crate) = 54473be61f4ebe4efd09cec9bd5d16fa51d70ea0192213d754d2d500457db110
+SIZE (rust/crates/tokio-macros-1.3.0.crate) = 7876
+SHA256 (rust/crates/tokio-rustls-0.22.0.crate) = bc6844de72e57df1980054b38be3a9f4702aba4858be64dd700181a8a6d0e1b6
+SIZE (rust/crates/tokio-rustls-0.22.0.crate) = 22706
+SHA256 (rust/crates/tokio-stream-0.1.7.crate) = 7b2f3f698253f03119ac0102beaa64f67a67e08074d03a22d18784104543727f
+SIZE (rust/crates/tokio-stream-0.1.7.crate) = 30323
+SHA256 (rust/crates/toml-0.4.10.crate) = 758664fc71a3a69038656bee8b6be6477d2a6c315a6b81f7081f591bffa4111f
+SIZE (rust/crates/toml-0.4.10.crate) = 47534
+SHA256 (rust/crates/tui-0.15.0.crate) = 861d8f3ad314ede6219bcb2ab844054b1de279ee37a9bc38e3d606f9d3fb2a71
+SIZE (rust/crates/tui-0.15.0.crate) = 139975
+SHA256 (rust/crates/typenum-1.13.0.crate) = 879f6906492a7cd215bfa4cf595b600146ccfac0c79bcbd1f3000162af5e8b06
+SIZE (rust/crates/typenum-1.13.0.crate) = 40238
+SHA256 (rust/crates/unicode-bidi-0.3.5.crate) = eeb8be209bb1c96b7c177c7420d26e04eccacb0eeae6b980e35fcb74678107e0
+SIZE (rust/crates/unicode-bidi-0.3.5.crate) = 33423
+SHA256 (rust/crates/unicode-normalization-0.1.19.crate) = d54590932941a9e9266f0832deed84ebe1bf2e4c9e4a3554d393d18f5e854bf9
+SIZE (rust/crates/unicode-normalization-0.1.19.crate) = 107353
+SHA256 (rust/crates/unicode-segmentation-1.7.1.crate) = bb0d2e7be6ae3a5fa87eed5fb451aff96f2573d2694942e40543ae0bbe19c796
+SIZE (rust/crates/unicode-segmentation-1.7.1.crate) = 93066
+SHA256 (rust/crates/unicode-width-0.1.8.crate) = 9337591893a19b88d8d87f2cec1e73fad5cdfd10e5a6f349f498ad6ea2ffb1e3
+SIZE (rust/crates/unicode-width-0.1.8.crate) = 16732
+SHA256 (rust/crates/unicode-xid-0.2.2.crate) = 8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3
+SIZE (rust/crates/unicode-xid-0.2.2.crate) = 14955
+SHA256 (rust/crates/unicode_categories-0.1.1.crate) = 39ec24b3121d976906ece63c9daad25b85969647682eee313cb5779fdd69e14e
+SIZE (rust/crates/unicode_categories-0.1.1.crate) = 87298
+SHA256 (rust/crates/untrusted-0.7.1.crate) = a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a
+SIZE (rust/crates/untrusted-0.7.1.crate) = 7924
+SHA256 (rust/crates/url-2.2.2.crate) = a507c383b2d33b5fc35d1861e77e6b383d158b2da5e14fe51b83dfedf6fd578c
+SIZE (rust/crates/url-2.2.2.crate) = 68555
+SHA256 (rust/crates/vcpkg-0.2.15.crate) = accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426
+SIZE (rust/crates/vcpkg-0.2.15.crate) = 228735
+SHA256 (rust/crates/vec_map-0.8.2.crate) = f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191
+SIZE (rust/crates/vec_map-0.8.2.crate) = 14466
+SHA256 (rust/crates/version_check-0.9.3.crate) = 5fecdca9a5291cc2b8dcf7dc02453fee791a280f3743cb0905f8822ae463b3fe
+SIZE (rust/crates/version_check-0.9.3.crate) = 12547
+SHA256 (rust/crates/wasi-0.10.2+wasi-snapshot-preview1.crate) = fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6
+SIZE (rust/crates/wasi-0.10.2+wasi-snapshot-preview1.crate) = 27505
+SHA256 (rust/crates/wasm-bindgen-0.2.74.crate) = d54ee1d4ed486f78874278e63e4069fc1ab9f6a18ca492076ffb90c5eb2997fd
+SIZE (rust/crates/wasm-bindgen-0.2.74.crate) = 158439
+SHA256 (rust/crates/wasm-bindgen-backend-0.2.74.crate) = 3b33f6a0694ccfea53d94db8b2ed1c3a8a4c86dd936b13b9f0a15ec4a451b900
+SIZE (rust/crates/wasm-bindgen-backend-0.2.74.crate) = 25434
+SHA256 (rust/crates/wasm-bindgen-macro-0.2.74.crate) = 088169ca61430fe1e58b8096c24975251700e7b1f6fd91cc9d59b04fb9b18bd4
+SIZE (rust/crates/wasm-bindgen-macro-0.2.74.crate) = 11536
+SHA256 (rust/crates/wasm-bindgen-macro-support-0.2.74.crate) = be2241542ff3d9f241f5e2cb6dd09b37efe786df8851c54957683a49f0987a97
+SIZE (rust/crates/wasm-bindgen-macro-support-0.2.74.crate) = 17831
+SHA256 (rust/crates/wasm-bindgen-shared-0.2.74.crate) = d7cff876b8f18eed75a66cf49b65e7f967cb354a7aa16003fb55dbfd25b44b4f
+SIZE (rust/crates/wasm-bindgen-shared-0.2.74.crate) = 7163
+SHA256 (rust/crates/web-sys-0.3.51.crate) = e828417b379f3df7111d3a2a9e5753706cae29c41f7c4029ee9fd77f3e09e582
+SIZE (rust/crates/web-sys-0.3.51.crate) = 651133
+SHA256 (rust/crates/webpki-0.21.4.crate) = b8e38c0608262c46d4a56202ebabdeb094cef7e560ca7a226c6bf055188aa4ea
+SIZE (rust/crates/webpki-0.21.4.crate) = 58505
+SHA256 (rust/crates/webpki-roots-0.21.1.crate) = aabe153544e473b775453675851ecc86863d2a81d786d741f6b76778f2a48940
+SIZE (rust/crates/webpki-roots-0.21.1.crate) = 223591
+SHA256 (rust/crates/which-4.2.2.crate) = ea187a8ef279bc014ec368c27a920da2024d2a711109bfbe3440585d5cf27ad9
+SIZE (rust/crates/which-4.2.2.crate) = 8589
+SHA256 (rust/crates/whoami-1.1.2.crate) = 4abacf325c958dfeaf1046931d37f2a901b6dfe0968ee965a29e94c6766b2af6
+SIZE (rust/crates/whoami-1.1.2.crate) = 10583
+SHA256 (rust/crates/winapi-0.3.9.crate) = 5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419
+SIZE (rust/crates/winapi-0.3.9.crate) = 1200382
+SHA256 (rust/crates/winapi-i686-pc-windows-gnu-0.4.0.crate) = ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6
+SIZE (rust/crates/winapi-i686-pc-windows-gnu-0.4.0.crate) = 2918815
+SHA256 (rust/crates/winapi-x86_64-pc-windows-gnu-0.4.0.crate) = 712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f
+SIZE (rust/crates/winapi-x86_64-pc-windows-gnu-0.4.0.crate) = 2947998
+SHA256 (rust/crates/wyz-0.2.0.crate) = 85e60b0d1b5f99db2556934e21937020776a5d31520bf169e851ac44e6420214
+SIZE (rust/crates/wyz-0.2.0.crate) = 12926
+SHA256 (rust/crates/zeroize-1.3.0.crate) = 4756f7db3f7b5574938c3eb1c117038b8e07f95ee6718c0efad4ac21508f1efd
+SIZE (rust/crates/zeroize-1.3.0.crate) = 15913
+SHA256 (rust/crates/zeroize_derive-1.1.0.crate) = a2c1e130bebaeab2f23886bf9acbaca14b092408c452543c857f66399cd6dab1
+SIZE (rust/crates/zeroize_derive-1.1.0.crate) = 8037
+SHA256 (tako8ki-gobang-v0.1.0-alpha.5_GH0.tar.gz) = 923210d500f070ac862c73d1a43a10520ee8c54f6692bbce99bbd073dfa72653
+SIZE (tako8ki-gobang-v0.1.0-alpha.5_GH0.tar.gz) = 2376883
diff --git a/databases/gobang/files/patch-rust-1.73.0 b/databases/gobang/files/patch-rust-1.73.0
new file mode 100644
index 000000000000..aa0bf93735c8
--- /dev/null
+++ b/databases/gobang/files/patch-rust-1.73.0
@@ -0,0 +1,64 @@
+From a8fc78c1e28c55af83a57d97dff3f6a93c45b46c Mon Sep 17 00:00:00 2001
+From: Philippe Antoine <contact@catenacyber.fr>
+Date: Fri, 3 Sep 2021 09:29:36 +0200
+Subject: [PATCH] rust: use explicitily Integer::div_ceil
+
+cf https://github.com/rust-lang/rust/issues/88581
+---
+ src/biguint.rs         |  2 +-
+ src/biguint/convert.rs | 15 ++++++---------
+ 2 files changed, 7 insertions(+), 10 deletions(-)
+
+diff --git a/src/biguint.rs b/src/biguint.rs
+index 271a8837..623823c8 100644
+--- cargo-crates/num-bigint-0.3.2/src/biguint.rs
++++ cargo-crates/num-bigint-0.3.2/src/biguint.rs
+@@ -395,7 +395,7 @@ impl Roots for BigUint {
+                 // Try to guess by scaling down such that it does fit in `f64`.
+                 // With some (x * 2��), its nth root ≈ (�√x * 2�)
+                 let extra_bits = bits - (core::f64::MAX_EXP as u64 - 1);
+-                let root_scale = extra_bits.div_ceil(&n64);
++                let root_scale = Integer::div_ceil(&extra_bits, &n64);
+                 let scale = root_scale * n64;
+                 if scale < bits && bits - scale > n64 {
+                     (self >> scale).nth_root(n) << root_scale
+diff --git a/src/biguint/convert.rs b/src/biguint/convert.rs
+index edeed84c..799152d5 100644
+--- cargo-crates/num-bigint-0.3.2/src/biguint/convert.rs
++++ cargo-crates/num-bigint-0.3.2/src/biguint/convert.rs
+@@ -65,9 +65,8 @@ fn from_inexact_bitwise_digits_le(v: &[u8], bits: u8) -> BigUint {
+     debug_assert!(!v.is_empty() && bits <= 8 && big_digit::BITS % bits != 0);
+     debug_assert!(v.iter().all(|&c| BigDigit::from(c) < (1 << bits)));
+ 
+-    let big_digits = (v.len() as u64)
+-        .saturating_mul(bits.into())
+-        .div_ceil(&big_digit::BITS.into())
++    let big_digits = (v.len() as u64).saturating_mul(bits.into());
++    let big_digits = Integer::div_ceil(&big_digits, &big_digit::BITS.into())
+         .to_usize()
+         .unwrap_or(core::usize::MAX);
+     let mut data = Vec::with_capacity(big_digits);
+@@ -580,9 +579,8 @@ pub(super) fn to_bitwise_digits_le(u: &BigUint, bits: u8) -> Vec<u8> {
+     let last_i = u.data.len() - 1;
+     let mask: BigDigit = (1 << bits) - 1;
+     let digits_per_big_digit = big_digit::BITS / bits;
+-    let digits = u
+-        .bits()
+-        .div_ceil(&u64::from(bits))
++    let digits = u.bits();
++    let digits = Integer::div_ceil(&digits, &u64::from(bits))
+         .to_usize()
+         .unwrap_or(core::usize::MAX);
+     let mut res = Vec::with_capacity(digits);
+@@ -608,9 +606,8 @@ fn to_inexact_bitwise_digits_le(u: &BigUint, bits: u8) -> Vec<u8> {
+     debug_assert!(!u.is_zero() && bits <= 8 && big_digit::BITS % bits != 0);
+ 
+     let mask: BigDigit = (1 << bits) - 1;
+-    let digits = u
+-        .bits()
+-        .div_ceil(&u64::from(bits))
++    let digits = u.bits();
++    let digits = Integer::div_ceil(&digits, &u64::from(bits))
+         .to_usize()
+         .unwrap_or(core::usize::MAX);
+     let mut res = Vec::with_capacity(digits);
diff --git a/databases/gobang/pkg-descr b/databases/gobang/pkg-descr
new file mode 100644
index 000000000000..e3c1bb087185
--- /dev/null
+++ b/databases/gobang/pkg-descr
@@ -0,0 +1,6 @@
+gobang is a cross-platform TUI database management tool written in Rust.
+
+Features:
+* Cross-platform support (macOS, Windows, Linux)
+* Multiple Database support (MySQL, PostgreSQL, SQLite)
+* Intuitive keyboard only control
diff --git a/databases/gom/Makefile b/databases/gom/Makefile
index 781d3be48a24..e00f600bccd1 100644
--- a/databases/gom/Makefile
+++ b/databases/gom/Makefile
@@ -5,11 +5,12 @@ MASTER_SITES=	GNOME
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	GObject Data Mapper
+WWW=		https://wiki.gnome.org/Projects/Gom
 
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-USES=		gnome meson pkgconfig python:3.4+ sqlite tar:xz
+USES=		gnome meson pkgconfig python sqlite tar:xz
 USE_GNOME=	gdkpixbuf2 glib20 introspection pygobject3
 
 USE_LDCONFIG=	yes
diff --git a/databases/gom/pkg-descr b/databases/gom/pkg-descr
index ce6d639d6c02..767e7f51a986 100644
--- a/databases/gom/pkg-descr
+++ b/databases/gom/pkg-descr
@@ -1,5 +1,3 @@
 This is an attempt to make a DataMapper for GObject. Mostly because I'm
 sick of doing this by hand in C. It would be cool if it would work across
 language boundries using GObject Introspection too.
-
-WWW: https://wiki.gnome.org/Projects/Gom
diff --git a/databases/goose/Makefile b/databases/goose/Makefile
new file mode 100644
index 000000000000..590271e3dd48
--- /dev/null
+++ b/databases/goose/Makefile
@@ -0,0 +1,21 @@
+PORTNAME=	goose
+DISTVERSIONPREFIX=	v
+DISTVERSION=	3.20.0
+CATEGORIES=	databases
+PKGNAMESUFFIX=	-db-migration-tool
+
+MAINTAINER=	yuri@FreeBSD.org
+COMMENT=	Database migration tool
+WWW=		https://pressly.github.io/goose/
+
+LICENSE=	MIT
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
+USES=		go:modules
+
+GO_MODULE=	github.com/pressly/goose/v3
+GO_TARGET=	./cmd/${PORTNAME}
+
+PLIST_FILES=	bin/${PORTNAME}
+
+.include <bsd.port.mk>
diff --git a/databases/goose/distinfo b/databases/goose/distinfo
new file mode 100644
index 000000000000..cf064cdf3acb
--- /dev/null
+++ b/databases/goose/distinfo
@@ -0,0 +1,5 @@
+TIMESTAMP = 1713844899
+SHA256 (go/databases_goose/goose-v3.20.0/v3.20.0.mod) = 86f336a6a4ee2adca37bd4a1dc40ec4663b54eb4a833c0316c3ace48dd25e145
+SIZE (go/databases_goose/goose-v3.20.0/v3.20.0.mod) = 3340
+SHA256 (go/databases_goose/goose-v3.20.0/v3.20.0.zip) = f0013043c4cb73e8e61bbbc8493ee936481cf9dd70949dd501552631d6b7a330
+SIZE (go/databases_goose/goose-v3.20.0/v3.20.0.zip) = 339554
diff --git a/databases/goose/pkg-descr b/databases/goose/pkg-descr
new file mode 100644
index 000000000000..3e38853b1f69
--- /dev/null
+++ b/databases/goose/pkg-descr
@@ -0,0 +1,2 @@
+goose is a database migration tool. Manage your database schema by creating
+incremental SQL changes and/or Go functions.
diff --git a/databases/gqlplus/Makefile b/databases/gqlplus/Makefile
index 8b0456480aa9..32739620c882 100644
--- a/databases/gqlplus/Makefile
+++ b/databases/gqlplus/Makefile
@@ -1,5 +1,3 @@
-# Created by: Yen-Ming Lee <leeym@FreeBSD.org>
-
 PORTNAME=	gqlplus
 PORTVERSION=	1.16
 PORTREVISION=	2
@@ -8,6 +6,7 @@ MASTER_SITES=	SF
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	SQL*PLUS with commandline editing, history, and name completion
+WWW=		https://gqlplus.sourceforge.net/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
diff --git a/databases/gqlplus/pkg-descr b/databases/gqlplus/pkg-descr
index ae24660810d2..75be67b65396 100644
--- a/databases/gqlplus/pkg-descr
+++ b/databases/gqlplus/pkg-descr
@@ -11,5 +11,3 @@ is needed - simply use gqlplus instead of sqlplus. In addition,
 configuration/installation is trivial: gqlplus is a single binary compiled
 executable (written in C), so all you need is download it and put it anywhere
 in your PATH. After that, you'll be ready to use it.
-
-WWW: http://gqlplus.sourceforge.net/
diff --git a/databases/grass7/Makefile b/databases/grass7/Makefile
index 6833baf7a306..49ecd791b789 100644
--- a/databases/grass7/Makefile
+++ b/databases/grass7/Makefile
@@ -1,8 +1,6 @@
-# Created by: Mikael URANKAR and Loïc BARTOLETTI
-
 PORTNAME=	grass
-PORTVERSION=	7.8.5
-PORTREVISION=	4
+PORTVERSION=	7.8.8
+PORTREVISION=	1
 CATEGORIES=	databases geography
 MASTER_SITES=	https://grass.osgeo.org/%SUBDIR%/ \
 		http://grass.cict.fr/%SUBDIR%/ \
@@ -20,12 +18,11 @@ PKGNAMESUFFIX=	7
 
 MAINTAINER=	lbartoletti@FreeBSD.org
 COMMENT=	Open source Geographical Information System (GIS)
+WWW=		https://grass.osgeo.org/
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/GPL.TXT
 
-BROKEN_sparc64=	Does not configure on sparc64
-
 BUILD_DEPENDS=	${PY_NUMPY} \
 		${PYTHON_SITELIBDIR}/six.py:devel/py-six@${PY_FLAVOR}
 LIB_DEPENDS=	libgdal.so:graphics/gdal \
@@ -40,7 +37,7 @@ RUN_DEPENDS=	${PY_NUMPY} \
 		${PYTHON_SITELIBDIR}/six.py:devel/py-six@${PY_FLAVOR}
 
 USES=		blaslapack compiler:c11 gl gmake gnome iconv \
-		jpeg perl5 pkgconfig python:3.6+ readline shebangfix xorg
+		jpeg perl5 pkgconfig python readline shebangfix xorg
 SHEBANG_GLOB=	*.py
 SHEBANG_LANG=	nviz
 nviz_OLD_CMD=	nviz
@@ -48,8 +45,8 @@ nviz_CMD=	${PREFIX}/${GRASS_INST_DIR}/bin/nviz
 USE_XORG=	sm ice x11 xext xi xmu xrender xt
 USE_GL=		gl glu
 USE_GNOME=	cairo
-USE_WX=		3.0
-WX_COMPS=	wx:build python:run
+USE_WX=		3.2
+WX_COMPS=	wx python:run
 GNU_CONFIGURE=	yes
 
 CONFIGURE_ARGS=	--with-includes=${LOCALBASE}/include \
@@ -71,7 +68,6 @@ CONFIGURE_ARGS=	--with-includes=${LOCALBASE}/include \
 		--with-geos=${LOCALBASE}/bin/geos-config \
 		--with-gdal=${LOCALBASE}/bin/gdal-config \
 		--with-pthread=yes \
-		--with-openmp \
 		--prefix=${LOCALBASE} \
 		--exec-prefix=${LOCALBASE}
 
@@ -89,12 +85,12 @@ PLIST_SUB=	GRASS_INST_DIR="${GRASS_INST_DIR}" \
 		VERSION="${PORTVERSION}" VERS="${PORTVERSION:C/([0-9]+).([0-9]+)(.*)/\1.\2/}" \
 		VER="${VER}" MAJVER="${PKGNAMESUFFIX}"
 
-OPTIONS_DEFINE=		LAS NETCDF NLS PDAL ZSTD
+OPTIONS_DEFINE=		NETCDF NLS PDAL ZSTD
 OPTIONS_MULTI=		DB
 OPTIONS_MULTI_DB=	MYSQL ODBC PGSQL SQLITE
 #OPTIONS_SINGLE=		BLAS
 #OPTIONS_SINGLE_BLAS=	ATLAS NETLIB GOTOBLAS OPENBLAS
-OPTIONS_DEFAULT=	LAS NETCDF NLS PDAL PGSQL SQLITE ZSTD
+OPTIONS_DEFAULT=	NETCDF NLS PDAL PGSQL SQLITE ZSTD
 OPTIONS_SUB=		yes
 
 # BLAS/LAPACK: Only netlib compile the maxmimum number of modules
@@ -104,14 +100,8 @@ OPTIONS_SUB=		yes
 #NETLIB_USES=		blaslapack
 #GOTOBLAS_USES=		blaslapack:gotoblas
 #OPENBLAS_USES=		blaslapack:openblas
-LAS_DESC=		Enable LiDAR modules
 PDAL_DESC=		Enable points cloud data modules
 DB_DESC=		Database support
-LAS_CONFIGURE_ON=	--with-liblas=yes
-LAS_LIB_DEPENDS=	liblas.so:devel/liblas \
-			libboost_program_options.so:devel/boost-libs \
-			libboost_thread.so:devel/boost-libs \
-			libgeotiff.so:graphics/libgeotiff
 MYSQL_USES=		mysql
 MYSQL_CONFIGURE_ON=	--with-mysql \
 			--with-mysql-includes=${LOCALBASE}/include/mysql \
@@ -123,7 +113,7 @@ NLS_USES=		gettext
 ODBC_LIB_DEPENDS=	libodbc.so:databases/unixODBC
 ODBC_CONFIGURE_WITH=	odbc
 PDAL_CONFIGURE_ON=	--with-pdal=${LOCALBASE}/bin/pdal-config
-PDAL_LIB_DEPENDS=	libpdal_base.so:math/pdal
+PDAL_LIB_DEPENDS=	libpdalcpp.so:math/pdal
 PGSQL_USES=		pgsql
 PGSQL_CONFIGURE_WITH=	postgres
 SQLITE_USES=		sqlite
@@ -132,6 +122,10 @@ SQLITE_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_F
 ZSTD_CONFIGURE_WITH=	zstd
 ZSTD_LIB_DEPENDS=	libzstd.so:archivers/zstd
 
+.if exists(/usr/include/omp.h)
+CONFIGURE_ARGS+=	--with-openmp
+.endif
+
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "i386"
@@ -148,18 +142,6 @@ GRASS_INST_DIR=	${PORTNAME}${VER}
 MANDIRS=	${PREFIX}/grass${VER}/docs/man/man1
 
 post-patch:
-	${REINPLACE_CMD} -e \
-		's|make -C|$$(MAKE) -C| ; \
-		 /^BINDIR/s|=.*|=	$${DESTDIR}$${UNIX_BIN}| ; \
-		 /test /s| $$(INST_DIR)| $${DESTDIR}$${INST_DIR}|g ; \
-		 /tar /s| $$(INST_DIR)| $${DESTDIR}$${INST_DIR}|g ; \
-		 /chmod /s| $$(INST_DIR)| $${DESTDIR}$${INST_DIR}|g ; \
-		 /tar /s| $$(INST_DIR)| $${DESTDIR}$${INST_DIR}|g ; \
-		 /rm /s| $$(INST_DIR)| $${DESTDIR}$${INST_DIR}|g ; \
-		 /$$(MAKE) /s| $$(INST_DIR)| $${DESTDIR}$${INST_DIR}|g ; \
-		 /^$$(INST_DIR)\//s|$$(INST_DIR)|$${DESTDIR}$${INST_DIR}|g ; \
-		 s|> $$(INST_DIR)|> $${DESTDIR}$${INST_DIR}|' \
-		${WRKSRC}/include/Make/Install.make
 	${REINPLACE_CMD} \
 		's|= python3|= ${PYTHON_CMD:T}|' ${WRKSRC}/include/Make/Platform.make.in
 	${REINPLACE_CMD} -e \
diff --git a/databases/grass7/distinfo b/databases/grass7/distinfo
index 8e559cab987a..f08c2194a479 100644
--- a/databases/grass7/distinfo
+++ b/databases/grass7/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1610555224
-SHA256 (grass-7.8.5.tar.gz) = a359bb665524ecccb643335d70f5436b1c84ffb6a0e428b78dffebacd983ff37
-SIZE (grass-7.8.5.tar.gz) = 61801712
+TIMESTAMP = 1709187366
+SHA256 (grass-7.8.8.tar.gz) = ba9620a87a89ad924670ce193a8de00329f57e7389539596698849e5ee5deebe
+SIZE (grass-7.8.8.tar.gz) = 66331485
diff --git a/databases/grass7/files/patch-aclocal.m4 b/databases/grass7/files/patch-aclocal.m4
deleted file mode 100644
index c3fc06183ca0..000000000000
--- a/databases/grass7/files/patch-aclocal.m4
+++ /dev/null
@@ -1,10 +0,0 @@
---- aclocal.m4.orig	2020-01-25 14:44:25 UTC
-+++ aclocal.m4
-@@ -560,6 +560,7 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [
- 	    # FreeBSD 3.* and greater have ELF.
- 	    SHLIB_CFLAGS="-fPIC"
- 	    #SHLIB_LD="ld -Bshareable -x"
-+            SHLIB_LD_FLAGS="-Wl,-soname,\$(notdir \$[@])"
- 	    SHLIB_LD="${CC} -shared"
- 	    SHLIB_SUFFIX=".so"
- 	    LDFLAGS="-export-dynamic"
diff --git a/databases/grass7/files/patch-configure b/databases/grass7/files/patch-configure
deleted file mode 100644
index fe7efd87db60..000000000000
--- a/databases/grass7/files/patch-configure
+++ /dev/null
@@ -1,10 +0,0 @@
---- configure.orig	2020-01-25 14:44:16 UTC
-+++ configure
-@@ -1591,6 +1591,7 @@ EOF
- 	    # FreeBSD 3.* and greater have ELF.
- 	    SHLIB_CFLAGS="-fPIC"
- 	    #SHLIB_LD="ld -Bshareable -x"
-+            SHLIB_LD_FLAGS="-Wl,-soname,\$(notdir \$@)"
- 	    SHLIB_LD="${CC} -shared"
- 	    SHLIB_SUFFIX=".so"
- 	    LDFLAGS="-export-dynamic"
diff --git a/databases/grass7/files/patch-include_Make_Install.make b/databases/grass7/files/patch-include_Make_Install.make
index 0e411b27d153..62ceb4921937 100644
--- a/databases/grass7/files/patch-include_Make_Install.make
+++ b/databases/grass7/files/patch-include_Make_Install.make
@@ -1,4 +1,4 @@
---- include/Make/Install.make.orig	2016-11-04 UTC
+--- include/Make/Install.make.orig	2021-10-17 18:22:04 UTC
 +++ include/Make/Install.make
 @@ -37,7 +37,6 @@ ifeq ($(strip $(MACOSX_APP)),1)
  	$(MAKE) install-macosx
@@ -8,29 +8,30 @@
  	$(MAKE) install-check-prefix
  	$(MAKE) real-install
  endif
-@@ -54,21 +53,6 @@ install-check-parent:
- 	while [ ! -d "$$INST_PATH" ]; do \
+@@ -54,22 +53,7 @@ install-check-parent: | $(DESTDIR)
+ 	while [ ! -d "$(DESTDIR)$$INST_PATH" ]; do \
  		INST_PATH=`dirname $$INST_PATH`; \
  	done; \
--	if [ ! -d "$(INST_DIR)" -a ! -w "$$INST_PATH" ] ; then \
+-	if [ ! -d "$(DESTDIR)$(INST_DIR)" -a ! -w "$(DESTDIR)$$INST_PATH" ] ; then \
 -		echo "ERROR: Directory $$INST_PATH is a parent directory of your" >&2 ; \
 -		echo "  install directory $(INST_DIR) and is not writable." >&2 ; \
 -		echo "  Perhaps you need root access." >&2 ; \
 -		echo "  Installation aborted, exiting Make." >&2 ; \
 -		exit 1; \
 -	fi
--
+ 
 -install-check-writable:
--	@ if [ -d "$(INST_DIR)" -a ! -w "$(INST_DIR)" ] ; then \
+-	@ if [ -d "$(DESTDIR)$(INST_DIR)" -a ! -w "$(DESTDIR)$(INST_DIR)" ] ; then \
 -		echo "ERROR: Your install directory $(INST_DIR) is not writable." >&2 ; \
 -		echo "  Perhaps you need root access." >&2 ; \
 -		echo "  Installation aborted, exiting Make." >&2 ; \
 -		exit 1; \
 -	fi
- 
+-
  install-check-prefix:
- 	@ result=`echo "$(INST_DIR)" | awk '{ if ($$1 ~ /grass/) print $$1 }'`; \
-@@ -77,18 +61,12 @@ install-check-prefix:
+ 	@ result=`echo "$(DESTDIR)$(INST_DIR)" | awk '{ if ($$1 ~ /grass/) print $$1 }'`; \
+ 	if [ "$$result" = "" ] ; then \
+@@ -77,12 +61,6 @@ install-check-prefix:
  		echo "  does not contain the word 'grass'." >&2 ; \
  		echo "  It is highly recommended that the word 'grass' be part" >&2 ; \
  		echo "  of your install directory to avoid conflicts." >&2 ; \
@@ -43,31 +44,3 @@
  	fi
  
  ifneq ($(strip $(MINGW)),)
- STARTUP = $(INST_DIR)/etc/$(GRASS_NAME).py
- else
--STARTUP = $(UNIX_BIN)/$(GRASS_NAME)
-+STARTUP = ${DESTDIR}/$(UNIX_BIN)/$(GRASS_NAME)
- endif
- 
- FONTCAP = etc/fontcap
-@@ -96,7 +96,8 @@ TMPGISRC = demolocation/.grassrc$(GRASS_
- PLATMAKE = include/Make/Platform.make
- GRASSMAKE = include/Make/Grass.make
- 
--real-install: | $(INST_DIR) $(UNIX_BIN)
-+real-install: 
-+	test -d $(INST_DIR) || $(MAKE_DIR_CMD) $(INST_DIR)
- 	-tar cBCf $(GISBASE) - . | tar xBCf $(INST_DIR) - 2>/dev/null
- 	-rm $(INST_DIR)/$(GRASS_NAME).tmp
- 	$(MAKE) $(STARTUP)
-@@ -121,8 +105,8 @@ ifneq ($(findstring darwin,$(ARCH)),)
- 	@/bin/ln -sfh "$(INST_DIR)/docs/html" /Library/Documentation/Help/GRASS-$(GRASS_VERSION_MAJOR).$(GRASS_VERSION_MINOR)
- endif
- 
--$(INST_DIR) $(UNIX_BIN):
--	$(MAKE_DIR_CMD) $@
-+#$(INST_DIR) $(UNIX_BIN):
-+#	$(MAKE_DIR_CMD) $@
- 
- $(STARTUP): $(ARCH_DISTDIR)/$(GRASS_NAME).tmp
- 	sed -e 's#'@GISBASE@'#'$(INST_DIR)'#g' \
diff --git a/databases/grass7/files/patch-include_gis.h b/databases/grass7/files/patch-include_gis.h
deleted file mode 100644
index 636a03516418..000000000000
--- a/databases/grass7/files/patch-include_gis.h
+++ /dev/null
@@ -1,24 +0,0 @@
---- include/gis.h.orig	2021-07-04 15:25:28 UTC
-+++ include/gis.h
-@@ -23,6 +23,7 @@
- /* System include files */
- #include <stdio.h>
- #include <stdarg.h>
-+#include <stdbool.h>
- 
- /* Grass and local include files */
- #include <grass/config.h>
-@@ -53,11 +54,11 @@ static const char *GRASS_copyright __attribute__ ((unu
- 
- /* Define TRUE and FALSE for boolean comparisons */
- #ifndef TRUE
--#define TRUE 1
-+#define TRUE true
- #endif
- 
- #ifndef FALSE
--#define FALSE 0
-+#define FALSE false
- #endif
- 
- #if defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64
diff --git a/databases/grass7/files/patch-lib_lidar_lidar.h b/databases/grass7/files/patch-lib_lidar_lidar.h
deleted file mode 100644
index c7273df39c5c..000000000000
--- a/databases/grass7/files/patch-lib_lidar_lidar.h
+++ /dev/null
@@ -1,12 +0,0 @@
---- lib/lidar/lidar.h.orig	2021-07-04 15:30:31 UTC
-+++ lib/lidar/lidar.h
-@@ -62,9 +62,6 @@
-     /* INTERPOLATOR */
- #define P_BILINEAR 		1
- #define P_BICUBIC 		0
--    /* Boolean definitions */
--#define TRUE 			1
--#define FALSE 			0
- 
- /*----------------------------------------------------------------------------------------------------------*/
-     /*STRUCTS DECLARATION */
diff --git a/databases/grass7/files/patch-raster3d_r3.showdspf_Ball.c b/databases/grass7/files/patch-raster3d_r3.showdspf_Ball.c
deleted file mode 100644
index 222cb30d38b3..000000000000
--- a/databases/grass7/files/patch-raster3d_r3.showdspf_Ball.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- raster3d/r3.showdspf/Ball.c.orig	2021-07-04 15:32:42 UTC
-+++ raster3d/r3.showdspf/Ball.c
-@@ -7,8 +7,6 @@
- #include "Ball.h"
- #include "BallMath.h"
- #include <stdio.h>
--#define TRUE 1
--#define FALSE 0
- 
- HMatrix mId = { {1, 0, 0, 0}
- , {0, 1, 0, 0}
diff --git a/databases/grass7/files/patch-raster3d_r3.showdspf_togif.c b/databases/grass7/files/patch-raster3d_r3.showdspf_togif.c
deleted file mode 100644
index fd625bb0d9b4..000000000000
--- a/databases/grass7/files/patch-raster3d_r3.showdspf_togif.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- raster3d/r3.showdspf/togif.c.orig	2021-07-04 15:33:18 UTC
-+++ raster3d/r3.showdspf/togif.c
-@@ -324,9 +324,6 @@ static int ditherrow(unsigned short *r, unsigned short
-  *
-  *****************************************************************************/
- 
--#define TRUE 1
--#define FALSE 0
--
- 
- /************************** BumpPixel() ********************************/
- /*
diff --git a/databases/grass7/files/patch-raster_r.param.scale_param.h b/databases/grass7/files/patch-raster_r.param.scale_param.h
deleted file mode 100644
index b05811d6eb20..000000000000
--- a/databases/grass7/files/patch-raster_r.param.scale_param.h
+++ /dev/null
@@ -1,12 +0,0 @@
---- raster/r.param.scale/param.h.orig	2021-07-04 15:31:09 UTC
-+++ raster/r.param.scale/param.h
-@@ -18,9 +18,6 @@
- 				/* 'blank' edge around raster.          */
- #define MAX_WSIZE 499		/* Maximum dimensions of window.        */
- 				/* Some useful labels.                  */
--#define TRUE 1
--#define FALSE 0
--
- #define RAD2DEG M_R2D
- #define DEG2RAD M_D2R
- 
diff --git a/databases/grass7/files/patch-raster_r.surf.idw_main.h b/databases/grass7/files/patch-raster_r.surf.idw_main.h
deleted file mode 100644
index 0b3e29895afd..000000000000
--- a/databases/grass7/files/patch-raster_r.surf.idw_main.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- raster/r.surf.idw/main.h.orig	2021-07-04 15:31:52 UTC
-+++ raster/r.surf.idw/main.h
-@@ -1,8 +1,6 @@
- #include <grass/raster.h>
- 
- #define         SHORT           short
--#define         TRUE    1
--#define         FALSE   0
- 
- #define MELEMENT        struct Melement
- MELEMENT {
diff --git a/databases/grass7/files/patch-vector_v.hull_chull.c b/databases/grass7/files/patch-vector_v.hull_chull.c
deleted file mode 100644
index a89e4f3228f8..000000000000
--- a/databases/grass7/files/patch-vector_v.hull_chull.c
+++ /dev/null
@@ -1,72 +0,0 @@
---- vector/v.hull/chull.c.orig	2021-07-04 15:27:24 UTC
-+++ vector/v.hull/chull.c
-@@ -22,6 +22,7 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <math.h>
-+#include <stdbool.h>
- 
- #include <grass/gis.h>
- #include <grass/vector.h>
-@@ -29,10 +30,6 @@
- 
- #include "globals.h"
- 
--/*Define Boolean type */
--typedef enum
--{ BFALSE, BTRUE } bool;
--
- /* Define vertex indices. */
- #define X   0
- #define Y   1
-@@ -76,10 +73,10 @@ struct tFaceStructure
- };
- 
- /* Define flags */
--#define ONHULL   	BTRUE
--#define REMOVED  	BTRUE
--#define VISIBLE  	BTRUE
--#define PROCESSED	BTRUE
-+#define ONHULL   	true
-+#define REMOVED  	true
-+#define VISIBLE  	true
-+#define PROCESSED	true
- 
- /* Global variable definitions */
- tVertex vertices = NULL;
-@@ -436,7 +433,7 @@ bool AddOne(tVertex p)
-     tFace f;
-     tEdge e, temp;
-     long int vol;
--    bool vis = BFALSE;
-+    bool vis = false;
- 
- 
-     /* Mark faces visible from p. */
-@@ -446,7 +443,7 @@ bool AddOne(tVertex p)
- 
- 	if (vol < 0) {
- 	    f->visible = VISIBLE;
--	    vis = BTRUE;
-+	    vis = true;
- 	}
- 	f = f->next;
-     } while (f != faces);
-@@ -454,7 +451,7 @@ bool AddOne(tVertex p)
-     /* If no faces are visible from p, then p is inside the hull. */
-     if (!vis) {
- 	p->onhull = !ONHULL;
--	return BFALSE;
-+	return false;
-     }
- 
-     /* Mark edges in interior of visible region for deletion.
-@@ -470,7 +467,7 @@ bool AddOne(tVertex p)
- 	    e->newface = MakeConeFace(e, p);
- 	e = temp;
-     } while (e != edges);
--    return BTRUE;
-+    return true;
- }
- 
- /*---------------------------------------------------------------------
diff --git a/databases/grass7/pkg-descr b/databases/grass7/pkg-descr
index b2dd34e61eba..a44cad5d95a0 100644
--- a/databases/grass7/pkg-descr
+++ b/databases/grass7/pkg-descr
@@ -5,5 +5,3 @@ An open source Geographical Information System (GIS) with raster,
 topological vector, image processing, and graphics production functionality
 that operates on various platforms through a graphical user interface and
 shell in X-Windows. It is released under GNU General Public License (GPL).
-
-WWW: https://grass.osgeo.org/
diff --git a/databases/grass7/pkg-plist b/databases/grass7/pkg-plist
index 6d6e16aa8dc5..0a663d95bb3d 100644
--- a/databases/grass7/pkg-plist
+++ b/databases/grass7/pkg-plist
@@ -1,6 +1,10 @@
-bin/grass%%MAJVER%%
-bin/grass%%VER%%
 %%GRASS_INST_DIR%%/AUTHORS
+%%GRASS_INST_DIR%%/CHANGES
+%%GRASS_INST_DIR%%/CITING
+%%GRASS_INST_DIR%%/COPYING
+%%GRASS_INST_DIR%%/GPL.TXT
+%%GRASS_INST_DIR%%/INSTALL
+%%GRASS_INST_DIR%%/REQUIREMENTS.html
 %%GRASS_INST_DIR%%/bin/d.barscale
 %%GRASS_INST_DIR%%/bin/d.colorlist
 %%GRASS_INST_DIR%%/bin/d.colortable
@@ -147,7 +151,6 @@ bin/grass%%VER%%
 %%GRASS_INST_DIR%%/bin/r.in.bin
 %%GRASS_INST_DIR%%/bin/r.in.gdal
 %%GRASS_INST_DIR%%/bin/r.in.gridatb
-%%LAS%%%%GRASS_INST_DIR%%/bin/r.in.lidar
 %%GRASS_INST_DIR%%/bin/r.in.mat
 %%GRASS_INST_DIR%%/bin/r.in.png
 %%GRASS_INST_DIR%%/bin/r.in.poly
@@ -269,7 +272,6 @@ bin/grass%%VER%%
 %%GRASS_INST_DIR%%/bin/r3.gwflow
 %%GRASS_INST_DIR%%/bin/r3.in.ascii
 %%GRASS_INST_DIR%%/bin/r3.in.bin
-%%LAS%%%%GRASS_INST_DIR%%/bin/r3.in.lidar
 %%GRASS_INST_DIR%%/bin/r3.in.v5d
 %%GRASS_INST_DIR%%/bin/r3.info
 %%GRASS_INST_DIR%%/bin/r3.mapcalc
@@ -279,7 +281,6 @@ bin/grass%%VER%%
 %%GRASS_INST_DIR%%/bin/r3.null
 %%GRASS_INST_DIR%%/bin/r3.out.ascii
 %%GRASS_INST_DIR%%/bin/r3.out.bin
-%%NETCDF%%%%GRASS_INST_DIR%%/bin/r3.out.netcdf
 %%GRASS_INST_DIR%%/bin/r3.out.v5d
 %%GRASS_INST_DIR%%/bin/r3.out.vtk
 %%GRASS_INST_DIR%%/bin/r3.retile
@@ -316,9 +317,7 @@ bin/grass%%VER%%
 %%GRASS_INST_DIR%%/bin/v.in.ascii
 %%GRASS_INST_DIR%%/bin/v.in.db
 %%GRASS_INST_DIR%%/bin/v.in.dxf
-%%LAS%%%%GRASS_INST_DIR%%/bin/v.in.lidar
 %%GRASS_INST_DIR%%/bin/v.in.ogr
-%%NOTONI386%%%%GRASS_INST_DIR%%/bin/v.in.pdal
 %%GRASS_INST_DIR%%/bin/v.in.region
 %%GRASS_INST_DIR%%/bin/v.info
 %%GRASS_INST_DIR%%/bin/v.kcv
@@ -353,9 +352,7 @@ bin/grass%%VER%%
 %%GRASS_INST_DIR%%/bin/v.normal
 %%GRASS_INST_DIR%%/bin/v.out.ascii
 %%GRASS_INST_DIR%%/bin/v.out.dxf
-%%LAS%%%%GRASS_INST_DIR%%/bin/v.out.lidar
 %%GRASS_INST_DIR%%/bin/v.out.ogr
-%%PGSQL%%%%GRASS_INST_DIR%%/bin/v.out.postgis
 %%GRASS_INST_DIR%%/bin/v.out.pov
 %%GRASS_INST_DIR%%/bin/v.out.svg
 %%GRASS_INST_DIR%%/bin/v.out.vtk
@@ -394,20 +391,18 @@ bin/grass%%VER%%
 %%GRASS_INST_DIR%%/bin/v.what.rast
 %%GRASS_INST_DIR%%/bin/v.what.rast3
 %%GRASS_INST_DIR%%/bin/ximgview
-%%GRASS_INST_DIR%%/CHANGES
-%%GRASS_INST_DIR%%/CITING
-%%GRASS_INST_DIR%%/contributors_extra.csv
 %%GRASS_INST_DIR%%/contributors.csv
-%%GRASS_INST_DIR%%/COPYING
+%%GRASS_INST_DIR%%/contributors_extra.csv
 %%GRASS_INST_DIR%%/demolocation/.grassrc%%VER%%
-%%GRASS_INST_DIR%%/demolocation/PERMANENT/dbf/mysites.dbf
-%%GRASS_INST_DIR%%/demolocation/PERMANENT/dbf/point.dbf
 %%GRASS_INST_DIR%%/demolocation/PERMANENT/DEFAULT_WIND
 %%GRASS_INST_DIR%%/demolocation/PERMANENT/MYNAME
 %%GRASS_INST_DIR%%/demolocation/PERMANENT/PROJ_INFO
 %%GRASS_INST_DIR%%/demolocation/PERMANENT/PROJ_UNITS
-%%GRASS_INST_DIR%%/demolocation/PERMANENT/sqlite/sqlite.db
 %%GRASS_INST_DIR%%/demolocation/PERMANENT/VAR
+%%GRASS_INST_DIR%%/demolocation/PERMANENT/WIND
+%%GRASS_INST_DIR%%/demolocation/PERMANENT/dbf/mysites.dbf
+%%GRASS_INST_DIR%%/demolocation/PERMANENT/dbf/point.dbf
+%%GRASS_INST_DIR%%/demolocation/PERMANENT/sqlite/sqlite.db
 %%GRASS_INST_DIR%%/demolocation/PERMANENT/vector/country_boundaries/cidx
 %%GRASS_INST_DIR%%/demolocation/PERMANENT/vector/country_boundaries/coor
 %%GRASS_INST_DIR%%/demolocation/PERMANENT/vector/country_boundaries/dbln
@@ -429,9 +424,8 @@ bin/grass%%VER%%
 %%GRASS_INST_DIR%%/demolocation/PERMANENT/vector/point/hist
 %%GRASS_INST_DIR%%/demolocation/PERMANENT/vector/point/sidx
 %%GRASS_INST_DIR%%/demolocation/PERMANENT/vector/point/topo
-%%GRASS_INST_DIR%%/demolocation/PERMANENT/WIND
-%%GRASS_INST_DIR%%/docs/html/aspect_diagram.png
 %%GRASS_INST_DIR%%/docs/html/aspect.png
+%%GRASS_INST_DIR%%/docs/html/aspect_diagram.png
 %%GRASS_INST_DIR%%/docs/html/barscales/arrow_ends.png
 %%GRASS_INST_DIR%%/docs/html/barscales/both_ticks.png
 %%GRASS_INST_DIR%%/docs/html/barscales/classic.png
@@ -486,11 +480,11 @@ bin/grass%%VER%%
 %%GRASS_INST_DIR%%/docs/html/colortables/nlcd.png
 %%GRASS_INST_DIR%%/docs/html/colortables/oranges.png
 %%GRASS_INST_DIR%%/docs/html/colortables/plasma.png
-%%GRASS_INST_DIR%%/docs/html/colortables/population_dens.png
 %%GRASS_INST_DIR%%/docs/html/colortables/population.png
+%%GRASS_INST_DIR%%/docs/html/colortables/population_dens.png
+%%GRASS_INST_DIR%%/docs/html/colortables/precipitation.png
 %%GRASS_INST_DIR%%/docs/html/colortables/precipitation_daily.png
 %%GRASS_INST_DIR%%/docs/html/colortables/precipitation_monthly.png
-%%GRASS_INST_DIR%%/docs/html/colortables/precipitation.png
 %%GRASS_INST_DIR%%/docs/html/colortables/rainbow.png
 %%GRASS_INST_DIR%%/docs/html/colortables/ramp.png
 %%GRASS_INST_DIR%%/docs/html/colortables/random.png
@@ -502,40 +496,12 @@ bin/grass%%VER%%
 %%GRASS_INST_DIR%%/docs/html/colortables/sepia.png
 %%GRASS_INST_DIR%%/docs/html/colortables/slope.png
 %%GRASS_INST_DIR%%/docs/html/colortables/soilmoisture.png
-%%GRASS_INST_DIR%%/docs/html/colortables/srtm_plus.png
 %%GRASS_INST_DIR%%/docs/html/colortables/srtm.png
+%%GRASS_INST_DIR%%/docs/html/colortables/srtm_plus.png
 %%GRASS_INST_DIR%%/docs/html/colortables/terrain.png
 %%GRASS_INST_DIR%%/docs/html/colortables/viridis.png
 %%GRASS_INST_DIR%%/docs/html/colortables/water.png
 %%GRASS_INST_DIR%%/docs/html/colortables/wave.png
-%%GRASS_INST_DIR%%/docs/html/d_correlate_plot.png
-%%GRASS_INST_DIR%%/docs/html/d_frame.png
-%%GRASS_INST_DIR%%/docs/html/d_geodesic.png
-%%GRASS_INST_DIR%%/docs/html/d_grid_blue_grid.png
-%%GRASS_INST_DIR%%/docs/html/d_grid_red_grid.png
-%%GRASS_INST_DIR%%/docs/html/d_histogram_bar.png
-%%GRASS_INST_DIR%%/docs/html/d_histogram_pie.png
-%%GRASS_INST_DIR%%/docs/html/d_legend_custom_labels_and_background.png
-%%GRASS_INST_DIR%%/docs/html/d_legend_logarithmic.png
-%%GRASS_INST_DIR%%/docs/html/d_legend_vect_subheadings.png
-%%GRASS_INST_DIR%%/docs/html/d_legend_vect.png
-%%GRASS_INST_DIR%%/docs/html/d_legend.png
-%%GRASS_INST_DIR%%/docs/html/d_mon_wx0_raster.png
-%%GRASS_INST_DIR%%/docs/html/d_mon_wx0.png
-%%GRASS_INST_DIR%%/docs/html/d_polar_aspect.png
-%%GRASS_INST_DIR%%/docs/html/d_rast_arrow_wind.png
-%%GRASS_INST_DIR%%/docs/html/d_rast_edit.png
-%%GRASS_INST_DIR%%/docs/html/d_rast_elevation_values.png
-%%GRASS_INST_DIR%%/docs/html/d_rast_elevation.png
-%%GRASS_INST_DIR%%/docs/html/d_rast_landuse.png
-%%GRASS_INST_DIR%%/docs/html/d_rast_num_zoom.png
-%%GRASS_INST_DIR%%/docs/html/d_rgb.png
-%%GRASS_INST_DIR%%/docs/html/d_rhumbline.png
-%%GRASS_INST_DIR%%/docs/html/d_text.png
-%%GRASS_INST_DIR%%/docs/html/d_to_rast_3D_example.jpg
-%%GRASS_INST_DIR%%/docs/html/d_vect_chart_pie_2d.png
-%%GRASS_INST_DIR%%/docs/html/d_vect_chart_pie_3d.png
-%%GRASS_INST_DIR%%/docs/html/d_vect_thematic.png
 %%GRASS_INST_DIR%%/docs/html/d.barscale.html
 %%GRASS_INST_DIR%%/docs/html/d.colorlist.html
 %%GRASS_INST_DIR%%/docs/html/d.colortable.html
@@ -572,15 +538,43 @@ bin/grass%%VER%%
 %%GRASS_INST_DIR%%/docs/html/d.text.html
 %%GRASS_INST_DIR%%/docs/html/d.title.html
 %%GRASS_INST_DIR%%/docs/html/d.to.rast.html
-%%GRASS_INST_DIR%%/docs/html/d.vect.chart_example.jpg
 %%GRASS_INST_DIR%%/docs/html/d.vect.chart.html
+%%GRASS_INST_DIR%%/docs/html/d.vect.chart_example.jpg
 %%GRASS_INST_DIR%%/docs/html/d.vect.html
 %%GRASS_INST_DIR%%/docs/html/d.vect.thematic.html
 %%GRASS_INST_DIR%%/docs/html/d.what.rast.html
 %%GRASS_INST_DIR%%/docs/html/d.what.vect.html
 %%GRASS_INST_DIR%%/docs/html/d.where.html
-%%GRASS_INST_DIR%%/docs/html/database_graphical.html
+%%GRASS_INST_DIR%%/docs/html/d_correlate_plot.png
+%%GRASS_INST_DIR%%/docs/html/d_frame.png
+%%GRASS_INST_DIR%%/docs/html/d_geodesic.png
+%%GRASS_INST_DIR%%/docs/html/d_grid_blue_grid.png
+%%GRASS_INST_DIR%%/docs/html/d_grid_red_grid.png
+%%GRASS_INST_DIR%%/docs/html/d_histogram_bar.png
+%%GRASS_INST_DIR%%/docs/html/d_histogram_pie.png
+%%GRASS_INST_DIR%%/docs/html/d_legend.png
+%%GRASS_INST_DIR%%/docs/html/d_legend_custom_labels_and_background.png
+%%GRASS_INST_DIR%%/docs/html/d_legend_logarithmic.png
+%%GRASS_INST_DIR%%/docs/html/d_legend_vect.png
+%%GRASS_INST_DIR%%/docs/html/d_legend_vect_subheadings.png
+%%GRASS_INST_DIR%%/docs/html/d_mon_wx0.png
+%%GRASS_INST_DIR%%/docs/html/d_mon_wx0_raster.png
+%%GRASS_INST_DIR%%/docs/html/d_polar_aspect.png
+%%GRASS_INST_DIR%%/docs/html/d_rast_arrow_wind.png
+%%GRASS_INST_DIR%%/docs/html/d_rast_edit.png
+%%GRASS_INST_DIR%%/docs/html/d_rast_elevation.png
+%%GRASS_INST_DIR%%/docs/html/d_rast_elevation_values.png
+%%GRASS_INST_DIR%%/docs/html/d_rast_landuse.png
+%%GRASS_INST_DIR%%/docs/html/d_rast_num_zoom.png
+%%GRASS_INST_DIR%%/docs/html/d_rgb.png
+%%GRASS_INST_DIR%%/docs/html/d_rhumbline.png
+%%GRASS_INST_DIR%%/docs/html/d_text.png
+%%GRASS_INST_DIR%%/docs/html/d_to_rast_3D_example.jpg
+%%GRASS_INST_DIR%%/docs/html/d_vect_chart_pie_2d.png
+%%GRASS_INST_DIR%%/docs/html/d_vect_chart_pie_3d.png
+%%GRASS_INST_DIR%%/docs/html/d_vect_thematic.png
 %%GRASS_INST_DIR%%/docs/html/database.html
+%%GRASS_INST_DIR%%/docs/html/database_graphical.html
 %%GRASS_INST_DIR%%/docs/html/databaseintro.html
 %%GRASS_INST_DIR%%/docs/html/datacatalog.png
 %%GRASS_INST_DIR%%/docs/html/db.columns.html
@@ -604,11 +598,52 @@ bin/grass%%VER%%
 %%GRASS_INST_DIR%%/docs/html/dbmgr_frame.png
 %%GRASS_INST_DIR%%/docs/html/dbmgr_sql_builder.png
 %%GRASS_INST_DIR%%/docs/html/dem.png
-%%GRASS_INST_DIR%%/docs/html/display_graphical.html
 %%GRASS_INST_DIR%%/docs/html/display.html
+%%GRASS_INST_DIR%%/docs/html/display_graphical.html
 %%GRASS_INST_DIR%%/docs/html/displaydrivers.html
 %%GRASS_INST_DIR%%/docs/html/dshade.png
 %%GRASS_INST_DIR%%/docs/html/full_index.html
+%%GRASS_INST_DIR%%/docs/html/g.access.html
+%%GRASS_INST_DIR%%/docs/html/g.cairocomp.html
+%%GRASS_INST_DIR%%/docs/html/g.copy.html
+%%GRASS_INST_DIR%%/docs/html/g.dirseps.html
+%%GRASS_INST_DIR%%/docs/html/g.extension.all.html
+%%GRASS_INST_DIR%%/docs/html/g.extension.html
+%%GRASS_INST_DIR%%/docs/html/g.filename.html
+%%GRASS_INST_DIR%%/docs/html/g.findetc.html
+%%GRASS_INST_DIR%%/docs/html/g.findfile.html
+%%GRASS_INST_DIR%%/docs/html/g.gisenv.html
+%%GRASS_INST_DIR%%/docs/html/g.gui.animation.html
+%%GRASS_INST_DIR%%/docs/html/g.gui.datacatalog.html
+%%GRASS_INST_DIR%%/docs/html/g.gui.dbmgr.html
+%%GRASS_INST_DIR%%/docs/html/g.gui.gcp.html
+%%GRASS_INST_DIR%%/docs/html/g.gui.gmodeler.html
+%%GRASS_INST_DIR%%/docs/html/g.gui.html
+%%GRASS_INST_DIR%%/docs/html/g.gui.iclass.html
+%%GRASS_INST_DIR%%/docs/html/g.gui.image2target.html
+%%GRASS_INST_DIR%%/docs/html/g.gui.mapswipe.html
+%%GRASS_INST_DIR%%/docs/html/g.gui.photo2image.html
+%%GRASS_INST_DIR%%/docs/html/g.gui.psmap.html
+%%GRASS_INST_DIR%%/docs/html/g.gui.rlisetup.html
+%%GRASS_INST_DIR%%/docs/html/g.gui.timeline.html
+%%GRASS_INST_DIR%%/docs/html/g.gui.tplot.html
+%%GRASS_INST_DIR%%/docs/html/g.gui.vdigit.html
+%%GRASS_INST_DIR%%/docs/html/g.list.html
+%%GRASS_INST_DIR%%/docs/html/g.manual.html
+%%GRASS_INST_DIR%%/docs/html/g.mapset.html
+%%GRASS_INST_DIR%%/docs/html/g.mapsets.html
+%%GRASS_INST_DIR%%/docs/html/g.message.html
+%%GRASS_INST_DIR%%/docs/html/g.mkfontcap.html
+%%GRASS_INST_DIR%%/docs/html/g.parser.html
+%%GRASS_INST_DIR%%/docs/html/g.pnmcomp.html
+%%GRASS_INST_DIR%%/docs/html/g.ppmtopng.html
+%%GRASS_INST_DIR%%/docs/html/g.proj.html
+%%GRASS_INST_DIR%%/docs/html/g.region.html
+%%GRASS_INST_DIR%%/docs/html/g.remove.html
+%%GRASS_INST_DIR%%/docs/html/g.rename.html
+%%GRASS_INST_DIR%%/docs/html/g.search.modules.html
+%%GRASS_INST_DIR%%/docs/html/g.tempfile.html
+%%GRASS_INST_DIR%%/docs/html/g.version.html
 %%GRASS_INST_DIR%%/docs/html/g_gui_gmodeler_avg_map.png
 %%GRASS_INST_DIR%%/docs/html/g_gui_gmodeler_avg_run.png
 %%GRASS_INST_DIR%%/docs/html/g_gui_gmodeler_comment.png
@@ -616,9 +651,9 @@ bin/grass%%VER%%
 %%GRASS_INST_DIR%%/docs/html/g_gui_gmodeler_dlg_module.png
 %%GRASS_INST_DIR%%/docs/html/g_gui_gmodeler_intermediate_data.png
 %%GRASS_INST_DIR%%/docs/html/g_gui_gmodeler_items.png
+%%GRASS_INST_DIR%%/docs/html/g_gui_gmodeler_loop.png
 %%GRASS_INST_DIR%%/docs/html/g_gui_gmodeler_loop_dlg.png
 %%GRASS_INST_DIR%%/docs/html/g_gui_gmodeler_loop_final.png
-%%GRASS_INST_DIR%%/docs/html/g_gui_gmodeler_loop.png
 %%GRASS_INST_DIR%%/docs/html/g_gui_gmodeler_lower_toolbar.png
 %%GRASS_INST_DIR%%/docs/html/g_gui_gmodeler_mcomment.png
 %%GRASS_INST_DIR%%/docs/html/g_gui_gmodeler_mdb.png
@@ -643,16 +678,16 @@ bin/grass%%VER%%
 %%GRASS_INST_DIR%%/docs/html/g_gui_gmodeler_mrelation.png
 %%GRASS_INST_DIR%%/docs/html/g_gui_gmodeler_mvector.png
 %%GRASS_INST_DIR%%/docs/html/g_gui_gmodeler_parameter.png
-%%GRASS_INST_DIR%%/docs/html/g_gui_gmodeler_python_code_result.png
-%%GRASS_INST_DIR%%/docs/html/g_gui_gmodeler_python_code.png
 %%GRASS_INST_DIR%%/docs/html/g_gui_gmodeler_python.png
+%%GRASS_INST_DIR%%/docs/html/g_gui_gmodeler_python_code.png
+%%GRASS_INST_DIR%%/docs/html/g_gui_gmodeler_python_code_result.png
 %%GRASS_INST_DIR%%/docs/html/g_gui_gmodeler_raster.png
 %%GRASS_INST_DIR%%/docs/html/g_gui_gmodeler_raster3d.png
 %%GRASS_INST_DIR%%/docs/html/g_gui_gmodeler_relation.png
 %%GRASS_INST_DIR%%/docs/html/g_gui_gmodeler_toolbar.png
+%%GRASS_INST_DIR%%/docs/html/g_gui_gmodeler_variables.png
 %%GRASS_INST_DIR%%/docs/html/g_gui_gmodeler_variables_raster.png
 %%GRASS_INST_DIR%%/docs/html/g_gui_gmodeler_variables_run.png
-%%GRASS_INST_DIR%%/docs/html/g_gui_gmodeler_variables.png
 %%GRASS_INST_DIR%%/docs/html/g_gui_gmodeler_vector.png
 %%GRASS_INST_DIR%%/docs/html/g_gui_gmodeler_zipcodes_avg_elevation.gxm
 %%GRASS_INST_DIR%%/docs/html/g_gui_rlisetup_1.png
@@ -668,49 +703,8 @@ bin/grass%%VER%%
 %%GRASS_INST_DIR%%/docs/html/g_gui_tplot_labels.png
 %%GRASS_INST_DIR%%/docs/html/g_mapsets_gui.png
 %%GRASS_INST_DIR%%/docs/html/g_parser_test.png
-%%GRASS_INST_DIR%%/docs/html/g.access.html
-%%GRASS_INST_DIR%%/docs/html/g.cairocomp.html
-%%GRASS_INST_DIR%%/docs/html/g.copy.html
-%%GRASS_INST_DIR%%/docs/html/g.dirseps.html
-%%GRASS_INST_DIR%%/docs/html/g.extension.all.html
-%%GRASS_INST_DIR%%/docs/html/g.extension.html
-%%GRASS_INST_DIR%%/docs/html/g.filename.html
-%%GRASS_INST_DIR%%/docs/html/g.findetc.html
-%%GRASS_INST_DIR%%/docs/html/g.findfile.html
-%%GRASS_INST_DIR%%/docs/html/g.gisenv.html
-%%GRASS_INST_DIR%%/docs/html/g.gui.animation.html
-%%GRASS_INST_DIR%%/docs/html/g.gui.datacatalog.html
-%%GRASS_INST_DIR%%/docs/html/g.gui.dbmgr.html
-%%GRASS_INST_DIR%%/docs/html/g.gui.gcp.html
-%%GRASS_INST_DIR%%/docs/html/g.gui.gmodeler.html
-%%GRASS_INST_DIR%%/docs/html/g.gui.html
-%%GRASS_INST_DIR%%/docs/html/g.gui.iclass.html
-%%GRASS_INST_DIR%%/docs/html/g.gui.image2target.html
-%%GRASS_INST_DIR%%/docs/html/g.gui.mapswipe.html
-%%GRASS_INST_DIR%%/docs/html/g.gui.photo2image.html
-%%GRASS_INST_DIR%%/docs/html/g.gui.psmap.html
-%%GRASS_INST_DIR%%/docs/html/g.gui.rlisetup.html
-%%GRASS_INST_DIR%%/docs/html/g.gui.timeline.html
-%%GRASS_INST_DIR%%/docs/html/g.gui.tplot.html
-%%GRASS_INST_DIR%%/docs/html/g.gui.vdigit.html
-%%GRASS_INST_DIR%%/docs/html/g.list.html
-%%GRASS_INST_DIR%%/docs/html/g.manual.html
-%%GRASS_INST_DIR%%/docs/html/g.mapset.html
-%%GRASS_INST_DIR%%/docs/html/g.mapsets.html
-%%GRASS_INST_DIR%%/docs/html/g.message.html
-%%GRASS_INST_DIR%%/docs/html/g.mkfontcap.html
-%%GRASS_INST_DIR%%/docs/html/g.parser.html
-%%GRASS_INST_DIR%%/docs/html/g.pnmcomp.html
-%%GRASS_INST_DIR%%/docs/html/g.ppmtopng.html
-%%GRASS_INST_DIR%%/docs/html/g.proj.html
-%%GRASS_INST_DIR%%/docs/html/g.region.html
-%%GRASS_INST_DIR%%/docs/html/g.remove.html
-%%GRASS_INST_DIR%%/docs/html/g.rename.html
-%%GRASS_INST_DIR%%/docs/html/g.search.modules.html
-%%GRASS_INST_DIR%%/docs/html/g.tempfile.html
-%%GRASS_INST_DIR%%/docs/html/g.version.html
-%%GRASS_INST_DIR%%/docs/html/general_graphical.html
 %%GRASS_INST_DIR%%/docs/html/general.html
+%%GRASS_INST_DIR%%/docs/html/general_graphical.html
 %%GRASS_INST_DIR%%/docs/html/geomorphon.png
 %%GRASS_INST_DIR%%/docs/html/gi_3dview.jpg
 %%GRASS_INST_DIR%%/docs/html/gi_addons.jpg
@@ -729,61 +723,22 @@ bin/grass%%VER%%
 %%GRASS_INST_DIR%%/docs/html/gi_temporal.jpg
 %%GRASS_INST_DIR%%/docs/html/gi_vector.jpg
 %%GRASS_INST_DIR%%/docs/html/graphical_index.html
+%%GRASS_INST_DIR%%/docs/html/grass-dbf.html
+%%GRASS_INST_DIR%%/docs/html/grass-ogr.html
+%%GRASS_INST_DIR%%/docs/html/grass-sqlite.html
+%%GRASS_INST_DIR%%/docs/html/grass7.html
+%%GRASS_INST_DIR%%/docs/html/grass7_arch.png
 %%GRASS_INST_DIR%%/docs/html/grass_database.html
 %%GRASS_INST_DIR%%/docs/html/grass_database.png
 %%GRASS_INST_DIR%%/docs/html/grass_icon.png
 %%GRASS_INST_DIR%%/docs/html/grass_logo.png
 %%GRASS_INST_DIR%%/docs/html/grass_logo.txt
 %%GRASS_INST_DIR%%/docs/html/grass_start.png
-%%GRASS_INST_DIR%%/docs/html/grass-dbf.html
-%%MYSQL%%%%GRASS_INST_DIR%%/docs/html/grass-mysql.html
-%%ODBC%%%%GRASS_INST_DIR%%/docs/html/grass-odbc.html
-%%GRASS_INST_DIR%%/docs/html/grass-ogr.html
-%%PGSQL%%%%GRASS_INST_DIR%%/docs/html/grass-pg.html
-%%GRASS_INST_DIR%%/docs/html/grass-sqlite.html
-%%GRASS_INST_DIR%%/docs/html/grass7_arch.png
-%%GRASS_INST_DIR%%/docs/html/grass7.html
 %%GRASS_INST_DIR%%/docs/html/grassdocs.css
 %%GRASS_INST_DIR%%/docs/html/guimodules_graphical.html
 %%GRASS_INST_DIR%%/docs/html/help_loc_struct.png
 %%GRASS_INST_DIR%%/docs/html/helptext.html
 %%GRASS_INST_DIR%%/docs/html/htmldriver.html
-%%GRASS_INST_DIR%%/docs/html/i_albedo_landsat5.png
-%%GRASS_INST_DIR%%/docs/html/i_albedo_landsat7.png
-%%NOTONI386%%%%GRASS_INST_DIR%%/docs/html/i.atcorr.html
-%%GRASS_INST_DIR%%/docs/html/i_atcorr_B02_atcorr.png
-%%GRASS_INST_DIR%%/docs/html/i_cluster_landsat_clustering.png
-%%GRASS_INST_DIR%%/docs/html/i_colors_enhance_corrected.jpg
-%%GRASS_INST_DIR%%/docs/html/i_colors_enhance_uncorrected.jpg
-%%GRASS_INST_DIR%%/docs/html/i_maxlik_classes.png
-%%GRASS_INST_DIR%%/docs/html/i_maxlik_rejection.png
-%%GRASS_INST_DIR%%/docs/html/i_maxlik_rgb.png
-%%GRASS_INST_DIR%%/docs/html/i_ortho_camera.png
-%%GRASS_INST_DIR%%/docs/html/i_ortho_photo_step1.png
-%%GRASS_INST_DIR%%/docs/html/i_ortho_photo_step5.png
-%%GRASS_INST_DIR%%/docs/html/i_ortho_photo_step6.png
-%%GRASS_INST_DIR%%/docs/html/i_ortho_photo_step7.png
-%%GRASS_INST_DIR%%/docs/html/i_ortho_photo_step8.png
-%%GRASS_INST_DIR%%/docs/html/i_pansharpen_rgb_brovey542.jpg
-%%GRASS_INST_DIR%%/docs/html/i_pansharpen_rgb_ihs542.jpg
-%%GRASS_INST_DIR%%/docs/html/i_pansharpen_rgb_landsat542.jpg
-%%GRASS_INST_DIR%%/docs/html/i_pansharpen_rgb_pca542.jpg
-%%GRASS_INST_DIR%%/docs/html/i_pca_result.png
-%%GRASS_INST_DIR%%/docs/html/i_segment_lsat7_pan.png
-%%GRASS_INST_DIR%%/docs/html/i_segment_lsat7_seg_min100.png
-%%GRASS_INST_DIR%%/docs/html/i_segment_lsat7_seg_min5.png
-%%GRASS_INST_DIR%%/docs/html/i_segment_ortho_segs_final.jpg
-%%GRASS_INST_DIR%%/docs/html/i_segment_ortho_segs_l1.jpg
-%%GRASS_INST_DIR%%/docs/html/i_segment_ortho_segs_l2_l5.jpg
-%%GRASS_INST_DIR%%/docs/html/i_spectral.png
-%%GRASS_INST_DIR%%/docs/html/i_tasscap_brightness.jpg
-%%GRASS_INST_DIR%%/docs/html/i_tasscap_greenness.jpg
-%%GRASS_INST_DIR%%/docs/html/i_tasscap_haze.jpg
-%%GRASS_INST_DIR%%/docs/html/i_tasscap_wetness.jpg
-%%GRASS_INST_DIR%%/docs/html/i_topo_corr_angles.png
-%%GRASS_INST_DIR%%/docs/html/i_vi_arvi.png
-%%GRASS_INST_DIR%%/docs/html/i_vi_gari.png
-%%GRASS_INST_DIR%%/docs/html/i_vi_ndvi.png
 %%GRASS_INST_DIR%%/docs/html/i.albedo.html
 %%GRASS_INST_DIR%%/docs/html/i.aster.toar.html
 %%GRASS_INST_DIR%%/docs/html/i.biomass.html
@@ -832,6 +787,41 @@ bin/grass%%VER%%
 %%GRASS_INST_DIR%%/docs/html/i.topo.corr.html
 %%GRASS_INST_DIR%%/docs/html/i.vi.html
 %%GRASS_INST_DIR%%/docs/html/i.zc.html
+%%GRASS_INST_DIR%%/docs/html/i_albedo_landsat5.png
+%%GRASS_INST_DIR%%/docs/html/i_albedo_landsat7.png
+%%GRASS_INST_DIR%%/docs/html/i_atcorr_B02_atcorr.png
+%%GRASS_INST_DIR%%/docs/html/i_cluster_landsat_clustering.png
+%%GRASS_INST_DIR%%/docs/html/i_colors_enhance_corrected.jpg
+%%GRASS_INST_DIR%%/docs/html/i_colors_enhance_uncorrected.jpg
+%%GRASS_INST_DIR%%/docs/html/i_maxlik_classes.png
+%%GRASS_INST_DIR%%/docs/html/i_maxlik_rejection.png
+%%GRASS_INST_DIR%%/docs/html/i_maxlik_rgb.png
+%%GRASS_INST_DIR%%/docs/html/i_ortho_camera.png
+%%GRASS_INST_DIR%%/docs/html/i_ortho_photo_step1.png
+%%GRASS_INST_DIR%%/docs/html/i_ortho_photo_step5.png
+%%GRASS_INST_DIR%%/docs/html/i_ortho_photo_step6.png
+%%GRASS_INST_DIR%%/docs/html/i_ortho_photo_step7.png
+%%GRASS_INST_DIR%%/docs/html/i_ortho_photo_step8.png
+%%GRASS_INST_DIR%%/docs/html/i_pansharpen_rgb_brovey542.jpg
+%%GRASS_INST_DIR%%/docs/html/i_pansharpen_rgb_ihs542.jpg
+%%GRASS_INST_DIR%%/docs/html/i_pansharpen_rgb_landsat542.jpg
+%%GRASS_INST_DIR%%/docs/html/i_pansharpen_rgb_pca542.jpg
+%%GRASS_INST_DIR%%/docs/html/i_pca_result.png
+%%GRASS_INST_DIR%%/docs/html/i_segment_lsat7_pan.png
+%%GRASS_INST_DIR%%/docs/html/i_segment_lsat7_seg_min100.png
+%%GRASS_INST_DIR%%/docs/html/i_segment_lsat7_seg_min5.png
+%%GRASS_INST_DIR%%/docs/html/i_segment_ortho_segs_final.jpg
+%%GRASS_INST_DIR%%/docs/html/i_segment_ortho_segs_l1.jpg
+%%GRASS_INST_DIR%%/docs/html/i_segment_ortho_segs_l2_l5.jpg
+%%GRASS_INST_DIR%%/docs/html/i_spectral.png
+%%GRASS_INST_DIR%%/docs/html/i_tasscap_brightness.jpg
+%%GRASS_INST_DIR%%/docs/html/i_tasscap_greenness.jpg
+%%GRASS_INST_DIR%%/docs/html/i_tasscap_haze.jpg
+%%GRASS_INST_DIR%%/docs/html/i_tasscap_wetness.jpg
+%%GRASS_INST_DIR%%/docs/html/i_topo_corr_angles.png
+%%GRASS_INST_DIR%%/docs/html/i_vi_arvi.png
+%%GRASS_INST_DIR%%/docs/html/i_vi_gari.png
+%%GRASS_INST_DIR%%/docs/html/i_vi_ndvi.png
 %%GRASS_INST_DIR%%/docs/html/iclass_frame.jpg
 %%GRASS_INST_DIR%%/docs/html/icons/3d-help.png
 %%GRASS_INST_DIR%%/docs/html/icons/3d-rotate.png
@@ -984,25 +974,25 @@ bin/grass%%VER%%
 %%GRASS_INST_DIR%%/docs/html/icons/zoom-more.png
 %%GRASS_INST_DIR%%/docs/html/icons/zoom-out.png
 %%GRASS_INST_DIR%%/docs/html/icons/zoom-region.png
-%%GRASS_INST_DIR%%/docs/html/imagery_graphical.html
 %%GRASS_INST_DIR%%/docs/html/imagery.html
+%%GRASS_INST_DIR%%/docs/html/imagery_graphical.html
 %%GRASS_INST_DIR%%/docs/html/imageryintro.html
 %%GRASS_INST_DIR%%/docs/html/index.html
 %%GRASS_INST_DIR%%/docs/html/jquery.fixedheadertable.min.js
 %%GRASS_INST_DIR%%/docs/html/keywords.html
 %%GRASS_INST_DIR%%/docs/html/legend.png
 %%GRASS_INST_DIR%%/docs/html/lrs.html
-%%GRASS_INST_DIR%%/docs/html/m_measure_distance.png
 %%GRASS_INST_DIR%%/docs/html/m.cogo.html
 %%GRASS_INST_DIR%%/docs/html/m.measure.html
 %%GRASS_INST_DIR%%/docs/html/m.nviz.image.html
 %%GRASS_INST_DIR%%/docs/html/m.nviz.script.html
 %%GRASS_INST_DIR%%/docs/html/m.proj.html
 %%GRASS_INST_DIR%%/docs/html/m.transform.html
+%%GRASS_INST_DIR%%/docs/html/m_measure_distance.png
 %%GRASS_INST_DIR%%/docs/html/manual_gallery.html
 %%GRASS_INST_DIR%%/docs/html/mapswipe_tsunami.jpg
-%%GRASS_INST_DIR%%/docs/html/miscellaneous_graphical.html
 %%GRASS_INST_DIR%%/docs/html/miscellaneous.html
+%%GRASS_INST_DIR%%/docs/html/miscellaneous_graphical.html
 %%GRASS_INST_DIR%%/docs/html/northarrows/1a.png
 %%GRASS_INST_DIR%%/docs/html/northarrows/1b.png
 %%GRASS_INST_DIR%%/docs/html/northarrows/2.png
@@ -1026,94 +1016,14 @@ bin/grass%%VER%%
 %%GRASS_INST_DIR%%/docs/html/parser_standard_options.js
 %%GRASS_INST_DIR%%/docs/html/pcurv.png
 %%GRASS_INST_DIR%%/docs/html/pngdriver.html
-%%GRASS_INST_DIR%%/docs/html/postscript_graphical.html
 %%GRASS_INST_DIR%%/docs/html/postscript.html
+%%GRASS_INST_DIR%%/docs/html/postscript_graphical.html
 %%GRASS_INST_DIR%%/docs/html/projectionintro.html
-%%GRASS_INST_DIR%%/docs/html/ps_map_basic.png
-%%GRASS_INST_DIR%%/docs/html/ps_map.png
 %%GRASS_INST_DIR%%/docs/html/ps.map.html
+%%GRASS_INST_DIR%%/docs/html/ps_map.png
+%%GRASS_INST_DIR%%/docs/html/ps_map_basic.png
 %%GRASS_INST_DIR%%/docs/html/psdriver.html
 %%GRASS_INST_DIR%%/docs/html/psmap_frame.jpg
-%%GRASS_INST_DIR%%/docs/html/r_buffer_road.png
-%%GRASS_INST_DIR%%/docs/html/r_carve_dem_carved_accum.png
-%%GRASS_INST_DIR%%/docs/html/r_carve_dem_carved_shaded.png
-%%GRASS_INST_DIR%%/docs/html/r_carve_dem_carved.png
-%%GRASS_INST_DIR%%/docs/html/r_carve_dem_orig_accum.png
-%%GRASS_INST_DIR%%/docs/html/r_carve_dem_orig_shaded.png
-%%GRASS_INST_DIR%%/docs/html/r_carve_dem_orig.png
-%%GRASS_INST_DIR%%/docs/html/r_clump_lakes.png
-%%GRASS_INST_DIR%%/docs/html/r_clump_lsat.png
-%%GRASS_INST_DIR%%/docs/html/r_contour_using_levels.png
-%%GRASS_INST_DIR%%/docs/html/r_drain_with_r_watershed_direction.png
-%%GRASS_INST_DIR%%/docs/html/r_drain.png
-%%GRASS_INST_DIR%%/docs/html/r_fill_dir.png
-%%GRASS_INST_DIR%%/docs/html/r_fill_stats_01.png
-%%GRASS_INST_DIR%%/docs/html/r_fill_stats_02.png
-%%GRASS_INST_DIR%%/docs/html/r_fill_stats_lidar.png
-%%GRASS_INST_DIR%%/docs/html/r_fill_stats_smoothing.png
-%%GRASS_INST_DIR%%/docs/html/r_flow_accumulation.png
-%%GRASS_INST_DIR%%/docs/html/r_flow_length.png
-%%GRASS_INST_DIR%%/docs/html/r_flow_line.png
-%%GRASS_INST_DIR%%/docs/html/r_geomorphon_summits.png
-%%GRASS_INST_DIR%%/docs/html/r_geomorphon.png
-%%GRASS_INST_DIR%%/docs/html/r_grow_distance_sea.png
-%%GRASS_INST_DIR%%/docs/html/r_grow_distance_zoom.png
-%%GRASS_INST_DIR%%/docs/html/r_grow_distance.png
-%%GRASS_INST_DIR%%/docs/html/r_gwflow_concept.png
-%%LAS%%%%GRASS_INST_DIR%%/docs/html/r_in_lidar_base_raster.png
-%%LAS%%%%GRASS_INST_DIR%%/docs/html/r_in_lidar_binning_count.png
-%%LAS%%%%GRASS_INST_DIR%%/docs/html/r_in_lidar_binning_mean.png
-%%LAS%%%%GRASS_INST_DIR%%/docs/html/r_in_lidar_dem_mean3D.jpg
-%%LAS%%%%GRASS_INST_DIR%%/docs/html/r_in_lidar_zrange.png
-%%LAS%%%%GRASS_INST_DIR%%/docs/html/r_in_lidar.png
-%%GRASS_INST_DIR%%/docs/html/r_in_wms_sentinel2.jpg
-%%GRASS_INST_DIR%%/docs/html/r_lake_lidar_dem.jpg
-%%GRASS_INST_DIR%%/docs/html/r_li_dominance_formula.png
-%%GRASS_INST_DIR%%/docs/html/r_li_edgedensity_formula_1.png
-%%GRASS_INST_DIR%%/docs/html/r_li_edgedensity_formula_2.png
-%%GRASS_INST_DIR%%/docs/html/r_li_pielou.png
-%%GRASS_INST_DIR%%/docs/html/r_li_renyi.png
-%%GRASS_INST_DIR%%/docs/html/r_li_richness_formula.png
-%%GRASS_INST_DIR%%/docs/html/r_li_shannon_formula.png
-%%GRASS_INST_DIR%%/docs/html/r_li_simpson_formula.png
-%%GRASS_INST_DIR%%/docs/html/r_mapcalc_simple.png
-%%GRASS_INST_DIR%%/docs/html/r_param_scale_morph.jpg
-%%GRASS_INST_DIR%%/docs/html/r_patch_zeros_as_nulls.png
-%%GRASS_INST_DIR%%/docs/html/r_patch.png
-%%GRASS_INST_DIR%%/docs/html/r_path_with_bitmask.png
-%%GRASS_INST_DIR%%/docs/html/r_path_with_r_watershed_direction.png
-%%GRASS_INST_DIR%%/docs/html/r_path.png
-%%GRASS_INST_DIR%%/docs/html/r_plane_3d.png
-%%GRASS_INST_DIR%%/docs/html/r_random_cells.png
-%%GRASS_INST_DIR%%/docs/html/r_relief.png
-%%GRASS_INST_DIR%%/docs/html/r_resamp_interp_new_250m.png
-%%GRASS_INST_DIR%%/docs/html/r_resamp_interp_orig_500m.png
-%%GRASS_INST_DIR%%/docs/html/r_resamp_stats_6m_20m.png
-%%GRASS_INST_DIR%%/docs/html/r_rgb_elevation.png
-%%GRASS_INST_DIR%%/docs/html/r_sim_water_water_depth.png
-%%GRASS_INST_DIR%%/docs/html/r_sim_water.png
-%%GRASS_INST_DIR%%/docs/html/r_slope_aspect_4_directions.png
-%%GRASS_INST_DIR%%/docs/html/r_slope_aspect_aspect.png
-%%GRASS_INST_DIR%%/docs/html/r_slope_aspect_pcurv.png
-%%GRASS_INST_DIR%%/docs/html/r_slope_aspect_slope.png
-%%GRASS_INST_DIR%%/docs/html/r_slope_aspect_tcurv.png
-%%GRASS_INST_DIR%%/docs/html/r_stream_extract_accum_orig_zoom.png
-%%GRASS_INST_DIR%%/docs/html/r_stream_extract_accum_weighted_zoom.png
-%%GRASS_INST_DIR%%/docs/html/r_stream_extract_streams_noweight.png
-%%GRASS_INST_DIR%%/docs/html/r_stream_extract_streams_weighed.png
-%%GRASS_INST_DIR%%/docs/html/r_stream_extract_weights_zoom.png
-%%GRASS_INST_DIR%%/docs/html/r_sunhours.png
-%%GRASS_INST_DIR%%/docs/html/r_surf_fractal_simple.png
-%%GRASS_INST_DIR%%/docs/html/r_surf_fractal.jpg
-%%GRASS_INST_DIR%%/docs/html/r_surf_gauss_hist.png
-%%GRASS_INST_DIR%%/docs/html/r_surf_random_hist.png
-%%GRASS_INST_DIR%%/docs/html/r_texture_directions_example.png
-%%GRASS_INST_DIR%%/docs/html/r_thin_network.png
-%%GRASS_INST_DIR%%/docs/html/r_thin_vectorized.png
-%%GRASS_INST_DIR%%/docs/html/r_topidx.png
-%%GRASS_INST_DIR%%/docs/html/r_volume_lake.png
-%%GRASS_INST_DIR%%/docs/html/r_water_outlet.png
-%%GRASS_INST_DIR%%/docs/html/r_watershed_drainage.png
 %%GRASS_INST_DIR%%/docs/html/r.basins.fill.html
 %%GRASS_INST_DIR%%/docs/html/r.blend.html
 %%GRASS_INST_DIR%%/docs/html/r.buffer.html
@@ -1155,7 +1065,6 @@ bin/grass%%VER%%
 %%GRASS_INST_DIR%%/docs/html/r.in.gdal.html
 %%GRASS_INST_DIR%%/docs/html/r.in.gridatb.html
 %%GRASS_INST_DIR%%/docs/html/r.in.mat.html
-%%LAS%%%%GRASS_INST_DIR%%/docs/html/r.in.lidar.html
 %%GRASS_INST_DIR%%/docs/html/r.in.png.html
 %%GRASS_INST_DIR%%/docs/html/r.in.poly.html
 %%GRASS_INST_DIR%%/docs/html/r.in.srtm.html
@@ -1259,7 +1168,6 @@ bin/grass%%VER%%
 %%GRASS_INST_DIR%%/docs/html/r.surf.gauss.html
 %%GRASS_INST_DIR%%/docs/html/r.surf.idw.html
 %%GRASS_INST_DIR%%/docs/html/r.surf.random.html
-%%NOTONI386%%%%GRASS_INST_DIR%%/docs/html/r.terraflow.html
 %%GRASS_INST_DIR%%/docs/html/r.texture.html
 %%GRASS_INST_DIR%%/docs/html/r.thin.html
 %%GRASS_INST_DIR%%/docs/html/r.tile.html
@@ -1277,7 +1185,6 @@ bin/grass%%VER%%
 %%GRASS_INST_DIR%%/docs/html/r.unpack.html
 %%GRASS_INST_DIR%%/docs/html/r.uslek.html
 %%GRASS_INST_DIR%%/docs/html/r.usler.html
-%%NOTONI386%%%%GRASS_INST_DIR%%/docs/html/r.viewshed.html
 %%GRASS_INST_DIR%%/docs/html/r.viewshed.png
 %%GRASS_INST_DIR%%/docs/html/r.volume.html
 %%GRASS_INST_DIR%%/docs/html/r.walk.html
@@ -1285,7 +1192,6 @@ bin/grass%%VER%%
 %%GRASS_INST_DIR%%/docs/html/r.watershed.html
 %%GRASS_INST_DIR%%/docs/html/r.what.color.html
 %%GRASS_INST_DIR%%/docs/html/r.what.html
-%%LAS%%%%GRASS_INST_DIR%%/docs/html/r3_in_lidar.png
 %%GRASS_INST_DIR%%/docs/html/r3.colors.html
 %%GRASS_INST_DIR%%/docs/html/r3.colors.out.html
 %%GRASS_INST_DIR%%/docs/html/r3.cross.rast.html
@@ -1295,7 +1201,6 @@ bin/grass%%VER%%
 %%GRASS_INST_DIR%%/docs/html/r3.gwflow.html
 %%GRASS_INST_DIR%%/docs/html/r3.in.ascii.html
 %%GRASS_INST_DIR%%/docs/html/r3.in.bin.html
-%%LAS%%%%GRASS_INST_DIR%%/docs/html/r3.in.lidar.html
 %%GRASS_INST_DIR%%/docs/html/r3.in.v5d.html
 %%GRASS_INST_DIR%%/docs/html/r3.in.xyz.html
 %%GRASS_INST_DIR%%/docs/html/r3.info.html
@@ -1306,7 +1211,6 @@ bin/grass%%VER%%
 %%GRASS_INST_DIR%%/docs/html/r3.null.html
 %%GRASS_INST_DIR%%/docs/html/r3.out.ascii.html
 %%GRASS_INST_DIR%%/docs/html/r3.out.bin.html
-%%NETCDF%%%%GRASS_INST_DIR%%/docs/html/r3.out.netcdf.html
 %%GRASS_INST_DIR%%/docs/html/r3.out.v5d.html
 %%GRASS_INST_DIR%%/docs/html/r3.out.vtk.html
 %%GRASS_INST_DIR%%/docs/html/r3.retile.html
@@ -1316,14 +1220,98 @@ bin/grass%%VER%%
 %%GRASS_INST_DIR%%/docs/html/r3.to.rast.html
 %%GRASS_INST_DIR%%/docs/html/r3.to.rast.png
 %%GRASS_INST_DIR%%/docs/html/r3.univar.html
-%%GRASS_INST_DIR%%/docs/html/r3flow_flowlines_color.png
 %%GRASS_INST_DIR%%/docs/html/r3flow_flowlines.png
-%%GRASS_INST_DIR%%/docs/html/raster_graphical.html
+%%GRASS_INST_DIR%%/docs/html/r3flow_flowlines_color.png
+%%GRASS_INST_DIR%%/docs/html/r_buffer_road.png
+%%GRASS_INST_DIR%%/docs/html/r_carve_dem_carved.png
+%%GRASS_INST_DIR%%/docs/html/r_carve_dem_carved_accum.png
+%%GRASS_INST_DIR%%/docs/html/r_carve_dem_carved_shaded.png
+%%GRASS_INST_DIR%%/docs/html/r_carve_dem_orig.png
+%%GRASS_INST_DIR%%/docs/html/r_carve_dem_orig_accum.png
+%%GRASS_INST_DIR%%/docs/html/r_carve_dem_orig_shaded.png
+%%GRASS_INST_DIR%%/docs/html/r_clump_lakes.png
+%%GRASS_INST_DIR%%/docs/html/r_clump_lsat.png
+%%GRASS_INST_DIR%%/docs/html/r_contour_using_levels.png
+%%GRASS_INST_DIR%%/docs/html/r_drain.png
+%%GRASS_INST_DIR%%/docs/html/r_drain_with_r_watershed_direction.png
+%%GRASS_INST_DIR%%/docs/html/r_fill_dir.png
+%%GRASS_INST_DIR%%/docs/html/r_fill_stats_01.png
+%%GRASS_INST_DIR%%/docs/html/r_fill_stats_02.png
+%%GRASS_INST_DIR%%/docs/html/r_fill_stats_lidar.png
+%%GRASS_INST_DIR%%/docs/html/r_fill_stats_smoothing.png
+%%GRASS_INST_DIR%%/docs/html/r_flow_accumulation.png
+%%GRASS_INST_DIR%%/docs/html/r_flow_length.png
+%%GRASS_INST_DIR%%/docs/html/r_flow_line.png
+%%GRASS_INST_DIR%%/docs/html/r_geomorphon.png
+%%GRASS_INST_DIR%%/docs/html/r_geomorphon_summits.png
+%%GRASS_INST_DIR%%/docs/html/r_grow_distance.png
+%%GRASS_INST_DIR%%/docs/html/r_grow_distance_sea.png
+%%GRASS_INST_DIR%%/docs/html/r_grow_distance_zoom.png
+%%GRASS_INST_DIR%%/docs/html/r_gwflow_concept.png
+%%GRASS_INST_DIR%%/docs/html/r_in_wms_sentinel2.jpg
+%%GRASS_INST_DIR%%/docs/html/r_lake_lidar_dem.jpg
+%%GRASS_INST_DIR%%/docs/html/r_li_dominance_formula.png
+%%GRASS_INST_DIR%%/docs/html/r_li_edgedensity_formula_1.png
+%%GRASS_INST_DIR%%/docs/html/r_li_edgedensity_formula_2.png
+%%GRASS_INST_DIR%%/docs/html/r_li_pielou.png
+%%GRASS_INST_DIR%%/docs/html/r_li_renyi.png
+%%GRASS_INST_DIR%%/docs/html/r_li_richness_formula.png
+%%GRASS_INST_DIR%%/docs/html/r_li_shannon_formula.png
+%%GRASS_INST_DIR%%/docs/html/r_li_simpson_formula.png
+%%GRASS_INST_DIR%%/docs/html/r_in_lidar.png
+%%GRASS_INST_DIR%%/docs/html/r_in_lidar_base_raster.png
+%%GRASS_INST_DIR%%/docs/html/r_in_lidar_binning_count.png
+%%GRASS_INST_DIR%%/docs/html/r_in_lidar_binning_mean.png
+%%GRASS_INST_DIR%%/docs/html/r_in_lidar_dem_mean3D.jpg
+%%GRASS_INST_DIR%%/docs/html/r_in_lidar_zrange.png
+%%GRASS_INST_DIR%%/docs/html/r_mapcalc_simple.png
+%%GRASS_INST_DIR%%/docs/html/r_param_scale_morph.jpg
+%%GRASS_INST_DIR%%/docs/html/r_patch.png
+%%GRASS_INST_DIR%%/docs/html/r_patch_zeros_as_nulls.png
+%%GRASS_INST_DIR%%/docs/html/r_path.png
+%%GRASS_INST_DIR%%/docs/html/r_path_with_bitmask.png
+%%GRASS_INST_DIR%%/docs/html/r_path_with_r_watershed_direction.png
+%%GRASS_INST_DIR%%/docs/html/r_plane_3d.png
+%%GRASS_INST_DIR%%/docs/html/r_random_cells.png
+%%GRASS_INST_DIR%%/docs/html/r_random_surface.jpg
+%%GRASS_INST_DIR%%/docs/html/r_random_surface_hist.png
+%%GRASS_INST_DIR%%/docs/html/r_relief.png
+%%GRASS_INST_DIR%%/docs/html/r_resamp_interp_new_250m.png
+%%GRASS_INST_DIR%%/docs/html/r_resamp_interp_orig_500m.png
+%%GRASS_INST_DIR%%/docs/html/r_resamp_stats_6m_20m.png
+%%GRASS_INST_DIR%%/docs/html/r_rgb_elevation.png
+%%GRASS_INST_DIR%%/docs/html/r_sim_water.png
+%%GRASS_INST_DIR%%/docs/html/r_sim_water_water_depth.png
+%%GRASS_INST_DIR%%/docs/html/r_slope_aspect_4_directions.png
+%%GRASS_INST_DIR%%/docs/html/r_slope_aspect_aspect.png
+%%GRASS_INST_DIR%%/docs/html/r_slope_aspect_pcurv.png
+%%GRASS_INST_DIR%%/docs/html/r_slope_aspect_slope.png
+%%GRASS_INST_DIR%%/docs/html/r_slope_aspect_tcurv.png
+%%GRASS_INST_DIR%%/docs/html/r_stream_extract_accum_orig_zoom.png
+%%GRASS_INST_DIR%%/docs/html/r_stream_extract_accum_weighted_zoom.png
+%%GRASS_INST_DIR%%/docs/html/r_stream_extract_streams_noweight.png
+%%GRASS_INST_DIR%%/docs/html/r_stream_extract_streams_weighed.png
+%%GRASS_INST_DIR%%/docs/html/r_stream_extract_weights_zoom.png
+%%GRASS_INST_DIR%%/docs/html/r_sunhours.png
+%%GRASS_INST_DIR%%/docs/html/r_surf_fractal.jpg
+%%GRASS_INST_DIR%%/docs/html/r_surf_fractal_simple.png
+%%GRASS_INST_DIR%%/docs/html/r_surf_gauss.jpg
+%%GRASS_INST_DIR%%/docs/html/r_surf_gauss_hist.png
+%%GRASS_INST_DIR%%/docs/html/r_surf_random.jpg
+%%GRASS_INST_DIR%%/docs/html/r_surf_random_hist.png
+%%GRASS_INST_DIR%%/docs/html/r_texture_directions_example.png
+%%GRASS_INST_DIR%%/docs/html/r_thin_network.png
+%%GRASS_INST_DIR%%/docs/html/r_thin_vectorized.png
+%%GRASS_INST_DIR%%/docs/html/r_topidx.png
+%%GRASS_INST_DIR%%/docs/html/r_volume_lake.png
+%%GRASS_INST_DIR%%/docs/html/r_water_outlet.png
+%%GRASS_INST_DIR%%/docs/html/r_watershed_drainage.png
 %%GRASS_INST_DIR%%/docs/html/raster.html
+%%GRASS_INST_DIR%%/docs/html/raster3d.html
 %%GRASS_INST_DIR%%/docs/html/raster3d_graphical.html
 %%GRASS_INST_DIR%%/docs/html/raster3d_layout.png
-%%GRASS_INST_DIR%%/docs/html/raster3d.html
 %%GRASS_INST_DIR%%/docs/html/raster3dintro.html
+%%GRASS_INST_DIR%%/docs/html/raster_graphical.html
 %%GRASS_INST_DIR%%/docs/html/rasterintro.html
 %%GRASS_INST_DIR%%/docs/html/rcost_knightsmove.png
 %%GRASS_INST_DIR%%/docs/html/rcost_solvedir.png
@@ -1341,14 +1329,15 @@ bin/grass%%VER%%
 %%GRASS_INST_DIR%%/docs/html/rterraflow_accumulation.png
 %%GRASS_INST_DIR%%/docs/html/rterraflow_dir2.png
 %%GRASS_INST_DIR%%/docs/html/rterraflow_dir3.png
-%%GRASS_INST_DIR%%/docs/html/runivar_basins_elev_zonal.png
 %%GRASS_INST_DIR%%/docs/html/runivar_basins.png
+%%GRASS_INST_DIR%%/docs/html/runivar_basins_elev_zonal.png
 %%GRASS_INST_DIR%%/docs/html/slope.png
 %%GRASS_INST_DIR%%/docs/html/sql.html
 %%GRASS_INST_DIR%%/docs/html/sweep1.png
 %%GRASS_INST_DIR%%/docs/html/sweep2.png
 %%GRASS_INST_DIR%%/docs/html/t.connect.html
 %%GRASS_INST_DIR%%/docs/html/t.create.html
+%%GRASS_INST_DIR%%/docs/html/t.downgrade.html
 %%GRASS_INST_DIR%%/docs/html/t.info.html
 %%GRASS_INST_DIR%%/docs/html/t.list.html
 %%GRASS_INST_DIR%%/docs/html/t.merge.html
@@ -1397,18 +1386,20 @@ bin/grass%%VER%%
 %%GRASS_INST_DIR%%/docs/html/t.vect.univar.html
 %%GRASS_INST_DIR%%/docs/html/t.vect.what.strds.html
 %%GRASS_INST_DIR%%/docs/html/tcurv.png
-%%GRASS_INST_DIR%%/docs/html/temporal_graphical.html
 %%GRASS_INST_DIR%%/docs/html/temporal.html
+%%GRASS_INST_DIR%%/docs/html/temporal_graphical.html
 %%GRASS_INST_DIR%%/docs/html/temporalintro.html
 %%GRASS_INST_DIR%%/docs/html/test.r3flow.html
 %%GRASS_INST_DIR%%/docs/html/test.raster3d.lib.html
 %%GRASS_INST_DIR%%/docs/html/timeline_2D.jpg
 %%GRASS_INST_DIR%%/docs/html/topic_ACCA.html
+%%GRASS_INST_DIR%%/docs/html/topic_GUI.html
+%%GRASS_INST_DIR%%/docs/html/topic_LIDAR.html
+%%GRASS_INST_DIR%%/docs/html/topic_RGB.html
 %%GRASS_INST_DIR%%/docs/html/topic_accumulation.html
 %%GRASS_INST_DIR%%/docs/html/topic_aggregation.html
 %%GRASS_INST_DIR%%/docs/html/topic_albedo.html
 %%GRASS_INST_DIR%%/docs/html/topic_algebra.html
-%%NOTONI386%%%%GRASS_INST_DIR%%/docs/html/topic_atmospheric_correction.html
 %%GRASS_INST_DIR%%/docs/html/topic_attribute_table.html
 %%GRASS_INST_DIR%%/docs/html/topic_biomass.html
 %%GRASS_INST_DIR%%/docs/html/topic_buffer.html
@@ -1445,7 +1436,6 @@ bin/grass%%VER%%
 %%GRASS_INST_DIR%%/docs/html/topic_gradient.html
 %%GRASS_INST_DIR%%/docs/html/topic_graphics.html
 %%GRASS_INST_DIR%%/docs/html/topic_groundwater_flow.html
-%%GRASS_INST_DIR%%/docs/html/topic_GUI.html
 %%GRASS_INST_DIR%%/docs/html/topic_histogram.html
 %%GRASS_INST_DIR%%/docs/html/topic_hydrology.html
 %%GRASS_INST_DIR%%/docs/html/topic_imagery_quality_assessment.html
@@ -1455,7 +1445,6 @@ bin/grass%%VER%%
 %%GRASS_INST_DIR%%/docs/html/topic_kernel_density.html
 %%GRASS_INST_DIR%%/docs/html/topic_landscape_structure_analysis.html
 %%GRASS_INST_DIR%%/docs/html/topic_latitude.html
-%%GRASS_INST_DIR%%/docs/html/topic_LIDAR.html
 %%GRASS_INST_DIR%%/docs/html/topic_linear_reference_system.html
 %%GRASS_INST_DIR%%/docs/html/topic_manual.html
 %%GRASS_INST_DIR%%/docs/html/topic_map_annotations.html
@@ -1482,7 +1471,6 @@ bin/grass%%VER%%
 %%GRASS_INST_DIR%%/docs/html/topic_rectify.html
 %%GRASS_INST_DIR%%/docs/html/topic_resample.html
 %%GRASS_INST_DIR%%/docs/html/topic_rescale.html
-%%GRASS_INST_DIR%%/docs/html/topic_RGB.html
 %%GRASS_INST_DIR%%/docs/html/topic_sampling.html
 %%GRASS_INST_DIR%%/docs/html/topic_segmentation.html
 %%GRASS_INST_DIR%%/docs/html/topic_series.html
@@ -1500,90 +1488,11 @@ bin/grass%%VER%%
 %%GRASS_INST_DIR%%/docs/html/topic_unit_test.html
 %%GRASS_INST_DIR%%/docs/html/topic_vector.html
 %%GRASS_INST_DIR%%/docs/html/topic_vegetation_index.html
-%%NOTONI386%%%%GRASS_INST_DIR%%/docs/html/topic_viewshed.html
 %%GRASS_INST_DIR%%/docs/html/topic_visualization.html
 %%GRASS_INST_DIR%%/docs/html/topic_volume.html
 %%GRASS_INST_DIR%%/docs/html/topic_voxel.html
 %%GRASS_INST_DIR%%/docs/html/topics.html
 %%GRASS_INST_DIR%%/docs/html/tplot.png
-%%GRASS_INST_DIR%%/docs/html/v_buffer_area_s.png
-%%GRASS_INST_DIR%%/docs/html/v_buffer_area.png
-%%GRASS_INST_DIR%%/docs/html/v_buffer_areas_int.png
-%%GRASS_INST_DIR%%/docs/html/v_buffer_areas.png
-%%GRASS_INST_DIR%%/docs/html/v_buffer_line_c.png
-%%GRASS_INST_DIR%%/docs/html/v_buffer_line_s.png
-%%GRASS_INST_DIR%%/docs/html/v_buffer_line.png
-%%GRASS_INST_DIR%%/docs/html/v_buffer_lines.png
-%%GRASS_INST_DIR%%/docs/html/v_buffer_no_cap.png
-%%GRASS_INST_DIR%%/docs/html/v_buffer_point_s.png
-%%GRASS_INST_DIR%%/docs/html/v_buffer_points.png
-%%GRASS_INST_DIR%%/docs/html/v_buffer_rounded_cap.png
-%%GRASS_INST_DIR%%/docs/html/v_buffer_square_cap.png
-%%GRASS_INST_DIR%%/docs/html/v_centroids.png
-%%GRASS_INST_DIR%%/docs/html/v_clean_rmsa.png
-%%GRASS_INST_DIR%%/docs/html/v_clean.png
-%%GRASS_INST_DIR%%/docs/html/v_clip_poly.png
-%%GRASS_INST_DIR%%/docs/html/v_clip_region.png
-%%GRASS_INST_DIR%%/docs/html/v_cluster_4_methods.png
-%%GRASS_INST_DIR%%/docs/html/v_decimate_count.png
-%%GRASS_INST_DIR%%/docs/html/v_decimate_grid_cat.png
-%%GRASS_INST_DIR%%/docs/html/v_decimate_original.png
-%%GRASS_INST_DIR%%/docs/html/v_delaunay.png
-%%GRASS_INST_DIR%%/docs/html/v_generalize_simplify.png
-%%GRASS_INST_DIR%%/docs/html/v_generalize_smooth.png
-%%GRASS_INST_DIR%%/docs/html/v_hull_3d.png
-%%GRASS_INST_DIR%%/docs/html/v_hull.png
-%%GRASS_INST_DIR%%/docs/html/v_kernel.png
-%%GRASS_INST_DIR%%/docs/html/v_label_sa.jpg
-%%GRASS_INST_DIR%%/docs/html/v_lidar_edgedetection_objects.png
-%%GRASS_INST_DIR%%/docs/html/v_lidar_edgedetection.png
-%%GRASS_INST_DIR%%/docs/html/v_mkgrid_hexagons.png
-%%GRASS_INST_DIR%%/docs/html/v_mkgrid_ppattern.png
-%%GRASS_INST_DIR%%/docs/html/v_mkgrid.png
-%%GRASS_INST_DIR%%/docs/html/v_net_alloc_from_centers.png
-%%GRASS_INST_DIR%%/docs/html/v_net_alloc_time.png
-%%GRASS_INST_DIR%%/docs/html/v_net_alloc_to_centers.png
-%%GRASS_INST_DIR%%/docs/html/v_net_alloc.png
-%%GRASS_INST_DIR%%/docs/html/v_net_visibility.png
-%%GRASS_INST_DIR%%/docs/html/v_overlay_area_lines.png
-%%GRASS_INST_DIR%%/docs/html/v_overlay_census_wake2000.png
-%%GRASS_INST_DIR%%/docs/html/v_overlay_op_and.png
-%%GRASS_INST_DIR%%/docs/html/v_overlay_op_not.png
-%%GRASS_INST_DIR%%/docs/html/v_overlay_op_or.png
-%%GRASS_INST_DIR%%/docs/html/v_overlay_op_xor.png
-%%GRASS_INST_DIR%%/docs/html/v_overlay_poly_1_2_a_o_n_x.png
-%%GRASS_INST_DIR%%/docs/html/v_overlay_poly_1_2.png
-%%GRASS_INST_DIR%%/docs/html/v_overlay_urban_census2000.png
-%%GRASS_INST_DIR%%/docs/html/v_overlay_urbanarea.png
-%%GRASS_INST_DIR%%/docs/html/v_perturb_normal.png
-%%GRASS_INST_DIR%%/docs/html/v_perturb_uniform.png
-%%GRASS_INST_DIR%%/docs/html/v_qcount_1.png
-%%GRASS_INST_DIR%%/docs/html/v_qcount_2.png
-%%GRASS_INST_DIR%%/docs/html/v_qcount_3.png
-%%GRASS_INST_DIR%%/docs/html/v_qcount_4.png
-%%GRASS_INST_DIR%%/docs/html/v_qcount_5.png
-%%GRASS_INST_DIR%%/docs/html/v_random_points_in_polygon.png
-%%GRASS_INST_DIR%%/docs/html/v_segment_spaced_percent_points.jpg
-%%GRASS_INST_DIR%%/docs/html/v_segment_spaced_points.jpg
-%%GRASS_INST_DIR%%/docs/html/v_segment_spaced_right_points.jpg
-%%GRASS_INST_DIR%%/docs/html/v_segment_subline.jpg
-%%GRASS_INST_DIR%%/docs/html/v_select_op_contains_pnts.png
-%%GRASS_INST_DIR%%/docs/html/v_select_op_contains_pol.png
-%%GRASS_INST_DIR%%/docs/html/v_select_op_crosses.png
-%%GRASS_INST_DIR%%/docs/html/v_select_op_disjoint.png
-%%GRASS_INST_DIR%%/docs/html/v_select_op_equals.png
-%%GRASS_INST_DIR%%/docs/html/v_select_op_intersects.png
-%%GRASS_INST_DIR%%/docs/html/v_select_op_overlap.png
-%%GRASS_INST_DIR%%/docs/html/v_select_op_overlaps.png
-%%GRASS_INST_DIR%%/docs/html/v_select_op_touches.png
-%%GRASS_INST_DIR%%/docs/html/v_select_op_within.png
-%%GRASS_INST_DIR%%/docs/html/v_to_rast_binning.png
-%%GRASS_INST_DIR%%/docs/html/v_to_rast_direction.png
-%%GRASS_INST_DIR%%/docs/html/v_to_rast3_test.png
-%%GRASS_INST_DIR%%/docs/html/v_vect_stats.png
-%%GRASS_INST_DIR%%/docs/html/v_voronoi_areas.png
-%%GRASS_INST_DIR%%/docs/html/v_voronoi_points.png
-%%GRASS_INST_DIR%%/docs/html/v_voronoi_skeleton.png
 %%GRASS_INST_DIR%%/docs/html/v.buffer.html
 %%GRASS_INST_DIR%%/docs/html/v.build.all.html
 %%GRASS_INST_DIR%%/docs/html/v.build.html
@@ -1626,11 +1535,9 @@ bin/grass%%VER%%
 %%GRASS_INST_DIR%%/docs/html/v.in.dxf.html
 %%GRASS_INST_DIR%%/docs/html/v.in.e00.html
 %%GRASS_INST_DIR%%/docs/html/v.in.geonames.html
-%%LAS%%%%GRASS_INST_DIR%%/docs/html/v.in.lidar.html
 %%GRASS_INST_DIR%%/docs/html/v.in.lines.html
 %%GRASS_INST_DIR%%/docs/html/v.in.mapgen.html
 %%GRASS_INST_DIR%%/docs/html/v.in.ogr.html
-%%NOTONI386%%%%GRASS_INST_DIR%%/docs/html/v.in.pdal.html
 %%GRASS_INST_DIR%%/docs/html/v.in.region.html
 %%GRASS_INST_DIR%%/docs/html/v.in.wfs.html
 %%GRASS_INST_DIR%%/docs/html/v.info.html
@@ -1667,8 +1574,6 @@ bin/grass%%VER%%
 %%GRASS_INST_DIR%%/docs/html/v.out.ascii.html
 %%GRASS_INST_DIR%%/docs/html/v.out.dxf.html
 %%GRASS_INST_DIR%%/docs/html/v.out.ogr.html
-%%LAS%%%%GRASS_INST_DIR%%/docs/html/v.out.lidar.html
-%%PGSQL%%%%GRASS_INST_DIR%%/docs/html/v.out.postgis.html
 %%GRASS_INST_DIR%%/docs/html/v.out.pov.html
 %%GRASS_INST_DIR%%/docs/html/v.out.svg.html
 %%GRASS_INST_DIR%%/docs/html/v.out.vtk.html
@@ -1713,10 +1618,88 @@ bin/grass%%VER%%
 %%GRASS_INST_DIR%%/docs/html/v.what.rast3.html
 %%GRASS_INST_DIR%%/docs/html/v.what.strds.html
 %%GRASS_INST_DIR%%/docs/html/v.what.vect.html
+%%GRASS_INST_DIR%%/docs/html/v_buffer_area.png
+%%GRASS_INST_DIR%%/docs/html/v_buffer_area_s.png
+%%GRASS_INST_DIR%%/docs/html/v_buffer_areas.png
+%%GRASS_INST_DIR%%/docs/html/v_buffer_areas_int.png
+%%GRASS_INST_DIR%%/docs/html/v_buffer_line.png
+%%GRASS_INST_DIR%%/docs/html/v_buffer_line_c.png
+%%GRASS_INST_DIR%%/docs/html/v_buffer_line_s.png
+%%GRASS_INST_DIR%%/docs/html/v_buffer_lines.png
+%%GRASS_INST_DIR%%/docs/html/v_buffer_no_cap.png
+%%GRASS_INST_DIR%%/docs/html/v_buffer_point_s.png
+%%GRASS_INST_DIR%%/docs/html/v_buffer_points.png
+%%GRASS_INST_DIR%%/docs/html/v_buffer_rounded_cap.png
+%%GRASS_INST_DIR%%/docs/html/v_buffer_square_cap.png
+%%GRASS_INST_DIR%%/docs/html/v_centroids.png
+%%GRASS_INST_DIR%%/docs/html/v_clean.png
+%%GRASS_INST_DIR%%/docs/html/v_clean_rmsa.png
+%%GRASS_INST_DIR%%/docs/html/v_clip_poly.png
+%%GRASS_INST_DIR%%/docs/html/v_clip_region.png
+%%GRASS_INST_DIR%%/docs/html/v_cluster_4_methods.png
+%%GRASS_INST_DIR%%/docs/html/v_decimate_count.png
+%%GRASS_INST_DIR%%/docs/html/v_decimate_grid_cat.png
+%%GRASS_INST_DIR%%/docs/html/v_decimate_original.png
+%%GRASS_INST_DIR%%/docs/html/v_delaunay.png
+%%GRASS_INST_DIR%%/docs/html/v_generalize_simplify.png
+%%GRASS_INST_DIR%%/docs/html/v_generalize_smooth.png
+%%GRASS_INST_DIR%%/docs/html/v_hull.png
+%%GRASS_INST_DIR%%/docs/html/v_hull_3d.png
+%%GRASS_INST_DIR%%/docs/html/v_kernel.png
+%%GRASS_INST_DIR%%/docs/html/v_label_sa.jpg
+%%GRASS_INST_DIR%%/docs/html/v_lidar_edgedetection.png
+%%GRASS_INST_DIR%%/docs/html/v_lidar_edgedetection_objects.png
+%%GRASS_INST_DIR%%/docs/html/v_mkgrid.png
+%%GRASS_INST_DIR%%/docs/html/v_mkgrid_hexagons.png
+%%GRASS_INST_DIR%%/docs/html/v_mkgrid_ppattern.png
+%%GRASS_INST_DIR%%/docs/html/v_net_alloc.png
+%%GRASS_INST_DIR%%/docs/html/v_net_alloc_from_centers.png
+%%GRASS_INST_DIR%%/docs/html/v_net_alloc_time.png
+%%GRASS_INST_DIR%%/docs/html/v_net_alloc_to_centers.png
+%%GRASS_INST_DIR%%/docs/html/v_net_visibility.png
+%%GRASS_INST_DIR%%/docs/html/v_overlay_area_lines.png
+%%GRASS_INST_DIR%%/docs/html/v_overlay_census_wake2000.png
+%%GRASS_INST_DIR%%/docs/html/v_overlay_op_and.png
+%%GRASS_INST_DIR%%/docs/html/v_overlay_op_not.png
+%%GRASS_INST_DIR%%/docs/html/v_overlay_op_or.png
+%%GRASS_INST_DIR%%/docs/html/v_overlay_op_xor.png
+%%GRASS_INST_DIR%%/docs/html/v_overlay_poly_1_2.png
+%%GRASS_INST_DIR%%/docs/html/v_overlay_poly_1_2_a_o_n_x.png
+%%GRASS_INST_DIR%%/docs/html/v_overlay_urban_census2000.png
+%%GRASS_INST_DIR%%/docs/html/v_overlay_urbanarea.png
+%%GRASS_INST_DIR%%/docs/html/v_perturb_normal.png
+%%GRASS_INST_DIR%%/docs/html/v_perturb_uniform.png
+%%GRASS_INST_DIR%%/docs/html/v_qcount_1.png
+%%GRASS_INST_DIR%%/docs/html/v_qcount_2.png
+%%GRASS_INST_DIR%%/docs/html/v_qcount_3.png
+%%GRASS_INST_DIR%%/docs/html/v_qcount_4.png
+%%GRASS_INST_DIR%%/docs/html/v_qcount_5.png
+%%GRASS_INST_DIR%%/docs/html/v_random_points_in_polygon.png
+%%GRASS_INST_DIR%%/docs/html/v_segment_spaced_percent_points.jpg
+%%GRASS_INST_DIR%%/docs/html/v_segment_spaced_points.jpg
+%%GRASS_INST_DIR%%/docs/html/v_segment_spaced_right_points.jpg
+%%GRASS_INST_DIR%%/docs/html/v_segment_subline.jpg
+%%GRASS_INST_DIR%%/docs/html/v_select_op_contains_pnts.png
+%%GRASS_INST_DIR%%/docs/html/v_select_op_contains_pol.png
+%%GRASS_INST_DIR%%/docs/html/v_select_op_crosses.png
+%%GRASS_INST_DIR%%/docs/html/v_select_op_disjoint.png
+%%GRASS_INST_DIR%%/docs/html/v_select_op_equals.png
+%%GRASS_INST_DIR%%/docs/html/v_select_op_intersects.png
+%%GRASS_INST_DIR%%/docs/html/v_select_op_overlap.png
+%%GRASS_INST_DIR%%/docs/html/v_select_op_overlaps.png
+%%GRASS_INST_DIR%%/docs/html/v_select_op_touches.png
+%%GRASS_INST_DIR%%/docs/html/v_select_op_within.png
+%%GRASS_INST_DIR%%/docs/html/v_to_rast3_test.png
+%%GRASS_INST_DIR%%/docs/html/v_to_rast_binning.png
+%%GRASS_INST_DIR%%/docs/html/v_to_rast_direction.png
+%%GRASS_INST_DIR%%/docs/html/v_vect_stats.png
+%%GRASS_INST_DIR%%/docs/html/v_voronoi_areas.png
+%%GRASS_INST_DIR%%/docs/html/v_voronoi_points.png
+%%GRASS_INST_DIR%%/docs/html/v_voronoi_skeleton.png
 %%GRASS_INST_DIR%%/docs/html/variables.html
 %%GRASS_INST_DIR%%/docs/html/vdigit_toolbar.jpg
-%%GRASS_INST_DIR%%/docs/html/vector_graphical.html
 %%GRASS_INST_DIR%%/docs/html/vector.html
+%%GRASS_INST_DIR%%/docs/html/vector_graphical.html
 %%GRASS_INST_DIR%%/docs/html/vectorascii.html
 %%GRASS_INST_DIR%%/docs/html/vectorintro.html
 %%GRASS_INST_DIR%%/docs/html/vnetdistance.png
@@ -1731,6 +1714,28 @@ bin/grass%%VER%%
 %%GRASS_INST_DIR%%/docs/html/vrandom_restricted_area.png
 %%GRASS_INST_DIR%%/docs/html/vrandom_restricted_attr.png
 %%GRASS_INST_DIR%%/docs/html/vrandom_z.png
+%%GRASS_INST_DIR%%/docs/html/wxGUI.animation.html
+%%GRASS_INST_DIR%%/docs/html/wxGUI.components.html
+%%GRASS_INST_DIR%%/docs/html/wxGUI.datacatalog.html
+%%GRASS_INST_DIR%%/docs/html/wxGUI.dbmgr.html
+%%GRASS_INST_DIR%%/docs/html/wxGUI.gcp.html
+%%GRASS_INST_DIR%%/docs/html/wxGUI.gmodeler.html
+%%GRASS_INST_DIR%%/docs/html/wxGUI.html
+%%GRASS_INST_DIR%%/docs/html/wxGUI.iclass.html
+%%GRASS_INST_DIR%%/docs/html/wxGUI.image2target.html
+%%GRASS_INST_DIR%%/docs/html/wxGUI.iscatt.html
+%%GRASS_INST_DIR%%/docs/html/wxGUI.mapswipe.html
+%%GRASS_INST_DIR%%/docs/html/wxGUI.modules.html
+%%GRASS_INST_DIR%%/docs/html/wxGUI.nviz.html
+%%GRASS_INST_DIR%%/docs/html/wxGUI.photo2image.html
+%%GRASS_INST_DIR%%/docs/html/wxGUI.psmap.html
+%%GRASS_INST_DIR%%/docs/html/wxGUI.rdigit.html
+%%GRASS_INST_DIR%%/docs/html/wxGUI.rlisetup.html
+%%GRASS_INST_DIR%%/docs/html/wxGUI.timeline.html
+%%GRASS_INST_DIR%%/docs/html/wxGUI.toolboxes.html
+%%GRASS_INST_DIR%%/docs/html/wxGUI.tplot.html
+%%GRASS_INST_DIR%%/docs/html/wxGUI.vdigit.html
+%%GRASS_INST_DIR%%/docs/html/wxGUI.vnet.html
 %%GRASS_INST_DIR%%/docs/html/wxGUI_animation_tool.jpg
 %%GRASS_INST_DIR%%/docs/html/wxGUI_gcp_frame.jpg
 %%GRASS_INST_DIR%%/docs/html/wxGUI_graphical.html
@@ -1759,28 +1764,6 @@ bin/grass%%VER%%
 %%GRASS_INST_DIR%%/docs/html/wxGUI_rdigit_step5.png
 %%GRASS_INST_DIR%%/docs/html/wxGUI_toolboxes.jpg
 %%GRASS_INST_DIR%%/docs/html/wxGUI_vnet.jpg
-%%GRASS_INST_DIR%%/docs/html/wxGUI.animation.html
-%%GRASS_INST_DIR%%/docs/html/wxGUI.components.html
-%%GRASS_INST_DIR%%/docs/html/wxGUI.datacatalog.html
-%%GRASS_INST_DIR%%/docs/html/wxGUI.dbmgr.html
-%%GRASS_INST_DIR%%/docs/html/wxGUI.gcp.html
-%%GRASS_INST_DIR%%/docs/html/wxGUI.gmodeler.html
-%%GRASS_INST_DIR%%/docs/html/wxGUI.html
-%%GRASS_INST_DIR%%/docs/html/wxGUI.iclass.html
-%%GRASS_INST_DIR%%/docs/html/wxGUI.image2target.html
-%%GRASS_INST_DIR%%/docs/html/wxGUI.iscatt.html
-%%GRASS_INST_DIR%%/docs/html/wxGUI.mapswipe.html
-%%GRASS_INST_DIR%%/docs/html/wxGUI.modules.html
-%%GRASS_INST_DIR%%/docs/html/wxGUI.nviz.html
-%%GRASS_INST_DIR%%/docs/html/wxGUI.photo2image.html
-%%GRASS_INST_DIR%%/docs/html/wxGUI.psmap.html
-%%GRASS_INST_DIR%%/docs/html/wxGUI.rdigit.html
-%%GRASS_INST_DIR%%/docs/html/wxGUI.rlisetup.html
-%%GRASS_INST_DIR%%/docs/html/wxGUI.timeline.html
-%%GRASS_INST_DIR%%/docs/html/wxGUI.toolboxes.html
-%%GRASS_INST_DIR%%/docs/html/wxGUI.tplot.html
-%%GRASS_INST_DIR%%/docs/html/wxGUI.vdigit.html
-%%GRASS_INST_DIR%%/docs/html/wxGUI.vnet.html
 %%GRASS_INST_DIR%%/docs/html/wxpyimgview.html
 %%GRASS_INST_DIR%%/docs/html/ximgview.html
 %%GRASS_INST_DIR%%/docs/html/zipcodes_larger2000ha.png
@@ -1829,8 +1812,8 @@ bin/grass%%VER%%
 %%GRASS_INST_DIR%%/docs/man/man1/d.what.rast.1.gz
 %%GRASS_INST_DIR%%/docs/man/man1/d.what.vect.1.gz
 %%GRASS_INST_DIR%%/docs/man/man1/d.where.1.gz
-%%GRASS_INST_DIR%%/docs/man/man1/database_graphical.1.gz
 %%GRASS_INST_DIR%%/docs/man/man1/database.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/database_graphical.1.gz
 %%GRASS_INST_DIR%%/docs/man/man1/databaseintro.1.gz
 %%GRASS_INST_DIR%%/docs/man/man1/db.columns.1.gz
 %%GRASS_INST_DIR%%/docs/man/man1/db.connect.1.gz
@@ -1850,8 +1833,8 @@ bin/grass%%VER%%
 %%GRASS_INST_DIR%%/docs/man/man1/db.tables.1.gz
 %%GRASS_INST_DIR%%/docs/man/man1/db.test.1.gz
 %%GRASS_INST_DIR%%/docs/man/man1/db.univar.1.gz
-%%GRASS_INST_DIR%%/docs/man/man1/display_graphical.1.gz
 %%GRASS_INST_DIR%%/docs/man/man1/display.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/display_graphical.1.gz
 %%GRASS_INST_DIR%%/docs/man/man1/displaydrivers.1.gz
 %%GRASS_INST_DIR%%/docs/man/man1/full_index.1.gz
 %%GRASS_INST_DIR%%/docs/man/man1/g.access.1.gz
@@ -1895,23 +1878,19 @@ bin/grass%%VER%%
 %%GRASS_INST_DIR%%/docs/man/man1/g.search.modules.1.gz
 %%GRASS_INST_DIR%%/docs/man/man1/g.tempfile.1.gz
 %%GRASS_INST_DIR%%/docs/man/man1/g.version.1.gz
-%%GRASS_INST_DIR%%/docs/man/man1/general_graphical.1.gz
 %%GRASS_INST_DIR%%/docs/man/man1/general.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/general_graphical.1.gz
 %%GRASS_INST_DIR%%/docs/man/man1/graphical_index.1.gz
-%%GRASS_INST_DIR%%/docs/man/man1/grass_database.1.gz
 %%GRASS_INST_DIR%%/docs/man/man1/grass-dbf.1.gz
-%%MYSQL%%%%GRASS_INST_DIR%%/docs/man/man1/grass-mysql.1.gz
-%%ODBC%%%%GRASS_INST_DIR%%/docs/man/man1/grass-odbc.1.gz
 %%GRASS_INST_DIR%%/docs/man/man1/grass-ogr.1.gz
-%%PGSQL%%%%GRASS_INST_DIR%%/docs/man/man1/grass-pg.1.gz
 %%GRASS_INST_DIR%%/docs/man/man1/grass-sqlite.1.gz
 %%GRASS_INST_DIR%%/docs/man/man1/grass7.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/grass_database.1.gz
 %%GRASS_INST_DIR%%/docs/man/man1/guimodules_graphical.1.gz
 %%GRASS_INST_DIR%%/docs/man/man1/helptext.1.gz
 %%GRASS_INST_DIR%%/docs/man/man1/htmldriver.1.gz
 %%GRASS_INST_DIR%%/docs/man/man1/i.albedo.1.gz
 %%GRASS_INST_DIR%%/docs/man/man1/i.aster.toar.1.gz
-%%NOTONI386%%%%GRASS_INST_DIR%%/docs/man/man1/i.atcorr.1.gz
 %%GRASS_INST_DIR%%/docs/man/man1/i.biomass.1.gz
 %%GRASS_INST_DIR%%/docs/man/man1/i.cca.1.gz
 %%GRASS_INST_DIR%%/docs/man/man1/i.cluster.1.gz
@@ -1958,8 +1937,8 @@ bin/grass%%VER%%
 %%GRASS_INST_DIR%%/docs/man/man1/i.topo.corr.1.gz
 %%GRASS_INST_DIR%%/docs/man/man1/i.vi.1.gz
 %%GRASS_INST_DIR%%/docs/man/man1/i.zc.1.gz
-%%GRASS_INST_DIR%%/docs/man/man1/imagery_graphical.1.gz
 %%GRASS_INST_DIR%%/docs/man/man1/imagery.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/imagery_graphical.1.gz
 %%GRASS_INST_DIR%%/docs/man/man1/imageryintro.1.gz
 %%GRASS_INST_DIR%%/docs/man/man1/index.1.gz
 %%GRASS_INST_DIR%%/docs/man/man1/keywords.1.gz
@@ -1971,12 +1950,12 @@ bin/grass%%VER%%
 %%GRASS_INST_DIR%%/docs/man/man1/m.proj.1.gz
 %%GRASS_INST_DIR%%/docs/man/man1/m.transform.1.gz
 %%GRASS_INST_DIR%%/docs/man/man1/manual_gallery.1.gz
-%%GRASS_INST_DIR%%/docs/man/man1/miscellaneous_graphical.1.gz
 %%GRASS_INST_DIR%%/docs/man/man1/miscellaneous.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/miscellaneous_graphical.1.gz
 %%GRASS_INST_DIR%%/docs/man/man1/parser_standard_options.1.gz
 %%GRASS_INST_DIR%%/docs/man/man1/pngdriver.1.gz
-%%GRASS_INST_DIR%%/docs/man/man1/postscript_graphical.1.gz
 %%GRASS_INST_DIR%%/docs/man/man1/postscript.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/postscript_graphical.1.gz
 %%GRASS_INST_DIR%%/docs/man/man1/projectionintro.1.gz
 %%GRASS_INST_DIR%%/docs/man/man1/ps.map.1.gz
 %%GRASS_INST_DIR%%/docs/man/man1/psdriver.1.gz
@@ -2020,7 +1999,6 @@ bin/grass%%VER%%
 %%GRASS_INST_DIR%%/docs/man/man1/r.in.bin.1.gz
 %%GRASS_INST_DIR%%/docs/man/man1/r.in.gdal.1.gz
 %%GRASS_INST_DIR%%/docs/man/man1/r.in.gridatb.1.gz
-%%LAS%%%%GRASS_INST_DIR%%/docs/man/man1/r.in.lidar.1.gz
 %%GRASS_INST_DIR%%/docs/man/man1/r.in.mat.1.gz
 %%GRASS_INST_DIR%%/docs/man/man1/r.in.png.1.gz
 %%GRASS_INST_DIR%%/docs/man/man1/r.in.poly.1.gz
@@ -2125,7 +2103,6 @@ bin/grass%%VER%%
 %%GRASS_INST_DIR%%/docs/man/man1/r.surf.gauss.1.gz
 %%GRASS_INST_DIR%%/docs/man/man1/r.surf.idw.1.gz
 %%GRASS_INST_DIR%%/docs/man/man1/r.surf.random.1.gz
-%%NOTONI386%%%%GRASS_INST_DIR%%/docs/man/man1/r.terraflow.1.gz
 %%GRASS_INST_DIR%%/docs/man/man1/r.texture.1.gz
 %%GRASS_INST_DIR%%/docs/man/man1/r.thin.1.gz
 %%GRASS_INST_DIR%%/docs/man/man1/r.tile.1.gz
@@ -2141,7 +2118,6 @@ bin/grass%%VER%%
 %%GRASS_INST_DIR%%/docs/man/man1/r.unpack.1.gz
 %%GRASS_INST_DIR%%/docs/man/man1/r.uslek.1.gz
 %%GRASS_INST_DIR%%/docs/man/man1/r.usler.1.gz
-%%NOTONI386%%%%GRASS_INST_DIR%%/docs/man/man1/r.viewshed.1.gz
 %%GRASS_INST_DIR%%/docs/man/man1/r.volume.1.gz
 %%GRASS_INST_DIR%%/docs/man/man1/r.walk.1.gz
 %%GRASS_INST_DIR%%/docs/man/man1/r.water.outlet.1.gz
@@ -2156,7 +2132,6 @@ bin/grass%%VER%%
 %%GRASS_INST_DIR%%/docs/man/man1/r3.gwflow.1.gz
 %%GRASS_INST_DIR%%/docs/man/man1/r3.in.ascii.1.gz
 %%GRASS_INST_DIR%%/docs/man/man1/r3.in.bin.1.gz
-%%LAS%%%%GRASS_INST_DIR%%/docs/man/man1/r3.in.lidar.1.gz
 %%GRASS_INST_DIR%%/docs/man/man1/r3.in.v5d.1.gz
 %%GRASS_INST_DIR%%/docs/man/man1/r3.in.xyz.1.gz
 %%GRASS_INST_DIR%%/docs/man/man1/r3.info.1.gz
@@ -2167,7 +2142,6 @@ bin/grass%%VER%%
 %%GRASS_INST_DIR%%/docs/man/man1/r3.null.1.gz
 %%GRASS_INST_DIR%%/docs/man/man1/r3.out.ascii.1.gz
 %%GRASS_INST_DIR%%/docs/man/man1/r3.out.bin.1.gz
-%%NETCDF%%%%GRASS_INST_DIR%%/docs/man/man1/r3.out.netcdf.1.gz
 %%GRASS_INST_DIR%%/docs/man/man1/r3.out.v5d.1.gz
 %%GRASS_INST_DIR%%/docs/man/man1/r3.out.vtk.1.gz
 %%GRASS_INST_DIR%%/docs/man/man1/r3.retile.1.gz
@@ -2176,15 +2150,16 @@ bin/grass%%VER%%
 %%GRASS_INST_DIR%%/docs/man/man1/r3.timestamp.1.gz
 %%GRASS_INST_DIR%%/docs/man/man1/r3.to.rast.1.gz
 %%GRASS_INST_DIR%%/docs/man/man1/r3.univar.1.gz
-%%GRASS_INST_DIR%%/docs/man/man1/raster_graphical.1.gz
 %%GRASS_INST_DIR%%/docs/man/man1/raster.1.gz
-%%GRASS_INST_DIR%%/docs/man/man1/raster3d_graphical.1.gz
 %%GRASS_INST_DIR%%/docs/man/man1/raster3d.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/raster3d_graphical.1.gz
 %%GRASS_INST_DIR%%/docs/man/man1/raster3dintro.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/raster_graphical.1.gz
 %%GRASS_INST_DIR%%/docs/man/man1/rasterintro.1.gz
 %%GRASS_INST_DIR%%/docs/man/man1/sql.1.gz
 %%GRASS_INST_DIR%%/docs/man/man1/t.connect.1.gz
 %%GRASS_INST_DIR%%/docs/man/man1/t.create.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/t.downgrade.1.gz
 %%GRASS_INST_DIR%%/docs/man/man1/t.info.1.gz
 %%GRASS_INST_DIR%%/docs/man/man1/t.list.1.gz
 %%GRASS_INST_DIR%%/docs/man/man1/t.merge.1.gz
@@ -2232,17 +2207,19 @@ bin/grass%%VER%%
 %%GRASS_INST_DIR%%/docs/man/man1/t.vect.observe.strds.1.gz
 %%GRASS_INST_DIR%%/docs/man/man1/t.vect.univar.1.gz
 %%GRASS_INST_DIR%%/docs/man/man1/t.vect.what.strds.1.gz
-%%GRASS_INST_DIR%%/docs/man/man1/temporal_graphical.1.gz
 %%GRASS_INST_DIR%%/docs/man/man1/temporal.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/temporal_graphical.1.gz
 %%GRASS_INST_DIR%%/docs/man/man1/temporalintro.1.gz
 %%GRASS_INST_DIR%%/docs/man/man1/test.r3flow.1.gz
 %%GRASS_INST_DIR%%/docs/man/man1/test.raster3d.lib.1.gz
 %%GRASS_INST_DIR%%/docs/man/man1/topic_ACCA.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/topic_GUI.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/topic_LIDAR.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/topic_RGB.1.gz
 %%GRASS_INST_DIR%%/docs/man/man1/topic_accumulation.1.gz
 %%GRASS_INST_DIR%%/docs/man/man1/topic_aggregation.1.gz
 %%GRASS_INST_DIR%%/docs/man/man1/topic_albedo.1.gz
 %%GRASS_INST_DIR%%/docs/man/man1/topic_algebra.1.gz
-%%NOTONI386%%%%GRASS_INST_DIR%%/docs/man/man1/topic_atmospheric_correction.1.gz
 %%GRASS_INST_DIR%%/docs/man/man1/topic_attribute_table.1.gz
 %%GRASS_INST_DIR%%/docs/man/man1/topic_biomass.1.gz
 %%GRASS_INST_DIR%%/docs/man/man1/topic_buffer.1.gz
@@ -2279,7 +2256,6 @@ bin/grass%%VER%%
 %%GRASS_INST_DIR%%/docs/man/man1/topic_gradient.1.gz
 %%GRASS_INST_DIR%%/docs/man/man1/topic_graphics.1.gz
 %%GRASS_INST_DIR%%/docs/man/man1/topic_groundwater_flow.1.gz
-%%GRASS_INST_DIR%%/docs/man/man1/topic_GUI.1.gz
 %%GRASS_INST_DIR%%/docs/man/man1/topic_histogram.1.gz
 %%GRASS_INST_DIR%%/docs/man/man1/topic_hydrology.1.gz
 %%GRASS_INST_DIR%%/docs/man/man1/topic_imagery_quality_assessment.1.gz
@@ -2289,7 +2265,6 @@ bin/grass%%VER%%
 %%GRASS_INST_DIR%%/docs/man/man1/topic_kernel_density.1.gz
 %%GRASS_INST_DIR%%/docs/man/man1/topic_landscape_structure_analysis.1.gz
 %%GRASS_INST_DIR%%/docs/man/man1/topic_latitude.1.gz
-%%GRASS_INST_DIR%%/docs/man/man1/topic_LIDAR.1.gz
 %%GRASS_INST_DIR%%/docs/man/man1/topic_linear_reference_system.1.gz
 %%GRASS_INST_DIR%%/docs/man/man1/topic_manual.1.gz
 %%GRASS_INST_DIR%%/docs/man/man1/topic_map_annotations.1.gz
@@ -2316,7 +2291,6 @@ bin/grass%%VER%%
 %%GRASS_INST_DIR%%/docs/man/man1/topic_rectify.1.gz
 %%GRASS_INST_DIR%%/docs/man/man1/topic_resample.1.gz
 %%GRASS_INST_DIR%%/docs/man/man1/topic_rescale.1.gz
-%%GRASS_INST_DIR%%/docs/man/man1/topic_RGB.1.gz
 %%GRASS_INST_DIR%%/docs/man/man1/topic_sampling.1.gz
 %%GRASS_INST_DIR%%/docs/man/man1/topic_segmentation.1.gz
 %%GRASS_INST_DIR%%/docs/man/man1/topic_series.1.gz
@@ -2334,7 +2308,6 @@ bin/grass%%VER%%
 %%GRASS_INST_DIR%%/docs/man/man1/topic_unit_test.1.gz
 %%GRASS_INST_DIR%%/docs/man/man1/topic_vector.1.gz
 %%GRASS_INST_DIR%%/docs/man/man1/topic_vegetation_index.1.gz
-%%NOTONI386%%%%GRASS_INST_DIR%%/docs/man/man1/topic_viewshed.1.gz
 %%GRASS_INST_DIR%%/docs/man/man1/topic_visualization.1.gz
 %%GRASS_INST_DIR%%/docs/man/man1/topic_volume.1.gz
 %%GRASS_INST_DIR%%/docs/man/man1/topic_voxel.1.gz
@@ -2382,10 +2355,8 @@ bin/grass%%VER%%
 %%GRASS_INST_DIR%%/docs/man/man1/v.in.e00.1.gz
 %%GRASS_INST_DIR%%/docs/man/man1/v.in.geonames.1.gz
 %%GRASS_INST_DIR%%/docs/man/man1/v.in.lines.1.gz
-%%LAS%%%%GRASS_INST_DIR%%/docs/man/man1/v.in.lidar.1.gz
 %%GRASS_INST_DIR%%/docs/man/man1/v.in.mapgen.1.gz
 %%GRASS_INST_DIR%%/docs/man/man1/v.in.ogr.1.gz
-%%NOTONI386%%%%GRASS_INST_DIR%%/docs/man/man1/v.in.pdal.1.gz
 %%GRASS_INST_DIR%%/docs/man/man1/v.in.region.1.gz
 %%GRASS_INST_DIR%%/docs/man/man1/v.in.wfs.1.gz
 %%GRASS_INST_DIR%%/docs/man/man1/v.info.1.gz
@@ -2422,8 +2393,6 @@ bin/grass%%VER%%
 %%GRASS_INST_DIR%%/docs/man/man1/v.out.ascii.1.gz
 %%GRASS_INST_DIR%%/docs/man/man1/v.out.dxf.1.gz
 %%GRASS_INST_DIR%%/docs/man/man1/v.out.ogr.1.gz
-%%LAS%%%%GRASS_INST_DIR%%/docs/man/man1/v.out.lidar.1.gz
-%%PGSQL%%%%GRASS_INST_DIR%%/docs/man/man1/v.out.postgis.1.gz
 %%GRASS_INST_DIR%%/docs/man/man1/v.out.pov.1.gz
 %%GRASS_INST_DIR%%/docs/man/man1/v.out.svg.1.gz
 %%GRASS_INST_DIR%%/docs/man/man1/v.out.vtk.1.gz
@@ -2469,11 +2438,10 @@ bin/grass%%VER%%
 %%GRASS_INST_DIR%%/docs/man/man1/v.what.strds.1.gz
 %%GRASS_INST_DIR%%/docs/man/man1/v.what.vect.1.gz
 %%GRASS_INST_DIR%%/docs/man/man1/variables.1.gz
-%%GRASS_INST_DIR%%/docs/man/man1/vector_graphical.1.gz
 %%GRASS_INST_DIR%%/docs/man/man1/vector.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/vector_graphical.1.gz
 %%GRASS_INST_DIR%%/docs/man/man1/vectorascii.1.gz
 %%GRASS_INST_DIR%%/docs/man/man1/vectorintro.1.gz
-%%GRASS_INST_DIR%%/docs/man/man1/wxGUI_graphical.1.gz
 %%GRASS_INST_DIR%%/docs/man/man1/wxGUI.1.gz
 %%GRASS_INST_DIR%%/docs/man/man1/wxGUI.animation.1.gz
 %%GRASS_INST_DIR%%/docs/man/man1/wxGUI.components.1.gz
@@ -2496,14 +2464,12 @@ bin/grass%%VER%%
 %%GRASS_INST_DIR%%/docs/man/man1/wxGUI.tplot.1.gz
 %%GRASS_INST_DIR%%/docs/man/man1/wxGUI.vdigit.1.gz
 %%GRASS_INST_DIR%%/docs/man/man1/wxGUI.vnet.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/wxGUI_graphical.1.gz
 %%GRASS_INST_DIR%%/docs/man/man1/wxpyimgview.1.gz
 %%GRASS_INST_DIR%%/docs/man/man1/ximgview.1.gz
 %%GRASS_INST_DIR%%/driver/db/dbf
-%%MYSQL%%%%GRASS_INST_DIR%%/driver/db/mysql
 %%GRASS_INST_DIR%%/driver/db/ogr
-%%ODBC%%%%GRASS_INST_DIR%%/driver/db/odbc
-%%PGSQL%%%%GRASS_INST_DIR%%/driver/db/pg
-%%SQLITE%%%%GRASS_INST_DIR%%/driver/db/sqlite
+%%GRASS_INST_DIR%%/etc/VERSIONNUMBER
 %%GRASS_INST_DIR%%/etc/clean_temp
 %%GRASS_INST_DIR%%/etc/colors.desc
 %%GRASS_INST_DIR%%/etc/colors/aspect
@@ -2570,45 +2536,45 @@ bin/grass%%VER%%
 %%GRASS_INST_DIR%%/etc/lister/cell
 %%GRASS_INST_DIR%%/etc/lister/vector
 %%GRASS_INST_DIR%%/etc/lock
+%%GRASS_INST_DIR%%/etc/paint/decorations/NorthArrow1.eps
+%%GRASS_INST_DIR%%/etc/paint/decorations/NorthArrow3.eps
+%%GRASS_INST_DIR%%/etc/paint/decorations/NorthArrow5.eps
 %%GRASS_INST_DIR%%/etc/paint/decorations/compass_exterior.eps
 %%GRASS_INST_DIR%%/etc/paint/decorations/compass_interior.eps
 %%GRASS_INST_DIR%%/etc/paint/decorations/grasslogo.eps
-%%GRASS_INST_DIR%%/etc/paint/decorations/n_arrow1_fancy.eps
 %%GRASS_INST_DIR%%/etc/paint/decorations/n_arrow1.eps
+%%GRASS_INST_DIR%%/etc/paint/decorations/n_arrow1_fancy.eps
 %%GRASS_INST_DIR%%/etc/paint/decorations/n_arrow2.eps
 %%GRASS_INST_DIR%%/etc/paint/decorations/north-arrow_1_simple_half_arrow.eps
-%%GRASS_INST_DIR%%/etc/paint/decorations/NorthArrow1.eps
-%%GRASS_INST_DIR%%/etc/paint/decorations/NorthArrow3.eps
-%%GRASS_INST_DIR%%/etc/paint/decorations/NorthArrow5.eps
 %%GRASS_INST_DIR%%/etc/paint/patterns/brick.eps
 %%GRASS_INST_DIR%%/etc/paint/patterns/cross_diag.eps
 %%GRASS_INST_DIR%%/etc/paint/patterns/cross_diag5.eps
 %%GRASS_INST_DIR%%/etc/paint/patterns/cross_normal.eps
 %%GRASS_INST_DIR%%/etc/paint/patterns/cross_normal5.eps
-%%GRASS_INST_DIR%%/etc/paint/patterns/diag_down_dash.eps
 %%GRASS_INST_DIR%%/etc/paint/patterns/diag_down.eps
 %%GRASS_INST_DIR%%/etc/paint/patterns/diag_down6.eps
-%%GRASS_INST_DIR%%/etc/paint/patterns/diag_up_dash.eps
+%%GRASS_INST_DIR%%/etc/paint/patterns/diag_down_dash.eps
 %%GRASS_INST_DIR%%/etc/paint/patterns/diag_up.eps
 %%GRASS_INST_DIR%%/etc/paint/patterns/diag_up6.eps
-%%GRASS_INST_DIR%%/etc/paint/patterns/horiz_line_dash.eps
+%%GRASS_INST_DIR%%/etc/paint/patterns/diag_up_dash.eps
 %%GRASS_INST_DIR%%/etc/paint/patterns/horiz_line.eps
 %%GRASS_INST_DIR%%/etc/paint/patterns/horiz_line6.eps
+%%GRASS_INST_DIR%%/etc/paint/patterns/horiz_line_dash.eps
 %%GRASS_INST_DIR%%/etc/paint/patterns/horiz_zigzag.eps
 %%GRASS_INST_DIR%%/etc/paint/patterns/polka_dot.eps
 %%GRASS_INST_DIR%%/etc/paint/patterns/railroad_down.eps
 %%GRASS_INST_DIR%%/etc/paint/patterns/railroad_up.eps
-%%GRASS_INST_DIR%%/etc/paint/patterns/vert_line_dash.eps
 %%GRASS_INST_DIR%%/etc/paint/patterns/vert_line.eps
 %%GRASS_INST_DIR%%/etc/paint/patterns/vert_line6.eps
+%%GRASS_INST_DIR%%/etc/paint/patterns/vert_line_dash.eps
 %%GRASS_INST_DIR%%/etc/paint/patterns/vert_zigzag.eps
 %%GRASS_INST_DIR%%/etc/paint/prolog.ps
+%%GRASS_INST_DIR%%/etc/proj/FIPS.code
 %%GRASS_INST_DIR%%/etc/proj/datum.table
 %%GRASS_INST_DIR%%/etc/proj/datumtransform.table
 %%GRASS_INST_DIR%%/etc/proj/desc.table
 %%GRASS_INST_DIR%%/etc/proj/ellipse.table
 %%GRASS_INST_DIR%%/etc/proj/ellipse.table.solar.system
-%%GRASS_INST_DIR%%/etc/proj/FIPS.code
 %%GRASS_INST_DIR%%/etc/proj/parms.table
 %%GRASS_INST_DIR%%/etc/proj/projections
 %%GRASS_INST_DIR%%/etc/proj/state27
@@ -2616,8 +2582,21 @@ bin/grass%%VER%%
 %%GRASS_INST_DIR%%/etc/proj/units.table
 %%GRASS_INST_DIR%%/etc/psdriver.ps
 %%GRASS_INST_DIR%%/etc/python/grass/__init__.py
+%%GRASS_INST_DIR%%/etc/python/grass/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
 %%GRASS_INST_DIR%%/etc/python/grass/exceptions/__init__.py
+%%GRASS_INST_DIR%%/etc/python/grass/exceptions/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
 %%GRASS_INST_DIR%%/etc/python/grass/gunittest/__init__.py
+%%GRASS_INST_DIR%%/etc/python/grass/gunittest/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/gunittest/__pycache__/case.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/gunittest/__pycache__/checkers.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/gunittest/__pycache__/gmodules.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/gunittest/__pycache__/gutils.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/gunittest/__pycache__/invoker.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/gunittest/__pycache__/loader.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/gunittest/__pycache__/main.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/gunittest/__pycache__/reporters.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/gunittest/__pycache__/runner.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/gunittest/__pycache__/utils.cpython-%%PYTHON_SUFFIX%%.pyc
 %%GRASS_INST_DIR%%/etc/python/grass/gunittest/case.py
 %%GRASS_INST_DIR%%/etc/python/grass/gunittest/checkers.py
 %%GRASS_INST_DIR%%/etc/python/grass/gunittest/gmodules.py
@@ -2629,12 +2608,41 @@ bin/grass%%VER%%
 %%GRASS_INST_DIR%%/etc/python/grass/gunittest/runner.py
 %%GRASS_INST_DIR%%/etc/python/grass/gunittest/utils.py
 %%GRASS_INST_DIR%%/etc/python/grass/imaging/__init__.py
+%%GRASS_INST_DIR%%/etc/python/grass/imaging/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/imaging/__pycache__/images2avi.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/imaging/__pycache__/images2gif.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/imaging/__pycache__/images2ims.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/imaging/__pycache__/images2swf.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/imaging/__pycache__/operations.cpython-%%PYTHON_SUFFIX%%.pyc
 %%GRASS_INST_DIR%%/etc/python/grass/imaging/images2avi.py
 %%GRASS_INST_DIR%%/etc/python/grass/imaging/images2gif.py
 %%GRASS_INST_DIR%%/etc/python/grass/imaging/images2ims.py
 %%GRASS_INST_DIR%%/etc/python/grass/imaging/images2swf.py
 %%GRASS_INST_DIR%%/etc/python/grass/imaging/operations.py
 %%GRASS_INST_DIR%%/etc/python/grass/lib/__init__.py
+%%GRASS_INST_DIR%%/etc/python/grass/lib/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/lib/__pycache__/arraystats.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/lib/__pycache__/cluster.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/lib/__pycache__/ctypes_loader.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/lib/__pycache__/ctypes_preamble.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/lib/__pycache__/date.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/lib/__pycache__/dbmi.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/lib/__pycache__/display.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/lib/__pycache__/gis.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/lib/__pycache__/gmath.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/lib/__pycache__/imagery.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/lib/__pycache__/nviz.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/lib/__pycache__/ogsf.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/lib/__pycache__/proj.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/lib/__pycache__/raster.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/lib/__pycache__/raster3d.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/lib/__pycache__/rowio.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/lib/__pycache__/rtree.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/lib/__pycache__/segment.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/lib/__pycache__/stats.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/lib/__pycache__/temporal.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/lib/__pycache__/vector.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/lib/__pycache__/vedit.cpython-%%PYTHON_SUFFIX%%.pyc
 %%GRASS_INST_DIR%%/etc/python/grass/lib/arraystats.py
 %%GRASS_INST_DIR%%/etc/python/grass/lib/cluster.py
 %%GRASS_INST_DIR%%/etc/python/grass/lib/ctypes_loader.py
@@ -2658,6 +2666,13 @@ bin/grass%%VER%%
 %%GRASS_INST_DIR%%/etc/python/grass/lib/vector.py
 %%GRASS_INST_DIR%%/etc/python/grass/lib/vedit.py
 %%GRASS_INST_DIR%%/etc/python/grass/pydispatch/__init__.py
+%%GRASS_INST_DIR%%/etc/python/grass/pydispatch/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/pydispatch/__pycache__/dispatcher.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/pydispatch/__pycache__/errors.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/pydispatch/__pycache__/robust.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/pydispatch/__pycache__/robustapply.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/pydispatch/__pycache__/saferef.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/pydispatch/__pycache__/signal.cpython-%%PYTHON_SUFFIX%%.pyc
 %%GRASS_INST_DIR%%/etc/python/grass/pydispatch/dispatcher.py
 %%GRASS_INST_DIR%%/etc/python/grass/pydispatch/errors.py
 %%GRASS_INST_DIR%%/etc/python/grass/pydispatch/robust.py
@@ -2665,16 +2680,37 @@ bin/grass%%VER%%
 %%GRASS_INST_DIR%%/etc/python/grass/pydispatch/saferef.py
 %%GRASS_INST_DIR%%/etc/python/grass/pydispatch/signal.py
 %%GRASS_INST_DIR%%/etc/python/grass/pygrass/__init__.py
+%%GRASS_INST_DIR%%/etc/python/grass/pygrass/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/pygrass/__pycache__/errors.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/pygrass/__pycache__/orderdict.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/pygrass/__pycache__/utils.cpython-%%PYTHON_SUFFIX%%.pyc
 %%GRASS_INST_DIR%%/etc/python/grass/pygrass/errors.py
 %%GRASS_INST_DIR%%/etc/python/grass/pygrass/gis/__init__.py
+%%GRASS_INST_DIR%%/etc/python/grass/pygrass/gis/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/pygrass/gis/__pycache__/region.cpython-%%PYTHON_SUFFIX%%.pyc
 %%GRASS_INST_DIR%%/etc/python/grass/pygrass/gis/region.py
 %%GRASS_INST_DIR%%/etc/python/grass/pygrass/messages/__init__.py
+%%GRASS_INST_DIR%%/etc/python/grass/pygrass/messages/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
 %%GRASS_INST_DIR%%/etc/python/grass/pygrass/modules/__init__.py
+%%GRASS_INST_DIR%%/etc/python/grass/pygrass/modules/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/pygrass/modules/__pycache__/shortcuts.cpython-%%PYTHON_SUFFIX%%.pyc
 %%GRASS_INST_DIR%%/etc/python/grass/pygrass/modules/grid/__init__.py
+%%GRASS_INST_DIR%%/etc/python/grass/pygrass/modules/grid/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/pygrass/modules/grid/__pycache__/grid.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/pygrass/modules/grid/__pycache__/patch.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/pygrass/modules/grid/__pycache__/split.cpython-%%PYTHON_SUFFIX%%.pyc
 %%GRASS_INST_DIR%%/etc/python/grass/pygrass/modules/grid/grid.py
 %%GRASS_INST_DIR%%/etc/python/grass/pygrass/modules/grid/patch.py
 %%GRASS_INST_DIR%%/etc/python/grass/pygrass/modules/grid/split.py
 %%GRASS_INST_DIR%%/etc/python/grass/pygrass/modules/interface/__init__.py
+%%GRASS_INST_DIR%%/etc/python/grass/pygrass/modules/interface/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/pygrass/modules/interface/__pycache__/docstring.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/pygrass/modules/interface/__pycache__/env.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/pygrass/modules/interface/__pycache__/flag.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/pygrass/modules/interface/__pycache__/module.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/pygrass/modules/interface/__pycache__/parameter.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/pygrass/modules/interface/__pycache__/read.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/pygrass/modules/interface/__pycache__/typedict.cpython-%%PYTHON_SUFFIX%%.pyc
 %%GRASS_INST_DIR%%/etc/python/grass/pygrass/modules/interface/docstring.py
 %%GRASS_INST_DIR%%/etc/python/grass/pygrass/modules/interface/env.py
 %%GRASS_INST_DIR%%/etc/python/grass/pygrass/modules/interface/flag.py
@@ -2685,6 +2721,14 @@ bin/grass%%VER%%
 %%GRASS_INST_DIR%%/etc/python/grass/pygrass/modules/shortcuts.py
 %%GRASS_INST_DIR%%/etc/python/grass/pygrass/orderdict.py
 %%GRASS_INST_DIR%%/etc/python/grass/pygrass/raster/__init__.py
+%%GRASS_INST_DIR%%/etc/python/grass/pygrass/raster/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/pygrass/raster/__pycache__/abstract.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/pygrass/raster/__pycache__/buffer.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/pygrass/raster/__pycache__/category.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/pygrass/raster/__pycache__/history.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/pygrass/raster/__pycache__/raster_type.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/pygrass/raster/__pycache__/rowio.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/pygrass/raster/__pycache__/segment.cpython-%%PYTHON_SUFFIX%%.pyc
 %%GRASS_INST_DIR%%/etc/python/grass/pygrass/raster/abstract.py
 %%GRASS_INST_DIR%%/etc/python/grass/pygrass/raster/buffer.py
 %%GRASS_INST_DIR%%/etc/python/grass/pygrass/raster/category.py
@@ -2693,15 +2737,31 @@ bin/grass%%VER%%
 %%GRASS_INST_DIR%%/etc/python/grass/pygrass/raster/rowio.py
 %%GRASS_INST_DIR%%/etc/python/grass/pygrass/raster/segment.py
 %%GRASS_INST_DIR%%/etc/python/grass/pygrass/rpc/__init__.py
+%%GRASS_INST_DIR%%/etc/python/grass/pygrass/rpc/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/pygrass/rpc/__pycache__/base.cpython-%%PYTHON_SUFFIX%%.pyc
 %%GRASS_INST_DIR%%/etc/python/grass/pygrass/rpc/base.py
 %%GRASS_INST_DIR%%/etc/python/grass/pygrass/shell/__init__.py
+%%GRASS_INST_DIR%%/etc/python/grass/pygrass/shell/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/pygrass/shell/__pycache__/conversion.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/pygrass/shell/__pycache__/show.cpython-%%PYTHON_SUFFIX%%.pyc
 %%GRASS_INST_DIR%%/etc/python/grass/pygrass/shell/conversion.py
 %%GRASS_INST_DIR%%/etc/python/grass/pygrass/shell/show.py
 %%GRASS_INST_DIR%%/etc/python/grass/pygrass/tests/__init__.py
+%%GRASS_INST_DIR%%/etc/python/grass/pygrass/tests/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/pygrass/tests/__pycache__/benchmark.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/pygrass/tests/__pycache__/set_mapset.cpython-%%PYTHON_SUFFIX%%.pyc
 %%GRASS_INST_DIR%%/etc/python/grass/pygrass/tests/benchmark.py
 %%GRASS_INST_DIR%%/etc/python/grass/pygrass/tests/set_mapset.py
 %%GRASS_INST_DIR%%/etc/python/grass/pygrass/utils.py
 %%GRASS_INST_DIR%%/etc/python/grass/pygrass/vector/__init__.py
+%%GRASS_INST_DIR%%/etc/python/grass/pygrass/vector/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/pygrass/vector/__pycache__/abstract.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/pygrass/vector/__pycache__/basic.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/pygrass/vector/__pycache__/find.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/pygrass/vector/__pycache__/geometry.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/pygrass/vector/__pycache__/sql.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/pygrass/vector/__pycache__/table.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/pygrass/vector/__pycache__/vector_type.cpython-%%PYTHON_SUFFIX%%.pyc
 %%GRASS_INST_DIR%%/etc/python/grass/pygrass/vector/abstract.py
 %%GRASS_INST_DIR%%/etc/python/grass/pygrass/vector/basic.py
 %%GRASS_INST_DIR%%/etc/python/grass/pygrass/vector/find.py
@@ -2710,6 +2770,16 @@ bin/grass%%VER%%
 %%GRASS_INST_DIR%%/etc/python/grass/pygrass/vector/table.py
 %%GRASS_INST_DIR%%/etc/python/grass/pygrass/vector/vector_type.py
 %%GRASS_INST_DIR%%/etc/python/grass/script/__init__.py
+%%GRASS_INST_DIR%%/etc/python/grass/script/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/script/__pycache__/array.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/script/__pycache__/core.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/script/__pycache__/db.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/script/__pycache__/raster.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/script/__pycache__/raster3d.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/script/__pycache__/setup.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/script/__pycache__/task.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/script/__pycache__/utils.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/script/__pycache__/vector.cpython-%%PYTHON_SUFFIX%%.pyc
 %%GRASS_INST_DIR%%/etc/python/grass/script/array.py
 %%GRASS_INST_DIR%%/etc/python/grass/script/core.py
 %%GRASS_INST_DIR%%/etc/python/grass/script/db.py
@@ -2720,6 +2790,41 @@ bin/grass%%VER%%
 %%GRASS_INST_DIR%%/etc/python/grass/script/utils.py
 %%GRASS_INST_DIR%%/etc/python/grass/script/vector.py
 %%GRASS_INST_DIR%%/etc/python/grass/temporal/__init__.py
+%%GRASS_INST_DIR%%/etc/python/grass/temporal/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/temporal/__pycache__/abstract_dataset.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/temporal/__pycache__/abstract_map_dataset.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/temporal/__pycache__/abstract_space_time_dataset.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/temporal/__pycache__/aggregation.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/temporal/__pycache__/base.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/temporal/__pycache__/c_libraries_interface.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/temporal/__pycache__/core.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/temporal/__pycache__/datetime_math.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/temporal/__pycache__/extract.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/temporal/__pycache__/factory.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/temporal/__pycache__/gui_support.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/temporal/__pycache__/list_stds.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/temporal/__pycache__/mapcalc.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/temporal/__pycache__/metadata.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/temporal/__pycache__/open_stds.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/temporal/__pycache__/register.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/temporal/__pycache__/sampling.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/temporal/__pycache__/space_time_datasets.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/temporal/__pycache__/spatial_extent.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/temporal/__pycache__/spatial_topology_dataset_connector.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/temporal/__pycache__/spatio_temporal_relationships.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/temporal/__pycache__/stds_export.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/temporal/__pycache__/stds_import.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/temporal/__pycache__/temporal_algebra.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/temporal/__pycache__/temporal_extent.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/temporal/__pycache__/temporal_granularity.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/temporal/__pycache__/temporal_operator.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/temporal/__pycache__/temporal_raster3d_algebra.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/temporal/__pycache__/temporal_raster_algebra.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/temporal/__pycache__/temporal_raster_base_algebra.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/temporal/__pycache__/temporal_topology_dataset_connector.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/temporal/__pycache__/temporal_vector_algebra.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/temporal/__pycache__/unit_tests.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/temporal/__pycache__/univar_statistics.cpython-%%PYTHON_SUFFIX%%.pyc
 %%GRASS_INST_DIR%%/etc/python/grass/temporal/abstract_dataset.py
 %%GRASS_INST_DIR%%/etc/python/grass/temporal/abstract_map_dataset.py
 %%GRASS_INST_DIR%%/etc/python/grass/temporal/abstract_space_time_dataset.py
@@ -2747,13 +2852,18 @@ bin/grass%%VER%%
 %%GRASS_INST_DIR%%/etc/python/grass/temporal/temporal_extent.py
 %%GRASS_INST_DIR%%/etc/python/grass/temporal/temporal_granularity.py
 %%GRASS_INST_DIR%%/etc/python/grass/temporal/temporal_operator.py
+%%GRASS_INST_DIR%%/etc/python/grass/temporal/temporal_raster3d_algebra.py
 %%GRASS_INST_DIR%%/etc/python/grass/temporal/temporal_raster_algebra.py
 %%GRASS_INST_DIR%%/etc/python/grass/temporal/temporal_raster_base_algebra.py
-%%GRASS_INST_DIR%%/etc/python/grass/temporal/temporal_raster3d_algebra.py
 %%GRASS_INST_DIR%%/etc/python/grass/temporal/temporal_topology_dataset_connector.py
 %%GRASS_INST_DIR%%/etc/python/grass/temporal/temporal_vector_algebra.py
 %%GRASS_INST_DIR%%/etc/python/grass/temporal/unit_tests.py
 %%GRASS_INST_DIR%%/etc/python/grass/temporal/univar_statistics.py
+%%GRASS_INST_DIR%%/etc/r.in.wms/__pycache__/srs.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/r.in.wms/__pycache__/wms_base.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/r.in.wms/__pycache__/wms_cap_parsers.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/r.in.wms/__pycache__/wms_drv.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/r.in.wms/__pycache__/wms_gdal_drv.cpython-%%PYTHON_SUFFIX%%.pyc
 %%GRASS_INST_DIR%%/etc/r.in.wms/srs.py
 %%GRASS_INST_DIR%%/etc/r.in.wms/wms_base.py
 %%GRASS_INST_DIR%%/etc/r.in.wms/wms_cap_parsers.py
@@ -2763,13 +2873,15 @@ bin/grass%%VER%%
 %%GRASS_INST_DIR%%/etc/r.watershed/seg
 %%GRASS_INST_DIR%%/etc/renamed_options
 %%GRASS_INST_DIR%%/etc/run
+%%GRASS_INST_DIR%%/etc/sql/downgrade_db_3_to_2.sql
+%%GRASS_INST_DIR%%/etc/sql/drop_views.sql
 %%GRASS_INST_DIR%%/etc/sql/map_tables_template.sql
 %%GRASS_INST_DIR%%/etc/sql/postgresql_delete_trigger.sql
 %%GRASS_INST_DIR%%/etc/sql/postgresql_indexes.sql
-%%GRASS_INST_DIR%%/etc/sql/raster_metadata_table.sql
-%%GRASS_INST_DIR%%/etc/sql/raster_views.sql
 %%GRASS_INST_DIR%%/etc/sql/raster3d_metadata_table.sql
 %%GRASS_INST_DIR%%/etc/sql/raster3d_views.sql
+%%GRASS_INST_DIR%%/etc/sql/raster_metadata_table.sql
+%%GRASS_INST_DIR%%/etc/sql/raster_views.sql
 %%GRASS_INST_DIR%%/etc/sql/sqlite3_delete_trigger.sql
 %%GRASS_INST_DIR%%/etc/sql/sqlite3_indexes.sql
 %%GRASS_INST_DIR%%/etc/sql/stds_map_register_table_template.sql
@@ -2856,7 +2968,6 @@ bin/grass%%VER%%
 %%GRASS_INST_DIR%%/etc/symbol/n_arrows/n_arrow8a
 %%GRASS_INST_DIR%%/etc/symbol/n_arrows/n_arrow8b
 %%GRASS_INST_DIR%%/etc/symbol/n_arrows/n_arrow9
-%%GRASS_INST_DIR%%/etc/VERSIONNUMBER
 %%GRASS_INST_DIR%%/etc/wxpyimgview_gui.py
 %%GRASS_INST_DIR%%/fonts/cyrilc.hmp
 %%GRASS_INST_DIR%%/fonts/fonts.table
@@ -2881,7 +2992,6 @@ bin/grass%%VER%%
 %%GRASS_INST_DIR%%/fonts/romant.hmp
 %%GRASS_INST_DIR%%/fonts/scriptc.hmp
 %%GRASS_INST_DIR%%/fonts/scripts.hmp
-%%GRASS_INST_DIR%%/GPL.TXT
 %%GRASS_INST_DIR%%/gui/icons/flags/af.png
 %%GRASS_INST_DIR%%/gui/icons/flags/am.png
 %%GRASS_INST_DIR%%/gui/icons/flags/ar.png
@@ -2913,8 +3023,8 @@ bin/grass%%VER%%
 %%GRASS_INST_DIR%%/gui/icons/flags/nl.png
 %%GRASS_INST_DIR%%/gui/icons/flags/no.png
 %%GRASS_INST_DIR%%/gui/icons/flags/pl.png
-%%GRASS_INST_DIR%%/gui/icons/flags/pt_br.png
 %%GRASS_INST_DIR%%/gui/icons/flags/pt.png
+%%GRASS_INST_DIR%%/gui/icons/flags/pt_br.png
 %%GRASS_INST_DIR%%/gui/icons/flags/ro.png
 %%GRASS_INST_DIR%%/gui/icons/flags/ru.png
 %%GRASS_INST_DIR%%/gui/icons/flags/sk.png
@@ -2928,16 +3038,8 @@ bin/grass%%VER%%
 %%GRASS_INST_DIR%%/gui/icons/flags/uk.png
 %%GRASS_INST_DIR%%/gui/icons/flags/vi.png
 %%GRASS_INST_DIR%%/gui/icons/flags/xh.png
-%%GRASS_INST_DIR%%/gui/icons/flags/zh_tw.png
 %%GRASS_INST_DIR%%/gui/icons/flags/zh.png
-%%GRASS_INST_DIR%%/gui/icons/grass_cmd.ico
-%%GRASS_INST_DIR%%/gui/icons/grass_dialog.ico
-%%GRASS_INST_DIR%%/gui/icons/grass_map.ico
-%%GRASS_INST_DIR%%/gui/icons/grass_msys.ico
-%%GRASS_INST_DIR%%/gui/icons/grass_nviz.ico
-%%GRASS_INST_DIR%%/gui/icons/grass_osgeo.ico
-%%GRASS_INST_DIR%%/gui/icons/grass_sql.ico
-%%GRASS_INST_DIR%%/gui/icons/grass_web.ico
+%%GRASS_INST_DIR%%/gui/icons/flags/zh_tw.png
 %%GRASS_INST_DIR%%/gui/icons/grass-128x128.png
 %%GRASS_INST_DIR%%/gui/icons/grass-16x16.png
 %%GRASS_INST_DIR%%/gui/icons/grass-192x192.png
@@ -3105,6 +3207,14 @@ bin/grass%%VER%%
 %%GRASS_INST_DIR%%/gui/icons/grass/zoom-more.png
 %%GRASS_INST_DIR%%/gui/icons/grass/zoom-out.png
 %%GRASS_INST_DIR%%/gui/icons/grass/zoom-region.png
+%%GRASS_INST_DIR%%/gui/icons/grass_cmd.ico
+%%GRASS_INST_DIR%%/gui/icons/grass_dialog.ico
+%%GRASS_INST_DIR%%/gui/icons/grass_map.ico
+%%GRASS_INST_DIR%%/gui/icons/grass_msys.ico
+%%GRASS_INST_DIR%%/gui/icons/grass_nviz.ico
+%%GRASS_INST_DIR%%/gui/icons/grass_osgeo.ico
+%%GRASS_INST_DIR%%/gui/icons/grass_sql.ico
+%%GRASS_INST_DIR%%/gui/icons/grass_web.ico
 %%GRASS_INST_DIR%%/gui/icons/wingrass.ico
 %%GRASS_INST_DIR%%/gui/images/grass_form.png
 %%GRASS_INST_DIR%%/gui/images/grass_world3-nq8.png
@@ -3115,8 +3225,8 @@ bin/grass%%VER%%
 %%GRASS_INST_DIR%%/gui/images/small_down_arrow.png
 %%GRASS_INST_DIR%%/gui/images/small_up_arrow.png
 %%GRASS_INST_DIR%%/gui/images/splash_screen.png
-%%GRASS_INST_DIR%%/gui/images/startup_banner_isis.png
 %%GRASS_INST_DIR%%/gui/images/startup_banner.png
+%%GRASS_INST_DIR%%/gui/images/startup_banner_isis.png
 %%GRASS_INST_DIR%%/gui/images/symbols/basic/arrow.png
 %%GRASS_INST_DIR%%/gui/images/symbols/basic/arrow1.png
 %%GRASS_INST_DIR%%/gui/images/symbols/basic/arrow2.png
@@ -3130,8 +3240,8 @@ bin/grass%%VER%%
 %%GRASS_INST_DIR%%/gui/images/symbols/basic/hexagon.png
 %%GRASS_INST_DIR%%/gui/images/symbols/basic/marker.png
 %%GRASS_INST_DIR%%/gui/images/symbols/basic/octagon.png
-%%GRASS_INST_DIR%%/gui/images/symbols/basic/pin_dot.png
 %%GRASS_INST_DIR%%/gui/images/symbols/basic/pin.png
+%%GRASS_INST_DIR%%/gui/images/symbols/basic/pin_dot.png
 %%GRASS_INST_DIR%%/gui/images/symbols/basic/point.png
 %%GRASS_INST_DIR%%/gui/images/symbols/basic/pushpin.png
 %%GRASS_INST_DIR%%/gui/images/symbols/basic/star.png
@@ -3169,10 +3279,10 @@ bin/grass%%VER%%
 %%GRASS_INST_DIR%%/gui/images/symbols/geology/strike_line.png
 %%GRASS_INST_DIR%%/gui/images/symbols/geology/strike_parallel.png
 %%GRASS_INST_DIR%%/gui/images/symbols/geology/strike_triangle.png
-%%GRASS_INST_DIR%%/gui/images/symbols/legend/area_curved.png
 %%GRASS_INST_DIR%%/gui/images/symbols/legend/area.png
-%%GRASS_INST_DIR%%/gui/images/symbols/legend/line_crooked.png
+%%GRASS_INST_DIR%%/gui/images/symbols/legend/area_curved.png
 %%GRASS_INST_DIR%%/gui/images/symbols/legend/line.png
+%%GRASS_INST_DIR%%/gui/images/symbols/legend/line_crooked.png
 %%GRASS_INST_DIR%%/gui/images/symbols/n_arrows/basic_compass.png
 %%GRASS_INST_DIR%%/gui/images/symbols/n_arrows/fancy_compass.png
 %%GRASS_INST_DIR%%/gui/images/symbols/n_arrows/n_arrow1a.png
@@ -3189,7 +3299,24 @@ bin/grass%%VER%%
 %%GRASS_INST_DIR%%/gui/images/symbols/n_arrows/n_arrow9.png
 %%GRASS_INST_DIR%%/gui/scripts/d.rast3d
 %%GRASS_INST_DIR%%/gui/scripts/d.wms
+%%GRASS_INST_DIR%%/gui/wxpython/README
+%%GRASS_INST_DIR%%/gui/wxpython/__pycache__/gis_set.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/__pycache__/gis_set_error.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/__pycache__/wxgui.cpython-%%PYTHON_SUFFIX%%.pyc
 %%GRASS_INST_DIR%%/gui/wxpython/animation/__init__.py
+%%GRASS_INST_DIR%%/gui/wxpython/animation/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/animation/__pycache__/anim.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/animation/__pycache__/controller.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/animation/__pycache__/data.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/animation/__pycache__/dialogs.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/animation/__pycache__/frame.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/animation/__pycache__/g.gui.animation.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/animation/__pycache__/mapwindow.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/animation/__pycache__/nviztask.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/animation/__pycache__/provider.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/animation/__pycache__/temporal_manager.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/animation/__pycache__/toolbars.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/animation/__pycache__/utils.cpython-%%PYTHON_SUFFIX%%.pyc
 %%GRASS_INST_DIR%%/gui/wxpython/animation/anim.py
 %%GRASS_INST_DIR%%/gui/wxpython/animation/controller.py
 %%GRASS_INST_DIR%%/gui/wxpython/animation/data.py
@@ -3203,6 +3330,23 @@ bin/grass%%VER%%
 %%GRASS_INST_DIR%%/gui/wxpython/animation/toolbars.py
 %%GRASS_INST_DIR%%/gui/wxpython/animation/utils.py
 %%GRASS_INST_DIR%%/gui/wxpython/core/__init__.py
+%%GRASS_INST_DIR%%/gui/wxpython/core/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/core/__pycache__/debug.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/core/__pycache__/gcmd.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/core/__pycache__/gconsole.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/core/__pycache__/giface.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/core/__pycache__/globalvar.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/core/__pycache__/gthread.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/core/__pycache__/layerlist.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/core/__pycache__/menutree.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/core/__pycache__/render.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/core/__pycache__/settings.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/core/__pycache__/toolboxes.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/core/__pycache__/treemodel.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/core/__pycache__/units.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/core/__pycache__/utils.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/core/__pycache__/workspace.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/core/__pycache__/ws.cpython-%%PYTHON_SUFFIX%%.pyc
 %%GRASS_INST_DIR%%/gui/wxpython/core/debug.py
 %%GRASS_INST_DIR%%/gui/wxpython/core/gcmd.py
 %%GRASS_INST_DIR%%/gui/wxpython/core/gconsole.py
@@ -3220,6 +3364,13 @@ bin/grass%%VER%%
 %%GRASS_INST_DIR%%/gui/wxpython/core/workspace.py
 %%GRASS_INST_DIR%%/gui/wxpython/core/ws.py
 %%GRASS_INST_DIR%%/gui/wxpython/datacatalog/__init__.py
+%%GRASS_INST_DIR%%/gui/wxpython/datacatalog/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/datacatalog/__pycache__/catalog.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/datacatalog/__pycache__/dialogs.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/datacatalog/__pycache__/frame.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/datacatalog/__pycache__/g.gui.datacatalog.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/datacatalog/__pycache__/toolbars.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/datacatalog/__pycache__/tree.cpython-%%PYTHON_SUFFIX%%.pyc
 %%GRASS_INST_DIR%%/gui/wxpython/datacatalog/catalog.py
 %%GRASS_INST_DIR%%/gui/wxpython/datacatalog/dialogs.py
 %%GRASS_INST_DIR%%/gui/wxpython/datacatalog/frame.py
@@ -3227,6 +3378,13 @@ bin/grass%%VER%%
 %%GRASS_INST_DIR%%/gui/wxpython/datacatalog/toolbars.py
 %%GRASS_INST_DIR%%/gui/wxpython/datacatalog/tree.py
 %%GRASS_INST_DIR%%/gui/wxpython/dbmgr/__init__.py
+%%GRASS_INST_DIR%%/gui/wxpython/dbmgr/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/dbmgr/__pycache__/base.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/dbmgr/__pycache__/dialogs.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/dbmgr/__pycache__/g.gui.dbmgr.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/dbmgr/__pycache__/manager.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/dbmgr/__pycache__/sqlbuilder.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/dbmgr/__pycache__/vinfo.cpython-%%PYTHON_SUFFIX%%.pyc
 %%GRASS_INST_DIR%%/gui/wxpython/dbmgr/base.py
 %%GRASS_INST_DIR%%/gui/wxpython/dbmgr/dialogs.py
 %%GRASS_INST_DIR%%/gui/wxpython/dbmgr/g.gui.dbmgr.py
@@ -3234,14 +3392,29 @@ bin/grass%%VER%%
 %%GRASS_INST_DIR%%/gui/wxpython/dbmgr/sqlbuilder.py
 %%GRASS_INST_DIR%%/gui/wxpython/dbmgr/vinfo.py
 %%GRASS_INST_DIR%%/gui/wxpython/gcp/__init__.py
+%%GRASS_INST_DIR%%/gui/wxpython/gcp/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/gcp/__pycache__/g.gui.gcp.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/gcp/__pycache__/manager.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/gcp/__pycache__/mapdisplay.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/gcp/__pycache__/statusbar.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/gcp/__pycache__/toolbars.cpython-%%PYTHON_SUFFIX%%.pyc
 %%GRASS_INST_DIR%%/gui/wxpython/gcp/g.gui.gcp.py
 %%GRASS_INST_DIR%%/gui/wxpython/gcp/manager.py
 %%GRASS_INST_DIR%%/gui/wxpython/gcp/mapdisplay.py
 %%GRASS_INST_DIR%%/gui/wxpython/gcp/statusbar.py
 %%GRASS_INST_DIR%%/gui/wxpython/gcp/toolbars.py
-%%GRASS_INST_DIR%%/gui/wxpython/gis_set_error.py
 %%GRASS_INST_DIR%%/gui/wxpython/gis_set.py
+%%GRASS_INST_DIR%%/gui/wxpython/gis_set_error.py
 %%GRASS_INST_DIR%%/gui/wxpython/gmodeler/__init__.py
+%%GRASS_INST_DIR%%/gui/wxpython/gmodeler/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/gmodeler/__pycache__/dialogs.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/gmodeler/__pycache__/frame.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/gmodeler/__pycache__/g.gui.gmodeler.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/gmodeler/__pycache__/giface.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/gmodeler/__pycache__/menudata.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/gmodeler/__pycache__/model.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/gmodeler/__pycache__/preferences.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/gmodeler/__pycache__/toolbars.cpython-%%PYTHON_SUFFIX%%.pyc
 %%GRASS_INST_DIR%%/gui/wxpython/gmodeler/dialogs.py
 %%GRASS_INST_DIR%%/gui/wxpython/gmodeler/frame.py
 %%GRASS_INST_DIR%%/gui/wxpython/gmodeler/g.gui.gmodeler.py
@@ -3251,6 +3424,25 @@ bin/grass%%VER%%
 %%GRASS_INST_DIR%%/gui/wxpython/gmodeler/preferences.py
 %%GRASS_INST_DIR%%/gui/wxpython/gmodeler/toolbars.py
 %%GRASS_INST_DIR%%/gui/wxpython/gui_core/__init__.py
+%%GRASS_INST_DIR%%/gui/wxpython/gui_core/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/gui_core/__pycache__/dialogs.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/gui_core/__pycache__/forms.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/gui_core/__pycache__/ghelp.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/gui_core/__pycache__/goutput.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/gui_core/__pycache__/gselect.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/gui_core/__pycache__/mapdisp.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/gui_core/__pycache__/menu.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/gui_core/__pycache__/preferences.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/gui_core/__pycache__/prompt.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/gui_core/__pycache__/pyedit.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/gui_core/__pycache__/pystc.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/gui_core/__pycache__/query.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/gui_core/__pycache__/simplelmgr.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/gui_core/__pycache__/toolbars.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/gui_core/__pycache__/treeview.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/gui_core/__pycache__/vselect.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/gui_core/__pycache__/widgets.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/gui_core/__pycache__/wrap.cpython-%%PYTHON_SUFFIX%%.pyc
 %%GRASS_INST_DIR%%/gui/wxpython/gui_core/dialogs.py
 %%GRASS_INST_DIR%%/gui/wxpython/gui_core/forms.py
 %%GRASS_INST_DIR%%/gui/wxpython/gui_core/ghelp.py
@@ -3270,6 +3462,14 @@ bin/grass%%VER%%
 %%GRASS_INST_DIR%%/gui/wxpython/gui_core/widgets.py
 %%GRASS_INST_DIR%%/gui/wxpython/gui_core/wrap.py
 %%GRASS_INST_DIR%%/gui/wxpython/iclass/__init__.py
+%%GRASS_INST_DIR%%/gui/wxpython/iclass/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/iclass/__pycache__/dialogs.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/iclass/__pycache__/digit.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/iclass/__pycache__/frame.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/iclass/__pycache__/g.gui.iclass.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/iclass/__pycache__/plots.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/iclass/__pycache__/statistics.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/iclass/__pycache__/toolbars.cpython-%%PYTHON_SUFFIX%%.pyc
 %%GRASS_INST_DIR%%/gui/wxpython/iclass/dialogs.py
 %%GRASS_INST_DIR%%/gui/wxpython/iclass/digit.py
 %%GRASS_INST_DIR%%/gui/wxpython/iclass/frame.py
@@ -3278,18 +3478,39 @@ bin/grass%%VER%%
 %%GRASS_INST_DIR%%/gui/wxpython/iclass/statistics.py
 %%GRASS_INST_DIR%%/gui/wxpython/iclass/toolbars.py
 %%GRASS_INST_DIR%%/gui/wxpython/icons/__init__.py
+%%GRASS_INST_DIR%%/gui/wxpython/icons/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/icons/__pycache__/grass_icons.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/icons/__pycache__/icon.cpython-%%PYTHON_SUFFIX%%.pyc
 %%GRASS_INST_DIR%%/gui/wxpython/icons/grass_icons.py
 %%GRASS_INST_DIR%%/gui/wxpython/icons/icon.py
 %%GRASS_INST_DIR%%/gui/wxpython/image2target/__init__.py
+%%GRASS_INST_DIR%%/gui/wxpython/image2target/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/image2target/__pycache__/g.gui.image2target.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/image2target/__pycache__/ii2t_gis_set.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/image2target/__pycache__/ii2t_gis_set_error.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/image2target/__pycache__/ii2t_manager.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/image2target/__pycache__/ii2t_mapdisplay.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/image2target/__pycache__/ii2t_menustrings.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/image2target/__pycache__/ii2t_statusbar.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/image2target/__pycache__/ii2t_toolbars.cpython-%%PYTHON_SUFFIX%%.pyc
 %%GRASS_INST_DIR%%/gui/wxpython/image2target/g.gui.image2target.py
-%%GRASS_INST_DIR%%/gui/wxpython/image2target/ii2t_gis_set_error.py
 %%GRASS_INST_DIR%%/gui/wxpython/image2target/ii2t_gis_set.py
+%%GRASS_INST_DIR%%/gui/wxpython/image2target/ii2t_gis_set_error.py
 %%GRASS_INST_DIR%%/gui/wxpython/image2target/ii2t_manager.py
 %%GRASS_INST_DIR%%/gui/wxpython/image2target/ii2t_mapdisplay.py
 %%GRASS_INST_DIR%%/gui/wxpython/image2target/ii2t_menustrings.py
 %%GRASS_INST_DIR%%/gui/wxpython/image2target/ii2t_statusbar.py
 %%GRASS_INST_DIR%%/gui/wxpython/image2target/ii2t_toolbars.py
 %%GRASS_INST_DIR%%/gui/wxpython/iscatt/__init__.py
+%%GRASS_INST_DIR%%/gui/wxpython/iscatt/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/iscatt/__pycache__/controllers.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/iscatt/__pycache__/core_c.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/iscatt/__pycache__/dialogs.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/iscatt/__pycache__/frame.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/iscatt/__pycache__/iscatt_core.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/iscatt/__pycache__/plots.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/iscatt/__pycache__/toolbars.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/iscatt/__pycache__/utils.cpython-%%PYTHON_SUFFIX%%.pyc
 %%GRASS_INST_DIR%%/gui/wxpython/iscatt/controllers.py
 %%GRASS_INST_DIR%%/gui/wxpython/iscatt/core_c.py
 %%GRASS_INST_DIR%%/gui/wxpython/iscatt/dialogs.py
@@ -3299,6 +3520,13 @@ bin/grass%%VER%%
 %%GRASS_INST_DIR%%/gui/wxpython/iscatt/toolbars.py
 %%GRASS_INST_DIR%%/gui/wxpython/iscatt/utils.py
 %%GRASS_INST_DIR%%/gui/wxpython/lmgr/__init__.py
+%%GRASS_INST_DIR%%/gui/wxpython/lmgr/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/lmgr/__pycache__/frame.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/lmgr/__pycache__/giface.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/lmgr/__pycache__/layertree.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/lmgr/__pycache__/menudata.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/lmgr/__pycache__/pyshell.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/lmgr/__pycache__/toolbars.cpython-%%PYTHON_SUFFIX%%.pyc
 %%GRASS_INST_DIR%%/gui/wxpython/lmgr/frame.py
 %%GRASS_INST_DIR%%/gui/wxpython/lmgr/giface.py
 %%GRASS_INST_DIR%%/gui/wxpython/lmgr/layertree.py
@@ -3306,10 +3534,21 @@ bin/grass%%VER%%
 %%GRASS_INST_DIR%%/gui/wxpython/lmgr/pyshell.py
 %%GRASS_INST_DIR%%/gui/wxpython/lmgr/toolbars.py
 %%GRASS_INST_DIR%%/gui/wxpython/location_wizard/__init__.py
+%%GRASS_INST_DIR%%/gui/wxpython/location_wizard/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/location_wizard/__pycache__/base.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/location_wizard/__pycache__/dialogs.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/location_wizard/__pycache__/wizard.cpython-%%PYTHON_SUFFIX%%.pyc
 %%GRASS_INST_DIR%%/gui/wxpython/location_wizard/base.py
 %%GRASS_INST_DIR%%/gui/wxpython/location_wizard/dialogs.py
 %%GRASS_INST_DIR%%/gui/wxpython/location_wizard/wizard.py
 %%GRASS_INST_DIR%%/gui/wxpython/mapdisp/__init__.py
+%%GRASS_INST_DIR%%/gui/wxpython/mapdisp/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/mapdisp/__pycache__/frame.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/mapdisp/__pycache__/gprint.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/mapdisp/__pycache__/main.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/mapdisp/__pycache__/statusbar.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/mapdisp/__pycache__/test_mapdisp.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/mapdisp/__pycache__/toolbars.cpython-%%PYTHON_SUFFIX%%.pyc
 %%GRASS_INST_DIR%%/gui/wxpython/mapdisp/frame.py
 %%GRASS_INST_DIR%%/gui/wxpython/mapdisp/gprint.py
 %%GRASS_INST_DIR%%/gui/wxpython/mapdisp/main.py
@@ -3317,18 +3556,38 @@ bin/grass%%VER%%
 %%GRASS_INST_DIR%%/gui/wxpython/mapdisp/test_mapdisp.py
 %%GRASS_INST_DIR%%/gui/wxpython/mapdisp/toolbars.py
 %%GRASS_INST_DIR%%/gui/wxpython/mapswipe/__init__.py
+%%GRASS_INST_DIR%%/gui/wxpython/mapswipe/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/mapswipe/__pycache__/dialogs.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/mapswipe/__pycache__/frame.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/mapswipe/__pycache__/g.gui.mapswipe.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/mapswipe/__pycache__/mapwindow.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/mapswipe/__pycache__/toolbars.cpython-%%PYTHON_SUFFIX%%.pyc
 %%GRASS_INST_DIR%%/gui/wxpython/mapswipe/dialogs.py
 %%GRASS_INST_DIR%%/gui/wxpython/mapswipe/frame.py
 %%GRASS_INST_DIR%%/gui/wxpython/mapswipe/g.gui.mapswipe.py
 %%GRASS_INST_DIR%%/gui/wxpython/mapswipe/mapwindow.py
 %%GRASS_INST_DIR%%/gui/wxpython/mapswipe/toolbars.py
 %%GRASS_INST_DIR%%/gui/wxpython/mapwin/__init__.py
+%%GRASS_INST_DIR%%/gui/wxpython/mapwin/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/mapwin/__pycache__/analysis.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/mapwin/__pycache__/base.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/mapwin/__pycache__/buffered.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/mapwin/__pycache__/decorations.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/mapwin/__pycache__/graphics.cpython-%%PYTHON_SUFFIX%%.pyc
 %%GRASS_INST_DIR%%/gui/wxpython/mapwin/analysis.py
 %%GRASS_INST_DIR%%/gui/wxpython/mapwin/base.py
 %%GRASS_INST_DIR%%/gui/wxpython/mapwin/buffered.py
 %%GRASS_INST_DIR%%/gui/wxpython/mapwin/decorations.py
 %%GRASS_INST_DIR%%/gui/wxpython/mapwin/graphics.py
 %%GRASS_INST_DIR%%/gui/wxpython/modules/__init__.py
+%%GRASS_INST_DIR%%/gui/wxpython/modules/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/modules/__pycache__/colorrules.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/modules/__pycache__/extensions.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/modules/__pycache__/histogram.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/modules/__pycache__/import_export.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/modules/__pycache__/mapsets_picker.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/modules/__pycache__/mcalc_builder.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/modules/__pycache__/vclean.cpython-%%PYTHON_SUFFIX%%.pyc
 %%GRASS_INST_DIR%%/gui/wxpython/modules/colorrules.py
 %%GRASS_INST_DIR%%/gui/wxpython/modules/extensions.py
 %%GRASS_INST_DIR%%/gui/wxpython/modules/histogram.py
@@ -3337,6 +3596,14 @@ bin/grass%%VER%%
 %%GRASS_INST_DIR%%/gui/wxpython/modules/mcalc_builder.py
 %%GRASS_INST_DIR%%/gui/wxpython/modules/vclean.py
 %%GRASS_INST_DIR%%/gui/wxpython/nviz/__init__.py
+%%GRASS_INST_DIR%%/gui/wxpython/nviz/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/nviz/__pycache__/animation.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/nviz/__pycache__/main.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/nviz/__pycache__/mapwindow.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/nviz/__pycache__/preferences.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/nviz/__pycache__/tools.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/nviz/__pycache__/workspace.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/nviz/__pycache__/wxnviz.cpython-%%PYTHON_SUFFIX%%.pyc
 %%GRASS_INST_DIR%%/gui/wxpython/nviz/animation.py
 %%GRASS_INST_DIR%%/gui/wxpython/nviz/main.py
 %%GRASS_INST_DIR%%/gui/wxpython/nviz/mapwindow.py
@@ -3345,12 +3612,26 @@ bin/grass%%VER%%
 %%GRASS_INST_DIR%%/gui/wxpython/nviz/workspace.py
 %%GRASS_INST_DIR%%/gui/wxpython/nviz/wxnviz.py
 %%GRASS_INST_DIR%%/gui/wxpython/photo2image/__init__.py
+%%GRASS_INST_DIR%%/gui/wxpython/photo2image/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/photo2image/__pycache__/g.gui.photo2image.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/photo2image/__pycache__/ip2i_manager.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/photo2image/__pycache__/ip2i_mapdisplay.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/photo2image/__pycache__/ip2i_statusbar.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/photo2image/__pycache__/ip2i_toolbars.cpython-%%PYTHON_SUFFIX%%.pyc
 %%GRASS_INST_DIR%%/gui/wxpython/photo2image/g.gui.photo2image.py
 %%GRASS_INST_DIR%%/gui/wxpython/photo2image/ip2i_manager.py
 %%GRASS_INST_DIR%%/gui/wxpython/photo2image/ip2i_mapdisplay.py
 %%GRASS_INST_DIR%%/gui/wxpython/photo2image/ip2i_statusbar.py
 %%GRASS_INST_DIR%%/gui/wxpython/photo2image/ip2i_toolbars.py
 %%GRASS_INST_DIR%%/gui/wxpython/psmap/__init__.py
+%%GRASS_INST_DIR%%/gui/wxpython/psmap/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/psmap/__pycache__/dialogs.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/psmap/__pycache__/frame.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/psmap/__pycache__/g.gui.psmap.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/psmap/__pycache__/instructions.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/psmap/__pycache__/menudata.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/psmap/__pycache__/toolbars.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/psmap/__pycache__/utils.cpython-%%PYTHON_SUFFIX%%.pyc
 %%GRASS_INST_DIR%%/gui/wxpython/psmap/dialogs.py
 %%GRASS_INST_DIR%%/gui/wxpython/psmap/frame.py
 %%GRASS_INST_DIR%%/gui/wxpython/psmap/g.gui.psmap.py
@@ -3359,27 +3640,55 @@ bin/grass%%VER%%
 %%GRASS_INST_DIR%%/gui/wxpython/psmap/toolbars.py
 %%GRASS_INST_DIR%%/gui/wxpython/psmap/utils.py
 %%GRASS_INST_DIR%%/gui/wxpython/rdigit/__init__.py
+%%GRASS_INST_DIR%%/gui/wxpython/rdigit/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/rdigit/__pycache__/controller.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/rdigit/__pycache__/dialogs.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/rdigit/__pycache__/toolbars.cpython-%%PYTHON_SUFFIX%%.pyc
 %%GRASS_INST_DIR%%/gui/wxpython/rdigit/controller.py
 %%GRASS_INST_DIR%%/gui/wxpython/rdigit/dialogs.py
 %%GRASS_INST_DIR%%/gui/wxpython/rdigit/toolbars.py
-%%GRASS_INST_DIR%%/gui/wxpython/README
 %%GRASS_INST_DIR%%/gui/wxpython/rlisetup/__init__.py
+%%GRASS_INST_DIR%%/gui/wxpython/rlisetup/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/rlisetup/__pycache__/frame.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/rlisetup/__pycache__/functions.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/rlisetup/__pycache__/g.gui.rlisetup.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/rlisetup/__pycache__/sampling_frame.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/rlisetup/__pycache__/wizard.cpython-%%PYTHON_SUFFIX%%.pyc
 %%GRASS_INST_DIR%%/gui/wxpython/rlisetup/frame.py
 %%GRASS_INST_DIR%%/gui/wxpython/rlisetup/functions.py
 %%GRASS_INST_DIR%%/gui/wxpython/rlisetup/g.gui.rlisetup.py
 %%GRASS_INST_DIR%%/gui/wxpython/rlisetup/sampling_frame.py
 %%GRASS_INST_DIR%%/gui/wxpython/rlisetup/wizard.py
 %%GRASS_INST_DIR%%/gui/wxpython/startup/__init__.py
+%%GRASS_INST_DIR%%/gui/wxpython/startup/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/startup/__pycache__/guiutils.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/startup/__pycache__/locdownload.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/startup/__pycache__/utils.cpython-%%PYTHON_SUFFIX%%.pyc
 %%GRASS_INST_DIR%%/gui/wxpython/startup/guiutils.py
 %%GRASS_INST_DIR%%/gui/wxpython/startup/locdownload.py
 %%GRASS_INST_DIR%%/gui/wxpython/startup/utils.py
 %%GRASS_INST_DIR%%/gui/wxpython/timeline/__init__.py
+%%GRASS_INST_DIR%%/gui/wxpython/timeline/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/timeline/__pycache__/frame.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/timeline/__pycache__/g.gui.timeline.cpython-%%PYTHON_SUFFIX%%.pyc
 %%GRASS_INST_DIR%%/gui/wxpython/timeline/frame.py
 %%GRASS_INST_DIR%%/gui/wxpython/timeline/g.gui.timeline.py
 %%GRASS_INST_DIR%%/gui/wxpython/tplot/__init__.py
+%%GRASS_INST_DIR%%/gui/wxpython/tplot/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/tplot/__pycache__/frame.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/tplot/__pycache__/g.gui.tplot.cpython-%%PYTHON_SUFFIX%%.pyc
 %%GRASS_INST_DIR%%/gui/wxpython/tplot/frame.py
 %%GRASS_INST_DIR%%/gui/wxpython/tplot/g.gui.tplot.py
 %%GRASS_INST_DIR%%/gui/wxpython/vdigit/__init__.py
+%%GRASS_INST_DIR%%/gui/wxpython/vdigit/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/vdigit/__pycache__/dialogs.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/vdigit/__pycache__/g.gui.vdigit.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/vdigit/__pycache__/main.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/vdigit/__pycache__/mapwindow.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/vdigit/__pycache__/preferences.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/vdigit/__pycache__/toolbars.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/vdigit/__pycache__/wxdigit.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/vdigit/__pycache__/wxdisplay.cpython-%%PYTHON_SUFFIX%%.pyc
 %%GRASS_INST_DIR%%/gui/wxpython/vdigit/dialogs.py
 %%GRASS_INST_DIR%%/gui/wxpython/vdigit/g.gui.vdigit.py
 %%GRASS_INST_DIR%%/gui/wxpython/vdigit/main.py
@@ -3389,6 +3698,13 @@ bin/grass%%VER%%
 %%GRASS_INST_DIR%%/gui/wxpython/vdigit/wxdigit.py
 %%GRASS_INST_DIR%%/gui/wxpython/vdigit/wxdisplay.py
 %%GRASS_INST_DIR%%/gui/wxpython/vnet/__init__.py
+%%GRASS_INST_DIR%%/gui/wxpython/vnet/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/vnet/__pycache__/dialogs.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/vnet/__pycache__/toolbars.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/vnet/__pycache__/vnet_core.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/vnet/__pycache__/vnet_data.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/vnet/__pycache__/vnet_utils.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/vnet/__pycache__/widgets.cpython-%%PYTHON_SUFFIX%%.pyc
 %%GRASS_INST_DIR%%/gui/wxpython/vnet/dialogs.py
 %%GRASS_INST_DIR%%/gui/wxpython/vnet/toolbars.py
 %%GRASS_INST_DIR%%/gui/wxpython/vnet/vnet_core.py
@@ -3396,11 +3712,21 @@ bin/grass%%VER%%
 %%GRASS_INST_DIR%%/gui/wxpython/vnet/vnet_utils.py
 %%GRASS_INST_DIR%%/gui/wxpython/vnet/widgets.py
 %%GRASS_INST_DIR%%/gui/wxpython/web_services/__init__.py
+%%GRASS_INST_DIR%%/gui/wxpython/web_services/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/web_services/__pycache__/cap_interface.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/web_services/__pycache__/dialogs.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/web_services/__pycache__/widgets.cpython-%%PYTHON_SUFFIX%%.pyc
 %%GRASS_INST_DIR%%/gui/wxpython/web_services/cap_interface.py
 %%GRASS_INST_DIR%%/gui/wxpython/web_services/dialogs.py
 %%GRASS_INST_DIR%%/gui/wxpython/web_services/widgets.py
 %%GRASS_INST_DIR%%/gui/wxpython/wxgui.py
 %%GRASS_INST_DIR%%/gui/wxpython/wxplot/__init__.py
+%%GRASS_INST_DIR%%/gui/wxpython/wxplot/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/wxplot/__pycache__/base.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/wxplot/__pycache__/dialogs.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/wxplot/__pycache__/histogram.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/wxplot/__pycache__/profile.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/wxplot/__pycache__/scatter.cpython-%%PYTHON_SUFFIX%%.pyc
 %%GRASS_INST_DIR%%/gui/wxpython/wxplot/base.py
 %%GRASS_INST_DIR%%/gui/wxpython/wxplot/dialogs.py
 %%GRASS_INST_DIR%%/gui/wxpython/wxplot/histogram.py
@@ -3410,21 +3736,52 @@ bin/grass%%VER%%
 %%GRASS_INST_DIR%%/gui/wxpython/xml/grass-gxw.dtd
 %%GRASS_INST_DIR%%/gui/wxpython/xml/main_menu.dtd
 %%GRASS_INST_DIR%%/gui/wxpython/xml/main_menu.xml
+%%GRASS_INST_DIR%%/gui/wxpython/xml/menudata.README
+%%GRASS_INST_DIR%%/gui/wxpython/xml/menudata.dtd
+%%GRASS_INST_DIR%%/gui/wxpython/xml/menudata.xml
 %%GRASS_INST_DIR%%/gui/wxpython/xml/menudata_modeler.xml
 %%GRASS_INST_DIR%%/gui/wxpython/xml/menudata_psmap.xml
 %%GRASS_INST_DIR%%/gui/wxpython/xml/menudata_pyedit.xml
-%%GRASS_INST_DIR%%/gui/wxpython/xml/menudata.dtd
-%%GRASS_INST_DIR%%/gui/wxpython/xml/menudata.README
-%%GRASS_INST_DIR%%/gui/wxpython/xml/menudata.xml
 %%GRASS_INST_DIR%%/gui/wxpython/xml/module_items.dtd
 %%GRASS_INST_DIR%%/gui/wxpython/xml/module_items.xml
-%%GRASS_INST_DIR%%/gui/wxpython/xml/module_tree_menudata.xml
 %%GRASS_INST_DIR%%/gui/wxpython/xml/module_tree.xml
+%%GRASS_INST_DIR%%/gui/wxpython/xml/module_tree_menudata.xml
 %%GRASS_INST_DIR%%/gui/wxpython/xml/toolboxes.dtd
 %%GRASS_INST_DIR%%/gui/wxpython/xml/toolboxes.xml
 %%GRASS_INST_DIR%%/gui/wxpython/xml/wxgui_items.dtd
 %%GRASS_INST_DIR%%/gui/wxpython/xml/wxgui_items.xml
 %%GRASS_INST_DIR%%/gui/xml/grass-interface.dtd
+%%GRASS_INST_DIR%%/include/Make/Compile.make
+%%GRASS_INST_DIR%%/include/Make/DB.make
+%%GRASS_INST_DIR%%/include/Make/Dir.make
+%%GRASS_INST_DIR%%/include/Make/Docs.make
+%%GRASS_INST_DIR%%/include/Make/Doxygen.make
+%%GRASS_INST_DIR%%/include/Make/Etc.make
+%%GRASS_INST_DIR%%/include/Make/Grass.make
+%%GRASS_INST_DIR%%/include/Make/GuiScript.make
+%%GRASS_INST_DIR%%/include/Make/Html.make
+%%GRASS_INST_DIR%%/include/Make/HtmlRules.make
+%%GRASS_INST_DIR%%/include/Make/Install.make
+%%GRASS_INST_DIR%%/include/Make/Lib.make
+%%GRASS_INST_DIR%%/include/Make/Module.make
+%%GRASS_INST_DIR%%/include/Make/Multi.make
+%%GRASS_INST_DIR%%/include/Make/NoHtml.make
+%%GRASS_INST_DIR%%/include/Make/Other.make
+%%GRASS_INST_DIR%%/include/Make/Platform.make
+%%GRASS_INST_DIR%%/include/Make/Python.make
+%%GRASS_INST_DIR%%/include/Make/Rules.make
+%%GRASS_INST_DIR%%/include/Make/Script.make
+%%GRASS_INST_DIR%%/include/Make/ScriptRules.make
+%%GRASS_INST_DIR%%/include/Make/ShScript.make
+%%GRASS_INST_DIR%%/include/Make/ShScriptRules.make
+%%GRASS_INST_DIR%%/include/Make/Shlib.make
+%%GRASS_INST_DIR%%/include/Make/Sphinx.make
+%%GRASS_INST_DIR%%/include/Make/Stlib.make
+%%GRASS_INST_DIR%%/include/Make/Vars.make
+%%GRASS_INST_DIR%%/include/grass/N_gwflow.h
+%%GRASS_INST_DIR%%/include/grass/N_heatflow.h
+%%GRASS_INST_DIR%%/include/grass/N_pde.h
+%%GRASS_INST_DIR%%/include/grass/N_solute_transport.h
 %%GRASS_INST_DIR%%/include/grass/arraystats.h
 %%GRASS_INST_DIR%%/include/grass/bitmap.h
 %%GRASS_INST_DIR%%/include/grass/blas.h
@@ -3442,6 +3799,7 @@ bin/grass%%VER%%
 %%GRASS_INST_DIR%%/include/grass/datetime.h
 %%GRASS_INST_DIR%%/include/grass/dbmi.h
 %%GRASS_INST_DIR%%/include/grass/dbstubs.h
+%%GRASS_INST_DIR%%/include/grass/defs/Paintlib.h
 %%GRASS_INST_DIR%%/include/grass/defs/arraystats.h
 %%GRASS_INST_DIR%%/include/grass/defs/bitmap.h
 %%GRASS_INST_DIR%%/include/grass/defs/btree.h
@@ -3467,7 +3825,6 @@ bin/grass%%VER%%
 %%GRASS_INST_DIR%%/include/grass/defs/nviz.h
 %%GRASS_INST_DIR%%/include/grass/defs/ogsf.h
 %%GRASS_INST_DIR%%/include/grass/defs/ortholib.h
-%%GRASS_INST_DIR%%/include/grass/defs/Paintlib.h
 %%GRASS_INST_DIR%%/include/grass/defs/raster.h
 %%GRASS_INST_DIR%%/include/grass/defs/raster3d.h
 %%GRASS_INST_DIR%%/include/grass/defs/rbtree.h
@@ -3481,9 +3838,9 @@ bin/grass%%VER%%
 %%GRASS_INST_DIR%%/include/grass/defs/vedit.h
 %%GRASS_INST_DIR%%/include/grass/dgl.h
 %%GRASS_INST_DIR%%/include/grass/dgl/avl.h
+%%GRASS_INST_DIR%%/include/grass/dgl/graph.h
 %%GRASS_INST_DIR%%/include/grass/dgl/graph_v1.h
 %%GRASS_INST_DIR%%/include/grass/dgl/graph_v2.h
-%%GRASS_INST_DIR%%/include/grass/dgl/graph.h
 %%GRASS_INST_DIR%%/include/grass/dgl/heap.h
 %%GRASS_INST_DIR%%/include/grass/dgl/helpers.h
 %%GRASS_INST_DIR%%/include/grass/dgl/tavl.h
@@ -3498,21 +3855,21 @@ bin/grass%%VER%%
 %%GRASS_INST_DIR%%/include/grass/gprojects.h
 %%GRASS_INST_DIR%%/include/grass/imagery.h
 %%GRASS_INST_DIR%%/include/grass/interpf.h
+%%GRASS_INST_DIR%%/include/grass/iostream/ami.h
 %%GRASS_INST_DIR%%/include/grass/iostream/ami_config.h
-%%GRASS_INST_DIR%%/include/grass/iostream/ami_sort_impl.h
 %%GRASS_INST_DIR%%/include/grass/iostream/ami_sort.h
+%%GRASS_INST_DIR%%/include/grass/iostream/ami_sort_impl.h
 %%GRASS_INST_DIR%%/include/grass/iostream/ami_stream.h
-%%GRASS_INST_DIR%%/include/grass/iostream/ami.h
 %%GRASS_INST_DIR%%/include/grass/iostream/embuffer.h
-%%GRASS_INST_DIR%%/include/grass/iostream/empq_adaptive_impl.h
+%%GRASS_INST_DIR%%/include/grass/iostream/empq.h
 %%GRASS_INST_DIR%%/include/grass/iostream/empq_adaptive.h
+%%GRASS_INST_DIR%%/include/grass/iostream/empq_adaptive_impl.h
 %%GRASS_INST_DIR%%/include/grass/iostream/empq_impl.h
-%%GRASS_INST_DIR%%/include/grass/iostream/empq.h
 %%GRASS_INST_DIR%%/include/grass/iostream/imbuffer.h
 %%GRASS_INST_DIR%%/include/grass/iostream/mem_stream.h
 %%GRASS_INST_DIR%%/include/grass/iostream/minmaxheap.h
-%%GRASS_INST_DIR%%/include/grass/iostream/mm_utils.h
 %%GRASS_INST_DIR%%/include/grass/iostream/mm.h
+%%GRASS_INST_DIR%%/include/grass/iostream/mm_utils.h
 %%GRASS_INST_DIR%%/include/grass/iostream/pqheap.h
 %%GRASS_INST_DIR%%/include/grass/iostream/queue.h
 %%GRASS_INST_DIR%%/include/grass/iostream/quicksort.h
@@ -3526,10 +3883,6 @@ bin/grass%%VER%%
 %%GRASS_INST_DIR%%/include/grass/linkm.h
 %%GRASS_INST_DIR%%/include/grass/lrs.h
 %%GRASS_INST_DIR%%/include/grass/manage.h
-%%GRASS_INST_DIR%%/include/grass/N_gwflow.h
-%%GRASS_INST_DIR%%/include/grass/N_heatflow.h
-%%GRASS_INST_DIR%%/include/grass/N_pde.h
-%%GRASS_INST_DIR%%/include/grass/N_solute_transport.h
 %%GRASS_INST_DIR%%/include/grass/neta.h
 %%GRASS_INST_DIR%%/include/grass/nviz.h
 %%GRASS_INST_DIR%%/include/grass/ogsf.h
@@ -3557,34 +3910,6 @@ bin/grass%%VER%%
 %%GRASS_INST_DIR%%/include/grass/vedit.h
 %%GRASS_INST_DIR%%/include/grass/version.h
 %%GRASS_INST_DIR%%/include/grass/waterglobs.h
-%%GRASS_INST_DIR%%/include/Make/Compile.make
-%%GRASS_INST_DIR%%/include/Make/DB.make
-%%GRASS_INST_DIR%%/include/Make/Dir.make
-%%GRASS_INST_DIR%%/include/Make/Docs.make
-%%GRASS_INST_DIR%%/include/Make/Doxygen.make
-%%GRASS_INST_DIR%%/include/Make/Etc.make
-%%GRASS_INST_DIR%%/include/Make/Grass.make
-%%GRASS_INST_DIR%%/include/Make/GuiScript.make
-%%GRASS_INST_DIR%%/include/Make/Html.make
-%%GRASS_INST_DIR%%/include/Make/HtmlRules.make
-%%GRASS_INST_DIR%%/include/Make/Install.make
-%%GRASS_INST_DIR%%/include/Make/Lib.make
-%%GRASS_INST_DIR%%/include/Make/Module.make
-%%GRASS_INST_DIR%%/include/Make/Multi.make
-%%GRASS_INST_DIR%%/include/Make/NoHtml.make
-%%GRASS_INST_DIR%%/include/Make/Other.make
-%%GRASS_INST_DIR%%/include/Make/Platform.make
-%%GRASS_INST_DIR%%/include/Make/Python.make
-%%GRASS_INST_DIR%%/include/Make/Rules.make
-%%GRASS_INST_DIR%%/include/Make/Script.make
-%%GRASS_INST_DIR%%/include/Make/ScriptRules.make
-%%GRASS_INST_DIR%%/include/Make/Shlib.make
-%%GRASS_INST_DIR%%/include/Make/ShScript.make
-%%GRASS_INST_DIR%%/include/Make/ShScriptRules.make
-%%GRASS_INST_DIR%%/include/Make/Sphinx.make
-%%GRASS_INST_DIR%%/include/Make/Stlib.make
-%%GRASS_INST_DIR%%/include/Make/Vars.make
-%%GRASS_INST_DIR%%/INSTALL
 %%GRASS_INST_DIR%%/lib/libgrass_arraystats.%%VERS%%.so
 %%GRASS_INST_DIR%%/lib/libgrass_arraystats.so
 %%GRASS_INST_DIR%%/lib/libgrass_bitmap.%%VERS%%.so
@@ -3690,92 +4015,6 @@ bin/grass%%VER%%
 %%GRASS_INST_DIR%%/lib/libgrass_vector.so
 %%GRASS_INST_DIR%%/lib/libgrass_vedit.%%VERS%%.so
 %%GRASS_INST_DIR%%/lib/libgrass_vedit.so
-%%NLS%%%%GRASS_INST_DIR%%/locale/ar/LC_MESSAGES/grasslibs.mo
-%%NLS%%%%GRASS_INST_DIR%%/locale/ar/LC_MESSAGES/grassmods.mo
-%%NLS%%%%GRASS_INST_DIR%%/locale/bn/LC_MESSAGES/grasslibs.mo
-%%NLS%%%%GRASS_INST_DIR%%/locale/bn/LC_MESSAGES/grassmods.mo
-%%NLS%%%%GRASS_INST_DIR%%/locale/bn/LC_MESSAGES/grasswxpy.mo
-%%NLS%%%%GRASS_INST_DIR%%/locale/cs/LC_MESSAGES/grasslibs.mo
-%%NLS%%%%GRASS_INST_DIR%%/locale/cs/LC_MESSAGES/grassmods.mo
-%%NLS%%%%GRASS_INST_DIR%%/locale/cs/LC_MESSAGES/grasswxpy.mo
-%%NLS%%%%GRASS_INST_DIR%%/locale/de/LC_MESSAGES/grasslibs.mo
-%%NLS%%%%GRASS_INST_DIR%%/locale/de/LC_MESSAGES/grassmods.mo
-%%NLS%%%%GRASS_INST_DIR%%/locale/de/LC_MESSAGES/grasswxpy.mo
-%%NLS%%%%GRASS_INST_DIR%%/locale/el/LC_MESSAGES/grasslibs.mo
-%%NLS%%%%GRASS_INST_DIR%%/locale/el/LC_MESSAGES/grassmods.mo
-%%NLS%%%%GRASS_INST_DIR%%/locale/el/LC_MESSAGES/grasswxpy.mo
-%%NLS%%%%GRASS_INST_DIR%%/locale/es/LC_MESSAGES/grasslibs.mo
-%%NLS%%%%GRASS_INST_DIR%%/locale/es/LC_MESSAGES/grassmods.mo
-%%NLS%%%%GRASS_INST_DIR%%/locale/es/LC_MESSAGES/grasswxpy.mo
-%%NLS%%%%GRASS_INST_DIR%%/locale/fi/LC_MESSAGES/grasslibs.mo
-%%NLS%%%%GRASS_INST_DIR%%/locale/fi/LC_MESSAGES/grassmods.mo
-%%NLS%%%%GRASS_INST_DIR%%/locale/fi/LC_MESSAGES/grasswxpy.mo
-%%NLS%%%%GRASS_INST_DIR%%/locale/fr/LC_MESSAGES/grasslibs.mo
-%%NLS%%%%GRASS_INST_DIR%%/locale/fr/LC_MESSAGES/grassmods.mo
-%%NLS%%%%GRASS_INST_DIR%%/locale/fr/LC_MESSAGES/grasswxpy.mo
-%%NLS%%%%GRASS_INST_DIR%%/locale/hu/LC_MESSAGES/grasslibs.mo
-%%NLS%%%%GRASS_INST_DIR%%/locale/hu/LC_MESSAGES/grassmods.mo
-%%NLS%%%%GRASS_INST_DIR%%/locale/hu/LC_MESSAGES/grasswxpy.mo
-%%NLS%%%%GRASS_INST_DIR%%/locale/id_ID/LC_MESSAGES/grasslibs.mo
-%%NLS%%%%GRASS_INST_DIR%%/locale/id_ID/LC_MESSAGES/grassmods.mo
-%%NLS%%%%GRASS_INST_DIR%%/locale/id_ID/LC_MESSAGES/grasswxpy.mo
-%%NLS%%%%GRASS_INST_DIR%%/locale/it/LC_MESSAGES/grasslibs.mo
-%%NLS%%%%GRASS_INST_DIR%%/locale/it/LC_MESSAGES/grassmods.mo
-%%NLS%%%%GRASS_INST_DIR%%/locale/it/LC_MESSAGES/grasswxpy.mo
-%%NLS%%%%GRASS_INST_DIR%%/locale/ja/LC_MESSAGES/grasslibs.mo
-%%NLS%%%%GRASS_INST_DIR%%/locale/ja/LC_MESSAGES/grassmods.mo
-%%NLS%%%%GRASS_INST_DIR%%/locale/ja/LC_MESSAGES/grasswxpy.mo
-%%NLS%%%%GRASS_INST_DIR%%/locale/ko/LC_MESSAGES/grasslibs.mo
-%%NLS%%%%GRASS_INST_DIR%%/locale/ko/LC_MESSAGES/grassmods.mo
-%%NLS%%%%GRASS_INST_DIR%%/locale/ko/LC_MESSAGES/grasswxpy.mo
-%%NLS%%%%GRASS_INST_DIR%%/locale/lv/LC_MESSAGES/grasslibs.mo
-%%NLS%%%%GRASS_INST_DIR%%/locale/lv/LC_MESSAGES/grassmods.mo
-%%NLS%%%%GRASS_INST_DIR%%/locale/lv/LC_MESSAGES/grasswxpy.mo
-%%NLS%%%%GRASS_INST_DIR%%/locale/ml/LC_MESSAGES/grasslibs.mo
-%%NLS%%%%GRASS_INST_DIR%%/locale/ml/LC_MESSAGES/grassmods.mo
-%%NLS%%%%GRASS_INST_DIR%%/locale/ml/LC_MESSAGES/grasswxpy.mo
-%%NLS%%%%GRASS_INST_DIR%%/locale/pl/LC_MESSAGES/grasslibs.mo
-%%NLS%%%%GRASS_INST_DIR%%/locale/pl/LC_MESSAGES/grassmods.mo
-%%NLS%%%%GRASS_INST_DIR%%/locale/pl/LC_MESSAGES/grasswxpy.mo
-%%NLS%%%%GRASS_INST_DIR%%/locale/pt_BR/LC_MESSAGES/grasslibs.mo
-%%NLS%%%%GRASS_INST_DIR%%/locale/pt_BR/LC_MESSAGES/grassmods.mo
-%%NLS%%%%GRASS_INST_DIR%%/locale/pt_BR/LC_MESSAGES/grasswxpy.mo
-%%NLS%%%%GRASS_INST_DIR%%/locale/pt/LC_MESSAGES/grasslibs.mo
-%%NLS%%%%GRASS_INST_DIR%%/locale/pt/LC_MESSAGES/grassmods.mo
-%%NLS%%%%GRASS_INST_DIR%%/locale/pt/LC_MESSAGES/grasswxpy.mo
-%%NLS%%%%GRASS_INST_DIR%%/locale/ro/LC_MESSAGES/grasslibs.mo
-%%NLS%%%%GRASS_INST_DIR%%/locale/ro/LC_MESSAGES/grassmods.mo
-%%NLS%%%%GRASS_INST_DIR%%/locale/ro/LC_MESSAGES/grasswxpy.mo
-%%NLS%%%%GRASS_INST_DIR%%/locale/ru/LC_MESSAGES/grasslibs.mo
-%%NLS%%%%GRASS_INST_DIR%%/locale/ru/LC_MESSAGES/grassmods.mo
-%%NLS%%%%GRASS_INST_DIR%%/locale/ru/LC_MESSAGES/grasswxpy.mo
-%%NLS%%%%GRASS_INST_DIR%%/locale/si/LC_MESSAGES/grasslibs.mo
-%%NLS%%%%GRASS_INST_DIR%%/locale/si/LC_MESSAGES/grassmods.mo
-%%NLS%%%%GRASS_INST_DIR%%/locale/si/LC_MESSAGES/grasswxpy.mo
-%%NLS%%%%GRASS_INST_DIR%%/locale/sl/LC_MESSAGES/grasslibs.mo
-%%NLS%%%%GRASS_INST_DIR%%/locale/sl/LC_MESSAGES/grassmods.mo
-%%NLS%%%%GRASS_INST_DIR%%/locale/ta/LC_MESSAGES/grasslibs.mo
-%%NLS%%%%GRASS_INST_DIR%%/locale/ta/LC_MESSAGES/grassmods.mo
-%%NLS%%%%GRASS_INST_DIR%%/locale/ta/LC_MESSAGES/grasswxpy.mo
-%%NLS%%%%GRASS_INST_DIR%%/locale/th/LC_MESSAGES/grasslibs.mo
-%%NLS%%%%GRASS_INST_DIR%%/locale/th/LC_MESSAGES/grassmods.mo
-%%NLS%%%%GRASS_INST_DIR%%/locale/th/LC_MESSAGES/grasswxpy.mo
-%%NLS%%%%GRASS_INST_DIR%%/locale/tr/LC_MESSAGES/grasslibs.mo
-%%NLS%%%%GRASS_INST_DIR%%/locale/tr/LC_MESSAGES/grassmods.mo
-%%NLS%%%%GRASS_INST_DIR%%/locale/tr/LC_MESSAGES/grasswxpy.mo
-%%NLS%%%%GRASS_INST_DIR%%/locale/uk/LC_MESSAGES/grasslibs.mo
-%%NLS%%%%GRASS_INST_DIR%%/locale/uk/LC_MESSAGES/grassmods.mo
-%%NLS%%%%GRASS_INST_DIR%%/locale/uk/LC_MESSAGES/grasswxpy.mo
-%%NLS%%%%GRASS_INST_DIR%%/locale/vi/LC_MESSAGES/grasslibs.mo
-%%NLS%%%%GRASS_INST_DIR%%/locale/vi/LC_MESSAGES/grassmods.mo
-%%NLS%%%%GRASS_INST_DIR%%/locale/vi/LC_MESSAGES/grasswxpy.mo
-%%NLS%%%%GRASS_INST_DIR%%/locale/zh_CN/LC_MESSAGES/grasslibs.mo
-%%NLS%%%%GRASS_INST_DIR%%/locale/zh_CN/LC_MESSAGES/grassmods.mo
-%%NLS%%%%GRASS_INST_DIR%%/locale/zh_CN/LC_MESSAGES/grasswxpy.mo
-%%NLS%%%%GRASS_INST_DIR%%/locale/zh/LC_MESSAGES/grasslibs.mo
-%%NLS%%%%GRASS_INST_DIR%%/locale/zh/LC_MESSAGES/grassmods.mo
-%%NLS%%%%GRASS_INST_DIR%%/locale/zh/LC_MESSAGES/grasswxpy.mo
-%%GRASS_INST_DIR%%/REQUIREMENTS.html
 %%GRASS_INST_DIR%%/scripts/d.correlate
 %%GRASS_INST_DIR%%/scripts/d.frame
 %%GRASS_INST_DIR%%/scripts/d.out.file
@@ -3841,6 +4080,7 @@ bin/grass%%VER%%
 %%GRASS_INST_DIR%%/scripts/r.unpack
 %%GRASS_INST_DIR%%/scripts/r3.in.xyz
 %%GRASS_INST_DIR%%/scripts/t.create
+%%GRASS_INST_DIR%%/scripts/t.downgrade
 %%GRASS_INST_DIR%%/scripts/t.info
 %%GRASS_INST_DIR%%/scripts/t.list
 %%GRASS_INST_DIR%%/scripts/t.merge
@@ -3934,14 +4174,133 @@ bin/grass%%VER%%
 %%GRASS_INST_DIR%%/share/icons/hicolor/96x96/apps/grass.png
 %%GRASS_INST_DIR%%/share/icons/hicolor/scalable/apps/grass.svg
 %%GRASS_INST_DIR%%/share/metainfo/org.osgeo.grass.appdata.xml
+%%GRASS_INST_DIR%%/tools/__pycache__/generate_last_commit_file%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/tools/__pycache__/ggroff.cpython-%%PYTHON_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/tools/__pycache__/ghtml.cpython-%%PYTHON_SUFFIX%%.pyc
 %%GRASS_INST_DIR%%/tools/g.echo
 %%GRASS_INST_DIR%%/tools/g.html2man.py
+%%GRASS_INST_DIR%%/tools/generate_last_commit_file.py
 %%GRASS_INST_DIR%%/tools/ggroff.py
 %%GRASS_INST_DIR%%/tools/ghtml.py
 %%GRASS_INST_DIR%%/tools/mkhtml.py
-%%NLS%%%%GRASS_INST_DIR%%/translation_status.json
 %%GRASS_INST_DIR%%/translators.csv
+%%MYSQL%%%%GRASS_INST_DIR%%/docs/html/grass-mysql.html
+%%MYSQL%%%%GRASS_INST_DIR%%/docs/man/man1/grass-mysql.1.gz
+%%MYSQL%%%%GRASS_INST_DIR%%/driver/db/mysql
+%%NETCDF%%%%GRASS_INST_DIR%%/bin/r3.out.netcdf
+%%NETCDF%%%%GRASS_INST_DIR%%/docs/html/r3.out.netcdf.html
+%%NETCDF%%%%GRASS_INST_DIR%%/docs/man/man1/r3.out.netcdf.1.gz
+%%NLS%%%%GRASS_INST_DIR%%/locale/ar/LC_MESSAGES/grasslibs.mo
+%%NLS%%%%GRASS_INST_DIR%%/locale/ar/LC_MESSAGES/grassmods.mo
+%%NLS%%%%GRASS_INST_DIR%%/locale/bn/LC_MESSAGES/grasslibs.mo
+%%NLS%%%%GRASS_INST_DIR%%/locale/bn/LC_MESSAGES/grassmods.mo
+%%NLS%%%%GRASS_INST_DIR%%/locale/bn/LC_MESSAGES/grasswxpy.mo
+%%NLS%%%%GRASS_INST_DIR%%/locale/cs/LC_MESSAGES/grasslibs.mo
+%%NLS%%%%GRASS_INST_DIR%%/locale/cs/LC_MESSAGES/grassmods.mo
+%%NLS%%%%GRASS_INST_DIR%%/locale/cs/LC_MESSAGES/grasswxpy.mo
+%%NLS%%%%GRASS_INST_DIR%%/locale/de/LC_MESSAGES/grasslibs.mo
+%%NLS%%%%GRASS_INST_DIR%%/locale/de/LC_MESSAGES/grassmods.mo
+%%NLS%%%%GRASS_INST_DIR%%/locale/de/LC_MESSAGES/grasswxpy.mo
+%%NLS%%%%GRASS_INST_DIR%%/locale/el/LC_MESSAGES/grasslibs.mo
+%%NLS%%%%GRASS_INST_DIR%%/locale/el/LC_MESSAGES/grassmods.mo
+%%NLS%%%%GRASS_INST_DIR%%/locale/el/LC_MESSAGES/grasswxpy.mo
+%%NLS%%%%GRASS_INST_DIR%%/locale/es/LC_MESSAGES/grasslibs.mo
+%%NLS%%%%GRASS_INST_DIR%%/locale/es/LC_MESSAGES/grassmods.mo
+%%NLS%%%%GRASS_INST_DIR%%/locale/es/LC_MESSAGES/grasswxpy.mo
+%%NLS%%%%GRASS_INST_DIR%%/locale/fi/LC_MESSAGES/grasslibs.mo
+%%NLS%%%%GRASS_INST_DIR%%/locale/fi/LC_MESSAGES/grassmods.mo
+%%NLS%%%%GRASS_INST_DIR%%/locale/fi/LC_MESSAGES/grasswxpy.mo
+%%NLS%%%%GRASS_INST_DIR%%/locale/fr/LC_MESSAGES/grasslibs.mo
+%%NLS%%%%GRASS_INST_DIR%%/locale/fr/LC_MESSAGES/grassmods.mo
+%%NLS%%%%GRASS_INST_DIR%%/locale/fr/LC_MESSAGES/grasswxpy.mo
+%%NLS%%%%GRASS_INST_DIR%%/locale/hu/LC_MESSAGES/grasslibs.mo
+%%NLS%%%%GRASS_INST_DIR%%/locale/hu/LC_MESSAGES/grassmods.mo
+%%NLS%%%%GRASS_INST_DIR%%/locale/hu/LC_MESSAGES/grasswxpy.mo
+%%NLS%%%%GRASS_INST_DIR%%/locale/id_ID/LC_MESSAGES/grasslibs.mo
+%%NLS%%%%GRASS_INST_DIR%%/locale/id_ID/LC_MESSAGES/grassmods.mo
+%%NLS%%%%GRASS_INST_DIR%%/locale/id_ID/LC_MESSAGES/grasswxpy.mo
+%%NLS%%%%GRASS_INST_DIR%%/locale/it/LC_MESSAGES/grasslibs.mo
+%%NLS%%%%GRASS_INST_DIR%%/locale/it/LC_MESSAGES/grassmods.mo
+%%NLS%%%%GRASS_INST_DIR%%/locale/it/LC_MESSAGES/grasswxpy.mo
+%%NLS%%%%GRASS_INST_DIR%%/locale/ja/LC_MESSAGES/grasslibs.mo
+%%NLS%%%%GRASS_INST_DIR%%/locale/ja/LC_MESSAGES/grassmods.mo
+%%NLS%%%%GRASS_INST_DIR%%/locale/ja/LC_MESSAGES/grasswxpy.mo
+%%NLS%%%%GRASS_INST_DIR%%/locale/ko/LC_MESSAGES/grasslibs.mo
+%%NLS%%%%GRASS_INST_DIR%%/locale/ko/LC_MESSAGES/grassmods.mo
+%%NLS%%%%GRASS_INST_DIR%%/locale/ko/LC_MESSAGES/grasswxpy.mo
+%%NLS%%%%GRASS_INST_DIR%%/locale/lv/LC_MESSAGES/grasslibs.mo
+%%NLS%%%%GRASS_INST_DIR%%/locale/lv/LC_MESSAGES/grassmods.mo
+%%NLS%%%%GRASS_INST_DIR%%/locale/lv/LC_MESSAGES/grasswxpy.mo
+%%NLS%%%%GRASS_INST_DIR%%/locale/ml/LC_MESSAGES/grasslibs.mo
+%%NLS%%%%GRASS_INST_DIR%%/locale/ml/LC_MESSAGES/grassmods.mo
+%%NLS%%%%GRASS_INST_DIR%%/locale/ml/LC_MESSAGES/grasswxpy.mo
+%%NLS%%%%GRASS_INST_DIR%%/locale/pl/LC_MESSAGES/grasslibs.mo
+%%NLS%%%%GRASS_INST_DIR%%/locale/pl/LC_MESSAGES/grassmods.mo
+%%NLS%%%%GRASS_INST_DIR%%/locale/pl/LC_MESSAGES/grasswxpy.mo
+%%NLS%%%%GRASS_INST_DIR%%/locale/pt/LC_MESSAGES/grasslibs.mo
+%%NLS%%%%GRASS_INST_DIR%%/locale/pt/LC_MESSAGES/grassmods.mo
+%%NLS%%%%GRASS_INST_DIR%%/locale/pt/LC_MESSAGES/grasswxpy.mo
+%%NLS%%%%GRASS_INST_DIR%%/locale/pt_BR/LC_MESSAGES/grasslibs.mo
+%%NLS%%%%GRASS_INST_DIR%%/locale/pt_BR/LC_MESSAGES/grassmods.mo
+%%NLS%%%%GRASS_INST_DIR%%/locale/pt_BR/LC_MESSAGES/grasswxpy.mo
+%%NLS%%%%GRASS_INST_DIR%%/locale/ro/LC_MESSAGES/grasslibs.mo
+%%NLS%%%%GRASS_INST_DIR%%/locale/ro/LC_MESSAGES/grassmods.mo
+%%NLS%%%%GRASS_INST_DIR%%/locale/ro/LC_MESSAGES/grasswxpy.mo
+%%NLS%%%%GRASS_INST_DIR%%/locale/ru/LC_MESSAGES/grasslibs.mo
+%%NLS%%%%GRASS_INST_DIR%%/locale/ru/LC_MESSAGES/grassmods.mo
+%%NLS%%%%GRASS_INST_DIR%%/locale/ru/LC_MESSAGES/grasswxpy.mo
+%%NLS%%%%GRASS_INST_DIR%%/locale/si/LC_MESSAGES/grasslibs.mo
+%%NLS%%%%GRASS_INST_DIR%%/locale/si/LC_MESSAGES/grassmods.mo
+%%NLS%%%%GRASS_INST_DIR%%/locale/si/LC_MESSAGES/grasswxpy.mo
+%%NLS%%%%GRASS_INST_DIR%%/locale/sl/LC_MESSAGES/grasslibs.mo
+%%NLS%%%%GRASS_INST_DIR%%/locale/sl/LC_MESSAGES/grassmods.mo
+%%NLS%%%%GRASS_INST_DIR%%/locale/ta/LC_MESSAGES/grasslibs.mo
+%%NLS%%%%GRASS_INST_DIR%%/locale/ta/LC_MESSAGES/grassmods.mo
+%%NLS%%%%GRASS_INST_DIR%%/locale/ta/LC_MESSAGES/grasswxpy.mo
+%%NLS%%%%GRASS_INST_DIR%%/locale/th/LC_MESSAGES/grasslibs.mo
+%%NLS%%%%GRASS_INST_DIR%%/locale/th/LC_MESSAGES/grassmods.mo
+%%NLS%%%%GRASS_INST_DIR%%/locale/th/LC_MESSAGES/grasswxpy.mo
+%%NLS%%%%GRASS_INST_DIR%%/locale/tr/LC_MESSAGES/grasslibs.mo
+%%NLS%%%%GRASS_INST_DIR%%/locale/tr/LC_MESSAGES/grassmods.mo
+%%NLS%%%%GRASS_INST_DIR%%/locale/tr/LC_MESSAGES/grasswxpy.mo
+%%NLS%%%%GRASS_INST_DIR%%/locale/uk/LC_MESSAGES/grasslibs.mo
+%%NLS%%%%GRASS_INST_DIR%%/locale/uk/LC_MESSAGES/grassmods.mo
+%%NLS%%%%GRASS_INST_DIR%%/locale/uk/LC_MESSAGES/grasswxpy.mo
+%%NLS%%%%GRASS_INST_DIR%%/locale/vi/LC_MESSAGES/grasslibs.mo
+%%NLS%%%%GRASS_INST_DIR%%/locale/vi/LC_MESSAGES/grassmods.mo
+%%NLS%%%%GRASS_INST_DIR%%/locale/vi/LC_MESSAGES/grasswxpy.mo
+%%NLS%%%%GRASS_INST_DIR%%/locale/zh/LC_MESSAGES/grasslibs.mo
+%%NLS%%%%GRASS_INST_DIR%%/locale/zh/LC_MESSAGES/grassmods.mo
+%%NLS%%%%GRASS_INST_DIR%%/locale/zh/LC_MESSAGES/grasswxpy.mo
+%%NLS%%%%GRASS_INST_DIR%%/locale/zh_CN/LC_MESSAGES/grasslibs.mo
+%%NLS%%%%GRASS_INST_DIR%%/locale/zh_CN/LC_MESSAGES/grassmods.mo
+%%NLS%%%%GRASS_INST_DIR%%/locale/zh_CN/LC_MESSAGES/grasswxpy.mo
+%%NLS%%%%GRASS_INST_DIR%%/translation_status.json
+%%NOTONI386%%%%GRASS_INST_DIR%%/bin/v.in.pdal
+%%NOTONI386%%%%GRASS_INST_DIR%%/docs/html/i.atcorr.html
+%%NOTONI386%%%%GRASS_INST_DIR%%/docs/html/r.terraflow.html
+%%NOTONI386%%%%GRASS_INST_DIR%%/docs/html/r.viewshed.html
+%%NOTONI386%%%%GRASS_INST_DIR%%/docs/html/topic_atmospheric_correction.html
+%%NOTONI386%%%%GRASS_INST_DIR%%/docs/html/topic_viewshed.html
+%%NOTONI386%%%%GRASS_INST_DIR%%/docs/html/v.in.pdal.html
+%%NOTONI386%%%%GRASS_INST_DIR%%/docs/man/man1/i.atcorr.1.gz
+%%NOTONI386%%%%GRASS_INST_DIR%%/docs/man/man1/r.terraflow.1.gz
+%%NOTONI386%%%%GRASS_INST_DIR%%/docs/man/man1/r.viewshed.1.gz
+%%NOTONI386%%%%GRASS_INST_DIR%%/docs/man/man1/topic_atmospheric_correction.1.gz
+%%NOTONI386%%%%GRASS_INST_DIR%%/docs/man/man1/topic_viewshed.1.gz
+%%NOTONI386%%%%GRASS_INST_DIR%%/docs/man/man1/v.in.pdal.1.gz
+%%ODBC%%%%GRASS_INST_DIR%%/docs/html/grass-odbc.html
+%%ODBC%%%%GRASS_INST_DIR%%/docs/man/man1/grass-odbc.1.gz
+%%ODBC%%%%GRASS_INST_DIR%%/driver/db/odbc
+%%PGSQL%%%%GRASS_INST_DIR%%/bin/v.out.postgis
+%%PGSQL%%%%GRASS_INST_DIR%%/docs/html/grass-pg.html
+%%PGSQL%%%%GRASS_INST_DIR%%/docs/html/v.out.postgis.html
+%%PGSQL%%%%GRASS_INST_DIR%%/docs/man/man1/grass-pg.1.gz
+%%PGSQL%%%%GRASS_INST_DIR%%/docs/man/man1/v.out.postgis.1.gz
+%%PGSQL%%%%GRASS_INST_DIR%%/driver/db/pg
+%%SQLITE%%%%GRASS_INST_DIR%%/driver/db/sqlite
 @dir %%GRASS_INST_DIR%%
+@dir %%GRASS_INST_DIR%%/share
 @dir %%GRASS_INST_DIR%%/demolocation/PERMANENT/cats
 @dir %%GRASS_INST_DIR%%/demolocation/PERMANENT/cell
 @dir %%GRASS_INST_DIR%%/demolocation/PERMANENT/cell_misc
@@ -3952,365 +4311,5 @@ bin/grass%%VER%%
 @dir %%GRASS_INST_DIR%%/demolocation/PERMANENT/windows
 @dir %%GRASS_INST_DIR%%/docs/html/colortables
 @dir %%GRASS_INST_DIR%%/gui/wxpython/scripts
-%%GRASS_INST_DIR%%/etc/python/grass/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/etc/python/grass/exceptions/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/etc/python/grass/gunittest/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/etc/python/grass/gunittest/__pycache__/case.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/etc/python/grass/gunittest/__pycache__/checkers.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/etc/python/grass/gunittest/__pycache__/gmodules.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/etc/python/grass/gunittest/__pycache__/gutils.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/etc/python/grass/gunittest/__pycache__/invoker.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/etc/python/grass/gunittest/__pycache__/loader.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/etc/python/grass/gunittest/__pycache__/main.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/etc/python/grass/gunittest/__pycache__/reporters.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/etc/python/grass/gunittest/__pycache__/runner.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/etc/python/grass/gunittest/__pycache__/utils.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/etc/python/grass/imaging/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/etc/python/grass/imaging/__pycache__/images2avi.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/etc/python/grass/imaging/__pycache__/images2gif.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/etc/python/grass/imaging/__pycache__/images2ims.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/etc/python/grass/imaging/__pycache__/images2swf.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/etc/python/grass/imaging/__pycache__/operations.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/etc/python/grass/lib/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/etc/python/grass/lib/__pycache__/arraystats.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/etc/python/grass/lib/__pycache__/cluster.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/etc/python/grass/lib/__pycache__/ctypes_loader.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/etc/python/grass/lib/__pycache__/ctypes_preamble.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/etc/python/grass/lib/__pycache__/date.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/etc/python/grass/lib/__pycache__/dbmi.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/etc/python/grass/lib/__pycache__/display.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/etc/python/grass/lib/__pycache__/gis.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/etc/python/grass/lib/__pycache__/gmath.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/etc/python/grass/lib/__pycache__/imagery.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/etc/python/grass/lib/__pycache__/nviz.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/etc/python/grass/lib/__pycache__/ogsf.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/etc/python/grass/lib/__pycache__/proj.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/etc/python/grass/lib/__pycache__/raster.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/etc/python/grass/lib/__pycache__/raster3d.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/etc/python/grass/lib/__pycache__/rowio.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/etc/python/grass/lib/__pycache__/rtree.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/etc/python/grass/lib/__pycache__/segment.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/etc/python/grass/lib/__pycache__/stats.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/etc/python/grass/lib/__pycache__/temporal.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/etc/python/grass/lib/__pycache__/vector.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/etc/python/grass/lib/__pycache__/vedit.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/etc/python/grass/pydispatch/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/etc/python/grass/pydispatch/__pycache__/dispatcher.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/etc/python/grass/pydispatch/__pycache__/errors.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/etc/python/grass/pydispatch/__pycache__/robust.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/etc/python/grass/pydispatch/__pycache__/robustapply.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/etc/python/grass/pydispatch/__pycache__/saferef.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/etc/python/grass/pydispatch/__pycache__/signal.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/etc/python/grass/pygrass/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/etc/python/grass/pygrass/__pycache__/errors.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/etc/python/grass/pygrass/__pycache__/orderdict.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/etc/python/grass/pygrass/__pycache__/utils.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/etc/python/grass/pygrass/gis/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/etc/python/grass/pygrass/gis/__pycache__/region.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/etc/python/grass/pygrass/messages/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/etc/python/grass/pygrass/modules/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/etc/python/grass/pygrass/modules/__pycache__/shortcuts.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/etc/python/grass/pygrass/modules/grid/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/etc/python/grass/pygrass/modules/grid/__pycache__/grid.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/etc/python/grass/pygrass/modules/grid/__pycache__/patch.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/etc/python/grass/pygrass/modules/grid/__pycache__/split.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/etc/python/grass/pygrass/modules/interface/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/etc/python/grass/pygrass/modules/interface/__pycache__/docstring.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/etc/python/grass/pygrass/modules/interface/__pycache__/env.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/etc/python/grass/pygrass/modules/interface/__pycache__/flag.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/etc/python/grass/pygrass/modules/interface/__pycache__/module.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/etc/python/grass/pygrass/modules/interface/__pycache__/parameter.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/etc/python/grass/pygrass/modules/interface/__pycache__/read.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/etc/python/grass/pygrass/modules/interface/__pycache__/typedict.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/etc/python/grass/pygrass/raster/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/etc/python/grass/pygrass/raster/__pycache__/abstract.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/etc/python/grass/pygrass/raster/__pycache__/buffer.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/etc/python/grass/pygrass/raster/__pycache__/category.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/etc/python/grass/pygrass/raster/__pycache__/history.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/etc/python/grass/pygrass/raster/__pycache__/raster_type.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/etc/python/grass/pygrass/raster/__pycache__/rowio.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/etc/python/grass/pygrass/raster/__pycache__/segment.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/etc/python/grass/pygrass/rpc/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/etc/python/grass/pygrass/rpc/__pycache__/base.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/etc/python/grass/pygrass/shell/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/etc/python/grass/pygrass/shell/__pycache__/conversion.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/etc/python/grass/pygrass/shell/__pycache__/show.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/etc/python/grass/pygrass/tests/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/etc/python/grass/pygrass/tests/__pycache__/benchmark.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/etc/python/grass/pygrass/tests/__pycache__/set_mapset.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/etc/python/grass/pygrass/vector/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/etc/python/grass/pygrass/vector/__pycache__/abstract.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/etc/python/grass/pygrass/vector/__pycache__/basic.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/etc/python/grass/pygrass/vector/__pycache__/find.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/etc/python/grass/pygrass/vector/__pycache__/geometry.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/etc/python/grass/pygrass/vector/__pycache__/sql.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/etc/python/grass/pygrass/vector/__pycache__/table.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/etc/python/grass/pygrass/vector/__pycache__/vector_type.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/etc/python/grass/script/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/etc/python/grass/script/__pycache__/array.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/etc/python/grass/script/__pycache__/core.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/etc/python/grass/script/__pycache__/db.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/etc/python/grass/script/__pycache__/raster.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/etc/python/grass/script/__pycache__/raster3d.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/etc/python/grass/script/__pycache__/setup.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/etc/python/grass/script/__pycache__/task.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/etc/python/grass/script/__pycache__/utils.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/etc/python/grass/script/__pycache__/vector.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/etc/python/grass/temporal/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/etc/python/grass/temporal/__pycache__/abstract_dataset.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/etc/python/grass/temporal/__pycache__/abstract_map_dataset.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/etc/python/grass/temporal/__pycache__/abstract_space_time_dataset.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/etc/python/grass/temporal/__pycache__/aggregation.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/etc/python/grass/temporal/__pycache__/base.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/etc/python/grass/temporal/__pycache__/c_libraries_interface.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/etc/python/grass/temporal/__pycache__/core.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/etc/python/grass/temporal/__pycache__/datetime_math.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/etc/python/grass/temporal/__pycache__/extract.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/etc/python/grass/temporal/__pycache__/factory.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/etc/python/grass/temporal/__pycache__/gui_support.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/etc/python/grass/temporal/__pycache__/list_stds.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/etc/python/grass/temporal/__pycache__/mapcalc.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/etc/python/grass/temporal/__pycache__/metadata.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/etc/python/grass/temporal/__pycache__/open_stds.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/etc/python/grass/temporal/__pycache__/register.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/etc/python/grass/temporal/__pycache__/sampling.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/etc/python/grass/temporal/__pycache__/space_time_datasets.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/etc/python/grass/temporal/__pycache__/spatial_extent.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/etc/python/grass/temporal/__pycache__/spatial_topology_dataset_connector.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/etc/python/grass/temporal/__pycache__/spatio_temporal_relationships.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/etc/python/grass/temporal/__pycache__/stds_export.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/etc/python/grass/temporal/__pycache__/stds_import.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/etc/python/grass/temporal/__pycache__/temporal_algebra.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/etc/python/grass/temporal/__pycache__/temporal_extent.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/etc/python/grass/temporal/__pycache__/temporal_granularity.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/etc/python/grass/temporal/__pycache__/temporal_operator.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/etc/python/grass/temporal/__pycache__/temporal_raster3d_algebra.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/etc/python/grass/temporal/__pycache__/temporal_raster_algebra.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/etc/python/grass/temporal/__pycache__/temporal_raster_base_algebra.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/etc/python/grass/temporal/__pycache__/temporal_topology_dataset_connector.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/etc/python/grass/temporal/__pycache__/temporal_vector_algebra.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/etc/python/grass/temporal/__pycache__/unit_tests.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/etc/python/grass/temporal/__pycache__/univar_statistics.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/etc/r.in.wms/__pycache__/srs.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/etc/r.in.wms/__pycache__/wms_base.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/etc/r.in.wms/__pycache__/wms_cap_parsers.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/etc/r.in.wms/__pycache__/wms_drv.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/etc/r.in.wms/__pycache__/wms_gdal_drv.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/gui/wxpython/__pycache__/gis_set.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/gui/wxpython/__pycache__/gis_set_error.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/gui/wxpython/__pycache__/wxgui.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/gui/wxpython/animation/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/gui/wxpython/animation/__pycache__/anim.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/gui/wxpython/animation/__pycache__/controller.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/gui/wxpython/animation/__pycache__/data.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/gui/wxpython/animation/__pycache__/dialogs.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/gui/wxpython/animation/__pycache__/frame.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/gui/wxpython/animation/__pycache__/g.gui.animation.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/gui/wxpython/animation/__pycache__/mapwindow.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/gui/wxpython/animation/__pycache__/nviztask.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/gui/wxpython/animation/__pycache__/provider.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/gui/wxpython/animation/__pycache__/temporal_manager.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/gui/wxpython/animation/__pycache__/toolbars.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/gui/wxpython/animation/__pycache__/utils.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/gui/wxpython/core/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/gui/wxpython/core/__pycache__/debug.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/gui/wxpython/core/__pycache__/gcmd.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/gui/wxpython/core/__pycache__/gconsole.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/gui/wxpython/core/__pycache__/giface.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/gui/wxpython/core/__pycache__/globalvar.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/gui/wxpython/core/__pycache__/gthread.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/gui/wxpython/core/__pycache__/layerlist.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/gui/wxpython/core/__pycache__/menutree.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/gui/wxpython/core/__pycache__/render.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/gui/wxpython/core/__pycache__/settings.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/gui/wxpython/core/__pycache__/toolboxes.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/gui/wxpython/core/__pycache__/treemodel.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/gui/wxpython/core/__pycache__/units.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/gui/wxpython/core/__pycache__/utils.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/gui/wxpython/core/__pycache__/workspace.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/gui/wxpython/core/__pycache__/ws.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/gui/wxpython/datacatalog/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/gui/wxpython/datacatalog/__pycache__/catalog.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/gui/wxpython/datacatalog/__pycache__/dialogs.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/gui/wxpython/datacatalog/__pycache__/frame.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/gui/wxpython/datacatalog/__pycache__/g.gui.datacatalog.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/gui/wxpython/datacatalog/__pycache__/toolbars.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/gui/wxpython/datacatalog/__pycache__/tree.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/gui/wxpython/dbmgr/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/gui/wxpython/dbmgr/__pycache__/base.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/gui/wxpython/dbmgr/__pycache__/dialogs.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/gui/wxpython/dbmgr/__pycache__/g.gui.dbmgr.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/gui/wxpython/dbmgr/__pycache__/manager.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/gui/wxpython/dbmgr/__pycache__/sqlbuilder.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/gui/wxpython/dbmgr/__pycache__/vinfo.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/gui/wxpython/gcp/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/gui/wxpython/gcp/__pycache__/g.gui.gcp.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/gui/wxpython/gcp/__pycache__/manager.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/gui/wxpython/gcp/__pycache__/mapdisplay.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/gui/wxpython/gcp/__pycache__/statusbar.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/gui/wxpython/gcp/__pycache__/toolbars.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/gui/wxpython/gmodeler/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/gui/wxpython/gmodeler/__pycache__/dialogs.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/gui/wxpython/gmodeler/__pycache__/frame.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/gui/wxpython/gmodeler/__pycache__/g.gui.gmodeler.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/gui/wxpython/gmodeler/__pycache__/giface.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/gui/wxpython/gmodeler/__pycache__/menudata.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/gui/wxpython/gmodeler/__pycache__/model.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/gui/wxpython/gmodeler/__pycache__/preferences.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/gui/wxpython/gmodeler/__pycache__/toolbars.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/gui/wxpython/gui_core/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/gui/wxpython/gui_core/__pycache__/dialogs.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/gui/wxpython/gui_core/__pycache__/forms.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/gui/wxpython/gui_core/__pycache__/ghelp.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/gui/wxpython/gui_core/__pycache__/goutput.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/gui/wxpython/gui_core/__pycache__/gselect.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/gui/wxpython/gui_core/__pycache__/mapdisp.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/gui/wxpython/gui_core/__pycache__/menu.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/gui/wxpython/gui_core/__pycache__/preferences.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/gui/wxpython/gui_core/__pycache__/prompt.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/gui/wxpython/gui_core/__pycache__/pyedit.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/gui/wxpython/gui_core/__pycache__/pystc.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/gui/wxpython/gui_core/__pycache__/query.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/gui/wxpython/gui_core/__pycache__/simplelmgr.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/gui/wxpython/gui_core/__pycache__/toolbars.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/gui/wxpython/gui_core/__pycache__/treeview.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/gui/wxpython/gui_core/__pycache__/vselect.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/gui/wxpython/gui_core/__pycache__/widgets.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/gui/wxpython/gui_core/__pycache__/wrap.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/gui/wxpython/iclass/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/gui/wxpython/iclass/__pycache__/dialogs.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/gui/wxpython/iclass/__pycache__/digit.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/gui/wxpython/iclass/__pycache__/frame.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/gui/wxpython/iclass/__pycache__/g.gui.iclass.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/gui/wxpython/iclass/__pycache__/plots.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/gui/wxpython/iclass/__pycache__/statistics.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/gui/wxpython/iclass/__pycache__/toolbars.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/gui/wxpython/icons/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/gui/wxpython/icons/__pycache__/grass_icons.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/gui/wxpython/icons/__pycache__/icon.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/gui/wxpython/image2target/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/gui/wxpython/image2target/__pycache__/g.gui.image2target.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/gui/wxpython/image2target/__pycache__/ii2t_gis_set.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/gui/wxpython/image2target/__pycache__/ii2t_gis_set_error.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/gui/wxpython/image2target/__pycache__/ii2t_manager.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/gui/wxpython/image2target/__pycache__/ii2t_mapdisplay.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/gui/wxpython/image2target/__pycache__/ii2t_menustrings.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/gui/wxpython/image2target/__pycache__/ii2t_statusbar.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/gui/wxpython/image2target/__pycache__/ii2t_toolbars.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/gui/wxpython/iscatt/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/gui/wxpython/iscatt/__pycache__/controllers.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/gui/wxpython/iscatt/__pycache__/core_c.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/gui/wxpython/iscatt/__pycache__/dialogs.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/gui/wxpython/iscatt/__pycache__/frame.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/gui/wxpython/iscatt/__pycache__/iscatt_core.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/gui/wxpython/iscatt/__pycache__/plots.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/gui/wxpython/iscatt/__pycache__/toolbars.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/gui/wxpython/iscatt/__pycache__/utils.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/gui/wxpython/lmgr/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/gui/wxpython/lmgr/__pycache__/frame.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/gui/wxpython/lmgr/__pycache__/giface.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/gui/wxpython/lmgr/__pycache__/layertree.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/gui/wxpython/lmgr/__pycache__/menudata.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/gui/wxpython/lmgr/__pycache__/pyshell.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/gui/wxpython/lmgr/__pycache__/toolbars.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/gui/wxpython/location_wizard/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/gui/wxpython/location_wizard/__pycache__/base.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/gui/wxpython/location_wizard/__pycache__/dialogs.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/gui/wxpython/location_wizard/__pycache__/wizard.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/gui/wxpython/mapdisp/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/gui/wxpython/mapdisp/__pycache__/frame.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/gui/wxpython/mapdisp/__pycache__/gprint.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/gui/wxpython/mapdisp/__pycache__/main.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/gui/wxpython/mapdisp/__pycache__/statusbar.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/gui/wxpython/mapdisp/__pycache__/test_mapdisp.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/gui/wxpython/mapdisp/__pycache__/toolbars.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/gui/wxpython/mapswipe/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/gui/wxpython/mapswipe/__pycache__/dialogs.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/gui/wxpython/mapswipe/__pycache__/frame.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/gui/wxpython/mapswipe/__pycache__/g.gui.mapswipe.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/gui/wxpython/mapswipe/__pycache__/mapwindow.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/gui/wxpython/mapswipe/__pycache__/toolbars.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/gui/wxpython/mapwin/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/gui/wxpython/mapwin/__pycache__/analysis.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/gui/wxpython/mapwin/__pycache__/base.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/gui/wxpython/mapwin/__pycache__/buffered.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/gui/wxpython/mapwin/__pycache__/decorations.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/gui/wxpython/mapwin/__pycache__/graphics.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/gui/wxpython/modules/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/gui/wxpython/modules/__pycache__/colorrules.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/gui/wxpython/modules/__pycache__/extensions.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/gui/wxpython/modules/__pycache__/histogram.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/gui/wxpython/modules/__pycache__/import_export.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/gui/wxpython/modules/__pycache__/mapsets_picker.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/gui/wxpython/modules/__pycache__/mcalc_builder.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/gui/wxpython/modules/__pycache__/vclean.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/gui/wxpython/nviz/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/gui/wxpython/nviz/__pycache__/animation.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/gui/wxpython/nviz/__pycache__/main.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/gui/wxpython/nviz/__pycache__/mapwindow.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/gui/wxpython/nviz/__pycache__/preferences.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/gui/wxpython/nviz/__pycache__/tools.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/gui/wxpython/nviz/__pycache__/workspace.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/gui/wxpython/nviz/__pycache__/wxnviz.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/gui/wxpython/photo2image/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/gui/wxpython/photo2image/__pycache__/g.gui.photo2image.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/gui/wxpython/photo2image/__pycache__/ip2i_manager.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/gui/wxpython/photo2image/__pycache__/ip2i_mapdisplay.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/gui/wxpython/photo2image/__pycache__/ip2i_statusbar.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/gui/wxpython/photo2image/__pycache__/ip2i_toolbars.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/gui/wxpython/psmap/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/gui/wxpython/psmap/__pycache__/dialogs.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/gui/wxpython/psmap/__pycache__/frame.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/gui/wxpython/psmap/__pycache__/g.gui.psmap.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/gui/wxpython/psmap/__pycache__/instructions.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/gui/wxpython/psmap/__pycache__/menudata.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/gui/wxpython/psmap/__pycache__/toolbars.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/gui/wxpython/psmap/__pycache__/utils.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/gui/wxpython/rdigit/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/gui/wxpython/rdigit/__pycache__/controller.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/gui/wxpython/rdigit/__pycache__/dialogs.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/gui/wxpython/rdigit/__pycache__/toolbars.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/gui/wxpython/rlisetup/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/gui/wxpython/rlisetup/__pycache__/frame.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/gui/wxpython/rlisetup/__pycache__/functions.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/gui/wxpython/rlisetup/__pycache__/g.gui.rlisetup.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/gui/wxpython/rlisetup/__pycache__/sampling_frame.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/gui/wxpython/rlisetup/__pycache__/wizard.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/gui/wxpython/startup/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/gui/wxpython/startup/__pycache__/guiutils.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/gui/wxpython/startup/__pycache__/locdownload.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/gui/wxpython/startup/__pycache__/utils.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/gui/wxpython/timeline/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/gui/wxpython/timeline/__pycache__/frame.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/gui/wxpython/timeline/__pycache__/g.gui.timeline.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/gui/wxpython/tplot/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/gui/wxpython/tplot/__pycache__/frame.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/gui/wxpython/tplot/__pycache__/g.gui.tplot.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/gui/wxpython/vdigit/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/gui/wxpython/vdigit/__pycache__/dialogs.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/gui/wxpython/vdigit/__pycache__/g.gui.vdigit.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/gui/wxpython/vdigit/__pycache__/main.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/gui/wxpython/vdigit/__pycache__/mapwindow.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/gui/wxpython/vdigit/__pycache__/preferences.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/gui/wxpython/vdigit/__pycache__/toolbars.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/gui/wxpython/vdigit/__pycache__/wxdigit.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/gui/wxpython/vdigit/__pycache__/wxdisplay.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/gui/wxpython/vnet/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/gui/wxpython/vnet/__pycache__/dialogs.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/gui/wxpython/vnet/__pycache__/toolbars.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/gui/wxpython/vnet/__pycache__/vnet_core.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/gui/wxpython/vnet/__pycache__/vnet_data.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/gui/wxpython/vnet/__pycache__/vnet_utils.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/gui/wxpython/vnet/__pycache__/widgets.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/gui/wxpython/web_services/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/gui/wxpython/web_services/__pycache__/cap_interface.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/gui/wxpython/web_services/__pycache__/dialogs.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/gui/wxpython/web_services/__pycache__/widgets.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/gui/wxpython/wxplot/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/gui/wxpython/wxplot/__pycache__/base.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/gui/wxpython/wxplot/__pycache__/dialogs.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/gui/wxpython/wxplot/__pycache__/histogram.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/gui/wxpython/wxplot/__pycache__/profile.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/gui/wxpython/wxplot/__pycache__/scatter.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/tools/__pycache__/ggroff.cpython-%%PYTHON_SUFFIX%%.pyc
-%%GRASS_INST_DIR%%/tools/__pycache__/ghtml.cpython-%%PYTHON_SUFFIX%%.pyc
+bin/grass%%MAJVER%%
+bin/grass%%VER%%
diff --git a/databases/grass8/Makefile b/databases/grass8/Makefile
new file mode 100644
index 000000000000..64c2ea039d70
--- /dev/null
+++ b/databases/grass8/Makefile
@@ -0,0 +1,152 @@
+PORTNAME=	grass
+DISTVERSION=	8.3.2
+PORTREVISION=	1
+CATEGORIES=	databases geography
+MASTER_SITES=	https://grass.osgeo.org/%SUBDIR%/ \
+		http://grass.cict.fr/%SUBDIR%/ \
+		http://grass.fbk.eu/%SUBDIR%/ \
+		http://grass.gis-lab.info/%SUBDIR%/ \
+		http://grass.meteo.uni.wroc.pl/%SUBDIR%/ \
+		http://grass.polytechnic.edu.na/%SUBDIR%/ \
+		http://grass.unibuc.ro/%SUBDIR%/ \
+		http://mirrors.ibiblio.org/grass/%SUBDIR%/ \
+		http://pinus.gntech.ac.kr/grass/%SUBDIR%/ \
+		http://wgbis.ces.iisc.ernet.in/grass/%SUBDIR%/ \
+		http://wgrass.media.osaka-cu.ac.jp/grassh/%SUBDIR%/
+MASTER_SITE_SUBDIR=	grass${VER}/source
+PKGNAMESUFFIX=	8
+
+MAINTAINER=	lbartoletti@FreeBSD.org
+COMMENT=	Open source Geographical Information System (GIS)
+WWW=		https://grass.osgeo.org/
+
+LICENSE=	GPLv2+
+LICENSE_FILE=	${WRKSRC}/GPL.TXT
+
+BUILD_DEPENDS=	${PY_NUMPY} \
+		${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR}
+LIB_DEPENDS=	libgdal.so:graphics/gdal \
+		libpng.so:graphics/png \
+		libproj.so:graphics/proj \
+		libtiff.so:graphics/tiff \
+		libgeotiff.so:graphics/libgeotiff \
+		libfftw3.so:math/fftw3 \
+		libfontconfig.so:x11-fonts/fontconfig \
+		libfreetype.so:print/freetype2 \
+		libgeos.so:graphics/geos \
+		libzstd.so:archivers/zstd
+RUN_DEPENDS=	${PY_NUMPY} \
+		${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR}
+
+USES=		blaslapack compiler:c11 gl gmake gnome iconv \
+		jpeg perl5 pkgconfig python readline shebangfix sqlite xorg
+SHEBANG_GLOB=	*.py
+SHEBANG_LANG=	nviz
+nviz_OLD_CMD=	nviz
+nviz_CMD=	${PREFIX}/${GRASS_INST_DIR}/bin/nviz
+USE_XORG=	sm ice x11 xext xi xmu xrender xt
+USE_GL=		gl glu
+USE_GNOME=	cairo
+USE_WX=		3.2
+WX_COMPS=	wx python:run
+GNU_CONFIGURE=	yes
+
+CONFIGURE_ARGS=	--with-includes=${LOCALBASE}/include \
+		--with-libs=${LOCALBASE}/lib \
+		--with-opengl-includes=${LOCALBASE}/include/ \
+		--with-opengl-libs=${LOCALBASE}/lib/ \
+		--with-freetype \
+		--with-freetype-includes=${LOCALBASE}/include/freetype2 \
+		--with-blas \
+		--with-lapack \
+		--with-cairo \
+		--with-readline \
+		--enable-largefile \
+		--with-wxwidgets=${WX_CONFIG} \
+		--with-proj-share=${LOCALBASE}/share/proj \
+		--with-proj-includes=${LOCALBASE}/include \
+		--with-proj-libs=${LOCALBASE}/lib \
+		--with-proj=${LOCALBASE}/bin/proj \
+		--with-geos=${LOCALBASE}/bin/geos-config \
+		--with-gdal=${LOCALBASE}/bin/gdal-config \
+		--with-pthread=yes \
+		--prefix=${LOCALBASE} \
+		--exec-prefix=${LOCALBASE}
+
+CFLAGS+=	-std=c11
+
+SUB_LIST=	PYTHON_CMD=${PYTHON_CMD}
+BINARY_ALIAS=	python3=${PYTHON_CMD}
+ALL_TARGET=	default
+USE_LDCONFIG=	${PREFIX}/${GRASS_INST_DIR}/lib
+MAKE_ENV+=	TARGET="${CONFIGURE_TARGET}"
+VER=		${PORTVERSION:R:C/\.//}
+
+PLIST_SUB=	GRASS_INST_DIR="${GRASS_INST_DIR}" \
+		VERSION="${PORTVERSION}" VERS="${PORTVERSION:C/([0-9]+).([0-9]+)(.*)/\1.\2/}" \
+		VER="${VER}" MAJVER="${PKGNAMESUFFIX}"
+
+OPTIONS_DEFINE=		NETCDF NLS PDAL
+OPTIONS_MULTI=		DB
+OPTIONS_MULTI_DB=	MYSQL ODBC PGSQL
+OPTIONS_DEFAULT=	NETCDF NLS PDAL PGSQL
+OPTIONS_SUB=		yes
+
+PDAL_DESC=		Enable points cloud data modules
+DB_DESC=		Database support
+MYSQL_USES=		mysql
+MYSQL_CONFIGURE_ON=	--with-mysql \
+			--with-mysql-includes=${LOCALBASE}/include/mysql \
+			--with-mysql-libs=${LOCALBASE}/lib/mysql
+NETCDF_CONFIGURE_ON=	--with-netcdf=${LOCALBASE}/bin/nc-config
+NETCDF_LIB_DEPENDS=	libnetcdf.so:science/netcdf
+NLS_CONFIGURE_WITH=	nls
+NLS_USES=		gettext
+ODBC_LIB_DEPENDS=	libodbc.so:databases/unixODBC
+ODBC_CONFIGURE_WITH=	odbc
+PDAL_CONFIGURE_ON=	--with-pdal=${LOCALBASE}/bin/pdal-config
+PDAL_LIB_DEPENDS=	libpdalcpp.so:math/pdal
+PGSQL_USES=		pgsql
+PGSQL_CONFIGURE_WITH=	postgres
+
+.if exists(/usr/include/omp.h)
+CONFIGURE_ARGS+=	--with-openmp
+.endif
+
+.include <bsd.port.pre.mk>
+
+.if !defined (GRASS_INST_DIR)
+GRASS_INST_DIR=	${PORTNAME}${VER}
+.endif
+
+MANDIRS=	${PREFIX}/grass${VER}/docs/man/man1
+
+post-patch:
+	${REINPLACE_CMD} \
+		's|= python3|= ${PYTHON_CMD:T}|' ${WRKSRC}/include/Make/Platform.make.in
+	${REINPLACE_CMD} \
+		's|$$(ARCH)|$$(TARGET)|g' ${WRKSRC}/include/Make/Grass.make
+# Replace hardcoded python interpreter to PYTHON_CMD
+	${REINPLACE_CMD} 's|"GRASS_PYTHON", "python"|"GRASS_PYTHON", "${PYTHON_CMD}"|g' \
+		${WRKSRC}/scripts/wxpyimgview/wxpyimgview.py
+	${REINPLACE_CMD} \
+		's|environ\["GRASS_PYTHON"\] = "python3"|environ["GRASS_PYTHON"] = "${PYTHON_CMD}"|g' \
+		${WRKSRC}/python/grass/script/setup.py
+
+post-install:
+	${RM} -rf ${STAGEDIR}${PREFIX}/${GRASS_INST_DIR}/demolocation/PERMANENT/.tmp/
+
+# STRIP PART
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${GRASS_INST_DIR}/bin/*
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${GRASS_INST_DIR}/driver/db/*
+.for i in clean_temp current_time_s_ms echo i.find lock run r.watershed/seg r.watershed/ram lister/vector lister/cell
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${GRASS_INST_DIR}/etc/${i}
+.endfor
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${GRASS_INST_DIR}/lib/*
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${GRASS_INST_DIR}/utils/g.echo
+
+# symlink grass8
+	${LN} -sf ${PORTNAME} \
+		${STAGEDIR}${PREFIX}/bin/${PORTNAME}${PKGNAMESUFFIX}
+.include <bsd.port.post.mk>
diff --git a/databases/grass8/distinfo b/databases/grass8/distinfo
new file mode 100644
index 000000000000..8ed74b087f1b
--- /dev/null
+++ b/databases/grass8/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1709882491
+SHA256 (grass-8.3.2.tar.gz) = ab924978c9d77dad9df9cdd8007955ef5ed6b377010e96f18bbfc85a99fba43c
+SIZE (grass-8.3.2.tar.gz) = 68662576
diff --git a/databases/grass8/pkg-descr b/databases/grass8/pkg-descr
new file mode 100644
index 000000000000..a44cad5d95a0
--- /dev/null
+++ b/databases/grass8/pkg-descr
@@ -0,0 +1,7 @@
+          Geographic Resources Analysis Support System
+                           (GRASS GIS)
+
+An open source Geographical Information System (GIS) with raster,
+topological vector, image processing, and graphics production functionality
+that operates on various platforms through a graphical user interface and
+shell in X-Windows. It is released under GNU General Public License (GPL).
diff --git a/databases/grass8/pkg-plist b/databases/grass8/pkg-plist
new file mode 100644
index 000000000000..df46c0efbff7
--- /dev/null
+++ b/databases/grass8/pkg-plist
@@ -0,0 +1,4436 @@
+bin/grass
+bin/grass%%MAJVER%%
+%%GRASS_INST_DIR%%/AUTHORS
+%%GRASS_INST_DIR%%/CHANGES
+%%GRASS_INST_DIR%%/CITING
+%%GRASS_INST_DIR%%/COPYING
+%%GRASS_INST_DIR%%/GPL.TXT
+%%GRASS_INST_DIR%%/INSTALL.md
+%%GRASS_INST_DIR%%/REQUIREMENTS.md
+%%GRASS_INST_DIR%%/bin/d.barscale
+%%GRASS_INST_DIR%%/bin/d.colorlist
+%%GRASS_INST_DIR%%/bin/d.colortable
+%%GRASS_INST_DIR%%/bin/d.erase
+%%GRASS_INST_DIR%%/bin/d.font
+%%GRASS_INST_DIR%%/bin/d.fontlist
+%%GRASS_INST_DIR%%/bin/d.geodesic
+%%GRASS_INST_DIR%%/bin/d.graph
+%%GRASS_INST_DIR%%/bin/d.grid
+%%GRASS_INST_DIR%%/bin/d.his
+%%GRASS_INST_DIR%%/bin/d.histogram
+%%GRASS_INST_DIR%%/bin/d.info
+%%GRASS_INST_DIR%%/bin/d.labels
+%%GRASS_INST_DIR%%/bin/d.legend
+%%GRASS_INST_DIR%%/bin/d.legend.vect
+%%GRASS_INST_DIR%%/bin/d.linegraph
+%%GRASS_INST_DIR%%/bin/d.mon
+%%GRASS_INST_DIR%%/bin/d.northarrow
+%%GRASS_INST_DIR%%/bin/d.path
+%%GRASS_INST_DIR%%/bin/d.profile
+%%GRASS_INST_DIR%%/bin/d.rast
+%%GRASS_INST_DIR%%/bin/d.rast.arrow
+%%GRASS_INST_DIR%%/bin/d.rast.num
+%%GRASS_INST_DIR%%/bin/d.rgb
+%%GRASS_INST_DIR%%/bin/d.rhumbline
+%%GRASS_INST_DIR%%/bin/d.text
+%%GRASS_INST_DIR%%/bin/d.title
+%%GRASS_INST_DIR%%/bin/d.vect
+%%GRASS_INST_DIR%%/bin/d.vect.chart
+%%GRASS_INST_DIR%%/bin/d.vect.thematic
+%%GRASS_INST_DIR%%/bin/d.where
+%%GRASS_INST_DIR%%/bin/db.columns
+%%GRASS_INST_DIR%%/bin/db.connect
+%%GRASS_INST_DIR%%/bin/db.copy
+%%GRASS_INST_DIR%%/bin/db.createdb
+%%GRASS_INST_DIR%%/bin/db.databases
+%%GRASS_INST_DIR%%/bin/db.describe
+%%GRASS_INST_DIR%%/bin/db.drivers
+%%GRASS_INST_DIR%%/bin/db.dropdb
+%%GRASS_INST_DIR%%/bin/db.execute
+%%GRASS_INST_DIR%%/bin/db.login
+%%GRASS_INST_DIR%%/bin/db.select
+%%GRASS_INST_DIR%%/bin/db.tables
+%%GRASS_INST_DIR%%/bin/g.access
+%%GRASS_INST_DIR%%/bin/g.cairocomp
+%%GRASS_INST_DIR%%/bin/g.copy
+%%GRASS_INST_DIR%%/bin/g.dirseps
+%%GRASS_INST_DIR%%/bin/g.filename
+%%GRASS_INST_DIR%%/bin/g.findetc
+%%GRASS_INST_DIR%%/bin/g.findfile
+%%GRASS_INST_DIR%%/bin/g.gisenv
+%%GRASS_INST_DIR%%/bin/g.gui
+%%GRASS_INST_DIR%%/bin/g.list
+%%GRASS_INST_DIR%%/bin/g.mapset
+%%GRASS_INST_DIR%%/bin/g.mapsets
+%%GRASS_INST_DIR%%/bin/g.message
+%%GRASS_INST_DIR%%/bin/g.mkfontcap
+%%GRASS_INST_DIR%%/bin/g.parser
+%%GRASS_INST_DIR%%/bin/g.pnmcomp
+%%GRASS_INST_DIR%%/bin/g.ppmtopng
+%%GRASS_INST_DIR%%/bin/g.proj
+%%GRASS_INST_DIR%%/bin/g.region
+%%GRASS_INST_DIR%%/bin/g.remove
+%%GRASS_INST_DIR%%/bin/g.rename
+%%GRASS_INST_DIR%%/bin/g.tempfile
+%%GRASS_INST_DIR%%/bin/g.version
+%%GRASS_INST_DIR%%/bin/i.albedo
+%%GRASS_INST_DIR%%/bin/i.aster.toar
+%%GRASS_INST_DIR%%/bin/i.atcorr
+%%GRASS_INST_DIR%%/bin/i.biomass
+%%GRASS_INST_DIR%%/bin/i.cca
+%%GRASS_INST_DIR%%/bin/i.cluster
+%%GRASS_INST_DIR%%/bin/i.eb.eta
+%%GRASS_INST_DIR%%/bin/i.eb.evapfr
+%%GRASS_INST_DIR%%/bin/i.eb.hsebal01
+%%GRASS_INST_DIR%%/bin/i.eb.netrad
+%%GRASS_INST_DIR%%/bin/i.eb.soilheatflux
+%%GRASS_INST_DIR%%/bin/i.emissivity
+%%GRASS_INST_DIR%%/bin/i.evapo.mh
+%%GRASS_INST_DIR%%/bin/i.evapo.pm
+%%GRASS_INST_DIR%%/bin/i.evapo.pt
+%%GRASS_INST_DIR%%/bin/i.evapo.time
+%%GRASS_INST_DIR%%/bin/i.fft
+%%GRASS_INST_DIR%%/bin/i.gensig
+%%GRASS_INST_DIR%%/bin/i.gensigset
+%%GRASS_INST_DIR%%/bin/i.group
+%%GRASS_INST_DIR%%/bin/i.his.rgb
+%%GRASS_INST_DIR%%/bin/i.ifft
+%%GRASS_INST_DIR%%/bin/i.landsat.acca
+%%GRASS_INST_DIR%%/bin/i.landsat.toar
+%%GRASS_INST_DIR%%/bin/i.maxlik
+%%GRASS_INST_DIR%%/bin/i.modis.qc
+%%GRASS_INST_DIR%%/bin/i.ortho.camera
+%%GRASS_INST_DIR%%/bin/i.ortho.elev
+%%GRASS_INST_DIR%%/bin/i.ortho.init
+%%GRASS_INST_DIR%%/bin/i.ortho.photo
+%%GRASS_INST_DIR%%/bin/i.ortho.rectify
+%%GRASS_INST_DIR%%/bin/i.ortho.target
+%%GRASS_INST_DIR%%/bin/i.ortho.transform
+%%GRASS_INST_DIR%%/bin/i.pca
+%%GRASS_INST_DIR%%/bin/i.rectify
+%%GRASS_INST_DIR%%/bin/i.rgb.his
+%%GRASS_INST_DIR%%/bin/i.segment
+%%GRASS_INST_DIR%%/bin/i.smap
+%%GRASS_INST_DIR%%/bin/i.target
+%%GRASS_INST_DIR%%/bin/i.topo.corr
+%%GRASS_INST_DIR%%/bin/i.vi
+%%GRASS_INST_DIR%%/bin/i.zc
+%%GRASS_INST_DIR%%/bin/m.cogo
+%%GRASS_INST_DIR%%/bin/m.measure
+%%GRASS_INST_DIR%%/bin/m.nviz.image
+%%GRASS_INST_DIR%%/bin/m.nviz.script
+%%GRASS_INST_DIR%%/bin/m.transform
+%%GRASS_INST_DIR%%/bin/ps.map
+%%GRASS_INST_DIR%%/bin/r.basins.fill
+%%GRASS_INST_DIR%%/bin/r.buffer
+%%GRASS_INST_DIR%%/bin/r.buildvrt
+%%GRASS_INST_DIR%%/bin/r.carve
+%%GRASS_INST_DIR%%/bin/r.category
+%%GRASS_INST_DIR%%/bin/r.circle
+%%GRASS_INST_DIR%%/bin/r.clump
+%%GRASS_INST_DIR%%/bin/r.coin
+%%GRASS_INST_DIR%%/bin/r.colors
+%%GRASS_INST_DIR%%/bin/r.colors.out
+%%GRASS_INST_DIR%%/bin/r.composite
+%%GRASS_INST_DIR%%/bin/r.compress
+%%GRASS_INST_DIR%%/bin/r.contour
+%%GRASS_INST_DIR%%/bin/r.cost
+%%GRASS_INST_DIR%%/bin/r.covar
+%%GRASS_INST_DIR%%/bin/r.cross
+%%GRASS_INST_DIR%%/bin/r.describe
+%%GRASS_INST_DIR%%/bin/r.distance
+%%GRASS_INST_DIR%%/bin/r.external
+%%GRASS_INST_DIR%%/bin/r.external.out
+%%GRASS_INST_DIR%%/bin/r.fill.dir
+%%GRASS_INST_DIR%%/bin/r.fill.stats
+%%GRASS_INST_DIR%%/bin/r.flow
+%%GRASS_INST_DIR%%/bin/r.geomorphon
+%%GRASS_INST_DIR%%/bin/r.grow.distance
+%%GRASS_INST_DIR%%/bin/r.gwflow
+%%GRASS_INST_DIR%%/bin/r.his
+%%GRASS_INST_DIR%%/bin/r.horizon
+%%GRASS_INST_DIR%%/bin/r.in.ascii
+%%GRASS_INST_DIR%%/bin/r.in.bin
+%%GRASS_INST_DIR%%/bin/r.in.gdal
+%%GRASS_INST_DIR%%/bin/r.in.gridatb
+%%GRASS_INST_DIR%%/bin/r.in.mat
+%%GRASS_INST_DIR%%/bin/r.in.png
+%%GRASS_INST_DIR%%/bin/r.in.poly
+%%GRASS_INST_DIR%%/bin/r.in.xyz
+%%GRASS_INST_DIR%%/bin/r.info
+%%GRASS_INST_DIR%%/bin/r.kappa
+%%GRASS_INST_DIR%%/bin/r.lake
+%%GRASS_INST_DIR%%/bin/r.latlong
+%%GRASS_INST_DIR%%/bin/r.li.cwed
+%%GRASS_INST_DIR%%/bin/r.li.dominance
+%%GRASS_INST_DIR%%/bin/r.li.edgedensity
+%%GRASS_INST_DIR%%/bin/r.li.mpa
+%%GRASS_INST_DIR%%/bin/r.li.mps
+%%GRASS_INST_DIR%%/bin/r.li.padcv
+%%GRASS_INST_DIR%%/bin/r.li.padrange
+%%GRASS_INST_DIR%%/bin/r.li.padsd
+%%GRASS_INST_DIR%%/bin/r.li.patchdensity
+%%GRASS_INST_DIR%%/bin/r.li.patchnum
+%%GRASS_INST_DIR%%/bin/r.li.pielou
+%%GRASS_INST_DIR%%/bin/r.li.renyi
+%%GRASS_INST_DIR%%/bin/r.li.richness
+%%GRASS_INST_DIR%%/bin/r.li.shannon
+%%GRASS_INST_DIR%%/bin/r.li.shape
+%%GRASS_INST_DIR%%/bin/r.li.simpson
+%%GRASS_INST_DIR%%/bin/r.mapcalc
+%%GRASS_INST_DIR%%/bin/r.mfilter
+%%GRASS_INST_DIR%%/bin/r.mode
+%%GRASS_INST_DIR%%/bin/r.neighbors
+%%GRASS_INST_DIR%%/bin/r.null
+%%GRASS_INST_DIR%%/bin/r.object.geometry
+%%GRASS_INST_DIR%%/bin/r.out.ascii
+%%GRASS_INST_DIR%%/bin/r.out.bin
+%%GRASS_INST_DIR%%/bin/r.out.gdal
+%%GRASS_INST_DIR%%/bin/r.out.gridatb
+%%GRASS_INST_DIR%%/bin/r.out.mat
+%%GRASS_INST_DIR%%/bin/r.out.mpeg
+%%GRASS_INST_DIR%%/bin/r.out.png
+%%GRASS_INST_DIR%%/bin/r.out.pov
+%%GRASS_INST_DIR%%/bin/r.out.ppm
+%%GRASS_INST_DIR%%/bin/r.out.ppm3
+%%GRASS_INST_DIR%%/bin/r.out.vrml
+%%GRASS_INST_DIR%%/bin/r.out.vtk
+%%GRASS_INST_DIR%%/bin/r.param.scale
+%%GRASS_INST_DIR%%/bin/r.patch
+%%GRASS_INST_DIR%%/bin/r.path
+%%GRASS_INST_DIR%%/bin/r.profile
+%%GRASS_INST_DIR%%/bin/r.proj
+%%GRASS_INST_DIR%%/bin/r.quant
+%%GRASS_INST_DIR%%/bin/r.quantile
+%%GRASS_INST_DIR%%/bin/r.random
+%%GRASS_INST_DIR%%/bin/r.random.cells
+%%GRASS_INST_DIR%%/bin/r.random.surface
+%%GRASS_INST_DIR%%/bin/r.reclass
+%%GRASS_INST_DIR%%/bin/r.recode
+%%GRASS_INST_DIR%%/bin/r.region
+%%GRASS_INST_DIR%%/bin/r.regression.line
+%%GRASS_INST_DIR%%/bin/r.regression.multi
+%%GRASS_INST_DIR%%/bin/r.relief
+%%GRASS_INST_DIR%%/bin/r.report
+%%GRASS_INST_DIR%%/bin/r.resamp.bspline
+%%GRASS_INST_DIR%%/bin/r.resamp.filter
+%%GRASS_INST_DIR%%/bin/r.resamp.interp
+%%GRASS_INST_DIR%%/bin/r.resamp.rst
+%%GRASS_INST_DIR%%/bin/r.resamp.stats
+%%GRASS_INST_DIR%%/bin/r.resample
+%%GRASS_INST_DIR%%/bin/r.rescale
+%%GRASS_INST_DIR%%/bin/r.rescale.eq
+%%GRASS_INST_DIR%%/bin/r.ros
+%%GRASS_INST_DIR%%/bin/r.series
+%%GRASS_INST_DIR%%/bin/r.series.accumulate
+%%GRASS_INST_DIR%%/bin/r.series.interp
+%%GRASS_INST_DIR%%/bin/r.sim.sediment
+%%GRASS_INST_DIR%%/bin/r.sim.water
+%%GRASS_INST_DIR%%/bin/r.slope.aspect
+%%GRASS_INST_DIR%%/bin/r.solute.transport
+%%GRASS_INST_DIR%%/bin/r.spread
+%%GRASS_INST_DIR%%/bin/r.spreadpath
+%%GRASS_INST_DIR%%/bin/r.statistics
+%%GRASS_INST_DIR%%/bin/r.stats
+%%GRASS_INST_DIR%%/bin/r.stats.quantile
+%%GRASS_INST_DIR%%/bin/r.stats.zonal
+%%GRASS_INST_DIR%%/bin/r.stream.extract
+%%GRASS_INST_DIR%%/bin/r.sun
+%%GRASS_INST_DIR%%/bin/r.sunhours
+%%GRASS_INST_DIR%%/bin/r.sunmask
+%%GRASS_INST_DIR%%/bin/r.support
+%%GRASS_INST_DIR%%/bin/r.support.stats
+%%GRASS_INST_DIR%%/bin/r.surf.area
+%%GRASS_INST_DIR%%/bin/r.surf.contour
+%%GRASS_INST_DIR%%/bin/r.surf.fractal
+%%GRASS_INST_DIR%%/bin/r.surf.gauss
+%%GRASS_INST_DIR%%/bin/r.surf.idw
+%%GRASS_INST_DIR%%/bin/r.surf.random
+%%GRASS_INST_DIR%%/bin/r.terraflow
+%%GRASS_INST_DIR%%/bin/r.texture
+%%GRASS_INST_DIR%%/bin/r.thin
+%%GRASS_INST_DIR%%/bin/r.tile
+%%GRASS_INST_DIR%%/bin/r.timestamp
+%%GRASS_INST_DIR%%/bin/r.to.rast3
+%%GRASS_INST_DIR%%/bin/r.to.rast3elev
+%%GRASS_INST_DIR%%/bin/r.to.vect
+%%GRASS_INST_DIR%%/bin/r.topidx
+%%GRASS_INST_DIR%%/bin/r.topmodel
+%%GRASS_INST_DIR%%/bin/r.transect
+%%GRASS_INST_DIR%%/bin/r.univar
+%%GRASS_INST_DIR%%/bin/r.uslek
+%%GRASS_INST_DIR%%/bin/r.usler
+%%GRASS_INST_DIR%%/bin/r.viewshed
+%%GRASS_INST_DIR%%/bin/r.volume
+%%GRASS_INST_DIR%%/bin/r.walk
+%%GRASS_INST_DIR%%/bin/r.water.outlet
+%%GRASS_INST_DIR%%/bin/r.watershed
+%%GRASS_INST_DIR%%/bin/r.what
+%%GRASS_INST_DIR%%/bin/r.what.color
+%%GRASS_INST_DIR%%/bin/r3.colors
+%%GRASS_INST_DIR%%/bin/r3.colors.out
+%%GRASS_INST_DIR%%/bin/r3.cross.rast
+%%GRASS_INST_DIR%%/bin/r3.flow
+%%GRASS_INST_DIR%%/bin/r3.gradient
+%%GRASS_INST_DIR%%/bin/r3.gwflow
+%%GRASS_INST_DIR%%/bin/r3.in.ascii
+%%GRASS_INST_DIR%%/bin/r3.in.bin
+%%GRASS_INST_DIR%%/bin/r3.in.v5d
+%%GRASS_INST_DIR%%/bin/r3.info
+%%GRASS_INST_DIR%%/bin/r3.mapcalc
+%%GRASS_INST_DIR%%/bin/r3.mask
+%%GRASS_INST_DIR%%/bin/r3.mkdspf
+%%GRASS_INST_DIR%%/bin/r3.neighbors
+%%GRASS_INST_DIR%%/bin/r3.null
+%%GRASS_INST_DIR%%/bin/r3.out.ascii
+%%GRASS_INST_DIR%%/bin/r3.out.bin
+%%GRASS_INST_DIR%%/bin/r3.out.v5d
+%%GRASS_INST_DIR%%/bin/r3.out.vtk
+%%GRASS_INST_DIR%%/bin/r3.retile
+%%GRASS_INST_DIR%%/bin/r3.stats
+%%GRASS_INST_DIR%%/bin/r3.support
+%%GRASS_INST_DIR%%/bin/r3.timestamp
+%%GRASS_INST_DIR%%/bin/r3.to.rast
+%%GRASS_INST_DIR%%/bin/r3.univar
+%%GRASS_INST_DIR%%/bin/t.connect
+%%GRASS_INST_DIR%%/bin/test.r3flow
+%%GRASS_INST_DIR%%/bin/test.raster3d.lib
+%%GRASS_INST_DIR%%/bin/v.buffer
+%%GRASS_INST_DIR%%/bin/v.build
+%%GRASS_INST_DIR%%/bin/v.build.polylines
+%%GRASS_INST_DIR%%/bin/v.category
+%%GRASS_INST_DIR%%/bin/v.class
+%%GRASS_INST_DIR%%/bin/v.clean
+%%GRASS_INST_DIR%%/bin/v.cluster
+%%GRASS_INST_DIR%%/bin/v.colors
+%%GRASS_INST_DIR%%/bin/v.colors.out
+%%GRASS_INST_DIR%%/bin/v.db.connect
+%%GRASS_INST_DIR%%/bin/v.db.select
+%%GRASS_INST_DIR%%/bin/v.decimate
+%%GRASS_INST_DIR%%/bin/v.delaunay
+%%GRASS_INST_DIR%%/bin/v.distance
+%%GRASS_INST_DIR%%/bin/v.drape
+%%GRASS_INST_DIR%%/bin/v.edit
+%%GRASS_INST_DIR%%/bin/v.external
+%%GRASS_INST_DIR%%/bin/v.external.out
+%%GRASS_INST_DIR%%/bin/v.extract
+%%GRASS_INST_DIR%%/bin/v.extrude
+%%GRASS_INST_DIR%%/bin/v.generalize
+%%GRASS_INST_DIR%%/bin/v.hull
+%%GRASS_INST_DIR%%/bin/v.in.ascii
+%%GRASS_INST_DIR%%/bin/v.in.db
+%%GRASS_INST_DIR%%/bin/v.in.dxf
+%%GRASS_INST_DIR%%/bin/v.in.ogr
+%%GRASS_INST_DIR%%/bin/v.in.region
+%%GRASS_INST_DIR%%/bin/v.info
+%%GRASS_INST_DIR%%/bin/v.kcv
+%%GRASS_INST_DIR%%/bin/v.kernel
+%%GRASS_INST_DIR%%/bin/v.label
+%%GRASS_INST_DIR%%/bin/v.label.sa
+%%GRASS_INST_DIR%%/bin/v.lidar.correction
+%%GRASS_INST_DIR%%/bin/v.lidar.edgedetection
+%%GRASS_INST_DIR%%/bin/v.lidar.growing
+%%GRASS_INST_DIR%%/bin/v.lrs.create
+%%GRASS_INST_DIR%%/bin/v.lrs.label
+%%GRASS_INST_DIR%%/bin/v.lrs.segment
+%%GRASS_INST_DIR%%/bin/v.lrs.where
+%%GRASS_INST_DIR%%/bin/v.mkgrid
+%%GRASS_INST_DIR%%/bin/v.neighbors
+%%GRASS_INST_DIR%%/bin/v.net
+%%GRASS_INST_DIR%%/bin/v.net.alloc
+%%GRASS_INST_DIR%%/bin/v.net.allpairs
+%%GRASS_INST_DIR%%/bin/v.net.bridge
+%%GRASS_INST_DIR%%/bin/v.net.centrality
+%%GRASS_INST_DIR%%/bin/v.net.components
+%%GRASS_INST_DIR%%/bin/v.net.connectivity
+%%GRASS_INST_DIR%%/bin/v.net.distance
+%%GRASS_INST_DIR%%/bin/v.net.flow
+%%GRASS_INST_DIR%%/bin/v.net.iso
+%%GRASS_INST_DIR%%/bin/v.net.path
+%%GRASS_INST_DIR%%/bin/v.net.salesman
+%%GRASS_INST_DIR%%/bin/v.net.spanningtree
+%%GRASS_INST_DIR%%/bin/v.net.steiner
+%%GRASS_INST_DIR%%/bin/v.net.timetable
+%%GRASS_INST_DIR%%/bin/v.net.visibility
+%%GRASS_INST_DIR%%/bin/v.normal
+%%GRASS_INST_DIR%%/bin/v.out.ascii
+%%GRASS_INST_DIR%%/bin/v.out.dxf
+%%GRASS_INST_DIR%%/bin/v.out.ogr
+%%GRASS_INST_DIR%%/bin/v.out.pov
+%%GRASS_INST_DIR%%/bin/v.out.svg
+%%GRASS_INST_DIR%%/bin/v.out.vtk
+%%GRASS_INST_DIR%%/bin/v.outlier
+%%GRASS_INST_DIR%%/bin/v.overlay
+%%GRASS_INST_DIR%%/bin/v.parallel
+%%GRASS_INST_DIR%%/bin/v.patch
+%%GRASS_INST_DIR%%/bin/v.perturb
+%%GRASS_INST_DIR%%/bin/v.profile
+%%GRASS_INST_DIR%%/bin/v.proj
+%%GRASS_INST_DIR%%/bin/v.qcount
+%%GRASS_INST_DIR%%/bin/v.random
+%%GRASS_INST_DIR%%/bin/v.reclass
+%%GRASS_INST_DIR%%/bin/v.rectify
+%%GRASS_INST_DIR%%/bin/v.sample
+%%GRASS_INST_DIR%%/bin/v.segment
+%%GRASS_INST_DIR%%/bin/v.select
+%%GRASS_INST_DIR%%/bin/v.split
+%%GRASS_INST_DIR%%/bin/v.support
+%%GRASS_INST_DIR%%/bin/v.surf.bspline
+%%GRASS_INST_DIR%%/bin/v.surf.idw
+%%GRASS_INST_DIR%%/bin/v.surf.rst
+%%GRASS_INST_DIR%%/bin/v.timestamp
+%%GRASS_INST_DIR%%/bin/v.to.3d
+%%GRASS_INST_DIR%%/bin/v.to.db
+%%GRASS_INST_DIR%%/bin/v.to.points
+%%GRASS_INST_DIR%%/bin/v.to.rast
+%%GRASS_INST_DIR%%/bin/v.to.rast3
+%%GRASS_INST_DIR%%/bin/v.transform
+%%GRASS_INST_DIR%%/bin/v.type
+%%GRASS_INST_DIR%%/bin/v.univar
+%%GRASS_INST_DIR%%/bin/v.vect.stats
+%%GRASS_INST_DIR%%/bin/v.vol.rst
+%%GRASS_INST_DIR%%/bin/v.voronoi
+%%GRASS_INST_DIR%%/bin/v.what
+%%GRASS_INST_DIR%%/bin/v.what.rast
+%%GRASS_INST_DIR%%/bin/v.what.rast3
+%%GRASS_INST_DIR%%/bin/ximgview
+%%GRASS_INST_DIR%%/contributors.csv
+%%GRASS_INST_DIR%%/contributors_extra.csv
+%%GRASS_INST_DIR%%/demolocation/.grassrc%%VER%%
+%%GRASS_INST_DIR%%/demolocation/PERMANENT/DEFAULT_WIND
+%%GRASS_INST_DIR%%/demolocation/PERMANENT/MYNAME
+%%GRASS_INST_DIR%%/demolocation/PERMANENT/PROJ_EPSG
+%%GRASS_INST_DIR%%/demolocation/PERMANENT/PROJ_INFO
+%%GRASS_INST_DIR%%/demolocation/PERMANENT/PROJ_SRID
+%%GRASS_INST_DIR%%/demolocation/PERMANENT/PROJ_UNITS
+%%GRASS_INST_DIR%%/demolocation/PERMANENT/VAR
+%%GRASS_INST_DIR%%/demolocation/PERMANENT/WIND
+%%GRASS_INST_DIR%%/demolocation/PERMANENT/sqlite/sqlite.db
+%%GRASS_INST_DIR%%/demolocation/PERMANENT/vector/country_boundaries/cidx
+%%GRASS_INST_DIR%%/demolocation/PERMANENT/vector/country_boundaries/coor
+%%GRASS_INST_DIR%%/demolocation/PERMANENT/vector/country_boundaries/dbln
+%%GRASS_INST_DIR%%/demolocation/PERMANENT/vector/country_boundaries/head
+%%GRASS_INST_DIR%%/demolocation/PERMANENT/vector/country_boundaries/hist
+%%GRASS_INST_DIR%%/demolocation/PERMANENT/vector/country_boundaries/sidx
+%%GRASS_INST_DIR%%/demolocation/PERMANENT/vector/country_boundaries/topo
+%%GRASS_INST_DIR%%/docs/html/aspect.png
+%%GRASS_INST_DIR%%/docs/html/aspect_diagram.png
+%%GRASS_INST_DIR%%/docs/html/band_references_scheme.png
+%%GRASS_INST_DIR%%/docs/html/barscales/arrow_ends.png
+%%GRASS_INST_DIR%%/docs/html/barscales/both_ticks.png
+%%GRASS_INST_DIR%%/docs/html/barscales/classic.png
+%%GRASS_INST_DIR%%/docs/html/barscales/down_ticks.png
+%%GRASS_INST_DIR%%/docs/html/barscales/full_checker.png
+%%GRASS_INST_DIR%%/docs/html/barscales/hollow.png
+%%GRASS_INST_DIR%%/docs/html/barscales/line.png
+%%GRASS_INST_DIR%%/docs/html/barscales/mixed_checker.png
+%%GRASS_INST_DIR%%/docs/html/barscales/part_checker.png
+%%GRASS_INST_DIR%%/docs/html/barscales/solid.png
+%%GRASS_INST_DIR%%/docs/html/barscales/tail_checker.png
+%%GRASS_INST_DIR%%/docs/html/barscales/up_ticks.png
+%%GRASS_INST_DIR%%/docs/html/cairodriver.html
+%%GRASS_INST_DIR%%/docs/html/class_graphical.html
+%%GRASS_INST_DIR%%/docs/html/colortables/aspect.png
+%%GRASS_INST_DIR%%/docs/html/colortables/aspectcolr.png
+%%GRASS_INST_DIR%%/docs/html/colortables/bcyr.png
+%%GRASS_INST_DIR%%/docs/html/colortables/bgyr.png
+%%GRASS_INST_DIR%%/docs/html/colortables/blues.png
+%%GRASS_INST_DIR%%/docs/html/colortables/byg.png
+%%GRASS_INST_DIR%%/docs/html/colortables/byr.png
+%%GRASS_INST_DIR%%/docs/html/colortables/celsius.png
+%%GRASS_INST_DIR%%/docs/html/colortables/corine.png
+%%GRASS_INST_DIR%%/docs/html/colortables/curvature.png
+%%GRASS_INST_DIR%%/docs/html/colortables/differences.png
+%%GRASS_INST_DIR%%/docs/html/colortables/elevation.png
+%%GRASS_INST_DIR%%/docs/html/colortables/etopo2.png
+%%GRASS_INST_DIR%%/docs/html/colortables/evi.png
+%%GRASS_INST_DIR%%/docs/html/colortables/fahrenheit.png
+%%GRASS_INST_DIR%%/docs/html/colortables/forest_cover.png
+%%GRASS_INST_DIR%%/docs/html/colortables/gdd.png
+%%GRASS_INST_DIR%%/docs/html/colortables/grass.png
+%%GRASS_INST_DIR%%/docs/html/colortables/greens.png
+%%GRASS_INST_DIR%%/docs/html/colortables/grey.eq.png
+%%GRASS_INST_DIR%%/docs/html/colortables/grey.log.png
+%%GRASS_INST_DIR%%/docs/html/colortables/grey.png
+%%GRASS_INST_DIR%%/docs/html/colortables/grey1.0.png
+%%GRASS_INST_DIR%%/docs/html/colortables/grey255.png
+%%GRASS_INST_DIR%%/docs/html/colortables/gyr.png
+%%GRASS_INST_DIR%%/docs/html/colortables/haxby.png
+%%GRASS_INST_DIR%%/docs/html/colortables/inferno.png
+%%GRASS_INST_DIR%%/docs/html/colortables/kelvin.png
+%%GRASS_INST_DIR%%/docs/html/colortables/magma.png
+%%GRASS_INST_DIR%%/docs/html/colortables/ndvi.png
+%%GRASS_INST_DIR%%/docs/html/colortables/ndwi.png
+%%GRASS_INST_DIR%%/docs/html/colortables/nlcd.png
+%%GRASS_INST_DIR%%/docs/html/colortables/oranges.png
+%%GRASS_INST_DIR%%/docs/html/colortables/plasma.png
+%%GRASS_INST_DIR%%/docs/html/colortables/population.png
+%%GRASS_INST_DIR%%/docs/html/colortables/population_dens.png
+%%GRASS_INST_DIR%%/docs/html/colortables/precipitation.png
+%%GRASS_INST_DIR%%/docs/html/colortables/precipitation_daily.png
+%%GRASS_INST_DIR%%/docs/html/colortables/precipitation_monthly.png
+%%GRASS_INST_DIR%%/docs/html/colortables/rainbow.png
+%%GRASS_INST_DIR%%/docs/html/colortables/ramp.png
+%%GRASS_INST_DIR%%/docs/html/colortables/random.png
+%%GRASS_INST_DIR%%/docs/html/colortables/reds.png
+%%GRASS_INST_DIR%%/docs/html/colortables/roygbiv.png
+%%GRASS_INST_DIR%%/docs/html/colortables/rstcurv.png
+%%GRASS_INST_DIR%%/docs/html/colortables/ryb.png
+%%GRASS_INST_DIR%%/docs/html/colortables/ryg.png
+%%GRASS_INST_DIR%%/docs/html/colortables/sepia.png
+%%GRASS_INST_DIR%%/docs/html/colortables/slope.png
+%%GRASS_INST_DIR%%/docs/html/colortables/soilmoisture.png
+%%GRASS_INST_DIR%%/docs/html/colortables/srtm.png
+%%GRASS_INST_DIR%%/docs/html/colortables/srtm_plus.png
+%%GRASS_INST_DIR%%/docs/html/colortables/terrain.png
+%%GRASS_INST_DIR%%/docs/html/colortables/viridis.png
+%%GRASS_INST_DIR%%/docs/html/colortables/water.png
+%%GRASS_INST_DIR%%/docs/html/colortables/wave.png
+%%GRASS_INST_DIR%%/docs/html/d.background.html
+%%GRASS_INST_DIR%%/docs/html/d.barscale.html
+%%GRASS_INST_DIR%%/docs/html/d.colorlist.html
+%%GRASS_INST_DIR%%/docs/html/d.colortable.html
+%%GRASS_INST_DIR%%/docs/html/d.correlate.html
+%%GRASS_INST_DIR%%/docs/html/d.erase.html
+%%GRASS_INST_DIR%%/docs/html/d.font.html
+%%GRASS_INST_DIR%%/docs/html/d.fontlist.html
+%%GRASS_INST_DIR%%/docs/html/d.frame.html
+%%GRASS_INST_DIR%%/docs/html/d.geodesic.html
+%%GRASS_INST_DIR%%/docs/html/d.graph.html
+%%GRASS_INST_DIR%%/docs/html/d.grid.html
+%%GRASS_INST_DIR%%/docs/html/d.his.html
+%%GRASS_INST_DIR%%/docs/html/d.histogram.html
+%%GRASS_INST_DIR%%/docs/html/d.info.html
+%%GRASS_INST_DIR%%/docs/html/d.labels.html
+%%GRASS_INST_DIR%%/docs/html/d.legend.html
+%%GRASS_INST_DIR%%/docs/html/d.legend.vect.html
+%%GRASS_INST_DIR%%/docs/html/d.linegraph.html
+%%GRASS_INST_DIR%%/docs/html/d.mon.html
+%%GRASS_INST_DIR%%/docs/html/d.northarrow.html
+%%GRASS_INST_DIR%%/docs/html/d.out.file.html
+%%GRASS_INST_DIR%%/docs/html/d.path.html
+%%GRASS_INST_DIR%%/docs/html/d.polar.html
+%%GRASS_INST_DIR%%/docs/html/d.profile.html
+%%GRASS_INST_DIR%%/docs/html/d.rast.arrow.html
+%%GRASS_INST_DIR%%/docs/html/d.rast.edit.html
+%%GRASS_INST_DIR%%/docs/html/d.rast.html
+%%GRASS_INST_DIR%%/docs/html/d.rast.leg.html
+%%GRASS_INST_DIR%%/docs/html/d.rast.num.html
+%%GRASS_INST_DIR%%/docs/html/d.redraw.html
+%%GRASS_INST_DIR%%/docs/html/d.rgb.html
+%%GRASS_INST_DIR%%/docs/html/d.rhumbline.html
+%%GRASS_INST_DIR%%/docs/html/d.shade.html
+%%GRASS_INST_DIR%%/docs/html/d.text.html
+%%GRASS_INST_DIR%%/docs/html/d.title.html
+%%GRASS_INST_DIR%%/docs/html/d.to.rast.html
+%%GRASS_INST_DIR%%/docs/html/d.vect.chart.html
+%%GRASS_INST_DIR%%/docs/html/d.vect.chart_example.jpg
+%%GRASS_INST_DIR%%/docs/html/d.vect.html
+%%GRASS_INST_DIR%%/docs/html/d.vect.thematic.html
+%%GRASS_INST_DIR%%/docs/html/d.what.rast.html
+%%GRASS_INST_DIR%%/docs/html/d.what.vect.html
+%%GRASS_INST_DIR%%/docs/html/d.where.html
+%%GRASS_INST_DIR%%/docs/html/d_background.png
+%%GRASS_INST_DIR%%/docs/html/d_correlate_plot.png
+%%GRASS_INST_DIR%%/docs/html/d_frame.png
+%%GRASS_INST_DIR%%/docs/html/d_geodesic.png
+%%GRASS_INST_DIR%%/docs/html/d_grid_blue_grid.png
+%%GRASS_INST_DIR%%/docs/html/d_grid_red_grid.png
+%%GRASS_INST_DIR%%/docs/html/d_histogram_bar.png
+%%GRASS_INST_DIR%%/docs/html/d_histogram_pie.png
+%%GRASS_INST_DIR%%/docs/html/d_legend.png
+%%GRASS_INST_DIR%%/docs/html/d_legend_custom_labels_and_background.png
+%%GRASS_INST_DIR%%/docs/html/d_legend_logarithmic.png
+%%GRASS_INST_DIR%%/docs/html/d_legend_vect.png
+%%GRASS_INST_DIR%%/docs/html/d_legend_vect_subheadings.png
+%%GRASS_INST_DIR%%/docs/html/d_mon_wx0.png
+%%GRASS_INST_DIR%%/docs/html/d_mon_wx0_raster.png
+%%GRASS_INST_DIR%%/docs/html/d_polar_aspect.png
+%%GRASS_INST_DIR%%/docs/html/d_rast_arrow_wind.png
+%%GRASS_INST_DIR%%/docs/html/d_rast_edit.png
+%%GRASS_INST_DIR%%/docs/html/d_rast_elevation.png
+%%GRASS_INST_DIR%%/docs/html/d_rast_elevation_values.png
+%%GRASS_INST_DIR%%/docs/html/d_rast_landuse.png
+%%GRASS_INST_DIR%%/docs/html/d_rast_num_zoom.png
+%%GRASS_INST_DIR%%/docs/html/d_rgb.png
+%%GRASS_INST_DIR%%/docs/html/d_rhumbline.png
+%%GRASS_INST_DIR%%/docs/html/d_text.png
+%%GRASS_INST_DIR%%/docs/html/d_to_rast_3D_example.jpg
+%%GRASS_INST_DIR%%/docs/html/d_vect_chart_pie_2d.png
+%%GRASS_INST_DIR%%/docs/html/d_vect_chart_pie_3d.png
+%%GRASS_INST_DIR%%/docs/html/d_vect_thematic.png
+%%GRASS_INST_DIR%%/docs/html/database.html
+%%GRASS_INST_DIR%%/docs/html/database_graphical.html
+%%GRASS_INST_DIR%%/docs/html/databaseintro.html
+%%GRASS_INST_DIR%%/docs/html/datacatalog.png
+%%GRASS_INST_DIR%%/docs/html/db.columns.html
+%%GRASS_INST_DIR%%/docs/html/db.connect.html
+%%GRASS_INST_DIR%%/docs/html/db.copy.html
+%%GRASS_INST_DIR%%/docs/html/db.createdb.html
+%%GRASS_INST_DIR%%/docs/html/db.databases.html
+%%GRASS_INST_DIR%%/docs/html/db.describe.html
+%%GRASS_INST_DIR%%/docs/html/db.drivers.html
+%%GRASS_INST_DIR%%/docs/html/db.dropcolumn.html
+%%GRASS_INST_DIR%%/docs/html/db.dropdb.html
+%%GRASS_INST_DIR%%/docs/html/db.droptable.html
+%%GRASS_INST_DIR%%/docs/html/db.execute.html
+%%GRASS_INST_DIR%%/docs/html/db.in.ogr.html
+%%GRASS_INST_DIR%%/docs/html/db.login.html
+%%GRASS_INST_DIR%%/docs/html/db.out.ogr.html
+%%GRASS_INST_DIR%%/docs/html/db.select.html
+%%GRASS_INST_DIR%%/docs/html/db.tables.html
+%%GRASS_INST_DIR%%/docs/html/db.test.html
+%%GRASS_INST_DIR%%/docs/html/db.univar.html
+%%GRASS_INST_DIR%%/docs/html/dbmgr_frame.png
+%%GRASS_INST_DIR%%/docs/html/dbmgr_sql_builder.png
+%%GRASS_INST_DIR%%/docs/html/dem.png
+%%GRASS_INST_DIR%%/docs/html/display.html
+%%GRASS_INST_DIR%%/docs/html/display_graphical.html
+%%GRASS_INST_DIR%%/docs/html/displaydrivers.html
+%%GRASS_INST_DIR%%/docs/html/dshade.png
+%%GRASS_INST_DIR%%/docs/html/full_index.html
+%%GRASS_INST_DIR%%/docs/html/g.access.html
+%%GRASS_INST_DIR%%/docs/html/g.cairocomp.html
+%%GRASS_INST_DIR%%/docs/html/g.copy.html
+%%GRASS_INST_DIR%%/docs/html/g.dirseps.html
+%%GRASS_INST_DIR%%/docs/html/g.download.location.html
+%%GRASS_INST_DIR%%/docs/html/g.extension.all.html
+%%GRASS_INST_DIR%%/docs/html/g.extension.html
+%%GRASS_INST_DIR%%/docs/html/g.filename.html
+%%GRASS_INST_DIR%%/docs/html/g.findetc.html
+%%GRASS_INST_DIR%%/docs/html/g.findfile.html
+%%GRASS_INST_DIR%%/docs/html/g.gisenv.html
+%%GRASS_INST_DIR%%/docs/html/g.gui.animation.html
+%%GRASS_INST_DIR%%/docs/html/g.gui.datacatalog.html
+%%GRASS_INST_DIR%%/docs/html/g.gui.dbmgr.html
+%%GRASS_INST_DIR%%/docs/html/g.gui.gcp.html
+%%GRASS_INST_DIR%%/docs/html/g.gui.gmodeler.html
+%%GRASS_INST_DIR%%/docs/html/g.gui.html
+%%GRASS_INST_DIR%%/docs/html/g.gui.iclass.html
+%%GRASS_INST_DIR%%/docs/html/g.gui.image2target.html
+%%GRASS_INST_DIR%%/docs/html/g.gui.mapswipe.html
+%%GRASS_INST_DIR%%/docs/html/g.gui.photo2image.html
+%%GRASS_INST_DIR%%/docs/html/g.gui.psmap.html
+%%GRASS_INST_DIR%%/docs/html/g.gui.rdigit.html
+%%GRASS_INST_DIR%%/docs/html/g.gui.rlisetup.html
+%%GRASS_INST_DIR%%/docs/html/g.gui.timeline.html
+%%GRASS_INST_DIR%%/docs/html/g.gui.tplot.html
+%%GRASS_INST_DIR%%/docs/html/g.gui.vdigit.html
+%%GRASS_INST_DIR%%/docs/html/g.list.html
+%%GRASS_INST_DIR%%/docs/html/g.manual.html
+%%GRASS_INST_DIR%%/docs/html/g.mapset.html
+%%GRASS_INST_DIR%%/docs/html/g.mapsets.html
+%%GRASS_INST_DIR%%/docs/html/g.message.html
+%%GRASS_INST_DIR%%/docs/html/g.mkfontcap.html
+%%GRASS_INST_DIR%%/docs/html/g.parser.html
+%%GRASS_INST_DIR%%/docs/html/g.pnmcomp.html
+%%GRASS_INST_DIR%%/docs/html/g.ppmtopng.html
+%%GRASS_INST_DIR%%/docs/html/g.proj.html
+%%GRASS_INST_DIR%%/docs/html/g.region.html
+%%GRASS_INST_DIR%%/docs/html/g.remove.html
+%%GRASS_INST_DIR%%/docs/html/g.rename.html
+%%GRASS_INST_DIR%%/docs/html/g.search.modules.html
+%%GRASS_INST_DIR%%/docs/html/g.tempfile.html
+%%GRASS_INST_DIR%%/docs/html/g.version.html
+%%GRASS_INST_DIR%%/docs/html/g_gui_gmodeler_avg_map.png
+%%GRASS_INST_DIR%%/docs/html/g_gui_gmodeler_avg_run.png
+%%GRASS_INST_DIR%%/docs/html/g_gui_gmodeler_comment.png
+%%GRASS_INST_DIR%%/docs/html/g_gui_gmodeler_db.png
+%%GRASS_INST_DIR%%/docs/html/g_gui_gmodeler_dlg_module.png
+%%GRASS_INST_DIR%%/docs/html/g_gui_gmodeler_intermediate_data.png
+%%GRASS_INST_DIR%%/docs/html/g_gui_gmodeler_items.png
+%%GRASS_INST_DIR%%/docs/html/g_gui_gmodeler_loop.png
+%%GRASS_INST_DIR%%/docs/html/g_gui_gmodeler_loop_dlg.png
+%%GRASS_INST_DIR%%/docs/html/g_gui_gmodeler_loop_final.png
+%%GRASS_INST_DIR%%/docs/html/g_gui_gmodeler_lower_toolbar.png
+%%GRASS_INST_DIR%%/docs/html/g_gui_gmodeler_mcomment.png
+%%GRASS_INST_DIR%%/docs/html/g_gui_gmodeler_mdb.png
+%%GRASS_INST_DIR%%/docs/html/g_gui_gmodeler_mloop.png
+%%GRASS_INST_DIR%%/docs/html/g_gui_gmodeler_mmodule.png
+%%GRASS_INST_DIR%%/docs/html/g_gui_gmodeler_mmodulex.png
+%%GRASS_INST_DIR%%/docs/html/g_gui_gmodeler_model_avg.png
+%%GRASS_INST_DIR%%/docs/html/g_gui_gmodeler_model_classification.png
+%%GRASS_INST_DIR%%/docs/html/g_gui_gmodeler_model_landslides.png
+%%GRASS_INST_DIR%%/docs/html/g_gui_gmodeler_model_properties.png
+%%GRASS_INST_DIR%%/docs/html/g_gui_gmodeler_model_usle.png
+%%GRASS_INST_DIR%%/docs/html/g_gui_gmodeler_modis_1.png
+%%GRASS_INST_DIR%%/docs/html/g_gui_gmodeler_modis_1o.png
+%%GRASS_INST_DIR%%/docs/html/g_gui_gmodeler_modis_2.png
+%%GRASS_INST_DIR%%/docs/html/g_gui_gmodeler_modis_2o.png
+%%GRASS_INST_DIR%%/docs/html/g_gui_gmodeler_modis_3.png
+%%GRASS_INST_DIR%%/docs/html/g_gui_gmodeler_modis_3o.png
+%%GRASS_INST_DIR%%/docs/html/g_gui_gmodeler_modul.png
+%%GRASS_INST_DIR%%/docs/html/g_gui_gmodeler_modulex.png
+%%GRASS_INST_DIR%%/docs/html/g_gui_gmodeler_mraster.png
+%%GRASS_INST_DIR%%/docs/html/g_gui_gmodeler_mraster3d.png
+%%GRASS_INST_DIR%%/docs/html/g_gui_gmodeler_mrelation.png
+%%GRASS_INST_DIR%%/docs/html/g_gui_gmodeler_mvector.png
+%%GRASS_INST_DIR%%/docs/html/g_gui_gmodeler_parameter.png
+%%GRASS_INST_DIR%%/docs/html/g_gui_gmodeler_python.png
+%%GRASS_INST_DIR%%/docs/html/g_gui_gmodeler_python_code.png
+%%GRASS_INST_DIR%%/docs/html/g_gui_gmodeler_python_code_result.png
+%%GRASS_INST_DIR%%/docs/html/g_gui_gmodeler_pywps_code.png
+%%GRASS_INST_DIR%%/docs/html/g_gui_gmodeler_raster.png
+%%GRASS_INST_DIR%%/docs/html/g_gui_gmodeler_raster3d.png
+%%GRASS_INST_DIR%%/docs/html/g_gui_gmodeler_relation.png
+%%GRASS_INST_DIR%%/docs/html/g_gui_gmodeler_toolbar.png
+%%GRASS_INST_DIR%%/docs/html/g_gui_gmodeler_variables.png
+%%GRASS_INST_DIR%%/docs/html/g_gui_gmodeler_variables_raster.png
+%%GRASS_INST_DIR%%/docs/html/g_gui_gmodeler_variables_run.png
+%%GRASS_INST_DIR%%/docs/html/g_gui_gmodeler_vector.png
+%%GRASS_INST_DIR%%/docs/html/g_gui_gmodeler_zipcodes_avg_elevation.gxm
+%%GRASS_INST_DIR%%/docs/html/g_gui_rlisetup_1.png
+%%GRASS_INST_DIR%%/docs/html/g_gui_rlisetup_2.png
+%%GRASS_INST_DIR%%/docs/html/g_gui_rlisetup_3.png
+%%GRASS_INST_DIR%%/docs/html/g_gui_rlisetup_4.png
+%%GRASS_INST_DIR%%/docs/html/g_gui_rlisetup_5.png
+%%GRASS_INST_DIR%%/docs/html/g_gui_rlisetup_6.png
+%%GRASS_INST_DIR%%/docs/html/g_gui_rlisetup_7.png
+%%GRASS_INST_DIR%%/docs/html/g_gui_rlisetup_8.png
+%%GRASS_INST_DIR%%/docs/html/g_gui_rlisetup_sample_areas.png
+%%GRASS_INST_DIR%%/docs/html/g_gui_tplot_export_csv.png
+%%GRASS_INST_DIR%%/docs/html/g_gui_tplot_labels.png
+%%GRASS_INST_DIR%%/docs/html/g_mapsets_gui.png
+%%GRASS_INST_DIR%%/docs/html/g_parser_test.png
+%%GRASS_INST_DIR%%/docs/html/general.html
+%%GRASS_INST_DIR%%/docs/html/general_graphical.html
+%%GRASS_INST_DIR%%/docs/html/geomorphon.png
+%%GRASS_INST_DIR%%/docs/html/gi_3dview.jpg
+%%GRASS_INST_DIR%%/docs/html/gi_addons.jpg
+%%GRASS_INST_DIR%%/docs/html/gi_c.jpg
+%%GRASS_INST_DIR%%/docs/html/gi_cartography.jpg
+%%GRASS_INST_DIR%%/docs/html/gi_database.jpg
+%%GRASS_INST_DIR%%/docs/html/gi_display.jpg
+%%GRASS_INST_DIR%%/docs/html/gi_gallery.jpg
+%%GRASS_INST_DIR%%/docs/html/gi_general.jpg
+%%GRASS_INST_DIR%%/docs/html/gi_gui.jpg
+%%GRASS_INST_DIR%%/docs/html/gi_imagery.jpg
+%%GRASS_INST_DIR%%/docs/html/gi_miscellaneous.jpg
+%%GRASS_INST_DIR%%/docs/html/gi_python.jpg
+%%GRASS_INST_DIR%%/docs/html/gi_raster.jpg
+%%GRASS_INST_DIR%%/docs/html/gi_raster3d.jpg
+%%GRASS_INST_DIR%%/docs/html/gi_temporal.jpg
+%%GRASS_INST_DIR%%/docs/html/gi_vector.jpg
+%%GRASS_INST_DIR%%/docs/html/graphical_index.html
+%%GRASS_INST_DIR%%/docs/html/grass-dbf.html
+%%GRASS_INST_DIR%%/docs/html/grass-ogr.html
+%%GRASS_INST_DIR%%/docs/html/grass-sqlite.html
+%%GRASS_INST_DIR%%/docs/html/grass.html
+%%GRASS_INST_DIR%%/docs/html/grass_arch.png
+%%GRASS_INST_DIR%%/docs/html/grass_database.html
+%%GRASS_INST_DIR%%/docs/html/grass_database.png
+%%GRASS_INST_DIR%%/docs/html/grass_icon.png
+%%GRASS_INST_DIR%%/docs/html/grass_logo.png
+%%GRASS_INST_DIR%%/docs/html/grass_logo.txt
+%%GRASS_INST_DIR%%/docs/html/grass_start.png
+%%GRASS_INST_DIR%%/docs/html/grassdb.png
+%%GRASS_INST_DIR%%/docs/html/grassdocs.css
+%%GRASS_INST_DIR%%/docs/html/guimodules_graphical.html
+%%GRASS_INST_DIR%%/docs/html/hamburger_menu.svg
+%%GRASS_INST_DIR%%/docs/html/hamburger_menu_close.svg
+%%GRASS_INST_DIR%%/docs/html/help_loc_struct.png
+%%GRASS_INST_DIR%%/docs/html/helptext.html
+%%GRASS_INST_DIR%%/docs/html/htmldriver.html
+%%GRASS_INST_DIR%%/docs/html/i.albedo.html
+%%GRASS_INST_DIR%%/docs/html/i.aster.toar.html
+%%GRASS_INST_DIR%%/docs/html/i.atcorr.html
+%%GRASS_INST_DIR%%/docs/html/i.band.library.html
+%%GRASS_INST_DIR%%/docs/html/i.biomass.html
+%%GRASS_INST_DIR%%/docs/html/i.cca.html
+%%GRASS_INST_DIR%%/docs/html/i.cluster.html
+%%GRASS_INST_DIR%%/docs/html/i.colors.enhance.html
+%%GRASS_INST_DIR%%/docs/html/i.eb.eta.html
+%%GRASS_INST_DIR%%/docs/html/i.eb.evapfr.html
+%%GRASS_INST_DIR%%/docs/html/i.eb.hsebal01.html
+%%GRASS_INST_DIR%%/docs/html/i.eb.netrad.html
+%%GRASS_INST_DIR%%/docs/html/i.eb.soilheatflux.html
+%%GRASS_INST_DIR%%/docs/html/i.emissivity.html
+%%GRASS_INST_DIR%%/docs/html/i.evapo.mh.html
+%%GRASS_INST_DIR%%/docs/html/i.evapo.pm.html
+%%GRASS_INST_DIR%%/docs/html/i.evapo.pt.html
+%%GRASS_INST_DIR%%/docs/html/i.evapo.time.html
+%%GRASS_INST_DIR%%/docs/html/i.fft.html
+%%GRASS_INST_DIR%%/docs/html/i.gensig.html
+%%GRASS_INST_DIR%%/docs/html/i.gensigset.html
+%%GRASS_INST_DIR%%/docs/html/i.group.html
+%%GRASS_INST_DIR%%/docs/html/i.his.rgb.html
+%%GRASS_INST_DIR%%/docs/html/i.ifft.html
+%%GRASS_INST_DIR%%/docs/html/i.image.mosaic.html
+%%GRASS_INST_DIR%%/docs/html/i.in.spotvgt.html
+%%GRASS_INST_DIR%%/docs/html/i.landsat.acca.html
+%%GRASS_INST_DIR%%/docs/html/i.landsat.toar.html
+%%GRASS_INST_DIR%%/docs/html/i.maxlik.html
+%%GRASS_INST_DIR%%/docs/html/i.modis.qc.html
+%%GRASS_INST_DIR%%/docs/html/i.oif.html
+%%GRASS_INST_DIR%%/docs/html/i.ortho.camera.html
+%%GRASS_INST_DIR%%/docs/html/i.ortho.elev.html
+%%GRASS_INST_DIR%%/docs/html/i.ortho.init.html
+%%GRASS_INST_DIR%%/docs/html/i.ortho.photo.html
+%%GRASS_INST_DIR%%/docs/html/i.ortho.rectify.html
+%%GRASS_INST_DIR%%/docs/html/i.ortho.target.html
+%%GRASS_INST_DIR%%/docs/html/i.ortho.transform.html
+%%GRASS_INST_DIR%%/docs/html/i.pansharpen.html
+%%GRASS_INST_DIR%%/docs/html/i.pca.html
+%%GRASS_INST_DIR%%/docs/html/i.rectify.html
+%%GRASS_INST_DIR%%/docs/html/i.rgb.his.html
+%%GRASS_INST_DIR%%/docs/html/i.segment.html
+%%GRASS_INST_DIR%%/docs/html/i.smap.html
+%%GRASS_INST_DIR%%/docs/html/i.spectral.html
+%%GRASS_INST_DIR%%/docs/html/i.target.html
+%%GRASS_INST_DIR%%/docs/html/i.tasscap.html
+%%GRASS_INST_DIR%%/docs/html/i.topo.corr.html
+%%GRASS_INST_DIR%%/docs/html/i.vi.html
+%%GRASS_INST_DIR%%/docs/html/i.zc.html
+%%GRASS_INST_DIR%%/docs/html/i_albedo_landsat5.png
+%%GRASS_INST_DIR%%/docs/html/i_albedo_landsat7.png
+%%GRASS_INST_DIR%%/docs/html/i_atcorr_B02_atcorr.png
+%%GRASS_INST_DIR%%/docs/html/i_cluster_landsat_clustering.png
+%%GRASS_INST_DIR%%/docs/html/i_colors_enhance_corrected.jpg
+%%GRASS_INST_DIR%%/docs/html/i_colors_enhance_uncorrected.jpg
+%%GRASS_INST_DIR%%/docs/html/i_evapo_time.png
+%%GRASS_INST_DIR%%/docs/html/i_maxlik_classes.png
+%%GRASS_INST_DIR%%/docs/html/i_maxlik_rejection.png
+%%GRASS_INST_DIR%%/docs/html/i_maxlik_rgb.png
+%%GRASS_INST_DIR%%/docs/html/i_ortho_camera.png
+%%GRASS_INST_DIR%%/docs/html/i_ortho_photo_step1.png
+%%GRASS_INST_DIR%%/docs/html/i_ortho_photo_step5.png
+%%GRASS_INST_DIR%%/docs/html/i_ortho_photo_step6.png
+%%GRASS_INST_DIR%%/docs/html/i_ortho_photo_step7.png
+%%GRASS_INST_DIR%%/docs/html/i_ortho_photo_step8.png
+%%GRASS_INST_DIR%%/docs/html/i_pansharpen_rgb_brovey542.jpg
+%%GRASS_INST_DIR%%/docs/html/i_pansharpen_rgb_ihs542.jpg
+%%GRASS_INST_DIR%%/docs/html/i_pansharpen_rgb_landsat542.jpg
+%%GRASS_INST_DIR%%/docs/html/i_pansharpen_rgb_pca542.jpg
+%%GRASS_INST_DIR%%/docs/html/i_pca_result.png
+%%GRASS_INST_DIR%%/docs/html/i_segment_lsat7_pan.png
+%%GRASS_INST_DIR%%/docs/html/i_segment_lsat7_seg_min100.png
+%%GRASS_INST_DIR%%/docs/html/i_segment_lsat7_seg_min5.png
+%%GRASS_INST_DIR%%/docs/html/i_segment_ortho_segs_final.jpg
+%%GRASS_INST_DIR%%/docs/html/i_segment_ortho_segs_l1.jpg
+%%GRASS_INST_DIR%%/docs/html/i_segment_ortho_segs_l2_l5.jpg
+%%GRASS_INST_DIR%%/docs/html/i_spectral.png
+%%GRASS_INST_DIR%%/docs/html/i_tasscap_brightness.jpg
+%%GRASS_INST_DIR%%/docs/html/i_tasscap_greenness.jpg
+%%GRASS_INST_DIR%%/docs/html/i_tasscap_haze.jpg
+%%GRASS_INST_DIR%%/docs/html/i_tasscap_wetness.jpg
+%%GRASS_INST_DIR%%/docs/html/i_topo_corr_angles.png
+%%GRASS_INST_DIR%%/docs/html/i_vi_arvi.png
+%%GRASS_INST_DIR%%/docs/html/i_vi_gari.png
+%%GRASS_INST_DIR%%/docs/html/i_vi_ndvi.png
+%%GRASS_INST_DIR%%/docs/html/iclass_frame.jpg
+%%GRASS_INST_DIR%%/docs/html/icons/3d-help.png
+%%GRASS_INST_DIR%%/docs/html/icons/3d-rotate.png
+%%GRASS_INST_DIR%%/docs/html/icons/3d-settings.png
+%%GRASS_INST_DIR%%/docs/html/icons/area-measure.png
+%%GRASS_INST_DIR%%/docs/html/icons/aspect-arrow.png
+%%GRASS_INST_DIR%%/docs/html/icons/attributes-display.png
+%%GRASS_INST_DIR%%/docs/html/icons/boundary-create.png
+%%GRASS_INST_DIR%%/docs/html/icons/cats-copy.png
+%%GRASS_INST_DIR%%/docs/html/icons/cats-display.png
+%%GRASS_INST_DIR%%/docs/html/icons/cell-cats.png
+%%GRASS_INST_DIR%%/docs/html/icons/centroid-create.png
+%%GRASS_INST_DIR%%/docs/html/icons/check.png
+%%GRASS_INST_DIR%%/docs/html/icons/create.png
+%%GRASS_INST_DIR%%/docs/html/icons/data-add.png
+%%GRASS_INST_DIR%%/docs/html/icons/edit.png
+%%GRASS_INST_DIR%%/docs/html/icons/erase.png
+%%GRASS_INST_DIR%%/docs/html/icons/execute.png
+%%GRASS_INST_DIR%%/docs/html/icons/flythrough.png
+%%GRASS_INST_DIR%%/docs/html/icons/font.png
+%%GRASS_INST_DIR%%/docs/html/icons/gcp-add.png
+%%GRASS_INST_DIR%%/docs/html/icons/gcp-create.png
+%%GRASS_INST_DIR%%/docs/html/icons/gcp-delete.png
+%%GRASS_INST_DIR%%/docs/html/icons/gcp-remove.png
+%%GRASS_INST_DIR%%/docs/html/icons/gcp-rms.png
+%%GRASS_INST_DIR%%/docs/html/icons/gcp-save.png
+%%GRASS_INST_DIR%%/docs/html/icons/georectify.png
+%%GRASS_INST_DIR%%/docs/html/icons/grassdb-add.png
+%%GRASS_INST_DIR%%/docs/html/icons/grassdb.png
+%%GRASS_INST_DIR%%/docs/html/icons/help.png
+%%GRASS_INST_DIR%%/docs/html/icons/his.png
+%%GRASS_INST_DIR%%/docs/html/icons/image-add.png
+%%GRASS_INST_DIR%%/docs/html/icons/image-export.png
+%%GRASS_INST_DIR%%/docs/html/icons/info.png
+%%GRASS_INST_DIR%%/docs/html/icons/label-add.png
+%%GRASS_INST_DIR%%/docs/html/icons/label.png
+%%GRASS_INST_DIR%%/docs/html/icons/layer-add.png
+%%GRASS_INST_DIR%%/docs/html/icons/layer-aspect-arrow-add.png
+%%GRASS_INST_DIR%%/docs/html/icons/layer-bottom.png
+%%GRASS_INST_DIR%%/docs/html/icons/layer-cell-cats-add.png
+%%GRASS_INST_DIR%%/docs/html/icons/layer-command-add.png
+%%GRASS_INST_DIR%%/docs/html/icons/layer-down.png
+%%GRASS_INST_DIR%%/docs/html/icons/layer-edit.png
+%%GRASS_INST_DIR%%/docs/html/icons/layer-export.png
+%%GRASS_INST_DIR%%/docs/html/icons/layer-grid-add.png
+%%GRASS_INST_DIR%%/docs/html/icons/layer-group-add.png
+%%GRASS_INST_DIR%%/docs/html/icons/layer-his-add.png
+%%GRASS_INST_DIR%%/docs/html/icons/layer-import.png
+%%GRASS_INST_DIR%%/docs/html/icons/layer-info.png
+%%GRASS_INST_DIR%%/docs/html/icons/layer-label-add.png
+%%GRASS_INST_DIR%%/docs/html/icons/layer-more.png
+%%GRASS_INST_DIR%%/docs/html/icons/layer-opacity.png
+%%GRASS_INST_DIR%%/docs/html/icons/layer-open.png
+%%GRASS_INST_DIR%%/docs/html/icons/layer-raster-add.png
+%%GRASS_INST_DIR%%/docs/html/icons/layer-raster-analyze.png
+%%GRASS_INST_DIR%%/docs/html/icons/layer-raster-histogram.png
+%%GRASS_INST_DIR%%/docs/html/icons/layer-raster-more.png
+%%GRASS_INST_DIR%%/docs/html/icons/layer-raster-profile.png
+%%GRASS_INST_DIR%%/docs/html/icons/layer-raster3d-add.png
+%%GRASS_INST_DIR%%/docs/html/icons/layer-redraw.png
+%%GRASS_INST_DIR%%/docs/html/icons/layer-remove.png
+%%GRASS_INST_DIR%%/docs/html/icons/layer-rgb-add.png
+%%GRASS_INST_DIR%%/docs/html/icons/layer-shaded-relief-add.png
+%%GRASS_INST_DIR%%/docs/html/icons/layer-up.png
+%%GRASS_INST_DIR%%/docs/html/icons/layer-vector-add.png
+%%GRASS_INST_DIR%%/docs/html/icons/layer-vector-chart-add.png
+%%GRASS_INST_DIR%%/docs/html/icons/layer-vector-more.png
+%%GRASS_INST_DIR%%/docs/html/icons/layer-vector-thematic-add.png
+%%GRASS_INST_DIR%%/docs/html/icons/layer-wms-add.png
+%%GRASS_INST_DIR%%/docs/html/icons/legend-add.png
+%%GRASS_INST_DIR%%/docs/html/icons/line-add.png
+%%GRASS_INST_DIR%%/docs/html/icons/line-create.png
+%%GRASS_INST_DIR%%/docs/html/icons/line-delete.png
+%%GRASS_INST_DIR%%/docs/html/icons/line-edit.png
+%%GRASS_INST_DIR%%/docs/html/icons/line-move.png
+%%GRASS_INST_DIR%%/docs/html/icons/line-split.png
+%%GRASS_INST_DIR%%/docs/html/icons/location-add.png
+%%GRASS_INST_DIR%%/docs/html/icons/location-download.png
+%%GRASS_INST_DIR%%/docs/html/icons/location.png
+%%GRASS_INST_DIR%%/docs/html/icons/locked.png
+%%GRASS_INST_DIR%%/docs/html/icons/loop-add.png
+%%GRASS_INST_DIR%%/docs/html/icons/map-add.png
+%%GRASS_INST_DIR%%/docs/html/icons/map-export.png
+%%GRASS_INST_DIR%%/docs/html/icons/map-info.png
+%%GRASS_INST_DIR%%/docs/html/icons/map-settings.png
+%%GRASS_INST_DIR%%/docs/html/icons/mapset-add.png
+%%GRASS_INST_DIR%%/docs/html/icons/mapset.png
+%%GRASS_INST_DIR%%/docs/html/icons/measure-length.png
+%%GRASS_INST_DIR%%/docs/html/icons/modeler-main.png
+%%GRASS_INST_DIR%%/docs/html/icons/modeler-variables.png
+%%GRASS_INST_DIR%%/docs/html/icons/module-add.png
+%%GRASS_INST_DIR%%/docs/html/icons/monitor-create.png
+%%GRASS_INST_DIR%%/docs/html/icons/monitor-settings.png
+%%GRASS_INST_DIR%%/docs/html/icons/move.png
+%%GRASS_INST_DIR%%/docs/html/icons/north-arrow-add.png
+%%GRASS_INST_DIR%%/docs/html/icons/open.png
+%%GRASS_INST_DIR%%/docs/html/icons/options.png
+%%GRASS_INST_DIR%%/docs/html/icons/overlay-add.png
+%%GRASS_INST_DIR%%/docs/html/icons/page-settings.png
+%%GRASS_INST_DIR%%/docs/html/icons/pan.png
+%%GRASS_INST_DIR%%/docs/html/icons/pdf-export.png
+%%GRASS_INST_DIR%%/docs/html/icons/player-back.png
+%%GRASS_INST_DIR%%/docs/html/icons/player-pause.png
+%%GRASS_INST_DIR%%/docs/html/icons/player-repeat-back-forward.png
+%%GRASS_INST_DIR%%/docs/html/icons/player-stop.png
+%%GRASS_INST_DIR%%/docs/html/icons/point-add.png
+%%GRASS_INST_DIR%%/docs/html/icons/point-create.png
+%%GRASS_INST_DIR%%/docs/html/icons/pointer.png
+%%GRASS_INST_DIR%%/docs/html/icons/polygon-create.png
+%%GRASS_INST_DIR%%/docs/html/icons/polygon-delete.png
+%%GRASS_INST_DIR%%/docs/html/icons/polygon.png
+%%GRASS_INST_DIR%%/docs/html/icons/print-compose.png
+%%GRASS_INST_DIR%%/docs/html/icons/print.png
+%%GRASS_INST_DIR%%/docs/html/icons/ps-export.png
+%%GRASS_INST_DIR%%/docs/html/icons/python-export.png
+%%GRASS_INST_DIR%%/docs/html/icons/python.png
+%%GRASS_INST_DIR%%/docs/html/icons/quit.png
+%%GRASS_INST_DIR%%/docs/html/icons/raster-calculator.png
+%%GRASS_INST_DIR%%/docs/html/icons/raster-import.png
+%%GRASS_INST_DIR%%/docs/html/icons/raster-stats.png
+%%GRASS_INST_DIR%%/docs/html/icons/raster.png
+%%GRASS_INST_DIR%%/docs/html/icons/raster3d.png
+%%GRASS_INST_DIR%%/docs/html/icons/rectangle-add.png
+%%GRASS_INST_DIR%%/docs/html/icons/redo.png
+%%GRASS_INST_DIR%%/docs/html/icons/redraw.png
+%%GRASS_INST_DIR%%/docs/html/icons/region.png
+%%GRASS_INST_DIR%%/docs/html/icons/relation-create.png
+%%GRASS_INST_DIR%%/docs/html/icons/reload.png
+%%GRASS_INST_DIR%%/docs/html/icons/rgb.png
+%%GRASS_INST_DIR%%/docs/html/icons/save.png
+%%GRASS_INST_DIR%%/docs/html/icons/scalebar-add.png
+%%GRASS_INST_DIR%%/docs/html/icons/script-load.png
+%%GRASS_INST_DIR%%/docs/html/icons/script-save.png
+%%GRASS_INST_DIR%%/docs/html/icons/select.png
+%%GRASS_INST_DIR%%/docs/html/icons/settings.png
+%%GRASS_INST_DIR%%/docs/html/icons/shaded-relief.png
+%%GRASS_INST_DIR%%/docs/html/icons/shortest-distance.png
+%%GRASS_INST_DIR%%/docs/html/icons/show.png
+%%GRASS_INST_DIR%%/docs/html/icons/stats.png
+%%GRASS_INST_DIR%%/docs/html/icons/table-manager.png
+%%GRASS_INST_DIR%%/docs/html/icons/table.png
+%%GRASS_INST_DIR%%/docs/html/icons/text-add.png
+%%GRASS_INST_DIR%%/docs/html/icons/tools.png
+%%GRASS_INST_DIR%%/docs/html/icons/undo.png
+%%GRASS_INST_DIR%%/docs/html/icons/unlocked.png
+%%GRASS_INST_DIR%%/docs/html/icons/vector-chart.png
+%%GRASS_INST_DIR%%/docs/html/icons/vector-import.png
+%%GRASS_INST_DIR%%/docs/html/icons/vector-thematic.png
+%%GRASS_INST_DIR%%/docs/html/icons/vector-tools.png
+%%GRASS_INST_DIR%%/docs/html/icons/vector.png
+%%GRASS_INST_DIR%%/docs/html/icons/vertex-create.png
+%%GRASS_INST_DIR%%/docs/html/icons/vertex-delete.png
+%%GRASS_INST_DIR%%/docs/html/icons/vertex-move.png
+%%GRASS_INST_DIR%%/docs/html/icons/wms.png
+%%GRASS_INST_DIR%%/docs/html/icons/zoom-extent.png
+%%GRASS_INST_DIR%%/docs/html/icons/zoom-in.png
+%%GRASS_INST_DIR%%/docs/html/icons/zoom-last.png
+%%GRASS_INST_DIR%%/docs/html/icons/zoom-layer.png
+%%GRASS_INST_DIR%%/docs/html/icons/zoom-more.png
+%%GRASS_INST_DIR%%/docs/html/icons/zoom-out.png
+%%GRASS_INST_DIR%%/docs/html/icons/zoom-region.png
+%%GRASS_INST_DIR%%/docs/html/imagery.html
+%%GRASS_INST_DIR%%/docs/html/imagery_graphical.html
+%%GRASS_INST_DIR%%/docs/html/imageryintro.html
+%%GRASS_INST_DIR%%/docs/html/index.html
+%%GRASS_INST_DIR%%/docs/html/jquery.fixedheadertable.min.js
+%%GRASS_INST_DIR%%/docs/html/keywords.html
+%%GRASS_INST_DIR%%/docs/html/legend.png
+%%GRASS_INST_DIR%%/docs/html/location-add.png
+%%GRASS_INST_DIR%%/docs/html/location-download.png
+%%GRASS_INST_DIR%%/docs/html/location.png
+%%GRASS_INST_DIR%%/docs/html/lrs.html
+%%GRASS_INST_DIR%%/docs/html/m.cogo.html
+%%GRASS_INST_DIR%%/docs/html/m.measure.html
+%%GRASS_INST_DIR%%/docs/html/m.nviz.image.html
+%%GRASS_INST_DIR%%/docs/html/m.nviz.script.html
+%%GRASS_INST_DIR%%/docs/html/m.proj.html
+%%GRASS_INST_DIR%%/docs/html/m.transform.html
+%%GRASS_INST_DIR%%/docs/html/m_measure_distance.png
+%%GRASS_INST_DIR%%/docs/html/manual_gallery.html
+%%GRASS_INST_DIR%%/docs/html/mapset.png
+%%GRASS_INST_DIR%%/docs/html/mapswipe_tsunami.jpg
+%%GRASS_INST_DIR%%/docs/html/miscellaneous.html
+%%GRASS_INST_DIR%%/docs/html/miscellaneous_graphical.html
+%%GRASS_INST_DIR%%/docs/html/northarrows/1a.png
+%%GRASS_INST_DIR%%/docs/html/northarrows/1b.png
+%%GRASS_INST_DIR%%/docs/html/northarrows/2.png
+%%GRASS_INST_DIR%%/docs/html/northarrows/3.png
+%%GRASS_INST_DIR%%/docs/html/northarrows/4.png
+%%GRASS_INST_DIR%%/docs/html/northarrows/5.png
+%%GRASS_INST_DIR%%/docs/html/northarrows/6.png
+%%GRASS_INST_DIR%%/docs/html/northarrows/7a.png
+%%GRASS_INST_DIR%%/docs/html/northarrows/7b.png
+%%GRASS_INST_DIR%%/docs/html/northarrows/8a.png
+%%GRASS_INST_DIR%%/docs/html/northarrows/8b.png
+%%GRASS_INST_DIR%%/docs/html/northarrows/9.png
+%%GRASS_INST_DIR%%/docs/html/northarrows/arrow1.png
+%%GRASS_INST_DIR%%/docs/html/northarrows/arrow2.png
+%%GRASS_INST_DIR%%/docs/html/northarrows/arrow3.png
+%%GRASS_INST_DIR%%/docs/html/northarrows/basic_compass.png
+%%GRASS_INST_DIR%%/docs/html/northarrows/fancy_compass.png
+%%GRASS_INST_DIR%%/docs/html/northarrows/star.png
+%%GRASS_INST_DIR%%/docs/html/parser_standard_options.css
+%%GRASS_INST_DIR%%/docs/html/parser_standard_options.html
+%%GRASS_INST_DIR%%/docs/html/parser_standard_options.js
+%%GRASS_INST_DIR%%/docs/html/pcurv.png
+%%GRASS_INST_DIR%%/docs/html/pngdriver.html
+%%GRASS_INST_DIR%%/docs/html/postscript.html
+%%GRASS_INST_DIR%%/docs/html/postscript_graphical.html
+%%GRASS_INST_DIR%%/docs/html/projectionintro.html
+%%GRASS_INST_DIR%%/docs/html/ps.map.html
+%%GRASS_INST_DIR%%/docs/html/ps_map.png
+%%GRASS_INST_DIR%%/docs/html/ps_map_basic.png
+%%GRASS_INST_DIR%%/docs/html/psdriver.html
+%%GRASS_INST_DIR%%/docs/html/psmap_frame.jpg
+%%GRASS_INST_DIR%%/docs/html/r.basins.fill.html
+%%GRASS_INST_DIR%%/docs/html/r.blend.html
+%%GRASS_INST_DIR%%/docs/html/r.buffer.html
+%%GRASS_INST_DIR%%/docs/html/r.buffer.lowmem.html
+%%GRASS_INST_DIR%%/docs/html/r.buildvrt.html
+%%GRASS_INST_DIR%%/docs/html/r.carve.html
+%%GRASS_INST_DIR%%/docs/html/r.category.html
+%%GRASS_INST_DIR%%/docs/html/r.circle.html
+%%GRASS_INST_DIR%%/docs/html/r.clump.html
+%%GRASS_INST_DIR%%/docs/html/r.coin.html
+%%GRASS_INST_DIR%%/docs/html/r.colors.html
+%%GRASS_INST_DIR%%/docs/html/r.colors.out.html
+%%GRASS_INST_DIR%%/docs/html/r.colors.stddev.html
+%%GRASS_INST_DIR%%/docs/html/r.composite.html
+%%GRASS_INST_DIR%%/docs/html/r.compress.html
+%%GRASS_INST_DIR%%/docs/html/r.contour.html
+%%GRASS_INST_DIR%%/docs/html/r.cost.html
+%%GRASS_INST_DIR%%/docs/html/r.covar.html
+%%GRASS_INST_DIR%%/docs/html/r.cross.html
+%%GRASS_INST_DIR%%/docs/html/r.describe.html
+%%GRASS_INST_DIR%%/docs/html/r.distance.html
+%%GRASS_INST_DIR%%/docs/html/r.drain.html
+%%GRASS_INST_DIR%%/docs/html/r.external.html
+%%GRASS_INST_DIR%%/docs/html/r.external.out.html
+%%GRASS_INST_DIR%%/docs/html/r.fill.dir.html
+%%GRASS_INST_DIR%%/docs/html/r.fill.stats.html
+%%GRASS_INST_DIR%%/docs/html/r.fillnulls.html
+%%GRASS_INST_DIR%%/docs/html/r.flow.html
+%%GRASS_INST_DIR%%/docs/html/r.geomorphon.html
+%%GRASS_INST_DIR%%/docs/html/r.grow.distance.html
+%%GRASS_INST_DIR%%/docs/html/r.grow.html
+%%GRASS_INST_DIR%%/docs/html/r.gwflow.html
+%%GRASS_INST_DIR%%/docs/html/r.his.html
+%%GRASS_INST_DIR%%/docs/html/r.horizon.html
+%%GRASS_INST_DIR%%/docs/html/r.import.html
+%%GRASS_INST_DIR%%/docs/html/r.in.ascii.html
+%%GRASS_INST_DIR%%/docs/html/r.in.aster.html
+%%GRASS_INST_DIR%%/docs/html/r.in.bin.html
+%%GRASS_INST_DIR%%/docs/html/r.in.gdal.html
+%%GRASS_INST_DIR%%/docs/html/r.in.gridatb.html
+%%GRASS_INST_DIR%%/docs/html/r.in.mat.html
+%%GRASS_INST_DIR%%/docs/html/r.in.png.html
+%%GRASS_INST_DIR%%/docs/html/r.in.poly.html
+%%GRASS_INST_DIR%%/docs/html/r.in.srtm.html
+%%GRASS_INST_DIR%%/docs/html/r.in.wms.html
+%%GRASS_INST_DIR%%/docs/html/r.in.xyz.html
+%%GRASS_INST_DIR%%/docs/html/r.info.html
+%%GRASS_INST_DIR%%/docs/html/r.kappa.html
+%%GRASS_INST_DIR%%/docs/html/r.lake.html
+%%GRASS_INST_DIR%%/docs/html/r.latlong.html
+%%GRASS_INST_DIR%%/docs/html/r.li.cwed.html
+%%GRASS_INST_DIR%%/docs/html/r.li.daemon.html
+%%GRASS_INST_DIR%%/docs/html/r.li.dominance.html
+%%GRASS_INST_DIR%%/docs/html/r.li.edgedensity.html
+%%GRASS_INST_DIR%%/docs/html/r.li.html
+%%GRASS_INST_DIR%%/docs/html/r.li.mpa.html
+%%GRASS_INST_DIR%%/docs/html/r.li.mps.html
+%%GRASS_INST_DIR%%/docs/html/r.li.padcv.html
+%%GRASS_INST_DIR%%/docs/html/r.li.padrange.html
+%%GRASS_INST_DIR%%/docs/html/r.li.padsd.html
+%%GRASS_INST_DIR%%/docs/html/r.li.patchdensity.html
+%%GRASS_INST_DIR%%/docs/html/r.li.patchnum.html
+%%GRASS_INST_DIR%%/docs/html/r.li.pielou.html
+%%GRASS_INST_DIR%%/docs/html/r.li.renyi.html
+%%GRASS_INST_DIR%%/docs/html/r.li.richness.html
+%%GRASS_INST_DIR%%/docs/html/r.li.shannon.html
+%%GRASS_INST_DIR%%/docs/html/r.li.shape.html
+%%GRASS_INST_DIR%%/docs/html/r.li.simpson.html
+%%GRASS_INST_DIR%%/docs/html/r.mapcalc.html
+%%GRASS_INST_DIR%%/docs/html/r.mapcalc.simple.html
+%%GRASS_INST_DIR%%/docs/html/r.mask.html
+%%GRASS_INST_DIR%%/docs/html/r.mfilter.html
+%%GRASS_INST_DIR%%/docs/html/r.mode.html
+%%GRASS_INST_DIR%%/docs/html/r.neighbors.html
+%%GRASS_INST_DIR%%/docs/html/r.null.html
+%%GRASS_INST_DIR%%/docs/html/r.object.geometry.html
+%%GRASS_INST_DIR%%/docs/html/r.out.ascii.html
+%%GRASS_INST_DIR%%/docs/html/r.out.bin.html
+%%GRASS_INST_DIR%%/docs/html/r.out.gdal.html
+%%GRASS_INST_DIR%%/docs/html/r.out.gridatb.html
+%%GRASS_INST_DIR%%/docs/html/r.out.mat.html
+%%GRASS_INST_DIR%%/docs/html/r.out.mpeg.html
+%%GRASS_INST_DIR%%/docs/html/r.out.png.html
+%%GRASS_INST_DIR%%/docs/html/r.out.pov.html
+%%GRASS_INST_DIR%%/docs/html/r.out.ppm.html
+%%GRASS_INST_DIR%%/docs/html/r.out.ppm3.html
+%%GRASS_INST_DIR%%/docs/html/r.out.vrml.html
+%%GRASS_INST_DIR%%/docs/html/r.out.vtk.html
+%%GRASS_INST_DIR%%/docs/html/r.out.xyz.html
+%%GRASS_INST_DIR%%/docs/html/r.pack.html
+%%GRASS_INST_DIR%%/docs/html/r.param.scale.html
+%%GRASS_INST_DIR%%/docs/html/r.patch.html
+%%GRASS_INST_DIR%%/docs/html/r.path.html
+%%GRASS_INST_DIR%%/docs/html/r.plane.html
+%%GRASS_INST_DIR%%/docs/html/r.profile.html
+%%GRASS_INST_DIR%%/docs/html/r.proj.html
+%%GRASS_INST_DIR%%/docs/html/r.quant.html
+%%GRASS_INST_DIR%%/docs/html/r.quantile.html
+%%GRASS_INST_DIR%%/docs/html/r.random.cells.html
+%%GRASS_INST_DIR%%/docs/html/r.random.html
+%%GRASS_INST_DIR%%/docs/html/r.random.surface.html
+%%GRASS_INST_DIR%%/docs/html/r.reclass.area.html
+%%GRASS_INST_DIR%%/docs/html/r.reclass.html
+%%GRASS_INST_DIR%%/docs/html/r.recode.html
+%%GRASS_INST_DIR%%/docs/html/r.region.html
+%%GRASS_INST_DIR%%/docs/html/r.regression.line.html
+%%GRASS_INST_DIR%%/docs/html/r.regression.multi.html
+%%GRASS_INST_DIR%%/docs/html/r.relief.html
+%%GRASS_INST_DIR%%/docs/html/r.report.html
+%%GRASS_INST_DIR%%/docs/html/r.resamp.bspline.html
+%%GRASS_INST_DIR%%/docs/html/r.resamp.filter.html
+%%GRASS_INST_DIR%%/docs/html/r.resamp.interp.html
+%%GRASS_INST_DIR%%/docs/html/r.resamp.rst.html
+%%GRASS_INST_DIR%%/docs/html/r.resamp.stats.html
+%%GRASS_INST_DIR%%/docs/html/r.resample.html
+%%GRASS_INST_DIR%%/docs/html/r.rescale.eq.html
+%%GRASS_INST_DIR%%/docs/html/r.rescale.html
+%%GRASS_INST_DIR%%/docs/html/r.rgb.html
+%%GRASS_INST_DIR%%/docs/html/r.ros.html
+%%GRASS_INST_DIR%%/docs/html/r.semantic.label.html
+%%GRASS_INST_DIR%%/docs/html/r.series.accumulate.html
+%%GRASS_INST_DIR%%/docs/html/r.series.html
+%%GRASS_INST_DIR%%/docs/html/r.series.interp.html
+%%GRASS_INST_DIR%%/docs/html/r.shade.html
+%%GRASS_INST_DIR%%/docs/html/r.sim.sediment.html
+%%GRASS_INST_DIR%%/docs/html/r.sim.water.html
+%%GRASS_INST_DIR%%/docs/html/r.slope.aspect.html
+%%GRASS_INST_DIR%%/docs/html/r.solute.transport.html
+%%GRASS_INST_DIR%%/docs/html/r.spread.html
+%%GRASS_INST_DIR%%/docs/html/r.spreadpath.html
+%%GRASS_INST_DIR%%/docs/html/r.statistics.html
+%%GRASS_INST_DIR%%/docs/html/r.stats.html
+%%GRASS_INST_DIR%%/docs/html/r.stats.quantile.html
+%%GRASS_INST_DIR%%/docs/html/r.stats.zonal.html
+%%GRASS_INST_DIR%%/docs/html/r.stream.extract.html
+%%GRASS_INST_DIR%%/docs/html/r.sun.html
+%%GRASS_INST_DIR%%/docs/html/r.sunhours.html
+%%GRASS_INST_DIR%%/docs/html/r.sunmask.html
+%%GRASS_INST_DIR%%/docs/html/r.support.html
+%%GRASS_INST_DIR%%/docs/html/r.support.stats.html
+%%GRASS_INST_DIR%%/docs/html/r.surf.area.html
+%%GRASS_INST_DIR%%/docs/html/r.surf.contour.html
+%%GRASS_INST_DIR%%/docs/html/r.surf.fractal.html
+%%GRASS_INST_DIR%%/docs/html/r.surf.gauss.html
+%%GRASS_INST_DIR%%/docs/html/r.surf.idw.html
+%%GRASS_INST_DIR%%/docs/html/r.surf.random.html
+%%GRASS_INST_DIR%%/docs/html/r.terraflow.html
+%%GRASS_INST_DIR%%/docs/html/r.texture.html
+%%GRASS_INST_DIR%%/docs/html/r.thin.html
+%%GRASS_INST_DIR%%/docs/html/r.tile.html
+%%GRASS_INST_DIR%%/docs/html/r.tileset.html
+%%GRASS_INST_DIR%%/docs/html/r.timestamp.html
+%%GRASS_INST_DIR%%/docs/html/r.to.rast3.html
+%%GRASS_INST_DIR%%/docs/html/r.to.rast3.png
+%%GRASS_INST_DIR%%/docs/html/r.to.rast3elev.html
+%%GRASS_INST_DIR%%/docs/html/r.to.rast3elev.png
+%%GRASS_INST_DIR%%/docs/html/r.to.vect.html
+%%GRASS_INST_DIR%%/docs/html/r.topidx.html
+%%GRASS_INST_DIR%%/docs/html/r.topmodel.html
+%%GRASS_INST_DIR%%/docs/html/r.transect.html
+%%GRASS_INST_DIR%%/docs/html/r.univar.html
+%%GRASS_INST_DIR%%/docs/html/r.unpack.html
+%%GRASS_INST_DIR%%/docs/html/r.uslek.html
+%%GRASS_INST_DIR%%/docs/html/r.usler.html
+%%GRASS_INST_DIR%%/docs/html/r.viewshed.html
+%%GRASS_INST_DIR%%/docs/html/r.viewshed.png
+%%GRASS_INST_DIR%%/docs/html/r.volume.html
+%%GRASS_INST_DIR%%/docs/html/r.walk.html
+%%GRASS_INST_DIR%%/docs/html/r.water.outlet.html
+%%GRASS_INST_DIR%%/docs/html/r.watershed.html
+%%GRASS_INST_DIR%%/docs/html/r.what.color.html
+%%GRASS_INST_DIR%%/docs/html/r.what.html
+%%GRASS_INST_DIR%%/docs/html/r3.colors.html
+%%GRASS_INST_DIR%%/docs/html/r3.colors.out.html
+%%GRASS_INST_DIR%%/docs/html/r3.cross.rast.html
+%%GRASS_INST_DIR%%/docs/html/r3.cross.rast.png
+%%GRASS_INST_DIR%%/docs/html/r3.flow.html
+%%GRASS_INST_DIR%%/docs/html/r3.gradient.html
+%%GRASS_INST_DIR%%/docs/html/r3.gwflow.html
+%%GRASS_INST_DIR%%/docs/html/r3.in.ascii.html
+%%GRASS_INST_DIR%%/docs/html/r3.in.bin.html
+%%GRASS_INST_DIR%%/docs/html/r3.in.v5d.html
+%%GRASS_INST_DIR%%/docs/html/r3.in.xyz.html
+%%GRASS_INST_DIR%%/docs/html/r3.info.html
+%%GRASS_INST_DIR%%/docs/html/r3.mapcalc.html
+%%GRASS_INST_DIR%%/docs/html/r3.mask.html
+%%GRASS_INST_DIR%%/docs/html/r3.mkdspf.html
+%%GRASS_INST_DIR%%/docs/html/r3.neighbors.html
+%%GRASS_INST_DIR%%/docs/html/r3.null.html
+%%GRASS_INST_DIR%%/docs/html/r3.out.ascii.html
+%%GRASS_INST_DIR%%/docs/html/r3.out.bin.html
+%%GRASS_INST_DIR%%/docs/html/r3.out.v5d.html
+%%GRASS_INST_DIR%%/docs/html/r3.out.vtk.html
+%%GRASS_INST_DIR%%/docs/html/r3.retile.html
+%%GRASS_INST_DIR%%/docs/html/r3.stats.html
+%%GRASS_INST_DIR%%/docs/html/r3.support.html
+%%GRASS_INST_DIR%%/docs/html/r3.timestamp.html
+%%GRASS_INST_DIR%%/docs/html/r3.to.rast.html
+%%GRASS_INST_DIR%%/docs/html/r3.to.rast.png
+%%GRASS_INST_DIR%%/docs/html/r3.univar.html
+%%GRASS_INST_DIR%%/docs/html/r3flow_flowlines.png
+%%GRASS_INST_DIR%%/docs/html/r3flow_flowlines_color.png
+%%GRASS_INST_DIR%%/docs/html/r_blend.png
+%%GRASS_INST_DIR%%/docs/html/r_buffer_road.png
+%%GRASS_INST_DIR%%/docs/html/r_carve_dem_carved.png
+%%GRASS_INST_DIR%%/docs/html/r_carve_dem_carved_accum.png
+%%GRASS_INST_DIR%%/docs/html/r_carve_dem_carved_shaded.png
+%%GRASS_INST_DIR%%/docs/html/r_carve_dem_orig.png
+%%GRASS_INST_DIR%%/docs/html/r_carve_dem_orig_accum.png
+%%GRASS_INST_DIR%%/docs/html/r_carve_dem_orig_shaded.png
+%%GRASS_INST_DIR%%/docs/html/r_clump_lakes.png
+%%GRASS_INST_DIR%%/docs/html/r_clump_lsat.png
+%%GRASS_INST_DIR%%/docs/html/r_colors_stddev.png
+%%GRASS_INST_DIR%%/docs/html/r_contour_using_levels.png
+%%GRASS_INST_DIR%%/docs/html/r_drain.png
+%%GRASS_INST_DIR%%/docs/html/r_drain_with_r_watershed_direction.png
+%%GRASS_INST_DIR%%/docs/html/r_fill_dir.png
+%%GRASS_INST_DIR%%/docs/html/r_fill_stats_01.png
+%%GRASS_INST_DIR%%/docs/html/r_fill_stats_02.png
+%%GRASS_INST_DIR%%/docs/html/r_fill_stats_lidar.png
+%%GRASS_INST_DIR%%/docs/html/r_fill_stats_smoothing.png
+%%GRASS_INST_DIR%%/docs/html/r_flow_accumulation.png
+%%GRASS_INST_DIR%%/docs/html/r_flow_length.png
+%%GRASS_INST_DIR%%/docs/html/r_flow_line.png
+%%GRASS_INST_DIR%%/docs/html/r_geomorphon.png
+%%GRASS_INST_DIR%%/docs/html/r_geomorphon_peaks.png
+%%GRASS_INST_DIR%%/docs/html/r_grow_distance.png
+%%GRASS_INST_DIR%%/docs/html/r_grow_distance_sea.png
+%%GRASS_INST_DIR%%/docs/html/r_grow_distance_zoom.png
+%%GRASS_INST_DIR%%/docs/html/r_gwflow_concept.png
+%%GRASS_INST_DIR%%/docs/html/r_in_wms_sentinel2.jpg
+%%GRASS_INST_DIR%%/docs/html/r_lake_lidar_dem.jpg
+%%GRASS_INST_DIR%%/docs/html/r_li_dominance_formula.png
+%%GRASS_INST_DIR%%/docs/html/r_li_edgedensity_formula_1.png
+%%GRASS_INST_DIR%%/docs/html/r_li_edgedensity_formula_2.png
+%%GRASS_INST_DIR%%/docs/html/r_li_pielou.png
+%%GRASS_INST_DIR%%/docs/html/r_li_renyi.png
+%%GRASS_INST_DIR%%/docs/html/r_li_richness_formula.png
+%%GRASS_INST_DIR%%/docs/html/r_li_shannon_formula.png
+%%GRASS_INST_DIR%%/docs/html/r_li_simpson_formula.png
+%%GRASS_INST_DIR%%/docs/html/r_mapcalc_simple.png
+%%GRASS_INST_DIR%%/docs/html/r_mfilter.png
+%%GRASS_INST_DIR%%/docs/html/r_mfilter_benchmark_1.png
+%%GRASS_INST_DIR%%/docs/html/r_mfilter_benchmark_2.png
+%%GRASS_INST_DIR%%/docs/html/r_neighbors.png
+%%GRASS_INST_DIR%%/docs/html/r_neighbors_benchmark_memory.png
+%%GRASS_INST_DIR%%/docs/html/r_neighbors_benchmark_nprocs.png
+%%GRASS_INST_DIR%%/docs/html/r_neighbors_benchmark_size.png
+%%GRASS_INST_DIR%%/docs/html/r_param_scale_morph.jpg
+%%GRASS_INST_DIR%%/docs/html/r_patch.png
+%%GRASS_INST_DIR%%/docs/html/r_patch_benchmark_memory.png
+%%GRASS_INST_DIR%%/docs/html/r_patch_benchmark_size.png
+%%GRASS_INST_DIR%%/docs/html/r_patch_zeros_as_nulls.png
+%%GRASS_INST_DIR%%/docs/html/r_path.png
+%%GRASS_INST_DIR%%/docs/html/r_path_with_bitmask.png
+%%GRASS_INST_DIR%%/docs/html/r_path_with_r_watershed_direction.png
+%%GRASS_INST_DIR%%/docs/html/r_plane_3d.png
+%%GRASS_INST_DIR%%/docs/html/r_random_cells.png
+%%GRASS_INST_DIR%%/docs/html/r_random_surface.jpg
+%%GRASS_INST_DIR%%/docs/html/r_random_surface_hist.png
+%%GRASS_INST_DIR%%/docs/html/r_relief.png
+%%GRASS_INST_DIR%%/docs/html/r_resamp_filter_benchmark_size.png
+%%GRASS_INST_DIR%%/docs/html/r_resamp_interp_benchmark_size.png
+%%GRASS_INST_DIR%%/docs/html/r_resamp_interp_new_250m.png
+%%GRASS_INST_DIR%%/docs/html/r_resamp_interp_orig_500m.png
+%%GRASS_INST_DIR%%/docs/html/r_resamp_stats_6m_20m.png
+%%GRASS_INST_DIR%%/docs/html/r_rgb_elevation.png
+%%GRASS_INST_DIR%%/docs/html/r_series.png
+%%GRASS_INST_DIR%%/docs/html/r_series_benchmark_memory.png
+%%GRASS_INST_DIR%%/docs/html/r_series_benchmark_size.png
+%%GRASS_INST_DIR%%/docs/html/r_sim_water.png
+%%GRASS_INST_DIR%%/docs/html/r_sim_water_water_depth.png
+%%GRASS_INST_DIR%%/docs/html/r_slope_aspect_4_directions.png
+%%GRASS_INST_DIR%%/docs/html/r_slope_aspect_aspect.png
+%%GRASS_INST_DIR%%/docs/html/r_slope_aspect_benchmark_memory.png
+%%GRASS_INST_DIR%%/docs/html/r_slope_aspect_benchmark_size.png
+%%GRASS_INST_DIR%%/docs/html/r_slope_aspect_pcurv.png
+%%GRASS_INST_DIR%%/docs/html/r_slope_aspect_slope.png
+%%GRASS_INST_DIR%%/docs/html/r_slope_aspect_tcurv.png
+%%GRASS_INST_DIR%%/docs/html/r_stats.zonal.png
+%%GRASS_INST_DIR%%/docs/html/r_stream_extract_accum_orig_zoom.png
+%%GRASS_INST_DIR%%/docs/html/r_stream_extract_accum_weighted_zoom.png
+%%GRASS_INST_DIR%%/docs/html/r_stream_extract_streams_noweight.png
+%%GRASS_INST_DIR%%/docs/html/r_stream_extract_streams_weighed.png
+%%GRASS_INST_DIR%%/docs/html/r_stream_extract_weights_zoom.png
+%%GRASS_INST_DIR%%/docs/html/r_sunhours.png
+%%GRASS_INST_DIR%%/docs/html/r_surf_fractal.jpg
+%%GRASS_INST_DIR%%/docs/html/r_surf_fractal_simple.png
+%%GRASS_INST_DIR%%/docs/html/r_surf_gauss.jpg
+%%GRASS_INST_DIR%%/docs/html/r_surf_gauss_hist.png
+%%GRASS_INST_DIR%%/docs/html/r_surf_random.jpg
+%%GRASS_INST_DIR%%/docs/html/r_surf_random_hist.png
+%%GRASS_INST_DIR%%/docs/html/r_texture_directions_example.png
+%%GRASS_INST_DIR%%/docs/html/r_thin_network.png
+%%GRASS_INST_DIR%%/docs/html/r_thin_vectorized.png
+%%GRASS_INST_DIR%%/docs/html/r_topidx.png
+%%GRASS_INST_DIR%%/docs/html/r_univar_benchmark_size.png
+%%GRASS_INST_DIR%%/docs/html/r_volume_lake.png
+%%GRASS_INST_DIR%%/docs/html/r_walk.png
+%%GRASS_INST_DIR%%/docs/html/r_water_outlet.png
+%%GRASS_INST_DIR%%/docs/html/r_watershed_drainage.png
+%%GRASS_INST_DIR%%/docs/html/raster-import.png
+%%GRASS_INST_DIR%%/docs/html/raster.html
+%%GRASS_INST_DIR%%/docs/html/raster3d.html
+%%GRASS_INST_DIR%%/docs/html/raster3d_graphical.html
+%%GRASS_INST_DIR%%/docs/html/raster3d_layout.png
+%%GRASS_INST_DIR%%/docs/html/raster3dintro.html
+%%GRASS_INST_DIR%%/docs/html/raster_graphical.html
+%%GRASS_INST_DIR%%/docs/html/rasterintro.html
+%%GRASS_INST_DIR%%/docs/html/rcost_knightsmove.png
+%%GRASS_INST_DIR%%/docs/html/rcost_solvedir.png
+%%GRASS_INST_DIR%%/docs/html/rhorizon_polar_plot.png
+%%GRASS_INST_DIR%%/docs/html/rhorizon_shaded_dem_point.png
+%%GRASS_INST_DIR%%/docs/html/rhorizon_singlepoint_plot.png
+%%GRASS_INST_DIR%%/docs/html/rlicwed_formula.png
+%%GRASS_INST_DIR%%/docs/html/rlimpa_formula.png
+%%GRASS_INST_DIR%%/docs/html/rlimps_formula.png
+%%GRASS_INST_DIR%%/docs/html/rlipadcv_formula1.png
+%%GRASS_INST_DIR%%/docs/html/rlipadcv_formula2.png
+%%GRASS_INST_DIR%%/docs/html/rlipadrange_formula.png
+%%GRASS_INST_DIR%%/docs/html/rlipadsd_formula.png
+%%GRASS_INST_DIR%%/docs/html/rshade.png
+%%GRASS_INST_DIR%%/docs/html/rterraflow_accumulation.png
+%%GRASS_INST_DIR%%/docs/html/rterraflow_dir2.png
+%%GRASS_INST_DIR%%/docs/html/rterraflow_dir3.png
+%%GRASS_INST_DIR%%/docs/html/rterraflow_direction_encoding.png
+%%GRASS_INST_DIR%%/docs/html/runivar_basins.png
+%%GRASS_INST_DIR%%/docs/html/runivar_basins_elev_zonal.png
+%%GRASS_INST_DIR%%/docs/html/slope.png
+%%GRASS_INST_DIR%%/docs/html/sql.html
+%%GRASS_INST_DIR%%/docs/html/sweep1.png
+%%GRASS_INST_DIR%%/docs/html/sweep2.png
+%%GRASS_INST_DIR%%/docs/html/t.connect.html
+%%GRASS_INST_DIR%%/docs/html/t.copy.html
+%%GRASS_INST_DIR%%/docs/html/t.create.html
+%%GRASS_INST_DIR%%/docs/html/t.info.html
+%%GRASS_INST_DIR%%/docs/html/t.list.html
+%%GRASS_INST_DIR%%/docs/html/t.merge.html
+%%GRASS_INST_DIR%%/docs/html/t.rast.accdetect.html
+%%GRASS_INST_DIR%%/docs/html/t.rast.accumulate.html
+%%GRASS_INST_DIR%%/docs/html/t.rast.aggregate.ds.html
+%%GRASS_INST_DIR%%/docs/html/t.rast.aggregate.html
+%%GRASS_INST_DIR%%/docs/html/t.rast.algebra.html
+%%GRASS_INST_DIR%%/docs/html/t.rast.colors.html
+%%GRASS_INST_DIR%%/docs/html/t.rast.contour.html
+%%GRASS_INST_DIR%%/docs/html/t.rast.export.html
+%%GRASS_INST_DIR%%/docs/html/t.rast.extract.html
+%%GRASS_INST_DIR%%/docs/html/t.rast.gapfill.html
+%%GRASS_INST_DIR%%/docs/html/t.rast.import.html
+%%GRASS_INST_DIR%%/docs/html/t.rast.list.html
+%%GRASS_INST_DIR%%/docs/html/t.rast.mapcalc.html
+%%GRASS_INST_DIR%%/docs/html/t.rast.neighbors.html
+%%GRASS_INST_DIR%%/docs/html/t.rast.out.vtk.html
+%%GRASS_INST_DIR%%/docs/html/t.rast.series.html
+%%GRASS_INST_DIR%%/docs/html/t.rast.to.rast3.html
+%%GRASS_INST_DIR%%/docs/html/t.rast.to.vect.html
+%%GRASS_INST_DIR%%/docs/html/t.rast.univar.html
+%%GRASS_INST_DIR%%/docs/html/t.rast.what.html
+%%GRASS_INST_DIR%%/docs/html/t.rast3d.algebra.html
+%%GRASS_INST_DIR%%/docs/html/t.rast3d.extract.html
+%%GRASS_INST_DIR%%/docs/html/t.rast3d.list.html
+%%GRASS_INST_DIR%%/docs/html/t.rast3d.mapcalc.html
+%%GRASS_INST_DIR%%/docs/html/t.rast3d.univar.html
+%%GRASS_INST_DIR%%/docs/html/t.register.html
+%%GRASS_INST_DIR%%/docs/html/t.remove.html
+%%GRASS_INST_DIR%%/docs/html/t.rename.html
+%%GRASS_INST_DIR%%/docs/html/t.sample.html
+%%GRASS_INST_DIR%%/docs/html/t.select.html
+%%GRASS_INST_DIR%%/docs/html/t.shift.html
+%%GRASS_INST_DIR%%/docs/html/t.snap.html
+%%GRASS_INST_DIR%%/docs/html/t.support.html
+%%GRASS_INST_DIR%%/docs/html/t.topology.html
+%%GRASS_INST_DIR%%/docs/html/t.unregister.html
+%%GRASS_INST_DIR%%/docs/html/t.upgrade.html
+%%GRASS_INST_DIR%%/docs/html/t.vect.algebra.html
+%%GRASS_INST_DIR%%/docs/html/t.vect.db.select.html
+%%GRASS_INST_DIR%%/docs/html/t.vect.export.html
+%%GRASS_INST_DIR%%/docs/html/t.vect.extract.html
+%%GRASS_INST_DIR%%/docs/html/t.vect.import.html
+%%GRASS_INST_DIR%%/docs/html/t.vect.list.html
+%%GRASS_INST_DIR%%/docs/html/t.vect.observe.strds.html
+%%GRASS_INST_DIR%%/docs/html/t.vect.univar.html
+%%GRASS_INST_DIR%%/docs/html/t.vect.what.strds.html
+%%GRASS_INST_DIR%%/docs/html/tcurv.png
+%%GRASS_INST_DIR%%/docs/html/temporal.html
+%%GRASS_INST_DIR%%/docs/html/temporal_graphical.html
+%%GRASS_INST_DIR%%/docs/html/temporalintro.html
+%%GRASS_INST_DIR%%/docs/html/test.r3flow.html
+%%GRASS_INST_DIR%%/docs/html/test.raster3d.lib.html
+%%GRASS_INST_DIR%%/docs/html/timeline_2D.jpg
+%%GRASS_INST_DIR%%/docs/html/topic_ACCA.html
+%%GRASS_INST_DIR%%/docs/html/topic_GUI.html
+%%GRASS_INST_DIR%%/docs/html/topic_LIDAR.html
+%%GRASS_INST_DIR%%/docs/html/topic_RGB.html
+%%GRASS_INST_DIR%%/docs/html/topic_accumulation.html
+%%GRASS_INST_DIR%%/docs/html/topic_aggregation.html
+%%GRASS_INST_DIR%%/docs/html/topic_albedo.html
+%%GRASS_INST_DIR%%/docs/html/topic_algebra.html
+%%GRASS_INST_DIR%%/docs/html/topic_atmospheric_correction.html
+%%GRASS_INST_DIR%%/docs/html/topic_attribute_table.html
+%%GRASS_INST_DIR%%/docs/html/topic_biomass.html
+%%GRASS_INST_DIR%%/docs/html/topic_buffer.html
+%%GRASS_INST_DIR%%/docs/html/topic_cartography.html
+%%GRASS_INST_DIR%%/docs/html/topic_category.html
+%%GRASS_INST_DIR%%/docs/html/topic_centroid.html
+%%GRASS_INST_DIR%%/docs/html/topic_classification.html
+%%GRASS_INST_DIR%%/docs/html/topic_clip.html
+%%GRASS_INST_DIR%%/docs/html/topic_color_table.html
+%%GRASS_INST_DIR%%/docs/html/topic_color_transformation.html
+%%GRASS_INST_DIR%%/docs/html/topic_composite.html
+%%GRASS_INST_DIR%%/docs/html/topic_connection_settings.html
+%%GRASS_INST_DIR%%/docs/html/topic_contour.html
+%%GRASS_INST_DIR%%/docs/html/topic_conversion.html
+%%GRASS_INST_DIR%%/docs/html/topic_copy.html
+%%GRASS_INST_DIR%%/docs/html/topic_cost_surface.html
+%%GRASS_INST_DIR%%/docs/html/topic_data.html
+%%GRASS_INST_DIR%%/docs/html/topic_diagram.html
+%%GRASS_INST_DIR%%/docs/html/topic_display.html
+%%GRASS_INST_DIR%%/docs/html/topic_dissolve.html
+%%GRASS_INST_DIR%%/docs/html/topic_distance.html
+%%GRASS_INST_DIR%%/docs/html/topic_edges.html
+%%GRASS_INST_DIR%%/docs/html/topic_editing.html
+%%GRASS_INST_DIR%%/docs/html/topic_elevation.html
+%%GRASS_INST_DIR%%/docs/html/topic_emissivity.html
+%%GRASS_INST_DIR%%/docs/html/topic_energy_balance.html
+%%GRASS_INST_DIR%%/docs/html/topic_evapotranspiration.html
+%%GRASS_INST_DIR%%/docs/html/topic_export.html
+%%GRASS_INST_DIR%%/docs/html/topic_extract.html
+%%GRASS_INST_DIR%%/docs/html/topic_fire.html
+%%GRASS_INST_DIR%%/docs/html/topic_fusion.html
+%%GRASS_INST_DIR%%/docs/html/topic_generalization.html
+%%GRASS_INST_DIR%%/docs/html/topic_geometry.html
+%%GRASS_INST_DIR%%/docs/html/topic_geomorphology.html
+%%GRASS_INST_DIR%%/docs/html/topic_geomorphons.html
+%%GRASS_INST_DIR%%/docs/html/topic_gradient.html
+%%GRASS_INST_DIR%%/docs/html/topic_graphics.html
+%%GRASS_INST_DIR%%/docs/html/topic_groundwater_flow.html
+%%GRASS_INST_DIR%%/docs/html/topic_histogram.html
+%%GRASS_INST_DIR%%/docs/html/topic_hydrology.html
+%%GRASS_INST_DIR%%/docs/html/topic_imagery.html
+%%GRASS_INST_DIR%%/docs/html/topic_imagery_quality_assessment.html
+%%GRASS_INST_DIR%%/docs/html/topic_import.html
+%%GRASS_INST_DIR%%/docs/html/topic_installation.html
+%%GRASS_INST_DIR%%/docs/html/topic_interpolation.html
+%%GRASS_INST_DIR%%/docs/html/topic_kernel_density.html
+%%GRASS_INST_DIR%%/docs/html/topic_landscape_structure_analysis.html
+%%GRASS_INST_DIR%%/docs/html/topic_latitude.html
+%%GRASS_INST_DIR%%/docs/html/topic_linear_reference_system.html
+%%GRASS_INST_DIR%%/docs/html/topic_manual.html
+%%GRASS_INST_DIR%%/docs/html/topic_map_annotations.html
+%%GRASS_INST_DIR%%/docs/html/topic_map_management.html
+%%GRASS_INST_DIR%%/docs/html/topic_mask.html
+%%GRASS_INST_DIR%%/docs/html/topic_measurement.html
+%%GRASS_INST_DIR%%/docs/html/topic_metadata.html
+%%GRASS_INST_DIR%%/docs/html/topic_modules.html
+%%GRASS_INST_DIR%%/docs/html/topic_mosaic.html
+%%GRASS_INST_DIR%%/docs/html/topic_multispectral.html
+%%GRASS_INST_DIR%%/docs/html/topic_network.html
+%%GRASS_INST_DIR%%/docs/html/topic_orthorectify.html
+%%GRASS_INST_DIR%%/docs/html/topic_paint_labels.html
+%%GRASS_INST_DIR%%/docs/html/topic_point_cloud.html
+%%GRASS_INST_DIR%%/docs/html/topic_printing.html
+%%GRASS_INST_DIR%%/docs/html/topic_profile.html
+%%GRASS_INST_DIR%%/docs/html/topic_projection.html
+%%GRASS_INST_DIR%%/docs/html/topic_querying.html
+%%GRASS_INST_DIR%%/docs/html/topic_radiometric_conversion.html
+%%GRASS_INST_DIR%%/docs/html/topic_raster.html
+%%GRASS_INST_DIR%%/docs/html/topic_reclassification.html
+%%GRASS_INST_DIR%%/docs/html/topic_recode_categories.html
+%%GRASS_INST_DIR%%/docs/html/topic_rectify.html
+%%GRASS_INST_DIR%%/docs/html/topic_resample.html
+%%GRASS_INST_DIR%%/docs/html/topic_rescale.html
+%%GRASS_INST_DIR%%/docs/html/topic_sampling.html
+%%GRASS_INST_DIR%%/docs/html/topic_segmentation.html
+%%GRASS_INST_DIR%%/docs/html/topic_series.html
+%%GRASS_INST_DIR%%/docs/html/topic_settings.html
+%%GRASS_INST_DIR%%/docs/html/topic_solar.html
+%%GRASS_INST_DIR%%/docs/html/topic_statistics.html
+%%GRASS_INST_DIR%%/docs/html/topic_support.html
+%%GRASS_INST_DIR%%/docs/html/topic_surface.html
+%%GRASS_INST_DIR%%/docs/html/topic_temporal.html
+%%GRASS_INST_DIR%%/docs/html/topic_terrain.html
+%%GRASS_INST_DIR%%/docs/html/topic_tiling.html
+%%GRASS_INST_DIR%%/docs/html/topic_time_management.html
+%%GRASS_INST_DIR%%/docs/html/topic_topology.html
+%%GRASS_INST_DIR%%/docs/html/topic_transformation.html
+%%GRASS_INST_DIR%%/docs/html/topic_unit_test.html
+%%GRASS_INST_DIR%%/docs/html/topic_vector.html
+%%GRASS_INST_DIR%%/docs/html/topic_vegetation_index.html
+%%GRASS_INST_DIR%%/docs/html/topic_viewshed.html
+%%GRASS_INST_DIR%%/docs/html/topic_visualization.html
+%%GRASS_INST_DIR%%/docs/html/topic_volume.html
+%%GRASS_INST_DIR%%/docs/html/topic_voxel.html
+%%GRASS_INST_DIR%%/docs/html/topics.html
+%%GRASS_INST_DIR%%/docs/html/tplot.png
+%%GRASS_INST_DIR%%/docs/html/v.buffer.html
+%%GRASS_INST_DIR%%/docs/html/v.build.all.html
+%%GRASS_INST_DIR%%/docs/html/v.build.html
+%%GRASS_INST_DIR%%/docs/html/v.build.polylines.html
+%%GRASS_INST_DIR%%/docs/html/v.category.html
+%%GRASS_INST_DIR%%/docs/html/v.centroids.html
+%%GRASS_INST_DIR%%/docs/html/v.class.html
+%%GRASS_INST_DIR%%/docs/html/v.clean.html
+%%GRASS_INST_DIR%%/docs/html/v.clip.html
+%%GRASS_INST_DIR%%/docs/html/v.cluster.html
+%%GRASS_INST_DIR%%/docs/html/v.colors.html
+%%GRASS_INST_DIR%%/docs/html/v.colors.out.html
+%%GRASS_INST_DIR%%/docs/html/v.db.addcolumn.html
+%%GRASS_INST_DIR%%/docs/html/v.db.addtable.html
+%%GRASS_INST_DIR%%/docs/html/v.db.connect.html
+%%GRASS_INST_DIR%%/docs/html/v.db.dropcolumn.html
+%%GRASS_INST_DIR%%/docs/html/v.db.droprow.html
+%%GRASS_INST_DIR%%/docs/html/v.db.droptable.html
+%%GRASS_INST_DIR%%/docs/html/v.db.join.html
+%%GRASS_INST_DIR%%/docs/html/v.db.reconnect.all.html
+%%GRASS_INST_DIR%%/docs/html/v.db.renamecolumn.html
+%%GRASS_INST_DIR%%/docs/html/v.db.select.html
+%%GRASS_INST_DIR%%/docs/html/v.db.univar.html
+%%GRASS_INST_DIR%%/docs/html/v.db.update.html
+%%GRASS_INST_DIR%%/docs/html/v.decimate.html
+%%GRASS_INST_DIR%%/docs/html/v.delaunay.html
+%%GRASS_INST_DIR%%/docs/html/v.dissolve.html
+%%GRASS_INST_DIR%%/docs/html/v.distance.html
+%%GRASS_INST_DIR%%/docs/html/v.drape.html
+%%GRASS_INST_DIR%%/docs/html/v.edit.html
+%%GRASS_INST_DIR%%/docs/html/v.external.html
+%%GRASS_INST_DIR%%/docs/html/v.external.out.html
+%%GRASS_INST_DIR%%/docs/html/v.extract.html
+%%GRASS_INST_DIR%%/docs/html/v.extrude.html
+%%GRASS_INST_DIR%%/docs/html/v.generalize.html
+%%GRASS_INST_DIR%%/docs/html/v.hull.html
+%%GRASS_INST_DIR%%/docs/html/v.import.html
+%%GRASS_INST_DIR%%/docs/html/v.in.ascii.html
+%%GRASS_INST_DIR%%/docs/html/v.in.db.html
+%%GRASS_INST_DIR%%/docs/html/v.in.dxf.html
+%%GRASS_INST_DIR%%/docs/html/v.in.e00.html
+%%GRASS_INST_DIR%%/docs/html/v.in.geonames.html
+%%GRASS_INST_DIR%%/docs/html/v.in.lines.html
+%%GRASS_INST_DIR%%/docs/html/v.in.mapgen.html
+%%GRASS_INST_DIR%%/docs/html/v.in.ogr.html
+%%GRASS_INST_DIR%%/docs/html/v.in.region.html
+%%GRASS_INST_DIR%%/docs/html/v.in.wfs.html
+%%GRASS_INST_DIR%%/docs/html/v.info.html
+%%GRASS_INST_DIR%%/docs/html/v.kcv.html
+%%GRASS_INST_DIR%%/docs/html/v.kernel.html
+%%GRASS_INST_DIR%%/docs/html/v.label.html
+%%GRASS_INST_DIR%%/docs/html/v.label.sa.html
+%%GRASS_INST_DIR%%/docs/html/v.lidar.correction.html
+%%GRASS_INST_DIR%%/docs/html/v.lidar.edgedetection.html
+%%GRASS_INST_DIR%%/docs/html/v.lidar.growing.html
+%%GRASS_INST_DIR%%/docs/html/v.lrs.create.html
+%%GRASS_INST_DIR%%/docs/html/v.lrs.label.html
+%%GRASS_INST_DIR%%/docs/html/v.lrs.segment.html
+%%GRASS_INST_DIR%%/docs/html/v.lrs.where.html
+%%GRASS_INST_DIR%%/docs/html/v.mkgrid.html
+%%GRASS_INST_DIR%%/docs/html/v.neighbors.html
+%%GRASS_INST_DIR%%/docs/html/v.net.alloc.html
+%%GRASS_INST_DIR%%/docs/html/v.net.allpairs.html
+%%GRASS_INST_DIR%%/docs/html/v.net.bridge.html
+%%GRASS_INST_DIR%%/docs/html/v.net.centrality.html
+%%GRASS_INST_DIR%%/docs/html/v.net.components.html
+%%GRASS_INST_DIR%%/docs/html/v.net.connectivity.html
+%%GRASS_INST_DIR%%/docs/html/v.net.distance.html
+%%GRASS_INST_DIR%%/docs/html/v.net.flow.html
+%%GRASS_INST_DIR%%/docs/html/v.net.html
+%%GRASS_INST_DIR%%/docs/html/v.net.iso.html
+%%GRASS_INST_DIR%%/docs/html/v.net.path.html
+%%GRASS_INST_DIR%%/docs/html/v.net.salesman.html
+%%GRASS_INST_DIR%%/docs/html/v.net.spanningtree.html
+%%GRASS_INST_DIR%%/docs/html/v.net.steiner.html
+%%GRASS_INST_DIR%%/docs/html/v.net.timetable.html
+%%GRASS_INST_DIR%%/docs/html/v.net.visibility.html
+%%GRASS_INST_DIR%%/docs/html/v.normal.html
+%%GRASS_INST_DIR%%/docs/html/v.out.ascii.html
+%%GRASS_INST_DIR%%/docs/html/v.out.dxf.html
+%%GRASS_INST_DIR%%/docs/html/v.out.ogr.html
+%%GRASS_INST_DIR%%/docs/html/v.out.pov.html
+%%GRASS_INST_DIR%%/docs/html/v.out.svg.html
+%%GRASS_INST_DIR%%/docs/html/v.out.vtk.html
+%%GRASS_INST_DIR%%/docs/html/v.outlier.html
+%%GRASS_INST_DIR%%/docs/html/v.overlay.html
+%%GRASS_INST_DIR%%/docs/html/v.pack.html
+%%GRASS_INST_DIR%%/docs/html/v.parallel.html
+%%GRASS_INST_DIR%%/docs/html/v.patch.html
+%%GRASS_INST_DIR%%/docs/html/v.perturb.html
+%%GRASS_INST_DIR%%/docs/html/v.profile.html
+%%GRASS_INST_DIR%%/docs/html/v.proj.html
+%%GRASS_INST_DIR%%/docs/html/v.qcount.html
+%%GRASS_INST_DIR%%/docs/html/v.random.html
+%%GRASS_INST_DIR%%/docs/html/v.rast.stats.html
+%%GRASS_INST_DIR%%/docs/html/v.reclass.html
+%%GRASS_INST_DIR%%/docs/html/v.rectify.html
+%%GRASS_INST_DIR%%/docs/html/v.report.html
+%%GRASS_INST_DIR%%/docs/html/v.sample.html
+%%GRASS_INST_DIR%%/docs/html/v.segment.html
+%%GRASS_INST_DIR%%/docs/html/v.select.html
+%%GRASS_INST_DIR%%/docs/html/v.split.html
+%%GRASS_INST_DIR%%/docs/html/v.support.html
+%%GRASS_INST_DIR%%/docs/html/v.surf.bspline.html
+%%GRASS_INST_DIR%%/docs/html/v.surf.idw.html
+%%GRASS_INST_DIR%%/docs/html/v.surf.rst.html
+%%GRASS_INST_DIR%%/docs/html/v.timestamp.html
+%%GRASS_INST_DIR%%/docs/html/v.to.3d.html
+%%GRASS_INST_DIR%%/docs/html/v.to.db.html
+%%GRASS_INST_DIR%%/docs/html/v.to.lines.html
+%%GRASS_INST_DIR%%/docs/html/v.to.points.html
+%%GRASS_INST_DIR%%/docs/html/v.to.rast.html
+%%GRASS_INST_DIR%%/docs/html/v.to.rast3.html
+%%GRASS_INST_DIR%%/docs/html/v.transform.html
+%%GRASS_INST_DIR%%/docs/html/v.type.html
+%%GRASS_INST_DIR%%/docs/html/v.univar.html
+%%GRASS_INST_DIR%%/docs/html/v.unpack.html
+%%GRASS_INST_DIR%%/docs/html/v.vect.stats.html
+%%GRASS_INST_DIR%%/docs/html/v.vol.rst.html
+%%GRASS_INST_DIR%%/docs/html/v.voronoi.html
+%%GRASS_INST_DIR%%/docs/html/v.what.html
+%%GRASS_INST_DIR%%/docs/html/v.what.rast.html
+%%GRASS_INST_DIR%%/docs/html/v.what.rast3.html
+%%GRASS_INST_DIR%%/docs/html/v.what.strds.html
+%%GRASS_INST_DIR%%/docs/html/v.what.vect.html
+%%GRASS_INST_DIR%%/docs/html/v_buffer_area.png
+%%GRASS_INST_DIR%%/docs/html/v_buffer_area_s.png
+%%GRASS_INST_DIR%%/docs/html/v_buffer_areas.png
+%%GRASS_INST_DIR%%/docs/html/v_buffer_areas_int.png
+%%GRASS_INST_DIR%%/docs/html/v_buffer_line.png
+%%GRASS_INST_DIR%%/docs/html/v_buffer_line_c.png
+%%GRASS_INST_DIR%%/docs/html/v_buffer_line_s.png
+%%GRASS_INST_DIR%%/docs/html/v_buffer_lines.png
+%%GRASS_INST_DIR%%/docs/html/v_buffer_no_cap.png
+%%GRASS_INST_DIR%%/docs/html/v_buffer_point_s.png
+%%GRASS_INST_DIR%%/docs/html/v_buffer_points.png
+%%GRASS_INST_DIR%%/docs/html/v_buffer_rounded_cap.png
+%%GRASS_INST_DIR%%/docs/html/v_buffer_square_cap.png
+%%GRASS_INST_DIR%%/docs/html/v_centroids.png
+%%GRASS_INST_DIR%%/docs/html/v_clean.png
+%%GRASS_INST_DIR%%/docs/html/v_clean_rmsa.png
+%%GRASS_INST_DIR%%/docs/html/v_clip_poly.png
+%%GRASS_INST_DIR%%/docs/html/v_clip_region.png
+%%GRASS_INST_DIR%%/docs/html/v_cluster_4_methods.png
+%%GRASS_INST_DIR%%/docs/html/v_decimate_count.png
+%%GRASS_INST_DIR%%/docs/html/v_decimate_grid_cat.png
+%%GRASS_INST_DIR%%/docs/html/v_decimate_original.png
+%%GRASS_INST_DIR%%/docs/html/v_delaunay.png
+%%GRASS_INST_DIR%%/docs/html/v_generalize_simplify.png
+%%GRASS_INST_DIR%%/docs/html/v_generalize_smooth.png
+%%GRASS_INST_DIR%%/docs/html/v_hull.png
+%%GRASS_INST_DIR%%/docs/html/v_hull_3d.png
+%%GRASS_INST_DIR%%/docs/html/v_kernel.png
+%%GRASS_INST_DIR%%/docs/html/v_label_sa.jpg
+%%GRASS_INST_DIR%%/docs/html/v_lidar_edgedetection.png
+%%GRASS_INST_DIR%%/docs/html/v_lidar_edgedetection_objects.png
+%%GRASS_INST_DIR%%/docs/html/v_mkgrid.png
+%%GRASS_INST_DIR%%/docs/html/v_mkgrid_hexagons.png
+%%GRASS_INST_DIR%%/docs/html/v_mkgrid_ppattern.png
+%%GRASS_INST_DIR%%/docs/html/v_net_alloc.png
+%%GRASS_INST_DIR%%/docs/html/v_net_alloc_from_centers.png
+%%GRASS_INST_DIR%%/docs/html/v_net_alloc_time.png
+%%GRASS_INST_DIR%%/docs/html/v_net_alloc_to_centers.png
+%%GRASS_INST_DIR%%/docs/html/v_net_visibility.png
+%%GRASS_INST_DIR%%/docs/html/v_overlay_area_lines.png
+%%GRASS_INST_DIR%%/docs/html/v_overlay_census_wake2000.png
+%%GRASS_INST_DIR%%/docs/html/v_overlay_op_and.png
+%%GRASS_INST_DIR%%/docs/html/v_overlay_op_not.png
+%%GRASS_INST_DIR%%/docs/html/v_overlay_op_or.png
+%%GRASS_INST_DIR%%/docs/html/v_overlay_op_xor.png
+%%GRASS_INST_DIR%%/docs/html/v_overlay_poly_1_2.png
+%%GRASS_INST_DIR%%/docs/html/v_overlay_poly_1_2_a_o_n_x.png
+%%GRASS_INST_DIR%%/docs/html/v_overlay_urban_census2000.png
+%%GRASS_INST_DIR%%/docs/html/v_overlay_urbanarea.png
+%%GRASS_INST_DIR%%/docs/html/v_perturb_normal.png
+%%GRASS_INST_DIR%%/docs/html/v_perturb_uniform.png
+%%GRASS_INST_DIR%%/docs/html/v_qcount_1.png
+%%GRASS_INST_DIR%%/docs/html/v_qcount_2.png
+%%GRASS_INST_DIR%%/docs/html/v_qcount_3.png
+%%GRASS_INST_DIR%%/docs/html/v_qcount_4.png
+%%GRASS_INST_DIR%%/docs/html/v_qcount_5.png
+%%GRASS_INST_DIR%%/docs/html/v_random_points_in_polygon.png
+%%GRASS_INST_DIR%%/docs/html/v_segment_spaced_percent_points.jpg
+%%GRASS_INST_DIR%%/docs/html/v_segment_spaced_points.jpg
+%%GRASS_INST_DIR%%/docs/html/v_segment_spaced_right_points.jpg
+%%GRASS_INST_DIR%%/docs/html/v_segment_subline.jpg
+%%GRASS_INST_DIR%%/docs/html/v_select_op_contains_pnts.png
+%%GRASS_INST_DIR%%/docs/html/v_select_op_contains_pol.png
+%%GRASS_INST_DIR%%/docs/html/v_select_op_crosses.png
+%%GRASS_INST_DIR%%/docs/html/v_select_op_disjoint.png
+%%GRASS_INST_DIR%%/docs/html/v_select_op_equals.png
+%%GRASS_INST_DIR%%/docs/html/v_select_op_intersects.png
+%%GRASS_INST_DIR%%/docs/html/v_select_op_overlap.png
+%%GRASS_INST_DIR%%/docs/html/v_select_op_overlaps.png
+%%GRASS_INST_DIR%%/docs/html/v_select_op_touches.png
+%%GRASS_INST_DIR%%/docs/html/v_select_op_within.png
+%%GRASS_INST_DIR%%/docs/html/v_to_rast3_test.png
+%%GRASS_INST_DIR%%/docs/html/v_to_rast_binning.png
+%%GRASS_INST_DIR%%/docs/html/v_to_rast_direction.png
+%%GRASS_INST_DIR%%/docs/html/v_vect_stats.png
+%%GRASS_INST_DIR%%/docs/html/v_voronoi_areas.png
+%%GRASS_INST_DIR%%/docs/html/v_voronoi_points.png
+%%GRASS_INST_DIR%%/docs/html/v_voronoi_skeleton.png
+%%GRASS_INST_DIR%%/docs/html/variables.html
+%%GRASS_INST_DIR%%/docs/html/vdigit_toolbar.jpg
+%%GRASS_INST_DIR%%/docs/html/vector-import.png
+%%GRASS_INST_DIR%%/docs/html/vector.html
+%%GRASS_INST_DIR%%/docs/html/vector_graphical.html
+%%GRASS_INST_DIR%%/docs/html/vectorascii.html
+%%GRASS_INST_DIR%%/docs/html/vectorintro.html
+%%GRASS_INST_DIR%%/docs/html/vnetdistance.png
+%%GRASS_INST_DIR%%/docs/html/vnetiso.png
+%%GRASS_INST_DIR%%/docs/html/vnetisotime.png
+%%GRASS_INST_DIR%%/docs/html/vnetpath.png
+%%GRASS_INST_DIR%%/docs/html/vnetsalesman.png
+%%GRASS_INST_DIR%%/docs/html/vnetsalesmantime.png
+%%GRASS_INST_DIR%%/docs/html/vnetsteiner.png
+%%GRASS_INST_DIR%%/docs/html/vnetsteinertime.png
+%%GRASS_INST_DIR%%/docs/html/vrandom_polygons.png
+%%GRASS_INST_DIR%%/docs/html/vrandom_restricted_area.png
+%%GRASS_INST_DIR%%/docs/html/vrandom_restricted_attr.png
+%%GRASS_INST_DIR%%/docs/html/vrandom_z.png
+%%GRASS_INST_DIR%%/docs/html/wxGUI.animation.html
+%%GRASS_INST_DIR%%/docs/html/wxGUI.components.html
+%%GRASS_INST_DIR%%/docs/html/wxGUI.datacatalog.html
+%%GRASS_INST_DIR%%/docs/html/wxGUI.dbmgr.html
+%%GRASS_INST_DIR%%/docs/html/wxGUI.gcp.html
+%%GRASS_INST_DIR%%/docs/html/wxGUI.gmodeler.html
+%%GRASS_INST_DIR%%/docs/html/wxGUI.html
+%%GRASS_INST_DIR%%/docs/html/wxGUI.iclass.html
+%%GRASS_INST_DIR%%/docs/html/wxGUI.image2target.html
+%%GRASS_INST_DIR%%/docs/html/wxGUI.iscatt.html
+%%GRASS_INST_DIR%%/docs/html/wxGUI.mapswipe.html
+%%GRASS_INST_DIR%%/docs/html/wxGUI.modules.html
+%%GRASS_INST_DIR%%/docs/html/wxGUI.nviz.html
+%%GRASS_INST_DIR%%/docs/html/wxGUI.photo2image.html
+%%GRASS_INST_DIR%%/docs/html/wxGUI.psmap.html
+%%GRASS_INST_DIR%%/docs/html/wxGUI.rdigit.html
+%%GRASS_INST_DIR%%/docs/html/wxGUI.rlisetup.html
+%%GRASS_INST_DIR%%/docs/html/wxGUI.timeline.html
+%%GRASS_INST_DIR%%/docs/html/wxGUI.toolboxes.html
+%%GRASS_INST_DIR%%/docs/html/wxGUI.tplot.html
+%%GRASS_INST_DIR%%/docs/html/wxGUI.vdigit.html
+%%GRASS_INST_DIR%%/docs/html/wxGUI.vnet.html
+%%GRASS_INST_DIR%%/docs/html/wxGUI_animation_tool.jpg
+%%GRASS_INST_DIR%%/docs/html/wxGUI_gcp_frame.jpg
+%%GRASS_INST_DIR%%/docs/html/wxGUI_graphical.html
+%%GRASS_INST_DIR%%/docs/html/wxGUI_iimage2target_frame.jpg
+%%GRASS_INST_DIR%%/docs/html/wxGUI_iphoto2image_frame.jpg
+%%GRASS_INST_DIR%%/docs/html/wxGUI_iscatt.jpg
+%%GRASS_INST_DIR%%/docs/html/wxGUI_layer_manager.png
+%%GRASS_INST_DIR%%/docs/html/wxGUI_map_display.jpg
+%%GRASS_INST_DIR%%/docs/html/wxGUI_modules_flags.png
+%%GRASS_INST_DIR%%/docs/html/wxGUI_modules_parameters.png
+%%GRASS_INST_DIR%%/docs/html/wxGUI_modules_style_left.png
+%%GRASS_INST_DIR%%/docs/html/wxGUI_modules_style_top.png
+%%GRASS_INST_DIR%%/docs/html/wxGUI_modules_widget_file1.png
+%%GRASS_INST_DIR%%/docs/html/wxGUI_modules_widget_file2.png
+%%GRASS_INST_DIR%%/docs/html/wxGUI_modules_widget_selection.png
+%%GRASS_INST_DIR%%/docs/html/wxGUI_nviz_toolbar.jpg
+%%GRASS_INST_DIR%%/docs/html/wxGUI_nviz_tools_light.jpg
+%%GRASS_INST_DIR%%/docs/html/wxGUI_nviz_tools_surface.jpg
+%%GRASS_INST_DIR%%/docs/html/wxGUI_nviz_tools_vector.jpg
+%%GRASS_INST_DIR%%/docs/html/wxGUI_nviz_tools_view.jpg
+%%GRASS_INST_DIR%%/docs/html/wxGUI_nviz_tools_volume.jpg
+%%GRASS_INST_DIR%%/docs/html/wxGUI_rdigit_step1.png
+%%GRASS_INST_DIR%%/docs/html/wxGUI_rdigit_step2.png
+%%GRASS_INST_DIR%%/docs/html/wxGUI_rdigit_step3.png
+%%GRASS_INST_DIR%%/docs/html/wxGUI_rdigit_step4.png
+%%GRASS_INST_DIR%%/docs/html/wxGUI_rdigit_step5.png
+%%GRASS_INST_DIR%%/docs/html/wxGUI_toolboxes.jpg
+%%GRASS_INST_DIR%%/docs/html/wxGUI_vnet.jpg
+%%GRASS_INST_DIR%%/docs/html/wxpyimgview.html
+%%GRASS_INST_DIR%%/docs/html/ximgview.html
+%%GRASS_INST_DIR%%/docs/html/zipcodes_larger2000ha.png
+%%GRASS_INST_DIR%%/docs/html/zipcodes_minor1000ha.png
+%%GRASS_INST_DIR%%/docs/man/man1/cairodriver.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/class_graphical.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/d.background.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/d.barscale.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/d.colorlist.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/d.colortable.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/d.correlate.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/d.erase.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/d.font.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/d.fontlist.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/d.frame.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/d.geodesic.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/d.graph.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/d.grid.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/d.his.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/d.histogram.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/d.info.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/d.labels.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/d.legend.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/d.legend.vect.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/d.linegraph.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/d.mon.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/d.northarrow.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/d.out.file.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/d.path.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/d.polar.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/d.profile.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/d.rast.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/d.rast.arrow.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/d.rast.edit.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/d.rast.leg.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/d.rast.num.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/d.redraw.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/d.rgb.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/d.rhumbline.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/d.shade.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/d.text.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/d.title.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/d.to.rast.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/d.vect.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/d.vect.chart.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/d.vect.thematic.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/d.what.rast.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/d.what.vect.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/d.where.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/database.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/database_graphical.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/databaseintro.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/db.columns.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/db.connect.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/db.copy.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/db.createdb.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/db.databases.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/db.describe.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/db.drivers.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/db.dropcolumn.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/db.dropdb.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/db.droptable.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/db.execute.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/db.in.ogr.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/db.login.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/db.out.ogr.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/db.select.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/db.tables.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/db.test.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/db.univar.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/display.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/display_graphical.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/displaydrivers.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/full_index.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/g.access.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/g.cairocomp.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/g.copy.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/g.dirseps.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/g.download.location.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/g.extension.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/g.extension.all.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/g.filename.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/g.findetc.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/g.findfile.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/g.gisenv.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/g.gui.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/g.gui.animation.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/g.gui.datacatalog.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/g.gui.dbmgr.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/g.gui.gcp.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/g.gui.gmodeler.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/g.gui.iclass.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/g.gui.image2target.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/g.gui.mapswipe.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/g.gui.photo2image.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/g.gui.psmap.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/g.gui.rdigit.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/g.gui.rlisetup.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/g.gui.timeline.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/g.gui.tplot.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/g.gui.vdigit.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/g.list.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/g.manual.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/g.mapset.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/g.mapsets.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/g.message.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/g.mkfontcap.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/g.parser.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/g.pnmcomp.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/g.ppmtopng.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/g.proj.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/g.region.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/g.remove.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/g.rename.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/g.search.modules.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/g.tempfile.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/g.version.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/general.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/general_graphical.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/graphical_index.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/grass-dbf.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/grass-ogr.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/grass-sqlite.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/grass.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/grass_database.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/guimodules_graphical.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/helptext.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/htmldriver.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/i.albedo.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/i.aster.toar.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/i.atcorr.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/i.band.library.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/i.biomass.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/i.cca.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/i.cluster.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/i.colors.enhance.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/i.eb.eta.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/i.eb.evapfr.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/i.eb.hsebal01.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/i.eb.netrad.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/i.eb.soilheatflux.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/i.emissivity.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/i.evapo.mh.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/i.evapo.pm.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/i.evapo.pt.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/i.evapo.time.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/i.fft.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/i.gensig.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/i.gensigset.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/i.group.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/i.his.rgb.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/i.ifft.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/i.image.mosaic.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/i.in.spotvgt.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/i.landsat.acca.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/i.landsat.toar.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/i.maxlik.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/i.modis.qc.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/i.oif.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/i.ortho.camera.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/i.ortho.elev.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/i.ortho.init.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/i.ortho.photo.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/i.ortho.rectify.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/i.ortho.target.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/i.ortho.transform.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/i.pansharpen.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/i.pca.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/i.rectify.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/i.rgb.his.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/i.segment.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/i.smap.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/i.spectral.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/i.target.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/i.tasscap.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/i.topo.corr.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/i.vi.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/i.zc.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/imagery.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/imagery_graphical.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/imageryintro.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/index.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/keywords.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/lrs.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/m.cogo.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/m.measure.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/m.nviz.image.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/m.nviz.script.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/m.proj.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/m.transform.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/manual_gallery.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/miscellaneous.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/miscellaneous_graphical.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/parser_standard_options.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/pngdriver.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/postscript.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/postscript_graphical.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/projectionintro.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/ps.map.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/psdriver.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/r.basins.fill.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/r.blend.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/r.buffer.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/r.buffer.lowmem.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/r.buildvrt.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/r.carve.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/r.category.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/r.circle.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/r.clump.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/r.coin.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/r.colors.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/r.colors.out.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/r.colors.stddev.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/r.composite.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/r.compress.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/r.contour.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/r.cost.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/r.covar.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/r.cross.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/r.describe.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/r.distance.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/r.drain.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/r.external.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/r.external.out.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/r.fill.dir.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/r.fill.stats.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/r.fillnulls.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/r.flow.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/r.geomorphon.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/r.grow.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/r.grow.distance.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/r.gwflow.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/r.his.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/r.horizon.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/r.import.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/r.in.ascii.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/r.in.aster.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/r.in.bin.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/r.in.gdal.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/r.in.gridatb.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/r.in.mat.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/r.in.png.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/r.in.poly.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/r.in.srtm.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/r.in.wms.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/r.in.xyz.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/r.info.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/r.kappa.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/r.lake.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/r.latlong.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/r.li.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/r.li.cwed.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/r.li.daemon.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/r.li.dominance.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/r.li.edgedensity.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/r.li.mpa.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/r.li.mps.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/r.li.padcv.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/r.li.padrange.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/r.li.padsd.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/r.li.patchdensity.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/r.li.patchnum.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/r.li.pielou.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/r.li.renyi.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/r.li.richness.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/r.li.shannon.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/r.li.shape.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/r.li.simpson.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/r.mapcalc.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/r.mapcalc.simple.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/r.mask.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/r.mfilter.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/r.mode.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/r.neighbors.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/r.null.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/r.object.geometry.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/r.out.ascii.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/r.out.bin.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/r.out.gdal.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/r.out.gridatb.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/r.out.mat.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/r.out.mpeg.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/r.out.png.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/r.out.pov.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/r.out.ppm.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/r.out.ppm3.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/r.out.vrml.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/r.out.vtk.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/r.out.xyz.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/r.pack.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/r.param.scale.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/r.patch.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/r.path.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/r.plane.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/r.profile.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/r.proj.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/r.quant.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/r.quantile.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/r.random.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/r.random.cells.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/r.random.surface.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/r.reclass.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/r.reclass.area.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/r.recode.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/r.region.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/r.regression.line.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/r.regression.multi.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/r.relief.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/r.report.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/r.resamp.bspline.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/r.resamp.filter.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/r.resamp.interp.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/r.resamp.rst.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/r.resamp.stats.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/r.resample.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/r.rescale.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/r.rescale.eq.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/r.rgb.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/r.ros.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/r.semantic.label.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/r.series.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/r.series.accumulate.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/r.series.interp.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/r.shade.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/r.sim.sediment.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/r.sim.water.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/r.slope.aspect.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/r.solute.transport.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/r.spread.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/r.spreadpath.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/r.statistics.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/r.stats.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/r.stats.quantile.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/r.stats.zonal.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/r.stream.extract.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/r.sun.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/r.sunhours.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/r.sunmask.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/r.support.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/r.support.stats.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/r.surf.area.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/r.surf.contour.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/r.surf.fractal.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/r.surf.gauss.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/r.surf.idw.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/r.surf.random.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/r.terraflow.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/r.texture.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/r.thin.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/r.tile.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/r.tileset.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/r.timestamp.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/r.to.rast3.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/r.to.rast3elev.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/r.to.vect.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/r.topidx.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/r.topmodel.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/r.transect.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/r.univar.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/r.unpack.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/r.uslek.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/r.usler.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/r.viewshed.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/r.volume.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/r.walk.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/r.water.outlet.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/r.watershed.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/r.what.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/r.what.color.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/r3.colors.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/r3.colors.out.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/r3.cross.rast.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/r3.flow.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/r3.gradient.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/r3.gwflow.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/r3.in.ascii.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/r3.in.bin.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/r3.in.v5d.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/r3.in.xyz.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/r3.info.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/r3.mapcalc.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/r3.mask.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/r3.mkdspf.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/r3.neighbors.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/r3.null.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/r3.out.ascii.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/r3.out.bin.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/r3.out.v5d.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/r3.out.vtk.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/r3.retile.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/r3.stats.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/r3.support.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/r3.timestamp.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/r3.to.rast.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/r3.univar.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/raster.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/raster3d.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/raster3d_graphical.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/raster3dintro.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/raster_graphical.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/rasterintro.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/sql.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/t.connect.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/t.copy.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/t.create.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/t.info.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/t.list.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/t.merge.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/t.rast.accdetect.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/t.rast.accumulate.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/t.rast.aggregate.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/t.rast.aggregate.ds.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/t.rast.algebra.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/t.rast.colors.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/t.rast.contour.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/t.rast.export.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/t.rast.extract.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/t.rast.gapfill.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/t.rast.import.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/t.rast.list.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/t.rast.mapcalc.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/t.rast.neighbors.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/t.rast.out.vtk.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/t.rast.series.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/t.rast.to.rast3.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/t.rast.to.vect.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/t.rast.univar.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/t.rast.what.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/t.rast3d.algebra.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/t.rast3d.extract.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/t.rast3d.list.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/t.rast3d.mapcalc.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/t.rast3d.univar.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/t.register.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/t.remove.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/t.rename.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/t.sample.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/t.select.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/t.shift.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/t.snap.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/t.support.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/t.topology.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/t.unregister.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/t.upgrade.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/t.vect.algebra.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/t.vect.db.select.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/t.vect.export.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/t.vect.extract.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/t.vect.import.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/t.vect.list.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/t.vect.observe.strds.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/t.vect.univar.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/t.vect.what.strds.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/temporal.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/temporal_graphical.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/temporalintro.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/test.r3flow.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/test.raster3d.lib.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/topic_ACCA.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/topic_GUI.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/topic_LIDAR.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/topic_RGB.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/topic_accumulation.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/topic_aggregation.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/topic_albedo.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/topic_algebra.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/topic_atmospheric_correction.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/topic_attribute_table.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/topic_biomass.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/topic_buffer.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/topic_cartography.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/topic_category.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/topic_centroid.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/topic_classification.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/topic_clip.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/topic_color_table.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/topic_color_transformation.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/topic_composite.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/topic_connection_settings.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/topic_contour.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/topic_conversion.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/topic_copy.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/topic_cost_surface.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/topic_data.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/topic_diagram.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/topic_display.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/topic_dissolve.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/topic_distance.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/topic_edges.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/topic_editing.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/topic_elevation.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/topic_emissivity.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/topic_energy_balance.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/topic_evapotranspiration.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/topic_export.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/topic_extract.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/topic_fire.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/topic_fusion.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/topic_generalization.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/topic_geometry.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/topic_geomorphology.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/topic_geomorphons.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/topic_gradient.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/topic_graphics.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/topic_groundwater_flow.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/topic_histogram.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/topic_hydrology.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/topic_imagery.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/topic_imagery_quality_assessment.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/topic_import.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/topic_installation.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/topic_interpolation.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/topic_kernel_density.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/topic_landscape_structure_analysis.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/topic_latitude.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/topic_linear_reference_system.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/topic_manual.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/topic_map_annotations.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/topic_map_management.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/topic_mask.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/topic_measurement.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/topic_metadata.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/topic_modules.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/topic_mosaic.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/topic_multispectral.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/topic_network.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/topic_orthorectify.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/topic_paint_labels.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/topic_point_cloud.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/topic_printing.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/topic_profile.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/topic_projection.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/topic_querying.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/topic_radiometric_conversion.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/topic_raster.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/topic_reclassification.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/topic_recode_categories.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/topic_rectify.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/topic_resample.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/topic_rescale.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/topic_sampling.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/topic_segmentation.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/topic_series.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/topic_settings.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/topic_solar.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/topic_statistics.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/topic_support.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/topic_surface.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/topic_temporal.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/topic_terrain.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/topic_tiling.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/topic_time_management.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/topic_topology.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/topic_transformation.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/topic_unit_test.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/topic_vector.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/topic_vegetation_index.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/topic_viewshed.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/topic_visualization.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/topic_volume.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/topic_voxel.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/topics.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/v.buffer.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/v.build.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/v.build.all.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/v.build.polylines.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/v.category.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/v.centroids.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/v.class.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/v.clean.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/v.clip.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/v.cluster.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/v.colors.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/v.colors.out.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/v.db.addcolumn.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/v.db.addtable.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/v.db.connect.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/v.db.dropcolumn.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/v.db.droprow.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/v.db.droptable.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/v.db.join.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/v.db.reconnect.all.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/v.db.renamecolumn.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/v.db.select.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/v.db.univar.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/v.db.update.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/v.decimate.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/v.delaunay.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/v.dissolve.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/v.distance.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/v.drape.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/v.edit.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/v.external.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/v.external.out.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/v.extract.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/v.extrude.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/v.generalize.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/v.hull.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/v.import.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/v.in.ascii.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/v.in.db.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/v.in.dxf.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/v.in.e00.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/v.in.geonames.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/v.in.lines.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/v.in.mapgen.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/v.in.ogr.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/v.in.region.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/v.in.wfs.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/v.info.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/v.kcv.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/v.kernel.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/v.label.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/v.label.sa.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/v.lidar.correction.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/v.lidar.edgedetection.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/v.lidar.growing.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/v.lrs.create.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/v.lrs.label.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/v.lrs.segment.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/v.lrs.where.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/v.mkgrid.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/v.neighbors.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/v.net.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/v.net.alloc.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/v.net.allpairs.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/v.net.bridge.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/v.net.centrality.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/v.net.components.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/v.net.connectivity.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/v.net.distance.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/v.net.flow.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/v.net.iso.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/v.net.path.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/v.net.salesman.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/v.net.spanningtree.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/v.net.steiner.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/v.net.timetable.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/v.net.visibility.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/v.normal.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/v.out.ascii.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/v.out.dxf.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/v.out.ogr.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/v.out.pov.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/v.out.svg.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/v.out.vtk.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/v.outlier.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/v.overlay.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/v.pack.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/v.parallel.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/v.patch.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/v.perturb.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/v.profile.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/v.proj.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/v.qcount.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/v.random.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/v.rast.stats.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/v.reclass.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/v.rectify.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/v.report.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/v.sample.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/v.segment.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/v.select.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/v.split.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/v.support.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/v.surf.bspline.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/v.surf.idw.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/v.surf.rst.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/v.timestamp.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/v.to.3d.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/v.to.db.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/v.to.lines.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/v.to.points.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/v.to.rast.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/v.to.rast3.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/v.transform.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/v.type.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/v.univar.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/v.unpack.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/v.vect.stats.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/v.vol.rst.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/v.voronoi.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/v.what.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/v.what.rast.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/v.what.rast3.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/v.what.strds.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/v.what.vect.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/variables.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/vector.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/vector_graphical.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/vectorascii.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/vectorintro.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/wxGUI.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/wxGUI.animation.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/wxGUI.components.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/wxGUI.datacatalog.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/wxGUI.dbmgr.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/wxGUI.gcp.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/wxGUI.gmodeler.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/wxGUI.iclass.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/wxGUI.image2target.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/wxGUI.iscatt.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/wxGUI.mapswipe.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/wxGUI.modules.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/wxGUI.nviz.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/wxGUI.photo2image.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/wxGUI.psmap.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/wxGUI.rdigit.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/wxGUI.rlisetup.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/wxGUI.timeline.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/wxGUI.toolboxes.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/wxGUI.tplot.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/wxGUI.vdigit.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/wxGUI.vnet.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/wxGUI_graphical.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/wxpyimgview.1.gz
+%%GRASS_INST_DIR%%/docs/man/man1/ximgview.1.gz
+%%GRASS_INST_DIR%%/driver/db/dbf
+%%GRASS_INST_DIR%%/driver/db/ogr
+%%GRASS_INST_DIR%%/driver/db/sqlite
+%%GRASS_INST_DIR%%/etc/VERSIONNUMBER
+%%GRASS_INST_DIR%%/etc/clean_temp
+%%GRASS_INST_DIR%%/etc/colors.desc
+%%GRASS_INST_DIR%%/etc/colors/aspect
+%%GRASS_INST_DIR%%/etc/colors/aspectcolr
+%%GRASS_INST_DIR%%/etc/colors/bcyr
+%%GRASS_INST_DIR%%/etc/colors/bgyr
+%%GRASS_INST_DIR%%/etc/colors/blues
+%%GRASS_INST_DIR%%/etc/colors/byg
+%%GRASS_INST_DIR%%/etc/colors/byr
+%%GRASS_INST_DIR%%/etc/colors/celsius
+%%GRASS_INST_DIR%%/etc/colors/corine
+%%GRASS_INST_DIR%%/etc/colors/curvature
+%%GRASS_INST_DIR%%/etc/colors/differences
+%%GRASS_INST_DIR%%/etc/colors/elevation
+%%GRASS_INST_DIR%%/etc/colors/etopo2
+%%GRASS_INST_DIR%%/etc/colors/evi
+%%GRASS_INST_DIR%%/etc/colors/fahrenheit
+%%GRASS_INST_DIR%%/etc/colors/forest_cover
+%%GRASS_INST_DIR%%/etc/colors/gdd
+%%GRASS_INST_DIR%%/etc/colors/grass
+%%GRASS_INST_DIR%%/etc/colors/greens
+%%GRASS_INST_DIR%%/etc/colors/grey
+%%GRASS_INST_DIR%%/etc/colors/grey1.0
+%%GRASS_INST_DIR%%/etc/colors/grey255
+%%GRASS_INST_DIR%%/etc/colors/gyr
+%%GRASS_INST_DIR%%/etc/colors/haxby
+%%GRASS_INST_DIR%%/etc/colors/inferno
+%%GRASS_INST_DIR%%/etc/colors/kelvin
+%%GRASS_INST_DIR%%/etc/colors/magma
+%%GRASS_INST_DIR%%/etc/colors/ndvi
+%%GRASS_INST_DIR%%/etc/colors/ndwi
+%%GRASS_INST_DIR%%/etc/colors/nlcd
+%%GRASS_INST_DIR%%/etc/colors/oranges
+%%GRASS_INST_DIR%%/etc/colors/plasma
+%%GRASS_INST_DIR%%/etc/colors/population
+%%GRASS_INST_DIR%%/etc/colors/population_dens
+%%GRASS_INST_DIR%%/etc/colors/precipitation
+%%GRASS_INST_DIR%%/etc/colors/precipitation_daily
+%%GRASS_INST_DIR%%/etc/colors/precipitation_monthly
+%%GRASS_INST_DIR%%/etc/colors/rainbow
+%%GRASS_INST_DIR%%/etc/colors/ramp
+%%GRASS_INST_DIR%%/etc/colors/reds
+%%GRASS_INST_DIR%%/etc/colors/roygbiv
+%%GRASS_INST_DIR%%/etc/colors/rstcurv
+%%GRASS_INST_DIR%%/etc/colors/ryb
+%%GRASS_INST_DIR%%/etc/colors/ryg
+%%GRASS_INST_DIR%%/etc/colors/sepia
+%%GRASS_INST_DIR%%/etc/colors/slope
+%%GRASS_INST_DIR%%/etc/colors/soilmoisture
+%%GRASS_INST_DIR%%/etc/colors/srtm
+%%GRASS_INST_DIR%%/etc/colors/srtm_plus
+%%GRASS_INST_DIR%%/etc/colors/terrain
+%%GRASS_INST_DIR%%/etc/colors/viridis
+%%GRASS_INST_DIR%%/etc/colors/water
+%%GRASS_INST_DIR%%/etc/colors/wave
+%%GRASS_INST_DIR%%/etc/current_time_s_ms
+%%GRASS_INST_DIR%%/etc/d.mon/render_cmd.py
+%%GRASS_INST_DIR%%/etc/d.polar/ps_defs.eps
+%%GRASS_INST_DIR%%/etc/db.test/test1
+%%GRASS_INST_DIR%%/etc/echo
+%%GRASS_INST_DIR%%/etc/element_list
+%%GRASS_INST_DIR%%/etc/fontcap
+%%GRASS_INST_DIR%%/etc/i.band.library/landsat.json
+%%GRASS_INST_DIR%%/etc/i.band.library/sentinel.json
+%%GRASS_INST_DIR%%/etc/i.find
+%%GRASS_INST_DIR%%/etc/license
+%%GRASS_INST_DIR%%/etc/lister/cell
+%%GRASS_INST_DIR%%/etc/lister/vector
+%%GRASS_INST_DIR%%/etc/lock
+%%GRASS_INST_DIR%%/etc/paint/decorations/NorthArrow1.eps
+%%GRASS_INST_DIR%%/etc/paint/decorations/NorthArrow3.eps
+%%GRASS_INST_DIR%%/etc/paint/decorations/NorthArrow5.eps
+%%GRASS_INST_DIR%%/etc/paint/decorations/compass_exterior.eps
+%%GRASS_INST_DIR%%/etc/paint/decorations/compass_interior.eps
+%%GRASS_INST_DIR%%/etc/paint/decorations/grasslogo.eps
+%%GRASS_INST_DIR%%/etc/paint/decorations/n_arrow1.eps
+%%GRASS_INST_DIR%%/etc/paint/decorations/n_arrow1_fancy.eps
+%%GRASS_INST_DIR%%/etc/paint/decorations/n_arrow2.eps
+%%GRASS_INST_DIR%%/etc/paint/decorations/north-arrow_1_simple_half_arrow.eps
+%%GRASS_INST_DIR%%/etc/paint/patterns/brick.eps
+%%GRASS_INST_DIR%%/etc/paint/patterns/cross_diag.eps
+%%GRASS_INST_DIR%%/etc/paint/patterns/cross_diag5.eps
+%%GRASS_INST_DIR%%/etc/paint/patterns/cross_normal.eps
+%%GRASS_INST_DIR%%/etc/paint/patterns/cross_normal5.eps
+%%GRASS_INST_DIR%%/etc/paint/patterns/diag_down.eps
+%%GRASS_INST_DIR%%/etc/paint/patterns/diag_down6.eps
+%%GRASS_INST_DIR%%/etc/paint/patterns/diag_down_dash.eps
+%%GRASS_INST_DIR%%/etc/paint/patterns/diag_up.eps
+%%GRASS_INST_DIR%%/etc/paint/patterns/diag_up6.eps
+%%GRASS_INST_DIR%%/etc/paint/patterns/diag_up_dash.eps
+%%GRASS_INST_DIR%%/etc/paint/patterns/horiz_line.eps
+%%GRASS_INST_DIR%%/etc/paint/patterns/horiz_line6.eps
+%%GRASS_INST_DIR%%/etc/paint/patterns/horiz_line_dash.eps
+%%GRASS_INST_DIR%%/etc/paint/patterns/horiz_zigzag.eps
+%%GRASS_INST_DIR%%/etc/paint/patterns/polka_dot.eps
+%%GRASS_INST_DIR%%/etc/paint/patterns/railroad_down.eps
+%%GRASS_INST_DIR%%/etc/paint/patterns/railroad_up.eps
+%%GRASS_INST_DIR%%/etc/paint/patterns/vert_line.eps
+%%GRASS_INST_DIR%%/etc/paint/patterns/vert_line6.eps
+%%GRASS_INST_DIR%%/etc/paint/patterns/vert_line_dash.eps
+%%GRASS_INST_DIR%%/etc/paint/patterns/vert_zigzag.eps
+%%GRASS_INST_DIR%%/etc/paint/prolog.ps
+%%GRASS_INST_DIR%%/etc/proj/FIPS.code
+%%GRASS_INST_DIR%%/etc/proj/datum.table
+%%GRASS_INST_DIR%%/etc/proj/datumtransform.table
+%%GRASS_INST_DIR%%/etc/proj/desc.table
+%%GRASS_INST_DIR%%/etc/proj/ellipse.table
+%%GRASS_INST_DIR%%/etc/proj/ellipse.table.solar.system
+%%GRASS_INST_DIR%%/etc/proj/parms.table
+%%GRASS_INST_DIR%%/etc/proj/projections
+%%GRASS_INST_DIR%%/etc/proj/state27
+%%GRASS_INST_DIR%%/etc/proj/state83
+%%GRASS_INST_DIR%%/etc/proj/units.table
+%%GRASS_INST_DIR%%/etc/psdriver.ps
+%%GRASS_INST_DIR%%/etc/python/grass/__init__.py
+%%GRASS_INST_DIR%%/etc/python/grass/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/app/__init__.py
+%%GRASS_INST_DIR%%/etc/python/grass/app/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/app/__pycache__/data%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/app/data.py
+%%GRASS_INST_DIR%%/etc/python/grass/benchmark/__init__.py
+%%GRASS_INST_DIR%%/etc/python/grass/benchmark/__main__.py
+%%GRASS_INST_DIR%%/etc/python/grass/benchmark/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/benchmark/__pycache__/__main__%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/benchmark/__pycache__/app%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/benchmark/__pycache__/plots%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/benchmark/__pycache__/results%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/benchmark/__pycache__/runners%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/benchmark/app.py
+%%GRASS_INST_DIR%%/etc/python/grass/benchmark/plots.py
+%%GRASS_INST_DIR%%/etc/python/grass/benchmark/results.py
+%%GRASS_INST_DIR%%/etc/python/grass/benchmark/runners.py
+%%GRASS_INST_DIR%%/etc/python/grass/exceptions/__init__.py
+%%GRASS_INST_DIR%%/etc/python/grass/exceptions/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/grassdb/__init__.py
+%%GRASS_INST_DIR%%/etc/python/grass/grassdb/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/grassdb/__pycache__/checks%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/grassdb/__pycache__/config%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/grassdb/__pycache__/create%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/grassdb/__pycache__/data%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/grassdb/__pycache__/manage%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/grassdb/checks.py
+%%GRASS_INST_DIR%%/etc/python/grass/grassdb/config.py
+%%GRASS_INST_DIR%%/etc/python/grass/grassdb/create.py
+%%GRASS_INST_DIR%%/etc/python/grass/grassdb/data.py
+%%GRASS_INST_DIR%%/etc/python/grass/grassdb/manage.py
+%%GRASS_INST_DIR%%/etc/python/grass/gunittest/__init__.py
+%%GRASS_INST_DIR%%/etc/python/grass/gunittest/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/gunittest/__pycache__/case%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/gunittest/__pycache__/checkers%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/gunittest/__pycache__/gmodules%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/gunittest/__pycache__/gutils%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/gunittest/__pycache__/invoker%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/gunittest/__pycache__/loader%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/gunittest/__pycache__/main%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/gunittest/__pycache__/reporters%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/gunittest/__pycache__/runner%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/gunittest/__pycache__/utils%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/gunittest/case.py
+%%GRASS_INST_DIR%%/etc/python/grass/gunittest/checkers.py
+%%GRASS_INST_DIR%%/etc/python/grass/gunittest/gmodules.py
+%%GRASS_INST_DIR%%/etc/python/grass/gunittest/gutils.py
+%%GRASS_INST_DIR%%/etc/python/grass/gunittest/invoker.py
+%%GRASS_INST_DIR%%/etc/python/grass/gunittest/loader.py
+%%GRASS_INST_DIR%%/etc/python/grass/gunittest/main.py
+%%GRASS_INST_DIR%%/etc/python/grass/gunittest/reporters.py
+%%GRASS_INST_DIR%%/etc/python/grass/gunittest/runner.py
+%%GRASS_INST_DIR%%/etc/python/grass/gunittest/utils.py
+%%GRASS_INST_DIR%%/etc/python/grass/imaging/__init__.py
+%%GRASS_INST_DIR%%/etc/python/grass/imaging/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/imaging/__pycache__/images2avi%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/imaging/__pycache__/images2gif%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/imaging/__pycache__/images2ims%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/imaging/__pycache__/images2swf%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/imaging/__pycache__/operations%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/imaging/images2avi.py
+%%GRASS_INST_DIR%%/etc/python/grass/imaging/images2gif.py
+%%GRASS_INST_DIR%%/etc/python/grass/imaging/images2ims.py
+%%GRASS_INST_DIR%%/etc/python/grass/imaging/images2swf.py
+%%GRASS_INST_DIR%%/etc/python/grass/imaging/operations.py
+%%GRASS_INST_DIR%%/etc/python/grass/jupyter/__init__.py
+%%GRASS_INST_DIR%%/etc/python/grass/jupyter/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/jupyter/__pycache__/interactivemap%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/jupyter/__pycache__/map%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/jupyter/__pycache__/map3d%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/jupyter/__pycache__/region%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/jupyter/__pycache__/reprojection_renderer%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/jupyter/__pycache__/setup%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/jupyter/__pycache__/timeseriesmap%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/jupyter/__pycache__/utils%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/jupyter/interactivemap.py
+%%GRASS_INST_DIR%%/etc/python/grass/jupyter/map.py
+%%GRASS_INST_DIR%%/etc/python/grass/jupyter/map3d.py
+%%GRASS_INST_DIR%%/etc/python/grass/jupyter/region.py
+%%GRASS_INST_DIR%%/etc/python/grass/jupyter/reprojection_renderer.py
+%%GRASS_INST_DIR%%/etc/python/grass/jupyter/setup.py
+%%GRASS_INST_DIR%%/etc/python/grass/jupyter/timeseriesmap.py
+%%GRASS_INST_DIR%%/etc/python/grass/jupyter/utils.py
+%%GRASS_INST_DIR%%/etc/python/grass/lib/__init__.py
+%%GRASS_INST_DIR%%/etc/python/grass/lib/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/lib/__pycache__/arraystats%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/lib/__pycache__/cluster%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/lib/__pycache__/ctypes_loader%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/lib/__pycache__/ctypes_preamble%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/lib/__pycache__/date%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/lib/__pycache__/dbmi%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/lib/__pycache__/display%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/lib/__pycache__/gis%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/lib/__pycache__/gmath%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/lib/__pycache__/imagery%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/lib/__pycache__/nviz%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/lib/__pycache__/ogsf%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/lib/__pycache__/proj%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/lib/__pycache__/raster%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/lib/__pycache__/raster3d%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/lib/__pycache__/rowio%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/lib/__pycache__/rtree%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/lib/__pycache__/segment%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/lib/__pycache__/stats%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/lib/__pycache__/temporal%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/lib/__pycache__/vector%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/lib/__pycache__/vedit%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/lib/arraystats.py
+%%GRASS_INST_DIR%%/etc/python/grass/lib/cluster.py
+%%GRASS_INST_DIR%%/etc/python/grass/lib/ctypes_loader.py
+%%GRASS_INST_DIR%%/etc/python/grass/lib/ctypes_preamble.py
+%%GRASS_INST_DIR%%/etc/python/grass/lib/date.py
+%%GRASS_INST_DIR%%/etc/python/grass/lib/dbmi.py
+%%GRASS_INST_DIR%%/etc/python/grass/lib/display.py
+%%GRASS_INST_DIR%%/etc/python/grass/lib/gis.py
+%%GRASS_INST_DIR%%/etc/python/grass/lib/gmath.py
+%%GRASS_INST_DIR%%/etc/python/grass/lib/imagery.py
+%%GRASS_INST_DIR%%/etc/python/grass/lib/nviz.py
+%%GRASS_INST_DIR%%/etc/python/grass/lib/ogsf.py
+%%GRASS_INST_DIR%%/etc/python/grass/lib/proj.py
+%%GRASS_INST_DIR%%/etc/python/grass/lib/raster.py
+%%GRASS_INST_DIR%%/etc/python/grass/lib/raster3d.py
+%%GRASS_INST_DIR%%/etc/python/grass/lib/rowio.py
+%%GRASS_INST_DIR%%/etc/python/grass/lib/rtree.py
+%%GRASS_INST_DIR%%/etc/python/grass/lib/segment.py
+%%GRASS_INST_DIR%%/etc/python/grass/lib/stats.py
+%%GRASS_INST_DIR%%/etc/python/grass/lib/temporal.py
+%%GRASS_INST_DIR%%/etc/python/grass/lib/vector.py
+%%GRASS_INST_DIR%%/etc/python/grass/lib/vedit.py
+%%GRASS_INST_DIR%%/etc/python/grass/pydispatch/__init__.py
+%%GRASS_INST_DIR%%/etc/python/grass/pydispatch/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/pydispatch/__pycache__/dispatcher%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/pydispatch/__pycache__/errors%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/pydispatch/__pycache__/robust%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/pydispatch/__pycache__/robustapply%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/pydispatch/__pycache__/saferef%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/pydispatch/__pycache__/signal%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/pydispatch/dispatcher.py
+%%GRASS_INST_DIR%%/etc/python/grass/pydispatch/errors.py
+%%GRASS_INST_DIR%%/etc/python/grass/pydispatch/robust.py
+%%GRASS_INST_DIR%%/etc/python/grass/pydispatch/robustapply.py
+%%GRASS_INST_DIR%%/etc/python/grass/pydispatch/saferef.py
+%%GRASS_INST_DIR%%/etc/python/grass/pydispatch/signal.py
+%%GRASS_INST_DIR%%/etc/python/grass/pygrass/__init__.py
+%%GRASS_INST_DIR%%/etc/python/grass/pygrass/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/pygrass/__pycache__/errors%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/pygrass/__pycache__/orderdict%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/pygrass/__pycache__/utils%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/pygrass/errors.py
+%%GRASS_INST_DIR%%/etc/python/grass/pygrass/gis/__init__.py
+%%GRASS_INST_DIR%%/etc/python/grass/pygrass/gis/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/pygrass/gis/__pycache__/region%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/pygrass/gis/region.py
+%%GRASS_INST_DIR%%/etc/python/grass/pygrass/messages/__init__.py
+%%GRASS_INST_DIR%%/etc/python/grass/pygrass/messages/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/pygrass/modules/__init__.py
+%%GRASS_INST_DIR%%/etc/python/grass/pygrass/modules/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/pygrass/modules/__pycache__/shortcuts%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/pygrass/modules/grid/__init__.py
+%%GRASS_INST_DIR%%/etc/python/grass/pygrass/modules/grid/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/pygrass/modules/grid/__pycache__/grid%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/pygrass/modules/grid/__pycache__/patch%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/pygrass/modules/grid/__pycache__/split%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/pygrass/modules/grid/grid.py
+%%GRASS_INST_DIR%%/etc/python/grass/pygrass/modules/grid/patch.py
+%%GRASS_INST_DIR%%/etc/python/grass/pygrass/modules/grid/split.py
+%%GRASS_INST_DIR%%/etc/python/grass/pygrass/modules/interface/__init__.py
+%%GRASS_INST_DIR%%/etc/python/grass/pygrass/modules/interface/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/pygrass/modules/interface/__pycache__/docstring%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/pygrass/modules/interface/__pycache__/env%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/pygrass/modules/interface/__pycache__/flag%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/pygrass/modules/interface/__pycache__/module%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/pygrass/modules/interface/__pycache__/parameter%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/pygrass/modules/interface/__pycache__/read%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/pygrass/modules/interface/__pycache__/typedict%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/pygrass/modules/interface/docstring.py
+%%GRASS_INST_DIR%%/etc/python/grass/pygrass/modules/interface/env.py
+%%GRASS_INST_DIR%%/etc/python/grass/pygrass/modules/interface/flag.py
+%%GRASS_INST_DIR%%/etc/python/grass/pygrass/modules/interface/module.py
+%%GRASS_INST_DIR%%/etc/python/grass/pygrass/modules/interface/parameter.py
+%%GRASS_INST_DIR%%/etc/python/grass/pygrass/modules/interface/read.py
+%%GRASS_INST_DIR%%/etc/python/grass/pygrass/modules/interface/typedict.py
+%%GRASS_INST_DIR%%/etc/python/grass/pygrass/modules/shortcuts.py
+%%GRASS_INST_DIR%%/etc/python/grass/pygrass/orderdict.py
+%%GRASS_INST_DIR%%/etc/python/grass/pygrass/raster/__init__.py
+%%GRASS_INST_DIR%%/etc/python/grass/pygrass/raster/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/pygrass/raster/__pycache__/abstract%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/pygrass/raster/__pycache__/buffer%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/pygrass/raster/__pycache__/category%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/pygrass/raster/__pycache__/history%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/pygrass/raster/__pycache__/raster_type%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/pygrass/raster/__pycache__/rowio%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/pygrass/raster/__pycache__/segment%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/pygrass/raster/abstract.py
+%%GRASS_INST_DIR%%/etc/python/grass/pygrass/raster/buffer.py
+%%GRASS_INST_DIR%%/etc/python/grass/pygrass/raster/category.py
+%%GRASS_INST_DIR%%/etc/python/grass/pygrass/raster/history.py
+%%GRASS_INST_DIR%%/etc/python/grass/pygrass/raster/raster_type.py
+%%GRASS_INST_DIR%%/etc/python/grass/pygrass/raster/rowio.py
+%%GRASS_INST_DIR%%/etc/python/grass/pygrass/raster/segment.py
+%%GRASS_INST_DIR%%/etc/python/grass/pygrass/rpc/__init__.py
+%%GRASS_INST_DIR%%/etc/python/grass/pygrass/rpc/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/pygrass/rpc/__pycache__/base%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/pygrass/rpc/base.py
+%%GRASS_INST_DIR%%/etc/python/grass/pygrass/shell/__init__.py
+%%GRASS_INST_DIR%%/etc/python/grass/pygrass/shell/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/pygrass/shell/__pycache__/conversion%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/pygrass/shell/__pycache__/show%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/pygrass/shell/conversion.py
+%%GRASS_INST_DIR%%/etc/python/grass/pygrass/shell/show.py
+%%GRASS_INST_DIR%%/etc/python/grass/pygrass/tests/__init__.py
+%%GRASS_INST_DIR%%/etc/python/grass/pygrass/tests/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/pygrass/tests/__pycache__/benchmark%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/pygrass/tests/__pycache__/set_mapset%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/pygrass/tests/benchmark.py
+%%GRASS_INST_DIR%%/etc/python/grass/pygrass/tests/set_mapset.py
+%%GRASS_INST_DIR%%/etc/python/grass/pygrass/utils.py
+%%GRASS_INST_DIR%%/etc/python/grass/pygrass/vector/__init__.py
+%%GRASS_INST_DIR%%/etc/python/grass/pygrass/vector/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/pygrass/vector/__pycache__/abstract%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/pygrass/vector/__pycache__/basic%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/pygrass/vector/__pycache__/find%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/pygrass/vector/__pycache__/geometry%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/pygrass/vector/__pycache__/sql%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/pygrass/vector/__pycache__/table%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/pygrass/vector/__pycache__/vector_type%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/pygrass/vector/abstract.py
+%%GRASS_INST_DIR%%/etc/python/grass/pygrass/vector/basic.py
+%%GRASS_INST_DIR%%/etc/python/grass/pygrass/vector/find.py
+%%GRASS_INST_DIR%%/etc/python/grass/pygrass/vector/geometry.py
+%%GRASS_INST_DIR%%/etc/python/grass/pygrass/vector/sql.py
+%%GRASS_INST_DIR%%/etc/python/grass/pygrass/vector/table.py
+%%GRASS_INST_DIR%%/etc/python/grass/pygrass/vector/vector_type.py
+%%GRASS_INST_DIR%%/etc/python/grass/script/__init__.py
+%%GRASS_INST_DIR%%/etc/python/grass/script/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/script/__pycache__/array%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/script/__pycache__/core%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/script/__pycache__/db%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/script/__pycache__/raster%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/script/__pycache__/raster3d%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/script/__pycache__/setup%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/script/__pycache__/task%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/script/__pycache__/utils%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/script/__pycache__/vector%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/script/array.py
+%%GRASS_INST_DIR%%/etc/python/grass/script/core.py
+%%GRASS_INST_DIR%%/etc/python/grass/script/db.py
+%%GRASS_INST_DIR%%/etc/python/grass/script/raster.py
+%%GRASS_INST_DIR%%/etc/python/grass/script/raster3d.py
+%%GRASS_INST_DIR%%/etc/python/grass/script/setup.py
+%%GRASS_INST_DIR%%/etc/python/grass/script/task.py
+%%GRASS_INST_DIR%%/etc/python/grass/script/utils.py
+%%GRASS_INST_DIR%%/etc/python/grass/script/vector.py
+%%GRASS_INST_DIR%%/etc/python/grass/semantic_label/__init__.py
+%%GRASS_INST_DIR%%/etc/python/grass/semantic_label/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/semantic_label/__pycache__/reader%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/semantic_label/reader.py
+%%GRASS_INST_DIR%%/etc/python/grass/temporal/__init__.py
+%%GRASS_INST_DIR%%/etc/python/grass/temporal/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/temporal/__pycache__/abstract_dataset%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/temporal/__pycache__/abstract_map_dataset%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/temporal/__pycache__/abstract_space_time_dataset%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/temporal/__pycache__/aggregation%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/temporal/__pycache__/base%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/temporal/__pycache__/c_libraries_interface%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/temporal/__pycache__/core%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/temporal/__pycache__/datetime_math%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/temporal/__pycache__/extract%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/temporal/__pycache__/factory%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/temporal/__pycache__/gui_support%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/temporal/__pycache__/list_stds%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/temporal/__pycache__/mapcalc%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/temporal/__pycache__/metadata%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/temporal/__pycache__/open_stds%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/temporal/__pycache__/register%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/temporal/__pycache__/sampling%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/temporal/__pycache__/space_time_datasets%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/temporal/__pycache__/spatial_extent%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/temporal/__pycache__/spatial_topology_dataset_connector%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/temporal/__pycache__/spatio_temporal_relationships%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/temporal/__pycache__/stds_export%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/temporal/__pycache__/stds_import%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/temporal/__pycache__/temporal_algebra%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/temporal/__pycache__/temporal_extent%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/temporal/__pycache__/temporal_granularity%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/temporal/__pycache__/temporal_operator%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/temporal/__pycache__/temporal_raster3d_algebra%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/temporal/__pycache__/temporal_raster_algebra%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/temporal/__pycache__/temporal_raster_base_algebra%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/temporal/__pycache__/temporal_topology_dataset_connector%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/temporal/__pycache__/temporal_vector_algebra%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/temporal/__pycache__/unit_tests%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/temporal/__pycache__/univar_statistics%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/temporal/abstract_dataset.py
+%%GRASS_INST_DIR%%/etc/python/grass/temporal/abstract_map_dataset.py
+%%GRASS_INST_DIR%%/etc/python/grass/temporal/abstract_space_time_dataset.py
+%%GRASS_INST_DIR%%/etc/python/grass/temporal/aggregation.py
+%%GRASS_INST_DIR%%/etc/python/grass/temporal/base.py
+%%GRASS_INST_DIR%%/etc/python/grass/temporal/c_libraries_interface.py
+%%GRASS_INST_DIR%%/etc/python/grass/temporal/core.py
+%%GRASS_INST_DIR%%/etc/python/grass/temporal/datetime_math.py
+%%GRASS_INST_DIR%%/etc/python/grass/temporal/extract.py
+%%GRASS_INST_DIR%%/etc/python/grass/temporal/factory.py
+%%GRASS_INST_DIR%%/etc/python/grass/temporal/gui_support.py
+%%GRASS_INST_DIR%%/etc/python/grass/temporal/list_stds.py
+%%GRASS_INST_DIR%%/etc/python/grass/temporal/mapcalc.py
+%%GRASS_INST_DIR%%/etc/python/grass/temporal/metadata.py
+%%GRASS_INST_DIR%%/etc/python/grass/temporal/open_stds.py
+%%GRASS_INST_DIR%%/etc/python/grass/temporal/register.py
+%%GRASS_INST_DIR%%/etc/python/grass/temporal/sampling.py
+%%GRASS_INST_DIR%%/etc/python/grass/temporal/space_time_datasets.py
+%%GRASS_INST_DIR%%/etc/python/grass/temporal/spatial_extent.py
+%%GRASS_INST_DIR%%/etc/python/grass/temporal/spatial_topology_dataset_connector.py
+%%GRASS_INST_DIR%%/etc/python/grass/temporal/spatio_temporal_relationships.py
+%%GRASS_INST_DIR%%/etc/python/grass/temporal/stds_export.py
+%%GRASS_INST_DIR%%/etc/python/grass/temporal/stds_import.py
+%%GRASS_INST_DIR%%/etc/python/grass/temporal/temporal_algebra.py
+%%GRASS_INST_DIR%%/etc/python/grass/temporal/temporal_extent.py
+%%GRASS_INST_DIR%%/etc/python/grass/temporal/temporal_granularity.py
+%%GRASS_INST_DIR%%/etc/python/grass/temporal/temporal_operator.py
+%%GRASS_INST_DIR%%/etc/python/grass/temporal/temporal_raster3d_algebra.py
+%%GRASS_INST_DIR%%/etc/python/grass/temporal/temporal_raster_algebra.py
+%%GRASS_INST_DIR%%/etc/python/grass/temporal/temporal_raster_base_algebra.py
+%%GRASS_INST_DIR%%/etc/python/grass/temporal/temporal_topology_dataset_connector.py
+%%GRASS_INST_DIR%%/etc/python/grass/temporal/temporal_vector_algebra.py
+%%GRASS_INST_DIR%%/etc/python/grass/temporal/unit_tests.py
+%%GRASS_INST_DIR%%/etc/python/grass/temporal/univar_statistics.py
+%%GRASS_INST_DIR%%/etc/python/grass/utils/__init__.py
+%%GRASS_INST_DIR%%/etc/python/grass/utils/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/utils/__pycache__/download%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/python/grass/utils/download.py
+%%GRASS_INST_DIR%%/etc/r.in.wms/__pycache__/srs%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/r.in.wms/__pycache__/wms_base%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/r.in.wms/__pycache__/wms_cap_parsers%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/r.in.wms/__pycache__/wms_drv%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/r.in.wms/__pycache__/wms_gdal_drv%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/etc/r.in.wms/srs.py
+%%GRASS_INST_DIR%%/etc/r.in.wms/wms_base.py
+%%GRASS_INST_DIR%%/etc/r.in.wms/wms_cap_parsers.py
+%%GRASS_INST_DIR%%/etc/r.in.wms/wms_drv.py
+%%GRASS_INST_DIR%%/etc/r.in.wms/wms_gdal_drv.py
+%%GRASS_INST_DIR%%/etc/r.watershed/ram
+%%GRASS_INST_DIR%%/etc/r.watershed/seg
+%%GRASS_INST_DIR%%/etc/renamed_options
+%%GRASS_INST_DIR%%/etc/run
+%%GRASS_INST_DIR%%/etc/sql/drop_views.sql
+%%GRASS_INST_DIR%%/etc/sql/map_tables_template.sql
+%%GRASS_INST_DIR%%/etc/sql/postgresql_delete_trigger.sql
+%%GRASS_INST_DIR%%/etc/sql/postgresql_indexes.sql
+%%GRASS_INST_DIR%%/etc/sql/raster3d_metadata_table.sql
+%%GRASS_INST_DIR%%/etc/sql/raster3d_views.sql
+%%GRASS_INST_DIR%%/etc/sql/raster_metadata_table.sql
+%%GRASS_INST_DIR%%/etc/sql/raster_views.sql
+%%GRASS_INST_DIR%%/etc/sql/sqlite3_delete_trigger.sql
+%%GRASS_INST_DIR%%/etc/sql/sqlite3_indexes.sql
+%%GRASS_INST_DIR%%/etc/sql/stds_map_register_table_template.sql
+%%GRASS_INST_DIR%%/etc/sql/stds_tables_template.sql
+%%GRASS_INST_DIR%%/etc/sql/str3ds_metadata_table.sql
+%%GRASS_INST_DIR%%/etc/sql/str3ds_views.sql
+%%GRASS_INST_DIR%%/etc/sql/strds_metadata_table.sql
+%%GRASS_INST_DIR%%/etc/sql/strds_views.sql
+%%GRASS_INST_DIR%%/etc/sql/stvds_metadata_table.sql
+%%GRASS_INST_DIR%%/etc/sql/stvds_views.sql
+%%GRASS_INST_DIR%%/etc/sql/update_stds_spatial_temporal_extent_template.sql
+%%GRASS_INST_DIR%%/etc/sql/update_str3ds_metadata_template.sql
+%%GRASS_INST_DIR%%/etc/sql/update_strds_metadata_template.sql
+%%GRASS_INST_DIR%%/etc/sql/update_strds_metadata_template_v3.sql
+%%GRASS_INST_DIR%%/etc/sql/update_stvds_metadata_template.sql
+%%GRASS_INST_DIR%%/etc/sql/upgrade_db_2_to_3.sql
+%%GRASS_INST_DIR%%/etc/sql/vector_metadata_table.sql
+%%GRASS_INST_DIR%%/etc/sql/vector_views.sql
+%%GRASS_INST_DIR%%/etc/symbol/basic/arrow
+%%GRASS_INST_DIR%%/etc/symbol/basic/arrow1
+%%GRASS_INST_DIR%%/etc/symbol/basic/arrow2
+%%GRASS_INST_DIR%%/etc/symbol/basic/arrow3
+%%GRASS_INST_DIR%%/etc/symbol/basic/box
+%%GRASS_INST_DIR%%/etc/symbol/basic/circle
+%%GRASS_INST_DIR%%/etc/symbol/basic/cross1
+%%GRASS_INST_DIR%%/etc/symbol/basic/cross2
+%%GRASS_INST_DIR%%/etc/symbol/basic/cross3
+%%GRASS_INST_DIR%%/etc/symbol/basic/diamond
+%%GRASS_INST_DIR%%/etc/symbol/basic/hexagon
+%%GRASS_INST_DIR%%/etc/symbol/basic/marker
+%%GRASS_INST_DIR%%/etc/symbol/basic/octagon
+%%GRASS_INST_DIR%%/etc/symbol/basic/pin
+%%GRASS_INST_DIR%%/etc/symbol/basic/pin_dot
+%%GRASS_INST_DIR%%/etc/symbol/basic/point
+%%GRASS_INST_DIR%%/etc/symbol/basic/pushpin
+%%GRASS_INST_DIR%%/etc/symbol/basic/star
+%%GRASS_INST_DIR%%/etc/symbol/basic/triangle
+%%GRASS_INST_DIR%%/etc/symbol/basic/x
+%%GRASS_INST_DIR%%/etc/symbol/demo/muchomurka
+%%GRASS_INST_DIR%%/etc/symbol/demo/smrk
+%%GRASS_INST_DIR%%/etc/symbol/extra/4pt_star
+%%GRASS_INST_DIR%%/etc/symbol/extra/adcp
+%%GRASS_INST_DIR%%/etc/symbol/extra/airport
+%%GRASS_INST_DIR%%/etc/symbol/extra/alpha_flag
+%%GRASS_INST_DIR%%/etc/symbol/extra/bridge
+%%GRASS_INST_DIR%%/etc/symbol/extra/dim_arrow
+%%GRASS_INST_DIR%%/etc/symbol/extra/dive_flag
+%%GRASS_INST_DIR%%/etc/symbol/extra/fiducial
+%%GRASS_INST_DIR%%/etc/symbol/extra/fish
+%%GRASS_INST_DIR%%/etc/symbol/extra/half-box
+%%GRASS_INST_DIR%%/etc/symbol/extra/half-circle
+%%GRASS_INST_DIR%%/etc/symbol/extra/offbox_ne
+%%GRASS_INST_DIR%%/etc/symbol/extra/offbox_nw
+%%GRASS_INST_DIR%%/etc/symbol/extra/offbox_se
+%%GRASS_INST_DIR%%/etc/symbol/extra/offbox_sw
+%%GRASS_INST_DIR%%/etc/symbol/extra/pentagon
+%%GRASS_INST_DIR%%/etc/symbol/extra/ping
+%%GRASS_INST_DIR%%/etc/symbol/extra/ring
+%%GRASS_INST_DIR%%/etc/symbol/extra/simple_zia
+%%GRASS_INST_DIR%%/etc/symbol/extra/target
+%%GRASS_INST_DIR%%/etc/symbol/geology/circle_cross
+%%GRASS_INST_DIR%%/etc/symbol/geology/half-arrow_left
+%%GRASS_INST_DIR%%/etc/symbol/geology/half-arrow_right
+%%GRASS_INST_DIR%%/etc/symbol/geology/strike_box
+%%GRASS_INST_DIR%%/etc/symbol/geology/strike_circle
+%%GRASS_INST_DIR%%/etc/symbol/geology/strike_cleavage
+%%GRASS_INST_DIR%%/etc/symbol/geology/strike_half-bowtie
+%%GRASS_INST_DIR%%/etc/symbol/geology/strike_line
+%%GRASS_INST_DIR%%/etc/symbol/geology/strike_parallel
+%%GRASS_INST_DIR%%/etc/symbol/geology/strike_triangle
+%%GRASS_INST_DIR%%/etc/symbol/legend/area
+%%GRASS_INST_DIR%%/etc/symbol/legend/area_curved
+%%GRASS_INST_DIR%%/etc/symbol/legend/line
+%%GRASS_INST_DIR%%/etc/symbol/legend/line_crooked
+%%GRASS_INST_DIR%%/etc/symbol/n_arrows/basic_compass
+%%GRASS_INST_DIR%%/etc/symbol/n_arrows/fancy_compass
+%%GRASS_INST_DIR%%/etc/symbol/n_arrows/n_arrow1a
+%%GRASS_INST_DIR%%/etc/symbol/n_arrows/n_arrow1b
+%%GRASS_INST_DIR%%/etc/symbol/n_arrows/n_arrow2
+%%GRASS_INST_DIR%%/etc/symbol/n_arrows/n_arrow3
+%%GRASS_INST_DIR%%/etc/symbol/n_arrows/n_arrow4
+%%GRASS_INST_DIR%%/etc/symbol/n_arrows/n_arrow5
+%%GRASS_INST_DIR%%/etc/symbol/n_arrows/n_arrow6
+%%GRASS_INST_DIR%%/etc/symbol/n_arrows/n_arrow7a
+%%GRASS_INST_DIR%%/etc/symbol/n_arrows/n_arrow7b
+%%GRASS_INST_DIR%%/etc/symbol/n_arrows/n_arrow8a
+%%GRASS_INST_DIR%%/etc/symbol/n_arrows/n_arrow8b
+%%GRASS_INST_DIR%%/etc/symbol/n_arrows/n_arrow9
+%%GRASS_INST_DIR%%/etc/wxpyimgview_gui.py
+%%GRASS_INST_DIR%%/fonts/cyrilc.hmp
+%%GRASS_INST_DIR%%/fonts/fonts.table
+%%GRASS_INST_DIR%%/fonts/gothgbt.hmp
+%%GRASS_INST_DIR%%/fonts/gothgrt.hmp
+%%GRASS_INST_DIR%%/fonts/gothitt.hmp
+%%GRASS_INST_DIR%%/fonts/greekc.hmp
+%%GRASS_INST_DIR%%/fonts/greekcs.hmp
+%%GRASS_INST_DIR%%/fonts/greekp.hmp
+%%GRASS_INST_DIR%%/fonts/greeks.hmp
+%%GRASS_INST_DIR%%/fonts/hersh.oc1
+%%GRASS_INST_DIR%%/fonts/hersh.oc2
+%%GRASS_INST_DIR%%/fonts/hersh.oc3
+%%GRASS_INST_DIR%%/fonts/hersh.oc4
+%%GRASS_INST_DIR%%/fonts/italicc.hmp
+%%GRASS_INST_DIR%%/fonts/italiccs.hmp
+%%GRASS_INST_DIR%%/fonts/italict.hmp
+%%GRASS_INST_DIR%%/fonts/romanc.hmp
+%%GRASS_INST_DIR%%/fonts/romancs.hmp
+%%GRASS_INST_DIR%%/fonts/romand.hmp
+%%GRASS_INST_DIR%%/fonts/romans.hmp
+%%GRASS_INST_DIR%%/fonts/romant.hmp
+%%GRASS_INST_DIR%%/fonts/scriptc.hmp
+%%GRASS_INST_DIR%%/fonts/scripts.hmp
+%%GRASS_INST_DIR%%/gui/icons/flags/af.png
+%%GRASS_INST_DIR%%/gui/icons/flags/am.png
+%%GRASS_INST_DIR%%/gui/icons/flags/ar.png
+%%GRASS_INST_DIR%%/gui/icons/flags/bg.png
+%%GRASS_INST_DIR%%/gui/icons/flags/cs.png
+%%GRASS_INST_DIR%%/gui/icons/flags/da.png
+%%GRASS_INST_DIR%%/gui/icons/flags/de.png
+%%GRASS_INST_DIR%%/gui/icons/flags/el.png
+%%GRASS_INST_DIR%%/gui/icons/flags/es.png
+%%GRASS_INST_DIR%%/gui/icons/flags/et.png
+%%GRASS_INST_DIR%%/gui/icons/flags/fa.png
+%%GRASS_INST_DIR%%/gui/icons/flags/fi.png
+%%GRASS_INST_DIR%%/gui/icons/flags/fr.png
+%%GRASS_INST_DIR%%/gui/icons/flags/he.png
+%%GRASS_INST_DIR%%/gui/icons/flags/hr.png
+%%GRASS_INST_DIR%%/gui/icons/flags/hu.png
+%%GRASS_INST_DIR%%/gui/icons/flags/id.png
+%%GRASS_INST_DIR%%/gui/icons/flags/is.png
+%%GRASS_INST_DIR%%/gui/icons/flags/it.png
+%%GRASS_INST_DIR%%/gui/icons/flags/ja.png
+%%GRASS_INST_DIR%%/gui/icons/flags/ka.png
+%%GRASS_INST_DIR%%/gui/icons/flags/ko.png
+%%GRASS_INST_DIR%%/gui/icons/flags/lo.png
+%%GRASS_INST_DIR%%/gui/icons/flags/lt.png
+%%GRASS_INST_DIR%%/gui/icons/flags/lv.png
+%%GRASS_INST_DIR%%/gui/icons/flags/ml.png
+%%GRASS_INST_DIR%%/gui/icons/flags/mn.png
+%%GRASS_INST_DIR%%/gui/icons/flags/mr.png
+%%GRASS_INST_DIR%%/gui/icons/flags/nl.png
+%%GRASS_INST_DIR%%/gui/icons/flags/no.png
+%%GRASS_INST_DIR%%/gui/icons/flags/pl.png
+%%GRASS_INST_DIR%%/gui/icons/flags/pt.png
+%%GRASS_INST_DIR%%/gui/icons/flags/pt_br.png
+%%GRASS_INST_DIR%%/gui/icons/flags/ro.png
+%%GRASS_INST_DIR%%/gui/icons/flags/ru.png
+%%GRASS_INST_DIR%%/gui/icons/flags/sk.png
+%%GRASS_INST_DIR%%/gui/icons/flags/sl.png
+%%GRASS_INST_DIR%%/gui/icons/flags/sq.png
+%%GRASS_INST_DIR%%/gui/icons/flags/sr.png
+%%GRASS_INST_DIR%%/gui/icons/flags/sv.png
+%%GRASS_INST_DIR%%/gui/icons/flags/ta.png
+%%GRASS_INST_DIR%%/gui/icons/flags/th.png
+%%GRASS_INST_DIR%%/gui/icons/flags/tr.png
+%%GRASS_INST_DIR%%/gui/icons/flags/uk.png
+%%GRASS_INST_DIR%%/gui/icons/flags/vi.png
+%%GRASS_INST_DIR%%/gui/icons/flags/xh.png
+%%GRASS_INST_DIR%%/gui/icons/flags/zh.png
+%%GRASS_INST_DIR%%/gui/icons/flags/zh_tw.png
+%%GRASS_INST_DIR%%/gui/icons/grass-128x128.png
+%%GRASS_INST_DIR%%/gui/icons/grass-16x16.png
+%%GRASS_INST_DIR%%/gui/icons/grass-192x192.png
+%%GRASS_INST_DIR%%/gui/icons/grass-22x22.png
+%%GRASS_INST_DIR%%/gui/icons/grass-24x24.png
+%%GRASS_INST_DIR%%/gui/icons/grass-32x32.png
+%%GRASS_INST_DIR%%/gui/icons/grass-36x36.png
+%%GRASS_INST_DIR%%/gui/icons/grass-40x40.png
+%%GRASS_INST_DIR%%/gui/icons/grass-42x42.png
+%%GRASS_INST_DIR%%/gui/icons/grass-48x48.png
+%%GRASS_INST_DIR%%/gui/icons/grass-64x64.png
+%%GRASS_INST_DIR%%/gui/icons/grass-72x72.png
+%%GRASS_INST_DIR%%/gui/icons/grass-80x80.png
+%%GRASS_INST_DIR%%/gui/icons/grass-8x8.png
+%%GRASS_INST_DIR%%/gui/icons/grass-96x96.png
+%%GRASS_INST_DIR%%/gui/icons/grass.ico
+%%GRASS_INST_DIR%%/gui/icons/grass/3d-help.png
+%%GRASS_INST_DIR%%/gui/icons/grass/3d-rotate.png
+%%GRASS_INST_DIR%%/gui/icons/grass/3d-settings.png
+%%GRASS_INST_DIR%%/gui/icons/grass/area-measure.png
+%%GRASS_INST_DIR%%/gui/icons/grass/aspect-arrow.png
+%%GRASS_INST_DIR%%/gui/icons/grass/attributes-display.png
+%%GRASS_INST_DIR%%/gui/icons/grass/boundary-create.png
+%%GRASS_INST_DIR%%/gui/icons/grass/cats-copy.png
+%%GRASS_INST_DIR%%/gui/icons/grass/cats-display.png
+%%GRASS_INST_DIR%%/gui/icons/grass/cell-cats.png
+%%GRASS_INST_DIR%%/gui/icons/grass/centroid-create.png
+%%GRASS_INST_DIR%%/gui/icons/grass/check.png
+%%GRASS_INST_DIR%%/gui/icons/grass/create.png
+%%GRASS_INST_DIR%%/gui/icons/grass/data-add.png
+%%GRASS_INST_DIR%%/gui/icons/grass/edit.png
+%%GRASS_INST_DIR%%/gui/icons/grass/erase.png
+%%GRASS_INST_DIR%%/gui/icons/grass/execute.png
+%%GRASS_INST_DIR%%/gui/icons/grass/flythrough.png
+%%GRASS_INST_DIR%%/gui/icons/grass/font.png
+%%GRASS_INST_DIR%%/gui/icons/grass/gcp-add.png
+%%GRASS_INST_DIR%%/gui/icons/grass/gcp-create.png
+%%GRASS_INST_DIR%%/gui/icons/grass/gcp-delete.png
+%%GRASS_INST_DIR%%/gui/icons/grass/gcp-remove.png
+%%GRASS_INST_DIR%%/gui/icons/grass/gcp-rms.png
+%%GRASS_INST_DIR%%/gui/icons/grass/gcp-save.png
+%%GRASS_INST_DIR%%/gui/icons/grass/georectify.png
+%%GRASS_INST_DIR%%/gui/icons/grass/grassdb-add.png
+%%GRASS_INST_DIR%%/gui/icons/grass/grassdb.png
+%%GRASS_INST_DIR%%/gui/icons/grass/help.png
+%%GRASS_INST_DIR%%/gui/icons/grass/his.png
+%%GRASS_INST_DIR%%/gui/icons/grass/image-add.png
+%%GRASS_INST_DIR%%/gui/icons/grass/image-export.png
+%%GRASS_INST_DIR%%/gui/icons/grass/info.png
+%%GRASS_INST_DIR%%/gui/icons/grass/label-add.png
+%%GRASS_INST_DIR%%/gui/icons/grass/label.png
+%%GRASS_INST_DIR%%/gui/icons/grass/layer-add.png
+%%GRASS_INST_DIR%%/gui/icons/grass/layer-aspect-arrow-add.png
+%%GRASS_INST_DIR%%/gui/icons/grass/layer-bottom.png
+%%GRASS_INST_DIR%%/gui/icons/grass/layer-cell-cats-add.png
+%%GRASS_INST_DIR%%/gui/icons/grass/layer-command-add.png
+%%GRASS_INST_DIR%%/gui/icons/grass/layer-down.png
+%%GRASS_INST_DIR%%/gui/icons/grass/layer-edit.png
+%%GRASS_INST_DIR%%/gui/icons/grass/layer-export.png
+%%GRASS_INST_DIR%%/gui/icons/grass/layer-grid-add.png
+%%GRASS_INST_DIR%%/gui/icons/grass/layer-group-add.png
+%%GRASS_INST_DIR%%/gui/icons/grass/layer-his-add.png
+%%GRASS_INST_DIR%%/gui/icons/grass/layer-import.png
+%%GRASS_INST_DIR%%/gui/icons/grass/layer-info.png
+%%GRASS_INST_DIR%%/gui/icons/grass/layer-label-add.png
+%%GRASS_INST_DIR%%/gui/icons/grass/layer-more.png
+%%GRASS_INST_DIR%%/gui/icons/grass/layer-opacity.png
+%%GRASS_INST_DIR%%/gui/icons/grass/layer-open.png
+%%GRASS_INST_DIR%%/gui/icons/grass/layer-raster-add.png
+%%GRASS_INST_DIR%%/gui/icons/grass/layer-raster-analyze.png
+%%GRASS_INST_DIR%%/gui/icons/grass/layer-raster-histogram.png
+%%GRASS_INST_DIR%%/gui/icons/grass/layer-raster-more.png
+%%GRASS_INST_DIR%%/gui/icons/grass/layer-raster-profile.png
+%%GRASS_INST_DIR%%/gui/icons/grass/layer-raster3d-add.png
+%%GRASS_INST_DIR%%/gui/icons/grass/layer-redraw.png
+%%GRASS_INST_DIR%%/gui/icons/grass/layer-remove.png
+%%GRASS_INST_DIR%%/gui/icons/grass/layer-rgb-add.png
+%%GRASS_INST_DIR%%/gui/icons/grass/layer-shaded-relief-add.png
+%%GRASS_INST_DIR%%/gui/icons/grass/layer-up.png
+%%GRASS_INST_DIR%%/gui/icons/grass/layer-vector-add.png
+%%GRASS_INST_DIR%%/gui/icons/grass/layer-vector-chart-add.png
+%%GRASS_INST_DIR%%/gui/icons/grass/layer-vector-more.png
+%%GRASS_INST_DIR%%/gui/icons/grass/layer-vector-thematic-add.png
+%%GRASS_INST_DIR%%/gui/icons/grass/layer-wms-add.png
+%%GRASS_INST_DIR%%/gui/icons/grass/legend-add.png
+%%GRASS_INST_DIR%%/gui/icons/grass/line-add.png
+%%GRASS_INST_DIR%%/gui/icons/grass/line-create.png
+%%GRASS_INST_DIR%%/gui/icons/grass/line-delete.png
+%%GRASS_INST_DIR%%/gui/icons/grass/line-edit.png
+%%GRASS_INST_DIR%%/gui/icons/grass/line-move.png
+%%GRASS_INST_DIR%%/gui/icons/grass/line-split.png
+%%GRASS_INST_DIR%%/gui/icons/grass/location-add.png
+%%GRASS_INST_DIR%%/gui/icons/grass/location-download.png
+%%GRASS_INST_DIR%%/gui/icons/grass/location.png
+%%GRASS_INST_DIR%%/gui/icons/grass/locked.png
+%%GRASS_INST_DIR%%/gui/icons/grass/loop-add.png
+%%GRASS_INST_DIR%%/gui/icons/grass/map-add.png
+%%GRASS_INST_DIR%%/gui/icons/grass/map-export.png
+%%GRASS_INST_DIR%%/gui/icons/grass/map-info.png
+%%GRASS_INST_DIR%%/gui/icons/grass/map-settings.png
+%%GRASS_INST_DIR%%/gui/icons/grass/mapset-add.png
+%%GRASS_INST_DIR%%/gui/icons/grass/mapset.png
+%%GRASS_INST_DIR%%/gui/icons/grass/measure-length.png
+%%GRASS_INST_DIR%%/gui/icons/grass/modeler-main.png
+%%GRASS_INST_DIR%%/gui/icons/grass/modeler-variables.png
+%%GRASS_INST_DIR%%/gui/icons/grass/module-add.png
+%%GRASS_INST_DIR%%/gui/icons/grass/monitor-create.png
+%%GRASS_INST_DIR%%/gui/icons/grass/monitor-settings.png
+%%GRASS_INST_DIR%%/gui/icons/grass/move.png
+%%GRASS_INST_DIR%%/gui/icons/grass/north-arrow-add.png
+%%GRASS_INST_DIR%%/gui/icons/grass/open.png
+%%GRASS_INST_DIR%%/gui/icons/grass/options.png
+%%GRASS_INST_DIR%%/gui/icons/grass/overlay-add.png
+%%GRASS_INST_DIR%%/gui/icons/grass/page-settings.png
+%%GRASS_INST_DIR%%/gui/icons/grass/pan.png
+%%GRASS_INST_DIR%%/gui/icons/grass/pdf-export.png
+%%GRASS_INST_DIR%%/gui/icons/grass/player-back.png
+%%GRASS_INST_DIR%%/gui/icons/grass/player-pause.png
+%%GRASS_INST_DIR%%/gui/icons/grass/player-repeat-back-forward.png
+%%GRASS_INST_DIR%%/gui/icons/grass/player-stop.png
+%%GRASS_INST_DIR%%/gui/icons/grass/point-add.png
+%%GRASS_INST_DIR%%/gui/icons/grass/point-create.png
+%%GRASS_INST_DIR%%/gui/icons/grass/pointer.png
+%%GRASS_INST_DIR%%/gui/icons/grass/polygon-create.png
+%%GRASS_INST_DIR%%/gui/icons/grass/polygon-delete.png
+%%GRASS_INST_DIR%%/gui/icons/grass/polygon.png
+%%GRASS_INST_DIR%%/gui/icons/grass/print-compose.png
+%%GRASS_INST_DIR%%/gui/icons/grass/print.png
+%%GRASS_INST_DIR%%/gui/icons/grass/ps-export.png
+%%GRASS_INST_DIR%%/gui/icons/grass/python-export.png
+%%GRASS_INST_DIR%%/gui/icons/grass/python.png
+%%GRASS_INST_DIR%%/gui/icons/grass/quit.png
+%%GRASS_INST_DIR%%/gui/icons/grass/raster-calculator.png
+%%GRASS_INST_DIR%%/gui/icons/grass/raster-import.png
+%%GRASS_INST_DIR%%/gui/icons/grass/raster-stats.png
+%%GRASS_INST_DIR%%/gui/icons/grass/raster.png
+%%GRASS_INST_DIR%%/gui/icons/grass/raster3d.png
+%%GRASS_INST_DIR%%/gui/icons/grass/rectangle-add.png
+%%GRASS_INST_DIR%%/gui/icons/grass/redo.png
+%%GRASS_INST_DIR%%/gui/icons/grass/redraw.png
+%%GRASS_INST_DIR%%/gui/icons/grass/region.png
+%%GRASS_INST_DIR%%/gui/icons/grass/relation-create.png
+%%GRASS_INST_DIR%%/gui/icons/grass/reload.png
+%%GRASS_INST_DIR%%/gui/icons/grass/rgb.png
+%%GRASS_INST_DIR%%/gui/icons/grass/save.png
+%%GRASS_INST_DIR%%/gui/icons/grass/scalebar-add.png
+%%GRASS_INST_DIR%%/gui/icons/grass/script-load.png
+%%GRASS_INST_DIR%%/gui/icons/grass/script-save.png
+%%GRASS_INST_DIR%%/gui/icons/grass/select.png
+%%GRASS_INST_DIR%%/gui/icons/grass/settings.png
+%%GRASS_INST_DIR%%/gui/icons/grass/shaded-relief.png
+%%GRASS_INST_DIR%%/gui/icons/grass/shortest-distance.png
+%%GRASS_INST_DIR%%/gui/icons/grass/show.png
+%%GRASS_INST_DIR%%/gui/icons/grass/stats.png
+%%GRASS_INST_DIR%%/gui/icons/grass/table-manager.png
+%%GRASS_INST_DIR%%/gui/icons/grass/table.png
+%%GRASS_INST_DIR%%/gui/icons/grass/text-add.png
+%%GRASS_INST_DIR%%/gui/icons/grass/tools.png
+%%GRASS_INST_DIR%%/gui/icons/grass/undo.png
+%%GRASS_INST_DIR%%/gui/icons/grass/unlocked.png
+%%GRASS_INST_DIR%%/gui/icons/grass/vector-chart.png
+%%GRASS_INST_DIR%%/gui/icons/grass/vector-import.png
+%%GRASS_INST_DIR%%/gui/icons/grass/vector-thematic.png
+%%GRASS_INST_DIR%%/gui/icons/grass/vector-tools.png
+%%GRASS_INST_DIR%%/gui/icons/grass/vector.png
+%%GRASS_INST_DIR%%/gui/icons/grass/vertex-create.png
+%%GRASS_INST_DIR%%/gui/icons/grass/vertex-delete.png
+%%GRASS_INST_DIR%%/gui/icons/grass/vertex-move.png
+%%GRASS_INST_DIR%%/gui/icons/grass/wms.png
+%%GRASS_INST_DIR%%/gui/icons/grass/zoom-extent.png
+%%GRASS_INST_DIR%%/gui/icons/grass/zoom-in.png
+%%GRASS_INST_DIR%%/gui/icons/grass/zoom-last.png
+%%GRASS_INST_DIR%%/gui/icons/grass/zoom-layer.png
+%%GRASS_INST_DIR%%/gui/icons/grass/zoom-more.png
+%%GRASS_INST_DIR%%/gui/icons/grass/zoom-out.png
+%%GRASS_INST_DIR%%/gui/icons/grass/zoom-region.png
+%%GRASS_INST_DIR%%/gui/icons/grass_cmd.ico
+%%GRASS_INST_DIR%%/gui/icons/grass_dialog.ico
+%%GRASS_INST_DIR%%/gui/icons/grass_map.ico
+%%GRASS_INST_DIR%%/gui/icons/grass_msys.ico
+%%GRASS_INST_DIR%%/gui/icons/grass_nviz.ico
+%%GRASS_INST_DIR%%/gui/icons/grass_osgeo.ico
+%%GRASS_INST_DIR%%/gui/icons/grass_sql.ico
+%%GRASS_INST_DIR%%/gui/icons/grass_web.ico
+%%GRASS_INST_DIR%%/gui/icons/wingrass.ico
+%%GRASS_INST_DIR%%/gui/images/grass_form.png
+%%GRASS_INST_DIR%%/gui/images/qgis_world.png
+%%GRASS_INST_DIR%%/gui/images/scalebar-fancy.png
+%%GRASS_INST_DIR%%/gui/images/scalebar-simple.png
+%%GRASS_INST_DIR%%/gui/images/small_down_arrow.png
+%%GRASS_INST_DIR%%/gui/images/small_up_arrow.png
+%%GRASS_INST_DIR%%/gui/images/splash_screen.png
+%%GRASS_INST_DIR%%/gui/images/symbols/basic/arrow.png
+%%GRASS_INST_DIR%%/gui/images/symbols/basic/arrow1.png
+%%GRASS_INST_DIR%%/gui/images/symbols/basic/arrow2.png
+%%GRASS_INST_DIR%%/gui/images/symbols/basic/arrow3.png
+%%GRASS_INST_DIR%%/gui/images/symbols/basic/box.png
+%%GRASS_INST_DIR%%/gui/images/symbols/basic/circle.png
+%%GRASS_INST_DIR%%/gui/images/symbols/basic/cross1.png
+%%GRASS_INST_DIR%%/gui/images/symbols/basic/cross2.png
+%%GRASS_INST_DIR%%/gui/images/symbols/basic/cross3.png
+%%GRASS_INST_DIR%%/gui/images/symbols/basic/diamond.png
+%%GRASS_INST_DIR%%/gui/images/symbols/basic/hexagon.png
+%%GRASS_INST_DIR%%/gui/images/symbols/basic/marker.png
+%%GRASS_INST_DIR%%/gui/images/symbols/basic/octagon.png
+%%GRASS_INST_DIR%%/gui/images/symbols/basic/pin.png
+%%GRASS_INST_DIR%%/gui/images/symbols/basic/pin_dot.png
+%%GRASS_INST_DIR%%/gui/images/symbols/basic/point.png
+%%GRASS_INST_DIR%%/gui/images/symbols/basic/pushpin.png
+%%GRASS_INST_DIR%%/gui/images/symbols/basic/star.png
+%%GRASS_INST_DIR%%/gui/images/symbols/basic/triangle.png
+%%GRASS_INST_DIR%%/gui/images/symbols/basic/x.png
+%%GRASS_INST_DIR%%/gui/images/symbols/demo/muchomurka.png
+%%GRASS_INST_DIR%%/gui/images/symbols/demo/smrk.png
+%%GRASS_INST_DIR%%/gui/images/symbols/extra/4pt_star.png
+%%GRASS_INST_DIR%%/gui/images/symbols/extra/adcp.png
+%%GRASS_INST_DIR%%/gui/images/symbols/extra/airport.png
+%%GRASS_INST_DIR%%/gui/images/symbols/extra/alpha_flag.png
+%%GRASS_INST_DIR%%/gui/images/symbols/extra/bridge.png
+%%GRASS_INST_DIR%%/gui/images/symbols/extra/dim_arrow.png
+%%GRASS_INST_DIR%%/gui/images/symbols/extra/dive_flag.png
+%%GRASS_INST_DIR%%/gui/images/symbols/extra/fiducial.png
+%%GRASS_INST_DIR%%/gui/images/symbols/extra/fish.png
+%%GRASS_INST_DIR%%/gui/images/symbols/extra/half-box.png
+%%GRASS_INST_DIR%%/gui/images/symbols/extra/half-circle.png
+%%GRASS_INST_DIR%%/gui/images/symbols/extra/offbox_ne.png
+%%GRASS_INST_DIR%%/gui/images/symbols/extra/offbox_nw.png
+%%GRASS_INST_DIR%%/gui/images/symbols/extra/offbox_se.png
+%%GRASS_INST_DIR%%/gui/images/symbols/extra/offbox_sw.png
+%%GRASS_INST_DIR%%/gui/images/symbols/extra/pentagon.png
+%%GRASS_INST_DIR%%/gui/images/symbols/extra/ping.png
+%%GRASS_INST_DIR%%/gui/images/symbols/extra/ring.png
+%%GRASS_INST_DIR%%/gui/images/symbols/extra/simple_zia.png
+%%GRASS_INST_DIR%%/gui/images/symbols/extra/target.png
+%%GRASS_INST_DIR%%/gui/images/symbols/geology/circle_cross.png
+%%GRASS_INST_DIR%%/gui/images/symbols/geology/half-arrow_left.png
+%%GRASS_INST_DIR%%/gui/images/symbols/geology/half-arrow_right.png
+%%GRASS_INST_DIR%%/gui/images/symbols/geology/strike_box.png
+%%GRASS_INST_DIR%%/gui/images/symbols/geology/strike_circle.png
+%%GRASS_INST_DIR%%/gui/images/symbols/geology/strike_cleavage.png
+%%GRASS_INST_DIR%%/gui/images/symbols/geology/strike_half-bowtie.png
+%%GRASS_INST_DIR%%/gui/images/symbols/geology/strike_line.png
+%%GRASS_INST_DIR%%/gui/images/symbols/geology/strike_parallel.png
+%%GRASS_INST_DIR%%/gui/images/symbols/geology/strike_triangle.png
+%%GRASS_INST_DIR%%/gui/images/symbols/legend/area.png
+%%GRASS_INST_DIR%%/gui/images/symbols/legend/area_curved.png
+%%GRASS_INST_DIR%%/gui/images/symbols/legend/line.png
+%%GRASS_INST_DIR%%/gui/images/symbols/legend/line_crooked.png
+%%GRASS_INST_DIR%%/gui/images/symbols/n_arrows/basic_compass.png
+%%GRASS_INST_DIR%%/gui/images/symbols/n_arrows/fancy_compass.png
+%%GRASS_INST_DIR%%/gui/images/symbols/n_arrows/n_arrow1a.png
+%%GRASS_INST_DIR%%/gui/images/symbols/n_arrows/n_arrow1b.png
+%%GRASS_INST_DIR%%/gui/images/symbols/n_arrows/n_arrow2.png
+%%GRASS_INST_DIR%%/gui/images/symbols/n_arrows/n_arrow3.png
+%%GRASS_INST_DIR%%/gui/images/symbols/n_arrows/n_arrow4.png
+%%GRASS_INST_DIR%%/gui/images/symbols/n_arrows/n_arrow5.png
+%%GRASS_INST_DIR%%/gui/images/symbols/n_arrows/n_arrow6.png
+%%GRASS_INST_DIR%%/gui/images/symbols/n_arrows/n_arrow7a.png
+%%GRASS_INST_DIR%%/gui/images/symbols/n_arrows/n_arrow7b.png
+%%GRASS_INST_DIR%%/gui/images/symbols/n_arrows/n_arrow8a.png
+%%GRASS_INST_DIR%%/gui/images/symbols/n_arrows/n_arrow8b.png
+%%GRASS_INST_DIR%%/gui/images/symbols/n_arrows/n_arrow9.png
+%%GRASS_INST_DIR%%/gui/scripts/d.rast3d
+%%GRASS_INST_DIR%%/gui/scripts/d.wms
+%%GRASS_INST_DIR%%/gui/wxpython/README
+%%GRASS_INST_DIR%%/gui/wxpython/__pycache__/wxgui%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/animation/__init__.py
+%%GRASS_INST_DIR%%/gui/wxpython/animation/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/animation/__pycache__/anim%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/animation/__pycache__/controller%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/animation/__pycache__/data%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/animation/__pycache__/dialogs%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/animation/__pycache__/frame%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/animation/__pycache__/g.gui.animation%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/animation/__pycache__/mapwindow%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/animation/__pycache__/nviztask%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/animation/__pycache__/provider%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/animation/__pycache__/temporal_manager%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/animation/__pycache__/toolbars%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/animation/__pycache__/utils%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/animation/anim.py
+%%GRASS_INST_DIR%%/gui/wxpython/animation/controller.py
+%%GRASS_INST_DIR%%/gui/wxpython/animation/data.py
+%%GRASS_INST_DIR%%/gui/wxpython/animation/dialogs.py
+%%GRASS_INST_DIR%%/gui/wxpython/animation/frame.py
+%%GRASS_INST_DIR%%/gui/wxpython/animation/g.gui.animation.py
+%%GRASS_INST_DIR%%/gui/wxpython/animation/mapwindow.py
+%%GRASS_INST_DIR%%/gui/wxpython/animation/nviztask.py
+%%GRASS_INST_DIR%%/gui/wxpython/animation/provider.py
+%%GRASS_INST_DIR%%/gui/wxpython/animation/temporal_manager.py
+%%GRASS_INST_DIR%%/gui/wxpython/animation/toolbars.py
+%%GRASS_INST_DIR%%/gui/wxpython/animation/utils.py
+%%GRASS_INST_DIR%%/gui/wxpython/core/__init__.py
+%%GRASS_INST_DIR%%/gui/wxpython/core/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/core/__pycache__/debug%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/core/__pycache__/gcmd%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/core/__pycache__/gconsole%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/core/__pycache__/giface%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/core/__pycache__/globalvar%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/core/__pycache__/gthread%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/core/__pycache__/layerlist%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/core/__pycache__/menutree%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/core/__pycache__/render%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/core/__pycache__/settings%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/core/__pycache__/toolboxes%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/core/__pycache__/treemodel%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/core/__pycache__/units%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/core/__pycache__/utils%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/core/__pycache__/workspace%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/core/__pycache__/ws%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/core/debug.py
+%%GRASS_INST_DIR%%/gui/wxpython/core/gcmd.py
+%%GRASS_INST_DIR%%/gui/wxpython/core/gconsole.py
+%%GRASS_INST_DIR%%/gui/wxpython/core/giface.py
+%%GRASS_INST_DIR%%/gui/wxpython/core/globalvar.py
+%%GRASS_INST_DIR%%/gui/wxpython/core/gthread.py
+%%GRASS_INST_DIR%%/gui/wxpython/core/layerlist.py
+%%GRASS_INST_DIR%%/gui/wxpython/core/menutree.py
+%%GRASS_INST_DIR%%/gui/wxpython/core/render.py
+%%GRASS_INST_DIR%%/gui/wxpython/core/settings.py
+%%GRASS_INST_DIR%%/gui/wxpython/core/toolboxes.py
+%%GRASS_INST_DIR%%/gui/wxpython/core/treemodel.py
+%%GRASS_INST_DIR%%/gui/wxpython/core/units.py
+%%GRASS_INST_DIR%%/gui/wxpython/core/utils.py
+%%GRASS_INST_DIR%%/gui/wxpython/core/workspace.py
+%%GRASS_INST_DIR%%/gui/wxpython/core/ws.py
+%%GRASS_INST_DIR%%/gui/wxpython/datacatalog/__init__.py
+%%GRASS_INST_DIR%%/gui/wxpython/datacatalog/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/datacatalog/__pycache__/catalog%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/datacatalog/__pycache__/dialogs%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/datacatalog/__pycache__/frame%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/datacatalog/__pycache__/g.gui.datacatalog%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/datacatalog/__pycache__/infomanager%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/datacatalog/__pycache__/toolbars%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/datacatalog/__pycache__/tree%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/datacatalog/catalog.py
+%%GRASS_INST_DIR%%/gui/wxpython/datacatalog/dialogs.py
+%%GRASS_INST_DIR%%/gui/wxpython/datacatalog/frame.py
+%%GRASS_INST_DIR%%/gui/wxpython/datacatalog/g.gui.datacatalog.py
+%%GRASS_INST_DIR%%/gui/wxpython/datacatalog/infomanager.py
+%%GRASS_INST_DIR%%/gui/wxpython/datacatalog/toolbars.py
+%%GRASS_INST_DIR%%/gui/wxpython/datacatalog/tree.py
+%%GRASS_INST_DIR%%/gui/wxpython/dbmgr/__init__.py
+%%GRASS_INST_DIR%%/gui/wxpython/dbmgr/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/dbmgr/__pycache__/base%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/dbmgr/__pycache__/dialogs%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/dbmgr/__pycache__/g.gui.dbmgr%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/dbmgr/__pycache__/manager%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/dbmgr/__pycache__/sqlbuilder%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/dbmgr/__pycache__/vinfo%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/dbmgr/base.py
+%%GRASS_INST_DIR%%/gui/wxpython/dbmgr/dialogs.py
+%%GRASS_INST_DIR%%/gui/wxpython/dbmgr/g.gui.dbmgr.py
+%%GRASS_INST_DIR%%/gui/wxpython/dbmgr/manager.py
+%%GRASS_INST_DIR%%/gui/wxpython/dbmgr/sqlbuilder.py
+%%GRASS_INST_DIR%%/gui/wxpython/dbmgr/vinfo.py
+%%GRASS_INST_DIR%%/gui/wxpython/gcp/__init__.py
+%%GRASS_INST_DIR%%/gui/wxpython/gcp/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/gcp/__pycache__/g.gui.gcp%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/gcp/__pycache__/manager%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/gcp/__pycache__/mapdisplay%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/gcp/__pycache__/statusbar%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/gcp/__pycache__/toolbars%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/gcp/g.gui.gcp.py
+%%GRASS_INST_DIR%%/gui/wxpython/gcp/manager.py
+%%GRASS_INST_DIR%%/gui/wxpython/gcp/mapdisplay.py
+%%GRASS_INST_DIR%%/gui/wxpython/gcp/statusbar.py
+%%GRASS_INST_DIR%%/gui/wxpython/gcp/toolbars.py
+%%GRASS_INST_DIR%%/gui/wxpython/gmodeler/__init__.py
+%%GRASS_INST_DIR%%/gui/wxpython/gmodeler/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/gmodeler/__pycache__/dialogs%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/gmodeler/__pycache__/frame%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/gmodeler/__pycache__/g.gui.gmodeler%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/gmodeler/__pycache__/giface%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/gmodeler/__pycache__/menudata%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/gmodeler/__pycache__/model%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/gmodeler/__pycache__/preferences%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/gmodeler/__pycache__/toolbars%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/gmodeler/dialogs.py
+%%GRASS_INST_DIR%%/gui/wxpython/gmodeler/frame.py
+%%GRASS_INST_DIR%%/gui/wxpython/gmodeler/g.gui.gmodeler.py
+%%GRASS_INST_DIR%%/gui/wxpython/gmodeler/giface.py
+%%GRASS_INST_DIR%%/gui/wxpython/gmodeler/menudata.py
+%%GRASS_INST_DIR%%/gui/wxpython/gmodeler/model.py
+%%GRASS_INST_DIR%%/gui/wxpython/gmodeler/preferences.py
+%%GRASS_INST_DIR%%/gui/wxpython/gmodeler/toolbars.py
+%%GRASS_INST_DIR%%/gui/wxpython/gui_core/__init__.py
+%%GRASS_INST_DIR%%/gui/wxpython/gui_core/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/gui_core/__pycache__/dialogs%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/gui_core/__pycache__/forms%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/gui_core/__pycache__/ghelp%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/gui_core/__pycache__/goutput%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/gui_core/__pycache__/gselect%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/gui_core/__pycache__/infobar%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/gui_core/__pycache__/mapdisp%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/gui_core/__pycache__/menu%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/gui_core/__pycache__/preferences%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/gui_core/__pycache__/prompt%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/gui_core/__pycache__/pyedit%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/gui_core/__pycache__/pystc%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/gui_core/__pycache__/query%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/gui_core/__pycache__/simplelmgr%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/gui_core/__pycache__/toolbars%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/gui_core/__pycache__/treeview%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/gui_core/__pycache__/vselect%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/gui_core/__pycache__/widgets%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/gui_core/__pycache__/wrap%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/gui_core/dialogs.py
+%%GRASS_INST_DIR%%/gui/wxpython/gui_core/forms.py
+%%GRASS_INST_DIR%%/gui/wxpython/gui_core/ghelp.py
+%%GRASS_INST_DIR%%/gui/wxpython/gui_core/goutput.py
+%%GRASS_INST_DIR%%/gui/wxpython/gui_core/gselect.py
+%%GRASS_INST_DIR%%/gui/wxpython/gui_core/infobar.py
+%%GRASS_INST_DIR%%/gui/wxpython/gui_core/mapdisp.py
+%%GRASS_INST_DIR%%/gui/wxpython/gui_core/menu.py
+%%GRASS_INST_DIR%%/gui/wxpython/gui_core/preferences.py
+%%GRASS_INST_DIR%%/gui/wxpython/gui_core/prompt.py
+%%GRASS_INST_DIR%%/gui/wxpython/gui_core/pyedit.py
+%%GRASS_INST_DIR%%/gui/wxpython/gui_core/pystc.py
+%%GRASS_INST_DIR%%/gui/wxpython/gui_core/query.py
+%%GRASS_INST_DIR%%/gui/wxpython/gui_core/simplelmgr.py
+%%GRASS_INST_DIR%%/gui/wxpython/gui_core/toolbars.py
+%%GRASS_INST_DIR%%/gui/wxpython/gui_core/treeview.py
+%%GRASS_INST_DIR%%/gui/wxpython/gui_core/vselect.py
+%%GRASS_INST_DIR%%/gui/wxpython/gui_core/widgets.py
+%%GRASS_INST_DIR%%/gui/wxpython/gui_core/wrap.py
+%%GRASS_INST_DIR%%/gui/wxpython/iclass/__init__.py
+%%GRASS_INST_DIR%%/gui/wxpython/iclass/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/iclass/__pycache__/dialogs%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/iclass/__pycache__/digit%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/iclass/__pycache__/frame%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/iclass/__pycache__/g.gui.iclass%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/iclass/__pycache__/plots%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/iclass/__pycache__/statistics%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/iclass/__pycache__/toolbars%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/iclass/dialogs.py
+%%GRASS_INST_DIR%%/gui/wxpython/iclass/digit.py
+%%GRASS_INST_DIR%%/gui/wxpython/iclass/frame.py
+%%GRASS_INST_DIR%%/gui/wxpython/iclass/g.gui.iclass.py
+%%GRASS_INST_DIR%%/gui/wxpython/iclass/plots.py
+%%GRASS_INST_DIR%%/gui/wxpython/iclass/statistics.py
+%%GRASS_INST_DIR%%/gui/wxpython/iclass/toolbars.py
+%%GRASS_INST_DIR%%/gui/wxpython/icons/__init__.py
+%%GRASS_INST_DIR%%/gui/wxpython/icons/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/icons/__pycache__/grass_icons%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/icons/__pycache__/icon%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/icons/grass_icons.py
+%%GRASS_INST_DIR%%/gui/wxpython/icons/icon.py
+%%GRASS_INST_DIR%%/gui/wxpython/image2target/__init__.py
+%%GRASS_INST_DIR%%/gui/wxpython/image2target/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/image2target/__pycache__/g.gui.image2target%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/image2target/__pycache__/ii2t_gis_set%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/image2target/__pycache__/ii2t_gis_set_error%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/image2target/__pycache__/ii2t_manager%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/image2target/__pycache__/ii2t_mapdisplay%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/image2target/__pycache__/ii2t_statusbar%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/image2target/__pycache__/ii2t_toolbars%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/image2target/g.gui.image2target.py
+%%GRASS_INST_DIR%%/gui/wxpython/image2target/ii2t_gis_set.py
+%%GRASS_INST_DIR%%/gui/wxpython/image2target/ii2t_gis_set_error.py
+%%GRASS_INST_DIR%%/gui/wxpython/image2target/ii2t_manager.py
+%%GRASS_INST_DIR%%/gui/wxpython/image2target/ii2t_mapdisplay.py
+%%GRASS_INST_DIR%%/gui/wxpython/image2target/ii2t_statusbar.py
+%%GRASS_INST_DIR%%/gui/wxpython/image2target/ii2t_toolbars.py
+%%GRASS_INST_DIR%%/gui/wxpython/iscatt/__init__.py
+%%GRASS_INST_DIR%%/gui/wxpython/iscatt/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/iscatt/__pycache__/controllers%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/iscatt/__pycache__/core_c%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/iscatt/__pycache__/dialogs%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/iscatt/__pycache__/frame%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/iscatt/__pycache__/iscatt_core%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/iscatt/__pycache__/plots%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/iscatt/__pycache__/toolbars%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/iscatt/__pycache__/utils%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/iscatt/controllers.py
+%%GRASS_INST_DIR%%/gui/wxpython/iscatt/core_c.py
+%%GRASS_INST_DIR%%/gui/wxpython/iscatt/dialogs.py
+%%GRASS_INST_DIR%%/gui/wxpython/iscatt/frame.py
+%%GRASS_INST_DIR%%/gui/wxpython/iscatt/iscatt_core.py
+%%GRASS_INST_DIR%%/gui/wxpython/iscatt/plots.py
+%%GRASS_INST_DIR%%/gui/wxpython/iscatt/toolbars.py
+%%GRASS_INST_DIR%%/gui/wxpython/iscatt/utils.py
+%%GRASS_INST_DIR%%/gui/wxpython/lmgr/__init__.py
+%%GRASS_INST_DIR%%/gui/wxpython/lmgr/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/lmgr/__pycache__/frame%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/lmgr/__pycache__/giface%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/lmgr/__pycache__/layertree%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/lmgr/__pycache__/menudata%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/lmgr/__pycache__/pyshell%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/lmgr/__pycache__/statusbar%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/lmgr/__pycache__/toolbars%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/lmgr/__pycache__/workspace%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/lmgr/frame.py
+%%GRASS_INST_DIR%%/gui/wxpython/lmgr/giface.py
+%%GRASS_INST_DIR%%/gui/wxpython/lmgr/layertree.py
+%%GRASS_INST_DIR%%/gui/wxpython/lmgr/menudata.py
+%%GRASS_INST_DIR%%/gui/wxpython/lmgr/pyshell.py
+%%GRASS_INST_DIR%%/gui/wxpython/lmgr/statusbar.py
+%%GRASS_INST_DIR%%/gui/wxpython/lmgr/toolbars.py
+%%GRASS_INST_DIR%%/gui/wxpython/lmgr/workspace.py
+%%GRASS_INST_DIR%%/gui/wxpython/location_wizard/__init__.py
+%%GRASS_INST_DIR%%/gui/wxpython/location_wizard/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/location_wizard/__pycache__/base%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/location_wizard/__pycache__/dialogs%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/location_wizard/__pycache__/wizard%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/location_wizard/base.py
+%%GRASS_INST_DIR%%/gui/wxpython/location_wizard/dialogs.py
+%%GRASS_INST_DIR%%/gui/wxpython/location_wizard/wizard.py
+%%GRASS_INST_DIR%%/gui/wxpython/main_window/__pycache__/frame%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/main_window/frame.py
+%%GRASS_INST_DIR%%/gui/wxpython/mapdisp/__init__.py
+%%GRASS_INST_DIR%%/gui/wxpython/mapdisp/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/mapdisp/__pycache__/frame%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/mapdisp/__pycache__/gprint%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/mapdisp/__pycache__/main%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/mapdisp/__pycache__/properties%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/mapdisp/__pycache__/statusbar%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/mapdisp/__pycache__/test_mapdisp%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/mapdisp/__pycache__/toolbars%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/mapdisp/frame.py
+%%GRASS_INST_DIR%%/gui/wxpython/mapdisp/gprint.py
+%%GRASS_INST_DIR%%/gui/wxpython/mapdisp/main.py
+%%GRASS_INST_DIR%%/gui/wxpython/mapdisp/properties.py
+%%GRASS_INST_DIR%%/gui/wxpython/mapdisp/statusbar.py
+%%GRASS_INST_DIR%%/gui/wxpython/mapdisp/test_mapdisp.py
+%%GRASS_INST_DIR%%/gui/wxpython/mapdisp/toolbars.py
+%%GRASS_INST_DIR%%/gui/wxpython/mapswipe/__init__.py
+%%GRASS_INST_DIR%%/gui/wxpython/mapswipe/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/mapswipe/__pycache__/dialogs%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/mapswipe/__pycache__/frame%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/mapswipe/__pycache__/g.gui.mapswipe%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/mapswipe/__pycache__/mapwindow%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/mapswipe/__pycache__/toolbars%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/mapswipe/dialogs.py
+%%GRASS_INST_DIR%%/gui/wxpython/mapswipe/frame.py
+%%GRASS_INST_DIR%%/gui/wxpython/mapswipe/g.gui.mapswipe.py
+%%GRASS_INST_DIR%%/gui/wxpython/mapswipe/mapwindow.py
+%%GRASS_INST_DIR%%/gui/wxpython/mapswipe/toolbars.py
+%%GRASS_INST_DIR%%/gui/wxpython/mapwin/__init__.py
+%%GRASS_INST_DIR%%/gui/wxpython/mapwin/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/mapwin/__pycache__/analysis%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/mapwin/__pycache__/base%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/mapwin/__pycache__/buffered%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/mapwin/__pycache__/decorations%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/mapwin/__pycache__/graphics%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/mapwin/analysis.py
+%%GRASS_INST_DIR%%/gui/wxpython/mapwin/base.py
+%%GRASS_INST_DIR%%/gui/wxpython/mapwin/buffered.py
+%%GRASS_INST_DIR%%/gui/wxpython/mapwin/decorations.py
+%%GRASS_INST_DIR%%/gui/wxpython/mapwin/graphics.py
+%%GRASS_INST_DIR%%/gui/wxpython/modules/__init__.py
+%%GRASS_INST_DIR%%/gui/wxpython/modules/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/modules/__pycache__/colorrules%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/modules/__pycache__/extensions%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/modules/__pycache__/histogram%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/modules/__pycache__/import_export%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/modules/__pycache__/mapsets_picker%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/modules/__pycache__/mcalc_builder%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/modules/colorrules.py
+%%GRASS_INST_DIR%%/gui/wxpython/modules/extensions.py
+%%GRASS_INST_DIR%%/gui/wxpython/modules/histogram.py
+%%GRASS_INST_DIR%%/gui/wxpython/modules/import_export.py
+%%GRASS_INST_DIR%%/gui/wxpython/modules/mapsets_picker.py
+%%GRASS_INST_DIR%%/gui/wxpython/modules/mcalc_builder.py
+%%GRASS_INST_DIR%%/gui/wxpython/nviz/__init__.py
+%%GRASS_INST_DIR%%/gui/wxpython/nviz/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/nviz/__pycache__/animation%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/nviz/__pycache__/main%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/nviz/__pycache__/mapwindow%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/nviz/__pycache__/preferences%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/nviz/__pycache__/tools%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/nviz/__pycache__/workspace%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/nviz/__pycache__/wxnviz%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/nviz/animation.py
+%%GRASS_INST_DIR%%/gui/wxpython/nviz/main.py
+%%GRASS_INST_DIR%%/gui/wxpython/nviz/mapwindow.py
+%%GRASS_INST_DIR%%/gui/wxpython/nviz/preferences.py
+%%GRASS_INST_DIR%%/gui/wxpython/nviz/tools.py
+%%GRASS_INST_DIR%%/gui/wxpython/nviz/workspace.py
+%%GRASS_INST_DIR%%/gui/wxpython/nviz/wxnviz.py
+%%GRASS_INST_DIR%%/gui/wxpython/photo2image/__init__.py
+%%GRASS_INST_DIR%%/gui/wxpython/photo2image/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/photo2image/__pycache__/g.gui.photo2image%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/photo2image/__pycache__/ip2i_manager%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/photo2image/__pycache__/ip2i_mapdisplay%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/photo2image/__pycache__/ip2i_statusbar%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/photo2image/__pycache__/ip2i_toolbars%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/photo2image/g.gui.photo2image.py
+%%GRASS_INST_DIR%%/gui/wxpython/photo2image/ip2i_manager.py
+%%GRASS_INST_DIR%%/gui/wxpython/photo2image/ip2i_mapdisplay.py
+%%GRASS_INST_DIR%%/gui/wxpython/photo2image/ip2i_statusbar.py
+%%GRASS_INST_DIR%%/gui/wxpython/photo2image/ip2i_toolbars.py
+%%GRASS_INST_DIR%%/gui/wxpython/psmap/__init__.py
+%%GRASS_INST_DIR%%/gui/wxpython/psmap/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/psmap/__pycache__/dialogs%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/psmap/__pycache__/frame%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/psmap/__pycache__/g.gui.psmap%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/psmap/__pycache__/instructions%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/psmap/__pycache__/menudata%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/psmap/__pycache__/toolbars%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/psmap/__pycache__/utils%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/psmap/dialogs.py
+%%GRASS_INST_DIR%%/gui/wxpython/psmap/frame.py
+%%GRASS_INST_DIR%%/gui/wxpython/psmap/g.gui.psmap.py
+%%GRASS_INST_DIR%%/gui/wxpython/psmap/instructions.py
+%%GRASS_INST_DIR%%/gui/wxpython/psmap/menudata.py
+%%GRASS_INST_DIR%%/gui/wxpython/psmap/toolbars.py
+%%GRASS_INST_DIR%%/gui/wxpython/psmap/utils.py
+%%GRASS_INST_DIR%%/gui/wxpython/rdigit/__init__.py
+%%GRASS_INST_DIR%%/gui/wxpython/rdigit/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/rdigit/__pycache__/controller%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/rdigit/__pycache__/dialogs%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/rdigit/__pycache__/g.gui.rdigit%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/rdigit/__pycache__/toolbars%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/rdigit/controller.py
+%%GRASS_INST_DIR%%/gui/wxpython/rdigit/dialogs.py
+%%GRASS_INST_DIR%%/gui/wxpython/rdigit/g.gui.rdigit.py
+%%GRASS_INST_DIR%%/gui/wxpython/rdigit/toolbars.py
+%%GRASS_INST_DIR%%/gui/wxpython/rlisetup/__init__.py
+%%GRASS_INST_DIR%%/gui/wxpython/rlisetup/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/rlisetup/__pycache__/frame%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/rlisetup/__pycache__/functions%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/rlisetup/__pycache__/g.gui.rlisetup%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/rlisetup/__pycache__/sampling_frame%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/rlisetup/__pycache__/wizard%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/rlisetup/frame.py
+%%GRASS_INST_DIR%%/gui/wxpython/rlisetup/functions.py
+%%GRASS_INST_DIR%%/gui/wxpython/rlisetup/g.gui.rlisetup.py
+%%GRASS_INST_DIR%%/gui/wxpython/rlisetup/sampling_frame.py
+%%GRASS_INST_DIR%%/gui/wxpython/rlisetup/wizard.py
+%%GRASS_INST_DIR%%/gui/wxpython/startup/__init__.py
+%%GRASS_INST_DIR%%/gui/wxpython/startup/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/startup/__pycache__/guiutils%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/startup/__pycache__/locdownload%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/startup/guiutils.py
+%%GRASS_INST_DIR%%/gui/wxpython/startup/locdownload.py
+%%GRASS_INST_DIR%%/gui/wxpython/timeline/__init__.py
+%%GRASS_INST_DIR%%/gui/wxpython/timeline/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/timeline/__pycache__/frame%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/timeline/__pycache__/g.gui.timeline%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/timeline/frame.py
+%%GRASS_INST_DIR%%/gui/wxpython/timeline/g.gui.timeline.py
+%%GRASS_INST_DIR%%/gui/wxpython/tplot/__init__.py
+%%GRASS_INST_DIR%%/gui/wxpython/tplot/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/tplot/__pycache__/frame%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/tplot/__pycache__/g.gui.tplot%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/tplot/frame.py
+%%GRASS_INST_DIR%%/gui/wxpython/tplot/g.gui.tplot.py
+%%GRASS_INST_DIR%%/gui/wxpython/vdigit/__init__.py
+%%GRASS_INST_DIR%%/gui/wxpython/vdigit/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/vdigit/__pycache__/dialogs%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/vdigit/__pycache__/g.gui.vdigit%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/vdigit/__pycache__/main%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/vdigit/__pycache__/mapwindow%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/vdigit/__pycache__/preferences%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/vdigit/__pycache__/toolbars%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/vdigit/__pycache__/wxdigit%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/vdigit/__pycache__/wxdisplay%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/vdigit/dialogs.py
+%%GRASS_INST_DIR%%/gui/wxpython/vdigit/g.gui.vdigit.py
+%%GRASS_INST_DIR%%/gui/wxpython/vdigit/main.py
+%%GRASS_INST_DIR%%/gui/wxpython/vdigit/mapwindow.py
+%%GRASS_INST_DIR%%/gui/wxpython/vdigit/preferences.py
+%%GRASS_INST_DIR%%/gui/wxpython/vdigit/toolbars.py
+%%GRASS_INST_DIR%%/gui/wxpython/vdigit/wxdigit.py
+%%GRASS_INST_DIR%%/gui/wxpython/vdigit/wxdisplay.py
+%%GRASS_INST_DIR%%/gui/wxpython/vnet/__init__.py
+%%GRASS_INST_DIR%%/gui/wxpython/vnet/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/vnet/__pycache__/dialogs%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/vnet/__pycache__/toolbars%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/vnet/__pycache__/vnet_core%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/vnet/__pycache__/vnet_data%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/vnet/__pycache__/vnet_utils%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/vnet/__pycache__/widgets%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/vnet/dialogs.py
+%%GRASS_INST_DIR%%/gui/wxpython/vnet/toolbars.py
+%%GRASS_INST_DIR%%/gui/wxpython/vnet/vnet_core.py
+%%GRASS_INST_DIR%%/gui/wxpython/vnet/vnet_data.py
+%%GRASS_INST_DIR%%/gui/wxpython/vnet/vnet_utils.py
+%%GRASS_INST_DIR%%/gui/wxpython/vnet/widgets.py
+%%GRASS_INST_DIR%%/gui/wxpython/web_services/__init__.py
+%%GRASS_INST_DIR%%/gui/wxpython/web_services/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/web_services/__pycache__/cap_interface%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/web_services/__pycache__/dialogs%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/web_services/__pycache__/widgets%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/web_services/cap_interface.py
+%%GRASS_INST_DIR%%/gui/wxpython/web_services/dialogs.py
+%%GRASS_INST_DIR%%/gui/wxpython/web_services/widgets.py
+%%GRASS_INST_DIR%%/gui/wxpython/wxgui.py
+%%GRASS_INST_DIR%%/gui/wxpython/wxplot/__init__.py
+%%GRASS_INST_DIR%%/gui/wxpython/wxplot/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/wxplot/__pycache__/base%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/wxplot/__pycache__/dialogs%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/wxplot/__pycache__/histogram%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/wxplot/__pycache__/profile%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/wxplot/__pycache__/scatter%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/gui/wxpython/wxplot/base.py
+%%GRASS_INST_DIR%%/gui/wxpython/wxplot/dialogs.py
+%%GRASS_INST_DIR%%/gui/wxpython/wxplot/histogram.py
+%%GRASS_INST_DIR%%/gui/wxpython/wxplot/profile.py
+%%GRASS_INST_DIR%%/gui/wxpython/wxplot/scatter.py
+%%GRASS_INST_DIR%%/gui/wxpython/xml/grass-gxm.dtd
+%%GRASS_INST_DIR%%/gui/wxpython/xml/grass-gxw.dtd
+%%GRASS_INST_DIR%%/gui/wxpython/xml/main_menu.dtd
+%%GRASS_INST_DIR%%/gui/wxpython/xml/main_menu.xml
+%%GRASS_INST_DIR%%/gui/wxpython/xml/menudata.README
+%%GRASS_INST_DIR%%/gui/wxpython/xml/menudata.dtd
+%%GRASS_INST_DIR%%/gui/wxpython/xml/menudata.xml
+%%GRASS_INST_DIR%%/gui/wxpython/xml/menudata_modeler.xml
+%%GRASS_INST_DIR%%/gui/wxpython/xml/menudata_psmap.xml
+%%GRASS_INST_DIR%%/gui/wxpython/xml/menudata_pyedit.xml
+%%GRASS_INST_DIR%%/gui/wxpython/xml/module_items.dtd
+%%GRASS_INST_DIR%%/gui/wxpython/xml/module_items.xml
+%%GRASS_INST_DIR%%/gui/wxpython/xml/module_tree.xml
+%%GRASS_INST_DIR%%/gui/wxpython/xml/module_tree_menudata.xml
+%%GRASS_INST_DIR%%/gui/wxpython/xml/toolboxes.dtd
+%%GRASS_INST_DIR%%/gui/wxpython/xml/toolboxes.xml
+%%GRASS_INST_DIR%%/gui/wxpython/xml/wxgui_items.dtd
+%%GRASS_INST_DIR%%/gui/wxpython/xml/wxgui_items.xml
+%%GRASS_INST_DIR%%/gui/xml/grass-interface.dtd
+%%GRASS_INST_DIR%%/include/Make/Compile.make
+%%GRASS_INST_DIR%%/include/Make/DB.make
+%%GRASS_INST_DIR%%/include/Make/Dir.make
+%%GRASS_INST_DIR%%/include/Make/Docs.make
+%%GRASS_INST_DIR%%/include/Make/Doxygen.make
+%%GRASS_INST_DIR%%/include/Make/Etc.make
+%%GRASS_INST_DIR%%/include/Make/Grass.make
+%%GRASS_INST_DIR%%/include/Make/GuiScript.make
+%%GRASS_INST_DIR%%/include/Make/Html.make
+%%GRASS_INST_DIR%%/include/Make/HtmlRules.make
+%%GRASS_INST_DIR%%/include/Make/Install.make
+%%GRASS_INST_DIR%%/include/Make/Lib.make
+%%GRASS_INST_DIR%%/include/Make/Module.make
+%%GRASS_INST_DIR%%/include/Make/Multi.make
+%%GRASS_INST_DIR%%/include/Make/NoHtml.make
+%%GRASS_INST_DIR%%/include/Make/Other.make
+%%GRASS_INST_DIR%%/include/Make/Platform.make
+%%GRASS_INST_DIR%%/include/Make/Python.make
+%%GRASS_INST_DIR%%/include/Make/Rules.make
+%%GRASS_INST_DIR%%/include/Make/Script.make
+%%GRASS_INST_DIR%%/include/Make/ScriptRules.make
+%%GRASS_INST_DIR%%/include/Make/ShScript.make
+%%GRASS_INST_DIR%%/include/Make/ShScriptRules.make
+%%GRASS_INST_DIR%%/include/Make/Shlib.make
+%%GRASS_INST_DIR%%/include/Make/Sphinx.make
+%%GRASS_INST_DIR%%/include/Make/Stlib.make
+%%GRASS_INST_DIR%%/include/Make/Vars.make
+%%GRASS_INST_DIR%%/include/grass/N_gwflow.h
+%%GRASS_INST_DIR%%/include/grass/N_heatflow.h
+%%GRASS_INST_DIR%%/include/grass/N_pde.h
+%%GRASS_INST_DIR%%/include/grass/N_solute_transport.h
+%%GRASS_INST_DIR%%/include/grass/arraystats.h
+%%GRASS_INST_DIR%%/include/grass/bitmap.h
+%%GRASS_INST_DIR%%/include/grass/blas.h
+%%GRASS_INST_DIR%%/include/grass/btree.h
+%%GRASS_INST_DIR%%/include/grass/calc.h
+%%GRASS_INST_DIR%%/include/grass/ccmath_grass.h
+%%GRASS_INST_DIR%%/include/grass/cdhc.h
+%%GRASS_INST_DIR%%/include/grass/citing.h
+%%GRASS_INST_DIR%%/include/grass/cluster.h
+%%GRASS_INST_DIR%%/include/grass/colors.h
+%%GRASS_INST_DIR%%/include/grass/config.h
+%%GRASS_INST_DIR%%/include/grass/confparms.h
+%%GRASS_INST_DIR%%/include/grass/copying.h
+%%GRASS_INST_DIR%%/include/grass/dataquad.h
+%%GRASS_INST_DIR%%/include/grass/datetime.h
+%%GRASS_INST_DIR%%/include/grass/dbmi.h
+%%GRASS_INST_DIR%%/include/grass/dbstubs.h
+%%GRASS_INST_DIR%%/include/grass/defs/Paintlib.h
+%%GRASS_INST_DIR%%/include/grass/defs/arraystats.h
+%%GRASS_INST_DIR%%/include/grass/defs/bitmap.h
+%%GRASS_INST_DIR%%/include/grass/defs/btree.h
+%%GRASS_INST_DIR%%/include/grass/defs/calc.h
+%%GRASS_INST_DIR%%/include/grass/defs/cdhc.h
+%%GRASS_INST_DIR%%/include/grass/defs/cluster.h
+%%GRASS_INST_DIR%%/include/grass/defs/colors.h
+%%GRASS_INST_DIR%%/include/grass/defs/datetime.h
+%%GRASS_INST_DIR%%/include/grass/defs/dbmi.h
+%%GRASS_INST_DIR%%/include/grass/defs/devlib.h
+%%GRASS_INST_DIR%%/include/grass/defs/dig_atts.h
+%%GRASS_INST_DIR%%/include/grass/defs/display.h
+%%GRASS_INST_DIR%%/include/grass/defs/form.h
+%%GRASS_INST_DIR%%/include/grass/defs/gis.h
+%%GRASS_INST_DIR%%/include/grass/defs/glocale.h
+%%GRASS_INST_DIR%%/include/grass/defs/gmath.h
+%%GRASS_INST_DIR%%/include/grass/defs/gprojects.h
+%%GRASS_INST_DIR%%/include/grass/defs/imagery.h
+%%GRASS_INST_DIR%%/include/grass/defs/la.h
+%%GRASS_INST_DIR%%/include/grass/defs/linkm.h
+%%GRASS_INST_DIR%%/include/grass/defs/manage.h
+%%GRASS_INST_DIR%%/include/grass/defs/neta.h
+%%GRASS_INST_DIR%%/include/grass/defs/nviz.h
+%%GRASS_INST_DIR%%/include/grass/defs/ogsf.h
+%%GRASS_INST_DIR%%/include/grass/defs/ortholib.h
+%%GRASS_INST_DIR%%/include/grass/defs/raster.h
+%%GRASS_INST_DIR%%/include/grass/defs/raster3d.h
+%%GRASS_INST_DIR%%/include/grass/defs/rbtree.h
+%%GRASS_INST_DIR%%/include/grass/defs/rowio.h
+%%GRASS_INST_DIR%%/include/grass/defs/segment.h
+%%GRASS_INST_DIR%%/include/grass/defs/spawn.h
+%%GRASS_INST_DIR%%/include/grass/defs/sqlp.h
+%%GRASS_INST_DIR%%/include/grass/defs/stats.h
+%%GRASS_INST_DIR%%/include/grass/defs/symbol.h
+%%GRASS_INST_DIR%%/include/grass/defs/vector.h
+%%GRASS_INST_DIR%%/include/grass/defs/vedit.h
+%%GRASS_INST_DIR%%/include/grass/dgl.h
+%%GRASS_INST_DIR%%/include/grass/dgl/avl.h
+%%GRASS_INST_DIR%%/include/grass/dgl/graph.h
+%%GRASS_INST_DIR%%/include/grass/dgl/graph_v1.h
+%%GRASS_INST_DIR%%/include/grass/dgl/graph_v2.h
+%%GRASS_INST_DIR%%/include/grass/dgl/heap.h
+%%GRASS_INST_DIR%%/include/grass/dgl/helpers.h
+%%GRASS_INST_DIR%%/include/grass/dgl/tavl.h
+%%GRASS_INST_DIR%%/include/grass/dgl/tree.h
+%%GRASS_INST_DIR%%/include/grass/dgl/type.h
+%%GRASS_INST_DIR%%/include/grass/display.h
+%%GRASS_INST_DIR%%/include/grass/fontcap.h
+%%GRASS_INST_DIR%%/include/grass/form.h
+%%GRASS_INST_DIR%%/include/grass/gis.h
+%%GRASS_INST_DIR%%/include/grass/glocale.h
+%%GRASS_INST_DIR%%/include/grass/gmath.h
+%%GRASS_INST_DIR%%/include/grass/gprojects.h
+%%GRASS_INST_DIR%%/include/grass/imagery.h
+%%GRASS_INST_DIR%%/include/grass/interpf.h
+%%GRASS_INST_DIR%%/include/grass/iostream/ami.h
+%%GRASS_INST_DIR%%/include/grass/iostream/ami_config.h
+%%GRASS_INST_DIR%%/include/grass/iostream/ami_sort.h
+%%GRASS_INST_DIR%%/include/grass/iostream/ami_sort_impl.h
+%%GRASS_INST_DIR%%/include/grass/iostream/ami_stream.h
+%%GRASS_INST_DIR%%/include/grass/iostream/embuffer.h
+%%GRASS_INST_DIR%%/include/grass/iostream/empq.h
+%%GRASS_INST_DIR%%/include/grass/iostream/empq_adaptive.h
+%%GRASS_INST_DIR%%/include/grass/iostream/empq_adaptive_impl.h
+%%GRASS_INST_DIR%%/include/grass/iostream/empq_impl.h
+%%GRASS_INST_DIR%%/include/grass/iostream/imbuffer.h
+%%GRASS_INST_DIR%%/include/grass/iostream/mem_stream.h
+%%GRASS_INST_DIR%%/include/grass/iostream/minmaxheap.h
+%%GRASS_INST_DIR%%/include/grass/iostream/mm.h
+%%GRASS_INST_DIR%%/include/grass/iostream/mm_utils.h
+%%GRASS_INST_DIR%%/include/grass/iostream/pqheap.h
+%%GRASS_INST_DIR%%/include/grass/iostream/queue.h
+%%GRASS_INST_DIR%%/include/grass/iostream/quicksort.h
+%%GRASS_INST_DIR%%/include/grass/iostream/replacementHeap.h
+%%GRASS_INST_DIR%%/include/grass/iostream/replacementHeapBlock.h
+%%GRASS_INST_DIR%%/include/grass/iostream/rtimer.h
+%%GRASS_INST_DIR%%/include/grass/kdtree.h
+%%GRASS_INST_DIR%%/include/grass/la.h
+%%GRASS_INST_DIR%%/include/grass/lapack.h
+%%GRASS_INST_DIR%%/include/grass/lidar.h
+%%GRASS_INST_DIR%%/include/grass/linkm.h
+%%GRASS_INST_DIR%%/include/grass/lrs.h
+%%GRASS_INST_DIR%%/include/grass/manage.h
+%%GRASS_INST_DIR%%/include/grass/neta.h
+%%GRASS_INST_DIR%%/include/grass/nviz.h
+%%GRASS_INST_DIR%%/include/grass/ogsf.h
+%%GRASS_INST_DIR%%/include/grass/ortholib.h
+%%GRASS_INST_DIR%%/include/grass/qtree.h
+%%GRASS_INST_DIR%%/include/grass/raster.h
+%%GRASS_INST_DIR%%/include/grass/raster3d.h
+%%GRASS_INST_DIR%%/include/grass/rbtree.h
+%%GRASS_INST_DIR%%/include/grass/rowio.h
+%%GRASS_INST_DIR%%/include/grass/rtree.h
+%%GRASS_INST_DIR%%/include/grass/segment.h
+%%GRASS_INST_DIR%%/include/grass/shapefil.h
+%%GRASS_INST_DIR%%/include/grass/simlib.h
+%%GRASS_INST_DIR%%/include/grass/spawn.h
+%%GRASS_INST_DIR%%/include/grass/sqlp.h
+%%GRASS_INST_DIR%%/include/grass/stats.h
+%%GRASS_INST_DIR%%/include/grass/symbol.h
+%%GRASS_INST_DIR%%/include/grass/temporal.h
+%%GRASS_INST_DIR%%/include/grass/vect/dig_defines.h
+%%GRASS_INST_DIR%%/include/grass/vect/dig_externs.h
+%%GRASS_INST_DIR%%/include/grass/vect/dig_macros.h
+%%GRASS_INST_DIR%%/include/grass/vect/dig_structs.h
+%%GRASS_INST_DIR%%/include/grass/vect/digit.h
+%%GRASS_INST_DIR%%/include/grass/vector.h
+%%GRASS_INST_DIR%%/include/grass/vedit.h
+%%GRASS_INST_DIR%%/include/grass/version.h
+%%GRASS_INST_DIR%%/include/grass/waterglobs.h
+%%GRASS_INST_DIR%%/lib/libgrass_arraystats.%%VERS%%.so
+%%GRASS_INST_DIR%%/lib/libgrass_arraystats.so
+%%GRASS_INST_DIR%%/lib/libgrass_bitmap.%%VERS%%.so
+%%GRASS_INST_DIR%%/lib/libgrass_bitmap.so
+%%GRASS_INST_DIR%%/lib/libgrass_btree.%%VERS%%.so
+%%GRASS_INST_DIR%%/lib/libgrass_btree.so
+%%GRASS_INST_DIR%%/lib/libgrass_btree2.%%VERS%%.so
+%%GRASS_INST_DIR%%/lib/libgrass_btree2.so
+%%GRASS_INST_DIR%%/lib/libgrass_cairodriver.%%VERS%%.so
+%%GRASS_INST_DIR%%/lib/libgrass_cairodriver.so
+%%GRASS_INST_DIR%%/lib/libgrass_calc.%%VERS%%.so
+%%GRASS_INST_DIR%%/lib/libgrass_calc.so
+%%GRASS_INST_DIR%%/lib/libgrass_ccmath.%%VERS%%.so
+%%GRASS_INST_DIR%%/lib/libgrass_ccmath.so
+%%GRASS_INST_DIR%%/lib/libgrass_cdhc.%%VERS%%.so
+%%GRASS_INST_DIR%%/lib/libgrass_cdhc.so
+%%GRASS_INST_DIR%%/lib/libgrass_cluster.%%VERS%%.so
+%%GRASS_INST_DIR%%/lib/libgrass_cluster.so
+%%GRASS_INST_DIR%%/lib/libgrass_datetime.%%VERS%%.so
+%%GRASS_INST_DIR%%/lib/libgrass_datetime.so
+%%GRASS_INST_DIR%%/lib/libgrass_dbmibase.%%VERS%%.so
+%%GRASS_INST_DIR%%/lib/libgrass_dbmibase.so
+%%GRASS_INST_DIR%%/lib/libgrass_dbmiclient.%%VERS%%.so
+%%GRASS_INST_DIR%%/lib/libgrass_dbmiclient.so
+%%GRASS_INST_DIR%%/lib/libgrass_dbmidriver.%%VERS%%.so
+%%GRASS_INST_DIR%%/lib/libgrass_dbmidriver.so
+%%GRASS_INST_DIR%%/lib/libgrass_dbstubs.%%VERS%%.so
+%%GRASS_INST_DIR%%/lib/libgrass_dbstubs.so
+%%GRASS_INST_DIR%%/lib/libgrass_dgl.%%VERS%%.so
+%%GRASS_INST_DIR%%/lib/libgrass_dgl.so
+%%GRASS_INST_DIR%%/lib/libgrass_dig2.%%VERS%%.so
+%%GRASS_INST_DIR%%/lib/libgrass_dig2.so
+%%GRASS_INST_DIR%%/lib/libgrass_display.%%VERS%%.so
+%%GRASS_INST_DIR%%/lib/libgrass_display.so
+%%GRASS_INST_DIR%%/lib/libgrass_driver.%%VERS%%.so
+%%GRASS_INST_DIR%%/lib/libgrass_driver.so
+%%GRASS_INST_DIR%%/lib/libgrass_dspf.%%VERS%%.so
+%%GRASS_INST_DIR%%/lib/libgrass_dspf.so
+%%GRASS_INST_DIR%%/lib/libgrass_g3d.%%VERS%%.so
+%%GRASS_INST_DIR%%/lib/libgrass_g3d.so
+%%GRASS_INST_DIR%%/lib/libgrass_gis.%%VERS%%.so
+%%GRASS_INST_DIR%%/lib/libgrass_gis.so
+%%GRASS_INST_DIR%%/lib/libgrass_gmath.%%VERS%%.so
+%%GRASS_INST_DIR%%/lib/libgrass_gmath.so
+%%GRASS_INST_DIR%%/lib/libgrass_gpde.%%VERS%%.so
+%%GRASS_INST_DIR%%/lib/libgrass_gpde.so
+%%GRASS_INST_DIR%%/lib/libgrass_gproj.%%VERS%%.so
+%%GRASS_INST_DIR%%/lib/libgrass_gproj.so
+%%GRASS_INST_DIR%%/lib/libgrass_htmldriver.%%VERS%%.so
+%%GRASS_INST_DIR%%/lib/libgrass_htmldriver.so
+%%GRASS_INST_DIR%%/lib/libgrass_imagery.%%VERS%%.so
+%%GRASS_INST_DIR%%/lib/libgrass_imagery.so
+%%GRASS_INST_DIR%%/lib/libgrass_interpdata.%%VERS%%.so
+%%GRASS_INST_DIR%%/lib/libgrass_interpdata.so
+%%GRASS_INST_DIR%%/lib/libgrass_interpfl.%%VERS%%.so
+%%GRASS_INST_DIR%%/lib/libgrass_interpfl.so
+%%GRASS_INST_DIR%%/lib/libgrass_iortho.%%VERS%%.so
+%%GRASS_INST_DIR%%/lib/libgrass_iortho.so
+%%GRASS_INST_DIR%%/lib/libgrass_iostream.%%VERS%%.so
+%%GRASS_INST_DIR%%/lib/libgrass_iostream.so
+%%GRASS_INST_DIR%%/lib/libgrass_lidar.%%VERS%%.so
+%%GRASS_INST_DIR%%/lib/libgrass_lidar.so
+%%GRASS_INST_DIR%%/lib/libgrass_linkm.%%VERS%%.so
+%%GRASS_INST_DIR%%/lib/libgrass_linkm.so
+%%GRASS_INST_DIR%%/lib/libgrass_lrs.%%VERS%%.so
+%%GRASS_INST_DIR%%/lib/libgrass_lrs.so
+%%GRASS_INST_DIR%%/lib/libgrass_manage.%%VERS%%.so
+%%GRASS_INST_DIR%%/lib/libgrass_manage.so
+%%GRASS_INST_DIR%%/lib/libgrass_neta.%%VERS%%.so
+%%GRASS_INST_DIR%%/lib/libgrass_neta.so
+%%GRASS_INST_DIR%%/lib/libgrass_nviz.%%VERS%%.so
+%%GRASS_INST_DIR%%/lib/libgrass_nviz.so
+%%GRASS_INST_DIR%%/lib/libgrass_ogsf.%%VERS%%.so
+%%GRASS_INST_DIR%%/lib/libgrass_ogsf.so
+%%GRASS_INST_DIR%%/lib/libgrass_pngdriver.%%VERS%%.so
+%%GRASS_INST_DIR%%/lib/libgrass_pngdriver.so
+%%GRASS_INST_DIR%%/lib/libgrass_psdriver.%%VERS%%.so
+%%GRASS_INST_DIR%%/lib/libgrass_psdriver.so
+%%GRASS_INST_DIR%%/lib/libgrass_qtree.%%VERS%%.so
+%%GRASS_INST_DIR%%/lib/libgrass_qtree.so
+%%GRASS_INST_DIR%%/lib/libgrass_raster.%%VERS%%.so
+%%GRASS_INST_DIR%%/lib/libgrass_raster.so
+%%GRASS_INST_DIR%%/lib/libgrass_rli.%%VERS%%.so
+%%GRASS_INST_DIR%%/lib/libgrass_rli.so
+%%GRASS_INST_DIR%%/lib/libgrass_rowio.%%VERS%%.so
+%%GRASS_INST_DIR%%/lib/libgrass_rowio.so
+%%GRASS_INST_DIR%%/lib/libgrass_rtree.%%VERS%%.so
+%%GRASS_INST_DIR%%/lib/libgrass_rtree.so
+%%GRASS_INST_DIR%%/lib/libgrass_segment.%%VERS%%.so
+%%GRASS_INST_DIR%%/lib/libgrass_segment.so
+%%GRASS_INST_DIR%%/lib/libgrass_shape.%%VERS%%.so
+%%GRASS_INST_DIR%%/lib/libgrass_shape.so
+%%GRASS_INST_DIR%%/lib/libgrass_sim.%%VERS%%.so
+%%GRASS_INST_DIR%%/lib/libgrass_sim.so
+%%GRASS_INST_DIR%%/lib/libgrass_sqlp.%%VERS%%.so
+%%GRASS_INST_DIR%%/lib/libgrass_sqlp.so
+%%GRASS_INST_DIR%%/lib/libgrass_stats.%%VERS%%.so
+%%GRASS_INST_DIR%%/lib/libgrass_stats.so
+%%GRASS_INST_DIR%%/lib/libgrass_symb.%%VERS%%.so
+%%GRASS_INST_DIR%%/lib/libgrass_symb.so
+%%GRASS_INST_DIR%%/lib/libgrass_temporal.%%VERS%%.so
+%%GRASS_INST_DIR%%/lib/libgrass_temporal.so
+%%GRASS_INST_DIR%%/lib/libgrass_vector.%%VERS%%.so
+%%GRASS_INST_DIR%%/lib/libgrass_vector.so
+%%GRASS_INST_DIR%%/lib/libgrass_vedit.%%VERS%%.so
+%%GRASS_INST_DIR%%/lib/libgrass_vedit.so
+%%GRASS_INST_DIR%%/locale/ar/LC_MESSAGES/grasslibs.mo
+%%GRASS_INST_DIR%%/locale/ar/LC_MESSAGES/grassmods.mo
+%%GRASS_INST_DIR%%/locale/ar/LC_MESSAGES/grasswxpy.mo
+%%GRASS_INST_DIR%%/locale/bn/LC_MESSAGES/grasslibs.mo
+%%GRASS_INST_DIR%%/locale/bn/LC_MESSAGES/grassmods.mo
+%%GRASS_INST_DIR%%/locale/bn/LC_MESSAGES/grasswxpy.mo
+%%GRASS_INST_DIR%%/locale/cs/LC_MESSAGES/grasslibs.mo
+%%GRASS_INST_DIR%%/locale/cs/LC_MESSAGES/grassmods.mo
+%%GRASS_INST_DIR%%/locale/cs/LC_MESSAGES/grasswxpy.mo
+%%GRASS_INST_DIR%%/locale/de/LC_MESSAGES/grasslibs.mo
+%%GRASS_INST_DIR%%/locale/de/LC_MESSAGES/grassmods.mo
+%%GRASS_INST_DIR%%/locale/de/LC_MESSAGES/grasswxpy.mo
+%%GRASS_INST_DIR%%/locale/el/LC_MESSAGES/grasslibs.mo
+%%GRASS_INST_DIR%%/locale/el/LC_MESSAGES/grassmods.mo
+%%GRASS_INST_DIR%%/locale/el/LC_MESSAGES/grasswxpy.mo
+%%GRASS_INST_DIR%%/locale/es/LC_MESSAGES/grasslibs.mo
+%%GRASS_INST_DIR%%/locale/es/LC_MESSAGES/grassmods.mo
+%%GRASS_INST_DIR%%/locale/es/LC_MESSAGES/grasswxpy.mo
+%%GRASS_INST_DIR%%/locale/fi/LC_MESSAGES/grasslibs.mo
+%%GRASS_INST_DIR%%/locale/fi/LC_MESSAGES/grassmods.mo
+%%GRASS_INST_DIR%%/locale/fi/LC_MESSAGES/grasswxpy.mo
+%%GRASS_INST_DIR%%/locale/fr/LC_MESSAGES/grasslibs.mo
+%%GRASS_INST_DIR%%/locale/fr/LC_MESSAGES/grassmods.mo
+%%GRASS_INST_DIR%%/locale/fr/LC_MESSAGES/grasswxpy.mo
+%%GRASS_INST_DIR%%/locale/hu/LC_MESSAGES/grasslibs.mo
+%%GRASS_INST_DIR%%/locale/hu/LC_MESSAGES/grassmods.mo
+%%GRASS_INST_DIR%%/locale/hu/LC_MESSAGES/grasswxpy.mo
+%%GRASS_INST_DIR%%/locale/id_ID/LC_MESSAGES/grasslibs.mo
+%%GRASS_INST_DIR%%/locale/id_ID/LC_MESSAGES/grassmods.mo
+%%GRASS_INST_DIR%%/locale/id_ID/LC_MESSAGES/grasswxpy.mo
+%%GRASS_INST_DIR%%/locale/it/LC_MESSAGES/grasslibs.mo
+%%GRASS_INST_DIR%%/locale/it/LC_MESSAGES/grassmods.mo
+%%GRASS_INST_DIR%%/locale/it/LC_MESSAGES/grasswxpy.mo
+%%GRASS_INST_DIR%%/locale/ja/LC_MESSAGES/grasslibs.mo
+%%GRASS_INST_DIR%%/locale/ja/LC_MESSAGES/grassmods.mo
+%%GRASS_INST_DIR%%/locale/ja/LC_MESSAGES/grasswxpy.mo
+%%GRASS_INST_DIR%%/locale/ko/LC_MESSAGES/grasslibs.mo
+%%GRASS_INST_DIR%%/locale/ko/LC_MESSAGES/grassmods.mo
+%%GRASS_INST_DIR%%/locale/ko/LC_MESSAGES/grasswxpy.mo
+%%GRASS_INST_DIR%%/locale/lv/LC_MESSAGES/grasslibs.mo
+%%GRASS_INST_DIR%%/locale/lv/LC_MESSAGES/grassmods.mo
+%%GRASS_INST_DIR%%/locale/lv/LC_MESSAGES/grasswxpy.mo
+%%GRASS_INST_DIR%%/locale/ml/LC_MESSAGES/grasslibs.mo
+%%GRASS_INST_DIR%%/locale/ml/LC_MESSAGES/grassmods.mo
+%%GRASS_INST_DIR%%/locale/ml/LC_MESSAGES/grasswxpy.mo
+%%GRASS_INST_DIR%%/locale/pl/LC_MESSAGES/grasslibs.mo
+%%GRASS_INST_DIR%%/locale/pl/LC_MESSAGES/grassmods.mo
+%%GRASS_INST_DIR%%/locale/pl/LC_MESSAGES/grasswxpy.mo
+%%GRASS_INST_DIR%%/locale/pt/LC_MESSAGES/grasslibs.mo
+%%GRASS_INST_DIR%%/locale/pt/LC_MESSAGES/grassmods.mo
+%%GRASS_INST_DIR%%/locale/pt/LC_MESSAGES/grasswxpy.mo
+%%GRASS_INST_DIR%%/locale/pt_BR/LC_MESSAGES/grasslibs.mo
+%%GRASS_INST_DIR%%/locale/pt_BR/LC_MESSAGES/grassmods.mo
+%%GRASS_INST_DIR%%/locale/pt_BR/LC_MESSAGES/grasswxpy.mo
+%%GRASS_INST_DIR%%/locale/ro/LC_MESSAGES/grasslibs.mo
+%%GRASS_INST_DIR%%/locale/ro/LC_MESSAGES/grassmods.mo
+%%GRASS_INST_DIR%%/locale/ro/LC_MESSAGES/grasswxpy.mo
+%%GRASS_INST_DIR%%/locale/ru/LC_MESSAGES/grasslibs.mo
+%%GRASS_INST_DIR%%/locale/ru/LC_MESSAGES/grassmods.mo
+%%GRASS_INST_DIR%%/locale/ru/LC_MESSAGES/grasswxpy.mo
+%%GRASS_INST_DIR%%/locale/si/LC_MESSAGES/grasslibs.mo
+%%GRASS_INST_DIR%%/locale/si/LC_MESSAGES/grassmods.mo
+%%GRASS_INST_DIR%%/locale/si/LC_MESSAGES/grasswxpy.mo
+%%GRASS_INST_DIR%%/locale/sl/LC_MESSAGES/grasslibs.mo
+%%GRASS_INST_DIR%%/locale/sl/LC_MESSAGES/grassmods.mo
+%%GRASS_INST_DIR%%/locale/sl/LC_MESSAGES/grasswxpy.mo
+%%GRASS_INST_DIR%%/locale/ta/LC_MESSAGES/grasslibs.mo
+%%GRASS_INST_DIR%%/locale/ta/LC_MESSAGES/grassmods.mo
+%%GRASS_INST_DIR%%/locale/ta/LC_MESSAGES/grasswxpy.mo
+%%GRASS_INST_DIR%%/locale/th/LC_MESSAGES/grasslibs.mo
+%%GRASS_INST_DIR%%/locale/th/LC_MESSAGES/grassmods.mo
+%%GRASS_INST_DIR%%/locale/th/LC_MESSAGES/grasswxpy.mo
+%%GRASS_INST_DIR%%/locale/tr/LC_MESSAGES/grasslibs.mo
+%%GRASS_INST_DIR%%/locale/tr/LC_MESSAGES/grassmods.mo
+%%GRASS_INST_DIR%%/locale/tr/LC_MESSAGES/grasswxpy.mo
+%%GRASS_INST_DIR%%/locale/uk/LC_MESSAGES/grasslibs.mo
+%%GRASS_INST_DIR%%/locale/uk/LC_MESSAGES/grassmods.mo
+%%GRASS_INST_DIR%%/locale/uk/LC_MESSAGES/grasswxpy.mo
+%%GRASS_INST_DIR%%/locale/vi/LC_MESSAGES/grasslibs.mo
+%%GRASS_INST_DIR%%/locale/vi/LC_MESSAGES/grassmods.mo
+%%GRASS_INST_DIR%%/locale/vi/LC_MESSAGES/grasswxpy.mo
+%%GRASS_INST_DIR%%/locale/zh/LC_MESSAGES/grasslibs.mo
+%%GRASS_INST_DIR%%/locale/zh/LC_MESSAGES/grassmods.mo
+%%GRASS_INST_DIR%%/locale/zh/LC_MESSAGES/grasswxpy.mo
+%%GRASS_INST_DIR%%/locale/zh_CN/LC_MESSAGES/grasslibs.mo
+%%GRASS_INST_DIR%%/locale/zh_CN/LC_MESSAGES/grassmods.mo
+%%GRASS_INST_DIR%%/locale/zh_CN/LC_MESSAGES/grasswxpy.mo
+%%GRASS_INST_DIR%%/scripts/d.background
+%%GRASS_INST_DIR%%/scripts/d.correlate
+%%GRASS_INST_DIR%%/scripts/d.frame
+%%GRASS_INST_DIR%%/scripts/d.out.file
+%%GRASS_INST_DIR%%/scripts/d.polar
+%%GRASS_INST_DIR%%/scripts/d.rast.edit
+%%GRASS_INST_DIR%%/scripts/d.rast.leg
+%%GRASS_INST_DIR%%/scripts/d.redraw
+%%GRASS_INST_DIR%%/scripts/d.shade
+%%GRASS_INST_DIR%%/scripts/d.to.rast
+%%GRASS_INST_DIR%%/scripts/d.what.rast
+%%GRASS_INST_DIR%%/scripts/d.what.vect
+%%GRASS_INST_DIR%%/scripts/db.dropcolumn
+%%GRASS_INST_DIR%%/scripts/db.droptable
+%%GRASS_INST_DIR%%/scripts/db.in.ogr
+%%GRASS_INST_DIR%%/scripts/db.out.ogr
+%%GRASS_INST_DIR%%/scripts/db.test
+%%GRASS_INST_DIR%%/scripts/db.univar
+%%GRASS_INST_DIR%%/scripts/g.download.location
+%%GRASS_INST_DIR%%/scripts/g.extension
+%%GRASS_INST_DIR%%/scripts/g.extension.all
+%%GRASS_INST_DIR%%/scripts/g.gui.animation
+%%GRASS_INST_DIR%%/scripts/g.gui.datacatalog
+%%GRASS_INST_DIR%%/scripts/g.gui.dbmgr
+%%GRASS_INST_DIR%%/scripts/g.gui.gcp
+%%GRASS_INST_DIR%%/scripts/g.gui.gmodeler
+%%GRASS_INST_DIR%%/scripts/g.gui.iclass
+%%GRASS_INST_DIR%%/scripts/g.gui.image2target
+%%GRASS_INST_DIR%%/scripts/g.gui.mapswipe
+%%GRASS_INST_DIR%%/scripts/g.gui.photo2image
+%%GRASS_INST_DIR%%/scripts/g.gui.psmap
+%%GRASS_INST_DIR%%/scripts/g.gui.rdigit
+%%GRASS_INST_DIR%%/scripts/g.gui.rlisetup
+%%GRASS_INST_DIR%%/scripts/g.gui.timeline
+%%GRASS_INST_DIR%%/scripts/g.gui.tplot
+%%GRASS_INST_DIR%%/scripts/g.gui.vdigit
+%%GRASS_INST_DIR%%/scripts/g.manual
+%%GRASS_INST_DIR%%/scripts/g.search.modules
+%%GRASS_INST_DIR%%/scripts/i.band.library
+%%GRASS_INST_DIR%%/scripts/i.colors.enhance
+%%GRASS_INST_DIR%%/scripts/i.image.mosaic
+%%GRASS_INST_DIR%%/scripts/i.in.spotvgt
+%%GRASS_INST_DIR%%/scripts/i.oif
+%%GRASS_INST_DIR%%/scripts/i.pansharpen
+%%GRASS_INST_DIR%%/scripts/i.spectral
+%%GRASS_INST_DIR%%/scripts/i.tasscap
+%%GRASS_INST_DIR%%/scripts/m.proj
+%%GRASS_INST_DIR%%/scripts/r.blend
+%%GRASS_INST_DIR%%/scripts/r.buffer.lowmem
+%%GRASS_INST_DIR%%/scripts/r.colors.stddev
+%%GRASS_INST_DIR%%/scripts/r.drain
+%%GRASS_INST_DIR%%/scripts/r.fillnulls
+%%GRASS_INST_DIR%%/scripts/r.grow
+%%GRASS_INST_DIR%%/scripts/r.import
+%%GRASS_INST_DIR%%/scripts/r.in.aster
+%%GRASS_INST_DIR%%/scripts/r.in.srtm
+%%GRASS_INST_DIR%%/scripts/r.in.wms
+%%GRASS_INST_DIR%%/scripts/r.mapcalc.simple
+%%GRASS_INST_DIR%%/scripts/r.mask
+%%GRASS_INST_DIR%%/scripts/r.out.xyz
+%%GRASS_INST_DIR%%/scripts/r.pack
+%%GRASS_INST_DIR%%/scripts/r.plane
+%%GRASS_INST_DIR%%/scripts/r.reclass.area
+%%GRASS_INST_DIR%%/scripts/r.rgb
+%%GRASS_INST_DIR%%/scripts/r.semantic.label
+%%GRASS_INST_DIR%%/scripts/r.shade
+%%GRASS_INST_DIR%%/scripts/r.tileset
+%%GRASS_INST_DIR%%/scripts/r.unpack
+%%GRASS_INST_DIR%%/scripts/r3.in.xyz
+%%GRASS_INST_DIR%%/scripts/t.copy
+%%GRASS_INST_DIR%%/scripts/t.create
+%%GRASS_INST_DIR%%/scripts/t.info
+%%GRASS_INST_DIR%%/scripts/t.list
+%%GRASS_INST_DIR%%/scripts/t.merge
+%%GRASS_INST_DIR%%/scripts/t.rast.accdetect
+%%GRASS_INST_DIR%%/scripts/t.rast.accumulate
+%%GRASS_INST_DIR%%/scripts/t.rast.aggregate
+%%GRASS_INST_DIR%%/scripts/t.rast.aggregate.ds
+%%GRASS_INST_DIR%%/scripts/t.rast.algebra
+%%GRASS_INST_DIR%%/scripts/t.rast.colors
+%%GRASS_INST_DIR%%/scripts/t.rast.contour
+%%GRASS_INST_DIR%%/scripts/t.rast.export
+%%GRASS_INST_DIR%%/scripts/t.rast.extract
+%%GRASS_INST_DIR%%/scripts/t.rast.gapfill
+%%GRASS_INST_DIR%%/scripts/t.rast.import
+%%GRASS_INST_DIR%%/scripts/t.rast.list
+%%GRASS_INST_DIR%%/scripts/t.rast.mapcalc
+%%GRASS_INST_DIR%%/scripts/t.rast.neighbors
+%%GRASS_INST_DIR%%/scripts/t.rast.out.vtk
+%%GRASS_INST_DIR%%/scripts/t.rast.series
+%%GRASS_INST_DIR%%/scripts/t.rast.to.rast3
+%%GRASS_INST_DIR%%/scripts/t.rast.to.vect
+%%GRASS_INST_DIR%%/scripts/t.rast.univar
+%%GRASS_INST_DIR%%/scripts/t.rast.what
+%%GRASS_INST_DIR%%/scripts/t.rast3d.algebra
+%%GRASS_INST_DIR%%/scripts/t.rast3d.extract
+%%GRASS_INST_DIR%%/scripts/t.rast3d.list
+%%GRASS_INST_DIR%%/scripts/t.rast3d.mapcalc
+%%GRASS_INST_DIR%%/scripts/t.rast3d.univar
+%%GRASS_INST_DIR%%/scripts/t.register
+%%GRASS_INST_DIR%%/scripts/t.remove
+%%GRASS_INST_DIR%%/scripts/t.rename
+%%GRASS_INST_DIR%%/scripts/t.sample
+%%GRASS_INST_DIR%%/scripts/t.select
+%%GRASS_INST_DIR%%/scripts/t.shift
+%%GRASS_INST_DIR%%/scripts/t.snap
+%%GRASS_INST_DIR%%/scripts/t.support
+%%GRASS_INST_DIR%%/scripts/t.topology
+%%GRASS_INST_DIR%%/scripts/t.unregister
+%%GRASS_INST_DIR%%/scripts/t.upgrade
+%%GRASS_INST_DIR%%/scripts/t.vect.algebra
+%%GRASS_INST_DIR%%/scripts/t.vect.db.select
+%%GRASS_INST_DIR%%/scripts/t.vect.export
+%%GRASS_INST_DIR%%/scripts/t.vect.extract
+%%GRASS_INST_DIR%%/scripts/t.vect.import
+%%GRASS_INST_DIR%%/scripts/t.vect.list
+%%GRASS_INST_DIR%%/scripts/t.vect.observe.strds
+%%GRASS_INST_DIR%%/scripts/t.vect.univar
+%%GRASS_INST_DIR%%/scripts/t.vect.what.strds
+%%GRASS_INST_DIR%%/scripts/v.build.all
+%%GRASS_INST_DIR%%/scripts/v.centroids
+%%GRASS_INST_DIR%%/scripts/v.clip
+%%GRASS_INST_DIR%%/scripts/v.db.addcolumn
+%%GRASS_INST_DIR%%/scripts/v.db.addtable
+%%GRASS_INST_DIR%%/scripts/v.db.dropcolumn
+%%GRASS_INST_DIR%%/scripts/v.db.droprow
+%%GRASS_INST_DIR%%/scripts/v.db.droptable
+%%GRASS_INST_DIR%%/scripts/v.db.join
+%%GRASS_INST_DIR%%/scripts/v.db.reconnect.all
+%%GRASS_INST_DIR%%/scripts/v.db.renamecolumn
+%%GRASS_INST_DIR%%/scripts/v.db.univar
+%%GRASS_INST_DIR%%/scripts/v.db.update
+%%GRASS_INST_DIR%%/scripts/v.dissolve
+%%GRASS_INST_DIR%%/scripts/v.import
+%%GRASS_INST_DIR%%/scripts/v.in.e00
+%%GRASS_INST_DIR%%/scripts/v.in.geonames
+%%GRASS_INST_DIR%%/scripts/v.in.lines
+%%GRASS_INST_DIR%%/scripts/v.in.mapgen
+%%GRASS_INST_DIR%%/scripts/v.in.wfs
+%%GRASS_INST_DIR%%/scripts/v.pack
+%%GRASS_INST_DIR%%/scripts/v.rast.stats
+%%GRASS_INST_DIR%%/scripts/v.report
+%%GRASS_INST_DIR%%/scripts/v.to.lines
+%%GRASS_INST_DIR%%/scripts/v.unpack
+%%GRASS_INST_DIR%%/scripts/v.what.strds
+%%GRASS_INST_DIR%%/scripts/v.what.vect
+%%GRASS_INST_DIR%%/scripts/wxpyimgview
+%%GRASS_INST_DIR%%/share/applications/grass.desktop
+%%GRASS_INST_DIR%%/share/icons/hicolor/128x128/apps/grass.png
+%%GRASS_INST_DIR%%/share/icons/hicolor/16x16/apps/grass.png
+%%GRASS_INST_DIR%%/share/icons/hicolor/192x192/apps/grass.png
+%%GRASS_INST_DIR%%/share/icons/hicolor/22x22/apps/grass.png
+%%GRASS_INST_DIR%%/share/icons/hicolor/24x24/apps/grass.png
+%%GRASS_INST_DIR%%/share/icons/hicolor/32x32/apps/grass.png
+%%GRASS_INST_DIR%%/share/icons/hicolor/36x36/apps/grass.png
+%%GRASS_INST_DIR%%/share/icons/hicolor/40x40/apps/grass.png
+%%GRASS_INST_DIR%%/share/icons/hicolor/42x42/apps/grass.png
+%%GRASS_INST_DIR%%/share/icons/hicolor/48x48/apps/grass.png
+%%GRASS_INST_DIR%%/share/icons/hicolor/64x64/apps/grass.png
+%%GRASS_INST_DIR%%/share/icons/hicolor/72x72/apps/grass.png
+%%GRASS_INST_DIR%%/share/icons/hicolor/80x80/apps/grass.png
+%%GRASS_INST_DIR%%/share/icons/hicolor/8x8/apps/grass.png
+%%GRASS_INST_DIR%%/share/icons/hicolor/96x96/apps/grass.png
+%%GRASS_INST_DIR%%/share/icons/hicolor/scalable/apps/grass.svg
+%%GRASS_INST_DIR%%/share/metainfo/org.osgeo.grass.appdata.xml
+%%GRASS_INST_DIR%%/translation_status.json
+%%GRASS_INST_DIR%%/translators.csv
+%%GRASS_INST_DIR%%/utils/__pycache__/generate_last_commit_file%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/utils/__pycache__/ggroff%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/utils/__pycache__/ghtml%%PYTHON_EXT_SUFFIX%%.pyc
+%%GRASS_INST_DIR%%/utils/g.echo
+%%GRASS_INST_DIR%%/utils/g.html2man.py
+%%GRASS_INST_DIR%%/utils/generate_last_commit_file.py
+%%GRASS_INST_DIR%%/utils/ggroff.py
+%%GRASS_INST_DIR%%/utils/ghtml.py
+%%GRASS_INST_DIR%%/utils/mkhtml.py
+%%MYSQL%%%%GRASS_INST_DIR%%/docs/html/grass-mysql.html
+%%MYSQL%%%%GRASS_INST_DIR%%/docs/man/man1/grass-mysql.1.gz
+%%MYSQL%%%%GRASS_INST_DIR%%/driver/db/mysql
+%%NETCDF%%%%GRASS_INST_DIR%%/bin/r3.out.netcdf
+%%NETCDF%%%%GRASS_INST_DIR%%/docs/html/r3.out.netcdf.html
+%%NETCDF%%%%GRASS_INST_DIR%%/docs/man/man1/r3.out.netcdf.1.gz
+%%ODBC%%%%GRASS_INST_DIR%%/docs/html/grass-odbc.html
+%%ODBC%%%%GRASS_INST_DIR%%/docs/man/man1/grass-odbc.1.gz
+%%ODBC%%%%GRASS_INST_DIR%%/driver/db/odbc
+%%PDAL%%%%GRASS_INST_DIR%%/bin/r.in.pdal
+%%PDAL%%%%GRASS_INST_DIR%%/bin/v.in.pdal
+%%PDAL%%%%GRASS_INST_DIR%%/docs/html/r.in.pdal.html
+%%PDAL%%%%GRASS_INST_DIR%%/docs/html/r_in_lidar.png
+%%PDAL%%%%GRASS_INST_DIR%%/docs/html/r_in_lidar_base_raster.png
+%%PDAL%%%%GRASS_INST_DIR%%/docs/html/r_in_lidar_binning_count.png
+%%PDAL%%%%GRASS_INST_DIR%%/docs/html/r_in_lidar_binning_mean.png
+%%PDAL%%%%GRASS_INST_DIR%%/docs/html/r_in_lidar_dem_mean3D.jpg
+%%PDAL%%%%GRASS_INST_DIR%%/docs/html/r_in_lidar_zrange.png
+%%PDAL%%%%GRASS_INST_DIR%%/docs/html/v.in.pdal.html
+%%PDAL%%%%GRASS_INST_DIR%%/docs/man/man1/r.in.pdal.1.gz
+%%PDAL%%%%GRASS_INST_DIR%%/docs/man/man1/v.in.pdal.1.gz
+%%PGSQL%%%%GRASS_INST_DIR%%/bin/v.out.postgis
+%%PGSQL%%%%GRASS_INST_DIR%%/docs/html/grass-pg.html
+%%PGSQL%%%%GRASS_INST_DIR%%/docs/html/v.out.postgis.html
+%%PGSQL%%%%GRASS_INST_DIR%%/docs/man/man1/grass-pg.1.gz
+%%PGSQL%%%%GRASS_INST_DIR%%/docs/man/man1/v.out.postgis.1.gz
+%%PGSQL%%%%GRASS_INST_DIR%%/driver/db/pg
+@dir %%GRASS_INST_DIR%%
+@dir %%GRASS_INST_DIR%%/demolocation/PERMANENT/cats
+@dir %%GRASS_INST_DIR%%/demolocation/PERMANENT/cell
+@dir %%GRASS_INST_DIR%%/demolocation/PERMANENT/cell_misc
+@dir %%GRASS_INST_DIR%%/demolocation/PERMANENT/cellhd
+@dir %%GRASS_INST_DIR%%/demolocation/PERMANENT/colr
+@dir %%GRASS_INST_DIR%%/demolocation/PERMANENT/fcell
+@dir %%GRASS_INST_DIR%%/demolocation/PERMANENT/hist
+@dir %%GRASS_INST_DIR%%/demolocation/PERMANENT/windows
+@dir %%GRASS_INST_DIR%%/gui/wxpython/scripts
+@dir %%GRASS_INST_DIR%%/share
diff --git a/databases/greptimedb/Makefile b/databases/greptimedb/Makefile
new file mode 100644
index 000000000000..86c6471722e9
--- /dev/null
+++ b/databases/greptimedb/Makefile
@@ -0,0 +1,1002 @@
+PORTNAME=	greptimedb
+DISTVERSIONPREFIX=	v
+DISTVERSION=	0.7.2
+CATEGORIES=	databases
+
+MAINTAINER=	yuri@FreeBSD.org
+COMMENT=	Open-source, cloud-native, distributed time-series database
+WWW=		https://greptime.com/
+
+LICENSE=	APACHE20
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
+BROKEN=		error[E0635]: unknown feature `stdsimd`, see https://github.com/GreptimeTeam/greptimedb/issues/3656
+
+BUILD_DEPENDS=	gmake:devel/gmake \
+		protoc:devel/protobuf \
+		rust-nightly>0:lang/rust-nightly \
+		${LOCALBASE}/bin/nm:devel/binutils
+LIB_DEPENDS=	libzstd.so:archivers/zstd
+
+USES=		cargo
+USE_RC_SUBR=	greptimedb
+
+USE_GITHUB=	yes
+GH_ACCOUNT=	GreptimeTeam
+
+CARGO_BUILDDEP=	no
+CARGO_CRATES=	Inflector-0.11.4 \
+		addr2line-0.21.0 \
+		adler-1.0.2 \
+		adler32-1.2.0 \
+		aes-0.8.4 \
+		ahash-0.7.7 \
+		ahash-0.8.6 \
+		aho-corasick-1.1.2 \
+		aide-0.9.0 \
+		alloc-no-stdlib-2.0.4 \
+		alloc-stdlib-0.2.2 \
+		allocator-api2-0.2.16 \
+		android-tzdata-0.1.1 \
+		android_system_properties-0.1.5 \
+		anes-0.1.6 \
+		ansi_term-0.12.1 \
+		anstream-0.6.5 \
+		anstyle-1.0.4 \
+		anstyle-parse-0.2.3 \
+		anstyle-query-1.0.2 \
+		anstyle-wincon-3.0.2 \
+		anyhow-1.0.76 \
+		anymap-1.0.0-beta.2 \
+		approx-0.5.1 \
+		approx_eq-0.1.8 \
+		aquamarine-0.3.3 \
+		arbitrary-1.3.2 \
+		arc-swap-1.6.0 \
+		array-init-2.1.0 \
+		arrayref-0.3.7 \
+		arrayvec-0.7.4 \
+		arrow-47.0.0 \
+		arrow-arith-47.0.0 \
+		arrow-array-47.0.0 \
+		arrow-buffer-47.0.0 \
+		arrow-cast-47.0.0 \
+		arrow-csv-47.0.0 \
+		arrow-data-47.0.0 \
+		arrow-flight-47.0.0 \
+		arrow-ipc-47.0.0 \
+		arrow-json-47.0.0 \
+		arrow-ord-47.0.0 \
+		arrow-row-47.0.0 \
+		arrow-schema-47.0.0 \
+		arrow-select-47.0.0 \
+		arrow-string-47.0.0 \
+		ascii-1.1.0 \
+		ascii-canvas-3.0.0 \
+		async-channel-1.9.0 \
+		async-compression-0.3.15 \
+		async-compression-0.4.5 \
+		async-lock-2.8.0 \
+		async-recursion-1.0.5 \
+		async-stream-0.3.5 \
+		async-stream-impl-0.3.5 \
+		async-trait-0.1.75 \
+		asynchronous-codec-0.7.0 \
+		atoi-1.0.0 \
+		atomic-0.5.3 \
+		atty-0.2.14 \
+		auto_impl-1.1.0 \
+		auto_ops-0.3.0 \
+		autocfg-1.1.0 \
+		autotools-0.2.6 \
+		axum-0.6.20 \
+		axum-core-0.3.4 \
+		axum-macros-0.3.8 \
+		axum-test-helper-0.3.0 \
+		backon-0.4.1 \
+		backtrace-0.3.69 \
+		base64-0.13.1 \
+		base64-0.21.5 \
+		base64-0.22.0 \
+		base64ct-1.6.0 \
+		bcder-0.7.3 \
+		bigdecimal-0.4.2 \
+		bincode-1.3.3 \
+		bindgen-0.69.1 \
+		bit-set-0.5.3 \
+		bit-vec-0.6.3 \
+		bitflags-1.3.2 \
+		bitflags-2.4.1 \
+		bitvec-1.0.1 \
+		blake2-0.10.6 \
+		blake3-1.5.0 \
+		block-buffer-0.10.4 \
+		block-padding-0.3.3 \
+		borsh-1.3.0 \
+		borsh-derive-1.3.0 \
+		brotli-3.4.0 \
+		brotli-decompressor-2.5.1 \
+		bstr-0.2.17 \
+		btoi-0.4.3 \
+		build-data-0.1.5 \
+		bumpalo-3.14.0 \
+		bytecheck-0.6.11 \
+		bytecheck_derive-0.6.11 \
+		bytecount-0.6.7 \
+		bytemuck-1.14.0 \
+		byteorder-1.5.0 \
+		bytes-1.5.0 \
+		bzip2-0.4.4 \
+		bzip2-sys-0.1.11+1.0.8 \
+		c2rust-bitfields-0.3.0 \
+		c2rust-bitfields-derive-0.2.1 \
+		cactus-1.0.6 \
+		camino-1.1.6 \
+		cargo-platform-0.1.5 \
+		cargo_metadata-0.14.2 \
+		caseless-0.2.1 \
+		cast-0.3.0 \
+		cbc-0.1.2 \
+		cc-1.0.83 \
+		cc-traits-2.0.0 \
+		cesu8-1.1.0 \
+		cexpr-0.6.0 \
+		cfg-if-0.1.10 \
+		cfg-if-1.0.0 \
+		cfg_aliases-0.1.1 \
+		cfgrammar-0.12.0 \
+		chrono-0.4.33 \
+		chrono-tz-0.8.4 \
+		chrono-tz-build-0.2.1 \
+		chunked_transfer-1.5.0 \
+		ciborium-0.2.1 \
+		ciborium-io-0.2.1 \
+		ciborium-ll-0.2.1 \
+		cipher-0.4.4 \
+		clang-sys-1.6.1 \
+		clap-2.34.0 \
+		clap-3.2.25 \
+		clap-4.4.11 \
+		clap_builder-4.4.11 \
+		clap_derive-4.4.7 \
+		clap_lex-0.2.4 \
+		clap_lex-0.6.0 \
+		clipboard-win-4.5.0 \
+		cmake-0.1.50 \
+		colorchoice-1.0.0 \
+		combine-4.6.6 \
+		comfy-table-7.1.0 \
+		comma-1.0.0 \
+		concurrent-queue-2.4.0 \
+		config-0.13.4 \
+		console-0.15.7 \
+		console-api-0.5.0 \
+		console-subscriber-0.1.10 \
+		const-oid-0.7.1 \
+		const-oid-0.9.6 \
+		const-random-0.1.17 \
+		const-random-macro-0.1.16 \
+		constant_time_eq-0.3.0 \
+		core-foundation-0.9.4 \
+		core-foundation-sys-0.8.6 \
+		cpp_demangle-0.4.3 \
+		cpufeatures-0.2.11 \
+		crc-3.0.1 \
+		crc-catalog-2.4.0 \
+		crc32c-0.6.4 \
+		crc32fast-1.3.2 \
+		criterion-0.4.0 \
+		criterion-plot-0.5.0 \
+		crossbeam-0.8.3 \
+		crossbeam-channel-0.5.10 \
+		crossbeam-deque-0.8.4 \
+		crossbeam-epoch-0.9.17 \
+		crossbeam-queue-0.3.10 \
+		crossbeam-utils-0.8.18 \
+		crunchy-0.2.2 \
+		crypto-bigint-0.3.2 \
+		crypto-common-0.1.6 \
+		csv-1.3.0 \
+		csv-core-0.1.11 \
+		darling-0.14.4 \
+		darling-0.20.3 \
+		darling_core-0.14.4 \
+		darling_core-0.20.3 \
+		darling_macro-0.14.4 \
+		darling_macro-0.20.3 \
+		dashmap-5.5.3 \
+		data-encoding-2.5.0 \
+		debugid-0.8.0 \
+		der-0.5.1 \
+		der-0.7.8 \
+		deranged-0.3.10 \
+		derive-new-0.5.9 \
+		derive-new-0.6.0 \
+		derive_arbitrary-1.3.2 \
+		derive_builder-0.11.2 \
+		derive_builder-0.12.0 \
+		derive_builder_core-0.11.2 \
+		derive_builder_core-0.12.0 \
+		derive_builder_macro-0.11.2 \
+		derive_builder_macro-0.12.0 \
+		diff-0.1.13 \
+		difference-2.0.0 \
+		difflib-0.4.0 \
+		digest-0.10.7 \
+		dirs-3.0.2 \
+		dirs-4.0.0 \
+		dirs-next-2.0.0 \
+		dirs-sys-0.3.7 \
+		dirs-sys-next-0.1.2 \
+		dlv-list-0.3.0 \
+		dlv-list-0.5.2 \
+		dns-lookup-1.0.8 \
+		doc-comment-0.3.3 \
+		dotenv-0.15.0 \
+		dotenvy-0.15.7 \
+		downcast-0.11.0 \
+		dyn-clone-1.0.16 \
+		either-1.9.0 \
+		ena-0.14.2 \
+		encode_unicode-0.3.6 \
+		encoding_rs-0.8.33 \
+		endian-type-0.1.2 \
+		enum-iterator-1.4.1 \
+		enum-iterator-derive-1.2.1 \
+		enum_dispatch-0.3.12 \
+		equivalent-1.0.1 \
+		erased-serde-0.4.1 \
+		errno-0.3.8 \
+		error-chain-0.12.4 \
+		error-code-2.3.1 \
+		etcd-client-0.12.3 \
+		event-listener-2.5.3 \
+		exitcode-1.1.2 \
+		fail-0.5.1 \
+		fallible-iterator-0.2.0 \
+		fallible-streaming-iterator-0.1.9 \
+		fastrand-1.9.0 \
+		fastrand-2.0.1 \
+		fd-lock-3.0.13 \
+		filetime-0.2.23 \
+		findshlibs-0.10.2 \
+		finl_unicode-1.2.0 \
+		fixedbitset-0.4.2 \
+		flagset-0.4.4 \
+		flatbuffers-23.5.26 \
+		flate2-1.0.28 \
+		float-cmp-0.9.0 \
+		fnv-1.0.7 \
+		form_urlencoded-1.2.1 \
+		format_num-0.1.0 \
+		fragile-2.0.0 \
+		frunk-0.4.2 \
+		frunk_core-0.4.2 \
+		frunk_derives-0.4.2 \
+		frunk_proc_macro_helpers-0.1.2 \
+		frunk_proc_macros-0.1.2 \
+		fs2-0.4.3 \
+		fsevent-sys-4.1.0 \
+		fst-0.4.7 \
+		funty-2.0.0 \
+		futures-0.3.30 \
+		futures-channel-0.3.30 \
+		futures-core-0.3.30 \
+		futures-executor-0.3.30 \
+		futures-intrusive-0.4.2 \
+		futures-io-0.3.30 \
+		futures-macro-0.3.30 \
+		futures-sink-0.3.30 \
+		futures-task-0.3.30 \
+		futures-timer-3.0.2 \
+		futures-util-0.3.30 \
+		generic-array-0.14.7 \
+		gethostname-0.2.3 \
+		getopts-0.2.21 \
+		getrandom-0.2.11 \
+		getset-0.1.2 \
+		gimli-0.28.1 \
+		git2-0.18.1 \
+		glob-0.3.1 \
+		h2-0.3.26 \
+		half-1.8.2 \
+		half-2.3.1 \
+		hashbrown-0.12.3 \
+		hashbrown-0.13.2 \
+		hashbrown-0.14.3 \
+		hashlink-0.8.4 \
+		hdrhistogram-7.5.4 \
+		headers-0.3.9 \
+		headers-core-0.2.0 \
+		heck-0.4.1 \
+		hermit-abi-0.1.19 \
+		hermit-abi-0.3.3 \
+		hex-0.4.3 \
+		hexf-parse-0.2.1 \
+		hkdf-0.12.4 \
+		hmac-0.12.1 \
+		home-0.5.9 \
+		hostname-0.3.1 \
+		html-escape-0.2.13 \
+		http-0.2.11 \
+		http-body-0.4.6 \
+		http-range-header-0.3.1 \
+		httparse-1.8.0 \
+		httpdate-1.0.3 \
+		human-panic-1.2.2 \
+		humantime-2.1.0 \
+		humantime-serde-1.1.1 \
+		hydroflow-0.5.0 \
+		hydroflow_datalog-0.5.0 \
+		hydroflow_datalog_core-0.5.0 \
+		hydroflow_lang-0.5.0 \
+		hydroflow_macro-0.5.0 \
+		hyper-0.14.28 \
+		hyper-rustls-0.24.2 \
+		hyper-timeout-0.4.1 \
+		iana-time-zone-0.1.58 \
+		iana-time-zone-haiku-0.1.2 \
+		ident_case-1.0.1 \
+		idna-0.5.0 \
+		if_chain-1.0.2 \
+		include_dir-0.7.3 \
+		include_dir_macros-0.7.3 \
+		indexmap-1.9.3 \
+		indexmap-2.1.0 \
+		indicatif-0.17.7 \
+		indoc-1.0.9 \
+		inferno-0.11.19 \
+		inotify-0.9.6 \
+		inotify-sys-0.1.5 \
+		inout-0.1.3 \
+		instant-0.1.12 \
+		integer-encoding-3.0.4 \
+		integer-encoding-4.0.0 \
+		inventory-0.3.14 \
+		io-lifetimes-1.0.11 \
+		ipnet-2.9.0 \
+		iri-string-0.7.0 \
+		is-macro-0.2.2 \
+		is-terminal-0.4.9 \
+		itertools-0.10.5 \
+		itertools-0.11.0 \
+		itertools-0.12.0 \
+		itoa-1.0.10 \
+		jni-0.21.1 \
+		jni-sys-0.3.0 \
+		jobserver-0.1.27 \
+		js-sys-0.3.66 \
+		json5-0.4.1 \
+		jsonwebtoken-9.2.0 \
+		keccak-0.1.4 \
+		keyed_priority_queue-0.4.2 \
+		kqueue-1.0.8 \
+		kqueue-sys-1.0.4 \
+		lalrpop-0.19.12 \
+		lalrpop-util-0.19.12 \
+		lattices-0.5.0 \
+		lazy_static-1.4.0 \
+		lazycell-1.3.0 \
+		lexical-core-0.8.5 \
+		lexical-parse-float-0.8.5 \
+		lexical-parse-integer-0.8.6 \
+		lexical-util-0.8.5 \
+		lexical-write-float-0.8.5 \
+		lexical-write-integer-0.8.5 \
+		libc-0.2.153 \
+		libfuzzer-sys-0.4.7 \
+		libgit2-sys-0.16.2+1.7.2 \
+		libloading-0.7.4 \
+		libm-0.2.8 \
+		libredox-0.0.1 \
+		libsqlite3-sys-0.25.2 \
+		libz-sys-1.1.12 \
+		linked-hash-map-0.5.6 \
+		linux-raw-sys-0.1.4 \
+		linux-raw-sys-0.4.12 \
+		lock_api-0.4.11 \
+		log-0.4.20 \
+		lrlex-0.12.0 \
+		lrpar-0.12.0 \
+		lrtable-0.12.0 \
+		lru-0.12.1 \
+		lz4-1.24.0 \
+		lz4-sys-1.9.4 \
+		lz4_flex-0.9.5 \
+		lzma-sys-0.1.20 \
+		mac_address-1.1.5 \
+		mach2-0.4.2 \
+		malloc_buf-0.0.6 \
+		maplit-1.0.2 \
+		match_cfg-0.1.0 \
+		matchers-0.1.0 \
+		matches-0.1.10 \
+		matchit-0.7.3 \
+		matrixmultiply-0.3.8 \
+		md-5-0.10.6 \
+		md5-0.7.0 \
+		memchr-2.6.4 \
+		memcomparable-0.2.0 \
+		memmap2-0.5.10 \
+		memmap2-0.9.3 \
+		memoffset-0.6.5 \
+		memoffset-0.7.1 \
+		memoffset-0.9.0 \
+		mime-0.3.17 \
+		mime_guess-2.0.4 \
+		minimal-lexical-0.2.1 \
+		miniz_oxide-0.7.1 \
+		mio-0.8.11 \
+		mockall-0.11.4 \
+		mockall_derive-0.11.4 \
+		moka-0.12.1 \
+		mt19937-2.0.1 \
+		multimap-0.8.3 \
+		mur3-0.1.0 \
+		mysql-common-derive-0.30.2 \
+		mysql-common-derive-0.31.0 \
+		mysql_async-0.33.0 \
+		mysql_common-0.31.0 \
+		mysql_common-0.32.0 \
+		nalgebra-0.29.0 \
+		nalgebra-macros-0.1.0 \
+		ndk-context-0.1.1 \
+		new_debug_unreachable-1.0.4 \
+		nibble_vec-0.1.0 \
+		nix-0.23.2 \
+		nix-0.25.1 \
+		nix-0.26.4 \
+		nom-7.1.3 \
+		normalize-line-endings-0.3.0 \
+		notify-6.1.1 \
+		ntapi-0.4.1 \
+		nu-ansi-term-0.46.0 \
+		num-0.4.1 \
+		num-bigint-0.4.4 \
+		num-bigint-dig-0.8.4 \
+		num-complex-0.4.4 \
+		num-derive-0.4.1 \
+		num-format-0.4.4 \
+		num-integer-0.1.45 \
+		num-iter-0.1.43 \
+		num-rational-0.4.1 \
+		num-traits-0.2.17 \
+		num_cpus-1.16.0 \
+		num_enum-0.5.11 \
+		num_enum_derive-0.5.11 \
+		number_prefix-0.4.0 \
+		objc-0.2.7 \
+		object-0.32.2 \
+		object-pool-0.5.4 \
+		object_store-0.7.1 \
+		once_cell-1.19.0 \
+		oorandom-11.1.3 \
+		opendal-0.45.1 \
+		openmetrics-parser-0.4.4 \
+		opensrv-mysql-0.7.0 \
+		openssl-probe-0.1.5 \
+		opentelemetry-0.21.0 \
+		opentelemetry-otlp-0.14.0 \
+		opentelemetry-proto-0.4.0 \
+		opentelemetry-semantic-conventions-0.13.0 \
+		opentelemetry_sdk-0.21.1 \
+		optional-0.5.0 \
+		orc-rust-0.2.43 \
+		ordered-float-2.10.1 \
+		ordered-float-3.9.2 \
+		ordered-float-4.2.0 \
+		ordered-multimap-0.4.3 \
+		ordered-multimap-0.7.1 \
+		os_info-3.7.0 \
+		os_str_bytes-6.6.1 \
+		overload-0.1.1 \
+		packedvec-1.2.4 \
+		pad-0.1.6 \
+		page_size-0.4.2 \
+		parking_lot-0.11.2 \
+		parking_lot-0.12.1 \
+		parking_lot_core-0.8.6 \
+		parking_lot_core-0.9.9 \
+		parquet-47.0.0 \
+		parse-zoneinfo-0.3.0 \
+		paste-1.0.14 \
+		path-slash-0.2.1 \
+		pathdiff-0.2.1 \
+		pbkdf2-0.12.2 \
+		peeking_take_while-0.1.2 \
+		pem-3.0.3 \
+		pem-rfc7468-0.3.1 \
+		pem-rfc7468-0.7.0 \
+		percent-encoding-2.3.1 \
+		permutation-0.4.1 \
+		pest-2.7.5 \
+		pest_derive-2.7.5 \
+		pest_generator-2.7.5 \
+		pest_meta-2.7.5 \
+		petgraph-0.6.4 \
+		pgwire-0.20.0 \
+		phf-0.11.2 \
+		phf_codegen-0.11.2 \
+		phf_generator-0.11.2 \
+		phf_shared-0.10.0 \
+		phf_shared-0.11.2 \
+		pin-project-1.1.3 \
+		pin-project-internal-1.1.3 \
+		pin-project-lite-0.2.13 \
+		pin-utils-0.1.0 \
+		pkcs1-0.3.3 \
+		pkcs1-0.7.5 \
+		pkcs5-0.7.1 \
+		pkcs8-0.8.0 \
+		pkcs8-0.10.2 \
+		pkg-config-0.3.28 \
+		plotters-0.3.5 \
+		plotters-backend-0.3.5 \
+		plotters-svg-0.3.5 \
+		pmutil-0.5.3 \
+		portable-atomic-1.6.0 \
+		postgres-protocol-0.6.6 \
+		postgres-types-0.2.6 \
+		powerfmt-0.2.0 \
+		pprof-0.13.0 \
+		ppv-lite86-0.2.17 \
+		precomputed-hash-0.1.1 \
+		predicates-2.1.5 \
+		predicates-core-1.0.6 \
+		predicates-tree-1.0.9 \
+		prettydiff-0.6.4 \
+		prettyplease-0.1.25 \
+		prettyplease-0.2.15 \
+		proc-macro-crate-1.3.1 \
+		proc-macro-crate-2.0.0 \
+		proc-macro-crate-3.1.0 \
+		proc-macro-error-1.0.4 \
+		proc-macro-error-attr-1.0.4 \
+		proc-macro2-1.0.71 \
+		procfs-0.14.2 \
+		prometheus-0.13.3 \
+		prometheus-static-metric-0.5.1 \
+		promql-parser-0.1.4 \
+		prost-0.11.9 \
+		prost-0.12.3 \
+		prost-build-0.11.9 \
+		prost-build-0.12.3 \
+		prost-derive-0.11.9 \
+		prost-derive-0.12.3 \
+		prost-types-0.11.9 \
+		prost-types-0.12.3 \
+		protobuf-2.28.0 \
+		protobuf-build-0.15.1 \
+		protobuf-codegen-2.28.0 \
+		protobuf-src-1.1.0+21.5 \
+		ptr_meta-0.1.4 \
+		ptr_meta_derive-0.1.4 \
+		pulldown-cmark-0.9.3 \
+		puruspe-0.1.5 \
+		pusherator-0.0.3 \
+		pyo3-0.19.2 \
+		pyo3-build-config-0.19.2 \
+		pyo3-ffi-0.19.2 \
+		pyo3-macros-0.19.2 \
+		pyo3-macros-backend-0.19.2 \
+		quanta-0.11.1 \
+		quick-xml-0.26.0 \
+		quick-xml-0.31.0 \
+		quote-1.0.33 \
+		radium-0.7.0 \
+		radix_trie-0.2.1 \
+		raft-engine-0.4.1 \
+		rand-0.8.5 \
+		rand_chacha-0.3.1 \
+		rand_core-0.6.4 \
+		rand_distr-0.4.3 \
+		raw-cpuid-10.7.0 \
+		raw-window-handle-0.5.2 \
+		rawpointer-0.2.1 \
+		rayon-1.8.0 \
+		rayon-core-1.12.0 \
+		redox_syscall-0.2.16 \
+		redox_syscall-0.4.1 \
+		redox_users-0.4.4 \
+		ref-cast-1.0.21 \
+		ref-cast-impl-1.0.21 \
+		regex-1.10.2 \
+		regex-automata-0.1.10 \
+		regex-automata-0.4.3 \
+		regex-syntax-0.6.29 \
+		regex-syntax-0.7.5 \
+		regex-syntax-0.8.2 \
+		regress-0.7.1 \
+		rend-0.4.1 \
+		reqsign-0.14.9 \
+		reqwest-0.11.23 \
+		result-like-0.4.6 \
+		result-like-derive-0.4.6 \
+		rexpect-0.5.0 \
+		rgb-0.8.37 \
+		ring-0.16.20 \
+		ring-0.17.7 \
+		rkyv-0.7.43 \
+		rkyv_derive-0.7.43 \
+		ron-0.7.1 \
+		rsa-0.6.1 \
+		rsa-0.9.6 \
+		rskafka-0.5.0 \
+		rstest-0.17.0 \
+		rstest_macros-0.17.0 \
+		rstest_reuse-0.5.0 \
+		rust-embed-6.8.1 \
+		rust-embed-impl-6.8.1 \
+		rust-embed-utils-7.8.1 \
+		rust-ini-0.18.0 \
+		rust-ini-0.20.0 \
+		rust-sitter-0.3.4 \
+		rust-sitter-common-0.3.4 \
+		rust-sitter-macro-0.3.4 \
+		rust-sitter-tool-0.3.4 \
+		rust_decimal-1.33.1 \
+		rustc-demangle-0.1.23 \
+		rustc-hash-1.1.0 \
+		rustc_version-0.4.0 \
+		rustix-0.36.17 \
+		rustix-0.38.28 \
+		rustls-0.20.9 \
+		rustls-0.21.10 \
+		rustls-0.22.1 \
+		rustls-native-certs-0.6.3 \
+		rustls-pemfile-1.0.4 \
+		rustls-pemfile-2.0.0 \
+		rustls-pki-types-1.1.0 \
+		rustls-webpki-0.101.7 \
+		rustls-webpki-0.102.0 \
+		rustversion-1.0.14 \
+		rustyline-10.1.1 \
+		rustyline-11.0.0 \
+		ryu-1.0.16 \
+		safe-lock-0.1.3 \
+		safe-proc-macro2-1.0.67 \
+		safe-quote-1.0.15 \
+		safe-regex-0.2.5 \
+		safe-regex-compiler-0.2.5 \
+		safe-regex-macro-0.2.5 \
+		safe_arch-0.7.1 \
+		salsa20-0.10.2 \
+		same-file-1.0.6 \
+		saturating-0.1.0 \
+		schannel-0.1.22 \
+		schemars-0.8.16 \
+		schemars_derive-0.8.16 \
+		scopeguard-1.2.0 \
+		scrypt-0.11.0 \
+		sct-0.7.1 \
+		seahash-4.1.0 \
+		sealed-0.5.0 \
+		secrecy-0.8.0 \
+		security-framework-2.9.2 \
+		security-framework-sys-2.9.1 \
+		semver-1.0.20 \
+		seq-macro-0.3.5 \
+		serde-1.0.193 \
+		serde_derive-1.0.193 \
+		serde_derive_internals-0.26.0 \
+		serde_json-1.0.108 \
+		serde_path_to_error-0.1.14 \
+		serde_repr-0.1.17 \
+		serde_spanned-0.6.5 \
+		serde_tokenstream-0.2.0 \
+		serde_urlencoded-0.7.1 \
+		serde_with-3.4.0 \
+		serde_with_macros-3.4.0 \
+		serde_yaml-0.9.29 \
+		sha-1-0.10.1 \
+		sha1-0.10.6 \
+		sha2-0.10.8 \
+		sha3-0.10.8 \
+		sharded-slab-0.1.7 \
+		shlex-1.3.0 \
+		signal-hook-registry-1.4.1 \
+		signature-2.2.0 \
+		simba-0.6.0 \
+		simdutf8-0.1.4 \
+		simple_asn1-0.6.2 \
+		siphasher-0.3.11 \
+		skeptic-0.13.7 \
+		slab-0.4.9 \
+		slotmap-1.0.7 \
+		smallbitvec-2.5.1 \
+		smallvec-1.11.2 \
+		snafu-0.7.5 \
+		snafu-derive-0.7.5 \
+		snap-1.1.1 \
+		socket2-0.4.10 \
+		socket2-0.5.5 \
+		sparsevec-0.1.4 \
+		spin-0.5.2 \
+		spin-0.9.8 \
+		spki-0.5.4 \
+		spki-0.7.3 \
+		sqlformat-0.2.3 \
+		sqlness-0.5.0 \
+		sqlparser-0.38.0 \
+		sqlparser_derive-0.1.1 \
+		sqlx-0.6.3 \
+		sqlx-core-0.6.3 \
+		sqlx-macros-0.6.3 \
+		sqlx-rt-0.6.3 \
+		sre-engine-0.4.3 \
+		stable_deref_trait-1.2.0 \
+		static_assertions-1.1.0 \
+		statrs-0.16.0 \
+		stats-cli-3.0.1 \
+		str-buf-1.0.6 \
+		str_stack-0.1.0 \
+		streaming-stats-0.2.3 \
+		strfmt-0.2.4 \
+		string_cache-0.8.7 \
+		stringprep-0.1.4 \
+		strsim-0.8.0 \
+		strsim-0.10.0 \
+		strum-0.24.1 \
+		strum-0.25.0 \
+		strum_macros-0.24.3 \
+		strum_macros-0.25.3 \
+		subprocess-0.2.9 \
+		substrait-0.17.1 \
+		subtle-2.5.0 \
+		symbolic-common-12.8.0 \
+		symbolic-demangle-12.8.0 \
+		syn-1.0.109 \
+		syn-2.0.43 \
+		syn-ext-0.4.0 \
+		syn-inline-mod-0.5.0 \
+		syn_derive-0.1.8 \
+		sync_wrapper-0.1.2 \
+		sysinfo-0.30.5 \
+		system-configuration-0.5.1 \
+		system-configuration-sys-0.5.0 \
+		tagptr-0.2.0 \
+		tap-1.0.1 \
+		target-lexicon-0.12.12 \
+		temp-env-0.3.6 \
+		tempfile-3.8.1 \
+		term-0.7.0 \
+		termcolor-1.4.0 \
+		termios-0.3.3 \
+		termtree-0.4.1 \
+		textwrap-0.11.0 \
+		textwrap-0.15.2 \
+		textwrap-0.16.0 \
+		thiserror-1.0.51 \
+		thiserror-impl-1.0.51 \
+		thread-id-4.2.1 \
+		thread_local-1.1.7 \
+		thrift-0.17.0 \
+		tikv-jemalloc-ctl-0.5.4 \
+		tikv-jemalloc-sys-0.5.4+5.3.0-patched \
+		tikv-jemallocator-0.5.4 \
+		time-0.3.31 \
+		time-core-0.1.2 \
+		time-macros-0.2.16 \
+		timsort-0.1.3 \
+		tiny-keccak-2.0.2 \
+		tiny_http-0.12.0 \
+		tinytemplate-1.2.1 \
+		tinyvec-1.6.0 \
+		tinyvec_macros-0.1.1 \
+		tokio-1.35.1 \
+		tokio-io-timeout-1.2.0 \
+		tokio-macros-2.2.0 \
+		tokio-metrics-0.3.1 \
+		tokio-metrics-collector-0.2.1 \
+		tokio-postgres-0.7.10 \
+		tokio-postgres-rustls-0.11.1 \
+		tokio-rustls-0.23.4 \
+		tokio-rustls-0.24.1 \
+		tokio-rustls-0.25.0 \
+		tokio-stream-0.1.14 \
+		tokio-test-0.4.3 \
+		tokio-util-0.7.10 \
+		toml-0.5.11 \
+		toml-0.8.8 \
+		toml_datetime-0.6.5 \
+		toml_edit-0.19.15 \
+		toml_edit-0.20.7 \
+		toml_edit-0.21.0 \
+		tonic-0.9.2 \
+		tonic-0.10.2 \
+		tonic-build-0.9.2 \
+		tonic-build-0.10.2 \
+		tonic-reflection-0.10.2 \
+		tower-0.4.13 \
+		tower-http-0.4.4 \
+		tower-layer-0.3.2 \
+		tower-service-0.3.2 \
+		tracing-0.1.40 \
+		tracing-appender-0.2.3 \
+		tracing-attributes-0.1.27 \
+		tracing-core-0.1.32 \
+		tracing-log-0.1.4 \
+		tracing-log-0.2.0 \
+		tracing-opentelemetry-0.22.0 \
+		tracing-subscriber-0.3.18 \
+		tree-sitter-0.20.10 \
+		tree-sitter-c2rust-0.20.10 \
+		tree-sitter-cli-0.20.8 \
+		tree-sitter-config-0.19.0 \
+		tree-sitter-highlight-0.20.1 \
+		tree-sitter-loader-0.20.0 \
+		tree-sitter-tags-0.20.2 \
+		triomphe-0.1.11 \
+		try-lock-0.2.5 \
+		try_from-0.3.2 \
+		twox-hash-1.6.3 \
+		typenum-1.17.0 \
+		typetag-0.2.14 \
+		typetag-impl-0.2.14 \
+		typify-0.0.14 \
+		typify-impl-0.0.14 \
+		typify-macro-0.0.14 \
+		ucd-0.1.1 \
+		ucd-trie-0.1.6 \
+		uname-0.1.1 \
+		unic-char-property-0.9.0 \
+		unic-char-range-0.9.0 \
+		unic-common-0.9.0 \
+		unic-emoji-char-0.9.0 \
+		unic-normal-0.9.0 \
+		unic-ucd-age-0.9.0 \
+		unic-ucd-bidi-0.9.0 \
+		unic-ucd-category-0.9.0 \
+		unic-ucd-hangul-0.9.0 \
+		unic-ucd-ident-0.9.0 \
+		unic-ucd-normal-0.9.0 \
+		unic-ucd-version-0.9.0 \
+		unicase-2.7.0 \
+		unicode-bidi-0.3.14 \
+		unicode-casing-0.1.0 \
+		unicode-ident-1.0.12 \
+		unicode-normalization-0.1.22 \
+		unicode-segmentation-1.10.1 \
+		unicode-width-0.1.11 \
+		unicode-xid-0.2.4 \
+		unicode_categories-0.1.1 \
+		unindent-0.1.11 \
+		unsafe-libyaml-0.2.10 \
+		untrusted-0.7.1 \
+		untrusted-0.9.0 \
+		url-2.5.0 \
+		urlencoding-2.1.3 \
+		utf8-width-0.1.7 \
+		utf8parse-0.2.1 \
+		uuid-1.6.1 \
+		uuid-macro-internal-1.6.1 \
+		valuable-0.1.0 \
+		variadics-0.0.2 \
+		vcpkg-0.2.15 \
+		vec_map-0.8.2 \
+		vergen-7.5.1 \
+		version_check-0.9.4 \
+		vob-3.0.3 \
+		volatile-0.3.0 \
+		walkdir-2.4.0 \
+		want-0.3.1 \
+		wasi-0.11.0+wasi-snapshot-preview1 \
+		wasite-0.1.0 \
+		wasm-bindgen-0.2.89 \
+		wasm-bindgen-backend-0.2.89 \
+		wasm-bindgen-futures-0.4.39 \
+		wasm-bindgen-macro-0.2.89 \
+		wasm-bindgen-macro-support-0.2.89 \
+		wasm-bindgen-shared-0.2.89 \
+		wasm-streams-0.3.0 \
+		web-sys-0.3.66 \
+		web-time-0.2.4 \
+		webbrowser-0.8.12 \
+		webpki-0.22.4 \
+		webpki-roots-0.22.6 \
+		webpki-roots-0.25.3 \
+		which-4.4.2 \
+		whoami-1.5.1 \
+		wide-0.7.13 \
+		widestring-0.5.1 \
+		winapi-0.3.9 \
+		winapi-i686-pc-windows-gnu-0.4.0 \
+		winapi-util-0.1.6 \
+		winapi-x86_64-pc-windows-gnu-0.4.0 \
+		windows-0.39.0 \
+		windows-0.52.0 \
+		windows-core-0.51.1 \
+		windows-core-0.52.0 \
+		windows-sys-0.45.0 \
+		windows-sys-0.48.0 \
+		windows-sys-0.52.0 \
+		windows-targets-0.42.2 \
+		windows-targets-0.48.5 \
+		windows-targets-0.52.0 \
+		windows_aarch64_gnullvm-0.42.2 \
+		windows_aarch64_gnullvm-0.48.5 \
+		windows_aarch64_gnullvm-0.52.0 \
+		windows_aarch64_msvc-0.39.0 \
+		windows_aarch64_msvc-0.42.2 \
+		windows_aarch64_msvc-0.48.5 \
+		windows_aarch64_msvc-0.52.0 \
+		windows_i686_gnu-0.39.0 \
+		windows_i686_gnu-0.42.2 \
+		windows_i686_gnu-0.48.5 \
+		windows_i686_gnu-0.52.0 \
+		windows_i686_msvc-0.39.0 \
+		windows_i686_msvc-0.42.2 \
+		windows_i686_msvc-0.48.5 \
+		windows_i686_msvc-0.52.0 \
+		windows_x86_64_gnu-0.39.0 \
+		windows_x86_64_gnu-0.42.2 \
+		windows_x86_64_gnu-0.48.5 \
+		windows_x86_64_gnu-0.52.0 \
+		windows_x86_64_gnullvm-0.42.2 \
+		windows_x86_64_gnullvm-0.48.5 \
+		windows_x86_64_gnullvm-0.52.0 \
+		windows_x86_64_msvc-0.39.0 \
+		windows_x86_64_msvc-0.42.2 \
+		windows_x86_64_msvc-0.48.5 \
+		windows_x86_64_msvc-0.52.0 \
+		winnow-0.5.30 \
+		winreg-0.10.1 \
+		winreg-0.50.0 \
+		wyz-0.5.1 \
+		x509-certificate-0.23.1 \
+		xml-rs-0.8.19 \
+		xz2-0.1.7 \
+		yaml-rust-0.4.5 \
+		zerocopy-0.7.32 \
+		zerocopy-derive-0.7.32 \
+		zeroize-1.7.0 \
+		zeroize_derive-1.4.2 \
+		zigzag-0.1.0 \
+		zstd-0.11.2+zstd.1.5.2 \
+		zstd-0.12.4 \
+		zstd-0.13.0 \
+		zstd-safe-5.0.2+zstd.1.5.2 \
+		zstd-safe-6.0.6 \
+		zstd-safe-7.0.0 \
+		zstd-sys-2.0.9+zstd.1.5.5 \
+		meter-core,meter-macros@git+https://github.com/GreptimeTeam/greptime-meter.git?rev=80b72716dcde47ec4161478416a5c6c21343364d\#80b72716dcde47ec4161478416a5c6c21343364d \
+		sqlparser,sqlparser_derive@git+https://github.com/GreptimeTeam/sqlparser-rs.git?rev=6a93567ae38d42be5c8d08b13c8ff4dde26502ef\#6a93567ae38d42be5c8d08b13c8ff4dde26502ef \
+		datafusion,datafusion-common,datafusion-execution,datafusion-expr,datafusion-optimizer,datafusion-physical-expr,datafusion-physical-plan,datafusion-sql,datafusion-substrait@git+https://github.com/apache/arrow-datafusion.git?rev=26e43acac3a96cec8dd4c8365f22dfb1a84306e9\#26e43acac3a96cec8dd4c8365f22dfb1a84306e9 \
+		influxdb_line_protocol@git+https://github.com/evenyag/influxdb_iox?branch=feat/line-protocol\#10ef0d0b02705ac7518717390939fa3a9bcfcacc \
+		rustpython-doc@git+https://github.com/RustPython/__doc__?branch=main\#8b62ce5d796d68a091969c9fa5406276cb483f79 \
+		rustpython-ast,rustpython-codegen,rustpython-common,rustpython-compiler,rustpython-compiler-core,rustpython-derive,rustpython-derive-impl,rustpython-parser,rustpython-pylib,rustpython-stdlib,rustpython-vm@git+https://github.com/discord9/RustPython?rev=9ed5137412\#9ed51374125b5f1a9e5cee5dd7e27023b8591f1e \
+		unicode_names2@git+https://github.com/youknowone/unicode_names2.git?rev=4ce16aa85cbcdd9cc830410f1a72ef9a235f2fde\#4ce16aa85cbcdd9cc830410f1a72ef9a235f2fde \
+		opentelemetry,opentelemetry-proto,opentelemetry_sdk@git+https://github.com/waynexia/opentelemetry-rust.git?rev=33841b38dda79b15f2024952be5f32533325ca02\#33841b38dda79b15f2024952be5f32533325ca02 \
+		greptime-proto@git+https://github.com/GreptimeTeam/greptime-proto.git?rev=06f6297ff3cab578a1589741b504342fbad70453\#06f6297ff3cab578a1589741b504342fbad70453
+
+USER=		nobody
+GROUP=		nobody
+
+SUB_LIST+=	USER=${USER} GROUP=${GROUP}
+PLIST_SUB+=	USER=${USER} GROUP=${GROUP}
+
+PROGS=		greptime \
+		nyc-taxi \
+		sqlness-runner
+
+do-install:
+	# binaries (workaround for error: found a virtual manifest at `xx` instead of a package manifest)
+.for p in ${PROGS}
+	${INSTALL_PROGRAM} \
+		${WRKDIR}/target/*/release/${p} \
+		${STAGEDIR}${PREFIX}/bin
+.endfor
+	# config files
+	${MKDIR} ${STAGEDIR}${ETCDIR}
+.for name in datanode frontend metasrv standalone
+	${INSTALL_DATA} ${WRKSRC}/config/${name}.example.toml ${STAGEDIR}${ETCDIR}/${name}.toml.sample
+.endfor
+	${REINPLACE_CMD} -i '' -e 's|data_home = "/tmp/greptimedb/"|data_home = "/var/db/greptimedb/"|' ${STAGEDIR}${ETCDIR}/*.toml.sample
+	# RC script
+	${INSTALL_DATA} ${WRKDIR}/greptimedb ${STAGEDIR}/${PREFIX}/etc/rc.d
+	# create dirs
+	${MKDIR} \
+		${STAGEDIR}/var/db/greptimedb \
+		${STAGEDIR}/var/log/greptimedb
+
+.include <bsd.port.mk>
diff --git a/databases/greptimedb/distinfo b/databases/greptimedb/distinfo
new file mode 100644
index 000000000000..2ce06f49d5c2
--- /dev/null
+++ b/databases/greptimedb/distinfo
@@ -0,0 +1,1889 @@
+TIMESTAMP = 1712518474
+SHA256 (rust/crates/Inflector-0.11.4.crate) = fe438c63458706e03479442743baae6c88256498e6431708f6dfc520a26515d3
+SIZE (rust/crates/Inflector-0.11.4.crate) = 17438
+SHA256 (rust/crates/addr2line-0.21.0.crate) = 8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb
+SIZE (rust/crates/addr2line-0.21.0.crate) = 40807
+SHA256 (rust/crates/adler-1.0.2.crate) = f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe
+SIZE (rust/crates/adler-1.0.2.crate) = 12778
+SHA256 (rust/crates/adler32-1.2.0.crate) = aae1277d39aeec15cb388266ecc24b11c80469deae6067e17a1a7aa9e5c1f234
+SIZE (rust/crates/adler32-1.2.0.crate) = 6411
+SHA256 (rust/crates/aes-0.8.4.crate) = b169f7a6d4742236a0a00c541b845991d0ac43e546831af1249753ab4c3aa3a0
+SIZE (rust/crates/aes-0.8.4.crate) = 124812
+SHA256 (rust/crates/ahash-0.7.7.crate) = 5a824f2aa7e75a0c98c5a504fceb80649e9c35265d44525b5f94de4771a395cd
+SIZE (rust/crates/ahash-0.7.7.crate) = 38508
+SHA256 (rust/crates/ahash-0.8.6.crate) = 91429305e9f0a25f6205c5b8e0d2db09e0708a7a6df0f42212bb56c32c8ac97a
+SIZE (rust/crates/ahash-0.8.6.crate) = 42780
+SHA256 (rust/crates/aho-corasick-1.1.2.crate) = b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0
+SIZE (rust/crates/aho-corasick-1.1.2.crate) = 183136
+SHA256 (rust/crates/aide-0.9.0.crate) = befdff0b4683a0824fc8719ce639a252d9d62cd89c8d0004c39e2417128c1eb8
+SIZE (rust/crates/aide-0.9.0.crate) = 355790
+SHA256 (rust/crates/alloc-no-stdlib-2.0.4.crate) = cc7bb162ec39d46ab1ca8c77bf72e890535becd1751bb45f64c597edb4c8c6b3
+SIZE (rust/crates/alloc-no-stdlib-2.0.4.crate) = 10105
+SHA256 (rust/crates/alloc-stdlib-0.2.2.crate) = 94fb8275041c72129eb51b7d0322c29b8387a0386127718b096429201a5d6ece
+SIZE (rust/crates/alloc-stdlib-0.2.2.crate) = 6693
+SHA256 (rust/crates/allocator-api2-0.2.16.crate) = 0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5
+SIZE (rust/crates/allocator-api2-0.2.16.crate) = 59025
+SHA256 (rust/crates/android-tzdata-0.1.1.crate) = e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0
+SIZE (rust/crates/android-tzdata-0.1.1.crate) = 7674
+SHA256 (rust/crates/android_system_properties-0.1.5.crate) = 819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311
+SIZE (rust/crates/android_system_properties-0.1.5.crate) = 5243
+SHA256 (rust/crates/anes-0.1.6.crate) = 4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299
+SIZE (rust/crates/anes-0.1.6.crate) = 23857
+SHA256 (rust/crates/ansi_term-0.12.1.crate) = d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2
+SIZE (rust/crates/ansi_term-0.12.1.crate) = 24838
+SHA256 (rust/crates/anstream-0.6.5.crate) = d664a92ecae85fd0a7392615844904654d1d5f5514837f471ddef4a057aba1b6
+SIZE (rust/crates/anstream-0.6.5.crate) = 30004
+SHA256 (rust/crates/anstyle-1.0.4.crate) = 7079075b41f533b8c61d2a4d073c4676e1f8b249ff94a393b0595db304e0dd87
+SIZE (rust/crates/anstyle-1.0.4.crate) = 13998
+SHA256 (rust/crates/anstyle-parse-0.2.3.crate) = c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c
+SIZE (rust/crates/anstyle-parse-0.2.3.crate) = 24699
+SHA256 (rust/crates/anstyle-query-1.0.2.crate) = e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648
+SIZE (rust/crates/anstyle-query-1.0.2.crate) = 8739
+SHA256 (rust/crates/anstyle-wincon-3.0.2.crate) = 1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7
+SIZE (rust/crates/anstyle-wincon-3.0.2.crate) = 11272
+SHA256 (rust/crates/anyhow-1.0.76.crate) = 59d2a3357dde987206219e78ecfbbb6e8dad06cbb65292758d3270e6254f7355
+SIZE (rust/crates/anyhow-1.0.76.crate) = 44259
+SHA256 (rust/crates/anymap-1.0.0-beta.2.crate) = 8f1f8f5a6f3d50d89e3797d7593a50f96bb2aaa20ca0cc7be1fb673232c91d72
+SIZE (rust/crates/anymap-1.0.0-beta.2.crate) = 13073
+SHA256 (rust/crates/approx-0.5.1.crate) = cab112f0a86d568ea0e627cc1d6be74a1e9cd55214684db5561995f6dad897c6
+SIZE (rust/crates/approx-0.5.1.crate) = 15100
+SHA256 (rust/crates/approx_eq-0.1.8.crate) = b3f9eb837c6a783fbf002e3e5cc7925a3aa6893d6d42f9169517528983777590
+SIZE (rust/crates/approx_eq-0.1.8.crate) = 2722
+SHA256 (rust/crates/aquamarine-0.3.3.crate) = d1da02abba9f9063d786eab1509833ebb2fac0f966862ca59439c76b9c566760
+SIZE (rust/crates/aquamarine-0.3.3.crate) = 2334637
+SHA256 (rust/crates/arbitrary-1.3.2.crate) = 7d5a26814d8dcb93b0e5a0ff3c6d80a8843bafb21b39e8e18a6f05471870e110
+SIZE (rust/crates/arbitrary-1.3.2.crate) = 32037
+SHA256 (rust/crates/arc-swap-1.6.0.crate) = bddcadddf5e9015d310179a59bb28c4d4b9920ad0f11e8e14dbadf654890c9a6
+SIZE (rust/crates/arc-swap-1.6.0.crate) = 67342
+SHA256 (rust/crates/array-init-2.1.0.crate) = 3d62b7694a562cdf5a74227903507c56ab2cc8bdd1f781ed5cb4cf9c9f810bfc
+SIZE (rust/crates/array-init-2.1.0.crate) = 11927
+SHA256 (rust/crates/arrayref-0.3.7.crate) = 6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545
+SIZE (rust/crates/arrayref-0.3.7.crate) = 9620
+SHA256 (rust/crates/arrayvec-0.7.4.crate) = 96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711
+SIZE (rust/crates/arrayvec-0.7.4.crate) = 29856
+SHA256 (rust/crates/arrow-47.0.0.crate) = 7fab9e93ba8ce88a37d5a30dce4b9913b75413dc1ac56cb5d72e5a840543f829
+SIZE (rust/crates/arrow-47.0.0.crate) = 82172
+SHA256 (rust/crates/arrow-arith-47.0.0.crate) = bc1d4e368e87ad9ee64f28b9577a3834ce10fe2703a26b28417d485bbbdff956
+SIZE (rust/crates/arrow-arith-47.0.0.crate) = 31240
+SHA256 (rust/crates/arrow-array-47.0.0.crate) = d02efa7253ede102d45a4e802a129e83bcc3f49884cab795b1ac223918e4318d
+SIZE (rust/crates/arrow-array-47.0.0.crate) = 156682
+SHA256 (rust/crates/arrow-buffer-47.0.0.crate) = fda119225204141138cb0541c692fbfef0e875ba01bfdeaed09e9d354f9d6195
+SIZE (rust/crates/arrow-buffer-47.0.0.crate) = 54683
+SHA256 (rust/crates/arrow-cast-47.0.0.crate) = 1d825d51b9968868d50bc5af92388754056796dbc62a4e25307d588a1fc84dee
+SIZE (rust/crates/arrow-cast-47.0.0.crate) = 64760
+SHA256 (rust/crates/arrow-csv-47.0.0.crate) = 43ef855dc6b126dc197f43e061d4de46b9d4c033aa51c2587657f7508242cef1
+SIZE (rust/crates/arrow-csv-47.0.0.crate) = 23497
+SHA256 (rust/crates/arrow-data-47.0.0.crate) = 475a4c3699c8b4095ca61cecf15da6f67841847a5f5aac983ccb9a377d02f73a
+SIZE (rust/crates/arrow-data-47.0.0.crate) = 41442
+SHA256 (rust/crates/arrow-flight-47.0.0.crate) = cd938ea4a0e8d0db2b9f47ebba792f73f6188f4289707caeaf93a3be705e5ed5
+SIZE (rust/crates/arrow-flight-47.0.0.crate) = 122738
+SHA256 (rust/crates/arrow-ipc-47.0.0.crate) = 1248005c8ac549f869b7a840859d942bf62471479c1a2d82659d453eebcd166a
+SIZE (rust/crates/arrow-ipc-47.0.0.crate) = 75796
+SHA256 (rust/crates/arrow-json-47.0.0.crate) = f03d7e3b04dd688ccec354fe449aed56b831679f03e44ee2c1cfc4045067b69c
+SIZE (rust/crates/arrow-json-47.0.0.crate) = 40857
+SHA256 (rust/crates/arrow-ord-47.0.0.crate) = 03b87aa408ea6a6300e49eb2eba0c032c88ed9dc19e0a9948489c55efdca71f4
+SIZE (rust/crates/arrow-ord-47.0.0.crate) = 38209
+SHA256 (rust/crates/arrow-row-47.0.0.crate) = 114a348ab581e7c9b6908fcab23cb39ff9f060eb19e72b13f8fb8eaa37f65d22
+SIZE (rust/crates/arrow-row-47.0.0.crate) = 24174
+SHA256 (rust/crates/arrow-schema-47.0.0.crate) = 5d1d179c117b158853e0101bfbed5615e86fe97ee356b4af901f1c5001e1ce4b
+SIZE (rust/crates/arrow-schema-47.0.0.crate) = 28771
+SHA256 (rust/crates/arrow-select-47.0.0.crate) = d5c71e003202e67e9db139e5278c79f5520bb79922261dfe140e4637ee8b6108
+SIZE (rust/crates/arrow-select-47.0.0.crate) = 38579
+SHA256 (rust/crates/arrow-string-47.0.0.crate) = c4cebbb282d6b9244895f4a9a912e55e57bce112554c7fa91fcec5459cb421ab
+SIZE (rust/crates/arrow-string-47.0.0.crate) = 22293
+SHA256 (rust/crates/ascii-1.1.0.crate) = d92bec98840b8f03a5ff5413de5293bfcd8bf96467cf5452609f939ec6f5de16
+SIZE (rust/crates/ascii-1.1.0.crate) = 36075
+SHA256 (rust/crates/ascii-canvas-3.0.0.crate) = 8824ecca2e851cec16968d54a01dd372ef8f95b244fb84b84e70128be347c3c6
+SIZE (rust/crates/ascii-canvas-3.0.0.crate) = 10575
+SHA256 (rust/crates/async-channel-1.9.0.crate) = 81953c529336010edd6d8e358f886d9581267795c61b19475b71314bffa46d35
+SIZE (rust/crates/async-channel-1.9.0.crate) = 13664
+SHA256 (rust/crates/async-compression-0.3.15.crate) = 942c7cd7ae39e91bde4820d74132e9862e62c2f386c3aa90ccf55949f5bad63a
+SIZE (rust/crates/async-compression-0.3.15.crate) = 58241
+SHA256 (rust/crates/async-compression-0.4.5.crate) = bc2d0cfb2a7388d34f590e76686704c494ed7aaceed62ee1ba35cbf363abc2a5
+SIZE (rust/crates/async-compression-0.4.5.crate) = 99222
+SHA256 (rust/crates/async-lock-2.8.0.crate) = 287272293e9d8c41773cec55e365490fe034813a2f172f502d6ddcf75b2f582b
+SIZE (rust/crates/async-lock-2.8.0.crate) = 29944
+SHA256 (rust/crates/async-recursion-1.0.5.crate) = 5fd55a5ba1179988837d24ab4c7cc8ed6efdeff578ede0416b4225a5fca35bd0
+SIZE (rust/crates/async-recursion-1.0.5.crate) = 11890
+SHA256 (rust/crates/async-stream-0.3.5.crate) = cd56dd203fef61ac097dd65721a419ddccb106b2d2b70ba60a6b529f03961a51
+SIZE (rust/crates/async-stream-0.3.5.crate) = 11916
+SHA256 (rust/crates/async-stream-impl-0.3.5.crate) = 16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193
+SIZE (rust/crates/async-stream-impl-0.3.5.crate) = 4173
+SHA256 (rust/crates/async-trait-0.1.75.crate) = fdf6721fb0140e4f897002dd086c06f6c27775df19cfe1fccb21181a48fd2c98
+SIZE (rust/crates/async-trait-0.1.75.crate) = 29209
+SHA256 (rust/crates/asynchronous-codec-0.7.0.crate) = a860072022177f903e59730004fb5dc13db9275b79bb2aef7ba8ce831956c233
+SIZE (rust/crates/asynchronous-codec-0.7.0.crate) = 14271
+SHA256 (rust/crates/atoi-1.0.0.crate) = d7c57d12312ff59c811c0643f4d80830505833c9ffaebd193d819392b265be8e
+SIZE (rust/crates/atoi-1.0.0.crate) = 7768
+SHA256 (rust/crates/atomic-0.5.3.crate) = c59bdb34bc650a32731b31bd8f0829cc15d24a708ee31559e0bb34f2bc320cba
+SIZE (rust/crates/atomic-0.5.3.crate) = 12801
+SHA256 (rust/crates/atty-0.2.14.crate) = d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8
+SIZE (rust/crates/atty-0.2.14.crate) = 5470
+SHA256 (rust/crates/auto_impl-1.1.0.crate) = fee3da8ef1276b0bee5dd1c7258010d8fffd31801447323115a25560e1327b89
+SIZE (rust/crates/auto_impl-1.1.0.crate) = 31243
+SHA256 (rust/crates/auto_ops-0.3.0.crate) = 7460f7dd8e100147b82a63afca1a20eb6c231ee36b90ba7272e14951cb58af59
+SIZE (rust/crates/auto_ops-0.3.0.crate) = 9343
+SHA256 (rust/crates/autocfg-1.1.0.crate) = d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa
+SIZE (rust/crates/autocfg-1.1.0.crate) = 13272
+SHA256 (rust/crates/autotools-0.2.6.crate) = aef8da1805e028a172334c3b680f93e71126f2327622faef2ec3d893c0a4ad77
+SIZE (rust/crates/autotools-0.2.6.crate) = 9991
+SHA256 (rust/crates/axum-0.6.20.crate) = 3b829e4e32b91e643de6eafe82b1d90675f5874230191a4ffbc1b336dec4d6bf
+SIZE (rust/crates/axum-0.6.20.crate) = 146227
+SHA256 (rust/crates/axum-core-0.3.4.crate) = 759fa577a247914fd3f7f76d62972792636412fbfd634cd452f6a385a74d2d2c
+SIZE (rust/crates/axum-core-0.3.4.crate) = 21088
+SHA256 (rust/crates/axum-macros-0.3.8.crate) = cdca6a10ecad987bda04e95606ef85a5417dcaac1a78455242d72e031e2b6b62
+SIZE (rust/crates/axum-macros-0.3.8.crate) = 35948
+SHA256 (rust/crates/axum-test-helper-0.3.0.crate) = 298f62fa902c2515c169ab0bfb56c593229f33faa01131215d58e3d4898e3aa9
+SIZE (rust/crates/axum-test-helper-0.3.0.crate) = 4547
+SHA256 (rust/crates/backon-0.4.1.crate) = 0c1a6197b2120bb2185a267f6515038558b019e92b832bb0320e96d66268dcf9
+SIZE (rust/crates/backon-0.4.1.crate) = 21485
+SHA256 (rust/crates/backtrace-0.3.69.crate) = 2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837
+SIZE (rust/crates/backtrace-0.3.69.crate) = 77299
+SHA256 (rust/crates/base64-0.13.1.crate) = 9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8
+SIZE (rust/crates/base64-0.13.1.crate) = 61002
+SHA256 (rust/crates/base64-0.21.5.crate) = 35636a1494ede3b646cc98f74f8e62c773a38a659ebc777a2cf26b9b74171df9
+SIZE (rust/crates/base64-0.21.5.crate) = 77134
+SHA256 (rust/crates/base64-0.22.0.crate) = 9475866fec1451be56a3c2400fd081ff546538961565ccb5b7142cbd22bc7a51
+SIZE (rust/crates/base64-0.22.0.crate) = 81568
+SHA256 (rust/crates/base64ct-1.6.0.crate) = 8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b
+SIZE (rust/crates/base64ct-1.6.0.crate) = 28870
+SHA256 (rust/crates/bcder-0.7.3.crate) = bf16bec990f8ea25cab661199904ef452fcf11f565c404ce6cffbdf3f8cbbc47
+SIZE (rust/crates/bcder-0.7.3.crate) = 63569
+SHA256 (rust/crates/bigdecimal-0.4.2.crate) = c06619be423ea5bb86c95f087d5707942791a08a85530df0db2209a3ecfb8bc9
+SIZE (rust/crates/bigdecimal-0.4.2.crate) = 60091
+SHA256 (rust/crates/bincode-1.3.3.crate) = b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad
+SIZE (rust/crates/bincode-1.3.3.crate) = 28958
+SHA256 (rust/crates/bindgen-0.69.1.crate) = 9ffcebc3849946a7170a05992aac39da343a90676ab392c51a4280981d6379c2
+SIZE (rust/crates/bindgen-0.69.1.crate) = 219972
+SHA256 (rust/crates/bit-set-0.5.3.crate) = 0700ddab506f33b20a03b13996eccd309a48e5ff77d0d95926aa0210fb4e95f1
+SIZE (rust/crates/bit-set-0.5.3.crate) = 14470
+SHA256 (rust/crates/bit-vec-0.6.3.crate) = 349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb
+SIZE (rust/crates/bit-vec-0.6.3.crate) = 19927
+SHA256 (rust/crates/bitflags-1.3.2.crate) = bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a
+SIZE (rust/crates/bitflags-1.3.2.crate) = 23021
+SHA256 (rust/crates/bitflags-2.4.1.crate) = 327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07
+SIZE (rust/crates/bitflags-2.4.1.crate) = 37043
+SHA256 (rust/crates/bitvec-1.0.1.crate) = 1bc2832c24239b0141d5674bb9174f9d68a8b5b3f2753311927c172ca46f7e9c
+SIZE (rust/crates/bitvec-1.0.1.crate) = 224375
+SHA256 (rust/crates/blake2-0.10.6.crate) = 46502ad458c9a52b69d4d4d32775c788b7a1b85e8bc9d482d92250fc0e3f8efe
+SIZE (rust/crates/blake2-0.10.6.crate) = 47234
+SHA256 (rust/crates/blake3-1.5.0.crate) = 0231f06152bf547e9c2b5194f247cd97aacf6dcd8b15d8e5ec0663f64580da87
+SIZE (rust/crates/blake3-1.5.0.crate) = 168914
+SHA256 (rust/crates/block-buffer-0.10.4.crate) = 3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71
+SIZE (rust/crates/block-buffer-0.10.4.crate) = 10538
+SHA256 (rust/crates/block-padding-0.3.3.crate) = a8894febbff9f758034a5b8e12d87918f56dfc64a8e1fe757d65e29041538d93
+SIZE (rust/crates/block-padding-0.3.3.crate) = 8504
+SHA256 (rust/crates/borsh-1.3.0.crate) = 26d4d6dafc1a3bb54687538972158f07b2c948bc57d5890df22c0739098b3028
+SIZE (rust/crates/borsh-1.3.0.crate) = 59097
+SHA256 (rust/crates/borsh-derive-1.3.0.crate) = bf4918709cc4dd777ad2b6303ed03cb37f3ca0ccede8c1b0d28ac6db8f4710e0
+SIZE (rust/crates/borsh-derive-1.3.0.crate) = 29092
+SHA256 (rust/crates/brotli-3.4.0.crate) = 516074a47ef4bce09577a3b379392300159ce5b1ba2e501ff1c819950066100f
+SIZE (rust/crates/brotli-3.4.0.crate) = 1362057
+SHA256 (rust/crates/brotli-decompressor-2.5.1.crate) = 4e2e4afe60d7dd600fdd3de8d0f08c2b7ec039712e3b6137ff98b7004e82de4f
+SIZE (rust/crates/brotli-decompressor-2.5.1.crate) = 193087
+SHA256 (rust/crates/bstr-0.2.17.crate) = ba3569f383e8f1598449f1a423e72e99569137b47740b1da11ef19af3d5c3223
+SIZE (rust/crates/bstr-0.2.17.crate) = 330350
+SHA256 (rust/crates/btoi-0.4.3.crate) = 9dd6407f73a9b8b6162d8a2ef999fe6afd7cc15902ebf42c5cd296addf17e0ad
+SIZE (rust/crates/btoi-0.4.3.crate) = 10007
+SHA256 (rust/crates/build-data-0.1.5.crate) = aed3884e2cab7c973c8fd2d150314b6a932df7fdc830edcaf1e8e7c4ae9db3c0
+SIZE (rust/crates/build-data-0.1.5.crate) = 15886
+SHA256 (rust/crates/bumpalo-3.14.0.crate) = 7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec
+SIZE (rust/crates/bumpalo-3.14.0.crate) = 82400
+SHA256 (rust/crates/bytecheck-0.6.11.crate) = 8b6372023ac861f6e6dc89c8344a8f398fb42aaba2b5dbc649ca0c0e9dbcb627
+SIZE (rust/crates/bytecheck-0.6.11.crate) = 8300
+SHA256 (rust/crates/bytecheck_derive-0.6.11.crate) = a7ec4c6f261935ad534c0c22dbef2201b45918860eb1c574b972bd213a76af61
+SIZE (rust/crates/bytecheck_derive-0.6.11.crate) = 5476
+SHA256 (rust/crates/bytecount-0.6.7.crate) = e1e5f035d16fc623ae5f74981db80a439803888314e3a555fd6f04acd51a3205
+SIZE (rust/crates/bytecount-0.6.7.crate) = 14642
+SHA256 (rust/crates/bytemuck-1.14.0.crate) = 374d28ec25809ee0e23827c2ab573d729e293f281dfe393500e7ad618baa61c6
+SIZE (rust/crates/bytemuck-1.14.0.crate) = 44933
+SHA256 (rust/crates/byteorder-1.5.0.crate) = 1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b
+SIZE (rust/crates/byteorder-1.5.0.crate) = 23288
+SHA256 (rust/crates/bytes-1.5.0.crate) = a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223
+SIZE (rust/crates/bytes-1.5.0.crate) = 58909
+SHA256 (rust/crates/bzip2-0.4.4.crate) = bdb116a6ef3f6c3698828873ad02c3014b3c85cadb88496095628e3ef1e347f8
+SIZE (rust/crates/bzip2-0.4.4.crate) = 34197
+SHA256 (rust/crates/bzip2-sys-0.1.11+1.0.8.crate) = 736a955f3fa7875102d57c82b8cac37ec45224a07fd32d58f9f7a186b6cd4cdc
+SIZE (rust/crates/bzip2-sys-0.1.11+1.0.8.crate) = 633444
+SHA256 (rust/crates/c2rust-bitfields-0.3.0.crate) = eb34f0c0ace43530b2df7f18bc69ee0c4082158aa451ece29602f8c841e73764
+SIZE (rust/crates/c2rust-bitfields-0.3.0.crate) = 5886
+SHA256 (rust/crates/c2rust-bitfields-derive-0.2.1.crate) = 3dd1601a7b828ab874d890e5a895563ca8ad485bdd3d2a359f148c8b72537241
+SIZE (rust/crates/c2rust-bitfields-derive-0.2.1.crate) = 3621
+SHA256 (rust/crates/cactus-1.0.6.crate) = cf034765b7d19a011c6d619e880582bf95e8186b580e6fab56589872dd87dcf5
+SIZE (rust/crates/cactus-1.0.6.crate) = 6753
+SHA256 (rust/crates/camino-1.1.6.crate) = c59e92b5a388f549b863a7bea62612c09f24c8393560709a54558a9abdfb3b9c
+SIZE (rust/crates/camino-1.1.6.crate) = 30519
+SHA256 (rust/crates/cargo-platform-0.1.5.crate) = e34637b3140142bdf929fb439e8aa4ebad7651ebf7b1080b3930aa16ac1459ff
+SIZE (rust/crates/cargo-platform-0.1.5.crate) = 11638
+SHA256 (rust/crates/cargo_metadata-0.14.2.crate) = 4acbb09d9ee8e23699b9634375c72795d095bf268439da88562cf9b501f181fa
+SIZE (rust/crates/cargo_metadata-0.14.2.crate) = 17469
+SHA256 (rust/crates/caseless-0.2.1.crate) = 808dab3318747be122cb31d36de18d4d1c81277a76f8332a02b81a3d73463d7f
+SIZE (rust/crates/caseless-0.2.1.crate) = 18826
+SHA256 (rust/crates/cast-0.3.0.crate) = 37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5
+SIZE (rust/crates/cast-0.3.0.crate) = 11452
+SHA256 (rust/crates/cbc-0.1.2.crate) = 26b52a9543ae338f279b96b0b9fed9c8093744685043739079ce85cd58f289a6
+SIZE (rust/crates/cbc-0.1.2.crate) = 23501
+SHA256 (rust/crates/cc-1.0.83.crate) = f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0
+SIZE (rust/crates/cc-1.0.83.crate) = 68343
+SHA256 (rust/crates/cc-traits-2.0.0.crate) = 060303ef31ef4a522737e1b1ab68c67916f2a787bb2f4f54f383279adba962b5
+SIZE (rust/crates/cc-traits-2.0.0.crate) = 18857
+SHA256 (rust/crates/cesu8-1.1.0.crate) = 6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c
+SIZE (rust/crates/cesu8-1.1.0.crate) = 10555
+SHA256 (rust/crates/cexpr-0.6.0.crate) = 6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766
+SIZE (rust/crates/cexpr-0.6.0.crate) = 17966
+SHA256 (rust/crates/cfg-if-0.1.10.crate) = 4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822
+SIZE (rust/crates/cfg-if-0.1.10.crate) = 7933
+SHA256 (rust/crates/cfg-if-1.0.0.crate) = baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd
+SIZE (rust/crates/cfg-if-1.0.0.crate) = 7934
+SHA256 (rust/crates/cfg_aliases-0.1.1.crate) = fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e
+SIZE (rust/crates/cfg_aliases-0.1.1.crate) = 6009
+SHA256 (rust/crates/cfgrammar-0.12.0.crate) = bf74ea341ae8905eac9a234b6a5a845e118c25bbbdecf85ec77431a8b3bfa0be
+SIZE (rust/crates/cfgrammar-0.12.0.crate) = 27706
+SHA256 (rust/crates/chrono-0.4.33.crate) = 9f13690e35a5e4ace198e7beea2895d29f3a9cc55015fcebe6336bd2010af9eb
+SIZE (rust/crates/chrono-0.4.33.crate) = 221279
+SHA256 (rust/crates/chrono-tz-0.8.4.crate) = e23185c0e21df6ed832a12e2bda87c7d1def6842881fb634a8511ced741b0d76
+SIZE (rust/crates/chrono-tz-0.8.4.crate) = 614717
+SHA256 (rust/crates/chrono-tz-build-0.2.1.crate) = 433e39f13c9a060046954e0592a8d0a4bcb1040125cbf91cb8ee58964cfb350f
+SIZE (rust/crates/chrono-tz-build-0.2.1.crate) = 10421
+SHA256 (rust/crates/chunked_transfer-1.5.0.crate) = 6e4de3bc4ea267985becf712dc6d9eed8b04c953b3fcfb339ebc87acd9804901
+SIZE (rust/crates/chunked_transfer-1.5.0.crate) = 9779
+SHA256 (rust/crates/ciborium-0.2.1.crate) = effd91f6c78e5a4ace8a5d3c0b6bfaec9e2baaef55f3efc00e45fb2e477ee926
+SIZE (rust/crates/ciborium-0.2.1.crate) = 34974
+SHA256 (rust/crates/ciborium-io-0.2.1.crate) = cdf919175532b369853f5d5e20b26b43112613fd6fe7aee757e35f7a44642656
+SIZE (rust/crates/ciborium-io-0.2.1.crate) = 6679
+SHA256 (rust/crates/ciborium-ll-0.2.1.crate) = defaa24ecc093c77630e6c15e17c51f5e187bf35ee514f4e2d67baaa96dae22b
+SIZE (rust/crates/ciborium-ll-0.2.1.crate) = 14649
+SHA256 (rust/crates/cipher-0.4.4.crate) = 773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad
+SIZE (rust/crates/cipher-0.4.4.crate) = 19073
+SHA256 (rust/crates/clang-sys-1.6.1.crate) = c688fc74432808e3eb684cae8830a86be1d66a2bd58e1f248ed0960a590baf6f
+SIZE (rust/crates/clang-sys-1.6.1.crate) = 41346
+SHA256 (rust/crates/clap-2.34.0.crate) = a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c
+SIZE (rust/crates/clap-2.34.0.crate) = 202210
+SHA256 (rust/crates/clap-3.2.25.crate) = 4ea181bf566f71cb9a5d17a59e1871af638180a18fb0035c92ae62b705207123
+SIZE (rust/crates/clap-3.2.25.crate) = 219403
+SHA256 (rust/crates/clap-4.4.11.crate) = bfaff671f6b22ca62406885ece523383b9b64022e341e53e009a62ebc47a45f2
+SIZE (rust/crates/clap-4.4.11.crate) = 54782
+SHA256 (rust/crates/clap_builder-4.4.11.crate) = a216b506622bb1d316cd51328dce24e07bdff4a6128a47c7e7fad11878d5adbb
+SIZE (rust/crates/clap_builder-4.4.11.crate) = 163317
+SHA256 (rust/crates/clap_derive-4.4.7.crate) = cf9804afaaf59a91e75b022a30fb7229a7901f60c755489cc61c9b423b836442
+SIZE (rust/crates/clap_derive-4.4.7.crate) = 29046
+SHA256 (rust/crates/clap_lex-0.2.4.crate) = 2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5
+SIZE (rust/crates/clap_lex-0.2.4.crate) = 9652
+SHA256 (rust/crates/clap_lex-0.6.0.crate) = 702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1
+SIZE (rust/crates/clap_lex-0.6.0.crate) = 12272
+SHA256 (rust/crates/clipboard-win-4.5.0.crate) = 7191c27c2357d9b7ef96baac1773290d4ca63b24205b82a3fd8a0637afcf0362
+SIZE (rust/crates/clipboard-win-4.5.0.crate) = 13476
+SHA256 (rust/crates/cmake-0.1.50.crate) = a31c789563b815f77f4250caee12365734369f942439b7defd71e18a48197130
+SIZE (rust/crates/cmake-0.1.50.crate) = 16748
+SHA256 (rust/crates/colorchoice-1.0.0.crate) = acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7
+SIZE (rust/crates/colorchoice-1.0.0.crate) = 6857
+SHA256 (rust/crates/combine-4.6.6.crate) = 35ed6e9d84f0b51a7f52daf1c7d71dd136fd7a3f41a8462b8cdb8c78d920fad4
+SIZE (rust/crates/combine-4.6.6.crate) = 132428
+SHA256 (rust/crates/comfy-table-7.1.0.crate) = 7c64043d6c7b7a4c58e39e7efccfdea7b93d885a795d0c054a69dbbf4dd52686
+SIZE (rust/crates/comfy-table-7.1.0.crate) = 72879
+SHA256 (rust/crates/comma-1.0.0.crate) = 55b672471b4e9f9e95499ea597ff64941a309b2cdbffcc46f2cc5e2d971fd335
+SIZE (rust/crates/comma-1.0.0.crate) = 2457
+SHA256 (rust/crates/concurrent-queue-2.4.0.crate) = d16048cd947b08fa32c24458a22f5dc5e835264f689f4f5653210c69fd107363
+SIZE (rust/crates/concurrent-queue-2.4.0.crate) = 20244
+SHA256 (rust/crates/config-0.13.4.crate) = 23738e11972c7643e4ec947840fc463b6a571afcd3e735bdfce7d03c7a784aca
+SIZE (rust/crates/config-0.13.4.crate) = 80328
+SHA256 (rust/crates/console-0.15.7.crate) = c926e00cc70edefdc64d3a5ff31cc65bb97a3460097762bd23afb4d8145fccf8
+SIZE (rust/crates/console-0.15.7.crate) = 35409
+SHA256 (rust/crates/console-api-0.5.0.crate) = c2895653b4d9f1538a83970077cb01dfc77a4810524e51a110944688e916b18e
+SIZE (rust/crates/console-api-0.5.0.crate) = 32420
+SHA256 (rust/crates/console-subscriber-0.1.10.crate) = d4cf42660ac07fcebed809cfe561dd8730bcd35b075215e6479c516bcd0d11cb
+SIZE (rust/crates/console-subscriber-0.1.10.crate) = 56045
+SHA256 (rust/crates/const-oid-0.7.1.crate) = e4c78c047431fee22c1a7bb92e00ad095a02a983affe4d8a72e2a2c62c1b94f3
+SIZE (rust/crates/const-oid-0.7.1.crate) = 14022
+SHA256 (rust/crates/const-oid-0.9.6.crate) = c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8
+SIZE (rust/crates/const-oid-0.9.6.crate) = 45382
+SHA256 (rust/crates/const-random-0.1.17.crate) = 5aaf16c9c2c612020bcfd042e170f6e32de9b9d75adb5277cdbbd2e2c8c8299a
+SIZE (rust/crates/const-random-0.1.17.crate) = 6640
+SHA256 (rust/crates/const-random-macro-0.1.16.crate) = f9d839f2a20b0aee515dc581a6172f2321f96cab76c1a38a4c584a194955390e
+SIZE (rust/crates/const-random-macro-0.1.16.crate) = 6657
+SHA256 (rust/crates/constant_time_eq-0.3.0.crate) = f7144d30dcf0fafbce74250a3963025d8d52177934239851c917d29f1df280c2
+SIZE (rust/crates/constant_time_eq-0.3.0.crate) = 11369
+SHA256 (rust/crates/core-foundation-0.9.4.crate) = 91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f
+SIZE (rust/crates/core-foundation-0.9.4.crate) = 27743
+SHA256 (rust/crates/core-foundation-sys-0.8.6.crate) = 06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f
+SIZE (rust/crates/core-foundation-sys-0.8.6.crate) = 37629
+SHA256 (rust/crates/cpp_demangle-0.4.3.crate) = 7e8227005286ec39567949b33df9896bcadfa6051bccca2488129f108ca23119
+SIZE (rust/crates/cpp_demangle-0.4.3.crate) = 78861
+SHA256 (rust/crates/cpufeatures-0.2.11.crate) = ce420fe07aecd3e67c5f910618fe65e94158f6dcc0adf44e00d69ce2bdfe0fd0
+SIZE (rust/crates/cpufeatures-0.2.11.crate) = 12727
+SHA256 (rust/crates/crc-3.0.1.crate) = 86ec7a15cbe22e59248fc7eadb1907dab5ba09372595da4d73dd805ed4417dfe
+SIZE (rust/crates/crc-3.0.1.crate) = 9950
+SHA256 (rust/crates/crc-catalog-2.4.0.crate) = 19d374276b40fb8bbdee95aef7c7fa6b5316ec764510eb64b8dd0e2ed0d7e7f5
+SIZE (rust/crates/crc-catalog-2.4.0.crate) = 10155
+SHA256 (rust/crates/crc32c-0.6.4.crate) = d8f48d60e5b4d2c53d5c2b1d8a58c849a70ae5e5509b08a48d047e3b65714a74
+SIZE (rust/crates/crc32c-0.6.4.crate) = 9661
+SHA256 (rust/crates/crc32fast-1.3.2.crate) = b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d
+SIZE (rust/crates/crc32fast-1.3.2.crate) = 38661
+SHA256 (rust/crates/criterion-0.4.0.crate) = e7c76e09c1aae2bc52b3d2f29e13c6572553b30c4aa1b8a49fd70de6412654cb
+SIZE (rust/crates/criterion-0.4.0.crate) = 108978
+SHA256 (rust/crates/criterion-plot-0.5.0.crate) = 6b50826342786a51a89e2da3a28f1c32b06e387201bc2d19791f622c673706b1
+SIZE (rust/crates/criterion-plot-0.5.0.crate) = 22706
+SHA256 (rust/crates/crossbeam-0.8.3.crate) = 6eb9105919ca8e40d437fc9cbb8f1975d916f1bd28afe795a48aae32a2cc8920
+SIZE (rust/crates/crossbeam-0.8.3.crate) = 10512
+SHA256 (rust/crates/crossbeam-channel-0.5.10.crate) = 82a9b73a36529d9c47029b9fb3a6f0ea3cc916a261195352ba19e770fc1748b2
+SIZE (rust/crates/crossbeam-channel-0.5.10.crate) = 90442
+SHA256 (rust/crates/crossbeam-deque-0.8.4.crate) = fca89a0e215bab21874660c67903c5f143333cab1da83d041c7ded6053774751
+SIZE (rust/crates/crossbeam-deque-0.8.4.crate) = 21752
+SHA256 (rust/crates/crossbeam-epoch-0.9.17.crate) = 0e3681d554572a651dda4186cd47240627c3d0114d45a95f6ad27f2f22e7548d
+SIZE (rust/crates/crossbeam-epoch-0.9.17.crate) = 46953
+SHA256 (rust/crates/crossbeam-queue-0.3.10.crate) = adc6598521bb5a83d491e8c1fe51db7296019d2ca3cb93cc6c2a20369a4d78a2
+SIZE (rust/crates/crossbeam-queue-0.3.10.crate) = 15595
+SHA256 (rust/crates/crossbeam-utils-0.8.18.crate) = c3a430a770ebd84726f584a90ee7f020d28db52c6d02138900f22341f866d39c
+SIZE (rust/crates/crossbeam-utils-0.8.18.crate) = 42383
+SHA256 (rust/crates/crunchy-0.2.2.crate) = 7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7
+SIZE (rust/crates/crunchy-0.2.2.crate) = 2995
+SHA256 (rust/crates/crypto-bigint-0.3.2.crate) = 03c6a1d5fa1de37e071642dfa44ec552ca5b299adb128fab16138e24b548fd21
+SIZE (rust/crates/crypto-bigint-0.3.2.crate) = 38857
+SHA256 (rust/crates/crypto-common-0.1.6.crate) = 1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3
+SIZE (rust/crates/crypto-common-0.1.6.crate) = 8760
+SHA256 (rust/crates/csv-1.3.0.crate) = ac574ff4d437a7b5ad237ef331c17ccca63c46479e5b5453eb8e10bb99a759fe
+SIZE (rust/crates/csv-1.3.0.crate) = 888212
+SHA256 (rust/crates/csv-core-0.1.11.crate) = 5efa2b3d7902f4b634a20cae3c9c4e6209dc4779feb6863329607560143efa70
+SIZE (rust/crates/csv-core-0.1.11.crate) = 25852
+SHA256 (rust/crates/darling-0.14.4.crate) = 7b750cb3417fd1b327431a470f388520309479ab0bf5e323505daf0290cd3850
+SIZE (rust/crates/darling-0.14.4.crate) = 25168
+SHA256 (rust/crates/darling-0.20.3.crate) = 0209d94da627ab5605dcccf08bb18afa5009cfbef48d8a8b7d7bdbc79be25c5e
+SIZE (rust/crates/darling-0.20.3.crate) = 26066
+SHA256 (rust/crates/darling_core-0.14.4.crate) = 109c1ca6e6b7f82cc233a97004ea8ed7ca123a9af07a8230878fcfda9b158bf0
+SIZE (rust/crates/darling_core-0.14.4.crate) = 57485
+SHA256 (rust/crates/darling_core-0.20.3.crate) = 177e3443818124b357d8e76f53be906d60937f0d3a90773a664fa63fa253e621
+SIZE (rust/crates/darling_core-0.20.3.crate) = 60281
+SHA256 (rust/crates/darling_macro-0.14.4.crate) = a4aab4dbc9f7611d8b55048a3a16d2d010c2c8334e46304b40ac1cc14bf3b48e
+SIZE (rust/crates/darling_macro-0.14.4.crate) = 1896
+SHA256 (rust/crates/darling_macro-0.20.3.crate) = 836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5
+SIZE (rust/crates/darling_macro-0.20.3.crate) = 1859
+SHA256 (rust/crates/dashmap-5.5.3.crate) = 978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856
+SIZE (rust/crates/dashmap-5.5.3.crate) = 24061
+SHA256 (rust/crates/data-encoding-2.5.0.crate) = 7e962a19be5cfc3f3bf6dd8f61eb50107f356ad6270fbb3ed41476571db78be5
+SIZE (rust/crates/data-encoding-2.5.0.crate) = 20632
+SHA256 (rust/crates/debugid-0.8.0.crate) = bef552e6f588e446098f6ba40d89ac146c8c7b64aade83c051ee00bb5d2bc18d
+SIZE (rust/crates/debugid-0.8.0.crate) = 12757
+SHA256 (rust/crates/der-0.5.1.crate) = 6919815d73839e7ad218de758883aae3a257ba6759ce7a9992501efbb53d705c
+SIZE (rust/crates/der-0.5.1.crate) = 57440
+SHA256 (rust/crates/der-0.7.8.crate) = fffa369a668c8af7dbf8b5e56c9f744fbd399949ed171606040001947de40b1c
+SIZE (rust/crates/der-0.7.8.crate) = 85085
+SHA256 (rust/crates/deranged-0.3.10.crate) = 8eb30d70a07a3b04884d2677f06bec33509dc67ca60d92949e5535352d3191dc
+SIZE (rust/crates/deranged-0.3.10.crate) = 17803
+SHA256 (rust/crates/derive-new-0.5.9.crate) = 3418329ca0ad70234b9735dc4ceed10af4df60eff9c8e7b06cb5e520d92c3535
+SIZE (rust/crates/derive-new-0.5.9.crate) = 7733
+SHA256 (rust/crates/derive-new-0.6.0.crate) = d150dea618e920167e5973d70ae6ece4385b7164e0d799fe7c122dd0a5d912ad
+SIZE (rust/crates/derive-new-0.6.0.crate) = 7694
+SHA256 (rust/crates/derive_arbitrary-1.3.2.crate) = 67e77553c4162a157adbf834ebae5b415acbecbeafc7a74b0e886657506a7611
+SIZE (rust/crates/derive_arbitrary-1.3.2.crate) = 10614
+SHA256 (rust/crates/derive_builder-0.11.2.crate) = d07adf7be193b71cc36b193d0f5fe60b918a3a9db4dad0449f57bcfd519704a3
+SIZE (rust/crates/derive_builder-0.11.2.crate) = 34316
+SHA256 (rust/crates/derive_builder-0.12.0.crate) = 8d67778784b508018359cbc8696edb3db78160bab2c2a28ba7f56ef6932997f8
+SIZE (rust/crates/derive_builder-0.12.0.crate) = 35456
+SHA256 (rust/crates/derive_builder_core-0.11.2.crate) = 1f91d4cfa921f1c05904dc3c57b4a32c38aed3340cce209f3a6fd1478babafc4
+SIZE (rust/crates/derive_builder_core-0.11.2.crate) = 29831
+SHA256 (rust/crates/derive_builder_core-0.12.0.crate) = c11bdc11a0c47bc7d37d582b5285da6849c96681023680b906673c5707af7b0f
+SIZE (rust/crates/derive_builder_core-0.12.0.crate) = 31438
+SHA256 (rust/crates/derive_builder_macro-0.11.2.crate) = 8f0314b72bed045f3a68671b3c86328386762c93f82d98c65c3cb5e5f573dd68
+SIZE (rust/crates/derive_builder_macro-0.11.2.crate) = 6222
+SHA256 (rust/crates/derive_builder_macro-0.12.0.crate) = ebcda35c7a396850a55ffeac740804b40ffec779b98fffbb1738f4033f0ee79e
+SIZE (rust/crates/derive_builder_macro-0.12.0.crate) = 6288
+SHA256 (rust/crates/diff-0.1.13.crate) = 56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8
+SIZE (rust/crates/diff-0.1.13.crate) = 46216
+SHA256 (rust/crates/difference-2.0.0.crate) = 524cbf6897b527295dff137cec09ecf3a05f4fddffd7dfcd1585403449e74198
+SIZE (rust/crates/difference-2.0.0.crate) = 147616
+SHA256 (rust/crates/difflib-0.4.0.crate) = 6184e33543162437515c2e2b48714794e37845ec9851711914eec9d308f6ebe8
+SIZE (rust/crates/difflib-0.4.0.crate) = 7638
+SHA256 (rust/crates/digest-0.10.7.crate) = 9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292
+SIZE (rust/crates/digest-0.10.7.crate) = 19557
+SHA256 (rust/crates/dirs-3.0.2.crate) = 30baa043103c9d0c2a57cf537cc2f35623889dc0d405e6c3cccfadbc81c71309
+SIZE (rust/crates/dirs-3.0.2.crate) = 12184
+SHA256 (rust/crates/dirs-4.0.0.crate) = ca3aa72a6f96ea37bbc5aa912f6788242832f75369bdfdadcb0e38423f100059
+SIZE (rust/crates/dirs-4.0.0.crate) = 12503
+SHA256 (rust/crates/dirs-next-2.0.0.crate) = b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1
+SIZE (rust/crates/dirs-next-2.0.0.crate) = 11689
+SHA256 (rust/crates/dirs-sys-0.3.7.crate) = 1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6
+SIZE (rust/crates/dirs-sys-0.3.7.crate) = 10597
+SHA256 (rust/crates/dirs-sys-next-0.1.2.crate) = 4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d
+SIZE (rust/crates/dirs-sys-next-0.1.2.crate) = 10681
+SHA256 (rust/crates/dlv-list-0.3.0.crate) = 0688c2a7f92e427f44895cd63841bff7b29f8d7a1648b9e7e07a4a365b2e1257
+SIZE (rust/crates/dlv-list-0.3.0.crate) = 11920
+SHA256 (rust/crates/dlv-list-0.5.2.crate) = 442039f5147480ba31067cb00ada1adae6892028e40e45fc5de7b7df6dcc1b5f
+SIZE (rust/crates/dlv-list-0.5.2.crate) = 22373
+SHA256 (rust/crates/dns-lookup-1.0.8.crate) = 53ecafc952c4528d9b51a458d1a8904b81783feff9fde08ab6ed2545ff396872
+SIZE (rust/crates/dns-lookup-1.0.8.crate) = 13153
+SHA256 (rust/crates/doc-comment-0.3.3.crate) = fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10
+SIZE (rust/crates/doc-comment-0.3.3.crate) = 4123
+SHA256 (rust/crates/dotenv-0.15.0.crate) = 77c90badedccf4105eca100756a0b1289e191f6fcbdadd3cee1d2f614f97da8f
+SIZE (rust/crates/dotenv-0.15.0.crate) = 11668
+SHA256 (rust/crates/dotenvy-0.15.7.crate) = 1aaf95b3e5c8f23aa320147307562d361db0ae0d51242340f558153b4eb2439b
+SIZE (rust/crates/dotenvy-0.15.7.crate) = 20293
+SHA256 (rust/crates/downcast-0.11.0.crate) = 1435fa1053d8b2fbbe9be7e97eca7f33d37b28409959813daefc1446a14247f1
+SIZE (rust/crates/downcast-0.11.0.crate) = 5976
+SHA256 (rust/crates/dyn-clone-1.0.16.crate) = 545b22097d44f8a9581187cdf93de7a71e4722bf51200cfaba810865b49a495d
+SIZE (rust/crates/dyn-clone-1.0.16.crate) = 11766
+SHA256 (rust/crates/either-1.9.0.crate) = a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07
+SIZE (rust/crates/either-1.9.0.crate) = 16660
+SHA256 (rust/crates/ena-0.14.2.crate) = c533630cf40e9caa44bd91aadc88a75d75a4c3a12b4cfde353cbed41daa1e1f1
+SIZE (rust/crates/ena-0.14.2.crate) = 22991
+SHA256 (rust/crates/encode_unicode-0.3.6.crate) = a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f
+SIZE (rust/crates/encode_unicode-0.3.6.crate) = 45741
+SHA256 (rust/crates/encoding_rs-0.8.33.crate) = 7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1
+SIZE (rust/crates/encoding_rs-0.8.33.crate) = 1370071
+SHA256 (rust/crates/endian-type-0.1.2.crate) = c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d
+SIZE (rust/crates/endian-type-0.1.2.crate) = 2340
+SHA256 (rust/crates/enum-iterator-1.4.1.crate) = 7add3873b5dd076766ee79c8e406ad1a472c385476b9e38849f8eec24f1be689
+SIZE (rust/crates/enum-iterator-1.4.1.crate) = 6699
+SHA256 (rust/crates/enum-iterator-derive-1.2.1.crate) = eecf8589574ce9b895052fa12d69af7a233f99e6107f5cb8dd1044f2a17bfdcb
+SIZE (rust/crates/enum-iterator-derive-1.2.1.crate) = 5071
+SHA256 (rust/crates/enum_dispatch-0.3.12.crate) = 8f33313078bb8d4d05a2733a94ac4c2d8a0df9a2b84424ebf4f33bfc224a890e
+SIZE (rust/crates/enum_dispatch-0.3.12.crate) = 22400
+SHA256 (rust/crates/equivalent-1.0.1.crate) = 5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5
+SIZE (rust/crates/equivalent-1.0.1.crate) = 6615
+SHA256 (rust/crates/erased-serde-0.4.1.crate) = 4adbf0983fe06bd3a5c19c8477a637c2389feb0994eca7a59e3b961054aa7c0a
+SIZE (rust/crates/erased-serde-0.4.1.crate) = 25657
+SHA256 (rust/crates/errno-0.3.8.crate) = a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245
+SIZE (rust/crates/errno-0.3.8.crate) = 10645
+SHA256 (rust/crates/error-chain-0.12.4.crate) = 2d2f06b9cac1506ece98fe3231e3cc9c4410ec3d5b1f24ae1c8946f0742cdefc
+SIZE (rust/crates/error-chain-0.12.4.crate) = 29274
+SHA256 (rust/crates/error-code-2.3.1.crate) = 64f18991e7bf11e7ffee451b5318b5c1a73c52d0d0ada6e5a3017c8c1ced6a21
+SIZE (rust/crates/error-code-2.3.1.crate) = 5324
+SHA256 (rust/crates/etcd-client-0.12.3.crate) = f5231ad671c74ee5dc02753a0a9c855fe6e90de2a07acb2582f8a702470e04d1
+SIZE (rust/crates/etcd-client-0.12.3.crate) = 71527
+SHA256 (rust/crates/event-listener-2.5.3.crate) = 0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0
+SIZE (rust/crates/event-listener-2.5.3.crate) = 15392
+SHA256 (rust/crates/exitcode-1.1.2.crate) = de853764b47027c2e862a995c34978ffa63c1501f2e15f987ba11bd4f9bba193
+SIZE (rust/crates/exitcode-1.1.2.crate) = 6538
+SHA256 (rust/crates/fail-0.5.1.crate) = fe5e43d0f78a42ad591453aedb1d7ae631ce7ee445c7643691055a9ed8d3b01c
+SIZE (rust/crates/fail-0.5.1.crate) = 17986
+SHA256 (rust/crates/fallible-iterator-0.2.0.crate) = 4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7
+SIZE (rust/crates/fallible-iterator-0.2.0.crate) = 18509
+SHA256 (rust/crates/fallible-streaming-iterator-0.1.9.crate) = 7360491ce676a36bf9bb3c56c1aa791658183a54d2744120f27285738d90465a
+SIZE (rust/crates/fallible-streaming-iterator-0.1.9.crate) = 9249
+SHA256 (rust/crates/fastrand-1.9.0.crate) = e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be
+SIZE (rust/crates/fastrand-1.9.0.crate) = 11910
+SHA256 (rust/crates/fastrand-2.0.1.crate) = 25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5
+SIZE (rust/crates/fastrand-2.0.1.crate) = 14664
+SHA256 (rust/crates/fd-lock-3.0.13.crate) = ef033ed5e9bad94e55838ca0ca906db0e043f517adda0c8b79c7a8c66c93c1b5
+SIZE (rust/crates/fd-lock-3.0.13.crate) = 13692
+SHA256 (rust/crates/filetime-0.2.23.crate) = 1ee447700ac8aa0b2f2bd7bc4462ad686ba06baa6727ac149a2d6277f0d240fd
+SIZE (rust/crates/filetime-0.2.23.crate) = 14942
+SHA256 (rust/crates/findshlibs-0.10.2.crate) = 40b9e59cd0f7e0806cca4be089683ecb6434e602038df21fe6bf6711b2f07f64
+SIZE (rust/crates/findshlibs-0.10.2.crate) = 20101
+SHA256 (rust/crates/finl_unicode-1.2.0.crate) = 8fcfdc7a0362c9f4444381a9e697c79d435fe65b52a37466fc2c1184cee9edc6
+SIZE (rust/crates/finl_unicode-1.2.0.crate) = 687752
+SHA256 (rust/crates/fixedbitset-0.4.2.crate) = 0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80
+SIZE (rust/crates/fixedbitset-0.4.2.crate) = 15954
+SHA256 (rust/crates/flagset-0.4.4.crate) = d52a7e408202050813e6f1d9addadcaafef3dca7530c7ddfb005d4081cce6779
+SIZE (rust/crates/flagset-0.4.4.crate) = 13347
+SHA256 (rust/crates/flatbuffers-23.5.26.crate) = 4dac53e22462d78c16d64a1cd22371b54cc3fe94aa15e7886a2fa6e5d1ab8640
+SIZE (rust/crates/flatbuffers-23.5.26.crate) = 23943
+SHA256 (rust/crates/flate2-1.0.28.crate) = 46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e
+SIZE (rust/crates/flate2-1.0.28.crate) = 73690
+SHA256 (rust/crates/float-cmp-0.9.0.crate) = 98de4bbd547a563b716d8dfa9aad1cb19bfab00f4fa09a6a4ed21dbcf44ce9c4
+SIZE (rust/crates/float-cmp-0.9.0.crate) = 10102
+SHA256 (rust/crates/fnv-1.0.7.crate) = 3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1
+SIZE (rust/crates/fnv-1.0.7.crate) = 11266
+SHA256 (rust/crates/form_urlencoded-1.2.1.crate) = e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456
+SIZE (rust/crates/form_urlencoded-1.2.1.crate) = 8969
+SHA256 (rust/crates/format_num-0.1.0.crate) = 14ac05eb8d2eb4ed1eeff847911deae077b0b53332465de9d6a26b0ea9961bc8
+SIZE (rust/crates/format_num-0.1.0.crate) = 16326
+SHA256 (rust/crates/fragile-2.0.0.crate) = 6c2141d6d6c8512188a7891b4b01590a45f6dac67afb4f255c4124dbb86d4eaa
+SIZE (rust/crates/fragile-2.0.0.crate) = 14668
+SHA256 (rust/crates/frunk-0.4.2.crate) = 11a351b59e12f97b4176ee78497dff72e4276fb1ceb13e19056aca7fa0206287
+SIZE (rust/crates/frunk-0.4.2.crate) = 36018
+SHA256 (rust/crates/frunk_core-0.4.2.crate) = af2469fab0bd07e64ccf0ad57a1438f63160c69b2e57f04a439653d68eb558d6
+SIZE (rust/crates/frunk_core-0.4.2.crate) = 38225
+SHA256 (rust/crates/frunk_derives-0.4.2.crate) = b0fa992f1656e1707946bbba340ad244f0814009ef8c0118eb7b658395f19a2e
+SIZE (rust/crates/frunk_derives-0.4.2.crate) = 2631
+SHA256 (rust/crates/frunk_proc_macro_helpers-0.1.2.crate) = 35b54add839292b743aeda6ebedbd8b11e93404f902c56223e51b9ec18a13d2c
+SIZE (rust/crates/frunk_proc_macro_helpers-0.1.2.crate) = 4600
+SHA256 (rust/crates/frunk_proc_macros-0.1.2.crate) = 71b85a1d4a9a6b300b41c05e8e13ef2feca03e0334127f29eca9506a7fe13a93
+SIZE (rust/crates/frunk_proc_macros-0.1.2.crate) = 1279
+SHA256 (rust/crates/fs2-0.4.3.crate) = 9564fc758e15025b46aa6643b1b77d047d1a56a1aea6e01002ac0c7026876213
+SIZE (rust/crates/fs2-0.4.3.crate) = 13138
+SHA256 (rust/crates/fsevent-sys-4.1.0.crate) = 76ee7a02da4d231650c7cea31349b889be2f45ddb3ef3032d2ec8185f6313fd2
+SIZE (rust/crates/fsevent-sys-4.1.0.crate) = 4620
+SHA256 (rust/crates/fst-0.4.7.crate) = 7ab85b9b05e3978cc9a9cf8fea7f01b494e1a09ed3037e16ba39edc7a29eb61a
+SIZE (rust/crates/fst-0.4.7.crate) = 1573393
+SHA256 (rust/crates/funty-2.0.0.crate) = e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c
+SIZE (rust/crates/funty-2.0.0.crate) = 13160
+SHA256 (rust/crates/futures-0.3.30.crate) = 645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0
+SIZE (rust/crates/futures-0.3.30.crate) = 53828
+SHA256 (rust/crates/futures-channel-0.3.30.crate) = eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78
+SIZE (rust/crates/futures-channel-0.3.30.crate) = 31736
+SHA256 (rust/crates/futures-core-0.3.30.crate) = dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d
+SIZE (rust/crates/futures-core-0.3.30.crate) = 14071
+SHA256 (rust/crates/futures-executor-0.3.30.crate) = a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d
+SIZE (rust/crates/futures-executor-0.3.30.crate) = 17744
+SHA256 (rust/crates/futures-intrusive-0.4.2.crate) = a604f7a68fbf8103337523b1fadc8ade7361ee3f112f7c680ad179651616aed5
+SIZE (rust/crates/futures-intrusive-0.4.2.crate) = 85696
+SHA256 (rust/crates/futures-io-0.3.30.crate) = a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1
+SIZE (rust/crates/futures-io-0.3.30.crate) = 8910
+SHA256 (rust/crates/futures-macro-0.3.30.crate) = 87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac
+SIZE (rust/crates/futures-macro-0.3.30.crate) = 11278
+SHA256 (rust/crates/futures-sink-0.3.30.crate) = 9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5
+SIZE (rust/crates/futures-sink-0.3.30.crate) = 7852
+SHA256 (rust/crates/futures-task-0.3.30.crate) = 38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004
+SIZE (rust/crates/futures-task-0.3.30.crate) = 11126
+SHA256 (rust/crates/futures-timer-3.0.2.crate) = e64b03909df88034c26dc1547e8970b91f98bdb65165d6a4e9110d94263dbb2c
+SIZE (rust/crates/futures-timer-3.0.2.crate) = 19879
+SHA256 (rust/crates/futures-util-0.3.30.crate) = 3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48
+SIZE (rust/crates/futures-util-0.3.30.crate) = 159977
+SHA256 (rust/crates/generic-array-0.14.7.crate) = 85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a
+SIZE (rust/crates/generic-array-0.14.7.crate) = 15950
+SHA256 (rust/crates/gethostname-0.2.3.crate) = c1ebd34e35c46e00bb73e81363248d627782724609fe1b6396f553f68fe3862e
+SIZE (rust/crates/gethostname-0.2.3.crate) = 8174
+SHA256 (rust/crates/getopts-0.2.21.crate) = 14dbbfd5c71d70241ecf9e6f13737f7b5ce823821063188d7e46c41d371eebd5
+SIZE (rust/crates/getopts-0.2.21.crate) = 18457
+SHA256 (rust/crates/getrandom-0.2.11.crate) = fe9006bed769170c11f845cf00c7c1e9092aeb3f268e007c3e760ac68008070f
+SIZE (rust/crates/getrandom-0.2.11.crate) = 35391
+SHA256 (rust/crates/getset-0.1.2.crate) = e45727250e75cc04ff2846a66397da8ef2b3db8e40e0cef4df67950a07621eb9
+SIZE (rust/crates/getset-0.1.2.crate) = 8831
+SHA256 (rust/crates/gimli-0.28.1.crate) = 4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253
+SIZE (rust/crates/gimli-0.28.1.crate) = 270497
+SHA256 (rust/crates/git2-0.18.1.crate) = fbf97ba92db08df386e10c8ede66a2a0369bd277090afd8710e19e38de9ec0cd
+SIZE (rust/crates/git2-0.18.1.crate) = 211466
+SHA256 (rust/crates/glob-0.3.1.crate) = d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b
+SIZE (rust/crates/glob-0.3.1.crate) = 18880
+SHA256 (rust/crates/h2-0.3.26.crate) = 81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8
+SIZE (rust/crates/h2-0.3.26.crate) = 168315
+SHA256 (rust/crates/half-1.8.2.crate) = eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7
+SIZE (rust/crates/half-1.8.2.crate) = 41874
+SHA256 (rust/crates/half-2.3.1.crate) = bc52e53916c08643f1b56ec082790d1e86a32e58dc5268f897f313fbae7b4872
+SIZE (rust/crates/half-2.3.1.crate) = 50257
+SHA256 (rust/crates/hashbrown-0.12.3.crate) = 8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888
+SIZE (rust/crates/hashbrown-0.12.3.crate) = 102968
+SHA256 (rust/crates/hashbrown-0.13.2.crate) = 43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e
+SIZE (rust/crates/hashbrown-0.13.2.crate) = 105265
+SHA256 (rust/crates/hashbrown-0.14.3.crate) = 290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604
+SIZE (rust/crates/hashbrown-0.14.3.crate) = 141425
+SHA256 (rust/crates/hashlink-0.8.4.crate) = e8094feaf31ff591f651a2664fb9cfd92bba7a60ce3197265e9482ebe753c8f7
+SIZE (rust/crates/hashlink-0.8.4.crate) = 26514
+SHA256 (rust/crates/hdrhistogram-7.5.4.crate) = 765c9198f173dd59ce26ff9f95ef0aafd0a0fe01fb9d72841bc5066a4c06511d
+SIZE (rust/crates/hdrhistogram-7.5.4.crate) = 319746
+SHA256 (rust/crates/headers-0.3.9.crate) = 06683b93020a07e3dbcf5f8c0f6d40080d725bea7936fc01ad345c01b97dc270
+SIZE (rust/crates/headers-0.3.9.crate) = 68290
+SHA256 (rust/crates/headers-core-0.2.0.crate) = e7f66481bfee273957b1f20485a4ff3362987f85b2c236580d81b4eb7a326429
+SIZE (rust/crates/headers-core-0.2.0.crate) = 2380
+SHA256 (rust/crates/heck-0.4.1.crate) = 95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8
+SIZE (rust/crates/heck-0.4.1.crate) = 11567
+SHA256 (rust/crates/hermit-abi-0.1.19.crate) = 62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33
+SIZE (rust/crates/hermit-abi-0.1.19.crate) = 9979
+SHA256 (rust/crates/hermit-abi-0.3.3.crate) = d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7
+SIZE (rust/crates/hermit-abi-0.3.3.crate) = 14253
+SHA256 (rust/crates/hex-0.4.3.crate) = 7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70
+SIZE (rust/crates/hex-0.4.3.crate) = 13299
+SHA256 (rust/crates/hexf-parse-0.2.1.crate) = dfa686283ad6dd069f105e5ab091b04c62850d3e4cf5d67debad1933f55023df
+SIZE (rust/crates/hexf-parse-0.2.1.crate) = 4662
+SHA256 (rust/crates/hkdf-0.12.4.crate) = 7b5f8eb2ad728638ea2c7d47a21db23b7b58a72ed6a38256b8a1849f15fbbdf7
+SIZE (rust/crates/hkdf-0.12.4.crate) = 171163
+SHA256 (rust/crates/hmac-0.12.1.crate) = 6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e
+SIZE (rust/crates/hmac-0.12.1.crate) = 42657
+SHA256 (rust/crates/home-0.5.9.crate) = e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5
+SIZE (rust/crates/home-0.5.9.crate) = 8760
+SHA256 (rust/crates/hostname-0.3.1.crate) = 3c731c3e10504cc8ed35cfe2f1db4c9274c3d35fa486e3b31df46f068ef3e867
+SIZE (rust/crates/hostname-0.3.1.crate) = 9272
+SHA256 (rust/crates/html-escape-0.2.13.crate) = 6d1ad449764d627e22bfd7cd5e8868264fc9236e07c752972b4080cd351cb476
+SIZE (rust/crates/html-escape-0.2.13.crate) = 23345
+SHA256 (rust/crates/http-0.2.11.crate) = 8947b1a6fad4393052c7ba1f4cd97bed3e953a95c79c92ad9b051a04611d9fbb
+SIZE (rust/crates/http-0.2.11.crate) = 100478
+SHA256 (rust/crates/http-body-0.4.6.crate) = 7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2
+SIZE (rust/crates/http-body-0.4.6.crate) = 10773
+SHA256 (rust/crates/http-range-header-0.3.1.crate) = add0ab9360ddbd88cfeb3bd9574a1d85cfdfa14db10b3e21d3700dbc4328758f
+SIZE (rust/crates/http-range-header-0.3.1.crate) = 7712
+SHA256 (rust/crates/httparse-1.8.0.crate) = d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904
+SIZE (rust/crates/httparse-1.8.0.crate) = 29954
+SHA256 (rust/crates/httpdate-1.0.3.crate) = df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9
+SIZE (rust/crates/httpdate-1.0.3.crate) = 10639
+SHA256 (rust/crates/human-panic-1.2.2.crate) = 7a79a67745be0cb8dd2771f03b24c2f25df98d5471fe7a595d668cfa2e6f843d
+SIZE (rust/crates/human-panic-1.2.2.crate) = 11437
+SHA256 (rust/crates/humantime-2.1.0.crate) = 9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4
+SIZE (rust/crates/humantime-2.1.0.crate) = 16749
+SHA256 (rust/crates/humantime-serde-1.1.1.crate) = 57a3db5ea5923d99402c94e9feb261dc5ee9b4efa158b0315f788cf549cc200c
+SIZE (rust/crates/humantime-serde-1.1.1.crate) = 7886
+SHA256 (rust/crates/hydroflow-0.5.0.crate) = a5129724896b4c3cf12f8e5f5af2f1d94b4c5933ae911189747025c6a5ff1346
+SIZE (rust/crates/hydroflow-0.5.0.crate) = 588840
+SHA256 (rust/crates/hydroflow_datalog-0.5.0.crate) = 41813c88b02f3bfa8f5962e125495aa47c8d382cf5d135b02da40af4342bc6fb
+SIZE (rust/crates/hydroflow_datalog-0.5.0.crate) = 5626
+SHA256 (rust/crates/hydroflow_datalog_core-0.5.0.crate) = ea77a3b2f09bba3d461f9ce0dee28798d3b07dafe77fc46de4675155f5925e53
+SIZE (rust/crates/hydroflow_datalog_core-0.5.0.crate) = 88777
+SHA256 (rust/crates/hydroflow_lang-0.5.0.crate) = f3191eee8ef49b4a814e4c33a0ce0d7470b733dc6118ea744f7f15168c38803f
+SIZE (rust/crates/hydroflow_lang-0.5.0.crate) = 119026
+SHA256 (rust/crates/hydroflow_macro-0.5.0.crate) = 9be25d2a927fe4e6afe3e204786e968e983f53f313cc561950ff1cd09ecd92fc
+SIZE (rust/crates/hydroflow_macro-0.5.0.crate) = 12403
+SHA256 (rust/crates/hyper-0.14.28.crate) = bf96e135eb83a2a8ddf766e426a841d8ddd7449d5f00d34ea02b41d2f19eef80
+SIZE (rust/crates/hyper-0.14.28.crate) = 197204
+SHA256 (rust/crates/hyper-rustls-0.24.2.crate) = ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590
+SIZE (rust/crates/hyper-rustls-0.24.2.crate) = 30195
+SHA256 (rust/crates/hyper-timeout-0.4.1.crate) = bbb958482e8c7be4bc3cf272a766a2b0bf1a6755e7a6ae777f017a31d11b13b1
+SIZE (rust/crates/hyper-timeout-0.4.1.crate) = 13805
+SHA256 (rust/crates/iana-time-zone-0.1.58.crate) = 8326b86b6cff230b97d0d312a6c40a60726df3332e721f72a1b035f451663b20
+SIZE (rust/crates/iana-time-zone-0.1.58.crate) = 27020
+SHA256 (rust/crates/iana-time-zone-haiku-0.1.2.crate) = f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f
+SIZE (rust/crates/iana-time-zone-haiku-0.1.2.crate) = 7185
+SHA256 (rust/crates/ident_case-1.0.1.crate) = b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39
+SIZE (rust/crates/ident_case-1.0.1.crate) = 3492
+SHA256 (rust/crates/idna-0.5.0.crate) = 634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6
+SIZE (rust/crates/idna-0.5.0.crate) = 271940
+SHA256 (rust/crates/if_chain-1.0.2.crate) = cb56e1aa765b4b4f3aadfab769793b7087bb03a4ea4920644a6d238e2df5b9ed
+SIZE (rust/crates/if_chain-1.0.2.crate) = 8062
+SHA256 (rust/crates/include_dir-0.7.3.crate) = 18762faeff7122e89e0857b02f7ce6fcc0d101d5e9ad2ad7846cc01d61b7f19e
+SIZE (rust/crates/include_dir-0.7.3.crate) = 6046
+SHA256 (rust/crates/include_dir_macros-0.7.3.crate) = b139284b5cf57ecfa712bcc66950bb635b31aff41c188e8a4cfc758eca374a3f
+SIZE (rust/crates/include_dir_macros-0.7.3.crate) = 3700
+SHA256 (rust/crates/indexmap-1.9.3.crate) = bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99
+SIZE (rust/crates/indexmap-1.9.3.crate) = 54653
+SHA256 (rust/crates/indexmap-2.1.0.crate) = d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f
+SIZE (rust/crates/indexmap-2.1.0.crate) = 68224
+SHA256 (rust/crates/indicatif-0.17.7.crate) = fb28741c9db9a713d93deb3bb9515c20788cef5815265bee4980e87bde7e0f25
+SIZE (rust/crates/indicatif-0.17.7.crate) = 63108
+SHA256 (rust/crates/indoc-1.0.9.crate) = bfa799dd5ed20a7e349f3b4639aa80d74549c81716d9ec4f994c9b5815598306
+SIZE (rust/crates/indoc-1.0.9.crate) = 13475
+SHA256 (rust/crates/inferno-0.11.19.crate) = 321f0f839cd44a4686e9504b0a62b4d69a50b62072144c71c68f5873c167b8d9
+SIZE (rust/crates/inferno-0.11.19.crate) = 102753
+SHA256 (rust/crates/inotify-0.9.6.crate) = f8069d3ec154eb856955c1c0fbffefbf5f3c40a104ec912d4797314c1801abff
+SIZE (rust/crates/inotify-0.9.6.crate) = 22971
+SHA256 (rust/crates/inotify-sys-0.1.5.crate) = e05c02b5e89bff3b946cedeca278abc628fe811e604f027c45a8aa3cf793d0eb
+SIZE (rust/crates/inotify-sys-0.1.5.crate) = 6965
+SHA256 (rust/crates/inout-0.1.3.crate) = a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5
+SIZE (rust/crates/inout-0.1.3.crate) = 10743
+SHA256 (rust/crates/instant-0.1.12.crate) = 7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c
+SIZE (rust/crates/instant-0.1.12.crate) = 6128
+SHA256 (rust/crates/integer-encoding-3.0.4.crate) = 8bb03732005da905c88227371639bf1ad885cc712789c011c31c5fb3ab3ccf02
+SIZE (rust/crates/integer-encoding-3.0.4.crate) = 12446
+SHA256 (rust/crates/integer-encoding-4.0.0.crate) = 924df4f0e24e2e7f9cdd90babb0b96f93b20f3ecfa949ea9e6613756b8c8e1bf
+SIZE (rust/crates/integer-encoding-4.0.0.crate) = 12732
+SHA256 (rust/crates/inventory-0.3.14.crate) = c8573b2b1fb643a372c73b23f4da5f888677feef3305146d68a539250a9bccc7
+SIZE (rust/crates/inventory-0.3.14.crate) = 13953
+SHA256 (rust/crates/io-lifetimes-1.0.11.crate) = eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2
+SIZE (rust/crates/io-lifetimes-1.0.11.crate) = 37346
+SHA256 (rust/crates/ipnet-2.9.0.crate) = 8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3
+SIZE (rust/crates/ipnet-2.9.0.crate) = 27627
+SHA256 (rust/crates/iri-string-0.7.0.crate) = 21859b667d66a4c1dacd9df0863b3efb65785474255face87f5bca39dd8407c0
+SIZE (rust/crates/iri-string-0.7.0.crate) = 129307
+SHA256 (rust/crates/is-macro-0.2.2.crate) = 8a7d079e129b77477a49c5c4f1cfe9ce6c2c909ef52520693e8e811a714c7b20
+SIZE (rust/crates/is-macro-0.2.2.crate) = 5247
+SHA256 (rust/crates/is-terminal-0.4.9.crate) = cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b
+SIZE (rust/crates/is-terminal-0.4.9.crate) = 8109
+SHA256 (rust/crates/itertools-0.10.5.crate) = b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473
+SIZE (rust/crates/itertools-0.10.5.crate) = 115354
+SHA256 (rust/crates/itertools-0.11.0.crate) = b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57
+SIZE (rust/crates/itertools-0.11.0.crate) = 125074
+SHA256 (rust/crates/itertools-0.12.0.crate) = 25db6b064527c5d482d0423354fcd07a89a2dfe07b67892e62411946db7f07b0
+SIZE (rust/crates/itertools-0.12.0.crate) = 133620
+SHA256 (rust/crates/itoa-1.0.10.crate) = b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c
+SIZE (rust/crates/itoa-1.0.10.crate) = 10534
+SHA256 (rust/crates/jni-0.21.1.crate) = 1a87aa2bb7d2af34197c04845522473242e1aa17c12f4935d5856491a7fb8c97
+SIZE (rust/crates/jni-0.21.1.crate) = 105028
+SHA256 (rust/crates/jni-sys-0.3.0.crate) = 8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130
+SIZE (rust/crates/jni-sys-0.3.0.crate) = 10232
+SHA256 (rust/crates/jobserver-0.1.27.crate) = 8c37f63953c4c63420ed5fd3d6d398c719489b9f872b9fa683262f8edd363c7d
+SIZE (rust/crates/jobserver-0.1.27.crate) = 24774
+SHA256 (rust/crates/js-sys-0.3.66.crate) = cee9c64da59eae3b50095c18d3e74f8b73c0b86d2792824ff01bbce68ba229ca
+SIZE (rust/crates/js-sys-0.3.66.crate) = 80765
+SHA256 (rust/crates/json5-0.4.1.crate) = 96b0db21af676c1ce64250b5f40f3ce2cf27e4e47cb91ed91eb6fe9350b430c1
+SIZE (rust/crates/json5-0.4.1.crate) = 15678
+SHA256 (rust/crates/jsonwebtoken-9.2.0.crate) = 5c7ea04a7c5c055c175f189b6dc6ba036fd62306b58c66c9f6389036c503a3f4
+SIZE (rust/crates/jsonwebtoken-9.2.0.crate) = 48775
+SHA256 (rust/crates/keccak-0.1.4.crate) = 8f6d5ed8676d904364de097082f4e7d240b571b67989ced0240f08b7f966f940
+SIZE (rust/crates/keccak-0.1.4.crate) = 13049
+SHA256 (rust/crates/keyed_priority_queue-0.4.2.crate) = 4ee7893dab2e44ae5f9d0173f26ff4aa327c10b01b06a72b52dd9405b628640d
+SIZE (rust/crates/keyed_priority_queue-0.4.2.crate) = 16016
+SHA256 (rust/crates/kqueue-1.0.8.crate) = 7447f1ca1b7b563588a205fe93dea8df60fd981423a768bc1c0ded35ed147d0c
+SIZE (rust/crates/kqueue-1.0.8.crate) = 12642
+SHA256 (rust/crates/kqueue-sys-1.0.4.crate) = ed9625ffda8729b85e45cf04090035ac368927b8cebc34898e7c120f52e4838b
+SIZE (rust/crates/kqueue-sys-1.0.4.crate) = 7160
+SHA256 (rust/crates/lalrpop-0.19.12.crate) = 0a1cbf952127589f2851ab2046af368fd20645491bb4b376f04b7f94d7a9837b
+SIZE (rust/crates/lalrpop-0.19.12.crate) = 226898
+SHA256 (rust/crates/lalrpop-util-0.19.12.crate) = d3c48237b9604c5a4702de6b824e02006c3214327564636aef27c1028a8fa0ed
+SIZE (rust/crates/lalrpop-util-0.19.12.crate) = 10178
+SHA256 (rust/crates/lattices-0.5.0.crate) = 4f3bff82353a971b61106a49369cfc1bd8398661107eadcb5387fcd21c43cac9
+SIZE (rust/crates/lattices-0.5.0.crate) = 28944
+SHA256 (rust/crates/lazy_static-1.4.0.crate) = e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646
+SIZE (rust/crates/lazy_static-1.4.0.crate) = 10443
+SHA256 (rust/crates/lazycell-1.3.0.crate) = 830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55
+SIZE (rust/crates/lazycell-1.3.0.crate) = 12502
+SHA256 (rust/crates/lexical-core-0.8.5.crate) = 2cde5de06e8d4c2faabc400238f9ae1c74d5412d03a7bd067645ccbc47070e46
+SIZE (rust/crates/lexical-core-0.8.5.crate) = 26680
+SHA256 (rust/crates/lexical-parse-float-0.8.5.crate) = 683b3a5ebd0130b8fb52ba0bdc718cc56815b6a097e28ae5a6997d0ad17dc05f
+SIZE (rust/crates/lexical-parse-float-0.8.5.crate) = 180161
+SHA256 (rust/crates/lexical-parse-integer-0.8.6.crate) = 6d0994485ed0c312f6d965766754ea177d07f9c00c9b82a5ee62ed5b47945ee9
+SIZE (rust/crates/lexical-parse-integer-0.8.6.crate) = 33647
+SHA256 (rust/crates/lexical-util-0.8.5.crate) = 5255b9ff16ff898710eb9eb63cb39248ea8a5bb036bea8085b1a767ff6c4e3fc
+SIZE (rust/crates/lexical-util-0.8.5.crate) = 85152
+SHA256 (rust/crates/lexical-write-float-0.8.5.crate) = accabaa1c4581f05a3923d1b4cfd124c329352288b7b9da09e766b0668116862
+SIZE (rust/crates/lexical-write-float-0.8.5.crate) = 100281
+SHA256 (rust/crates/lexical-write-integer-0.8.5.crate) = e1b6f3d1f4422866b68192d62f77bc5c700bee84f3069f2469d7bc8c77852446
+SIZE (rust/crates/lexical-write-integer-0.8.5.crate) = 55427
+SHA256 (rust/crates/libc-0.2.153.crate) = 9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd
+SIZE (rust/crates/libc-0.2.153.crate) = 740614
+SHA256 (rust/crates/libfuzzer-sys-0.4.7.crate) = a96cfd5557eb82f2b83fed4955246c988d331975a002961b07c81584d107e7f7
+SIZE (rust/crates/libfuzzer-sys-0.4.7.crate) = 128332
+SHA256 (rust/crates/libgit2-sys-0.16.2+1.7.2.crate) = ee4126d8b4ee5c9d9ea891dd875cfdc1e9d0950437179104b183d7d8a74d24e8
+SIZE (rust/crates/libgit2-sys-0.16.2+1.7.2.crate) = 1773674
+SHA256 (rust/crates/libloading-0.7.4.crate) = b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f
+SIZE (rust/crates/libloading-0.7.4.crate) = 27580
+SHA256 (rust/crates/libm-0.2.8.crate) = 4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058
+SIZE (rust/crates/libm-0.2.8.crate) = 113450
+SHA256 (rust/crates/libredox-0.0.1.crate) = 85c833ca1e66078851dba29046874e38f08b2c883700aa29a03ddd3b23814ee8
+SIZE (rust/crates/libredox-0.0.1.crate) = 4212
+SHA256 (rust/crates/libsqlite3-sys-0.25.2.crate) = 29f835d03d717946d28b1d1ed632eb6f0e24a299388ee623d0c23118d3e8a7fa
+SIZE (rust/crates/libsqlite3-sys-0.25.2.crate) = 4841525
+SHA256 (rust/crates/libz-sys-1.1.12.crate) = d97137b25e321a73eef1418d1d5d2eda4d77e12813f8e6dead84bc52c5870a7b
+SIZE (rust/crates/libz-sys-1.1.12.crate) = 3030648
+SHA256 (rust/crates/linked-hash-map-0.5.6.crate) = 0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f
+SIZE (rust/crates/linked-hash-map-0.5.6.crate) = 15049
+SHA256 (rust/crates/linux-raw-sys-0.1.4.crate) = f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4
+SIZE (rust/crates/linux-raw-sys-0.1.4.crate) = 878981
+SHA256 (rust/crates/linux-raw-sys-0.4.12.crate) = c4cd1a83af159aa67994778be9070f0ae1bd732942279cabb14f86f986a21456
+SIZE (rust/crates/linux-raw-sys-0.4.12.crate) = 1465800
+SHA256 (rust/crates/lock_api-0.4.11.crate) = 3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45
+SIZE (rust/crates/lock_api-0.4.11.crate) = 27487
+SHA256 (rust/crates/log-0.4.20.crate) = b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f
+SIZE (rust/crates/log-0.4.20.crate) = 38307
+SHA256 (rust/crates/lrlex-0.12.0.crate) = 22b832738fbfa58ad036580929e973b3b6bd31c6d6c7f18f6b5ea7b626675c85
+SIZE (rust/crates/lrlex-0.12.0.crate) = 20247
+SHA256 (rust/crates/lrpar-0.12.0.crate) = 2f270b952b07995fe874b10a5ed7dd28c80aa2130e37a7de7ed667d034e0a521
+SIZE (rust/crates/lrpar-0.12.0.crate) = 34436
+SHA256 (rust/crates/lrtable-0.12.0.crate) = a854115c6a10772ac154261592b082436abc869c812575cadcf9d7ceda8eff0b
+SIZE (rust/crates/lrtable-0.12.0.crate) = 20152
+SHA256 (rust/crates/lru-0.12.1.crate) = 2994eeba8ed550fd9b47a0b38f0242bc3344e496483c6180b69139cc2fa5d1d7
+SIZE (rust/crates/lru-0.12.1.crate) = 14583
+SHA256 (rust/crates/lz4-1.24.0.crate) = 7e9e2dd86df36ce760a60f6ff6ad526f7ba1f14ba0356f8254fb6905e6494df1
+SIZE (rust/crates/lz4-1.24.0.crate) = 13361
+SHA256 (rust/crates/lz4-sys-1.9.4.crate) = 57d27b317e207b10f69f5e75494119e391a96f48861ae870d1da6edac98ca900
+SIZE (rust/crates/lz4-sys-1.9.4.crate) = 354842
+SHA256 (rust/crates/lz4_flex-0.9.5.crate) = 1a8cbbb2831780bc3b9c15a41f5b49222ef756b6730a95f3decfdd15903eb5a3
+SIZE (rust/crates/lz4_flex-0.9.5.crate) = 38497
+SHA256 (rust/crates/lzma-sys-0.1.20.crate) = 5fda04ab3764e6cde78b9974eec4f779acaba7c4e84b36eca3cf77c581b85d27
+SIZE (rust/crates/lzma-sys-0.1.20.crate) = 760045
+SHA256 (rust/crates/mac_address-1.1.5.crate) = 4863ee94f19ed315bf3bc00299338d857d4b5bc856af375cc97d237382ad3856
+SIZE (rust/crates/mac_address-1.1.5.crate) = 12191
+SHA256 (rust/crates/mach2-0.4.2.crate) = 19b955cdeb2a02b9117f121ce63aa52d08ade45de53e48fe6a38b39c10f6f709
+SIZE (rust/crates/mach2-0.4.2.crate) = 21889
+SHA256 (rust/crates/malloc_buf-0.0.6.crate) = 62bb907fe88d54d8d9ce32a3cceab4218ed2f6b7d35617cafe9adf84e43919cb
+SIZE (rust/crates/malloc_buf-0.0.6.crate) = 1239
+SHA256 (rust/crates/maplit-1.0.2.crate) = 3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d
+SIZE (rust/crates/maplit-1.0.2.crate) = 8871
+SHA256 (rust/crates/match_cfg-0.1.0.crate) = ffbee8634e0d45d258acb448e7eaab3fce7a0a467395d4d9f228e3c1f01fb2e4
+SIZE (rust/crates/match_cfg-0.1.0.crate) = 7153
+SHA256 (rust/crates/matchers-0.1.0.crate) = 8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558
+SIZE (rust/crates/matchers-0.1.0.crate) = 6948
+SHA256 (rust/crates/matches-0.1.10.crate) = 2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5
+SIZE (rust/crates/matches-0.1.10.crate) = 2592
+SHA256 (rust/crates/matchit-0.7.3.crate) = 0e7465ac9959cc2b1404e8e2367b43684a6d13790fe23056cc8c6c5a6b7bcb94
+SIZE (rust/crates/matchit-0.7.3.crate) = 30372
+SHA256 (rust/crates/matrixmultiply-0.3.8.crate) = 7574c1cf36da4798ab73da5b215bbf444f50718207754cb522201d78d1cd0ff2
+SIZE (rust/crates/matrixmultiply-0.3.8.crate) = 57530
+SHA256 (rust/crates/md-5-0.10.6.crate) = d89e7ee0cfbedfc4da3340218492196241d89eefb6dab27de5df917a6d2e78cf
+SIZE (rust/crates/md-5-0.10.6.crate) = 16161
+SHA256 (rust/crates/md5-0.7.0.crate) = 490cc448043f947bae3cbee9c203358d62dbee0db12107a74be5c30ccfd09771
+SIZE (rust/crates/md5-0.7.0.crate) = 6671
+SHA256 (rust/crates/memchr-2.6.4.crate) = f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167
+SIZE (rust/crates/memchr-2.6.4.crate) = 94439
+SHA256 (rust/crates/memcomparable-0.2.0.crate) = 376101dbd964fc502d5902216e180f92b3d003b5cc3d2e40e044eb5470fca677
+SIZE (rust/crates/memcomparable-0.2.0.crate) = 16516
+SHA256 (rust/crates/memmap2-0.5.10.crate) = 83faa42c0a078c393f6b29d5db232d8be22776a891f8f56e5284faee4a20b327
+SIZE (rust/crates/memmap2-0.5.10.crate) = 26847
+SHA256 (rust/crates/memmap2-0.9.3.crate) = 45fd3a57831bf88bc63f8cebc0cf956116276e97fef3966103e96416209f7c92
+SIZE (rust/crates/memmap2-0.9.3.crate) = 33125
+SHA256 (rust/crates/memoffset-0.6.5.crate) = 5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce
+SIZE (rust/crates/memoffset-0.6.5.crate) = 7686
+SHA256 (rust/crates/memoffset-0.7.1.crate) = 5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4
+SIZE (rust/crates/memoffset-0.7.1.crate) = 8556
+SHA256 (rust/crates/memoffset-0.9.0.crate) = 5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c
+SIZE (rust/crates/memoffset-0.9.0.crate) = 9033
+SHA256 (rust/crates/mime-0.3.17.crate) = 6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a
+SIZE (rust/crates/mime-0.3.17.crate) = 15712
+SHA256 (rust/crates/mime_guess-2.0.4.crate) = 4192263c238a5f0d0c6bfd21f336a313a4ce1c450542449ca191bb657b4642ef
+SIZE (rust/crates/mime_guess-2.0.4.crate) = 26399
+SHA256 (rust/crates/minimal-lexical-0.2.1.crate) = 68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a
+SIZE (rust/crates/minimal-lexical-0.2.1.crate) = 94841
+SHA256 (rust/crates/miniz_oxide-0.7.1.crate) = e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7
+SIZE (rust/crates/miniz_oxide-0.7.1.crate) = 55194
+SHA256 (rust/crates/mio-0.8.11.crate) = a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c
+SIZE (rust/crates/mio-0.8.11.crate) = 102983
+SHA256 (rust/crates/mockall-0.11.4.crate) = 4c84490118f2ee2d74570d114f3d0493cbf02790df303d2707606c3e14e07c96
+SIZE (rust/crates/mockall-0.11.4.crate) = 22374
+SHA256 (rust/crates/mockall_derive-0.11.4.crate) = 22ce75669015c4f47b289fd4d4f56e894e4c96003ffdf3ac51313126f94c6cbb
+SIZE (rust/crates/mockall_derive-0.11.4.crate) = 44096
+SHA256 (rust/crates/moka-0.12.1.crate) = d8017ec3548ffe7d4cef7ac0e12b044c01164a74c0f3119420faeaf13490ad8b
+SIZE (rust/crates/moka-0.12.1.crate) = 213820
+SHA256 (rust/crates/mt19937-2.0.1.crate) = 12ca7f22ed370d5991a9caec16a83187e865bc8a532f889670337d5a5689e3a1
+SIZE (rust/crates/mt19937-2.0.1.crate) = 4717
+SHA256 (rust/crates/multimap-0.8.3.crate) = e5ce46fe64a9d73be07dcbe690a38ce1b293be448fd8ce1e6c1b8062c9f72c6a
+SIZE (rust/crates/multimap-0.8.3.crate) = 13518
+SHA256 (rust/crates/mur3-0.1.0.crate) = 97af489e1e21b68de4c390ecca6703318bc1aa16e9733bcb62c089b73c6fbb1b
+SIZE (rust/crates/mur3-0.1.0.crate) = 7728
+SHA256 (rust/crates/mysql-common-derive-0.30.2.crate) = 56b0d8a0db9bf6d2213e11f2c701cb91387b0614361625ab7b9743b41aa4938f
+SIZE (rust/crates/mysql-common-derive-0.30.2.crate) = 11568
+SHA256 (rust/crates/mysql-common-derive-0.31.0.crate) = c60492b5eb751e55b42d716b6b26dceb66767996cd7a5560a842fbf613ca2e92
+SIZE (rust/crates/mysql-common-derive-0.31.0.crate) = 11693
+SHA256 (rust/crates/mysql_async-0.33.0.crate) = 6750b17ce50f8f112ef1a8394121090d47c596b56a6a17569ca680a9626e2ef2
+SIZE (rust/crates/mysql_async-0.33.0.crate) = 98068
+SHA256 (rust/crates/mysql_common-0.31.0.crate) = 06f19e4cfa0ab5a76b627cec2d81331c49b034988eaf302c3bafeada684eadef
+SIZE (rust/crates/mysql_common-0.31.0.crate) = 161273
+SHA256 (rust/crates/mysql_common-0.32.0.crate) = b73aacd01475af6d2efbdf489efd60fc519515ffe94edfd74236f954d521e31b
+SIZE (rust/crates/mysql_common-0.32.0.crate) = 163800
+SHA256 (rust/crates/nalgebra-0.29.0.crate) = d506eb7e08d6329505faa8a3a00a5dcc6de9f76e0c77e4b75763ae3c770831ff
+SIZE (rust/crates/nalgebra-0.29.0.crate) = 344585
+SHA256 (rust/crates/nalgebra-macros-0.1.0.crate) = 01fcc0b8149b4632adc89ac3b7b31a12fb6099a0317a4eb2ebff574ef7de7218
+SIZE (rust/crates/nalgebra-macros-0.1.0.crate) = 5758
+SHA256 (rust/crates/ndk-context-0.1.1.crate) = 27b02d87554356db9e9a873add8782d4ea6e3e58ea071a9adb9a2e8ddb884a8b
+SIZE (rust/crates/ndk-context-0.1.1.crate) = 2205
+SHA256 (rust/crates/new_debug_unreachable-1.0.4.crate) = e4a24736216ec316047a1fc4252e27dabb04218aa4a3f37c6e7ddbf1f9782b54
+SIZE (rust/crates/new_debug_unreachable-1.0.4.crate) = 2561
+SHA256 (rust/crates/nibble_vec-0.1.0.crate) = 77a5d83df9f36fe23f0c3648c6bbb8b0298bb5f1939c8f2704431371f4b84d43
+SIZE (rust/crates/nibble_vec-0.1.0.crate) = 11796
+SHA256 (rust/crates/nix-0.23.2.crate) = 8f3790c00a0150112de0f4cd161e3d7fc4b2d8a5542ffc35f099a2562aecb35c
+SIZE (rust/crates/nix-0.23.2.crate) = 242042
+SHA256 (rust/crates/nix-0.25.1.crate) = f346ff70e7dbfd675fe90590b92d59ef2de15a8779ae305ebcbfd3f0caf59be4
+SIZE (rust/crates/nix-0.25.1.crate) = 272312
+SHA256 (rust/crates/nix-0.26.4.crate) = 598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b
+SIZE (rust/crates/nix-0.26.4.crate) = 279099
+SHA256 (rust/crates/nom-7.1.3.crate) = d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a
+SIZE (rust/crates/nom-7.1.3.crate) = 117570
+SHA256 (rust/crates/normalize-line-endings-0.3.0.crate) = 61807f77802ff30975e01f4f071c8ba10c022052f98b3294119f3e615d13e5be
+SIZE (rust/crates/normalize-line-endings-0.3.0.crate) = 5737
+SHA256 (rust/crates/notify-6.1.1.crate) = 6205bd8bb1e454ad2e27422015fb5e4f2bcc7e08fa8f27058670d208324a4d2d
+SIZE (rust/crates/notify-6.1.1.crate) = 40117
+SHA256 (rust/crates/ntapi-0.4.1.crate) = e8a3895c6391c39d7fe7ebc444a87eb2991b2a0bc718fdabd071eec617fc68e4
+SIZE (rust/crates/ntapi-0.4.1.crate) = 126552
+SHA256 (rust/crates/nu-ansi-term-0.46.0.crate) = 77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84
+SIZE (rust/crates/nu-ansi-term-0.46.0.crate) = 24311
+SHA256 (rust/crates/num-0.4.1.crate) = b05180d69e3da0e530ba2a1dae5110317e49e3b7f3d41be227dc5f92e49ee7af
+SIZE (rust/crates/num-0.4.1.crate) = 9522
+SHA256 (rust/crates/num-bigint-0.4.4.crate) = 608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0
+SIZE (rust/crates/num-bigint-0.4.4.crate) = 99369
+SHA256 (rust/crates/num-bigint-dig-0.8.4.crate) = dc84195820f291c7697304f3cbdadd1cb7199c0efc917ff5eafd71225c136151
+SIZE (rust/crates/num-bigint-dig-0.8.4.crate) = 123825
+SHA256 (rust/crates/num-complex-0.4.4.crate) = 1ba157ca0885411de85d6ca030ba7e2a83a28636056c7c699b07c8b6f7383214
+SIZE (rust/crates/num-complex-0.4.4.crate) = 29564
+SHA256 (rust/crates/num-derive-0.4.1.crate) = cfb77679af88f8b125209d354a202862602672222e7f2313fdd6dc349bad4712
+SIZE (rust/crates/num-derive-0.4.1.crate) = 14840
+SHA256 (rust/crates/num-format-0.4.4.crate) = a652d9771a63711fd3c3deb670acfbe5c30a4072e664d7a3bf5a9e1056ac72c3
+SIZE (rust/crates/num-format-0.4.4.crate) = 61509
+SHA256 (rust/crates/num-integer-0.1.45.crate) = 225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9
+SIZE (rust/crates/num-integer-0.1.45.crate) = 22529
+SHA256 (rust/crates/num-iter-0.1.43.crate) = 7d03e6c028c5dc5cac6e2dec0efda81fc887605bb3d884578bb6d6bf7514e252
+SIZE (rust/crates/num-iter-0.1.43.crate) = 10655
+SHA256 (rust/crates/num-rational-0.4.1.crate) = 0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0
+SIZE (rust/crates/num-rational-0.4.1.crate) = 27889
+SHA256 (rust/crates/num-traits-0.2.17.crate) = 39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c
+SIZE (rust/crates/num-traits-0.2.17.crate) = 50190
+SHA256 (rust/crates/num_cpus-1.16.0.crate) = 4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43
+SIZE (rust/crates/num_cpus-1.16.0.crate) = 15713
+SHA256 (rust/crates/num_enum-0.5.11.crate) = 1f646caf906c20226733ed5b1374287eb97e3c2a5c227ce668c1f2ce20ae57c9
+SIZE (rust/crates/num_enum-0.5.11.crate) = 16772
+SHA256 (rust/crates/num_enum_derive-0.5.11.crate) = dcbff9bc912032c62bf65ef1d5aea88983b420f4f839db1e9b0c281a25c9c799
+SIZE (rust/crates/num_enum_derive-0.5.11.crate) = 15552
+SHA256 (rust/crates/number_prefix-0.4.0.crate) = 830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3
+SIZE (rust/crates/number_prefix-0.4.0.crate) = 6922
+SHA256 (rust/crates/objc-0.2.7.crate) = 915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1
+SIZE (rust/crates/objc-0.2.7.crate) = 22036
+SHA256 (rust/crates/object-0.32.2.crate) = a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441
+SIZE (rust/crates/object-0.32.2.crate) = 286994
+SHA256 (rust/crates/object-pool-0.5.4.crate) = ee9a3e7196d09ec86002b939f1576e8e446d58def8fd48fe578e2c72d5328d68
+SIZE (rust/crates/object-pool-0.5.4.crate) = 2335507
+SHA256 (rust/crates/object_store-0.7.1.crate) = f930c88a43b1c3f6e776dfe495b4afab89882dbc81530c632db2ed65451ebcb4
+SIZE (rust/crates/object_store-0.7.1.crate) = 141940
+SHA256 (rust/crates/once_cell-1.19.0.crate) = 3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92
+SIZE (rust/crates/once_cell-1.19.0.crate) = 33046
+SHA256 (rust/crates/oorandom-11.1.3.crate) = 0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575
+SIZE (rust/crates/oorandom-11.1.3.crate) = 10068
+SHA256 (rust/crates/opendal-0.45.1.crate) = 52c17c077f23fa2d2c25d9d22af98baa43b8bbe2ef0de80cf66339aa70401467
+SIZE (rust/crates/opendal-0.45.1.crate) = 608526
+SHA256 (rust/crates/openmetrics-parser-0.4.4.crate) = e40a68c62e09c5dfec2f6472af3bd5e8ddf506fcf14c78ece23794ffbb874eca
+SIZE (rust/crates/openmetrics-parser-0.4.4.crate) = 27509
+SHA256 (rust/crates/opensrv-mysql-0.7.0.crate) = 4148ab944991b0a33be74d2636a815268974578812a9e4cf7dc785325e858154
+SIZE (rust/crates/opensrv-mysql-0.7.0.crate) = 103724
+SHA256 (rust/crates/openssl-probe-0.1.5.crate) = ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf
+SIZE (rust/crates/openssl-probe-0.1.5.crate) = 7227
+SHA256 (rust/crates/opentelemetry-0.21.0.crate) = 1e32339a5dc40459130b3bd269e9892439f55b33e772d2a9d402a789baaf4e8a
+SIZE (rust/crates/opentelemetry-0.21.0.crate) = 70114
+SHA256 (rust/crates/opentelemetry-otlp-0.14.0.crate) = f24cda83b20ed2433c68241f918d0f6fdec8b1d43b7a9590ab4420c5095ca930
+SIZE (rust/crates/opentelemetry-otlp-0.14.0.crate) = 30982
+SHA256 (rust/crates/opentelemetry-proto-0.4.0.crate) = a2e155ce5cc812ea3d1dffbd1539aed653de4bf4882d60e6e04dcf0901d674e1
+SIZE (rust/crates/opentelemetry-proto-0.4.0.crate) = 159421
+SHA256 (rust/crates/opentelemetry-semantic-conventions-0.13.0.crate) = f5774f1ef1f982ef2a447f6ee04ec383981a3ab99c8e77a1a7b30182e65bbc84
+SIZE (rust/crates/opentelemetry-semantic-conventions-0.13.0.crate) = 32259
+SHA256 (rust/crates/opentelemetry_sdk-0.21.1.crate) = 968ba3f2ca03e90e5187f5e4f46c791ef7f2c163ae87789c8ce5f5ca3b7b7de5
+SIZE (rust/crates/opentelemetry_sdk-0.21.1.crate) = 118942
+SHA256 (rust/crates/optional-0.5.0.crate) = 978aa494585d3ca4ad74929863093e87cac9790d81fe7aba2b3dc2890643a0fc
+SIZE (rust/crates/optional-0.5.0.crate) = 18863
+SHA256 (rust/crates/orc-rust-0.2.43.crate) = 900310981898f6e3877286f1272b75f5c4a604628594a0a7026311b93a2aa5e6
+SIZE (rust/crates/orc-rust-0.2.43.crate) = 25128
+SHA256 (rust/crates/ordered-float-2.10.1.crate) = 68f19d67e5a2795c94e73e0bb1cc1a7edeb2e28efd39e2e1c9b7a40c1108b11c
+SIZE (rust/crates/ordered-float-2.10.1.crate) = 16029
+SHA256 (rust/crates/ordered-float-3.9.2.crate) = f1e1c390732d15f1d48471625cd92d154e66db2c56645e29a9cd26f4699f72dc
+SIZE (rust/crates/ordered-float-3.9.2.crate) = 19788
+SHA256 (rust/crates/ordered-float-4.2.0.crate) = a76df7075c7d4d01fdcb46c912dd17fba5b60c78ea480b475f2b6ab6f666584e
+SIZE (rust/crates/ordered-float-4.2.0.crate) = 20510
+SHA256 (rust/crates/ordered-multimap-0.4.3.crate) = ccd746e37177e1711c20dd619a1620f34f5c8b569c53590a72dedd5344d8924a
+SIZE (rust/crates/ordered-multimap-0.4.3.crate) = 19599
+SHA256 (rust/crates/ordered-multimap-0.7.1.crate) = a4d6a8c22fc714f0c2373e6091bf6f5e9b37b1bc0b1184874b7e0a4e303d318f
+SIZE (rust/crates/ordered-multimap-0.7.1.crate) = 23144
+SHA256 (rust/crates/os_info-3.7.0.crate) = 006e42d5b888366f1880eda20371fedde764ed2213dc8496f49622fa0c99cd5e
+SIZE (rust/crates/os_info-3.7.0.crate) = 24133
+SHA256 (rust/crates/os_str_bytes-6.6.1.crate) = e2355d85b9a3786f481747ced0e0ff2ba35213a1f9bd406ed906554d7af805a1
+SIZE (rust/crates/os_str_bytes-6.6.1.crate) = 27643
+SHA256 (rust/crates/overload-0.1.1.crate) = b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39
+SIZE (rust/crates/overload-0.1.1.crate) = 24439
+SHA256 (rust/crates/packedvec-1.2.4.crate) = bde3c690ec20e4a2b4fb46f0289a451181eb50011a1e2acc8d85e2fde9062a45
+SIZE (rust/crates/packedvec-1.2.4.crate) = 9295
+SHA256 (rust/crates/pad-0.1.6.crate) = d2ad9b889f1b12e0b9ee24db044b5129150d5eada288edc800f789928dc8c0e3
+SIZE (rust/crates/pad-0.1.6.crate) = 4963
+SHA256 (rust/crates/page_size-0.4.2.crate) = eebde548fbbf1ea81a99b128872779c437752fb99f217c45245e1a61dcd9edcd
+SIZE (rust/crates/page_size-0.4.2.crate) = 8386
+SHA256 (rust/crates/parking_lot-0.11.2.crate) = 7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99
+SIZE (rust/crates/parking_lot-0.11.2.crate) = 39869
+SHA256 (rust/crates/parking_lot-0.12.1.crate) = 3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f
+SIZE (rust/crates/parking_lot-0.12.1.crate) = 40967
+SHA256 (rust/crates/parking_lot_core-0.8.6.crate) = 60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc
+SIZE (rust/crates/parking_lot_core-0.8.6.crate) = 32567
+SHA256 (rust/crates/parking_lot_core-0.9.9.crate) = 4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e
+SIZE (rust/crates/parking_lot_core-0.9.9.crate) = 32445
+SHA256 (rust/crates/parquet-47.0.0.crate) = 0463cc3b256d5f50408c49a4be3a16674f4c8ceef60941709620a062b1f6bf4d
+SIZE (rust/crates/parquet-47.0.0.crate) = 413518
+SHA256 (rust/crates/parse-zoneinfo-0.3.0.crate) = c705f256449c60da65e11ff6626e0c16a0a0b96aaa348de61376b249bc340f41
+SIZE (rust/crates/parse-zoneinfo-0.3.0.crate) = 76590
+SHA256 (rust/crates/paste-1.0.14.crate) = de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c
+SIZE (rust/crates/paste-1.0.14.crate) = 18157
+SHA256 (rust/crates/path-slash-0.2.1.crate) = 1e91099d4268b0e11973f036e885d652fb0b21fedcf69738c627f94db6a44f42
+SIZE (rust/crates/path-slash-0.2.1.crate) = 8821
+SHA256 (rust/crates/pathdiff-0.2.1.crate) = 8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd
+SIZE (rust/crates/pathdiff-0.2.1.crate) = 7142
+SHA256 (rust/crates/pbkdf2-0.12.2.crate) = f8ed6a7761f76e3b9f92dfb0a60a6a6477c61024b775147ff0973a02653abaf2
+SIZE (rust/crates/pbkdf2-0.12.2.crate) = 13906
+SHA256 (rust/crates/peeking_take_while-0.1.2.crate) = 19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099
+SIZE (rust/crates/peeking_take_while-0.1.2.crate) = 6697
+SHA256 (rust/crates/pem-3.0.3.crate) = 1b8fcc794035347fb64beda2d3b462595dd2753e3f268d89c5aae77e8cf2c310
+SIZE (rust/crates/pem-3.0.3.crate) = 13035
+SHA256 (rust/crates/pem-rfc7468-0.3.1.crate) = 01de5d978f34aa4b2296576379fcc416034702fd94117c56ffd8a1a767cefb30
+SIZE (rust/crates/pem-rfc7468-0.3.1.crate) = 22690
+SHA256 (rust/crates/pem-rfc7468-0.7.0.crate) = 88b39c9bfcfc231068454382784bb460aae594343fb030d46e9f50a645418412
+SIZE (rust/crates/pem-rfc7468-0.7.0.crate) = 24159
+SHA256 (rust/crates/percent-encoding-2.3.1.crate) = e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e
+SIZE (rust/crates/percent-encoding-2.3.1.crate) = 10235
+SHA256 (rust/crates/permutation-0.4.1.crate) = df202b0b0f5b8e389955afd5f27b007b00fb948162953f1db9c70d2c7e3157d7
+SIZE (rust/crates/permutation-0.4.1.crate) = 11876
+SHA256 (rust/crates/pest-2.7.5.crate) = ae9cee2a55a544be8b89dc6848072af97a20f2422603c10865be2a42b580fff5
+SIZE (rust/crates/pest-2.7.5.crate) = 117583
+SHA256 (rust/crates/pest_derive-2.7.5.crate) = 81d78524685f5ef2a3b3bd1cafbc9fcabb036253d9b1463e726a91cd16e2dfc2
+SIZE (rust/crates/pest_derive-2.7.5.crate) = 35415
+SHA256 (rust/crates/pest_generator-2.7.5.crate) = 68bd1206e71118b5356dae5ddc61c8b11e28b09ef6a31acbd15ea48a28e0c227
+SIZE (rust/crates/pest_generator-2.7.5.crate) = 17709
+SHA256 (rust/crates/pest_meta-2.7.5.crate) = 7c747191d4ad9e4a4ab9c8798f1e82a39affe7ef9648390b7e5548d18e099de6
+SIZE (rust/crates/pest_meta-2.7.5.crate) = 40969
+SHA256 (rust/crates/petgraph-0.6.4.crate) = e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9
+SIZE (rust/crates/petgraph-0.6.4.crate) = 185895
+SHA256 (rust/crates/pgwire-0.20.0.crate) = c00492c52bb65e0421211b7f4c5d9de7586e53786a3b244efb00f74851206bf6
+SIZE (rust/crates/pgwire-0.20.0.crate) = 82998
+SHA256 (rust/crates/phf-0.11.2.crate) = ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc
+SIZE (rust/crates/phf-0.11.2.crate) = 21569
+SHA256 (rust/crates/phf_codegen-0.11.2.crate) = e8d39688d359e6b34654d328e262234662d16cc0f60ec8dcbe5e718709342a5a
+SIZE (rust/crates/phf_codegen-0.11.2.crate) = 12977
+SHA256 (rust/crates/phf_generator-0.11.2.crate) = 48e4cc64c2ad9ebe670cb8fd69dd50ae301650392e81c05f9bfcb2d5bdbc24b0
+SIZE (rust/crates/phf_generator-0.11.2.crate) = 14190
+SHA256 (rust/crates/phf_shared-0.10.0.crate) = b6796ad771acdc0123d2a88dc428b5e38ef24456743ddb1744ed628f9815c096
+SIZE (rust/crates/phf_shared-0.10.0.crate) = 4095
+SHA256 (rust/crates/phf_shared-0.11.2.crate) = 90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b
+SIZE (rust/crates/phf_shared-0.11.2.crate) = 14284
+SHA256 (rust/crates/pin-project-1.1.3.crate) = fda4ed1c6c173e3fc7a83629421152e01d7b1f9b7f65fb301e490e8cfc656422
+SIZE (rust/crates/pin-project-1.1.3.crate) = 57740
+SHA256 (rust/crates/pin-project-internal-1.1.3.crate) = 4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405
+SIZE (rust/crates/pin-project-internal-1.1.3.crate) = 27824
+SHA256 (rust/crates/pin-project-lite-0.2.13.crate) = 8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58
+SIZE (rust/crates/pin-project-lite-0.2.13.crate) = 29141
+SHA256 (rust/crates/pin-utils-0.1.0.crate) = 8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184
+SIZE (rust/crates/pin-utils-0.1.0.crate) = 7580
+SHA256 (rust/crates/pkcs1-0.3.3.crate) = a78f66c04ccc83dd4486fd46c33896f4e17b24a7a3a6400dedc48ed0ddd72320
+SIZE (rust/crates/pkcs1-0.3.3.crate) = 32081
+SHA256 (rust/crates/pkcs1-0.7.5.crate) = c8ffb9f10fa047879315e6625af03c164b16962a5368d724ed16323b68ace47f
+SIZE (rust/crates/pkcs1-0.7.5.crate) = 35790
+SHA256 (rust/crates/pkcs5-0.7.1.crate) = e847e2c91a18bfa887dd028ec33f2fe6f25db77db3619024764914affe8b69a6
+SIZE (rust/crates/pkcs5-0.7.1.crate) = 41902
+SHA256 (rust/crates/pkcs8-0.8.0.crate) = 7cabda3fb821068a9a4fab19a683eac3af12edf0f34b94a8be53c4972b8149d0
+SIZE (rust/crates/pkcs8-0.8.0.crate) = 27313
+SHA256 (rust/crates/pkcs8-0.10.2.crate) = f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7
+SIZE (rust/crates/pkcs8-0.10.2.crate) = 26360
+SHA256 (rust/crates/pkg-config-0.3.28.crate) = 69d3587f8a9e599cc7ec2c00e331f71c4e69a5f9a4b8a6efd5b07466b9736f9a
+SIZE (rust/crates/pkg-config-0.3.28.crate) = 20330
+SHA256 (rust/crates/plotters-0.3.5.crate) = d2c224ba00d7cadd4d5c660deaf2098e5e80e07846537c51f9cfa4be50c1fd45
+SIZE (rust/crates/plotters-0.3.5.crate) = 143975
+SHA256 (rust/crates/plotters-backend-0.3.5.crate) = 9e76628b4d3a7581389a35d5b6e2139607ad7c75b17aed325f210aa91f4a9609
+SIZE (rust/crates/plotters-backend-0.3.5.crate) = 13440
+SHA256 (rust/crates/plotters-svg-0.3.5.crate) = 38f6d39893cca0701371e3c27294f09797214b86f1fb951b89ade8ec04e2abab
+SIZE (rust/crates/plotters-svg-0.3.5.crate) = 6948
+SHA256 (rust/crates/pmutil-0.5.3.crate) = 3894e5d549cccbe44afecf72922f277f603cd4bb0219c8342631ef18fffbe004
+SIZE (rust/crates/pmutil-0.5.3.crate) = 11031
+SHA256 (rust/crates/portable-atomic-1.6.0.crate) = 7170ef9988bc169ba16dd36a7fa041e5c4cbeb6a35b76d4c03daded371eae7c0
+SIZE (rust/crates/portable-atomic-1.6.0.crate) = 140689
+SHA256 (rust/crates/postgres-protocol-0.6.6.crate) = 49b6c5ef183cd3ab4ba005f1ca64c21e8bd97ce4699cfea9e8d9a2c4958ca520
+SIZE (rust/crates/postgres-protocol-0.6.6.crate) = 25224
+SHA256 (rust/crates/postgres-types-0.2.6.crate) = 8d2234cdee9408b523530a9b6d2d6b373d1db34f6a8e51dc03ded1828d7fb67c
+SIZE (rust/crates/postgres-types-0.2.6.crate) = 29521
+SHA256 (rust/crates/powerfmt-0.2.0.crate) = 439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391
+SIZE (rust/crates/powerfmt-0.2.0.crate) = 15165
+SHA256 (rust/crates/pprof-0.13.0.crate) = ef5c97c51bd34c7e742402e216abdeb44d415fbe6ae41d56b114723e953711cb
+SIZE (rust/crates/pprof-0.13.0.crate) = 44693
+SHA256 (rust/crates/ppv-lite86-0.2.17.crate) = 5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de
+SIZE (rust/crates/ppv-lite86-0.2.17.crate) = 22242
+SHA256 (rust/crates/precomputed-hash-0.1.1.crate) = 925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c
+SIZE (rust/crates/precomputed-hash-0.1.1.crate) = 1640
+SHA256 (rust/crates/predicates-2.1.5.crate) = 59230a63c37f3e18569bdb90e4a89cbf5bf8b06fea0b84e65ea10cc4df47addd
+SIZE (rust/crates/predicates-2.1.5.crate) = 24165
+SHA256 (rust/crates/predicates-core-1.0.6.crate) = b794032607612e7abeb4db69adb4e33590fa6cf1149e95fd7cb00e634b92f174
+SIZE (rust/crates/predicates-core-1.0.6.crate) = 8084
+SHA256 (rust/crates/predicates-tree-1.0.9.crate) = 368ba315fb8c5052ab692e68a0eefec6ec57b23a36959c14496f0b0df2c0cecf
+SIZE (rust/crates/predicates-tree-1.0.9.crate) = 7960
+SHA256 (rust/crates/prettydiff-0.6.4.crate) = 8ff1fec61082821f8236cf6c0c14e8172b62ce8a72a0eedc30d3b247bb68dc11
+SIZE (rust/crates/prettydiff-0.6.4.crate) = 68435
+SHA256 (rust/crates/prettyplease-0.1.25.crate) = 6c8646e95016a7a6c4adea95bafa8a16baab64b583356217f2c85db4a39d9a86
+SIZE (rust/crates/prettyplease-0.1.25.crate) = 49545
+SHA256 (rust/crates/prettyplease-0.2.15.crate) = ae005bd773ab59b4725093fd7df83fd7892f7d8eafb48dbd7de6e024e4215f9d
+SIZE (rust/crates/prettyplease-0.2.15.crate) = 57034
+SHA256 (rust/crates/proc-macro-crate-1.3.1.crate) = 7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919
+SIZE (rust/crates/proc-macro-crate-1.3.1.crate) = 9678
+SHA256 (rust/crates/proc-macro-crate-2.0.0.crate) = 7e8366a6159044a37876a2b9817124296703c586a5c92e2c53751fa06d8d43e8
+SIZE (rust/crates/proc-macro-crate-2.0.0.crate) = 10922
+SHA256 (rust/crates/proc-macro-crate-3.1.0.crate) = 6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284
+SIZE (rust/crates/proc-macro-crate-3.1.0.crate) = 11084
+SHA256 (rust/crates/proc-macro-error-1.0.4.crate) = da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c
+SIZE (rust/crates/proc-macro-error-1.0.4.crate) = 25293
+SHA256 (rust/crates/proc-macro-error-attr-1.0.4.crate) = a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869
+SIZE (rust/crates/proc-macro-error-attr-1.0.4.crate) = 7971
+SHA256 (rust/crates/proc-macro2-1.0.71.crate) = 75cb1540fadbd5b8fbccc4dddad2734eba435053f725621c070711a14bb5f4b8
+SIZE (rust/crates/proc-macro2-1.0.71.crate) = 44407
+SHA256 (rust/crates/procfs-0.14.2.crate) = b1de8dacb0873f77e6aefc6d71e044761fcc68060290f5b1089fcdf84626bb69
+SIZE (rust/crates/procfs-0.14.2.crate) = 116068
+SHA256 (rust/crates/prometheus-0.13.3.crate) = 449811d15fbdf5ceb5c1144416066429cf82316e2ec8ce0c1f6f8a02e7bbcf8c
+SIZE (rust/crates/prometheus-0.13.3.crate) = 82457
+SHA256 (rust/crates/prometheus-static-metric-0.5.1.crate) = f8f30cdb09c39930b8fa5e0f23cbb895ab3f766b187403a0ba0956fc1ef4f0e5
+SIZE (rust/crates/prometheus-static-metric-0.5.1.crate) = 22167
+SHA256 (rust/crates/promql-parser-0.1.4.crate) = a96ad54e4f5d76ea28a131b1a09aaa6e58708eae98510f63ccec4ce7514bf30d
+SIZE (rust/crates/promql-parser-0.1.4.crate) = 59643
+SHA256 (rust/crates/prost-0.11.9.crate) = 0b82eaa1d779e9a4bc1c3217db8ffbeabaae1dca241bf70183242128d48681cd
+SIZE (rust/crates/prost-0.11.9.crate) = 28958
+SHA256 (rust/crates/prost-0.12.3.crate) = 146c289cda302b98a28d40c8b3b90498d6e526dd24ac2ecea73e4e491685b94a
+SIZE (rust/crates/prost-0.12.3.crate) = 29461
+SHA256 (rust/crates/prost-build-0.11.9.crate) = 119533552c9a7ffacc21e099c24a0ac8bb19c2a2a3f363de84cd9b844feab270
+SIZE (rust/crates/prost-build-0.11.9.crate) = 37990
+SHA256 (rust/crates/prost-build-0.12.3.crate) = c55e02e35260070b6f716a2423c2ff1c3bb1642ddca6f99e1f26d06268a0e2d2
+SIZE (rust/crates/prost-build-0.12.3.crate) = 39018
+SHA256 (rust/crates/prost-derive-0.11.9.crate) = e5d2d8d10f3c6ded6da8b05b5fb3b8a5082514344d56c9f871412d29b4e075b4
+SIZE (rust/crates/prost-derive-0.11.9.crate) = 19513
+SHA256 (rust/crates/prost-derive-0.12.3.crate) = efb6c9a1dd1def8e2124d17e83a20af56f1570d6c2d2bd9e266ccb768df3840e
+SIZE (rust/crates/prost-derive-0.12.3.crate) = 19603
+SHA256 (rust/crates/prost-types-0.11.9.crate) = 213622a1460818959ac1181aaeb2dc9c7f63df720db7d788b3e24eacd1983e13
+SIZE (rust/crates/prost-types-0.11.9.crate) = 40809
+SHA256 (rust/crates/prost-types-0.12.3.crate) = 193898f59edcf43c26227dcd4c8427f00d99d61e95dcde58dabd49fa291d470e
+SIZE (rust/crates/prost-types-0.12.3.crate) = 42091
+SHA256 (rust/crates/protobuf-2.28.0.crate) = 106dd99e98437432fed6519dedecfade6a06a73bb7b2a1e019fdd2bee5778d94
+SIZE (rust/crates/protobuf-2.28.0.crate) = 167541
+SHA256 (rust/crates/protobuf-build-0.15.1.crate) = c852d9625b912c3e50480cdc701f60f49890b5d7ad46198dd583600f15e7c6ec
+SIZE (rust/crates/protobuf-build-0.15.1.crate) = 2291834
+SHA256 (rust/crates/protobuf-codegen-2.28.0.crate) = 033460afb75cf755fcfc16dfaed20b86468082a2ea24e05ac35ab4a099a017d6
+SIZE (rust/crates/protobuf-codegen-2.28.0.crate) = 40826
+SHA256 (rust/crates/protobuf-src-1.1.0+21.5.crate) = c7ac8852baeb3cc6fb83b93646fb93c0ffe5d14bf138c945ceb4b9948ee0e3c1
+SIZE (rust/crates/protobuf-src-1.1.0+21.5.crate) = 6792235
+SHA256 (rust/crates/ptr_meta-0.1.4.crate) = 0738ccf7ea06b608c10564b31debd4f5bc5e197fc8bfe088f68ae5ce81e7a4f1
+SIZE (rust/crates/ptr_meta-0.1.4.crate) = 5754
+SHA256 (rust/crates/ptr_meta_derive-0.1.4.crate) = 16b845dbfca988fa33db069c0e230574d15a3088f147a87b64c7589eb662c9ac
+SIZE (rust/crates/ptr_meta_derive-0.1.4.crate) = 2302
+SHA256 (rust/crates/pulldown-cmark-0.9.3.crate) = 77a1a2f1f0a7ecff9c31abbe177637be0e97a0aef46cf8738ece09327985d998
+SIZE (rust/crates/pulldown-cmark-0.9.3.crate) = 117339
+SHA256 (rust/crates/puruspe-0.1.5.crate) = 3b7e158a385023d209d6d5f2585c4b468f6dcb3dd5aca9b75c4f1678c05bb375
+SIZE (rust/crates/puruspe-0.1.5.crate) = 9929
+SHA256 (rust/crates/pusherator-0.0.3.crate) = bd486cb5153e0d8fa91d3daebae48917ae299b2569cc79901922f3923dc312ef
+SIZE (rust/crates/pusherator-0.0.3.crate) = 6651
+SHA256 (rust/crates/pyo3-0.19.2.crate) = e681a6cfdc4adcc93b4d3cf993749a4552018ee0a9b65fc0ccfad74352c72a38
+SIZE (rust/crates/pyo3-0.19.2.crate) = 418228
+SHA256 (rust/crates/pyo3-build-config-0.19.2.crate) = 076c73d0bc438f7a4ef6fdd0c3bb4732149136abd952b110ac93e4edb13a6ba5
+SIZE (rust/crates/pyo3-build-config-0.19.2.crate) = 29206
+SHA256 (rust/crates/pyo3-ffi-0.19.2.crate) = e53cee42e77ebe256066ba8aa77eff722b3bb91f3419177cf4cd0f304d3284d9
+SIZE (rust/crates/pyo3-ffi-0.19.2.crate) = 66500
+SHA256 (rust/crates/pyo3-macros-0.19.2.crate) = dfeb4c99597e136528c6dd7d5e3de5434d1ceaf487436a3f03b2d56b6fc9efd1
+SIZE (rust/crates/pyo3-macros-0.19.2.crate) = 7173
+SHA256 (rust/crates/pyo3-macros-backend-0.19.2.crate) = 947dc12175c254889edc0c02e399476c2f652b4b9ebd123aa655c224de259536
+SIZE (rust/crates/pyo3-macros-backend-0.19.2.crate) = 49962
+SHA256 (rust/crates/quanta-0.11.1.crate) = a17e662a7a8291a865152364c20c7abc5e60486ab2001e8ec10b24862de0b9ab
+SIZE (rust/crates/quanta-0.11.1.crate) = 27775
+SHA256 (rust/crates/quick-xml-0.26.0.crate) = 7f50b1c63b38611e7d4d7f68b82d3ad0cc71a2ad2e7f61fc10f1328d917c93cd
+SIZE (rust/crates/quick-xml-0.26.0.crate) = 116260
+SHA256 (rust/crates/quick-xml-0.31.0.crate) = 1004a344b30a54e2ee58d66a71b32d2db2feb0a31f9a2d302bf0536f15de2a33
+SIZE (rust/crates/quick-xml-0.31.0.crate) = 172236
+SHA256 (rust/crates/quote-1.0.33.crate) = 5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae
+SIZE (rust/crates/quote-1.0.33.crate) = 28090
+SHA256 (rust/crates/radium-0.7.0.crate) = dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09
+SIZE (rust/crates/radium-0.7.0.crate) = 10906
+SHA256 (rust/crates/radix_trie-0.2.1.crate) = c069c179fcdc6a2fe24d8d18305cf085fdbd4f922c041943e203685d6a1c58fd
+SIZE (rust/crates/radix_trie-0.2.1.crate) = 251366
+SHA256 (rust/crates/raft-engine-0.4.1.crate) = 3bc58d7f3a865d3224bad461e5fbe386b799b2b7eabea43e1da6f11ac725d83f
+SIZE (rust/crates/raft-engine-0.4.1.crate) = 135944
+SHA256 (rust/crates/rand-0.8.5.crate) = 34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404
+SIZE (rust/crates/rand-0.8.5.crate) = 87113
+SHA256 (rust/crates/rand_chacha-0.3.1.crate) = e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88
+SIZE (rust/crates/rand_chacha-0.3.1.crate) = 15251
+SHA256 (rust/crates/rand_core-0.6.4.crate) = ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c
+SIZE (rust/crates/rand_core-0.6.4.crate) = 22666
+SHA256 (rust/crates/rand_distr-0.4.3.crate) = 32cb0b9bc82b0a0876c2dd994a7e7a2683d3e7390ca40e6886785ef0c7e3ee31
+SIZE (rust/crates/rand_distr-0.4.3.crate) = 58255
+SHA256 (rust/crates/raw-cpuid-10.7.0.crate) = 6c297679cb867470fa8c9f67dbba74a78d78e3e98d7cf2b08d6d71540f797332
+SIZE (rust/crates/raw-cpuid-10.7.0.crate) = 107292
+SHA256 (rust/crates/raw-window-handle-0.5.2.crate) = f2ff9a1f06a88b01621b7ae906ef0211290d1c8a168a15542486a8f61c0833b9
+SIZE (rust/crates/raw-window-handle-0.5.2.crate) = 17063
+SHA256 (rust/crates/rawpointer-0.2.1.crate) = 60a357793950651c4ed0f3f52338f53b2f809f32d83a07f72909fa13e4c6c1e3
+SIZE (rust/crates/rawpointer-0.2.1.crate) = 7490
+SHA256 (rust/crates/rayon-1.8.0.crate) = 9c27db03db7734835b3f53954b534c91069375ce6ccaa2e065441e07d9b6cdb1
+SIZE (rust/crates/rayon-1.8.0.crate) = 170172
+SHA256 (rust/crates/rayon-core-1.12.0.crate) = 5ce3fb6ad83f861aac485e76e1985cd109d9a3713802152be56c3b1f0e0658ed
+SIZE (rust/crates/rayon-core-1.12.0.crate) = 70081
+SHA256 (rust/crates/redox_syscall-0.2.16.crate) = fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a
+SIZE (rust/crates/redox_syscall-0.2.16.crate) = 24012
+SHA256 (rust/crates/redox_syscall-0.4.1.crate) = 4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa
+SIZE (rust/crates/redox_syscall-0.4.1.crate) = 24858
+SHA256 (rust/crates/redox_users-0.4.4.crate) = a18479200779601e498ada4e8c1e1f50e3ee19deb0259c25825a98b5603b2cb4
+SIZE (rust/crates/redox_users-0.4.4.crate) = 15438
+SHA256 (rust/crates/ref-cast-1.0.21.crate) = 53313ec9f12686aeeffb43462c3ac77aa25f590a5f630eb2cde0de59417b29c7
+SIZE (rust/crates/ref-cast-1.0.21.crate) = 12659
+SHA256 (rust/crates/ref-cast-impl-1.0.21.crate) = 2566c4bf6845f2c2e83b27043c3f5dfcd5ba8f2937d6c00dc009bfb51a079dc4
+SIZE (rust/crates/ref-cast-impl-1.0.21.crate) = 9289
+SHA256 (rust/crates/regex-1.10.2.crate) = 380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343
+SIZE (rust/crates/regex-1.10.2.crate) = 252839
+SHA256 (rust/crates/regex-automata-0.1.10.crate) = 6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132
+SIZE (rust/crates/regex-automata-0.1.10.crate) = 114533
+SHA256 (rust/crates/regex-automata-0.4.3.crate) = 5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f
+SIZE (rust/crates/regex-automata-0.4.3.crate) = 617011
+SHA256 (rust/crates/regex-syntax-0.6.29.crate) = f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1
+SIZE (rust/crates/regex-syntax-0.6.29.crate) = 299752
+SHA256 (rust/crates/regex-syntax-0.7.5.crate) = dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da
+SIZE (rust/crates/regex-syntax-0.7.5.crate) = 343366
+SHA256 (rust/crates/regex-syntax-0.8.2.crate) = c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f
+SIZE (rust/crates/regex-syntax-0.8.2.crate) = 347228
+SHA256 (rust/crates/regress-0.7.1.crate) = 4ed9969cad8051328011596bf549629f1b800cf1731e7964b1eef8dfc480d2c2
+SIZE (rust/crates/regress-0.7.1.crate) = 248686
+SHA256 (rust/crates/rend-0.4.1.crate) = a2571463863a6bd50c32f94402933f03457a3fbaf697a707c5be741e459f08fd
+SIZE (rust/crates/rend-0.4.1.crate) = 9305
+SHA256 (rust/crates/reqsign-0.14.9.crate) = 43e319d9de9ff4d941abf4ac718897118b0fe04577ea3f8e0f5788971784eef5
+SIZE (rust/crates/reqsign-0.14.9.crate) = 68657
+SHA256 (rust/crates/reqwest-0.11.23.crate) = 37b1ae8d9ac08420c66222fb9096fc5de435c3c48542bc5336c51892cffafb41
+SIZE (rust/crates/reqwest-0.11.23.crate) = 158448
+SHA256 (rust/crates/result-like-0.4.6.crate) = ccc7ce6435c33898517a30e85578cd204cbb696875efb93dec19a2d31294f810
+SIZE (rust/crates/result-like-0.4.6.crate) = 4311
+SHA256 (rust/crates/result-like-derive-0.4.6.crate) = 1fabf0a2e54f711c68c50d49f648a1a8a37adcb57353f518ac4df374f0788f42
+SIZE (rust/crates/result-like-derive-0.4.6.crate) = 5814
+SHA256 (rust/crates/rexpect-0.5.0.crate) = 01ff60778f96fb5a48adbe421d21bf6578ed58c0872d712e7e08593c195adff8
+SIZE (rust/crates/rexpect-0.5.0.crate) = 24191
+SHA256 (rust/crates/rgb-0.8.37.crate) = 05aaa8004b64fd573fc9d002f4e632d51ad4f026c2b5ba95fcb6c2f32c2c47d8
+SIZE (rust/crates/rgb-0.8.37.crate) = 16644
+SHA256 (rust/crates/ring-0.16.20.crate) = 3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc
+SIZE (rust/crates/ring-0.16.20.crate) = 5082615
+SHA256 (rust/crates/ring-0.17.7.crate) = 688c63d65483050968b2a8937f7995f443e27041a0f7700aa59b0822aedebb74
+SIZE (rust/crates/ring-0.17.7.crate) = 4146482
+SHA256 (rust/crates/rkyv-0.7.43.crate) = 527a97cdfef66f65998b5f3b637c26f5a5ec09cc52a3f9932313ac645f4190f5
+SIZE (rust/crates/rkyv-0.7.43.crate) = 115657
+SHA256 (rust/crates/rkyv_derive-0.7.43.crate) = b5c462a1328c8e67e4d6dbad1eb0355dd43e8ab432c6e227a43657f16ade5033
+SIZE (rust/crates/rkyv_derive-0.7.43.crate) = 18914
+SHA256 (rust/crates/ron-0.7.1.crate) = 88073939a61e5b7680558e6be56b419e208420c2adb92be54921fa6b72283f1a
+SIZE (rust/crates/ron-0.7.1.crate) = 53572
+SHA256 (rust/crates/rsa-0.6.1.crate) = 4cf22754c49613d2b3b119f0e5d46e34a2c628a937e3024b8762de4e7d8c710b
+SIZE (rust/crates/rsa-0.6.1.crate) = 53215
+SHA256 (rust/crates/rsa-0.9.6.crate) = 5d0e5124fcb30e76a7e79bfee683a2746db83784b86289f6251b54b7950a0dfc
+SIZE (rust/crates/rsa-0.9.6.crate) = 80048
+SHA256 (rust/crates/rskafka-0.5.0.crate) = 132ecfa3cd9c3825208524a80881f115337762904ad3f0174e87975b2d79162c
+SIZE (rust/crates/rskafka-0.5.0.crate) = 119210
+SHA256 (rust/crates/rstest-0.17.0.crate) = de1bb486a691878cd320c2f0d319ba91eeaa2e894066d8b5f8f117c000e9d962
+SIZE (rust/crates/rstest-0.17.0.crate) = 26737
+SHA256 (rust/crates/rstest_macros-0.17.0.crate) = 290ca1a1c8ca7edb7c3283bd44dc35dd54fdec6253a3912e201ba1072018fca8
+SIZE (rust/crates/rstest_macros-0.17.0.crate) = 50678
+SHA256 (rust/crates/rstest_reuse-0.5.0.crate) = 45f80dcc84beab3a327bbe161f77db25f336a1452428176787c8c79ac79d7073
+SIZE (rust/crates/rstest_reuse-0.5.0.crate) = 9048
+SHA256 (rust/crates/rust-embed-6.8.1.crate) = a36224c3276f8c4ebc8c20f158eca7ca4359c8db89991c4925132aaaf6702661
+SIZE (rust/crates/rust-embed-6.8.1.crate) = 901392
+SHA256 (rust/crates/rust-embed-impl-6.8.1.crate) = 49b94b81e5b2c284684141a2fb9e2a31be90638caf040bf9afbc5a0416afe1ac
+SIZE (rust/crates/rust-embed-impl-6.8.1.crate) = 4979
+SHA256 (rust/crates/rust-embed-utils-7.8.1.crate) = 9d38ff6bf570dc3bb7100fce9f7b60c33fa71d80e88da3f2580df4ff2bdded74
+SIZE (rust/crates/rust-embed-utils-7.8.1.crate) = 3321
+SHA256 (rust/crates/rust-ini-0.18.0.crate) = f6d5f2436026b4f6e79dc829837d467cc7e9a55ee40e750d716713540715a2df
+SIZE (rust/crates/rust-ini-0.18.0.crate) = 15439
+SHA256 (rust/crates/rust-ini-0.20.0.crate) = 3e0698206bcb8882bf2a9ecb4c1e7785db57ff052297085a6efd4fe42302068a
+SIZE (rust/crates/rust-ini-0.20.0.crate) = 18419
+SHA256 (rust/crates/rust-sitter-0.3.4.crate) = 1a0f365b4eb9591dd3e685791389a932041b0dc6ccf5db1ec3d8913f67279365
+SIZE (rust/crates/rust-sitter-0.3.4.crate) = 5505
+SHA256 (rust/crates/rust-sitter-common-0.3.4.crate) = c3c0a0b1da7317031274502b7c52cbb7cf529e7d1e1f3e23876519372b173a94
+SIZE (rust/crates/rust-sitter-common-0.3.4.crate) = 4751
+SHA256 (rust/crates/rust-sitter-macro-0.3.4.crate) = d25e213e40efa00713547cc0f3529694aca547cfceb0839bbc9406632e14d410
+SIZE (rust/crates/rust-sitter-macro-0.3.4.crate) = 12354
+SHA256 (rust/crates/rust-sitter-tool-0.3.4.crate) = 803c6596476a188a4dd18106eb927a926a202e00077cdaa5648dd620262af158
+SIZE (rust/crates/rust-sitter-tool-0.3.4.crate) = 9489
+SHA256 (rust/crates/rust_decimal-1.33.1.crate) = 06676aec5ccb8fc1da723cc8c0f9a46549f21ebb8753d3915c6c41db1e7f1dc4
+SIZE (rust/crates/rust_decimal-1.33.1.crate) = 125610
+SHA256 (rust/crates/rustc-demangle-0.1.23.crate) = d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76
+SIZE (rust/crates/rustc-demangle-0.1.23.crate) = 28970
+SHA256 (rust/crates/rustc-hash-1.1.0.crate) = 08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2
+SIZE (rust/crates/rustc-hash-1.1.0.crate) = 9331
+SHA256 (rust/crates/rustc_version-0.4.0.crate) = bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366
+SIZE (rust/crates/rustc_version-0.4.0.crate) = 12175
+SHA256 (rust/crates/rustix-0.36.17.crate) = 305efbd14fde4139eb501df5f136994bb520b033fa9fbdce287507dc23b8c7ed
+SIZE (rust/crates/rustix-0.36.17.crate) = 290840
+SHA256 (rust/crates/rustix-0.38.28.crate) = 72e572a5e8ca657d7366229cdde4bd14c4eb5499a9573d4d366fe1b599daa316
+SIZE (rust/crates/rustix-0.38.28.crate) = 365398
+SHA256 (rust/crates/rustls-0.20.9.crate) = 1b80e3dec595989ea8510028f30c408a4630db12c9cbb8de34203b89d6577e99
+SIZE (rust/crates/rustls-0.20.9.crate) = 270582
+SHA256 (rust/crates/rustls-0.21.10.crate) = f9d5a6813c0759e4609cd494e8e725babae6a2ca7b62a5536a13daaec6fcb7ba
+SIZE (rust/crates/rustls-0.21.10.crate) = 284920
+SHA256 (rust/crates/rustls-0.22.1.crate) = fe6b63262c9fcac8659abfaa96cac103d28166d3ff3eaf8f412e19f3ae9e5a48
+SIZE (rust/crates/rustls-0.22.1.crate) = 326936
+SHA256 (rust/crates/rustls-native-certs-0.6.3.crate) = a9aace74cb666635c918e9c12bc0d348266037aa8eb599b5cba565709a8dff00
+SIZE (rust/crates/rustls-native-certs-0.6.3.crate) = 24438
+SHA256 (rust/crates/rustls-pemfile-1.0.4.crate) = 1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c
+SIZE (rust/crates/rustls-pemfile-1.0.4.crate) = 22092
+SHA256 (rust/crates/rustls-pemfile-2.0.0.crate) = 35e4980fa29e4c4b212ffb3db068a564cbf560e51d3944b7c88bd8bf5bec64f4
+SIZE (rust/crates/rustls-pemfile-2.0.0.crate) = 23799
+SHA256 (rust/crates/rustls-pki-types-1.1.0.crate) = 9e9d979b3ce68192e42760c7810125eb6cf2ea10efae545a156063e61f314e2a
+SIZE (rust/crates/rustls-pki-types-1.1.0.crate) = 21252
+SHA256 (rust/crates/rustls-webpki-0.101.7.crate) = 8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765
+SIZE (rust/crates/rustls-webpki-0.101.7.crate) = 168808
+SHA256 (rust/crates/rustls-webpki-0.102.0.crate) = de2635c8bc2b88d367767c5de8ea1d8db9af3f6219eba28442242d9ab81d1b89
+SIZE (rust/crates/rustls-webpki-0.102.0.crate) = 195872
+SHA256 (rust/crates/rustversion-1.0.14.crate) = 7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4
+SIZE (rust/crates/rustversion-1.0.14.crate) = 17261
+SHA256 (rust/crates/rustyline-10.1.1.crate) = c1e83c32c3f3c33b08496e0d1df9ea8c64d39adb8eb36a1ebb1440c690697aef
+SIZE (rust/crates/rustyline-10.1.1.crate) = 106800
+SHA256 (rust/crates/rustyline-11.0.0.crate) = 5dfc8644681285d1fb67a467fb3021bfea306b99b4146b166a1fe3ada965eece
+SIZE (rust/crates/rustyline-11.0.0.crate) = 113960
+SHA256 (rust/crates/ryu-1.0.16.crate) = f98d2aa92eebf49b69786be48e4477826b256916e84a57ff2a4f21923b48eb4c
+SIZE (rust/crates/ryu-1.0.16.crate) = 47351
+SHA256 (rust/crates/safe-lock-0.1.3.crate) = 077d73db7973cccf63eb4aff1e5a34dc2459baa867512088269ea5f2f4253c90
+SIZE (rust/crates/safe-lock-0.1.3.crate) = 4662
+SHA256 (rust/crates/safe-proc-macro2-1.0.67.crate) = 7fd85be67db87168aa3c13fd0da99f48f2ab005dccad5af5626138dc1df20eb6
+SIZE (rust/crates/safe-proc-macro2-1.0.67.crate) = 42703
+SHA256 (rust/crates/safe-quote-1.0.15.crate) = 77e530f7831f3feafcd5f1aae406ac205dd998436b4007c8e80f03eca78a88f7
+SIZE (rust/crates/safe-quote-1.0.15.crate) = 26091
+SHA256 (rust/crates/safe-regex-0.2.5.crate) = a15289bf322e0673d52756a18194167f2378ec1a15fe884af6e2d2cb934822b0
+SIZE (rust/crates/safe-regex-0.2.5.crate) = 20805
+SHA256 (rust/crates/safe-regex-compiler-0.2.5.crate) = fba76fae590a2aa665279deb1f57b5098cbace01a0c5e60e262fcf55f7c51542
+SIZE (rust/crates/safe-regex-compiler-0.2.5.crate) = 29468
+SHA256 (rust/crates/safe-regex-macro-0.2.5.crate) = 96c2e96b5c03f158d1b16ba79af515137795f4ad4e8de3f790518aae91f1d127
+SIZE (rust/crates/safe-regex-macro-0.2.5.crate) = 2496
+SHA256 (rust/crates/safe_arch-0.7.1.crate) = f398075ce1e6a179b46f51bd88d0598b92b00d3551f1a2d4ac49e771b56ac354
+SIZE (rust/crates/safe_arch-0.7.1.crate) = 76930
+SHA256 (rust/crates/salsa20-0.10.2.crate) = 97a22f5af31f73a954c10289c93e8a50cc23d971e80ee446f1f6f7137a088213
+SIZE (rust/crates/salsa20-0.10.2.crate) = 12780
+SHA256 (rust/crates/same-file-1.0.6.crate) = 93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502
+SIZE (rust/crates/same-file-1.0.6.crate) = 10183
+SHA256 (rust/crates/saturating-0.1.0.crate) = ece8e78b2f38ec51c51f5d475df0a7187ba5111b2a28bdc761ee05b075d40a71
+SIZE (rust/crates/saturating-0.1.0.crate) = 2904
+SHA256 (rust/crates/schannel-0.1.22.crate) = 0c3733bf4cf7ea0880754e19cb5a462007c4a8c1914bff372ccc95b464f1df88
+SIZE (rust/crates/schannel-0.1.22.crate) = 41642
+SHA256 (rust/crates/schemars-0.8.16.crate) = 45a28f4c49489add4ce10783f7911893516f15afe45d015608d41faca6bc4d29
+SIZE (rust/crates/schemars-0.8.16.crate) = 57072
+SHA256 (rust/crates/schemars_derive-0.8.16.crate) = c767fd6fa65d9ccf9cf026122c1b555f2ef9a4f0cea69da4d7dbc3e258d30967
+SIZE (rust/crates/schemars_derive-0.8.16.crate) = 19064
+SHA256 (rust/crates/scopeguard-1.2.0.crate) = 94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49
+SIZE (rust/crates/scopeguard-1.2.0.crate) = 11619
+SHA256 (rust/crates/scrypt-0.11.0.crate) = 0516a385866c09368f0b5bcd1caff3366aace790fcd46e2bb032697bb172fd1f
+SIZE (rust/crates/scrypt-0.11.0.crate) = 13440
+SHA256 (rust/crates/sct-0.7.1.crate) = da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414
+SIZE (rust/crates/sct-0.7.1.crate) = 27501
+SHA256 (rust/crates/seahash-4.1.0.crate) = 1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b
+SIZE (rust/crates/seahash-4.1.0.crate) = 31976
+SHA256 (rust/crates/sealed-0.5.0.crate) = f4a8caec23b7800fb97971a1c6ae365b6239aaeddfb934d6265f8505e795699d
+SIZE (rust/crates/sealed-0.5.0.crate) = 13419
+SHA256 (rust/crates/secrecy-0.8.0.crate) = 9bd1c54ea06cfd2f6b63219704de0b9b4f72dcc2b8fdef820be6cd799780e91e
+SIZE (rust/crates/secrecy-0.8.0.crate) = 11916
+SHA256 (rust/crates/security-framework-2.9.2.crate) = 05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de
+SIZE (rust/crates/security-framework-2.9.2.crate) = 79295
+SHA256 (rust/crates/security-framework-sys-2.9.1.crate) = e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a
+SIZE (rust/crates/security-framework-sys-2.9.1.crate) = 18284
+SHA256 (rust/crates/semver-1.0.20.crate) = 836fa6a3e1e547f9a2c4040802ec865b5d85f4014efe00555d7090a3dcaa1090
+SIZE (rust/crates/semver-1.0.20.crate) = 30451
+SHA256 (rust/crates/seq-macro-0.3.5.crate) = a3f0bf26fd526d2a95683cd0f87bf103b8539e2ca1ef48ce002d67aad59aa0b4
+SIZE (rust/crates/seq-macro-0.3.5.crate) = 13332
+SHA256 (rust/crates/serde-1.0.193.crate) = 25dd9975e68d0cb5aa1120c288333fc98731bd1dd12f561e468ea4728c042b89
+SIZE (rust/crates/serde-1.0.193.crate) = 76863
+SHA256 (rust/crates/serde_derive-1.0.193.crate) = 43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3
+SIZE (rust/crates/serde_derive-1.0.193.crate) = 55692
+SHA256 (rust/crates/serde_derive_internals-0.26.0.crate) = 85bf8229e7920a9f636479437026331ce11aa132b4dde37d121944a44d6e5f3c
+SIZE (rust/crates/serde_derive_internals-0.26.0.crate) = 25382
+SHA256 (rust/crates/serde_json-1.0.108.crate) = 3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b
+SIZE (rust/crates/serde_json-1.0.108.crate) = 146476
+SHA256 (rust/crates/serde_path_to_error-0.1.14.crate) = 4beec8bce849d58d06238cb50db2e1c417cfeafa4c63f692b15c82b7c80f8335
+SIZE (rust/crates/serde_path_to_error-0.1.14.crate) = 16553
+SHA256 (rust/crates/serde_repr-0.1.17.crate) = 3081f5ffbb02284dda55132aa26daecedd7372a42417bbbab6f14ab7d6bb9145
+SIZE (rust/crates/serde_repr-0.1.17.crate) = 9971
+SHA256 (rust/crates/serde_spanned-0.6.5.crate) = eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1
+SIZE (rust/crates/serde_spanned-0.6.5.crate) = 8349
+SHA256 (rust/crates/serde_tokenstream-0.2.0.crate) = 8a00ffd23fd882d096f09fcaae2a9de8329a328628e86027e049ee051dc1621f
+SIZE (rust/crates/serde_tokenstream-0.2.0.crate) = 19372
+SHA256 (rust/crates/serde_urlencoded-0.7.1.crate) = d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd
+SIZE (rust/crates/serde_urlencoded-0.7.1.crate) = 12822
+SHA256 (rust/crates/serde_with-3.4.0.crate) = 64cd236ccc1b7a29e7e2739f27c0b2dd199804abc4290e32f59f3b68d6405c23
+SIZE (rust/crates/serde_with-3.4.0.crate) = 126494
+SHA256 (rust/crates/serde_with_macros-3.4.0.crate) = 93634eb5f75a2323b16de4748022ac4297f9e76b6dced2be287a099f41b5e788
+SIZE (rust/crates/serde_with_macros-3.4.0.crate) = 28226
+SHA256 (rust/crates/serde_yaml-0.9.29.crate) = a15e0ef66bf939a7c890a0bf6d5a733c70202225f9888a89ed5c62298b019129
+SIZE (rust/crates/serde_yaml-0.9.29.crate) = 64840
+SHA256 (rust/crates/sha-1-0.10.1.crate) = f5058ada175748e33390e40e872bd0fe59a19f265d0158daa551c5a88a76009c
+SIZE (rust/crates/sha-1-0.10.1.crate) = 12018
+SHA256 (rust/crates/sha1-0.10.6.crate) = e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba
+SIZE (rust/crates/sha1-0.10.6.crate) = 13517
+SHA256 (rust/crates/sha2-0.10.8.crate) = 793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8
+SIZE (rust/crates/sha2-0.10.8.crate) = 26357
+SHA256 (rust/crates/sha3-0.10.8.crate) = 75872d278a8f37ef87fa0ddbda7802605cb18344497949862c0d4dcb291eba60
+SIZE (rust/crates/sha3-0.10.8.crate) = 858216
+SHA256 (rust/crates/sharded-slab-0.1.7.crate) = f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6
+SIZE (rust/crates/sharded-slab-0.1.7.crate) = 58227
+SHA256 (rust/crates/shlex-1.3.0.crate) = 0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64
+SIZE (rust/crates/shlex-1.3.0.crate) = 18713
+SHA256 (rust/crates/signal-hook-registry-1.4.1.crate) = d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1
+SIZE (rust/crates/signal-hook-registry-1.4.1.crate) = 17987
+SHA256 (rust/crates/signature-2.2.0.crate) = 77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de
+SIZE (rust/crates/signature-2.2.0.crate) = 15531
+SHA256 (rust/crates/simba-0.6.0.crate) = f0b7840f121a46d63066ee7a99fc81dcabbc6105e437cae43528cea199b5a05f
+SIZE (rust/crates/simba-0.6.0.crate) = 49252
+SHA256 (rust/crates/simdutf8-0.1.4.crate) = f27f6278552951f1f2b8cf9da965d10969b2efdea95a6ec47987ab46edfe263a
+SIZE (rust/crates/simdutf8-0.1.4.crate) = 28621
+SHA256 (rust/crates/simple_asn1-0.6.2.crate) = adc4e5204eb1910f40f9cfa375f6f05b68c3abac4b6fd879c8ff5e7ae8a0a085
+SIZE (rust/crates/simple_asn1-0.6.2.crate) = 15992
+SHA256 (rust/crates/siphasher-0.3.11.crate) = 38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d
+SIZE (rust/crates/siphasher-0.3.11.crate) = 10442
+SHA256 (rust/crates/skeptic-0.13.7.crate) = 16d23b015676c90a0f01c197bfdc786c20342c73a0afdda9025adb0bc42940a8
+SIZE (rust/crates/skeptic-0.13.7.crate) = 13108
+SHA256 (rust/crates/slab-0.4.9.crate) = 8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67
+SIZE (rust/crates/slab-0.4.9.crate) = 17108
+SHA256 (rust/crates/slotmap-1.0.7.crate) = dbff4acf519f630b3a3ddcfaea6c06b42174d9a44bc70c620e9ed1649d58b82a
+SIZE (rust/crates/slotmap-1.0.7.crate) = 61390
+SHA256 (rust/crates/smallbitvec-2.5.1.crate) = 75ce4f9dc4a41b4c3476cc925f1efb11b66df373a8fde5d4b8915fa91b5d995e
+SIZE (rust/crates/smallbitvec-2.5.1.crate) = 14761
+SHA256 (rust/crates/smallvec-1.11.2.crate) = 4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970
+SIZE (rust/crates/smallvec-1.11.2.crate) = 34801
+SHA256 (rust/crates/snafu-0.7.5.crate) = e4de37ad025c587a29e8f3f5605c00f70b98715ef90b9061a815b9e59e9042d6
+SIZE (rust/crates/snafu-0.7.5.crate) = 65229
+SHA256 (rust/crates/snafu-derive-0.7.5.crate) = 990079665f075b699031e9c08fd3ab99be5029b96f3b78dc0709e8f77e4efebf
+SIZE (rust/crates/snafu-derive-0.7.5.crate) = 28208
+SHA256 (rust/crates/snap-1.1.1.crate) = 1b6b67fb9a61334225b5b790716f609cd58395f895b3fe8b328786812a40bc3b
+SIZE (rust/crates/snap-1.1.1.crate) = 33763
+SHA256 (rust/crates/socket2-0.4.10.crate) = 9f7916fc008ca5542385b89a3d3ce689953c143e9304a9bf8beec1de48994c0d
+SIZE (rust/crates/socket2-0.4.10.crate) = 45697
+SHA256 (rust/crates/socket2-0.5.5.crate) = 7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9
+SIZE (rust/crates/socket2-0.5.5.crate) = 54863
+SHA256 (rust/crates/sparsevec-0.1.4.crate) = 928d1ef5df00aec8c5643c2ac37db4dd282763013c0fcc81efbb8e13db8dd8ec
+SIZE (rust/crates/sparsevec-0.1.4.crate) = 6628
+SHA256 (rust/crates/spin-0.5.2.crate) = 6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d
+SIZE (rust/crates/spin-0.5.2.crate) = 12004
+SHA256 (rust/crates/spin-0.9.8.crate) = 6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67
+SIZE (rust/crates/spin-0.9.8.crate) = 38958
+SHA256 (rust/crates/spki-0.5.4.crate) = 44d01ac02a6ccf3e07db148d2be087da624fea0221a16152ed01f0496a6b0a27
+SIZE (rust/crates/spki-0.5.4.crate) = 12003
+SHA256 (rust/crates/spki-0.7.3.crate) = d91ed6c858b01f942cd56b37a94b3e0a1798290327d1236e4d9cf4eaca44d29d
+SIZE (rust/crates/spki-0.7.3.crate) = 16409
+SHA256 (rust/crates/sqlformat-0.2.3.crate) = ce81b7bd7c4493975347ef60d8c7e8b742d4694f4c49f93e0a12ea263938176c
+SIZE (rust/crates/sqlformat-0.2.3.crate) = 21878
+SHA256 (rust/crates/sqlness-0.5.0.crate) = 0860f149718809371602b42573693e1ed2b1d0aed35fe69e04e4e4e9918d81f7
+SIZE (rust/crates/sqlness-0.5.0.crate) = 26326
+SHA256 (rust/crates/sqlparser-0.38.0.crate) = 0272b7bb0a225320170c99901b4b5fb3a4384e255a7f2cc228f61e2ba3893e75
+SIZE (rust/crates/sqlparser-0.38.0.crate) = 147540
+SHA256 (rust/crates/sqlparser_derive-0.1.1.crate) = 55fe75cb4a364c7f7ae06c7dbbc8d84bddd85d6cdf9975963c3935bc1991761e
+SIZE (rust/crates/sqlparser_derive-0.1.1.crate) = 3358
+SHA256 (rust/crates/sqlx-0.6.3.crate) = f8de3b03a925878ed54a954f621e64bf55a3c1bd29652d0d1a17830405350188
+SIZE (rust/crates/sqlx-0.6.3.crate) = 127030
+SHA256 (rust/crates/sqlx-core-0.6.3.crate) = fa8241483a83a3f33aa5fff7e7d9def398ff9990b2752b6c6112b83c6d246029
+SIZE (rust/crates/sqlx-core-0.6.3.crate) = 298191
+SHA256 (rust/crates/sqlx-macros-0.6.3.crate) = 9966e64ae989e7e575b19d7265cb79d7fc3cbbdf179835cb0d716f294c2049c9
+SIZE (rust/crates/sqlx-macros-0.6.3.crate) = 24559
+SHA256 (rust/crates/sqlx-rt-0.6.3.crate) = 804d3f245f894e61b1e6263c84b23ca675d96753b5abfd5cc8597d86806e8024
+SIZE (rust/crates/sqlx-rt-0.6.3.crate) = 2327
+SHA256 (rust/crates/sre-engine-0.4.3.crate) = 1120e6a8cbd4d85d5532d2e8a245aef2128e1853981f8b6d9943264184843102
+SIZE (rust/crates/sre-engine-0.4.3.crate) = 11448
+SHA256 (rust/crates/stable_deref_trait-1.2.0.crate) = a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3
+SIZE (rust/crates/stable_deref_trait-1.2.0.crate) = 8054
+SHA256 (rust/crates/static_assertions-1.1.0.crate) = a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f
+SIZE (rust/crates/static_assertions-1.1.0.crate) = 18480
+SHA256 (rust/crates/statrs-0.16.0.crate) = 2d08e5e1748192713cc281da8b16924fb46be7b0c2431854eadc785823e5696e
+SIZE (rust/crates/statrs-0.16.0.crate) = 138777
+SHA256 (rust/crates/stats-cli-3.0.1.crate) = c8786c4fc8a91bc4fcd90aed33413f79e4dc9811f24ba14d1d59adf57cf1c871
+SIZE (rust/crates/stats-cli-3.0.1.crate) = 12559
+SHA256 (rust/crates/str-buf-1.0.6.crate) = 9e08d8363704e6c71fc928674353e6b7c23dcea9d82d7012c8faf2a3a025f8d0
+SIZE (rust/crates/str-buf-1.0.6.crate) = 3828
+SHA256 (rust/crates/str_stack-0.1.0.crate) = 9091b6114800a5f2141aee1d1b9d6ca3592ac062dc5decb3764ec5895a47b4eb
+SIZE (rust/crates/str_stack-0.1.0.crate) = 7977
+SHA256 (rust/crates/streaming-stats-0.2.3.crate) = b0d670ce4e348a2081843569e0f79b21c99c91bb9028b3b3ecb0f050306de547
+SIZE (rust/crates/streaming-stats-0.2.3.crate) = 9383
+SHA256 (rust/crates/strfmt-0.2.4.crate) = 7a8348af2d9fc3258c8733b8d9d8db2e56f54b2363a4b5b81585c7875ed65e65
+SIZE (rust/crates/strfmt-0.2.4.crate) = 15194
+SHA256 (rust/crates/string_cache-0.8.7.crate) = f91138e76242f575eb1d3b38b4f1362f10d3a43f47d182a5b359af488a02293b
+SIZE (rust/crates/string_cache-0.8.7.crate) = 16655
+SHA256 (rust/crates/stringprep-0.1.4.crate) = bb41d74e231a107a1b4ee36bd1214b11285b77768d2e3824aedafa988fd36ee6
+SIZE (rust/crates/stringprep-0.1.4.crate) = 23551
+SHA256 (rust/crates/strsim-0.8.0.crate) = 8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a
+SIZE (rust/crates/strsim-0.8.0.crate) = 9309
+SHA256 (rust/crates/strsim-0.10.0.crate) = 73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623
+SIZE (rust/crates/strsim-0.10.0.crate) = 11355
+SHA256 (rust/crates/strum-0.24.1.crate) = 063e6045c0e62079840579a7e47a355ae92f60eb74daaf156fb1e84ba164e63f
+SIZE (rust/crates/strum-0.24.1.crate) = 5636
+SHA256 (rust/crates/strum-0.25.0.crate) = 290d54ea6f91c969195bdbcd7442c8c2a2ba87da8bf60a7ee86a235d4bc1e125
+SIZE (rust/crates/strum-0.25.0.crate) = 5539
+SHA256 (rust/crates/strum_macros-0.24.3.crate) = 1e385be0d24f186b4ce2f9982191e7101bb737312ad61c1f2f984f34bcf85d59
+SIZE (rust/crates/strum_macros-0.24.3.crate) = 20696
+SHA256 (rust/crates/strum_macros-0.25.3.crate) = 23dc1fa9ac9c169a78ba62f0b841814b7abae11bdd047b9c58f893439e309ea0
+SIZE (rust/crates/strum_macros-0.25.3.crate) = 22570
+SHA256 (rust/crates/subprocess-0.2.9.crate) = 0c2e86926081dda636c546d8c5e641661049d7562a68f5488be4a1f7f66f6086
+SIZE (rust/crates/subprocess-0.2.9.crate) = 46463
+SHA256 (rust/crates/substrait-0.17.1.crate) = f1e8440a1c9b95a7c9a00a19f78b980749e8c945eb880687a5d673cea83729c5
+SIZE (rust/crates/substrait-0.17.1.crate) = 47692
+SHA256 (rust/crates/subtle-2.5.0.crate) = 81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc
+SIZE (rust/crates/subtle-2.5.0.crate) = 13909
+SHA256 (rust/crates/symbolic-common-12.8.0.crate) = 1cccfffbc6bb3bb2d3a26cd2077f4d055f6808d266f9d4d158797a4c60510dfe
+SIZE (rust/crates/symbolic-common-12.8.0.crate) = 24334
+SHA256 (rust/crates/symbolic-demangle-12.8.0.crate) = 76a99812da4020a67e76c4eb41f08c87364c14170495ff780f30dd519c221a68
+SIZE (rust/crates/symbolic-demangle-12.8.0.crate) = 205528
+SHA256 (rust/crates/syn-1.0.109.crate) = 72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237
+SIZE (rust/crates/syn-1.0.109.crate) = 237611
+SHA256 (rust/crates/syn-2.0.43.crate) = ee659fb5f3d355364e1f3e5bc10fb82068efbf824a1e9d1c9504244a6469ad53
+SIZE (rust/crates/syn-2.0.43.crate) = 248363
+SHA256 (rust/crates/syn-ext-0.4.0.crate) = 9b86cb2b68c5b3c078cac02588bc23f3c04bb828c5d3aedd17980876ec6a7be6
+SIZE (rust/crates/syn-ext-0.4.0.crate) = 10535
+SHA256 (rust/crates/syn-inline-mod-0.5.0.crate) = b670f535364c67358ecffb60b9f2579f9b45d3c71e8cca6d45d22ee0fadaa7eb
+SIZE (rust/crates/syn-inline-mod-0.5.0.crate) = 10020
+SHA256 (rust/crates/syn_derive-0.1.8.crate) = 1329189c02ff984e9736652b1631330da25eaa6bc639089ed4915d25446cbe7b
+SIZE (rust/crates/syn_derive-0.1.8.crate) = 5173
+SHA256 (rust/crates/sync_wrapper-0.1.2.crate) = 2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160
+SIZE (rust/crates/sync_wrapper-0.1.2.crate) = 6933
+SHA256 (rust/crates/sysinfo-0.30.5.crate) = 1fb4f3438c8f6389c864e61221cbc97e9bca98b4daf39a5beb7bea660f528bb2
+SIZE (rust/crates/sysinfo-0.30.5.crate) = 169073
+SHA256 (rust/crates/system-configuration-0.5.1.crate) = ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7
+SIZE (rust/crates/system-configuration-0.5.1.crate) = 12618
+SHA256 (rust/crates/system-configuration-sys-0.5.0.crate) = a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9
+SIZE (rust/crates/system-configuration-sys-0.5.0.crate) = 6730
+SHA256 (rust/crates/tagptr-0.2.0.crate) = 7b2093cf4c8eb1e67749a6762251bc9cd836b6fc171623bd0a9d324d37af2417
+SIZE (rust/crates/tagptr-0.2.0.crate) = 13320
+SHA256 (rust/crates/tap-1.0.1.crate) = 55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369
+SIZE (rust/crates/tap-1.0.1.crate) = 11316
+SHA256 (rust/crates/target-lexicon-0.12.12.crate) = 14c39fd04924ca3a864207c66fc2cd7d22d7c016007f9ce846cbb9326331930a
+SIZE (rust/crates/target-lexicon-0.12.12.crate) = 25156
+SHA256 (rust/crates/temp-env-0.3.6.crate) = 96374855068f47402c3121c6eed88d29cb1de8f3ab27090e273e420bdabcf050
+SIZE (rust/crates/temp-env-0.3.6.crate) = 10746
+SHA256 (rust/crates/tempfile-3.8.1.crate) = 7ef1adac450ad7f4b3c28589471ade84f25f731a7a0fe30d71dfa9f60fd808e5
+SIZE (rust/crates/tempfile-3.8.1.crate) = 32164
+SHA256 (rust/crates/term-0.7.0.crate) = c59df8ac95d96ff9bede18eb7300b0fda5e5d8d90960e76f8e14ae765eedbf1f
+SIZE (rust/crates/term-0.7.0.crate) = 37082
+SHA256 (rust/crates/termcolor-1.4.0.crate) = ff1bc3d3f05aff0403e8ac0d92ced918ec05b666a43f83297ccef5bea8a3d449
+SIZE (rust/crates/termcolor-1.4.0.crate) = 18765
+SHA256 (rust/crates/termios-0.3.3.crate) = 411c5bf740737c7918b8b1fe232dca4dc9f8e754b8ad5e20966814001ed0ac6b
+SIZE (rust/crates/termios-0.3.3.crate) = 17103
+SHA256 (rust/crates/termtree-0.4.1.crate) = 3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76
+SIZE (rust/crates/termtree-0.4.1.crate) = 4557
+SHA256 (rust/crates/textwrap-0.11.0.crate) = d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060
+SIZE (rust/crates/textwrap-0.11.0.crate) = 17322
+SHA256 (rust/crates/textwrap-0.15.2.crate) = b7b3e525a49ec206798b40326a44121291b530c963cfb01018f63e135bac543d
+SIZE (rust/crates/textwrap-0.15.2.crate) = 53191
+SHA256 (rust/crates/textwrap-0.16.0.crate) = 222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d
+SIZE (rust/crates/textwrap-0.16.0.crate) = 53722
+SHA256 (rust/crates/thiserror-1.0.51.crate) = f11c217e1416d6f036b870f14e0413d480dbf28edbee1f877abaf0206af43bb7
+SIZE (rust/crates/thiserror-1.0.51.crate) = 20045
+SHA256 (rust/crates/thiserror-impl-1.0.51.crate) = 01742297787513b79cf8e29d1056ede1313e2420b7b3b15d0a768b4921f549df
+SIZE (rust/crates/thiserror-impl-1.0.51.crate) = 15372
+SHA256 (rust/crates/thread-id-4.2.1.crate) = f0ec81c46e9eb50deaa257be2f148adf052d1fb7701cfd55ccfab2525280b70b
+SIZE (rust/crates/thread-id-4.2.1.crate) = 9100
+SHA256 (rust/crates/thread_local-1.1.7.crate) = 3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152
+SIZE (rust/crates/thread_local-1.1.7.crate) = 13585
+SHA256 (rust/crates/thrift-0.17.0.crate) = 7e54bc85fc7faa8bc175c4bab5b92ba8d9a3ce893d0e9f42cc455c8ab16a9e09
+SIZE (rust/crates/thrift-0.17.0.crate) = 45286
+SHA256 (rust/crates/tikv-jemalloc-ctl-0.5.4.crate) = 619bfed27d807b54f7f776b9430d4f8060e66ee138a28632ca898584d462c31c
+SIZE (rust/crates/tikv-jemalloc-ctl-0.5.4.crate) = 19234
+SHA256 (rust/crates/tikv-jemalloc-sys-0.5.4+5.3.0-patched.crate) = 9402443cb8fd499b6f327e40565234ff34dbda27460c5b47db0db77443dd85d1
+SIZE (rust/crates/tikv-jemalloc-sys-0.5.4+5.3.0-patched.crate) = 884765
+SHA256 (rust/crates/tikv-jemallocator-0.5.4.crate) = 965fe0c26be5c56c94e38ba547249074803efd52adfb66de62107d95aab3eaca
+SIZE (rust/crates/tikv-jemallocator-0.5.4.crate) = 13101
+SHA256 (rust/crates/time-0.3.31.crate) = f657ba42c3f86e7680e53c8cd3af8abbe56b5491790b46e22e19c0d57463583e
+SIZE (rust/crates/time-0.3.31.crate) = 121762
+SHA256 (rust/crates/time-core-0.1.2.crate) = ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3
+SIZE (rust/crates/time-core-0.1.2.crate) = 7191
+SHA256 (rust/crates/time-macros-0.2.16.crate) = 26197e33420244aeb70c3e8c78376ca46571bc4e701e4791c2cd9f57dcb3a43f
+SIZE (rust/crates/time-macros-0.2.16.crate) = 24356
+SHA256 (rust/crates/timsort-0.1.3.crate) = 639ce8ef6d2ba56be0383a94dd13b92138d58de44c62618303bb798fa92bdc00
+SIZE (rust/crates/timsort-0.1.3.crate) = 16185
+SHA256 (rust/crates/tiny-keccak-2.0.2.crate) = 2c9d3793400a45f954c52e73d068316d76b6f4e36977e3fcebb13a2721e80237
+SIZE (rust/crates/tiny-keccak-2.0.2.crate) = 20129
+SHA256 (rust/crates/tiny_http-0.12.0.crate) = 389915df6413a2e74fb181895f933386023c71110878cd0825588928e64cdc82
+SIZE (rust/crates/tiny_http-0.12.0.crate) = 51330
+SHA256 (rust/crates/tinytemplate-1.2.1.crate) = be4d6b5f19ff7664e8c98d03e2139cb510db9b0a60b55f8e8709b689d939b6bc
+SIZE (rust/crates/tinytemplate-1.2.1.crate) = 26490
+SHA256 (rust/crates/tinyvec-1.6.0.crate) = 87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50
+SIZE (rust/crates/tinyvec-1.6.0.crate) = 45991
+SHA256 (rust/crates/tinyvec_macros-0.1.1.crate) = 1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20
+SIZE (rust/crates/tinyvec_macros-0.1.1.crate) = 5865
+SHA256 (rust/crates/tokio-1.35.1.crate) = c89b4efa943be685f629b149f53829423f8f5531ea21249408e8e2f8671ec104
+SIZE (rust/crates/tokio-1.35.1.crate) = 744407
+SHA256 (rust/crates/tokio-io-timeout-1.2.0.crate) = 30b74022ada614a1b4834de765f9bb43877f910cc8ce4be40e89042c9223a8bf
+SIZE (rust/crates/tokio-io-timeout-1.2.0.crate) = 8993
+SHA256 (rust/crates/tokio-macros-2.2.0.crate) = 5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b
+SIZE (rust/crates/tokio-macros-2.2.0.crate) = 11520
+SHA256 (rust/crates/tokio-metrics-0.3.1.crate) = eace09241d62c98b7eeb1107d4c5c64ca3bd7da92e8c218c153ab3a78f9be112
+SIZE (rust/crates/tokio-metrics-0.3.1.crate) = 42777
+SHA256 (rust/crates/tokio-metrics-collector-0.2.1.crate) = d767da47381602cc481653456823b3ebb600e83d5dd4e0293da9b5566c6c00f0
+SIZE (rust/crates/tokio-metrics-collector-0.2.1.crate) = 21734
+SHA256 (rust/crates/tokio-postgres-0.7.10.crate) = d340244b32d920260ae7448cb72b6e238bddc3d4f7603394e7dd46ed8e48f5b8
+SIZE (rust/crates/tokio-postgres-0.7.10.crate) = 76616
+SHA256 (rust/crates/tokio-postgres-rustls-0.11.1.crate) = 0ea13f22eda7127c827983bdaf0d7fff9df21c8817bab02815ac277a21143677
+SIZE (rust/crates/tokio-postgres-rustls-0.11.1.crate) = 4134
+SHA256 (rust/crates/tokio-rustls-0.23.4.crate) = c43ee83903113e03984cb9e5cebe6c04a5116269e900e3ddba8f068a62adda59
+SIZE (rust/crates/tokio-rustls-0.23.4.crate) = 27024
+SHA256 (rust/crates/tokio-rustls-0.24.1.crate) = c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081
+SIZE (rust/crates/tokio-rustls-0.24.1.crate) = 33049
+SHA256 (rust/crates/tokio-rustls-0.25.0.crate) = 775e0c0f0adb3a2f22a00c4745d728b479985fc15ee7ca6a2608388c5569860f
+SIZE (rust/crates/tokio-rustls-0.25.0.crate) = 30541
+SHA256 (rust/crates/tokio-stream-0.1.14.crate) = 397c988d37662c7dda6d2208364a706264bf3d6138b11d436cbac0ad38832842
+SIZE (rust/crates/tokio-stream-0.1.14.crate) = 35881
+SHA256 (rust/crates/tokio-test-0.4.3.crate) = e89b3cbabd3ae862100094ae433e1def582cf86451b4e9bf83aa7ac1d8a7d719
+SIZE (rust/crates/tokio-test-0.4.3.crate) = 12250
+SHA256 (rust/crates/tokio-util-0.7.10.crate) = 5419f34732d9eb6ee4c3578b7989078579b7f039cbbb9ca2c4da015749371e15
+SIZE (rust/crates/tokio-util-0.7.10.crate) = 110508
+SHA256 (rust/crates/toml-0.5.11.crate) = f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234
+SIZE (rust/crates/toml-0.5.11.crate) = 54910
+SHA256 (rust/crates/toml-0.8.8.crate) = a1a195ec8c9da26928f773888e0742ca3ca1040c6cd859c919c9f59c1954ab35
+SIZE (rust/crates/toml-0.8.8.crate) = 50451
+SHA256 (rust/crates/toml_datetime-0.6.5.crate) = 3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1
+SIZE (rust/crates/toml_datetime-0.6.5.crate) = 10910
+SHA256 (rust/crates/toml_edit-0.19.15.crate) = 1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421
+SIZE (rust/crates/toml_edit-0.19.15.crate) = 95324
+SHA256 (rust/crates/toml_edit-0.20.7.crate) = 70f427fce4d84c72b5b732388bf4a9f4531b53f74e2887e3ecb2481f68f66d81
+SIZE (rust/crates/toml_edit-0.20.7.crate) = 101056
+SHA256 (rust/crates/toml_edit-0.21.0.crate) = d34d383cd00a163b4a5b85053df514d45bc330f6de7737edfe0a93311d1eaa03
+SIZE (rust/crates/toml_edit-0.21.0.crate) = 101265
+SHA256 (rust/crates/tonic-0.9.2.crate) = 3082666a3a6433f7f511c7192923fa1fe07c69332d3c6a2e6bb040b569199d5a
+SIZE (rust/crates/tonic-0.9.2.crate) = 92598
+SHA256 (rust/crates/tonic-0.10.2.crate) = d560933a0de61cf715926b9cac824d4c883c2c43142f787595e48280c40a1d0e
+SIZE (rust/crates/tonic-0.10.2.crate) = 95739
+SHA256 (rust/crates/tonic-build-0.9.2.crate) = a6fdaae4c2c638bb70fe42803a26fbd6fc6ac8c72f5c59f67ecc2a2dcabf4b07
+SIZE (rust/crates/tonic-build-0.9.2.crate) = 17283
+SHA256 (rust/crates/tonic-build-0.10.2.crate) = 9d021fc044c18582b9a2408cd0dd05b1596e3ecdb5c4df822bb0183545683889
+SIZE (rust/crates/tonic-build-0.10.2.crate) = 17908
+SHA256 (rust/crates/tonic-reflection-0.10.2.crate) = 3fa37c513df1339d197f4ba21d28c918b9ef1ac1768265f11ecb6b7f1cba1b76
+SIZE (rust/crates/tonic-reflection-0.10.2.crate) = 12835
+SHA256 (rust/crates/tower-0.4.13.crate) = b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c
+SIZE (rust/crates/tower-0.4.13.crate) = 106906
+SHA256 (rust/crates/tower-http-0.4.4.crate) = 61c5bb1d698276a2443e5ecfabc1008bf15a36c12e6a7176e7bf089ea9131140
+SIZE (rust/crates/tower-http-0.4.4.crate) = 115612
+SHA256 (rust/crates/tower-layer-0.3.2.crate) = c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0
+SIZE (rust/crates/tower-layer-0.3.2.crate) = 6023
+SHA256 (rust/crates/tower-service-0.3.2.crate) = b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52
+SIZE (rust/crates/tower-service-0.3.2.crate) = 6847
+SHA256 (rust/crates/tracing-0.1.40.crate) = c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef
+SIZE (rust/crates/tracing-0.1.40.crate) = 79459
+SHA256 (rust/crates/tracing-appender-0.2.3.crate) = 3566e8ce28cc0a3fe42519fc80e6b4c943cc4c8cef275620eb8dac2d3d4e06cf
+SIZE (rust/crates/tracing-appender-0.2.3.crate) = 21964
+SHA256 (rust/crates/tracing-attributes-0.1.27.crate) = 34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7
+SIZE (rust/crates/tracing-attributes-0.1.27.crate) = 32241
+SHA256 (rust/crates/tracing-core-0.1.32.crate) = c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54
+SIZE (rust/crates/tracing-core-0.1.32.crate) = 61221
+SHA256 (rust/crates/tracing-log-0.1.4.crate) = f751112709b4e791d8ce53e32c4ed2d353565a795ce84da2285393f41557bdf2
+SIZE (rust/crates/tracing-log-0.1.4.crate) = 20640
+SHA256 (rust/crates/tracing-log-0.2.0.crate) = ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3
+SIZE (rust/crates/tracing-log-0.2.0.crate) = 17561
+SHA256 (rust/crates/tracing-opentelemetry-0.22.0.crate) = c67ac25c5407e7b961fafc6f7e9aa5958fd297aada2d20fa2ae1737357e55596
+SIZE (rust/crates/tracing-opentelemetry-0.22.0.crate) = 135369
+SHA256 (rust/crates/tracing-subscriber-0.3.18.crate) = ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b
+SIZE (rust/crates/tracing-subscriber-0.3.18.crate) = 196312
+SHA256 (rust/crates/tree-sitter-0.20.10.crate) = e747b1f9b7b931ed39a548c1fae149101497de3c1fc8d9e18c62c1a66c683d3d
+SIZE (rust/crates/tree-sitter-0.20.10.crate) = 134502
+SHA256 (rust/crates/tree-sitter-c2rust-0.20.10.crate) = ee40a4d9cf5a30c199935f346887588239daceae4d1418d81b789276fffb8d91
+SIZE (rust/crates/tree-sitter-c2rust-0.20.10.crate) = 230922
+SHA256 (rust/crates/tree-sitter-cli-0.20.8.crate) = ae7e9d844d4d38e511a7b93fe8ced79f2a364c32fdea10d04546f1c8317d5a0c
+SIZE (rust/crates/tree-sitter-cli-0.20.8.crate) = 2486780
+SHA256 (rust/crates/tree-sitter-config-0.19.0.crate) = f5fec4cb27f052ead2246631b332dba0cb6af9a54ce012badee59c4b0ded5e03
+SIZE (rust/crates/tree-sitter-config-0.19.0.crate) = 2579
+SHA256 (rust/crates/tree-sitter-highlight-0.20.1.crate) = 042342584c5a7a0b833d9fc4e2bdab3f9868ddc6c4b339a1e01451c6720868bc
+SIZE (rust/crates/tree-sitter-highlight-0.20.1.crate) = 13977
+SHA256 (rust/crates/tree-sitter-loader-0.20.0.crate) = d0b17eef4833c7c139abed66d562dfa23228e97e647597baf246fd56c21bbfaf
+SIZE (rust/crates/tree-sitter-loader-0.20.0.crate) = 8037
+SHA256 (rust/crates/tree-sitter-tags-0.20.2.crate) = ccb3f1376219530a37a809751ecf65aa35fd8b9c1c4ab6d4faf5f6a9eeda2c05
+SIZE (rust/crates/tree-sitter-tags-0.20.2.crate) = 9445
+SHA256 (rust/crates/triomphe-0.1.11.crate) = 859eb650cfee7434994602c3a68b25d77ad9e68c8a6cd491616ef86661382eb3
+SIZE (rust/crates/triomphe-0.1.11.crate) = 28299
+SHA256 (rust/crates/try-lock-0.2.5.crate) = e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b
+SIZE (rust/crates/try-lock-0.2.5.crate) = 4314
+SHA256 (rust/crates/try_from-0.3.2.crate) = 283d3b89e1368717881a9d51dad843cc435380d8109c9e47d38780a324698d8b
+SIZE (rust/crates/try_from-0.3.2.crate) = 4264
+SHA256 (rust/crates/twox-hash-1.6.3.crate) = 97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675
+SIZE (rust/crates/twox-hash-1.6.3.crate) = 21842
+SHA256 (rust/crates/typenum-1.17.0.crate) = 42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825
+SIZE (rust/crates/typenum-1.17.0.crate) = 42849
+SHA256 (rust/crates/typetag-0.2.14.crate) = 196976efd4a62737b3a2b662cda76efb448d099b1049613d7a5d72743c611ce0
+SIZE (rust/crates/typetag-0.2.14.crate) = 27793
+SHA256 (rust/crates/typetag-impl-0.2.14.crate) = 2eea6765137e2414c44c7b1e07c73965a118a72c46148e1e168b3fc9d3ccf3aa
+SIZE (rust/crates/typetag-impl-0.2.14.crate) = 9095
+SHA256 (rust/crates/typify-0.0.14.crate) = c2e3b707a653e2915a2fc2c4ee96a3d30b9554b9435eb4cc8b5c6c74bbdd3044
+SIZE (rust/crates/typify-0.0.14.crate) = 15066
+SHA256 (rust/crates/typify-impl-0.0.14.crate) = 9d9c752192779f666e4c868672dee56a652b82c08032c7e9d23f6a845b282298
+SIZE (rust/crates/typify-impl-0.0.14.crate) = 310414
+SHA256 (rust/crates/typify-macro-0.0.14.crate) = a14defd554507e72a2bb93cd081c8b374cfed43b3d986b141ad3839d9fd6986b
+SIZE (rust/crates/typify-macro-0.0.14.crate) = 6141
+SHA256 (rust/crates/ucd-0.1.1.crate) = fe4fa6e588762366f1eb4991ce59ad1b93651d0b769dfb4e4d1c5c4b943d1159
+SIZE (rust/crates/ucd-0.1.1.crate) = 341787
+SHA256 (rust/crates/ucd-trie-0.1.6.crate) = ed646292ffc8188ef8ea4d1e0e0150fb15a5c2e12ad9b8fc191ae7a8a7f3c4b9
+SIZE (rust/crates/ucd-trie-0.1.6.crate) = 45790
+SHA256 (rust/crates/uname-0.1.1.crate) = b72f89f0ca32e4db1c04e2a72f5345d59796d4866a1ee0609084569f73683dc8
+SIZE (rust/crates/uname-0.1.1.crate) = 6852
+SHA256 (rust/crates/unic-char-property-0.9.0.crate) = a8c57a407d9b6fa02b4795eb81c5b6652060a15a7903ea981f3d723e6c0be221
+SIZE (rust/crates/unic-char-property-0.9.0.crate) = 6809
+SHA256 (rust/crates/unic-char-range-0.9.0.crate) = 0398022d5f700414f6b899e10b8348231abf9173fa93144cbc1a43b9793c1fbc
+SIZE (rust/crates/unic-char-range-0.9.0.crate) = 7020
+SHA256 (rust/crates/unic-common-0.9.0.crate) = 80d7ff825a6a654ee85a63e80f92f054f904f21e7d12da4e22f9834a4aaa35bc
+SIZE (rust/crates/unic-common-0.9.0.crate) = 2558
+SHA256 (rust/crates/unic-emoji-char-0.9.0.crate) = 0b07221e68897210270a38bde4babb655869637af0f69407f96053a34f76494d
+SIZE (rust/crates/unic-emoji-char-0.9.0.crate) = 5667
+SHA256 (rust/crates/unic-normal-0.9.0.crate) = f09d64d33589a94628bc2aeb037f35c2e25f3f049c7348b5aa5580b48e6bba62
+SIZE (rust/crates/unic-normal-0.9.0.crate) = 186971
+SHA256 (rust/crates/unic-ucd-age-0.9.0.crate) = 6c8cfdfe71af46b871dc6af2c24fcd360e2f3392ee4c5111877f2947f311671c
+SIZE (rust/crates/unic-ucd-age-0.9.0.crate) = 14554
+SHA256 (rust/crates/unic-ucd-bidi-0.9.0.crate) = d1d568b51222484e1f8209ce48caa6b430bf352962b877d592c29ab31fb53d8c
+SIZE (rust/crates/unic-ucd-bidi-0.9.0.crate) = 15803
+SHA256 (rust/crates/unic-ucd-category-0.9.0.crate) = 1b8d4591f5fcfe1bd4453baaf803c40e1b1e69ff8455c47620440b46efef91c0
+SIZE (rust/crates/unic-ucd-category-0.9.0.crate) = 25480
+SHA256 (rust/crates/unic-ucd-hangul-0.9.0.crate) = eb1dc690e19010e1523edb9713224cba5ef55b54894fe33424439ec9a40c0054
+SIZE (rust/crates/unic-ucd-hangul-0.9.0.crate) = 3508
+SHA256 (rust/crates/unic-ucd-ident-0.9.0.crate) = e230a37c0381caa9219d67cf063aa3a375ffed5bf541a452db16e744bdab6987
+SIZE (rust/crates/unic-ucd-ident-0.9.0.crate) = 16128
+SHA256 (rust/crates/unic-ucd-normal-0.9.0.crate) = 86aed873b8202d22b13859dda5fe7c001d271412c31d411fd9b827e030569410
+SIZE (rust/crates/unic-ucd-normal-0.9.0.crate) = 50571
+SHA256 (rust/crates/unic-ucd-version-0.9.0.crate) = 96bd2f2237fe450fcd0a1d2f5f4e91711124f7857ba2e964247776ebeeb7b0c4
+SIZE (rust/crates/unic-ucd-version-0.9.0.crate) = 2246
+SHA256 (rust/crates/unicase-2.7.0.crate) = f7d2d4dafb69621809a81864c9c1b864479e1235c0dd4e199924b9742439ed89
+SIZE (rust/crates/unicase-2.7.0.crate) = 23783
+SHA256 (rust/crates/unicode-bidi-0.3.14.crate) = 6f2528f27a9eb2b21e69c95319b30bd0efd85d09c379741b0f78ea1d86be2416
+SIZE (rust/crates/unicode-bidi-0.3.14.crate) = 56429
+SHA256 (rust/crates/unicode-casing-0.1.0.crate) = 623f59e6af2a98bdafeb93fa277ac8e1e40440973001ca15cf4ae1541cd16d56
+SIZE (rust/crates/unicode-casing-0.1.0.crate) = 21310
+SHA256 (rust/crates/unicode-ident-1.0.12.crate) = 3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b
+SIZE (rust/crates/unicode-ident-1.0.12.crate) = 42168
+SHA256 (rust/crates/unicode-normalization-0.1.22.crate) = 5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921
+SIZE (rust/crates/unicode-normalization-0.1.22.crate) = 122604
+SHA256 (rust/crates/unicode-segmentation-1.10.1.crate) = 1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36
+SIZE (rust/crates/unicode-segmentation-1.10.1.crate) = 98416
+SHA256 (rust/crates/unicode-width-0.1.11.crate) = e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85
+SIZE (rust/crates/unicode-width-0.1.11.crate) = 19187
+SHA256 (rust/crates/unicode-xid-0.2.4.crate) = f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c
+SIZE (rust/crates/unicode-xid-0.2.4.crate) = 15352
+SHA256 (rust/crates/unicode_categories-0.1.1.crate) = 39ec24b3121d976906ece63c9daad25b85969647682eee313cb5779fdd69e14e
+SIZE (rust/crates/unicode_categories-0.1.1.crate) = 87298
+SHA256 (rust/crates/unindent-0.1.11.crate) = e1766d682d402817b5ac4490b3c3002d91dfa0d22812f341609f97b08757359c
+SIZE (rust/crates/unindent-0.1.11.crate) = 7700
+SHA256 (rust/crates/unsafe-libyaml-0.2.10.crate) = ab4c90930b95a82d00dc9e9ac071b4991924390d46cbd0dfe566148667605e4b
+SIZE (rust/crates/unsafe-libyaml-0.2.10.crate) = 61964
+SHA256 (rust/crates/untrusted-0.7.1.crate) = a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a
+SIZE (rust/crates/untrusted-0.7.1.crate) = 7924
+SHA256 (rust/crates/untrusted-0.9.0.crate) = 8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1
+SIZE (rust/crates/untrusted-0.9.0.crate) = 14447
+SHA256 (rust/crates/url-2.5.0.crate) = 31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633
+SIZE (rust/crates/url-2.5.0.crate) = 78605
+SHA256 (rust/crates/urlencoding-2.1.3.crate) = daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da
+SIZE (rust/crates/urlencoding-2.1.3.crate) = 6538
+SHA256 (rust/crates/utf8-width-0.1.7.crate) = 86bd8d4e895da8537e5315b8254664e6b769c4ff3db18321b297a1e7004392e3
+SIZE (rust/crates/utf8-width-0.1.7.crate) = 2977
+SHA256 (rust/crates/utf8parse-0.2.1.crate) = 711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a
+SIZE (rust/crates/utf8parse-0.2.1.crate) = 13435
+SHA256 (rust/crates/uuid-1.6.1.crate) = 5e395fcf16a7a3d8127ec99782007af141946b4795001f876d54fb0d55978560
+SIZE (rust/crates/uuid-1.6.1.crate) = 55554
+SHA256 (rust/crates/uuid-macro-internal-1.6.1.crate) = f49e7f3f3db8040a100710a11932239fd30697115e2ba4107080d8252939845e
+SIZE (rust/crates/uuid-macro-internal-1.6.1.crate) = 9137
+SHA256 (rust/crates/valuable-0.1.0.crate) = 830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d
+SIZE (rust/crates/valuable-0.1.0.crate) = 27718
+SHA256 (rust/crates/variadics-0.0.2.crate) = c4500f518837578bf2d62d9c12f47ecb5b5279da689574793b7bace8138b4784
+SIZE (rust/crates/variadics-0.0.2.crate) = 4556
+SHA256 (rust/crates/vcpkg-0.2.15.crate) = accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426
+SIZE (rust/crates/vcpkg-0.2.15.crate) = 228735
+SHA256 (rust/crates/vec_map-0.8.2.crate) = f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191
+SIZE (rust/crates/vec_map-0.8.2.crate) = 14466
+SHA256 (rust/crates/vergen-7.5.1.crate) = f21b881cd6636ece9735721cf03c1fe1e774fe258683d084bb2812ab67435749
+SIZE (rust/crates/vergen-7.5.1.crate) = 31562
+SHA256 (rust/crates/version_check-0.9.4.crate) = 49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f
+SIZE (rust/crates/version_check-0.9.4.crate) = 14895
+SHA256 (rust/crates/vob-3.0.3.crate) = c058f4c41e71a043c67744cb76dcc1ae63ece328c1732a72489ccccc2dec23e6
+SIZE (rust/crates/vob-3.0.3.crate) = 17698
+SHA256 (rust/crates/volatile-0.3.0.crate) = f8e76fae08f03f96e166d2dfda232190638c10e0383841252416f9cfe2ae60e6
+SIZE (rust/crates/volatile-0.3.0.crate) = 3095
+SHA256 (rust/crates/walkdir-2.4.0.crate) = d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee
+SIZE (rust/crates/walkdir-2.4.0.crate) = 23550
+SHA256 (rust/crates/want-0.3.1.crate) = bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e
+SIZE (rust/crates/want-0.3.1.crate) = 6398
+SHA256 (rust/crates/wasi-0.11.0+wasi-snapshot-preview1.crate) = 9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423
+SIZE (rust/crates/wasi-0.11.0+wasi-snapshot-preview1.crate) = 28131
+SHA256 (rust/crates/wasite-0.1.0.crate) = b8dad83b4f25e74f184f64c43b150b91efe7647395b42289f38e50566d82855b
+SIZE (rust/crates/wasite-0.1.0.crate) = 2346
+SHA256 (rust/crates/wasm-bindgen-0.2.89.crate) = 0ed0d4f68a3015cc185aff4db9506a015f4b96f95303897bfa23f846db54064e
+SIZE (rust/crates/wasm-bindgen-0.2.89.crate) = 181935
+SHA256 (rust/crates/wasm-bindgen-backend-0.2.89.crate) = 1b56f625e64f3a1084ded111c4d5f477df9f8c92df113852fa5a374dbda78826
+SIZE (rust/crates/wasm-bindgen-backend-0.2.89.crate) = 28205
+SHA256 (rust/crates/wasm-bindgen-futures-0.4.39.crate) = ac36a15a220124ac510204aec1c3e5db8a22ab06fd6706d881dc6149f8ed9a12
+SIZE (rust/crates/wasm-bindgen-futures-0.4.39.crate) = 15376
+SHA256 (rust/crates/wasm-bindgen-macro-0.2.89.crate) = 0162dbf37223cd2afce98f3d0785506dcb8d266223983e4b5b525859e6e182b2
+SIZE (rust/crates/wasm-bindgen-macro-0.2.89.crate) = 13906
+SHA256 (rust/crates/wasm-bindgen-macro-support-0.2.89.crate) = f0eb82fcb7930ae6219a7ecfd55b217f5f0893484b7a13022ebb2b2bf20b5283
+SIZE (rust/crates/wasm-bindgen-macro-support-0.2.89.crate) = 20008
+SHA256 (rust/crates/wasm-bindgen-shared-0.2.89.crate) = 7ab9b36309365056cd639da3134bf87fa8f3d86008abf99e612384a6eecd459f
+SIZE (rust/crates/wasm-bindgen-shared-0.2.89.crate) = 7265
+SHA256 (rust/crates/wasm-streams-0.3.0.crate) = b4609d447824375f43e1ffbc051b50ad8f4b3ae8219680c94452ea05eb240ac7
+SIZE (rust/crates/wasm-streams-0.3.0.crate) = 33502
+SHA256 (rust/crates/web-sys-0.3.66.crate) = 50c24a44ec86bb68fbecd1b3efed7e85ea5621b39b35ef2766b66cd984f8010f
+SIZE (rust/crates/web-sys-0.3.66.crate) = 733024
+SHA256 (rust/crates/web-time-0.2.4.crate) = aa30049b1c872b72c89866d458eae9f20380ab280ffd1b1e18df2d3e2d98cfe0
+SIZE (rust/crates/web-time-0.2.4.crate) = 15743
+SHA256 (rust/crates/webbrowser-0.8.12.crate) = 82b2391658b02c27719fc5a0a73d6e696285138e8b12fba9d4baa70451023c71
+SIZE (rust/crates/webbrowser-0.8.12.crate) = 38923
+SHA256 (rust/crates/webpki-0.22.4.crate) = ed63aea5ce73d0ff405984102c42de94fc55a6b75765d621c65262469b3c9b53
+SIZE (rust/crates/webpki-0.22.4.crate) = 63472
+SHA256 (rust/crates/webpki-roots-0.22.6.crate) = b6c71e40d7d2c34a5106301fb632274ca37242cd0c9d3e64dbece371a40a2d87
+SIZE (rust/crates/webpki-roots-0.22.6.crate) = 242386
+SHA256 (rust/crates/webpki-roots-0.25.3.crate) = 1778a42e8b3b90bff8d0f5032bf22250792889a5cdc752aa0020c84abe3aaf10
+SIZE (rust/crates/webpki-roots-0.25.3.crate) = 251565
+SHA256 (rust/crates/which-4.4.2.crate) = 87ba24419a2078cd2b0f2ede2691b6c66d8e47836da3b6db8265ebad47afbfc7
+SIZE (rust/crates/which-4.4.2.crate) = 15953
+SHA256 (rust/crates/whoami-1.5.1.crate) = a44ab49fad634e88f55bf8f9bb3abd2f27d7204172a112c7c9987e01c1c94ea9
+SIZE (rust/crates/whoami-1.5.1.crate) = 24026
+SHA256 (rust/crates/wide-0.7.13.crate) = c68938b57b33da363195412cfc5fc37c9ed49aa9cfe2156fde64b8d2c9498242
+SIZE (rust/crates/wide-0.7.13.crate) = 80191
+SHA256 (rust/crates/widestring-0.5.1.crate) = 17882f045410753661207383517a6f62ec3dbeb6a4ed2acce01f0728238d1983
+SIZE (rust/crates/widestring-0.5.1.crate) = 41338
+SHA256 (rust/crates/winapi-0.3.9.crate) = 5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419
+SIZE (rust/crates/winapi-0.3.9.crate) = 1200382
+SHA256 (rust/crates/winapi-i686-pc-windows-gnu-0.4.0.crate) = ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6
+SIZE (rust/crates/winapi-i686-pc-windows-gnu-0.4.0.crate) = 2918815
+SHA256 (rust/crates/winapi-util-0.1.6.crate) = f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596
+SIZE (rust/crates/winapi-util-0.1.6.crate) = 12234
+SHA256 (rust/crates/winapi-x86_64-pc-windows-gnu-0.4.0.crate) = 712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f
+SIZE (rust/crates/winapi-x86_64-pc-windows-gnu-0.4.0.crate) = 2947998
+SHA256 (rust/crates/windows-0.39.0.crate) = f1c4bd0a50ac6020f65184721f758dba47bb9fbc2133df715ec74a237b26794a
+SIZE (rust/crates/windows-0.39.0.crate) = 12776691
+SHA256 (rust/crates/windows-0.52.0.crate) = e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be
+SIZE (rust/crates/windows-0.52.0.crate) = 11843715
+SHA256 (rust/crates/windows-core-0.51.1.crate) = f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64
+SIZE (rust/crates/windows-core-0.51.1.crate) = 42364
+SHA256 (rust/crates/windows-core-0.52.0.crate) = 33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9
+SIZE (rust/crates/windows-core-0.52.0.crate) = 42154
+SHA256 (rust/crates/windows-sys-0.45.0.crate) = 75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0
+SIZE (rust/crates/windows-sys-0.45.0.crate) = 2568659
+SHA256 (rust/crates/windows-sys-0.48.0.crate) = 677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9
+SIZE (rust/crates/windows-sys-0.48.0.crate) = 2628884
+SHA256 (rust/crates/windows-sys-0.52.0.crate) = 282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d
+SIZE (rust/crates/windows-sys-0.52.0.crate) = 2576877
+SHA256 (rust/crates/windows-targets-0.42.2.crate) = 8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071
+SIZE (rust/crates/windows-targets-0.42.2.crate) = 5492
+SHA256 (rust/crates/windows-targets-0.48.5.crate) = 9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c
+SIZE (rust/crates/windows-targets-0.48.5.crate) = 6904
+SHA256 (rust/crates/windows-targets-0.52.0.crate) = 8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd
+SIZE (rust/crates/windows-targets-0.52.0.crate) = 6229
+SHA256 (rust/crates/windows_aarch64_gnullvm-0.42.2.crate) = 597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8
+SIZE (rust/crates/windows_aarch64_gnullvm-0.42.2.crate) = 364071
+SHA256 (rust/crates/windows_aarch64_gnullvm-0.48.5.crate) = 2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8
+SIZE (rust/crates/windows_aarch64_gnullvm-0.48.5.crate) = 418492
+SHA256 (rust/crates/windows_aarch64_gnullvm-0.52.0.crate) = cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea
+SIZE (rust/crates/windows_aarch64_gnullvm-0.52.0.crate) = 430182
+SHA256 (rust/crates/windows_aarch64_msvc-0.39.0.crate) = ec7711666096bd4096ffa835238905bb33fb87267910e154b18b44eaabb340f2
+SIZE (rust/crates/windows_aarch64_msvc-0.39.0.crate) = 661960
+SHA256 (rust/crates/windows_aarch64_msvc-0.42.2.crate) = e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43
+SIZE (rust/crates/windows_aarch64_msvc-0.42.2.crate) = 666981
+SHA256 (rust/crates/windows_aarch64_msvc-0.48.5.crate) = dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc
+SIZE (rust/crates/windows_aarch64_msvc-0.48.5.crate) = 798483
+SHA256 (rust/crates/windows_aarch64_msvc-0.52.0.crate) = bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef
+SIZE (rust/crates/windows_aarch64_msvc-0.52.0.crate) = 821663
+SHA256 (rust/crates/windows_i686_gnu-0.39.0.crate) = 763fc57100a5f7042e3057e7e8d9bdd7860d330070251a73d003563a3bb49e1b
+SIZE (rust/crates/windows_i686_gnu-0.39.0.crate) = 818115
+SHA256 (rust/crates/windows_i686_gnu-0.42.2.crate) = c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f
+SIZE (rust/crates/windows_i686_gnu-0.42.2.crate) = 736236
+SHA256 (rust/crates/windows_i686_gnu-0.48.5.crate) = a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e
+SIZE (rust/crates/windows_i686_gnu-0.48.5.crate) = 844891
+SHA256 (rust/crates/windows_i686_gnu-0.52.0.crate) = a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313
+SIZE (rust/crates/windows_i686_gnu-0.52.0.crate) = 870285
+SHA256 (rust/crates/windows_i686_msvc-0.39.0.crate) = 7bc7cbfe58828921e10a9f446fcaaf649204dcfe6c1ddd712c5eebae6bda1106
+SIZE (rust/crates/windows_i686_msvc-0.39.0.crate) = 724575
+SHA256 (rust/crates/windows_i686_msvc-0.42.2.crate) = 44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060
+SIZE (rust/crates/windows_i686_msvc-0.42.2.crate) = 724951
+SHA256 (rust/crates/windows_i686_msvc-0.48.5.crate) = 8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406
+SIZE (rust/crates/windows_i686_msvc-0.48.5.crate) = 864300
+SHA256 (rust/crates/windows_i686_msvc-0.52.0.crate) = ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a
+SIZE (rust/crates/windows_i686_msvc-0.52.0.crate) = 888693
+SHA256 (rust/crates/windows_x86_64_gnu-0.39.0.crate) = 6868c165637d653ae1e8dc4d82c25d4f97dd6605eaa8d784b5c6e0ab2a252b65
+SIZE (rust/crates/windows_x86_64_gnu-0.39.0.crate) = 790933
+SHA256 (rust/crates/windows_x86_64_gnu-0.42.2.crate) = 8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36
+SIZE (rust/crates/windows_x86_64_gnu-0.42.2.crate) = 699373
+SHA256 (rust/crates/windows_x86_64_gnu-0.48.5.crate) = 53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e
+SIZE (rust/crates/windows_x86_64_gnu-0.48.5.crate) = 801619
+SHA256 (rust/crates/windows_x86_64_gnu-0.52.0.crate) = 3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd
+SIZE (rust/crates/windows_x86_64_gnu-0.52.0.crate) = 826213
+SHA256 (rust/crates/windows_x86_64_gnullvm-0.42.2.crate) = 26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3
+SIZE (rust/crates/windows_x86_64_gnullvm-0.42.2.crate) = 364068
+SHA256 (rust/crates/windows_x86_64_gnullvm-0.48.5.crate) = 0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc
+SIZE (rust/crates/windows_x86_64_gnullvm-0.48.5.crate) = 418486
+SHA256 (rust/crates/windows_x86_64_gnullvm-0.52.0.crate) = 1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e
+SIZE (rust/crates/windows_x86_64_gnullvm-0.52.0.crate) = 430165
+SHA256 (rust/crates/windows_x86_64_msvc-0.39.0.crate) = 5e4d40883ae9cae962787ca76ba76390ffa29214667a111db9e0a1ad8377e809
+SIZE (rust/crates/windows_x86_64_msvc-0.39.0.crate) = 662005
+SHA256 (rust/crates/windows_x86_64_msvc-0.42.2.crate) = 9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0
+SIZE (rust/crates/windows_x86_64_msvc-0.42.2.crate) = 666936
+SHA256 (rust/crates/windows_x86_64_msvc-0.48.5.crate) = ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538
+SIZE (rust/crates/windows_x86_64_msvc-0.48.5.crate) = 798412
+SHA256 (rust/crates/windows_x86_64_msvc-0.52.0.crate) = dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04
+SIZE (rust/crates/windows_x86_64_msvc-0.52.0.crate) = 821600
+SHA256 (rust/crates/winnow-0.5.30.crate) = 9b5c3db89721d50d0e2a673f5043fc4722f76dcc352d7b1ab8b8288bed4ed2c5
+SIZE (rust/crates/winnow-0.5.30.crate) = 152904
+SHA256 (rust/crates/winreg-0.10.1.crate) = 80d0f4e272c85def139476380b12f9ac60926689dd2e01d4923222f40580869d
+SIZE (rust/crates/winreg-0.10.1.crate) = 25725
+SHA256 (rust/crates/winreg-0.50.0.crate) = 524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1
+SIZE (rust/crates/winreg-0.50.0.crate) = 29703
+SHA256 (rust/crates/wyz-0.5.1.crate) = 05f360fc0b24296329c78fda852a1e9ae82de9cf7b27dae4b7f62f118f77b9ed
+SIZE (rust/crates/wyz-0.5.1.crate) = 18790
+SHA256 (rust/crates/x509-certificate-0.23.1.crate) = 66534846dec7a11d7c50a74b7cdb208b9a581cad890b7866430d438455847c85
+SIZE (rust/crates/x509-certificate-0.23.1.crate) = 45663
+SHA256 (rust/crates/xml-rs-0.8.19.crate) = 0fcb9cbac069e033553e8bb871be2fbdffcab578eb25bd0f7c508cedc6dcd75a
+SIZE (rust/crates/xml-rs-0.8.19.crate) = 54051
+SHA256 (rust/crates/xz2-0.1.7.crate) = 388c44dc09d76f1536602ead6d325eb532f5c122f17782bd57fb47baeeb767e2
+SIZE (rust/crates/xz2-0.1.7.crate) = 23892
+SHA256 (rust/crates/yaml-rust-0.4.5.crate) = 56c1936c4cc7a1c9ab21a1ebb602eb942ba868cbd44a99cb7cdc5892335e1c85
+SIZE (rust/crates/yaml-rust-0.4.5.crate) = 47783
+SHA256 (rust/crates/zerocopy-0.7.32.crate) = 74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be
+SIZE (rust/crates/zerocopy-0.7.32.crate) = 151096
+SHA256 (rust/crates/zerocopy-derive-0.7.32.crate) = 9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6
+SIZE (rust/crates/zerocopy-derive-0.7.32.crate) = 37623
+SHA256 (rust/crates/zeroize-1.7.0.crate) = 525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d
+SIZE (rust/crates/zeroize-1.7.0.crate) = 19039
+SHA256 (rust/crates/zeroize_derive-1.4.2.crate) = ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69
+SIZE (rust/crates/zeroize_derive-1.4.2.crate) = 11141
+SHA256 (rust/crates/zigzag-0.1.0.crate) = 70b40401a28d86ce16a330b863b86fd7dbee4d7c940587ab09ab8c019f9e3fdf
+SIZE (rust/crates/zigzag-0.1.0.crate) = 2085
+SHA256 (rust/crates/zstd-0.11.2+zstd.1.5.2.crate) = 20cc960326ece64f010d2d2107537f26dc589a6573a316bd5b1dba685fa5fde4
+SIZE (rust/crates/zstd-0.11.2+zstd.1.5.2.crate) = 28987
+SHA256 (rust/crates/zstd-0.12.4.crate) = 1a27595e173641171fc74a1232b7b1c7a7cb6e18222c11e9dfb9888fa424c53c
+SIZE (rust/crates/zstd-0.12.4.crate) = 30434
+SHA256 (rust/crates/zstd-0.13.0.crate) = bffb3309596d527cfcba7dfc6ed6052f1d39dfbd7c867aa2e865e4a449c10110
+SIZE (rust/crates/zstd-0.13.0.crate) = 28911
+SHA256 (rust/crates/zstd-safe-5.0.2+zstd.1.5.2.crate) = 1d2a5585e04f9eea4b2a3d1eca508c4dee9592a89ef6f450c11719da0726f4db
+SIZE (rust/crates/zstd-safe-5.0.2+zstd.1.5.2.crate) = 17273
+SHA256 (rust/crates/zstd-safe-6.0.6.crate) = ee98ffd0b48ee95e6c5168188e44a54550b1564d9d530ee21d5f0eaed1069581
+SIZE (rust/crates/zstd-safe-6.0.6.crate) = 20828
+SHA256 (rust/crates/zstd-safe-7.0.0.crate) = 43747c7422e2924c11144d5229878b98180ef8b06cca4ab5af37afc8a8d8ea3e
+SIZE (rust/crates/zstd-safe-7.0.0.crate) = 20463
+SHA256 (rust/crates/zstd-sys-2.0.9+zstd.1.5.5.crate) = 9e16efa8a874a0481a574084d34cc26fdb3b99627480f785888deb6386506656
+SIZE (rust/crates/zstd-sys-2.0.9+zstd.1.5.5.crate) = 728791
+SHA256 (GreptimeTeam-greptime-meter-80b72716dcde47ec4161478416a5c6c21343364d_GH0.tar.gz) = cb143eb6a8c522cb674a364cdd5bb6abf081fe0a5bf75589779d70b0856b8eef
+SIZE (GreptimeTeam-greptime-meter-80b72716dcde47ec4161478416a5c6c21343364d_GH0.tar.gz) = 10577
+SHA256 (GreptimeTeam-sqlparser-rs-6a93567ae38d42be5c8d08b13c8ff4dde26502ef_GH0.tar.gz) = d09dfb682ce352ad65ccda773c721541925a27c92be0cbf4febd9a2f07aa2938
+SIZE (GreptimeTeam-sqlparser-rs-6a93567ae38d42be5c8d08b13c8ff4dde26502ef_GH0.tar.gz) = 252924
+SHA256 (apache-arrow-datafusion-26e43acac3a96cec8dd4c8365f22dfb1a84306e9_GH0.tar.gz) = 71e543fc817b12813f16d402fa28650361ecb85f92cb20c3ee29fa6f98864752
+SIZE (apache-arrow-datafusion-26e43acac3a96cec8dd4c8365f22dfb1a84306e9_GH0.tar.gz) = 2556514
+SHA256 (evenyag-influxdb_iox-10ef0d0b02705ac7518717390939fa3a9bcfcacc_GH0.tar.gz) = 1e24a19b024f74065ad9a9b46a698b2ba17e1616e217e8dfea81b0a6cbcf6735
+SIZE (evenyag-influxdb_iox-10ef0d0b02705ac7518717390939fa3a9bcfcacc_GH0.tar.gz) = 7347494
+SHA256 (RustPython-__doc__-8b62ce5d796d68a091969c9fa5406276cb483f79_GH0.tar.gz) = afa7fd498357dc0548901671bd3c4d0d3d207bab23d09b3b6b4ee21ddbf4e06d
+SIZE (RustPython-__doc__-8b62ce5d796d68a091969c9fa5406276cb483f79_GH0.tar.gz) = 99231
+SHA256 (discord9-RustPython-9ed51374125b5f1a9e5cee5dd7e27023b8591f1e_GH0.tar.gz) = b619a156f9d6caee4dded0c890147be0faad8726fee9ce66eaad24f5d7e2f712
+SIZE (discord9-RustPython-9ed51374125b5f1a9e5cee5dd7e27023b8591f1e_GH0.tar.gz) = 10889865
+SHA256 (youknowone-unicode_names2-4ce16aa85cbcdd9cc830410f1a72ef9a235f2fde_GH0.tar.gz) = 7dc5f9695932b5ec54d53b44db9f6f8933d5c283946841366cd39936d6dcc0dd
+SIZE (youknowone-unicode_names2-4ce16aa85cbcdd9cc830410f1a72ef9a235f2fde_GH0.tar.gz) = 799276
+SHA256 (waynexia-opentelemetry-rust-33841b38dda79b15f2024952be5f32533325ca02_GH0.tar.gz) = 7f34c6589a03c1e9b0c21af5315cccdbb91e7baa80fed7b47597d15e3aa4004c
+SIZE (waynexia-opentelemetry-rust-33841b38dda79b15f2024952be5f32533325ca02_GH0.tar.gz) = 869255
+SHA256 (GreptimeTeam-greptime-proto-06f6297ff3cab578a1589741b504342fbad70453_GH0.tar.gz) = c726e1a7a7c1f0ac403a18caef0c6d7dcf325aeddf1a859170ed40b2b858680c
+SIZE (GreptimeTeam-greptime-proto-06f6297ff3cab578a1589741b504342fbad70453_GH0.tar.gz) = 1005122
+SHA256 (GreptimeTeam-greptimedb-v0.7.2_GH0.tar.gz) = a74f5d080a15c749248e584710b6ecb3700987322c3ce84188bc3e3c2a8e2450
+SIZE (GreptimeTeam-greptimedb-v0.7.2_GH0.tar.gz) = 2440358
diff --git a/databases/greptimedb/files/greptimedb.in b/databases/greptimedb/files/greptimedb.in
new file mode 100644
index 000000000000..9d7615ccba0b
--- /dev/null
+++ b/databases/greptimedb/files/greptimedb.in
@@ -0,0 +1,127 @@
+#!/bin/sh
+
+# PROVIDE: greptimedb
+# REQUIRE: LOGIN
+# KEYWORD: shutdown
+#
+# Add the following lines to /etc/rc.conf to run greptimedb:
+#
+# greptimedb_profiles (str):     Set to "" by default.
+#                               Define your profiles here.
+# greptimedb(_profile)?_enable (bool):	Set it to "YES" to enable greptimedb.
+#				Default is "NO".
+# greptimedb(_profile)?_args (flags):	Set extra args here. More options in greptimedb(1)
+#				Default is "--log-dir=/var/log/greptimedb --log-level=info \
+#				standalone start -c %%ETCDIR%%/standalone.toml"
+#				for the 'standalone' mode.
+# greptimedb(_profile)?_user (user):	Set user to run greptimedb.
+#				Default is "%%USER%%".
+# greptimedb(_profile)?_group (group):	Set group to run greptimedb.
+#				Default is "%%GROUP%%".
+# greptimedb(_profile)?_post_start (str):   Set extra commands that should be executed after greptimedb was successfully
+#                               started here.
+#                               Default is empty "".
+
+. /etc/rc.subr
+
+name="greptimedb"
+rcvar=greptimedb_enable
+
+_piddir="/var/run/greptimedb"
+pidfile="${_piddir}/greptimedb.pid"
+
+: ${greptimedb_enable="NO"}
+: ${greptimedb_user="%%USER%%"}
+: ${greptimedb_group="%%GROUP%%"}
+: ${greptimedb_args="--log-dir=/var/log/greptimedb --log-level=info standalone start -c %%ETCDIR%%/standalone.toml"} # standalone mode
+
+load_rc_config ${name}
+
+if [ -n "$2" ]; then # profile is provided
+	profile="$2"
+	if [ -n "${greptimedb_profiles}" ]; then
+		pidfile="${_piddir}/greptimedb.${profile}.pid"
+		eval greptimedb_enable="\${greptimedb_${profile}_enable:-${greptimedb_enable}}"
+		eval greptimedb_user="\${greptimedb_${profile}_user:-${greptimedb_user}}"
+		eval greptimedb_group="\${greptimedb_${profile}_group:-${greptimedb_group}}"
+		eval greptimedb_args="\${greptimedb_${profile}_args:-${greptimedb_args}}"
+		eval greptimedb_post_start="\${greptimedb_${profile}_post_start:-${greptimedb_post_start}}"
+	else
+		echo "%%PREFIX%%/etc/rc.d/greptimedb: extra argument ignored"
+	fi
+else # profile is not provided
+	if [ -n "${greptimedb_profiles}" -a -n "$1" ]; then
+		for profile in ${greptimedb_profiles}; do
+			eval _enable="\${greptimedb_${profile}_enable}"
+			case "${_enable:-${greptimedb_enable}}" in
+			[Nn][Oo]|[Ff][Aa][Ll][Ss][Ee]|[Oo][Ff][Ff]|0)
+				continue
+				;;
+			[Yy][Ee][Ss]|[Tt][Rr][Uu][Ee]|[Oo][Nn]|1)
+				;;
+			*)
+				if test -z "$_enable"; then
+					_var=greptimedb_enable
+				else
+					_var=greptimedb_"${profile}"_enable
+				fi
+				warn \
+					"Bad value" \
+					"'${_enable:-${greptimedb_enable}}'" \
+					"for ${_var}. " \
+					"Profile ${profile} skipped."
+				continue
+				;;
+			esac
+			echo "===> greptimedb profile: ${profile}"
+			if %%PREFIX%%/etc/rc.d/greptimedb $1 ${profile} ; then
+				success="${profile} ${success:-}"
+			else
+				failed="${profile} (${retcode}) ${failed:-}"
+			fi
+		done
+		exit 0
+	fi
+fi
+
+greptimedb_poststart()
+{
+	if [ -n "$greptimedb_post_start" ]; then
+		eval $greptimedb_post_start
+	fi
+}
+
+greptimedb_poststop()
+{
+	if [ -n "${profile}" ]; then
+		[ -e "$pidfile" ] && unlink $pidfile
+	else
+		local file
+
+		for file in ${_piddir}/* ; do
+			case "$file" in
+			*\*)
+				continue ;;
+			esac
+			unlink $file
+		done
+	fi
+}
+
+_profsuffx=""
+if [ -n "${profile}" ]; then
+	_profsuffx="-${profile}"
+fi
+
+procname=%%PREFIX%%/bin/greptime
+command="/usr/sbin/daemon"
+command_args="-f -S -p ${pidfile} \
+	-t greptimedb${_profsuffx} \
+	%%PREFIX%%/bin/greptime $greptimedb_args"
+
+
+start_precmd="install -d -o $greptimedb_user -g $greptimedb_group -m 755 $_piddir"
+start_postcmd="${name}_poststart"
+stop_postcmd="${name}_poststop"
+
+run_rc_command "$1"
diff --git a/databases/greptimedb/pkg-descr b/databases/greptimedb/pkg-descr
new file mode 100644
index 000000000000..4ab8eb48855b
--- /dev/null
+++ b/databases/greptimedb/pkg-descr
@@ -0,0 +1,4 @@
+GreptimeDB is an open-source time-series database with a special focus on
+scalability, analytical capabilities and efficiency. It's designed to work on
+infrastructure of the cloud era, and users benefit from its elasticity and
+commodity storage.
diff --git a/databases/greptimedb/pkg-plist b/databases/greptimedb/pkg-plist
new file mode 100644
index 000000000000..1f2e39d2b8b0
--- /dev/null
+++ b/databases/greptimedb/pkg-plist
@@ -0,0 +1,9 @@
+bin/greptime
+bin/nyc-taxi
+bin/sqlness-runner
+@sample %%ETCDIR%%/datanode.toml.sample
+@sample %%ETCDIR%%/frontend.toml.sample
+@sample %%ETCDIR%%/metasrv.toml.sample
+@sample %%ETCDIR%%/standalone.toml.sample
+@dir(%%USER%%,%%GROUP%%,) /var/db/greptimedb
+@dir(%%USER%%,%%GROUP%%,) /var/log/greptimedb
diff --git a/databases/hashtypes/Makefile b/databases/hashtypes/Makefile
index 676421a419a1..17b2437dbcc2 100644
--- a/databases/hashtypes/Makefile
+++ b/databases/hashtypes/Makefile
@@ -1,22 +1,30 @@
-# Created by: Sevan Janiyan <venture37@geeklan.co.uk>
-
 PORTNAME=	hashtypes
-PORTVERSION=	0.1.1
-PORTREVISION=	3
+PORTVERSION=	0.1.4
 CATEGORIES=	databases security
 MASTER_SITES=	http://api.pgxn.org/dist/hashtypes/${PORTVERSION}/ \
 		http://oss-files.dreamindustries.co/mirror/
 
+PATCH_SITES=	https://github.com/adjust/${PORTNAME}/commit/
+PATCHFILES+=	1c08e29edab2541ab06bd1c990ae68beb417e542.patch:-p1
+
 MAINTAINER=	oss-contrib@dreamindustries.co
 COMMENT=	Hash data types for PostgreSQL
+WWW=		https://pgxn.org/dist/hashtypes/
+
+LICENSE=	MIT
+LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		gmake pgsql zip
-LLD_UNSAFE=	yes
 
 MAKE_ARGS=	USE_PGXS=1 MODULEDIR=extension
+INSTALL_TARGET=	install-strip
+
+LLD_UNSAFE=	yes
+
 MODULEDIR=	${PREFIX}/share/postgresql/extension
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.control ${STAGEDIR}${MODULEDIR}
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/postgresql/hashtypes.so
 
 .include <bsd.port.mk>
diff --git a/databases/hashtypes/distinfo b/databases/hashtypes/distinfo
index b424407281fb..35143e3abeee 100644
--- a/databases/hashtypes/distinfo
+++ b/databases/hashtypes/distinfo
@@ -1,2 +1,5 @@
-SHA256 (hashtypes-0.1.1.zip) = 183cb81bc4973df18906f0ab07f1d6891b9879b312f6de2772a54ff94696ab5e
-SIZE (hashtypes-0.1.1.zip) = 12989
+TIMESTAMP = 1686262968
+SHA256 (hashtypes-0.1.4.zip) = 2262b5ad8389362aea7bec0a9af566bc61ddc8ad81258e9fcf54573a4fc6ca4d
+SIZE (hashtypes-0.1.4.zip) = 35118
+SHA256 (1c08e29edab2541ab06bd1c990ae68beb417e542.patch) = f6204c3cfd7bbc37f7076979a96c8ea4e9a87fc4f1207bc4e7e470c49933dbad
+SIZE (1c08e29edab2541ab06bd1c990ae68beb417e542.patch) = 3835
diff --git a/databases/hashtypes/pkg-descr b/databases/hashtypes/pkg-descr
index 827c79eadfa9..72363dd6b924 100644
--- a/databases/hashtypes/pkg-descr
+++ b/databases/hashtypes/pkg-descr
@@ -1,5 +1,3 @@
 SHA1, SHA256, SHA512, MD5 & CRC32 data types for PostgreSQL
 A fork of the shatypes extension which adds additional
 data types along with some fixes.
-
-WWW: http://pgxn.org/dist/hashtypes/
diff --git a/databases/hashtypes/pkg-plist b/databases/hashtypes/pkg-plist
index 5f476cf17ff1..9ad5a85c61fd 100644
--- a/databases/hashtypes/pkg-plist
+++ b/databases/hashtypes/pkg-plist
@@ -1,4 +1,10 @@
 lib/postgresql/hashtypes.so
 share/doc/postgresql/extension/README.hashtypes
 share/postgresql/extension/hashtypes--0.1.1.sql
+share/postgresql/extension/hashtypes--0.1.1--0.1.2.sql
+share/postgresql/extension/hashtypes--0.1.2--0.1.3.sql
+share/postgresql/extension/hashtypes--0.1.2.sql
+share/postgresql/extension/hashtypes--0.1.3--0.1.4.sql
+share/postgresql/extension/hashtypes--0.1.3.sql
+share/postgresql/extension/hashtypes--0.1.4.sql
 share/postgresql/extension/hashtypes.control
diff --git a/databases/hbase/Makefile b/databases/hbase/Makefile
deleted file mode 100644
index 82d418dc3c2c..000000000000
--- a/databases/hbase/Makefile
+++ /dev/null
@@ -1,87 +0,0 @@
-# Created by: Dmitry Sivachenko <mitya@yandex-team.ru>
-
-PORTNAME=	hbase
-PORTVERSION=	1.2.1
-PORTREVISION=	1
-CATEGORIES=	databases java
-MASTER_SITES=	APACHE/${PORTNAME}/${PORTVERSION} \
-		http://kev009.com/freebsd/:maven
-DISTFILES=	${DISTNAME}-src${EXTRACT_SUFX} FreeBSD-${PORTNAME}-${PORTVERSION}-maven-repository.tar.gz:maven
-DIST_SUBDIR=	hadoop
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Hadoop database, a distributed, scalable, big data store
-
-LICENSE=	APACHE20
-
-BUILD_DEPENDS=	bash:shells/bash \
-		cmake:devel/cmake \
-		${LOCALBASE}/share/java/maven3/bin/mvn:devel/maven3
-RUN_DEPENDS=	bash:shells/bash \
-		yarn:devel/hadoop2
-
-USES=		cpe
-CPE_VENDOR=	apache
-USE_JAVA=	yes
-MAKE_ENV+=	JAVA_HOME=${JAVA_HOME} MAVEN_OPTS="-XX:MaxPermSize=256m"
-
-OPTIONS_DEFINE=	DOCS
-
-PORTDOCS=	*
-
-HBASE_LOGDIR=	/var/log/${PORTNAME}
-HBASE_RUNDIR=	/var/run/${PORTNAME}
-
-HBASE_DIST=	${WRKSRC}/hbase-assembly/target/${PORTNAME}-${PORTVERSION}
-
-HBASE_USER=	hbase
-HBASE_GROUP=	hbase
-USERS=		${HBASE_USER}
-GROUPS=		${HBASE_GROUP}
-
-SUB_FILES=	hbase-env-dist.sh pkg-message
-USE_RC_SUBR=    hbase_master hbase_regionserver
-SUB_LIST=	HBASE_USER="${HBASE_USER}" \
-		JAVA_HOME="${JAVA_HOME}" \
-		HBASE_LOG_DIR="${HBASE_LOGDIR}" \
-		HBASE_PID_DIR="${HBASE_RUNDIR}"
-PLIST_SUB=	HBASE_USER=${HBASE_USER} \
-		HBASE_GROUP=${HBASE_GROUP} \
-		HBASE_LOGDIR=${HBASE_LOGDIR} \
-		HBASE_RUNDIR=${HBASE_RUNDIR} \
-		PORTVERSION="${PORTVERSION}"
-
-.include <bsd.port.pre.mk>
-
-.if ${JAVA_PORT_VERSION:M*8*}
-JDK18_PROFILE=	,build-with-jdk8
-JDK18_SOURCE=	-DcompileSource=1.8
-.endif
-
-post-patch:
-	${REINPLACE_CMD} -e "s#%%ETCDIR%%#${ETCDIR}#" ${WRKSRC}/conf/hbase-env.sh ${WRKSRC}/bin/hbase
-	${RM} ${WRKSRC}/conf/hbase-env.sh.bak ${WRKSRC}/conf/hbase-env.sh.orig
-
-do-build:
-	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${LOCALBASE}/share/java/maven3/bin/mvn -Dmaven.repo.local=${WRKDIR}/m2 --offline clean install -Prelease,native${JDK18_PROFILE} -DskipTests ${JDK18_SOURCE}
-	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${LOCALBASE}/share/java/maven3/bin/mvn -Dmaven.repo.local=${WRKDIR}/m2 --offline install -DskipTests site assembly:single -Prelease,native${JDK18_PROFILE} ${JDK18_SOURCE}
-
-post-build:
-	cd ${WRKSRC}/hbase-assembly/target && ${TAR} xf ${PORTNAME}-${PORTVERSION}-bin.tar.gz
-	${RM} ${HBASE_DIST}/conf/*.cmd
-
-do-install:
-	${MKDIR} ${STAGEDIR}${PREFIX}/hbase/bin
-	cd ${HBASE_DIST}/bin && ${INSTALL_SCRIPT} *.sh hbase hirb.rb ${STAGEDIR}${PREFIX}/hbase/bin/
-	${MKDIR} ${STAGEDIR}${ETCDIR} ${STAGEDIR}${EXAMPLESDIR}
-	cd ${HBASE_DIST} && ${COPYTREE_SHARE} conf ${STAGEDIR}${EXAMPLESDIR}/
-	${INSTALL_DATA} ${WRKDIR}/hbase-env-dist.sh ${STAGEDIR}${ETCDIR}/
-	cd ${HBASE_DIST}/docs && ${COPYTREE_SHARE} "*" ${STAGEDIR}${DOCSDIR}/
-	cd ${HBASE_DIST} && ${COPYTREE_SHARE} hbase-webapps ${STAGEDIR}${PREFIX}/hbase/
-	cd ${HBASE_DIST} && ${COPYTREE_SHARE} lib ${STAGEDIR}${PREFIX}/hbase/ "! -name hadoop-*.jar"
-	${MKDIR} ${STAGEDIR}${HBASE_LOGDIR}
-	${MKDIR} ${STAGEDIR}${HBASE_RUNDIR}
-	${CHMOD} 644 ${STAGEDIR}${PREFIX}/hbase/lib/native/libmlockall_agent.so
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/hbase/lib/native/libmlockall_agent.so
-
-.include <bsd.port.post.mk>
diff --git a/databases/hbase/distinfo b/databases/hbase/distinfo
deleted file mode 100644
index 619aabd510c9..000000000000
--- a/databases/hbase/distinfo
+++ /dev/null
@@ -1,4 +0,0 @@
-SHA256 (hadoop/hbase-1.2.1-src.tar.gz) = e8000a65e98d4c5db7bab54da99a57209fe4ea777ab41e91ae8ccf7bfa2d50dd
-SIZE (hadoop/hbase-1.2.1-src.tar.gz) = 15977992
-SHA256 (hadoop/FreeBSD-hbase-1.2.1-maven-repository.tar.gz) = 0a208d7d7a924f06f1994b321ae60d12be5a0410c8acae04f4aeb805c158f58b
-SIZE (hadoop/FreeBSD-hbase-1.2.1-maven-repository.tar.gz) = 272188603
diff --git a/databases/hbase/files/hbase-env-dist.sh.in b/databases/hbase/files/hbase-env-dist.sh.in
deleted file mode 100644
index 24053cef3dcd..000000000000
--- a/databases/hbase/files/hbase-env-dist.sh.in
+++ /dev/null
@@ -1,9 +0,0 @@
-# This file contains FreeBSD-specific configuration parameters.
-# It is not supposed to be edited.  It will be overwritten during upgrades.
-# Edit hbase-env.sh instead.
-
-export JAVA_HOME=%%JAVA_HOME%%
-export HBASE_LOG_DIR=%%HBASE_LOG_DIR%%
-export HBASE_PID_DIR=%%HBASE_PID_DIR%%
-export HBASE_HOME=%%PREFIX%%/hbase
-export HBASE_CONF_DIR=%%ETCDIR%%
diff --git a/databases/hbase/files/hbase_master.in b/databases/hbase/files/hbase_master.in
deleted file mode 100644
index d821169a7bc6..000000000000
--- a/databases/hbase/files/hbase_master.in
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/sh
-
-# PROVIDE: hbase_master
-# REQUIRE: LOGIN
-# KEYWORD: shutdown
-#
-# hbase_master_enable (bool):        Set to NO by default.
-#                                    Set it to YES to enable HBase master.
-
-. /etc/rc.subr
-
-export PATH=${PATH}:%%LOCALBASE%%/bin
-name=hbase_master
-rcvar=hbase_master_enable
-
-load_rc_config "${name}"
-
-: ${hbase_master_enable:=NO}
-: ${hbase_master_user:=%%HBASE_USER%%}
-
-command="%%PREFIX%%/hbase/bin/hbase-daemon.sh"
-command_interpreter="bash"
-command_args='--config %%ETCDIR%% start master'
-
-stop_cmd=hbase_master_stop
-
-hbase_master_stop () {
-  su -m ${hbase_master_user} -c "${command} --config %%ETCDIR%% stop master"
-}
-
-run_rc_command "$1"
diff --git a/databases/hbase/files/hbase_regionserver.in b/databases/hbase/files/hbase_regionserver.in
deleted file mode 100644
index 266d2937a905..000000000000
--- a/databases/hbase/files/hbase_regionserver.in
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/sh
-
-# PROVIDE: hbase_regionserver
-# REQUIRE: LOGIN
-# KEYWORD: shutdown
-#
-# hbase_regionserver_enable (bool):  Set to NO by default.
-#                                    Set it to YES to enable HBase regionserver.
-
-. /etc/rc.subr
-
-export PATH=${PATH}:%%LOCALBASE%%/bin
-name=hbase_regionserver
-rcvar=hbase_regionserver_enable
-
-load_rc_config "${name}"
-
-: ${hbase_regionserver_enable:=NO}
-: ${hbase_regionserver_user:=%%HBASE_USER%%}
-
-command="%%PREFIX%%/hbase/bin/hbase-daemon.sh"
-command_interpreter="bash"
-command_args='--config %%ETCDIR%% start regionserver'
-
-stop_cmd=hbase_regionserver_stop
-
-hbase_regionserver_stop () {
-  su -m ${hbase_regionserver_user} -c "${command} --config %%ETCDIR%% stop regionserver"
-}
-
-run_rc_command "$1"
diff --git a/databases/hbase/files/patch-bin-hbase b/databases/hbase/files/patch-bin-hbase
deleted file mode 100644
index 62838b5a91ae..000000000000
--- a/databases/hbase/files/patch-bin-hbase
+++ /dev/null
@@ -1,10 +0,0 @@
---- bin/hbase.orig	2015-11-11 22:16:01.759936000 -0700
-+++ bin/hbase	2015-11-11 22:17:30.695969000 -0700
-@@ -57,6 +57,7 @@
- bin=`dirname "$0"`
- bin=`cd "$bin">/dev/null; pwd`
- 
-+export HBASE_CONF_DIR=%%ETCDIR%%
- # This will set HBASE_HOME, etc.
- . "$bin"/hbase-config.sh
- 
diff --git a/databases/hbase/files/patch-hbase-assembly-pom.xml b/databases/hbase/files/patch-hbase-assembly-pom.xml
deleted file mode 100644
index 6b1c331fd4a7..000000000000
--- a/databases/hbase/files/patch-hbase-assembly-pom.xml
+++ /dev/null
@@ -1,11 +0,0 @@
---- hbase-assembly/pom.xml	2016-10-09 00:48:11.000000000 -0400
-+++ hbase-assembly/pom.xml	2016-11-14 21:50:05.891026000 -0500
-@@ -138,7 +138,7 @@ 
-                 <argument>bash</argument>
-                 <argument>-c</argument>
-                 <argument>cat maven-shared-archive-resources/META-INF/NOTICE \
--                  `find ${project.build.directory}/dependency -iname NOTICE -or -iname NOTICE.txt` \
-+                  `find ${project.build.directory}/dependency -iname NOTICE -or -iname NOTICE.txt`
-                 </argument>
-               </arguments>
-               <outputFile>${project.build.directory}/NOTICE.aggregate</outputFile>
diff --git a/databases/hbase/files/patch-hbase-daemon.sh b/databases/hbase/files/patch-hbase-daemon.sh
deleted file mode 100644
index 97b81e5db387..000000000000
--- a/databases/hbase/files/patch-hbase-daemon.sh
+++ /dev/null
@@ -1,18 +0,0 @@
---- bin/hbase-daemon.sh.orig	2015-11-11 22:19:14.786233000 -0700
-+++ bin/hbase-daemon.sh	2015-11-11 22:19:45.137538000 -0700
-@@ -93,7 +93,6 @@
- 
- check_before_start(){
-     #ckeck if the process is not running
--    mkdir -p "$HBASE_PID_DIR"
-     if [ -f $HBASE_PID ]; then
-       if kill -0 `cat $HBASE_PID` > /dev/null 2>&1; then
-         echo $command running as process `cat $HBASE_PID`.  Stop it first.
-@@ -124,7 +123,6 @@
- if [ "$HBASE_LOG_DIR" = "" ]; then
-   export HBASE_LOG_DIR="$HBASE_HOME/logs"
- fi
--mkdir -p "$HBASE_LOG_DIR"
- 
- if [ "$HBASE_PID_DIR" = "" ]; then
-   HBASE_PID_DIR=/tmp
diff --git a/databases/hbase/files/patch-hbase-env.sh b/databases/hbase/files/patch-hbase-env.sh
deleted file mode 100644
index fae00d81d028..000000000000
--- a/databases/hbase/files/patch-hbase-env.sh
+++ /dev/null
@@ -1,29 +0,0 @@
---- conf/hbase-env.sh.orig	2015-11-11 22:32:08.539865000 -0700
-+++ conf/hbase-env.sh	2015-11-11 22:34:34.423285000 -0700
-@@ -17,6 +17,8 @@
- # * limitations under the License.
- # */
- 
-+. %%ETCDIR%%/hbase-env-dist.sh
-+
- # Set environment variables here.
- 
- # This script sets variables multiple times over the course of starting an hbase process,
-@@ -24,7 +26,7 @@
- # into the startup scripts (bin/hbase, etc.)
- 
- # The java implementation to use.  Java 1.7+ required.
--# export JAVA_HOME=/usr/java/jdk1.6.0/
-+# export JAVA_HOME=/usr/java/jdk1.6.0/ --> Defined in hbase-env-dist.sh
- 
- # Extra Java CLASSPATH elements.  Optional.
- # export HBASE_CLASSPATH=
-@@ -125,7 +127,7 @@
- # export HBASE_SLAVE_SLEEP=0.1
- 
- # Tell HBase whether it should manage it's own instance of Zookeeper or not.
--# export HBASE_MANAGES_ZK=true
-+export HBASE_MANAGES_ZK=false
- 
- # The default log rolling policy is RFA, where the log file is rolled as per the size defined for the 
- # RFA appender. Please refer to the log4j.properties file to see more details on this appender.
diff --git a/databases/hbase/files/patch-pom.xml b/databases/hbase/files/patch-pom.xml
deleted file mode 100644
index 165cd4b538e1..000000000000
--- a/databases/hbase/files/patch-pom.xml
+++ /dev/null
@@ -1,14 +0,0 @@
---- pom.xml.orig	2015-11-11 22:13:24.366024000 -0700
-+++ pom.xml	2015-11-12 02:03:55.927461000 -0700
-@@ -1021,6 +1021,11 @@
-             <artifactId>asciidoctorj-pdf</artifactId>
-             <version>1.5.0-alpha.6</version>
-           </dependency>
-+          <dependency>
-+            <groupId>org.jruby</groupId>
-+            <artifactId>jruby-complete</artifactId>
-+            <version>9.0.3.0</version>
-+          </dependency>
-         </dependencies>
-         <configuration>
-           <outputDirectory>target/site</outputDirectory>
diff --git a/databases/hbase/files/pkg-message.in b/databases/hbase/files/pkg-message.in
deleted file mode 100644
index 2c9f8d38f1d0..000000000000
--- a/databases/hbase/files/pkg-message.in
+++ /dev/null
@@ -1,8 +0,0 @@
-[
-{ type: install
-  message: <<EOM
-HBase binaries are installed in %%PREFIX%%/hbase/bin/
-Consider adding this directory to your $PATH.
-EOM
-}
-]
diff --git a/databases/hbase/pkg-descr b/databases/hbase/pkg-descr
deleted file mode 100644
index 51a74169b216..000000000000
--- a/databases/hbase/pkg-descr
+++ /dev/null
@@ -1,23 +0,0 @@
-Apache HBase is an open-source, distributed, versioned, non-relational database
-modeled after Google's Bigtable: A Distributed Storage System for Structured
-Data by Chang et al.  Just as Bigtable leverages the distributed data storage
-provided by the Google File System, Apache HBase provides Bigtable-like
-capabilities on top of Hadoop and HDFS.
-
-Features:
--- Linear and modular scalability
--- Strictly consistent reads and writes
--- Automatic and configurable sharding of tables
--- Automatic failover support between RegionServers
--- Convenient base classes for backing Hadoop MapReduce jobs with
-   Apache HBase tables
--- Easy to use Java API for client access
--- Block cache and Bloom Filters for real-time queries
--- Query predicate push down via server side Filters
--- Thrift gateway and a REST-ful Web service that supports XML, Protobuf
-   and binary data encoding options
--- Extensible jruby-based (JIRB) shell
--- Support for exporting metrics via the Hadoop metrics subsystem to files
-   or Ganglia, or via JMX
-
-WWW: http://hbase.apache.org/
diff --git a/databases/hbase/pkg-plist b/databases/hbase/pkg-plist
deleted file mode 100644
index 9a73e2c33987..000000000000
--- a/databases/hbase/pkg-plist
+++ /dev/null
@@ -1,269 +0,0 @@
-%%ETCDIR%%/hbase-env-dist.sh
-hbase/bin/graceful_stop.sh
-hbase/bin/hbase
-hbase/bin/hbase-cleanup.sh
-hbase/bin/hbase-common.sh
-hbase/bin/hbase-config.sh
-hbase/bin/hbase-daemon.sh
-hbase/bin/hbase-daemons.sh
-hbase/bin/hirb.rb
-hbase/bin/local-master-backup.sh
-hbase/bin/local-regionservers.sh
-hbase/bin/master-backup.sh
-hbase/bin/regionservers.sh
-hbase/bin/rolling-restart.sh
-hbase/bin/start-hbase.sh
-hbase/bin/stop-hbase.sh
-hbase/bin/zookeepers.sh
-%%EXAMPLESDIR%%/conf/hadoop-metrics2-hbase.properties
-%%EXAMPLESDIR%%/conf/hbase-env.sh
-%%EXAMPLESDIR%%/conf/hbase-policy.xml
-%%EXAMPLESDIR%%/conf/hbase-site.xml
-%%EXAMPLESDIR%%/conf/log4j.properties
-%%EXAMPLESDIR%%/conf/regionservers
-hbase/hbase-webapps/master/WEB-INF/web.xml
-hbase/hbase-webapps/master/index.html
-hbase/hbase-webapps/regionserver/WEB-INF/web.xml
-hbase/hbase-webapps/regionserver/index.html
-hbase/hbase-webapps/rest/WEB-INF/web.xml
-hbase/hbase-webapps/rest/index.html
-hbase/hbase-webapps/static/css/bootstrap-theme.css
-hbase/hbase-webapps/static/css/bootstrap-theme.min.css
-hbase/hbase-webapps/static/css/bootstrap.css
-hbase/hbase-webapps/static/css/bootstrap.min.css
-hbase/hbase-webapps/static/css/hbase.css
-hbase/hbase-webapps/static/fonts/glyphicons-halflings-regular.eot
-hbase/hbase-webapps/static/fonts/glyphicons-halflings-regular.svg
-hbase/hbase-webapps/static/fonts/glyphicons-halflings-regular.ttf
-hbase/hbase-webapps/static/fonts/glyphicons-halflings-regular.woff
-hbase/hbase-webapps/static/hbase_logo.png
-hbase/hbase-webapps/static/hbase_logo_med.gif
-hbase/hbase-webapps/static/hbase_logo_small.png
-hbase/hbase-webapps/static/js/bootstrap.js
-hbase/hbase-webapps/static/js/bootstrap.min.js
-hbase/hbase-webapps/static/js/jquery.min.js
-hbase/hbase-webapps/static/js/tab.js
-hbase/hbase-webapps/static/jumping-orca_rotated_12percent.png
-hbase/hbase-webapps/thrift/WEB-INF/web.xml
-hbase/hbase-webapps/thrift/index.html
-hbase/lib/activation-1.1.jar
-hbase/lib/antisamy-1.4.3.jar
-hbase/lib/aopalliance-1.0.jar
-hbase/lib/apacheds-i18n-2.0.0-M15.jar
-hbase/lib/apacheds-kerberos-codec-2.0.0-M15.jar
-hbase/lib/api-asn1-api-1.0.0-M20.jar
-hbase/lib/api-util-1.0.0-M20.jar
-hbase/lib/asm-3.1.jar
-hbase/lib/avro-1.7.4.jar
-hbase/lib/batik-css-1.7.jar
-hbase/lib/batik-ext-1.7.jar
-hbase/lib/batik-util-1.7.jar
-hbase/lib/bsh-core-2.0b4.jar
-hbase/lib/commons-beanutils-1.7.0.jar
-hbase/lib/commons-beanutils-core-1.7.0.jar
-hbase/lib/commons-cli-1.2.jar
-hbase/lib/commons-codec-1.9.jar
-hbase/lib/commons-collections-3.2.2.jar
-hbase/lib/commons-compress-1.4.1.jar
-hbase/lib/commons-configuration-1.6.jar
-hbase/lib/commons-daemon-1.0.13.jar
-hbase/lib/commons-digester-1.8.jar
-hbase/lib/commons-el-1.0.jar
-hbase/lib/commons-fileupload-1.2.jar
-hbase/lib/commons-httpclient-3.1.jar
-hbase/lib/commons-io-2.4.jar
-hbase/lib/commons-lang-2.6.jar
-hbase/lib/commons-logging-1.2.jar
-hbase/lib/commons-math-2.2.jar
-hbase/lib/commons-math3-3.1.1.jar
-hbase/lib/commons-net-3.1.jar
-hbase/lib/disruptor-3.3.0.jar
-hbase/lib/esapi-2.1.0.jar
-hbase/lib/findbugs-annotations-1.3.9-1.jar
-hbase/lib/guava-12.0.1.jar
-hbase/lib/guice-3.0.jar
-hbase/lib/guice-servlet-3.0.jar
-hbase/lib/hbase-annotations-%%PORTVERSION%%.jar
-hbase/lib/hbase-annotations-%%PORTVERSION%%-tests.jar
-hbase/lib/hbase-client-%%PORTVERSION%%.jar
-hbase/lib/hbase-common-%%PORTVERSION%%-tests.jar
-hbase/lib/hbase-common-%%PORTVERSION%%.jar
-hbase/lib/hbase-examples-%%PORTVERSION%%.jar
-hbase/lib/hbase-external-blockcache-%%PORTVERSION%%.jar
-hbase/lib/hbase-hadoop-compat-%%PORTVERSION%%.jar
-hbase/lib/hbase-hadoop2-compat-%%PORTVERSION%%.jar
-hbase/lib/hbase-it-%%PORTVERSION%%-tests.jar
-hbase/lib/hbase-it-%%PORTVERSION%%.jar
-hbase/lib/hbase-prefix-tree-%%PORTVERSION%%.jar
-hbase/lib/hbase-procedure-%%PORTVERSION%%.jar
-hbase/lib/hbase-protocol-%%PORTVERSION%%.jar
-hbase/lib/hbase-resource-bundle-%%PORTVERSION%%.jar
-hbase/lib/hbase-rest-%%PORTVERSION%%.jar
-hbase/lib/hbase-server-%%PORTVERSION%%-tests.jar
-hbase/lib/hbase-server-%%PORTVERSION%%.jar
-hbase/lib/hbase-shell-%%PORTVERSION%%.jar
-hbase/lib/hbase-thrift-%%PORTVERSION%%.jar
-hbase/lib/htrace-core-3.1.0-incubating.jar
-hbase/lib/httpclient-4.2.5.jar
-hbase/lib/httpcore-4.4.1.jar
-hbase/lib/jackson-core-asl-1.9.13.jar
-hbase/lib/jackson-jaxrs-1.9.13.jar
-hbase/lib/jackson-mapper-asl-1.9.13.jar
-hbase/lib/jackson-xc-1.9.13.jar
-hbase/lib/jamon-runtime-2.4.1.jar
-hbase/lib/jasper-compiler-5.5.23.jar
-hbase/lib/jasper-runtime-5.5.23.jar
-hbase/lib/javax.inject-1.jar
-hbase/lib/java-xmlbuilder-0.4.jar
-hbase/lib/jaxb-api-2.2.2.jar
-hbase/lib/jaxb-impl-2.2.3-1.jar
-hbase/lib/jcodings-1.0.8.jar
-hbase/lib/jersey-client-1.9.jar
-hbase/lib/jersey-core-1.9.jar
-hbase/lib/jersey-guice-1.9.jar
-hbase/lib/jersey-json-1.9.jar
-hbase/lib/jersey-server-1.9.jar
-hbase/lib/jets3t-0.9.0.jar
-hbase/lib/jettison-1.3.3.jar
-hbase/lib/jetty-6.1.26.jar
-hbase/lib/jetty-sslengine-6.1.26.jar
-hbase/lib/jetty-util-6.1.26.jar
-hbase/lib/joni-2.1.2.jar
-hbase/lib/jruby-complete-1.6.8.jar
-hbase/lib/jsch-0.1.42.jar
-hbase/lib/jsp-2.1-6.1.14.jar
-hbase/lib/jsp-api-2.1-6.1.14.jar
-hbase/lib/jsr305-1.3.9.jar
-hbase/lib/junit-4.12.jar
-hbase/lib/leveldbjni-all-1.8.jar
-hbase/lib/libthrift-0.9.3.jar
-hbase/lib/log4j-1.2.17.jar
-hbase/lib/metrics-core-2.2.0.jar
-hbase/lib/native/libmlockall_agent.so
-hbase/lib/nekohtml-1.9.12.jar
-hbase/lib/netty-all-4.0.23.Final.jar
-hbase/lib/paranamer-2.3.jar
-hbase/lib/protobuf-java-2.5.0.jar
-hbase/lib/ruby/hbase.rb
-hbase/lib/ruby/hbase/admin.rb
-hbase/lib/ruby/hbase/hbase.rb
-hbase/lib/ruby/hbase/quotas.rb
-hbase/lib/ruby/hbase/replication_admin.rb
-hbase/lib/ruby/hbase/security.rb
-hbase/lib/ruby/hbase/table.rb
-hbase/lib/ruby/hbase/visibility_labels.rb
-hbase/lib/ruby/irb/hirb.rb
-hbase/lib/ruby/shell.rb
-hbase/lib/ruby/shell/commands.rb
-hbase/lib/ruby/shell/commands/abort_procedure.rb
-hbase/lib/ruby/shell/commands/add_labels.rb
-hbase/lib/ruby/shell/commands/add_peer.rb
-hbase/lib/ruby/shell/commands/alter.rb
-hbase/lib/ruby/shell/commands/alter_async.rb
-hbase/lib/ruby/shell/commands/alter_namespace.rb
-hbase/lib/ruby/shell/commands/alter_status.rb
-hbase/lib/ruby/shell/commands/append.rb
-hbase/lib/ruby/shell/commands/append_peer_tableCFs.rb
-hbase/lib/ruby/shell/commands/assign.rb
-hbase/lib/ruby/shell/commands/balance_switch.rb
-hbase/lib/ruby/shell/commands/balancer.rb
-hbase/lib/ruby/shell/commands/balancer_enabled.rb
-hbase/lib/ruby/shell/commands/catalogjanitor_enabled.rb
-hbase/lib/ruby/shell/commands/catalogjanitor_run.rb
-hbase/lib/ruby/shell/commands/catalogjanitor_switch.rb
-hbase/lib/ruby/shell/commands/clear_auths.rb
-hbase/lib/ruby/shell/commands/clone_snapshot.rb
-hbase/lib/ruby/shell/commands/close_region.rb
-hbase/lib/ruby/shell/commands/compact.rb
-hbase/lib/ruby/shell/commands/compact_rs.rb
-hbase/lib/ruby/shell/commands/count.rb
-hbase/lib/ruby/shell/commands/create.rb
-hbase/lib/ruby/shell/commands/create_namespace.rb
-hbase/lib/ruby/shell/commands/delete.rb
-hbase/lib/ruby/shell/commands/delete_all_snapshot.rb
-hbase/lib/ruby/shell/commands/delete_snapshot.rb
-hbase/lib/ruby/shell/commands/deleteall.rb
-hbase/lib/ruby/shell/commands/describe.rb
-hbase/lib/ruby/shell/commands/describe_namespace.rb
-hbase/lib/ruby/shell/commands/disable.rb
-hbase/lib/ruby/shell/commands/disable_all.rb
-hbase/lib/ruby/shell/commands/disable_peer.rb
-hbase/lib/ruby/shell/commands/disable_table_replication.rb
-hbase/lib/ruby/shell/commands/drop.rb
-hbase/lib/ruby/shell/commands/drop_all.rb
-hbase/lib/ruby/shell/commands/drop_namespace.rb
-hbase/lib/ruby/shell/commands/enable.rb
-hbase/lib/ruby/shell/commands/enable_all.rb
-hbase/lib/ruby/shell/commands/enable_peer.rb
-hbase/lib/ruby/shell/commands/enable_table_replication.rb
-hbase/lib/ruby/shell/commands/exists.rb
-hbase/lib/ruby/shell/commands/flush.rb
-hbase/lib/ruby/shell/commands/get.rb
-hbase/lib/ruby/shell/commands/get_auths.rb
-hbase/lib/ruby/shell/commands/get_counter.rb
-hbase/lib/ruby/shell/commands/get_splits.rb
-hbase/lib/ruby/shell/commands/get_table.rb
-hbase/lib/ruby/shell/commands/grant.rb
-hbase/lib/ruby/shell/commands/incr.rb
-hbase/lib/ruby/shell/commands/is_disabled.rb
-hbase/lib/ruby/shell/commands/is_enabled.rb
-hbase/lib/ruby/shell/commands/list.rb
-hbase/lib/ruby/shell/commands/list_labels.rb
-hbase/lib/ruby/shell/commands/list_namespace.rb
-hbase/lib/ruby/shell/commands/list_namespace_tables.rb
-hbase/lib/ruby/shell/commands/list_peers.rb
-hbase/lib/ruby/shell/commands/list_procedures.rb
-hbase/lib/ruby/shell/commands/list_quotas.rb
-hbase/lib/ruby/shell/commands/list_replicated_tables.rb
-hbase/lib/ruby/shell/commands/list_security_capabilities.rb
-hbase/lib/ruby/shell/commands/list_snapshots.rb
-hbase/lib/ruby/shell/commands/locate_region.rb
-hbase/lib/ruby/shell/commands/major_compact.rb
-hbase/lib/ruby/shell/commands/merge_region.rb
-hbase/lib/ruby/shell/commands/move.rb
-hbase/lib/ruby/shell/commands/normalize.rb
-hbase/lib/ruby/shell/commands/normalizer_enabled.rb
-hbase/lib/ruby/shell/commands/normalizer_switch.rb
-hbase/lib/ruby/shell/commands/put.rb
-hbase/lib/ruby/shell/commands/remove_peer.rb
-hbase/lib/ruby/shell/commands/remove_peer_tableCFs.rb
-hbase/lib/ruby/shell/commands/restore_snapshot.rb
-hbase/lib/ruby/shell/commands/revoke.rb
-hbase/lib/ruby/shell/commands/scan.rb
-hbase/lib/ruby/shell/commands/set_auths.rb
-hbase/lib/ruby/shell/commands/set_peer_tableCFs.rb
-hbase/lib/ruby/shell/commands/set_quota.rb
-hbase/lib/ruby/shell/commands/set_visibility.rb
-hbase/lib/ruby/shell/commands/show_filters.rb
-hbase/lib/ruby/shell/commands/show_peer_tableCFs.rb
-hbase/lib/ruby/shell/commands/snapshot.rb
-hbase/lib/ruby/shell/commands/split.rb
-hbase/lib/ruby/shell/commands/status.rb
-hbase/lib/ruby/shell/commands/table_help.rb
-hbase/lib/ruby/shell/commands/trace.rb
-hbase/lib/ruby/shell/commands/truncate.rb
-hbase/lib/ruby/shell/commands/truncate_preserve.rb
-hbase/lib/ruby/shell/commands/unassign.rb
-hbase/lib/ruby/shell/commands/update_all_config.rb
-hbase/lib/ruby/shell/commands/update_config.rb
-hbase/lib/ruby/shell/commands/user_permission.rb
-hbase/lib/ruby/shell/commands/version.rb
-hbase/lib/ruby/shell/commands/wal_roll.rb
-hbase/lib/ruby/shell/commands/whoami.rb
-hbase/lib/ruby/shell/commands/zk_dump.rb
-hbase/lib/ruby/shell/formatter.rb
-hbase/lib/servlet-api-2.5.jar
-hbase/lib/servlet-api-2.5-6.1.14.jar
-hbase/lib/slf4j-api-1.7.7.jar
-hbase/lib/slf4j-log4j12-1.7.5.jar
-hbase/lib/snappy-java-1.0.4.1.jar
-hbase/lib/spymemcached-2.11.6.jar
-hbase/lib/xalan-2.7.0.jar
-hbase/lib/xmlenc-0.52.jar
-hbase/lib/xml-apis-1.3.03.jar
-hbase/lib/xml-apis-ext-1.3.04.jar
-hbase/lib/xom-1.2.5.jar
-hbase/lib/xz-1.0.jar
-hbase/lib/zookeeper-3.4.6.jar
-@dir(%%HBASE_USER%%,%%HBASE_GROUP%%,) %%HBASE_RUNDIR%%
-@dir(%%HBASE_USER%%,%%HBASE_GROUP%%,) %%HBASE_LOGDIR%%
diff --git a/databases/hiredis/Makefile b/databases/hiredis/Makefile
index f5b3e4ee0ad0..65a82f428108 100644
--- a/databases/hiredis/Makefile
+++ b/databases/hiredis/Makefile
@@ -1,30 +1,24 @@
-# Created by: Grzegorz Blach <gblach@FreeBSD.org>
-
 PORTNAME=	hiredis
-PORTVERSION=	0.13.3
-DISTVERSIONPREFIX=v
+DISTVERSIONPREFIX=	v
+DISTVERSION=	1.2.0-15
 CATEGORIES=	databases
 
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	Minimalistic C client library for the Redis database
+WWW=		https://github.com/redis/hiredis
 
 LICENSE=	BSD3CLAUSE
+LICENSE_FILE=	${WRKSRC}/COPYING
 
-USE_GITHUB=	yes
-GH_ACCOUNT=	redis
-
-USES=		cpe gmake
-USE_LDCONFIG=	yes
-
+USES=		cmake cpe pathfix ssl
 CPE_VENDOR=	redislabs
+USE_LDCONFIG=	yes
 
-post-patch:
-	@${REINPLACE_CMD} \
-		-e '/^REAL_/s/ \$$(ARCH)//' \
-		-e 's|\$$(INSTALL_LIBRARY_PATH)/\$$(PKGCONF_PATH)|\$$(DESTDIR)\$$(PREFIX)/libdata/\$$(PKGCONF_PATH)|' \
-		${WRKSRC}/Makefile
+USE_GITHUB=	yes
+GH_ACCOUNT=	redis
+GH_TAGNAME=	7ab6b82
 
-post-build:
-	@${STRIP_CMD} ${WRKSRC}/libhiredis.so
+CMAKE_OFF=	ENABLE_NUGET
+CMAKE_ON=	DISABLE_TESTS ENABLE_SSL
 
 .include <bsd.port.mk>
diff --git a/databases/hiredis/distinfo b/databases/hiredis/distinfo
index b8cf24490d0b..212f3760a2a6 100644
--- a/databases/hiredis/distinfo
+++ b/databases/hiredis/distinfo
@@ -1,2 +1,3 @@
-SHA256 (redis-hiredis-v0.13.3_GH0.tar.gz) = 717e6fc8dc2819bef522deaca516de9e51b9dfa68fe393b7db5c3b6079196f78
-SIZE (redis-hiredis-v0.13.3_GH0.tar.gz) = 58291
+TIMESTAMP = 1711298380
+SHA256 (redis-hiredis-v1.2.0-15-7ab6b82_GH0.tar.gz) = fb136fc3f5bce774eb92709e1d041fa851e1130e95cc3aea5b871b91ff0ce4c5
+SIZE (redis-hiredis-v1.2.0-15-7ab6b82_GH0.tar.gz) = 128129
diff --git a/databases/hiredis/files/patch-hiredis.h b/databases/hiredis/files/patch-hiredis.h
new file mode 100644
index 000000000000..414bd3c61bf4
--- /dev/null
+++ b/databases/hiredis/files/patch-hiredis.h
@@ -0,0 +1,11 @@
+--- hiredis.h.orig	2024-03-24 16:33:25 UTC
++++ hiredis.h
+@@ -48,7 +48,7 @@ typedef long long ssize_t;
+ #define HIREDIS_MAJOR 1
+ #define HIREDIS_MINOR 2
+ #define HIREDIS_PATCH 0
+-#define HIREDIS_SONAME 1.2.1-dev
++#define HIREDIS_SONAME 1.2.1
+ 
+ /* Connection type can be blocking or non-blocking and is set in the
+  * least significant bit of the flags field in redisContext. */
diff --git a/databases/hiredis/pkg-descr b/databases/hiredis/pkg-descr
index d459860f7ef1..1635cb295df2 100644
--- a/databases/hiredis/pkg-descr
+++ b/databases/hiredis/pkg-descr
@@ -15,5 +15,3 @@ any Redis version >= 1.2.0.
 
 The library comes with multiple APIs. There is the synchronous API, the
 asynchronous API and the reply parsing API.
-
-WWW: https://github.com/redis/hiredis
diff --git a/databases/hiredis/pkg-plist b/databases/hiredis/pkg-plist
index f80650b00bbf..861303e922e2 100644
--- a/databases/hiredis/pkg-plist
+++ b/databases/hiredis/pkg-plist
@@ -3,14 +3,30 @@ include/hiredis/adapters/glib.h
 include/hiredis/adapters/ivykis.h
 include/hiredis/adapters/libev.h
 include/hiredis/adapters/libevent.h
+include/hiredis/adapters/libhv.h
+include/hiredis/adapters/libsdevent.h
 include/hiredis/adapters/libuv.h
 include/hiredis/adapters/macosx.h
+include/hiredis/adapters/poll.h
 include/hiredis/adapters/qt.h
+include/hiredis/adapters/redismoduleapi.h
+include/hiredis/alloc.h
 include/hiredis/async.h
 include/hiredis/hiredis.h
+include/hiredis/hiredis_ssl.h
 include/hiredis/read.h
 include/hiredis/sds.h
-lib/libhiredis.a
+include/hiredis/sockcompat.h
+lib/cmake/hiredis/hiredis-config-version.cmake
+lib/cmake/hiredis/hiredis-config.cmake
+lib/cmake/hiredis/hiredis-targets-%%CMAKE_BUILD_TYPE%%.cmake
+lib/cmake/hiredis/hiredis-targets.cmake
+lib/cmake/hiredis_ssl/hiredis_ssl-config.cmake
+lib/cmake/hiredis_ssl/hiredis_ssl-targets-%%CMAKE_BUILD_TYPE%%.cmake
+lib/cmake/hiredis_ssl/hiredis_ssl-targets.cmake
 lib/libhiredis.so
-lib/libhiredis.so.0.13
+lib/libhiredis.so.1.2.1
+lib/libhiredis_ssl.so
+lib/libhiredis_ssl.so.1.2.1
 libdata/pkgconfig/hiredis.pc
+libdata/pkgconfig/hiredis_ssl.pc
diff --git a/databases/hsqldb/Makefile b/databases/hsqldb/Makefile
index d418a2586526..a13dc408ff6d 100644
--- a/databases/hsqldb/Makefile
+++ b/databases/hsqldb/Makefile
@@ -1,5 +1,3 @@
-# Created by: Michael Winking <mwfp@foldl.net>
-
 PORTNAME=	hsqldb
 PORTVERSION=	2.3.4
 CATEGORIES=	databases java
@@ -7,6 +5,7 @@ MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}_2_3
 
 MAINTAINER=	jim@ohlste.in
 COMMENT=	Embeddable SQL database written in Java
+WWW=		https://hsqldb.org/
 
 LICENSE=	BSD3CLAUSE
 
diff --git a/databases/hsqldb/pkg-descr b/databases/hsqldb/pkg-descr
index ca031925f2b4..bde5615db101 100644
--- a/databases/hsqldb/pkg-descr
+++ b/databases/hsqldb/pkg-descr
@@ -7,5 +7,3 @@ for applets), fast database engine which offers both in-memory and disk-based
 tables and supports embedded and server modes. Additionally, it includes tools
 such as a minimal web server, in-memory query and management tools (can be run
 as applets) and a number of demonstration examples.
-
-WWW: http://hsqldb.org/
diff --git a/databases/immudb/Makefile b/databases/immudb/Makefile
new file mode 100644
index 000000000000..6cd11e9c0586
--- /dev/null
+++ b/databases/immudb/Makefile
@@ -0,0 +1,33 @@
+PORTNAME=	immudb
+DISTVERSIONPREFIX=	v
+DISTVERSION=	1.5.0
+PORTREVISION=	6
+CATEGORIES=	databases net
+PKGNAMESUFFIX=	${DISTVERSION:R:S/.//}
+
+PATCH_SITES=	https://github.com/codenotary/immudb/commit/
+PATCHFILES=	0df15e08d84e89509499a84d1b5266b5612c0301.patch:-p1
+
+MAINTAINER=	ronald@FreeBSD.org
+COMMENT=	Database with built-in cryptographic proof and verification
+WWW=		https://immudb.io/
+
+LICENSE=	APACHE20
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
+BUILD_DEPENDS=	bash:shells/bash
+
+USES=		gmake go:modules,no_targets
+GO_MODULE=	github.com/codenotary/immudb
+
+.include <bsd.port.pre.mk>
+
+post-patch:
+	@${REINPLACE_CMD} -e 's|/bin/bash|${LOCALBASE}/bin/bash|g' ${WRKSRC}/Makefile
+
+do-install:
+.for f in immuadmin immuclient immudb immutest
+	${INSTALL_PROGRAM} ${WRKSRC}/${f} ${STAGEDIR}/${PREFIX}/bin/${f}
+.endfor
+
+.include <bsd.port.post.mk>
diff --git a/databases/immudb/distinfo b/databases/immudb/distinfo
new file mode 100644
index 000000000000..0f691bb209b3
--- /dev/null
+++ b/databases/immudb/distinfo
@@ -0,0 +1,7 @@
+TIMESTAMP = 1687460511
+SHA256 (go/databases_immudb/immudb-v1.5.0/v1.5.0.mod) = 0b625efa9ff12cf898d6aca289132418011fa0d582bec3e6cba8ce8bb3072ea0
+SIZE (go/databases_immudb/immudb-v1.5.0/v1.5.0.mod) = 5067
+SHA256 (go/databases_immudb/immudb-v1.5.0/v1.5.0.zip) = 57d030659fdf5b6554990445d0630afa79d8e4fb985315d362d6db56192428e8
+SIZE (go/databases_immudb/immudb-v1.5.0/v1.5.0.zip) = 3146310
+SHA256 (go/databases_immudb/immudb-v1.5.0/0df15e08d84e89509499a84d1b5266b5612c0301.patch) = 0703b8f09b7077c3621650cae53655e9c8a03013420f42662c50aeaa5aac8a6e
+SIZE (go/databases_immudb/immudb-v1.5.0/0df15e08d84e89509499a84d1b5266b5612c0301.patch) = 947
diff --git a/databases/immudb/pkg-descr b/databases/immudb/pkg-descr
new file mode 100644
index 000000000000..5ac4ca4ecf84
--- /dev/null
+++ b/databases/immudb/pkg-descr
@@ -0,0 +1,6 @@
+Open source immutable database
+
+* High performance and easy to integrate
+* Supports both Key/Value & SQL
+* Cryptographical client-verification, tamper-resistant, and auditable
+* Versioned and temporal queries subject to cryptographic verification
diff --git a/databases/immudb/pkg-plist b/databases/immudb/pkg-plist
new file mode 100644
index 000000000000..2d0b292a016c
--- /dev/null
+++ b/databases/immudb/pkg-plist
@@ -0,0 +1,4 @@
+bin/immuadmin
+bin/immuclient
+bin/immudb
+bin/immutest
diff --git a/databases/imposm3/Makefile b/databases/imposm3/Makefile
new file mode 100644
index 000000000000..905782f1ba85
--- /dev/null
+++ b/databases/imposm3/Makefile
@@ -0,0 +1,32 @@
+PORTNAME=	imposm3
+DISTVERSIONPREFIX=	v
+DISTVERSION=	0.11.1
+PORTREVISION=	6
+CATEGORIES=	databases geography
+
+MAINTAINER=	darcy@dbitech.ca
+COMMENT=	Imposm imports OpenStreetMap data into PostGIS
+WWW=		http://imposm.org/docs/imposm3/latest/
+
+LICENSE=	APACHE20
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
+LIB_DEPENDS=	libgeos.so:graphics/geos \
+		libleveldb.so:databases/leveldb
+
+USES=		go:modules
+GO_MODULE=	github.com/omniscale/imposm3
+GO_TARGET=	./cmd/imposm
+GO_BUILDFLAGS=	-ldflags "\
+		-X github.com/omniscale/imposm3.Version=${DISTVERSION}"
+
+PLIST_FILES=	bin/imposm
+
+PORTEXAMPLES=	example-mapping.json example-mapping.yml
+OPTIONS_DEFINE=	EXAMPLES
+
+post-install-EXAMPLES-on:
+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+	(cd ${WRKSRC} && ${COPYTREE_SHARE} "${PORTEXAMPLES}" ${STAGEDIR}${EXAMPLESDIR})
+
+.include <bsd.port.mk>
diff --git a/databases/imposm3/distinfo b/databases/imposm3/distinfo
new file mode 100644
index 000000000000..bf2a56fa976b
--- /dev/null
+++ b/databases/imposm3/distinfo
@@ -0,0 +1,5 @@
+TIMESTAMP = 1675057218
+SHA256 (go/databases_imposm3/imposm3-v0.11.1/v0.11.1.mod) = 9aa4a2a81d8d8bdce8b45ad927017112d345d37ba85954c942dd49422c78a9da
+SIZE (go/databases_imposm3/imposm3-v0.11.1/v0.11.1.mod) = 589
+SHA256 (go/databases_imposm3/imposm3-v0.11.1/v0.11.1.zip) = 1887daa48293a460bb64cae3800162329d7e7d455f1421bd3c8bffbc39544cec
+SIZE (go/databases_imposm3/imposm3-v0.11.1/v0.11.1.zip) = 834723
diff --git a/databases/imposm3/pkg-descr b/databases/imposm3/pkg-descr
new file mode 100644
index 000000000000..568547ba8dfd
--- /dev/null
+++ b/databases/imposm3/pkg-descr
@@ -0,0 +1,6 @@
+Imposm is an importer for OpenStreetMap data. It reads PBF files and
+imports the data into PostgreSQL/PostGIS. It can also automatically
+update the database with the latest changes from OSM.
+
+It is designed to create databases that are optimized for rendering
+(i.e. generating tiles or for WMS services).
diff --git a/databases/influxdb/Makefile b/databases/influxdb/Makefile
index d51a7d7aecce..f23b39d2ccd4 100644
--- a/databases/influxdb/Makefile
+++ b/databases/influxdb/Makefile
@@ -1,48 +1,53 @@
 PORTNAME=	influxdb
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.8.9
+DISTVERSION=	1.8.10
+PORTREVISION=	21
 CATEGORIES=	databases net-mgmt
 
-MAINTAINER=	driesm.michiels@gmail.com
+MAINTAINER=	driesm@FreeBSD.org
 COMMENT=	Open-source distributed time series database
+WWW=		https://influxdata.com/
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-USES=		go:modules
+USES=		cpe go:modules
+USE_GITHUB=	nodefault
+GH_TUPLE=	golang:sys:v0.5.0:sys
+
+CPE_VENDOR=	influxdata
 
 USE_RC_SUBR=	influxd
 
 GO_MODULE=	github.com/influxdata/influxdb
-GO_TARGET=	./cmd/influxd \
-		./cmd/influx \
-		./cmd/influx_inspect \
-		./cmd/influx_stress
+GO_TARGET=	./cmd/influx ./cmd/influx_inspect ./cmd/influx_stress \
+		./cmd/influxd
+
 GO_BUILDFLAGS=	-ldflags "-X main.version=${DISTVERSION}"
 
-SUB_LIST=	INFLUXD_USER=${INFLUXD_USER} \
+SUB_LIST=	INFLUXD_DBDIR=${INFLUXD_DBDIR} \
 		INFLUXD_GROUP=${INFLUXD_GROUP} \
-		INFLUXD_DBDIR=${INFLUXD_DBDIR} \
+		INFLUXD_LOGDIR=${INFLUXD_LOGDIR} \
 		INFLUXD_PIDDIR=${INFLUXD_PIDDIR} \
-		INFLUXD_LOGDIR=${INFLUXD_LOGDIR}
+		INFLUXD_USER=${INFLUXD_USER}
 
 USERS=		${INFLUXD_USER}
 GROUPS=		${INFLUXD_GROUP}
 
-PLIST_SUB=	INFLUXD_USER=${INFLUXD_USER} \
+PLIST_SUB=	INFLUXD_DBDIR=${INFLUXD_DBDIR} \
 		INFLUXD_GROUP=${INFLUXD_GROUP} \
-		INFLUXD_DBDIR=${INFLUXD_DBDIR} \
+		INFLUXD_LOGDIR=${INFLUXD_LOGDIR} \
 		INFLUXD_PIDDIR=${INFLUXD_PIDDIR} \
-		INFLUXD_LOGDIR=${INFLUXD_LOGDIR}
+		INFLUXD_USER=${INFLUXD_USER}
 
 OPTIONS_DEFINE=		MANPAGES
 OPTIONS_DEFAULT=	MANPAGES
-OPTIONS_SUB=	yes
+OPTIONS_SUB=		yes
 
-MANPAGES_BUILD_DEPENDS=	xmlto:textproc/xmlto \
-			asciidoc:textproc/asciidoc \
-			docbook-xml>0:textproc/docbook-xml
-MANPAGES_USES=	gmake
+MANPAGES_USES=		gmake
+MANPAGES_BUILD_DEPENDS=	asciidoc:textproc/asciidoc \
+			docbook-xml>0:textproc/docbook-xml \
+			xmlto:textproc/xmlto
 
 INFLUXD_DBDIR=	/var/db/${PORTNAME}/
 INFLUXD_LOGDIR=	/var/log/${PORTNAME}/
@@ -59,11 +64,15 @@ SUB_LIST+=	INFLUXD_LOGCMD="daemon"
 SUB_LIST+=	INFLUXD_LOGCMD="logger"
 .endif
 
+pre-patch:
+	${RM} -r ${WRKSRC}/vendor/golang.org/x/sys
+	${LN} -s ${WRKDIR}/sys-* ${WRKSRC}/vendor/golang.org/x/sys
+
 do-build-MANPAGES-on:
 	@cd ${WRKSRC}/man && ${SETENV} ${MAKE_ENV} ${MAKE_CMD}
 
 do-install-MANPAGES-on:
-	${INSTALL_MAN} ${WRKSRC}/man/*.1 ${STAGEDIR}${MANPREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/man/*.1 ${STAGEDIR}${PREFIX}/share/man/man1
 
 post-install:
 	${MKDIR} ${STAGEDIR}${INFLUXD_DBDIR} \
diff --git a/databases/influxdb/distinfo b/databases/influxdb/distinfo
index add1a023d895..2be5e6e015e4 100644
--- a/databases/influxdb/distinfo
+++ b/databases/influxdb/distinfo
@@ -1,5 +1,7 @@
-TIMESTAMP = 1631722942
-SHA256 (go/databases_influxdb/influxdb-v1.8.9/v1.8.9.mod) = d8c7e25a7f3d2390d6d80dbca209feea6f326e59a5461c6deda66e6fe1a70053
-SIZE (go/databases_influxdb/influxdb-v1.8.9/v1.8.9.mod) = 2637
-SHA256 (go/databases_influxdb/influxdb-v1.8.9/v1.8.9.zip) = 10051bf038c94f86eea61a2dcbf746f3593b40e263c7e744d29cc0914e9462ca
-SIZE (go/databases_influxdb/influxdb-v1.8.9/v1.8.9.zip) = 12511820
+TIMESTAMP = 1677794245
+SHA256 (go/databases_influxdb/influxdb-v1.8.10/v1.8.10.mod) = d8c7e25a7f3d2390d6d80dbca209feea6f326e59a5461c6deda66e6fe1a70053
+SIZE (go/databases_influxdb/influxdb-v1.8.10/v1.8.10.mod) = 2637
+SHA256 (go/databases_influxdb/influxdb-v1.8.10/v1.8.10.zip) = dbd494351510fa2b78c3eebea3f155cd1487771b40c4897fb5c87791328e24a2
+SIZE (go/databases_influxdb/influxdb-v1.8.10/v1.8.10.zip) = 12518277
+SHA256 (go/databases_influxdb/influxdb-v1.8.10/golang-sys-v0.5.0_GH0.tar.gz) = 810c8f1b7704674971ab6b2b614aba20a5a1765018fd2c639f528dbbcbf88b1f
+SIZE (go/databases_influxdb/influxdb-v1.8.10/golang-sys-v0.5.0_GH0.tar.gz) = 1429723
diff --git a/databases/influxdb/files/influxd.in b/databases/influxdb/files/influxd.in
index 57c3892f1cff..539daf16d49c 100644
--- a/databases/influxdb/files/influxd.in
+++ b/databases/influxdb/files/influxd.in
@@ -43,7 +43,7 @@ influxd_pidfile="%%INFLUXD_PIDDIR%%${name}.pid"
 procname="%%PREFIX%%/bin/${name}"
 command=/usr/sbin/daemon
 start_precmd="influxd_precmd"
-start_cmd="influxd_startcmd_%%INFLUXD_LOGCMD%%"        
+start_cmd="influxd_startcmd_%%INFLUXD_LOGCMD%%"
 
 influxd_precmd()
 {
@@ -52,16 +52,16 @@ influxd_precmd()
 
 influxd_startcmd_daemon()                      
 {   
-    echo "Starting ${name}."                   
-    /usr/sbin/daemon -c -p ${influxd_pidfile} -S -s ${influxd_priority} -l ${influxd_facility} \
-        -u ${influxd_user} ${procname} ${influxd_options}
+    echo "Starting ${name}."
+    /usr/sbin/daemon -c -p ${influxd_pidfile} -S -s ${influxd_priority} -l ${influxd_facility} -T ${name} \
+	-u ${influxd_user} ${procname} ${influxd_options}
 }                                              
 
-influxd_startcmd_logger()                      
+influxd_startcmd_logger()
 {   
-    echo "Starting ${name}."                   
+    echo "Starting ${name}."
     /usr/sbin/daemon -c -p ${influxd_pidfile} -u ${influxd_user} /bin/sh -c "${procname} ${influxd_options} 2>&1 \
         | /usr/bin/logger -t ${name} -p ${influxd_facility}.${influxd_priority}"
-}                                              
+}
 
 run_rc_command "$1"
diff --git a/databases/influxdb/files/patch-go.mod b/databases/influxdb/files/patch-go.mod
new file mode 100644
index 000000000000..0963f7b243c4
--- /dev/null
+++ b/databases/influxdb/files/patch-go.mod
@@ -0,0 +1,122 @@
+--- go.mod.orig	2023-03-02 21:16:04 UTC
++++ go.mod
+@@ -1,9 +1,8 @@
+ module github.com/influxdata/influxdb
+ 
+-go 1.13
++go 1.17
+ 
+ require (
+-	cloud.google.com/go/bigtable v1.2.0 // indirect
+ 	collectd.org v0.3.0
+ 	github.com/BurntSushi/toml v0.3.1
+ 	github.com/apache/arrow/go/arrow v0.0.0-20191024131854-af6fa24be0db
+@@ -13,8 +12,6 @@ require (
+ 	github.com/davecgh/go-spew v1.1.1
+ 	github.com/dgrijalva/jwt-go/v4 v4.0.0-preview1
+ 	github.com/dgryski/go-bitstream v0.0.0-20180413035011-3522498ce2c8
+-	github.com/glycerine/go-unsnap-stream v0.0.0-20180323001048-9f0cb55181dd // indirect
+-	github.com/glycerine/goconvey v0.0.0-20190410193231-58a59202ab31 // indirect
+ 	github.com/gogo/protobuf v1.3.2
+ 	github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db
+ 	github.com/google/go-cmp v0.4.0
+@@ -25,33 +22,89 @@ require (
+ 	github.com/influxdata/usage-client v0.0.0-20160829180054-6d3895376368
+ 	github.com/jsternberg/zap-logfmt v1.0.0
+ 	github.com/jwilder/encoding v0.0.0-20170811194829-b4e1701a28ef
+-	github.com/klauspost/compress v1.4.0 // indirect
+-	github.com/klauspost/cpuid v0.0.0-20170728055534-ae7887de9fa5 // indirect
+-	github.com/klauspost/crc32 v0.0.0-20161016154125-cb6bfca970f6 // indirect
+ 	github.com/klauspost/pgzip v1.0.2-0.20170402124221-0bf5dcad4ada
+ 	github.com/mattn/go-isatty v0.0.4
+-	github.com/mschoch/smat v0.0.0-20160514031455-90eadee771ae // indirect
+ 	github.com/opentracing/opentracing-go v1.0.3-0.20180606204148-bd9c31933947
+ 	github.com/paulbellamy/ratecounter v0.2.0
+ 	github.com/peterh/liner v1.0.1-0.20180619022028-8c1271fcf47f
+-	github.com/philhofer/fwd v1.0.0 // indirect
+ 	github.com/pkg/errors v0.9.1
+ 	github.com/prometheus/client_golang v1.0.0
+ 	github.com/retailnext/hllpp v1.0.1-0.20180308014038-101a6d2f8b52
+-	github.com/segmentio/kafka-go v0.2.0 // indirect
+-	github.com/smartystreets/goconvey v1.6.4 // indirect
+ 	github.com/spf13/cast v1.3.0
+ 	github.com/stretchr/testify v1.7.0
+ 	github.com/tinylib/msgp v1.0.2
+-	github.com/willf/bitset v1.1.3 // indirect
+ 	github.com/xlab/treeprint v0.0.0-20180616005107-d6fb6747feb6
+ 	go.uber.org/zap v1.9.1
+ 	golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2
+ 	golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9
+-	golang.org/x/sys v0.0.0-20201119102817-f84b799fce68
++	golang.org/x/sys v0.5.0
+ 	golang.org/x/text v0.3.3
+ 	golang.org/x/time v0.0.0-20190308202827-9d24e82272b4
+ 	golang.org/x/tools v0.0.0-20210106214847-113979e3529a
+-	gonum.org/v1/gonum v0.6.0 // indirect
+ 	google.golang.org/grpc v1.26.0
++)
++
++require (
++	cloud.google.com/go v0.51.0 // indirect
++	cloud.google.com/go/bigtable v1.2.0 // indirect
++	github.com/Masterminds/goutils v1.1.1 // indirect
++	github.com/Masterminds/semver v1.5.0 // indirect
++	github.com/Masterminds/sprig v2.22.0+incompatible // indirect
++	github.com/beorn7/perks v1.0.0 // indirect
++	github.com/c-bata/go-prompt v0.2.2 // indirect
++	github.com/dustin/go-humanize v1.0.0 // indirect
++	github.com/eclipse/paho.mqtt.golang v1.2.0 // indirect
++	github.com/glycerine/go-unsnap-stream v0.0.0-20180323001048-9f0cb55181dd // indirect
++	github.com/glycerine/goconvey v0.0.0-20190410193231-58a59202ab31 // indirect
++	github.com/go-sql-driver/mysql v1.4.1 // indirect
++	github.com/gofrs/uuid v3.3.0+incompatible // indirect
++	github.com/golang/geo v0.0.0-20190916061304-5b978397cfec // indirect
++	github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7 // indirect
++	github.com/golang/protobuf v1.3.2 // indirect
++	github.com/google/flatbuffers v1.11.0 // indirect
++	github.com/google/uuid v1.2.0 // indirect
++	github.com/googleapis/gax-go/v2 v2.0.5 // indirect
++	github.com/huandu/xstrings v1.3.2 // indirect
++	github.com/imdario/mergo v0.3.12 // indirect
++	github.com/influxdata/line-protocol v0.0.0-20180522152040-32c6aa80de5e // indirect
++	github.com/influxdata/tdigest v0.0.0-20181121200506-bf2b5ad3c0a9 // indirect
++	github.com/jstemmer/go-junit-report v0.9.1 // indirect
++	github.com/klauspost/compress v1.4.0 // indirect
++	github.com/klauspost/cpuid v0.0.0-20170728055534-ae7887de9fa5 // indirect
++	github.com/klauspost/crc32 v0.0.0-20161016154125-cb6bfca970f6 // indirect
++	github.com/lib/pq v1.0.0 // indirect
++	github.com/mattn/go-colorable v0.0.9 // indirect
++	github.com/mattn/go-runewidth v0.0.3 // indirect
++	github.com/mattn/go-tty v0.0.0-20180907095812-13ff1204f104 // indirect
++	github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
++	github.com/mitchellh/copystructure v1.1.1 // indirect
++	github.com/mitchellh/reflectwalk v1.0.1 // indirect
++	github.com/mschoch/smat v0.0.0-20160514031455-90eadee771ae // indirect
++	github.com/philhofer/fwd v1.0.0 // indirect
++	github.com/pkg/term v0.0.0-20180730021639-bffc007b7fd5 // indirect
++	github.com/pmezard/go-difflib v1.0.0 // indirect
++	github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4 // indirect
++	github.com/prometheus/common v0.6.0 // indirect
++	github.com/prometheus/procfs v0.0.2 // indirect
++	github.com/segmentio/kafka-go v0.2.0 // indirect
++	github.com/smartystreets/goconvey v1.6.4 // indirect
++	github.com/spf13/pflag v1.0.3 // indirect
++	github.com/willf/bitset v1.1.3 // indirect
++	go.opencensus.io v0.22.2 // indirect
++	go.uber.org/atomic v1.5.1 // indirect
++	go.uber.org/multierr v1.4.0 // indirect
++	go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee // indirect
++	golang.org/x/exp v0.0.0-20191227195350-da58074b4299 // indirect
++	golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f // indirect
++	golang.org/x/mod v0.3.0 // indirect
++	golang.org/x/net v0.0.0-20210226172049-e18ecbb05110 // indirect
++	golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d // indirect
++	golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1 // indirect
++	golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
++	gonum.org/v1/gonum v0.6.0 // indirect
++	google.golang.org/api v0.15.0 // indirect
++	google.golang.org/appengine v1.6.5 // indirect
++	google.golang.org/genproto v0.0.0-20200108215221-bd8f9a0ef82f // indirect
++	gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c // indirect
++	honnef.co/go/tools v0.0.1-2019.2.3 // indirect
+ )
diff --git a/databases/influxdb/files/patch-go.sum b/databases/influxdb/files/patch-go.sum
new file mode 100644
index 000000000000..4bbc8440f82e
--- /dev/null
+++ b/databases/influxdb/files/patch-go.sum
@@ -0,0 +1,37 @@
+--- go.sum.orig	2023-03-02 22:00:44 UTC
++++ go.sum
+@@ -20,7 +20,6 @@ cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54
+ cloud.google.com/go/pubsub v1.1.0 h1:9/vpR43S4aJaROxqQHQ3nH9lfyKKV0dC3vOmnw8ebQQ=
+ cloud.google.com/go/pubsub v1.1.0/go.mod h1:EwwdRX2sKPjnvnqCa270oGRyludottCI76h+R3AArQw=
+ cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiyrjsg+URw=
+-cloud.google.com/go/storage v1.5.0 h1:RPUcBvDeYgQFMfQu1eBMq6piD1SXmLH+vK3qjewZPus=
+ cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0ZeosJ0Rtdos=
+ collectd.org v0.3.0 h1:iNBHGw1VvPJxH2B6RiFWFZ+vsjo1lCdRszBeOuwGi00=
+ collectd.org v0.3.0/go.mod h1:A/8DzQBkF6abtvrT2j/AU/4tiBgJWYyh0y/oB/4MlWE=
+@@ -122,7 +121,6 @@ github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlU
+ github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
+ github.com/google/go-cmp v0.4.0 h1:xsAVV57WRhGj6kEIi8ReJzQlHHqcBYCElAvkovg3B/4=
+ github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+-github.com/google/martian v2.1.0+incompatible h1:/CP5g8u/VJHijgedC/Legn3BAbAaWPgecwXBIDzw5no=
+ github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs=
+ github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
+ github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
+@@ -380,8 +378,9 @@ golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go
+ golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+ golang.org/x/sys v0.0.0-20200107162124-548cf772de50/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+ golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+-golang.org/x/sys v0.0.0-20201119102817-f84b799fce68 h1:nxC68pudNYkKU6jWhgrqdreuFiOQWj1Fs7T3VrH4Pjw=
+ golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
++golang.org/x/sys v0.5.0 h1:MUK/U/4lj1t1oPg0HfuXDN/Z1wv31ZJ/YcPiGccS4DU=
++golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+ golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1 h1:v+OssWQX+hTHEmOBgwxdZxK4zHq3yOs8F9J7mk0PY8E=
+ golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
+ golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+@@ -433,7 +432,6 @@ gonum.org/v1/gonum v0.0.0-20181121035319-3f7ecaa7e8ca/
+ gonum.org/v1/gonum v0.6.0 h1:DJy6UzXbahnGUf1ujUNkh/NEtK14qMo2nvlBPs4U5yw=
+ gonum.org/v1/gonum v0.6.0/go.mod h1:9mxDZsDKxgMAuccQkewq682L+0eCu4dCN2yonUJTCLU=
+ gonum.org/v1/netlib v0.0.0-20181029234149-ec6d1f5cefe6/go.mod h1:wa6Ws7BG/ESfp6dHfk7C6KdzKA7wR7u/rKwOGE66zvw=
+-gonum.org/v1/netlib v0.0.0-20190313105609-8cb42192e0e0 h1:OE9mWmgKkjJyEmDAAtGMPjXu+YNeGvK9VTSHY6+Qihc=
+ gonum.org/v1/netlib v0.0.0-20190313105609-8cb42192e0e0/go.mod h1:wa6Ws7BG/ESfp6dHfk7C6KdzKA7wR7u/rKwOGE66zvw=
+ gonum.org/v1/plot v0.0.0-20190515093506-e2840ee46a6b/go.mod h1:Wt8AAjI+ypCyYX3nZBvf6cAIx93T+c/OS2HFAYskSZc=
+ google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE=
diff --git a/databases/influxdb/files/patch-vendor_modules.txt b/databases/influxdb/files/patch-vendor_modules.txt
new file mode 100644
index 000000000000..6f8b42640f65
--- /dev/null
+++ b/databases/influxdb/files/patch-vendor_modules.txt
@@ -0,0 +1,421 @@
+--- vendor/modules.txt.orig	2023-03-02 22:00:03 UTC
++++ vendor/modules.txt
+@@ -1,4 +1,5 @@
+ # cloud.google.com/go v0.51.0
++## explicit; go 1.11
+ cloud.google.com/go
+ cloud.google.com/go/compute/metadata
+ cloud.google.com/go/iam
+@@ -8,21 +9,28 @@ cloud.google.com/go/internal/version
+ cloud.google.com/go/longrunning
+ cloud.google.com/go/longrunning/autogen
+ # cloud.google.com/go/bigtable v1.2.0
++## explicit; go 1.11
+ cloud.google.com/go/bigtable
+ cloud.google.com/go/bigtable/internal/option
+ # collectd.org v0.3.0
++## explicit
+ collectd.org/api
+ collectd.org/cdtime
+ collectd.org/network
+ # github.com/BurntSushi/toml v0.3.1
++## explicit
+ github.com/BurntSushi/toml
+ # github.com/Masterminds/goutils v1.1.1
++## explicit
+ github.com/Masterminds/goutils
+ # github.com/Masterminds/semver v1.5.0
++## explicit
+ github.com/Masterminds/semver
+ # github.com/Masterminds/sprig v2.22.0+incompatible
++## explicit
+ github.com/Masterminds/sprig
+ # github.com/apache/arrow/go/arrow v0.0.0-20191024131854-af6fa24be0db
++## explicit; go 1.12
+ github.com/apache/arrow/go/arrow
+ github.com/apache/arrow/go/arrow/array
+ github.com/apache/arrow/go/arrow/bitutil
+@@ -33,34 +41,50 @@ github.com/apache/arrow/go/arrow/internal/debug
+ github.com/apache/arrow/go/arrow/math
+ github.com/apache/arrow/go/arrow/memory
+ # github.com/benbjohnson/tmpl v1.1.0
++## explicit; go 1.16
+ github.com/benbjohnson/tmpl
+ # github.com/beorn7/perks v1.0.0
++## explicit; go 1.12
+ github.com/beorn7/perks/quantile
+ # github.com/bmizerany/pat v0.0.0-20170815010413-6226ea591a40
++## explicit
+ github.com/bmizerany/pat
+ # github.com/c-bata/go-prompt v0.2.2
++## explicit
+ github.com/c-bata/go-prompt
+ # github.com/cespare/xxhash v1.1.0
++## explicit
+ github.com/cespare/xxhash
+ # github.com/davecgh/go-spew v1.1.1
++## explicit
+ github.com/davecgh/go-spew/spew
+ # github.com/dgrijalva/jwt-go/v4 v4.0.0-preview1
++## explicit; go 1.12
+ github.com/dgrijalva/jwt-go/v4
+ # github.com/dgryski/go-bitstream v0.0.0-20180413035011-3522498ce2c8
++## explicit
+ github.com/dgryski/go-bitstream
+ # github.com/dustin/go-humanize v1.0.0
++## explicit
+ github.com/dustin/go-humanize
+ github.com/dustin/go-humanize/english
+ # github.com/eclipse/paho.mqtt.golang v1.2.0
++## explicit
+ github.com/eclipse/paho.mqtt.golang
+ github.com/eclipse/paho.mqtt.golang/packets
+ # github.com/glycerine/go-unsnap-stream v0.0.0-20180323001048-9f0cb55181dd
++## explicit
+ github.com/glycerine/go-unsnap-stream
++# github.com/glycerine/goconvey v0.0.0-20190410193231-58a59202ab31
++## explicit
+ # github.com/go-sql-driver/mysql v1.4.1
++## explicit
+ github.com/go-sql-driver/mysql
+ # github.com/gofrs/uuid v3.3.0+incompatible
++## explicit
+ github.com/gofrs/uuid
+ # github.com/gogo/protobuf v1.3.2
++## explicit; go 1.15
+ github.com/gogo/protobuf/gogoproto
+ github.com/gogo/protobuf/plugin/compare
+ github.com/gogo/protobuf/plugin/defaultcheck
+@@ -91,14 +115,17 @@ github.com/gogo/protobuf/types
+ github.com/gogo/protobuf/vanity
+ github.com/gogo/protobuf/vanity/command
+ # github.com/golang/geo v0.0.0-20190916061304-5b978397cfec
++## explicit; go 1.12
+ github.com/golang/geo/r1
+ github.com/golang/geo/r2
+ github.com/golang/geo/r3
+ github.com/golang/geo/s1
+ github.com/golang/geo/s2
+ # github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7
++## explicit
+ github.com/golang/groupcache/lru
+ # github.com/golang/protobuf v1.3.2
++## explicit
+ github.com/golang/protobuf/proto
+ github.com/golang/protobuf/protoc-gen-go
+ github.com/golang/protobuf/protoc-gen-go/descriptor
+@@ -113,10 +140,13 @@ github.com/golang/protobuf/ptypes/empty
+ github.com/golang/protobuf/ptypes/timestamp
+ github.com/golang/protobuf/ptypes/wrappers
+ # github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db
++## explicit
+ github.com/golang/snappy
+ # github.com/google/flatbuffers v1.11.0
++## explicit
+ github.com/google/flatbuffers/go
+ # github.com/google/go-cmp v0.4.0
++## explicit; go 1.8
+ github.com/google/go-cmp/cmp
+ github.com/google/go-cmp/cmp/cmpopts
+ github.com/google/go-cmp/cmp/internal/diff
+@@ -124,14 +154,19 @@ github.com/google/go-cmp/cmp/internal/flags
+ github.com/google/go-cmp/cmp/internal/function
+ github.com/google/go-cmp/cmp/internal/value
+ # github.com/google/uuid v1.2.0
++## explicit
+ github.com/google/uuid
+ # github.com/googleapis/gax-go/v2 v2.0.5
++## explicit
+ github.com/googleapis/gax-go/v2
+ # github.com/huandu/xstrings v1.3.2
++## explicit; go 1.12
+ github.com/huandu/xstrings
+ # github.com/imdario/mergo v0.3.12
++## explicit; go 1.13
+ github.com/imdario/mergo
+ # github.com/influxdata/flux v0.65.1
++## explicit; go 1.12
+ github.com/influxdata/flux
+ github.com/influxdata/flux/arrow
+ github.com/influxdata/flux/ast
+@@ -218,11 +253,14 @@ github.com/influxdata/flux/values
+ github.com/influxdata/flux/values/objects
+ github.com/influxdata/flux/values/valuestest
+ # github.com/influxdata/influxql v1.1.1-0.20200828144457-65d3ef77d385
++## explicit; go 1.13
+ github.com/influxdata/influxql
+ github.com/influxdata/influxql/internal
+ # github.com/influxdata/line-protocol v0.0.0-20180522152040-32c6aa80de5e
++## explicit
+ github.com/influxdata/line-protocol
+ # github.com/influxdata/pkg-config v0.2.8
++## explicit; go 1.12
+ github.com/influxdata/pkg-config
+ github.com/influxdata/pkg-config/internal/logutil
+ github.com/influxdata/pkg-config/internal/modfile
+@@ -231,92 +269,133 @@ github.com/influxdata/pkg-config/internal/module
+ github.com/influxdata/pkg-config/internal/semver
+ github.com/influxdata/pkg-config/libs/flux
+ # github.com/influxdata/roaring v0.4.13-0.20180809181101-fc520f41fab6
++## explicit
+ github.com/influxdata/roaring
+ # github.com/influxdata/tdigest v0.0.0-20181121200506-bf2b5ad3c0a9
++## explicit
+ github.com/influxdata/tdigest
+ # github.com/influxdata/usage-client v0.0.0-20160829180054-6d3895376368
++## explicit
+ github.com/influxdata/usage-client/v1
+ # github.com/jstemmer/go-junit-report v0.9.1
++## explicit; go 1.2
+ github.com/jstemmer/go-junit-report
+ github.com/jstemmer/go-junit-report/formatter
+ github.com/jstemmer/go-junit-report/parser
+ # github.com/jsternberg/zap-logfmt v1.0.0
++## explicit
+ github.com/jsternberg/zap-logfmt
+ # github.com/jwilder/encoding v0.0.0-20170811194829-b4e1701a28ef
++## explicit
+ github.com/jwilder/encoding/simple8b
+ # github.com/klauspost/compress v1.4.0
++## explicit
+ github.com/klauspost/compress/flate
+ # github.com/klauspost/cpuid v0.0.0-20170728055534-ae7887de9fa5
++## explicit
+ github.com/klauspost/cpuid
+ # github.com/klauspost/crc32 v0.0.0-20161016154125-cb6bfca970f6
++## explicit
+ github.com/klauspost/crc32
+ # github.com/klauspost/pgzip v1.0.2-0.20170402124221-0bf5dcad4ada
++## explicit
+ github.com/klauspost/pgzip
+ # github.com/lib/pq v1.0.0
++## explicit
+ github.com/lib/pq
+ github.com/lib/pq/oid
+ # github.com/mattn/go-colorable v0.0.9
++## explicit
+ github.com/mattn/go-colorable
+ # github.com/mattn/go-isatty v0.0.4
++## explicit
+ github.com/mattn/go-isatty
+ # github.com/mattn/go-runewidth v0.0.3
++## explicit
+ github.com/mattn/go-runewidth
+ # github.com/mattn/go-tty v0.0.0-20180907095812-13ff1204f104
++## explicit
+ github.com/mattn/go-tty
+ # github.com/matttproud/golang_protobuf_extensions v1.0.1
++## explicit
+ github.com/matttproud/golang_protobuf_extensions/pbutil
+ # github.com/mitchellh/copystructure v1.1.1
++## explicit; go 1.15
+ github.com/mitchellh/copystructure
+ # github.com/mitchellh/reflectwalk v1.0.1
++## explicit
+ github.com/mitchellh/reflectwalk
+ # github.com/mschoch/smat v0.0.0-20160514031455-90eadee771ae
++## explicit
+ github.com/mschoch/smat
+ # github.com/opentracing/opentracing-go v1.0.3-0.20180606204148-bd9c31933947
++## explicit
+ github.com/opentracing/opentracing-go
+ github.com/opentracing/opentracing-go/log
+ # github.com/paulbellamy/ratecounter v0.2.0
++## explicit
+ github.com/paulbellamy/ratecounter
+ # github.com/peterh/liner v1.0.1-0.20180619022028-8c1271fcf47f
++## explicit
+ github.com/peterh/liner
+ # github.com/philhofer/fwd v1.0.0
++## explicit
+ github.com/philhofer/fwd
+ # github.com/pkg/errors v0.9.1
++## explicit
+ github.com/pkg/errors
+ # github.com/pkg/term v0.0.0-20180730021639-bffc007b7fd5
++## explicit
+ github.com/pkg/term/termios
+ # github.com/pmezard/go-difflib v1.0.0
++## explicit
+ github.com/pmezard/go-difflib/difflib
+ # github.com/prometheus/client_golang v1.0.0
++## explicit
+ github.com/prometheus/client_golang/prometheus
+ github.com/prometheus/client_golang/prometheus/internal
+ github.com/prometheus/client_golang/prometheus/promhttp
+ # github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4
++## explicit; go 1.9
+ github.com/prometheus/client_model/go
+ # github.com/prometheus/common v0.6.0
++## explicit
+ github.com/prometheus/common/expfmt
+ github.com/prometheus/common/internal/bitbucket.org/ww/goautoneg
+ github.com/prometheus/common/model
+ # github.com/prometheus/procfs v0.0.2
++## explicit
+ github.com/prometheus/procfs
+ github.com/prometheus/procfs/internal/fs
+ # github.com/retailnext/hllpp v1.0.1-0.20180308014038-101a6d2f8b52
++## explicit
+ github.com/retailnext/hllpp
+ # github.com/segmentio/kafka-go v0.2.0
++## explicit
+ github.com/segmentio/kafka-go
++# github.com/smartystreets/goconvey v1.6.4
++## explicit
+ # github.com/spf13/cast v1.3.0
++## explicit
+ github.com/spf13/cast
+ # github.com/spf13/pflag v1.0.3
++## explicit
+ github.com/spf13/pflag
+ # github.com/stretchr/testify v1.7.0
++## explicit; go 1.13
+ github.com/stretchr/testify/assert
+ github.com/stretchr/testify/require
+ # github.com/tinylib/msgp v1.0.2
++## explicit
+ github.com/tinylib/msgp/msgp
+ # github.com/willf/bitset v1.1.3
++## explicit
+ github.com/willf/bitset
+ # github.com/xlab/treeprint v0.0.0-20180616005107-d6fb6747feb6
++## explicit
+ github.com/xlab/treeprint
+ # go.opencensus.io v0.22.2
++## explicit; go 1.13
+ go.opencensus.io
+ go.opencensus.io/internal
+ go.opencensus.io/internal/tagencoding
+@@ -335,12 +414,16 @@ go.opencensus.io/trace/internal
+ go.opencensus.io/trace/propagation
+ go.opencensus.io/trace/tracestate
+ # go.uber.org/atomic v1.5.1
++## explicit; go 1.13
+ go.uber.org/atomic
+ # go.uber.org/multierr v1.4.0
++## explicit; go 1.12
+ go.uber.org/multierr
+ # go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee
++## explicit
+ go.uber.org/tools/update-license
+ # go.uber.org/zap v1.9.1
++## explicit
+ go.uber.org/zap
+ go.uber.org/zap/buffer
+ go.uber.org/zap/internal/bufferpool
+@@ -351,21 +434,26 @@ go.uber.org/zap/zapcore
+ go.uber.org/zap/zaptest
+ go.uber.org/zap/zaptest/observer
+ # golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2
++## explicit; go 1.11
+ golang.org/x/crypto/bcrypt
+ golang.org/x/crypto/blowfish
+ golang.org/x/crypto/pbkdf2
+ golang.org/x/crypto/scrypt
+ golang.org/x/crypto/ssh/terminal
+ # golang.org/x/exp v0.0.0-20191227195350-da58074b4299
++## explicit; go 1.12
+ golang.org/x/exp/apidiff
+ golang.org/x/exp/cmd/apidiff
+ # golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f
++## explicit; go 1.11
+ golang.org/x/lint
+ golang.org/x/lint/golint
+ # golang.org/x/mod v0.3.0
++## explicit; go 1.12
+ golang.org/x/mod/module
+ golang.org/x/mod/semver
+ # golang.org/x/net v0.0.0-20210226172049-e18ecbb05110
++## explicit; go 1.11
+ golang.org/x/net/context
+ golang.org/x/net/context/ctxhttp
+ golang.org/x/net/http/httpguts
+@@ -378,21 +466,26 @@ golang.org/x/net/proxy
+ golang.org/x/net/trace
+ golang.org/x/net/websocket
+ # golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d
++## explicit; go 1.11
+ golang.org/x/oauth2
+ golang.org/x/oauth2/google
+ golang.org/x/oauth2/internal
+ golang.org/x/oauth2/jws
+ golang.org/x/oauth2/jwt
+ # golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9
++## explicit
+ golang.org/x/sync/errgroup
+-# golang.org/x/sys v0.0.0-20201119102817-f84b799fce68
++# golang.org/x/sys v0.5.0
++## explicit; go 1.17
+ golang.org/x/sys/internal/unsafeheader
+ golang.org/x/sys/plan9
+ golang.org/x/sys/unix
+ golang.org/x/sys/windows
+ # golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1
++## explicit; go 1.11
+ golang.org/x/term
+ # golang.org/x/text v0.3.3
++## explicit; go 1.11
+ golang.org/x/text/encoding
+ golang.org/x/text/encoding/internal
+ golang.org/x/text/encoding/internal/identifier
+@@ -404,8 +497,10 @@ golang.org/x/text/transform
+ golang.org/x/text/unicode/bidi
+ golang.org/x/text/unicode/norm
+ # golang.org/x/time v0.0.0-20190308202827-9d24e82272b4
++## explicit
+ golang.org/x/time/rate
+ # golang.org/x/tools v0.0.0-20210106214847-113979e3529a
++## explicit; go 1.12
+ golang.org/x/tools/cmd/goimports
+ golang.org/x/tools/go/analysis
+ golang.org/x/tools/go/analysis/passes/inspect
+@@ -431,9 +526,13 @@ golang.org/x/tools/internal/lsp/fuzzy
+ golang.org/x/tools/internal/packagesinternal
+ golang.org/x/tools/internal/typesinternal
+ # golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1
++## explicit; go 1.11
+ golang.org/x/xerrors
+ golang.org/x/xerrors/internal
++# gonum.org/v1/gonum v0.6.0
++## explicit; go 1.12
+ # google.golang.org/api v0.15.0
++## explicit; go 1.11
+ google.golang.org/api/cloudresourcemanager/v1
+ google.golang.org/api/googleapi
+ google.golang.org/api/googleapi/transport
+@@ -447,6 +546,7 @@ google.golang.org/api/transport/grpc
+ google.golang.org/api/transport/http
+ google.golang.org/api/transport/http/internal/propagation
+ # google.golang.org/appengine v1.6.5
++## explicit; go 1.11
+ google.golang.org/appengine
+ google.golang.org/appengine/cloudsql
+ google.golang.org/appengine/internal
+@@ -461,6 +561,7 @@ google.golang.org/appengine/internal/urlfetch
+ google.golang.org/appengine/socket
+ google.golang.org/appengine/urlfetch
+ # google.golang.org/genproto v0.0.0-20200108215221-bd8f9a0ef82f
++## explicit; go 1.11
+ google.golang.org/genproto/googleapis/api/annotations
+ google.golang.org/genproto/googleapis/bigtable/admin/v2
+ google.golang.org/genproto/googleapis/bigtable/v2
+@@ -471,6 +572,7 @@ google.golang.org/genproto/googleapis/rpc/status
+ google.golang.org/genproto/googleapis/type/expr
+ google.golang.org/genproto/protobuf/field_mask
+ # google.golang.org/grpc v1.26.0
++## explicit; go 1.11
+ google.golang.org/grpc
+ google.golang.org/grpc/attributes
+ google.golang.org/grpc/backoff
+@@ -519,8 +621,10 @@ google.golang.org/grpc/stats
+ google.golang.org/grpc/status
+ google.golang.org/grpc/tap
+ # gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c
++## explicit
+ gopkg.in/yaml.v3
+ # honnef.co/go/tools v0.0.1-2019.2.3
++## explicit; go 1.11
+ honnef.co/go/tools/arg
+ honnef.co/go/tools/cmd/staticcheck
+ honnef.co/go/tools/config
diff --git a/databases/influxdb/pkg-descr b/databases/influxdb/pkg-descr
index 2b203c3c641e..7fe79ffa0935 100644
--- a/databases/influxdb/pkg-descr
+++ b/databases/influxdb/pkg-descr
@@ -12,5 +12,3 @@ and real-time analytics. It arose from our need for a database like
 this on more than a few previous products we' built. You can read
 more about our jurney from SaaS application to open source time
 series database.
-
-WWW: https://influxdata.com/
diff --git a/databases/influxdb/pkg-plist b/databases/influxdb/pkg-plist
index 5a9997443e59..e2264edf0f1e 100644
--- a/databases/influxdb/pkg-plist
+++ b/databases/influxdb/pkg-plist
@@ -2,15 +2,15 @@ bin/influx
 bin/influx_inspect
 bin/influxd
 bin/influx_stress
-%%MANPAGES%%man/man1/influx.1.gz
-%%MANPAGES%%man/man1/influx_inspect.1.gz
-%%MANPAGES%%man/man1/influx_stress.1.gz
-%%MANPAGES%%man/man1/influxd-backup.1.gz
-%%MANPAGES%%man/man1/influxd-config.1.gz
-%%MANPAGES%%man/man1/influxd-restore.1.gz
-%%MANPAGES%%man/man1/influxd-run.1.gz
-%%MANPAGES%%man/man1/influxd-version.1.gz
-%%MANPAGES%%man/man1/influxd.1.gz
+%%MANPAGES%%share/man/man1/influx.1.gz
+%%MANPAGES%%share/man/man1/influx_inspect.1.gz
+%%MANPAGES%%share/man/man1/influx_stress.1.gz
+%%MANPAGES%%share/man/man1/influxd-backup.1.gz
+%%MANPAGES%%share/man/man1/influxd-config.1.gz
+%%MANPAGES%%share/man/man1/influxd-restore.1.gz
+%%MANPAGES%%share/man/man1/influxd-run.1.gz
+%%MANPAGES%%share/man/man1/influxd-version.1.gz
+%%MANPAGES%%share/man/man1/influxd.1.gz
 @dir(%%INFLUXD_USER%%,%%INFLUXD_GROUP%%,0750) %%INFLUXD_DBDIR%%
 @dir(%%INFLUXD_USER%%,%%INFLUXD_GROUP%%,0750) %%INFLUXD_LOGDIR%%
 @dir(%%INFLUXD_USER%%,%%INFLUXD_GROUP%%,0750) %%INFLUXD_PIDDIR%%
diff --git a/databases/influxdb2-cli/Makefile b/databases/influxdb2-cli/Makefile
new file mode 100644
index 000000000000..86740ebf9994
--- /dev/null
+++ b/databases/influxdb2-cli/Makefile
@@ -0,0 +1,28 @@
+PORTNAME=	influxdb2-cli
+DISTVERSIONPREFIX=	v
+DISTVERSION=	2.7.5
+CATEGORIES=	databases net-mgmt
+
+MAINTAINER=	driesm@FreeBSD.org
+COMMENT=	CLI for managing resources in InfluxDB v2
+WWW=		https://github.com/influxdata/influx-cli
+
+LICENSE=	MIT
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
+USES=		go:modules
+USE_GITHUB=	nodefault
+GH_TUPLE=	golang:sys:v0.6.0:sys
+
+GO_MODULE=	github.com/influxdata/influx-cli/v2
+GO_TARGET=	./cmd/influx
+
+CONFLICTS_INSTALL=	influxdb
+
+PLIST_FILES=	bin/influx
+
+pre-patch:
+	${RM} -r ${WRKSRC}/vendor/golang.org/x/sys
+	${LN} -s ${WRKDIR}/sys-* ${WRKSRC}/vendor/golang.org/x/sys
+
+.include <bsd.port.mk>
diff --git a/databases/influxdb2-cli/distinfo b/databases/influxdb2-cli/distinfo
new file mode 100644
index 000000000000..aa1fa25a20bc
--- /dev/null
+++ b/databases/influxdb2-cli/distinfo
@@ -0,0 +1,7 @@
+TIMESTAMP = 1713805296
+SHA256 (go/databases_influxdb2-cli/influxdb2-cli-v2.7.5/v2.7.5.mod) = d8b0517329fc95de12d302b12ec456719ac4762c41d571f274ec1e3fa34b7180
+SIZE (go/databases_influxdb2-cli/influxdb2-cli-v2.7.5/v2.7.5.mod) = 2685
+SHA256 (go/databases_influxdb2-cli/influxdb2-cli-v2.7.5/v2.7.5.zip) = 20d66aeaa48138e337222fc8316631167c5ec202ac70090941560962981d61bb
+SIZE (go/databases_influxdb2-cli/influxdb2-cli-v2.7.5/v2.7.5.zip) = 862738
+SHA256 (go/databases_influxdb2-cli/influxdb2-cli-v2.7.5/golang-sys-v0.6.0_GH0.tar.gz) = b4f6d17c7a128f76169964b437cb66b3f2dbf9a33361928ec19dfecf7b03fc54
+SIZE (go/databases_influxdb2-cli/influxdb2-cli-v2.7.5/golang-sys-v0.6.0_GH0.tar.gz) = 1434234
diff --git a/databases/influxdb2-cli/pkg-descr b/databases/influxdb2-cli/pkg-descr
new file mode 100644
index 000000000000..3f03bf7e5743
--- /dev/null
+++ b/databases/influxdb2-cli/pkg-descr
@@ -0,0 +1 @@
+CLI for managing resources in InfluxDB v2.
diff --git a/databases/innotop/Makefile b/databases/innotop/Makefile
index 0dd0a9d86d0b..3baf8a40e885 100644
--- a/databases/innotop/Makefile
+++ b/databases/innotop/Makefile
@@ -1,25 +1,28 @@
-# Created by: Steven Kreuzer <skreuzer@f2o.org>
-
 PORTNAME=	innotop
-PORTVERSION=	1.11.4
+PORTVERSION=	1.13.0
+PORTREVISION=	1
 DISTVERSIONPREFIX=	v
 CATEGORIES=	databases
 
 MAINTAINER=	skreuzer@FreeBSD.org
 COMMENT=	MySQL and InnoDB monitoring program
+WWW=		https://github.com/innotop/innotop
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	p5-DBD-mysql>=0:databases/p5-DBD-mysql \
+BUILD_DEPENDS=	${DBD_MYSQL} \
 		p5-DBI>=1.46:databases/p5-DBI \
-		p5-Term-ReadKey>=2.10:devel/p5-Term-ReadKey
+		p5-Term-ReadKey>=2.10:devel/p5-Term-ReadKey \
+		p5-Time-HiRes>0:devel/p5-Time-HiRes \
+		p5-Term-ANSIColor>0:devel/p5-Term-ANSIColor \
+		p5-Term-ReadLine>0:devel/p5-Term-ReadLine
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-USE_GITHUB=	yes
-
 USES=		mysql perl5
+
 USE_PERL5=	configure
+USE_GITHUB=	yes
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/etc/innotop|${PREFIX}/etc|g' ${WRKSRC}/innotop
diff --git a/databases/innotop/distinfo b/databases/innotop/distinfo
index 87ff39fab360..c5d438227e90 100644
--- a/databases/innotop/distinfo
+++ b/databases/innotop/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1485023021
-SHA256 (innotop-innotop-v1.11.4_GH0.tar.gz) = fb0d7d2558e2198d9224b44dc4220d4c62e1b5b0069312012306275be39b4ab9
-SIZE (innotop-innotop-v1.11.4_GH0.tar.gz) = 179683
+TIMESTAMP = 1639844189
+SHA256 (innotop-innotop-v1.13.0_GH0.tar.gz) = 6ec91568e32bda3126661523d9917c7fbbd4b9f85db79224c01b2a740727a65c
+SIZE (innotop-innotop-v1.13.0_GH0.tar.gz) = 189278
diff --git a/databases/innotop/pkg-descr b/databases/innotop/pkg-descr
index f16352296983..5f06674e7ec2 100644
--- a/databases/innotop/pkg-descr
+++ b/databases/innotop/pkg-descr
@@ -1,8 +1,5 @@
-innotop connects to a MySQL database server and retrieves
-information from it, then displays it in a manner similar
-to the UNIX top program.
+innotop is a MySQL and InnoDB transaction/status monitor, like 'top' for MySQL.
 
-It runs on most Unix systems which have Perl, DBI, and
-Term::ReadKey installed.
-
-WWW: http://code.google.com/p/innotop/
+It displays queries, InnoDB transactions, lock waits, deadlocks, foreign key
+errors, open tables, replication status, buffer information, row operations,
+logs, I/O operations, load graph, and more.
diff --git a/databases/iowow/Makefile b/databases/iowow/Makefile
index 4c278229e153..0e3150b2048b 100644
--- a/databases/iowow/Makefile
+++ b/databases/iowow/Makefile
@@ -1,12 +1,11 @@
-# Created by: Alexey Dokuchaev <danfe@FreeBSD.org>
-
 PORTNAME=	iowow
-PORTVERSION=	1.4.13
+PORTVERSION=	1.4.17
 DISTVERSIONPREFIX=	v
 CATEGORIES=	databases
 
 MAINTAINER=	danfe@FreeBSD.org
 COMMENT=	Persistent key-value database engine
+WWW=		https://iowow.softmotions.com/
 
 LICENSE=	MIT
 
@@ -23,10 +22,6 @@ OPTIONS_DEFINE=	DOCS TEST
 TEST_BUILD_DEPENDS=	${LOCALBASE}/include/CUnit/Basic.h:devel/cunit
 TEST_CMAKE_ON=	-DBUILD_TESTS:BOOL=ON
 
-post-patch:
-	@${REINPLACE_CMD} -e '/-D_XOPEN_SOURCE=600/d' \
-		${WRKSRC}/src/CMakeLists.txt
-
 do-test-TEST-on:
 	@cd ${TEST_WRKSRC} && ctest -C ${CMAKE_BUILD_TYPE} ${_MAKE_JOBS}
 
diff --git a/databases/iowow/distinfo b/databases/iowow/distinfo
index 41d583cc778e..4f40d5bb38e4 100644
--- a/databases/iowow/distinfo
+++ b/databases/iowow/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1630659785
-SHA256 (Softmotions-iowow-v1.4.13_GH0.tar.gz) = 73535cd7a0bb6de2a8d1063da787b9b9d95810c2036e342400c12ad6f853fe60
-SIZE (Softmotions-iowow-v1.4.13_GH0.tar.gz) = 522886
+TIMESTAMP = 1699892975
+SHA256 (Softmotions-iowow-v1.4.17_GH0.tar.gz) = 13a851026dbc1f31583fba96986e86e94a7554f9e7d38aa12a9ea5dbebdf328b
+SIZE (Softmotions-iowow-v1.4.17_GH0.tar.gz) = 623827
diff --git a/databases/iowow/files/patch-src_CMakeLists.txt b/databases/iowow/files/patch-src_CMakeLists.txt
index 3f42057dd4b5..43b5202787b1 100644
--- a/databases/iowow/files/patch-src_CMakeLists.txt
+++ b/databases/iowow/files/patch-src_CMakeLists.txt
@@ -1,17 +1,5 @@
 --- src/CMakeLists.txt.orig	2019-03-29 16:56:25 UTC
 +++ src/CMakeLists.txt
-@@ -100,6 +100,11 @@ if (HAVE_CLOCK_MONOTONIC)
-   add_definitions(-DIW_HAVE_CLOCK_MONOTONIC)
- endif()
- 
-+check_symbol_exists(basename_r libgen.h HAVE_BASENAME_R)
-+if (HAVE_BASENAME_R)
-+  set_source_files_properties(log/iwlog.c PROPERTIES COMPILE_FLAGS -DIW_HAVE_BASENAME_R)
-+endif()
-+
- foreach(HF IN ITEMS stdlib stddef stdint stdbool stdatomic unistd dirent)
-     string(TOUPPER "${HF}" UHF)
-     check_include_file(${HF}.h "IW_HAVE_${UHF}")
 @@ -164,7 +169,7 @@ endif()
  
  set(CMAKE_C_FLAGS_DEBUG "-O0 -g -ggdb -Werror -DDEBUG -D_DEBUG -UNDEBUG \
@@ -21,15 +9,6 @@
  set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELEASE} -g")
  
  
-@@ -187,7 +192,7 @@ file(GLOB PROJECT_GENERATED_HDRS ${PROJECT_GENERATED_D
- list(APPEND ALL_HDRS ${PROJECT_GENERATED_HDRS})
- 
- configure_file(${CMAKE_CURRENT_SOURCE_DIR}/tmpl/libiowow.pc.in ${PROJECT_GENERATED_DIR}/libiowow.pc @ONLY)
--install(FILES ${PROJECT_GENERATED_DIR}/libiowow.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
-+install(FILES ${PROJECT_GENERATED_DIR}/libiowow.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}data/pkgconfig)
- 
- foreach(MODULE IN LISTS MODULES)
-     if (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${MODULE}/CMakeLists.txt)
 @@ -278,7 +283,6 @@ endif()
  
  
diff --git a/databases/iowow/files/patch-src_platform_unix_unix.c b/databases/iowow/files/patch-src_platform_unix_unix.c
deleted file mode 100644
index 6910201ce373..000000000000
--- a/databases/iowow/files/patch-src_platform_unix_unix.c
+++ /dev/null
@@ -1,22 +0,0 @@
---- src/platform/unix/unix.c.orig	2021-09-03 09:03:05 UTC
-+++ src/platform/unix/unix.c
-@@ -355,7 +355,7 @@ iwrc iwp_fdatasync(HANDLE fh) {
-   if (fcntl(fh, F_FULLFSYNC) == -1) {
-     return iwrc_set_errno(IW_ERROR_IO_ERRNO, errno);
-   }
--#else
-+#elif defined(__FreeBSD_version) && __FreeBSD_version > 1100501
-   if (fdatasync(fh) == -1) {
-     return iwrc_set_errno(IW_ERROR_IO_ERRNO, errno);
-   }
-@@ -384,6 +384,10 @@ void iwp_set_current_thread_name(const char *name) {
- 
- #if defined(__linux__)
-   prctl(PR_SET_NAME, name);
-+#elif defined(__FreeBSD__)
-+  // We're using even more non-standard pthread_set_name_np() here
-+  // because pthread_setname_np() is not available on FreeBSD 11.X.
-+  pthread_set_name_np(pthread_self(), name);
- #elif defined(__NetBSD__)
-   rv = pthread_setname_np(pthread_self(), "%s", (void*) name);
- #elif defined(__APPLE__)
diff --git a/databases/iowow/files/patch-src_utils_sort__r.h b/databases/iowow/files/patch-src_utils_sort__r.h
new file mode 100644
index 000000000000..3577a97bf4cc
--- /dev/null
+++ b/databases/iowow/files/patch-src_utils_sort__r.h
@@ -0,0 +1,25 @@
+--- src/utils/sort_r.h.orig	2022-02-14 12:24:37 UTC
++++ src/utils/sort_r.h
+@@ -25,10 +25,11 @@
+ #define _SORT_R_INLINE inline
+ 
+ #if (  defined __APPLE__ || defined __MACH__ || defined __DARWIN__    \
+-    || defined __FreeBSD__ || defined __DragonFly__) && defined IW_HAVE_QSORT_R
++    || (defined __FreeBSD__ && !defined(qsort_r)) || defined __DragonFly__) && defined IW_HAVE_QSORT_R
+ #  define _SORT_R_BSD
+ #elif (  defined _GNU_SOURCE || defined __gnu_hurd__ || defined __GNU__    \
+-      || defined __linux__ || defined __MINGW32__ || defined __GLIBC__) && defined IW_HAVE_QSORT_R
++      || defined __linux__ || defined __MINGW32__ || defined __GLIBC__     \
++      || (defined (__FreeBSD__) && defined(qsort_r))) && defined IW_HAVE_QSORT_R
+ #  define _SORT_R_LINUX
+ #elif (defined _WIN32 || defined _WIN64 || defined __WINDOWS__)
+ #  define _SORT_R_WINDOWS
+@@ -283,7 +284,7 @@ typedef int (*__compar_d_fn_t)(const void*, const void
+   #if defined _SORT_R_LINUX
+ 
+ typedef int (*__compar_d_fn_t)(const void*, const void*, void*);
+-extern void qsort_r(
++extern void (qsort_r)(
+   void *base, size_t nel, size_t width,
+   __compar_d_fn_t __compar, void *arg)
+ __attribute__((nonnull(1, 4)));
diff --git a/databases/iowow/pkg-descr b/databases/iowow/pkg-descr
index 2803ef9f55a3..152c4a2932f7 100644
--- a/databases/iowow/pkg-descr
+++ b/databases/iowow/pkg-descr
@@ -12,5 +12,3 @@ structure.  Some of its features and limitations:
   - Tiny C11 library (200 KB), easily embeddable into any software
   - Maximum storage file size is 512 GB, maximum size of a single
     key+value record is 255 MB
-
-WWW: http://iowow.io/
diff --git a/databases/iowow/pkg-plist b/databases/iowow/pkg-plist
index 0aa3a9e4d6cc..a41bb3b76b90 100644
--- a/databases/iowow/pkg-plist
+++ b/databases/iowow/pkg-plist
@@ -1,21 +1,27 @@
 include/iowow/basedefs.h
 include/iowow/iowow.h
 include/iowow/iwarr.h
+include/iowow/iwavl.h
+include/iowow/iwbinn.h
 include/iowow/iwbits.h
+include/iowow/iwchars.h
 include/iowow/iwconv.h
 include/iowow/iwdlsnr.h
 include/iowow/iwexfile.h
 include/iowow/iwfile.h
 include/iowow/iwfsmfile.h
 include/iowow/iwhmap.h
+include/iowow/iwini.h
+include/iowow/iwjson.h
+include/iowow/iwjson_internal.h
 include/iowow/iwkv.h
 include/iowow/iwlog.h
 include/iowow/iwp.h
 include/iowow/iwpool.h
 include/iowow/iwrb.h
 include/iowow/iwrdb.h
-include/iowow/iwsha2.h
-include/iowow/iwstree.h
+include/iowow/iwre.h
+include/iowow/iwrefs.h
 include/iowow/iwstw.h
 include/iowow/iwth.h
 include/iowow/iwtp.h
@@ -23,12 +29,15 @@ include/iowow/iwutils.h
 include/iowow/iwuuid.h
 include/iowow/iwxstr.h
 include/iowow/murmur3.h
+include/iowow/utf8proc.h
+include/iowow/wyhash.h
+include/iowow/wyhash32.h
 lib/libiowow-1.a
 lib/libiowow.so
 lib/libiowow.so.1
 lib/libiowow.so.%%VERSION%%
 libdata/pkgconfig/libiowow.pc
-man/man3/iowow.3.gz
+share/man/man3/iowow.3.gz
 %%DATADIR%%/iowow-exports-%%CMAKE_BUILD_TYPE%%.cmake
 %%DATADIR%%/iowow-exports.cmake
 %%DATADIR%%/iowow-static-exports-%%CMAKE_BUILD_TYPE%%.cmake
diff --git a/databases/ip4r/Makefile b/databases/ip4r/Makefile
index a9e4ec6b3d47..67b736973da2 100644
--- a/databases/ip4r/Makefile
+++ b/databases/ip4r/Makefile
@@ -1,12 +1,10 @@
-# Created by: Ade Lovett <ade@FreeBSD.org>
-
 PORTNAME=	ip4r
-PORTVERSION=	2.4.1
-PORTREVISION=	1
+PORTVERSION=	2.4.2
 CATEGORIES=	databases net
 
 MAINTAINER=	axel.rau@chaos1.de
 COMMENT=	IP address and IP range index types for PostgreSQL
+WWW=		https://github.com/RhodiumToad/ip4r
 
 LICENSE=	PostgreSQL
 
diff --git a/databases/ip4r/distinfo b/databases/ip4r/distinfo
index b8ba548807f0..2dc6ba9c1398 100644
--- a/databases/ip4r/distinfo
+++ b/databases/ip4r/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1564818466
-SHA256 (RhodiumToad-ip4r-2.4.1_GH0.tar.gz) = 78b9f0c1ae45c22182768fe892a32d533c82281035e10914111400bf6301c726
-SIZE (RhodiumToad-ip4r-2.4.1_GH0.tar.gz) = 128212
+TIMESTAMP = 1700337516
+SHA256 (RhodiumToad-ip4r-2.4.2_GH0.tar.gz) = 0f7b1f159974f49a47842a8ab6751aecca1ed1142b6d5e38d81b064b2ead1b4b
+SIZE (RhodiumToad-ip4r-2.4.2_GH0.tar.gz) = 132976
diff --git a/databases/ip4r/pkg-descr b/databases/ip4r/pkg-descr
index 25c4c1b2f7e2..732931924c3d 100644
--- a/databases/ip4r/pkg-descr
+++ b/databases/ip4r/pkg-descr
@@ -2,5 +2,3 @@ IP4R is a contributed PostgreSQL module that embraces and extends the
 existing 'inet' and 'cidr' built-in types, providing extra functionality
 and simplicity to IPv4 and IPv6 address lookup within large-scale
 environments.
-
-WWW: https://github.com/RhodiumToad/ip4r
diff --git a/databases/ip4r/pkg-plist b/databases/ip4r/pkg-plist
index ee252fae530c..e092302e532b 100644
--- a/databases/ip4r/pkg-plist
+++ b/databases/ip4r/pkg-plist
@@ -5,7 +5,4 @@ share/postgresql/extension/ip4r--2.0--2.1.sql
 share/postgresql/extension/ip4r--2.1--2.2.sql
 share/postgresql/extension/ip4r--2.2--2.4.sql
 share/postgresql/extension/ip4r--2.4.sql
-share/postgresql/extension/ip4r--unpackaged1--2.0.sql
-share/postgresql/extension/ip4r--unpackaged2.0--2.0.sql
-share/postgresql/extension/ip4r--unpackaged2.1--2.1.sql
 share/postgresql/extension/ip4r.control
diff --git a/databases/ipa_sdb/Makefile b/databases/ipa_sdb/Makefile
index 800195ed3744..2e93f661179b 100644
--- a/databases/ipa_sdb/Makefile
+++ b/databases/ipa_sdb/Makefile
@@ -1,13 +1,12 @@
-# Created by: Andrey Simonenko
-
 PORTNAME=	ipa_sdb
 PORTVERSION=	1.1.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	databases
 MASTER_SITES=	SF/ipa-system/modules/ipa_sdb
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	IPA simple database module
+WWW=		https://ipa-system.sourceforge.net/modules/ipa_sdb/
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
@@ -17,6 +16,7 @@ BUILD_DEPENDS=	${LOCALBASE}/include/ipa_mod.h:sysutils/ipa
 USES=		libtool tar:bzip2
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
+GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
 INSTALL_TARGET=	install-strip
 
 NO_OPTIONS_SORT=	yes
diff --git a/databases/ipa_sdb/pkg-descr b/databases/ipa_sdb/pkg-descr
index 51be473b2a83..36143787a97a 100644
--- a/databases/ipa_sdb/pkg-descr
+++ b/databases/ipa_sdb/pkg-descr
@@ -12,5 +12,3 @@ Main features:
 - Access to statistics can be granted accordingly to the user group;
 - The ipa_sdb_dump(8) utility converts ipa_sdb(5) database files to text
   representation and back.
-
-WWW: http://ipa-system.sourceforge.net/modules/ipa_sdb/
diff --git a/databases/ipa_sdb/pkg-plist b/databases/ipa_sdb/pkg-plist
index c7f9620c5833..0581f179729e 100644
--- a/databases/ipa_sdb/pkg-plist
+++ b/databases/ipa_sdb/pkg-plist
@@ -3,11 +3,11 @@ include/ipa_sdb.h
 include/ipa_sdb_config.h
 lib/ipa_db_sdb.so
 lib/ipa_st_sdb.so
-man/man5/ipa_sdb.5.gz
-man/man8/ipa_db_sdb.8.gz
-man/man8/ipa_sdb_dump.8.gz
-man/man8/ipa_st_sdb.8.gz
-man/ru.KOI8-R/man5/ipa_sdb.5.gz
-man/ru.KOI8-R/man8/ipa_db_sdb.8.gz
-man/ru.KOI8-R/man8/ipa_sdb_dump.8.gz
-man/ru.KOI8-R/man8/ipa_st_sdb.8.gz
+share/man/man5/ipa_sdb.5.gz
+share/man/man8/ipa_db_sdb.8.gz
+share/man/man8/ipa_sdb_dump.8.gz
+share/man/man8/ipa_st_sdb.8.gz
+share/man/ru.KOI8-R/man5/ipa_sdb.5.gz
+share/man/ru.KOI8-R/man8/ipa_db_sdb.8.gz
+share/man/ru.KOI8-R/man8/ipa_sdb_dump.8.gz
+share/man/ru.KOI8-R/man8/ipa_st_sdb.8.gz
diff --git a/databases/iplike/Makefile b/databases/iplike/Makefile
index 37e61b9ecd97..f772fafc52a4 100644
--- a/databases/iplike/Makefile
+++ b/databases/iplike/Makefile
@@ -1,5 +1,3 @@
-# Created by: Sevan Janiyan <venture37@geeklan.co.uk>
-
 PORTNAME=	iplike
 PORTVERSION=	2.2.0
 CATEGORIES=	databases
@@ -7,6 +5,7 @@ MASTER_SITES=	SF/opennms/IPLIKE/stable-2.2/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	C implementation of the OpenNMS iplike stored procedure
+WWW=		https://www.opennms.org/wiki/IPLIKE
 
 USES=		libtool pgsql
 
diff --git a/databases/iplike/pkg-descr b/databases/iplike/pkg-descr
index b44cc213c9a3..3fd51345d47f 100644
--- a/databases/iplike/pkg-descr
+++ b/databases/iplike/pkg-descr
@@ -1,5 +1,3 @@
 A C implementation of the stored procedure written in plpgsql that's bundled
 with OpenNMS, this is the preferred version for use as is offers better
 performance
-
-WWW: http://www.opennms.org/wiki/IPLIKE
diff --git a/databases/isql-viewer/Makefile b/databases/isql-viewer/Makefile
deleted file mode 100644
index 7744419bf014..000000000000
--- a/databases/isql-viewer/Makefile
+++ /dev/null
@@ -1,53 +0,0 @@
-# Created by: Stefan Schmidt <stefan.schmidt@stadtbuch.de>
-
-PORTNAME=	isql-viewer
-PORTVERSION=	2.1.8
-PORTREVISION=	5
-CATEGORIES=	databases java
-MASTER_SITES=	SF/isql/Stand%20Alone%20Jars/Version%20${PORTVERSION}:isql \
-		APACHE/ws/soap/version-2.2:bsf
-DISTFILES=	${ISQL_JAR}:isql \
-		${BSF_JAR}:bsf
-EXTRACT_ONLY=	# none
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	JDBC 2.x compliant database front end
-
-RUN_DEPENDS=	${JYTHON_PREFIX}/${JYTHON_JAR}:lang/jython \
-		${JAVALIBDIR}/postgresql.jar:databases/postgresql-jdbc \
-		${JAVALIBDIR}/mysql-connector-java.jar:databases/mysql-connector-java
-
-USE_JAVA=	yes
-NO_BUILD=	yes
-
-ISQL=		iSQL-Viewer
-ISQL_JAR=	${ISQL}-${PORTVERSION}.jar
-DEST_ISQL_JAR=	${ISQL}.jar
-
-BSF_JAR=	bsf.jar
-DEST_BSF_JAR=	ibm-${BSF_JAR}
-
-JYTHON_PREFIX=	${LOCALBASE}/lib/jython
-JYTHON_JAR=	jython.jar
-
-JARFILES=	${DEST_ISQL_JAR} \
-		${DEST_BSF_JAR}
-
-PLIST_FILES=	bin/iSQL-Viewer \
-		${JARFILES:S,^,%%JAVAJARDIR%%/,}
-
-JAR_DEPENDS=	mysql-connector-java.jar \
-		postgresql.jar
-
-CLASSPATH=	"${JARFILES:S,^,${JAVAJARDIR}/,}:${JYTHON_PREFIX}/${JYTHON_JAR}:${JAR_DEPENDS:S,^,${JAVALIBDIR}/,:S| |:|g}"
-
-do-configure:
-	@${SED} -e 's|%%CLASSPATH%%|${CLASSPATH:C,[[:space:]],:,g}|g'	\
-		${FILESDIR}/iSQL-Viewer.sh > ${WRKDIR}/iSQL-Viewer.sh
-
-do-install:
-	${INSTALL_DATA} ${_DISTDIR}${ISQL_JAR} ${STAGEDIR}${JAVAJARDIR}/${DEST_ISQL_JAR}
-	${INSTALL_DATA} ${_DISTDIR}${BSF_JAR} ${STAGEDIR}${JAVAJARDIR}/${DEST_BSF_JAR}
-	${INSTALL_SCRIPT} ${WRKDIR}/iSQL-Viewer.sh ${STAGEDIR}${PREFIX}/bin/iSQL-Viewer
-
-.include <bsd.port.mk>
diff --git a/databases/isql-viewer/distinfo b/databases/isql-viewer/distinfo
deleted file mode 100644
index cfeed14fb598..000000000000
--- a/databases/isql-viewer/distinfo
+++ /dev/null
@@ -1,4 +0,0 @@
-SHA256 (iSQL-Viewer-2.1.8.jar) = bc9388f4af4f14bd4cd52bea624f55b0c5891ce629456d1ae4207c79302df564
-SIZE (iSQL-Viewer-2.1.8.jar) = 1137862
-SHA256 (bsf.jar) = 548c27c4dc7d7dbcb4a4903a8464406533399ae92cde28c9ff590c690b6d9d6d
-SIZE (bsf.jar) = 105573
diff --git a/databases/isql-viewer/files/iSQL-Viewer.sh b/databases/isql-viewer/files/iSQL-Viewer.sh
deleted file mode 100644
index cc0e394eec41..000000000000
--- a/databases/isql-viewer/files/iSQL-Viewer.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-java -classpath %%CLASSPATH%% org.isqlviewer.core.Launcher
diff --git a/databases/isql-viewer/pkg-descr b/databases/isql-viewer/pkg-descr
deleted file mode 100644
index 67cdbd458207..000000000000
--- a/databases/isql-viewer/pkg-descr
+++ /dev/null
@@ -1,23 +0,0 @@
-iSQL-Viewer is an open-source JDBC 2.x compliant database front end written
-in Java. It implements across multiple platforms features of the JDBC API.
-It does everything through a single interface.
-
-iSQL-Viewer works with most database platforms, including PostgreSQL, MySQL,
-Oracle, and Informix. iSQL-Viewer provides a variety of tools and features
-to carry out common database tasks. It includes:
-
-    * Scripting support using JPython and the IBM BSF framework
-    * A guided query builder for creating simple and complex SQL queries
-    * Enhanced object viewing for images, HTML, and other binary format files
-    * A friendly SQL console for executing SQL statements
-    * Batch processing of SQL files
-    * Database introspection
-    * "Bookmarks" to store SQL commands you commonly use
-    * Import and export to popular file formats such as Microsoft Excel, XML,
-      HTML and ASCII delimited.
-    * Enhanced interface support across platforms
-
-iSQL-Viewer is designed to meet the needs of JDBC Driver developers and
-database developers who work in single or multi-platform environments.
-
-WWW: http://www.isqlviewer.com/
diff --git a/databases/isql-viewer/pkg-message b/databases/isql-viewer/pkg-message
deleted file mode 100644
index 99bcbf41246b..000000000000
--- a/databases/isql-viewer/pkg-message
+++ /dev/null
@@ -1,15 +0,0 @@
-[
-{ type: install
-  message: <<EOM
-This port of iSQL-Viewer is configured to automatically detect and use
-the installed JDBC drivers for MySQL and PostgreSQL.
-
-You can add additional JDBC drivers (and dependent JAR files) on a per
-service basis in the tabbed dialog "Resources" which resides inside the
-"Service Manager" dialog.
-
-However, please note that adding JAR files or directories in the preferences
-dialog doesn't have the desired effect in this version.
-EOM
-}
-]
diff --git a/databases/jasperreports/Makefile b/databases/jasperreports/Makefile
deleted file mode 100644
index 478a4fa8a04b..000000000000
--- a/databases/jasperreports/Makefile
+++ /dev/null
@@ -1,65 +0,0 @@
-# Created by: Thierry Thomas <thierry@pompo.net>
-
-PORTNAME=	jasperreports
-PORTVERSION=	5.5.2
-PORTREVISION=	2
-CATEGORIES=	databases print java
-MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/JasperReports%20${PORTVERSION}
-DISTFILES=	${PORTNAME}-${PORTVERSION}.jar ${PORTNAME}-applet-${PORTVERSION}.jar
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Powerful open source Java reporting tool
-
-RUN_DEPENDS=	${JAVALIBDIR}/itext.jar:devel/itext			\
-		${JAVALIBDIR}/xalan.jar:textproc/xalan-j		\
-		${JAVALIBDIR}/crimson.jar:textproc/crimson		\
-		${JAVALIBDIR}/poi.jar:textproc/apache-poi		\
-		${JAVALIBDIR}/jfreechart.jar:java/jfreechart	\
-		${LOCALBASE}/share/java/batik/lib/batik-all.jar:graphics/batik	\
-		${JAVALIBDIR}/commons-beanutils.jar:java/apache-commons-beanutils\
-		${JAVALIBDIR}/commons-digester.jar:textproc/apache-commons-digester
-
-USES=		cpe
-CPE_VENDOR=	jaspersoft
-
-OPTIONS_DEFINE=	MYSQL PGSQL HSQLDB
-OPTIONS_DEFAULT=MYSQL PGSQL
-
-HSQLDB_DESC=	Install libraries required for HSQLDB
-
-USE_JAVA=	yes
-NO_BUILD=	yes
-EXTRACT_CMD=	${CP}
-EXTRACT_BEFORE_ARGS=	# empty
-EXTRACT_AFTER_ARGS=	.
-
-LICENSE=	LGPL3
-
-PLIST_FILES=	${DISTFILES:S|^|%%JAVAJARDIR%%/|:S|-${PORTVERSION}||}
-
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MMYSQL}
-RUN_DEPENDS+=	${JAVALIBDIR}/mysql-connector-java.jar:databases/mysql-connector-java
-.else
-RUN_DEPENDS+=	${JAVALIBDIR}/log4j.jar:devel/log4j
-.endif
-
-.if ${PORT_OPTIONS:MPGSQL}
-RUN_DEPENDS+=	${JAVALIBDIR}/postgresql.jar:databases/postgresql-jdbc
-.endif
-
-.if ${PORT_OPTIONS:MHSQLDB}
-RUN_DEPENDS+=	${JAVALIBDIR}/hsqldb.jar:databases/hsqldb
-.endif
-
-post-extract:
-.for jf in ${DISTFILES}
-	${MV} ${WRKDIR}/${jf} ${WRKDIR}/${jf:S|-${PORTVERSION}||}
-.endfor
-
-do-install:
-	${INSTALL_DATA} ${DISTFILES:S|^|${WRKDIR}/|:S|-${PORTVERSION}||}	\
-		${STAGEDIR}${JAVAJARDIR}
-
-.include <bsd.port.mk>
diff --git a/databases/jasperreports/distinfo b/databases/jasperreports/distinfo
deleted file mode 100644
index 2181e99c9a1d..000000000000
--- a/databases/jasperreports/distinfo
+++ /dev/null
@@ -1,4 +0,0 @@
-SHA256 (jasperreports-5.5.2.jar) = 2373ea494b9260e54ac4c0c9434226f1439662152e67fa435691e1e54a21c7ac
-SIZE (jasperreports-5.5.2.jar) = 4961703
-SHA256 (jasperreports-applet-5.5.2.jar) = 3b65af419fb91b17ae4e5095da0e47f9e2f1b9c6f855d9522935bee443442d77
-SIZE (jasperreports-applet-5.5.2.jar) = 548467
diff --git a/databases/jasperreports/pkg-descr b/databases/jasperreports/pkg-descr
deleted file mode 100644
index 7d02c6388cb0..000000000000
--- a/databases/jasperreports/pkg-descr
+++ /dev/null
@@ -1,13 +0,0 @@
-JasperReports is a powerful open source Java reporting tool that has the
-ability to deliver rich content onto the screen, to the printer or into
-PDF, HTML, XLS, CSV and XML files.
-
-It is entirely written in Java and can be used in a variety of Java enabled
-applications, including J2EE or Web applications, to generate dynamic content.
-
-Its main purpose is to help creating page oriented, ready to print documents in
-a simple and flexible manner.
-
-If you need a GUI, please see the port devel/ireport.
-
-WWW: http://jasperforge.org/projects/jasperreports
diff --git a/databases/jdb/Makefile b/databases/jdb/Makefile
index 6fcbfb301e02..116476259fbc 100644
--- a/databases/jdb/Makefile
+++ b/databases/jdb/Makefile
@@ -1,5 +1,3 @@
-# Created by: Lars Eggert <larse@isi.edu>
-
 PORTNAME=	jdb
 PORTVERSION=	1.14
 PORTREVISION=	3
@@ -8,6 +6,7 @@ MASTER_SITES=	http://www.isi.edu/~johnh/SOFTWARE/JDB/
 
 MAINTAINER=	lars.eggert@gmx.net
 COMMENT=	JDB manipulates flat-ASCII databases from shell scripts
+WWW=		https://www.isi.edu/~johnh/SOFTWARE/JDB/index.html
 
 USES=		perl5 shebangfix
 GNU_CONFIGURE=	yes
diff --git a/databases/jdb/pkg-descr b/databases/jdb/pkg-descr
index ae3957773d54..23c736dd3a15 100644
--- a/databases/jdb/pkg-descr
+++ b/databases/jdb/pkg-descr
@@ -17,5 +17,3 @@ higher-level functions.
 JDB is built on flat-ASCII databases.  By storing data in simple text
 files and processing it with pipelines it is easy to experiment (in
 the shell) and look at the output.
-
-WWW: http://www.isi.edu/~johnh/SOFTWARE/JDB/index.html
diff --git a/databases/jdbc-oracle11g/Makefile b/databases/jdbc-oracle11g/Makefile
index bdfd713042be..2abe2b5109d0 100644
--- a/databases/jdbc-oracle11g/Makefile
+++ b/databases/jdbc-oracle11g/Makefile
@@ -10,6 +10,7 @@ DIST_SUBDIR=	oracle11g
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	JDBC drivers for Oracle 11g
+WWW=		http://www.oracle.com/technetwork/database/features/jdbc/index-091264.html
 
 # Converted from RESTRICTED
 LICENSE=	ORACLE
@@ -18,7 +19,7 @@ LICENSE_TEXT=	Packaging prohibited by Oracle license
 LICENSE_PERMS=	auto-accept
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.7 1.8
+JAVA_VERSION=	8
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
 
diff --git a/databases/jdbc-oracle11g/pkg-descr b/databases/jdbc-oracle11g/pkg-descr
index 1e884c045bb1..de835b155918 100644
--- a/databases/jdbc-oracle11g/pkg-descr
+++ b/databases/jdbc-oracle11g/pkg-descr
@@ -1,4 +1,2 @@
 This is a port of the JDBC driver which is used to access Oracle 11g databases
 using a database-independant API in Java for use with JDK 1.5.
-
-WWW: http://www.oracle.com/technetwork/database/features/jdbc/index-091264.html
diff --git a/databases/jetbrains-datagrip/Makefile b/databases/jetbrains-datagrip/Makefile
new file mode 100644
index 000000000000..d75002ca6fb8
--- /dev/null
+++ b/databases/jetbrains-datagrip/Makefile
@@ -0,0 +1,82 @@
+PORTNAME=	datagrip
+DISTVERSION=	2023.2
+PORTREVISION=	1
+CATEGORIES=	databases java
+MASTER_SITES=	https://download-cf.jetbrains.com/datagrip/
+PKGNAMEPREFIX=	jetbrains-
+DIST_SUBDIR=	jetbrains
+
+MAINTAINER=	ports@FreeBSD.org
+COMMENT=	JetBrains DataGrip IDE for your Databases
+WWW=		https://www.jetbrains.com/datagrip/
+
+LICENSE=	IntelliJ-datagrip
+LICENSE_NAME=	Subscription license agreement for business and organizations
+LICENSE_TEXT=	See: https://www.jetbrains.com/store/license.html
+LICENSE_PERMS=	dist-mirror pkg-mirror auto-accept
+
+ONLY_FOR_ARCHS=	amd64
+
+BUILD_DEPENDS=	jna>0:devel/jna
+RUN_DEPENDS=	intellij-fsnotifier>0:java/intellij-fsnotifier \
+		jetbrains-pty4j>=0.12.13:devel/jetbrains-pty4j \
+		jetbrains-sqlite>=232.8660.185:devel/jetbrains-sqlite \
+		lsof:sysutils/lsof
+
+USES=		python:run shebangfix
+
+USE_JAVA=	yes
+JAVA_VERSION=	17+
+
+USE_LDCONFIG=	yes
+
+SHEBANG_FILES=	bin/restart.py
+
+DATADIR=	${PREFIX}/share/jetbrains/${PORTNAME}
+NO_ARCH=	yes
+NO_ARCH_IGNORE=	libjnidispatch.so
+NO_BUILD=	yes
+SUB_FILES=	${PORTNAME} ${PORTNAME}.desktop pkg-message
+SUB_LIST=	JAVA_HOME=${JAVA_HOME}
+
+WRKSRC=		${WRKDIR}/DataGrip-${PORTVERSION}
+
+do-install:
+# Linux/Windows/OS X only so remove them
+	@${RM} -r \
+		${WRKSRC}/bin/fsnotifier \
+		${WRKSRC}/bin/repair \
+		${WRKSRC}/jbr \
+		${WRKSRC}/lib/jna \
+		${WRKSRC}/lib/native \
+		${WRKSRC}/lib/pty4j \
+		${WRKSRC}/plugins/remote-dev-server
+	${MKDIR} ${STAGEDIR}${DATADIR}
+	@(cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR} \
+		"! -name *\.bak ! -name *\.so ! -name *\.dll ! -name *\.dylib ! -name *\.pdb ! -name *\.sh")
+	@(cd ${WRKSRC}/bin && ${COPYTREE_BIN} . ${STAGEDIR}${DATADIR}/bin/ \
+		"-name *\.sh -o -name *\.py")
+	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} \
+		${STAGEDIR}${PREFIX}/bin/${PORTNAME}
+	${INSTALL_MAN} ${FILESDIR}/${PORTNAME}.1 \
+		${STAGEDIR}${PREFIX}/share/man/man1
+	${INSTALL_DATA} ${WRKDIR}/${PORTNAME}.desktop \
+		${STAGEDIR}${PREFIX}/share/applications/
+# Use fsnotifier replacement provided by java/intellij-fsnotifier
+	${ECHO} "idea.filewatcher.executable.path=${PREFIX}/bin/fsnotifier" \
+		>> ${STAGEDIR}${DATADIR}/bin/idea.properties
+# Install FreeBSD native lib provided by devel/jna
+	@${MKDIR} ${WRKDIR}/jna
+	@(cd ${WRKDIR}/jna && \
+		${JAR} xf ${JAVAJARDIR}/jna.jar com/sun/jna/freebsd-x86-64/libjnidispatch.so)
+	${MKDIR} ${STAGEDIR}${DATADIR}/lib/jna/amd64
+	${INSTALL_LIB} ${WRKDIR}/jna/com/sun/jna/freebsd-x86-64/libjnidispatch.so \
+		${STAGEDIR}${DATADIR}/lib/jna/amd64/
+# Use pty4j replacement provided by devel/jetbrains-pty4j
+	${MKDIR} ${STAGEDIR}${DATADIR}/lib/pty4j/freebsd/x86-64
+	${LN} -sf ../../../../../pty4j/amd64/libpty.so ${STAGEDIR}${DATADIR}/lib/pty4j/freebsd/x86-64/libpty.so
+# Use sqlite replacement provided by devel/jetbrains-sqlite
+	${MKDIR} ${STAGEDIR}${DATADIR}/lib/native/linux-x86_64
+	${LN} -sf ../../../../sqlite/amd64/libsqliteij.so ${STAGEDIR}${DATADIR}/lib/native/linux-x86_64/libsqliteij.so
+
+.include <bsd.port.mk>
diff --git a/databases/jetbrains-datagrip/distinfo b/databases/jetbrains-datagrip/distinfo
new file mode 100644
index 000000000000..1aa3565b2f1c
--- /dev/null
+++ b/databases/jetbrains-datagrip/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1690740881
+SHA256 (jetbrains/datagrip-2023.2.tar.gz) = f8344dad4f502a215440fb7ccbc4c69acdd0b18f33d855f0d0d0d2bbe44a5f26
+SIZE (jetbrains/datagrip-2023.2.tar.gz) = 569402212
diff --git a/databases/jetbrains-datagrip/files/datagrip.1 b/databases/jetbrains-datagrip/files/datagrip.1
new file mode 100644
index 000000000000..b34566dd0c5c
--- /dev/null
+++ b/databases/jetbrains-datagrip/files/datagrip.1
@@ -0,0 +1,16 @@
+.\"     $OpenBSD: mdoc.template,v 1.10 2007/05/31 22:10:19 jmc Exp $
+.Dd $Mdocdate: April 9 2010 $
+.Dt datagrip 1
+.Os
+.Sh NAME
+.Nm datagrip
+.Nd launch JetBrains DataGrip Integrated Development Environment
+.Sh SYNOPSIS
+.Nm
+.Op jvm-args
+.Sh DESCRIPTION
+.Nm
+starts up the JetBrains DataGrip Integrated Development Environment.
+.Sh SEE ALSO
+The web site
+https://www.jetbrains.com/datagrip/ .
diff --git a/databases/jetbrains-datagrip/files/datagrip.desktop.in b/databases/jetbrains-datagrip/files/datagrip.desktop.in
new file mode 100644
index 000000000000..82b6e8c33030
--- /dev/null
+++ b/databases/jetbrains-datagrip/files/datagrip.desktop.in
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Version=1.0
+Encoding=UTF-8
+Type=Application
+Name=DataGrip
+GenericName=DataGrip
+Comment=DataGrip Integrated Development Environment
+Icon=%%DATADIR%%/bin/datagrip.png
+Exec=%%PREFIX%%/bin/datagrip
+Terminal=false
+StartupNotify=true
+Categories=Application;Development;
diff --git a/databases/jetbrains-datagrip/files/datagrip.in b/databases/jetbrains-datagrip/files/datagrip.in
new file mode 100644
index 000000000000..e15668ea0882
--- /dev/null
+++ b/databases/jetbrains-datagrip/files/datagrip.in
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+export JAVA_HOME="${JAVA_HOME:-"%%JAVA_HOME%%"}"
+export SHELL="/bin/sh"
+
+exec "%%DATADIR%%/bin/datagrip.sh" "$@"
diff --git a/databases/jetbrains-datagrip/files/pkg-message.in b/databases/jetbrains-datagrip/files/pkg-message.in
new file mode 100644
index 000000000000..05839729a7e0
--- /dev/null
+++ b/databases/jetbrains-datagrip/files/pkg-message.in
@@ -0,0 +1,12 @@
+[
+{ type: install
+  message: <<EOM
+There is a native (faster) file watching support backed by kqueue which is
+enabled by default.  If you encounter problems with watching large
+trees, you can disable it by adding the following property via the menu
+entry Help -> Edit Custom Properties...
+
+      idea.filewatcher.disabled=true
+EOM
+}
+]
diff --git a/databases/jetbrains-datagrip/pkg-descr b/databases/jetbrains-datagrip/pkg-descr
new file mode 100644
index 000000000000..b619ef89a8dc
--- /dev/null
+++ b/databases/jetbrains-datagrip/pkg-descr
@@ -0,0 +1,10 @@
+DataGrip - A cross-platform IDE for Databases
+
+Native support for PostgreSQL, MySQL, Hive, SQLite, and many more
+Cloud-hosted DBs, enabling you to introspect and modify objects,
+schemas, columns, and rows. Supports parametrized SQL queries, entity
+relationship diagrams using key relations, scripting and version control
+support.
+
+While this is trial software, there are commercial and academic licenses
+available.
diff --git a/databases/jetbrains-datagrip/pkg-plist b/databases/jetbrains-datagrip/pkg-plist
new file mode 100644
index 000000000000..76f791054562
--- /dev/null
+++ b/databases/jetbrains-datagrip/pkg-plist
@@ -0,0 +1,491 @@
+%%DATADIR%%/bin/brokenPlugins.db
+%%DATADIR%%/bin/datagrip.png
+%%DATADIR%%/bin/datagrip.sh
+%%DATADIR%%/bin/datagrip.svg
+%%DATADIR%%/bin/datagrip64.vmoptions
+%%DATADIR%%/bin/format.sh
+%%DATADIR%%/bin/idea.properties
+%%DATADIR%%/bin/inspect.sh
+%%DATADIR%%/bin/ltedit.sh
+%%DATADIR%%/bin/remote-dev-server.sh
+%%DATADIR%%/bin/restart.py
+%%DATADIR%%/build.txt
+%%DATADIR%%/Install-Linux-tar.txt
+%%DATADIR%%/lib/annotations-java5.jar
+%%DATADIR%%/lib/app-client.jar
+%%DATADIR%%/lib/app.jar
+%%DATADIR%%/lib/async-profiler.jar
+%%DATADIR%%/lib/bouncy-castle.jar
+%%DATADIR%%/lib/build-marker-DB-232.8660.111
+%%DATADIR%%/lib/byte-buddy-agent.jar
+%%DATADIR%%/lib/cds/classesLogAgent.jar
+%%DATADIR%%/lib/error-prone-annotations.jar
+%%DATADIR%%/lib/external-system-rt.jar
+%%DATADIR%%/lib/externalProcess-rt.jar
+%%DATADIR%%/lib/forms_rt.jar
+%%DATADIR%%/lib/groovy.jar
+%%DATADIR%%/lib/grpc.jar
+%%DATADIR%%/lib/intellij-coverage-agent-1.0.723.jar
+%%DATADIR%%/lib/intellij-test-discovery.jar
+%%DATADIR%%/lib/jetbrains-annotations.jar
+%%DATADIR%%/lib/jna/amd64/libjnidispatch.so
+%%DATADIR%%/lib/jps-model.jar
+%%DATADIR%%/lib/jsch-agent.jar
+%%DATADIR%%/lib/lib-client.jar
+%%DATADIR%%/lib/lib.jar
+%%DATADIR%%/lib/modules.jar
+%%DATADIR%%/lib/native/linux-x86_64/libsqliteij.so
+%%DATADIR%%/lib/platform-loader.jar
+%%DATADIR%%/lib/product-client.jar
+%%DATADIR%%/lib/product.jar
+%%DATADIR%%/lib/protobuf.jar
+%%DATADIR%%/lib/pty4j/freebsd/x86-64/libpty.so
+%%DATADIR%%/lib/rd.jar
+%%DATADIR%%/lib/stats.jar
+%%DATADIR%%/lib/util_rt.jar
+%%DATADIR%%/lib/util-8.jar
+%%DATADIR%%/lib/util.jar
+%%DATADIR%%/license/javahelp_license.txt
+%%DATADIR%%/license/javolution_license.txt
+%%DATADIR%%/license/saxon-conditions.html
+%%DATADIR%%/license/third-party-libraries.html
+%%DATADIR%%/license/third-party-libraries.json
+%%DATADIR%%/license/yourkit-license-redist.txt
+%%DATADIR%%/plugins/charts/lib/charts.jar
+%%DATADIR%%/plugins/cloudConfig/lib/cloudConfig.jar
+%%DATADIR%%/plugins/color-scheme-solarized-datagrip/lib/color-scheme-solarized-datagrip.jar
+%%DATADIR%%/plugins/color-scheme-vibrant_ink/lib/color-scheme-vibrant_ink.jar
+%%DATADIR%%/plugins/color-scheme-warmNeon/lib/color-scheme-warmNeon.jar
+%%DATADIR%%/plugins/completionMlRanking/lib/completionMlRanking.jar
+%%DATADIR%%/plugins/configurationScript/lib/configurationScript.jar
+%%DATADIR%%/plugins/DatabaseTools/lib/aether-dependency-resolver.jar
+%%DATADIR%%/plugins/DatabaseTools/lib/database-minicats.jar
+%%DATADIR%%/plugins/DatabaseTools/lib/database-openapi.jar
+%%DATADIR%%/plugins/DatabaseTools/lib/database-plugin.jar
+%%DATADIR%%/plugins/DatabaseTools/lib/jdbc-console.jar
+%%DATADIR%%/plugins/DatabaseTools/lib/maven-resolver-connector-basic.jar
+%%DATADIR%%/plugins/DatabaseTools/lib/maven-resolver-transport-file.jar
+%%DATADIR%%/plugins/DatabaseTools/lib/maven-resolver-transport-http.jar
+%%DATADIR%%/plugins/datagrip-impl/lib/datagrip-impl.jar
+%%DATADIR%%/plugins/DataGripHelp/lib/datagrip-help.jar
+%%DATADIR%%/plugins/DataGripHelp/lib/help-datagrip-assets.jar
+%%DATADIR%%/plugins/dev/lib/dev.jar
+%%DATADIR%%/plugins/grid-core-impl/lib/grid-core.jar
+%%DATADIR%%/plugins/grid-core-impl/lib/jdbc-console-types.jar
+%%DATADIR%%/plugins/grid-impl/lib/grid.jar
+%%DATADIR%%/plugins/performanceTesting-async/lib/performanceTesting-async.jar
+%%DATADIR%%/plugins/performanceTesting/lib/performanceTesting.jar
+%%DATADIR%%/plugins/platform-images/lib/platform-images.jar
+%%DATADIR%%/plugins/platform-langInjection/lib/IntelliLang.jar
+%%DATADIR%%/plugins/platform-langInjection/lib/java-langInjection-jps.jar
+%%DATADIR%%/plugins/platform-langInjection/lib/platform-langInjection.jar
+%%DATADIR%%/plugins/searchEverywhereMl/lib/searchEverywhereMl.jar
+%%DATADIR%%/plugins/settingsSync/lib/settingsSync.jar
+%%DATADIR%%/plugins/textmate/lib/bundles/bat/.vscodeignore
+%%DATADIR%%/plugins/textmate/lib/bundles/bat/cgmanifest.json
+%%DATADIR%%/plugins/textmate/lib/bundles/bat/language-configuration.json
+%%DATADIR%%/plugins/textmate/lib/bundles/bat/package.json
+%%DATADIR%%/plugins/textmate/lib/bundles/bat/package.nls.json
+%%DATADIR%%/plugins/textmate/lib/bundles/bat/snippets/batchfile.code-snippets
+%%DATADIR%%/plugins/textmate/lib/bundles/bat/syntaxes/batchfile.tmLanguage.json
+%%DATADIR%%/plugins/textmate/lib/bundles/clojure/.vscodeignore
+%%DATADIR%%/plugins/textmate/lib/bundles/clojure/cgmanifest.json
+%%DATADIR%%/plugins/textmate/lib/bundles/clojure/language-configuration.json
+%%DATADIR%%/plugins/textmate/lib/bundles/clojure/package.json
+%%DATADIR%%/plugins/textmate/lib/bundles/clojure/package.nls.json
+%%DATADIR%%/plugins/textmate/lib/bundles/clojure/syntaxes/clojure.tmLanguage.json
+%%DATADIR%%/plugins/textmate/lib/bundles/cmake/LICENSE
+%%DATADIR%%/plugins/textmate/lib/bundles/cmake/package.json
+%%DATADIR%%/plugins/textmate/lib/bundles/cmake/README.md
+%%DATADIR%%/plugins/textmate/lib/bundles/cmake/syntaxes/CMake.tmLanguage
+%%DATADIR%%/plugins/textmate/lib/bundles/cmake/syntaxes/CMakeCache.tmLanguage
+%%DATADIR%%/plugins/textmate/lib/bundles/coffeescript/.vscodeignore
+%%DATADIR%%/plugins/textmate/lib/bundles/coffeescript/cgmanifest.json
+%%DATADIR%%/plugins/textmate/lib/bundles/coffeescript/language-configuration.json
+%%DATADIR%%/plugins/textmate/lib/bundles/coffeescript/package.json
+%%DATADIR%%/plugins/textmate/lib/bundles/coffeescript/package.nls.json
+%%DATADIR%%/plugins/textmate/lib/bundles/coffeescript/snippets/coffeescript.code-snippets
+%%DATADIR%%/plugins/textmate/lib/bundles/coffeescript/syntaxes/coffeescript.tmLanguage.json
+%%DATADIR%%/plugins/textmate/lib/bundles/cpp/.vscodeignore
+%%DATADIR%%/plugins/textmate/lib/bundles/cpp/cgmanifest.json
+%%DATADIR%%/plugins/textmate/lib/bundles/cpp/language-configuration.json
+%%DATADIR%%/plugins/textmate/lib/bundles/cpp/package.json
+%%DATADIR%%/plugins/textmate/lib/bundles/cpp/package.nls.json
+%%DATADIR%%/plugins/textmate/lib/bundles/cpp/snippets/c.code-snippets
+%%DATADIR%%/plugins/textmate/lib/bundles/cpp/snippets/cpp.code-snippets
+%%DATADIR%%/plugins/textmate/lib/bundles/cpp/syntaxes/c.tmLanguage.json
+%%DATADIR%%/plugins/textmate/lib/bundles/cpp/syntaxes/cpp.embedded.macro.tmLanguage.json
+%%DATADIR%%/plugins/textmate/lib/bundles/cpp/syntaxes/cpp.tmLanguage.json
+%%DATADIR%%/plugins/textmate/lib/bundles/cpp/syntaxes/cuda-cpp.tmLanguage.json
+%%DATADIR%%/plugins/textmate/lib/bundles/cpp/syntaxes/platform.tmLanguage.json
+%%DATADIR%%/plugins/textmate/lib/bundles/csharp/.vscodeignore
+%%DATADIR%%/plugins/textmate/lib/bundles/csharp/cgmanifest.json
+%%DATADIR%%/plugins/textmate/lib/bundles/csharp/language-configuration.json
+%%DATADIR%%/plugins/textmate/lib/bundles/csharp/package.json
+%%DATADIR%%/plugins/textmate/lib/bundles/csharp/package.nls.json
+%%DATADIR%%/plugins/textmate/lib/bundles/csharp/snippets/csharp.code-snippets
+%%DATADIR%%/plugins/textmate/lib/bundles/csharp/syntaxes/csharp.tmLanguage.json
+%%DATADIR%%/plugins/textmate/lib/bundles/css/.vscode/launch.json
+%%DATADIR%%/plugins/textmate/lib/bundles/css/.vscodeignore
+%%DATADIR%%/plugins/textmate/lib/bundles/css/cgmanifest.json
+%%DATADIR%%/plugins/textmate/lib/bundles/css/language-configuration.json
+%%DATADIR%%/plugins/textmate/lib/bundles/css/package.json
+%%DATADIR%%/plugins/textmate/lib/bundles/css/package.nls.json
+%%DATADIR%%/plugins/textmate/lib/bundles/css/syntaxes/css.tmLanguage.json
+%%DATADIR%%/plugins/textmate/lib/bundles/dart/.vscodeignore
+%%DATADIR%%/plugins/textmate/lib/bundles/dart/cgmanifest.json
+%%DATADIR%%/plugins/textmate/lib/bundles/dart/language-configuration.json
+%%DATADIR%%/plugins/textmate/lib/bundles/dart/package.json
+%%DATADIR%%/plugins/textmate/lib/bundles/dart/package.nls.json
+%%DATADIR%%/plugins/textmate/lib/bundles/dart/syntaxes/dart.tmLanguage.json
+%%DATADIR%%/plugins/textmate/lib/bundles/diff/.vscodeignore
+%%DATADIR%%/plugins/textmate/lib/bundles/diff/cgmanifest.json
+%%DATADIR%%/plugins/textmate/lib/bundles/diff/language-configuration.json
+%%DATADIR%%/plugins/textmate/lib/bundles/diff/package.json
+%%DATADIR%%/plugins/textmate/lib/bundles/diff/package.nls.json
+%%DATADIR%%/plugins/textmate/lib/bundles/diff/syntaxes/diff.tmLanguage.json
+%%DATADIR%%/plugins/textmate/lib/bundles/docker/.vscodeignore
+%%DATADIR%%/plugins/textmate/lib/bundles/docker/cgmanifest.json
+%%DATADIR%%/plugins/textmate/lib/bundles/docker/language-configuration.json
+%%DATADIR%%/plugins/textmate/lib/bundles/docker/package.json
+%%DATADIR%%/plugins/textmate/lib/bundles/docker/package.nls.json
+%%DATADIR%%/plugins/textmate/lib/bundles/docker/syntaxes/docker.tmLanguage.json
+%%DATADIR%%/plugins/textmate/lib/bundles/erlang/grammar/Erlang.plist
+%%DATADIR%%/plugins/textmate/lib/bundles/erlang/language-configuration.json
+%%DATADIR%%/plugins/textmate/lib/bundles/erlang/package.json
+%%DATADIR%%/plugins/textmate/lib/bundles/fsharp/.vscodeignore
+%%DATADIR%%/plugins/textmate/lib/bundles/fsharp/cgmanifest.json
+%%DATADIR%%/plugins/textmate/lib/bundles/fsharp/language-configuration.json
+%%DATADIR%%/plugins/textmate/lib/bundles/fsharp/package.json
+%%DATADIR%%/plugins/textmate/lib/bundles/fsharp/package.nls.json
+%%DATADIR%%/plugins/textmate/lib/bundles/fsharp/snippets/fsharp.code-snippets
+%%DATADIR%%/plugins/textmate/lib/bundles/fsharp/syntaxes/fsharp.tmLanguage.json
+%%DATADIR%%/plugins/textmate/lib/bundles/git-base/.vscodeignore
+%%DATADIR%%/plugins/textmate/lib/bundles/git-base/cgmanifest.json
+%%DATADIR%%/plugins/textmate/lib/bundles/git-base/languages/git-commit.language-configuration.json
+%%DATADIR%%/plugins/textmate/lib/bundles/git-base/languages/git-rebase.language-configuration.json
+%%DATADIR%%/plugins/textmate/lib/bundles/git-base/languages/ignore.language-configuration.json
+%%DATADIR%%/plugins/textmate/lib/bundles/git-base/package.json
+%%DATADIR%%/plugins/textmate/lib/bundles/git-base/package.nls.json
+%%DATADIR%%/plugins/textmate/lib/bundles/git-base/README.md
+%%DATADIR%%/plugins/textmate/lib/bundles/git-base/syntaxes/git-commit.tmLanguage.json
+%%DATADIR%%/plugins/textmate/lib/bundles/git-base/syntaxes/git-rebase.tmLanguage.json
+%%DATADIR%%/plugins/textmate/lib/bundles/git-base/syntaxes/ignore.tmLanguage.json
+%%DATADIR%%/plugins/textmate/lib/bundles/git-base/tsconfig.json
+%%DATADIR%%/plugins/textmate/lib/bundles/go/.vscodeignore
+%%DATADIR%%/plugins/textmate/lib/bundles/go/cgmanifest.json
+%%DATADIR%%/plugins/textmate/lib/bundles/go/language-configuration.json
+%%DATADIR%%/plugins/textmate/lib/bundles/go/package.json
+%%DATADIR%%/plugins/textmate/lib/bundles/go/package.nls.json
+%%DATADIR%%/plugins/textmate/lib/bundles/go/syntaxes/go.tmLanguage.json
+%%DATADIR%%/plugins/textmate/lib/bundles/groovy/.vscodeignore
+%%DATADIR%%/plugins/textmate/lib/bundles/groovy/cgmanifest.json
+%%DATADIR%%/plugins/textmate/lib/bundles/groovy/language-configuration.json
+%%DATADIR%%/plugins/textmate/lib/bundles/groovy/package.json
+%%DATADIR%%/plugins/textmate/lib/bundles/groovy/package.nls.json
+%%DATADIR%%/plugins/textmate/lib/bundles/groovy/snippets/groovy.code-snippets
+%%DATADIR%%/plugins/textmate/lib/bundles/groovy/syntaxes/groovy.tmLanguage.json
+%%DATADIR%%/plugins/textmate/lib/bundles/handlebars/.vscodeignore
+%%DATADIR%%/plugins/textmate/lib/bundles/handlebars/cgmanifest.json
+%%DATADIR%%/plugins/textmate/lib/bundles/handlebars/language-configuration.json
+%%DATADIR%%/plugins/textmate/lib/bundles/handlebars/package.json
+%%DATADIR%%/plugins/textmate/lib/bundles/handlebars/package.nls.json
+%%DATADIR%%/plugins/textmate/lib/bundles/handlebars/syntaxes/Handlebars.tmLanguage.json
+%%DATADIR%%/plugins/textmate/lib/bundles/hlsl/.vscodeignore
+%%DATADIR%%/plugins/textmate/lib/bundles/hlsl/cgmanifest.json
+%%DATADIR%%/plugins/textmate/lib/bundles/hlsl/language-configuration.json
+%%DATADIR%%/plugins/textmate/lib/bundles/hlsl/package.json
+%%DATADIR%%/plugins/textmate/lib/bundles/hlsl/package.nls.json
+%%DATADIR%%/plugins/textmate/lib/bundles/hlsl/syntaxes/hlsl.tmLanguage.json
+%%DATADIR%%/plugins/textmate/lib/bundles/html/.vscodeignore
+%%DATADIR%%/plugins/textmate/lib/bundles/html/cgmanifest.json
+%%DATADIR%%/plugins/textmate/lib/bundles/html/language-configuration.json
+%%DATADIR%%/plugins/textmate/lib/bundles/html/package.json
+%%DATADIR%%/plugins/textmate/lib/bundles/html/package.nls.json
+%%DATADIR%%/plugins/textmate/lib/bundles/html/snippets/html.code-snippets
+%%DATADIR%%/plugins/textmate/lib/bundles/html/syntaxes/html-derivative.tmLanguage.json
+%%DATADIR%%/plugins/textmate/lib/bundles/html/syntaxes/html.tmLanguage.json
+%%DATADIR%%/plugins/textmate/lib/bundles/ini/.vscodeignore
+%%DATADIR%%/plugins/textmate/lib/bundles/ini/cgmanifest.json
+%%DATADIR%%/plugins/textmate/lib/bundles/ini/ini.language-configuration.json
+%%DATADIR%%/plugins/textmate/lib/bundles/ini/package.json
+%%DATADIR%%/plugins/textmate/lib/bundles/ini/package.nls.json
+%%DATADIR%%/plugins/textmate/lib/bundles/ini/properties.language-configuration.json
+%%DATADIR%%/plugins/textmate/lib/bundles/ini/syntaxes/ini.tmLanguage.json
+%%DATADIR%%/plugins/textmate/lib/bundles/java/.vscodeignore
+%%DATADIR%%/plugins/textmate/lib/bundles/java/cgmanifest.json
+%%DATADIR%%/plugins/textmate/lib/bundles/java/language-configuration.json
+%%DATADIR%%/plugins/textmate/lib/bundles/java/package.json
+%%DATADIR%%/plugins/textmate/lib/bundles/java/package.nls.json
+%%DATADIR%%/plugins/textmate/lib/bundles/java/snippets/java.code-snippets
+%%DATADIR%%/plugins/textmate/lib/bundles/java/syntaxes/java.tmLanguage.json
+%%DATADIR%%/plugins/textmate/lib/bundles/javascript/.vscodeignore
+%%DATADIR%%/plugins/textmate/lib/bundles/javascript/cgmanifest.json
+%%DATADIR%%/plugins/textmate/lib/bundles/javascript/javascript-language-configuration.json
+%%DATADIR%%/plugins/textmate/lib/bundles/javascript/package.json
+%%DATADIR%%/plugins/textmate/lib/bundles/javascript/package.nls.json
+%%DATADIR%%/plugins/textmate/lib/bundles/javascript/snippets/javascript.code-snippets
+%%DATADIR%%/plugins/textmate/lib/bundles/javascript/syntaxes/JavaScript.tmLanguage.json
+%%DATADIR%%/plugins/textmate/lib/bundles/javascript/syntaxes/JavaScriptReact.tmLanguage.json
+%%DATADIR%%/plugins/textmate/lib/bundles/javascript/syntaxes/Readme.md
+%%DATADIR%%/plugins/textmate/lib/bundles/javascript/syntaxes/Regular Expressions (JavaScript).tmLanguage
+%%DATADIR%%/plugins/textmate/lib/bundles/javascript/tags-language-configuration.json
+%%DATADIR%%/plugins/textmate/lib/bundles/json/.vscodeignore
+%%DATADIR%%/plugins/textmate/lib/bundles/json/cgmanifest.json
+%%DATADIR%%/plugins/textmate/lib/bundles/json/language-configuration.json
+%%DATADIR%%/plugins/textmate/lib/bundles/json/package.json
+%%DATADIR%%/plugins/textmate/lib/bundles/json/package.nls.json
+%%DATADIR%%/plugins/textmate/lib/bundles/json/syntaxes/JSON.tmLanguage.json
+%%DATADIR%%/plugins/textmate/lib/bundles/json/syntaxes/JSONC.tmLanguage.json
+%%DATADIR%%/plugins/textmate/lib/bundles/jsp/jsp-configuration.json
+%%DATADIR%%/plugins/textmate/lib/bundles/jsp/LICENSE
+%%DATADIR%%/plugins/textmate/lib/bundles/jsp/package.json
+%%DATADIR%%/plugins/textmate/lib/bundles/jsp/README.md
+%%DATADIR%%/plugins/textmate/lib/bundles/jsp/syntaxes/jsp.tmLanguage.json
+%%DATADIR%%/plugins/textmate/lib/bundles/julia/.vscodeignore
+%%DATADIR%%/plugins/textmate/lib/bundles/julia/cgmanifest.json
+%%DATADIR%%/plugins/textmate/lib/bundles/julia/language-configuration.json
+%%DATADIR%%/plugins/textmate/lib/bundles/julia/package.json
+%%DATADIR%%/plugins/textmate/lib/bundles/julia/package.nls.json
+%%DATADIR%%/plugins/textmate/lib/bundles/julia/syntaxes/julia.tmLanguage.json
+%%DATADIR%%/plugins/textmate/lib/bundles/kotlin/info.plist
+%%DATADIR%%/plugins/textmate/lib/bundles/kotlin/snippets/class.tmSnippet
+%%DATADIR%%/plugins/textmate/lib/bundles/kotlin/snippets/println.tmSnippet
+%%DATADIR%%/plugins/textmate/lib/bundles/kotlin/syntaxes/Kotlin.tmLanguage
+%%DATADIR%%/plugins/textmate/lib/bundles/latex/.vscodeignore
+%%DATADIR%%/plugins/textmate/lib/bundles/latex/cgmanifest.json
+%%DATADIR%%/plugins/textmate/lib/bundles/latex/cpp-bailout-license.txt
+%%DATADIR%%/plugins/textmate/lib/bundles/latex/latex-cpp-embedded-language-configuration.json
+%%DATADIR%%/plugins/textmate/lib/bundles/latex/latex-language-configuration.json
+%%DATADIR%%/plugins/textmate/lib/bundles/latex/markdown-latex-combined-language-configuration.json
+%%DATADIR%%/plugins/textmate/lib/bundles/latex/markdown-latex-combined-license.txt
+%%DATADIR%%/plugins/textmate/lib/bundles/latex/package.json
+%%DATADIR%%/plugins/textmate/lib/bundles/latex/package.nls.json
+%%DATADIR%%/plugins/textmate/lib/bundles/latex/syntaxes/Bibtex.tmLanguage.json
+%%DATADIR%%/plugins/textmate/lib/bundles/latex/syntaxes/cpp-grammar-bailout.tmLanguage.json
+%%DATADIR%%/plugins/textmate/lib/bundles/latex/syntaxes/LaTeX.tmLanguage.json
+%%DATADIR%%/plugins/textmate/lib/bundles/latex/syntaxes/markdown-latex-combined.tmLanguage.json
+%%DATADIR%%/plugins/textmate/lib/bundles/latex/syntaxes/TeX.tmLanguage.json
+%%DATADIR%%/plugins/textmate/lib/bundles/less/.vscodeignore
+%%DATADIR%%/plugins/textmate/lib/bundles/less/cgmanifest.json
+%%DATADIR%%/plugins/textmate/lib/bundles/less/language-configuration.json
+%%DATADIR%%/plugins/textmate/lib/bundles/less/package.json
+%%DATADIR%%/plugins/textmate/lib/bundles/less/package.nls.json
+%%DATADIR%%/plugins/textmate/lib/bundles/less/syntaxes/less.tmLanguage.json
+%%DATADIR%%/plugins/textmate/lib/bundles/log/.vscodeignore
+%%DATADIR%%/plugins/textmate/lib/bundles/log/cgmanifest.json
+%%DATADIR%%/plugins/textmate/lib/bundles/log/package.json
+%%DATADIR%%/plugins/textmate/lib/bundles/log/package.nls.json
+%%DATADIR%%/plugins/textmate/lib/bundles/log/syntaxes/log.tmLanguage.json
+%%DATADIR%%/plugins/textmate/lib/bundles/lua/.vscodeignore
+%%DATADIR%%/plugins/textmate/lib/bundles/lua/cgmanifest.json
+%%DATADIR%%/plugins/textmate/lib/bundles/lua/language-configuration.json
+%%DATADIR%%/plugins/textmate/lib/bundles/lua/package.json
+%%DATADIR%%/plugins/textmate/lib/bundles/lua/package.nls.json
+%%DATADIR%%/plugins/textmate/lib/bundles/lua/syntaxes/lua.tmLanguage.json
+%%DATADIR%%/plugins/textmate/lib/bundles/make/.vscodeignore
+%%DATADIR%%/plugins/textmate/lib/bundles/make/cgmanifest.json
+%%DATADIR%%/plugins/textmate/lib/bundles/make/language-configuration.json
+%%DATADIR%%/plugins/textmate/lib/bundles/make/package.json
+%%DATADIR%%/plugins/textmate/lib/bundles/make/package.nls.json
+%%DATADIR%%/plugins/textmate/lib/bundles/make/syntaxes/make.tmLanguage.json
+%%DATADIR%%/plugins/textmate/lib/bundles/markdown-basics/.vscodeignore
+%%DATADIR%%/plugins/textmate/lib/bundles/markdown-basics/cgmanifest.json
+%%DATADIR%%/plugins/textmate/lib/bundles/markdown-basics/language-configuration.json
+%%DATADIR%%/plugins/textmate/lib/bundles/markdown-basics/package.json
+%%DATADIR%%/plugins/textmate/lib/bundles/markdown-basics/package.nls.json
+%%DATADIR%%/plugins/textmate/lib/bundles/markdown-basics/snippets/markdown.code-snippets
+%%DATADIR%%/plugins/textmate/lib/bundles/markdown-basics/syntaxes/markdown.tmLanguage.json
+%%DATADIR%%/plugins/textmate/lib/bundles/markdown-math/.gitignore
+%%DATADIR%%/plugins/textmate/lib/bundles/markdown-math/.vscodeignore
+%%DATADIR%%/plugins/textmate/lib/bundles/markdown-math/cgmanifest.json
+%%DATADIR%%/plugins/textmate/lib/bundles/markdown-math/notebook/tsconfig.json
+%%DATADIR%%/plugins/textmate/lib/bundles/markdown-math/package.json
+%%DATADIR%%/plugins/textmate/lib/bundles/markdown-math/package.nls.json
+%%DATADIR%%/plugins/textmate/lib/bundles/markdown-math/preview-styles/index.css
+%%DATADIR%%/plugins/textmate/lib/bundles/markdown-math/README.md
+%%DATADIR%%/plugins/textmate/lib/bundles/markdown-math/syntaxes/md-math-block.tmLanguage.json
+%%DATADIR%%/plugins/textmate/lib/bundles/markdown-math/syntaxes/md-math-inline.tmLanguage.json
+%%DATADIR%%/plugins/textmate/lib/bundles/markdown-math/syntaxes/md-math.tmLanguage.json
+%%DATADIR%%/plugins/textmate/lib/bundles/markdown-math/tsconfig.json
+%%DATADIR%%/plugins/textmate/lib/bundles/mdx/license
+%%DATADIR%%/plugins/textmate/lib/bundles/mdx/package.json
+%%DATADIR%%/plugins/textmate/lib/bundles/mdx/syntaxes/mdx.tmLanguage.json
+%%DATADIR%%/plugins/textmate/lib/bundles/objective-c/.vscodeignore
+%%DATADIR%%/plugins/textmate/lib/bundles/objective-c/cgmanifest.json
+%%DATADIR%%/plugins/textmate/lib/bundles/objective-c/language-configuration.json
+%%DATADIR%%/plugins/textmate/lib/bundles/objective-c/package.json
+%%DATADIR%%/plugins/textmate/lib/bundles/objective-c/package.nls.json
+%%DATADIR%%/plugins/textmate/lib/bundles/objective-c/syntaxes/objective-c.tmLanguage.json
+%%DATADIR%%/plugins/textmate/lib/bundles/objective-c/syntaxes/objective-c++.tmLanguage.json
+%%DATADIR%%/plugins/textmate/lib/bundles/perl/.vscodeignore
+%%DATADIR%%/plugins/textmate/lib/bundles/perl/cgmanifest.json
+%%DATADIR%%/plugins/textmate/lib/bundles/perl/package.json
+%%DATADIR%%/plugins/textmate/lib/bundles/perl/package.nls.json
+%%DATADIR%%/plugins/textmate/lib/bundles/perl/perl.language-configuration.json
+%%DATADIR%%/plugins/textmate/lib/bundles/perl/perl6.language-configuration.json
+%%DATADIR%%/plugins/textmate/lib/bundles/perl/syntaxes/perl.tmLanguage.json
+%%DATADIR%%/plugins/textmate/lib/bundles/perl/syntaxes/perl6.tmLanguage.json
+%%DATADIR%%/plugins/textmate/lib/bundles/php/.vscode/launch.json
+%%DATADIR%%/plugins/textmate/lib/bundles/php/.vscode/tasks.json
+%%DATADIR%%/plugins/textmate/lib/bundles/php/.vscodeignore
+%%DATADIR%%/plugins/textmate/lib/bundles/php/cgmanifest.json
+%%DATADIR%%/plugins/textmate/lib/bundles/php/language-configuration.json
+%%DATADIR%%/plugins/textmate/lib/bundles/php/package.json
+%%DATADIR%%/plugins/textmate/lib/bundles/php/package.nls.json
+%%DATADIR%%/plugins/textmate/lib/bundles/php/snippets/php.code-snippets
+%%DATADIR%%/plugins/textmate/lib/bundles/php/syntaxes/html.tmLanguage.json
+%%DATADIR%%/plugins/textmate/lib/bundles/php/syntaxes/php.tmLanguage.json
+%%DATADIR%%/plugins/textmate/lib/bundles/powershell/.vscodeignore
+%%DATADIR%%/plugins/textmate/lib/bundles/powershell/cgmanifest.json
+%%DATADIR%%/plugins/textmate/lib/bundles/powershell/language-configuration.json
+%%DATADIR%%/plugins/textmate/lib/bundles/powershell/package.json
+%%DATADIR%%/plugins/textmate/lib/bundles/powershell/package.nls.json
+%%DATADIR%%/plugins/textmate/lib/bundles/powershell/snippets/powershell.code-snippets
+%%DATADIR%%/plugins/textmate/lib/bundles/powershell/syntaxes/powershell.tmLanguage.json
+%%DATADIR%%/plugins/textmate/lib/bundles/pug/.vscodeignore
+%%DATADIR%%/plugins/textmate/lib/bundles/pug/cgmanifest.json
+%%DATADIR%%/plugins/textmate/lib/bundles/pug/language-configuration.json
+%%DATADIR%%/plugins/textmate/lib/bundles/pug/package.json
+%%DATADIR%%/plugins/textmate/lib/bundles/pug/package.nls.json
+%%DATADIR%%/plugins/textmate/lib/bundles/pug/syntaxes/pug.tmLanguage.json
+%%DATADIR%%/plugins/textmate/lib/bundles/python/.vscode/launch.json
+%%DATADIR%%/plugins/textmate/lib/bundles/python/.vscode/tasks.json
+%%DATADIR%%/plugins/textmate/lib/bundles/python/.vscodeignore
+%%DATADIR%%/plugins/textmate/lib/bundles/python/cgmanifest.json
+%%DATADIR%%/plugins/textmate/lib/bundles/python/language-configuration.json
+%%DATADIR%%/plugins/textmate/lib/bundles/python/package.json
+%%DATADIR%%/plugins/textmate/lib/bundles/python/package.nls.json
+%%DATADIR%%/plugins/textmate/lib/bundles/python/syntaxes/MagicPython.tmLanguage.json
+%%DATADIR%%/plugins/textmate/lib/bundles/python/syntaxes/MagicRegExp.tmLanguage.json
+%%DATADIR%%/plugins/textmate/lib/bundles/r/.vscodeignore
+%%DATADIR%%/plugins/textmate/lib/bundles/r/cgmanifest.json
+%%DATADIR%%/plugins/textmate/lib/bundles/r/language-configuration.json
+%%DATADIR%%/plugins/textmate/lib/bundles/r/package.json
+%%DATADIR%%/plugins/textmate/lib/bundles/r/package.nls.json
+%%DATADIR%%/plugins/textmate/lib/bundles/r/syntaxes/r.tmLanguage.json
+%%DATADIR%%/plugins/textmate/lib/bundles/razor/.vscodeignore
+%%DATADIR%%/plugins/textmate/lib/bundles/razor/cgmanifest.json
+%%DATADIR%%/plugins/textmate/lib/bundles/razor/language-configuration.json
+%%DATADIR%%/plugins/textmate/lib/bundles/razor/package.json
+%%DATADIR%%/plugins/textmate/lib/bundles/razor/package.nls.json
+%%DATADIR%%/plugins/textmate/lib/bundles/razor/syntaxes/cshtml.tmLanguage.json
+%%DATADIR%%/plugins/textmate/lib/bundles/restructuredtext/.vscodeignore
+%%DATADIR%%/plugins/textmate/lib/bundles/restructuredtext/cgmanifest.json
+%%DATADIR%%/plugins/textmate/lib/bundles/restructuredtext/language-configuration.json
+%%DATADIR%%/plugins/textmate/lib/bundles/restructuredtext/package.json
+%%DATADIR%%/plugins/textmate/lib/bundles/restructuredtext/package.nls.json
+%%DATADIR%%/plugins/textmate/lib/bundles/restructuredtext/syntaxes/rst.tmLanguage.json
+%%DATADIR%%/plugins/textmate/lib/bundles/ruby/.vscodeignore
+%%DATADIR%%/plugins/textmate/lib/bundles/ruby/cgmanifest.json
+%%DATADIR%%/plugins/textmate/lib/bundles/ruby/language-configuration.json
+%%DATADIR%%/plugins/textmate/lib/bundles/ruby/package.json
+%%DATADIR%%/plugins/textmate/lib/bundles/ruby/package.nls.json
+%%DATADIR%%/plugins/textmate/lib/bundles/ruby/syntaxes/ruby.tmLanguage.json
+%%DATADIR%%/plugins/textmate/lib/bundles/rust/.vscodeignore
+%%DATADIR%%/plugins/textmate/lib/bundles/rust/cgmanifest.json
+%%DATADIR%%/plugins/textmate/lib/bundles/rust/language-configuration.json
+%%DATADIR%%/plugins/textmate/lib/bundles/rust/package.json
+%%DATADIR%%/plugins/textmate/lib/bundles/rust/package.nls.json
+%%DATADIR%%/plugins/textmate/lib/bundles/rust/syntaxes/rust.tmLanguage.json
+%%DATADIR%%/plugins/textmate/lib/bundles/scss/.vscodeignore
+%%DATADIR%%/plugins/textmate/lib/bundles/scss/cgmanifest.json
+%%DATADIR%%/plugins/textmate/lib/bundles/scss/language-configuration.json
+%%DATADIR%%/plugins/textmate/lib/bundles/scss/package.json
+%%DATADIR%%/plugins/textmate/lib/bundles/scss/package.nls.json
+%%DATADIR%%/plugins/textmate/lib/bundles/scss/syntaxes/sassdoc.tmLanguage.json
+%%DATADIR%%/plugins/textmate/lib/bundles/scss/syntaxes/scss.tmLanguage.json
+%%DATADIR%%/plugins/textmate/lib/bundles/search-result/.vscodeignore
+%%DATADIR%%/plugins/textmate/lib/bundles/search-result/package.json
+%%DATADIR%%/plugins/textmate/lib/bundles/search-result/package.nls.json
+%%DATADIR%%/plugins/textmate/lib/bundles/search-result/README.md
+%%DATADIR%%/plugins/textmate/lib/bundles/search-result/syntaxes/searchResult.tmLanguage.json
+%%DATADIR%%/plugins/textmate/lib/bundles/search-result/tsconfig.json
+%%DATADIR%%/plugins/textmate/lib/bundles/shaderlab/.vscodeignore
+%%DATADIR%%/plugins/textmate/lib/bundles/shaderlab/cgmanifest.json
+%%DATADIR%%/plugins/textmate/lib/bundles/shaderlab/language-configuration.json
+%%DATADIR%%/plugins/textmate/lib/bundles/shaderlab/package.json
+%%DATADIR%%/plugins/textmate/lib/bundles/shaderlab/package.nls.json
+%%DATADIR%%/plugins/textmate/lib/bundles/shaderlab/syntaxes/shaderlab.tmLanguage.json
+%%DATADIR%%/plugins/textmate/lib/bundles/shellscript/.vscodeignore
+%%DATADIR%%/plugins/textmate/lib/bundles/shellscript/cgmanifest.json
+%%DATADIR%%/plugins/textmate/lib/bundles/shellscript/language-configuration.json
+%%DATADIR%%/plugins/textmate/lib/bundles/shellscript/package.json
+%%DATADIR%%/plugins/textmate/lib/bundles/shellscript/package.nls.json
+%%DATADIR%%/plugins/textmate/lib/bundles/shellscript/syntaxes/shell-unix-bash.tmLanguage.json
+%%DATADIR%%/plugins/textmate/lib/bundles/sql/.vscodeignore
+%%DATADIR%%/plugins/textmate/lib/bundles/sql/cgmanifest.json
+%%DATADIR%%/plugins/textmate/lib/bundles/sql/language-configuration.json
+%%DATADIR%%/plugins/textmate/lib/bundles/sql/package.json
+%%DATADIR%%/plugins/textmate/lib/bundles/sql/package.nls.json
+%%DATADIR%%/plugins/textmate/lib/bundles/sql/syntaxes/sql.tmLanguage.json
+%%DATADIR%%/plugins/textmate/lib/bundles/swift/.vscodeignore
+%%DATADIR%%/plugins/textmate/lib/bundles/swift/cgmanifest.json
+%%DATADIR%%/plugins/textmate/lib/bundles/swift/language-configuration.json
+%%DATADIR%%/plugins/textmate/lib/bundles/swift/LICENSE.md
+%%DATADIR%%/plugins/textmate/lib/bundles/swift/package.json
+%%DATADIR%%/plugins/textmate/lib/bundles/swift/package.nls.json
+%%DATADIR%%/plugins/textmate/lib/bundles/swift/snippets/swift.code-snippets
+%%DATADIR%%/plugins/textmate/lib/bundles/swift/syntaxes/swift.tmLanguage.json
+%%DATADIR%%/plugins/textmate/lib/bundles/terraform/language-configuration.json
+%%DATADIR%%/plugins/textmate/lib/bundles/terraform/LICENSE
+%%DATADIR%%/plugins/textmate/lib/bundles/terraform/package.json
+%%DATADIR%%/plugins/textmate/lib/bundles/terraform/README.md
+%%DATADIR%%/plugins/textmate/lib/bundles/terraform/snippets/terraform.json
+%%DATADIR%%/plugins/textmate/lib/bundles/terraform/syntaxes/terraform.tmGrammar.json
+%%DATADIR%%/plugins/textmate/lib/bundles/twig/LICENSE.md
+%%DATADIR%%/plugins/textmate/lib/bundles/twig/package.json
+%%DATADIR%%/plugins/textmate/lib/bundles/twig/README.md
+%%DATADIR%%/plugins/textmate/lib/bundles/twig/snippets/snippets.json
+%%DATADIR%%/plugins/textmate/lib/bundles/twig/src/extension.js
+%%DATADIR%%/plugins/textmate/lib/bundles/twig/src/hover/filters.json
+%%DATADIR%%/plugins/textmate/lib/bundles/twig/src/hover/functions.json
+%%DATADIR%%/plugins/textmate/lib/bundles/twig/src/hover/twig.json
+%%DATADIR%%/plugins/textmate/lib/bundles/twig/src/languages/twig.configuration.json
+%%DATADIR%%/plugins/textmate/lib/bundles/twig/src/snippets/snippets.json
+%%DATADIR%%/plugins/textmate/lib/bundles/twig/src/syntaxes/twig.tmLanguage
+%%DATADIR%%/plugins/textmate/lib/bundles/typescript-basics/.vscodeignore
+%%DATADIR%%/plugins/textmate/lib/bundles/typescript-basics/cgmanifest.json
+%%DATADIR%%/plugins/textmate/lib/bundles/typescript-basics/language-configuration.json
+%%DATADIR%%/plugins/textmate/lib/bundles/typescript-basics/package.json
+%%DATADIR%%/plugins/textmate/lib/bundles/typescript-basics/package.nls.json
+%%DATADIR%%/plugins/textmate/lib/bundles/typescript-basics/snippets/typescript.code-snippets
+%%DATADIR%%/plugins/textmate/lib/bundles/typescript-basics/syntaxes/jsdoc.js.injection.tmLanguage.json
+%%DATADIR%%/plugins/textmate/lib/bundles/typescript-basics/syntaxes/jsdoc.ts.injection.tmLanguage.json
+%%DATADIR%%/plugins/textmate/lib/bundles/typescript-basics/syntaxes/Readme.md
+%%DATADIR%%/plugins/textmate/lib/bundles/typescript-basics/syntaxes/TypeScript.tmLanguage.json
+%%DATADIR%%/plugins/textmate/lib/bundles/typescript-basics/syntaxes/TypeScriptReact.tmLanguage.json
+%%DATADIR%%/plugins/textmate/lib/bundles/vb/.vscodeignore
+%%DATADIR%%/plugins/textmate/lib/bundles/vb/cgmanifest.json
+%%DATADIR%%/plugins/textmate/lib/bundles/vb/language-configuration.json
+%%DATADIR%%/plugins/textmate/lib/bundles/vb/package.json
+%%DATADIR%%/plugins/textmate/lib/bundles/vb/package.nls.json
+%%DATADIR%%/plugins/textmate/lib/bundles/vb/snippets/vb.code-snippets
+%%DATADIR%%/plugins/textmate/lib/bundles/vb/syntaxes/asp-vb-net.tmlanguage.json
+%%DATADIR%%/plugins/textmate/lib/bundles/viml/grammars/viml.json
+%%DATADIR%%/plugins/textmate/lib/bundles/viml/LICENSE.txt
+%%DATADIR%%/plugins/textmate/lib/bundles/viml/package.json
+%%DATADIR%%/plugins/textmate/lib/bundles/xml/.vscodeignore
+%%DATADIR%%/plugins/textmate/lib/bundles/xml/cgmanifest.json
+%%DATADIR%%/plugins/textmate/lib/bundles/xml/package.json
+%%DATADIR%%/plugins/textmate/lib/bundles/xml/package.nls.json
+%%DATADIR%%/plugins/textmate/lib/bundles/xml/syntaxes/xml.tmLanguage.json
+%%DATADIR%%/plugins/textmate/lib/bundles/xml/syntaxes/xsl.tmLanguage.json
+%%DATADIR%%/plugins/textmate/lib/bundles/xml/xml.language-configuration.json
+%%DATADIR%%/plugins/textmate/lib/bundles/xml/xsl.language-configuration.json
+%%DATADIR%%/plugins/textmate/lib/bundles/yaml/.vscodeignore
+%%DATADIR%%/plugins/textmate/lib/bundles/yaml/cgmanifest.json
+%%DATADIR%%/plugins/textmate/lib/bundles/yaml/language-configuration.json
+%%DATADIR%%/plugins/textmate/lib/bundles/yaml/package.json
+%%DATADIR%%/plugins/textmate/lib/bundles/yaml/package.nls.json
+%%DATADIR%%/plugins/textmate/lib/bundles/yaml/syntaxes/yaml.tmLanguage.json
+%%DATADIR%%/plugins/textmate/lib/textmate.jar
+%%DATADIR%%/plugins/uml/lib/uml-support.jar
+%%DATADIR%%/plugins/vcs-git/lib/git4idea-rt.jar
+%%DATADIR%%/plugins/vcs-git/lib/vcs-git.jar
+%%DATADIR%%/plugins/xpath/lib/rt/xslt-rt.jar
+%%DATADIR%%/plugins/xpath/lib/xpath.jar
+%%DATADIR%%/product-info.json
+bin/datagrip
+share/man/man1/datagrip.1.gz
+share/applications/datagrip.desktop
diff --git a/databases/jlog/Makefile b/databases/jlog/Makefile
index de64d7dffd8c..28e53169d68b 100644
--- a/databases/jlog/Makefile
+++ b/databases/jlog/Makefile
@@ -1,5 +1,3 @@
-# Created by: alfred
-
 PORTNAME=	jlog
 # version is YYYYMMDDxx <- xx is 00, 01 as needed per day
 PORTVERSION=	1.2.2.s2015012200
@@ -7,10 +5,11 @@ CATEGORIES=	databases
 
 MAINTAINER=	alfred@FreeBSD.org
 COMMENT=	Journaled log library
+WWW=		https://labs.omniti.com/labs/jlog
 
 LICENSE=	BSD3CLAUSE
 
-BUILD_DEPENDS=	autoconf-2.13:devel/autoconf213
+BUILD_DEPENDS=	autoconf2.13:devel/autoconf2.13
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	omniti-labs
@@ -31,6 +30,6 @@ PERL_CONFIGURE_ON=	--with-perl-lib=site
 PERL_CONFIGURE_WITH=	perl
 
 pre-configure:
-	(cd ${WRKSRC} && ${LOCALBASE}/bin/autoconf-2.13)
+	(cd ${WRKSRC} && ${LOCALBASE}/bin/autoconf2.13)
 
 .include <bsd.port.mk>
diff --git a/databases/jlog/pkg-descr b/databases/jlog/pkg-descr
index 0b2d27a1dde4..36268d1e89e2 100644
--- a/databases/jlog/pkg-descr
+++ b/databases/jlog/pkg-descr
@@ -7,5 +7,3 @@ while subscribers open the log and consume messages from it. "That
 sounds easy." libjlog abstracts away the need to perform log rotation
 or maintenance by publishing into fixed size log buffers and
 eliminating old log buffers when there are no more consumers pending.
-
-WWW: https://labs.omniti.com/labs/jlog
diff --git a/databases/jrobin/Makefile b/databases/jrobin/Makefile
index baeb930327c3..707bf08f8b5c 100644
--- a/databases/jrobin/Makefile
+++ b/databases/jrobin/Makefile
@@ -1,5 +1,3 @@
-# Created by: ijliao
-
 PORTNAME=	jrobin
 PORTVERSION=	1.5.14
 CATEGORIES=	databases java
@@ -9,6 +7,7 @@ EXTRACT_ONLY=
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Pure Java alternative to RRDTool
+WWW=		http://www.jrobin.org/
 
 USE_JAVA=	yes
 NO_BUILD=	yes
diff --git a/databases/jrobin/pkg-descr b/databases/jrobin/pkg-descr
index 3d699b201a9d..59ddc247629d 100644
--- a/databases/jrobin/pkg-descr
+++ b/databases/jrobin/pkg-descr
@@ -10,5 +10,3 @@ of RRDTool's original source code. JRobin does not use native functions and
 libraries, has no Runtime.exec() calls and does not require RRDTool to be
 present. JRobin is distributed as a software library (jar files) and comes
 with full java source code (LGPL licence).
-
-WWW: http://www.jrobin.org/
diff --git a/databases/jrrd/Makefile b/databases/jrrd/Makefile
index 64c2e2b722de..cbc6b8211544 100644
--- a/databases/jrrd/Makefile
+++ b/databases/jrrd/Makefile
@@ -1,5 +1,3 @@
-# Created by: Ryan T. Dean <rtdean@cytherianage.net>
-
 PORTNAME=	jrrd
 PORTVERSION=	1.1.4
 CATEGORIES=	databases java
@@ -7,6 +5,7 @@ MASTER_SITES=	SF/opennms/JRRD/stable-1.0
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Java native interface (JNI) to RRDtool
+WWW=		https://www.opennms.org/index.php/Jrrd
 
 LIB_DEPENDS=	librrd.so:databases/rrdtool
 
diff --git a/databases/jrrd/pkg-descr b/databases/jrrd/pkg-descr
index 1e8e84c25578..f658eb21cce8 100644
--- a/databases/jrrd/pkg-descr
+++ b/databases/jrrd/pkg-descr
@@ -1,4 +1,2 @@
 A Java native interface (JNI) to RRDtool, formerly a part of the base
 OpenNMS package.
-
-WWW: http://www.opennms.org/index.php/Jrrd
diff --git a/databases/kbibtex/Makefile b/databases/kbibtex/Makefile
index 05f420b2dae8..7a0d7b2e5c54 100644
--- a/databases/kbibtex/Makefile
+++ b/databases/kbibtex/Makefile
@@ -1,46 +1,42 @@
-# Created by: Markus Brueffer <markus@FreeBSD.org>
-
 PORTNAME=	kbibtex
-DISTVERSION=	0.9.2
-PORTREVISION=	20
+DISTVERSION=	0.10.0
+PORTREVISION=	9
 CATEGORIES=	databases kde
 MASTER_SITES=	KDE/stable/KBibTeX/${DISTVERSION}
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Bibliography editor for KDE
+WWW=		https://userbase.kde.org/KBibTeX
+
+LICENSE=	GPLv2+
+LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libicuuc.so:devel/icu \
 		libpoppler.so:graphics/poppler \
-		libpoppler-qt5.so:graphics/poppler-qt5 \
-		libqoauth-qt5.so:net/qoauth-qt5
+		libpoppler-qt5.so:graphics/poppler-qt5
 
-USES=		cmake compiler:c++11-lang desktop-file-utils gettext gnome \
-		iconv kde:5 qca qt:5 shared-mime-info tar:xz
-USE_GNOME=	libxml2 libxslt
+USES=		cmake compiler:c++11-lang desktop-file-utils gettext-tools \
+		kde:5 pkgconfig qt:5 shared-mime-info tar:xz xorg
 USE_KDE=	auth bookmarks codecs completion config configwidgets \
-		coreaddons crash ecm i18n iconthemes itemviews jobwidgets \
-		kio parts service solid sonnet texteditor textwidgets wallet \
-		widgetsaddons windowsystem xmlgui \
-		doctools_build
-USE_QT=		concurrent core dbus declarative gui location network \
-		printsupport webchannel widgets xml xmlpatterns \
-		buildtools_build qmake_build
+		coreaddons crash i18n iconthemes itemviews jobwidgets kio \
+		parts service solid sonnet syntaxhighlighting texteditor \
+		textwidgets wallet widgetsaddons windowsystem xmlgui \
+		doctools:build ecm:build
+USE_QT=		concurrent core dbus gui location network networkauth \
+		widgets xml xmlpatterns \
+		buildtools:build qmake:build
+USE_XORG=	x11
 USE_LDCONFIG=	yes
 
-OPTIONS_DEFINE=	WEBENGINE
-OPTIONS_DEFAULT_amd64=	WEBENGINE
-OPTIONS_DEFAULT_i386=	WEBENGINE
+CMAKE_ARGS+=	-DKDE_INSTALL_MANDIR:PATH=${PREFIX}/share/man
 
-WEBENGINE_DESC=		Add dependency on qt5-webengine
-WEBENGINE_USE=		QT=webengine
-WEBENGINE_USE_OFF=	QT=webkit
-WEBENGINE_CMAKE_BOOL_OFF=	CMAKE_DISABLE_FIND_PACKAGE_Qt5WebEngineWidgets
+OPTIONS_DEFINE=			WEBENGINE
+OPTIONS_DEFAULT_aarch64=	WEBENGINE
+OPTIONS_DEFAULT_amd64=		WEBENGINE
+OPTIONS_DEFAULT_i386=		WEBENGINE
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MWEBENGINE}
-DEPRECATED=	Uses EOL Python 2.7 via www/qt5-webengine
-EXPIRATION_DATE=2021-06-23
-.endif
+WEBENGINE_DESC=			Webpage rendering support
+WEBENGINE_USE=			QT=declarative,printsupport,webchannel,webengine
+WEBENGINE_CMAKE_BOOL_OFF=	CMAKE_DISABLE_FIND_PACKAGE_Qt5WebEngineWidgets
 
 .include <bsd.port.mk>
diff --git a/databases/kbibtex/distinfo b/databases/kbibtex/distinfo
index 45e818e62ea3..2edaae756cf7 100644
--- a/databases/kbibtex/distinfo
+++ b/databases/kbibtex/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1587962652
-SHA256 (kbibtex-0.9.2.tar.xz) = d98651fba99de8ebaf1a19bd8b3c3ac660a34cea33e4c587be30fd61466fac27
-SIZE (kbibtex-0.9.2.tar.xz) = 4196896
+TIMESTAMP = 1681627178
+SHA256 (kbibtex-0.10.0.tar.xz) = b127b240a7cd77c538619dc882a399b3c6ccd77a04428a497af906f14d09b8c4
+SIZE (kbibtex-0.10.0.tar.xz) = 3885328
diff --git a/databases/kbibtex/files/patch-src_data_file.cpp b/databases/kbibtex/files/patch-src_data_file.cpp
index a036bbe153cd..ec759bc06a96 100644
--- a/databases/kbibtex/files/patch-src_data_file.cpp
+++ b/databases/kbibtex/files/patch-src_data_file.cpp
@@ -1,8 +1,8 @@
---- src/data/file.cpp.orig	2015-08-09 18:14:19 UTC
+--- src/data/file.cpp.orig	2023-01-12 18:57:44 UTC
 +++ src/data/file.cpp
-@@ -42,8 +42,8 @@ const QString File::ProtectCasing = QLat
- const QString File::NameFormatting = QLatin1String("NameFormatting");
- const QString File::ListSeparator = QLatin1String("ListSeparator");
+@@ -44,8 +44,8 @@ const QString File::ListSeparator = QStringLiteral("Li
+ const QString File::NameFormatting = QStringLiteral("NameFormatting");
+ const QString File::ListSeparator = QStringLiteral("ListSeparator");
  
 -const quint64 valid = 0x08090a0b0c0d0e0f;
 -const quint64 invalid = 0x0102030405060708;
diff --git a/databases/kbibtex/pkg-descr b/databases/kbibtex/pkg-descr
index f91bd18e097b..5025ea2b3d77 100644
--- a/databases/kbibtex/pkg-descr
+++ b/databases/kbibtex/pkg-descr
@@ -1,3 +1 @@
 KBibTeX is a bibliography editor for KDE.
-
-WWW: http://home.gna.org/kbibtex/
diff --git a/databases/kbibtex/pkg-plist b/databases/kbibtex/pkg-plist
index 49391aa9b4cd..117b27b41cfd 100644
--- a/databases/kbibtex/pkg-plist
+++ b/databases/kbibtex/pkg-plist
@@ -1,32 +1,301 @@
 bin/kbibtex
-etc/xdg/kbibtexrc
-lib/libkbibtexconfig.so
+include/KBibTeX/config/BibTeXEntries
+include/KBibTeX/config/BibTeXFields
+include/KBibTeX/config/NotificationHub
+include/KBibTeX/config/Preferences
+include/KBibTeX/config/bibtexentries.h
+include/KBibTeX/config/bibtexfields.h
+include/KBibTeX/config/kbibtexconfig_export.h
+include/KBibTeX/config/notificationhub.h
+include/KBibTeX/config/preferences.h
+include/KBibTeX/data/Comment
+include/KBibTeX/data/Element
+include/KBibTeX/data/Entry
+include/KBibTeX/data/File
+include/KBibTeX/data/FileModel
+include/KBibTeX/data/Macro
+include/KBibTeX/data/Preamble
+include/KBibTeX/data/Value
+include/KBibTeX/data/comment.h
+include/KBibTeX/data/element.h
+include/KBibTeX/data/entry.h
+include/KBibTeX/data/file.h
+include/KBibTeX/data/filemodel.h
+include/KBibTeX/data/kbibtexdata_export.h
+include/KBibTeX/data/macro.h
+include/KBibTeX/data/preamble.h
+include/KBibTeX/data/value.h
+include/KBibTeX/global/KBibTeX
+include/KBibTeX/global/kbibtex.h
+include/KBibTeX/global/kbibtexglobal_export.h
+include/KBibTeX/gui/AssociatedFilesUI
+include/KBibTeX/gui/BasicFileView
+include/KBibTeX/gui/Clipboard
+include/KBibTeX/gui/ColorLabelWidget
+include/KBibTeX/gui/ElementEditor
+include/KBibTeX/gui/ElementWidgets
+include/KBibTeX/gui/EntryLayout
+include/KBibTeX/gui/FieldInput
+include/KBibTeX/gui/FieldLineEdit
+include/KBibTeX/gui/FieldListEdit
+include/KBibTeX/gui/FileDelegate
+include/KBibTeX/gui/FileSettingsWidget
+include/KBibTeX/gui/FileView
+include/KBibTeX/gui/FilterBar
+include/KBibTeX/gui/FindDuplicatesUI
+include/KBibTeX/gui/FindPDFUI
+include/KBibTeX/gui/GUIHelper
+include/KBibTeX/gui/HidingTabWidget
+include/KBibTeX/gui/ItalicTextItemModel
+include/KBibTeX/gui/KBibTeXPreferencesDialog
+include/KBibTeX/gui/MenuLineEdit
+include/KBibTeX/gui/PartWidget
+include/KBibTeX/gui/RadioButtonTreeView
+include/KBibTeX/gui/RangeWidget
+include/KBibTeX/gui/SettingsAbstractWidget
+include/KBibTeX/gui/SettingsColorLabelWidget
+include/KBibTeX/gui/SettingsFileExporterPDFPSWidget
+include/KBibTeX/gui/SettingsFileExporterWidget
+include/KBibTeX/gui/SettingsGeneralWidget
+include/KBibTeX/gui/SettingsGlobalKeywordsWidget
+include/KBibTeX/gui/SettingsIdSuggestionsEditor
+include/KBibTeX/gui/SettingsIdSuggestionsWidget
+include/KBibTeX/gui/SettingsUserInterfaceWidget
+include/KBibTeX/gui/SortFilterFileModel
+include/KBibTeX/gui/StarRating
+include/KBibTeX/gui/ValueListModel
+include/KBibTeX/gui/associatedfilesui.h
+include/KBibTeX/gui/basicfileview.h
+include/KBibTeX/gui/clipboard.h
+include/KBibTeX/gui/colorlabelwidget.h
+include/KBibTeX/gui/elementeditor.h
+include/KBibTeX/gui/elementwidgets.h
+include/KBibTeX/gui/entrylayout.h
+include/KBibTeX/gui/fieldinput.h
+include/KBibTeX/gui/fieldlineedit.h
+include/KBibTeX/gui/fieldlistedit.h
+include/KBibTeX/gui/filedelegate.h
+include/KBibTeX/gui/filesettingswidget.h
+include/KBibTeX/gui/fileview.h
+include/KBibTeX/gui/filterbar.h
+include/KBibTeX/gui/findduplicatesui.h
+include/KBibTeX/gui/findpdfui.h
+include/KBibTeX/gui/guihelper.h
+include/KBibTeX/gui/hidingtabwidget.h
+include/KBibTeX/gui/italictextitemmodel.h
+include/KBibTeX/gui/kbibtexgui_export.h
+include/KBibTeX/gui/kbibtexpreferencesdialog.h
+include/KBibTeX/gui/menulineedit.h
+include/KBibTeX/gui/partwidget.h
+include/KBibTeX/gui/radiobuttontreeview.h
+include/KBibTeX/gui/rangewidget.h
+include/KBibTeX/gui/settingsabstractwidget.h
+include/KBibTeX/gui/settingscolorlabelwidget.h
+include/KBibTeX/gui/settingsfileexporterpdfpswidget.h
+include/KBibTeX/gui/settingsfileexporterwidget.h
+include/KBibTeX/gui/settingsgeneralwidget.h
+include/KBibTeX/gui/settingsglobalkeywordswidget.h
+include/KBibTeX/gui/settingsidsuggestionseditor.h
+include/KBibTeX/gui/settingsidsuggestionswidget.h
+include/KBibTeX/gui/settingsuserinterfacewidget.h
+include/KBibTeX/gui/sortfilterfilemodel.h
+include/KBibTeX/gui/starrating.h
+include/KBibTeX/gui/valuelistmodel.h
+include/KBibTeX/io/BibUtils
+include/KBibTeX/io/Encoder
+include/KBibTeX/io/EncoderLaTeX
+include/KBibTeX/io/EncoderXML
+include/KBibTeX/io/FileExporter
+include/KBibTeX/io/FileExporterBibTeX
+include/KBibTeX/io/FileExporterBibTeX2HTML
+include/KBibTeX/io/FileExporterBibTeXOutput
+include/KBibTeX/io/FileExporterBibUtils
+include/KBibTeX/io/FileExporterPDF
+include/KBibTeX/io/FileExporterPS
+include/KBibTeX/io/FileExporterRIS
+include/KBibTeX/io/FileExporterRTF
+include/KBibTeX/io/FileExporterToolchain
+include/KBibTeX/io/FileExporterXML
+include/KBibTeX/io/FileExporterXSLT
+include/KBibTeX/io/FileImporter
+include/KBibTeX/io/FileImporterBibTeX
+include/KBibTeX/io/FileImporterBibUtils
+include/KBibTeX/io/FileImporterPDF
+include/KBibTeX/io/FileImporterRIS
+include/KBibTeX/io/FileInfo
+include/KBibTeX/io/TextEncoder
+include/KBibTeX/io/XSLTransform
+include/KBibTeX/io/bibutils.h
+include/KBibTeX/io/encoder.h
+include/KBibTeX/io/encoderlatex.h
+include/KBibTeX/io/encoderxml.h
+include/KBibTeX/io/fileexporter.h
+include/KBibTeX/io/fileexporterbibtex.h
+include/KBibTeX/io/fileexporterbibtex2html.h
+include/KBibTeX/io/fileexporterbibtexoutput.h
+include/KBibTeX/io/fileexporterbibutils.h
+include/KBibTeX/io/fileexporterpdf.h
+include/KBibTeX/io/fileexporterps.h
+include/KBibTeX/io/fileexporterris.h
+include/KBibTeX/io/fileexporterrtf.h
+include/KBibTeX/io/fileexportertoolchain.h
+include/KBibTeX/io/fileexporterxml.h
+include/KBibTeX/io/fileexporterxslt.h
+include/KBibTeX/io/fileimporter.h
+include/KBibTeX/io/fileimporterbibtex.h
+include/KBibTeX/io/fileimporterbibutils.h
+include/KBibTeX/io/fileimporterpdf.h
+include/KBibTeX/io/fileimporterris.h
+include/KBibTeX/io/fileinfo.h
+include/KBibTeX/io/kbibtexio_export.h
+include/KBibTeX/io/textencoder.h
+include/KBibTeX/io/xsltransform.h
+include/KBibTeX/kbibtex-version.h
+include/KBibTeX/networking/API
+include/KBibTeX/networking/AssociatedFiles
+include/KBibTeX/networking/Collection
+include/KBibTeX/networking/CollectionModel
+include/KBibTeX/networking/FindPDF
+include/KBibTeX/networking/Groups
+include/KBibTeX/networking/InternalNetworkAccessManager
+include/KBibTeX/networking/Items
+include/KBibTeX/networking/OAuthWizard
+include/KBibTeX/networking/OnlineSearchAbstract
+include/KBibTeX/networking/OnlineSearchAcmPortal
+include/KBibTeX/networking/OnlineSearchArXiv
+include/KBibTeX/networking/OnlineSearchBibsonomy
+include/KBibTeX/networking/OnlineSearchBioRxiv
+include/KBibTeX/networking/OnlineSearchCERNDS
+include/KBibTeX/networking/OnlineSearchDOI
+include/KBibTeX/networking/OnlineSearchGeneral
+include/KBibTeX/networking/OnlineSearchGoogleScholar
+include/KBibTeX/networking/OnlineSearchIDEASRePEc
+include/KBibTeX/networking/OnlineSearchIEEEXplore
+include/KBibTeX/networking/OnlineSearchIngentaConnect
+include/KBibTeX/networking/OnlineSearchInspireHep
+include/KBibTeX/networking/OnlineSearchJStor
+include/KBibTeX/networking/OnlineSearchMRLookup
+include/KBibTeX/networking/OnlineSearchMathSciNet
+include/KBibTeX/networking/OnlineSearchPubMed
+include/KBibTeX/networking/OnlineSearchSOANASAADS
+include/KBibTeX/networking/OnlineSearchScienceDirect
+include/KBibTeX/networking/OnlineSearchSemanticScholar
+include/KBibTeX/networking/OnlineSearchSimpleBibTeXDownload
+include/KBibTeX/networking/OnlineSearchSpringerLink
+include/KBibTeX/networking/TagModel
+include/KBibTeX/networking/Tags
+include/KBibTeX/networking/UrlChecker
+include/KBibTeX/networking/api.h
+include/KBibTeX/networking/associatedfiles.h
+include/KBibTeX/networking/collection.h
+include/KBibTeX/networking/collectionmodel.h
+include/KBibTeX/networking/findpdf.h
+include/KBibTeX/networking/groups.h
+include/KBibTeX/networking/internalnetworkaccessmanager.h
+include/KBibTeX/networking/items.h
+include/KBibTeX/networking/kbibtexnetworking_export.h
+include/KBibTeX/networking/oauthwizard.h
+include/KBibTeX/networking/onlinesearchabstract.h
+include/KBibTeX/networking/onlinesearchacmportal.h
+include/KBibTeX/networking/onlinesearcharxiv.h
+include/KBibTeX/networking/onlinesearchbibsonomy.h
+include/KBibTeX/networking/onlinesearchbiorxiv.h
+include/KBibTeX/networking/onlinesearchcernds.h
+include/KBibTeX/networking/onlinesearchdoi.h
+include/KBibTeX/networking/onlinesearchgeneral.h
+include/KBibTeX/networking/onlinesearchgooglescholar.h
+include/KBibTeX/networking/onlinesearchideasrepec.h
+include/KBibTeX/networking/onlinesearchieeexplore.h
+include/KBibTeX/networking/onlinesearchingentaconnect.h
+include/KBibTeX/networking/onlinesearchinspirehep.h
+include/KBibTeX/networking/onlinesearchjstor.h
+include/KBibTeX/networking/onlinesearchmathscinet.h
+include/KBibTeX/networking/onlinesearchmrlookup.h
+include/KBibTeX/networking/onlinesearchpubmed.h
+include/KBibTeX/networking/onlinesearchsciencedirect.h
+include/KBibTeX/networking/onlinesearchsemanticscholar.h
+include/KBibTeX/networking/onlinesearchsimplebibtexdownload.h
+include/KBibTeX/networking/onlinesearchsoanasaads.h
+include/KBibTeX/networking/onlinesearchspringerlink.h
+include/KBibTeX/networking/tagmodel.h
+include/KBibTeX/networking/tags.h
+include/KBibTeX/networking/urlchecker.h
+include/KBibTeX/processing/BibliographyService
+include/KBibTeX/processing/CheckBibTeX
+include/KBibTeX/processing/FindDuplicates
+include/KBibTeX/processing/IdSuggestions
+include/KBibTeX/processing/JournalAbbreviations
+include/KBibTeX/processing/LyX
+include/KBibTeX/processing/bibliographyservice.h
+include/KBibTeX/processing/checkbibtex.h
+include/KBibTeX/processing/findduplicates.h
+include/KBibTeX/processing/idsuggestions.h
+include/KBibTeX/processing/journalabbreviations.h
+include/KBibTeX/processing/kbibtexprocessing_export.h
+include/KBibTeX/processing/lyx.h
+lib/cmake/KBibTeX/KBibTeXConfig-config.cmake
+lib/cmake/KBibTeX/KBibTeXConfig-configVersion.cmake
+lib/cmake/KBibTeX/KBibTeXData-config.cmake
+lib/cmake/KBibTeX/KBibTeXData-configVersion.cmake
+lib/cmake/KBibTeX/KBibTeXGUI-config.cmake
+lib/cmake/KBibTeX/KBibTeXGUI-configVersion.cmake
+lib/cmake/KBibTeX/KBibTeXGlobal-config.cmake
+lib/cmake/KBibTeX/KBibTeXGlobal-configVersion.cmake
+lib/cmake/KBibTeX/KBibTeXIO-config.cmake
+lib/cmake/KBibTeX/KBibTeXIO-configVersion.cmake
+lib/cmake/KBibTeX/KBibTeXNetworking-config.cmake
+lib/cmake/KBibTeX/KBibTeXNetworking-configVersion.cmake
+lib/cmake/KBibTeX/KBibTeXProcessing-config.cmake
+lib/cmake/KBibTeX/KBibTeXProcessing-configVersion.cmake
 lib/libkbibtexconfig.so.0
-lib/libkbibtexconfig.so.0.9
-lib/libkbibtexdata.so
+lib/libkbibtexconfig.so.0.10
 lib/libkbibtexdata.so.0
-lib/libkbibtexdata.so.0.9
-lib/libkbibtexgui.so
+lib/libkbibtexdata.so.0.10
+lib/libkbibtexglobal.so
+lib/libkbibtexglobal.so.0
+lib/libkbibtexglobal.so.0.10
 lib/libkbibtexgui.so.0
-lib/libkbibtexgui.so.0.9
-lib/libkbibtexio.so
+lib/libkbibtexgui.so.0.10
 lib/libkbibtexio.so.0
-lib/libkbibtexio.so.0.9
-lib/libkbibtexnetworking.so
+lib/libkbibtexio.so.0.10
 lib/libkbibtexnetworking.so.0
-lib/libkbibtexnetworking.so.0.9
-lib/libkbibtexproc.so
-lib/libkbibtexproc.so.0
-lib/libkbibtexproc.so.0.9
+lib/libkbibtexnetworking.so.0.10
+lib/libkbibtexprocessing.so.0
+lib/libkbibtexprocessing.so.0.10
 %%QT_PLUGINDIR%%/kbibtexpart.so
-man/ca/man1/kbibtex.1.gz
-man/de/man1/kbibtex.1.gz
-man/it/man1/kbibtex.1.gz
-man/man1/kbibtex.1.gz
-man/nl/man1/kbibtex.1.gz
-man/sv/man1/kbibtex.1.gz
-man/uk/man1/kbibtex.1.gz
+share/man/ca/man1/kbibtex.1.gz
+share/man/de/man1/kbibtex.1.gz
+share/man/es/man1/kbibtex.1.gz
+share/man/it/man1/kbibtex.1.gz
+share/man/man1/kbibtex.1.gz
+share/man/nl/man1/kbibtex.1.gz
+share/man/pt_BR/man1/kbibtex.1.gz
+share/man/ru/man1/kbibtex.1.gz
+share/man/sv/man1/kbibtex.1.gz
+share/man/uk/man1/kbibtex.1.gz
 share/applications/org.kde.kbibtex.desktop
+share/doc/HTML/ca/kbibtex/add-macro-source.png
+share/doc/HTML/ca/kbibtex/add-macro.png
+share/doc/HTML/ca/kbibtex/config-color.png
+share/doc/HTML/ca/kbibtex/config-general.png
+share/doc/HTML/ca/kbibtex/config-id-suggestions.png
+share/doc/HTML/ca/kbibtex/config-keywords.png
+share/doc/HTML/ca/kbibtex/config-pdf.png
+share/doc/HTML/ca/kbibtex/config-saving.png
+share/doc/HTML/ca/kbibtex/config-user-interface.png
+share/doc/HTML/ca/kbibtex/element-editor.png
+share/doc/HTML/ca/kbibtex/external-tab.png
+share/doc/HTML/ca/kbibtex/file-settings.png
+share/doc/HTML/ca/kbibtex/first-run.png
+share/doc/HTML/ca/kbibtex/index.cache.bz2
+share/doc/HTML/ca/kbibtex/index.docbook
+share/doc/HTML/ca/kbibtex/list-of-documents.png
+share/doc/HTML/ca/kbibtex/list-of-values.png
+share/doc/HTML/ca/kbibtex/main-toolbar.png
+share/doc/HTML/ca/kbibtex/online-search.png
+share/doc/HTML/ca/kbibtex/reference-preview.png
+share/doc/HTML/ca/kbibtex/statistics.png
+share/doc/HTML/ca/kbibtex/zotero.png
 share/doc/HTML/de/kbibtex/index.cache.bz2
 share/doc/HTML/de/kbibtex/index.docbook
 share/doc/HTML/en/kbibtex/add-macro-source.png
@@ -86,6 +355,8 @@ share/doc/HTML/it/kbibtex/index.cache.bz2
 share/doc/HTML/it/kbibtex/index.docbook
 share/doc/HTML/nl/kbibtex/index.cache.bz2
 share/doc/HTML/nl/kbibtex/index.docbook
+share/doc/HTML/ru/kbibtex/index.cache.bz2
+share/doc/HTML/ru/kbibtex/index.docbook
 share/doc/HTML/sv/kbibtex/index.cache.bz2
 share/doc/HTML/sv/kbibtex/index.docbook
 share/doc/HTML/uk/kbibtex/add-macro-source.png
@@ -145,6 +416,7 @@ share/locale/bs/LC_MESSAGES/kbibtex.mo
 share/locale/ca/LC_MESSAGES/kbibtex.mo
 share/locale/ca@valencia/LC_MESSAGES/kbibtex.mo
 share/locale/cs/LC_MESSAGES/kbibtex.mo
+share/locale/da/LC_MESSAGES/kbibtex.mo
 share/locale/de/LC_MESSAGES/kbibtex.mo
 share/locale/en_GB/LC_MESSAGES/kbibtex.mo
 share/locale/es/LC_MESSAGES/kbibtex.mo
@@ -155,6 +427,7 @@ share/locale/gl/LC_MESSAGES/kbibtex.mo
 share/locale/hu/LC_MESSAGES/kbibtex.mo
 share/locale/ia/LC_MESSAGES/kbibtex.mo
 share/locale/it/LC_MESSAGES/kbibtex.mo
+share/locale/ka/LC_MESSAGES/kbibtex.mo
 share/locale/ko/LC_MESSAGES/kbibtex.mo
 share/locale/lt/LC_MESSAGES/kbibtex.mo
 share/locale/nb/LC_MESSAGES/kbibtex.mo
@@ -164,9 +437,11 @@ share/locale/pt/LC_MESSAGES/kbibtex.mo
 share/locale/pt_BR/LC_MESSAGES/kbibtex.mo
 share/locale/ru/LC_MESSAGES/kbibtex.mo
 share/locale/sk/LC_MESSAGES/kbibtex.mo
+share/locale/sl/LC_MESSAGES/kbibtex.mo
 share/locale/sv/LC_MESSAGES/kbibtex.mo
 share/locale/tr/LC_MESSAGES/kbibtex.mo
 share/locale/uk/LC_MESSAGES/kbibtex.mo
 share/locale/zh_CN/LC_MESSAGES/kbibtex.mo
 share/metainfo/org.kde.kbibtex.appdata.xml
 share/mime/packages/bibliography.xml
+share/qlogging-categories5/kbibtex.categories
diff --git a/databases/kdb/Makefile b/databases/kdb/Makefile
index 7df4efab58d3..810baa929348 100644
--- a/databases/kdb/Makefile
+++ b/databases/kdb/Makefile
@@ -1,20 +1,24 @@
 PORTNAME=		kdb
 DISTVERSION=		3.2.0
-PORTREVISION=		9
+PORTREVISION=		15
 CATEGORIES=		databases kde
 MASTER_SITES=		KDE/stable/${PORTNAME}/src
 DIST_SUBDIR=		KDE/${PORTNAME}
 
+PATCH_SITES=		https://invent.kde.org/libraries/kdb/-/commit/
+PATCHFILES=		b36d74f13a1421437a725fb74502c993c359392a.diff:-p1
+
 MAINTAINER=		kde@FreeBSD.org
 COMMENT=		Database connectivity and creation framework
+WWW=		https://community.kde.org/KDb
 
 LIB_DEPENDS=		libicuuc.so:devel/icu
 
-USES=			cmake compiler:c++11-lang kde:5 \
-			python qt:5 tar:xz
-USE_KDE=		coreaddons ecm i18n
-USE_QT=			core gui network widgets xml \
-			buildtools_build qmake_build
+USES=		cmake compiler:c++11-lang kde:5 python qt:5 tar:xz
+USE_KDE=	coreaddons i18n \
+		ecm:build
+USE_QT=		core gui network widgets xml \
+		buildtools:build qmake:build
 
 # In the future, these options will be moved into slave ports
 OPTIONS_DEFINE=		SQLITE MYSQL PGSQL
diff --git a/databases/kdb/distinfo b/databases/kdb/distinfo
index d1397e7a8f53..3c5803e792d8 100644
--- a/databases/kdb/distinfo
+++ b/databases/kdb/distinfo
@@ -1,3 +1,5 @@
-TIMESTAMP = 1554540562
+TIMESTAMP = 1640592017
 SHA256 (KDE/kdb/kdb-3.2.0.tar.xz) = 8f8983bc8d143832dc14bc2003ba6af1af27688e477c0c791fd61445464f2069
 SIZE (KDE/kdb/kdb-3.2.0.tar.xz) = 650180
+SHA256 (KDE/kdb/b36d74f13a1421437a725fb74502c993c359392a.diff) = f6c87efb353ab55cd09e894ff07a80811441ce7d932e5bc16628b4e78a6e4d7f
+SIZE (KDE/kdb/b36d74f13a1421437a725fb74502c993c359392a.diff) = 2448
diff --git a/databases/kdb/pkg-descr b/databases/kdb/pkg-descr
index 5920893496fd..5fcf0ecd4ae8 100644
--- a/databases/kdb/pkg-descr
+++ b/databases/kdb/pkg-descr
@@ -3,5 +3,3 @@ general-purpose C++ Qt library and set of plugins delivering support for
 various database vendors.
 
 It is a part of the Kexi project and the general Calligra Suite.
-
-WWW: https://community.kde.org/KDb
diff --git a/databases/kexi/Makefile b/databases/kexi/Makefile
index 261295c2ead4..04fe726291ed 100644
--- a/databases/kexi/Makefile
+++ b/databases/kexi/Makefile
@@ -1,27 +1,31 @@
 PORTNAME=		kexi
 DISTVERSION=		3.2.0
-PORTREVISION=		3
+PORTREVISION=	8
 CATEGORIES=		databases kde
 MASTER_SITES=		KDE/stable/${PORTNAME}/src
 DIST_SUBDIR=		KDE/${PORTNAME}
 
 MAINTAINER=		kde@FreeBSD.org
 COMMENT=		Visual database applications creator
+WWW=		https://www.kexi-project.org/
 
 LIB_DEPENDS=		libKDb3.so:databases/kdb \
 			libKPropertyCore3.so:x11-toolkits/kproperty \
 			libKReport3.so:textproc/kreport
 
-USES=			cmake compiler:c++11-lang desktop-file-utils gettext gnome \
-			iconv kde:5 pkgconfig qt:5 tar:xz
-USE_GNOME=		glib20
-USE_KDE=		auth bookmarks codecs completion config \
-			configwidgets coreaddons crash ecm guiaddons i18n \
-			iconthemes itemviews jobwidgets kio parts service \
-			solid sonnet texteditor textwidgets widgetsaddons \
-			xmlgui breeze-icons_build
-USE_QT=			concurrent core dbus declarative gui network printsupport webkit widgets xml \
-			buildtools_build qmake_build
+USES=		cmake compiler:c++11-lang desktop-file-utils gettext gl gnome \
+		iconv kde:5 pkgconfig qt:5 tar:xz xorg
+USE_GL=			gl
+USE_GNOME=	glib20
+USE_KDE=	auth bookmarks codecs completion config configwidgets \
+		coreaddons crash guiaddons i18n iconthemes itemviews \
+		jobwidgets kio parts service solid sonnet syntaxhighlighting \
+		texteditor textwidgets widgetsaddons windowsystem xmlgui \
+		breeze-icons:build ecm:build
+USE_QT=		concurrent core dbus declarative gui network printsupport \
+		widgets xml \
+		buildtools:build qmake:build testlib:build
+USE_XORG=	x11
 
 CONFLICTS_INSTALL=	calligra-2*
 
diff --git a/databases/kexi/pkg-descr b/databases/kexi/pkg-descr
index c59da16e1a14..cb14bf6f20d7 100644
--- a/databases/kexi/pkg-descr
+++ b/databases/kexi/pkg-descr
@@ -1,5 +1,3 @@
 Kexi is an open source visual database applications creator,
 a long-awaited competitor for programs like MS Access
 or Filemaker.
-
-WWW: http://www.kexi-project.org/
diff --git a/databases/kexi/pkg-plist b/databases/kexi/pkg-plist
index 1826e1be0f5d..8aabfa51479b 100644
--- a/databases/kexi/pkg-plist
+++ b/databases/kexi/pkg-plist
@@ -36,7 +36,6 @@ lib/libkformdesigner3.2.so
 lib/libkformdesigner3.2.so.3.2
 lib/libkformdesigner3.2.so.3.2.0
 %%QT_PLUGINDIR%%/kexi/3.2/forms/widgets/org.kexi-project.form.widgets.main.so
-%%QT_PLUGINDIR%%/kexi/3.2/forms/widgets/org.kexi-project.form.widgets.web-browser.so
 %%QT_PLUGINDIR%%/kexi/3.2/kexi_csvimportexportplugin.so
 %%QT_PLUGINDIR%%/kexi/3.2/kexi_formplugin.so
 %%QT_PLUGINDIR%%/kexi/3.2/kexi_migrationplugin.so
@@ -86,7 +85,6 @@ share/icons/hicolor/64x64/apps/kexi-3.2.png
 %%DATADIR%%/3.2/examples/Simple_Database.kexi
 %%DATADIR%%/3.2/icons/kexi_breeze.rcc
 %%DATADIR%%/3.2/icons/org.kexi-project.form.widgets.main_breeze.rcc
-%%DATADIR%%/3.2/icons/org.kexi-project.form.widgets.web-browser_breeze.rcc
 %%DATADIR%%/3.2/status/contribution_details.ui
 %%DATADIR%%/3.2/status/contribution_help.ui
 %%DATADIR%%/3.2/status/status.rcc
diff --git a/databases/keydb/Makefile b/databases/keydb/Makefile
new file mode 100644
index 000000000000..6b17a882faa6
--- /dev/null
+++ b/databases/keydb/Makefile
@@ -0,0 +1,91 @@
+PORTNAME=	keydb
+DISTVERSIONPREFIX=	v
+DISTVERSION=	6.3.4
+CATEGORIES=	databases
+
+MAINTAINER=	zi@FreeBSD.org
+COMMENT=	High performance fork of Redis--a persistent key-value database
+WWW=		https://docs.keydb.dev/
+
+LICENSE=	BSD3CLAUSE
+LICENSE_FILE=	${WRKSRC}/COPYING
+
+BROKEN_i386=	assertion failed: static_assert(sizeof(long) == sizeof(long long),"")
+
+LIB_DEPENDS=	libuuid.so:misc/e2fsprogs-libuuid \
+		liblz4.so:archivers/liblz4 \
+		libsnappy.so:archivers/snappy \
+		libzstd.so:archivers/zstd
+
+USES=		compiler:c11 cpe gmake localbase:ldflags pkgconfig:build
+
+USE_GITHUB=	yes
+GH_ACCOUNT=	Snapchat
+GH_PROJECT=	KeyDB
+USE_RC_SUBR=	keydb keydb_sentinel
+
+MAKE_ENV=	OPTIMIZATION= \
+		V=yo
+
+LDFLAGS+=	-lpthread -lm -lexecinfo
+
+SUB_FILES=	pkg-message
+SUB_LIST=	PORTNAME=${PORTNAME} \
+		KEYDB_DBDIR=${KEYDB_DBDIR} \
+		KEYDB_LOGDIR=${KEYDB_LOGDIR} \
+		KEYDB_RUNDIR=${KEYDB_RUNDIR} \
+		KEYDB_USER=${USERS}
+
+USERS=		keydb
+GROUPS=		keydb
+
+PLIST_SUB=	KEYDB_DBDIR=${KEYDB_DBDIR} \
+		KEYDB_GROUP=${GROUPS} \
+		KEYDB_LOGDIR=${KEYDB_LOGDIR} \
+		KEYDB_RUNDIR=${KEYDB_RUNDIR} \
+		KEYDB_USER=${USERS}
+
+OPTIONS_DEFINE=	TLS
+OPTIONS_DEFAULT=TLS
+
+TLS_DESC=	Use TLS (openssl req.)
+
+TLS_USES=	ssl
+TLS_MAKE_ENV=	BUILD_TLS=yes
+
+BIN_FILES=	keydb-benchmark keydb-check-aof keydb-check-rdb keydb-cli \
+		keydb-sentinel keydb-server
+
+KEYDB_DBDIR?=	/var/db/keydb
+KEYDB_RUNDIR?=	/var/run/keydb
+KEYDB_LOGDIR?=	/var/log/keydb
+
+.include <bsd.port.pre.mk>
+
+.if ${ARCH} == i386 && !${CFLAGS:M-march=*}
+# Needed for __atomic_fetch_add_8
+USE_GCC=	yes
+CFLAGS+=	-march=i586
+.endif
+
+.if defined(_ADDFLAGS)
+CFLAGS+=	-fPIC
+LDFLAGS+=	-Wl,-E
+.endif
+
+post-patch:
+	${REINPLACE_CMD} 's|/usr/local|${PREFIX}|g' ${WRKSRC}/src/Makefile
+
+post-build:
+	${SED} ${SUB_LIST:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
+		${WRKSRC}/keydb.conf > ${WRKDIR}/keydb.conf
+
+do-install:
+	${INSTALL_PROGRAM} ${BIN_FILES:C!^!${WRKSRC}/src/!} ${STAGEDIR}${PREFIX}/bin/
+	${INSTALL_DATA} ${WRKDIR}/keydb.conf ${STAGEDIR}${PREFIX}/etc/keydb.conf.sample
+	${INSTALL_DATA} ${WRKSRC}/sentinel.conf ${STAGEDIR}${PREFIX}/etc/keydb_sentinel.conf.sample
+	${MKDIR} ${STAGEDIR}${KEYDB_LOGDIR} \
+		${STAGEDIR}${KEYDB_DBDIR} \
+		${STAGEDIR}${KEYDB_RUNDIR}
+
+.include <bsd.port.post.mk>
diff --git a/databases/keydb/distinfo b/databases/keydb/distinfo
new file mode 100644
index 000000000000..afd69f927fce
--- /dev/null
+++ b/databases/keydb/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1698955833
+SHA256 (Snapchat-KeyDB-v6.3.4_GH0.tar.gz) = 229190b251f921e05aff7b0d2f04b5676c198131e2abbec1e2cfb2e61215e2f3
+SIZE (Snapchat-KeyDB-v6.3.4_GH0.tar.gz) = 5942328
diff --git a/databases/keydb/files/keydb.in b/databases/keydb/files/keydb.in
new file mode 100644
index 000000000000..3179aa20ce1f
--- /dev/null
+++ b/databases/keydb/files/keydb.in
@@ -0,0 +1,67 @@
+#!/bin/sh
+
+# PROVIDE: keydb
+# REQUIRE: LOGIN
+# BEFORE:  securelevel
+# KEYWORD: shutdown
+
+# Add the following line to /etc/rc.conf to enable `keydb':
+#
+#keydb_enable="YES"
+#
+# Define profiles here to run separate keydb instances:
+#
+#keydb_profiles="foo bar" #  Script uses %%PREFIX%%/etc/keydb-NAME.conf respectively.
+#			     For correct script working please update pidfile entries in
+#			     keydb-NAME.conf files.
+
+. /etc/rc.subr
+
+name="keydb"
+rcvar="${name}_enable"
+
+extra_commands="reload"
+
+command="%%PREFIX%%/bin/keydb-server"
+pidfile="%%KEYDB_RUNDIR%%/$name.pid"
+
+# read configuration and set defaults
+load_rc_config "$name"
+: ${keydb_enable="NO"}
+: ${keydb_user="%%KEYDB_USER%%"}
+: ${keydb_config="%%PREFIX%%/etc/$name.conf"}
+
+command_args="${keydb_config}"
+required_files="${keydb_config}"
+
+_profile_exists() {
+	for _p in ${keydb_profiles}; do
+		[ "${_p}" = "$1" ] && return 1;
+	done
+	return 0
+}
+
+if [ $# -eq 2 ]; then
+	_profile=$2
+	_profile_exists $_profile
+	_exists=$?
+	[ ${_exists} -ne 1 ] && {
+		echo "`basename %%PREFIX%%/etc/rc.d/keydb`: no '$2' in 'keydb_profiles'"
+		exit 1
+	};
+	echo "-- Profile: ${_profile} --"
+	config_file="%%PREFIX%%/etc/${name}-${_profile}.conf"
+	command_args="${config_file}"
+	pidfile="%%KEYDB_RUNDIR%%/${_profile}.pid"
+	required_files="${config_file}"
+elif [ -n "${keydb_profiles}" ]; then
+	_swap=$*; shift; _profiles=$*
+	_profiles=${_profiles:-${keydb_profiles}}
+	set -- ${_swap}
+	for _profile in ${_profiles}; do
+		%%PREFIX%%/etc/rc.d/keydb $1 ${_profile}
+	done
+	exit 0
+fi
+
+run_rc_command "$1"
diff --git a/databases/keydb/files/keydb_sentinel.in b/databases/keydb/files/keydb_sentinel.in
new file mode 100644
index 000000000000..b2b88e779834
--- /dev/null
+++ b/databases/keydb/files/keydb_sentinel.in
@@ -0,0 +1,39 @@
+#!/bin/sh
+
+# PROVIDE: keydb_sentinel
+# REQUIRE: LOGIN
+# BEFORE:  securelevel
+# KEYWORD: shutdown
+
+# Add the following line to /etc/rc.conf to enable `sentinel':
+#
+#keydb_sentinel_enable="YES"
+#
+
+. /etc/rc.subr
+
+name="keydb_sentinel"
+rcvar="${name}_enable"
+
+command="/usr/local/bin/keydb-sentinel"
+pidfile="/var/run/keydb/$name.pid"
+
+# read configuration and set defaults
+load_rc_config "$name"
+: ${keydb_sentinel_enable="NO"}
+: ${keydb_sentinel_user="keydb"}
+: ${keydb_sentinel_config="/usr/local/etc/$name.conf"}
+
+command_args="${keydb_sentinel_config} --daemonize yes --pidfile ${pidfile}"
+required_files="${keydb_sentinel_config}"
+start_precmd="${name}_checks"
+restart_precmd="${name}_checks"
+
+keydb_sentinel_checks()
+{
+    if [ x`id -u ${keydb_sentinel_user}` != x`stat -f %u ${keydb_sentinel_config}` ]; then
+	err 1 "${keydb_sentinel_config} must be owned by user ${keydb_sentinel_user}"
+    fi
+}
+
+run_rc_command "$1"
diff --git a/databases/keydb/files/patch-deps-hiredis-Makefile b/databases/keydb/files/patch-deps-hiredis-Makefile
new file mode 100644
index 000000000000..78f5c6184fb4
--- /dev/null
+++ b/databases/keydb/files/patch-deps-hiredis-Makefile
@@ -0,0 +1,40 @@
+--- deps/hiredis/Makefile.orig	2023-10-25 15:54:51 UTC
++++ deps/hiredis/Makefile
+@@ -21,7 +21,7 @@ HIREDIS_PATCH=$(shell grep HIREDIS_PATCH hiredis.h | a
+ HIREDIS_SONAME=$(shell grep HIREDIS_SONAME hiredis.h | awk '{print $$3}')
+ 
+ # Installation related variables and target
+-PREFIX?=/usr/local
++PREFIX?=${PREFIX}
+ INCLUDE_PATH?=include/hiredis
+ LIBRARY_PATH?=lib
+ PKGCONF_PATH?=pkgconfig
+@@ -44,10 +44,9 @@ export REDIS_TEST_CONFIG
+ # Fallback to gcc when $CC is not in $PATH.
+ CC:=$(shell sh -c 'type $${CC%% *} >/dev/null 2>/dev/null && echo $(CC) || echo gcc')
+ CXX:=$(shell sh -c 'type $${CXX%% *} >/dev/null 2>/dev/null && echo $(CXX) || echo g++')
+-OPTIMIZATION?=-O3
+ WARNINGS=-Wall -W -Wstrict-prototypes -Wwrite-strings -Wno-missing-field-initializers
+ DEBUG_FLAGS?= -g -ggdb
+-REAL_CFLAGS=$(OPTIMIZATION) -fPIC $(CPPFLAGS) $(CFLAGS) $(WARNINGS) $(DEBUG_FLAGS)
++REAL_CFLAGS=$(OPTIMIZATION) -fPIC $(CFLAGS) $(WARNINGS) $(DEBUG_FLAGS) $(PLATFORM_FLAGS)
+ REAL_LDFLAGS=$(LDFLAGS)
+ 
+ DYLIBSUFFIX=so
+@@ -106,6 +105,16 @@ ifeq ($(uname_S),Darwin)
+   DYLIB_MAKE_CMD=$(CC) -dynamiclib -Wl,-install_name,$(PREFIX)/$(LIBRARY_PATH)/$(DYLIB_MINOR_NAME) -o $(DYLIBNAME) $(LDFLAGS)
+   SSL_DYLIB_MAKE_CMD=$(CC) -dynamiclib -Wl,-install_name,$(PREFIX)/$(LIBRARY_PATH)/$(SSL_DYLIB_MINOR_NAME) -o $(SSL_DYLIBNAME) $(LDFLAGS) $(SSL_LDFLAGS)
+   DYLIB_PLUGIN=-Wl,-undefined -Wl,dynamic_lookup
++endif
++ifeq ($(uname_S),FreeBSD)
++  CFLAGS?=$(CFLAGS)
++  CCLINK?=pthread
++  LDFLAGS?=-L. -Wl,-rpath,.
++  DYLIBNAME?=libhiredis.so
++  DYLIB_MAKE_CMD?=$(CC) -o ${DYLIBNAME} ${OBJ}
++  STLIBNAME?=libhiredis.a
++  STLIB_MAKE_CMD?=ar rcs ${STLIBNAME} ${OBJ}
++  SSL_LDFLAGS+=${OPENSSL_LDFLAGS}
+ endif
+ 
+ all: $(DYLIBNAME) $(STLIBNAME) hiredis-test $(PKGCONFNAME)
diff --git a/databases/keydb/files/patch-deps-hiredis-net.c b/databases/keydb/files/patch-deps-hiredis-net.c
new file mode 100644
index 000000000000..0dfde3135238
--- /dev/null
+++ b/databases/keydb/files/patch-deps-hiredis-net.c
@@ -0,0 +1,39 @@
+--- deps/hiredis/net.c.orig	2019-11-28 19:32:05 UTC
++++ deps/hiredis/net.c
+@@ -178,14 +178,34 @@
+         __redisSetError(c,REDIS_ERR_OTHER,strerror(errno));
+         return REDIS_ERR;
+     }
+-#else
+-#if defined(__GLIBC__) && !defined(__FreeBSD_kernel__)
++#elif defined(__GLIBC__)
+     if (setsockopt(fd, IPPROTO_TCP, TCP_KEEPIDLE, &val, sizeof(val)) < 0) {
+         __redisSetError(c,REDIS_ERR_OTHER,strerror(errno));
+         return REDIS_ERR;
+     }
+ 
+     val = interval/3;
++    if (val == 0) val = 1;
++    if (setsockopt(fd, IPPROTO_TCP, TCP_KEEPINTVL, &val, sizeof(val)) < 0) {
++        __redisSetError(c,REDIS_ERR_OTHER,strerror(errno));
++        return REDIS_ERR;
++    }
++
++    val = 3;
++    if (setsockopt(fd, IPPROTO_TCP, TCP_KEEPCNT, &val, sizeof(val)) < 0) {
++        __redisSetError(c,REDIS_ERR_OTHER,strerror(errno));
++        return REDIS_ERR;
++    }
++#else
++#if !defined(__sun) && defined(TCP_KEEPIDLE) && defined(TCP_KEEPINTL) && \
++    defined(TCP_KEEPCNT)
++    val = interval;
++    if (setsockopt(fd, IPPROTO_TCP, TCP_KEEPIDLE, &val, sizeof(val)) < 0) {
++        __redisSetError(c,REDIS_ERR_OTHER,strerror(errno));
++        return REDIS_ERR;
++    }
++
++    val = internal/3;
+     if (val == 0) val = 1;
+     if (setsockopt(fd, IPPROTO_TCP, TCP_KEEPINTVL, &val, sizeof(val)) < 0) {
+         __redisSetError(c,REDIS_ERR_OTHER,strerror(errno));
diff --git a/databases/redis5/files/patch-deps-linenoise-Makefile b/databases/keydb/files/patch-deps-linenoise-Makefile
index aef0f10966af..aef0f10966af 100644
--- a/databases/redis5/files/patch-deps-linenoise-Makefile
+++ b/databases/keydb/files/patch-deps-linenoise-Makefile
diff --git a/databases/keydb/files/patch-deps_Makefile b/databases/keydb/files/patch-deps_Makefile
new file mode 100644
index 000000000000..f5352bbfde00
--- /dev/null
+++ b/databases/keydb/files/patch-deps_Makefile
@@ -0,0 +1,10 @@
+--- deps/Makefile.orig	2023-10-25 17:16:24 UTC
++++ deps/Makefile
+@@ -38,7 +38,6 @@ distclean:
+ 	-(cd linenoise && $(MAKE) clean) > /dev/null || true
+ 	-(cd lua && $(MAKE) clean) > /dev/null || true
+ 	-(cd jemalloc && [ -f Makefile ] && $(MAKE) distclean) > /dev/null || true
+-	-(cd rocksdb && $(MAKE) clean) > /dev/null || true
+ 	-(cd hdr_histogram && $(MAKE) clean) > /dev/null || true
+ 	-(rm -f .make-*)
+ 
diff --git a/databases/redis5/files/patch-deps_lua_src_lua__cjson.c b/databases/keydb/files/patch-deps_lua_src_lua__cjson.c
index 0bb150504c67..0bb150504c67 100644
--- a/databases/redis5/files/patch-deps_lua_src_lua__cjson.c
+++ b/databases/keydb/files/patch-deps_lua_src_lua__cjson.c
diff --git a/databases/keydb/files/patch-keydb.conf b/databases/keydb/files/patch-keydb.conf
new file mode 100644
index 000000000000..e28a0d9305df
--- /dev/null
+++ b/databases/keydb/files/patch-keydb.conf
@@ -0,0 +1,38 @@
+--- keydb.conf.orig	2023-10-25 15:57:07 UTC
++++ keydb.conf
+@@ -281,7 +281,7 @@ tcp-keepalive 300
+ 
+ # By default KeyDB does not run as a daemon. Use 'yes' if you need it.
+ # Note that KeyDB will write a pid file in /var/run/keydb.pid when daemonized.
+-daemonize no
++daemonize yes
+ 
+ # If you run KeyDB from upstart or systemd, KeyDB can interact with your
+ # supervision tree. Options:
+@@ -304,7 +304,7 @@ supervised no
+ #
+ # Creating a pid file is best effort: if KeyDB is not able to create it
+ # nothing bad happens, the server will start and run normally.
+-pidfile /var/run/keydb_6379.pid
++pidfile %%KEYDB_RUNDIR%%/keydb.pid
+ 
+ # Specify the server verbosity level.
+ # This can be one of:
+@@ -317,7 +317,7 @@ loglevel notice
+ # Specify the log file name. Also the empty string can be used to force
+ # KeyDB to log on the standard output. Note that if you use standard
+ # output for logging but daemonize, logs will be sent to /dev/null
+-logfile ""
++logfile %%KEYDB_LOGDIR%%/keydb.log
+ 
+ # To enable logging to the system logger, just set 'syslog-enabled' to yes,
+ # and optionally update the other syslog parameters to suit your needs.
+@@ -470,7 +470,7 @@ rdb-del-sync-files no
+ # The Append Only File will also be created inside this directory.
+ #
+ # Note that you must specify a directory here, not a file name.
+-dir ./
++dir %%KEYDB_DBDIR%%/
+ 
+ ################################# REPLICATION #################################
+ 
diff --git a/databases/keydb/files/patch-src-Makefile b/databases/keydb/files/patch-src-Makefile
new file mode 100644
index 000000000000..c88dc47461f5
--- /dev/null
+++ b/databases/keydb/files/patch-src-Makefile
@@ -0,0 +1,37 @@
+--- src/Makefile.orig	2023-11-02 20:13:44 UTC
++++ src/Makefile
+@@ -138,7 +138,6 @@ endif	
+ # Override default settings if possible
+ -include .make-settings
+ 
+-DEBUG=-g -ggdb
+ FINAL_CFLAGS=$(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) $(KEYDB_CFLAGS) $(REDIS_CFLAGS)
+ FINAL_CXXFLAGS=$(CXX_STD) $(WARN) $(OPT) $(DEBUG) $(CXXFLAGS) $(KEYDB_CFLAGS) $(REDIS_CFLAGS)
+ FINAL_LDFLAGS=$(LDFLAGS) $(KEYDB_LDFLAGS) $(DEBUG)
+@@ -214,9 +213,6 @@ else
+ ifeq ($(uname_S),FreeBSD)
+ 	# FreeBSD
+ 	FINAL_LIBS+= -lpthread -luuid -lexecinfo
+-	FINAL_CFLAGS+= -I/usr/local/include
+-	FINAL_CXXFLAGS+= -I/usr/local/include
+-	FINAL_LDFLAGS+= -L/usr/local/lib
+ 	ifeq ($(USE_BACKTRACE),yes)
+ 	    FINAL_CFLAGS+= -DUSE_BACKTRACE
+ 	endif
+@@ -355,7 +351,7 @@ else
+ endif
+ 
+ # Alpine OS doesn't have support for the execinfo backtrace library we use for debug, so we provide an alternate implementation using libwunwind.
+-OS := $(shell cat /etc/os-release | grep ID= | head -n 1 | cut -d'=' -f2)
++OS := $(shell uname -r)
+ ifeq ($(OS),alpine)
+     FINAL_CXXFLAGS+=-DUNW_LOCAL_ONLY
+ 	FINAL_CXXFLAGS+=-DALPINE
+@@ -426,7 +422,6 @@ persist-settings: distclean
+ 	echo PREV_FINAL_CFLAGS=$(FINAL_CFLAGS) >> .make-settings
+ 	echo PREV_FINAL_CXXFLAGS=$(FINAL_CXXFLAGS) >> .make-settings
+ 	echo PREV_FINAL_LDFLAGS=$(FINAL_LDFLAGS) >> .make-settings
+-	-(cd modules && $(MAKE))
+ 	-(cd ../deps && $(MAKE) $(DEPENDENCY_TARGETS))
+ 
+ .PHONY: persist-settings
diff --git a/databases/redis6/files/patch-src-mkreleasehdr.sh b/databases/keydb/files/patch-src-mkreleasehdr.sh
index e48b3174d315..e48b3174d315 100644
--- a/databases/redis6/files/patch-src-mkreleasehdr.sh
+++ b/databases/keydb/files/patch-src-mkreleasehdr.sh
diff --git a/databases/keydb/files/pkg-message.in b/databases/keydb/files/pkg-message.in
new file mode 100644
index 000000000000..8014e03653d3
--- /dev/null
+++ b/databases/keydb/files/pkg-message.in
@@ -0,0 +1,11 @@
+[
+{ type: install
+  message: <<EOM
+      To setup "%%PORTNAME%%" you need to edit the configuration file:
+      %%PREFIX%%/etc/%%PORTNAME%%.conf
+
+      To run keydb from startup, add %%PORTNAME%%_enable="YES"
+      in your /etc/rc.conf.
+EOM
+}
+]
diff --git a/databases/keydb/pkg-descr b/databases/keydb/pkg-descr
new file mode 100644
index 000000000000..91aa8af57a9b
--- /dev/null
+++ b/databases/keydb/pkg-descr
@@ -0,0 +1,18 @@
+KeyDB is a high performance fork of Redis with a focus on multithreading,
+memory efficiency, and high throughput. In addition to performance
+improvements, KeyDB offers features such as Active Replication, FLASH
+Storage and Subkey Expires. KeyDB has a MVCC architecture that allows you
+to execute queries such as KEYS and SCAN without blocking the database and
+degrading performance.
+
+KeyDB maintains full compatibility with the Redis protocol, modules, and
+scripts. This includes the atomicity guarantees for scripts and transactions.
+Because KeyDB keeps in sync with Redis development KeyDB is a superset of
+Redis functionality, making KeyDB a drop in replacement for existing Redis
+deployments.
+
+On the same hardware KeyDB can achieve significantly higher throughput than
+Redis. Active-Replication simplifies hot-spare failover allowing you to
+easily distribute writes over replicas and use simple TCP based load
+balancing/failover. KeyDB's higher performance allows you to do more on less
+hardware which reduces operation costs and complexity.
diff --git a/databases/keydb/pkg-plist b/databases/keydb/pkg-plist
new file mode 100644
index 000000000000..05562806edb7
--- /dev/null
+++ b/databases/keydb/pkg-plist
@@ -0,0 +1,11 @@
+bin/keydb-benchmark
+bin/keydb-check-aof
+bin/keydb-check-rdb
+bin/keydb-cli
+bin/keydb-sentinel
+bin/keydb-server
+@sample etc/keydb.conf.sample
+@sample(%%KEYDB_USER%%,%%KEYDB_GROUP%%,) etc/keydb_sentinel.conf.sample
+@dir(%%KEYDB_USER%%,%%KEYDB_GROUP%%,) %%KEYDB_DBDIR%%
+@dir(%%KEYDB_USER%%,%%KEYDB_GROUP%%,) %%KEYDB_LOGDIR%%
+@dir(%%KEYDB_USER%%,%%KEYDB_GROUP%%,) %%KEYDB_RUNDIR%%
diff --git a/databases/kyotocabinet/Makefile b/databases/kyotocabinet/Makefile
index 2410a4afe53a..55089b058f8b 100644
--- a/databases/kyotocabinet/Makefile
+++ b/databases/kyotocabinet/Makefile
@@ -1,13 +1,12 @@
-# Created by: Akinori MUSHA aka knu <knu@idaemons.org>
-
 PORTNAME=	kyotocabinet
-PORTVERSION=	1.2.79
+PORTVERSION=	1.2.80
 CATEGORIES=	databases
 MASTER_SITES=	https://dbmx.net/kyotocabinet/pkg/ \
 		LOCAL/sunpoet
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Straightforward implementation of DBM
+WWW=		https://dbmx.net/kyotocabinet/
 
 LICENSE=	GPLv3
 
diff --git a/databases/kyotocabinet/distinfo b/databases/kyotocabinet/distinfo
index eaab79cb1d46..7dd5848f795f 100644
--- a/databases/kyotocabinet/distinfo
+++ b/databases/kyotocabinet/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1608366102
-SHA256 (kyotocabinet-1.2.79.tar.gz) = 67fb1da4ae2a86f15bb9305f26caa1a7c0c27d525464c71fd732660a95ae3e1d
-SIZE (kyotocabinet-1.2.79.tar.gz) = 943804
+TIMESTAMP = 1681843824
+SHA256 (kyotocabinet-1.2.80.tar.gz) = 4c85d736668d82920bfdbdb92ac3d66b7db1108f09581a769dd9160a02def349
+SIZE (kyotocabinet-1.2.80.tar.gz) = 942543
diff --git a/databases/kyotocabinet/pkg-descr b/databases/kyotocabinet/pkg-descr
index fcb1294de435..5ab8dfd20acc 100644
--- a/databases/kyotocabinet/pkg-descr
+++ b/databases/kyotocabinet/pkg-descr
@@ -19,5 +19,3 @@ C++, C, Java, Python, Ruby, Perl, and Lua. Kyoto Cabinet is available
 on platforms which have API conforming to C++03 with the TR1 library
 extensions. Kyoto Cabinet is a free software licensed under the GNU
 General Public License.
-
-WWW: https://dbmx.net/kyotocabinet/
diff --git a/databases/kyotocabinet/pkg-plist b/databases/kyotocabinet/pkg-plist
index a46607fc872a..a287e2a87efe 100644
--- a/databases/kyotocabinet/pkg-plist
+++ b/databases/kyotocabinet/pkg-plist
@@ -39,23 +39,6 @@ lib/libkyotocabinet.so
 lib/libkyotocabinet.so.16
 lib/libkyotocabinet.so.16.14.0
 libdata/pkgconfig/kyotocabinet.pc
-man/man1/kccachetest.1.gz
-man/man1/kcdirmgr.1.gz
-man/man1/kcdirtest.1.gz
-man/man1/kcforestmgr.1.gz
-man/man1/kcforesttest.1.gz
-man/man1/kcgrasstest.1.gz
-man/man1/kchashmgr.1.gz
-man/man1/kchashtest.1.gz
-man/man1/kclangctest.1.gz
-man/man1/kcpolymgr.1.gz
-man/man1/kcpolytest.1.gz
-man/man1/kcprototest.1.gz
-man/man1/kcstashtest.1.gz
-man/man1/kctreemgr.1.gz
-man/man1/kctreetest.1.gz
-man/man1/kcutilmgr.1.gz
-man/man1/kcutiltest.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/COPYING
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
 %%PORTDOCS%%%%DOCSDIR%%/FOSSEXCEPTION
@@ -330,3 +313,20 @@ man/man1/kcutiltest.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/doc/logo.png
 %%PORTDOCS%%%%DOCSDIR%%/doc/spex.html
 %%PORTDOCS%%%%DOCSDIR%%/kyotocabinet.idl
+share/man/man1/kccachetest.1.gz
+share/man/man1/kcdirmgr.1.gz
+share/man/man1/kcdirtest.1.gz
+share/man/man1/kcforestmgr.1.gz
+share/man/man1/kcforesttest.1.gz
+share/man/man1/kcgrasstest.1.gz
+share/man/man1/kchashmgr.1.gz
+share/man/man1/kchashtest.1.gz
+share/man/man1/kclangctest.1.gz
+share/man/man1/kcpolymgr.1.gz
+share/man/man1/kcpolytest.1.gz
+share/man/man1/kcprototest.1.gz
+share/man/man1/kcstashtest.1.gz
+share/man/man1/kctreemgr.1.gz
+share/man/man1/kctreetest.1.gz
+share/man/man1/kcutilmgr.1.gz
+share/man/man1/kcutiltest.1.gz
diff --git a/databases/kyototycoon/Makefile b/databases/kyototycoon/Makefile
index 0e0580931a5a..924e439b2052 100644
--- a/databases/kyototycoon/Makefile
+++ b/databases/kyototycoon/Makefile
@@ -1,5 +1,3 @@
-# Created by: Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>
-
 PORTNAME=	kyototycoon
 PORTVERSION=	0.9.56
 PORTREVISION=	6
@@ -9,6 +7,7 @@ MASTER_SITES=	https://dbmx.net/kyototycoon/pkg/ \
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Handy cache/storage server
+WWW=		https://dbmx.net/kyototycoon/
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
diff --git a/databases/kyototycoon/pkg-descr b/databases/kyototycoon/pkg-descr
index 1abec501f62d..2f4f51542585 100644
--- a/databases/kyototycoon/pkg-descr
+++ b/databases/kyototycoon/pkg-descr
@@ -17,5 +17,3 @@ notification facilities such as "epoll" and "kqueue" of underlying systems. The
 server supports high availability mechanisms, which are hot backup, update
 logging, and asynchronous replication. The server can embed Lua, a lightweight
 script language so that you can define arbitrary operations of the database.
-
-WWW: https://dbmx.net/kyototycoon/
diff --git a/databases/kyototycoon/pkg-plist b/databases/kyototycoon/pkg-plist
index 1ec7a92d384b..9984ef594150 100644
--- a/databases/kyototycoon/pkg-plist
+++ b/databases/kyototycoon/pkg-plist
@@ -26,11 +26,11 @@ lib/libkyototycoon.so.2.19.0
 libdata/pkgconfig/kyototycoon.pc
 libexec/ktplugdbvoid.so
 libexec/ktplugservmemc.so
-man/man1/ktremotemgr.1.gz
-man/man1/ktremotetest.1.gz
-man/man1/ktserver.1.gz
-man/man1/kttimedmgr.1.gz
-man/man1/kttimedtest.1.gz
-man/man1/ktutilmgr.1.gz
-man/man1/ktutilserv.1.gz
-man/man1/ktutiltest.1.gz
+share/man/man1/ktremotemgr.1.gz
+share/man/man1/ktremotetest.1.gz
+share/man/man1/ktserver.1.gz
+share/man/man1/kttimedmgr.1.gz
+share/man/man1/kttimedtest.1.gz
+share/man/man1/ktutilmgr.1.gz
+share/man/man1/ktutilserv.1.gz
+share/man/man1/ktutiltest.1.gz
diff --git a/databases/ldb15/Makefile b/databases/ldb15/Makefile
index c5e4515decc8..9eb3083e510f 100644
--- a/databases/ldb15/Makefile
+++ b/databases/ldb15/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=		ldb
 PORTVERSION=		1.5.6
-PORTREVISION=		2
+PORTREVISION=		3
 PORTEPOCH=		0
 CATEGORIES=		databases
 MASTER_SITES=		SAMBA
@@ -8,6 +8,7 @@ PKGNAMESUFFIX?=		15
 
 MAINTAINER=		timur@FreeBSD.org
 COMMENT=		LDAP-like embedded database
+WWW=		https://ldb.samba.org/
 
 LICENSE=		GPLv3+
 
@@ -23,26 +24,24 @@ LDB_DEPENDS=		talloc>=2.2.0:devel/talloc \
 			cmocka>=1.1.3:sysutils/cmocka \
 			popt>=0:devel/popt
 
-CONFLICTS_INSTALL=	ldb-1.1.* ldb1[2-46]-1.*
+CONFLICTS_INSTALL=	ldb[0-9][0-9] samba4[0-9][0-9] # include/ldb.h lib/python3.8/site-packages/_ldb_text.py
 
 #FLAVORS=		default nopython
 #nopython_PKGNAMESUFFIX=	-nopython
 #nopython_CONFLICTS=	ldb
 #default_CONFLICTS=	ldb-nopython
 
-USES=			compiler gettext-runtime pkgconfig waf
+USES=			compiler gettext-runtime ldap pkgconfig waf
 USE_LDCONFIG=		yes
 WAF_CMD=		${BUILD_WRKSRC}/buildtools/bin/waf
 CONFIGURE_LOG=		${BUILD_WRKSRC}/bin/config.log
 
-USE_OPENLDAP=		yes
 PKGCONFIGDIR?=		${PREFIX}/libdata/pkgconfig
 PLIST_SUB+=		PKGCONFIGDIR=${PKGCONFIGDIR:S;${PREFIX}/;;}
 
 CONFIGURE_ARGS+=	--bundled-libraries=!talloc,!tevent,!tdb,!popt,!cmocka \
 			--with-modulesdir=${PREFIX}/lib/shared-modules \
 			--with-privatelibdir=${PREFIX}/lib/ldb \
-			--mandir=${MANPREFIX}/man \
 			--with-openldap=${LOCALBASE} \
 			--disable-rpath \
 			--without-gettext
@@ -97,7 +96,7 @@ PLIST_FILES=		include/ldb_version.h \
 USES+=			python:build,test
 CONFIGURE_ARGS+=	--disable-python
 .else
-USES+=			gettext-runtime python:3.6+
+USES+=			gettext-runtime python
 
 PLIST_FILES+=		include/pyldb.h \
 			lib/libpyldb-util${PYTHON_EXT_SUFFIX}.so \
@@ -109,13 +108,20 @@ PLIST_FILES+=		include/pyldb.h \
 
 .include <bsd.port.pre.mk>
 
+CFLAGS+=		-I${LOCALBASE}/include
+LDFLAGS+=		-L${LOCALBASE}/lib
+
+# Some symbols in ldb's linker version scripts are not defined, but since the
+# scripts are generated dynamically, suppress errors with lld >= 17 due to these
+# undefined symbols.
+LDFLAGS+=		-Wl,--undefined-version
+
 .if ! ${PORT_OPTIONS:MMANPAGES}
 CONFIGURE_ENV+=		XSLTPROC="true"
 .else
 BUILD_DEPENDS+=		${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:textproc/docbook-xsl \
 			xsltproc:textproc/libxslt
 .endif
-CONFIGURE_ENV+=		CFLAGS=-I${LOCALBASE}/include LDFLAGS=-L${LOCALBASE}/lib
 
 # No fancy color error messages
 .if ${COMPILER_TYPE} == "clang"
@@ -124,14 +130,14 @@ CFLAGS+=		-fno-color-diagnostics
 CONFIGURE_ENV+=		NOCOLOR=yes
 MAKE_ENV+=		NOCOLOR=yes
 
-LDB_MAN1=		man/man1/ldbadd.1.gz \
-			man/man1/ldbdel.1.gz \
-			man/man1/ldbedit.1.gz \
-			man/man1/ldbmodify.1.gz \
-			man/man1/ldbrename.1.gz \
-			man/man1/ldbsearch.1.gz
+LDB_MAN1=		share/man/man1/ldbadd.1.gz \
+			share/man/man1/ldbdel.1.gz \
+			share/man/man1/ldbedit.1.gz \
+			share/man/man1/ldbmodify.1.gz \
+			share/man/man1/ldbrename.1.gz \
+			share/man/man1/ldbsearch.1.gz
 
-LDB_MAN3=		man/man3/ldb.3.gz
+LDB_MAN3=		share/man/man3/ldb.3.gz
 
 PLIST_FILES+=		${LDB_MAN1} ${LDB_MAN3}
 
diff --git a/databases/ldb15/pkg-descr b/databases/ldb15/pkg-descr
index 92cd13b5db8c..6e55f91b65a7 100644
--- a/databases/ldb15/pkg-descr
+++ b/databases/ldb15/pkg-descr
@@ -5,5 +5,3 @@ within an application.
 
 In some ways it can be seen as a intermediate solution between key-value
 pair databases and a real LDAP database.
-
-WWW: https://ldb.samba.org/
diff --git a/databases/ldb20/Makefile b/databases/ldb20/Makefile
index a54eec8c0e03..2d6b568b1db4 100644
--- a/databases/ldb20/Makefile
+++ b/databases/ldb20/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=		ldb
 PORTVERSION=		2.0.10
-PORTREVISION=		1
+PORTREVISION=		2
 PORTEPOCH=		0
 CATEGORIES=		databases
 MASTER_SITES=		SAMBA
@@ -8,6 +8,7 @@ PKGNAMESUFFIX?=		20
 
 MAINTAINER=		timur@FreeBSD.org
 COMMENT=		LDAP-like embedded database
+WWW=		https://ldb.samba.org/
 
 LICENSE=		GPLv3+
 
@@ -23,21 +24,19 @@ LDB_DEPENDS=		talloc>=2.2.0:devel/talloc \
 			cmocka>=1.1.3:sysutils/cmocka \
 			popt>=0:devel/popt
 
-CONFLICTS_INSTALL=	ldb-1.1.* ldb1[2-9]-1.* ldb2[1-9]-2.*
+CONFLICTS_INSTALL=	ldb[0-9][0-9] # include/ldb.h
 
-USES=			compiler pkgconfig waf
+USES=			compiler ldap pkgconfig waf
 USE_LDCONFIG=		yes
 WAF_CMD=		${BUILD_WRKSRC}/buildtools/bin/waf
 CONFIGURE_LOG=		${BUILD_WRKSRC}/bin/config.log
 
-USE_OPENLDAP=		yes
 PKGCONFIGDIR?=		${PREFIX}/libdata/pkgconfig
 PLIST_SUB+=		PKGCONFIGDIR=${PKGCONFIGDIR:S;${PREFIX}/;;}
 
 CONFIGURE_ARGS+=	--bundled-libraries=!talloc,!tevent,!tdb,!popt,!cmocka \
 			--with-modulesdir=${PREFIX}/lib/shared-modules \
 			--with-privatelibdir=${PREFIX}/lib/ldb \
-			--mandir=${MANPREFIX}/man \
 			--with-openldap=${LOCALBASE} \
 			--disable-rpath \
 			--without-gettext
@@ -88,10 +87,15 @@ PLIST_FILES=		include/ldb_version.h \
 			${LDB_LIBS} \
 			${PKGCONFIGDIR}/ldb.pc
 
-
 .include <bsd.port.pre.mk>
 
-CONFIGURE_ENV+=		CFLAGS=-I${LOCALBASE}/include LDFLAGS=-L${LOCALBASE}/lib
+CFLAGS+=		-I${LOCALBASE}/include
+LDFLAGS+=		-L${LOCALBASE}/lib
+
+# Some symbols in ldb's linker version scripts are not defined, but since the
+# scripts are generated dynamically, suppress errors with lld >= 17 due to these
+# undefined symbols.
+LDFLAGS+=		-Wl,--undefined-version
 
 .if ! ${PORT_OPTIONS:MMANPAGES}
 CONFIGURE_ENV+=		XSLTPROC="true"
@@ -104,7 +108,7 @@ BUILD_DEPENDS+=		${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:textproc/do
 USES+=			python:build,test
 CONFIGURE_ARGS+=	--disable-python
 .else
-USES+=			gettext-runtime python:3.6+
+USES+=			gettext-runtime python
 
 PLIST_FILES+=		include/pyldb.h \
 			lib/libpyldb-util${PYTHON_EXT_SUFFIX}.so \
@@ -121,14 +125,14 @@ CFLAGS+=		-fno-color-diagnostics
 CONFIGURE_ENV+=		NOCOLOR=yes
 MAKE_ENV+=		NOCOLOR=yes
 
-LDB_MAN1=		man/man1/ldbadd.1.gz \
-			man/man1/ldbdel.1.gz \
-			man/man1/ldbedit.1.gz \
-			man/man1/ldbmodify.1.gz \
-			man/man1/ldbrename.1.gz \
-			man/man1/ldbsearch.1.gz
+LDB_MAN1=		share/man/man1/ldbadd.1.gz \
+			share/man/man1/ldbdel.1.gz \
+			share/man/man1/ldbedit.1.gz \
+			share/man/man1/ldbmodify.1.gz \
+			share/man/man1/ldbrename.1.gz \
+			share/man/man1/ldbsearch.1.gz
 
-LDB_MAN3=		man/man3/ldb.3.gz
+LDB_MAN3=		share/man/man3/ldb.3.gz
 
 PLIST_FILES+=		${LDB_MAN1} ${LDB_MAN3}
 
diff --git a/databases/ldb20/pkg-descr b/databases/ldb20/pkg-descr
index 92cd13b5db8c..6e55f91b65a7 100644
--- a/databases/ldb20/pkg-descr
+++ b/databases/ldb20/pkg-descr
@@ -5,5 +5,3 @@ within an application.
 
 In some ways it can be seen as a intermediate solution between key-value
 pair databases and a real LDAP database.
-
-WWW: https://ldb.samba.org/
diff --git a/databases/ldb21/Makefile b/databases/ldb21/Makefile
index c5044bda873a..a842425afd1f 100644
--- a/databases/ldb21/Makefile
+++ b/databases/ldb21/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=		ldb
 PORTVERSION=		2.1.5
-PORTREVISION=		1
+PORTREVISION=		2
 PORTEPOCH=		0
 CATEGORIES=		databases
 MASTER_SITES=		SAMBA
@@ -8,6 +8,7 @@ PKGNAMESUFFIX?=		21
 
 MAINTAINER=		timur@FreeBSD.org
 COMMENT=		LDAP-like embedded database
+WWW=		https://ldb.samba.org/
 
 LICENSE=		GPLv3+
 
@@ -22,22 +23,20 @@ LDB_DEPENDS=		talloc>=2.2.0:devel/talloc \
 			cmocka>=1.1.3:sysutils/cmocka \
 			popt>=0:devel/popt
 
-USES=			compiler pkgconfig waf
+USES=			compiler ldap pkgconfig waf
 
-CONFLICTS_INSTALL=	ldb-1.1.* ldb1[2-9]-1.* ldb2[02-9]-2.*
+CONFLICTS_INSTALL=	ldb[0-9][0-9] # include/ldb.h
 
 USE_LDCONFIG=		yes
 WAF_CMD=		${BUILD_WRKSRC}/buildtools/bin/waf
 CONFIGURE_LOG=		${BUILD_WRKSRC}/bin/config.log
 
-USE_OPENLDAP=		yes
 PKGCONFIGDIR?=		${PREFIX}/libdata/pkgconfig
 PLIST_SUB+=		PKGCONFIGDIR=${PKGCONFIGDIR:S;${PREFIX}/;;}
 
 CONFIGURE_ARGS+=	--bundled-libraries=!talloc,!tevent,!tdb,!popt,!cmocka \
 			--with-modulesdir=${PREFIX}/lib/shared-modules \
 			--with-privatelibdir=${PREFIX}/lib/ldb \
-			--mandir=${MANPREFIX}/man \
 			--with-openldap=${LOCALBASE} \
 			--disable-rpath \
 			--without-gettext
@@ -93,6 +92,11 @@ PLIST_FILES=		include/ldb_version.h \
 CFLAGS+=		-I${LOCALBASE}/include
 LDFLAGS+=		-L${LOCALBASE}/lib
 
+# Some symbols in ldb's linker version scripts are not defined, but since the
+# scripts are generated dynamically, suppress errors with lld >= 17 due to these
+# undefined symbols.
+LDFLAGS+=		-Wl,--undefined-version
+
 .if ! ${PORT_OPTIONS:MMANPAGES}
 CONFIGURE_ENV+=		XSLTPROC="true"
 .else
@@ -104,7 +108,7 @@ BUILD_DEPENDS+=		${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:textproc/do
 USES+=			python:build,test
 CONFIGURE_ARGS+=	--disable-python
 .else
-USES+=			gettext-runtime python:3.6+
+USES+=			gettext-runtime python
 
 PLIST_FILES+=		include/pyldb.h \
 			lib/libpyldb-util${PYTHON_EXT_SUFFIX}.so \
@@ -121,14 +125,14 @@ CFLAGS+=		-fno-color-diagnostics
 CONFIGURE_ENV+=		NOCOLOR=yes
 MAKE_ENV+=		NOCOLOR=yes
 
-LDB_MAN1=		man/man1/ldbadd.1.gz \
-			man/man1/ldbdel.1.gz \
-			man/man1/ldbedit.1.gz \
-			man/man1/ldbmodify.1.gz \
-			man/man1/ldbrename.1.gz \
-			man/man1/ldbsearch.1.gz
+LDB_MAN1=		share/man/man1/ldbadd.1.gz \
+			share/man/man1/ldbdel.1.gz \
+			share/man/man1/ldbedit.1.gz \
+			share/man/man1/ldbmodify.1.gz \
+			share/man/man1/ldbrename.1.gz \
+			share/man/man1/ldbsearch.1.gz
 
-LDB_MAN3=		man/man3/ldb.3.gz
+LDB_MAN3=		share/man/man3/ldb.3.gz
 
 PLIST_FILES+=		${LDB_MAN1} ${LDB_MAN3}
 
diff --git a/databases/ldb21/pkg-descr b/databases/ldb21/pkg-descr
index 92cd13b5db8c..6e55f91b65a7 100644
--- a/databases/ldb21/pkg-descr
+++ b/databases/ldb21/pkg-descr
@@ -5,5 +5,3 @@ within an application.
 
 In some ways it can be seen as a intermediate solution between key-value
 pair databases and a real LDAP database.
-
-WWW: https://ldb.samba.org/
diff --git a/databases/ldb22/Makefile b/databases/ldb22/Makefile
index d5847542daa0..961c3f0a4f3f 100644
--- a/databases/ldb22/Makefile
+++ b/databases/ldb22/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=		ldb
-PORTVERSION=		2.2.1
-PORTREVISION=		1
+PORTVERSION=		2.2.3
+PORTREVISION=	1
 PORTEPOCH=		0
 CATEGORIES=		databases
 MASTER_SITES=		SAMBA
@@ -8,6 +8,7 @@ PKGNAMESUFFIX?=		22
 
 MAINTAINER=		timur@FreeBSD.org
 COMMENT=		LDAP-like embedded database
+WWW=		https://ldb.samba.org/
 
 LICENSE=		GPLv3+
 
@@ -24,22 +25,20 @@ TEST_DEPENDS=		${LDB_DEPENDS} \
 			cmocka>=1.1.3:sysutils/cmocka
 RUN_DEPENDS=		${LDB_DEPENDS}
 
-USES=			compiler pkgconfig waf
+USES=			compiler ldap pkgconfig waf
 
-CONFLICTS_INSTALL=	ldb-1.1.* ldb1[2-9]-1.* ldb2[013-9]-2.*
+CONFLICTS_INSTALL=	ldb[0-9][0-9] # include/ldb.h
 
 USE_LDCONFIG=		yes
 WAF_CMD=		${BUILD_WRKSRC}/buildtools/bin/waf
 CONFIGURE_LOG=		${BUILD_WRKSRC}/bin/config.log
 
-USE_OPENLDAP=		yes
 PKGCONFIGDIR?=		${PREFIX}/libdata/pkgconfig
 PLIST_SUB+=		PKGCONFIGDIR=${PKGCONFIGDIR:S;${PREFIX}/;;}
 
 CONFIGURE_ARGS+=	--bundled-libraries=!talloc,!tevent,!tdb,!popt,!cmocka \
 			--with-modulesdir=${PREFIX}/lib/shared-modules \
 			--with-privatelibdir=${PREFIX}/lib/ldb \
-			--mandir=${MANPREFIX}/man \
 			--with-openldap=${LOCALBASE} \
 			--disable-rpath \
 			--without-gettext
@@ -95,6 +94,11 @@ PLIST_FILES=		include/ldb_version.h \
 CFLAGS+=		-I${LOCALBASE}/include
 LDFLAGS+=		-L${LOCALBASE}/lib
 
+# Some symbols in ldb's linker version scripts are not defined, but since the
+# scripts are generated dynamically, suppress errors with lld >= 17 due to these
+# undefined symbols.
+LDFLAGS+=		-Wl,--undefined-version
+
 .if ! ${PORT_OPTIONS:MMANPAGES}
 CONFIGURE_ENV+=		XSLTPROC="true"
 .else
@@ -106,7 +110,7 @@ BUILD_DEPENDS+=		${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:textproc/do
 USES+=			python:build,test
 CONFIGURE_ARGS+=	--disable-python
 .else
-USES+=			gettext-runtime python:3.6+
+USES+=			gettext-runtime python
 
 PLIST_FILES+=		include/pyldb.h \
 			lib/libpyldb-util${PYTHON_EXT_SUFFIX}.so \
@@ -123,14 +127,14 @@ CFLAGS+=		-fno-color-diagnostics
 CONFIGURE_ENV+=		NOCOLOR=yes
 MAKE_ENV+=		NOCOLOR=yes
 
-LDB_MAN1=		man/man1/ldbadd.1.gz \
-			man/man1/ldbdel.1.gz \
-			man/man1/ldbedit.1.gz \
-			man/man1/ldbmodify.1.gz \
-			man/man1/ldbrename.1.gz \
-			man/man1/ldbsearch.1.gz
+LDB_MAN1=		share/man/man1/ldbadd.1.gz \
+			share/man/man1/ldbdel.1.gz \
+			share/man/man1/ldbedit.1.gz \
+			share/man/man1/ldbmodify.1.gz \
+			share/man/man1/ldbrename.1.gz \
+			share/man/man1/ldbsearch.1.gz
 
-LDB_MAN3=		man/man3/ldb.3.gz
+LDB_MAN3=		share/man/man3/ldb.3.gz
 
 PLIST_FILES+=		${LDB_MAN1} ${LDB_MAN3}
 
diff --git a/databases/ldb22/distinfo b/databases/ldb22/distinfo
index c4e7ece8b3eb..a27fcb8ca4a4 100644
--- a/databases/ldb22/distinfo
+++ b/databases/ldb22/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1616901739
-SHA256 (ldb-2.2.1.tar.gz) = f7eb8f6f399c7240a6f0fe8e591b6f51ccacbfc563c5f53d5a641a21aa7e9804
-SIZE (ldb-2.2.1.tar.gz) = 1676819
+TIMESTAMP = 1635893596
+SHA256 (ldb-2.2.3.tar.gz) = a2f54ff1bc05f0a8d1e08300936cb9a5224ffe09357fe16d4f689beeaba3e941
+SIZE (ldb-2.2.3.tar.gz) = 1708827
diff --git a/databases/ldb22/files/patch-samba-4.14.14-for-ldb22 b/databases/ldb22/files/patch-samba-4.14.14-for-ldb22
new file mode 100644
index 000000000000..456fec5f9fce
--- /dev/null
+++ b/databases/ldb22/files/patch-samba-4.14.14-for-ldb22
@@ -0,0 +1,825 @@
+diff --git ./modules/rdn_name.c ./modules/rdn_name.c
+index e69ad9315ae..25cffe07591 100644
+--- ./modules/rdn_name.c
++++ ./modules/rdn_name.c
+@@ -545,7 +545,7 @@ static int rdn_name_modify(struct ldb_module *module, struct ldb_request *req)
+ 	if (e != NULL) {
+ 		ldb_asprintf_errstring(ldb, "Modify of 'distinguishedName' on %s not permitted, must use 'rename' operation instead",
+ 				       ldb_dn_get_linearized(req->op.mod.message->dn));
+-		if (e->flags == LDB_FLAG_MOD_REPLACE) {
++		if (LDB_FLAG_MOD_TYPE(e->flags) == LDB_FLAG_MOD_REPLACE) {
+ 			return LDB_ERR_CONSTRAINT_VIOLATION;
+ 		} else {
+ 			return LDB_ERR_UNWILLING_TO_PERFORM;
+diff --git ./common/ldb_msg.c ./common/ldb_msg.c
+index 57dfc5a04c2..2a9ce384bb9 100644
+--- ./common/ldb_msg.c
++++ ./common/ldb_msg.c
+@@ -833,11 +833,7 @@ void ldb_msg_sort_elements(struct ldb_message *msg)
+ 		       ldb_msg_element_compare_name);
+ }
+ 
+-/*
+-  shallow copy a message - copying only the elements array so that the caller
+-  can safely add new elements without changing the message
+-*/
+-struct ldb_message *ldb_msg_copy_shallow(TALLOC_CTX *mem_ctx,
++static struct ldb_message *ldb_msg_copy_shallow_impl(TALLOC_CTX *mem_ctx,
+ 					 const struct ldb_message *msg)
+ {
+ 	struct ldb_message *msg2;
+@@ -863,6 +859,35 @@ failed:
+ 	return NULL;
+ }
+ 
++/*
++  shallow copy a message - copying only the elements array so that the caller
++  can safely add new elements without changing the message
++*/
++struct ldb_message *ldb_msg_copy_shallow(TALLOC_CTX *mem_ctx,
++					 const struct ldb_message *msg)
++{
++	struct ldb_message *msg2;
++	unsigned int i;
++
++	msg2 = ldb_msg_copy_shallow_impl(mem_ctx, msg);
++	if (msg2 == NULL) {
++		return NULL;
++	}
++
++	for (i = 0; i < msg2->num_elements; ++i) {
++		/*
++		 * Mark this message's elements as sharing their values with the
++		 * original message, so that we don't inadvertently modify or
++		 * free them. We don't mark the original message element as
++		 * shared, so the original message element should not be
++		 * modified or freed while the shallow copy lives.
++		 */
++		struct ldb_message_element *el = &msg2->elements[i];
++		el->flags |= LDB_FLAG_INTERNAL_SHARED_VALUES;
++	}
++
++        return msg2;
++}
+ 
+ /*
+   copy a message, allocating new memory for all parts
+@@ -873,7 +898,7 @@ struct ldb_message *ldb_msg_copy(TALLOC_CTX *mem_ctx,
+ 	struct ldb_message *msg2;
+ 	unsigned int i, j;
+ 
+-	msg2 = ldb_msg_copy_shallow(mem_ctx, msg);
++	msg2 = ldb_msg_copy_shallow_impl(mem_ctx, msg);
+ 	if (msg2 == NULL) return NULL;
+ 
+ 	if (msg2->dn != NULL) {
+@@ -894,6 +919,12 @@ struct ldb_message *ldb_msg_copy(TALLOC_CTX *mem_ctx,
+ 				goto failed;
+ 			}
+ 		}
++
++                /*
++                 * Since we copied this element's values, we can mark them as
++                 * not shared.
++		 */
++		el->flags &= ~LDB_FLAG_INTERNAL_SHARED_VALUES;
+ 	}
+ 
+ 	return msg2;
+diff --git ./include/ldb_module.h ./include/ldb_module.h
+index 8c1e5ee7936..4c7c85a17f0 100644
+--- ./include/ldb_module.h
++++ ./include/ldb_module.h
+@@ -96,6 +96,12 @@ struct ldb_module;
+  */
+ #define LDB_FLAG_INTERNAL_FORCE_UNIQUE_INDEX 0x100
+ 
++/*
++ * indicates that this element's values are shared with another element (for
++ * example, in a shallow copy of an ldb_message) and should not be freed
++ */
++#define LDB_FLAG_INTERNAL_SHARED_VALUES 0x200
++
+ /* an extended match rule that always fails to match */
+ #define SAMBA_LDAP_MATCH_ALWAYS_FALSE "1.3.6.1.4.1.7165.4.5.1"
+ 
+diff --git ./common/ldb_msg.c ./common/ldb_msg.c
+index 2a9ce384bb9..44d3b29e9a7 100644
+--- ./common/ldb_msg.c
++++ ./common/ldb_msg.c
+@@ -417,6 +417,47 @@ int ldb_msg_add(struct ldb_message *msg,
+ 	return LDB_SUCCESS;
+ }
+ 
++/*
++ * add a value to a message element
++ */
++int ldb_msg_element_add_value(TALLOC_CTX *mem_ctx,
++			      struct ldb_message_element *el,
++			      const struct ldb_val *val)
++{
++	struct ldb_val *vals;
++
++	if (el->flags & LDB_FLAG_INTERNAL_SHARED_VALUES) {
++		/*
++		 * Another message is using this message element's values array,
++		 * so we don't want to make any modifications to the original
++		 * message, or potentially invalidate its own values by calling
++		 * talloc_realloc(). Make a copy instead.
++		 */
++		el->flags &= ~LDB_FLAG_INTERNAL_SHARED_VALUES;
++
++		vals = talloc_array(mem_ctx, struct ldb_val,
++				    el->num_values + 1);
++		if (vals == NULL) {
++			return LDB_ERR_OPERATIONS_ERROR;
++		}
++
++		if (el->values != NULL) {
++			memcpy(vals, el->values, el->num_values * sizeof(struct ldb_val));
++		}
++	} else {
++		vals = talloc_realloc(mem_ctx, el->values, struct ldb_val,
++				      el->num_values + 1);
++		if (vals == NULL) {
++			return LDB_ERR_OPERATIONS_ERROR;
++		}
++	}
++	el->values = vals;
++	el->values[el->num_values] = *val;
++	el->num_values++;
++
++	return LDB_SUCCESS;
++}
++
+ /*
+   add a value to a message
+ */
+@@ -426,7 +467,6 @@ int ldb_msg_add_value(struct ldb_message *msg,
+ 		      struct ldb_message_element **return_el)
+ {
+ 	struct ldb_message_element *el;
+-	struct ldb_val *vals;
+ 	int ret;
+ 
+ 	el = ldb_msg_find_element(msg, attr_name);
+@@ -437,14 +477,10 @@ int ldb_msg_add_value(struct ldb_message *msg,
+ 		}
+ 	}
+ 
+-	vals = talloc_realloc(msg->elements, el->values, struct ldb_val,
+-			      el->num_values+1);
+-	if (!vals) {
+-		return LDB_ERR_OPERATIONS_ERROR;
++	ret = ldb_msg_element_add_value(msg->elements, el, val);
++	if (ret != LDB_SUCCESS) {
++		return ret;
+ 	}
+-	el->values = vals;
+-	el->values[el->num_values] = *val;
+-	el->num_values++;
+ 
+ 	if (return_el) {
+ 		*return_el = el;
+diff --git ./include/ldb.h ./include/ldb.h
+index bc44157eaf4..129beefeaf5 100644
+--- ./include/ldb.h
++++ ./include/ldb.h
+@@ -1981,6 +1981,12 @@ int ldb_msg_add_empty(struct ldb_message *msg,
+ 		int flags,
+ 		struct ldb_message_element **return_el);
+ 
++/**
++   add a value to a message element
++*/
++int ldb_msg_element_add_value(TALLOC_CTX *mem_ctx,
++			      struct ldb_message_element *el,
++			      const struct ldb_val *val);
+ /**
+    add a element to a ldb_message
+ */
+diff --git ./common/ldb_msg.c ./common/ldb_msg.c
+index 44d3b29e9a7..9cd7998e21c 100644
+--- ./common/ldb_msg.c
++++ ./common/ldb_msg.c
+@@ -509,12 +509,15 @@ int ldb_msg_add_steal_value(struct ldb_message *msg,
+ 
+ 
+ /*
+-  add a string element to a message
++  add a string element to a message, specifying flags
+ */
+-int ldb_msg_add_string(struct ldb_message *msg,
+-		       const char *attr_name, const char *str)
++int ldb_msg_add_string_flags(struct ldb_message *msg,
++			     const char *attr_name, const char *str,
++			     int flags)
+ {
+ 	struct ldb_val val;
++	int ret;
++	struct ldb_message_element *el = NULL;
+ 
+ 	val.data = discard_const_p(uint8_t, str);
+ 	val.length = strlen(str);
+@@ -524,7 +527,25 @@ int ldb_msg_add_string(struct ldb_message *msg,
+ 		return LDB_SUCCESS;
+ 	}
+ 
+-	return ldb_msg_add_value(msg, attr_name, &val, NULL);
++	ret = ldb_msg_add_value(msg, attr_name, &val, &el);
++	if (ret != LDB_SUCCESS) {
++		return ret;
++	}
++
++	if (flags != 0) {
++		el->flags = flags;
++	}
++
++	return LDB_SUCCESS;
++}
++
++/*
++  add a string element to a message
++*/
++int ldb_msg_add_string(struct ldb_message *msg,
++		       const char *attr_name, const char *str)
++{
++	return ldb_msg_add_string_flags(msg, attr_name, str, 0);
+ }
+ 
+ /*
+@@ -586,6 +607,142 @@ int ldb_msg_add_fmt(struct ldb_message *msg,
+ 	return ldb_msg_add_steal_value(msg, attr_name, &val);
+ }
+ 
++static int ldb_msg_append_value_impl(struct ldb_message *msg,
++				     const char *attr_name,
++				     const struct ldb_val *val,
++				     int flags,
++				     struct ldb_message_element **return_el)
++{
++	struct ldb_message_element *el = NULL;
++	int ret;
++
++	ret = ldb_msg_add_empty(msg, attr_name, flags, &el);
++	if (ret != LDB_SUCCESS) {
++		return ret;
++	}
++
++	ret = ldb_msg_element_add_value(msg->elements, el, val);
++	if (ret != LDB_SUCCESS) {
++		return ret;
++	}
++
++	if (return_el != NULL) {
++		*return_el = el;
++	}
++
++	return LDB_SUCCESS;
++}
++
++/*
++  append a value to a message
++*/
++int ldb_msg_append_value(struct ldb_message *msg,
++			 const char *attr_name,
++			 const struct ldb_val *val,
++			 int flags)
++{
++	return ldb_msg_append_value_impl(msg, attr_name, val, flags, NULL);
++}
++
++/*
++  append a value to a message, stealing it into the 'right' place
++*/
++int ldb_msg_append_steal_value(struct ldb_message *msg,
++			       const char *attr_name,
++			       struct ldb_val *val,
++			       int flags)
++{
++	int ret;
++	struct ldb_message_element *el = NULL;
++
++	ret = ldb_msg_append_value_impl(msg, attr_name, val, flags, &el);
++	if (ret == LDB_SUCCESS) {
++		talloc_steal(el->values, val->data);
++	}
++	return ret;
++}
++
++/*
++  append a string element to a message, stealing it into the 'right' place
++*/
++int ldb_msg_append_steal_string(struct ldb_message *msg,
++				const char *attr_name, char *str,
++				int flags)
++{
++	struct ldb_val val;
++
++	val.data = (uint8_t *)str;
++	val.length = strlen(str);
++
++	if (val.length == 0) {
++		/* allow empty strings as non-existent attributes */
++		return LDB_SUCCESS;
++	}
++
++	return ldb_msg_append_steal_value(msg, attr_name, &val, flags);
++}
++
++/*
++  append a string element to a message
++*/
++int ldb_msg_append_string(struct ldb_message *msg,
++			  const char *attr_name, const char *str, int flags)
++{
++	struct ldb_val val;
++
++	val.data = discard_const_p(uint8_t, str);
++	val.length = strlen(str);
++
++	if (val.length == 0) {
++		/* allow empty strings as non-existent attributes */
++		return LDB_SUCCESS;
++	}
++
++	return ldb_msg_append_value(msg, attr_name, &val, flags);
++}
++
++/*
++  append a DN element to a message
++  WARNING: this uses the linearized string from the dn, and does not
++  copy the string.
++*/
++int ldb_msg_append_linearized_dn(struct ldb_message *msg, const char *attr_name,
++				 struct ldb_dn *dn, int flags)
++{
++	char *str = ldb_dn_alloc_linearized(msg, dn);
++
++	if (str == NULL) {
++		/* we don't want to have unknown DNs added */
++		return LDB_ERR_OPERATIONS_ERROR;
++	}
++
++	return ldb_msg_append_steal_string(msg, attr_name, str, flags);
++}
++
++/*
++  append a printf formatted element to a message
++*/
++int ldb_msg_append_fmt(struct ldb_message *msg, int flags,
++		       const char *attr_name, const char *fmt, ...)
++{
++	struct ldb_val val;
++	va_list ap;
++	char *str = NULL;
++
++	va_start(ap, fmt);
++	str = talloc_vasprintf(msg, fmt, ap);
++	va_end(ap);
++
++	if (str == NULL) {
++		return LDB_ERR_OPERATIONS_ERROR;
++	}
++
++	val.data   = (uint8_t *)str;
++	val.length = strlen(str);
++
++	return ldb_msg_append_steal_value(msg, attr_name, &val, flags);
++}
++
+ /*
+   compare two ldb_message_element structures
+   assumes case sensitive comparison
+diff --git ./include/ldb.h ./include/ldb.h
+index 129beefeaf5..63d8aedd672 100644
+--- ./include/ldb.h
++++ ./include/ldb.h
+@@ -2002,12 +2002,36 @@ int ldb_msg_add_steal_value(struct ldb_message *msg,
+ 		      struct ldb_val *val);
+ int ldb_msg_add_steal_string(struct ldb_message *msg,
+ 			     const char *attr_name, char *str);
++int ldb_msg_add_string_flags(struct ldb_message *msg,
++			     const char *attr_name, const char *str,
++			     int flags);
+ int ldb_msg_add_string(struct ldb_message *msg,
+ 		       const char *attr_name, const char *str);
+ int ldb_msg_add_linearized_dn(struct ldb_message *msg, const char *attr_name,
+ 			      struct ldb_dn *dn);
+ int ldb_msg_add_fmt(struct ldb_message *msg,
+ 		    const char *attr_name, const char *fmt, ...) PRINTF_ATTRIBUTE(3,4);
++/**
++   append a element to a ldb_message
++*/
++int ldb_msg_append_value(struct ldb_message *msg,
++			 const char *attr_name,
++			 const struct ldb_val *val,
++			 int flags);
++int ldb_msg_append_steal_value(struct ldb_message *msg,
++			       const char *attr_name,
++			       struct ldb_val *val,
++			       int flags);
++int ldb_msg_append_steal_string(struct ldb_message *msg,
++				const char *attr_name, char *str,
++				int flags);
++int ldb_msg_append_string(struct ldb_message *msg,
++			  const char *attr_name, const char *str,
++			  int flags);
++int ldb_msg_append_linearized_dn(struct ldb_message *msg, const char *attr_name,
++				 struct ldb_dn *dn, int flags);
++int ldb_msg_append_fmt(struct ldb_message *msg, int flags,
++		       const char *attr_name, const char *fmt, ...) PRINTF_ATTRIBUTE(4,5);
+ 
+ /**
+    compare two message elements - return 0 on match
+diff --git ./ldb_map/ldb_map.c ./ldb_map/ldb_map.c
+index b453dff80d2..c7b0c228631 100644
+--- ./ldb_map/ldb_map.c
++++ ./ldb_map/ldb_map.c
+@@ -946,10 +946,7 @@ struct ldb_request *map_build_fixup_req(struct map_context *ac,
+ 	if ( ! dn || ! ldb_dn_validate(msg->dn)) {
+ 		goto failed;
+ 	}
+-	if (ldb_msg_add_empty(msg, IS_MAPPED, LDB_FLAG_MOD_REPLACE, NULL) != 0) {
+-		goto failed;
+-	}
+-	if (ldb_msg_add_string(msg, IS_MAPPED, dn) != 0) {
++	if (ldb_msg_append_string(msg, IS_MAPPED, dn, LDB_FLAG_MOD_REPLACE) != 0) {
+ 		goto failed;
+ 	}
+ 
+diff --git ./ldb_map/ldb_map_inbound.c ./ldb_map/ldb_map_inbound.c
+index 324295737da..50b9427c26c 100644
+--- ./ldb_map/ldb_map_inbound.c
++++ ./ldb_map/ldb_map_inbound.c
+@@ -569,12 +569,9 @@ static int map_modify_do_local(struct map_context *ac)
+ 		/* No local record present, add it instead */
+ 		/* Add local 'IS_MAPPED' */
+ 		/* TODO: use GUIDs here instead */
+-		if (ldb_msg_add_empty(ac->local_msg, IS_MAPPED,
+-					LDB_FLAG_MOD_ADD, NULL) != 0) {
+-			return LDB_ERR_OPERATIONS_ERROR;
+-		}
+-		ret = ldb_msg_add_linearized_dn(ac->local_msg, IS_MAPPED,
+-						ac->remote_req->op.mod.message->dn);
++		ret = ldb_msg_append_linearized_dn(ac->local_msg, IS_MAPPED,
++						   ac->remote_req->op.mod.message->dn,
++						   LDB_FLAG_MOD_ADD);
+ 		if (ret != 0) {
+ 			return LDB_ERR_OPERATIONS_ERROR;
+ 		}
+diff --git ./modules/rdn_name.c ./modules/rdn_name.c
+index 25cffe07591..3cb62bf567b 100644
+--- ./modules/rdn_name.c
++++ ./modules/rdn_name.c
+@@ -308,16 +308,10 @@ static int rdn_rename_callback(struct ldb_request *req, struct ldb_reply *ares)
+ 	}
+ 	rdn_val = ldb_val_dup(msg, rdn_val_p);
+ 
+-	if (ldb_msg_add_empty(msg, rdn_name, LDB_FLAG_MOD_REPLACE, NULL) != 0) {
++	if (ldb_msg_append_value(msg, rdn_name, &rdn_val, LDB_FLAG_MOD_REPLACE) != 0) {
+ 		goto error;
+ 	}
+-	if (ldb_msg_add_value(msg, rdn_name, &rdn_val, NULL) != 0) {
+-		goto error;
+-	}
+-	if (ldb_msg_add_empty(msg, "name", LDB_FLAG_MOD_REPLACE, NULL) != 0) {
+-		goto error;
+-	}
+-	if (ldb_msg_add_value(msg, "name", &rdn_val, NULL) != 0) {
++	if (ldb_msg_append_value(msg, "name", &rdn_val, LDB_FLAG_MOD_REPLACE) != 0) {
+ 		goto error;
+ 	}
+ 
+@@ -466,11 +460,7 @@ static int rdn_name_modify(struct ldb_module *module, struct ldb_request *req)
+ 		if (ret != 0) {
+ 			return ldb_module_oom(module);
+ 		}
+-		ret = ldb_msg_add_empty(msg, rdn_name, LDB_FLAG_MOD_ADD, NULL);
+-		if (ret != 0) {
+-			return ldb_module_oom(module);
+-		}
+-		ret = ldb_msg_add_value(msg, rdn_name, &rdn_val, NULL);
++		ret = ldb_msg_append_value(msg, rdn_name, &rdn_val, LDB_FLAG_MOD_ADD);
+ 		if (ret != 0) {
+ 			return ldb_module_oom(module);
+ 		}
+@@ -479,11 +469,7 @@ static int rdn_name_modify(struct ldb_module *module, struct ldb_request *req)
+ 		if (ret != 0) {
+ 			return ldb_module_oom(module);
+ 		}
+-		ret = ldb_msg_add_empty(msg, "name", LDB_FLAG_MOD_ADD, NULL);
+-		if (ret != 0) {
+-			return ldb_module_oom(module);
+-		}
+-		ret = ldb_msg_add_value(msg, "name", &rdn_val, NULL);
++		ret = ldb_msg_append_value(msg, "name", &rdn_val, LDB_FLAG_MOD_ADD);
+ 		if (ret != 0) {
+ 			return ldb_module_oom(module);
+ 		}
+diff --git ./ABI/ldb-2.3.4.sigs ./ABI/ldb-2.3.4.sigs
+new file mode 100644
+index 00000000000..40388d9e330
+--- /dev/null
++++ ./ABI/ldb-2.3.4.sigs
+@@ -0,0 +1,291 @@
++ldb_add: int (struct ldb_context *, const struct ldb_message *)
++ldb_any_comparison: int (struct ldb_context *, void *, ldb_attr_handler_t, const struct ldb_val *, const struct ldb_val *)
++ldb_asprintf_errstring: void (struct ldb_context *, const char *, ...)
++ldb_attr_casefold: char *(TALLOC_CTX *, const char *)
++ldb_attr_dn: int (const char *)
++ldb_attr_in_list: int (const char * const *, const char *)
++ldb_attr_list_copy: const char **(TALLOC_CTX *, const char * const *)
++ldb_attr_list_copy_add: const char **(TALLOC_CTX *, const char * const *, const char *)
++ldb_base64_decode: int (char *)
++ldb_base64_encode: char *(TALLOC_CTX *, const char *, int)
++ldb_binary_decode: struct ldb_val (TALLOC_CTX *, const char *)
++ldb_binary_encode: char *(TALLOC_CTX *, struct ldb_val)
++ldb_binary_encode_string: char *(TALLOC_CTX *, const char *)
++ldb_build_add_req: int (struct ldb_request **, struct ldb_context *, TALLOC_CTX *, const struct ldb_message *, struct ldb_control **, void *, ldb_request_callback_t, struct ldb_request *)
++ldb_build_del_req: int (struct ldb_request **, struct ldb_context *, TALLOC_CTX *, struct ldb_dn *, struct ldb_control **, void *, ldb_request_callback_t, struct ldb_request *)
++ldb_build_extended_req: int (struct ldb_request **, struct ldb_context *, TALLOC_CTX *, const char *, void *, struct ldb_control **, void *, ldb_request_callback_t, struct ldb_request *)
++ldb_build_mod_req: int (struct ldb_request **, struct ldb_context *, TALLOC_CTX *, const struct ldb_message *, struct ldb_control **, void *, ldb_request_callback_t, struct ldb_request *)
++ldb_build_rename_req: int (struct ldb_request **, struct ldb_context *, TALLOC_CTX *, struct ldb_dn *, struct ldb_dn *, struct ldb_control **, void *, ldb_request_callback_t, struct ldb_request *)
++ldb_build_search_req: int (struct ldb_request **, struct ldb_context *, TALLOC_CTX *, struct ldb_dn *, enum ldb_scope, const char *, const char * const *, struct ldb_control **, void *, ldb_request_callback_t, struct ldb_request *)
++ldb_build_search_req_ex: int (struct ldb_request **, struct ldb_context *, TALLOC_CTX *, struct ldb_dn *, enum ldb_scope, struct ldb_parse_tree *, const char * const *, struct ldb_control **, void *, ldb_request_callback_t, struct ldb_request *)
++ldb_casefold: char *(struct ldb_context *, TALLOC_CTX *, const char *, size_t)
++ldb_casefold_default: char *(void *, TALLOC_CTX *, const char *, size_t)
++ldb_check_critical_controls: int (struct ldb_control **)
++ldb_comparison_binary: int (struct ldb_context *, void *, const struct ldb_val *, const struct ldb_val *)
++ldb_comparison_fold: int (struct ldb_context *, void *, const struct ldb_val *, const struct ldb_val *)
++ldb_connect: int (struct ldb_context *, const char *, unsigned int, const char **)
++ldb_control_to_string: char *(TALLOC_CTX *, const struct ldb_control *)
++ldb_controls_except_specified: struct ldb_control **(struct ldb_control **, TALLOC_CTX *, struct ldb_control *)
++ldb_debug: void (struct ldb_context *, enum ldb_debug_level, const char *, ...)
++ldb_debug_add: void (struct ldb_context *, const char *, ...)
++ldb_debug_end: void (struct ldb_context *, enum ldb_debug_level)
++ldb_debug_set: void (struct ldb_context *, enum ldb_debug_level, const char *, ...)
++ldb_delete: int (struct ldb_context *, struct ldb_dn *)
++ldb_dn_add_base: bool (struct ldb_dn *, struct ldb_dn *)
++ldb_dn_add_base_fmt: bool (struct ldb_dn *, const char *, ...)
++ldb_dn_add_child: bool (struct ldb_dn *, struct ldb_dn *)
++ldb_dn_add_child_fmt: bool (struct ldb_dn *, const char *, ...)
++ldb_dn_add_child_val: bool (struct ldb_dn *, const char *, struct ldb_val)
++ldb_dn_alloc_casefold: char *(TALLOC_CTX *, struct ldb_dn *)
++ldb_dn_alloc_linearized: char *(TALLOC_CTX *, struct ldb_dn *)
++ldb_dn_canonical_ex_string: char *(TALLOC_CTX *, struct ldb_dn *)
++ldb_dn_canonical_string: char *(TALLOC_CTX *, struct ldb_dn *)
++ldb_dn_check_local: bool (struct ldb_module *, struct ldb_dn *)
++ldb_dn_check_special: bool (struct ldb_dn *, const char *)
++ldb_dn_compare: int (struct ldb_dn *, struct ldb_dn *)
++ldb_dn_compare_base: int (struct ldb_dn *, struct ldb_dn *)
++ldb_dn_copy: struct ldb_dn *(TALLOC_CTX *, struct ldb_dn *)
++ldb_dn_escape_value: char *(TALLOC_CTX *, struct ldb_val)
++ldb_dn_extended_add_syntax: int (struct ldb_context *, unsigned int, const struct ldb_dn_extended_syntax *)
++ldb_dn_extended_filter: void (struct ldb_dn *, const char * const *)
++ldb_dn_extended_syntax_by_name: const struct ldb_dn_extended_syntax *(struct ldb_context *, const char *)
++ldb_dn_from_ldb_val: struct ldb_dn *(TALLOC_CTX *, struct ldb_context *, const struct ldb_val *)
++ldb_dn_get_casefold: const char *(struct ldb_dn *)
++ldb_dn_get_comp_num: int (struct ldb_dn *)
++ldb_dn_get_component_name: const char *(struct ldb_dn *, unsigned int)
++ldb_dn_get_component_val: const struct ldb_val *(struct ldb_dn *, unsigned int)
++ldb_dn_get_extended_comp_num: int (struct ldb_dn *)
++ldb_dn_get_extended_component: const struct ldb_val *(struct ldb_dn *, const char *)
++ldb_dn_get_extended_linearized: char *(TALLOC_CTX *, struct ldb_dn *, int)
++ldb_dn_get_ldb_context: struct ldb_context *(struct ldb_dn *)
++ldb_dn_get_linearized: const char *(struct ldb_dn *)
++ldb_dn_get_parent: struct ldb_dn *(TALLOC_CTX *, struct ldb_dn *)
++ldb_dn_get_rdn_name: const char *(struct ldb_dn *)
++ldb_dn_get_rdn_val: const struct ldb_val *(struct ldb_dn *)
++ldb_dn_has_extended: bool (struct ldb_dn *)
++ldb_dn_is_null: bool (struct ldb_dn *)
++ldb_dn_is_special: bool (struct ldb_dn *)
++ldb_dn_is_valid: bool (struct ldb_dn *)
++ldb_dn_map_local: struct ldb_dn *(struct ldb_module *, void *, struct ldb_dn *)
++ldb_dn_map_rebase_remote: struct ldb_dn *(struct ldb_module *, void *, struct ldb_dn *)
++ldb_dn_map_remote: struct ldb_dn *(struct ldb_module *, void *, struct ldb_dn *)
++ldb_dn_minimise: bool (struct ldb_dn *)
++ldb_dn_new: struct ldb_dn *(TALLOC_CTX *, struct ldb_context *, const char *)
++ldb_dn_new_fmt: struct ldb_dn *(TALLOC_CTX *, struct ldb_context *, const char *, ...)
++ldb_dn_remove_base_components: bool (struct ldb_dn *, unsigned int)
++ldb_dn_remove_child_components: bool (struct ldb_dn *, unsigned int)
++ldb_dn_remove_extended_components: void (struct ldb_dn *)
++ldb_dn_replace_components: bool (struct ldb_dn *, struct ldb_dn *)
++ldb_dn_set_component: int (struct ldb_dn *, int, const char *, const struct ldb_val)
++ldb_dn_set_extended_component: int (struct ldb_dn *, const char *, const struct ldb_val *)
++ldb_dn_update_components: int (struct ldb_dn *, const struct ldb_dn *)
++ldb_dn_validate: bool (struct ldb_dn *)
++ldb_dump_results: void (struct ldb_context *, struct ldb_result *, FILE *)
++ldb_error_at: int (struct ldb_context *, int, const char *, const char *, int)
++ldb_errstring: const char *(struct ldb_context *)
++ldb_extended: int (struct ldb_context *, const char *, void *, struct ldb_result **)
++ldb_extended_default_callback: int (struct ldb_request *, struct ldb_reply *)
++ldb_filter_attrs: int (struct ldb_context *, const struct ldb_message *, const char * const *, struct ldb_message *)
++ldb_filter_from_tree: char *(TALLOC_CTX *, const struct ldb_parse_tree *)
++ldb_get_config_basedn: struct ldb_dn *(struct ldb_context *)
++ldb_get_create_perms: unsigned int (struct ldb_context *)
++ldb_get_default_basedn: struct ldb_dn *(struct ldb_context *)
++ldb_get_event_context: struct tevent_context *(struct ldb_context *)
++ldb_get_flags: unsigned int (struct ldb_context *)
++ldb_get_opaque: void *(struct ldb_context *, const char *)
++ldb_get_root_basedn: struct ldb_dn *(struct ldb_context *)
++ldb_get_schema_basedn: struct ldb_dn *(struct ldb_context *)
++ldb_global_init: int (void)
++ldb_handle_get_event_context: struct tevent_context *(struct ldb_handle *)
++ldb_handle_new: struct ldb_handle *(TALLOC_CTX *, struct ldb_context *)
++ldb_handle_use_global_event_context: void (struct ldb_handle *)
++ldb_handler_copy: int (struct ldb_context *, void *, const struct ldb_val *, struct ldb_val *)
++ldb_handler_fold: int (struct ldb_context *, void *, const struct ldb_val *, struct ldb_val *)
++ldb_init: struct ldb_context *(TALLOC_CTX *, struct tevent_context *)
++ldb_ldif_message_redacted_string: char *(struct ldb_context *, TALLOC_CTX *, enum ldb_changetype, const struct ldb_message *)
++ldb_ldif_message_string: char *(struct ldb_context *, TALLOC_CTX *, enum ldb_changetype, const struct ldb_message *)
++ldb_ldif_parse_modrdn: int (struct ldb_context *, const struct ldb_ldif *, TALLOC_CTX *, struct ldb_dn **, struct ldb_dn **, bool *, struct ldb_dn **, struct ldb_dn **)
++ldb_ldif_read: struct ldb_ldif *(struct ldb_context *, int (*)(void *), void *)
++ldb_ldif_read_file: struct ldb_ldif *(struct ldb_context *, FILE *)
++ldb_ldif_read_file_state: struct ldb_ldif *(struct ldb_context *, struct ldif_read_file_state *)
++ldb_ldif_read_free: void (struct ldb_context *, struct ldb_ldif *)
++ldb_ldif_read_string: struct ldb_ldif *(struct ldb_context *, const char **)
++ldb_ldif_write: int (struct ldb_context *, int (*)(void *, const char *, ...), void *, const struct ldb_ldif *)
++ldb_ldif_write_file: int (struct ldb_context *, FILE *, const struct ldb_ldif *)
++ldb_ldif_write_redacted_trace_string: char *(struct ldb_context *, TALLOC_CTX *, const struct ldb_ldif *)
++ldb_ldif_write_string: char *(struct ldb_context *, TALLOC_CTX *, const struct ldb_ldif *)
++ldb_load_modules: int (struct ldb_context *, const char **)
++ldb_map_add: int (struct ldb_module *, struct ldb_request *)
++ldb_map_delete: int (struct ldb_module *, struct ldb_request *)
++ldb_map_init: int (struct ldb_module *, const struct ldb_map_attribute *, const struct ldb_map_objectclass *, const char * const *, const char *, const char *)
++ldb_map_modify: int (struct ldb_module *, struct ldb_request *)
++ldb_map_rename: int (struct ldb_module *, struct ldb_request *)
++ldb_map_search: int (struct ldb_module *, struct ldb_request *)
++ldb_match_message: int (struct ldb_context *, const struct ldb_message *, const struct ldb_parse_tree *, enum ldb_scope, bool *)
++ldb_match_msg: int (struct ldb_context *, const struct ldb_message *, const struct ldb_parse_tree *, struct ldb_dn *, enum ldb_scope)
++ldb_match_msg_error: int (struct ldb_context *, const struct ldb_message *, const struct ldb_parse_tree *, struct ldb_dn *, enum ldb_scope, bool *)
++ldb_match_msg_objectclass: int (const struct ldb_message *, const char *)
++ldb_mod_register_control: int (struct ldb_module *, const char *)
++ldb_modify: int (struct ldb_context *, const struct ldb_message *)
++ldb_modify_default_callback: int (struct ldb_request *, struct ldb_reply *)
++ldb_module_call_chain: char *(struct ldb_request *, TALLOC_CTX *)
++ldb_module_connect_backend: int (struct ldb_context *, const char *, const char **, struct ldb_module **)
++ldb_module_done: int (struct ldb_request *, struct ldb_control **, struct ldb_extended *, int)
++ldb_module_flags: uint32_t (struct ldb_context *)
++ldb_module_get_ctx: struct ldb_context *(struct ldb_module *)
++ldb_module_get_name: const char *(struct ldb_module *)
++ldb_module_get_ops: const struct ldb_module_ops *(struct ldb_module *)
++ldb_module_get_private: void *(struct ldb_module *)
++ldb_module_init_chain: int (struct ldb_context *, struct ldb_module *)
++ldb_module_load_list: int (struct ldb_context *, const char **, struct ldb_module *, struct ldb_module **)
++ldb_module_new: struct ldb_module *(TALLOC_CTX *, struct ldb_context *, const char *, const struct ldb_module_ops *)
++ldb_module_next: struct ldb_module *(struct ldb_module *)
++ldb_module_popt_options: struct poptOption **(struct ldb_context *)
++ldb_module_send_entry: int (struct ldb_request *, struct ldb_message *, struct ldb_control **)
++ldb_module_send_referral: int (struct ldb_request *, char *)
++ldb_module_set_next: void (struct ldb_module *, struct ldb_module *)
++ldb_module_set_private: void (struct ldb_module *, void *)
++ldb_modules_hook: int (struct ldb_context *, enum ldb_module_hook_type)
++ldb_modules_list_from_string: const char **(struct ldb_context *, TALLOC_CTX *, const char *)
++ldb_modules_load: int (const char *, const char *)
++ldb_msg_add: int (struct ldb_message *, const struct ldb_message_element *, int)
++ldb_msg_add_empty: int (struct ldb_message *, const char *, int, struct ldb_message_element **)
++ldb_msg_add_fmt: int (struct ldb_message *, const char *, const char *, ...)
++ldb_msg_add_linearized_dn: int (struct ldb_message *, const char *, struct ldb_dn *)
++ldb_msg_add_steal_string: int (struct ldb_message *, const char *, char *)
++ldb_msg_add_steal_value: int (struct ldb_message *, const char *, struct ldb_val *)
++ldb_msg_add_string: int (struct ldb_message *, const char *, const char *)
++ldb_msg_add_string_flags: int (struct ldb_message *, const char *, const char *, int)
++ldb_msg_add_value: int (struct ldb_message *, const char *, const struct ldb_val *, struct ldb_message_element **)
++ldb_msg_append_fmt: int (struct ldb_message *, int, const char *, const char *, ...)
++ldb_msg_append_linearized_dn: int (struct ldb_message *, const char *, struct ldb_dn *, int)
++ldb_msg_append_steal_string: int (struct ldb_message *, const char *, char *, int)
++ldb_msg_append_steal_value: int (struct ldb_message *, const char *, struct ldb_val *, int)
++ldb_msg_append_string: int (struct ldb_message *, const char *, const char *, int)
++ldb_msg_append_value: int (struct ldb_message *, const char *, const struct ldb_val *, int)
++ldb_msg_canonicalize: struct ldb_message *(struct ldb_context *, const struct ldb_message *)
++ldb_msg_check_string_attribute: int (const struct ldb_message *, const char *, const char *)
++ldb_msg_copy: struct ldb_message *(TALLOC_CTX *, const struct ldb_message *)
++ldb_msg_copy_attr: int (struct ldb_message *, const char *, const char *)
++ldb_msg_copy_shallow: struct ldb_message *(TALLOC_CTX *, const struct ldb_message *)
++ldb_msg_diff: struct ldb_message *(struct ldb_context *, struct ldb_message *, struct ldb_message *)
++ldb_msg_difference: int (struct ldb_context *, TALLOC_CTX *, struct ldb_message *, struct ldb_message *, struct ldb_message **)
++ldb_msg_element_add_value: int (TALLOC_CTX *, struct ldb_message_element *, const struct ldb_val *)
++ldb_msg_element_compare: int (struct ldb_message_element *, struct ldb_message_element *)
++ldb_msg_element_compare_name: int (struct ldb_message_element *, struct ldb_message_element *)
++ldb_msg_element_equal_ordered: bool (const struct ldb_message_element *, const struct ldb_message_element *)
++ldb_msg_find_attr_as_bool: int (const struct ldb_message *, const char *, int)
++ldb_msg_find_attr_as_dn: struct ldb_dn *(struct ldb_context *, TALLOC_CTX *, const struct ldb_message *, const char *)
++ldb_msg_find_attr_as_double: double (const struct ldb_message *, const char *, double)
++ldb_msg_find_attr_as_int: int (const struct ldb_message *, const char *, int)
++ldb_msg_find_attr_as_int64: int64_t (const struct ldb_message *, const char *, int64_t)
++ldb_msg_find_attr_as_string: const char *(const struct ldb_message *, const char *, const char *)
++ldb_msg_find_attr_as_uint: unsigned int (const struct ldb_message *, const char *, unsigned int)
++ldb_msg_find_attr_as_uint64: uint64_t (const struct ldb_message *, const char *, uint64_t)
++ldb_msg_find_common_values: int (struct ldb_context *, TALLOC_CTX *, struct ldb_message_element *, struct ldb_message_element *, uint32_t)
++ldb_msg_find_duplicate_val: int (struct ldb_context *, TALLOC_CTX *, const struct ldb_message_element *, struct ldb_val **, uint32_t)
++ldb_msg_find_element: struct ldb_message_element *(const struct ldb_message *, const char *)
++ldb_msg_find_ldb_val: const struct ldb_val *(const struct ldb_message *, const char *)
++ldb_msg_find_val: struct ldb_val *(const struct ldb_message_element *, struct ldb_val *)
++ldb_msg_new: struct ldb_message *(TALLOC_CTX *)
++ldb_msg_normalize: int (struct ldb_context *, TALLOC_CTX *, const struct ldb_message *, struct ldb_message **)
++ldb_msg_remove_attr: void (struct ldb_message *, const char *)
++ldb_msg_remove_element: void (struct ldb_message *, struct ldb_message_element *)
++ldb_msg_rename_attr: int (struct ldb_message *, const char *, const char *)
++ldb_msg_sanity_check: int (struct ldb_context *, const struct ldb_message *)
++ldb_msg_sort_elements: void (struct ldb_message *)
++ldb_next_del_trans: int (struct ldb_module *)
++ldb_next_end_trans: int (struct ldb_module *)
++ldb_next_init: int (struct ldb_module *)
++ldb_next_prepare_commit: int (struct ldb_module *)
++ldb_next_read_lock: int (struct ldb_module *)
++ldb_next_read_unlock: int (struct ldb_module *)
++ldb_next_remote_request: int (struct ldb_module *, struct ldb_request *)
++ldb_next_request: int (struct ldb_module *, struct ldb_request *)
++ldb_next_start_trans: int (struct ldb_module *)
++ldb_op_default_callback: int (struct ldb_request *, struct ldb_reply *)
++ldb_options_copy: const char **(TALLOC_CTX *, const char **)
++ldb_options_find: const char *(struct ldb_context *, const char **, const char *)
++ldb_options_get: const char **(struct ldb_context *)
++ldb_pack_data: int (struct ldb_context *, const struct ldb_message *, struct ldb_val *, uint32_t)
++ldb_parse_control_from_string: struct ldb_control *(struct ldb_context *, TALLOC_CTX *, const char *)
++ldb_parse_control_strings: struct ldb_control **(struct ldb_context *, TALLOC_CTX *, const char **)
++ldb_parse_tree: struct ldb_parse_tree *(TALLOC_CTX *, const char *)
++ldb_parse_tree_attr_replace: void (struct ldb_parse_tree *, const char *, const char *)
++ldb_parse_tree_copy_shallow: struct ldb_parse_tree *(TALLOC_CTX *, const struct ldb_parse_tree *)
++ldb_parse_tree_walk: int (struct ldb_parse_tree *, int (*)(struct ldb_parse_tree *, void *), void *)
++ldb_qsort: void (void * const, size_t, size_t, void *, ldb_qsort_cmp_fn_t)
++ldb_register_backend: int (const char *, ldb_connect_fn, bool)
++ldb_register_extended_match_rule: int (struct ldb_context *, const struct ldb_extended_match_rule *)
++ldb_register_hook: int (ldb_hook_fn)
++ldb_register_module: int (const struct ldb_module_ops *)
++ldb_rename: int (struct ldb_context *, struct ldb_dn *, struct ldb_dn *)
++ldb_reply_add_control: int (struct ldb_reply *, const char *, bool, void *)
++ldb_reply_get_control: struct ldb_control *(struct ldb_reply *, const char *)
++ldb_req_get_custom_flags: uint32_t (struct ldb_request *)
++ldb_req_is_untrusted: bool (struct ldb_request *)
++ldb_req_location: const char *(struct ldb_request *)
++ldb_req_mark_trusted: void (struct ldb_request *)
++ldb_req_mark_untrusted: void (struct ldb_request *)
++ldb_req_set_custom_flags: void (struct ldb_request *, uint32_t)
++ldb_req_set_location: void (struct ldb_request *, const char *)
++ldb_request: int (struct ldb_context *, struct ldb_request *)
++ldb_request_add_control: int (struct ldb_request *, const char *, bool, void *)
++ldb_request_done: int (struct ldb_request *, int)
++ldb_request_get_control: struct ldb_control *(struct ldb_request *, const char *)
++ldb_request_get_status: int (struct ldb_request *)
++ldb_request_replace_control: int (struct ldb_request *, const char *, bool, void *)
++ldb_request_set_state: void (struct ldb_request *, int)
++ldb_reset_err_string: void (struct ldb_context *)
++ldb_save_controls: int (struct ldb_control *, struct ldb_request *, struct ldb_control ***)
++ldb_schema_attribute_add: int (struct ldb_context *, const char *, unsigned int, const char *)
++ldb_schema_attribute_add_with_syntax: int (struct ldb_context *, const char *, unsigned int, const struct ldb_schema_syntax *)
++ldb_schema_attribute_by_name: const struct ldb_schema_attribute *(struct ldb_context *, const char *)
++ldb_schema_attribute_fill_with_syntax: int (struct ldb_context *, TALLOC_CTX *, const char *, unsigned int, const struct ldb_schema_syntax *, struct ldb_schema_attribute *)
++ldb_schema_attribute_remove: void (struct ldb_context *, const char *)
++ldb_schema_attribute_remove_flagged: void (struct ldb_context *, unsigned int)
++ldb_schema_attribute_set_override_handler: void (struct ldb_context *, ldb_attribute_handler_override_fn_t, void *)
++ldb_schema_set_override_GUID_index: void (struct ldb_context *, const char *, const char *)
++ldb_schema_set_override_indexlist: void (struct ldb_context *, bool)
++ldb_search: int (struct ldb_context *, TALLOC_CTX *, struct ldb_result **, struct ldb_dn *, enum ldb_scope, const char * const *, const char *, ...)
++ldb_search_default_callback: int (struct ldb_request *, struct ldb_reply *)
++ldb_sequence_number: int (struct ldb_context *, enum ldb_sequence_type, uint64_t *)
++ldb_set_create_perms: void (struct ldb_context *, unsigned int)
++ldb_set_debug: int (struct ldb_context *, void (*)(void *, enum ldb_debug_level, const char *, va_list), void *)
++ldb_set_debug_stderr: int (struct ldb_context *)
++ldb_set_default_dns: void (struct ldb_context *)
++ldb_set_errstring: void (struct ldb_context *, const char *)
++ldb_set_event_context: void (struct ldb_context *, struct tevent_context *)
++ldb_set_flags: void (struct ldb_context *, unsigned int)
++ldb_set_modules_dir: void (struct ldb_context *, const char *)
++ldb_set_opaque: int (struct ldb_context *, const char *, void *)
++ldb_set_require_private_event_context: void (struct ldb_context *)
++ldb_set_timeout: int (struct ldb_context *, struct ldb_request *, int)
++ldb_set_timeout_from_prev_req: int (struct ldb_context *, struct ldb_request *, struct ldb_request *)
++ldb_set_utf8_default: void (struct ldb_context *)
++ldb_set_utf8_fns: void (struct ldb_context *, void *, char *(*)(void *, void *, const char *, size_t))
++ldb_setup_wellknown_attributes: int (struct ldb_context *)
++ldb_should_b64_encode: int (struct ldb_context *, const struct ldb_val *)
++ldb_standard_syntax_by_name: const struct ldb_schema_syntax *(struct ldb_context *, const char *)
++ldb_strerror: const char *(int)
++ldb_string_to_time: time_t (const char *)
++ldb_string_utc_to_time: time_t (const char *)
++ldb_timestring: char *(TALLOC_CTX *, time_t)
++ldb_timestring_utc: char *(TALLOC_CTX *, time_t)
++ldb_transaction_cancel: int (struct ldb_context *)
++ldb_transaction_cancel_noerr: int (struct ldb_context *)
++ldb_transaction_commit: int (struct ldb_context *)
++ldb_transaction_prepare_commit: int (struct ldb_context *)
++ldb_transaction_start: int (struct ldb_context *)
++ldb_unpack_data: int (struct ldb_context *, const struct ldb_val *, struct ldb_message *)
++ldb_unpack_data_flags: int (struct ldb_context *, const struct ldb_val *, struct ldb_message *, unsigned int)
++ldb_unpack_get_format: int (const struct ldb_val *, uint32_t *)
++ldb_val_dup: struct ldb_val (TALLOC_CTX *, const struct ldb_val *)
++ldb_val_equal_exact: int (const struct ldb_val *, const struct ldb_val *)
++ldb_val_map_local: struct ldb_val (struct ldb_module *, void *, const struct ldb_map_attribute *, const struct ldb_val *)
++ldb_val_map_remote: struct ldb_val (struct ldb_module *, void *, const struct ldb_map_attribute *, const struct ldb_val *)
++ldb_val_string_cmp: int (const struct ldb_val *, const char *)
++ldb_val_to_time: int (const struct ldb_val *, time_t *)
++ldb_valid_attr_name: int (const char *)
++ldb_vdebug: void (struct ldb_context *, enum ldb_debug_level, const char *, va_list)
++ldb_wait: int (struct ldb_handle *, enum ldb_wait_type)
+diff --git ./ABI/pyldb-util-2.3.4.sigs ./ABI/pyldb-util-2.3.4.sigs
+new file mode 100644
+index 00000000000..164a806b2ff
+--- /dev/null
++++ ./ABI/pyldb-util-2.3.4.sigs
+@@ -0,0 +1,3 @@
++pyldb_Dn_FromDn: PyObject *(struct ldb_dn *)
++pyldb_Object_AsDn: bool (TALLOC_CTX *, PyObject *, struct ldb_context *, struct ldb_dn **)
++pyldb_check_type: bool (PyObject *, const char *)
diff --git a/databases/ldb22/pkg-descr b/databases/ldb22/pkg-descr
index 92cd13b5db8c..6e55f91b65a7 100644
--- a/databases/ldb22/pkg-descr
+++ b/databases/ldb22/pkg-descr
@@ -5,5 +5,3 @@ within an application.
 
 In some ways it can be seen as a intermediate solution between key-value
 pair databases and a real LDAP database.
-
-WWW: https://ldb.samba.org/
diff --git a/databases/ldb25/Makefile b/databases/ldb25/Makefile
new file mode 100644
index 000000000000..0729907ac55d
--- /dev/null
+++ b/databases/ldb25/Makefile
@@ -0,0 +1,155 @@
+PORTNAME=	ldb
+PORTVERSION=	2.5.3
+CATEGORIES=	databases
+MASTER_SITES=	SAMBA
+PKGNAMESUFFIX?=	25
+
+MAINTAINER=	xavier.beaudouin@klarasystems.com
+COMMENT=	LDAP-like embedded database
+WWW=		https://ldb.samba.org/
+
+LICENSE=	GPLv3+
+
+IGNORE_NONTHREAD_PYTHON=	needs port lang/python${PYTHON_SUFFIX} to be \
+				build with THREADS support
+
+LDB_DEPENDS=	talloc>=2.2.0:devel/talloc tevent>=0.10.0:devel/tevent \
+		tdb>=1.4.0:databases/tdb lmdb>=0.9.23:databases/lmdb \
+		popt>=0:devel/popt
+BUILD_DEPENDS=	${LDB_DEPENDS} \
+		cmocka>=1.1.3:sysutils/cmocka
+TEST_DEPENDS=	${LDB_DEPENDS} \
+		cmocka>=1.1.3:sysutils/cmocka
+RUN_DEPENDS=	${LDB_DEPENDS}
+
+USES=		compiler ldap localbase:ldflags pkgconfig waf
+
+CONFLICTS_INSTALL=	ldb[0-9][0-9] # include/ldb.h
+
+USE_LDCONFIG=	yes
+WAF_CMD=	${BUILD_WRKSRC}/buildtools/bin/waf
+CONFIGURE_LOG=	${BUILD_WRKSRC}/bin/config.log
+
+PKGCONFIGDIR?=	${PREFIX}/libdata/pkgconfig
+PLIST_SUB+=	PKGCONFIGDIR=${PKGCONFIGDIR:S;${PREFIX}/;;}
+
+CONFIGURE_ARGS+=	--bundled-libraries=!talloc,!tevent,!tdb,!popt,!cmocka \
+			--disable-rpath \
+			--with-modulesdir=${PREFIX}/lib/shared-modules \
+			--with-openldap=${LOCALBASE} \
+			--with-privatelibdir=${PREFIX}/lib/ldb \
+			--without-gettext
+
+OPTIONS_DEFINE=	DEBUG MANPAGES PYTHON3
+MANPAGES_DESC=	Build and install manpages (requires textproc/docbook-xsl)
+
+DEBUG_CONFIGURE_ON=	--enable-debug \
+			--verbose
+DEBUG_MAKE_ARGS=	--verbose
+DEBUG_FLAGS=		-g -ggdb3 -O0
+
+.include <bsd.port.options.mk>
+
+LDB_BINS=	bin/ldbedit bin/ldbmodify bin/ldbadd bin/ldbdel bin/ldbsearch \
+		bin/ldbrename
+
+LDB_LIBS=	lib/libldb.so lib/libldb.so.2 lib/ldb/libldb-tdb-int.so \
+		lib/ldb/libldb-tdb-err-map.so lib/ldb/libldb-key-value.so \
+		lib/ldb/libldb-cmdline.so lib/shared-modules/ldb/skel.so \
+		lib/shared-modules/ldb/server_sort.so \
+		lib/shared-modules/ldb/sample.so \
+		lib/shared-modules/ldb/rdn_name.so \
+		lib/shared-modules/ldb/paged_searches.so \
+		lib/shared-modules/ldb/ldb.so lib/shared-modules/ldb/ldap.so \
+		lib/shared-modules/ldb/asq.so lib/shared-modules/ldb/tdb.so
+# Only for 64-bit architectures
+.if ${ARCH} != armv6 && ${ARCH} != armv7 && ${ARCH} != i386 && ${ARCH} != mips && \
+	${ARCH} != powerpc && ${ARCH} != powerpcspe
+LDB_LIBS+=	lib/ldb/libldb-mdb-int.so lib/shared-modules/ldb/mdb.so
+.endif
+
+PLIST_FILES=	${LDB_BINS} \
+		${LDB_LIBS} \
+		${PKGCONFIGDIR}/ldb.pc \
+		include/ldb.h \
+		include/ldb_errors.h \
+		include/ldb_handlers.h \
+		include/ldb_module.h \
+		include/ldb_version.h
+
+.include <bsd.port.pre.mk>
+
+# Some symbols in ldb's linker version scripts are not defined, but since the
+# scripts are generated dynamically, suppress errors with lld >= 17 due to these
+# undefined symbols.
+LDFLAGS+=	-Wl,--undefined-version
+
+.if !${PORT_OPTIONS:MMANPAGES}
+CONFIGURE_ENV+=	XSLTPROC="true"
+.else
+BUILD_DEPENDS+=	${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:textproc/docbook-xsl \
+		xsltproc:textproc/libxslt
+.endif
+
+.if !${PORT_OPTIONS:MPYTHON3} || defined(NO_PYTHON)
+USES+=			python:build,test
+CONFIGURE_ARGS+=	--disable-python
+.else
+USES+=			gettext-runtime python
+
+PLIST_FILES+=	${PKGCONFIGDIR}/pyldb-util${PYTHON_EXT_SUFFIX}.pc \
+		${PYTHON_SITELIBDIR}/_ldb_text.py \
+		${PYTHON_SITELIBDIR}/ldb${PYTHON_EXT_SUFFIX}.so \
+		include/pyldb.h \
+		lib/libpyldb-util${PYTHON_EXT_SUFFIX}.so \
+		lib/libpyldb-util${PYTHON_EXT_SUFFIX}.so.2
+.endif
+
+# No fancy color error messages
+.if ${COMPILER_TYPE} == "clang"
+CFLAGS+=	-fno-color-diagnostics
+.endif
+CONFIGURE_ENV+=	NOCOLOR=yes
+MAKE_ENV+=	NOCOLOR=yes
+
+LDB_MAN1=	share/man/man1/ldbadd.1.gz \
+		share/man/man1/ldbdel.1.gz \
+		share/man/man1/ldbedit.1.gz \
+		share/man/man1/ldbmodify.1.gz \
+		share/man/man1/ldbrename.1.gz \
+		share/man/man1/ldbsearch.1.gz
+
+LDB_MAN3=	share/man/man3/ldb.3.gz
+
+PLIST_FILES+=	${LDB_MAN1} \
+		${LDB_MAN3}
+
+post-patch:
+			@${REINPLACE_CMD} -e 's|%%PKGCONFIGDIR%%|${PKGCONFIGDIR}|g' \
+				${BUILD_WRKSRC}/wscript
+
+# Use threading (or multiprocessing) but not thread (renamed in python 3+).
+pre-configure:
+			@if ! ${PYTHON_CMD} -c "import multiprocessing;" 2>/dev/null; then \
+				${ECHO_CMD}; \
+				${ECHO_MSG} "===>  ${PKGNAME} "${IGNORE_NONTHREAD_PYTHON:Q}.; \
+				${ECHO_CMD}; \
+				${FALSE}; \
+			fi
+
+pre-build-MANPAGES-off:
+			-${MKDIR} ${BUILD_WRKSRC}/bin/default/man
+.for man in ${LDB_MAN1} ${LDB_MAN3}
+			${INSTALL_MAN} ${FILESDIR}/man/`basename ${man} .gz` ${BUILD_WRKSRC}/bin/default/man
+.endfor
+
+post-install:
+.for lib in ${LDB_BINS} ${LDB_LIBS}
+		${STRIP_CMD} ${STAGEDIR}${PREFIX}/${lib}
+.endfor
+.if ${PORT_OPTIONS:MPYTHON3} && !defined(NO_PYTHON)
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libpyldb-util${PYTHON_EXT_SUFFIX}.so
+	${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/ldb${PYTHON_EXT_SUFFIX}.so
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/databases/ldb25/distinfo b/databases/ldb25/distinfo
new file mode 100644
index 000000000000..321b00a2cf87
--- /dev/null
+++ b/databases/ldb25/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1700563483
+SHA256 (ldb-2.5.3.tar.gz) = 396d8bb9bb926a0fd2e6aa4ebec56e50942cc53648737aabcdf18d30fe6ac226
+SIZE (ldb-2.5.3.tar.gz) = 1736354
diff --git a/databases/ldb25/files/man/ldb.3 b/databases/ldb25/files/man/ldb.3
new file mode 100644
index 000000000000..ee748545d8f1
--- /dev/null
+++ b/databases/ldb25/files/man/ldb.3
@@ -0,0 +1,427 @@
+'\" t
+.\"     Title: ldb
+.\"    Author: [see the "Author" section]
+.\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
+.\"      Date: 09/23/2020
+.\"    Manual: System Administration tools
+.\"    Source: LDB 1.1
+.\"  Language: English
+.\"
+.TH "LDB" "3" "09/23/2020" "LDB 1\&.1" "System Administration tools"
+.\" -----------------------------------------------------------------
+.\" * Define some portability stuff
+.\" -----------------------------------------------------------------
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.\" http://bugs.debian.org/507673
+.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.ie \n(.g .ds Aq \(aq
+.el       .ds Aq '
+.\" -----------------------------------------------------------------
+.\" * set default formatting
+.\" -----------------------------------------------------------------
+.\" disable hyphenation
+.nh
+.\" disable justification (adjust text to left margin only)
+.ad l
+.\" -----------------------------------------------------------------
+.\" * MAIN CONTENT STARTS HERE *
+.\" -----------------------------------------------------------------
+.SH "NAME"
+ldb \- A light\-weight database library
+.SH "SYNOPSIS"
+.sp
+.nf
+#include <ldb\&.h>
+.fi
+.SH "DESCRIPTION"
+.PP
+ldb is a light weight embedded database library and API\&. With a programming interface that is very similar to LDAP, ldb can store its data either in a tdb(3) database or in a real LDAP database\&.
+.PP
+When used with the tdb backend ldb does not require any database daemon\&. Instead, ldb function calls are processed immediately by the ldb library, which does IO directly on the database, while allowing multiple readers/writers using operating system byte range locks\&. This leads to an API with very low overheads, often resulting in speeds of more than 10x what can be achieved with a more traditional LDAP architecture\&.
+.PP
+In a taxonomy of databases ldb would sit half way between key/value pair databases (such as berkley db or tdb) and a full LDAP database\&. With a structured attribute oriented API like LDAP and good indexing capabilities, ldb can be used for quite sophisticated applications that need a light weight database, without the administrative overhead of a full LDAP installation\&.
+.PP
+Included with ldb are a number of useful command line tools for manipulating a ldb database\&. These tools are similar in style to the equivalent ldap command line tools\&.
+.PP
+In its default mode of operation with a tdb backend, ldb can also be seen as a "schema\-less LDAP"\&. By default ldb does not require a schema, which greatly reduces the complexity of getting started with ldb databases\&. As the complexity of you application grows you can take advantage of some of the optional schema\-like attributes that ldb offers, or you can migrate to using the full LDAP api while keeping your exiting ldb code\&.
+.PP
+If you are new to ldb, then I suggest starting with the manual pages for ldbsearch(1) and ldbedit(1), and experimenting with a local database\&. Then I suggest you look at the ldb_connect(3) and ldb_search(3) manual pages\&.
+.SH "TOOLS"
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+ldbsearch(1)
+\- command line ldb search utility
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+ldbedit(1)
+\- edit all or part of a ldb database using your favourite editor
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+ldbadd(1)
+\- add records to a ldb database using LDIF formatted input
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+ldbdel(1)
+\- delete records from a ldb database
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+ldbmodify(1)
+\- modify records in a ldb database using LDIF formatted input
+.RE
+.SH "FUNCTIONS"
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+\fBldb_connect(3)\fR
+\- connect to a ldb backend
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+\fBldb_search(3)\fR
+\- perform a database search
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+\fBldb_add(3)\fR
+\- add a record to the database
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+\fBldb_delete(3)\fR
+\- delete a record from the database
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+\fBldb_modify(3)\fR
+\- modify a record in the database
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+\fBldb_errstring(3)\fR
+\- retrieve extended error information from the last operation
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+\fBldb_ldif_write(3)\fR
+\- write a LDIF formatted message
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+\fBldb_ldif_write_file(3)\fR
+\- write a LDIF formatted message to a file
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+\fBldb_ldif_read(3)\fR
+\- read a LDIF formatted message
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+\fBldb_ldif_read_free(3)\fR
+\- free the result of a ldb_ldif_read()
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+\fBldb_ldif_read_file(3)\fR
+\- read a LDIF message from a file
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+\fBldb_ldif_read_string(3)\fR
+\- read a LDIF message from a string
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+\fBldb_msg_find_element(3)\fR
+\- find an element in a ldb_message
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+\fBldb_val_equal_exact(3)\fR
+\- compare two ldb_val structures
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+\fBldb_msg_find_val(3)\fR
+\- find an element by value
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+\fBldb_msg_add_empty(3)\fR
+\- add an empty message element to a ldb_message
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+\fBldb_msg_add(3)\fR
+\- add a non\-empty message element to a ldb_message
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+\fBldb_msg_element_compare(3)\fR
+\- compare two ldb_message_element structures
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+\fBldb_msg_find_int(3)\fR
+\- return an integer value from a ldb_message
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+\fBldb_msg_find_uint(3)\fR
+\- return an unsigned integer value from a ldb_message
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+\fBldb_msg_find_double(3)\fR
+\- return a double value from a ldb_message
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+\fBldb_msg_find_string(3)\fR
+\- return a string value from a ldb_message
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+\fBldb_set_alloc(3)\fR
+\- set the memory allocation function to be used by ldb
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+\fBldb_set_debug(3)\fR
+\- set a debug handler to be used by ldb
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+\fBldb_set_debug_stderr(3)\fR
+\- set a debug handler for stderr output
+.RE
+.SH "AUTHOR"
+.PP
+ldb was written by
+\m[blue]\fBAndrew Tridgell\fR\m[]\&\s-2\u[1]\d\s+2\&.
+.PP
+If you wish to report a problem or make a suggestion then please see the
+\m[blue]\fB\%http://ldb.samba.org/\fR\m[]
+web site for current contact and maintainer information\&.
+.PP
+ldb is released under the GNU Lesser General Public License version 2 or later\&. Please see the file COPYING for license details\&.
+.SH "NOTES"
+.IP " 1." 4
+Andrew Tridgell
+.RS 4
+\%https://www.samba.org/~tridge/
+.RE
diff --git a/databases/ldb25/files/man/ldbadd.1 b/databases/ldb25/files/man/ldbadd.1
new file mode 100644
index 000000000000..90014c9d6703
--- /dev/null
+++ b/databases/ldb25/files/man/ldbadd.1
@@ -0,0 +1,78 @@
+'\" t
+.\"     Title: ldbadd
+.\"    Author: [see the "AUTHOR" section]
+.\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
+.\"      Date: 09/23/2020
+.\"    Manual: System Administration tools
+.\"    Source: LDB 1.1
+.\"  Language: English
+.\"
+.TH "LDBADD" "1" "09/23/2020" "LDB 1\&.1" "System Administration tools"
+.\" -----------------------------------------------------------------
+.\" * Define some portability stuff
+.\" -----------------------------------------------------------------
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.\" http://bugs.debian.org/507673
+.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.ie \n(.g .ds Aq \(aq
+.el       .ds Aq '
+.\" -----------------------------------------------------------------
+.\" * set default formatting
+.\" -----------------------------------------------------------------
+.\" disable hyphenation
+.nh
+.\" disable justification (adjust text to left margin only)
+.ad l
+.\" -----------------------------------------------------------------
+.\" * MAIN CONTENT STARTS HERE *
+.\" -----------------------------------------------------------------
+.SH "NAME"
+ldbadd \- Command\-line utility for adding records to an LDB
+.SH "SYNOPSIS"
+.HP \w'\fBldbadd\fR\ 'u
+\fBldbadd\fR [\-h] [\-H\ LDB\-URL] [ldif\-file1] [ldif\-file2] [\&.\&.\&.]
+.SH "DESCRIPTION"
+.PP
+ldbadd adds records to an ldb(3) database\&. It reads the ldif(5) files specified on the command line and adds the records from these files to the LDB database, which is specified by the \-H option or the LDB_URL environment variable\&.
+.PP
+If \- is specified as a ldb file, the ldif input is read from standard input\&.
+.SH "OPTIONS"
+.PP
+\-h
+.RS 4
+Show list of available options\&.
+.RE
+.PP
+\-H <ldb\-url>
+.RS 4
+LDB URL to connect to\&. See ldb(3) for details\&.
+.RE
+.SH "ENVIRONMENT"
+.PP
+LDB_URL
+.RS 4
+LDB URL to connect to (can be overridden by using the \-H command\-line option\&.)
+.RE
+.SH "VERSION"
+.PP
+This man page is correct for version 1\&.1 of LDB\&.
+.SH "SEE ALSO"
+.PP
+ldb(3), ldbmodify, ldbdel, ldif(5)
+.SH "AUTHOR"
+.PP
+ldb was written by
+\m[blue]\fBAndrew Tridgell\fR\m[]\&\s-2\u[1]\d\s+2\&.
+.PP
+If you wish to report a problem or make a suggestion then please see the
+\m[blue]\fB\%http://ldb.samba.org/\fR\m[]
+web site for current contact and maintainer information\&.
+.PP
+This manpage was written by Jelmer Vernooij\&.
+.SH "NOTES"
+.IP " 1." 4
+Andrew Tridgell
+.RS 4
+\%https://www.samba.org/~tridge/
+.RE
diff --git a/databases/ldb25/files/man/ldbdel.1 b/databases/ldb25/files/man/ldbdel.1
new file mode 100644
index 000000000000..86541dccc899
--- /dev/null
+++ b/databases/ldb25/files/man/ldbdel.1
@@ -0,0 +1,80 @@
+'\" t
+.\"     Title: ldbdel
+.\"    Author: [see the "AUTHOR" section]
+.\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
+.\"      Date: 09/23/2020
+.\"    Manual: System Administration tools
+.\"    Source: LDB 1.1
+.\"  Language: English
+.\"
+.TH "LDBDEL" "1" "09/23/2020" "LDB 1\&.1" "System Administration tools"
+.\" -----------------------------------------------------------------
+.\" * Define some portability stuff
+.\" -----------------------------------------------------------------
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.\" http://bugs.debian.org/507673
+.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.ie \n(.g .ds Aq \(aq
+.el       .ds Aq '
+.\" -----------------------------------------------------------------
+.\" * set default formatting
+.\" -----------------------------------------------------------------
+.\" disable hyphenation
+.nh
+.\" disable justification (adjust text to left margin only)
+.ad l
+.\" -----------------------------------------------------------------
+.\" * MAIN CONTENT STARTS HERE *
+.\" -----------------------------------------------------------------
+.SH "NAME"
+ldbdel \- Command\-line program for deleting LDB records
+.SH "SYNOPSIS"
+.HP \w'\fBldbdel\fR\ 'u
+\fBldbdel\fR [\-h] [\-H\ LDB\-URL] [dn] [\&.\&.\&.]
+.SH "DESCRIPTION"
+.PP
+ldbdel deletes records from an ldb(3) database\&. It deletes the records identified by the dn\*(Aqs specified on the command\-line\&.
+.PP
+ldbdel uses either the database that is specified with the \-H option or the database specified by the LDB_URL environment variable\&.
+.SH "OPTIONS"
+.PP
+\-h
+.RS 4
+Show list of available options\&.
+.RE
+.PP
+\-H <ldb\-url>
+.RS 4
+LDB URL to connect to\&. See ldb(3) for details\&.
+.RE
+.SH "ENVIRONMENT"
+.PP
+LDB_URL
+.RS 4
+LDB URL to connect to (can be overridden by using the \-H command\-line option\&.)
+.RE
+.SH "VERSION"
+.PP
+This man page is correct for version 1\&.1 of LDB\&.
+.SH "SEE ALSO"
+.PP
+ldb(3), ldbmodify, ldbadd, ldif(5)
+.SH "AUTHOR"
+.PP
+ldb was written by
+\m[blue]\fBAndrew Tridgell\fR\m[]\&\s-2\u[1]\d\s+2\&.
+.PP
+If you wish to report a problem or make a suggestion then please see the
+\m[blue]\fB\%http://ldb.samba.org/\fR\m[]
+web site for current contact and maintainer information\&.
+.PP
+ldbdel was written by Andrew Tridgell\&.
+.PP
+This manpage was written by Jelmer Vernooij\&.
+.SH "NOTES"
+.IP " 1." 4
+Andrew Tridgell
+.RS 4
+\%https://www.samba.org/~tridge/
+.RE
diff --git a/databases/ldb25/files/man/ldbedit.1 b/databases/ldb25/files/man/ldbedit.1
new file mode 100644
index 000000000000..cb7b75fe8d67
--- /dev/null
+++ b/databases/ldb25/files/man/ldbedit.1
@@ -0,0 +1,111 @@
+'\" t
+.\"     Title: ldbedit
+.\"    Author: [see the "AUTHOR" section]
+.\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
+.\"      Date: 09/23/2020
+.\"    Manual: System Administration tools
+.\"    Source: LDB 1.1
+.\"  Language: English
+.\"
+.TH "LDBEDIT" "1" "09/23/2020" "LDB 1\&.1" "System Administration tools"
+.\" -----------------------------------------------------------------
+.\" * Define some portability stuff
+.\" -----------------------------------------------------------------
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.\" http://bugs.debian.org/507673
+.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.ie \n(.g .ds Aq \(aq
+.el       .ds Aq '
+.\" -----------------------------------------------------------------
+.\" * set default formatting
+.\" -----------------------------------------------------------------
+.\" disable hyphenation
+.nh
+.\" disable justification (adjust text to left margin only)
+.ad l
+.\" -----------------------------------------------------------------
+.\" * MAIN CONTENT STARTS HERE *
+.\" -----------------------------------------------------------------
+.SH "NAME"
+ldbedit \- Edit LDB databases using your preferred editor
+.SH "SYNOPSIS"
+.HP \w'\fBldbedit\fR\ 'u
+\fBldbedit\fR [\-?] [\-\-usage] [\-s\ base|one|sub] [\-b\ basedn] [\-a] [\-e\ editor] [\-H\ LDB\-URL] [expression] [attributes...]
+.SH "DESCRIPTION"
+.PP
+ldbedit is a utility that allows you to edit LDB entries (in tdb files, sqlite files or LDAP servers) using your preferred editor\&. ldbedit generates an LDIF file based on your query, allows you to edit the LDIF, and then merges that LDIF back into the LDB backend\&.
+.SH "OPTIONS"
+.PP
+\-?, \-\-help
+.RS 4
+Show list of available options, and a phrase describing what that option does\&.
+.RE
+.PP
+\-\-usage
+.RS 4
+Show list of available options\&. This is similar to the help option, however it does not provide any description, and is hence shorter\&.
+.RE
+.PP
+\-H <ldb\-url>
+.RS 4
+LDB URL to connect to\&. For a tdb database, this will be of the form tdb://\fIfilename\fR\&. For a LDAP connection over unix domain sockets, this will be of the form ldapi://\fIsocket\fR\&. For a (potentially remote) LDAP connection over TCP, this will be of the form ldap://\fIhostname\fR\&. For an SQLite database, this will be of the form sqlite://\fIfilename\fR\&.
+.RE
+.PP
+\-s one|sub|base
+.RS 4
+Search scope to use\&. One\-level, subtree or base\&.
+.RE
+.PP
+\-a, \-all
+.RS 4
+Edit all records\&. This allows you to apply the same change to a number of records at once\&. You probably want to combine this with an expression of the form "objectclass=*"\&.
+.RE
+.PP
+\-e editor, \-\-editor editor
+.RS 4
+Specify the editor that should be used (overrides the VISUAL and EDITOR environment variables)\&. If this option is not used, and neither VISUAL nor EDITOR environment variables are set, then the vi editor will be used\&.
+.RE
+.PP
+\-b basedn
+.RS 4
+Specify Base Distinguished Name to use\&.
+.RE
+.PP
+\-v, \-\-verbose
+.RS 4
+Make ldbedit more verbose about the operations that are being performed\&. Without this option, ldbedit will only provide a summary change line\&.
+.RE
+.SH "ENVIRONMENT"
+.PP
+LDB_URL
+.RS 4
+LDB URL to connect to\&. This can be overridden by using the \-H command\-line option\&.)
+.RE
+.PP
+VISUAL and EDITOR
+.RS 4
+Environment variables used to determine what editor to use\&. VISUAL takes precedence over EDITOR, and both are overridden by the \-e command\-line option\&.
+.RE
+.SH "VERSION"
+.PP
+This man page is correct for version 1\&.1 of LDB\&.
+.SH "SEE ALSO"
+.PP
+ldb(3), ldbmodify(1), ldbdel(1), ldif(5), vi(1)
+.SH "AUTHOR"
+.PP
+ldb was written by
+\m[blue]\fBAndrew Tridgell\fR\m[]\&\s-2\u[1]\d\s+2\&.
+.PP
+If you wish to report a problem or make a suggestion then please see the
+\m[blue]\fB\%http://ldb.samba.org/\fR\m[]
+web site for current contact and maintainer information\&.
+.PP
+This manpage was written by Jelmer Vernooij and updated by Brad Hards\&.
+.SH "NOTES"
+.IP " 1." 4
+Andrew Tridgell
+.RS 4
+\%https://www.samba.org/~tridge/
+.RE
diff --git a/databases/ldb25/files/man/ldbmodify.1 b/databases/ldb25/files/man/ldbmodify.1
new file mode 100644
index 000000000000..be4815da7287
--- /dev/null
+++ b/databases/ldb25/files/man/ldbmodify.1
@@ -0,0 +1,73 @@
+'\" t
+.\"     Title: ldbmodify
+.\"    Author: [see the "AUTHOR" section]
+.\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
+.\"      Date: 09/23/2020
+.\"    Manual: System Administration tools
+.\"    Source: LDB 1.1
+.\"  Language: English
+.\"
+.TH "LDBMODIFY" "1" "09/23/2020" "LDB 1\&.1" "System Administration tools"
+.\" -----------------------------------------------------------------
+.\" * Define some portability stuff
+.\" -----------------------------------------------------------------
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.\" http://bugs.debian.org/507673
+.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.ie \n(.g .ds Aq \(aq
+.el       .ds Aq '
+.\" -----------------------------------------------------------------
+.\" * set default formatting
+.\" -----------------------------------------------------------------
+.\" disable hyphenation
+.nh
+.\" disable justification (adjust text to left margin only)
+.ad l
+.\" -----------------------------------------------------------------
+.\" * MAIN CONTENT STARTS HERE *
+.\" -----------------------------------------------------------------
+.SH "NAME"
+ldbmodify \- Modify records in a LDB database
+.SH "SYNOPSIS"
+.HP \w'\fBldbmodify\fR\ 'u
+\fBldbmodify\fR [\-H\ LDB\-URL] [ldif\-file]
+.SH "DESCRIPTION"
+.PP
+ldbmodify changes, adds and deletes records in a LDB database\&. The changes that should be made to the LDB database are read from the specified LDIF\-file\&. If \- is specified as the filename, input is read from stdin\&.
+.PP
+For now, see ldapmodify(1) for details on the LDIF file format\&.
+.SH "OPTIONS"
+.PP
+\-H <ldb\-url>
+.RS 4
+LDB URL to connect to\&. See ldb(3) for details\&.
+.RE
+.SH "ENVIRONMENT"
+.PP
+LDB_URL
+.RS 4
+LDB URL to connect to (can be overridden by using the \-H command\-line option\&.)
+.RE
+.SH "VERSION"
+.PP
+This man page is correct for version 1\&.1 of LDB\&.
+.SH "SEE ALSO"
+.PP
+ldb(3), ldbedit
+.SH "AUTHOR"
+.PP
+ldb was written by
+\m[blue]\fBAndrew Tridgell\fR\m[]\&\s-2\u[1]\d\s+2\&.
+.PP
+If you wish to report a problem or make a suggestion then please see the
+\m[blue]\fB\%http://ldb.samba.org/\fR\m[]
+web site for current contact and maintainer information\&.
+.PP
+This manpage was written by Jelmer Vernooij\&.
+.SH "NOTES"
+.IP " 1." 4
+Andrew Tridgell
+.RS 4
+\%https://www.samba.org/~tridge/
+.RE
diff --git a/databases/ldb25/files/man/ldbrename.1 b/databases/ldb25/files/man/ldbrename.1
new file mode 100644
index 000000000000..0bdbc67a3b32
--- /dev/null
+++ b/databases/ldb25/files/man/ldbrename.1
@@ -0,0 +1,81 @@
+'\" t
+.\"     Title: ldbrename
+.\"    Author: [see the "AUTHOR" section]
+.\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
+.\"      Date: 09/23/2020
+.\"    Manual: System Administration tools
+.\"    Source: LDB 1.1
+.\"  Language: English
+.\"
+.TH "LDBRENAME" "1" "09/23/2020" "LDB 1\&.1" "System Administration tools"
+.\" -----------------------------------------------------------------
+.\" * Define some portability stuff
+.\" -----------------------------------------------------------------
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.\" http://bugs.debian.org/507673
+.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.ie \n(.g .ds Aq \(aq
+.el       .ds Aq '
+.\" -----------------------------------------------------------------
+.\" * set default formatting
+.\" -----------------------------------------------------------------
+.\" disable hyphenation
+.nh
+.\" disable justification (adjust text to left margin only)
+.ad l
+.\" -----------------------------------------------------------------
+.\" * MAIN CONTENT STARTS HERE *
+.\" -----------------------------------------------------------------
+.SH "NAME"
+ldbrename \- Edit LDB databases using your favorite editor
+.SH "SYNOPSIS"
+.HP \w'\fBldbrename\fR\ 'u
+\fBldbrename\fR [\-h] [\-o\ options] {olddn} {newdn}
+.SH "DESCRIPTION"
+.PP
+ldbrename is a utility that allows you to rename trees in an LDB database based by DN\&. This utility takes two arguments: the original DN name of the top element and the DN to change it to\&.
+.SH "OPTIONS"
+.PP
+\-h
+.RS 4
+Show list of available options\&.
+.RE
+.PP
+\-H <ldb\-url>
+.RS 4
+LDB URL to connect to\&. See ldb(3) for details\&.
+.RE
+.PP
+\-o options
+.RS 4
+Extra ldb options, such as modules\&.
+.RE
+.SH "ENVIRONMENT"
+.PP
+LDB_URL
+.RS 4
+LDB URL to connect to (can be overridden by using the \-H command\-line option\&.)
+.RE
+.SH "VERSION"
+.PP
+This man page is correct for version 1\&.1 of LDB\&.
+.SH "SEE ALSO"
+.PP
+ldb(3), ldbmodify, ldbdel, ldif(5)
+.SH "AUTHOR"
+.PP
+ldb was written by
+\m[blue]\fBAndrew Tridgell\fR\m[]\&\s-2\u[1]\d\s+2\&.
+.PP
+If you wish to report a problem or make a suggestion then please see the
+\m[blue]\fB\%http://ldb.samba.org/\fR\m[]
+web site for current contact and maintainer information\&.
+.PP
+This manpage was written by Jelmer Vernooij\&.
+.SH "NOTES"
+.IP " 1." 4
+Andrew Tridgell
+.RS 4
+\%https://www.samba.org/~tridge/
+.RE
diff --git a/databases/ldb25/files/man/ldbsearch.1 b/databases/ldb25/files/man/ldbsearch.1
new file mode 100644
index 000000000000..ff7645bfce4e
--- /dev/null
+++ b/databases/ldb25/files/man/ldbsearch.1
@@ -0,0 +1,91 @@
+'\" t
+.\"     Title: ldbsearch
+.\"    Author: [see the "AUTHOR" section]
+.\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
+.\"      Date: 09/23/2020
+.\"    Manual: System Administration tools
+.\"    Source: LDB 1.1
+.\"  Language: English
+.\"
+.TH "LDBSEARCH" "1" "09/23/2020" "LDB 1\&.1" "System Administration tools"
+.\" -----------------------------------------------------------------
+.\" * Define some portability stuff
+.\" -----------------------------------------------------------------
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.\" http://bugs.debian.org/507673
+.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.ie \n(.g .ds Aq \(aq
+.el       .ds Aq '
+.\" -----------------------------------------------------------------
+.\" * set default formatting
+.\" -----------------------------------------------------------------
+.\" disable hyphenation
+.nh
+.\" disable justification (adjust text to left margin only)
+.ad l
+.\" -----------------------------------------------------------------
+.\" * MAIN CONTENT STARTS HERE *
+.\" -----------------------------------------------------------------
+.SH "NAME"
+ldbsearch \- Search for records in a LDB database
+.SH "SYNOPSIS"
+.HP \w'\fBldbsearch\fR\ 'u
+\fBldbsearch\fR [\-h] [\-s\ base|one|sub] [\-b\ basedn] [\-i] [\-H\ LDB\-URL] [expression] [attributes]
+.SH "DESCRIPTION"
+.PP
+ldbsearch searches a LDB database for records matching the specified expression (see the ldapsearch(1) manpage for a description of the expression format)\&. For each record, the specified attributes are printed\&.
+.SH "OPTIONS"
+.PP
+\-h
+.RS 4
+Show list of available options\&.
+.RE
+.PP
+\-H <ldb\-url>
+.RS 4
+LDB URL to connect to\&. See ldb(3) for details\&.
+.RE
+.PP
+\-s one|sub|base
+.RS 4
+Search scope to use\&. One\-level, subtree or base\&.
+.RE
+.PP
+\-i
+.RS 4
+Read search expressions from stdin\&.
+.RE
+.PP
+\-b basedn
+.RS 4
+Specify Base DN to use\&.
+.RE
+.SH "ENVIRONMENT"
+.PP
+LDB_URL
+.RS 4
+LDB URL to connect to (can be overridden by using the \-H command\-line option\&.)
+.RE
+.SH "VERSION"
+.PP
+This man page is correct for version 1\&.1 of LDB\&.
+.SH "SEE ALSO"
+.PP
+ldb(3), ldbedit(1)
+.SH "AUTHOR"
+.PP
+ldb was written by
+\m[blue]\fBAndrew Tridgell\fR\m[]\&\s-2\u[1]\d\s+2\&.
+.PP
+If you wish to report a problem or make a suggestion then please see the
+\m[blue]\fB\%http://ldb.samba.org/\fR\m[]
+web site for current contact and maintainer information\&.
+.PP
+This manpage was written by Jelmer Vernooij\&.
+.SH "NOTES"
+.IP " 1." 4
+Andrew Tridgell
+.RS 4
+\%https://www.samba.org/~tridge/
+.RE
diff --git a/databases/ldb25/files/patch-buildtools_wafsamba_samba__autoconf.py b/databases/ldb25/files/patch-buildtools_wafsamba_samba__autoconf.py
new file mode 100644
index 000000000000..e98feeb31336
--- /dev/null
+++ b/databases/ldb25/files/patch-buildtools_wafsamba_samba__autoconf.py
@@ -0,0 +1,50 @@
+--- buildtools/wafsamba/samba_autoconf.py.orig	2022-12-15 13:35:50 UTC
++++ buildtools/wafsamba/samba_autoconf.py
+@@ -595,7 +595,7 @@ def library_flags(self, libs):
+ 
+ 
+ @conf
+-def CHECK_LIB(conf, libs, mandatory=False, empty_decl=True, set_target=True, shlib=False):
++def CHECK_LIB(conf, libs, mandatory=False, empty_decl=True, set_target=True, shlib=False, msg=None):
+     '''check if a set of libraries exist as system libraries
+ 
+     returns the sublist of libs that do exist as a syslib or []
+@@ -615,11 +615,29 @@ int foo()
+             ret.append(lib)
+             continue
+ 
++        if msg is None:
++            msg = 'Checking for library %s' % lib
++
+         (ccflags, ldflags, cpppath) = library_flags(conf, lib)
++
+         if shlib:
+-            res = conf.check(features='c cshlib', fragment=fragment, lib=lib, uselib_store=lib, cflags=ccflags, ldflags=ldflags, uselib=lib.upper(), mandatory=False)
++            res = conf.check(features='c cshlib',
++                             fragment=fragment,
++                             lib=lib,
++                             uselib_store=lib,
++                             cflags=ccflags,
++                             ldflags=ldflags,
++                             uselib=lib.upper(),
++                             mandatory=False,
++                             msg=msg)
+         else:
+-            res = conf.check(lib=lib, uselib_store=lib, cflags=ccflags, ldflags=ldflags, uselib=lib.upper(), mandatory=False)
++            res = conf.check(lib=lib,
++                             uselib_store=lib,
++                             cflags=ccflags,
++                             ldflags=ldflags,
++                             uselib=lib.upper(),
++                             mandatory=False,
++                             msg=msg)
+ 
+         if not res:
+             if mandatory:
+@@ -989,5 +1007,5 @@ def SAMBA_CHECK_UNDEFINED_SYMBOL_FLAGS(conf):
+         conf.env.undefined_ldflags = conf.ADD_LDFLAGS('-Wl,-no-undefined', testflags=True)
+ 
+         if (conf.env.undefined_ignore_ldflags == [] and
+-            conf.CHECK_LDFLAGS(['-undefined', 'dynamic_lookup'])):
++            conf.CHECK_LDFLAGS(['-undefined', 'dynamic_lookup'] + conf.env.WERROR_CFLAGS)):
+             conf.env.undefined_ignore_ldflags = ['-undefined', 'dynamic_lookup']
diff --git a/databases/ldb25/files/patch-buildtools_wafsamba_samba__install.py b/databases/ldb25/files/patch-buildtools_wafsamba_samba__install.py
new file mode 100644
index 000000000000..5a85a034aea7
--- /dev/null
+++ b/databases/ldb25/files/patch-buildtools_wafsamba_samba__install.py
@@ -0,0 +1,11 @@
+--- buildtools/wafsamba/samba_install.py.orig	2019-03-21 10:12:32 UTC
++++ buildtools/wafsamba/samba_install.py
+@@ -115,7 +115,7 @@ def install_library(self):
+                 inst_name    = bld.make_libname(t.target)
+         elif self.vnum:
+             vnum_base    = self.vnum.split('.')[0]
+-            install_name = bld.make_libname(target_name, version=self.vnum)
++            install_name = bld.make_libname(target_name, version=vnum_base)
+             install_link = bld.make_libname(target_name, version=vnum_base)
+             inst_name    = bld.make_libname(t.target)
+             if not self.private_library or not t.env.SONAME_ST:
diff --git a/databases/ldb25/files/patch-buildtools_wafsamba_wscript b/databases/ldb25/files/patch-buildtools_wafsamba_wscript
new file mode 100644
index 000000000000..5480a1e65320
--- /dev/null
+++ b/databases/ldb25/files/patch-buildtools_wafsamba_wscript
@@ -0,0 +1,22 @@
+--- buildtools/wafsamba/wscript.orig	2022-03-29 07:53:52 UTC
++++ buildtools/wafsamba/wscript
+@@ -133,12 +133,17 @@ Currently the only tested value is 'smbtorture,smbd/sm
+                    help=("private library directory [PREFIX/lib/%s]" % Context.g_module.APPNAME),
+                    action="store", dest='PRIVATELIBDIR', default=None)
+ 
++    opt.add_option('--with-openldap',
++                   help='additional directory to search for OpenLDAP libs',
++                   action='store', dest='ldap_open', default=None,
++                   match = ['Checking for library lber', 'Checking for library ldap'])
++
+     opt.add_option('--with-libiconv',
+                    help='additional directory to search for libiconv',
+-                   action='store', dest='iconv_open', default='/usr/local',
++                   action='store', dest='iconv_open', default=None,
+                    match = ['Checking for library iconv', 'Checking for iconv_open', 'Checking for header iconv.h'])
+     opt.add_option('--without-gettext',
+-                   help=("Disable use of gettext"),
++                   help=("disable use of gettext"),
+                    action="store_true", dest='disable_gettext', default=False)
+ 
+     gr = opt.option_group('developer options')
diff --git a/databases/ldb25/files/patch-include_ldb__module.h b/databases/ldb25/files/patch-include_ldb__module.h
new file mode 100644
index 000000000000..3b62136e9456
--- /dev/null
+++ b/databases/ldb25/files/patch-include_ldb__module.h
@@ -0,0 +1,15 @@
+--- include/ldb_module.h.orig	2023-03-29 13:42:11 UTC
++++ include/ldb_module.h
+@@ -108,6 +108,12 @@ struct ldb_module;
+  */
+ #define LDB_FLAG_INTERNAL_ACCESS_CHECKED 0x400
+ 
++/*
++ * indicates that this element's values are shared with another element (for
++ * example, in a shallow copy of an ldb_message) and should not be freed
++ */
++#define LDB_FLAG_INTERNAL_SHARED_VALUES 0x200
++
+ /* an extended match rule that always fails to match */
+ #define SAMBA_LDAP_MATCH_ALWAYS_FALSE "1.3.6.1.4.1.7165.4.5.1"
+ 
diff --git a/databases/ldb25/files/patch-ldb_key_value__ldb_kv_cache.c b/databases/ldb25/files/patch-ldb_key_value__ldb_kv_cache.c
new file mode 100644
index 000000000000..4c1eedea0693
--- /dev/null
+++ b/databases/ldb25/files/patch-ldb_key_value__ldb_kv_cache.c
@@ -0,0 +1,13 @@
+--- ldb_key_value/ldb_kv_cache.c.orig	2022-01-24 10:27:24 UTC
++++ ldb_key_value/ldb_kv_cache.c
+@@ -92,7 +92,9 @@ static int ldb_schema_attribute_compare(const void *p1
+ {
+ 	const struct ldb_schema_attribute *sa1 = (const struct ldb_schema_attribute *)p1;
+ 	const struct ldb_schema_attribute *sa2 = (const struct ldb_schema_attribute *)p2;
+-	return ldb_attr_cmp(sa1->name, sa2->name);
++	int res = ldb_attr_cmp(sa1->name, sa2->name);
++
++	return (res) ? res : (sa1->flags > sa2->flags) ? 1 : (sa1->flags < sa2->flags) ? -1 : 0;
+ }
+ 
+ /*
diff --git a/databases/ldb25/files/patch-lib_replace_replace.c b/databases/ldb25/files/patch-lib_replace_replace.c
new file mode 100644
index 000000000000..00c04853dfdf
--- /dev/null
+++ b/databases/ldb25/files/patch-lib_replace_replace.c
@@ -0,0 +1,20 @@
+--- lib/replace/replace.c.orig	2023-11-22 12:09:13 UTC
++++ lib/replace/replace.c
+@@ -560,6 +560,7 @@ long long int rep_strtoll(const char *str, char **endp
+ 
+ 
+ #ifndef HAVE_STRTOULL
++#warning NO_HAVE_STRTOULL
+ unsigned long long int rep_strtoull(const char *str, char **endptr, int base)
+ {
+ #ifdef HAVE_STRTOUQ
+@@ -573,7 +574,9 @@ unsigned long long int rep_strtoull(const char *str, c
+ #endif
+ }
+ #else
++#warning HAVE_STROULL
+ #ifdef HAVE_BSD_STRTOLL
++#warning HAVE_BSD_STROLL
+ #undef strtoull
+ unsigned long long int rep_strtoull(const char *str, char **endptr, int base)
+ {
diff --git a/databases/ldb25/files/patch-lib_replace_wscript b/databases/ldb25/files/patch-lib_replace_wscript
new file mode 100644
index 000000000000..cf9834979d44
--- /dev/null
+++ b/databases/ldb25/files/patch-lib_replace_wscript
@@ -0,0 +1,11 @@
+--- lib/replace/wscript.orig	2022-10-24 10:21:14 UTC
++++ lib/replace/wscript
+@@ -122,7 +122,7 @@ def configure(conf):
+     conf.CHECK_HEADERS('sys/atomic.h stdatomic.h')
+     conf.CHECK_HEADERS('libgen.h')
+ 
+-    if conf.CHECK_CFLAGS('-Wno-format-truncation'):
++    if conf.CHECK_CFLAGS(['-Wno-format-truncation'] + conf.env.WERROR_CFLAGS):
+         conf.define('HAVE_WNO_FORMAT_TRUNCATION', '1')
+ 
+     if conf.CHECK_CFLAGS('-Wno-unused-function'):
diff --git a/databases/ldb25/files/patch-wscript b/databases/ldb25/files/patch-wscript
new file mode 100644
index 000000000000..81600dc38d83
--- /dev/null
+++ b/databases/ldb25/files/patch-wscript
@@ -0,0 +1,40 @@
+--- wscript.orig	2023-03-29 15:42:11.181590800 +0200
++++ wscript	2023-12-07 17:41:11.676269000 +0100
+@@ -208,7 +208,7 @@
+     if bld.env.standalone_ldb:
+         if not 'PACKAGE_VERSION' in bld.env:
+             bld.env.PACKAGE_VERSION = VERSION
+-        bld.env.PKGCONFIGDIR = '${LIBDIR}/pkgconfig'
++        bld.env.PKGCONFIGDIR = '%%PKGCONFIGDIR%%'
+         private_library = False
+     else:
+         private_library = True
+@@ -413,7 +413,7 @@
+                               bld.SUBDIR('ldb_mdb',
+                                          '''ldb_mdb.c '''),
+                               private_library=True,
+-                              deps='ldb lmdb ldb_key_value')
++                              deps='replace ldb lmdb ldb_key_value')
+             lmdb_deps = ' ldb_mdb_int'
+         else:
+             lmdb_deps = ''
+@@ -498,11 +498,6 @@
+                          deps='cmocka ldb',
+                          install=False)
+ 
+-        bld.SAMBA_BINARY('ldb_match_test',
+-                         source='tests/ldb_match_test.c',
+-                         deps='cmocka ldb',
+-                         install=False)
+-
+         bld.SAMBA_BINARY('ldb_key_value_test',
+                          source='tests/ldb_key_value_test.c',
+                          deps='cmocka ldb ldb_tdb_err_map',
+@@ -634,7 +629,6 @@
+                  'ldb_tdb_guid_mod_op_test',
+                  'ldb_tdb_kv_ops_test',
+                  'ldb_tdb_test',
+-                 'ldb_match_test',
+                  'ldb_key_value_test',
+                  # we currently don't run ldb_key_value_sub_txn_tdb_test as it
+                  # tests the nested/sub transaction handling
diff --git a/databases/ldb25/pkg-descr b/databases/ldb25/pkg-descr
new file mode 100644
index 000000000000..6e55f91b65a7
--- /dev/null
+++ b/databases/ldb25/pkg-descr
@@ -0,0 +1,7 @@
+ldb is a LDAP-like embedded database.
+
+ldb provides a fast database with an LDAP-like API designed to be used
+within an application.
+
+In some ways it can be seen as a intermediate solution between key-value
+pair databases and a real LDAP database.
diff --git a/databases/leo_center/Makefile b/databases/leo_center/Makefile
index 45b4f98716a8..5059c6207099 100644
--- a/databases/leo_center/Makefile
+++ b/databases/leo_center/Makefile
@@ -1,5 +1,3 @@
-# Created by: Mikolaj Golub <trociny@FreeBSD.org>
-
 PORTNAME=	leo_center
 PORTVERSION=	0.4.70
 PORTREVISION=	1
@@ -7,6 +5,7 @@ CATEGORIES=	databases
 
 MAINTAINER=	trociny@FreeBSD.org
 COMMENT=	LeoFS Web console
+WWW=		https://leo-project.net/
 
 LICENSE=	APACHE20
 
diff --git a/databases/leo_center/pkg-descr b/databases/leo_center/pkg-descr
index 5fcc784cc4cb..b6a654d0ca02 100644
--- a/databases/leo_center/pkg-descr
+++ b/databases/leo_center/pkg-descr
@@ -1,5 +1,3 @@
 LeoFS is a highly scalable, fault-tolerant distributed file system for
 the Web. LeoCenter is LeoFS Web console in your browser.  You can use
 it to easily operate LeoFS.
-
-WWW: https://leo-project.net/
diff --git a/databases/leofs/Makefile b/databases/leofs/Makefile
index 46f358e64f87..00ff718ee162 100644
--- a/databases/leofs/Makefile
+++ b/databases/leofs/Makefile
@@ -1,22 +1,20 @@
-# Created by: Mikolaj Golub <trociny@FreeBSD.org>
-
 PORTNAME=	leofs
 DISTVERSION=	1.4.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	databases
 DIST_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	trociny@FreeBSD.org
 COMMENT=	Highly scalable, fault-tolerant distributed file system
+WWW=		https://leo-project.net/
 
 LICENSE=	APACHE20
 
-BROKEN_aarch64=		Does not compile: fatal error: lzo/lzo1x.h file not found
-NOT_FOR_ARCHS=		riscv64 sparc64
+NOT_FOR_ARCHS=		riscv64
 NOT_FOR_ARCHS_REASON=	does not build: error Please implement AtomicPointer for this platform
 
 BUILD_DEPENDS=	${LOCALBASE}/lib/erlang21/bin/erlc:lang/erlang-runtime21 \
-		${LOCALBASE}/bin/cmake:devel/cmake \
+		${LOCALBASE}/bin/cmake:devel/cmake-core \
 		${LOCALBASE}/lib/libcheck.a:devel/check
 
 USE_GITHUB=	yes
@@ -57,6 +55,7 @@ SUB_LIST+=	LEOFS_USER=${LEOFS_USER} \
 SUB_FILES+=	${LEOFS_SBIN_FILES:S/^/sbin-/}
 
 USES=		dos2unix gmake pkgconfig ssl
+USE_CXXSTD=	gnu++11
 USE_RC_SUBR=	${PORTNAME}
 
 DOS2UNIX_FILES=	apps/leo_*/snmp/snmpa_*/leo_*_snmp.config
@@ -107,6 +106,9 @@ LEOFS_DEPS=	\
 
 GH_TUPLE=	${LEOFS_DEPS:C,(.*)/(.*)=(.*):(.*),\1:\2:\3:\4/deps/\4,}
 
+CFLAGS_aarch64=	-DLEVELDB_CSTDATOMIC_PRESENT
+CFLAGS_armv6=	-DLEVELDB_CSTDATOMIC_PRESENT
+CFLAGS_armv7=	-DLEVELDB_CSTDATOMIC_PRESENT
 CFLAGS_powerpc=	-DLEVELDB_CSTDATOMIC_PRESENT
 CFLAGS_powerpc64=	-DLEVELDB_CSTDATOMIC_PRESENT
 CFLAGS_powerpc64le=	-DLEVELDB_CSTDATOMIC_PRESENT
diff --git a/databases/leofs/pkg-descr b/databases/leofs/pkg-descr
index 8a6dfad6fbdd..111de6be5721 100644
--- a/databases/leofs/pkg-descr
+++ b/databases/leofs/pkg-descr
@@ -14,5 +14,3 @@ LeoFS provides High Scalability. Adding and removing nodes is simple
 and quick, allowing you to react swiftly when your needs change. A
 LeoFS cluster can be thought as elastic storage that you can stretch
 as much and as often as you need.
-
-WWW: http://leo-project.net/
diff --git a/databases/leveldb/Makefile b/databases/leveldb/Makefile
index f091f6826d80..970602748f7f 100644
--- a/databases/leveldb/Makefile
+++ b/databases/leveldb/Makefile
@@ -1,26 +1,26 @@
-# Created by: Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>
-
 PORTNAME=	leveldb
 PORTVERSION=	1.23
+PORTREVISION=	1
 CATEGORIES=	databases
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Fast and lightweight key/value database library by Google
+WWW=		https://github.com/google/leveldb
 
 LICENSE=	BSD3CLAUSE
 
-USES=		cmake compiler:c++11-lang localbase
+TEST_DEPENDS=	benchmark>=0:devel/benchmark \
+		googletest>=0:devel/googletest
+
+USES=		cmake:testing compiler:c++11-lang localbase:ldflags
 
 CMAKE_OFF=	LEVELDB_BUILD_TESTS
 CMAKE_ON=	BUILD_SHARED_LIBS LEVELDB_BUILD_BENCHMARKS LEVELDB_INSTALL
+CMAKE_TESTING_ON=	LEVELDB_BUILD_TESTS
 USE_CXXSTD=	c++11
 USE_LDCONFIG=	yes
 
-PLIST_SUB=	SHLIB_MAJOR=${SHLIB_MAJOR} \
-		SHLIB_MINOR=${SHLIB_MINOR}
-
-SHLIB_MAJOR=	${PORTVERSION:R}
-SHLIB_MINOR=	${PORTVERSION:E}
+PLIST_SUB=	PORTVERSION=${PORTVERSION}
 
 GH_ACCOUNT=	google
 USE_GITHUB=	yes
@@ -33,9 +33,6 @@ SNAPPY_LIB_DEPENDS=	libsnappy.so:archivers/snappy
 SNAPPY_VARS=		SNAPPY=1 SNAPPY_CFLAGS=-DSNAPPY
 SNAPPY_VARS_OFF=	SNAPPY=0 SNAPPY_CFLAGS=
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|%%SHLIB_MAJOR%%|${SHLIB_MAJOR}|; s|%%SHLIB_MINOR%%|${SHLIB_MINOR}|' ${WRKSRC}/CMakeLists.txt
-
 post-install:
 	${AR} cq ${STAGEDIR}${PREFIX}/lib/libleveldb.a ${BUILD_WRKSRC}/CMakeFiles/leveldb.dir/*/*.o
 # backward compatibility (for databases/p5-Tie-LevelDB)
diff --git a/databases/leveldb/files/patch-CMakeLists.txt b/databases/leveldb/files/patch-CMakeLists.txt
index f4c15a9c4f26..2983e1b6df73 100644
--- a/databases/leveldb/files/patch-CMakeLists.txt
+++ b/databases/leveldb/files/patch-CMakeLists.txt
@@ -1,14 +1,25 @@
---- CMakeLists.txt.orig	2019-03-29 21:37:39 UTC
+--- CMakeLists.txt.orig	2021-02-23 20:54:37 UTC
 +++ CMakeLists.txt
-@@ -228,6 +228,11 @@ if (NOT HAVE_CXX17_HAS_INCLUDE)
- endif(NOT HAVE_CXX17_HAS_INCLUDE)
+@@ -295,22 +295,6 @@ if(LEVELDB_BUILD_TESTS)
+   set(install_gmock OFF)
+   set(build_gmock ON)
+ 
+-  # This project is tested using GoogleTest.
+-  add_subdirectory("third_party/googletest")
+-
+-  # This project uses Google benchmark for benchmarking.
+-  set(BENCHMARK_ENABLE_TESTING OFF CACHE BOOL "" FORCE)
+-  set(BENCHMARK_ENABLE_EXCEPTIONS OFF CACHE BOOL "" FORCE)
+-  add_subdirectory("third_party/benchmark")
+-
+-  # GoogleTest triggers a missing field initializers warning.
+-  if(LEVELDB_HAVE_NO_MISSING_FIELD_INITIALIZERS)
+-    set_property(TARGET gtest
+-        APPEND PROPERTY COMPILE_OPTIONS -Wno-missing-field-initializers)
+-    set_property(TARGET gmock
+-        APPEND PROPERTY COMPILE_OPTIONS -Wno-missing-field-initializers)
+-  endif(LEVELDB_HAVE_NO_MISSING_FIELD_INITIALIZERS)
+-
+   function(leveldb_test test_file)
+     get_filename_component(test_target_name "${test_file}" NAME_WE)
  
- if(BUILD_SHARED_LIBS)
-+  set_target_properties(leveldb
-+    PROPERTIES
-+      VERSION %%SHLIB_MAJOR%%.%%SHLIB_MINOR%%
-+      SOVERSION %%SHLIB_MAJOR%%
-+  )
-   target_compile_definitions(leveldb
-     PUBLIC
-       # Used by include/export.h.
diff --git a/databases/leveldb/pkg-descr b/databases/leveldb/pkg-descr
index 12c0cd29da19..f5175b9a0d12 100644
--- a/databases/leveldb/pkg-descr
+++ b/databases/leveldb/pkg-descr
@@ -14,5 +14,3 @@ Features:
   interface so users can customize the operating system interactions.
 - Detailed documentation about how to use the library is included with the
   source code.
-
-WWW: https://github.com/google/leveldb
diff --git a/databases/leveldb/pkg-plist b/databases/leveldb/pkg-plist
index 69dde5e2f7ab..dbc60f08af68 100644
--- a/databases/leveldb/pkg-plist
+++ b/databases/leveldb/pkg-plist
@@ -19,6 +19,6 @@ lib/cmake/leveldb/leveldbTargets-%%CMAKE_BUILD_TYPE%%.cmake
 lib/cmake/leveldb/leveldbTargets.cmake
 lib/libleveldb.a
 lib/libleveldb.so
-lib/libleveldb.so.%%SHLIB_MAJOR%%
-lib/libleveldb.so.%%SHLIB_MAJOR%%.%%SHLIB_MINOR%%
+lib/libleveldb.so.1
+lib/libleveldb.so.%%PORTVERSION%%.0
 %%DATADIR%%/build_config.mk
diff --git a/databases/libcouchbase/Makefile b/databases/libcouchbase/Makefile
index 04a4773b638d..44c451af1c23 100644
--- a/databases/libcouchbase/Makefile
+++ b/databases/libcouchbase/Makefile
@@ -1,17 +1,19 @@
 PORTNAME=	libcouchbase
-PORTVERSION=	2.10.7
+PORTVERSION=	3.3.8
+PORTREVISION=	1
 CATEGORIES=	databases
-MASTER_SITES=	http://packages.couchbase.com/clients/c/
+MASTER_SITES=	https://github.com/couchbase/${PORTNAME}/releases/download/${PORTVERSION}/
 
 MAINTAINER=	sergey@couchbase.com
 COMMENT=	Multithreaded noSQL database (client and library)
+WWW=		https://docs.couchbase.com/c-sdk/current/hello-world/start-using-sdk.html
 
 LICENSE=	APACHE20
 
-BROKEN_mips64=		fails to link: ld: failed to merge target specific data
+BROKEN_mips64=	fails to link: ld: failed to merge target specific data
 
-LIB_DEPENDS=	libevent.so:devel/libevent \
-		libev.so:devel/libev \
+LIB_DEPENDS=	libev.so:devel/libev \
+		libevent.so:devel/libevent \
 		libuv.so:devel/libuv
 
 USES=		cmake perl5 ssl
@@ -20,6 +22,8 @@ USE_PERL5=	build run
 
 CMAKE_ARGS=	-DLCB_NO_TESTS=1
 
+CONFLICTS_INSTALL=	coin-or-cbc
+
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == aarch64 || ${ARCH:Marmv*} || ${ARCH} == riscv64
diff --git a/databases/libcouchbase/distinfo b/databases/libcouchbase/distinfo
index 5c7d9fd1700e..3a4d0747a241 100644
--- a/databases/libcouchbase/distinfo
+++ b/databases/libcouchbase/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1592402966
-SHA256 (libcouchbase-2.10.7.tar.gz) = bbee97ef2394f275b8cd4b9b940010566a2d34d4754ba3532a7fca3d94029b75
-SIZE (libcouchbase-2.10.7.tar.gz) = 1345574
+TIMESTAMP = 1692385531
+SHA256 (libcouchbase-3.3.8.tar.gz) = 5e29ab6bfc5c1fe4f54450f6285cc36de8fff4bf2d39dd16d17aa47cbb9ff88a
+SIZE (libcouchbase-3.3.8.tar.gz) = 1491492
diff --git a/databases/libcouchbase/files/patch-CMakeLists.txt b/databases/libcouchbase/files/patch-CMakeLists.txt
index da30e2e7b71d..5a1ba2f57f57 100644
--- a/databases/libcouchbase/files/patch-CMakeLists.txt
+++ b/databases/libcouchbase/files/patch-CMakeLists.txt
@@ -1,16 +1,16 @@
---- CMakeLists.txt.orig	2015-08-27 15:51:35 UTC
+--- CMakeLists.txt.orig	2023-08-16 20:12:55 UTC
 +++ CMakeLists.txt
-@@ -371,6 +371,7 @@ INSTALL(DIRECTORY include/libcouchbase $
-     DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
-     FILES_MATCHING PATTERN *.h PATTERN *.c)
- 
-+set(CMAKE_INSTALL_MANDIR "man")
- INSTALL(DIRECTORY doc/man/ DESTINATION ${CMAKE_INSTALL_MANDIR}/man1 FILES_MATCHING PATTERN *.1)
- INSTALL(DIRECTORY doc/man/ DESTINATION ${CMAKE_INSTALL_MANDIR}/man4  FILES_MATCHING PATTERN *.4)
+@@ -484,6 +484,7 @@ IF(LCB_INSTALL_HEADERS)
+ ENDIF()
  
-@@ -382,7 +383,7 @@ SET(_lcb_manifest "${LCB_GENINFODIR}/MAN
+ IF(NOT LCB_NO_TOOLS)
++    set(CMAKE_INSTALL_MANDIR "share/man")
+     INSTALL(DIRECTORY doc/man/ DESTINATION ${CMAKE_INSTALL_MANDIR}/man1 FILES_MATCHING PATTERN *.1)
+     INSTALL(DIRECTORY doc/man/ DESTINATION ${CMAKE_INSTALL_MANDIR}/man4  FILES_MATCHING PATTERN *.4)
+ ENDIF()
+@@ -503,7 +504,7 @@ SET(_lcb_manifest "${LCB_GENINFODIR}/MANIFEST")
  # pkg-config stuff goes with installation
- IF(NOT WIN32)
+ IF(NOT WIN32 AND LCB_INSTALL_PKGCONFIG)
      CONFIGURE_FILE(packaging/libcouchbase.pc.in packaging/libcouchbase.pc @ONLY)
 -    INSTALL(FILES ${PROJECT_BINARY_DIR}/packaging/libcouchbase.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
 +    INSTALL(FILES ${PROJECT_BINARY_DIR}/packaging/libcouchbase.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}data/pkgconfig)
diff --git a/databases/libcouchbase/files/patch-plugins_io_libuv_libuv__compat.h b/databases/libcouchbase/files/patch-plugins_io_libuv_libuv__compat.h
new file mode 100644
index 000000000000..c082286f2d92
--- /dev/null
+++ b/databases/libcouchbase/files/patch-plugins_io_libuv_libuv__compat.h
@@ -0,0 +1,13 @@
+--- plugins/io/libuv/libuv_compat.h.orig	2023-06-03 18:58:46 UTC
++++ plugins/io/libuv/libuv_compat.h
+@@ -35,6 +35,10 @@
+ #define UNKNOWN -1
+ #endif
+ 
++#ifndef ENODATA
++#define ENODATA EPIPE
++#endif
++
+ #ifndef EAIFAMNOSUPPORT
+ #define EAIFAMNOSUPPORT EAI_FAMILY
+ #endif
diff --git a/databases/libcouchbase/files/patch-src_lcbio_ioutils.cc b/databases/libcouchbase/files/patch-src_lcbio_ioutils.cc
index dc48546eb71c..57093aa31465 100644
--- a/databases/libcouchbase/files/patch-src_lcbio_ioutils.cc
+++ b/databases/libcouchbase/files/patch-src_lcbio_ioutils.cc
@@ -1,10 +1,12 @@
---- src/lcbio/ioutils.cc.orig	2020-06-17 13:30:27 UTC
+--- src/lcbio/ioutils.cc.orig	2022-12-09 14:14:27 UTC
 +++ src/lcbio/ioutils.cc
-@@ -25,6 +25,7 @@
- #include "manager.h"
+@@ -24,6 +24,9 @@
+ #include "hostlist.h"
  #include "iotable.h"
- #include <stdio.h>
-+#include <netinet/in.h>
  #include "ssl.h"
++#ifdef __FreeBSD__
++#include <netinet/in.h>
++#endif
  
- lcbio_CSERR
+ lcbio_CSERR lcbio_mkcserr(int syserr)
+ {
diff --git a/databases/libcouchbase/files/patch-tools_cbc-proxy.cc b/databases/libcouchbase/files/patch-tools_cbc-proxy.cc
index 58f053571a60..39945c572511 100644
--- a/databases/libcouchbase/files/patch-tools_cbc-proxy.cc
+++ b/databases/libcouchbase/files/patch-tools_cbc-proxy.cc
@@ -1,10 +1,13 @@
---- tools/cbc-proxy.cc.orig	2020-06-17 13:30:27 UTC
+--- tools/cbc-proxy.cc.orig	2022-12-09 14:19:12 UTC
 +++ tools/cbc-proxy.cc
-@@ -18,6 +18,7 @@
+@@ -35,6 +35,10 @@
+ #include <event2/bufferevent.h>
+ #include <event2/buffer.h>
  
- #include "config.h"
- #include <sys/types.h>
++#ifdef __FreeBSD__
 +#include <netinet/in.h>
- #include <libcouchbase/couchbase.h>
- #include <libcouchbase/vbucket.h>
- #include <libcouchbase/api3.h>
++#endif
++
+ using namespace cbc;
+ using namespace cliopts;
+ 
diff --git a/databases/libcouchbase/pkg-descr b/databases/libcouchbase/pkg-descr
index ce6778201a69..d80d99754f26 100644
--- a/databases/libcouchbase/pkg-descr
+++ b/databases/libcouchbase/pkg-descr
@@ -1,5 +1,3 @@
 This is the C client library for Couchbase. It communicates with the cluster
 and speaks the relevant protocols necessary to connect to the cluster and
 execute data operations.
-
-WWW: https://developer.couchbase.com/documentation/server/current/sdk/c/start-using-sdk.html
diff --git a/databases/libcouchbase/pkg-plist b/databases/libcouchbase/pkg-plist
index 275ff95d6e58..77350377fc07 100644
--- a/databases/libcouchbase/pkg-plist
+++ b/databases/libcouchbase/pkg-plist
@@ -3,15 +3,18 @@ bin/cbc-admin
 bin/cbc-bucket-create
 bin/cbc-bucket-delete
 bin/cbc-bucket-flush
+bin/cbc-bucket-list
 bin/cbc-cat
+bin/cbc-collection-id
+bin/cbc-collection-manifest
 bin/cbc-connstr
 bin/cbc-create
 bin/cbc-decr
+bin/cbc-gen
 bin/cbc-hash
 bin/cbc-incr
 bin/cbc-keygen
 bin/cbc-lock
-bin/cbc-mcflush
 bin/cbc-mcversion
 bin/cbc-n1ql
 bin/cbc-n1qlback
@@ -35,29 +38,23 @@ bin/cbc-version
 bin/cbc-view
 bin/cbc-watch
 bin/cbc-write-config
-include/libcouchbase/_cxxwrap.h
-include/libcouchbase/analytics.h
-include/libcouchbase/api-legacy.h
-include/libcouchbase/api3.h
 include/libcouchbase/assert.h
 include/libcouchbase/auth.h
-include/libcouchbase/cbft.h
 include/libcouchbase/cntl-private.h
 include/libcouchbase/cntl.h
 include/libcouchbase/configuration.h
 include/libcouchbase/couchbase.h
 include/libcouchbase/crypto.h
-include/libcouchbase/deprecated.h
 include/libcouchbase/error.h
-include/libcouchbase/http.h
+include/libcouchbase/iometrics.h
 include/libcouchbase/iops.h
 include/libcouchbase/ixmgmt.h
 include/libcouchbase/kvbuf.h
 include/libcouchbase/libev_io_opts.h
 include/libcouchbase/libevent_io_opts.h
 include/libcouchbase/libuv_io_opts.h
+include/libcouchbase/logger.h
 include/libcouchbase/metrics.h
-include/libcouchbase/n1ql.h
 include/libcouchbase/pktfwd.h
 include/libcouchbase/plugins/io/bsdio-inl.c
 include/libcouchbase/plugins/io/libuv/libuv_compat.h
@@ -66,49 +63,47 @@ include/libcouchbase/plugins/io/libuv/plugin-libuv.c
 include/libcouchbase/plugins/io/wsaerr-inl.c
 include/libcouchbase/plugins/io/wsaerr.h
 include/libcouchbase/select_io_opts.h
-include/libcouchbase/subdoc.h
 include/libcouchbase/sysdefs.h
 include/libcouchbase/tracing.h
+include/libcouchbase/utils.h
 include/libcouchbase/vbucket.h
-include/libcouchbase/views.h
 include/libcouchbase/visibility.h
 lib/libcouchbase.so
-lib/libcouchbase.so.2
-lib/libcouchbase.so.2.0.69
-lib/libcouchbase_libev.so
-lib/libcouchbase_libevent.so
-lib/libcouchbase_libuv.so
+lib/libcouchbase.so.8
+lib/libcouchbase.so.8.0.16
+lib/libcouchbase/libcouchbase_libev.so
+lib/libcouchbase/libcouchbase_libevent.so
+lib/libcouchbase/libcouchbase_libuv.so
 libdata/pkgconfig/libcouchbase.pc
-man/man1/cbc-admin.1.gz
-man/man1/cbc-bucket-create.1.gz
-man/man1/cbc-bucket-delete.1.gz
-man/man1/cbc-cat.1.gz
-man/man1/cbc-connstr.1.gz
-man/man1/cbc-cp.1.gz
-man/man1/cbc-create.1.gz
-man/man1/cbc-decr.1.gz
-man/man1/cbc-flush.1.gz
-man/man1/cbc-hash.1.gz
-man/man1/cbc-incr.1.gz
-man/man1/cbc-lock.1.gz
-man/man1/cbc-mcflush.1.gz
-man/man1/cbc-mcversion.1.gz
-man/man1/cbc-n1ql.1.gz
-man/man1/cbc-n1qlback.1.gz
-man/man1/cbc-observe.1.gz
-man/man1/cbc-pillowfight.1.gz
-man/man1/cbc-ping.1.gz
-man/man1/cbc-rm.1.gz
-man/man1/cbc-role-list.1.gz
-man/man1/cbc-stats.1.gz
-man/man1/cbc-subdoc.1.gz
-man/man1/cbc-unlock.1.gz
-man/man1/cbc-user-delete.1.gz
-man/man1/cbc-user-list.1.gz
-man/man1/cbc-user-upsert.1.gz
-man/man1/cbc-verbosity.1.gz
-man/man1/cbc-version.1.gz
-man/man1/cbc-view.1.gz
-man/man1/cbc-watch.1.gz
-man/man1/cbc.1.gz
-man/man4/cbcrc.4.gz
+share/man/man1/cbc-admin.1.gz
+share/man/man1/cbc-bucket-create.1.gz
+share/man/man1/cbc-bucket-delete.1.gz
+share/man/man1/cbc-cat.1.gz
+share/man/man1/cbc-connstr.1.gz
+share/man/man1/cbc-cp.1.gz
+share/man/man1/cbc-create.1.gz
+share/man/man1/cbc-decr.1.gz
+share/man/man1/cbc-flush.1.gz
+share/man/man1/cbc-hash.1.gz
+share/man/man1/cbc-incr.1.gz
+share/man/man1/cbc-lock.1.gz
+share/man/man1/cbc-mcversion.1.gz
+share/man/man1/cbc-n1ql.1.gz
+share/man/man1/cbc-n1qlback.1.gz
+share/man/man1/cbc-observe.1.gz
+share/man/man1/cbc-pillowfight.1.gz
+share/man/man1/cbc-ping.1.gz
+share/man/man1/cbc-rm.1.gz
+share/man/man1/cbc-role-list.1.gz
+share/man/man1/cbc-stats.1.gz
+share/man/man1/cbc-subdoc.1.gz
+share/man/man1/cbc-unlock.1.gz
+share/man/man1/cbc-user-delete.1.gz
+share/man/man1/cbc-user-list.1.gz
+share/man/man1/cbc-user-upsert.1.gz
+share/man/man1/cbc-verbosity.1.gz
+share/man/man1/cbc-version.1.gz
+share/man/man1/cbc-view.1.gz
+share/man/man1/cbc-watch.1.gz
+share/man/man1/cbc.1.gz
+share/man/man4/cbcrc.4.gz
diff --git a/databases/libdbi-drivers/Makefile b/databases/libdbi-drivers/Makefile
index a6fee5ae8d1e..acf82837f2e9 100644
--- a/databases/libdbi-drivers/Makefile
+++ b/databases/libdbi-drivers/Makefile
@@ -1,5 +1,3 @@
-# Created by: ijliao
-
 PORTNAME=	libdbi-drivers
 PORTVERSION=	0.9.0
 PORTREVISION=	6
@@ -8,6 +6,7 @@ MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${DISTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Drivers for libdbi
+WWW=		https://libdbi-drivers.sourceforge.net/
 
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/COPYING
@@ -48,5 +47,6 @@ SQLITE3_PLIST_FILES=	lib/dbd/libdbdsqlite3.so
 
 post-patch:
 	@${TOUCH} ${WRKSRC}/drivers/*/dbd_*/*
+	@${REINPLACE_CMD} 's/tests //' ${WRKSRC}/Makefile.in
 
 .include <bsd.port.mk>
diff --git a/databases/libdbi-drivers/pkg-descr b/databases/libdbi-drivers/pkg-descr
index cbf876d37a44..e2f3f99b42ae 100644
--- a/databases/libdbi-drivers/pkg-descr
+++ b/databases/libdbi-drivers/pkg-descr
@@ -1,4 +1,2 @@
 The libdbi-drivers project maintains drivers for libdbi. Drivers are
 distributed separately from the library itself.
-
-WWW: http://libdbi-drivers.sourceforge.net/
diff --git a/databases/libdbi/Makefile b/databases/libdbi/Makefile
index 2c126ea44114..06d46fab1ee8 100644
--- a/databases/libdbi/Makefile
+++ b/databases/libdbi/Makefile
@@ -1,5 +1,3 @@
-# Created by: ijliao
-
 PORTNAME=	libdbi
 PORTVERSION=	0.9.0
 PORTREVISION=	3
@@ -8,6 +6,7 @@ MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Database Independent Abstraction Layer for C
+WWW=		https://libdbi.sourceforge.net/
 
 LICENSE=	LGPL21+
 LICENSE_FILE=	${WRKSRC}/COPYING
diff --git a/databases/libdbi/pkg-descr b/databases/libdbi/pkg-descr
index a2e4e51c0eb5..8bf1989016f9 100644
--- a/databases/libdbi/pkg-descr
+++ b/databases/libdbi/pkg-descr
@@ -2,5 +2,3 @@ libdbi implements a database-independent abstraction layer in C, similar
 to the DBI/DBD layer in Perl. Writing one generic set of code, programmers
 can leverage the power of multiple databases and multiple simultaneous
 database connections by using this framework.
-
-WWW: http://libdbi.sourceforge.net/
diff --git a/databases/libdrizzle-redux/Makefile b/databases/libdrizzle-redux/Makefile
index d0782d9e465d..c21603b77d04 100644
--- a/databases/libdrizzle-redux/Makefile
+++ b/databases/libdrizzle-redux/Makefile
@@ -1,5 +1,3 @@
-# Created by: Jim Ohlstein <jim@ohlste.in>
-
 PORTNAME=	libdrizzle
 PORTVERSION=	5.1.4
 PORTREVISION=	2
@@ -11,6 +9,7 @@ EXTRACT_ONLY=	libdrizzle-5.1.4.tar.gz
 
 MAINTAINER=	jim@ohlste.in
 COMMENT=	Client and protocol library for the Drizzle database
+WWW=		https://launchpad.net/libdrizzle
 
 LICENSE=	BSD2CLAUSE
 
@@ -18,7 +17,7 @@ GNU_CONFIGURE=	yes
 USES=		gmake libtool ssl
 USE_LDCONFIG=	yes
 
-CONFLICTS=	libdrizzle-[0-9]*
+CONFLICTS_INSTALL=	libdrizzle # lib/libdrizzle.so
 
 OPTIONS_DEFINE=	DOCS
 
diff --git a/databases/libdrizzle-redux/pkg-descr b/databases/libdrizzle-redux/pkg-descr
index bd58b1722fd5..058c5fffc133 100644
--- a/databases/libdrizzle-redux/pkg-descr
+++ b/databases/libdrizzle-redux/pkg-descr
@@ -1,5 +1,3 @@
 Drizzle Client & Protocol Library. This project
 is for the new development of the MySQL compatible
 C connector library called libdrizzle-redux.
-
-WWW: https://launchpad.net/libdrizzle
diff --git a/databases/libdrizzle/Makefile b/databases/libdrizzle/Makefile
index 44467faf6415..2f2c58647f03 100644
--- a/databases/libdrizzle/Makefile
+++ b/databases/libdrizzle/Makefile
@@ -1,5 +1,3 @@
-# Created by: Greg Larkin <glarkin@FreeBSD.org>
-
 PORTNAME=	libdrizzle
 PORTVERSION=	0.8
 PORTREVISION=	7
@@ -9,6 +7,7 @@ MASTER_SITES=	http://launchpadlibrarian.net/41155299/ \
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Client and protocol library for the Drizzle database
+WWW=		https://launchpad.net/libdrizzle
 
 LICENSE=	BSD3CLAUSE
 
@@ -23,6 +22,8 @@ CONFIGURE_ARGS+=--enable-libsqlite3
 USE_LDCONFIG=	yes
 INSTALL_TARGET=	install-strip
 
+CONFLICTS_INSTALL=	libdrizzle-redux # lib/libdrizzle.so
+
 SAMPLE_PROGS=	client pipe_query proxy server simple \
 		simple_multi sqlite_server
 
diff --git a/databases/libdrizzle/pkg-descr b/databases/libdrizzle/pkg-descr
index 9b847cd0471c..ae0a623389b5 100644
--- a/databases/libdrizzle/pkg-descr
+++ b/databases/libdrizzle/pkg-descr
@@ -4,5 +4,3 @@ utilities and any new projects that require low-level protocol
 communication (like proxies). Other language interfaces (PHP
 extensions, Python DBI, Perl DBD, SWIG, ...) should be built off
 of this library.
-
-WWW: https://launchpad.net/libdrizzle
diff --git a/databases/libgda5-bdb/Makefile b/databases/libgda5-bdb/Makefile
deleted file mode 100644
index 78fc3958368f..000000000000
--- a/databases/libgda5-bdb/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-# Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
-
-PORTREVISION=	0
-CATEGORIES=	databases gnome
-PKGNAMESUFFIX=	5-bdb
-
-MAINTAINER=	gnome@FreeBSD.org
-COMMENT=	Provides Berkeley DB backend for the libgda5 library
-
-MASTERDIR=	${.CURDIR}/../libgda5
-BUILD_WRKSRC=	${WRKSRC}/providers/bdb/
-INSTALL_WRKSRC=	${BUILD_WRKSRC}
-PLIST=		${.CURDIR}/pkg-plist
-
-LIBGDA5_SLAVE=	bdb
-
-.include "${MASTERDIR}/Makefile"
diff --git a/databases/libgda5-bdb/pkg-plist b/databases/libgda5-bdb/pkg-plist
deleted file mode 100644
index d8aee73c0c66..000000000000
--- a/databases/libgda5-bdb/pkg-plist
+++ /dev/null
@@ -1,3 +0,0 @@
-lib/libgda-%%VERSION%%/providers/libgda-bdb.so
-libdata/pkgconfig/libgda-bdb-%%VERSION%%.pc
-share/libgda-%%VERSION%%/bdb_specs_dsn.xml
diff --git a/databases/libgda5-jdbc/Makefile b/databases/libgda5-jdbc/Makefile
index 16d913424fc4..7c4ffcf24df0 100644
--- a/databases/libgda5-jdbc/Makefile
+++ b/databases/libgda5-jdbc/Makefile
@@ -1,6 +1,4 @@
-# Created by: Koop Mast <kwm@FreeBSD.org>
-
-PORTREVISION=	0
+PORTREVISION=	2
 CATEGORIES=	databases gnome
 PKGNAMESUFFIX=	5-jdbc
 
diff --git a/databases/libgda5-ldap/Makefile b/databases/libgda5-ldap/Makefile
index edc698a3a482..f7250e2c5061 100644
--- a/databases/libgda5-ldap/Makefile
+++ b/databases/libgda5-ldap/Makefile
@@ -1,6 +1,4 @@
-# Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
-
-PORTREVISION=	1
+PORTREVISION=	3
 CATEGORIES=	databases gnome
 PKGNAMESUFFIX=	5-ldap
 
diff --git a/databases/libgda5-mdb/Makefile b/databases/libgda5-mdb/Makefile
deleted file mode 100644
index 84c6aa0defd7..000000000000
--- a/databases/libgda5-mdb/Makefile
+++ /dev/null
@@ -1,25 +0,0 @@
-# Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
-
-PORTREVISION=	1
-CATEGORIES=	databases gnome
-PKGNAMESUFFIX=	5-mdb
-
-MAINTAINER=	gnome@FreeBSD.org
-COMMENT=	Provides mdb backend for the libgda5 library
-
-BROKEN=		does not compile: 'mdbfakeglib.h' file not found
-
-MASTERDIR=	${.CURDIR}/../libgda5
-BUILD_WRKSRC=	${WRKSRC}/providers/mdb/
-INSTALL_WRKSRC=	${BUILD_WRKSRC}
-PLIST=		${.CURDIR}/pkg-plist
-
-LIBGDA5_SLAVE=	mdb
-
-post-extract:
-	@${REINPLACE_CMD} -e 's|MDB_SDATETIME|MDB_DATETIME|g' \
-		${WRKSRC}/providers/mdb/gda-mdb-provider.c \
-		${WRKSRC}/providers/mdb/libmdb-src/include/mdbtools.h \
-		${WRKSRC}/providers/mdb/libmdb-src/data.c
-
-.include "${MASTERDIR}/Makefile"
diff --git a/databases/libgda5-mdb/pkg-plist b/databases/libgda5-mdb/pkg-plist
deleted file mode 100644
index 2300d6e2fd4e..000000000000
--- a/databases/libgda5-mdb/pkg-plist
+++ /dev/null
@@ -1,3 +0,0 @@
-lib/libgda-%%VERSION%%/providers/libgda-mdb.so
-libdata/pkgconfig/libgda-mdb-%%VERSION%%.pc
-share/libgda-%%VERSION%%/mdb_specs_dsn.xml
diff --git a/databases/libgda5-mysql/Makefile b/databases/libgda5-mysql/Makefile
index 748e6152a453..7e8342d2d1ed 100644
--- a/databases/libgda5-mysql/Makefile
+++ b/databases/libgda5-mysql/Makefile
@@ -1,6 +1,4 @@
-# Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
-
-PORTREVISION=	0
+PORTREVISION=	2
 CATEGORIES=	databases gnome
 PKGNAMESUFFIX=	5-mysql
 
diff --git a/databases/libgda5-postgresql/Makefile b/databases/libgda5-postgresql/Makefile
index 59860c6fc6d4..e87277922bed 100644
--- a/databases/libgda5-postgresql/Makefile
+++ b/databases/libgda5-postgresql/Makefile
@@ -1,6 +1,4 @@
-# Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
-
-PORTREVISION=	0
+PORTREVISION=	2
 CATEGORIES=	databases gnome
 PKGNAMESUFFIX=	5-postgresql
 
diff --git a/databases/libgda5-ui/Makefile b/databases/libgda5-ui/Makefile
index 1793568f71dc..60ea296df428 100644
--- a/databases/libgda5-ui/Makefile
+++ b/databases/libgda5-ui/Makefile
@@ -1,6 +1,4 @@
-# Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
-
-PORTREVISION=	0
+PORTREVISION=	3
 CATEGORIES=	databases gnome
 PKGNAMESUFFIX=	5-ui
 
diff --git a/databases/libgda5/Makefile b/databases/libgda5/Makefile
index d1b7e89a48bf..f10317737485 100644
--- a/databases/libgda5/Makefile
+++ b/databases/libgda5/Makefile
@@ -1,34 +1,34 @@
-# Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
-
 PORTNAME=	libgda
 DISTVERSION?=	5.2.10
+PORTREVISION=	4
 CATEGORIES=	databases gnome
 MASTER_SITES=	GNOME
 PKGNAMESUFFIX?=	5
-DIST_SUBDIR=	gnome3
+DIST_SUBDIR=	gnome
 
 MAINTAINER?=	gnome@FreeBSD.org
 COMMENT?=	Provides uniform access to different kinds of data sources
+WWW=		https://www.gnome-db.org/
 
 LICENSE=	GPLv2+ LGPL20+
 LICENSE_COMB=	multi
 LICENSE_FILE_GPLv2+ =	${WRKSRC}/COPYING
 LICENSE_FILE_LGPL20+ =	${WRKSRC}/COPYING.LIB
 
-USES=		python readline shebangfix tar:xz
+USES=		cpe python readline shebangfix sqlite tar:xz
+CPE_VENDOR=	gnome
 LIBGDA5_SLAVE?=	no
 SHEBANG_FILES=	libgda-report/RML/*/*.py
 
-.if !defined(REFERENCE_PORT)
-
 BUILD_DEPENDS=	itstool:textproc/itstool
 LIB_DEPENDS=	libsecret-1.so:security/libsecret \
 		libsoup-2.4.so:devel/libsoup \
 
 USES+=		gettext gmake gnome libtool localbase pathfix pkgconfig
-USE_GNOME=	glib20 libxslt intlhack introspection:build referencehack
+USE_GNOME=	glib20 libxslt intlhack introspection:build
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
+GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
 INSTALL_TARGET=	install-strip
 #MAKE_JOBS_UNSAFE=yes
 CONFIGURE_ARGS=	--without-oracle \
@@ -50,7 +50,6 @@ LIB_DEPENDS=	libgcrypt.so:security/libgcrypt \
 		libgpg-error.so:security/libgpg-error
 CONFIGURE_ARGS+=--with-ui
 USE_GNOME+=	cairo gtk30
-INSTALLS_ICONS=	yes
 .else
 CONFIGURE_ARGS+=--without-ui
 .endif
@@ -63,7 +62,7 @@ CONFIGURE_ARGS+=	--without-bdb
 .endif
 
 .if ${LIBGDA5_SLAVE}==ldap
-USE_OPENLDAP=	yes
+USES+=			ldap
 CONFIGURE_ARGS+=	--with-ldap=${LOCALBASE}
 .else
 CONFIGURE_ARGS+=	--without-ldap
@@ -71,6 +70,7 @@ CONFIGURE_ARGS+=	--without-ldap
 
 .if ${LIBGDA5_SLAVE}==mysql
 USES+=			mysql
+IGNORE_WITH_MYSQL=	80
 CONFIGURE_ARGS+=	--with-mysql=${LOCALBASE}
 .else
 CONFIGURE_ARGS+=	--without-mysql
@@ -99,6 +99,10 @@ CFLAGS+=		-I${JAVA_HOME}/include -I${JAVA_HOME}/include/freebsd
 CONFIGURE_ARGS+=	--without-java
 .endif
 
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 ))
+CFLAGS+=	-Wno-error=incompatible-function-pointer-types
+.endif
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|-ldl||g' \
 		${WRKSRC}/configure
@@ -152,4 +156,3 @@ post-install:
 .endif
 
 .include <bsd.port.mk>
-.endif
diff --git a/databases/libgda5/distinfo b/databases/libgda5/distinfo
index 4d3da826ec61..a4222605af7c 100644
--- a/databases/libgda5/distinfo
+++ b/databases/libgda5/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1605445415
-SHA256 (gnome3/libgda-5.2.10.tar.xz) = 6f6cdf7b8053f553b907e0c88a6064eb48cf2751852eb24323dcf027792334c8
-SIZE (gnome3/libgda-5.2.10.tar.xz) = 12625140
+TIMESTAMP = 1656739377
+SHA256 (gnome/libgda-5.2.10.tar.xz) = 6f6cdf7b8053f553b907e0c88a6064eb48cf2751852eb24323dcf027792334c8
+SIZE (gnome/libgda-5.2.10.tar.xz) = 12625140
diff --git a/databases/libgda5/pkg-descr b/databases/libgda5/pkg-descr
index c9bebba9bc77..9f5f8e768638 100644
--- a/databases/libgda5/pkg-descr
+++ b/databases/libgda5/pkg-descr
@@ -15,5 +15,3 @@ the GDA model's set of CORBA interfaces.
 
 libgda was part of the GNOME-DB project, but has been separated from it
 to allow non-GNOME applications to be developed based on it.
-
-WWW: https://www.gnome-db.org/
diff --git a/databases/libgda5/pkg-plist b/databases/libgda5/pkg-plist
index 9a5936ace7bc..bb96c4a4e5d8 100644
--- a/databases/libgda5/pkg-plist
+++ b/databases/libgda5/pkg-plist
@@ -119,7 +119,7 @@ libdata/pkgconfig/libgda-report-%%VERSION%%.pc
 libdata/pkgconfig/libgda-sqlite-%%VERSION%%.pc
 libdata/pkgconfig/libgda-web-%%VERSION%%.pc
 libdata/pkgconfig/libgda-xslt-%%VERSION%%.pc
-man/man1/gda-sql-%%VERSION%%.1.gz
+share/man/man1/gda-sql-%%VERSION%%.1.gz
 share/gir-1.0/Gda-%%VERSION%%.gir
 share/gtk-doc/html/libgda-%%VERSION%%/DataModels.png
 share/gtk-doc/html/libgda-%%VERSION%%/GdaBatch.html
diff --git a/databases/libgdamm5/Makefile b/databases/libgdamm5/Makefile
index 5e08ac3b26a0..f2579ce488f7 100644
--- a/databases/libgdamm5/Makefile
+++ b/databases/libgdamm5/Makefile
@@ -1,13 +1,13 @@
-# Created by: Alexander Nedotsukov <bland@FreeBSD.org>
-
 PORTNAME=	libgdamm
 PORTVERSION=	4.99.11
+PORTREVISION=	2
 CATEGORIES=	databases gnome
 MASTER_SITES=	GNOME
-DIST_SUBDIR=	gnome3
+DIST_SUBDIR=	gnome
 
-MAINTAINER=	bland@FreeBSD.org
+MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	C++ wrapper for libgda5 library
+WWW=		https://www.gtkmm.org/
 
 USES=		gmake libtool pathfix pkgconfig tar:xz compiler:c++11-lang gnome
 USE_CXXSTD=	c++11
diff --git a/databases/libgdamm5/distinfo b/databases/libgdamm5/distinfo
index defb27aea6b7..6edcbd3348e9 100644
--- a/databases/libgdamm5/distinfo
+++ b/databases/libgdamm5/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1569858193
-SHA256 (gnome3/libgdamm-4.99.11.tar.xz) = e9820070a1b258fbdfa9b6583d97dfdb1340c90bb353c5f5e21522375609d0bb
-SIZE (gnome3/libgdamm-4.99.11.tar.xz) = 1605420
+TIMESTAMP = 1656739354
+SHA256 (gnome/libgdamm-4.99.11.tar.xz) = e9820070a1b258fbdfa9b6583d97dfdb1340c90bb353c5f5e21522375609d0bb
+SIZE (gnome/libgdamm-4.99.11.tar.xz) = 1605420
diff --git a/databases/libgdamm5/pkg-descr b/databases/libgdamm5/pkg-descr
index 0d3f018064d8..e517a273270a 100644
--- a/databases/libgdamm5/pkg-descr
+++ b/databases/libgdamm5/pkg-descr
@@ -1,3 +1 @@
 This is a set of thin C++ wrappers for libgda v5 library.
-
-WWW: https://www.gtkmm.org/
diff --git a/databases/libhsclient/Makefile b/databases/libhsclient/Makefile
index f21d77d66cc3..626c36431561 100644
--- a/databases/libhsclient/Makefile
+++ b/databases/libhsclient/Makefile
@@ -1,19 +1,23 @@
-# Created by: Jui-Nan Lin <jnlin@freebsd.cs.nctu.edu.tw>
-
 PORTNAME=	libhsclient
 DISTVERSION=	1.0.6-20110614
 PORTREVISION=	1
 CATEGORIES=	databases
-MASTER_SITES=	http://www.cs.nctu.edu.tw/~jnlin/distfiles/
+MASTER_SITES=	http://people.cs.nycu.edu.tw/~jnlin/distfiles/
 DISTNAME=	HandlerSocket-Plugin-for-MySQL-${DISTVERSION}
 
 MAINTAINER=	jnlin@freebsd.cs.nctu.edu.tw
 COMMENT=	Client Library of HandlerSocket Plugin
+WWW=		https://github.com/ahiguti/HandlerSocket-Plugin-for-MySQL
 
-WRKSRC=		${WRKDIR}/HandlerSocket-Plugin-for-MySQL
+LICENSE=	BSD3CLAUSE
+LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		libtool
+USE_CXXSTD=	c++14
+
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-handlersocket-server=no
 
+WRKSRC=		${WRKDIR}/HandlerSocket-Plugin-for-MySQL
+
 .include <bsd.port.mk>
diff --git a/databases/libhsclient/pkg-descr b/databases/libhsclient/pkg-descr
index 9a2ca57a1941..d2f1920d029d 100644
--- a/databases/libhsclient/pkg-descr
+++ b/databases/libhsclient/pkg-descr
@@ -1,4 +1,2 @@
 libhsclient is the client library of HandlerSocket for MySQL,
 which is a NoSQL plugin for MySQL.
-
-WWW: https://github.com/ahiguti/HandlerSocket-Plugin-for-MySQL
diff --git a/databases/libiodbc/Makefile b/databases/libiodbc/Makefile
index da4b25d13e29..d7da3e8531ce 100644
--- a/databases/libiodbc/Makefile
+++ b/databases/libiodbc/Makefile
@@ -1,12 +1,12 @@
-# Created by: erikhb@bgnett.no
-
 PORTNAME=	libiodbc
 DISTVERSIONPREFIX=	v
-DISTVERSION=	3.52.15
+DISTVERSION=	3.52.16
+PORTREVISION=	1
 CATEGORIES=	databases
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	ODBC 3.x driver manager, for universal data source access
+WWW=		https://www.iodbc.org/
 
 LICENSE=		BSD3CLAUSE LGPL20
 LICENSE_COMB=		dual
@@ -15,6 +15,7 @@ LICENSE_FILE_LGPL20=	${WRKSRC}/LICENSE.LGPL
 
 USES=		autoreconf libtool pathfix pkgconfig
 GNU_CONFIGURE=	yes
+GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
 CONFIGURE_ARGS=	--with-iodbc-inidir=${ETCDIR} \
 		--includedir=${LOCALBASE}/include/libiodbc \
 		--disable-libodbc
diff --git a/databases/libiodbc/distinfo b/databases/libiodbc/distinfo
index 60a1c90b9733..20079712f6e2 100644
--- a/databases/libiodbc/distinfo
+++ b/databases/libiodbc/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1626285969
-SHA256 (openlink-iODBC-v3.52.15_GH0.tar.gz) = f6b376b6dffb4807343d6d612ed527089f99869ed91bab0bbbb47fdea5ed6ace
-SIZE (openlink-iODBC-v3.52.15_GH0.tar.gz) = 658200
+TIMESTAMP = 1683210394
+SHA256 (openlink-iODBC-v3.52.16_GH0.tar.gz) = a0cf0375b462f98c0081c2ceae5ef78276003e57cdf1eb86bd04508fb62a0660
+SIZE (openlink-iODBC-v3.52.16_GH0.tar.gz) = 660741
diff --git a/databases/libiodbc/pkg-descr b/databases/libiodbc/pkg-descr
index fa2b4a558ccb..58f509bd77a2 100644
--- a/databases/libiodbc/pkg-descr
+++ b/databases/libiodbc/pkg-descr
@@ -9,5 +9,3 @@ within one process through suitable ODBC drivers.
 
 iODBC is freely redistributable under either the GNU Library General Public
 Licence (LGPL) or the BSD licence.
-
-WWW: http://www.iodbc.org/
diff --git a/databases/libiodbc/pkg-plist b/databases/libiodbc/pkg-plist
index 5ed7f5df5e58..34eb3067465e 100644
--- a/databases/libiodbc/pkg-plist
+++ b/databases/libiodbc/pkg-plist
@@ -16,24 +16,24 @@ include/libiodbc/sqlucode.h
 %%GTK2%%lib/libdrvproxy.a
 %%GTK2%%lib/libdrvproxy.so
 %%GTK2%%lib/libdrvproxy.so.2
-%%GTK2%%lib/libdrvproxy.so.2.1.30
+%%GTK2%%lib/libdrvproxy.so.2.1.31
 lib/libiodbc.a
 lib/libiodbc.so
 lib/libiodbc.so.2
-lib/libiodbc.so.2.1.30
+lib/libiodbc.so.2.1.31
 %%GTK2%%lib/libiodbcadm.a
 %%GTK2%%lib/libiodbcadm.so
 %%GTK2%%lib/libiodbcadm.so.2
-%%GTK2%%lib/libiodbcadm.so.2.1.30
+%%GTK2%%lib/libiodbcadm.so.2.1.31
 lib/libiodbcinst.a
 lib/libiodbcinst.so
 lib/libiodbcinst.so.2
-lib/libiodbcinst.so.2.1.30
+lib/libiodbcinst.so.2.1.31
 libdata/pkgconfig/libiodbc.pc
-man/man1/iodbc-config.1.gz
-%%GTK2%%man/man1/iodbcadm-gtk.1.gz
-man/man1/iodbctest.1.gz
-man/man1/iodbctestw.1.gz
+share/man/man1/iodbc-config.1.gz
+%%GTK2%%share/man/man1/iodbcadm-gtk.1.gz
+share/man/man1/iodbctest.1.gz
+share/man/man1/iodbctestw.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
 %%PORTDOCS%%%%DOCSDIR%%/NEWS
diff --git a/databases/libmemcache/Makefile b/databases/libmemcache/Makefile
index 3ae4ee5ed122..85651faa9c81 100644
--- a/databases/libmemcache/Makefile
+++ b/databases/libmemcache/Makefile
@@ -1,5 +1,3 @@
-# Created by: Sean Chittenden <seanc@FreeBSD.org>
-
 PORTNAME=	libmemcache
 DISTVERSION=	1.4.0.rc2
 PORTREVISION=	2
@@ -8,6 +6,7 @@ MASTER_SITES=	http://people.FreeBSD.org/~seanc/libmemcache/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	C library for accessing a memcache cluster
+WWW=		https://people.FreeBSD.org/~seanc/libmemcache/
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYING
diff --git a/databases/libmemcache/pkg-descr b/databases/libmemcache/pkg-descr
index 33732112e42c..fa64d125e441 100644
--- a/databases/libmemcache/pkg-descr
+++ b/databases/libmemcache/pkg-descr
@@ -2,5 +2,3 @@ libmemcache is a high-performance C interface for databases/memcached.
 memcached is a distributed memory object caching system, generic in
 nature, but intended for use in speeding up dynamic web applications
 by alleviating database load.
-
-WWW: https://people.FreeBSD.org/~seanc/libmemcache/
diff --git a/databases/libmemcached/Makefile b/databases/libmemcached/Makefile
index 210a57e724ba..9d24a3914075 100644
--- a/databases/libmemcached/Makefile
+++ b/databases/libmemcached/Makefile
@@ -1,51 +1,48 @@
 PORTNAME=	libmemcached
-PORTVERSION=	1.0.18
-PORTREVISION=	7
+PORTVERSION=	1.1.4
+PORTREVISION=	1
 CATEGORIES=	databases
-MASTER_SITES=	https://launchpad.net/${PORTNAME}/${PORTVERSION:R}/${PORTVERSION}/+download/
 
 MAINTAINER=	sunpoet@FreeBSD.org
-COMMENT=	C and C++ client library to the memcached server
+COMMENT=	C/C++ client library and tools for the memcached server
+WWW=		https://awesomized.github.io/libmemcached/ \
+		https://github.com/awesomized/libmemcached
 
 LICENSE=	BSD3CLAUSE
-LICENSE_FILE=	${WRKSRC}/COPYING
+LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libevent.so:devel/libevent
-TEST_DEPENDS=	memcached:databases/memcached
-
-USES=		autoreconf gmake libtool localbase pathfix pkgconfig
-
-CONFIGURE_ARGS=	--enable-libmemcachedprotocol \
-		--without-memcached \
-		--without-sphinx-build
-CXXFLAGS+=	-D__STDC_CONSTANT_MACROS -pthread
-GNU_CONFIGURE=	yes
-LIBS+=		-lexecinfo
-PATHFIX_MAKEFILEIN=	include.am
-TEST_TARGET=	check
+TEST_DEPENDS=	memcached:databases/memcached \
+		onetbb>=0:devel/onetbb
+
+USES=		bison compiler:c++11-lang pathfix pkgconfig ssl
+
+CMAKE_OFF=	BUILD_DOCSONLY BUILD_DOCS_MANGZ BUILD_DOCS_HTML BUILD_TESTING ENABLE_DTRACE
+CMAKE_ON=	BUILD_SHARED_LIBS ENABLE_MEMASLAP ENABLE_OPENSSL_CRYPTO
+CMAKE_TESTING_ON=	BUILD_TESTING
 USE_LDCONFIG=	yes
 
-OPTIONS_DEFINE=	DEBUG MEMASLAP SASL
+USE_GITHUB=	yes
+GH_ACCOUNT=	awesomized
+
+OPTIONS_DEFINE=	DOCS MANPAGES SASL
 OPTIONS_GROUP=	HASH
 OPTIONS_GROUP_HASH=	FNV64 HSIEH MURMUR
-OPTIONS_DEFAULT=MEMASLAP SASL MURMUR FNV64
+OPTIONS_DEFAULT=FNV64 HSIEH MURMUR SASL
+OPTIONS_SUB=	yes
 FNV64_DESC=	Enable fnv64 hashing
 HSIEH_DESC=	Enable hsieh hashing
 MEMASLAP_DESC=	Load generation and benchmark tool
 MURMUR_DESC=	Enable murmur hashing
 
-DEBUG_CONFIGURE_ENABLE=	debug
-FNV64_CONFIGURE_ENABLE=	fnv64_hash
-HSIEH_CONFIGURE_ENABLE=	hsieh_hash
-MEMASLAP_CONFIGURE_ENABLE=	memaslap
-MURMUR_CONFIGURE_ENABLE=murmur_hash
-SASL_CONFIGURE_ENABLE=	sasl
+FNV64_CMAKE_BOOL=	ENABLE_HASH_FNV64
+HSIEH_CMAKE_BOOL=	ENABLE_HASH_HSIEH
+MANPAGES_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sphinx>=0,1:textproc/py-sphinx@${PY_FLAVOR}
+MANPAGES_CMAKE_BOOL=	BUILD_DOCS BUILD_DOCS_MAN
+MANPAGES_USES=		cmake:noninja,testing python:env
+MANPAGES_USES_OFF=	cmake:testing
+MURMUR_CMAKE_BOOL=	ENABLE_HASH_MURMUR
+SASL_CMAKE_BOOL=	ENABLE_SASL
 SASL_LIB_DEPENDS=	libsasl2.so:security/cyrus-sasl2
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|%%LTLIBSASL2%%|${LTLIBSASL2}|' ${WRKSRC}/Makefile.in
-
-post-install:
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/*.so
-
 .include <bsd.port.mk>
diff --git a/databases/libmemcached/distinfo b/databases/libmemcached/distinfo
index 240b9b4527c6..6d3acc8f5af7 100644
--- a/databases/libmemcached/distinfo
+++ b/databases/libmemcached/distinfo
@@ -1,2 +1,3 @@
-SHA256 (libmemcached-1.0.18.tar.gz) = e22c0bb032fde08f53de9ffbc5a128233041d9f33b5de022c0978a2149885f82
-SIZE (libmemcached-1.0.18.tar.gz) = 1039649
+TIMESTAMP = 1685986616
+SHA256 (awesomized-libmemcached-1.1.4_GH0.tar.gz) = c477e1f6510e1dc698e84f3717ce690a8f65b94c616ecaa62306cce0f5e3116a
+SIZE (awesomized-libmemcached-1.1.4_GH0.tar.gz) = 530337
diff --git a/databases/libmemcached/files/patch-CMakeLists.txt b/databases/libmemcached/files/patch-CMakeLists.txt
new file mode 100644
index 000000000000..1935d2316675
--- /dev/null
+++ b/databases/libmemcached/files/patch-CMakeLists.txt
@@ -0,0 +1,19 @@
+--- CMakeLists.txt.orig	2023-03-06 08:47:30 UTC
++++ CMakeLists.txt
+@@ -6,7 +6,7 @@ endif()
+ 
+ include(CMakeVersions.txt)
+ 
+-project(libmemcached-awesome
++project(libmemcached
+         VERSION "${LIBMEMCACHED_VERSION}"
+         DESCRIPTION "libmemcached-awesome, a C/C++ memcached client library"
+         )
+@@ -70,7 +70,6 @@ install(FILES
+             ChangeLog-1.0.md
+             ChangeLog-1.1.md
+             CONTRIBUTING.md
+-            LICENSE
+             NEWS
+             README.md
+             TODO
diff --git a/databases/libmemcached/files/patch-Makefile.in b/databases/libmemcached/files/patch-Makefile.in
deleted file mode 100644
index 5e14e0106b9a..000000000000
--- a/databases/libmemcached/files/patch-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in.orig	2014-02-09 11:52:56 UTC
-+++ Makefile.in
-@@ -2934,7 +2934,7 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- LCOV = @LCOV@
- LCOV_GENHTML = @LCOV_GENHTML@
- LD = @LD@
--LDFLAGS = @LDFLAGS@
-+LDFLAGS = @LDFLAGS@ %%LTLIBSASL2%%
- LEX = @LEX@
- LIBEVENT_LIB = @LIBEVENT_LIB@
- LIBGEARMAN_CPPFLAGS = @LIBGEARMAN_CPPFLAGS@
diff --git a/databases/libmemcached/files/patch-bug1245562 b/databases/libmemcached/files/patch-bug1245562
deleted file mode 100644
index 6c29b93886a5..000000000000
--- a/databases/libmemcached/files/patch-bug1245562
+++ /dev/null
@@ -1,34 +0,0 @@
---- clients/memflush.cc.orig	2014-02-09 11:52:42 UTC
-+++ clients/memflush.cc
-@@ -39,7 +39,7 @@ int main(int argc, char *argv[])
- {
-   options_parse(argc, argv);
- 
--  if (opt_servers == false)
-+  if (opt_servers == NULL)
-   {
-     char *temp;
- 
-@@ -48,7 +48,7 @@ int main(int argc, char *argv[])
-       opt_servers= strdup(temp);
-     }
- 
--    if (opt_servers == false)
-+    if (opt_servers == NULL)
-     {
-       std::cerr << "No Servers provided" << std::endl;
-       exit(EXIT_FAILURE);
---- libmemcached-1.0/memcached.h.orig	2014-02-09 11:52:42 UTC
-+++ libmemcached-1.0/memcached.h
-@@ -43,7 +43,11 @@
- #endif
- 
- #ifdef __cplusplus
-+#ifdef _LIBCPP_VERSION
- #  include <cinttypes>
-+#else
-+#  include <tr1/cinttypes>
-+#endif
- #  include <cstddef>
- #  include <cstdlib>
- #else
diff --git a/databases/libmemcached/files/patch-clients_memaslap.c b/databases/libmemcached/files/patch-clients_memaslap.c
deleted file mode 100644
index 02ea7c490ed7..000000000000
--- a/databases/libmemcached/files/patch-clients_memaslap.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- clients/memaslap.c.orig	2020-08-22 10:06:16 UTC
-+++ clients/memaslap.c
-@@ -45,6 +45,11 @@
- #define OPTIONSTRING const char*
- #endif
- 
-+/* global variables */
-+ms_global_t ms_global;
-+ms_statistic_t ms_statistic;
-+ms_stats_t ms_stats;
-+
- /* options */
- static struct option long_options[]=
- {
diff --git a/databases/libmemcached/files/patch-clients_ms__memslap.h b/databases/libmemcached/files/patch-clients_ms__memslap.h
deleted file mode 100644
index 7b992f71119b..000000000000
--- a/databases/libmemcached/files/patch-clients_ms__memslap.h
+++ /dev/null
@@ -1,23 +0,0 @@
---- clients/ms_memslap.h.orig	2020-08-22 10:06:28 UTC
-+++ clients/ms_memslap.h
-@@ -116,14 +116,14 @@ typedef struct global
-   bool time_out;
- } ms_global_t;
- 
--/* global structure */
--ms_global_t ms_global;
-+/* global structure, defined in memaslap.c */
-+extern ms_global_t ms_global;
- 
--/* global stats information structure */
--ms_stats_t ms_stats;
-+/* global stats information structure, defined in memaslap.c */
-+extern ms_stats_t ms_stats;
- 
--/* global statistic structure */
--ms_statistic_t ms_statistic;
-+/* global statistic structure, defined in mamaslap.c */
-+extern ms_statistic_t ms_statistic;
- 
- #ifdef __cplusplus
- }
diff --git a/databases/libmemcached/files/patch-configure.ac b/databases/libmemcached/files/patch-configure.ac
deleted file mode 100644
index 6b9c0665e33d..000000000000
--- a/databases/libmemcached/files/patch-configure.ac
+++ /dev/null
@@ -1,19 +0,0 @@
---- configure.ac.orig	2014-02-09 11:52:42 UTC
-+++ configure.ac
-@@ -13,13 +13,13 @@ m4_include([version.m4])
- AC_PREREQ([2.61])
- AC_INIT([libmemcached],VERSION_NUMBER,[http://libmemcached.org/])
- 
-+AC_CONFIG_AUX_DIR([build-aux])
-+AC_CONFIG_MACRO_DIR([m4])
-+
- # Setup the compilers early on
- AC_PROG_CC([cc gcc clang])
- AC_PROG_CXX([c++ g++ clang++])
- 
--AC_CONFIG_AUX_DIR([build-aux])
--AC_CONFIG_MACRO_DIR([m4])
--
- AC_CANONICAL_HOST
- AC_ARG_PROGRAM
- AC_USE_SYSTEM_EXTENSIONS
diff --git a/databases/libmemcached/files/patch-libmemcached_assert.hpp b/databases/libmemcached/files/patch-libmemcached_assert.hpp
deleted file mode 100644
index 91c68e89a1cc..000000000000
--- a/databases/libmemcached/files/patch-libmemcached_assert.hpp
+++ /dev/null
@@ -1,13 +0,0 @@
---- libmemcached/assert.hpp.orig	2014-02-09 11:52:42 UTC
-+++ libmemcached/assert.hpp
-@@ -51,8 +51,10 @@
- # ifdef _WIN32
- #  include <malloc.h>
- # else
-+#ifdef HAVE_ALLOCA_H
- #  include <alloca.h>
- # endif
-+# endif
- 
- #ifdef __cplusplus
- # include <cstdarg>
diff --git a/databases/libmemcached/files/patch-libtest_lite.h b/databases/libmemcached/files/patch-libtest_lite.h
deleted file mode 100644
index c9cd4a3605e1..000000000000
--- a/databases/libmemcached/files/patch-libtest_lite.h
+++ /dev/null
@@ -1,13 +0,0 @@
---- libtest/lite.h.orig	2014-02-09 11:52:42 UTC
-+++ libtest/lite.h
-@@ -54,8 +54,10 @@
- #if defined(WIN32)
- # include <malloc.h>
- #else
-+#ifdef HAVE_ALLOCA_H
- # include <alloca.h>
- #endif
-+#endif
- 
- #ifndef __PRETTY_FUNCTION__
- # define __PRETTY_FUNCTION__ __func__
diff --git a/databases/libmemcached/files/patch-m4_ax__debug.m4 b/databases/libmemcached/files/patch-m4_ax__debug.m4
deleted file mode 100644
index 53a5aeceff9c..000000000000
--- a/databases/libmemcached/files/patch-m4_ax__debug.m4
+++ /dev/null
@@ -1,28 +0,0 @@
-Fixed a bug that caused configure to disobey the enable/disable debug flag.  The debug flag will default to disabled if not specified.
---- m4/ax_debug.m4.orig	2014-02-09 11:52:42 UTC
-+++ m4/ax_debug.m4
-@@ -49,16 +49,18 @@ AC_DEFUN([AX_DEBUG],
-     [AC_PREREQ([2.63])dnl
-     AC_ARG_ENABLE([debug],
-       [AS_HELP_STRING([--enable-debug],
--        [Add debug code/turns off optimizations (yes|no) @<:@default=no@:>@])],
--      [ax_enable_debug=yes
-+        [Add debug code/turns off optimizations (yes|no) @<:@default=no@:>@])])
-+    AS_IF([test "x$enable_debug" = "xyes"], [
-+      ax_enable_debug=yes
-       AC_DEFINE([DEBUG],[1],[Define to 1 to enable debugging code.])
-       AX_CHECK_LIBRARY([MCHECK],[mcheck.h],[mcheck],[AX_APPEND_LINK_FLAGS([-lmcheck])])
-       AX_ADD_AM_MACRO([--debug],[AM_YFLAGS])
--      AX_ADD_AM_MACRO([-D_GLIBCXX_DEBUG],[AM_CPPFLAGS])],
--      [ax_enable_debug=no
-+      AX_ADD_AM_MACRO([-D_GLIBCXX_DEBUG],[AM_CPPFLAGS])
-+    ], [
-+      ax_enable_debug=no
-       AC_SUBST([MCHECK])
--      AC_DEFINE([DEBUG],[0],[Define to 1 to enable debugging code.])])
--
-+      AC_DEFINE([DEBUG],[0],[Define to 1 to enable debugging code.])
-+    ])
-     AC_MSG_CHECKING([for debug])
-     AC_MSG_RESULT([$ax_enable_debug])
-     AM_CONDITIONAL([DEBUG],[test "x${ax_enable_debug}" = "xyes"])])
diff --git a/databases/libmemcached/files/patch-man_include.am b/databases/libmemcached/files/patch-man_include.am
deleted file mode 100644
index 32aa812967b1..000000000000
--- a/databases/libmemcached/files/patch-man_include.am
+++ /dev/null
@@ -1,10 +0,0 @@
---- man/include.am.orig	2014-02-09 11:52:42 UTC
-+++ man/include.am
-@@ -4,7 +4,6 @@
- 
- # Build rule for documentation
- $(dist_man_MANS): $(top_srcdir)/configure.ac
--	$(MAKE) $(AM_MAKEFLAGS) man
- 
- .NOTPARALLEL: $(dist_man_MANS)
- 
diff --git a/databases/libmemcached/files/patch-sasl b/databases/libmemcached/files/patch-sasl
new file mode 100644
index 000000000000..44b43acbe8a4
--- /dev/null
+++ b/databases/libmemcached/files/patch-sasl
@@ -0,0 +1,87 @@
+--- test/tests/memcached/regression/lp_001-630-615.cpp.orig	2023-06-03 12:15:40 UTC
++++ test/tests/memcached/regression/lp_001-630-615.cpp
+@@ -6,29 +6,8 @@
+ TEST_CASE("memcached_regression_lp1630615") {
+ #if !LIBMEMCACHED_WITH_SASL_SUPPORT
+   WARN("ENABLE_SASL=OFF");
+-#else
+-  Shell sh;
+-  string mc{MEMCACHED_BINARY}, err;
+-
+-  if (!sh.run(mc + " -S --version", err)) {
+-    WARN(mc << ": " << err);
+-  } else {
+-    memcached_return_t rc;
+-    auto test = MemcachedCluster::sasl();
+-    auto memc = &test.memc;
+-    MemcachedPtr copy{memcached_clone(nullptr, memc)};
+-
+-    REQUIRE(memcached_server_by_key(memc, S(__func__), &rc)->fd == INVALID_SOCKET);
+-    REQUIRE_SUCCESS(memcached_set(memc, S(__func__), S(__func__), 0, 0));
+-    REQUIRE(memcached_server_by_key(memc, S(__func__), &rc)->fd != INVALID_SOCKET);
+-
+-    REQUIRE(memcached_server_by_key(*copy, S(__func__), &rc)->fd == INVALID_SOCKET);
+-    Malloced val{memcached_get(*copy, S(__func__), nullptr, nullptr, &rc)};
+-    REQUIRE(memcached_server_by_key(*copy, S(__func__), &rc)->fd != INVALID_SOCKET);
+-    
+-    REQUIRE_SUCCESS(rc);
+-    REQUIRE(*val);
+-    REQUIRE(string(__func__) == string(*val));
+-  }
++#endif
++#if LIBMEMCACHED_WITH_SASL_SUPPORT
++  WARN("SASL_TESTS disabled due to permission issues");
+ #endif
+ }
+--- test/tests/memcached/sasl.cpp.orig	2023-06-03 11:11:01 UTC
++++ test/tests/memcached/sasl.cpp
+@@ -6,46 +6,8 @@
+ TEST_CASE("memcached_sasl") {
+ #if !LIBMEMCACHED_WITH_SASL_SUPPORT
+   WARN("ENABLE_SASL=OFF");
+-#else
+-  Shell sh;
+-  string mc{MEMCACHED_BINARY}, err;
+-
+-  if (!sh.run(mc + " -S --version", err)) {
+-    WARN(mc << ": " << err);
+-  } else {
+-    auto test = MemcachedCluster::sasl();
+-    auto memc = &test.memc;
+-
+-    REQUIRE_SUCCESS(memcached_set(memc, S(__func__), S(__func__), 0, 0));
+-    REQUIRE_SUCCESS(memcached_delete(memc, S(__func__), 0));
+-    REQUIRE_SUCCESS(memcached_destroy_sasl_auth_data(memc));
+-    REQUIRE_SUCCESS(memcached_destroy_sasl_auth_data(memc));
+-    REQUIRE_RC(MEMCACHED_INVALID_ARGUMENTS, memcached_destroy_sasl_auth_data(nullptr));
+-
+-    memcached_quit(memc);
+-
+-    REQUIRE_RC(MEMCACHED_AUTH_FAILURE, memcached_set(memc, S(__func__), S(__func__), 0, 0));
+-
+-    REQUIRE_SUCCESS(memcached_set_sasl_auth_data(memc, "username", "password"));
+-    REQUIRE_RC(MEMCACHED_AUTH_FAILURE, memcached_set(memc, S(__func__), S(__func__), 0, 0));
+-
+-    SECTION("getpid2") {
+-      memcached_return_t rc;
+-
+-      for (auto &server : test.cluster.getServers()) {
+-        REQUIRE(server.getPid() == libmemcached_util_getpid2("localhost", get<int>(server.getSocketOrPort()), "memcached", "memcached", &rc));
+-        REQUIRE_SUCCESS(rc);
+-      }
+-
+-      REQUIRE(-1 == libmemcached_util_getpid2("localhost", 1, "foo", "bar", &rc));
+-      REQUIRE(memcached_fatal(rc));
+-    }
+-
+-    SECTION("ping2") {
+-      memcached_server_fn fptr[] = {&ping2_callback};
+-
+-      REQUIRE_SUCCESS(memcached_server_cursor(memc, fptr, nullptr, 1));
+-    }
+-  }
++#endif
++#if LIBMEMCACHED_WITH_SASL_SUPPORT
++  WARN("SASL_TESTS disabled due to permission issues");
+ #endif
+ }
diff --git a/databases/libmemcached/files/patch-util_log.hpp b/databases/libmemcached/files/patch-util_log.hpp
deleted file mode 100644
index 5dd9f530971e..000000000000
--- a/databases/libmemcached/files/patch-util_log.hpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- util/log.hpp.orig	2014-02-09 11:52:42 UTC
-+++ util/log.hpp
-@@ -42,6 +42,7 @@
- #include <fcntl.h>
- #include <iostream>
- #include <string>
-+#include <string.h>
- #include <syslog.h>
- 
- #define UTIL_MAX_ERROR_SIZE 2048
diff --git a/databases/libmemcached/pkg-descr b/databases/libmemcached/pkg-descr
index f1391280e4c9..522775ee3319 100644
--- a/databases/libmemcached/pkg-descr
+++ b/databases/libmemcached/pkg-descr
@@ -19,5 +19,3 @@ memrm - Remove a key(s) from the serrver.
 memcp - Copy files to a memached server.
 memstat - Dump the stats of your servers to standard output
 memslap - Generate testing loads on a memcached cluster
-
-WWW: https://libmemcached.org/
diff --git a/databases/libmemcached/pkg-plist b/databases/libmemcached/pkg-plist
index 6e8563c50adf..2afd0c8f8f4e 100644
--- a/databases/libmemcached/pkg-plist
+++ b/databases/libmemcached/pkg-plist
@@ -13,6 +13,7 @@ bin/memslap
 bin/memstat
 bin/memtouch
 include/libhashkit-1.0/algorithm.h
+include/libhashkit-1.0/basic_string.h
 include/libhashkit-1.0/behavior.h
 include/libhashkit-1.0/configure.h
 include/libhashkit-1.0/digest.h
@@ -89,6 +90,7 @@ include/libmemcached/memcached.hpp
 include/libmemcached/util.h
 include/libmemcachedprotocol-0.0/binary.h
 include/libmemcachedprotocol-0.0/callback.h
+include/libmemcachedprotocol-0.0/configure.h
 include/libmemcachedprotocol-0.0/handler.h
 include/libmemcachedprotocol-0.0/vbucket.h
 include/libmemcachedutil-1.0/flush.h
@@ -98,138 +100,196 @@ include/libmemcachedutil-1.0/ping.h
 include/libmemcachedutil-1.0/pool.h
 include/libmemcachedutil-1.0/util.h
 include/libmemcachedutil-1.0/version.h
-lib/libhashkit.a
+lib/cmake/libmemcached/libhashkit-targets-%%CMAKE_BUILD_TYPE%%.cmake
+lib/cmake/libmemcached/libhashkit-targets.cmake
+lib/cmake/libmemcached/libhashkit-version.cmake
+lib/cmake/libmemcached/libmemcached-config.cmake
+lib/cmake/libmemcached/libmemcached-targets-%%CMAKE_BUILD_TYPE%%.cmake
+lib/cmake/libmemcached/libmemcached-targets.cmake
+lib/cmake/libmemcached/libmemcached-version.cmake
+lib/cmake/libmemcached/libmemcachedprotocol-targets-%%CMAKE_BUILD_TYPE%%.cmake
+lib/cmake/libmemcached/libmemcachedprotocol-targets.cmake
+lib/cmake/libmemcached/libmemcachedprotocol-version.cmake
+lib/cmake/libmemcached/libmemcachedutil-targets-%%CMAKE_BUILD_TYPE%%.cmake
+lib/cmake/libmemcached/libmemcachedutil-targets.cmake
+lib/cmake/libmemcached/libmemcachedutil-version.cmake
+lib/cmake/libmemcached/p9y-targets-%%CMAKE_BUILD_TYPE%%.cmake
+lib/cmake/libmemcached/p9y-targets.cmake
 lib/libhashkit.so
 lib/libhashkit.so.2
 lib/libhashkit.so.2.0.0
-lib/libmemcached.a
 lib/libmemcached.so
 lib/libmemcached.so.11
 lib/libmemcached.so.11.0.0
-lib/libmemcachedprotocol.a
 lib/libmemcachedprotocol.so
 lib/libmemcachedprotocol.so.0
 lib/libmemcachedprotocol.so.0.0.0
-lib/libmemcachedutil.a
 lib/libmemcachedutil.so
 lib/libmemcachedutil.so.2
 lib/libmemcachedutil.so.2.0.0
+lib/libp9y.a
 libdata/pkgconfig/libmemcached.pc
-man/man1/memaslap.1.gz
-man/man1/memcapable.1.gz
-man/man1/memcat.1.gz
-man/man1/memcp.1.gz
-man/man1/memdump.1.gz
-man/man1/memerror.1.gz
-man/man1/memexist.1.gz
-man/man1/memflush.1.gz
-man/man1/memparse.1.gz
-man/man1/memping.1.gz
-man/man1/memrm.1.gz
-man/man1/memslap.1.gz
-man/man1/memstat.1.gz
-man/man1/memtouch.1.gz
-man/man3/hashkit_clone.3.gz
-man/man3/hashkit_crc32.3.gz
-man/man3/hashkit_create.3.gz
-man/man3/hashkit_fnv1_32.3.gz
-man/man3/hashkit_fnv1_64.3.gz
-man/man3/hashkit_fnv1a_32.3.gz
-man/man3/hashkit_fnv1a_64.3.gz
-man/man3/hashkit_free.3.gz
-man/man3/hashkit_functions.3.gz
-man/man3/hashkit_hsieh.3.gz
-man/man3/hashkit_is_allocated.3.gz
-man/man3/hashkit_jenkins.3.gz
-man/man3/hashkit_md5.3.gz
-man/man3/hashkit_murmur.3.gz
-man/man3/hashkit_value.3.gz
-man/man3/libhashkit.3.gz
-man/man3/libmemcached.3.gz
-man/man3/libmemcached_check_configuration.3.gz
-man/man3/libmemcached_configuration.3.gz
-man/man3/libmemcached_examples.3.gz
-man/man3/libmemcachedutil.3.gz
-man/man3/memcached.3.gz
-man/man3/memcached_add.3.gz
-man/man3/memcached_add_by_key.3.gz
-man/man3/memcached_analyze.3.gz
-man/man3/memcached_append.3.gz
-man/man3/memcached_append_by_key.3.gz
-man/man3/memcached_behavior_get.3.gz
-man/man3/memcached_behavior_set.3.gz
-man/man3/memcached_callback_get.3.gz
-man/man3/memcached_callback_set.3.gz
-man/man3/memcached_cas.3.gz
-man/man3/memcached_cas_by_key.3.gz
-man/man3/memcached_clone.3.gz
-man/man3/memcached_create.3.gz
-man/man3/memcached_decrement.3.gz
-man/man3/memcached_decrement_with_initial.3.gz
-man/man3/memcached_delete.3.gz
-man/man3/memcached_delete_by_key.3.gz
-man/man3/memcached_destroy_sasl_auth_data.3.gz
-man/man3/memcached_dump.3.gz
-man/man3/memcached_exist.3.gz
-man/man3/memcached_exist_by_key.3.gz
-man/man3/memcached_fetch.3.gz
-man/man3/memcached_fetch_execute.3.gz
-man/man3/memcached_fetch_result.3.gz
-man/man3/memcached_flush_buffers.3.gz
-man/man3/memcached_free.3.gz
-man/man3/memcached_generate_hash.3.gz
-man/man3/memcached_generate_hash_value.3.gz
-man/man3/memcached_get.3.gz
-man/man3/memcached_get_by_key.3.gz
-man/man3/memcached_get_memory_allocators.3.gz
-man/man3/memcached_get_sasl_callbacks.3.gz
-man/man3/memcached_get_user_data.3.gz
-man/man3/memcached_increment.3.gz
-man/man3/memcached_increment_with_initial.3.gz
-man/man3/memcached_last_error_message.3.gz
-man/man3/memcached_lib_version.3.gz
-man/man3/memcached_mget.3.gz
-man/man3/memcached_mget_by_key.3.gz
-man/man3/memcached_mget_execute.3.gz
-man/man3/memcached_mget_execute_by_key.3.gz
-man/man3/memcached_pool.3.gz
-man/man3/memcached_pool_behavior_get.3.gz
-man/man3/memcached_pool_behavior_set.3.gz
-man/man3/memcached_pool_create.3.gz
-man/man3/memcached_pool_destroy.3.gz
-man/man3/memcached_pool_fetch.3.gz
-man/man3/memcached_pool_pop.3.gz
-man/man3/memcached_pool_push.3.gz
-man/man3/memcached_pool_release.3.gz
-man/man3/memcached_pool_st.3.gz
-man/man3/memcached_prepend.3.gz
-man/man3/memcached_prepend_by_key.3.gz
-man/man3/memcached_quit.3.gz
-man/man3/memcached_replace.3.gz
-man/man3/memcached_replace_by_key.3.gz
-man/man3/memcached_sasl_set_auth_data.3.gz
-man/man3/memcached_server_add.3.gz
-man/man3/memcached_server_count.3.gz
-man/man3/memcached_server_cursor.3.gz
-man/man3/memcached_server_list.3.gz
-man/man3/memcached_server_list_append.3.gz
-man/man3/memcached_server_list_count.3.gz
-man/man3/memcached_server_list_free.3.gz
-man/man3/memcached_server_push.3.gz
-man/man3/memcached_servers_parse.3.gz
-man/man3/memcached_set.3.gz
-man/man3/memcached_set_by_key.3.gz
-man/man3/memcached_set_memory_allocators.3.gz
-man/man3/memcached_set_sasl_callbacks.3.gz
-man/man3/memcached_set_user_data.3.gz
-man/man3/memcached_stat.3.gz
-man/man3/memcached_stat_execute.3.gz
-man/man3/memcached_stat_get_keys.3.gz
-man/man3/memcached_stat_get_value.3.gz
-man/man3/memcached_stat_servername.3.gz
-man/man3/memcached_strerror.3.gz
-man/man3/memcached_touch.3.gz
-man/man3/memcached_touch_by_key.3.gz
-man/man3/memcached_verbosity.3.gz
-man/man3/memcached_version.3.gz
 share/aclocal/ax_libmemcached.m4
+%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
+%%PORTDOCS%%%%DOCSDIR%%/BUGS.md
+%%PORTDOCS%%%%DOCSDIR%%/CONTRIBUTING.md
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog-0.md
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog-1.0.md
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog-1.1.md
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog.md
+%%PORTDOCS%%%%DOCSDIR%%/NEWS
+%%PORTDOCS%%%%DOCSDIR%%/README.md
+%%PORTDOCS%%%%DOCSDIR%%/TODO
+%%DATADIR%%/example.cnf
+%%MANPAGES%%share/man/man1/memaslap.1.gz
+%%MANPAGES%%share/man/man1/memcapable.1.gz
+%%MANPAGES%%share/man/man1/memcat.1.gz
+%%MANPAGES%%share/man/man1/memcp.1.gz
+%%MANPAGES%%share/man/man1/memdump.1.gz
+%%MANPAGES%%share/man/man1/memerror.1.gz
+%%MANPAGES%%share/man/man1/memexist.1.gz
+%%MANPAGES%%share/man/man1/memflush.1.gz
+%%MANPAGES%%share/man/man1/memparse.1.gz
+%%MANPAGES%%share/man/man1/memping.1.gz
+%%MANPAGES%%share/man/man1/memrm.1.gz
+%%MANPAGES%%share/man/man1/memslap.1.gz
+%%MANPAGES%%share/man/man1/memstat.1.gz
+%%MANPAGES%%share/man/man1/memtouch.1.gz
+%%MANPAGES%%share/man/man3/hashkit_clone.3.gz
+%%MANPAGES%%share/man/man3/hashkit_crc32.3.gz
+%%MANPAGES%%share/man/man3/hashkit_create.3.gz
+%%MANPAGES%%share/man/man3/hashkit_fnv1_32.3.gz
+%%MANPAGES%%share/man/man3/hashkit_fnv1_64.3.gz
+%%MANPAGES%%share/man/man3/hashkit_fnv1a_32.3.gz
+%%MANPAGES%%share/man/man3/hashkit_fnv1a_64.3.gz
+%%MANPAGES%%share/man/man3/hashkit_free.3.gz
+%%MANPAGES%%share/man/man3/hashkit_function.3.gz
+%%MANPAGES%%share/man/man3/hashkit_functions.3.gz
+%%MANPAGES%%share/man/man3/hashkit_get_distribution_function.3.gz
+%%MANPAGES%%share/man/man3/hashkit_get_function.3.gz
+%%MANPAGES%%share/man/man3/hashkit_hsieh.3.gz
+%%MANPAGES%%share/man/man3/hashkit_is_allocated.3.gz
+%%MANPAGES%%share/man/man3/hashkit_jenkins.3.gz
+%%MANPAGES%%share/man/man3/hashkit_md5.3.gz
+%%MANPAGES%%share/man/man3/hashkit_murmur.3.gz
+%%MANPAGES%%share/man/man3/hashkit_set_custom_distribution_function.3.gz
+%%MANPAGES%%share/man/man3/hashkit_set_custom_function.3.gz
+%%MANPAGES%%share/man/man3/hashkit_set_distribution_function.3.gz
+%%MANPAGES%%share/man/man3/hashkit_set_function.3.gz
+%%MANPAGES%%share/man/man3/hashkit_value.3.gz
+%%MANPAGES%%share/man/man3/libhashkit.3.gz
+%%MANPAGES%%share/man/man3/libmemcached.3.gz
+%%MANPAGES%%share/man/man3/libmemcached_check_configuration.3.gz
+%%MANPAGES%%share/man/man3/libmemcached_configuration.3.gz
+%%MANPAGES%%share/man/man3/libmemcached_examples.3.gz
+%%MANPAGES%%share/man/man3/libmemcachedutil.3.gz
+%%MANPAGES%%share/man/man3/memcached.3.gz
+%%MANPAGES%%share/man/man3/memcached_add.3.gz
+%%MANPAGES%%share/man/man3/memcached_add_by_key.3.gz
+%%MANPAGES%%share/man/man3/memcached_analyze.3.gz
+%%MANPAGES%%share/man/man3/memcached_append.3.gz
+%%MANPAGES%%share/man/man3/memcached_append_by_key.3.gz
+%%MANPAGES%%share/man/man3/memcached_auto.3.gz
+%%MANPAGES%%share/man/man3/memcached_behavior.3.gz
+%%MANPAGES%%share/man/man3/memcached_behavior_get.3.gz
+%%MANPAGES%%share/man/man3/memcached_behavior_set.3.gz
+%%MANPAGES%%share/man/man3/memcached_callback.3.gz
+%%MANPAGES%%share/man/man3/memcached_callback_get.3.gz
+%%MANPAGES%%share/man/man3/memcached_callback_set.3.gz
+%%MANPAGES%%share/man/man3/memcached_cas.3.gz
+%%MANPAGES%%share/man/man3/memcached_cas_by_key.3.gz
+%%MANPAGES%%share/man/man3/memcached_clone.3.gz
+%%MANPAGES%%share/man/man3/memcached_create.3.gz
+%%MANPAGES%%share/man/man3/memcached_decrement.3.gz
+%%MANPAGES%%share/man/man3/memcached_decrement_with_initial.3.gz
+%%MANPAGES%%share/man/man3/memcached_delete.3.gz
+%%MANPAGES%%share/man/man3/memcached_delete_by_key.3.gz
+%%MANPAGES%%share/man/man3/memcached_destroy_sasl_auth_data.3.gz
+%%MANPAGES%%share/man/man3/memcached_dump.3.gz
+%%MANPAGES%%share/man/man3/memcached_exist.3.gz
+%%MANPAGES%%share/man/man3/memcached_exist_by_key.3.gz
+%%MANPAGES%%share/man/man3/memcached_fetch.3.gz
+%%MANPAGES%%share/man/man3/memcached_fetch_execute.3.gz
+%%MANPAGES%%share/man/man3/memcached_fetch_result.3.gz
+%%MANPAGES%%share/man/man3/memcached_flush.3.gz
+%%MANPAGES%%share/man/man3/memcached_flush_buffers.3.gz
+%%MANPAGES%%share/man/man3/memcached_free.3.gz
+%%MANPAGES%%share/man/man3/memcached_generate_hash.3.gz
+%%MANPAGES%%share/man/man3/memcached_generate_hash_value.3.gz
+%%MANPAGES%%share/man/man3/memcached_get.3.gz
+%%MANPAGES%%share/man/man3/memcached_get_by_key.3.gz
+%%MANPAGES%%share/man/man3/memcached_get_memory_allocators.3.gz
+%%MANPAGES%%share/man/man3/memcached_get_sasl_callbacks.3.gz
+%%MANPAGES%%share/man/man3/memcached_get_user_data.3.gz
+%%MANPAGES%%share/man/man3/memcached_increment.3.gz
+%%MANPAGES%%share/man/man3/memcached_increment_with_initial.3.gz
+%%MANPAGES%%share/man/man3/memcached_last_error.3.gz
+%%MANPAGES%%share/man/man3/memcached_last_error_errno.3.gz
+%%MANPAGES%%share/man/man3/memcached_last_error_message.3.gz
+%%MANPAGES%%share/man/man3/memcached_lib_version.3.gz
+%%MANPAGES%%share/man/man3/memcached_memory_allocators.3.gz
+%%MANPAGES%%share/man/man3/memcached_mget.3.gz
+%%MANPAGES%%share/man/man3/memcached_mget_by_key.3.gz
+%%MANPAGES%%share/man/man3/memcached_mget_execute.3.gz
+%%MANPAGES%%share/man/man3/memcached_mget_execute_by_key.3.gz
+%%MANPAGES%%share/man/man3/memcached_pool.3.gz
+%%MANPAGES%%share/man/man3/memcached_pool_behavior_get.3.gz
+%%MANPAGES%%share/man/man3/memcached_pool_behavior_set.3.gz
+%%MANPAGES%%share/man/man3/memcached_pool_create.3.gz
+%%MANPAGES%%share/man/man3/memcached_pool_destroy.3.gz
+%%MANPAGES%%share/man/man3/memcached_pool_fetch.3.gz
+%%MANPAGES%%share/man/man3/memcached_pool_pop.3.gz
+%%MANPAGES%%share/man/man3/memcached_pool_push.3.gz
+%%MANPAGES%%share/man/man3/memcached_pool_%%CMAKE_BUILD_TYPE%%.3.gz
+%%MANPAGES%%share/man/man3/memcached_pool_st.3.gz
+%%MANPAGES%%share/man/man3/memcached_prepend.3.gz
+%%MANPAGES%%share/man/man3/memcached_prepend_by_key.3.gz
+%%MANPAGES%%share/man/man3/memcached_quit.3.gz
+%%MANPAGES%%share/man/man3/memcached_replace.3.gz
+%%MANPAGES%%share/man/man3/memcached_replace_by_key.3.gz
+%%MANPAGES%%share/man/man3/memcached_result_cas.3.gz
+%%MANPAGES%%share/man/man3/memcached_result_create.3.gz
+%%MANPAGES%%share/man/man3/memcached_result_flags.3.gz
+%%MANPAGES%%share/man/man3/memcached_result_free.3.gz
+%%MANPAGES%%share/man/man3/memcached_result_key_length.3.gz
+%%MANPAGES%%share/man/man3/memcached_result_key_value.3.gz
+%%MANPAGES%%share/man/man3/memcached_result_length.3.gz
+%%MANPAGES%%share/man/man3/memcached_result_st.3.gz
+%%MANPAGES%%share/man/man3/memcached_result_value.3.gz
+%%MANPAGES%%share/man/man3/memcached_return_t.3.gz
+%%MANPAGES%%share/man/man3/memcached_sasl.3.gz
+%%MANPAGES%%share/man/man3/memcached_sasl_set_auth_data.3.gz
+%%MANPAGES%%share/man/man3/memcached_server_add.3.gz
+%%MANPAGES%%share/man/man3/memcached_server_add_unix_socket.3.gz
+%%MANPAGES%%share/man/man3/memcached_server_count.3.gz
+%%MANPAGES%%share/man/man3/memcached_server_cursor.3.gz
+%%MANPAGES%%share/man/man3/memcached_server_list.3.gz
+%%MANPAGES%%share/man/man3/memcached_server_list_append.3.gz
+%%MANPAGES%%share/man/man3/memcached_server_list_count.3.gz
+%%MANPAGES%%share/man/man3/memcached_server_list_free.3.gz
+%%MANPAGES%%share/man/man3/memcached_server_push.3.gz
+%%MANPAGES%%share/man/man3/memcached_server_st.3.gz
+%%MANPAGES%%share/man/man3/memcached_servers.3.gz
+%%MANPAGES%%share/man/man3/memcached_servers_parse.3.gz
+%%MANPAGES%%share/man/man3/memcached_servers_reset.3.gz
+%%MANPAGES%%share/man/man3/memcached_set.3.gz
+%%MANPAGES%%share/man/man3/memcached_set_by_key.3.gz
+%%MANPAGES%%share/man/man3/memcached_set_encoding_key.3.gz
+%%MANPAGES%%share/man/man3/memcached_set_memory_allocators.3.gz
+%%MANPAGES%%share/man/man3/memcached_set_memory_allocators_context.3.gz
+%%MANPAGES%%share/man/man3/memcached_set_sasl_callbacks.3.gz
+%%MANPAGES%%share/man/man3/memcached_set_user_data.3.gz
+%%MANPAGES%%share/man/man3/memcached_stat.3.gz
+%%MANPAGES%%share/man/man3/memcached_stat_execute.3.gz
+%%MANPAGES%%share/man/man3/memcached_stat_get_keys.3.gz
+%%MANPAGES%%share/man/man3/memcached_stat_get_value.3.gz
+%%MANPAGES%%share/man/man3/memcached_stat_servername.3.gz
+%%MANPAGES%%share/man/man3/memcached_stats.3.gz
+%%MANPAGES%%share/man/man3/memcached_strerror.3.gz
+%%MANPAGES%%share/man/man3/memcached_touch.3.gz
+%%MANPAGES%%share/man/man3/memcached_touch_by_key.3.gz
+%%MANPAGES%%share/man/man3/memcached_user_data.3.gz
+%%MANPAGES%%share/man/man3/memcached_verbosity.3.gz
+%%MANPAGES%%share/man/man3/memcached_version.3.gz
diff --git a/databases/libmongo-client/Makefile b/databases/libmongo-client/Makefile
index 207557864c46..671207e8e009 100644
--- a/databases/libmongo-client/Makefile
+++ b/databases/libmongo-client/Makefile
@@ -1,5 +1,3 @@
-# Created by: Denis Generalov <gd.workbox@gmail.com>
-
 PORTNAME=	libmongo-client
 PORTVERSION=	0.1.6.3
 DISTVERSIONPREFIX=	${PORTNAME}-
@@ -8,6 +6,7 @@ CATEGORIES=	databases
 
 MAINTAINER=	gd.workbox@gmail.com
 COMMENT=	Alternative C driver for MongoDB
+WWW=		https://github.com/algernon/libmongo-client
 
 LICENSE=	APACHE20
 
diff --git a/databases/libmongo-client/pkg-descr b/databases/libmongo-client/pkg-descr
index 3160606139b6..cf710fc720a6 100644
--- a/databases/libmongo-client/pkg-descr
+++ b/databases/libmongo-client/pkg-descr
@@ -4,5 +4,3 @@ than the official one:
 libmongo-client is meant to be a stable (API, ABI and quality alike), clean,
 well documented and well tested shared library, that strives to make the most
 common use cases as convenient as possible.
-
-WWW: https://github.com/algernon/libmongo-client
diff --git a/databases/libmongocrypt/Makefile b/databases/libmongocrypt/Makefile
new file mode 100644
index 000000000000..69c67512580b
--- /dev/null
+++ b/databases/libmongocrypt/Makefile
@@ -0,0 +1,26 @@
+PORTNAME=	libmongocrypt
+DISTVERSION=	1.8.1
+CATEGORIES=	databases
+
+MAINTAINER=	hiroo.ono+freebsd@gmail.com
+COMMENT=	MongoDB companion C library for client side encryption in drivers
+WWW=		https://github.com/mongodb/libmongocrypt
+
+LICENSE=	APACHE20
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
+LIB_DEPENDS=	libbson-1.0.so:devel/libbson \
+		libmongoc-1.0.so:devel/mongo-c-driver
+
+USES=		cmake python:build ssl
+
+USE_GITHUB=	yes
+GH_ACCOUNT=	mongodb
+
+CMAKE_OFF=	BUILD_TESTING ENABLE_ONLINE_TESTS \
+		MONGOCRYPT_ENABLE_DECIMAL128
+CMAKE_ON=	USE_SHARED_LIBBSON
+CMAKE_ARGS=	-DBUILD_VERSION=${DISTVERSION} \
+		-DMONGOCRYPT_MONGOC_DIR="USE-SYSTEM"
+
+.include <bsd.port.mk>
diff --git a/databases/libmongocrypt/distinfo b/databases/libmongocrypt/distinfo
new file mode 100644
index 000000000000..5cc112c19fb4
--- /dev/null
+++ b/databases/libmongocrypt/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1687607926
+SHA256 (mongodb-libmongocrypt-1.8.1_GH0.tar.gz) = 068a677d3716ac89d730223c1758f041d840eb3363f0521b9969a02bb3a0f977
+SIZE (mongodb-libmongocrypt-1.8.1_GH0.tar.gz) = 4223480
diff --git a/databases/libmongocrypt/pkg-descr b/databases/libmongocrypt/pkg-descr
new file mode 100644
index 000000000000..17d54944785a
--- /dev/null
+++ b/databases/libmongocrypt/pkg-descr
@@ -0,0 +1 @@
+MongoDB companion C library for client side encryption in drivers
diff --git a/databases/libmongocrypt/pkg-plist b/databases/libmongocrypt/pkg-plist
new file mode 100644
index 000000000000..85b02ef3866d
--- /dev/null
+++ b/databases/libmongocrypt/pkg-plist
@@ -0,0 +1,39 @@
+include/kms_message/kms_azure_request.h
+include/kms_message/kms_b64.h
+include/kms_message/kms_caller_identity_request.h
+include/kms_message/kms_decrypt_request.h
+include/kms_message/kms_encrypt_request.h
+include/kms_message/kms_gcp_request.h
+include/kms_message/kms_kmip_request.h
+include/kms_message/kms_kmip_response.h
+include/kms_message/kms_kmip_response_parser.h
+include/kms_message/kms_message.h
+include/kms_message/kms_message_defines.h
+include/kms_message/kms_request.h
+include/kms_message/kms_request_opt.h
+include/kms_message/kms_response.h
+include/kms_message/kms_response_parser.h
+include/mongocrypt/mongocrypt-compat.h
+include/mongocrypt/mongocrypt-config.h
+include/mongocrypt/mongocrypt-export.h
+include/mongocrypt/mongocrypt.h
+lib/cmake/kms_message/kms_message-config-version.cmake
+lib/cmake/kms_message/kms_message-config.cmake
+lib/cmake/kms_message/kms_message_targets-%%CMAKE_BUILD_TYPE%%.cmake
+lib/cmake/kms_message/kms_message_targets.cmake
+lib/cmake/mongocrypt/mongocrypt-config-version.cmake
+lib/cmake/mongocrypt/mongocrypt-config.cmake
+lib/cmake/mongocrypt/mongocrypt_targets-%%CMAKE_BUILD_TYPE%%.cmake
+lib/cmake/mongocrypt/mongocrypt_targets.cmake
+lib/libbson-static-for-libmongocrypt.a
+lib/libkms_message-static.a
+lib/libkms_message.so
+lib/libkms_message.so.0
+lib/libkms_message.so.0.0.0
+lib/libmongocrypt-static.a
+lib/libmongocrypt.so
+lib/libmongocrypt.so.0
+lib/libmongocrypt.so.0.0.0
+libdata/pkgconfig/libkms_message.pc
+libdata/pkgconfig/libmongocrypt-static.pc
+libdata/pkgconfig/libmongocrypt.pc
diff --git a/databases/libmswstr/Makefile b/databases/libmswstr/Makefile
index b94833d9394e..c84e3f9d093e 100644
--- a/databases/libmswstr/Makefile
+++ b/databases/libmswstr/Makefile
@@ -1,11 +1,10 @@
-# Created by: Rainer Hurling <rhurlin@gwdg.de>
-
 PORTNAME=	libmswstr
 PORTVERSION=	0.0.1
 CATEGORIES=	databases
 
 MAINTAINER=	rhurlin@FreeBSD.org
 COMMENT=	Read and parse mdb file indices
+WWW=		https://github.com/leecher1337/libmswstr
 
 # https://github.com/leecher1337/libmswstr/blob/master/COPYING
 #DISABLE_LICENSES=	yes
diff --git a/databases/libmswstr/pkg-descr b/databases/libmswstr/pkg-descr
index 36c0d07c49f6..c515b80382cd 100644
--- a/databases/libmswstr/pkg-descr
+++ b/databases/libmswstr/pkg-descr
@@ -10,5 +10,3 @@ Libraries that try to read and parse mdb file indices like
 databases/mdbtools should work on every platform and therefore a
 platform independent version of this library is needed. This is an
 attempt to port the library to Posix-systems.
-
-WWW: https://github.com/leecher1337/libmswstr
diff --git a/databases/libnvpair/Makefile b/databases/libnvpair/Makefile
index 8f59eff75fb4..b8b0ae394b26 100644
--- a/databases/libnvpair/Makefile
+++ b/databases/libnvpair/Makefile
@@ -1,11 +1,10 @@
-# Created by: John Marino <marino@FreeBSD.org>
-
 PORTNAME=	libnvpair
 PORTVERSION=	2.0
 CATEGORIES=	databases devel
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Illumos name-value pair library
+WWW=		http://illumos.org/man/3lib/libnvpair
 
 LICENSE=	CDDL
 
diff --git a/databases/libnvpair/pkg-descr b/databases/libnvpair/pkg-descr
index 279f04df1ffa..db8058157fe4 100644
--- a/databases/libnvpair/pkg-descr
+++ b/databases/libnvpair/pkg-descr
@@ -6,5 +6,3 @@ name-value pairs.  This is a base library for Solaris and its descendents.
 However, the kernel-specific code has been removed thus libnvpair is
 strictly meant for the userland.  The XDR functionality has been masked
 for now due to RPC differences between *BSD and Illumos.
-
-WWW: http://illumos.org/man/3lib/libnvpair
diff --git a/databases/libodbc++/Makefile b/databases/libodbc++/Makefile
index 43394c9c2f8b..f677de7d67cd 100644
--- a/databases/libodbc++/Makefile
+++ b/databases/libodbc++/Makefile
@@ -4,28 +4,31 @@ PORTREVISION=	5
 CATEGORIES=	databases devel
 MASTER_SITES=	SF/libodbcxx/libodbc%2B%2B/${PORTVERSION}
 
-MAINTAINER=	fjoe@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	C++ class library and toolset for ODBC access to data sources
+WWW=		http://orcane.net/freeodbc++/
 
 LICENSE=	GPLv2
 
-OPTIONS_DEFINE=	DOXYGEN DOCS
-
-DOXYGEN_IMPLIES=	DOCS
-DOXYGEN_BUILD_DEPENDS=	doxygen:devel/doxygen
+LIB_DEPENDS=	libodbc.so:databases/unixODBC
 
 USES=		gmake libtool ncurses pathfix pkgconfig readline tar:bzip2
+USE_CXXSTD=	c++14
 USE_LDCONFIG=	yes
+
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-isqlxx
-INSTALL_TARGET=	install-strip
+CONFIGURE_ARGS=	--with-isqlxx --with-odbc=${LOCALBASE}
 
-LIB_DEPENDS=	libodbc.so:databases/unixODBC
-CONFIGURE_ARGS+=	--with-odbc=${LOCALBASE}
+INSTALL_TARGET=	install-strip
 
 DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}-${PORTVERSION}
 PORTDOCS=	progref
 
+OPTIONS_DEFINE=	DOXYGEN DOCS
+
+DOXYGEN_IMPLIES=	DOCS
+DOXYGEN_BUILD_DEPENDS=	doxygen:devel/doxygen
+
 post-extract:
 	${RM} ${WRKSRC}/doc/progref/progref-stamp
 
diff --git a/databases/libodbc++/pkg-descr b/databases/libodbc++/pkg-descr
index 3615f0a8a975..dc54cc4f43f1 100644
--- a/databases/libodbc++/pkg-descr
+++ b/databases/libodbc++/pkg-descr
@@ -8,5 +8,3 @@ an ODBC driver manager.  It currently supports either iODBC or unixODBC.
 This port allows the user to select which driver manager to use via a
 build-time variable definition - see the comments in the Makefile for further
 details.
-
-WWW: http://orcane.net/freeodbc++/
diff --git a/databases/libpbl/Makefile b/databases/libpbl/Makefile
index afc1085adad4..a32b9935539d 100644
--- a/databases/libpbl/Makefile
+++ b/databases/libpbl/Makefile
@@ -1,5 +1,3 @@
-# Created by: Zach Thompson <hideo@lastamericanempire.com>
-
 PORTNAME=	libpbl
 PORTVERSION=	1.04.04
 CATEGORIES=	databases
@@ -8,16 +6,13 @@ DISTNAME=	pbl_${PORTVERSION:S/./_/g}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Peter Graf's Program Base Library
+WWW=		https://mission-base.com/peter/source/
 
 LICENSE=	LGPL21+
 
 MAKEFILE=	makefile
 TEST_TARGET=	test
 
-BROKEN_armv6=	Fails to build: cannot compile pblPerform.c
-BROKEN_armv7=	Fails to build: cannot compile pblPerform.c
-BROKEN_mips=	Fails to build: cannot compile pblPerform.c
-
 WRKSRC=		${WRKDIR}/${DISTNAME}/src
 
 PLIST_FILES=	include/pbl.h \
diff --git a/databases/libpbl/files/patch-pblPerform.c b/databases/libpbl/files/patch-pblPerform.c
new file mode 100644
index 000000000000..151d8a0ed7c5
--- /dev/null
+++ b/databases/libpbl/files/patch-pblPerform.c
@@ -0,0 +1,11 @@
+--- pblPerform.c.orig	2021-09-26 20:04:50 UTC
++++ pblPerform.c
+@@ -85,7 +85,7 @@ if( end.tv_usec < start.tv_usec )\
+     start.tv_sec++;\
+ }\
+ \
+-printf( "%s took %ld.%.6ld\n", tag, (long)end.tv_sec - start.tv_sec, (long)end.tv_usec );\
++printf( "%s took %lld.%.6lld\n", tag, (long long)end.tv_sec - start.tv_sec, (long long)end.tv_usec );\
+ }\
+ 
+ /*****************************************************************************/
diff --git a/databases/libpbl/pkg-descr b/databases/libpbl/pkg-descr
index a305463a42c3..325a160f57d4 100644
--- a/databases/libpbl/pkg-descr
+++ b/databases/libpbl/pkg-descr
@@ -1,4 +1,2 @@
 Peter Graf's Program Base Library of C functions.
 Includes hash table, ISAM, key file implementations.
-
-WWW: http://mission-base.com/peter/source/
diff --git a/databases/libpg_query/Makefile b/databases/libpg_query/Makefile
index cd2d8402bc0b..a838cf86ab2c 100644
--- a/databases/libpg_query/Makefile
+++ b/databases/libpg_query/Makefile
@@ -1,20 +1,18 @@
-# Created by: Matthias Fechner <mfechner@FreeBSD.org>
-
 PORTNAME=	libpg_query
-DISTVERSION=	10-1.0.4
-PORTREVISION=	0
+DISTVERSION=	15-4.2.3
 CATEGORIES=	databases devel
 
-PATCH_SITES=	https://github.com/lfittl/libpg_query/commit/
-PATCHFILES=	820f5294f92927d6c4f61722bb28cf380942b83c.patch:-p1
-
 MAINTAINER=	mfechner@FreeBSD.org
 COMMENT=	C library for accessing the PostgreSQL parser outside of the server
+WWW=		https://github.com/lfittl/libpg_query
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-USES=		compiler:c11 gmake pgsql
+BROKEN_i386=	Tests are failing: INVALID result for ALTER SUBSCRIPTION mysub SET PUBLICATION insert_only
+
+USES=		compiler:c11 cpe gmake pgsql
+CPE_VENDOR=	${PORTNAME}_project
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
diff --git a/databases/libpg_query/distinfo b/databases/libpg_query/distinfo
index 6e7d89244eec..5ece7905198d 100644
--- a/databases/libpg_query/distinfo
+++ b/databases/libpg_query/distinfo
@@ -1,5 +1,3 @@
-TIMESTAMP = 1609782591
-SHA256 (lfittl-libpg_query-10-1.0.4_GH0.tar.gz) = 88cc90296e5fcaaebd0b360c46698b7c5badddf86f120e249ef682a820d41338
-SIZE (lfittl-libpg_query-10-1.0.4_GH0.tar.gz) = 1508585
-SHA256 (820f5294f92927d6c4f61722bb28cf380942b83c.patch) = 3d528a6d72aac8a3aa04c64d2218c43de9818baf2b0cbe54e7a075cbf069436c
-SIZE (820f5294f92927d6c4f61722bb28cf380942b83c.patch) = 2374
+TIMESTAMP = 1702537287
+SHA256 (lfittl-libpg_query-15-4.2.3_GH0.tar.gz) = 8b820d63442b1677ce4f0df2a95b3fafdbc520a82901def81217559ec4df9e6b
+SIZE (lfittl-libpg_query-15-4.2.3_GH0.tar.gz) = 4172169
diff --git a/databases/libpg_query/pkg-descr b/databases/libpg_query/pkg-descr
index 6e04a75b2fc6..28bbf54d2194 100644
--- a/databases/libpg_query/pkg-descr
+++ b/databases/libpg_query/pkg-descr
@@ -2,5 +2,3 @@ C library for accessing the PostgreSQL parser outside of the server.
 
 This library uses the actual PostgreSQL server source to parse SQL
 queries and return the internal PostgreSQL parse tree.
-
-WWW: https://github.com/lfittl/libpg_query
diff --git a/databases/libpqtypes/Makefile b/databases/libpqtypes/Makefile
index f8a1cfcb34b0..6239d5ae5096 100644
--- a/databases/libpqtypes/Makefile
+++ b/databases/libpqtypes/Makefile
@@ -1,19 +1,19 @@
-# Created by: Dave Green <dg@fastmail.co.uk>
-
 PORTNAME=	libpqtypes
 PORTVERSION=	1.5.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	databases
 MASTER_SITES=	http://pgfoundry.org/frs/download.php/3484/
 
 MAINTAINER=	dg@fastmail.co.uk
 COMMENT=	Extension to libpq parameter handling
+WWW=		http://libpqtypes.esilo.com/
 
 LICENSE=	BSD2CLAUSE
 
 USES=		gmake libtool pgsql autoreconf
 
 GNU_CONFIGURE=	yes
+GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
 USE_LDCONFIG=	yes
 
 INSTALL_TARGET=	install-strip
diff --git a/databases/libpqtypes/pkg-descr b/databases/libpqtypes/pkg-descr
index 6f18d6515d0a..51bd5ef53af1 100644
--- a/databases/libpqtypes/pkg-descr
+++ b/databases/libpqtypes/pkg-descr
@@ -1,5 +1,3 @@
 libpqtypes is a libpq extension that offers a new way of handling parameterized
 queries and getting result field values. Both putting parameters and getting
 values use a printf/scanf style interface, with consistent specifiers for both.
-
-WWW: http://libpqtypes.esilo.com/
diff --git a/databases/libpqtypes/pkg-plist b/databases/libpqtypes/pkg-plist
index a38f0639a565..275b495d3eff 100644
--- a/databases/libpqtypes/pkg-plist
+++ b/databases/libpqtypes/pkg-plist
@@ -2,36 +2,36 @@ include/libpqtypes.h
 lib/libpqtypes.so
 lib/libpqtypes.so.0
 lib/libpqtypes.so.0.1.5
-man/man3/PQclearSpecs.3.gz
-man/man3/PQclearTypes.3.gz
-man/man3/PQexecf.3.gz
-man/man3/PQexecvf.3.gz
-man/man3/PQgetErrorField.3.gz
-man/man3/PQgeterror.3.gz
-man/man3/PQgetf.3.gz
-man/man3/PQgetvf.3.gz
-man/man3/PQinitTypes.3.gz
-man/man3/PQlocalTZInfo.3.gz
-man/man3/PQparamClear.3.gz
-man/man3/PQparamCount.3.gz
-man/man3/PQparamCreate.3.gz
-man/man3/PQparamExec.3.gz
-man/man3/PQparamExecPrepared.3.gz
-man/man3/PQparamReset.3.gz
-man/man3/PQparamSendQuery.3.gz
-man/man3/PQparamSendQueryPrepared.3.gz
-man/man3/PQputf.3.gz
-man/man3/PQputvf.3.gz
-man/man3/PQregisterComposites.3.gz
-man/man3/PQregisterResult.3.gz
-man/man3/PQregisterSubClasses.3.gz
-man/man3/PQregisterTypes.3.gz
-man/man3/PQregisterUserDefinedTypes.3.gz
-man/man3/PQsendf.3.gz
-man/man3/PQsendvf.3.gz
-man/man3/PQseterror.3.gz
-man/man3/PQspecPrepare.3.gz
-man/man3/PQtypesRegister.3.gz
-man/man3/pqt-composites.3.gz
-man/man3/pqt-handlers.3.gz
-man/man3/pqt-specs.3.gz
+share/man/man3/PQclearSpecs.3.gz
+share/man/man3/PQclearTypes.3.gz
+share/man/man3/PQexecf.3.gz
+share/man/man3/PQexecvf.3.gz
+share/man/man3/PQgetErrorField.3.gz
+share/man/man3/PQgeterror.3.gz
+share/man/man3/PQgetf.3.gz
+share/man/man3/PQgetvf.3.gz
+share/man/man3/PQinitTypes.3.gz
+share/man/man3/PQlocalTZInfo.3.gz
+share/man/man3/PQparamClear.3.gz
+share/man/man3/PQparamCount.3.gz
+share/man/man3/PQparamCreate.3.gz
+share/man/man3/PQparamExec.3.gz
+share/man/man3/PQparamExecPrepared.3.gz
+share/man/man3/PQparamReset.3.gz
+share/man/man3/PQparamSendQuery.3.gz
+share/man/man3/PQparamSendQueryPrepared.3.gz
+share/man/man3/PQputf.3.gz
+share/man/man3/PQputvf.3.gz
+share/man/man3/PQregisterComposites.3.gz
+share/man/man3/PQregisterResult.3.gz
+share/man/man3/PQregisterSubClasses.3.gz
+share/man/man3/PQregisterTypes.3.gz
+share/man/man3/PQregisterUserDefinedTypes.3.gz
+share/man/man3/PQsendf.3.gz
+share/man/man3/PQsendvf.3.gz
+share/man/man3/PQseterror.3.gz
+share/man/man3/PQspecPrepare.3.gz
+share/man/man3/PQtypesRegister.3.gz
+share/man/man3/pqt-composites.3.gz
+share/man/man3/pqt-handlers.3.gz
+share/man/man3/pqt-specs.3.gz
diff --git a/databases/libsdb/Makefile b/databases/libsdb/Makefile
index 0884e9ea927d..ae2608e8eb1f 100644
--- a/databases/libsdb/Makefile
+++ b/databases/libsdb/Makefile
@@ -1,18 +1,18 @@
-# Created by: ijliao
-
 PORTNAME=	libsdb
 PORTVERSION=	0.10.1
+PORTREVISION=	1
 CATEGORIES=	databases
 MASTER_SITES=	http://siag.nu/pub/libsdb/
 DISTNAME=	sdb-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Simple database library
+WWW=		https://siag.nu/libsdb/
 
 MAKE_JOBS_UNSAFE=	yes
 
 HAS_CONFIGURE=	yes
-MAKE_ARGS=	PREFIX="${PREFIX}" CC="${CC}" CFLAGS="${CFLAGS}"
+MAKE_ARGS=	PREFIX="${PREFIX}" CC="${CC}" CFLAGS="${CFLAGS}" MANDIR="${PREFIX}/share/man"
 USE_LDCONFIG=	yes
 
 PLIST_SUB=	VERSION="${PORTVERSION}"
diff --git a/databases/libsdb/files/patch-config.in b/databases/libsdb/files/patch-config.in
index 061a3f3a490e..1994ca0ff66b 100644
--- a/databases/libsdb/files/patch-config.in
+++ b/databases/libsdb/files/patch-config.in
@@ -6,8 +6,8 @@
  install-man:
 -	mkdir -p $(MANDIR)/man3 && cp $(MAN3) $(MANDIR)/man3
 -	mkdir -p $(MANDIR)/man8 && cp $(MAN8) $(MANDIR)/man8
-+	$(BSD_INSTALL_MAN) $(MAN3) $(DESTDIR)$(MANDIR)/man3
-+	$(BSD_INSTALL_MAN) $(MAN8) $(DESTDIR)$(MANDIR)/man8
++	$(BSD_INSTALL_MAN) $(MAN3) $(DESTDIR)/$(MANDIR)/man3
++	$(BSD_INSTALL_MAN) $(MAN8) $(DESTDIR)/$(MANDIR)/man8
  
  uninstall-man:
  	cd $(MANDIR)/man3 && rm -f $(MAN3)
diff --git a/databases/libsdb/pkg-descr b/databases/libsdb/pkg-descr
index f53b29bee758..690544627eee 100644
--- a/databases/libsdb/pkg-descr
+++ b/databases/libsdb/pkg-descr
@@ -10,5 +10,3 @@ Supported databases:
    - Postgresql
    - Oracle
    - Gdbm
-
-WWW: http://siag.nu/libsdb/
diff --git a/databases/libsdb/pkg-plist b/databases/libsdb/pkg-plist
index 492bb6e160f9..d13459183a90 100644
--- a/databases/libsdb/pkg-plist
+++ b/databases/libsdb/pkg-plist
@@ -7,9 +7,9 @@ lib/libsdb.a
 lib/libsdb.so
 lib/libsdb.so.0
 lib/libsdb.so.0.10.0
-man/man3/sdb.3.gz
-man/man3/sdb_close.3.gz
-man/man3/sdb_init.3.gz
-man/man3/sdb_open.3.gz
-man/man3/sdb_query.3.gz
-man/man8/sdbd.8.gz
+share/man/man3/sdb.3.gz
+share/man/man3/sdb_close.3.gz
+share/man/man3/sdb_init.3.gz
+share/man/man3/sdb_open.3.gz
+share/man/man3/sdb_query.3.gz
+share/man/man8/sdbd.8.gz
diff --git a/databases/libzdb/Makefile b/databases/libzdb/Makefile
index 09bfd3967359..c29399bfc3f6 100644
--- a/databases/libzdb/Makefile
+++ b/databases/libzdb/Makefile
@@ -1,12 +1,11 @@
-# Created by: vanilla@
-
 PORTNAME=	libzdb
-PORTVERSION=	3.2.2
+PORTVERSION=	3.2.3
 CATEGORIES=	databases
 MASTER_SITES=	https://www.tildeslash.com/libzdb/dist/
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Thread-safe connection pool library
+WWW=		https://www.tildeslash.com/libzdb/
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
@@ -20,10 +19,10 @@ GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
 USE_LDCONFIG=	yes
 
-OPTIONS_DEFINE=		SSL
-OPTIONS_MULTI=		DB
+OPTIONS_DEFINE=	SSL
+OPTIONS_MULTI=	DB
 OPTIONS_MULTI_DB=	MYSQL PGSQL SQLITE
-OPTIONS_DEFAULT=	MYSQL PGSQL SQLITE SSL
+OPTIONS_DEFAULT=MYSQL PGSQL SQLITE SSL
 
 MYSQL_CONFIGURE_WITH=	mysql=${LOCALBASE}/bin/mysql_config
 MYSQL_USES=		mysql
@@ -33,15 +32,15 @@ SQLITE_CONFIGURE_WITH=	sqlite=${LOCALBASE}
 SQLITE_USES=		sqlite
 SSL_USES=		ssl
 
-.include <bsd.port.options.mk> 	 
+.include <bsd.port.options.mk>
 
 # See PR/237200 for details
-.if ${PORT_OPTIONS:MSSL} 	 
-.if ${SSL_DEFAULT} == base 	 
-CONFIGURE_ARGS+=        --enable-openssl 	 
-.else 	 
-CONFIGURE_ARGS+=        --enable-openssl=${OPENSSLBASE} 	 
-.endif 	 
+.if ${PORT_OPTIONS:MSSL}
+.if ${SSL_DEFAULT} == base
+CONFIGURE_ARGS+=	--enable-openssl
+.else
+CONFIGURE_ARGS+=	--enable-openssl=${OPENSSLBASE}
+.endif
 .endif
 
 .include <bsd.port.mk>
diff --git a/databases/libzdb/distinfo b/databases/libzdb/distinfo
index abab5a51925c..de970c3008f9 100644
--- a/databases/libzdb/distinfo
+++ b/databases/libzdb/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1585752011
-SHA256 (libzdb-3.2.2.tar.gz) = d51e4e21ee1ee84ac8763de91bf485360cd76860b951ca998e891824c4f195ae
-SIZE (libzdb-3.2.2.tar.gz) = 752292
+TIMESTAMP = 1669057529
+SHA256 (libzdb-3.2.3.tar.gz) = a1957826fab7725484fc5b74780a6a7d0d8b7f5e2e54d26e106b399e0a86beb0
+SIZE (libzdb-3.2.3.tar.gz) = 771263
diff --git a/databases/libzdb/pkg-descr b/databases/libzdb/pkg-descr
index 5c2f467bbd3a..0fcd33047fa0 100644
--- a/databases/libzdb/pkg-descr
+++ b/databases/libzdb/pkg-descr
@@ -4,5 +4,3 @@ the following features:
 - Connect to multiple database systems
 - Zero runtime configuration, connect using a URL scheme
 - Supports MySQL, PostgreSQL, SQLite and Oracle
-
-WWW: https://www.tildeslash.com/libzdb/
diff --git a/databases/libzdb/pkg-plist b/databases/libzdb/pkg-plist
index 8e0674e0d652..cc195ddc3261 100644
--- a/databases/libzdb/pkg-plist
+++ b/databases/libzdb/pkg-plist
@@ -10,5 +10,5 @@ include/zdb/zdbpp.h
 lib/libzdb.a
 lib/libzdb.so
 lib/libzdb.so.13
-lib/libzdb.so.13.0.0
+lib/libzdb.so.13.1.0
 libdata/pkgconfig/zdb.pc
diff --git a/databases/linux-c7-sqlite3/Makefile b/databases/linux-c7-sqlite3/Makefile
index 65105ba32a28..16ef72056af9 100644
--- a/databases/linux-c7-sqlite3/Makefile
+++ b/databases/linux-c7-sqlite3/Makefile
@@ -1,5 +1,3 @@
-# Created by: Piotr Kubaj <pkubaj@anongoth.pl>
-
 PORTNAME=	sqlite
 PORTVERSION=	3.7.17
 DISTVERSIONSUFFIX=	-8.el7_7.1
@@ -8,6 +6,7 @@ CATEGORIES=	databases linux
 
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	Library that implements an embeddable SQL database engine (Linux CentOS ${LINUX_DIST_VER})
+WWW=		https://www.sqlite.org/
 
 LICENSE=	PD
 
@@ -15,7 +14,7 @@ USES=		cpe linux:c7
 USE_LDCONFIG=	yes
 USE_LINUX_RPM=	yes
 
-CONFLICTS=	linux-c6-${PORTNAME}-[0-9]*
+CONFLICTS=	linux-c6-${PORTNAME}
 DESCR=		${.CURDIR}/../${PORTNAME}3/pkg-descr
 
 OPTIONS_DEFINE=	DOCS
diff --git a/databases/linux-c7-sqlite3/distinfo b/databases/linux-c7-sqlite3/distinfo
index fdc7f5ee3c95..f9c390c9d113 100644
--- a/databases/linux-c7-sqlite3/distinfo
+++ b/databases/linux-c7-sqlite3/distinfo
@@ -1,4 +1,6 @@
-TIMESTAMP = 1581427438
+TIMESTAMP = 1627157188
+SHA256 (centos/sqlite-3.7.17-8.el7_7.1.aarch64.rpm) = 1cd83fe84556753dcfd6b71db11971e428fad5106eb329b390f80e391830780f
+SIZE (centos/sqlite-3.7.17-8.el7_7.1.aarch64.rpm) = 375332
 SHA256 (centos/sqlite-3.7.17-8.el7_7.1.i686.rpm) = 23aba566842009e5b1de0da13d18652ba0df4250af61b62d2c0cd1109f1c75d1
 SIZE (centos/sqlite-3.7.17-8.el7_7.1.i686.rpm) = 406104
 SHA256 (centos/sqlite-3.7.17-8.el7_7.1.x86_64.rpm) = 93ffb0eb1e297c35cee76add2e583efb990da702684bbfaa6b159494d135d99c
diff --git a/databases/linux-c7-sqlite3/pkg-plist.aarch64 b/databases/linux-c7-sqlite3/pkg-plist.aarch64
new file mode 100644
index 000000000000..75c26c4f7d07
--- /dev/null
+++ b/databases/linux-c7-sqlite3/pkg-plist.aarch64
@@ -0,0 +1,5 @@
+usr/bin/sqlite3
+usr/lib64/libsqlite3.so.0
+usr/lib64/libsqlite3.so.0.8.6
+%%PORTDOCS%%%%DOCSDIR%%/README
+usr/share/man/man1/sqlite3.1.gz
diff --git a/databases/linux-c7-unixODBC/Makefile b/databases/linux-c7-unixODBC/Makefile
index b2f1ae39cee9..2c34f9adc217 100644
--- a/databases/linux-c7-unixODBC/Makefile
+++ b/databases/linux-c7-unixODBC/Makefile
@@ -1,5 +1,3 @@
-# Created by: Alexey Dokuchaev <danfe@FreeBSD.org>
-
 PORTNAME=	unixODBC
 PORTVERSION=	2.3.1
 DISTVERSIONSUFFIX=	-14.el7
@@ -7,6 +5,7 @@ CATEGORIES=	databases linux
 
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	Complete ODBC driver manager (Linux CentOS ${LINUX_DIST_VER})
+WWW=		http://www.unixodbc.org/
 
 LICENSE=	GPLv2+ LGPL21+
 LICENSE_COMB=	multi
diff --git a/databases/linux-c7-unixODBC/distinfo b/databases/linux-c7-unixODBC/distinfo
index bfb6ae45ff3b..aba17e98db5d 100644
--- a/databases/linux-c7-unixODBC/distinfo
+++ b/databases/linux-c7-unixODBC/distinfo
@@ -1,3 +1,6 @@
+TIMESTAMP = 1627157192
+SHA256 (centos/unixODBC-2.3.1-14.el7.aarch64.rpm) = 3f41c3ca116d62f44c474b0527e2687bf66ea1148b60e46b2f3d275ce5de5827
+SIZE (centos/unixODBC-2.3.1-14.el7.aarch64.rpm) = 409368
 SHA256 (centos/unixODBC-2.3.1-14.el7.i686.rpm) = b77c1d3e9e0e2228529be1624ab63bf9f14a929bf2688735517366c00df96b87
 SIZE (centos/unixODBC-2.3.1-14.el7.i686.rpm) = 420992
 SHA256 (centos/unixODBC-2.3.1-14.el7.x86_64.rpm) = a54857e37a6c08567828ffd39c81be455019611b9675b1310a597b23e22e0e91
diff --git a/databases/linux-c7-unixODBC/pkg-plist.aarch64 b/databases/linux-c7-unixODBC/pkg-plist.aarch64
new file mode 100644
index 000000000000..9e424cec7886
--- /dev/null
+++ b/databases/linux-c7-unixODBC/pkg-plist.aarch64
@@ -0,0 +1,109 @@
+etc/odbcinst.ini
+usr/bin/dltest
+usr/bin/isql
+usr/bin/iusql
+usr/bin/odbc_config
+usr/bin/odbcinst
+usr/lib64/libesoobS.so.2
+usr/lib64/libesoobS.so.2.0.0
+usr/lib64/libmimerS.so.2
+usr/lib64/libmimerS.so.2.0.0
+usr/lib64/libnn.so.2
+usr/lib64/libnn.so.2.0.0
+usr/lib64/libodbc.so
+usr/lib64/libodbc.so.2
+usr/lib64/libodbc.so.2.0.0
+usr/lib64/libodbccr.so.2
+usr/lib64/libodbccr.so.2.0.0
+usr/lib64/libodbcdrvcfg1S.so.2
+usr/lib64/libodbcdrvcfg1S.so.2.0.0
+usr/lib64/libodbcdrvcfg2S.so.2
+usr/lib64/libodbcdrvcfg2S.so.2.0.0
+usr/lib64/libodbcinst.so
+usr/lib64/libodbcinst.so.2
+usr/lib64/libodbcinst.so.2.0.0
+usr/lib64/libodbcminiS.so.2
+usr/lib64/libodbcminiS.so.2.0.0
+usr/lib64/libodbcmyS.so
+usr/lib64/libodbcmyS.so.2
+usr/lib64/libodbcmyS.so.2.0.0
+usr/lib64/libodbcnnS.so.2
+usr/lib64/libodbcnnS.so.2.0.0
+usr/lib64/libodbcpsqlS.so
+usr/lib64/libodbcpsqlS.so.2
+usr/lib64/libodbcpsqlS.so.2.0.0
+usr/lib64/libodbctxtS.so.2
+usr/lib64/libodbctxtS.so.2.0.0
+usr/lib64/liboplodbcS.so.2
+usr/lib64/liboplodbcS.so.2.0.0
+usr/lib64/liboraodbcS.so.2
+usr/lib64/liboraodbcS.so.2.0.0
+usr/lib64/libsapdbS.so.2
+usr/lib64/libsapdbS.so.2.0.0
+usr/lib64/libtdsS.so.2
+usr/lib64/libtdsS.so.2.0.0
+usr/lib64/libtemplate.so.2
+usr/lib64/libtemplate.so.2.0.0
+%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
+%%PORTDOCS%%%%DOCSDIR%%/NEWS
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/README.dist
+%%PORTDOCS%%%%DOCSDIR%%/doc/AdministratorManual/index.html
+%%PORTDOCS%%%%DOCSDIR%%/doc/AdministratorManual/odbcinst.html
+%%PORTDOCS%%%%DOCSDIR%%/doc/AdministratorManual/php3.html
+%%PORTDOCS%%%%DOCSDIR%%/doc/AdministratorManual/unixODBC.gif
+%%PORTDOCS%%%%DOCSDIR%%/doc/AdministratorManual/unixODBCsetup.html
+%%PORTDOCS%%%%DOCSDIR%%/doc/ProgrammerManual/Tutorial/close.html
+%%PORTDOCS%%%%DOCSDIR%%/doc/ProgrammerManual/Tutorial/conne.html
+%%PORTDOCS%%%%DOCSDIR%%/doc/ProgrammerManual/Tutorial/dsn.html
+%%PORTDOCS%%%%DOCSDIR%%/doc/ProgrammerManual/Tutorial/gloss.html
+%%PORTDOCS%%%%DOCSDIR%%/doc/ProgrammerManual/Tutorial/index.html
+%%PORTDOCS%%%%DOCSDIR%%/doc/ProgrammerManual/Tutorial/intro.html
+%%PORTDOCS%%%%DOCSDIR%%/doc/ProgrammerManual/Tutorial/navi.html
+%%PORTDOCS%%%%DOCSDIR%%/doc/ProgrammerManual/Tutorial/odbc.css
+%%PORTDOCS%%%%DOCSDIR%%/doc/ProgrammerManual/Tutorial/query.html
+%%PORTDOCS%%%%DOCSDIR%%/doc/ProgrammerManual/Tutorial/resul.html
+%%PORTDOCS%%%%DOCSDIR%%/doc/ProgrammerManual/index.html
+%%PORTDOCS%%%%DOCSDIR%%/doc/ProgrammerManual/unixODBC.gif
+%%PORTDOCS%%%%DOCSDIR%%/doc/UserManual/Figure1.gif
+%%PORTDOCS%%%%DOCSDIR%%/doc/UserManual/Figure2.gif
+%%PORTDOCS%%%%DOCSDIR%%/doc/UserManual/Figure3.gif
+%%PORTDOCS%%%%DOCSDIR%%/doc/UserManual/Figure4.gif
+%%PORTDOCS%%%%DOCSDIR%%/doc/UserManual/Figure6.gif
+%%PORTDOCS%%%%DOCSDIR%%/doc/UserManual/My.sql
+%%PORTDOCS%%%%DOCSDIR%%/doc/UserManual/StarOfficeDataGrid.gif
+%%PORTDOCS%%%%DOCSDIR%%/doc/UserManual/index.html
+%%PORTDOCS%%%%DOCSDIR%%/doc/UserManual/unixODBC.gif
+%%PORTDOCS%%%%DOCSDIR%%/doc/index.html
+%%PORTDOCS%%%%DOCSDIR%%/doc/lst/InternalStructure.gif
+%%PORTDOCS%%%%DOCSDIR%%/doc/lst/InternalStructure.html
+%%PORTDOCS%%%%DOCSDIR%%/doc/lst/InternalStructure.vsd
+%%PORTDOCS%%%%DOCSDIR%%/doc/lst/InternalStructure2.gif
+%%PORTDOCS%%%%DOCSDIR%%/doc/lst/InternalStructure2.html
+%%PORTDOCS%%%%DOCSDIR%%/doc/lst/InternalStructure3.gif
+%%PORTDOCS%%%%DOCSDIR%%/doc/lst/InternalStructure3.html
+%%PORTDOCS%%%%DOCSDIR%%/doc/lst/InternalStructure4.gif
+%%PORTDOCS%%%%DOCSDIR%%/doc/lst/InternalStructure4.html
+%%PORTDOCS%%%%DOCSDIR%%/doc/lst/InternalStructure5.gif
+%%PORTDOCS%%%%DOCSDIR%%/doc/lst/InternalStructure5.html
+%%PORTDOCS%%%%DOCSDIR%%/doc/lst/InternalStructure6.gif
+%%PORTDOCS%%%%DOCSDIR%%/doc/lst/InternalStructure6.html
+%%PORTDOCS%%%%DOCSDIR%%/doc/lst/InternalStructure7.gif
+%%PORTDOCS%%%%DOCSDIR%%/doc/lst/InternalStructure7.html
+%%PORTDOCS%%%%DOCSDIR%%/doc/lst/InternalStructure8.gif
+%%PORTDOCS%%%%DOCSDIR%%/doc/lst/InternalStructure8.html
+%%PORTDOCS%%%%DOCSDIR%%/doc/lst/InternalStructure9.gif
+%%PORTDOCS%%%%DOCSDIR%%/doc/lst/InternalStructure9.html
+%%PORTDOCS%%%%DOCSDIR%%/doc/lst/back.gif
+%%PORTDOCS%%%%DOCSDIR%%/doc/lst/next.gif
+%%PORTDOCS%%%%DOCSDIR%%/doc/smallbook.gif
+%%PORTDOCS%%%%DOCSDIR%%/doc/unixODBC.gif
+usr/share/man/man1/dltest.1.gz
+usr/share/man/man1/isql.1.gz
+usr/share/man/man1/iusql.1.gz
+usr/share/man/man1/odbc_config.1.gz
+usr/share/man/man1/odbcinst.1.gz
+usr/share/man/man5/odbc.ini.5.gz
+usr/share/man/man5/odbcinst.ini.5.gz
diff --git a/databases/linux-oracle-instantclient-basic/Makefile b/databases/linux-oracle-instantclient-basic/Makefile
index f6290a1e9462..e733c2a3c497 100644
--- a/databases/linux-oracle-instantclient-basic/Makefile
+++ b/databases/linux-oracle-instantclient-basic/Makefile
@@ -1,5 +1,3 @@
-# Created by: Alexander Novitsky
-
 PORTNAME=		instantclient
 PORTVERSION=		${ORACLEVERSION}.${DISTDATE}
 PORTREVISION=		5
@@ -12,6 +10,7 @@ DIST_SUBDIR=		oracle
 
 MAINTAINER=		pi@FreeBSD.org
 COMMENT=		Oracle 10 32Bit Linux InstantClient basics for RDBMS 8.1.2+
+WWW=		http://www.oracle.com/technology/tech/oci/instantclient/instantclient.html
 
 # Converted from RESTRICTED
 LICENSE=	Oracle
diff --git a/databases/linux-oracle-instantclient-basic/pkg-descr b/databases/linux-oracle-instantclient-basic/pkg-descr
index 3fee293344fc..2aa15cb632f6 100644
--- a/databases/linux-oracle-instantclient-basic/pkg-descr
+++ b/databases/linux-oracle-instantclient-basic/pkg-descr
@@ -5,5 +5,3 @@ the standard Oracle client or having an ORACLE_HOME.  OCI, OCCI, ODBC,
 and JDBC applications work without modification, while using
 significantly less disk space than before.  Even SQL*Plus can be used
 with Instant Client.  No recompile, no hassle.
-
-WWW: http://www.oracle.com/technology/tech/oci/instantclient/instantclient.html
diff --git a/databases/linux-oracle-instantclient-sdk/Makefile b/databases/linux-oracle-instantclient-sdk/Makefile
index 4f7a4b39f639..1878dd0f1ecf 100644
--- a/databases/linux-oracle-instantclient-sdk/Makefile
+++ b/databases/linux-oracle-instantclient-sdk/Makefile
@@ -1,5 +1,3 @@
-# Created by: nork@FreeBSD.org
-
 PORTNAME=	instantclient
 PORTVERSION=	${ORACLEVERSION}.${DISTDATE}
 PORTEPOCH=	1
@@ -12,6 +10,7 @@ DIST_SUBDIR=	oracle
 
 MAINTAINER=	pi@FreeBSD.org
 COMMENT=	Oracle 10 InstantClient SDK. Works with Oracle RDBMS 8.1.2+
+WWW=		http://www.oracle.com/technology/tech/oci/instantclient/instantclient.html
 
 # Converted from RESTRICTED
 LICENSE=	Oracle
diff --git a/databases/linux-oracle-instantclient-sdk/pkg-descr b/databases/linux-oracle-instantclient-sdk/pkg-descr
index 1575c75cb9e5..bfcac97879d5 100644
--- a/databases/linux-oracle-instantclient-sdk/pkg-descr
+++ b/databases/linux-oracle-instantclient-sdk/pkg-descr
@@ -5,5 +5,3 @@ the standard Oracle client or having an ORACLE_HOME.  OCI, OCCI, ODBC,
 and JDBC applications work without modification, while using
 significantly less disk space than before.  Even SQL*Plus can be used
 with Instant Client.  No recompile, no hassle.
-
-WWW: http://www.oracle.com/technology/tech/oci/instantclient/instantclient.html
diff --git a/databases/liquibase/Makefile b/databases/liquibase/Makefile
index 305fc3bffeaa..5e52be8fc395 100644
--- a/databases/liquibase/Makefile
+++ b/databases/liquibase/Makefile
@@ -1,5 +1,3 @@
-# Created by: Gea-Suan Lin <gslin@gslin.org>
-
 PORTNAME=	liquibase
 PORTVERSION=	4.3.5
 CATEGORIES=	databases java
@@ -7,9 +5,12 @@ MASTER_SITES=	https://github.com/liquibase/liquibase/releases/download/v${PORTVE
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Database Change Management
+WWW=		https://www.liquibase.org/
 
 LICENSE=	APACHE20
 
+USES=		cpe
+
 NO_ARCH=	yes
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
diff --git a/databases/liquibase/pkg-descr b/databases/liquibase/pkg-descr
index f5e60e273ca4..3fe35406f0c9 100644
--- a/databases/liquibase/pkg-descr
+++ b/databases/liquibase/pkg-descr
@@ -2,5 +2,3 @@ Liquibase is an open source (Apache 2.0 Licensed), database-independent
 library for tracking, managing and applying database changes. It is
 built on a simple premise: All database changes are stored in a human
 readable yet trackable form and checked into source control.
-
-WWW: http://www.liquibase.org/
diff --git a/databases/litestream/Makefile b/databases/litestream/Makefile
index b95fe3aa95d6..061a644e262c 100644
--- a/databases/litestream/Makefile
+++ b/databases/litestream/Makefile
@@ -1,66 +1,67 @@
 PORTNAME=	litestream
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.3.5
+DISTVERSION=	0.3.13
+PORTREVISION=	2
 CATEGORIES=	databases
 
 MAINTAINER=	nc@FreeBSD.org
 COMMENT=	Standalone streaming replication tool for SQLite
+WWW=		https://litestream.io/
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BROKEN_i386=	Build error: constant 9223372036854775807 overflows int
 
-USES=		go:modules
+USES=		go:1.21,modules
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	benbjohnson
 
 GH_TUPLE=	\
 		Azure:azure-pipeline-go:v0.2.3:azure_azure_pipeline_go/vendor/github.com/Azure/azure-pipeline-go \
-		Azure:azure-storage-blob-go:v0.13.0:azure_azure_storage_blob_go/vendor/github.com/Azure/azure-storage-blob-go \
-		Azure:go-autorest:autorest/v0.9.0:azure_go_autorest_autorest/vendor/github.com/Azure/go-autorest \
-		aws:aws-sdk-go:v1.27.0:aws_aws_sdk_go/vendor/github.com/aws/aws-sdk-go \
+		Azure:azure-storage-blob-go:v0.15.0:azure_azure_storage_blob_go/vendor/github.com/Azure/azure-storage-blob-go \
+		FiloSottile:age:v1.1.1:filosottile_age/vendor/filippo.io/age \
+		aws:aws-sdk-go:v1.44.318:aws_aws_sdk_go/vendor/github.com/aws/aws-sdk-go \
 		beorn7:perks:v1.0.1:beorn7_perks/vendor/github.com/beorn7/perks \
-		census-instrumentation:opencensus-go:v0.23.0:census_instrumentation_opencensus_go/vendor/go.opencensus.io \
-		cespare:xxhash:v2.1.1:cespare_xxhash_v2/vendor/github.com/cespare/xxhash/v2 \
-		davecgh:go-spew:v1.1.1:davecgh_go_spew/vendor/github.com/davecgh/go-spew \
+		census-instrumentation:opencensus-go:v0.24.0:census_instrumentation_opencensus_go/vendor/go.opencensus.io \
+		cespare:xxhash:v2.2.0:cespare_xxhash_v2/vendor/github.com/cespare/xxhash/v2 \
 		go-yaml:yaml:v2.4.0:go_yaml_yaml/vendor/gopkg.in/yaml.v2 \
 		golang:appengine:v1.6.7:golang_appengine/vendor/google.golang.org/appengine \
-		golang:crypto:c07d793c2f9a:golang_crypto/vendor/golang.org/x/crypto \
-		golang:groupcache:8c9f03a8e57e:golang_groupcache/vendor/github.com/golang/groupcache \
-		golang:lint:83fdc39ff7b5:golang_lint/vendor/golang.org/x/lint \
-		golang:mod:v0.4.1:golang_mod/vendor/golang.org/x/mod \
-		golang:net:d523dce5a7f4:golang_net/vendor/golang.org/x/net \
-		golang:oauth2:5e61552d6c78:golang_oauth2/vendor/golang.org/x/oauth2 \
-		golang:protobuf:v1.5.2:golang_protobuf/vendor/github.com/golang/protobuf \
-		golang:sync:036812b2e83c:golang_sync/vendor/golang.org/x/sync \
-		golang:sys:f1c623a9e750:golang_sys/vendor/golang.org/x/sys \
-		golang:text:v0.3.5:golang_text/vendor/golang.org/x/text \
-		golang:tools:v0.1.0:golang_tools/vendor/golang.org/x/tools \
-		golang:xerrors:5ec99f83aff1:golang_xerrors/vendor/golang.org/x/xerrors \
-		google:go-genproto:3c870d7478d2:google_go_genproto/vendor/google.golang.org/genproto \
-		google:uuid:v1.1.2:google_uuid/vendor/github.com/google/uuid \
-		googleapis:gax-go:v2.0.5:googleapis_gax_go_v2/vendor/github.com/googleapis/gax-go \
-		googleapis:google-api-go-client:v0.45.0:googleapis_google_api_go_client/vendor/google.golang.org/api \
-		googleapis:google-cloud-go:storage/v1.15.0:googleapis_google_cloud_go_storage \
-		googleapis:google-cloud-go:v0.81.0:googleapis_google_cloud_go/vendor/cloud.google.com/go \
-		grpc:grpc-go:v1.37.0:grpc_grpc_go/vendor/google.golang.org/grpc \
-		jmespath:go-jmespath:c2b33e8439af:jmespath_go_jmespath/vendor/github.com/jmespath/go-jmespath \
-		jstemmer:go-junit-report:v0.9.1:jstemmer_go_junit_report/vendor/github.com/jstemmer/go-junit-report \
+		golang:crypto:v0.12.0:golang_crypto/vendor/golang.org/x/crypto \
+		golang:groupcache:41bb18bfe9da:golang_groupcache/vendor/github.com/golang/groupcache \
+		golang:net:v0.14.0:golang_net/vendor/golang.org/x/net \
+		golang:oauth2:v0.11.0:golang_oauth2/vendor/golang.org/x/oauth2 \
+		golang:protobuf:v1.5.3:golang_protobuf/vendor/github.com/golang/protobuf \
+		golang:sync:v0.3.0:golang_sync/vendor/golang.org/x/sync \
+		golang:sys:v0.11.0:golang_sys/vendor/golang.org/x/sys \
+		golang:text:v0.12.0:golang_text/vendor/golang.org/x/text \
+		golang:xerrors:04be3eba64a2:golang_xerrors/vendor/golang.org/x/xerrors \
+		google:go-cmp:v0.5.9:google_go_cmp/vendor/github.com/google/go-cmp \
+		google:go-genproto:1744710a1577:google_go_genproto/vendor/google.golang.org/genproto \
+		google:s2a-go:v0.1.4:google_s2a_go/vendor/github.com/google/s2a-go \
+		google:uuid:v1.3.0:google_uuid/vendor/github.com/google/uuid \
+		googleapis:enterprise-certificate-proxy:v0.2.5:googleapis_enterprise_certificate_proxy/vendor/github.com/googleapis/enterprise-certificate-proxy \
+		googleapis:gax-go:v2.12.0:googleapis_gax_go_v2/vendor/github.com/googleapis/gax-go \
+		googleapis:google-api-go-client:v0.135.0:googleapis_google_api_go_client/vendor/google.golang.org/api \
+		googleapis:google-cloud-go:compute/v1.23.0:googleapis_google_cloud_go_compute \
+		googleapis:google-cloud-go:iam/v1.1.1:googleapis_google_cloud_go_iam \
+		googleapis:google-cloud-go:storage/v1.31.0:googleapis_google_cloud_go_storage \
+		googleapis:google-cloud-go:v0.110.7:googleapis_google_cloud_go/vendor/cloud.google.com/go \
+		grpc:grpc-go:v1.57.0:grpc_grpc_go/vendor/google.golang.org/grpc \
+		jmespath:go-jmespath:v0.4.0:jmespath_go_jmespath/vendor/github.com/jmespath/go-jmespath \
 		kr:fs:v0.1.0:kr_fs/vendor/github.com/kr/fs \
-		mattn:go-ieproxy:v0.0.1:mattn_go_ieproxy/vendor/github.com/mattn/go-ieproxy \
-		mattn:go-shellwords:v1.0.11:mattn_go_shellwords/vendor/github.com/mattn/go-shellwords \
-		mattn:go-sqlite3:v1.14.5:mattn_go_sqlite3/vendor/github.com/mattn/go-sqlite3 \
-		matttproud:golang_protobuf_extensions:v1.0.1:matttproud_golang_protobuf_extensions/vendor/github.com/matttproud/golang_protobuf_extensions \
-		pierrec:lz4:v4.1.3:pierrec_lz4_v4/vendor/github.com/pierrec/lz4/v4 \
-		pkg:errors:v0.9.1:pkg_errors/vendor/github.com/pkg/errors \
-		pkg:sftp:v1.13.0:pkg_sftp/vendor/github.com/pkg/sftp \
-		prometheus:client_golang:v1.9.0:prometheus_client_golang/vendor/github.com/prometheus/client_golang \
-		prometheus:client_model:v0.2.0:prometheus_client_model/vendor/github.com/prometheus/client_model \
-		prometheus:common:v0.15.0:prometheus_common/vendor/github.com/prometheus/common \
-		prometheus:procfs:v0.2.0:prometheus_procfs/vendor/github.com/prometheus/procfs \
-		protocolbuffers:protobuf-go:v1.26.0:protocolbuffers_protobuf_go/vendor/google.golang.org/protobuf
+		mattn:go-ieproxy:v0.0.11:mattn_go_ieproxy/vendor/github.com/mattn/go-ieproxy \
+		mattn:go-shellwords:v1.0.12:mattn_go_shellwords/vendor/github.com/mattn/go-shellwords \
+		mattn:go-sqlite3:v1.14.17:mattn_go_sqlite3/vendor/github.com/mattn/go-sqlite3 \
+		matttproud:golang_protobuf_extensions:v1.0.4:matttproud_golang_protobuf_extensions/vendor/github.com/matttproud/golang_protobuf_extensions \
+		pierrec:lz4:v4.1.18:pierrec_lz4_v4/vendor/github.com/pierrec/lz4/v4 \
+		pkg:sftp:v1.13.5:pkg_sftp/vendor/github.com/pkg/sftp \
+		prometheus:client_golang:v1.16.0:prometheus_client_golang/vendor/github.com/prometheus/client_golang \
+		prometheus:client_model:v0.4.0:prometheus_client_model/vendor/github.com/prometheus/client_model \
+		prometheus:common:v0.44.0:prometheus_common/vendor/github.com/prometheus/common \
+		prometheus:procfs:v0.11.1:prometheus_procfs/vendor/github.com/prometheus/procfs \
+		protocolbuffers:protobuf-go:v1.31.0:protocolbuffers_protobuf_go/vendor/google.golang.org/protobuf
 
 GO_PKGNAME=	github.com/${GH_ACCOUNT}/${GH_PROJECT}
 GO_TARGET=	./cmd/${PORTNAME}
@@ -68,7 +69,12 @@ GO_TARGET=	./cmd/${PORTNAME}
 PLIST_FILES=	bin/${PORTNAME}
 
 post-extract:
+	@${RM} -r ${WRKSRC}/vendor/cloud.google.com/go/compute
+	@${RLN} ${WRKSRC_googleapis_google_cloud_go_compute}/compute ${WRKSRC}/vendor/cloud.google.com/go/compute
+	@${RM} -r ${WRKSRC}/vendor/cloud.google.com/go/iam
+	@${RLN} ${WRKSRC_googleapis_google_cloud_go_iam}/iam ${WRKSRC}/vendor/cloud.google.com/go/iam
 	@${RM} -r ${WRKSRC}/vendor/cloud.google.com/go/storage
 	@${RLN} ${WRKSRC_googleapis_google_cloud_go_storage}/storage ${WRKSRC}/vendor/cloud.google.com/go/storage
 
 .include <bsd.port.mk>
+
diff --git a/databases/litestream/distinfo b/databases/litestream/distinfo
index dd16c15d4157..bcd068297a56 100644
--- a/databases/litestream/distinfo
+++ b/databases/litestream/distinfo
@@ -1,91 +1,89 @@
-TIMESTAMP = 1623776373
-SHA256 (benbjohnson-litestream-v0.3.5_GH0.tar.gz) = 53b4c100acd6e5c69457ea251dd3276c6786aa2d1a7e18a2f9518557f66fd209
-SIZE (benbjohnson-litestream-v0.3.5_GH0.tar.gz) = 101545
+TIMESTAMP = 1708056687
+SHA256 (benbjohnson-litestream-v0.3.13_GH0.tar.gz) = 92cb22323b8168f6efdfcad270772fea9e78c709a7149b1bf35d81fcb88bdaf9
+SIZE (benbjohnson-litestream-v0.3.13_GH0.tar.gz) = 86613
 SHA256 (Azure-azure-pipeline-go-v0.2.3_GH0.tar.gz) = 99bd58f4a07dd02d9615e3638b3bb6dbfad80ef678ccdb8e17e3fa2b0fef343e
 SIZE (Azure-azure-pipeline-go-v0.2.3_GH0.tar.gz) = 17102
-SHA256 (Azure-azure-storage-blob-go-v0.13.0_GH0.tar.gz) = 6bf7145210331efa3f0417f6684cf764c22743cf23122048ec136600daebf443
-SIZE (Azure-azure-storage-blob-go-v0.13.0_GH0.tar.gz) = 242403
-SHA256 (Azure-go-autorest-autorest-v0.9.0_GH0.tar.gz) = 329a4ec7a1c365102860054acd3e8310ed24da09fcf3e43f18e6940f729fc34b
-SIZE (Azure-go-autorest-autorest-v0.9.0_GH0.tar.gz) = 159509
-SHA256 (aws-aws-sdk-go-v1.27.0_GH0.tar.gz) = 9f3dc12e43f795efad08a8ac37c5179546bbceb6485e569125f64e829f9a64dc
-SIZE (aws-aws-sdk-go-v1.27.0_GH0.tar.gz) = 13666537
+SHA256 (Azure-azure-storage-blob-go-v0.15.0_GH0.tar.gz) = cc3bf32565eb7f4bf24a09aa5b20f4a9934f7ca5ac33f21942a65bce1cd297b0
+SIZE (Azure-azure-storage-blob-go-v0.15.0_GH0.tar.gz) = 234763
+SHA256 (FiloSottile-age-v1.1.1_GH0.tar.gz) = f1f3dbade631976701cd295aa89308681318d73118f5673cced13f127a91178c
+SIZE (FiloSottile-age-v1.1.1_GH0.tar.gz) = 204281
+SHA256 (aws-aws-sdk-go-v1.44.318_GH0.tar.gz) = 0bef072b6ff99ddbdacc9ac6c0f97859e6e3f4ab0e28120ad21a5b34d584df19
+SIZE (aws-aws-sdk-go-v1.44.318_GH0.tar.gz) = 29153067
 SHA256 (beorn7-perks-v1.0.1_GH0.tar.gz) = 98db84bb0224a26094e6adba91b7ee7a1a7ace28cb648d818f8e779e6a19f825
 SIZE (beorn7-perks-v1.0.1_GH0.tar.gz) = 10867
-SHA256 (census-instrumentation-opencensus-go-v0.23.0_GH0.tar.gz) = cc9dc0234de1baacf1855cf19615b381ca2f2adb83a2871e7a9b8b74e46818cf
-SIZE (census-instrumentation-opencensus-go-v0.23.0_GH0.tar.gz) = 176498
-SHA256 (cespare-xxhash-v2.1.1_GH0.tar.gz) = 0ee31178d2c5a1249be4e26294a2f428008dc4e1ecbbfbe47f74e41026df1148
-SIZE (cespare-xxhash-v2.1.1_GH0.tar.gz) = 9292
-SHA256 (davecgh-go-spew-v1.1.1_GH0.tar.gz) = 7d82b9bb7291adbe7498fe946920ab3e7fc9e6cbfc3b2294693fad00bf0dd17e
-SIZE (davecgh-go-spew-v1.1.1_GH0.tar.gz) = 42152
+SHA256 (census-instrumentation-opencensus-go-v0.24.0_GH0.tar.gz) = 048708914541817193330ce052026deb0c617c9d953ac15ae601ab2bde5788d1
+SIZE (census-instrumentation-opencensus-go-v0.24.0_GH0.tar.gz) = 176752
+SHA256 (cespare-xxhash-v2.2.0_GH0.tar.gz) = b8c684b9e5e136510913727e6a845b28f8176e55db827b11f17769fba970fe13
+SIZE (cespare-xxhash-v2.2.0_GH0.tar.gz) = 12334
 SHA256 (go-yaml-yaml-v2.4.0_GH0.tar.gz) = d8e94679e5fff6bd1a35e10241543929a5f3da44f701755babf99b3daf0faac0
 SIZE (go-yaml-yaml-v2.4.0_GH0.tar.gz) = 73209
 SHA256 (golang-appengine-v1.6.7_GH0.tar.gz) = c623d81235f7c9699e299b328191d813337dd57dcc800d7afdb5130e8c321a8f
 SIZE (golang-appengine-v1.6.7_GH0.tar.gz) = 333007
-SHA256 (golang-crypto-c07d793c2f9a_GH0.tar.gz) = bd1e0856c43287c6ebd20d59e2b4f2ffa91c5cc275dbb02bb2cfc822e6dc18a4
-SIZE (golang-crypto-c07d793c2f9a_GH0.tar.gz) = 1732023
-SHA256 (golang-groupcache-8c9f03a8e57e_GH0.tar.gz) = b92f918daa48048fd360f14d1a4aed6e70c1176ae6b00b0dc04094bb088e9865
-SIZE (golang-groupcache-8c9f03a8e57e_GH0.tar.gz) = 26047
-SHA256 (golang-lint-83fdc39ff7b5_GH0.tar.gz) = 5014077abbc075c3b4b459f7ad98cc1c28f2ae6bde906a9d8ed19d8c8b97987a
-SIZE (golang-lint-83fdc39ff7b5_GH0.tar.gz) = 31889
-SHA256 (golang-mod-v0.4.1_GH0.tar.gz) = 548935751dbc1c29a27bf1b1de6d7ffe58b752d6ad7bc1f254e6ea89ae2ddd59
-SIZE (golang-mod-v0.4.1_GH0.tar.gz) = 102751
-SHA256 (golang-net-d523dce5a7f4_GH0.tar.gz) = 2845c6b37390b25a88a8a71e211e1ed9da8a1f6363baa275d6d30e8dd0d00a21
-SIZE (golang-net-d523dce5a7f4_GH0.tar.gz) = 1252646
-SHA256 (golang-oauth2-5e61552d6c78_GH0.tar.gz) = 01ea885d501ffceaecaef9a91a433c3391583f4ee6cae16115ebb2ccafcc90c9
-SIZE (golang-oauth2-5e61552d6c78_GH0.tar.gz) = 78982
-SHA256 (golang-protobuf-v1.5.2_GH0.tar.gz) = 088cc0f3ba18fb8f9d00319568ff0af5a06d8925a6e6cb983bb837b4efb703b3
-SIZE (golang-protobuf-v1.5.2_GH0.tar.gz) = 171702
-SHA256 (golang-sync-036812b2e83c_GH0.tar.gz) = 75ac8fc16bdceb2496c4a9cc98584b70c29032d91a9e57a624acb073e3232fda
-SIZE (golang-sync-036812b2e83c_GH0.tar.gz) = 18752
-SHA256 (golang-sys-f1c623a9e750_GH0.tar.gz) = 15a6f78a91827579b9e204b14e4efa338840b5cd797d03400cea62a0b9d8bed5
-SIZE (golang-sys-f1c623a9e750_GH0.tar.gz) = 1219335
-SHA256 (golang-text-v0.3.5_GH0.tar.gz) = f85d1185ba116cd40ef8cf702fe1d960ed41d039c08fd314dbeb5866f3166f27
-SIZE (golang-text-v0.3.5_GH0.tar.gz) = 8348127
-SHA256 (golang-tools-v0.1.0_GH0.tar.gz) = 88f66c1a7ff0f7fce20c0808d2769baa977f56f74197c9681cd864d0977e97a2
-SIZE (golang-tools-v0.1.0_GH0.tar.gz) = 2683055
-SHA256 (golang-xerrors-5ec99f83aff1_GH0.tar.gz) = 71975d658357e170fd6a41f92539cde8b39c9cd8bfe5931b6311bc5f5c0da0d7
-SIZE (golang-xerrors-5ec99f83aff1_GH0.tar.gz) = 13664
-SHA256 (google-go-genproto-3c870d7478d2_GH0.tar.gz) = 0d8900ad3968161ea124e4ad8ad01420c2952580d86b093c93d377607011b6b5
-SIZE (google-go-genproto-3c870d7478d2_GH0.tar.gz) = 8700263
-SHA256 (google-uuid-v1.1.2_GH0.tar.gz) = e650558e314307cf33391d0a9ef575b418188206d61cb9751e9f11bceb0874d0
-SIZE (google-uuid-v1.1.2_GH0.tar.gz) = 13871
-SHA256 (googleapis-gax-go-v2.0.5_GH0.tar.gz) = 3089affe6f5e27f7a6d494cb399aa6baf232384f763f548ad5ddfbea0e88e59c
-SIZE (googleapis-gax-go-v2.0.5_GH0.tar.gz) = 15328
-SHA256 (googleapis-google-api-go-client-v0.45.0_GH0.tar.gz) = 628120c26b3db51e218d50b3555eb552a12993e5c1096b4ed8ad200bae925985
-SIZE (googleapis-google-api-go-client-v0.45.0_GH0.tar.gz) = 20020236
-SHA256 (googleapis-google-cloud-go-storage-v1.15.0_GH0.tar.gz) = b33646613edf0deffdf6ff397e94b3cc17253cf8abda2480b417e9316181fb09
-SIZE (googleapis-google-cloud-go-storage-v1.15.0_GH0.tar.gz) = 3751063
-SHA256 (googleapis-google-cloud-go-v0.81.0_GH0.tar.gz) = 307f191f0ebcd71b96ec66554670eb3cf0398c64a427e43651472b5d9616f1ae
-SIZE (googleapis-google-cloud-go-v0.81.0_GH0.tar.gz) = 3510192
-SHA256 (grpc-grpc-go-v1.37.0_GH0.tar.gz) = ab96e0de7416d1d26ea5c98417d21cd72b2c66094b80ba3ab1d03f4a5aa728ca
-SIZE (grpc-grpc-go-v1.37.0_GH0.tar.gz) = 1236791
-SHA256 (jmespath-go-jmespath-c2b33e8439af_GH0.tar.gz) = 1ccd468fe91f58cd1b144f6317f06b53bf0a5da5e03e6a399a2d03f087db1fe9
-SIZE (jmespath-go-jmespath-c2b33e8439af_GH0.tar.gz) = 48265
-SHA256 (jstemmer-go-junit-report-v0.9.1_GH0.tar.gz) = 4999e6d8feefe5b89eb9c2b3845a3c0ecdb6f0b0ba4e9785567a43f8952fff15
-SIZE (jstemmer-go-junit-report-v0.9.1_GH0.tar.gz) = 17764
+SHA256 (golang-crypto-v0.12.0_GH0.tar.gz) = f2e422baedd3a599471bfe6adb8e4b337a80bb8a9665d283a8d0810edadbd31c
+SIZE (golang-crypto-v0.12.0_GH0.tar.gz) = 1792261
+SHA256 (golang-groupcache-41bb18bfe9da_GH0.tar.gz) = 1e89795970d6593affdafe1d09dcf947681ca1ea82528e8e4fb9974a77f2e394
+SIZE (golang-groupcache-41bb18bfe9da_GH0.tar.gz) = 26101
+SHA256 (golang-net-v0.14.0_GH0.tar.gz) = 4e1e28fced7e751f6e91462463bbd5c291601807a7cc2ead1fcc7373bcc93828
+SIZE (golang-net-v0.14.0_GH0.tar.gz) = 1421533
+SHA256 (golang-oauth2-v0.11.0_GH0.tar.gz) = 8cb6f05e8bf107a1b99fe05450eac7b115d1eccb2aaa115cc3212447058c68b6
+SIZE (golang-oauth2-v0.11.0_GH0.tar.gz) = 87085
+SHA256 (golang-protobuf-v1.5.3_GH0.tar.gz) = 48457a6a9e8c78a7556ff5ff4a4c77d7df9bf70e882491ee0f3f1ff06db2bfaa
+SIZE (golang-protobuf-v1.5.3_GH0.tar.gz) = 171822
+SHA256 (golang-sync-v0.3.0_GH0.tar.gz) = 0be463c5e9198caec11b59795c780db96d9136df65451196629d74f737ef457a
+SIZE (golang-sync-v0.3.0_GH0.tar.gz) = 20003
+SHA256 (golang-sys-v0.11.0_GH0.tar.gz) = 907778fbdf5a900ee51fc45e0a3f2cc7bc693af8a9c972c00679b194b61ea24c
+SIZE (golang-sys-v0.11.0_GH0.tar.gz) = 1445078
+SHA256 (golang-text-v0.12.0_GH0.tar.gz) = 223318d6bd0b76fe5cdff3499a0ad0b3bfe573336951b0b141af6cde704252da
+SIZE (golang-text-v0.12.0_GH0.tar.gz) = 8967035
+SHA256 (golang-xerrors-04be3eba64a2_GH0.tar.gz) = 1b1756da9c87dce13834d0a495f2fe4d560b95a4aa208b638afbe602a872d26a
+SIZE (golang-xerrors-04be3eba64a2_GH0.tar.gz) = 13746
+SHA256 (google-go-cmp-v0.5.9_GH0.tar.gz) = 41a074c2fcfc72f813736f8ca8e3116e260a6b79af407d9da0d4c5e4c3f61acf
+SIZE (google-go-cmp-v0.5.9_GH0.tar.gz) = 104427
+SHA256 (google-go-genproto-1744710a1577_GH0.tar.gz) = ca5e53c22e60221eb115f71bb1c2eca0754d9271b03bfe00356292d92dabde7a
+SIZE (google-go-genproto-1744710a1577_GH0.tar.gz) = 5913798
+SHA256 (google-s2a-go-v0.1.4_GH0.tar.gz) = 0e475188ca25a2623cdbc038994a86bbd586c8b8fff8409f8f208a7802d52343
+SIZE (google-s2a-go-v0.1.4_GH0.tar.gz) = 258639
+SHA256 (google-uuid-v1.3.0_GH0.tar.gz) = 7f7f37c47980e0afcc178a9ffc390bec29ed2371919b4c07658eb01791a7f921
+SIZE (google-uuid-v1.3.0_GH0.tar.gz) = 16210
+SHA256 (googleapis-enterprise-certificate-proxy-v0.2.5_GH0.tar.gz) = 9d993226e4c4a0fdd9b52e122bdb59602f1f7b1881a71f331b6dbc49b22dbfd9
+SIZE (googleapis-enterprise-certificate-proxy-v0.2.5_GH0.tar.gz) = 32145
+SHA256 (googleapis-gax-go-v2.12.0_GH0.tar.gz) = 40987741a6ab2c9aa56ee1a498e521d719271b808d25318cf2a602ee8b5f5dbf
+SIZE (googleapis-gax-go-v2.12.0_GH0.tar.gz) = 37779
+SHA256 (googleapis-google-api-go-client-v0.135.0_GH0.tar.gz) = 4b82637a59395e3eb8e982658e6b2942cfa9e751424af7085e612dd18aa1abd9
+SIZE (googleapis-google-api-go-client-v0.135.0_GH0.tar.gz) = 32621198
+SHA256 (googleapis-google-cloud-go-compute-v1.23.0_GH0.tar.gz) = 3d3378dbc0be74c941caafbd53fdd4a75c277d22599669a97da282e7f6c1aee0
+SIZE (googleapis-google-cloud-go-compute-v1.23.0_GH0.tar.gz) = 21906397
+SHA256 (googleapis-google-cloud-go-iam-v1.1.1_GH0.tar.gz) = c924403af4de57f23bccbef232cd019046b563406c6e86689af4c4109d83a67e
+SIZE (googleapis-google-cloud-go-iam-v1.1.1_GH0.tar.gz) = 21700167
+SHA256 (googleapis-google-cloud-go-storage-v1.31.0_GH0.tar.gz) = 4e8a5ba3f65e2d783ad8d148a0aa16fbc60aea75242dd5d65eaca9aa8ebf86bf
+SIZE (googleapis-google-cloud-go-storage-v1.31.0_GH0.tar.gz) = 21733622
+SHA256 (googleapis-google-cloud-go-v0.110.7_GH0.tar.gz) = 3d2d0ace11c6777740972b41a1310f9f7310eb97e4663e14eb19ec15c7c4332e
+SIZE (googleapis-google-cloud-go-v0.110.7_GH0.tar.gz) = 22095871
+SHA256 (grpc-grpc-go-v1.57.0_GH0.tar.gz) = da107f9e13596b9f2e0a473ff864fe30a40942febf57d7a281e3a1265081ec22
+SIZE (grpc-grpc-go-v1.57.0_GH0.tar.gz) = 1954303
+SHA256 (jmespath-go-jmespath-v0.4.0_GH0.tar.gz) = aa86d00b6836345eee196c13df2df084a18e0b1159935de9289f2ef6a7fe375d
+SIZE (jmespath-go-jmespath-v0.4.0_GH0.tar.gz) = 128861
 SHA256 (kr-fs-v0.1.0_GH0.tar.gz) = 5743b4ec1e7c4a336c40c9936989174dc9bfc1fb19640d7308c04892453f6c8d
 SIZE (kr-fs-v0.1.0_GH0.tar.gz) = 4405
-SHA256 (mattn-go-ieproxy-v0.0.1_GH0.tar.gz) = 26cc1f0d9ba19556cd91e0d4ed07ba2042eacd07c5b9aec082f7a77e2ef1fa28
-SIZE (mattn-go-ieproxy-v0.0.1_GH0.tar.gz) = 9090
-SHA256 (mattn-go-shellwords-v1.0.11_GH0.tar.gz) = 103a3e83248ebb11bd50d9333a228efc0080646b022e5b0899c2888c7ce432a2
-SIZE (mattn-go-shellwords-v1.0.11_GH0.tar.gz) = 6110
-SHA256 (mattn-go-sqlite3-v1.14.5_GH0.tar.gz) = f162215679df7efb3565dc2882f661ed5e500401c31fa6bfaa1e16939e4ea613
-SIZE (mattn-go-sqlite3-v1.14.5_GH0.tar.gz) = 2354542
-SHA256 (matttproud-golang_protobuf_extensions-v1.0.1_GH0.tar.gz) = 2def0ee6f6b12b1efc0e3007d89f598608a072610e805c3655ea9d13c3ead49b
-SIZE (matttproud-golang_protobuf_extensions-v1.0.1_GH0.tar.gz) = 37184
-SHA256 (pierrec-lz4-v4.1.3_GH0.tar.gz) = b0b2314f061215d9c7ea554290d9e32739a5e644d4d56dc326d89bfdf6616e4a
-SIZE (pierrec-lz4-v4.1.3_GH0.tar.gz) = 38696559
-SHA256 (pkg-errors-v0.9.1_GH0.tar.gz) = 56bfd893023daa498508bfe161de1be83299fcf15376035e7df79cbd7d6fa608
-SIZE (pkg-errors-v0.9.1_GH0.tar.gz) = 13415
-SHA256 (pkg-sftp-v1.13.0_GH0.tar.gz) = f9f5e448a7ba1771f2c0c0490c54640fcc56600b6c6488e9f0db54d1e1961918
-SIZE (pkg-sftp-v1.13.0_GH0.tar.gz) = 88574
-SHA256 (prometheus-client_golang-v1.9.0_GH0.tar.gz) = 92ccfb35268ce2de6beeb45d4b5639e4bce78111b8629bcde5727165f7e1afb1
-SIZE (prometheus-client_golang-v1.9.0_GH0.tar.gz) = 177330
-SHA256 (prometheus-client_model-v0.2.0_GH0.tar.gz) = 4ab1be9cdfa702d7f49beeb09a256bcc6a2aad55e8a0a37e7732a46934264e12
-SIZE (prometheus-client_model-v0.2.0_GH0.tar.gz) = 10986
-SHA256 (prometheus-common-v0.15.0_GH0.tar.gz) = f0957de56c09431076239d27bb85e07841bb832d0c99210087bc6da63a0b2cb6
-SIZE (prometheus-common-v0.15.0_GH0.tar.gz) = 124369
-SHA256 (prometheus-procfs-v0.2.0_GH0.tar.gz) = b6c013031ac8b9f8f9e1595103c48feb80dfe59c37aac73efe724fddbc0b3f50
-SIZE (prometheus-procfs-v0.2.0_GH0.tar.gz) = 157368
-SHA256 (protocolbuffers-protobuf-go-v1.26.0_GH0.tar.gz) = 26218474bcf776ecf32d7d194c6bfaca8e7b4f0c087e5b595fd50fbb31409676
-SIZE (protocolbuffers-protobuf-go-v1.26.0_GH0.tar.gz) = 1270215
+SHA256 (mattn-go-ieproxy-v0.0.11_GH0.tar.gz) = 21a2b77d65bdcfbec7658e33054de7b058bd0003d3c8659518747e6e80d4c34f
+SIZE (mattn-go-ieproxy-v0.0.11_GH0.tar.gz) = 13537
+SHA256 (mattn-go-shellwords-v1.0.12_GH0.tar.gz) = 9884291747f54aa51a946b0880854ec6ac6e1f4c06899ba9be5ae5a6364428db
+SIZE (mattn-go-shellwords-v1.0.12_GH0.tar.gz) = 6325
+SHA256 (mattn-go-sqlite3-v1.14.17_GH0.tar.gz) = b57b6edbe84f9c7ac980d8541867491b97d4a16b19284b58e1418823d6c62431
+SIZE (mattn-go-sqlite3-v1.14.17_GH0.tar.gz) = 2529017
+SHA256 (matttproud-golang_protobuf_extensions-v1.0.4_GH0.tar.gz) = b64cab9cb9ae8b9162c7197aeedc6ed617b4c93e4f5674c3ec6cd2e9b0d9d09c
+SIZE (matttproud-golang_protobuf_extensions-v1.0.4_GH0.tar.gz) = 37510
+SHA256 (pierrec-lz4-v4.1.18_GH0.tar.gz) = d0f8f245d9269fa565a52639521f40f02fca5c4ebc111151251555ee9c9e3331
+SIZE (pierrec-lz4-v4.1.18_GH0.tar.gz) = 40909892
+SHA256 (pkg-sftp-v1.13.5_GH0.tar.gz) = c7317ec28d40a2db47c099bd1eff8a72f31dd1cb8d4ce6a84379e15dfd4922a9
+SIZE (pkg-sftp-v1.13.5_GH0.tar.gz) = 116617
+SHA256 (prometheus-client_golang-v1.16.0_GH0.tar.gz) = bccccdd5fc17fb5722064d48b3c2e00e405620a5c5322c7d4508af28278b1456
+SIZE (prometheus-client_golang-v1.16.0_GH0.tar.gz) = 1102629
+SHA256 (prometheus-client_model-v0.4.0_GH0.tar.gz) = 82fc41d9481476a778b120d4553e9e4edf06cc4efd52ee09ba000933d3a2a53d
+SIZE (prometheus-client_model-v0.4.0_GH0.tar.gz) = 16638
+SHA256 (prometheus-common-v0.44.0_GH0.tar.gz) = 0cc74ab6d743fe83e28f11e2f9083686e6f57f3e7552611b80b7ca2a1cd1517d
+SIZE (prometheus-common-v0.44.0_GH0.tar.gz) = 133037
+SHA256 (prometheus-procfs-v0.11.1_GH0.tar.gz) = 8cdf6eb78014556e439c51623e3db06a765287ba21970602d5541328065cfb1e
+SIZE (prometheus-procfs-v0.11.1_GH0.tar.gz) = 229537
+SHA256 (protocolbuffers-protobuf-go-v1.31.0_GH0.tar.gz) = 96d670e9bae145ff2dd0f48a3693edb1f45ec3ee56d5f50a5f01cc7e060314bc
+SIZE (protocolbuffers-protobuf-go-v1.31.0_GH0.tar.gz) = 1311732
diff --git a/databases/litestream/pkg-descr b/databases/litestream/pkg-descr
index 247544762cda..d2e92b4167f4 100644
--- a/databases/litestream/pkg-descr
+++ b/databases/litestream/pkg-descr
@@ -2,5 +2,3 @@ Litestream is a standalone streaming replication tool for SQLite. It runs as
 a background process and safely replicates changes incrementally to another
 file or S3. Litestream only communicates with SQLite through the SQLite API
 so it will not corrupt your database.
-
-WWW: https://litestream.io/
diff --git a/databases/lmdb/Makefile b/databases/lmdb/Makefile
index 325721a9f62e..66511700e680 100644
--- a/databases/lmdb/Makefile
+++ b/databases/lmdb/Makefile
@@ -1,13 +1,13 @@
-# Created by: Xin Li <delphij@FreeBSD.org>
-
 PORTNAME=	lmdb
-PORTVERSION=	0.9.29
+PORTVERSION=	0.9.32
+PORTREVISION=	0
 DISTVERSIONPREFIX=	${PORTNAME:tu}_
 PORTEPOCH=	1
 CATEGORIES=	databases
 
 MAINTAINER=	delphij@FreeBSD.org
 COMMENT=	OpenLDAP Lightning Memory-Mapped Database
+WWW=		https://symas.com/lmdb/
 
 LICENSE=	OPENLDAP
 LICENSE_NAME=	OpenLDAP Public License
@@ -22,7 +22,8 @@ MAKE_ARGS+=	INSTALL_LIB="${INSTALL_LIB}" INSTALL_DATA="${INSTALL_DATA}" INSTALL_
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
-GH_ACCOUNT=	${PORTNAME:tu}
+GH_ACCOUNT=	openldap
+GH_PROJECT=	openldap
 
 SUB_FILES+=	lmdb.pc
 SUB_LIST+=	PORTVERSION=${PORTVERSION}
diff --git a/databases/lmdb/distinfo b/databases/lmdb/distinfo
index 2396b82ac35a..59c26f270c61 100644
--- a/databases/lmdb/distinfo
+++ b/databases/lmdb/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1627280384
-SHA256 (LMDB-lmdb-LMDB_0.9.29_GH0.tar.gz) = 22054926b426c66d8f2bc22071365df6e35f3aacf19ad943bc6167d4cae3bebb
-SIZE (LMDB-lmdb-LMDB_0.9.29_GH0.tar.gz) = 144660
+TIMESTAMP = 1706850650
+SHA256 (openldap-openldap-LMDB_0.9.32_GH0.tar.gz) = c0937223bba3c37c896809883a3c9b43049354578b239d6ed2476236a87f40c9
+SIZE (openldap-openldap-LMDB_0.9.32_GH0.tar.gz) = 149188
diff --git a/databases/lmdb/files/patch-Makefile b/databases/lmdb/files/patch-Makefile
index 40fd5d1cd596..28211b028dd2 100644
--- a/databases/lmdb/files/patch-Makefile
+++ b/databases/lmdb/files/patch-Makefile
@@ -1,6 +1,6 @@
---- Makefile.orig	2016-12-28 18:36:01 UTC
+--- Makefile.orig	2024-01-29 18:20:26 UTC
 +++ Makefile
-@@ -23,17 +23,17 @@ AR	= ar
+@@ -23,22 +23,24 @@ OPT = -O2 -g
  W	= -W -Wall -Wno-unused-parameter -Wbad-function-cast -Wuninitialized
  THREADS = -pthread
  OPT = -O2 -g
@@ -18,11 +18,19 @@
  includedir = $(prefix)/include
  datarootdir = $(prefix)/share
 -mandir = $(datarootdir)/man
-+mandir = $(prefix)/man
++mandir = $(prefix)/share/man
  
  ########################################################################
  
-@@ -49,10 +49,10 @@ install: $(ILIBS) $(IPROGS) $(IHDRS)
+ IHDRS	= lmdb.h
+-ILIBS	= liblmdb.a liblmdb$(SOEXT)
++LIBS	= liblmdb.a
++SHLIBS	= liblmdb$(SOEXT)
++ILIBS	= $(LIBS) $(SHLIBS)
+ IPROGS	= mdb_stat mdb_copy mdb_dump mdb_load
+ IDOCS	= mdb_stat.1 mdb_copy.1 mdb_dump.1 mdb_load.1
+ PROGS	= $(IPROGS) mtest mtest2 mtest3 mtest4 mtest5
+@@ -49,10 +51,11 @@ install: $(ILIBS) $(IPROGS) $(IHDRS)
  	mkdir -p $(DESTDIR)$(libdir)
  	mkdir -p $(DESTDIR)$(includedir)
  	mkdir -p $(DESTDIR)$(mandir)/man1
@@ -31,21 +39,18 @@
 -	for f in $(IHDRS); do cp $$f $(DESTDIR)$(includedir); done
 -	for f in $(IDOCS); do cp $$f $(DESTDIR)$(mandir)/man1; done
 +	for f in $(IPROGS); do $(INSTALL_PROGRAM) $$f $(DESTDIR)$(bindir); done
-+	for f in $(ILIBS); do $(INSTALL_LIB) $$f $(DESTDIR)$(libdir); done
++	for f in $(LIBS); do $(INSTALL_DATA) $$f $(DESTDIR)$(libdir); done
++	for f in $(SHLIBS); do $(INSTALL_LIB) $$f $(DESTDIR)$(libdir); done
 +	for f in $(IHDRS); do $(INSTALL_DATA) $$f $(DESTDIR)$(includedir); done
 +	for f in $(IDOCS); do $(INSTALL_MAN) $$f $(DESTDIR)$(mandir)/man1; done
  
  clean:
  	rm -rf $(PROGS) *.[ao] *.[ls]o *~ testdb
-@@ -64,20 +64,30 @@ test:	all
- liblmdb.a:	mdb.o midl.o
- 	$(AR) rs $@ mdb.o midl.o
+@@ -66,19 +69,30 @@ liblmdb$(SOEXT):	mdb.lo midl.lo
  
--liblmdb$(SOEXT):	mdb.lo midl.lo
--#	$(CC) $(LDFLAGS) -pthread -shared -Wl,-Bsymbolic -o $@ mdb.o midl.o $(SOLIBS)
+ liblmdb$(SOEXT):	mdb.lo midl.lo
+ #	$(CC) $(LDFLAGS) -pthread -shared -Wl,-Bsymbolic -o $@ mdb.o midl.o $(SOLIBS)
 -	$(CC) $(LDFLAGS) -pthread -shared -o $@ mdb.lo midl.lo $(SOLIBS)
-+    liblmdb$(SOEXT):	mdb.lo midl.lo
-+    #	$(CC) $(LDFLAGS) -pthread -shared -Wl,-Bsymbolic -o $@ mdb.o midl.o $(SOLIBS)
 +	$(CC) $(LDFLAGS) -pthread -shared -Wl,-soname,$@ -o $@ mdb.lo midl.lo $(SOLIBS)
  
  mdb_stat: mdb_stat.o liblmdb.a
@@ -68,6 +73,8 @@
 +	${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${.ALLSRC}
  mtest6:	mtest6.o liblmdb.a
 +	${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${.ALLSRC}
+ mplay:	mplay.o liblmdb.a
++	${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${.ALLSRC}
  
  mdb.o: mdb.c lmdb.h midl.h
  	$(CC) $(CFLAGS) $(CPPFLAGS) -c mdb.c
diff --git a/databases/lmdb/pkg-descr b/databases/lmdb/pkg-descr
index 51caadff30fd..f48b2b6a0257 100644
--- a/databases/lmdb/pkg-descr
+++ b/databases/lmdb/pkg-descr
@@ -9,5 +9,3 @@ virtual address space, (it is not limited to the
 size of physical RAM). LMDB was originally called
 MDB, but was renamed to avoid confusion with other
 software associated with the name MDB.
-
-WWW: https://symas.com/lmdb/
diff --git a/databases/lmdb/pkg-plist b/databases/lmdb/pkg-plist
index 449038cdcbd6..fd7e46b5d58d 100644
--- a/databases/lmdb/pkg-plist
+++ b/databases/lmdb/pkg-plist
@@ -7,7 +7,7 @@ lib/liblmdb.a
 lib/liblmdb.so
 lib/liblmdb.so.0
 libdata/pkgconfig/lmdb.pc
-man/man1/mdb_copy.1.gz
-man/man1/mdb_dump.1.gz
-man/man1/mdb_load.1.gz
-man/man1/mdb_stat.1.gz
+share/man/man1/mdb_copy.1.gz
+share/man/man1/mdb_dump.1.gz
+share/man/man1/mdb_load.1.gz
+share/man/man1/mdb_stat.1.gz
diff --git a/databases/lua-lsqlite3/Makefile b/databases/lua-lsqlite3/Makefile
index 76e38b1558eb..68e481174feb 100644
--- a/databases/lua-lsqlite3/Makefile
+++ b/databases/lua-lsqlite3/Makefile
@@ -1,26 +1,21 @@
-# Created by: Yarema <yds@Necessitu.de>
-
 PORTNAME=	lsqlite3
 PORTVERSION=	0.9.5
 PORTREVISION=	1
 CATEGORIES=	databases
 MASTER_SITES=	http://Lua.SQLite.org/index.cgi/zip/
 PKGNAMEPREFIX=	${LUA_PKGNAMEPREFIX}
-DISTNAME=	${PORTNAME}_fsl_9y
+DISTNAME=	${PORTNAME}_fsl09y
 
 MAINTAINER=	yds@Necessitu.de
-COMMENT=	Lua 5.1 to 5.3 wrapper for SQLite3 library
+COMMENT=	Lua wrapper for SQLite3 library
+WWW=		http://Lua.SQLite.org/index.cgi/doc/tip/doc/lsqlite3.wiki
 
 LICENSE=	MIT
 
-BROKEN=		does not build: cp: /wrkdirs/usr/ports/databases/sqlite3/work/sqlite-src-3350500/sqlite3.[ch]: No such file or directory
-
-BUILD_DEPENDS=	${NONEXISTENT}:databases/sqlite3:patch
+BUILD_DEPENDS=	${NONEXISTENT}:databases/sqlite3:build
 
 USES=		localbase:ldflags sqlite:3 zip lua:module
 
-OPTIONS_DEFINE=	DOCS EXAMPLES
-
 CFLAGS+=	-pedantic -Wall -Qunused-arguments -fPIC -DPIC\
 		-std=c99 -fno-strict-aliasing -I${LUA_INCDIR}\
 		-DLSQLITE_VERSION=\"${PORTVERSION}\"
@@ -29,6 +24,8 @@ LDFLAGS+=	-shared -pthread -lm -L${LOCALBASE}/lib
 DOCSDIR=	${LUA_DOCSDIR}
 EXAMPLESDIR=	${LUA_EXAMPLESDIR}
 
+OPTIONS_DEFINE=	DOCS EXAMPLES
+
 pre-configure:
 	@${CP} -p `${SETENV} -u FLAVOR ${MAKE} -V WRKSRC -C ${PORTSDIR}/databases/sqlite3`/sqlite3.[ch] ${WRKSRC}
 
diff --git a/databases/lua-lsqlite3/distinfo b/databases/lua-lsqlite3/distinfo
index 67976470547a..694d839ffc22 100644
--- a/databases/lua-lsqlite3/distinfo
+++ b/databases/lua-lsqlite3/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1553623319
-SHA256 (lsqlite3_fsl_9y.zip) = ad81bf0d081b8200932c851e19b2a0a6319bc7b6e3401deeb9c29e5d041e6540
-SIZE (lsqlite3_fsl_9y.zip) = 2123295
+TIMESTAMP = 1631022697
+SHA256 (lsqlite3_fsl09y.zip) = 4c1415c6169ceedfef55888db5bd081dadc154a868c07ad2a06e75825be21d94
+SIZE (lsqlite3_fsl09y.zip) = 2124170
diff --git a/databases/lua-lsqlite3/pkg-descr b/databases/lua-lsqlite3/pkg-descr
index 560e3abc76f1..b080fbbf252f 100644
--- a/databases/lua-lsqlite3/pkg-descr
+++ b/databases/lua-lsqlite3/pkg-descr
@@ -10,5 +10,3 @@ dynamically, the other statically.
 The module `lsqlite3` links SQLite3 dynamically.
 
 The module `lsqlite3complete` links SQLite3 statically.
-
-WWW: http://Lua.SQLite.org/index.cgi/doc/tip/doc/lsqlite3.wiki
diff --git a/databases/lua-pgsql/Makefile b/databases/lua-pgsql/Makefile
index d110f65c3d77..d2014685b42e 100644
--- a/databases/lua-pgsql/Makefile
+++ b/databases/lua-pgsql/Makefile
@@ -1,20 +1,22 @@
 PORTNAME=	pgsql
 PORTVERSION=	1.6.8
+PORTREVISION=	1
 CATEGORIES=	databases
 PKGNAMEPREFIX=	${LUA_PKGNAMEPREFIX}
 
 MAINTAINER=	dmitry.wagin@ya.ru
 COMMENT=	Lua binding for PostgreSQL
+WWW=		https://github.com/arcapos/luapgsql
 
 LICENSE=	BSD3CLAUSE
 
-USES=		lua pgsql:9.5+
+USES=		lua:flavors,53+ pgsql:11+
 WANT_PGSQL=	client
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	arcapos
 GH_PROJECT=	luapgsql
-GH_TAGNAME=	023992e
+GH_TAGNAME=	0f80ff5
 
 MAKE_ARGS=	LUA_VERSION=${LUA_VER}
 
diff --git a/databases/lua-pgsql/distinfo b/databases/lua-pgsql/distinfo
index 3bbee1821660..8ae8fdfd3c75 100644
--- a/databases/lua-pgsql/distinfo
+++ b/databases/lua-pgsql/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1615382038
-SHA256 (arcapos-luapgsql-1.6.8-023992e_GH0.tar.gz) = 2c2e56e9f9dca510c706bdf2f549aee957cb3632986d7ab1aef02ccb4bc0d9fd
-SIZE (arcapos-luapgsql-1.6.8-023992e_GH0.tar.gz) = 13775
+TIMESTAMP = 1692268310
+SHA256 (arcapos-luapgsql-1.6.8-0f80ff5_GH0.tar.gz) = 0b16ee0725868b9c7dd398ce1b78fa54f1fdf7fea2d31700c75d72beca3fc528
+SIZE (arcapos-luapgsql-1.6.8-0f80ff5_GH0.tar.gz) = 14280
diff --git a/databases/lua-pgsql/pkg-descr b/databases/lua-pgsql/pkg-descr
index 5fe15db3e263..4ef536c83d1f 100644
--- a/databases/lua-pgsql/pkg-descr
+++ b/databases/lua-pgsql/pkg-descr
@@ -1,3 +1 @@
 Lua binding for PostgreSQL.
-
-WWW: https://github.com/arcapos/luapgsql
diff --git a/databases/lua-resty-redis/Makefile b/databases/lua-resty-redis/Makefile
index a25670e8c80b..98c54681f0aa 100644
--- a/databases/lua-resty-redis/Makefile
+++ b/databases/lua-resty-redis/Makefile
@@ -6,6 +6,7 @@ CATEGORIES=	databases
 
 MAINTAINER=	arcade@b1t.name
 COMMENT=	Redis client driver for the ngx_lua nginx module
+WWW=		https://github.com/openresty/lua-resty-redis
 
 LICENSE=	BSD2CLAUSE
 
diff --git a/databases/lua-resty-redis/pkg-descr b/databases/lua-resty-redis/pkg-descr
index bc12d11e620e..67bf05c33324 100644
--- a/databases/lua-resty-redis/pkg-descr
+++ b/databases/lua-resty-redis/pkg-descr
@@ -4,5 +4,3 @@ http://wiki.nginx.org/HttpLuaModule
 
 This Lua library takes advantage of ngx_lua's cosocket API, which ensures 100%
 nonblocking behavior.
-
-WWW: https://github.com/openresty/lua-resty-redis
diff --git a/databases/lua-xapian/Makefile b/databases/lua-xapian/Makefile
index e40d32cf4ad4..e5ceab0aa4db 100644
--- a/databases/lua-xapian/Makefile
+++ b/databases/lua-xapian/Makefile
@@ -1,7 +1,5 @@
-# Created by: Po-Chuan Hsieh <sunpoet@FreeBSD.org>
-
 PORTNAME=	xapian
-PORTVERSION=	1.4.18
+PORTVERSION=	1.4.25
 DISTVERSIONPREFIX=	bindings-
 CATEGORIES=	databases
 MASTER_SITES=	https://oligarchy.co.uk/xapian/${PORTVERSION}/ \
@@ -10,6 +8,7 @@ PKGNAMEPREFIX=	${LUA_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Lua binding for Xapian
+WWW=		https://xapian.org/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
@@ -19,8 +18,6 @@ LIB_DEPENDS=	libxapian.so:databases/xapian-core
 
 USES=		compiler:c++11-lang libtool lua:module tar:xz
 
-DOCSDIR=	${LUA_DOCSDIR}
-
 CONFIGURE_ARGS=	--datarootdir=${DATADIR} \
 		--docdir=${DOCSDIR} \
 		--enable-shared \
@@ -30,17 +27,20 @@ CONFIGURE_ARGS=	--datarootdir=${DATADIR} \
 		--without-java \
 		--without-perl \
 		--without-php \
-		--without-php7 \
 		--without-python \
 		--without-python3 \
 		--without-ruby \
 		--without-tcl
-CONFIGURE_ENV=	LUA="${LUA_CMD}" LUA_INC="${LUA_INCDIR}" LUA_LIB="${LUA_MODLIBDIR}" LUA_SO=.so
+CONFIGURE_ENV=	LUA="${LUA_CMD}" \
+		LUA_CFLAGS="-I${LUA_INCDIR}" \
+		LUA_LIB="${LUA_MODLIBDIR}" \
+		LUA_LIBS="-L${LOCALBASE}/lib -llua-${LUA_VER}" \
+		LUA_SO=.so
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
 USE_CXXSTD=	c++11
 
-PORTDOCS=	*
+DOCSDIR=	${LUA_DOCSDIR}
 
 CONFLICTS_INSTALL=	xapian-bindings12
 
@@ -48,7 +48,4 @@ PORTSCOUT=	limitw:1,even
 
 OPTIONS_DEFINE=	DOCS
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|-lstdc++||g' ${WRKSRC}/configure
-
 .include <bsd.port.mk>
diff --git a/databases/lua-xapian/distinfo b/databases/lua-xapian/distinfo
index d7abc8bc255e..97cfe857e575 100644
--- a/databases/lua-xapian/distinfo
+++ b/databases/lua-xapian/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1611665347
-SHA256 (xapian-bindings-1.4.18.tar.xz) = fe52064e90d202f7819130ae3ad013c8b2b9cb517ad9fd607cf41d0110c5f18f
-SIZE (xapian-bindings-1.4.18.tar.xz) = 1135644
+TIMESTAMP = 1710712352
+SHA256 (xapian-bindings-1.4.25.tar.xz) = 068314fca3f54524701492df432fa54c485fd4e39613ca2cd275e136964e81a9
+SIZE (xapian-bindings-1.4.25.tar.xz) = 1076644
diff --git a/databases/lua-xapian/files/patch-configure b/databases/lua-xapian/files/patch-configure
new file mode 100644
index 000000000000..14e67dc6f4e0
--- /dev/null
+++ b/databases/lua-xapian/files/patch-configure
@@ -0,0 +1,11 @@
+--- configure.orig	2023-02-02 01:01:44 UTC
++++ configure
+@@ -21048,7 +21048,7 @@ SWIG_CXXFLAGS=
+ if test yes = "$GXX" ; then
+                     SWIG_CXXFLAGS="-fno-strict-aliasing"
+ 
+-              XAPIAN_LIBS="$XAPIAN_LIBS -lstdc++"
++              XAPIAN_LIBS="$XAPIAN_LIBS"
+ 
+ 
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
diff --git a/databases/lua-xapian/pkg-descr b/databases/lua-xapian/pkg-descr
index a8de3815479a..540d420a7576 100644
--- a/databases/lua-xapian/pkg-descr
+++ b/databases/lua-xapian/pkg-descr
@@ -1,3 +1 @@
 Lua binding for Xapian
-
-WWW: https://xapian.org/
diff --git a/databases/lua-xapian/pkg-plist b/databases/lua-xapian/pkg-plist
index e2e547050bdf..8c818f80b594 100644
--- a/databases/lua-xapian/pkg-plist
+++ b/databases/lua-xapian/pkg-plist
@@ -1,2 +1,7 @@
 %%LUA_MODLIBDIR%%/xapian.a
 %%LUA_MODLIBDIR%%/xapian.so
+%%LUA_DOCSDIR%%/lua/examples/simpleexpand.lua
+%%LUA_DOCSDIR%%/lua/examples/simpleindex.lua
+%%LUA_DOCSDIR%%/lua/examples/simplematchdecider.lua
+%%LUA_DOCSDIR%%/lua/examples/simplesearch.lua
+%%LUA_DOCSDIR%%/lua/index.html
diff --git a/databases/luadbi/Makefile b/databases/luadbi/Makefile
index eaae30c12c04..37413e1749bf 100644
--- a/databases/luadbi/Makefile
+++ b/databases/luadbi/Makefile
@@ -1,13 +1,13 @@
-# Created by: Olexander Melnyk <olexander.v.melnyk@gmail.com>
-
 PORTNAME=	luadbi
 PORTVERSION=	0.7.2
+PORTREVISION=	1
 DISTVERSIONPREFIX=	v
 CATEGORIES=	databases
 PKGNAMEPREFIX=	${LUA_PKGNAMEPREFIX}
 
 MAINTAINER=	olexander.v.melnyk@gmail.com
 COMMENT=	Multi-backend SQL database library for Lua
+WWW=		https://github.com/mwild1/luadbi
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYING
@@ -32,7 +32,7 @@ MAKE_JOBS_UNSAFE=yes
 
 OPTIONS_MULTI=	DATABASE
 OPTIONS_MULTI_DATABASE=	MYSQL SQLITE3 PGSQL
-OPTIONS_DEFAULT=	MYSQL
+OPTIONS_DEFAULT=	SQLITE3
 
 PLIST_FILES=	%%LUA_MODSHAREDIR%%/DBI.lua
 
@@ -41,6 +41,7 @@ MYSQL_ALL_TARGET=	mysql
 MYSQL_PLIST_FILES=	%%LUA_MODLIBDIR%%/dbd/mysql.so
 MYSQL_MAKE_ENV+=	MYSQL_LDFLAGS="-L${LOCALBASE}/lib/mysql -lmysqlclient"
 MYSQL_MAKE_ENV+=	MYSQL_INC="-I${LOCALBASE}/include/mysql"
+MYSQL_VARS=	IGNORE_WITH_MYSQL="80 81"
 
 SQLITE3_USES=		localbase:ldflags sqlite:3
 SQLITE3_ALL_TARGET=	sqlite3
diff --git a/databases/luadbi/pkg-descr b/databases/luadbi/pkg-descr
index 711a09b0dc59..4fa0e4bf81c5 100644
--- a/databases/luadbi/pkg-descr
+++ b/databases/luadbi/pkg-descr
@@ -5,5 +5,3 @@ for all database operations.
 
 On FreeBSD, LuaDBI supports MySQL, PostgreSQL, and SQLite3 databases with
 native database drivers.
-
-WWW: https://github.com/mwild1/luadbi
diff --git a/databases/luasql-firebird/Makefile b/databases/luasql-firebird/Makefile
index ee40eba51879..0f3443ae9a15 100644
--- a/databases/luasql-firebird/Makefile
+++ b/databases/luasql-firebird/Makefile
@@ -1,6 +1,4 @@
-# Created by: Martin Matuska <martin@matuska.org>
-
-PORTREVISION=	1
+PORTREVISION=	3
 
 LUASQL_DRIVER=	firebird
 
diff --git a/databases/luasql-mysql/Makefile b/databases/luasql-mysql/Makefile
index 07afa4202c39..4d74dfe4afd9 100644
--- a/databases/luasql-mysql/Makefile
+++ b/databases/luasql-mysql/Makefile
@@ -1,13 +1,12 @@
-# Created by: Martin Matuska <martin@matuska.org>
-
 PORTNAME=	luasql
 PORTVERSION=	2.6.0
 CATEGORIES=	databases
 PKGNAMEPREFIX=	${LUA_PKGNAMEPREFIX}
 PKGNAMESUFFIX=	-${LUASQL_DRIVER}
 
-MAINTAINER=	mbeis@xs4all.nl
+MAINTAINER=	ports@freebsd.org
 COMMENT=	LuaSQL driver
+WWW=		https://github.com/keplerproject/luasql
 
 LICENSE=	MIT
 
diff --git a/databases/luasql-mysql/pkg-descr b/databases/luasql-mysql/pkg-descr
index e3d6a85d243d..1cf847ac2ad0 100644
--- a/databases/luasql-mysql/pkg-descr
+++ b/databases/luasql-mysql/pkg-descr
@@ -3,5 +3,3 @@ LuaSQL is a simple interface from Lua to a DBMS. It enables a Lua program to:
     * Connect to ODBC, ADO, Oracle, MySQL, SQLite and PostgreSQL databases;
     * Execute arbitrary SQL statements;
     * Retrieve results in a row-by-row cursor fashion.
-
-WWW: https://github.com/keplerproject/luasql
diff --git a/databases/luasql-odbc/Makefile b/databases/luasql-odbc/Makefile
index 46909e05d714..9863fd843d4b 100644
--- a/databases/luasql-odbc/Makefile
+++ b/databases/luasql-odbc/Makefile
@@ -1,5 +1,3 @@
-# Created by: Martin Matuska <martin@matuska.org>
-
 LUASQL_DRIVER=	odbc
 
 MASTERDIR=	${.CURDIR}/../luasql-mysql
diff --git a/databases/luasql-postgres/Makefile b/databases/luasql-postgres/Makefile
index b7d5468b2dea..1d581d475ed6 100644
--- a/databases/luasql-postgres/Makefile
+++ b/databases/luasql-postgres/Makefile
@@ -1,5 +1,3 @@
-# Created by: Martin Matuska <martin@matuska.org>
-
 LUASQL_DRIVER=	postgres
 
 MASTERDIR=	${.CURDIR}/../luasql-mysql
diff --git a/databases/luasql-sqlite3/Makefile b/databases/luasql-sqlite3/Makefile
index 384aa3479f56..a94da372ee84 100644
--- a/databases/luasql-sqlite3/Makefile
+++ b/databases/luasql-sqlite3/Makefile
@@ -1,5 +1,3 @@
-# Created by: Martin Matuska <martin@matuska.org>
-
 LUASQL_DRIVER=	sqlite3
 
 MASTERDIR=	${.CURDIR}/../luasql-mysql
diff --git a/databases/mantis/Makefile b/databases/mantis/Makefile
index b8326413c118..7d4eb85aa6c5 100644
--- a/databases/mantis/Makefile
+++ b/databases/mantis/Makefile
@@ -1,7 +1,5 @@
-# Created by: Rozhuk Ivan <rozhuk.im@gmail.com>
-
 PORTNAME=	mantis
-PORTVERSION=	2.25.2
+PORTVERSION=	2.26.0
 PORTEPOCH=	1
 CATEGORIES=	databases www
 MASTER_SITES=	SF/mantisbt/mantis-stable/${PORTVERSION}
@@ -11,12 +9,13 @@ DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	zab@zltech.eu
 COMMENT=	Bug tracking system written in PHP
+WWW=		https://www.mantisbt.org/
 
 LICENSE=	GPLv2
 
 USES=		php:flavors
 USE_GITHUB=	nodefault
-USE_PHP=	fileinfo filter hash json mbstring pcre session xml
+USE_PHP=	fileinfo filter mbstring session xml
 
 DATADIR=	${WWWDIR}
 NO_ARCH=	yes
@@ -70,9 +69,9 @@ PGSQL_USE=			PHP=pgsql
 PIWIK_GH_TUPLE=			mantisbt-plugins:piwik:a2dba46836bdc07a80b8040e889ba0606f97415e:piwik
 SAMPLEAUTH_GH_TUPLE=		mantisbt-plugins:SampleAuth:34856715f49a5c273f33e094c759c0e0b52b3912:sampleauth/plugins/SampleAuth
 SI_USE=				PHP=curl
-SI_GH_TUPLE=			mantisbt-plugins:source-integration:v2.4.1:si
-SLACK_GH_TUPLE=			mantisbt-plugins:Slack:1488824bca1cd4cbacc99930a095c4d0131eb206:slack/plugins/Slack
-SNIPPETS_GH_TUPLE=		mantisbt-plugins:Snippets:v2.3.2:snippets/plugins/Snippets
+SI_GH_TUPLE=			mantisbt-plugins:source-integration:v2.6.0:si
+SLACK_GH_TUPLE=			mantisbt-plugins:Slack:v1.0.3:slack
+SNIPPETS_GH_TUPLE=		mantisbt-plugins:Snippets:v2.4.1:snippets/plugins/Snippets
 TASKODROME_GH_TUPLE=		mantisbt-plugins:Taskodrome:69577a62e7db1c50945b513616ca15db97eeb67f:taskodrome
 TIMETRACKING_GH_TUPLE=		mantisbt-plugins:timetracking:3a560673d85e17651fc1994f5e09e2ae9df62336:timetracking
 
diff --git a/databases/mantis/distinfo b/databases/mantis/distinfo
index 4cae6e862298..de1c484545c0 100644
--- a/databases/mantis/distinfo
+++ b/databases/mantis/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1625784066
-SHA256 (mantisbt-2.25.2.tar.gz) = 8b087e71594fd70d2d2e39d2d2e1285b47a9919d8d8fd268df009df76ebc3671
-SIZE (mantisbt-2.25.2.tar.gz) = 15101103
+TIMESTAMP = 1704558346
+SHA256 (mantisbt-2.26.0.tar.gz) = e278303e167c31e8f57fd52e266c15da71633718ae0d101101168847830e4f24
+SIZE (mantisbt-2.26.0.tar.gz) = 15585201
 SHA256 (mantisbt-plugins-Activity-2b1e3da2243613ebd13878501cfdcd9422cf4d4b_GH0.tar.gz) = 56da94642a28171a5d7c3e7830fe4e292cd4003cf58a20a373e9155bba3dda68
 SIZE (mantisbt-plugins-Activity-2b1e3da2243613ebd13878501cfdcd9422cf4d4b_GH0.tar.gz) = 42852
 SHA256 (mantisbt-plugins-Announce-v2.4.3_GH0.tar.gz) = 795f9bfab09bb69d41dc66d1e2a515fa5fa03ed485cd25d5f1dc5bb01b3b01c2
@@ -27,12 +27,12 @@ SHA256 (mantisbt-plugins-piwik-a2dba46836bdc07a80b8040e889ba0606f97415e_GH0.tar.
 SIZE (mantisbt-plugins-piwik-a2dba46836bdc07a80b8040e889ba0606f97415e_GH0.tar.gz) = 2898
 SHA256 (mantisbt-plugins-SampleAuth-34856715f49a5c273f33e094c759c0e0b52b3912_GH0.tar.gz) = 0b469ad79ffb792e4fc9cbcc5d48266c686be20de3f0cd6986bf43893deca1c3
 SIZE (mantisbt-plugins-SampleAuth-34856715f49a5c273f33e094c759c0e0b52b3912_GH0.tar.gz) = 197029
-SHA256 (mantisbt-plugins-source-integration-v2.4.1_GH0.tar.gz) = a630f3adf71a47468553fc68a9f786804dc131e334c3fc42270ed03db1847dc2
-SIZE (mantisbt-plugins-source-integration-v2.4.1_GH0.tar.gz) = 177159
-SHA256 (mantisbt-plugins-Slack-1488824bca1cd4cbacc99930a095c4d0131eb206_GH0.tar.gz) = 5f6e7f5aeff183637636bbdeb631aff5f816abca8aa755183da4abe0b996aa02
-SIZE (mantisbt-plugins-Slack-1488824bca1cd4cbacc99930a095c4d0131eb206_GH0.tar.gz) = 115163
-SHA256 (mantisbt-plugins-Snippets-v2.3.2_GH0.tar.gz) = 009c034a694e7d3f85569ad376a28735c7972299972d796471b563f27066cce9
-SIZE (mantisbt-plugins-Snippets-v2.3.2_GH0.tar.gz) = 36975
+SHA256 (mantisbt-plugins-source-integration-v2.6.0_GH0.tar.gz) = 932ab53e5385aaf0ccb0f88c72402bc7cb0b400153757dd565fe146dbc2d6c3b
+SIZE (mantisbt-plugins-source-integration-v2.6.0_GH0.tar.gz) = 187283
+SHA256 (mantisbt-plugins-Slack-v1.0.3_GH0.tar.gz) = 485b293ecf35828f077f893630ea76f4b960c362760f31fcf96611abdea10630
+SIZE (mantisbt-plugins-Slack-v1.0.3_GH0.tar.gz) = 116403
+SHA256 (mantisbt-plugins-Snippets-v2.4.1_GH0.tar.gz) = f302d2ee7b13d298935383f3c755670a04e78faae6b0ed116407986996ebc45e
+SIZE (mantisbt-plugins-Snippets-v2.4.1_GH0.tar.gz) = 37546
 SHA256 (mantisbt-plugins-Taskodrome-69577a62e7db1c50945b513616ca15db97eeb67f_GH0.tar.gz) = 1374bc708e4b4bea9d511607a3238efc16cf02c6839b058116abf08f69fe3c53
 SIZE (mantisbt-plugins-Taskodrome-69577a62e7db1c50945b513616ca15db97eeb67f_GH0.tar.gz) = 6062381
 SHA256 (mantisbt-plugins-timetracking-3a560673d85e17651fc1994f5e09e2ae9df62336_GH0.tar.gz) = 99f13d9d4cef6aa9875dcd2b122dcd48b33dbd1e51439d455ea850b59bf7f14a
diff --git a/databases/mantis/pkg-descr b/databases/mantis/pkg-descr
index c71e8ded8396..b6f2599435c7 100644
--- a/databases/mantis/pkg-descr
+++ b/databases/mantis/pkg-descr
@@ -6,5 +6,3 @@ collaborating with their teammates and clients effectively.
 It is written in the PHP scripting language and works with the MySQL
 (or one of its forks), and PostgreSQL databases and a web server.
 Almost any web browser should be able to function as a client.
-
-WWW: http://www.mantisbt.org/
diff --git a/databases/mariadb-connector-c/Makefile b/databases/mariadb-connector-c/Makefile
index 4767d6110b4d..dc09b64bca75 100644
--- a/databases/mariadb-connector-c/Makefile
+++ b/databases/mariadb-connector-c/Makefile
@@ -1,28 +1,33 @@
 PORTNAME=	mariadb-connector-c
-PORTVERSION=	3.1.10
+PORTVERSION=	3.3.8
+PORTREVISION=	1
 CATEGORIES=	databases
-MASTER_SITES=	http://ftp.osuosl.org/pub/${SITESDIR}/ \
-		http://mirrors.supportex.net/${SITESDIR}/ \
-		http://mirror2.hs-esslingen.de/pub/Mirrors/${SITESDIR}/ \
-		http://gd.tuwien.ac.at/db/${SITESDIR}/ \
-		http://mirrors.fe.up.pt/pub/${SITESDIR}/ \
-		http://mirror.de.gsnw.de:56431/${SITESDIR}/ \
-		http://mirror.layerjet.com/${SITESDIR}/ \
-		http://mirror.switch.ch/mirror/${SITESDIR}/
+MASTER_SITES=	https://mirror.nodesdirect.com/${SITESDIR}/ \
+		https://mirror.one.com/${SITESDIR}/ \
+		https://ftp.nluug.nl/db/${SITESDIR}/ \
+		https://ftp.icm.edu.pl/pub/unix/database/${SITESDIR}/ \
+		https://mirror.truenetwork.ru/${SITESDIR}/ \
+		https://mirrors.aliyun.com/${SITESDIR}/ \
+		https://ftp.ubuntu-tw.org/mirror/${SITESDIR}/ \
+		https://mirror.kku.ac.th/${SITESDIR}/ \
+		https://espejito.fder.edu.uy/${SITESDIR}/ \
+		https://ftp.osuosl.org/pub/${SITESDIR}/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-src
 
 MAINTAINER=	brnrd@FreeBSD.org
 COMMENT=	MariaDB database connector for C
+WWW=		https://www.mariadb.com/kb/en/mariadb/about-mariadb-connector-c/
 
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/COPYING.LIB
 
-LIB_DEPENDS=	libcurl.so:ftp/curl
+LIB_DEPENDS=	libcurl.so:ftp/curl \
+		libzstd.so:archivers/zstd
 
-CONFLICTS_INSTALL=	mariadb[0-9]*-client-* \
-			mariadb102-server-* \
-			mysql[0-9]*-client-* \
-			percona[0-9]*-client-*
+CONFLICTS_INSTALL=	mariadb[0-9]*-client \
+			mariadb102-server \
+			mysql[0-9]*-client \
+			percona[0-9]*-client
 
 USES=		cmake:insource compiler:c++11-lib iconv:translit ssl
 USE_LDCONFIG=	${PREFIX}/lib/mariadb
@@ -30,6 +35,7 @@ SITESDIR=	mariadb/connector-c-${PORTVERSION}
 DOCSDIR=	${PREFIX}/share/doc/mysql
 
 CMAKE_ARGS+=	-DCOMPILATION_COMMENT="FreeBSD Ports" \
-		-DWITH_EXTERNAL_ZLIB="YES"
+		-DWITH_EXTERNAL_ZLIB="YES" \
+		-DINSTALL_MANDIR:PATH=${PREFIX}/share/man
 
 .include <bsd.port.mk>
diff --git a/databases/mariadb-connector-c/distinfo b/databases/mariadb-connector-c/distinfo
index 14f8f76ea5c8..d501ccd5997a 100644
--- a/databases/mariadb-connector-c/distinfo
+++ b/databases/mariadb-connector-c/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1603044903
-SHA256 (mariadb-connector-c-3.1.10-src.tar.gz) = af3e5613cb9e811f70db85a8a704c7140dc3e35f7c39912d0509511638f9658f
-SIZE (mariadb-connector-c-3.1.10-src.tar.gz) = 746801
+TIMESTAMP = 1703845639
+SHA256 (mariadb-connector-c-3.3.8-src.tar.gz) = f9f076b4aa9fb22cc94b24f82c80f9ef063805ecd6533a2eb5d5060cf93833e8
+SIZE (mariadb-connector-c-3.3.8-src.tar.gz) = 1393368
diff --git a/databases/mariadb-connector-c/files/patch-libmariadb_cmake_ConnectorName.cmake b/databases/mariadb-connector-c/files/patch-libmariadb_cmake_ConnectorName.cmake
deleted file mode 100644
index 0cdf01e6f5b2..000000000000
--- a/databases/mariadb-connector-c/files/patch-libmariadb_cmake_ConnectorName.cmake
+++ /dev/null
@@ -1,11 +0,0 @@
---- cmake/ConnectorName.cmake.orig	2021-04-02 09:49:25 UTC
-+++ cmake/ConnectorName.cmake
-@@ -22,7 +22,7 @@ IF(CMAKE_SYSTEM_NAME MATCHES "Windows")
-     SET(MACHINE_NAME "x64")
-   ELSE()
-     SET(MACHINE_NAME "32")
--  END()
-+  ENDIF()
- ENDIF()
- 
- SET(product_name "mysql-connector-c-${CPACK_PACKAGE_VERSION}-${PLATFORM_NAME}${CONCAT_SIGN}${MACHINE_NAME}")
diff --git a/databases/mariadb-connector-c/pkg-descr b/databases/mariadb-connector-c/pkg-descr
index ab5013067913..258f2007a9b0 100644
--- a/databases/mariadb-connector-c/pkg-descr
+++ b/databases/mariadb-connector-c/pkg-descr
@@ -4,5 +4,3 @@ to MariaDB and MySQL databases. MySQL Connector/C is LGPL licensed.
 Parts of MariaDB Connector/C are derived from PHP\'s mysqlnd extension and
 the original LGPL MySQL client library for MySQL 3.23. The rest of the code
 is written by developers at MariaDB Corporation Ab.
-
-WWW: https://www.mariadb.com/kb/en/mariadb/about-mariadb-connector-c/
diff --git a/databases/mariadb-connector-c/pkg-plist b/databases/mariadb-connector-c/pkg-plist
index b1a7b481fc80..5ebcc5330524 100644
--- a/databases/mariadb-connector-c/pkg-plist
+++ b/databases/mariadb-connector-c/pkg-plist
@@ -15,6 +15,7 @@ include/mariadb/mysql/client_plugin.h
 include/mariadb/mysql/plugin_auth.h
 include/mariadb/mysql/plugin_auth_common.h
 include/mariadb/mysqld_error.h
+lib/mariadb/libmariadb.a
 lib/mariadb/libmariadb.so
 lib/mariadb/libmariadb.so.3
 lib/mariadb/libmariadbclient.a
@@ -25,4 +26,125 @@ lib/mariadb/plugin/dialog.so
 lib/mariadb/plugin/mysql_clear_password.so
 lib/mariadb/plugin/remote_io.so
 lib/mariadb/plugin/sha256_password.so
+lib/mariadb/plugin/zstd.so
 libdata/pkgconfig/libmariadb.pc
+share/man/man3/mariadb_cancel.3.gz
+share/man/man3/mariadb_connection.3.gz
+share/man/man3/mariadb_dyncol_check.3.gz
+share/man/man3/mariadb_dyncol_column_cmp_named.3.gz
+share/man/man3/mariadb_dyncol_column_count.3.gz
+share/man/man3/mariadb_dyncol_create_many_named.3.gz
+share/man/man3/mariadb_dyncol_create_many_num.3.gz
+share/man/man3/mariadb_dyncol_exists_named.3.gz
+share/man/man3/mariadb_dyncol_exists_num.3.gz
+share/man/man3/mariadb_dyncol_free.3.gz
+share/man/man3/mariadb_dyncol_list_named.3.gz
+share/man/man3/mariadb_dyncol_list_num.3.gz
+share/man/man3/mariadb_dyncol_unpack.3.gz
+share/man/man3/mariadb_dyncol_update_many_named.3.gz
+share/man/man3/mariadb_dyncol_update_many_num.3.gz
+share/man/man3/mariadb_get_infov.3.gz
+share/man/man3/mariadb_reconnect.3.gz
+share/man/man3/mariadb_rpl_close.3.gz
+share/man/man3/mariadb_rpl_fetch.3.gz
+share/man/man3/mariadb_rpl_get_optionsv.3.gz
+share/man/man3/mariadb_rpl_open.3.gz
+share/man/man3/mariadb_rpl_optionsv.3.gz
+share/man/man3/mariadb_stmt_execute_direct.3.gz
+share/man/man3/mariadb_stmt_fetch_fields.3.gz
+share/man/man3/mysql_affected_rows.3.gz
+share/man/man3/mysql_autocommit.3.gz
+share/man/man3/mysql_change_user.3.gz
+share/man/man3/mysql_close.3.gz
+share/man/man3/mysql_commit.3.gz
+share/man/man3/mysql_data_seek.3.gz
+share/man/man3/mysql_errno.3.gz
+share/man/man3/mysql_error.3.gz
+share/man/man3/mysql_fetch_field.3.gz
+share/man/man3/mysql_fetch_field_direct.3.gz
+share/man/man3/mysql_fetch_fields.3.gz
+share/man/man3/mysql_fetch_lengths.3.gz
+share/man/man3/mysql_fetch_row.3.gz
+share/man/man3/mysql_field_count.3.gz
+share/man/man3/mysql_field_seek.3.gz
+share/man/man3/mysql_field_tell.3.gz
+share/man/man3/mysql_free_result.3.gz
+share/man/man3/mysql_get_character_set_info.3.gz
+share/man/man3/mysql_get_client_info.3.gz
+share/man/man3/mysql_get_client_version.3.gz
+share/man/man3/mysql_get_host_info.3.gz
+share/man/man3/mysql_get_proto_info.3.gz
+share/man/man3/mysql_get_server_info.3.gz
+share/man/man3/mysql_get_server_version.3.gz
+share/man/man3/mysql_get_socket.3.gz
+share/man/man3/mysql_get_ssl_cipher.3.gz
+share/man/man3/mysql_hex_string.3.gz
+share/man/man3/mysql_info.3.gz
+share/man/man3/mysql_init.3.gz
+share/man/man3/mysql_kill.3.gz
+share/man/man3/mysql_more_results.3.gz
+share/man/man3/mysql_next_result.3.gz
+share/man/man3/mysql_num_fields.3.gz
+share/man/man3/mysql_num_rows.3.gz
+share/man/man3/mysql_options.3.gz
+share/man/man3/mysql_options4.3.gz
+share/man/man3/mysql_optionsv.3.gz
+share/man/man3/mysql_ping.3.gz
+share/man/man3/mysql_query.3.gz
+share/man/man3/mysql_read_query_result.3.gz
+share/man/man3/mysql_real_connect.3.gz
+share/man/man3/mysql_real_escape_string.3.gz
+share/man/man3/mysql_real_query.3.gz
+share/man/man3/mysql_refresh.3.gz
+share/man/man3/mysql_reset_connection.3.gz
+share/man/man3/mysql_rollback.3.gz
+share/man/man3/mysql_row_seek.3.gz
+share/man/man3/mysql_row_tell.3.gz
+share/man/man3/mysql_select_db.3.gz
+share/man/man3/mysql_send_query.3.gz
+share/man/man3/mysql_server_end.3.gz
+share/man/man3/mysql_server_init.3.gz
+share/man/man3/mysql_session_track_get_first.3.gz
+share/man/man3/mysql_session_track_get_next.3.gz
+share/man/man3/mysql_set_character_set.3.gz
+share/man/man3/mysql_set_server_option.3.gz
+share/man/man3/mysql_shutdown.3.gz
+share/man/man3/mysql_sqlstate.3.gz
+share/man/man3/mysql_ssl_set.3.gz
+share/man/man3/mysql_stat.3.gz
+share/man/man3/mysql_stmt_affected_rows.3.gz
+share/man/man3/mysql_stmt_attr_get.3.gz
+share/man/man3/mysql_stmt_attr_set.3.gz
+share/man/man3/mysql_stmt_bind_param.3.gz
+share/man/man3/mysql_stmt_bind_result.3.gz
+share/man/man3/mysql_stmt_close.3.gz
+share/man/man3/mysql_stmt_data_seek.3.gz
+share/man/man3/mysql_stmt_errno.3.gz
+share/man/man3/mysql_stmt_error.3.gz
+share/man/man3/mysql_stmt_execute.3.gz
+share/man/man3/mysql_stmt_fetch.3.gz
+share/man/man3/mysql_stmt_fetch_column.3.gz
+share/man/man3/mysql_stmt_field_count.3.gz
+share/man/man3/mysql_stmt_free_result.3.gz
+share/man/man3/mysql_stmt_init.3.gz
+share/man/man3/mysql_stmt_insert_id.3.gz
+share/man/man3/mysql_stmt_more_results.3.gz
+share/man/man3/mysql_stmt_next_result.3.gz
+share/man/man3/mysql_stmt_num_rows.3.gz
+share/man/man3/mysql_stmt_param_count.3.gz
+share/man/man3/mysql_stmt_param_metadata.3.gz
+share/man/man3/mysql_stmt_prepare.3.gz
+share/man/man3/mysql_stmt_reset.3.gz
+share/man/man3/mysql_stmt_result_metadata.3.gz
+share/man/man3/mysql_stmt_row_seek.3.gz
+share/man/man3/mysql_stmt_row_tell.3.gz
+share/man/man3/mysql_stmt_send_long_data.3.gz
+share/man/man3/mysql_stmt_sqlstate.3.gz
+share/man/man3/mysql_stmt_store_result.3.gz
+share/man/man3/mysql_stmt_warning_count.3.gz
+share/man/man3/mysql_store_result.3.gz
+share/man/man3/mysql_thread_end.3.gz
+share/man/man3/mysql_thread_id.3.gz
+share/man/man3/mysql_thread_init.3.gz
+share/man/man3/mysql_use_result.3.gz
+share/man/man3/mysql_warning_count.3.gz
diff --git a/databases/mariadb-connector-odbc/Makefile b/databases/mariadb-connector-odbc/Makefile
index 4732487d6149..d4f05e432041 100644
--- a/databases/mariadb-connector-odbc/Makefile
+++ b/databases/mariadb-connector-odbc/Makefile
@@ -1,19 +1,22 @@
 PORTNAME=	mariadb
-PORTVERSION=	3.1.11
+PORTVERSION=	3.1.20
 CATEGORIES=	databases
-MASTER_SITES=	http://ftp.osuosl.org/pub/${SITESDIR}/ \
-		http://mirrors.supportex.net/${SITESDIR}/ \
-		http://mirror2.hs-esslingen.de/pub/Mirrors/${SITESDIR}/ \
-		http://gd.tuwien.ac.at/db/${SITESDIR}/ \
-		http://mirrors.fe.up.pt/pub/${SITESDIR}/ \
-		http://mirror.de.gsnw.de:56431/${SITESDIR}/ \
-		http://mirror.layerjet.com/${SITESDIR}/ \
-		http://mirror.switch.ch/mirror/${SITESDIR}/
+MASTER_SITES=	https://mirror.nodesdirect.com/${SITESDIR}/ \
+		https://mirror.one.com/${SITESDIR}/ \
+		https://ftp.nluug.nl/db/${SITESDIR}/ \
+		https://ftp.icm.edu.pl/pub/unix/database/${SITESDIR}/ \
+		https://mirror.truenetwork.ru/${SITESDIR}/ \
+		https://mirrors.aliyun.com/${SITESDIR}/ \
+		https://ftp.ubuntu-tw.org/mirror/${SITESDIR}/ \
+		https://mirror.kku.ac.th/${SITESDIR}/ \
+		https://espejito.fder.edu.uy/${SITESDIR}/ \
+		https://ftp.osuosl.org/pub/${SITESDIR}/
 PKGNAMESUFFIX=	-connector-odbc
-DISTNAME=	${PORTNAME}${PKGNAMESUFFIX}-${DISTVERSION}-ga-src
+DISTNAME=	${PORTNAME}${PKGNAMESUFFIX}-${DISTVERSION}-src
 
 MAINTAINER=	brnrd@FreeBSD.org
 COMMENT=	MariaDB database connector for odbc
+WWW=		https://mariadb.com/kb/en/mariadb/mariadb-connector-odbc/
 
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/COPYING
@@ -36,7 +39,8 @@ LDFLAGS+=	-L${LOCALBASE}/lib/mariadb
 
 SSL_CMAKE_ON=	-DWITH_OPENSSL=on
 
-PLIST_FILES=	lib/mariadb/libmaodbc.so
+PLIST_FILES=	lib/mariadb/libmaodbc.so \
+		libdata/pkgconfig/libmaodbc.pc
 
 post-install:
 	${RM} -r ${STAGEDIR}${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX} \
diff --git a/databases/mariadb-connector-odbc/distinfo b/databases/mariadb-connector-odbc/distinfo
index 66653583d68e..9e5ed1924917 100644
--- a/databases/mariadb-connector-odbc/distinfo
+++ b/databases/mariadb-connector-odbc/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1608466653
-SHA256 (mariadb-connector-odbc-3.1.11-ga-src.tar.gz) = d81a35cd9c9d2e1e732b7bd9ee704eb83775ed74bcc38d6cd5d367a3fc525a34
-SIZE (mariadb-connector-odbc-3.1.11-ga-src.tar.gz) = 542434
+TIMESTAMP = 1703846623
+SHA256 (mariadb-connector-odbc-3.1.20-src.tar.gz) = 41f7db83c907017be67f9941649e7ce1d3597c6d68f6241cb9b7709bbe2a490b
+SIZE (mariadb-connector-odbc-3.1.20-src.tar.gz) = 562312
diff --git a/databases/mariadb-connector-odbc/pkg-descr b/databases/mariadb-connector-odbc/pkg-descr
index 36506286fe55..4bc62c6366e8 100644
--- a/databases/mariadb-connector-odbc/pkg-descr
+++ b/databases/mariadb-connector-odbc/pkg-descr
@@ -2,5 +2,3 @@ MariaDB Connector/ODBC is a standardized, LGPL licensed database driver
 using the industry standard ODBC API. It supports ODBC Standard 3.5, can be
 used as a drop-in replacement for MySQL Connector/ODBC, and it supports
 both Unicode and ANSI modes.
-
-WWW: https://mariadb.com/kb/en/mariadb/mariadb-connector-odbc/
diff --git a/databases/mariadb1011-client/Makefile b/databases/mariadb1011-client/Makefile
new file mode 100644
index 000000000000..e9499297d213
--- /dev/null
+++ b/databases/mariadb1011-client/Makefile
@@ -0,0 +1,10 @@
+PORTNAME=	mariadb
+PKGNAMESUFFIX=	1011-client
+
+COMMENT=	Multithreaded SQL database (client)
+
+MASTERDIR=	${.CURDIR}/../${PORTNAME}${PKGNAMESUFFIX:C/-client/-server/}
+
+PLIST=		${.CURDIR}/pkg-plist
+
+.include "${MASTERDIR}/Makefile"
diff --git a/databases/mariadb1011-client/pkg-plist b/databases/mariadb1011-client/pkg-plist
new file mode 100644
index 000000000000..98ad22c80283
--- /dev/null
+++ b/databases/mariadb1011-client/pkg-plist
@@ -0,0 +1,267 @@
+bin/mariadb
+bin/mariadb-access
+bin/mariadb-admin
+bin/mariadb-binlog
+bin/mariadb-check
+bin/mariadb-config
+bin/mariadb-conv
+bin/mariadb-convert-table-format
+bin/mariadb-dump
+@comment bin/mariadb-dumpslow
+bin/mariadb-find-rows
+bin/mariadb-hotcopy
+bin/mariadb-import
+bin/mariadb-plugin
+bin/mariadb-show
+@comment bin/mariadb-secure-installation
+bin/mariadb-setpermission
+bin/mariadb-slap
+bin/mariadb-test
+bin/mariadb-waitpid
+bin/mariadb_config
+bin/msql2mysql
+bin/mysql
+bin/mysql_config
+bin/mysql_convert_table_format
+bin/mysql_find_rows
+@comment bin/mysql_secure_installation
+bin/mysql_setpermission
+@comment bin/mysql_plugin
+@comment bin/mysql_waitpid
+bin/mysqlaccess
+bin/mysqladmin
+bin/mysqlbinlog
+bin/mysqlcheck
+bin/mysqldump
+@comment bin/mysqldumpslow
+bin/mysqlhotcopy
+bin/mysqlimport
+bin/mysqlshow
+bin/mysqlslap
+bin/mysqltest
+@comment bin/mytop
+bin/my_print_defaults
+bin/replace
+@sample %%ETCDIR%%/my.cnf.sample
+@sample %%ETCDIR%%/conf.d/client.cnf.sample
+include/mysql/errmsg.h
+include/mysql/ma_list.h
+include/mysql/ma_pvio.h
+include/mysql/ma_tls.h
+include/mysql/mariadb/ma_io.h
+include/mysql/mariadb_com.h
+include/mysql/mariadb_ctype.h
+include/mysql/mariadb_dyncol.h
+include/mysql/mariadb_rpl.h
+include/mysql/mariadb_stmt.h
+include/mysql/mariadb_version.h
+include/mysql/my_alloca.h
+include/mysql/my_config.h
+include/mysql/my_global.h
+include/mysql/my_sys.h
+include/mysql/mysql.h
+include/mysql/mysql_com.h
+include/mysql/mysql_version.h
+include/mysql/mysql/client_plugin.h
+include/mysql/mysql/plugin_auth.h
+include/mysql/mysql/plugin_auth_common.h
+include/mysql/mysqld_error.h
+%%NO_GSSAPI_NONE%%lib/mysql/plugin/auth_gssapi_client.so
+lib/mysql/libmariadb.a
+lib/mysql/libmariadb.so
+lib/mysql/libmariadb.so.3
+lib/mysql/libmariadbclient.a
+lib/mysql/libmysqlclient.a
+lib/mysql/libmysqlclient.so
+lib/mysql/libmysqlclient_r.a
+lib/mysql/libmysqlclient_r.so
+lib/mysql/libmysqlservices.a
+lib/mysql/plugin/caching_sha2_password.so
+lib/mysql/plugin/client_ed25519.so
+lib/mysql/plugin/daemon_example.ini
+lib/mysql/plugin/dialog.so
+lib/mysql/plugin/mysql_clear_password.so
+@comment lib/mysql/plugin/zstd.so
+lib/mysql/plugin/sha256_password.so
+libdata/pkgconfig/libmariadb.pc
+share/man/man1/mariadb.1.gz
+share/man/man1/mariadb-access.1.gz
+share/man/man1/mariadb-admin.1.gz
+share/man/man1/mariadb-binlog.1.gz
+share/man/man1/mariadb-check.1.gz
+share/man/man1/mariadb-client-test-embedded.1.gz
+share/man/man1/mariadb-client-test.1.gz
+share/man/man1/mariadb-convert-table-format.1.gz
+share/man/man1/mariadb_config.1.gz
+share/man/man1/mariadb-dump.1.gz
+@comment share/man/man1/mariadb-dumpslow.1.gz
+@comment share/man/man1/mariadb-embedded.1.gz
+share/man/man1/mariadb-find-rows.1.gz
+share/man/man1/mariadb-hotcopy.1.gz
+share/man/man1/mariadb-import.1.gz
+share/man/man1/mariadb-plugin.1.gz
+@comment share/man/man1/mariadb-secure-installation.1.gz
+share/man/man1/mariadb-setpermission.1.gz
+share/man/man1/mariadb-show.1.gz
+share/man/man1/mariadb-slap.1.gz
+share/man/man1/mariadb-test-embedded.1.gz
+share/man/man1/mariadb-test.1.gz
+@comment share/man/man1/mariadb-tzinfo-to-sql.1.gz
+@comment share/man/man1/mariadb-waitpid.1.gz
+share/man/man1/msql2mysql.1.gz
+share/man/man1/my_print_defaults.1.gz
+share/man/man1/my_safe_process.1.gz
+@comment share/man/man1/myisam_ftdump.1.gz
+@comment share/man/man1/myisamchk.1.gz
+@comment share/man/man1/myisamlog.1.gz
+@comment share/man/man1/myisampack.1.gz
+share/man/man1/mysql-stress-test.pl.1.gz
+share/man/man1/mysql-test-run.pl.1.gz
+share/man/man1/mysql.1.gz
+share/man/man1/mysql_client_test.1.gz
+share/man/man1/mysql_client_test_embedded.1.gz
+share/man/man1/mysql_config.1.gz
+share/man/man1/mysql_convert_table_format.1.gz
+share/man/man1/mysql_embedded.1.gz
+share/man/man1/mysql_find_rows.1.gz
+share/man/man1/mysql_plugin.1.gz
+@comment share/man/man1/mysql_secure_installation.1.gz
+share/man/man1/mysql_setpermission.1.gz
+@comment share/man/man1/mysql_tzinfo_to_sql.1.gz
+@comment share/man/man1/mysql_waitpid.1.gz
+share/man/man1/mysqlaccess.1.gz
+share/man/man1/mysqladmin.1.gz
+share/man/man1/mysqlbinlog.1.gz
+share/man/man1/mysqlcheck.1.gz
+share/man/man1/mysqldump.1.gz
+@comment share/man/man1/mysqldumpslow.1.gz
+share/man/man1/mysqlhotcopy.1.gz
+share/man/man1/mysqlimport.1.gz
+share/man/man1/mysqlshow.1.gz
+share/man/man1/mysqlslap.1.gz
+share/man/man1/mysqltest.1.gz
+share/man/man1/mysqltest_embedded.1.gz
+@comment share/man/man1/mytop.1.gz
+@comment share/man/man1/perror.1.gz
+share/man/man1/replace.1.gz
+@comment share/man/man1/resolve_stack_dump.1.gz
+share/man/man3/mariadb_cancel.3.gz
+share/man/man3/mariadb_connection.3.gz
+share/man/man3/mariadb_dyncol_check.3.gz
+share/man/man3/mariadb_dyncol_column_cmp_named.3.gz
+share/man/man3/mariadb_dyncol_column_count.3.gz
+share/man/man3/mariadb_dyncol_create_many_named.3.gz
+share/man/man3/mariadb_dyncol_create_many_num.3.gz
+share/man/man3/mariadb_dyncol_exists_named.3.gz
+share/man/man3/mariadb_dyncol_exists_num.3.gz
+share/man/man3/mariadb_dyncol_free.3.gz
+share/man/man3/mariadb_dyncol_list_named.3.gz
+share/man/man3/mariadb_dyncol_list_num.3.gz
+share/man/man3/mariadb_dyncol_unpack.3.gz
+share/man/man3/mariadb_dyncol_update_many_named.3.gz
+share/man/man3/mariadb_dyncol_update_many_num.3.gz
+share/man/man3/mariadb_get_infov.3.gz
+share/man/man3/mariadb_reconnect.3.gz
+share/man/man3/mariadb_rpl_close.3.gz
+share/man/man3/mariadb_rpl_fetch.3.gz
+share/man/man3/mariadb_rpl_get_optionsv.3.gz
+share/man/man3/mariadb_rpl_open.3.gz
+share/man/man3/mariadb_rpl_optionsv.3.gz
+share/man/man3/mariadb_stmt_execute_direct.3.gz
+share/man/man3/mariadb_stmt_fetch_fields.3.gz
+share/man/man3/mysql_affected_rows.3.gz
+share/man/man3/mysql_autocommit.3.gz
+share/man/man3/mysql_change_user.3.gz
+share/man/man3/mysql_close.3.gz
+share/man/man3/mysql_commit.3.gz
+share/man/man3/mysql_data_seek.3.gz
+share/man/man3/mysql_errno.3.gz
+share/man/man3/mysql_error.3.gz
+share/man/man3/mysql_fetch_field.3.gz
+share/man/man3/mysql_fetch_field_direct.3.gz
+share/man/man3/mysql_fetch_fields.3.gz
+share/man/man3/mysql_fetch_lengths.3.gz
+share/man/man3/mysql_fetch_row.3.gz
+share/man/man3/mysql_field_count.3.gz
+share/man/man3/mysql_field_seek.3.gz
+share/man/man3/mysql_field_tell.3.gz
+share/man/man3/mysql_free_result.3.gz
+share/man/man3/mysql_get_character_set_info.3.gz
+share/man/man3/mysql_get_client_info.3.gz
+share/man/man3/mysql_get_client_version.3.gz
+share/man/man3/mysql_get_host_info.3.gz
+share/man/man3/mysql_get_proto_info.3.gz
+share/man/man3/mysql_get_server_info.3.gz
+share/man/man3/mysql_get_server_version.3.gz
+share/man/man3/mysql_get_socket.3.gz
+share/man/man3/mysql_get_ssl_cipher.3.gz
+share/man/man3/mysql_hex_string.3.gz
+share/man/man3/mysql_info.3.gz
+share/man/man3/mysql_init.3.gz
+share/man/man3/mysql_kill.3.gz
+share/man/man3/mysql_more_results.3.gz
+share/man/man3/mysql_next_result.3.gz
+share/man/man3/mysql_num_fields.3.gz
+share/man/man3/mysql_num_rows.3.gz
+share/man/man3/mysql_options.3.gz
+share/man/man3/mysql_options4.3.gz
+share/man/man3/mysql_optionsv.3.gz
+share/man/man3/mysql_ping.3.gz
+share/man/man3/mysql_query.3.gz
+share/man/man3/mysql_read_query_result.3.gz
+share/man/man3/mysql_real_connect.3.gz
+share/man/man3/mysql_real_escape_string.3.gz
+share/man/man3/mysql_real_query.3.gz
+share/man/man3/mysql_refresh.3.gz
+share/man/man3/mysql_reset_connection.3.gz
+share/man/man3/mysql_rollback.3.gz
+share/man/man3/mysql_row_seek.3.gz
+share/man/man3/mysql_row_tell.3.gz
+share/man/man3/mysql_select_db.3.gz
+share/man/man3/mysql_send_query.3.gz
+share/man/man3/mysql_server_end.3.gz
+share/man/man3/mysql_server_init.3.gz
+share/man/man3/mysql_session_track_get_first.3.gz
+share/man/man3/mysql_session_track_get_next.3.gz
+share/man/man3/mysql_set_character_set.3.gz
+share/man/man3/mysql_set_server_option.3.gz
+share/man/man3/mysql_shutdown.3.gz
+share/man/man3/mysql_sqlstate.3.gz
+share/man/man3/mysql_ssl_set.3.gz
+share/man/man3/mysql_stat.3.gz
+share/man/man3/mysql_stmt_affected_rows.3.gz
+share/man/man3/mysql_stmt_attr_get.3.gz
+share/man/man3/mysql_stmt_attr_set.3.gz
+share/man/man3/mysql_stmt_bind_param.3.gz
+share/man/man3/mysql_stmt_bind_result.3.gz
+share/man/man3/mysql_stmt_close.3.gz
+share/man/man3/mysql_stmt_data_seek.3.gz
+share/man/man3/mysql_stmt_errno.3.gz
+share/man/man3/mysql_stmt_error.3.gz
+share/man/man3/mysql_stmt_execute.3.gz
+share/man/man3/mysql_stmt_fetch.3.gz
+share/man/man3/mysql_stmt_fetch_column.3.gz
+share/man/man3/mysql_stmt_field_count.3.gz
+share/man/man3/mysql_stmt_free_result.3.gz
+share/man/man3/mysql_stmt_init.3.gz
+share/man/man3/mysql_stmt_insert_id.3.gz
+share/man/man3/mysql_stmt_more_results.3.gz
+share/man/man3/mysql_stmt_next_result.3.gz
+share/man/man3/mysql_stmt_num_rows.3.gz
+share/man/man3/mysql_stmt_param_count.3.gz
+share/man/man3/mysql_stmt_param_metadata.3.gz
+share/man/man3/mysql_stmt_prepare.3.gz
+share/man/man3/mysql_stmt_reset.3.gz
+share/man/man3/mysql_stmt_result_metadata.3.gz
+share/man/man3/mysql_stmt_row_seek.3.gz
+share/man/man3/mysql_stmt_row_tell.3.gz
+share/man/man3/mysql_stmt_send_long_data.3.gz
+share/man/man3/mysql_stmt_sqlstate.3.gz
+share/man/man3/mysql_stmt_store_result.3.gz
+share/man/man3/mysql_stmt_warning_count.3.gz
+share/man/man3/mysql_store_result.3.gz
+share/man/man3/mysql_thread_end.3.gz
+share/man/man3/mysql_thread_id.3.gz
+share/man/man3/mysql_thread_init.3.gz
+share/man/man3/mysql_use_result.3.gz
+share/man/man3/mysql_warning_count.3.gz
diff --git a/databases/mariadb1011-server/Makefile b/databases/mariadb1011-server/Makefile
new file mode 100644
index 000000000000..a30c91ba2b5e
--- /dev/null
+++ b/databases/mariadb1011-server/Makefile
@@ -0,0 +1,295 @@
+PORTNAME?=	mariadb
+PORTVERSION=	10.11.7
+CATEGORIES=	databases
+MASTER_SITES=	https://mirror.nodesdirect.com/${SITESDIR}/ \
+		https://mirror.one.com/${SITESDIR}/ \
+		https://ftp.nluug.nl/db/${SITESDIR}/ \
+		https://ftp.icm.edu.pl/pub/unix/database/${SITESDIR}/ \
+		https://mirror.truenetwork.ru/${SITESDIR}/ \
+		https://mirrors.aliyun.com/${SITESDIR}/ \
+		https://ftp.ubuntu-tw.org/mirror/${SITESDIR}/ \
+		https://mirror.kku.ac.th/${SITESDIR}/ \
+		https://espejito.fder.edu.uy/${SITESDIR}/ \
+		https://ftp.osuosl.org/pub/${SITESDIR}/ \
+		https://downloads.mariadb.org/rest-api/mariadb/${PORTVERSION}/
+PKGNAMESUFFIX?=	1011-server
+
+MAINTAINER=	brnrd@FreeBSD.org
+COMMENT?=	Multithreaded SQL database (server)
+WWW=		https://mariadb.org/
+
+LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/COPYING
+
+#EXPIRATION_DATE=	2028-02-01
+
+LIB_DEPENDS+=	libfmt.so:devel/libfmt \
+		liblz4.so:archivers/liblz4 \
+		libpcre2-8.so:devel/pcre2 \
+		libzstd.so:archivers/zstd
+
+# Ugly workaround for MariaDB/CMake library detection
+LDFLAGS+=	-L${LOCALBASE}/lib
+
+USES=		bison:build cmake:insource compiler:c++11-lib cpe iconv:translit libedit ncurses shebangfix ssl
+
+SUB_FILES=	pkg-message
+PKGMESSAGE=	${WRKDIR}/pkg-message
+
+USE_LDCONFIG=	${PREFIX}/lib/mysql
+SHEBANG_FILES=	scripts/*.sh support-files/*.sh
+SITESDIR=	mariadb/mariadb-${PORTVERSION}/source
+DOCSDIR=	${PREFIX}/share/doc/mysql
+
+MARIADB_USER?=		mysql
+MARIADB_GROUP?=		mysql
+MARIADB_DBDIR?=		/var/db/mysql
+MARIADB_RUNDIR?=	/var/run/mysql
+MARIADB_SOCK?=		mysql.sock
+MARIADB_LOGDIR?=	/var/log/mysql
+
+USERS=			${MARIADB_USER}
+GROUPS=			${MARIADB_GROUP}
+
+OPTIONS_SINGLE=		GSSAPI
+OPTIONS_SINGLE_GSSAPI=	GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT GSSAPI_NONE
+OPTIONS_DEFAULT=	GSSAPI_BASE
+
+.if ${PKGNAMESUFFIX:M*-server}
+# MySQL-Server options
+OPTIONS_DEFAULT+=	AWS_KEY_MGMT CONNECT_EXTRA HASHICORP_VAULT INNOBASE SPHINX SPIDER WSREP
+OPTIONS_GROUP=		COMPRESSION ENGINES GROONGA
+OPTIONS_DEFINE=		AWS_KEY_MGMT CONNECT_EXTRA DOCS HASHICORP_VAULT
+OPTIONS_DEFINE_amd64=	WSREP
+OPTIONS_DEFINE_aarch64=	WSREP
+OPTIONS_DEFINE_powerpc64le=	WSREP
+OPTIONS_DEFINE_powerpc64=	WSREP
+OPTIONS_DEFINE_riscv64=	WSREP
+OPTIONS_GROUP_COMPRESSION=	LZO SNAPPY
+OPTIONS_GROUP_ENGINES=	COLUMNSTORE INNOBASE MROONGA OQGRAPH ROCKSDB S3 SPHINX SPIDER
+OPTIONS_GROUP_GROONGA=	ZMQ MSGPACK
+OPTIONS_EXCLUDE_i386=	ROCKSDB
+
+AWS_KEY_MGMT_DESC=	AWS Encryption Key Management Plugin
+COLUMNSTORE_DESC=	Columnar storage egine
+CONNECT_EXTRA_DESC=	Enable ODBC and XML in CONNECT engine
+COMPRESSION_DESC=	Optional page compression
+ENGINES_DESC=	Optional MariaDB storage engines
+GROONGA_DESC=	Optional Mroonga features
+HASHICORP_VAULT_DESC=	Enable HashiCorp vault key-storage plugin
+INNOBASE_DESC=	InnoDB default engine
+MROONGA_DESC=	Mroonga Full Text Search engine
+MSGPACK_DESC=	MsgPack support
+OQGRAPH_DESC=	Open Query Graph Computation engine
+ROCKSDB_DESC=	RocksDB LSM engine
+S3_DESC=	S3 storage engine (Gamma)
+SPHINX_DESC=	SphinxSE engine
+SPIDER_DESC=	Partitioning and XA-transactions engine
+WSREP_DESC=	Build wsrep clustering
+ZMQ_DESC=	ZeroMQ support
+.endif
+
+CMAKE_ARGS+=	-DCMAKE_PREFIX_PATH=${PREFIX} \
+		-DINSTALL_DOCDIR="share/doc/mysql" \
+		-DINSTALL_DOCREADMEDIR="share/doc/mysql" \
+		-DINSTALL_INFODIR="info" \
+		-DINSTALL_LIBDIR="lib/mysql" \
+		-DINSTALL_MANDIR="share/man" \
+		-DINSTALL_MYSQLDATADIR="${MARIADB_DBDIR}" \
+		-DINSTALL_MYSQLSHAREDIR="share/mysql" \
+		-DINSTALL_MYSQLTESTDIR= \
+		-DINSTALL_PLUGINDIR="lib/mysql/plugin" \
+		-DINSTALL_SBINDIR="libexec" \
+		-DINSTALL_SCRIPTDIR="bin" \
+		-DINSTALL_SQLBENCHDIR= \
+		-DINSTALL_SUPPORTFILESDIR="share/mysql" \
+		-DINSTALL_SYSCONFDIR="${ETCDIR}" \
+		-DINSTALL_SYSCONF2DIR="${ETCDIR}/conf.d" \
+		-DINSTALL_UNIX_ADDRDIR="${MARIADB_RUNDIR}/${MARIADB_SOCK}" \
+		-DWITH_PCRE=system \
+		-DPCRE_LIBRARY_DIRS=${PREFIX}/lib \
+		-DWITH_LIBFMT=system \
+		-DLIBFMT_INCLUDE_DIR=${PREFIX}/include \
+		-DHAVE_SYSTEM_LIBFMT=yes \
+		-DWITH_SSL="${OPENSSLBASE}" \
+		-DGRN_WITH_LZ4=ON -DWITH_INNODB_LZ4=ON -DWITH_ROCKSDB_LZ4=ON \
+		-DCURSES_CURSES_LIBRARY="/usr/lib/libcurses.so" \
+		-DCURSES_FORM_LIBRARY="/usr/lib/libform.so" \
+		-DCURSES_CURSES_LIBRARY="/usr/lib/libncurses.so" \
+		-DKRB5_CONFIG="${KRB5CONFIG}" \
+		-DCURSES_NCURSES_LIBRARY="${NCURSESLIB}/libncurses.so" \
+		-DCOMPILATION_COMMENT="FreeBSD Ports" \
+		-DPLUGIN_AUTH_TEST_PLUGIN=NO
+CMAKE_OFF+=	CONC_WITH_UNIT_TESTS CONNECT_WITH_MONGO WITH_UNIT_TESTS
+CMAKE_ON+=	WITH_LIBWRAP WITHOUT_DOCS
+DISABLED_PLUGINS+=	AUTH_TEST_PLUGIN DAEMON_EXAMPLE DIALOG_EXAMPLES \
+		EXAMPLE EXAMPLE_KEY_MANAGEMENT FTEXAMPLE
+
+DATADIR=	${PREFIX}/share/mysql
+ETCDIR=		${PREFIX}/etc/mysql
+
+CONFLICTS_INSTALL=	mariadb10[0-57-9]-${PKGNAMESUFFIX:C/^[0-9]*-//}-* \
+			mysql[0-9]*-${PKGNAMESUFFIX:C/^[0-9]*-//}-* \
+			mysqlwsrep* \
+			percona[0-9]*-${PKGNAMESUFFIX:C/^[0-9]*-//}-*
+
+FASTMTX_CMAKE_BOOL=	WITH_FAST_MUTEXES
+GSSAPI_BASE_USES=	gssapi
+GSSAPI_HEIMDAL_USES=	gssapi:heimdal
+GSSAPI_MIT_USES=	gssapi:mit
+GSSAPI_NONE_CMAKE_ON=	-DPLUGIN_AUTH_GSSAPI_CLIENT=OFF
+OPTIONS_SUB=		yes
+SUB_LIST+=	MARIADB_RUNDIR="${MARIADB_RUNDIR}" \
+		MARIADB_SOCK="${MARIADB_SOCK}"
+
+.if ${PKGNAMESUFFIX:M*-client}
+# MySQL-Client part
+CMAKE_ON+=	CONC_WITH_MYSQLCOMPAT WITHOUT_SERVER
+CMAKE_OFF+=	WITH_WSREP
+USES+=		readline
+USE_LDCONFIG=	${PREFIX}/lib/mysql
+SUB_FILES+=	my.cnf.sample client.cnf.sample
+
+.else # ! ${PKGNAMESUFFIX:M*-client}
+# MySQL-Server part
+USES+=		mysql:1011m
+
+USE_LDCONFIG+=	${PREFIX}/lib/mysql/plugin
+USE_RC_SUBR=	mysql-server
+
+CMAKE_ON+=	CMAKE_SKIP_BUILD_RPATH WITH_EMBEDDED_SERVER
+CMAKE_OFF+=	WITH_CLIENT
+SUB_FILES+=	server.cnf.sample
+SUB_LIST+=	MARIADB_DBDIR="${MARIADB_DBDIR}" \
+		MARIADB_LOGDIR="${MARIADB_LOGDIR}" \
+		MARIADB_USER="${MARIADB_USER}"
+PLIST_SUB+=	MARIADB_LOGDIR="${MARIADB_LOGDIR}" \
+		MARIADB_USER="${MARIADB_USER}" \
+		MARIADB_GROUP="${MARIADB_GROUP}"
+
+.for ENGINE in ${OPTIONS_GROUP_ENGINES:NINNOBASE}
+${ENGINE}_CMAKE_OFF=	-DPLUGIN_${ENGINE}=NO
+${ENGINE}_CMAKE_ON=	-DPLUGIN_${ENGINE}=DYNAMIC
+.endfor
+AWS_KEY_MGMT_CMAKE_ON=	-DPLUGIN_AWS_KEY_MANAGEMENT=ON
+INNOBASE_VARS_OFF=	disabled_plugins+=INNOBASE
+#COLUMNSTORE_BROKEN=	ColumnStore engine build failure "fatal error: 'sys/prctl.h' file not found"
+CONNECT_EXTRA_LIB_DEPENDS=	libodbc.so:databases/unixODBC
+CONNECT_EXTRA_USE=		gnome=libxml2
+CONNECT_EXTRA_USES=		gnome
+CONNECT_EXTRA_CMAKE_BOOL=	CONNECT_WITH_LIBXML2 CONNECT_WITH_ODBC
+GSSAPI_NONE_VARS=	disabled_plugins+=AUTH_GSSAPI
+HASHICORP_VAULT_CMAKE_OFF=	-DPLUGIN_HASHICORP_KEY_MANAGEMENT=OFF
+HASHICORP_VAULT_LIB_DEPENDS=	libcurl.so:ftp/curl
+LZO_CMAKE_ON=		-DWITH_INNODB_LZO=ON
+LZO_CMAKE_OFF=		-DWITH_INNODB_LZO=OFF
+LZO_LIB_DEPENDS=	liblzo2.so:archivers/lzo2
+MSGPACK_LIB_DEPENDS=	libmsgpackc.so:devel/msgpack-c
+OQGRAPH_LIB_DEPENDS=	libboost_system.so:devel/boost-libs \
+			libJudy.so:devel/judy
+ROCKSDB_USES=		python
+ROCKSDB_CMAKE_ON=	-DPYTHON_SHEBANG=${PYTHON_CMD} -DWITH_ROCKSDB_zstd=ON
+S3_LIB_DEPENDS=		libcurl.so:ftp/curl
+SNAPPY_CMAKE_ON=	-DWITH_INNODB_SNAPPY=ON  -DWITH_ROCKSDB_snappy=ON
+SNAPPY_CMAKE_OFF=	-DWITH_INNODB_SNAPPY=OFF -DWITH_ROCKSDB_snappy=OFF
+SNAPPY_LIB_DEPENDS=	libsnappy.so:archivers/snappy
+WSREP_CMAKE_BOOL=	WITH_WSREP
+WSREP_LIB_DEPENDS=	libgalera.so:databases/galera26
+WSREP_RUN_DEPENDS=	bash:shells/bash \
+			rsync:net/rsync \
+			#stunnel:security/stunnel
+WSREP_SHEBANG_FILES=	bin/wsrep_sst_rsync
+ZMQ_LIB_DEPENDS=	libzmq.so:net/libzmq4
+
+.for PLUGIN in ${DISABLED_PLUGINS}
+CMAKE_ARGS+=		-DPLUGIN_${PLUGIN}=NO
+.endfor
+
+.endif # ${PKGNAMESUFFIX:M*-client}
+
+.include <bsd.port.options.mk>
+
+.if ${OPSYS} == FreeBSD
+SUB_LIST+=	LEGACY_LIMITS="@comment " MODERN_LIMITS=""
+.else
+SUB_LIST+=	LEGACY_LIMITS="" MODERN_LIMITS="@comment "
+.endif
+
+.if ${SSL_DEFAULT} != base && ${PORT_OPTIONS:MGSSAPI_BASE}
+GSSAPI_BASE_IGNORE=	GSSAPI_BASE is not compatible with OpenSSL from ports. Use other GSSAPI options or OpenSSL from base system
+.endif
+
+.if ${SSL_DEFAULT:Mlibressl*}
+CFLAGS+=	-Wno-incompatible-function-pointer-types
+.warning HELLO FROM MAKE LIBRESSL
+.endif
+
+.if ${ARCH} != amd64 && ${ARCH} != aarch64
+PLIST_SUB+=	WSREP="@comment "
+.endif
+
+post-patch:
+.if ${OPSYS} == DragonFly
+	${CP} ${WRKSRC}/cmake/os/FreeBSD.cmake \
+		${WRKSRC}/cmake/os/DragonFly.cmake
+.endif
+
+post-configure:
+	${REINPLACE_CMD} -Ee 's|(#define INCLUDE.*)"$$|\1 -I${PREFIX}/include"|' \
+		-e 's|(#define LIBS .*)"$$|\1 -L${PREFIX}/lib"|' \
+		${WRKSRC}/libmariadb/mariadb_config/mariadb_config.c
+	${REINPLACE_CMD} 's|%%LOCALBASE%%|${PREFIX}|' \
+		${WRKSRC}/scripts/mysql_config.sh
+
+pre-install:
+	${MKDIR} ${STAGEDIR}${ETCDIR}/conf.d
+
+.if ${PKGNAMESUFFIX:M*-client}
+post-install:
+	${INSTALL_DATA} ${WRKDIR}/my.cnf.sample ${STAGEDIR}${ETCDIR}/my.cnf.sample
+	${INSTALL_DATA} ${WRKDIR}/client.cnf.sample \
+		${STAGEDIR}${ETCDIR}/conf.d/client.cnf.sample
+	${RM} -r ${STAGEDIR}${DATADIR} \
+		${STAGEDIR}${PREFIX}/include/mysql/server \
+		${STAGEDIR}${ETCDIR}/init.d \
+		${STAGEDIR}${PREFIX}/lib/mysql/pkgconfig
+
+post-install-GSSAPI_NONE-off:
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/mysql/plugin/auth_gssapi_client.so
+
+.else # ! ${PKGNAMESUFFIX:M*-client}
+post-install:
+	${INSTALL_DATA} ${WRKDIR}/server.cnf.sample \
+		${STAGEDIR}${ETCDIR}/conf.d/server.cnf.sample
+	${MV} ${STAGEDIR}${PREFIX}/share/user_map.conf \
+		${STAGEDIR}${PREFIX}/etc/mysql/user_map.conf.sample
+	${MV} ${STAGEDIR}${PREFIX}/share/pam_user_map.so \
+		${STAGEDIR}${PREFIX}/lib/mysql/
+	${RM} -r ${STAGEDIR}${PREFIX}/share/mysql/policy \
+		${STAGEDIR}${PREFIX}/include/mysql/server/private \
+		${STAGEDIR}${PREFIX}/lib/mysql/pkgconfig \
+		${STAGEDIR}${PREFIX}/libexec/rcmysql \
+		${STAGEDIR}/suite \
+		${STAGEDIR}${ETCDIR}/init.d \
+		${STAGEDIR}${ETCDIR}/logrotate.d \
+		${STAGEDIR}${DOCSDIR}/COPYING
+	${MKDIR} ${STAGEDIR}${MARIADB_LOGDIR}
+	${SED} '/%%/d;/^@comment /d;s/^/@comment /' ${PORTSDIR}/${CATEGORIES:[1]}/${PORTNAME}${PKGNAMESUFFIX:S/-server/-client/}/pkg-plist \
+		>> ${TMPPLIST}
+
+post-install-MROONGA-on:
+	${MV} ${STAGEDIR}${PREFIX}/share/groonga ${STAGEDIR}${DOCSDIR}/
+	${RM}	${STAGEDIR}${DOCSDIR}/groonga/COPYING \
+		${STAGEDIR}${DATADIR}/mroonga/COPYING
+
+post-install-SPIDER-on:
+	${MV} ${STAGEDIR}${ETCDIR}/conf.d/spider.cnf \
+		${STAGEDIR}${ETCDIR}/conf.d/spider.cnf.sample
+
+post-install-WSREP-on:
+	${MV} ${STAGEDIR}${DATADIR}/wsrep.cnf \
+		${STAGEDIR}${ETCDIR}/conf.d/wsrep.cnf.sample
+
+.endif # ${PKGNAMESUFFIX:M*-client}
+
+.include <bsd.port.mk>
diff --git a/databases/mariadb1011-server/distinfo b/databases/mariadb1011-server/distinfo
new file mode 100644
index 000000000000..284ca03c1efb
--- /dev/null
+++ b/databases/mariadb1011-server/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1709979504
+SHA256 (mariadb-10.11.7.tar.gz) = 5239a245ed90517e96396605cd01ccd8f73cd7442d1b3076b6ffe258110e5157
+SIZE (mariadb-10.11.7.tar.gz) = 100584592
diff --git a/databases/mariadb1011-server/files/client.cnf.sample.in b/databases/mariadb1011-server/files/client.cnf.sample.in
new file mode 100644
index 000000000000..2513f6a04fb2
--- /dev/null
+++ b/databases/mariadb1011-server/files/client.cnf.sample.in
@@ -0,0 +1,52 @@
+# Options specific to client applications, see
+# https://mariadb.com/kb/en/configuring-mariadb-with-option-files/#client-option-groups
+
+# Options specific to all client programs
+[client]
+# port			= 3306 # inherited from %%ETCDIR%%/my.cnf
+# socket		= %%MARIADB_RUNDIR%%/%%MARIADB_SOCK%% # inherited from %%ETCDIR%%/my.cnf
+
+# Options specific to MariaDB client programs
+[client-mariadb]
+
+#
+## Options for specific client Tools
+#
+
+# Options read by `mysql`
+# Renamed from [mysql] starting with MariaDB 10.4.6.
+[mariadb-client]	Options read by mysql. Available starting with MariaDB 10.4.6.
+prompt			= \u@\h [\d]>\_
+no_auto_rehash
+
+# Options read by `mysqldump`
+# Renamed from [mysqldump] starting with MariaDB 10.4.6.
+[mariadb-dump]
+max_allowed_packet	= 256M
+quote_names
+quick
+
+# Options read by `mysqladmin`
+# Renamed from [mysqladmin] starting with MariaDB 10.4.6.
+[mariadb-admin]
+
+# Options read by `mysqlbinlog` 
+# Renamed from [mysqlbinlog] starting with MariaDB 10.4.6.
+[mariadb-binlog]
+
+# Options read by `mysqlcheck`
+# Renamed from [mysqlcheck] starting with MariaDB 10.4.6.
+[mariadb-check]
+
+# Options read by `mysqlimport`
+# Renamed from [mysqlimport] starting with MariaDB 10.4.6.
+[mariadb-import]
+
+# Options read by `mysqlshow`
+# Renamed from [mysqlshow] starting with MariaDB 10.4.6.
+[mariadb-show]
+
+# Options read by `mysqlslap`
+# Renamed from [mysqlslap]  starting with MariaDB 10.4.6.
+[mariadb-slap]
+
diff --git a/databases/mariadb104-server/files/my.cnf.sample.in b/databases/mariadb1011-server/files/my.cnf.sample.in
index 15dbc7e64da8..15dbc7e64da8 100644
--- a/databases/mariadb104-server/files/my.cnf.sample.in
+++ b/databases/mariadb1011-server/files/my.cnf.sample.in
diff --git a/databases/mariadb1011-server/files/mysql-server.in b/databases/mariadb1011-server/files/mysql-server.in
new file mode 100644
index 000000000000..e494dee09e92
--- /dev/null
+++ b/databases/mariadb1011-server/files/mysql-server.in
@@ -0,0 +1,149 @@
+#!/bin/sh
+
+# PROVIDE: mysql
+# REQUIRE: LOGIN
+# KEYWORD: shutdown
+#
+# Add the following line to /etc/rc.conf to enable mysql:
+# mysql_(instance_)?enable (bool):	Set to "NO" by default.
+#			Set it to "YES" to enable MySQL.
+%%LEGACY_LIMITS%%# mysql_(instance_)?limits (bool):	Set to "NO" by default.
+%%LEGACY_LIMITS%%#			Set it to yes to run `limits -e -U mysql`
+%%LEGACY_LIMITS%%#			just before mysql starts.
+# mysql_(instance_)?dbdir (str):	Default to "%%MARIADB_DBDIR%%"
+#			Base database directory.
+# mysql_(instance_)?args (str):	Custom additional arguments to be passed
+#			to mysqld_safe (default empty).
+# mysql_(instance_)?pidfile (str): Custom PID file path and name.
+#			Default to "${mysql_dbdir}/${hostname}.pid".
+# mysql_(instance_)?user (str): User to run mysqld as
+#			Default to "%%MARIADB_USER%%" created by the port
+# mysql_(instance_)?optfile (str): Server-specific option file.
+#			Default to "${mysql_dbdir}/my.cnf".
+# mysql_(instance)?rundir (str):	Default to "%%MARIADB_RUNDIR%%"
+# mysql_instances (str): Set to "" by default. 
+#			If defined, list of instances to enable
+
+. /etc/rc.subr
+
+name="mysql"
+rcvar=mysql_enable
+
+load_rc_config $name
+
+: ${mysql_enable="NO"}
+%%LEGACY_LIMITS%%: ${mysql_limits="NO"}
+: ${mysql_user="%%MARIADB_USER%%"}
+%%LEGACY_LIMITS%%mysql_limits_args="-e -U ${mysql_user}"
+: ${mysql_dbdir="%%MARIADB_DBDIR%%"}
+: ${mysql_optfile="%%ETCDIR%%/my.cnf"}
+: ${mysql_rundir="%%MARIADB_RUNDIR%%"}
+
+command="/usr/sbin/daemon"
+procname="%%PREFIX%%/libexec/mariadbd"
+start_precmd="${name}_prestart"
+start_postcmd="${name}_poststart"
+
+if [ -n "$2" ]; then
+	instance="$2"
+	load_rc_config ${name}_${instance}
+	case "$mysql_instances" in
+	"$2 "*|*" $2 "*|*" $2"|"$2")
+		eval mysql_args="\${mysql_${instance}_args:-\"${mysql_args}\"}"
+		eval mysql_dbdir="\${mysql_${instance}_dbdir:-\"%%MARIADB_DBDIR%%_${instance}\"}"
+		%%LEGACY_LIMITS%%eval mysql_limits="\${mysql_${instance}_limits:-\"${mysql_limits}\"}"
+		eval mysql_user="\${mysql_${instance}_user:-\"${mysql_user}\"}"
+		%%LEGACY_LIMITS%%eval mysql_limits_args="\${mysql_${instance}_limits_args:-\"-e -U $mysql_user\"}"
+		eval mysql_socket="\${mysql_${instance}_socket:-\"%%MARIADB_RUNDIR%%_${instance}/%%MARIADB_SOCK%%\"}"
+		eval mysql_optfile="\${mysql_${instance}_optfile:-\"%%ETCDIR%%_${instance}/my.cnf\"}"
+		eval mysql_pidfile="\${mysql_${instance}_pidfile:-\"%%MARIADB_RUNDIR%%_${instance}/mysqld.pid\"}"
+	;;
+	*)
+		err 1 "$2 not found in mysql_instances" ;;
+	esac
+else
+	if [ -n "${mysql_instances}" -a -n "$1" ]; then
+		for instance in ${mysql_instances}; do
+			eval _enable="\${mysql_${instance}_enable}"
+			case "${_enable:-${mysql_enable}}" in
+			[Nn][Oo]|[Ff][Aa][Ll][Ss][Ee]|[Oo][Ff][Ff]|0)
+				continue
+			;;
+			[Yy][Ee][Ss]|[Tt][Rr][Uu][Ee]|[Oo][Nn]|1)
+			;;
+			*)
+				if [ -z "$_enable" ]; then
+					_var=mysql_enable
+				else
+					_var=mysql_${instance}_enable
+				fi
+				warn "Bad value" \
+					"'${_enable:-${mysql_enable}}'" \
+					"for ${_var}. " \
+					"Instance ${instance} skipped."
+				continue
+			;;
+			esac
+			echo "===> mysql instance: ${instance}"
+			if %%PREFIX%%/etc/rc.d/mysql-server $1 ${instance}; then
+				success="${instance} ${success}"
+			else
+				failed="${instance} (${retcode}) ${failed}"
+			fi
+		done
+		exit 0
+	else
+		mysql_pidfile=${mysql_pidfile:-"%%MARIADB_RUNDIR%%/mysqld.pid"}
+	fi
+fi
+
+pidfile=$mysql_pidfile
+mysql_install_db="%%PREFIX%%/bin/mariadb-install-db"
+mysql_install_db_args="--basedir=%%PREFIX%% --datadir=${mysql_dbdir} --force"
+command_args="-c -f %%PREFIX%%/bin/mariadbd-safe --defaults-extra-file=${mysql_optfile} --user=${mysql_user} --datadir=${mysql_dbdir} --pid-file=${pidfile} ${mysql_socket:+--socket=${mysql_socket}} ${mysql_args}"
+
+mysql_create_auth_tables()
+{
+	eval $mysql_install_db $mysql_install_db_args
+        [ $? -eq 0 ] && chown -R ${mysql_user}:$(id -gn $mysql_user) ${mysql_dbdir}
+}
+
+mysql_prestart()
+{
+	local dir
+	for dir in /etc /usr/local/etc /etc/mysql /var/db/mysql; do
+		if [ -f "${dir}/my.cnf" ]; then
+			echo "Please merge existing ${dir}/my.cnf file with %%ETCDIR%%/conf.d/server.cnf"
+			return 1
+		fi
+	done
+	if [ ! -d "${mysql_dbdir}/mysql/." ]; then
+		mysql_create_auth_tables || return 1
+	fi
+	mysql_group="`/usr/bin/id -gn ${mysql_user}`"
+	[ "${mysql_socket}" = "" ] && mysql_rundir="%%MARIADB_RUNDIR%%" || mysql_rundir="`/usr/bin/dirname ${mysql_socket}`"
+	if [ ! -d "${mysql_rundir}" ]; then
+		install -d -o ${mysql_user} -g ${mysql_group} "${mysql_rundir}"
+	fi
+%%LEGACY_LIMITS%%	if checkyesno mysql_limits; then
+%%LEGACY_LIMITS%%		eval `/usr/bin/limits ${mysql_limits_args}` 2>/dev/null
+%%LEGACY_LIMITS%%	else
+%%LEGACY_LIMITS%%		return 0
+%%LEGACY_LIMITS%%	fi
+%%MODERN_LIMITS%%	return 0
+	if [ ! -d "${mysql_rundir}" ]; then
+		install -d -u${mysql_user} -g$(id -gn $mysql_user) -m755 ${mysql_rundir}
+	fi
+}
+
+mysql_poststart()
+{
+	local timeout=15
+	while [ ! -f "${pidfile}" -a ${timeout} -gt 0 ]; do
+		timeout=$(( timeout - 1 ))
+		sleep 1
+	done
+	return 0
+}
+
+run_rc_command "$1"
diff --git a/databases/mariadb1011-server/files/patch-include_my__cpu.h b/databases/mariadb1011-server/files/patch-include_my__cpu.h
new file mode 100644
index 000000000000..e205cbfa05e2
--- /dev/null
+++ b/databases/mariadb1011-server/files/patch-include_my__cpu.h
@@ -0,0 +1,48 @@
+--- include/my_cpu.h.orig	2021-09-27 13:32:48 UTC
++++ include/my_cpu.h
+@@ -23,7 +23,8 @@
+   The defines are the same ones used by the linux kernel
+ */
+ 
+-#ifdef _ARCH_PWR8
++#if defined(_ARCH_PWR8)
++#if defined(linux)
+ #include <sys/platform/ppc.h>
+ /* Very low priority */
+ #define HMT_very_low() __ppc_set_ppr_very_low()
+@@ -37,6 +38,22 @@
+ #define HMT_medium_high() __ppc_set_ppr_med_high()
+ /* High priority */
+ #define HMT_high() asm volatile("or 3,3,3")
++#elif defined(__FreeBSD__)
++#include <sys/types.h>
++#include <sys/sysctl.h>
++/* Very low priority */
++#define HMT_very_low() __asm__ volatile ("or 31,31,31")
++/* Low priority */
++#define HMT_low() __asm__ volatile ("or 1,1,1")
++/* Medium low priority */
++#define HMT_medium_low() __asm__ volatile ("or 6,6,6")
++/* Medium priority */
++#define HMT_medium() __asm__ volatile ("or 2,2,2")
++/* Medium high priority */
++#define HMT_medium_high() __asm__ volatile ("or 5,5,5")
++/* High priority */
++#define HMT_high() asm volatile("or 3,3,3")
++#endif
+ #else
+ #define HMT_very_low()
+ #define HMT_low()
+@@ -81,7 +98,12 @@ static inline void MY_RELAX_CPU(void)
+   __asm__ __volatile__ ("pause");
+ #endif
+ #elif defined(_ARCH_PWR8)
++#if defined(linux)
+   __ppc_get_timebase();
++#elif defined(__FreeBSD__)
++  uint64_t __tb;
++  __asm__ volatile ("mfspr %0, 268" : "=r" (__tb));
++#endif
+ #elif defined __GNUC__ && (defined __arm__ || defined __aarch64__)
+   /* Mainly, prevent the compiler from optimizing away delay loops */
+ #ifdef _aarch64_
diff --git a/databases/mariadb1011-server/files/patch-mysys__ssl_openssl.c b/databases/mariadb1011-server/files/patch-mysys__ssl_openssl.c
new file mode 100644
index 000000000000..0ef6a3c29540
--- /dev/null
+++ b/databases/mariadb1011-server/files/patch-mysys__ssl_openssl.c
@@ -0,0 +1,14 @@
+--- mysys_ssl/openssl.c.orig	2024-02-01 17:44:37 UTC
++++ mysys_ssl/openssl.c
+@@ -30,6 +30,11 @@ int check_openssl_compatibility()
+ {
+   return 0;
+ }
++#elif defined(LIBRESSL_VERSION_NUMBER)
++int check_openssl_compatibility()
++{
++  return 1;
++}
+ #else
+ #include <openssl/evp.h>
+ 
diff --git a/databases/mariadb1011-server/files/patch-mysys_crc32_crc32c.cc b/databases/mariadb1011-server/files/patch-mysys_crc32_crc32c.cc
new file mode 100644
index 000000000000..445fd0e97865
--- /dev/null
+++ b/databases/mariadb1011-server/files/patch-mysys_crc32_crc32c.cc
@@ -0,0 +1,24 @@
+--- mysys/crc32/crc32c.cc.orig	2021-08-04 18:00:35 UTC
++++ mysys/crc32/crc32c.cc
+@@ -543,6 +543,21 @@ static int arch_ppc_probe(void) {
+ 
+   return arch_ppc_crc32;
+ }
++#elif __FreeBSD__
++#include <machine/cpu.h>
++#include <sys/auxv.h>
++#include <sys/elf_common.h>
++static int arch_ppc_probe(void) {
++  unsigned long cpufeatures;
++  arch_ppc_crc32 = 0;
++
++#if defined(__powerpc64__)
++  elf_aux_info(AT_HWCAP2, &cpufeatures, sizeof(cpufeatures));
++  if (cpufeatures & PPC_FEATURE2_HAS_VEC_CRYPTO) arch_ppc_crc32 = 1;
++#endif  /* __powerpc64__ */
++
++  return arch_ppc_crc32;
++}
+ #endif  // __linux__
+ #endif
+ 
diff --git a/databases/mariadb1011-server/files/patch-scripts_mysql__config.sh b/databases/mariadb1011-server/files/patch-scripts_mysql__config.sh
new file mode 100644
index 000000000000..f8321be63ecc
--- /dev/null
+++ b/databases/mariadb1011-server/files/patch-scripts_mysql__config.sh
@@ -0,0 +1,10 @@
+--- scripts/mysql_config.sh.orig	2021-07-07 20:25:20 UTC
++++ scripts/mysql_config.sh
+@@ -88,6 +88,7 @@ fi
+ # Create options 
+ libs="-L$pkglibdir @RPATH_OPTION@ @LIBS_FOR_CLIENTS@"
+ embedded_libs="-L$pkglibdir @RPATH_OPTION@ @EMB_LIBS_FOR_CLIENTS@"
++embedded_libs="$embedded_libs -%%LOCALBASE%%/lib "
+ 
+ include="-I$pkgincludedir"
+ if [ "$basedir" != "/usr" ]; then
diff --git a/databases/mariadb1011-server/files/patch-sql_mysqld.cc b/databases/mariadb1011-server/files/patch-sql_mysqld.cc
new file mode 100644
index 000000000000..e433bfc7d450
--- /dev/null
+++ b/databases/mariadb1011-server/files/patch-sql_mysqld.cc
@@ -0,0 +1,20 @@
+--- sql/mysqld.cc.orig	2021-06-15 10:16:51 UTC
++++ sql/mysqld.cc
+@@ -205,7 +205,7 @@ typedef fp_except fp_except_t;
+ 
+ inline void setup_fpu()
+ {
+-#if defined(__FreeBSD__) && defined(HAVE_IEEEFP_H) && !defined(HAVE_FEDISABLEEXCEPT)
++#if defined(__FreeBSD__) && defined(HAVE_IEEEFP_H) && !defined(HAVE_FEDISABLEEXCEPT) && defined(FP_X_INV)
+   /* We can't handle floating point exceptions with threads, so disable
+      this on freebsd
+      Don't fall for overflow, underflow,divide-by-zero or loss of precision.
+@@ -218,7 +218,7 @@ inline void setup_fpu()
+   fpsetmask(~(FP_X_INV |             FP_X_OFL | FP_X_UFL | FP_X_DZ |
+               FP_X_IMP));
+ #endif /* FP_X_DNML */
+-#endif /* __FreeBSD__ && HAVE_IEEEFP_H && !HAVE_FEDISABLEEXCEPT */
++#endif /* __FreeBSD__ && HAVE_IEEEFP_H && !HAVE_FEDISABLEEXCEPT && FP_X_INV */
+ 
+ #ifdef HAVE_FEDISABLEEXCEPT
+   fedisableexcept(FE_ALL_EXCEPT);
diff --git a/databases/mariadb1011-server/files/patch-storage_columnstore_columnstore_utils_common_threadnaming.cpp b/databases/mariadb1011-server/files/patch-storage_columnstore_columnstore_utils_common_threadnaming.cpp
new file mode 100644
index 000000000000..26ea3d16ecd7
--- /dev/null
+++ b/databases/mariadb1011-server/files/patch-storage_columnstore_columnstore_utils_common_threadnaming.cpp
@@ -0,0 +1,24 @@
+--- storage/columnstore/columnstore/utils/common/threadnaming.cpp.orig	2022-05-18 08:34:17 UTC
++++ storage/columnstore/columnstore/utils/common/threadnaming.cpp
+@@ -22,13 +22,21 @@ namespace utils
+ {
+ void setThreadName(const char* threadName)
+ {
++#ifdef __FreeBSD__
++  pthread_set_name_np(pthread_self(), threadName);
++#else
+   prctl(PR_SET_NAME, threadName, 0, 0, 0);
++#endif
+ }
+ 
+ std::string getThreadName()
+ {
+   char buf[32];
++#ifdef __FreeBSD__
++  pthread_get_name_np(pthread_self(), buf, sizeof(buf));
++#else
+   prctl(PR_GET_NAME, buf, 0, 0, 0);
++#endif
+   return std::string(buf);
+ }
+ }  // namespace utils
diff --git a/databases/mariadb1011-server/files/patch-storage_rocksdb_rocksdb_port_jemalloc__helper.h b/databases/mariadb1011-server/files/patch-storage_rocksdb_rocksdb_port_jemalloc__helper.h
new file mode 100644
index 000000000000..dab7177b65b8
--- /dev/null
+++ b/databases/mariadb1011-server/files/patch-storage_rocksdb_rocksdb_port_jemalloc__helper.h
@@ -0,0 +1,13 @@
+--- storage/rocksdb/rocksdb/port/jemalloc_helper.h.orig	2020-06-23 15:10:17 UTC
++++ storage/rocksdb/rocksdb/port/jemalloc_helper.h
+@@ -26,6 +26,10 @@
+ #include <jemalloc/jemalloc.h>
+ #endif
+ 
++#ifdef __FreeBSD__
++#define JEMALLOC_USABLE_SIZE_CONST const
++#endif
++
+ #ifndef JEMALLOC_CXX_THROW
+ #define JEMALLOC_CXX_THROW
+ #endif
diff --git a/databases/mariadb1011-server/files/patch-tpool_CMakeLists.txt b/databases/mariadb1011-server/files/patch-tpool_CMakeLists.txt
new file mode 100644
index 000000000000..5ab7d5de3dd2
--- /dev/null
+++ b/databases/mariadb1011-server/files/patch-tpool_CMakeLists.txt
@@ -0,0 +1,8 @@
+--- tpool/CMakeLists.txt.orig	2020-06-23 15:10:18 UTC
++++ tpool/CMakeLists.txt
+@@ -1,4 +1,5 @@
+ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR} ${PROJECT_SOURCE_DIR}/include)
++ADD_DEFINITIONS(-fPIC)
+ IF(WIN32)
+   SET(EXTRA_SOURCES tpool_win.cc aio_win.cc)
+ ELSEIF(CMAKE_SYSTEM_NAME STREQUAL "Linux")
diff --git a/databases/mariadb1011-server/files/pkg-message.in b/databases/mariadb1011-server/files/pkg-message.in
new file mode 100644
index 000000000000..8589380d09d6
--- /dev/null
+++ b/databases/mariadb1011-server/files/pkg-message.in
@@ -0,0 +1,28 @@
+[
+{ type: install
+  message: <<EOM
+MariaDB respects hier(7) and doesn't check /etc and /etc/mysql for
+my.cnf. Please move existing my.cnf files from those paths to
+%%PREFIX%%/etc/mysql or %%PREFIX%%/etc. Sample
+configuration files are provided in %%PREFIX%%/etc/mysql
+and %%PREFIX%%/etc/mysql/conf.d.
+The rc(8) script no longer uses /var/db/mysql/my.cnf for configuration
+nor /var/db/mysql for logs and PID-file.
+
+This port does NOT include the mytop perl script, this is included in
+the MariaDB tarball but the most recent version can be found in the
+databases/mytop port
+
+%%WSREP%%Using wsrep clustering requires adding a configuration file.
+%%WSREP%%Copy %%PREFIX%%/etc/mysql/conf.d/wsrep.conf.sample to
+%%WSREP%%%%PREFIX%%/etc/mysql/conf.d/wsrep.conf and change what you need there.
+EOM
+}
+{ type: upgrade
+  message: <<EOM
+Remember to run mariadb-upgrade (with the optional --datadir=<dbdir> flag)
+the first time you start the MySQL server after an upgrade from an
+earlier version.
+EOM
+}
+]
diff --git a/databases/mariadb1011-server/files/server.cnf.sample.in b/databases/mariadb1011-server/files/server.cnf.sample.in
new file mode 100644
index 000000000000..9e84965c7679
--- /dev/null
+++ b/databases/mariadb1011-server/files/server.cnf.sample.in
@@ -0,0 +1,60 @@
+# Options specific to server applications, see
+# https://mariadb.com/kb/en/configuring-mariadb-with-option-files/#server-option-groups
+
+# Options specific to all server programs
+[server]
+
+# Options specific to MariaDB server programs
+[server-mariadb]
+
+#
+# Options for specific server tools
+#
+
+[mysqld]
+user				= %%MARIADB_USER%%
+# port				= 3306 # inherited from %%ETCDIR%%/my.cnf
+# socket			= %%MARIADB_RUNDIR%%/mysql.sock # inherited from %%ETCDIR%%/my.cnf
+bind-address			= 127.0.0.1
+basedir				= %%PREFIX%%
+datadir				= %%MARIADB_DBDIR%%
+net_retry_count			= 16384
+log_error			= %%MARIADB_LOGDIR%%/mysqld.err
+# [mysqld] configuration for ZFS
+# From https://www.percona.com/resources/technical-presentations/zfs-mysql-percona-technical-webinar
+# Create separate datasets for data and logs, eg
+# zroot/mysql      compression=on recordsize=128k atime=off
+# zroot/mysql/data recordsize=16k
+# zroot/mysql/logs
+# datadir 			= %%MARIADB_DBDIR%%/data
+# innodb_log_group_home_dir	= %%MARIADB_DBDIR%%/log
+# audit_log_file		= %%MARIADB_DBDIR%%/log/audit.log
+# general_log_file		= %%MARIADB_DBDIR%%/log/general.log
+# log_bin			= %%MARIADB_DBDIR%%/log/mysql-bin
+# relay_log			= %%MARIADB_DBDIR%%/log/relay-log
+# slow_query_log_file		= %%MARIADB_DBDIR%%/log/slow.log
+# innodb_doublewrite		= 0
+# innodb_flush_method		= O_DSYNC
+
+# Options read by `mariadb_safe`
+# Renamed from [mysqld_safe] starting with MariaDB 10.4.6.
+[mariadb-safe]
+
+# Options read my `mariabackup`
+[mariabackup]
+
+# Options read by `mysql_upgrade`
+# Renamed from [mysql_upgrade] starting with MariaDB 10.4.6.
+[mariadb-upgrade]
+
+# Specific options read by the mariabackup SST method
+[sst]
+
+# Options read by `mysqlbinlog`
+# Renamed from [mysqlbinlog] starting with MariaDB 10.4.6.
+[mariadb-binlog]
+
+# Options read by `mysqladmin`
+# Renamed from [mysqladmin] starting with MariaDB 10.4.6.
+[mariadb-admin]
+
diff --git a/databases/mariadb1011-server/pkg-descr b/databases/mariadb1011-server/pkg-descr
new file mode 100644
index 000000000000..f76c83728f01
--- /dev/null
+++ b/databases/mariadb1011-server/pkg-descr
@@ -0,0 +1,12 @@
+MariaDB is a database server that offers drop-in replacement functionality
+for MySQL. MariaDB is built by some of the original authors of MySQL, with
+assistance from the broader community of Free and open source software
+developers. In addition to the core functionality of MySQL, MariaDB offers
+a rich set of feature enhancements including alternate storage engines,
+server optimizations, and patches.
+
+MariaDB is primarily driven by developers at Monty Program, a company
+founded by Michael "Monty" Widenius, the original author of MySQL, but
+this is not the whole story about MariaDB. On the "About MariaDB" page you
+will find more information about all participants in the MariaDB community,
+including storage engines XtraDB and PBXT.
diff --git a/databases/mariadb1011-server/pkg-plist b/databases/mariadb1011-server/pkg-plist
new file mode 100644
index 000000000000..cbe019bf499e
--- /dev/null
+++ b/databases/mariadb1011-server/pkg-plist
@@ -0,0 +1,536 @@
+bin/aria_chk
+bin/aria_dump_log
+bin/aria_ftdump
+bin/aria_pack
+bin/aria_read_log
+%%S3%%bin/aria_s3_copy
+%%INNOBASE%%bin/innochecksum
+%%INNOBASE%%bin/mariabackup
+bin/mariadb-backup
+bin/mariadb-client-test
+bin/mariadb-client-test-embedded
+bin/mariadb-dumpslow
+bin/mariadb-embedded
+bin/mariadb-fix-extensions
+bin/mariadb-install-db
+%%ROCKSDB%%bin/mariadb-ldb
+bin/mariadb-secure-installation
+bin/mariadb-test-embedded
+bin/mariadb-tzinfo-to-sql
+bin/mariadb-upgrade
+bin/mariadbd-multi
+bin/mariadbd-safe
+bin/mariadbd-safe-helper
+%%INNOBASE%%bin/mbstream
+bin/myisam_ftdump
+bin/myisamchk
+bin/myisamlog
+bin/myisampack
+@comment bin/mytop
+%%ROCKSDB%%bin/myrocks_hotbackup
+bin/mysql_client_test
+bin/mysql_client_test_embedded
+bin/mysql_embedded
+bin/mysql_fix_extensions
+bin/mysql_install_db
+%%ROCKSDB%%bin/mysql_ldb
+bin/mysql_plugin
+bin/mysql_secure_installation
+bin/mysql_tzinfo_to_sql
+bin/mysql_upgrade
+bin/mysql_waitpid
+bin/mysqld_multi
+bin/mysqld_safe
+bin/mysqld_safe_helper
+bin/mysqldumpslow
+bin/mysqltest_embedded
+bin/perror
+bin/resolve_stack_dump
+bin/resolveip
+%%ROCKSDB%%bin/sst_dump
+bin/test-connect-t
+%%WSREP%%bin/wsrep_sst_common
+%%WSREP%%bin/wsrep_sst_mariabackup
+%%WSREP%%bin/wsrep_sst_mysqldump
+%%WSREP%%bin/wsrep_sst_rsync
+%%WSREP%%bin/wsrep_sst_rsync_wan
+%%WSREP%%bin/wsrep_sst_backup
+@comment %%ETCDIR%%/conf.d/client.cnf
+%%ETCDIR%%/conf.d/enable_encryption.preset
+%%HASHICORP_VAULT%%%%ETCDIR%%/conf.d/hashicorp_key_management.cnf
+%%ETCDIR%%/conf.d/mysql-clients.cnf
+%%ETCDIR%%/conf.d/provider_bzip2.cnf
+%%ETCDIR%%/conf.d/provider_lz4.cnf
+%%ETCDIR%%/conf.d/provider_lzma.cnf
+%%LZO%%%%ETCDIR%%/conf.d/provider_lzo.cnf
+%%SNAPPY%%%%ETCDIR%%/conf.d/provider_snappy.cnf
+%%S3%%%%ETCDIR%%/conf.d/s3.cnf
+@sample %%ETCDIR%%/conf.d/server.cnf.sample
+%%SPIDER%%@sample %%ETCDIR%%/conf.d/spider.cnf.sample
+%%WSREP%%%%ETCDIR%%/conf.d/wsrep.cnf.sample
+@comment %%ETCDIR%%/my.cnf
+@comment %%ETCDIR%%/server.cnf
+@sample %%ETCDIR%%/user_map.conf.sample
+include/mysql/server/big_endian.h
+include/mysql/server/byte_order_generic.h
+include/mysql/server/byte_order_generic_x86.h
+include/mysql/server/byte_order_generic_x86_64.h
+include/mysql/server/decimal.h
+include/mysql/server/errmsg.h
+include/mysql/server/handler_ername.h
+include/mysql/server/handler_state.h
+include/mysql/server/json_lib.h
+include/mysql/server/keycache.h
+include/mysql/server/little_endian.h
+include/mysql/server/m_ctype.h
+include/mysql/server/m_string.h
+include/mysql/server/ma_dyncol.h
+include/mysql/server/mariadb_capi_rename.h
+include/mysql/server/my_alloc.h
+include/mysql/server/my_alloca.h
+include/mysql/server/my_attribute.h
+include/mysql/server/my_byteorder.h
+include/mysql/server/my_compiler.h
+include/mysql/server/my_config.h
+include/mysql/server/my_dbug.h
+include/mysql/server/my_decimal_limits.h
+include/mysql/server/my_dir.h
+include/mysql/server/my_getopt.h
+include/mysql/server/my_global.h
+include/mysql/server/my_list.h
+include/mysql/server/my_net.h
+include/mysql/server/my_pthread.h
+include/mysql/server/my_sys.h
+include/mysql/server/my_valgrind.h
+include/mysql/server/my_xml.h
+include/mysql/server/mysql.h
+include/mysql/server/mysql/auth_dialog_client.h
+include/mysql/server/mysql/client_plugin.h
+include/mysql/server/mysql/plugin.h
+include/mysql/server/mysql/plugin_audit.h
+include/mysql/server/mysql/plugin_auth.h
+include/mysql/server/mysql/plugin_auth_common.h
+include/mysql/server/mysql/plugin_data_type.h
+include/mysql/server/mysql/plugin_encryption.h
+include/mysql/server/mysql/plugin_ftparser.h
+include/mysql/server/mysql/plugin_function.h
+include/mysql/server/mysql/plugin_password_validation.h
+include/mysql/server/mysql/psi/mysql_file.h
+include/mysql/server/mysql/psi/mysql_idle.h
+include/mysql/server/mysql/psi/mysql_mdl.h
+include/mysql/server/mysql/psi/mysql_memory.h
+include/mysql/server/mysql/psi/mysql_ps.h
+include/mysql/server/mysql/psi/mysql_socket.h
+include/mysql/server/mysql/psi/mysql_sp.h
+include/mysql/server/mysql/psi/mysql_stage.h
+include/mysql/server/mysql/psi/mysql_statement.h
+include/mysql/server/mysql/psi/mysql_table.h
+include/mysql/server/mysql/psi/mysql_thread.h
+include/mysql/server/mysql/psi/mysql_transaction.h
+include/mysql/server/mysql/psi/psi.h
+include/mysql/server/mysql/psi/psi_abi_v0.h
+include/mysql/server/mysql/psi/psi_abi_v1.h
+include/mysql/server/mysql/psi/psi_abi_v2.h
+include/mysql/server/mysql/psi/psi_base.h
+include/mysql/server/mysql/psi/psi_memory.h
+include/mysql/server/mysql/service_base64.h
+include/mysql/server/mysql/service_debug_sync.h
+include/mysql/server/mysql/service_encryption.h
+include/mysql/server/mysql/service_encryption_scheme.h
+include/mysql/server/mysql/service_json.h
+include/mysql/server/mysql/service_kill_statement.h
+include/mysql/server/mysql/service_logger.h
+include/mysql/server/mysql/service_md5.h
+include/mysql/server/mysql/service_my_crypt.h
+include/mysql/server/mysql/service_my_print_error.h
+include/mysql/server/mysql/service_my_snprintf.h
+include/mysql/server/mysql/service_progress_report.h
+include/mysql/server/mysql/service_sha1.h
+include/mysql/server/mysql/service_sha2.h
+include/mysql/server/mysql/service_thd_alloc.h
+include/mysql/server/mysql/service_thd_autoinc.h
+include/mysql/server/mysql/service_thd_error_context.h
+include/mysql/server/mysql/service_thd_mdl.h
+include/mysql/server/mysql/service_thd_rnd.h
+include/mysql/server/mysql/service_thd_specifics.h
+include/mysql/server/mysql/service_thd_timezone.h
+include/mysql/server/mysql/service_thd_wait.h
+include/mysql/server/mysql/service_sql.h
+%%WSREP%%include/mysql/server/mysql/service_wsrep.h
+include/mysql/server/mysql/services.h
+include/mysql/server/mysql_com.h
+include/mysql/server/mysql_com_server.h
+include/mysql/server/mysql_embed.h
+include/mysql/server/mysql_time.h
+include/mysql/server/mysql_version.h
+include/mysql/server/mysqld_ername.h
+include/mysql/server/mysqld_error.h
+include/mysql/server/pack.h
+include/mysql/server/sql_common.h
+include/mysql/server/sql_state.h
+include/mysql/server/sslopt-case.h
+include/mysql/server/sslopt-longopts.h
+include/mysql/server/sslopt-vars.h
+include/mysql/server/typelib.h
+lib/mysql/libmariadbd.a
+lib/mysql/libmariadbd.so
+lib/mysql/libmariadbd.so.19
+lib/mysql/libmysqld.a
+lib/mysql/libmysqld.so
+lib/mysql/pam_user_map.so
+lib/mysql/plugin/adt_null.so
+lib/mysql/plugin/auth_0x0100.so
+lib/mysql/plugin/auth_ed25519.so
+@comment lib/mysql/plugin/auth_gssapi_client.so
+%%NO_GSSAPI_NONE%%lib/mysql/plugin/auth_gssapi.so
+lib/mysql/plugin/auth_pam.so
+lib/mysql/plugin/auth_pam_tool_dir/auth_pam_tool
+lib/mysql/plugin/auth_pam_v1.so
+lib/mysql/plugin/debug_key_management.so
+lib/mysql/plugin/disks.so
+lib/mysql/plugin/file_key_management.so
+lib/mysql/plugin/func_test.so
+lib/mysql/plugin/ha_archive.so
+lib/mysql/plugin/ha_blackhole.so
+lib/mysql/plugin/ha_connect.so
+lib/mysql/plugin/ha_federated.so
+lib/mysql/plugin/ha_federatedx.so
+%%MROONGA%%lib/mysql/plugin/ha_mroonga.so
+%%OQGRAPH%%lib/mysql/plugin/ha_oqgraph.so
+%%ROCKSDB%%lib/mysql/plugin/ha_rocksdb.so
+%%S3%%lib/mysql/plugin/ha_s3.so
+%%SPHINX%%lib/mysql/plugin/ha_sphinx.so
+%%SPIDER%%lib/mysql/plugin/ha_spider.so
+lib/mysql/plugin/ha_test_sql_discovery.so
+lib/mysql/plugin/handlersocket.so
+%%HASHICORP_VAULT%%lib/mysql/plugin/hashicorp_key_management.so
+lib/mysql/plugin/locales.so
+lib/mysql/plugin/metadata_lock_info.so
+lib/mysql/plugin/password_reuse_check.so
+lib/mysql/plugin/provider_bzip2.so
+lib/mysql/plugin/provider_lz4.so
+lib/mysql/plugin/provider_lzma.so
+%%LZO%%lib/mysql/plugin/provider_lzo.so
+%%SNAPPY%%lib/mysql/plugin/provider_snappy.so
+lib/mysql/plugin/qa_auth_client.so
+lib/mysql/plugin/qa_auth_interface.so
+lib/mysql/plugin/qa_auth_server.so
+lib/mysql/plugin/query_cache_info.so
+lib/mysql/plugin/query_response_time.so
+lib/mysql/plugin/server_audit.so
+lib/mysql/plugin/simple_password_check.so
+lib/mysql/plugin/sql_errlog.so
+lib/mysql/plugin/test_sql_service.so
+lib/mysql/plugin/test_versioning.so
+lib/mysql/plugin/type_mysql_json.so
+lib/mysql/plugin/type_mysql_timestamp.so
+lib/mysql/plugin/type_test.so
+%%WSREP%%lib/mysql/plugin/wsrep_info.so
+lib/mysql/plugin/zstd.so
+libexec/mariadbd
+libexec/mysqld
+@comment share/man/man1/aria_chk.1.gz
+@comment share/man/man1/aria_dump_log.1.gz
+@comment share/man/man1/aria_ftdump.1.gz
+@comment share/man/man1/aria_pack.1.gz
+@comment share/man/man1/aria_read_log.1.gz
+@comment %%S3%%share/man/man1/aria_s3_copy.1.gz
+@comment share/man/man1/galera_new_cluster.1.gz
+@comment share/man/man1/galera_recovery.1.gz
+@comment share/man/man1/innochecksum.1.gz
+@comment share/man/man1/mariabackup.1.gz
+@comment share/man/man1/mariadb-access.1.gz
+@comment share/man/man1/mariadb-admin.1.gz
+@comment share/man/man1/mariadb-backup.1.gz
+@comment share/man/man1/mariadb-binlog.1.gz
+@comment share/man/man1/mariadb-check.1.gz
+@comment share/man/man1/mariadb-client-test-embedded.1.gz
+@comment share/man/man1/mariadb-client-test.1.gz
+@comment share/man/man1/mariadb-conv.1.gz
+@comment share/man/man1/mariadb-convert-table-format.1.gz
+@comment share/man/man1/mariadb-dump.1.gz
+@comment share/man/man1/mariadb-dumpslow.1.gz
+@comment share/man/man1/mariadb-embedded.1.gz
+@comment share/man/man1/mariadb-find-rows.1.gz
+@comment share/man/man1/mariadb-fix-extensions.1.gz
+@comment share/man/man1/mariadb-hotcopy.1.gz
+@comment share/man/man1/mariadb-import.1.gz
+@comment share/man/man1/mariadb-install-db.1.gz
+@comment %%ROCKSDB%%share/man/man1/mariadb-ldb.1.gz
+@comment share/man/man1/mariadb-plugin.1.gz
+@comment share/man/man1/mariadb-secure-installation.1.gz
+@comment share/man/man1/mariadb-service-convert.1.gz
+@comment share/man/man1/mariadb-setpermission.1.gz
+@comment share/man/man1/mariadb-show.1.gz
+@comment share/man/man1/mariadb-slap.1.gz
+@comment share/man/man1/mariadb-test-embedded.1.gz
+@comment share/man/man1/mariadb-test.1.gz
+@comment share/man/man1/mariadb-tzinfo-to-sql.1.gz
+@comment share/man/man1/mariadb-upgrade.1.gz
+@comment share/man/man1/mariadb-waitpid.1.gz
+@comment share/man/man1/mariadbd-multi.1.gz
+@comment share/man/man1/mariadbd-safe-helper.1.gz
+@comment share/man/man1/mariadbd-safe.1.gz
+@comment share/man/man1/mariadb.1.gz
+@comment share/man/man1/mariadb_config.1.gz
+@comment share/man/man1/mbstream.1.gz
+@comment share/man/man1/msql2mysql.1.gz
+@comment share/man/man1/my_print_defaults.1.gz
+@comment share/man/man1/my_safe_process.1.gz
+@comment share/man/man1/myisam_ftdump.1.gz
+@comment share/man/man1/myisamchk.1.gz
+@comment share/man/man1/myisamlog.1.gz
+@comment share/man/man1/myisampack.1.gz
+@comment %%ROCKSDB%%share/man/man1/myrocks_hotbackup.1.gz
+@comment share/man/man1/mysql-stress-test.pl.1.gz
+@comment share/man/man1/mysql-test-run.pl.1.gz
+@comment share/man/man1/mysql.1.gz
+@comment share/man/man1/mysql_client_test.1.gz
+@comment share/man/man1/mysql_client_test_embedded.1.gz
+@comment share/man/man1/mysql_config.1.gz
+@comment share/man/man1/mysql_convert_table_format.1.gz
+@comment share/man/man1/mysql_embedded.1.gz
+@comment share/man/man1/mysql_find_rows.1.gz
+@comment share/man/man1/mysql_plugin.1.gz
+@comment share/man/man1/mysql_setpermission.1.gz
+@comment share/man/man1/mysqlaccess.1.gz
+@comment share/man/man1/mysqladmin.1.gz
+@comment share/man/man1/mysqlbinlog.1.gz
+@comment share/man/man1/mysqlcheck.1.gz
+@comment share/man/man1/mysqldump.1.gz
+@comment share/man/man1/mysqlhotcopy.1.gz
+@comment share/man/man1/mysqlimport.1.gz
+@comment share/man/man1/mysqlshow.1.gz
+@comment share/man/man1/mysqlslap.1.gz
+@comment share/man/man1/mysqltest.1.gz
+@comment share/man/man1/mysqltest_embedded.1.gz
+@comment @comment share/man/man1/mytop.1.gz
+@comment share/man/man1/mysql.server.1.gz
+@comment share/man/man1/mysql_fix_extensions.1.gz
+@comment share/man/man1/mysql_install_db.1.gz
+@comment %%ROCKSDB%%share/man/man1/mysql_ldb.1.gz
+@comment share/man/man1/mysql_secure_installation.1.gz
+@comment share/man/man1/mysql_tzinfo_to_sql.1.gz
+@comment share/man/man1/mysql_upgrade.1.gz
+@comment share/man/man1/mysql_waitpid.1.gz
+@comment share/man/man1/mysqld_multi.1.gz
+@comment share/man/man1/mysqld_safe.1.gz
+@comment share/man/man1/mysqld_safe_helper.1.gz
+@comment share/man/man1/mysqldumpslow.1.gz
+@comment share/man/man1/perror.1.gz
+@comment share/man/man1/replace.1.gz
+@comment share/man/man1/resolve_stack_dump.1.gz
+@comment share/man/man1/resolveip.1.gz
+@comment %%WSREP%%share/man/man1/wsrep_sst_common.1.gz
+@comment %%WSREP%%share/man/man1/wsrep_sst_mariabackup.1.gz
+@comment %%WSREP%%share/man/man1/wsrep_sst_mysqldump.1.gz
+@comment %%WSREP%%share/man/man1/wsrep_sst_rsync.1.gz
+@comment %%WSREP%%share/man/man1/wsrep_sst_rsync_wan.1.gz
+@comment share/man/man3/mariadb_cancel.3.gz
+@comment share/man/man3/mariadb_connection.3.gz
+@comment share/man/man3/mariadb_dyncol_check.3.gz
+@comment share/man/man3/mariadb_dyncol_column_cmp_named.3.gz
+@comment share/man/man3/mariadb_dyncol_column_count.3.gz
+@comment share/man/man3/mariadb_dyncol_create_many_named.3.gz
+@comment share/man/man3/mariadb_dyncol_create_many_num.3.gz
+@comment share/man/man3/mariadb_dyncol_exists_named.3.gz
+@comment share/man/man3/mariadb_dyncol_exists_num.3.gz
+@comment share/man/man3/mariadb_dyncol_free.3.gz
+@comment share/man/man3/mariadb_dyncol_list_named.3.gz
+@comment share/man/man3/mariadb_dyncol_list_num.3.gz
+@comment share/man/man3/mariadb_dyncol_unpack.3.gz
+@comment share/man/man3/mariadb_dyncol_update_many_named.3.gz
+@comment share/man/man3/mariadb_dyncol_update_many_num.3.gz
+@comment share/man/man3/mariadb_get_infov.3.gz
+@comment share/man/man3/mariadb_reconnect.3.gz
+@comment share/man/man3/mariadb_rpl_close.3.gz
+@comment share/man/man3/mariadb_rpl_fetch.3.gz
+@comment share/man/man3/mariadb_rpl_get_optionsv.3.gz
+@comment share/man/man3/mariadb_rpl_open.3.gz
+@comment share/man/man3/mariadb_rpl_optionsv.3.gz
+@comment share/man/man3/mariadb_stmt_execute_direct.3.gz
+@comment share/man/man3/mariadb_stmt_fetch_fields.3.gz
+@comment share/man/man3/mysql_affected_rows.3.gz
+@comment share/man/man3/mysql_autocommit.3.gz
+@comment share/man/man3/mysql_change_user.3.gz
+@comment share/man/man3/mysql_close.3.gz
+@comment share/man/man3/mysql_commit.3.gz
+@comment share/man/man3/mysql_data_seek.3.gz
+@comment share/man/man3/mysql_errno.3.gz
+@comment share/man/man3/mysql_error.3.gz
+@comment share/man/man3/mysql_fetch_field.3.gz
+@comment share/man/man3/mysql_fetch_field_direct.3.gz
+@comment share/man/man3/mysql_fetch_fields.3.gz
+@comment share/man/man3/mysql_fetch_lengths.3.gz
+@comment share/man/man3/mysql_fetch_row.3.gz
+@comment share/man/man3/mysql_field_count.3.gz
+@comment share/man/man3/mysql_field_seek.3.gz
+@comment share/man/man3/mysql_field_tell.3.gz
+@comment share/man/man3/mysql_free_result.3.gz
+@comment share/man/man3/mysql_get_character_set_info.3.gz
+@comment share/man/man3/mysql_get_client_info.3.gz
+@comment share/man/man3/mysql_get_client_version.3.gz
+@comment share/man/man3/mysql_get_host_info.3.gz
+@comment share/man/man3/mysql_get_proto_info.3.gz
+@comment share/man/man3/mysql_get_server_info.3.gz
+@comment share/man/man3/mysql_get_server_version.3.gz
+@comment share/man/man3/mysql_get_socket.3.gz
+@comment share/man/man3/mysql_get_ssl_cipher.3.gz
+@comment share/man/man3/mysql_hex_string.3.gz
+@comment share/man/man3/mysql_info.3.gz
+@comment share/man/man3/mysql_init.3.gz
+@comment share/man/man3/mysql_kill.3.gz
+@comment share/man/man3/mysql_more_results.3.gz
+@comment share/man/man3/mysql_next_result.3.gz
+@comment share/man/man3/mysql_num_fields.3.gz
+@comment share/man/man3/mysql_num_rows.3.gz
+@comment share/man/man3/mysql_options.3.gz
+@comment share/man/man3/mysql_options4.3.gz
+@comment share/man/man3/mysql_optionsv.3.gz
+@comment share/man/man3/mysql_ping.3.gz
+@comment share/man/man3/mysql_query.3.gz
+@comment share/man/man3/mysql_read_query_result.3.gz
+@comment share/man/man3/mysql_real_connect.3.gz
+@comment share/man/man3/mysql_real_escape_string.3.gz
+@comment share/man/man3/mysql_real_query.3.gz
+@comment share/man/man3/mysql_refresh.3.gz
+@comment share/man/man3/mysql_reset_connection.3.gz
+@comment share/man/man3/mysql_rollback.3.gz
+@comment share/man/man3/mysql_row_seek.3.gz
+@comment share/man/man3/mysql_row_tell.3.gz
+@comment share/man/man3/mysql_select_db.3.gz
+@comment share/man/man3/mysql_send_query.3.gz
+@comment share/man/man3/mysql_server_end.3.gz
+@comment share/man/man3/mysql_server_init.3.gz
+@comment share/man/man3/mysql_session_track_get_first.3.gz
+@comment share/man/man3/mysql_session_track_get_next.3.gz
+@comment share/man/man3/mysql_set_character_set.3.gz
+@comment share/man/man3/mysql_set_server_option.3.gz
+@comment share/man/man3/mysql_shutdown.3.gz
+@comment share/man/man3/mysql_sqlstate.3.gz
+@comment share/man/man3/mysql_ssl_set.3.gz
+@comment share/man/man3/mysql_stat.3.gz
+@comment share/man/man3/mysql_stmt_affected_rows.3.gz
+@comment share/man/man3/mysql_stmt_attr_get.3.gz
+@comment share/man/man3/mysql_stmt_attr_set.3.gz
+@comment share/man/man3/mysql_stmt_bind_param.3.gz
+@comment share/man/man3/mysql_stmt_bind_result.3.gz
+@comment share/man/man3/mysql_stmt_close.3.gz
+@comment share/man/man3/mysql_stmt_data_seek.3.gz
+@comment share/man/man3/mysql_stmt_errno.3.gz
+@comment share/man/man3/mysql_stmt_error.3.gz
+@comment share/man/man3/mysql_stmt_execute.3.gz
+@comment share/man/man3/mysql_stmt_fetch.3.gz
+@comment share/man/man3/mysql_stmt_fetch_column.3.gz
+@comment share/man/man3/mysql_stmt_field_count.3.gz
+@comment share/man/man3/mysql_stmt_free_result.3.gz
+@comment share/man/man3/mysql_stmt_init.3.gz
+@comment share/man/man3/mysql_stmt_insert_id.3.gz
+@comment share/man/man3/mysql_stmt_more_results.3.gz
+@comment share/man/man3/mysql_stmt_next_result.3.gz
+@comment share/man/man3/mysql_stmt_num_rows.3.gz
+@comment share/man/man3/mysql_stmt_param_count.3.gz
+@comment share/man/man3/mysql_stmt_param_metadata.3.gz
+@comment share/man/man3/mysql_stmt_prepare.3.gz
+@comment share/man/man3/mysql_stmt_reset.3.gz
+@comment share/man/man3/mysql_stmt_result_metadata.3.gz
+@comment share/man/man3/mysql_stmt_row_seek.3.gz
+@comment share/man/man3/mysql_stmt_row_tell.3.gz
+@comment share/man/man3/mysql_stmt_send_long_data.3.gz
+@comment share/man/man3/mysql_stmt_sqlstate.3.gz
+@comment share/man/man3/mysql_stmt_store_result.3.gz
+@comment share/man/man3/mysql_stmt_warning_count.3.gz
+@comment share/man/man3/mysql_store_result.3.gz
+@comment share/man/man3/mysql_thread_end.3.gz
+@comment share/man/man3/mysql_thread_id.3.gz
+@comment share/man/man3/mysql_thread_init.3.gz
+@comment share/man/man3/mysql_use_result.3.gz
+@comment share/man/man3/mysql_warning_count.3.gz
+@comment share/man/man8/mariadbd.8.gz
+@comment share/man/man8/mysqld.8.gz
+share/aclocal/mysql.m4
+%%PORTDOCS%%%%DOCSDIR%%/CREDITS
+%%PORTDOCS%%%%DOCSDIR%%/INSTALL-BINARY
+%%PORTDOCS%%%%WSREP%%%%DOCSDIR%%/README-wsrep
+%%PORTDOCS%%%%DOCSDIR%%/README.md
+%%PORTDOCS%%%%DOCSDIR%%/THIRDPARTY
+%%MROONGA%%%%PORTDOCS%%%%DOCSDIR%%/groonga/README.md
+%%MROONGA%%share/groonga-normalizer-mysql/README.md
+%%MROONGA%%share/groonga-normalizer-mysql/lgpl-2.0.txt
+%%HASHICORP_VAULT%%%%PORTDOCS%%%%DOCSDIR%%/hashicorp_key_management.txt
+%%DATADIR%%/binary-configure
+%%DATADIR%%/bulgarian/errmsg.sys
+%%DATADIR%%/charsets/Index.xml
+%%DATADIR%%/charsets/README
+%%DATADIR%%/charsets/armscii8.xml
+%%DATADIR%%/charsets/ascii.xml
+%%DATADIR%%/charsets/cp1250.xml
+%%DATADIR%%/charsets/cp1251.xml
+%%DATADIR%%/charsets/cp1256.xml
+%%DATADIR%%/charsets/cp1257.xml
+%%DATADIR%%/charsets/cp850.xml
+%%DATADIR%%/charsets/cp852.xml
+%%DATADIR%%/charsets/cp866.xml
+%%DATADIR%%/charsets/dec8.xml
+%%DATADIR%%/charsets/geostd8.xml
+%%DATADIR%%/charsets/greek.xml
+%%DATADIR%%/charsets/hebrew.xml
+%%DATADIR%%/charsets/hp8.xml
+%%DATADIR%%/charsets/keybcs2.xml
+%%DATADIR%%/charsets/koi8r.xml
+%%DATADIR%%/charsets/koi8u.xml
+%%DATADIR%%/charsets/latin1.xml
+%%DATADIR%%/charsets/latin2.xml
+%%DATADIR%%/charsets/latin5.xml
+%%DATADIR%%/charsets/latin7.xml
+%%DATADIR%%/charsets/macce.xml
+%%DATADIR%%/charsets/macroman.xml
+%%DATADIR%%/charsets/swe7.xml
+%%DATADIR%%/chinese/errmsg.sys
+%%DATADIR%%/czech/errmsg.sys
+%%DATADIR%%/danish/errmsg.sys
+%%DATADIR%%/dutch/errmsg.sys
+%%DATADIR%%/english/errmsg.sys
+%%DATADIR%%/errmsg-utf8.txt
+%%DATADIR%%/estonian/errmsg.sys
+%%DATADIR%%/fill_help_tables.sql
+%%DATADIR%%/french/errmsg.sys
+%%DATADIR%%/german/errmsg.sys
+%%DATADIR%%/georgian/errmsg.sys
+%%DATADIR%%/greek/errmsg.sys
+%%DATADIR%%/hindi/errmsg.sys
+%%DATADIR%%/hungarian/errmsg.sys
+%%DATADIR%%/italian/errmsg.sys
+%%DATADIR%%/japanese/errmsg.sys
+%%DATADIR%%/korean/errmsg.sys
+%%DATADIR%%/magic
+%%DATADIR%%/maria_add_gis_sp.sql
+%%DATADIR%%/maria_add_gis_sp_bootstrap.sql
+%%DATADIR%%/mariadb.logrotate
+%%DATADIR%%/mini-benchmark
+%%MROONGA%%%%DATADIR%%/mroonga/AUTHORS
+%%MROONGA%%%%DATADIR%%/mroonga/install.sql
+%%MROONGA%%%%DATADIR%%/mroonga/uninstall.sql
+%%DATADIR%%/mysql.server
+%%DATADIR%%/mysql_performance_tables.sql
+%%DATADIR%%/mysql_sys_schema.sql
+%%DATADIR%%/mysql_system_tables.sql
+%%DATADIR%%/mysql_system_tables_data.sql
+%%DATADIR%%/mysql_test_data_timezone.sql
+%%DATADIR%%/mysql_test_db.sql
+%%DATADIR%%/mysqld_multi.server
+%%DATADIR%%/norwegian-ny/errmsg.sys
+%%DATADIR%%/norwegian/errmsg.sys
+%%DATADIR%%/polish/errmsg.sys
+%%DATADIR%%/portuguese/errmsg.sys
+%%DATADIR%%/romanian/errmsg.sys
+%%DATADIR%%/russian/errmsg.sys
+%%DATADIR%%/serbian/errmsg.sys
+%%DATADIR%%/slovak/errmsg.sys
+%%DATADIR%%/spanish/errmsg.sys
+%%DATADIR%%/swedish/errmsg.sys
+%%DATADIR%%/ukrainian/errmsg.sys
+@comment %%DATADIR%%/wsrep.cnf
+%%WSREP%%%%DATADIR%%/wsrep_notify
+@dir(%%MARIADB_USER%%,%%MARIADB_GROUP%%,) %%MARIADB_LOGDIR%%
+
diff --git a/databases/mariadb103-client/Makefile b/databases/mariadb103-client/Makefile
deleted file mode 100644
index d79f7096c9af..000000000000
--- a/databases/mariadb103-client/Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
-# Created by: Bernard Spil <brnrd@FreeBSD.org>
-
-PORTNAME=	mariadb
-PKGNAMESUFFIX=	103-client
-
-COMMENT=	Multithreaded SQL database (client)
-
-MASTERDIR=	${.CURDIR}/../mariadb103-server
-
-FILESDIR=	${.CURDIR}/files
-PATCHDIR=	${.CURDIR}/files
-PLIST=		${.CURDIR}/pkg-plist
-
-CONFLICTS_INSTALL=	databases/mytop
-
-.include "${MASTERDIR}/Makefile"
diff --git a/databases/mariadb103-client/files/patch-CMakeLists.txt b/databases/mariadb103-client/files/patch-CMakeLists.txt
deleted file mode 100644
index 7122c9289f07..000000000000
--- a/databases/mariadb103-client/files/patch-CMakeLists.txt
+++ /dev/null
@@ -1,19 +0,0 @@
---- CMakeLists.txt.orig	2021-05-08 08:36:42.000000000 +0200
-+++ CMakeLists.txt	2021-05-08 08:40:29.000000000 +0200
-@@ -517,13 +517,15 @@
-   WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
- )
- 
-+IF(FALSE)
- INSTALL_DOCUMENTATION(README.md CREDITS COPYING THIRDPARTY COMPONENT Readme)
-+ENDIF()
- 
- # MDEV-6526 these files are not installed anymore
- #INSTALL_DOCUMENTATION(${CMAKE_BINARY_DIR}/Docs/INFO_SRC
- #                      ${CMAKE_BINARY_DIR}/Docs/INFO_BIN)
- 
--IF(UNIX)
-+IF(FALSE)
-   INSTALL_DOCUMENTATION(Docs/INSTALL-BINARY Docs/README-wsrep COMPONENT Readme)
- ENDIF()
- 
diff --git a/databases/mariadb103-client/files/patch-MDEV-11790 b/databases/mariadb103-client/files/patch-MDEV-11790
deleted file mode 100644
index 1794bcf44da7..000000000000
--- a/databases/mariadb103-client/files/patch-MDEV-11790
+++ /dev/null
@@ -1,46 +0,0 @@
-WITHOUT_SERVER installs server-only files
-
-https://jira.mariadb.org/browse/MDEV-11790
---- extra/CMakeLists.txt.orig	2018-10-02 09:45:40 UTC
-+++ extra/CMakeLists.txt
-@@ -99,7 +99,7 @@ IF(WITH_INNOBASE_STORAGE_ENGINE)
-   ADD_DEPENDENCIES(innochecksum GenError)
- ENDIF()
- 
--MYSQL_ADD_EXECUTABLE(replace replace.c COMPONENT Server)
-+MYSQL_ADD_EXECUTABLE(replace replace.c COMPONENT Client)
- TARGET_LINK_LIBRARIES(replace mysys)
- 
- IF(UNIX)
---- scripts/CMakeLists.txt.orig	2018-10-02 09:45:42 UTC
-+++ scripts/CMakeLists.txt
-@@ -241,7 +241,10 @@ ENDIF()
- SET(mysql_config_COMPONENT COMPONENT Development)
- SET(msql2mysql_COMPONENT COMPONENT Client)
- SET(mysqlaccess_COMPONENT COMPONENT Client)
-+SET(mysqlhotcopy_COMPONENT COMPONENT Client)
-+SET(mysql_convert_table_format_COMPONENT COMPONENT Client)
- SET(mysql_find_rows_COMPONENT COMPONENT Client)
-+SET(mysql_setpermission_COMPONENT COMPONENT Client)
- SET(mytop_COMPONENT Mytop)
- 
- IF(WIN32)
-@@ -298,14 +301,14 @@ ELSE()
-   # On Unix, most of the files end up in the bin directory
-   SET(BIN_SCRIPTS
-     msql2mysql
--    mysql_config
--    mysql_setpermission
--    mysql_secure_installation
-     mysqlaccess
-+    mysqlhotcopy
-+    mysql_config
-     mysql_convert_table_format
-     mysql_find_rows
-+    mysql_secure_installation
-+    mysql_setpermission
-     mytop
--    mysqlhotcopy
-     ${SERVER_SCRIPTS}
-     ${WSREP_SCRIPTS}
-     ${SYSTEMD_SCRIPTS}
diff --git a/databases/mariadb103-client/files/pkg-message.in b/databases/mariadb103-client/files/pkg-message.in
deleted file mode 100644
index 00ac47038607..000000000000
--- a/databases/mariadb103-client/files/pkg-message.in
+++ /dev/null
@@ -1,9 +0,0 @@
-[
-{ type: install
-  message: <<EOM
-MariaDB respects hier(7) and doesn't check /etc and /etc/mysql for
-my.cnf. Please move existing my.cnf files from those paths to
-%%PREFIX%%/etc and %%PREFIX%%/etc/mysql.
-EOM
-}
-]
diff --git a/databases/mariadb103-client/pkg-plist b/databases/mariadb103-client/pkg-plist
deleted file mode 100644
index 2bf148b27732..000000000000
--- a/databases/mariadb103-client/pkg-plist
+++ /dev/null
@@ -1,129 +0,0 @@
-bin/mariadb_config
-bin/msql2mysql
-bin/mysql
-bin/mysql_config
-bin/mysql_convert_table_format
-bin/mysql_find_rows
-bin/mysql_setpermission
-@comment bin/mysql_plugin
-bin/mysql_waitpid
-bin/mysqlaccess
-bin/mysqladmin
-bin/mysqlbinlog
-bin/mysqlcheck
-bin/mysqldump
-bin/mysqlhotcopy
-bin/mysqlimport
-bin/mysqlshow
-bin/mysqlslap
-bin/mysqltest
-bin/mytop
-bin/replace
-@comment bin/wsrep_sst_rsync_wan
-include/mysql/errmsg.h
-include/mysql/ma_list.h
-include/mysql/ma_pvio.h
-include/mysql/ma_tls.h
-include/mysql/mariadb/ma_io.h
-include/mysql/mariadb_com.h
-include/mysql/mariadb_ctype.h
-include/mysql/mariadb_dyncol.h
-include/mysql/mariadb_rpl.h
-include/mysql/mariadb_stmt.h
-include/mysql/mariadb_version.h
-include/mysql/my_config.h
-include/mysql/my_global.h
-include/mysql/my_sys.h
-include/mysql/mysql.h
-include/mysql/mysql_com.h
-include/mysql/mysql_version.h
-include/mysql/mysql/client_plugin.h
-include/mysql/mysql/plugin_auth.h
-include/mysql/mysql/plugin_auth_common.h
-include/mysql/mysqld_error.h
-@comment etc/init.d/mysql
-@comment etc/logrotate.d/mysql
-@sample etc/my.cnf.sample
-@comment libexec/rcmysql
-%%NO_GSSAPI_NONE%%lib/mysql/plugin/auth_gssapi_client.so
-lib/mysql/libmariadb.so
-lib/mysql/libmariadb.so.3
-lib/mysql/libmariadbclient.a
-lib/mysql/libmysqlservices.a
-lib/mysql/libmysqlclient.a
-lib/mysql/libmysqlclient.so
-lib/mysql/libmysqlclient_r.a
-lib/mysql/libmysqlclient_r.so
-@comment lib/mysql/plugin/caching_sha2_password.so
-lib/mysql/plugin/client_ed25519.so
-lib/mysql/plugin/daemon_example.ini
-lib/mysql/plugin/dialog.so
-lib/mysql/plugin/mysql_clear_password.so
-lib/mysql/plugin/sha256_password.so
-libdata/pkgconfig/libmariadb.pc
-libdata/pkgconfig/mariadb.pc
-@comment man/man1/aria_chk.1.gz
-@comment man/man1/aria_dump_log.1.gz
-@comment man/man1/aria_ftdump.1.gz
-@comment man/man1/aria_pack.1.gz
-@comment man/man1/aria_read_log.1.gz
-@comment man/man1/galera_new_cluster.1.gz
-@comment man/man1/galera_recovery.1.gz
-@comment man/man1/innochecksum.1.gz
-@comment man/man1/mariabackup.1.gz
-@comment man/man1/mariadb-service-convert.1.gz
-man/man1/msql2mysql.1.gz
-@comment man/man1/mbstream.1.gz
-@comment man/man1/my_print_defaults.1.gz
-man/man1/my_safe_process.1.gz
-@comment man/man1/myisam_ftdump.1.gz
-@comment man/man1/myisamchk.1.gz
-@comment man/man1/myisamlog.1.gz
-@comment man/man1/myisampack.1.gz
-man/man1/mysql-stress-test.pl.1.gz
-man/man1/mysql-test-run.pl.1.gz
-man/man1/mysql.1.gz
-@comment man/man1/mysql.server.1.gz
-man/man1/mysql_client_test.1.gz
-man/man1/mysql_client_test_embedded.1.gz
-man/man1/mysql_config.1.gz
-man/man1/mysql_convert_table_format.1.gz
-@comment man/man1/mysql_embedded.1.gz
-man/man1/mysql_find_rows.1.gz
-@comment man/man1/mysql_fix_extensions.1.gz
-@comment man/man1/mysql_install_db.1.gz
-@comment man/man1/mysql_ldb.1.gz
-man/man1/mysql_plugin.1.gz
-@comment man/man1/mysql_secure_installation.1.gz
-man/man1/mysql_setpermission.1.gz
-man/man1/mysql_tzinfo_to_sql.1.gz
-@comment man/man1/mysql_upgrade.1.gz
-man/man1/mysql_waitpid.1.gz
-man/man1/mysqlaccess.1.gz
-man/man1/mysqladmin.1.gz
-man/man1/mysqlbinlog.1.gz
-man/man1/mysqlcheck.1.gz
-@comment man/man1/mysqld_multi.1.gz
-@comment man/man1/mysqld_safe.1.gz
-@comment man/man1/mysqld_safe_helper.1.gz
-man/man1/mysqldump.1.gz
-@comment man/man1/mysqldumpslow.1.gz
-man/man1/mysqlhotcopy.1.gz
-man/man1/mysqlimport.1.gz
-man/man1/mysqlshow.1.gz
-man/man1/mysqlslap.1.gz
-man/man1/mysqltest.1.gz
-man/man1/mysqltest_embedded.1.gz
-@comment man/man1/perror.1.gz
-man/man1/replace.1.gz
-@comment man/man1/resolve_stack_dump.1.gz
-@comment man/man1/resolveip.1.gz
-@comment man/man1/wsrep_sst_common.1.gz
-@comment man/man1/wsrep_sst_mariabackup.1.gz
-@comment man/man1/wsrep_sst_mysqldump.1.gz
-@comment man/man1/wsrep_sst_rsync.1.gz
-@comment man/man1/wsrep_sst_rsync_wan.1.gz
-@comment man/man8/mysqld.8.gz
-@comment share/aclocal/mysql.m4
-@dir etc/mysql
-@dir etc/mysql/conf.d
diff --git a/databases/mariadb103-server/Makefile b/databases/mariadb103-server/Makefile
deleted file mode 100644
index 0d2562ab2541..000000000000
--- a/databases/mariadb103-server/Makefile
+++ /dev/null
@@ -1,222 +0,0 @@
-# Created by: Bernard Spil <brnrd@FreeBSD.org>
-
-PORTNAME?=	mariadb
-PORTVERSION=	10.3.31
-PORTREVISION?=	1
-CATEGORIES=	databases
-MASTER_SITES=	http://mirrors.supportex.net/${SITESDIR}/ \
-		http://mirror2.hs-esslingen.de/pub/Mirrors/${SITESDIR}/ \
-		http://gd.tuwien.ac.at/db/${SITESDIR}/ \
-		http://mirrors.fe.up.pt/pub/${SITESDIR}/ \
-		http://mirror.de.gsnw.de:56431/${SITESDIR}/ \
-		http://mirror.layerjet.com/${SITESDIR}/ \
-		http://mirror.switch.ch/mirror/${SITESDIR}/ \
-		http://ftp.osuosl.org/pub/${SITESDIR}/
-PKGNAMESUFFIX?=	103-server
-
-MAINTAINER=	brnrd@FreeBSD.org
-COMMENT?=	Multithreaded SQL database (server)
-
-LICENSE=	GPLv2
-LICENSE_FILE=	${WRKSRC}/COPYING
-
-SUB_FILES=	pkg-message
-PKGMESSAGE=	${WRKDIR}/pkg-message
-
-USES=		bison:build cmake:insource,noninja compiler:c++11-lib cpe iconv:translit libedit ncurses shebangfix ssl
-USE_LDCONFIG=	${PREFIX}/lib/mysql
-SHEBANG_FILES=	scripts/*.sh
-SITESDIR=	mariadb/mariadb-${PORTVERSION}/source
-DOCSDIR=	${PREFIX}/share/doc/mysql
-
-OPTIONS_SINGLE=		GSSAPI
-OPTIONS_SINGLE_GSSAPI=	GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT GSSAPI_NONE
-OPTIONS_DEFAULT=	GSSAPI_BASE
-
-.if ${PKGNAMESUFFIX:M*-server}
-# MySQL-Server options
-OPTIONS_DEFAULT+=	CONNECT_EXTRA INNOBASE SPHINX SPIDER WSREP
-OPTIONS_GROUP=		COMPRESSION ENGINES GROONGA
-OPTIONS_DEFINE=		CONNECT_EXTRA DOCS
-OPTIONS_DEFINE_amd64=	WSREP
-OPTIONS_GROUP_COMPRESSION=	LZ4 LZO SNAPPY ZSTD
-OPTIONS_GROUP_ENGINES=	INNOBASE MROONGA OQGRAPH ROCKSDB SPHINX SPIDER TOKUDB
-OPTIONS_GROUP_GROONGA=	ZMQ MSGPACK
-OPTIONS_EXCLUDE_i386=	TOKUDB
-
-CONNECT_EXTRA_DESC=	Enable ODBC and XML in CONNECT engine
-COMPRESSION_DESC=	Optional page compression
-ENGINES_DESC=	Optional MariaDB storage engines
-GROONGA_DESC=	Optional Mroonga features
-INNOBASE_DESC=	InnoDB default engine
-MROONGA_DESC=	Mroonga Full Text Search engine
-MSGPACK_DESC=	MsgPack support
-OQGRAPH_DESC=	Open Query Graph Computation engine
-ROCKSDB_DESC=	RocksDB LSM engine (Alpha)
-SPHINX_DESC=	SphinxSE engine
-SPIDER_DESC=	Partitioning and XA-transactions engine
-TOKUDB_DESC=	Fractal tree index tree data structure engine
-WSREP_DESC=	Build wsrep clustering
-ZMQ_DESC=	ZeroMQ support
-ZSTD_DESC+=	Zstandard compression support (RocksDB only)
-.endif
-
-CMAKE_ARGS+=	-DINSTALL_DOCDIR="share/doc/mysql" \
-		-DINSTALL_DOCREADMEDIR="share/doc/mysql" \
-		-DINSTALL_INCLUDEDIR="include/mysql" \
-		-DINSTALL_INFODIR="info" \
-		-DINSTALL_LIBDIR="lib/mysql" \
-		-DINSTALL_MANDIR="man" \
-		-DINSTALL_MYSQLDATADIR="/var/db/mysql" \
-		-DINSTALL_MYSQLSHAREDIR="share/mysql" \
-		-DINSTALL_MYSQLTESTDIR= \
-		-DINSTALL_PLUGINDIR="lib/mysql/plugin" \
-		-DINSTALL_SBINDIR="libexec" \
-		-DINSTALL_SCRIPTDIR="bin" \
-		-DINSTALL_SHAREDIR="share" \
-		-DINSTALL_SQLBENCHDIR= \
-		-DINSTALL_SUPPORTFILESDIR="share/mysql" \
-		-DINSTALL_SYSCONFDIR="${PREFIX}/etc" \
-		-DWITH_SSL="${OPENSSLBASE}" \
-		-DCURSES_CURSES_LIBRARY="/usr/lib/libcurses.so" \
-		-DCURSES_FORM_LIBRARY="/usr/lib/libform.so" \
-		-DCURSES_CURSES_LIBRARY="/usr/lib/libncurses.so" \
-		-DKRB5_CONFIG="${KRB5CONFIG}" \
-		-DCURSES_NCURSES_LIBRARY="${NCURSESLIB}/libncurses.so" \
-		-DCOMPILATION_COMMENT="FreeBSD Ports" \
-		-DCMAKE_PREFIX_PATH=${PREFIX} \
-CMAKE_OFF+=	CONNECT_WITH_MONGO WITH_UNIT_TESTS
-CMAKE_ON+=	WITH_LIBWRAP WITHOUT_DOCS
-DISABLED_PLUGINS+=	DAEMON_EXAMPLE DIALOG_EXAMPLES EXAMPLE \
-		EXAMPLE_KEY_MANAGEMENT FTEXAMPLE
-
-DATADIR=	${PREFIX}/share/mysql
-
-CONFLICTS_INSTALL=	mariadb10[0-24-9]-${PKGNAMESUFFIX:C/^[0-9]*-//}-* \
-			mysql[0-9]*-${PKGNAMESUFFIX:C/^[0-9]*-//}-* \
-			mysqlwsrep* \
-			percona[0-9]*-${PKGNAMESUFFIX:C/^[0-9]*-//}-*
-
-FASTMTX_CMAKE_BOOL=	WITH_FAST_MUTEXES
-GSSAPI_BASE_USES=	gssapi
-GSSAPI_HEIMDAL_USES=	gssapi:heimdal
-GSSAPI_MIT_USES=	gssapi:mit
-GSSAPI_NONE_CMAKE_ON=	-DPLUGIN_AUTH_GSSAPI_CLIENT=OFF
-OPTIONS_SUB=		yes
-
-.if ${PKGNAMESUFFIX:M*-client}
-# MySQL-Client part
-CMAKE_ON+=	CONC_WITH_MYSQLCOMPAT WITHOUT_SERVER
-CMAKE_OFF+=	CONC_WITH_UNITTEST WITH_WSREP
-USES+=		readline
-USE_LDCONFIG=	${PREFIX}/lib/mysql
-.else # ! ${PKGNAMESUFFIX:M*-client}
-# MySQL-Server part
-USES+=		mysql:103m
-USE_LDCONFIG+=	${PREFIX}/lib/mysql/plugin
-USE_RC_SUBR=	mysql-server
-USERS=		mysql
-GROUPS=		mysql
-CMAKE_ON+=	CMAKE_SKIP_BUILD_RPATH WITH_EMBEDDED_SERVER
-CMAKE_OFF+=	WITH_CLIENT
-
-.for ENGINE in ${OPTIONS_GROUP_ENGINES:NINNOBASE}
-${ENGINE}_CMAKE_OFF=	-DPLUGIN_${ENGINE}=NO
-${ENGINE}_CMAKE_ON=	-DPLUGIN_${ENGINE}=DYNAMIC
-.endfor
-INNOBASE_VARS_OFF=	disabled_plugins+=INNOBASE
-
-CONNECT_EXTRA_LIB_DEPENDS=	libodbc.so:databases/unixODBC
-CONNECT_EXTRA_USE=		gnome=libxml2
-CONNECT_EXTRA_USES=		gnome
-CONNECT_EXTRA_CMAKE_BOOL=	CONNECT_WITH_LIBXML2 CONNECT_WITH_ODBC
-GSSAPI_NONE_VARS=	disabled_plugins+=AUTH_GSSAPI
-LZ4_CMAKE_ON=		-DGRN_WITH_LZ4=ON  -DWITH_INNODB_LZ4=ON  -DWITH_ROCKSDB_LZ4=ON
-LZ4_CMAKE_OFF=		-DGRN_WITH_LZ4=OFF -DWITH_INNODB_LZ4=OFF -DWITH_ROCKSDB_LZ4=OFF
-LZ4_LIB_DEPENDS=	liblz4.so:archivers/liblz4
-LZO_CMAKE_ON=		-DWITH_INNODB_LZO=ON
-LZO_CMAKE_OFF=		-DWITH_INNODB_LZO=OFF
-LZO_LIB_DEPENDS=	liblzo2.so:archivers/lzo2
-MROONGA_IMPLIES=	LZ4
-MSGPACK_LIB_DEPENDS=	libmsgpackc.so:devel/msgpack
-OQGRAPH_LIB_DEPENDS=	libboost_system.so:devel/boost-libs \
-			libJudy.so:devel/judy
-ROCKSDB_USES=		python
-ROCKSDB_CMAKE_ON=	-DPYTHON_SHEBANG=${PYTHON_CMD}
-SNAPPY_CMAKE_ON=	-DWITH_INNODB_SNAPPY=ON  -DWITH_ROCKSDB_snappy=ON
-SNAPPY_CMAKE_OFF=	-DWITH_INNODB_SNAPPY=OFF -DWITH_ROCKSDB_snappy=OFF
-SNAPPY_LIB_DEPENDS=	libsnappy.so:archivers/snappy
-TOKUDB_IMPLIES=		SNAPPY
-TOKUDB_PORTDOCS=	README.md
-WSREP_CMAKE_BOOL=	WITH_WSREP
-WSREP_LIB_DEPENDS=	libgalera.so:databases/galera
-WSREP_RUN_DEPENDS=	bash:shells/bash \
-			rsync:net/rsync \
-	#		stunnel:security/stunnel
-ZMQ_LIB_DEPENDS=	libzmq.so:net/libzmq4
-ZSTD_CMAKE_ON=		-DWITH_ROCKSDB_zstd=ON
-ZSTD_CMAKE_OFF=		-DWITH_ROCKSDB_zstd=OFF
-ZSTD_LIB_DEPENDS=	libzstd.so:archivers/zstd
-
-.include <bsd.port.options.mk>
-
-.for PLUGIN in ${DISABLED_PLUGINS}
-CMAKE_ARGS+=		-DPLUGIN_${PLUGIN}=NO
-.endfor
-
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1200057
-SUB_LIST+=	LEGACY_LIMITS="@comment " MODERN_LIMITS=""
-.else
-SUB_LIST+=	LEGACY_LIMITS="" MODERN_LIMITS="@comment "
-.endif
-
-.endif # ${PKGNAMESUFFIX:M*-client}
-
-.if defined(WITH_OPENSSL_PORT)
-GSSAPI_BASE_IGNORE=	BASE_GSSAPI is not compatible with OpenSSL from ports. Use other GSSAPI options or OpenSSL from base system
-.endif
-
-.include <bsd.port.pre.mk>
-
-.if ${ARCH} != amd64
-PLIST_SUB+=	WSREP="@comment "
-.endif
-
-.if ${OPSYS} == DragonFly
-CMAKE_OFF+=	WITH_TOKUDB
-.endif
-
-post-patch:
-	${REINPLACE_CMD} 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/mysys/my_default.c
-	${REINPLACE_CMD} 's|%%LOCALBASE%%|${LOCALBASE}|g' \
-		${WRKSRC}/storage/tokudb/PerconaFT/cmake_modules/TokuThirdParty.cmake
-	${REINPLACE_CMD} 's|/etc/my.cnf.d|${LOCALBASE}/etc/mysql/conf.d|' \
-		${WRKSRC}/support-files/rpm/my.cnf
-.if ${OPSYS} == DragonFly
-	${CP} ${WRKSRC}/cmake/os/FreeBSD.cmake \
-		${WRKSRC}/cmake/os/DragonFly.cmake
-.endif
-
-.if ${PKGNAMESUFFIX:M*-client}
-post-install:
-	${MV} ${STAGEDIR}${PREFIX}/lib/mysql/pkgconfig/mariadb.pc \
-		${STAGEDIR}${PREFIX}/libdata/pkgconfig/mariadb.pc
-	${RM} -r ${STAGEDIR}${DATADIR} \
-		${STAGEDIR}${PREFIX}/include/mysql/server \
-		${STAGEDIR}${PREFIX}/lib/mysql/pkgconfig
-	${MV} ${STAGEDIR}${PREFIX}/etc/my.cnf ${STAGEDIR}${PREFIX}/etc/my.cnf.sample
-	${MKDIR} -p ${STAGEDIR}${PREFIX}/etc/mysql/conf.d
-
-post-install-GSSAPI_NONE-off:
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/mysql/plugin/auth_gssapi_client.so
-
-.else # ! ${PKGNAMESUFFIX:M*-client}
-post-install:
-	${RM} -r ${STAGEDIR}${PREFIX}/share/mysql/policy \
-		${STAGEDIR}${PREFIX}/include/mysql/server/private \
-		${STAGEDIR}${PREFIX}/lib/mysql/pkgconfig
-	${MV} ${STAGEDIR}${PREFIX}/etc/mysql/user_map.conf \
-		${STAGEDIR}${PREFIX}/etc/mysql/user_map.conf.sample
-.endif # ${PKGNAMESUFFIX:M*-client}
-
-.include <bsd.port.post.mk>
diff --git a/databases/mariadb103-server/distinfo b/databases/mariadb103-server/distinfo
deleted file mode 100644
index 31e29a79b9ae..000000000000
--- a/databases/mariadb103-server/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1628426460
-SHA256 (mariadb-10.3.31.tar.gz) = 20421dfe5750f510ab0ee23420337332e6799cd38fa31332e2841dfa956eb771
-SIZE (mariadb-10.3.31.tar.gz) = 73298653
diff --git a/databases/mariadb103-server/files/mysql-server.in b/databases/mariadb103-server/files/mysql-server.in
deleted file mode 100644
index 9da717d5b9a3..000000000000
--- a/databases/mariadb103-server/files/mysql-server.in
+++ /dev/null
@@ -1,138 +0,0 @@
-#!/bin/sh
-
-# PROVIDE: mysql
-# REQUIRE: LOGIN
-# KEYWORD: shutdown
-#
-# Add the following line to /etc/rc.conf to enable mysql:
-# mysql_(instance_)?enable (bool):	Set to "NO" by default.
-#			Set it to "YES" to enable MySQL.
-%%LEGACY_LIMITS%%# mysql_(instance_)?limits (bool):	Set to "NO" by default.
-%%LEGACY_LIMITS%%#			Set it to yes to run `limits -e -U mysql`
-%%LEGACY_LIMITS%%#			just before mysql starts.
-# mysql_(instance_)?dbdir (str):	Default to "/var/db/mysql"
-#			Base database directory.
-# mysql_(instance_)?args (str):	Custom additional arguments to be passed
-#			to mysqld_safe (default empty).
-# mysql_(instance_)?pidfile (str): Custum PID file path and name.
-#			Default to "${mysql_dbdir}/${hostname}.pid".
-# mysql_(instance_)?user (str): User to run mysqld as
-#			Default to "mysql" created by the port
-# mysql_(instance_)?optfile (str): Server-specific option file.
-#			Default to "${mysql_dbdir}/my.cnf".
-# mysql_instances (str): Set to "" by default. 
-#			If defined, list of instances to enable
-
-. /etc/rc.subr
-
-name="mysql"
-rcvar=mysql_enable
-
-load_rc_config $name
-
-: ${mysql_enable="NO"}
-%%LEGACY_LIMITS%%: ${mysql_limits="NO"}
-: ${mysql_user="mysql"}
-%%LEGACY_LIMITS%%mysql_limits_args="-e -U ${mysql_user}"
-: ${mysql_dbdir="/var/db/mysql"}
-: ${mysql_optfile="${mysql_dbdir}/my.cnf"}
-
-command="/usr/sbin/daemon"
-procname="%%PREFIX%%/libexec/mysqld"
-start_precmd="${name}_prestart"
-start_postcmd="${name}_poststart"
-
-if [ -n "$2" ]; then
-	instance="$2"
-	load_rc_config ${name}_${instance}
-	case "$mysql_instances" in
-	"$2 "*|*" $2 "*|*" $2"|"$2")
-		eval mysql_args="\${mysql_${instance}_args:-\"${mysql_args}\"}"
-		eval mysql_dbdir="\${mysql_${instance}_dbdir:-\"/var/db/mysql_${instance}\"}"
-		%%LEGACY_LIMITS%%eval mysql_limits="\${mysql_${instance}_limits:-\"${mysql_limits}\"}"
-		eval mysql_user="\${mysql_${instance}_user:-\"${mysql_user}\"}"
-		%%LEGACY_LIMITS%%eval mysql_limits_args="\${mysql_${instance}_limits_args:-\"-e -U $mysql_user\"}"
-		eval mysql_optfile="\${mysql_${instance}_optfile:-\"${mysql_dbdir}/my.cnf\"}"
-		eval mysql_pidfile="\${mysql_${instance}_pidfile:-\"${mysql_dbdir}/`/bin/hostname`.pid\"}"
-	;;
-	*)
-		err 1 "$2 not found in mysql_instances" ;;
-	esac
-else
-	if [ -n "${mysql_instances}" -a -n "$1" ]; then
-		for instance in ${mysql_instances}; do
-			eval _enable="\${mysql_${instance}_enable}"
-			case "${_enable:-${mysql_enable}}" in
-			[Nn][Oo]|[Ff][Aa][Ll][Ss][Ee]|[Oo][Ff][Ff]|0)
-				continue
-			;;
-			[Yy][Ee][Ss]|[Tt][Rr][Uu][Ee]|[Oo][Nn]|1)
-			;;
-			*)
-				if [ -z "$_enable" ]; then
-					_var=mysql_enable
-				else
-					_var=mysql_${instance}_enable
-				fi
-				warn "Bad value" \
-					"'${_enable:-${mysql_enable}}'" \
-					"for ${_var}. " \
-					"Instance ${instance} skipped."
-				continue
-			;;
-			esac
-			echo "===> mysql instance: ${instance}"
-			if %%PREFIX%%/etc/rc.d/mysql-server $1 ${instance}; then
-				success="${instance} ${success}"
-			else
-				failed="${instance} (${retcode}) ${failed}"
-			fi
-		done
-		exit 0
-	else
-		mysql_pidfile=${mysql_pidfile:-"${mysql_dbdir}/`/bin/hostname`.pid"}
-	fi
-fi
-
-pidfile=$mysql_pidfile
-mysql_install_db="%%PREFIX%%/bin/mysql_install_db"
-mysql_install_db_args="--basedir=%%PREFIX%% --datadir=${mysql_dbdir} --force"
-command_args="-c -f %%PREFIX%%/bin/mysqld_safe --defaults-extra-file=${mysql_optfile} --user=${mysql_user} --datadir=${mysql_dbdir} --pid-file=${pidfile} ${mysql_args}"
-
-mysql_create_auth_tables()
-{
-	eval $mysql_install_db $mysql_install_db_args
-        [ $? -eq 0 ] && chown -R ${mysql_user}:$(id -gn $mysql_user) ${mysql_dbdir}
-}
-
-mysql_prestart()
-{
-	local dir
-	for dir in /etc /etc/mysql; do
-		if [ -f "${dir}/my.cnf" ]; then
-			echo "Please move existing my.cnf file from ${dir} to %%PREFIX%%${dir}"
-			return 1
-		fi
-	done
-	if [ ! -d "${mysql_dbdir}/mysql/." ]; then
-		mysql_create_auth_tables || return 1
-	fi
-%%LEGACY_LIMITS%%	if checkyesno mysql_limits; then
-%%LEGACY_LIMITS%%		eval `/usr/bin/limits ${mysql_limits_args}` 2>/dev/null
-%%LEGACY_LIMITS%%	else
-%%LEGACY_LIMITS%%		return 0
-%%LEGACY_LIMITS%%	fi
-%%MODERN_LIMITS%%	return 0
-}
-
-mysql_poststart()
-{
-	local timeout=15
-	while [ ! -f "${pidfile}" -a ${timeout} -gt 0 ]; do
-		timeout=$(( timeout - 1 ))
-		sleep 1
-	done
-	return 0
-}
-
-run_rc_command "$1"
diff --git a/databases/mariadb103-server/files/patch-CMakeLists.txt b/databases/mariadb103-server/files/patch-CMakeLists.txt
deleted file mode 100644
index 7122c9289f07..000000000000
--- a/databases/mariadb103-server/files/patch-CMakeLists.txt
+++ /dev/null
@@ -1,19 +0,0 @@
---- CMakeLists.txt.orig	2021-05-08 08:36:42.000000000 +0200
-+++ CMakeLists.txt	2021-05-08 08:40:29.000000000 +0200
-@@ -517,13 +517,15 @@
-   WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
- )
- 
-+IF(FALSE)
- INSTALL_DOCUMENTATION(README.md CREDITS COPYING THIRDPARTY COMPONENT Readme)
-+ENDIF()
- 
- # MDEV-6526 these files are not installed anymore
- #INSTALL_DOCUMENTATION(${CMAKE_BINARY_DIR}/Docs/INFO_SRC
- #                      ${CMAKE_BINARY_DIR}/Docs/INFO_BIN)
- 
--IF(UNIX)
-+IF(FALSE)
-   INSTALL_DOCUMENTATION(Docs/INSTALL-BINARY Docs/README-wsrep COMPONENT Readme)
- ENDIF()
- 
diff --git a/databases/mariadb103-server/files/patch-MDEV-11790 b/databases/mariadb103-server/files/patch-MDEV-11790
deleted file mode 100644
index 1794bcf44da7..000000000000
--- a/databases/mariadb103-server/files/patch-MDEV-11790
+++ /dev/null
@@ -1,46 +0,0 @@
-WITHOUT_SERVER installs server-only files
-
-https://jira.mariadb.org/browse/MDEV-11790
---- extra/CMakeLists.txt.orig	2018-10-02 09:45:40 UTC
-+++ extra/CMakeLists.txt
-@@ -99,7 +99,7 @@ IF(WITH_INNOBASE_STORAGE_ENGINE)
-   ADD_DEPENDENCIES(innochecksum GenError)
- ENDIF()
- 
--MYSQL_ADD_EXECUTABLE(replace replace.c COMPONENT Server)
-+MYSQL_ADD_EXECUTABLE(replace replace.c COMPONENT Client)
- TARGET_LINK_LIBRARIES(replace mysys)
- 
- IF(UNIX)
---- scripts/CMakeLists.txt.orig	2018-10-02 09:45:42 UTC
-+++ scripts/CMakeLists.txt
-@@ -241,7 +241,10 @@ ENDIF()
- SET(mysql_config_COMPONENT COMPONENT Development)
- SET(msql2mysql_COMPONENT COMPONENT Client)
- SET(mysqlaccess_COMPONENT COMPONENT Client)
-+SET(mysqlhotcopy_COMPONENT COMPONENT Client)
-+SET(mysql_convert_table_format_COMPONENT COMPONENT Client)
- SET(mysql_find_rows_COMPONENT COMPONENT Client)
-+SET(mysql_setpermission_COMPONENT COMPONENT Client)
- SET(mytop_COMPONENT Mytop)
- 
- IF(WIN32)
-@@ -298,14 +301,14 @@ ELSE()
-   # On Unix, most of the files end up in the bin directory
-   SET(BIN_SCRIPTS
-     msql2mysql
--    mysql_config
--    mysql_setpermission
--    mysql_secure_installation
-     mysqlaccess
-+    mysqlhotcopy
-+    mysql_config
-     mysql_convert_table_format
-     mysql_find_rows
-+    mysql_secure_installation
-+    mysql_setpermission
-     mytop
--    mysqlhotcopy
-     ${SERVER_SCRIPTS}
-     ${WSREP_SCRIPTS}
-     ${SYSTEMD_SCRIPTS}
diff --git a/databases/mariadb103-server/files/patch-MDEV-20248 b/databases/mariadb103-server/files/patch-MDEV-20248
deleted file mode 100644
index ef0d97b17225..000000000000
--- a/databases/mariadb103-server/files/patch-MDEV-20248
+++ /dev/null
@@ -1,13 +0,0 @@
---- storage/rocksdb/rocksdb/port/jemalloc_helper.h.orig	2019-07-30 11:32:15 UTC
-+++ storage/rocksdb/rocksdb/port/jemalloc_helper.h
-@@ -12,6 +12,10 @@
- #include <jemalloc/jemalloc.h>
- #endif
- 
-+#ifdef __FreeBSD__
-+#define JEMALLOC_USABLE_SIZE_CONST const
-+#endif
-+
- #ifndef JEMALLOC_CXX_THROW
- #define JEMALLOC_CXX_THROW
- #endif
diff --git a/databases/mariadb103-server/files/patch-MDEV-26537 b/databases/mariadb103-server/files/patch-MDEV-26537
deleted file mode 100644
index 05cf0f5a4ebc..000000000000
--- a/databases/mariadb103-server/files/patch-MDEV-26537
+++ /dev/null
@@ -1,126 +0,0 @@
-From d09426f9e60fd93296464ec9eb5f9d85566437d3 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Marko=20M=C3=A4kel=C3=A4?= <marko.makela@mariadb.com>
-Date: Fri, 10 Sep 2021 19:15:41 +0300
-Subject: [PATCH] MDEV-26537 InnoDB corrupts files due to incorrect st_blksize
- calculation
-
-The st_blksize returned by fstat(2) is not documented to be
-a power of 2, like we assumed in
-commit 58252fff15acfe7c7b0452a87e202e3f8e454e19 (MDEV-26040).
-While on Linux, the st_blksize appears to report the file system
-block size (which hopefully is not smaller than the sector size
-of the underlying block device), on FreeBSD we observed
-st_blksize values that might have been something similar to st_size.
-
-Also IBM AIX was affected by this. A simple test case would
-lead to a crash when using the minimum innodb_buffer_pool_size=5m
-on both FreeBSD and AIX:
-
-seq -f 'create table t%g engine=innodb select * from seq_1_to_200000;' \
-1 100|mysql test&
-seq -f 'create table u%g engine=innodb select * from seq_1_to_200000;' \
-1 100|mysql test&
-
-We will fix this by not trusting st_blksize at all, and assuming that
-the smallest allowed write size (for O_DIRECT) is 4096 bytes. We hope
-that no storage systems with larger block size exist. Anything larger
-than 4096 bytes should be unlikely, given that it is the minimum
-virtual memory page size of many contemporary processors.
-
-MariaDB Server on Microsoft Windows was not affected by this.
-
-While the 512-byte sector size of the venerable Seagate ST-225 is still
-in widespread use, the minimum innodb_page_size is 4096 bytes, and
-innodb_log_file_size can be set in integer multiples of 65536 bytes.
-
-The only occasion where InnoDB uses smaller data file block sizes than
-4096 bytes is with ROW_FORMAT=COMPRESSED tables with KEY_BLOCK_SIZE=1
-or KEY_BLOCK_SIZE=2 (or innodb_page_size=4096). For such tables,
-we will from now on preallocate space in integer multiples of 4096 bytes
-and let regular writes extend the file by 1024, 2048, or 3072 bytes.
-
-The view INFORMATION_SCHEMA.INNODB_SYS_TABLESPACES.FS_BLOCK_SIZE
-should report the raw st_blksize.
-
-For page_compressed tables, the function fil_space_get_block_size()
-will map to 512 any st_blksize value that is larger than 4096.
-
-os_file_set_size(): Assume that the file system block size is 4096 bytes,
-and only support extending files to integer multiples of 4096 bytes.
-
-fil_space_extend_must_retry(): Round down the preallocation size to
-an integer multiple of 4096 bytes.
---- mysql-test/suite/innodb/t/check_ibd_filesize.test.orig	2021-08-02 10:58:56 UTC
-+++ mysql-test/suite/innodb/t/check_ibd_filesize.test
-@@ -46,6 +46,12 @@ perl;
- print "# bytes: ", (-s "$ENV{MYSQLD_DATADIR}/test/t1.ibd"), "\n";
- EOF
- INSERT INTO t1 SELECT seq,REPEAT('a',30000) FROM seq_1_to_20;
-+# Ensure that the file will be extended with the last 1024-byte page
-+# after the file was pre-extended in 4096-byte increments.
-+--disable_query_log
-+FLUSH TABLE t1 FOR EXPORT;
-+UNLOCK TABLES;
-+--enable_query_log
- perl;
- print "# bytes: ", (-s "$ENV{MYSQLD_DATADIR}/test/t1.ibd"), "\n";
- EOF
- mysql-test/suite/innodb/t/check_ibd_filesize.test |  6 ++++++
- storage/innobase/fil/fil0fil.cc                   | 13 +++++++++----
- storage/innobase/os/os0file.cc                    |  7 ++++---
- 3 files changed, 19 insertions(+), 7 deletions(-)
-
---- storage/innobase/fil/fil0fil.cc.orig	2021-08-02 10:58:57 UTC
-+++ storage/innobase/fil/fil0fil.cc
-@@ -942,11 +942,17 @@ fil_space_extend_must_retry(
- 	const page_size_t	pageSize(space->flags);
- 	const ulint		page_size = pageSize.physical();
- 
--	/* fil_read_first_page() expects srv_page_size bytes.
--	fil_node_open_file() expects at least 4 * srv_page_size bytes.*/
--	os_offset_t new_size = std::max(
--		os_offset_t(size - file_start_page_no) * page_size,
-+		/* fil_read_first_page() expects innodb_page_size bytes.
-+		fil_node_open_file() expects at least 4 * innodb_page_size bytes.
-+		os_file_set_size() expects multiples of 4096 bytes.
-+		For ROW_FORMAT=COMPRESSED tables using 1024-byte or 2048-byte
-+		pages, we will preallocate up to an integer multiple of 4096 bytes,
-+		and let normal writes append 1024, 2048, or 3072 bytes to the file. */
-+		os_offset_t new_size = std::max(
-+		(os_offset_t(size - file_start_page_no) * page_size)
-+		& ~os_offset_t(4095),
- 		os_offset_t(FIL_IBD_FILE_INITIAL_SIZE << srv_page_size_shift));
-+		
- 
- 	*success = os_file_set_size(node->name, node->handle, new_size,
- 		FSP_FLAGS_HAS_PAGE_COMPRESSION(space->flags));
---- storage/innobase/os/os0file.cc.orig	2021-08-02 10:58:57 UTC
-+++ storage/innobase/os/os0file.cc
-@@ -5351,6 +5351,8 @@ os_file_set_size(
- 	os_offset_t	size,
- 	bool	is_sparse)
- {
-+	ut_ad(!(size & 4095));
-+
- #ifdef _WIN32
- 	/* On Windows, changing file size works well and as expected for both
- 	sparse and normal files.
-@@ -5392,7 +5394,7 @@ fallback:
- 			if (current_size >= size) {
- 				return true;
- 			}
--			current_size &= ~os_offset_t(statbuf.st_blksize - 1);
-+			current_size &= ~4095ULL;
- 			err = posix_fallocate(file, current_size,
- 					      size - current_size);
- 		}
-@@ -5432,8 +5434,7 @@ fallback:
- 	if (fstat(file, &statbuf)) {
- 		return false;
- 	}
--	os_offset_t current_size = statbuf.st_size
--		& ~os_offset_t(statbuf.st_blksize - 1);
-+	os_offset_t current_size = statbuf.st_size & ~4095ULL;
- #endif
- 	if (current_size >= size) {
- 		return true;
diff --git a/databases/mariadb103-server/files/patch-cmake_install__layout.cmake b/databases/mariadb103-server/files/patch-cmake_install__layout.cmake
deleted file mode 100644
index 2f6b38ffa45d..000000000000
--- a/databases/mariadb103-server/files/patch-cmake_install__layout.cmake
+++ /dev/null
@@ -1,13 +0,0 @@
---- cmake/install_layout.cmake.orig	2020-05-09 19:27:56 UTC
-+++ cmake/install_layout.cmake
-@@ -128,8 +128,8 @@ SET(INSTALL_SUPPORTFILESDIR_STANDALONE  "support-files
- SET(INSTALL_MYSQLDATADIR_STANDALONE     "data")
- 
- SET(INSTALL_UNIX_ADDRDIR_STANDALONE     "/tmp/mysql.sock")
--SET(INSTALL_PAMDIR_STANDALONE           "share")
--SET(INSTALL_PAMDATADIR_STANDALONE       "share")
-+SET(INSTALL_PAMDIR_STANDALONE           "lib/mysql/plugin")
-+SET(INSTALL_PAMDATADIR_STANDALONE       "etc/mysql")
- #
- # RPM layout
- #
diff --git a/databases/mariadb103-server/files/patch-extra_CMakeLists.txt b/databases/mariadb103-server/files/patch-extra_CMakeLists.txt
deleted file mode 100644
index e083792cd77c..000000000000
--- a/databases/mariadb103-server/files/patch-extra_CMakeLists.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-Fix up missing WITHOUT_DOCS, WITHOUT_CLIENT options
-
---- extra/CMakeLists.txt.orig	2017-05-14 23:13:15 UTC
-+++ extra/CMakeLists.txt
-@@ -96,9 +96,11 @@ IF(UNIX)
-   MYSQL_ADD_EXECUTABLE(resolve_stack_dump resolve_stack_dump.c)
-   TARGET_LINK_LIBRARIES(resolve_stack_dump mysys)
- 
-+IF(FALSE)
-   MYSQL_ADD_EXECUTABLE(mysql_waitpid mysql_waitpid.c COMPONENT Client)
-   TARGET_LINK_LIBRARIES(mysql_waitpid mysys)
-+ENDIF()
-
-   MYSQL_ADD_EXECUTABLE(mysqld_safe_helper mysqld_safe_helper.c COMPONENT Server)
-   TARGET_LINK_LIBRARIES(mysqld_safe_helper mysys)
- ENDIF()
diff --git a/databases/mariadb103-server/files/patch-extra_mariabackup_CMakeLists.txt b/databases/mariadb103-server/files/patch-extra_mariabackup_CMakeLists.txt
deleted file mode 100644
index 4a4abfc53dc0..000000000000
--- a/databases/mariadb103-server/files/patch-extra_mariabackup_CMakeLists.txt
+++ /dev/null
@@ -1,10 +0,0 @@
---- extra/mariabackup/CMakeLists.txt.orig	2019-12-05 22:22:27 UTC
-+++ extra/mariabackup/CMakeLists.txt
-@@ -114,6 +114,7 @@ MYSQL_ADD_EXECUTABLE(mbstream
- TARGET_LINK_LIBRARIES(mbstream
-   mysys
-   crc
-+  sql
- )
- ADD_DEPENDENCIES(mbstream GenError)
- 
diff --git a/databases/mariadb103-server/files/patch-libmariadb_CMakeLists.txt b/databases/mariadb103-server/files/patch-libmariadb_CMakeLists.txt
deleted file mode 100644
index 827b9f87ceef..000000000000
--- a/databases/mariadb103-server/files/patch-libmariadb_CMakeLists.txt
+++ /dev/null
@@ -1,11 +0,0 @@
---- libmariadb/CMakeLists.txt.orig	2018-05-23 20:38:41 UTC
-+++ libmariadb/CMakeLists.txt
-@@ -371,7 +371,7 @@ ENDIF()
- INCLUDE(${CC_SOURCE_DIR}/plugins/CMakeLists.txt)
- ADD_SUBDIRECTORY(include)
- ADD_SUBDIRECTORY(libmariadb)
--IF(NOT WIN32)
-+IF(NOT WIN32 AND NOT WITHOUT_CLIENT)
-   ADD_SUBDIRECTORY(mariadb_config)
- ENDIF()
- 
diff --git a/databases/mariadb103-server/files/patch-libmariadb_include_CMakeLists.txt b/databases/mariadb103-server/files/patch-libmariadb_include_CMakeLists.txt
deleted file mode 100644
index 70e8fad20f85..000000000000
--- a/databases/mariadb103-server/files/patch-libmariadb_include_CMakeLists.txt
+++ /dev/null
@@ -1,15 +0,0 @@
---- libmariadb/include/CMakeLists.txt.orig	2017-05-14 23:13:15 UTC
-+++ libmariadb/include/CMakeLists.txt
-@@ -21,6 +21,7 @@ IF(WIN32)
-   SET(WIX_INCLUDES ${MARIADB_CLIENT_INCLUDES} ${MARIADB_ADDITIONAL_INCLUDES} ${MYSQL_ADDITIONAL_INCLUDES} PARENT_SCOPE)
- ENDIF()
- 
-+IF(NOT WITHOUT_CLIENT)
- INSTALL(FILES
-    ${MARIADB_CLIENT_INCLUDES}
-    DESTINATION ${INSTALL_INCLUDEDIR}
-@@ -33,3 +34,4 @@ INSTALL(FILES
-    ${MARIADB_ADDITIONAL_INCLUDES}
-    DESTINATION ${INSTALL_INCLUDEDIR}/mariadb
-    COMPONENT Development)
-+ENDIF()
diff --git a/databases/mariadb103-server/files/patch-libmariadb_libmariadb_CMakeLists.txt b/databases/mariadb103-server/files/patch-libmariadb_libmariadb_CMakeLists.txt
deleted file mode 100644
index 0542221db134..000000000000
--- a/databases/mariadb103-server/files/patch-libmariadb_libmariadb_CMakeLists.txt
+++ /dev/null
@@ -1,14 +0,0 @@
---- libmariadb/libmariadb/CMakeLists.txt.orig	2017-05-14 23:13:15 UTC
-+++ libmariadb/libmariadb/CMakeLists.txt
-@@ -401,9 +401,11 @@ SET_TARGET_PROPERTIES(libmariadb PROPERT
- INSTALL(TARGETS mariadbclient
-           COMPONENT Development
-           DESTINATION ${INSTALL_LIBDIR})
-+IF(NOT WITHOUT_CLIENT)
- INSTALL(TARGETS libmariadb
-           COMPONENT SharedLibraries
-         DESTINATION ${INSTALL_LIBDIR})
-+ENDIF()
- 
- IF(WIN32)
-    # On Windows, install PDB
diff --git a/databases/mariadb103-server/files/patch-libmariadb_plugins_auth_CMakeLists.txt b/databases/mariadb103-server/files/patch-libmariadb_plugins_auth_CMakeLists.txt
deleted file mode 100644
index aa01e9d54190..000000000000
--- a/databases/mariadb103-server/files/patch-libmariadb_plugins_auth_CMakeLists.txt
+++ /dev/null
@@ -1,30 +0,0 @@
---- libmariadb/plugins/auth/CMakeLists.txt.orig	2019-11-11 05:31:43 UTC
-+++ libmariadb/plugins/auth/CMakeLists.txt
-@@ -75,6 +75,7 @@ IF(CRYPTO_PLUGIN)
-                         ${CRYPT_SOURCE}
-                 LIBRARIES ${CRYPT_LIBS})
- 
-+  IF(NOT WITHOUT_CLIENT)
-   IF(WITH_SSL STREQUAL "GNUTLS" AND NOT WIN32)
-     MESSAGE1(STATUS "sha256_password not supported by GnuTLS due to missing OAEP padding")
-   ELSE()
-@@ -85,6 +86,7 @@ IF(CRYPTO_PLUGIN)
-                     SOURCES ${AUTH_DIR}/sha256_pw.c
-                     LIBRARIES ${CRYPT_LIBS})
-   ENDIF()
-+  ENDIF()  
- ENDIF()
- 
- #GSSAPI client authentication plugin
-@@ -119,9 +121,11 @@ REGISTER_PLUGIN(TARGET mysql_old_password
-                 DEFAULT STATIC
-                 SOURCES ${AUTH_DIR}/old_password.c)
- 
-+IF(NOT WITHOUT_CLIENT)
- # Cleartext
- REGISTER_PLUGIN(TARGET mysql_clear_password
-                 TYPE MARIADB_CLIENT_PLUGIN_AUTH
-                 CONFIGURATIONS DYNAMIC STATIC OFF
-                 DEFAULT DYNAMIC
-                 SOURCES ${AUTH_DIR}/mariadb_cleartext.c)
-+ENDIF()
diff --git a/databases/mariadb103-server/files/patch-libservices_CMakeLists.txt b/databases/mariadb103-server/files/patch-libservices_CMakeLists.txt
deleted file mode 100644
index 82bf5fac68ea..000000000000
--- a/databases/mariadb103-server/files/patch-libservices_CMakeLists.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-Fix up missing WITHOUT_DOCS, WITHOUT_CLIENT options
-
---- libservices/CMakeLists.txt.orig	2017-05-14 23:13:16 UTC
-+++ libservices/CMakeLists.txt
-@@ -40,4 +40,6 @@ SET(MYSQLSERVICES_SOURCES
-   )
- 
- ADD_CONVENIENCE_LIBRARY(mysqlservices ${MYSQLSERVICES_SOURCES})
-+IF(FALSE)
- INSTALL(TARGETS mysqlservices DESTINATION ${INSTALL_LIBDIR} COMPONENT Development)
-+ENDIF()
diff --git a/databases/mariadb103-server/files/patch-man_CMakeLists.txt b/databases/mariadb103-server/files/patch-man_CMakeLists.txt
deleted file mode 100644
index 350a8f5ef2b7..000000000000
--- a/databases/mariadb103-server/files/patch-man_CMakeLists.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-Fix up missing WITHOUT_DOCS, WITHOUT_CLIENT options
-
---- man/CMakeLists.txt.orig	2017-05-14 23:13:16 UTC
-+++ man/CMakeLists.txt
-@@ -38,7 +38,8 @@ SET(MAN1_TEST mysql-stress-test.pl.1 mys
- 
- INSTALL(FILES ${MAN1_SERVER} DESTINATION ${INSTALL_MANDIR}/man1 COMPONENT ManPagesServer)
- INSTALL(FILES ${MAN8_SERVER} DESTINATION ${INSTALL_MANDIR}/man8 COMPONENT ManPagesServer)
-+IF(FALSE)
- INSTALL(FILES ${MAN1_CLIENT} DESTINATION ${INSTALL_MANDIR}/man1 COMPONENT ManPagesClient)
- INSTALL(FILES ${MAN1_DEVEL} DESTINATION ${INSTALL_MANDIR}/man1 COMPONENT ManPagesDevelopment)
- INSTALL(FILES ${MAN1_TEST} DESTINATION ${INSTALL_MANDIR}/man1 COMPONENT ManPagesTest)
--
-+ENDIF()
diff --git a/databases/mariadb103-server/files/patch-mysys_my__default.c b/databases/mariadb103-server/files/patch-mysys_my__default.c
deleted file mode 100644
index ef8d9b5ca53e..000000000000
--- a/databases/mariadb103-server/files/patch-mysys_my__default.c
+++ /dev/null
@@ -1,52 +0,0 @@
---- mysys/my_default.c.orig	2017-05-14 23:13:17 UTC
-+++ mysys/my_default.c
-@@ -785,7 +785,7 @@ static int search_default_file_with_ext(
-   {
-     MY_STAT stat_info;
-     if (!my_stat(name,&stat_info,MYF(0)))
--      return 1;
-+      return 0;
-     /*
-       Ignore world-writable regular files.
-       This is mainly done to protect us to not read a file created by
-@@ -803,6 +803,14 @@ static int search_default_file_with_ext(
-   if (!(fp= mysql_file_fopen(key_file_cnf, name, O_RDONLY, MYF(0))))
-     return 1;					/* Ignore wrong files */
- 
-+  if (strstr(name, "/etc") == name)
-+  {
-+    fprintf(stderr,
-+             "error: Config file %s in invalid location, please move to or merge with %%PREFIX%%%s\n",
-+             name,name);
-+      goto err;
-+  }
-+
-   while (mysql_file_fgets(buff, sizeof(buff) - 1, fp))
-   {
-     line++;
-@@ -1067,7 +1075,8 @@ void my_print_default_files(const char *
-           if (name[0] == FN_HOMELIB)	/* Add . to filenames in home */
-             *end++= '.';
-           strxmov(end, conf_file, *ext, " ", NullS);
--          fputs(name, stdout);
-+          if (strstr(name, "/etc") != name)
-+            fputs(name, stdout);
-         }
-       }
-     }
-@@ -1192,13 +1201,10 @@ static const char **init_default_directo
- 
- #else
- 
--#if defined(DEFAULT_SYSCONFDIR)
--  if (DEFAULT_SYSCONFDIR[0])
--    errors += add_directory(alloc, DEFAULT_SYSCONFDIR, dirs);
--#else
-   errors += add_directory(alloc, "/etc/", dirs);
-   errors += add_directory(alloc, "/etc/mysql/", dirs);
--#endif /* DEFAULT_SYSCONFDIR */
-+  errors += add_directory(alloc, "%%PREFIX%%/etc/", dirs);
-+  errors += add_directory(alloc, "%%PREFIX%%/etc/mysql/", dirs);
- 
- #endif
- 
diff --git a/databases/mariadb103-server/files/patch-oqgraph-MDEV-15291 b/databases/mariadb103-server/files/patch-oqgraph-MDEV-15291
deleted file mode 100644
index 05083cd206ac..000000000000
--- a/databases/mariadb103-server/files/patch-oqgraph-MDEV-15291
+++ /dev/null
@@ -1,40 +0,0 @@
---- storage/oqgraph/oqgraph_judy.cc.orig	2018-02-12 15:01:28 UTC
-+++ storage/oqgraph/oqgraph_judy.cc
-@@ -27,7 +27,7 @@
- /*
-   Currently the only active code that can return error is:
-     judy_bitset::reset()/J1U()
--    judy_bitset::setbit()/J1S()
-+    judy_bitset::jsetbit()/J1S()
- 
-   In most cases errors are either about wrong parameters passed to Judy
-   functions or internal structures corruption. These definitely deserve
-@@ -60,7 +60,7 @@ bool open_query::judy_bitset::test(size_
-   return rc == 1;
- }
- 
--open_query::judy_bitset& open_query::judy_bitset::setbit(size_type n)
-+open_query::judy_bitset& open_query::judy_bitset::jsetbit(size_type n)
- {
-   int rc;
-   J1S(rc, array, n);
---- storage/oqgraph/oqgraph_judy.h.orig	2018-02-12 15:01:28 UTC
-+++ storage/oqgraph/oqgraph_judy.h
-@@ -63,7 +63,7 @@ namespace open_query
-       if (!val)
-         return reset(n);
-       else
--        return setbit(n);
-+        return jsetbit(n);
-     }
- 
-     judy_bitset& set(const judy_bitset& src);
-@@ -115,7 +115,7 @@ namespace open_query
-   private:
-     mutable void* array;
- 
--    judy_bitset& setbit(size_type n);
-+    judy_bitset& jsetbit(size_type n);
-   };
- }
- 
diff --git a/databases/mariadb103-server/files/patch-pcre_CMakeLists.txt b/databases/mariadb103-server/files/patch-pcre_CMakeLists.txt
deleted file mode 100644
index c09bb5f9d875..000000000000
--- a/databases/mariadb103-server/files/patch-pcre_CMakeLists.txt
+++ /dev/null
@@ -1,11 +0,0 @@
---- pcre/CMakeLists.txt.orig	2017-08-17 10:05:39 UTC
-+++ pcre/CMakeLists.txt
-@@ -510,6 +510,8 @@ IF(PCRE_SHOW_REPORT)
-   MESSAGE(STATUS "")
- ENDIF(PCRE_SHOW_REPORT)
- 
-+IF(FALSE)
- INSTALL(FILES ${CMAKE_BINARY_DIR}/pcre/pcre.h DESTINATION ${INSTALL_INCLUDEDIR}/server/private COMPONENT Development)
-+ENDIF()
- 
- # end CMakeLists.txt
diff --git a/databases/mariadb103-server/files/patch-scripts_mysql__config.sh b/databases/mariadb103-server/files/patch-scripts_mysql__config.sh
deleted file mode 100644
index 13f25ca9fb74..000000000000
--- a/databases/mariadb103-server/files/patch-scripts_mysql__config.sh
+++ /dev/null
@@ -1,12 +0,0 @@
---- scripts/mysql_config.sh.orig	2017-05-24 09:15:23 UTC
-+++ scripts/mysql_config.sh
-@@ -106,7 +106,9 @@ fi
- 
- # Create options 
- libs="-L$pkglibdir @RPATH_OPTION@ @LIBS_FOR_CLIENTS@"
-+libs="$libs -L%%LOCALBASE%%/lib "
- embedded_libs="-L$pkglibdir @RPATH_OPTION@ @EMB_LIBS_FOR_CLIENTS@"
-+embedded_libs="$embedded_libs -L%%LOCALBASE%%/lib "
- 
- include="-I$pkgincludedir"
- if [ "$basedir" != "/usr" ]; then
diff --git a/databases/mariadb103-server/files/patch-scripts_mysqld__safe.sh b/databases/mariadb103-server/files/patch-scripts_mysqld__safe.sh
deleted file mode 100644
index 0c694bd3a30a..000000000000
--- a/databases/mariadb103-server/files/patch-scripts_mysqld__safe.sh
+++ /dev/null
@@ -1,16 +0,0 @@
---- scripts/mysqld_safe.sh.orig	2017-05-24 09:15:23 UTC
-+++ scripts/mysqld_safe.sh
-@@ -568,11 +568,11 @@ fi
- 
- if test -z "$MYSQL_HOME"
- then 
--  if test -r "$DATADIR/my.cnf"
-+  if test -r "$DATADIR/etc/my.cnf"
-   then
-     log_error "WARNING: Found $DATADIR/my.cnf
- The data directory is not a valid location for my.cnf, please move it to
--$MY_BASEDIR_VERSION/my.cnf"
-+$MY_BASEDIR_VERSION/etc/my.cnf"
-   fi
-   MYSQL_HOME=$MY_BASEDIR_VERSION
- fi
diff --git a/databases/mariadb103-server/files/patch-scripts_wsrep__sst__mariabackup.sh b/databases/mariadb103-server/files/patch-scripts_wsrep__sst__mariabackup.sh
deleted file mode 100644
index dc45c2d238c7..000000000000
--- a/databases/mariadb103-server/files/patch-scripts_wsrep__sst__mariabackup.sh
+++ /dev/null
@@ -1,11 +0,0 @@
---- scripts/wsrep_sst_mariabackup.sh.orig	2021-06-09 14:23:11.000000000 +0200
-+++ scripts/wsrep_sst_mariabackup.sh
-@@ -696,7 +696,7 @@
-     local ltcmd="$tcmd"
-     if [ $tmt -gt 0 ]; then
-         if [ -n "$(command -v timeout)" ]; then
--            if timeout --help | grep -qw -- '-k'; then
-+            if timeout --help 2>&1 | grep -qw -- '-k'; then
-                 ltcmd="timeout -k $(( tmt+10 )) $tmt $tcmd"
-             else
-                 ltcmd="timeout -s9 $tmt $tcmd"
diff --git a/databases/mariadb103-server/files/patch-sql_mysqld.cc b/databases/mariadb103-server/files/patch-sql_mysqld.cc
deleted file mode 100644
index 4109d800da4c..000000000000
--- a/databases/mariadb103-server/files/patch-sql_mysqld.cc
+++ /dev/null
@@ -1,31 +0,0 @@
---- sql/mysqld.cc.orig	2021-05-05 15:26:23 UTC
-+++ sql/mysqld.cc
-@@ -206,7 +206,7 @@ typedef fp_except fp_except_t;
- 
- inline void setup_fpu()
- {
--#if defined(__FreeBSD__) && defined(HAVE_IEEEFP_H) && !defined(HAVE_FEDISABLEEXCEPT)
-+#if defined(__FreeBSD__) && defined(HAVE_IEEEFP_H) && !defined(HAVE_FEDISABLEEXCEPT) && defined(FP_X_INV)
-   /* We can't handle floating point exceptions with threads, so disable
-      this on freebsd
-      Don't fall for overflow, underflow,divide-by-zero or loss of precision.
-@@ -219,7 +219,7 @@ inline void setup_fpu()
-   fpsetmask(~(FP_X_INV |             FP_X_OFL | FP_X_UFL | FP_X_DZ |
-               FP_X_IMP));
- #endif /* FP_X_DNML */
--#endif /* __FreeBSD__ && HAVE_IEEEFP_H && !HAVE_FEDISABLEEXCEPT */
-+#endif /* __FreeBSD__ && HAVE_IEEEFP_H && !HAVE_FEDISABLEEXCEPT && defined(FP_X_INV) */
- 
- #ifdef HAVE_FEDISABLEEXCEPT
-   fedisableexcept(FE_ALL_EXCEPT);
-@@ -5033,8 +5033,9 @@ static void init_ssl()
-       while ((err= ERR_get_error()))
-         sql_print_warning("SSL error: %s", ERR_error_string(err, NULL));
-     }
--    else
-+    else {
-       ERR_remove_state(0);
-+    }
-   }
-   else
-   {
diff --git a/databases/mariadb103-server/files/patch-storage_innobase_lz4.cmake b/databases/mariadb103-server/files/patch-storage_innobase_lz4.cmake
deleted file mode 100644
index 245725cd4801..000000000000
--- a/databases/mariadb103-server/files/patch-storage_innobase_lz4.cmake
+++ /dev/null
@@ -1,36 +0,0 @@
---- storage/innobase/lz4.cmake.orig	2021-08-02 10:58:57 UTC
-+++ storage/innobase/lz4.cmake
-@@ -17,9 +17,16 @@ SET(WITH_INNODB_LZ4 AUTO CACHE STRING
- 
- MACRO (MYSQL_CHECK_LZ4)
-   IF (WITH_INNODB_LZ4 STREQUAL "ON" OR WITH_INNODB_LZ4 STREQUAL "AUTO")
--    CHECK_INCLUDE_FILES(lz4.h HAVE_LZ4_H)
--    CHECK_LIBRARY_EXISTS(lz4 LZ4_compress_limitedOutput "" HAVE_LZ4_SHARED_LIB)
--    CHECK_LIBRARY_EXISTS(lz4 LZ4_compress_default "" HAVE_LZ4_COMPRESS_DEFAULT)
-+    find_path(LZ4_INCLUDE_DIR NAMES lz4.h)
-+    find_library(LZ4_LIBRARY NAMES lz4)
-+    IF (LZ4_LIBRARY)
-+    get_filename_component(LZ4_LIBDIR ${LZ4_LIBRARY} DIRECTORY)
-+#MESSAGE(STATUS "LZ4_INCLUDE_DIR=${LZ4_INCLUDE_DIR} LZ4_LIBRARY=${LZ4_LIBRARY} LZ4_LIBDIR=${LZ4_LIBDIR}")
-+    IF (LZ4_INCLUDE_DIR)
-+      SET(HAVE_LZ4_H YES)
-+    ENDIF()
-+    CHECK_LIBRARY_EXISTS(lz4 LZ4_compress_limitedOutput ${LZ4_LIBDIR} HAVE_LZ4_SHARED_LIB)
-+    CHECK_LIBRARY_EXISTS(lz4 LZ4_compress_default ${LZ4_LIBDIR} HAVE_LZ4_COMPRESS_DEFAULT)
- 
-     IF (HAVE_LZ4_SHARED_LIB AND HAVE_LZ4_H)
-       SET(HAVE_INNODB_LZ4 TRUE)
-@@ -27,11 +34,12 @@ MACRO (MYSQL_CHECK_LZ4)
-       IF (HAVE_LZ4_COMPRESS_DEFAULT)
-         ADD_DEFINITIONS(-DHAVE_LZ4_COMPRESS_DEFAULT=1)
-       ENDIF()
--      LINK_LIBRARIES(lz4)
-+      LINK_LIBRARIES(${LZ4_LIBRARY})
-     ELSE()
-       IF (WITH_INNODB_LZ4 STREQUAL "ON")
-         MESSAGE(FATAL_ERROR "Required lz4 library is not found")
-       ENDIF()
-+    ENDIF()
-     ENDIF()
-   ENDIF()
-   ADD_FEATURE_INFO(INNODB_LZ4 HAVE_INNODB_LZ4 "LZ4 compression in the InnoDB storage engine")
diff --git a/databases/mariadb103-server/files/patch-storage_innobase_lzo.cmake b/databases/mariadb103-server/files/patch-storage_innobase_lzo.cmake
deleted file mode 100644
index 54de34c4f0d8..000000000000
--- a/databases/mariadb103-server/files/patch-storage_innobase_lzo.cmake
+++ /dev/null
@@ -1,24 +0,0 @@
---- storage/innobase/lzo.cmake.orig	2021-08-02 10:58:57 UTC
-+++ storage/innobase/lzo.cmake
-@@ -17,13 +17,17 @@ SET(WITH_INNODB_LZO AUTO CACHE STRING
- 
- MACRO (MYSQL_CHECK_LZO)
-   IF (WITH_INNODB_LZO STREQUAL "ON" OR WITH_INNODB_LZO STREQUAL "AUTO")
--    CHECK_INCLUDE_FILES(lzo/lzo1x.h HAVE_LZO_H)
--    CHECK_LIBRARY_EXISTS(lzo2 lzo1x_1_compress "" HAVE_LZO_SHARED_LIB)
--
-+    find_path(LZO_INCLUDE NAMES lzo/lzo1x.h)
-+    find_library(LZO_LIBRARY NAMES lzo2)
-+    get_filename_component(LZO_LIBDIR ${LZO_LIBRARY} DIRECTORY)
-+    IF (LZO_INCLUDE)
-+      SET(HAVE_LZO_H 1)
-+    ENDIF()
-+    CHECK_LIBRARY_EXISTS(lzo2 lzo1x_1_compress ${LZO_LIBDIR} HAVE_LZO_SHARED_LIB)
-     IF(HAVE_LZO_SHARED_LIB AND HAVE_LZO_H)
-       SET(HAVE_INNODB_LZO TRUE)
-       ADD_DEFINITIONS(-DHAVE_LZO=1)
--      LINK_LIBRARIES(lzo2)
-+      LINK_LIBRARIES(${LZO_LIBRARY})
-     ELSE()
-       IF (WITH_INNODB_LZO STREQUAL "ON")
-         MESSAGE(FATAL_ERROR "Required lzo library is not found")
diff --git a/databases/mariadb103-server/files/patch-storage_innobase_snappy.cmake b/databases/mariadb103-server/files/patch-storage_innobase_snappy.cmake
deleted file mode 100644
index 9e8fc040616c..000000000000
--- a/databases/mariadb103-server/files/patch-storage_innobase_snappy.cmake
+++ /dev/null
@@ -1,25 +0,0 @@
---- storage/innobase/snappy.cmake.orig	2021-08-02 10:58:58 UTC
-+++ storage/innobase/snappy.cmake
-@@ -17,13 +17,18 @@ SET(WITH_INNODB_SNAPPY AUTO CACHE STRING
- 
- MACRO (MYSQL_CHECK_SNAPPY)
-   IF (WITH_INNODB_SNAPPY STREQUAL "ON" OR WITH_INNODB_SNAPPY STREQUAL "AUTO")
--    CHECK_INCLUDE_FILES(snappy-c.h HAVE_SNAPPY_H)
--    CHECK_LIBRARY_EXISTS(snappy snappy_uncompress "" HAVE_SNAPPY_SHARED_LIB)
--
-+    find_path(SNAPPY_INCLUDE_DIR NAMES snappy-c.h)
-+    find_library(SNAPPY_LIBRARY NAMES snappy)
-+    get_filename_component(SNAPPY_LIBDIR ${SNAPPY_LIBRARY} DIRECTORY)
-+    IF (SNAPPY_INCLUDE_DIR)
-+      SET(HAVE_SNAPPY_H 1)
-+    ENDIF()
-+    CHECK_LIBRARY_EXISTS(snappy snappy_uncompress ${SNAPPY_LIBDIR} HAVE_SNAPPY_SHARED_LIB)
-+#MESSAGE(STATUS "HAVE_SNAPPY_H=${HAVE_SNAPPY_H} HAVE_SNAPPY_SHARED_LIB=${HAVE_SNAPPY_SHARED_LIB} SNAPPY_LIBDIR=${SNAPPY_LIBDIR} ")
-     IF(HAVE_SNAPPY_SHARED_LIB AND HAVE_SNAPPY_H)
-       SET(HAVE_INNODB_SNAPPY TRUE)
-       ADD_DEFINITIONS(-DHAVE_SNAPPY=1)
--      LINK_LIBRARIES(snappy)
-+      LINK_LIBRARIES(${SNAPPY_LIBRARY})
-     ELSE()
-       IF (WITH_INNODB_SNAPPY STREQUAL "ON")
-         MESSAGE(FATAL_ERROR "Required snappy library is not found")
diff --git a/databases/mariadb103-server/files/patch-storage_mroonga_vendor_groonga_CMakeLists.txt b/databases/mariadb103-server/files/patch-storage_mroonga_vendor_groonga_CMakeLists.txt
deleted file mode 100644
index 023d10e97d94..000000000000
--- a/databases/mariadb103-server/files/patch-storage_mroonga_vendor_groonga_CMakeLists.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-From https://github.com/openquery/mariadb-server/commit/43bf72e45b9ead6aa0dc4abd6e5719c6381974b5
-
---- storage/mroonga/vendor/groonga/CMakeLists.txt.orig	2017-05-14 23:13:18 UTC
-+++ storage/mroonga/vendor/groonga/CMakeLists.txt
-@@ -167,6 +167,10 @@ if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_COM
-   MY_CHECK_AND_SET_COMPILER_FLAG("-Wno-clobbered")
- endif()
- 
-+if(CMAKE_COMPILER_IS_CLANGCXX)
-+  MY_CHECK_AND_SET_COMPILER_FLAG("-fexceptions")
-+endif()
-+
- if(NOT DEFINED CMAKE_C_COMPILE_OPTIONS_PIC)
-   # For old CMake
-   if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_COMPILER_IS_CLANGCXX)
diff --git a/databases/mariadb103-server/files/patch-storage_tokudb_CMakeLists.txt b/databases/mariadb103-server/files/patch-storage_tokudb_CMakeLists.txt
deleted file mode 100644
index e75813586e40..000000000000
--- a/databases/mariadb103-server/files/patch-storage_tokudb_CMakeLists.txt
+++ /dev/null
@@ -1,9 +0,0 @@
---- storage/tokudb/CMakeLists.txt.orig	2017-09-25 08:33:26.000000000 +0200
-+++ storage/tokudb/CMakeLists.txt	2017-09-28 21:46:55.119327000 +0200
-@@ -108,6 +108,3 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINA
- 
- TARGET_LINK_LIBRARIES(tokudb tokufractaltree_static tokuportability_static
-                       ${ZLIB_LIBRARY} ${LIBJEMALLOC} stdc++)
--
--SET(CMAKE_MODULE_LINKER_FLAGS_RELEASE "${CMAKE_MODULE_LINKER_FLAGS_RELEASE} -flto -fuse-linker-plugin")
--SET(CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO "${CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO} -flto -fuse-linker-plugin")
diff --git a/databases/mariadb103-server/files/patch-storage_tokudb_PerconaFT_CMakeLists.txt b/databases/mariadb103-server/files/patch-storage_tokudb_PerconaFT_CMakeLists.txt
deleted file mode 100644
index 9ef62147175b..000000000000
--- a/databases/mariadb103-server/files/patch-storage_tokudb_PerconaFT_CMakeLists.txt
+++ /dev/null
@@ -1,11 +0,0 @@
---- storage/tokudb/PerconaFT/CMakeLists.txt.orig	2017-05-14 23:13:20 UTC
-+++ storage/tokudb/PerconaFT/CMakeLists.txt
-@@ -80,7 +80,7 @@ add_subdirectory(src)
- add_subdirectory(ftcxx)
- add_subdirectory(tools)
- 
--INSTALL_DOCUMENTATION(README.md COPYING.AGPLv3 COPYING.GPLv2 PATENTS
-+INSTALL_DOCUMENTATION(README.md
-   COMPONENT Server)
- 
- ## build tags
diff --git a/databases/mariadb103-server/files/patch-storage_tokudb_PerconaFT_cmake__modules_TokuThirdParty.cmake b/databases/mariadb103-server/files/patch-storage_tokudb_PerconaFT_cmake__modules_TokuThirdParty.cmake
deleted file mode 100644
index 5bd9971c69da..000000000000
--- a/databases/mariadb103-server/files/patch-storage_tokudb_PerconaFT_cmake__modules_TokuThirdParty.cmake
+++ /dev/null
@@ -1,36 +0,0 @@
---- storage/tokudb/PerconaFT/cmake_modules/TokuThirdParty.cmake.orig	2019-11-06 16:01:58 UTC
-+++ storage/tokudb/PerconaFT/cmake_modules/TokuThirdParty.cmake
-@@ -1,5 +1,12 @@
- include(ExternalProject)
- 
-+IF (CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
-+  include_directories("/usr/include")
-+
-+  add_library(lzma SHARED IMPORTED)
-+  set_target_properties(lzma PROPERTIES IMPORTED_LOCATION
-+    "/usr/lib/liblzma.so")
-+ELSE()
- ## add lzma with an external project
- set(xz_configure_opts --with-pic --enable-static)
- if (APPLE)
-@@ -105,8 +112,15 @@ add_library(lzma STATIC IMPORTED)
- set_target_properties(lzma PROPERTIES IMPORTED_LOCATION
-   "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/xz/lib/liblzma.a")
- add_dependencies(lzma build_lzma)
-+ENDIF()
- 
-+IF (CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
-+  include_directories("%%LOCALBASE%%/include")
- 
-+  add_library(snappy SHARED IMPORTED)
-+  set_target_properties(snappy PROPERTIES IMPORTED_LOCATION
-+    "%%LOCALBASE%%/lib/libsnappy.so")
-+ELSE()
- ## add snappy with an external project
- set(SNAPPY_SOURCE_DIR "${TokuDB_SOURCE_DIR}/third_party/snappy-1.1.2" CACHE FILEPATH "Where to find sources for snappy.")
- if (NOT EXISTS "${SNAPPY_SOURCE_DIR}/CMakeLists.txt")
-@@ -140,3 +154,4 @@ add_library(snappy STATIC IMPORTED)
- set_target_properties(snappy PROPERTIES IMPORTED_LOCATION
-   "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/snappy/lib/libsnappy.a")
- add_dependencies(snappy build_snappy)
-+ENDIF()
diff --git a/databases/mariadb103-server/files/patch-storage_tokudb_PerconaFT_portability_memory.cc b/databases/mariadb103-server/files/patch-storage_tokudb_PerconaFT_portability_memory.cc
deleted file mode 100644
index c6eb23c5a525..000000000000
--- a/databases/mariadb103-server/files/patch-storage_tokudb_PerconaFT_portability_memory.cc
+++ /dev/null
@@ -1,16 +0,0 @@
-Fix build error
-
---- storage/tokudb/PerconaFT/portability/memory.cc.orig	2017-05-14 23:13:21 UTC
-+++ storage/tokudb/PerconaFT/portability/memory.cc
-@@ -42,11 +42,6 @@ Copyright (c) 2006, 2015, Percona and/or
- #include <string.h>
- #include <stdio.h>
- #include <stdlib.h>
--#if defined(HAVE_MALLOC_H)
--# include <malloc.h>
--#elif defined(HAVE_SYS_MALLOC_H)
--# include <sys/malloc.h>
--#endif
- #include <dlfcn.h>
- #include <toku_race_tools.h>
- #include "memory.h"
diff --git a/databases/mariadb103-server/files/patch-support-files_CMakeLists.txt b/databases/mariadb103-server/files/patch-support-files_CMakeLists.txt
deleted file mode 100644
index c9392ca628a2..000000000000
--- a/databases/mariadb103-server/files/patch-support-files_CMakeLists.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-Fix up missing WITHOUT_DOCS, WITHOUT_CLIENT options
-
---- support-files/CMakeLists.txt.orig	2017-05-14 23:13:28 UTC
-+++ support-files/CMakeLists.txt
-@@ -83,7 +83,9 @@ IF(UNIX)
-   CONFIGURE_FILE(mariadb.pc.in ${CMAKE_CURRENT_BINARY_DIR}/mariadb.pc @ONLY)
-   INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/mariadb.pc DESTINATION ${INSTALL_SHAREDIR}/pkgconfig COMPONENT Development)
- 
-+IF(FALSE)
-   INSTALL(FILES mysql.m4 DESTINATION ${INSTALL_SHAREDIR}/aclocal COMPONENT Development)
-+ENDIF()
-   
-   SET(bindir ${INSTALL_BINDIRABS})
-   SET(sbindir ${INSTALL_SBINDIRABS})
diff --git a/databases/mariadb103-server/files/pkg-message.in b/databases/mariadb103-server/files/pkg-message.in
deleted file mode 100644
index 7c02aa873dca..000000000000
--- a/databases/mariadb103-server/files/pkg-message.in
+++ /dev/null
@@ -1,20 +0,0 @@
-[
-{ type: install
-  message: <<EOM
-MariaDB respects hier(7) and doesn't check /etc and /etc/mysql for
-my.cnf. Please move existing my.cnf files from those paths to
-%%PREFIX%%/etc and %%PREFIX%%/etc/mysql.
-
-This port does NOT include the mytop perl script, this is included in
-the MariaDB tarball but the most recent version can be found in the
-databases/mytop port
-EOM
-}
-{ type: upgrade
-  message: <<EOM
-Remember to run mysql_upgrade (with the optional --datadir=<dbdir> flag)
-the first time you start the MySQL server after an upgrade from an
-earlier version.
-EOM
-}
-]
diff --git a/databases/mariadb103-server/pkg-descr b/databases/mariadb103-server/pkg-descr
deleted file mode 100644
index 874d96eeaa95..000000000000
--- a/databases/mariadb103-server/pkg-descr
+++ /dev/null
@@ -1,14 +0,0 @@
-MariaDB is a database server that offers drop-in replacement functionality
-for MySQL. MariaDB is built by some of the original authors of MySQL, with
-assistance from the broader community of Free and open source software
-developers. In addition to the core functionality of MySQL, MariaDB offers
-a rich set of feature enhancements including alternate storage engines,
-server optimizations, and patches.
-
-MariaDB is primarily driven by developers at Monty Program, a company
-founded by Michael "Monty" Widenius, the original author of MySQL, but
-this is not the whole story about MariaDB. On the "About MariaDB" page you
-will find more information about all participants in the MariaDB community,
-including storage engines XtraDB and PBXT.
-
-WWW: https://mariadb.org/
diff --git a/databases/mariadb103-server/pkg-plist b/databases/mariadb103-server/pkg-plist
deleted file mode 100644
index 8ec9d7fffce5..000000000000
--- a/databases/mariadb103-server/pkg-plist
+++ /dev/null
@@ -1,353 +0,0 @@
-bin/aria_chk
-bin/aria_dump_log
-bin/aria_ftdump
-bin/aria_pack
-bin/aria_read_log
-%%INNOBASE%%bin/innochecksum
-%%INNOBASE%%bin/mariabackup
-%%INNOBASE%%bin/mbstream
-@comment bin/msql2mysql
-bin/my_print_defaults
-bin/myisam_ftdump
-bin/myisamchk
-bin/myisamlog
-bin/myisampack
-%%ROCKSDB%%bin/myrocks_hotbackup
-bin/mysql_client_test
-bin/mysql_client_test_embedded
-@comment bin/mysql_config
-@comment bin/mysql_convert_table_format
-bin/mysql_embedded
-@comment bin/mysql_find_rows
-bin/mysql_fix_extensions
-bin/mysql_install_db
-%%ROCKSDB%%bin/mysql_ldb
-bin/mysql_plugin
-bin/mysql_secure_installation
-@comment bin/mysql_setpermission
-bin/mysql_tzinfo_to_sql
-bin/mysql_upgrade
-@comment bin/mysqlaccess
-bin/mysqld_multi
-bin/mysqld_safe
-bin/mysqld_safe_helper
-bin/mysqldumpslow
-@comment bin/mysqlhotcopy
-@comment bin/mysqltest
-@comment bin/mysqltest_embedded
-@comment bin/mytop
-bin/perror
-@comment bin/replace
-bin/resolve_stack_dump
-bin/resolveip
-%%ROCKSDB%%bin/sst_dump
-@comment bin/test-connect-t
-%%TOKUDB%%bin/tokuft_logprint
-%%TOKUDB%%bin/tokuftdump
-%%WSREP%%bin/wsrep_sst_common
-%%WSREP%%bin/wsrep_sst_mariabackup
-%%WSREP%%bin/wsrep_sst_mysqldump
-%%WSREP%%bin/wsrep_sst_rsync
-%%WSREP%%bin/wsrep_sst_rsync_wan
-@comment data/test/db.opt
-@comment etc/init.d/mysql
-etc/logrotate.d/mysql
-@comment etc/my.cnf
-@sample etc/mysql/user_map.conf.sample
-@comment include/mysql/mariadb_rpl.h
-@comment include/mysql/my_config.h
-@comment include/mysql/my_global.h
-@comment include/mysql/my_sys.h
-@comment include/mysql/mysql_com.h
-@comment include/mysql/mysql_version.h
-@comment include/mysql/mysqld_error.h
-include/mysql/server/big_endian.h
-include/mysql/server/byte_order_generic.h
-include/mysql/server/byte_order_generic_x86.h
-include/mysql/server/byte_order_generic_x86_64.h
-include/mysql/server/decimal.h
-include/mysql/server/errmsg.h
-include/mysql/server/handler_ername.h
-include/mysql/server/handler_state.h
-include/mysql/server/json_lib.h
-include/mysql/server/keycache.h
-include/mysql/server/little_endian.h
-include/mysql/server/m_ctype.h
-include/mysql/server/m_string.h
-include/mysql/server/ma_dyncol.h
-include/mysql/server/my_alloc.h
-include/mysql/server/my_attribute.h
-include/mysql/server/my_byteorder.h
-include/mysql/server/my_compiler.h
-include/mysql/server/my_config.h
-include/mysql/server/my_dbug.h
-include/mysql/server/my_decimal_limits.h
-include/mysql/server/my_dir.h
-include/mysql/server/my_getopt.h
-include/mysql/server/my_global.h
-include/mysql/server/my_list.h
-include/mysql/server/my_net.h
-include/mysql/server/my_pthread.h
-include/mysql/server/my_sys.h
-include/mysql/server/my_valgrind.h
-include/mysql/server/my_xml.h
-include/mysql/server/mysql.h
-include/mysql/server/mysql/auth_dialog_client.h
-include/mysql/server/mysql/client_plugin.h
-include/mysql/server/mysql/plugin.h
-include/mysql/server/mysql/plugin_audit.h
-include/mysql/server/mysql/plugin_auth.h
-include/mysql/server/mysql/plugin_auth_common.h
-include/mysql/server/mysql/plugin_encryption.h
-include/mysql/server/mysql/plugin_ftparser.h
-include/mysql/server/mysql/plugin_password_validation.h
-include/mysql/server/mysql/psi/mysql_file.h
-include/mysql/server/mysql/psi/mysql_idle.h
-include/mysql/server/mysql/psi/mysql_socket.h
-include/mysql/server/mysql/psi/mysql_stage.h
-include/mysql/server/mysql/psi/mysql_statement.h
-include/mysql/server/mysql/psi/mysql_table.h
-include/mysql/server/mysql/psi/mysql_thread.h
-include/mysql/server/mysql/psi/psi.h
-include/mysql/server/mysql/psi/psi_abi_v0.h
-include/mysql/server/mysql/psi/psi_abi_v1.h
-include/mysql/server/mysql/psi/psi_abi_v2.h
-include/mysql/server/mysql/psi/psi_base.h
-include/mysql/server/mysql/psi/psi_memory.h
-include/mysql/server/mysql/service_base64.h
-include/mysql/server/mysql/service_debug_sync.h
-include/mysql/server/mysql/service_encryption.h
-include/mysql/server/mysql/service_encryption_scheme.h
-include/mysql/server/mysql/service_kill_statement.h
-include/mysql/server/mysql/service_logger.h
-include/mysql/server/mysql/service_md5.h
-include/mysql/server/mysql/service_my_crypt.h
-include/mysql/server/mysql/service_my_print_error.h
-include/mysql/server/mysql/service_my_snprintf.h
-include/mysql/server/mysql/service_progress_report.h
-include/mysql/server/mysql/service_sha1.h
-include/mysql/server/mysql/service_sha2.h
-include/mysql/server/mysql/service_thd_alloc.h
-include/mysql/server/mysql/service_thd_autoinc.h
-include/mysql/server/mysql/service_thd_error_context.h
-include/mysql/server/mysql/service_thd_rnd.h
-include/mysql/server/mysql/service_thd_specifics.h
-include/mysql/server/mysql/service_thd_timezone.h
-include/mysql/server/mysql/service_thd_wait.h
-include/mysql/server/mysql/service_wsrep.h
-include/mysql/server/mysql/services.h
-include/mysql/server/mysql_com.h
-include/mysql/server/mysql_com_server.h
-include/mysql/server/mysql_embed.h
-include/mysql/server/mysql_time.h
-include/mysql/server/mysql_version.h
-include/mysql/server/mysqld_ername.h
-include/mysql/server/mysqld_error.h
-include/mysql/server/pack.h
-include/mysql/server/sql_common.h
-include/mysql/server/sql_state.h
-include/mysql/server/sslopt-case.h
-include/mysql/server/sslopt-longopts.h
-include/mysql/server/sslopt-vars.h
-include/mysql/server/typelib.h
-@comment lib/mysql/libmariadbclient.a
-lib/mysql/libmariadbd.a
-lib/mysql/libmariadbd.so
-lib/mysql/libmariadbd.so.19
-@comment lib/mysql/libmysqlclient.a
-@comment lib/mysql/libmysqlclient.so
-@comment lib/mysql/libmysqlclient_r.a
-@comment lib/mysql/libmysqlclient_r.so
-lib/mysql/libmysqld.a
-lib/mysql/libmysqld.so
-lib/mysql/plugin/adt_null.so
-lib/mysql/plugin/auth_0x0100.so
-lib/mysql/plugin/auth_ed25519.so
-%%NO_GSSAPI_NONE%%lib/mysql/plugin/auth_gssapi.so
-lib/mysql/plugin/auth_pam.so
-lib/mysql/plugin/auth_socket.so
-lib/mysql/plugin/auth_test_plugin.so
-lib/mysql/plugin/caching_sha2_password.so
-lib/mysql/plugin/debug_key_management.so
-@comment lib/mysql/plugin/dialog.so
-lib/mysql/plugin/file_key_management.so
-lib/mysql/plugin/ha_archive.so
-lib/mysql/plugin/ha_blackhole.so
-lib/mysql/plugin/ha_connect.so
-lib/mysql/plugin/ha_federated.so
-lib/mysql/plugin/ha_federatedx.so
-%%MROONGA%%lib/mysql/plugin/ha_mroonga.so
-%%OQGRAPH%%lib/mysql/plugin/ha_oqgraph.so
-%%ROCKSDB%%lib/mysql/plugin/ha_rocksdb.so
-%%SPHINX%%lib/mysql/plugin/ha_sphinx.so
-%%SPIDER%%lib/mysql/plugin/ha_spider.so
-%%TOKUDB%%lib/mysql/plugin/ha_tokudb.so
-@comment lib/mysql/plugin/daemon_example.ini
-lib/mysql/plugin/ha_test_sql_discovery.so
-lib/mysql/plugin/handlersocket.so
-lib/mysql/plugin/locales.so
-lib/mysql/plugin/metadata_lock_info.so
-lib/mysql/plugin/pam_user_map.so
-lib/mysql/plugin/qa_auth_client.so
-lib/mysql/plugin/qa_auth_interface.so
-lib/mysql/plugin/qa_auth_server.so
-lib/mysql/plugin/query_cache_info.so
-lib/mysql/plugin/query_response_time.so
-lib/mysql/plugin/server_audit.so
-lib/mysql/plugin/simple_password_check.so
-lib/mysql/plugin/sql_errlog.so
-lib/mysql/plugin/test_versioning.so
-%%WSREP%%lib/mysql/plugin/wsrep_info.so
-libexec/mysqld
-@comment libexec/rcmysql
-man/man1/aria_chk.1.gz
-man/man1/aria_dump_log.1.gz
-man/man1/aria_ftdump.1.gz
-man/man1/aria_pack.1.gz
-man/man1/aria_read_log.1.gz
-man/man1/galera_new_cluster.1.gz
-man/man1/galera_recovery.1.gz
-man/man1/innochecksum.1.gz
-@comment man/man1/mariadb-service-convert.1.gz
-man/man1/mariabackup.1.gz
-man/man1/mbstream.1.gz
-man/man1/my_print_defaults.1.gz
-man/man1/myisam_ftdump.1.gz
-man/man1/myisamchk.1.gz
-man/man1/myisamlog.1.gz
-man/man1/myisampack.1.gz
-man/man1/mysql.server.1.gz
-@comment man/man1/mysql_convert_table_format.1.gz
-man/man1/mysql_fix_extensions.1.gz
-%%ROCKSDB%%man/man1/mysql_ldb.1.gz
-man/man1/mysql_install_db.1.gz
-man/man1/mysql_secure_installation.1.gz
-@comment man/man1/mysql_setpermission.1.gz
-@comment man/man1/mysql_tzinfo_to_sql.1.gz
-man/man1/mysql_upgrade.1.gz
-man/man1/mysqld_multi.1.gz
-man/man1/mysqld_safe.1.gz
-man/man1/mysqld_safe_helper.1.gz
-man/man1/mysqldumpslow.1.gz
-@comment man/man1/mysqlhotcopy.1.gz
-@comment man/man1/mysqltest.1.gz
-man/man1/perror.1.gz
-@comment man/man1/replace.1.gz
-man/man1/resolve_stack_dump.1.gz
-man/man1/resolveip.1.gz
-%%TOKUDB%%man/man1/tokuft_logprint.1.gz
-%%TOKUDB%%man/man1/tokuftdump.1.gz
-%%WSREP%%man/man1/wsrep_sst_common.1.gz
-%%WSREP%%man/man1/wsrep_sst_mariabackup.1.gz
-%%WSREP%%man/man1/wsrep_sst_mysqldump.1.gz
-%%WSREP%%man/man1/wsrep_sst_rsync.1.gz
-%%WSREP%%man/man1/wsrep_sst_rsync_wan.1.gz
-man/man8/mysqld.8.gz
-%%DATADIR%%/binary-configure
-%%DATADIR%%/fill_help_tables.sql
-%%DATADIR%%/magic
-%%SPIDER%%%%DATADIR%%/install_spider.sql
-%%DATADIR%%/maria_add_gis_sp.sql
-%%DATADIR%%/maria_add_gis_sp_bootstrap.sql
-%%MROONGA%%%%DATADIR%%/mroonga/AUTHORS
-@comment %%DATADIR%%/mroonga/COPYING
-%%MROONGA%%%%DATADIR%%/mroonga/install.sql
-%%MROONGA%%%%DATADIR%%/mroonga/uninstall.sql
-%%DATADIR%%/mysql-log-rotate
-%%DATADIR%%/mysql.server
-%%DATADIR%%/mysql_performance_tables.sql
-%%DATADIR%%/mysql_system_tables.sql
-%%DATADIR%%/mysql_system_tables_data.sql
-%%DATADIR%%/mysql_test_data_timezone.sql
-%%DATADIR%%/mysql_test_db.sql
-%%DATADIR%%/mysqld_multi.server
-%%DATADIR%%/charsets/Index.xml
-%%DATADIR%%/charsets/README
-%%DATADIR%%/charsets/armscii8.xml
-%%DATADIR%%/charsets/ascii.xml
-%%DATADIR%%/charsets/cp1250.xml
-%%DATADIR%%/charsets/cp1251.xml
-%%DATADIR%%/charsets/cp1256.xml
-%%DATADIR%%/charsets/cp1257.xml
-%%DATADIR%%/charsets/cp850.xml
-%%DATADIR%%/charsets/cp852.xml
-%%DATADIR%%/charsets/cp866.xml
-%%DATADIR%%/charsets/dec8.xml
-%%DATADIR%%/charsets/geostd8.xml
-%%DATADIR%%/charsets/greek.xml
-%%DATADIR%%/charsets/hebrew.xml
-%%DATADIR%%/charsets/hp8.xml
-%%DATADIR%%/charsets/keybcs2.xml
-%%DATADIR%%/charsets/koi8r.xml
-%%DATADIR%%/charsets/koi8u.xml
-%%DATADIR%%/charsets/latin1.xml
-%%DATADIR%%/charsets/latin2.xml
-%%DATADIR%%/charsets/latin5.xml
-%%DATADIR%%/charsets/latin7.xml
-%%DATADIR%%/charsets/macce.xml
-%%DATADIR%%/charsets/macroman.xml
-%%DATADIR%%/charsets/swe7.xml
-%%DATADIR%%/czech/errmsg.sys
-%%DATADIR%%/danish/errmsg.sys
-%%DATADIR%%/dutch/errmsg.sys
-%%DATADIR%%/english/errmsg.sys
-%%DATADIR%%/errmsg-utf8.txt
-%%DATADIR%%/estonian/errmsg.sys
-%%DATADIR%%/french/errmsg.sys
-%%DATADIR%%/german/errmsg.sys
-%%DATADIR%%/greek/errmsg.sys
-%%DATADIR%%/hindi/errmsg.sys
-%%DATADIR%%/hungarian/errmsg.sys
-%%DATADIR%%/italian/errmsg.sys
-%%DATADIR%%/japanese/errmsg.sys
-%%DATADIR%%/korean/errmsg.sys
-%%DATADIR%%/norwegian-ny/errmsg.sys
-%%DATADIR%%/norwegian/errmsg.sys
-%%DATADIR%%/polish/errmsg.sys
-%%DATADIR%%/portuguese/errmsg.sys
-%%DATADIR%%/romanian/errmsg.sys
-%%DATADIR%%/russian/errmsg.sys
-%%DATADIR%%/serbian/errmsg.sys
-%%DATADIR%%/slovak/errmsg.sys
-%%DATADIR%%/spanish/errmsg.sys
-%%DATADIR%%/swedish/errmsg.sys
-%%DATADIR%%/ukrainian/errmsg.sys
-%%WSREP%%%%DATADIR%%/wsrep.cnf
-%%WSREP%%%%DATADIR%%/wsrep_notify
-@comment %%DOCSDIR%%/COPYING
-@comment %%DOCSDIR%%/COPYING.thirdparty
-@comment share/groonga-normalizer-mysql/lgpl-2.0.txt
-@comment share/groonga/COPYING
-%%MROONGA%%share/groonga-normalizer-mysql/README.md
-%%MROONGA%%share/groonga/README.md
-@comment bin/mariadb_config
-@comment bin/mysql
-@comment bin/mysqladmin
-@comment bin/mysqlbinlog
-@comment bin/mysqlcheck
-@comment bin/mysqldump
-@comment bin/mysqlimport
-@comment bin/mysqlshow
-@comment bin/mysqlslap
-@comment include/mysql/errmsg.h
-@comment include/mysql/ma_list.h
-@comment include/mysql/ma_pvio.h
-@comment include/mysql/ma_tls.h
-@comment include/mysql/mariadb/ma_io.h
-@comment include/mysql/mariadb_com.h
-@comment include/mysql/mariadb_ctype.h
-@comment include/mysql/mariadb_dyncol.h
-@comment include/mysql/mariadb_stmt.h
-@comment include/mysql/mariadb_version.h
-@comment include/mysql/mysql.h
-@comment include/mysql/mysql/client_plugin.h
-@comment include/mysql/mysql/plugin_auth.h
-@comment include/mysql/mysql/plugin_auth_common.h
-@comment lib/mysql/libmariadb.so
-@comment lib/mysql/libmariadb.so.3
-@comment lib/mysql/plugin/auth_gssapi_client.so
-@comment lib/mysql/plugin/client_ed25519.so
-@comment lib/mysql/plugin/mysql_clear_password.so
-@comment lib/mysql/plugin/sha256_password.so
-@comment libdata/pkgconfig/libmariadb.pc
-
diff --git a/databases/mariadb104-client/Makefile b/databases/mariadb104-client/Makefile
deleted file mode 100644
index 42c92d38d59b..000000000000
--- a/databases/mariadb104-client/Makefile
+++ /dev/null
@@ -1,14 +0,0 @@
-# Created by: Bernard Spil <brnrd@FreeBSD.org>
-
-PORTNAME=	mariadb
-PKGNAMESUFFIX=	104-client
-
-COMMENT=	Multithreaded SQL database (client)
-
-MASTERDIR=	${.CURDIR}/../${PORTNAME}${PKGNAMESUFFIX:C/-client/-server/}
-
-PLIST=		${.CURDIR}/pkg-plist
-
-CONFLICTS_INSTALL=	databases/mytop
-
-.include "${MASTERDIR}/Makefile"
diff --git a/databases/mariadb104-client/pkg-plist b/databases/mariadb104-client/pkg-plist
deleted file mode 100644
index 1e1470cde0b9..000000000000
--- a/databases/mariadb104-client/pkg-plist
+++ /dev/null
@@ -1,172 +0,0 @@
-bin/mariadb
-bin/mariadb-access
-bin/mariadb-admin
-bin/mariadb-binlog
-bin/mariadb-check
-bin/mariadb-convert-table-format
-bin/mariadb-dump
-bin/mariadb-find-rows
-bin/mariadb-hotcopy
-bin/mariadb-import
-bin/mariadb-plugin
-bin/mariadb-setpermission
-bin/mariadb-show
-bin/mariadb-slap
-@comment bin/mariadb-test
-@comment bin/mariadb-waitpid
-bin/mariadb_config
-bin/msql2mysql
-bin/mysql
-bin/mysql_config
-bin/mysql_convert_table_format
-bin/mysql_find_rows
-bin/mysql_setpermission
-@comment bin/mysql_plugin
-@comment bin/mysql_waitpid
-bin/mysqlaccess
-bin/mysqladmin
-bin/mysqlbinlog
-bin/mysqlcheck
-bin/mysqldump
-bin/mysqlhotcopy
-bin/mysqlimport
-bin/mysqlshow
-bin/mysqlslap
-@comment bin/mysqltest
-bin/mytop
-bin/replace
-@comment bin/wsrep_sst_rsync_wan
-@sample %%ETCDIR%%/my.cnf.sample
-@sample %%ETCDIR%%/conf.d/client.cnf.sample
-include/mysql/errmsg.h
-include/mysql/ma_list.h
-include/mysql/ma_pvio.h
-include/mysql/ma_tls.h
-include/mysql/mariadb/ma_io.h
-include/mysql/mariadb_com.h
-include/mysql/mariadb_ctype.h
-include/mysql/mariadb_dyncol.h
-include/mysql/mariadb_rpl.h
-include/mysql/mariadb_stmt.h
-include/mysql/mariadb_version.h
-include/mysql/my_config.h
-include/mysql/my_global.h
-include/mysql/my_sys.h
-include/mysql/mysql.h
-include/mysql/mysql_com.h
-include/mysql/mysql_version.h
-include/mysql/mysql/client_plugin.h
-include/mysql/mysql/plugin_auth.h
-include/mysql/mysql/plugin_auth_common.h
-include/mysql/mysqld_error.h
-%%NO_GSSAPI_NONE%%lib/mysql/plugin/auth_gssapi_client.so
-lib/mysql/libmariadb.so
-lib/mysql/libmariadb.so.3
-lib/mysql/libmariadbclient.a
-lib/mysql/libmysqlclient.a
-lib/mysql/libmysqlclient.so
-lib/mysql/libmysqlclient_r.a
-lib/mysql/libmysqlclient_r.so
-@comment lib/mysql/plugin/caching_sha2_password.so
-lib/mysql/plugin/client_ed25519.so
-lib/mysql/plugin/daemon_example.ini
-lib/mysql/plugin/dialog.so
-lib/mysql/plugin/mysql_clear_password.so
-lib/mysql/plugin/sha256_password.so
-libdata/pkgconfig/libmariadb.pc
-@comment man/man1/aria_chk.1.gz
-@comment man/man1/aria_dump_log.1.gz
-@comment man/man1/aria_ftdump.1.gz
-@comment man/man1/aria_pack.1.gz
-@comment man/man1/aria_read_log.1.gz
-@comment man/man1/galera_new_cluster.1.gz
-@comment man/man1/galera_recovery.1.gz
-@comment man/man1/innochecksum.1.gz
-@comment man/man1/mariabackup.1.gz
-man/man1/mariadb.1.gz
-man/man1/mariadb-access.1.gz
-man/man1/mariadb-admin.1.gz
-@comment man/man1/mariadb-backup.1.gz
-man/man1/mariadb-binlog.1.gz
-man/man1/mariadb-check.1.gz
-@comment man/man1/mariadb-client-test-embedded.1.gz
-@comment man/man1/mariadb-client-test.1.gz
-man/man1/mariadb-convert-table-format.1.gz
-man/man1/mariadb-dump.1.gz
-@comment man/man1/mariadb-dumpslow.1.gz
-@comment man/man1/mariadb-embedded.1.gz
-man/man1/mariadb-find-rows.1.gz
-@comment man/man1/mariadb-fix-extensions.1.gz
-man/man1/mariadb-hotcopy.1.gz
-man/man1/mariadb-import.1.gz
-@comment man/man1/mariadb-install-db.1.gz
-@comment man/man1/mariadb-ldb.1.gz
-man/man1/mariadb-plugin.1.gz
-@comment man/man1/mariadb-secure-installation.1.gz
-@comment man/man1/mariadb-service-convert.1.gz
-man/man1/mariadb-setpermission.1.gz
-man/man1/mariadb-show.1.gz
-man/man1/mariadb-slap.1.gz
-@comment man/man1/mariadb-test-embedded.1.gz
-@comment man/man1/mariadb-test.1.gz
-@comment man/man1/mariadb-tzinfo-to-sql.1.gz
-@comment man/man1/mariadb-upgrade.1.gz
-@comment man/man1/mariadb-waitpid.1.gz
-@comment man/man1/mariadbd-multi.1.gz
-@comment man/man1/mariadbd-safe-helper.1.gz
-@comment man/man1/mariadbd-safe.1.gz
-@comment man/man8/mariadbd.8.gz
-man/man1/msql2mysql.1.gz
-@comment man/man1/mbstream.1.gz
-@comment man/man1/my_print_defaults.1.gz
-man/man1/my_safe_process.1.gz
-@comment man/man1/myisam_ftdump.1.gz
-@comment man/man1/myisamchk.1.gz
-@comment man/man1/myisamlog.1.gz
-@comment man/man1/myisampack.1.gz
-man/man1/mysql-stress-test.pl.1.gz
-man/man1/mysql-test-run.pl.1.gz
-man/man1/mysql.1.gz
-@comment man/man1/mysql.server.1.gz
-@comment man/man1/mysql_client_test.1.gz
-@comment man/man1/mysql_client_test_embedded.1.gz
-man/man1/mysql_config.1.gz
-man/man1/mysql_convert_table_format.1.gz
-@comment man/man1/mysql_embedded.1.gz
-man/man1/mysql_find_rows.1.gz
-@comment man/man1/mysql_fix_extensions.1.gz
-@comment man/man1/mysql_install_db.1.gz
-@comment man/man1/mysql_ldb.1.gz
-man/man1/mysql_plugin.1.gz
-@comment man/man1/mysql_secure_installation.1.gz
-man/man1/mysql_setpermission.1.gz
-@comment man/man1/mysql_tzinfo_to_sql.1.gz
-@comment man/man1/mysql_upgrade.1.gz
-man/man1/mysql_waitpid.1.gz
-man/man1/mysqlaccess.1.gz
-man/man1/mysqladmin.1.gz
-man/man1/mysqlbinlog.1.gz
-man/man1/mysqlcheck.1.gz
-@comment man/man1/mysqld_multi.1.gz
-@comment man/man1/mysqld_safe.1.gz
-@comment man/man1/mysqld_safe_helper.1.gz
-man/man1/mysqldump.1.gz
-@comment man/man1/mysqldumpslow.1.gz
-man/man1/mysqlhotcopy.1.gz
-man/man1/mysqlimport.1.gz
-man/man1/mysqlshow.1.gz
-man/man1/mysqlslap.1.gz
-@comment man/man1/mysqltest.1.gz
-@comment man/man1/mysqltest_embedded.1.gz
-@comment man/man1/perror.1.gz
-man/man1/replace.1.gz
-@comment man/man1/resolve_stack_dump.1.gz
-@comment man/man1/resolveip.1.gz
-@comment man/man1/wsrep_sst_common.1.gz
-@comment man/man1/wsrep_sst_mariabackup.1.gz
-@comment man/man1/wsrep_sst_mysqldump.1.gz
-@comment man/man1/wsrep_sst_rsync.1.gz
-@comment man/man1/wsrep_sst_rsync_wan.1.gz
-@comment man/man8/mysqld.8.gz
-libdata/pkgconfig/mariadb.pc
-@dir(%%MARIADB_USER%%,%%MARIADB_GROUP%%,) %%MARIADB_RUNDIR%%
diff --git a/databases/mariadb104-server/Makefile b/databases/mariadb104-server/Makefile
deleted file mode 100644
index eef8cc75b7de..000000000000
--- a/databases/mariadb104-server/Makefile
+++ /dev/null
@@ -1,264 +0,0 @@
-# Created by: Bernard Spil <brnrd@FreeBSD.org>
-
-PORTNAME?=	mariadb
-PORTVERSION=	10.4.21
-PORTREVISION?=	1
-CATEGORIES=	databases
-MASTER_SITES=	http://mirrors.supportex.net/${SITESDIR}/ \
-		http://mirror2.hs-esslingen.de/pub/Mirrors/${SITESDIR}/ \
-		http://gd.tuwien.ac.at/db/${SITESDIR}/ \
-		http://mirrors.fe.up.pt/pub/${SITESDIR}/ \
-		http://mirror.de.gsnw.de:56431/${SITESDIR}/ \
-		http://mirror.layerjet.com/${SITESDIR}/ \
-		http://mirror.switch.ch/mirror/${SITESDIR}/ \
-		http://ftp.osuosl.org/pub/${SITESDIR}/
-PKGNAMESUFFIX?=	104-server
-
-MAINTAINER=	brnrd@FreeBSD.org
-COMMENT?=	Multithreaded SQL database (server)
-
-LICENSE=	GPLv2
-LICENSE_FILE=	${WRKSRC}/COPYING
-
-USES=		bison:build cmake:insource,noninja compiler:c++11-lib cpe iconv:translit libedit ncurses shebangfix ssl
-
-SUB_FILES=	pkg-message
-PKGMESSAGE=	${WRKDIR}/pkg-message
-
-USE_LDCONFIG=	${PREFIX}/lib/mysql
-SHEBANG_FILES=	scripts/*.sh
-SITESDIR=	mariadb/mariadb-${PORTVERSION}/source
-
-DOCSDIR=	${PREFIX}/share/doc/mysql
-ETCDIR=		${PREFIX}/etc/mysql
-
-MARIADB_USER?=	mysql
-MARIADB_GROUP?=	mysql
-
-MARIADB_RUNDIR?=	/var/run/mysql
-MARIADB_SOCK?=		mysql.sock
-MARIADB_LOGDIR?=	/var/log/mysql
-
-OPTIONS_SINGLE=		GSSAPI
-OPTIONS_SINGLE_GSSAPI=	GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT GSSAPI_NONE
-OPTIONS_DEFAULT=	GSSAPI_BASE
-
-.if ${PKGNAMESUFFIX:M*-server}
-# MySQL-Server options
-OPTIONS_DEFAULT+=	CONNECT_EXTRA INNOBASE SPHINX SPIDER WSREP
-OPTIONS_GROUP=		COMPRESSION ENGINES GROONGA
-OPTIONS_DEFINE=		CONNECT_EXTRA DOCS
-OPTIONS_DEFINE_amd64=	WSREP
-OPTIONS_GROUP_COMPRESSION=	LZ4 LZO SNAPPY ZSTD
-OPTIONS_GROUP_ENGINES=	INNOBASE MROONGA OQGRAPH ROCKSDB SPHINX SPIDER TOKUDB
-OPTIONS_GROUP_GROONGA=	ZMQ MSGPACK
-OPTIONS_EXCLUDE_i386=	ROCKSDB TOKUDB
-
-CONNECT_EXTRA_DESC=	Enable ODBC and XML in CONNECT engine
-COMPRESSION_DESC=	Optional page compression
-ENGINES_DESC=	Optional MariaDB storage engines
-GROONGA_DESC=	Optional Mroonga features
-INNOBASE_DESC=	InnoDB default engine
-MROONGA_DESC=	Mroonga Full Text Search engine
-MSGPACK_DESC=	MsgPack support
-OQGRAPH_DESC=	Open Query Graph Computation engine
-ROCKSDB_DESC=	RocksDB LSM engine (Alpha)
-SPHINX_DESC=	SphinxSE engine
-SPIDER_DESC=	Partitioning and XA-transactions engine
-TOKUDB_DESC=	Fractal tree index tree data structure engine
-WSREP_DESC=	Build wsrep clustering
-ZMQ_DESC=	ZeroMQ support
-ZSTD_DESC+=	Zstandard compression support (RocksDB only)
-.endif
-
-CMAKE_ARGS+=	-DINSTALL_DOCDIR="share/doc/mysql" \
-		-DINSTALL_DOCREADMEDIR="share/doc/mysql" \
-		-DINSTALL_INCLUDEDIR="include/mysql" \
-		-DINSTALL_INFODIR="info" \
-		-DINSTALL_LIBDIR="lib/mysql" \
-		-DINSTALL_MANDIR="man" \
-		-DINSTALL_MYSQLDATADIR="/var/db/mysql" \
-		-DINSTALL_MYSQLSHAREDIR="share/mysql" \
-		-DINSTALL_MYSQLTESTDIR= \
-		-DINSTALL_PLUGINDIR="lib/mysql/plugin" \
-		-DINSTALL_SBINDIR="libexec" \
-		-DINSTALL_SCRIPTDIR="bin" \
-		-DINSTALL_SHAREDIR="share" \
-		-DINSTALL_SQLBENCHDIR= \
-		-DINSTALL_SUPPORTFILESDIR="share/mysql" \
-		-DDEFAULT_SYSCONFDIR="${PREFIX}/etc" \
-		-DDEFAULT_SYSCONF2DIR="${ETCDIR}/conf.d" \
-		-DINSTALL_UNIX_ADDRDIR="${MARIADB_RUNDIR}/${MARIADB_SOCK}" \
-		-DWITH_SSL="${OPENSSLBASE}" \
-		-DCURSES_CURSES_LIBRARY="/usr/lib/libcurses.so" \
-		-DCURSES_FORM_LIBRARY="/usr/lib/libform.so" \
-		-DCURSES_CURSES_LIBRARY="/usr/lib/libncurses.so" \
-		-DKRB5_CONFIG="${KRB5CONFIG}" \
-		-DCURSES_NCURSES_LIBRARY="${NCURSESLIB}/libncurses.so" \
-		-DCOMPILATION_COMMENT="FreeBSD Ports" \
-		-DCMAKE_PREFIX_PATH=${PREFIX}
-CMAKE_OFF+=	CONC_WITH_UNIT_TESTS CONNECT_WITH_MONGO WITH_UNIT_TESTS
-CMAKE_ON+=	WITH_LIBWRAP WITHOUT_DOCS
-DISABLED_PLUGINS+=	AUTH_TEST_PLUGIN DAEMON_EXAMPLE DIALOG_EXAMPLES \
-		EXAMPLE EXAMPLE_KEY_MANAGEMENT FTEXAMPLE
-
-DATADIR=	${PREFIX}/share/mysql
-ETCDIR=		${PREFIX}/etc/mysql
-
-CONFLICTS_INSTALL=	mariadb10[0-24-9]-${PKGNAMESUFFIX:C/^[0-9]*-//}-* \
-			mysql[0-9]*-${PKGNAMESUFFIX:C/^[0-9]*-//}-* \
-			mysqlwsrep* \
-			percona[0-9]*-${PKGNAMESUFFIX:C/^[0-9]*-//}-*
-
-FASTMTX_CMAKE_BOOL=	WITH_FAST_MUTEXES
-GSSAPI_BASE_USES=	gssapi
-GSSAPI_HEIMDAL_USES=	gssapi:heimdal
-GSSAPI_MIT_USES=	gssapi:mit
-GSSAPI_NONE_CMAKE_ON=	-DPLUGIN_AUTH_GSSAPI_CLIENT=OFF
-OPTIONS_SUB=		yes
-SUB_LIST+=		MARIADB_USER="${MARIADB_USER}" \
-			MARIADB_RUNDIR="${MARIADB_RUNDIR}" \
-			MARIADB_SOCK="${MARIADB_SOCK}"
-PLIST_SUB+=		MARIADB_USER="${MARIADB_USER}" \
-			MARIADB_GROUP="${MARIADB_GROUP}"
-
-.if ${PKGNAMESUFFIX:M*-client}
-# MySQL-Client part
-CMAKE_ON+=	CONC_WITH_MYSQLCOMPAT WITHOUT_SERVER
-CMAKE_OFF+=	WITH_WSREP
-USES+=		readline
-USE_LDCONFIG=	${PREFIX}/lib/mysql
-SUB_FILES+=	my.cnf.sample client.cnf.sample
-PLIST_SUB+=	MARIADB_RUNDIR="${MARIADB_RUNDIR}"
-.else # ! ${PKGNAMESUFFIX:M*-client}
-# MySQL-Server part
-USES+=		mysql:104m
-USE_LDCONFIG+=	${PREFIX}/lib/mysql/plugin
-USE_RC_SUBR=	mysql-server
-USERS=		${MARIADB_USER}
-GROUPS=		${MARIADB_GROUP}
-CMAKE_ON+=	CMAKE_SKIP_BUILD_RPATH WITH_EMBEDDED_SERVER
-CMAKE_OFF+=	WITH_CLIENT
-SUB_FILES+=	server.cnf.sample
-SUB_LIST+=	MARIADB_LOGDIR="${MARIADB_LOGDIR}"
-PLIST_SUB+=	MARIADB_LOGDIR="${MARIADB_LOGDIR}"
-
-.for ENGINE in ${OPTIONS_GROUP_ENGINES:NINNOBASE}
-${ENGINE}_CMAKE_OFF=	-DPLUGIN_${ENGINE}=NO
-${ENGINE}_CMAKE_ON=	-DPLUGIN_${ENGINE}=DYNAMIC
-.endfor
-INNOBASE_VARS_OFF=	disabled_plugins+=INNOBASE
-
-CONNECT_EXTRA_LIB_DEPENDS=	libodbc.so:databases/unixODBC
-CONNECT_EXTRA_USE=		gnome=libxml2
-CONNECT_EXTRA_USES=		gnome
-CONNECT_EXTRA_CMAKE_BOOL=	CONNECT_WITH_LIBXML2 CONNECT_WITH_ODBC
-GSSAPI_NONE_VARS=	disabled_plugins+=AUTH_GSSAPI
-LZ4_CMAKE_ON=		-DGRN_WITH_LZ4=ON  -DWITH_INNODB_LZ4=ON  -DWITH_ROCKSDB_LZ4=ON
-LZ4_CMAKE_OFF=		-DGRN_WITH_LZ4=OFF -DWITH_INNODB_LZ4=OFF -DWITH_ROCKSDB_LZ4=OFF
-LZ4_LIB_DEPENDS=	liblz4.so:archivers/liblz4
-LZO_CMAKE_ON=		-DWITH_INNODB_LZO=ON
-LZO_CMAKE_OFF=		-DWITH_INNODB_LZO=OFF
-LZO_LIB_DEPENDS=	liblzo2.so:archivers/lzo2
-MROONGA_IMPLIES=	LZ4
-MSGPACK_LIB_DEPENDS=	libmsgpackc.so:devel/msgpack
-OQGRAPH_LIB_DEPENDS=	libboost_system.so:devel/boost-libs \
-			libJudy.so:devel/judy
-ROCKSDB_USES=		python
-ROCKSDB_CMAKE_ON=	-DPYTHON_SHEBANG=${PYTHON_CMD}
-SNAPPY_CMAKE_ON=	-DWITH_INNODB_SNAPPY=ON  -DWITH_ROCKSDB_snappy=ON
-SNAPPY_CMAKE_OFF=	-DWITH_INNODB_SNAPPY=OFF -DWITH_ROCKSDB_snappy=OFF
-SNAPPY_LIB_DEPENDS=	libsnappy.so:archivers/snappy
-TOKUDB_IMPLIES=		SNAPPY
-TOKUDB_PORTDOCS=	README.md
-WSREP_CMAKE_BOOL=	WITH_WSREP
-WSREP_LIB_DEPENDS=	libgalera.so:databases/galera26
-WSREP_RUN_DEPENDS=	bash:shells/bash \
-			rsync:net/rsync \
-			#stunnel:security/stunnel
-WSREP_SHEBANG_FILES=	bin/wsrep_sst_rsync
-ZMQ_LIB_DEPENDS=	libzmq.so:net/libzmq4
-ZSTD_CMAKE_ON=		-DWITH_ROCKSDB_zstd=ON
-ZSTD_CMAKE_OFF=		-DWITH_ROCKSDB_zstd=OFF
-ZSTD_LIB_DEPENDS=	libzstd.so:archivers/zstd
-
-.for PLUGIN in ${DISABLED_PLUGINS}
-CMAKE_ARGS+=		-DPLUGIN_${PLUGIN}=NO
-.endfor
-
-.endif # ${PKGNAMESUFFIX:M*-client}
-
-.include <bsd.port.options.mk>
-
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1200057
-SUB_LIST+=	LEGACY_LIMITS="@comment " MODERN_LIMITS=""
-.else
-SUB_LIST+=	LEGACY_LIMITS="" MODERN_LIMITS="@comment "
-.endif
-
-.if ${SSL_DEFAULT} != base && ${PORT_OPTIONS:MGSSAPI_BASE}
-GSSAPI_BASE_IGNORE=	BASE_GSSAPI is not compatible with OpenSSL from ports. Use other GSSAPI options or OpenSSL from base system
-.endif
-
-.include <bsd.port.pre.mk>
-
-.if ${ARCH} != amd64
-PLIST_SUB+=	WSREP="@comment "
-.endif
-
-.if ${ARCH} == i386
-USE_GCC=       yes
-CFLAGS+=       -latomic -fasynchronous-unwind-tables
-.endif
-
-.if ${OPSYS} == DragonFly
-CMAKE_OFF+=	WITH_TOKUDB
-.endif
-
-post-patch:
-	${REINPLACE_CMD} 's|%%LOCALBASE%%|${LOCALBASE}|g' \
-		${WRKSRC}/storage/tokudb/PerconaFT/cmake_modules/TokuThirdParty.cmake
-	${REINPLACE_CMD} 's|%%PREFIX%%|${PREFIX}|' ${WRKSRC}/mysys/my_default.c
-.if ${OPSYS} == DragonFly
-	${CP} ${WRKSRC}/cmake/os/FreeBSD.cmake \
-		${WRKSRC}/cmake/os/DragonFly.cmake
-.endif
-
-post-configure:
-	${REINPLACE_CMD} -Ee 's|(#define INCLUDE.*)"$$|\1 -I${PREFIX}/include"|' \
-		-e 's|(#define LIBS .*)"$$|\1 -L${PREFIX}/lib"|' \
-		${WRKSRC}/libmariadb/mariadb_config/mariadb_config.c
-
-pre-install:
-	${MKDIR} ${STAGEDIR}${ETCDIR}/conf.d
-
-.if ${PKGNAMESUFFIX:M*-client}
-post-install:
-	${INSTALL_DATA} ${WRKDIR}/my.cnf.sample ${STAGEDIR}${ETCDIR}/my.cnf.sample
-	${INSTALL_DATA} ${WRKDIR}/client.cnf.sample \
-		${STAGEDIR}${ETCDIR}/conf.d/client.cnf.sample
-	${RM} -r ${STAGEDIR}${DATADIR} \
-		${STAGEDIR}${PREFIX}/include/mysql/server
-	${MV} ${STAGEDIR}${PREFIX}/lib/mysql/pkgconfig/mariadb.pc \
-		${STAGEDIR}${PREFIX}/libdata/pkgconfig/mariadb.pc
-	${RMDIR} ${STAGEDIR}${PREFIX}/lib/mysql/pkgconfig
-	${MKDIR} ${STAGEDIR}/${MARIADB_RUNDIR}
-
-post-install-GSSAPI_NONE-off:
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/mysql/plugin/auth_gssapi_client.so
-
-.else # ! ${PKGNAMESUFFIX:M*-client}
-post-install:
-	${INSTALL_DATA} ${WRKDIR}/server.cnf.sample \
-		${STAGEDIR}${ETCDIR}/conf.d/server.cnf.sample
-	${RM} -r ${STAGEDIR}${PREFIX}/share/mysql/policy \
-		${STAGEDIR}${PREFIX}/include/mysql/server/private \
-		${STAGEDIR}${PREFIX}/lib/mysql/pkgconfig
-	${MV} ${STAGEDIR}${PREFIX}/etc/mysql/user_map.conf \
-		${STAGEDIR}${PREFIX}/etc/mysql/user_map.conf.sample
-	${MV} ${STAGEDIR}${DATADIR}/wsrep.cnf \
-		${STAGEDIR}${ETCDIR}/conf.d/wsrep.cnf.sample || true
-	${MKDIR} ${STAGEDIR}/${MARIADB_LOGDIR}
-.endif # ${PKGNAMESUFFIX:M*-client}
-
-.include <bsd.port.post.mk>
diff --git a/databases/mariadb104-server/distinfo b/databases/mariadb104-server/distinfo
deleted file mode 100644
index ae780beace2f..000000000000
--- a/databases/mariadb104-server/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1628423421
-SHA256 (mariadb-10.4.21.tar.gz) = 94dd2e6f5d286de8a7dccffe984015d4253a0568281c7440e772cfbe098a291d
-SIZE (mariadb-10.4.21.tar.gz) = 84809537
diff --git a/databases/mariadb104-server/files/client.cnf.sample.in b/databases/mariadb104-server/files/client.cnf.sample.in
deleted file mode 100644
index d468cb8705b8..000000000000
--- a/databases/mariadb104-server/files/client.cnf.sample.in
+++ /dev/null
@@ -1,52 +0,0 @@
-# Options specific to client applications, see
-# https://mariadb.com/kb/en/configuring-mariadb-with-option-files/#client-option-groups
-
-# Options specific to all client programs
-[client]
-# port			= 3306 # inherited from %%ETCDIR%%/my.cnf
-# socket		= %%MARIADB_RUNDIR%%/mysql.sock # inherited from %%ETCDIR%%/my.cnf
-
-# Options specific to MariaDB client programs
-[client-mariadb]
-
-#
-## Options for specific client Tools
-#
-
-# Options read by `mysql`
-# Renamed from [mysql] starting with MariaDB 10.4.6.
-[mariadb-client]	Options read by mysql. Available starting with MariaDB 10.4.6.
-prompt			= \u@\h [\d]>\_
-no_auto_rehash
-
-# Options read by `mysqldump`
-# Renamed from [mysqldump] starting with MariaDB 10.4.6.
-[mariadb-dump]
-max_allowed_packet	= 256M
-quote_names
-quick
-
-# Options read by `mysqladmin`
-# Renamed from [mysqladmin] starting with MariaDB 10.4.6.
-[mariadb-admin]
-
-# Options read by `mysqlbinlog` 
-# Renamed from [mysqlbinlog] starting with MariaDB 10.4.6.
-[mariadb-binlog]
-
-# Options read by `mysqlcheck`
-# Renamed from [mysqlcheck] starting with MariaDB 10.4.6.
-[mariadb-check]
-
-# Options read by `mysqlimport`
-# Renamed from [mysqlimport] starting with MariaDB 10.4.6.
-[mariadb-import]
-
-# Options read by `mysqlshow`
-# Renamed from [mysqlshow] starting with MariaDB 10.4.6.
-[mariadb-show]
-
-# Options read by `mysqlslap`
-# Renamed from [mysqlslap]  starting with MariaDB 10.4.6.
-[mariadb-slap]
-
diff --git a/databases/mariadb104-server/files/mysql-server.in b/databases/mariadb104-server/files/mysql-server.in
deleted file mode 100644
index 4e2753f09ee6..000000000000
--- a/databases/mariadb104-server/files/mysql-server.in
+++ /dev/null
@@ -1,147 +0,0 @@
-#!/bin/sh
-
-# PROVIDE: mysql
-# REQUIRE: LOGIN
-# KEYWORD: shutdown
-#
-# Add the following line to /etc/rc.conf to enable mysql:
-# mysql_(instance_)?enable (bool):	Set to "NO" by default.
-#			Set it to "YES" to enable MySQL.
-%%LEGACY_LIMITS%%# mysql_(instance_)?limits (bool):	Set to "NO" by default.
-%%LEGACY_LIMITS%%#			Set it to yes to run `limits -e -U mysql`
-%%LEGACY_LIMITS%%#			just before mysql starts.
-# mysql_(instance_)?dbdir (str):	Base database directory.
-#			Default to "/var/db/mysql"
-# mysql_(instance_)?args (str):	Custom additional arguments to be passed
-#			to mysqld_safe (default empty).
-# mysql_(instance_)?pidfile (str): Custum PID file path and name.
-#			Default to "${mysql_dbdir}/${hostname}.pid".
-# mysql_(instance_)?user (str): User to run mysqld as.
-#			Default to "%%MARIADB_USER%%" created by the port
-# mysql_(instance_)?socket (str): Name of the socket file.
-#			Default to "" and used from %%ETCDIR%%/my.cnf,
-#			where default is "%%MARIADB_RUNDIR%%/%%MARIADB_SOCK%%".
-# mysql_(instance_)?optfile (str): Server-specific option file.
-#			Default to "${mysql_dbdir}/my.cnf".
-# mysql_instances (str): Set to "" by default. 
-#			If defined, list of instances to enable
-
-. /etc/rc.subr
-
-name="mysql"
-rcvar=mysql_enable
-
-load_rc_config $name
-
-: ${mysql_enable="NO"}
-%%LEGACY_LIMITS%%: ${mysql_limits="NO"}
-: ${mysql_user="%%MARIADB_USER%%"}
-%%LEGACY_LIMITS%%mysql_limits_args="-e -U ${mysql_user}"
-: ${mysql_dbdir="/var/db/mysql"}
-: ${mysql_optfile="${mysql_dbdir}/my.cnf"}
-
-command="/usr/sbin/daemon"
-procname="%%PREFIX%%/libexec/mysqld"
-start_precmd="${name}_prestart"
-start_postcmd="${name}_poststart"
-
-if [ -n "$2" ]; then
-	instance="$2"
-	load_rc_config ${name}_${instance}
-	case "$mysql_instances" in
-	"$2 "*|*" $2 "*|*" $2"|"$2")
-		eval mysql_args="\${mysql_${instance}_args:-\"${mysql_args}\"}"
-		eval mysql_dbdir="\${mysql_${instance}_dbdir:-\"/var/db/mysql_${instance}\"}"
-		%%LEGACY_LIMITS%%eval mysql_limits="\${mysql_${instance}_limits:-\"${mysql_limits}\"}"
-		eval mysql_user="\${mysql_${instance}_user:-\"${mysql_user}\"}"
-		%%LEGACY_LIMITS%%eval mysql_limits_args="\${mysql_${instance}_limits_args:-\"-e -U $mysql_user\"}"
-		eval mysql_socket="\${mysql_${instance}_socket:-\"${mysql_socket}\"}"
-		eval mysql_optfile="\${mysql_${instance}_optfile:-\"${mysql_dbdir}/my.cnf\"}"
-		eval mysql_pidfile="\${mysql_${instance}_pidfile:-\"${mysql_dbdir}/`/bin/hostname`.pid\"}"
-	;;
-	*)
-		err 1 "$2 not found in mysql_instances" ;;
-	esac
-else
-	if [ -n "${mysql_instances}" -a -n "$1" ]; then
-		for instance in ${mysql_instances}; do
-			eval _enable="\${mysql_${instance}_enable}"
-			case "${_enable:-${mysql_enable}}" in
-			[Nn][Oo]|[Ff][Aa][Ll][Ss][Ee]|[Oo][Ff][Ff]|0)
-				continue
-			;;
-			[Yy][Ee][Ss]|[Tt][Rr][Uu][Ee]|[Oo][Nn]|1)
-			;;
-			*)
-				if [ -z "$_enable" ]; then
-					_var=mysql_enable
-				else
-					_var=mysql_${instance}_enable
-				fi
-				warn "Bad value" \
-					"'${_enable:-${mysql_enable}}'" \
-					"for ${_var}. " \
-					"Instance ${instance} skipped."
-				continue
-			;;
-			esac
-			echo "===> mysql instance: ${instance}"
-			if %%PREFIX%%/etc/rc.d/mysql-server $1 ${instance}; then
-				success="${instance} ${success}"
-			else
-				failed="${instance} (${retcode}) ${failed}"
-			fi
-		done
-		exit 0
-	else
-		mysql_pidfile=${mysql_pidfile:-"${mysql_dbdir}/`/bin/hostname`.pid"}
-	fi
-fi
-
-pidfile=$mysql_pidfile
-mysql_install_db="%%PREFIX%%/bin/mysql_install_db"
-mysql_install_db_args="--basedir=%%PREFIX%% --datadir=${mysql_dbdir} --force"
-command_args="-c -f %%PREFIX%%/bin/mysqld_safe --defaults-extra-file=${mysql_optfile} --user=${mysql_user} --datadir=${mysql_dbdir} --pid-file=${pidfile} ${mysql_socket:+--socket=${mysql_socket}} ${mysql_args}"
-
-mysql_create_auth_tables()
-{
-	eval $mysql_install_db $mysql_install_db_args
-        [ $? -eq 0 ] && chown -R ${mysql_user}:$(id -gn $mysql_user) ${mysql_dbdir}
-}
-
-mysql_prestart()
-{
-	local dir
-	for dir in /etc /etc/mysql; do
-		if [ -f "${dir}/my.cnf" ]; then
-			echo "Please move existing my.cnf file from ${dir} to %%PREFIX%%${dir}"
-			return 1
-		fi
-	done
-	if [ ! -d "${mysql_dbdir}/mysql/." ]; then
-		mysql_create_auth_tables || return 1
-	fi
-	[ "${mysql_socket}" = "" ] && mysql_rundir="%%MARIADB_RUNDIR%%" || mysql_rundir="`/usr/bin/dirname ${mysql_socket}`"
-	if [ ! -d "${mysql_rundir}" ]; then
-		install -d -o ${mysql_user} -g $(id -gn $mysql_user) "${mysql_rundir}"
-
-	fi
-%%LEGACY_LIMITS%%	if checkyesno mysql_limits; then
-%%LEGACY_LIMITS%%		eval `/usr/bin/limits ${mysql_limits_args}` 2>/dev/null
-%%LEGACY_LIMITS%%	else
-%%LEGACY_LIMITS%%		return 0
-%%LEGACY_LIMITS%%	fi
-%%MODERN_LIMITS%%	return 0
-}
-
-mysql_poststart()
-{
-	local timeout=15
-	while [ ! -f "${pidfile}" -a ${timeout} -gt 0 ]; do
-		timeout=$(( timeout - 1 ))
-		sleep 1
-	done
-	return 0
-}
-
-run_rc_command "$1"
diff --git a/databases/mariadb104-server/files/patch-CMakeLists.txt b/databases/mariadb104-server/files/patch-CMakeLists.txt
deleted file mode 100644
index 567e4df8a720..000000000000
--- a/databases/mariadb104-server/files/patch-CMakeLists.txt
+++ /dev/null
@@ -1,12 +0,0 @@
---- CMakeLists.txt.orig	2019-11-07 05:52:21 UTC
-+++ CMakeLists.txt
-@@ -504,7 +504,9 @@ ADD_CUSTOM_TARGET(INFO_BIN ALL
-   WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
- )
- 
-+IF(FALSE)
- INSTALL_DOCUMENTATION(README.md CREDITS COPYING THIRDPARTY COMPONENT Readme)
-+ENDIF()
- 
- # MDEV-6526 these files are not installed anymore
- #INSTALL_DOCUMENTATION(${CMAKE_BINARY_DIR}/Docs/INFO_SRC
diff --git a/databases/mariadb104-server/files/patch-MDEV-11790 b/databases/mariadb104-server/files/patch-MDEV-11790
deleted file mode 100644
index 1794bcf44da7..000000000000
--- a/databases/mariadb104-server/files/patch-MDEV-11790
+++ /dev/null
@@ -1,46 +0,0 @@
-WITHOUT_SERVER installs server-only files
-
-https://jira.mariadb.org/browse/MDEV-11790
---- extra/CMakeLists.txt.orig	2018-10-02 09:45:40 UTC
-+++ extra/CMakeLists.txt
-@@ -99,7 +99,7 @@ IF(WITH_INNOBASE_STORAGE_ENGINE)
-   ADD_DEPENDENCIES(innochecksum GenError)
- ENDIF()
- 
--MYSQL_ADD_EXECUTABLE(replace replace.c COMPONENT Server)
-+MYSQL_ADD_EXECUTABLE(replace replace.c COMPONENT Client)
- TARGET_LINK_LIBRARIES(replace mysys)
- 
- IF(UNIX)
---- scripts/CMakeLists.txt.orig	2018-10-02 09:45:42 UTC
-+++ scripts/CMakeLists.txt
-@@ -241,7 +241,10 @@ ENDIF()
- SET(mysql_config_COMPONENT COMPONENT Development)
- SET(msql2mysql_COMPONENT COMPONENT Client)
- SET(mysqlaccess_COMPONENT COMPONENT Client)
-+SET(mysqlhotcopy_COMPONENT COMPONENT Client)
-+SET(mysql_convert_table_format_COMPONENT COMPONENT Client)
- SET(mysql_find_rows_COMPONENT COMPONENT Client)
-+SET(mysql_setpermission_COMPONENT COMPONENT Client)
- SET(mytop_COMPONENT Mytop)
- 
- IF(WIN32)
-@@ -298,14 +301,14 @@ ELSE()
-   # On Unix, most of the files end up in the bin directory
-   SET(BIN_SCRIPTS
-     msql2mysql
--    mysql_config
--    mysql_setpermission
--    mysql_secure_installation
-     mysqlaccess
-+    mysqlhotcopy
-+    mysql_config
-     mysql_convert_table_format
-     mysql_find_rows
-+    mysql_secure_installation
-+    mysql_setpermission
-     mytop
--    mysqlhotcopy
-     ${SERVER_SCRIPTS}
-     ${WSREP_SCRIPTS}
-     ${SYSTEMD_SCRIPTS}
diff --git a/databases/mariadb104-server/files/patch-MDEV-20248 b/databases/mariadb104-server/files/patch-MDEV-20248
deleted file mode 100644
index ef0d97b17225..000000000000
--- a/databases/mariadb104-server/files/patch-MDEV-20248
+++ /dev/null
@@ -1,13 +0,0 @@
---- storage/rocksdb/rocksdb/port/jemalloc_helper.h.orig	2019-07-30 11:32:15 UTC
-+++ storage/rocksdb/rocksdb/port/jemalloc_helper.h
-@@ -12,6 +12,10 @@
- #include <jemalloc/jemalloc.h>
- #endif
- 
-+#ifdef __FreeBSD__
-+#define JEMALLOC_USABLE_SIZE_CONST const
-+#endif
-+
- #ifndef JEMALLOC_CXX_THROW
- #define JEMALLOC_CXX_THROW
- #endif
diff --git a/databases/mariadb104-server/files/patch-MDEV-26537 b/databases/mariadb104-server/files/patch-MDEV-26537
deleted file mode 100644
index 05cf0f5a4ebc..000000000000
--- a/databases/mariadb104-server/files/patch-MDEV-26537
+++ /dev/null
@@ -1,126 +0,0 @@
-From d09426f9e60fd93296464ec9eb5f9d85566437d3 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Marko=20M=C3=A4kel=C3=A4?= <marko.makela@mariadb.com>
-Date: Fri, 10 Sep 2021 19:15:41 +0300
-Subject: [PATCH] MDEV-26537 InnoDB corrupts files due to incorrect st_blksize
- calculation
-
-The st_blksize returned by fstat(2) is not documented to be
-a power of 2, like we assumed in
-commit 58252fff15acfe7c7b0452a87e202e3f8e454e19 (MDEV-26040).
-While on Linux, the st_blksize appears to report the file system
-block size (which hopefully is not smaller than the sector size
-of the underlying block device), on FreeBSD we observed
-st_blksize values that might have been something similar to st_size.
-
-Also IBM AIX was affected by this. A simple test case would
-lead to a crash when using the minimum innodb_buffer_pool_size=5m
-on both FreeBSD and AIX:
-
-seq -f 'create table t%g engine=innodb select * from seq_1_to_200000;' \
-1 100|mysql test&
-seq -f 'create table u%g engine=innodb select * from seq_1_to_200000;' \
-1 100|mysql test&
-
-We will fix this by not trusting st_blksize at all, and assuming that
-the smallest allowed write size (for O_DIRECT) is 4096 bytes. We hope
-that no storage systems with larger block size exist. Anything larger
-than 4096 bytes should be unlikely, given that it is the minimum
-virtual memory page size of many contemporary processors.
-
-MariaDB Server on Microsoft Windows was not affected by this.
-
-While the 512-byte sector size of the venerable Seagate ST-225 is still
-in widespread use, the minimum innodb_page_size is 4096 bytes, and
-innodb_log_file_size can be set in integer multiples of 65536 bytes.
-
-The only occasion where InnoDB uses smaller data file block sizes than
-4096 bytes is with ROW_FORMAT=COMPRESSED tables with KEY_BLOCK_SIZE=1
-or KEY_BLOCK_SIZE=2 (or innodb_page_size=4096). For such tables,
-we will from now on preallocate space in integer multiples of 4096 bytes
-and let regular writes extend the file by 1024, 2048, or 3072 bytes.
-
-The view INFORMATION_SCHEMA.INNODB_SYS_TABLESPACES.FS_BLOCK_SIZE
-should report the raw st_blksize.
-
-For page_compressed tables, the function fil_space_get_block_size()
-will map to 512 any st_blksize value that is larger than 4096.
-
-os_file_set_size(): Assume that the file system block size is 4096 bytes,
-and only support extending files to integer multiples of 4096 bytes.
-
-fil_space_extend_must_retry(): Round down the preallocation size to
-an integer multiple of 4096 bytes.
---- mysql-test/suite/innodb/t/check_ibd_filesize.test.orig	2021-08-02 10:58:56 UTC
-+++ mysql-test/suite/innodb/t/check_ibd_filesize.test
-@@ -46,6 +46,12 @@ perl;
- print "# bytes: ", (-s "$ENV{MYSQLD_DATADIR}/test/t1.ibd"), "\n";
- EOF
- INSERT INTO t1 SELECT seq,REPEAT('a',30000) FROM seq_1_to_20;
-+# Ensure that the file will be extended with the last 1024-byte page
-+# after the file was pre-extended in 4096-byte increments.
-+--disable_query_log
-+FLUSH TABLE t1 FOR EXPORT;
-+UNLOCK TABLES;
-+--enable_query_log
- perl;
- print "# bytes: ", (-s "$ENV{MYSQLD_DATADIR}/test/t1.ibd"), "\n";
- EOF
- mysql-test/suite/innodb/t/check_ibd_filesize.test |  6 ++++++
- storage/innobase/fil/fil0fil.cc                   | 13 +++++++++----
- storage/innobase/os/os0file.cc                    |  7 ++++---
- 3 files changed, 19 insertions(+), 7 deletions(-)
-
---- storage/innobase/fil/fil0fil.cc.orig	2021-08-02 10:58:57 UTC
-+++ storage/innobase/fil/fil0fil.cc
-@@ -942,11 +942,17 @@ fil_space_extend_must_retry(
- 	const page_size_t	pageSize(space->flags);
- 	const ulint		page_size = pageSize.physical();
- 
--	/* fil_read_first_page() expects srv_page_size bytes.
--	fil_node_open_file() expects at least 4 * srv_page_size bytes.*/
--	os_offset_t new_size = std::max(
--		os_offset_t(size - file_start_page_no) * page_size,
-+		/* fil_read_first_page() expects innodb_page_size bytes.
-+		fil_node_open_file() expects at least 4 * innodb_page_size bytes.
-+		os_file_set_size() expects multiples of 4096 bytes.
-+		For ROW_FORMAT=COMPRESSED tables using 1024-byte or 2048-byte
-+		pages, we will preallocate up to an integer multiple of 4096 bytes,
-+		and let normal writes append 1024, 2048, or 3072 bytes to the file. */
-+		os_offset_t new_size = std::max(
-+		(os_offset_t(size - file_start_page_no) * page_size)
-+		& ~os_offset_t(4095),
- 		os_offset_t(FIL_IBD_FILE_INITIAL_SIZE << srv_page_size_shift));
-+		
- 
- 	*success = os_file_set_size(node->name, node->handle, new_size,
- 		FSP_FLAGS_HAS_PAGE_COMPRESSION(space->flags));
---- storage/innobase/os/os0file.cc.orig	2021-08-02 10:58:57 UTC
-+++ storage/innobase/os/os0file.cc
-@@ -5351,6 +5351,8 @@ os_file_set_size(
- 	os_offset_t	size,
- 	bool	is_sparse)
- {
-+	ut_ad(!(size & 4095));
-+
- #ifdef _WIN32
- 	/* On Windows, changing file size works well and as expected for both
- 	sparse and normal files.
-@@ -5392,7 +5394,7 @@ fallback:
- 			if (current_size >= size) {
- 				return true;
- 			}
--			current_size &= ~os_offset_t(statbuf.st_blksize - 1);
-+			current_size &= ~4095ULL;
- 			err = posix_fallocate(file, current_size,
- 					      size - current_size);
- 		}
-@@ -5432,8 +5434,7 @@ fallback:
- 	if (fstat(file, &statbuf)) {
- 		return false;
- 	}
--	os_offset_t current_size = statbuf.st_size
--		& ~os_offset_t(statbuf.st_blksize - 1);
-+	os_offset_t current_size = statbuf.st_size & ~4095ULL;
- #endif
- 	if (current_size >= size) {
- 		return true;
diff --git a/databases/mariadb104-server/files/patch-cmake_install__layout.cmake b/databases/mariadb104-server/files/patch-cmake_install__layout.cmake
deleted file mode 100644
index 2f6b38ffa45d..000000000000
--- a/databases/mariadb104-server/files/patch-cmake_install__layout.cmake
+++ /dev/null
@@ -1,13 +0,0 @@
---- cmake/install_layout.cmake.orig	2020-05-09 19:27:56 UTC
-+++ cmake/install_layout.cmake
-@@ -128,8 +128,8 @@ SET(INSTALL_SUPPORTFILESDIR_STANDALONE  "support-files
- SET(INSTALL_MYSQLDATADIR_STANDALONE     "data")
- 
- SET(INSTALL_UNIX_ADDRDIR_STANDALONE     "/tmp/mysql.sock")
--SET(INSTALL_PAMDIR_STANDALONE           "share")
--SET(INSTALL_PAMDATADIR_STANDALONE       "share")
-+SET(INSTALL_PAMDIR_STANDALONE           "lib/mysql/plugin")
-+SET(INSTALL_PAMDATADIR_STANDALONE       "etc/mysql")
- #
- # RPM layout
- #
diff --git a/databases/mariadb104-server/files/patch-libmariadb_include_CMakeLists.txt b/databases/mariadb104-server/files/patch-libmariadb_include_CMakeLists.txt
deleted file mode 100644
index 70e8fad20f85..000000000000
--- a/databases/mariadb104-server/files/patch-libmariadb_include_CMakeLists.txt
+++ /dev/null
@@ -1,15 +0,0 @@
---- libmariadb/include/CMakeLists.txt.orig	2017-05-14 23:13:15 UTC
-+++ libmariadb/include/CMakeLists.txt
-@@ -21,6 +21,7 @@ IF(WIN32)
-   SET(WIX_INCLUDES ${MARIADB_CLIENT_INCLUDES} ${MARIADB_ADDITIONAL_INCLUDES} ${MYSQL_ADDITIONAL_INCLUDES} PARENT_SCOPE)
- ENDIF()
- 
-+IF(NOT WITHOUT_CLIENT)
- INSTALL(FILES
-    ${MARIADB_CLIENT_INCLUDES}
-    DESTINATION ${INSTALL_INCLUDEDIR}
-@@ -33,3 +34,4 @@ INSTALL(FILES
-    ${MARIADB_ADDITIONAL_INCLUDES}
-    DESTINATION ${INSTALL_INCLUDEDIR}/mariadb
-    COMPONENT Development)
-+ENDIF()
diff --git a/databases/mariadb104-server/files/patch-libmariadb_libmariadb_CMakeLists.txt b/databases/mariadb104-server/files/patch-libmariadb_libmariadb_CMakeLists.txt
deleted file mode 100644
index 0542221db134..000000000000
--- a/databases/mariadb104-server/files/patch-libmariadb_libmariadb_CMakeLists.txt
+++ /dev/null
@@ -1,14 +0,0 @@
---- libmariadb/libmariadb/CMakeLists.txt.orig	2017-05-14 23:13:15 UTC
-+++ libmariadb/libmariadb/CMakeLists.txt
-@@ -401,9 +401,11 @@ SET_TARGET_PROPERTIES(libmariadb PROPERT
- INSTALL(TARGETS mariadbclient
-           COMPONENT Development
-           DESTINATION ${INSTALL_LIBDIR})
-+IF(NOT WITHOUT_CLIENT)
- INSTALL(TARGETS libmariadb
-           COMPONENT SharedLibraries
-         DESTINATION ${INSTALL_LIBDIR})
-+ENDIF()
- 
- IF(WIN32)
-    # On Windows, install PDB
diff --git a/databases/mariadb104-server/files/patch-libmariadb_plugins_auth_CMakeLists.txt b/databases/mariadb104-server/files/patch-libmariadb_plugins_auth_CMakeLists.txt
deleted file mode 100644
index f9edf6c4e50e..000000000000
--- a/databases/mariadb104-server/files/patch-libmariadb_plugins_auth_CMakeLists.txt
+++ /dev/null
@@ -1,31 +0,0 @@
---- libmariadb/plugins/auth/CMakeLists.txt.orig	2019-11-07 05:52:21 UTC
-+++ libmariadb/plugins/auth/CMakeLists.txt
-@@ -3,6 +3,7 @@ SET(AUTH_DIR ${CC_SOURCE_DIR}/plugins/auth)
- INCLUDE_DIRECTORIES(${AUTH_DIR})
- INCLUDE_DIRECTORIES(${CC_SOURCE_DIR}/include)
- 
-+IF(NOT WITHOUT_CLIENT)
- SET(CRYPTO_PLUGIN 1)
- IF(WIN32)
-   SET(CRYPT_SOURCE ${CC_SOURCE_DIR}/libmariadb/secure/win_crypt.c)
-@@ -18,6 +19,7 @@ ELSEIF(WITH_SSL STREQUAL "GNUTLS")
- ELSE()
-   UNSET(CRYPTO_PLUGIN)
- ENDIF()
-+ENDIF()
- 
- #native password
- REGISTER_PLUGIN(TARGET mysql_native_password
-@@ -119,10 +121,11 @@ REGISTER_PLUGIN(TARGET mysql_old_password
-                 DEFAULT STATIC
-                 SOURCES ${AUTH_DIR}/old_password.c)
- 
-+IF(NOT WITHOUT_CLIENT)
- # Cleartext
- REGISTER_PLUGIN(TARGET mysql_clear_password
-                 TYPE MARIADB_CLIENT_PLUGIN_AUTH
-                 CONFIGURATIONS DYNAMIC STATIC OFF
-                 DEFAULT DYNAMIC
-                 SOURCES ${AUTH_DIR}/mariadb_cleartext.c)
--
-+ENDIF()
diff --git a/databases/mariadb104-server/files/patch-libservices_CMakeLists.txt b/databases/mariadb104-server/files/patch-libservices_CMakeLists.txt
deleted file mode 100644
index 82bf5fac68ea..000000000000
--- a/databases/mariadb104-server/files/patch-libservices_CMakeLists.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-Fix up missing WITHOUT_DOCS, WITHOUT_CLIENT options
-
---- libservices/CMakeLists.txt.orig	2017-05-14 23:13:16 UTC
-+++ libservices/CMakeLists.txt
-@@ -40,4 +40,6 @@ SET(MYSQLSERVICES_SOURCES
-   )
- 
- ADD_CONVENIENCE_LIBRARY(mysqlservices ${MYSQLSERVICES_SOURCES})
-+IF(FALSE)
- INSTALL(TARGETS mysqlservices DESTINATION ${INSTALL_LIBDIR} COMPONENT Development)
-+ENDIF()
diff --git a/databases/mariadb104-server/files/patch-mysys_my__default.c b/databases/mariadb104-server/files/patch-mysys_my__default.c
deleted file mode 100644
index ef8d9b5ca53e..000000000000
--- a/databases/mariadb104-server/files/patch-mysys_my__default.c
+++ /dev/null
@@ -1,52 +0,0 @@
---- mysys/my_default.c.orig	2017-05-14 23:13:17 UTC
-+++ mysys/my_default.c
-@@ -785,7 +785,7 @@ static int search_default_file_with_ext(
-   {
-     MY_STAT stat_info;
-     if (!my_stat(name,&stat_info,MYF(0)))
--      return 1;
-+      return 0;
-     /*
-       Ignore world-writable regular files.
-       This is mainly done to protect us to not read a file created by
-@@ -803,6 +803,14 @@ static int search_default_file_with_ext(
-   if (!(fp= mysql_file_fopen(key_file_cnf, name, O_RDONLY, MYF(0))))
-     return 1;					/* Ignore wrong files */
- 
-+  if (strstr(name, "/etc") == name)
-+  {
-+    fprintf(stderr,
-+             "error: Config file %s in invalid location, please move to or merge with %%PREFIX%%%s\n",
-+             name,name);
-+      goto err;
-+  }
-+
-   while (mysql_file_fgets(buff, sizeof(buff) - 1, fp))
-   {
-     line++;
-@@ -1067,7 +1075,8 @@ void my_print_default_files(const char *
-           if (name[0] == FN_HOMELIB)	/* Add . to filenames in home */
-             *end++= '.';
-           strxmov(end, conf_file, *ext, " ", NullS);
--          fputs(name, stdout);
-+          if (strstr(name, "/etc") != name)
-+            fputs(name, stdout);
-         }
-       }
-     }
-@@ -1192,13 +1201,10 @@ static const char **init_default_directo
- 
- #else
- 
--#if defined(DEFAULT_SYSCONFDIR)
--  if (DEFAULT_SYSCONFDIR[0])
--    errors += add_directory(alloc, DEFAULT_SYSCONFDIR, dirs);
--#else
-   errors += add_directory(alloc, "/etc/", dirs);
-   errors += add_directory(alloc, "/etc/mysql/", dirs);
--#endif /* DEFAULT_SYSCONFDIR */
-+  errors += add_directory(alloc, "%%PREFIX%%/etc/", dirs);
-+  errors += add_directory(alloc, "%%PREFIX%%/etc/mysql/", dirs);
- 
- #endif
- 
diff --git a/databases/mariadb104-server/files/patch-oqgraph-MDEV-15291 b/databases/mariadb104-server/files/patch-oqgraph-MDEV-15291
deleted file mode 100644
index 05083cd206ac..000000000000
--- a/databases/mariadb104-server/files/patch-oqgraph-MDEV-15291
+++ /dev/null
@@ -1,40 +0,0 @@
---- storage/oqgraph/oqgraph_judy.cc.orig	2018-02-12 15:01:28 UTC
-+++ storage/oqgraph/oqgraph_judy.cc
-@@ -27,7 +27,7 @@
- /*
-   Currently the only active code that can return error is:
-     judy_bitset::reset()/J1U()
--    judy_bitset::setbit()/J1S()
-+    judy_bitset::jsetbit()/J1S()
- 
-   In most cases errors are either about wrong parameters passed to Judy
-   functions or internal structures corruption. These definitely deserve
-@@ -60,7 +60,7 @@ bool open_query::judy_bitset::test(size_
-   return rc == 1;
- }
- 
--open_query::judy_bitset& open_query::judy_bitset::setbit(size_type n)
-+open_query::judy_bitset& open_query::judy_bitset::jsetbit(size_type n)
- {
-   int rc;
-   J1S(rc, array, n);
---- storage/oqgraph/oqgraph_judy.h.orig	2018-02-12 15:01:28 UTC
-+++ storage/oqgraph/oqgraph_judy.h
-@@ -63,7 +63,7 @@ namespace open_query
-       if (!val)
-         return reset(n);
-       else
--        return setbit(n);
-+        return jsetbit(n);
-     }
- 
-     judy_bitset& set(const judy_bitset& src);
-@@ -115,7 +115,7 @@ namespace open_query
-   private:
-     mutable void* array;
- 
--    judy_bitset& setbit(size_type n);
-+    judy_bitset& jsetbit(size_type n);
-   };
- }
- 
diff --git a/databases/mariadb104-server/files/patch-pcre_CMakeLists.txt b/databases/mariadb104-server/files/patch-pcre_CMakeLists.txt
deleted file mode 100644
index c09bb5f9d875..000000000000
--- a/databases/mariadb104-server/files/patch-pcre_CMakeLists.txt
+++ /dev/null
@@ -1,11 +0,0 @@
---- pcre/CMakeLists.txt.orig	2017-08-17 10:05:39 UTC
-+++ pcre/CMakeLists.txt
-@@ -510,6 +510,8 @@ IF(PCRE_SHOW_REPORT)
-   MESSAGE(STATUS "")
- ENDIF(PCRE_SHOW_REPORT)
- 
-+IF(FALSE)
- INSTALL(FILES ${CMAKE_BINARY_DIR}/pcre/pcre.h DESTINATION ${INSTALL_INCLUDEDIR}/server/private COMPONENT Development)
-+ENDIF()
- 
- # end CMakeLists.txt
diff --git a/databases/mariadb104-server/files/patch-plugin_auth__pam_testing_CMakeLists.txt b/databases/mariadb104-server/files/patch-plugin_auth__pam_testing_CMakeLists.txt
deleted file mode 100644
index b759accf8e2a..000000000000
--- a/databases/mariadb104-server/files/patch-plugin_auth__pam_testing_CMakeLists.txt
+++ /dev/null
@@ -1,10 +0,0 @@
---- plugin/auth_pam/testing/CMakeLists.txt.orig	2019-11-07 05:52:22 UTC
-+++ plugin/auth_pam/testing/CMakeLists.txt
-@@ -5,5 +5,7 @@ SET_TARGET_PROPERTIES (pam_mariadb_mtr PROPERTIES PREF
- TARGET_LINK_LIBRARIES(pam_mariadb_mtr pam)
- 
- SET(dest DESTINATION "${INSTALL_MYSQLTESTDIR}/suite/plugins/pam" COMPONENT Test)
-+IF(FALSE)
- INSTALL(TARGETS pam_mariadb_mtr ${dest})
- INSTALL(FILES mariadb_mtr.conf RENAME mariadb_mtr ${dest})
-+ENDIF()
diff --git a/databases/mariadb104-server/files/patch-scripts_mysql__config.sh b/databases/mariadb104-server/files/patch-scripts_mysql__config.sh
deleted file mode 100644
index 13f25ca9fb74..000000000000
--- a/databases/mariadb104-server/files/patch-scripts_mysql__config.sh
+++ /dev/null
@@ -1,12 +0,0 @@
---- scripts/mysql_config.sh.orig	2017-05-24 09:15:23 UTC
-+++ scripts/mysql_config.sh
-@@ -106,7 +106,9 @@ fi
- 
- # Create options 
- libs="-L$pkglibdir @RPATH_OPTION@ @LIBS_FOR_CLIENTS@"
-+libs="$libs -L%%LOCALBASE%%/lib "
- embedded_libs="-L$pkglibdir @RPATH_OPTION@ @EMB_LIBS_FOR_CLIENTS@"
-+embedded_libs="$embedded_libs -L%%LOCALBASE%%/lib "
- 
- include="-I$pkgincludedir"
- if [ "$basedir" != "/usr" ]; then
diff --git a/databases/mariadb104-server/files/patch-scripts_mysqld__safe.sh b/databases/mariadb104-server/files/patch-scripts_mysqld__safe.sh
deleted file mode 100644
index 0c694bd3a30a..000000000000
--- a/databases/mariadb104-server/files/patch-scripts_mysqld__safe.sh
+++ /dev/null
@@ -1,16 +0,0 @@
---- scripts/mysqld_safe.sh.orig	2017-05-24 09:15:23 UTC
-+++ scripts/mysqld_safe.sh
-@@ -568,11 +568,11 @@ fi
- 
- if test -z "$MYSQL_HOME"
- then 
--  if test -r "$DATADIR/my.cnf"
-+  if test -r "$DATADIR/etc/my.cnf"
-   then
-     log_error "WARNING: Found $DATADIR/my.cnf
- The data directory is not a valid location for my.cnf, please move it to
--$MY_BASEDIR_VERSION/my.cnf"
-+$MY_BASEDIR_VERSION/etc/my.cnf"
-   fi
-   MYSQL_HOME=$MY_BASEDIR_VERSION
- fi
diff --git a/databases/mariadb104-server/files/patch-scripts_wsrep__sst__mariabackup.sh b/databases/mariadb104-server/files/patch-scripts_wsrep__sst__mariabackup.sh
deleted file mode 100644
index dc45c2d238c7..000000000000
--- a/databases/mariadb104-server/files/patch-scripts_wsrep__sst__mariabackup.sh
+++ /dev/null
@@ -1,11 +0,0 @@
---- scripts/wsrep_sst_mariabackup.sh.orig	2021-06-09 14:23:11.000000000 +0200
-+++ scripts/wsrep_sst_mariabackup.sh
-@@ -696,7 +696,7 @@
-     local ltcmd="$tcmd"
-     if [ $tmt -gt 0 ]; then
-         if [ -n "$(command -v timeout)" ]; then
--            if timeout --help | grep -qw -- '-k'; then
-+            if timeout --help 2>&1 | grep -qw -- '-k'; then
-                 ltcmd="timeout -k $(( tmt+10 )) $tmt $tcmd"
-             else
-                 ltcmd="timeout -s9 $tmt $tcmd"
diff --git a/databases/mariadb104-server/files/patch-sql_mysqld.cc b/databases/mariadb104-server/files/patch-sql_mysqld.cc
deleted file mode 100644
index 4109d800da4c..000000000000
--- a/databases/mariadb104-server/files/patch-sql_mysqld.cc
+++ /dev/null
@@ -1,31 +0,0 @@
---- sql/mysqld.cc.orig	2021-05-05 15:26:23 UTC
-+++ sql/mysqld.cc
-@@ -206,7 +206,7 @@ typedef fp_except fp_except_t;
- 
- inline void setup_fpu()
- {
--#if defined(__FreeBSD__) && defined(HAVE_IEEEFP_H) && !defined(HAVE_FEDISABLEEXCEPT)
-+#if defined(__FreeBSD__) && defined(HAVE_IEEEFP_H) && !defined(HAVE_FEDISABLEEXCEPT) && defined(FP_X_INV)
-   /* We can't handle floating point exceptions with threads, so disable
-      this on freebsd
-      Don't fall for overflow, underflow,divide-by-zero or loss of precision.
-@@ -219,7 +219,7 @@ inline void setup_fpu()
-   fpsetmask(~(FP_X_INV |             FP_X_OFL | FP_X_UFL | FP_X_DZ |
-               FP_X_IMP));
- #endif /* FP_X_DNML */
--#endif /* __FreeBSD__ && HAVE_IEEEFP_H && !HAVE_FEDISABLEEXCEPT */
-+#endif /* __FreeBSD__ && HAVE_IEEEFP_H && !HAVE_FEDISABLEEXCEPT && defined(FP_X_INV) */
- 
- #ifdef HAVE_FEDISABLEEXCEPT
-   fedisableexcept(FE_ALL_EXCEPT);
-@@ -5033,8 +5033,9 @@ static void init_ssl()
-       while ((err= ERR_get_error()))
-         sql_print_warning("SSL error: %s", ERR_error_string(err, NULL));
-     }
--    else
-+    else {
-       ERR_remove_state(0);
-+    }
-   }
-   else
-   {
diff --git a/databases/mariadb104-server/files/patch-storage_innobase_lz4.cmake b/databases/mariadb104-server/files/patch-storage_innobase_lz4.cmake
deleted file mode 100644
index 83080ef8386f..000000000000
--- a/databases/mariadb104-server/files/patch-storage_innobase_lz4.cmake
+++ /dev/null
@@ -1,44 +0,0 @@
---- storage/innobase/lz4.cmake.orig	2021-08-02 18:07:03 UTC
-+++ storage/innobase/lz4.cmake
-@@ -17,20 +17,28 @@ SET(WITH_INNODB_LZ4 AUTO CACHE STRING
- 
- MACRO (MYSQL_CHECK_LZ4)
-   IF (WITH_INNODB_LZ4 STREQUAL "ON" OR WITH_INNODB_LZ4 STREQUAL "AUTO")
--    CHECK_INCLUDE_FILES(lz4.h HAVE_LZ4_H)
--    CHECK_LIBRARY_EXISTS(lz4 LZ4_compress_limitedOutput "" HAVE_LZ4_SHARED_LIB)
--    CHECK_LIBRARY_EXISTS(lz4 LZ4_compress_default "" HAVE_LZ4_COMPRESS_DEFAULT)
--
--    IF (HAVE_LZ4_SHARED_LIB AND HAVE_LZ4_H)
--      SET(HAVE_INNODB_LZ4 TRUE)
--      ADD_DEFINITIONS(-DHAVE_LZ4=1)
--      IF (HAVE_LZ4_COMPRESS_DEFAULT)
--        ADD_DEFINITIONS(-DHAVE_LZ4_COMPRESS_DEFAULT=1)
-+    find_path(LZ4_INCLUDE_DIR NAMES lz4.h)
-+    find_library(LZ4_LIBRARY NAMES lz4)
-+    IF (LZ4_LIBRARY)
-+      get_filename_component(LZ4_LIBDIR ${LZ4_LIBRARY} DIRECTORY)
-+#  MESSAGE(STATUS "LZ4_INCLUDE_DIR=${LZ4_INCLUDE_DIR} LZ4_LIBRARY=${LZ4_LIBRARY} LZ4_LIBDIR=${LZ4_LIBDIR}")
-+      IF (LZ4_INCLUDE_DIR)
-+        SET(HAVE_LZ4_H YES)
-       ENDIF()
--      LINK_LIBRARIES(lz4)
--    ELSE()
--      IF (WITH_INNODB_LZ4 STREQUAL "ON")
--        MESSAGE(FATAL_ERROR "Required lz4 library is not found")
-+      CHECK_LIBRARY_EXISTS(lz4 LZ4_compress_limitedOutput ${LZ4_LIBDIR} HAVE_LZ4_SHARED_LIB)
-+      CHECK_LIBRARY_EXISTS(lz4 LZ4_compress_default ${LZ4_LIBDIR} HAVE_LZ4_COMPRESS_DEFAULT)
-+
-+      IF (HAVE_LZ4_SHARED_LIB AND HAVE_LZ4_H)
-+        SET(HAVE_INNODB_LZ4 TRUE)
-+        ADD_DEFINITIONS(-DHAVE_LZ4=1)
-+        IF (HAVE_LZ4_COMPRESS_DEFAULT)
-+          ADD_DEFINITIONS(-DHAVE_LZ4_COMPRESS_DEFAULT=1)
-+        ENDIF()
-+        LINK_LIBRARIES(innobase ${LZ4_LIBRARY})
-+      ELSE()
-+        IF (WITH_INNODB_LZ4 STREQUAL "ON")
-+          MESSAGE(FATAL_ERROR "Required lz4 library is not found")
-+        ENDIF()
-       ENDIF()
-     ENDIF()
-   ENDIF()
diff --git a/databases/mariadb104-server/files/patch-storage_innobase_lzo.cmake b/databases/mariadb104-server/files/patch-storage_innobase_lzo.cmake
deleted file mode 100644
index 291a8af8346a..000000000000
--- a/databases/mariadb104-server/files/patch-storage_innobase_lzo.cmake
+++ /dev/null
@@ -1,24 +0,0 @@
---- storage/innobase/lzo.cmake.orig	2021-08-02 18:07:03 UTC
-+++ storage/innobase/lzo.cmake
-@@ -17,13 +17,17 @@ SET(WITH_INNODB_LZO AUTO CACHE STRING
- 
- MACRO (MYSQL_CHECK_LZO)
-   IF (WITH_INNODB_LZO STREQUAL "ON" OR WITH_INNODB_LZO STREQUAL "AUTO")
--    CHECK_INCLUDE_FILES(lzo/lzo1x.h HAVE_LZO_H)
--    CHECK_LIBRARY_EXISTS(lzo2 lzo1x_1_compress "" HAVE_LZO_SHARED_LIB)
--
-+    find_path(LZO_INCLUDE NAMES lzo/lzo1x.h)
-+    find_library(LZO_LIBRARY NAMES lzo2)
-+    get_filename_component(LZO_LIBDIR ${LZO_LIBRARY} DIRECTORY)
-+    IF (LZO_INCLUDE)
-+      SET(HAVE_LZO_H 1)
-+    ENDIF()
-+    CHECK_LIBRARY_EXISTS(lzo2 lzo1x_1_compress ${LZO_LIBDIR} HAVE_LZO_SHARED_LIB)
-     IF(HAVE_LZO_SHARED_LIB AND HAVE_LZO_H)
-       SET(HAVE_INNODB_LZO TRUE)
-       ADD_DEFINITIONS(-DHAVE_LZO=1)
--      LINK_LIBRARIES(lzo2)
-+      LINK_LIBRARIES(${LZO_LIBRARY})
-     ELSE()
-       IF (WITH_INNODB_LZO STREQUAL "ON")
-         MESSAGE(FATAL_ERROR "Required lzo library is not found")
diff --git a/databases/mariadb104-server/files/patch-storage_innobase_snappy.cmake b/databases/mariadb104-server/files/patch-storage_innobase_snappy.cmake
deleted file mode 100644
index b1e5ed595b5f..000000000000
--- a/databases/mariadb104-server/files/patch-storage_innobase_snappy.cmake
+++ /dev/null
@@ -1,25 +0,0 @@
---- storage/innobase/snappy.cmake.orig	2021-08-02 18:07:03 UTC
-+++ storage/innobase/snappy.cmake
-@@ -17,13 +17,19 @@ SET(WITH_INNODB_SNAPPY AUTO CACHE STRING
- 
- MACRO (MYSQL_CHECK_SNAPPY)
-   IF (WITH_INNODB_SNAPPY STREQUAL "ON" OR WITH_INNODB_SNAPPY STREQUAL "AUTO")
--    CHECK_INCLUDE_FILES(snappy-c.h HAVE_SNAPPY_H)
--    CHECK_LIBRARY_EXISTS(snappy snappy_uncompress "" HAVE_SNAPPY_SHARED_LIB)
-+    find_path(SNAPPY_INCLUDE_DIR NAMES snappy-c.h)
-+    find_library(SNAPPY_LIBRARY NAMES snappy)
-+    get_filename_component(SNAPPY_LIBDIR ${SNAPPY_LIBRARY} DIRECTORY)
-+    IF (SNAPPY_INCLUDE_DIR)
-+      SET(HAVE_SNAPPY_H 1)
-+    ENDIF()
-+    CHECK_LIBRARY_EXISTS(snappy snappy_uncompress ${SNAPPY_LIBDIR} HAVE_SNAPPY_SHARED_LIB)
-+#MESSAGE(STATUS "HAVE_SNAPPY_H=${HAVE_SNAPPY_H} HAVE_SNAPPY_SHARED_LIB=${HAVE_SNAPPY_SHARED_LIB} SNAPPY_LIBDIR=${SNAPPY_LIBDIR} ")
- 
-     IF(HAVE_SNAPPY_SHARED_LIB AND HAVE_SNAPPY_H)
-       SET(HAVE_INNODB_SNAPPY TRUE)
-       ADD_DEFINITIONS(-DHAVE_SNAPPY=1)
--      LINK_LIBRARIES(snappy)
-+      LINK_LIBRARIES(${SNAPPY_LIBRARY})
-     ELSE()
-       IF (WITH_INNODB_SNAPPY STREQUAL "ON")
-         MESSAGE(FATAL_ERROR "Required snappy library is not found")
diff --git a/databases/mariadb104-server/files/patch-storage_mroonga_vendor_groonga_CMakeLists.txt b/databases/mariadb104-server/files/patch-storage_mroonga_vendor_groonga_CMakeLists.txt
deleted file mode 100644
index 023d10e97d94..000000000000
--- a/databases/mariadb104-server/files/patch-storage_mroonga_vendor_groonga_CMakeLists.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-From https://github.com/openquery/mariadb-server/commit/43bf72e45b9ead6aa0dc4abd6e5719c6381974b5
-
---- storage/mroonga/vendor/groonga/CMakeLists.txt.orig	2017-05-14 23:13:18 UTC
-+++ storage/mroonga/vendor/groonga/CMakeLists.txt
-@@ -167,6 +167,10 @@ if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_COM
-   MY_CHECK_AND_SET_COMPILER_FLAG("-Wno-clobbered")
- endif()
- 
-+if(CMAKE_COMPILER_IS_CLANGCXX)
-+  MY_CHECK_AND_SET_COMPILER_FLAG("-fexceptions")
-+endif()
-+
- if(NOT DEFINED CMAKE_C_COMPILE_OPTIONS_PIC)
-   # For old CMake
-   if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_COMPILER_IS_CLANGCXX)
diff --git a/databases/mariadb104-server/files/patch-storage_tokudb_CMakeLists.txt b/databases/mariadb104-server/files/patch-storage_tokudb_CMakeLists.txt
deleted file mode 100644
index e75813586e40..000000000000
--- a/databases/mariadb104-server/files/patch-storage_tokudb_CMakeLists.txt
+++ /dev/null
@@ -1,9 +0,0 @@
---- storage/tokudb/CMakeLists.txt.orig	2017-09-25 08:33:26.000000000 +0200
-+++ storage/tokudb/CMakeLists.txt	2017-09-28 21:46:55.119327000 +0200
-@@ -108,6 +108,3 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINA
- 
- TARGET_LINK_LIBRARIES(tokudb tokufractaltree_static tokuportability_static
-                       ${ZLIB_LIBRARY} ${LIBJEMALLOC} stdc++)
--
--SET(CMAKE_MODULE_LINKER_FLAGS_RELEASE "${CMAKE_MODULE_LINKER_FLAGS_RELEASE} -flto -fuse-linker-plugin")
--SET(CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO "${CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO} -flto -fuse-linker-plugin")
diff --git a/databases/mariadb104-server/files/patch-storage_tokudb_PerconaFT_CMakeLists.txt b/databases/mariadb104-server/files/patch-storage_tokudb_PerconaFT_CMakeLists.txt
deleted file mode 100644
index 9ef62147175b..000000000000
--- a/databases/mariadb104-server/files/patch-storage_tokudb_PerconaFT_CMakeLists.txt
+++ /dev/null
@@ -1,11 +0,0 @@
---- storage/tokudb/PerconaFT/CMakeLists.txt.orig	2017-05-14 23:13:20 UTC
-+++ storage/tokudb/PerconaFT/CMakeLists.txt
-@@ -80,7 +80,7 @@ add_subdirectory(src)
- add_subdirectory(ftcxx)
- add_subdirectory(tools)
- 
--INSTALL_DOCUMENTATION(README.md COPYING.AGPLv3 COPYING.GPLv2 PATENTS
-+INSTALL_DOCUMENTATION(README.md
-   COMPONENT Server)
- 
- ## build tags
diff --git a/databases/mariadb104-server/files/patch-storage_tokudb_PerconaFT_cmake__modules_TokuThirdParty.cmake b/databases/mariadb104-server/files/patch-storage_tokudb_PerconaFT_cmake__modules_TokuThirdParty.cmake
deleted file mode 100644
index 7f9ff7913496..000000000000
--- a/databases/mariadb104-server/files/patch-storage_tokudb_PerconaFT_cmake__modules_TokuThirdParty.cmake
+++ /dev/null
@@ -1,38 +0,0 @@
-Do NOT use bundled libs, use xz/lzma from base and archivers/snappy from ports
-
---- storage/tokudb/PerconaFT/cmake_modules/TokuThirdParty.cmake.orig	2019-11-07 05:52:23 UTC
-+++ storage/tokudb/PerconaFT/cmake_modules/TokuThirdParty.cmake
-@@ -1,5 +1,12 @@
- include(ExternalProject)
- 
-+IF (CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
-+  include_directories("/usr/include")
-+
-+  add_library(lzma SHARED IMPORTED)
-+  set_target_properties(lzma PROPERTIES IMPORTED_LOCATION
-+    "/usr/lib/liblzma.so")
-+ELSE()
- ## add lzma with an external project
- set(xz_configure_opts --with-pic --enable-static)
- if (APPLE)
-@@ -71,8 +78,15 @@ add_library(lzma STATIC IMPORTED)
- set_target_properties(lzma PROPERTIES IMPORTED_LOCATION
-   "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/xz/lib/liblzma.a")
- add_dependencies(lzma build_lzma)
-+ENDIF()
- 
-+IF (CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
-+  include_directories("%%LOCALBASE%%/include")
- 
-+  add_library(snappy SHARED IMPORTED)
-+  set_target_properties(snappy PROPERTIES IMPORTED_LOCATION
-+    "%%LOCALBASE%%/lib/libsnappy.so")
-+ELSE()
- ## add snappy with an external project
- set(SNAPPY_SOURCE_DIR "${TokuDB_SOURCE_DIR}/third_party/snappy-1.1.2" CACHE FILEPATH "Where to find sources for snappy.")
- if (NOT EXISTS "${SNAPPY_SOURCE_DIR}/CMakeLists.txt")
-@@ -109,3 +123,4 @@ add_library(snappy STATIC IMPORTED)
- set_target_properties(snappy PROPERTIES IMPORTED_LOCATION
-   "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/snappy/lib/libsnappy.a")
- add_dependencies(snappy build_snappy)
-+ENDIF()
diff --git a/databases/mariadb104-server/files/patch-storage_tokudb_PerconaFT_portability_memory.cc b/databases/mariadb104-server/files/patch-storage_tokudb_PerconaFT_portability_memory.cc
deleted file mode 100644
index c6eb23c5a525..000000000000
--- a/databases/mariadb104-server/files/patch-storage_tokudb_PerconaFT_portability_memory.cc
+++ /dev/null
@@ -1,16 +0,0 @@
-Fix build error
-
---- storage/tokudb/PerconaFT/portability/memory.cc.orig	2017-05-14 23:13:21 UTC
-+++ storage/tokudb/PerconaFT/portability/memory.cc
-@@ -42,11 +42,6 @@ Copyright (c) 2006, 2015, Percona and/or
- #include <string.h>
- #include <stdio.h>
- #include <stdlib.h>
--#if defined(HAVE_MALLOC_H)
--# include <malloc.h>
--#elif defined(HAVE_SYS_MALLOC_H)
--# include <sys/malloc.h>
--#endif
- #include <dlfcn.h>
- #include <toku_race_tools.h>
- #include "memory.h"
diff --git a/databases/mariadb104-server/files/patch-support-files_CMakeLists.txt b/databases/mariadb104-server/files/patch-support-files_CMakeLists.txt
deleted file mode 100644
index c9392ca628a2..000000000000
--- a/databases/mariadb104-server/files/patch-support-files_CMakeLists.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-Fix up missing WITHOUT_DOCS, WITHOUT_CLIENT options
-
---- support-files/CMakeLists.txt.orig	2017-05-14 23:13:28 UTC
-+++ support-files/CMakeLists.txt
-@@ -83,7 +83,9 @@ IF(UNIX)
-   CONFIGURE_FILE(mariadb.pc.in ${CMAKE_CURRENT_BINARY_DIR}/mariadb.pc @ONLY)
-   INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/mariadb.pc DESTINATION ${INSTALL_SHAREDIR}/pkgconfig COMPONENT Development)
- 
-+IF(FALSE)
-   INSTALL(FILES mysql.m4 DESTINATION ${INSTALL_SHAREDIR}/aclocal COMPONENT Development)
-+ENDIF()
-   
-   SET(bindir ${INSTALL_BINDIRABS})
-   SET(sbindir ${INSTALL_SBINDIRABS})
diff --git a/databases/mariadb104-server/files/pkg-message.in b/databases/mariadb104-server/files/pkg-message.in
deleted file mode 100644
index 7c031a3048ed..000000000000
--- a/databases/mariadb104-server/files/pkg-message.in
+++ /dev/null
@@ -1,26 +0,0 @@
-[
-{ type: install
-  message: <<EOM
-MariaDB respects hier(7) and doesn't check /etc and /etc/mysql for
-my.cnf. Please move existing my.cnf files from those paths to
-%%PREFIX%%/etc/mysql or %%PREFIX%%/etc. Sample
-configuration files are provided in %%PREFIX%%/etc/mysql
-and %%PREFIX%%/etc/mysql/conf.d.
-
-This port does NOT include the mytop perl script, this is included in
-the MariaDB tarball but the most recent version can be found in the
-databases/mytop port
-EOM
-}
-{ type: upgrade
-  message: <<EOM
-The default MySQL socket location has moved from /tmp to %%MARIADB_RUNDIR%%
-for both client and server packages. Make sure you update your configurations
-in /var/db/mysql and %%PREFIX%%/etc.
-
-Remember to run mariadb-upgrade (with the optional --datadir=<dbdir> flag)
-the first time you start the MySQL server after an upgrade from an
-earlier version.
-EOM
-}
-
diff --git a/databases/mariadb104-server/files/server.cnf.sample.in b/databases/mariadb104-server/files/server.cnf.sample.in
deleted file mode 100644
index c08ce7461ed2..000000000000
--- a/databases/mariadb104-server/files/server.cnf.sample.in
+++ /dev/null
@@ -1,60 +0,0 @@
-# Options specific to server applications, see
-# https://mariadb.com/kb/en/configuring-mariadb-with-option-files/#server-option-groups
-
-# Options specific to all server programs
-[server]
-
-# Options specific to MariaDB server programs
-[server-mariadb]
-
-#
-# Options for specific server tools
-#
-
-[mysqld]
-user				= %%MARIADB_USER%%
-# port				= 3306 # inherited from %%ETCDIR%%/my.cnf
-# socket			= %%MARIADB_RUNDIR%%/%%MARIADB_SOCK%% # inherited from %%ETCDIR%%/my.cnf
-bind-address			= 127.0.0.1
-basedir				= %%PREFIX%%
-datadir				= /var/db/mysql
-net_retry_count			= 16384
-log_error			= %%MARIADB_LOGDIR%%/mysqld.err
-# [mysqld] configuration for ZFS
-# From https://www.percona.com/resources/technical-presentations/zfs-mysql-percona-technical-webinar
-# Create separate datasets for data and logs, eg
-# zroot/mysql      compression=on recordsize=128k atime=off
-# zroot/mysql/data recordsize=16k
-# zroot/mysql/logs
-# datadir 			= /var/db/mysql/data
-# innodb_log_group_home_dir	= /var/db/mysql/log
-# audit_log_file		= /var/db/mysql/log/audit.log
-# general_log_file		= /var/db/mysql/log/general.log
-# log_bin			= /var/db/mysql/log/mysql-bin
-# relay_log			= /var/db/mysql/log/relay-log
-# slow_query_log_file		= /var/db/mysql/log/slow.log
-# innodb_doublewrite		= 0
-# innodb_flush_method		= O_DSYNC
-
-# Options read by `mysqld_safe`
-# Renamed from [mysqld_safe] starting with MariaDB 10.4.6.
-[mariadb_safe]
-
-# Options read my `mariabackup`
-[mariabackup]
-
-# Options read by `mysql_upgrade`
-# Renamed from [mysql_upgrade] starting with MariaDB 10.4.6.
-[mariadb-upgrade]
-
-# Specific options read by the mariabackup SST method
-[sst]
-
-# Options read by `mysqlbinlog`
-# Renamed from [mysqlbinlog] starting with MariaDB 10.4.6.
-[mariadb-binlog]
-
-# Options read by `mysqladmin`
-# Renamed from [mysqladmin] starting with MariaDB 10.4.6.
-[mariadb-admin]
-
diff --git a/databases/mariadb104-server/pkg-descr b/databases/mariadb104-server/pkg-descr
deleted file mode 100644
index 874d96eeaa95..000000000000
--- a/databases/mariadb104-server/pkg-descr
+++ /dev/null
@@ -1,14 +0,0 @@
-MariaDB is a database server that offers drop-in replacement functionality
-for MySQL. MariaDB is built by some of the original authors of MySQL, with
-assistance from the broader community of Free and open source software
-developers. In addition to the core functionality of MySQL, MariaDB offers
-a rich set of feature enhancements including alternate storage engines,
-server optimizations, and patches.
-
-MariaDB is primarily driven by developers at Monty Program, a company
-founded by Michael "Monty" Widenius, the original author of MySQL, but
-this is not the whole story about MariaDB. On the "About MariaDB" page you
-will find more information about all participants in the MariaDB community,
-including storage engines XtraDB and PBXT.
-
-WWW: https://mariadb.org/
diff --git a/databases/mariadb104-server/pkg-plist b/databases/mariadb104-server/pkg-plist
deleted file mode 100644
index ac3a50adb345..000000000000
--- a/databases/mariadb104-server/pkg-plist
+++ /dev/null
@@ -1,442 +0,0 @@
-bin/aria_chk
-bin/aria_dump_log
-bin/aria_ftdump
-bin/aria_pack
-bin/aria_read_log
-%%INNOBASE%%bin/innochecksum
-%%INNOBASE%%bin/mariabackup
-bin/mariadb-backup
-bin/mariadb-dumpslow
-bin/mariadb-embedded
-bin/mariadb-fix-extensions
-bin/mariadb-install-db
-%%ROCKSDB%%bin/mariadb-ldb
-bin/mariadb-secure-installation
-bin/mariadb-tzinfo-to-sql
-bin/mariadb-upgrade
-bin/mariadbd-multi
-bin/mariadbd-safe
-bin/mariadbd-safe-helper
-bin/mariadb-waitpid
-%%INNOBASE%%bin/mbstream
-bin/my_print_defaults
-bin/myisam_ftdump
-bin/myisamchk
-bin/myisamlog
-bin/myisampack
-%%ROCKSDB%%bin/myrocks_hotbackup
-bin/mysql_client_test
-bin/mysql_client_test_embedded
-bin/mysql_embedded
-bin/mysql_fix_extensions
-bin/mysql_install_db
-%%ROCKSDB%%bin/mysql_ldb
-bin/mysql_plugin
-bin/mysql_secure_installation
-bin/mysql_tzinfo_to_sql
-bin/mysql_upgrade
-bin/mysql_waitpid
-bin/mysqld_multi
-bin/mysqld_safe
-bin/mysqld_safe_helper
-bin/mysqldumpslow
-@comment bin/mysqltest_embedded
-bin/perror
-bin/resolve_stack_dump
-bin/resolveip
-%%ROCKSDB%%bin/sst_dump
-@comment bin/test-connect-t
-%%TOKUDB%%bin/tokuft_logprint
-%%TOKUDB%%bin/tokuftdump
-%%WSREP%%bin/wsrep_sst_common
-%%WSREP%%bin/wsrep_sst_mariabackup
-%%WSREP%%bin/wsrep_sst_mysqldump
-%%WSREP%%bin/wsrep_sst_rsync
-%%WSREP%%bin/wsrep_sst_rsync_wan
-@sample %%ETCDIR%%/conf.d/server.cnf.sample
-%%WSREP%%%%ETCDIR%%/conf.d/wsrep.cnf.sample
-@sample %%ETCDIR%%/user_map.conf.sample
-@comment data/test/db.opt
-include/mysql/server/big_endian.h
-include/mysql/server/byte_order_generic.h
-include/mysql/server/byte_order_generic_x86.h
-include/mysql/server/byte_order_generic_x86_64.h
-include/mysql/server/decimal.h
-include/mysql/server/errmsg.h
-include/mysql/server/handler_ername.h
-include/mysql/server/handler_state.h
-include/mysql/server/json_lib.h
-include/mysql/server/keycache.h
-include/mysql/server/little_endian.h
-include/mysql/server/m_ctype.h
-include/mysql/server/m_string.h
-include/mysql/server/ma_dyncol.h
-include/mysql/server/my_alloc.h
-include/mysql/server/my_attribute.h
-include/mysql/server/my_byteorder.h
-include/mysql/server/my_compiler.h
-include/mysql/server/my_config.h
-include/mysql/server/my_dbug.h
-include/mysql/server/my_decimal_limits.h
-include/mysql/server/my_dir.h
-include/mysql/server/my_getopt.h
-include/mysql/server/my_global.h
-include/mysql/server/my_list.h
-include/mysql/server/my_net.h
-include/mysql/server/my_pthread.h
-include/mysql/server/my_sys.h
-include/mysql/server/my_valgrind.h
-include/mysql/server/my_xml.h
-include/mysql/server/mysql.h
-include/mysql/server/mysql/auth_dialog_client.h
-include/mysql/server/mysql/client_plugin.h
-include/mysql/server/mysql/plugin.h
-include/mysql/server/mysql/plugin_audit.h
-include/mysql/server/mysql/plugin_auth.h
-include/mysql/server/mysql/plugin_auth_common.h
-include/mysql/server/mysql/plugin_encryption.h
-include/mysql/server/mysql/plugin_ftparser.h
-include/mysql/server/mysql/plugin_password_validation.h
-include/mysql/server/mysql/psi/mysql_file.h
-include/mysql/server/mysql/psi/mysql_idle.h
-include/mysql/server/mysql/psi/mysql_socket.h
-include/mysql/server/mysql/psi/mysql_stage.h
-include/mysql/server/mysql/psi/mysql_statement.h
-include/mysql/server/mysql/psi/mysql_table.h
-include/mysql/server/mysql/psi/mysql_thread.h
-include/mysql/server/mysql/psi/psi.h
-include/mysql/server/mysql/psi/psi_abi_v0.h
-include/mysql/server/mysql/psi/psi_abi_v1.h
-include/mysql/server/mysql/psi/psi_abi_v2.h
-include/mysql/server/mysql/psi/psi_base.h
-include/mysql/server/mysql/psi/psi_memory.h
-include/mysql/server/mysql/service_base64.h
-include/mysql/server/mysql/service_debug_sync.h
-include/mysql/server/mysql/service_encryption.h
-include/mysql/server/mysql/service_encryption_scheme.h
-include/mysql/server/mysql/service_json.h
-include/mysql/server/mysql/service_kill_statement.h
-include/mysql/server/mysql/service_logger.h
-include/mysql/server/mysql/service_md5.h
-include/mysql/server/mysql/service_my_crypt.h
-include/mysql/server/mysql/service_my_print_error.h
-include/mysql/server/mysql/service_my_snprintf.h
-include/mysql/server/mysql/service_progress_report.h
-include/mysql/server/mysql/service_sha1.h
-include/mysql/server/mysql/service_sha2.h
-include/mysql/server/mysql/service_thd_alloc.h
-include/mysql/server/mysql/service_thd_autoinc.h
-include/mysql/server/mysql/service_thd_error_context.h
-include/mysql/server/mysql/service_thd_rnd.h
-include/mysql/server/mysql/service_thd_specifics.h
-include/mysql/server/mysql/service_thd_timezone.h
-include/mysql/server/mysql/service_thd_wait.h
-include/mysql/server/mysql/service_wsrep.h
-include/mysql/server/mysql/services.h
-include/mysql/server/mysql_com.h
-include/mysql/server/mysql_com_server.h
-include/mysql/server/mysql_embed.h
-include/mysql/server/mysql_time.h
-include/mysql/server/mysql_version.h
-include/mysql/server/mysqld_ername.h
-include/mysql/server/mysqld_error.h
-include/mysql/server/pack.h
-include/mysql/server/sql_common.h
-include/mysql/server/sql_state.h
-include/mysql/server/sslopt-case.h
-include/mysql/server/sslopt-longopts.h
-include/mysql/server/sslopt-vars.h
-include/mysql/server/typelib.h
-@comment lib/mysql/libmariadbclient.a
-lib/mysql/libmariadbd.a
-lib/mysql/libmariadbd.so
-lib/mysql/libmariadbd.so.19
-lib/mysql/libmysqld.a
-lib/mysql/libmysqld.so
-lib/mysql/plugin/adt_null.so
-lib/mysql/plugin/auth_0x0100.so
-lib/mysql/plugin/auth_ed25519.so
-%%NO_GSSAPI_NONE%%lib/mysql/plugin/auth_gssapi.so
-lib/mysql/plugin/auth_pam.so
-lib/mysql/plugin/auth_pam_tool_dir/auth_pam_tool
-lib/mysql/plugin/auth_pam_v1.so
-lib/mysql/plugin/caching_sha2_password.so
-lib/mysql/plugin/debug_key_management.so
-lib/mysql/plugin/file_key_management.so
-lib/mysql/plugin/ha_archive.so
-lib/mysql/plugin/ha_blackhole.so
-lib/mysql/plugin/ha_connect.so
-lib/mysql/plugin/ha_federated.so
-lib/mysql/plugin/ha_federatedx.so
-%%MROONGA%%lib/mysql/plugin/ha_mroonga.so
-%%OQGRAPH%%lib/mysql/plugin/ha_oqgraph.so
-%%ROCKSDB%%lib/mysql/plugin/ha_rocksdb.so
-%%SPHINX%%lib/mysql/plugin/ha_sphinx.so
-%%SPIDER%%lib/mysql/plugin/ha_spider.so
-%%TOKUDB%%lib/mysql/plugin/ha_tokudb.so
-lib/mysql/plugin/ha_test_sql_discovery.so
-lib/mysql/plugin/handlersocket.so
-lib/mysql/plugin/locales.so
-lib/mysql/plugin/metadata_lock_info.so
-lib/mysql/plugin/pam_user_map.so
-lib/mysql/plugin/qa_auth_client.so
-lib/mysql/plugin/qa_auth_interface.so
-lib/mysql/plugin/qa_auth_server.so
-lib/mysql/plugin/query_cache_info.so
-lib/mysql/plugin/query_response_time.so
-lib/mysql/plugin/server_audit.so
-lib/mysql/plugin/simple_password_check.so
-lib/mysql/plugin/sql_errlog.so
-lib/mysql/plugin/test_versioning.so
-%%WSREP%%lib/mysql/plugin/wsrep_info.so
-libexec/mariadbd
-libexec/mysqld
-man/man1/aria_chk.1.gz
-man/man1/aria_dump_log.1.gz
-man/man1/aria_ftdump.1.gz
-man/man1/aria_pack.1.gz
-man/man1/aria_read_log.1.gz
-man/man1/galera_new_cluster.1.gz
-man/man1/galera_recovery.1.gz
-man/man1/innochecksum.1.gz
-man/man1/mariabackup.1.gz
-man/man1/mariadb-backup.1.gz
-man/man1/mariadb-dumpslow.1.gz
-man/man1/mariadb-embedded.1.gz
-man/man1/mariadb-fix-extensions.1.gz
-man/man1/mariadb-install-db.1.gz
-%%ROCKSDB%%man/man1/mariadb-ldb.1.gz
-man/man1/mariadb-secure-installation.1.gz
-@comment man/man1/mariadb-service-convert.1.gz
-man/man1/mariadb-tzinfo-to-sql.1.gz
-man/man1/mariadb-upgrade.1.gz
-man/man1/mariadbd-multi.1.gz
-man/man1/mariadbd-safe-helper.1.gz
-man/man1/mariadbd-safe.1.gz
-man/man1/mbstream.1.gz
-man/man1/my_print_defaults.1.gz
-man/man1/myisam_ftdump.1.gz
-man/man1/myisamchk.1.gz
-man/man1/myisamlog.1.gz
-man/man1/myisampack.1.gz
-man/man1/mysql.server.1.gz
-man/man1/mysql_fix_extensions.1.gz
-%%ROCKSDB%%man/man1/mysql_ldb.1.gz
-man/man1/mysql_install_db.1.gz
-man/man1/mysql_secure_installation.1.gz
-man/man1/mysql_tzinfo_to_sql.1.gz
-man/man1/mysql_upgrade.1.gz
-man/man1/mysqld_multi.1.gz
-man/man1/mysqld_safe.1.gz
-man/man1/mysqld_safe_helper.1.gz
-man/man1/mysqldumpslow.1.gz
-man/man1/perror.1.gz
-man/man1/resolve_stack_dump.1.gz
-man/man1/resolveip.1.gz
-%%TOKUDB%%man/man1/tokuft_logprint.1.gz
-%%TOKUDB%%man/man1/tokuftdump.1.gz
-%%WSREP%%man/man1/wsrep_sst_common.1.gz
-%%WSREP%%man/man1/wsrep_sst_mariabackup.1.gz
-%%WSREP%%man/man1/wsrep_sst_mysqldump.1.gz
-%%WSREP%%man/man1/wsrep_sst_rsync.1.gz
-%%WSREP%%man/man1/wsrep_sst_rsync_wan.1.gz
-man/man8/mariadbd.8.gz
-man/man8/mysqld.8.gz
-%%DATADIR%%/binary-configure
-%%DATADIR%%/charsets/Index.xml
-%%DATADIR%%/charsets/README
-%%DATADIR%%/charsets/armscii8.xml
-%%DATADIR%%/charsets/ascii.xml
-%%DATADIR%%/charsets/cp1250.xml
-%%DATADIR%%/charsets/cp1251.xml
-%%DATADIR%%/charsets/cp1256.xml
-%%DATADIR%%/charsets/cp1257.xml
-%%DATADIR%%/charsets/cp850.xml
-%%DATADIR%%/charsets/cp852.xml
-%%DATADIR%%/charsets/cp866.xml
-%%DATADIR%%/charsets/dec8.xml
-%%DATADIR%%/charsets/geostd8.xml
-%%DATADIR%%/charsets/greek.xml
-%%DATADIR%%/charsets/hebrew.xml
-%%DATADIR%%/charsets/hp8.xml
-%%DATADIR%%/charsets/keybcs2.xml
-%%DATADIR%%/charsets/koi8r.xml
-%%DATADIR%%/charsets/koi8u.xml
-%%DATADIR%%/charsets/latin1.xml
-%%DATADIR%%/charsets/latin2.xml
-%%DATADIR%%/charsets/latin5.xml
-%%DATADIR%%/charsets/latin7.xml
-%%DATADIR%%/charsets/macce.xml
-%%DATADIR%%/charsets/macroman.xml
-%%DATADIR%%/charsets/swe7.xml
-%%DATADIR%%/czech/errmsg.sys
-%%DATADIR%%/danish/errmsg.sys
-%%DATADIR%%/dutch/errmsg.sys
-%%DATADIR%%/english/errmsg.sys
-%%DATADIR%%/errmsg-utf8.txt
-%%DATADIR%%/estonian/errmsg.sys
-%%DATADIR%%/fill_help_tables.sql
-%%DATADIR%%/french/errmsg.sys
-%%DATADIR%%/german/errmsg.sys
-%%DATADIR%%/greek/errmsg.sys
-%%DATADIR%%/hindi/errmsg.sys
-%%DATADIR%%/hungarian/errmsg.sys
-%%SPIDER%%%%DATADIR%%/install_spider.sql
-%%DATADIR%%/italian/errmsg.sys
-%%DATADIR%%/japanese/errmsg.sys
-%%DATADIR%%/korean/errmsg.sys
-%%DATADIR%%/magic
-%%DATADIR%%/maria_add_gis_sp.sql
-%%DATADIR%%/maria_add_gis_sp_bootstrap.sql
-%%MROONGA%%%%DATADIR%%/mroonga/AUTHORS
-%%MROONGA%%%%DATADIR%%/mroonga/install.sql
-%%MROONGA%%%%DATADIR%%/mroonga/uninstall.sql
-%%DATADIR%%/mysql-log-rotate
-%%DATADIR%%/mysql.server
-%%DATADIR%%/mysql_performance_tables.sql
-%%DATADIR%%/mysql_system_tables.sql
-%%DATADIR%%/mysql_system_tables_data.sql
-%%DATADIR%%/mysql_test_data_timezone.sql
-%%DATADIR%%/mysql_test_db.sql
-%%DATADIR%%/mysqld_multi.server
-%%DATADIR%%/norwegian-ny/errmsg.sys
-%%DATADIR%%/norwegian/errmsg.sys
-%%DATADIR%%/polish/errmsg.sys
-%%DATADIR%%/portuguese/errmsg.sys
-%%DATADIR%%/romanian/errmsg.sys
-%%DATADIR%%/russian/errmsg.sys
-%%DATADIR%%/serbian/errmsg.sys
-%%DATADIR%%/slovak/errmsg.sys
-%%DATADIR%%/spanish/errmsg.sys
-%%DATADIR%%/swedish/errmsg.sys
-%%DATADIR%%/ukrainian/errmsg.sys
-%%WSREP%%%%DATADIR%%/wsrep_notify
-@comment %%DOCSDIR%%/COPYING
-%%DOCSDIR%%/INSTALL-BINARY
-%%WSREP%%%%DOCSDIR%%/README-wsrep
-@comment %%DOCSDIR%%/THIRDPARTY
-@comment share/groonga-normalizer-mysql/lgpl-2.0.txt
-@comment share/groonga/COPYING
-@comment share/mysql/mroonga/COPYING
-%%MROONGA%%share/groonga-normalizer-mysql/README.md
-%%MROONGA%%share/groonga/README.md
-@comment bin/mariadb
-@comment bin/mariadb-access
-@comment bin/mariadb-admin
-@comment bin/mariadb-binlog
-@comment bin/mariadb-check
-@comment bin/mariadb-client-test
-@comment bin/mariadb-client-test-embedded
-@comment bin/mariadb-convert-table-format
-@comment bin/mariadb-dump
-@comment bin/mariadb-find-rows
-@comment bin/mariadb-hotcopy
-@comment bin/mariadb-import
-@comment bin/mariadb-plugin
-@comment bin/mariadb-setpermission
-@comment bin/mariadb-show
-@comment bin/mariadb-slap
-@comment bin/mariadb-test
-@comment bin/mariadb-test-embedded
-@comment bin/mariadb_config
-@comment bin/msql2mysql
-@comment bin/mysql
-@comment bin/mysql_config
-@comment bin/mysql_convert_table_format
-@comment bin/mysql_find_rows
-@comment bin/mysql_setpermission
-@comment bin/mysqlaccess
-@comment bin/mysqladmin
-@comment bin/mysqlbinlog
-@comment bin/mysqlcheck
-@comment bin/mysqldump
-@comment bin/mysqlhotcopy
-@comment bin/mysqlimport
-@comment bin/mysqlshow
-@comment bin/mysqlslap
-@comment bin/mysqltest
-@comment bin/mytop
-@comment bin/replace
-@comment include/mysql/errmsg.h
-@comment include/mysql/ma_list.h
-@comment include/mysql/ma_pvio.h
-@comment include/mysql/ma_tls.h
-@comment include/mysql/mariadb/ma_io.h
-@comment include/mysql/mariadb_com.h
-@comment include/mysql/mariadb_ctype.h
-@comment include/mysql/mariadb_dyncol.h
-@comment include/mysql/mariadb_rpl.h
-@comment include/mysql/mariadb_stmt.h
-@comment include/mysql/mariadb_version.h
-@comment include/mysql/my_config.h
-@comment include/mysql/my_global.h
-@comment include/mysql/my_sys.h
-@comment include/mysql/mysql.h
-@comment include/mysql/mysql/client_plugin.h
-@comment include/mysql/mysql/plugin_auth.h
-@comment include/mysql/mysql/plugin_auth_common.h
-@comment include/mysql/mysql_com.h
-@comment include/mysql/mysql_version.h
-@comment include/mysql/mysqld_error.h
-@comment lib/mysql/libmariadb.so
-@comment lib/mysql/libmariadb.so.3
-@comment lib/mysql/libmariadbclient.a
-@comment lib/mysql/libmysqlclient.a
-@comment lib/mysql/libmysqlclient.so
-@comment lib/mysql/libmysqlclient_r.a
-@comment lib/mysql/libmysqlclient_r.so
-@comment lib/mysql/plugin/auth_gssapi_client.so
-@comment lib/mysql/plugin/client_ed25519.so
-@comment lib/mysql/plugin/daemon_example.ini
-@comment lib/mysql/plugin/dialog.so
-@comment lib/mysql/plugin/mysql_clear_password.so
-@comment lib/mysql/plugin/sha256_password.so
-@comment libdata/pkgconfig/libmariadb.pc
-@comment man/man1/mariadb-access.1.gz
-@comment man/man1/mariadb-admin.1.gz
-@comment man/man1/mariadb-binlog.1.gz
-@comment man/man1/mariadb-check.1.gz
-@comment man/man1/mariadb-client-test-embedded.1.gz
-@comment man/man1/mariadb-client-test.1.gz
-@comment man/man1/mariadb-convert-table-format.1.gz
-@comment man/man1/mariadb-dump.1.gz
-@comment man/man1/mariadb-find-rows.1.gz
-@comment man/man1/mariadb-hotcopy.1.gz
-@comment man/man1/mariadb-import.1.gz
-@comment man/man1/mariadb-plugin.1.gz
-@comment man/man1/mariadb-service-convert.1.gz
-@comment man/man1/mariadb-setpermission.1.gz
-@comment man/man1/mariadb-show.1.gz
-@comment man/man1/mariadb-slap.1.gz
-@comment man/man1/mariadb-test-embedded.1.gz
-@comment man/man1/mariadb-test.1.gz
-man/man1/mariadb-waitpid.1.gz
-@comment man/man1/mariadb.1.gz
-@comment man/man1/msql2mysql.1.gz
-@comment man/man1/my_safe_process.1.gz
-@comment man/man1/mysql-stress-test.pl.1.gz
-@comment man/man1/mysql-test-run.pl.1.gz
-@comment man/man1/mysql.1.gz
-@comment man/man1/mysql_client_test.1.gz
-@comment man/man1/mysql_client_test_embedded.1.gz
-@comment man/man1/mysql_config.1.gz
-@comment man/man1/mysql_convert_table_format.1.gz
-@comment man/man1/mysql_embedded.1.gz
-@comment man/man1/mysql_find_rows.1.gz
-@comment man/man1/mysql_plugin.1.gz
-@comment man/man1/mysql_setpermission.1.gz
-@comment man/man1/mysql_waitpid.1.gz
-@comment man/man1/mysqlaccess.1.gz
-@comment man/man1/mysqladmin.1.gz
-@comment man/man1/mysqlbinlog.1.gz
-@comment man/man1/mysqlcheck.1.gz
-@comment man/man1/mysqldump.1.gz
-@comment man/man1/mysqlhotcopy.1.gz
-@comment man/man1/mysqlimport.1.gz
-@comment man/man1/mysqlshow.1.gz
-@comment man/man1/mysqlslap.1.gz
-@comment man/man1/mysqltest.1.gz
-@comment man/man1/mysqltest_embedded.1.gz
-@comment man/man1/replace.1.gz
-@comment share/pkgconfig/mariadb.pc
-@dir(%%MARIADB_USER%%,%%MARIADB_GROUP%%,) %%MARIADB_LOGDIR%%
diff --git a/databases/mariadb105-client/Makefile b/databases/mariadb105-client/Makefile
index 1374ded8512f..eadf06134a6a 100644
--- a/databases/mariadb105-client/Makefile
+++ b/databases/mariadb105-client/Makefile
@@ -1,5 +1,3 @@
-# Created by: Bernard Spil <brnrd@FreeBSD.org>
-
 PORTNAME=	mariadb
 PKGNAMESUFFIX=	105-client
 
diff --git a/databases/mariadb105-client/pkg-plist b/databases/mariadb105-client/pkg-plist
index 1e24b40d271a..4ac9327ed063 100644
--- a/databases/mariadb105-client/pkg-plist
+++ b/databases/mariadb105-client/pkg-plist
@@ -55,6 +55,7 @@ include/mysql/mariadb_dyncol.h
 include/mysql/mariadb_rpl.h
 include/mysql/mariadb_stmt.h
 include/mysql/mariadb_version.h
+include/mysql/my_alloca.h
 include/mysql/my_config.h
 include/mysql/my_global.h
 include/mysql/my_sys.h
@@ -66,6 +67,7 @@ include/mysql/mysql/plugin_auth.h
 include/mysql/mysql/plugin_auth_common.h
 include/mysql/mysqld_error.h
 %%NO_GSSAPI_NONE%%lib/mysql/plugin/auth_gssapi_client.so
+lib/mysql/libmariadb.a
 lib/mysql/libmariadb.so
 lib/mysql/libmariadb.so.3
 lib/mysql/libmariadbclient.a
@@ -83,103 +85,103 @@ lib/mysql/plugin/sha256_password.so
 libdata/pkgconfig/libmariadb.pc
 libdata/pkgconfig/mariadb.pc
 @comment libexec/rcmysql
-@comment man/man1/aria_chk.1.gz
-@comment man/man1/aria_dump_log.1.gz
-@comment man/man1/aria_ftdump.1.gz
-@comment man/man1/aria_pack.1.gz
-@comment man/man1/aria_read_log.1.gz
-@comment man/man1/aria_s3_copy.1.gz
-@comment man/man1/galera_new_cluster.1.gz
-@comment man/man1/galera_recovery.1.gz
-@comment man/man1/innochecksum.1.gz
-@comment man/man1/mariabackup.1.gz
-man/man1/mariadb.1.gz
-man/man1/mariadb-access.1.gz
-man/man1/mariadb-admin.1.gz
-@comment man/man1/mariadb-backup.1.gz
-man/man1/mariadb-binlog.1.gz
-man/man1/mariadb-check.1.gz
-man/man1/mariadb-client-test-embedded.1.gz
-man/man1/mariadb-client-test.1.gz
-man/man1/mariadb-conv.1.gz
-man/man1/mariadb-convert-table-format.1.gz
-man/man1/mariadb_config.1.gz
-man/man1/mariadb-dump.1.gz
-@comment man/man1/mariadb-dumpslow.1.gz
-@comment man/man1/mariadb-embedded.1.gz
-man/man1/mariadb-find-rows.1.gz
-@comment man/man1/mariadb-fix-extensions.1.gz
-man/man1/mariadb-hotcopy.1.gz
-man/man1/mariadb-import.1.gz
-@comment man/man1/mariadb-install-db.1.gz
-@comment man/man1/mariadb-ldb.1.gz
-man/man1/mariadb-plugin.1.gz
-@comment man/man1/mariadb-secure-installation.1.gz
-man/man1/mariadb-service-convert.1.gz
-man/man1/mariadb-setpermission.1.gz
-man/man1/mariadb-show.1.gz
-man/man1/mariadb-slap.1.gz
-man/man1/mariadb-test-embedded.1.gz
-man/man1/mariadb-test.1.gz
-@comment man/man1/mariadb-tzinfo-to-sql.1.gz
-@comment man/man1/mariadb-upgrade.1.gz
-@comment man/man1/mariadb-waitpid.1.gz
-@comment man/man1/mariadbd-multi.1.gz
-@comment man/man1/mariadbd-safe-helper.1.gz
-@comment man/man1/mariadbd-safe.1.gz
-@comment man/man1/mbstream.1.gz
-man/man1/msql2mysql.1.gz
-man/man1/my_print_defaults.1.gz
-man/man1/my_safe_process.1.gz
-@comment man/man1/myisam_ftdump.1.gz
-@comment man/man1/myisamchk.1.gz
-@comment man/man1/myisamlog.1.gz
-@comment man/man1/myisampack.1.gz
-@comment man/man1/myrocks_hotbackup.1.gz
-man/man1/mysql-stress-test.pl.1.gz
-man/man1/mysql-test-run.pl.1.gz
-man/man1/mysql.1.gz
-@comment man/man1/mysql.server.1.gz
-man/man1/mysql_client_test.1.gz
-man/man1/mysql_client_test_embedded.1.gz
-man/man1/mysql_config.1.gz
-man/man1/mysql_convert_table_format.1.gz
-man/man1/mysql_embedded.1.gz
-man/man1/mysql_find_rows.1.gz
-@comment man/man1/mysql_fix_extensions.1.gz
-@comment man/man1/mysql_install_db.1.gz
-@comment man/man1/mysql_ldb.1.gz
-man/man1/mysql_plugin.1.gz
-@comment man/man1/mysql_secure_installation.1.gz
-man/man1/mysql_setpermission.1.gz
-@comment man/man1/mysql_tzinfo_to_sql.1.gz
-@comment man/man1/mysql_upgrade.1.gz
-@comment man/man1/mysql_waitpid.1.gz
-man/man1/mysqlaccess.1.gz
-man/man1/mysqladmin.1.gz
-man/man1/mysqlbinlog.1.gz
-man/man1/mysqlcheck.1.gz
-@comment man/man1/mysqld_multi.1.gz
-@comment man/man1/mysqld_safe.1.gz
-@comment man/man1/mysqld_safe_helper.1.gz
-man/man1/mysqldump.1.gz
-@comment man/man1/mysqldumpslow.1.gz
-man/man1/mysqlhotcopy.1.gz
-man/man1/mysqlimport.1.gz
-man/man1/mysqlshow.1.gz
-man/man1/mysqlslap.1.gz
-man/man1/mysqltest.1.gz
-man/man1/mysqltest_embedded.1.gz
-@comment man/man1/mytop.1.gz
-@comment man/man1/perror.1.gz
-man/man1/replace.1.gz
-@comment man/man1/resolve_stack_dump.1.gz
-@comment man/man1/resolveip.1.gz
-@comment man/man1/wsrep_sst_common.1.gz
-@comment man/man1/wsrep_sst_mariabackup.1.gz
-@comment man/man1/wsrep_sst_mysqldump.1.gz
-@comment man/man1/wsrep_sst_rsync.1.gz
-@comment man/man1/wsrep_sst_rsync_wan.1.gz
-@comment man/man8/mariadbd.8.gz
-@comment man/man8/mysqld.8.gz
+@comment share/man/man1/aria_chk.1.gz
+@comment share/man/man1/aria_dump_log.1.gz
+@comment share/man/man1/aria_ftdump.1.gz
+@comment share/man/man1/aria_pack.1.gz
+@comment share/man/man1/aria_read_log.1.gz
+@comment share/man/man1/aria_s3_copy.1.gz
+@comment share/man/man1/galera_new_cluster.1.gz
+@comment share/man/man1/galera_recovery.1.gz
+@comment share/man/man1/innochecksum.1.gz
+@comment share/man/man1/mariabackup.1.gz
+share/man/man1/mariadb.1.gz
+share/man/man1/mariadb-access.1.gz
+share/man/man1/mariadb-admin.1.gz
+@comment share/man/man1/mariadb-backup.1.gz
+share/man/man1/mariadb-binlog.1.gz
+share/man/man1/mariadb-check.1.gz
+share/man/man1/mariadb-client-test-embedded.1.gz
+share/man/man1/mariadb-client-test.1.gz
+share/man/man1/mariadb-conv.1.gz
+share/man/man1/mariadb-convert-table-format.1.gz
+share/man/man1/mariadb_config.1.gz
+share/man/man1/mariadb-dump.1.gz
+@comment share/man/man1/mariadb-dumpslow.1.gz
+@comment share/man/man1/mariadb-embedded.1.gz
+share/man/man1/mariadb-find-rows.1.gz
+@comment share/man/man1/mariadb-fix-extensions.1.gz
+share/man/man1/mariadb-hotcopy.1.gz
+share/man/man1/mariadb-import.1.gz
+@comment share/man/man1/mariadb-install-db.1.gz
+@comment share/man/man1/mariadb-ldb.1.gz
+share/man/man1/mariadb-plugin.1.gz
+@comment share/man/man1/mariadb-secure-installation.1.gz
+share/man/man1/mariadb-service-convert.1.gz
+share/man/man1/mariadb-setpermission.1.gz
+share/man/man1/mariadb-show.1.gz
+share/man/man1/mariadb-slap.1.gz
+share/man/man1/mariadb-test-embedded.1.gz
+share/man/man1/mariadb-test.1.gz
+@comment share/man/man1/mariadb-tzinfo-to-sql.1.gz
+@comment share/man/man1/mariadb-upgrade.1.gz
+@comment share/man/man1/mariadb-waitpid.1.gz
+@comment share/man/man1/mariadbd-multi.1.gz
+@comment share/man/man1/mariadbd-safe-helper.1.gz
+@comment share/man/man1/mariadbd-safe.1.gz
+@comment share/man/man1/mbstream.1.gz
+share/man/man1/msql2mysql.1.gz
+share/man/man1/my_print_defaults.1.gz
+share/man/man1/my_safe_process.1.gz
+@comment share/man/man1/myisam_ftdump.1.gz
+@comment share/man/man1/myisamchk.1.gz
+@comment share/man/man1/myisamlog.1.gz
+@comment share/man/man1/myisampack.1.gz
+@comment share/man/man1/myrocks_hotbackup.1.gz
+share/man/man1/mysql-stress-test.pl.1.gz
+share/man/man1/mysql-test-run.pl.1.gz
+share/man/man1/mysql.1.gz
+@comment share/man/man1/mysql.server.1.gz
+share/man/man1/mysql_client_test.1.gz
+share/man/man1/mysql_client_test_embedded.1.gz
+share/man/man1/mysql_config.1.gz
+share/man/man1/mysql_convert_table_format.1.gz
+share/man/man1/mysql_embedded.1.gz
+share/man/man1/mysql_find_rows.1.gz
+@comment share/man/man1/mysql_fix_extensions.1.gz
+@comment share/man/man1/mysql_install_db.1.gz
+@comment share/man/man1/mysql_ldb.1.gz
+share/man/man1/mysql_plugin.1.gz
+@comment share/man/man1/mysql_secure_installation.1.gz
+share/man/man1/mysql_setpermission.1.gz
+@comment share/man/man1/mysql_tzinfo_to_sql.1.gz
+@comment share/man/man1/mysql_upgrade.1.gz
+@comment share/man/man1/mysql_waitpid.1.gz
+share/man/man1/mysqlaccess.1.gz
+share/man/man1/mysqladmin.1.gz
+share/man/man1/mysqlbinlog.1.gz
+share/man/man1/mysqlcheck.1.gz
+@comment share/man/man1/mysqld_multi.1.gz
+@comment share/man/man1/mysqld_safe.1.gz
+@comment share/man/man1/mysqld_safe_helper.1.gz
+share/man/man1/mysqldump.1.gz
+@comment share/man/man1/mysqldumpslow.1.gz
+share/man/man1/mysqlhotcopy.1.gz
+share/man/man1/mysqlimport.1.gz
+share/man/man1/mysqlshow.1.gz
+share/man/man1/mysqlslap.1.gz
+share/man/man1/mysqltest.1.gz
+share/man/man1/mysqltest_embedded.1.gz
+@comment share/man/man1/mytop.1.gz
+@comment share/man/man1/perror.1.gz
+share/man/man1/replace.1.gz
+@comment share/man/man1/resolve_stack_dump.1.gz
+@comment share/man/man1/resolveip.1.gz
+@comment share/man/man1/wsrep_sst_common.1.gz
+@comment share/man/man1/wsrep_sst_mariabackup.1.gz
+@comment share/man/man1/wsrep_sst_mysqldump.1.gz
+@comment share/man/man1/wsrep_sst_rsync.1.gz
+@comment share/man/man1/wsrep_sst_rsync_wan.1.gz
+@comment share/man/man8/mariadbd.8.gz
+@comment share/man/man8/mysqld.8.gz
 share/aclocal/mysql.m4
diff --git a/databases/mariadb105-server/Makefile b/databases/mariadb105-server/Makefile
index 4a3565ff8fb5..4b8151e1bc2e 100644
--- a/databases/mariadb105-server/Makefile
+++ b/databases/mariadb105-server/Makefile
@@ -1,25 +1,30 @@
-# Created by: Bernard Spil <brnrd@FreeBSD.org>
-
 PORTNAME?=	mariadb
-PORTVERSION=	10.5.12
-PORTREVISION?=	1
+PORTVERSION=	10.5.23
+PORTREVISION?=	0
 CATEGORIES=	databases
-MASTER_SITES=	http://mirrors.supportex.net/${SITESDIR}/ \
-		http://mirror2.hs-esslingen.de/pub/Mirrors/${SITESDIR}/ \
-		http://gd.tuwien.ac.at/db/${SITESDIR}/ \
-		http://mirrors.fe.up.pt/pub/${SITESDIR}/ \
-		http://mirror.de.gsnw.de:56431/${SITESDIR}/ \
-		http://mirror.layerjet.com/${SITESDIR}/ \
-		http://mirror.switch.ch/mirror/${SITESDIR}/ \
-		http://ftp.osuosl.org/pub/${SITESDIR}/
+MASTER_SITES=	\
+		https://mirror.nodesdirect.com/${SITESDIR}/ \
+		https://mirror.one.com/${SITESDIR}/ \
+		https://ftp.nluug.nl/db/${SITESDIR}/ \
+		https://ftp.icm.edu.pl/pub/unix/database/${SITESDIR}/ \
+		https://mirror.truenetwork.ru/${SITESDIR}/ \
+		https://mirrors.aliyun.com/${SITESDIR}/ \
+		https://ftp.ubuntu-tw.org/mirror/${SITESDIR}/ \
+		https://mirror.kku.ac.th/${SITESDIR}/ \
+		https://espejito.fder.edu.uy/${SITESDIR}/ \
+		https://ftp.osuosl.org/pub/${SITESDIR}/ \
+		https://downloads.mariadb.org/rest-api/mariadb/${PORTVERSION}/
 PKGNAMESUFFIX?=	105-server
 
 MAINTAINER=	brnrd@FreeBSD.org
 COMMENT?=	Multithreaded SQL database (server)
+WWW=		https://mariadb.org/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
+#EXPIRATION_DATE=	2025-06-01
+
 LIB_DEPENDS+=	libpcre2-8.so:devel/pcre2
 
 # Ugly workaround for MariaDB/CMake library detection
@@ -56,6 +61,9 @@ OPTIONS_GROUP=		COMPRESSION ENGINES GROONGA
 OPTIONS_DEFINE=		CONNECT_EXTRA DOCS
 OPTIONS_DEFINE_amd64=	WSREP
 OPTIONS_DEFINE_aarch64=	WSREP
+OPTIONS_DEFINE_powerpc64le=	WSREP
+OPTIONS_DEFINE_powerpc64=	WSREP
+OPTIONS_DEFINE_riscv64=	WSREP
 OPTIONS_GROUP_COMPRESSION=	LZ4 LZO SNAPPY ZSTD
 OPTIONS_GROUP_ENGINES=	COLUMNSTORE INNOBASE MROONGA OQGRAPH ROCKSDB S3 SPHINX SPIDER
 OPTIONS_GROUP_GROONGA=	ZMQ MSGPACK
@@ -84,6 +92,7 @@ CMAKE_ARGS+=	-DCMAKE_PREFIX_PATH=${PREFIX} \
 		-DINSTALL_DOCREADMEDIR="share/doc/mysql" \
 		-DINSTALL_INFODIR="info" \
 		-DINSTALL_LIBDIR="lib/mysql" \
+		-DINSTALL_MANDIR="share/man" \
 		-DINSTALL_MYSQLDATADIR="${MARIADB_DBDIR}" \
 		-DINSTALL_MYSQLSHAREDIR="share/mysql" \
 		-DINSTALL_MYSQLTESTDIR= \
@@ -112,10 +121,11 @@ DISABLED_PLUGINS+=	AUTH_TEST_PLUGIN DAEMON_EXAMPLE DIALOG_EXAMPLES \
 DATADIR=	${PREFIX}/share/mysql
 ETCDIR=		${PREFIX}/etc/mysql
 
-CONFLICTS_INSTALL=	mariadb10[0-46-9]-${PKGNAMESUFFIX:C/^[0-9]*-//}-* \
-			mysql[0-9]*-${PKGNAMESUFFIX:C/^[0-9]*-//}-* \
-			mysqlwsrep* \
-			percona[0-9]*-${PKGNAMESUFFIX:C/^[0-9]*-//}-*
+CONFLICTS_INSTALL=	mariadb10[0-46-9]-${PKGNAMESUFFIX:C/^[0-9]*-//} \
+			mariadb1011-${PKGNAMESUFFIX:C/^[0-9]*-//} \
+			mysql[0-9]*-${PKGNAMESUFFIX:C/^[0-9]*-//} \
+			mysqlwsrep*-server \
+			percona[0-9]*-${PKGNAMESUFFIX:C/^[0-9]*-//}
 
 FASTMTX_CMAKE_BOOL=	WITH_FAST_MUTEXES
 GSSAPI_BASE_USES=	gssapi
@@ -156,7 +166,7 @@ ${ENGINE}_CMAKE_OFF=	-DPLUGIN_${ENGINE}=NO
 ${ENGINE}_CMAKE_ON=	-DPLUGIN_${ENGINE}=DYNAMIC
 .endfor
 INNOBASE_VARS_OFF=	disabled_plugins+=INNOBASE
-#COLUMNSTORE_BROKEN=	fatal error: 'sys/sysinfo.h' file not found
+COLUMNSTORE_BROKEN=	ColumnStore build failure "'swap<logging::Message>' is missing exception specification"
 CONNECT_EXTRA_LIB_DEPENDS=	libodbc.so:databases/unixODBC
 CONNECT_EXTRA_USE=		gnome=libxml2
 CONNECT_EXTRA_USES=		gnome
@@ -169,9 +179,10 @@ LZO_CMAKE_ON=		-DWITH_INNODB_LZO=ON
 LZO_CMAKE_OFF=		-DWITH_INNODB_LZO=OFF
 LZO_LIB_DEPENDS=	liblzo2.so:archivers/lzo2
 MROONGA_IMPLIES=	LZ4
-MSGPACK_LIB_DEPENDS=	libmsgpackc.so:devel/msgpack
+MSGPACK_LIB_DEPENDS=	libmsgpackc.so:devel/msgpack-c
 OQGRAPH_LIB_DEPENDS=	libboost_system.so:devel/boost-libs \
 			libJudy.so:devel/judy
+#ROCKSDB_BROKEN=		RocksDB build failure "incompatible pointer to integer conversion assigning to 'size_t'"
 ROCKSDB_USES=		python
 ROCKSDB_CMAKE_ON=	-DPYTHON_SHEBANG=${PYTHON_CMD}
 SNAPPY_CMAKE_ON=	-DWITH_INNODB_SNAPPY=ON  -DWITH_ROCKSDB_snappy=ON
@@ -196,16 +207,14 @@ CMAKE_ARGS+=		-DPLUGIN_${PLUGIN}=NO
 
 .include <bsd.port.options.mk>
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1200057
-SUB_LIST+=	LEGACY_LIMITS="@comment " MODERN_LIMITS=""
-.else
-SUB_LIST+=	LEGACY_LIMITS="" MODERN_LIMITS="@comment "
-.endif
-
 .if ${SSL_DEFAULT} != base && ${PORT_OPTIONS:MGSSAPI_BASE}
 GSSAPI_BASE_IGNORE=	GSSAPI_BASE is not compatible with OpenSSL from ports. Use other GSSAPI options or OpenSSL from base system
 .endif
 
+.if ${SSL_DEFAULT:Mlibressl*}
+CFLAGS+=        -Wno-incompatible-function-pointer-types
+.endif
+
 .if ${ARCH} != amd64 && ${ARCH} != aarch64
 PLIST_SUB+=	WSREP="@comment "
 .endif
diff --git a/databases/mariadb105-server/distinfo b/databases/mariadb105-server/distinfo
index 148012cb3dbe..bf0621f94dcc 100644
--- a/databases/mariadb105-server/distinfo
+++ b/databases/mariadb105-server/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1628155943
-SHA256 (mariadb-10.5.12.tar.gz) = ab4f1ca69a30c5372e191a68e8b543a74168327680fb1f4067e8cc0a5582e4bd
-SIZE (mariadb-10.5.12.tar.gz) = 101914615
+TIMESTAMP = 1701021292
+SHA256 (mariadb-10.5.23.tar.gz) = 3f7c33b208cb799db014a874f56718eadff22ee95781fa360aa6bc696109acfe
+SIZE (mariadb-10.5.23.tar.gz) = 114829503
diff --git a/databases/mariadb105-server/files/mysql-server.in b/databases/mariadb105-server/files/mysql-server.in
index c4fd7307ca24..b5c1a172e365 100644
--- a/databases/mariadb105-server/files/mysql-server.in
+++ b/databases/mariadb105-server/files/mysql-server.in
@@ -7,14 +7,11 @@
 # Add the following line to /etc/rc.conf to enable mysql:
 # mysql_(instance_)?enable (bool):	Set to "NO" by default.
 #			Set it to "YES" to enable MySQL.
-%%LEGACY_LIMITS%%# mysql_(instance_)?limits (bool):	Set to "NO" by default.
-%%LEGACY_LIMITS%%#			Set it to yes to run `limits -e -U mysql`
-%%LEGACY_LIMITS%%#			just before mysql starts.
 # mysql_(instance_)?dbdir (str):	Default to "%%MARIADB_DBDIR%%"
 #			Base database directory.
 # mysql_(instance_)?args (str):	Custom additional arguments to be passed
 #			to mysqld_safe (default empty).
-# mysql_(instance_)?pidfile (str): Custum PID file path and name.
+# mysql_(instance_)?pidfile (str): Custom PID file path and name.
 #			Default to "${mysql_dbdir}/${hostname}.pid".
 # mysql_(instance_)?user (str): User to run mysqld as
 #			Default to "%%MARIADB_USER%%" created by the port
@@ -32,9 +29,7 @@ rcvar=mysql_enable
 load_rc_config $name
 
 : ${mysql_enable="NO"}
-%%LEGACY_LIMITS%%: ${mysql_limits="NO"}
 : ${mysql_user="%%MARIADB_USER%%"}
-%%LEGACY_LIMITS%%mysql_limits_args="-e -U ${mysql_user}"
 : ${mysql_dbdir="%%MARIADB_DBDIR%%"}
 : ${mysql_optfile="%%ETCDIR%%/my.cnf"}
 : ${mysql_rundir="%%MARIADB_RUNDIR%%"}
@@ -51,9 +46,7 @@ if [ -n "$2" ]; then
 	"$2 "*|*" $2 "*|*" $2"|"$2")
 		eval mysql_args="\${mysql_${instance}_args:-\"${mysql_args}\"}"
 		eval mysql_dbdir="\${mysql_${instance}_dbdir:-\"%%MARIADB_DBDIR%%_${instance}\"}"
-		%%LEGACY_LIMITS%%eval mysql_limits="\${mysql_${instance}_limits:-\"${mysql_limits}\"}"
 		eval mysql_user="\${mysql_${instance}_user:-\"${mysql_user}\"}"
-		%%LEGACY_LIMITS%%eval mysql_limits_args="\${mysql_${instance}_limits_args:-\"-e -U $mysql_user\"}"
 		eval mysql_socket="\${mysql_${instance}_socket:-\"%%MARIADB_RUNDIR%%_${instance}/%%MARIADB_SOCK%%\"}"
 		eval mysql_optfile="\${mysql_${instance}_optfile:-\"%%ETCDIR%%_${instance}/my.cnf\"}"
 		eval mysql_pidfile="\${mysql_${instance}_pidfile:-\"%%MARIADB_RUNDIR%%_${instance}/mysqld.pid\"}"
@@ -125,12 +118,7 @@ mysql_prestart()
 	if [ ! -d "${mysql_rundir}" ]; then
 		install -d -o ${mysql_user} -g ${mysql_group} "${mysql_rundir}"
 	fi
-%%LEGACY_LIMITS%%	if checkyesno mysql_limits; then
-%%LEGACY_LIMITS%%		eval `/usr/bin/limits ${mysql_limits_args}` 2>/dev/null
-%%LEGACY_LIMITS%%	else
-%%LEGACY_LIMITS%%		return 0
-%%LEGACY_LIMITS%%	fi
-%%MODERN_LIMITS%%	return 0
+	return 0
 	if [ ! -d "${mysql_rundir}" ]; then
 		install -d -u${mysql_user} -g$(id -gn $mysql_user) -m755 ${mysql_rundir}
 	fi
diff --git a/databases/mariadb105-server/files/patch-MDEV-26537 b/databases/mariadb105-server/files/patch-MDEV-26537
deleted file mode 100644
index 0fb9ecc7f529..000000000000
--- a/databases/mariadb105-server/files/patch-MDEV-26537
+++ /dev/null
@@ -1,109 +0,0 @@
-From 716f04a40f225af11fa88e793441da96dd0ddf21 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Marko=20M=C3=A4kel=C3=A4?= <marko.makela@mariadb.com>
-Date: Fri, 10 Sep 2021 11:20:12 +0300
-Subject: [PATCH] MDEV-26537 InnoDB corrupts files due to incorrect st_blksize
- calculation
-
-The st_blksize returned by fstat(2) is not documented to be
-a power of 2, like we assumed in
-commit 58252fff15acfe7c7b0452a87e202e3f8e454e19 (MDEV-26040).
-While on Linux, the st_blksize appears to report the file system
-block size, on FreeBSD it seems to be something similar to st_size.
-
-Also IBM AIX was affected by the bug. A simple test case that would
-lead to a crash when using the minimum innodb_buffer_pool_size=5m:
-
-seq -f 'create table t%g engine=innodb select * from seq_1_to_200000;' \
-1 100|mysql test&
-seq -f 'create table u%g engine=innodb select * from seq_1_to_200000;' \
-1 100|mysql test&
-
-We will fix this by not trusting st_blksize at all, and assuming that
-the file system block size is 4096 bytes. We hope that no storage systems
-with larger block size exist. Anything larger than 4096 bytes should be
-unlikely, given that it is the minimum virtual memory page size of many
-contemporary processors.
-
-While the block size 512 bytes of the venerable Seagate ST-225 is still
-in widespread use, the minimum innodb_page_size is 4096 bytes, and
-innodb_log_file_size can be set in integer multiples of 65536 bytes.
-
-The only occasion where InnoDB uses smaller block sizes than 4096 bytes
-is with ROW_FORMAT=COMPRESSED tables with KEY_BLOCK_SIZE=1
-or KEY_BLOCK_SIZE=2 (or innodb_page_size=4096). For such tables,
-we will from now on preallocate space in integer multiples of 4096 bytes
-and let regular writes extend the file by 1024, 2048, or 3072 bytes.
-
-The view INFORMATION_SCHEMA.INNODB_SYS_TABLESPACES.FS_BLOCK_SIZE
-should report the raw st_blksize.
-
-For page_compressed tables, the function fil_space_get_block_size()
-will map to 512 any st_blksize value that is larger than 4096.
-
-os_file_set_size(): Assume that the file system block size is 4096 bytes,
-and only support extending files to integer multiples of 4096 bytes.
-
-fil_space_extend_must_retry(): Round down the preallocation size to
-an integer multiple of 4096 bytes.
----
- mysql-test/suite/innodb/r/check_ibd_filesize,4k.rdiff |  2 +-
- storage/innobase/fil/fil0fil.cc                       | 11 ++++++++---
- storage/innobase/os/os0file.cc                        |  7 ++++---
- 3 files changed, 13 insertions(+), 7 deletions(-)
-
-diff --git a/storage/innobase/fil/fil0fil.cc b/storage/innobase/fil/fil0fil.cc
-index 6af8b729d78c5..b9421df3ffbad 100644
---- storage/innobase/fil/fil0fil.cc
-+++ storage/innobase/fil/fil0fil.cc
-@@ -578,10 +578,15 @@ fil_space_extend_must_retry(
- 
- 	const unsigned	page_size = space->physical_size();
- 
--	/* Datafile::read_first_page() expects srv_page_size bytes.
--	fil_node_t::read_page0() expects at least 4 * srv_page_size bytes.*/
-+	/* Datafile::read_first_page() expects innodb_page_size bytes.
-+	fil_node_t::read_page0() expects at least 4 * innodb_page_size bytes.
-+	os_file_set_size() expects multiples of 4096 bytes.
-+	For ROW_FORMAT=COMPRESSED tables using 1024-byte or 2048-byte
-+	pages, we will preallocate up to an integer multiple of 4096 bytes,
-+	and let normal writes append 1024, 2048, or 3072 bytes to the file. */
- 	os_offset_t new_size = std::max(
--		os_offset_t(size - file_start_page_no) * page_size,
-+		(os_offset_t(size - file_start_page_no) * page_size)
-+		& ~os_offset_t(4095),
- 		os_offset_t(FIL_IBD_FILE_INITIAL_SIZE << srv_page_size_shift));
- 
- 	*success = os_file_set_size(node->name, node->handle, new_size,
-diff --git a/storage/innobase/os/os0file.cc b/storage/innobase/os/os0file.cc
-index dde1975ea08b5..9e1eeff202d4b 100644
---- storage/innobase/os/os0file.cc
-+++ storage/innobase/os/os0file.cc
-@@ -3303,6 +3303,8 @@ os_file_set_size(
- 	os_offset_t	size,
- 	bool	is_sparse)
- {
-+	ut_ad(!(size & 4095));
-+
- #ifdef _WIN32
- 	/* On Windows, changing file size works well and as expected for both
- 	sparse and normal files.
-@@ -3344,7 +3346,7 @@ os_file_set_size(
- 			if (current_size >= size) {
- 				return true;
- 			}
--			current_size &= ~os_offset_t(statbuf.st_blksize - 1);
-+			current_size &= ~4095ULL;
- 			err = posix_fallocate(file, current_size,
- 					      size - current_size);
- 		}
-@@ -3384,8 +3386,7 @@ os_file_set_size(
- 	if (fstat(file, &statbuf)) {
- 		return false;
- 	}
--	os_offset_t current_size = statbuf.st_size
--		& ~os_offset_t(statbuf.st_blksize - 1);
-+	os_offset_t current_size = statbuf.st_size & ~4095ULL;
- #endif
- 	if (current_size >= size) {
- 		return true;
-
diff --git a/databases/mariadb105-server/files/patch-extra_CMakeLists.txt b/databases/mariadb105-server/files/patch-extra_CMakeLists.txt
deleted file mode 100644
index 6f662cf00bac..000000000000
--- a/databases/mariadb105-server/files/patch-extra_CMakeLists.txt
+++ /dev/null
@@ -1,11 +0,0 @@
---- extra/CMakeLists.txt.orig	2020-06-23 15:10:16 UTC
-+++ extra/CMakeLists.txt
-@@ -46,7 +46,7 @@ ADD_CUSTOM_TARGET(GenError
-                   DEPENDS
-                   ${CMAKE_BINARY_DIR}/include/mysqld_error.h.tmp)
- 
--MYSQL_ADD_EXECUTABLE(my_print_defaults my_print_defaults.c)
-+MYSQL_ADD_EXECUTABLE(my_print_defaults my_print_defaults.c COMPONENT Client)
- TARGET_LINK_LIBRARIES(my_print_defaults  mysys)
- 
- MYSQL_ADD_EXECUTABLE(perror perror.c)
diff --git a/databases/mariadb105-server/files/patch-include_my__cpu.h b/databases/mariadb105-server/files/patch-include_my__cpu.h
new file mode 100644
index 000000000000..e205cbfa05e2
--- /dev/null
+++ b/databases/mariadb105-server/files/patch-include_my__cpu.h
@@ -0,0 +1,48 @@
+--- include/my_cpu.h.orig	2021-09-27 13:32:48 UTC
++++ include/my_cpu.h
+@@ -23,7 +23,8 @@
+   The defines are the same ones used by the linux kernel
+ */
+ 
+-#ifdef _ARCH_PWR8
++#if defined(_ARCH_PWR8)
++#if defined(linux)
+ #include <sys/platform/ppc.h>
+ /* Very low priority */
+ #define HMT_very_low() __ppc_set_ppr_very_low()
+@@ -37,6 +38,22 @@
+ #define HMT_medium_high() __ppc_set_ppr_med_high()
+ /* High priority */
+ #define HMT_high() asm volatile("or 3,3,3")
++#elif defined(__FreeBSD__)
++#include <sys/types.h>
++#include <sys/sysctl.h>
++/* Very low priority */
++#define HMT_very_low() __asm__ volatile ("or 31,31,31")
++/* Low priority */
++#define HMT_low() __asm__ volatile ("or 1,1,1")
++/* Medium low priority */
++#define HMT_medium_low() __asm__ volatile ("or 6,6,6")
++/* Medium priority */
++#define HMT_medium() __asm__ volatile ("or 2,2,2")
++/* Medium high priority */
++#define HMT_medium_high() __asm__ volatile ("or 5,5,5")
++/* High priority */
++#define HMT_high() asm volatile("or 3,3,3")
++#endif
+ #else
+ #define HMT_very_low()
+ #define HMT_low()
+@@ -81,7 +98,12 @@ static inline void MY_RELAX_CPU(void)
+   __asm__ __volatile__ ("pause");
+ #endif
+ #elif defined(_ARCH_PWR8)
++#if defined(linux)
+   __ppc_get_timebase();
++#elif defined(__FreeBSD__)
++  uint64_t __tb;
++  __asm__ volatile ("mfspr %0, 268" : "=r" (__tb));
++#endif
+ #elif defined __GNUC__ && (defined __arm__ || defined __aarch64__)
+   /* Mainly, prevent the compiler from optimizing away delay loops */
+ #ifdef _aarch64_
diff --git a/databases/mariadb105-server/files/patch-scripts_wsrep__sst__mariabackup.sh b/databases/mariadb105-server/files/patch-scripts_wsrep__sst__mariabackup.sh
deleted file mode 100644
index 291b11edadbe..000000000000
--- a/databases/mariadb105-server/files/patch-scripts_wsrep__sst__mariabackup.sh
+++ /dev/null
@@ -1,11 +0,0 @@
---- scripts/wsrep_sst_mariabackup.sh.orig	2021-06-24 09:33:04 UTC
-+++ scripts/wsrep_sst_mariabackup.sh
-@@ -696,7 +696,7 @@ recv_joiner()
-     local ltcmd="$tcmd"
-     if [ $tmt -gt 0 ]; then
-         if [ -n "$(command -v timeout)" ]; then
--            if timeout --help | grep -qw -- '-k'; then
-+            if timeout --help 2>&1 | grep -qw -- '-k'; then
-                 ltcmd="timeout -k $(( tmt+10 )) $tmt $tcmd"
-             else
-                 ltcmd="timeout -s9 $tmt $tcmd"
diff --git a/databases/mariadb105-server/files/pkg-message.in b/databases/mariadb105-server/files/pkg-message.in
index 189a27624f5d..5117fc0b766a 100644
--- a/databases/mariadb105-server/files/pkg-message.in
+++ b/databases/mariadb105-server/files/pkg-message.in
@@ -21,4 +21,4 @@ the first time you start the MySQL server after an upgrade from an
 earlier version.
 EOM
 }
-
+]
diff --git a/databases/mariadb105-server/pkg-descr b/databases/mariadb105-server/pkg-descr
index 874d96eeaa95..f76c83728f01 100644
--- a/databases/mariadb105-server/pkg-descr
+++ b/databases/mariadb105-server/pkg-descr
@@ -10,5 +10,3 @@ founded by Michael "Monty" Widenius, the original author of MySQL, but
 this is not the whole story about MariaDB. On the "About MariaDB" page you
 will find more information about all participants in the MariaDB community,
 including storage engines XtraDB and PBXT.
-
-WWW: https://mariadb.org/
diff --git a/databases/mariadb105-server/pkg-plist b/databases/mariadb105-server/pkg-plist
index 2e6f8dd92eb7..330ed11f7de8 100644
--- a/databases/mariadb105-server/pkg-plist
+++ b/databases/mariadb105-server/pkg-plist
@@ -49,6 +49,7 @@ bin/resolve_stack_dump
 bin/resolveip
 %%ROCKSDB%%bin/sst_dump
 @comment bin/test-connect-t
+%%WSREP%%bin/wsrep_sst_backup
 %%WSREP%%bin/wsrep_sst_common
 %%WSREP%%bin/wsrep_sst_mariabackup
 %%WSREP%%bin/wsrep_sst_mysqldump
@@ -65,6 +66,7 @@ bin/resolveip
 %%WSREP%%%%ETCDIR%%/conf.d/wsrep.cnf.sample
 @sample %%ETCDIR%%/user_map.conf.sample
 @comment data/test/db.opt
+@comment include/mysql/my_alloca.h
 include/mysql/server/big_endian.h
 include/mysql/server/byte_order_generic.h
 include/mysql/server/byte_order_generic_x86.h
@@ -79,7 +81,9 @@ include/mysql/server/little_endian.h
 include/mysql/server/m_ctype.h
 include/mysql/server/m_string.h
 include/mysql/server/ma_dyncol.h
+include/mysql/server/mariadb_capi_rename.h
 include/mysql/server/my_alloc.h
+include/mysql/server/my_alloca.h
 include/mysql/server/my_attribute.h
 include/mysql/server/my_byteorder.h
 include/mysql/server/my_compiler.h
@@ -147,7 +151,7 @@ include/mysql/server/mysql/service_thd_rnd.h
 include/mysql/server/mysql/service_thd_specifics.h
 include/mysql/server/mysql/service_thd_timezone.h
 include/mysql/server/mysql/service_thd_wait.h
-include/mysql/server/mysql/service_wsrep.h
+%%WSREP%%include/mysql/server/mysql/service_wsrep.h
 include/mysql/server/mysql/services.h
 include/mysql/server/mysql_com.h
 include/mysql/server/mysql_com_server.h
@@ -163,6 +167,7 @@ include/mysql/server/sslopt-case.h
 include/mysql/server/sslopt-longopts.h
 include/mysql/server/sslopt-vars.h
 include/mysql/server/typelib.h
+@comment lib/mysql/libmariadb.a
 @comment lib/mysql/libmariadbclient.a
 lib/mysql/libmariadbd.a
 lib/mysql/libmariadbd.so
@@ -179,6 +184,7 @@ lib/mysql/plugin/auth_pam_tool_dir/auth_pam_tool
 lib/mysql/plugin/auth_pam_v1.so
 @comment lib/mysql/plugin/caching_sha2_password.so
 lib/mysql/plugin/debug_key_management.so
+lib/mysql/plugin/disks.so
 lib/mysql/plugin/file_key_management.so
 lib/mysql/plugin/func_test.so
 lib/mysql/plugin/ha_archive.so
@@ -213,62 +219,63 @@ lib/mysql/plugin/type_test.so
 libexec/mariadbd
 libexec/mysqld
 @comment libexec/rcmysql
-man/man1/aria_chk.1.gz
-man/man1/aria_dump_log.1.gz
-man/man1/aria_ftdump.1.gz
-man/man1/aria_pack.1.gz
-man/man1/aria_read_log.1.gz
-%%S3%%man/man1/aria_s3_copy.1.gz
-man/man1/galera_new_cluster.1.gz
-man/man1/galera_recovery.1.gz
-man/man1/innochecksum.1.gz
-man/man1/mariabackup.1.gz
-man/man1/mariadb-backup.1.gz
-@comment man/man1/mariadb-conv.1.gz
-@comment man/man1/mariadb_config.1.gz
-man/man1/mariadb-dumpslow.1.gz
-man/man1/mariadb-embedded.1.gz
-man/man1/mariadb-fix-extensions.1.gz
-man/man1/mariadb-install-db.1.gz
-%%ROCKSDB%%man/man1/mariadb-ldb.1.gz
-man/man1/mariadb-secure-installation.1.gz
-@comment man/man1/mariadb-service-convert.1.gz
-man/man1/mariadb-tzinfo-to-sql.1.gz
-man/man1/mariadb-upgrade.1.gz
-man/man1/mariadbd-multi.1.gz
-man/man1/mariadbd-safe-helper.1.gz
-man/man1/mariadbd-safe.1.gz
-man/man1/mbstream.1.gz
-@comment man/man1/my_print_defaults.1.gz
-man/man1/myisam_ftdump.1.gz
-man/man1/myisamchk.1.gz
-man/man1/myisamlog.1.gz
-man/man1/myisampack.1.gz
-%%ROCKSDB%%man/man1/myrocks_hotbackup.1.gz
-man/man1/mysql.server.1.gz
-man/man1/mysql_fix_extensions.1.gz
-%%ROCKSDB%%man/man1/mysql_ldb.1.gz
-man/man1/mysql_install_db.1.gz
-man/man1/mysql_secure_installation.1.gz
-man/man1/mysql_tzinfo_to_sql.1.gz
-man/man1/mysql_upgrade.1.gz
-man/man1/mysqld_multi.1.gz
-man/man1/mysqld_safe.1.gz
-man/man1/mysqld_safe_helper.1.gz
-man/man1/mysqldumpslow.1.gz
-@comment man/man1/mytop.1.gz
-man/man1/perror.1.gz
-man/man1/resolve_stack_dump.1.gz
-man/man1/resolveip.1.gz
-%%WSREP%%man/man1/wsrep_sst_common.1.gz
-%%WSREP%%man/man1/wsrep_sst_mariabackup.1.gz
-%%WSREP%%man/man1/wsrep_sst_mysqldump.1.gz
-%%WSREP%%man/man1/wsrep_sst_rsync.1.gz
-%%WSREP%%man/man1/wsrep_sst_rsync_wan.1.gz
-man/man8/mariadbd.8.gz
-man/man8/mysqld.8.gz
+share/man/man1/aria_chk.1.gz
+share/man/man1/aria_dump_log.1.gz
+share/man/man1/aria_ftdump.1.gz
+share/man/man1/aria_pack.1.gz
+share/man/man1/aria_read_log.1.gz
+%%S3%%share/man/man1/aria_s3_copy.1.gz
+%%WSREP%%share/man/man1/galera_new_cluster.1.gz
+%%WSREP%%share/man/man1/galera_recovery.1.gz
+share/man/man1/innochecksum.1.gz
+share/man/man1/mariabackup.1.gz
+share/man/man1/mariadb-backup.1.gz
+@comment share/man/man1/mariadb-conv.1.gz
+@comment share/man/man1/mariadb_config.1.gz
+share/man/man1/mariadb-dumpslow.1.gz
+share/man/man1/mariadb-embedded.1.gz
+share/man/man1/mariadb-fix-extensions.1.gz
+share/man/man1/mariadb-install-db.1.gz
+%%ROCKSDB%%share/man/man1/mariadb-ldb.1.gz
+share/man/man1/mariadb-secure-installation.1.gz
+@comment share/man/man1/mariadb-service-convert.1.gz
+share/man/man1/mariadb-tzinfo-to-sql.1.gz
+share/man/man1/mariadb-upgrade.1.gz
+share/man/man1/mariadbd-multi.1.gz
+share/man/man1/mariadbd-safe-helper.1.gz
+share/man/man1/mariadbd-safe.1.gz
+share/man/man1/mbstream.1.gz
+@comment share/man/man1/my_print_defaults.1.gz
+share/man/man1/myisam_ftdump.1.gz
+share/man/man1/myisamchk.1.gz
+share/man/man1/myisamlog.1.gz
+share/man/man1/myisampack.1.gz
+%%ROCKSDB%%share/man/man1/myrocks_hotbackup.1.gz
+share/man/man1/mysql.server.1.gz
+share/man/man1/mysql_fix_extensions.1.gz
+%%ROCKSDB%%share/man/man1/mysql_ldb.1.gz
+share/man/man1/mysql_install_db.1.gz
+share/man/man1/mysql_secure_installation.1.gz
+share/man/man1/mysql_tzinfo_to_sql.1.gz
+share/man/man1/mysql_upgrade.1.gz
+share/man/man1/mysqld_multi.1.gz
+share/man/man1/mysqld_safe.1.gz
+share/man/man1/mysqld_safe_helper.1.gz
+share/man/man1/mysqldumpslow.1.gz
+@comment share/man/man1/mytop.1.gz
+share/man/man1/perror.1.gz
+share/man/man1/resolve_stack_dump.1.gz
+share/man/man1/resolveip.1.gz
+%%WSREP%%share/man/man1/wsrep_sst_common.1.gz
+%%WSREP%%share/man/man1/wsrep_sst_mariabackup.1.gz
+%%WSREP%%share/man/man1/wsrep_sst_mysqldump.1.gz
+%%WSREP%%share/man/man1/wsrep_sst_rsync.1.gz
+%%WSREP%%share/man/man1/wsrep_sst_rsync_wan.1.gz
+share/man/man8/mariadbd.8.gz
+share/man/man8/mysqld.8.gz
 @comment share/aclocal/mysql.m4
 %%DATADIR%%/binary-configure
+%%DATADIR%%/bulgarian/errmsg.sys
 %%DATADIR%%/charsets/Index.xml
 %%DATADIR%%/charsets/README
 %%DATADIR%%/charsets/armscii8.xml
@@ -295,6 +302,7 @@ man/man8/mysqld.8.gz
 %%DATADIR%%/charsets/macce.xml
 %%DATADIR%%/charsets/macroman.xml
 %%DATADIR%%/charsets/swe7.xml
+%%DATADIR%%/chinese/errmsg.sys
 %%DATADIR%%/czech/errmsg.sys
 %%DATADIR%%/danish/errmsg.sys
 %%DATADIR%%/dutch/errmsg.sys
@@ -419,51 +427,51 @@ man/man8/mysqld.8.gz
 @comment lib/mysql/plugin/mysql_clear_password.so
 @comment lib/mysql/plugin/sha256_password.so
 @comment libdata/pkgconfig/libmariadb.pc
-@comment man/man1/mariadb-access.1.gz
-@comment man/man1/mariadb-admin.1.gz
-@comment man/man1/mariadb-binlog.1.gz
-@comment man/man1/mariadb-check.1.gz
-@comment man/man1/mariadb-client-test-embedded.1.gz
-@comment man/man1/mariadb-client-test.1.gz
-@comment man/man1/mariadb-convert-table-format.1.gz
-@comment man/man1/mariadb-dump.1.gz
-@comment man/man1/mariadb-find-rows.1.gz
-@comment man/man1/mariadb-hotcopy.1.gz
-@comment man/man1/mariadb-import.1.gz
-@comment man/man1/mariadb-plugin.1.gz
-@comment man/man1/mariadb-service-convert.1.gz
-@comment man/man1/mariadb-setpermission.1.gz
-@comment man/man1/mariadb-show.1.gz
-@comment man/man1/mariadb-slap.1.gz
-@comment man/man1/mariadb-test-embedded.1.gz
-@comment man/man1/mariadb-test.1.gz
-man/man1/mariadb-waitpid.1.gz
-@comment man/man1/mariadb.1.gz
-@comment man/man1/msql2mysql.1.gz
-@comment man/man1/my_safe_process.1.gz
-@comment man/man1/mysql-stress-test.pl.1.gz
-@comment man/man1/mysql-test-run.pl.1.gz
-@comment man/man1/mysql.1.gz
-@comment man/man1/mysql_client_test.1.gz
-@comment man/man1/mysql_client_test_embedded.1.gz
-@comment man/man1/mysql_config.1.gz
-@comment man/man1/mysql_convert_table_format.1.gz
-@comment man/man1/mysql_embedded.1.gz
-@comment man/man1/mysql_find_rows.1.gz
-@comment man/man1/mysql_plugin.1.gz
-@comment man/man1/mysql_setpermission.1.gz
-@comment man/man1/mysql_waitpid.1.gz
-@comment man/man1/mysqlaccess.1.gz
-@comment man/man1/mysqladmin.1.gz
-@comment man/man1/mysqlbinlog.1.gz
-@comment man/man1/mysqlcheck.1.gz
-@comment man/man1/mysqldump.1.gz
-@comment man/man1/mysqlhotcopy.1.gz
-@comment man/man1/mysqlimport.1.gz
-@comment man/man1/mysqlshow.1.gz
-@comment man/man1/mysqlslap.1.gz
-@comment man/man1/mysqltest.1.gz
-@comment man/man1/mysqltest_embedded.1.gz
-@comment man/man1/replace.1.gz
+@comment share/man/man1/mariadb-access.1.gz
+@comment share/man/man1/mariadb-admin.1.gz
+@comment share/man/man1/mariadb-binlog.1.gz
+@comment share/man/man1/mariadb-check.1.gz
+@comment share/man/man1/mariadb-client-test-embedded.1.gz
+@comment share/man/man1/mariadb-client-test.1.gz
+@comment share/man/man1/mariadb-convert-table-format.1.gz
+@comment share/man/man1/mariadb-dump.1.gz
+@comment share/man/man1/mariadb-find-rows.1.gz
+@comment share/man/man1/mariadb-hotcopy.1.gz
+@comment share/man/man1/mariadb-import.1.gz
+@comment share/man/man1/mariadb-plugin.1.gz
+@comment share/man/man1/mariadb-service-convert.1.gz
+@comment share/man/man1/mariadb-setpermission.1.gz
+@comment share/man/man1/mariadb-show.1.gz
+@comment share/man/man1/mariadb-slap.1.gz
+@comment share/man/man1/mariadb-test-embedded.1.gz
+@comment share/man/man1/mariadb-test.1.gz
+share/man/man1/mariadb-waitpid.1.gz
+@comment share/man/man1/mariadb.1.gz
+@comment share/man/man1/msql2mysql.1.gz
+@comment share/man/man1/my_safe_process.1.gz
+@comment share/man/man1/mysql-stress-test.pl.1.gz
+@comment share/man/man1/mysql-test-run.pl.1.gz
+@comment share/man/man1/mysql.1.gz
+@comment share/man/man1/mysql_client_test.1.gz
+@comment share/man/man1/mysql_client_test_embedded.1.gz
+@comment share/man/man1/mysql_config.1.gz
+@comment share/man/man1/mysql_convert_table_format.1.gz
+@comment share/man/man1/mysql_embedded.1.gz
+@comment share/man/man1/mysql_find_rows.1.gz
+@comment share/man/man1/mysql_plugin.1.gz
+@comment share/man/man1/mysql_setpermission.1.gz
+@comment share/man/man1/mysql_waitpid.1.gz
+@comment share/man/man1/mysqlaccess.1.gz
+@comment share/man/man1/mysqladmin.1.gz
+@comment share/man/man1/mysqlbinlog.1.gz
+@comment share/man/man1/mysqlcheck.1.gz
+@comment share/man/man1/mysqldump.1.gz
+@comment share/man/man1/mysqlhotcopy.1.gz
+@comment share/man/man1/mysqlimport.1.gz
+@comment share/man/man1/mysqlshow.1.gz
+@comment share/man/man1/mysqlslap.1.gz
+@comment share/man/man1/mysqltest.1.gz
+@comment share/man/man1/mysqltest_embedded.1.gz
+@comment share/man/man1/replace.1.gz
 @comment share/pkgconfig/mariadb.pc
 @dir(%%MARIADB_USER%%,%%MARIADB_GROUP%%,) %%MARIADB_LOGDIR%%
diff --git a/databases/mariadb106-client/Makefile b/databases/mariadb106-client/Makefile
new file mode 100644
index 000000000000..8a221e01c1f7
--- /dev/null
+++ b/databases/mariadb106-client/Makefile
@@ -0,0 +1,10 @@
+PORTNAME=	mariadb
+PKGNAMESUFFIX=	106-client
+
+COMMENT=	Multithreaded SQL database (client)
+
+MASTERDIR=	${.CURDIR}/../${PORTNAME}${PKGNAMESUFFIX:C/-client/-server/}
+
+PLIST=		${.CURDIR}/pkg-plist
+
+.include "${MASTERDIR}/Makefile"
diff --git a/databases/mariadb106-client/pkg-plist b/databases/mariadb106-client/pkg-plist
new file mode 100644
index 000000000000..2e475e5b99df
--- /dev/null
+++ b/databases/mariadb106-client/pkg-plist
@@ -0,0 +1,267 @@
+bin/mariadb
+bin/mariadb-access
+bin/mariadb-admin
+bin/mariadb-binlog
+bin/mariadb-check
+bin/mariadb-config
+bin/mariadb-conv
+bin/mariadb-convert-table-format
+bin/mariadb-dump
+@comment bin/mariadb-dumpslow
+bin/mariadb-find-rows
+bin/mariadb-hotcopy
+bin/mariadb-import
+bin/mariadb-plugin
+bin/mariadb-show
+@comment bin/mariadb-secure-installation
+bin/mariadb-setpermission
+bin/mariadb-slap
+bin/mariadb-test
+bin/mariadb-waitpid
+bin/mariadb_config
+bin/msql2mysql
+bin/mysql
+bin/mysql_config
+bin/mysql_convert_table_format
+bin/mysql_find_rows
+@comment bin/mysql_secure_installation
+bin/mysql_setpermission
+@comment bin/mysql_plugin
+@comment bin/mysql_waitpid
+bin/mysqlaccess
+bin/mysqladmin
+bin/mysqlbinlog
+bin/mysqlcheck
+bin/mysqldump
+@comment bin/mysqldumpslow
+bin/mysqlhotcopy
+bin/mysqlimport
+bin/mysqlshow
+bin/mysqlslap
+bin/mysqltest
+@comment bin/mytop
+bin/my_print_defaults
+bin/replace
+@sample %%ETCDIR%%/my.cnf.sample
+@sample %%ETCDIR%%/conf.d/client.cnf.sample
+include/mysql/errmsg.h
+include/mysql/ma_list.h
+include/mysql/ma_pvio.h
+include/mysql/ma_tls.h
+include/mysql/mariadb/ma_io.h
+include/mysql/mariadb_com.h
+include/mysql/mariadb_ctype.h
+include/mysql/mariadb_dyncol.h
+include/mysql/mariadb_rpl.h
+include/mysql/mariadb_stmt.h
+include/mysql/mariadb_version.h
+include/mysql/my_alloca.h
+include/mysql/my_config.h
+include/mysql/my_global.h
+include/mysql/my_sys.h
+include/mysql/mysql.h
+include/mysql/mysql_com.h
+include/mysql/mysql_version.h
+include/mysql/mysql/client_plugin.h
+include/mysql/mysql/plugin_auth.h
+include/mysql/mysql/plugin_auth_common.h
+include/mysql/mysqld_error.h
+%%NO_GSSAPI_NONE%%lib/mysql/plugin/auth_gssapi_client.so
+lib/mysql/libmariadb.a
+lib/mysql/libmariadb.so
+lib/mysql/libmariadb.so.3
+lib/mysql/libmariadbclient.a
+lib/mysql/libmysqlclient.a
+lib/mysql/libmysqlclient.so
+lib/mysql/libmysqlclient_r.a
+lib/mysql/libmysqlclient_r.so
+lib/mysql/libmysqlservices.a
+lib/mysql/plugin/caching_sha2_password.so
+lib/mysql/plugin/client_ed25519.so
+lib/mysql/plugin/daemon_example.ini
+lib/mysql/plugin/dialog.so
+lib/mysql/plugin/mysql_clear_password.so
+lib/mysql/plugin/sha256_password.so
+@comment lib/mysql/plugin/zstd.so
+libdata/pkgconfig/libmariadb.pc
+share/man/man1/mariadb.1.gz
+share/man/man1/mariadb-access.1.gz
+share/man/man1/mariadb-admin.1.gz
+share/man/man1/mariadb-binlog.1.gz
+share/man/man1/mariadb-check.1.gz
+share/man/man1/mariadb-client-test-embedded.1.gz
+share/man/man1/mariadb-client-test.1.gz
+share/man/man1/mariadb-convert-table-format.1.gz
+share/man/man1/mariadb_config.1.gz
+share/man/man1/mariadb-dump.1.gz
+@comment share/man/man1/mariadb-dumpslow.1.gz
+@comment share/man/man1/mariadb-embedded.1.gz
+share/man/man1/mariadb-find-rows.1.gz
+share/man/man1/mariadb-hotcopy.1.gz
+share/man/man1/mariadb-import.1.gz
+share/man/man1/mariadb-plugin.1.gz
+@comment share/man/man1/mariadb-secure-installation.1.gz
+share/man/man1/mariadb-setpermission.1.gz
+share/man/man1/mariadb-show.1.gz
+share/man/man1/mariadb-slap.1.gz
+share/man/man1/mariadb-test-embedded.1.gz
+share/man/man1/mariadb-test.1.gz
+@comment share/man/man1/mariadb-tzinfo-to-sql.1.gz
+@comment share/man/man1/mariadb-waitpid.1.gz
+share/man/man1/msql2mysql.1.gz
+share/man/man1/my_print_defaults.1.gz
+share/man/man1/my_safe_process.1.gz
+@comment share/man/man1/myisam_ftdump.1.gz
+@comment share/man/man1/myisamchk.1.gz
+@comment share/man/man1/myisamlog.1.gz
+@comment share/man/man1/myisampack.1.gz
+share/man/man1/mysql-stress-test.pl.1.gz
+share/man/man1/mysql-test-run.pl.1.gz
+share/man/man1/mysql.1.gz
+share/man/man1/mysql_client_test.1.gz
+share/man/man1/mysql_client_test_embedded.1.gz
+share/man/man1/mysql_config.1.gz
+share/man/man1/mysql_convert_table_format.1.gz
+share/man/man1/mysql_embedded.1.gz
+share/man/man1/mysql_find_rows.1.gz
+share/man/man1/mysql_plugin.1.gz
+@comment share/man/man1/mysql_secure_installation.1.gz
+share/man/man1/mysql_setpermission.1.gz
+@comment share/man/man1/mysql_tzinfo_to_sql.1.gz
+@comment share/man/man1/mysql_waitpid.1.gz
+share/man/man1/mysqlaccess.1.gz
+share/man/man1/mysqladmin.1.gz
+share/man/man1/mysqlbinlog.1.gz
+share/man/man1/mysqlcheck.1.gz
+share/man/man1/mysqldump.1.gz
+@comment share/man/man1/mysqldumpslow.1.gz
+share/man/man1/mysqlhotcopy.1.gz
+share/man/man1/mysqlimport.1.gz
+share/man/man1/mysqlshow.1.gz
+share/man/man1/mysqlslap.1.gz
+share/man/man1/mysqltest.1.gz
+share/man/man1/mysqltest_embedded.1.gz
+@comment share/man/man1/mytop.1.gz
+@comment share/man/man1/perror.1.gz
+share/man/man1/replace.1.gz
+@comment share/man/man1/resolve_stack_dump.1.gz
+share/man/man3/mariadb_cancel.3.gz
+share/man/man3/mariadb_connection.3.gz
+share/man/man3/mariadb_dyncol_check.3.gz
+share/man/man3/mariadb_dyncol_column_cmp_named.3.gz
+share/man/man3/mariadb_dyncol_column_count.3.gz
+share/man/man3/mariadb_dyncol_create_many_named.3.gz
+share/man/man3/mariadb_dyncol_create_many_num.3.gz
+share/man/man3/mariadb_dyncol_exists_named.3.gz
+share/man/man3/mariadb_dyncol_exists_num.3.gz
+share/man/man3/mariadb_dyncol_free.3.gz
+share/man/man3/mariadb_dyncol_list_named.3.gz
+share/man/man3/mariadb_dyncol_list_num.3.gz
+share/man/man3/mariadb_dyncol_unpack.3.gz
+share/man/man3/mariadb_dyncol_update_many_named.3.gz
+share/man/man3/mariadb_dyncol_update_many_num.3.gz
+share/man/man3/mariadb_get_infov.3.gz
+share/man/man3/mariadb_reconnect.3.gz
+share/man/man3/mariadb_rpl_close.3.gz
+share/man/man3/mariadb_rpl_fetch.3.gz
+share/man/man3/mariadb_rpl_get_optionsv.3.gz
+share/man/man3/mariadb_rpl_open.3.gz
+share/man/man3/mariadb_rpl_optionsv.3.gz
+share/man/man3/mariadb_stmt_execute_direct.3.gz
+share/man/man3/mariadb_stmt_fetch_fields.3.gz
+share/man/man3/mysql_affected_rows.3.gz
+share/man/man3/mysql_autocommit.3.gz
+share/man/man3/mysql_change_user.3.gz
+share/man/man3/mysql_close.3.gz
+share/man/man3/mysql_commit.3.gz
+share/man/man3/mysql_data_seek.3.gz
+share/man/man3/mysql_errno.3.gz
+share/man/man3/mysql_error.3.gz
+share/man/man3/mysql_fetch_field.3.gz
+share/man/man3/mysql_fetch_field_direct.3.gz
+share/man/man3/mysql_fetch_fields.3.gz
+share/man/man3/mysql_fetch_lengths.3.gz
+share/man/man3/mysql_fetch_row.3.gz
+share/man/man3/mysql_field_count.3.gz
+share/man/man3/mysql_field_seek.3.gz
+share/man/man3/mysql_field_tell.3.gz
+share/man/man3/mysql_free_result.3.gz
+share/man/man3/mysql_get_character_set_info.3.gz
+share/man/man3/mysql_get_client_info.3.gz
+share/man/man3/mysql_get_client_version.3.gz
+share/man/man3/mysql_get_host_info.3.gz
+share/man/man3/mysql_get_proto_info.3.gz
+share/man/man3/mysql_get_server_info.3.gz
+share/man/man3/mysql_get_server_version.3.gz
+share/man/man3/mysql_get_socket.3.gz
+share/man/man3/mysql_get_ssl_cipher.3.gz
+share/man/man3/mysql_hex_string.3.gz
+share/man/man3/mysql_info.3.gz
+share/man/man3/mysql_init.3.gz
+share/man/man3/mysql_kill.3.gz
+share/man/man3/mysql_more_results.3.gz
+share/man/man3/mysql_next_result.3.gz
+share/man/man3/mysql_num_fields.3.gz
+share/man/man3/mysql_num_rows.3.gz
+share/man/man3/mysql_options.3.gz
+share/man/man3/mysql_options4.3.gz
+share/man/man3/mysql_optionsv.3.gz
+share/man/man3/mysql_ping.3.gz
+share/man/man3/mysql_query.3.gz
+share/man/man3/mysql_read_query_result.3.gz
+share/man/man3/mysql_real_connect.3.gz
+share/man/man3/mysql_real_escape_string.3.gz
+share/man/man3/mysql_real_query.3.gz
+share/man/man3/mysql_refresh.3.gz
+share/man/man3/mysql_reset_connection.3.gz
+share/man/man3/mysql_rollback.3.gz
+share/man/man3/mysql_row_seek.3.gz
+share/man/man3/mysql_row_tell.3.gz
+share/man/man3/mysql_select_db.3.gz
+share/man/man3/mysql_send_query.3.gz
+share/man/man3/mysql_server_end.3.gz
+share/man/man3/mysql_server_init.3.gz
+share/man/man3/mysql_session_track_get_first.3.gz
+share/man/man3/mysql_session_track_get_next.3.gz
+share/man/man3/mysql_set_character_set.3.gz
+share/man/man3/mysql_set_server_option.3.gz
+share/man/man3/mysql_shutdown.3.gz
+share/man/man3/mysql_sqlstate.3.gz
+share/man/man3/mysql_ssl_set.3.gz
+share/man/man3/mysql_stat.3.gz
+share/man/man3/mysql_stmt_affected_rows.3.gz
+share/man/man3/mysql_stmt_attr_get.3.gz
+share/man/man3/mysql_stmt_attr_set.3.gz
+share/man/man3/mysql_stmt_bind_param.3.gz
+share/man/man3/mysql_stmt_bind_result.3.gz
+share/man/man3/mysql_stmt_close.3.gz
+share/man/man3/mysql_stmt_data_seek.3.gz
+share/man/man3/mysql_stmt_errno.3.gz
+share/man/man3/mysql_stmt_error.3.gz
+share/man/man3/mysql_stmt_execute.3.gz
+share/man/man3/mysql_stmt_fetch.3.gz
+share/man/man3/mysql_stmt_fetch_column.3.gz
+share/man/man3/mysql_stmt_field_count.3.gz
+share/man/man3/mysql_stmt_free_result.3.gz
+share/man/man3/mysql_stmt_init.3.gz
+share/man/man3/mysql_stmt_insert_id.3.gz
+share/man/man3/mysql_stmt_more_results.3.gz
+share/man/man3/mysql_stmt_next_result.3.gz
+share/man/man3/mysql_stmt_num_rows.3.gz
+share/man/man3/mysql_stmt_param_count.3.gz
+share/man/man3/mysql_stmt_param_metadata.3.gz
+share/man/man3/mysql_stmt_prepare.3.gz
+share/man/man3/mysql_stmt_reset.3.gz
+share/man/man3/mysql_stmt_result_metadata.3.gz
+share/man/man3/mysql_stmt_row_seek.3.gz
+share/man/man3/mysql_stmt_row_tell.3.gz
+share/man/man3/mysql_stmt_send_long_data.3.gz
+share/man/man3/mysql_stmt_sqlstate.3.gz
+share/man/man3/mysql_stmt_store_result.3.gz
+share/man/man3/mysql_stmt_warning_count.3.gz
+share/man/man3/mysql_store_result.3.gz
+share/man/man3/mysql_thread_end.3.gz
+share/man/man3/mysql_thread_id.3.gz
+share/man/man3/mysql_thread_init.3.gz
+share/man/man3/mysql_use_result.3.gz
+share/man/man3/mysql_warning_count.3.gz
diff --git a/databases/mariadb106-server/Makefile b/databases/mariadb106-server/Makefile
new file mode 100644
index 000000000000..a86624b801dd
--- /dev/null
+++ b/databases/mariadb106-server/Makefile
@@ -0,0 +1,294 @@
+PORTNAME?=	mariadb
+PORTVERSION=	10.6.17
+PORTREVISION?=	0
+CATEGORIES=	databases
+MASTER_SITES=	https://mirror.nodesdirect.com/${SITESDIR}/ \
+		https://mirror.one.com/${SITESDIR}/ \
+		https://ftp.nluug.nl/db/${SITESDIR}/ \
+		https://ftp.icm.edu.pl/pub/unix/database/${SITESDIR}/ \
+		https://mirror.truenetwork.ru/${SITESDIR}/ \
+		https://mirrors.aliyun.com/${SITESDIR}/ \
+		https://ftp.ubuntu-tw.org/mirror/${SITESDIR}/ \
+		https://mirror.kku.ac.th/${SITESDIR}/ \
+		https://espejito.fder.edu.uy/${SITESDIR}/ \
+		https://ftp.osuosl.org/pub/${SITESDIR}/ \
+		https://downloads.mariadb.org/rest-api/mariadb/${PORTVERSION}/
+PKGNAMESUFFIX?=	106-server
+
+MAINTAINER=	brnrd@FreeBSD.org
+COMMENT?=	Multithreaded SQL database (server)
+WWW=		https://mariadb.org/
+
+LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/COPYING
+
+#EXPIRATION_DATE=	2026-07-01
+
+LIB_DEPENDS+=	libpcre2-8.so:devel/pcre2 \
+		libzstd.so:archivers/zstd
+
+# Ugly workaround for MariaDB/CMake library detection
+LDFLAGS+=	-L${LOCALBASE}/lib
+
+USES=		bison:build cmake:insource compiler:c++11-lib cpe iconv:translit libedit ncurses shebangfix ssl
+
+SUB_FILES=	pkg-message
+PKGMESSAGE=	${WRKDIR}/pkg-message
+
+USE_LDCONFIG=	${PREFIX}/lib/mysql
+SHEBANG_FILES=	scripts/*.sh
+SITESDIR=	mariadb/mariadb-${PORTVERSION}/source
+DOCSDIR=	${PREFIX}/share/doc/mysql
+
+MARIADB_USER?=		mysql
+MARIADB_GROUP?=		mysql
+MARIADB_DBDIR?=		/var/db/mysql
+MARIADB_RUNDIR?=	/var/run/mysql
+MARIADB_SOCK?=		mysql.sock
+MARIADB_LOGDIR?=	/var/log/mysql
+
+USERS=			${MARIADB_USER}
+GROUPS=			${MARIADB_GROUP}
+
+OPTIONS_SINGLE=		GSSAPI
+OPTIONS_SINGLE_GSSAPI=	GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT GSSAPI_NONE
+OPTIONS_DEFAULT=	GSSAPI_BASE
+
+.if ${PKGNAMESUFFIX:M*-server}
+# MySQL-Server options
+OPTIONS_DEFAULT+=	CONNECT_EXTRA INNOBASE SPHINX SPIDER WSREP
+OPTIONS_GROUP=		COMPRESSION ENGINES GROONGA
+OPTIONS_DEFINE=		CONNECT_EXTRA DOCS
+OPTIONS_DEFINE_amd64=	WSREP
+OPTIONS_DEFINE_aarch64=	WSREP
+OPTIONS_DEFINE_powerpc64le=	WSREP
+OPTIONS_DEFINE_powerpc64=	WSREP
+OPTIONS_DEFINE_riscv64=	WSREP
+OPTIONS_GROUP_COMPRESSION=	LZ4 LZO SNAPPY
+OPTIONS_GROUP_ENGINES=	COLUMNSTORE INNOBASE MROONGA OQGRAPH ROCKSDB S3 SPHINX SPIDER
+OPTIONS_GROUP_GROONGA=	ZMQ MSGPACK
+OPTIONS_EXCLUDE_i386=	ROCKSDB
+
+COLUMNSTORE_DESC=	Columnar storage egine (BETA)
+CONNECT_EXTRA_DESC=	Enable ODBC and XML in CONNECT engine
+COMPRESSION_DESC=	Optional page compression
+ENGINES_DESC=	Optional MariaDB storage engines
+GROONGA_DESC=	Optional Mroonga features
+INNOBASE_DESC=	InnoDB default engine
+MROONGA_DESC=	Mroonga Full Text Search engine
+MSGPACK_DESC=	MsgPack support
+OQGRAPH_DESC=	Open Query Graph Computation engine
+ROCKSDB_DESC=	RocksDB LSM engine
+S3_DESC=	S3 storage engine (Alpha)
+SPHINX_DESC=	SphinxSE engine
+SPIDER_DESC=	Partitioning and XA-transactions engine
+WSREP_DESC=	Build wsrep clustering
+ZMQ_DESC=	ZeroMQ support
+.endif
+
+CMAKE_ARGS+=	-DCMAKE_PREFIX_PATH=${PREFIX} \
+		-DINSTALL_DOCDIR="share/doc/mysql" \
+		-DINSTALL_DOCREADMEDIR="share/doc/mysql" \
+		-DINSTALL_INFODIR="info" \
+		-DINSTALL_LIBDIR="lib/mysql" \
+		-DINSTALL_MANDIR="share/man" \
+		-DINSTALL_MYSQLDATADIR="${MARIADB_DBDIR}" \
+		-DINSTALL_MYSQLSHAREDIR="share/mysql" \
+		-DINSTALL_MYSQLTESTDIR= \
+		-DINSTALL_PLUGINDIR="lib/mysql/plugin" \
+		-DINSTALL_SBINDIR="libexec" \
+		-DINSTALL_SCRIPTDIR="bin" \
+		-DINSTALL_SQLBENCHDIR= \
+		-DINSTALL_SUPPORTFILESDIR="share/mysql" \
+		-DINSTALL_SYSCONFDIR="${ETCDIR}" \
+		-DINSTALL_SYSCONF2DIR="${ETCDIR}/conf.d" \
+		-DINSTALL_UNIX_ADDRDIR="${MARIADB_RUNDIR}/${MARIADB_SOCK}" \
+		-DWITH_PCRE=system \
+		-DPCRE_LIBRARY_DIRS=${PREFIX}/lib \
+		-DWITH_SSL="${OPENSSLBASE}" \
+		-DCURSES_CURSES_LIBRARY="/usr/lib/libcurses.so" \
+		-DCURSES_FORM_LIBRARY="/usr/lib/libform.so" \
+		-DCURSES_CURSES_LIBRARY="/usr/lib/libncurses.so" \
+		-DKRB5_CONFIG="${KRB5CONFIG}" \
+		-DCURSES_NCURSES_LIBRARY="${NCURSESLIB}/libncurses.so" \
+		-DCOMPILATION_COMMENT="FreeBSD Ports" \
+		-DPLUGIN_AUTH_TEST_PLUGIN=NO
+CMAKE_OFF+=	CONC_WITH_UNIT_TESTS CONNECT_WITH_MONGO WITH_UNIT_TESTS
+CMAKE_ON+=	WITH_LIBWRAP WITHOUT_DOCS
+DISABLED_PLUGINS+=	AUTH_TEST_PLUGIN DAEMON_EXAMPLE DIALOG_EXAMPLES \
+		EXAMPLE EXAMPLE_KEY_MANAGEMENT FTEXAMPLE
+
+DATADIR=	${PREFIX}/share/mysql
+ETCDIR=		${PREFIX}/etc/mysql
+
+CONFLICTS_INSTALL=	mariadb10[0-57-9]-${PKGNAMESUFFIX:C/^[0-9]*-//}-* \
+			mariadb1011-${PKGNAMESUFFIX:C/^[0-9]*-//}-* \
+			mysql[0-9]*-${PKGNAMESUFFIX:C/^[0-9]*-//}-* \
+			mysqlwsrep* \
+			percona[0-9]*-${PKGNAMESUFFIX:C/^[0-9]*-//}-*
+
+FASTMTX_CMAKE_BOOL=	WITH_FAST_MUTEXES
+GSSAPI_BASE_USES=	gssapi
+GSSAPI_HEIMDAL_USES=	gssapi:heimdal
+GSSAPI_MIT_USES=	gssapi:mit
+GSSAPI_NONE_CMAKE_ON=	-DPLUGIN_AUTH_GSSAPI_CLIENT=OFF
+OPTIONS_SUB=		yes
+SUB_LIST+=	MARIADB_RUNDIR="${MARIADB_RUNDIR}" \
+		MARIADB_SOCK="${MARIADB_SOCK}"
+
+.if ${PKGNAMESUFFIX:M*-client}
+# MySQL-Client part
+CMAKE_ON+=	CONC_WITH_MYSQLCOMPAT WITHOUT_SERVER
+CMAKE_OFF+=	WITH_WSREP
+USES+=		readline
+USE_LDCONFIG=	${PREFIX}/lib/mysql
+SUB_FILES+=	my.cnf.sample client.cnf.sample
+
+.else # ! ${PKGNAMESUFFIX:M*-client}
+# MySQL-Server part
+USES+=		mysql:106m
+
+USE_LDCONFIG+=	${PREFIX}/lib/mysql/plugin
+USE_RC_SUBR=	mysql-server
+
+CMAKE_ON+=	CMAKE_SKIP_BUILD_RPATH WITH_EMBEDDED_SERVER
+CMAKE_OFF+=	WITH_CLIENT
+SUB_FILES+=	server.cnf.sample
+SUB_LIST+=	MARIADB_DBDIR="${MARIADB_DBDIR}" \
+		MARIADB_LOGDIR="${MARIADB_LOGDIR}" \
+		MARIADB_USER="${MARIADB_USER}"
+PLIST_SUB+=	MARIADB_LOGDIR="${MARIADB_LOGDIR}" \
+		MARIADB_USER="${MARIADB_USER}" \
+		MARIADB_GROUP="${MARIADB_GROUP}"
+
+.for ENGINE in ${OPTIONS_GROUP_ENGINES:NINNOBASE}
+${ENGINE}_CMAKE_OFF=	-DPLUGIN_${ENGINE}=NO
+${ENGINE}_CMAKE_ON=	-DPLUGIN_${ENGINE}=DYNAMIC
+.endfor
+INNOBASE_VARS_OFF=	disabled_plugins+=INNOBASE
+COLUMNSTORE_BROKEN=	error: __float128 is not supported on this target
+CONNECT_EXTRA_LIB_DEPENDS=	libodbc.so:databases/unixODBC
+CONNECT_EXTRA_USE=		gnome=libxml2
+CONNECT_EXTRA_USES=		gnome
+CONNECT_EXTRA_CMAKE_BOOL=	CONNECT_WITH_LIBXML2 CONNECT_WITH_ODBC
+GSSAPI_NONE_VARS=	disabled_plugins+=AUTH_GSSAPI
+LZ4_CMAKE_ON=		-DGRN_WITH_LZ4=ON  -DWITH_INNODB_LZ4=ON  -DWITH_ROCKSDB_LZ4=ON
+LZ4_CMAKE_OFF=		-DGRN_WITH_LZ4=OFF -DWITH_INNODB_LZ4=OFF -DWITH_ROCKSDB_LZ4=OFF
+LZ4_LIB_DEPENDS=	liblz4.so:archivers/liblz4
+LZO_CMAKE_ON=		-DWITH_INNODB_LZO=ON
+LZO_CMAKE_OFF=		-DWITH_INNODB_LZO=OFF
+LZO_LIB_DEPENDS=	liblzo2.so:archivers/lzo2
+MROONGA_IMPLIES=	LZ4
+MSGPACK_LIB_DEPENDS=	libmsgpackc.so:devel/msgpack-c
+OQGRAPH_LIB_DEPENDS=	libboost_system.so:devel/boost-libs \
+			libJudy.so:devel/judy
+ROCKSDB_USES=		python
+ROCKSDB_CMAKE_ON=	-DPYTHON_SHEBANG=${PYTHON_CMD} -DWITH_ROCKSDB_zstd=ON
+SNAPPY_CMAKE_ON=	-DWITH_INNODB_SNAPPY=ON  -DWITH_ROCKSDB_snappy=ON
+SNAPPY_CMAKE_OFF=	-DWITH_INNODB_SNAPPY=OFF -DWITH_ROCKSDB_snappy=OFF
+SNAPPY_LIB_DEPENDS=	libsnappy.so:archivers/snappy
+WSREP_CMAKE_BOOL=	WITH_WSREP
+WSREP_LIB_DEPENDS=	libgalera.so:databases/galera26
+WSREP_RUN_DEPENDS=	bash:shells/bash \
+			rsync:net/rsync \
+			#stunnel:security/stunnel
+WSREP_SHEBANG_FILES=	bin/wsrep_sst_rsync
+ZMQ_LIB_DEPENDS=	libzmq.so:net/libzmq4
+ZSTD_LIB_DEPENDS=	libzstd.so:archivers/zstd
+
+.for PLUGIN in ${DISABLED_PLUGINS}
+CMAKE_ARGS+=		-DPLUGIN_${PLUGIN}=NO
+.endfor
+
+.endif # ${PKGNAMESUFFIX:M*-client}
+
+.include <bsd.port.options.mk>
+
+.if ${OPSYS} == FreeBSD
+SUB_LIST+=	LEGACY_LIMITS="@comment " MODERN_LIMITS=""
+.else
+SUB_LIST+=	LEGACY_LIMITS="" MODERN_LIMITS="@comment "
+.endif
+
+.if ${SSL_DEFAULT} != base && ${PORT_OPTIONS:MGSSAPI_BASE}
+GSSAPI_BASE_IGNORE=	GSSAPI_BASE is not compatible with OpenSSL from ports. Use other GSSAPI options or OpenSSL from base system
+.endif
+
+.if ${SSL_DEFAULT:Mlibressl*}
+CFLAGS+=        -Wno-incompatible-function-pointer-types
+.endif
+
+.if ${ARCH} != amd64 && ${ARCH} != aarch64
+PLIST_SUB+=	WSREP="@comment "
+.endif
+
+post-patch:
+.if ${OPSYS} == DragonFly
+	${CP} ${WRKSRC}/cmake/os/FreeBSD.cmake \
+		${WRKSRC}/cmake/os/DragonFly.cmake
+.endif
+
+pre-configure:
+	${REINPLACE_CMD} 's|\(CHECK_LIBRARY_EXISTS.*\) "" HAVE_|\1 ${LOCALBASE}/lib HAVE_|' \
+		${WRKSRC}/cmake/pcre.cmake \
+		${WRKSRC}/storage/innobase/*.cmake
+
+post-configure:
+	${REINPLACE_CMD} -Ee 's|(#define INCLUDE.*)"$$|\1 -I${PREFIX}/include"|' \
+		-e 's|(#define LIBS .*)"$$|\1 -L${PREFIX}/lib"|' \
+		${WRKSRC}/libmariadb/mariadb_config/mariadb_config.c
+	${REINPLACE_CMD} 's|%%LOCALBASE%%|${PREFIX}|' \
+		${WRKSRC}/scripts/mysql_config.sh
+
+pre-install:
+	${MKDIR} ${STAGEDIR}${ETCDIR}/conf.d
+
+.if ${PKGNAMESUFFIX:M*-client}
+post-install:
+	${INSTALL_DATA} ${WRKDIR}/my.cnf.sample ${STAGEDIR}${ETCDIR}/my.cnf.sample
+	${INSTALL_DATA} ${WRKDIR}/client.cnf.sample \
+		${STAGEDIR}${ETCDIR}/conf.d/client.cnf.sample
+	${RM} -r ${STAGEDIR}${DATADIR} \
+		${STAGEDIR}${PREFIX}/include/mysql/server \
+		${STAGEDIR}${ETCDIR}/init.d \
+		${STAGEDIR}${PREFIX}/lib/mysql/pkgconfig
+
+post-install-GSSAPI_NONE-off:
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/mysql/plugin/auth_gssapi_client.so
+
+.else # ! ${PKGNAMESUFFIX:M*-client}
+post-install:
+	${INSTALL_DATA} ${WRKDIR}/server.cnf.sample \
+		${STAGEDIR}${ETCDIR}/conf.d/server.cnf.sample
+	${MV} ${STAGEDIR}${PREFIX}/share/user_map.conf \
+		${STAGEDIR}${PREFIX}/etc/mysql/user_map.conf.sample
+	${MV} ${STAGEDIR}${PREFIX}/share/pam_user_map.so \
+		${STAGEDIR}${PREFIX}/lib/mysql/
+	${RM} -r ${STAGEDIR}${PREFIX}/share/mysql/policy \
+		${STAGEDIR}${PREFIX}/include/mysql/server/private \
+		${STAGEDIR}${PREFIX}/lib/mysql/pkgconfig \
+		${STAGEDIR}${PREFIX}/libexec/rcmysql \
+		${STAGEDIR}/suite \
+		${STAGEDIR}${ETCDIR}/init.d \
+		${STAGEDIR}${ETCDIR}/logrotate.d \
+		${STAGEDIR}${DOCSDIR}/COPYING
+	${MKDIR} ${STAGEDIR}${MARIADB_LOGDIR}
+	${SED} '/%%/d;/^@comment /d;s/^/@comment /' ${PORTSDIR}/${CATEGORIES:[1]}/${PORTNAME}${PKGNAMESUFFIX:S/-server/-client/}/pkg-plist \
+		>> ${TMPPLIST}
+
+post-install-MROONGA-on:
+	${MV} ${STAGEDIR}${PREFIX}/share/groonga ${STAGEDIR}${DOCSDIR}
+	${RM}	${STAGEDIR}${DOCSDIR}/groonga/COPYING \
+		${STAGEDIR}${DATADIR}/mroonga/COPYING
+
+post-install-SPIDER-on:
+	${MV} ${STAGEDIR}${ETCDIR}/conf.d/spider.cnf \
+		${STAGEDIR}${ETCDIR}/conf.d/spider.cnf.sample
+
+post-install-WSREP-on:
+	${MV} ${STAGEDIR}${DATADIR}/wsrep.cnf \
+		${STAGEDIR}${ETCDIR}/conf.d/wsrep.cnf.sample
+
+.endif # ${PKGNAMESUFFIX:M*-client}
+
+.include <bsd.port.mk>
diff --git a/databases/mariadb106-server/distinfo b/databases/mariadb106-server/distinfo
new file mode 100644
index 000000000000..861a22bde861
--- /dev/null
+++ b/databases/mariadb106-server/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1710088429
+SHA256 (mariadb-10.6.17.tar.gz) = fb41b0702059c046832d60138733acb73e4c0e5a1a0681061709d25591e4b086
+SIZE (mariadb-10.6.17.tar.gz) = 99067793
diff --git a/databases/mariadb106-server/files/client.cnf.sample.in b/databases/mariadb106-server/files/client.cnf.sample.in
new file mode 100644
index 000000000000..2513f6a04fb2
--- /dev/null
+++ b/databases/mariadb106-server/files/client.cnf.sample.in
@@ -0,0 +1,52 @@
+# Options specific to client applications, see
+# https://mariadb.com/kb/en/configuring-mariadb-with-option-files/#client-option-groups
+
+# Options specific to all client programs
+[client]
+# port			= 3306 # inherited from %%ETCDIR%%/my.cnf
+# socket		= %%MARIADB_RUNDIR%%/%%MARIADB_SOCK%% # inherited from %%ETCDIR%%/my.cnf
+
+# Options specific to MariaDB client programs
+[client-mariadb]
+
+#
+## Options for specific client Tools
+#
+
+# Options read by `mysql`
+# Renamed from [mysql] starting with MariaDB 10.4.6.
+[mariadb-client]	Options read by mysql. Available starting with MariaDB 10.4.6.
+prompt			= \u@\h [\d]>\_
+no_auto_rehash
+
+# Options read by `mysqldump`
+# Renamed from [mysqldump] starting with MariaDB 10.4.6.
+[mariadb-dump]
+max_allowed_packet	= 256M
+quote_names
+quick
+
+# Options read by `mysqladmin`
+# Renamed from [mysqladmin] starting with MariaDB 10.4.6.
+[mariadb-admin]
+
+# Options read by `mysqlbinlog` 
+# Renamed from [mysqlbinlog] starting with MariaDB 10.4.6.
+[mariadb-binlog]
+
+# Options read by `mysqlcheck`
+# Renamed from [mysqlcheck] starting with MariaDB 10.4.6.
+[mariadb-check]
+
+# Options read by `mysqlimport`
+# Renamed from [mysqlimport] starting with MariaDB 10.4.6.
+[mariadb-import]
+
+# Options read by `mysqlshow`
+# Renamed from [mysqlshow] starting with MariaDB 10.4.6.
+[mariadb-show]
+
+# Options read by `mysqlslap`
+# Renamed from [mysqlslap]  starting with MariaDB 10.4.6.
+[mariadb-slap]
+
diff --git a/databases/mariadb106-server/files/my.cnf.sample.in b/databases/mariadb106-server/files/my.cnf.sample.in
new file mode 100644
index 000000000000..15dbc7e64da8
--- /dev/null
+++ b/databases/mariadb106-server/files/my.cnf.sample.in
@@ -0,0 +1,13 @@
+#
+# This group is read both by the client and the server
+# use it for options that affect everything, see
+# https://mariadb.com/kb/en/configuring-mariadb-with-option-files/#option-groups
+#
+[client-server]
+port	= 3306
+socket	= %%MARIADB_RUNDIR%%/%%MARIADB_SOCK%%
+
+#
+# include *.cnf from the config directory
+#
+!includedir %%ETCDIR%%/conf.d/
diff --git a/databases/mariadb106-server/files/mysql-server.in b/databases/mariadb106-server/files/mysql-server.in
new file mode 100644
index 000000000000..e494dee09e92
--- /dev/null
+++ b/databases/mariadb106-server/files/mysql-server.in
@@ -0,0 +1,149 @@
+#!/bin/sh
+
+# PROVIDE: mysql
+# REQUIRE: LOGIN
+# KEYWORD: shutdown
+#
+# Add the following line to /etc/rc.conf to enable mysql:
+# mysql_(instance_)?enable (bool):	Set to "NO" by default.
+#			Set it to "YES" to enable MySQL.
+%%LEGACY_LIMITS%%# mysql_(instance_)?limits (bool):	Set to "NO" by default.
+%%LEGACY_LIMITS%%#			Set it to yes to run `limits -e -U mysql`
+%%LEGACY_LIMITS%%#			just before mysql starts.
+# mysql_(instance_)?dbdir (str):	Default to "%%MARIADB_DBDIR%%"
+#			Base database directory.
+# mysql_(instance_)?args (str):	Custom additional arguments to be passed
+#			to mysqld_safe (default empty).
+# mysql_(instance_)?pidfile (str): Custom PID file path and name.
+#			Default to "${mysql_dbdir}/${hostname}.pid".
+# mysql_(instance_)?user (str): User to run mysqld as
+#			Default to "%%MARIADB_USER%%" created by the port
+# mysql_(instance_)?optfile (str): Server-specific option file.
+#			Default to "${mysql_dbdir}/my.cnf".
+# mysql_(instance)?rundir (str):	Default to "%%MARIADB_RUNDIR%%"
+# mysql_instances (str): Set to "" by default. 
+#			If defined, list of instances to enable
+
+. /etc/rc.subr
+
+name="mysql"
+rcvar=mysql_enable
+
+load_rc_config $name
+
+: ${mysql_enable="NO"}
+%%LEGACY_LIMITS%%: ${mysql_limits="NO"}
+: ${mysql_user="%%MARIADB_USER%%"}
+%%LEGACY_LIMITS%%mysql_limits_args="-e -U ${mysql_user}"
+: ${mysql_dbdir="%%MARIADB_DBDIR%%"}
+: ${mysql_optfile="%%ETCDIR%%/my.cnf"}
+: ${mysql_rundir="%%MARIADB_RUNDIR%%"}
+
+command="/usr/sbin/daemon"
+procname="%%PREFIX%%/libexec/mariadbd"
+start_precmd="${name}_prestart"
+start_postcmd="${name}_poststart"
+
+if [ -n "$2" ]; then
+	instance="$2"
+	load_rc_config ${name}_${instance}
+	case "$mysql_instances" in
+	"$2 "*|*" $2 "*|*" $2"|"$2")
+		eval mysql_args="\${mysql_${instance}_args:-\"${mysql_args}\"}"
+		eval mysql_dbdir="\${mysql_${instance}_dbdir:-\"%%MARIADB_DBDIR%%_${instance}\"}"
+		%%LEGACY_LIMITS%%eval mysql_limits="\${mysql_${instance}_limits:-\"${mysql_limits}\"}"
+		eval mysql_user="\${mysql_${instance}_user:-\"${mysql_user}\"}"
+		%%LEGACY_LIMITS%%eval mysql_limits_args="\${mysql_${instance}_limits_args:-\"-e -U $mysql_user\"}"
+		eval mysql_socket="\${mysql_${instance}_socket:-\"%%MARIADB_RUNDIR%%_${instance}/%%MARIADB_SOCK%%\"}"
+		eval mysql_optfile="\${mysql_${instance}_optfile:-\"%%ETCDIR%%_${instance}/my.cnf\"}"
+		eval mysql_pidfile="\${mysql_${instance}_pidfile:-\"%%MARIADB_RUNDIR%%_${instance}/mysqld.pid\"}"
+	;;
+	*)
+		err 1 "$2 not found in mysql_instances" ;;
+	esac
+else
+	if [ -n "${mysql_instances}" -a -n "$1" ]; then
+		for instance in ${mysql_instances}; do
+			eval _enable="\${mysql_${instance}_enable}"
+			case "${_enable:-${mysql_enable}}" in
+			[Nn][Oo]|[Ff][Aa][Ll][Ss][Ee]|[Oo][Ff][Ff]|0)
+				continue
+			;;
+			[Yy][Ee][Ss]|[Tt][Rr][Uu][Ee]|[Oo][Nn]|1)
+			;;
+			*)
+				if [ -z "$_enable" ]; then
+					_var=mysql_enable
+				else
+					_var=mysql_${instance}_enable
+				fi
+				warn "Bad value" \
+					"'${_enable:-${mysql_enable}}'" \
+					"for ${_var}. " \
+					"Instance ${instance} skipped."
+				continue
+			;;
+			esac
+			echo "===> mysql instance: ${instance}"
+			if %%PREFIX%%/etc/rc.d/mysql-server $1 ${instance}; then
+				success="${instance} ${success}"
+			else
+				failed="${instance} (${retcode}) ${failed}"
+			fi
+		done
+		exit 0
+	else
+		mysql_pidfile=${mysql_pidfile:-"%%MARIADB_RUNDIR%%/mysqld.pid"}
+	fi
+fi
+
+pidfile=$mysql_pidfile
+mysql_install_db="%%PREFIX%%/bin/mariadb-install-db"
+mysql_install_db_args="--basedir=%%PREFIX%% --datadir=${mysql_dbdir} --force"
+command_args="-c -f %%PREFIX%%/bin/mariadbd-safe --defaults-extra-file=${mysql_optfile} --user=${mysql_user} --datadir=${mysql_dbdir} --pid-file=${pidfile} ${mysql_socket:+--socket=${mysql_socket}} ${mysql_args}"
+
+mysql_create_auth_tables()
+{
+	eval $mysql_install_db $mysql_install_db_args
+        [ $? -eq 0 ] && chown -R ${mysql_user}:$(id -gn $mysql_user) ${mysql_dbdir}
+}
+
+mysql_prestart()
+{
+	local dir
+	for dir in /etc /usr/local/etc /etc/mysql /var/db/mysql; do
+		if [ -f "${dir}/my.cnf" ]; then
+			echo "Please merge existing ${dir}/my.cnf file with %%ETCDIR%%/conf.d/server.cnf"
+			return 1
+		fi
+	done
+	if [ ! -d "${mysql_dbdir}/mysql/." ]; then
+		mysql_create_auth_tables || return 1
+	fi
+	mysql_group="`/usr/bin/id -gn ${mysql_user}`"
+	[ "${mysql_socket}" = "" ] && mysql_rundir="%%MARIADB_RUNDIR%%" || mysql_rundir="`/usr/bin/dirname ${mysql_socket}`"
+	if [ ! -d "${mysql_rundir}" ]; then
+		install -d -o ${mysql_user} -g ${mysql_group} "${mysql_rundir}"
+	fi
+%%LEGACY_LIMITS%%	if checkyesno mysql_limits; then
+%%LEGACY_LIMITS%%		eval `/usr/bin/limits ${mysql_limits_args}` 2>/dev/null
+%%LEGACY_LIMITS%%	else
+%%LEGACY_LIMITS%%		return 0
+%%LEGACY_LIMITS%%	fi
+%%MODERN_LIMITS%%	return 0
+	if [ ! -d "${mysql_rundir}" ]; then
+		install -d -u${mysql_user} -g$(id -gn $mysql_user) -m755 ${mysql_rundir}
+	fi
+}
+
+mysql_poststart()
+{
+	local timeout=15
+	while [ ! -f "${pidfile}" -a ${timeout} -gt 0 ]; do
+		timeout=$(( timeout - 1 ))
+		sleep 1
+	done
+	return 0
+}
+
+run_rc_command "$1"
diff --git a/databases/mariadb106-server/files/patch-include_my__cpu.h b/databases/mariadb106-server/files/patch-include_my__cpu.h
new file mode 100644
index 000000000000..e205cbfa05e2
--- /dev/null
+++ b/databases/mariadb106-server/files/patch-include_my__cpu.h
@@ -0,0 +1,48 @@
+--- include/my_cpu.h.orig	2021-09-27 13:32:48 UTC
++++ include/my_cpu.h
+@@ -23,7 +23,8 @@
+   The defines are the same ones used by the linux kernel
+ */
+ 
+-#ifdef _ARCH_PWR8
++#if defined(_ARCH_PWR8)
++#if defined(linux)
+ #include <sys/platform/ppc.h>
+ /* Very low priority */
+ #define HMT_very_low() __ppc_set_ppr_very_low()
+@@ -37,6 +38,22 @@
+ #define HMT_medium_high() __ppc_set_ppr_med_high()
+ /* High priority */
+ #define HMT_high() asm volatile("or 3,3,3")
++#elif defined(__FreeBSD__)
++#include <sys/types.h>
++#include <sys/sysctl.h>
++/* Very low priority */
++#define HMT_very_low() __asm__ volatile ("or 31,31,31")
++/* Low priority */
++#define HMT_low() __asm__ volatile ("or 1,1,1")
++/* Medium low priority */
++#define HMT_medium_low() __asm__ volatile ("or 6,6,6")
++/* Medium priority */
++#define HMT_medium() __asm__ volatile ("or 2,2,2")
++/* Medium high priority */
++#define HMT_medium_high() __asm__ volatile ("or 5,5,5")
++/* High priority */
++#define HMT_high() asm volatile("or 3,3,3")
++#endif
+ #else
+ #define HMT_very_low()
+ #define HMT_low()
+@@ -81,7 +98,12 @@ static inline void MY_RELAX_CPU(void)
+   __asm__ __volatile__ ("pause");
+ #endif
+ #elif defined(_ARCH_PWR8)
++#if defined(linux)
+   __ppc_get_timebase();
++#elif defined(__FreeBSD__)
++  uint64_t __tb;
++  __asm__ volatile ("mfspr %0, 268" : "=r" (__tb));
++#endif
+ #elif defined __GNUC__ && (defined __arm__ || defined __aarch64__)
+   /* Mainly, prevent the compiler from optimizing away delay loops */
+ #ifdef _aarch64_
diff --git a/databases/mariadb106-server/files/patch-mysys__ssl_openssl.c b/databases/mariadb106-server/files/patch-mysys__ssl_openssl.c
new file mode 100644
index 000000000000..0ef6a3c29540
--- /dev/null
+++ b/databases/mariadb106-server/files/patch-mysys__ssl_openssl.c
@@ -0,0 +1,14 @@
+--- mysys_ssl/openssl.c.orig	2024-02-01 17:44:37 UTC
++++ mysys_ssl/openssl.c
+@@ -30,6 +30,11 @@ int check_openssl_compatibility()
+ {
+   return 0;
+ }
++#elif defined(LIBRESSL_VERSION_NUMBER)
++int check_openssl_compatibility()
++{
++  return 1;
++}
+ #else
+ #include <openssl/evp.h>
+ 
diff --git a/databases/mariadb106-server/files/patch-mysys_crc32_crc32c.cc b/databases/mariadb106-server/files/patch-mysys_crc32_crc32c.cc
new file mode 100644
index 000000000000..445fd0e97865
--- /dev/null
+++ b/databases/mariadb106-server/files/patch-mysys_crc32_crc32c.cc
@@ -0,0 +1,24 @@
+--- mysys/crc32/crc32c.cc.orig	2021-08-04 18:00:35 UTC
++++ mysys/crc32/crc32c.cc
+@@ -543,6 +543,21 @@ static int arch_ppc_probe(void) {
+ 
+   return arch_ppc_crc32;
+ }
++#elif __FreeBSD__
++#include <machine/cpu.h>
++#include <sys/auxv.h>
++#include <sys/elf_common.h>
++static int arch_ppc_probe(void) {
++  unsigned long cpufeatures;
++  arch_ppc_crc32 = 0;
++
++#if defined(__powerpc64__)
++  elf_aux_info(AT_HWCAP2, &cpufeatures, sizeof(cpufeatures));
++  if (cpufeatures & PPC_FEATURE2_HAS_VEC_CRYPTO) arch_ppc_crc32 = 1;
++#endif  /* __powerpc64__ */
++
++  return arch_ppc_crc32;
++}
+ #endif  // __linux__
+ #endif
+ 
diff --git a/databases/mariadb106-server/files/patch-scripts_mysql__config.sh b/databases/mariadb106-server/files/patch-scripts_mysql__config.sh
new file mode 100644
index 000000000000..f8321be63ecc
--- /dev/null
+++ b/databases/mariadb106-server/files/patch-scripts_mysql__config.sh
@@ -0,0 +1,10 @@
+--- scripts/mysql_config.sh.orig	2021-07-07 20:25:20 UTC
++++ scripts/mysql_config.sh
+@@ -88,6 +88,7 @@ fi
+ # Create options 
+ libs="-L$pkglibdir @RPATH_OPTION@ @LIBS_FOR_CLIENTS@"
+ embedded_libs="-L$pkglibdir @RPATH_OPTION@ @EMB_LIBS_FOR_CLIENTS@"
++embedded_libs="$embedded_libs -%%LOCALBASE%%/lib "
+ 
+ include="-I$pkgincludedir"
+ if [ "$basedir" != "/usr" ]; then
diff --git a/databases/mariadb106-server/files/patch-sql_mysqld.cc b/databases/mariadb106-server/files/patch-sql_mysqld.cc
new file mode 100644
index 000000000000..e433bfc7d450
--- /dev/null
+++ b/databases/mariadb106-server/files/patch-sql_mysqld.cc
@@ -0,0 +1,20 @@
+--- sql/mysqld.cc.orig	2021-06-15 10:16:51 UTC
++++ sql/mysqld.cc
+@@ -205,7 +205,7 @@ typedef fp_except fp_except_t;
+ 
+ inline void setup_fpu()
+ {
+-#if defined(__FreeBSD__) && defined(HAVE_IEEEFP_H) && !defined(HAVE_FEDISABLEEXCEPT)
++#if defined(__FreeBSD__) && defined(HAVE_IEEEFP_H) && !defined(HAVE_FEDISABLEEXCEPT) && defined(FP_X_INV)
+   /* We can't handle floating point exceptions with threads, so disable
+      this on freebsd
+      Don't fall for overflow, underflow,divide-by-zero or loss of precision.
+@@ -218,7 +218,7 @@ inline void setup_fpu()
+   fpsetmask(~(FP_X_INV |             FP_X_OFL | FP_X_UFL | FP_X_DZ |
+               FP_X_IMP));
+ #endif /* FP_X_DNML */
+-#endif /* __FreeBSD__ && HAVE_IEEEFP_H && !HAVE_FEDISABLEEXCEPT */
++#endif /* __FreeBSD__ && HAVE_IEEEFP_H && !HAVE_FEDISABLEEXCEPT && FP_X_INV */
+ 
+ #ifdef HAVE_FEDISABLEEXCEPT
+   fedisableexcept(FE_ALL_EXCEPT);
diff --git a/databases/mariadb106-server/files/patch-storage_columnstore_columnstore_utils_common_threadnaming.cpp b/databases/mariadb106-server/files/patch-storage_columnstore_columnstore_utils_common_threadnaming.cpp
new file mode 100644
index 000000000000..26ea3d16ecd7
--- /dev/null
+++ b/databases/mariadb106-server/files/patch-storage_columnstore_columnstore_utils_common_threadnaming.cpp
@@ -0,0 +1,24 @@
+--- storage/columnstore/columnstore/utils/common/threadnaming.cpp.orig	2022-05-18 08:34:17 UTC
++++ storage/columnstore/columnstore/utils/common/threadnaming.cpp
+@@ -22,13 +22,21 @@ namespace utils
+ {
+ void setThreadName(const char* threadName)
+ {
++#ifdef __FreeBSD__
++  pthread_set_name_np(pthread_self(), threadName);
++#else
+   prctl(PR_SET_NAME, threadName, 0, 0, 0);
++#endif
+ }
+ 
+ std::string getThreadName()
+ {
+   char buf[32];
++#ifdef __FreeBSD__
++  pthread_get_name_np(pthread_self(), buf, sizeof(buf));
++#else
+   prctl(PR_GET_NAME, buf, 0, 0, 0);
++#endif
+   return std::string(buf);
+ }
+ }  // namespace utils
diff --git a/databases/mariadb106-server/files/patch-storage_rocksdb_rocksdb_port_jemalloc__helper.h b/databases/mariadb106-server/files/patch-storage_rocksdb_rocksdb_port_jemalloc__helper.h
new file mode 100644
index 000000000000..dab7177b65b8
--- /dev/null
+++ b/databases/mariadb106-server/files/patch-storage_rocksdb_rocksdb_port_jemalloc__helper.h
@@ -0,0 +1,13 @@
+--- storage/rocksdb/rocksdb/port/jemalloc_helper.h.orig	2020-06-23 15:10:17 UTC
++++ storage/rocksdb/rocksdb/port/jemalloc_helper.h
+@@ -26,6 +26,10 @@
+ #include <jemalloc/jemalloc.h>
+ #endif
+ 
++#ifdef __FreeBSD__
++#define JEMALLOC_USABLE_SIZE_CONST const
++#endif
++
+ #ifndef JEMALLOC_CXX_THROW
+ #define JEMALLOC_CXX_THROW
+ #endif
diff --git a/databases/mariadb106-server/files/patch-tpool_CMakeLists.txt b/databases/mariadb106-server/files/patch-tpool_CMakeLists.txt
new file mode 100644
index 000000000000..5ab7d5de3dd2
--- /dev/null
+++ b/databases/mariadb106-server/files/patch-tpool_CMakeLists.txt
@@ -0,0 +1,8 @@
+--- tpool/CMakeLists.txt.orig	2020-06-23 15:10:18 UTC
++++ tpool/CMakeLists.txt
+@@ -1,4 +1,5 @@
+ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR} ${PROJECT_SOURCE_DIR}/include)
++ADD_DEFINITIONS(-fPIC)
+ IF(WIN32)
+   SET(EXTRA_SOURCES tpool_win.cc aio_win.cc)
+ ELSEIF(CMAKE_SYSTEM_NAME STREQUAL "Linux")
diff --git a/databases/mariadb106-server/files/pkg-message.in b/databases/mariadb106-server/files/pkg-message.in
new file mode 100644
index 000000000000..8589380d09d6
--- /dev/null
+++ b/databases/mariadb106-server/files/pkg-message.in
@@ -0,0 +1,28 @@
+[
+{ type: install
+  message: <<EOM
+MariaDB respects hier(7) and doesn't check /etc and /etc/mysql for
+my.cnf. Please move existing my.cnf files from those paths to
+%%PREFIX%%/etc/mysql or %%PREFIX%%/etc. Sample
+configuration files are provided in %%PREFIX%%/etc/mysql
+and %%PREFIX%%/etc/mysql/conf.d.
+The rc(8) script no longer uses /var/db/mysql/my.cnf for configuration
+nor /var/db/mysql for logs and PID-file.
+
+This port does NOT include the mytop perl script, this is included in
+the MariaDB tarball but the most recent version can be found in the
+databases/mytop port
+
+%%WSREP%%Using wsrep clustering requires adding a configuration file.
+%%WSREP%%Copy %%PREFIX%%/etc/mysql/conf.d/wsrep.conf.sample to
+%%WSREP%%%%PREFIX%%/etc/mysql/conf.d/wsrep.conf and change what you need there.
+EOM
+}
+{ type: upgrade
+  message: <<EOM
+Remember to run mariadb-upgrade (with the optional --datadir=<dbdir> flag)
+the first time you start the MySQL server after an upgrade from an
+earlier version.
+EOM
+}
+]
diff --git a/databases/mariadb106-server/files/server.cnf.sample.in b/databases/mariadb106-server/files/server.cnf.sample.in
new file mode 100644
index 000000000000..9e84965c7679
--- /dev/null
+++ b/databases/mariadb106-server/files/server.cnf.sample.in
@@ -0,0 +1,60 @@
+# Options specific to server applications, see
+# https://mariadb.com/kb/en/configuring-mariadb-with-option-files/#server-option-groups
+
+# Options specific to all server programs
+[server]
+
+# Options specific to MariaDB server programs
+[server-mariadb]
+
+#
+# Options for specific server tools
+#
+
+[mysqld]
+user				= %%MARIADB_USER%%
+# port				= 3306 # inherited from %%ETCDIR%%/my.cnf
+# socket			= %%MARIADB_RUNDIR%%/mysql.sock # inherited from %%ETCDIR%%/my.cnf
+bind-address			= 127.0.0.1
+basedir				= %%PREFIX%%
+datadir				= %%MARIADB_DBDIR%%
+net_retry_count			= 16384
+log_error			= %%MARIADB_LOGDIR%%/mysqld.err
+# [mysqld] configuration for ZFS
+# From https://www.percona.com/resources/technical-presentations/zfs-mysql-percona-technical-webinar
+# Create separate datasets for data and logs, eg
+# zroot/mysql      compression=on recordsize=128k atime=off
+# zroot/mysql/data recordsize=16k
+# zroot/mysql/logs
+# datadir 			= %%MARIADB_DBDIR%%/data
+# innodb_log_group_home_dir	= %%MARIADB_DBDIR%%/log
+# audit_log_file		= %%MARIADB_DBDIR%%/log/audit.log
+# general_log_file		= %%MARIADB_DBDIR%%/log/general.log
+# log_bin			= %%MARIADB_DBDIR%%/log/mysql-bin
+# relay_log			= %%MARIADB_DBDIR%%/log/relay-log
+# slow_query_log_file		= %%MARIADB_DBDIR%%/log/slow.log
+# innodb_doublewrite		= 0
+# innodb_flush_method		= O_DSYNC
+
+# Options read by `mariadb_safe`
+# Renamed from [mysqld_safe] starting with MariaDB 10.4.6.
+[mariadb-safe]
+
+# Options read my `mariabackup`
+[mariabackup]
+
+# Options read by `mysql_upgrade`
+# Renamed from [mysql_upgrade] starting with MariaDB 10.4.6.
+[mariadb-upgrade]
+
+# Specific options read by the mariabackup SST method
+[sst]
+
+# Options read by `mysqlbinlog`
+# Renamed from [mysqlbinlog] starting with MariaDB 10.4.6.
+[mariadb-binlog]
+
+# Options read by `mysqladmin`
+# Renamed from [mysqladmin] starting with MariaDB 10.4.6.
+[mariadb-admin]
+
diff --git a/databases/mariadb106-server/pkg-descr b/databases/mariadb106-server/pkg-descr
new file mode 100644
index 000000000000..f76c83728f01
--- /dev/null
+++ b/databases/mariadb106-server/pkg-descr
@@ -0,0 +1,12 @@
+MariaDB is a database server that offers drop-in replacement functionality
+for MySQL. MariaDB is built by some of the original authors of MySQL, with
+assistance from the broader community of Free and open source software
+developers. In addition to the core functionality of MySQL, MariaDB offers
+a rich set of feature enhancements including alternate storage engines,
+server optimizations, and patches.
+
+MariaDB is primarily driven by developers at Monty Program, a company
+founded by Michael "Monty" Widenius, the original author of MySQL, but
+this is not the whole story about MariaDB. On the "About MariaDB" page you
+will find more information about all participants in the MariaDB community,
+including storage engines XtraDB and PBXT.
diff --git a/databases/mariadb106-server/pkg-plist b/databases/mariadb106-server/pkg-plist
new file mode 100644
index 000000000000..505d81bfc44c
--- /dev/null
+++ b/databases/mariadb106-server/pkg-plist
@@ -0,0 +1,520 @@
+bin/aria_chk
+bin/aria_dump_log
+bin/aria_ftdump
+bin/aria_pack
+bin/aria_read_log
+%%S3%%bin/aria_s3_copy
+%%INNOBASE%%bin/innochecksum
+%%INNOBASE%%bin/mariabackup
+bin/mariadb-backup
+bin/mariadb-client-test
+bin/mariadb-client-test-embedded
+bin/mariadb-dumpslow
+bin/mariadb-embedded
+bin/mariadb-fix-extensions
+bin/mariadb-install-db
+%%ROCKSDB%%bin/mariadb-ldb
+bin/mariadb-secure-installation
+bin/mariadb-test-embedded
+bin/mariadb-tzinfo-to-sql
+bin/mariadb-upgrade
+bin/mariadbd-multi
+bin/mariadbd-safe
+bin/mariadbd-safe-helper
+%%INNOBASE%%bin/mbstream
+bin/myisam_ftdump
+bin/myisamchk
+bin/myisamlog
+bin/myisampack
+@comment bin/mytop
+%%ROCKSDB%%bin/myrocks_hotbackup
+bin/mysql_client_test
+bin/mysql_client_test_embedded
+bin/mysql_embedded
+bin/mysql_fix_extensions
+bin/mysql_install_db
+%%ROCKSDB%%bin/mysql_ldb
+bin/mysql_plugin
+bin/mysql_secure_installation
+bin/mysql_tzinfo_to_sql
+bin/mysql_upgrade
+bin/mysql_waitpid
+bin/mysqld_multi
+bin/mysqld_safe
+bin/mysqld_safe_helper
+bin/mysqldumpslow
+bin/mysqltest_embedded
+bin/perror
+bin/resolve_stack_dump
+bin/resolveip
+%%ROCKSDB%%bin/sst_dump
+bin/test-connect-t
+%%WSREP%%bin/wsrep_sst_common
+%%WSREP%%bin/wsrep_sst_mariabackup
+%%WSREP%%bin/wsrep_sst_mysqldump
+%%WSREP%%bin/wsrep_sst_rsync
+%%WSREP%%bin/wsrep_sst_rsync_wan
+%%WSREP%%bin/wsrep_sst_backup
+@comment %%ETCDIR%%/conf.d/client.cnf
+%%ETCDIR%%/conf.d/enable_encryption.preset
+%%ETCDIR%%/conf.d/mysql-clients.cnf
+%%S3%%%%ETCDIR%%/conf.d/s3.cnf
+@comment %%ETCDIR%%/server.cnf
+@sample %%ETCDIR%%/conf.d/server.cnf.sample
+%%SPIDER%%@sample %%ETCDIR%%/conf.d/spider.cnf.sample
+%%WSREP%%%%ETCDIR%%/conf.d/wsrep.cnf.sample
+@comment %%ETCDIR%%/my.cnf
+@sample %%ETCDIR%%/user_map.conf.sample
+include/mysql/server/big_endian.h
+include/mysql/server/byte_order_generic.h
+include/mysql/server/byte_order_generic_x86.h
+include/mysql/server/byte_order_generic_x86_64.h
+include/mysql/server/decimal.h
+include/mysql/server/errmsg.h
+include/mysql/server/handler_ername.h
+include/mysql/server/handler_state.h
+include/mysql/server/json_lib.h
+include/mysql/server/keycache.h
+include/mysql/server/little_endian.h
+include/mysql/server/m_ctype.h
+include/mysql/server/m_string.h
+include/mysql/server/ma_dyncol.h
+include/mysql/server/mariadb_capi_rename.h
+include/mysql/server/my_alloc.h
+include/mysql/server/my_alloca.h
+include/mysql/server/my_attribute.h
+include/mysql/server/my_byteorder.h
+include/mysql/server/my_compiler.h
+include/mysql/server/my_config.h
+include/mysql/server/my_dbug.h
+include/mysql/server/my_decimal_limits.h
+include/mysql/server/my_dir.h
+include/mysql/server/my_getopt.h
+include/mysql/server/my_global.h
+include/mysql/server/my_list.h
+include/mysql/server/my_net.h
+include/mysql/server/my_pthread.h
+include/mysql/server/my_sys.h
+include/mysql/server/my_valgrind.h
+include/mysql/server/my_xml.h
+include/mysql/server/mysql.h
+include/mysql/server/mysql/auth_dialog_client.h
+include/mysql/server/mysql/client_plugin.h
+include/mysql/server/mysql/plugin.h
+include/mysql/server/mysql/plugin_audit.h
+include/mysql/server/mysql/plugin_auth.h
+include/mysql/server/mysql/plugin_auth_common.h
+include/mysql/server/mysql/plugin_data_type.h
+include/mysql/server/mysql/plugin_encryption.h
+include/mysql/server/mysql/plugin_ftparser.h
+include/mysql/server/mysql/plugin_function.h
+include/mysql/server/mysql/plugin_password_validation.h
+include/mysql/server/mysql/psi/mysql_file.h
+include/mysql/server/mysql/psi/mysql_idle.h
+include/mysql/server/mysql/psi/mysql_mdl.h
+include/mysql/server/mysql/psi/mysql_memory.h
+include/mysql/server/mysql/psi/mysql_ps.h
+include/mysql/server/mysql/psi/mysql_socket.h
+include/mysql/server/mysql/psi/mysql_sp.h
+include/mysql/server/mysql/psi/mysql_stage.h
+include/mysql/server/mysql/psi/mysql_statement.h
+include/mysql/server/mysql/psi/mysql_table.h
+include/mysql/server/mysql/psi/mysql_thread.h
+include/mysql/server/mysql/psi/mysql_transaction.h
+include/mysql/server/mysql/psi/psi.h
+include/mysql/server/mysql/psi/psi_abi_v0.h
+include/mysql/server/mysql/psi/psi_abi_v1.h
+include/mysql/server/mysql/psi/psi_abi_v2.h
+include/mysql/server/mysql/psi/psi_base.h
+include/mysql/server/mysql/psi/psi_memory.h
+include/mysql/server/mysql/service_base64.h
+include/mysql/server/mysql/service_debug_sync.h
+include/mysql/server/mysql/service_encryption.h
+include/mysql/server/mysql/service_encryption_scheme.h
+include/mysql/server/mysql/service_json.h
+include/mysql/server/mysql/service_kill_statement.h
+include/mysql/server/mysql/service_logger.h
+include/mysql/server/mysql/service_md5.h
+include/mysql/server/mysql/service_my_crypt.h
+include/mysql/server/mysql/service_my_print_error.h
+include/mysql/server/mysql/service_my_snprintf.h
+include/mysql/server/mysql/service_progress_report.h
+include/mysql/server/mysql/service_sha1.h
+include/mysql/server/mysql/service_sha2.h
+include/mysql/server/mysql/service_sql.h
+include/mysql/server/mysql/service_thd_alloc.h
+include/mysql/server/mysql/service_thd_autoinc.h
+include/mysql/server/mysql/service_thd_error_context.h
+include/mysql/server/mysql/service_thd_mdl.h
+include/mysql/server/mysql/service_thd_rnd.h
+include/mysql/server/mysql/service_thd_specifics.h
+include/mysql/server/mysql/service_thd_timezone.h
+include/mysql/server/mysql/service_thd_wait.h
+%%WSREP%%include/mysql/server/mysql/service_wsrep.h
+include/mysql/server/mysql/services.h
+include/mysql/server/mysql_com.h
+include/mysql/server/mysql_com_server.h
+include/mysql/server/mysql_embed.h
+include/mysql/server/mysql_time.h
+include/mysql/server/mysql_version.h
+include/mysql/server/mysqld_ername.h
+include/mysql/server/mysqld_error.h
+include/mysql/server/pack.h
+include/mysql/server/sql_common.h
+include/mysql/server/sql_state.h
+include/mysql/server/sslopt-case.h
+include/mysql/server/sslopt-longopts.h
+include/mysql/server/sslopt-vars.h
+include/mysql/server/typelib.h
+lib/mysql/libmariadbd.a
+lib/mysql/libmariadbd.so
+lib/mysql/libmariadbd.so.19
+lib/mysql/libmysqld.a
+lib/mysql/libmysqld.so
+lib/mysql/pam_user_map.so
+lib/mysql/plugin/adt_null.so
+lib/mysql/plugin/auth_0x0100.so
+lib/mysql/plugin/auth_ed25519.so
+@comment lib/mysql/plugin/auth_gssapi_client.so
+%%NO_GSSAPI_NONE%%lib/mysql/plugin/auth_gssapi.so
+lib/mysql/plugin/auth_pam.so
+lib/mysql/plugin/auth_pam_tool_dir/auth_pam_tool
+lib/mysql/plugin/auth_pam_v1.so
+lib/mysql/plugin/debug_key_management.so
+lib/mysql/plugin/disks.so
+lib/mysql/plugin/file_key_management.so
+lib/mysql/plugin/func_test.so
+lib/mysql/plugin/ha_archive.so
+lib/mysql/plugin/ha_blackhole.so
+lib/mysql/plugin/ha_connect.so
+lib/mysql/plugin/ha_federated.so
+lib/mysql/plugin/ha_federatedx.so
+%%MROONGA%%lib/mysql/plugin/ha_mroonga.so
+%%OQGRAPH%%lib/mysql/plugin/ha_oqgraph.so
+%%ROCKSDB%%lib/mysql/plugin/ha_rocksdb.so
+%%S3%%lib/mysql/plugin/ha_s3.so
+%%SPHINX%%lib/mysql/plugin/ha_sphinx.so
+%%SPIDER%%lib/mysql/plugin/ha_spider.so
+lib/mysql/plugin/ha_test_sql_discovery.so
+lib/mysql/plugin/handlersocket.so
+lib/mysql/plugin/locales.so
+lib/mysql/plugin/metadata_lock_info.so
+lib/mysql/plugin/qa_auth_client.so
+lib/mysql/plugin/qa_auth_interface.so
+lib/mysql/plugin/qa_auth_server.so
+lib/mysql/plugin/query_cache_info.so
+lib/mysql/plugin/query_response_time.so
+lib/mysql/plugin/server_audit.so
+lib/mysql/plugin/simple_password_check.so
+lib/mysql/plugin/sql_errlog.so
+lib/mysql/plugin/test_sql_service.so
+lib/mysql/plugin/test_versioning.so
+lib/mysql/plugin/type_mysql_json.so
+lib/mysql/plugin/type_test.so
+lib/mysql/plugin/type_mysql_timestamp.so
+%%WSREP%%lib/mysql/plugin/wsrep_info.so
+lib/mysql/plugin/zstd.so
+libexec/mariadbd
+libexec/mysqld
+@comment share/man/man1/aria_chk.1.gz
+@comment share/man/man1/aria_dump_log.1.gz
+@comment share/man/man1/aria_ftdump.1.gz
+@comment share/man/man1/aria_pack.1.gz
+@comment share/man/man1/aria_read_log.1.gz
+@comment %%S3%%share/man/man1/aria_s3_copy.1.gz
+@comment share/man/man1/galera_new_cluster.1.gz
+@comment share/man/man1/galera_recovery.1.gz
+@comment share/man/man1/innochecksum.1.gz
+@comment share/man/man1/mariabackup.1.gz
+@comment share/man/man1/mariadb-access.1.gz
+@comment share/man/man1/mariadb-admin.1.gz
+@comment share/man/man1/mariadb-backup.1.gz
+@comment share/man/man1/mariadb-binlog.1.gz
+@comment share/man/man1/mariadb-check.1.gz
+@comment share/man/man1/mariadb-client-test-embedded.1.gz
+@comment share/man/man1/mariadb-client-test.1.gz
+@comment share/man/man1/mariadb-conv.1.gz
+@comment share/man/man1/mariadb-convert-table-format.1.gz
+@comment share/man/man1/mariadb-dump.1.gz
+@comment share/man/man1/mariadb-dumpslow.1.gz
+@comment share/man/man1/mariadb-embedded.1.gz
+@comment share/man/man1/mariadb-find-rows.1.gz
+@comment share/man/man1/mariadb-fix-extensions.1.gz
+@comment share/man/man1/mariadb-hotcopy.1.gz
+@comment share/man/man1/mariadb-import.1.gz
+@comment share/man/man1/mariadb-install-db.1.gz
+@comment %%ROCKSDB%%share/man/man1/mariadb-ldb.1.gz
+@comment share/man/man1/mariadb-plugin.1.gz
+@comment share/man/man1/mariadb-secure-installation.1.gz
+@comment share/man/man1/mariadb-service-convert.1.gz
+@comment share/man/man1/mariadb-setpermission.1.gz
+@comment share/man/man1/mariadb-show.1.gz
+@comment share/man/man1/mariadb-slap.1.gz
+@comment share/man/man1/mariadb-test-embedded.1.gz
+@comment share/man/man1/mariadb-test.1.gz
+@comment share/man/man1/mariadb-tzinfo-to-sql.1.gz
+@comment share/man/man1/mariadb-upgrade.1.gz
+@comment share/man/man1/mariadb-waitpid.1.gz
+@comment share/man/man1/mariadbd-multi.1.gz
+@comment share/man/man1/mariadbd-safe-helper.1.gz
+@comment share/man/man1/mariadbd-safe.1.gz
+@comment share/man/man1/mariadb.1.gz
+@comment share/man/man1/mariadb_config.1.gz
+@comment share/man/man1/mbstream.1.gz
+@comment share/man/man1/msql2mysql.1.gz
+@comment share/man/man1/my_print_defaults.1.gz
+@comment share/man/man1/my_safe_process.1.gz
+@comment share/man/man1/myisam_ftdump.1.gz
+@comment share/man/man1/myisamchk.1.gz
+@comment share/man/man1/myisamlog.1.gz
+@comment share/man/man1/myisampack.1.gz
+@comment %%ROCKSDB%%share/man/man1/myrocks_hotbackup.1.gz
+@comment share/man/man1/mysql-stress-test.pl.1.gz
+@comment share/man/man1/mysql-test-run.pl.1.gz
+@comment share/man/man1/mysql.1.gz
+@comment share/man/man1/mysql_client_test.1.gz
+@comment share/man/man1/mysql_client_test_embedded.1.gz
+@comment share/man/man1/mysql_config.1.gz
+@comment share/man/man1/mysql_convert_table_format.1.gz
+@comment share/man/man1/mysql_embedded.1.gz
+@comment share/man/man1/mysql_find_rows.1.gz
+@comment share/man/man1/mysql_plugin.1.gz
+@comment share/man/man1/mysql_setpermission.1.gz
+@comment share/man/man1/mysqlaccess.1.gz
+@comment share/man/man1/mysqladmin.1.gz
+@comment share/man/man1/mysqlbinlog.1.gz
+@comment share/man/man1/mysqlcheck.1.gz
+@comment share/man/man1/mysqldump.1.gz
+@comment share/man/man1/mysqlhotcopy.1.gz
+@comment share/man/man1/mysqlimport.1.gz
+@comment share/man/man1/mysqlshow.1.gz
+@comment share/man/man1/mysqlslap.1.gz
+@comment share/man/man1/mysqltest.1.gz
+@comment share/man/man1/mysqltest_embedded.1.gz
+@comment @comment share/man/man1/mytop.1.gz
+@comment share/man/man1/mysql.server.1.gz
+@comment share/man/man1/mysql_fix_extensions.1.gz
+@comment share/man/man1/mysql_install_db.1.gz
+@comment %%ROCKSDB%%share/man/man1/mysql_ldb.1.gz
+@comment share/man/man1/mysql_secure_installation.1.gz
+@comment share/man/man1/mysql_tzinfo_to_sql.1.gz
+@comment share/man/man1/mysql_upgrade.1.gz
+@comment share/man/man1/mysql_waitpid.1.gz
+@comment share/man/man1/mysqld_multi.1.gz
+@comment share/man/man1/mysqld_safe.1.gz
+@comment share/man/man1/mysqld_safe_helper.1.gz
+@comment share/man/man1/mysqldumpslow.1.gz
+@comment share/man/man1/perror.1.gz
+@comment share/man/man1/replace.1.gz
+@comment share/man/man1/resolve_stack_dump.1.gz
+@comment share/man/man1/resolveip.1.gz
+@comment %%WSREP%%share/man/man1/wsrep_sst_common.1.gz
+@comment %%WSREP%%share/man/man1/wsrep_sst_mariabackup.1.gz
+@comment %%WSREP%%share/man/man1/wsrep_sst_mysqldump.1.gz
+@comment %%WSREP%%share/man/man1/wsrep_sst_rsync.1.gz
+@comment %%WSREP%%share/man/man1/wsrep_sst_rsync_wan.1.gz
+@comment share/man/man3/mariadb_cancel.3.gz
+@comment share/man/man3/mariadb_connection.3.gz
+@comment share/man/man3/mariadb_dyncol_check.3.gz
+@comment share/man/man3/mariadb_dyncol_column_cmp_named.3.gz
+@comment share/man/man3/mariadb_dyncol_column_count.3.gz
+@comment share/man/man3/mariadb_dyncol_create_many_named.3.gz
+@comment share/man/man3/mariadb_dyncol_create_many_num.3.gz
+@comment share/man/man3/mariadb_dyncol_exists_named.3.gz
+@comment share/man/man3/mariadb_dyncol_exists_num.3.gz
+@comment share/man/man3/mariadb_dyncol_free.3.gz
+@comment share/man/man3/mariadb_dyncol_list_named.3.gz
+@comment share/man/man3/mariadb_dyncol_list_num.3.gz
+@comment share/man/man3/mariadb_dyncol_unpack.3.gz
+@comment share/man/man3/mariadb_dyncol_update_many_named.3.gz
+@comment share/man/man3/mariadb_dyncol_update_many_num.3.gz
+@comment share/man/man3/mariadb_get_infov.3.gz
+@comment share/man/man3/mariadb_reconnect.3.gz
+@comment share/man/man3/mariadb_rpl_close.3.gz
+@comment share/man/man3/mariadb_rpl_fetch.3.gz
+@comment share/man/man3/mariadb_rpl_get_optionsv.3.gz
+@comment share/man/man3/mariadb_rpl_open.3.gz
+@comment share/man/man3/mariadb_rpl_optionsv.3.gz
+@comment share/man/man3/mariadb_stmt_execute_direct.3.gz
+@comment share/man/man3/mariadb_stmt_fetch_fields.3.gz
+@comment share/man/man3/mysql_affected_rows.3.gz
+@comment share/man/man3/mysql_autocommit.3.gz
+@comment share/man/man3/mysql_change_user.3.gz
+@comment share/man/man3/mysql_close.3.gz
+@comment share/man/man3/mysql_commit.3.gz
+@comment share/man/man3/mysql_data_seek.3.gz
+@comment share/man/man3/mysql_errno.3.gz
+@comment share/man/man3/mysql_error.3.gz
+@comment share/man/man3/mysql_fetch_field.3.gz
+@comment share/man/man3/mysql_fetch_field_direct.3.gz
+@comment share/man/man3/mysql_fetch_fields.3.gz
+@comment share/man/man3/mysql_fetch_lengths.3.gz
+@comment share/man/man3/mysql_fetch_row.3.gz
+@comment share/man/man3/mysql_field_count.3.gz
+@comment share/man/man3/mysql_field_seek.3.gz
+@comment share/man/man3/mysql_field_tell.3.gz
+@comment share/man/man3/mysql_free_result.3.gz
+@comment share/man/man3/mysql_get_character_set_info.3.gz
+@comment share/man/man3/mysql_get_client_info.3.gz
+@comment share/man/man3/mysql_get_client_version.3.gz
+@comment share/man/man3/mysql_get_host_info.3.gz
+@comment share/man/man3/mysql_get_proto_info.3.gz
+@comment share/man/man3/mysql_get_server_info.3.gz
+@comment share/man/man3/mysql_get_server_version.3.gz
+@comment share/man/man3/mysql_get_socket.3.gz
+@comment share/man/man3/mysql_get_ssl_cipher.3.gz
+@comment share/man/man3/mysql_hex_string.3.gz
+@comment share/man/man3/mysql_info.3.gz
+@comment share/man/man3/mysql_init.3.gz
+@comment share/man/man3/mysql_kill.3.gz
+@comment share/man/man3/mysql_more_results.3.gz
+@comment share/man/man3/mysql_next_result.3.gz
+@comment share/man/man3/mysql_num_fields.3.gz
+@comment share/man/man3/mysql_num_rows.3.gz
+@comment share/man/man3/mysql_options.3.gz
+@comment share/man/man3/mysql_options4.3.gz
+@comment share/man/man3/mysql_optionsv.3.gz
+@comment share/man/man3/mysql_ping.3.gz
+@comment share/man/man3/mysql_query.3.gz
+@comment share/man/man3/mysql_read_query_result.3.gz
+@comment share/man/man3/mysql_real_connect.3.gz
+@comment share/man/man3/mysql_real_escape_string.3.gz
+@comment share/man/man3/mysql_real_query.3.gz
+@comment share/man/man3/mysql_refresh.3.gz
+@comment share/man/man3/mysql_reset_connection.3.gz
+@comment share/man/man3/mysql_rollback.3.gz
+@comment share/man/man3/mysql_row_seek.3.gz
+@comment share/man/man3/mysql_row_tell.3.gz
+@comment share/man/man3/mysql_select_db.3.gz
+@comment share/man/man3/mysql_send_query.3.gz
+@comment share/man/man3/mysql_server_end.3.gz
+@comment share/man/man3/mysql_server_init.3.gz
+@comment share/man/man3/mysql_session_track_get_first.3.gz
+@comment share/man/man3/mysql_session_track_get_next.3.gz
+@comment share/man/man3/mysql_set_character_set.3.gz
+@comment share/man/man3/mysql_set_server_option.3.gz
+@comment share/man/man3/mysql_shutdown.3.gz
+@comment share/man/man3/mysql_sqlstate.3.gz
+@comment share/man/man3/mysql_ssl_set.3.gz
+@comment share/man/man3/mysql_stat.3.gz
+@comment share/man/man3/mysql_stmt_affected_rows.3.gz
+@comment share/man/man3/mysql_stmt_attr_get.3.gz
+@comment share/man/man3/mysql_stmt_attr_set.3.gz
+@comment share/man/man3/mysql_stmt_bind_param.3.gz
+@comment share/man/man3/mysql_stmt_bind_result.3.gz
+@comment share/man/man3/mysql_stmt_close.3.gz
+@comment share/man/man3/mysql_stmt_data_seek.3.gz
+@comment share/man/man3/mysql_stmt_errno.3.gz
+@comment share/man/man3/mysql_stmt_error.3.gz
+@comment share/man/man3/mysql_stmt_execute.3.gz
+@comment share/man/man3/mysql_stmt_fetch.3.gz
+@comment share/man/man3/mysql_stmt_fetch_column.3.gz
+@comment share/man/man3/mysql_stmt_field_count.3.gz
+@comment share/man/man3/mysql_stmt_free_result.3.gz
+@comment share/man/man3/mysql_stmt_init.3.gz
+@comment share/man/man3/mysql_stmt_insert_id.3.gz
+@comment share/man/man3/mysql_stmt_more_results.3.gz
+@comment share/man/man3/mysql_stmt_next_result.3.gz
+@comment share/man/man3/mysql_stmt_num_rows.3.gz
+@comment share/man/man3/mysql_stmt_param_count.3.gz
+@comment share/man/man3/mysql_stmt_param_metadata.3.gz
+@comment share/man/man3/mysql_stmt_prepare.3.gz
+@comment share/man/man3/mysql_stmt_reset.3.gz
+@comment share/man/man3/mysql_stmt_result_metadata.3.gz
+@comment share/man/man3/mysql_stmt_row_seek.3.gz
+@comment share/man/man3/mysql_stmt_row_tell.3.gz
+@comment share/man/man3/mysql_stmt_send_long_data.3.gz
+@comment share/man/man3/mysql_stmt_sqlstate.3.gz
+@comment share/man/man3/mysql_stmt_store_result.3.gz
+@comment share/man/man3/mysql_stmt_warning_count.3.gz
+@comment share/man/man3/mysql_store_result.3.gz
+@comment share/man/man3/mysql_thread_end.3.gz
+@comment share/man/man3/mysql_thread_id.3.gz
+@comment share/man/man3/mysql_thread_init.3.gz
+@comment share/man/man3/mysql_use_result.3.gz
+@comment share/man/man3/mysql_warning_count.3.gz
+@comment share/man/man8/mariadbd.8.gz
+@comment share/man/man8/mysqld.8.gz
+share/aclocal/mysql.m4
+%%PORTDOCS%%%%DOCSDIR%%/CREDITS
+%%PORTDOCS%%%%DOCSDIR%%/INSTALL-BINARY
+%%PORTDOCS%%%%WSREP%%%%DOCSDIR%%/README-wsrep
+%%PORTDOCS%%%%DOCSDIR%%/README.md
+%%PORTDOCS%%%%DOCSDIR%%/THIRDPARTY
+%%MROONGA%%%%PORTDOCS%%%%DOCSDIR%%/groonga/README.md
+%%MROONGA%%share/groonga-normalizer-mysql/README.md
+%%MROONGA%%share/groonga-normalizer-mysql/lgpl-2.0.txt
+%%DATADIR%%/binary-configure
+%%DATADIR%%/bulgarian/errmsg.sys
+%%DATADIR%%/charsets/Index.xml
+%%DATADIR%%/charsets/README
+%%DATADIR%%/charsets/armscii8.xml
+%%DATADIR%%/charsets/ascii.xml
+%%DATADIR%%/charsets/cp1250.xml
+%%DATADIR%%/charsets/cp1251.xml
+%%DATADIR%%/charsets/cp1256.xml
+%%DATADIR%%/charsets/cp1257.xml
+%%DATADIR%%/charsets/cp850.xml
+%%DATADIR%%/charsets/cp852.xml
+%%DATADIR%%/charsets/cp866.xml
+%%DATADIR%%/charsets/dec8.xml
+%%DATADIR%%/charsets/geostd8.xml
+%%DATADIR%%/charsets/greek.xml
+%%DATADIR%%/charsets/hebrew.xml
+%%DATADIR%%/charsets/hp8.xml
+%%DATADIR%%/charsets/keybcs2.xml
+%%DATADIR%%/charsets/koi8r.xml
+%%DATADIR%%/charsets/koi8u.xml
+%%DATADIR%%/charsets/latin1.xml
+%%DATADIR%%/charsets/latin2.xml
+%%DATADIR%%/charsets/latin5.xml
+%%DATADIR%%/charsets/latin7.xml
+%%DATADIR%%/charsets/macce.xml
+%%DATADIR%%/charsets/macroman.xml
+%%DATADIR%%/charsets/swe7.xml
+%%DATADIR%%/chinese/errmsg.sys
+%%DATADIR%%/czech/errmsg.sys
+%%DATADIR%%/danish/errmsg.sys
+%%DATADIR%%/dutch/errmsg.sys
+%%DATADIR%%/english/errmsg.sys
+%%DATADIR%%/errmsg-utf8.txt
+%%DATADIR%%/estonian/errmsg.sys
+%%DATADIR%%/fill_help_tables.sql
+%%DATADIR%%/french/errmsg.sys
+%%DATADIR%%/german/errmsg.sys
+%%DATADIR%%/greek/errmsg.sys
+%%DATADIR%%/hindi/errmsg.sys
+%%DATADIR%%/hungarian/errmsg.sys
+%%DATADIR%%/italian/errmsg.sys
+%%DATADIR%%/japanese/errmsg.sys
+%%DATADIR%%/korean/errmsg.sys
+%%DATADIR%%/magic
+%%DATADIR%%/maria_add_gis_sp.sql
+%%DATADIR%%/maria_add_gis_sp_bootstrap.sql
+%%MROONGA%%%%DATADIR%%/mroonga/AUTHORS
+%%MROONGA%%%%DATADIR%%/mroonga/install.sql
+%%MROONGA%%%%DATADIR%%/mroonga/uninstall.sql
+%%DATADIR%%/mysql-log-rotate
+%%DATADIR%%/mysql.server
+%%DATADIR%%/mysql_performance_tables.sql
+%%DATADIR%%/mysql_sys_schema.sql
+%%DATADIR%%/mysql_system_tables.sql
+%%DATADIR%%/mysql_system_tables_data.sql
+%%DATADIR%%/mysql_test_data_timezone.sql
+%%DATADIR%%/mysql_test_db.sql
+%%DATADIR%%/mysqld_multi.server
+%%DATADIR%%/norwegian-ny/errmsg.sys
+%%DATADIR%%/norwegian/errmsg.sys
+%%DATADIR%%/polish/errmsg.sys
+%%DATADIR%%/portuguese/errmsg.sys
+%%DATADIR%%/romanian/errmsg.sys
+%%DATADIR%%/russian/errmsg.sys
+%%DATADIR%%/serbian/errmsg.sys
+%%DATADIR%%/slovak/errmsg.sys
+%%DATADIR%%/spanish/errmsg.sys
+%%DATADIR%%/swedish/errmsg.sys
+%%DATADIR%%/ukrainian/errmsg.sys
+@comment %%DATADIR%%/wsrep.cnf
+%%WSREP%%%%DATADIR%%/wsrep_notify
+@dir(%%MARIADB_USER%%,%%MARIADB_GROUP%%,) %%MARIADB_LOGDIR%%
+
diff --git a/databases/mdbtools/Makefile b/databases/mdbtools/Makefile
index 1916f2b6ea38..e50d3e787889 100644
--- a/databases/mdbtools/Makefile
+++ b/databases/mdbtools/Makefile
@@ -1,12 +1,12 @@
-# Created by: Anders Nordby <anders@fix.no>
-
 PORTNAME=	mdbtools
-DISTVERSIONPREFIX=	v
-DISTVERSION=	0.9.4
+DISTVERSION=	1.0.0
+PORTREVISION=	2
 CATEGORIES=	databases
+MASTER_SITES=	https://github.com/${PORTNAME}/${PORTNAME}/releases/download/v${DISTVERSION}/
 
 MAINTAINER=	rhurlin@FreeBSD.org
 COMMENT=	Utilities and libraries to export data from MS Access databases (.mdb)
+WWW=		https://github.com/mdbtools/mdbtools/
 
 LICENSE=	GPLv2
 
@@ -16,33 +16,51 @@ BUILD_DEPENDS=	bash-completion>=0:shells/bash-completion \
 LIB_DEPENDS=	libodbcinst.so:databases/unixODBC
 RUN_DEPENDS=	bash-completion>=0:shells/bash-completion
 
-USES=		autoreconf bison gettext gnome iconv libtool pathfix \
+USES=		bison cpe gnome iconv:wchar_t libtool pathfix \
 		pkgconfig readline
-USE_GITHUB=	yes
+CPE_VENDOR=	mdbtools_project
 USE_GNOME=	glib20
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
+GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
 CONFIGURE_ARGS=	${ICONV_CONFIGURE_ARG} \
 		--with-unixodbc=${LOCALBASE}
 
 INSTALL_TARGET=	install-strip
 
-CPPFLAGS+=	-I${WRKSRC}/include
-
-OPTIONS_DEFINE=		DOCS MANPAGES LIBMSWSTR
+OPTIONS_DEFINE=		DOCS MANPAGES LIBMSWSTR NLS
 OPTIONS_DEFAULT=	MANPAGES
 OPTIONS_SUB=		yes
 
 LIBMSWSTR_DESC=	Read and parse JET 4 mdb file indices
 
-LIBMSWSTR_LIB_DEPENDS=	libmswstr.so:databases/libmswstr
+LIBMSWSTR_LIB_DEPENDS=		libmswstr.so:databases/libmswstr
 LIBMSWSTR_CONFIGURE_ENV_OFF=	ac_cv_lib_mswstr_DBLCMapStringW=no
 MANPAGES_CONFIGURE_OFF=		--disable-man
+NLS_USES=			gettext
+
+DOCS=		AUTHORS HACKING.md NEWS README.md
+
+.include <bsd.port.pre.mk>
+
+.if ${LLVM_DEFAULT} >= 15
+# With LLVM15:  parser.c:1053:9: error:
+# variable 'yynerrs' set but not used [-Werror,-Wunused-but-set-variable]
+BUILD_DEPENDS+=	llvm-config${LLVM_VER}:devel/llvm${LLVM_VER}
+LLVM_VER=	14
+#CMAKE_ARGS+=	-DLLVM_DIR=${LOCALBASE}/llvm${LLVM_VER}/lib/cmake/llvm
+CC=		clang${LLVM_VER}
+CPP=		clang-cpp${LLVM_VER}
+CXX=		clang++${LLVM_VER}
+.endif
 
-DOCS=		AUTHORS HACKING.md NEWS README.md TODO.md
+post-configure:
+	@${REINPLACE_CMD} -e \
+		's|libdir = $${exec_prefix}/lib/odbc|libdir = $${exec_prefix}/lib|' \
+		${WRKSRC}/src/odbc/Makefile
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${DOCS:S,^,${WRKSRC}/,}  ${STAGEDIR}${DOCSDIR}
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/databases/mdbtools/distinfo b/databases/mdbtools/distinfo
index 1666db424714..3fe0d8002f5f 100644
--- a/databases/mdbtools/distinfo
+++ b/databases/mdbtools/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1628137093
-SHA256 (mdbtools-mdbtools-v0.9.4_GH0.tar.gz) = ba9cc857e9e629195e67e6f0a9a8f2120ffe526faad59ab07371a2ac40176ef9
-SIZE (mdbtools-mdbtools-v0.9.4_GH0.tar.gz) = 215253
+TIMESTAMP = 1641508630
+SHA256 (mdbtools-1.0.0.tar.gz) = 3446e1d71abdeb98d41e252777e67e1909b186496fda59f98f67032f7fbcd955
+SIZE (mdbtools-1.0.0.tar.gz) = 643866
diff --git a/databases/mdbtools/pkg-descr b/databases/mdbtools/pkg-descr
index 07c6c369a760..6954d542b7b7 100644
--- a/databases/mdbtools/pkg-descr
+++ b/databases/mdbtools/pkg-descr
@@ -1,5 +1,3 @@
 MDB Tools is a set of programs to help you extract data from Microsoft Access
 files in various settings. See the NEWS file for information about the latest
 release.
-
-WWW: https://github.com/mdbtools/mdbtools/
diff --git a/databases/mdbtools/pkg-plist b/databases/mdbtools/pkg-plist
index 391699a77aed..2bcf1a1f1be1 100644
--- a/databases/mdbtools/pkg-plist
+++ b/databases/mdbtools/pkg-plist
@@ -16,7 +16,7 @@ include/mdbtools.h
 lib/libmdb.a
 lib/libmdb.so
 lib/libmdb.so.3
-lib/libmdb.so.3.0.4
+lib/libmdb.so.3.1.0
 lib/libmdbodbc.a
 lib/libmdbodbc.so
 lib/libmdbodbcW.a
@@ -24,23 +24,9 @@ lib/libmdbodbcW.so
 lib/libmdbsql.a
 lib/libmdbsql.so
 lib/libmdbsql.so.3
-lib/libmdbsql.so.3.0.4
+lib/libmdbsql.so.3.1.0
 libdata/pkgconfig/libmdb.pc
 libdata/pkgconfig/libmdbsql.pc
-%%MANPAGES%%man/man1/mdb-array.1.gz
-%%MANPAGES%%man/man1/mdb-count.1.gz
-%%MANPAGES%%man/man1/mdb-export.1.gz
-%%MANPAGES%%man/man1/mdb-header.1.gz
-%%MANPAGES%%man/man1/mdb-hexdump.1.gz
-%%MANPAGES%%man/man1/mdb-import.1.gz
-%%MANPAGES%%man/man1/mdb-json.1.gz
-%%MANPAGES%%man/man1/mdb-parsecsv.1.gz
-%%MANPAGES%%man/man1/mdb-prop.1.gz
-%%MANPAGES%%man/man1/mdb-queries.1.gz
-%%MANPAGES%%man/man1/mdb-schema.1.gz
-%%MANPAGES%%man/man1/mdb-sql.1.gz
-%%MANPAGES%%man/man1/mdb-tables.1.gz
-%%MANPAGES%%man/man1/mdb-ver.1.gz
 share/bash-completion/completions/mdb-count
 share/bash-completion/completions/mdb-export
 share/bash-completion/completions/mdb-hexdump
@@ -57,4 +43,17 @@ share/bash-completion/completions/mdb-ver
 %%PORTDOCS%%%%DOCSDIR%%/HACKING.md
 %%PORTDOCS%%%%DOCSDIR%%/NEWS
 %%PORTDOCS%%%%DOCSDIR%%/README.md
-%%PORTDOCS%%%%DOCSDIR%%/TODO.md
+%%MANPAGES%%share/man/man1/mdb-array.1.gz
+%%MANPAGES%%share/man/man1/mdb-count.1.gz
+%%MANPAGES%%share/man/man1/mdb-export.1.gz
+%%MANPAGES%%share/man/man1/mdb-header.1.gz
+%%MANPAGES%%share/man/man1/mdb-hexdump.1.gz
+%%MANPAGES%%share/man/man1/mdb-import.1.gz
+%%MANPAGES%%share/man/man1/mdb-json.1.gz
+%%MANPAGES%%share/man/man1/mdb-parsecsv.1.gz
+%%MANPAGES%%share/man/man1/mdb-prop.1.gz
+%%MANPAGES%%share/man/man1/mdb-queries.1.gz
+%%MANPAGES%%share/man/man1/mdb-schema.1.gz
+%%MANPAGES%%share/man/man1/mdb-sql.1.gz
+%%MANPAGES%%share/man/man1/mdb-tables.1.gz
+%%MANPAGES%%share/man/man1/mdb-ver.1.gz
diff --git a/databases/mdbx/Makefile b/databases/mdbx/Makefile
index f70f8a141e75..fcf25c146d0a 100644
--- a/databases/mdbx/Makefile
+++ b/databases/mdbx/Makefile
@@ -1,14 +1,14 @@
-# Created by: Mahlon E. Smith <mahlon@martini.nu>
-
 PORTNAME=	mdbx
-PORTVERSION=	0.10.1
-DISTVERSIONPREFIX=	v
+PORTVERSION=	0.11.14
+PORTREVISION=	1
 CATEGORIES=	databases
 MASTER_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/releases/download/${DISTVERSIONPREFIX}${DISTVERSION}/
-DISTNAME=	${GH_PROJECT}-amalgamated-${DISTVERSION}
+MASTER_SITES=	https://libmdbx.dqdkfa.ru/release/
+DISTNAME=	libmdbx-amalgamated-${DISTVERSION}
 
 MAINTAINER=	mahlon@martini.nu
 COMMENT=	Lightning Memory-Mapped Database (Extended)
+WWW=		https://github.com/erthink/libmdbx
 
 LICENSE=	OPENLDAP
 LICENSE_NAME=	OpenLDAP Public License
@@ -16,13 +16,11 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 USES=		gmake
-# No USE_GITHUB, we want the amalgamated build.
-GH_ACCOUNT=	erthink
-GH_PROJECT=	libmdbx
 USE_LDCONFIG=	yes
 
 MAKEFILE=	GNUmakefile
 MAKE_ARGS=	mdbx tools
+MAKE_ENV=	mandir=${PREFIX}/share/man
 
 CFLAGS+=	-Wall -Werror -Wextra -Wpedantic -ffunction-sections \
 		-fPIC -fvisibility=hidden -std=gnu11 -pthread -Wno-error=attributes
diff --git a/databases/mdbx/distinfo b/databases/mdbx/distinfo
index ebb07a47b305..cfb8f8d1e751 100644
--- a/databases/mdbx/distinfo
+++ b/databases/mdbx/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1625074121
-SHA256 (libmdbx-amalgamated-0.10.1.tar.gz) = dfcf8993a5242fcd7e7b28e3c3019d60a337e81d5e8c6f4d8368050264262e9a
-SIZE (libmdbx-amalgamated-0.10.1.tar.gz) = 647460
+TIMESTAMP = 1676493467
+SHA256 (libmdbx-amalgamated-0.11.14.tar.gz) = 95327d7b59c6ea76ee4830f288d280dd4e90e6af2905b66e80671a14dafd3e0c
+SIZE (libmdbx-amalgamated-0.11.14.tar.gz) = 698366
diff --git a/databases/mdbx/files/patch-GNUmakefile b/databases/mdbx/files/patch-GNUmakefile
index e8fe532f39c3..575d96a0d47a 100644
--- a/databases/mdbx/files/patch-GNUmakefile
+++ b/databases/mdbx/files/patch-GNUmakefile
@@ -1,32 +1,37 @@
---- GNUmakefile.orig	2021-05-09 00:11:57 UTC
+--- GNUmakefile.orig	2022-08-02 10:17:33 UTC
 +++ GNUmakefile
-@@ -13,7 +13,7 @@
- # in README and source code (see src/options.h) if you do.
+@@ -9,7 +9,7 @@
+ # Basic internal definitios. For a customizable variables and options see below.
  #
- 
--SHELL   := env bash
-+SHELL   := env sh
- 
- # install sandbox
- DESTDIR ?=
-@@ -53,7 +53,7 @@ define uname2sosuffix
-     *) echo so;;
+ $(info // The GNU Make $(MAKE_VERSION))
+-SHELL         := $(shell env bash -c 'echo $$BASH')
++SHELL         := sh
+ MAKE_VERx3    := $(shell printf "%3s%3s%3s" $(subst ., ,$(MAKE_VERSION)))
+ make_lt_3_81  := $(shell expr "$(MAKE_VERx3)" "<" "  3 81")
+ ifneq ($(make_lt_3_81),0)
+@@ -117,7 +117,7 @@ define uname2libs
    esac
  endef
+ 
 -SO_SUFFIX  := $(shell $(uname2sosuffix))
-+SO_SUFFIX  := so.0.10.1
++SO_SUFFIX  := so.0.11.14
  HEADERS    := mdbx.h mdbx.h++
  LIBRARIES  := libmdbx.a libmdbx.$(SO_SUFFIX)
  TOOLS      := mdbx_stat mdbx_copy mdbx_dump mdbx_load mdbx_chk mdbx_drop
-@@ -194,11 +194,11 @@ mdbx_%:	mdbx_%.c libmdbx.a
+@@ -284,16 +284,11 @@ mdbx_%.static-lto: mdbx_%.c config.h mdbx.c mdbx.h
  
  install: $(LIBRARIES) $(TOOLS) $(HEADERS)
  	@echo '  INSTALLING...'
--	$(INSTALL) -D -p $(EXE_INSTALL_FLAGS) -t $(DESTDIR)$(prefix)/bin$(suffix) $(TOOLS) && \
--	$(INSTALL) -D -p $(EXE_INSTALL_FLAGS) -t $(DESTDIR)$(prefix)/lib$(suffix) $(filter-out libmdbx.a,$(LIBRARIES)) && \
--	$(INSTALL) -D -p -t $(DESTDIR)$(prefix)/lib$(suffix) libmdbx.a && \
--	$(INSTALL) -D -p -m 444 -t $(DESTDIR)$(prefix)/include $(HEADERS) && \
--	$(INSTALL) -D -p -m 444 -t $(DESTDIR)$(mandir)/man1 $(addprefix $(MAN_SRCDIR), $(MANPAGES))
+-	$(QUIET)mkdir -p $(DESTDIR)$(prefix)/bin$(suffix) && \
+-		$(INSTALL) -p $(EXE_INSTALL_FLAGS) $(TOOLS) $(DESTDIR)$(prefix)/bin$(suffix)/ && \
+-	mkdir -p $(DESTDIR)$(prefix)/lib$(suffix)/ && \
+-		$(INSTALL) -p $(EXE_INSTALL_FLAGS) $(filter-out libmdbx.a,$(LIBRARIES)) $(DESTDIR)$(prefix)/lib$(suffix)/ && \
+-	mkdir -p $(DESTDIR)$(prefix)/lib$(suffix)/ && \
+-		$(INSTALL) -p libmdbx.a $(DESTDIR)$(prefix)/lib$(suffix)/ && \
+-	mkdir -p $(DESTDIR)$(prefix)/include/ && \
+-		$(INSTALL) -p -m 444 $(HEADERS) $(DESTDIR)$(prefix)/include/ && \
+-	mkdir -p $(DESTDIR)$(mandir)/man1/ && \
+-		$(INSTALL) -p -m 444 $(addprefix $(MAN_SRCDIR), $(MANPAGES)) $(DESTDIR)$(mandir)/man1/
 +	install -p -s $(TOOLS) $(DESTDIR)$(prefix)/bin$(suffix) && \
 +	install -p -s $(filter-out libmdbx.a,$(LIBRARIES)) $(DESTDIR)$(prefix)/lib$(suffix) && \
 +	install -p libmdbx.a $(DESTDIR)$(prefix)/lib$(suffix) && \
diff --git a/databases/mdbx/files/patch-mdbx.h++ b/databases/mdbx/files/patch-mdbx.h++
new file mode 100644
index 000000000000..51538c655c60
--- /dev/null
+++ b/databases/mdbx/files/patch-mdbx.h++
@@ -0,0 +1,11 @@
+--- mdbx.h++.orig	2022-08-02 10:17:33 UTC
++++ mdbx.h++
+@@ -23,6 +23,8 @@
+ 
+ #pragma once
+ 
++#define _LIBCPP_NO_EXPERIMENTAL_DEPRECATION_WARNING_FILESYSTEM
++
+ /* Workaround for modern libstdc++ with CLANG < 4.x */
+ #if defined(__SIZEOF_INT128__) && !defined(__GLIBCXX_TYPE_INT_N_0) &&          \
+     defined(__clang__) && __clang_major__ < 4
diff --git a/databases/mdbx/pkg-descr b/databases/mdbx/pkg-descr
index 75b0153b62bf..2368dd02249b 100644
--- a/databases/mdbx/pkg-descr
+++ b/databases/mdbx/pkg-descr
@@ -6,5 +6,3 @@ properties and capabilities, focused on creating unique lightweight solutions.
 Historically, libmdbx is a deeply revised and extended descendant of the
 amazing Lightning Memory-Mapped Database. libmdbx inherits all benefits from
 LMDB, but resolves some issues and adds a set of improvements.
-
-WWW: https://github.com/erthink/libmdbx
diff --git a/databases/mdbx/pkg-plist b/databases/mdbx/pkg-plist
index a4f51ffddbb3..7865020f6dd2 100644
--- a/databases/mdbx/pkg-plist
+++ b/databases/mdbx/pkg-plist
@@ -10,9 +10,9 @@ lib/libmdbx.a
 lib/libmdbx.so
 lib/libmdbx.so.0
 lib/libmdbx.so.%%VERSION%%
-man/man1/mdbx_chk.1.gz
-man/man1/mdbx_copy.1.gz
-man/man1/mdbx_dump.1.gz
-man/man1/mdbx_drop.1.gz
-man/man1/mdbx_load.1.gz
-man/man1/mdbx_stat.1.gz
+share/man/man1/mdbx_chk.1.gz
+share/man/man1/mdbx_copy.1.gz
+share/man/man1/mdbx_dump.1.gz
+share/man/man1/mdbx_drop.1.gz
+share/man/man1/mdbx_load.1.gz
+share/man/man1/mdbx_stat.1.gz
diff --git a/databases/mdcached/Makefile b/databases/mdcached/Makefile
index ba273ddcbdfd..fa6d3e9c304f 100644
--- a/databases/mdcached/Makefile
+++ b/databases/mdcached/Makefile
@@ -1,26 +1,32 @@
-# Created by: Ivan Voras <ivoras@FreeBSD.org>
-
 PORTNAME=	mdcached
 PORTVERSION=	1.0.9
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	databases net
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	ivoras@FreeBSD.org
 COMMENT=	High performance cache server similar to memcached
+WWW=		https://mdcached.sourceforge.net/
 
 LICENSE=	BSD2CLAUSE
 
 USES=		tar:tgz
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}/${PORTNAME}
 USE_LDCONFIG=	yes
 
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}/${PORTNAME}
+
 PORTDOCS=	UserGuide.txt mdcached.txt
 
 OPTIONS_DEFINE=	DOCS
 
+.include <bsd.port.options.mk>
+
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 ))
+CFLAGS+=	-Wno-error=dynamic-exception-spec
+.endif
+
 post-patch:
-	@${REINPLACE_CMD} 's|ADDCFLAGS = -Wall -g -O3 -march=native|ADDCFLAGS = ${CFLAGS}|' \
+	@${REINPLACE_CMD} 's|ADDCFLAGS = -Wall -g -O3|ADDCFLAGS = ${CFLAGS}|' \
 		${WRKSRC}/Makefile
 	@${REINPLACE_CMD} 's|/usr/local|${PREFIX}|' \
 		${WRKSRC}/FreeBSD/${PORTNAME}
@@ -32,7 +38,7 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/lib${PORTNAME}.a ${STAGEDIR}${PREFIX}/lib
 	${INSTALL_DATA} ${WRKSRC}/mc_protocol.h ${STAGEDIR}${PREFIX}/include
 	${INSTALL_DATA} ${WRKSRC}/mc_client.h ${STAGEDIR}${PREFIX}/include
-	${INSTALL_MAN} ${WRKSRC}/doc/${PORTNAME}.1 ${STAGEDIR}${MANPREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/doc/${PORTNAME}.1 ${STAGEDIR}${PREFIX}/share/man/man1
 	${INSTALL_SCRIPT} ${WRKSRC}/FreeBSD/${PORTNAME} ${STAGEDIR}${PREFIX}/etc/rc.d
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/doc/|} ${STAGEDIR}${DOCSDIR}
diff --git a/databases/mdcached/pkg-descr b/databases/mdcached/pkg-descr
index 871f751012a3..cf01dfe83562 100644
--- a/databases/mdcached/pkg-descr
+++ b/databases/mdcached/pkg-descr
@@ -3,5 +3,3 @@ but offering much higher flexibility through use of record tags which can be
 used to perform bulk operations on sets of records. It has its own binary
 network protocol which is accessible through Unix domain sockets and through
 TCP. It is indended to be accessed through a high-performance C library.
-
-WWW: http://mdcached.sourceforge.net/
diff --git a/databases/mdcached/pkg-plist b/databases/mdcached/pkg-plist
index dacd5d344263..aa5b3ddd3c5b 100644
--- a/databases/mdcached/pkg-plist
+++ b/databases/mdcached/pkg-plist
@@ -5,4 +5,4 @@ include/mc_protocol.h
 lib/libmdcached.a
 lib/libmdcached.so
 lib/libmdcached.so.1
-man/man1/mdcached.1.gz
+share/man/man1/mdcached.1.gz
diff --git a/databases/memcached/Makefile b/databases/memcached/Makefile
index 4e13727dd6a9..e8ef24a56257 100644
--- a/databases/memcached/Makefile
+++ b/databases/memcached/Makefile
@@ -1,67 +1,56 @@
-# Created by: Sean Chittenden <seanc@FreeBSD.org>
-
 PORTNAME=	memcached
-PORTVERSION=	1.6.10
+PORTVERSION=	1.6.26
 CATEGORIES=	databases
 MASTER_SITES=	http://www.memcached.org/files/ \
 		GENTOO
 
-MAINTAINER=	swills@FreeBSD.org
+MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	High-performance distributed memory object cache system
+WWW=		https://memcached.org/
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libevent.so:devel/libevent
 
-USES=		autoreconf cpe shebangfix
-SHEBANG_FILES=	scripts/memcached-tool
-
+USES=		autoreconf cpe pkgconfig shebangfix
+USE_CSTD=	c99
 USE_RC_SUBR=	memcached
-SUB_LIST+=	RC_SUBR_SUFFIX=${RC_SUBR_SUFFIX}
 
-USE_CSTD=	c99
-GNU_CONFIGURE=	yes
+SHEBANG_FILES=	scripts/memcached-tool
+
+HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-coverage \
 		--program-prefix= \
 		--with-libevent=${LOCALBASE}
 
+MAKE_JOBS_UNSAFE=	yes
+
+SUB_LIST+=	RC_SUBR_SUFFIX=${RC_SUBR_SUFFIX}
+
 # Dtrace option disabled until it is fixed upstream
 OPTIONS_DEFINE=		DOCS SASL
-OPTIONS_DEFAULT=	SASL
 OPTIONS_DEFINE_amd64=	DTRACE
-OPTIONS_DEFAULT_amd64=	DTRACE
 OPTIONS_DEFINE_powerpc64=	DTRACE
-OPTIONS_DEFAULT_powerpc64=	DTRACE
-OPTIONS_EXCLUDE_powerpc64=	${OPTIONS_EXCLUDE_${ARCH}_${OSREL:R}}
-OPTIONS_EXCLUDE_powerpc64_11=	DTRACE
-OPTIONS_EXCLUDE_powerpc64_12=	DTRACE
 OPTIONS_DEFINE_powerpc64le=	DTRACE
+OPTIONS_DEFAULT=	SASL
+OPTIONS_DEFAULT_amd64=	DTRACE
+OPTIONS_DEFAULT_powerpc64=	DTRACE
 OPTIONS_DEFAULT_powerpc64le=	DTRACE
 
-.if !exists(/usr/sbin/dtrace)
-OPTIONS_EXCLUDE+=	DTRACE
-.endif
-
 DTRACE_DESC=	Enable dtrace probes
 SASL_DESC=	Enable SASL Authentication
 
 DOCS_BUILD_DEPENDS=	xml2rfc:textproc/xml2rfc
 DOCS_CONFIGURE_ENABLE=	docs
-
 DTRACE_CONFIGURE_ENABLE=	dtrace
-
 SASL_LIB_DEPENDS=	libsasl2.so:security/cyrus-sasl2
+SASL_USES=	localbase:ldflags
 SASL_CONFIGURE_ENABLE=	sasl
-SASL_CFLAGS=		-I${LOCALBASE}/include
-SASL_CPPFLAGS+=		${CFLAGS}
-SASL_LDFLAGS=		-L${LOCALBASE}/lib
-
-MAKE_JOBS_UNSAFE=	yes
 
 .include <bsd.port.pre.mk>
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1200057
+.if ${OPSYS} == FreeBSD
 CONFIGURE_ARGS+=	--enable-tls
 USES+=			ssl
 .endif
diff --git a/databases/memcached/distinfo b/databases/memcached/distinfo
index f40737c65896..d46253ddd0d9 100644
--- a/databases/memcached/distinfo
+++ b/databases/memcached/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1628174236
-SHA256 (memcached-1.6.10.tar.gz) = ef46ac33c55d3a0f1c5ae8eb654677d84669913997db5d0c422c5eaffd694a92
-SIZE (memcached-1.6.10.tar.gz) = 609630
+TIMESTAMP = 1711705428
+SHA256 (memcached-1.6.26.tar.gz) = c939c7859a3c1cf60303e9dd080c63ac4a387ee2846d595cd5263a3dcacdc2f7
+SIZE (memcached-1.6.26.tar.gz) = 1178446
diff --git a/databases/memcached/files/patch-configure.ac b/databases/memcached/files/patch-configure.ac
index 81b0024fee3a..bfe9ca6ef3d7 100644
--- a/databases/memcached/files/patch-configure.ac
+++ b/databases/memcached/files/patch-configure.ac
@@ -1,6 +1,6 @@
---- configure.ac.orig	2020-11-21 00:10:41 UTC
+--- configure.ac.orig	2023-03-08 21:34:27 UTC
 +++ configure.ac
-@@ -182,7 +182,7 @@ if test "x$enable_dtrace" = "xyes"; then
+@@ -201,7 +201,7 @@ if test "x$enable_dtrace" = "xyes"; then
    if test "x$DTRACE" != "xno"; then
      AC_DEFINE([ENABLE_DTRACE],1,[Set to nonzero if you want to include DTRACE])
      build_dtrace=yes
@@ -9,12 +9,3 @@
      if test $? -eq 0
      then
          dtrace_instrument_obj=yes
-@@ -793,7 +793,7 @@ then
- elif test "$GCC" = "yes"
- then
-   GCC_VERSION=`$CC -dumpversion`
--  CFLAGS="$CFLAGS -Wall -Werror -pedantic -Wmissing-prototypes -Wmissing-declarations -Wredundant-decls"
-+  CFLAGS="$CFLAGS -Wall -pedantic -Wmissing-prototypes -Wmissing-declarations -Wredundant-decls"
-   if test "x$enable_asan" = "xyes"; then
-     CFLAGS="$CFLAGS -fsanitize=address"
-   fi
diff --git a/databases/memcached/files/patch-memcached.c b/databases/memcached/files/patch-memcached.c
index daedd4c1c45c..7e248161d68f 100644
--- a/databases/memcached/files/patch-memcached.c
+++ b/databases/memcached/files/patch-memcached.c
@@ -1,6 +1,6 @@
---- memcached.c.orig	2020-11-21 00:10:41 UTC
+--- memcached.c.orig	2023-03-08 21:34:27 UTC
 +++ memcached.c
-@@ -676,7 +676,7 @@ conn *conn_new(const int sfd, enum conn_states init_st
+@@ -707,7 +707,7 @@ conn *conn_new(const int sfd, enum conn_states init_st
          if (init_state == conn_listening) {
              fprintf(stderr, "<%d server listening (%s)\n", sfd,
                  prot_text(c->protocol));
@@ -9,7 +9,7 @@
              fprintf(stderr, "<%d server listening (udp)\n", sfd);
          } else if (c->protocol == negotiating_prot) {
              fprintf(stderr, "<%d new auto-negotiating client connection\n",
-@@ -736,7 +736,7 @@ conn *conn_new(const int sfd, enum conn_states init_st
+@@ -772,7 +772,7 @@ conn *conn_new(const int sfd, enum conn_states init_st
          c->write = tcp_write;
      }
  
@@ -18,7 +18,7 @@
          c->try_read_command = try_read_command_udp;
      } else {
          switch (c->protocol) {
-@@ -820,7 +820,7 @@ static void conn_cleanup(conn *c) {
+@@ -871,7 +871,7 @@ static void conn_cleanup(conn *c) {
          c->sasl_conn = NULL;
      }
  
@@ -27,7 +27,7 @@
          conn_set_state(c, conn_read);
      }
  }
-@@ -1116,7 +1116,7 @@ bool resp_start(conn *c) {
+@@ -1171,7 +1171,7 @@ bool resp_start(conn *c) {
          c->resp->next = resp;
          c->resp = resp;
      }
@@ -36,7 +36,7 @@
          // need to hold on to some data for async responses.
          c->resp->request_id = c->request_id;
          c->resp->request_addr = c->request_addr;
-@@ -2046,7 +2046,7 @@ void process_stats_conns(ADD_STAT add_stats, void *c) 
+@@ -2166,7 +2166,7 @@ void process_stats_conns(ADD_STAT add_stats, void *c) 
               * output -- not worth the complexity of the locking that'd be
               * required to prevent it.
               */
@@ -45,7 +45,7 @@
                  APPEND_NUM_STAT(i, "UDP", "%s", "UDP");
              }
              if (conns[i]->state != conn_closed) {
-@@ -3242,7 +3242,7 @@ static void drive_machine(conn *c) {
+@@ -3361,7 +3361,7 @@ static void drive_machine(conn *c) {
              break;
  
          case conn_closing:
@@ -54,7 +54,7 @@
                  conn_cleanup(c);
              else
                  conn_close(c);
-@@ -3425,7 +3425,7 @@ static int server_socket(const char *interface,
+@@ -3552,7 +3552,7 @@ static int server_socket(const char *interface,
  #endif
  
          setsockopt(sfd, SOL_SOCKET, SO_REUSEADDR, (void *)&flags, sizeof(flags));
@@ -63,7 +63,7 @@
              maximize_sndbuf(sfd);
          } else {
              error = setsockopt(sfd, SOL_SOCKET, SO_KEEPALIVE, (void *)&flags, sizeof(flags));
-@@ -3480,7 +3480,7 @@ static int server_socket(const char *interface,
+@@ -3607,7 +3607,7 @@ static int server_socket(const char *interface,
              }
          }
  
diff --git a/databases/memcached/files/patch-xxhash.h b/databases/memcached/files/patch-xxhash.h
index f62d8def3ef3..e82ee3f35f2e 100644
--- a/databases/memcached/files/patch-xxhash.h
+++ b/databases/memcached/files/patch-xxhash.h
@@ -1,6 +1,6 @@
---- xxhash.h.orig	2021-03-31 12:18:19 UTC
+--- xxhash.h.orig	2022-08-26 03:34:25 UTC
 +++ xxhash.h
-@@ -2409,6 +2409,7 @@ XXH_PUBLIC_API XXH64_hash_t XXH64_hashFromCanonical(co
+@@ -2931,6 +2931,7 @@ enum XXH_VECTOR_TYPE /* fake enum */ {
  #    if defined(__GNUC__) && !defined(__APPLE_ALTIVEC__)
  #      define __APPLE_ALTIVEC__
  #    endif
diff --git a/databases/memcached/pkg-descr b/databases/memcached/pkg-descr
index c4dbada3ebf0..45f7bbaae582 100644
--- a/databases/memcached/pkg-descr
+++ b/databases/memcached/pkg-descr
@@ -1,5 +1,3 @@
 memcached is a high-performance, distributed memory object caching
 system, generic in nature, but intended for use in speeding up dynamic
 web applications by alleviating database load.
-
-WWW: http://memcached.org/
diff --git a/databases/memcached/pkg-plist b/databases/memcached/pkg-plist
index 5c1c13f2747c..d6b3be689503 100644
--- a/databases/memcached/pkg-plist
+++ b/databases/memcached/pkg-plist
@@ -2,7 +2,7 @@ bin/memcached
 bin/memcached-tool
 include/memcached/protocol_binary.h
 include/memcached/xxhash.h
-man/man1/memcached.1.gz
+share/man/man1/memcached.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/protocol-binary-range.txt
 %%PORTDOCS%%%%DOCSDIR%%/protocol-binary.txt
 %%PORTDOCS%%%%DOCSDIR%%/protocol.txt
diff --git a/databases/metabase/Makefile b/databases/metabase/Makefile
index f325542cea26..ae980ce59243 100644
--- a/databases/metabase/Makefile
+++ b/databases/metabase/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	metabase
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.40.1
+DISTVERSION=	0.41.5
 CATEGORIES=	databases java
 MASTER_SITES=	https://downloads.metabase.com/${DISTVERSIONPREFIX}${PORTVERSION}/
 DISTNAME=	${PORTNAME}
@@ -10,6 +10,7 @@ EXTRACT_ONLY=
 
 MAINTAINER=	daniel@morante.net
 COMMENT=	Simple and powerful analytics tool that supports multiple data stores
+WWW=		https://metabase.com/
 
 LICENSE=	AGPLv3
 
diff --git a/databases/metabase/distinfo b/databases/metabase/distinfo
index c1ff9286f085..ccc9f6800030 100644
--- a/databases/metabase/distinfo
+++ b/databases/metabase/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1626738677
-SHA256 (metabase-0.40.1/metabase.jar) = 972babb2ce60740729ba56323188bdf998e417dc1d9bac5642d7a429e4a793b1
-SIZE (metabase-0.40.1/metabase.jar) = 270293188
+TIMESTAMP = 1640189444
+SHA256 (metabase-0.41.5/metabase.jar) = 0c7d71cb571354334d5f238869ac861f33a2e20d19ba434515b663b9f63e5cb9
+SIZE (metabase-0.41.5/metabase.jar) = 274018114
diff --git a/databases/metabase/pkg-descr b/databases/metabase/pkg-descr
index 1597159de9c8..2953a908b498 100644
--- a/databases/metabase/pkg-descr
+++ b/databases/metabase/pkg-descr
@@ -5,5 +5,3 @@ make sense, whether that's a bar graph or a detailed table.
 Your questions can be saved for later, making it easy to come back to them,
 or you can group questions into great looking dashboards. Metabase also
 makes it easy to share questions and dashboards with the rest of your team.
-
-WWW: https://metabase.com/
diff --git a/databases/mongodb-tools/Makefile b/databases/mongodb-tools/Makefile
index 032ec08e7b23..9f24ef162c48 100644
--- a/databases/mongodb-tools/Makefile
+++ b/databases/mongodb-tools/Makefile
@@ -1,16 +1,15 @@
 PORTNAME=	mongodb-tools
-DISTVERSION=	100.4.1
+DISTVERSION=	100.9.4
+PORTREVISION=	3
 CATEGORIES=	databases
 
-MAINTAINER=	ronald-lists@klop.ws
+MAINTAINER=	ronald@FreeBSD.org
 COMMENT=	Tools for MongoDB 4.4.x and up
+WWW=		https://docs.mongodb.com/database-tools/
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
-ONLY_FOR_ARCHS=	aarch64 amd64 armv7 i386
-ONLY_FOR_ARCHS_REASON=	not yet ported to other architectures
-
 USES=		compiler:c++14-lang go localbase
 USE_GITHUB=	yes
 GH_ACCOUNT=	mongodb
@@ -19,7 +18,7 @@ GH_PROJECT=	mongo-tools
 GO_PKGNAME=	github.com/${GH_ACCOUNT}/${GH_PROJECT}
 GO_BUILDFLAGS=	-tags "${USE_MY_TAGS}"
 
-CONFLICTS_INSTALL=	mongodb36-tools mongodb4[02]-tools
+CONFLICTS_INSTALL=	mongodb42-tools
 
 OPTIONS_DEFINE=		DOCS
 OPTIONS_DEFAULT=	BSONDUMP MONGODUMP MONGOEXPORT MONGOFILES MONGOIMPORT \
@@ -50,7 +49,6 @@ MONGOSTAT_VARS=		go_target+=./mongostat/main:mongostat
 MONGOTOP_VARS=		go_target+=./mongotop/main:mongotop
 SASL_LIB_DEPENDS=	libsasl2.so:security/cyrus-sasl2
 SASL_USE=		my_tags=sasl
-SSL_USES=		ssl
 SSL_USE=		my_tags=ssl
 
 post-install-DOCS-on:
diff --git a/databases/mongodb-tools/distinfo b/databases/mongodb-tools/distinfo
index 8eca0f0f257f..ca065d01cfaa 100644
--- a/databases/mongodb-tools/distinfo
+++ b/databases/mongodb-tools/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1627152431
-SHA256 (mongodb-mongo-tools-100.4.1_GH0.tar.gz) = 974ca9adb5d348767723bf49db840500196046acdb8c0349632b495653faff91
-SIZE (mongodb-mongo-tools-100.4.1_GH0.tar.gz) = 3793073
+TIMESTAMP = 1702043841
+SHA256 (mongodb-mongo-tools-100.9.4_GH0.tar.gz) = 513c8471f7a733f0582b521330ccada326cc01f47da489bda7b5b42959564385
+SIZE (mongodb-mongo-tools-100.9.4_GH0.tar.gz) = 4742913
diff --git a/databases/mongodb-tools/pkg-descr b/databases/mongodb-tools/pkg-descr
index d08897727372..88051a67f638 100644
--- a/databases/mongodb-tools/pkg-descr
+++ b/databases/mongodb-tools/pkg-descr
@@ -11,5 +11,4 @@ Useful utilities for managing a MongoDB instance written in Go.
 - mongofiles - Read, write, delete, or update files in GridFS
 - mongotop - Monitor read/write activity on a mongo server
 
-WWW: https://github.com/mongodb/mongo-tools
-WWW: https://docs.mongodb.com/database-tools/
+See also: https://github.com/mongodb/mongo-tools
diff --git a/databases/mongodb36-tools/Makefile b/databases/mongodb36-tools/Makefile
deleted file mode 100644
index 9824ccc54658..000000000000
--- a/databases/mongodb36-tools/Makefile
+++ /dev/null
@@ -1,73 +0,0 @@
-PORTNAME=	mongodb36-tools
-PORTVERSION=	3.6.3
-DISTVERSIONPREFIX=	r
-CATEGORIES=	databases net
-
-MAINTAINER=	numisemis@yahoo.com
-COMMENT=	Tools for MongoDB
-
-LICENSE=	APACHE20
-
-ONLY_FOR_ARCHS=	amd64 i386
-ONLY_FOR_ARCHS_REASON=	"not yet ported to anything other than i386 and amd64"
-BROKEN_SSL=	openssl libressl libressl-devel
-BROKEN_SSL_REASON_openssl=	variable has incomplete type 'BIO_METHOD' (aka 'struct bio_method_st')
-BROKEN_SSL_REASON_libressl=		could not determine kind of name for C.EVP_sha
-BROKEN_SSL_REASON_libressl-devel=	${BROKEN_SSL_REASON_libressl}
-
-CONFLICTS_INSTALL=	mongodb mongodb4[02] mongodb4[02]-tools
-
-USES=	go localbase
-
-USE_GITHUB=	yes
-GH_ACCOUNT=	mongodb
-GH_PROJECT=	mongo-tools
-
-OPTIONS_DEFINE=	DOCS SSL SASL
-OPTIONS_DEFAULT=	SSL SASL
-
-SASL_USE=	my_tags=sasl
-SASL_LIB_DEPENDS=	libsasl2.so:security/cyrus-sasl2
-
-SSL_USES=	ssl
-SSL_USE=	my_tags=ssl
-
-# Go is not our friend. Without below, ignores user-supplied flags.
-MAKE_CMD=	${LOCALBASE}/bin/go build
-MAKE_ENV=	GOPATH="${WRKSRC}/.gopath:${WRKSRC}/vendor" \
-		CGO_CFLAGS="${CFLAGS}" CGO_CPPFLAGS="${CPPFLAGS}" \
-		CGO_CXXFLAGS="${CXXFLAGS}" CGO_LDFLAGS="-L${LOCALBASE}/lib ${LDFLAGS}" \
-		GO111MODULE=off
-
-MY_TAGS=	-tags "${USE_MY_TAGS}"
-
-.include <bsd.port.pre.mk>
-
-.if ${SSL_DEFAULT} == base
-BROKEN_FreeBSD_12=	variable has incomplete type 'BIO_METHOD' (aka 'struct bio_method_st')
-BROKEN_FreeBSD_13=	variable has incomplete type 'BIO_METHOD' (aka 'struct bio_method_st')
-.endif
-
-post-patch:
-	@cd ${WRKSRC} ; ${MKDIR} ${WRKSRC}/.gopath/src/github.com/${GH_ACCOUNT} ; \
-		${LN} -sf ${WRKSRC} ${WRKSRC}/.gopath/src/github.com/${GH_ACCOUNT}/${GH_PROJECT}
-
-do-build:
-.for x in bsondump mongostat mongofiles mongoexport mongoimport mongorestore mongodump mongotop
-	${SETENV} ${MAKE_ENV} ${MAKE_CMD} \
-		-o ${WRKSRC}/bin/${x} ${MY_TAGS}\
-		-ldflags "-X github.com/${GH_ACCOUNT}/${GH_PROJECT}/common/options.Gitspec=${GH_TAGNAME}"\
-		${WRKSRC}/${x}/main/${x}.go
-.endfor
-
-do-install:
-.for x in bsondump mongostat mongofiles mongoexport mongoimport mongorestore mongodump mongotop
-	${INSTALL_PROGRAM} ${WRKSRC}/bin/${x} ${STAGEDIR}${PREFIX}/bin/
-.endfor
-
-	${MKDIR} ${STAGEDIR}${DOCSDIR}
-.for x in LICENSE.md README.md THIRD-PARTY-NOTICES
-	${INSTALL_MAN} ${WRKSRC}/${x} ${STAGEDIR}${DOCSDIR}
-.endfor
-
-.include <bsd.port.post.mk>
diff --git a/databases/mongodb36-tools/distinfo b/databases/mongodb36-tools/distinfo
deleted file mode 100644
index d39a0ad05915..000000000000
--- a/databases/mongodb36-tools/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1522662593
-SHA256 (mongodb-mongo-tools-r3.6.3_GH0.tar.gz) = d97461a21227a3563e3e362dfda330becff48a901ecb3309241f607c7c8900af
-SIZE (mongodb-mongo-tools-r3.6.3_GH0.tar.gz) = 4693833
diff --git a/databases/mongodb36-tools/files/patch-vendor_src_github.com_spacemonkeygo_openssl_build.go b/databases/mongodb36-tools/files/patch-vendor_src_github.com_spacemonkeygo_openssl_build.go
deleted file mode 100644
index 84c06e3f3083..000000000000
--- a/databases/mongodb36-tools/files/patch-vendor_src_github.com_spacemonkeygo_openssl_build.go
+++ /dev/null
@@ -1,10 +0,0 @@
---- vendor/src/github.com/spacemonkeygo/openssl/build.go.orig	2017-07-31 19:00:22 UTC
-+++ vendor/src/github.com/spacemonkeygo/openssl/build.go
-@@ -19,6 +19,7 @@ package openssl
- // #cgo linux pkg-config: openssl
- // #cgo windows CFLAGS: -DWIN32_LEAN_AND_MEAN
- // #cgo windows LDFLAGS: -lcrypt32
-+// #cgo freebsd LDFLAGS: -lssl -lcrypto
- // #cgo darwin CFLAGS: -Wno-deprecated-declarations
- // #cgo darwin LDFLAGS: -lssl -lcrypto -framework CoreFoundation -framework Foundation -framework Security
- import "C"
diff --git a/databases/mongodb36-tools/files/patch-vendor_src_github.com_spacemonkeygo_openssl_init__posix.go b/databases/mongodb36-tools/files/patch-vendor_src_github.com_spacemonkeygo_openssl_init__posix.go
deleted file mode 100644
index 17dc773143bf..000000000000
--- a/databases/mongodb36-tools/files/patch-vendor_src_github.com_spacemonkeygo_openssl_init__posix.go
+++ /dev/null
@@ -1,11 +0,0 @@
---- vendor/src/github.com/spacemonkeygo/openssl/init_posix.go.orig	2016-01-03 17:52:58 UTC
-+++ vendor/src/github.com/spacemonkeygo/openssl/init_posix.go
-@@ -12,7 +12,7 @@
- // See the License for the specific language governing permissions and
- // limitations under the License.
- 
--// +build linux darwin cgo
-+// +build linux darwin freebsd cgo
- // +build !windows
- 
- package openssl
diff --git a/databases/mongodb36-tools/pkg-descr b/databases/mongodb36-tools/pkg-descr
deleted file mode 100644
index a0deecd70c72..000000000000
--- a/databases/mongodb36-tools/pkg-descr
+++ /dev/null
@@ -1,6 +0,0 @@
-Since MongoDB 3.2, the tools bsondump, mongoimport, mongoexport, mongodump,
-mongorestore, mongostat, mongofiles and mongotop have been placed
-in a separate package and rewritten in Go. These are useful utilities for
-managing a MongoDB instance.
-
-WWW: https://github.com/mongodb/mongo-tools
diff --git a/databases/mongodb36-tools/pkg-plist b/databases/mongodb36-tools/pkg-plist
deleted file mode 100644
index cb8a263ca9bc..000000000000
--- a/databases/mongodb36-tools/pkg-plist
+++ /dev/null
@@ -1,11 +0,0 @@
-bin/bsondump
-bin/mongodump
-bin/mongoexport
-bin/mongofiles
-bin/mongoimport
-bin/mongorestore
-bin/mongostat
-bin/mongotop
-%%PORTDOCS%%%%DOCSDIR%%/LICENSE.md
-%%PORTDOCS%%%%DOCSDIR%%/README.md
-%%PORTDOCS%%%%DOCSDIR%%/THIRD-PARTY-NOTICES
diff --git a/databases/mongodb36/Makefile b/databases/mongodb36/Makefile
deleted file mode 100644
index 08bc75c50f91..000000000000
--- a/databases/mongodb36/Makefile
+++ /dev/null
@@ -1,80 +0,0 @@
-PORTNAME=	mongodb
-DISTVERSIONPREFIX=	r
-DISTVERSION=	3.6.23
-CATEGORIES=	databases net
-MASTER_SITES=	https://fastdl.mongodb.org/src/ \
-		http://fastdl.mongodb.org/src/
-PKGNAMESUFFIX=	${PORTVERSION:R:S/.//}
-DISTNAME=	mongodb-src-${DISTVERSIONPREFIX}${DISTVERSION}
-
-MAINTAINER=	dev@dudu.ro
-COMMENT=	Distributed document-oriented "NoSQL" database
-
-# mongodb is SSPLv1, C++ driver is APACHE20
-LICENSE=	SSPLv1 APACHE20
-LICENSE_COMB=	multi
-LICENSE_NAME_SSPLv1=	Server Side Public License Version 1
-LICENSE_FILE_SSPLv1=	${WRKSRC}/LICENSE-Community.txt
-LICENSE_PERMS_SSPLv1=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
-
-ONLY_FOR_ARCHS=	aarch64 amd64
-ONLY_FOR_ARCHS_REASON=	"Only supported on amd64 and aarch64 (i386 deprecated in v3)"
-
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cheetah3>0:devel/py-cheetah3@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}yaml>=3.11:devel/py-yaml@${PY_FLAVOR}
-LIB_DEPENDS=	libboost_system.so:devel/boost-libs \
-		libpcre.so:devel/pcre \
-		libsnappy.so:archivers/snappy
-
-USES=		compiler:c++14-lang cpe python:3.5+,build scons shebangfix
-USE_RC_SUBR=	mongod
-
-CONFLICTS_INSTALL=	mongodb4[024]
-
-SHEBANG_FILES=	src/mongo/installer/compass/install_compass.in
-python_OLD_CMD=	@python_interpreter@
-MAKE_ARGS=	--prefix=${STAGEDIR}${PREFIX} \
-		--use-system-pcre --use-system-snappy \
-		--use-system-boost --use-system-zlib \
-		--cxx-std=14 --libc++ \
-		--runtime-hardening=on \
-		--disable-warnings-as-errors \
-		VERBOSE=on
-
-USERS=		mongodb
-GROUPS=		mongodb
-
-OPTIONS_DEFINE=		SASL SSL
-OPTIONS_DEFAULT=	SASL SSL
-
-SASL_LIB_DEPENDS=	libsasl2.so:security/cyrus-sasl2
-SASL_MAKE_ARGS=		--use-sasl-client
-
-SSL_USES=	ssl
-SSL_MAKE_ARGS=	--ssl
-
-.include <bsd.port.options.mk>
-
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1200057
-SUB_LIST+=	LEGACY_LIMITS="@comment " MODERN_LIMITS=""
-.else
-SUB_LIST+=	LEGACY_LIMITS="" MODERN_LIMITS="@comment "
-.endif
-
-.if ${ARCH} == aarch64
-EXTRA_PATCHES=	${FILESDIR}/aarch64
-.endif
-
-ALL_TARGET=	core
-
-PORTSCOUT=	limitw:1,even
-
-CPE_PRODUCT=	mongodb
-
-post-install:
-.for f in mongo mongod mongoperf mongos
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${f}
-.endfor
-	${CP} ${WRKSRC}/rpm/mongod.conf ${STAGEDIR}${PREFIX}/etc/mongodb.conf.sample
-
-.include <bsd.port.mk>
diff --git a/databases/mongodb36/distinfo b/databases/mongodb36/distinfo
deleted file mode 100644
index 69d2d4a9758c..000000000000
--- a/databases/mongodb36/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1615977097
-SHA256 (mongodb-src-r3.6.23.tar.gz) = 109a487ab5b8cdc189bc77ea27ae5f1bcc8db0b465527464bd87c2fa3928149e
-SIZE (mongodb-src-r3.6.23.tar.gz) = 41087578
diff --git a/databases/mongodb36/files/aarch64/patch-src_third__party_IntelRDFPMathLib20U1_LIBRARY_src_bid__functions.h b/databases/mongodb36/files/aarch64/patch-src_third__party_IntelRDFPMathLib20U1_LIBRARY_src_bid__functions.h
deleted file mode 100644
index c0bbc7a702e4..000000000000
--- a/databases/mongodb36/files/aarch64/patch-src_third__party_IntelRDFPMathLib20U1_LIBRARY_src_bid__functions.h
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/third_party/IntelRDFPMathLib20U1/LIBRARY/src/bid_functions.h.orig	2018-12-13 15:47:17 UTC
-+++ src/third_party/IntelRDFPMathLib20U1/LIBRARY/src/bid_functions.h
-@@ -42,7 +42,7 @@
- #include <ctype.h>

- 

- // Fix system header issue on Sun solaris and define required type by ourselves

--#if !defined(_WCHAR_T) && !defined(_WCHAR_T_DEFINED) && !defined(__QNX__)

-+#if !defined(_WCHAR_T) && !defined(_WCHAR_T_DEFINED) && !defined(__QNX__) && !defined(_WCHAR_T_DECLARED)

- typedef int   wchar_t;

- #endif

- 

-@@ -150,7 +150,7 @@ typedef BID_UINT128 _Quad;

- ///////////////////////////////////////////////////////

- //  This section may move to fenv_support.h

- 

--#if !defined(__FENV_H_INCLUDED) && !defined (_FENV_H) && !defined(_FENV_INCLUDED)          /* Otherwise we already defined fexcept_t type */

-+#if !defined(__FENV_H_INCLUDED) && !defined (_FENV_H) && !defined(_FENV_INCLUDED) && !defined (_FENV_H_)          /* Otherwise we already defined fexcept_t type */

- #if defined(__ECL) || defined(__ECC)            /* Intel(R) Itanium(R) architecture */

- /* Default 64-bit Floating Point Status Register   */

- #if defined(__linux__)

diff --git a/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_SConscript b/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_SConscript
deleted file mode 100644
index 5a19c5616a34..000000000000
--- a/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_SConscript
+++ /dev/null
@@ -1,18 +0,0 @@
---- src/third_party/mozjs-45/SConscript.orig	2019-01-18 20:35:17 UTC
-+++ src/third_party/mozjs-45/SConscript
-@@ -97,7 +97,6 @@ env.Prepend(CPPPATH=[
- sources = [
-     "extract/js/src/builtin/RegExp.cpp",
-     "extract/js/src/frontend/Parser.cpp",
--    "extract/js/src/jit/ProcessExecutableMemory.cpp",
-     "extract/js/src/jsarray.cpp",
-     "extract/js/src/jsatom.cpp",
-     "extract/js/src/jsmath.cpp",
-@@ -112,6 +111,7 @@ sources = [
- 
- if env['TARGET_ARCH'] == 'x86_64' and not env.TargetOSIs('solaris'):
-     sources.extend([
-+        "extract/js/src/jit/ProcessExecutableMemory.cpp",
-         "extract/js/src/jit/x86-shared/Disassembler-x86-shared.cpp",
-     ])
- 
diff --git a/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src0.cpp b/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src0.cpp
deleted file mode 100644
index 7447e35fc0e6..000000000000
--- a/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src0.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src0.cpp.orig	2019-01-18 22:48:17 UTC
-+++ src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src0.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "asmjs/AsmJSFrameIterator.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "asmjs/AsmJSFrameIterator.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "asmjs/AsmJSFrameIterator.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "asmjs/AsmJSLink.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "asmjs/AsmJSLink.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "asmjs/AsmJSLink.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "asmjs/AsmJSModule.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "asmjs/AsmJSModule.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "asmjs/AsmJSModule.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "asmjs/AsmJSSignalHandlers.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "asmjs/AsmJSSignalHandlers.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "asmjs/AsmJSSignalHandlers.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "asmjs/AsmJSValidate.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "asmjs/AsmJSValidate.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "asmjs/AsmJSValidate.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "asmjs/WasmGenerator.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "asmjs/WasmGenerator.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "asmjs/WasmGenerator.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src1.cpp b/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src1.cpp
deleted file mode 100644
index 3bc2df08b0be..000000000000
--- a/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src1.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src1.cpp.orig	2019-01-18 22:48:17 UTC
-+++ src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src1.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "asmjs/WasmIonCompile.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "asmjs/WasmIonCompile.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "asmjs/WasmIonCompile.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "asmjs/WasmStubs.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "asmjs/WasmStubs.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "asmjs/WasmStubs.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "builtin/AtomicsObject.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "builtin/AtomicsObject.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "builtin/AtomicsObject.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "builtin/Eval.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "builtin/Eval.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "builtin/Eval.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "builtin/Intl.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "builtin/Intl.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "builtin/Intl.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "builtin/MapObject.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "builtin/MapObject.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "builtin/MapObject.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src10.cpp b/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src10.cpp
deleted file mode 100644
index 9dd333c2b0a5..000000000000
--- a/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src10.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src10.cpp.orig	2019-01-18 22:48:17 UTC
-+++ src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src10.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "jit/BaselineFrameInfo.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/BaselineFrameInfo.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/BaselineFrameInfo.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/BaselineIC.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/BaselineIC.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/BaselineIC.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/BaselineInspector.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/BaselineInspector.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/BaselineInspector.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/BaselineJIT.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/BaselineJIT.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/BaselineJIT.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/BitSet.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/BitSet.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/BitSet.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/BytecodeAnalysis.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/BytecodeAnalysis.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/BytecodeAnalysis.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src11.cpp b/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src11.cpp
deleted file mode 100644
index b9474a34514b..000000000000
--- a/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src11.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src11.cpp.orig	2019-01-18 22:48:17 UTC
-+++ src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src11.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "jit/C1Spewer.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/C1Spewer.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/C1Spewer.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/CodeGenerator.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/CodeGenerator.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/CodeGenerator.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/CompileWrappers.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/CompileWrappers.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/CompileWrappers.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/Disassembler.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/Disassembler.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/Disassembler.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/EagerSimdUnbox.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/EagerSimdUnbox.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/EagerSimdUnbox.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/EdgeCaseAnalysis.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/EdgeCaseAnalysis.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/EdgeCaseAnalysis.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src12.cpp b/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src12.cpp
deleted file mode 100644
index 963d167804d9..000000000000
--- a/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src12.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src12.cpp.orig	2019-01-18 22:48:17 UTC
-+++ src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src12.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "jit/EffectiveAddressAnalysis.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/EffectiveAddressAnalysis.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/EffectiveAddressAnalysis.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/ExecutableAllocator.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/ExecutableAllocator.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/ExecutableAllocator.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/InstructionReordering.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/InstructionReordering.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/InstructionReordering.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/Ion.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/Ion.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/Ion.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/IonAnalysis.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/IonAnalysis.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/IonAnalysis.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/IonBuilder.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/IonBuilder.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/IonBuilder.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src13.cpp b/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src13.cpp
deleted file mode 100644
index b65b58bcc20a..000000000000
--- a/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src13.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src13.cpp.orig	2019-01-18 22:48:17 UTC
-+++ src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src13.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "jit/IonCaches.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/IonCaches.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/IonCaches.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/IonOptimizationLevels.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/IonOptimizationLevels.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/IonOptimizationLevels.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/JSONSpewer.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/JSONSpewer.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/JSONSpewer.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/JitFrames.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/JitFrames.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/JitFrames.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/JitOptions.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/JitOptions.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/JitOptions.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/JitSpewer.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/JitSpewer.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/JitSpewer.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src14.cpp b/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src14.cpp
deleted file mode 100644
index 3c06d8f9dcfb..000000000000
--- a/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src14.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src14.cpp.orig	2019-01-18 22:48:17 UTC
-+++ src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src14.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "jit/JitcodeMap.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/JitcodeMap.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/JitcodeMap.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/LICM.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/LICM.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/LICM.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/LIR.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/LIR.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/LIR.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/LoopUnroller.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/LoopUnroller.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/LoopUnroller.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/Lowering.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/Lowering.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/Lowering.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/MCallOptimize.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/MCallOptimize.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/MCallOptimize.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src15.cpp b/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src15.cpp
deleted file mode 100644
index 816eb4adc1a6..000000000000
--- a/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src15.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src15.cpp.orig	2019-01-18 22:48:17 UTC
-+++ src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src15.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "jit/MIR.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/MIR.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/MIR.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/MIRGraph.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/MIRGraph.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/MIRGraph.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/MacroAssembler.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/MacroAssembler.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/MacroAssembler.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/MoveResolver.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/MoveResolver.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/MoveResolver.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/OptimizationTracking.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/OptimizationTracking.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/OptimizationTracking.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/PerfSpewer.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/PerfSpewer.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/PerfSpewer.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src16.cpp b/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src16.cpp
deleted file mode 100644
index 26fe3aa060dc..000000000000
--- a/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src16.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src16.cpp.orig	2019-01-18 22:48:17 UTC
-+++ src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src16.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "jit/ProcessExecutableMemory.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/ProcessExecutableMemory.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/ProcessExecutableMemory.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/RangeAnalysis.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/RangeAnalysis.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/RangeAnalysis.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/Recover.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/Recover.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/Recover.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/RegisterAllocator.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/RegisterAllocator.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/RegisterAllocator.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/RematerializedFrame.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/RematerializedFrame.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/RematerializedFrame.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/Safepoints.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/Safepoints.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/Safepoints.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src17.cpp b/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src17.cpp
deleted file mode 100644
index 2038f8cd00ac..000000000000
--- a/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src17.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src17.cpp.orig	2019-01-18 22:48:17 UTC
-+++ src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src17.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "jit/ScalarReplacement.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/ScalarReplacement.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/ScalarReplacement.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/SharedIC.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/SharedIC.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/SharedIC.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/Sink.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/Sink.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/Sink.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/Snapshots.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/Snapshots.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/Snapshots.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/StupidAllocator.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/StupidAllocator.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/StupidAllocator.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/TypePolicy.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/TypePolicy.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/TypePolicy.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src18.cpp b/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src18.cpp
deleted file mode 100644
index 1ada547bd5b6..000000000000
--- a/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src18.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src18.cpp.orig	2019-01-18 22:48:17 UTC
-+++ src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src18.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "jit/TypedObjectPrediction.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/TypedObjectPrediction.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/TypedObjectPrediction.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/VMFunctions.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/VMFunctions.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/VMFunctions.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/ValueNumbering.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/ValueNumbering.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/ValueNumbering.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/none/Trampoline-none.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/none/Trampoline-none.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/none/Trampoline-none.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/shared/BaselineCompiler-shared.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/shared/BaselineCompiler-shared.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/shared/BaselineCompiler-shared.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/shared/CodeGenerator-shared.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/shared/CodeGenerator-shared.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/shared/CodeGenerator-shared.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src19.cpp b/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src19.cpp
deleted file mode 100644
index cbd28046fca1..000000000000
--- a/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src19.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src19.cpp.orig	2019-01-18 22:48:17 UTC
-+++ src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src19.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "jit/shared/Lowering-shared.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/shared/Lowering-shared.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/shared/Lowering-shared.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jsalloc.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jsalloc.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jsalloc.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jsapi.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jsapi.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jsapi.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jsbool.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jsbool.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jsbool.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jscntxt.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jscntxt.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jscntxt.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jscompartment.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jscompartment.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jscompartment.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src2.cpp b/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src2.cpp
deleted file mode 100644
index 81ea41928119..000000000000
--- a/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src2.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src2.cpp.orig	2019-01-18 22:48:17 UTC
-+++ src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src2.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "builtin/ModuleObject.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "builtin/ModuleObject.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "builtin/ModuleObject.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "builtin/Object.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "builtin/Object.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "builtin/Object.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "builtin/Profilers.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "builtin/Profilers.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "builtin/Profilers.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "builtin/Reflect.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "builtin/Reflect.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "builtin/Reflect.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "builtin/ReflectParse.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "builtin/ReflectParse.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "builtin/ReflectParse.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "builtin/SIMD.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "builtin/SIMD.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "builtin/SIMD.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src20.cpp b/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src20.cpp
deleted file mode 100644
index 742426e01211..000000000000
--- a/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src20.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src20.cpp.orig	2019-01-18 22:48:17 UTC
-+++ src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src20.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "jsdate.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jsdate.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jsdate.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jsdtoa.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jsdtoa.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jsdtoa.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jsexn.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jsexn.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jsexn.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jsfriendapi.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jsfriendapi.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jsfriendapi.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jsfun.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jsfun.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jsfun.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jsgc.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jsgc.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jsgc.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src21.cpp b/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src21.cpp
deleted file mode 100644
index 2d7e591192e7..000000000000
--- a/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src21.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src21.cpp.orig	2019-01-18 22:48:17 UTC
-+++ src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src21.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "jsiter.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jsiter.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jsiter.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jsnativestack.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jsnativestack.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jsnativestack.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jsnum.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jsnum.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jsnum.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jsobj.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jsobj.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jsobj.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "json.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "json.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "json.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jsopcode.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jsopcode.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jsopcode.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src22.cpp b/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src22.cpp
deleted file mode 100644
index d5575e9cf371..000000000000
--- a/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src22.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src22.cpp.orig	2019-01-18 22:48:17 UTC
-+++ src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src22.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "jsprf.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jsprf.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jsprf.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jspropertytree.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jspropertytree.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jspropertytree.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jsscript.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jsscript.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jsscript.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jsstr.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jsstr.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jsstr.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jswatchpoint.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jswatchpoint.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jswatchpoint.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jsweakmap.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jsweakmap.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jsweakmap.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src23.cpp b/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src23.cpp
deleted file mode 100644
index e4f39b8ae2bb..000000000000
--- a/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src23.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src23.cpp.orig	2019-01-18 22:48:17 UTC
-+++ src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src23.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "perf/jsperf.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "perf/jsperf.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "perf/jsperf.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "proxy/BaseProxyHandler.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "proxy/BaseProxyHandler.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "proxy/BaseProxyHandler.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "proxy/CrossCompartmentWrapper.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "proxy/CrossCompartmentWrapper.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "proxy/CrossCompartmentWrapper.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "proxy/DeadObjectProxy.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "proxy/DeadObjectProxy.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "proxy/DeadObjectProxy.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "proxy/DirectProxyHandler.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "proxy/DirectProxyHandler.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "proxy/DirectProxyHandler.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "proxy/OpaqueCrossCompartmentWrapper.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "proxy/OpaqueCrossCompartmentWrapper.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "proxy/OpaqueCrossCompartmentWrapper.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src24.cpp b/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src24.cpp
deleted file mode 100644
index 09aa08d66d26..000000000000
--- a/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src24.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src24.cpp.orig	2019-01-18 22:48:17 UTC
-+++ src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src24.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "proxy/Proxy.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "proxy/Proxy.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "proxy/Proxy.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "proxy/ScriptedDirectProxyHandler.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "proxy/ScriptedDirectProxyHandler.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "proxy/ScriptedDirectProxyHandler.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "proxy/ScriptedIndirectProxyHandler.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "proxy/ScriptedIndirectProxyHandler.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "proxy/ScriptedIndirectProxyHandler.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "proxy/SecurityWrapper.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "proxy/SecurityWrapper.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "proxy/SecurityWrapper.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "proxy/Wrapper.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "proxy/Wrapper.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "proxy/Wrapper.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/ArgumentsObject.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/ArgumentsObject.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/ArgumentsObject.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src25.cpp b/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src25.cpp
deleted file mode 100644
index a495f144a4bd..000000000000
--- a/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src25.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src25.cpp.orig	2019-01-18 22:48:17 UTC
-+++ src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src25.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "vm/ArrayBufferObject.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/ArrayBufferObject.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/ArrayBufferObject.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/CallNonGenericMethod.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/CallNonGenericMethod.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/CallNonGenericMethod.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/CharacterEncoding.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/CharacterEncoding.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/CharacterEncoding.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/CodeCoverage.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/CodeCoverage.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/CodeCoverage.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/Compression.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/Compression.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/Compression.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/DateTime.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/DateTime.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/DateTime.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src26.cpp b/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src26.cpp
deleted file mode 100644
index a48c7b4354ba..000000000000
--- a/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src26.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src26.cpp.orig	2019-01-18 22:48:17 UTC
-+++ src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src26.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "vm/Debugger.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/Debugger.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/Debugger.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/DebuggerMemory.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/DebuggerMemory.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/DebuggerMemory.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/ErrorObject.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/ErrorObject.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/ErrorObject.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/ForOfIterator.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/ForOfIterator.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/ForOfIterator.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/GeneratorObject.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/GeneratorObject.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/GeneratorObject.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/GlobalObject.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/GlobalObject.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/GlobalObject.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src27.cpp b/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src27.cpp
deleted file mode 100644
index 3c86bb4e4860..000000000000
--- a/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src27.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src27.cpp.orig	2019-01-18 22:48:17 UTC
-+++ src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src27.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "vm/HelperThreads.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/HelperThreads.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/HelperThreads.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/Id.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/Id.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/Id.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/Interpreter.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/Interpreter.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/Interpreter.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/JSONParser.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/JSONParser.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/JSONParser.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/MemoryMetrics.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/MemoryMetrics.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/MemoryMetrics.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/Monitor.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/Monitor.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/Monitor.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src28.cpp b/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src28.cpp
deleted file mode 100644
index 9c71115c00c0..000000000000
--- a/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src28.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src28.cpp.orig	2019-01-18 22:48:17 UTC
-+++ src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src28.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "vm/NativeObject.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/NativeObject.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/NativeObject.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/ObjectGroup.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/ObjectGroup.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/ObjectGroup.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/PIC.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/PIC.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/PIC.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/PosixNSPR.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/PosixNSPR.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/PosixNSPR.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/Printer.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/Printer.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/Printer.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/Probes.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/Probes.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/Probes.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src29.cpp b/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src29.cpp
deleted file mode 100644
index fa188e4bbe64..000000000000
--- a/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src29.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src29.cpp.orig	2019-01-18 22:48:17 UTC
-+++ src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src29.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "vm/ProxyObject.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/ProxyObject.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/ProxyObject.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/ReceiverGuard.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/ReceiverGuard.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/ReceiverGuard.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/RegExpObject.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/RegExpObject.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/RegExpObject.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/RegExpStatics.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/RegExpStatics.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/RegExpStatics.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/Runtime.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/Runtime.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/Runtime.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/SPSProfiler.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/SPSProfiler.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/SPSProfiler.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src3.cpp b/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src3.cpp
deleted file mode 100644
index ac11b2e77a32..000000000000
--- a/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src3.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src3.cpp.orig	2019-01-18 22:48:17 UTC
-+++ src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src3.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "builtin/SymbolObject.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "builtin/SymbolObject.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "builtin/SymbolObject.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "builtin/TestingFunctions.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "builtin/TestingFunctions.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "builtin/TestingFunctions.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "builtin/TypedObject.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "builtin/TypedObject.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "builtin/TypedObject.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "builtin/WeakMapObject.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "builtin/WeakMapObject.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "builtin/WeakMapObject.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "builtin/WeakSetObject.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "builtin/WeakSetObject.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "builtin/WeakSetObject.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "devtools/sharkctl.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "devtools/sharkctl.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "devtools/sharkctl.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src30.cpp b/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src30.cpp
deleted file mode 100644
index 31b1a180bd26..000000000000
--- a/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src30.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src30.cpp.orig	2019-01-18 22:48:17 UTC
-+++ src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src30.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "vm/SavedStacks.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/SavedStacks.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/SavedStacks.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/ScopeObject.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/ScopeObject.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/ScopeObject.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/SelfHosting.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/SelfHosting.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/SelfHosting.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/Shape.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/Shape.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/Shape.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/SharedArrayObject.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/SharedArrayObject.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/SharedArrayObject.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/Stack.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/Stack.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/Stack.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src31.cpp b/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src31.cpp
deleted file mode 100644
index 6dedacb8aa84..000000000000
--- a/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src31.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src31.cpp.orig	2019-01-18 22:48:17 UTC
-+++ src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src31.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "vm/Stopwatch.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/Stopwatch.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/Stopwatch.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/String.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/String.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/String.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/StringBuffer.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/StringBuffer.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/StringBuffer.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/StructuredClone.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/StructuredClone.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/StructuredClone.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/Symbol.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/Symbol.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/Symbol.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/TaggedProto.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/TaggedProto.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/TaggedProto.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src32.cpp b/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src32.cpp
deleted file mode 100644
index cf2c9a3453c5..000000000000
--- a/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src32.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src32.cpp.orig	2019-01-18 22:48:17 UTC
-+++ src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src32.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "vm/Time.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/Time.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/Time.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/TypeInference.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/TypeInference.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/TypeInference.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/TypedArrayObject.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/TypedArrayObject.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/TypedArrayObject.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/UbiNode.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/UbiNode.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/UbiNode.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/UbiNodeCensus.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/UbiNodeCensus.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/UbiNodeCensus.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/UnboxedObject.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/UnboxedObject.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/UnboxedObject.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src33.cpp b/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src33.cpp
deleted file mode 100644
index e3be88056d29..000000000000
--- a/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src33.cpp
+++ /dev/null
@@ -1,41 +0,0 @@
---- src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src33.cpp.orig	2019-01-18 22:48:18 UTC
-+++ src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src33.cpp
-@@ -0,0 +1,37 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "vm/Unicode.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/Unicode.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/Unicode.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/Value.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/Value.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/Value.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/WeakMapPtr.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/WeakMapPtr.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/WeakMapPtr.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/Xdr.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/Xdr.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/Xdr.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src4.cpp b/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src4.cpp
deleted file mode 100644
index 76228a440849..000000000000
--- a/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src4.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src4.cpp.orig	2019-01-18 22:48:18 UTC
-+++ src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src4.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "ds/LifoAlloc.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "ds/LifoAlloc.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "ds/LifoAlloc.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "frontend/BytecodeCompiler.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "frontend/BytecodeCompiler.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "frontend/BytecodeCompiler.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "frontend/BytecodeEmitter.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "frontend/BytecodeEmitter.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "frontend/BytecodeEmitter.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "frontend/FoldConstants.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "frontend/FoldConstants.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "frontend/FoldConstants.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "frontend/NameFunctions.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "frontend/NameFunctions.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "frontend/NameFunctions.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "frontend/ParseMaps.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "frontend/ParseMaps.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "frontend/ParseMaps.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src5.cpp b/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src5.cpp
deleted file mode 100644
index 857e9272b201..000000000000
--- a/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src5.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src5.cpp.orig	2019-01-18 22:48:18 UTC
-+++ src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src5.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "frontend/ParseNode.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "frontend/ParseNode.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "frontend/ParseNode.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "frontend/TokenStream.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "frontend/TokenStream.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "frontend/TokenStream.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "gc/Allocator.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "gc/Allocator.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "gc/Allocator.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "gc/Barrier.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "gc/Barrier.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "gc/Barrier.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "gc/GCTrace.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "gc/GCTrace.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "gc/GCTrace.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "gc/Iteration.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "gc/Iteration.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "gc/Iteration.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src6.cpp b/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src6.cpp
deleted file mode 100644
index ca87a387e54a..000000000000
--- a/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src6.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src6.cpp.orig	2019-01-18 22:48:18 UTC
-+++ src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src6.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "gc/Marking.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "gc/Marking.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "gc/Marking.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "gc/Memory.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "gc/Memory.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "gc/Memory.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "gc/MemoryProfiler.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "gc/MemoryProfiler.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "gc/MemoryProfiler.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "gc/Nursery.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "gc/Nursery.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "gc/Nursery.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "gc/RootMarking.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "gc/RootMarking.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "gc/RootMarking.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "gc/Statistics.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "gc/Statistics.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "gc/Statistics.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src7.cpp b/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src7.cpp
deleted file mode 100644
index 7a98bfe58b7f..000000000000
--- a/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src7.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src7.cpp.orig	2019-01-18 22:48:18 UTC
-+++ src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src7.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "gc/Tracer.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "gc/Tracer.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "gc/Tracer.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "gc/Verifier.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "gc/Verifier.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "gc/Verifier.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "gc/Zone.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "gc/Zone.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "gc/Zone.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "irregexp/NativeRegExpMacroAssembler.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "irregexp/NativeRegExpMacroAssembler.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "irregexp/NativeRegExpMacroAssembler.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "irregexp/RegExpAST.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "irregexp/RegExpAST.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "irregexp/RegExpAST.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "irregexp/RegExpEngine.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "irregexp/RegExpEngine.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "irregexp/RegExpEngine.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src8.cpp b/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src8.cpp
deleted file mode 100644
index 7afdd362289e..000000000000
--- a/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src8.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src8.cpp.orig	2019-01-18 22:48:18 UTC
-+++ src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src8.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "irregexp/RegExpInterpreter.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "irregexp/RegExpInterpreter.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "irregexp/RegExpInterpreter.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "irregexp/RegExpMacroAssembler.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "irregexp/RegExpMacroAssembler.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "irregexp/RegExpMacroAssembler.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "irregexp/RegExpParser.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "irregexp/RegExpParser.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "irregexp/RegExpParser.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "irregexp/RegExpStack.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "irregexp/RegExpStack.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "irregexp/RegExpStack.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/AliasAnalysis.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/AliasAnalysis.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/AliasAnalysis.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/AlignmentMaskAnalysis.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/AlignmentMaskAnalysis.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/AlignmentMaskAnalysis.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src9.cpp b/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src9.cpp
deleted file mode 100644
index 20f11700164f..000000000000
--- a/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src9.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src9.cpp.orig	2019-01-18 22:48:18 UTC
-+++ src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src9.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "jit/BacktrackingAllocator.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/BacktrackingAllocator.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/BacktrackingAllocator.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/Bailouts.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/Bailouts.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/Bailouts.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/BaselineBailouts.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/BaselineBailouts.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/BaselineBailouts.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/BaselineCompiler.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/BaselineCompiler.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/BaselineCompiler.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/BaselineDebugModeOSR.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/BaselineDebugModeOSR.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/BaselineDebugModeOSR.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/BaselineFrame.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/BaselineFrame.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/BaselineFrame.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_js-confdefs.h b/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_js-confdefs.h
deleted file mode 100644
index a24659c5a145..000000000000
--- a/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_js-confdefs.h
+++ /dev/null
@@ -1,91 +0,0 @@
---- src/third_party/mozjs-45/platform/aarch64/freebsd/build/js-confdefs.h.orig	2019-01-18 22:48:18 UTC
-+++ src/third_party/mozjs-45/platform/aarch64/freebsd/build/js-confdefs.h
-@@ -0,0 +1,88 @@
-+/* List of defines generated by configure. Included with preprocessor flag,
-+ * -include, to avoid long list of -D defines on the compile command-line.
-+ * Do not edit.
-+ */
-+
-+#ifndef js_confdefs_h
-+#define js_confdefs_h
-+
-+#define CPP_THROW_NEW throw()
-+#define D_INO d_ino
-+#define EDITLINE 1
-+#define HAVE_64BIT_BUILD 1
-+#define HAVE_ACOSH 1
-+#define HAVE_ASINH 1
-+#define HAVE_ATANH 1
-+#define HAVE_CBRT 1
-+#define HAVE_CLOCK_MONOTONIC 1
-+#define HAVE_CPP_AMBIGUITY_RESOLVING_USING 1
-+#define HAVE_CPP_DYNAMIC_CAST_TO_VOID_PTR 1
-+#define HAVE_DIRENT_H 1
-+#define HAVE_DLOPEN 1
-+#define HAVE_EXPM1 1
-+#define HAVE_GETC_UNLOCKED 1
-+#define HAVE_GETOPT_H 1
-+#define HAVE_GMTIME_R 1
-+#define HAVE_I18N_LC_MESSAGES 1
-+#define HAVE_LANGINFO_CODESET 1
-+#define HAVE_LIBM 1
-+#define HAVE_LOCALECONV 1
-+#define HAVE_LOCALECONV 1
-+#define HAVE_LOCALTIME_R 1
-+#define HAVE_LOG1P 1
-+#define HAVE_LOG2 1
-+#define HAVE_MACHINE_ENDIAN_H 1
-+#define HAVE_MALLOC_USABLE_SIZE 1
-+#define HAVE_MBRTOWC 1
-+#define HAVE_MEMORY_H 1
-+#define HAVE_NL_TYPES_H 1
-+#define HAVE_POSIX_FADVISE 1
-+#define HAVE_POSIX_FALLOCATE 1
-+#define HAVE_POSIX_MEMALIGN 1
-+#define HAVE_RES_NINIT 1
-+#define HAVE_SETLOCALE 1
-+#define HAVE_SSIZE_T 1
-+#define HAVE_STRNDUP 1
-+#define HAVE_SYS_CDEFS_H 1
-+#define HAVE_SYS_MOUNT_H 1
-+#define HAVE_SYS_STATVFS_H 1
-+#define HAVE_THREAD_TLS_KEYWORD 1
-+#define HAVE_TM_ZONE_TM_GMTOFF 1
-+#define HAVE_UNISTD_H 1
-+#define HAVE_VALLOC 1
-+#define HAVE_VA_COPY 1
-+#define HAVE_VISIBILITY_ATTRIBUTE 1
-+#define HAVE_VISIBILITY_HIDDEN_ATTRIBUTE 1
-+#define HAVE_WCRTOMB 1
-+#define HAVE_X11_XKBLIB_H 1
-+#define HAVE___CXA_DEMANGLE 1
-+#define JS_CODEGEN_NONE 1
-+#define JS_DEFAULT_JITREPORT_GRANULARITY 3
-+#define JS_HAVE_MACHINE_ENDIAN_H 1
-+#define JS_POSIX_NSPR 1
-+#define JS_PUNBOX64 1
-+#define JS_STANDALONE 1
-+#define MALLOC_H <malloc_np.h>
-+#define MALLOC_USABLE_SIZE_CONST_PTR const
-+#define MOZILLA_UAVERSION "45.0"
-+#define MOZILLA_VERSION "45.9.0"
-+#define MOZILLA_VERSION_U 45.9.0
-+#define MOZJS_MAJOR_VERSION 45
-+#define MOZJS_MINOR_VERSION 9
-+#define MOZ_DEBUG_SYMBOLS 1
-+#define MOZ_DLL_SUFFIX ".so"
-+#define MOZ_GLUE_IN_PROGRAM 1
-+#define MOZ_MEMORY 1
-+#define MOZ_MEMORY_BSD 1
-+#define MOZ_UPDATE_CHANNEL default
-+#define NO_NSPR_10_SUPPORT 1
-+#define RELEASE_BUILD 1
-+#define STDC_HEADERS 1
-+#define VA_COPY va_copy
-+#define XP_UNIX 1
-+#define _REENTRANT 1
-+#define _THREAD_SAFE 1
-+
-+#include "js/RequiredDefines.h"
-+
-+#endif /* js_confdefs_h */
diff --git a/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_include_js-config.h b/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_include_js-config.h
deleted file mode 100644
index c11f55644c87..000000000000
--- a/databases/mongodb36/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_include_js-config.h
+++ /dev/null
@@ -1,62 +0,0 @@
---- src/third_party/mozjs-45/platform/aarch64/freebsd/include/js-config.h.orig	2019-01-18 22:48:29 UTC
-+++ src/third_party/mozjs-45/platform/aarch64/freebsd/include/js-config.h
-@@ -0,0 +1,59 @@
-+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-+ * vim: set ts=8 sw=4 et tw=78:
-+ *
-+ * This Source Code Form is subject to the terms of the Mozilla Public
-+ * License, v. 2.0. If a copy of the MPL was not distributed with this
-+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-+
-+#ifndef js_config_h
-+#define js_config_h
-+
-+/* Definitions set at build time that affect SpiderMonkey's public API.
-+   This header file is generated by the SpiderMonkey configure script,
-+   and installed along with jsapi.h.  */
-+
-+/* Define to 1 if SpiderMonkey is in debug mode. */
-+/* #undef JS_DEBUG */
-+
-+/* Define to 1 if SpiderMonkey should not use struct types in debug builds. */
-+/* #undef JS_NO_JSVAL_JSID_STRUCT_TYPES */
-+
-+/* Define to 1 if SpiderMonkey should support multi-threaded clients.  */
-+/* #undef JS_THREADSAFE */
-+
-+/* Define to 1 if SpiderMonkey should include ctypes support.  */
-+/* #undef JS_HAS_CTYPES */
-+
-+/* Define to 1 if SpiderMonkey should support the ability to perform
-+   entirely too much GC.  */
-+/* #undef JS_GC_ZEAL */
-+
-+/* Define to 1 if SpiderMonkey should use small chunks. */
-+/* #undef JS_GC_SMALL_CHUNK_SIZE */
-+
-+/* Define to 1 to perform extra assertions and heap poisoning. */
-+/* #undef JS_CRASH_DIAGNOSTICS */
-+
-+/* Define to 1 if the <endian.h> header is present and
-+   useable.  See jscpucfg.h.  */
-+/* #undef JS_HAVE_ENDIAN_H */
-+
-+/* Define to 1 if the <machine/endian.h> header is present and
-+   useable.  See jscpucfg.h.  */
-+#define JS_HAVE_MACHINE_ENDIAN_H 1
-+
-+/* Define to 1 if the <sys/isa_defs.h> header is present and
-+   useable.  See jscpucfg.h.  */
-+/* #undef JS_HAVE_SYS_ISA_DEFS_H */
-+
-+/* Define to 1 if SpiderMonkey is in NUNBOX32 mode. */
-+/* #undef JS_NUNBOX32 */
-+
-+/* Define to 1 if SpiderMonkey is in PUNBOX64 mode. */
-+#define JS_PUNBOX64 1
-+
-+/* MOZILLA JSAPI version number components */
-+#define MOZJS_MAJOR_VERSION 45
-+#define MOZJS_MINOR_VERSION 9
-+
-+#endif /* js_config_h */
diff --git a/databases/mongodb36/files/mongod.in b/databases/mongodb36/files/mongod.in
deleted file mode 100644
index e885be83196c..000000000000
--- a/databases/mongodb36/files/mongod.in
+++ /dev/null
@@ -1,62 +0,0 @@
-#!/bin/sh
-
-# PROVIDE: mongod
-# REQUIRE: NETWORK ldconfig
-# KEYWORD: shutdown
-#
-# Add the following lines to /etc/rc.conf.local or /etc/rc.conf
-# to enable this service:
-#
-# mongod_enable (bool):  Set to "NO" by default.
-#                        Set it to "YES" to enable mongod.
-%%LEGACY_LIMITS%%# mongod_limits (bool):  Set to "NO" by default.
-%%LEGACY_LIMITS%%#                        Set it to yes to run `limits -e -U mongodb`
-%%LEGACY_LIMITS%%#                        just before mongod starts.
-# mongod_dbpath (str):   Default to "/var/db/mongodb"
-#                        Base database directory.
-# mongod_flags (str):    Custom additional arguments to be passed to mongod.
-#                        Default to "--logpath ${mongod_dbpath}/mongod.log --logappend".
-# mongod_config (str):	 Default to "%%PREFIX%%/etc/mongodb.conf"
-#                        Path to config file
-#
-
-. /etc/rc.subr
-
-name="mongod"
-rcvar=mongod_enable
-
-load_rc_config $name
-
-: ${mongod_enable="NO"}
-%%LEGACY_LIMITS%%: ${mongod_limits="NO"}
-: ${mongod_dbpath="/var/db/mongodb"}
-: ${mongod_flags="--logpath ${mongod_dbpath}/mongod.log --logappend --setParameter=disabledSecureAllocatorDomains=\*"}
-: ${mongod_user="mongodb"}
-: ${mongod_group="mongodb"}
-: ${mongod_config="%%PREFIX%%/etc/mongodb.conf"}
-
-pidfile="${mongod_dbpath}/mongod.lock"
-command=%%PREFIX%%/bin/${name}
-command_args="--config $mongod_config --dbpath $mongod_dbpath --fork >/dev/null 2>/dev/null"
-start_precmd="${name}_prestart"
-
-mongod_create_dbpath()
-{
-        mkdir ${mongod_dbpath} >/dev/null 2>/dev/null
-        [ $? -eq 0 ] && chown -R ${mongod_user}:${mongod_group} ${mongod_dbpath}
-}
-
-mongod_prestart()
-{
-        if [ ! -d ${mongod_dbpath} ]; then
-                mongod_create_dbpath || return 1
-        fi
-%%LEGACY_LIMITS%%        if checkyesno mongod_limits; then
-%%LEGACY_LIMITS%%                eval `/usr/bin/limits -e -U ${mongod_user}` 2>/dev/null
-%%LEGACY_LIMITS%%        else
-%%LEGACY_LIMITS%%                return 0
-%%LEGACY_LIMITS%%        fi
-%%MODERN_LIMITS%%        return 0
-}
-
-run_rc_command "$1"
diff --git a/databases/mongodb36/files/patch-SConstruct b/databases/mongodb36/files/patch-SConstruct
deleted file mode 100644
index d7b1c853af78..000000000000
--- a/databases/mongodb36/files/patch-SConstruct
+++ /dev/null
@@ -1,48 +0,0 @@
---- SConstruct.orig	2018-01-04 23:28:55 UTC
-+++ SConstruct
-@@ -922,9 +922,9 @@ if has_option('variables-help'):
-     print(env_vars.GenerateHelpText(env))
-     Exit(0)
- 
--unknown_vars = env_vars.UnknownVariables()
--if unknown_vars:
--    env.FatalError("Unknown variables specified: {0}", ", ".join(unknown_vars.keys()))
-+#unknown_vars = env_vars.UnknownVariables()
-+#if unknown_vars:
-+#    env.FatalError("Unknown variables specified: {0}", ", ".join(unknown_vars.keys()))
- 
- def set_config_header_define(env, varname, varval = 1):
-     env['CONFIG_HEADER_DEFINES'][varname] = varval
-@@ -1612,7 +1612,7 @@ if env.TargetOSIs('posix'):
-             # If runtime hardening is requested, then build anything
-             # destined for an executable with the necessary flags for PIE.
-             env.AppendUnique(
--                PROGCCFLAGS=['-fPIE'],
-+                PROGCCFLAGS=['-fpic'],
-                 PROGLINKFLAGS=['-pie'],
-             )
- 
-@@ -1626,7 +1626,7 @@ if env.TargetOSIs('posix'):
-                          "-Wno-unknown-pragmas",
-                          "-Winvalid-pch"] )
-     # env.Append( " -Wconversion" ) TODO: this doesn't really work yet
--    if env.TargetOSIs('linux', 'darwin', 'solaris'):
-+    if env.TargetOSIs('linux', 'darwin', 'solaris', 'freebsd'):
-         if not has_option("disable-warnings-as-errors"):
-             env.Append( CCFLAGS=["-Werror"] )
- 
-@@ -1661,10 +1661,10 @@ if env.TargetOSIs('posix'):
-         env.Append( CCFLAGS=["-fprofile-arcs", "-ftest-coverage"] )
-         env.Append( LINKFLAGS=["-fprofile-arcs", "-ftest-coverage"] )
- 
--    if optBuild:
--        env.Append( CCFLAGS=["-O2"] )
--    else:
--        env.Append( CCFLAGS=["-O0"] )
-+    #if optBuild:
-+    #    env.Append( CCFLAGS=["-O2"] )
-+    #else:
-+    #    env.Append( CCFLAGS=["-O0"] )
- 
-     # Promote linker warnings into errors. We can't yet do this on OS X because its linker considers
-     # noall_load obsolete and warns about it.
diff --git a/databases/mongodb36/files/patch-asio-libc++7 b/databases/mongodb36/files/patch-asio-libc++7
deleted file mode 100644
index 59e617b3b5de..000000000000
--- a/databases/mongodb36/files/patch-asio-libc++7
+++ /dev/null
@@ -1,15 +0,0 @@
-https://github.com/boostorg/asio/commit/b5b17a67f0aa29f5156324d5e8a73dd8669a5a51
-
---- src/third_party/asio-master/asio/include/asio/detail/config.hpp.orig	2018-07-03 21:09:33 UTC
-+++ src/third_party/asio-master/asio/include/asio/detail/config.hpp
-@@ -784,8 +784,9 @@
- # if !defined(ASIO_DISABLE_STD_STRING_VIEW)
- #  if defined(__clang__)
- #   if (__cplusplus >= 201402)
--#    if __has_include(<experimental/string_view>)
-+#    if __has_include(<string_view>)
- #     define ASIO_HAS_STD_STRING_VIEW 1
-+#    elif __has_include(<experimental/string_view>)
- #     define ASIO_HAS_STD_EXPERIMENTAL_STRING_VIEW 1
- #    endif // __has_include(<experimental/string_view>)
- #   endif // (__cplusplus >= 201402)
diff --git a/databases/mongodb36/files/patch-python3 b/databases/mongodb36/files/patch-python3
deleted file mode 100644
index 3b529242503b..000000000000
--- a/databases/mongodb36/files/patch-python3
+++ /dev/null
@@ -1,1977 +0,0 @@
-From cbfdc41e1d05aa1bfc298b8bd1a2fae9b3477e87 Mon Sep 17 00:00:00 2001
-From: MikaelUrankar <mikael.urankar@gmail.com>
-Date: Sat, 3 Oct 2020 17:26:21 +0200
-Subject: [PATCH 01/24] Backport SConstruct patch
-
----
- SConstruct | 61 ++++++++++++++++++++++++++++--------------------------
- 1 file changed, 32 insertions(+), 29 deletions(-)
-
-diff --git a/SConstruct b/SConstruct
-index cd4100e9..63f22862 100644
---- SConstruct
-+++ SConstruct
-@@ -28,8 +28,8 @@ import mongo.platform as mongo_platform
- import mongo.toolchain as mongo_toolchain
- import mongo.generators as mongo_generators
- 
--EnsurePythonVersion(2, 7)
--EnsureSConsVersion(2, 5)
-+EnsurePythonVersion(3, 5)
-+EnsureSConsVersion(3, 0, 4)
- 
- from buildscripts import utils
- from buildscripts import moduleconfig
-@@ -389,7 +389,7 @@ win_version_min_choices = {
- }
- 
- add_option('win-version-min',
--    choices=win_version_min_choices.keys(),
-+    choices=list(win_version_min_choices.keys()),
-     default=None,
-     help='minimum Windows version to support',
-     type='choice',
-@@ -482,7 +482,7 @@ try:
- except IOError as e:
-     # If the file error wasn't because the file is missing, error out
-     if e.errno != errno.ENOENT:
--        print("Error opening version.json: {0}".format(e.strerror))
-+        print(("Error opening version.json: {0}".format(e.strerror)))
-         Exit(1)
- 
-     version_data = {
-@@ -491,14 +491,14 @@ except IOError as e:
-     }
- 
- except ValueError as e:
--    print("Error decoding version.json: {0}".format(e))
-+    print(("Error decoding version.json: {0}".format(e)))
-     Exit(1)
- 
- # Setup the command-line variables
- def variable_shlex_converter(val):
-     # If the argument is something other than a string, propogate
-     # it literally.
--    if not isinstance(val, basestring):
-+    if not isinstance(val, str):
-         return val
-     parse_mode = get_option('variable-parse-mode')
-     if parse_mode == 'auto':
-@@ -563,7 +563,7 @@ def variable_distsrc_converter(val):
- 
- variables_files = variable_shlex_converter(get_option('variables-files'))
- for file in variables_files:
--    print("Using variable customization file %s" % file)
-+    print(("Using variable customization file %s" % file))
- 
- env_vars = Variables(
-     files=variables_files,
-@@ -572,7 +572,7 @@ env_vars = Variables(
- 
- sconsflags = os.environ.get('SCONSFLAGS', None)
- if sconsflags:
--    print("Using SCONSFLAGS environment variable arguments: %s" % sconsflags)
-+    print(("Using SCONSFLAGS environment variable arguments: %s" % sconsflags))
- 
- env_vars.Add('ABIDW',
-     help="Configures the path to the 'abidw' (a libabigail) utility")
-@@ -691,7 +691,7 @@ env_vars.Add('MONGO_DISTNAME',
- def validate_mongo_version(key, val, env):
-     regex = r'^(\d+)\.(\d+)\.(\d+)-?((?:(rc)(\d+))?.*)?'
-     if not re.match(regex, val):
--        print("Invalid MONGO_VERSION '{}', or could not derive from version.json or git metadata. Please add a conforming MONGO_VERSION=x.y.z[-extra] as an argument to SCons".format(val))
-+        print(("Invalid MONGO_VERSION '{}', or could not derive from version.json or git metadata. Please add a conforming MONGO_VERSION=x.y.z[-extra] as an argument to SCons".format(val)))
-         Exit(1)
- 
- env_vars.Add('MONGO_VERSION',
-@@ -822,12 +822,12 @@ if installDir[0] not in ['$', '#']:
-         Exit(1)
- 
- sconsDataDir = Dir(buildDir).Dir('scons')
--SConsignFile(str(sconsDataDir.File('sconsign')))
-+SConsignFile(str(sconsDataDir.File('sconsign.py3')))
- 
- def printLocalInfo():
-     import sys, SCons
--    print( "scons version: " + SCons.__version__ )
--    print( "python version: " + " ".join( [ `i` for i in sys.version_info ] ) )
-+    print(( "scons version: " + SCons.__version__ ))
-+    print(( "python version: " + " ".join( [ repr(i) for i in sys.version_info ] ) ))
- 
- printLocalInfo()
- 
-@@ -904,12 +904,12 @@ env.AddMethod(mongo_platform.env_os_is_wrapper, 'TargetOSIs')
- env.AddMethod(mongo_platform.env_get_os_name_wrapper, 'GetTargetOSName')
- 
- def fatal_error(env, msg, *args):
--    print(msg.format(*args))
-+    print((msg.format(*args)))
-     Exit(1)
- 
- def conf_error(env, msg, *args):
--    print(msg.format(*args))
--    print("See {0} for details".format(env.File('$CONFIGURELOG').abspath))
-+    print((msg.format(*args)))
-+    print(("See {0} for details".format(env.File('$CONFIGURELOG').abspath)))
-     Exit(1)
- 
- env.AddMethod(fatal_error, 'FatalError')
-@@ -928,12 +928,12 @@ else:
- env.AddMethod(lambda env: env['VERBOSE'], 'Verbose')
- 
- if has_option('variables-help'):
--    print(env_vars.GenerateHelpText(env))
-+    print((env_vars.GenerateHelpText(env)))
-     Exit(0)
- 
- #unknown_vars = env_vars.UnknownVariables()
- #if unknown_vars:
--#    env.FatalError("Unknown variables specified: {0}", ", ".join(unknown_vars.keys()))
-+#    env.FatalError("Unknown variables specified: {0}", ", ".join(list(unknown_vars.keys())))
- 
- def set_config_header_define(env, varname, varval = 1):
-     env['CONFIG_HEADER_DEFINES'][varname] = varval
-@@ -1018,7 +1018,7 @@ def CheckForProcessor(context, which_arch):
-         context.Result(ret)
-         return ret;
- 
--    for k in processor_macros.keys():
-+    for k in list(processor_macros.keys()):
-         ret = run_compile_check(k)
-         if ret:
-             context.Result('Detected a %s processor' % k)
-@@ -1136,7 +1136,7 @@ else:
-     env['TARGET_ARCH'] = detected_processor
- 
- if env['TARGET_OS'] not in os_macros:
--    print("No special config for [{0}] which probably means it won't work".format(env['TARGET_OS']))
-+    print(("No special config for [{0}] which probably means it won't work".format(env['TARGET_OS'])))
- elif not detectConf.CheckForOS(env['TARGET_OS']):
-     env.ConfError("TARGET_OS ({0}) is not supported by compiler", env['TARGET_OS'])
- 
-@@ -1922,7 +1922,7 @@ def doConfigure(myenv):
-             # form -Wno-xxx (but not -Wno-error=xxx), we also add -Wxxx to the flags. GCC does
-             # warn on unknown -Wxxx style flags, so this lets us probe for availablity of
-             # -Wno-xxx.
--            for kw in test_mutation.keys():
-+            for kw in list(test_mutation.keys()):
-                 test_flags = test_mutation[kw]
-                 for test_flag in test_flags:
-                     if test_flag.startswith("-Wno-") and not test_flag.startswith("-Wno-error="):
-@@ -1936,7 +1936,7 @@ def doConfigure(myenv):
-         # to make them real errors.
-         cloned.Append(CCFLAGS=['-Werror'])
-         conf = Configure(cloned, help=False, custom_tests = {
--                'CheckFlag' : lambda(ctx) : CheckFlagTest(ctx, tool, extension, flag)
-+                'CheckFlag' : lambda ctx : CheckFlagTest(ctx, tool, extension, flag)
-         })
-         available = conf.CheckFlag()
-         conf.Finish()
-@@ -2408,7 +2408,7 @@ def doConfigure(myenv):
-             "undefined" : myenv.File("#etc/ubsan.blacklist"),
-         }
- 
--        blackfiles = set([v for (k, v) in blackfiles_map.iteritems() if k in sanitizer_list])
-+        blackfiles = {v for (k, v) in blackfiles_map.items() if k in sanitizer_list}
-         blacklist_options=["-fsanitize-blacklist=%s" % blackfile
-                            for blackfile in blackfiles
-                            if os.stat(blackfile.path).st_size != 0]
-@@ -2420,7 +2420,7 @@ def doConfigure(myenv):
-         llvm_symbolizer = get_option('llvm-symbolizer')
-         if os.path.isabs(llvm_symbolizer):
-             if not myenv.File(llvm_symbolizer).exists():
--                print("WARNING: Specified symbolizer '%s' not found" % llvm_symbolizer)
-+                print(("WARNING: Specified symbolizer '%s' not found" % llvm_symbolizer))
-                 llvm_symbolizer = None
-         else:
-             llvm_symbolizer = myenv.WhereIs(llvm_symbolizer)
-@@ -2710,7 +2710,7 @@ def doConfigure(myenv):
-             files = ['ssleay32.dll', 'libeay32.dll']
-             for extra_file in files:
-                 if not addOpenSslLibraryToDistArchive(extra_file):
--                    print("WARNING: Cannot find SSL library '%s'" % extra_file)
-+                    print(("WARNING: Cannot find SSL library '%s'" % extra_file))
- 
-         # Used to import system certificate keychains
-         if conf.env.TargetOSIs('darwin'):
-@@ -2738,7 +2738,7 @@ def doConfigure(myenv):
-                         # TODO: If we could programmatically extract the paths from the info output
-                         # we could give a better message here, but brew info's machine readable output
-                         # doesn't seem to include the whole 'caveats' section.
--                        message = subprocess.check_output([brew, "info", "openssl"])
-+                        message = subprocess.check_output([brew, "info", "openssl"]).decode('utf-8')
-                         advice = textwrap.dedent(
-                             """\
-                             NOTE: HomeBrew installed to {0} appears to have OpenSSL installed.
-@@ -3114,7 +3114,7 @@ def doConfigure(myenv):
- 
-         outputIndex = next((idx for idx in [0,1] if conf.CheckAltivecVbpermqOutput(idx)), None)
-         if outputIndex is not None:
--	    conf.env.SetConfigHeaderDefine("MONGO_CONFIG_ALTIVEC_VEC_VBPERMQ_OUTPUT_INDEX", outputIndex)
-+            conf.env.SetConfigHeaderDefine("MONGO_CONFIG_ALTIVEC_VEC_VBPERMQ_OUTPUT_INDEX", outputIndex)
-         else:
-             myenv.ConfError("Running on ppc64le, but can't find a correct vec_vbpermq output index.  Compiler or platform not supported")
- 
-@@ -3176,9 +3176,12 @@ def doLint( env , target , source ):
-     import buildscripts.pylinters
-     buildscripts.pylinters.lint_all(None, {}, [])
- 
--    import buildscripts.lint
--    if not buildscripts.lint.run_lint( [ "src/mongo/" ] ):
--        raise Exception( "lint errors" )
-+    env.Command(
-+        target="#run_lint",
-+        source=["buildscripts/lint.py", "src/mongo"],
-+        action="$PYTHON $SOURCES[0] $SOURCES[1]",
-+    )
-+
- 
- env.Alias( "lint" , [] , [ doLint ] )
- env.AlwaysBuild( "lint" )
--- 
-2.28.0
-
-
-From 81abd3f9ba48ffb27919e574c8d518f4a1d8fbf3 Mon Sep 17 00:00:00 2001
-From: MikaelUrankar <mikael.urankar@gmail.com>
-Date: Sat, 3 Oct 2020 17:27:46 +0200
-Subject: [PATCH 02/24] Backport buildscripts/aggregate_tracefiles.py
-
----
- buildscripts/aggregate_tracefiles.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/buildscripts/aggregate_tracefiles.py b/buildscripts/aggregate_tracefiles.py
-index 8f1db785..0b4bfd24 100644
---- buildscripts/aggregate_tracefiles.py
-+++ buildscripts/aggregate_tracefiles.py
-@@ -16,7 +16,7 @@ def aggregate(inputs, output):
- 
-     args += ['-o', output]
- 
--    print ' '.join(args)
-+    print(' '.join(args))
-     
-     return subprocess.call(args)  
- 
--- 
-2.28.0
-
-
-From 035a04745cb159c2a971180d1d76bca51de9245c Mon Sep 17 00:00:00 2001
-From: MikaelUrankar <mikael.urankar@gmail.com>
-Date: Sat, 3 Oct 2020 17:32:28 +0200
-Subject: [PATCH 03/24] Backport buildscripts/aws_ec2.py
-
----
- buildscripts/aws_ec2.py | 83 ++++++++++++++++++-----------------------
- 1 file changed, 37 insertions(+), 46 deletions(-)
-
-diff --git a/buildscripts/aws_ec2.py b/buildscripts/aws_ec2.py
-index bc467d6e..f2e033a4 100755
---- buildscripts/aws_ec2.py
-+++ buildscripts/aws_ec2.py
-@@ -2,7 +2,7 @@
- 
- """AWS EC2 instance launcher and controller."""
- 
--from __future__ import print_function
-+
- 
- import base64
- import collections
-@@ -94,12 +94,13 @@ class AwsEc2(object):
-             if reached_state:
-                 print(" Instance {}!".format(instance.state["Name"]), file=sys.stdout)
-             else:
--                print(" Instance in state '{}', failed to reach state '{}'{}!".format(
--                    instance.state["Name"], state, client_error), file=sys.stdout)
-+                print(
-+                    " Instance in state '{}', failed to reach state '{}'{}!".format(
-+                        instance.state["Name"], state, client_error), file=sys.stdout)
-             sys.stdout.flush()
-         return 0 if reached_state else 1
- 
--    def control_instance(  #pylint: disable=too-many-arguments,too-many-branches
-+    def control_instance(  #pylint: disable=too-many-arguments,too-many-branches,too-many-locals
-             self, mode, image_id, wait_time_secs=0, show_progress=False, console_output_file=None,
-             console_screenshot_file=None):
-         """Control an AMI instance. Returns 0 & status information, if successful."""
-@@ -257,40 +258,34 @@ def main():
-     create_options = optparse.OptionGroup(parser, "Create options")
-     status_options = optparse.OptionGroup(parser, "Status options")
- 
--    parser.add_option("--mode",
--                      dest="mode",
--                      choices=_MODES,
--                      default="status",
--                      help="Operations to perform on an EC2 instance, choose one of"
--                           " '{}', defaults to '%default'.".format(", ".join(_MODES)))
-+    parser.add_option(
-+        "--mode", dest="mode", choices=_MODES, default="status",
-+        help=("Operations to perform on an EC2 instance, choose one of"
-+              " '{}', defaults to '%default'.".format(", ".join(_MODES))))
- 
-     control_options.add_option("--imageId",
-                                dest="image_id",
-                                default=None,
-                                help="EC2 image_id to perform operation on [REQUIRED for control].")
- 
--    control_options.add_option("--waitTimeSecs",
--                               dest="wait_time_secs",
--                               type=int,
--                               default=5 * 60,
--                               help="Time to wait for EC2 instance to reach it's new state,"
--                                    " defaults to '%default'.")
-+    control_options.add_option(
-+        "--waitTimeSecs", dest="wait_time_secs", type=int, default=5 * 60,
-+        help=("Time to wait for EC2 instance to reach it's new state,"
-+              " defaults to '%default'."))
-+
- 
-     create_options.add_option("--ami",
-                               dest="ami",
-                               default=None,
-                               help="EC2 AMI to launch [REQUIRED for create].")
- 
--    create_options.add_option("--blockDevice",
--                              dest="block_devices",
--                              metavar="DEVICE-NAME DEVICE-SIZE-GB",
--                              action="append",
--                              default=[],
--                              nargs=2,
--                              help="EBS device name and volume size in GiB."
--                                   " More than one device can be attached, by specifying"
--                                   " this option more than once."
--                                   " The device will be deleted on termination of the instance.")
-+    create_options.add_option(
-+        "--blockDevice", dest="block_devices", metavar="DEVICE-NAME DEVICE-SIZE-GB",
-+        action="append", default=[], nargs=2,
-+        help=("EBS device name and volume size in GiB."
-+              " More than one device can be attached, by specifying"
-+              " this option more than once."
-+              " The device will be deleted on termination of the instance."))
- 
-     create_options.add_option("--instanceType",
-                               dest="instance_type",
-@@ -302,19 +297,15 @@ def main():
-                               default=None,
-                               help="EC2 key name [REQUIRED for create].")
- 
--    create_options.add_option("--securityGroupIds",
--                              dest="security_group_ids",
--                              action="append",
--                              default=[],
--                              help="EC2 security group ids. More than one security group id can be"
--                                   " added, by specifying this option more than once.")
-+    create_options.add_option(
-+        "--securityGroupIds", dest="security_group_ids", action="append", default=[],
-+        help=("EC2 security group ids. More than one security group id can be"
-+              " added, by specifying this option more than once."))
- 
--    create_options.add_option("--securityGroup",
--                              dest="security_groups",
--                              action="append",
--                              default=[],
--                              help="EC2 security group. More than one security group can be added,"
--                                   " by specifying this option more than once.")
-+    create_options.add_option(
-+        "--securityGroup", dest="security_groups", action="append", default=[],
-+        help=("EC2 security group. More than one security group can be added,"
-+              " by specifying this option more than once."))
- 
-     create_options.add_option("--subnetId",
-                               dest="subnet_id",
-@@ -350,14 +341,15 @@ def main():
-                               default=None,
-                               help="Save the status into the specified YAML file.")
- 
--    status_options.add_option("--consoleOutputFile", dest="console_output_file", default=None,
--                              help="Save the console output into the specified file, if"
--                              " available.")
-+    status_options.add_option(
-+        "--consoleOutputFile", dest="console_output_file", default=None,
-+        help="Save the console output into the specified file, if"
-+        " available.")
- 
--    status_options.add_option("--consoleScreenshotFile", dest="console_screenshot_file",
--                              default=None,
--                              help="Save the console screenshot (JPG format) into the specified"
--                              " file, if available.")
-+    status_options.add_option(
-+        "--consoleScreenshotFile", dest="console_screenshot_file", default=None,
-+        help="Save the console screenshot (JPG format) into the specified"
-+        " file, if available.")
- 
-     parser.add_option_group(control_options)
-     parser.add_option_group(create_options)
-@@ -382,7 +374,6 @@ def main():
-                 parser.error("Block size must be an integer")
-             block_devices[device_name] = device_size
- 
--        # The 'expire-on' key is a UTC time.
-         expire_dt = datetime.datetime.utcnow() + datetime.timedelta(hours=options.tag_expire_hours)
-         tags = [{"Key": "expire-on", "Value": expire_dt.strftime("%Y-%m-%d %H:%M:%S")},
-                 {"Key": "Name", "Value": options.tag_name},
--- 
-2.28.0
-
-
-From b6f97aeb89868c62c3c01f7f2e6f47ecda846d94 Mon Sep 17 00:00:00 2001
-From: MikaelUrankar <mikael.urankar@gmail.com>
-Date: Sat, 3 Oct 2020 17:33:44 +0200
-Subject: [PATCH 04/24] backport site_scons/mongo/__init__.py
-
----
- site_scons/mongo/__init__.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/site_scons/mongo/__init__.py b/site_scons/mongo/__init__.py
-index 510bd7bc..f7747809 100644
---- site_scons/mongo/__init__.py
-+++ site_scons/mongo/__init__.py
-@@ -5,4 +5,4 @@
- def print_build_failures():
-     from SCons.Script import GetBuildFailures
-     for bf in GetBuildFailures():
--        print "%s failed: %s" % (bf.node, bf.errstr)
-+        print("%s failed: %s" % (bf.node, bf.errstr))
--- 
-2.28.0
-
-
-From 054ba812f02c54663a76b7092aa0c1eeeaf9925e Mon Sep 17 00:00:00 2001
-From: MikaelUrankar <mikael.urankar@gmail.com>
-Date: Sat, 3 Oct 2020 17:35:06 +0200
-Subject: [PATCH 05/24] backport site_scons/mongo/generators.py
-
----
- site_scons/mongo/generators.py | 75 +++++++++++++++++++++++++++-------
- 1 file changed, 61 insertions(+), 14 deletions(-)
-
-diff --git a/site_scons/mongo/generators.py b/site_scons/mongo/generators.py
-index c07e86a4..052f18d3 100644
---- site_scons/mongo/generators.py
-+++ site_scons/mongo/generators.py
-@@ -1,6 +1,6 @@
- # -*- mode: python; -*-
- 
--import md5
-+import hashlib
- 
- # Default and alternative generator definitions go here.
- 
-@@ -15,22 +15,69 @@ import md5
- # want to define them.
- def default_buildinfo_environment_data():
-     return (
--        ('distmod', '$MONGO_DISTMOD', True, True,),
--        ('distarch', '$MONGO_DISTARCH', True, True,),
--        ('cc', '$CC_VERSION', True, False,),
--        ('ccflags', '$CCFLAGS', True, False,),
--        ('cxx', '$CXX_VERSION', True, False,),
--        ('cxxflags', '$CXXFLAGS', True, False,),
--        ('linkflags', '$LINKFLAGS', True, False,),
--        ('target_arch', '$TARGET_ARCH', True, True,),
--        ('target_os', '$TARGET_OS', True, False,),
-+        (
-+            'distmod',
-+            '$MONGO_DISTMOD',
-+            True,
-+            True,
-+        ),
-+        (
-+            'distarch',
-+            '$MONGO_DISTARCH',
-+            True,
-+            True,
-+        ),
-+        (
-+            'cc',
-+            '$CC_VERSION',
-+            True,
-+            False,
-+        ),
-+        (
-+            'ccflags',
-+            '$CCFLAGS',
-+            True,
-+            False,
-+        ),
-+        (
-+            'cxx',
-+            '$CXX_VERSION',
-+            True,
-+            False,
-+        ),
-+        (
-+            'cxxflags',
-+            '$CXXFLAGS',
-+            True,
-+            False,
-+        ),
-+        (
-+            'linkflags',
-+            '$LINKFLAGS',
-+            True,
-+            False,
-+        ),
-+        (
-+            'target_arch',
-+            '$TARGET_ARCH',
-+            True,
-+            True,
-+        ),
-+        (
-+            'target_os',
-+            '$TARGET_OS',
-+            True,
-+            False,
-+        ),
-     )
- 
-+
- # If you want buildInfo and --version to be relatively empty, set
- # MONGO_BUILDINFO_ENVIRONMENT_DATA = empty_buildinfo_environment_data()
- def empty_buildinfo_environment_data():
-     return ()
- 
-+
- def default_variant_dir_generator(target, source, env, for_signature):
- 
-     if env.GetOption('cache') != None:
-@@ -44,11 +91,11 @@ def default_variant_dir_generator(target, source, env, for_signature):
- 
-     # Hash the named options and their values, and take the first 8 characters of the hash as
-     # the variant name
--    hasher = md5.md5()
-+    hasher = hashlib.md5()
-     for option in variant_options:
--        hasher.update(option)
--        hasher.update(str(env.GetOption(option)))
--    variant_dir = hasher.hexdigest()[0:8]
-+        hasher.update(option.encode('utf-8'))
-+        hasher.update(str(env.GetOption(option)).encode('utf-8'))
-+    variant_dir = str(hasher.hexdigest()[0:8])
- 
-     # If our option hash yields a well known hash, replace it with its name.
-     known_variant_hashes = {
--- 
-2.28.0
-
-
-From 83a4ac06adfa2d7adfb6dedeb6fb258130ab3015 Mon Sep 17 00:00:00 2001
-From: MikaelUrankar <mikael.urankar@gmail.com>
-Date: Sat, 3 Oct 2020 17:36:14 +0200
-Subject: [PATCH 06/24] backport buildscripts/utils.py
-
----
- buildscripts/utils.py | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/buildscripts/utils.py b/buildscripts/utils.py
-index 69a78921..1c08bdf8 100644
---- buildscripts/utils.py
-+++ buildscripts/utils.py
-@@ -107,7 +107,7 @@ def getGitDescribe():
-             stderr=devnull,
-             stdin=devnull,
-             shell=True)
--        return proc.communicate()[0].strip()
-+        return proc.communicate()[0].strip().decode('utf-8')
- 
- def execsys( args ):
-     import subprocess
-@@ -122,7 +122,7 @@ def getprocesslist():
-     raw = ""
-     try:
-         raw = execsys( "/bin/ps axww" )[0]
--    except Exception,e:
-+    except Exception as e:
-         print( "can't get processlist: " + str( e ) )
- 
-     r = re.compile( "[\r\n]+" )
-@@ -176,7 +176,7 @@ def didMongodStart( port=27017 , timeout=20 ):
-         try:
-             checkMongoPort( port )
-             return True
--        except Exception,e:
-+        except Exception as e:
-             print( e )
-             timeout = timeout - 1
-     return False
--- 
-2.28.0
-
-
-From f38206bde5a4e7cf14a7e17b67ccf074b222c9a6 Mon Sep 17 00:00:00 2001
-From: MikaelUrankar <mikael.urankar@gmail.com>
-Date: Sat, 3 Oct 2020 17:48:44 +0200
-Subject: [PATCH 07/24] backport site_scons/libdeps.py
-
----
- site_scons/libdeps.py | 46 ++++++++++++++++++++++++++-----------------
- 1 file changed, 28 insertions(+), 18 deletions(-)
-
-diff --git a/site_scons/libdeps.py b/site_scons/libdeps.py
-index 632ed29b..62272052 100644
---- site_scons/libdeps.py
-+++ site_scons/libdeps.py
-@@ -61,7 +61,7 @@ syslibdeps_env_var = 'SYSLIBDEPS'
- missing_syslibdep = 'MISSING_LIBDEP_'
- 
- class dependency(object):
--    Public, Private, Interface = range(3)
-+    Public, Private, Interface = list(range(3))
- 
-     def __init__(self, value, dynamic, deptype):
-         self.target_node = value
-@@ -74,7 +74,7 @@ class dependency(object):
- class DependencyCycleError(SCons.Errors.UserError):
-     """Exception representing a cycle discovered in library dependencies."""
- 
--    def __init__(self, first_node ):
-+    def __init__(self, first_node):
-         super(DependencyCycleError, self).__init__()
-         self.cycle_nodes = [first_node]
- 
-@@ -89,8 +89,8 @@ def __get_sorted_direct_libdeps(node):
-         setattr(node.attributes, "libdeps_direct_sorted", direct_sorted)
-     return direct_sorted
- 
--def __get_libdeps(node):
- 
-+def __get_libdeps(node):
-     """Given a SCons Node, return its library dependencies, topologically sorted.
- 
-     Computes the dependencies if they're not already cached.
-@@ -122,7 +122,7 @@ def __get_libdeps(node):
-                 marked.add(n.target_node)
-                 tsorted.append(n.target_node)
- 
--            except DependencyCycleError, e:
-+            except DependencyCycleError as e:
-                 if len(e.cycle_nodes) == 1 or e.cycle_nodes[0] != e.cycle_nodes[-1]:
-                     e.cycle_nodes.insert(0, n.target_node)
-                 raise
-@@ -139,6 +139,7 @@ def __get_libdeps(node):
- 
-     return tsorted
- 
-+
- def __get_syslibdeps(node):
-     """ Given a SCons Node, return its system library dependencies.
- 
-@@ -150,11 +151,11 @@ def __get_syslibdeps(node):
-         for lib in __get_libdeps(node):
-             for syslib in node.get_env().Flatten(lib.get_env().get(syslibdeps_env_var, [])):
-                 if syslib:
--                    if type(syslib) in (str, unicode) and syslib.startswith(missing_syslibdep):
--                        print("Target '%s' depends on the availability of a "
-+                    if type(syslib) is str and syslib.startswith(missing_syslibdep):
-+                        print(("Target '%s' depends on the availability of a "
-                               "system provided library for '%s', "
-                               "but no suitable library was found during configuration." %
--                              (str(node), syslib[len(missing_syslibdep):]))
-+                              (str(node), syslib[len(missing_syslibdep):])))
-                         node.get_env().Exit(1)
-                     syslibdeps.append(syslib)
-         setattr(node.attributes, cached_var_name, syslibdeps)
-@@ -170,17 +171,20 @@ def update_scanner(builder):
- 
-     if old_scanner:
-         path_function = old_scanner.path_function
-+
-         def new_scanner(node, env, path=()):
-             result = old_scanner.function(node, env, path)
-             result.extend(__get_libdeps(node))
-             return result
-     else:
-         path_function = None
-+
-         def new_scanner(node, env, path=()):
-             return __get_libdeps(node)
- 
-     builder.target_scanner = SCons.Scanner.Scanner(function=new_scanner,
--                                                    path_function=path_function)
-+                                                   path_function=path_function)
-+
- 
- def get_libdeps(source, target, env, for_signature):
-     """Implementation of the special _LIBDEPS environment variable.
-@@ -191,6 +195,7 @@ def get_libdeps(source, target, env, for_signature):
-     target = env.Flatten([target])
-     return __get_libdeps(target[0])
- 
-+
- def get_libdeps_objs(source, target, env, for_signature):
-     objs = []
-     for lib in get_libdeps(source, target, env, for_signature):
-@@ -198,6 +203,7 @@ def get_libdeps_objs(source, target, env, for_signature):
-         objs.extend(lib.sources)
-     return objs
- 
-+
- def get_syslibdeps(source, target, env, for_signature):
-     deps = __get_syslibdeps(target[0])
-     lib_link_prefix = env.subst('$LIBLINKPREFIX')
-@@ -209,7 +215,7 @@ def get_syslibdeps(source, target, env, for_signature):
-         # they're believed to represent library short names, that should be prefixed with -l
-         # or the compiler-specific equivalent.  I.e., 'm' becomes '-lm', but 'File("m.a") is passed
-         # through whole cloth.
--        if type(d) in (str, unicode):
-+        if type(d) is str:
-             result.append('%s%s%s' % (lib_link_prefix, d, lib_link_suffix))
-         else:
-             result.append(d)
-@@ -252,8 +258,8 @@ def libdeps_emitter(target, source, env):
-     prereqs.extend(dependency(l, False, dependency.Private) for l in env.get(libdeps_env_var + '_PRIVATE', []) if l)
- 
-     for prereq in prereqs:
--        prereqWithIxes = SCons.Util.adjustixes(
--            prereq.target_node, lib_builder.get_prefix(env), lib_builder.get_suffix(env))
-+        prereqWithIxes = SCons.Util.adjustixes(prereq.target_node, lib_builder.get_prefix(env),
-+                                               lib_builder.get_suffix(env))
-         prereq.target_node = lib_node_factory(prereqWithIxes)
- 
-     for t in target:
-@@ -264,16 +270,16 @@ def libdeps_emitter(target, source, env):
-     for dependent in env.get('LIBDEPS_DEPENDENTS', []):
-         if dependent is None:
-             continue
--        dependentWithIxes = SCons.Util.adjustixes(
--            dependent, lib_builder.get_prefix(env), lib_builder.get_suffix(env))
-+        dependentWithIxes = SCons.Util.adjustixes(dependent, lib_builder.get_prefix(env),
-+                                                  lib_builder.get_suffix(env))
-         dependentNode = lib_node_factory(dependentWithIxes)
-         __append_direct_libdeps(dependentNode, [dependency(target[0], False, dependency.Public)])
- 
-     for dependent in env.get('PROGDEPS_DEPENDENTS', []):
-         if dependent is None:
-             continue
--        dependentWithIxes = SCons.Util.adjustixes(
--            dependent, prog_builder.get_prefix(env), prog_builder.get_suffix(env))
-+        dependentWithIxes = SCons.Util.adjustixes(dependent, prog_builder.get_prefix(env),
-+                                                  prog_builder.get_suffix(env))
-         dependentNode = prog_node_factory(dependentWithIxes)
-         __append_direct_libdeps(dependentNode, [dependency(target[0], False, dependency.Public)])
- 
-@@ -372,9 +378,11 @@ def setup_environment(env, emitting_shared=False):
-                 if 'init-no-global-side-effects' in env.Entry(lib).get_env().get('LIBDEPS_TAGS', []):
-                     result.append(str(lib))
-                 else:
--                    result.extend(env.subst('$LINK_WHOLE_ARCHIVE_LIB_START'
--                                            '$TARGET'
--                                            '$LINK_WHOLE_ARCHIVE_LIB_END', target=lib).split())
-+                    result.extend(
-+                        env.subst(
-+                            '$LINK_WHOLE_ARCHIVE_LIB_START'
-+                            '$TARGET'
-+                            '$LINK_WHOLE_ARCHIVE_LIB_END', target=lib).split())
-             return result
- 
-         env['_LIBDEPS_LIBS_WITH_TAGS'] = expand_libdeps_with_extraction_flags
-@@ -394,6 +402,7 @@ def setup_environment(env, emitting_shared=False):
-         except KeyError:
-             pass
- 
-+
- def setup_conftests(conf):
-     def FindSysLibDep(context, name, libs, **kwargs):
-         var = "LIBDEPS_" + name.upper() + "_SYSLIBDEP"
-@@ -406,4 +415,5 @@ def setup_conftests(conf):
-                 return context.Result(result)
-         context.env[var] = __missing_syslib(name)
-         return context.Result(result)
-+
-     conf.AddTest('FindSysLibDep', FindSysLibDep)
--- 
-2.28.0
-
-
-From 2bc91392ab7dba6a09aa4100a9e8666a82dd7941 Mon Sep 17 00:00:00 2001
-From: MikaelUrankar <mikael.urankar@gmail.com>
-Date: Sat, 3 Oct 2020 17:49:45 +0200
-Subject: [PATCH 08/24] backport site_scons/site_tools/distsrc.py
-
----
- site_scons/site_tools/distsrc.py | 25 ++++++++++++++-----------
- 1 file changed, 14 insertions(+), 11 deletions(-)
-
-diff --git a/site_scons/site_tools/distsrc.py b/site_scons/site_tools/distsrc.py
-index 861f5d9e..cc72c065 100644
---- site_scons/site_tools/distsrc.py
-+++ site_scons/site_tools/distsrc.py
-@@ -20,7 +20,7 @@ import shutil
- import tarfile
- import time
- import zipfile
--import StringIO
-+import io
- 
- from distutils.spawn import find_executable
- 
-@@ -28,7 +28,7 @@ __distsrc_callbacks = []
- 
- class DistSrcFile:
-     def __init__(self, **kwargs):
--        [ setattr(self, key, val) for (key, val) in kwargs.items() ]
-+        [ setattr(self, key, val) for (key, val) in list(kwargs.items()) ]
- 
-     def __str__(self):
-         return self.name
-@@ -60,6 +60,7 @@ class DistSrcArchive:
-     def close(self):
-         self.archive_file.close()
- 
-+
- class DistSrcTarArchive(DistSrcArchive):
-     def __iter__(self):
-         file_list = self.archive_file.getnames()
-@@ -82,7 +83,7 @@ class DistSrcTarArchive(DistSrcArchive):
- 
-     def append_file_contents(self, filename, file_contents,
-             mtime=time.time(),
--            mode=0644,
-+            mode=0o644,
-             uname="root",
-             gname="root"):
-         file_metadata = tarfile.TarInfo(name=filename)
-@@ -91,7 +92,7 @@ class DistSrcTarArchive(DistSrcArchive):
-         file_metadata.uname = uname
-         file_metadata.gname = gname
-         file_metadata.size = len(file_contents)
--        file_buf = StringIO.StringIO(file_contents)
-+        file_buf = io.BytesIO(file_contents.encode('utf-8'))
-         if self.archive_mode == 'r':
-             self.archive_file.close()
-             self.archive_file = tarfile.open(
-@@ -105,6 +106,7 @@ class DistSrcTarArchive(DistSrcArchive):
-     def append_file(self, filename, localfile):
-         self.archive_file.add(localfile, arcname=filename)
- 
-+
- class DistSrcZipArchive(DistSrcArchive):
-     def __iter__(self):
-         file_list = self.archive_file.namelist()
-@@ -119,7 +121,7 @@ class DistSrcZipArchive(DistSrcArchive):
-             name=key,
-             size=item_data.file_size,
-             mtime=time.mktime(fixed_time),
--            mode=0775 if is_dir else 0664,
-+            mode=0o775 if is_dir else 0o664,
-             type=tarfile.DIRTYPE if is_dir else tarfile.REGTYPE,
-             uid=0,
-             gid=0,
-@@ -129,7 +131,7 @@ class DistSrcZipArchive(DistSrcArchive):
- 
-     def append_file_contents(self, filename, file_contents,
-             mtime=time.time(),
--            mode=0644,
-+            mode=0o644,
-             uname="root",
-             gname="root"):
-         self.archive_file.writestr(filename, file_contents)
-@@ -139,7 +141,7 @@ class DistSrcZipArchive(DistSrcArchive):
- 
- def build_error_action(msg):
-     def error_stub(target=None, source=None, env=None):
--        print msg
-+        print(msg)
-         env.Exit(1)
-     return [ error_stub ]
- 
-@@ -162,7 +164,7 @@ def distsrc_action_generator(source, target, env, for_signature):
- 
-     target_ext = str(target[0])[-3:]
-     if not target_ext in [ 'zip', 'tar' ]:
--        print "Invalid file format for distsrc. Must be tar or zip file"
-+        print("Invalid file format for distsrc. Must be tar or zip file")
-         env.Exit(1)
- 
-     git_cmd = "\"%s\" archive --format %s --output %s --prefix ${MONGO_DIST_SRC_PREFIX} HEAD" % (
-@@ -173,14 +175,14 @@ def distsrc_action_generator(source, target, env, for_signature):
-         SCons.Action.Action(run_distsrc_callbacks, "Running distsrc callbacks for $TARGET")
-     ]
- 
-+
- def add_callback(env, fn):
-     __distsrc_callbacks.append(fn)
- 
-+
- def generate(env, **kwargs):
-     env.AddMethod(add_callback, 'AddDistSrcCallback')
--    env['BUILDERS']['__DISTSRC'] = SCons.Builder.Builder(
--        generator=distsrc_action_generator,
--    )
-+    env['BUILDERS']['__DISTSRC'] = SCons.Builder.Builder(generator=distsrc_action_generator, )
- 
-     def DistSrc(env, target):
-         result = env.__DISTSRC(target=target, source=[])
-@@ -190,5 +192,6 @@ def generate(env, **kwargs):
- 
-     env.AddMethod(DistSrc, 'DistSrc')
- 
-+
- def exists(env):
-     return True
--- 
-2.28.0
-
-
-From b27a4fc533e5290495f3b2d2bc78ea208d607bf5 Mon Sep 17 00:00:00 2001
-From: MikaelUrankar <mikael.urankar@gmail.com>
-Date: Sat, 3 Oct 2020 17:50:41 +0200
-Subject: [PATCH 09/24] backport site_scons/site_tools/mongo_benchmark.py
-
----
- site_scons/site_tools/mongo_benchmark.py | 7 ++++---
- 1 file changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/site_scons/site_tools/mongo_benchmark.py b/site_scons/site_tools/mongo_benchmark.py
-index 7c12627b..f3f84d73 100644
---- site_scons/site_tools/mongo_benchmark.py
-+++ site_scons/site_tools/mongo_benchmark.py
-@@ -11,10 +11,10 @@ def register_benchmark(env, test):
-     env.Alias('$BENCHMARK_ALIAS', test)
- 
- def benchmark_list_builder_action(env, target, source):
--    ofile = open(str(target[0]), 'wb')
-+    ofile = open(str(target[0]), 'w')
-     try:
-         for s in _benchmarks:
--            print '\t' + str(s)
-+            print('\t' + str(s))
-             ofile.write('%s\n' % s)
-     finally:
-         ofile.close()
-@@ -37,9 +37,10 @@ def build_benchmark(env, target, source, **kwargs):
-     bmEnv.Install("#/build/benchmark/", result[0])
-     return result
- 
-+
- def generate(env):
-     env.Command('$BENCHMARK_LIST', env.Value(_benchmarks),
--            Action(benchmark_list_builder_action, "Generating $TARGET"))
-+                Action(benchmark_list_builder_action, "Generating $TARGET"))
-     env.AddMethod(register_benchmark, 'RegisterBenchmark')
-     env.AddMethod(build_benchmark, 'Benchmark')
-     env.Alias('$BENCHMARK_ALIAS', '$BENCHMARK_LIST')
--- 
-2.28.0
-
-
-From 2059bb295d0d440a615241a834094dba3c840d6f Mon Sep 17 00:00:00 2001
-From: MikaelUrankar <mikael.urankar@gmail.com>
-Date: Sat, 3 Oct 2020 17:51:30 +0200
-Subject: [PATCH 10/24] backport site_scons/site_tools/mongo_integrationtest.py
-
----
- site_scons/site_tools/mongo_integrationtest.py | 7 ++++---
- 1 file changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/site_scons/site_tools/mongo_integrationtest.py b/site_scons/site_tools/mongo_integrationtest.py
-index ff9a5f45..324cac63 100644
---- site_scons/site_tools/mongo_integrationtest.py
-+++ site_scons/site_tools/mongo_integrationtest.py
-@@ -12,10 +12,10 @@ def register_integration_test(env, test):
-     env.Alias('$INTEGRATION_TEST_ALIAS', installed_test)
- 
- def integration_test_list_builder_action(env, target, source):
--    ofile = open(str(target[0]), 'wb')
-+    ofile = open(str(target[0]), 'w')
-     try:
-         for s in _integration_tests:
--            print '\t' + str(s)
-+            print('\t' + str(s))
-             ofile.write('%s\n' % s)
-     finally:
-         ofile.close()
-@@ -30,9 +30,10 @@ def build_cpp_integration_test(env, target, source, **kwargs):
-     env.RegisterIntegrationTest(result[0])
-     return result
- 
-+
- def generate(env):
-     env.Command('$INTEGRATION_TEST_LIST', env.Value(_integration_tests),
--            Action(integration_test_list_builder_action, "Generating $TARGET"))
-+                Action(integration_test_list_builder_action, "Generating $TARGET"))
-     env.AddMethod(register_integration_test, 'RegisterIntegrationTest')
-     env.AddMethod(build_cpp_integration_test, 'CppIntegrationTest')
-     env.Alias('$INTEGRATION_TEST_ALIAS', '$INTEGRATION_TEST_LIST')
--- 
-2.28.0
-
-
-From 747ce174e66d87aa71d6a3943457228ecd1d6aa2 Mon Sep 17 00:00:00 2001
-From: MikaelUrankar <mikael.urankar@gmail.com>
-Date: Sat, 3 Oct 2020 17:54:25 +0200
-Subject: [PATCH 11/24] backport site_scons/site_tools/mongo_unittest.py
-
----
- site_scons/site_tools/mongo_unittest.py | 7 ++++---
- 1 file changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/site_scons/site_tools/mongo_unittest.py b/site_scons/site_tools/mongo_unittest.py
-index ec99ab2d..28504767 100644
---- site_scons/site_tools/mongo_unittest.py
-+++ site_scons/site_tools/mongo_unittest.py
-@@ -11,10 +11,10 @@ def register_unit_test(env, test):
-     env.Alias('$UNITTEST_ALIAS', test)
- 
- def unit_test_list_builder_action(env, target, source):
--    ofile = open(str(target[0]), 'wb')
-+    ofile = open(str(target[0]), 'w')
-     try:
-         for s in _unittests:
--            print '\t' + str(s)
-+            print('\t' + str(s))
-             ofile.write('%s\n' % s)
-     finally:
-         ofile.close()
-@@ -30,9 +30,10 @@ def build_cpp_unit_test(env, target, source, **kwargs):
-     env.Install("#/build/unittests/", result[0])
-     return result
- 
-+
- def generate(env):
-     env.Command('$UNITTEST_LIST', env.Value(_unittests),
--            Action(unit_test_list_builder_action, "Generating $TARGET"))
-+                Action(unit_test_list_builder_action, "Generating $TARGET"))
-     env.AddMethod(register_unit_test, 'RegisterUnitTest')
-     env.AddMethod(build_cpp_unit_test, 'CppUnitTest')
-     env.Alias('$UNITTEST_ALIAS', '$UNITTEST_LIST')
--- 
-2.28.0
-
-
-From 72af34f1fbb1341dbb4f91147346eba24ad3bba1 Mon Sep 17 00:00:00 2001
-From: MikaelUrankar <mikael.urankar@gmail.com>
-Date: Sat, 3 Oct 2020 17:54:44 +0200
-Subject: [PATCH 12/24] backport site_scons/site_tools/split_dwarf.py
-
----
- site_scons/site_tools/split_dwarf.py | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/site_scons/site_tools/split_dwarf.py b/site_scons/site_tools/split_dwarf.py
-index 95130c9e..c57b9e96 100644
---- site_scons/site_tools/split_dwarf.py
-+++ site_scons/site_tools/split_dwarf.py
-@@ -26,6 +26,7 @@ _CXXSuffixes = ['.cpp', '.cc', '.cxx', '.c++', '.C++']
- if SCons.Util.case_sensitive_suffixes('.c', '.C'):
-     _CXXSuffixes.append('.C')
- 
-+
- def _dwo_emitter(target, source, env):
-     new_targets = []
-     for t in target:
-@@ -40,6 +41,7 @@ def _dwo_emitter(target, source, env):
-     targets = target + new_targets
-     return (targets, source)
- 
-+
- def generate(env):
-     suffixes = []
-     if _splitDwarfFlag in env['CCFLAGS']:
-@@ -52,7 +54,7 @@ def generate(env):
- 
-     for object_builder in SCons.Tool.createObjBuilders(env):
-         emitterdict = object_builder.builder.emitter
--        for suffix in emitterdict.iterkeys():
-+        for suffix in emitterdict.keys():
-             if not suffix in suffixes:
-                 continue
-             base = emitterdict[suffix]
-@@ -61,5 +63,6 @@ def generate(env):
-                 _dwo_emitter,
-             ])
- 
-+
- def exists(env):
-     return any(_splitDwarfFlag in env[f] for f in ['CCFLAGS', 'CFLAGS', 'CXXFLAGS'])
--- 
-2.28.0
-
-
-From 1e6b16c197766c1f9b19d32cacb658dff44b52b5 Mon Sep 17 00:00:00 2001
-From: MikaelUrankar <mikael.urankar@gmail.com>
-Date: Sat, 3 Oct 2020 17:56:46 +0200
-Subject: [PATCH 13/24] backport site_scons/site_tools/thin_archive.py
-
----
- site_scons/site_tools/thin_archive.py | 18 +++++++++++-------
- 1 file changed, 11 insertions(+), 7 deletions(-)
-
-diff --git a/site_scons/site_tools/thin_archive.py b/site_scons/site_tools/thin_archive.py
-index 511c0ef6..500c3355 100644
---- site_scons/site_tools/thin_archive.py
-+++ site_scons/site_tools/thin_archive.py
-@@ -17,6 +17,7 @@ import SCons
- import re
- import subprocess
- 
-+
- def exists(env):
-     if not 'AR' in env:
-         return False
-@@ -30,10 +31,9 @@ def exists(env):
-     if not "rc" in env['ARFLAGS']:
-         return False
- 
--    pipe = SCons.Action._subproc(env, SCons.Util.CLVar(ar) + ['--version'],
--                                 stdin = 'devnull',
--                                 stderr = 'devnull',
--                                 stdout = subprocess.PIPE)
-+    pipe = SCons.Action._subproc(env,
-+                                 SCons.Util.CLVar(ar) + ['--version'], stdin='devnull',
-+                                 stderr='devnull', stdout=subprocess.PIPE)
-     if pipe.wait() != 0:
-         return False
- 
-@@ -41,7 +41,7 @@ def exists(env):
-     for line in pipe.stdout:
-         if isgnu:
-             continue  # consume all data
--        isgnu = re.search(r'^GNU ar', line)
-+        isgnu = re.search(r'^GNU ar', line.decode('utf-8'))
- 
-     return bool(isgnu)
- 
-@@ -56,6 +56,7 @@ def _add_emitter(builder):
-     new_emitter = SCons.Builder.ListEmitter([base_emitter, new_emitter])
-     builder.emitter = new_emitter
- 
-+
- def _add_scanner(builder):
-     old_scanner = builder.target_scanner
-     path_function = old_scanner.path_function
-@@ -69,13 +70,16 @@ def _add_scanner(builder):
-                 new_results.extend(base.children())
-         return new_results
- 
--    builder.target_scanner = SCons.Scanner.Scanner(function=new_scanner, path_function=path_function)
-+    builder.target_scanner = SCons.Scanner.Scanner(function=new_scanner,
-+                                                   path_function=path_function)
-+
- 
- def generate(env):
-     if not exists(env):
-         return
- 
--    env['ARFLAGS'] = SCons.Util.CLVar([arflag if arflag != "rc" else "rcsTD" for arflag in env['ARFLAGS']])
-+    env['ARFLAGS'] = SCons.Util.CLVar(
-+        [arflag if arflag != "rc" else "rcsTD" for arflag in env['ARFLAGS']])
- 
-     def noop_action(env, target, source):
-         pass
--- 
-2.28.0
-
-
-From 5c0d6355043aa07402eea9e85100f7cfc19897ce Mon Sep 17 00:00:00 2001
-From: MikaelUrankar <mikael.urankar@gmail.com>
-Date: Sat, 3 Oct 2020 18:07:05 +0200
-Subject: [PATCH 14/24] python3 buildscripts/errorcodes.py
-
----
- buildscripts/errorcodes.py | 14 +++++++-------
- 1 file changed, 7 insertions(+), 7 deletions(-)
-
-diff --git a/buildscripts/errorcodes.py b/buildscripts/errorcodes.py
-index cc467899..7d83b11e 100755
---- buildscripts/errorcodes.py
-+++ buildscripts/errorcodes.py
-@@ -9,7 +9,7 @@ Optionally replaces zero codes in source code with new distinct values.
- import bisect
- import os
- import sys
--import utils
-+from . import utils
- from collections import defaultdict, namedtuple
- from optparse import OptionParser
- 
-@@ -66,7 +66,7 @@ def parseSourceFiles( callback ):
- 
-     for sourceFile in utils.getAllSourceFiles(prefix='src/mongo/'):
-         if list_files:
--            print 'scanning file: ' + sourceFile
-+            print ('scanning file: ' + sourceFile)
- 
-         with open(sourceFile) as f:
-             text = f.read()
-@@ -159,7 +159,7 @@ def readErrorCodes():
- 
-     parseSourceFiles( checkDups )
- 
--    if seen.has_key("0"):
-+    if "0" in seen:
-         code = "0"
-         bad = seen[code]
-         errors.append( bad )
-@@ -196,12 +196,12 @@ def replaceBadCodes( errors, nextCode ):
-     for assertLoc in reversed(sorted(set(zero_errors))):
-         (sourceFile, byteOffset, lines, code) = assertLoc
-         lineNum, _ = getLineAndColumnForPosition(assertLoc)
--        print "UPDATING_FILE: %s:%s" % (sourceFile, lineNum)
-+        print ("UPDATING_FILE: %s:%s" % (sourceFile, lineNum))
- 
-         ln = lineNum - 1
- 
-         with open(sourceFile, 'r+') as f:
--            print "LINE_%d_BEFORE:%s" % (lineNum, f.readlines()[ln].rstrip())
-+            print ("LINE_%d_BEFORE:%s" % (lineNum, f.readlines()[ln].rstrip()))
- 
-             f.seek(0)
-             text = f.read()
-@@ -212,7 +212,7 @@ def replaceBadCodes( errors, nextCode ):
-             f.write(text[byteOffset+1:])
-             f.seek(0)
- 
--            print "LINE_%d_AFTER :%s" % (lineNum, f.readlines()[ln].rstrip())
-+            print ("LINE_%d_AFTER :%s" % (lineNum, f.readlines()[ln].rstrip()))
-         nextCode += 1
- 
- 
-@@ -281,7 +281,7 @@ def main():
-     elif options.replace:
-         replaceBadCodes(errors, next)
-     else:
--        print ERROR_HELP
-+        print (ERROR_HELP)
-         sys.exit(1)
- 
- 
--- 
-2.28.0
-
-
-From 6aec2eae836c40b8c3a3f0663ada65a85d593a4e Mon Sep 17 00:00:00 2001
-From: MikaelUrankar <mikael.urankar@gmail.com>
-Date: Sat, 3 Oct 2020 18:22:46 +0200
-Subject: [PATCH 15/24] backport src/mongo/SConscript
-
----
- src/mongo/SConscript | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/src/mongo/SConscript b/src/mongo/SConscript
-index d93eb08f..aa4f6123 100644
---- src/mongo/SConscript
-+++ src/mongo/SConscript
-@@ -157,9 +157,9 @@ js_engine_ver = get_option("js-engine") if get_option("server-js") == "on" else
- 
- # On windows, we need to escape the backslashes in the command-line
- # so that windows paths look okay.
--cmd_line = " ".join(sys.argv).encode('string-escape')
-+cmd_line = " ".join(sys.argv).encode('unicode_escape')
- if env.TargetOSIs('windows'):
--    cmd_line = cmd_line.replace('\\', r'\\')
-+    cmd_line = cmd_line.replace(b'\\', b'\\')
- 
- module_list = '{ %s }' % ', '.join([ '"{0}"'.format(x) for x in env['MONGO_MODULES'] ])
- 
-@@ -613,7 +613,7 @@ env.Append(MODULE_BANNERS = [distsrc.File('README'),
-                              distsrc.File('MPL-2')])
- 
- # If no module has introduced a file named LICENSE.txt, then inject the license.
--if sum(itertools.imap(lambda x: x.name == "LICENSE.txt", env['MODULE_BANNERS'])) == 0:
-+if sum(map(lambda x: x.name == "LICENSE.txt", env['MODULE_BANNERS'])) == 0:
-     env.Append(MODULE_BANNERS = [distsrc.File('LICENSE-Community.txt')])
- 
- # All module banners get staged to the top level of the tarfile, so we
-@@ -632,7 +632,7 @@ module_banner_transforms = ["--transform %s=$SERVER_DIST_BASENAME" % d for d in
- # Allow modules to map original file name directories to subdirectories
- # within the archive (e.g. { "src/mongo/db/modules/enterprise/docs": "snmp"})
- archive_addition_transforms = []
--for full_dir, archive_dir in env["ARCHIVE_ADDITION_DIR_MAP"].items():
-+for full_dir, archive_dir in list(env["ARCHIVE_ADDITION_DIR_MAP"].items()):
-   archive_addition_transforms.append("--transform \"%s=$SERVER_DIST_BASENAME/%s\"" %
-                                      (full_dir, archive_dir))
- 
--- 
-2.28.0
-
-
-From 0ef150e257dedb2fbe3512020ce9583b604b836d Mon Sep 17 00:00:00 2001
-From: MikaelUrankar <mikael.urankar@gmail.com>
-Date: Sat, 3 Oct 2020 18:25:00 +0200
-Subject: [PATCH 16/24] backport buildscripts/idl/idlc.py
-
----
- buildscripts/idl/idlc.py | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/buildscripts/idl/idlc.py b/buildscripts/idl/idlc.py
-index c6bf5056..90cb9ac1 100644
---- buildscripts/idl/idlc.py
-+++ buildscripts/idl/idlc.py
-@@ -29,8 +29,6 @@
- #
- """IDL Compiler Driver Main Entry point."""
- 
--from __future__ import absolute_import, print_function
--
- import argparse
- import logging
- import sys
--- 
-2.28.0
-
-
-From 18d0c5440d9c6f6b6d2a38d600347c92eb47e4d8 Mon Sep 17 00:00:00 2001
-From: MikaelUrankar <mikael.urankar@gmail.com>
-Date: Sat, 3 Oct 2020 18:25:52 +0200
-Subject: [PATCH 17/24] backport src/mongo/db/auth/generate_action_types.py
-
----
- src/mongo/db/auth/generate_action_types.py | 12 ++++++------
- 1 file changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/src/mongo/db/auth/generate_action_types.py b/src/mongo/db/auth/generate_action_types.py
-index 3d3a36c0..618669fd 100755
---- src/mongo/db/auth/generate_action_types.py
-+++ src/mongo/db/auth/generate_action_types.py
-@@ -26,7 +26,6 @@
- # delete this exception statement from your version. If you delete this
- # exception statement from all source files in the program, then also delete
- # it in the license file.
--
- """Generate action_type.{h,cpp}
- 
- Usage:
-@@ -35,7 +34,6 @@ Usage:
- 
- import sys
- 
--
- headerFileTemplate = """// AUTO-GENERATED FILE DO NOT EDIT
- // See src/mongo/db/auth/generate_action_types.py
- /**
-@@ -194,14 +192,14 @@ namespace mongo {
- } // namespace mongo
- """
- 
-+
- def writeSourceFile(actionTypes, sourceOutputFile):
-     actionTypeConstants = ""
-     fromStringIfStatements = ""
-     toStringCaseStatements = ""
-     for actionType in actionTypes:
-         actionTypeConstants += ("    const ActionType ActionType::%(actionType)s"
--                                "(%(actionType)sValue);\n" %
--                                dict(actionType=actionType))
-+                                "(%(actionType)sValue);\n" % dict(actionType=actionType))
-         fromStringIfStatements += """        if (action == "%(actionType)s") {
-             *result = %(actionType)s;
-             return Status::OK();
-@@ -215,6 +213,7 @@ def writeSourceFile(actionTypes, sourceOutputFile):
- 
-     pass
- 
-+
- def writeHeaderFile(actionTypes, headerOutputFile):
-     actionTypeConstants = ""
-     actionTypeIdentifiers = ""
-@@ -225,6 +224,7 @@ def writeHeaderFile(actionTypes, headerOutputFile):
-                                                     actionTypeIdentifiers=actionTypeIdentifiers)
-     headerOutputFile.write(formattedHeaderFile)
- 
-+
- def hasDuplicateActionTypes(actionTypes):
-     sortedActionTypes = sorted(actionTypes)
- 
-@@ -232,7 +232,7 @@ def hasDuplicateActionTypes(actionTypes):
-     prevActionType = sortedActionTypes[0]
-     for actionType in sortedActionTypes[1:]:
-         if actionType == prevActionType:
--            print 'Duplicate actionType %s\n' % actionType
-+            print('Duplicate actionType %s\n' % actionType)
-             didFail = True
-         prevActionType = actionType
- 
-@@ -245,7 +245,7 @@ def parseActionTypesFromFile(actionTypesFilename):
- 
- if __name__ == "__main__":
-     if len(sys.argv) != 4:
--        print "Usage: generate_action_types.py <path to action_types.txt> <header file path> <source file path>"
-+        print("Usage: generate_action_types.py <path to action_types.txt> <header file path> <source file path>")
-         sys.exit(-1)
- 
-     actionTypes = parseActionTypesFromFile(sys.argv[1])
--- 
-2.28.0
-
-
-From 6df9773b207f90692bda010f2778f57f957944ff Mon Sep 17 00:00:00 2001
-From: MikaelUrankar <mikael.urankar@gmail.com>
-Date: Sat, 3 Oct 2020 18:29:19 +0200
-Subject: [PATCH 18/24] backport buildscripts/idl/idl/compiler.py
-
----
- buildscripts/idl/idl/compiler.py | 10 ++++------
- 1 file changed, 4 insertions(+), 6 deletions(-)
-
-diff --git a/buildscripts/idl/idl/compiler.py b/buildscripts/idl/idl/compiler.py
-index 0905a18e..19aaf436 100644
---- buildscripts/idl/idl/compiler.py
-+++ buildscripts/idl/idl/compiler.py
-@@ -31,8 +31,6 @@ IDL compiler driver.
- Orchestrates the 3 passes (parser, binder, and generator) together.
- """
- 
--from __future__ import absolute_import, print_function, unicode_literals
--
- import io
- import logging
- import os
-@@ -66,14 +64,14 @@ class CompilerImportResolver(parser.ImportResolverBase):
-     """Class for the IDL compiler to resolve imported files."""
- 
-     def __init__(self, import_directories):
--        # type: (List[unicode]) -> None
-+        # type: (List[str]) -> None
-         """Construct a ImportResolver."""
-         self._import_directories = import_directories
- 
-         super(CompilerImportResolver, self).__init__()
- 
-     def resolve(self, base_file, imported_file_name):
--        # type: (unicode, unicode) -> unicode
-+        # type: (str, str) -> str
-         """Return the complete path to an imported file name."""
- 
-         logging.debug("Resolving imported file '%s' for file '%s'", imported_file_name, base_file)
-@@ -104,7 +102,7 @@ class CompilerImportResolver(parser.ImportResolverBase):
-         raise errors.IDLError(msg)
- 
-     def open(self, resolved_file_name):
--        # type: (unicode) -> Any
-+        # type: (str) -> Any
-         """Return an io.Stream for the requested file."""
-         return io.open(resolved_file_name, encoding='utf-8')
- 
-@@ -121,7 +119,7 @@ def _write_dependencies(spec):
- 
- 
- def _update_import_includes(args, spec, header_file_name):
--    # type: (CompilerArgs, syntax.IDLSpec, unicode) -> None
-+    # type: (CompilerArgs, syntax.IDLSpec, str) -> None
-     """Update the list of imports with a list of include files for each import with structs."""
-     # This function is fragile:
-     # In order to try to generate headers with an "include what you use" set of headers, the IDL
--- 
-2.28.0
-
-
-From 8e28ce9f7b396b16ad9d574a754b5e40fd063ed4 Mon Sep 17 00:00:00 2001
-From: MikaelUrankar <mikael.urankar@gmail.com>
-Date: Sat, 3 Oct 2020 18:31:51 +0200
-Subject: [PATCH 19/24] backport buildscripts/idl/idl/syntax.py
-
----
- buildscripts/idl/idl/syntax.py | 83 ++++++++++++++++------------------
- 1 file changed, 40 insertions(+), 43 deletions(-)
-
-diff --git a/buildscripts/idl/idl/syntax.py b/buildscripts/idl/idl/syntax.py
-index 492a7b99..96ac5090 100644
---- buildscripts/idl/idl/syntax.py
-+++ buildscripts/idl/idl/syntax.py
-@@ -33,8 +33,6 @@ It maps 1-1 to the YAML file, and has not been checked if
- it follows the rules of the IDL, etc.
- """
- 
--from __future__ import absolute_import, print_function, unicode_literals
--
- import itertools
- from typing import Any, Dict, Iterator, List, Optional, Tuple, Union
- 
-@@ -70,7 +68,7 @@ class IDLSpec(object):
- 
- 
- def parse_array_type(name):
--    # type: (unicode) -> unicode
-+    # type: (str) -> str
-     """Parse a type name of the form 'array<type>' and extract type."""
-     if not name.startswith("array<") and not name.endswith(">"):
-         return None
-@@ -94,8 +92,7 @@ def _zip_scalar(items, obj):
- def _item_and_type(dic):
-     # type: (Dict[Any, List[Any]]) -> Iterator[Tuple[Any, Any]]
-     """Return an Iterator of (key, value) pairs from a dictionary."""
--    return itertools.chain.from_iterable((_zip_scalar(value, key)
--                                          for (key, value) in dic.viewitems()))
-+    return itertools.chain.from_iterable((_zip_scalar(value, key) for (key, value) in dic.items()))
- 
- 
- class SymbolTable(object):
-@@ -115,7 +112,7 @@ class SymbolTable(object):
-         self.types = []  # type: List[Type]
- 
-     def _is_duplicate(self, ctxt, location, name, duplicate_class_name):
--        # type: (errors.ParserContext, common.SourceLocation, unicode, unicode) -> bool
-+        # type: (errors.ParserContext, common.SourceLocation, str, str) -> bool
-         """Return true if the given item already exist in the symbol table."""
-         for (item, entity_type) in _item_and_type({
-                 "command": self.commands,
-@@ -179,12 +176,12 @@ class SymbolTable(object):
-             self.add_type(ctxt, idltype)
- 
-     def resolve_field_type(self, ctxt, location, field_name, type_name):
--        # type: (errors.ParserContext, common.SourceLocation, unicode, unicode) -> Optional[Union[Command, Enum, Struct, Type]]
-+        # type: (errors.ParserContext, common.SourceLocation, str, str) -> Optional[Union[Command, Enum, Struct, Type]]
-         """Find the type or struct a field refers to or log an error."""
-         return self._resolve_field_type(ctxt, location, field_name, type_name)
- 
-     def _resolve_field_type(self, ctxt, location, field_name, type_name):
--        # type: (errors.ParserContext, common.SourceLocation, unicode, unicode) -> Optional[Union[Command, Enum, Struct, Type]]
-+        # type: (errors.ParserContext, common.SourceLocation, str, str) -> Optional[Union[Command, Enum, Struct, Type]]
-         """Find the type or struct a field refers to or log an error."""
-         # pylint: disable=too-many-return-statements
- 
-@@ -237,15 +234,15 @@ class Import(common.SourceLocation):
-     """IDL imports object."""
- 
-     def __init__(self, file_name, line, column):
--        # type: (unicode, int, int) -> None
-+        # type: (str, int, int) -> None
-         """Construct an Imports section."""
--        self.imports = []  # type: List[unicode]
-+        self.imports = []  # type: List[str]
- 
-         # These are not part of the IDL syntax but are produced by the parser.
-         # List of imports with structs.
--        self.resolved_imports = []  # type: List[unicode]
-+        self.resolved_imports = []  # type: List[str]
-         # All imports directly or indirectly included
--        self.dependencies = []  # type: List[unicode]
-+        self.dependencies = []  # type: List[str]
- 
-         super(Import, self).__init__(file_name, line, column)
- 
-@@ -262,16 +259,16 @@ class Type(common.SourceLocation):
-     # pylint: disable=too-many-instance-attributes
- 
-     def __init__(self, file_name, line, column):
--        # type: (unicode, int, int) -> None
-+        # type: (str, int, int) -> None
-         """Construct a Type."""
--        self.name = None  # type: unicode
--        self.description = None  # type: unicode
--        self.cpp_type = None  # type: unicode
--        self.bson_serialization_type = None  # type: List[unicode]
--        self.bindata_subtype = None  # type: unicode
--        self.serializer = None  # type: unicode
--        self.deserializer = None  # type: unicode
--        self.default = None  # type: unicode
-+        self.name = None  # type: str
-+        self.description = None  # type: str
-+        self.cpp_type = None  # type: str
-+        self.bson_serialization_type = None  # type: List[str]
-+        self.bindata_subtype = None  # type: str
-+        self.serializer = None  # type: str
-+        self.deserializer = None  # type: str
-+        self.default = None  # type: str
- 
-         super(Type, self).__init__(file_name, line, column)
- 
-@@ -288,15 +285,15 @@ class Field(common.SourceLocation):
-     # pylint: disable=too-many-instance-attributes
- 
-     def __init__(self, file_name, line, column):
--        # type: (unicode, int, int) -> None
-+        # type: (str, int, int) -> None
-         """Construct a Field."""
--        self.name = None  # type: unicode
--        self.cpp_name = None  # type: unicode
--        self.description = None  # type: unicode
--        self.type = None  # type: unicode
-+        self.name = None  # type: str
-+        self.cpp_name = None  # type: str
-+        self.description = None  # type: str
-+        self.type = None  # type: str
-         self.ignore = False  # type: bool
-         self.optional = False  # type: bool
--        self.default = None  # type: unicode
-+        self.default = None  # type: str
-         self.supports_doc_sequence = False  # type: bool
- 
-         # Internal fields - not generated by parser
-@@ -314,10 +311,10 @@ class ChainedStruct(common.SourceLocation):
-     """
- 
-     def __init__(self, file_name, line, column):
--        # type: (unicode, int, int) -> None
-+        # type: (str, int, int) -> None
-         """Construct a Type."""
--        self.name = None  # type: unicode
--        self.cpp_name = None  # type: unicode
-+        self.name = None  # type: str
-+        self.cpp_name = None  # type: str
- 
-         super(ChainedStruct, self).__init__(file_name, line, column)
- 
-@@ -330,10 +327,10 @@ class ChainedType(common.SourceLocation):
-     """
- 
-     def __init__(self, file_name, line, column):
--        # type: (unicode, int, int) -> None
-+        # type: (str, int, int) -> None
-         """Construct a Type."""
--        self.name = None  # type: unicode
--        self.cpp_name = None  # type: unicode
-+        self.name = None  # type: str
-+        self.cpp_name = None  # type: str
- 
-         super(ChainedType, self).__init__(file_name, line, column)
- 
-@@ -348,10 +345,10 @@ class Struct(common.SourceLocation):
-     # pylint: disable=too-many-instance-attributes
- 
-     def __init__(self, file_name, line, column):
--        # type: (unicode, int, int) -> None
-+        # type: (str, int, int) -> None
-         """Construct a Struct."""
--        self.name = None  # type: unicode
--        self.description = None  # type: unicode
-+        self.name = None  # type: str
-+        self.description = None  # type: str
-         self.strict = True  # type: bool
-         self.immutable = False  # type: bool
-         self.inline_chained_structs = False  # type: bool
-@@ -389,10 +386,10 @@ class EnumValue(common.SourceLocation):
-     """
- 
-     def __init__(self, file_name, line, column):
--        # type: (unicode, int, int) -> None
-+        # type: (str, int, int) -> None
-         """Construct an Enum."""
--        self.name = None  # type: unicode
--        self.value = None  # type: unicode
-+        self.name = None  # type: str
-+        self.value = None  # type: str
- 
-         super(EnumValue, self).__init__(file_name, line, column)
- 
-@@ -405,11 +402,11 @@ class Enum(common.SourceLocation):
-     """
- 
-     def __init__(self, file_name, line, column):
--        # type: (unicode, int, int) -> None
-+        # type: (str, int, int) -> None
-         """Construct an Enum."""
--        self.name = None  # type: unicode
--        self.description = None  # type: unicode
--        self.type = None  # type: unicode
-+        self.name = None  # type: str
-+        self.description = None  # type: str
-+        self.type = None  # type: str
-         self.values = None  # type: List[EnumValue]
- 
-         # Internal property that is not represented as syntax. An imported enum is read from an
--- 
-2.28.0
-
-
-From 90f2a9fb3ebe659b3d884e3a94bb5fc0a8ef5f69 Mon Sep 17 00:00:00 2001
-From: MikaelUrankar <mikael.urankar@gmail.com>
-Date: Sat, 3 Oct 2020 18:35:50 +0200
-Subject: [PATCH 20/24] backport src/mongo/base/generate_error_codes.py
-
----
- src/mongo/base/generate_error_codes.py | 24 ++++++++++++++----------
- 1 file changed, 14 insertions(+), 10 deletions(-)
-
-diff --git a/src/mongo/base/generate_error_codes.py b/src/mongo/base/generate_error_codes.py
-index 5de9e524..6538b6b5 100644
---- src/mongo/base/generate_error_codes.py
-+++ src/mongo/base/generate_error_codes.py
-@@ -26,7 +26,6 @@
- # delete this exception statement from your version. If you delete this
- # exception statement from all source files in the program, then also delete
- # it in the license file.
--
- """Generate error_codes.{h,cpp} from error_codes.err.
- 
- Format of error_codes.err:
-@@ -51,10 +50,9 @@ def render_template(template_path, **kw):
-        returns the result as a string'''
- 
-     template = Template.compile(
--            file=template_path,
--            compilerSettings=dict(directiveStartToken="//#",directiveEndToken="//#"),
--            baseclass=dict,
--            useCache=False)
-+         file=template_path,
-+         compilerSettings=dict(directiveStartToken="//#", directiveEndToken="//#",
-+                               commentStartToken="//##"), baseclass=dict, useCache=False)
-     return str(template(**kw))
- 
- class ErrorCode:
-@@ -63,11 +61,13 @@ class ErrorCode:
-         self.code = code
-         self.categories = []
- 
-+
- class ErrorClass:
-     def __init__(self, name, codes):
-         self.name = name
-         self.codes = codes
- 
-+
- def main(argv):
-     # Parse and validate argv.
-     if len(sys.argv) < 2:
-@@ -94,7 +94,7 @@ def main(argv):
-                 categories=error_classes,
-                 )
- 
--        with open(output, 'wb') as outfile:
-+        with open(output, 'w') as outfile:
-             outfile.write(text)
- 
- def die(message=None):
-@@ -126,6 +126,7 @@ def check_for_conflicts(error_codes, error_classes):
-     if failed:
-         die()
- 
-+
- def has_duplicate_error_codes(error_codes):
-     sorted_by_name = sorted(error_codes, key=lambda x: x.name)
-     sorted_by_code = sorted(error_codes, key=lambda x: x.code)
-@@ -134,21 +135,22 @@ def has_duplicate_error_codes(error_codes):
-     prev = sorted_by_name[0]
-     for curr in sorted_by_name[1:]:
-         if curr.name == prev.name:
--            sys.stdout.write('Duplicate name %s with codes %s and %s\n'
--                    % (curr.name, curr.code, prev.code))
-+            sys.stdout.write(
-+                'Duplicate name %s with codes %s and %s\n' % (curr.name, curr.code, prev.code))
-             failed = True
-         prev = curr
- 
-     prev = sorted_by_code[0]
-     for curr in sorted_by_code[1:]:
-         if curr.code == prev.code:
--            sys.stdout.write('Duplicate code %s with names %s and %s\n'
--                    % (curr.code, curr.name, prev.name))
-+            sys.stdout.write(
-+                'Duplicate code %s with names %s and %s\n' % (curr.code, curr.name, prev.name))
-             failed = True
-         prev = curr
- 
-     return failed
- 
-+
- def has_duplicate_error_classes(error_classes):
-     names = sorted(ec.name for ec in error_classes)
- 
-@@ -161,6 +163,7 @@ def has_duplicate_error_classes(error_classes):
-         prev_name = name
-     return failed
- 
-+
- def has_missing_error_codes(error_codes, error_classes):
-     code_names = dict((ec.name, ec) for ec in error_codes)
-     failed = False
-@@ -174,5 +177,6 @@ def has_missing_error_codes(error_codes, error_classes):
- 
-     return failed
- 
-+
- if __name__ == '__main__':
-     main(sys.argv)
--- 
-2.28.0
-
-
-From 4418d8f8c9e432e380a4e611f5475ba3a4d76699 Mon Sep 17 00:00:00 2001
-From: MikaelUrankar <mikael.urankar@gmail.com>
-Date: Sat, 3 Oct 2020 19:34:19 +0200
-Subject: [PATCH 21/24] backport site_scons/site_tools/idl_tool.py
-
----
- site_scons/site_tools/idl_tool.py | 14 +++++---------
- 1 file changed, 5 insertions(+), 9 deletions(-)
-
-diff --git a/site_scons/site_tools/idl_tool.py b/site_scons/site_tools/idl_tool.py
-index 78bedfaa..fc53b3ae 100755
---- site_scons/site_tools/idl_tool.py
-+++ site_scons/site_tools/idl_tool.py
-@@ -21,6 +21,7 @@ import sys
- 
- import SCons
- 
-+
- def idlc_emitter(target, source, env):
-     """For each input IDL file, the tool produces a .cpp and .h file."""
-     first_source = str(source[0])
-@@ -43,7 +44,7 @@ IDLCAction = SCons.Action.Action('$IDLCCOM', '$IDLCCOMSTR')
- def idl_scanner(node, env, path):
-     # Use the import scanner mode of the IDL compiler to file imported files
-     cmd = [sys.executable, "buildscripts/idl/idlc.py",  '--include','src', str(node), '--write-dependencies']
--    deps_str = subprocess.check_output(cmd)
-+    deps_str = subprocess.check_output(cmd).decode('utf-8')
- 
-     deps_list = deps_str.splitlines()
- 
-@@ -57,19 +58,14 @@ def idl_scanner(node, env, path):
- idl_scanner = SCons.Scanner.Scanner(function=idl_scanner, skeys=['.idl'])
- 
- # TODO: create a scanner for imports when imports are implemented
--IDLCBuilder = SCons.Builder.Builder(
--    action=IDLCAction,
--    emitter=idlc_emitter,
--    srcsuffx=".idl",
--    suffix=".cpp",
--    source_scanner = idl_scanner
--    )
-+IDLCBuilder = SCons.Builder.Builder(action=IDLCAction, emitter=idlc_emitter, srcsuffx=".idl",
-+                                    suffix=".cpp", source_scanner=idl_scanner)
- 
- 
- def generate(env):
-     bld = IDLCBuilder
- 
--    env.Append(SCANNERS = idl_scanner)
-+    env.Append(SCANNERS=idl_scanner)
- 
-     env['BUILDERS']['Idlc'] = bld
- 
--- 
-2.28.0
-
-
-From 185809c361b8c495002ed26485237164d31de367 Mon Sep 17 00:00:00 2001
-From: MikaelUrankar <mikael.urankar@gmail.com>
-Date: Sat, 3 Oct 2020 19:53:37 +0200
-Subject: [PATCH 22/24] backport
- src/mongo/db/query/collation/generate_icu_init_cpp.py
-
----
- src/mongo/db/query/collation/generate_icu_init_cpp.py | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/src/mongo/db/query/collation/generate_icu_init_cpp.py b/src/mongo/db/query/collation/generate_icu_init_cpp.py
-index a95740b8..2a550a0c 100755
---- src/mongo/db/query/collation/generate_icu_init_cpp.py
-+++ src/mongo/db/query/collation/generate_icu_init_cpp.py
-@@ -31,6 +31,7 @@ import optparse
- import os
- import sys
- 
-+
- def main(argv):
-     parser = optparse.OptionParser()
-     parser.add_option('-o', '--output', action='store', dest='output_cpp_file',
-@@ -46,6 +47,7 @@ def main(argv):
-         parser.error("input ICU data file unspecified")
-     generate_cpp_file(options.input_data_file, options.output_cpp_file)
- 
-+
- def generate_cpp_file(data_file_path, cpp_file_path):
-     source_template = '''// AUTO-GENERATED FILE DO NOT EDIT
- // See generate_icu_init_cpp.py.
-@@ -112,8 +114,8 @@ MONGO_INITIALIZER(LoadICUData)(InitializerContext* context) {
- '''
-     decimal_encoded_data = ''
-     with open(data_file_path, 'rb') as data_file:
--        decimal_encoded_data = ','.join([str(ord(byte)) for byte in data_file.read()])
--    with open(cpp_file_path, 'wb') as cpp_file:
-+        decimal_encoded_data = ','.join([str(byte) for byte in data_file.read()])
-+    with open(cpp_file_path, 'w') as cpp_file:
-         cpp_file.write(source_template % dict(decimal_encoded_data=decimal_encoded_data))
- 
- if __name__ == '__main__':
--- 
-2.28.0
-
-
-From 636d99fde6ba86fb3d4ae959e5ea9433e94f2390 Mon Sep 17 00:00:00 2001
-From: MikaelUrankar <mikael.urankar@gmail.com>
-Date: Sat, 3 Oct 2020 20:02:29 +0200
-Subject: [PATCH 23/24] backport site_scons/site_tools/jstoh.py
-
----
- site_scons/site_tools/jstoh.py | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/site_scons/site_tools/jstoh.py b/site_scons/site_tools/jstoh.py
-index dc90b324..d8998179 100644
---- site_scons/site_tools/jstoh.py
-+++ site_scons/site_tools/jstoh.py
-@@ -39,8 +39,8 @@ def jsToHeader(target, source):
- 
-     text = '\n'.join(h)
- 
--    print "writing: %s" % outFile
--    with open(outFile, 'wb') as out:
-+    print ("writing: %s" % outFile)
-+    with open(outFile, 'w') as out:
-         try:
-             out.write(text)
-         finally:
-@@ -49,7 +49,7 @@ def jsToHeader(target, source):
- 
- if __name__ == "__main__":
-     if len(sys.argv) < 3:
--        print "Must specify [target] [source] "
-+        print("Must specify [target] [source] ")
-         sys.exit(1)
- 
-     jsToHeader(sys.argv[1], sys.argv[2:])
--- 
-2.28.0
-
-
-From 7edbc7b873c0dc04fb96b125a8749fa29f7b8baf Mon Sep 17 00:00:00 2001
-From: MikaelUrankar <mikael.urankar@gmail.com>
-Date: Sat, 3 Oct 2020 20:08:21 +0200
-Subject: [PATCH 24/24] backport src/mongo/db/fts/generate_stop_words.py
-
----
- src/mongo/db/fts/generate_stop_words.py | 9 +++++----
- 1 file changed, 5 insertions(+), 4 deletions(-)
-
-diff --git a/src/mongo/db/fts/generate_stop_words.py b/src/mongo/db/fts/generate_stop_words.py
-index e0dc801c..6893ba91 100644
---- src/mongo/db/fts/generate_stop_words.py
-+++ src/mongo/db/fts/generate_stop_words.py
-@@ -7,7 +7,7 @@ def generate( header, source, language_files ):
-     for x in language_files:
-         print( "\t%s" % x )
- 
--    out = open( header, "wb" )
-+    out = open( header, "w" )
-     out.write( """
- #pragma once
- #include <set>
-@@ -24,8 +24,8 @@ namespace fts {
- 
- 
- 
--    out = open( source, "wb" )
--    out.write( '#include "%s"' % header.rpartition( "/" )[2].rpartition( "\\" )[2] )
-+    out = open( source, "w", encoding='utf-8')
-+    out.write( '#include "{}"'.format(header.rpartition( "/" )[2].rpartition( "\\" )[2]) )
-     out.write( """
- namespace mongo {
- namespace fts {
-@@ -41,12 +41,13 @@ namespace fts {
-         out.write( '  {\n' )
-         out.write( '   const char* const words[] = {\n' )
-         for word in open( l_file, "rb" ):
--            out.write( '       "%s",\n' % word.strip() )
-+            out.write( '       "%s",\n' % word.decode('utf-8').strip() )
-         out.write( '   };\n' )
-         out.write( '   const size_t wordcnt = sizeof(words) / sizeof(words[0]);\n' )
-         out.write( '   std::set< std::string >& l = (*m)["%s"];\n' % l )
-         out.write( '   l.insert(&words[0], &words[wordcnt]);\n' )
-         out.write( '  }\n' )
-+
-     out.write( """
-   }
- } // namespace fts
--- 
-2.28.0
-
diff --git a/databases/mongodb36/files/patch-rpm_mongod.conf b/databases/mongodb36/files/patch-rpm_mongod.conf
deleted file mode 100644
index 77f3b6026daf..000000000000
--- a/databases/mongodb36/files/patch-rpm_mongod.conf
+++ /dev/null
@@ -1,25 +0,0 @@
---- rpm/mongod.conf.orig	2018-01-04 23:28:55 UTC
-+++ rpm/mongod.conf
-@@ -7,11 +7,11 @@
- systemLog:
-   destination: file
-   logAppend: true
--  path: /var/log/mongodb/mongod.log
-+  path: /var/db/mongodb/mongod.log 
- 
- # Where and how to store data.
- storage:
--  dbPath: /var/lib/mongo
-+  dbPath: /var/db/mongodb 
-   journal:
-     enabled: true
- #  engine:
-@@ -21,7 +21,7 @@ storage:
- # how the process runs
- processManagement:
-   fork: true  # fork and run in background
--  pidFilePath: /var/run/mongodb/mongod.pid  # location of pidfile
-+  pidFilePath: /var/db/mongodb/mongod.lock  # location of pidfile
-   timeZoneInfo: /usr/share/zoneinfo
- 
- # network interfaces
diff --git a/databases/mongodb36/files/patch-src_mongo_base_error__codes.tpl.h b/databases/mongodb36/files/patch-src_mongo_base_error__codes.tpl.h
deleted file mode 100644
index b8846b503b70..000000000000
--- a/databases/mongodb36/files/patch-src_mongo_base_error__codes.tpl.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/mongo/base/error_codes.tpl.h.orig	2019-08-13 23:47:34 UTC
-+++ src/mongo/base/error_codes.tpl.h
-@@ -118,7 +118,7 @@ template <int32_t code>
- constexpr bool isNamedCode = false;
- //#for $ec in $codes
- template <>
--constexpr bool isNamedCode<ErrorCodes::$ec.name> = true;
-+constexpr inline bool isNamedCode<ErrorCodes::$ec.name> = true;
- //#end for
- 
- MONGO_COMPILER_NORETURN void throwExceptionForStatus(const Status& status);
diff --git a/databases/mongodb36/pkg-descr b/databases/mongodb36/pkg-descr
deleted file mode 100644
index 54992a7f4681..000000000000
--- a/databases/mongodb36/pkg-descr
+++ /dev/null
@@ -1,5 +0,0 @@
-Mongo (from "humongous") is a high-performance, open source,
-schema-free, document-oriented database. A common name in the
-"NOSQL" community.
-
-WWW: https://docs.mongodb.com/v3.6/
diff --git a/databases/mongodb36/pkg-plist b/databases/mongodb36/pkg-plist
deleted file mode 100644
index d47470ba2b6b..000000000000
--- a/databases/mongodb36/pkg-plist
+++ /dev/null
@@ -1,6 +0,0 @@
-bin/install_compass
-bin/mongo
-bin/mongod
-bin/mongoperf
-bin/mongos
-@sample etc/mongodb.conf.sample
diff --git a/databases/mongodb40-tools/Makefile b/databases/mongodb40-tools/Makefile
deleted file mode 100644
index d56a26d0dc93..000000000000
--- a/databases/mongodb40-tools/Makefile
+++ /dev/null
@@ -1,64 +0,0 @@
-PORTNAME=	mongodb40-tools
-DISTVERSIONPREFIX=	r
-DISTVERSION=	4.0.24
-CATEGORIES=	databases
-
-MAINTAINER=	dev.ashevchuk@gmail.com
-COMMENT=	Tools for MongoDB
-
-LICENSE=	APACHE20
-LICENSE_FILE=	${WRKSRC}/LICENSE.md
-
-ONLY_FOR_ARCHS=	aarch64 amd64 armv7 i386
-ONLY_FOR_ARCHS_REASON=	not yet ported to other architectures
-
-USES=		compiler:c++14-lang go localbase
-USE_GITHUB=	yes
-GH_ACCOUNT=	mongodb
-GH_PROJECT=	mongo-tools
-
-GO_BUILDFLAGS=	-tags "${USE_MY_TAGS}"
-GO_PKGNAME=	github.com/${GH_ACCOUNT}/${GH_PROJECT}
-
-CONFLICTS_INSTALL=	mongodb36-tools mongodb42-tools mongodb-tools
-
-OPTIONS_DEFINE=		DOCS
-OPTIONS_DEFAULT=	MONGODUMP MONGOEXPORT MONGOFILES MONGOIMPORT \
-			MONGORESTORE SASL SSL
-OPTIONS_MULTI=		SECURITY TOOLS
-OPTIONS_MULTI_TOOLS=	BSONDUMP MONGODUMP MONGOEXPORT MONGOFILES MONGOIMPORT \
-			MONGOREPLAY MONGORESTORE MONGOSTAT MONGOTOP
-OPTIONS_MULTI_SECURITY=	SASL SSL
-OPTIONS_SUB=		yes
-
-BSONDUMP_DESC=		BSON files into human-readable formats
-MONGOSTAT_DESC=		Status of a running mongod or mongos instance
-MONGOFILES_DESC=	Interface to GridFS in a MongoDB instance
-MONGOEXPORT_DESC=	JSON or CSV export of MongoDB instance data
-MONGOIMPORT_DESC=	Importing JSON, CSV, or TSV into a MongoDB instance
-MONGORESTORE_DESC=	BSON data to a MongoDB instance
-MONGODUMP_DESC=		BSON data from the contents of a MongoDB instance
-MONGOTOP_DESC=		Track the amount of data I/O time
-MONGOREPLAY_DESC=	Traffic capture and replay tool
-
-BSONDUMP_VARS=		go_target+=./bsondump/main:bsondump
-MONGOSTAT_VARS=		go_target+=./mongostat/main:mongostat
-MONGOFILES_VARS=	go_target+=./mongofiles/main:mongofiles
-MONGOEXPORT_VARS=	go_target+=./mongoexport/main:mongoexport
-MONGOIMPORT_VARS=	go_target+=./mongoimport/main:mongoimport
-MONGORESTORE_VARS=	go_target+=./mongorestore/main:mongorestore
-MONGODUMP_VARS=		go_target+=./mongodump/main:mongodump
-MONGOTOP_VARS=		go_target+=./mongotop/main:mongotop
-MONGOREPLAY_VARS=	go_target+=./mongoreplay/main:mongoreplay
-SASL_LIB_DEPENDS=	libsasl2.so:security/cyrus-sasl2
-SASL_USE=		my_tags=sasl
-SSL_USES=		ssl
-SSL_USE=		my_tags=ssl
-
-post-install-DOCS-on:
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-.for doc in README.md CONTRIBUTING.md THIRD-PARTY-NOTICES
-	${INSTALL_MAN} ${WRKSRC}/${doc} ${STAGEDIR}${DOCSDIR}
-.endfor
-
-.include <bsd.port.mk>
diff --git a/databases/mongodb40-tools/distinfo b/databases/mongodb40-tools/distinfo
deleted file mode 100644
index c872d1e1b590..000000000000
--- a/databases/mongodb40-tools/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1618524070
-SHA256 (mongodb-mongo-tools-r4.0.24_GH0.tar.gz) = 0d8d7e980c5ec6b2e3c7dca9e2eb53ddc092e9f82d983df81d3b012d164f1e51
-SIZE (mongodb-mongo-tools-r4.0.24_GH0.tar.gz) = 11148198
diff --git a/databases/mongodb40-tools/files/patch-common_util_file.go b/databases/mongodb40-tools/files/patch-common_util_file.go
deleted file mode 100644
index c80484150d59..000000000000
--- a/databases/mongodb40-tools/files/patch-common_util_file.go
+++ /dev/null
@@ -1,325 +0,0 @@
---- common/util/file.go.orig  2018-11-21 17:52:58 UTC
-+++ common/util/file.go
-@@ -9,11 +9,68 @@
- import (
- 	"bufio"
- 	"io"
--	"net/url"
- 	"os"
- 	"path/filepath"
-+	"strconv"
- )
- 
-+// Error reports an error and the operation and URL that caused it.
-+type Error struct {
-+	Op  string
-+	URL string
-+	Err error
-+}
-+
-+func (e *Error) Error() string { return e.Op + " " + e.URL + ": " + e.Err.Error() }
-+
-+func ishex(c byte) bool {
-+	switch {
-+	case '0' <= c && c <= '9':
-+		return true
-+	case 'a' <= c && c <= 'f':
-+		return true
-+	case 'A' <= c && c <= 'F':
-+		return true
-+	}
-+	return false
-+}
-+
-+func unhex(c byte) byte {
-+	switch {
-+	case '0' <= c && c <= '9':
-+		return c - '0'
-+	case 'a' <= c && c <= 'f':
-+		return c - 'a' + 10
-+	case 'A' <= c && c <= 'F':
-+		return c - 'A' + 10
-+	}
-+	return 0
-+}
-+
-+type encoding int
-+
-+const (
-+	encodePath encoding = 1 + iota
-+	encodePathSegment
-+	encodeHost
-+	encodeZone
-+	encodeUserPassword
-+	encodeQueryComponent
-+	encodeFragment
-+)
-+
-+type EscapeError string
-+
-+func (e EscapeError) Error() string {
-+	return "invalid URL escape " + strconv.Quote(string(e))
-+}
-+
-+type InvalidHostError string
-+
-+func (e InvalidHostError) Error() string {
-+	return "invalid character " + strconv.Quote(string(e)) + " in host name"
-+}
-+
- // GetFieldsFromFile fetches the first line from the contents of the file
- // at "path"
- func GetFieldsFromFile(path string) ([]string, error) {
-@@ -42,11 +99,11 @@
- }
- 
- func EscapeCollectionName(collName string) string {
--	return url.PathEscape(collName)
-+	return PathEscape(collName)
- }
- 
- func UnescapeCollectionName(escapedCollName string) (string, error) {
--	return url.PathUnescape(escapedCollName)
-+	return PathUnescape(escapedCollName)
- }
- 
- type WrappedReadCloser struct {
-@@ -76,3 +133,238 @@
- 	}
- 	return innerErr
- }
-+
-+// Return true if the specified character should be escaped when
-+// appearing in a URL string, according to RFC 3986.
-+//
-+// Please be informed that for now shouldEscape does not check all
-+// reserved characters correctly. See golang.org/issue/5684.
-+func shouldEscape(c byte, mode encoding) bool {
-+	// §2.3 Unreserved characters (alphanum)
-+	if 'A' <= c && c <= 'Z' || 'a' <= c && c <= 'z' || '0' <= c && c <= '9' {
-+		return false
-+	}
-+
-+	if mode == encodeHost || mode == encodeZone {
-+		// §3.2.2 Host allows
-+		//	sub-delims = "!" / "$" / "&" / "'" / "(" / ")" / "*" / "+" / "," / ";" / "="
-+		// as part of reg-name.
-+		// We add : because we include :port as part of host.
-+		// We add [ ] because we include [ipv6]:port as part of host.
-+		// We add < > because they're the only characters left that
-+		// we could possibly allow, and Parse will reject them if we
-+		// escape them (because hosts can't use %-encoding for
-+		// ASCII bytes).
-+		switch c {
-+		case '!', '$', '&', '\'', '(', ')', '*', '+', ',', ';', '=', ':', '[', ']', '<', '>', '"':
-+			return false
-+		}
-+	}
-+
-+	switch c {
-+	case '-', '_', '.', '~': // §2.3 Unreserved characters (mark)
-+		return false
-+
-+	case '$', '&', '+', ',', '/', ':', ';', '=', '?', '@': // §2.2 Reserved characters (reserved)
-+		// Different sections of the URL allow a few of
-+		// the reserved characters to appear unescaped.
-+		switch mode {
-+		case encodePath: // §3.3
-+			// The RFC allows : @ & = + $ but saves / ; , for assigning
-+			// meaning to individual path segments. This package
-+			// only manipulates the path as a whole, so we allow those
-+			// last three as well. That leaves only ? to escape.
-+			return c == '?'
-+
-+		case encodePathSegment: // §3.3
-+			// The RFC allows : @ & = + $ but saves / ; , for assigning
-+			// meaning to individual path segments.
-+			return c == '/' || c == ';' || c == ',' || c == '?'
-+
-+		case encodeUserPassword: // §3.2.1
-+			// The RFC allows ';', ':', '&', '=', '+', '$', and ',' in
-+			// userinfo, so we must escape only '@', '/', and '?'.
-+			// The parsing of userinfo treats ':' as special so we must escape
-+			// that too.
-+			return c == '@' || c == '/' || c == '?' || c == ':'
-+
-+		case encodeQueryComponent: // §3.4
-+			// The RFC reserves (so we must escape) everything.
-+			return true
-+
-+		case encodeFragment: // §4.1
-+			// The RFC text is silent but the grammar allows
-+			// everything, so escape nothing.
-+			return false
-+		}
-+	}
-+
-+	if mode == encodeFragment {
-+		// RFC 3986 §2.2 allows not escaping sub-delims. A subset of sub-delims are
-+		// included in reserved from RFC 2396 §2.2. The remaining sub-delims do not
-+		// need to be escaped. To minimize potential breakage, we apply two restrictions:
-+		// (1) we always escape sub-delims outside of the fragment, and (2) we always
-+		// escape single quote to avoid breaking callers that had previously assumed that
-+		// single quotes would be escaped. See issue #19917.
-+		switch c {
-+		case '!', '(', ')', '*':
-+			return false
-+		}
-+	}
-+
-+	// Everything else must be escaped.
-+	return true
-+}
-+
-+// PathUnescape does the inverse transformation of PathEscape,
-+// converting each 3-byte encoded substring of the form "%AB" into the
-+// hex-decoded byte 0xAB. It returns an error if any % is not followed
-+// by two hexadecimal digits.
-+//
-+// PathUnescape is identical to QueryUnescape except that it does not
-+// unescape '+' to ' ' (space).
-+func PathUnescape(s string) (string, error) {
-+	return unescape(s, encodePathSegment)
-+}
-+
-+// unescape unescapes a string; the mode specifies
-+// which section of the URL string is being unescaped.
-+func unescape(s string, mode encoding) (string, error) {
-+	// Count %, check that they're well-formed.
-+	n := 0
-+	hasPlus := false
-+	for i := 0; i < len(s); {
-+		switch s[i] {
-+		case '%':
-+			n++
-+			if i+2 >= len(s) || !ishex(s[i+1]) || !ishex(s[i+2]) {
-+				s = s[i:]
-+				if len(s) > 3 {
-+					s = s[:3]
-+				}
-+				return "", EscapeError(s)
-+			}
-+			// Per https://tools.ietf.org/html/rfc3986#page-21
-+			// in the host component %-encoding can only be used
-+			// for non-ASCII bytes.
-+			// But https://tools.ietf.org/html/rfc6874#section-2
-+			// introduces %25 being allowed to escape a percent sign
-+			// in IPv6 scoped-address literals. Yay.
-+			if mode == encodeHost && unhex(s[i+1]) < 8 && s[i:i+3] != "%25" {
-+				return "", EscapeError(s[i : i+3])
-+			}
-+			if mode == encodeZone {
-+				// RFC 6874 says basically "anything goes" for zone identifiers
-+				// and that even non-ASCII can be redundantly escaped,
-+				// but it seems prudent to restrict %-escaped bytes here to those
-+				// that are valid host name bytes in their unescaped form.
-+				// That is, you can use escaping in the zone identifier but not
-+				// to introduce bytes you couldn't just write directly.
-+				// But Windows puts spaces here! Yay.
-+				v := unhex(s[i+1])<<4 | unhex(s[i+2])
-+				if s[i:i+3] != "%25" && v != ' ' && shouldEscape(v, encodeHost) {
-+					return "", EscapeError(s[i : i+3])
-+				}
-+			}
-+			i += 3
-+		case '+':
-+			hasPlus = mode == encodeQueryComponent
-+			i++
-+		default:
-+			if (mode == encodeHost || mode == encodeZone) && s[i] < 0x80 && shouldEscape(s[i], mode) {
-+				return "", InvalidHostError(s[i : i+1])
-+			}
-+			i++
-+		}
-+	}
-+
-+	if n == 0 && !hasPlus {
-+		return s, nil
-+	}
-+
-+	t := make([]byte, len(s)-2*n)
-+	j := 0
-+	for i := 0; i < len(s); {
-+		switch s[i] {
-+		case '%':
-+			t[j] = unhex(s[i+1])<<4 | unhex(s[i+2])
-+			j++
-+			i += 3
-+		case '+':
-+			if mode == encodeQueryComponent {
-+				t[j] = ' '
-+			} else {
-+				t[j] = '+'
-+			}
-+			j++
-+			i++
-+		default:
-+			t[j] = s[i]
-+			j++
-+			i++
-+		}
-+	}
-+	return string(t), nil
-+}
-+
-+// PathEscape escapes the string so it can be safely placed
-+// inside a URL path segment.
-+func PathEscape(s string) string {
-+	return escape(s, encodePathSegment)
-+}
-+
-+func escape(s string, mode encoding) string {
-+	spaceCount, hexCount := 0, 0
-+	for i := 0; i < len(s); i++ {
-+		c := s[i]
-+		if shouldEscape(c, mode) {
-+			if c == ' ' && mode == encodeQueryComponent {
-+				spaceCount++
-+			} else {
-+				hexCount++
-+			}
-+		}
-+	}
-+
-+	if spaceCount == 0 && hexCount == 0 {
-+		return s
-+	}
-+
-+	var buf [64]byte
-+	var t []byte
-+
-+	required := len(s) + 2*hexCount
-+	if required <= len(buf) {
-+		t = buf[:required]
-+	} else {
-+		t = make([]byte, required)
-+	}
-+
-+	if hexCount == 0 {
-+		copy(t, s)
-+		for i := 0; i < len(s); i++ {
-+			if s[i] == ' ' {
-+				t[i] = '+'
-+			}
-+		}
-+		return string(t)
-+	}
-+
-+	j := 0
-+	for i := 0; i < len(s); i++ {
-+		switch c := s[i]; {
-+		case c == ' ' && mode == encodeQueryComponent:
-+			t[j] = '+'
-+			j++
-+		case shouldEscape(c, mode):
-+			t[j] = '%'
-+			t[j+1] = "0123456789ABCDEF"[c>>4]
-+			t[j+2] = "0123456789ABCDEF"[c&15]
-+			j += 3
-+		default:
-+			t[j] = s[i]
-+			j++
-+		}
-+	}
-+	return string(t)
-+}
diff --git a/databases/mongodb40-tools/files/patch-vendor_github.com_10gen_openssl_build.go b/databases/mongodb40-tools/files/patch-vendor_github.com_10gen_openssl_build.go
deleted file mode 100644
index e0190c61259f..000000000000
--- a/databases/mongodb40-tools/files/patch-vendor_github.com_10gen_openssl_build.go
+++ /dev/null
@@ -1,9 +0,0 @@
---- vendor/github.com/10gen/openssl/build.go.orig	2018-11-21 19:00:22 UTC
-+++ vendor/github.com/10gen/openssl/build.go
-@@ -20,5 +20,6 @@
- // #cgo CFLAGS: -Wno-deprecated-declarations
- // #cgo windows CFLAGS: -DWIN32_LEAN_AND_MEAN -I"c:/openssl/include"
- // #cgo windows LDFLAGS: -lssleay32 -llibeay32 -lcrypt32 -L "c:/openssl/bin"
-+// #cgo freebsd LDFLAGS: -lssl -lcrypto
- // #cgo darwin LDFLAGS: -framework CoreFoundation -framework Foundation -framework Security
- import "C"
diff --git a/databases/mongodb40-tools/files/patch-vendor_github.com_10gen_openssl_init__posix.go b/databases/mongodb40-tools/files/patch-vendor_github.com_10gen_openssl_init__posix.go
deleted file mode 100644
index 07c593cf0018..000000000000
--- a/databases/mongodb40-tools/files/patch-vendor_github.com_10gen_openssl_init__posix.go
+++ /dev/null
@@ -1,11 +0,0 @@
---- vendor/github.com/10gen/openssl/init_posix.go.orig	2018-11-21 17:52:58 UTC
-+++ vendor/github.com/10gen/openssl/init_posix.go
-@@ -12,7 +12,7 @@
- // See the License for the specific language governing permissions and
- // limitations under the License.
- 
--// +build linux darwin cgo
-+// +build linux darwin freebsd cgo
- // +build !windows
- 
- package openssl
diff --git a/databases/mongodb40-tools/pkg-descr b/databases/mongodb40-tools/pkg-descr
deleted file mode 100644
index f38ee90d6be4..000000000000
--- a/databases/mongodb40-tools/pkg-descr
+++ /dev/null
@@ -1,15 +0,0 @@
-Useful utilities for managing a MongoDB instance written in Go.
-
-- bsondump - display BSON files in a human-readable format
-- mongoimport - Convert data from JSON, TSV or CSV and insert them
-  into a collection
-- mongoexport - Write an existing collection to CSV or JSON format
-- mongodump/mongorestore - Dump MongoDB backups to disk in .BSON
-  format, or restore them to a live database
-- mongostat - Monitor live MongoDB servers, replica sets, or sharded
-  clusters
-- mongofiles - Read, write, delete, or update files in GridFS
-- mongotop - Monitor read/write activity on a mongo server
-- mongoreplay - Capture, observe, and replay traffic for MongoDB
-
-WWW: https://github.com/mongodb/mongo-tools
diff --git a/databases/mongodb40-tools/pkg-plist b/databases/mongodb40-tools/pkg-plist
deleted file mode 100644
index 4fc11536871b..000000000000
--- a/databases/mongodb40-tools/pkg-plist
+++ /dev/null
@@ -1,12 +0,0 @@
-%%BSONDUMP%%bin/bsondump
-%%MONGODUMP%%bin/mongodump
-%%MONGOEXPORT%%bin/mongoexport
-%%MONGOFILES%%bin/mongofiles
-%%MONGOIMPORT%%bin/mongoimport
-%%MONGORESTORE%%bin/mongorestore
-%%MONGOREPLAY%%bin/mongoreplay
-%%MONGOSTAT%%bin/mongostat
-%%MONGOTOP%%bin/mongotop
-%%PORTDOCS%%%%DOCSDIR%%/CONTRIBUTING.md
-%%PORTDOCS%%%%DOCSDIR%%/README.md
-%%PORTDOCS%%%%DOCSDIR%%/THIRD-PARTY-NOTICES
diff --git a/databases/mongodb40/Makefile b/databases/mongodb40/Makefile
deleted file mode 100644
index f56d4fb23ea2..000000000000
--- a/databases/mongodb40/Makefile
+++ /dev/null
@@ -1,82 +0,0 @@
-PORTNAME=	mongodb
-DISTVERSIONPREFIX=	r
-DISTVERSION=	4.0.25
-CATEGORIES=	databases net
-MASTER_SITES=	https://fastdl.mongodb.org/src/ \
-		http://fastdl.mongodb.org/src/
-PKGNAMESUFFIX=	${PORTVERSION:R:S/.//}
-DISTNAME=	mongodb-src-${DISTVERSIONPREFIX}${DISTVERSION}
-
-MAINTAINER=	dev.ashevchuk@gmail.com
-COMMENT=	Distributed document-oriented "NoSQL" database (4.0.x Branch)
-
-LICENSE=	SSPLv1 APACHE20
-LICENSE_COMB=	multi
-LICENSE_NAME_SSPLv1=	Server Side Public License Version 1
-LICENSE_FILE_SSPLv1=	${WRKSRC}/LICENSE-Community.txt
-LICENSE_PERMS_SSPLv1=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
-
-ONLY_FOR_ARCHS=	aarch64 amd64 powerpc64le
-ONLY_FOR_ARCHS_REASON=	Only supported on amd64, aarch64 and powerpc64le (i386 deprecated in v3)
-
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cheetah3>0:devel/py-cheetah3@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}yaml>=3.11:devel/py-yaml@${PY_FLAVOR} \
-		${LOCALBASE}/bin/ar:devel/binutils
-LIB_DEPENDS=	libboost_system.so:devel/boost-libs \
-		libpcre.so:devel/pcre \
-		libcurl.so:ftp/curl \
-		libsnappy.so:archivers/snappy
-
-USES=		compiler:c++14-lang cpe python:3.5+,build scons
-USE_RC_SUBR=	mongod
-
-CONFLICTS_INSTALL=	mongodb36 mongodb4[24]
-
-MAKE_ARGS=	--prefix=${STAGEDIR}${PREFIX} \
-		--use-system-pcre --use-system-snappy \
-		--use-system-boost --use-system-zlib \
-		--cxx-std=14 --libc++ \
-		--runtime-hardening=on \
-		--disable-warnings-as-errors \
-		VERBOSE=on AR=${PREFIX}/bin/ar
-
-USERS=		mongodb
-GROUPS=		mongodb
-
-OPTIONS_DEFINE=		SASL SSL
-OPTIONS_DEFAULT=	SASL SSL
-
-SASL_LIB_DEPENDS=	libsasl2.so:security/cyrus-sasl2
-SASL_MAKE_ARGS=		--use-sasl-client
-
-SSL_USES=	ssl
-SSL_MAKE_ARGS=	--ssl
-
-.include <bsd.port.options.mk>
-
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1200057
-SUB_LIST+=	LEGACY_LIMITS="@comment " MODERN_LIMITS=""
-.else
-SUB_LIST+=	LEGACY_LIMITS="" MODERN_LIMITS="@comment "
-.endif
-
-.if ${ARCH} == aarch64 || ${ARCH} == powerpc64le
-EXTRA_PATCHES=	${FILESDIR}/${ARCH}
-.endif
-
-ALL_TARGET=	core
-
-PORTSCOUT=	limitw:1,even
-
-CPE_PRODUCT=	mongodb
-
-pre-patch:
-	${MV} ${WRKSRC}/src/third_party/wiredtiger/src/checksum/power8/crc32.sx ${WRKSRC}/src/third_party/wiredtiger/src/checksum/power8/crc32.S
-
-post-install:
-.for f in mongo mongod mongos
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${f}
-.endfor
-	${CP} ${WRKSRC}/rpm/mongod.conf ${STAGEDIR}${PREFIX}/etc/mongodb.conf.sample
-
-.include <bsd.port.mk>
diff --git a/databases/mongodb40/distinfo b/databases/mongodb40/distinfo
deleted file mode 100644
index 766d8f0341c9..000000000000
--- a/databases/mongodb40/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1623237574
-SHA256 (mongodb-src-r4.0.25.tar.gz) = c51f1f78bc121a260023e5419dd219456ed4fbb6da3f8954654263a0b260b0fd
-SIZE (mongodb-src-r4.0.25.tar.gz) = 50516290
diff --git a/databases/mongodb40/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src0.cpp b/databases/mongodb40/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src0.cpp
deleted file mode 100644
index 7447e35fc0e6..000000000000
--- a/databases/mongodb40/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src0.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src0.cpp.orig	2019-01-18 22:48:17 UTC
-+++ src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src0.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "asmjs/AsmJSFrameIterator.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "asmjs/AsmJSFrameIterator.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "asmjs/AsmJSFrameIterator.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "asmjs/AsmJSLink.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "asmjs/AsmJSLink.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "asmjs/AsmJSLink.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "asmjs/AsmJSModule.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "asmjs/AsmJSModule.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "asmjs/AsmJSModule.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "asmjs/AsmJSSignalHandlers.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "asmjs/AsmJSSignalHandlers.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "asmjs/AsmJSSignalHandlers.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "asmjs/AsmJSValidate.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "asmjs/AsmJSValidate.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "asmjs/AsmJSValidate.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "asmjs/WasmGenerator.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "asmjs/WasmGenerator.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "asmjs/WasmGenerator.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb40/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src1.cpp b/databases/mongodb40/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src1.cpp
deleted file mode 100644
index 3bc2df08b0be..000000000000
--- a/databases/mongodb40/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src1.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src1.cpp.orig	2019-01-18 22:48:17 UTC
-+++ src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src1.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "asmjs/WasmIonCompile.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "asmjs/WasmIonCompile.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "asmjs/WasmIonCompile.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "asmjs/WasmStubs.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "asmjs/WasmStubs.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "asmjs/WasmStubs.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "builtin/AtomicsObject.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "builtin/AtomicsObject.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "builtin/AtomicsObject.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "builtin/Eval.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "builtin/Eval.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "builtin/Eval.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "builtin/Intl.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "builtin/Intl.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "builtin/Intl.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "builtin/MapObject.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "builtin/MapObject.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "builtin/MapObject.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb40/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src10.cpp b/databases/mongodb40/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src10.cpp
deleted file mode 100644
index 9dd333c2b0a5..000000000000
--- a/databases/mongodb40/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src10.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src10.cpp.orig	2019-01-18 22:48:17 UTC
-+++ src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src10.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "jit/BaselineFrameInfo.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/BaselineFrameInfo.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/BaselineFrameInfo.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/BaselineIC.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/BaselineIC.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/BaselineIC.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/BaselineInspector.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/BaselineInspector.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/BaselineInspector.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/BaselineJIT.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/BaselineJIT.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/BaselineJIT.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/BitSet.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/BitSet.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/BitSet.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/BytecodeAnalysis.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/BytecodeAnalysis.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/BytecodeAnalysis.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb40/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src11.cpp b/databases/mongodb40/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src11.cpp
deleted file mode 100644
index b9474a34514b..000000000000
--- a/databases/mongodb40/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src11.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src11.cpp.orig	2019-01-18 22:48:17 UTC
-+++ src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src11.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "jit/C1Spewer.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/C1Spewer.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/C1Spewer.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/CodeGenerator.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/CodeGenerator.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/CodeGenerator.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/CompileWrappers.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/CompileWrappers.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/CompileWrappers.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/Disassembler.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/Disassembler.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/Disassembler.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/EagerSimdUnbox.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/EagerSimdUnbox.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/EagerSimdUnbox.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/EdgeCaseAnalysis.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/EdgeCaseAnalysis.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/EdgeCaseAnalysis.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb40/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src12.cpp b/databases/mongodb40/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src12.cpp
deleted file mode 100644
index 963d167804d9..000000000000
--- a/databases/mongodb40/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src12.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src12.cpp.orig	2019-01-18 22:48:17 UTC
-+++ src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src12.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "jit/EffectiveAddressAnalysis.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/EffectiveAddressAnalysis.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/EffectiveAddressAnalysis.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/ExecutableAllocator.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/ExecutableAllocator.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/ExecutableAllocator.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/InstructionReordering.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/InstructionReordering.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/InstructionReordering.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/Ion.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/Ion.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/Ion.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/IonAnalysis.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/IonAnalysis.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/IonAnalysis.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/IonBuilder.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/IonBuilder.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/IonBuilder.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb40/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src13.cpp b/databases/mongodb40/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src13.cpp
deleted file mode 100644
index b65b58bcc20a..000000000000
--- a/databases/mongodb40/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src13.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src13.cpp.orig	2019-01-18 22:48:17 UTC
-+++ src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src13.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "jit/IonCaches.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/IonCaches.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/IonCaches.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/IonOptimizationLevels.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/IonOptimizationLevels.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/IonOptimizationLevels.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/JSONSpewer.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/JSONSpewer.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/JSONSpewer.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/JitFrames.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/JitFrames.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/JitFrames.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/JitOptions.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/JitOptions.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/JitOptions.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/JitSpewer.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/JitSpewer.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/JitSpewer.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb40/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src14.cpp b/databases/mongodb40/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src14.cpp
deleted file mode 100644
index 3c06d8f9dcfb..000000000000
--- a/databases/mongodb40/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src14.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src14.cpp.orig	2019-01-18 22:48:17 UTC
-+++ src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src14.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "jit/JitcodeMap.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/JitcodeMap.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/JitcodeMap.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/LICM.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/LICM.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/LICM.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/LIR.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/LIR.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/LIR.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/LoopUnroller.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/LoopUnroller.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/LoopUnroller.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/Lowering.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/Lowering.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/Lowering.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/MCallOptimize.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/MCallOptimize.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/MCallOptimize.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb40/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src15.cpp b/databases/mongodb40/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src15.cpp
deleted file mode 100644
index 816eb4adc1a6..000000000000
--- a/databases/mongodb40/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src15.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src15.cpp.orig	2019-01-18 22:48:17 UTC
-+++ src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src15.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "jit/MIR.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/MIR.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/MIR.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/MIRGraph.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/MIRGraph.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/MIRGraph.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/MacroAssembler.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/MacroAssembler.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/MacroAssembler.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/MoveResolver.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/MoveResolver.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/MoveResolver.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/OptimizationTracking.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/OptimizationTracking.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/OptimizationTracking.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/PerfSpewer.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/PerfSpewer.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/PerfSpewer.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb40/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src16.cpp b/databases/mongodb40/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src16.cpp
deleted file mode 100644
index 26fe3aa060dc..000000000000
--- a/databases/mongodb40/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src16.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src16.cpp.orig	2019-01-18 22:48:17 UTC
-+++ src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src16.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "jit/ProcessExecutableMemory.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/ProcessExecutableMemory.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/ProcessExecutableMemory.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/RangeAnalysis.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/RangeAnalysis.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/RangeAnalysis.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/Recover.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/Recover.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/Recover.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/RegisterAllocator.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/RegisterAllocator.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/RegisterAllocator.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/RematerializedFrame.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/RematerializedFrame.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/RematerializedFrame.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/Safepoints.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/Safepoints.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/Safepoints.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb40/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src17.cpp b/databases/mongodb40/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src17.cpp
deleted file mode 100644
index 2038f8cd00ac..000000000000
--- a/databases/mongodb40/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src17.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src17.cpp.orig	2019-01-18 22:48:17 UTC
-+++ src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src17.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "jit/ScalarReplacement.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/ScalarReplacement.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/ScalarReplacement.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/SharedIC.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/SharedIC.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/SharedIC.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/Sink.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/Sink.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/Sink.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/Snapshots.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/Snapshots.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/Snapshots.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/StupidAllocator.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/StupidAllocator.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/StupidAllocator.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/TypePolicy.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/TypePolicy.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/TypePolicy.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb40/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src18.cpp b/databases/mongodb40/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src18.cpp
deleted file mode 100644
index 1ada547bd5b6..000000000000
--- a/databases/mongodb40/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src18.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src18.cpp.orig	2019-01-18 22:48:17 UTC
-+++ src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src18.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "jit/TypedObjectPrediction.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/TypedObjectPrediction.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/TypedObjectPrediction.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/VMFunctions.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/VMFunctions.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/VMFunctions.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/ValueNumbering.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/ValueNumbering.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/ValueNumbering.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/none/Trampoline-none.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/none/Trampoline-none.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/none/Trampoline-none.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/shared/BaselineCompiler-shared.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/shared/BaselineCompiler-shared.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/shared/BaselineCompiler-shared.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/shared/CodeGenerator-shared.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/shared/CodeGenerator-shared.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/shared/CodeGenerator-shared.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb40/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src19.cpp b/databases/mongodb40/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src19.cpp
deleted file mode 100644
index cbd28046fca1..000000000000
--- a/databases/mongodb40/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src19.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src19.cpp.orig	2019-01-18 22:48:17 UTC
-+++ src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src19.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "jit/shared/Lowering-shared.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/shared/Lowering-shared.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/shared/Lowering-shared.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jsalloc.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jsalloc.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jsalloc.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jsapi.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jsapi.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jsapi.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jsbool.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jsbool.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jsbool.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jscntxt.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jscntxt.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jscntxt.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jscompartment.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jscompartment.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jscompartment.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb40/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src2.cpp b/databases/mongodb40/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src2.cpp
deleted file mode 100644
index 81ea41928119..000000000000
--- a/databases/mongodb40/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src2.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src2.cpp.orig	2019-01-18 22:48:17 UTC
-+++ src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src2.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "builtin/ModuleObject.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "builtin/ModuleObject.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "builtin/ModuleObject.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "builtin/Object.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "builtin/Object.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "builtin/Object.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "builtin/Profilers.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "builtin/Profilers.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "builtin/Profilers.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "builtin/Reflect.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "builtin/Reflect.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "builtin/Reflect.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "builtin/ReflectParse.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "builtin/ReflectParse.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "builtin/ReflectParse.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "builtin/SIMD.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "builtin/SIMD.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "builtin/SIMD.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb40/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src20.cpp b/databases/mongodb40/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src20.cpp
deleted file mode 100644
index 742426e01211..000000000000
--- a/databases/mongodb40/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src20.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src20.cpp.orig	2019-01-18 22:48:17 UTC
-+++ src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src20.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "jsdate.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jsdate.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jsdate.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jsdtoa.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jsdtoa.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jsdtoa.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jsexn.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jsexn.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jsexn.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jsfriendapi.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jsfriendapi.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jsfriendapi.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jsfun.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jsfun.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jsfun.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jsgc.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jsgc.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jsgc.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb40/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src21.cpp b/databases/mongodb40/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src21.cpp
deleted file mode 100644
index 2d7e591192e7..000000000000
--- a/databases/mongodb40/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src21.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src21.cpp.orig	2019-01-18 22:48:17 UTC
-+++ src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src21.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "jsiter.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jsiter.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jsiter.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jsnativestack.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jsnativestack.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jsnativestack.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jsnum.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jsnum.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jsnum.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jsobj.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jsobj.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jsobj.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "json.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "json.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "json.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jsopcode.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jsopcode.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jsopcode.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb40/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src22.cpp b/databases/mongodb40/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src22.cpp
deleted file mode 100644
index d5575e9cf371..000000000000
--- a/databases/mongodb40/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src22.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src22.cpp.orig	2019-01-18 22:48:17 UTC
-+++ src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src22.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "jsprf.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jsprf.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jsprf.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jspropertytree.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jspropertytree.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jspropertytree.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jsscript.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jsscript.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jsscript.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jsstr.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jsstr.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jsstr.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jswatchpoint.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jswatchpoint.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jswatchpoint.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jsweakmap.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jsweakmap.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jsweakmap.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb40/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src23.cpp b/databases/mongodb40/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src23.cpp
deleted file mode 100644
index e4f39b8ae2bb..000000000000
--- a/databases/mongodb40/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src23.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src23.cpp.orig	2019-01-18 22:48:17 UTC
-+++ src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src23.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "perf/jsperf.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "perf/jsperf.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "perf/jsperf.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "proxy/BaseProxyHandler.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "proxy/BaseProxyHandler.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "proxy/BaseProxyHandler.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "proxy/CrossCompartmentWrapper.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "proxy/CrossCompartmentWrapper.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "proxy/CrossCompartmentWrapper.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "proxy/DeadObjectProxy.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "proxy/DeadObjectProxy.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "proxy/DeadObjectProxy.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "proxy/DirectProxyHandler.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "proxy/DirectProxyHandler.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "proxy/DirectProxyHandler.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "proxy/OpaqueCrossCompartmentWrapper.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "proxy/OpaqueCrossCompartmentWrapper.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "proxy/OpaqueCrossCompartmentWrapper.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb40/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src24.cpp b/databases/mongodb40/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src24.cpp
deleted file mode 100644
index 09aa08d66d26..000000000000
--- a/databases/mongodb40/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src24.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src24.cpp.orig	2019-01-18 22:48:17 UTC
-+++ src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src24.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "proxy/Proxy.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "proxy/Proxy.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "proxy/Proxy.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "proxy/ScriptedDirectProxyHandler.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "proxy/ScriptedDirectProxyHandler.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "proxy/ScriptedDirectProxyHandler.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "proxy/ScriptedIndirectProxyHandler.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "proxy/ScriptedIndirectProxyHandler.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "proxy/ScriptedIndirectProxyHandler.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "proxy/SecurityWrapper.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "proxy/SecurityWrapper.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "proxy/SecurityWrapper.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "proxy/Wrapper.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "proxy/Wrapper.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "proxy/Wrapper.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/ArgumentsObject.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/ArgumentsObject.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/ArgumentsObject.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb40/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src25.cpp b/databases/mongodb40/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src25.cpp
deleted file mode 100644
index a495f144a4bd..000000000000
--- a/databases/mongodb40/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src25.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src25.cpp.orig	2019-01-18 22:48:17 UTC
-+++ src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src25.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "vm/ArrayBufferObject.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/ArrayBufferObject.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/ArrayBufferObject.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/CallNonGenericMethod.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/CallNonGenericMethod.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/CallNonGenericMethod.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/CharacterEncoding.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/CharacterEncoding.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/CharacterEncoding.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/CodeCoverage.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/CodeCoverage.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/CodeCoverage.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/Compression.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/Compression.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/Compression.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/DateTime.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/DateTime.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/DateTime.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb40/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src26.cpp b/databases/mongodb40/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src26.cpp
deleted file mode 100644
index a48c7b4354ba..000000000000
--- a/databases/mongodb40/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src26.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src26.cpp.orig	2019-01-18 22:48:17 UTC
-+++ src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src26.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "vm/Debugger.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/Debugger.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/Debugger.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/DebuggerMemory.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/DebuggerMemory.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/DebuggerMemory.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/ErrorObject.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/ErrorObject.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/ErrorObject.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/ForOfIterator.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/ForOfIterator.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/ForOfIterator.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/GeneratorObject.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/GeneratorObject.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/GeneratorObject.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/GlobalObject.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/GlobalObject.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/GlobalObject.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb40/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src27.cpp b/databases/mongodb40/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src27.cpp
deleted file mode 100644
index 3c86bb4e4860..000000000000
--- a/databases/mongodb40/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src27.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src27.cpp.orig	2019-01-18 22:48:17 UTC
-+++ src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src27.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "vm/HelperThreads.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/HelperThreads.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/HelperThreads.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/Id.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/Id.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/Id.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/Interpreter.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/Interpreter.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/Interpreter.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/JSONParser.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/JSONParser.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/JSONParser.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/MemoryMetrics.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/MemoryMetrics.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/MemoryMetrics.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/Monitor.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/Monitor.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/Monitor.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb40/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src28.cpp b/databases/mongodb40/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src28.cpp
deleted file mode 100644
index 9c71115c00c0..000000000000
--- a/databases/mongodb40/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src28.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src28.cpp.orig	2019-01-18 22:48:17 UTC
-+++ src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src28.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "vm/NativeObject.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/NativeObject.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/NativeObject.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/ObjectGroup.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/ObjectGroup.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/ObjectGroup.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/PIC.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/PIC.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/PIC.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/PosixNSPR.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/PosixNSPR.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/PosixNSPR.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/Printer.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/Printer.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/Printer.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/Probes.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/Probes.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/Probes.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb40/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src29.cpp b/databases/mongodb40/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src29.cpp
deleted file mode 100644
index fa188e4bbe64..000000000000
--- a/databases/mongodb40/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src29.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src29.cpp.orig	2019-01-18 22:48:17 UTC
-+++ src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src29.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "vm/ProxyObject.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/ProxyObject.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/ProxyObject.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/ReceiverGuard.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/ReceiverGuard.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/ReceiverGuard.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/RegExpObject.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/RegExpObject.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/RegExpObject.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/RegExpStatics.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/RegExpStatics.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/RegExpStatics.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/Runtime.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/Runtime.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/Runtime.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/SPSProfiler.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/SPSProfiler.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/SPSProfiler.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb40/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src3.cpp b/databases/mongodb40/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src3.cpp
deleted file mode 100644
index ac11b2e77a32..000000000000
--- a/databases/mongodb40/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src3.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src3.cpp.orig	2019-01-18 22:48:17 UTC
-+++ src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src3.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "builtin/SymbolObject.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "builtin/SymbolObject.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "builtin/SymbolObject.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "builtin/TestingFunctions.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "builtin/TestingFunctions.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "builtin/TestingFunctions.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "builtin/TypedObject.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "builtin/TypedObject.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "builtin/TypedObject.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "builtin/WeakMapObject.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "builtin/WeakMapObject.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "builtin/WeakMapObject.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "builtin/WeakSetObject.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "builtin/WeakSetObject.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "builtin/WeakSetObject.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "devtools/sharkctl.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "devtools/sharkctl.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "devtools/sharkctl.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb40/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src30.cpp b/databases/mongodb40/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src30.cpp
deleted file mode 100644
index 31b1a180bd26..000000000000
--- a/databases/mongodb40/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src30.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src30.cpp.orig	2019-01-18 22:48:17 UTC
-+++ src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src30.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "vm/SavedStacks.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/SavedStacks.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/SavedStacks.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/ScopeObject.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/ScopeObject.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/ScopeObject.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/SelfHosting.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/SelfHosting.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/SelfHosting.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/Shape.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/Shape.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/Shape.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/SharedArrayObject.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/SharedArrayObject.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/SharedArrayObject.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/Stack.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/Stack.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/Stack.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb40/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src31.cpp b/databases/mongodb40/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src31.cpp
deleted file mode 100644
index 6dedacb8aa84..000000000000
--- a/databases/mongodb40/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src31.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src31.cpp.orig	2019-01-18 22:48:17 UTC
-+++ src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src31.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "vm/Stopwatch.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/Stopwatch.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/Stopwatch.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/String.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/String.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/String.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/StringBuffer.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/StringBuffer.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/StringBuffer.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/StructuredClone.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/StructuredClone.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/StructuredClone.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/Symbol.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/Symbol.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/Symbol.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/TaggedProto.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/TaggedProto.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/TaggedProto.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb40/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src32.cpp b/databases/mongodb40/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src32.cpp
deleted file mode 100644
index cf2c9a3453c5..000000000000
--- a/databases/mongodb40/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src32.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src32.cpp.orig	2019-01-18 22:48:17 UTC
-+++ src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src32.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "vm/Time.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/Time.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/Time.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/TypeInference.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/TypeInference.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/TypeInference.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/TypedArrayObject.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/TypedArrayObject.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/TypedArrayObject.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/UbiNode.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/UbiNode.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/UbiNode.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/UbiNodeCensus.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/UbiNodeCensus.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/UbiNodeCensus.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/UnboxedObject.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/UnboxedObject.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/UnboxedObject.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb40/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src33.cpp b/databases/mongodb40/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src33.cpp
deleted file mode 100644
index e3be88056d29..000000000000
--- a/databases/mongodb40/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src33.cpp
+++ /dev/null
@@ -1,41 +0,0 @@
---- src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src33.cpp.orig	2019-01-18 22:48:18 UTC
-+++ src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src33.cpp
-@@ -0,0 +1,37 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "vm/Unicode.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/Unicode.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/Unicode.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/Value.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/Value.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/Value.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/WeakMapPtr.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/WeakMapPtr.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/WeakMapPtr.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/Xdr.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/Xdr.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/Xdr.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb40/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src4.cpp b/databases/mongodb40/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src4.cpp
deleted file mode 100644
index 76228a440849..000000000000
--- a/databases/mongodb40/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src4.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src4.cpp.orig	2019-01-18 22:48:18 UTC
-+++ src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src4.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "ds/LifoAlloc.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "ds/LifoAlloc.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "ds/LifoAlloc.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "frontend/BytecodeCompiler.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "frontend/BytecodeCompiler.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "frontend/BytecodeCompiler.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "frontend/BytecodeEmitter.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "frontend/BytecodeEmitter.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "frontend/BytecodeEmitter.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "frontend/FoldConstants.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "frontend/FoldConstants.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "frontend/FoldConstants.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "frontend/NameFunctions.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "frontend/NameFunctions.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "frontend/NameFunctions.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "frontend/ParseMaps.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "frontend/ParseMaps.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "frontend/ParseMaps.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb40/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src5.cpp b/databases/mongodb40/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src5.cpp
deleted file mode 100644
index 857e9272b201..000000000000
--- a/databases/mongodb40/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src5.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src5.cpp.orig	2019-01-18 22:48:18 UTC
-+++ src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src5.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "frontend/ParseNode.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "frontend/ParseNode.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "frontend/ParseNode.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "frontend/TokenStream.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "frontend/TokenStream.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "frontend/TokenStream.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "gc/Allocator.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "gc/Allocator.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "gc/Allocator.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "gc/Barrier.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "gc/Barrier.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "gc/Barrier.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "gc/GCTrace.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "gc/GCTrace.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "gc/GCTrace.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "gc/Iteration.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "gc/Iteration.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "gc/Iteration.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb40/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src6.cpp b/databases/mongodb40/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src6.cpp
deleted file mode 100644
index ca87a387e54a..000000000000
--- a/databases/mongodb40/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src6.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src6.cpp.orig	2019-01-18 22:48:18 UTC
-+++ src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src6.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "gc/Marking.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "gc/Marking.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "gc/Marking.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "gc/Memory.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "gc/Memory.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "gc/Memory.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "gc/MemoryProfiler.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "gc/MemoryProfiler.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "gc/MemoryProfiler.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "gc/Nursery.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "gc/Nursery.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "gc/Nursery.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "gc/RootMarking.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "gc/RootMarking.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "gc/RootMarking.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "gc/Statistics.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "gc/Statistics.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "gc/Statistics.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb40/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src7.cpp b/databases/mongodb40/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src7.cpp
deleted file mode 100644
index 7a98bfe58b7f..000000000000
--- a/databases/mongodb40/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src7.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src7.cpp.orig	2019-01-18 22:48:18 UTC
-+++ src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src7.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "gc/Tracer.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "gc/Tracer.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "gc/Tracer.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "gc/Verifier.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "gc/Verifier.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "gc/Verifier.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "gc/Zone.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "gc/Zone.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "gc/Zone.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "irregexp/NativeRegExpMacroAssembler.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "irregexp/NativeRegExpMacroAssembler.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "irregexp/NativeRegExpMacroAssembler.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "irregexp/RegExpAST.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "irregexp/RegExpAST.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "irregexp/RegExpAST.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "irregexp/RegExpEngine.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "irregexp/RegExpEngine.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "irregexp/RegExpEngine.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb40/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src8.cpp b/databases/mongodb40/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src8.cpp
deleted file mode 100644
index 7afdd362289e..000000000000
--- a/databases/mongodb40/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src8.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src8.cpp.orig	2019-01-18 22:48:18 UTC
-+++ src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src8.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "irregexp/RegExpInterpreter.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "irregexp/RegExpInterpreter.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "irregexp/RegExpInterpreter.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "irregexp/RegExpMacroAssembler.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "irregexp/RegExpMacroAssembler.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "irregexp/RegExpMacroAssembler.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "irregexp/RegExpParser.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "irregexp/RegExpParser.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "irregexp/RegExpParser.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "irregexp/RegExpStack.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "irregexp/RegExpStack.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "irregexp/RegExpStack.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/AliasAnalysis.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/AliasAnalysis.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/AliasAnalysis.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/AlignmentMaskAnalysis.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/AlignmentMaskAnalysis.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/AlignmentMaskAnalysis.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb40/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src9.cpp b/databases/mongodb40/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src9.cpp
deleted file mode 100644
index 20f11700164f..000000000000
--- a/databases/mongodb40/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_Unified__cpp__js__src9.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src9.cpp.orig	2019-01-18 22:48:18 UTC
-+++ src/third_party/mozjs-45/platform/aarch64/freebsd/build/Unified_cpp_js_src9.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "jit/BacktrackingAllocator.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/BacktrackingAllocator.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/BacktrackingAllocator.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/Bailouts.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/Bailouts.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/Bailouts.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/BaselineBailouts.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/BaselineBailouts.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/BaselineBailouts.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/BaselineCompiler.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/BaselineCompiler.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/BaselineCompiler.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/BaselineDebugModeOSR.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/BaselineDebugModeOSR.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/BaselineDebugModeOSR.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/BaselineFrame.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/BaselineFrame.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/BaselineFrame.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb40/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_js-confdefs.h b/databases/mongodb40/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_js-confdefs.h
deleted file mode 100644
index a24659c5a145..000000000000
--- a/databases/mongodb40/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_build_js-confdefs.h
+++ /dev/null
@@ -1,91 +0,0 @@
---- src/third_party/mozjs-45/platform/aarch64/freebsd/build/js-confdefs.h.orig	2019-01-18 22:48:18 UTC
-+++ src/third_party/mozjs-45/platform/aarch64/freebsd/build/js-confdefs.h
-@@ -0,0 +1,88 @@
-+/* List of defines generated by configure. Included with preprocessor flag,
-+ * -include, to avoid long list of -D defines on the compile command-line.
-+ * Do not edit.
-+ */
-+
-+#ifndef js_confdefs_h
-+#define js_confdefs_h
-+
-+#define CPP_THROW_NEW throw()
-+#define D_INO d_ino
-+#define EDITLINE 1
-+#define HAVE_64BIT_BUILD 1
-+#define HAVE_ACOSH 1
-+#define HAVE_ASINH 1
-+#define HAVE_ATANH 1
-+#define HAVE_CBRT 1
-+#define HAVE_CLOCK_MONOTONIC 1
-+#define HAVE_CPP_AMBIGUITY_RESOLVING_USING 1
-+#define HAVE_CPP_DYNAMIC_CAST_TO_VOID_PTR 1
-+#define HAVE_DIRENT_H 1
-+#define HAVE_DLOPEN 1
-+#define HAVE_EXPM1 1
-+#define HAVE_GETC_UNLOCKED 1
-+#define HAVE_GETOPT_H 1
-+#define HAVE_GMTIME_R 1
-+#define HAVE_I18N_LC_MESSAGES 1
-+#define HAVE_LANGINFO_CODESET 1
-+#define HAVE_LIBM 1
-+#define HAVE_LOCALECONV 1
-+#define HAVE_LOCALECONV 1
-+#define HAVE_LOCALTIME_R 1
-+#define HAVE_LOG1P 1
-+#define HAVE_LOG2 1
-+#define HAVE_MACHINE_ENDIAN_H 1
-+#define HAVE_MALLOC_USABLE_SIZE 1
-+#define HAVE_MBRTOWC 1
-+#define HAVE_MEMORY_H 1
-+#define HAVE_NL_TYPES_H 1
-+#define HAVE_POSIX_FADVISE 1
-+#define HAVE_POSIX_FALLOCATE 1
-+#define HAVE_POSIX_MEMALIGN 1
-+#define HAVE_RES_NINIT 1
-+#define HAVE_SETLOCALE 1
-+#define HAVE_SSIZE_T 1
-+#define HAVE_STRNDUP 1
-+#define HAVE_SYS_CDEFS_H 1
-+#define HAVE_SYS_MOUNT_H 1
-+#define HAVE_SYS_STATVFS_H 1
-+#define HAVE_THREAD_TLS_KEYWORD 1
-+#define HAVE_TM_ZONE_TM_GMTOFF 1
-+#define HAVE_UNISTD_H 1
-+#define HAVE_VALLOC 1
-+#define HAVE_VA_COPY 1
-+#define HAVE_VISIBILITY_ATTRIBUTE 1
-+#define HAVE_VISIBILITY_HIDDEN_ATTRIBUTE 1
-+#define HAVE_WCRTOMB 1
-+#define HAVE_X11_XKBLIB_H 1
-+#define HAVE___CXA_DEMANGLE 1
-+#define JS_CODEGEN_NONE 1
-+#define JS_DEFAULT_JITREPORT_GRANULARITY 3
-+#define JS_HAVE_MACHINE_ENDIAN_H 1
-+#define JS_POSIX_NSPR 1
-+#define JS_PUNBOX64 1
-+#define JS_STANDALONE 1
-+#define MALLOC_H <malloc_np.h>
-+#define MALLOC_USABLE_SIZE_CONST_PTR const
-+#define MOZILLA_UAVERSION "45.0"
-+#define MOZILLA_VERSION "45.9.0"
-+#define MOZILLA_VERSION_U 45.9.0
-+#define MOZJS_MAJOR_VERSION 45
-+#define MOZJS_MINOR_VERSION 9
-+#define MOZ_DEBUG_SYMBOLS 1
-+#define MOZ_DLL_SUFFIX ".so"
-+#define MOZ_GLUE_IN_PROGRAM 1
-+#define MOZ_MEMORY 1
-+#define MOZ_MEMORY_BSD 1
-+#define MOZ_UPDATE_CHANNEL default
-+#define NO_NSPR_10_SUPPORT 1
-+#define RELEASE_BUILD 1
-+#define STDC_HEADERS 1
-+#define VA_COPY va_copy
-+#define XP_UNIX 1
-+#define _REENTRANT 1
-+#define _THREAD_SAFE 1
-+
-+#include "js/RequiredDefines.h"
-+
-+#endif /* js_confdefs_h */
diff --git a/databases/mongodb40/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_include_js-config.h b/databases/mongodb40/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_include_js-config.h
deleted file mode 100644
index c11f55644c87..000000000000
--- a/databases/mongodb40/files/aarch64/patch-src_third__party_mozjs-45_platform_aarch64_freebsd_include_js-config.h
+++ /dev/null
@@ -1,62 +0,0 @@
---- src/third_party/mozjs-45/platform/aarch64/freebsd/include/js-config.h.orig	2019-01-18 22:48:29 UTC
-+++ src/third_party/mozjs-45/platform/aarch64/freebsd/include/js-config.h
-@@ -0,0 +1,59 @@
-+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-+ * vim: set ts=8 sw=4 et tw=78:
-+ *
-+ * This Source Code Form is subject to the terms of the Mozilla Public
-+ * License, v. 2.0. If a copy of the MPL was not distributed with this
-+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-+
-+#ifndef js_config_h
-+#define js_config_h
-+
-+/* Definitions set at build time that affect SpiderMonkey's public API.
-+   This header file is generated by the SpiderMonkey configure script,
-+   and installed along with jsapi.h.  */
-+
-+/* Define to 1 if SpiderMonkey is in debug mode. */
-+/* #undef JS_DEBUG */
-+
-+/* Define to 1 if SpiderMonkey should not use struct types in debug builds. */
-+/* #undef JS_NO_JSVAL_JSID_STRUCT_TYPES */
-+
-+/* Define to 1 if SpiderMonkey should support multi-threaded clients.  */
-+/* #undef JS_THREADSAFE */
-+
-+/* Define to 1 if SpiderMonkey should include ctypes support.  */
-+/* #undef JS_HAS_CTYPES */
-+
-+/* Define to 1 if SpiderMonkey should support the ability to perform
-+   entirely too much GC.  */
-+/* #undef JS_GC_ZEAL */
-+
-+/* Define to 1 if SpiderMonkey should use small chunks. */
-+/* #undef JS_GC_SMALL_CHUNK_SIZE */
-+
-+/* Define to 1 to perform extra assertions and heap poisoning. */
-+/* #undef JS_CRASH_DIAGNOSTICS */
-+
-+/* Define to 1 if the <endian.h> header is present and
-+   useable.  See jscpucfg.h.  */
-+/* #undef JS_HAVE_ENDIAN_H */
-+
-+/* Define to 1 if the <machine/endian.h> header is present and
-+   useable.  See jscpucfg.h.  */
-+#define JS_HAVE_MACHINE_ENDIAN_H 1
-+
-+/* Define to 1 if the <sys/isa_defs.h> header is present and
-+   useable.  See jscpucfg.h.  */
-+/* #undef JS_HAVE_SYS_ISA_DEFS_H */
-+
-+/* Define to 1 if SpiderMonkey is in NUNBOX32 mode. */
-+/* #undef JS_NUNBOX32 */
-+
-+/* Define to 1 if SpiderMonkey is in PUNBOX64 mode. */
-+#define JS_PUNBOX64 1
-+
-+/* MOZILLA JSAPI version number components */
-+#define MOZJS_MAJOR_VERSION 45
-+#define MOZJS_MINOR_VERSION 9
-+
-+#endif /* js_config_h */
diff --git a/databases/mongodb40/files/mongod.in b/databases/mongodb40/files/mongod.in
deleted file mode 100644
index e885be83196c..000000000000
--- a/databases/mongodb40/files/mongod.in
+++ /dev/null
@@ -1,62 +0,0 @@
-#!/bin/sh
-
-# PROVIDE: mongod
-# REQUIRE: NETWORK ldconfig
-# KEYWORD: shutdown
-#
-# Add the following lines to /etc/rc.conf.local or /etc/rc.conf
-# to enable this service:
-#
-# mongod_enable (bool):  Set to "NO" by default.
-#                        Set it to "YES" to enable mongod.
-%%LEGACY_LIMITS%%# mongod_limits (bool):  Set to "NO" by default.
-%%LEGACY_LIMITS%%#                        Set it to yes to run `limits -e -U mongodb`
-%%LEGACY_LIMITS%%#                        just before mongod starts.
-# mongod_dbpath (str):   Default to "/var/db/mongodb"
-#                        Base database directory.
-# mongod_flags (str):    Custom additional arguments to be passed to mongod.
-#                        Default to "--logpath ${mongod_dbpath}/mongod.log --logappend".
-# mongod_config (str):	 Default to "%%PREFIX%%/etc/mongodb.conf"
-#                        Path to config file
-#
-
-. /etc/rc.subr
-
-name="mongod"
-rcvar=mongod_enable
-
-load_rc_config $name
-
-: ${mongod_enable="NO"}
-%%LEGACY_LIMITS%%: ${mongod_limits="NO"}
-: ${mongod_dbpath="/var/db/mongodb"}
-: ${mongod_flags="--logpath ${mongod_dbpath}/mongod.log --logappend --setParameter=disabledSecureAllocatorDomains=\*"}
-: ${mongod_user="mongodb"}
-: ${mongod_group="mongodb"}
-: ${mongod_config="%%PREFIX%%/etc/mongodb.conf"}
-
-pidfile="${mongod_dbpath}/mongod.lock"
-command=%%PREFIX%%/bin/${name}
-command_args="--config $mongod_config --dbpath $mongod_dbpath --fork >/dev/null 2>/dev/null"
-start_precmd="${name}_prestart"
-
-mongod_create_dbpath()
-{
-        mkdir ${mongod_dbpath} >/dev/null 2>/dev/null
-        [ $? -eq 0 ] && chown -R ${mongod_user}:${mongod_group} ${mongod_dbpath}
-}
-
-mongod_prestart()
-{
-        if [ ! -d ${mongod_dbpath} ]; then
-                mongod_create_dbpath || return 1
-        fi
-%%LEGACY_LIMITS%%        if checkyesno mongod_limits; then
-%%LEGACY_LIMITS%%                eval `/usr/bin/limits -e -U ${mongod_user}` 2>/dev/null
-%%LEGACY_LIMITS%%        else
-%%LEGACY_LIMITS%%                return 0
-%%LEGACY_LIMITS%%        fi
-%%MODERN_LIMITS%%        return 0
-}
-
-run_rc_command "$1"
diff --git a/databases/mongodb40/files/patch-SConstruct b/databases/mongodb40/files/patch-SConstruct
deleted file mode 100644
index 3c44d579d094..000000000000
--- a/databases/mongodb40/files/patch-SConstruct
+++ /dev/null
@@ -1,32 +0,0 @@
---- SConstruct.orig	2018-01-04 23:28:55 UTC
-+++ SConstruct
-@@ -922,9 +922,9 @@ if has_option('variables-help'):
-     print(env_vars.GenerateHelpText(env))
-     Exit(0)
- 
--unknown_vars = env_vars.UnknownVariables()
--if unknown_vars:
--    env.FatalError("Unknown variables specified: {0}", ", ".join(unknown_vars.keys()))
-+#unknown_vars = env_vars.UnknownVariables()
-+#if unknown_vars:
-+#    env.FatalError("Unknown variables specified: {0}", ", ".join(unknown_vars.keys()))
- 
- def set_config_header_define(env, varname, varval = 1):
-     env['CONFIG_HEADER_DEFINES'][varname] = varval
-@@ -1612,7 +1612,7 @@ if env.TargetOSIs('posix'):
-             # If runtime hardening is requested, then build anything
-             # destined for an executable with the necessary flags for PIE.
-             env.AppendUnique(
--                PROGCCFLAGS=['-fPIE'],
-+                PROGCCFLAGS=['-fpic'],
-                 PROGLINKFLAGS=['-pie'],
-             )
- 
-@@ -1626,7 +1626,7 @@ if env.TargetOSIs('posix'):
-                          "-Wno-unknown-pragmas",
-                          "-Winvalid-pch"] )
-     # env.Append( " -Wconversion" ) TODO: this doesn't really work yet
--    if env.TargetOSIs('linux', 'darwin', 'solaris'):
-+    if env.TargetOSIs('linux', 'darwin', 'solaris', 'freebsd'):
-         if not has_option("disable-warnings-as-errors"):
-             env.Append( CCFLAGS=["-Werror"] )
diff --git a/databases/mongodb40/files/patch-python3 b/databases/mongodb40/files/patch-python3
deleted file mode 100644
index 2d8b2ea8bfab..000000000000
--- a/databases/mongodb40/files/patch-python3
+++ /dev/null
@@ -1,1397 +0,0 @@
-diff -ru /data/ports-build/mongodb-src-r4.0.21/SConstruct ./SConstruct
---- /data/ports-build/mongodb-src-r4.0.21/SConstruct	2020-11-15 22:50:25.001942000 +0100
-+++ ./SConstruct	2020-11-16 20:09:38.793885000 +0100
-@@ -28,8 +28,8 @@
- import mongo.toolchain as mongo_toolchain
- import mongo.generators as mongo_generators
- 
--EnsurePythonVersion(2, 7)
--EnsureSConsVersion(2, 5)
-+EnsurePythonVersion(3, 5)
-+EnsureSConsVersion(3, 0, 4)
- 
- from buildscripts import utils
- from buildscripts import moduleconfig
-@@ -435,7 +435,7 @@
- }
- 
- add_option('win-version-min',
--    choices=win_version_min_choices.keys(),
-+    choices=list(win_version_min_choices.keys()),
-     default=None,
-     help='minimum Windows version to support',
-     type='choice',
-@@ -547,7 +547,7 @@
- except IOError as e:
-     # If the file error wasn't because the file is missing, error out
-     if e.errno != errno.ENOENT:
--        print("Error opening version.json: {0}".format(e.strerror))
-+        print(("Error opening version.json: {0}".format(e.strerror)))
-         Exit(1)
- 
-     version_data = {
-@@ -556,14 +556,14 @@
-     }
- 
- except ValueError as e:
--    print("Error decoding version.json: {0}".format(e))
-+    print(("Error decoding version.json: {0}".format(e)))
-     Exit(1)
- 
- # Setup the command-line variables
- def variable_shlex_converter(val):
-     # If the argument is something other than a string, propogate
-     # it literally.
--    if not isinstance(val, basestring):
-+    if not isinstance(val, str):
-         return val
-     parse_mode = get_option('variable-parse-mode')
-     if parse_mode == 'auto':
-@@ -627,7 +627,7 @@
- 
- variables_files = variable_shlex_converter(get_option('variables-files'))
- for file in variables_files:
--    print("Using variable customization file %s" % file)
-+    print(("Using variable customization file %s" % file))
- 
- env_vars = Variables(
-     files=variables_files,
-@@ -636,7 +636,7 @@
- 
- sconsflags = os.environ.get('SCONSFLAGS', None)
- if sconsflags:
--    print("Using SCONSFLAGS environment variable arguments: %s" % sconsflags)
-+    print(("Using SCONSFLAGS environment variable arguments: %s" % sconsflags))
- 
- env_vars.Add('ABIDW',
-     help="Configures the path to the 'abidw' (a libabigail) utility")
-@@ -770,7 +770,7 @@
- def validate_mongo_version(key, val, env):
-     regex = r'^(\d+)\.(\d+)\.(\d+)-?((?:(rc)(\d+))?.*)?'
-     if not re.match(regex, val):
--        print("Invalid MONGO_VERSION '{}', or could not derive from version.json or git metadata. Please add a conforming MONGO_VERSION=x.y.z[-extra] as an argument to SCons".format(val))
-+        print(("Invalid MONGO_VERSION '{}', or could not derive from version.json or git metadata. Please add a conforming MONGO_VERSION=x.y.z[-extra] as an argument to SCons".format(val)))
-         Exit(1)
- 
- env_vars.Add('MONGO_VERSION',
-@@ -901,12 +901,12 @@
-         Exit(1)
- 
- sconsDataDir = Dir(buildDir).Dir('scons')
--SConsignFile(str(sconsDataDir.File('sconsign')))
-+SConsignFile(str(sconsDataDir.File('sconsign.py3')))
- 
- def printLocalInfo():
-     import sys, SCons
--    print( "scons version: " + SCons.__version__ )
--    print( "python version: " + " ".join( [ `i` for i in sys.version_info ] ) )
-+    print(( "scons version: " + SCons.__version__ ))
-+    print(( "python version: " + " ".join( [ repr(i) for i in sys.version_info ] ) ))
- 
- printLocalInfo()
- 
-@@ -986,12 +986,12 @@
- env.AddMethod(mongo_platform.env_get_os_name_wrapper, 'GetTargetOSName')
- 
- def fatal_error(env, msg, *args):
--    print(msg.format(*args))
-+    print((msg.format(*args)))
-     Exit(1)
- 
- def conf_error(env, msg, *args):
--    print(msg.format(*args))
--    print("See {0} for details".format(env.File('$CONFIGURELOG').abspath))
-+    print((msg.format(*args)))
-+    print(("See {0} for details".format(env.File('$CONFIGURELOG').abspath)))
-     Exit(1)
- 
- env.AddMethod(fatal_error, 'FatalError')
-@@ -1010,12 +1010,12 @@
- env.AddMethod(lambda env: env['VERBOSE'], 'Verbose')
- 
- if has_option('variables-help'):
--    print(env_vars.GenerateHelpText(env))
-+    print((env_vars.GenerateHelpText(env)))
-     Exit(0)
- 
- #unknown_vars = env_vars.UnknownVariables()
- #if unknown_vars:
--#    env.FatalError("Unknown variables specified: {0}", ", ".join(unknown_vars.keys()))
-+#    env.FatalError("Unknown variables specified: {0}", ", ".join(list(unknown_vars.keys())))
- 
- def set_config_header_define(env, varname, varval = 1):
-     env['CONFIG_HEADER_DEFINES'][varname] = varval
-@@ -1100,7 +1100,7 @@
-         context.Result(ret)
-         return ret;
- 
--    for k in processor_macros.keys():
-+    for k in list(processor_macros.keys()):
-         ret = run_compile_check(k)
-         if ret:
-             context.Result('Detected a %s processor' % k)
-@@ -1222,7 +1222,7 @@
-     env['TARGET_ARCH'] = detected_processor
- 
- if env['TARGET_OS'] not in os_macros:
--    print("No special config for [{0}] which probably means it won't work".format(env['TARGET_OS']))
-+    print(("No special config for [{0}] which probably means it won't work".format(env['TARGET_OS'])))
- elif not detectConf.CheckForOS(env['TARGET_OS']):
-     env.ConfError("TARGET_OS ({0}) is not supported by compiler", env['TARGET_OS'])
- 
-@@ -2081,7 +2081,7 @@
-             # form -Wno-xxx (but not -Wno-error=xxx), we also add -Wxxx to the flags. GCC does
-             # warn on unknown -Wxxx style flags, so this lets us probe for availablity of
-             # -Wno-xxx.
--            for kw in test_mutation.keys():
-+            for kw in list(test_mutation.keys()):
-                 test_flags = test_mutation[kw]
-                 for test_flag in test_flags:
-                     if test_flag.startswith("-Wno-") and not test_flag.startswith("-Wno-error="):
-@@ -2095,7 +2095,7 @@
-         # to make them real errors.
-         cloned.Append(CCFLAGS=['-Werror'])
-         conf = Configure(cloned, help=False, custom_tests = {
--                'CheckFlag' : lambda(ctx) : CheckFlagTest(ctx, tool, extension, flag)
-+                'CheckFlag' : lambda ctx : CheckFlagTest(ctx, tool, extension, flag)
-         })
-         available = conf.CheckFlag()
-         conf.Finish()
-@@ -2611,7 +2611,7 @@
-         llvm_symbolizer = get_option('llvm-symbolizer')
-         if os.path.isabs(llvm_symbolizer):
-             if not myenv.File(llvm_symbolizer).exists():
--                print("WARNING: Specified symbolizer '%s' not found" % llvm_symbolizer)
-+                print(("WARNING: Specified symbolizer '%s' not found" % llvm_symbolizer))
-                 llvm_symbolizer = None
-         else:
-             llvm_symbolizer = myenv.WhereIs(llvm_symbolizer)
-@@ -2922,7 +2922,7 @@
-                         # TODO: If we could programmatically extract the paths from the info output
-                         # we could give a better message here, but brew info's machine readable output
-                         # doesn't seem to include the whole 'caveats' section.
--                        message = subprocess.check_output([brew, "info", "openssl"])
-+                        message = subprocess.check_output([brew, "info", "openssl"]).decode('utf-8')
-                         advice = textwrap.dedent(
-                             """\
-                             NOTE: HomeBrew installed to {0} appears to have OpenSSL installed.
-@@ -3082,7 +3082,7 @@
-         files = ['ssleay32.dll', 'libeay32.dll']
-         for extra_file in files:
-             if not addOpenSslLibraryToDistArchive(extra_file):
--                print("WARNING: Cannot find SSL library '%s'" % extra_file)
-+                print(("WARNING: Cannot find SSL library '%s'" % extra_file))
- 
- 
- 
-@@ -3423,7 +3423,7 @@
- 
-         outputIndex = next((idx for idx in [0,1] if conf.CheckAltivecVbpermqOutput(idx)), None)
-         if outputIndex is not None:
--	    conf.env.SetConfigHeaderDefine("MONGO_CONFIG_ALTIVEC_VEC_VBPERMQ_OUTPUT_INDEX", outputIndex)
-+            conf.env.SetConfigHeaderDefine("MONGO_CONFIG_ALTIVEC_VEC_VBPERMQ_OUTPUT_INDEX", outputIndex)
-         else:
-             myenv.ConfError("Running on ppc64le, but can't find a correct vec_vbpermq output index.  Compiler or platform not supported")
- 
-@@ -3523,9 +3523,12 @@
-     import buildscripts.pylinters
-     buildscripts.pylinters.lint_all(None, {}, [])
- 
--    import buildscripts.lint
--    if not buildscripts.lint.run_lint( [ "src/mongo/" ] ):
--        raise Exception( "lint errors" )
-+    env.Command(
-+        target="#run_lint",
-+        source=["buildscripts/lint.py", "src/mongo"],
-+        action="$PYTHON $SOURCES[0] $SOURCES[1]",
-+    )
-+
- 
- env.Alias( "lint" , [] , [ doLint ] )
- env.AlwaysBuild( "lint" )
-Only in .: build
-Only in ./buildscripts: __pycache__
-diff -ru /data/ports-build/mongodb-src-r4.0.21/buildscripts/aggregate_tracefiles.py ./buildscripts/aggregate_tracefiles.py
---- /data/ports-build/mongodb-src-r4.0.21/buildscripts/aggregate_tracefiles.py	2020-10-16 18:02:58.000000000 +0200
-+++ ./buildscripts/aggregate_tracefiles.py	2020-11-16 20:09:38.798317000 +0100
-@@ -20,7 +20,7 @@
- 
-     args += ['-o', output]
- 
--    print ' '.join(args)
-+    print(' '.join(args))
- 
-     return subprocess.call(args)
- 
-diff -ru /data/ports-build/mongodb-src-r4.0.21/buildscripts/aws_ec2.py ./buildscripts/aws_ec2.py
---- /data/ports-build/mongodb-src-r4.0.21/buildscripts/aws_ec2.py	2020-10-16 18:02:58.000000000 +0200
-+++ ./buildscripts/aws_ec2.py	2020-11-16 20:09:38.801388000 +0100
-@@ -1,8 +1,8 @@
- #!/usr/bin/env python
- """AWS EC2 instance launcher and controller."""
- 
--from __future__ import print_function
- 
-+
- import base64
- import collections
- import datetime
-@@ -88,12 +88,13 @@
-             if reached_state:
-                 print(" Instance {}!".format(instance.state["Name"]), file=sys.stdout)
-             else:
--                print(" Instance in state '{}', failed to reach state '{}'{}!".format(
--                    instance.state["Name"], state, client_error), file=sys.stdout)
-+                print(
-+                    " Instance in state '{}', failed to reach state '{}'{}!".format(
-+                        instance.state["Name"], state, client_error), file=sys.stdout)
-             sys.stdout.flush()
-         return 0 if reached_state else 1
- 
--    def control_instance(  #pylint: disable=too-many-arguments,too-many-branches
-+    def control_instance(  #pylint: disable=too-many-arguments,too-many-branches,too-many-locals
-             self, mode, image_id, wait_time_secs=0, show_progress=False, console_output_file=None,
-             console_screenshot_file=None):
-         """Control an AMI instance. Returns 0 & status information, if successful."""
-@@ -296,14 +297,15 @@
-     status_options.add_option("--yamlFile", dest="yaml_file", default=None,
-                               help="Save the status into the specified YAML file.")
- 
--    status_options.add_option("--consoleOutputFile", dest="console_output_file", default=None,
--                              help="Save the console output into the specified file, if"
--                              " available.")
-+    status_options.add_option(
-+        "--consoleOutputFile", dest="console_output_file", default=None,
-+        help="Save the console output into the specified file, if"
-+        " available.")
- 
--    status_options.add_option("--consoleScreenshotFile", dest="console_screenshot_file",
--                              default=None,
--                              help="Save the console screenshot (JPG format) into the specified"
--                              " file, if available.")
-+    status_options.add_option(
-+        "--consoleScreenshotFile", dest="console_screenshot_file", default=None,
-+        help="Save the console screenshot (JPG format) into the specified"
-+        " file, if available.")
- 
-     parser.add_option_group(control_options)
-     parser.add_option_group(create_options)
-@@ -328,7 +330,6 @@
-                 parser.error("Block size must be an integer")
-             block_devices[device_name] = device_size
- 
--        # The 'expire-on' key is a UTC time.
-         expire_dt = datetime.datetime.utcnow() + datetime.timedelta(hours=options.tag_expire_hours)
-         tags = [{"Key": "expire-on", "Value": expire_dt.strftime("%Y-%m-%d %H:%M:%S")},
-                 {"Key": "Name",
-Only in ./buildscripts/idl/idl: __pycache__
-diff -ru /data/ports-build/mongodb-src-r4.0.21/buildscripts/idl/idl/compiler.py ./buildscripts/idl/idl/compiler.py
---- /data/ports-build/mongodb-src-r4.0.21/buildscripts/idl/idl/compiler.py	2020-10-16 18:02:58.000000000 +0200
-+++ ./buildscripts/idl/idl/compiler.py	2020-11-16 20:09:38.804248000 +0100
-@@ -31,8 +31,6 @@
- Orchestrates the 3 passes (parser, binder, and generator) together.
- """
- 
--from __future__ import absolute_import, print_function, unicode_literals
--
- import io
- import logging
- import os
-@@ -70,14 +68,14 @@
-     """Class for the IDL compiler to resolve imported files."""
- 
-     def __init__(self, import_directories):
--        # type: (List[unicode]) -> None
-+        # type: (List[str]) -> None
-         """Construct a ImportResolver."""
-         self._import_directories = import_directories
- 
-         super(CompilerImportResolver, self).__init__()
- 
-     def resolve(self, base_file, imported_file_name):
--        # type: (unicode, unicode) -> unicode
-+        # type: (str, str) -> str
-         """Return the complete path to an imported file name."""
- 
-         logging.debug("Resolving imported file '%s' for file '%s'", imported_file_name, base_file)
-@@ -108,7 +106,7 @@
-         raise errors.IDLError(msg)
- 
-     def open(self, resolved_file_name):
--        # type: (unicode) -> Any
-+        # type: (str) -> Any
-         """Return an io.Stream for the requested file."""
-         return io.open(resolved_file_name, encoding='utf-8')
- 
-@@ -125,7 +123,7 @@
- 
- 
- def _update_import_includes(args, spec, header_file_name):
--    # type: (CompilerArgs, syntax.IDLSpec, unicode) -> None
-+    # type: (CompilerArgs, syntax.IDLSpec, str) -> None
-     """Update the list of imports with a list of include files for each import with structs."""
-     # This function is fragile:
-     # In order to try to generate headers with an "include what you use" set of headers, the IDL
-diff -ru /data/ports-build/mongodb-src-r4.0.21/buildscripts/idl/idl/syntax.py ./buildscripts/idl/idl/syntax.py
---- /data/ports-build/mongodb-src-r4.0.21/buildscripts/idl/idl/syntax.py	2020-10-16 18:02:58.000000000 +0200
-+++ ./buildscripts/idl/idl/syntax.py	2020-11-16 20:09:38.806128000 +0100
-@@ -33,8 +33,6 @@
- it follows the rules of the IDL, etc.
- """
- 
--from __future__ import absolute_import, print_function, unicode_literals
--
- import itertools
- from typing import Any, Dict, Iterator, List, Optional, Tuple, Union
- 
-@@ -70,7 +68,7 @@
- 
- 
- def parse_array_type(name):
--    # type: (unicode) -> unicode
-+    # type: (str) -> str
-     """Parse a type name of the form 'array<type>' and extract type."""
-     if not name.startswith("array<") and not name.endswith(">"):
-         return None
-@@ -95,7 +93,7 @@
-     # type: (Dict[Any, List[Any]]) -> Iterator[Tuple[Any, Any]]
-     """Return an Iterator of (key, value) pairs from a dictionary."""
-     return itertools.chain.from_iterable(
--        (_zip_scalar(value, key) for (key, value) in dic.viewitems()))
-+        (_zip_scalar(value, key) for (key, value) in dic.items()))
- 
- 
- class SymbolTable(object):
-@@ -115,7 +113,7 @@
-         self.types = []  # type: List[Type]
- 
-     def _is_duplicate(self, ctxt, location, name, duplicate_class_name):
--        # type: (errors.ParserContext, common.SourceLocation, unicode, unicode) -> bool
-+        # type: (errors.ParserContext, common.SourceLocation, str, str) -> bool
-         """Return true if the given item already exist in the symbol table."""
-         for (item, entity_type) in _item_and_type({
-                 "command": self.commands,
-@@ -179,12 +177,12 @@
-             self.add_type(ctxt, idltype)
- 
-     def resolve_field_type(self, ctxt, location, field_name, type_name):
--        # type: (errors.ParserContext, common.SourceLocation, unicode, unicode) -> Optional[Union[Command, Enum, Struct, Type]]
-+        # type: (errors.ParserContext, common.SourceLocation, str, str) -> Optional[Union[Command, Enum, Struct, Type]]
-         """Find the type or struct a field refers to or log an error."""
-         return self._resolve_field_type(ctxt, location, field_name, type_name)
- 
-     def _resolve_field_type(self, ctxt, location, field_name, type_name):
--        # type: (errors.ParserContext, common.SourceLocation, unicode, unicode) -> Optional[Union[Command, Enum, Struct, Type]]
-+        # type: (errors.ParserContext, common.SourceLocation, str, str) -> Optional[Union[Command, Enum, Struct, Type]]
-         """Find the type or struct a field refers to or log an error."""
-         # pylint: disable=too-many-return-statements
- 
-@@ -237,15 +235,15 @@
-     """IDL imports object."""
- 
-     def __init__(self, file_name, line, column):
--        # type: (unicode, int, int) -> None
-+        # type: (str, int, int) -> None
-         """Construct an Imports section."""
--        self.imports = []  # type: List[unicode]
-+        self.imports = []  # type: List[str]
- 
-         # These are not part of the IDL syntax but are produced by the parser.
-         # List of imports with structs.
--        self.resolved_imports = []  # type: List[unicode]
-+        self.resolved_imports = []  # type: List[str]
-         # All imports directly or indirectly included
--        self.dependencies = []  # type: List[unicode]
-+        self.dependencies = []  # type: List[str]
- 
-         super(Import, self).__init__(file_name, line, column)
- 
-@@ -262,16 +260,16 @@
-     # pylint: disable=too-many-instance-attributes
- 
-     def __init__(self, file_name, line, column):
--        # type: (unicode, int, int) -> None
-+        # type: (str, int, int) -> None
-         """Construct a Type."""
--        self.name = None  # type: unicode
--        self.description = None  # type: unicode
--        self.cpp_type = None  # type: unicode
--        self.bson_serialization_type = None  # type: List[unicode]
--        self.bindata_subtype = None  # type: unicode
--        self.serializer = None  # type: unicode
--        self.deserializer = None  # type: unicode
--        self.default = None  # type: unicode
-+        self.name = None  # type: str
-+        self.description = None  # type: str
-+        self.cpp_type = None  # type: str
-+        self.bson_serialization_type = None  # type: List[str]
-+        self.bindata_subtype = None  # type: str
-+        self.serializer = None  # type: str
-+        self.deserializer = None  # type: str
-+        self.default = None  # type: str
- 
-         super(Type, self).__init__(file_name, line, column)
- 
-@@ -288,15 +286,15 @@
-     # pylint: disable=too-many-instance-attributes
- 
-     def __init__(self, file_name, line, column):
--        # type: (unicode, int, int) -> None
-+        # type: (str, int, int) -> None
-         """Construct a Field."""
--        self.name = None  # type: unicode
--        self.cpp_name = None  # type: unicode
--        self.description = None  # type: unicode
--        self.type = None  # type: unicode
-+        self.name = None  # type: str
-+        self.cpp_name = None  # type: str
-+        self.description = None  # type: str
-+        self.type = None  # type: str
-         self.ignore = False  # type: bool
-         self.optional = False  # type: bool
--        self.default = None  # type: unicode
-+        self.default = None  # type: str
-         self.supports_doc_sequence = False  # type: bool
-         self.comparison_order = -1  # type: int
-         self.non_const_getter = False  # type: bool
-@@ -316,10 +314,10 @@
-     """
- 
-     def __init__(self, file_name, line, column):
--        # type: (unicode, int, int) -> None
-+        # type: (str, int, int) -> None
-         """Construct a Type."""
--        self.name = None  # type: unicode
--        self.cpp_name = None  # type: unicode
-+        self.name = None  # type: str
-+        self.cpp_name = None  # type: str
- 
-         super(ChainedStruct, self).__init__(file_name, line, column)
- 
-@@ -332,10 +330,10 @@
-     """
- 
-     def __init__(self, file_name, line, column):
--        # type: (unicode, int, int) -> None
-+        # type: (str, int, int) -> None
-         """Construct a Type."""
--        self.name = None  # type: unicode
--        self.cpp_name = None  # type: unicode
-+        self.name = None  # type: str
-+        self.cpp_name = None  # type: str
- 
-         super(ChainedType, self).__init__(file_name, line, column)
- 
-@@ -350,10 +348,10 @@
-     # pylint: disable=too-many-instance-attributes
- 
-     def __init__(self, file_name, line, column):
--        # type: (unicode, int, int) -> None
-+        # type: (str, int, int) -> None
-         """Construct a Struct."""
--        self.name = None  # type: unicode
--        self.description = None  # type: unicode
-+        self.name = None  # type: str
-+        self.description = None  # type: str
-         self.strict = True  # type: bool
-         self.immutable = False  # type: bool
-         self.inline_chained_structs = True  # type: bool
-@@ -399,10 +397,10 @@
-     """
- 
-     def __init__(self, file_name, line, column):
--        # type: (unicode, int, int) -> None
-+        # type: (str, int, int) -> None
-         """Construct an Enum."""
--        self.name = None  # type: unicode
--        self.value = None  # type: unicode
-+        self.name = None  # type: str
-+        self.value = None  # type: str
- 
-         super(EnumValue, self).__init__(file_name, line, column)
- 
-@@ -415,11 +413,11 @@
-     """
- 
-     def __init__(self, file_name, line, column):
--        # type: (unicode, int, int) -> None
-+        # type: (str, int, int) -> None
-         """Construct an Enum."""
--        self.name = None  # type: unicode
--        self.description = None  # type: unicode
--        self.type = None  # type: unicode
-+        self.name = None  # type: str
-+        self.description = None  # type: str
-+        self.type = None  # type: str
-         self.values = None  # type: List[EnumValue]
- 
-         # Internal property that is not represented as syntax. An imported enum is read from an
-diff -ru /data/ports-build/mongodb-src-r4.0.21/buildscripts/idl/idlc.py ./buildscripts/idl/idlc.py
---- /data/ports-build/mongodb-src-r4.0.21/buildscripts/idl/idlc.py	2020-10-16 18:02:58.000000000 +0200
-+++ ./buildscripts/idl/idlc.py	2020-11-16 20:09:38.807705000 +0100
-@@ -29,8 +29,6 @@
- #
- """IDL Compiler Driver Main Entry point."""
- 
--from __future__ import absolute_import, print_function
--
- import argparse
- import logging
- import sys
-diff -ru /data/ports-build/mongodb-src-r4.0.21/buildscripts/utils.py ./buildscripts/utils.py
---- /data/ports-build/mongodb-src-r4.0.21/buildscripts/utils.py	2020-10-16 18:02:58.000000000 +0200
-+++ ./buildscripts/utils.py	2020-11-16 20:09:38.809660000 +0100
-@@ -99,7 +99,7 @@
-     with open(os.devnull, "r+") as devnull:
-         proc = subprocess.Popen("git describe --abbrev=7", stdout=subprocess.PIPE, stderr=devnull,
-                                 stdin=devnull, shell=True)
--        return proc.communicate()[0].strip()
-+        return proc.communicate()[0].strip().decode('utf-8')
- 
- 
- def execsys(args):
-Only in ./site_scons: __pycache__
-diff -ru /data/ports-build/mongodb-src-r4.0.21/site_scons/libdeps.py ./site_scons/libdeps.py
---- /data/ports-build/mongodb-src-r4.0.21/site_scons/libdeps.py	2020-10-16 18:02:58.000000000 +0200
-+++ ./site_scons/libdeps.py	2020-11-16 20:09:38.813403000 +0100
-@@ -61,7 +61,7 @@
- missing_syslibdep = 'MISSING_LIBDEP_'
- 
- class dependency(object):
--    Public, Private, Interface = range(3)
-+    Public, Private, Interface = list(range(3))
- 
-     def __init__(self, value, deptype):
-         self.target_node = value
-@@ -85,7 +85,7 @@
- class DependencyCycleError(SCons.Errors.UserError):
-     """Exception representing a cycle discovered in library dependencies."""
- 
--    def __init__(self, first_node ):
-+    def __init__(self, first_node):
-         super(DependencyCycleError, self).__init__()
-         self.cycle_nodes = [first_node]
- 
-@@ -100,8 +100,8 @@
-         setattr(node.attributes, "libdeps_direct_sorted", direct_sorted)
-     return direct_sorted
- 
--def __get_libdeps(node):
- 
-+def __get_libdeps(node):
-     """Given a SCons Node, return its library dependencies, topologically sorted.
- 
-     Computes the dependencies if they're not already cached.
-@@ -133,7 +133,7 @@
-                 marked.add(n.target_node)
-                 tsorted.append(n.target_node)
- 
--            except DependencyCycleError, e:
-+            except DependencyCycleError as e:
-                 if len(e.cycle_nodes) == 1 or e.cycle_nodes[0] != e.cycle_nodes[-1]:
-                     e.cycle_nodes.insert(0, n.target_node)
-                 raise
-@@ -150,6 +150,7 @@
- 
-     return tsorted
- 
-+
- def __get_syslibdeps(node):
-     """ Given a SCons Node, return its system library dependencies.
- 
-@@ -161,11 +162,11 @@
-         for lib in __get_libdeps(node):
-             for syslib in node.get_env().Flatten(lib.get_env().get(syslibdeps_env_var, [])):
-                 if syslib:
--                    if type(syslib) in (str, unicode) and syslib.startswith(missing_syslibdep):
--                        print("Target '%s' depends on the availability of a "
-+                    if type(syslib) is str and syslib.startswith(missing_syslibdep):
-+                        print(("Target '%s' depends on the availability of a "
-                               "system provided library for '%s', "
-                               "but no suitable library was found during configuration." %
--                              (str(node), syslib[len(missing_syslibdep):]))
-+                              (str(node), syslib[len(missing_syslibdep):])))
-                         node.get_env().Exit(1)
-                     syslibdeps.append(syslib)
-         setattr(node.attributes, cached_var_name, syslibdeps)
-@@ -181,18 +182,21 @@
- 
-     if old_scanner:
-         path_function = old_scanner.path_function
-+
-         def new_scanner(node, env, path=()):
-             result = old_scanner.function(node, env, path)
-             result.extend(__get_libdeps(node))
-             return result
-     else:
-         path_function = None
-+
-         def new_scanner(node, env, path=()):
-             return __get_libdeps(node)
- 
-     builder.target_scanner = SCons.Scanner.Scanner(function=new_scanner,
--                                                    path_function=path_function)
-+                                                   path_function=path_function)
- 
-+
- def get_libdeps(source, target, env, for_signature):
-     """Implementation of the special _LIBDEPS environment variable.
- 
-@@ -202,6 +206,7 @@
-     target = env.Flatten([target])
-     return __get_libdeps(target[0])
- 
-+
- def get_libdeps_objs(source, target, env, for_signature):
-     objs = []
-     for lib in get_libdeps(source, target, env, for_signature):
-@@ -209,6 +214,7 @@
-         objs.extend(lib.sources)
-     return objs
- 
-+
- def get_syslibdeps(source, target, env, for_signature):
-     deps = __get_syslibdeps(target[0])
-     lib_link_prefix = env.subst('$LIBLINKPREFIX')
-@@ -220,7 +226,7 @@
-         # they're believed to represent library short names, that should be prefixed with -l
-         # or the compiler-specific equivalent.  I.e., 'm' becomes '-lm', but 'File("m.a") is passed
-         # through whole cloth.
--        if type(d) in (str, unicode):
-+        if type(d) is str:
-             result.append('%s%s%s' % (lib_link_prefix, d, lib_link_suffix))
-         else:
-             result.append(d)
-@@ -382,6 +388,7 @@
-         except KeyError:
-             pass
- 
-+
- def setup_conftests(conf):
-     def FindSysLibDep(context, name, libs, **kwargs):
-         var = "LIBDEPS_" + name.upper() + "_SYSLIBDEP"
-@@ -394,4 +401,5 @@
-                 return context.Result(result)
-         context.env[var] = __missing_syslib(name)
-         return context.Result(result)
-+
-     conf.AddTest('FindSysLibDep', FindSysLibDep)
-diff -ru /data/ports-build/mongodb-src-r4.0.21/site_scons/mongo/__init__.py ./site_scons/mongo/__init__.py
---- /data/ports-build/mongodb-src-r4.0.21/site_scons/mongo/__init__.py	2020-10-16 18:02:58.000000000 +0200
-+++ ./site_scons/mongo/__init__.py	2020-11-16 20:09:38.815614000 +0100
-@@ -5,4 +5,4 @@
- def print_build_failures():
-     from SCons.Script import GetBuildFailures
-     for bf in GetBuildFailures():
--        print "%s failed: %s" % (bf.node, bf.errstr)
-+        print("%s failed: %s" % (bf.node, bf.errstr))
-Only in ./site_scons/mongo: __pycache__
-diff -ru /data/ports-build/mongodb-src-r4.0.21/site_scons/mongo/generators.py ./site_scons/mongo/generators.py
---- /data/ports-build/mongodb-src-r4.0.21/site_scons/mongo/generators.py	2020-10-16 18:02:58.000000000 +0200
-+++ ./site_scons/mongo/generators.py	2020-11-16 20:09:38.817602000 +0100
-@@ -1,6 +1,6 @@
- # -*- mode: python; -*-
- 
--import md5
-+import hashlib
- 
- # Default and alternative generator definitions go here.
- 
-@@ -15,22 +15,69 @@
- # want to define them.
- def default_buildinfo_environment_data():
-     return (
--        ('distmod', '$MONGO_DISTMOD', True, True,),
--        ('distarch', '$MONGO_DISTARCH', True, True,),
--        ('cc', '$CC_VERSION', True, False,),
--        ('ccflags', '$CCFLAGS', True, False,),
--        ('cxx', '$CXX_VERSION', True, False,),
--        ('cxxflags', '$CXXFLAGS', True, False,),
--        ('linkflags', '$LINKFLAGS', True, False,),
--        ('target_arch', '$TARGET_ARCH', True, True,),
--        ('target_os', '$TARGET_OS', True, False,),
-+        (
-+            'distmod',
-+            '$MONGO_DISTMOD',
-+            True,
-+            True,
-+        ),
-+        (
-+            'distarch',
-+            '$MONGO_DISTARCH',
-+            True,
-+            True,
-+        ),
-+        (
-+            'cc',
-+            '$CC_VERSION',
-+            True,
-+            False,
-+        ),
-+        (
-+            'ccflags',
-+            '$CCFLAGS',
-+            True,
-+            False,
-+        ),
-+        (
-+            'cxx',
-+            '$CXX_VERSION',
-+            True,
-+            False,
-+        ),
-+        (
-+            'cxxflags',
-+            '$CXXFLAGS',
-+            True,
-+            False,
-+        ),
-+        (
-+            'linkflags',
-+            '$LINKFLAGS',
-+            True,
-+            False,
-+        ),
-+        (
-+            'target_arch',
-+            '$TARGET_ARCH',
-+            True,
-+            True,
-+        ),
-+        (
-+            'target_os',
-+            '$TARGET_OS',
-+            True,
-+            False,
-+        ),
-     )
- 
-+
- # If you want buildInfo and --version to be relatively empty, set
- # MONGO_BUILDINFO_ENVIRONMENT_DATA = empty_buildinfo_environment_data()
- def empty_buildinfo_environment_data():
-     return ()
- 
-+
- def default_variant_dir_generator(target, source, env, for_signature):
- 
-     if env.GetOption('cache') != None:
-@@ -44,11 +91,11 @@
- 
-     # Hash the named options and their values, and take the first 8 characters of the hash as
-     # the variant name
--    hasher = md5.md5()
-+    hasher = hashlib.md5()
-     for option in variant_options:
--        hasher.update(option)
--        hasher.update(str(env.GetOption(option)))
--    variant_dir = hasher.hexdigest()[0:8]
-+        hasher.update(option.encode('utf-8'))
-+        hasher.update(str(env.GetOption(option)).encode('utf-8'))
-+    variant_dir = str(hasher.hexdigest()[0:8])
- 
-     # If our option hash yields a well known hash, replace it with its name.
-     known_variant_hashes = {
-Only in ./site_scons/site_tools: __pycache__
-diff -ru /data/ports-build/mongodb-src-r4.0.21/site_scons/site_tools/distsrc.py ./site_scons/site_tools/distsrc.py
---- /data/ports-build/mongodb-src-r4.0.21/site_scons/site_tools/distsrc.py	2020-10-16 18:02:58.000000000 +0200
-+++ ./site_scons/site_tools/distsrc.py	2020-11-16 20:09:38.819994000 +0100
-@@ -20,7 +20,7 @@
- import tarfile
- import time
- import zipfile
--import StringIO
-+import io
- 
- from distutils.spawn import find_executable
- 
-@@ -28,7 +28,7 @@
- 
- class DistSrcFile:
-     def __init__(self, **kwargs):
--        [ setattr(self, key, val) for (key, val) in kwargs.items() ]
-+        [ setattr(self, key, val) for (key, val) in list(kwargs.items()) ]
- 
-     def __str__(self):
-         return self.name
-@@ -60,6 +60,7 @@
-     def close(self):
-         self.archive_file.close()
- 
-+
- class DistSrcTarArchive(DistSrcArchive):
-     def __iter__(self):
-         file_list = self.archive_file.getnames()
-@@ -82,7 +83,7 @@
- 
-     def append_file_contents(self, filename, file_contents,
-             mtime=time.time(),
--            mode=0644,
-+            mode=0o644,
-             uname="root",
-             gname="root"):
-         file_metadata = tarfile.TarInfo(name=filename)
-@@ -91,7 +92,7 @@
-         file_metadata.uname = uname
-         file_metadata.gname = gname
-         file_metadata.size = len(file_contents)
--        file_buf = StringIO.StringIO(file_contents)
-+        file_buf = io.BytesIO(file_contents.encode('utf-8'))
-         if self.archive_mode == 'r':
-             self.archive_file.close()
-             self.archive_file = tarfile.open(
-@@ -105,6 +106,7 @@
-     def append_file(self, filename, localfile):
-         self.archive_file.add(localfile, arcname=filename)
- 
-+
- class DistSrcZipArchive(DistSrcArchive):
-     def __iter__(self):
-         file_list = self.archive_file.namelist()
-@@ -119,7 +121,7 @@
-             name=key,
-             size=item_data.file_size,
-             mtime=time.mktime(fixed_time),
--            mode=0775 if is_dir else 0664,
-+            mode=0o775 if is_dir else 0o664,
-             type=tarfile.DIRTYPE if is_dir else tarfile.REGTYPE,
-             uid=0,
-             gid=0,
-@@ -129,7 +131,7 @@
- 
-     def append_file_contents(self, filename, file_contents,
-             mtime=time.time(),
--            mode=0644,
-+            mode=0o644,
-             uname="root",
-             gname="root"):
-         self.archive_file.writestr(filename, file_contents)
-@@ -139,7 +141,7 @@
- 
- def build_error_action(msg):
-     def error_stub(target=None, source=None, env=None):
--        print msg
-+        print(msg)
-         env.Exit(1)
-     return [ error_stub ]
- 
-@@ -162,7 +164,7 @@
- 
-     target_ext = str(target[0])[-3:]
-     if not target_ext in [ 'zip', 'tar' ]:
--        print "Invalid file format for distsrc. Must be tar or zip file"
-+        print("Invalid file format for distsrc. Must be tar or zip file")
-         env.Exit(1)
- 
-     git_cmd = "\"%s\" archive --format %s --output %s --prefix ${MONGO_DIST_SRC_PREFIX} HEAD" % (
-@@ -173,14 +175,14 @@
-         SCons.Action.Action(run_distsrc_callbacks, "Running distsrc callbacks for $TARGET")
-     ]
- 
-+
- def add_callback(env, fn):
-     __distsrc_callbacks.append(fn)
- 
-+
- def generate(env, **kwargs):
-     env.AddMethod(add_callback, 'AddDistSrcCallback')
--    env['BUILDERS']['__DISTSRC'] = SCons.Builder.Builder(
--        generator=distsrc_action_generator,
--    )
-+    env['BUILDERS']['__DISTSRC'] = SCons.Builder.Builder(generator=distsrc_action_generator, )
- 
-     def DistSrc(env, target):
-         result = env.__DISTSRC(target=target, source=[])
-@@ -189,6 +191,7 @@
-         return result
- 
-     env.AddMethod(DistSrc, 'DistSrc')
-+
- 
- def exists(env):
-     return True
-diff -ru /data/ports-build/mongodb-src-r4.0.21/site_scons/site_tools/idl_tool.py ./site_scons/site_tools/idl_tool.py
---- /data/ports-build/mongodb-src-r4.0.21/site_scons/site_tools/idl_tool.py	2020-10-16 18:02:58.000000000 +0200
-+++ ./site_scons/site_tools/idl_tool.py	2020-11-16 20:09:38.821062000 +0100
-@@ -21,6 +21,7 @@
- 
- import SCons
- 
-+
- def idlc_emitter(target, source, env):
-     """For each input IDL file, the tool produces a .cpp and .h file."""
-     first_source = str(source[0])
-@@ -43,7 +44,7 @@
- def idl_scanner(node, env, path):
-     # Use the import scanner mode of the IDL compiler to file imported files
-     cmd = [sys.executable, "buildscripts/idl/idlc.py",  '--include','src', str(node), '--write-dependencies']
--    deps_str = subprocess.check_output(cmd)
-+    deps_str = subprocess.check_output(cmd).decode('utf-8')
- 
-     deps_list = deps_str.splitlines()
- 
-@@ -57,19 +58,14 @@
- idl_scanner = SCons.Scanner.Scanner(function=idl_scanner, skeys=['.idl'])
- 
- # TODO: create a scanner for imports when imports are implemented
--IDLCBuilder = SCons.Builder.Builder(
--    action=IDLCAction,
--    emitter=idlc_emitter,
--    srcsuffx=".idl",
--    suffix=".cpp",
--    source_scanner = idl_scanner
--    )
-+IDLCBuilder = SCons.Builder.Builder(action=IDLCAction, emitter=idlc_emitter, srcsuffx=".idl",
-+                                    suffix=".cpp", source_scanner=idl_scanner)
- 
- 
- def generate(env):
-     bld = IDLCBuilder
- 
--    env.Append(SCANNERS = idl_scanner)
-+    env.Append(SCANNERS=idl_scanner)
- 
-     env['BUILDERS']['Idlc'] = bld
- 
-diff -ru /data/ports-build/mongodb-src-r4.0.21/site_scons/site_tools/jstoh.py ./site_scons/site_tools/jstoh.py
---- /data/ports-build/mongodb-src-r4.0.21/site_scons/site_tools/jstoh.py	2020-10-16 18:02:58.000000000 +0200
-+++ ./site_scons/site_tools/jstoh.py	2020-11-16 20:30:59.809428000 +0100
-@@ -39,7 +39,7 @@
- 
-     text = '\n'.join(h)
- 
--    with open(outFile, 'wb') as out:
-+    with open(outFile, 'w') as out:
-         try:
-             out.write(text)
-         finally:
-@@ -48,7 +48,7 @@
- 
- if __name__ == "__main__":
-     if len(sys.argv) < 3:
--        print "Must specify [target] [source] "
-+        print("Must specify [target] [source] ")
-         sys.exit(1)
- 
-     jsToHeader(sys.argv[1], sys.argv[2:])
-diff -ru /data/ports-build/mongodb-src-r4.0.21/site_scons/site_tools/mongo_benchmark.py ./site_scons/site_tools/mongo_benchmark.py
---- /data/ports-build/mongodb-src-r4.0.21/site_scons/site_tools/mongo_benchmark.py	2020-10-16 18:02:58.000000000 +0200
-+++ ./site_scons/site_tools/mongo_benchmark.py	2020-11-16 20:09:38.823525000 +0100
-@@ -11,10 +11,10 @@
-     env.Alias('$BENCHMARK_ALIAS', test)
- 
- def benchmark_list_builder_action(env, target, source):
--    ofile = open(str(target[0]), 'wb')
-+    ofile = open(str(target[0]), 'w')
-     try:
-         for s in _benchmarks:
--            print '\t' + str(s)
-+            print('\t' + str(s))
-             ofile.write('%s\n' % s)
-     finally:
-         ofile.close()
-@@ -40,9 +40,10 @@
-         bmEnv.Install("#/build/benchmark/", result[0])
-     return result
- 
-+
- def generate(env):
-     env.Command('$BENCHMARK_LIST', env.Value(_benchmarks),
--            Action(benchmark_list_builder_action, "Generating $TARGET"))
-+                Action(benchmark_list_builder_action, "Generating $TARGET"))
-     env.AddMethod(register_benchmark, 'RegisterBenchmark')
-     env.AddMethod(build_benchmark, 'Benchmark')
-     env.Alias('$BENCHMARK_ALIAS', '$BENCHMARK_LIST')
-diff -ru /data/ports-build/mongodb-src-r4.0.21/site_scons/site_tools/mongo_integrationtest.py ./site_scons/site_tools/mongo_integrationtest.py
---- /data/ports-build/mongodb-src-r4.0.21/site_scons/site_tools/mongo_integrationtest.py	2020-10-16 18:02:58.000000000 +0200
-+++ ./site_scons/site_tools/mongo_integrationtest.py	2020-11-16 20:09:38.824569000 +0100
-@@ -12,10 +12,10 @@
-     env.Alias('$INTEGRATION_TEST_ALIAS', installed_test)
- 
- def integration_test_list_builder_action(env, target, source):
--    ofile = open(str(target[0]), 'wb')
-+    ofile = open(str(target[0]), 'w')
-     try:
-         for s in _integration_tests:
--            print '\t' + str(s)
-+            print('\t' + str(s))
-             ofile.write('%s\n' % s)
-     finally:
-         ofile.close()
-@@ -31,9 +31,10 @@
-     env.RegisterIntegrationTest(result[0])
-     return result
- 
-+
- def generate(env):
-     env.Command('$INTEGRATION_TEST_LIST', env.Value(_integration_tests),
--            Action(integration_test_list_builder_action, "Generating $TARGET"))
-+                Action(integration_test_list_builder_action, "Generating $TARGET"))
-     env.AddMethod(register_integration_test, 'RegisterIntegrationTest')
-     env.AddMethod(build_cpp_integration_test, 'CppIntegrationTest')
-     env.Alias('$INTEGRATION_TEST_ALIAS', '$INTEGRATION_TEST_LIST')
-diff -ru /data/ports-build/mongodb-src-r4.0.21/site_scons/site_tools/mongo_unittest.py ./site_scons/site_tools/mongo_unittest.py
---- /data/ports-build/mongodb-src-r4.0.21/site_scons/site_tools/mongo_unittest.py	2020-10-16 18:02:58.000000000 +0200
-+++ ./site_scons/site_tools/mongo_unittest.py	2020-11-16 20:09:38.825577000 +0100
-@@ -11,10 +11,10 @@
-     env.Alias('$UNITTEST_ALIAS', test)
- 
- def unit_test_list_builder_action(env, target, source):
--    ofile = open(str(target[0]), 'wb')
-+    ofile = open(str(target[0]), 'w')
-     try:
-         for s in _unittests:
--            print '\t' + str(s)
-+            print('\t' + str(s))
-             ofile.write('%s\n' % s)
-     finally:
-         ofile.close()
-@@ -33,9 +33,10 @@
-         env.Install("#/build/unittests/", result[0])
-     return result
- 
-+
- def generate(env):
-     env.Command('$UNITTEST_LIST', env.Value(_unittests),
--            Action(unit_test_list_builder_action, "Generating $TARGET"))
-+                Action(unit_test_list_builder_action, "Generating $TARGET"))
-     env.AddMethod(register_unit_test, 'RegisterUnitTest')
-     env.AddMethod(build_cpp_unit_test, 'CppUnitTest')
-     env.Alias('$UNITTEST_ALIAS', '$UNITTEST_LIST')
-diff -ru /data/ports-build/mongodb-src-r4.0.21/site_scons/site_tools/split_dwarf.py ./site_scons/site_tools/split_dwarf.py
---- /data/ports-build/mongodb-src-r4.0.21/site_scons/site_tools/split_dwarf.py	2020-10-16 18:02:58.000000000 +0200
-+++ ./site_scons/site_tools/split_dwarf.py	2020-11-16 20:09:38.826716000 +0100
-@@ -26,6 +26,7 @@
- if SCons.Util.case_sensitive_suffixes('.c', '.C'):
-     _CXXSuffixes.append('.C')
- 
-+
- def _dwo_emitter(target, source, env):
-     new_targets = []
-     for t in target:
-@@ -40,6 +41,7 @@
-     targets = target + new_targets
-     return (targets, source)
- 
-+
- def generate(env):
-     suffixes = []
-     if _splitDwarfFlag in env['CCFLAGS']:
-@@ -52,7 +54,7 @@
- 
-     for object_builder in SCons.Tool.createObjBuilders(env):
-         emitterdict = object_builder.builder.emitter
--        for suffix in emitterdict.iterkeys():
-+        for suffix in emitterdict.keys():
-             if not suffix in suffixes:
-                 continue
-             base = emitterdict[suffix]
-@@ -60,6 +62,7 @@
-                 base,
-                 _dwo_emitter,
-             ])
-+
- 
- def exists(env):
-     return any(_splitDwarfFlag in env[f] for f in ['CCFLAGS', 'CFLAGS', 'CXXFLAGS'])
-diff -ru /data/ports-build/mongodb-src-r4.0.21/site_scons/site_tools/thin_archive.py ./site_scons/site_tools/thin_archive.py
---- /data/ports-build/mongodb-src-r4.0.21/site_scons/site_tools/thin_archive.py	2020-10-16 18:02:58.000000000 +0200
-+++ ./site_scons/site_tools/thin_archive.py	2020-11-16 20:09:38.827857000 +0100
-@@ -17,6 +17,7 @@
- import re
- import subprocess
- 
-+
- def exists(env):
-     if not 'AR' in env:
-         return False
-@@ -30,10 +31,9 @@
-     if not "rc" in env['ARFLAGS']:
-         return False
- 
--    pipe = SCons.Action._subproc(env, SCons.Util.CLVar(ar) + ['--version'],
--                                 stdin = 'devnull',
--                                 stderr = 'devnull',
--                                 stdout = subprocess.PIPE)
-+    pipe = SCons.Action._subproc(env,
-+                                 SCons.Util.CLVar(ar) + ['--version'], stdin='devnull',
-+                                 stderr='devnull', stdout=subprocess.PIPE)
-     if pipe.wait() != 0:
-         return False
- 
-@@ -41,7 +41,7 @@
-     for line in pipe.stdout:
-         if found:
-             continue  # consume all data
--        found = re.search(r'^GNU ar|^LLVM', line)
-+        found = re.search(r'^GNU ar|^LLVM', line.decode('utf-8'))
- 
-     return bool(found)
- 
-@@ -56,6 +56,7 @@
-     new_emitter = SCons.Builder.ListEmitter([base_emitter, new_emitter])
-     builder.emitter = new_emitter
- 
-+
- def _add_scanner(builder):
-     old_scanner = builder.target_scanner
-     path_function = old_scanner.path_function
-@@ -69,13 +70,16 @@
-                 new_results.extend(base.children())
-         return new_results
- 
--    builder.target_scanner = SCons.Scanner.Scanner(function=new_scanner, path_function=path_function)
-+    builder.target_scanner = SCons.Scanner.Scanner(function=new_scanner,
-+                                                   path_function=path_function)
- 
-+
- def generate(env):
-     if not exists(env):
-         return
- 
--    env['ARFLAGS'] = SCons.Util.CLVar([arflag if arflag != "rc" else "rcsTD" for arflag in env['ARFLAGS']])
-+    env['ARFLAGS'] = SCons.Util.CLVar(
-+        [arflag if arflag != "rc" else "rcsTD" for arflag in env['ARFLAGS']])
- 
-     def noop_action(env, target, source):
-         pass
-diff -ru /data/ports-build/mongodb-src-r4.0.21/src/mongo/SConscript ./src/mongo/SConscript
---- /data/ports-build/mongodb-src-r4.0.21/src/mongo/SConscript	2020-10-16 18:02:58.000000000 +0200
-+++ ./src/mongo/SConscript	2020-11-16 20:09:38.834118000 +0100
-@@ -155,9 +155,9 @@
- 
- # On windows, we need to escape the backslashes in the command-line
- # so that windows paths look okay.
--cmd_line = " ".join(sys.argv).encode('string-escape')
-+cmd_line = " ".join(sys.argv).encode('unicode_escape')
- if env.TargetOSIs('windows'):
--    cmd_line = cmd_line.replace('\\', r'\\')
-+    cmd_line = cmd_line.replace(b'\\', b'\\')
- 
- module_list = '{ %s }' % ', '.join([ '"{0}"'.format(x) for x in env['MONGO_MODULES'] ])
- 
-@@ -662,7 +662,7 @@
- 
- # If no module has introduced a file named LICENSE-Enterprise.txt then this
- # is a Community build, so inject the Community license
--if sum(itertools.imap(lambda x: x.name == "LICENSE-Enterprise.txt", env['MODULE_BANNERS'])) == 0:
-+if sum(map(lambda x: x.name == "LICENSE.txt", env['MODULE_BANNERS'])) == 0:
-     env.Append(MODULE_BANNERS = [distsrc.File('LICENSE-Community.txt')])
- 
- # All module banners get staged to the top level of the tarfile, so we
-@@ -681,7 +681,7 @@
- # Allow modules to map original file name directories to subdirectories
- # within the archive (e.g. { "src/mongo/db/modules/enterprise/docs": "snmp"})
- archive_addition_transforms = []
--for full_dir, archive_dir in env["ARCHIVE_ADDITION_DIR_MAP"].items():
-+for full_dir, archive_dir in list(env["ARCHIVE_ADDITION_DIR_MAP"].items()):
-   archive_addition_transforms.append("--transform \"%s=$SERVER_DIST_BASENAME/%s\"" %
-                                      (full_dir, archive_dir))
- 
-diff -ru /data/ports-build/mongodb-src-r4.0.21/src/mongo/base/generate_error_codes.py ./src/mongo/base/generate_error_codes.py
---- /data/ports-build/mongodb-src-r4.0.21/src/mongo/base/generate_error_codes.py	2020-10-16 18:02:58.000000000 +0200
-+++ ./src/mongo/base/generate_error_codes.py	2020-11-16 20:09:38.838467000 +0100
-@@ -26,7 +26,6 @@
- # delete this exception statement from your version. If you delete this
- # exception statement from all source files in the program, then also delete
- # it in the license file.
--
- """Generate error_codes.{h,cpp} from error_codes.err.
- 
- Format of error_codes.err:
-@@ -68,11 +67,13 @@
-         self.extra = extra
-         self.categories = []
- 
-+
- class ErrorClass:
-     def __init__(self, name, codes):
-         self.name = name
-         self.codes = codes
- 
-+
- def main(argv):
-     # Parse and validate argv.
-     if len(sys.argv) < 2:
-@@ -99,7 +100,7 @@
-                 categories=error_classes,
-                 )
- 
--        with open(output, 'wb') as outfile:
-+        with open(output, 'w') as outfile:
-             outfile.write(text)
- 
- def die(message=None):
-@@ -131,6 +132,7 @@
-     if failed:
-         die()
- 
-+
- def has_duplicate_error_codes(error_codes):
-     sorted_by_name = sorted(error_codes, key=lambda x: x.name)
-     sorted_by_code = sorted(error_codes, key=lambda x: x.code)
-@@ -139,21 +141,22 @@
-     prev = sorted_by_name[0]
-     for curr in sorted_by_name[1:]:
-         if curr.name == prev.name:
--            sys.stdout.write('Duplicate name %s with codes %s and %s\n'
--                    % (curr.name, curr.code, prev.code))
-+            sys.stdout.write(
-+                'Duplicate name %s with codes %s and %s\n' % (curr.name, curr.code, prev.code))
-             failed = True
-         prev = curr
- 
-     prev = sorted_by_code[0]
-     for curr in sorted_by_code[1:]:
-         if curr.code == prev.code:
--            sys.stdout.write('Duplicate code %s with names %s and %s\n'
--                    % (curr.code, curr.name, prev.name))
-+            sys.stdout.write(
-+                'Duplicate code %s with names %s and %s\n' % (curr.code, curr.name, prev.name))
-             failed = True
-         prev = curr
- 
-     return failed
- 
-+
- def has_duplicate_error_classes(error_classes):
-     names = sorted(ec.name for ec in error_classes)
- 
-@@ -166,6 +169,7 @@
-         prev_name = name
-     return failed
- 
-+
- def has_missing_error_codes(error_codes, error_classes):
-     code_names = dict((ec.name, ec) for ec in error_codes)
-     failed = False
-@@ -178,6 +182,7 @@
-                 failed = True
- 
-     return failed
-+
- 
- if __name__ == '__main__':
-     main(sys.argv)
-diff -ru /data/ports-build/mongodb-src-r4.0.21/src/mongo/db/auth/generate_action_types.py ./src/mongo/db/auth/generate_action_types.py
---- /data/ports-build/mongodb-src-r4.0.21/src/mongo/db/auth/generate_action_types.py	2020-10-16 18:02:58.000000000 +0200
-+++ ./src/mongo/db/auth/generate_action_types.py	2020-11-16 20:09:38.846414000 +0100
-@@ -26,7 +26,6 @@
- # delete this exception statement from your version. If you delete this
- # exception statement from all source files in the program, then also delete
- # it in the license file.
--
- """Generate action_type.{h,cpp}
- 
- Usage:
-@@ -35,7 +34,6 @@
- 
- import sys
- 
--
- headerFileTemplate = """// AUTO-GENERATED FILE DO NOT EDIT
- // See src/mongo/db/auth/generate_action_types.py
- /**
-@@ -194,14 +192,14 @@
- } // namespace mongo
- """
- 
-+
- def writeSourceFile(actionTypes, sourceOutputFile):
-     actionTypeConstants = ""
-     fromStringIfStatements = ""
-     toStringCaseStatements = ""
-     for actionType in actionTypes:
-         actionTypeConstants += ("    const ActionType ActionType::%(actionType)s"
--                                "(%(actionType)sValue);\n" %
--                                dict(actionType=actionType))
-+                                "(%(actionType)sValue);\n" % dict(actionType=actionType))
-         fromStringIfStatements += """        if (action == "%(actionType)s") {
-             *result = %(actionType)s;
-             return Status::OK();
-@@ -215,6 +213,7 @@
- 
-     pass
- 
-+
- def writeHeaderFile(actionTypes, headerOutputFile):
-     actionTypeConstants = ""
-     actionTypeIdentifiers = ""
-@@ -225,6 +224,7 @@
-                                                     actionTypeIdentifiers=actionTypeIdentifiers)
-     headerOutputFile.write(formattedHeaderFile)
- 
-+
- def hasDuplicateActionTypes(actionTypes):
-     sortedActionTypes = sorted(actionTypes)
- 
-@@ -232,7 +232,7 @@
-     prevActionType = sortedActionTypes[0]
-     for actionType in sortedActionTypes[1:]:
-         if actionType == prevActionType:
--            print 'Duplicate actionType %s\n' % actionType
-+            print('Duplicate actionType %s\n' % actionType)
-             didFail = True
-         prevActionType = actionType
- 
-@@ -245,7 +245,7 @@
- 
- if __name__ == "__main__":
-     if len(sys.argv) != 4:
--        print "Usage: generate_action_types.py <path to action_types.txt> <header file path> <source file path>"
-+        print("Usage: generate_action_types.py <path to action_types.txt> <header file path> <source file path>")
-         sys.exit(-1)
- 
-     actionTypes = parseActionTypesFromFile(sys.argv[1])
-diff -ru /data/ports-build/mongodb-src-r4.0.21/src/mongo/db/fts/generate_stop_words.py ./src/mongo/db/fts/generate_stop_words.py
---- /data/ports-build/mongodb-src-r4.0.21/src/mongo/db/fts/generate_stop_words.py	2020-10-16 18:02:58.000000000 +0200
-+++ ./src/mongo/db/fts/generate_stop_words.py	2020-11-16 20:09:38.851050000 +0100
-@@ -1,7 +1,7 @@
- import sys
- 
- def generate( header, source, language_files ):
--    out = open( header, "wb" )
-+    out = open( header, "w" )
-     out.write( """
- #pragma once
- #include <set>
-@@ -18,8 +18,8 @@
- 
- 
- 
--    out = open( source, "wb" )
--    out.write( '#include "%s"' % header.rpartition( "/" )[2].rpartition( "\\" )[2] )
-+    out = open( source, "w", encoding='utf-8')
-+    out.write( '#include "{}"'.format(header.rpartition( "/" )[2].rpartition( "\\" )[2]) )
-     out.write( """
- namespace mongo {
- namespace fts {
-@@ -35,12 +35,13 @@
-         out.write( '  {\n' )
-         out.write( '   const char* const words[] = {\n' )
-         for word in open( l_file, "rb" ):
--            out.write( '       "%s",\n' % word.strip() )
-+            out.write( '       "%s",\n' % word.decode('utf-8').strip() )
-         out.write( '   };\n' )
-         out.write( '   const size_t wordcnt = sizeof(words) / sizeof(words[0]);\n' )
-         out.write( '   std::set< std::string >& l = (*m)["%s"];\n' % l )
-         out.write( '   l.insert(&words[0], &words[wordcnt]);\n' )
-         out.write( '  }\n' )
-+
-     out.write( """
-   }
- } // namespace fts
-diff -ru /data/ports-build/mongodb-src-r4.0.21/src/mongo/util/generate_icu_init_cpp.py ./src/mongo/util/generate_icu_init_cpp.py
---- /data/ports-build/mongodb-src-r4.0.21/src/mongo/util/generate_icu_init_cpp.py	2020-10-16 18:02:58.000000000 +0200
-+++ ./src/mongo/util/generate_icu_init_cpp.py	2020-11-16 21:01:59.537644000 +0100
-@@ -112,8 +112,8 @@
- '''
-     decimal_encoded_data = ''
-     with open(data_file_path, 'rb') as data_file:
--        decimal_encoded_data = ','.join([str(ord(byte)) for byte in data_file.read()])
--    with open(cpp_file_path, 'wb') as cpp_file:
-+        decimal_encoded_data = ','.join([str(byte) for byte in data_file.read()])
-+    with open(cpp_file_path, 'w') as cpp_file:
-         cpp_file.write(source_template % dict(decimal_encoded_data=decimal_encoded_data))
- 
- if __name__ == '__main__':
diff --git a/databases/mongodb40/files/patch-rpm_mongod.conf b/databases/mongodb40/files/patch-rpm_mongod.conf
deleted file mode 100644
index 77f3b6026daf..000000000000
--- a/databases/mongodb40/files/patch-rpm_mongod.conf
+++ /dev/null
@@ -1,25 +0,0 @@
---- rpm/mongod.conf.orig	2018-01-04 23:28:55 UTC
-+++ rpm/mongod.conf
-@@ -7,11 +7,11 @@
- systemLog:
-   destination: file
-   logAppend: true
--  path: /var/log/mongodb/mongod.log
-+  path: /var/db/mongodb/mongod.log 
- 
- # Where and how to store data.
- storage:
--  dbPath: /var/lib/mongo
-+  dbPath: /var/db/mongodb 
-   journal:
-     enabled: true
- #  engine:
-@@ -21,7 +21,7 @@ storage:
- # how the process runs
- processManagement:
-   fork: true  # fork and run in background
--  pidFilePath: /var/run/mongodb/mongod.pid  # location of pidfile
-+  pidFilePath: /var/db/mongodb/mongod.lock  # location of pidfile
-   timeZoneInfo: /usr/share/zoneinfo
- 
- # network interfaces
diff --git a/databases/mongodb40/files/patch-src_mongo_base_error__codes.tpl.h b/databases/mongodb40/files/patch-src_mongo_base_error__codes.tpl.h
deleted file mode 100644
index 3ad2213ceaac..000000000000
--- a/databases/mongodb40/files/patch-src_mongo_base_error__codes.tpl.h
+++ /dev/null
@@ -1,14 +0,0 @@
-# based on: https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=245976#c12
-# https://jira.mongodb.org/browse/SERVER-44025
-# https://github.com/mongodb/mongo/commit/e484c9af6b4ae4a1d22c905e252ad3ad13f30bfc
---- src/mongo/base/error_codes.tpl.h.orig	2020-06-07 14:38:05 UTC
-+++ src/mongo/base/error_codes.tpl.h
-@@ -127,7 +127,7 @@ template <int32_t code>
- constexpr bool isNamedCode = false;
- //#for $ec in $codes
- template <>
--constexpr bool isNamedCode<ErrorCodes::$ec.name> = true;
-+constexpr inline bool isNamedCode<ErrorCodes::$ec.name> = true;
- //#end for
- 
- MONGO_COMPILER_NORETURN void throwExceptionForStatus(const Status& status);
diff --git a/databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_gen-config.sh b/databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_gen-config.sh
deleted file mode 100644
index e23398b0c2d4..000000000000
--- a/databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_gen-config.sh
+++ /dev/null
@@ -1,21 +0,0 @@
---- src/third_party/mozjs-45/gen-config.sh.orig	2020-11-30 15:51:50 UTC
-+++ src/third_party/mozjs-45/gen-config.sh
-@@ -27,6 +27,9 @@ case "$_Path" in
-     "platform/aarch64/linux")
-         _CONFIG_OPTS="--host=aarch64-linux"
- 	;;
-+    "platform/ppc64le/freebsd")
-+        _CONFIG_OPTS="--host=ppc64le-freebsd"
-+	;;
-     "platform/ppc64le/linux")
-         _CONFIG_OPTS="--host=ppc64le-linux"
- 	;;
-@@ -81,7 +84,7 @@ esac
- cd mozilla-release/js/src
- rm config.cache
- 
--PYTHON=python ./configure --without-x --without-intl-api --enable-posix-nspr-emulation --disable-trace-logging "$_CONFIG_OPTS"
-+PYTHON=python2.7 ./configure --without-x --without-intl-api --enable-posix-nspr-emulation --disable-trace-logging "$_CONFIG_OPTS"
- 
- cd ../../..
- 
diff --git a/databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src0.cpp b/databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src0.cpp
deleted file mode 100644
index d40c2c1e0fdb..000000000000
--- a/databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src0.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-45/platform/ppc64le/freebsd/build/Unified_cpp_js_src0.cpp.orig	2020-11-30 15:55:08 UTC
-+++ src/third_party/mozjs-45/platform/ppc64le/freebsd/build/Unified_cpp_js_src0.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "asmjs/AsmJSFrameIterator.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "asmjs/AsmJSFrameIterator.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "asmjs/AsmJSFrameIterator.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "asmjs/AsmJSLink.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "asmjs/AsmJSLink.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "asmjs/AsmJSLink.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "asmjs/AsmJSModule.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "asmjs/AsmJSModule.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "asmjs/AsmJSModule.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "asmjs/AsmJSSignalHandlers.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "asmjs/AsmJSSignalHandlers.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "asmjs/AsmJSSignalHandlers.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "asmjs/AsmJSValidate.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "asmjs/AsmJSValidate.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "asmjs/AsmJSValidate.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "asmjs/WasmGenerator.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "asmjs/WasmGenerator.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "asmjs/WasmGenerator.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src1.cpp b/databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src1.cpp
deleted file mode 100644
index 4e1c13f94c5b..000000000000
--- a/databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src1.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-45/platform/ppc64le/freebsd/build/Unified_cpp_js_src1.cpp.orig	2020-11-30 15:55:08 UTC
-+++ src/third_party/mozjs-45/platform/ppc64le/freebsd/build/Unified_cpp_js_src1.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "asmjs/WasmIonCompile.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "asmjs/WasmIonCompile.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "asmjs/WasmIonCompile.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "asmjs/WasmStubs.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "asmjs/WasmStubs.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "asmjs/WasmStubs.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "builtin/AtomicsObject.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "builtin/AtomicsObject.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "builtin/AtomicsObject.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "builtin/Eval.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "builtin/Eval.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "builtin/Eval.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "builtin/Intl.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "builtin/Intl.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "builtin/Intl.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "builtin/MapObject.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "builtin/MapObject.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "builtin/MapObject.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src10.cpp b/databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src10.cpp
deleted file mode 100644
index 67f43a616044..000000000000
--- a/databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src10.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-45/platform/ppc64le/freebsd/build/Unified_cpp_js_src10.cpp.orig	2020-11-30 15:55:08 UTC
-+++ src/third_party/mozjs-45/platform/ppc64le/freebsd/build/Unified_cpp_js_src10.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "jit/BaselineFrameInfo.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/BaselineFrameInfo.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/BaselineFrameInfo.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/BaselineIC.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/BaselineIC.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/BaselineIC.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/BaselineInspector.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/BaselineInspector.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/BaselineInspector.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/BaselineJIT.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/BaselineJIT.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/BaselineJIT.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/BitSet.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/BitSet.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/BitSet.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/BytecodeAnalysis.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/BytecodeAnalysis.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/BytecodeAnalysis.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src11.cpp b/databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src11.cpp
deleted file mode 100644
index 5ac645ebe559..000000000000
--- a/databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src11.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-45/platform/ppc64le/freebsd/build/Unified_cpp_js_src11.cpp.orig	2020-11-30 15:55:08 UTC
-+++ src/third_party/mozjs-45/platform/ppc64le/freebsd/build/Unified_cpp_js_src11.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "jit/C1Spewer.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/C1Spewer.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/C1Spewer.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/CodeGenerator.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/CodeGenerator.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/CodeGenerator.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/CompileWrappers.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/CompileWrappers.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/CompileWrappers.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/Disassembler.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/Disassembler.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/Disassembler.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/EagerSimdUnbox.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/EagerSimdUnbox.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/EagerSimdUnbox.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/EdgeCaseAnalysis.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/EdgeCaseAnalysis.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/EdgeCaseAnalysis.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src12.cpp b/databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src12.cpp
deleted file mode 100644
index b4f17aa42ca9..000000000000
--- a/databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src12.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-45/platform/ppc64le/freebsd/build/Unified_cpp_js_src12.cpp.orig	2020-11-30 15:55:08 UTC
-+++ src/third_party/mozjs-45/platform/ppc64le/freebsd/build/Unified_cpp_js_src12.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "jit/EffectiveAddressAnalysis.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/EffectiveAddressAnalysis.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/EffectiveAddressAnalysis.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/ExecutableAllocator.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/ExecutableAllocator.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/ExecutableAllocator.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/InstructionReordering.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/InstructionReordering.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/InstructionReordering.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/Ion.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/Ion.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/Ion.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/IonAnalysis.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/IonAnalysis.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/IonAnalysis.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/IonBuilder.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/IonBuilder.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/IonBuilder.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src13.cpp b/databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src13.cpp
deleted file mode 100644
index d556257c3793..000000000000
--- a/databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src13.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-45/platform/ppc64le/freebsd/build/Unified_cpp_js_src13.cpp.orig	2020-11-30 15:55:08 UTC
-+++ src/third_party/mozjs-45/platform/ppc64le/freebsd/build/Unified_cpp_js_src13.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "jit/IonCaches.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/IonCaches.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/IonCaches.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/IonOptimizationLevels.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/IonOptimizationLevels.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/IonOptimizationLevels.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/JSONSpewer.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/JSONSpewer.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/JSONSpewer.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/JitFrames.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/JitFrames.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/JitFrames.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/JitOptions.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/JitOptions.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/JitOptions.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/JitSpewer.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/JitSpewer.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/JitSpewer.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src14.cpp b/databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src14.cpp
deleted file mode 100644
index 6b5029b9a591..000000000000
--- a/databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src14.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-45/platform/ppc64le/freebsd/build/Unified_cpp_js_src14.cpp.orig	2020-11-30 15:55:08 UTC
-+++ src/third_party/mozjs-45/platform/ppc64le/freebsd/build/Unified_cpp_js_src14.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "jit/JitcodeMap.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/JitcodeMap.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/JitcodeMap.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/LICM.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/LICM.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/LICM.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/LIR.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/LIR.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/LIR.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/LoopUnroller.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/LoopUnroller.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/LoopUnroller.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/Lowering.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/Lowering.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/Lowering.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/MCallOptimize.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/MCallOptimize.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/MCallOptimize.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src15.cpp b/databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src15.cpp
deleted file mode 100644
index 212274b5c11e..000000000000
--- a/databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src15.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-45/platform/ppc64le/freebsd/build/Unified_cpp_js_src15.cpp.orig	2020-11-30 15:55:08 UTC
-+++ src/third_party/mozjs-45/platform/ppc64le/freebsd/build/Unified_cpp_js_src15.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "jit/MIR.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/MIR.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/MIR.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/MIRGraph.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/MIRGraph.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/MIRGraph.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/MacroAssembler.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/MacroAssembler.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/MacroAssembler.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/MoveResolver.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/MoveResolver.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/MoveResolver.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/OptimizationTracking.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/OptimizationTracking.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/OptimizationTracking.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/PerfSpewer.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/PerfSpewer.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/PerfSpewer.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src16.cpp b/databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src16.cpp
deleted file mode 100644
index a4f687fb5e6b..000000000000
--- a/databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src16.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-45/platform/ppc64le/freebsd/build/Unified_cpp_js_src16.cpp.orig	2020-11-30 15:55:08 UTC
-+++ src/third_party/mozjs-45/platform/ppc64le/freebsd/build/Unified_cpp_js_src16.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "jit/ProcessExecutableMemory.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/ProcessExecutableMemory.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/ProcessExecutableMemory.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/RangeAnalysis.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/RangeAnalysis.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/RangeAnalysis.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/Recover.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/Recover.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/Recover.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/RegisterAllocator.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/RegisterAllocator.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/RegisterAllocator.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/RematerializedFrame.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/RematerializedFrame.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/RematerializedFrame.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/Safepoints.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/Safepoints.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/Safepoints.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src17.cpp b/databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src17.cpp
deleted file mode 100644
index 4a66bc9f228e..000000000000
--- a/databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src17.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-45/platform/ppc64le/freebsd/build/Unified_cpp_js_src17.cpp.orig	2020-11-30 15:55:08 UTC
-+++ src/third_party/mozjs-45/platform/ppc64le/freebsd/build/Unified_cpp_js_src17.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "jit/ScalarReplacement.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/ScalarReplacement.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/ScalarReplacement.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/SharedIC.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/SharedIC.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/SharedIC.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/Sink.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/Sink.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/Sink.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/Snapshots.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/Snapshots.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/Snapshots.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/StupidAllocator.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/StupidAllocator.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/StupidAllocator.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/TypePolicy.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/TypePolicy.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/TypePolicy.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src18.cpp b/databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src18.cpp
deleted file mode 100644
index fad4b24e34e8..000000000000
--- a/databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src18.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-45/platform/ppc64le/freebsd/build/Unified_cpp_js_src18.cpp.orig	2020-11-30 15:55:08 UTC
-+++ src/third_party/mozjs-45/platform/ppc64le/freebsd/build/Unified_cpp_js_src18.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "jit/TypedObjectPrediction.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/TypedObjectPrediction.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/TypedObjectPrediction.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/VMFunctions.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/VMFunctions.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/VMFunctions.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/ValueNumbering.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/ValueNumbering.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/ValueNumbering.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/none/Trampoline-none.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/none/Trampoline-none.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/none/Trampoline-none.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/shared/BaselineCompiler-shared.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/shared/BaselineCompiler-shared.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/shared/BaselineCompiler-shared.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/shared/CodeGenerator-shared.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/shared/CodeGenerator-shared.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/shared/CodeGenerator-shared.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src19.cpp b/databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src19.cpp
deleted file mode 100644
index aaa14d91c821..000000000000
--- a/databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src19.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-45/platform/ppc64le/freebsd/build/Unified_cpp_js_src19.cpp.orig	2020-11-30 15:55:08 UTC
-+++ src/third_party/mozjs-45/platform/ppc64le/freebsd/build/Unified_cpp_js_src19.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "jit/shared/Lowering-shared.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/shared/Lowering-shared.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/shared/Lowering-shared.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jsalloc.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jsalloc.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jsalloc.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jsapi.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jsapi.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jsapi.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jsbool.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jsbool.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jsbool.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jscntxt.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jscntxt.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jscntxt.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jscompartment.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jscompartment.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jscompartment.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src2.cpp b/databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src2.cpp
deleted file mode 100644
index 60657353c208..000000000000
--- a/databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src2.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-45/platform/ppc64le/freebsd/build/Unified_cpp_js_src2.cpp.orig	2020-11-30 15:55:08 UTC
-+++ src/third_party/mozjs-45/platform/ppc64le/freebsd/build/Unified_cpp_js_src2.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "builtin/ModuleObject.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "builtin/ModuleObject.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "builtin/ModuleObject.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "builtin/Object.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "builtin/Object.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "builtin/Object.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "builtin/Profilers.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "builtin/Profilers.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "builtin/Profilers.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "builtin/Reflect.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "builtin/Reflect.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "builtin/Reflect.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "builtin/ReflectParse.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "builtin/ReflectParse.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "builtin/ReflectParse.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "builtin/SIMD.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "builtin/SIMD.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "builtin/SIMD.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src20.cpp b/databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src20.cpp
deleted file mode 100644
index a3c40f89e0d9..000000000000
--- a/databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src20.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-45/platform/ppc64le/freebsd/build/Unified_cpp_js_src20.cpp.orig	2020-11-30 15:55:08 UTC
-+++ src/third_party/mozjs-45/platform/ppc64le/freebsd/build/Unified_cpp_js_src20.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "jsdate.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jsdate.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jsdate.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jsdtoa.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jsdtoa.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jsdtoa.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jsexn.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jsexn.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jsexn.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jsfriendapi.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jsfriendapi.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jsfriendapi.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jsfun.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jsfun.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jsfun.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jsgc.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jsgc.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jsgc.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src21.cpp b/databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src21.cpp
deleted file mode 100644
index 998ebde49058..000000000000
--- a/databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src21.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-45/platform/ppc64le/freebsd/build/Unified_cpp_js_src21.cpp.orig	2020-11-30 15:55:08 UTC
-+++ src/third_party/mozjs-45/platform/ppc64le/freebsd/build/Unified_cpp_js_src21.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "jsiter.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jsiter.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jsiter.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jsnativestack.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jsnativestack.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jsnativestack.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jsnum.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jsnum.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jsnum.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jsobj.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jsobj.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jsobj.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "json.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "json.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "json.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jsopcode.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jsopcode.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jsopcode.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src22.cpp b/databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src22.cpp
deleted file mode 100644
index bcade7ee2385..000000000000
--- a/databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src22.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-45/platform/ppc64le/freebsd/build/Unified_cpp_js_src22.cpp.orig	2020-11-30 15:55:08 UTC
-+++ src/third_party/mozjs-45/platform/ppc64le/freebsd/build/Unified_cpp_js_src22.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "jsprf.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jsprf.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jsprf.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jspropertytree.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jspropertytree.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jspropertytree.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jsscript.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jsscript.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jsscript.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jsstr.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jsstr.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jsstr.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jswatchpoint.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jswatchpoint.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jswatchpoint.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jsweakmap.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jsweakmap.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jsweakmap.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src23.cpp b/databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src23.cpp
deleted file mode 100644
index 7a758062b229..000000000000
--- a/databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src23.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-45/platform/ppc64le/freebsd/build/Unified_cpp_js_src23.cpp.orig	2020-11-30 15:55:08 UTC
-+++ src/third_party/mozjs-45/platform/ppc64le/freebsd/build/Unified_cpp_js_src23.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "perf/jsperf.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "perf/jsperf.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "perf/jsperf.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "proxy/BaseProxyHandler.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "proxy/BaseProxyHandler.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "proxy/BaseProxyHandler.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "proxy/CrossCompartmentWrapper.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "proxy/CrossCompartmentWrapper.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "proxy/CrossCompartmentWrapper.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "proxy/DeadObjectProxy.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "proxy/DeadObjectProxy.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "proxy/DeadObjectProxy.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "proxy/DirectProxyHandler.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "proxy/DirectProxyHandler.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "proxy/DirectProxyHandler.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "proxy/OpaqueCrossCompartmentWrapper.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "proxy/OpaqueCrossCompartmentWrapper.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "proxy/OpaqueCrossCompartmentWrapper.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src24.cpp b/databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src24.cpp
deleted file mode 100644
index c6ce0f718c67..000000000000
--- a/databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src24.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-45/platform/ppc64le/freebsd/build/Unified_cpp_js_src24.cpp.orig	2020-11-30 15:55:08 UTC
-+++ src/third_party/mozjs-45/platform/ppc64le/freebsd/build/Unified_cpp_js_src24.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "proxy/Proxy.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "proxy/Proxy.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "proxy/Proxy.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "proxy/ScriptedDirectProxyHandler.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "proxy/ScriptedDirectProxyHandler.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "proxy/ScriptedDirectProxyHandler.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "proxy/ScriptedIndirectProxyHandler.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "proxy/ScriptedIndirectProxyHandler.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "proxy/ScriptedIndirectProxyHandler.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "proxy/SecurityWrapper.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "proxy/SecurityWrapper.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "proxy/SecurityWrapper.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "proxy/Wrapper.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "proxy/Wrapper.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "proxy/Wrapper.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/ArgumentsObject.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/ArgumentsObject.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/ArgumentsObject.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src25.cpp b/databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src25.cpp
deleted file mode 100644
index 65d34854466b..000000000000
--- a/databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src25.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-45/platform/ppc64le/freebsd/build/Unified_cpp_js_src25.cpp.orig	2020-11-30 15:55:08 UTC
-+++ src/third_party/mozjs-45/platform/ppc64le/freebsd/build/Unified_cpp_js_src25.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "vm/ArrayBufferObject.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/ArrayBufferObject.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/ArrayBufferObject.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/CallNonGenericMethod.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/CallNonGenericMethod.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/CallNonGenericMethod.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/CharacterEncoding.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/CharacterEncoding.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/CharacterEncoding.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/CodeCoverage.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/CodeCoverage.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/CodeCoverage.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/Compression.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/Compression.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/Compression.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/DateTime.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/DateTime.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/DateTime.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src26.cpp b/databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src26.cpp
deleted file mode 100644
index a36ff8d65028..000000000000
--- a/databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src26.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-45/platform/ppc64le/freebsd/build/Unified_cpp_js_src26.cpp.orig	2020-11-30 15:55:08 UTC
-+++ src/third_party/mozjs-45/platform/ppc64le/freebsd/build/Unified_cpp_js_src26.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "vm/Debugger.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/Debugger.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/Debugger.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/DebuggerMemory.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/DebuggerMemory.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/DebuggerMemory.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/ErrorObject.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/ErrorObject.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/ErrorObject.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/ForOfIterator.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/ForOfIterator.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/ForOfIterator.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/GeneratorObject.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/GeneratorObject.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/GeneratorObject.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/GlobalObject.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/GlobalObject.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/GlobalObject.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src27.cpp b/databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src27.cpp
deleted file mode 100644
index 355d40846169..000000000000
--- a/databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src27.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-45/platform/ppc64le/freebsd/build/Unified_cpp_js_src27.cpp.orig	2020-11-30 15:55:08 UTC
-+++ src/third_party/mozjs-45/platform/ppc64le/freebsd/build/Unified_cpp_js_src27.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "vm/HelperThreads.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/HelperThreads.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/HelperThreads.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/Id.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/Id.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/Id.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/Interpreter.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/Interpreter.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/Interpreter.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/JSONParser.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/JSONParser.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/JSONParser.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/MemoryMetrics.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/MemoryMetrics.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/MemoryMetrics.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/Monitor.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/Monitor.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/Monitor.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src28.cpp b/databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src28.cpp
deleted file mode 100644
index a457d4201566..000000000000
--- a/databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src28.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-45/platform/ppc64le/freebsd/build/Unified_cpp_js_src28.cpp.orig	2020-11-30 15:55:08 UTC
-+++ src/third_party/mozjs-45/platform/ppc64le/freebsd/build/Unified_cpp_js_src28.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "vm/NativeObject.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/NativeObject.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/NativeObject.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/ObjectGroup.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/ObjectGroup.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/ObjectGroup.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/PIC.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/PIC.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/PIC.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/PosixNSPR.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/PosixNSPR.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/PosixNSPR.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/Printer.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/Printer.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/Printer.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/Probes.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/Probes.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/Probes.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src29.cpp b/databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src29.cpp
deleted file mode 100644
index a9c961858082..000000000000
--- a/databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src29.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-45/platform/ppc64le/freebsd/build/Unified_cpp_js_src29.cpp.orig	2020-11-30 15:55:08 UTC
-+++ src/third_party/mozjs-45/platform/ppc64le/freebsd/build/Unified_cpp_js_src29.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "vm/ProxyObject.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/ProxyObject.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/ProxyObject.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/ReceiverGuard.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/ReceiverGuard.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/ReceiverGuard.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/RegExpObject.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/RegExpObject.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/RegExpObject.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/RegExpStatics.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/RegExpStatics.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/RegExpStatics.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/Runtime.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/Runtime.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/Runtime.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/SPSProfiler.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/SPSProfiler.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/SPSProfiler.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src3.cpp b/databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src3.cpp
deleted file mode 100644
index 1199e24af625..000000000000
--- a/databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src3.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-45/platform/ppc64le/freebsd/build/Unified_cpp_js_src3.cpp.orig	2020-11-30 15:55:08 UTC
-+++ src/third_party/mozjs-45/platform/ppc64le/freebsd/build/Unified_cpp_js_src3.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "builtin/SymbolObject.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "builtin/SymbolObject.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "builtin/SymbolObject.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "builtin/TestingFunctions.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "builtin/TestingFunctions.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "builtin/TestingFunctions.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "builtin/TypedObject.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "builtin/TypedObject.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "builtin/TypedObject.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "builtin/WeakMapObject.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "builtin/WeakMapObject.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "builtin/WeakMapObject.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "builtin/WeakSetObject.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "builtin/WeakSetObject.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "builtin/WeakSetObject.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "devtools/sharkctl.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "devtools/sharkctl.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "devtools/sharkctl.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src30.cpp b/databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src30.cpp
deleted file mode 100644
index 385677b5118b..000000000000
--- a/databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src30.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-45/platform/ppc64le/freebsd/build/Unified_cpp_js_src30.cpp.orig	2020-11-30 15:55:08 UTC
-+++ src/third_party/mozjs-45/platform/ppc64le/freebsd/build/Unified_cpp_js_src30.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "vm/SavedStacks.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/SavedStacks.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/SavedStacks.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/ScopeObject.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/ScopeObject.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/ScopeObject.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/SelfHosting.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/SelfHosting.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/SelfHosting.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/Shape.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/Shape.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/Shape.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/SharedArrayObject.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/SharedArrayObject.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/SharedArrayObject.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/Stack.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/Stack.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/Stack.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src31.cpp b/databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src31.cpp
deleted file mode 100644
index b9abd3bc6e98..000000000000
--- a/databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src31.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-45/platform/ppc64le/freebsd/build/Unified_cpp_js_src31.cpp.orig	2020-11-30 15:55:08 UTC
-+++ src/third_party/mozjs-45/platform/ppc64le/freebsd/build/Unified_cpp_js_src31.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "vm/Stopwatch.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/Stopwatch.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/Stopwatch.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/String.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/String.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/String.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/StringBuffer.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/StringBuffer.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/StringBuffer.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/StructuredClone.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/StructuredClone.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/StructuredClone.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/Symbol.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/Symbol.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/Symbol.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/TaggedProto.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/TaggedProto.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/TaggedProto.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src32.cpp b/databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src32.cpp
deleted file mode 100644
index a52eb2388cd7..000000000000
--- a/databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src32.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-45/platform/ppc64le/freebsd/build/Unified_cpp_js_src32.cpp.orig	2020-11-30 15:55:08 UTC
-+++ src/third_party/mozjs-45/platform/ppc64le/freebsd/build/Unified_cpp_js_src32.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "vm/Time.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/Time.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/Time.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/TypeInference.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/TypeInference.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/TypeInference.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/TypedArrayObject.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/TypedArrayObject.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/TypedArrayObject.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/UbiNode.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/UbiNode.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/UbiNode.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/UbiNodeCensus.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/UbiNodeCensus.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/UbiNodeCensus.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/UnboxedObject.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/UnboxedObject.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/UnboxedObject.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src33.cpp b/databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src33.cpp
deleted file mode 100644
index ad07c75831b1..000000000000
--- a/databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src33.cpp
+++ /dev/null
@@ -1,41 +0,0 @@
---- src/third_party/mozjs-45/platform/ppc64le/freebsd/build/Unified_cpp_js_src33.cpp.orig	2020-11-30 15:55:08 UTC
-+++ src/third_party/mozjs-45/platform/ppc64le/freebsd/build/Unified_cpp_js_src33.cpp
-@@ -0,0 +1,37 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "vm/Unicode.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/Unicode.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/Unicode.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/Value.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/Value.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/Value.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/WeakMapPtr.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/WeakMapPtr.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/WeakMapPtr.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/Xdr.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/Xdr.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/Xdr.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src4.cpp b/databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src4.cpp
deleted file mode 100644
index f5eb5525c788..000000000000
--- a/databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src4.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-45/platform/ppc64le/freebsd/build/Unified_cpp_js_src4.cpp.orig	2020-11-30 15:55:08 UTC
-+++ src/third_party/mozjs-45/platform/ppc64le/freebsd/build/Unified_cpp_js_src4.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "ds/LifoAlloc.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "ds/LifoAlloc.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "ds/LifoAlloc.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "frontend/BytecodeCompiler.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "frontend/BytecodeCompiler.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "frontend/BytecodeCompiler.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "frontend/BytecodeEmitter.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "frontend/BytecodeEmitter.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "frontend/BytecodeEmitter.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "frontend/FoldConstants.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "frontend/FoldConstants.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "frontend/FoldConstants.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "frontend/NameFunctions.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "frontend/NameFunctions.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "frontend/NameFunctions.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "frontend/ParseMaps.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "frontend/ParseMaps.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "frontend/ParseMaps.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src5.cpp b/databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src5.cpp
deleted file mode 100644
index 9de0f34031d5..000000000000
--- a/databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src5.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-45/platform/ppc64le/freebsd/build/Unified_cpp_js_src5.cpp.orig	2020-11-30 15:55:08 UTC
-+++ src/third_party/mozjs-45/platform/ppc64le/freebsd/build/Unified_cpp_js_src5.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "frontend/ParseNode.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "frontend/ParseNode.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "frontend/ParseNode.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "frontend/TokenStream.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "frontend/TokenStream.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "frontend/TokenStream.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "gc/Allocator.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "gc/Allocator.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "gc/Allocator.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "gc/Barrier.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "gc/Barrier.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "gc/Barrier.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "gc/GCTrace.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "gc/GCTrace.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "gc/GCTrace.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "gc/Iteration.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "gc/Iteration.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "gc/Iteration.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src6.cpp b/databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src6.cpp
deleted file mode 100644
index cccf3ddf96bb..000000000000
--- a/databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src6.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-45/platform/ppc64le/freebsd/build/Unified_cpp_js_src6.cpp.orig	2020-11-30 15:55:08 UTC
-+++ src/third_party/mozjs-45/platform/ppc64le/freebsd/build/Unified_cpp_js_src6.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "gc/Marking.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "gc/Marking.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "gc/Marking.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "gc/Memory.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "gc/Memory.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "gc/Memory.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "gc/MemoryProfiler.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "gc/MemoryProfiler.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "gc/MemoryProfiler.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "gc/Nursery.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "gc/Nursery.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "gc/Nursery.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "gc/RootMarking.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "gc/RootMarking.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "gc/RootMarking.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "gc/Statistics.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "gc/Statistics.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "gc/Statistics.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src7.cpp b/databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src7.cpp
deleted file mode 100644
index af993bfa3266..000000000000
--- a/databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src7.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-45/platform/ppc64le/freebsd/build/Unified_cpp_js_src7.cpp.orig	2020-11-30 15:55:08 UTC
-+++ src/third_party/mozjs-45/platform/ppc64le/freebsd/build/Unified_cpp_js_src7.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "gc/Tracer.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "gc/Tracer.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "gc/Tracer.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "gc/Verifier.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "gc/Verifier.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "gc/Verifier.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "gc/Zone.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "gc/Zone.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "gc/Zone.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "irregexp/NativeRegExpMacroAssembler.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "irregexp/NativeRegExpMacroAssembler.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "irregexp/NativeRegExpMacroAssembler.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "irregexp/RegExpAST.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "irregexp/RegExpAST.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "irregexp/RegExpAST.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "irregexp/RegExpEngine.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "irregexp/RegExpEngine.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "irregexp/RegExpEngine.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src8.cpp b/databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src8.cpp
deleted file mode 100644
index da4f72d1555a..000000000000
--- a/databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src8.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-45/platform/ppc64le/freebsd/build/Unified_cpp_js_src8.cpp.orig	2020-11-30 15:55:08 UTC
-+++ src/third_party/mozjs-45/platform/ppc64le/freebsd/build/Unified_cpp_js_src8.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "irregexp/RegExpInterpreter.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "irregexp/RegExpInterpreter.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "irregexp/RegExpInterpreter.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "irregexp/RegExpMacroAssembler.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "irregexp/RegExpMacroAssembler.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "irregexp/RegExpMacroAssembler.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "irregexp/RegExpParser.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "irregexp/RegExpParser.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "irregexp/RegExpParser.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "irregexp/RegExpStack.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "irregexp/RegExpStack.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "irregexp/RegExpStack.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/AliasAnalysis.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/AliasAnalysis.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/AliasAnalysis.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/AlignmentMaskAnalysis.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/AlignmentMaskAnalysis.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/AlignmentMaskAnalysis.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src9.cpp b/databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src9.cpp
deleted file mode 100644
index 3616d83653d8..000000000000
--- a/databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_Unified__cpp__js__src9.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-45/platform/ppc64le/freebsd/build/Unified_cpp_js_src9.cpp.orig	2020-11-30 15:55:08 UTC
-+++ src/third_party/mozjs-45/platform/ppc64le/freebsd/build/Unified_cpp_js_src9.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "jit/BacktrackingAllocator.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/BacktrackingAllocator.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/BacktrackingAllocator.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/Bailouts.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/Bailouts.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/Bailouts.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/BaselineBailouts.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/BaselineBailouts.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/BaselineBailouts.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/BaselineCompiler.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/BaselineCompiler.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/BaselineCompiler.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/BaselineDebugModeOSR.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/BaselineDebugModeOSR.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/BaselineDebugModeOSR.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/BaselineFrame.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/BaselineFrame.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/BaselineFrame.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_js-confdefs.h b/databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_js-confdefs.h
deleted file mode 100644
index 4f20bfd858bb..000000000000
--- a/databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_build_js-confdefs.h
+++ /dev/null
@@ -1,94 +0,0 @@
---- src/third_party/mozjs-45/platform/ppc64le/freebsd/build/js-confdefs.h.orig	2020-11-30 15:55:08 UTC
-+++ src/third_party/mozjs-45/platform/ppc64le/freebsd/build/js-confdefs.h
-@@ -0,0 +1,91 @@
-+/* List of defines generated by configure. Included with preprocessor flag,
-+ * -include, to avoid long list of -D defines on the compile command-line.
-+ * Do not edit.
-+ */
-+
-+#ifndef js_confdefs_h
-+#define js_confdefs_h
-+
-+#define CPP_THROW_NEW throw()
-+#define D_INO d_ino
-+#define EDITLINE 1
-+#define HAVE_64BIT_BUILD 1
-+#define HAVE_ACOSH 1
-+#define HAVE_ASINH 1
-+#define HAVE_ATANH 1
-+#define HAVE_CBRT 1
-+#define HAVE_CLOCK_MONOTONIC 1
-+#define HAVE_CPP_AMBIGUITY_RESOLVING_USING 1
-+#define HAVE_CPP_DYNAMIC_CAST_TO_VOID_PTR 1
-+#define HAVE_DIRENT_H 1
-+#define HAVE_DLOPEN 1
-+#define HAVE_EXPM1 1
-+#define HAVE_GETC_UNLOCKED 1
-+#define HAVE_GETOPT_H 1
-+#define HAVE_GMTIME_R 1
-+#define HAVE_I18N_LC_MESSAGES 1
-+#define HAVE_LANGINFO_CODESET 1
-+#define HAVE_LIBM 1
-+#define HAVE_LOCALECONV 1
-+#define HAVE_LOCALECONV 1
-+#define HAVE_LOCALTIME_R 1
-+#define HAVE_LOG1P 1
-+#define HAVE_LOG2 1
-+#define HAVE_MACHINE_ENDIAN_H 1
-+#define HAVE_MALLOC_H 1
-+#define HAVE_MALLOC_H 1
-+#define HAVE_MALLOC_USABLE_SIZE 1
-+#define HAVE_MBRTOWC 1
-+#define HAVE_MEMALIGN 1
-+#define HAVE_MEMORY_H 1
-+#define HAVE_NL_TYPES_H 1
-+#define HAVE_POSIX_FADVISE 1
-+#define HAVE_POSIX_FALLOCATE 1
-+#define HAVE_POSIX_MEMALIGN 1
-+#define HAVE_RES_NINIT 1
-+#define HAVE_SETLOCALE 1
-+#define HAVE_SSIZE_T 1
-+#define HAVE_STRNDUP 1
-+#define HAVE_SYS_CDEFS_H 1
-+#define HAVE_SYS_MOUNT_H 1
-+#define HAVE_SYS_STATVFS_H 1
-+#define HAVE_THREAD_TLS_KEYWORD 1
-+#define HAVE_TM_ZONE_TM_GMTOFF 1
-+#define HAVE_UNISTD_H 1
-+#define HAVE_VALLOC 1
-+#define HAVE_VA_COPY 1
-+#define HAVE_VISIBILITY_ATTRIBUTE 1
-+#define HAVE_VISIBILITY_HIDDEN_ATTRIBUTE 1
-+#define HAVE_WCRTOMB 1
-+#define HAVE___CXA_DEMANGLE 1
-+#define JS_CODEGEN_NONE 1
-+#define JS_DEFAULT_JITREPORT_GRANULARITY 3
-+#define JS_HAVE_MACHINE_ENDIAN_H 1
-+#define JS_POSIX_NSPR 1
-+#define JS_PUNBOX64 1
-+#define JS_STANDALONE 1
-+#define MALLOC_H <malloc.h>
-+#define MALLOC_USABLE_SIZE_CONST_PTR const
-+#define MOZILLA_UAVERSION "45.0"
-+#define MOZILLA_VERSION "45.9.0"
-+#define MOZILLA_VERSION_U 45.9.0
-+#define MOZJS_MAJOR_VERSION 45
-+#define MOZJS_MINOR_VERSION 9
-+#define MOZ_DEBUG_SYMBOLS 1
-+#define MOZ_DLL_SUFFIX ".so"
-+#define MOZ_GLUE_IN_PROGRAM 1
-+#define MOZ_MEMORY 1
-+#define MOZ_MEMORY_BSD 1
-+#define MOZ_UPDATE_CHANNEL default
-+#define NO_NSPR_10_SUPPORT 1
-+#define RELEASE_BUILD 1
-+#define STDC_HEADERS 1
-+#define VA_COPY va_copy
-+#define XP_UNIX 1
-+#define X_DISPLAY_MISSING 1
-+#define _REENTRANT 1
-+#define _THREAD_SAFE 1
-+
-+#include "js/RequiredDefines.h"
-+
-+#endif /* js_confdefs_h */
diff --git a/databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_include_js-config.h b/databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_include_js-config.h
deleted file mode 100644
index d479e798ab52..000000000000
--- a/databases/mongodb40/files/powerpc64le/patch-src_third__party_mozjs-45_platform_ppc64le_freebsd_include_js-config.h
+++ /dev/null
@@ -1,62 +0,0 @@
---- src/third_party/mozjs-45/platform/ppc64le/freebsd/include/js-config.h.orig	2020-11-30 15:55:21 UTC
-+++ src/third_party/mozjs-45/platform/ppc64le/freebsd/include/js-config.h
-@@ -0,0 +1,59 @@
-+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-+ * vim: set ts=8 sw=4 et tw=78:
-+ *
-+ * This Source Code Form is subject to the terms of the Mozilla Public
-+ * License, v. 2.0. If a copy of the MPL was not distributed with this
-+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-+
-+#ifndef js_config_h
-+#define js_config_h
-+
-+/* Definitions set at build time that affect SpiderMonkey's public API.
-+   This header file is generated by the SpiderMonkey configure script,
-+   and installed along with jsapi.h.  */
-+
-+/* Define to 1 if SpiderMonkey is in debug mode. */
-+/* #undef JS_DEBUG */
-+
-+/* Define to 1 if SpiderMonkey should not use struct types in debug builds. */
-+/* #undef JS_NO_JSVAL_JSID_STRUCT_TYPES */
-+
-+/* Define to 1 if SpiderMonkey should support multi-threaded clients.  */
-+/* #undef JS_THREADSAFE */
-+
-+/* Define to 1 if SpiderMonkey should include ctypes support.  */
-+/* #undef JS_HAS_CTYPES */
-+
-+/* Define to 1 if SpiderMonkey should support the ability to perform
-+   entirely too much GC.  */
-+/* #undef JS_GC_ZEAL */
-+
-+/* Define to 1 if SpiderMonkey should use small chunks. */
-+/* #undef JS_GC_SMALL_CHUNK_SIZE */
-+
-+/* Define to 1 to perform extra assertions and heap poisoning. */
-+/* #undef JS_CRASH_DIAGNOSTICS */
-+
-+/* Define to 1 if the <endian.h> header is present and
-+   useable.  See jscpucfg.h.  */
-+/* #undef JS_HAVE_ENDIAN_H */
-+
-+/* Define to 1 if the <machine/endian.h> header is present and
-+   useable.  See jscpucfg.h.  */
-+#define JS_HAVE_MACHINE_ENDIAN_H 1
-+
-+/* Define to 1 if the <sys/isa_defs.h> header is present and
-+   useable.  See jscpucfg.h.  */
-+/* #undef JS_HAVE_SYS_ISA_DEFS_H */
-+
-+/* Define to 1 if SpiderMonkey is in NUNBOX32 mode. */
-+/* #undef JS_NUNBOX32 */
-+
-+/* Define to 1 if SpiderMonkey is in PUNBOX64 mode. */
-+#define JS_PUNBOX64 1
-+
-+/* MOZILLA JSAPI version number components */
-+#define MOZJS_MAJOR_VERSION 45
-+#define MOZJS_MINOR_VERSION 9
-+
-+#endif /* js_config_h */
diff --git a/databases/mongodb40/files/powerpc64le/patch-src_third__party_wiredtiger_dist_filelist b/databases/mongodb40/files/powerpc64le/patch-src_third__party_wiredtiger_dist_filelist
deleted file mode 100644
index 096454a20016..000000000000
--- a/databases/mongodb40/files/powerpc64le/patch-src_third__party_wiredtiger_dist_filelist
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/third_party/wiredtiger/dist/filelist.orig	2020-11-30 17:45:30 UTC
-+++ src/third_party/wiredtiger/dist/filelist
-@@ -49,7 +49,7 @@ src/btree/row_modify.c
- src/btree/row_srch.c
- src/cache/cache_las.c
- src/checksum/arm64/crc32-arm64.c	ARM64_HOST
--src/checksum/power8/crc32.sx		POWERPC_HOST
-+src/checksum/power8/crc32.S		POWERPC_HOST
- src/checksum/power8/crc32_wrapper.c	POWERPC_HOST
- src/checksum/software/checksum.c
- src/checksum/x86/crc32-x86.c		X86_HOST
diff --git a/databases/mongodb40/files/powerpc64le/patch-src_third__party_wiredtiger_src_checksum_power8_crc32.S b/databases/mongodb40/files/powerpc64le/patch-src_third__party_wiredtiger_src_checksum_power8_crc32.S
deleted file mode 100644
index fe2e707d16a7..000000000000
--- a/databases/mongodb40/files/powerpc64le/patch-src_third__party_wiredtiger_src_checksum_power8_crc32.S
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/third_party/wiredtiger/src/checksum/power8/crc32.S.orig	2020-09-02 06:34:58 UTC
-+++ src/third_party/wiredtiger/src/checksum/power8/crc32.S
-@@ -26,7 +26,11 @@
-  * as published by the Free Software Foundation; either version
-  * 2 of the License, or (at your option) any later version.
-  */
-+#ifdef __clang__
-+#include "ppc-asm.h"
-+#else
- #include <ppc-asm.h>
-+#endif
- #include "ppc-opcode.h"
- 
- #undef toc
diff --git a/databases/mongodb40/files/powerpc64le/patch-src_third__party_wiredtiger_src_checksum_power8_ppc-asm.h b/databases/mongodb40/files/powerpc64le/patch-src_third__party_wiredtiger_src_checksum_power8_ppc-asm.h
deleted file mode 100644
index 7cd3eb43c89c..000000000000
--- a/databases/mongodb40/files/powerpc64le/patch-src_third__party_wiredtiger_src_checksum_power8_ppc-asm.h
+++ /dev/null
@@ -1,393 +0,0 @@
---- src/third_party/wiredtiger/src/checksum/power8/ppc-asm.h.orig	2020-11-25 13:26:22 UTC
-+++ src/third_party/wiredtiger/src/checksum/power8/ppc-asm.h
-@@ -0,0 +1,390 @@
-+/* PowerPC asm definitions for GNU C.
-+
-+Copyright (C) 2002-2020 Free Software Foundation, Inc.
-+
-+This file is part of GCC.
-+
-+GCC is free software; you can redistribute it and/or modify it under
-+the terms of the GNU General Public License as published by the Free
-+Software Foundation; either version 3, or (at your option) any later
-+version.
-+
-+GCC is distributed in the hope that it will be useful, but WITHOUT ANY
-+WARRANTY; without even the implied warranty of MERCHANTABILITY or
-+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-+for more details.
-+
-+Under Section 7 of GPL version 3, you are granted additional
-+permissions described in the GCC Runtime Library Exception, version
-+3.1, as published by the Free Software Foundation.
-+
-+You should have received a copy of the GNU General Public License and
-+a copy of the GCC Runtime Library Exception along with this program;
-+see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-+<http://www.gnu.org/licenses/>.  */
-+
-+/* Under winnt, 1) gas supports the following as names and 2) in particular
-+   defining "toc" breaks the FUNC_START macro as ".toc" becomes ".2" */
-+
-+#define r0	0
-+#define sp	1
-+#define toc	2
-+#define r3	3
-+#define r4	4
-+#define r5	5
-+#define r6	6
-+#define r7	7
-+#define r8	8
-+#define r9	9
-+#define r10	10
-+#define r11	11
-+#define r12	12
-+#define r13	13
-+#define r14	14
-+#define r15	15
-+#define r16	16
-+#define r17	17
-+#define r18	18
-+#define r19     19
-+#define r20	20
-+#define r21	21
-+#define r22	22
-+#define r23	23
-+#define r24	24
-+#define r25	25
-+#define r26	26
-+#define r27	27
-+#define r28	28
-+#define r29	29
-+#define r30	30
-+#define r31	31
-+
-+#define cr0	0
-+#define cr1	1
-+#define cr2	2
-+#define cr3	3
-+#define cr4	4
-+#define cr5	5
-+#define cr6	6
-+#define cr7	7
-+
-+#define f0	0
-+#define f1	1
-+#define f2	2
-+#define f3	3
-+#define f4	4
-+#define f5	5
-+#define f6	6
-+#define f7	7
-+#define f8	8
-+#define f9	9
-+#define f10	10
-+#define f11	11
-+#define f12	12
-+#define f13	13
-+#define f14	14
-+#define f15	15
-+#define f16	16
-+#define f17	17
-+#define f18	18
-+#define f19	19
-+#define f20	20
-+#define f21	21
-+#define f22	22
-+#define f23	23
-+#define f24	24
-+#define f25	25
-+#define f26	26
-+#define f27	27
-+#define f28	28
-+#define f29	29
-+#define f30	30
-+#define f31	31
-+
-+#ifdef __VSX__
-+#define f32	32
-+#define f33	33
-+#define f34	34
-+#define f35	35
-+#define f36	36
-+#define f37	37
-+#define f38	38
-+#define f39	39
-+#define f40	40
-+#define f41	41
-+#define f42	42
-+#define f43	43
-+#define f44	44
-+#define f45	45
-+#define f46	46
-+#define f47	47
-+#define f48	48
-+#define f49	49
-+#define f50	50
-+#define f51	51
-+#define f52	52
-+#define f53	53
-+#define f54	54
-+#define f55	55
-+#define f56	56
-+#define f57	57
-+#define f58	58
-+#define f59	59
-+#define f60	60
-+#define f61	61
-+#define f62	62
-+#define f63	63
-+#endif
-+
-+#ifdef __ALTIVEC__
-+#define v0	0
-+#define v1	1
-+#define v2	2
-+#define v3	3
-+#define v4	4
-+#define v5	5
-+#define v6	6
-+#define v7	7
-+#define v8	8
-+#define v9	9
-+#define v10	10
-+#define v11	11
-+#define v12	12
-+#define v13	13
-+#define v14	14
-+#define v15	15
-+#define v16	16
-+#define v17	17
-+#define v18	18
-+#define v19	19
-+#define v20	20
-+#define v21	21
-+#define v22	22
-+#define v23	23
-+#define v24	24
-+#define v25	25
-+#define v26	26
-+#define v27	27
-+#define v28	28
-+#define v29	29
-+#define v30	30
-+#define v31	31
-+#endif
-+
-+#ifdef __VSX__
-+#define vs0	0
-+#define vs1	1
-+#define vs2	2
-+#define vs3	3
-+#define vs4	4
-+#define vs5	5
-+#define vs6	6
-+#define vs7	7
-+#define vs8	8
-+#define vs9	9
-+#define vs10	10
-+#define vs11	11
-+#define vs12	12
-+#define vs13	13
-+#define vs14	14
-+#define vs15	15
-+#define vs16	16
-+#define vs17	17
-+#define vs18	18
-+#define vs19	19
-+#define vs20	20
-+#define vs21	21
-+#define vs22	22
-+#define vs23	23
-+#define vs24	24
-+#define vs25	25
-+#define vs26	26
-+#define vs27	27
-+#define vs28	28
-+#define vs29	29
-+#define vs30	30
-+#define vs31	31
-+#define vs32	32
-+#define vs33	33
-+#define vs34	34
-+#define vs35	35
-+#define vs36	36
-+#define vs37	37
-+#define vs38	38
-+#define vs39	39
-+#define vs40	40
-+#define vs41	41
-+#define vs42	42
-+#define vs43	43
-+#define vs44	44
-+#define vs45	45
-+#define vs46	46
-+#define vs47	47
-+#define vs48	48
-+#define vs49	49
-+#define vs50	50
-+#define vs51	51
-+#define vs52	52
-+#define vs53	53
-+#define vs54	54
-+#define vs55	55
-+#define vs56	56
-+#define vs57	57
-+#define vs58	58
-+#define vs59	59
-+#define vs60	60
-+#define vs61	61
-+#define vs62	62
-+#define vs63	63
-+#endif
-+
-+/*
-+ * Macros to glue together two tokens.
-+ */
-+
-+#ifdef __STDC__
-+#define XGLUE(a,b) a##b
-+#else
-+#define XGLUE(a,b) a/**/b
-+#endif
-+
-+#define GLUE(a,b) XGLUE(a,b)
-+
-+/*
-+ * Macros to begin and end a function written in assembler.  If -mcall-aixdesc
-+ * or -mcall-nt, create a function descriptor with the given name, and create
-+ * the real function with one or two leading periods respectively.
-+ */
-+
-+#if defined(__powerpc64__) && _CALL_ELF == 2
-+
-+/* Defining "toc" above breaks @toc in assembler code.  */
-+#undef toc
-+
-+#define FUNC_NAME(name) GLUE(__USER_LABEL_PREFIX__,name)
-+#ifdef __PCREL__
-+#define JUMP_TARGET(name) GLUE(FUNC_NAME(name),@notoc)
-+#define FUNC_START(name) \
-+	.type FUNC_NAME(name),@function; \
-+	.globl FUNC_NAME(name); \
-+FUNC_NAME(name): \
-+	.localentry FUNC_NAME(name),1
-+#else
-+#define JUMP_TARGET(name) FUNC_NAME(name)
-+#define FUNC_START(name) \
-+	.type FUNC_NAME(name),@function; \
-+	.globl FUNC_NAME(name); \
-+FUNC_NAME(name): \
-+0:	addis 2,12,(.TOC.-0b)@ha; \
-+	addi 2,2,(.TOC.-0b)@l; \
-+	.localentry FUNC_NAME(name),.-FUNC_NAME(name)
-+#endif /* !__PCREL__ */
-+
-+#define HIDDEN_FUNC(name) \
-+  FUNC_START(name) \
-+  .hidden FUNC_NAME(name);
-+
-+#define FUNC_END(name) \
-+	.size FUNC_NAME(name),.-FUNC_NAME(name)
-+
-+#elif defined (__powerpc64__)
-+
-+#define FUNC_NAME(name) GLUE(.,name)
-+#define JUMP_TARGET(name) FUNC_NAME(name)
-+#define FUNC_START(name) \
-+	.section ".opd","aw"; \
-+name: \
-+	.quad GLUE(.,name); \
-+	.quad .TOC.@tocbase; \
-+	.quad 0; \
-+	.previous; \
-+	.type GLUE(.,name),@function; \
-+	.globl name; \
-+	.globl GLUE(.,name); \
-+GLUE(.,name):
-+
-+#define HIDDEN_FUNC(name) \
-+  FUNC_START(name) \
-+  .hidden name;	\
-+  .hidden GLUE(.,name);
-+
-+#define FUNC_END(name) \
-+GLUE(.L,name): \
-+	.size GLUE(.,name),GLUE(.L,name)-GLUE(.,name)
-+
-+#elif defined(_CALL_AIXDESC)
-+
-+#ifdef _RELOCATABLE
-+#define DESC_SECTION ".got2"
-+#else
-+#define DESC_SECTION ".got1"
-+#endif
-+
-+#define FUNC_NAME(name) GLUE(.,name)
-+#define JUMP_TARGET(name) FUNC_NAME(name)
-+#define FUNC_START(name) \
-+	.section DESC_SECTION,"aw"; \
-+name: \
-+	.long GLUE(.,name); \
-+	.long _GLOBAL_OFFSET_TABLE_; \
-+	.long 0; \
-+	.previous; \
-+	.type GLUE(.,name),@function; \
-+	.globl name; \
-+	.globl GLUE(.,name); \
-+GLUE(.,name):
-+
-+#define HIDDEN_FUNC(name) \
-+  FUNC_START(name) \
-+  .hidden name; \
-+  .hidden GLUE(.,name);
-+
-+#define FUNC_END(name) \
-+GLUE(.L,name): \
-+	.size GLUE(.,name),GLUE(.L,name)-GLUE(.,name)
-+
-+#else
-+
-+#define FUNC_NAME(name) GLUE(__USER_LABEL_PREFIX__,name)
-+#if defined __PIC__ || defined __pic__
-+#define JUMP_TARGET(name) FUNC_NAME(name@plt)
-+#else
-+#define JUMP_TARGET(name) FUNC_NAME(name)
-+#endif
-+#define FUNC_START(name) \
-+	.type FUNC_NAME(name),@function; \
-+	.globl FUNC_NAME(name); \
-+FUNC_NAME(name):
-+
-+#define HIDDEN_FUNC(name) \
-+  FUNC_START(name) \
-+  .hidden FUNC_NAME(name);
-+
-+#define FUNC_END(name) \
-+GLUE(.L,name): \
-+	.size FUNC_NAME(name),GLUE(.L,name)-FUNC_NAME(name)
-+#endif
-+
-+#ifdef IN_GCC
-+/* For HAVE_GAS_CFI_DIRECTIVE.  */
-+#include "auto-host.h"
-+
-+#ifdef HAVE_GAS_CFI_DIRECTIVE
-+# define CFI_STARTPROC			.cfi_startproc
-+# define CFI_ENDPROC			.cfi_endproc
-+# define CFI_OFFSET(reg, off)		.cfi_offset reg, off
-+# define CFI_DEF_CFA_REGISTER(reg)	.cfi_def_cfa_register reg
-+# define CFI_RESTORE(reg)		.cfi_restore reg
-+#else
-+# define CFI_STARTPROC
-+# define CFI_ENDPROC
-+# define CFI_OFFSET(reg, off)
-+# define CFI_DEF_CFA_REGISTER(reg)
-+# define CFI_RESTORE(reg)
-+#endif
-+#endif
-+
-+#if defined __linux__ && !defined __powerpc64__
-+	.section .note.GNU-stack
-+	.previous
-+#endif
diff --git a/databases/mongodb40/pkg-descr b/databases/mongodb40/pkg-descr
deleted file mode 100644
index e51df526ebcc..000000000000
--- a/databases/mongodb40/pkg-descr
+++ /dev/null
@@ -1,5 +0,0 @@
-Mongo (from "humongous") is a high-performance, open source,
-schema-free, document-oriented database. A common name in the
-"NOSQL" community.
-
-WWW: https://docs.mongodb.com/v4.0/
diff --git a/databases/mongodb40/pkg-plist b/databases/mongodb40/pkg-plist
deleted file mode 100644
index 83149ff7676d..000000000000
--- a/databases/mongodb40/pkg-plist
+++ /dev/null
@@ -1,5 +0,0 @@
-bin/install_compass
-bin/mongo
-bin/mongod
-bin/mongos
-@sample etc/mongodb.conf.sample
diff --git a/databases/mongodb42-tools/Makefile b/databases/mongodb42-tools/Makefile
deleted file mode 100644
index 9b5d877bf8d6..000000000000
--- a/databases/mongodb42-tools/Makefile
+++ /dev/null
@@ -1,64 +0,0 @@
-PORTNAME=	mongodb42-tools
-DISTVERSIONPREFIX=	r
-DISTVERSION=	4.2.14
-CATEGORIES=	databases
-
-MAINTAINER=	ronald-lists@klop.ws
-COMMENT=	Tools for MongoDB 4.2.x
-
-LICENSE=	APACHE20
-LICENSE_FILE=	${WRKSRC}/LICENSE.md
-
-ONLY_FOR_ARCHS=	aarch64 amd64 armv7 i386
-ONLY_FOR_ARCHS_REASON=	not yet ported to other architectures
-
-USES=		compiler:c++14-lang go localbase
-USE_GITHUB=	yes
-GH_ACCOUNT=	mongodb
-GH_PROJECT=	mongo-tools
-
-GO_BUILDFLAGS=	-tags "${USE_MY_TAGS}"
-GO_PKGNAME=	github.com/${GH_ACCOUNT}/${GH_PROJECT}
-
-CONFLICTS_INSTALL=	mongodb36-tools mongodb40-tools mongodb-tools
-
-OPTIONS_DEFINE=		DOCS
-OPTIONS_DEFAULT=	MONGODUMP MONGOEXPORT MONGOFILES MONGOIMPORT \
-			MONGORESTORE SASL SSL
-OPTIONS_MULTI=		SECURITY TOOLS
-OPTIONS_MULTI_TOOLS=	BSONDUMP MONGODUMP MONGOEXPORT MONGOFILES MONGOIMPORT \
-			MONGOREPLAY MONGORESTORE MONGOSTAT MONGOTOP
-OPTIONS_MULTI_SECURITY=	SASL SSL
-OPTIONS_SUB=		yes
-
-BSONDUMP_DESC=		BSON files into human-readable formats
-MONGOSTAT_DESC=		Status of a running mongod or mongos instance
-MONGOFILES_DESC=	Interface to GridFS in a MongoDB instance
-MONGOEXPORT_DESC=	JSON or CSV export of MongoDB instance data
-MONGOIMPORT_DESC=	Importing JSON, CSV, or TSV into a MongoDB instance
-MONGORESTORE_DESC=	BSON data to a MongoDB instance
-MONGODUMP_DESC=		BSON data from the contents of a MongoDB instance
-MONGOTOP_DESC=		Track the amount of data I/O time
-MONGOREPLAY_DESC=	Traffic capture and replay tool
-
-BSONDUMP_VARS=		go_target+=./bsondump/main:bsondump
-MONGOSTAT_VARS=		go_target+=./mongostat/main:mongostat
-MONGOFILES_VARS=	go_target+=./mongofiles/main:mongofiles
-MONGOEXPORT_VARS=	go_target+=./mongoexport/main:mongoexport
-MONGOIMPORT_VARS=	go_target+=./mongoimport/main:mongoimport
-MONGORESTORE_VARS=	go_target+=./mongorestore/main:mongorestore
-MONGODUMP_VARS=		go_target+=./mongodump/main:mongodump
-MONGOTOP_VARS=		go_target+=./mongotop/main:mongotop
-MONGOREPLAY_VARS=	go_target+=./mongoreplay/main:mongoreplay
-SASL_LIB_DEPENDS=	libsasl2.so:security/cyrus-sasl2
-SASL_USE=		my_tags=sasl
-SSL_USES=		ssl
-SSL_USE=		my_tags=ssl
-
-post-install-DOCS-on:
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-.for doc in README.md CONTRIBUTING.md THIRD-PARTY-NOTICES
-	${INSTALL_MAN} ${WRKSRC}/${doc} ${STAGEDIR}${DOCSDIR}
-.endfor
-
-.include <bsd.port.mk>
diff --git a/databases/mongodb42-tools/distinfo b/databases/mongodb42-tools/distinfo
deleted file mode 100644
index 39d49cd677a8..000000000000
--- a/databases/mongodb42-tools/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1620129017
-SHA256 (mongodb-mongo-tools-r4.2.14_GH0.tar.gz) = 2c2bd94020f40cd0cdebe5fa54a18291fdf13a6a9cf7a2dd08ce4ae8e687997b
-SIZE (mongodb-mongo-tools-r4.2.14_GH0.tar.gz) = 15029404
diff --git a/databases/mongodb42-tools/files/patch-vendor_github.com_10gen_openssl_build.go b/databases/mongodb42-tools/files/patch-vendor_github.com_10gen_openssl_build.go
deleted file mode 100644
index e0190c61259f..000000000000
--- a/databases/mongodb42-tools/files/patch-vendor_github.com_10gen_openssl_build.go
+++ /dev/null
@@ -1,9 +0,0 @@
---- vendor/github.com/10gen/openssl/build.go.orig	2018-11-21 19:00:22 UTC
-+++ vendor/github.com/10gen/openssl/build.go
-@@ -20,5 +20,6 @@
- // #cgo CFLAGS: -Wno-deprecated-declarations
- // #cgo windows CFLAGS: -DWIN32_LEAN_AND_MEAN -I"c:/openssl/include"
- // #cgo windows LDFLAGS: -lssleay32 -llibeay32 -lcrypt32 -L "c:/openssl/bin"
-+// #cgo freebsd LDFLAGS: -lssl -lcrypto
- // #cgo darwin LDFLAGS: -framework CoreFoundation -framework Foundation -framework Security
- import "C"
diff --git a/databases/mongodb42-tools/files/patch-vendor_github.com_10gen_openssl_init__posix.go b/databases/mongodb42-tools/files/patch-vendor_github.com_10gen_openssl_init__posix.go
deleted file mode 100644
index 07c593cf0018..000000000000
--- a/databases/mongodb42-tools/files/patch-vendor_github.com_10gen_openssl_init__posix.go
+++ /dev/null
@@ -1,11 +0,0 @@
---- vendor/github.com/10gen/openssl/init_posix.go.orig	2018-11-21 17:52:58 UTC
-+++ vendor/github.com/10gen/openssl/init_posix.go
-@@ -12,7 +12,7 @@
- // See the License for the specific language governing permissions and
- // limitations under the License.
- 
--// +build linux darwin cgo
-+// +build linux darwin freebsd cgo
- // +build !windows
- 
- package openssl
diff --git a/databases/mongodb42-tools/pkg-descr b/databases/mongodb42-tools/pkg-descr
deleted file mode 100644
index f38ee90d6be4..000000000000
--- a/databases/mongodb42-tools/pkg-descr
+++ /dev/null
@@ -1,15 +0,0 @@
-Useful utilities for managing a MongoDB instance written in Go.
-
-- bsondump - display BSON files in a human-readable format
-- mongoimport - Convert data from JSON, TSV or CSV and insert them
-  into a collection
-- mongoexport - Write an existing collection to CSV or JSON format
-- mongodump/mongorestore - Dump MongoDB backups to disk in .BSON
-  format, or restore them to a live database
-- mongostat - Monitor live MongoDB servers, replica sets, or sharded
-  clusters
-- mongofiles - Read, write, delete, or update files in GridFS
-- mongotop - Monitor read/write activity on a mongo server
-- mongoreplay - Capture, observe, and replay traffic for MongoDB
-
-WWW: https://github.com/mongodb/mongo-tools
diff --git a/databases/mongodb42-tools/pkg-plist b/databases/mongodb42-tools/pkg-plist
deleted file mode 100644
index 3d21f0470ad4..000000000000
--- a/databases/mongodb42-tools/pkg-plist
+++ /dev/null
@@ -1,12 +0,0 @@
-%%BSONDUMP%%bin/bsondump
-%%MONGODUMP%%bin/mongodump
-%%MONGOEXPORT%%bin/mongoexport
-%%MONGOFILES%%bin/mongofiles
-%%MONGOIMPORT%%bin/mongoimport
-%%MONGORESTORE%%bin/mongorestore
-%%MONGOREPLAY%%bin/mongoreplay
-%%MONGOSTAT%%bin/mongostat
-%%MONGOTOP%%bin/mongotop
-%%PORTDOCS%%%%DOCSDIR%%/README.md
-%%PORTDOCS%%%%DOCSDIR%%/CONTRIBUTING.md
-%%PORTDOCS%%%%DOCSDIR%%/THIRD-PARTY-NOTICES
diff --git a/databases/mongodb42/Makefile b/databases/mongodb42/Makefile
deleted file mode 100644
index 2e91c1936951..000000000000
--- a/databases/mongodb42/Makefile
+++ /dev/null
@@ -1,96 +0,0 @@
-PORTNAME=	mongodb
-DISTVERSIONPREFIX=	r
-DISTVERSION=	4.2.15
-CATEGORIES=	databases net
-MASTER_SITES=	https://fastdl.mongodb.org/src/ \
-		http://fastdl.mongodb.org/src/
-PKGNAMESUFFIX=	${DISTVERSION:R:S/.//}
-DISTNAME=	mongodb-src-${DISTVERSIONPREFIX}${DISTVERSION}
-
-MAINTAINER=	ronald-lists@klop.ws
-COMMENT=	Distributed document-oriented "NoSQL" database (4.2.x Branch)
-
-LICENSE=	SSPLv1 APACHE20 # mongodb is SSPLv1, C++ driver is APACHE20
-LICENSE_COMB=	multi
-LICENSE_NAME_SSPLv1=	Server Side Public License
-LICENSE_FILE_SSPLv1=	${WRKSRC}/LICENSE-Community.txt
-LICENSE_PERMS_SSPLv1=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
-
-ONLY_FOR_ARCHS=	aarch64 amd64 powerpc64le
-ONLY_FOR_ARCHS_REASON=	Only ported to amd64, aarch64 and powerpc64le on FreeBSD. Upstream supports arm64, ppc64le, s390x and x86-64.
-
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cheetah3>0:devel/py-cheetah3@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}yaml>=3.11:devel/py-yaml@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}psutil>0:sysutils/py-psutil@${PY_FLAVOR} \
-		${LOCALBASE}/bin/ar:devel/binutils
-LIB_DEPENDS=	libboost_system.so:devel/boost-libs \
-		libpcre.so:devel/pcre \
-		libcurl.so:ftp/curl \
-		libsnappy.so:archivers/snappy
-
-USES=		compiler:c++17-lang cpe python:3.5+,build scons shebangfix
-USE_RC_SUBR=	mongod
-
-CONFLICTS_BUILD=	mongo-cxx-driver
-CONFLICTS_INSTALL=	mongodb36 mongodb4[04]
-
-OPTIONS_DEFINE=	LTO SASL SSL
-OPTIONS_DEFAULT=LTO SASL SSL
-OPTIONS_EXCLUDE_aarch64=        ${OPTIONS_EXCLUDE_${ARCH}_${OSREL:R}}
-OPTIONS_EXCLUDE_aarch64_14=     LTO # Does not work with llvm12 on aarch64.
-
-SHEBANG_FILES=	src/mongo/installer/compass/install_compass
-python_OLD_CMD=	@python_interpreter@
-MAKE_ARGS=	--prefix=${STAGEDIR}${PREFIX} \
-		--use-system-zlib \
-		--use-system-pcre \
-		--use-system-snappy \
-		--use-system-boost \
-		--libc++ \
-		--cxx-std=17 \
-		--runtime-hardening=on \
-		-j ${MAKE_JOBS_NUMBER} \
-		--disable-warnings-as-errors \
-		VERBOSE=on \
-		AR=${PREFIX}/bin/ar
-
-USERS=		mongodb
-GROUPS=		mongodb
-
-LTO_LDFLAGS=	-fuse-ld=lld
-LTO_MAKE_ARGS=	--lto=on
-
-SASL_LIB_DEPENDS=	libsasl2.so:security/cyrus-sasl2
-SASL_MAKE_ARGS=		--use-sasl-client
-
-SSL_USES=	ssl
-SSL_MAKE_ARGS=	--ssl
-
-.include <bsd.port.pre.mk>
-
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1200057
-SUB_LIST+=	LEGACY_LIMITS="@comment " MODERN_LIMITS=""
-.else
-SUB_LIST+=	LEGACY_LIMITS="" MODERN_LIMITS="@comment "
-.endif
-
-.if ${ARCH} == aarch64 || ${ARCH} == powerpc64le
-EXTRA_PATCHES=	${FILESDIR}/${ARCH}
-.endif
-
-ALL_TARGET=	core
-
-PORTSCOUT=	limitw:1,even
-
-CPE_PRODUCT=	mongodb
-
-pre-patch:
-	${MV} ${WRKSRC}/src/third_party/wiredtiger/src/checksum/power8/crc32.sx ${WRKSRC}/src/third_party/wiredtiger/src/checksum/power8/crc32.S
-
-post-install:
-.for f in mongo mongod mongos
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${f}
-.endfor
-	${CP} ${WRKSRC}/rpm/mongod.conf ${STAGEDIR}${PREFIX}/etc/mongodb.conf.sample
-
-.include <bsd.port.post.mk>
diff --git a/databases/mongodb42/distinfo b/databases/mongodb42/distinfo
deleted file mode 100644
index 565217003185..000000000000
--- a/databases/mongodb42/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1626038087
-SHA256 (mongodb-src-r4.2.15.tar.gz) = 22f704dd35c0abe182cfd244ce08f43783c1ece6be23e47a6f1872798c312deb
-SIZE (mongodb-src-r4.2.15.tar.gz) = 62187847
diff --git a/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_gen-config.sh b/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_gen-config.sh
deleted file mode 100644
index d9a2e1c3f075..000000000000
--- a/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_gen-config.sh
+++ /dev/null
@@ -1,24 +0,0 @@
---- src/third_party/mozjs-60/gen-config.sh.orig	2019-10-11 03:28:57 UTC
-+++ src/third_party/mozjs-60/gen-config.sh
-@@ -28,6 +28,9 @@ _xcode_setup() {
- }
- 
- case "$_Path" in
-+    "platform/aarch64/freebsd")
-+        _CONFIG_OPTS="--host=aarch64-freebsd"
-+	;;
-     "platform/aarch64/linux")
-         _CONFIG_OPTS="--host=aarch64-linux"
- 	;;
-@@ -82,9 +85,9 @@ esac
- cd mozilla-release/js/src
- rm config.cache || true
- 
--PYTHON=python ./configure --without-intl-api --enable-posix-nspr-emulation --disable-trace-logging --disable-js-shell --disable-tests "$_CONFIG_OPTS"
-+PYTHON=python2.7 ./configure --without-intl-api --enable-posix-nspr-emulation --disable-trace-logging --disable-js-shell --disable-tests "$_CONFIG_OPTS"
- 
--make recurse_export
-+gmake recurse_export
- 
- cd ../../..
- 
diff --git a/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src0.cpp b/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src0.cpp
deleted file mode 100644
index 35267bd71800..000000000000
--- a/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src0.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src0.cpp.orig	2019-11-14 10:50:10 UTC
-+++ src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src0.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "builtin/AtomicsObject.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "builtin/AtomicsObject.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "builtin/AtomicsObject.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "builtin/DataViewObject.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "builtin/DataViewObject.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "builtin/DataViewObject.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "builtin/Eval.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "builtin/Eval.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "builtin/Eval.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "builtin/JSON.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "builtin/JSON.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "builtin/JSON.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "builtin/MapObject.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "builtin/MapObject.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "builtin/MapObject.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "builtin/ModuleObject.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "builtin/ModuleObject.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "builtin/ModuleObject.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src1.cpp b/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src1.cpp
deleted file mode 100644
index efbdb9d15a2c..000000000000
--- a/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src1.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src1.cpp.orig	2019-11-14 10:50:10 UTC
-+++ src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src1.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "builtin/Object.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "builtin/Object.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "builtin/Object.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "builtin/Profilers.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "builtin/Profilers.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "builtin/Profilers.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "builtin/Promise.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "builtin/Promise.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "builtin/Promise.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "builtin/Reflect.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "builtin/Reflect.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "builtin/Reflect.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "builtin/ReflectParse.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "builtin/ReflectParse.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "builtin/ReflectParse.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "builtin/SIMD.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "builtin/SIMD.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "builtin/SIMD.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src10.cpp b/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src10.cpp
deleted file mode 100644
index c39f94663e23..000000000000
--- a/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src10.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src10.cpp.orig	2019-11-14 10:50:10 UTC
-+++ src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src10.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "irregexp/RegExpParser.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "irregexp/RegExpParser.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "irregexp/RegExpParser.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "irregexp/RegExpStack.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "irregexp/RegExpStack.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "irregexp/RegExpStack.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/AliasAnalysis.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/AliasAnalysis.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/AliasAnalysis.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/AliasAnalysisShared.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/AliasAnalysisShared.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/AliasAnalysisShared.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/AlignmentMaskAnalysis.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/AlignmentMaskAnalysis.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/AlignmentMaskAnalysis.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/BacktrackingAllocator.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/BacktrackingAllocator.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/BacktrackingAllocator.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src11.cpp b/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src11.cpp
deleted file mode 100644
index cf4689b32cf0..000000000000
--- a/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src11.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src11.cpp.orig	2019-11-14 10:50:10 UTC
-+++ src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src11.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "jit/Bailouts.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/Bailouts.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/Bailouts.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/BaselineBailouts.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/BaselineBailouts.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/BaselineBailouts.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/BaselineCacheIRCompiler.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/BaselineCacheIRCompiler.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/BaselineCacheIRCompiler.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/BaselineCompiler.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/BaselineCompiler.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/BaselineCompiler.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/BaselineDebugModeOSR.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/BaselineDebugModeOSR.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/BaselineDebugModeOSR.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/BaselineFrame.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/BaselineFrame.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/BaselineFrame.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src12.cpp b/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src12.cpp
deleted file mode 100644
index ad4e5e7518fa..000000000000
--- a/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src12.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src12.cpp.orig	2019-11-14 10:50:10 UTC
-+++ src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src12.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "jit/BaselineFrameInfo.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/BaselineFrameInfo.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/BaselineFrameInfo.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/BaselineIC.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/BaselineIC.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/BaselineIC.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/BaselineInspector.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/BaselineInspector.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/BaselineInspector.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/BaselineJIT.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/BaselineJIT.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/BaselineJIT.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/BitSet.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/BitSet.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/BitSet.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/BytecodeAnalysis.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/BytecodeAnalysis.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/BytecodeAnalysis.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src13.cpp b/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src13.cpp
deleted file mode 100644
index 328213eb2f0d..000000000000
--- a/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src13.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src13.cpp.orig	2019-11-14 10:50:10 UTC
-+++ src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src13.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "jit/C1Spewer.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/C1Spewer.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/C1Spewer.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/CacheIR.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/CacheIR.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/CacheIR.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/CacheIRCompiler.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/CacheIRCompiler.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/CacheIRCompiler.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/CacheIRSpewer.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/CacheIRSpewer.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/CacheIRSpewer.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/CodeGenerator.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/CodeGenerator.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/CodeGenerator.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/CompileWrappers.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/CompileWrappers.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/CompileWrappers.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src14.cpp b/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src14.cpp
deleted file mode 100644
index 08e8256eb971..000000000000
--- a/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src14.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src14.cpp.orig	2019-11-14 10:50:10 UTC
-+++ src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src14.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "jit/Disassembler.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/Disassembler.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/Disassembler.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/EagerSimdUnbox.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/EagerSimdUnbox.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/EagerSimdUnbox.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/EdgeCaseAnalysis.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/EdgeCaseAnalysis.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/EdgeCaseAnalysis.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/EffectiveAddressAnalysis.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/EffectiveAddressAnalysis.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/EffectiveAddressAnalysis.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/ExecutableAllocator.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/ExecutableAllocator.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/ExecutableAllocator.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/FlowAliasAnalysis.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/FlowAliasAnalysis.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/FlowAliasAnalysis.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src15.cpp b/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src15.cpp
deleted file mode 100644
index 139e4275d6f0..000000000000
--- a/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src15.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src15.cpp.orig	2019-11-14 10:50:10 UTC
-+++ src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src15.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "jit/FoldLinearArithConstants.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/FoldLinearArithConstants.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/FoldLinearArithConstants.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/InstructionReordering.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/InstructionReordering.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/InstructionReordering.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/Ion.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/Ion.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/Ion.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/IonAnalysis.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/IonAnalysis.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/IonAnalysis.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/IonBuilder.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/IonBuilder.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/IonBuilder.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/IonCacheIRCompiler.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/IonCacheIRCompiler.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/IonCacheIRCompiler.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src16.cpp b/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src16.cpp
deleted file mode 100644
index ac06eda07ebb..000000000000
--- a/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src16.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src16.cpp.orig	2019-11-14 10:50:10 UTC
-+++ src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src16.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "jit/IonControlFlow.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/IonControlFlow.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/IonControlFlow.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/IonIC.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/IonIC.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/IonIC.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/IonOptimizationLevels.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/IonOptimizationLevels.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/IonOptimizationLevels.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/JSJitFrameIter.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/JSJitFrameIter.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/JSJitFrameIter.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/JSONSpewer.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/JSONSpewer.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/JSONSpewer.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/Jit.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/Jit.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/Jit.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src17.cpp b/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src17.cpp
deleted file mode 100644
index a6ac50a8e649..000000000000
--- a/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src17.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src17.cpp.orig	2019-11-14 10:50:10 UTC
-+++ src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src17.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "jit/JitFrames.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/JitFrames.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/JitFrames.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/JitOptions.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/JitOptions.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/JitOptions.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/JitSpewer.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/JitSpewer.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/JitSpewer.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/JitcodeMap.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/JitcodeMap.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/JitcodeMap.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/LICM.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/LICM.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/LICM.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/LIR.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/LIR.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/LIR.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src18.cpp b/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src18.cpp
deleted file mode 100644
index b2b96ea13a42..000000000000
--- a/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src18.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src18.cpp.orig	2019-11-14 10:50:10 UTC
-+++ src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src18.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "jit/Linker.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/Linker.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/Linker.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/LoopUnroller.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/LoopUnroller.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/LoopUnroller.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/Lowering.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/Lowering.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/Lowering.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/MCallOptimize.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/MCallOptimize.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/MCallOptimize.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/MIR.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/MIR.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/MIR.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/MIRGraph.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/MIRGraph.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/MIRGraph.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src19.cpp b/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src19.cpp
deleted file mode 100644
index 07492522a4c0..000000000000
--- a/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src19.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src19.cpp.orig	2019-11-14 10:50:10 UTC
-+++ src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src19.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "jit/MacroAssembler.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/MacroAssembler.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/MacroAssembler.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/MoveResolver.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/MoveResolver.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/MoveResolver.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/OptimizationTracking.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/OptimizationTracking.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/OptimizationTracking.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/PerfSpewer.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/PerfSpewer.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/PerfSpewer.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/ProcessExecutableMemory.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/ProcessExecutableMemory.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/ProcessExecutableMemory.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/RangeAnalysis.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/RangeAnalysis.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/RangeAnalysis.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src2.cpp b/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src2.cpp
deleted file mode 100644
index 70e2c7d7ca91..000000000000
--- a/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src2.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src2.cpp.orig	2019-11-14 10:50:10 UTC
-+++ src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src2.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "builtin/Stream.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "builtin/Stream.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "builtin/Stream.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "builtin/String.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "builtin/String.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "builtin/String.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "builtin/Symbol.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "builtin/Symbol.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "builtin/Symbol.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "builtin/TestingFunctions.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "builtin/TestingFunctions.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "builtin/TestingFunctions.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "builtin/TypedObject.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "builtin/TypedObject.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "builtin/TypedObject.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "builtin/WeakMapObject.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "builtin/WeakMapObject.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "builtin/WeakMapObject.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src20.cpp b/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src20.cpp
deleted file mode 100644
index abbfe301d77d..000000000000
--- a/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src20.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src20.cpp.orig	2019-11-14 10:50:10 UTC
-+++ src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src20.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "jit/Recover.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/Recover.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/Recover.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/RegisterAllocator.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/RegisterAllocator.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/RegisterAllocator.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/RematerializedFrame.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/RematerializedFrame.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/RematerializedFrame.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/Safepoints.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/Safepoints.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/Safepoints.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/ScalarReplacement.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/ScalarReplacement.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/ScalarReplacement.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/SharedIC.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/SharedIC.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/SharedIC.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src21.cpp b/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src21.cpp
deleted file mode 100644
index 000003d1e76a..000000000000
--- a/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src21.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src21.cpp.orig	2019-11-14 10:50:10 UTC
-+++ src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src21.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "jit/Sink.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/Sink.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/Sink.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/Snapshots.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/Snapshots.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/Snapshots.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/StupidAllocator.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/StupidAllocator.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/StupidAllocator.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/TypePolicy.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/TypePolicy.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/TypePolicy.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/TypedObjectPrediction.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/TypedObjectPrediction.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/TypedObjectPrediction.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/VMFunctions.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/VMFunctions.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/VMFunctions.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src22.cpp b/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src22.cpp
deleted file mode 100644
index 3464e75d9f19..000000000000
--- a/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src22.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src22.cpp.orig	2019-11-14 10:50:10 UTC
-+++ src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src22.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "jit/ValueNumbering.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/ValueNumbering.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/ValueNumbering.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/WasmBCE.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/WasmBCE.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/WasmBCE.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/arm64/Architecture-arm64.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/arm64/Architecture-arm64.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/arm64/Architecture-arm64.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/arm64/Assembler-arm64.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/arm64/Assembler-arm64.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/arm64/Assembler-arm64.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/arm64/Bailouts-arm64.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/arm64/Bailouts-arm64.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/arm64/Bailouts-arm64.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/arm64/BaselineIC-arm64.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/arm64/BaselineIC-arm64.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/arm64/BaselineIC-arm64.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src23.cpp b/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src23.cpp
deleted file mode 100644
index c577a3ea9e8e..000000000000
--- a/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src23.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src23.cpp.orig	2019-11-14 10:50:10 UTC
-+++ src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src23.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "jit/arm64/CodeGenerator-arm64.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/arm64/CodeGenerator-arm64.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/arm64/CodeGenerator-arm64.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/arm64/Disassembler-arm64.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/arm64/Disassembler-arm64.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/arm64/Disassembler-arm64.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/arm64/Lowering-arm64.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/arm64/Lowering-arm64.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/arm64/Lowering-arm64.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/arm64/MacroAssembler-arm64.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/arm64/MacroAssembler-arm64.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/arm64/MacroAssembler-arm64.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/arm64/MoveEmitter-arm64.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/arm64/MoveEmitter-arm64.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/arm64/MoveEmitter-arm64.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/arm64/SharedIC-arm64.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/arm64/SharedIC-arm64.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/arm64/SharedIC-arm64.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src24.cpp b/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src24.cpp
deleted file mode 100644
index 2e35b91b9e92..000000000000
--- a/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src24.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src24.cpp.orig	2019-11-14 10:50:10 UTC
-+++ src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src24.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "jit/arm64/Trampoline-arm64.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/arm64/Trampoline-arm64.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/arm64/Trampoline-arm64.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/arm64/vixl/Assembler-vixl.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/arm64/vixl/Assembler-vixl.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/arm64/vixl/Assembler-vixl.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/arm64/vixl/Cpu-vixl.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/arm64/vixl/Cpu-vixl.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/arm64/vixl/Cpu-vixl.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/arm64/vixl/Decoder-vixl.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/arm64/vixl/Decoder-vixl.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/arm64/vixl/Decoder-vixl.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/arm64/vixl/Disasm-vixl.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/arm64/vixl/Disasm-vixl.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/arm64/vixl/Disasm-vixl.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/arm64/vixl/Instructions-vixl.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/arm64/vixl/Instructions-vixl.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/arm64/vixl/Instructions-vixl.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src25.cpp b/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src25.cpp
deleted file mode 100644
index d39b20212787..000000000000
--- a/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src25.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src25.cpp.orig	2019-11-14 10:50:10 UTC
-+++ src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src25.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "jit/arm64/vixl/Instrument-vixl.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/arm64/vixl/Instrument-vixl.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/arm64/vixl/Instrument-vixl.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/arm64/vixl/MacroAssembler-vixl.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/arm64/vixl/MacroAssembler-vixl.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/arm64/vixl/MacroAssembler-vixl.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/arm64/vixl/MozAssembler-vixl.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/arm64/vixl/MozAssembler-vixl.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/arm64/vixl/MozAssembler-vixl.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/arm64/vixl/MozInstructions-vixl.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/arm64/vixl/MozInstructions-vixl.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/arm64/vixl/MozInstructions-vixl.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/arm64/vixl/Utils-vixl.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/arm64/vixl/Utils-vixl.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/arm64/vixl/Utils-vixl.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/shared/Assembler-shared.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/shared/Assembler-shared.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/shared/Assembler-shared.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src26.cpp b/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src26.cpp
deleted file mode 100644
index bde86b89f01a..000000000000
--- a/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src26.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src26.cpp.orig	2019-11-14 10:50:10 UTC
-+++ src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src26.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "jit/shared/BaselineCompiler-shared.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/shared/BaselineCompiler-shared.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/shared/BaselineCompiler-shared.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/shared/CodeGenerator-shared.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/shared/CodeGenerator-shared.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/shared/CodeGenerator-shared.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/shared/Disassembler-shared.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/shared/Disassembler-shared.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/shared/Disassembler-shared.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/shared/Lowering-shared.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/shared/Lowering-shared.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/shared/Lowering-shared.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jsapi.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jsapi.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jsapi.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jsbool.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jsbool.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jsbool.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src27.cpp b/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src27.cpp
deleted file mode 100644
index 2f2a96949763..000000000000
--- a/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src27.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src27.cpp.orig	2019-11-14 10:50:10 UTC
-+++ src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src27.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "jsdate.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jsdate.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jsdate.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jsexn.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jsexn.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jsexn.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jsfriendapi.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jsfriendapi.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jsfriendapi.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jsnum.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jsnum.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jsnum.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "perf/jsperf.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "perf/jsperf.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "perf/jsperf.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "proxy/BaseProxyHandler.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "proxy/BaseProxyHandler.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "proxy/BaseProxyHandler.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src28.cpp b/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src28.cpp
deleted file mode 100644
index 75283e764239..000000000000
--- a/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src28.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src28.cpp.orig	2019-11-14 10:50:10 UTC
-+++ src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src28.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "proxy/CrossCompartmentWrapper.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "proxy/CrossCompartmentWrapper.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "proxy/CrossCompartmentWrapper.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "proxy/DeadObjectProxy.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "proxy/DeadObjectProxy.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "proxy/DeadObjectProxy.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "proxy/OpaqueCrossCompartmentWrapper.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "proxy/OpaqueCrossCompartmentWrapper.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "proxy/OpaqueCrossCompartmentWrapper.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "proxy/Proxy.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "proxy/Proxy.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "proxy/Proxy.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "proxy/ScriptedProxyHandler.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "proxy/ScriptedProxyHandler.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "proxy/ScriptedProxyHandler.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "proxy/SecurityWrapper.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "proxy/SecurityWrapper.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "proxy/SecurityWrapper.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src29.cpp b/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src29.cpp
deleted file mode 100644
index e0da0383a810..000000000000
--- a/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src29.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src29.cpp.orig	2019-11-14 10:50:10 UTC
-+++ src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src29.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "proxy/Wrapper.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "proxy/Wrapper.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "proxy/Wrapper.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "threading/Mutex.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "threading/Mutex.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "threading/Mutex.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "threading/ProtectedData.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "threading/ProtectedData.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "threading/ProtectedData.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "threading/posix/CpuCount.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "threading/posix/CpuCount.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "threading/posix/CpuCount.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "threading/posix/Thread.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "threading/posix/Thread.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "threading/posix/Thread.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "util/AllocPolicy.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "util/AllocPolicy.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "util/AllocPolicy.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src3.cpp b/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src3.cpp
deleted file mode 100644
index d6d1247e788c..000000000000
--- a/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src3.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src3.cpp.orig	2019-11-14 10:50:10 UTC
-+++ src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src3.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "builtin/WeakSetObject.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "builtin/WeakSetObject.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "builtin/WeakSetObject.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "builtin/intl/Collator.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "builtin/intl/Collator.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "builtin/intl/Collator.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "builtin/intl/CommonFunctions.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "builtin/intl/CommonFunctions.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "builtin/intl/CommonFunctions.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "builtin/intl/DateTimeFormat.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "builtin/intl/DateTimeFormat.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "builtin/intl/DateTimeFormat.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "builtin/intl/IntlObject.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "builtin/intl/IntlObject.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "builtin/intl/IntlObject.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "builtin/intl/NumberFormat.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "builtin/intl/NumberFormat.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "builtin/intl/NumberFormat.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src30.cpp b/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src30.cpp
deleted file mode 100644
index 9f85f3d707af..000000000000
--- a/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src30.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src30.cpp.orig	2019-11-14 10:50:10 UTC
-+++ src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src30.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "util/NativeStack.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "util/NativeStack.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "util/NativeStack.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "util/Printf.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "util/Printf.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "util/Printf.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "util/StringBuffer.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "util/StringBuffer.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "util/StringBuffer.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "util/Text.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "util/Text.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "util/Text.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "util/Unicode.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "util/Unicode.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "util/Unicode.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/ArgumentsObject.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/ArgumentsObject.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/ArgumentsObject.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src31.cpp b/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src31.cpp
deleted file mode 100644
index f8b699e92f64..000000000000
--- a/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src31.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src31.cpp.orig	2019-11-14 10:50:10 UTC
-+++ src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src31.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "vm/ArrayBufferObject.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/ArrayBufferObject.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/ArrayBufferObject.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/AsyncFunction.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/AsyncFunction.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/AsyncFunction.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/AsyncIteration.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/AsyncIteration.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/AsyncIteration.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/BytecodeUtil.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/BytecodeUtil.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/BytecodeUtil.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/Caches.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/Caches.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/Caches.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/CallNonGenericMethod.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/CallNonGenericMethod.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/CallNonGenericMethod.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src32.cpp b/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src32.cpp
deleted file mode 100644
index 68c0ecfdb271..000000000000
--- a/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src32.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src32.cpp.orig	2019-11-14 10:50:10 UTC
-+++ src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src32.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "vm/CharacterEncoding.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/CharacterEncoding.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/CharacterEncoding.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/CodeCoverage.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/CodeCoverage.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/CodeCoverage.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/Compression.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/Compression.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/Compression.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/DateTime.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/DateTime.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/DateTime.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/Debugger.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/Debugger.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/Debugger.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/DebuggerMemory.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/DebuggerMemory.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/DebuggerMemory.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src33.cpp b/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src33.cpp
deleted file mode 100644
index b964b35b9f72..000000000000
--- a/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src33.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src33.cpp.orig	2019-11-14 10:50:10 UTC
-+++ src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src33.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "vm/EnvironmentObject.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/EnvironmentObject.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/EnvironmentObject.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/ErrorObject.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/ErrorObject.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/ErrorObject.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/ErrorReporting.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/ErrorReporting.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/ErrorReporting.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/ForOfIterator.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/ForOfIterator.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/ForOfIterator.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/GeckoProfiler.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/GeckoProfiler.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/GeckoProfiler.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/GeneratorObject.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/GeneratorObject.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/GeneratorObject.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src34.cpp b/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src34.cpp
deleted file mode 100644
index 4ac8f1c3a893..000000000000
--- a/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src34.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src34.cpp.orig	2019-11-14 10:50:10 UTC
-+++ src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src34.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "vm/GlobalObject.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/GlobalObject.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/GlobalObject.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/HelperThreads.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/HelperThreads.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/HelperThreads.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/Id.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/Id.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/Id.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/Initialization.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/Initialization.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/Initialization.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/Iteration.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/Iteration.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/Iteration.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/JSCompartment.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/JSCompartment.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/JSCompartment.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src35.cpp b/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src35.cpp
deleted file mode 100644
index cf2691f19256..000000000000
--- a/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src35.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src35.cpp.orig	2019-11-14 10:50:10 UTC
-+++ src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src35.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "vm/JSContext.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/JSContext.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/JSContext.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/JSFunction.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/JSFunction.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/JSFunction.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/JSONParser.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/JSONParser.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/JSONParser.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/JSONPrinter.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/JSONPrinter.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/JSONPrinter.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/JSObject.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/JSObject.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/JSObject.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/JSScript.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/JSScript.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/JSScript.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src36.cpp b/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src36.cpp
deleted file mode 100644
index 9133f272e1df..000000000000
--- a/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src36.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src36.cpp.orig	2019-11-14 10:50:10 UTC
-+++ src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src36.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "vm/MemoryMetrics.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/MemoryMetrics.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/MemoryMetrics.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/NativeObject.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/NativeObject.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/NativeObject.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/ObjectGroup.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/ObjectGroup.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/ObjectGroup.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/PIC.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/PIC.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/PIC.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/PosixNSPR.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/PosixNSPR.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/PosixNSPR.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/Printer.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/Printer.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/Printer.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src37.cpp b/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src37.cpp
deleted file mode 100644
index c9332164f542..000000000000
--- a/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src37.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src37.cpp.orig	2019-11-14 10:50:10 UTC
-+++ src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src37.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "vm/Probes.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/Probes.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/Probes.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/ProxyObject.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/ProxyObject.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/ProxyObject.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/Realm.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/Realm.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/Realm.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/ReceiverGuard.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/ReceiverGuard.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/ReceiverGuard.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/RegExpObject.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/RegExpObject.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/RegExpObject.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/RegExpStatics.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/RegExpStatics.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/RegExpStatics.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src38.cpp b/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src38.cpp
deleted file mode 100644
index e0647efc2708..000000000000
--- a/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src38.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src38.cpp.orig	2019-11-14 10:50:10 UTC
-+++ src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src38.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "vm/Runtime.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/Runtime.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/Runtime.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/SavedStacks.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/SavedStacks.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/SavedStacks.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/Scope.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/Scope.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/Scope.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/SelfHosting.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/SelfHosting.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/SelfHosting.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/Shape.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/Shape.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/Shape.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/SharedArrayObject.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/SharedArrayObject.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/SharedArrayObject.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src39.cpp b/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src39.cpp
deleted file mode 100644
index 5af83c9fe9b0..000000000000
--- a/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src39.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src39.cpp.orig	2019-11-14 10:50:10 UTC
-+++ src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src39.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "vm/SharedImmutableStringsCache.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/SharedImmutableStringsCache.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/SharedImmutableStringsCache.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/Stack.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/Stack.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/Stack.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/Stopwatch.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/Stopwatch.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/Stopwatch.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/StringType.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/StringType.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/StringType.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/StructuredClone.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/StructuredClone.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/StructuredClone.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/SymbolType.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/SymbolType.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/SymbolType.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src4.cpp b/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src4.cpp
deleted file mode 100644
index a462e63844f8..000000000000
--- a/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src4.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src4.cpp.orig	2019-11-14 10:50:10 UTC
-+++ src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src4.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "builtin/intl/PluralRules.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "builtin/intl/PluralRules.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "builtin/intl/PluralRules.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "builtin/intl/RelativeTimeFormat.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "builtin/intl/RelativeTimeFormat.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "builtin/intl/RelativeTimeFormat.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "builtin/intl/SharedIntlData.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "builtin/intl/SharedIntlData.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "builtin/intl/SharedIntlData.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "devtools/sharkctl.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "devtools/sharkctl.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "devtools/sharkctl.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "ds/Bitmap.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "ds/Bitmap.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "ds/Bitmap.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "ds/LifoAlloc.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "ds/LifoAlloc.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "ds/LifoAlloc.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src40.cpp b/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src40.cpp
deleted file mode 100644
index b1a376efbfec..000000000000
--- a/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src40.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src40.cpp.orig	2019-11-14 10:50:10 UTC
-+++ src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src40.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "vm/TaggedProto.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/TaggedProto.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/TaggedProto.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/Time.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/Time.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/Time.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/TypeInference.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/TypeInference.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/TypeInference.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/TypedArrayObject.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/TypedArrayObject.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/TypedArrayObject.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/UbiNode.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/UbiNode.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/UbiNode.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/UbiNodeCensus.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/UbiNodeCensus.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/UbiNodeCensus.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src41.cpp b/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src41.cpp
deleted file mode 100644
index ffe530456196..000000000000
--- a/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src41.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src41.cpp.orig	2019-11-14 10:50:10 UTC
-+++ src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src41.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "vm/UbiNodeShortestPaths.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/UbiNodeShortestPaths.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/UbiNodeShortestPaths.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/UnboxedObject.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/UnboxedObject.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/UnboxedObject.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/Value.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/Value.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/Value.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/Xdr.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/Xdr.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/Xdr.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "wasm/AsmJS.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "wasm/AsmJS.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "wasm/AsmJS.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "wasm/WasmBaselineCompile.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "wasm/WasmBaselineCompile.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "wasm/WasmBaselineCompile.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src42.cpp b/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src42.cpp
deleted file mode 100644
index 9fb1cd7dea06..000000000000
--- a/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src42.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src42.cpp.orig	2019-11-14 10:50:10 UTC
-+++ src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src42.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "wasm/WasmBinaryIterator.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "wasm/WasmBinaryIterator.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "wasm/WasmBinaryIterator.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "wasm/WasmBinaryToAST.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "wasm/WasmBinaryToAST.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "wasm/WasmBinaryToAST.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "wasm/WasmBinaryToText.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "wasm/WasmBinaryToText.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "wasm/WasmBinaryToText.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "wasm/WasmBuiltins.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "wasm/WasmBuiltins.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "wasm/WasmBuiltins.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "wasm/WasmCode.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "wasm/WasmCode.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "wasm/WasmCode.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "wasm/WasmCompartment.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "wasm/WasmCompartment.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "wasm/WasmCompartment.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src43.cpp b/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src43.cpp
deleted file mode 100644
index 137f5cbc5bf6..000000000000
--- a/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src43.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src43.cpp.orig	2019-11-14 10:50:10 UTC
-+++ src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src43.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "wasm/WasmCompile.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "wasm/WasmCompile.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "wasm/WasmCompile.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "wasm/WasmDebug.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "wasm/WasmDebug.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "wasm/WasmDebug.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "wasm/WasmFrameIter.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "wasm/WasmFrameIter.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "wasm/WasmFrameIter.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "wasm/WasmGenerator.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "wasm/WasmGenerator.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "wasm/WasmGenerator.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "wasm/WasmInstance.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "wasm/WasmInstance.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "wasm/WasmInstance.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "wasm/WasmIonCompile.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "wasm/WasmIonCompile.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "wasm/WasmIonCompile.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src44.cpp b/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src44.cpp
deleted file mode 100644
index 6a593e5792c2..000000000000
--- a/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src44.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src44.cpp.orig	2019-11-14 10:50:10 UTC
-+++ src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src44.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "wasm/WasmJS.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "wasm/WasmJS.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "wasm/WasmJS.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "wasm/WasmModule.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "wasm/WasmModule.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "wasm/WasmModule.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "wasm/WasmProcess.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "wasm/WasmProcess.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "wasm/WasmProcess.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "wasm/WasmSignalHandlers.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "wasm/WasmSignalHandlers.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "wasm/WasmSignalHandlers.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "wasm/WasmStubs.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "wasm/WasmStubs.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "wasm/WasmStubs.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "wasm/WasmTable.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "wasm/WasmTable.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "wasm/WasmTable.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src45.cpp b/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src45.cpp
deleted file mode 100644
index aa22938a6bed..000000000000
--- a/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src45.cpp
+++ /dev/null
@@ -1,41 +0,0 @@
---- src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src45.cpp.orig	2019-11-14 10:50:10 UTC
-+++ src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src45.cpp
-@@ -0,0 +1,37 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "wasm/WasmTextToBinary.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "wasm/WasmTextToBinary.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "wasm/WasmTextToBinary.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "wasm/WasmTextUtils.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "wasm/WasmTextUtils.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "wasm/WasmTextUtils.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "wasm/WasmTypes.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "wasm/WasmTypes.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "wasm/WasmTypes.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "wasm/WasmValidate.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "wasm/WasmValidate.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "wasm/WasmValidate.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src5.cpp b/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src5.cpp
deleted file mode 100644
index f4a959845523..000000000000
--- a/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src5.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src5.cpp.orig	2019-11-14 10:50:10 UTC
-+++ src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src5.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "ds/MemoryProtectionExceptionHandler.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "ds/MemoryProtectionExceptionHandler.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "ds/MemoryProtectionExceptionHandler.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "frontend/BytecodeCompiler.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "frontend/BytecodeCompiler.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "frontend/BytecodeCompiler.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "frontend/BytecodeEmitter.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "frontend/BytecodeEmitter.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "frontend/BytecodeEmitter.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "frontend/FoldConstants.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "frontend/FoldConstants.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "frontend/FoldConstants.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "frontend/NameFunctions.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "frontend/NameFunctions.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "frontend/NameFunctions.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "frontend/ParseNode.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "frontend/ParseNode.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "frontend/ParseNode.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src6.cpp b/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src6.cpp
deleted file mode 100644
index d51813d5851d..000000000000
--- a/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src6.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src6.cpp.orig	2019-11-14 10:50:10 UTC
-+++ src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src6.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "frontend/TokenStream.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "frontend/TokenStream.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "frontend/TokenStream.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "gc/Allocator.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "gc/Allocator.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "gc/Allocator.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "gc/AtomMarking.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "gc/AtomMarking.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "gc/AtomMarking.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "gc/Barrier.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "gc/Barrier.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "gc/Barrier.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "gc/GC.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "gc/GC.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "gc/GC.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "gc/GCTrace.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "gc/GCTrace.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "gc/GCTrace.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src7.cpp b/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src7.cpp
deleted file mode 100644
index 721b997eb42a..000000000000
--- a/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src7.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src7.cpp.orig	2019-11-14 10:50:10 UTC
-+++ src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src7.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "gc/Marking.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "gc/Marking.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "gc/Marking.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "gc/Memory.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "gc/Memory.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "gc/Memory.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "gc/Nursery.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "gc/Nursery.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "gc/Nursery.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "gc/PublicIterators.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "gc/PublicIterators.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "gc/PublicIterators.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "gc/RootMarking.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "gc/RootMarking.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "gc/RootMarking.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "gc/Statistics.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "gc/Statistics.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "gc/Statistics.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src8.cpp b/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src8.cpp
deleted file mode 100644
index ec1dc0a33d9e..000000000000
--- a/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src8.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src8.cpp.orig	2019-11-14 10:50:10 UTC
-+++ src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src8.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "gc/Tracer.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "gc/Tracer.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "gc/Tracer.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "gc/Verifier.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "gc/Verifier.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "gc/Verifier.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "gc/WeakMap.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "gc/WeakMap.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "gc/WeakMap.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "gc/WeakMapPtr.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "gc/WeakMapPtr.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "gc/WeakMapPtr.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "gc/Zone.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "gc/Zone.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "gc/Zone.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "gc/ZoneGroup.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "gc/ZoneGroup.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "gc/ZoneGroup.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src9.cpp b/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src9.cpp
deleted file mode 100644
index 75b99301ed55..000000000000
--- a/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_Unified__cpp__js__src9.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src9.cpp.orig	2019-11-14 10:50:10 UTC
-+++ src/third_party/mozjs-60/platform/aarch64/freebsd/build/Unified_cpp_js_src9.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "irregexp/NativeRegExpMacroAssembler.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "irregexp/NativeRegExpMacroAssembler.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "irregexp/NativeRegExpMacroAssembler.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "irregexp/RegExpAST.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "irregexp/RegExpAST.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "irregexp/RegExpAST.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "irregexp/RegExpCharacters.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "irregexp/RegExpCharacters.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "irregexp/RegExpCharacters.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "irregexp/RegExpEngine.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "irregexp/RegExpEngine.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "irregexp/RegExpEngine.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "irregexp/RegExpInterpreter.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "irregexp/RegExpInterpreter.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "irregexp/RegExpInterpreter.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "irregexp/RegExpMacroAssembler.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "irregexp/RegExpMacroAssembler.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "irregexp/RegExpMacroAssembler.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_js-confdefs.h b/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_js-confdefs.h
deleted file mode 100644
index 117a1ec6cf65..000000000000
--- a/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_build_js-confdefs.h
+++ /dev/null
@@ -1,79 +0,0 @@
---- src/third_party/mozjs-60/platform/aarch64/freebsd/build/js-confdefs.h.orig	2019-11-14 10:50:10 UTC
-+++ src/third_party/mozjs-60/platform/aarch64/freebsd/build/js-confdefs.h
-@@ -0,0 +1,76 @@
-+/* List of defines generated by configure. Included with preprocessor flag,
-+ * -include, to avoid long list of -D defines on the compile command-line.
-+ * Do not edit.
-+ */
-+
-+#ifndef js_confdefs_h
-+#define js_confdefs_h
-+
-+// Expands to all the defines from configure.
-+#define CPP_THROW_NEW throw()
-+#define CROSS_COMPILE 
-+#define EDITLINE 1
-+#define HAVE_64BIT_BUILD 1
-+#define HAVE_CLOCK_MONOTONIC 1
-+#define HAVE_CPP_DYNAMIC_CAST_TO_VOID_PTR 1
-+#define HAVE_DIRENT_H 1
-+#define HAVE_DLOPEN 1
-+#define HAVE_GETC_UNLOCKED 1
-+#define HAVE_GETOPT_H 1
-+#define HAVE_GMTIME_R 1
-+#define HAVE_INTTYPES_H 1
-+#define HAVE_LANGINFO_CODESET 1
-+#define HAVE_LIBM 1
-+#define HAVE_LOCALECONV 1
-+#define HAVE_LOCALTIME_R 1
-+#define HAVE_MALLOC_USABLE_SIZE 1
-+#define HAVE_NETINET_IN_H 1
-+#define HAVE_NL_TYPES_H 1
-+#define HAVE_POSIX_FADVISE 1
-+#define HAVE_POSIX_FALLOCATE 1
-+#define HAVE_POSIX_MEMALIGN 1
-+#define HAVE_RES_NINIT 1
-+#define HAVE_SINCOS 1
-+#define HAVE_SSIZE_T 1
-+#define HAVE_STDINT_H 1
-+#define HAVE_STRNDUP 1
-+#define HAVE_SYS_MOUNT_H 1
-+#define HAVE_SYS_QUEUE_H 1
-+#define HAVE_SYS_STATVFS_H 1
-+#define HAVE_SYS_TYPES_H 1
-+#define HAVE_THREAD_TLS_KEYWORD 1
-+#define HAVE_TM_ZONE_TM_GMTOFF 1
-+#define HAVE_UNISTD_H 1
-+#define HAVE_VALLOC 1
-+#define HAVE_VA_COPY 1
-+#define HAVE_VISIBILITY_ATTRIBUTE 1
-+#define HAVE_VISIBILITY_HIDDEN_ATTRIBUTE 1
-+#define HAVE___CXA_DEMANGLE 1
-+#define JS_64BIT 1
-+#define JS_CODEGEN_ARM64 1
-+#define JS_DEFAULT_JITREPORT_GRANULARITY 3
-+#define JS_POSIX_NSPR 1
-+#define JS_PUNBOX64 1
-+#define JS_STANDALONE 1
-+#define MALLOC_H <malloc_np.h>
-+#define MALLOC_USABLE_SIZE_CONST_PTR const
-+#define MOZILLA_UAVERSION "60.0"
-+#define MOZILLA_VERSION "60.3.0"
-+#define MOZILLA_VERSION_U 60.3.0
-+#define MOZJS_MAJOR_VERSION 60
-+#define MOZJS_MINOR_VERSION 3
-+#define MOZ_BUILD_APP js
-+#define MOZ_DLL_SUFFIX ".so"
-+#define MOZ_UPDATE_CHANNEL default
-+#define NO_NSPR_10_SUPPORT 1
-+#define RELEASE_OR_BETA 1
-+#define STDC_HEADERS 1
-+#define VA_COPY va_copy
-+#define XP_UNIX 1
-+#define X_DISPLAY_MISSING 1
-+#define _REENTRANT 1
-+#define _THREAD_SAFE 1
-+
-+#include "js/RequiredDefines.h"
-+
-+#endif /* js_confdefs_h */
diff --git a/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_include_js-config.h b/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_include_js-config.h
deleted file mode 100644
index 8d6a984696b8..000000000000
--- a/databases/mongodb42/files/aarch64/patch-src_third__party_mozjs-60_platform_aarch64_freebsd_include_js-config.h
+++ /dev/null
@@ -1,64 +0,0 @@
---- src/third_party/mozjs-60/platform/aarch64/freebsd/include/js-config.h.orig	2019-11-14 10:50:21 UTC
-+++ src/third_party/mozjs-60/platform/aarch64/freebsd/include/js-config.h
-@@ -0,0 +1,61 @@
-+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-+ * vim: set ts=8 sw=4 et tw=78:
-+ *
-+ * This Source Code Form is subject to the terms of the Mozilla Public
-+ * License, v. 2.0. If a copy of the MPL was not distributed with this
-+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-+
-+#ifndef js_config_h
-+#define js_config_h
-+
-+/* Definitions set at build time that affect SpiderMonkey's public API.
-+   This header file is generated by the SpiderMonkey configure script,
-+   and installed along with jsapi.h.  */
-+
-+/* Define to 1 if SpiderMonkey is in debug mode. */
-+/* #undef JS_DEBUG */
-+
-+/*
-+ * NB: We have a special case for rust-bindgen, which wants to be able to
-+ * generate both debug and release bindings on a single objdir.
-+ */
-+#ifdef JS_DEBUG
-+#if !defined(DEBUG) && !defined(RUST_BINDGEN)
-+#  error "SpiderMonkey was configured with --enable-debug, so DEBUG must be defined when including this header"
-+# endif
-+#else
-+# if defined(DEBUG) && !defined(RUST_BINDGEN)
-+#  error "SpiderMonkey was configured with --disable-debug, so DEBUG must be not defined when including this header"
-+# endif
-+#endif
-+
-+/* Define to 1 if SpiderMonkey should not use struct types in debug builds. */
-+/* #undef JS_NO_JSVAL_JSID_STRUCT_TYPES */
-+
-+/* Define to 1 if SpiderMonkey should support multi-threaded clients.  */
-+/* #undef JS_THREADSAFE */
-+
-+/* Define to 1 if SpiderMonkey should include ctypes support.  */
-+/* #undef JS_HAS_CTYPES */
-+
-+/* Define to 1 if SpiderMonkey should support the ability to perform
-+   entirely too much GC.  */
-+/* #undef JS_GC_ZEAL */
-+
-+/* Define to 1 if SpiderMonkey should use small chunks. */
-+/* #undef JS_GC_SMALL_CHUNK_SIZE */
-+
-+/* Define to 1 to perform extra assertions and heap poisoning. */
-+/* #undef JS_CRASH_DIAGNOSTICS */
-+
-+/* Define to 1 if SpiderMonkey is in NUNBOX32 mode. */
-+/* #undef JS_NUNBOX32 */
-+
-+/* Define to 1 if SpiderMonkey is in PUNBOX64 mode. */
-+#define JS_PUNBOX64 1
-+
-+/* MOZILLA JSAPI version number components */
-+#define MOZJS_MAJOR_VERSION 60
-+#define MOZJS_MINOR_VERSION 3
-+
-+#endif /* js_config_h */
diff --git a/databases/mongodb42/files/mongod.in b/databases/mongodb42/files/mongod.in
deleted file mode 100644
index e885be83196c..000000000000
--- a/databases/mongodb42/files/mongod.in
+++ /dev/null
@@ -1,62 +0,0 @@
-#!/bin/sh
-
-# PROVIDE: mongod
-# REQUIRE: NETWORK ldconfig
-# KEYWORD: shutdown
-#
-# Add the following lines to /etc/rc.conf.local or /etc/rc.conf
-# to enable this service:
-#
-# mongod_enable (bool):  Set to "NO" by default.
-#                        Set it to "YES" to enable mongod.
-%%LEGACY_LIMITS%%# mongod_limits (bool):  Set to "NO" by default.
-%%LEGACY_LIMITS%%#                        Set it to yes to run `limits -e -U mongodb`
-%%LEGACY_LIMITS%%#                        just before mongod starts.
-# mongod_dbpath (str):   Default to "/var/db/mongodb"
-#                        Base database directory.
-# mongod_flags (str):    Custom additional arguments to be passed to mongod.
-#                        Default to "--logpath ${mongod_dbpath}/mongod.log --logappend".
-# mongod_config (str):	 Default to "%%PREFIX%%/etc/mongodb.conf"
-#                        Path to config file
-#
-
-. /etc/rc.subr
-
-name="mongod"
-rcvar=mongod_enable
-
-load_rc_config $name
-
-: ${mongod_enable="NO"}
-%%LEGACY_LIMITS%%: ${mongod_limits="NO"}
-: ${mongod_dbpath="/var/db/mongodb"}
-: ${mongod_flags="--logpath ${mongod_dbpath}/mongod.log --logappend --setParameter=disabledSecureAllocatorDomains=\*"}
-: ${mongod_user="mongodb"}
-: ${mongod_group="mongodb"}
-: ${mongod_config="%%PREFIX%%/etc/mongodb.conf"}
-
-pidfile="${mongod_dbpath}/mongod.lock"
-command=%%PREFIX%%/bin/${name}
-command_args="--config $mongod_config --dbpath $mongod_dbpath --fork >/dev/null 2>/dev/null"
-start_precmd="${name}_prestart"
-
-mongod_create_dbpath()
-{
-        mkdir ${mongod_dbpath} >/dev/null 2>/dev/null
-        [ $? -eq 0 ] && chown -R ${mongod_user}:${mongod_group} ${mongod_dbpath}
-}
-
-mongod_prestart()
-{
-        if [ ! -d ${mongod_dbpath} ]; then
-                mongod_create_dbpath || return 1
-        fi
-%%LEGACY_LIMITS%%        if checkyesno mongod_limits; then
-%%LEGACY_LIMITS%%                eval `/usr/bin/limits -e -U ${mongod_user}` 2>/dev/null
-%%LEGACY_LIMITS%%        else
-%%LEGACY_LIMITS%%                return 0
-%%LEGACY_LIMITS%%        fi
-%%MODERN_LIMITS%%        return 0
-}
-
-run_rc_command "$1"
diff --git a/databases/mongodb42/files/patch-SConstruct b/databases/mongodb42/files/patch-SConstruct
deleted file mode 100644
index 47fc2da88d30..000000000000
--- a/databases/mongodb42/files/patch-SConstruct
+++ /dev/null
@@ -1,43 +0,0 @@
---- SConstruct.orig	2021-06-30 17:39:08 UTC
-+++ SConstruct
-@@ -1092,9 +1092,9 @@ if has_option('variables-help'):
-     print((env_vars.GenerateHelpText(env)))
-     Exit(0)
- 
--unknown_vars = env_vars.UnknownVariables()
--if unknown_vars:
--    env.FatalError("Unknown variables specified: {0}", ", ".join(list(unknown_vars.keys())))
-+#unknown_vars = env_vars.UnknownVariables()
-+#if unknown_vars:
-+#    env.FatalError("Unknown variables specified: {0}", ", ".join(list(unknown_vars.keys())))
- 
- def set_config_header_define(env, varname, varval = 1):
-     env['CONFIG_HEADER_DEFINES'][varname] = varval
-@@ -1884,7 +1884,7 @@ if env.TargetOSIs('posix'):
-             # If runtime hardening is requested, then build anything
-             # destined for an executable with the necessary flags for PIE.
-             env.AppendUnique(
--                PROGCCFLAGS=['-fPIE'],
-+                PROGCCFLAGS=['-fpic'],
-                 PROGLINKFLAGS=['-pie'],
-             )
- 
-@@ -1898,7 +1898,7 @@ if env.TargetOSIs('posix'):
-                          "-Wno-unknown-pragmas",
-                          "-Winvalid-pch"] )
-     # env.Append( " -Wconversion" ) TODO: this doesn't really work yet
--    if env.TargetOSIs('linux', 'darwin', 'solaris'):
-+    if env.TargetOSIs('linux', 'darwin', 'solaris', 'freebsd'):
-         if not has_option("disable-warnings-as-errors"):
-             env.Append( CCFLAGS=["-Werror"] )
- 
-@@ -3627,7 +3627,8 @@ def doConfigure(myenv):
-     myenv = conf.Finish()
- 
-     if env['TARGET_ARCH'] == "aarch64":
--        AddToCCFLAGSIfSupported(myenv, "-moutline-atomics")
-+        # https://lists.freebsd.org/archives/freebsd-ports/2021-July/000431.html
-+        AddToCCFLAGSIfSupported(myenv, "-mno-outline-atomics")
- 
-     return myenv
- 
diff --git a/databases/mongodb42/files/patch-rpm_mongod.conf b/databases/mongodb42/files/patch-rpm_mongod.conf
deleted file mode 100644
index 1a21e4250707..000000000000
--- a/databases/mongodb42/files/patch-rpm_mongod.conf
+++ /dev/null
@@ -1,25 +0,0 @@
---- rpm/mongod.conf.orig	2019-08-08 20:06:23 UTC
-+++ rpm/mongod.conf
-@@ -7,11 +7,11 @@
- systemLog:
-   destination: file
-   logAppend: true
--  path: /var/log/mongodb/mongod.log
-+  path: /var/db/mongodb/mongod.log 
- 
- # Where and how to store data.
- storage:
--  dbPath: /var/lib/mongo
-+  dbPath: /var/db/mongodb 
-   journal:
-     enabled: true
- #  engine:
-@@ -20,7 +20,7 @@ storage:
- # how the process runs
- processManagement:
-   fork: true  # fork and run in background
--  pidFilePath: /var/run/mongodb/mongod.pid  # location of pidfile
-+  pidFilePath: /var/db/mongodb/mongod.lock  # location of pidfile
-   timeZoneInfo: /usr/share/zoneinfo
- 
- # network interfaces
diff --git a/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_extract_js_src_wasm_WasmSignalHandlers.cpp b/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_extract_js_src_wasm_WasmSignalHandlers.cpp
deleted file mode 100644
index 7041fb8157a7..000000000000
--- a/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_extract_js_src_wasm_WasmSignalHandlers.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
---- src/third_party/mozjs-60/extract/js/src/wasm/WasmSignalHandlers.cpp.orig	2020-11-24 21:49:40 UTC
-+++ src/third_party/mozjs-60/extract/js/src/wasm/WasmSignalHandlers.cpp
-@@ -263,6 +263,10 @@ struct AutoSignalHandler
- #  define EPC_sig(p) ((p)->uc_mcontext.mc_pc)
- #  define RFP_sig(p) ((p)->uc_mcontext.mc_regs[30])
- # endif
-+# if defined(__FreeBSD__) && defined(__powerpc64__)
-+#  define R01_sig(p) ((p)->uc_mcontext.mc_frame[1])
-+#  define R32_sig(p) ((p)->uc_mcontext.mc_srr0)
-+# endif
- #elif defined(XP_DARWIN)
- # define EIP_sig(p) ((p)->uc_mcontext->__ss.__eip)
- # define EBP_sig(p) ((p)->uc_mcontext->__ss.__ebp)
diff --git a/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_gen-config.sh b/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_gen-config.sh
deleted file mode 100644
index 046501068238..000000000000
--- a/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_gen-config.sh
+++ /dev/null
@@ -1,24 +0,0 @@
---- src/third_party/mozjs-60/gen-config.sh.orig	2020-11-25 13:19:42 UTC
-+++ src/third_party/mozjs-60/gen-config.sh
-@@ -31,6 +31,9 @@ case "$_Path" in
-     "platform/aarch64/linux")
-         _CONFIG_OPTS="--host=aarch64-linux"
- 	;;
-+    "platform/ppc64le/freebsd")
-+        _CONFIG_OPTS="--host=ppc64le-freebsd"
-+	;;
-     "platform/ppc64le/linux")
-         _CONFIG_OPTS="--host=ppc64le-linux"
- 	;;
-@@ -82,9 +85,9 @@ esac
- cd mozilla-release/js/src
- rm config.cache || true
- 
--PYTHON=python ./configure --without-intl-api --enable-posix-nspr-emulation --disable-trace-logging --disable-js-shell --disable-tests "$_CONFIG_OPTS"
-+PYTHON=python2.7 ./configure --without-intl-api --enable-posix-nspr-emulation --disable-trace-logging --disable-js-shell --disable-tests "$_CONFIG_OPTS"
- 
--make recurse_export
-+gmake recurse_export
- 
- cd ../../..
- 
diff --git a/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src0.cpp b/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src0.cpp
deleted file mode 100644
index e98d92ce22e3..000000000000
--- a/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src0.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-60/platform/ppc64le/freebsd/build/Unified_cpp_js_src0.cpp.orig	2020-11-25 14:27:55 UTC
-+++ src/third_party/mozjs-60/platform/ppc64le/freebsd/build/Unified_cpp_js_src0.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "builtin/AtomicsObject.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "builtin/AtomicsObject.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "builtin/AtomicsObject.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "builtin/DataViewObject.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "builtin/DataViewObject.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "builtin/DataViewObject.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "builtin/Eval.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "builtin/Eval.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "builtin/Eval.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "builtin/JSON.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "builtin/JSON.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "builtin/JSON.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "builtin/MapObject.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "builtin/MapObject.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "builtin/MapObject.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "builtin/ModuleObject.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "builtin/ModuleObject.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "builtin/ModuleObject.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src1.cpp b/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src1.cpp
deleted file mode 100644
index 73a4afcb3c5b..000000000000
--- a/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src1.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-60/platform/ppc64le/freebsd/build/Unified_cpp_js_src1.cpp.orig	2020-11-25 14:27:55 UTC
-+++ src/third_party/mozjs-60/platform/ppc64le/freebsd/build/Unified_cpp_js_src1.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "builtin/Object.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "builtin/Object.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "builtin/Object.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "builtin/Profilers.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "builtin/Profilers.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "builtin/Profilers.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "builtin/Promise.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "builtin/Promise.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "builtin/Promise.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "builtin/Reflect.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "builtin/Reflect.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "builtin/Reflect.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "builtin/ReflectParse.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "builtin/ReflectParse.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "builtin/ReflectParse.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "builtin/SIMD.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "builtin/SIMD.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "builtin/SIMD.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src10.cpp b/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src10.cpp
deleted file mode 100644
index ac0b01bf919c..000000000000
--- a/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src10.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-60/platform/ppc64le/freebsd/build/Unified_cpp_js_src10.cpp.orig	2020-11-25 14:27:55 UTC
-+++ src/third_party/mozjs-60/platform/ppc64le/freebsd/build/Unified_cpp_js_src10.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "irregexp/RegExpParser.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "irregexp/RegExpParser.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "irregexp/RegExpParser.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "irregexp/RegExpStack.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "irregexp/RegExpStack.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "irregexp/RegExpStack.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/AliasAnalysis.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/AliasAnalysis.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/AliasAnalysis.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/AliasAnalysisShared.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/AliasAnalysisShared.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/AliasAnalysisShared.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/AlignmentMaskAnalysis.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/AlignmentMaskAnalysis.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/AlignmentMaskAnalysis.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/BacktrackingAllocator.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/BacktrackingAllocator.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/BacktrackingAllocator.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src11.cpp b/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src11.cpp
deleted file mode 100644
index 0fd01bd3892d..000000000000
--- a/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src11.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-60/platform/ppc64le/freebsd/build/Unified_cpp_js_src11.cpp.orig	2020-11-25 14:27:55 UTC
-+++ src/third_party/mozjs-60/platform/ppc64le/freebsd/build/Unified_cpp_js_src11.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "jit/Bailouts.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/Bailouts.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/Bailouts.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/BaselineBailouts.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/BaselineBailouts.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/BaselineBailouts.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/BaselineCacheIRCompiler.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/BaselineCacheIRCompiler.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/BaselineCacheIRCompiler.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/BaselineCompiler.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/BaselineCompiler.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/BaselineCompiler.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/BaselineDebugModeOSR.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/BaselineDebugModeOSR.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/BaselineDebugModeOSR.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/BaselineFrame.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/BaselineFrame.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/BaselineFrame.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src12.cpp b/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src12.cpp
deleted file mode 100644
index f5c544cfec07..000000000000
--- a/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src12.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-60/platform/ppc64le/freebsd/build/Unified_cpp_js_src12.cpp.orig	2020-11-25 14:27:55 UTC
-+++ src/third_party/mozjs-60/platform/ppc64le/freebsd/build/Unified_cpp_js_src12.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "jit/BaselineFrameInfo.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/BaselineFrameInfo.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/BaselineFrameInfo.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/BaselineIC.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/BaselineIC.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/BaselineIC.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/BaselineInspector.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/BaselineInspector.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/BaselineInspector.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/BaselineJIT.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/BaselineJIT.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/BaselineJIT.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/BitSet.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/BitSet.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/BitSet.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/BytecodeAnalysis.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/BytecodeAnalysis.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/BytecodeAnalysis.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src13.cpp b/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src13.cpp
deleted file mode 100644
index f0a2c6fc3965..000000000000
--- a/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src13.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-60/platform/ppc64le/freebsd/build/Unified_cpp_js_src13.cpp.orig	2020-11-25 14:27:55 UTC
-+++ src/third_party/mozjs-60/platform/ppc64le/freebsd/build/Unified_cpp_js_src13.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "jit/C1Spewer.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/C1Spewer.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/C1Spewer.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/CacheIR.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/CacheIR.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/CacheIR.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/CacheIRCompiler.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/CacheIRCompiler.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/CacheIRCompiler.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/CacheIRSpewer.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/CacheIRSpewer.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/CacheIRSpewer.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/CodeGenerator.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/CodeGenerator.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/CodeGenerator.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/CompileWrappers.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/CompileWrappers.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/CompileWrappers.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src14.cpp b/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src14.cpp
deleted file mode 100644
index ca5e42d58f62..000000000000
--- a/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src14.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-60/platform/ppc64le/freebsd/build/Unified_cpp_js_src14.cpp.orig	2020-11-25 14:27:55 UTC
-+++ src/third_party/mozjs-60/platform/ppc64le/freebsd/build/Unified_cpp_js_src14.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "jit/Disassembler.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/Disassembler.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/Disassembler.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/EagerSimdUnbox.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/EagerSimdUnbox.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/EagerSimdUnbox.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/EdgeCaseAnalysis.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/EdgeCaseAnalysis.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/EdgeCaseAnalysis.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/EffectiveAddressAnalysis.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/EffectiveAddressAnalysis.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/EffectiveAddressAnalysis.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/ExecutableAllocator.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/ExecutableAllocator.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/ExecutableAllocator.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/FlowAliasAnalysis.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/FlowAliasAnalysis.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/FlowAliasAnalysis.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src15.cpp b/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src15.cpp
deleted file mode 100644
index a15d8fb5f012..000000000000
--- a/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src15.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-60/platform/ppc64le/freebsd/build/Unified_cpp_js_src15.cpp.orig	2020-11-25 14:27:55 UTC
-+++ src/third_party/mozjs-60/platform/ppc64le/freebsd/build/Unified_cpp_js_src15.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "jit/FoldLinearArithConstants.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/FoldLinearArithConstants.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/FoldLinearArithConstants.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/InstructionReordering.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/InstructionReordering.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/InstructionReordering.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/Ion.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/Ion.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/Ion.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/IonAnalysis.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/IonAnalysis.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/IonAnalysis.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/IonBuilder.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/IonBuilder.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/IonBuilder.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/IonCacheIRCompiler.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/IonCacheIRCompiler.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/IonCacheIRCompiler.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src16.cpp b/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src16.cpp
deleted file mode 100644
index b8e483979145..000000000000
--- a/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src16.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-60/platform/ppc64le/freebsd/build/Unified_cpp_js_src16.cpp.orig	2020-11-25 14:27:55 UTC
-+++ src/third_party/mozjs-60/platform/ppc64le/freebsd/build/Unified_cpp_js_src16.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "jit/IonControlFlow.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/IonControlFlow.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/IonControlFlow.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/IonIC.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/IonIC.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/IonIC.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/IonOptimizationLevels.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/IonOptimizationLevels.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/IonOptimizationLevels.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/JSJitFrameIter.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/JSJitFrameIter.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/JSJitFrameIter.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/JSONSpewer.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/JSONSpewer.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/JSONSpewer.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/Jit.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/Jit.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/Jit.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src17.cpp b/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src17.cpp
deleted file mode 100644
index 3b604bf23e19..000000000000
--- a/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src17.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-60/platform/ppc64le/freebsd/build/Unified_cpp_js_src17.cpp.orig	2020-11-25 14:27:55 UTC
-+++ src/third_party/mozjs-60/platform/ppc64le/freebsd/build/Unified_cpp_js_src17.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "jit/JitFrames.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/JitFrames.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/JitFrames.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/JitOptions.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/JitOptions.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/JitOptions.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/JitSpewer.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/JitSpewer.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/JitSpewer.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/JitcodeMap.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/JitcodeMap.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/JitcodeMap.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/LICM.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/LICM.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/LICM.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/LIR.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/LIR.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/LIR.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src18.cpp b/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src18.cpp
deleted file mode 100644
index 7b9b354581de..000000000000
--- a/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src18.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-60/platform/ppc64le/freebsd/build/Unified_cpp_js_src18.cpp.orig	2020-11-25 14:27:55 UTC
-+++ src/third_party/mozjs-60/platform/ppc64le/freebsd/build/Unified_cpp_js_src18.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "jit/Linker.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/Linker.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/Linker.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/LoopUnroller.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/LoopUnroller.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/LoopUnroller.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/Lowering.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/Lowering.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/Lowering.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/MCallOptimize.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/MCallOptimize.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/MCallOptimize.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/MIR.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/MIR.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/MIR.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/MIRGraph.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/MIRGraph.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/MIRGraph.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src19.cpp b/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src19.cpp
deleted file mode 100644
index f67b77e0a7b3..000000000000
--- a/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src19.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-60/platform/ppc64le/freebsd/build/Unified_cpp_js_src19.cpp.orig	2020-11-25 14:27:55 UTC
-+++ src/third_party/mozjs-60/platform/ppc64le/freebsd/build/Unified_cpp_js_src19.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "jit/MacroAssembler.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/MacroAssembler.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/MacroAssembler.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/MoveResolver.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/MoveResolver.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/MoveResolver.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/OptimizationTracking.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/OptimizationTracking.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/OptimizationTracking.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/PerfSpewer.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/PerfSpewer.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/PerfSpewer.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/ProcessExecutableMemory.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/ProcessExecutableMemory.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/ProcessExecutableMemory.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/RangeAnalysis.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/RangeAnalysis.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/RangeAnalysis.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src2.cpp b/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src2.cpp
deleted file mode 100644
index 48af4435ee55..000000000000
--- a/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src2.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-60/platform/ppc64le/freebsd/build/Unified_cpp_js_src2.cpp.orig	2020-11-25 14:27:55 UTC
-+++ src/third_party/mozjs-60/platform/ppc64le/freebsd/build/Unified_cpp_js_src2.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "builtin/Stream.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "builtin/Stream.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "builtin/Stream.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "builtin/String.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "builtin/String.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "builtin/String.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "builtin/Symbol.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "builtin/Symbol.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "builtin/Symbol.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "builtin/TestingFunctions.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "builtin/TestingFunctions.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "builtin/TestingFunctions.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "builtin/TypedObject.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "builtin/TypedObject.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "builtin/TypedObject.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "builtin/WeakMapObject.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "builtin/WeakMapObject.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "builtin/WeakMapObject.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src20.cpp b/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src20.cpp
deleted file mode 100644
index 886f831e464d..000000000000
--- a/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src20.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-60/platform/ppc64le/freebsd/build/Unified_cpp_js_src20.cpp.orig	2020-11-25 14:27:55 UTC
-+++ src/third_party/mozjs-60/platform/ppc64le/freebsd/build/Unified_cpp_js_src20.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "jit/Recover.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/Recover.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/Recover.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/RegisterAllocator.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/RegisterAllocator.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/RegisterAllocator.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/RematerializedFrame.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/RematerializedFrame.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/RematerializedFrame.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/Safepoints.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/Safepoints.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/Safepoints.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/ScalarReplacement.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/ScalarReplacement.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/ScalarReplacement.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/SharedIC.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/SharedIC.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/SharedIC.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src21.cpp b/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src21.cpp
deleted file mode 100644
index 2f70a4a54368..000000000000
--- a/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src21.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-60/platform/ppc64le/freebsd/build/Unified_cpp_js_src21.cpp.orig	2020-11-25 14:27:55 UTC
-+++ src/third_party/mozjs-60/platform/ppc64le/freebsd/build/Unified_cpp_js_src21.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "jit/Sink.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/Sink.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/Sink.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/Snapshots.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/Snapshots.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/Snapshots.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/StupidAllocator.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/StupidAllocator.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/StupidAllocator.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/TypePolicy.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/TypePolicy.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/TypePolicy.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/TypedObjectPrediction.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/TypedObjectPrediction.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/TypedObjectPrediction.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/VMFunctions.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/VMFunctions.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/VMFunctions.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src22.cpp b/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src22.cpp
deleted file mode 100644
index c4b342f141d0..000000000000
--- a/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src22.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-60/platform/ppc64le/freebsd/build/Unified_cpp_js_src22.cpp.orig	2020-11-25 14:27:55 UTC
-+++ src/third_party/mozjs-60/platform/ppc64le/freebsd/build/Unified_cpp_js_src22.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "jit/ValueNumbering.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/ValueNumbering.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/ValueNumbering.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/WasmBCE.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/WasmBCE.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/WasmBCE.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/none/Trampoline-none.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/none/Trampoline-none.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/none/Trampoline-none.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/shared/Assembler-shared.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/shared/Assembler-shared.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/shared/Assembler-shared.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/shared/BaselineCompiler-shared.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/shared/BaselineCompiler-shared.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/shared/BaselineCompiler-shared.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/shared/CodeGenerator-shared.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/shared/CodeGenerator-shared.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/shared/CodeGenerator-shared.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src23.cpp b/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src23.cpp
deleted file mode 100644
index d53f90d32a9b..000000000000
--- a/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src23.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-60/platform/ppc64le/freebsd/build/Unified_cpp_js_src23.cpp.orig	2020-11-25 14:27:55 UTC
-+++ src/third_party/mozjs-60/platform/ppc64le/freebsd/build/Unified_cpp_js_src23.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "jit/shared/Disassembler-shared.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/shared/Disassembler-shared.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/shared/Disassembler-shared.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jit/shared/Lowering-shared.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jit/shared/Lowering-shared.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jit/shared/Lowering-shared.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jsapi.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jsapi.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jsapi.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jsbool.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jsbool.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jsbool.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jsdate.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jsdate.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jsdate.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jsexn.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jsexn.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jsexn.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src24.cpp b/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src24.cpp
deleted file mode 100644
index dc5fbe20141a..000000000000
--- a/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src24.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-60/platform/ppc64le/freebsd/build/Unified_cpp_js_src24.cpp.orig	2020-11-25 14:27:55 UTC
-+++ src/third_party/mozjs-60/platform/ppc64le/freebsd/build/Unified_cpp_js_src24.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "jsfriendapi.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jsfriendapi.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jsfriendapi.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "jsnum.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "jsnum.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "jsnum.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "perf/jsperf.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "perf/jsperf.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "perf/jsperf.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "proxy/BaseProxyHandler.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "proxy/BaseProxyHandler.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "proxy/BaseProxyHandler.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "proxy/CrossCompartmentWrapper.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "proxy/CrossCompartmentWrapper.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "proxy/CrossCompartmentWrapper.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "proxy/DeadObjectProxy.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "proxy/DeadObjectProxy.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "proxy/DeadObjectProxy.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src25.cpp b/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src25.cpp
deleted file mode 100644
index e1252834cbdf..000000000000
--- a/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src25.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-60/platform/ppc64le/freebsd/build/Unified_cpp_js_src25.cpp.orig	2020-11-25 14:27:55 UTC
-+++ src/third_party/mozjs-60/platform/ppc64le/freebsd/build/Unified_cpp_js_src25.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "proxy/OpaqueCrossCompartmentWrapper.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "proxy/OpaqueCrossCompartmentWrapper.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "proxy/OpaqueCrossCompartmentWrapper.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "proxy/Proxy.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "proxy/Proxy.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "proxy/Proxy.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "proxy/ScriptedProxyHandler.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "proxy/ScriptedProxyHandler.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "proxy/ScriptedProxyHandler.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "proxy/SecurityWrapper.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "proxy/SecurityWrapper.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "proxy/SecurityWrapper.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "proxy/Wrapper.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "proxy/Wrapper.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "proxy/Wrapper.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "threading/Mutex.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "threading/Mutex.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "threading/Mutex.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src26.cpp b/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src26.cpp
deleted file mode 100644
index 6797c9a971fb..000000000000
--- a/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src26.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-60/platform/ppc64le/freebsd/build/Unified_cpp_js_src26.cpp.orig	2020-11-25 14:27:55 UTC
-+++ src/third_party/mozjs-60/platform/ppc64le/freebsd/build/Unified_cpp_js_src26.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "threading/ProtectedData.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "threading/ProtectedData.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "threading/ProtectedData.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "threading/posix/CpuCount.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "threading/posix/CpuCount.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "threading/posix/CpuCount.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "threading/posix/Thread.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "threading/posix/Thread.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "threading/posix/Thread.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "util/AllocPolicy.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "util/AllocPolicy.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "util/AllocPolicy.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "util/NativeStack.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "util/NativeStack.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "util/NativeStack.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "util/Printf.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "util/Printf.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "util/Printf.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src27.cpp b/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src27.cpp
deleted file mode 100644
index 52810c7c9d69..000000000000
--- a/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src27.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-60/platform/ppc64le/freebsd/build/Unified_cpp_js_src27.cpp.orig	2020-11-25 14:27:55 UTC
-+++ src/third_party/mozjs-60/platform/ppc64le/freebsd/build/Unified_cpp_js_src27.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "util/StringBuffer.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "util/StringBuffer.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "util/StringBuffer.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "util/Text.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "util/Text.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "util/Text.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "util/Unicode.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "util/Unicode.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "util/Unicode.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/ArgumentsObject.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/ArgumentsObject.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/ArgumentsObject.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/ArrayBufferObject.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/ArrayBufferObject.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/ArrayBufferObject.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/AsyncFunction.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/AsyncFunction.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/AsyncFunction.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src28.cpp b/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src28.cpp
deleted file mode 100644
index 91be25909161..000000000000
--- a/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src28.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-60/platform/ppc64le/freebsd/build/Unified_cpp_js_src28.cpp.orig	2020-11-25 14:27:55 UTC
-+++ src/third_party/mozjs-60/platform/ppc64le/freebsd/build/Unified_cpp_js_src28.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "vm/AsyncIteration.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/AsyncIteration.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/AsyncIteration.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/BytecodeUtil.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/BytecodeUtil.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/BytecodeUtil.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/Caches.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/Caches.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/Caches.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/CallNonGenericMethod.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/CallNonGenericMethod.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/CallNonGenericMethod.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/CharacterEncoding.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/CharacterEncoding.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/CharacterEncoding.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/CodeCoverage.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/CodeCoverage.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/CodeCoverage.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src29.cpp b/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src29.cpp
deleted file mode 100644
index 7aabe50eca82..000000000000
--- a/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src29.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-60/platform/ppc64le/freebsd/build/Unified_cpp_js_src29.cpp.orig	2020-11-25 14:27:55 UTC
-+++ src/third_party/mozjs-60/platform/ppc64le/freebsd/build/Unified_cpp_js_src29.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "vm/Compression.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/Compression.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/Compression.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/DateTime.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/DateTime.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/DateTime.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/Debugger.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/Debugger.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/Debugger.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/DebuggerMemory.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/DebuggerMemory.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/DebuggerMemory.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/EnvironmentObject.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/EnvironmentObject.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/EnvironmentObject.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/ErrorObject.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/ErrorObject.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/ErrorObject.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src3.cpp b/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src3.cpp
deleted file mode 100644
index 6ee624b440ba..000000000000
--- a/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src3.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-60/platform/ppc64le/freebsd/build/Unified_cpp_js_src3.cpp.orig	2020-11-25 14:27:55 UTC
-+++ src/third_party/mozjs-60/platform/ppc64le/freebsd/build/Unified_cpp_js_src3.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "builtin/WeakSetObject.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "builtin/WeakSetObject.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "builtin/WeakSetObject.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "builtin/intl/Collator.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "builtin/intl/Collator.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "builtin/intl/Collator.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "builtin/intl/CommonFunctions.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "builtin/intl/CommonFunctions.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "builtin/intl/CommonFunctions.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "builtin/intl/DateTimeFormat.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "builtin/intl/DateTimeFormat.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "builtin/intl/DateTimeFormat.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "builtin/intl/IntlObject.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "builtin/intl/IntlObject.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "builtin/intl/IntlObject.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "builtin/intl/NumberFormat.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "builtin/intl/NumberFormat.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "builtin/intl/NumberFormat.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src30.cpp b/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src30.cpp
deleted file mode 100644
index ad2dbddad1d9..000000000000
--- a/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src30.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-60/platform/ppc64le/freebsd/build/Unified_cpp_js_src30.cpp.orig	2020-11-25 14:27:55 UTC
-+++ src/third_party/mozjs-60/platform/ppc64le/freebsd/build/Unified_cpp_js_src30.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "vm/ErrorReporting.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/ErrorReporting.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/ErrorReporting.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/ForOfIterator.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/ForOfIterator.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/ForOfIterator.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/GeckoProfiler.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/GeckoProfiler.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/GeckoProfiler.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/GeneratorObject.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/GeneratorObject.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/GeneratorObject.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/GlobalObject.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/GlobalObject.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/GlobalObject.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/HelperThreads.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/HelperThreads.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/HelperThreads.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src31.cpp b/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src31.cpp
deleted file mode 100644
index b0767fabc340..000000000000
--- a/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src31.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-60/platform/ppc64le/freebsd/build/Unified_cpp_js_src31.cpp.orig	2020-11-25 14:27:56 UTC
-+++ src/third_party/mozjs-60/platform/ppc64le/freebsd/build/Unified_cpp_js_src31.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "vm/Id.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/Id.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/Id.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/Initialization.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/Initialization.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/Initialization.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/Iteration.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/Iteration.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/Iteration.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/JSCompartment.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/JSCompartment.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/JSCompartment.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/JSContext.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/JSContext.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/JSContext.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/JSFunction.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/JSFunction.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/JSFunction.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src32.cpp b/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src32.cpp
deleted file mode 100644
index 29dea373c40d..000000000000
--- a/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src32.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-60/platform/ppc64le/freebsd/build/Unified_cpp_js_src32.cpp.orig	2020-11-25 14:27:56 UTC
-+++ src/third_party/mozjs-60/platform/ppc64le/freebsd/build/Unified_cpp_js_src32.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "vm/JSONParser.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/JSONParser.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/JSONParser.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/JSONPrinter.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/JSONPrinter.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/JSONPrinter.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/JSObject.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/JSObject.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/JSObject.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/JSScript.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/JSScript.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/JSScript.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/MemoryMetrics.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/MemoryMetrics.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/MemoryMetrics.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/NativeObject.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/NativeObject.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/NativeObject.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src33.cpp b/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src33.cpp
deleted file mode 100644
index 057cfb09434a..000000000000
--- a/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src33.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-60/platform/ppc64le/freebsd/build/Unified_cpp_js_src33.cpp.orig	2020-11-25 14:27:56 UTC
-+++ src/third_party/mozjs-60/platform/ppc64le/freebsd/build/Unified_cpp_js_src33.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "vm/ObjectGroup.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/ObjectGroup.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/ObjectGroup.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/PIC.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/PIC.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/PIC.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/PosixNSPR.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/PosixNSPR.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/PosixNSPR.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/Printer.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/Printer.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/Printer.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/Probes.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/Probes.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/Probes.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/ProxyObject.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/ProxyObject.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/ProxyObject.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src34.cpp b/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src34.cpp
deleted file mode 100644
index c1eba4e8d74f..000000000000
--- a/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src34.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-60/platform/ppc64le/freebsd/build/Unified_cpp_js_src34.cpp.orig	2020-11-25 14:27:56 UTC
-+++ src/third_party/mozjs-60/platform/ppc64le/freebsd/build/Unified_cpp_js_src34.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "vm/Realm.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/Realm.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/Realm.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/ReceiverGuard.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/ReceiverGuard.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/ReceiverGuard.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/RegExpObject.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/RegExpObject.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/RegExpObject.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/RegExpStatics.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/RegExpStatics.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/RegExpStatics.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/Runtime.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/Runtime.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/Runtime.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/SavedStacks.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/SavedStacks.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/SavedStacks.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src35.cpp b/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src35.cpp
deleted file mode 100644
index c097a69fc0b3..000000000000
--- a/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src35.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-60/platform/ppc64le/freebsd/build/Unified_cpp_js_src35.cpp.orig	2020-11-25 14:27:56 UTC
-+++ src/third_party/mozjs-60/platform/ppc64le/freebsd/build/Unified_cpp_js_src35.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "vm/Scope.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/Scope.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/Scope.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/SelfHosting.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/SelfHosting.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/SelfHosting.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/Shape.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/Shape.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/Shape.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/SharedArrayObject.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/SharedArrayObject.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/SharedArrayObject.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/SharedImmutableStringsCache.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/SharedImmutableStringsCache.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/SharedImmutableStringsCache.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/Stack.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/Stack.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/Stack.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src36.cpp b/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src36.cpp
deleted file mode 100644
index acffed21d717..000000000000
--- a/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src36.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-60/platform/ppc64le/freebsd/build/Unified_cpp_js_src36.cpp.orig	2020-11-25 14:27:56 UTC
-+++ src/third_party/mozjs-60/platform/ppc64le/freebsd/build/Unified_cpp_js_src36.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "vm/Stopwatch.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/Stopwatch.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/Stopwatch.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/StringType.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/StringType.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/StringType.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/StructuredClone.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/StructuredClone.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/StructuredClone.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/SymbolType.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/SymbolType.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/SymbolType.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/TaggedProto.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/TaggedProto.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/TaggedProto.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/Time.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/Time.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/Time.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src37.cpp b/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src37.cpp
deleted file mode 100644
index bf5596c49070..000000000000
--- a/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src37.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-60/platform/ppc64le/freebsd/build/Unified_cpp_js_src37.cpp.orig	2020-11-25 14:27:56 UTC
-+++ src/third_party/mozjs-60/platform/ppc64le/freebsd/build/Unified_cpp_js_src37.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "vm/TypeInference.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/TypeInference.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/TypeInference.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/TypedArrayObject.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/TypedArrayObject.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/TypedArrayObject.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/UbiNode.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/UbiNode.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/UbiNode.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/UbiNodeCensus.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/UbiNodeCensus.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/UbiNodeCensus.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/UbiNodeShortestPaths.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/UbiNodeShortestPaths.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/UbiNodeShortestPaths.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/UnboxedObject.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/UnboxedObject.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/UnboxedObject.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src38.cpp b/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src38.cpp
deleted file mode 100644
index 68678ab7a5fd..000000000000
--- a/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src38.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-60/platform/ppc64le/freebsd/build/Unified_cpp_js_src38.cpp.orig	2020-11-25 14:27:56 UTC
-+++ src/third_party/mozjs-60/platform/ppc64le/freebsd/build/Unified_cpp_js_src38.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "vm/Value.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/Value.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/Value.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "vm/Xdr.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "vm/Xdr.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "vm/Xdr.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "wasm/AsmJS.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "wasm/AsmJS.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "wasm/AsmJS.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "wasm/WasmBaselineCompile.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "wasm/WasmBaselineCompile.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "wasm/WasmBaselineCompile.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "wasm/WasmBinaryIterator.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "wasm/WasmBinaryIterator.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "wasm/WasmBinaryIterator.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "wasm/WasmBinaryToAST.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "wasm/WasmBinaryToAST.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "wasm/WasmBinaryToAST.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src39.cpp b/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src39.cpp
deleted file mode 100644
index f5881eb0e9a0..000000000000
--- a/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src39.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-60/platform/ppc64le/freebsd/build/Unified_cpp_js_src39.cpp.orig	2020-11-25 14:27:56 UTC
-+++ src/third_party/mozjs-60/platform/ppc64le/freebsd/build/Unified_cpp_js_src39.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "wasm/WasmBinaryToText.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "wasm/WasmBinaryToText.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "wasm/WasmBinaryToText.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "wasm/WasmBuiltins.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "wasm/WasmBuiltins.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "wasm/WasmBuiltins.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "wasm/WasmCode.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "wasm/WasmCode.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "wasm/WasmCode.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "wasm/WasmCompartment.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "wasm/WasmCompartment.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "wasm/WasmCompartment.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "wasm/WasmCompile.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "wasm/WasmCompile.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "wasm/WasmCompile.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "wasm/WasmDebug.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "wasm/WasmDebug.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "wasm/WasmDebug.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src4.cpp b/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src4.cpp
deleted file mode 100644
index 89b4a1b63ae1..000000000000
--- a/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src4.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-60/platform/ppc64le/freebsd/build/Unified_cpp_js_src4.cpp.orig	2020-11-25 14:27:56 UTC
-+++ src/third_party/mozjs-60/platform/ppc64le/freebsd/build/Unified_cpp_js_src4.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "builtin/intl/PluralRules.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "builtin/intl/PluralRules.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "builtin/intl/PluralRules.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "builtin/intl/RelativeTimeFormat.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "builtin/intl/RelativeTimeFormat.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "builtin/intl/RelativeTimeFormat.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "builtin/intl/SharedIntlData.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "builtin/intl/SharedIntlData.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "builtin/intl/SharedIntlData.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "devtools/sharkctl.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "devtools/sharkctl.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "devtools/sharkctl.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "ds/Bitmap.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "ds/Bitmap.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "ds/Bitmap.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "ds/LifoAlloc.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "ds/LifoAlloc.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "ds/LifoAlloc.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src40.cpp b/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src40.cpp
deleted file mode 100644
index aa6405477bcd..000000000000
--- a/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src40.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-60/platform/ppc64le/freebsd/build/Unified_cpp_js_src40.cpp.orig	2020-11-25 14:27:56 UTC
-+++ src/third_party/mozjs-60/platform/ppc64le/freebsd/build/Unified_cpp_js_src40.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "wasm/WasmFrameIter.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "wasm/WasmFrameIter.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "wasm/WasmFrameIter.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "wasm/WasmGenerator.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "wasm/WasmGenerator.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "wasm/WasmGenerator.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "wasm/WasmInstance.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "wasm/WasmInstance.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "wasm/WasmInstance.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "wasm/WasmIonCompile.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "wasm/WasmIonCompile.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "wasm/WasmIonCompile.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "wasm/WasmJS.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "wasm/WasmJS.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "wasm/WasmJS.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "wasm/WasmModule.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "wasm/WasmModule.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "wasm/WasmModule.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src41.cpp b/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src41.cpp
deleted file mode 100644
index 7c915d58149a..000000000000
--- a/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src41.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-60/platform/ppc64le/freebsd/build/Unified_cpp_js_src41.cpp.orig	2020-11-25 14:27:56 UTC
-+++ src/third_party/mozjs-60/platform/ppc64le/freebsd/build/Unified_cpp_js_src41.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "wasm/WasmProcess.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "wasm/WasmProcess.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "wasm/WasmProcess.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "wasm/WasmSignalHandlers.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "wasm/WasmSignalHandlers.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "wasm/WasmSignalHandlers.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "wasm/WasmStubs.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "wasm/WasmStubs.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "wasm/WasmStubs.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "wasm/WasmTable.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "wasm/WasmTable.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "wasm/WasmTable.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "wasm/WasmTextToBinary.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "wasm/WasmTextToBinary.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "wasm/WasmTextToBinary.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "wasm/WasmTextUtils.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "wasm/WasmTextUtils.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "wasm/WasmTextUtils.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src42.cpp b/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src42.cpp
deleted file mode 100644
index d2244553adb0..000000000000
--- a/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src42.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
---- src/third_party/mozjs-60/platform/ppc64le/freebsd/build/Unified_cpp_js_src42.cpp.orig	2020-11-25 14:27:56 UTC
-+++ src/third_party/mozjs-60/platform/ppc64le/freebsd/build/Unified_cpp_js_src42.cpp
-@@ -0,0 +1,19 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "wasm/WasmTypes.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "wasm/WasmTypes.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "wasm/WasmTypes.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "wasm/WasmValidate.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "wasm/WasmValidate.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "wasm/WasmValidate.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src5.cpp b/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src5.cpp
deleted file mode 100644
index faf1d28cc02f..000000000000
--- a/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src5.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-60/platform/ppc64le/freebsd/build/Unified_cpp_js_src5.cpp.orig	2020-11-25 14:27:56 UTC
-+++ src/third_party/mozjs-60/platform/ppc64le/freebsd/build/Unified_cpp_js_src5.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "ds/MemoryProtectionExceptionHandler.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "ds/MemoryProtectionExceptionHandler.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "ds/MemoryProtectionExceptionHandler.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "frontend/BytecodeCompiler.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "frontend/BytecodeCompiler.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "frontend/BytecodeCompiler.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "frontend/BytecodeEmitter.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "frontend/BytecodeEmitter.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "frontend/BytecodeEmitter.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "frontend/FoldConstants.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "frontend/FoldConstants.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "frontend/FoldConstants.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "frontend/NameFunctions.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "frontend/NameFunctions.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "frontend/NameFunctions.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "frontend/ParseNode.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "frontend/ParseNode.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "frontend/ParseNode.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src6.cpp b/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src6.cpp
deleted file mode 100644
index e8536a3bfefd..000000000000
--- a/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src6.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-60/platform/ppc64le/freebsd/build/Unified_cpp_js_src6.cpp.orig	2020-11-25 14:27:56 UTC
-+++ src/third_party/mozjs-60/platform/ppc64le/freebsd/build/Unified_cpp_js_src6.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "frontend/TokenStream.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "frontend/TokenStream.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "frontend/TokenStream.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "gc/Allocator.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "gc/Allocator.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "gc/Allocator.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "gc/AtomMarking.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "gc/AtomMarking.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "gc/AtomMarking.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "gc/Barrier.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "gc/Barrier.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "gc/Barrier.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "gc/GC.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "gc/GC.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "gc/GC.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "gc/GCTrace.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "gc/GCTrace.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "gc/GCTrace.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src7.cpp b/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src7.cpp
deleted file mode 100644
index daf3e28f9f1a..000000000000
--- a/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src7.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-60/platform/ppc64le/freebsd/build/Unified_cpp_js_src7.cpp.orig	2020-11-25 14:27:56 UTC
-+++ src/third_party/mozjs-60/platform/ppc64le/freebsd/build/Unified_cpp_js_src7.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "gc/Marking.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "gc/Marking.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "gc/Marking.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "gc/Memory.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "gc/Memory.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "gc/Memory.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "gc/Nursery.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "gc/Nursery.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "gc/Nursery.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "gc/PublicIterators.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "gc/PublicIterators.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "gc/PublicIterators.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "gc/RootMarking.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "gc/RootMarking.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "gc/RootMarking.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "gc/Statistics.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "gc/Statistics.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "gc/Statistics.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src8.cpp b/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src8.cpp
deleted file mode 100644
index bce289ac0055..000000000000
--- a/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src8.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-60/platform/ppc64le/freebsd/build/Unified_cpp_js_src8.cpp.orig	2020-11-25 14:27:56 UTC
-+++ src/third_party/mozjs-60/platform/ppc64le/freebsd/build/Unified_cpp_js_src8.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "gc/Tracer.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "gc/Tracer.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "gc/Tracer.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "gc/Verifier.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "gc/Verifier.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "gc/Verifier.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "gc/WeakMap.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "gc/WeakMap.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "gc/WeakMap.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "gc/WeakMapPtr.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "gc/WeakMapPtr.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "gc/WeakMapPtr.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "gc/Zone.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "gc/Zone.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "gc/Zone.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "gc/ZoneGroup.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "gc/ZoneGroup.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "gc/ZoneGroup.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src9.cpp b/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src9.cpp
deleted file mode 100644
index 3db79fe94816..000000000000
--- a/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_Unified__cpp__js__src9.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/third_party/mozjs-60/platform/ppc64le/freebsd/build/Unified_cpp_js_src9.cpp.orig	2020-11-25 14:27:56 UTC
-+++ src/third_party/mozjs-60/platform/ppc64le/freebsd/build/Unified_cpp_js_src9.cpp
-@@ -0,0 +1,55 @@
-+#define MOZ_UNIFIED_BUILD
-+#include "irregexp/NativeRegExpMacroAssembler.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "irregexp/NativeRegExpMacroAssembler.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "irregexp/NativeRegExpMacroAssembler.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "irregexp/RegExpAST.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "irregexp/RegExpAST.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "irregexp/RegExpAST.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "irregexp/RegExpCharacters.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "irregexp/RegExpCharacters.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "irregexp/RegExpCharacters.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "irregexp/RegExpEngine.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "irregexp/RegExpEngine.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "irregexp/RegExpEngine.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "irregexp/RegExpInterpreter.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "irregexp/RegExpInterpreter.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "irregexp/RegExpInterpreter.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-+#include "irregexp/RegExpMacroAssembler.cpp"
-+#ifdef PL_ARENA_CONST_ALIGN_MASK
-+#error "irregexp/RegExpMacroAssembler.cpp uses PL_ARENA_CONST_ALIGN_MASK, so it cannot be built in unified mode."
-+#undef PL_ARENA_CONST_ALIGN_MASK
-+#endif
-+#ifdef INITGUID
-+#error "irregexp/RegExpMacroAssembler.cpp defines INITGUID, so it cannot be built in unified mode."
-+#undef INITGUID
-+#endif
-\ No newline at end of file
diff --git a/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_js-confdefs.h b/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_js-confdefs.h
deleted file mode 100644
index dc00035b30ef..000000000000
--- a/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_build_js-confdefs.h
+++ /dev/null
@@ -1,81 +0,0 @@
---- src/third_party/mozjs-60/platform/ppc64le/freebsd/build/js-confdefs.h.orig	2020-11-25 14:27:55 UTC
-+++ src/third_party/mozjs-60/platform/ppc64le/freebsd/build/js-confdefs.h
-@@ -0,0 +1,78 @@
-+/* List of defines generated by configure. Included with preprocessor flag,
-+ * -include, to avoid long list of -D defines on the compile command-line.
-+ * Do not edit.
-+ */
-+
-+#ifndef js_confdefs_h
-+#define js_confdefs_h
-+
-+// Expands to all the defines from configure.
-+#define CPP_THROW_NEW throw()
-+#define CROSS_COMPILE 
-+#define EDITLINE 1
-+#define HAVE_64BIT_BUILD 1
-+#define HAVE_CLOCK_MONOTONIC 1
-+#define HAVE_CPP_DYNAMIC_CAST_TO_VOID_PTR 1
-+#define HAVE_DIRENT_H 1
-+#define HAVE_DLOPEN 1
-+#define HAVE_GETC_UNLOCKED 1
-+#define HAVE_GETOPT_H 1
-+#define HAVE_GMTIME_R 1
-+#define HAVE_INTTYPES_H 1
-+#define HAVE_LANGINFO_CODESET 1
-+#define HAVE_LIBM 1
-+#define HAVE_LOCALECONV 1
-+#define HAVE_LOCALTIME_R 1
-+#define HAVE_MALLOC_H 1
-+#define HAVE_MALLOC_USABLE_SIZE 1
-+#define HAVE_MEMALIGN 1
-+#define HAVE_NETINET_IN_H 1
-+#define HAVE_NL_TYPES_H 1
-+#define HAVE_POSIX_FADVISE 1
-+#define HAVE_POSIX_FALLOCATE 1
-+#define HAVE_POSIX_MEMALIGN 1
-+#define HAVE_PTHREAD_GETNAME_NP 1
-+#define HAVE_RES_NINIT 1
-+#define HAVE_SINCOS 1
-+#define HAVE_SSIZE_T 1
-+#define HAVE_STDINT_H 1
-+#define HAVE_STRNDUP 1
-+#define HAVE_SYS_MOUNT_H 1
-+#define HAVE_SYS_QUEUE_H 1
-+#define HAVE_SYS_STATVFS_H 1
-+#define HAVE_SYS_TYPES_H 1
-+#define HAVE_THREAD_TLS_KEYWORD 1
-+#define HAVE_TM_ZONE_TM_GMTOFF 1
-+#define HAVE_UNISTD_H 1
-+#define HAVE_VALLOC 1
-+#define HAVE_VA_COPY 1
-+#define HAVE_VISIBILITY_ATTRIBUTE 1
-+#define HAVE_VISIBILITY_HIDDEN_ATTRIBUTE 1
-+#define HAVE___CXA_DEMANGLE 1
-+#define JS_64BIT 1
-+#define JS_CODEGEN_NONE 1
-+#define JS_DEFAULT_JITREPORT_GRANULARITY 3
-+#define JS_POSIX_NSPR 1
-+#define JS_PUNBOX64 1
-+#define JS_STANDALONE 1
-+#define MALLOC_H <malloc.h>
-+#define MALLOC_USABLE_SIZE_CONST_PTR const
-+#define MOZILLA_UAVERSION "60.0"
-+#define MOZILLA_VERSION "60.3.0"
-+#define MOZILLA_VERSION_U 60.3.0
-+#define MOZJS_MAJOR_VERSION 60
-+#define MOZJS_MINOR_VERSION 3
-+#define MOZ_BUILD_APP js
-+#define MOZ_DLL_SUFFIX ".so"
-+#define MOZ_UPDATE_CHANNEL default
-+#define NO_NSPR_10_SUPPORT 1
-+#define RELEASE_OR_BETA 1
-+#define STDC_HEADERS 1
-+#define VA_COPY va_copy
-+#define XP_UNIX 1
-+#define _REENTRANT 1
-+#define _THREAD_SAFE 1
-+
-+#include "js/RequiredDefines.h"
-+
-+#endif /* js_confdefs_h */
diff --git a/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_include_js-config.h b/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_include_js-config.h
deleted file mode 100644
index 54067136fd77..000000000000
--- a/databases/mongodb42/files/powerpc64le/patch-src_third__party_mozjs-60_platform_ppc64le_freebsd_include_js-config.h
+++ /dev/null
@@ -1,64 +0,0 @@
---- src/third_party/mozjs-60/platform/ppc64le/freebsd/include/js-config.h.orig	2020-11-25 14:27:30 UTC
-+++ src/third_party/mozjs-60/platform/ppc64le/freebsd/include/js-config.h
-@@ -0,0 +1,61 @@
-+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-+ * vim: set ts=8 sw=4 et tw=78:
-+ *
-+ * This Source Code Form is subject to the terms of the Mozilla Public
-+ * License, v. 2.0. If a copy of the MPL was not distributed with this
-+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-+
-+#ifndef js_config_h
-+#define js_config_h
-+
-+/* Definitions set at build time that affect SpiderMonkey's public API.
-+   This header file is generated by the SpiderMonkey configure script,
-+   and installed along with jsapi.h.  */
-+
-+/* Define to 1 if SpiderMonkey is in debug mode. */
-+/* #undef JS_DEBUG */
-+
-+/*
-+ * NB: We have a special case for rust-bindgen, which wants to be able to
-+ * generate both debug and release bindings on a single objdir.
-+ */
-+#ifdef JS_DEBUG
-+#if !defined(DEBUG) && !defined(RUST_BINDGEN)
-+#  error "SpiderMonkey was configured with --enable-debug, so DEBUG must be defined when including this header"
-+# endif
-+#else
-+# if defined(DEBUG) && !defined(RUST_BINDGEN)
-+#  error "SpiderMonkey was configured with --disable-debug, so DEBUG must be not defined when including this header"
-+# endif
-+#endif
-+
-+/* Define to 1 if SpiderMonkey should not use struct types in debug builds. */
-+/* #undef JS_NO_JSVAL_JSID_STRUCT_TYPES */
-+
-+/* Define to 1 if SpiderMonkey should support multi-threaded clients.  */
-+/* #undef JS_THREADSAFE */
-+
-+/* Define to 1 if SpiderMonkey should include ctypes support.  */
-+/* #undef JS_HAS_CTYPES */
-+
-+/* Define to 1 if SpiderMonkey should support the ability to perform
-+   entirely too much GC.  */
-+/* #undef JS_GC_ZEAL */
-+
-+/* Define to 1 if SpiderMonkey should use small chunks. */
-+/* #undef JS_GC_SMALL_CHUNK_SIZE */
-+
-+/* Define to 1 to perform extra assertions and heap poisoning. */
-+/* #undef JS_CRASH_DIAGNOSTICS */
-+
-+/* Define to 1 if SpiderMonkey is in NUNBOX32 mode. */
-+/* #undef JS_NUNBOX32 */
-+
-+/* Define to 1 if SpiderMonkey is in PUNBOX64 mode. */
-+#define JS_PUNBOX64 1
-+
-+/* MOZILLA JSAPI version number components */
-+#define MOZJS_MAJOR_VERSION 60
-+#define MOZJS_MINOR_VERSION 3
-+
-+#endif /* js_config_h */
diff --git a/databases/mongodb42/files/powerpc64le/patch-src_third__party_wiredtiger_dist_filelist b/databases/mongodb42/files/powerpc64le/patch-src_third__party_wiredtiger_dist_filelist
deleted file mode 100644
index 6964d23f0932..000000000000
--- a/databases/mongodb42/files/powerpc64le/patch-src_third__party_wiredtiger_dist_filelist
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/third_party/wiredtiger/dist/filelist.orig	2020-11-25 14:29:56 UTC
-+++ src/third_party/wiredtiger/dist/filelist
-@@ -51,7 +51,7 @@ src/btree/row_modify.c
- src/btree/row_srch.c
- src/cache/cache_las.c
- src/checksum/arm64/crc32-arm64.c	ARM64_HOST
--src/checksum/power8/crc32.sx		POWERPC_HOST
-+src/checksum/power8/crc32.S		POWERPC_HOST
- src/checksum/power8/crc32_wrapper.c	POWERPC_HOST
- src/checksum/software/checksum.c
- src/checksum/x86/crc32-x86.c		X86_HOST
diff --git a/databases/mongodb42/files/powerpc64le/patch-src_third__party_wiredtiger_src_checksum_power8_crc32.S b/databases/mongodb42/files/powerpc64le/patch-src_third__party_wiredtiger_src_checksum_power8_crc32.S
deleted file mode 100644
index fe2e707d16a7..000000000000
--- a/databases/mongodb42/files/powerpc64le/patch-src_third__party_wiredtiger_src_checksum_power8_crc32.S
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/third_party/wiredtiger/src/checksum/power8/crc32.S.orig	2020-09-02 06:34:58 UTC
-+++ src/third_party/wiredtiger/src/checksum/power8/crc32.S
-@@ -26,7 +26,11 @@
-  * as published by the Free Software Foundation; either version
-  * 2 of the License, or (at your option) any later version.
-  */
-+#ifdef __clang__
-+#include "ppc-asm.h"
-+#else
- #include <ppc-asm.h>
-+#endif
- #include "ppc-opcode.h"
- 
- #undef toc
diff --git a/databases/mongodb42/files/powerpc64le/patch-src_third__party_wiredtiger_src_checksum_power8_ppc-asm.h b/databases/mongodb42/files/powerpc64le/patch-src_third__party_wiredtiger_src_checksum_power8_ppc-asm.h
deleted file mode 100644
index 7cd3eb43c89c..000000000000
--- a/databases/mongodb42/files/powerpc64le/patch-src_third__party_wiredtiger_src_checksum_power8_ppc-asm.h
+++ /dev/null
@@ -1,393 +0,0 @@
---- src/third_party/wiredtiger/src/checksum/power8/ppc-asm.h.orig	2020-11-25 13:26:22 UTC
-+++ src/third_party/wiredtiger/src/checksum/power8/ppc-asm.h
-@@ -0,0 +1,390 @@
-+/* PowerPC asm definitions for GNU C.
-+
-+Copyright (C) 2002-2020 Free Software Foundation, Inc.
-+
-+This file is part of GCC.
-+
-+GCC is free software; you can redistribute it and/or modify it under
-+the terms of the GNU General Public License as published by the Free
-+Software Foundation; either version 3, or (at your option) any later
-+version.
-+
-+GCC is distributed in the hope that it will be useful, but WITHOUT ANY
-+WARRANTY; without even the implied warranty of MERCHANTABILITY or
-+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-+for more details.
-+
-+Under Section 7 of GPL version 3, you are granted additional
-+permissions described in the GCC Runtime Library Exception, version
-+3.1, as published by the Free Software Foundation.
-+
-+You should have received a copy of the GNU General Public License and
-+a copy of the GCC Runtime Library Exception along with this program;
-+see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-+<http://www.gnu.org/licenses/>.  */
-+
-+/* Under winnt, 1) gas supports the following as names and 2) in particular
-+   defining "toc" breaks the FUNC_START macro as ".toc" becomes ".2" */
-+
-+#define r0	0
-+#define sp	1
-+#define toc	2
-+#define r3	3
-+#define r4	4
-+#define r5	5
-+#define r6	6
-+#define r7	7
-+#define r8	8
-+#define r9	9
-+#define r10	10
-+#define r11	11
-+#define r12	12
-+#define r13	13
-+#define r14	14
-+#define r15	15
-+#define r16	16
-+#define r17	17
-+#define r18	18
-+#define r19     19
-+#define r20	20
-+#define r21	21
-+#define r22	22
-+#define r23	23
-+#define r24	24
-+#define r25	25
-+#define r26	26
-+#define r27	27
-+#define r28	28
-+#define r29	29
-+#define r30	30
-+#define r31	31
-+
-+#define cr0	0
-+#define cr1	1
-+#define cr2	2
-+#define cr3	3
-+#define cr4	4
-+#define cr5	5
-+#define cr6	6
-+#define cr7	7
-+
-+#define f0	0
-+#define f1	1
-+#define f2	2
-+#define f3	3
-+#define f4	4
-+#define f5	5
-+#define f6	6
-+#define f7	7
-+#define f8	8
-+#define f9	9
-+#define f10	10
-+#define f11	11
-+#define f12	12
-+#define f13	13
-+#define f14	14
-+#define f15	15
-+#define f16	16
-+#define f17	17
-+#define f18	18
-+#define f19	19
-+#define f20	20
-+#define f21	21
-+#define f22	22
-+#define f23	23
-+#define f24	24
-+#define f25	25
-+#define f26	26
-+#define f27	27
-+#define f28	28
-+#define f29	29
-+#define f30	30
-+#define f31	31
-+
-+#ifdef __VSX__
-+#define f32	32
-+#define f33	33
-+#define f34	34
-+#define f35	35
-+#define f36	36
-+#define f37	37
-+#define f38	38
-+#define f39	39
-+#define f40	40
-+#define f41	41
-+#define f42	42
-+#define f43	43
-+#define f44	44
-+#define f45	45
-+#define f46	46
-+#define f47	47
-+#define f48	48
-+#define f49	49
-+#define f50	50
-+#define f51	51
-+#define f52	52
-+#define f53	53
-+#define f54	54
-+#define f55	55
-+#define f56	56
-+#define f57	57
-+#define f58	58
-+#define f59	59
-+#define f60	60
-+#define f61	61
-+#define f62	62
-+#define f63	63
-+#endif
-+
-+#ifdef __ALTIVEC__
-+#define v0	0
-+#define v1	1
-+#define v2	2
-+#define v3	3
-+#define v4	4
-+#define v5	5
-+#define v6	6
-+#define v7	7
-+#define v8	8
-+#define v9	9
-+#define v10	10
-+#define v11	11
-+#define v12	12
-+#define v13	13
-+#define v14	14
-+#define v15	15
-+#define v16	16
-+#define v17	17
-+#define v18	18
-+#define v19	19
-+#define v20	20
-+#define v21	21
-+#define v22	22
-+#define v23	23
-+#define v24	24
-+#define v25	25
-+#define v26	26
-+#define v27	27
-+#define v28	28
-+#define v29	29
-+#define v30	30
-+#define v31	31
-+#endif
-+
-+#ifdef __VSX__
-+#define vs0	0
-+#define vs1	1
-+#define vs2	2
-+#define vs3	3
-+#define vs4	4
-+#define vs5	5
-+#define vs6	6
-+#define vs7	7
-+#define vs8	8
-+#define vs9	9
-+#define vs10	10
-+#define vs11	11
-+#define vs12	12
-+#define vs13	13
-+#define vs14	14
-+#define vs15	15
-+#define vs16	16
-+#define vs17	17
-+#define vs18	18
-+#define vs19	19
-+#define vs20	20
-+#define vs21	21
-+#define vs22	22
-+#define vs23	23
-+#define vs24	24
-+#define vs25	25
-+#define vs26	26
-+#define vs27	27
-+#define vs28	28
-+#define vs29	29
-+#define vs30	30
-+#define vs31	31
-+#define vs32	32
-+#define vs33	33
-+#define vs34	34
-+#define vs35	35
-+#define vs36	36
-+#define vs37	37
-+#define vs38	38
-+#define vs39	39
-+#define vs40	40
-+#define vs41	41
-+#define vs42	42
-+#define vs43	43
-+#define vs44	44
-+#define vs45	45
-+#define vs46	46
-+#define vs47	47
-+#define vs48	48
-+#define vs49	49
-+#define vs50	50
-+#define vs51	51
-+#define vs52	52
-+#define vs53	53
-+#define vs54	54
-+#define vs55	55
-+#define vs56	56
-+#define vs57	57
-+#define vs58	58
-+#define vs59	59
-+#define vs60	60
-+#define vs61	61
-+#define vs62	62
-+#define vs63	63
-+#endif
-+
-+/*
-+ * Macros to glue together two tokens.
-+ */
-+
-+#ifdef __STDC__
-+#define XGLUE(a,b) a##b
-+#else
-+#define XGLUE(a,b) a/**/b
-+#endif
-+
-+#define GLUE(a,b) XGLUE(a,b)
-+
-+/*
-+ * Macros to begin and end a function written in assembler.  If -mcall-aixdesc
-+ * or -mcall-nt, create a function descriptor with the given name, and create
-+ * the real function with one or two leading periods respectively.
-+ */
-+
-+#if defined(__powerpc64__) && _CALL_ELF == 2
-+
-+/* Defining "toc" above breaks @toc in assembler code.  */
-+#undef toc
-+
-+#define FUNC_NAME(name) GLUE(__USER_LABEL_PREFIX__,name)
-+#ifdef __PCREL__
-+#define JUMP_TARGET(name) GLUE(FUNC_NAME(name),@notoc)
-+#define FUNC_START(name) \
-+	.type FUNC_NAME(name),@function; \
-+	.globl FUNC_NAME(name); \
-+FUNC_NAME(name): \
-+	.localentry FUNC_NAME(name),1
-+#else
-+#define JUMP_TARGET(name) FUNC_NAME(name)
-+#define FUNC_START(name) \
-+	.type FUNC_NAME(name),@function; \
-+	.globl FUNC_NAME(name); \
-+FUNC_NAME(name): \
-+0:	addis 2,12,(.TOC.-0b)@ha; \
-+	addi 2,2,(.TOC.-0b)@l; \
-+	.localentry FUNC_NAME(name),.-FUNC_NAME(name)
-+#endif /* !__PCREL__ */
-+
-+#define HIDDEN_FUNC(name) \
-+  FUNC_START(name) \
-+  .hidden FUNC_NAME(name);
-+
-+#define FUNC_END(name) \
-+	.size FUNC_NAME(name),.-FUNC_NAME(name)
-+
-+#elif defined (__powerpc64__)
-+
-+#define FUNC_NAME(name) GLUE(.,name)
-+#define JUMP_TARGET(name) FUNC_NAME(name)
-+#define FUNC_START(name) \
-+	.section ".opd","aw"; \
-+name: \
-+	.quad GLUE(.,name); \
-+	.quad .TOC.@tocbase; \
-+	.quad 0; \
-+	.previous; \
-+	.type GLUE(.,name),@function; \
-+	.globl name; \
-+	.globl GLUE(.,name); \
-+GLUE(.,name):
-+
-+#define HIDDEN_FUNC(name) \
-+  FUNC_START(name) \
-+  .hidden name;	\
-+  .hidden GLUE(.,name);
-+
-+#define FUNC_END(name) \
-+GLUE(.L,name): \
-+	.size GLUE(.,name),GLUE(.L,name)-GLUE(.,name)
-+
-+#elif defined(_CALL_AIXDESC)
-+
-+#ifdef _RELOCATABLE
-+#define DESC_SECTION ".got2"
-+#else
-+#define DESC_SECTION ".got1"
-+#endif
-+
-+#define FUNC_NAME(name) GLUE(.,name)
-+#define JUMP_TARGET(name) FUNC_NAME(name)
-+#define FUNC_START(name) \
-+	.section DESC_SECTION,"aw"; \
-+name: \
-+	.long GLUE(.,name); \
-+	.long _GLOBAL_OFFSET_TABLE_; \
-+	.long 0; \
-+	.previous; \
-+	.type GLUE(.,name),@function; \
-+	.globl name; \
-+	.globl GLUE(.,name); \
-+GLUE(.,name):
-+
-+#define HIDDEN_FUNC(name) \
-+  FUNC_START(name) \
-+  .hidden name; \
-+  .hidden GLUE(.,name);
-+
-+#define FUNC_END(name) \
-+GLUE(.L,name): \
-+	.size GLUE(.,name),GLUE(.L,name)-GLUE(.,name)
-+
-+#else
-+
-+#define FUNC_NAME(name) GLUE(__USER_LABEL_PREFIX__,name)
-+#if defined __PIC__ || defined __pic__
-+#define JUMP_TARGET(name) FUNC_NAME(name@plt)
-+#else
-+#define JUMP_TARGET(name) FUNC_NAME(name)
-+#endif
-+#define FUNC_START(name) \
-+	.type FUNC_NAME(name),@function; \
-+	.globl FUNC_NAME(name); \
-+FUNC_NAME(name):
-+
-+#define HIDDEN_FUNC(name) \
-+  FUNC_START(name) \
-+  .hidden FUNC_NAME(name);
-+
-+#define FUNC_END(name) \
-+GLUE(.L,name): \
-+	.size FUNC_NAME(name),GLUE(.L,name)-FUNC_NAME(name)
-+#endif
-+
-+#ifdef IN_GCC
-+/* For HAVE_GAS_CFI_DIRECTIVE.  */
-+#include "auto-host.h"
-+
-+#ifdef HAVE_GAS_CFI_DIRECTIVE
-+# define CFI_STARTPROC			.cfi_startproc
-+# define CFI_ENDPROC			.cfi_endproc
-+# define CFI_OFFSET(reg, off)		.cfi_offset reg, off
-+# define CFI_DEF_CFA_REGISTER(reg)	.cfi_def_cfa_register reg
-+# define CFI_RESTORE(reg)		.cfi_restore reg
-+#else
-+# define CFI_STARTPROC
-+# define CFI_ENDPROC
-+# define CFI_OFFSET(reg, off)
-+# define CFI_DEF_CFA_REGISTER(reg)
-+# define CFI_RESTORE(reg)
-+#endif
-+#endif
-+
-+#if defined __linux__ && !defined __powerpc64__
-+	.section .note.GNU-stack
-+	.previous
-+#endif
diff --git a/databases/mongodb42/pkg-descr b/databases/mongodb42/pkg-descr
deleted file mode 100644
index a239821567aa..000000000000
--- a/databases/mongodb42/pkg-descr
+++ /dev/null
@@ -1,5 +0,0 @@
-Mongo (from "humongous") is a high-performance, open source,
-schema-free, document-oriented database. A common name in the
-"NOSQL" community.
-
-WWW: https://docs.mongodb.com/v4.2/
diff --git a/databases/mongodb42/pkg-plist b/databases/mongodb42/pkg-plist
deleted file mode 100644
index 83149ff7676d..000000000000
--- a/databases/mongodb42/pkg-plist
+++ /dev/null
@@ -1,5 +0,0 @@
-bin/install_compass
-bin/mongo
-bin/mongod
-bin/mongos
-@sample etc/mongodb.conf.sample
diff --git a/databases/mongodb44/Makefile b/databases/mongodb44/Makefile
index a3720cf9b94f..22c94ad946ec 100644
--- a/databases/mongodb44/Makefile
+++ b/databases/mongodb44/Makefile
@@ -1,14 +1,15 @@
 PORTNAME=	mongodb
 DISTVERSIONPREFIX=	r
-DISTVERSION=	4.4.8
+DISTVERSION=	4.4.29
 CATEGORIES=	databases net
 MASTER_SITES=	https://fastdl.mongodb.org/src/ \
 		http://fastdl.mongodb.org/src/
 PKGNAMESUFFIX=	${DISTVERSION:R:S/.//}
 DISTNAME=	mongodb-src-${DISTVERSIONPREFIX}${DISTVERSION}
 
-MAINTAINER=	ronald-lists@klop.ws
+MAINTAINER=	ronald@FreeBSD.org
 COMMENT=	Distributed document-oriented "NoSQL" database (4.4.x Branch)
+WWW=		https://docs.mongodb.com/v4.4/
 
 LICENSE=	SSPLv1 APACHE20 # mongodb is SSPLv1, C++ driver is APACHE20
 LICENSE_COMB=	multi
@@ -16,43 +17,57 @@ LICENSE_NAME_SSPLv1=	Server Side Public License Version 1
 LICENSE_FILE_SSPLv1=	${WRKSRC}/LICENSE-Community.txt
 LICENSE_PERMS_SSPLv1=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
+DEPRECATED=	EOL as of February 2024, https://www.mongodb.com/legal/support-policy/lifecycles
+EXPIRATION_DATE=2024-07-31
 ONLY_FOR_ARCHS=	aarch64 amd64 powerpc64le
-ONLY_FOR_ARCHS_REASON=	Only ported to amd64, aarch64 and powerpc64le on FreeBSD. Upstream supports arm64, ppc64le, s390x and x86-64.
+ONLY_FOR_ARCHS_REASON=	only ported to amd64, aarch64, and powerpc64le on FreeBSD; upstream supports arm64, ppc64le, s390x, and x86-64
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cheetah3>0:devel/py-cheetah3@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}yaml>=3.11:devel/py-yaml@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}psutil>0:sysutils/py-psutil@${PY_FLAVOR} \
-		${LOCALBASE}/bin/ar:devel/binutils
+		${PYTHON_PKGNAMEPREFIX}psutil>0:sysutils/py-psutil@${PY_FLAVOR}
 LIB_DEPENDS=	libpcre.so:devel/pcre \
 		libcurl.so:ftp/curl \
 		libsnappy.so:archivers/snappy
 
-USES=		compiler:c++17-lang cpe python:3.5+,build scons
+USES=		compiler:c++17-lang cpe python:build scons
 USE_RC_SUBR=	mongod
 
-PORTSCOUT=     limit:^4\.4\.
-
-CONFLICTS_INSTALL=	mongodb36 mongodb4[02]
-
-OPTIONS_DEFINE=	LTO SASL SSL
-OPTIONS_DEFAULT=LTO SASL SSL
-OPTIONS_EXCLUDE_aarch64=	${OPTIONS_EXCLUDE_${ARCH}_${OSREL:R}}
-OPTIONS_EXCLUDE_aarch64_14=	LTO # Does not work with llvm12 on aarch64.
-
+# --modules= disables "enterprise" module from src/mongo/db/modules/
 MAKE_ARGS=	--use-system-zlib \
 		--use-system-pcre \
 		--use-system-snappy \
 		--libc++ \
 		--cxx-std=17 \
+		--modules= \
 		--runtime-hardening=on \
 		-j ${MAKE_JOBS_NUMBER} \
 		--disable-warnings-as-errors \
 		VERBOSE=on \
-		AR=${PREFIX}/bin/ar
+		AR=llvm-ar
+
+CFLAGS+=	-D_HAS_AUTO_PTR_ETC=0
+
+CONFLICTS_INSTALL=	mongodb[0-9][0-9] # etc/mongodb.conf.sample
+
+PORTSCOUT=	limit:^4\.4\.
 
 USERS=		mongodb
 GROUPS=		mongodb
 
+OPTIONS_DEFINE=			LTO SASL SSL
+OPTIONS_DEFINE_aarch64=	ARMV80A
+OPTIONS_DEFAULT=		LTO SASL SSL
+OPTIONS_DEFAULT_aarch64=	ARMV80A
+OPTIONS_EXCLUDE_aarch64=	${OPTIONS_EXCLUDE_${ARCH}_${OSREL:R}}
+OPTIONS_EXCLUDE_aarch64_14=	LTO # Does not work with llvm12 on aarch64.
+
+# MongoDB on non-LSE ARM cpu like Raspberry Pi can work but is unsupported upstream.
+# Can give corruption on high concurrency.
+# Please read https://jira.mongodb.org/browse/SERVER-71772.
+ARMV80A_DESC=	Enable non-LSE ARM64 CPUs like RPI4.
+
+ARMV80A_EXTRA_PATCHES=	${FILESDIR}/extrapatch-SConstruct
+
 LTO_MAKE_ARGS=	--lto=on
 
 SASL_LIB_DEPENDS=	libsasl2.so:security/cyrus-sasl2
@@ -63,14 +78,8 @@ SSL_MAKE_ARGS=	--ssl
 
 .include <bsd.port.pre.mk>
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1200057
-SUB_LIST+=	LEGACY_LIMITS="@comment " MODERN_LIMITS=""
-.else
-SUB_LIST+=	LEGACY_LIMITS="" MODERN_LIMITS="@comment "
-.endif
-
 .if ${ARCH} == aarch64 || ${ARCH} == powerpc64le
-EXTRA_PATCHES=	${FILESDIR}/${ARCH}
+EXTRA_PATCHES+=	${FILESDIR}/${ARCH}
 .endif
 
 ALL_TARGET=	install-core
diff --git a/databases/mongodb44/distinfo b/databases/mongodb44/distinfo
index 3d2b2bc2f004..58cef4b0cb4e 100644
--- a/databases/mongodb44/distinfo
+++ b/databases/mongodb44/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1628281136
-SHA256 (mongodb-src-r4.4.8.tar.gz) = 6f9bd6626ef61ec3cd9051ff8576bf499936de99c4fc3551f8bde4e9ba504a97
-SIZE (mongodb-src-r4.4.8.tar.gz) = 50492854
+TIMESTAMP = 1709336798
+SHA256 (mongodb-src-r4.4.29.tar.gz) = 63792db1e58b0a3d41063b969251f6514fc0f0c899b8165282f1044d754ae8c0
+SIZE (mongodb-src-r4.4.29.tar.gz) = 51483592
diff --git a/databases/mongodb44/files/aarch64/patch-src_third__party_mozjs-60_gen-config.sh b/databases/mongodb44/files/aarch64/patch-src_third__party_mozjs-60_gen-config.sh
index d9a2e1c3f075..8a81b2bb4293 100644
--- a/databases/mongodb44/files/aarch64/patch-src_third__party_mozjs-60_gen-config.sh
+++ b/databases/mongodb44/files/aarch64/patch-src_third__party_mozjs-60_gen-config.sh
@@ -1,6 +1,6 @@
---- src/third_party/mozjs-60/gen-config.sh.orig	2019-10-11 03:28:57 UTC
+--- src/third_party/mozjs-60/gen-config.sh.orig	2023-05-10 02:21:42 UTC
 +++ src/third_party/mozjs-60/gen-config.sh
-@@ -28,6 +28,9 @@ _xcode_setup() {
+@@ -28,6 +28,9 @@ case "$_Path" in
  }
  
  case "$_Path" in
@@ -10,7 +10,7 @@
      "platform/aarch64/linux")
          _CONFIG_OPTS="--host=aarch64-linux"
  	;;
-@@ -82,9 +85,9 @@ esac
+@@ -82,9 +85,9 @@ rm config.cache || true
  cd mozilla-release/js/src
  rm config.cache || true
  
diff --git a/databases/mongodb44/files/extrapatch-SConstruct b/databases/mongodb44/files/extrapatch-SConstruct
new file mode 100644
index 000000000000..f82c38ad98f8
--- /dev/null
+++ b/databases/mongodb44/files/extrapatch-SConstruct
@@ -0,0 +1,11 @@
+--- SConstruct.orig	2023-05-10 02:21:42 UTC
++++ SConstruct
+@@ -2297,7 +2297,7 @@ if env.ToolchainIs('GCC', 'clang'):
+     elif env['TARGET_ARCH'] == 'aarch64':
+         # If we are using GCC or clang to target aarch64, set the arch to be armv8.2-a,
+         # This is to prevent a bug with WT see SERVER-71772 for more details
+-        env.Append( CCFLAGS=['-march=armv8.2-a', '-mtune=generic'] )
++        env.Append( CCFLAGS=['-march=armv8-a+crc', '-mtune=generic'] )
+ 
+ # Needed for auth tests since key files are stored in git with mode 644.
+ if not env.TargetOSIs('windows'):
diff --git a/databases/mongodb44/files/mongod.in b/databases/mongodb44/files/mongod.in
index e885be83196c..20b0f5c0f43d 100644
--- a/databases/mongodb44/files/mongod.in
+++ b/databases/mongodb44/files/mongod.in
@@ -9,9 +9,6 @@
 #
 # mongod_enable (bool):  Set to "NO" by default.
 #                        Set it to "YES" to enable mongod.
-%%LEGACY_LIMITS%%# mongod_limits (bool):  Set to "NO" by default.
-%%LEGACY_LIMITS%%#                        Set it to yes to run `limits -e -U mongodb`
-%%LEGACY_LIMITS%%#                        just before mongod starts.
 # mongod_dbpath (str):   Default to "/var/db/mongodb"
 #                        Base database directory.
 # mongod_flags (str):    Custom additional arguments to be passed to mongod.
@@ -28,7 +25,6 @@ rcvar=mongod_enable
 load_rc_config $name
 
 : ${mongod_enable="NO"}
-%%LEGACY_LIMITS%%: ${mongod_limits="NO"}
 : ${mongod_dbpath="/var/db/mongodb"}
 : ${mongod_flags="--logpath ${mongod_dbpath}/mongod.log --logappend --setParameter=disabledSecureAllocatorDomains=\*"}
 : ${mongod_user="mongodb"}
@@ -51,12 +47,7 @@ mongod_prestart()
         if [ ! -d ${mongod_dbpath} ]; then
                 mongod_create_dbpath || return 1
         fi
-%%LEGACY_LIMITS%%        if checkyesno mongod_limits; then
-%%LEGACY_LIMITS%%                eval `/usr/bin/limits -e -U ${mongod_user}` 2>/dev/null
-%%LEGACY_LIMITS%%        else
-%%LEGACY_LIMITS%%                return 0
-%%LEGACY_LIMITS%%        fi
-%%MODERN_LIMITS%%        return 0
+        return 0
 }
 
 run_rc_command "$1"
diff --git a/databases/mongodb44/files/patch-SConstruct b/databases/mongodb44/files/patch-SConstruct
index de57cb103810..c5f7a951c670 100644
--- a/databases/mongodb44/files/patch-SConstruct
+++ b/databases/mongodb44/files/patch-SConstruct
@@ -1,6 +1,6 @@
---- SConstruct.orig	2021-07-07 09:17:06 UTC
+--- SConstruct.orig	2023-12-17 21:00:26 UTC
 +++ SConstruct
-@@ -1213,9 +1213,9 @@ if has_option('variables-help'):
+@@ -1262,9 +1262,9 @@ if has_option('variables-help'):
      print(env_vars.GenerateHelpText(env))
      Exit(0)
  
@@ -11,9 +11,9 @@
 +#if unknown_vars:
 +#    env.FatalError("Unknown variables specified: {0}", ", ".join(list(unknown_vars.keys())))
  
- if get_option('install-action') != 'default' and get_option('ninja') != "disabled":
-     env.FatalError("Cannot use non-default install actions when generating Ninja.")
-@@ -2091,7 +2091,7 @@ if env.TargetOSIs('posix'):
+ install_actions.setup(env, get_option('install-action'))
+ 
+@@ -2189,7 +2189,7 @@ if env.TargetOSIs('posix'):
              # If runtime hardening is requested, then build anything
              # destined for an executable with the necessary flags for PIE.
              env.AppendUnique(
@@ -22,7 +22,7 @@
                  PROGLINKFLAGS=['-pie'],
              )
  
-@@ -2106,7 +2106,7 @@ if env.TargetOSIs('posix'):
+@@ -2204,7 +2204,7 @@ if env.TargetOSIs('posix'):
                           "-Wno-unknown-pragmas",
                           "-Winvalid-pch"] )
      # env.Append( " -Wconversion" ) TODO: this doesn't really work yet
@@ -31,13 +31,3 @@
          if not has_option("disable-warnings-as-errors"):
              env.Append( CCFLAGS=["-Werror"] )
  
-@@ -3926,7 +3926,8 @@ def doConfigure(myenv):
-     myenv = conf.Finish()
- 
-     if env['TARGET_ARCH'] == "aarch64":
--        AddToCCFLAGSIfSupported(myenv, "-moutline-atomics")
-+        # https://lists.freebsd.org/archives/freebsd-ports/2021-July/000431.html
-+        AddToCCFLAGSIfSupported(myenv, "-mno-outline-atomics")
- 
-     conf = Configure(myenv)
-     usdt_enabled = get_option('enable-usdt-probes')
diff --git a/databases/mongodb44/files/patch-rpm_mongod.conf b/databases/mongodb44/files/patch-rpm_mongod.conf
index 1a21e4250707..d2ab7fb69c08 100644
--- a/databases/mongodb44/files/patch-rpm_mongod.conf
+++ b/databases/mongodb44/files/patch-rpm_mongod.conf
@@ -14,12 +14,3 @@
    journal:
      enabled: true
  #  engine:
-@@ -20,7 +20,7 @@ storage:
- # how the process runs
- processManagement:
-   fork: true  # fork and run in background
--  pidFilePath: /var/run/mongodb/mongod.pid  # location of pidfile
-+  pidFilePath: /var/db/mongodb/mongod.lock  # location of pidfile
-   timeZoneInfo: /usr/share/zoneinfo
- 
- # network interfaces
diff --git a/databases/mongodb44/files/patch-src_third__party_boost-1.70.0_boost_mpl_aux___integral__wrapper.hpp b/databases/mongodb44/files/patch-src_third__party_boost-1.70.0_boost_mpl_aux___integral__wrapper.hpp
new file mode 100644
index 000000000000..fc5562f61763
--- /dev/null
+++ b/databases/mongodb44/files/patch-src_third__party_boost-1.70.0_boost_mpl_aux___integral__wrapper.hpp
@@ -0,0 +1,11 @@
+--- src/third_party/boost-1.70.0/boost/mpl/aux_/integral_wrapper.hpp.orig	2023-06-29 10:06:20 UTC
++++ src/third_party/boost-1.70.0/boost/mpl/aux_/integral_wrapper.hpp
+@@ -56,7 +56,7 @@ struct AUX_WRAPPER_NAME
+ // have to #ifdef here: some compilers don't like the 'N + 1' form (MSVC),
+ // while some other don't like 'value + 1' (Borland), and some don't like
+ // either
+-#if BOOST_WORKAROUND(__EDG_VERSION__, <= 243)
++#if 1 //BOOST_WORKAROUND(__EDG_VERSION__, <= 243)
+  private:
+     BOOST_STATIC_CONSTANT(AUX_WRAPPER_VALUE_TYPE, next_value = BOOST_MPL_AUX_STATIC_CAST(AUX_WRAPPER_VALUE_TYPE, (N + 1)));
+     BOOST_STATIC_CONSTANT(AUX_WRAPPER_VALUE_TYPE, prior_value = BOOST_MPL_AUX_STATIC_CAST(AUX_WRAPPER_VALUE_TYPE, (N - 1)));
diff --git a/databases/mongodb44/pkg-descr b/databases/mongodb44/pkg-descr
index f39861b24b3c..59930ca8f679 100644
--- a/databases/mongodb44/pkg-descr
+++ b/databases/mongodb44/pkg-descr
@@ -1,5 +1,3 @@
 Mongo (from "humongous") is a high-performance, open source,
 schema-free, document-oriented database. A common name in the
 "NOSQL" community.
-
-WWW: https://docs.mongodb.com/v4.4/
diff --git a/databases/mongodb44/pkg-message b/databases/mongodb44/pkg-message
new file mode 100644
index 000000000000..e0a343760e63
--- /dev/null
+++ b/databases/mongodb44/pkg-message
@@ -0,0 +1,8 @@
+[
+{ type: install
+  message: <<EOM
+MongoDB on Raspberry Pi can work but is unsupported upstream.
+Please read https://jira.mongodb.org/browse/SERVER-71772 if you run this on a non-LSE ARM cpu.
+EOM
+}
+]
diff --git a/databases/mongodb50/Makefile b/databases/mongodb50/Makefile
index 593808b7b8e3..ccbc2e666182 100644
--- a/databases/mongodb50/Makefile
+++ b/databases/mongodb50/Makefile
@@ -1,61 +1,76 @@
 PORTNAME=	mongodb
 DISTVERSIONPREFIX=	r
-DISTVERSION=	5.0.2
+DISTVERSION=	5.0.26
+PORTREVISION=	1
 CATEGORIES=	databases net
 MASTER_SITES=	https://fastdl.mongodb.org/src/ \
 		http://fastdl.mongodb.org/src/
 PKGNAMESUFFIX=	${DISTVERSION:R:S/.//}
 DISTNAME=	mongodb-src-${DISTVERSIONPREFIX}${DISTVERSION}
 
-MAINTAINER=	ronald-lists@klop.ws
+MAINTAINER=	ronald@FreeBSD.org
 COMMENT=	Distributed document-oriented "NoSQL" database (5.0.x Branch)
+WWW=		https://docs.mongodb.com/v5.0/
 
-LICENSE=	SSPLv1 APACHE20 # mongodb is SSPLv1, C++ driver is APACHE20
+LICENSE=	APACHE20 SSPLv1 # mongodb is SSPLv1, C++ driver is APACHE20
 LICENSE_COMB=	multi
 LICENSE_NAME_SSPLv1=	Server Side Public License Version 1
 LICENSE_FILE_SSPLv1=	${WRKSRC}/LICENSE-Community.txt
 LICENSE_PERMS_SSPLv1=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 ONLY_FOR_ARCHS=	aarch64 amd64 powerpc64le
-ONLY_FOR_ARCHS_REASON=	Only ported to amd64, aarch64 and powerpc64le on FreeBSD. Upstream supports arm64, ppc64le, s390x and x86-64.
+ONLY_FOR_ARCHS_REASON=	only ported to amd64, aarch64, and powerpc64le on FreeBSD; upstream supports arm64, ppc64le, s390x, and x86-64
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cheetah3>0:devel/py-cheetah3@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}yaml>=3.11:devel/py-yaml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}psutil>0:sysutils/py-psutil@${PY_FLAVOR} \
-		${LOCALBASE}/bin/ar:devel/binutils
-LIB_DEPENDS=	libpcre.so:devel/pcre \
-		libcurl.so:ftp/curl \
-		libsnappy.so:archivers/snappy
-
-USES=		compiler:c++17-lang cpe python:3.5+,build scons shebangfix
+		${PYTHON_PKGNAMEPREFIX}yaml>=3.11:devel/py-yaml@${PY_FLAVOR}
+LIB_DEPENDS=	libcurl.so:ftp/curl \
+		libpcre.so:devel/pcre \
+		libsnappy.so:archivers/snappy \
+		libstemmer.so:textproc/snowballstemmer \
+		libunwind.so:devel/libunwind \
+		libyaml-cpp.so:devel/yaml-cpp \
+		libzstd.so:archivers/zstd
+
+USES=		compiler:c++17-lang cpe python:build scons shebangfix
 USE_RC_SUBR=	mongod
 
-CONFLICTS_INSTALL=	mongodb36 mongodb4[024]
-
-OPTIONS_DEFINE=	LTO SASL SSL
-OPTIONS_DEFAULT=LTO SASL SSL
-OPTIONS_EXCLUDE_aarch64=        ${OPTIONS_EXCLUDE_${ARCH}_${OSREL:R}}
-OPTIONS_EXCLUDE_aarch64_14=     LTO # Does not work with llvm12 on aarch64.
-
-SHEBANG_FILES=  buildscripts/scons.py
-python_OLD_CMD= @python_interpreter@
+SHEBANG_FILES=	buildscripts/scons.py
+python_OLD_CMD=	@python_interpreter@
 
-MAKE_ARGS=	--use-system-zlib \
-		--use-system-pcre \
-		--use-system-snappy \
+# --modules= disables "enterprise" module from src/mongo/db/modules/
+MAKE_ARGS=	--cxx-std=17 \
+		--disable-warnings-as-errors \
 		--libc++ \
-		--cxx-std=17 \
+		--modules= \
 		--runtime-hardening=on \
+		--use-system-libunwind \
+		--use-system-pcre \
+		--use-system-snappy \
+		--use-system-stemmer \
+		--use-system-yaml \
+		--use-system-zlib \
+		--use-system-zstd \
 		-j ${MAKE_JOBS_NUMBER} \
-		--disable-warnings-as-errors \
-		VERBOSE=on \
-		AR=${PREFIX}/bin/ar
+		AR=llvm-ar \
+		VERBOSE=on
+
+CFLAGS+=	-DBOOST_NO_CXX98_FUNCTION_BASE
+
+CONFLICTS_INSTALL=	mongodb[0-9][0-9] # etc/mongodb.conf.sample
 
 USERS=		mongodb
 GROUPS=		mongodb
 
+OPTIONS_DEFINE=		LTO SASL SSL NOAVX
+OPTIONS_DEFAULT=	SASL SSL
+
+NOAVX_DESC=	"Disable AVX instructions on amd64 (Sandybridge+)"
+
 LTO_MAKE_ARGS=	--lto=on
 
+NOAVX_MAKE_ARGS=	--experimental-optimization="-sandybridge"
+
 SASL_LIB_DEPENDS=	libsasl2.so:security/cyrus-sasl2
 SASL_MAKE_ARGS=		--use-sasl-client
 
@@ -64,25 +79,29 @@ SSL_MAKE_ARGS=	--ssl
 
 .include <bsd.port.pre.mk>
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1200057
-SUB_LIST+=	LEGACY_LIMITS="@comment " MODERN_LIMITS=""
-.else
-SUB_LIST+=	LEGACY_LIMITS="" MODERN_LIMITS="@comment "
-.endif
-
 .if ${ARCH} == aarch64 || ${ARCH} == powerpc64le
 EXTRA_PATCHES=	${FILESDIR}/${ARCH}
 .endif
 
 ALL_TARGET=	install-core
 
-PORTSCOUT=	limitw:1,even
+# This ports is only following the Major Release.
+# https://docs.mongodb.com/manual/reference/versioning/
+PORTSCOUT=	limit:^5\.0\.
 
 CPE_PRODUCT=	mongodb
 
 pre-patch:
 	${MV} ${WRKSRC}/src/third_party/wiredtiger/src/checksum/power8/crc32.sx ${WRKSRC}/src/third_party/wiredtiger/src/checksum/power8/crc32.S
 
+post-patch:
+	${RM} -rf ${WRKSRC}/src/third_party/pcre-*
+	${RM} -rf ${WRKSRC}/src/third_party/snappy-*
+	${RM} -rf ${WRKSRC}/src/third_party/unwind
+	${RM} -rf ${WRKSRC}/src/third_party/yaml-cpp
+	${RM} -rf ${WRKSRC}/src/third_party/zlib-*
+	${RM} -rf ${WRKSRC}/src/third_party/zstandard-*
+
 do-build:
 	${WRKSRC}/buildscripts/scons.py	-C ${WRKSRC} ${MAKE_ARGS}
 
@@ -91,5 +110,10 @@ do-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${f}
 .endfor
 	${INSTALL_DATA} ${WRKSRC}/rpm/mongod.conf ${STAGEDIR}${PREFIX}/etc/mongodb.conf.sample
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+.for doc in LICENSE-Community.txt MPL-2 README THIRD-PARTY-NOTICES
+	${MV} ${STAGEDIR}${PREFIX}/${doc} ${STAGEDIR}${DOCSDIR}/
+.endfor
+	${RM} ${STAGEDIR}${PREFIX}/bin/resmoke.py
 
 .include <bsd.port.post.mk>
diff --git a/databases/mongodb50/distinfo b/databases/mongodb50/distinfo
index dac7de837a73..b94cf6b34939 100644
--- a/databases/mongodb50/distinfo
+++ b/databases/mongodb50/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1628188110
-SHA256 (mongodb-src-r5.0.2.tar.gz) = 8877424e7568c209625ea7ed8bc38710887ab0133150d1fa713859db0064e315
-SIZE (mongodb-src-r5.0.2.tar.gz) = 54527477
+TIMESTAMP = 1711276068
+SHA256 (mongodb-src-r5.0.26.tar.gz) = 186bc4e76cc2bb6b60e29df95c9e48efc9c1c51529e0ac01aa59ad8afe7437bc
+SIZE (mongodb-src-r5.0.26.tar.gz) = 57084482
diff --git a/databases/mongodb50/files/mongod.in b/databases/mongodb50/files/mongod.in
index e885be83196c..20b0f5c0f43d 100644
--- a/databases/mongodb50/files/mongod.in
+++ b/databases/mongodb50/files/mongod.in
@@ -9,9 +9,6 @@
 #
 # mongod_enable (bool):  Set to "NO" by default.
 #                        Set it to "YES" to enable mongod.
-%%LEGACY_LIMITS%%# mongod_limits (bool):  Set to "NO" by default.
-%%LEGACY_LIMITS%%#                        Set it to yes to run `limits -e -U mongodb`
-%%LEGACY_LIMITS%%#                        just before mongod starts.
 # mongod_dbpath (str):   Default to "/var/db/mongodb"
 #                        Base database directory.
 # mongod_flags (str):    Custom additional arguments to be passed to mongod.
@@ -28,7 +25,6 @@ rcvar=mongod_enable
 load_rc_config $name
 
 : ${mongod_enable="NO"}
-%%LEGACY_LIMITS%%: ${mongod_limits="NO"}
 : ${mongod_dbpath="/var/db/mongodb"}
 : ${mongod_flags="--logpath ${mongod_dbpath}/mongod.log --logappend --setParameter=disabledSecureAllocatorDomains=\*"}
 : ${mongod_user="mongodb"}
@@ -51,12 +47,7 @@ mongod_prestart()
         if [ ! -d ${mongod_dbpath} ]; then
                 mongod_create_dbpath || return 1
         fi
-%%LEGACY_LIMITS%%        if checkyesno mongod_limits; then
-%%LEGACY_LIMITS%%                eval `/usr/bin/limits -e -U ${mongod_user}` 2>/dev/null
-%%LEGACY_LIMITS%%        else
-%%LEGACY_LIMITS%%                return 0
-%%LEGACY_LIMITS%%        fi
-%%MODERN_LIMITS%%        return 0
+        return 0
 }
 
 run_rc_command "$1"
diff --git a/databases/mongodb50/files/patch-SConstruct b/databases/mongodb50/files/patch-SConstruct
index c798505de87a..01af9a42437c 100644
--- a/databases/mongodb50/files/patch-SConstruct
+++ b/databases/mongodb50/files/patch-SConstruct
@@ -1,6 +1,6 @@
---- SConstruct.orig	2021-07-15 20:56:31 UTC
+--- SConstruct.orig	2022-05-17 13:56:34 UTC
 +++ SConstruct
-@@ -1328,9 +1328,9 @@ if has_option('variables-help'):
+@@ -1301,9 +1301,9 @@ if has_option('variables-help'):
      print(env_vars.GenerateHelpText(env))
      Exit(0)
  
@@ -13,7 +13,7 @@
  
  if get_option('install-action') != 'default' and get_option('ninja') != "disabled":
      env.FatalError("Cannot use non-default install actions when generating Ninja.")
-@@ -2507,7 +2507,7 @@ if env.TargetOSIs('posix'):
+@@ -2370,13 +2370,13 @@ if env.TargetOSIs('posix'):
              # If runtime hardening is requested, then build anything
              # destined for an executable with the necessary flags for PIE.
              env.AppendUnique(
@@ -22,7 +22,14 @@
                  PROGLINKFLAGS=['-pie'],
              )
  
-@@ -2684,8 +2684,12 @@ if not env.TargetOSIs('windows', 'macOS') and (env.Too
+     # -Winvalid-pch Warn if a precompiled header (see Precompiled Headers) is found in the search path but can't be used.
+     env.Append( CCFLAGS=["-fasynchronous-unwind-tables",
+-                         "-ggdb" if not env.TargetOSIs('emscripten') else "-g",
++    #                    "-ggdb" if not env.TargetOSIs('emscripten') else "-g",
+                          "-Wall",
+                          "-Wsign-compare",
+                          "-Wno-unknown-pragmas",
+@@ -2541,8 +2541,12 @@ if not env.TargetOSIs('windows', 'macOS') and (env.Too
      # setting it for both C and C++ by setting both of CFLAGS and
      # CXXFLAGS.
  
@@ -36,13 +43,12 @@
          "i386"       : { "-march=" : "nocona",       "-mtune=" : "generic"                        },
          "ppc64le"    : { "-mcpu="  : "power8",       "-mtune=" : "power8", "-mcmodel=" : "medium" },
          "s390x"      : { "-march=" : "z196",         "-mtune=" : "zEC12"                          },
-@@ -4520,7 +4524,8 @@ def doConfigure(myenv):
-     myenv = conf.Finish()
+@@ -2554,7 +2558,7 @@ if not env.TargetOSIs('windows', 'macOS') and (env.Too
+     if "sandybridge" in selected_experimental_optimizations:
+         default_targeting_flags_for_architecture["x86_64"] = {
+             "-march="                : "sandybridge",
+-            "-mtune="                : "generic",
++    #       "-mtune="                : "generic",
+             "-mprefer-vector-width=" : "128",
+         }
  
-     if env['TARGET_ARCH'] == "aarch64":
--        AddToCCFLAGSIfSupported(myenv, "-moutline-atomics")
-+        # https://lists.freebsd.org/archives/freebsd-ports/2021-July/000431.html
-+        AddToCCFLAGSIfSupported(myenv, "-mno-outline-atomics")
- 
-     conf = Configure(myenv)
-     usdt_enabled = get_option('enable-usdt-probes')
diff --git a/databases/mongodb50/files/patch-rpm_mongod.conf b/databases/mongodb50/files/patch-rpm_mongod.conf
index 1a21e4250707..d2ab7fb69c08 100644
--- a/databases/mongodb50/files/patch-rpm_mongod.conf
+++ b/databases/mongodb50/files/patch-rpm_mongod.conf
@@ -14,12 +14,3 @@
    journal:
      enabled: true
  #  engine:
-@@ -20,7 +20,7 @@ storage:
- # how the process runs
- processManagement:
-   fork: true  # fork and run in background
--  pidFilePath: /var/run/mongodb/mongod.pid  # location of pidfile
-+  pidFilePath: /var/db/mongodb/mongod.lock  # location of pidfile
-   timeZoneInfo: /usr/share/zoneinfo
- 
- # network interfaces
diff --git a/databases/mongodb50/files/patch-src_third__party_boost_boost_mpl_aux___integral__wrapper.hpp b/databases/mongodb50/files/patch-src_third__party_boost_boost_mpl_aux___integral__wrapper.hpp
new file mode 100644
index 000000000000..a45dcb0f2340
--- /dev/null
+++ b/databases/mongodb50/files/patch-src_third__party_boost_boost_mpl_aux___integral__wrapper.hpp
@@ -0,0 +1,11 @@
+--- src/third_party/boost/boost/mpl/aux_/integral_wrapper.hpp.orig	2023-06-30 20:32:00 UTC
++++ src/third_party/boost/boost/mpl/aux_/integral_wrapper.hpp
+@@ -56,7 +56,7 @@ struct AUX_WRAPPER_NAME
+ // have to #ifdef here: some compilers don't like the 'N + 1' form (MSVC),
+ // while some other don't like 'value + 1' (Borland), and some don't like
+ // either
+-#if BOOST_WORKAROUND(__EDG_VERSION__, <= 243)
++#if 1 //BOOST_WORKAROUND(__EDG_VERSION__, <= 243)
+  private:
+     BOOST_STATIC_CONSTANT(AUX_WRAPPER_VALUE_TYPE, next_value = BOOST_MPL_AUX_STATIC_CAST(AUX_WRAPPER_VALUE_TYPE, (N + 1)));
+     BOOST_STATIC_CONSTANT(AUX_WRAPPER_VALUE_TYPE, prior_value = BOOST_MPL_AUX_STATIC_CAST(AUX_WRAPPER_VALUE_TYPE, (N - 1)));
diff --git a/databases/mongodb50/pkg-descr b/databases/mongodb50/pkg-descr
index e109232e7864..59930ca8f679 100644
--- a/databases/mongodb50/pkg-descr
+++ b/databases/mongodb50/pkg-descr
@@ -1,5 +1,3 @@
 Mongo (from "humongous") is a high-performance, open source,
 schema-free, document-oriented database. A common name in the
 "NOSQL" community.
-
-WWW: https://docs.mongodb.com/v5.0/
diff --git a/databases/mongodb50/pkg-message b/databases/mongodb50/pkg-message
new file mode 100644
index 000000000000..43e45ca6a35a
--- /dev/null
+++ b/databases/mongodb50/pkg-message
@@ -0,0 +1,8 @@
+[
+{ type: install
+  message: <<EOM
+MongoDB on Rasperry Pi can work but is unsupported upstream.
+Please read https://jira.mongodb.org/browse/SERVER-71772 if you run this on a non-LSE ARM cpu.
+EOM
+}
+]
diff --git a/databases/mongodb50/pkg-plist b/databases/mongodb50/pkg-plist
index 038c2fbafba6..dbb1f6e5ce80 100644
--- a/databases/mongodb50/pkg-plist
+++ b/databases/mongodb50/pkg-plist
@@ -2,3 +2,7 @@ bin/mongo
 bin/mongod
 bin/mongos
 @sample etc/mongodb.conf.sample
+%%DOCSDIR%%/LICENSE-Community.txt
+%%DOCSDIR%%/MPL-2
+%%DOCSDIR%%/README
+%%DOCSDIR%%/THIRD-PARTY-NOTICES
diff --git a/databases/mongodb60/Makefile b/databases/mongodb60/Makefile
new file mode 100644
index 000000000000..e6f708e25e01
--- /dev/null
+++ b/databases/mongodb60/Makefile
@@ -0,0 +1,146 @@
+PORTNAME=	mongodb
+DISTVERSIONPREFIX=	r
+DISTVERSION=	6.0.14
+CATEGORIES=	databases net
+PKGNAMESUFFIX=	${DISTVERSION:R:S/.//}
+
+MAINTAINER=	ronald@FreeBSD.org
+COMMENT=	Distributed document-oriented "NoSQL" database (6.0.x Branch)
+WWW=		https://docs.mongodb.com/v6.0/
+
+LICENSE=	APACHE20 SSPLv1 # mongodb is SSPLv1, C++ driver is APACHE20
+LICENSE_COMB=	multi
+LICENSE_NAME_SSPLv1=	Server Side Public License Version 1
+LICENSE_FILE_SSPLv1=	${WRKSRC}/LICENSE-Community.txt
+LICENSE_PERMS_SSPLv1=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
+
+ONLY_FOR_ARCHS=	aarch64 amd64 powerpc64le
+ONLY_FOR_ARCHS_REASON=	only ported to amd64, aarch64, and powerpc64le on FreeBSD; upstream supports arm64, ppc64le, s390x, and x86-64
+
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cheetah3>0:devel/py-cheetah3@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}packaging>0:devel/py-packaging@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}psutil>0:sysutils/py-psutil@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pymongo>0:databases/py-pymongo@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}yaml>=3.11:devel/py-yaml@${PY_FLAVOR}
+# build depends used while running ${WRKSRC}/src/third_party/mozjs/gen-config.sh
+BUILD_DEPENDS+=	autoconf2.13:devel/autoconf2.13 \
+		gsed:textproc/gsed
+LIB_DEPENDS=	libcurl.so:ftp/curl \
+		libicuuc.so:devel/icu \
+		libpcre.so:devel/pcre \
+		libsnappy.so:archivers/snappy \
+		libstemmer.so:textproc/snowballstemmer \
+		libunwind.so:devel/libunwind \
+		libyaml-cpp.so:devel/yaml-cpp \
+		libzstd.so:archivers/zstd
+
+USES=		compiler:c++17-lang cpe python:build scons shebangfix
+# gmake is used while running ${WRKSRC}/src/third_party/mozjs/gen-config.sh
+USES+=		gmake pkgconfig
+
+# mozjs tag comes from ${WRKSRC}/src/third_party/mozjs/get-sources.sh
+MOZJS_TAG=	82aac6af18abcd5bf188afbc821779ccb0ca0902
+
+USE_GITHUB=	yes
+GH_ACCOUNT=	mongodb mongodb-forks:mozjs
+GH_PROJECT=	mongo spidermonkey:mozjs
+GH_TAGNAME=	${MOZJS_TAG}:mozjs
+USE_RC_SUBR=	mongod
+
+SHEBANG_FILES=	buildscripts/scons.py
+python_OLD_CMD=	@python_interpreter@
+
+MAKE_ARGS=	--cxx-std=17 \
+		--disable-warnings-as-errors \
+		--libc++ \
+		--runtime-hardening=on \
+		--use-system-icu \
+		--use-system-libunwind \
+		--use-system-pcre \
+		--use-system-snappy \
+		--use-system-stemmer \
+		--use-system-yaml \
+		--use-system-zlib \
+		--use-system-zstd \
+		-j${MAKE_JOBS_NUMBER} \
+		AR=llvm-ar \
+		MONGO_VERSION=${DISTVERSION} \
+		VERBOSE=on
+
+CFLAGS+=	-DBOOST_NO_CXX98_FUNCTION_BASE
+
+CONFLICTS_INSTALL=	mongodb[0-9][0-9]
+
+USERS=		mongodb
+GROUPS=		mongodb
+
+OPTIONS_DEFINE=		LTO SASL SSL NOAVX
+OPTIONS_DEFAULT=	LTO SASL SSL
+
+NOAVX_DESC=	"Disable AVX instructions on amd64 (Sandybridge+)"
+
+LTO_MAKE_ARGS=	--lto=on
+
+NOAVX_MAKE_ARGS=	--experimental-optimization="-sandybridge"
+
+SASL_LIB_DEPENDS=	libsasl2.so:security/cyrus-sasl2
+SASL_MAKE_ARGS=		--use-sasl-client
+
+SSL_USES=	ssl
+SSL_MAKE_ARGS=	--ssl
+
+.include <bsd.port.pre.mk>
+
+ALL_TARGET=	install-core
+
+# This ports is only following the Major Release.
+# https://docs.mongodb.com/manual/reference/versioning/
+PORTSCOUT=	limit:^6\.0\.
+
+CPE_PRODUCT=	mongodb
+
+.if ${ARCH} == amd64
+MOZJS_ARCH=	x86_64
+.elif ${ARCH} == powerpc64le
+MOZJS_ARCH=	ppc64le
+.elif ${ARCH} == aarch64
+MOZJS_ARCH=	${ARCH}
+.endif
+
+post-patch:
+	${RM} -rf ${WRKSRC}/src/third_party/icu4c-*
+	${RM} -rf ${WRKSRC}/src/third_party/pcre-*
+	${RM} -rf ${WRKSRC}/src/third_party/snappy-*
+	${RM} -rf ${WRKSRC}/src/third_party/libstemmer_c
+	${RM} -rf ${WRKSRC}/src/third_party/unwind
+	${RM} -rf ${WRKSRC}/src/third_party/yaml-cpp
+	${RM} -rf ${WRKSRC}/src/third_party/zlib-*
+	${RM} -rf ${WRKSRC}/src/third_party/zstandard
+
+# fix build with python-3.11
+	${REINPLACE_CMD} -e 's#rU#r#g' ${WRKDIR}/spidermonkey-${MOZJS_TAG}/python/mozbuild/mozbuild/util.py
+	${REINPLACE_CMD} -e 's#rU#r#g' ${WRKDIR}/spidermonkey-${MOZJS_TAG}/python/mozbuild/mozbuild/preprocessor.py
+	${REINPLACE_CMD} -e 's#rU#r#g' ${WRKDIR}/spidermonkey-${MOZJS_TAG}/python/mozbuild/mozbuild/backend/base.py
+	${REINPLACE_CMD} -e 's#rU#r#g' ${WRKDIR}/spidermonkey-${MOZJS_TAG}/python/mozbuild/mozbuild/action/process_define_files.py
+
+do-configure:
+# Replacement of ${WRKSRC}/src/third_party/mozjs/get-sources.sh
+	${LN} -sF ${WRKDIR}/spidermonkey-${MOZJS_TAG} ${WRKSRC}/src/third_party/mozjs/mozilla-release
+	cd ${WRKSRC}/src/third_party/mozjs/mozilla-release/js/src && ${LOCALBASE}/bin/autoconf2.13
+	cd ${WRKSRC}/src/third_party/mozjs && PYTHON3="${PYTHON_CMD}" ${SH} ./gen-config.sh ${MOZJS_ARCH} freebsd
+
+do-build:
+	${WRKSRC}/buildscripts/scons.py	-C ${WRKSRC} ${MAKE_ARGS}
+
+do-install:
+.for f in mongod mongos
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${f}
+.endfor
+	${INSTALL_DATA} ${WRKSRC}/rpm/mongod.conf ${STAGEDIR}${PREFIX}/etc/mongodb.conf.sample
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+.for doc in LICENSE-Community.txt MPL-2 README THIRD-PARTY-NOTICES
+	${MV} ${STAGEDIR}${PREFIX}/${doc} ${STAGEDIR}${DOCSDIR}/
+.endfor
+	${RM} ${STAGEDIR}${PREFIX}/bin/resmoke.py
+
+.include <bsd.port.post.mk>
diff --git a/databases/mongodb60/distinfo b/databases/mongodb60/distinfo
new file mode 100644
index 000000000000..7ee1f90d920c
--- /dev/null
+++ b/databases/mongodb60/distinfo
@@ -0,0 +1,5 @@
+TIMESTAMP = 1709336837
+SHA256 (mongodb-mongo-r6.0.14_GH0.tar.gz) = c4625d19c38036df4dd8ea474bdddb852d5e60b4df0563248f813f3a97235be2
+SIZE (mongodb-mongo-r6.0.14_GH0.tar.gz) = 91244689
+SHA256 (mongodb-forks-spidermonkey-82aac6af18abcd5bf188afbc821779ccb0ca0902_GH0.tar.gz) = a365bf54ef4e4fd6a136cf6afa9c620ba0c8982402473b9bfac38928a688a9e0
+SIZE (mongodb-forks-spidermonkey-82aac6af18abcd5bf188afbc821779ccb0ca0902_GH0.tar.gz) = 141291901
diff --git a/databases/mongodb60/files/mongod.in b/databases/mongodb60/files/mongod.in
new file mode 100644
index 000000000000..20b0f5c0f43d
--- /dev/null
+++ b/databases/mongodb60/files/mongod.in
@@ -0,0 +1,53 @@
+#!/bin/sh
+
+# PROVIDE: mongod
+# REQUIRE: NETWORK ldconfig
+# KEYWORD: shutdown
+#
+# Add the following lines to /etc/rc.conf.local or /etc/rc.conf
+# to enable this service:
+#
+# mongod_enable (bool):  Set to "NO" by default.
+#                        Set it to "YES" to enable mongod.
+# mongod_dbpath (str):   Default to "/var/db/mongodb"
+#                        Base database directory.
+# mongod_flags (str):    Custom additional arguments to be passed to mongod.
+#                        Default to "--logpath ${mongod_dbpath}/mongod.log --logappend".
+# mongod_config (str):	 Default to "%%PREFIX%%/etc/mongodb.conf"
+#                        Path to config file
+#
+
+. /etc/rc.subr
+
+name="mongod"
+rcvar=mongod_enable
+
+load_rc_config $name
+
+: ${mongod_enable="NO"}
+: ${mongod_dbpath="/var/db/mongodb"}
+: ${mongod_flags="--logpath ${mongod_dbpath}/mongod.log --logappend --setParameter=disabledSecureAllocatorDomains=\*"}
+: ${mongod_user="mongodb"}
+: ${mongod_group="mongodb"}
+: ${mongod_config="%%PREFIX%%/etc/mongodb.conf"}
+
+pidfile="${mongod_dbpath}/mongod.lock"
+command=%%PREFIX%%/bin/${name}
+command_args="--config $mongod_config --dbpath $mongod_dbpath --fork >/dev/null 2>/dev/null"
+start_precmd="${name}_prestart"
+
+mongod_create_dbpath()
+{
+        mkdir ${mongod_dbpath} >/dev/null 2>/dev/null
+        [ $? -eq 0 ] && chown -R ${mongod_user}:${mongod_group} ${mongod_dbpath}
+}
+
+mongod_prestart()
+{
+        if [ ! -d ${mongod_dbpath} ]; then
+                mongod_create_dbpath || return 1
+        fi
+        return 0
+}
+
+run_rc_command "$1"
diff --git a/databases/mongodb60/files/patch-SConstruct b/databases/mongodb60/files/patch-SConstruct
new file mode 100644
index 000000000000..84d453d69e95
--- /dev/null
+++ b/databases/mongodb60/files/patch-SConstruct
@@ -0,0 +1,44 @@
+--- SConstruct.orig	2022-08-05 16:21:29 UTC
++++ SConstruct
+@@ -1342,9 +1342,9 @@ if has_option('variables-help'):
+     print(env_vars.GenerateHelpText(env))
+     Exit(0)
+ 
+-unknown_vars = env_vars.UnknownVariables()
+-if unknown_vars:
+-    env.FatalError("Unknown variables specified: {0}", ", ".join(list(unknown_vars.keys())))
++#unknown_vars = env_vars.UnknownVariables()
++#if unknown_vars:
++#    env.FatalError("Unknown variables specified: {0}", ", ".join(list(unknown_vars.keys())))
+ 
+ if get_option('install-action') != 'default' and get_option('ninja') != "disabled":
+     env.FatalError("Cannot use non-default install actions when generating Ninja.")
+@@ -2427,13 +2427,12 @@ if env.TargetOSIs('posix'):
+             # If runtime hardening is requested, then build anything
+             # destined for an executable with the necessary flags for PIE.
+             env.AppendUnique(
+-                PROGCCFLAGS=['-fPIE'],
++                PROGCCFLAGS=['-fpic'],
+                 PROGLINKFLAGS=['-pie'],
+             )
+ 
+     # -Winvalid-pch Warn if a precompiled header (see Precompiled Headers) is found in the search path but can't be used.
+     env.Append( CCFLAGS=["-fasynchronous-unwind-tables",
+-                         "-ggdb" if not env.TargetOSIs('emscripten') else "-g",
+                          "-Wall",
+                          "-Wsign-compare",
+                          "-Wno-unknown-pragmas",
+@@ -2600,8 +2599,12 @@ if not env.TargetOSIs('windows', 'macOS') and (env.Too
+     # setting it for both C and C++ by setting both of CFLAGS and
+     # CXXFLAGS.
+ 
++    arm_march_flag = "armv8-a"
++    if get_option('use-hardware-crc32') == "on":
++        arm_march_flag += "+crc"
++
+     default_targeting_flags_for_architecture = {
+-        "aarch64"    : { "-march=" : "armv8.2-a",    "-mtune=" : "generic"                        },
++        "aarch64"    : { "-march=" : arm_march_flag, "-mtune=" : "generic"                        },
+         "i386"       : { "-march=" : "nocona",       "-mtune=" : "generic"                        },
+         "ppc64le"    : { "-mcpu="  : "power8",       "-mtune=" : "power8", "-mcmodel=" : "medium" },
+         "s390x"      : { "-march=" : "z196",         "-mtune=" : "zEC12"                          },
diff --git a/databases/mongodb60/files/patch-boost179-link-fix b/databases/mongodb60/files/patch-boost179-link-fix
new file mode 100644
index 000000000000..157ebaaf0221
--- /dev/null
+++ b/databases/mongodb60/files/patch-boost179-link-fix
@@ -0,0 +1,21 @@
+--- SConstruct
++++ SConstruct
+@@ -3511,17 +3511,11 @@ def doConfigure(myenv):
+             "BOOST_LOG_NO_SHORTHAND_NAMES",
+             "BOOST_LOG_USE_NATIVE_SYSLOG",
+             "BOOST_LOG_WITHOUT_THREAD_ATTR",
++            "BOOST_LOG_DYN_LINK",
+             "ABSL_FORCE_ALIGNED_ACCESS",
+         ]
+     )
+ 
+-    if link_model.startswith("dynamic") and not link_model == 'dynamic-sdk':
+-        conf.env.AppendUnique(
+-            CPPDEFINES=[
+-                "BOOST_LOG_DYN_LINK",
+-            ]
+-    )
+-
+     if use_system_version_of_library("boost"):
+         if not conf.CheckCXXHeader( "boost/filesystem/operations.hpp" ):
+             myenv.ConfError("can't find boost headers")
diff --git a/databases/mongodb60/files/patch-boost179-system-compat-fix b/databases/mongodb60/files/patch-boost179-system-compat-fix
new file mode 100644
index 000000000000..bb991c72455d
--- /dev/null
+++ b/databases/mongodb60/files/patch-boost179-system-compat-fix
@@ -0,0 +1,108 @@
+diff --git a/src/mongo/db/auth/security_key_test.cpp b/src/mongo/db/auth/security_key_test.cpp
+index 96f95829..e64aded8 100644
+--- src/mongo/db/auth/security_key_test.cpp
++++ src/mongo/db/auth/security_key_test.cpp
+@@ -30,6 +30,7 @@
+ #include "mongo/platform/basic.h"
+ 
+ #include <boost/filesystem.hpp>
++#include <boost/filesystem/fstream.hpp>
+ 
+ #include "mongo/base/string_data.h"
+ #include "mongo/db/auth/authorization_manager.h"
+diff --git a/src/mongo/db/repl/tenant_migration_shard_merge_util.cpp b/src/mongo/db/repl/tenant_migration_shard_merge_util.cpp
+index 05779a48..011c49e7 100644
+--- src/mongo/db/repl/tenant_migration_shard_merge_util.cpp
++++ src/mongo/db/repl/tenant_migration_shard_merge_util.cpp
+@@ -32,6 +32,7 @@
+ #include "mongo/db/repl/tenant_migration_shard_merge_util.h"
+ 
+ #include <boost/filesystem.hpp>
++#include <boost/filesystem/fstream.hpp>
+ #include <boost/filesystem/operations.hpp>
+ #include <boost/filesystem/path.hpp>
+ #include <fmt/format.h>
+diff --git a/src/mongo/db/storage/storage_repair_observer.cpp b/src/mongo/db/storage/storage_repair_observer.cpp
+index 22b76a6a..ec5bcece 100644
+--- src/mongo/db/storage/storage_repair_observer.cpp
++++ src/mongo/db/storage/storage_repair_observer.cpp
+@@ -41,6 +41,7 @@
+ #include <sys/types.h>
+ #endif
+ 
++#include <boost/filesystem/fstream.hpp>
+ #include <boost/filesystem/path.hpp>
+ 
+ #include "mongo/db/dbhelpers.h"
+diff --git a/src/mongo/db/storage/wiredtiger/wiredtiger_kv_engine.cpp b/src/mongo/db/storage/wiredtiger/wiredtiger_kv_engine.cpp
+index 2c5a6ed5..6c98c384 100644
+--- src/mongo/db/storage/wiredtiger/wiredtiger_kv_engine.cpp
++++ src/mongo/db/storage/wiredtiger/wiredtiger_kv_engine.cpp
+@@ -48,6 +48,7 @@
+ #include "mongo/db/storage/wiredtiger/wiredtiger_kv_engine.h"
+ 
+ #include <boost/filesystem.hpp>
++#include <boost/filesystem/fstream.hpp>
+ #include <boost/filesystem/operations.hpp>
+ #include <boost/filesystem/path.hpp>
+ #include <boost/system/error_code.hpp>
+diff --git a/src/mongo/db/storage/wiredtiger/wiredtiger_kv_engine_test.cpp b/src/mongo/db/storage/wiredtiger/wiredtiger_kv_engine_test.cpp
+index 9917d95e..c4073444 100644
+--- src/mongo/db/storage/wiredtiger/wiredtiger_kv_engine_test.cpp
++++ src/mongo/db/storage/wiredtiger/wiredtiger_kv_engine_test.cpp
+@@ -34,6 +34,7 @@
+ #include "mongo/db/storage/kv/kv_engine_test_harness.h"
+ 
+ #include <boost/filesystem.hpp>
++#include <boost/filesystem/fstream.hpp>
+ #include <boost/filesystem/path.hpp>
+ #include <memory>
+ 
+diff --git a/src/mongo/db/storage/wiredtiger/wiredtiger_util.cpp b/src/mongo/db/storage/wiredtiger/wiredtiger_util.cpp
+index de31ec10..c29fbd33 100644
+--- src/mongo/db/storage/wiredtiger/wiredtiger_util.cpp
++++ src/mongo/db/storage/wiredtiger/wiredtiger_util.cpp
+@@ -36,6 +36,7 @@
+ #include <limits>
+ 
+ #include <boost/filesystem.hpp>
++#include <boost/filesystem/fstream.hpp>
+ #include <boost/filesystem/path.hpp>
+ 
+ #include "mongo/base/simple_string_data_comparator.h"
+diff --git a/src/mongo/shell/shell_utils_extended.cpp b/src/mongo/shell/shell_utils_extended.cpp
+index 6cd6dc6e..318d6a8d 100644
+--- src/mongo/shell/shell_utils_extended.cpp
++++ src/mongo/shell/shell_utils_extended.cpp
+@@ -37,6 +37,7 @@
+ #endif
+ 
+ #include <boost/filesystem.hpp>
++#include <boost/filesystem/fstream.hpp>
+ #include <fmt/format.h>
+ #include <fstream>
+ 
+diff --git a/src/mongo/util/processinfo_linux.cpp b/src/mongo/util/processinfo_linux.cpp
+index 37e3d2ea..9027110d 100644
+--- src/mongo/util/processinfo_linux.cpp
++++ src/mongo/util/processinfo_linux.cpp
+@@ -36,6 +36,7 @@
+ #include <iostream>
+ #include <malloc.h>
+ #include <pcrecpp.h>
++#include <fstream>
+ #include <sched.h>
+ #include <stdio.h>
+ #include <sys/mman.h>
+diff --git a/src/mongo/util/stacktrace_threads.cpp b/src/mongo/util/stacktrace_threads.cpp
+index d7157d0e..3aca6357 100644
+--- src/mongo/util/stacktrace_threads.cpp
++++ src/mongo/util/stacktrace_threads.cpp
+@@ -36,6 +36,7 @@
+ #include <array>
+ #include <atomic>
+ #include <boost/filesystem.hpp>
++#include <boost/filesystem/fstream.hpp>
+ #include <cstdint>
+ #include <cstdlib>
+ #include <dirent.h>
diff --git a/databases/mongodb60/files/patch-buildscripts_scons.py b/databases/mongodb60/files/patch-buildscripts_scons.py
new file mode 100644
index 000000000000..20d0429965af
--- /dev/null
+++ b/databases/mongodb60/files/patch-buildscripts_scons.py
@@ -0,0 +1,25 @@
+--- buildscripts/scons.py.orig	2021-08-23 09:10:10 UTC
++++ buildscripts/scons.py
+@@ -18,14 +18,14 @@ SITE_TOOLS_DIR = os.path.join(MONGODB_ROOT, 'site_scon
+ 
+ sys.path = [SCONS_DIR, SITE_TOOLS_DIR] + sys.path
+ 
+-# pylint: disable=C0413
+-from mongo.pip_requirements import verify_requirements, MissingRequirements
+-
+-try:
+-    verify_requirements('etc/pip/compile-requirements.txt')
+-except MissingRequirements as ex:
+-    print(ex)
+-    sys.exit(1)
++## pylint: disable=C0413
++#from mongo.pip_requirements import verify_requirements, MissingRequirements
++#
++#try:
++#    verify_requirements('etc/pip/compile-requirements.txt')
++#except MissingRequirements as ex:
++#    print(ex)
++#    sys.exit(1)
+ 
+ try:
+     import SCons.Script
diff --git a/databases/mongodb60/files/patch-rpm_mongod.conf b/databases/mongodb60/files/patch-rpm_mongod.conf
new file mode 100644
index 000000000000..b742b1604402
--- /dev/null
+++ b/databases/mongodb60/files/patch-rpm_mongod.conf
@@ -0,0 +1,16 @@
+--- rpm/mongod.conf.orig	2023-04-28 08:22:02 UTC
++++ rpm/mongod.conf
+@@ -7,11 +7,11 @@ systemLog:
+ systemLog:
+   destination: file
+   logAppend: true
+-  path: /var/log/mongodb/mongod.log
++  path: /var/db/mongodb/mongod.log 
+ 
+ # Where and how to store data.
+ storage:
+-  dbPath: /var/lib/mongo
++  dbPath: /var/db/mongodb 
+   journal:
+     enabled: true
+ #  engine:
diff --git a/databases/mongodb60/files/patch-src_mongo_db_fts_stemmer.h b/databases/mongodb60/files/patch-src_mongo_db_fts_stemmer.h
new file mode 100644
index 000000000000..9b235ec0c7e0
--- /dev/null
+++ b/databases/mongodb60/files/patch-src_mongo_db_fts_stemmer.h
@@ -0,0 +1,11 @@
+--- src/mongo/db/fts/stemmer.h.orig	2022-09-26 08:31:59 UTC
++++ src/mongo/db/fts/stemmer.h
+@@ -32,7 +32,7 @@
+ 
+ #include "mongo/base/string_data.h"
+ #include "mongo/db/fts/fts_language.h"
+-#include "third_party/libstemmer_c/include/libstemmer.h"
++#include "libstemmer.h"
+ 
+ namespace mongo {
+ 
diff --git a/databases/mongodb60/files/patch-src_mongo_platform_process__id.cpp b/databases/mongodb60/files/patch-src_mongo_platform_process__id.cpp
new file mode 100644
index 000000000000..11f61a36ca08
--- /dev/null
+++ b/databases/mongodb60/files/patch-src_mongo_platform_process__id.cpp
@@ -0,0 +1,24 @@
+--- src/mongo/platform/process_id.cpp.orig	2021-03-26 23:29:14 UTC
++++ src/mongo/platform/process_id.cpp
+@@ -35,6 +35,10 @@
+ #include <pthread.h>
+ #endif
+ 
++#if defined(__FreeBSD__)
++#include <pthread_np.h>
++#endif
++
+ #if defined(__linux__)
+ #include <sys/syscall.h>
+ #include <sys/types.h>
+@@ -72,6 +76,10 @@ inline NativeProcessId getCurrentNativeThreadId() {
+     uint64_t tid;
+     invariant(::pthread_threadid_np(NULL, &tid) == 0);
+     return tid;
++}
++#elif __FreeBSD__
++inline NativeProcessId getCurrentNativeThreadId() {
++    return pthread_getthreadid_np();
+ }
+ #else
+ inline NativeProcessId getCurrentNativeThreadId() {
diff --git a/databases/mongodb60/files/patch-src_third__party_boost_boost_mpl_aux___integral__wrapper.hpp b/databases/mongodb60/files/patch-src_third__party_boost_boost_mpl_aux___integral__wrapper.hpp
new file mode 100644
index 000000000000..a45dcb0f2340
--- /dev/null
+++ b/databases/mongodb60/files/patch-src_third__party_boost_boost_mpl_aux___integral__wrapper.hpp
@@ -0,0 +1,11 @@
+--- src/third_party/boost/boost/mpl/aux_/integral_wrapper.hpp.orig	2023-06-30 20:32:00 UTC
++++ src/third_party/boost/boost/mpl/aux_/integral_wrapper.hpp
+@@ -56,7 +56,7 @@ struct AUX_WRAPPER_NAME
+ // have to #ifdef here: some compilers don't like the 'N + 1' form (MSVC),
+ // while some other don't like 'value + 1' (Borland), and some don't like
+ // either
+-#if BOOST_WORKAROUND(__EDG_VERSION__, <= 243)
++#if 1 //BOOST_WORKAROUND(__EDG_VERSION__, <= 243)
+  private:
+     BOOST_STATIC_CONSTANT(AUX_WRAPPER_VALUE_TYPE, next_value = BOOST_MPL_AUX_STATIC_CAST(AUX_WRAPPER_VALUE_TYPE, (N + 1)));
+     BOOST_STATIC_CONSTANT(AUX_WRAPPER_VALUE_TYPE, prior_value = BOOST_MPL_AUX_STATIC_CAST(AUX_WRAPPER_VALUE_TYPE, (N - 1)));
diff --git a/databases/mongodb60/files/patch-src_third__party_mozjs_gen-config.sh b/databases/mongodb60/files/patch-src_third__party_mozjs_gen-config.sh
new file mode 100644
index 000000000000..58daab4bc056
--- /dev/null
+++ b/databases/mongodb60/files/patch-src_third__party_mozjs_gen-config.sh
@@ -0,0 +1,30 @@
+--- src/third_party/mozjs/gen-config.sh.orig	2022-08-05 16:21:29 UTC
++++ src/third_party/mozjs/gen-config.sh
+@@ -29,6 +29,9 @@ case "$_Path" in
+ }
+ 
+ case "$_Path" in
++    "platform/aarch64/freebsd")
++        _CONFIG_OPTS="--host=aarch64-freebsd"
++	;;
+     "platform/aarch64/linux")
+         _CONFIG_OPTS="--host=aarch64-linux"
+     ;;
+@@ -108,7 +111,7 @@ CFLAGS="$CFLAGS -D__STDC_FORMAT_MACROS" \
+     --disable-js-shell \
+     --disable-tests "$_CONFIG_OPTS"
+ 
+-make recurse_export
++gmake recurse_export
+ 
+ cd ../../../..
+ 
+@@ -159,7 +162,7 @@ find "$_Path/build" -name '*.cpp' |
+ find "$_Path/build" -name '*.cpp' |
+     while read unified_file ; do
+         echo "Processing $unified_file"
+-        sed $SEDOPTION \
++        gsed $SEDOPTION \
+             -e 's|#include ".*/js/src/|#include "|' \
+             -e 's|#error ".*/js/src/|#error "|' \
+             "$unified_file"
diff --git a/databases/mongodb60/files/patch-src_third__party_mozjs_get-sources.sh b/databases/mongodb60/files/patch-src_third__party_mozjs_get-sources.sh
new file mode 100644
index 000000000000..1ae6264dc459
--- /dev/null
+++ b/databases/mongodb60/files/patch-src_third__party_mozjs_get-sources.sh
@@ -0,0 +1,14 @@
+--- src/third_party/mozjs/get-sources.sh.orig	2022-09-08 09:53:27 UTC
++++ src/third_party/mozjs/get-sources.sh
+@@ -12,9 +12,9 @@ LIB_GIT_REPO=git@github.com:mongodb-forks/spidermonkey
+ LIB_GIT_REVISION=82aac6af18abcd5bf188afbc821779ccb0ca0902
+ LIB_GIT_REPO=git@github.com:mongodb-forks/spidermonkey.git
+ 
+-DEST_DIR=$(git rev-parse --show-toplevel)/src/third_party/mozjs
++DEST_DIR=$(realpath .)
+ 
+-LIB_GIT_DIR=$(mktemp -d /tmp/import-spidermonkey.XXXXXX)
++LIB_GIT_DIR=$(mktemp -d /var/tmp/import-spidermonkey.XXXXXX)
+ trap "rm -rf $LIB_GIT_DIR" EXIT
+ 
+ git clone $LIB_GIT_REPO $LIB_GIT_DIR
diff --git a/databases/mongodb60/pkg-descr b/databases/mongodb60/pkg-descr
new file mode 100644
index 000000000000..59930ca8f679
--- /dev/null
+++ b/databases/mongodb60/pkg-descr
@@ -0,0 +1,3 @@
+Mongo (from "humongous") is a high-performance, open source,
+schema-free, document-oriented database. A common name in the
+"NOSQL" community.
diff --git a/databases/mongodb60/pkg-message b/databases/mongodb60/pkg-message
new file mode 100644
index 000000000000..43e45ca6a35a
--- /dev/null
+++ b/databases/mongodb60/pkg-message
@@ -0,0 +1,8 @@
+[
+{ type: install
+  message: <<EOM
+MongoDB on Rasperry Pi can work but is unsupported upstream.
+Please read https://jira.mongodb.org/browse/SERVER-71772 if you run this on a non-LSE ARM cpu.
+EOM
+}
+]
diff --git a/databases/mongodb60/pkg-plist b/databases/mongodb60/pkg-plist
new file mode 100644
index 000000000000..feaf3313657d
--- /dev/null
+++ b/databases/mongodb60/pkg-plist
@@ -0,0 +1,7 @@
+bin/mongod
+bin/mongos
+@sample etc/mongodb.conf.sample
+%%DOCSDIR%%/LICENSE-Community.txt
+%%DOCSDIR%%/MPL-2
+%%DOCSDIR%%/README
+%%DOCSDIR%%/THIRD-PARTY-NOTICES
diff --git a/databases/mongodb70/Makefile b/databases/mongodb70/Makefile
new file mode 100644
index 000000000000..e2e66e3223a8
--- /dev/null
+++ b/databases/mongodb70/Makefile
@@ -0,0 +1,151 @@
+PORTNAME=	mongodb
+DISTVERSIONPREFIX=	r
+DISTVERSION=	7.0.8
+CATEGORIES=	databases net
+PKGNAMESUFFIX=	${DISTVERSION:R:S/.//}
+
+MAINTAINER=	ronald@FreeBSD.org
+COMMENT=	Distributed document-oriented "NoSQL" database (7.0.x Branch)
+WWW=		https://www.mongodb.com/docs/v7.0/
+
+LICENSE=	APACHE20 SSPLv1 # mongodb is SSPLv1, C++ driver is APACHE20
+LICENSE_COMB=	multi
+LICENSE_NAME_SSPLv1=	Server Side Public License Version 1
+LICENSE_FILE_SSPLv1=	${WRKSRC}/LICENSE-Community.txt
+LICENSE_PERMS_SSPLv1=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
+
+ONLY_FOR_ARCHS=	aarch64 amd64 powerpc64le
+ONLY_FOR_ARCHS_REASON=	only ported to amd64, aarch64, and powerpc64le on FreeBSD; upstream supports arm64, ppc64le, s390x, and x86-64
+
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cheetah3>0:devel/py-cheetah3@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}packaging>0:devel/py-packaging@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}psutil>0:sysutils/py-psutil@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pymongo>0:databases/py-pymongo@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}yaml>=3.11:devel/py-yaml@${PY_FLAVOR}
+# build depends used while running ${WRKSRC}/src/third_party/mozjs/gen-config.sh
+BUILD_DEPENDS+=	autoconf2.13:devel/autoconf2.13 \
+		gsed:textproc/gsed
+LIB_DEPENDS=	libcurl.so:ftp/curl \
+		libpcre2-8.so:devel/pcre2 \
+		libsnappy.so:archivers/snappy \
+		libstemmer.so:textproc/snowballstemmer \
+		libunwind.so:devel/libunwind \
+		libyaml-cpp.so:devel/yaml-cpp \
+		libzstd.so:archivers/zstd
+
+USES=		compiler:c++20-lang cpe python:build scons shebangfix
+# gmake is used while running ${WRKSRC}/src/third_party/mozjs/gen-config.sh
+USES+=		gmake pkgconfig
+
+# mozjs tag comes from ${WRKSRC}/src/third_party/mozjs/get-sources.sh
+MOZJS_TAG=	82aac6af18abcd5bf188afbc821779ccb0ca0902
+
+USE_GITHUB=	yes
+GH_ACCOUNT=	mongodb mongodb-forks:mozjs
+GH_PROJECT=	mongo spidermonkey:mozjs
+GH_TAGNAME=	${MOZJS_TAG}:mozjs
+USE_RC_SUBR=	mongod
+
+SHEBANG_FILES=	buildscripts/scons.py
+python_OLD_CMD=	@python_interpreter@
+
+MAKE_ARGS=	--allocator=system \
+		--cxx-std=20 \
+		--disable-warnings-as-errors \
+		--libc++ \
+		--runtime-hardening=on \
+		--use-system-libunwind \
+		--use-system-pcre2 \
+		--use-system-snappy \
+		--use-system-stemmer \
+		--use-system-yaml \
+		--use-system-zlib \
+		--use-system-zstd \
+		-j${MAKE_JOBS_NUMBER} \
+		AR=llvm-ar \
+		MONGO_VERSION=${DISTVERSION} \
+		VERBOSE=on
+
+CFLAGS+=	-DBOOST_NO_CXX98_FUNCTION_BASE
+
+CONFLICTS_INSTALL=	mongodb[0-9][0-9]
+
+USERS=		mongodb
+GROUPS=		mongodb
+
+OPTIONS_DEFINE=		LTO SASL SSL NOAVX
+OPTIONS_DEFINE_aarch64=	ARMV80A
+OPTIONS_DEFAULT=	SASL SSL
+
+# MongoDB on non-LSE ARM cpu like Raspberry Pi can work but is unsupported upstream.
+# Can give corruption on high concurrency.
+# Please read https://jira.mongodb.org/browse/SERVER-71772.
+ARMV80A_DESC=	Enable non-LSE ARM64 CPUs like RPI4.
+NOAVX_DESC=	"Disable AVX instructions on amd64 (Sandybridge+)"
+
+ARMV80A_EXTRA_PATCHES=	${FILESDIR}/extrapatch-SConstruct
+
+LTO_MAKE_ARGS=	--lto=on
+
+NOAVX_MAKE_ARGS=	--experimental-optimization="-sandybridge"
+
+SASL_LIB_DEPENDS=	libsasl2.so:security/cyrus-sasl2
+SASL_MAKE_ARGS=		--use-sasl-client
+
+SSL_USES=	ssl
+SSL_MAKE_ARGS=	--ssl
+
+.include <bsd.port.pre.mk>
+
+ALL_TARGET=	install-core
+
+# This ports is only following the Major Release.
+# https://docs.mongodb.com/manual/reference/versioning/
+PORTSCOUT=	limit:^7\.0\.
+
+CPE_PRODUCT=	mongodb
+
+.if ${ARCH} == amd64
+MOZJS_ARCH=	x86_64
+.elif ${ARCH} == powerpc64le
+MOZJS_ARCH=	ppc64le
+.elif ${ARCH} == aarch64
+MOZJS_ARCH=	${ARCH}
+.endif
+
+post-patch:
+	${RM} -rf ${WRKSRC}/src/third_party/pcre2
+	${RM} -rf ${WRKSRC}/src/third_party/snappy-*
+	${RM} -rf ${WRKSRC}/src/third_party/libstemmer_c
+	${RM} -rf ${WRKSRC}/src/third_party/unwind
+	${RM} -rf ${WRKSRC}/src/third_party/yaml-cpp
+	${RM} -rf ${WRKSRC}/src/third_party/zlib-*
+	${RM} -rf ${WRKSRC}/src/third_party/zstandard
+
+# fix build with python-3.11
+	${REINPLACE_CMD} -e 's#rU#r#g' ${WRKDIR}/spidermonkey-${MOZJS_TAG}/python/mozbuild/mozbuild/util.py
+	${REINPLACE_CMD} -e 's#rU#r#g' ${WRKDIR}/spidermonkey-${MOZJS_TAG}/python/mozbuild/mozbuild/preprocessor.py
+	${REINPLACE_CMD} -e 's#rU#r#g' ${WRKDIR}/spidermonkey-${MOZJS_TAG}/python/mozbuild/mozbuild/backend/base.py
+	${REINPLACE_CMD} -e 's#rU#r#g' ${WRKDIR}/spidermonkey-${MOZJS_TAG}/python/mozbuild/mozbuild/action/process_define_files.py
+
+do-configure:
+# Replacement of ${WRKSRC}/src/third_party/mozjs/get-sources.sh
+	${LN} -sF ${WRKDIR}/spidermonkey-${MOZJS_TAG} ${WRKSRC}/src/third_party/mozjs/mozilla-release
+	cd ${WRKSRC}/src/third_party/mozjs/mozilla-release/js/src && ${LOCALBASE}/bin/autoconf2.13
+	cd ${WRKSRC}/src/third_party/mozjs && PYTHON3="${PYTHON_CMD}" ${SH} ./gen-config.sh ${MOZJS_ARCH} freebsd
+
+do-build:
+	${WRKSRC}/buildscripts/scons.py	-C ${WRKSRC} ${MAKE_ARGS}
+
+do-install:
+.for f in mongod mongos
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${f}
+.endfor
+	${INSTALL_DATA} ${WRKSRC}/rpm/mongod.conf ${STAGEDIR}${PREFIX}/etc/mongodb.conf.sample
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+.for doc in LICENSE-Community.txt MPL-2 README THIRD-PARTY-NOTICES
+	${MV} ${STAGEDIR}${PREFIX}/${doc} ${STAGEDIR}${DOCSDIR}/
+.endfor
+	${RM} ${STAGEDIR}${PREFIX}/bin/resmoke.py
+
+.include <bsd.port.post.mk>
diff --git a/databases/mongodb70/distinfo b/databases/mongodb70/distinfo
new file mode 100644
index 000000000000..43a5609aa0c3
--- /dev/null
+++ b/databases/mongodb70/distinfo
@@ -0,0 +1,5 @@
+TIMESTAMP = 1712401409
+SHA256 (mongodb-mongo-r7.0.8_GH0.tar.gz) = b65a84474639e7f8826b6912f776e6a38fe320be897d1e7d1cf5d1389616a34c
+SIZE (mongodb-mongo-r7.0.8_GH0.tar.gz) = 113731549
+SHA256 (mongodb-forks-spidermonkey-82aac6af18abcd5bf188afbc821779ccb0ca0902_GH0.tar.gz) = a365bf54ef4e4fd6a136cf6afa9c620ba0c8982402473b9bfac38928a688a9e0
+SIZE (mongodb-forks-spidermonkey-82aac6af18abcd5bf188afbc821779ccb0ca0902_GH0.tar.gz) = 141291901
diff --git a/databases/mongodb70/files/extrapatch-SConstruct b/databases/mongodb70/files/extrapatch-SConstruct
new file mode 100644
index 000000000000..05946bd82cdc
--- /dev/null
+++ b/databases/mongodb70/files/extrapatch-SConstruct
@@ -0,0 +1,16 @@
+--- SConstruct.orig	2023-06-07 17:07:38 UTC
++++ SConstruct
+@@ -3217,8 +3205,12 @@ if not env.TargetOSIs('windows', 'macOS') and (env.Too
+     # setting it for both C and C++ by setting both of CFLAGS and
+     # CXXFLAGS.
+ 
++    arm_march_flag = "armv8-a"
++    if get_option('use-hardware-crc32') == "on":
++        arm_march_flag += "+crc"
++
+     default_targeting_flags_for_architecture = {
+-        "aarch64": {"-march=": "armv8.2-a", "-mtune=": "generic"},
++        "aarch64": {"-march=": arm_march_flag, "-mtune=": "generic"},
+         "i386": {"-march=": "nocona", "-mtune=": "generic"},
+         "ppc64le": {"-mcpu=": "power8", "-mtune=": "power8", "-mcmodel=": "medium"},
+         "s390x": {"-march=": "z196", "-mtune=": "zEC12"},
diff --git a/databases/mongodb70/files/mongod.in b/databases/mongodb70/files/mongod.in
new file mode 100644
index 000000000000..20b0f5c0f43d
--- /dev/null
+++ b/databases/mongodb70/files/mongod.in
@@ -0,0 +1,53 @@
+#!/bin/sh
+
+# PROVIDE: mongod
+# REQUIRE: NETWORK ldconfig
+# KEYWORD: shutdown
+#
+# Add the following lines to /etc/rc.conf.local or /etc/rc.conf
+# to enable this service:
+#
+# mongod_enable (bool):  Set to "NO" by default.
+#                        Set it to "YES" to enable mongod.
+# mongod_dbpath (str):   Default to "/var/db/mongodb"
+#                        Base database directory.
+# mongod_flags (str):    Custom additional arguments to be passed to mongod.
+#                        Default to "--logpath ${mongod_dbpath}/mongod.log --logappend".
+# mongod_config (str):	 Default to "%%PREFIX%%/etc/mongodb.conf"
+#                        Path to config file
+#
+
+. /etc/rc.subr
+
+name="mongod"
+rcvar=mongod_enable
+
+load_rc_config $name
+
+: ${mongod_enable="NO"}
+: ${mongod_dbpath="/var/db/mongodb"}
+: ${mongod_flags="--logpath ${mongod_dbpath}/mongod.log --logappend --setParameter=disabledSecureAllocatorDomains=\*"}
+: ${mongod_user="mongodb"}
+: ${mongod_group="mongodb"}
+: ${mongod_config="%%PREFIX%%/etc/mongodb.conf"}
+
+pidfile="${mongod_dbpath}/mongod.lock"
+command=%%PREFIX%%/bin/${name}
+command_args="--config $mongod_config --dbpath $mongod_dbpath --fork >/dev/null 2>/dev/null"
+start_precmd="${name}_prestart"
+
+mongod_create_dbpath()
+{
+        mkdir ${mongod_dbpath} >/dev/null 2>/dev/null
+        [ $? -eq 0 ] && chown -R ${mongod_user}:${mongod_group} ${mongod_dbpath}
+}
+
+mongod_prestart()
+{
+        if [ ! -d ${mongod_dbpath} ]; then
+                mongod_create_dbpath || return 1
+        fi
+        return 0
+}
+
+run_rc_command "$1"
diff --git a/databases/mongodb70/files/patch-SConstruct b/databases/mongodb70/files/patch-SConstruct
new file mode 100644
index 000000000000..a6da48e57114
--- /dev/null
+++ b/databases/mongodb70/files/patch-SConstruct
@@ -0,0 +1,57 @@
+--- SConstruct.orig	2023-06-07 17:07:38 UTC
++++ SConstruct
+@@ -23,7 +23,6 @@ import SCons.Script
+ 
+ import SCons
+ import SCons.Script
+-from mongo_tooling_metrics.lib.top_level_metrics import SConsToolingMetrics
+ from site_scons.mongo import build_profiles
+ 
+ # This must be first, even before EnsureSConsVersion, if
+@@ -1655,16 +1654,6 @@ env.AddMethod(lambda env, name, **kwargs: add_option(n
+ del envDict
+ env.AddMethod(lambda env, name, **kwargs: add_option(name, **kwargs), 'AddOption')
+ 
+-# The placement of this is intentional. Here we setup an atexit method to store tooling metrics.
+-# We should only register this function after env, env_vars and the parser have been properly initialized.
+-SConsToolingMetrics.register_metrics(
+-    utc_starttime=datetime.utcnow(),
+-    artifact_dir=env.Dir('$BUILD_DIR').get_abspath(),
+-    env_vars=env_vars,
+-    env=env,
+-    parser=_parser,
+-)
+-
+ if get_option('build-metrics'):
+     env['BUILD_METRICS_ARTIFACTS_DIR'] = '$BUILD_ROOT/$VARIANT_DIR'
+     env.Tool('build_metrics')
+@@ -1801,9 +1790,9 @@ if has_option('variables-help'):
+     print(env_vars.GenerateHelpText(env))
+     Exit(0)
+ 
+-unknown_vars = env_vars.UnknownVariables()
+-if unknown_vars:
+-    env.FatalError("Unknown variables specified: {0}", ", ".join(list(unknown_vars.keys())))
++#unknown_vars = env_vars.UnknownVariables()
++#if unknown_vars:
++#    env.FatalError("Unknown variables specified: {0}", ", ".join(list(unknown_vars.keys())))
+ 
+ install_actions.setup(env, get_option('install-action'))
+ 
+@@ -3026,7 +3015,7 @@ if env.TargetOSIs('posix'):
+             # If runtime hardening is requested, then build anything
+             # destined for an executable with the necessary flags for PIE.
+             env.AppendUnique(
+-                PROGCCFLAGS=['-fPIE'],
++                PROGCCFLAGS=['-fpic'],
+                 PROGLINKFLAGS=['-pie'],
+             )
+ 
+@@ -3034,7 +3023,6 @@ if env.TargetOSIs('posix'):
+     env.Append(
+         CCFLAGS=[
+             "-fasynchronous-unwind-tables",
+-            "-g2" if not env.TargetOSIs('emscripten') else "-g",
+             "-Wall",
+             "-Wsign-compare",
+             "-Wno-unknown-pragmas",
diff --git a/databases/mongodb70/files/patch-buildscripts_scons.py b/databases/mongodb70/files/patch-buildscripts_scons.py
new file mode 100644
index 000000000000..20d0429965af
--- /dev/null
+++ b/databases/mongodb70/files/patch-buildscripts_scons.py
@@ -0,0 +1,25 @@
+--- buildscripts/scons.py.orig	2021-08-23 09:10:10 UTC
++++ buildscripts/scons.py
+@@ -18,14 +18,14 @@ SITE_TOOLS_DIR = os.path.join(MONGODB_ROOT, 'site_scon
+ 
+ sys.path = [SCONS_DIR, SITE_TOOLS_DIR] + sys.path
+ 
+-# pylint: disable=C0413
+-from mongo.pip_requirements import verify_requirements, MissingRequirements
+-
+-try:
+-    verify_requirements('etc/pip/compile-requirements.txt')
+-except MissingRequirements as ex:
+-    print(ex)
+-    sys.exit(1)
++## pylint: disable=C0413
++#from mongo.pip_requirements import verify_requirements, MissingRequirements
++#
++#try:
++#    verify_requirements('etc/pip/compile-requirements.txt')
++#except MissingRequirements as ex:
++#    print(ex)
++#    sys.exit(1)
+ 
+ try:
+     import SCons.Script
diff --git a/databases/mongodb70/files/patch-rpm_mongod.conf b/databases/mongodb70/files/patch-rpm_mongod.conf
new file mode 100644
index 000000000000..b4a8d4e6bdea
--- /dev/null
+++ b/databases/mongodb70/files/patch-rpm_mongod.conf
@@ -0,0 +1,16 @@
+--- rpm/mongod.conf.orig	2023-02-07 18:25:28 UTC
++++ rpm/mongod.conf
+@@ -7,11 +7,11 @@ systemLog:
+ systemLog:
+   destination: file
+   logAppend: true
+-  path: /var/log/mongodb/mongod.log
++  path: /var/db/mongodb/mongod.log
+ 
+ # Where and how to store data.
+ storage:
+-  dbPath: /var/lib/mongo
++  dbPath: /var/db/mongodb
+ 
+ # how the process runs
+ processManagement:
diff --git a/databases/mongodb70/files/patch-src_mongo_db_exec_document__value_value.cpp b/databases/mongodb70/files/patch-src_mongo_db_exec_document__value_value.cpp
new file mode 100644
index 000000000000..194db618f3b2
--- /dev/null
+++ b/databases/mongodb70/files/patch-src_mongo_db_exec_document__value_value.cpp
@@ -0,0 +1,15 @@
+--- src/mongo/db/exec/document_value/value.cpp.orig	2023-06-15 22:07:57 UTC
++++ src/mongo/db/exec/document_value/value.cpp
+@@ -59,6 +59,12 @@ using namespace std::string_literals;
+ using std::vector;
+ using namespace std::string_literals;
+ 
++RCVector::RCVector() {
++}
++
++RCVector::RCVector(std::vector<Value> v) : vec(std::move(v)) {
++}
++
+ void ValueStorage::verifyRefCountingIfShould() const {
+     switch (type) {
+         case MinKey:
diff --git a/databases/mongodb70/files/patch-src_mongo_db_exec_document__value_value__internal.h b/databases/mongodb70/files/patch-src_mongo_db_exec_document__value_value__internal.h
new file mode 100644
index 000000000000..6770dde9e770
--- /dev/null
+++ b/databases/mongodb70/files/patch-src_mongo_db_exec_document__value_value__internal.h
@@ -0,0 +1,13 @@
+--- src/mongo/db/exec/document_value/value_internal.h.orig	2023-06-15 22:07:57 UTC
++++ src/mongo/db/exec/document_value/value_internal.h
+@@ -51,8 +51,8 @@ class RCVector : public RefCountable { (public)
+ /// A heap-allocated reference-counted std::vector
+ class RCVector : public RefCountable {
+ public:
+-    RCVector() {}
+-    RCVector(std::vector<Value> v) : vec(std::move(v)) {}
++    RCVector();
++    RCVector(std::vector<Value> v);
+     std::vector<Value> vec;
+ };
+ 
diff --git a/databases/mongodb70/files/patch-src_mongo_db_exec_near.cpp b/databases/mongodb70/files/patch-src_mongo_db_exec_near.cpp
new file mode 100644
index 000000000000..0bbdb149268d
--- /dev/null
+++ b/databases/mongodb70/files/patch-src_mongo_db_exec_near.cpp
@@ -0,0 +1,46 @@
+--- src/mongo/db/exec/near.cpp.orig	2023-06-15 22:07:57 UTC
++++ src/mongo/db/exec/near.cpp
+@@ -42,6 +42,21 @@ using std::vector;
+ using std::unique_ptr;
+ using std::vector;
+ 
++/**
++ * Holds a generic search result with a distance computed in some fashion.
++ */
++struct NearStage::SearchResult {
++    SearchResult(WorkingSetID resultID, double distance) : resultID(resultID), distance(distance) {}
++
++    bool operator<(const SearchResult& other) const {
++        // We want increasing distance, not decreasing, so we reverse the <
++        return distance > other.distance;
++    }
++
++    WorkingSetID resultID;
++    double distance;
++};
++
+ NearStage::NearStage(ExpressionContext* expCtx,
+                      const char* typeName,
+                      StageType type,
+@@ -113,21 +128,6 @@ PlanStage::StageState NearStage::doWork(WorkingSetID* 
+ 
+     return nextState;
+ }
+-
+-/**
+- * Holds a generic search result with a distance computed in some fashion.
+- */
+-struct NearStage::SearchResult {
+-    SearchResult(WorkingSetID resultID, double distance) : resultID(resultID), distance(distance) {}
+-
+-    bool operator<(const SearchResult& other) const {
+-        // We want increasing distance, not decreasing, so we reverse the <
+-        return distance > other.distance;
+-    }
+-
+-    WorkingSetID resultID;
+-    double distance;
+-};
+ 
+ // Set "toReturn" when NEED_YIELD.
+ PlanStage::StageState NearStage::bufferNext(WorkingSetID* toReturn) {
diff --git a/databases/mongodb70/files/patch-src_mongo_s_write__ops_write__op.h b/databases/mongodb70/files/patch-src_mongo_s_write__ops_write__op.h
new file mode 100644
index 000000000000..f5edb3f0748f
--- /dev/null
+++ b/databases/mongodb70/files/patch-src_mongo_s_write__ops_write__op.h
@@ -0,0 +1,74 @@
+--- src/mongo/s/write_ops/write_op.h.orig	2023-06-15 22:07:57 UTC
++++ src/mongo/s/write_ops/write_op.h
+@@ -38,7 +38,7 @@ struct TargetedWrite;
+ namespace mongo {
+ 
+ struct TargetedWrite;
+-struct ChildWriteOp;
++class WriteOp;
+ 
+ enum WriteOpState {
+     // Item is ready to be targeted
+@@ -63,6 +63,31 @@ enum WriteOpState {
+ };
+ 
+ /**
++ * State of a write in-progress (to a single shard) which is one part of a larger write
++ * operation.
++ *
++ * As above, the write op may finish in either a successful (_Completed) or unsuccessful
++ * (_Error) state.
++ */
++struct ChildWriteOp {
++    ChildWriteOp(WriteOp* const parent) : parentOp(parent) {}
++
++    const WriteOp* const parentOp;
++
++    WriteOpState state{WriteOpState_Ready};
++
++    // non-zero when state == _Pending
++    // Not owned here but tracked for reporting
++    TargetedWrite* pendingWrite{nullptr};
++
++    // filled when state > _Pending
++    std::unique_ptr<ShardEndpoint> endpoint;
++
++    // filled when state == _Error or (optionally) when state == _Cancelled
++    boost::optional<write_ops::WriteError> error;
++};
++
++/**
+  * State of a single write item in-progress from a client request.
+  *
+  * The lifecyle of a write op:
+@@ -182,30 +207,6 @@ class WriteOp { (private)
+ 
+     // stores the shards where this write operation succeeded
+     absl::flat_hash_set<ShardId> _successfulShardSet;
+-};
+-/**
+- * State of a write in-progress (to a single shard) which is one part of a larger write
+- * operation.
+- *
+- * As above, the write op may finish in either a successful (_Completed) or unsuccessful
+- * (_Error) state.
+- */
+-struct ChildWriteOp {
+-    ChildWriteOp(WriteOp* const parent) : parentOp(parent) {}
+-
+-    const WriteOp* const parentOp;
+-
+-    WriteOpState state{WriteOpState_Ready};
+-
+-    // non-zero when state == _Pending
+-    // Not owned here but tracked for reporting
+-    TargetedWrite* pendingWrite{nullptr};
+-
+-    // filled when state > _Pending
+-    std::unique_ptr<ShardEndpoint> endpoint;
+-
+-    // filled when state == _Error or (optionally) when state == _Cancelled
+-    boost::optional<write_ops::WriteError> error;
+ };
+ 
+ // First value is write item index in the batch, second value is child write op index
diff --git a/databases/mongodb70/files/patch-src_mongo_util_net_ssl__types.h b/databases/mongodb70/files/patch-src_mongo_util_net_ssl__types.h
new file mode 100644
index 000000000000..b74a1c248ddc
--- /dev/null
+++ b/databases/mongodb70/files/patch-src_mongo_util_net_ssl__types.h
@@ -0,0 +1,10 @@
+--- src/mongo/util/net/ssl_types.h.orig	2023-06-15 22:07:57 UTC
++++ src/mongo/util/net/ssl_types.h
+@@ -61,6 +61,7 @@ class SSLX509Name { (public)
+         auto equalityLens() const {
+             return std::tie(oid, type, value);
+         }
++        friend bool operator==(const Entry& lhs, const Entry& rhs);
+     };
+ 
+     SSLX509Name() = default;
diff --git a/databases/mongodb70/files/patch-src_third__party_abseil-cpp_dist_absl_base_internal_unscaledcycleclock.cc b/databases/mongodb70/files/patch-src_third__party_abseil-cpp_dist_absl_base_internal_unscaledcycleclock.cc
new file mode 100644
index 000000000000..af57deacab62
--- /dev/null
+++ b/databases/mongodb70/files/patch-src_third__party_abseil-cpp_dist_absl_base_internal_unscaledcycleclock.cc
@@ -0,0 +1,13 @@
+--- src/third_party/abseil-cpp/dist/absl/base/internal/unscaledcycleclock.cc.orig	2023-05-10 10:35:21 UTC
++++ src/third_party/abseil-cpp/dist/absl/base/internal/unscaledcycleclock.cc
+@@ -24,8 +24,9 @@
+ #ifdef __GLIBC__
+ #include <sys/platform/ppc.h>
+ #elif defined(__FreeBSD__)
+-#include <sys/sysctl.h>
++#include "absl/base/call_once.h"
+ #include <sys/types.h>
++#include <sys/sysctl.h>
+ #endif
+ #endif
+ 
diff --git a/databases/mongodb70/files/patch-src_third__party_asio-master_asio_include_asio_detail_config.hpp b/databases/mongodb70/files/patch-src_third__party_asio-master_asio_include_asio_detail_config.hpp
new file mode 100644
index 000000000000..09713cbc0028
--- /dev/null
+++ b/databases/mongodb70/files/patch-src_third__party_asio-master_asio_include_asio_detail_config.hpp
@@ -0,0 +1,10 @@
+--- src/third_party/asio-master/asio/include/asio/detail/config.hpp.orig	2023-04-29 10:17:24 UTC
++++ src/third_party/asio-master/asio/include/asio/detail/config.hpp
+@@ -19,6 +19,7 @@
+ // individual scons objects.
+ # define ASIO_STANDALONE // MongoDB
+ # define ASIO_SEPARATE_COMPILATION // MongoDB
++# define ASIO_HAS_STD_INVOKE_RESULT // FreeBSD
+ 
+ #if defined(ASIO_STANDALONE)
+ # define ASIO_DISABLE_BOOST_ARRAY 1
diff --git a/databases/mongodb70/files/patch-src_third__party_boost_boost_mpl_aux___integral__wrapper.hpp b/databases/mongodb70/files/patch-src_third__party_boost_boost_mpl_aux___integral__wrapper.hpp
new file mode 100644
index 000000000000..f6e1178b4a65
--- /dev/null
+++ b/databases/mongodb70/files/patch-src_third__party_boost_boost_mpl_aux___integral__wrapper.hpp
@@ -0,0 +1,11 @@
+--- src/third_party/boost/boost/mpl/aux_/integral_wrapper.hpp.orig	2023-06-15 22:07:57 UTC
++++ src/third_party/boost/boost/mpl/aux_/integral_wrapper.hpp
+@@ -56,7 +56,7 @@ struct AUX_WRAPPER_NAME
+ // have to #ifdef here: some compilers don't like the 'N + 1' form (MSVC),
+ // while some other don't like 'value + 1' (Borland), and some don't like
+ // either
+-#if BOOST_WORKAROUND(__EDG_VERSION__, <= 243)
++#if 1 //BOOST_WORKAROUND(__EDG_VERSION__, <= 243)
+  private:
+     BOOST_STATIC_CONSTANT(AUX_WRAPPER_VALUE_TYPE, next_value = BOOST_MPL_AUX_STATIC_CAST(AUX_WRAPPER_VALUE_TYPE, (N + 1)));
+     BOOST_STATIC_CONSTANT(AUX_WRAPPER_VALUE_TYPE, prior_value = BOOST_MPL_AUX_STATIC_CAST(AUX_WRAPPER_VALUE_TYPE, (N - 1)));
diff --git a/databases/mongodb70/files/patch-src_third__party_mozjs_gen-config.sh b/databases/mongodb70/files/patch-src_third__party_mozjs_gen-config.sh
new file mode 100644
index 000000000000..58daab4bc056
--- /dev/null
+++ b/databases/mongodb70/files/patch-src_third__party_mozjs_gen-config.sh
@@ -0,0 +1,30 @@
+--- src/third_party/mozjs/gen-config.sh.orig	2022-08-05 16:21:29 UTC
++++ src/third_party/mozjs/gen-config.sh
+@@ -29,6 +29,9 @@ case "$_Path" in
+ }
+ 
+ case "$_Path" in
++    "platform/aarch64/freebsd")
++        _CONFIG_OPTS="--host=aarch64-freebsd"
++	;;
+     "platform/aarch64/linux")
+         _CONFIG_OPTS="--host=aarch64-linux"
+     ;;
+@@ -108,7 +111,7 @@ CFLAGS="$CFLAGS -D__STDC_FORMAT_MACROS" \
+     --disable-js-shell \
+     --disable-tests "$_CONFIG_OPTS"
+ 
+-make recurse_export
++gmake recurse_export
+ 
+ cd ../../../..
+ 
+@@ -159,7 +162,7 @@ find "$_Path/build" -name '*.cpp' |
+ find "$_Path/build" -name '*.cpp' |
+     while read unified_file ; do
+         echo "Processing $unified_file"
+-        sed $SEDOPTION \
++        gsed $SEDOPTION \
+             -e 's|#include ".*/js/src/|#include "|' \
+             -e 's|#error ".*/js/src/|#error "|' \
+             "$unified_file"
diff --git a/databases/mongodb70/files/patch-src_third__party_mozjs_get-sources.sh b/databases/mongodb70/files/patch-src_third__party_mozjs_get-sources.sh
new file mode 100644
index 000000000000..1ae6264dc459
--- /dev/null
+++ b/databases/mongodb70/files/patch-src_third__party_mozjs_get-sources.sh
@@ -0,0 +1,14 @@
+--- src/third_party/mozjs/get-sources.sh.orig	2022-09-08 09:53:27 UTC
++++ src/third_party/mozjs/get-sources.sh
+@@ -12,9 +12,9 @@ LIB_GIT_REPO=git@github.com:mongodb-forks/spidermonkey
+ LIB_GIT_REVISION=82aac6af18abcd5bf188afbc821779ccb0ca0902
+ LIB_GIT_REPO=git@github.com:mongodb-forks/spidermonkey.git
+ 
+-DEST_DIR=$(git rev-parse --show-toplevel)/src/third_party/mozjs
++DEST_DIR=$(realpath .)
+ 
+-LIB_GIT_DIR=$(mktemp -d /tmp/import-spidermonkey.XXXXXX)
++LIB_GIT_DIR=$(mktemp -d /var/tmp/import-spidermonkey.XXXXXX)
+ trap "rm -rf $LIB_GIT_DIR" EXIT
+ 
+ git clone $LIB_GIT_REPO $LIB_GIT_DIR
diff --git a/databases/mongodb70/pkg-descr b/databases/mongodb70/pkg-descr
new file mode 100644
index 000000000000..59930ca8f679
--- /dev/null
+++ b/databases/mongodb70/pkg-descr
@@ -0,0 +1,3 @@
+Mongo (from "humongous") is a high-performance, open source,
+schema-free, document-oriented database. A common name in the
+"NOSQL" community.
diff --git a/databases/mongodb70/pkg-message b/databases/mongodb70/pkg-message
new file mode 100644
index 000000000000..53d27f877b5a
--- /dev/null
+++ b/databases/mongodb70/pkg-message
@@ -0,0 +1,9 @@
+[
+{ type: install
+  message: <<EOM
+MongoDB on Raspberry Pi can work but is unsupported upstream.
+Please read https://jira.mongodb.org/browse/SERVER-71772 and enable option 
+ARMV80A if you run this on a non-LSE ARM cpu like Raspberry Pi 4.
+EOM
+}
+]
diff --git a/databases/mongodb70/pkg-plist b/databases/mongodb70/pkg-plist
new file mode 100644
index 000000000000..feaf3313657d
--- /dev/null
+++ b/databases/mongodb70/pkg-plist
@@ -0,0 +1,7 @@
+bin/mongod
+bin/mongos
+@sample etc/mongodb.conf.sample
+%%DOCSDIR%%/LICENSE-Community.txt
+%%DOCSDIR%%/MPL-2
+%%DOCSDIR%%/README
+%%DOCSDIR%%/THIRD-PARTY-NOTICES
diff --git a/databases/movine/Makefile b/databases/movine/Makefile
new file mode 100644
index 000000000000..72165ef55ebc
--- /dev/null
+++ b/databases/movine/Makefile
@@ -0,0 +1,190 @@
+PORTNAME=	movine
+DISTVERSIONPREFIX=	v
+DISTVERSION=	0.11.0
+PORTREVISION=	12
+CATEGORIES=	databases
+
+MAINTAINER=	yuri@FreeBSD.org
+COMMENT=	Database migration manager written in Rust
+WWW=		https://github.com/byronwasti/movine
+
+LICENSE=	MIT
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
+USES=		cargo ssl
+USE_GITHUB=	yes
+GH_ACCOUNT=	byronwasti
+
+CARGO_CRATES=	aho-corasick-0.7.15 \
+		ansi_term-0.11.0 \
+		ansi_term-0.12.1 \
+		async-trait-0.1.41 \
+		atty-0.2.14 \
+		autocfg-1.0.1 \
+		base64-0.13.0 \
+		bitflags-1.2.1 \
+		block-buffer-0.9.0 \
+		bumpalo-3.6.1 \
+		byteorder-1.3.4 \
+		bytes-1.0.1 \
+		cc-1.0.62 \
+		cfg-if-0.1.10 \
+		cfg-if-1.0.0 \
+		chrono-0.4.19 \
+		clap-2.33.3 \
+		cloudabi-0.1.0 \
+		core-foundation-0.9.1 \
+		core-foundation-sys-0.8.2 \
+		cpuid-bool-0.1.2 \
+		crypto-mac-0.10.0 \
+		digest-0.9.0 \
+		dotenv-0.15.0 \
+		env_logger-0.7.1 \
+		envy-0.4.1 \
+		fallible-iterator-0.2.0 \
+		fallible-streaming-iterator-0.1.9 \
+		foreign-types-0.3.2 \
+		foreign-types-shared-0.1.1 \
+		futures-0.3.8 \
+		futures-channel-0.3.8 \
+		futures-core-0.3.8 \
+		futures-executor-0.3.8 \
+		futures-io-0.3.8 \
+		futures-macro-0.3.8 \
+		futures-sink-0.3.8 \
+		futures-task-0.3.8 \
+		futures-util-0.3.8 \
+		generic-array-0.14.4 \
+		getrandom-0.2.2 \
+		heck-0.3.1 \
+		hermit-abi-0.1.17 \
+		hmac-0.10.1 \
+		humantime-1.3.0 \
+		instant-0.1.8 \
+		js-sys-0.3.50 \
+		lazy_static-1.4.0 \
+		libc-0.2.93 \
+		libsqlite3-sys-0.18.0 \
+		linked-hash-map-0.5.3 \
+		lock_api-0.4.1 \
+		log-0.4.11 \
+		lru-cache-0.1.2 \
+		matches-0.1.8 \
+		md-5-0.9.1 \
+		memchr-2.3.4 \
+		mio-0.7.11 \
+		miow-0.3.7 \
+		native-tls-0.2.7 \
+		ntapi-0.3.6 \
+		num-integer-0.1.44 \
+		num-traits-0.2.14 \
+		once_cell-1.5.2 \
+		opaque-debug-0.3.0 \
+		openssl-0.10.33 \
+		openssl-probe-0.1.2 \
+		openssl-sys-0.9.61 \
+		parking_lot-0.11.0 \
+		parking_lot_core-0.8.0 \
+		percent-encoding-2.1.0 \
+		phf-0.8.0 \
+		phf_shared-0.8.0 \
+		pin-project-1.0.1 \
+		pin-project-internal-1.0.1 \
+		pin-project-lite-0.2.6 \
+		pin-utils-0.1.0 \
+		pkg-config-0.3.19 \
+		postgres-0.19.1 \
+		postgres-native-tls-0.5.0 \
+		postgres-protocol-0.6.1 \
+		postgres-types-0.2.1 \
+		ppv-lite86-0.2.10 \
+		proc-macro-error-1.0.4 \
+		proc-macro-error-attr-1.0.4 \
+		proc-macro-hack-0.5.19 \
+		proc-macro-nested-0.1.6 \
+		proc-macro2-1.0.26 \
+		quick-error-1.2.3 \
+		quote-1.0.7 \
+		rand-0.8.3 \
+		rand_chacha-0.3.0 \
+		rand_core-0.6.2 \
+		rand_hc-0.3.0 \
+		redox_syscall-0.1.57 \
+		redox_syscall-0.2.5 \
+		regex-1.4.2 \
+		regex-syntax-0.6.21 \
+		remove_dir_all-0.5.3 \
+		ring-0.16.20 \
+		rusqlite-0.23.1 \
+		rustls-0.19.0 \
+		schannel-0.1.19 \
+		scopeguard-1.1.0 \
+		sct-0.6.0 \
+		security-framework-2.2.0 \
+		security-framework-sys-2.2.0 \
+		serde-1.0.117 \
+		serde_derive-1.0.117 \
+		sha2-0.9.2 \
+		siphasher-0.3.3 \
+		slab-0.4.2 \
+		smallvec-1.5.0 \
+		socket2-0.4.0 \
+		spin-0.5.2 \
+		stringprep-0.1.2 \
+		strsim-0.8.0 \
+		structopt-0.3.20 \
+		structopt-derive-0.4.13 \
+		subtle-2.3.0 \
+		syn-1.0.69 \
+		tempfile-3.2.0 \
+		termcolor-1.1.0 \
+		textwrap-0.11.0 \
+		thread_local-1.0.1 \
+		time-0.1.44 \
+		tinyvec-1.0.1 \
+		tinyvec_macros-0.1.0 \
+		tokio-1.4.0 \
+		tokio-native-tls-0.3.0 \
+		tokio-postgres-0.7.1 \
+		tokio-postgres-rustls-0.8.0 \
+		tokio-rustls-0.22.0 \
+		tokio-util-0.6.5 \
+		toml-0.5.7 \
+		typenum-1.12.0 \
+		unicode-bidi-0.3.4 \
+		unicode-normalization-0.1.14 \
+		unicode-segmentation-1.7.0 \
+		unicode-width-0.1.8 \
+		unicode-xid-0.2.1 \
+		untrusted-0.7.1 \
+		vcpkg-0.2.10 \
+		vec_map-0.8.2 \
+		version_check-0.9.2 \
+		wasi-0.10.0+wasi-snapshot-preview1 \
+		wasm-bindgen-0.2.73 \
+		wasm-bindgen-backend-0.2.73 \
+		wasm-bindgen-macro-0.2.73 \
+		wasm-bindgen-macro-support-0.2.73 \
+		wasm-bindgen-shared-0.2.73 \
+		web-sys-0.3.50 \
+		webpki-0.21.4 \
+		winapi-0.3.9 \
+		winapi-i686-pc-windows-gnu-0.4.0 \
+		winapi-util-0.1.5 \
+		winapi-x86_64-pc-windows-gnu-0.4.0
+
+OPENSSLINC=	/usr/include
+OPENSSLLIB=	/usr/lib
+
+PLIST_FILES=	bin/${PORTNAME}
+
+.include <bsd.port.options.mk>
+
+.if ( ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400092 && ${SSL_DEFAULT} == base ) || ${SSL_DEFAULT:Mopenssl} || ${SSL_DEFAULT:Mopenssl3*}
+BROKEN=	Fails to detect OpenSSL 3 and later
+.endif
+
+post-install:
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
+
+.include <bsd.port.mk>
diff --git a/databases/movine/distinfo b/databases/movine/distinfo
new file mode 100644
index 000000000000..6c4831add808
--- /dev/null
+++ b/databases/movine/distinfo
@@ -0,0 +1,317 @@
+TIMESTAMP = 1672651246
+SHA256 (rust/crates/aho-corasick-0.7.15.crate) = 7404febffaa47dac81aa44dba71523c9d069b1bdc50a77db41195149e17f68e5
+SIZE (rust/crates/aho-corasick-0.7.15.crate) = 113071
+SHA256 (rust/crates/ansi_term-0.11.0.crate) = ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b
+SIZE (rust/crates/ansi_term-0.11.0.crate) = 17087
+SHA256 (rust/crates/ansi_term-0.12.1.crate) = d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2
+SIZE (rust/crates/ansi_term-0.12.1.crate) = 24838
+SHA256 (rust/crates/async-trait-0.1.41.crate) = b246867b8b3b6ae56035f1eb1ed557c1d8eae97f0d53696138a50fa0e3a3b8c0
+SIZE (rust/crates/async-trait-0.1.41.crate) = 24830
+SHA256 (rust/crates/atty-0.2.14.crate) = d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8
+SIZE (rust/crates/atty-0.2.14.crate) = 5470
+SHA256 (rust/crates/autocfg-1.0.1.crate) = cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a
+SIZE (rust/crates/autocfg-1.0.1.crate) = 12908
+SHA256 (rust/crates/base64-0.13.0.crate) = 904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd
+SIZE (rust/crates/base64-0.13.0.crate) = 62070
+SHA256 (rust/crates/bitflags-1.2.1.crate) = cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693
+SIZE (rust/crates/bitflags-1.2.1.crate) = 16745
+SHA256 (rust/crates/block-buffer-0.9.0.crate) = 4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4
+SIZE (rust/crates/block-buffer-0.9.0.crate) = 7108
+SHA256 (rust/crates/bumpalo-3.6.1.crate) = 63396b8a4b9de3f4fdfb320ab6080762242f66a8ef174c49d8e19b674db4cdbe
+SIZE (rust/crates/bumpalo-3.6.1.crate) = 133836
+SHA256 (rust/crates/byteorder-1.3.4.crate) = 08c48aae112d48ed9f069b33538ea9e3e90aa263cfa3d1c24309612b1f7472de
+SIZE (rust/crates/byteorder-1.3.4.crate) = 21943
+SHA256 (rust/crates/bytes-1.0.1.crate) = b700ce4376041dcd0a327fd0097c41095743c4c8af8887265942faf1100bd040
+SIZE (rust/crates/bytes-1.0.1.crate) = 48142
+SHA256 (rust/crates/cc-1.0.62.crate) = f1770ced377336a88a67c473594ccc14eca6f4559217c34f64aac8f83d641b40
+SIZE (rust/crates/cc-1.0.62.crate) = 52639
+SHA256 (rust/crates/cfg-if-0.1.10.crate) = 4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822
+SIZE (rust/crates/cfg-if-0.1.10.crate) = 7933
+SHA256 (rust/crates/cfg-if-1.0.0.crate) = baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd
+SIZE (rust/crates/cfg-if-1.0.0.crate) = 7934
+SHA256 (rust/crates/chrono-0.4.19.crate) = 670ad68c9088c2a963aaa298cb369688cf3f9465ce5e2d4ca10e6e0098a1ce73
+SIZE (rust/crates/chrono-0.4.19.crate) = 155663
+SHA256 (rust/crates/clap-2.33.3.crate) = 37e58ac78573c40708d45522f0d80fa2f01cc4f9b4e2bf749807255454312002
+SIZE (rust/crates/clap-2.33.3.crate) = 201925
+SHA256 (rust/crates/cloudabi-0.1.0.crate) = 4344512281c643ae7638bbabc3af17a11307803ec8f0fcad9fae512a8bf36467
+SIZE (rust/crates/cloudabi-0.1.0.crate) = 22687
+SHA256 (rust/crates/core-foundation-0.9.1.crate) = 0a89e2ae426ea83155dccf10c0fa6b1463ef6d5fcb44cee0b224a408fa640a62
+SIZE (rust/crates/core-foundation-0.9.1.crate) = 25985
+SHA256 (rust/crates/core-foundation-sys-0.8.2.crate) = ea221b5284a47e40033bf9b66f35f984ec0ea2931eb03505246cd27a963f981b
+SIZE (rust/crates/core-foundation-sys-0.8.2.crate) = 17461
+SHA256 (rust/crates/cpuid-bool-0.1.2.crate) = 8aebca1129a03dc6dc2b127edd729435bbc4a37e1d5f4d7513165089ceb02634
+SIZE (rust/crates/cpuid-bool-0.1.2.crate) = 7173
+SHA256 (rust/crates/crypto-mac-0.10.0.crate) = 4857fd85a0c34b3c3297875b747c1e02e06b6a0ea32dd892d8192b9ce0813ea6
+SIZE (rust/crates/crypto-mac-0.10.0.crate) = 9476
+SHA256 (rust/crates/digest-0.9.0.crate) = d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066
+SIZE (rust/crates/digest-0.9.0.crate) = 13247
+SHA256 (rust/crates/dotenv-0.15.0.crate) = 77c90badedccf4105eca100756a0b1289e191f6fcbdadd3cee1d2f614f97da8f
+SIZE (rust/crates/dotenv-0.15.0.crate) = 11668
+SHA256 (rust/crates/env_logger-0.7.1.crate) = 44533bbbb3bb3c1fa17d9f2e4e38bbbaf8396ba82193c4cb1b6445d711445d36
+SIZE (rust/crates/env_logger-0.7.1.crate) = 32281
+SHA256 (rust/crates/envy-0.4.1.crate) = f938a4abd5b75fe3737902dbc2e79ca142cc1526827a9e40b829a086758531a9
+SIZE (rust/crates/envy-0.4.1.crate) = 10833
+SHA256 (rust/crates/fallible-iterator-0.2.0.crate) = 4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7
+SIZE (rust/crates/fallible-iterator-0.2.0.crate) = 18509
+SHA256 (rust/crates/fallible-streaming-iterator-0.1.9.crate) = 7360491ce676a36bf9bb3c56c1aa791658183a54d2744120f27285738d90465a
+SIZE (rust/crates/fallible-streaming-iterator-0.1.9.crate) = 9249
+SHA256 (rust/crates/foreign-types-0.3.2.crate) = f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1
+SIZE (rust/crates/foreign-types-0.3.2.crate) = 7504
+SHA256 (rust/crates/foreign-types-shared-0.1.1.crate) = 00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b
+SIZE (rust/crates/foreign-types-shared-0.1.1.crate) = 5672
+SHA256 (rust/crates/futures-0.3.8.crate) = 9b3b0c040a1fe6529d30b3c5944b280c7f0dcb2930d2c3062bca967b602583d0
+SIZE (rust/crates/futures-0.3.8.crate) = 40380
+SHA256 (rust/crates/futures-channel-0.3.8.crate) = 4b7109687aa4e177ef6fe84553af6280ef2778bdb7783ba44c9dc3399110fe64
+SIZE (rust/crates/futures-channel-0.3.8.crate) = 29476
+SHA256 (rust/crates/futures-core-0.3.8.crate) = 847ce131b72ffb13b6109a221da9ad97a64cbe48feb1028356b836b47b8f1748
+SIZE (rust/crates/futures-core-0.3.8.crate) = 13857
+SHA256 (rust/crates/futures-executor-0.3.8.crate) = 4caa2b2b68b880003057c1dd49f1ed937e38f22fcf6c212188a121f08cf40a65
+SIZE (rust/crates/futures-executor-0.3.8.crate) = 16653
+SHA256 (rust/crates/futures-io-0.3.8.crate) = 611834ce18aaa1bd13c4b374f5d653e1027cf99b6b502584ff8c9a64413b30bb
+SIZE (rust/crates/futures-io-0.3.8.crate) = 9131
+SHA256 (rust/crates/futures-macro-0.3.8.crate) = 77408a692f1f97bcc61dc001d752e00643408fbc922e4d634c655df50d595556
+SIZE (rust/crates/futures-macro-0.3.8.crate) = 9766
+SHA256 (rust/crates/futures-sink-0.3.8.crate) = f878195a49cee50e006b02b93cf7e0a95a38ac7b776b4c4d9cc1207cd20fcb3d
+SIZE (rust/crates/futures-sink-0.3.8.crate) = 7733
+SHA256 (rust/crates/futures-task-0.3.8.crate) = 7c554eb5bf48b2426c4771ab68c6b14468b6e76cc90996f528c3338d761a4d0d
+SIZE (rust/crates/futures-task-0.3.8.crate) = 11118
+SHA256 (rust/crates/futures-util-0.3.8.crate) = d304cff4a7b99cfb7986f7d43fbe93d175e72e704a8860787cc95e9ffd85cbd2
+SIZE (rust/crates/futures-util-0.3.8.crate) = 134020
+SHA256 (rust/crates/generic-array-0.14.4.crate) = 501466ecc8a30d1d3b7fc9229b122b2ce8ed6e9d9223f1138d4babb253e51817
+SIZE (rust/crates/generic-array-0.14.4.crate) = 28916
+SHA256 (rust/crates/getrandom-0.2.2.crate) = c9495705279e7140bf035dde1f6e750c162df8b625267cd52cc44e0b156732c8
+SIZE (rust/crates/getrandom-0.2.2.crate) = 26010
+SHA256 (rust/crates/heck-0.3.1.crate) = 20564e78d53d2bb135c343b3f47714a56af2061f1c928fdb541dc7b9fdd94205
+SIZE (rust/crates/heck-0.3.1.crate) = 54666
+SHA256 (rust/crates/hermit-abi-0.1.17.crate) = 5aca5565f760fb5b220e499d72710ed156fdb74e631659e99377d9ebfbd13ae8
+SIZE (rust/crates/hermit-abi-0.1.17.crate) = 10065
+SHA256 (rust/crates/hmac-0.10.1.crate) = c1441c6b1e930e2817404b5046f1f989899143a12bf92de603b69f4e0aee1e15
+SIZE (rust/crates/hmac-0.10.1.crate) = 11120
+SHA256 (rust/crates/humantime-1.3.0.crate) = df004cfca50ef23c36850aaaa59ad52cc70d0e90243c3c7737a4dd32dc7a3c4f
+SIZE (rust/crates/humantime-1.3.0.crate) = 17020
+SHA256 (rust/crates/instant-0.1.8.crate) = cb1fc4429a33e1f80d41dc9fea4d108a88bec1de8053878898ae448a0b52f613
+SIZE (rust/crates/instant-0.1.8.crate) = 5076
+SHA256 (rust/crates/js-sys-0.3.50.crate) = 2d99f9e3e84b8f67f846ef5b4cbbc3b1c29f6c759fcbce6f01aa0e73d932a24c
+SIZE (rust/crates/js-sys-0.3.50.crate) = 67123
+SHA256 (rust/crates/lazy_static-1.4.0.crate) = e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646
+SIZE (rust/crates/lazy_static-1.4.0.crate) = 10443
+SHA256 (rust/crates/libc-0.2.93.crate) = 9385f66bf6105b241aa65a61cb923ef20efc665cb9f9bb50ac2f0c4b7f378d41
+SIZE (rust/crates/libc-0.2.93.crate) = 510944
+SHA256 (rust/crates/libsqlite3-sys-0.18.0.crate) = 1e704a02bcaecd4a08b93a23f6be59d0bd79cd161e0963e9499165a0a35df7bd
+SIZE (rust/crates/libsqlite3-sys-0.18.0.crate) = 2281735
+SHA256 (rust/crates/linked-hash-map-0.5.3.crate) = 8dd5a6d5999d9907cda8ed67bbd137d3af8085216c2ac62de5be860bd41f304a
+SIZE (rust/crates/linked-hash-map-0.5.3.crate) = 16130
+SHA256 (rust/crates/lock_api-0.4.1.crate) = 28247cc5a5be2f05fbcd76dd0cf2c7d3b5400cb978a28042abcd4fa0b3f8261c
+SIZE (rust/crates/lock_api-0.4.1.crate) = 20339
+SHA256 (rust/crates/log-0.4.11.crate) = 4fabed175da42fed1fa0746b0ea71f412aa9d35e76e95e59b192c64b9dc2bf8b
+SIZE (rust/crates/log-0.4.11.crate) = 36276
+SHA256 (rust/crates/lru-cache-0.1.2.crate) = 31e24f1ad8321ca0e8a1e0ac13f23cb668e6f5466c2c57319f6a5cf1cc8e3b1c
+SIZE (rust/crates/lru-cache-0.1.2.crate) = 9307
+SHA256 (rust/crates/matches-0.1.8.crate) = 7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08
+SIZE (rust/crates/matches-0.1.8.crate) = 2216
+SHA256 (rust/crates/md-5-0.9.1.crate) = 7b5a279bb9607f9f53c22d496eade00d138d1bdcccd07d74650387cf94942a15
+SIZE (rust/crates/md-5-0.9.1.crate) = 15494
+SHA256 (rust/crates/memchr-2.3.4.crate) = 0ee1c47aaa256ecabcaea351eae4a9b01ef39ed810004e298d2511ed284b1525
+SIZE (rust/crates/memchr-2.3.4.crate) = 23077
+SHA256 (rust/crates/mio-0.7.11.crate) = cf80d3e903b34e0bd7282b218398aec54e082c840d9baf8339e0080a0c542956
+SIZE (rust/crates/mio-0.7.11.crate) = 86660
+SHA256 (rust/crates/miow-0.3.7.crate) = b9f1c5b025cda876f66ef43a113f91ebc9f4ccef34843000e0adf6ebbab84e21
+SIZE (rust/crates/miow-0.3.7.crate) = 24563
+SHA256 (rust/crates/native-tls-0.2.7.crate) = b8d96b2e1c8da3957d58100b09f102c6d9cfdfced01b7ec5a8974044bb09dbd4
+SIZE (rust/crates/native-tls-0.2.7.crate) = 24958
+SHA256 (rust/crates/ntapi-0.3.6.crate) = 3f6bb902e437b6d86e03cce10a7e2af662292c5dfef23b65899ea3ac9354ad44
+SIZE (rust/crates/ntapi-0.3.6.crate) = 127221
+SHA256 (rust/crates/num-integer-0.1.44.crate) = d2cc698a63b549a70bc047073d2949cce27cd1c7b0a4a862d08a8031bc2801db
+SIZE (rust/crates/num-integer-0.1.44.crate) = 22216
+SHA256 (rust/crates/num-traits-0.2.14.crate) = 9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290
+SIZE (rust/crates/num-traits-0.2.14.crate) = 45476
+SHA256 (rust/crates/once_cell-1.5.2.crate) = 13bd41f508810a131401606d54ac32a467c97172d74ba7662562ebba5ad07fa0
+SIZE (rust/crates/once_cell-1.5.2.crate) = 27660
+SHA256 (rust/crates/opaque-debug-0.3.0.crate) = 624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5
+SIZE (rust/crates/opaque-debug-0.3.0.crate) = 5767
+SHA256 (rust/crates/openssl-0.10.33.crate) = a61075b62a23fef5a29815de7536d940aa35ce96d18ce0cc5076272db678a577
+SIZE (rust/crates/openssl-0.10.33.crate) = 202638
+SHA256 (rust/crates/openssl-probe-0.1.2.crate) = 77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de
+SIZE (rust/crates/openssl-probe-0.1.2.crate) = 6427
+SHA256 (rust/crates/openssl-sys-0.9.61.crate) = 313752393519e876837e09e1fa183ddef0be7735868dced3196f4472d536277f
+SIZE (rust/crates/openssl-sys-0.9.61.crate) = 52010
+SHA256 (rust/crates/parking_lot-0.11.0.crate) = a4893845fa2ca272e647da5d0e46660a314ead9c2fdd9a883aabc32e481a8733
+SIZE (rust/crates/parking_lot-0.11.0.crate) = 39558
+SHA256 (rust/crates/parking_lot_core-0.8.0.crate) = c361aa727dd08437f2f1447be8b59a33b0edd15e0fcee698f935613d9efbca9b
+SIZE (rust/crates/parking_lot_core-0.8.0.crate) = 33870
+SHA256 (rust/crates/percent-encoding-2.1.0.crate) = d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e
+SIZE (rust/crates/percent-encoding-2.1.0.crate) = 9748
+SHA256 (rust/crates/phf-0.8.0.crate) = 3dfb61232e34fcb633f43d12c58f83c1df82962dcdfa565a4e866ffc17dafe12
+SIZE (rust/crates/phf-0.8.0.crate) = 3902
+SHA256 (rust/crates/phf_shared-0.8.0.crate) = c00cf8b9eafe68dde5e9eaa2cef8ee84a9336a47d566ec55ca16589633b65af7
+SIZE (rust/crates/phf_shared-0.8.0.crate) = 2860
+SHA256 (rust/crates/pin-project-1.0.1.crate) = ee41d838744f60d959d7074e3afb6b35c7456d0f61cad38a24e35e6553f73841
+SIZE (rust/crates/pin-project-1.0.1.crate) = 54113
+SHA256 (rust/crates/pin-project-internal-1.0.1.crate) = 81a4ffa594b66bff340084d4081df649a7dc049ac8d7fc458d8e628bfbbb2f86
+SIZE (rust/crates/pin-project-internal-1.0.1.crate) = 26953
+SHA256 (rust/crates/pin-project-lite-0.2.6.crate) = dc0e1f259c92177c30a4c9d177246edd0a3568b25756a977d0632cf8fa37e905
+SIZE (rust/crates/pin-project-lite-0.2.6.crate) = 25494
+SHA256 (rust/crates/pin-utils-0.1.0.crate) = 8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184
+SIZE (rust/crates/pin-utils-0.1.0.crate) = 7580
+SHA256 (rust/crates/pkg-config-0.3.19.crate) = 3831453b3449ceb48b6d9c7ad7c96d5ea673e9b470a1dc578c2ce6521230884c
+SIZE (rust/crates/pkg-config-0.3.19.crate) = 15451
+SHA256 (rust/crates/postgres-0.19.1.crate) = c7871ee579860d8183f542e387b176a25f2656b9fb5211e045397f745a68d1c2
+SIZE (rust/crates/postgres-0.19.1.crate) = 25518
+SHA256 (rust/crates/postgres-native-tls-0.5.0.crate) = 2d442770e2b1e244bb5eb03b31c79b65bb2568f413b899eaba850fa945a65954
+SIZE (rust/crates/postgres-native-tls-0.5.0.crate) = 7488
+SHA256 (rust/crates/postgres-protocol-0.6.1.crate) = ff3e0f70d32e20923cabf2df02913be7c1842d4c772db8065c00fcfdd1d1bff3
+SIZE (rust/crates/postgres-protocol-0.6.1.crate) = 24063
+SHA256 (rust/crates/postgres-types-0.2.1.crate) = 430f4131e1b7657b0cd9a2b0c3408d77c9a43a042d300b8c77f981dffcc43a2f
+SIZE (rust/crates/postgres-types-0.2.1.crate) = 25448
+SHA256 (rust/crates/ppv-lite86-0.2.10.crate) = ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857
+SIZE (rust/crates/ppv-lite86-0.2.10.crate) = 20915
+SHA256 (rust/crates/proc-macro-error-1.0.4.crate) = da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c
+SIZE (rust/crates/proc-macro-error-1.0.4.crate) = 25293
+SHA256 (rust/crates/proc-macro-error-attr-1.0.4.crate) = a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869
+SIZE (rust/crates/proc-macro-error-attr-1.0.4.crate) = 7971
+SHA256 (rust/crates/proc-macro-hack-0.5.19.crate) = dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5
+SIZE (rust/crates/proc-macro-hack-0.5.19.crate) = 15556
+SHA256 (rust/crates/proc-macro-nested-0.1.6.crate) = eba180dafb9038b050a4c280019bbedf9f2467b61e5d892dcad585bb57aadc5a
+SIZE (rust/crates/proc-macro-nested-0.1.6.crate) = 6498
+SHA256 (rust/crates/proc-macro2-1.0.26.crate) = a152013215dca273577e18d2bf00fa862b89b24169fb78c4c95aeb07992c9cec
+SIZE (rust/crates/proc-macro2-1.0.26.crate) = 38233
+SHA256 (rust/crates/quick-error-1.2.3.crate) = a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0
+SIZE (rust/crates/quick-error-1.2.3.crate) = 15066
+SHA256 (rust/crates/quote-1.0.7.crate) = aa563d17ecb180e500da1cfd2b028310ac758de548efdd203e18f283af693f37
+SIZE (rust/crates/quote-1.0.7.crate) = 25170
+SHA256 (rust/crates/rand-0.8.3.crate) = 0ef9e7e66b4468674bfcb0c81af8b7fa0bb154fa9f28eb840da5c447baeb8d7e
+SIZE (rust/crates/rand-0.8.3.crate) = 84493
+SHA256 (rust/crates/rand_chacha-0.3.0.crate) = e12735cf05c9e10bf21534da50a147b924d555dc7a547c42e6bb2d5b6017ae0d
+SIZE (rust/crates/rand_chacha-0.3.0.crate) = 13920
+SHA256 (rust/crates/rand_core-0.6.2.crate) = 34cf66eb183df1c5876e2dcf6b13d57340741e8dc255b48e40a26de954d06ae7
+SIZE (rust/crates/rand_core-0.6.2.crate) = 21708
+SHA256 (rust/crates/rand_hc-0.3.0.crate) = 3190ef7066a446f2e7f42e239d161e905420ccab01eb967c9eb27d21b2322a73
+SIZE (rust/crates/rand_hc-0.3.0.crate) = 11780
+SHA256 (rust/crates/redox_syscall-0.1.57.crate) = 41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce
+SIZE (rust/crates/redox_syscall-0.1.57.crate) = 17087
+SHA256 (rust/crates/redox_syscall-0.2.5.crate) = 94341e4e44e24f6b591b59e47a8a027df12e008d73fd5672dbea9cc22f4507d9
+SIZE (rust/crates/redox_syscall-0.2.5.crate) = 23449
+SHA256 (rust/crates/regex-1.4.2.crate) = 38cf2c13ed4745de91a5eb834e11c00bcc3709e773173b2ce4c56c9fbde04b9c
+SIZE (rust/crates/regex-1.4.2.crate) = 236931
+SHA256 (rust/crates/regex-syntax-0.6.21.crate) = 3b181ba2dcf07aaccad5448e8ead58db5b742cf85dfe035e2227f137a539a189
+SIZE (rust/crates/regex-syntax-0.6.21.crate) = 293572
+SHA256 (rust/crates/remove_dir_all-0.5.3.crate) = 3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7
+SIZE (rust/crates/remove_dir_all-0.5.3.crate) = 9184
+SHA256 (rust/crates/ring-0.16.20.crate) = 3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc
+SIZE (rust/crates/ring-0.16.20.crate) = 5082615
+SHA256 (rust/crates/rusqlite-0.23.1.crate) = 45d0fd62e1df63d254714e6cb40d0a0e82e7a1623e7a27f679d851af092ae58b
+SIZE (rust/crates/rusqlite-0.23.1.crate) = 112106
+SHA256 (rust/crates/rustls-0.19.0.crate) = 064fd21ff87c6e87ed4506e68beb42459caa4a0e2eb144932e6776768556980b
+SIZE (rust/crates/rustls-0.19.0.crate) = 208339
+SHA256 (rust/crates/schannel-0.1.19.crate) = 8f05ba609c234e60bee0d547fe94a4c7e9da733d1c962cf6e59efa4cd9c8bc75
+SIZE (rust/crates/schannel-0.1.19.crate) = 42755
+SHA256 (rust/crates/scopeguard-1.1.0.crate) = d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd
+SIZE (rust/crates/scopeguard-1.1.0.crate) = 11470
+SHA256 (rust/crates/sct-0.6.0.crate) = e3042af939fca8c3453b7af0f1c66e533a15a86169e39de2657310ade8f98d3c
+SIZE (rust/crates/sct-0.6.0.crate) = 28777
+SHA256 (rust/crates/security-framework-2.2.0.crate) = 3670b1d2fdf6084d192bc71ead7aabe6c06aa2ea3fbd9cc3ac111fa5c2b1bd84
+SIZE (rust/crates/security-framework-2.2.0.crate) = 57599
+SHA256 (rust/crates/security-framework-sys-2.2.0.crate) = 3676258fd3cfe2c9a0ec99ce3038798d847ce3e4bb17746373eb9f0f1ac16339
+SIZE (rust/crates/security-framework-sys-2.2.0.crate) = 11744
+SHA256 (rust/crates/serde-1.0.117.crate) = b88fa983de7720629c9387e9f517353ed404164b1e482c970a90c1a4aaf7dc1a
+SIZE (rust/crates/serde-1.0.117.crate) = 74505
+SHA256 (rust/crates/serde_derive-1.0.117.crate) = cbd1ae72adb44aab48f325a02444a5fc079349a8d804c1fc922aed3f7454c74e
+SIZE (rust/crates/serde_derive-1.0.117.crate) = 50712
+SHA256 (rust/crates/sha2-0.9.2.crate) = 6e7aab86fe2149bad8c507606bdb3f4ef5e7b2380eb92350f56122cca72a42a8
+SIZE (rust/crates/sha2-0.9.2.crate) = 19665
+SHA256 (rust/crates/siphasher-0.3.3.crate) = fa8f3741c7372e75519bd9346068370c9cdaabcc1f9599cbcf2a2719352286b7
+SIZE (rust/crates/siphasher-0.3.3.crate) = 9458
+SHA256 (rust/crates/slab-0.4.2.crate) = c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8
+SIZE (rust/crates/slab-0.4.2.crate) = 10136
+SHA256 (rust/crates/smallvec-1.5.0.crate) = 7acad6f34eb9e8a259d3283d1e8c1d34d7415943d4895f65cc73813c7396fc85
+SIZE (rust/crates/smallvec-1.5.0.crate) = 26303
+SHA256 (rust/crates/socket2-0.4.0.crate) = 9e3dfc207c526015c632472a77be09cf1b6e46866581aecae5cc38fb4235dea2
+SIZE (rust/crates/socket2-0.4.0.crate) = 37949
+SHA256 (rust/crates/spin-0.5.2.crate) = 6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d
+SIZE (rust/crates/spin-0.5.2.crate) = 12004
+SHA256 (rust/crates/stringprep-0.1.2.crate) = 8ee348cb74b87454fff4b551cbf727025810a004f88aeacae7f85b87f4e9a1c1
+SIZE (rust/crates/stringprep-0.1.2.crate) = 22021
+SHA256 (rust/crates/strsim-0.8.0.crate) = 8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a
+SIZE (rust/crates/strsim-0.8.0.crate) = 9309
+SHA256 (rust/crates/structopt-0.3.20.crate) = 126d630294ec449fae0b16f964e35bf3c74f940da9dca17ee9b905f7b3112eb8
+SIZE (rust/crates/structopt-0.3.20.crate) = 50699
+SHA256 (rust/crates/structopt-derive-0.4.13.crate) = 65e51c492f9e23a220534971ff5afc14037289de430e3c83f9daf6a1b6ae91e8
+SIZE (rust/crates/structopt-derive-0.4.13.crate) = 20115
+SHA256 (rust/crates/subtle-2.3.0.crate) = 343f3f510c2915908f155e94f17220b19ccfacf2a64a2a5d8004f2c3e311e7fd
+SIZE (rust/crates/subtle-2.3.0.crate) = 11096
+SHA256 (rust/crates/syn-1.0.69.crate) = 48fe99c6bd8b1cc636890bcc071842de909d902c81ac7dab53ba33c421ab8ffb
+SIZE (rust/crates/syn-1.0.69.crate) = 231954
+SHA256 (rust/crates/tempfile-3.2.0.crate) = dac1c663cfc93810f88aed9b8941d48cabf856a1b111c29a40439018d870eb22
+SIZE (rust/crates/tempfile-3.2.0.crate) = 25892
+SHA256 (rust/crates/termcolor-1.1.0.crate) = bb6bfa289a4d7c5766392812c0a1f4c1ba45afa1ad47803c11e1f407d846d75f
+SIZE (rust/crates/termcolor-1.1.0.crate) = 17193
+SHA256 (rust/crates/textwrap-0.11.0.crate) = d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060
+SIZE (rust/crates/textwrap-0.11.0.crate) = 17322
+SHA256 (rust/crates/thread_local-1.0.1.crate) = d40c6d1b69745a6ec6fb1ca717914848da4b44ae29d9b3080cbee91d72a69b14
+SIZE (rust/crates/thread_local-1.0.1.crate) = 12609
+SHA256 (rust/crates/time-0.1.44.crate) = 6db9e6914ab8b1ae1c260a4ae7a49b6c5611b40328a735b21862567685e73255
+SIZE (rust/crates/time-0.1.44.crate) = 28885
+SHA256 (rust/crates/tinyvec-1.0.1.crate) = b78a366903f506d2ad52ca8dc552102ffdd3e937ba8a227f024dc1d1eae28575
+SIZE (rust/crates/tinyvec-1.0.1.crate) = 33836
+SHA256 (rust/crates/tinyvec_macros-0.1.0.crate) = cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c
+SIZE (rust/crates/tinyvec_macros-0.1.0.crate) = 1817
+SHA256 (rust/crates/tokio-1.4.0.crate) = 134af885d758d645f0f0505c9a8b3f9bf8a348fd822e112ab5248138348f1722
+SIZE (rust/crates/tokio-1.4.0.crate) = 439130
+SHA256 (rust/crates/tokio-native-tls-0.3.0.crate) = f7d995660bd2b7f8c1568414c1126076c13fbb725c40112dc0120b78eb9b717b
+SIZE (rust/crates/tokio-native-tls-0.3.0.crate) = 20759
+SHA256 (rust/crates/tokio-postgres-0.7.1.crate) = 98779a950cb6ef76f8ad71c411176115c5c1200a83eeeca4dd9f61e3fc4836c8
+SIZE (rust/crates/tokio-postgres-0.7.1.crate) = 66614
+SHA256 (rust/crates/tokio-postgres-rustls-0.8.0.crate) = 7bd8c37d8c23cb6ecdc32fc171bade4e9c7f1be65f693a17afbaad02091a0a19
+SIZE (rust/crates/tokio-postgres-rustls-0.8.0.crate) = 3326
+SHA256 (rust/crates/tokio-rustls-0.22.0.crate) = bc6844de72e57df1980054b38be3a9f4702aba4858be64dd700181a8a6d0e1b6
+SIZE (rust/crates/tokio-rustls-0.22.0.crate) = 22706
+SHA256 (rust/crates/tokio-util-0.6.5.crate) = 5143d049e85af7fbc36f5454d990e62c2df705b3589f123b71f441b6b59f443f
+SIZE (rust/crates/tokio-util-0.6.5.crate) = 71019
+SHA256 (rust/crates/toml-0.5.7.crate) = 75cf45bb0bef80604d001caaec0d09da99611b3c0fd39d3080468875cdb65645
+SIZE (rust/crates/toml-0.5.7.crate) = 54372
+SHA256 (rust/crates/typenum-1.12.0.crate) = 373c8a200f9e67a0c95e62a4f52fbf80c23b4381c05a17845531982fa99e6b33
+SIZE (rust/crates/typenum-1.12.0.crate) = 36037
+SHA256 (rust/crates/unicode-bidi-0.3.4.crate) = 49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5
+SIZE (rust/crates/unicode-bidi-0.3.4.crate) = 32228
+SHA256 (rust/crates/unicode-normalization-0.1.14.crate) = b7f98e67a4d84f730d343392f9bfff7d21e3fca562b9cb7a43b768350beeddc6
+SIZE (rust/crates/unicode-normalization-0.1.14.crate) = 92680
+SHA256 (rust/crates/unicode-segmentation-1.7.0.crate) = db8716a166f290ff49dabc18b44aa407cb7c6dbe1aa0971b44b8a24b0ca35aae
+SIZE (rust/crates/unicode-segmentation-1.7.0.crate) = 93069
+SHA256 (rust/crates/unicode-width-0.1.8.crate) = 9337591893a19b88d8d87f2cec1e73fad5cdfd10e5a6f349f498ad6ea2ffb1e3
+SIZE (rust/crates/unicode-width-0.1.8.crate) = 16732
+SHA256 (rust/crates/unicode-xid-0.2.1.crate) = f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564
+SIZE (rust/crates/unicode-xid-0.2.1.crate) = 14392
+SHA256 (rust/crates/untrusted-0.7.1.crate) = a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a
+SIZE (rust/crates/untrusted-0.7.1.crate) = 7924
+SHA256 (rust/crates/vcpkg-0.2.10.crate) = 6454029bf181f092ad1b853286f23e2c507d8e8194d01d92da4a55c274a5508c
+SIZE (rust/crates/vcpkg-0.2.10.crate) = 11504
+SHA256 (rust/crates/vec_map-0.8.2.crate) = f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191
+SIZE (rust/crates/vec_map-0.8.2.crate) = 14466
+SHA256 (rust/crates/version_check-0.9.2.crate) = b5a972e5669d67ba988ce3dc826706fb0a8b01471c088cb0b6110b805cc36aed
+SIZE (rust/crates/version_check-0.9.2.crate) = 11979
+SHA256 (rust/crates/wasi-0.10.0+wasi-snapshot-preview1.crate) = 1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f
+SIZE (rust/crates/wasi-0.10.0+wasi-snapshot-preview1.crate) = 26964
+SHA256 (rust/crates/wasm-bindgen-0.2.73.crate) = 83240549659d187488f91f33c0f8547cbfef0b2088bc470c116d1d260ef623d9
+SIZE (rust/crates/wasm-bindgen-0.2.73.crate) = 159293
+SHA256 (rust/crates/wasm-bindgen-backend-0.2.73.crate) = ae70622411ca953215ca6d06d3ebeb1e915f0f6613e3b495122878d7ebec7dae
+SIZE (rust/crates/wasm-bindgen-backend-0.2.73.crate) = 25434
+SHA256 (rust/crates/wasm-bindgen-macro-0.2.73.crate) = 3e734d91443f177bfdb41969de821e15c516931c3c3db3d318fa1b68975d0f6f
+SIZE (rust/crates/wasm-bindgen-macro-0.2.73.crate) = 11545
+SHA256 (rust/crates/wasm-bindgen-macro-support-0.2.73.crate) = d53739ff08c8a68b0fdbcd54c372b8ab800b1449ab3c9d706503bc7dd1621b2c
+SIZE (rust/crates/wasm-bindgen-macro-support-0.2.73.crate) = 17835
+SHA256 (rust/crates/wasm-bindgen-shared-0.2.73.crate) = d9a543ae66aa233d14bb765ed9af4a33e81b8b58d1584cf1b47ff8cd0b9e4489
+SIZE (rust/crates/wasm-bindgen-shared-0.2.73.crate) = 6691
+SHA256 (rust/crates/web-sys-0.3.50.crate) = a905d57e488fec8861446d3393670fb50d27a262344013181c2cdf9fff5481be
+SIZE (rust/crates/web-sys-0.3.50.crate) = 650100
+SHA256 (rust/crates/webpki-0.21.4.crate) = b8e38c0608262c46d4a56202ebabdeb094cef7e560ca7a226c6bf055188aa4ea
+SIZE (rust/crates/webpki-0.21.4.crate) = 58505
+SHA256 (rust/crates/winapi-0.3.9.crate) = 5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419
+SIZE (rust/crates/winapi-0.3.9.crate) = 1200382
+SHA256 (rust/crates/winapi-i686-pc-windows-gnu-0.4.0.crate) = ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6
+SIZE (rust/crates/winapi-i686-pc-windows-gnu-0.4.0.crate) = 2918815
+SHA256 (rust/crates/winapi-util-0.1.5.crate) = 70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178
+SIZE (rust/crates/winapi-util-0.1.5.crate) = 10164
+SHA256 (rust/crates/winapi-x86_64-pc-windows-gnu-0.4.0.crate) = 712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f
+SIZE (rust/crates/winapi-x86_64-pc-windows-gnu-0.4.0.crate) = 2947998
+SHA256 (byronwasti-movine-v0.11.0_GH0.tar.gz) = ed67992ff9c478084602bcebe905c4a78a4053b77b6aff4d2a48d8c5abab6671
+SIZE (byronwasti-movine-v0.11.0_GH0.tar.gz) = 26579
diff --git a/databases/movine/files/patch-powerpc b/databases/movine/files/patch-powerpc
new file mode 100644
index 000000000000..4a416caf6ff6
--- /dev/null
+++ b/databases/movine/files/patch-powerpc
@@ -0,0 +1,62 @@
+--- cargo-crates/libc-0.2.93/src/unix/bsd/freebsdlike/freebsd/mod.rs.orig	2020-03-17 20:35:43 UTC
++++ cargo-crates/libc-0.2.93/src/unix/bsd/freebsdlike/freebsd/mod.rs
+@@ -1486,6 +1486,9 @@ cfg_if! {
+     } else if #[cfg(target_arch = "powerpc64")] {
+         mod powerpc64;
+         pub use self::powerpc64::*;
++    } else if #[cfg(target_arch = "powerpc")] {
++        mod powerpc;
++        pub use self::powerpc::*;
+     } else {
+         // Unknown target_arch
+     }
+--- cargo-crates/libc-0.2.93/src/unix/bsd/freebsdlike/freebsd/powerpc.rs.orig	2021-06-23 22:40:24 UTC
++++ cargo-crates/libc-0.2.93/src/unix/bsd/freebsdlike/freebsd/powerpc.rs
+@@ -0,0 +1,47 @@
++pub type c_char = u8;
++pub type c_long = i32;
++pub type c_ulong = u32;
++pub type wchar_t = i32;
++pub type time_t = i64;
++pub type suseconds_t = i32;
++pub type register_t = i32;
++
++s! {
++    pub struct stat {
++        pub st_dev: ::dev_t,
++        pub st_ino: ::ino_t,
++        pub st_mode: ::mode_t,
++        pub st_nlink: ::nlink_t,
++        pub st_uid: ::uid_t,
++        pub st_gid: ::gid_t,
++        pub st_rdev: ::dev_t,
++        pub st_atime: ::time_t,
++        pub st_atime_nsec: ::c_long,
++        pub st_mtime: ::time_t,
++        pub st_mtime_nsec: ::c_long,
++        pub st_ctime: ::time_t,
++        pub st_ctime_nsec: ::c_long,
++        pub st_size: ::off_t,
++        pub st_blocks: ::blkcnt_t,
++        pub st_blksize: ::blksize_t,
++        pub st_flags: ::fflags_t,
++        pub st_gen: u32,
++        pub st_lspare: i32,
++        pub st_birthtime: ::time_t,
++        pub st_birthtime_nsec: ::c_long,
++    }
++}
++
++// should be pub(crate), but that requires Rust 1.18.0
++cfg_if! {
++    if #[cfg(libc_const_size_of)] {
++        #[doc(hidden)]
++        pub const _ALIGNBYTES: usize = ::mem::size_of::<::c_int>() - 1;
++    } else {
++        #[doc(hidden)]
++        pub const _ALIGNBYTES: usize = 4 - 1;
++    }
++}
++
++pub const MAP_32BIT: ::c_int = 0x00080000;
++pub const MINSIGSTKSZ: ::size_t = 2048; // 512 * 4
diff --git a/databases/movine/pkg-descr b/databases/movine/pkg-descr
new file mode 100644
index 000000000000..cff09ed13b5f
--- /dev/null
+++ b/databases/movine/pkg-descr
@@ -0,0 +1,8 @@
+Movine is a simple database migration manager that aims to be compatible with
+real-world migration work. Many migration managers get confused with
+complicated development strategies for migrations. Oftentimes migration managers
+do not warn you if the SQL saved in git differs from what was actually run on
+the database. Movine solves this issue by keeping track of the unique hashes for
+the up.sql and down.sql for each migration, and provides tools for fixing
+issues. This allows users to easily keep track of whether their local migration
+history matches the one on the database.
diff --git a/databases/mroonga/Makefile b/databases/mroonga/Makefile
index 0daad6e08f31..26e014e5269e 100644
--- a/databases/mroonga/Makefile
+++ b/databases/mroonga/Makefile
@@ -1,37 +1,35 @@
-# Created by: Muhammad Moinur Rahman <bofh@FreeBSD.org>
-
 PORTNAME=	mroonga
-PORTVERSION=	11.04
+PORTVERSION=	13.05
+PORTREVISION=	1
 CATEGORIES=	databases textproc
 MASTER_SITES=	http://packages.groonga.org/source/mroonga/
 
 MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	Open-source fulltext search engine for MySQL
+WWW=		https://mroonga.org/
 
 LICENSE=	LGPL21
-
-IGNORE_WITH_MYSQL=	101m 102m 103m 57p 57w
+LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	${NONEXISTENT}:${_MYSQL_SERVER}:configure
 LIB_DEPENDS=	libgroonga.so:textproc/groonga
 
 USES=		compiler:c11 libtool mysql pkgconfig shebangfix
+IGNORE_WITH_MYSQL=	105m 106m 1011m 81
 
-SHEBANG_FILES=	data/rpm/post.sh \
-				data/rpm/preun.sh
+SHEBANG_FILES=	data/rpm/post.sh data/rpm/preun.sh
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-mysql-source="$$(cd ${PORTSDIR}/${_MYSQL_SERVER}; ${MAKE} -V WRKSRC)" \
-		--with-mysql-build="$$(cd ${PORTSDIR}/${_MYSQL_SERVER}; ${MAKE} -V BUILD_WRKSRC)" \
-		--with-mysql-config=${PREFIX}/bin/mysql_config
+GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
+CONFIGURE_ARGS=	--with-mysql-build="$$(cd ${PORTSDIR}/${_MYSQL_SERVER}; ${MAKE} -V BUILD_WRKSRC)" \
+		--with-mysql-config=${PREFIX}/bin/mysql_config \
+		--with-mysql-source="$$(cd ${PORTSDIR}/${_MYSQL_SERVER}; ${MAKE} -V WRKSRC)"
 
 SUB_FILES=	pkg-message
 
-OPTIONS_DEFINE=		DOCS
+OPTIONS_DEFINE=	DOCS
 
 post-patch:
-# Avoid conflict with C++20 <version> by adding .txt suffix
-	@${MV} ${WRKSRC}/version ${WRKSRC}/version.txt
 	@${REINPLACE_CMD} -i .c++20 's,srcdir)/version[[:>:]],&.txt,' \
 		${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} -e '/deb/d' \
diff --git a/databases/mroonga/distinfo b/databases/mroonga/distinfo
index 72e5a0750cff..ff70662bba3c 100644
--- a/databases/mroonga/distinfo
+++ b/databases/mroonga/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1625174243
-SHA256 (mroonga-11.04.tar.gz) = 3f601729f1e7fe35cbd1d6cc15c7c7a0b5560d63ed89c082dfdae6a85e90c28a
-SIZE (mroonga-11.04.tar.gz) = 2792714
+TIMESTAMP = 1691885759
+SHA256 (mroonga-13.05.tar.gz) = 8e918d40129c6c09b47eb0c56c7548f82c37d5569318e4bf11e94364786817cd
+SIZE (mroonga-13.05.tar.gz) = 2684820
diff --git a/databases/mroonga/pkg-descr b/databases/mroonga/pkg-descr
index b7efe19e7403..2a64f0f7a81b 100644
--- a/databases/mroonga/pkg-descr
+++ b/databases/mroonga/pkg-descr
@@ -1,5 +1,3 @@
 Mroonga is a storage engine for MySQL. It provides fast fulltext search
 feature for all languages including Chinese, Japanese and Korean to all
 MySQL users. Mroonga was called Groonga storage engine.
-
-WWW: http://mroonga.org/
diff --git a/databases/mroonga/pkg-plist b/databases/mroonga/pkg-plist
index b73660cb3c69..fb8cc2dcb8a4 100644
--- a/databases/mroonga/pkg-plist
+++ b/databases/mroonga/pkg-plist
@@ -2,8 +2,8 @@ lib/mysql/plugin/ha_mroonga.a
 lib/mysql/plugin/ha_mroonga.so
 lib/mysql/plugin/ha_mroonga.so.0
 lib/mysql/plugin/ha_mroonga.so.0.0.0
-man/ja/man1/mroonga.1.gz
-man/man1/mroonga.1.gz
+share/man/ja/man1/mroonga.1.gz
+share/man/man1/mroonga.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/en/html/_images/storage-mode.png
 %%PORTDOCS%%%%DOCSDIR%%/en/html/_images/wrapper-mode.png
 %%PORTDOCS%%%%DOCSDIR%%/en/html/_static/basic.css
@@ -11,8 +11,6 @@ man/man1/mroonga.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/en/html/_static/documentation_options.js
 %%PORTDOCS%%%%DOCSDIR%%/en/html/_static/favicon.ico
 %%PORTDOCS%%%%DOCSDIR%%/en/html/_static/file.png
-%%PORTDOCS%%%%DOCSDIR%%/en/html/_static/jquery-3.5.1.js
-%%PORTDOCS%%%%DOCSDIR%%/en/html/_static/jquery.js
 %%PORTDOCS%%%%DOCSDIR%%/en/html/_static/language_data.js
 %%PORTDOCS%%%%DOCSDIR%%/en/html/_static/logo.png
 %%PORTDOCS%%%%DOCSDIR%%/en/html/_static/minus.png
@@ -21,8 +19,7 @@ man/man1/mroonga.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/en/html/_static/plus.png
 %%PORTDOCS%%%%DOCSDIR%%/en/html/_static/pygments.css
 %%PORTDOCS%%%%DOCSDIR%%/en/html/_static/searchtools.js
-%%PORTDOCS%%%%DOCSDIR%%/en/html/_static/underscore-1.13.1.js
-%%PORTDOCS%%%%DOCSDIR%%/en/html/_static/underscore.js
+%%PORTDOCS%%%%DOCSDIR%%/en/html/_static/sphinx_highlight.js
 %%PORTDOCS%%%%DOCSDIR%%/en/html/characteristic.html
 %%PORTDOCS%%%%DOCSDIR%%/en/html/community.html
 %%PORTDOCS%%%%DOCSDIR%%/en/html/contribution.html
@@ -37,22 +34,32 @@ man/man1/mroonga.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/en/html/genindex.html
 %%PORTDOCS%%%%DOCSDIR%%/en/html/index.html
 %%PORTDOCS%%%%DOCSDIR%%/en/html/install.html
+%%PORTDOCS%%%%DOCSDIR%%/en/html/install/almalinux.html
+%%PORTDOCS%%%%DOCSDIR%%/en/html/install/amazon-linux.html
 %%PORTDOCS%%%%DOCSDIR%%/en/html/install/centos.html
 %%PORTDOCS%%%%DOCSDIR%%/en/html/install/debian.html
 %%PORTDOCS%%%%DOCSDIR%%/en/html/install/docker.html
 %%PORTDOCS%%%%DOCSDIR%%/en/html/install/fedora.html
 %%PORTDOCS%%%%DOCSDIR%%/en/html/install/macos.html
+%%PORTDOCS%%%%DOCSDIR%%/en/html/install/oracle-linux.html
 %%PORTDOCS%%%%DOCSDIR%%/en/html/install/others.html
 %%PORTDOCS%%%%DOCSDIR%%/en/html/install/ubuntu.html
 %%PORTDOCS%%%%DOCSDIR%%/en/html/install/windows.html
 %%PORTDOCS%%%%DOCSDIR%%/en/html/news.html
-%%PORTDOCS%%%%DOCSDIR%%/en/html/news/0.x.html
-%%PORTDOCS%%%%DOCSDIR%%/en/html/news/1.x.html
-%%PORTDOCS%%%%DOCSDIR%%/en/html/news/2.x.html
-%%PORTDOCS%%%%DOCSDIR%%/en/html/news/3.x.html
-%%PORTDOCS%%%%DOCSDIR%%/en/html/news/4.x.html
-%%PORTDOCS%%%%DOCSDIR%%/en/html/news/5.x.html
-%%PORTDOCS%%%%DOCSDIR%%/en/html/news/6.x.html
+%%PORTDOCS%%%%DOCSDIR%%/en/html/news/0.html
+%%PORTDOCS%%%%DOCSDIR%%/en/html/news/1.html
+%%PORTDOCS%%%%DOCSDIR%%/en/html/news/10.html
+%%PORTDOCS%%%%DOCSDIR%%/en/html/news/11.html
+%%PORTDOCS%%%%DOCSDIR%%/en/html/news/12.html
+%%PORTDOCS%%%%DOCSDIR%%/en/html/news/13.html
+%%PORTDOCS%%%%DOCSDIR%%/en/html/news/2.html
+%%PORTDOCS%%%%DOCSDIR%%/en/html/news/3.html
+%%PORTDOCS%%%%DOCSDIR%%/en/html/news/4.html
+%%PORTDOCS%%%%DOCSDIR%%/en/html/news/5.html
+%%PORTDOCS%%%%DOCSDIR%%/en/html/news/6.html
+%%PORTDOCS%%%%DOCSDIR%%/en/html/news/7.html
+%%PORTDOCS%%%%DOCSDIR%%/en/html/news/8.html
+%%PORTDOCS%%%%DOCSDIR%%/en/html/news/9.html
 %%PORTDOCS%%%%DOCSDIR%%/en/html/objects.inv
 %%PORTDOCS%%%%DOCSDIR%%/en/html/reference.html
 %%PORTDOCS%%%%DOCSDIR%%/en/html/reference/full_text_search.html
@@ -86,8 +93,6 @@ man/man1/mroonga.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/ja/html/_static/documentation_options.js
 %%PORTDOCS%%%%DOCSDIR%%/ja/html/_static/favicon.ico
 %%PORTDOCS%%%%DOCSDIR%%/ja/html/_static/file.png
-%%PORTDOCS%%%%DOCSDIR%%/ja/html/_static/jquery-3.5.1.js
-%%PORTDOCS%%%%DOCSDIR%%/ja/html/_static/jquery.js
 %%PORTDOCS%%%%DOCSDIR%%/ja/html/_static/language_data.js
 %%PORTDOCS%%%%DOCSDIR%%/ja/html/_static/logo.png
 %%PORTDOCS%%%%DOCSDIR%%/ja/html/_static/minus.png
@@ -96,8 +101,7 @@ man/man1/mroonga.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/ja/html/_static/plus.png
 %%PORTDOCS%%%%DOCSDIR%%/ja/html/_static/pygments.css
 %%PORTDOCS%%%%DOCSDIR%%/ja/html/_static/searchtools.js
-%%PORTDOCS%%%%DOCSDIR%%/ja/html/_static/underscore-1.13.1.js
-%%PORTDOCS%%%%DOCSDIR%%/ja/html/_static/underscore.js
+%%PORTDOCS%%%%DOCSDIR%%/ja/html/_static/sphinx_highlight.js
 %%PORTDOCS%%%%DOCSDIR%%/ja/html/characteristic.html
 %%PORTDOCS%%%%DOCSDIR%%/ja/html/community.html
 %%PORTDOCS%%%%DOCSDIR%%/ja/html/contribution.html
@@ -112,22 +116,32 @@ man/man1/mroonga.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/ja/html/genindex.html
 %%PORTDOCS%%%%DOCSDIR%%/ja/html/index.html
 %%PORTDOCS%%%%DOCSDIR%%/ja/html/install.html
+%%PORTDOCS%%%%DOCSDIR%%/ja/html/install/almalinux.html
+%%PORTDOCS%%%%DOCSDIR%%/ja/html/install/amazon-linux.html
 %%PORTDOCS%%%%DOCSDIR%%/ja/html/install/centos.html
 %%PORTDOCS%%%%DOCSDIR%%/ja/html/install/debian.html
 %%PORTDOCS%%%%DOCSDIR%%/ja/html/install/docker.html
 %%PORTDOCS%%%%DOCSDIR%%/ja/html/install/fedora.html
 %%PORTDOCS%%%%DOCSDIR%%/ja/html/install/macos.html
+%%PORTDOCS%%%%DOCSDIR%%/ja/html/install/oracle-linux.html
 %%PORTDOCS%%%%DOCSDIR%%/ja/html/install/others.html
 %%PORTDOCS%%%%DOCSDIR%%/ja/html/install/ubuntu.html
 %%PORTDOCS%%%%DOCSDIR%%/ja/html/install/windows.html
 %%PORTDOCS%%%%DOCSDIR%%/ja/html/news.html
-%%PORTDOCS%%%%DOCSDIR%%/ja/html/news/0.x.html
-%%PORTDOCS%%%%DOCSDIR%%/ja/html/news/1.x.html
-%%PORTDOCS%%%%DOCSDIR%%/ja/html/news/2.x.html
-%%PORTDOCS%%%%DOCSDIR%%/ja/html/news/3.x.html
-%%PORTDOCS%%%%DOCSDIR%%/ja/html/news/4.x.html
-%%PORTDOCS%%%%DOCSDIR%%/ja/html/news/5.x.html
-%%PORTDOCS%%%%DOCSDIR%%/ja/html/news/6.x.html
+%%PORTDOCS%%%%DOCSDIR%%/ja/html/news/0.html
+%%PORTDOCS%%%%DOCSDIR%%/ja/html/news/1.html
+%%PORTDOCS%%%%DOCSDIR%%/ja/html/news/10.html
+%%PORTDOCS%%%%DOCSDIR%%/ja/html/news/11.html
+%%PORTDOCS%%%%DOCSDIR%%/ja/html/news/12.html
+%%PORTDOCS%%%%DOCSDIR%%/ja/html/news/13.html
+%%PORTDOCS%%%%DOCSDIR%%/ja/html/news/2.html
+%%PORTDOCS%%%%DOCSDIR%%/ja/html/news/3.html
+%%PORTDOCS%%%%DOCSDIR%%/ja/html/news/4.html
+%%PORTDOCS%%%%DOCSDIR%%/ja/html/news/5.html
+%%PORTDOCS%%%%DOCSDIR%%/ja/html/news/6.html
+%%PORTDOCS%%%%DOCSDIR%%/ja/html/news/7.html
+%%PORTDOCS%%%%DOCSDIR%%/ja/html/news/8.html
+%%PORTDOCS%%%%DOCSDIR%%/ja/html/news/9.html
 %%PORTDOCS%%%%DOCSDIR%%/ja/html/objects.inv
 %%PORTDOCS%%%%DOCSDIR%%/ja/html/reference.html
 %%PORTDOCS%%%%DOCSDIR%%/ja/html/reference/full_text_search.html
@@ -175,22 +189,32 @@ man/man1/mroonga.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/source/index.rst
 %%PORTDOCS%%%%DOCSDIR%%/source/install.rst
 %%PORTDOCS%%%%DOCSDIR%%/source/install/32bit-note.inc
+%%PORTDOCS%%%%DOCSDIR%%/source/install/almalinux.rst
+%%PORTDOCS%%%%DOCSDIR%%/source/install/amazon-linux.rst
 %%PORTDOCS%%%%DOCSDIR%%/source/install/centos.rst
 %%PORTDOCS%%%%DOCSDIR%%/source/install/debian.rst
 %%PORTDOCS%%%%DOCSDIR%%/source/install/docker.rst
 %%PORTDOCS%%%%DOCSDIR%%/source/install/fedora.rst
 %%PORTDOCS%%%%DOCSDIR%%/source/install/macos.rst
+%%PORTDOCS%%%%DOCSDIR%%/source/install/oracle-linux.rst
 %%PORTDOCS%%%%DOCSDIR%%/source/install/others.rst
 %%PORTDOCS%%%%DOCSDIR%%/source/install/ubuntu.rst
 %%PORTDOCS%%%%DOCSDIR%%/source/install/windows.rst
 %%PORTDOCS%%%%DOCSDIR%%/source/news.rst
-%%PORTDOCS%%%%DOCSDIR%%/source/news/0.x.rst
-%%PORTDOCS%%%%DOCSDIR%%/source/news/1.x.rst
-%%PORTDOCS%%%%DOCSDIR%%/source/news/2.x.rst
-%%PORTDOCS%%%%DOCSDIR%%/source/news/3.x.rst
-%%PORTDOCS%%%%DOCSDIR%%/source/news/4.x.rst
-%%PORTDOCS%%%%DOCSDIR%%/source/news/5.x.rst
-%%PORTDOCS%%%%DOCSDIR%%/source/news/6.x.rst
+%%PORTDOCS%%%%DOCSDIR%%/source/news/0.rst
+%%PORTDOCS%%%%DOCSDIR%%/source/news/1.rst
+%%PORTDOCS%%%%DOCSDIR%%/source/news/10.rst
+%%PORTDOCS%%%%DOCSDIR%%/source/news/11.rst
+%%PORTDOCS%%%%DOCSDIR%%/source/news/12.rst
+%%PORTDOCS%%%%DOCSDIR%%/source/news/13.md
+%%PORTDOCS%%%%DOCSDIR%%/source/news/2.rst
+%%PORTDOCS%%%%DOCSDIR%%/source/news/3.rst
+%%PORTDOCS%%%%DOCSDIR%%/source/news/4.rst
+%%PORTDOCS%%%%DOCSDIR%%/source/news/5.rst
+%%PORTDOCS%%%%DOCSDIR%%/source/news/6.rst
+%%PORTDOCS%%%%DOCSDIR%%/source/news/7.rst
+%%PORTDOCS%%%%DOCSDIR%%/source/news/8.rst
+%%PORTDOCS%%%%DOCSDIR%%/source/news/9.rst
 %%PORTDOCS%%%%DOCSDIR%%/source/reference.rst
 %%PORTDOCS%%%%DOCSDIR%%/source/reference/full_text_search.rst
 %%PORTDOCS%%%%DOCSDIR%%/source/reference/full_text_search/boolean_mode.rst
@@ -217,3 +241,4 @@ man/man1/mroonga.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/source/upgrade.rst
 %%DATADIR%%/install.sql
 %%DATADIR%%/uninstall.sql
+%%DATADIR%%/update.sql
diff --git a/databases/mtop/Makefile b/databases/mtop/Makefile
index e5d2cb317e7d..b6f9333e4348 100644
--- a/databases/mtop/Makefile
+++ b/databases/mtop/Makefile
@@ -1,23 +1,22 @@
-# Created by: ijliao
-
 PORTNAME=	mtop
 PORTVERSION=	0.6.6
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	databases
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/v${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	MySQL Monitoring Tool
+WWW=		https://mtop.sourceforge.net/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	p5-Curses>=0:devel/p5-Curses \
-		p5-DBD-mysql>=0:databases/p5-DBD-mysql
+		${DBD_MYSQL}
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
-USES=		perl5
+USES=		mysql perl5
 USE_PERL5=	configure
 
 post-patch:
diff --git a/databases/mtop/pkg-descr b/databases/mtop/pkg-descr
index b43262d70127..2b4908520e42 100644
--- a/databases/mtop/pkg-descr
+++ b/databases/mtop/pkg-descr
@@ -7,5 +7,3 @@ configuration information, and tuning tips are provided.
 mkill (MySQL kill) monitors a MySQL server for long running queries and kills
 them after a specified time interval. Queries can be selected based on regexes
 on the user, host, command, database, state and query.
-
-WWW: http://mtop.sourceforge.net/
diff --git a/databases/mydumper/Makefile b/databases/mydumper/Makefile
index 8dcc43211b19..5fdaae7ee96c 100644
--- a/databases/mydumper/Makefile
+++ b/databases/mydumper/Makefile
@@ -1,12 +1,11 @@
-# Created by: Gea-Suan Lin <gslin@gslin.org>
-
 PORTNAME=	mydumper
-DISTVERSION=	0.10.7-2
 DISTVERSIONPREFIX=	v
+DISTVERSION=	0.16.1-3
 CATEGORIES=	databases
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	MySQL Data Dumper
+WWW=		https://github.com/mydumper/mydumper
 
 LICENSE=	GPLv3
 
@@ -18,16 +17,13 @@ USE_GNOME=	glib20
 CMAKE_ARGS=	${CMAKE_ARGS_${CHOSEN_COMPILER_TYPE}}
 CMAKE_ARGS_gcc=	-DMYSQL_LIBRARIES_atomic:FILEPATH=${LOCALBASE}/lib/gcc${GCC_DEFAULT}/libatomic.so
 CMAKE_OFF=	BUILD_DOCS WITH_BINLOG
+CMAKE_ON=	WITH_GLIB_uuid_string_random WITH_SSL
 
 PLIST_FILES=	sbin/mydumper sbin/myloader
 
-GH_ACCOUNT=	maxbube
 USE_GITHUB=	yes
 
-PORTSCOUT=	skipv:v0.10.7-2
-
-post-patch:
-	@${REINPLACE_CMD} -e '/link_libraries(mydumper/ s|)$$| -lm)|; s|-Werror||' ${WRKSRC}/CMakeLists.txt
+PORTSCOUT=	skipv:${DISTVERSION},v${DISTVERSION}
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/mydumper ${WRKSRC}/myloader ${STAGEDIR}${PREFIX}/sbin/
diff --git a/databases/mydumper/distinfo b/databases/mydumper/distinfo
index 4bc8b082eb0c..9894a1da16bf 100644
--- a/databases/mydumper/distinfo
+++ b/databases/mydumper/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1626891024
-SHA256 (maxbube-mydumper-v0.10.7-2_GH0.tar.gz) = 2e7cbd5e22422c418f2803755e1735878c060a2eff61c036799b2fc1443c751c
-SIZE (maxbube-mydumper-v0.10.7-2_GH0.tar.gz) = 71660
+TIMESTAMP = 1711466062
+SHA256 (mydumper-mydumper-v0.16.1-3_GH0.tar.gz) = ba5defbed572ac73f7cd2faeb2f0132bbcf72ce44d3159235d3b8b2e2c9e792a
+SIZE (mydumper-mydumper-v0.16.1-3_GH0.tar.gz) = 186578
diff --git a/databases/mydumper/files/patch-CMakeLists.txt b/databases/mydumper/files/patch-CMakeLists.txt
new file mode 100644
index 000000000000..b87fb67603d0
--- /dev/null
+++ b/databases/mydumper/files/patch-CMakeLists.txt
@@ -0,0 +1,11 @@
+--- CMakeLists.txt.orig	2024-03-06 21:10:19 UTC
++++ CMakeLists.txt
+@@ -44,7 +44,7 @@ endif()
+     set(WITH_SSL OFF)
+ endif()
+ 
+-set(CMAKE_C_FLAGS "-std=gnu99 -Wall -Wno-deprecated-declarations -Wunused -Wwrite-strings -Wno-strict-aliasing -Wextra -Wshadow -g -Werror ${MYSQL_CFLAGS}")
++set(CMAKE_C_FLAGS "-std=gnu99 -Wall -Wno-deprecated-declarations -Wunused -Wwrite-strings -Wno-strict-aliasing -Wextra -Wshadow -g ${MYSQL_CFLAGS}")
+ include_directories(${MYDUMPER_SOURCE_DIR} ${MYSQL_INCLUDE_DIR} ${GLIB2_INCLUDE_DIR} ${PCRE_INCLUDE_DIR} ${ZLIB_INCLUDE_DIRS} )
+ 
+ OPTION(WITH_ASAN "Build with ASAN" OFF)
diff --git a/databases/mydumper/pkg-descr b/databases/mydumper/pkg-descr
index 0384e69ae42b..61e90bdf040c 100644
--- a/databases/mydumper/pkg-descr
+++ b/databases/mydumper/pkg-descr
@@ -1,12 +1,14 @@
-== What is mydumper? Why? ==
+MyDumper is a MySQL Logical Backup Tool. It has 2 tools:
+- mydumper which is responsible to export a consistent backup of MySQL databases
+- myloader reads the backup from mydumper, connects the to destination database
+  and imports the backup. Both tools use multithreading capabilities
 
-* Parallelism (hence, speed) and performance (avoids expensive character set
+Why do we need MyDumper?
+- Parallelism (hence, speed) and performance (avoids expensive character set
   conversion routines, efficient code overall)
-* Easier to manage output (separate files for tables, dump metadata, etc, easy
+- Easier to manage output (separate files for tables, dump metadata, etc, easy
   to view/parse data)
-* Consistency - maintains snapshot across all threads, provides accurate master
+- Consistency - maintains snapshot across all threads, provides accurate master
   and slave log positions, etc
-* Manageability - supports PCRE for specifying database and tables inclusions
+- Manageability - supports PCRE for specifying database and tables inclusions
   and exclusions
-
-WWW: https://github.com/maxbube/mydumper
diff --git a/databases/mysac/Makefile b/databases/mysac/Makefile
deleted file mode 100644
index 9b1637a58afc..000000000000
--- a/databases/mysac/Makefile
+++ /dev/null
@@ -1,37 +0,0 @@
-# Created by: Jake Smith <jake@xz.cx>
-
-PORTNAME=	mysac
-PORTVERSION=	1.1.2
-CATEGORIES=	databases
-MASTER_SITES=	http://www.arpalert.org/src/ \
-		http://xz.cx/downloads/mysac/
-
-MAINTAINER=	jake@xz.cx
-COMMENT=	MySQL Simple Asynchronous Client
-
-LICENSE=	LGPL3
-
-USES=		mysql
-
-IGNORE_WITH_MYSQL=	57 80 101m 102m 103m 57p 57w
-
-USE_LDCONFIG=	yes
-
-CFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-I${LOCALBASE}/lib
-
-PLIST_FILES=	lib/libmysac.so \
-		lib/libmysac.so.0 \
-		lib/libmysac-static.a \
-		include/mysac.h
-
-pre-build:
-	${TOUCH} ${WRKSRC}/make.deps
-
-do-install:
-	${INSTALL_LIB} ${WRKSRC}/libmysac.so ${STAGEDIR}${PREFIX}/lib
-	${LN} -sf libmysac.so ${STAGEDIR}${PREFIX}/lib/libmysac.so.0
-	${INSTALL_DATA} ${WRKSRC}/libmysac-static.a ${STAGEDIR}${PREFIX}/lib
-	${INSTALL_DATA} ${WRKSRC}/mysac.h ${STAGEDIR}${PREFIX}/include
-
-.include <bsd.port.mk>
diff --git a/databases/mysac/distinfo b/databases/mysac/distinfo
deleted file mode 100644
index 82b93c9de6fd..000000000000
--- a/databases/mysac/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (mysac-1.1.2.tar.gz) = 0150edee0df888f9c6fe884c07281242ee28d408023994834facff93db15d77b
-SIZE (mysac-1.1.2.tar.gz) = 45407
diff --git a/databases/mysac/files/patch-Makefile b/databases/mysac/files/patch-Makefile
deleted file mode 100644
index 19d934fdd2d4..000000000000
--- a/databases/mysac/files/patch-Makefile
+++ /dev/null
@@ -1,34 +0,0 @@
---- Makefile.orig	2012-01-02 06:39:03.451282135 +0000
-+++ Makefile	2012-01-02 06:40:08.403362273 +0000
-@@ -15,24 +15,26 @@
- # You should have received a copy of the GNU General Public License
- # along with MySAC.  If not, see <http://www.gnu.org/licenses/>.
- #
--SHELL=/bin/bash
-+SHELL=/bin/sh
- # Mysql lib directory
- # exemple: <path>/mysql-5.1.41/libmysql_r/.libs
--MYSQL_LIB := /usr/lib
-+MYSQL_LIB := $(LOCALBASE)/lib/mysql
- 
- # Mysql include directory
- # exemple: <path>/mysql-5.1.41/include
--MYSQL_INC := /usr/include/mysql
-+MYSQL_INC := $(LOCALBASE)/include/mysql
- 
- # get build version from the git tree in the form "lasttag-changes", 
- # and use "VERSION" file if unknown.
- BUILDVER := $(shell ./mysac_ver)
- 
--CFLAGS = -DBUILDVER=$(BUILDVER) -I$(MYSQL_INC) -O0 -g -Wall -Werror -fpic
--LDFLAGS = -g -L$(MYSQL_LIB) -lmysqlclient_r
-+CFLAGS += -DBUILDVER=$(BUILDVER) -I$(MYSQL_INC) -O0 -g -Wall -fpic
-+LDFLAGS += -g -L$(MYSQL_LIB) -lmysqlclient_r
- 
- OBJS = mysac.o mysac_net.o mysac_decode_field.o mysac_decode_row.o mysac_encode_values.o mysac_errors.o
- 
-+all: build
-+
- build: make.deps
- 	$(MAKE) lib
- 
diff --git a/databases/mysac/files/patch-mysac.c b/databases/mysac/files/patch-mysac.c
deleted file mode 100644
index 01662b9c0164..000000000000
--- a/databases/mysac/files/patch-mysac.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- mysac.c.orig	2012-01-02 05:39:13.267796448 +0000
-+++ mysac.c	2012-01-02 05:39:23.079360664 +0000
-@@ -22,8 +22,8 @@
- #include <string.h>
- #include <stdarg.h>
- #include <ctype.h>
--#include <mysql/mysql.h>
- #include <mysql/my_global.h>
-+#include <mysql/mysql.h>
- 
- #include "mysac_decode_field.h"
- #include "mysac_encode_values.h"
diff --git a/databases/mysac/files/patch-mysac_decode_field.c b/databases/mysac/files/patch-mysac_decode_field.c
deleted file mode 100644
index 2cb3a4398875..000000000000
--- a/databases/mysac/files/patch-mysac_decode_field.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- mysac_decode_field.c.orig	2011-06-06 20:58:33.000000000 +0100
-+++ mysac_decode_field.c	2012-01-02 05:47:37.837388605 +0000
-@@ -21,8 +21,8 @@
- #include <stdint.h>
- #include <string.h>
- #include <stdarg.h>
--#include <mysql/mysql.h>
- #include <mysql/my_global.h>
-+#include <mysql/mysql.h>
- 
- #include "mysac_utils.h"
- #include "mysac.h"
diff --git a/databases/mysac/pkg-descr b/databases/mysac/pkg-descr
deleted file mode 100644
index cc65fffd2dbd..000000000000
--- a/databases/mysac/pkg-descr
+++ /dev/null
@@ -1,6 +0,0 @@
-MySAC (Simple Asynchronous Client) is a library that provides mechanisms for
-making asynchronous requests to MySQL database.  It uses the official MySQL
-client library for authentication and network functions.  Memory allocation
-must be done in user code, so any memory manager can be used.
-
-WWW: http://www.arpalert.org/mysac.html
diff --git a/databases/mysql++/Makefile b/databases/mysql++/Makefile
new file mode 100644
index 000000000000..d9f0a239cbfd
--- /dev/null
+++ b/databases/mysql++/Makefile
@@ -0,0 +1,23 @@
+PORTNAME=	mysql++
+DISTVERSION=	3.3.0
+CATEGORIES=	databases devel
+MASTER_SITES=	https://tangentsoft.com/mysqlpp/releases/
+
+MAINTAINER=	yuri@FreeBSD.org
+COMMENT=	C++ wrapper for the MySQL and MariaDB C APIs
+WWW=		https://tangentsoft.com/mysqlpp
+
+LICENSE=	LGPL21
+
+USES=		gmake mysql
+USE_CXXSTD=	c++14
+USE_LDCONFIG=	yes
+
+GNU_CONFIGURE=	yes
+
+TEST_TARGET=	tests # unclear how to run tests
+
+post-configure:
+	@${RM} ${WRKSRC}/version
+
+.include <bsd.port.mk>
diff --git a/databases/mysql++/distinfo b/databases/mysql++/distinfo
new file mode 100644
index 000000000000..0206dc26b917
--- /dev/null
+++ b/databases/mysql++/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1669410555
+SHA256 (mysql++-3.3.0.tar.gz) = 449cbc46556cc2cc9f9d6736904169a8df6415f6960528ee658998f96ca0e7cf
+SIZE (mysql++-3.3.0.tar.gz) = 4635623
diff --git a/databases/mysql++/files/patch-Makefile.in b/databases/mysql++/files/patch-Makefile.in
new file mode 100644
index 000000000000..b11ad758d559
--- /dev/null
+++ b/databases/mysql++/files/patch-Makefile.in
@@ -0,0 +1,12 @@
+--- Makefile.in.orig	2022-11-25 21:14:38 UTC
++++ Makefile.in
+@@ -313,7 +313,8 @@ COND_USE_SOTWOSYMLINKS_1___mysqlpp___so_symlinks_unins
+ 
+ ### Targets: ###
+ 
+-all: $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3) $(LIBPREFIX)mysqlpp_ssqls2parse$(LIBEXT) ssqlsxlat$(EXEEXT) test_array_index$(EXEEXT) test_cpool$(EXEEXT) test_datetime$(EXEEXT) test_inttypes$(EXEEXT) test_insertpolicy$(EXEEXT) test_manip$(EXEEXT) test_null_comparison$(EXEEXT) test_query_copy$(EXEEXT) test_qssqls$(EXEEXT) test_qstream$(EXEEXT) test_sqlstream$(EXEEXT) test_ssqls2$(EXEEXT) test_string$(EXEEXT) test_tcp$(EXEEXT) test_uds$(EXEEXT) test_wnp$(EXEEXT) $(LIBPREFIX)mysqlpp_excommon$(LIBEXT) cgi_jpeg$(EXEEXT) cpool$(EXEEXT) dbinfo$(EXEEXT) deadlock$(EXEEXT) fieldinf$(EXEEXT) for_each$(EXEEXT) load_jpeg$(EXEEXT) multiquery$(EXEEXT) resetdb$(EXEEXT) simple1$(EXEEXT) simple2$(EXEEXT) simple3$(EXEEXT) ssqls1$(EXEEXT) ssqls2$(EXEEXT) ssqls3$(EXEEXT) ssqls4$(EXEEXT) ssqls5$(EXEEXT) ssqls6$(EXEEXT) store_if$(EXEEXT) tquery1$(EXEEXT) tquery2$(EXEEXT) tquery3$(EXEEXT) tquery4$(EXEEXT) transaction$(EXEEXT)
++all: $(DLLPREFIX)mysqlpp$(__mysqlpp___targetsuf3) $(LIBPREFIX)mysqlpp_ssqls2parse$(LIBEXT) ssqlsxlat$(EXEEXT) $(LIBPREFIX)mysqlpp_excommon$(LIBEXT) cgi_jpeg$(EXEEXT) cpool$(EXEEXT) dbinfo$(EXEEXT) deadlock$(EXEEXT) fieldinf$(EXEEXT) for_each$(EXEEXT) load_jpeg$(EXEEXT) multiquery$(EXEEXT) resetdb$(EXEEXT) simple1$(EXEEXT) simple2$(EXEEXT) simple3$(EXEEXT) ssqls1$(EXEEXT) ssqls2$(EXEEXT) ssqls3$(EXEEXT) ssqls4$(EXEEXT) ssqls5$(EXEEXT) ssqls6$(EXEEXT) store_if$(EXEEXT) tquery1$(EXEEXT) tquery2$(EXEEXT) tquery3$(EXEEXT) tquery4$(EXEEXT) transaction$(EXEEXT)
++tests: test_array_index$(EXEEXT) test_cpool$(EXEEXT) test_datetime$(EXEEXT) test_inttypes$(EXEEXT) test_insertpolicy$(EXEEXT) test_manip$(EXEEXT) test_null_comparison$(EXEEXT) test_query_copy$(EXEEXT) test_qssqls$(EXEEXT) test_qstream$(EXEEXT) test_sqlstream$(EXEEXT) test_ssqls2$(EXEEXT) test_string$(EXEEXT) test_tcp$(EXEEXT) test_uds$(EXEEXT) test_wnp$(EXEEXT)
+ 
+ install: install_mysqlpp
+ 	$(INSTALL_DIR) $(DESTDIR)$(prefix)/include/mysql++
diff --git a/databases/mysql++/pkg-descr b/databases/mysql++/pkg-descr
new file mode 100644
index 000000000000..f688106e0923
--- /dev/null
+++ b/databases/mysql++/pkg-descr
@@ -0,0 +1,5 @@
+MySQL++ is a C++ wrapper for the MySQL and MariaDB C APIs. It is built on the
+same principles as the Standard C++ Library to make dealing with the database
+as easy as dealing with std containers. MySQL++ lets you avoid the most
+repetitive sorts of SQL by providing native C++ interfaces for these common
+tasks.
diff --git a/databases/mysql++/pkg-plist b/databases/mysql++/pkg-plist
new file mode 100644
index 000000000000..5c77b3248a76
--- /dev/null
+++ b/databases/mysql++/pkg-plist
@@ -0,0 +1,46 @@
+include/mysql++/autoflag.h
+include/mysql++/beemutex.h
+include/mysql++/cmdline.h
+include/mysql++/common.h
+include/mysql++/comparable.h
+include/mysql++/connection.h
+include/mysql++/cpool.h
+include/mysql++/datetime.h
+include/mysql++/dbdriver.h
+include/mysql++/exceptions.h
+include/mysql++/field.h
+include/mysql++/field_names.h
+include/mysql++/field_types.h
+include/mysql++/insertpolicy.h
+include/mysql++/manip.h
+include/mysql++/myset.h
+include/mysql++/mysql++.h
+include/mysql++/mystring.h
+include/mysql++/noexceptions.h
+include/mysql++/null.h
+include/mysql++/options.h
+include/mysql++/qparms.h
+include/mysql++/query.h
+include/mysql++/querydef.h
+include/mysql++/refcounted.h
+include/mysql++/result.h
+include/mysql++/row.h
+include/mysql++/scopedconnection.h
+include/mysql++/sql_buffer.h
+include/mysql++/sql_types.h
+include/mysql++/sqlstream.h
+include/mysql++/ssqls.h
+include/mysql++/ssqls2.h
+include/mysql++/stadapter.h
+include/mysql++/stream2string.h
+include/mysql++/tcp_connection.h
+include/mysql++/tiny_int.h
+include/mysql++/transaction.h
+include/mysql++/type_info.h
+include/mysql++/uds_connection.h
+include/mysql++/utility.h
+include/mysql++/vallist.h
+include/mysql++/wnp_connection.h
+lib/libmysqlpp.so
+lib/libmysqlpp.so.3
+lib/libmysqlpp.so.3.3.0
diff --git a/databases/mysql-connector-c++/Makefile b/databases/mysql-connector-c++/Makefile
index 86159e26b89b..73cd4352bdd5 100644
--- a/databases/mysql-connector-c++/Makefile
+++ b/databases/mysql-connector-c++/Makefile
@@ -1,64 +1,59 @@
-# Created by: gahr
-
 PORTNAME=	mysql-connector-c++
-PORTVERSION=	1.1.13
+PORTVERSION=	8.0.33
 PORTREVISION=	1
 CATEGORIES=	databases
 MASTER_SITES=	MYSQL/Connector-C++
+DISTNAME=	${PORTNAME}-${PORTVERSION}-src
 
 MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	MySQL database connector for C++
+WWW=		https://dev.mysql.com/doc/relnotes/connector-cpp/en/index.html
 
 LICENSE=	GPLv2 # only
-LICENSE_FILE=	${WRKSRC}/LICENSE
+LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-LIB_DEPENDS=	libboost_regex.so:devel/boost-libs
+LIB_DEPENDS=	libboost_regex.so:devel/boost-libs \
+		liblz4.so:archivers/liblz4 \
+		libprotobuf.so:devel/protobuf \
+		libzstd.so:archivers/zstd
 
-USES=		cmake compiler:c++11-lang mysql ssl
+USES=		cmake:noninja compiler:c++17-lang cpe gmake mysql ssl
+IGNORE_WITH_MYSQL=	105m 106m 1011m
+CPE_VENDOR=	oracle
+USE_CXXSTD=	c++17
 USE_LDCONFIG=	yes
 
-CMAKE_ARGS=	-DDOC_DESTINATION="${DOCSDIR}" -DCMAKE_ENABLE_C++11=ON
+CMAKE_ARGS=	-DCMAKE_ENABLE_C++17=ON \
+		-DWITH_LZ4=system \
+		-DWITH_PROTOBUF=system \
+		-DWITH_SYSTEM_LIBS=1 \
+		-DWITH_ZLIB=system \
+		-DWITH_ZSTD=system
 
 PLIST_SUB=	PORTVERSION=${PORTVERSION}
-
 PORTDOCS=	*
-OPTIONS_DEFINE=	DOCS
 
-post-install:
-	@${RM} ${STAGEDIR}${DOCSDIR}/INSTALL \
-		${STAGEDIR}${DOCSDIR}/COPYING
+OPTIONS_DEFINE=	DOCS JDBC
+OPTIONS_DEFAULT=	JDBC
+OPTIONS_SUB=	yes
 
-.if defined(MAINTAINER_MODE)
-CMAKE_ARGS+=	-DMYSQLCPPCONN_TEST_NOT_IMPLEMENTED:BOOL=1 \
-		-DMYSQLCPPCONN_BUILD_EXAMPLES:BOOL=1
+JDBC_DESC=	Build  JDBC Interface
 
-do-test:
-#	These tests assume that a database is running on localhost,
-#	with user:root and pass:root
-	(cd ${WRKDIR}/.build ; \
-	test/CJUnitTestsPort/CJUnitTestsPort --verbose ; \
-	test/driver_test --verbose ; \
-	test/static_test --verbose ; \
-	examples/connect --verbose ; \
-	examples/connection_meta_schemaobj --verbose ; \
-	examples/debug --verbose ; \
-	examples/dynamic_load --verbose ; \
-	examples/exceptions --verbose ; \
-	examples/prepared_statement --verbose ; \
-	examples/resultset --verbose ; \
-	examples/resultset_binary --verbose ; \
-	examples/resultset_meta --verbose ; \
-	examples/resultset_types --verbose ; \
-	examples/statement --verbose ; \
-	test/unit/classes/art_resultset --verbose ; \
-	test/unit/classes/connection --verbose ; \
-	test/unit/classes/databasemetadata --verbose ; \
-	test/unit/classes/parametermetadata --verbose ; \
-	test/unit/classes/preparedstatement --verbose ; \
-	test/unit/classes/resultset --verbose ; \
-	test/unit/classes/resultsetmetadata --verbose ; \
-	test/unit/classes/savepoint --verbose ; \
-	test/unit/classes/statement )
-.endif
+DOCS_BUILD_DEPENDS=	doxygen:devel/doxygen
+DOCS_CMAKE_ON=		-DDOC_DESTINATION="${DOCSDIR}" \
+			-DWITH_DOC=ON
+JDBC_LIB_DEPENDS=	libunwind.so:devel/libunwind
+JDBC_CMAKE_ON=		-DWITH_JDBC=ON
+
+post-install:
+	@${RM} ${STAGEDIR}${PREFIX}/INFO_BIN
+	@${RM} ${STAGEDIR}${PREFIX}/INFO_SRC
+
+post-install-DOCS-on:
+	@${RM} ${STAGEDIR}${DOCSDIR}/INSTALL \
+		${STAGEDIR}${DOCSDIR}/LICENSE.txt
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	cd ${BUILD_WRKSRC}/doc && \
+		${COPYTREE_SHARE} html ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/databases/mysql-connector-c++/distinfo b/databases/mysql-connector-c++/distinfo
index cdb132d4f773..07e02a50bd6e 100644
--- a/databases/mysql-connector-c++/distinfo
+++ b/databases/mysql-connector-c++/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1572299977
-SHA256 (mysql-connector-c++-1.1.13.tar.gz) = 332c87330ab167c17606b95d27af110c3f8f228658e8ba0d1f6e5f0a0acf3b41
-SIZE (mysql-connector-c++-1.1.13.tar.gz) = 519743
+TIMESTAMP = 1688279127
+SHA256 (mysql-connector-c++-8.0.33-src.tar.gz) = 160cf6881fbde9bd46cd11aaf12930b676bc6e27589ac5c7ba49c196b97e053b
+SIZE (mysql-connector-c++-8.0.33-src.tar.gz) = 4531693
diff --git a/databases/mysql-connector-c++/files/patch-CMakeLists.txt b/databases/mysql-connector-c++/files/patch-CMakeLists.txt
deleted file mode 100644
index 5dfa0b0b7bcd..000000000000
--- a/databases/mysql-connector-c++/files/patch-CMakeLists.txt
+++ /dev/null
@@ -1,10 +0,0 @@
---- CMakeLists.txt.orig	2016-01-12 18:42:38 UTC
-+++ CMakeLists.txt
-@@ -316,7 +316,6 @@ ELSE(WIN32)
-   SET(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_INSTALL_DIRECTORY}")
- ENDIF(WIN32)
- 
--SET(DOC_DESTINATION ".")
- IF(RPM_LAYOUT)
-   SET(DOC_DESTINATION "share/doc/${CPACK_PACKAGE_NAME}-${MYSQLCPPCONN_VERSION}")
- ENDIF()
diff --git a/databases/mysql-connector-c++/files/patch-protobuf b/databases/mysql-connector-c++/files/patch-protobuf
new file mode 100644
index 000000000000..bef66563c69a
--- /dev/null
+++ b/databases/mysql-connector-c++/files/patch-protobuf
@@ -0,0 +1,56 @@
+--- cdk/protocol/mysqlx/protocol.cc.orig	2023-03-23 16:32:48 UTC
++++ cdk/protocol/mysqlx/protocol.cc
+@@ -37,6 +37,7 @@
+ 

+ #include <mysql/cdk/foundation/common.h>

+ #include <google/protobuf/io/zero_copy_stream.h>

++#include <absl/base/log_severity.h>

+ 

+ /*

+   Note: On Windows the INIT_ONCE structure was added only in later

+@@ -117,7 +118,7 @@ namespace mysqlx {

+   Protobuf log handler initialization.

+ */

+ 

+-static void log_handler(LogLevel level, const char* filename, int line, const std::string& message);

++static void log_handler(absl::LogSeverity level, const char* filename, int line, const std::string& message);

+ 

+ #ifdef _WIN32

+ BOOL CALLBACK log_handler_init(PINIT_ONCE, PVOID, PVOID*)

+@@ -128,7 +129,6 @@ BOOL CALLBACK log_handler_init(PINIT_ONCE, PVOID, PVOI
+ #else

+ static void log_handler_init()

+ {

+-  SetLogHandler(log_handler);

+ }

+ #endif

+ 

+@@ -290,14 +290,14 @@ Message* mk_message(Protocol_side side, msg_type_t msg
+ */

+ 

+ static void log_handler(

+-  LogLevel level, const char* /*filename*/, int /*line*/,

++  absl::LogSeverity level, const char* /*filename*/, int /*line*/,

+   const std::string& message

+ )

+ {

+   switch(level)

+   {

+-    case LOGLEVEL_FATAL:

+-    case LOGLEVEL_ERROR:

++    case absl::LogSeverity::kFatal:

++    case absl::LogSeverity::kError:

+       /*

+         With this code the error description is:

+ 

+@@ -311,8 +311,8 @@ static void log_handler(

+       */

+       throw_error(cdkerrc::protobuf_error, message);

+ 

+-    case LOGLEVEL_WARNING:

+-    case LOGLEVEL_INFO:

++    case absl::LogSeverity::kWarning:

++    case absl::LogSeverity::kInfo:

+     default:

+     {

+       // just ignore for now

diff --git a/databases/mysql-connector-c++/pkg-descr b/databases/mysql-connector-c++/pkg-descr
index 48be25c944ac..fc03fe7854d9 100644
--- a/databases/mysql-connector-c++/pkg-descr
+++ b/databases/mysql-connector-c++/pkg-descr
@@ -12,5 +12,3 @@ classes:
 The JDBC 4.0 API defines approximately 450 methods for the above mentioned
 classes. MySQL Connector/C++ implements around 80% of these and makes them
 available in the current release.
-
-WWW: http://dev.mysql.com/doc/relnotes/connector-cpp/en/index.html
diff --git a/databases/mysql-connector-c++/pkg-plist b/databases/mysql-connector-c++/pkg-plist
index a730f110cff2..0871a6f066b6 100644
--- a/databases/mysql-connector-c++/pkg-plist
+++ b/databases/mysql-connector-c++/pkg-plist
@@ -1,23 +1,57 @@
-include/cppconn/build_config.h
-include/cppconn/config.h
-include/cppconn/connection.h
-include/cppconn/datatype.h
-include/cppconn/driver.h
-include/cppconn/exception.h
-include/cppconn/metadata.h
-include/cppconn/parameter_metadata.h
-include/cppconn/prepared_statement.h
-include/cppconn/resultset.h
-include/cppconn/resultset_metadata.h
-include/cppconn/statement.h
-include/cppconn/sqlstring.h
-include/cppconn/variant.h
-include/cppconn/version_info.h
-include/cppconn/warning.h
-include/mysql_connection.h
-include/mysql_driver.h
-include/mysql_error.h
-lib/libmysqlcppconn-static.a
-lib/libmysqlcppconn.so
-lib/libmysqlcppconn.so.7
-lib/libmysqlcppconn.so.7.%%PORTVERSION%%
+%%JDBC%%include/jdbc/cppconn/build_config.h
+%%JDBC%%include/jdbc/cppconn/callback.h
+%%JDBC%%include/jdbc/cppconn/config.h
+%%JDBC%%include/jdbc/cppconn/connection.h
+%%JDBC%%include/jdbc/cppconn/datatype.h
+%%JDBC%%include/jdbc/cppconn/driver.h
+%%JDBC%%include/jdbc/cppconn/exception.h
+%%JDBC%%include/jdbc/cppconn/metadata.h
+%%JDBC%%include/jdbc/cppconn/parameter_metadata.h
+%%JDBC%%include/jdbc/cppconn/prepared_statement.h
+%%JDBC%%include/jdbc/cppconn/resultset.h
+%%JDBC%%include/jdbc/cppconn/resultset_metadata.h
+%%JDBC%%include/jdbc/cppconn/sqlstring.h
+%%JDBC%%include/jdbc/cppconn/statement.h
+%%JDBC%%include/jdbc/cppconn/variant.h
+%%JDBC%%include/jdbc/cppconn/version_info.h
+%%JDBC%%include/jdbc/cppconn/warning.h
+%%JDBC%%include/jdbc/mysql_connection.h
+%%JDBC%%include/jdbc/mysql_driver.h
+%%JDBC%%include/jdbc/mysql_error.h
+%%JDBC%%include/mysql/jdbc.h
+include/mysqlx/common.h
+include/mysqlx/common/api.h
+include/mysqlx/common/error.h
+include/mysqlx/common/op_if.h
+include/mysqlx/common/settings.h
+include/mysqlx/common/util.h
+include/mysqlx/common/value.h
+include/mysqlx/common_constants.h
+include/mysqlx/devapi/collations.h
+include/mysqlx/devapi/collection_crud.h
+include/mysqlx/devapi/common.h
+include/mysqlx/devapi/crud.h
+include/mysqlx/devapi/detail/crud.h
+include/mysqlx/devapi/detail/error.h
+include/mysqlx/devapi/detail/result.h
+include/mysqlx/devapi/detail/row.h
+include/mysqlx/devapi/detail/session.h
+include/mysqlx/devapi/detail/settings.h
+include/mysqlx/devapi/document.h
+include/mysqlx/devapi/error.h
+include/mysqlx/devapi/executable.h
+include/mysqlx/devapi/mysql_charsets.h
+include/mysqlx/devapi/mysql_collations.h
+include/mysqlx/devapi/result.h
+include/mysqlx/devapi/row.h
+include/mysqlx/devapi/settings.h
+include/mysqlx/devapi/table_crud.h
+include/mysqlx/version_info.h
+include/mysqlx/xapi.h
+include/mysqlx/xdevapi.h
+%%JDBC%%lib/libmysqlcppconn.so
+%%JDBC%%lib/libmysqlcppconn.so.9
+%%JDBC%%lib/libmysqlcppconn.so.9.%%PORTVERSION%%
+lib/libmysqlcppconn8.so
+lib/libmysqlcppconn8.so.2
+lib/libmysqlcppconn8.so.2.%%PORTVERSION%%
diff --git a/databases/mysql-connector-c/Makefile b/databases/mysql-connector-c/Makefile
deleted file mode 100644
index 31605a38fb0e..000000000000
--- a/databases/mysql-connector-c/Makefile
+++ /dev/null
@@ -1,39 +0,0 @@
-# Created by: gahr
-
-PORTNAME=	mysql-connector-c
-PORTVERSION=	6.1.11
-PORTREVISION=	1
-CATEGORIES=	databases
-MASTER_SITES=	MYSQL/Connector-C
-DISTNAME=	${PORTNAME}-${PORTVERSION}-src
-
-MAINTAINER=	bofh@FreeBSD.org
-COMMENT=	MySQL database connector for C
-
-LICENSE=	GPLv2
-LICENSE_FILE=	${WRKSRC}/COPYING
-
-USES=		cmake compiler:features mysql ssl
-CMAKE_ARGS+=	-DOPENSSL_INCLUDE_DIR="${OPENSSLINC}"
-USE_LDCONFIG=	${PREFIX}/lib/${PORTNAME}
-
-PLIST_SUB+=	PORTVERSION=${PORTVERSION}
-
-.include <bsd.port.pre.mk>
-
-.if ${ARCH} == "i386" && ${COMPILER_TYPE} == gcc && ${COMPILER_VERSION} <= 42
-CFLAGS+=	-march=i586
-.endif
-
-.if (${OPSYS} == FreeBSD && ${OSVERSION} > 1200085 && ${SSL_DEFAULT} == base) || ${SSL_DEFAULT} == openssl
-EXTRA_PATCHES+=	${FILESDIR}/extra-patch-vio_viosslfactories.c \
-		${FILESDIR}/extra-patch-mysys__ssl_my__aes__openssl.cc
-.endif
-
-.if ${SSL_DEFAULT} == base
-CMAKE_ARGS+=	-DWITH_SSL="system"
-.else
-CMAKE_ARGS+=	-DWITH_SSL="${OPENSSLBASE}"
-.endif
-
-.include <bsd.port.post.mk>
diff --git a/databases/mysql-connector-c/distinfo b/databases/mysql-connector-c/distinfo
deleted file mode 100644
index d07f9e1e726b..000000000000
--- a/databases/mysql-connector-c/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1501858684
-SHA256 (mysql-connector-c-6.1.11-src.tar.gz) = c8664851487200162b38b6f3c8db69850bd4f0e4c5ff5a6d161dbfb5cb76b6c4
-SIZE (mysql-connector-c-6.1.11-src.tar.gz) = 3489345
diff --git a/databases/mysql-connector-c/files/extra-patch-mysys__ssl_my__aes__openssl.cc b/databases/mysql-connector-c/files/extra-patch-mysys__ssl_my__aes__openssl.cc
deleted file mode 100644
index 66f558b85489..000000000000
--- a/databases/mysql-connector-c/files/extra-patch-mysys__ssl_my__aes__openssl.cc
+++ /dev/null
@@ -1,81 +0,0 @@
---- mysys_ssl/my_aes_openssl.cc.orig	2021-06-07 05:16:32 UTC
-+++ mysys_ssl/my_aes_openssl.cc
-@@ -122,7 +122,7 @@ int my_aes_encrypt(const unsigned char *source, uint32
-                    enum my_aes_opmode mode, const unsigned char *iv,
-                    bool padding)
- {
--  EVP_CIPHER_CTX ctx;
-+  EVP_CIPHER_CTX *ctx = EVP_CIPHER_CTX_new();
-   const EVP_CIPHER *cipher= aes_evp_type(mode);
-   int u_len, f_len;
-   /* The real key to be used for encryption */
-@@ -132,23 +132,23 @@ int my_aes_encrypt(const unsigned char *source, uint32
-   if (!cipher || (EVP_CIPHER_iv_length(cipher) > 0 && !iv))
-     return MY_AES_BAD_DATA;
- 
--  if (!EVP_EncryptInit(&ctx, cipher, rkey, iv))
-+  if (!EVP_EncryptInit(ctx, cipher, rkey, iv))
-     goto aes_error;                             /* Error */
--  if (!EVP_CIPHER_CTX_set_padding(&ctx, padding))
-+  if (!EVP_CIPHER_CTX_set_padding(ctx, padding))
-     goto aes_error;                             /* Error */
--  if (!EVP_EncryptUpdate(&ctx, dest, &u_len, source, source_length))
-+  if (!EVP_EncryptUpdate(ctx, dest, &u_len, source, source_length))
-     goto aes_error;                             /* Error */
- 
--  if (!EVP_EncryptFinal(&ctx, dest + u_len, &f_len))
-+  if (!EVP_EncryptFinal(ctx, dest + u_len, &f_len))
-     goto aes_error;                             /* Error */
- 
--  EVP_CIPHER_CTX_cleanup(&ctx);
-+  EVP_CIPHER_CTX_free(ctx);
-   return u_len + f_len;
- 
- aes_error:
-   /* need to explicitly clean up the error if we want to ignore it */
-   ERR_clear_error();
--  EVP_CIPHER_CTX_cleanup(&ctx);
-+  EVP_CIPHER_CTX_free(ctx);
-   return MY_AES_BAD_DATA;
- }
- 
-@@ -159,7 +159,7 @@ int my_aes_decrypt(const unsigned char *source, uint32
-                    bool padding)
- {
- 
--  EVP_CIPHER_CTX ctx;
-+  EVP_CIPHER_CTX *ctx = EVP_CIPHER_CTX_new();
-   const EVP_CIPHER *cipher= aes_evp_type(mode);
-   int u_len, f_len;
- 
-@@ -170,24 +170,22 @@ int my_aes_decrypt(const unsigned char *source, uint32
-   if (!cipher || (EVP_CIPHER_iv_length(cipher) > 0 && !iv))
-     return MY_AES_BAD_DATA;
- 
--  EVP_CIPHER_CTX_init(&ctx);
--
--  if (!EVP_DecryptInit(&ctx, aes_evp_type(mode), rkey, iv))
-+  if (!EVP_DecryptInit(ctx, aes_evp_type(mode), rkey, iv))
-     goto aes_error;                             /* Error */
--  if (!EVP_CIPHER_CTX_set_padding(&ctx, padding))
-+  if (!EVP_CIPHER_CTX_set_padding(ctx, padding))
-     goto aes_error;                             /* Error */
--  if (!EVP_DecryptUpdate(&ctx, dest, &u_len, source, source_length))
-+  if (!EVP_DecryptUpdate(ctx, dest, &u_len, source, source_length))
-     goto aes_error;                             /* Error */
--  if (!EVP_DecryptFinal_ex(&ctx, dest + u_len, &f_len))
-+  if (!EVP_DecryptFinal_ex(ctx, dest + u_len, &f_len))
-     goto aes_error;                             /* Error */
- 
--  EVP_CIPHER_CTX_cleanup(&ctx);
-+  EVP_CIPHER_CTX_free(ctx);
-   return u_len + f_len;
- 
- aes_error:
-   /* need to explicitly clean up the error if we want to ignore it */
-   ERR_clear_error();
--  EVP_CIPHER_CTX_cleanup(&ctx);
-+  EVP_CIPHER_CTX_free(ctx);
-   return MY_AES_BAD_DATA;
- }
- 
diff --git a/databases/mysql-connector-c/files/extra-patch-vio_viosslfactories.c b/databases/mysql-connector-c/files/extra-patch-vio_viosslfactories.c
deleted file mode 100644
index eebe158a1ea2..000000000000
--- a/databases/mysql-connector-c/files/extra-patch-vio_viosslfactories.c
+++ /dev/null
@@ -1,43 +0,0 @@
---- vio/viosslfactories.c.orig	2021-06-07 04:55:13 UTC
-+++ vio/viosslfactories.c
-@@ -86,7 +86,7 @@ static my_bool     ssl_initialized         = FALSE;
-   mjxx/bg6bOOjpgZapvB6ABWlWmRmAAWFtwIBBQ==
-   -----END DH PARAMETERS-----
-  */
--static unsigned char dh2048_p[]=
-+static unsigned char dhp_2048[]=
- {
-   0x8A, 0x5D, 0xFA, 0xC0, 0x66, 0x76, 0x4E, 0x61, 0xFA, 0xCA, 0xC0, 0x37,
-   0x57, 0x5C, 0x6D, 0x3F, 0x83, 0x0A, 0xA1, 0xF5, 0xF1, 0xE6, 0x7F, 0x3C,
-@@ -112,20 +112,25 @@ static unsigned char dh2048_p[]=
-   0x00, 0x05, 0x85, 0xB7,
- };
- 
--static unsigned char dh2048_g[]={
-+static unsigned char dhg_2048[]={
-   0x05,
- };
- 
- static DH *get_dh2048(void)
- {
--  DH *dh;
--  if ((dh=DH_new()))
-+  DH *dh = DH_new();
-+  BIGNUM *dhp_bn, *dhg_bn;
-+
-+  if (dh != NULL)
-   {
--    dh->p=BN_bin2bn(dh2048_p,sizeof(dh2048_p),NULL);
--    dh->g=BN_bin2bn(dh2048_g,sizeof(dh2048_g),NULL);
--    if (! dh->p || ! dh->g)
-+    dhp_bn = BN_bin2bn(dhp_2048, sizeof (dhp_2048), NULL);
-+    dhg_bn = BN_bin2bn(dhg_2048, sizeof (dhg_2048), NULL);
-+    if (dhp_bn == NULL || dhg_bn == NULL
-+        || !DH_set0_pqg(dh, dhp_bn, NULL, dhg_bn)) 
-     {
-       DH_free(dh);
-+      BN_free(dhp_bn);
-+      BN_free(dhg_bn);
-       dh=0;
-     }
-   }
diff --git a/databases/mysql-connector-c/files/patch-CMakeLists.txt b/databases/mysql-connector-c/files/patch-CMakeLists.txt
deleted file mode 100644
index bac039a8c691..000000000000
--- a/databases/mysql-connector-c/files/patch-CMakeLists.txt
+++ /dev/null
@@ -1,11 +0,0 @@
---- CMakeLists.txt.orig	2017-03-04 21:11:15 UTC
-+++ CMakeLists.txt
-@@ -562,7 +562,7 @@ ADD_SUBDIRECTORY(packaging/WiX)
- #
- # RPM installs documentation directly from the source tree
- #
--IF(NOT INSTALL_LAYOUT MATCHES "RPM")
-+IF(NOT INSTALL_LAYOUT MATCHES "RPM" AND 0)
-   INSTALL(FILES COPYING LICENSE.mysql
-     DESTINATION ${INSTALL_DOCREADMEDIR}
-     COMPONENT Readme
diff --git a/databases/mysql-connector-c/files/patch-cmake_install__layout.cmake b/databases/mysql-connector-c/files/patch-cmake_install__layout.cmake
deleted file mode 100644
index 7c5b85dd66fd..000000000000
--- a/databases/mysql-connector-c/files/patch-cmake_install__layout.cmake
+++ /dev/null
@@ -1,21 +0,0 @@
---- cmake/install_layout.cmake.orig	2017-07-13 06:55:32 UTC
-+++ cmake/install_layout.cmake
-@@ -151,14 +151,14 @@ SET(secure_file_priv_embedded_path "NULL")
- #
- # STANDALONE layout
- #
--SET(INSTALL_BINDIR_STANDALONE           "bin")
-+SET(INSTALL_BINDIR_STANDALONE           "bin/mysql-connector-c")
- SET(INSTALL_SBINDIR_STANDALONE          "bin")
- SET(INSTALL_SCRIPTDIR_STANDALONE        "scripts")
- #
--SET(INSTALL_LIBDIR_STANDALONE           "lib")
--SET(INSTALL_PLUGINDIR_STANDALONE        "lib/plugin")
-+SET(INSTALL_LIBDIR_STANDALONE           "lib/mysql-connector-c")
-+SET(INSTALL_PLUGINDIR_STANDALONE        "lib/mysql-connector-cplugin")
- #
--SET(INSTALL_INCLUDEDIR_STANDALONE       "include")
-+SET(INSTALL_INCLUDEDIR_STANDALONE       "include/mysql-connector-c")
- #
- SET(INSTALL_DOCDIR_STANDALONE           "docs")
- SET(INSTALL_DOCREADMEDIR_STANDALONE     ".")
diff --git a/databases/mysql-connector-c/files/patch-cmake_install__macros.cmake b/databases/mysql-connector-c/files/patch-cmake_install__macros.cmake
deleted file mode 100644
index 4debda0bd44e..000000000000
--- a/databases/mysql-connector-c/files/patch-cmake_install__macros.cmake
+++ /dev/null
@@ -1,13 +0,0 @@
---- cmake/install_macros.cmake.orig	2021-04-22 20:14:44 UTC
-+++ cmake/install_macros.cmake
-@@ -362,8 +362,8 @@ FUNCTION(INSTALL_DEBUG_TARGET target)
-         CONFIGURATIONS Release RelWithDebInfo
-         COMPONENT ${ARG_COMPONENT}
-         OPTIONAL)
--    ENDIF()
--  ENDFOREACH()
-+    ENDFOREACH()
-+  ENDIF()
- 
- ENDFUNCTION()
- 
diff --git a/databases/mysql-connector-c/files/patch-cmake_ssl.cmake b/databases/mysql-connector-c/files/patch-cmake_ssl.cmake
deleted file mode 100644
index b2789aa7e698..000000000000
--- a/databases/mysql-connector-c/files/patch-cmake_ssl.cmake
+++ /dev/null
@@ -1,21 +0,0 @@
---- cmake/ssl.cmake.orig	2017-03-04 21:14:36 UTC
-+++ cmake/ssl.cmake
-@@ -166,7 +166,7 @@ MACRO (MYSQL_CHECK_SSL)
-     # Encoded as MNNFFPPS: major minor fix patch status
-     FILE(STRINGS "${OPENSSL_INCLUDE_DIR}/openssl/opensslv.h"
-       OPENSSL_VERSION_NUMBER
--      REGEX "^#[ ]*define[\t ]+OPENSSL_VERSION_NUMBER[\t ]+0x[0-9].*"
-+      REGEX "define[\t ]+OPENSSL_VERSION_NUMBER[\t ]+0x[0-9].*"
-     )
-     STRING(REGEX REPLACE
-       "^.*OPENSSL_VERSION_NUMBER[\t ]+0x([0-9]).*$" "\\1"
-@@ -176,7 +176,8 @@ MACRO (MYSQL_CHECK_SSL)
-     IF(OPENSSL_INCLUDE_DIR AND
-        OPENSSL_LIBRARY   AND
-        CRYPTO_LIBRARY      AND
--       OPENSSL_MAJOR_VERSION STREQUAL "1"
-+       (OPENSSL_MAJOR_VERSION STREQUAL "1" OR
-+       OPENSSL_MAJOR_VERSION STREQUAL "2")
-       )
-       SET(OPENSSL_FOUND TRUE)
-     ELSE()
diff --git a/databases/mysql-connector-c/files/patch-libmysql_CMakeLists.txt b/databases/mysql-connector-c/files/patch-libmysql_CMakeLists.txt
deleted file mode 100644
index 47298d663ac2..000000000000
--- a/databases/mysql-connector-c/files/patch-libmysql_CMakeLists.txt
+++ /dev/null
@@ -1,11 +0,0 @@
---- libmysql/CMakeLists.txt.orig	2017-07-13 06:55:32 UTC
-+++ libmysql/CMakeLists.txt
-@@ -287,7 +287,7 @@ IF(NOT DISABLE_SHARED)
-     COMPONENT SharedLibraries)
-   IF(UNIX)
-     # libtool compatability
--    IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD" OR APPLE)
-+    IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD|DragonFly" OR APPLE)
-       SET(OS_SHARED_LIB_VERSION "${SHARED_LIB_MAJOR_VERSION}")
-     ELSE()
-       SET(OS_SHARED_LIB_VERSION
diff --git a/databases/mysql-connector-c/files/patch-sql-common_client__authentication.cc b/databases/mysql-connector-c/files/patch-sql-common_client__authentication.cc
deleted file mode 100644
index 76da9a91be1f..000000000000
--- a/databases/mysql-connector-c/files/patch-sql-common_client__authentication.cc
+++ /dev/null
@@ -1,15 +0,0 @@
-sql-common/client_authentication.cc:86:56: error: comparison between pointer and integer ('char *' and 'int')
-      mysql->options.extension->server_public_key_path != '\0')
-      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ^  ~~~~
-
---- sql-common/client_authentication.cc.orig	2018-08-27 19:39:51 UTC
-+++ sql-common/client_authentication.cc
-@@ -83,7 +83,7 @@ RSA *rsa_init(MYSQL *mysql)
- 
-   if (mysql->options.extension != NULL &&
-       mysql->options.extension->server_public_key_path != NULL &&
--      mysql->options.extension->server_public_key_path != '\0')
-+      *mysql->options.extension->server_public_key_path != '\0')
-   {
-     pub_key_file= fopen(mysql->options.extension->server_public_key_path,
-                         "r");
diff --git a/databases/mysql-connector-c/pkg-descr b/databases/mysql-connector-c/pkg-descr
deleted file mode 100644
index 0b7f0d5ed80a..000000000000
--- a/databases/mysql-connector-c/pkg-descr
+++ /dev/null
@@ -1,5 +0,0 @@
-MySQL Connector/C is a C client library for client/server communication. It is
-a standalone replacement for the MySQL Client Library shipped with the MySQL
-Server.
-
-WWW: https://dev.mysql.com/downloads/c-api/
diff --git a/databases/mysql-connector-c/pkg-plist b/databases/mysql-connector-c/pkg-plist
deleted file mode 100644
index 4468f538cd0d..000000000000
--- a/databases/mysql-connector-c/pkg-plist
+++ /dev/null
@@ -1,71 +0,0 @@
-bin/mysql-connector-c/my_print_defaults
-bin/mysql-connector-c/mysql_config
-bin/mysql-connector-c/perror
-include/mysql-connector-c/big_endian.h
-include/mysql-connector-c/binary_log_types.h
-include/mysql-connector-c/byte_order_generic.h
-include/mysql-connector-c/byte_order_generic_x86.h
-include/mysql-connector-c/decimal.h
-include/mysql-connector-c/errmsg.h
-include/mysql-connector-c/keycache.h
-include/mysql-connector-c/little_endian.h
-include/mysql-connector-c/m_ctype.h
-include/mysql-connector-c/m_string.h
-include/mysql-connector-c/my_alloc.h
-include/mysql-connector-c/my_byteorder.h
-include/mysql-connector-c/my_command.h
-include/mysql-connector-c/my_compiler.h
-include/mysql-connector-c/my_config.h
-include/mysql-connector-c/my_dbug.h
-include/mysql-connector-c/my_dir.h
-include/mysql-connector-c/my_getopt.h
-include/mysql-connector-c/my_global.h
-include/mysql-connector-c/my_list.h
-include/mysql-connector-c/my_sys.h
-include/mysql-connector-c/my_thread.h
-include/mysql-connector-c/my_thread_local.h
-include/mysql-connector-c/my_xml.h
-include/mysql-connector-c/mysql.h
-include/mysql-connector-c/mysql/client_authentication.h
-include/mysql-connector-c/mysql/client_plugin.h
-include/mysql-connector-c/mysql/client_plugin.h.pp
-include/mysql-connector-c/mysql/get_password.h
-include/mysql-connector-c/mysql/mysql_lex_string.h
-include/mysql-connector-c/mysql/plugin_auth_common.h
-include/mysql-connector-c/mysql/plugin_trace.h
-include/mysql-connector-c/mysql/psi/mysql_file.h
-include/mysql-connector-c/mysql/psi/mysql_idle.h
-include/mysql-connector-c/mysql/psi/mysql_mdl.h
-include/mysql-connector-c/mysql/psi/mysql_memory.h
-include/mysql-connector-c/mysql/psi/mysql_ps.h
-include/mysql-connector-c/mysql/psi/mysql_socket.h
-include/mysql-connector-c/mysql/psi/mysql_sp.h
-include/mysql-connector-c/mysql/psi/mysql_stage.h
-include/mysql-connector-c/mysql/psi/mysql_statement.h
-include/mysql-connector-c/mysql/psi/mysql_table.h
-include/mysql-connector-c/mysql/psi/mysql_thread.h
-include/mysql-connector-c/mysql/psi/mysql_transaction.h
-include/mysql-connector-c/mysql/psi/psi.h
-include/mysql-connector-c/mysql/psi/psi_base.h
-include/mysql-connector-c/mysql/psi/psi_memory.h
-include/mysql-connector-c/mysql/service_mysql_alloc.h
-include/mysql-connector-c/mysql/service_my_snprintf.h
-include/mysql-connector-c/mysql_com.h
-include/mysql-connector-c/mysql_com_server.h
-include/mysql-connector-c/mysql_embed.h
-include/mysql-connector-c/mysql_time.h
-include/mysql-connector-c/mysql_version.h
-include/mysql-connector-c/mysqld_ername.h
-include/mysql-connector-c/mysqld_error.h
-include/mysql-connector-c/sql_common.h
-include/mysql-connector-c/sql_state.h
-include/mysql-connector-c/sslopt-case.h
-include/mysql-connector-c/sslopt-longopts.h
-include/mysql-connector-c/sslopt-vars.h
-include/mysql-connector-c/thr_cond.h
-include/mysql-connector-c/thr_mutex.h
-include/mysql-connector-c/thr_rwlock.h
-include/mysql-connector-c/typelib.h
-lib/mysql-connector-c/libmysqlclient.a
-lib/mysql-connector-c/libmysqlclient.so
-lib/mysql-connector-c/libmysqlclient.so.18
diff --git a/databases/mysql-connector-j/Makefile b/databases/mysql-connector-j/Makefile
new file mode 100644
index 000000000000..10083cd3d4b1
--- /dev/null
+++ b/databases/mysql-connector-j/Makefile
@@ -0,0 +1,46 @@
+PORTNAME=	mysql-connector-j
+PORTVERSION=	8.1.0
+CATEGORIES=	databases java
+MASTER_SITES=	MYSQL/Connector-J
+
+MAINTAINER=	ultima@FreeBSD.org
+COMMENT=	MySQL Connector/J: JDBC interface for MySQL
+WWW=		https://dev.mysql.com/downloads/connector/j/
+
+LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
+RUN_DEPENDS=	${JAVALIBDIR}/slf4j-api.jar:devel/slf4j \
+		${JAVALIBDIR}/c3p0.jar:databases/c3p0 \
+		${JAVALIBDIR}/protobuf-java.jar:devel/protobuf-java
+
+USES=		cpe
+USE_JAVA=	yes
+
+CPE_VENDOR=	oracle
+CPE_PRODUCT=	mysql_connector_j
+
+NO_ARCH=	yes
+NO_BUILD=	yes
+
+CONFLICTS_INSTALL=	mysql-connector-java51 # share/java/classes/mysql-connector-java.jar
+
+JAVA_VERSION=	8+
+EXTRADOCS=	CHANGES
+
+PLIST_FILES=	${JAVAJARDIR}/${PORTNAME}.jar
+
+OPTIONS_DEFINE=	DOCS
+
+PORTDOCS=	*
+
+do-install:
+	${INSTALL_DATA} ${INSTALL_WRKSRC}/${DISTNAME}.jar ${STAGEDIR}${JAVAJARDIR}/${PORTNAME}.jar
+
+do-install-DOCS-on:
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	@for extradoc in ${EXTRADOCS} ; do \
+	  ${INSTALL_DATA} ${INSTALL_WRKSRC}/$$extradoc ${STAGEDIR}${DOCSDIR} ; \
+	done
+
+.include <bsd.port.mk>
diff --git a/databases/mysql-connector-j/distinfo b/databases/mysql-connector-j/distinfo
new file mode 100644
index 000000000000..f61dad7eefac
--- /dev/null
+++ b/databases/mysql-connector-j/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1693155206
+SHA256 (mysql-connector-j-8.1.0.tar.gz) = d16855f9cf180f9c128b202d43c1ea0fc8a03863d34006a06fc76f64565fe2e9
+SIZE (mysql-connector-j-8.1.0.tar.gz) = 4241696
diff --git a/databases/mysql-connector-j/pkg-descr b/databases/mysql-connector-j/pkg-descr
new file mode 100644
index 000000000000..531eab3c3cb4
--- /dev/null
+++ b/databases/mysql-connector-j/pkg-descr
@@ -0,0 +1,5 @@
+
+MySQL Connector/J is the official JDBC driver for MySQL. MySQL
+Connector/J 8.0 is compatible with all MySQL versions starting with
+MySQL 5.5. Additionally, MySQL Connector/J 8.0 supports the new X
+DevAPI for development with MySQL Server 8.0.
diff --git a/databases/mysql-connector-java/Makefile b/databases/mysql-connector-java/Makefile
deleted file mode 100644
index 3c0a9403d065..000000000000
--- a/databases/mysql-connector-java/Makefile
+++ /dev/null
@@ -1,47 +0,0 @@
-# Created by: Matthew Seaman
-
-PORTNAME=	mysql-connector-java
-PORTVERSION=	8.0.26
-CATEGORIES=	databases java
-MASTER_SITES=	MYSQL/Connector-J
-
-MAINTAINER=	ultima@FreeBSD.org
-COMMENT=	MySQL Connector/J: JDBC interface for MySQL
-
-LICENSE=	GPLv2
-LICENSE_FILE=	${WRKSRC}/LICENSE
-
-RUN_DEPENDS=	${JAVALIBDIR}/slf4j-api.jar:devel/slf4j \
-		${JAVALIBDIR}/c3p0.jar:databases/c3p0 \
-		${JAVALIBDIR}/protobuf-java.jar:devel/protobuf-java
-
-USES=		cpe
-USE_JAVA=	yes
-
-CPE_VENDOR=	oracle
-CPE_PRODUCT=	mysql_connector_j
-
-NO_ARCH=	yes
-NO_BUILD=	yes
-
-CONFLICTS_INSTALL=	mysql-connector-java51-*
-
-JAVA_VERSION=	1.8+
-EXTRADOCS=	CHANGES
-
-PLIST_FILES=	${JAVAJARDIR}/${PORTNAME}.jar
-
-OPTIONS_DEFINE=	DOCS
-
-PORTDOCS=	*
-
-do-install:
-	${INSTALL_DATA} ${INSTALL_WRKSRC}/${DISTNAME}.jar ${STAGEDIR}${JAVAJARDIR}/${PORTNAME}.jar
-
-do-install-DOCS-on:
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	@for extradoc in ${EXTRADOCS} ; do \
-	  ${INSTALL_DATA} ${INSTALL_WRKSRC}/$$extradoc ${STAGEDIR}${DOCSDIR} ; \
-	done
-
-.include <bsd.port.mk>
diff --git a/databases/mysql-connector-java/distinfo b/databases/mysql-connector-java/distinfo
deleted file mode 100644
index 8a45f7cf6694..000000000000
--- a/databases/mysql-connector-java/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1627272373
-SHA256 (mysql-connector-java-8.0.26.tar.gz) = f3eb0f06cf35657a6cf8128b5c83a2c100e54a76ea801f9064e1dbbaa50ec008
-SIZE (mysql-connector-java-8.0.26.tar.gz) = 4180706
diff --git a/databases/mysql-connector-java/pkg-descr b/databases/mysql-connector-java/pkg-descr
deleted file mode 100644
index 1c2cc60dea83..000000000000
--- a/databases/mysql-connector-java/pkg-descr
+++ /dev/null
@@ -1,7 +0,0 @@
-
-MySQL Connector/J is the official JDBC driver for MySQL. MySQL
-Connector/J 8.0 is compatible with all MySQL versions starting with
-MySQL 5.5. Additionally, MySQL Connector/J 8.0 supports the new X
-DevAPI for development with MySQL Server 8.0.
-
-WWW: https://dev.mysql.com/downloads/connector/j/
diff --git a/databases/mysql-connector-java51/Makefile b/databases/mysql-connector-java51/Makefile
index ede3b6b97681..0da50589ab8c 100644
--- a/databases/mysql-connector-java51/Makefile
+++ b/databases/mysql-connector-java51/Makefile
@@ -1,5 +1,3 @@
-# Created by: Matthew Seaman
-
 PORTNAME=	mysql-connector-java
 PORTVERSION=	5.1.49
 CATEGORIES=	databases java
@@ -8,6 +6,7 @@ PKGNAMESUFFIX=	51
 
 MAINTAINER=	ultima@FreeBSD.org
 COMMENT=	MySQL Connector/J: JDBC interface for MySQL
+WWW=		https://dev.mysql.com/downloads/connector/j/
 
 LICENSE=	GPLv2
 
@@ -20,11 +19,11 @@ USES=		cpe
 CPE_VENDOR=	oracle
 CPE_PRODUCT=	mysql_connector_j
 
-CONFLICTS_INSTALL=	mysql-connector-java-8*
+CONFLICTS_INSTALL=	mysql-connector-java # share/java/classes/mysql-connector-java.jar
 
 NO_ARCH=	yes
 USE_JAVA=	yes
-JAVA_VERSION=	1.7 1.8
+JAVA_VERSION=	8
 BUILDDIR=	${WRKDIR}/${DISTNAME}
 APIDOCSDIR=	${STAGEDIR}${DOCSDIR}/javadoc
 SRCDIR=		${WRKDIR}/${DISTNAME}/src
diff --git a/databases/mysql-connector-java51/pkg-descr b/databases/mysql-connector-java51/pkg-descr
index ed9bd89df272..a048c34b323a 100644
--- a/databases/mysql-connector-java51/pkg-descr
+++ b/databases/mysql-connector-java51/pkg-descr
@@ -9,5 +9,3 @@ complete JDBC feature set that supports the capabilities of MySQL.
 
 This port is derived from the original databases/mysql-jdbc-mm port of
 the mm.mysql JDBC connector by dglo@ssec.wisc.edu.
-
-WWW: https://dev.mysql.com/downloads/connector/j/
diff --git a/databases/mysql-connector-odbc-80/Makefile b/databases/mysql-connector-odbc-80/Makefile
new file mode 100644
index 000000000000..501f5ea87616
--- /dev/null
+++ b/databases/mysql-connector-odbc-80/Makefile
@@ -0,0 +1,38 @@
+PORTNAME=	mysql-connector-odbc
+PORTVERSION=	8.0.32
+CATEGORIES=	databases
+MASTER_SITES=	MYSQL/Connector-ODBC/8.0
+PKGNAMESUFFIX=	-${DRIVER_MANAGER}-mysql${MYSQL_VER}
+DISTNAME=	${PORTNAME}-${PORTVERSION}-src
+
+MAINTAINER=	bofh@FreeBSD.org
+COMMENT=	ODBC driver for MySQL${MYSQL_VER} / ${DRIVER_MANAGER}
+WWW=		https://www.mysql.com/
+
+LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/LICENSE.txt
+
+LIB_DEPENDS=	libodbc.so:databases/unixODBC \
+	libunwind.so:devel/libunwind \
+	libzstd.so:archivers/zstd
+
+USES=		cmake compiler:c++11-lang localbase:ldflags mysql:80 ssl
+USE_LDCONFIG=	yes
+
+CMAKE_ARGS=	-DWITH_UNIXODBC=1 -DDISABLE_GUI=1
+
+DRIVER_MANAGER=	unixodbc
+
+PLIST_FILES=	bin/myodbc-installer \
+		lib/libmyodbc8a.so \
+		lib/libmyodbc8w.so \
+		test/dltest
+PORTDOCS=	*
+
+OPTIONS_DEFINE=	DOCS
+
+post-install:
+	@${RM} ${STAGEDIR}${PREFIX}/INFO_BIN
+	@${RM} ${STAGEDIR}${PREFIX}/INFO_SRC
+
+.include <bsd.port.mk>
diff --git a/databases/mysql-connector-odbc-80/distinfo b/databases/mysql-connector-odbc-80/distinfo
new file mode 100644
index 000000000000..6348964715af
--- /dev/null
+++ b/databases/mysql-connector-odbc-80/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1675358550
+SHA256 (mysql-connector-odbc-8.0.32-src.tar.gz) = 068f275afccc69e2ea5ea0d59ea0ecf0380710f9a9f6158e4751f07d5eec84a2
+SIZE (mysql-connector-odbc-8.0.32-src.tar.gz) = 3845574
diff --git a/databases/mysql-connector-odbc-80/files/patch-CMakeLists.txt b/databases/mysql-connector-odbc-80/files/patch-CMakeLists.txt
new file mode 100644
index 000000000000..366b09a1ecf7
--- /dev/null
+++ b/databases/mysql-connector-odbc-80/files/patch-CMakeLists.txt
@@ -0,0 +1,234 @@
+--- CMakeLists.txt.orig	2022-12-10 21:58:26 UTC
++++ CMakeLists.txt
+@@ -458,7 +458,7 @@ IF(WIN32)
+ 
+   if (FIX_WARNINGS)
+ 
+-    # TODO: Increase warning level and once all warnings are cleared, enable 
++    # TODO: Increase warning level and once all warnings are cleared, enable
+     # higher warning level in MAINTAINER_MODE. We start with no warnings on
+     # level /W1
+ 
+@@ -478,7 +478,7 @@ ELSE(WIN32)
+   if(FIX_WARNINGS)
+ 
+     # TODO: Fix the compile warnings generated without `-w`. Once done,
+-    # remove this option in MAINTAINER_MODE so that we see when new 
++    # remove this option in MAINTAINER_MODE so that we see when new
+     # warnings appear. Then proceed to `-w extra`.
+ 
+     add_compile_options(-Werror)
+@@ -486,7 +486,7 @@ ELSE(WIN32)
+     else()
+ 
+     add_compile_options( -w )
+-  
++
+   endif()
+ 
+ ENDIF(WIN32)
+@@ -517,7 +517,6 @@ ADD_SUBDIRECTORY(installer)
+ 
+ ADD_SUBDIRECTORY(dltest)
+ ADD_SUBDIRECTORY(installer)
+-ADD_SUBDIRECTORY(test)
+ 
+ # For dynamic linking use the built-in sys and strings
+ IF(NOT MYSQLCLIENT_STATIC_LINKING)
+@@ -591,10 +590,10 @@ INCLUDE(cmake/info_bin.cmake)
+ #------------ Installation ---------------------------
+ INCLUDE(cmake/info_bin.cmake)
+ 
+-INSTALL(FILES LICENSE.txt   DESTINATION .)
++INSTALL(FILES LICENSE.txt   DESTINATION ./share/doc/mysql-connector-odbc/)
+ 
+ if(EXISTS "${CMAKE_SOURCE_DIR}/README.txt")
+-  INSTALL(FILES README.txt    DESTINATION .)
++  INSTALL(FILES README.txt    DESTINATION ./share/doc/mysql-connector-odbc/)
+ else()
+   INSTALL(FILES README.md    DESTINATION .)
+   INSTALL(FILES CONTRIBUTING.md    DESTINATION .)
+@@ -658,7 +657,7 @@ ELSE(WIN32)
+ 
+ ELSE(WIN32)
+ 
+-  INSTALL(FILES ChangeLog    DESTINATION .)
++  INSTALL(FILES ChangeLog    DESTINATION ./share/doc/mysql-connector-odbc/)
+ 
+ ENDIF(WIN32)
+ 
+@@ -666,16 +665,16 @@ ENDIF(WIN32)
+ # Bundle 3rd party dependencies if needed
+ # =======================================
+ 
+-# If build is configured with BUNDEL_DEPENDENCIES enabled then client-side 
+-# plugins, their dependencies and other dependencies of the client library that 
+-# are found at the client library installation location are copied to the 
++# If build is configured with BUNDEL_DEPENDENCIES enabled then client-side
++# plugins, their dependencies and other dependencies of the client library that
++# are found at the client library installation location are copied to the
+ # location where ODBC driver is installed.
+ #
+-# The lists of known plugins and 3rd party libraries are specified below. Only 
+-# the specified plugins and libraries will be bundled. Also plugins and 
+-# libraries that can be found with the server but which should be ignored are 
+-# specified below. When building in MAINTAINER_MODE cmake will report error if 
+-# it finds a plugin or 3rd party librariy which is not listed here. When that 
++# The lists of known plugins and 3rd party libraries are specified below. Only
++# the specified plugins and libraries will be bundled. Also plugins and
++# libraries that can be found with the server but which should be ignored are
++# specified below. When building in MAINTAINER_MODE cmake will report error if
++# it finds a plugin or 3rd party librariy which is not listed here. When that
+ # happens the lists should be updated.
+ #
+ # TODO: Move these checks to cmake/FindMySQL.cmake ?
+@@ -697,20 +696,20 @@ endif()
+ # Plugin dependencies.
+ #
+ # Warning: If one library name is a prefix of the other, the longer name
+-# should be listed first, otherwise the logic detecting missing dependencies 
++# should be listed first, otherwise the logic detecting missing dependencies
+ # will break... For example: `krb5support` must go before `krb5`
+ 
+ set(AUTH_DEPS_fido fido2)
+ 
+ if(WIN32)
+-  set(AUTH_DEPS_kerberos 
++  set(AUTH_DEPS_kerberos
+     comerr gssapi k5sprt krbcc xpprof krb5
+   )
+ else()
+   set(AUTH_DEPS_kerberos gssapi_krb5 k5crypto krb5support krb5 com_err)
+ endif()
+ 
+-# Note: On Solaris and macOS all dependencies of ldap_sasl plugin are assumed 
++# Note: On Solaris and macOS all dependencies of ldap_sasl plugin are assumed
+ # to be part of the OS.
+ 
+ if(NOT APPLE AND NOT CMAKE_SYSTEM_NAME MATCHES "SunOS")
+@@ -730,7 +729,7 @@ set(BUNDLED_LIBS
+   libssl libcrypto ssleay libeay
+ )
+ 
+-# List plugins and other libraries that can be found bundled with the server 
++# List plugins and other libraries that can be found bundled with the server
+ # but which are not relevant on client-side and can be safely ignored.
+ 
+ set(IGNORED_PLUGINS qa_auth_client)
+@@ -797,11 +796,11 @@ endfunction(bundle_lib)
+ 
+ 
+ # Bundle libraries listed in a list variable ${to_bundle}.
+-# Libraries that were found and bundled are removed from ${to_bundle} list. 
+-# Other libraries found but not listed in ${to_bundle} are returned 
++# Libraries that were found and bundled are removed from ${to_bundle} list.
++# Other libraries found but not listed in ${to_bundle} are returned
+ # in ${ignored} variable.
+-# If additional arguments are given, they are used as glob expressions to find 
+-# the libraries to be bundled, otherwise 3rd parties bundled in with the server 
++# If additional arguments are given, they are used as glob expressions to find
++# the libraries to be bundled, otherwise 3rd parties bundled in with the server
+ # are searched in ${MYSQL_LIB_DIR} locations.
+ 
+ macro(bundle_libs to_bundle ignored)
+@@ -811,12 +810,12 @@ macro(bundle_libs to_bundle ignored)
+   if(ARGN)
+ 
+    file(GLOB _bundled ${ARGN})
+-  
++
+   else()
+ 
+     file(GLOB _bundled
+       "${MYSQL_LIB_DIR}/*${CMAKE_SHARED_LIBRARY_SUFFIX}*"
+-      "${MYSQL_LIB_DIR}/private/*${CMAKE_SHARED_LIBRARY_SUFFIX}*"  
++      "${MYSQL_LIB_DIR}/private/*${CMAKE_SHARED_LIBRARY_SUFFIX}*"
+     )
+ 
+     # On windows, libs are in bin directory
+@@ -865,9 +864,9 @@ endmacro(bundle_libs)
+ endmacro(bundle_libs)
+ 
+ 
+-# Bundle plugins listed in PLUGINS list. Each bundled plugin P is removed from 
+-# the list and its dependedencies listed in DEPS_${P} are also bundled. Client 
+-# side plugins found with the server and not listed in PLUGINS are returned 
++# Bundle plugins listed in PLUGINS list. Each bundled plugin P is removed from
++# the list and its dependedencies listed in DEPS_${P} are also bundled. Client
++# side plugins found with the server and not listed in PLUGINS are returned
+ # in ${ignored} list.
+ 
+ macro(bundle_plugins ignored)
+@@ -888,7 +887,7 @@ macro(bundle_plugins ignored)
+ 
+     #message("== looking at client-side plugin: ${lib_name}")
+ 
+-    # Match plugin name against names in PLUGINS list and in case of match 
++    # Match plugin name against names in PLUGINS list and in case of match
+     # remove that name from the list
+ 
+     unset(plugin)
+@@ -926,7 +925,7 @@ macro(bundle_plugins ignored)
+       set(sasl_bundled 1)
+     endif()
+ 
+-    # On Windows the MIT Kerberos library uses ccapiserver.exe application 
++    # On Windows the MIT Kerberos library uses ccapiserver.exe application
+     # in some scenarios - we need to bundle it as well.
+ 
+     if(WIN32 AND "${DEPS_${plugin}}" MATCHES "krb5")
+@@ -1000,7 +999,7 @@ if(BUNDLE_DEPENDENCIES)
+   endforeach()
+ 
+   # Bundle the plugins and their dependencies.
+- 
++
+   unset(ingored)
+   bundle_plugins(ignored)
+ 
+@@ -1012,7 +1011,7 @@ if(BUNDLE_DEPENDENCIES)
+ 
+     foreach(plugin ${IGNORED_PLUGINS})
+ 
+-      # Note: Old cmake (seen with 3.13.4) generates this error on 
++      # Note: Old cmake (seen with 3.13.4) generates this error on
+       # list(FILTER...) if the list is empty:
+       # "list sub-command FILTER requires list to be present"
+ 
+@@ -1037,8 +1036,8 @@ if(BUNDLE_DEPENDENCIES)
+ 
+   message(STATUS "Looking for bundled client lib dependencies")
+ 
+-  # Bundle additional libraries listed in BUNDLED_LIBS 
+-  # For OpenSSL libs, first look in the location of the library that 
++  # Bundle additional libraries listed in BUNDLED_LIBS
++  # For OpenSSL libs, first look in the location of the library that
+   # is actually being used in the build.
+ 
+   #message("== BUNDLED_LIBS: ${BUNDLED_LIBS}")
+@@ -1052,12 +1051,12 @@ if(BUNDLE_DEPENDENCIES)
+   unset(extra_libs)
+   bundle_libs(BUNDLED_LIBS extra_libs)
+ 
+-  # In MAINTAINER_MODE check whether all 3rd party libs found but not bundled 
++  # In MAINTAINER_MODE check whether all 3rd party libs found but not bundled
+   # are listed in IGNORED_LIBS
+ 
+   if(MAINTAINER_MODE)
+ 
+-    # Extend ignore list with libraries that are dependencies of known plugins 
++    # Extend ignore list with libraries that are dependencies of known plugins
+     # and are not listed in BUNDLED_LIBS. Otherwise we would get false errors
+     # below.
+ 
+@@ -1065,8 +1064,8 @@ if(BUNDLE_DEPENDENCIES)
+       list(APPEND IGNORED_LIBS ${DEPS_${plugin}})
+     endforeach()
+ 
+-    # Remove from ${extra_libs} the libraries that we know we should ignore. 
+-    # Also the openssl libs that might end up in ${extra_libs} bacause of two 
++    # Remove from ${extra_libs} the libraries that we know we should ignore.
++    # Also the openssl libs that might end up in ${extra_libs} bacause of two
+     # stage search logic above.
+ 
+     #message("== extra_libs: ${extra_libs}")
diff --git a/databases/mysql-connector-odbc-80/files/patch-driver_dll.cc b/databases/mysql-connector-odbc-80/files/patch-driver_dll.cc
new file mode 100644
index 000000000000..59db345c06bb
--- /dev/null
+++ b/databases/mysql-connector-odbc-80/files/patch-driver_dll.cc
@@ -0,0 +1,11 @@
+--- driver/dll.cc.orig	2022-12-10 21:58:26 UTC
++++ driver/dll.cc
+@@ -145,7 +145,7 @@ void myodbc_end()
+        This eliminates the delay when mysys_end() is called and other threads
+        have been initialized but not ended.
+     */
+-    my_thread_end_wait_time= 0;
++    static uint my_thread_end_wait_time= 0;
+ #endif
+ 
+     mysql_library_end();
diff --git a/databases/mysql-connector-odbc-80/files/patch-include_mysql-8.0_my__sys.h b/databases/mysql-connector-odbc-80/files/patch-include_mysql-8.0_my__sys.h
new file mode 100644
index 000000000000..f56fd61ce3bf
--- /dev/null
+++ b/databases/mysql-connector-odbc-80/files/patch-include_mysql-8.0_my__sys.h
@@ -0,0 +1,24 @@
+--- include/mysql-8.0/my_sys.h.orig	2022-12-10 21:58:26 UTC
++++ include/mysql-8.0/my_sys.h
+@@ -34,8 +34,12 @@
+ #include "my_config.h"
+ 
+ #ifdef HAVE_ALLOCA_H
++#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
++#include <stdlib.h>
++#else
+ #include <alloca.h>
+ #endif
++#endif
+ #include <limits.h>
+ #ifdef _WIN32
+ #include <malloc.h>
+@@ -322,6 +326,8 @@ typedef int (*IO_CACHE_CALLBACK)(IO_CACHE *);
+ 
+ struct IO_CACHE;
+ typedef int (*IO_CACHE_CALLBACK)(IO_CACHE *);
++
++typedef unsigned long ulong;
+ 
+ struct IO_CACHE_SHARE {
+   mysql_mutex_t mutex;      /* To sync on reads into buffer. */
diff --git a/databases/mysql-connector-odbc-80/pkg-descr b/databases/mysql-connector-odbc-80/pkg-descr
new file mode 100644
index 000000000000..0441dd6a5d7f
--- /dev/null
+++ b/databases/mysql-connector-odbc-80/pkg-descr
@@ -0,0 +1 @@
+MySQL Connector ODBC is an ODBC driver for interfacing to MySQL databases.
diff --git a/databases/mysql-connector-odbc/Makefile b/databases/mysql-connector-odbc/Makefile
deleted file mode 100644
index 588b10dc2441..000000000000
--- a/databases/mysql-connector-odbc/Makefile
+++ /dev/null
@@ -1,38 +0,0 @@
-# Created by: sergey@migsoft.com.ua
-
-PORTNAME=	mysql-connector-odbc
-PORTVERSION=	5.3.13
-PORTREVISION=	1
-CATEGORIES=	databases
-MASTER_SITES=	MYSQL/Connector-ODBC/5.3
-PKGNAMESUFFIX=	-${DRIVER_MANAGER}-mysql${MYSQL_VER}
-DISTNAME=	${PORTNAME}-${PORTVERSION}-src
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	ODBC driver for MySQL${MYSQL_VER} / ${DRIVER_MANAGER}
-
-LICENSE=	GPLv2
-LICENSE_FILE=	${WRKSRC}/LICENSE.txt
-
-LIB_DEPENDS=	libodbc.so:databases/unixODBC
-
-USES=		cmake compiler:c++11-lang mysql
-
-CMAKE_ARGS=	-DWITH_UNIXODBC=1 -DDISABLE_GUI=1
-USE_LDCONFIG=	yes
-
-MAKE_JOBS_UNSAFE=yes
-
-LDFLAGS+=	-L${LOCALBASE}/lib
-
-DRIVER_MANAGER=	unixodbc
-
-PORTDOCS=	*
-
-PLIST_FILES=	bin/myodbc-installer \
-		lib/libmyodbc5a.so \
-		lib/libmyodbc5w.so
-
-OPTIONS_DEFINE=	DOCS
-
-.include <bsd.port.mk>
diff --git a/databases/mysql-connector-odbc/distinfo b/databases/mysql-connector-odbc/distinfo
deleted file mode 100644
index 53ee695d2482..000000000000
--- a/databases/mysql-connector-odbc/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1560498109
-SHA256 (mysql-connector-odbc-5.3.13-src.tar.gz) = 6127639a503e80cff71e211d7534801a074e781624974807a279c7f6e6f0353a
-SIZE (mysql-connector-odbc-5.3.13-src.tar.gz) = 3009032
diff --git a/databases/mysql-connector-odbc/files/patch-CMakeLists.txt b/databases/mysql-connector-odbc/files/patch-CMakeLists.txt
deleted file mode 100644
index f184b2a0e6f4..000000000000
--- a/databases/mysql-connector-odbc/files/patch-CMakeLists.txt
+++ /dev/null
@@ -1,30 +0,0 @@
---- CMakeLists.txt.orig	2019-04-15 16:56:34 UTC
-+++ CMakeLists.txt
-@@ -431,7 +431,6 @@ ENDIF(NOT DISABLE_GUI)
- 
- ADD_SUBDIRECTORY(dltest)
- ADD_SUBDIRECTORY(installer)
--ADD_SUBDIRECTORY(test)
- 
- # For dynamic linking use the built-in sys and strings
- IF(NOT MYSQLCLIENT_STATIC_LINKING)
-@@ -501,8 +500,8 @@ cmake/sql.*\\\\.c$
- #------------ Installation ---------------------------
- 
- 
--INSTALL(FILES LICENSE.txt   DESTINATION .)
--INSTALL(FILES README.txt    DESTINATION .)
-+INSTALL(FILES LICENSE.txt   DESTINATION ./share/doc/mysql-connector-odbc/)
-+INSTALL(FILES README.txt    DESTINATION ./share/doc/mysql-connector-odbc/)
- 
- IF(WIN32)
- 
-@@ -542,7 +541,7 @@ IF(WIN32)
- 
- ELSE(WIN32)
- 
--  INSTALL(FILES ChangeLog    DESTINATION .)
-+  INSTALL(FILES ChangeLog    DESTINATION ./share/doc/mysql-connector-odbc/)
- 
- ENDIF(WIN32)
- 
diff --git a/databases/mysql-connector-odbc/files/patch-driver_dll.cc b/databases/mysql-connector-odbc/files/patch-driver_dll.cc
deleted file mode 100644
index b69ce6b9e812..000000000000
--- a/databases/mysql-connector-odbc/files/patch-driver_dll.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- driver/dll.cc.orig	2019-04-15 16:56:34 UTC
-+++ driver/dll.cc
-@@ -125,7 +125,7 @@ void myodbc_end()
-        This eliminates the delay when mysys_end() is called and other threads
-        have been initialized but not ended.
-     */
--    my_thread_end_wait_time= 0;
-+    static uint my_thread_end_wait_time= 0;
- #endif
- 
- /*
diff --git a/databases/mysql-connector-odbc/files/patch-driver_handle.cc b/databases/mysql-connector-odbc/files/patch-driver_handle.cc
deleted file mode 100644
index 3a12e522fa4e..000000000000
--- a/databases/mysql-connector-odbc/files/patch-driver_handle.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- driver/handle.cc.orig	2019-04-15 16:56:34 UTC
-+++ driver/handle.cc
-@@ -646,7 +646,7 @@ SQLRETURN SQL_API my_SQLFreeStmtExtended(SQLHSTMT hstm
- #if MYSQL_VERSION_ID >= 50722 && MYSQL_VERSION_ID < 80000
-       if (stmt->result != NULL
- #else
--      if((stmt->result != NULL) && (stmt->result->field_alloc != NULL)
-+      if((stmt->result != NULL) && (&stmt->result->field_alloc != NULL)
- #if (!MYSQLCLIENT_STATIC_LINKING || !MYSQL8)
-          && (stmt->result->field_alloc.pre_alloc != NULL )
- #endif
diff --git a/databases/mysql-connector-odbc/pkg-descr b/databases/mysql-connector-odbc/pkg-descr
deleted file mode 100644
index 89c9baf1615c..000000000000
--- a/databases/mysql-connector-odbc/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-MySQL Connector ODBC is an ODBC driver for interfacing to MySQL databases.
-
-WWW: http://www.mysql.com/
diff --git a/databases/mysql-q4m/Makefile b/databases/mysql-q4m/Makefile
deleted file mode 100644
index cd07099c09ff..000000000000
--- a/databases/mysql-q4m/Makefile
+++ /dev/null
@@ -1,57 +0,0 @@
-# Created by: Akinori MUSHA aka knu <knu@idaemons.org>
-
-PORTNAME=	q4m
-PORTVERSION=	0.9.14
-PORTREVISION=	5
-CATEGORIES=	databases
-MASTER_SITES=	http://q4m.kazuhooku.com/dist/
-PKGNAMEPREFIX=	${_MYSQL_SERVER:T:C/-server$/-/}
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Message queue that works as a pluggable storage engine of MySQL
-
-FETCH_DEPENDS+=	${NONEXISTENT}:${_MYSQL_SERVER}:fetch
-BUILD_DEPENDS+=	${NONEXISTENT}:${_MYSQL_SERVER}:build
-
-USES=		gmake perl5 libtool mysql:server
-
-IGNORE_WITH_MYSQL=	57 80 101m 102m 103m 57p 57w
-USE_GCC=	yes
-USE_PERL5=	run
-
-GNU_CONFIGURE=	yes
-LDFLAGS+=	-lpthread -L${LOCALBASE}/lib/mysql
-CONFIGURE_ARGS=	--prefix="${PREFIX}" \
-		--libdir="${PREFIX}/lib/mysql/plugin" \
-		--with-mysql="$$(cd ${PORTSDIR}/${_MYSQL_SERVER}; ${MAKE} -V WRKSRC)" \
-		CPPFLAGS="-I$$(cd ${PORTSDIR}/${_MYSQL_SERVER}; ${MAKE} -V BUILD_WRKSRC)/include -DDEBUG_OFF"
-INSTALL_TARGET=	bindir=${STAGEDIR}${PREFIX}/bin install
-
-post-extract:
-	${CP} -p ${WRKSRC}/support-files/install.sql ${WRKSRC}/examples/
-
-OPTIONS_DEFINE=	DOCS EXAMPLES
-
-PORTDOCS=	AUTHORS ChangeLog README doc
-PORTEXAMPLES=	crawler install.sql
-
-post-patch:
-	@${REINPLACE_CMD} -e 's|/include/mysql|/include/mysql/mysql|g' ${WRKSRC}/configure
-
-post-install:
-	${MKDIR} ${STAGEDIR}${DOCSDIR}
-.for f in ${PORTDOCS}
-	cd ${WRKSRC}; ${COPYTREE_SHARE} ${f} ${STAGEDIR}${DOCSDIR}
-.endfor
-	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
-.for f in ${PORTEXAMPLES}
-	cd ${WRKSRC}/examples; ${COPYTREE_SHARE} ${f} ${STAGEDIR}${EXAMPLESDIR}
-.endfor
-
-install-functions:
-	mysql -u root -p -f mysql < ${EXAMPLESDIR}/install.sql
-
-test:
-	cd ${WRKSRC}; ./run_tests.pl
-
-.include <bsd.port.mk>
diff --git a/databases/mysql-q4m/distinfo b/databases/mysql-q4m/distinfo
deleted file mode 100644
index 1c5c0a949858..000000000000
--- a/databases/mysql-q4m/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1481686487
-SHA256 (q4m-0.9.14.tar.gz) = 26f6242fb56580a3bd16fd025012fac3b264be6269255532d1398273b1d7792a
-SIZE (q4m-0.9.14.tar.gz) = 1665552
diff --git a/databases/mysql-q4m/files/patch-src__ha_queue.cc b/databases/mysql-q4m/files/patch-src__ha_queue.cc
deleted file mode 100644
index 92ceb4f921e8..000000000000
--- a/databases/mysql-q4m/files/patch-src__ha_queue.cc
+++ /dev/null
@@ -1,21 +0,0 @@
---- src/ha_queue.cc.orig	2014-02-06 14:51:01.000000000 +0900
-+++ src/ha_queue.cc	2014-02-12 13:48:57.069544726 +0900
-@@ -68,9 +68,7 @@
- #define Q4M_DELETE_MT_PWRITE 2
- #define Q4M_DELETE_SERIAL_PWRITE 3
- 
--#if MYSQL_VERSION_ID < 50500
- #include "queue_config.h"
--#endif
- 
- #if SIZEOF_OFF_T != 8
- #  error "support for 64-bit file offsets is mandatory"
-@@ -763,7 +761,7 @@
-     if (share->mmap_table(max(min((info->_header.end() + EXPAND_BY - 1)
- 				  / EXPAND_BY * EXPAND_BY,
- 				  mmap_max),
--			      EXPAND_BY))
-+			      static_cast<ulonglong>EXPAND_BY))
- 	!= 0) {
-       log("mmap failed\n");
-       goto ERR_AFTER_FILEOPEN;
diff --git a/databases/mysql-q4m/files/patch-src__queue_cond.cc b/databases/mysql-q4m/files/patch-src__queue_cond.cc
deleted file mode 100644
index 343a58be8b6e..000000000000
--- a/databases/mysql-q4m/files/patch-src__queue_cond.cc
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/queue_cond.cc.orig	2013-03-22 15:35:15.000000000 +0900
-+++ src/queue_cond.cc	2014-01-22 18:55:04.861289350 +0900
-@@ -10,6 +10,7 @@
- #include <string>
- #include <iostream>
- #endif
-+#include "queue_config.h"
- #include "queue_cond.h"
- 
- using namespace std;
diff --git a/databases/mysql-q4m/pkg-descr b/databases/mysql-q4m/pkg-descr
deleted file mode 100644
index 8155e2ace1bc..000000000000
--- a/databases/mysql-q4m/pkg-descr
+++ /dev/null
@@ -1,6 +0,0 @@
-Q4M (Queue for MySQL) is a message queue licensed under GPL that works
-as a pluggable storage engine of MySQL 5.1, designed to be robust,
-fast, flexible.  The development started in late December of 2007, and
-although it is very primitive, operates quite swiftly.
-
-WWW: http://q4m.github.com/
diff --git a/databases/mysql-q4m/pkg-plist b/databases/mysql-q4m/pkg-plist
deleted file mode 100644
index cd98d6282824..000000000000
--- a/databases/mysql-q4m/pkg-plist
+++ /dev/null
@@ -1,5 +0,0 @@
-bin/q4m-forward
-lib/mysql/plugin/libqueue_engine.a
-lib/mysql/plugin/libqueue_engine.so
-lib/mysql/plugin/libqueue_engine.so.0
-lib/mysql/plugin/libqueue_engine.so.0.0.0
diff --git a/databases/mysql-udf/Makefile b/databases/mysql-udf/Makefile
deleted file mode 100644
index 56db4c7ccb47..000000000000
--- a/databases/mysql-udf/Makefile
+++ /dev/null
@@ -1,43 +0,0 @@
-# Created by: Martin Matuska <mm@FreeBSD.org>
-
-PORTNAME=	mysql-udf
-PORTVERSION=	0.3
-PORTREVISION=	3
-CATEGORIES=	databases
-MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Set of user-defined functions for the MySQL server
-
-WRKSRC=		${WRKDIR}/${PORTNAME}
-
-USES=		mysql
-CFLAGS_aarch64+=-fPIC
-CFLAGS_amd64+=	-fPIC
-CFLAGS_i386+=	-fPIC
-CFLAGS_powerpc+=	-fPIC
-CFLAGS_powerpc64+=	-fPIC
-CFLAGS_powerpc64le+=	-fPIC
-
-MODULES=	colwidth confidence_higher confidence_lower correlation \
-		faculty geomean intercept kurtosis longest median noverm \
-		skewness slope stdnorm_density stdnorm_dist weightedavg
-
-.for MODULE in ${MODULES}
-PLIST_FILES+=	lib/mysql/plugin/udf_${MODULE}.so
-.endfor
-
-do-build:
-.for MODULE in ${MODULES}
-	cd ${WRKSRC} && \
-	${CC} ${CFLAGS} -I${LOCALBASE}/include -I${LOCALBASE}/include/mysql -c -o udf_${MODULE}.o udf_${MODULE}.cc && \
-	${CC} -shared -o udf_${MODULE}.so udf_${MODULE}.o
-.endfor
-
-do-install:
-	${MKDIR} ${STAGEDIR}${PREFIX}/lib/mysql/plugin
-.for MODULE in ${MODULES}
-	${INSTALL_PROGRAM} ${WRKSRC}/udf_${MODULE}.so ${STAGEDIR}${PREFIX}/lib/mysql/plugin/udf_${MODULE}.so
-.endfor
-
-.include <bsd.port.mk>
diff --git a/databases/mysql-udf/distinfo b/databases/mysql-udf/distinfo
deleted file mode 100644
index d1afcfd8f0c5..000000000000
--- a/databases/mysql-udf/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1467549429
-SHA256 (mysql-udf-0.3.tar.gz) = d9115aeecccfc06ccdc209a761a6a4d0dba70f15c9319ab76d173b04737beaf2
-SIZE (mysql-udf-0.3.tar.gz) = 6714
diff --git a/databases/mysql-udf/files/patch-mysql_4.1 b/databases/mysql-udf/files/patch-mysql_4.1
deleted file mode 100644
index 992f6a4d1554..000000000000
--- a/databases/mysql-udf/files/patch-mysql_4.1
+++ /dev/null
@@ -1,490 +0,0 @@
-diff -C3 -r mysql-udf-orig/udf_colwidth.cc udf_colwidth.cc
-*** mysql-udf-orig/udf_colwidth.cc	2004-07-16 00:35:05.000000000 +0200
---- udf_colwidth.cc	2005-10-05 14:37:55.000000000 +0200
-***************
-*** 42,47 ****
---- 42,48 ----
-  my_bool colwidth_init( UDF_INIT* initid, UDF_ARGS* args, char* message );
-  void colwidth_deinit( UDF_INIT* initid );
-  void colwidth_reset( UDF_INIT* initid, UDF_ARGS* args, char* is_null, char *error );
-+ void colwidth_clear( UDF_INIT* initid, char* is_null, char *error );
-  void colwidth_add( UDF_INIT* initid, UDF_ARGS* args, char* is_null, char *error );
-  long long colwidth( UDF_INIT* initid, UDF_ARGS* args, char* is_null, char* error );
-  
-***************
-*** 93,102 ****
-  
-  void colwidth_reset( UDF_INIT* initid, UDF_ARGS* args, char* is_null, char* message )
-  {
-    struct colwidth_data* data = (struct colwidth_data*)initid->ptr;
-    
-    data->maxlength=(long long) 0;
--   colwidth_add( initid, args, is_null, message );
-  }
-  
-  
---- 94,110 ----
-  
-  void colwidth_reset( UDF_INIT* initid, UDF_ARGS* args, char* is_null, char* message )
-  {
-+ 
-+   colwidth_clear( initid, is_null, message );
-+   colwidth_add( initid, args, is_null, message );
-+ }
-+ 
-+ 
-+ void colwidth_clear( UDF_INIT* initid, char* is_null, char* message )
-+ {
-    struct colwidth_data* data = (struct colwidth_data*)initid->ptr;
-    
-    data->maxlength=(long long) 0;
-  }
-  
-  
-diff -C3 -r mysql-udf-orig/udf_confidence_higher.cc udf_confidence_higher.cc
-*** mysql-udf-orig/udf_confidence_higher.cc	2004-07-15 23:39:09.000000000 +0200
---- udf_confidence_higher.cc	2005-06-01 10:19:48.000000000 +0200
-***************
-*** 38,43 ****
---- 38,44 ----
-  #include <mysql.h>
-  #include <m_ctype.h>
-  #include <m_string.h>		
-+ #include <math.h>
-  
-  #ifdef HAVE_DLOPEN
-  
-diff -C3 -r mysql-udf-orig/udf_confidence_lower.cc udf_confidence_lower.cc
-*** mysql-udf-orig/udf_confidence_lower.cc	2004-07-15 23:38:17.000000000 +0200
---- udf_confidence_lower.cc	2005-06-01 10:20:17.000000000 +0200
-***************
-*** 38,43 ****
---- 38,44 ----
-  #include <mysql.h>
-  #include <m_ctype.h>
-  #include <m_string.h>		
-+ #include <math.h>
-  
-  #ifdef HAVE_DLOPEN
-  
-diff -C3 -r mysql-udf-orig/udf_correlation.cc udf_correlation.cc
-*** mysql-udf-orig/udf_correlation.cc	2004-07-16 00:31:41.000000000 +0200
---- udf_correlation.cc	2005-10-05 14:14:22.000000000 +0200
-***************
-*** 36,41 ****
---- 36,42 ----
-  #include <mysql.h>
-  #include <m_ctype.h>
-  #include <m_string.h>		
-+ #include <math.h>
-  
-  #ifdef HAVE_DLOPEN
-  
-***************
-*** 49,54 ****
---- 50,56 ----
-  my_bool correlation_init( UDF_INIT* initid, UDF_ARGS* args, char* message );
-  void correlation_deinit( UDF_INIT* initid );
-  void correlation_reset( UDF_INIT* initid, UDF_ARGS* args, char* is_null, char *error );
-+ void correlation_clear( UDF_INIT* initid, char* is_null, char *error );
-  void correlation_add( UDF_INIT* initid, UDF_ARGS* args, char* is_null, char *error );
-  double correlation( UDF_INIT* initid, UDF_ARGS* args, char* is_null, char *error );
-  
-***************
-*** 134,139 ****
---- 136,147 ----
-  
-  void correlation_reset( UDF_INIT* initid, UDF_ARGS* args, char* is_null, char* is_error )
-  {
-+   correlation_clear( initid, is_null, is_error );
-+   correlation_add( initid, args, is_null, is_error );
-+ }
-+ 
-+ void correlation_clear( UDF_INIT* initid, char* is_null, char* is_error )
-+ {
-    regression_data *buffer = (regression_data*)initid->ptr;
-    buffer->count = 0;
-    buffer->abscount=0;
-***************
-*** 156,162 ****
-    buffer->valuesx=(double *) malloc(BUFFERSIZE*sizeof(double));
-    buffer->valuesy=(double *) malloc(BUFFERSIZE*sizeof(double));
-  
--   correlation_add( initid, args, is_null, is_error );
-  }
-  
-  
---- 164,169 ----
-diff -C3 -r mysql-udf-orig/udf_geomean.cc udf_geomean.cc
-*** mysql-udf-orig/udf_geomean.cc	2004-07-16 00:10:42.000000000 +0200
---- udf_geomean.cc	2005-10-05 15:06:05.000000000 +0200
-***************
-*** 34,39 ****
---- 34,40 ----
-  #include <mysql.h>
-  #include <m_ctype.h>
-  #include <m_string.h>		
-+ #include <math.h>
-  
-  #ifdef HAVE_DLOPEN
-  
-***************
-*** 43,48 ****
---- 44,50 ----
-  my_bool geomean_init( UDF_INIT* initid, UDF_ARGS* args, char* message );
-  void geomean_deinit( UDF_INIT* initid );
-  void geomean_reset( UDF_INIT* initid, UDF_ARGS* args, char* is_null, char *error );
-+ void geomean_clear( UDF_INIT* initid, char* is_null, char *error );
-  void geomean_add( UDF_INIT* initid, UDF_ARGS* args, char* is_null, char *error );
-  double geomean( UDF_INIT* initid, UDF_ARGS* args, char* is_null, char *error );
-  }
-***************
-*** 104,109 ****
---- 106,117 ----
-  
-  void geomean_reset( UDF_INIT* initid, UDF_ARGS* args, char* is_null, char* is_error )
-  {
-+   geomean_clear( initid, is_null, is_error );
-+   geomean_add( initid, args, is_null, is_error );
-+ }
-+ 
-+ void geomean_clear( UDF_INIT* initid, char* is_null, char* is_error )
-+ {
-    geomean_data *buffer = (geomean_data*)initid->ptr;
-    buffer->count = 0;
-    buffer->value=0;
-***************
-*** 111,117 ****
-    *is_null = 0;
-    *is_error = 0;
-  
--   geomean_add( initid, args, is_null, is_error );
-  }
-  
-  
---- 119,124 ----
-diff -C3 -r mysql-udf-orig/udf_intercept.cc udf_intercept.cc
-*** mysql-udf-orig/udf_intercept.cc	2004-07-16 00:29:17.000000000 +0200
---- udf_intercept.cc	2005-10-05 14:45:26.000000000 +0200
-***************
-*** 48,53 ****
---- 48,54 ----
-  my_bool intercept_init( UDF_INIT* initid, UDF_ARGS* args, char* message );
-  void intercept_deinit( UDF_INIT* initid );
-  void intercept_reset( UDF_INIT* initid, UDF_ARGS* args, char* is_null, char *error );
-+ void intercept_clear( UDF_INIT* initid, char* is_null, char *error );
-  void intercept_add( UDF_INIT* initid, UDF_ARGS* args, char* is_null, char *error );
-  double intercept( UDF_INIT* initid, UDF_ARGS* args, char* is_null, char *error );
-  
-***************
-*** 133,138 ****
---- 134,145 ----
-  
-  void intercept_reset( UDF_INIT* initid, UDF_ARGS* args, char* is_null, char* is_error )
-  {
-+   intercept_clear( initid, is_null, is_error );
-+   intercept_add( initid, args, is_null, is_error );
-+ }
-+ 
-+ void intercept_clear( UDF_INIT* initid, char* is_null, char* is_error )
-+ {
-    regression_data *buffer = (regression_data*)initid->ptr;
-    buffer->count = 0;
-    buffer->abscount=0;
-***************
-*** 155,165 ****
-    buffer->valuesx=(double *) malloc(BUFFERSIZE*sizeof(double));
-    buffer->valuesy=(double *) malloc(BUFFERSIZE*sizeof(double));
-  
--   intercept_add( initid, args, is_null, is_error );
-  }
-  
-  
-- 
-  void intercept_add( UDF_INIT* initid, UDF_ARGS* args, char* is_null, char* is_error )
-  {
-    if (args->args[0]!=NULL && args->args[1]!=NULL)
---- 162,170 ----
-diff -C3 -r mysql-udf-orig/udf_kurtosis.cc udf_kurtosis.cc
-*** mysql-udf-orig/udf_kurtosis.cc	2004-07-15 23:55:53.000000000 +0200
---- udf_kurtosis.cc	2005-10-05 14:47:25.000000000 +0200
-***************
-*** 34,39 ****
---- 34,40 ----
-  #include <mysql.h>
-  #include <m_ctype.h>
-  #include <m_string.h>		
-+ #include <math.h>
-  
-  #ifdef HAVE_DLOPEN
-  
-***************
-*** 46,51 ****
---- 47,53 ----
-  my_bool kurtosis_init( UDF_INIT* initid, UDF_ARGS* args, char* message );
-  void kurtosis_deinit( UDF_INIT* initid );
-  void kurtosis_reset( UDF_INIT* initid, UDF_ARGS* args, char* is_null, char *error );
-+ void kurtosis_clear( UDF_INIT* initid, char* is_null, char *error );
-  void kurtosis_add( UDF_INIT* initid, UDF_ARGS* args, char* is_null, char *error );
-  double kurtosis( UDF_INIT* initid, UDF_ARGS* args, char* is_null, char *error );
-  }
-***************
-*** 116,121 ****
---- 118,130 ----
-  
-  void kurtosis_reset( UDF_INIT* initid, UDF_ARGS* args, char* is_null, char* is_error )
-  {
-+   kurtosis_clear( initid, is_null, is_error );
-+   kurtosis_add( initid, args, is_null, is_error );
-+ }
-+ 
-+ 
-+ void kurtosis_clear( UDF_INIT* initid, char* is_null, char* is_error )
-+ {
-    kurtosis_data *buffer = (kurtosis_data*)initid->ptr;
-    buffer->count = 0;
-    buffer->abscount=0;
-***************
-*** 131,137 ****
-  
-    buffer->values=(double *) malloc(BUFFERSIZE*sizeof(double));
-  
--   kurtosis_add( initid, args, is_null, is_error );
-  }
-  
-  
---- 140,145 ----
-diff -C3 -r mysql-udf-orig/udf_longest.cc udf_longest.cc
-*** mysql-udf-orig/udf_longest.cc	2004-07-16 00:34:09.000000000 +0200
---- udf_longest.cc	2005-10-05 14:48:58.000000000 +0200
-***************
-*** 41,46 ****
---- 41,47 ----
-  my_bool longest_init( UDF_INIT* initid, UDF_ARGS* args, char* message );
-  void longest_deinit( UDF_INIT* initid );
-  void longest_reset( UDF_INIT* initid, UDF_ARGS* args, char* is_null, char *error );
-+ void longest_clear( UDF_INIT* initid, char* is_null, char *error );
-  void longest_add( UDF_INIT* initid, UDF_ARGS* args, char* is_null, char *error );
-  char *longest(UDF_INIT * initid, UDF_ARGS *args, char *result, unsigned long *length, char *is_null, char * /*error*/ );
-  }
-***************
-*** 97,102 ****
---- 98,109 ----
-  
-  void longest_reset( UDF_INIT* initid, UDF_ARGS* args, char* is_null, char* message )
-  {
-+   longest_clear( initid, is_null, message );
-+   longest_add( initid, args, is_null, message );
-+ }
-+ 
-+ void longest_clear( UDF_INIT* initid, char* is_null, char* message )
-+ {
-    struct longest_data* data = (struct longest_data*) initid->ptr;
-    if (data->result_string != NULL)
-    {
-***************
-*** 105,111 ****
-    }
-    data->length = 0;
-    *is_null = 0;
--   longest_add( initid, args, is_null, message );
-  }
-  
-  
---- 112,117 ----
-diff -C3 -r mysql-udf-orig/udf_median.cc udf_median.cc
-*** mysql-udf-orig/udf_median.cc	2004-07-16 00:11:52.000000000 +0200
---- udf_median.cc	2005-10-05 13:49:00.000000000 +0200
-***************
-*** 46,51 ****
---- 46,52 ----
-  my_bool median_init( UDF_INIT* initid, UDF_ARGS* args, char* message );
-  void median_deinit( UDF_INIT* initid );
-  void median_reset( UDF_INIT* initid, UDF_ARGS* args, char* is_null, char *error );
-+ void median_clear( UDF_INIT* initid, char* is_null, char *error );
-  void median_add( UDF_INIT* initid, UDF_ARGS* args, char* is_null, char *error );
-  double median( UDF_INIT* initid, UDF_ARGS* args, char* is_null, char *error );
-  }
-***************
-*** 116,121 ****
---- 117,128 ----
-  
-  void median_reset( UDF_INIT* initid, UDF_ARGS* args, char* is_null, char* is_error )
-  {
-+   median_clear(initid, is_null, is_error);
-+   median_add( initid, args, is_null, is_error );
-+ }
-+ 
-+ void median_clear( UDF_INIT* initid, char* is_null, char* is_error )
-+ {
-    median_data *buffer = (median_data*)initid->ptr;
-    buffer->count = 0;
-    buffer->abscount=0;
-***************
-*** 131,140 ****
-  
-    buffer->values=(double *) malloc(BUFFERSIZE*sizeof(double));
-  
--   median_add( initid, args, is_null, is_error );
-  }
-  
-- 
-  void median_add( UDF_INIT* initid, UDF_ARGS* args, char* is_null, char* is_error )
-  {
-    if (args->args[0]!=NULL)
---- 138,145 ----
-diff -C3 -r mysql-udf-orig/udf_skewness.cc udf_skewness.cc
-*** mysql-udf-orig/udf_skewness.cc	2004-07-15 23:56:06.000000000 +0200
---- udf_skewness.cc	2005-10-05 14:51:28.000000000 +0200
-***************
-*** 34,39 ****
---- 34,40 ----
-  #include <mysql.h>
-  #include <m_ctype.h>
-  #include <m_string.h>		
-+ #include <math.h>
-  
-  #ifdef HAVE_DLOPEN
-  
-***************
-*** 46,51 ****
---- 47,53 ----
-  my_bool skewness_init( UDF_INIT* initid, UDF_ARGS* args, char* message );
-  void skewness_deinit( UDF_INIT* initid );
-  void skewness_reset( UDF_INIT* initid, UDF_ARGS* args, char* is_null, char *error );
-+ void skewness_clear( UDF_INIT* initid, char* is_null, char *error );
-  void skewness_add( UDF_INIT* initid, UDF_ARGS* args, char* is_null, char *error );
-  double skewness( UDF_INIT* initid, UDF_ARGS* args, char* is_null, char *error );
-  }
-***************
-*** 116,121 ****
---- 118,129 ----
-  
-  void skewness_reset( UDF_INIT* initid, UDF_ARGS* args, char* is_null, char* is_error )
-  {
-+   skewness_clear( initid, is_null, is_error );
-+   skewness_add( initid, args, is_null, is_error );
-+ }
-+ 
-+ void skewness_clear( UDF_INIT* initid, char* is_null, char* is_error )
-+ {
-    skewness_data *buffer = (skewness_data*)initid->ptr;
-    buffer->count = 0;
-    buffer->abscount=0;
-***************
-*** 131,137 ****
-  
-    buffer->values=(double *) malloc(BUFFERSIZE*sizeof(double));
-  
--   skewness_add( initid, args, is_null, is_error );
-  }
-  
-  
---- 139,144 ----
-diff -C3 -r mysql-udf-orig/udf_slope.cc udf_slope.cc
-*** mysql-udf-orig/udf_slope.cc	2004-07-16 00:28:02.000000000 +0200
---- udf_slope.cc	2005-10-05 14:53:30.000000000 +0200
-***************
-*** 49,54 ****
---- 49,55 ----
-  my_bool slope_init( UDF_INIT* initid, UDF_ARGS* args, char* message );
-  void slope_deinit( UDF_INIT* initid );
-  void slope_reset( UDF_INIT* initid, UDF_ARGS* args, char* is_null, char *error );
-+ void slope_clear( UDF_INIT* initid, char* is_null, char *error );
-  void slope_add( UDF_INIT* initid, UDF_ARGS* args, char* is_null, char *error );
-  double slope( UDF_INIT* initid, UDF_ARGS* args, char* is_null, char *error );
-  
-***************
-*** 134,139 ****
---- 135,146 ----
-  
-  void slope_reset( UDF_INIT* initid, UDF_ARGS* args, char* is_null, char* is_error )
-  {
-+   slope_clear( initid, is_null, is_error );
-+   slope_add( initid, args, is_null, is_error );
-+ }
-+ 
-+ void slope_clear( UDF_INIT* initid, char* is_null, char* is_error )
-+ {
-    regression_data *buffer = (regression_data*)initid->ptr;
-    buffer->count = 0;
-    buffer->abscount=0;
-***************
-*** 156,162 ****
-    buffer->valuesx=(double *) malloc(BUFFERSIZE*sizeof(double));
-    buffer->valuesy=(double *) malloc(BUFFERSIZE*sizeof(double));
-  
--   slope_add( initid, args, is_null, is_error );
-  }
-  
-  
---- 163,168 ----
-diff -C3 -r mysql-udf-orig/udf_stdnorm_density.cc udf_stdnorm_density.cc
-*** mysql-udf-orig/udf_stdnorm_density.cc	2004-07-16 00:00:20.000000000 +0200
---- udf_stdnorm_density.cc	2005-06-01 11:43:29.000000000 +0200
-***************
-*** 34,39 ****
---- 34,40 ----
-  #include <mysql.h>
-  #include <m_ctype.h>
-  #include <m_string.h>		
-+ #include <math.h>
-  
-  #ifdef HAVE_DLOPEN
-  
-***************
-*** 42,48 ****
-  {
-  
-  my_bool stdnorm_density_init(UDF_INIT *, UDF_ARGS *args, char *message);
-! double stdnorm_density_(UDF_INIT *initid, UDF_ARGS *args, char *is_null,char *error);
-  
-  }
-  
---- 43,49 ----
-  {
-  
-  my_bool stdnorm_density_init(UDF_INIT *, UDF_ARGS *args, char *message);
-! double stdnorm_density(UDF_INIT *initid, UDF_ARGS *args, char *is_null,char *error);
-  
-  }
-  
-diff -C3 -r mysql-udf-orig/udf_weightedavg.cc udf_weightedavg.cc
-*** mysql-udf-orig/udf_weightedavg.cc	2004-07-29 21:15:43.000000000 +0200
---- udf_weightedavg.cc	2005-10-05 14:55:18.000000000 +0200
-***************
-*** 44,49 ****
---- 44,50 ----
-  my_bool weightedavg_init( UDF_INIT* initid, UDF_ARGS* args, char* message );
-  void weightedavg_deinit( UDF_INIT* initid );
-  void weightedavg_reset( UDF_INIT* initid, UDF_ARGS* args, char* is_null, char *error );
-+ void weightedavg_clear( UDF_INIT* initid, char* is_null, char *error );
-  void weightedavg_add( UDF_INIT* initid, UDF_ARGS* args, char* is_null, char *error );
-  double weightedavg( UDF_INIT* initid, UDF_ARGS* args, char* is_null, char *error );
-  }
-***************
-*** 111,116 ****
---- 112,124 ----
-  
-  void weightedavg_reset( UDF_INIT* initid, UDF_ARGS* args, char* is_null, char* is_error )
-  {
-+   weightedavg_clear( initid, is_null, is_error );
-+   weightedavg_add( initid, args, is_null, is_error );
-+ }
-+ 
-+ 
-+ void weightedavg_clear( UDF_INIT* initid, char* is_null, char* is_error )
-+ {
-    weightedavg_data *buffer = (weightedavg_data*)initid->ptr;
-    buffer->count = 0;
-    buffer->datasum = 0;
-***************
-*** 118,124 ****
-    *is_null = 0;
-    *is_error = 0;
-  
--   weightedavg_add( initid, args, is_null, is_error );
-  }
-  
-  
---- 126,131 ----
diff --git a/databases/mysql-udf/pkg-descr b/databases/mysql-udf/pkg-descr
deleted file mode 100644
index 9a7822748de6..000000000000
--- a/databases/mysql-udf/pkg-descr
+++ /dev/null
@@ -1,12 +0,0 @@
-This package adds several user-defined statistics functions
-to the MySQL server providing the ability to:
-
-    * calculate the median of any values,
-    * calculate the skewness and kurtosis of a distribution of value
-    * retrieve the effective length of the longest value in a STRING column,
-    * get the longest value from a STRING column,
-    * calculate the faculty of a value,
-    * calculate linear regression parameters (intercept, slope, correlation
-      coefficent) of any values
-
-WWW: http://mysql-udf.sourceforge.net/
diff --git a/databases/mysql-udf/pkg-message b/databases/mysql-udf/pkg-message
deleted file mode 100644
index 157d9ddb2bc8..000000000000
--- a/databases/mysql-udf/pkg-message
+++ /dev/null
@@ -1,31 +0,0 @@
-[
-{ type: install
-  message: <<EOM
-To add the custom functions to your MySQL server use the following syntax:
-(you may install only the functions you need):
-
-CREATE AGGREGATE FUNCTION median RETURNS REAL SONAME 'udf_median.so';
-CREATE AGGREGATE FUNCTION correlation RETURNS REAL SONAME 'udf_correlation.so';
-CREATE AGGREGATE FUNCTION intercept RETURNS REAL SONAME 'udf_intercept.so';
-CREATE AGGREGATE FUNCTION slope RETURNS REAL SONAME 'udf_slope.so';
-CREATE AGGREGATE FUNCTION skewness RETURNS REAL SONAME 'udf_skewness.so';
-CREATE AGGREGATE FUNCTION kurtosis RETURNS REAL SONAME 'udf_kurtosis.so';
-CREATE FUNCTION confidence_higher RETURNS REAL SONAME 'udf_confidence_higher.so';
-CREATE FUNCTION confidence_lower RETURNS REAL SONAME 'udf_confidence_lower.so';
-CREATE FUNCTION stdnorm_density RETURNS REAL SONAME 'udf_stdnorm_density.so';
-CREATE FUNCTION stdnorm_dist RETURNS REAL SONAME 'udf_stdnorm_dist.so';
-CREATE AGGREGATE FUNCTION geomean RETURNS REAL SONAME 'udf_geomean.so';
-CREATE AGGREGATE FUNCTION weightedavg RETURNS REAL SONAME 'udf_weightedavg.so';
-CREATE FUNCTION noverm RETURNS INTEGER SONAME 'udf_noverm.so';
-CREATE FUNCTION faculty RETURNS REAL SONAME 'udf_faculty.so';
-CREATE AGGREGATE FUNCTION COLWIDTH RETURNS INTEGER SONAME 'udf_colwidth.so';
-CREATE AGGREGATE FUNCTION LONGEST RETURNS STRING SONAME 'udf_longest.so';
-
-Example for deinstalling a function:
-DROP FUNCTION median;
-
-For function descriptions, see the following webpage:
-http://mysql-udf.sourceforge.net/
-EOM
-}
-]
diff --git a/databases/mysql2pgsql/Makefile b/databases/mysql2pgsql/Makefile
index 338eec353b14..1c3555178ab7 100644
--- a/databases/mysql2pgsql/Makefile
+++ b/databases/mysql2pgsql/Makefile
@@ -1,5 +1,3 @@
-# Created by: Pete Fritchman <petef@databits.net>
-
 PORTNAME=	mysql2pgsql
 PORTVERSION=	1.2
 PORTEPOCH=	1
@@ -10,6 +8,7 @@ EXTRACT_SUFX=	.perl
 
 MAINTAINER=	klossalex@gmail.com
 COMMENT=	Convert a MySQL dump to a PostgreSQL dump
+WWW=		http://pgfoundry.org/projects/mysql2pgsql/
 
 USES=		perl5 shebangfix
 NO_BUILD=	yes
diff --git a/databases/mysql2pgsql/pkg-descr b/databases/mysql2pgsql/pkg-descr
index 423080993f21..7668637709b8 100644
--- a/databases/mysql2pgsql/pkg-descr
+++ b/databases/mysql2pgsql/pkg-descr
@@ -3,5 +3,3 @@ dumps to a PostgreSQL-compatible format (so the data can be imported
 into PostgreSQL).  This can be useful if you are switching from MySQL
 to PostgreSQL and you have quite a bit of data in your MySQL
 databases.
-
-WWW: http://pgfoundry.org/projects/mysql2pgsql/
diff --git a/databases/mysql55-client/Makefile b/databases/mysql55-client/Makefile
deleted file mode 100644
index d4e16fe50ae1..000000000000
--- a/databases/mysql55-client/Makefile
+++ /dev/null
@@ -1,28 +0,0 @@
-# Created by: Alex Dupre <ale@FreeBSD.org>
-
-PORTNAME=	mysql
-PKGNAMESUFFIX=	55-client
-
-COMMENT=	Multithreaded SQL database (client)
-
-MASTERDIR=	${.CURDIR}/../mysql55-server
-
-PKGMESSAGE=	${.CURDIR}/pkg-message
-PATCHDIR=	${.CURDIR}/files
-PLIST=		${.CURDIR}/pkg-plist
-
-CONFLICTS_INSTALL=	mysql5[0-46-9]-client-* \
-			mariadb*-client-* \
-			percona*-client-*
-
-CMAKE_ARGS+=	-DWITHOUT_SERVER=1
-
-USE_LDCONFIG=	${PREFIX}/lib/mysql
-
-MMAN1=		comp_err.1 msql2mysql.1 mysql.1 mysql_config.1 mysql_find_rows.1 \
-		mysql_waitpid.1 mysqlaccess.1 mysqladmin.1 mysqlbinlog.1 \
-		mysqlcheck.1 mysqldump.1 mysqlimport.1 mysqlshow.1 mysqlslap.1
-
-CLIENT_ONLY=	yes
-
-.include "${MASTERDIR}/Makefile"
diff --git a/databases/mysql55-client/files/patch-CMakeLists.txt b/databases/mysql55-client/files/patch-CMakeLists.txt
deleted file mode 100644
index 3b289cf4f0a6..000000000000
--- a/databases/mysql55-client/files/patch-CMakeLists.txt
+++ /dev/null
@@ -1,72 +0,0 @@
---- CMakeLists.txt.orig	2015-06-25 13:44:36.000000000 +0000
-+++ CMakeLists.txt	2015-09-19 07:48:14.145882685 +0000
-@@ -390,33 +390,11 @@
- ENDIF()
- 
- ADD_SUBDIRECTORY(extra)
--IF(NOT WITHOUT_SERVER)
--  ADD_SUBDIRECTORY(tests)
--  ADD_SUBDIRECTORY(client)
--  ADD_SUBDIRECTORY(sql)
--  ADD_SUBDIRECTORY(sql/share)
--  ADD_SUBDIRECTORY(libservices)
--  OPTION (WITH_EMBEDDED_SERVER "Compile MySQL with embedded server" OFF)
--  IF(WITH_EMBEDDED_SERVER) 
--   ADD_SUBDIRECTORY(libmysqld)
--   ADD_SUBDIRECTORY(libmysqld/examples)
--  ENDIF(WITH_EMBEDDED_SERVER)
--
--  ADD_SUBDIRECTORY(mysql-test)
--  ADD_SUBDIRECTORY(mysql-test/lib/My/SafeProcess)
--  ADD_SUBDIRECTORY(support-files)
--  ADD_SUBDIRECTORY(scripts)
--  ADD_SUBDIRECTORY(sql-bench)
--  IF(UNIX)
--    ADD_SUBDIRECTORY(man)
--  ENDIF()
--  IF(EXISTS ${CMAKE_SOURCE_DIR}/internal/CMakeLists.txt)
--    ADD_SUBDIRECTORY(internal)
--  ENDIF()
--  ADD_SUBDIRECTORY(packaging/rpm-oel)
--  ADD_SUBDIRECTORY(packaging/rpm-sles)
--  ADD_SUBDIRECTORY(packaging/rpm-docker)
--ENDIF()
-+ADD_SUBDIRECTORY(client)
-+ADD_SUBDIRECTORY(libservices)
-+ADD_SUBDIRECTORY(support-files)
-+ADD_SUBDIRECTORY(scripts)
-+ADD_SUBDIRECTORY(man)
- 
- INCLUDE(cmake/abi_check.cmake)
- INCLUDE(cmake/tags.cmake)
-@@ -453,19 +431,21 @@
- ELSE()
-   SET(CPACK_GENERATOR "TGZ")
- ENDIF() 
-+IF(FALSE)
- ADD_SUBDIRECTORY(packaging/WiX)
- ADD_SUBDIRECTORY(packaging/solaris)
-+ENDIF() 
- 
- # Create a single package with "make package"
- # (see http://public.kitware.com/Bug/view.php?id=11452)
- SET(CPACK_MONOLITHIC_INSTALL 1 CACHE INTERNAL "")
- 
- IF(UNIX)
--  INSTALL(FILES Docs/mysql.info DESTINATION ${INSTALL_INFODIR} OPTIONAL COMPONENT Info)
- ENDIF()
- #
- # RPM installs documentation directly from the source tree
- #
-+IF(FALSE)
- IF(NOT INSTALL_LAYOUT MATCHES "RPM")
-   INSTALL(FILES COPYING LICENSE.mysql 
-   DESTINATION ${INSTALL_DOCREADMEDIR} 
-@@ -491,6 +471,7 @@
-     PATTERN "sp-imp-spec.txt" EXCLUDE
-   )
- ENDIF()
-+ENDIF()
- 
- INCLUDE(CPack)
- 
diff --git a/databases/mysql55-client/files/patch-client_CMakeLists.txt b/databases/mysql55-client/files/patch-client_CMakeLists.txt
deleted file mode 100644
index 74f289fce78c..000000000000
--- a/databases/mysql55-client/files/patch-client_CMakeLists.txt
+++ /dev/null
@@ -1,47 +0,0 @@
---- client/CMakeLists.txt.orig	2014-11-04 07:49:50.000000000 +0000
-+++ client/CMakeLists.txt	2014-12-03 09:22:09.860599069 +0000
-@@ -33,6 +33,7 @@
-   TARGET_LINK_LIBRARIES(mysql ${READLINE_LIBRARY})
- ENDIF(UNIX)
- 
-+IF(FALSE)
- MYSQL_ADD_EXECUTABLE(mysqltest mysqltest.cc COMPONENT Test)
- SET_SOURCE_FILES_PROPERTIES(mysqltest.cc PROPERTIES COMPILE_FLAGS "-DTHREADS")
- # mysqltest has unused result errors, so we skip Werror
-@@ -42,6 +43,7 @@
-   ADD_COMPILE_FLAGS(mysqltest.cc COMPILE_FLAGS "-Wno-error")
- ENDIF()
- TARGET_LINK_LIBRARIES(mysqltest mysqlclient regex)
-+ENDIF()
- 
- 
- MYSQL_ADD_EXECUTABLE(mysqlcheck mysqlcheck.c)
-@@ -53,15 +55,19 @@
- MYSQL_ADD_EXECUTABLE(mysqlimport mysqlimport.c)
- TARGET_LINK_LIBRARIES(mysqlimport mysqlclient)
- 
-+IF(FALSE)
- MYSQL_ADD_EXECUTABLE(mysql_upgrade mysql_upgrade.c)
- TARGET_LINK_LIBRARIES(mysql_upgrade mysqlclient)
- ADD_DEPENDENCIES(mysql_upgrade GenFixPrivs)
-+ENDIF()
- 
- MYSQL_ADD_EXECUTABLE(mysqlshow mysqlshow.c)
- TARGET_LINK_LIBRARIES(mysqlshow mysqlclient)
- 
-+IF(FALSE)
- MYSQL_ADD_EXECUTABLE(mysql_plugin mysql_plugin.c)
- TARGET_LINK_LIBRARIES(mysql_plugin mysqlclient)
-+ENDIF()
- 
- MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc)
- TARGET_LINK_LIBRARIES(mysqlbinlog mysqlclient)
-@@ -78,7 +84,7 @@
-   MYSQL_ADD_EXECUTABLE(echo echo.c)
- ENDIF(WIN32)
- 
--SET_TARGET_PROPERTIES (mysqlcheck mysqldump mysqlimport mysql_upgrade mysqlshow mysqlslap mysql_plugin 
-+SET_TARGET_PROPERTIES (mysqlcheck mysqldump mysqlimport mysqlshow mysqlslap
- PROPERTIES HAS_CXX TRUE)
- 
- ADD_DEFINITIONS(-DHAVE_DLOPEN)
diff --git a/databases/mysql55-client/files/patch-extra_CMakeLists.txt b/databases/mysql55-client/files/patch-extra_CMakeLists.txt
deleted file mode 100644
index 78a301146b95..000000000000
--- a/databases/mysql55-client/files/patch-extra_CMakeLists.txt
+++ /dev/null
@@ -1,25 +0,0 @@
---- extra/CMakeLists.txt.orig	2010-12-03 18:58:24.000000000 +0100
-+++ extra/CMakeLists.txt	2010-12-23 14:45:36.000000000 +0100
-@@ -50,6 +50,7 @@
-                   ${PROJECT_BINARY_DIR}/sql/share/english/errmsg.sys 
-                   ${PROJECT_SOURCE_DIR}/sql/share/errmsg-utf8.txt)
- 
-+IF(FALSE)
- MYSQL_ADD_EXECUTABLE(my_print_defaults my_print_defaults.c)
- TARGET_LINK_LIBRARIES(my_print_defaults  mysys)
- 
-@@ -69,11 +70,14 @@
- 
- MYSQL_ADD_EXECUTABLE(replace replace.c)
- TARGET_LINK_LIBRARIES(replace mysys)
-+ENDIF()
- IF(UNIX)
-+IF(FALSE)
-   MYSQL_ADD_EXECUTABLE(innochecksum innochecksum.c)
- 
-   MYSQL_ADD_EXECUTABLE(resolve_stack_dump resolve_stack_dump.c)
-   TARGET_LINK_LIBRARIES(resolve_stack_dump mysys)
-+ENDIF()
- 
-   MYSQL_ADD_EXECUTABLE(mysql_waitpid mysql_waitpid.c)
-   TARGET_LINK_LIBRARIES(mysql_waitpid mysys)
diff --git a/databases/mysql55-client/files/patch-include_CMakeLists.txt b/databases/mysql55-client/files/patch-include_CMakeLists.txt
deleted file mode 100644
index 02ae2db9f708..000000000000
--- a/databases/mysql55-client/files/patch-include_CMakeLists.txt
+++ /dev/null
@@ -1,12 +0,0 @@
---- include/CMakeLists.txt.orig	2011-01-19 23:37:08.000000000 +0100
-+++ include/CMakeLists.txt	2011-02-07 22:42:05.129894470 +0100
-@@ -27,9 +27,6 @@
-   my_list.h
-   my_alloc.h
-   typelib.h 
--  mysql/plugin.h
--  mysql/plugin_audit.h
--  mysql/plugin_ftparser.h
- )
- 
- SET(HEADERS 
diff --git a/databases/mysql55-client/files/patch-include_my_compare.h b/databases/mysql55-client/files/patch-include_my_compare.h
deleted file mode 100644
index 093c8ae37789..000000000000
--- a/databases/mysql55-client/files/patch-include_my_compare.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- include/my_compare.h.orig	2011-05-10 09:46:46.000000000 +0200
-+++ include/my_compare.h	2011-05-10 09:47:01.000000000 +0200
-@@ -39,7 +39,7 @@
-   But beware the dependency of MI_MAX_POSSIBLE_KEY_BUFF and HA_MAX_KEY_LENGTH.
- */
- 
--#define HA_MAX_KEY_LENGTH           1000        /* Max length in bytes */
-+#define HA_MAX_KEY_LENGTH           4000        /* Max length in bytes */
- #define HA_MAX_KEY_SEG              16          /* Max segments for key */
- 
- #define HA_MAX_POSSIBLE_KEY_BUFF    (HA_MAX_KEY_LENGTH + 24+ 6+6)
diff --git a/databases/mysql55-client/files/patch-include_myisam.h b/databases/mysql55-client/files/patch-include_myisam.h
deleted file mode 100644
index 450645400dd5..000000000000
--- a/databases/mysql55-client/files/patch-include_myisam.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- include/myisam.h.orig	2009-02-16 23:04:54.000000000 +0100
-+++ include/myisam.h	2009-02-16 23:10:08.000000000 +0100
-@@ -48,7 +48,7 @@
-   The following defines can be increased if necessary.
-   But beware the dependency of MI_MAX_POSSIBLE_KEY_BUFF and MI_MAX_KEY_LENGTH.
- */
--#define MI_MAX_KEY_LENGTH           1000            /* Max length in bytes */
-+#define MI_MAX_KEY_LENGTH           4000            /* Max length in bytes */
- #define MI_MAX_KEY_SEG              16              /* Max segments for key */
- 
- #define MI_MAX_KEY_BUFF  (MI_MAX_KEY_LENGTH+MI_MAX_KEY_SEG*6+8+8)
diff --git a/databases/mysql55-client/files/patch-man_CMakeLists.txt b/databases/mysql55-client/files/patch-man_CMakeLists.txt
deleted file mode 100644
index 0f79f3e2403d..000000000000
--- a/databases/mysql55-client/files/patch-man_CMakeLists.txt
+++ /dev/null
@@ -1,13 +0,0 @@
---- man/CMakeLists.txt.orig	2011-10-22 14:08:32.000000000 +0200
-+++ man/CMakeLists.txt	2011-10-22 14:22:42.000000000 +0200
-@@ -15,10 +15,6 @@
- 
- # Copy man pages
- FILE(GLOB MAN1_FILES *.1)
--FILE(GLOB MAN1_EXCLUDE make_win_bin_dist.1)
--FILE(GLOB MAN1_NDB ndb*.1)
--FILE(GLOB MAN8_FILES *.8)
--FILE(GLOB MAN8_NDB ndb*.8)
- IF(MAN1_FILES)
-   IF(MAN1_EXCLUDE)
-     LIST(REMOVE_ITEM MAN1_FILES ${MAN1_EXCLUDE})
diff --git a/databases/mysql55-client/files/patch-mysys_default.c b/databases/mysql55-client/files/patch-mysys_default.c
deleted file mode 100644
index 816105371bdf..000000000000
--- a/databases/mysql55-client/files/patch-mysys_default.c
+++ /dev/null
@@ -1,31 +0,0 @@
---- mysys/default.c.orig	2010-11-02 23:01:13.000000000 +0100
-+++ mysys/default.c	2010-11-10 16:39:51.000000000 +0100
-@@ -70,7 +70,7 @@
- 
- /* Which directories are searched for options (and in which order) */
- 
--#define MAX_DEFAULT_DIRS 6
-+#define MAX_DEFAULT_DIRS 7
- #define DEFAULT_DIRS_SIZE (MAX_DEFAULT_DIRS + 1)  /* Terminate with NULL */
- static const char **default_directories = NULL;
- 
-@@ -711,7 +711,7 @@
-   {
-     MY_STAT stat_info;
-     if (!my_stat(name,&stat_info,MYF(0)))
--      return 1;
-+      return 0;
-     /*
-       Ignore world-writable regular files.
-       This is mainly done to protect us to not read a file created by
-@@ -1153,7 +1153,10 @@
- 
- #if defined(DEFAULT_SYSCONFDIR)
-   if (DEFAULT_SYSCONFDIR[0])
-+  {
-     errors += add_directory(alloc, DEFAULT_SYSCONFDIR, dirs);
-+    errors += add_directory(alloc, DEFAULT_SYSCONFDIR "/mysql", dirs);
-+  }
- #endif /* DEFAULT_SYSCONFDIR */
- 
- #endif
diff --git a/databases/mysql55-client/files/patch-scripts_CMakeLists.txt b/databases/mysql55-client/files/patch-scripts_CMakeLists.txt
deleted file mode 100644
index 4dd4080c4f5f..000000000000
--- a/databases/mysql55-client/files/patch-scripts_CMakeLists.txt
+++ /dev/null
@@ -1,78 +0,0 @@
---- scripts/CMakeLists.txt.orig	2010-12-03 18:58:26.000000000 +0100
-+++ scripts/CMakeLists.txt	2011-01-11 20:18:07.000000000 +0100
-@@ -71,6 +71,7 @@
- )
- ENDIF()
- 
-+IF(FALSE)
- INSTALL(FILES 
-   ${CMAKE_CURRENT_SOURCE_DIR}/mysql_system_tables.sql 
-   ${CMAKE_CURRENT_SOURCE_DIR}/mysql_system_tables_data.sql
-@@ -79,6 +80,7 @@
-   ${FIX_PRIVILEGES_SQL}
-   DESTINATION ${INSTALL_MYSQLSHAREDIR} COMPONENT Server
- )
-+ENDIF()
- 
- # TCMalloc hacks
- IF(MALLOC_LIB)
-@@ -138,6 +140,7 @@
- SET(HOSTNAME "hostname")
- SET(MYSQLD_USER "mysql")
- 
-+IF(FALSE)
- # Required for mysqlbug until autotools are deprecated, once done remove these
- # and expand default cmake variables
- SET(CC ${CMAKE_C_COMPILER})
-@@ -174,6 +177,7 @@
-   DESTINATION ${INSTALL_BINDIR}
-   COMPONENT Server
-   )
-+ENDIF()
- 
- ENDIF(UNIX)
- 
-@@ -198,6 +202,7 @@
-   SET(localstatedir ${MYSQL_DATADIR})
- ENDIF()
- 
-+IF()
- IF(UNIX)
- CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/mysql_install_db.sh
-   ${CMAKE_CURRENT_BINARY_DIR}/mysql_install_db ESCAPE_QUOTES @ONLY)
-@@ -215,6 +220,7 @@
-   DESTINATION ${DEST}
-   COMPONENT Server
-   )
-+ENDIF()
- 
- 
- SET(prefix "${CMAKE_INSTALL_PREFIX}")
-@@ -266,6 +272,8 @@
-           GET_FILENAME_COMPONENT(lib "${lib}" NAME_WE)
-           STRING(REGEX REPLACE "^lib" "" lib "${lib}")
-           SET(${var} "${${var}}-l${lib} " ) 
-+        ELSEIF(lib STREQUAL "-pthread")
-+          SET(${var} "${${var}}-pthread " ) 
-         ELSE()
-           SET(${var} "${${var}}-l${lib} " ) 
-         ENDIF()
-@@ -318,18 +326,9 @@
-   SET(BIN_SCRIPTS
-     msql2mysql
-     mysql_config
--    mysql_fix_extensions
--    mysql_setpermission
--    mysql_secure_installation
--    mysql_zap
-     mysqlaccess
-     mysqlaccess.conf
--    mysql_convert_table_format
-     mysql_find_rows
--    mysqlhotcopy
--    mysqldumpslow
--    mysqld_multi
--    mysqld_safe
-   )
-   FOREACH(file ${BIN_SCRIPTS})
-     IF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh)
diff --git a/databases/mysql55-client/files/patch-sql_common_client_plugin.c b/databases/mysql55-client/files/patch-sql_common_client_plugin.c
deleted file mode 100644
index 069eaef76e11..000000000000
--- a/databases/mysql55-client/files/patch-sql_common_client_plugin.c
+++ /dev/null
@@ -1,47 +0,0 @@
---- sql-common/client_plugin.c.orig	2014-09-22 09:23:23 UTC
-+++ sql-common/client_plugin.c
-@@ -233,11 +233,13 @@
- {
-   MYSQL mysql;
-   struct st_mysql_client_plugin **builtin;
-+  va_list unused;
- 
-   if (initialized)
-     return 0;
- 
-   bzero(&mysql, sizeof(mysql)); /* dummy mysql for set_mysql_extended_error */
-+  bzero(&unused, sizeof(unused)); /* suppress uninitialized-value warnings */
- 
-   pthread_mutex_init(&LOCK_load_client_plugin, MY_MUTEX_INIT_SLOW);
-   init_alloc_root(&mem_root, 128, 128);
-@@ -249,7 +251,7 @@
-   pthread_mutex_lock(&LOCK_load_client_plugin);
- 
-   for (builtin= mysql_client_builtins; *builtin; builtin++)
--    add_plugin(&mysql, *builtin, 0, 0, 0);
-+    add_plugin(&mysql, *builtin, 0, 0, unused);
- 
-   pthread_mutex_unlock(&LOCK_load_client_plugin);
- 
-@@ -293,9 +295,12 @@
- mysql_client_register_plugin(MYSQL *mysql,
-                              struct st_mysql_client_plugin *plugin)
- {
-+  va_list unused;
-   if (is_not_initialized(mysql, plugin->name))
-     return NULL;
- 
-+  bzero(&unused, sizeof(unused)); /* suppress uninitialized-value warnings */
-+
-   pthread_mutex_lock(&LOCK_load_client_plugin);
- 
-   /* make sure the plugin wasn't loaded meanwhile */
-@@ -307,7 +312,7 @@
-     plugin= NULL;
-   }
-   else
--    plugin= add_plugin(mysql, plugin, 0, 0, 0);
-+    plugin= add_plugin(mysql, plugin, 0, 0, unused);
- 
-   pthread_mutex_unlock(&LOCK_load_client_plugin);
-   return plugin;
diff --git a/databases/mysql55-client/files/patch-support-files_CMakeLists.txt b/databases/mysql55-client/files/patch-support-files_CMakeLists.txt
deleted file mode 100644
index e9d1405d119f..000000000000
--- a/databases/mysql55-client/files/patch-support-files_CMakeLists.txt
+++ /dev/null
@@ -1,41 +0,0 @@
---- support-files/CMakeLists.txt.orig	2017-03-18 05:41:10.000000000 +0100
-+++ support-files/CMakeLists.txt	2017-04-12 19:03:14.636331000 +0200
-@@ -40,12 +40,14 @@
-   SET(inst_location ${INSTALL_SUPPORTFILESDIR})
- ENDIF()
- 
-+IF(FALSE)
- FOREACH(inifile my-huge my-innodb-heavy-4G my-large my-medium my-small)
-   CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${inifile}.cnf.sh 
-                  ${CMAKE_CURRENT_BINARY_DIR}/${inifile}.${ini_file_extension} @ONLY)
-   INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${inifile}.${ini_file_extension}
-           DESTINATION ${inst_location} COMPONENT IniFiles)
- ENDFOREACH()
-+ENDIF()
- 
- IF(UNIX)
-   IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
-@@ -54,6 +56,7 @@
-     SET (PIDOF "pgrep -d' ' -f")
-   ENDIF()
-   SET(prefix ${CMAKE_INSTALL_PREFIX})
-+IF(FALSE)
-   FOREACH(script  mysqld_multi.server mysql-log-rotate binary-configure
-     config.medium.ini config.small.ini config.huge.ini ndb-config-2-node.ini)
-     CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${script}.sh 
-@@ -73,8 +76,10 @@
-   IF(INSTALL_SUPPORTFILESDIR)
-     INSTALL(FILES magic DESTINATION ${inst_location} COMPONENT SupportFiles)
-   ENDIF()
-+ENDIF()
- 
-   INSTALL(FILES mysql.m4 DESTINATION ${INSTALL_SHAREDIR}/aclocal COMPONENT Development)
-+IF(FALSE)
-   CONFIGURE_FILE(MySQL-shared-compat.spec.sh ${CMAKE_CURRENT_BINARY_DIR}/MySQL-shared-compat.spec @ONLY)
-   CONFIGURE_FILE(mysql.spec.sh ${CMAKE_CURRENT_BINARY_DIR}/mysql.spec @ONLY)
-   
-@@ -99,3 +104,4 @@
-     PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ 
-     GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
- ENDIF()
-+ENDIF()
diff --git a/databases/mysql55-client/pkg-message b/databases/mysql55-client/pkg-message
deleted file mode 100644
index 0d8d7d73c6c0..000000000000
--- a/databases/mysql55-client/pkg-message
+++ /dev/null
@@ -1,17 +0,0 @@
-[
-{ type: install
-  message: <<EOM
-Please be aware the database client is vulnerable
-to CVE-2015-3152 - SSL Downgrade aka "BACKRONYM".
-You may find more information at the following URL:
-
-http://www.vuxml.org/freebsd/36bd352d-299b-11e5-86ff-14dae9d210b8.html
-
-Although this database client is not listed as
-"affected", it is vulnerable and will not be
-receiving a patch. Please take note of this when
-deploying this software.
-
-EOM
-}
-]
diff --git a/databases/mysql55-client/pkg-plist b/databases/mysql55-client/pkg-plist
deleted file mode 100644
index d650fcb03a2d..000000000000
--- a/databases/mysql55-client/pkg-plist
+++ /dev/null
@@ -1,85 +0,0 @@
-bin/msql2mysql
-bin/mysql
-bin/mysql_config
-bin/mysql_find_rows
-bin/mysql_waitpid
-bin/mysqlaccess
-bin/mysqlaccess.conf
-bin/mysqladmin
-bin/mysqlbinlog
-bin/mysqlcheck
-bin/mysqldump
-bin/mysqlimport
-bin/mysqlshow
-bin/mysqlslap
-include/mysql/decimal.h
-include/mysql/errmsg.h
-include/mysql/keycache.h
-include/mysql/m_ctype.h
-include/mysql/m_string.h
-include/mysql/my_alloc.h
-include/mysql/my_attribute.h
-include/mysql/my_compiler.h
-include/mysql/my_config.h
-include/mysql/my_dbug.h
-include/mysql/my_dir.h
-include/mysql/my_getopt.h
-include/mysql/my_global.h
-include/mysql/my_list.h
-include/mysql/my_net.h
-include/mysql/my_pthread.h
-include/mysql/my_sys.h
-include/mysql/my_xml.h
-include/mysql/mysql/client_plugin.h
-include/mysql/mysql/innodb_priv.h
-include/mysql/mysql/plugin.h
-include/mysql/mysql/plugin_audit.h
-include/mysql/mysql/plugin_auth.h
-include/mysql/mysql/plugin_auth_common.h
-include/mysql/mysql/plugin_ftparser.h
-include/mysql/mysql/psi/mysql_file.h
-include/mysql/mysql/psi/mysql_thread.h
-include/mysql/mysql/psi/psi.h
-include/mysql/mysql/psi/psi_abi_v1.h
-include/mysql/mysql/psi/psi_abi_v2.h
-include/mysql/mysql/service_my_snprintf.h
-include/mysql/mysql/service_thd_alloc.h
-include/mysql/mysql/service_thd_wait.h
-include/mysql/mysql/service_thread_scheduler.h
-include/mysql/mysql/services.h
-include/mysql/mysql/thread_pool_priv.h
-include/mysql/mysql.h
-include/mysql/mysql_com.h
-include/mysql/mysql_embed.h
-include/mysql/mysql_time.h
-include/mysql/mysql_version.h
-include/mysql/mysqld_ername.h
-include/mysql/mysqld_error.h
-include/mysql/sql_common.h
-include/mysql/sql_state.h
-include/mysql/sslopt-case.h
-include/mysql/sslopt-longopts.h
-include/mysql/sslopt-vars.h
-include/mysql/typelib.h
-lib/mysql/libmysqlclient.a
-lib/mysql/libmysqlclient.so
-lib/mysql/libmysqlclient.so.18
-lib/mysql/libmysqlclient_r.a
-lib/mysql/libmysqlclient_r.so
-lib/mysql/libmysqlclient_r.so.18
-lib/mysql/libmysqlservices.a
-man/man1/comp_err.1.gz
-man/man1/msql2mysql.1.gz
-man/man1/mysql.1.gz
-man/man1/mysql_config.1.gz
-man/man1/mysql_find_rows.1.gz
-man/man1/mysql_waitpid.1.gz
-man/man1/mysqlaccess.1.gz
-man/man1/mysqladmin.1.gz
-man/man1/mysqlbinlog.1.gz
-man/man1/mysqlcheck.1.gz
-man/man1/mysqldump.1.gz
-man/man1/mysqlimport.1.gz
-man/man1/mysqlshow.1.gz
-man/man1/mysqlslap.1.gz
-share/aclocal/mysql.m4
diff --git a/databases/mysql55-server/Makefile b/databases/mysql55-server/Makefile
deleted file mode 100644
index 80ec9d48c6f8..000000000000
--- a/databases/mysql55-server/Makefile
+++ /dev/null
@@ -1,112 +0,0 @@
-# Created by: Alex Dupre <ale@FreeBSD.org>
-
-PORTNAME?=	mysql
-PORTVERSION=	5.5.62
-PORTREVISION?=	3
-CATEGORIES=	databases
-MASTER_SITES=	MYSQL/MySQL-5.5
-PKGNAMESUFFIX?=	55-server
-
-MAINTAINER=	ale@FreeBSD.org
-COMMENT?=	Multithreaded SQL database (server)
-
-LICENSE=	GPLv2
-
-SLAVEDIRS=	databases/mysql55-client
-USES=		cmake:insource,noninja cpe readline shebangfix
-CXXFLAGS+=	${CPPFLAGS}
-NO_OPTIONS_SORT=yes
-
-CPE_VENDOR=	oracle
-
-OPTIONS_DEFINE=	SSL FASTMTX
-OPTIONS_DEFAULT=SSL
-
-FASTMTX_DESC=	Replace mutexes with spinlocks
-
-CMAKE_ARGS+=	-DINSTALL_DOCDIR="share/doc/mysql" \
-		-DINSTALL_DOCREADMEDIR="share/doc/mysql" \
-		-DINSTALL_INCLUDEDIR="include/mysql" \
-		-DINSTALL_INFODIR="info" \
-		-DINSTALL_LIBDIR="lib/mysql" \
-		-DINSTALL_MANDIR="man" \
-		-DINSTALL_MYSQLDATADIR="/var/db/mysql" \
-		-DINSTALL_MYSQLSHAREDIR="share/mysql" \
-		-DINSTALL_MYSQLTESTDIR="share/mysql/tests" \
-		-DINSTALL_PLUGINDIR="lib/mysql/plugin" \
-		-DINSTALL_SBINDIR="libexec" \
-		-DINSTALL_SCRIPTDIR="bin" \
-		-DINSTALL_SHAREDIR="share" \
-		-DINSTALL_SQLBENCHDIR="share/mysql" \
-		-DINSTALL_SUPPORTFILESDIR="share/mysql" \
-		-DWITH_UNIT_TESTS=0 \
-		-DWITH_LIBEDIT=0 \
-		-DWITH_LIBWRAP=1
-
-SHEBANG_FILES=	scripts/*.pl* scripts/*.sh
-
-.ifdef USE_MYSQL
-.error You have `USE_MYSQL' variable defined either in environment or in make(1) arguments. Please undefine and try again.
-.endif
-
-.include <bsd.port.options.mk>
-
-.if defined(PPC_ABI) && ${PPC_ABI} == ELFv2
-USES+=          compiler:gcc-c++11-lib
-USE_CXXSTD=     gnu++11
-.else
-USES+=          compiler:c++11-lang
-USE_CXXSTD=     gnu++98
-.endif
-
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1200057
-SUB_LIST+=	LEGACY_LIMITS="@comment " MODERN_LIMITS=""
-.else
-SUB_LIST+=	LEGACY_LIMITS="" MODERN_LIMITS="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MSSL}
-CMAKE_ARGS+=	-DWITH_SSL=bundled
-.endif
-.if ${PORT_OPTIONS:MFASTMTX}
-CMAKE_ARGS+=	-DWITH_FAST_MUTEXES=1
-.endif
-
-# MySQL-Server part
-.if !defined(CLIENT_ONLY)
-USES+=		mysql:55
-
-CONFLICTS_INSTALL=	mysql5[0-46-9]-server-* \
-			mysqlwsrep* \
-			mariadb*-server-* \
-			percona*-server-*
-
-USE_RC_SUBR=	mysql-server
-
-USERS=		mysql
-GROUPS=		mysql
-
-MMAN1=		my_print_defaults.1 myisam_ftdump.1 myisamchk.1 myisamlog.1 myisampack.1 \
-		mysql.server.1 mysql_convert_table_format.1 mysql_fix_extensions.1 \
-		mysql_install_db.1 mysql_plugin.1 mysql_secure_installation.1 mysql_setpermission.1 \
-		mysql_tzinfo_to_sql.1 mysql_upgrade.1 mysql_zap.1 mysqlbug.1 \
-		mysqld_multi.1 mysqld_safe.1 mysqldumpslow.1 mysqlhotcopy.1 mysqlman.1 \
-		perror.1 replace.1 resolve_stack_dump.1 resolveip.1
-
-CMAKE_ARGS+=	-DWITH_EMBEDDED_SERVER="ON"
-.endif
-
-post-patch:
-	@${REINPLACE_CMD} 's/*.1/${MMAN1}/' ${WRKSRC}/man/CMakeLists.txt
-
-post-install:
-	# Empty directory, but check-plist complains
-	@${RMDIR} ${STAGEDIR}${PREFIX}/info || ${TRUE}
-	
-.include <bsd.port.pre.mk>
-
-.if ${ARCH} == armv6 || ${ARCH} == armv7
-EXTRA_PATCHES+=		${FILESDIR}/extra-patch-config.h.cmake
-.endif
-
-.include <bsd.port.post.mk>
diff --git a/databases/mysql55-server/distinfo b/databases/mysql55-server/distinfo
deleted file mode 100644
index 052db61350b5..000000000000
--- a/databases/mysql55-server/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1540551076
-SHA256 (mysql-5.5.62.tar.gz) = b1e7853bc1f04aabf6771e0ad947f35ac8d237f4b35d0706d1095c9526ff99d7
-SIZE (mysql-5.5.62.tar.gz) = 21111902
diff --git a/databases/mysql55-server/files/extra-patch-config.h.cmake b/databases/mysql55-server/files/extra-patch-config.h.cmake
deleted file mode 100644
index 3ac1add1b9ce..000000000000
--- a/databases/mysql55-server/files/extra-patch-config.h.cmake
+++ /dev/null
@@ -1,12 +0,0 @@
---- config.h.cmake.orig	2014-12-05 16:24:02 UTC
-+++ config.h.cmake
-@@ -151,7 +151,8 @@
- #cmakedefine HAVE_FESETROUND 1
- #cmakedefine HAVE_FINITE 1
- #cmakedefine HAVE_FP_EXCEPT 1
--#cmakedefine HAVE_FPSETMASK 1
-+#cmakedefine HAVE_FPSETMASK 0
-+#cmakedefine HAVE_FEDISABLEEXCEPT 1
- #cmakedefine HAVE_FSEEKO 1
- #cmakedefine HAVE_FSYNC 1
- #cmakedefine HAVE_FTIME 1
diff --git a/databases/mysql55-server/files/mysql-server.in b/databases/mysql55-server/files/mysql-server.in
deleted file mode 100644
index 6e9ca18040a6..000000000000
--- a/databases/mysql55-server/files/mysql-server.in
+++ /dev/null
@@ -1,77 +0,0 @@
-#!/bin/sh
-
-# PROVIDE: mysql
-# REQUIRE: LOGIN
-# KEYWORD: shutdown
-
-#
-# Add the following line to /etc/rc.conf to enable mysql:
-# mysql_enable (bool):	Set to "NO" by default.
-#			Set it to "YES" to enable MySQL.
-%%LEGACY_LIMITS%%# mysql_limits (bool):	Set to "NO" by default.
-%%LEGACY_LIMITS%%#			Set it to yes to run `limits -e -U mysql`
-%%LEGACY_LIMITS%%#			just before mysql starts.
-# mysql_dbdir (str):	Default to "/var/db/mysql"
-#			Base database directory.
-# mysql_optfile (str):	Server-specific option file.
-#			Default to "${mysql_dbdir}/my.cnf".
-# mysql_pidfile (str):	Custum PID file path and name.
-#			Default to "${mysql_dbdir}/${hostname}.pid".
-# mysql_args (str):	Custom additional arguments to be passed
-#			to mysqld_safe (default empty).
-#
-
-. /etc/rc.subr
-
-name="mysql"
-rcvar=mysql_enable
-
-load_rc_config $name
-
-: ${mysql_enable="NO"}
-%%LEGACY_LIMITS%%: ${mysql_limits="NO"}
-: ${mysql_dbdir="/var/db/mysql"}
-: ${mysql_optfile="${mysql_dbdir}/my.cnf"}
-
-mysql_user="mysql"
-%%LEGACY_LIMITS%%mysql_limits_args="-e -U ${mysql_user}"
-: ${hostname:=`/bin/hostname`}
-pidfile=${mysql_pidfile:-"${mysql_dbdir}/${hostname}.pid"}
-command="/usr/sbin/daemon"
-command_args="-c -f %%PREFIX%%/bin/mysqld_safe --defaults-extra-file=${mysql_optfile} --user=${mysql_user} --datadir=${mysql_dbdir} --pid-file=${pidfile} ${mysql_args}"
-procname="%%PREFIX%%/libexec/mysqld"
-start_precmd="${name}_prestart"
-start_postcmd="${name}_poststart"
-mysql_install_db="%%PREFIX%%/bin/mysql_install_db"
-mysql_install_db_args="--basedir=%%PREFIX%% --defaults-extra-file=${mysql_optfile} --datadir=${mysql_dbdir} --force"
-
-mysql_create_auth_tables()
-{
-	eval $mysql_install_db $mysql_install_db_args >/dev/null 2>/dev/null
-        [ $? -eq 0 ] && chown -R ${mysql_user}:${mysql_user} ${mysql_dbdir}
-}
-
-mysql_prestart()
-{
-	if [ ! -d "${mysql_dbdir}/mysql/." ]; then
-		mysql_create_auth_tables || return 1
-	fi
-%%LEGACY_LIMITS%%	if checkyesno mysql_limits; then
-%%LEGACY_LIMITS%%		eval `/usr/bin/limits ${mysql_limits_args}` 2>/dev/null
-%%LEGACY_LIMITS%%	else
-%%LEGACY_LIMITS%%		return 0
-%%LEGACY_LIMITS%%	fi
-%%MODERN_LIMITS%%	return 0
-}
-
-mysql_poststart()
-{
-	local timeout=15
-	while [ ! -f "${pidfile}" -a ${timeout} -gt 0 ]; do
-		timeout=$(( timeout - 1 ))
-		sleep 1
-	done
-	return 0
-}
-
-run_rc_command "$1"
diff --git a/databases/mysql55-server/files/patch-CMakeLists.txt b/databases/mysql55-server/files/patch-CMakeLists.txt
deleted file mode 100644
index 59e1a4126599..000000000000
--- a/databases/mysql55-server/files/patch-CMakeLists.txt
+++ /dev/null
@@ -1,49 +0,0 @@
---- CMakeLists.txt.orig	2013-05-16 17:47:15.000000000 +0200
-+++ CMakeLists.txt	2013-06-12 09:41:06.000000000 +0200
-@@ -306,7 +306,6 @@
- 
- ADD_SUBDIRECTORY(extra)
- IF(NOT WITHOUT_SERVER)
--  ADD_SUBDIRECTORY(tests)
-   ADD_SUBDIRECTORY(client)
-   ADD_SUBDIRECTORY(sql)
-   ADD_SUBDIRECTORY(sql/share)
-@@ -314,14 +313,10 @@
-   OPTION (WITH_EMBEDDED_SERVER "Compile MySQL with embedded server" OFF)
-   IF(WITH_EMBEDDED_SERVER) 
-    ADD_SUBDIRECTORY(libmysqld)
--   ADD_SUBDIRECTORY(libmysqld/examples)
-   ENDIF(WITH_EMBEDDED_SERVER)
- 
--  ADD_SUBDIRECTORY(mysql-test)
--  ADD_SUBDIRECTORY(mysql-test/lib/My/SafeProcess)
-   ADD_SUBDIRECTORY(support-files)
-   ADD_SUBDIRECTORY(scripts)
--  ADD_SUBDIRECTORY(sql-bench)
-   IF(UNIX)
-     ADD_SUBDIRECTORY(man)
-   ENDIF()
-@@ -365,8 +360,10 @@
- ELSE()
-   SET(CPACK_GENERATOR "TGZ")
- ENDIF() 
-+IF(FALSE)
- ADD_SUBDIRECTORY(packaging/WiX)
- ADD_SUBDIRECTORY(packaging/solaris)
-+ENDIF() 
- 
- # Create a single package with "make package"
- # (see http://public.kitware.com/Bug/view.php?id=11452)
-@@ -379,6 +376,7 @@
- #
- # RPM installs documentation directly from the source tree
- #
-+IF(FALSE)
- IF(NOT INSTALL_LAYOUT MATCHES "RPM")
-   INSTALL(FILES COPYING LICENSE.mysql 
-   DESTINATION ${INSTALL_DOCREADMEDIR} 
-@@ -404,3 +402,4 @@
-     PATTERN "sp-imp-spec.txt" EXCLUDE
-   )
- ENDIF()
-+ENDIF()
diff --git a/databases/mysql55-server/files/patch-client_CMakeLists.txt b/databases/mysql55-server/files/patch-client_CMakeLists.txt
deleted file mode 100644
index fc496933828e..000000000000
--- a/databases/mysql55-server/files/patch-client_CMakeLists.txt
+++ /dev/null
@@ -1,62 +0,0 @@
---- client/CMakeLists.txt.orig	2014-11-04 07:49:50.000000000 +0000
-+++ client/CMakeLists.txt	2014-12-03 09:23:56.610710083 +0000
-@@ -27,11 +27,13 @@
- 
- ADD_DEFINITIONS(${READLINE_DEFINES})
- ADD_DEFINITIONS(${SSL_DEFINES})
-+IF(FALSE)
- MYSQL_ADD_EXECUTABLE(mysql completion_hash.cc mysql.cc readline.cc sql_string.cc)
- TARGET_LINK_LIBRARIES(mysql mysqlclient)
- IF(UNIX)
-   TARGET_LINK_LIBRARIES(mysql ${READLINE_LIBRARY})
- ENDIF(UNIX)
-+ENDIF()
- 
- MYSQL_ADD_EXECUTABLE(mysqltest mysqltest.cc COMPONENT Test)
- SET_SOURCE_FILES_PROPERTIES(mysqltest.cc PROPERTIES COMPILE_FLAGS "-DTHREADS")
-@@ -44,6 +46,7 @@
- TARGET_LINK_LIBRARIES(mysqltest mysqlclient regex)
- 
- 
-+IF(FALSE)
- MYSQL_ADD_EXECUTABLE(mysqlcheck mysqlcheck.c)
- TARGET_LINK_LIBRARIES(mysqlcheck mysqlclient)
- 
-@@ -52,17 +55,21 @@
- 
- MYSQL_ADD_EXECUTABLE(mysqlimport mysqlimport.c)
- TARGET_LINK_LIBRARIES(mysqlimport mysqlclient)
-+ENDIF()
- 
- MYSQL_ADD_EXECUTABLE(mysql_upgrade mysql_upgrade.c)
- TARGET_LINK_LIBRARIES(mysql_upgrade mysqlclient)
- ADD_DEPENDENCIES(mysql_upgrade GenFixPrivs)
- 
-+IF(FALSE)
- MYSQL_ADD_EXECUTABLE(mysqlshow mysqlshow.c)
- TARGET_LINK_LIBRARIES(mysqlshow mysqlclient)
-+ENDIF()
- 
- MYSQL_ADD_EXECUTABLE(mysql_plugin mysql_plugin.c)
- TARGET_LINK_LIBRARIES(mysql_plugin mysqlclient)
- 
-+IF(FALSE)
- MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc)
- TARGET_LINK_LIBRARIES(mysqlbinlog mysqlclient)
- 
-@@ -72,13 +79,14 @@
- MYSQL_ADD_EXECUTABLE(mysqlslap mysqlslap.c)
- SET_SOURCE_FILES_PROPERTIES(mysqlslap.c PROPERTIES COMPILE_FLAGS "-DTHREADS")
- TARGET_LINK_LIBRARIES(mysqlslap mysqlclient)
-+ENDIF()
- 
- # "WIN32" also covers 64 bit. "echo" is used in some files below "mysql-test/".
- IF(WIN32)
-   MYSQL_ADD_EXECUTABLE(echo echo.c)
- ENDIF(WIN32)
- 
--SET_TARGET_PROPERTIES (mysqlcheck mysqldump mysqlimport mysql_upgrade mysqlshow mysqlslap mysql_plugin 
-+SET_TARGET_PROPERTIES (mysql_upgrade mysql_plugin
- PROPERTIES HAS_CXX TRUE)
- 
- ADD_DEFINITIONS(-DHAVE_DLOPEN)
diff --git a/databases/mysql55-server/files/patch-client_mysql.cc b/databases/mysql55-server/files/patch-client_mysql.cc
deleted file mode 100644
index 5a03f22b249f..000000000000
--- a/databases/mysql55-server/files/patch-client_mysql.cc
+++ /dev/null
@@ -1,25 +0,0 @@
---- client/mysql.cc.orig	2016-09-30 11:41:40 UTC
-+++ client/mysql.cc
-@@ -2738,9 +2738,11 @@ static void initialize_readline (char *n
- #ifdef HAVE_LOCALE_H
-   setlocale(LC_ALL,""); /* so as libedit use isprint */
- #endif
--  rl_attempted_completion_function= (CPPFunction*)&new_mysql_completion;
--  rl_completion_entry_function= &no_completion;
-+  rl_attempted_completion_function= (rl_completion_func_t*)&new_mysql_completion;
-+  rl_completion_entry_function= (rl_compentry_func_t*)&no_completion;
-+  /*
-   rl_add_defun("magic-space", (Function*)&fake_magic_space, -1);
-+  */
- #else
-   rl_attempted_completion_function= (CPPFunction*)&new_mysql_completion;
-   rl_completion_entry_function= &no_completion;
-@@ -2759,7 +2761,7 @@ static char **new_mysql_completion(const
-                                    int end MY_ATTRIBUTE((unused)))
- {
-   if (!status.batch && !quick)
--#if defined(USE_NEW_READLINE_INTERFACE)
-+#if defined(USE_NEW_READLINE_INTERFACE) || defined(USE_LIBEDIT_INTERFACE)
-     return rl_completion_matches(text, new_command_generator);
- #else
-     return completion_matches((char *)text, (CPFunction *)new_command_generator);
diff --git a/databases/mysql55-server/files/patch-cmake_plugin.cmake b/databases/mysql55-server/files/patch-cmake_plugin.cmake
deleted file mode 100644
index c151ea35f4ee..000000000000
--- a/databases/mysql55-server/files/patch-cmake_plugin.cmake
+++ /dev/null
@@ -1,10 +0,0 @@
---- cmake/plugin.cmake.orig	2011-09-09 17:56:39.000000000 +0200
-+++ cmake/plugin.cmake	2011-10-07 10:56:37.000000000 +0200
-@@ -195,7 +195,6 @@
-       OUTPUT_NAME "${ARG_MODULE_OUTPUT_NAME}")  
-     # Install dynamic library
-     MYSQL_INSTALL_TARGETS(${target} DESTINATION ${INSTALL_PLUGINDIR} COMPONENT Server)
--    INSTALL_DEBUG_TARGET(${target} DESTINATION ${INSTALL_PLUGINDIR}/debug)
-     # Add installed files to list for RPMs
-     FILE(APPEND ${CMAKE_BINARY_DIR}/support-files/plugins.files
-             "%attr(755, root, root) %{_prefix}/${INSTALL_PLUGINDIR}/${ARG_MODULE_OUTPUT_NAME}.so\n"
diff --git a/databases/mysql55-server/files/patch-extra_CMakeLists.txt b/databases/mysql55-server/files/patch-extra_CMakeLists.txt
deleted file mode 100644
index f8f555f5e0e8..000000000000
--- a/databases/mysql55-server/files/patch-extra_CMakeLists.txt
+++ /dev/null
@@ -1,12 +0,0 @@
---- extra/CMakeLists.txt.orig	2010-12-23 17:38:06.000000000 +0100
-+++ extra/CMakeLists.txt	2010-12-23 17:38:51.000000000 +0100
-@@ -75,7 +75,9 @@
-   MYSQL_ADD_EXECUTABLE(resolve_stack_dump resolve_stack_dump.c)
-   TARGET_LINK_LIBRARIES(resolve_stack_dump mysys)
- 
-+IF(FALSE)
-   MYSQL_ADD_EXECUTABLE(mysql_waitpid mysql_waitpid.c)
-   TARGET_LINK_LIBRARIES(mysql_waitpid mysys)
- ENDIF()
-+ENDIF()
- 
diff --git a/databases/mysql55-server/files/patch-include_CMakeLists.txt b/databases/mysql55-server/files/patch-include_CMakeLists.txt
deleted file mode 100644
index 2478ae5fa6e3..000000000000
--- a/databases/mysql55-server/files/patch-include_CMakeLists.txt
+++ /dev/null
@@ -1,10 +0,0 @@
---- include/CMakeLists.txt.orig	2011-01-19 23:37:08.000000000 +0100
-+++ include/CMakeLists.txt	2011-02-07 22:40:32.698758463 +0100
-@@ -57,5 +57,7 @@
-   ${HEADERS_GEN_CONFIGURE}
- )
- 
-+IF(FALSE)
- INSTALL(FILES ${HEADERS} DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT Development)
- INSTALL(DIRECTORY mysql/ DESTINATION ${INSTALL_INCLUDEDIR}/mysql COMPONENT Development FILES_MATCHING PATTERN "*.h")
-+ENDIF()
diff --git a/databases/mysql55-server/files/patch-include_my_compare.h b/databases/mysql55-server/files/patch-include_my_compare.h
deleted file mode 100644
index 093c8ae37789..000000000000
--- a/databases/mysql55-server/files/patch-include_my_compare.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- include/my_compare.h.orig	2011-05-10 09:46:46.000000000 +0200
-+++ include/my_compare.h	2011-05-10 09:47:01.000000000 +0200
-@@ -39,7 +39,7 @@
-   But beware the dependency of MI_MAX_POSSIBLE_KEY_BUFF and HA_MAX_KEY_LENGTH.
- */
- 
--#define HA_MAX_KEY_LENGTH           1000        /* Max length in bytes */
-+#define HA_MAX_KEY_LENGTH           4000        /* Max length in bytes */
- #define HA_MAX_KEY_SEG              16          /* Max segments for key */
- 
- #define HA_MAX_POSSIBLE_KEY_BUFF    (HA_MAX_KEY_LENGTH + 24+ 6+6)
diff --git a/databases/mysql55-server/files/patch-include_myisam.h b/databases/mysql55-server/files/patch-include_myisam.h
deleted file mode 100644
index 450645400dd5..000000000000
--- a/databases/mysql55-server/files/patch-include_myisam.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- include/myisam.h.orig	2009-02-16 23:04:54.000000000 +0100
-+++ include/myisam.h	2009-02-16 23:10:08.000000000 +0100
-@@ -48,7 +48,7 @@
-   The following defines can be increased if necessary.
-   But beware the dependency of MI_MAX_POSSIBLE_KEY_BUFF and MI_MAX_KEY_LENGTH.
- */
--#define MI_MAX_KEY_LENGTH           1000            /* Max length in bytes */
-+#define MI_MAX_KEY_LENGTH           4000            /* Max length in bytes */
- #define MI_MAX_KEY_SEG              16              /* Max segments for key */
- 
- #define MI_MAX_KEY_BUFF  (MI_MAX_KEY_LENGTH+MI_MAX_KEY_SEG*6+8+8)
diff --git a/databases/mysql55-server/files/patch-libmysql_CMakeLists.txt b/databases/mysql55-server/files/patch-libmysql_CMakeLists.txt
deleted file mode 100644
index 9d7dfc81fbaa..000000000000
--- a/databases/mysql55-server/files/patch-libmysql_CMakeLists.txt
+++ /dev/null
@@ -1,39 +0,0 @@
---- libmysql/CMakeLists.txt.orig	2014-03-14 18:58:32.000000000 +0000
-+++ libmysql/CMakeLists.txt	2014-03-31 12:19:56.265410574 +0000
-@@ -165,7 +165,7 @@
- 
- # Merge several convenience libraries into one big mysqlclient
- # and link them together into shared library.
--MERGE_LIBRARIES(mysqlclient STATIC ${LIBS} COMPONENT Development)
-+MERGE_LIBRARIES(mysqlclient STATIC ${LIBS} COMPONENT Development NOINSTALL)
- 
- # Visual Studio users need debug  static library for debug projects
- INSTALL_DEBUG_SYMBOLS(clientlib)
-@@ -180,6 +180,7 @@
-   SET(${out_name} ${name})
- ENDMACRO()
- 
-+IF(FALSE)
- IF(UNIX)
-   MACRO(GET_VERSIONED_LIBNAME LIBNAME EXTENSION VERSION OUTNAME)
-     SET(DOT_VERSION ".${VERSION}")
-@@ -200,11 +201,13 @@
-     ${lib_name} ${CMAKE_STATIC_LIBRARY_PREFIX}mysqlclient_r.a
-     ${INSTALL_LIBDIR} Development)
- ENDIF()
-+ENDIF()
- 
- IF(NOT DISABLE_SHARED)
-   MERGE_LIBRARIES(libmysql SHARED ${LIBS}
-     EXPORTS ${CLIENT_API_FUNCTIONS}
--    COMPONENT SharedLibraries)
-+    COMPONENT SharedLibraries NOINSTALL)
-+IF(FALSE)
-   IF(UNIX)
-     # libtool compatability
-     IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD" OR APPLE)
-@@ -261,3 +264,4 @@
-     ENDFOREACH()
-   ENDIF()
- ENDIF()
-+ENDIF()
diff --git a/databases/mysql55-server/files/patch-libservices_CMakeLists.txt b/databases/mysql55-server/files/patch-libservices_CMakeLists.txt
deleted file mode 100644
index fcbcea7aed21..000000000000
--- a/databases/mysql55-server/files/patch-libservices_CMakeLists.txt
+++ /dev/null
@@ -1,9 +0,0 @@
---- libservices/CMakeLists.txt.orig	2010-12-23 17:13:03.000000000 +0100
-+++ libservices/CMakeLists.txt	2010-12-23 17:13:17.000000000 +0100
-@@ -22,4 +22,6 @@
-   my_thread_scheduler_service.c)
- 
- ADD_LIBRARY(mysqlservices ${MYSQLSERVICES_SOURCES})
-+IF(FALSE)
- INSTALL(TARGETS mysqlservices DESTINATION ${INSTALL_LIBDIR} COMPONENT Development)
-+ENDIF()
diff --git a/databases/mysql55-server/files/patch-man_CMakeLists.txt b/databases/mysql55-server/files/patch-man_CMakeLists.txt
deleted file mode 100644
index 7849c77af111..000000000000
--- a/databases/mysql55-server/files/patch-man_CMakeLists.txt
+++ /dev/null
@@ -1,11 +0,0 @@
---- man/CMakeLists.txt.orig	2011-10-22 14:36:06.000000000 +0200
-+++ man/CMakeLists.txt	2011-10-22 14:36:23.000000000 +0200
-@@ -15,8 +15,6 @@
- 
- # Copy man pages
- FILE(GLOB MAN1_FILES *.1)
--FILE(GLOB MAN1_EXCLUDE make_win_bin_dist.1)
--FILE(GLOB MAN1_NDB ndb*.1)
- FILE(GLOB MAN8_FILES *.8)
- FILE(GLOB MAN8_NDB ndb*.8)
- IF(MAN1_FILES)
diff --git a/databases/mysql55-server/files/patch-mysys_default.c b/databases/mysql55-server/files/patch-mysys_default.c
deleted file mode 100644
index 816105371bdf..000000000000
--- a/databases/mysql55-server/files/patch-mysys_default.c
+++ /dev/null
@@ -1,31 +0,0 @@
---- mysys/default.c.orig	2010-11-02 23:01:13.000000000 +0100
-+++ mysys/default.c	2010-11-10 16:39:51.000000000 +0100
-@@ -70,7 +70,7 @@
- 
- /* Which directories are searched for options (and in which order) */
- 
--#define MAX_DEFAULT_DIRS 6
-+#define MAX_DEFAULT_DIRS 7
- #define DEFAULT_DIRS_SIZE (MAX_DEFAULT_DIRS + 1)  /* Terminate with NULL */
- static const char **default_directories = NULL;
- 
-@@ -711,7 +711,7 @@
-   {
-     MY_STAT stat_info;
-     if (!my_stat(name,&stat_info,MYF(0)))
--      return 1;
-+      return 0;
-     /*
-       Ignore world-writable regular files.
-       This is mainly done to protect us to not read a file created by
-@@ -1153,7 +1153,10 @@
- 
- #if defined(DEFAULT_SYSCONFDIR)
-   if (DEFAULT_SYSCONFDIR[0])
-+  {
-     errors += add_directory(alloc, DEFAULT_SYSCONFDIR, dirs);
-+    errors += add_directory(alloc, DEFAULT_SYSCONFDIR "/mysql", dirs);
-+  }
- #endif /* DEFAULT_SYSCONFDIR */
- 
- #endif
diff --git a/databases/mysql55-server/files/patch-scripts_CMakeLists.txt b/databases/mysql55-server/files/patch-scripts_CMakeLists.txt
deleted file mode 100644
index de410a1d3549..000000000000
--- a/databases/mysql55-server/files/patch-scripts_CMakeLists.txt
+++ /dev/null
@@ -1,37 +0,0 @@
---- scripts/CMakeLists.txt.orig	2011-07-13 21:09:03.000000000 +0200
-+++ scripts/CMakeLists.txt	2011-09-01 09:48:22.000000000 +0200
-@@ -266,6 +266,8 @@
-           GET_FILENAME_COMPONENT(lib "${lib}" NAME_WE)
-           STRING(REGEX REPLACE "^lib" "" lib "${lib}")
-           SET(${var} "${${var}}-l${lib} " ) 
-+        ELSEIF(lib STREQUAL "-pthread")
-+          SET(${var} "${${var}}-pthread " ) 
-         ELSE()
-           SET(${var} "${${var}}-l${lib} " ) 
-         ENDIF()
-@@ -316,16 +318,11 @@
-   # On Unix, most of the files end up in the bin directory
-   SET(mysql_config_COMPONENT COMPONENT Development)
-   SET(BIN_SCRIPTS
--    msql2mysql
--    mysql_config
-     mysql_fix_extensions
-     mysql_setpermission
-     mysql_secure_installation
-     mysql_zap
--    mysqlaccess
--    mysqlaccess.conf
-     mysql_convert_table_format
--    mysql_find_rows
-     mysqlhotcopy
-     mysqldumpslow
-     mysqld_multi
-@@ -334,7 +331,7 @@
-   FOREACH(file ${BIN_SCRIPTS})
-     IF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh)
-       CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh
--        ${CMAKE_CURRENT_BINARY_DIR}/${file} ESCAPE_QUOTES @ONLY)
-+        ${CMAKE_CURRENT_BINARY_DIR}/${file} @ONLY)
-     ELSEIF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${file})
-       CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${file}
-          ${CMAKE_CURRENT_BINARY_DIR}/${file} COPYONLY)
diff --git a/databases/mysql55-server/files/patch-scripts_mysqld_safe.sh b/databases/mysql55-server/files/patch-scripts_mysqld_safe.sh
deleted file mode 100644
index 2a30469922f0..000000000000
--- a/databases/mysql55-server/files/patch-scripts_mysqld_safe.sh
+++ /dev/null
@@ -1,24 +0,0 @@
---- scripts/mysqld_safe.sh.orig	2007-10-08 10:39:23.000000000 +0200
-+++ scripts/mysqld_safe.sh	2007-10-08 10:40:52.000000000 +0200
-@@ -242,10 +242,10 @@
- 
- if test -z "$MYSQL_HOME"
- then 
--  if test -r "$MY_BASEDIR_VERSION/my.cnf" && test -r "$DATADIR/my.cnf"
-+  if test -r "$MY_BASEDIR_VERSION/etc/my.cnf" && test -r "$DATADIR/my.cnf"
-   then
-     log_error "WARNING: Found two instances of my.cnf -
--$MY_BASEDIR_VERSION/my.cnf and
-+$MY_BASEDIR_VERSION/etc/my.cnf and
- $DATADIR/my.cnf
- IGNORING $DATADIR/my.cnf"
- 
-@@ -254,7 +254,7 @@
-   then
-     log_error "WARNING: Found $DATADIR/my.cnf
- The data directory is a deprecated location for my.cnf, please move it to
--$MY_BASEDIR_VERSION/my.cnf"
-+$MY_BASEDIR_VERSION/etc/my.cnf"
-     MYSQL_HOME=$DATADIR
-   else
-     MYSQL_HOME=$MY_BASEDIR_VERSION
diff --git a/databases/mysql55-server/files/patch-sql_CMakeLists.txt b/databases/mysql55-server/files/patch-sql_CMakeLists.txt
deleted file mode 100644
index 41d8905bd519..000000000000
--- a/databases/mysql55-server/files/patch-sql_CMakeLists.txt
+++ /dev/null
@@ -1,18 +0,0 @@
---- sql/CMakeLists.txt.orig	2013-03-25 14:14:58.000000000 +0100
-+++ sql/CMakeLists.txt	2013-04-19 14:57:41.000000000 +0200
-@@ -261,6 +261,7 @@ ADD_CUSTOM_TARGET(distclean
- 
- IF(INSTALL_LAYOUT STREQUAL "STANDALONE")
- 
-+IF(FALSE)
- # Copy db.opt into data/test/
- SET(DBOPT_FILE ${CMAKE_CURRENT_SOURCE_DIR}/db.opt ) 
- INSTALL(FILES ${DBOPT_FILE} DESTINATION data/test COMPONENT DataFiles)
-@@ -301,6 +302,7 @@ ELSE()
-   INSTALL(FILES ${DUMMY_FILE} DESTINATION data/mysql COMPONENT DataFiles)
- ENDIF()
- ENDIF()
-+ENDIF()
- 
- ADD_CUSTOM_TARGET(show-dist-name
-   COMMAND ${CMAKE_COMMAND} -E echo "${CPACK_PACKAGE_FILE_NAME}"
diff --git a/databases/mysql55-server/files/patch-sql_common_client_plugin.c b/databases/mysql55-server/files/patch-sql_common_client_plugin.c
deleted file mode 100644
index 069eaef76e11..000000000000
--- a/databases/mysql55-server/files/patch-sql_common_client_plugin.c
+++ /dev/null
@@ -1,47 +0,0 @@
---- sql-common/client_plugin.c.orig	2014-09-22 09:23:23 UTC
-+++ sql-common/client_plugin.c
-@@ -233,11 +233,13 @@
- {
-   MYSQL mysql;
-   struct st_mysql_client_plugin **builtin;
-+  va_list unused;
- 
-   if (initialized)
-     return 0;
- 
-   bzero(&mysql, sizeof(mysql)); /* dummy mysql for set_mysql_extended_error */
-+  bzero(&unused, sizeof(unused)); /* suppress uninitialized-value warnings */
- 
-   pthread_mutex_init(&LOCK_load_client_plugin, MY_MUTEX_INIT_SLOW);
-   init_alloc_root(&mem_root, 128, 128);
-@@ -249,7 +251,7 @@
-   pthread_mutex_lock(&LOCK_load_client_plugin);
- 
-   for (builtin= mysql_client_builtins; *builtin; builtin++)
--    add_plugin(&mysql, *builtin, 0, 0, 0);
-+    add_plugin(&mysql, *builtin, 0, 0, unused);
- 
-   pthread_mutex_unlock(&LOCK_load_client_plugin);
- 
-@@ -293,9 +295,12 @@
- mysql_client_register_plugin(MYSQL *mysql,
-                              struct st_mysql_client_plugin *plugin)
- {
-+  va_list unused;
-   if (is_not_initialized(mysql, plugin->name))
-     return NULL;
- 
-+  bzero(&unused, sizeof(unused)); /* suppress uninitialized-value warnings */
-+
-   pthread_mutex_lock(&LOCK_load_client_plugin);
- 
-   /* make sure the plugin wasn't loaded meanwhile */
-@@ -307,7 +312,7 @@
-     plugin= NULL;
-   }
-   else
--    plugin= add_plugin(mysql, plugin, 0, 0, 0);
-+    plugin= add_plugin(mysql, plugin, 0, 0, unused);
- 
-   pthread_mutex_unlock(&LOCK_load_client_plugin);
-   return plugin;
diff --git a/databases/mysql55-server/files/patch-sql_sql_partition.cc b/databases/mysql55-server/files/patch-sql_sql_partition.cc
deleted file mode 100644
index 11c62230ac6c..000000000000
--- a/databases/mysql55-server/files/patch-sql_sql_partition.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- sql/sql_partition.cc.orig	2018-05-14 15:35:48.089983000 +0200
-+++ sql/sql_partition.cc	2018-05-14 15:36:03.185749000 +0200
-@@ -283,7 +283,7 @@
-     }
-   }
-   part_info->set_up_defaults_for_partitioning(table->file,
--                                              (ulonglong)0, (uint)0);
-+                                              NULL, 0U);
-   DBUG_RETURN(FALSE);
- }
- 
diff --git a/databases/mysql55-server/files/patch-sql_sql_trigger.cc b/databases/mysql55-server/files/patch-sql_sql_trigger.cc
deleted file mode 100644
index 7e308976b3ec..000000000000
--- a/databases/mysql55-server/files/patch-sql_sql_trigger.cc
+++ /dev/null
@@ -1,50 +0,0 @@
---- sql/sql_trigger.cc.orig	2012-08-02 00:01:13.000000000 +0200
-+++ sql/sql_trigger.cc	2012-09-11 17:01:13.000000000 +0200
-@@ -192,32 +192,32 @@ static File_option triggers_file_parameters[]=
- {
-   {
-     { C_STRING_WITH_LEN("triggers") },
--    my_offsetof(class Table_triggers_list, definitions_list),
-+    static_cast<int>(my_offsetof(class Table_triggers_list, definitions_list)),
-     FILE_OPTIONS_STRLIST
-   },
-   {
-     { C_STRING_WITH_LEN("sql_modes") },
--    my_offsetof(class Table_triggers_list, definition_modes_list),
-+    static_cast<int>(my_offsetof(class Table_triggers_list, definition_modes_list)),
-     FILE_OPTIONS_ULLLIST
-   },
-   {
-     { C_STRING_WITH_LEN("definers") },
--    my_offsetof(class Table_triggers_list, definers_list),
-+    static_cast<int>(my_offsetof(class Table_triggers_list, definers_list)),
-     FILE_OPTIONS_STRLIST
-   },
-   {
-     { C_STRING_WITH_LEN("client_cs_names") },
--    my_offsetof(class Table_triggers_list, client_cs_names),
-+    static_cast<int>(my_offsetof(class Table_triggers_list, client_cs_names)),
-     FILE_OPTIONS_STRLIST
-   },
-   {
-     { C_STRING_WITH_LEN("connection_cl_names") },
--    my_offsetof(class Table_triggers_list, connection_cl_names),
-+    static_cast<int>(my_offsetof(class Table_triggers_list, connection_cl_names)),
-     FILE_OPTIONS_STRLIST
-   },
-   {
-     { C_STRING_WITH_LEN("db_cl_names") },
--    my_offsetof(class Table_triggers_list, db_cl_names),
-+    static_cast<int>(my_offsetof(class Table_triggers_list, db_cl_names)),
-     FILE_OPTIONS_STRLIST
-   },
-   { { 0, 0 }, 0, FILE_OPTIONS_STRING }
-@@ -226,7 +226,7 @@ static File_option triggers_file_parameters[]=
- File_option sql_modes_parameters=
- {
-   { C_STRING_WITH_LEN("sql_modes") },
--  my_offsetof(class Table_triggers_list, definition_modes_list),
-+  static_cast<int>(my_offsetof(class Table_triggers_list, definition_modes_list)),
-   FILE_OPTIONS_ULLLIST
- };
- 
diff --git a/databases/mysql55-server/files/patch-sql_sql_view.cc b/databases/mysql55-server/files/patch-sql_sql_view.cc
deleted file mode 100644
index 5f4d92d7eebf..000000000000
--- a/databases/mysql55-server/files/patch-sql_sql_view.cc
+++ /dev/null
@@ -1,63 +0,0 @@
---- sql/sql_view.cc.orig	2012-08-02 00:01:13.000000000 +0200
-+++ sql/sql_view.cc	2012-09-11 17:01:13.000000000 +0200
-@@ -730,46 +730,46 @@ static const int required_view_parameters= 14;
- */
- static File_option view_parameters[]=
- {{{ C_STRING_WITH_LEN("query")},
--  my_offsetof(TABLE_LIST, select_stmt),
-+  static_cast<int>(my_offsetof(TABLE_LIST, select_stmt)),
-   FILE_OPTIONS_ESTRING},
-  {{ C_STRING_WITH_LEN("md5")},
--  my_offsetof(TABLE_LIST, md5),
-+  static_cast<int>(my_offsetof(TABLE_LIST, md5)),
-   FILE_OPTIONS_STRING},
-  {{ C_STRING_WITH_LEN("updatable")},
--  my_offsetof(TABLE_LIST, updatable_view),
-+  static_cast<int>(my_offsetof(TABLE_LIST, updatable_view)),
-   FILE_OPTIONS_ULONGLONG},
-  {{ C_STRING_WITH_LEN("algorithm")},
--  my_offsetof(TABLE_LIST, algorithm),
-+  static_cast<int>(my_offsetof(TABLE_LIST, algorithm)),
-   FILE_OPTIONS_ULONGLONG},
-  {{ C_STRING_WITH_LEN("definer_user")},
--  my_offsetof(TABLE_LIST, definer.user),
-+  static_cast<int>(my_offsetof(TABLE_LIST, definer.user)),
-   FILE_OPTIONS_STRING},
-  {{ C_STRING_WITH_LEN("definer_host")},
--  my_offsetof(TABLE_LIST, definer.host),
-+  static_cast<int>(my_offsetof(TABLE_LIST, definer.host)),
-   FILE_OPTIONS_STRING},
-  {{ C_STRING_WITH_LEN("suid")},
--  my_offsetof(TABLE_LIST, view_suid),
-+  static_cast<int>(my_offsetof(TABLE_LIST, view_suid)),
-   FILE_OPTIONS_ULONGLONG},
-  {{ C_STRING_WITH_LEN("with_check_option")},
--  my_offsetof(TABLE_LIST, with_check),
-+  static_cast<int>(my_offsetof(TABLE_LIST, with_check)),
-   FILE_OPTIONS_ULONGLONG},
-  {{ C_STRING_WITH_LEN("timestamp")},
--  my_offsetof(TABLE_LIST, timestamp),
-+  static_cast<int>(my_offsetof(TABLE_LIST, timestamp)),
-   FILE_OPTIONS_TIMESTAMP},
-  {{ C_STRING_WITH_LEN("create-version")},
--  my_offsetof(TABLE_LIST, file_version),
-+  static_cast<int>(my_offsetof(TABLE_LIST, file_version)),
-   FILE_OPTIONS_ULONGLONG},
-  {{ C_STRING_WITH_LEN("source")},
--  my_offsetof(TABLE_LIST, source),
-+  static_cast<int>(my_offsetof(TABLE_LIST, source)),
-   FILE_OPTIONS_ESTRING},
-  {{(char*) STRING_WITH_LEN("client_cs_name")},
--  my_offsetof(TABLE_LIST, view_client_cs_name),
-+  static_cast<int>(my_offsetof(TABLE_LIST, view_client_cs_name)),
-   FILE_OPTIONS_STRING},
-  {{(char*) STRING_WITH_LEN("connection_cl_name")},
--  my_offsetof(TABLE_LIST, view_connection_cl_name),
-+  static_cast<int>(my_offsetof(TABLE_LIST, view_connection_cl_name)),
-   FILE_OPTIONS_STRING},
-  {{(char*) STRING_WITH_LEN("view_body_utf8")},
--  my_offsetof(TABLE_LIST, view_body_utf8),
-+  static_cast<int>(my_offsetof(TABLE_LIST, view_body_utf8)),
-   FILE_OPTIONS_ESTRING},
-  {{NullS, 0},			0,
-   FILE_OPTIONS_STRING}
diff --git a/databases/mysql55-server/files/patch-sql_sys_vars.cc b/databases/mysql55-server/files/patch-sql_sys_vars.cc
deleted file mode 100644
index e8f0caff4aff..000000000000
--- a/databases/mysql55-server/files/patch-sql_sys_vars.cc
+++ /dev/null
@@ -1,38 +0,0 @@
---- sql/sys_vars.cc.orig	2012-06-15 17:03:32.000000000 +0200
-+++ sql/sys_vars.cc	2012-06-15 17:16:23.000000000 +0200
-@@ -900,7 +900,7 @@
-        "connection before closing it",
-        SESSION_VAR(net_interactive_timeout),
-        CMD_LINE(REQUIRED_ARG),
--       VALID_RANGE(1, LONG_TIMEOUT), DEFAULT(NET_WAIT_TIMEOUT), BLOCK_SIZE(1));
-+       VALID_RANGE(1, INT_MAX32/1000), DEFAULT(NET_WAIT_TIMEOUT), BLOCK_SIZE(1));
- 
- static Sys_var_ulong Sys_join_buffer_size(
-        "join_buffer_size",
-@@ -1401,7 +1401,7 @@
-        "Number of seconds to wait for more data from a connection before "
-        "aborting the read",
-        SESSION_VAR(net_read_timeout), CMD_LINE(REQUIRED_ARG),
--       VALID_RANGE(1, LONG_TIMEOUT), DEFAULT(NET_READ_TIMEOUT), BLOCK_SIZE(1),
-+       VALID_RANGE(1, INT_MAX32/1000), DEFAULT(NET_READ_TIMEOUT), BLOCK_SIZE(1),
-        NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0),
-        ON_UPDATE(fix_net_read_timeout));
- 
-@@ -1416,7 +1416,7 @@
-        "Number of seconds to wait for a block to be written to a connection "
-        "before aborting the write",
-        SESSION_VAR(net_write_timeout), CMD_LINE(REQUIRED_ARG),
--       VALID_RANGE(1, LONG_TIMEOUT), DEFAULT(NET_WRITE_TIMEOUT), BLOCK_SIZE(1),
-+       VALID_RANGE(1, INT_MAX32/1000), DEFAULT(NET_WRITE_TIMEOUT), BLOCK_SIZE(1),
-        NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0),
-        ON_UPDATE(fix_net_write_timeout));
- 
-@@ -2257,7 +2257,7 @@
-        "The number of seconds the server waits for activity on a "
-        "connection before closing it",
-        SESSION_VAR(net_wait_timeout), CMD_LINE(REQUIRED_ARG),
--       VALID_RANGE(1, IF_WIN(INT_MAX32/1000, LONG_TIMEOUT)),
-+       VALID_RANGE(1, INT_MAX32/1000),
-        DEFAULT(NET_WAIT_TIMEOUT), BLOCK_SIZE(1));
- 
- /** propagates changes to the relevant flag of @@optimizer_switch */
diff --git a/databases/mysql55-server/files/patch-support-files_CMakeLists.txt b/databases/mysql55-server/files/patch-support-files_CMakeLists.txt
deleted file mode 100644
index 159e1fa71ba2..000000000000
--- a/databases/mysql55-server/files/patch-support-files_CMakeLists.txt
+++ /dev/null
@@ -1,12 +0,0 @@
---- support-files/CMakeLists.txt.orig	2010-12-23 17:38:19.000000000 +0100
-+++ support-files/CMakeLists.txt	2010-12-23 17:41:11.000000000 +0100
-@@ -74,7 +74,9 @@
-     INSTALL(FILES magic DESTINATION ${inst_location} COMPONENT SupportFiles)
-   ENDIF()
- 
-+IF(FALSE)
-   INSTALL(FILES mysql.m4 DESTINATION ${INSTALL_SHAREDIR}/aclocal COMPONENT Development)
-+ENDIF()
-   CONFIGURE_FILE(MySQL-shared-compat.spec.sh ${CMAKE_CURRENT_BINARY_DIR}/MySQL-shared-compat.spec @ONLY)
-   CONFIGURE_FILE(mysql.spec.sh ${CMAKE_CURRENT_BINARY_DIR}/mysql.spec @ONLY)
-   CONFIGURE_FILE(mysql.spec.sh ${CMAKE_CURRENT_BINARY_DIR}/mysql.${VERSION}.spec @ONLY)
diff --git a/databases/mysql55-server/pkg-descr b/databases/mysql55-server/pkg-descr
deleted file mode 100644
index 028ce03b0da2..000000000000
--- a/databases/mysql55-server/pkg-descr
+++ /dev/null
@@ -1,4 +0,0 @@
-MySQL is a very fast, multi-threaded, multi-user and robust SQL
-(Structured Query Language) database server.
-
-WWW: https://www.mysql.com/
diff --git a/databases/mysql55-server/pkg-message b/databases/mysql55-server/pkg-message
deleted file mode 100644
index e619c93e68e7..000000000000
--- a/databases/mysql55-server/pkg-message
+++ /dev/null
@@ -1,8 +0,0 @@
-[
-{ type: upgrade
-  message: <<EOM
-Remember to run mysql_upgrade the first time you start the MySQL server
-after an upgrade from an earlier version.
-EOM
-}
-]
diff --git a/databases/mysql55-server/pkg-plist b/databases/mysql55-server/pkg-plist
deleted file mode 100644
index 135eca47d8f7..000000000000
--- a/databases/mysql55-server/pkg-plist
+++ /dev/null
@@ -1,136 +0,0 @@
-bin/innochecksum
-bin/my_print_defaults
-bin/myisam_ftdump
-bin/myisamchk
-bin/myisamlog
-bin/myisampack
-bin/mysql_convert_table_format
-bin/mysql_fix_extensions
-bin/mysql_install_db
-bin/mysql_plugin
-bin/mysql_secure_installation
-bin/mysql_setpermission
-bin/mysql_tzinfo_to_sql
-bin/mysql_upgrade
-bin/mysql_zap
-bin/mysqlbug
-bin/mysqld_multi
-bin/mysqld_safe
-bin/mysqldumpslow
-bin/mysqlhotcopy
-bin/mysqltest
-bin/perror
-bin/replace
-bin/resolve_stack_dump
-bin/resolveip
-lib/mysql/libmysqld.a
-lib/mysql/plugin/adt_null.so
-lib/mysql/plugin/auth.so
-lib/mysql/plugin/auth_test_plugin.so
-lib/mysql/plugin/daemon_example.ini
-lib/mysql/plugin/ha_archive.so
-lib/mysql/plugin/ha_blackhole.so
-lib/mysql/plugin/ha_example.so
-lib/mysql/plugin/ha_federated.so
-lib/mysql/plugin/libdaemon_example.so
-lib/mysql/plugin/mypluglib.so
-lib/mysql/plugin/qa_auth_client.so
-lib/mysql/plugin/qa_auth_interface.so
-lib/mysql/plugin/qa_auth_server.so
-lib/mysql/plugin/semisync_master.so
-lib/mysql/plugin/semisync_slave.so
-libexec/mysqld
-man/man1/my_print_defaults.1.gz
-man/man1/myisam_ftdump.1.gz
-man/man1/myisamchk.1.gz
-man/man1/myisamlog.1.gz
-man/man1/myisampack.1.gz
-man/man1/mysql.server.1.gz
-man/man1/mysql_convert_table_format.1.gz
-man/man1/mysql_fix_extensions.1.gz
-man/man1/mysql_install_db.1.gz
-man/man1/mysql_plugin.1.gz
-man/man1/mysql_secure_installation.1.gz
-man/man1/mysql_setpermission.1.gz
-man/man1/mysql_tzinfo_to_sql.1.gz
-man/man1/mysql_upgrade.1.gz
-man/man1/mysql_zap.1.gz
-man/man1/mysqlbug.1.gz
-man/man1/mysqld_multi.1.gz
-man/man1/mysqld_safe.1.gz
-man/man1/mysqldumpslow.1.gz
-man/man1/mysqlhotcopy.1.gz
-man/man1/mysqlman.1.gz
-man/man1/perror.1.gz
-man/man1/replace.1.gz
-man/man1/resolve_stack_dump.1.gz
-man/man1/resolveip.1.gz
-man/man8/mysqld.8.gz
-%%DATADIR%%/binary-configure
-%%DATADIR%%/charsets/Index.xml
-%%DATADIR%%/charsets/README
-%%DATADIR%%/charsets/armscii8.xml
-%%DATADIR%%/charsets/ascii.xml
-%%DATADIR%%/charsets/cp1250.xml
-%%DATADIR%%/charsets/cp1251.xml
-%%DATADIR%%/charsets/cp1256.xml
-%%DATADIR%%/charsets/cp1257.xml
-%%DATADIR%%/charsets/cp850.xml
-%%DATADIR%%/charsets/cp852.xml
-%%DATADIR%%/charsets/cp866.xml
-%%DATADIR%%/charsets/dec8.xml
-%%DATADIR%%/charsets/geostd8.xml
-%%DATADIR%%/charsets/greek.xml
-%%DATADIR%%/charsets/hebrew.xml
-%%DATADIR%%/charsets/hp8.xml
-%%DATADIR%%/charsets/keybcs2.xml
-%%DATADIR%%/charsets/koi8r.xml
-%%DATADIR%%/charsets/koi8u.xml
-%%DATADIR%%/charsets/latin1.xml
-%%DATADIR%%/charsets/latin2.xml
-%%DATADIR%%/charsets/latin5.xml
-%%DATADIR%%/charsets/latin7.xml
-%%DATADIR%%/charsets/macce.xml
-%%DATADIR%%/charsets/macroman.xml
-%%DATADIR%%/charsets/swe7.xml
-%%DATADIR%%/config.huge.ini
-%%DATADIR%%/config.medium.ini
-%%DATADIR%%/config.small.ini
-%%DATADIR%%/czech/errmsg.sys
-%%DATADIR%%/danish/errmsg.sys
-%%DATADIR%%/dutch/errmsg.sys
-%%DATADIR%%/english/errmsg.sys
-%%DATADIR%%/errmsg-utf8.txt
-%%DATADIR%%/estonian/errmsg.sys
-%%DATADIR%%/fill_help_tables.sql
-%%DATADIR%%/french/errmsg.sys
-%%DATADIR%%/german/errmsg.sys
-%%DATADIR%%/greek/errmsg.sys
-%%DATADIR%%/hungarian/errmsg.sys
-%%DATADIR%%/italian/errmsg.sys
-%%DATADIR%%/japanese/errmsg.sys
-%%DATADIR%%/korean/errmsg.sys
-%%DATADIR%%/magic
-%%DATADIR%%/my-huge.cnf
-%%DATADIR%%/my-innodb-heavy-4G.cnf
-%%DATADIR%%/my-large.cnf
-%%DATADIR%%/my-medium.cnf
-%%DATADIR%%/my-small.cnf
-%%DATADIR%%/mysql-log-rotate
-%%DATADIR%%/mysql.server
-%%DATADIR%%/mysql_system_tables.sql
-%%DATADIR%%/mysql_system_tables_data.sql
-%%DATADIR%%/mysql_test_data_timezone.sql
-%%DATADIR%%/mysqld_multi.server
-%%DATADIR%%/ndb-config-2-node.ini
-%%DATADIR%%/norwegian-ny/errmsg.sys
-%%DATADIR%%/norwegian/errmsg.sys
-%%DATADIR%%/polish/errmsg.sys
-%%DATADIR%%/portuguese/errmsg.sys
-%%DATADIR%%/romanian/errmsg.sys
-%%DATADIR%%/russian/errmsg.sys
-%%DATADIR%%/serbian/errmsg.sys
-%%DATADIR%%/slovak/errmsg.sys
-%%DATADIR%%/spanish/errmsg.sys
-%%DATADIR%%/swedish/errmsg.sys
-%%DATADIR%%/ukrainian/errmsg.sys
diff --git a/databases/mysql56-client/Makefile b/databases/mysql56-client/Makefile
deleted file mode 100644
index 60dfbc74278c..000000000000
--- a/databases/mysql56-client/Makefile
+++ /dev/null
@@ -1,34 +0,0 @@
-# Created by: Alex Dupre <ale@FreeBSD.org>
-
-PORTNAME=	mysql
-PORTREVISION=	0
-PKGNAMESUFFIX=	56-client
-
-COMMENT=	Multithreaded SQL database (client)
-
-LICENSE+=	LGPL21
-
-BROKEN_sparc64=	Does not build: reports unsupported compiler
-
-MASTERDIR=	${.CURDIR}/../mysql56-server
-
-PKGMESSAGE=	${.CURDIR}/pkg-message
-PATCHDIR=	${.CURDIR}/files
-PLIST=		${.CURDIR}/pkg-plist
-
-CONFLICTS_INSTALL=	mysql5[0-57-9]-client-* \
-			mysql[0-46-9][0-9]-client-* \
-			mariadb[0-9][0-9]-client-* \
-			percona[0-9][0-9]-client-*
-
-CMAKE_ARGS+=	-DWITHOUT_SERVER=1
-
-USE_LDCONFIG+=	${PREFIX}/lib/mysql
-
-MMAN1=		comp_err.1 msql2mysql.1 mysql.1 mysql_config.1 mysql_config_editor.1 mysql_find_rows.1 \
-		mysql_waitpid.1 mysqlaccess.1 mysqladmin.1 mysqlbinlog.1 \
-		mysqlcheck.1 mysqldump.1 mysqlimport.1 mysqlshow.1 mysqlslap.1
-
-CLIENT_ONLY=	yes
-
-.include "${MASTERDIR}/Makefile"
diff --git a/databases/mysql56-client/files/patch-CMakeLists.txt b/databases/mysql56-client/files/patch-CMakeLists.txt
deleted file mode 100644
index 3a2856f26e6d..000000000000
--- a/databases/mysql56-client/files/patch-CMakeLists.txt
+++ /dev/null
@@ -1,40 +0,0 @@
---- CMakeLists.txt.orig	2016-11-28 13:36:22 UTC
-+++ CMakeLists.txt
-@@ -481,8 +481,8 @@ ENDIF()
- 
- ADD_SUBDIRECTORY(extra)
- ADD_SUBDIRECTORY(client)
--ADD_SUBDIRECTORY(sql/share)
- ADD_SUBDIRECTORY(libservices)
-+ADD_SUBDIRECTORY(support-files)
- 
- IF(UNIX)
-   ADD_SUBDIRECTORY(man)
-@@ -552,18 +552,17 @@ ELSE()
-   SET(CPACK_GENERATOR "TGZ")
- ENDIF() 
- ADD_SUBDIRECTORY(packaging/WiX)
--ADD_SUBDIRECTORY(packaging/solaris)
- 
- # Create a single package with "make package"
- # (see http://public.kitware.com/Bug/view.php?id=11452)
- SET(CPACK_MONOLITHIC_INSTALL 1 CACHE INTERNAL "")
- 
- IF(UNIX)
--  INSTALL(FILES Docs/mysql.info DESTINATION ${INSTALL_INFODIR} OPTIONAL COMPONENT Info)
- ENDIF()
- #
- # RPM installs documentation directly from the source tree
- #
-+IF(FALSE)
- IF(NOT INSTALL_LAYOUT MATCHES "RPM")
-   INSTALL(FILES COPYING LICENSE.mysql 
-   DESTINATION ${INSTALL_DOCREADMEDIR} 
-@@ -585,6 +584,7 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM")
-     PATTERN "sp-imp-spec.txt" EXCLUDE
-   )
- ENDIF()
-+ENDIF()
- 
- INCLUDE(CPack)
- 
diff --git a/databases/mysql56-client/files/patch-client_CMakeLists.txt b/databases/mysql56-client/files/patch-client_CMakeLists.txt
deleted file mode 100644
index f9abf51f399c..000000000000
--- a/databases/mysql56-client/files/patch-client_CMakeLists.txt
+++ /dev/null
@@ -1,43 +0,0 @@
---- client/CMakeLists.txt.orig	2016-03-03 16:35:33.000000000 +0100
-+++ client/CMakeLists.txt	2016-04-19 17:30:13.344558659 +0200
-@@ -37,9 +37,11 @@ IF(UNIX)
-   TARGET_LINK_LIBRARIES(mysql ${EDITLINE_LIBRARY})
- ENDIF(UNIX)
- 
-+IF(FALSE)
- MYSQL_ADD_EXECUTABLE(mysqltest mysqltest.cc COMPONENT Test)
- SET_SOURCE_FILES_PROPERTIES(mysqltest.cc PROPERTIES COMPILE_FLAGS "-DTHREADS")
- TARGET_LINK_LIBRARIES(mysqltest mysqlclient regex)
- ADD_DEPENDENCIES(mysqltest GenError)
-+ENDIF()
- 
- MYSQL_ADD_EXECUTABLE(mysqlcheck mysqlcheck.c)
-@@ -52,15 +54,19 @@ MYSQL_ADD_EXECUTABLE(mysqlimport mysqlim
- SET_SOURCE_FILES_PROPERTIES(mysqlimport.c PROPERTIES COMPILE_FLAGS "-DTHREADS")
- TARGET_LINK_LIBRARIES(mysqlimport mysqlclient)
- 
-+IF(FALSE)
- MYSQL_ADD_EXECUTABLE(mysql_upgrade mysql_upgrade.c)
- TARGET_LINK_LIBRARIES(mysql_upgrade mysqlclient)
- ADD_DEPENDENCIES(mysql_upgrade GenFixPrivs)
-+ENDIF()
- 
- MYSQL_ADD_EXECUTABLE(mysqlshow mysqlshow.c)
- TARGET_LINK_LIBRARIES(mysqlshow mysqlclient)
- 
-+IF(FALSE)
- MYSQL_ADD_EXECUTABLE(mysql_plugin mysql_plugin.c)
- TARGET_LINK_LIBRARIES(mysql_plugin mysqlclient)
-+ENDIF()
- 
- MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc)
- TARGET_LINK_LIBRARIES(mysqlbinlog mysqlclient)
-@@ -81,8 +87,6 @@ IF(WIN32)
- ENDIF(WIN32)
- 
- SET_TARGET_PROPERTIES (
--  mysql_plugin 
--  mysql_upgrade
-   mysqlcheck
-   mysqldump
-   mysqlimport
diff --git a/databases/mysql56-client/files/patch-cmake_build_configurations_compiler_options.cmake b/databases/mysql56-client/files/patch-cmake_build_configurations_compiler_options.cmake
deleted file mode 100644
index f22178ade70a..000000000000
--- a/databases/mysql56-client/files/patch-cmake_build_configurations_compiler_options.cmake
+++ /dev/null
@@ -1,20 +0,0 @@
---- cmake/build_configurations/compiler_options.cmake.orig	2020-01-01 21:24:49.736077000 +0100
-+++ cmake/build_configurations/compiler_options.cmake	2020-01-01 21:25:22.307418000 +0100
-@@ -32,7 +32,7 @@ IF(UNIX)  
- 
-   # Default GCC flags
-   IF(CMAKE_COMPILER_IS_GNUCC)
--    SET(COMMON_C_FLAGS               "-g -fabi-version=2 -fno-omit-frame-pointer -fno-strict-aliasing")
-+    SET(COMMON_C_FLAGS               "-g -fno-omit-frame-pointer -fno-strict-aliasing")
-     # Disable inline optimizations for valgrind testing to avoid false positives
-     IF(WITH_VALGRIND)
-       SET(COMMON_C_FLAGS             "-fno-inline ${COMMON_C_FLAGS}")
-@@ -47,7 +47,7 @@ IF(UNIX)  
-     IF(GXX_VERSION VERSION_EQUAL 6.0 OR GXX_VERSION VERSION_GREATER 6.0)
-       SET(COMMON_CXX_FLAGS             "${COMMON_CXX_FLAGS} -std=gnu++03")
-     ENDIF()
--    SET(COMMON_CXX_FLAGS               "-g -fabi-version=2 -fno-omit-frame-pointer -fno-strict-aliasing")
-+    SET(COMMON_CXX_FLAGS               "-g -fno-omit-frame-pointer -fno-strict-aliasing")
-     # Disable inline optimizations for valgrind testing to avoid false positives
-     IF(WITH_VALGRIND)
-       SET(COMMON_CXX_FLAGS             "-fno-inline ${COMMON_CXX_FLAGS}")
diff --git a/databases/mysql56-client/files/patch-cmake_ssl.cmake b/databases/mysql56-client/files/patch-cmake_ssl.cmake
deleted file mode 100644
index 52db9e37d987..000000000000
--- a/databases/mysql56-client/files/patch-cmake_ssl.cmake
+++ /dev/null
@@ -1,26 +0,0 @@
---- cmake/ssl.cmake.orig	2019-11-26 16:53:45 UTC
-+++ cmake/ssl.cmake
-@@ -189,13 +189,20 @@ MACRO (MYSQL_CHECK_SSL)
-         OPENSSL_FIX_VERSION "${OPENSSL_VERSION_NUMBER}"
-         )
-     ENDIF()
--    IF("${OPENSSL_MAJOR_VERSION}.${OPENSSL_MINOR_VERSION}.${OPENSSL_FIX_VERSION}" VERSION_GREATER "1.1.0")
--       ADD_DEFINITIONS(-DHAVE_TLSv13)
-+    CHECK_SYMBOL_EXISTS(TLS1_3_VERSION "openssl/tls1.h" HAVE_TLS1_3_VERSION)
-+    IF(HAVE_TLS1_3_VERSION)
-+       #ADD_DEFINITIONS(-DHAVE_TLSv13)
-     ENDIF()
-     IF(OPENSSL_INCLUDE_DIR AND
-        OPENSSL_LIBRARY   AND
-        CRYPTO_LIBRARY      AND
--       OPENSSL_MAJOR_VERSION STREQUAL "1"
-+       OPENSSL_MAJOR_VERSION VERSION_GREATER_EQUAL "1"
-+      )
-+      SET(OPENSSL_FOUND TRUE)
-+    ELSEIF(OPENSSL_INCLUDE_DIR AND
-+       OPENSSL_LIBRARY   AND
-+       CRYPTO_LIBRARY      AND
-+       OPENSSL_MAJOR_VERSION STREQUAL "2"
-       )
-       SET(OPENSSL_FOUND TRUE)
-     ELSE()
diff --git a/databases/mysql56-client/files/patch-extra_CMakeLists.txt b/databases/mysql56-client/files/patch-extra_CMakeLists.txt
deleted file mode 100644
index cdfc77b55aaa..000000000000
--- a/databases/mysql56-client/files/patch-extra_CMakeLists.txt
+++ /dev/null
@@ -1,32 +0,0 @@
---- extra/CMakeLists.txt.orig	2016-11-28 13:36:22 UTC
-+++ extra/CMakeLists.txt
-@@ -35,6 +35,7 @@ ENDIF()
- 
- ADD_CUSTOM_COMMAND(OUTPUT ${PROJECT_BINARY_DIR}/include/mysqld_error.h 
-                    ${PROJECT_BINARY_DIR}/sql/share/english/errmsg.sys
-+                   COMMAND mkdir -p ${PROJECT_BINARY_DIR}/sql/share/
-                    COMMAND comp_err
-                     --charset=${PROJECT_SOURCE_DIR}/sql/share/charsets 
-                     --out-dir=${PROJECT_BINARY_DIR}/sql/share/
-@@ -60,6 +61,7 @@ IF (WIN32 AND WITH_SSL_PATH AND HAVE_CRY
- ENDIF()
- 
- 
-+IF(FALSE)
- MYSQL_ADD_EXECUTABLE(my_print_defaults my_print_defaults.c)
- TARGET_LINK_LIBRARIES(my_print_defaults  mysys mysys_ssl)
- SET_TARGET_PROPERTIES(my_print_defaults PROPERTIES LINKER_LANGUAGE CXX)
-@@ -96,10 +98,13 @@ IF(WITH_INNOBASE_STORAGE_ENGINE)
-   MYSQL_ADD_EXECUTABLE(innochecksum innochecksum.cc ${INNOBASE_SOURCES})
-   TARGET_LINK_LIBRARIES(innochecksum mysys mysys_ssl)
- ENDIF()
-+ENDIF()
- 
- IF(UNIX)
-+IF(FALSE)
-   MYSQL_ADD_EXECUTABLE(resolve_stack_dump resolve_stack_dump.cc)
-   TARGET_LINK_LIBRARIES(resolve_stack_dump mysys mysys_ssl)
-+ENDIF()
- 
-   MYSQL_ADD_EXECUTABLE(mysql_waitpid mysql_waitpid.c)
-   TARGET_LINK_LIBRARIES(mysql_waitpid mysys mysys_ssl)
diff --git a/databases/mysql56-client/files/patch-include-CMakeLists.txt b/databases/mysql56-client/files/patch-include-CMakeLists.txt
deleted file mode 100644
index d34ccda7fb7a..000000000000
--- a/databases/mysql56-client/files/patch-include-CMakeLists.txt
+++ /dev/null
@@ -1,10 +0,0 @@
---- include/CMakeLists.txt.orig	2014-01-14 23:38:00.000000000 +0800
-+++ include/CMakeLists.txt	2014-02-28 04:51:50.269412818 +0800
-@@ -35,6 +35,7 @@
- 
- SET(HEADERS 
-   ${HEADERS_ABI} 
-+  hash.h
-   my_dbug.h 
-   m_string.h
-   my_sys.h 
diff --git a/databases/mysql56-client/files/patch-include_my_compare.h b/databases/mysql56-client/files/patch-include_my_compare.h
deleted file mode 100644
index 093c8ae37789..000000000000
--- a/databases/mysql56-client/files/patch-include_my_compare.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- include/my_compare.h.orig	2011-05-10 09:46:46.000000000 +0200
-+++ include/my_compare.h	2011-05-10 09:47:01.000000000 +0200
-@@ -39,7 +39,7 @@
-   But beware the dependency of MI_MAX_POSSIBLE_KEY_BUFF and HA_MAX_KEY_LENGTH.
- */
- 
--#define HA_MAX_KEY_LENGTH           1000        /* Max length in bytes */
-+#define HA_MAX_KEY_LENGTH           4000        /* Max length in bytes */
- #define HA_MAX_KEY_SEG              16          /* Max segments for key */
- 
- #define HA_MAX_POSSIBLE_KEY_BUFF    (HA_MAX_KEY_LENGTH + 24+ 6+6)
diff --git a/databases/mysql56-client/files/patch-include_myisam.h b/databases/mysql56-client/files/patch-include_myisam.h
deleted file mode 100644
index 450645400dd5..000000000000
--- a/databases/mysql56-client/files/patch-include_myisam.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- include/myisam.h.orig	2009-02-16 23:04:54.000000000 +0100
-+++ include/myisam.h	2009-02-16 23:10:08.000000000 +0100
-@@ -48,7 +48,7 @@
-   The following defines can be increased if necessary.
-   But beware the dependency of MI_MAX_POSSIBLE_KEY_BUFF and MI_MAX_KEY_LENGTH.
- */
--#define MI_MAX_KEY_LENGTH           1000            /* Max length in bytes */
-+#define MI_MAX_KEY_LENGTH           4000            /* Max length in bytes */
- #define MI_MAX_KEY_SEG              16              /* Max segments for key */
- 
- #define MI_MAX_KEY_BUFF  (MI_MAX_KEY_LENGTH+MI_MAX_KEY_SEG*6+8+8)
diff --git a/databases/mysql56-client/files/patch-man_CMakeLists.txt b/databases/mysql56-client/files/patch-man_CMakeLists.txt
deleted file mode 100644
index 066b1e4252b0..000000000000
--- a/databases/mysql56-client/files/patch-man_CMakeLists.txt
+++ /dev/null
@@ -1,15 +0,0 @@
---- man/CMakeLists.txt.orig	2016-11-28 13:36:22 UTC
-+++ man/CMakeLists.txt
-@@ -14,11 +14,7 @@
- # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
- 
- # Copy man pages
--FILE(GLOB MAN1_FILES *.1)
--FILE(GLOB MAN1_EXCLUDE make_win_bin_dist.1)
--FILE(GLOB MAN1_NDB ndb*.1)
--FILE(GLOB MAN8_FILES *.8)
--FILE(GLOB MAN8_NDB ndb*.8)
-+FILE(GLOB MAN1_FILES comp_err.1 msql2mysql.1 mysql.1 mysql_config.1 mysql_config_editor.1 mysql_find_rows.1  mysql_waitpid.1 mysqlaccess.1 mysqladmin.1 mysqlbinlog.1  mysqlcheck.1 mysqldump.1 mysqlimport.1 mysqlshow.1 mysqlslap.1)
- IF(MAN1_FILES)
-   IF(MAN1_EXCLUDE)
-     LIST(REMOVE_ITEM MAN1_FILES ${MAN1_EXCLUDE})
diff --git a/databases/mysql56-client/files/patch-mysys__ssl_my__aes__openssl.cc b/databases/mysql56-client/files/patch-mysys__ssl_my__aes__openssl.cc
deleted file mode 100644
index 0d1dea6cf6cb..000000000000
--- a/databases/mysql56-client/files/patch-mysys__ssl_my__aes__openssl.cc
+++ /dev/null
@@ -1,74 +0,0 @@
---- mysys_ssl/my_aes_openssl.cc.orig	2019-11-26 16:53:45 UTC
-+++ mysys_ssl/my_aes_openssl.cc
-@@ -120,7 +120,7 @@ int my_aes_encrypt(const unsigned char *source, uint32
-                    const unsigned char *key, uint32 key_length,
-                    enum my_aes_opmode mode, const unsigned char *iv)
- {
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-   EVP_CIPHER_CTX stack_ctx;
-   EVP_CIPHER_CTX *ctx= &stack_ctx;
- #else /* OPENSSL_VERSION_NUMBER < 0x10100000L */
-@@ -135,7 +135,7 @@ int my_aes_encrypt(const unsigned char *source, uint32
-   if (!ctx || !cipher || (EVP_CIPHER_iv_length(cipher) > 0 && !iv))
-     return MY_AES_BAD_DATA;
- 
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-   EVP_CIPHER_CTX_init(ctx);
- #endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */
- 
-@@ -148,7 +148,7 @@ int my_aes_encrypt(const unsigned char *source, uint32
-   if (!EVP_EncryptFinal(ctx, dest + u_len, &f_len))
-     goto aes_error;                             /* Error */
- 
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-   EVP_CIPHER_CTX_cleanup(ctx);
- #else /* OPENSSL_VERSION_NUMBER < 0x10100000L */
-   EVP_CIPHER_CTX_free(ctx);
-@@ -158,7 +158,7 @@ int my_aes_encrypt(const unsigned char *source, uint32
- aes_error:
-   /* need to explicitly clean up the error if we want to ignore it */
-   ERR_clear_error();
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-   EVP_CIPHER_CTX_cleanup(ctx);
- #else /* OPENSSL_VERSION_NUMBER < 0x10100000L */
-   EVP_CIPHER_CTX_free(ctx);
-@@ -172,7 +172,7 @@ int my_aes_decrypt(const unsigned char *source, uint32
-                    const unsigned char *key, uint32 key_length,
-                    enum my_aes_opmode mode, const unsigned char *iv)
- {
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-   EVP_CIPHER_CTX stack_ctx;
-   EVP_CIPHER_CTX *ctx= &stack_ctx;
- #else /* OPENSSL_VERSION_NUMBER < 0x10100000L */
-@@ -188,7 +188,7 @@ int my_aes_decrypt(const unsigned char *source, uint32
-   if (!ctx || !cipher || (EVP_CIPHER_iv_length(cipher) > 0 && !iv))
-     return MY_AES_BAD_DATA;
- 
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-   EVP_CIPHER_CTX_init(ctx);
- #endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */
- 
-@@ -201,7 +201,7 @@ int my_aes_decrypt(const unsigned char *source, uint32
-   if (!EVP_DecryptFinal_ex(ctx, dest + u_len, &f_len))
-     goto aes_error;                             /* Error */
- 
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-   EVP_CIPHER_CTX_cleanup(ctx);
- #else /* OPENSSL_VERSION_NUMBER < 0x10100000L */
-   EVP_CIPHER_CTX_free(ctx);
-@@ -211,7 +211,7 @@ int my_aes_decrypt(const unsigned char *source, uint32
- aes_error:
-   /* need to explicitly clean up the error if we want to ignore it */
-   ERR_clear_error();
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-   EVP_CIPHER_CTX_cleanup(ctx);
- #else /* OPENSSL_VERSION_NUMBER < 0x10100000L */
-   EVP_CIPHER_CTX_free(ctx);
diff --git a/databases/mysql56-client/files/patch-mysys_ssl_my_default.cc b/databases/mysql56-client/files/patch-mysys_ssl_my_default.cc
deleted file mode 100644
index fa06468ce959..000000000000
--- a/databases/mysql56-client/files/patch-mysys_ssl_my_default.cc
+++ /dev/null
@@ -1,61 +0,0 @@
---- mysys_ssl/my_default.cc.orig	2016-11-28 13:36:22 UTC
-+++ mysys_ssl/my_default.cc
-@@ -110,7 +110,7 @@ static my_bool defaults_already_read= FA
- 
- /* Which directories are searched for options (and in which order) */
- 
--#define MAX_DEFAULT_DIRS 6
-+#define MAX_DEFAULT_DIRS 7
- #define DEFAULT_DIRS_SIZE (MAX_DEFAULT_DIRS + 1)  /* Terminate with NULL */
- static const char **default_directories = NULL;
- 
-@@ -903,6 +903,14 @@ static int search_default_file_with_ext(
-       return 1;                                 /* Ignore wrong files */
-   }
- 
-+  if (strstr(name, "/etc") == name)
-+  {
-+    fprintf(stderr,
-+             "error: Config file %s in invalid location, please move to or merge with /usr/local%s\n",
-+             name,name);
-+      goto err;
-+  }
-+
-   while (mysql_file_getline(buff, sizeof(buff) - 1, fp, is_login_file))
-   {
-     line++;
-@@ -1241,7 +1249,8 @@ void my_print_default_files(const char *
-             end[(strlen(end)-1)] = ' ';
-           else
-             strxmov(end, conf_file, *ext , " ",  NullS);
--          fputs(name, stdout);
-+          if (strstr(name, "/etc") != name)
-+            fputs(name, stdout);
-         }
-       }
-     }
-@@ -1400,13 +1409,8 @@ static const char **init_default_directo
- 
- #else
- 
--  errors += add_directory(alloc, "/etc/", dirs);
--  errors += add_directory(alloc, "/etc/mysql/", dirs);
--
--#if defined(DEFAULT_SYSCONFDIR)
--  if (DEFAULT_SYSCONFDIR[0])
--    errors += add_directory(alloc, DEFAULT_SYSCONFDIR, dirs);
--#endif /* DEFAULT_SYSCONFDIR */
-+  errors += add_directory(alloc, "/usr/local/etc/", dirs);
-+  errors += add_directory(alloc, "/usr/local/etc/mysql/", dirs);
- 
- #endif
- 
-@@ -1477,7 +1481,7 @@ int check_file_permissions(const char *f
-   MY_STAT stat_info;
- 
-   if (!my_stat(file_name,&stat_info,MYF(0)))
--    return 1;
-+    return 0;
-   /*
-     Ignore .mylogin.cnf file if not exclusively readable/writable
-     by current user.
diff --git a/databases/mysql56-client/files/patch-scripts_CMakeLists.txt b/databases/mysql56-client/files/patch-scripts_CMakeLists.txt
deleted file mode 100644
index 9d16479b0067..000000000000
--- a/databases/mysql56-client/files/patch-scripts_CMakeLists.txt
+++ /dev/null
@@ -1,93 +0,0 @@
---- scripts/CMakeLists.txt.orig	2016-11-28 13:36:22 UTC
-+++ scripts/CMakeLists.txt
-@@ -71,6 +71,7 @@ IF(UNIX)
- )
- ENDIF()
- 
-+IF(FALSE)
- INSTALL(FILES 
-   ${CMAKE_CURRENT_SOURCE_DIR}/mysql_system_tables.sql 
-   ${CMAKE_CURRENT_SOURCE_DIR}/mysql_system_tables_data.sql
-@@ -80,6 +81,7 @@ INSTALL(FILES 
-   ${FIX_PRIVILEGES_SQL}
-   DESTINATION ${INSTALL_MYSQLSHAREDIR} COMPONENT Server
- )
-+ENDIF()
- 
- # TCMalloc hacks
- IF(MALLOC_LIB)
-@@ -168,6 +170,7 @@ ENDIF()
- SET(HOSTNAME "hostname")
- SET(MYSQLD_USER "mysql")
- 
-+IF(FALSE)
- # Required for mysqlbug until autotools are deprecated, once done remove these
- # and expand default cmake variables
- SET(CC ${CMAKE_C_COMPILER})
-@@ -204,6 +207,7 @@ INSTALL_SCRIPT(${CMAKE_CURRENT_BINARY_DI
-   DESTINATION ${INSTALL_BINDIR}
-   COMPONENT Server
-   )
-+ENDIF()
- 
- ENDIF(UNIX)
- 
-@@ -228,6 +232,7 @@ ELSE()
-   SET(localstatedir ${MYSQL_DATADIR})
- ENDIF()
- 
-+IF(FALSE)
- IF(UNIX)
-   SET(EXT)
- ELSE()
-@@ -242,6 +247,7 @@ INSTALL_SCRIPT(
-   DESTINATION ${DEST}
-   COMPONENT Server
-   )
-+ENDIF()
- 
- SET(prefix "${CMAKE_INSTALL_PREFIX}")
- SET(sysconfdir ${prefix})
-@@ -298,6 +304,8 @@ MACRO(EXTRACT_LINK_LIBRARIES target var)
-           GET_FILENAME_COMPONENT(lib "${lib}" NAME_WE)
-           STRING(REGEX REPLACE "^lib" "" lib "${lib}")
-           SET(${var} "${${var}}-l${lib} " ) 
-+        ELSEIF(lib STREQUAL "-pthread")
-+          SET(${var} "${${var}}-pthread " ) 
-         ELSE()
-           SET(${var} "${${var}}-l${lib} " ) 
-         ENDIF()
-@@ -353,17 +361,9 @@ ELSE()
-   SET(BIN_SCRIPTS
-     msql2mysql
-     mysql_config
--    mysql_fix_extensions
--    mysql_setpermission
--    mysql_zap
-     mysqlaccess
-     mysqlaccess.conf
--    mysql_convert_table_format
-     mysql_find_rows
--    mysqlhotcopy
--    mysqldumpslow
--    mysqld_multi
--    mysqld_safe
-   )
-   FOREACH(file ${BIN_SCRIPTS})
-     IF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh)
-@@ -387,6 +387,7 @@ ELSE()
-      )
-   ENDFOREACH()
- 
-+IF(FALSE)
-   # Input files with pl.in extension - drop the extension completely
-   SET(PLIN_FILES mysql_secure_installation)
-   FOREACH(file ${PLIN_FILES})
-@@ -399,6 +400,7 @@ ELSE()
-     INSTALL_SCRIPT(${CMAKE_CURRENT_BINARY_DIR}/${file} COMPONENT ${${file}_COMPONENT})
-   ENDFOREACH()
- ENDIF()
-+ENDIF()
- 
- # Install libgcc as  mylibgcc.a
- IF(CMAKE_COMPILER_IS_GNUCXX AND CMAKE_CXX_FLAGS MATCHES "-static")
diff --git a/databases/mysql56-client/files/patch-sql-common_client.c b/databases/mysql56-client/files/patch-sql-common_client.c
deleted file mode 100644
index cfc168b75a53..000000000000
--- a/databases/mysql56-client/files/patch-sql-common_client.c
+++ /dev/null
@@ -1,15 +0,0 @@
---- sql-common/client.c.orig	2019-11-26 16:53:45 UTC
-+++ sql-common/client.c
-@@ -1980,7 +1980,11 @@ static int ssl_verify_server_cert(Vio *vio, const char
-     goto error;
-   }
- 
--  cn= (char *) ASN1_STRING_data(cn_asn1);
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-+  cn= (const char *) ASN1_STRING_data(cn_asn1);
-+#else
-+  cn= (const char *) ASN1_STRING_get0_data(cn_asn1);
-+#endif
- 
-   // There should not be any NULL embedded in the CN
-   if ((size_t)ASN1_STRING_length(cn_asn1) != strlen(cn))
diff --git a/databases/mysql56-client/files/patch-sql_mysqld.cc b/databases/mysql56-client/files/patch-sql_mysqld.cc
deleted file mode 100644
index debee80ea2ce..000000000000
--- a/databases/mysql56-client/files/patch-sql_mysqld.cc
+++ /dev/null
@@ -1,65 +0,0 @@
---- sql/mysqld.cc.orig	2019-11-26 16:53:45 UTC
-+++ sql/mysqld.cc
-@@ -1258,7 +1258,7 @@ char *opt_ssl_ca= NULL, *opt_ssl_capath= NULL, *opt_ss
-      *opt_ssl_crlpath= NULL;
- 
- #ifdef HAVE_OPENSSL
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- #include <openssl/crypto.h>
- typedef struct CRYPTO_dynlock_value
- {
-@@ -2029,7 +2029,7 @@ static void clean_up_mutexes()
-   mysql_mutex_destroy(&LOCK_connection_count);
- #ifdef HAVE_OPENSSL
-   mysql_mutex_destroy(&LOCK_des_key_file);
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-   for (int i= 0; i < CRYPTO_num_locks(); ++i)
-     mysql_rwlock_destroy(&openssl_stdlocks[i].lock);
-   OPENSSL_free(openssl_stdlocks);
-@@ -2768,7 +2768,7 @@ bool one_thread_per_connection_end(THD *thd, bool bloc
- 
-   // Clean up errors now, before possibly waiting for a new connection.
- #ifndef EMBEDDED_LIBRARY
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-   ERR_remove_thread_state(0);
- #endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */
- #endif
-@@ -4252,7 +4252,7 @@ static int init_thread_environment()
- #ifdef HAVE_OPENSSL
-   mysql_mutex_init(key_LOCK_des_key_file,
-                    &LOCK_des_key_file, MY_MUTEX_INIT_FAST);
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-   openssl_stdlocks= (openssl_lock_t*) OPENSSL_malloc(CRYPTO_num_locks() *
-                                                      sizeof(openssl_lock_t));
-   for (int i= 0; i < CRYPTO_num_locks(); ++i)
-@@ -4301,7 +4301,7 @@ static int init_thread_environment()
-   OpenSSL 1.1 supports native platform threads,
-   so we don't need the following callback functions.
- */
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- 
- static unsigned long openssl_id_function()
- {
-@@ -4375,7 +4375,7 @@ static void openssl_lock(int mode, openssl_lock_t *loc
- static int init_ssl()
- {
- #ifdef HAVE_OPENSSL
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-   CRYPTO_malloc_init();
- #else /* OPENSSL_VERSION_NUMBER < 0x10100000L */
-   OPENSSL_malloc_init();
-@@ -4392,7 +4392,7 @@ static int init_ssl()
- 					  opt_ssl_cipher, &error,
-                                           opt_ssl_crl, opt_ssl_crlpath);
-     DBUG_PRINT("info",("ssl_acceptor_fd: 0x%lx", (long) ssl_acceptor_fd));
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-     ERR_remove_thread_state(0);
- #endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */
-     if (!ssl_acceptor_fd)
diff --git a/databases/mysql56-client/files/patch-support-files_CMakeLists.txt b/databases/mysql56-client/files/patch-support-files_CMakeLists.txt
deleted file mode 100644
index eb31e58fb36d..000000000000
--- a/databases/mysql56-client/files/patch-support-files_CMakeLists.txt
+++ /dev/null
@@ -1,40 +0,0 @@
---- support-files/CMakeLists.txt.orig	2017-03-18 06:43:12 UTC
-+++ support-files/CMakeLists.txt
-@@ -44,11 +44,13 @@ ELSE()
-   SET(inst_location ${INSTALL_SUPPORTFILESDIR})
- ENDIF()
- 
-+IF(FALSE)
- SET(inifile my-default)
- CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${inifile}.cnf.sh 
-                ${CMAKE_CURRENT_BINARY_DIR}/${inifile}.${ini_file_extension} @ONLY)
- INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${inifile}.${ini_file_extension}
-         DESTINATION ${inst_location} COMPONENT IniFiles)
-+ENDIF()
- 
- IF(UNIX)
-   IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
-@@ -57,6 +59,7 @@ IF(UNIX)
-     SET (PIDOF "pgrep -d' ' -f")
-   ENDIF()
-   SET(prefix ${CMAKE_INSTALL_PREFIX})
-+IF(FALSE)
-   FOREACH(script  mysqld_multi.server mysql-log-rotate binary-configure)
-     CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${script}.sh 
-                    ${CMAKE_CURRENT_BINARY_DIR}/${script} @ONLY )
-@@ -73,8 +76,10 @@ IF(UNIX)
-   IF(INSTALL_SUPPORTFILESDIR)
-     INSTALL(FILES magic DESTINATION ${inst_location} COMPONENT SupportFiles)
-   ENDIF()
-+ENDIF()
- 
-   INSTALL(FILES mysql.m4 DESTINATION ${INSTALL_SHAREDIR}/aclocal COMPONENT Development)
-+IF(FALSE)
-   CONFIGURE_FILE(MySQL-shared-compat.spec.sh ${CMAKE_CURRENT_BINARY_DIR}/MySQL-shared-compat.spec @ONLY)
-   CONFIGURE_FILE(mysql.spec.sh ${CMAKE_CURRENT_BINARY_DIR}/mysql.spec @ONLY)
-   
-@@ -99,3 +104,4 @@ IF(UNIX)
-     PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ 
-     GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
- ENDIF()
-+ENDIF()
diff --git a/databases/mysql56-client/files/patch-vio_vio.c b/databases/mysql56-client/files/patch-vio_vio.c
deleted file mode 100644
index 042c4d65e8f2..000000000000
--- a/databases/mysql56-client/files/patch-vio_vio.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- vio/vio.c.orig	2019-11-26 16:53:45 UTC
-+++ vio/vio.c
-@@ -394,7 +394,7 @@ void vio_end(void)
- {
- #if defined(HAVE_OPENSSL)
-   // This one is needed on the client side
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-   ERR_remove_thread_state(0);
- #endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */
-   ERR_free_strings();
diff --git a/databases/mysql56-client/files/patch-vio_viossl.c b/databases/mysql56-client/files/patch-vio_viossl.c
deleted file mode 100644
index 54a6280525fc..000000000000
--- a/databases/mysql56-client/files/patch-vio_viossl.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- vio/viossl.c.orig	2019-11-26 16:53:45 UTC
-+++ vio/viossl.c
-@@ -385,7 +385,7 @@ static int ssl_do(struct st_VioSSLFd *ptr, Vio *vio,
-   DBUG_PRINT("info", ("ssl: 0x%lx timeout: %ld", (long) ssl, timeout));
-   SSL_clear(ssl);
-   SSL_set_fd(ssl, sd);
--#if defined(SSL_OP_NO_COMPRESSION)
-+#if defined(SSL_OP_NO_COMPRESSION) && !defined(LIBRESSL_VERSION_NUMBER)
-   SSL_set_options(ssl, SSL_OP_NO_COMPRESSION); /* OpenSSL >= 1.0 only */
- #elif OPENSSL_VERSION_NUMBER >= 0x00908000L /* workaround for OpenSSL 0.9.8 */
-   sk_SSL_COMP_zero(SSL_COMP_get_compression_methods());
-@@ -403,7 +403,7 @@ static int ssl_do(struct st_VioSSLFd *ptr, Vio *vio,
-       for (j = 0; j < n; j++)
-       {
-         SSL_COMP *c = sk_SSL_COMP_value(ssl_comp_methods, j);
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-         DBUG_PRINT("info", ("  %d: %s\n", c->id, c->name));
- #else /* OPENSSL_VERSION_NUMBER < 0x10100000L */
-         DBUG_PRINT("info", ("  %d: %s\n", SSL_COMP_get_id(c), SSL_COMP_get0_name(c)));
diff --git a/databases/mysql56-client/files/patch-vio_viosslfactories.c b/databases/mysql56-client/files/patch-vio_viosslfactories.c
deleted file mode 100644
index dd1293395898..000000000000
--- a/databases/mysql56-client/files/patch-vio_viosslfactories.c
+++ /dev/null
@@ -1,38 +0,0 @@
---- vio/viosslfactories.c.orig	2019-11-26 16:53:45 UTC
-+++ vio/viosslfactories.c
-@@ -91,7 +91,7 @@ static DH *get_dh2048(void)
-       DH_free(dh);
-       return NULL;
-     }
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-     dh->p= p;
-     dh->g= g;
- #endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */
-@@ -226,7 +226,7 @@ new_VioSSLFd(const char *key_file, const char *cert_fi
-   struct st_VioSSLFd *ssl_fd;
-   /* MySQL 5.6 supports TLS up to v1.2, explicitly disable TLSv1.3. */
-   long ssl_ctx_options= SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3 |
--#ifdef HAVE_TLSv13
-+#if defined(HAVE_TLSv13) && !defined(LIBRESSL_VERSION_NUMBER)
-                         SSL_OP_NO_TLSv1_3 |
- #endif /* HAVE_TLSv13 */
-                         SSL_OP_NO_TICKET;
-@@ -250,7 +250,7 @@ new_VioSSLFd(const char *key_file, const char *cert_fi
-     DBUG_RETURN(0);
- 
-   if (!(ssl_fd->ssl_context= SSL_CTX_new(is_client ?
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-                                          SSLv23_client_method() :
-                                          SSLv23_server_method()
- #else /* OPENSSL_VERSION_NUMBER < 0x10100000L */
-@@ -268,7 +268,7 @@ new_VioSSLFd(const char *key_file, const char *cert_fi
- 
-   SSL_CTX_set_options(ssl_fd->ssl_context, ssl_ctx_options);
- 
--#ifdef HAVE_TLSv13
-+#if defined(HAVE_TLSv13) && !defined(LIBRESSL_VERSION_NUMBER)
-   /*
-     MySQL 5.6 doesn't support TLSv1.3 - set empty TLSv1.3 ciphersuites.
-   */
diff --git a/databases/mysql56-client/pkg-message b/databases/mysql56-client/pkg-message
deleted file mode 100644
index a71ac478bbf5..000000000000
--- a/databases/mysql56-client/pkg-message
+++ /dev/null
@@ -1,16 +0,0 @@
-[
-{ type: install
-  message: <<EOM
-Please be aware the database client is vulnerable
-to CVE-2015-3152 - SSL Downgrade aka "BACKRONYM".
-You may find more information at the following URL:
-
-http://www.vuxml.org/freebsd/36bd352d-299b-11e5-86ff-14dae9d210b8.html
-
-Although this database client is not listed as
-"affected", it is vulnerable and will not be
-receiving a patch. Please take note of this when
-deploying this software.
-EOM
-}
-]
diff --git a/databases/mysql56-client/pkg-plist b/databases/mysql56-client/pkg-plist
deleted file mode 100644
index d890a7d2a08f..000000000000
--- a/databases/mysql56-client/pkg-plist
+++ /dev/null
@@ -1,111 +0,0 @@
-bin/msql2mysql
-bin/mysql
-bin/mysql_config
-bin/mysql_config_editor
-bin/mysql_find_rows
-bin/mysql_waitpid
-bin/mysqlaccess
-bin/mysqlaccess.conf
-bin/mysqladmin
-bin/mysqlbinlog
-bin/mysqlcheck
-bin/mysqldump
-bin/mysqlimport
-bin/mysqlshow
-bin/mysqlslap
-include/mysql/big_endian.h
-include/mysql/byte_order_generic.h
-include/mysql/byte_order_generic_x86.h
-include/mysql/byte_order_generic_x86_64.h
-include/mysql/decimal.h
-include/mysql/errmsg.h
-include/mysql/hash.h
-include/mysql/keycache.h
-include/mysql/little_endian.h
-include/mysql/m_ctype.h
-include/mysql/m_string.h
-include/mysql/my_alloc.h
-include/mysql/my_attribute.h
-include/mysql/my_byteorder.h
-include/mysql/my_compiler.h
-include/mysql/my_config.h
-include/mysql/my_dbug.h
-include/mysql/my_dir.h
-include/mysql/my_getopt.h
-include/mysql/my_global.h
-include/mysql/my_list.h
-include/mysql/my_net.h
-include/mysql/my_pthread.h
-include/mysql/my_sys.h
-include/mysql/my_xml.h
-include/mysql/mysql.h
-include/mysql/mysql/client_authentication.h
-include/mysql/mysql/client_plugin.h
-include/mysql/mysql/client_plugin.h.pp
-include/mysql/mysql/get_password.h
-include/mysql/mysql/innodb_priv.h
-include/mysql/mysql/plugin.h
-include/mysql/mysql/plugin_audit.h
-include/mysql/mysql/plugin_audit.h.pp
-include/mysql/mysql/plugin_auth.h
-include/mysql/mysql/plugin_auth.h.pp
-include/mysql/mysql/plugin_auth_common.h
-include/mysql/mysql/plugin_ftparser.h
-include/mysql/mysql/plugin_ftparser.h.pp
-include/mysql/mysql/plugin_validate_password.h
-include/mysql/mysql/psi/mysql_file.h
-include/mysql/mysql/psi/mysql_idle.h
-include/mysql/mysql/psi/mysql_socket.h
-include/mysql/mysql/psi/mysql_stage.h
-include/mysql/mysql/psi/mysql_statement.h
-include/mysql/mysql/psi/mysql_table.h
-include/mysql/mysql/psi/mysql_thread.h
-include/mysql/mysql/psi/psi.h
-include/mysql/mysql/service_my_plugin_log.h
-include/mysql/mysql/service_my_snprintf.h
-include/mysql/mysql/service_mysql_string.h
-include/mysql/mysql/service_thd_alloc.h
-include/mysql/mysql/service_thd_wait.h
-include/mysql/mysql/service_thread_scheduler.h
-include/mysql/mysql/services.h
-include/mysql/mysql/thread_pool_priv.h
-include/mysql/mysql_com.h
-include/mysql/mysql_com_server.h
-include/mysql/mysql_embed.h
-include/mysql/mysql_time.h
-include/mysql/mysql_version.h
-include/mysql/mysqld_ername.h
-include/mysql/mysqld_error.h
-include/mysql/plugin.h
-include/mysql/plugin_audit.h
-include/mysql/plugin_ftparser.h
-include/mysql/plugin_validate_password.h
-include/mysql/sql_common.h
-include/mysql/sql_state.h
-include/mysql/sslopt-case.h
-include/mysql/sslopt-longopts.h
-include/mysql/sslopt-vars.h
-include/mysql/typelib.h
-lib/mysql/libmysqlclient.a
-lib/mysql/libmysqlclient.so
-lib/mysql/libmysqlclient.so.18
-lib/mysql/libmysqlclient_r.a
-lib/mysql/libmysqlclient_r.so
-lib/mysql/libmysqlclient_r.so.18
-lib/mysql/libmysqlservices.a
-man/man1/comp_err.1.gz
-man/man1/msql2mysql.1.gz
-man/man1/mysql.1.gz
-man/man1/mysql_config.1.gz
-man/man1/mysql_config_editor.1.gz
-man/man1/mysql_find_rows.1.gz
-man/man1/mysql_waitpid.1.gz
-man/man1/mysqlaccess.1.gz
-man/man1/mysqladmin.1.gz
-man/man1/mysqlbinlog.1.gz
-man/man1/mysqlcheck.1.gz
-man/man1/mysqldump.1.gz
-man/man1/mysqlimport.1.gz
-man/man1/mysqlshow.1.gz
-man/man1/mysqlslap.1.gz
-share/aclocal/mysql.m4
diff --git a/databases/mysql56-server/Makefile b/databases/mysql56-server/Makefile
deleted file mode 100644
index 1805470ec640..000000000000
--- a/databases/mysql56-server/Makefile
+++ /dev/null
@@ -1,173 +0,0 @@
-# Created by: Alex Dupre <ale@FreeBSD.org>
-
-PORTNAME?=	mysql
-PORTVERSION=	5.6.51
-PORTREVISION?=	0
-CATEGORIES=	databases
-MASTER_SITES=	MYSQL/MySQL-5.6
-PKGNAMESUFFIX?=	56-server
-
-MAINTAINER=	joneum@FreeBSD.org
-COMMENT?=	Multithreaded SQL database (server)
-
-LICENSE=	GPLv2
-
-BROKEN_armv6=	qemu: uncaught target signal 11 (Segmentation fault) - core dumped
-
-SLAVEDIRS=	databases/mysql56-client
-USES=		bison:build cmake:noninja cpe groff:run libedit localbase \
-		perl5 shebangfix ssl
-
-CPE_VENDOR=	oracle
-
-USE_PERL5=	run
-
-MY_DBDIR=	/var/db/mysql
-MY_SECDIR=	/var/db/mysql_secure
-MY_TMPDIR=	/var/db/mysql_tmpdir
-
-LIB_DEPENDS+=	libevent.so:devel/libevent \
-		liblz4.so:archivers/liblz4
-
-CMAKE_BUILD_TYPE=	Release
-
-CMAKE_ARGS+=	-DINSTALL_LAYOUT=FREEBSD \
-		-DINSTALL_LDCONFIGDIR="${LOCALBASE}/libdata/ldconfig" \
-		-DINSTALL_PKGCONFIGDIR="${LOCALBASE}/libdata/pkgconfig" \
-		-DINSTALL_DOCDIR="share/doc/mysql" \
-		-DINSTALL_DOCREADMEDIR="share/doc/mysql" \
-		-DINSTALL_INCLUDEDIR="include/mysql" \
-		-DINSTALL_INFODIR="${INFO_PATH}" \
-		-DINSTALL_LIBDIR="lib/mysql" \
-		-DINSTALL_MANDIR="man" \
-		-DINSTALL_MYSQLDATADIR="${MY_DBDIR}" \
-		-DINSTALL_MYSQLKEYRINGDIR="etc/mysql/keyring" \
-		-DINSTALL_MYSQLSHAREDIR="share/mysql" \
-		-DINSTALL_MYSQLTESTDIR="share/mysql/tests" \
-		-DINSTALL_PLUGINDIR="lib/mysql/plugin" \
-		-DINSTALL_SBINDIR="libexec" \
-		-DINSTALL_SCRIPTDIR="bin" \
-		-DINSTALL_SECURE_FILE_PRIVDIR="${MY_SECDIR}" \
-		-DINSTALL_SHAREDIR="share" \
-		-DINSTALL_SQLBENCHDIR="share/mysql" \
-		-DINSTALL_SUPPORTFILESDIR="share/mysql" \
-		-DMYSQL_KEYRINGDIR="${ETCDIR}/keyring" \
-		-DWITH_BOOST="${WRKSRC}/boost" \
-		-DWITH_EDITLINE=system \
-		-DWITH_LIBEVENT=system \
-		-DWITH_LZ4=system \
-		-DWITH_ZLIB=system \
-		-DWITH_SSL=${OPENSSLBASE} \
-		-DCRYPTO_LIBRARY=${OPENSSLLIB}/libcrypto.so \
-		-DOPENSSL_LIBRARY=${OPENSSLLIB}/libssl.so \
-		-DINSTALL_MYSQLTESTDIR=0
-
-SHEBANG_FILES=	scripts/*.pl* scripts/*.sh
-
-.ifdef USE_MYSQL
-.error You have `USE_MYSQL' variable defined either in environment or in make(1) arguments. Please undefine and try again.
-.endif
-
-SUB_LIST=	MY_DBDIR=${MY_DBDIR} \
-		MY_SECDIR=${MY_SECDIR} \
-		MY_TMPDIR=${MY_TMPDIR}
-
-PLIST_SUB=	MY_DBDIR=${MY_DBDIR} \
-		MY_SECDIR=${MY_SECDIR} \
-		MY_TMPDIR=${MY_TMPDIR}
-
-# MySQL-Server part
-.if !defined(CLIENT_ONLY)
-USES+=		mysql:56
-
-CONFLICTS_INSTALL=	mysql5[0-57-9]-server-* \
-			mysql[0-46-9][0-9]-server-* \
-			mysqlwsrep* \
-			mariadb[0-9][0-9]-server-* \
-			percona[0-9][0-9]-server-*
-
-USE_RC_SUBR=	mysql-server
-
-SUB_FILES=	my.cnf.sample pkg-message
-
-USERS=		mysql
-GROUPS=		mysql
-
-USE_LDCONFIG+=	${PREFIX}/lib/mysql/plugin
-
-MMAN1=		my_print_defaults.1 myisam_ftdump.1 myisamchk.1 myisamlog.1 myisampack.1 \
-		mysql.server.1 mysql_convert_table_format.1 mysql_fix_extensions.1 \
-		mysql_install_db.1 mysql_plugin.1 mysql_secure_installation.1 mysql_setpermission.1 \
-		mysql_tzinfo_to_sql.1 mysql_upgrade.1 mysql_zap.1 mysqlbug.1 \
-		mysqld_multi.1 mysqld_safe.1 mysqldumpslow.1 mysqlhotcopy.1 mysqlman.1 \
-		mysqltest.1 perror.1 replace.1 resolve_stack_dump.1 resolveip.1
-
-CMAKE_ARGS+=	-DWITH_EMBEDDED_SERVER="ON"
-
-OPTIONS_GROUP=		STORAGE
-OPTIONS_GROUP_STORAGE=	ARCHIVE BLACKHOLE EXAMPLE FEDERATED INNOBASE PARTITION PERFSCHEMA
-OPTIONS_SUB=		YES
-STORAGE_DESC=		Permissible "Storage Engines" (to compile statically into the server)
-ARCHIVE_DESC=		Compile "Archive Storage" statically in server
-BLACKHOLE_DESC=		Compile "Blackhole Storage" statically in server
-EXAMPLE_DESC=		Compile "Example Storage" statically in server
-FEDERATED_DESC=		Compile "Federated Storage" statically in server
-INNOBASE_DESC=		Compile "InnoDB Storage" statically in server
-PARTITION_DESC=		Compile "Partitioning support Storage" statically in server
-PERFSCHEMA_DESC=	Compile "Performance Schema Storage" statically in server
-
-ARCHIVE_CMAKE_ON=	-DWITH_ARCHIVE_STORAGE_ENGINE=1
-BLACKHOLE_CMAKE_ON=	-DWITH_BLACKHOLE_STORAGE_ENGINE=1
-EXAMPLE_CMAKE_ON=	-DWITH_EXAMPLE_STORAGE_ENGINE=1
-FEDERATED_CMAKE_ON=	-DWITH_FEDERATED_STORAGE_ENGINE=1
-INNOBASE_CMAKE_ON=	-DWITH_INNOBASE_STORAGE_ENGINE=1
-PARTITION_CMAKE_ON=	-DWITH_PARTITION_STORAGE_ENGINE=1
-PERFSCHEMA_CMAKE_ON=	-DWITH_PERFSCHEMA_STORAGE_ENGINE=1
-
-OPTIONS_GROUP+=		FEATURES
-OPTIONS_GROUP_FEATURES=	PERFSCHM
-FEATURES_DESC=		Default features knobs
-PERFSCHM_DESC=		Enable "Performance Schema" by default (High RAM usage)
-OPTIONS_DEFAULT+=	PERFSCHM
-
-PERFSCHM_SUB_LIST+=		PERFSCHEMRC=""
-PERFSCHM_SUB_LIST_OFF+=		PERFSCHEMRC="--skip-performance-schema"
-FEDERATED_SUB_LIST+=		FEDER="--federated"
-FEDERATED_SUB_LIST_OFF+=	FEDER=""
-.endif
-
-.include <bsd.port.options.mk>
-
-.if defined(PPC_ABI) && ${PPC_ABI} == ELFv2
-USES+=		compiler:gcc-c++11-lib
-USE_CXXSTD=	gnu++11
-.else
-USES+=		compiler:c++11-lib
-USE_CXXSTD=	c++11
-.endif
-
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1200057
-SUB_LIST+=	LEGACY_LIMITS="@comment " MODERN_LIMITS=""
-.else
-SUB_LIST+=	LEGACY_LIMITS="" MODERN_LIMITS="@comment "
-.endif
-
-.include <bsd.port.pre.mk>
-
-post-patch:
-	@${REINPLACE_CMD} 's/*.1/${MMAN1}/' ${WRKSRC}/man/CMakeLists.txt
-
-.if !defined(CLIENT_ONLY)
-post-install:
-	${MKDIR} ${STAGEDIR}${ETCDIR}
-	${INSTALL_DATA} ${WRKDIR}/my.cnf.sample ${STAGEDIR}${ETCDIR}/my.cnf.sample
-	${MKDIR} ${STAGEDIR}${ETCDIR}/keyring
-	${MKDIR} ${STAGEDIR}${MY_SECDIR}
-	${MKDIR} ${STAGEDIR}${MY_TMPDIR}
-.endif
-
-.if ${ARCH} == armv6 || ${ARCH} == armv7
-EXTRA_PATCHES+=		${FILESDIR}/extra-patch-config.h.cmake
-.endif
-
-.include <bsd.port.post.mk>
diff --git a/databases/mysql56-server/distinfo b/databases/mysql56-server/distinfo
deleted file mode 100644
index c5be53f998dc..000000000000
--- a/databases/mysql56-server/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1611992804
-SHA256 (mysql-5.6.51.tar.gz) = 262ccaf2930fca1f33787505dd125a7a04844f40d3421289a51974b5935d9abc
-SIZE (mysql-5.6.51.tar.gz) = 32411131
diff --git a/databases/mysql56-server/files/extra-patch-config.h.cmake b/databases/mysql56-server/files/extra-patch-config.h.cmake
deleted file mode 100644
index 3ac1add1b9ce..000000000000
--- a/databases/mysql56-server/files/extra-patch-config.h.cmake
+++ /dev/null
@@ -1,12 +0,0 @@
---- config.h.cmake.orig	2014-12-05 16:24:02 UTC
-+++ config.h.cmake
-@@ -151,7 +151,8 @@
- #cmakedefine HAVE_FESETROUND 1
- #cmakedefine HAVE_FINITE 1
- #cmakedefine HAVE_FP_EXCEPT 1
--#cmakedefine HAVE_FPSETMASK 1
-+#cmakedefine HAVE_FPSETMASK 0
-+#cmakedefine HAVE_FEDISABLEEXCEPT 1
- #cmakedefine HAVE_FSEEKO 1
- #cmakedefine HAVE_FSYNC 1
- #cmakedefine HAVE_FTIME 1
diff --git a/databases/mysql56-server/files/my.cnf.sample.in b/databases/mysql56-server/files/my.cnf.sample.in
deleted file mode 100644
index 5d8056748079..000000000000
--- a/databases/mysql56-server/files/my.cnf.sample.in
+++ /dev/null
@@ -1,61 +0,0 @@
-[client]
-port                            = 3306
-socket                          = /tmp/mysql.sock
-
-[mysql]
-prompt                          = \u@\h [\d]>\_
-no_auto_rehash
-
-[mysqld]
-user                            = mysql
-port                            = 3306
-socket                          = /tmp/mysql.sock
-bind-address                    = 127.0.0.1
-basedir                         = %%PREFIX%%
-datadir                         = %%MY_DBDIR%%
-tmpdir                          = %%MY_TMPDIR%%
-slave-load-tmpdir               = %%MY_TMPDIR%%
-secure-file-priv                = %%MY_SECDIR%%
-log-bin                         = mysql-bin
-log-output                      = TABLE
-master-info-repository          = TABLE
-relay-log-info-repository       = TABLE
-relay-log-recovery              = 1
-slow-query-log                  = 1
-server-id                       = 1
-sync_binlog                     = 1
-sync_relay_log                  = 1
-binlog_cache_size               = 16M
-expire_logs_days                = 30
-log-slave-updates               = 1
-enforce-gtid-consistency        = 1
-gtid-mode                       = ON
-safe-user-create                = 1
-lower_case_table_names          = 1
-explicit-defaults-for-timestamp = 1
-myisam-recover-options          = BACKUP,FORCE
-open_files_limit                = 32768
-table_open_cache                = 16384
-table_definition_cache          = 8192
-net_retry_count                 = 16384
-key_buffer_size                 = 256M
-max_allowed_packet              = 64M
-query_cache_type                = 0
-query_cache_size                = 0
-long_query_time                 = 0.5
-innodb_buffer_pool_size         = 1G
-innodb_data_home_dir            = %%MY_DBDIR%%
-innodb_log_group_home_dir       = %%MY_DBDIR%%
-innodb_data_file_path           = ibdata1:128M:autoextend
-innodb_flush_method             = O_DIRECT
-innodb_log_file_size            = 256M
-innodb_log_buffer_size          = 16M
-innodb_write_io_threads         = 8
-innodb_read_io_threads          = 8
-innodb_autoinc_lock_mode        = 2
-skip-symbolic-links
-
-[mysqldump]
-max_allowed_packet              = 256M
-quote_names
-quick
diff --git a/databases/mysql56-server/files/mysql-server.in b/databases/mysql56-server/files/mysql-server.in
deleted file mode 100644
index cf0a501c6f46..000000000000
--- a/databases/mysql56-server/files/mysql-server.in
+++ /dev/null
@@ -1,89 +0,0 @@
-#!/bin/sh
-
-# PROVIDE: mysql
-# REQUIRE: LOGIN
-# KEYWORD: shutdown
-
-#
-# Add the following line to /etc/rc.conf to enable mysql:
-# mysql_enable (bool):	Set to "NO" by default.
-#			Set it to "YES" to enable MySQL.
-%%LEGACY_LIMITS%%# mysql_limits (bool):	Set to "NO" by default.
-%%LEGACY_LIMITS%%#			Set it to yes to run `limits -e -U mysql`
-%%LEGACY_LIMITS%%#			just before mysql starts.
-# mysql_dbdir (str):	Default to "%%MY_DBDIR%%"
-#			Base database directory.
-# mysql_confdir (str):	Default to "%%ETCDIR%%"
-#			Base configuration directory.
-# mysql_optfile (str):	Server-specific option file.
-#			Set it in the rc.conf or default behaviour of
-#			`mysqld_safe` itself, will be picking
-#			${mysql_confdir}/my.cnf if it exists.
-# mysql_pidfile (str):	Custum PID file path and name.
-#			Default to "${mysql_dbdir}/${hostname}.pid".
-# mysql_args (str):	Custom additional arguments to be passed
-#			to mysqld_safe (default empty).
-#
-
-. /etc/rc.subr
-
-name="mysql"
-rcvar=mysql_enable
-
-load_rc_config $name
-
-: ${mysql_enable="NO"}
-%%LEGACY_LIMITS%%: ${mysql_limits="NO"}
-: ${mysql_dbdir="%%MY_DBDIR%%"}
-: ${mysql_confdir="%%ETCDIR%%"}
-if [ -f "${mysql_confdir}/my.cnf" ]; then
-: ${mysql_optfile="${mysql_confdir}/my.cnf"}
-elif [ -f "${mysql_dbdir}/my.cnf" ]; then
-: ${mysql_optfile="${mysql_dbdir}/my.cnf"}
-fi
-if [ ! -z "${mysql_optfile}" ]; then
-mysql_extra="--defaults-extra-file=${mysql_optfile}"
-fi
-
-mysql_user="mysql"
-%%LEGACY_LIMITS%%mysql_limits_args="-e -U ${mysql_user}"
-: ${hostname:=`/bin/hostname`}
-pidfile=${mysql_pidfile:-"${mysql_dbdir}/${hostname}.pid"}
-command="/usr/sbin/daemon"
-command_args="-c -f %%PREFIX%%/bin/mysqld_safe ${mysql_extra} --basedir=%%PREFIX%% --datadir=${mysql_dbdir} --pid-file=${pidfile} --user=${mysql_user} ${mysql_args} %%FEDER%% %%PERFSCHEMRC%%"
-procname="%%PREFIX%%/libexec/mysqld"
-start_precmd="${name}_prestart"
-start_postcmd="${name}_poststart"
-mysql_install_db="%%PREFIX%%/bin/mysql_install_db"
-mysql_install_db_args="${mysql_extra} --basedir=%%PREFIX%% --datadir=${mysql_dbdir} --force"
-
-mysql_create_auth_tables()
-{
-	eval $mysql_install_db $mysql_install_db_args >/dev/null 2>/dev/null
-        [ $? -eq 0 ] && chown -R ${mysql_user}:${mysql_user} ${mysql_dbdir}
-}
-
-mysql_prestart()
-{
-	if [ ! -d "${mysql_dbdir}/mysql/." ]; then
-		mysql_create_auth_tables || return 1
-	fi
-%%LEGACY_LIMITS%%	if checkyesno mysql_limits; then
-%%LEGACY_LIMITS%%		eval `/usr/bin/limits ${mysql_limits_args}` 2>/dev/null
-%%LEGACY_LIMITS%%	else
-%%LEGACY_LIMITS%%		return 0
-%%LEGACY_LIMITS%%	fi
-%%MODERN_LIMITS%%	return 0
-}
-
-mysql_poststart()
-{
-	local timeout=15
-	while [ ! -f "${pidfile}" -a ${timeout} -gt 0 ]; do
-		timeout=$(( timeout - 1 ))
-		sleep 1
-	done
-	return 0
-}
-
-run_rc_command "$1"
diff --git a/databases/mysql56-server/files/patch-CMakeLists.txt b/databases/mysql56-server/files/patch-CMakeLists.txt
deleted file mode 100644
index 23cca022fbb1..000000000000
--- a/databases/mysql56-server/files/patch-CMakeLists.txt
+++ /dev/null
@@ -1,42 +0,0 @@
---- CMakeLists.txt.orig	2020-01-01 20:46:13.771078000 +0100
-+++ CMakeLists.txt	2020-01-01 20:49:28.631677000 +0100
-@@ -558,12 +558,10 @@ IF(UNIX)
- ENDIF()
- 
- IF(NOT WITHOUT_SERVER)
--  ADD_SUBDIRECTORY(tests)
-   ADD_SUBDIRECTORY(sql)
-   OPTION (WITH_EMBEDDED_SERVER "Compile MySQL with embedded server" OFF)
-   IF(WITH_EMBEDDED_SERVER) 
-    ADD_SUBDIRECTORY(libmysqld)
--   ADD_SUBDIRECTORY(libmysqld/examples)
-   ENDIF(WITH_EMBEDDED_SERVER)
- ENDIF()
- 
-@@ -572,10 +570,7 @@ ENDIF()
- ADD_SUBDIRECTORY(scripts)
- 
- IF(NOT WITHOUT_SERVER)
--  ADD_SUBDIRECTORY(mysql-test)
--  ADD_SUBDIRECTORY(mysql-test/lib/My/SafeProcess)
-   ADD_SUBDIRECTORY(support-files)
--  ADD_SUBDIRECTORY(sql-bench)
-   IF(EXISTS ${CMAKE_SOURCE_DIR}/internal/CMakeLists.txt)
-     ADD_SUBDIRECTORY(internal)
-   ENDIF()
-@@ -634,6 +629,7 @@ ENDIF()
- #
- # RPM installs documentation directly from the source tree
- #
-+IF(FALSE)
- IF(NOT INSTALL_LAYOUT MATCHES "RPM")
-   INSTALL(FILES
-     README
-@@ -652,6 +648,7 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM")
-     PATTERN "mysql.info" EXCLUDE
-     PATTERN "sp-imp-spec.txt" EXCLUDE
-   )
-+ENDIF()
- ENDIF()
- 
- INCLUDE(CPack)
diff --git a/databases/mysql56-server/files/patch-client_CMakeLists.txt b/databases/mysql56-server/files/patch-client_CMakeLists.txt
deleted file mode 100644
index 1714bbfadb6a..000000000000
--- a/databases/mysql56-server/files/patch-client_CMakeLists.txt
+++ /dev/null
@@ -1,65 +0,0 @@
---- client/CMakeLists.txt.orig	2013-05-21 17:18:39.000000000 +0200
-+++ client/CMakeLists.txt	2013-06-10 15:43:33.000000000 +0200
-@@ -31,17 +31,20 @@
- COPY_OPENSSL_DLLS(copy_openssl_client)
- 
- ADD_DEFINITIONS(${SSL_DEFINES})
-+IF(FALSE)
- MYSQL_ADD_EXECUTABLE(mysql completion_hash.cc mysql.cc readline.cc sql_string.cc)
- TARGET_LINK_LIBRARIES(mysql mysqlclient)
- IF(UNIX)
-   TARGET_LINK_LIBRARIES(mysql ${EDITLINE_LIBRARY})
- ENDIF(UNIX)
-+ENDIF()
- 
- MYSQL_ADD_EXECUTABLE(mysqltest mysqltest.cc COMPONENT Test)
- SET_SOURCE_FILES_PROPERTIES(mysqltest.cc PROPERTIES COMPILE_FLAGS "-DTHREADS")
- TARGET_LINK_LIBRARIES(mysqltest mysqlclient regex)
- ADD_DEPENDENCIES(mysqltest GenError)
- 
-+IF(FALSE)
- MYSQL_ADD_EXECUTABLE(mysqlcheck mysqlcheck.c)
- TARGET_LINK_LIBRARIES(mysqlcheck mysqlclient)
- 
-@@ -50,17 +53,21 @@
- 
- MYSQL_ADD_EXECUTABLE(mysqlimport mysqlimport.c)
- TARGET_LINK_LIBRARIES(mysqlimport mysqlclient)
-+ENDIF()
- 
- MYSQL_ADD_EXECUTABLE(mysql_upgrade mysql_upgrade.c)
- TARGET_LINK_LIBRARIES(mysql_upgrade mysqlclient)
- ADD_DEPENDENCIES(mysql_upgrade GenFixPrivs)
- 
-+IF(FALSE)
- MYSQL_ADD_EXECUTABLE(mysqlshow mysqlshow.c)
- TARGET_LINK_LIBRARIES(mysqlshow mysqlclient)
-+ENDIF()
- 
- MYSQL_ADD_EXECUTABLE(mysql_plugin mysql_plugin.c)
- TARGET_LINK_LIBRARIES(mysql_plugin mysqlclient)
- 
-+IF(FALSE)
- MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc)
- TARGET_LINK_LIBRARIES(mysqlbinlog mysqlclient)
- 
-@@ -73,6 +80,7 @@
- 
- MYSQL_ADD_EXECUTABLE(mysql_config_editor mysql_config_editor.cc)
- TARGET_LINK_LIBRARIES(mysql_config_editor mysqlclient)
-+ENDIF()
- 
- # "WIN32" also covers 64 bit. "echo" is used in some files below "mysql-test/".
- IF(WIN32)
-@@ -82,11 +90,6 @@
- SET_TARGET_PROPERTIES (
-   mysql_plugin 
-   mysql_upgrade
--  mysqlcheck
--  mysqldump
--  mysqlimport
--  mysqlshow
--  mysqlslap
- PROPERTIES HAS_CXX TRUE)
- 
- ADD_DEFINITIONS(-DHAVE_DLOPEN)
diff --git a/databases/mysql56-server/files/patch-cmake_plugin.cmake b/databases/mysql56-server/files/patch-cmake_plugin.cmake
deleted file mode 100644
index da0ed4222758..000000000000
--- a/databases/mysql56-server/files/patch-cmake_plugin.cmake
+++ /dev/null
@@ -1,12 +0,0 @@
---- cmake/plugin.cmake.orig	2019-03-15 07:38:15 UTC
-+++ cmake/plugin.cmake
-@@ -212,9 +212,6 @@ MACRO(MYSQL_ADD_PLUGIN)
-       MYSQL_INSTALL_TARGETS(${target}
-         DESTINATION ${INSTALL_PLUGINDIR}
-         COMPONENT ${INSTALL_COMPONENT})
--      INSTALL_DEBUG_TARGET(${target}
--        DESTINATION ${INSTALL_PLUGINDIR}/debug
--        COMPONENT ${INSTALL_COMPONENT})
-       # Add installed files to list for RPMs
-       FILE(APPEND ${CMAKE_BINARY_DIR}/support-files/plugins.files
-               "%attr(755, root, root) %{_prefix}/${INSTALL_PLUGINDIR}/${ARG_MODULE_OUTPUT_NAME}.so\n"
diff --git a/databases/mysql56-server/files/patch-cmake_ssl.cmake b/databases/mysql56-server/files/patch-cmake_ssl.cmake
deleted file mode 100644
index 52db9e37d987..000000000000
--- a/databases/mysql56-server/files/patch-cmake_ssl.cmake
+++ /dev/null
@@ -1,26 +0,0 @@
---- cmake/ssl.cmake.orig	2019-11-26 16:53:45 UTC
-+++ cmake/ssl.cmake
-@@ -189,13 +189,20 @@ MACRO (MYSQL_CHECK_SSL)
-         OPENSSL_FIX_VERSION "${OPENSSL_VERSION_NUMBER}"
-         )
-     ENDIF()
--    IF("${OPENSSL_MAJOR_VERSION}.${OPENSSL_MINOR_VERSION}.${OPENSSL_FIX_VERSION}" VERSION_GREATER "1.1.0")
--       ADD_DEFINITIONS(-DHAVE_TLSv13)
-+    CHECK_SYMBOL_EXISTS(TLS1_3_VERSION "openssl/tls1.h" HAVE_TLS1_3_VERSION)
-+    IF(HAVE_TLS1_3_VERSION)
-+       #ADD_DEFINITIONS(-DHAVE_TLSv13)
-     ENDIF()
-     IF(OPENSSL_INCLUDE_DIR AND
-        OPENSSL_LIBRARY   AND
-        CRYPTO_LIBRARY      AND
--       OPENSSL_MAJOR_VERSION STREQUAL "1"
-+       OPENSSL_MAJOR_VERSION VERSION_GREATER_EQUAL "1"
-+      )
-+      SET(OPENSSL_FOUND TRUE)
-+    ELSEIF(OPENSSL_INCLUDE_DIR AND
-+       OPENSSL_LIBRARY   AND
-+       CRYPTO_LIBRARY      AND
-+       OPENSSL_MAJOR_VERSION STREQUAL "2"
-       )
-       SET(OPENSSL_FOUND TRUE)
-     ELSE()
diff --git a/databases/mysql56-server/files/patch-extra_CMakeLists.txt b/databases/mysql56-server/files/patch-extra_CMakeLists.txt
deleted file mode 100644
index 6bd2fd069171..000000000000
--- a/databases/mysql56-server/files/patch-extra_CMakeLists.txt
+++ /dev/null
@@ -1,13 +0,0 @@
---- extra/CMakeLists.txt.orig	2013-01-22 17:54:50.000000000 +0100
-+++ extra/CMakeLists.txt	2013-02-13 14:35:11.000000000 +0100
-@@ -102,8 +102,10 @@
-   TARGET_LINK_LIBRARIES(resolve_stack_dump mysys mysys_ssl)
-   SET_TARGET_PROPERTIES(resolve_stack_dump PROPERTIES LINKER_LANGUAGE CXX)
- 
-+IF(FALSE)
-   MYSQL_ADD_EXECUTABLE(mysql_waitpid mysql_waitpid.c)
-   TARGET_LINK_LIBRARIES(mysql_waitpid mysys mysys_ssl)
-   SET_TARGET_PROPERTIES(mysql_waitpid PROPERTIES LINKER_LANGUAGE CXX)
- ENDIF()
-+ENDIF()
- 
diff --git a/databases/mysql56-server/files/patch-include_CMakeLists.txt b/databases/mysql56-server/files/patch-include_CMakeLists.txt
deleted file mode 100644
index 5d5e96a0f1d7..000000000000
--- a/databases/mysql56-server/files/patch-include_CMakeLists.txt
+++ /dev/null
@@ -1,15 +0,0 @@
---- include/CMakeLists.txt.orig	2013-01-22 17:54:49.000000000 +0100
-+++ include/CMakeLists.txt	2013-02-13 14:53:40.000000000 +0100
-@@ -65,10 +65,12 @@
-   ${HEADERS_GEN_CONFIGURE}
- )
- 
-+IF(FALSE)
- INSTALL(FILES ${HEADERS} DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT Development)
- INSTALL(DIRECTORY mysql/ DESTINATION ${INSTALL_INCLUDEDIR}/mysql COMPONENT Development 
-  PATTERN "*.h"
-  PATTERN "psi_abi*" EXCLUDE
- )
-+ENDIF()
- 
- 
diff --git a/databases/mysql56-server/files/patch-include_my_compare.h b/databases/mysql56-server/files/patch-include_my_compare.h
deleted file mode 100644
index 093c8ae37789..000000000000
--- a/databases/mysql56-server/files/patch-include_my_compare.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- include/my_compare.h.orig	2011-05-10 09:46:46.000000000 +0200
-+++ include/my_compare.h	2011-05-10 09:47:01.000000000 +0200
-@@ -39,7 +39,7 @@
-   But beware the dependency of MI_MAX_POSSIBLE_KEY_BUFF and HA_MAX_KEY_LENGTH.
- */
- 
--#define HA_MAX_KEY_LENGTH           1000        /* Max length in bytes */
-+#define HA_MAX_KEY_LENGTH           4000        /* Max length in bytes */
- #define HA_MAX_KEY_SEG              16          /* Max segments for key */
- 
- #define HA_MAX_POSSIBLE_KEY_BUFF    (HA_MAX_KEY_LENGTH + 24+ 6+6)
diff --git a/databases/mysql56-server/files/patch-include_myisam.h b/databases/mysql56-server/files/patch-include_myisam.h
deleted file mode 100644
index 450645400dd5..000000000000
--- a/databases/mysql56-server/files/patch-include_myisam.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- include/myisam.h.orig	2009-02-16 23:04:54.000000000 +0100
-+++ include/myisam.h	2009-02-16 23:10:08.000000000 +0100
-@@ -48,7 +48,7 @@
-   The following defines can be increased if necessary.
-   But beware the dependency of MI_MAX_POSSIBLE_KEY_BUFF and MI_MAX_KEY_LENGTH.
- */
--#define MI_MAX_KEY_LENGTH           1000            /* Max length in bytes */
-+#define MI_MAX_KEY_LENGTH           4000            /* Max length in bytes */
- #define MI_MAX_KEY_SEG              16              /* Max segments for key */
- 
- #define MI_MAX_KEY_BUFF  (MI_MAX_KEY_LENGTH+MI_MAX_KEY_SEG*6+8+8)
diff --git a/databases/mysql56-server/files/patch-libmysql_CMakeLists.txt b/databases/mysql56-server/files/patch-libmysql_CMakeLists.txt
deleted file mode 100644
index 4b4c58856b9f..000000000000
--- a/databases/mysql56-server/files/patch-libmysql_CMakeLists.txt
+++ /dev/null
@@ -1,42 +0,0 @@
---- libmysql/CMakeLists.txt.orig	2020-01-01 21:38:55.670126000 +0100
-+++ libmysql/CMakeLists.txt	2020-01-01 21:47:51.799099000 +0100
-@@ -205,7 +205,7 @@ IF(WIN32)
- ENDIF()
- 
- # Merge several convenience libraries into one big mysqlclient
--MERGE_LIBRARIES(mysqlclient STATIC ${LIBS_TO_MERGE} COMPONENT Development)
-+MERGE_LIBRARIES(mysqlclient STATIC ${LIBS_TO_MERGE} COMPONENT Development NOINSTALL)
- TARGET_LINK_LIBRARIES(mysqlclient ${LIBS_TO_LINK})
- 
- # Visual Studio users need debug  static library for debug projects
-@@ -234,20 +234,23 @@ IF(UNIX)
-   ENDMACRO()
- ENDIF()
- 
-+IF(FALSE)
- IF(UNIX)
-   GET_TARGET_NAME(mysqlclient lib_name)
-   INSTALL_SYMLINK(mysqlclient
-     ${lib_name} ${CMAKE_STATIC_LIBRARY_PREFIX}mysqlclient_r.a
-     ${INSTALL_LIBDIR} Development)
- ENDIF()
-+ENDIF()
- 
- IF(NOT DISABLE_SHARED)
-   # Merge several convenience libraries into one big mysqlclient
-   # and link them together into shared library.
-   MERGE_LIBRARIES(libmysql SHARED ${LIBS_TO_MERGE}
-     EXPORTS ${CLIENT_API_FUNCTIONS}
--    COMPONENT SharedLibraries)
-+	COMPONENT SharedLibraries NOINSTALL)
-   TARGET_LINK_LIBRARIES(libmysql ${LIBS_TO_LINK})
-+  IF(FALSE)
-   IF(UNIX)
-     # libtool compatability
-     IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD" OR APPLE)
-@@ -316,4 +319,5 @@ IF(NOT DISABLE_SHARED)
-         ${INSTALL_LIBDIR} SharedLibraries)
-     ENDFOREACH()
-   ENDIF()
-+ ENDIF()
- ENDIF()
diff --git a/databases/mysql56-server/files/patch-libservices_CMakeLists.txt b/databases/mysql56-server/files/patch-libservices_CMakeLists.txt
deleted file mode 100644
index fcbcea7aed21..000000000000
--- a/databases/mysql56-server/files/patch-libservices_CMakeLists.txt
+++ /dev/null
@@ -1,9 +0,0 @@
---- libservices/CMakeLists.txt.orig	2010-12-23 17:13:03.000000000 +0100
-+++ libservices/CMakeLists.txt	2010-12-23 17:13:17.000000000 +0100
-@@ -22,4 +22,6 @@
-   my_thread_scheduler_service.c)
- 
- ADD_LIBRARY(mysqlservices ${MYSQLSERVICES_SOURCES})
-+IF(FALSE)
- INSTALL(TARGETS mysqlservices DESTINATION ${INSTALL_LIBDIR} COMPONENT Development)
-+ENDIF()
diff --git a/databases/mysql56-server/files/patch-man_CMakeLists.txt b/databases/mysql56-server/files/patch-man_CMakeLists.txt
deleted file mode 100644
index 7849c77af111..000000000000
--- a/databases/mysql56-server/files/patch-man_CMakeLists.txt
+++ /dev/null
@@ -1,11 +0,0 @@
---- man/CMakeLists.txt.orig	2011-10-22 14:36:06.000000000 +0200
-+++ man/CMakeLists.txt	2011-10-22 14:36:23.000000000 +0200
-@@ -15,8 +15,6 @@
- 
- # Copy man pages
- FILE(GLOB MAN1_FILES *.1)
--FILE(GLOB MAN1_EXCLUDE make_win_bin_dist.1)
--FILE(GLOB MAN1_NDB ndb*.1)
- FILE(GLOB MAN8_FILES *.8)
- FILE(GLOB MAN8_NDB ndb*.8)
- IF(MAN1_FILES)
diff --git a/databases/mysql56-server/files/patch-mysys__ssl_my__aes__openssl.cc b/databases/mysql56-server/files/patch-mysys__ssl_my__aes__openssl.cc
deleted file mode 100644
index 0d1dea6cf6cb..000000000000
--- a/databases/mysql56-server/files/patch-mysys__ssl_my__aes__openssl.cc
+++ /dev/null
@@ -1,74 +0,0 @@
---- mysys_ssl/my_aes_openssl.cc.orig	2019-11-26 16:53:45 UTC
-+++ mysys_ssl/my_aes_openssl.cc
-@@ -120,7 +120,7 @@ int my_aes_encrypt(const unsigned char *source, uint32
-                    const unsigned char *key, uint32 key_length,
-                    enum my_aes_opmode mode, const unsigned char *iv)
- {
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-   EVP_CIPHER_CTX stack_ctx;
-   EVP_CIPHER_CTX *ctx= &stack_ctx;
- #else /* OPENSSL_VERSION_NUMBER < 0x10100000L */
-@@ -135,7 +135,7 @@ int my_aes_encrypt(const unsigned char *source, uint32
-   if (!ctx || !cipher || (EVP_CIPHER_iv_length(cipher) > 0 && !iv))
-     return MY_AES_BAD_DATA;
- 
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-   EVP_CIPHER_CTX_init(ctx);
- #endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */
- 
-@@ -148,7 +148,7 @@ int my_aes_encrypt(const unsigned char *source, uint32
-   if (!EVP_EncryptFinal(ctx, dest + u_len, &f_len))
-     goto aes_error;                             /* Error */
- 
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-   EVP_CIPHER_CTX_cleanup(ctx);
- #else /* OPENSSL_VERSION_NUMBER < 0x10100000L */
-   EVP_CIPHER_CTX_free(ctx);
-@@ -158,7 +158,7 @@ int my_aes_encrypt(const unsigned char *source, uint32
- aes_error:
-   /* need to explicitly clean up the error if we want to ignore it */
-   ERR_clear_error();
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-   EVP_CIPHER_CTX_cleanup(ctx);
- #else /* OPENSSL_VERSION_NUMBER < 0x10100000L */
-   EVP_CIPHER_CTX_free(ctx);
-@@ -172,7 +172,7 @@ int my_aes_decrypt(const unsigned char *source, uint32
-                    const unsigned char *key, uint32 key_length,
-                    enum my_aes_opmode mode, const unsigned char *iv)
- {
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-   EVP_CIPHER_CTX stack_ctx;
-   EVP_CIPHER_CTX *ctx= &stack_ctx;
- #else /* OPENSSL_VERSION_NUMBER < 0x10100000L */
-@@ -188,7 +188,7 @@ int my_aes_decrypt(const unsigned char *source, uint32
-   if (!ctx || !cipher || (EVP_CIPHER_iv_length(cipher) > 0 && !iv))
-     return MY_AES_BAD_DATA;
- 
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-   EVP_CIPHER_CTX_init(ctx);
- #endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */
- 
-@@ -201,7 +201,7 @@ int my_aes_decrypt(const unsigned char *source, uint32
-   if (!EVP_DecryptFinal_ex(ctx, dest + u_len, &f_len))
-     goto aes_error;                             /* Error */
- 
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-   EVP_CIPHER_CTX_cleanup(ctx);
- #else /* OPENSSL_VERSION_NUMBER < 0x10100000L */
-   EVP_CIPHER_CTX_free(ctx);
-@@ -211,7 +211,7 @@ int my_aes_decrypt(const unsigned char *source, uint32
- aes_error:
-   /* need to explicitly clean up the error if we want to ignore it */
-   ERR_clear_error();
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-   EVP_CIPHER_CTX_cleanup(ctx);
- #else /* OPENSSL_VERSION_NUMBER < 0x10100000L */
-   EVP_CIPHER_CTX_free(ctx);
diff --git a/databases/mysql56-server/files/patch-mysys_ssl_my_default.cc b/databases/mysql56-server/files/patch-mysys_ssl_my_default.cc
deleted file mode 100644
index fa06468ce959..000000000000
--- a/databases/mysql56-server/files/patch-mysys_ssl_my_default.cc
+++ /dev/null
@@ -1,61 +0,0 @@
---- mysys_ssl/my_default.cc.orig	2016-11-28 13:36:22 UTC
-+++ mysys_ssl/my_default.cc
-@@ -110,7 +110,7 @@ static my_bool defaults_already_read= FA
- 
- /* Which directories are searched for options (and in which order) */
- 
--#define MAX_DEFAULT_DIRS 6
-+#define MAX_DEFAULT_DIRS 7
- #define DEFAULT_DIRS_SIZE (MAX_DEFAULT_DIRS + 1)  /* Terminate with NULL */
- static const char **default_directories = NULL;
- 
-@@ -903,6 +903,14 @@ static int search_default_file_with_ext(
-       return 1;                                 /* Ignore wrong files */
-   }
- 
-+  if (strstr(name, "/etc") == name)
-+  {
-+    fprintf(stderr,
-+             "error: Config file %s in invalid location, please move to or merge with /usr/local%s\n",
-+             name,name);
-+      goto err;
-+  }
-+
-   while (mysql_file_getline(buff, sizeof(buff) - 1, fp, is_login_file))
-   {
-     line++;
-@@ -1241,7 +1249,8 @@ void my_print_default_files(const char *
-             end[(strlen(end)-1)] = ' ';
-           else
-             strxmov(end, conf_file, *ext , " ",  NullS);
--          fputs(name, stdout);
-+          if (strstr(name, "/etc") != name)
-+            fputs(name, stdout);
-         }
-       }
-     }
-@@ -1400,13 +1409,8 @@ static const char **init_default_directo
- 
- #else
- 
--  errors += add_directory(alloc, "/etc/", dirs);
--  errors += add_directory(alloc, "/etc/mysql/", dirs);
--
--#if defined(DEFAULT_SYSCONFDIR)
--  if (DEFAULT_SYSCONFDIR[0])
--    errors += add_directory(alloc, DEFAULT_SYSCONFDIR, dirs);
--#endif /* DEFAULT_SYSCONFDIR */
-+  errors += add_directory(alloc, "/usr/local/etc/", dirs);
-+  errors += add_directory(alloc, "/usr/local/etc/mysql/", dirs);
- 
- #endif
- 
-@@ -1477,7 +1481,7 @@ int check_file_permissions(const char *f
-   MY_STAT stat_info;
- 
-   if (!my_stat(file_name,&stat_info,MYF(0)))
--    return 1;
-+    return 0;
-   /*
-     Ignore .mylogin.cnf file if not exclusively readable/writable
-     by current user.
diff --git a/databases/mysql56-server/files/patch-plugin_password_validation_validate_password.cc b/databases/mysql56-server/files/patch-plugin_password_validation_validate_password.cc
deleted file mode 100644
index 653f03095030..000000000000
--- a/databases/mysql56-server/files/patch-plugin_password_validation_validate_password.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- plugin/password_validation/validate_password.cc.orig	2013-09-10 07:38:25.000000000 +0000
-+++ plugin/password_validation/validate_password.cc	2013-10-05 15:40:20.790380179 +0000
-@@ -16,6 +16,8 @@
- #include <my_sys.h>
- #include <string>
- #include <mysql/plugin_validate_password.h>
-+/* solve clash between libc++ bitset::test() and test macro from my_global.h */
-+#undef test
- #include <set>
- #include <iostream>
- #include <fstream>
diff --git a/databases/mysql56-server/files/patch-scripts_CMakeLists.txt b/databases/mysql56-server/files/patch-scripts_CMakeLists.txt
deleted file mode 100644
index ef7b3a1b506b..000000000000
--- a/databases/mysql56-server/files/patch-scripts_CMakeLists.txt
+++ /dev/null
@@ -1,36 +0,0 @@
---- scripts/CMakeLists.txt.orig	2013-01-22 17:54:49.000000000 +0100
-+++ scripts/CMakeLists.txt	2013-02-13 14:39:57.000000000 +0100
-@@ -264,6 +264,8 @@
-           GET_FILENAME_COMPONENT(lib "${lib}" NAME_WE)
-           STRING(REGEX REPLACE "^lib" "" lib "${lib}")
-           SET(${var} "${${var}}-l${lib} " ) 
-+        ELSEIF(lib STREQUAL "-pthread")
-+          SET(${var} "${${var}}-pthread " ) 
-         ELSE()
-           SET(${var} "${${var}}-l${lib} " ) 
-         ENDIF()
-@@ -314,15 +316,10 @@
-   # On Unix, most of the files end up in the bin directory
-   SET(mysql_config_COMPONENT COMPONENT Development)
-   SET(BIN_SCRIPTS
--    msql2mysql
--    mysql_config
-     mysql_fix_extensions
-     mysql_setpermission
-     mysql_zap
--    mysqlaccess
--    mysqlaccess.conf
-     mysql_convert_table_format
--    mysql_find_rows
-     mysqlhotcopy
-     mysqldumpslow
-     mysqld_multi
-@@ -331,7 +328,7 @@
-   FOREACH(file ${BIN_SCRIPTS})
-     IF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh)
-       CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh
--        ${CMAKE_CURRENT_BINARY_DIR}/${file} ESCAPE_QUOTES @ONLY)
-+        ${CMAKE_CURRENT_BINARY_DIR}/${file} @ONLY)
-     ELSEIF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${file})
-       CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${file}
-          ${CMAKE_CURRENT_BINARY_DIR}/${file} COPYONLY)
diff --git a/databases/mysql56-server/files/patch-scripts_mysqld_safe.sh b/databases/mysql56-server/files/patch-scripts_mysqld_safe.sh
deleted file mode 100644
index 2a30469922f0..000000000000
--- a/databases/mysql56-server/files/patch-scripts_mysqld_safe.sh
+++ /dev/null
@@ -1,24 +0,0 @@
---- scripts/mysqld_safe.sh.orig	2007-10-08 10:39:23.000000000 +0200
-+++ scripts/mysqld_safe.sh	2007-10-08 10:40:52.000000000 +0200
-@@ -242,10 +242,10 @@
- 
- if test -z "$MYSQL_HOME"
- then 
--  if test -r "$MY_BASEDIR_VERSION/my.cnf" && test -r "$DATADIR/my.cnf"
-+  if test -r "$MY_BASEDIR_VERSION/etc/my.cnf" && test -r "$DATADIR/my.cnf"
-   then
-     log_error "WARNING: Found two instances of my.cnf -
--$MY_BASEDIR_VERSION/my.cnf and
-+$MY_BASEDIR_VERSION/etc/my.cnf and
- $DATADIR/my.cnf
- IGNORING $DATADIR/my.cnf"
- 
-@@ -254,7 +254,7 @@
-   then
-     log_error "WARNING: Found $DATADIR/my.cnf
- The data directory is a deprecated location for my.cnf, please move it to
--$MY_BASEDIR_VERSION/my.cnf"
-+$MY_BASEDIR_VERSION/etc/my.cnf"
-     MYSQL_HOME=$DATADIR
-   else
-     MYSQL_HOME=$MY_BASEDIR_VERSION
diff --git a/databases/mysql56-server/files/patch-sql-common_client.c b/databases/mysql56-server/files/patch-sql-common_client.c
deleted file mode 100644
index cfc168b75a53..000000000000
--- a/databases/mysql56-server/files/patch-sql-common_client.c
+++ /dev/null
@@ -1,15 +0,0 @@
---- sql-common/client.c.orig	2019-11-26 16:53:45 UTC
-+++ sql-common/client.c
-@@ -1980,7 +1980,11 @@ static int ssl_verify_server_cert(Vio *vio, const char
-     goto error;
-   }
- 
--  cn= (char *) ASN1_STRING_data(cn_asn1);
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-+  cn= (const char *) ASN1_STRING_data(cn_asn1);
-+#else
-+  cn= (const char *) ASN1_STRING_get0_data(cn_asn1);
-+#endif
- 
-   // There should not be any NULL embedded in the CN
-   if ((size_t)ASN1_STRING_length(cn_asn1) != strlen(cn))
diff --git a/databases/mysql56-server/files/patch-sql_CMakeLists.txt b/databases/mysql56-server/files/patch-sql_CMakeLists.txt
deleted file mode 100644
index 2eeb4edfd51c..000000000000
--- a/databases/mysql56-server/files/patch-sql_CMakeLists.txt
+++ /dev/null
@@ -1,18 +0,0 @@
---- sql/CMakeLists.txt.orig	2013-04-05 14:27:18.000000000 +0200
-+++ sql/CMakeLists.txt	2013-04-19 15:08:12.000000000 +0200
-@@ -423,6 +423,7 @@
- 
- IF(INSTALL_LAYOUT STREQUAL "STANDALONE")
- 
-+IF(FALSE)
- # Copy db.opt into data/test/
- SET(DBOPT_FILE ${CMAKE_CURRENT_SOURCE_DIR}/db.opt ) 
- INSTALL(FILES ${DBOPT_FILE} DESTINATION data/test COMPONENT DataFiles)
-@@ -467,6 +468,7 @@
-   INSTALL(FILES ${DUMMY_FILE} DESTINATION data/mysql COMPONENT DataFiles)
- ENDIF()
- ENDIF()
-+ENDIF()
- 
- ADD_CUSTOM_TARGET(show-dist-name
-   COMMAND ${CMAKE_COMMAND} -E echo "${CPACK_PACKAGE_FILE_NAME}"
diff --git a/databases/mysql56-server/files/patch-sql_mysqld.cc b/databases/mysql56-server/files/patch-sql_mysqld.cc
deleted file mode 100644
index debee80ea2ce..000000000000
--- a/databases/mysql56-server/files/patch-sql_mysqld.cc
+++ /dev/null
@@ -1,65 +0,0 @@
---- sql/mysqld.cc.orig	2019-11-26 16:53:45 UTC
-+++ sql/mysqld.cc
-@@ -1258,7 +1258,7 @@ char *opt_ssl_ca= NULL, *opt_ssl_capath= NULL, *opt_ss
-      *opt_ssl_crlpath= NULL;
- 
- #ifdef HAVE_OPENSSL
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- #include <openssl/crypto.h>
- typedef struct CRYPTO_dynlock_value
- {
-@@ -2029,7 +2029,7 @@ static void clean_up_mutexes()
-   mysql_mutex_destroy(&LOCK_connection_count);
- #ifdef HAVE_OPENSSL
-   mysql_mutex_destroy(&LOCK_des_key_file);
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-   for (int i= 0; i < CRYPTO_num_locks(); ++i)
-     mysql_rwlock_destroy(&openssl_stdlocks[i].lock);
-   OPENSSL_free(openssl_stdlocks);
-@@ -2768,7 +2768,7 @@ bool one_thread_per_connection_end(THD *thd, bool bloc
- 
-   // Clean up errors now, before possibly waiting for a new connection.
- #ifndef EMBEDDED_LIBRARY
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-   ERR_remove_thread_state(0);
- #endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */
- #endif
-@@ -4252,7 +4252,7 @@ static int init_thread_environment()
- #ifdef HAVE_OPENSSL
-   mysql_mutex_init(key_LOCK_des_key_file,
-                    &LOCK_des_key_file, MY_MUTEX_INIT_FAST);
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-   openssl_stdlocks= (openssl_lock_t*) OPENSSL_malloc(CRYPTO_num_locks() *
-                                                      sizeof(openssl_lock_t));
-   for (int i= 0; i < CRYPTO_num_locks(); ++i)
-@@ -4301,7 +4301,7 @@ static int init_thread_environment()
-   OpenSSL 1.1 supports native platform threads,
-   so we don't need the following callback functions.
- */
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- 
- static unsigned long openssl_id_function()
- {
-@@ -4375,7 +4375,7 @@ static void openssl_lock(int mode, openssl_lock_t *loc
- static int init_ssl()
- {
- #ifdef HAVE_OPENSSL
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-   CRYPTO_malloc_init();
- #else /* OPENSSL_VERSION_NUMBER < 0x10100000L */
-   OPENSSL_malloc_init();
-@@ -4392,7 +4392,7 @@ static int init_ssl()
- 					  opt_ssl_cipher, &error,
-                                           opt_ssl_crl, opt_ssl_crlpath);
-     DBUG_PRINT("info",("ssl_acceptor_fd: 0x%lx", (long) ssl_acceptor_fd));
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-     ERR_remove_thread_state(0);
- #endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */
-     if (!ssl_acceptor_fd)
diff --git a/databases/mysql56-server/files/patch-sql_sys_vars.cc b/databases/mysql56-server/files/patch-sql_sys_vars.cc
deleted file mode 100644
index e8f0caff4aff..000000000000
--- a/databases/mysql56-server/files/patch-sql_sys_vars.cc
+++ /dev/null
@@ -1,38 +0,0 @@
---- sql/sys_vars.cc.orig	2012-06-15 17:03:32.000000000 +0200
-+++ sql/sys_vars.cc	2012-06-15 17:16:23.000000000 +0200
-@@ -900,7 +900,7 @@
-        "connection before closing it",
-        SESSION_VAR(net_interactive_timeout),
-        CMD_LINE(REQUIRED_ARG),
--       VALID_RANGE(1, LONG_TIMEOUT), DEFAULT(NET_WAIT_TIMEOUT), BLOCK_SIZE(1));
-+       VALID_RANGE(1, INT_MAX32/1000), DEFAULT(NET_WAIT_TIMEOUT), BLOCK_SIZE(1));
- 
- static Sys_var_ulong Sys_join_buffer_size(
-        "join_buffer_size",
-@@ -1401,7 +1401,7 @@
-        "Number of seconds to wait for more data from a connection before "
-        "aborting the read",
-        SESSION_VAR(net_read_timeout), CMD_LINE(REQUIRED_ARG),
--       VALID_RANGE(1, LONG_TIMEOUT), DEFAULT(NET_READ_TIMEOUT), BLOCK_SIZE(1),
-+       VALID_RANGE(1, INT_MAX32/1000), DEFAULT(NET_READ_TIMEOUT), BLOCK_SIZE(1),
-        NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0),
-        ON_UPDATE(fix_net_read_timeout));
- 
-@@ -1416,7 +1416,7 @@
-        "Number of seconds to wait for a block to be written to a connection "
-        "before aborting the write",
-        SESSION_VAR(net_write_timeout), CMD_LINE(REQUIRED_ARG),
--       VALID_RANGE(1, LONG_TIMEOUT), DEFAULT(NET_WRITE_TIMEOUT), BLOCK_SIZE(1),
-+       VALID_RANGE(1, INT_MAX32/1000), DEFAULT(NET_WRITE_TIMEOUT), BLOCK_SIZE(1),
-        NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0),
-        ON_UPDATE(fix_net_write_timeout));
- 
-@@ -2257,7 +2257,7 @@
-        "The number of seconds the server waits for activity on a "
-        "connection before closing it",
-        SESSION_VAR(net_wait_timeout), CMD_LINE(REQUIRED_ARG),
--       VALID_RANGE(1, IF_WIN(INT_MAX32/1000, LONG_TIMEOUT)),
-+       VALID_RANGE(1, INT_MAX32/1000),
-        DEFAULT(NET_WAIT_TIMEOUT), BLOCK_SIZE(1));
- 
- /** propagates changes to the relevant flag of @@optimizer_switch */
diff --git a/databases/mysql56-server/files/patch-storage_innobase_handler_i_s.cc b/databases/mysql56-server/files/patch-storage_innobase_handler_i_s.cc
deleted file mode 100644
index 1b4ba6429308..000000000000
--- a/databases/mysql56-server/files/patch-storage_innobase_handler_i_s.cc
+++ /dev/null
@@ -1,13 +0,0 @@
---- storage/innobase/handler/i_s.cc.orig	2020-03-09 10:37:59 UTC
-+++ storage/innobase/handler/i_s.cc
-@@ -43,6 +43,10 @@ Created July 18, 2007 Vasil Dimov
- #include <sql_plugin.h>
- #include <mysql/innodb_priv.h>
- 
-+#include <string>
-+#include <sstream>
-+#include <iostream>
-+
- #include "btr0pcur.h"
- #include "btr0types.h"
- #include "dict0dict.h"
diff --git a/databases/mysql56-server/files/patch-support-files_CMakeLists.txt b/databases/mysql56-server/files/patch-support-files_CMakeLists.txt
deleted file mode 100644
index 159e1fa71ba2..000000000000
--- a/databases/mysql56-server/files/patch-support-files_CMakeLists.txt
+++ /dev/null
@@ -1,12 +0,0 @@
---- support-files/CMakeLists.txt.orig	2010-12-23 17:38:19.000000000 +0100
-+++ support-files/CMakeLists.txt	2010-12-23 17:41:11.000000000 +0100
-@@ -74,7 +74,9 @@
-     INSTALL(FILES magic DESTINATION ${inst_location} COMPONENT SupportFiles)
-   ENDIF()
- 
-+IF(FALSE)
-   INSTALL(FILES mysql.m4 DESTINATION ${INSTALL_SHAREDIR}/aclocal COMPONENT Development)
-+ENDIF()
-   CONFIGURE_FILE(MySQL-shared-compat.spec.sh ${CMAKE_CURRENT_BINARY_DIR}/MySQL-shared-compat.spec @ONLY)
-   CONFIGURE_FILE(mysql.spec.sh ${CMAKE_CURRENT_BINARY_DIR}/mysql.spec @ONLY)
-   CONFIGURE_FILE(mysql.spec.sh ${CMAKE_CURRENT_BINARY_DIR}/mysql.${VERSION}.spec @ONLY)
diff --git a/databases/mysql56-server/files/patch-vio_vio.c b/databases/mysql56-server/files/patch-vio_vio.c
deleted file mode 100644
index 042c4d65e8f2..000000000000
--- a/databases/mysql56-server/files/patch-vio_vio.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- vio/vio.c.orig	2019-11-26 16:53:45 UTC
-+++ vio/vio.c
-@@ -394,7 +394,7 @@ void vio_end(void)
- {
- #if defined(HAVE_OPENSSL)
-   // This one is needed on the client side
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-   ERR_remove_thread_state(0);
- #endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */
-   ERR_free_strings();
diff --git a/databases/mysql56-server/files/patch-vio_viossl.c b/databases/mysql56-server/files/patch-vio_viossl.c
deleted file mode 100644
index 54a6280525fc..000000000000
--- a/databases/mysql56-server/files/patch-vio_viossl.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- vio/viossl.c.orig	2019-11-26 16:53:45 UTC
-+++ vio/viossl.c
-@@ -385,7 +385,7 @@ static int ssl_do(struct st_VioSSLFd *ptr, Vio *vio,
-   DBUG_PRINT("info", ("ssl: 0x%lx timeout: %ld", (long) ssl, timeout));
-   SSL_clear(ssl);
-   SSL_set_fd(ssl, sd);
--#if defined(SSL_OP_NO_COMPRESSION)
-+#if defined(SSL_OP_NO_COMPRESSION) && !defined(LIBRESSL_VERSION_NUMBER)
-   SSL_set_options(ssl, SSL_OP_NO_COMPRESSION); /* OpenSSL >= 1.0 only */
- #elif OPENSSL_VERSION_NUMBER >= 0x00908000L /* workaround for OpenSSL 0.9.8 */
-   sk_SSL_COMP_zero(SSL_COMP_get_compression_methods());
-@@ -403,7 +403,7 @@ static int ssl_do(struct st_VioSSLFd *ptr, Vio *vio,
-       for (j = 0; j < n; j++)
-       {
-         SSL_COMP *c = sk_SSL_COMP_value(ssl_comp_methods, j);
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-         DBUG_PRINT("info", ("  %d: %s\n", c->id, c->name));
- #else /* OPENSSL_VERSION_NUMBER < 0x10100000L */
-         DBUG_PRINT("info", ("  %d: %s\n", SSL_COMP_get_id(c), SSL_COMP_get0_name(c)));
diff --git a/databases/mysql56-server/files/patch-vio_viosslfactories.c b/databases/mysql56-server/files/patch-vio_viosslfactories.c
deleted file mode 100644
index dd1293395898..000000000000
--- a/databases/mysql56-server/files/patch-vio_viosslfactories.c
+++ /dev/null
@@ -1,38 +0,0 @@
---- vio/viosslfactories.c.orig	2019-11-26 16:53:45 UTC
-+++ vio/viosslfactories.c
-@@ -91,7 +91,7 @@ static DH *get_dh2048(void)
-       DH_free(dh);
-       return NULL;
-     }
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-     dh->p= p;
-     dh->g= g;
- #endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */
-@@ -226,7 +226,7 @@ new_VioSSLFd(const char *key_file, const char *cert_fi
-   struct st_VioSSLFd *ssl_fd;
-   /* MySQL 5.6 supports TLS up to v1.2, explicitly disable TLSv1.3. */
-   long ssl_ctx_options= SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3 |
--#ifdef HAVE_TLSv13
-+#if defined(HAVE_TLSv13) && !defined(LIBRESSL_VERSION_NUMBER)
-                         SSL_OP_NO_TLSv1_3 |
- #endif /* HAVE_TLSv13 */
-                         SSL_OP_NO_TICKET;
-@@ -250,7 +250,7 @@ new_VioSSLFd(const char *key_file, const char *cert_fi
-     DBUG_RETURN(0);
- 
-   if (!(ssl_fd->ssl_context= SSL_CTX_new(is_client ?
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-                                          SSLv23_client_method() :
-                                          SSLv23_server_method()
- #else /* OPENSSL_VERSION_NUMBER < 0x10100000L */
-@@ -268,7 +268,7 @@ new_VioSSLFd(const char *key_file, const char *cert_fi
- 
-   SSL_CTX_set_options(ssl_fd->ssl_context, ssl_ctx_options);
- 
--#ifdef HAVE_TLSv13
-+#if defined(HAVE_TLSv13) && !defined(LIBRESSL_VERSION_NUMBER)
-   /*
-     MySQL 5.6 doesn't support TLSv1.3 - set empty TLSv1.3 ciphersuites.
-   */
diff --git a/databases/mysql56-server/files/pkg-message.in b/databases/mysql56-server/files/pkg-message.in
deleted file mode 100644
index 70f7b439a1dd..000000000000
--- a/databases/mysql56-server/files/pkg-message.in
+++ /dev/null
@@ -1,16 +0,0 @@
-[
-{ type: install
-  message: <<EOM
-Please keep in mind that the default location for my.cnf will be changed
-from "/var/db/mysql/my.cnf" to "%%ETCDIR%%/my.cnf" in the near
-future.  If you do not want to move your my.cnf to the new location then
-you must set "mysql_optfile" in /etc/rc.conf to "/var/db/mysql/my.cnf".
-EOM
-}
-{ type: upgrade
-  message: <<EOM
-Remember to run mysql_upgrade the first time you start the MySQL server
-after an upgrade from an earlier version.
-EOM
-}
-]
diff --git a/databases/mysql56-server/pkg-descr b/databases/mysql56-server/pkg-descr
deleted file mode 100644
index 028ce03b0da2..000000000000
--- a/databases/mysql56-server/pkg-descr
+++ /dev/null
@@ -1,4 +0,0 @@
-MySQL is a very fast, multi-threaded, multi-user and robust SQL
-(Structured Query Language) database server.
-
-WWW: https://www.mysql.com/
diff --git a/databases/mysql56-server/pkg-plist b/databases/mysql56-server/pkg-plist
deleted file mode 100644
index acb819c467c8..000000000000
--- a/databases/mysql56-server/pkg-plist
+++ /dev/null
@@ -1,138 +0,0 @@
-bin/innochecksum
-bin/my_print_defaults
-bin/myisam_ftdump
-bin/myisamchk
-bin/myisamlog
-bin/myisampack
-bin/mysql_convert_table_format
-bin/mysql_fix_extensions
-bin/mysql_install_db
-bin/mysql_plugin
-bin/mysql_secure_installation
-bin/mysql_setpermission
-bin/mysql_tzinfo_to_sql
-bin/mysql_upgrade
-bin/mysql_zap
-bin/mysqlbug
-bin/mysqld_multi
-bin/mysqld_safe
-bin/mysqldumpslow
-bin/mysqlhotcopy
-bin/mysqltest
-bin/perror
-bin/replace
-bin/resolve_stack_dump
-bin/resolveip
-lib/mysql/libmysqld.a
-lib/mysql/plugin/adt_null.so
-lib/mysql/plugin/auth.so
-lib/mysql/plugin/auth_test_plugin.so
-lib/mysql/plugin/connection_control.so
-lib/mysql/plugin/daemon_example.ini
-lib/mysql/plugin/libdaemon_example.so
-%%EXAMPLE%%lib/mysql/plugin/ha_example.so
-lib/mysql/plugin/mypluglib.so
-lib/mysql/plugin/mysql_no_login.so
-lib/mysql/plugin/qa_auth_client.so
-lib/mysql/plugin/qa_auth_interface.so
-lib/mysql/plugin/qa_auth_server.so
-lib/mysql/plugin/semisync_master.so
-lib/mysql/plugin/semisync_slave.so
-lib/mysql/plugin/test_udf_services.so
-%%EXAMPLE%%lib/mysql/plugin/udf_example.so
-lib/mysql/plugin/validate_password.so
-libexec/mysqld
-man/man1/my_print_defaults.1.gz
-man/man1/myisam_ftdump.1.gz
-man/man1/myisamchk.1.gz
-man/man1/myisamlog.1.gz
-man/man1/myisampack.1.gz
-man/man1/mysql.server.1.gz
-man/man1/mysql_convert_table_format.1.gz
-man/man1/mysql_fix_extensions.1.gz
-man/man1/mysql_install_db.1.gz
-man/man1/mysql_plugin.1.gz
-man/man1/mysql_secure_installation.1.gz
-man/man1/mysql_setpermission.1.gz
-man/man1/mysql_tzinfo_to_sql.1.gz
-man/man1/mysql_upgrade.1.gz
-man/man1/mysql_zap.1.gz
-man/man1/mysqlbug.1.gz
-man/man1/mysqld_multi.1.gz
-man/man1/mysqld_safe.1.gz
-man/man1/mysqldumpslow.1.gz
-man/man1/mysqlhotcopy.1.gz
-man/man1/mysqlman.1.gz
-man/man1/perror.1.gz
-man/man1/replace.1.gz
-man/man1/resolve_stack_dump.1.gz
-man/man1/resolveip.1.gz
-man/man8/mysqld.8.gz
-%%DATADIR%%/binary-configure
-%%DATADIR%%/bulgarian/errmsg.sys
-%%DATADIR%%/charsets/Index.xml
-%%DATADIR%%/charsets/README
-%%DATADIR%%/charsets/armscii8.xml
-%%DATADIR%%/charsets/ascii.xml
-%%DATADIR%%/charsets/cp1250.xml
-%%DATADIR%%/charsets/cp1251.xml
-%%DATADIR%%/charsets/cp1256.xml
-%%DATADIR%%/charsets/cp1257.xml
-%%DATADIR%%/charsets/cp850.xml
-%%DATADIR%%/charsets/cp852.xml
-%%DATADIR%%/charsets/cp866.xml
-%%DATADIR%%/charsets/dec8.xml
-%%DATADIR%%/charsets/geostd8.xml
-%%DATADIR%%/charsets/greek.xml
-%%DATADIR%%/charsets/hebrew.xml
-%%DATADIR%%/charsets/hp8.xml
-%%DATADIR%%/charsets/keybcs2.xml
-%%DATADIR%%/charsets/koi8r.xml
-%%DATADIR%%/charsets/koi8u.xml
-%%DATADIR%%/charsets/latin1.xml
-%%DATADIR%%/charsets/latin2.xml
-%%DATADIR%%/charsets/latin5.xml
-%%DATADIR%%/charsets/latin7.xml
-%%DATADIR%%/charsets/macce.xml
-%%DATADIR%%/charsets/macroman.xml
-%%DATADIR%%/charsets/swe7.xml
-%%DATADIR%%/czech/errmsg.sys
-%%DATADIR%%/danish/errmsg.sys
-%%DATADIR%%/dictionary.txt
-%%DATADIR%%/dutch/errmsg.sys
-%%DATADIR%%/english/errmsg.sys
-%%DATADIR%%/errmsg-utf8.txt
-%%DATADIR%%/estonian/errmsg.sys
-%%DATADIR%%/fill_help_tables.sql
-%%DATADIR%%/french/errmsg.sys
-%%DATADIR%%/german/errmsg.sys
-%%DATADIR%%/greek/errmsg.sys
-%%DATADIR%%/hungarian/errmsg.sys
-%%DATADIR%%/innodb_memcached_config.sql
-%%DATADIR%%/italian/errmsg.sys
-%%DATADIR%%/japanese/errmsg.sys
-%%DATADIR%%/korean/errmsg.sys
-%%DATADIR%%/magic
-%%DATADIR%%/my-default.cnf
-%%DATADIR%%/mysql-log-rotate
-%%DATADIR%%/mysql.server
-%%DATADIR%%/mysql_security_commands.sql
-%%DATADIR%%/mysql_system_tables.sql
-%%DATADIR%%/mysql_system_tables_data.sql
-%%DATADIR%%/mysql_test_data_timezone.sql
-%%DATADIR%%/mysqld_multi.server
-%%DATADIR%%/norwegian-ny/errmsg.sys
-%%DATADIR%%/norwegian/errmsg.sys
-%%DATADIR%%/polish/errmsg.sys
-%%DATADIR%%/portuguese/errmsg.sys
-%%DATADIR%%/romanian/errmsg.sys
-%%DATADIR%%/russian/errmsg.sys
-%%DATADIR%%/serbian/errmsg.sys
-%%DATADIR%%/slovak/errmsg.sys
-%%DATADIR%%/spanish/errmsg.sys
-%%DATADIR%%/swedish/errmsg.sys
-%%DATADIR%%/ukrainian/errmsg.sys
-%%ETCDIR%%/my.cnf.sample
-@dir(mysql,mysql,0750) %%ETCDIR%%/keyring
-@dir(mysql,mysql,0750) %%MY_SECDIR%%
-@dir(mysql,mysql,0750) %%MY_TMPDIR%%
diff --git a/databases/mysql57-client/Makefile b/databases/mysql57-client/Makefile
deleted file mode 100644
index 0e64409255a9..000000000000
--- a/databases/mysql57-client/Makefile
+++ /dev/null
@@ -1,51 +0,0 @@
-# Created by: "Mahdi Mokhtari <mokhi64@gmail.com>"
-
-PORTNAME=	mysql
-PORTREVISION=	1
-PKGNAMESUFFIX=	57-client
-
-COMMENT=	Multithreaded SQL database (client)
-
-LICENSE+=	LGPL21
-
-MASTERDIR=	${.CURDIR}/../mysql57-server
-
-PKGMESSAGE=	${.CURDIR}/pkg-message
-PATCHDIR=	${.CURDIR}/files
-PLIST=		${.CURDIR}/pkg-plist
-
-CONFLICTS_INSTALL=	mysql5[0-68-9]-client-* \
-			mysql[0-46-9][0-9]-client-* \
-			mariadb[0-9][0-9]-client-* \
-			percona[0-9][0-9]-client-*
-
-CMAKE_ARGS+=	-DWITHOUT_SERVER=1 \
-		-DWITH_NDBCLUSTER=1
-
-CFLAGS+=	-DNDEBUG
-CXXFLAGS+=	-DNDEBUG
-
-USE_LDCONFIG+=	${PREFIX}/lib/mysql
-
-MMAN1=		comp_err.1 msql2mysql.1 mysql.1 mysql_config.1 mysql_config_editor.1 mysql_find_rows.1 \
-		mysql_waitpid.1 mysqlaccess.1 mysqladmin.1 mysqlbinlog.1 \
-		mysqlcheck.1 mysqldump.1 mysqlimport.1 mysqlshow.1 mysqlslap.1
-
-CLIENT_ONLY=	yes
-
-OPTIONS_GROUP+=		PLUGINS
-PLUGINS_DESC=		Default Client Plugins
-OPTIONS_GROUP_PLUGINS=	SASLCLIENT
-SASLCLIENT_DESC=	SASL client plugin module
-SASLCLIENT_CMAKE_BOOL=	WITH_AUTHENTICATION_LDAP
-SASLCLIENT_LIB_DEPENDS=		libsasl2.so:security/cyrus-sasl2
-SASLCLIENT_USE=		OPENLDAP=yes
-OPTIONS_DEFAULT+=	SASLCLIENT
-
-# issue 166367: adding symlinks for back-compatibility with ${lib}_r
-post-install:
-	@${LN} -s libmysqlclient.a ${STAGEDIR}${PREFIX}/lib/mysql/libmysqlclient_r.a
-	@${LN} -s libmysqlclient.so ${STAGEDIR}${PREFIX}/lib/mysql/libmysqlclient_r.so
-	@${LN} -s libmysqlclient.so.20 ${STAGEDIR}${PREFIX}/lib/mysql/libmysqlclient_r.so.20
-
-.include "${MASTERDIR}/Makefile"
diff --git a/databases/mysql57-client/files/patch-CMakeLists.txt b/databases/mysql57-client/files/patch-CMakeLists.txt
deleted file mode 100644
index 3e1761d68ea5..000000000000
--- a/databases/mysql57-client/files/patch-CMakeLists.txt
+++ /dev/null
@@ -1,46 +0,0 @@
---- CMakeLists.txt.orig	2017-06-22 14:13:19 UTC
-+++ CMakeLists.txt
-@@ -610,9 +610,6 @@ IF(NOT WITHOUT_SERVER)
-   SET (MYSQLD_STATIC_EMBEDDED_PLUGIN_LIBS "" CACHE INTERNAL "")
-   # Add storage engines and plugins.
-   CONFIGURE_PLUGINS()
--ELSE()
--  # We may still want Cluster client libraries, use -DWITH_NDBCLUSTER=1
--  ADD_SUBDIRECTORY(storage/ndb)
- ENDIF()
- 
- ADD_SUBDIRECTORY(include)
-@@ -647,8 +644,8 @@ ENDIF()
- 
- ADD_SUBDIRECTORY(extra)
- ADD_SUBDIRECTORY(client)
--ADD_SUBDIRECTORY(sql/share)
- ADD_SUBDIRECTORY(libservices)
-+ADD_SUBDIRECTORY(support-files)
- 
- IF(UNIX)
-   ADD_SUBDIRECTORY(man)
-@@ -719,14 +716,13 @@ ELSE()
-   SET(CPACK_GENERATOR "TGZ")
- ENDIF() 
- ADD_SUBDIRECTORY(packaging/WiX)
--ADD_SUBDIRECTORY(packaging/solaris)
- 
- IF(UNIX)
--  INSTALL(FILES Docs/mysql.info DESTINATION ${INSTALL_INFODIR} OPTIONAL COMPONENT Info)
- ENDIF()
- #
- # RPM installs documentation directly from the source tree
- #
-+IF(FALSE)
- IF(NOT INSTALL_LAYOUT MATCHES "RPM")
-   INSTALL(FILES COPYING LICENSE.mysql 
-   DESTINATION ${INSTALL_DOCREADMEDIR} 
-@@ -749,6 +745,7 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM")
-     PATTERN "sp-imp-spec.txt" EXCLUDE
-   )
- ENDIF()
-+ENDIF()
- 
- INCLUDE(CPack)
- 
diff --git a/databases/mysql57-client/files/patch-client_CMakeLists.txt b/databases/mysql57-client/files/patch-client_CMakeLists.txt
deleted file mode 100644
index 843117b51fd6..000000000000
--- a/databases/mysql57-client/files/patch-client_CMakeLists.txt
+++ /dev/null
@@ -1,54 +0,0 @@
---- client/CMakeLists.txt.orig	2016-03-28 18:06:12 UTC
-+++ client/CMakeLists.txt
-@@ -47,6 +47,7 @@ IF(UNIX)
-   TARGET_LINK_LIBRARIES(mysql ${EDITLINE_LIBRARY})
- ENDIF(UNIX)
- 
-+IF(FALSE)
- IF(NOT WITHOUT_SERVER)
-   MYSQL_ADD_EXECUTABLE(mysql_upgrade
-     upgrade/program.cc
-@@ -57,10 +58,13 @@ ADD_COMPILE_FLAGS(
- TARGET_LINK_LIBRARIES(mysql_upgrade mysqlclient client_base mysqlcheck_core)
- ADD_DEPENDENCIES(mysql_upgrade GenFixPrivs GenSysSchema)
- ENDIF()
-+ENDIF()
- 
-+IF(FALSE)
- MYSQL_ADD_EXECUTABLE(mysqltest mysqltest.cc COMPONENT Test)
- SET_SOURCE_FILES_PROPERTIES(mysqltest.cc PROPERTIES COMPILE_FLAGS "-DTHREADS")
- TARGET_LINK_LIBRARIES(mysqltest mysqlclient regex)
- ADD_DEPENDENCIES(mysqltest GenError)
-+ENDIF()
- 
- ADD_CONVENIENCE_LIBRARY(mysqlcheck_core check/mysqlcheck_core.cc)
-@@ -78,8 +82,10 @@ TARGET_LINK_LIBRARIES(mysqlimport mysqlc
- MYSQL_ADD_EXECUTABLE(mysqlshow mysqlshow.c)
- TARGET_LINK_LIBRARIES(mysqlshow mysqlclient)
- 
-+IF(FALSE)
- MYSQL_ADD_EXECUTABLE(mysql_plugin mysql_plugin.c)
- TARGET_LINK_LIBRARIES(mysql_plugin mysqlclient)
-+ENDIF()
- 
- MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc)
- ADD_COMPILE_FLAGS(
-@@ -98,8 +104,10 @@ TARGET_LINK_LIBRARIES(mysqlslap mysqlcli
- MYSQL_ADD_EXECUTABLE(mysql_config_editor mysql_config_editor.cc)
- TARGET_LINK_LIBRARIES(mysql_config_editor mysqlclient)
- 
-+IF(FALSE)
- MYSQL_ADD_EXECUTABLE(mysql_secure_installation mysql_secure_installation.cc)
- TARGET_LINK_LIBRARIES(mysql_secure_installation mysqlclient)
-+ENDIF()
- 
- IF(UNIX AND NOT WITHOUT_SERVER)
-   MYSQL_ADD_EXECUTABLE(mysql_install_db
-@@ -122,7 +130,6 @@ IF(WIN32)
- ENDIF(WIN32)
- 
- SET_TARGET_PROPERTIES (
--  mysql_plugin
-   mysqlcheck
-   mysqldump
-   mysqlimport
diff --git a/databases/mysql57-client/files/patch-cmake_build__configurations_compiler__options.cmake b/databases/mysql57-client/files/patch-cmake_build__configurations_compiler__options.cmake
deleted file mode 100644
index f8c13ec7c398..000000000000
--- a/databases/mysql57-client/files/patch-cmake_build__configurations_compiler__options.cmake
+++ /dev/null
@@ -1,20 +0,0 @@
---- cmake/build_configurations/compiler_options.cmake.orig	2016-08-25 11:52:06 UTC
-+++ cmake/build_configurations/compiler_options.cmake
-@@ -43,7 +43,7 @@ IF(UNIX)  
- 
-   # Default GCC flags
-   IF(CMAKE_COMPILER_IS_GNUCC)
--    SET(COMMON_C_FLAGS "-fabi-version=2 -fno-omit-frame-pointer -fno-strict-aliasing")
-+    SET(COMMON_C_FLAGS "-fno-omit-frame-pointer -fno-strict-aliasing")
-     # Disable inline optimizations for valgrind testing to avoid false positives
-     IF(WITH_VALGRIND)
-       STRING_PREPEND(COMMON_C_FLAGS "-fno-inline ")
-@@ -68,7 +68,7 @@ IF(UNIX)  
-     ENDIF()
-   ENDIF()
-   IF(CMAKE_COMPILER_IS_GNUCXX)
--    SET(COMMON_CXX_FLAGS               "-fabi-version=2 -fno-omit-frame-pointer -fno-strict-aliasing")
-+    SET(COMMON_CXX_FLAGS               "-fno-omit-frame-pointer -fno-strict-aliasing")
-     # GCC 6 has C++14 as default, set it explicitly to the old default.
-     EXECUTE_PROCESS(COMMAND ${CMAKE_CXX_COMPILER} -dumpversion
-                     OUTPUT_VARIABLE GXX_VERSION)
diff --git a/databases/mysql57-client/files/patch-cmake_os_FreeBSD.cmake b/databases/mysql57-client/files/patch-cmake_os_FreeBSD.cmake
deleted file mode 100644
index e2f70f193360..000000000000
--- a/databases/mysql57-client/files/patch-cmake_os_FreeBSD.cmake
+++ /dev/null
@@ -1,32 +0,0 @@
---- cmake/os/FreeBSD.cmake.orig	2018-10-04 05:48:22 UTC
-+++ cmake/os/FreeBSD.cmake
-@@ -30,12 +30,26 @@ IF(NOT FORCE_UNSUPPORTED_COMPILER)
-     IF(NOT HAVE_SUPPORTED_CLANG_VERSION)
-       MESSAGE(FATAL_ERROR "Clang 3.3 or newer is required!")
-     ENDIF()
--  ELSE()
--    MESSAGE(FATAL_ERROR "Unsupported compiler!")
-+    CHECK_C_SOURCE_RUNS("
-+      int main()
-+      {
-+        return (__clang_major__ >= 4);
-+      }" I386_ATOMIC_BUILTINS)
-+    IF((CMAKE_SYSTEM_PROCESSOR MATCHES "i386") AND (NOT I386_ATOMIC_BUILTINS))
-+      SET(HAVE_GCC_ATOMIC_BUILTINS CACHE  INTERNAL "")
-+    ENDIF()
-+  ELSEIF(CMAKE_COMPILER_IS_GNUCC)
-+    EXECUTE_PROCESS(COMMAND ${CMAKE_C_COMPILER} -dumpversion
-+                    OUTPUT_VARIABLE GCC_VERSION)
-+    IF(GCC_VERSION VERSION_LESS 4.4)
-+      MESSAGE(FATAL_ERROR "GCC 4.4 or newer is required!")
-+    ENDIF()
-   ENDIF()
- ENDIF()
- 
- # Should not be needed any more, but kept for easy resurrection if needed
- #   #Legacy option, maybe not needed anymore , taken as is from autotools build
- #   ADD_DEFINITIONS(-DNET_RETRY_COUNT=1000000)
--
-+# For GCC maybe it's also good idea to use
-+#   ADD_DEFINITIONS(-D_GNU_SOURCE)
-+    
diff --git a/databases/mysql57-client/files/patch-cmake_plugin.cmake b/databases/mysql57-client/files/patch-cmake_plugin.cmake
deleted file mode 100644
index 77b38c747b61..000000000000
--- a/databases/mysql57-client/files/patch-cmake_plugin.cmake
+++ /dev/null
@@ -1,25 +0,0 @@
---- cmake/plugin.cmake.orig	2017-06-22 14:13:19 UTC
-+++ cmake/plugin.cmake
-@@ -263,13 +270,17 @@ MACRO(MYSQL_ADD_PLUGIN)
-       MYSQL_INSTALL_TARGETS(${target}
-         DESTINATION ${INSTALL_PLUGINDIR}
-         COMPONENT ${INSTALL_COMPONENT})
--      INSTALL_DEBUG_TARGET(${target}
--        DESTINATION ${INSTALL_PLUGINDIR}/debug
--        COMPONENT ${INSTALL_COMPONENT})
-+      IF(CMAKE_BUILD_TYPE MATCHES "Debug")
-+          INSTALL_DEBUG_TARGET(${target}
-+            DESTINATION ${INSTALL_PLUGINDIR}/debug
-+            COMPONENT ${INSTALL_COMPONENT})
-+          # Add installed files to list for RPMs
-+          FILE(APPEND ${CMAKE_BINARY_DIR}/support-files/plugins.files
-+                  "%attr(755, root, root) %{_prefix}/${INSTALL_PLUGINDIR}/debug/${ARG_MODULE_OUTPUT_NAME}.so\n")
-+      ENDIF()
-       # Add installed files to list for RPMs
-       FILE(APPEND ${CMAKE_BINARY_DIR}/support-files/plugins.files
--              "%attr(755, root, root) %{_prefix}/${INSTALL_PLUGINDIR}/${ARG_MODULE_OUTPUT_NAME}.so\n"
--              "%attr(755, root, root) %{_prefix}/${INSTALL_PLUGINDIR}/debug/${ARG_MODULE_OUTPUT_NAME}.so\n")
-+              "%attr(755, root, root) %{_prefix}/${INSTALL_PLUGINDIR}/${ARG_MODULE_OUTPUT_NAME}.so\n")
-       # For internal testing in PB2, append collections files
-       IF(DEFINED ENV{PB2WORKDIR})
-         PLUGIN_APPEND_COLLECTIONS(${plugin})
diff --git a/databases/mysql57-client/files/patch-cmake_ssl.cmake b/databases/mysql57-client/files/patch-cmake_ssl.cmake
deleted file mode 100644
index 0e70d693a90d..000000000000
--- a/databases/mysql57-client/files/patch-cmake_ssl.cmake
+++ /dev/null
@@ -1,54 +0,0 @@
---- cmake/ssl.cmake.orig	2019-12-06 10:41:47 UTC
-+++ cmake/ssl.cmake
-@@ -150,22 +150,12 @@ MACRO (MYSQL_CHECK_SSL)
-       MESSAGE(STATUS "OPENSSL_APPLINK_C ${OPENSSL_APPLINK_C}")
-     ENDIF()
- 
--    # On mac this list is <.dylib;.so;.a>
--    # We prefer static libraries, so we reverse it here.
--    IF (WITH_SSL_PATH)
--      LIST(REVERSE CMAKE_FIND_LIBRARY_SUFFIXES)
--      MESSAGE(STATUS "suffixes <${CMAKE_FIND_LIBRARY_SUFFIXES}>")
--    ENDIF()
--
-     FIND_LIBRARY(OPENSSL_LIBRARY
-                  NAMES ssl libssl ssleay32 ssleay32MD
-                  HINTS ${OPENSSL_ROOT_DIR}/lib)
-     FIND_LIBRARY(CRYPTO_LIBRARY
-                  NAMES crypto libcrypto libeay32
-                  HINTS ${OPENSSL_ROOT_DIR}/lib)
--    IF (WITH_SSL_PATH)
--      LIST(REVERSE CMAKE_FIND_LIBRARY_SUFFIXES)
--    ENDIF()
- 
-     IF(OPENSSL_INCLUDE_DIR)
-       # Verify version number. Version information looks like:
-@@ -193,9 +183,10 @@ MACRO (MYSQL_CHECK_SSL)
-       )
-     SET(OPENSSL_VERSION ${OPENSSL_VERSION} CACHE INTERNAL "")
- 
--    IF("${OPENSSL_VERSION}" VERSION_GREATER "1.1.0")
--       ADD_DEFINITIONS(-DHAVE_TLSv13)
--       SET(HAVE_TLSv13 1)
-+    CHECK_SYMBOL_EXISTS(TLS1_3_VERSION "openssl/tls1.h" HAVE_TLS1_3_VERSION)
-+    IF(HAVE_TLS1_3_VERSION)
-+       #ADD_DEFINITIONS(-DHAVE_TLSv13)
-+       #SET(HAVE_TLSv13 1)
-        IF(SOLARIS)
-          SET(FORCE_SSL_SOLARIS "-Wl,--undefined,address_of_sk_new_null")
-        ENDIF()
-@@ -203,7 +204,13 @@ MACRO (MYSQL_CHECK_SSL)
-     IF(OPENSSL_INCLUDE_DIR AND
-        OPENSSL_LIBRARY   AND
-        CRYPTO_LIBRARY      AND
--       OPENSSL_MAJOR_VERSION STREQUAL "1"
-+       OPENSSL_MAJOR_VERSION VERSION_GREATER_EQUAL "1"
-+      )
-+      SET(OPENSSL_FOUND TRUE)
-+    ELSEIF(OPENSSL_INCLUDE_DIR AND
-+       OPENSSL_LIBRARY   AND
-+       CRYPTO_LIBRARY      AND
-+       OPENSSL_MAJOR_VERSION STREQUAL "2"
-       )
-       SET(OPENSSL_FOUND TRUE)
-     ELSE()
diff --git a/databases/mysql57-client/files/patch-configure.cmake b/databases/mysql57-client/files/patch-configure.cmake
deleted file mode 100644
index 81ab9495aac3..000000000000
--- a/databases/mysql57-client/files/patch-configure.cmake
+++ /dev/null
@@ -1,15 +0,0 @@
---- configure.cmake.orig	2018-01-16 23:26:09 UTC
-+++ configure.cmake
-@@ -43,6 +43,12 @@ IF(UNIX)
- ENDIF()
- 
- 
-+IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
-+  SET(CMAKE_SHARED_LIBRARY_C_FLAGS
-+    "${CMAKE_SHARED_LIBRARY_C_FLAGS} ${CMAKE_C_FLAGS} -L%%FREEBSD_LOCAL_LIB%%")
-+ENDIF()
-+
-+
- IF(CMAKE_SYSTEM_NAME MATCHES "SunOS" AND CMAKE_COMPILER_IS_GNUCXX)
-   ## We will be using gcc to generate .so files
-   ## Add C flags (e.g. -m64) to CMAKE_SHARED_LIBRARY_C_FLAGS
diff --git a/databases/mysql57-client/files/patch-extra_CMakeLists.txt b/databases/mysql57-client/files/patch-extra_CMakeLists.txt
deleted file mode 100644
index 045b98549e41..000000000000
--- a/databases/mysql57-client/files/patch-extra_CMakeLists.txt
+++ /dev/null
@@ -1,33 +0,0 @@
---- extra/CMakeLists.txt.orig	2016-03-28 18:06:12 UTC
-+++ extra/CMakeLists.txt
-@@ -45,6 +45,7 @@ ENDIF()
- 
- ADD_CUSTOM_COMMAND(OUTPUT ${PROJECT_BINARY_DIR}/include/mysqld_error.h 
-                    ${PROJECT_BINARY_DIR}/sql/share/english/errmsg.sys
-+                   COMMAND mkdir -p ${PROJECT_BINARY_DIR}/sql/share/
-                    COMMAND comp_err
-                     --charset=${PROJECT_SOURCE_DIR}/sql/share/charsets 
-                     --out-dir=${PROJECT_BINARY_DIR}/sql/share/
-@@ -73,6 +74,7 @@ IF (WIN32 AND WITH_SSL_PATH AND HAVE_CRY
- ENDIF()
- 
- 
-+IF(FALSE)
- MYSQL_ADD_EXECUTABLE(my_print_defaults my_print_defaults.c)
- TARGET_LINK_LIBRARIES(my_print_defaults  mysys mysys_ssl)
- SET_TARGET_PROPERTIES(my_print_defaults PROPERTIES LINKER_LANGUAGE CXX)
-@@ -142,11 +144,14 @@ IF(WITH_INNOBASE_STORAGE_ENGINE)
-   TARGET_LINK_LIBRARIES(innochecksum mysys mysys_ssl ${LZ4_LIBRARY})
-   ADD_DEPENDENCIES(innochecksum GenError)
- ENDIF()
-+ENDIF()
- 
-+IF(FALSE)
- IF(UNIX)
-   MYSQL_ADD_EXECUTABLE(resolve_stack_dump resolve_stack_dump.cc)
-   TARGET_LINK_LIBRARIES(resolve_stack_dump mysys mysys_ssl)
- ENDIF()
-+ENDIF()
- 
- # In published release builds on Solaris, we need to bundle gcc source.
- # PB2 will take care of putting it in extra/ when needed
diff --git a/databases/mysql57-client/files/patch-include_CMakeLists.txt b/databases/mysql57-client/files/patch-include_CMakeLists.txt
deleted file mode 100644
index 1fc41ad15601..000000000000
--- a/databases/mysql57-client/files/patch-include_CMakeLists.txt
+++ /dev/null
@@ -1,10 +0,0 @@
---- include/CMakeLists.txt.orig	2016-03-28 18:06:12 UTC
-+++ include/CMakeLists.txt
-@@ -38,6 +38,7 @@ SET(HEADERS_ABI 
- 
- SET(HEADERS 
-   ${HEADERS_ABI} 
-+  hash.h
-   my_dbug.h 
-   m_string.h
-   my_sys.h 
diff --git a/databases/mysql57-client/files/patch-include_my__compare.h b/databases/mysql57-client/files/patch-include_my__compare.h
deleted file mode 100644
index 1a64142bb658..000000000000
--- a/databases/mysql57-client/files/patch-include_my__compare.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- include/my_compare.h.orig	2016-03-28 18:06:12 UTC
-+++ include/my_compare.h
-@@ -40,7 +40,7 @@ extern "C" {
-   But beware the dependency of MI_MAX_POSSIBLE_KEY_BUFF and HA_MAX_KEY_LENGTH.
- */
- 
--#define HA_MAX_KEY_LENGTH           1000        /* Max length in bytes */
-+#define HA_MAX_KEY_LENGTH           4000        /* Max length in bytes */
- #define HA_MAX_KEY_SEG              16          /* Max segments for key */
- 
- #define HA_MAX_POSSIBLE_KEY_BUFF    (HA_MAX_KEY_LENGTH + 24+ 6+6)
diff --git a/databases/mysql57-client/files/patch-include_my_openssl.h b/databases/mysql57-client/files/patch-include_my_openssl.h
deleted file mode 100644
index 43ddb2935038..000000000000
--- a/databases/mysql57-client/files/patch-include_my_openssl.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- include/my_openssl.h.orig	2020-03-23 17:35:17 UTC
-+++ include/my_openssl.h
-@@ -51,7 +51,7 @@ extern "C" {
-  */
- static inline int mysql_OPENSSL_init()
- {
--#if defined(HAVE_STATIC_OPENSSL)
-+#if defined(HAVE_STATIC_OPENSSL) && !defined(LIBRESSL_VERSION_NUMBER)
-   return OPENSSL_init_crypto(OPENSSL_INIT_NO_ATEXIT, NULL);
- #else
-   return SSL_library_init();
diff --git a/databases/mysql57-client/files/patch-include_myisam.h b/databases/mysql57-client/files/patch-include_myisam.h
deleted file mode 100644
index 0a4b795e9426..000000000000
--- a/databases/mysql57-client/files/patch-include_myisam.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- include/myisam.h.orig	2016-03-28 18:06:12 UTC
-+++ include/myisam.h
-@@ -45,7 +45,7 @@ extern "C" {
-   The following defines can be increased if necessary.
-   But beware the dependency of MI_MAX_POSSIBLE_KEY_BUFF and MI_MAX_KEY_LENGTH.
- */
--#define MI_MAX_KEY_LENGTH           1000            /* Max length in bytes */
-+#define MI_MAX_KEY_LENGTH           4000            /* Max length in bytes */
- #define MI_MAX_KEY_SEG              16              /* Max segments for key */
- 
- #define MI_MAX_KEY_BUFF  (MI_MAX_KEY_LENGTH+MI_MAX_KEY_SEG*6+8+8)
diff --git a/databases/mysql57-client/files/patch-libmysql_CMakeLists.txt b/databases/mysql57-client/files/patch-libmysql_CMakeLists.txt
deleted file mode 100644
index b90821a7f767..000000000000
--- a/databases/mysql57-client/files/patch-libmysql_CMakeLists.txt
+++ /dev/null
@@ -1,11 +0,0 @@
---- libmysql/CMakeLists.txt.orig	2016-03-28 18:06:12 UTC
-+++ libmysql/CMakeLists.txt
-@@ -260,7 +260,7 @@ IF(NOT DISABLE_SHARED)
-     COMPONENT SharedLibraries)
-   IF(UNIX)
-     # libtool compatability
--    IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD" OR APPLE)
-+    IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD|DragonFly" OR APPLE)
-       SET(OS_SHARED_LIB_VERSION "${SHARED_LIB_MAJOR_VERSION}")
-     ELSE()
-       SET(OS_SHARED_LIB_VERSION
diff --git a/databases/mysql57-client/files/patch-man_CMakeLists.txt b/databases/mysql57-client/files/patch-man_CMakeLists.txt
deleted file mode 100644
index e02a804949d8..000000000000
--- a/databases/mysql57-client/files/patch-man_CMakeLists.txt
+++ /dev/null
@@ -1,13 +0,0 @@
---- man/CMakeLists.txt.orig	2015-11-29 19:16:24 UTC
-+++ man/CMakeLists.txt
-@@ -15,10 +15,6 @@
- 
- # Copy man pages
- FILE(GLOB MAN1_FILES *.1)
--FILE(GLOB MAN1_EXCLUDE make_win_bin_dist.1)
--FILE(GLOB MAN1_NDB ndb*.1)
--FILE(GLOB MAN8_FILES *.8)
--FILE(GLOB MAN8_NDB ndb*.8)
- IF(MAN1_FILES)
-   IF(MAN1_EXCLUDE)
-     LIST(REMOVE_ITEM MAN1_FILES ${MAN1_EXCLUDE})
diff --git a/databases/mysql57-client/files/patch-mysys__ssl_my__default.cc b/databases/mysql57-client/files/patch-mysys__ssl_my__default.cc
deleted file mode 100644
index ea05679341fa..000000000000
--- a/databases/mysql57-client/files/patch-mysys__ssl_my__default.cc
+++ /dev/null
@@ -1,61 +0,0 @@
---- mysys_ssl/my_default.cc.orig	2016-08-25 11:52:06 UTC
-+++ mysys_ssl/my_default.cc
-@@ -114,7 +114,7 @@ static my_bool defaults_already_read= FA
- 
- /* Which directories are searched for options (and in which order) */
- 
--#define MAX_DEFAULT_DIRS 6
-+#define MAX_DEFAULT_DIRS 7
- #define DEFAULT_DIRS_SIZE (MAX_DEFAULT_DIRS + 1)  /* Terminate with NULL */
- static const char **default_directories = NULL;
- 
-@@ -914,6 +914,14 @@ static int search_default_file_with_ext(
-       return 1;                                 /* Ignore wrong files */
-   }
- 
-+  if (strstr(name, "/etc") == name)
-+  {
-+    fprintf(stderr,
-+             "error: Config file %s in invalid location, please move to or merge with /usr/local%s\n",
-+             name,name);
-+      goto err;
-+  }
-+
-   while (mysql_file_getline(buff, sizeof(buff) - 1, fp, is_login_file))
-   {
-     line++;
-@@ -1252,7 +1260,8 @@ void my_print_default_files(const char *
-             end[(strlen(end)-1)] = ' ';
-           else
-             strxmov(end, conf_file, *ext , " ",  NullS);
--          fputs(name, stdout);
-+          if (strstr(name, "/etc") != name)
-+            fputs(name, stdout);
-         }
-       }
-     }
-@@ -1411,13 +1420,8 @@ static const char **init_default_directo
- 
- #else
- 
--  errors += add_directory(alloc, "/etc/", dirs);
--  errors += add_directory(alloc, "/etc/mysql/", dirs);
--
--#if defined(DEFAULT_SYSCONFDIR)
--  if (DEFAULT_SYSCONFDIR[0])
--    errors += add_directory(alloc, DEFAULT_SYSCONFDIR, dirs);
--#endif /* DEFAULT_SYSCONFDIR */
-+  errors += add_directory(alloc, "/usr/local/etc/", dirs);
-+  errors += add_directory(alloc, "/usr/local/etc/mysql/", dirs);
- 
- #endif
- 
-@@ -1488,7 +1492,7 @@ int check_file_permissions(const char *f
-   MY_STAT stat_info;
- 
-   if (!my_stat(file_name,&stat_info,MYF(0)))
--    return 1;
-+    return 0;
-   /*
-     Ignore .mylogin.cnf file if not exclusively readable/writable
-     by current user.
diff --git a/databases/mysql57-client/files/patch-mysys_mf__iocache2.c b/databases/mysql57-client/files/patch-mysys_mf__iocache2.c
deleted file mode 100644
index 10663953a1d5..000000000000
--- a/databases/mysql57-client/files/patch-mysys_mf__iocache2.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- mysys/mf_iocache2.c.orig	2018-10-28 11:22:04 UTC
-+++ mysys/mf_iocache2.c
-@@ -19,6 +19,7 @@
- 
- #include "mysys_priv.h"
- #include "my_sys.h"
-+#include "mysql/psi/mysql_file.h"
- #include <m_string.h>
- #include <stdarg.h>
- #include <m_ctype.h>
diff --git a/databases/mysql57-client/files/patch-mysys_my__symlink.c b/databases/mysql57-client/files/patch-mysys_my__symlink.c
deleted file mode 100644
index 1a392a41660c..000000000000
--- a/databases/mysql57-client/files/patch-mysys_my__symlink.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- mysys/my_symlink.c.orig	2017-07-19 12:10:42 UTC
-+++ mysys/my_symlink.c
-@@ -23,6 +23,7 @@
- #include <sys/param.h>
- #include <sys/stat.h>
- #endif
-+#include "my_dir.h"
- 
- /*
-   Reads the content of a symbolic link
diff --git a/databases/mysql57-client/files/patch-scripts_CMakeLists.txt b/databases/mysql57-client/files/patch-scripts_CMakeLists.txt
deleted file mode 100644
index 493e407cbff5..000000000000
--- a/databases/mysql57-client/files/patch-scripts_CMakeLists.txt
+++ /dev/null
@@ -1,64 +0,0 @@
---- scripts/CMakeLists.txt.orig	2019-06-10 10:43:20.000000000 -0400
-+++ scripts/CMakeLists.txt	2019-08-01 10:59:24.177559000 -0400
-@@ -46,6 +46,7 @@
-   MESSAGE(FATAL_ERROR "Cannot concatenate files")
- ENDIF()
- 
-+IF(FALSE)
- # Build mysql_fix_privilege_tables.c
- ADD_CUSTOM_COMMAND(
-   OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/mysql_fix_privilege_tables_sql.c
-@@ -66,6 +67,7 @@
-   DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/mysql_fix_privilege_tables_sql.c
-   ${CMAKE_CURRENT_BINARY_DIR}/sql_commands_sys_schema.h
- )
-+ENDIF()
- 
- # If we do not have performance schema compiled in then sys will not work,
- # so only create an empty sys database with an auto-generated file,
-@@ -146,6 +148,7 @@
-   )
- ENDIF()
- 
-+IF(FALSE)
- IF(UNIX)
-  FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/make_binary_distribution 
-    "cd ${CMAKE_BINARY_DIR} && '${CMAKE_CPACK_COMMAND}' -G TGZ --config CPackConfig.cmake\n" )
-@@ -153,6 +156,7 @@
-   COMMAND chmod +x ${CMAKE_CURRENT_BINARY_DIR}/make_binary_distribution
- )
- ENDIF()
-+ENDIF()
- 
- IF(NOT WITHOUT_SERVER)
-   INSTALL(FILES
-@@ -326,6 +330,8 @@
-           GET_FILENAME_COMPONENT(lib "${lib}" NAME_WE)
-           STRING(REGEX REPLACE "^lib" "" lib "${lib}")
-           SET(${var} "${${var}}-l${lib} " )
-+        ELSEIF(lib STREQUAL "-pthread")
-+          SET(${var} "${${var}}-pthread " )
-         ELSE()
-           SET(${var} "${${var}}-l${lib} " )
-         ENDIF()
-@@ -411,19 +417,7 @@
-   # On Unix, most of the files end up in the bin directory
-   SET(mysql_config_COMPONENT COMPONENT Development)
- 
--  IF(WITH_SYSTEMD)
--    SET(BIN_SCRIPTS
--      mysql_config
--      mysqldumpslow
--      )
--  ELSE()
--    SET(BIN_SCRIPTS
--      mysql_config
--      mysqldumpslow
--      mysqld_multi
--      mysqld_safe
--      )
--  ENDIF()
-+  SET(BIN_SCRIPTS mysql_config)
- 
-   SET(PKGCONFIG_FILE ${LIBMYSQL_OS_OUTPUT_NAME}.pc)
-   STRING(REGEX REPLACE "/mysql$" "" PKGCONFIG_DIR "${INSTALL_LIBDIR}")
diff --git a/databases/mysql57-client/files/patch-sql_auth_sha2_password_common.cc b/databases/mysql57-client/files/patch-sql_auth_sha2_password_common.cc
deleted file mode 100644
index 567a7da1628c..000000000000
--- a/databases/mysql57-client/files/patch-sql_auth_sha2_password_common.cc
+++ /dev/null
@@ -1,12 +0,0 @@
---- sql/auth/sha2_password_common.cc
-+++ sql/auth/sha2_password_common.cc
-@@ -116,7 +116,8 @@ bool SHA256_digest::retrieve_digest(unsigned char *digest,
-     DBUG_RETURN(true);
-   }
-   m_ok= EVP_DigestFinal_ex(md_context, m_digest, NULL);
--#if defined(HAVE_WOLFSSL) || OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if defined(HAVE_WOLFSSL) || OPENSSL_VERSION_NUMBER < 0x10100000L || \
-+    (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x02090000fL)
-   EVP_MD_CTX_cleanup(md_context);
- #else  /* OPENSSL_VERSION_NUMBER < 0x10100000L */
-   EVP_MD_CTX_reset(md_context);
diff --git a/databases/mysql57-client/files/patch-storage_myisam_mi__dynrec.c b/databases/mysql57-client/files/patch-storage_myisam_mi__dynrec.c
deleted file mode 100644
index 282cffdbcbc5..000000000000
--- a/databases/mysql57-client/files/patch-storage_myisam_mi__dynrec.c
+++ /dev/null
@@ -1,23 +0,0 @@
---- storage/myisam/mi_dynrec.c.orig	2016-03-28 18:06:12 UTC
-+++ storage/myisam/mi_dynrec.c
-@@ -65,18 +65,13 @@ my_bool mi_dynmap_file(MI_INFO *info, my
-     DBUG_RETURN(1);
-   }
-   /*
--    I wonder if it is good to use MAP_NORESERVE. From the Linux man page:
--    MAP_NORESERVE
--      Do not reserve swap space for this mapping. When swap space is
--      reserved, one has the guarantee that it is possible to modify the
--      mapping. When swap space is not reserved one might get SIGSEGV
--      upon a write if no physical memory is available.
-+    MAP_NORESERVE is unimplemented in FreeBSD
-   */
-   info->s->file_map= (uchar*)
-                   my_mmap(0, (size_t) size,
-                           info->s->mode==O_RDONLY ? PROT_READ :
-                           PROT_READ | PROT_WRITE,
--                          MAP_SHARED | MAP_NORESERVE,
-+                          MAP_SHARED,
-                           info->dfile, 0L);
-   if (info->s->file_map == (uchar*) MAP_FAILED)
-   {
diff --git a/databases/mysql57-client/files/patch-support-files_CMakeLists.txt b/databases/mysql57-client/files/patch-support-files_CMakeLists.txt
deleted file mode 100644
index 405d4f734914..000000000000
--- a/databases/mysql57-client/files/patch-support-files_CMakeLists.txt
+++ /dev/null
@@ -1,27 +0,0 @@
---- support-files/CMakeLists.txt.orig	2017-03-18 07:45:14 UTC
-+++ support-files/CMakeLists.txt
-@@ -47,6 +47,7 @@ IF(UNIX)
-     SET (PIDOF "pgrep -d' ' -f")
-   ENDIF()
-   SET(prefix ${CMAKE_INSTALL_PREFIX})
-+IF (FALSE)
-   FOREACH(script  mysqld_multi.server mysql-log-rotate)
-     CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${script}.sh 
-                    ${CMAKE_CURRENT_BINARY_DIR}/${script} @ONLY )
-@@ -59,9 +60,11 @@ IF(UNIX)
-   IF(INSTALL_SUPPORTFILESDIR)
-     INSTALL(FILES magic DESTINATION ${inst_location} COMPONENT SupportFiles)
-   ENDIF()
-+ENDIF()
- 
-   INSTALL(FILES mysql.m4 DESTINATION ${INSTALL_SHAREDIR}/aclocal COMPONENT Development)
-   
-+IF(FALSE)
-   SET(bindir ${prefix}/${INSTALL_BINDIR})
-   SET(sbindir ${prefix}/${INSTALL_SBINDIR})
-   SET(scriptdir ${prefix}/${INSTALL_SCRIPTDIR})
-@@ -74,3 +77,4 @@ IF(UNIX)
-     PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ 
-     GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
- ENDIF()
-+ENDIF()
diff --git a/databases/mysql57-client/files/patch-vio_viosslfactories.c b/databases/mysql57-client/files/patch-vio_viosslfactories.c
deleted file mode 100644
index 00c32ea9dca3..000000000000
--- a/databases/mysql57-client/files/patch-vio_viosslfactories.c
+++ /dev/null
@@ -1,62 +0,0 @@
---- vio/viosslfactories.c
-+++ vio/viosslfactories.c
-@@ -123,21 +123,19 @@ static DH *get_dh2048(void)
-   DH *dh;
-   if ((dh=DH_new()))
-   {
--    BIGNUM *p= BN_bin2bn(dh2048_p, sizeof(dh2048_p), NULL);
--    BIGNUM *g= BN_bin2bn(dh2048_g, sizeof(dh2048_g), NULL);
--    if (!p || !g
--#if OPENSSL_VERSION_NUMBER >= 0x10100000L
--        || !DH_set0_pqg(dh, p, NULL, g)
--#endif /* OPENSSL_VERSION_NUMBER >= 0x10100000L */
--    ) {
--      /* DH_free() will free 'p' and 'g' at once. */
-+    BIGNUM *p = BN_bin2bn(dh2048_p,sizeof(dh2048_p), NULL);
-+    BIGNUM *g = BN_bin2bn(dh2048_g,sizeof(dh2048_g), NULL);
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-+    dh->p=p;
-+    dh->g=g;
-+    if (! dh->p || ! dh->g)
-+#else
-+    if (!DH_set0_pqg(dh, p, NULL, g))
-+#endif
-+    {
-       DH_free(dh);
--      return NULL;
-+      dh = NULL;
-     }
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
--    dh->p= p;
--    dh->g= g;
--#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */
-   }
-   return(dh);
- }
-@@ -503,7 +501,7 @@ new_VioSSLFd(const char *key_file, const char *cert_fi
-   struct st_VioSSLFd *ssl_fd;
-   /* MySQL 5.7 supports TLS up to v1.2, explicitly disable TLSv1.3. */
-   long ssl_ctx_options= SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3
--#ifdef HAVE_TLSv13
-+#if defined(HAVE_TLSv13) && !defined(LIBRESSL_VERSION_NUMBER)
-                         | SSL_OP_NO_TLSv1_3
- #endif /* HAVE_TLSv13 */
-                         ;
-@@ -536,7 +534,7 @@ new_VioSSLFd(const char *key_file, const char *cert_fi
-                     SSL_OP_NO_TLSv1 |
-                     SSL_OP_NO_TLSv1_1
-                     | SSL_OP_NO_TLSv1_2
--#ifdef HAVE_TLSv13
-+#if defined(HAVE_TLSv13) && !defined(LIBRESSL_VERSION_NUMBER)
-                     | SSL_OP_NO_TLSv1_3
- #endif /* HAVE_TLSv13 */
-                     | SSL_OP_NO_TICKET
-@@ -559,7 +557,7 @@ new_VioSSLFd(const char *key_file, const char *cert_fi
- 
-   SSL_CTX_set_options(ssl_fd->ssl_context, ssl_ctx_options);
- 
--#ifdef HAVE_TLSv13
-+#if defined(HAVE_TLSv13) && !defined(LIBRESSL_VERSION_NUMBER)
-   /*
-     MySQL 5.7 doesn't support TLSv1.3 - set empty TLSv1.3 ciphersuites.
-   */
diff --git a/databases/mysql57-client/pkg-message b/databases/mysql57-client/pkg-message
deleted file mode 100644
index 2890251a7084..000000000000
--- a/databases/mysql57-client/pkg-message
+++ /dev/null
@@ -1,8 +0,0 @@
-[
-{ type: install
-  message: <<EOM
-This is the mysql CLIENT without the server.
-for complete server and client, please install databases/mysql57-server
-EOM
-}
-]
diff --git a/databases/mysql57-client/pkg-plist b/databases/mysql57-client/pkg-plist
deleted file mode 100644
index e4767fa87d2a..000000000000
--- a/databases/mysql57-client/pkg-plist
+++ /dev/null
@@ -1,140 +0,0 @@
-bin/mysql
-bin/mysql_config
-bin/mysql_config_editor
-bin/mysql_ssl_rsa_setup
-bin/mysqladmin
-bin/mysqlbinlog
-bin/mysqlcheck
-bin/mysqldump
-bin/mysqlimport
-bin/mysqlpump
-bin/mysqlshow
-bin/mysqlslap
-include/mysql/binary_log_types.h
-include/mysql/big_endian.h
-include/mysql/byte_order_generic.h
-include/mysql/byte_order_generic_x86.h
-include/mysql/decimal.h
-include/mysql/errmsg.h
-include/mysql/hash.h
-include/mysql/keycache.h
-include/mysql/little_endian.h
-include/mysql/m_ctype.h
-include/mysql/m_string.h
-include/mysql/my_alloc.h
-include/mysql/my_byteorder.h
-include/mysql/my_command.h
-include/mysql/my_compiler.h
-include/mysql/my_config.h
-include/mysql/my_dbug.h
-include/mysql/my_dir.h
-include/mysql/my_getopt.h
-include/mysql/my_global.h
-include/mysql/my_list.h
-include/mysql/my_sys.h
-include/mysql/my_thread.h
-include/mysql/my_thread_local.h
-include/mysql/my_xml.h
-include/mysql/mysql.h
-include/mysql/mysql/client_authentication.h
-include/mysql/mysql/client_plugin.h
-include/mysql/mysql/client_plugin.h.pp
-include/mysql/mysql/com_data.h
-include/mysql/mysql/get_password.h
-include/mysql/mysql/group_replication_priv.h
-include/mysql/mysql/innodb_priv.h
-include/mysql/mysql/mysql_lex_string.h
-include/mysql/mysql/plugin.h
-include/mysql/mysql/plugin_audit.h
-include/mysql/mysql/plugin_audit.h.pp
-include/mysql/mysql/plugin_auth.h
-include/mysql/mysql/plugin_auth.h.pp
-include/mysql/mysql/plugin_auth_common.h
-include/mysql/mysql/plugin_ftparser.h
-include/mysql/mysql/plugin_ftparser.h.pp
-include/mysql/mysql/plugin_group_replication.h
-include/mysql/mysql/plugin_keyring.h
-include/mysql/mysql/plugin_keyring.h.pp
-include/mysql/mysql/plugin_trace.h
-include/mysql/mysql/plugin_validate_password.h
-include/mysql/mysql/psi/mysql_file.h
-include/mysql/mysql/psi/mysql_idle.h
-include/mysql/mysql/psi/mysql_mdl.h
-include/mysql/mysql/psi/mysql_memory.h
-include/mysql/mysql/psi/mysql_ps.h
-include/mysql/mysql/psi/mysql_socket.h
-include/mysql/mysql/psi/mysql_sp.h
-include/mysql/mysql/psi/mysql_stage.h
-include/mysql/mysql/psi/mysql_statement.h
-include/mysql/mysql/psi/mysql_table.h
-include/mysql/mysql/psi/mysql_thread.h
-include/mysql/mysql/psi/mysql_transaction.h
-include/mysql/mysql/psi/psi.h
-include/mysql/mysql/psi/psi_base.h
-include/mysql/mysql/psi/psi_memory.h
-include/mysql/mysql/service_command.h
-include/mysql/mysql/service_locking.h
-include/mysql/mysql/service_my_plugin_log.h
-include/mysql/mysql/service_my_snprintf.h
-include/mysql/mysql/service_mysql_alloc.h
-include/mysql/mysql/service_mysql_keyring.h
-include/mysql/mysql/service_mysql_password_policy.h
-include/mysql/mysql/service_mysql_string.h
-include/mysql/mysql/service_parser.h
-include/mysql/mysql/service_rpl_transaction_ctx.h
-include/mysql/mysql/service_rpl_transaction_write_set.h
-include/mysql/mysql/service_rules_table.h
-include/mysql/mysql/service_security_context.h
-include/mysql/mysql/service_srv_session.h
-include/mysql/mysql/service_srv_session_info.h
-include/mysql/mysql/service_ssl_wrapper.h
-include/mysql/mysql/service_thd_alloc.h
-include/mysql/mysql/service_thd_engine_lock.h
-include/mysql/mysql/service_thd_wait.h
-include/mysql/mysql/service_thread_scheduler.h
-include/mysql/mysql/services.h
-include/mysql/mysql/services.h.pp
-include/mysql/mysql/thread_pool_priv.h
-include/mysql/mysql/thread_type.h
-include/mysql/mysql_com.h
-include/mysql/mysql_com_server.h
-include/mysql/mysql_embed.h
-include/mysql/mysql_time.h
-include/mysql/mysql_version.h
-include/mysql/mysqld_ername.h
-include/mysql/mysqld_error.h
-include/mysql/plugin.h
-include/mysql/plugin_audit.h
-include/mysql/plugin_ftparser.h
-include/mysql/plugin_group_replication.h
-include/mysql/plugin_keyring.h
-include/mysql/plugin_validate_password.h
-include/mysql/sql_common.h
-include/mysql/sql_state.h
-include/mysql/sslopt-case.h
-include/mysql/sslopt-longopts.h
-include/mysql/sslopt-vars.h
-include/mysql/thr_cond.h
-include/mysql/thr_mutex.h
-include/mysql/thr_rwlock.h
-include/mysql/typelib.h
-lib/mysql/libmysqlclient.a
-lib/mysql/libmysqlclient.so
-lib/mysql/libmysqlclient.so.20
-lib/mysql/libmysqlclient_r.a
-lib/mysql/libmysqlclient_r.so
-lib/mysql/libmysqlclient_r.so.20
-%%SASLCLIENT%%lib/mysql/plugin/authentication_ldap_sasl_client.so
-libdata/pkgconfig/mysqlclient.pc
-man/man1/comp_err.1.gz
-man/man1/mysql.1.gz
-man/man1/mysql_config.1.gz
-man/man1/mysql_config_editor.1.gz
-man/man1/mysqladmin.1.gz
-man/man1/mysqlbinlog.1.gz
-man/man1/mysqlcheck.1.gz
-man/man1/mysqldump.1.gz
-man/man1/mysqlimport.1.gz
-man/man1/mysqlshow.1.gz
-man/man1/mysqlslap.1.gz
-share/aclocal/mysql.m4
diff --git a/databases/mysql57-server/Makefile b/databases/mysql57-server/Makefile
deleted file mode 100644
index 2ace4c5f7304..000000000000
--- a/databases/mysql57-server/Makefile
+++ /dev/null
@@ -1,192 +0,0 @@
-# Created by: Mahdi Mokhtari <mokhi64@gmail.com>
-
-PORTNAME?=	mysql
-PORTVERSION=	5.7.35
-PORTREVISION?=	0
-CATEGORIES=	databases
-MASTER_SITES=	MYSQL/MySQL-5.7
-PKGNAMESUFFIX?=	57-server
-DISTNAME=	${PORTNAME}-boost-${PORTVERSION}
-
-MAINTAINER=	joneum@FreeBSD.org
-COMMENT?=	Multithreaded SQL database (server)
-
-LICENSE=	GPLv2
-
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
-
-SLAVEDIRS=	databases/mysql57-client
-USES=		bison:build cmake:noninja compiler:c11 compiler:c++11-lib \
-		cpe groff:run libedit localbase perl5 shebangfix ssl
-
-CPE_VENDOR=	oracle
-
-USE_PERL5=	run
-
-MY_DBDIR=	/var/db/mysql
-MY_SECDIR=	/var/db/mysql_secure
-MY_TMPDIR=	/var/db/mysql_tmpdir
-
-LIB_DEPENDS+=	libcurl.so:ftp/curl \
-		libevent.so:devel/libevent \
-		liblz4.so:archivers/liblz4 \
-		libprotobuf.so:devel/protobuf
-
-CMAKE_BUILD_TYPE=	Release
-
-CFLAGS+=	-DNDEBUG
-CXXFLAGS+=	-DNDEBUG
-
-CMAKE_ARGS+=	-DINSTALL_LAYOUT=FREEBSD \
-		-DINSTALL_LDCONFIGDIR="${LOCALBASE}/libdata/ldconfig" \
-		-DINSTALL_PKGCONFIGDIR="${LOCALBASE}/libdata/pkgconfig" \
-		-DINSTALL_DOCDIR="share/doc/mysql" \
-		-DINSTALL_DOCREADMEDIR="share/doc/mysql" \
-		-DINSTALL_INCLUDEDIR="include/mysql" \
-		-DINSTALL_INFODIR="${INFO_PATH}" \
-		-DINSTALL_LIBDIR="lib/mysql" \
-		-DINSTALL_MANDIR="man" \
-		-DINSTALL_MYSQLDATADIR="${MY_DBDIR}" \
-		-DINSTALL_MYSQLKEYRINGDIR="etc/mysql/keyring" \
-		-DINSTALL_MYSQLSHAREDIR="share/mysql" \
-		-DINSTALL_MYSQLTESTDIR="share/mysql/tests" \
-		-DINSTALL_PLUGINDIR="lib/mysql/plugin" \
-		-DINSTALL_SBINDIR="libexec" \
-		-DINSTALL_SCRIPTDIR="bin" \
-		-DINSTALL_SECURE_FILE_PRIVDIR="${MY_SECDIR}" \
-		-DINSTALL_SHAREDIR="share" \
-		-DINSTALL_SUPPORTFILESDIR="share/mysql" \
-		-DMYSQL_KEYRINGDIR="${ETCDIR}/keyring" \
-		-DWITH_BOOST="${WRKSRC}/boost" \
-		-DWITH_EDITLINE=system \
-		-DWITH_LIBEVENT=system \
-		-DWITH_LZ4=system \
-		-DWITH_ZLIB=system \
-		-DWITH_PROTOBUF=system \
-		-DWITH_CURL=system \
-		-DINSTALL_MYSQLTESTDIR=0 \
-		-DWITH_DEBUG=0
-
-SHEBANG_FILES=	scripts/*.pl* scripts/*.sh
-
-.ifdef USE_MYSQL
-.error You have `USE_MYSQL' variable defined either in environment or in make(1) arguments. Please undefine and try again.
-.endif
-
-SUB_LIST=	MY_DBDIR=${MY_DBDIR} \
-		MY_SECDIR=${MY_SECDIR} \
-		MY_TMPDIR=${MY_TMPDIR}
-
-PLIST_SUB=	MY_DBDIR=${MY_DBDIR} \
-		MY_SECDIR=${MY_SECDIR} \
-		MY_TMPDIR=${MY_TMPDIR}
-
-OPTIONS_SUB=		YES
-
-# MySQL-Server part
-.if !defined(CLIENT_ONLY)
-USES+=		mysql:57
-
-CONFLICTS_INSTALL=	mysql5[0-68-9]-server-* \
-			mysql[0-46-9][0-9]-server-* \
-			mysqlwsrep* \
-			mariadb[0-9][0-9]-server-* \
-			percona[0-9][0-9]-server-*
-
-USE_RC_SUBR=	mysql-server
-
-SUB_FILES=	my.cnf.sample pkg-message
-
-USERS=		mysql
-GROUPS=		mysql
-
-USE_CXXSTD=	c++11
-USE_LDCONFIG+=	${PREFIX}/lib/mysql/plugin
-
-MMAN1=		my_print_defaults.1 myisam_ftdump.1 myisamchk.1 myisamlog.1 myisampack.1 \
-		mysql.server.1 mysql_convert_table_format.1 mysql_fix_extensions.1 \
-		mysql_install_db.1 mysql_plugin.1 mysql_secure_installation.1 mysql_setpermission.1 \
-		mysql_tzinfo_to_sql.1 mysql_upgrade.1 mysql_zap.1 mysqlbug.1 \
-		mysqld_multi.1 mysqld_safe.1 mysqldumpslow.1 mysqlhotcopy.1 mysqlman.1 \
-		mysqltest.1 perror.1 replace.1 resolve_stack_dump.1 resolveip.1
-
-CMAKE_ARGS+=	-DWITH_EMBEDDED_SERVER="ON"
-
-OPTIONS_GROUP+=		STORAGE
-OPTIONS_GROUP_STORAGE=	ARCHIVE BLACKHOLE EXAMPLE FEDERATED INNOBASE PARTITION PERFSCHEMA
-STORAGE_DESC=		Permissible "Storage Engines" (to compile statically into the server)
-ARCHIVE_DESC=		Compile "Archive Storage" statically in server
-BLACKHOLE_DESC=		Compile "Blackhole Storage" statically in server
-EXAMPLE_DESC=		Compile "Example Storage" statically in server
-FEDERATED_DESC=		Compile "Federated Storage" statically in server
-INNOBASE_DESC=		Compile "InnoDB Storage" statically in server
-PARTITION_DESC=		Compile "Partitioning support Storage" statically in server
-PERFSCHEMA_DESC=	Compile "Performance Schema Storage" statically in server
-
-ARCHIVE_CMAKE_ON=	-DWITH_ARCHIVE_STORAGE_ENGINE=1
-BLACKHOLE_CMAKE_ON=	-DWITH_BLACKHOLE_STORAGE_ENGINE=1
-EXAMPLE_CMAKE_ON=	-DWITH_EXAMPLE_STORAGE_ENGINE=1
-FEDERATED_CMAKE_ON=	-DWITH_FEDERATED_STORAGE_ENGINE=1
-INNOBASE_CMAKE_ON=	-DWITH_INNOBASE_STORAGE_ENGINE=1
-PARTITION_CMAKE_ON=	-DWITH_PARTITION_STORAGE_ENGINE=1
-PERFSCHEMA_CMAKE_ON=	-DWITH_PERFSCHEMA_STORAGE_ENGINE=1
-
-OPTIONS_GROUP+=		FEATURES
-FEATURES_DESC=		Default features knobs
-OPTIONS_GROUP_FEATURES=	PERFSCHM
-PERFSCHM_DESC=		Enable "Performance Schema" by default (High RAM usage)
-OPTIONS_DEFAULT+=	PERFSCHM
-
-PERFSCHM_SUB_LIST+=		PERFSCHEMRC=""
-PERFSCHM_SUB_LIST_OFF+=		PERFSCHEMRC="--skip-performance-schema"
-FEDERATED_SUB_LIST+=		FEDER="--federated"
-FEDERATED_SUB_LIST_OFF+=	FEDER=""
-
-# issue 220865: Currently there's no source to be built with server-side support.
-#		But this keeps the pkg-plist not overlaping
-CMAKE_ARGS+=	-DWITH_AUTHENTICATION_LDAP=0
-.endif
-
-.include <bsd.port.options.mk>
-
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1200057
-SUB_LIST+=	LEGACY_LIMITS="@comment " MODERN_LIMITS=""
-.else
-SUB_LIST+=	LEGACY_LIMITS="" MODERN_LIMITS="@comment "
-.endif
-
-.include <bsd.port.pre.mk>
-
-.if ${SSL_DEFAULT} == base
-CMAKE_ARGS+=		-DWITH_SSL=system
-.else
-CMAKE_ARGS+=		-DWITH_SSL=${OPENSSLBASE}
-.endif
-
-.if ${CHOSEN_COMPILER_TYPE} == gcc
-CXXFLAGS+=	-fpermissive
-.endif
-
-.if ${ARCH} == powerpc
-LLD_UNSAFE=	yes
-.endif
-
-post-extract:
-	@${RM} -rv ${WRKSRC}/sql/sql_hints.yy.cc ${WRKSRC}/sql/sql_hints.yy.h
-
-post-patch:
-	@${REINPLACE_CMD} 's/*.1/${MMAN1}/' ${WRKSRC}/man/CMakeLists.txt
-	# issue 220865: MySQL developers forgot that FreeBSD != Linux
-	@${REINPLACE_CMD} -e 's|%%FREEBSD_LOCAL_LIB%%|${LOCALBASE}/lib|g' \
-	    ${WRKSRC}/configure.cmake
-
-.if !defined(CLIENT_ONLY)
-post-install:
-	${MKDIR} ${STAGEDIR}${ETCDIR}
-	${INSTALL_DATA} ${WRKDIR}/my.cnf.sample ${STAGEDIR}${ETCDIR}/my.cnf.sample
-	${MKDIR} ${STAGEDIR}${ETCDIR}/keyring
-	${MKDIR} ${STAGEDIR}${MY_SECDIR}
-	${MKDIR} ${STAGEDIR}${MY_TMPDIR}
-.endif
-
-.include <bsd.port.post.mk>
diff --git a/databases/mysql57-server/distinfo b/databases/mysql57-server/distinfo
deleted file mode 100644
index 16aa72c286a0..000000000000
--- a/databases/mysql57-server/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1627053937
-SHA256 (mysql-boost-5.7.35.tar.gz) = 6b30c93e5927857e31769bf5356eb23a5cff59c0a0205e5772b51b09bf3f9e12
-SIZE (mysql-boost-5.7.35.tar.gz) = 52959014
diff --git a/databases/mysql57-server/files/extra-patch-config.h.cmake b/databases/mysql57-server/files/extra-patch-config.h.cmake
deleted file mode 100644
index 3ac1add1b9ce..000000000000
--- a/databases/mysql57-server/files/extra-patch-config.h.cmake
+++ /dev/null
@@ -1,12 +0,0 @@
---- config.h.cmake.orig	2014-12-05 16:24:02 UTC
-+++ config.h.cmake
-@@ -151,7 +151,8 @@
- #cmakedefine HAVE_FESETROUND 1
- #cmakedefine HAVE_FINITE 1
- #cmakedefine HAVE_FP_EXCEPT 1
--#cmakedefine HAVE_FPSETMASK 1
-+#cmakedefine HAVE_FPSETMASK 0
-+#cmakedefine HAVE_FEDISABLEEXCEPT 1
- #cmakedefine HAVE_FSEEKO 1
- #cmakedefine HAVE_FSYNC 1
- #cmakedefine HAVE_FTIME 1
diff --git a/databases/mysql57-server/files/my.cnf.sample.in b/databases/mysql57-server/files/my.cnf.sample.in
deleted file mode 100644
index 55ba041bbc7b..000000000000
--- a/databases/mysql57-server/files/my.cnf.sample.in
+++ /dev/null
@@ -1,62 +0,0 @@
-[client]
-port                            = 3306
-socket                          = /tmp/mysql.sock
-
-[mysql]
-prompt                          = \u@\h [\d]>\_
-no_auto_rehash
-
-[mysqld]
-user                            = mysql
-port                            = 3306
-socket                          = /tmp/mysql.sock
-bind-address                    = 127.0.0.1
-basedir                         = %%PREFIX%%
-datadir                         = %%MY_DBDIR%%
-tmpdir                          = %%MY_TMPDIR%%
-slave-load-tmpdir               = %%MY_TMPDIR%%
-secure-file-priv                = %%MY_SECDIR%%
-log-bin                         = mysql-bin
-log-output                      = TABLE
-master-info-repository          = TABLE
-relay-log-info-repository       = TABLE
-relay-log-recovery              = 1
-slow-query-log                  = 1
-server-id                       = 1
-sync_binlog                     = 1
-sync_relay_log                  = 1
-binlog_cache_size               = 16M
-expire_logs_days                = 30
-default_password_lifetime       = 0
-enforce-gtid-consistency        = 1
-gtid-mode                       = ON
-safe-user-create                = 1
-lower_case_table_names          = 1
-explicit-defaults-for-timestamp = 1
-myisam-recover-options          = BACKUP,FORCE
-open_files_limit                = 32768
-table_open_cache                = 16384
-table_definition_cache          = 8192
-net_retry_count                 = 16384
-key_buffer_size                 = 256M
-max_allowed_packet              = 64M
-query_cache_type                = 0
-query_cache_size                = 0
-long_query_time                 = 0.5
-innodb_buffer_pool_size         = 1G
-innodb_data_home_dir            = %%MY_DBDIR%%
-innodb_log_group_home_dir       = %%MY_DBDIR%%
-innodb_data_file_path           = ibdata1:128M:autoextend
-innodb_temp_data_file_path      = ibtmp1:128M:autoextend
-innodb_flush_method             = O_DIRECT
-innodb_log_file_size            = 256M
-innodb_log_buffer_size          = 16M
-innodb_write_io_threads         = 8
-innodb_read_io_threads          = 8
-innodb_autoinc_lock_mode        = 2
-skip-symbolic-links
-
-[mysqldump]
-max_allowed_packet              = 256M
-quote_names
-quick
diff --git a/databases/mysql57-server/files/mysql-server.in b/databases/mysql57-server/files/mysql-server.in
deleted file mode 100644
index 37022059e2bc..000000000000
--- a/databases/mysql57-server/files/mysql-server.in
+++ /dev/null
@@ -1,89 +0,0 @@
-#!/bin/sh
-
-# PROVIDE: mysql
-# REQUIRE: LOGIN
-# KEYWORD: shutdown
-
-#
-# Add the following line to /etc/rc.conf to enable mysql:
-# mysql_enable (bool):	Set to "NO" by default.
-#			Set it to "YES" to enable MySQL.
-%%LEGACY_LIMITS%%# mysql_limits (bool):	Set to "NO" by default.
-%%LEGACY_LIMITS%%#			Set it to yes to run `limits -e -U mysql`
-%%LEGACY_LIMITS%%#			just before mysql starts.
-# mysql_dbdir (str):	Default to "%%MY_DBDIR%%"
-#			Base database directory.
-# mysql_confdir (str):	Default to "%%ETCDIR%%"
-#			Base configuration directory.
-# mysql_optfile (str):	Server-specific option file.
-#			Set it in the rc.conf or default behaviour of
-#			`mysqld_safe` itself, will be picking
-#			${mysql_confdir}/my.cnf if it exists.
-# mysql_pidfile (str):	Custum PID file path and name.
-#			Default to "${mysql_dbdir}/${hostname}.pid".
-# mysql_args (str):	Custom additional arguments to be passed
-#			to mysqld_safe (default empty).
-#
-
-. /etc/rc.subr
-
-name="mysql"
-rcvar=mysql_enable
-
-load_rc_config $name
-
-: ${mysql_enable="NO"}
-%%LEGACY_LIMITS%%: ${mysql_limits="NO"}
-: ${mysql_dbdir="%%MY_DBDIR%%"}
-: ${mysql_confdir="%%ETCDIR%%"}
-if [ -f "${mysql_confdir}/my.cnf" ]; then
-: ${mysql_optfile="${mysql_confdir}/my.cnf"}
-elif [ -f "${mysql_dbdir}/my.cnf" ]; then
-: ${mysql_optfile="${mysql_dbdir}/my.cnf"}
-fi
-if [ ! -z "${mysql_optfile}" ]; then
-mysql_extra="--defaults-extra-file=${mysql_optfile}"
-fi
-
-
-mysql_user="mysql"
-%%LEGACY_LIMITS%%mysql_limits_args="-e -U ${mysql_user}"
-: ${hostname:=`/bin/hostname`}
-pidfile=${mysql_pidfile:-"${mysql_dbdir}/${hostname}.pid"}
-command="/usr/sbin/daemon"
-command_args="-c -f %%PREFIX%%/bin/mysqld_safe ${mysql_extra} --basedir=%%PREFIX%% --datadir=${mysql_dbdir} --pid-file=${pidfile} --user=${mysql_user} ${mysql_args} %%FEDER%% %%PERFSCHEMRC%%"
-procname="%%PREFIX%%/libexec/mysqld"
-start_precmd="${name}_prestart"
-start_postcmd="${name}_poststart"
-mysql_install_db="%%PREFIX%%/bin/mysql_install_db"
-mysql_install_db_args="${mysql_extra} --basedir=%%PREFIX%% --datadir=${mysql_dbdir} --mysqld-file=${procname} --user=${mysql_user}"
-
-mysql_create_auth_tables()
-{
-	eval $mysql_install_db $mysql_install_db_args >/dev/null 2>/dev/null
-}
-
-mysql_prestart()
-{
-	if [ ! -d "${mysql_dbdir}/mysql/." ]; then
-		mysql_create_auth_tables || return 1
-	fi
-%%LEGACY_LIMITS%%	if checkyesno mysql_limits; then
-%%LEGACY_LIMITS%%		eval `/usr/bin/limits ${mysql_limits_args}` 2>/dev/null
-%%LEGACY_LIMITS%%	else
-%%LEGACY_LIMITS%%		return 0
-%%LEGACY_LIMITS%%	fi
-%%MODERN_LIMITS%%	return 0
-}
-
-mysql_poststart()
-{
-	local timeout=15
-	while [ ! -f "${pidfile}" -a ${timeout} -gt 0 ]; do
-		timeout=$(( timeout - 1 ))
-		sleep 1
-	done
-	return 0
-}
-
-run_rc_command "$1"
diff --git a/databases/mysql57-server/files/patch-CMakeLists.txt b/databases/mysql57-server/files/patch-CMakeLists.txt
deleted file mode 100644
index e9f84fa8f474..000000000000
--- a/databases/mysql57-server/files/patch-CMakeLists.txt
+++ /dev/null
@@ -1,40 +0,0 @@
---- CMakeLists.txt.orig	2021-07-26 19:43:45.021975000 +0200
-+++ CMakeLists.txt	2021-07-26 19:49:38.318138000 +0200
-@@ -715,12 +715,10 @@ IF(UNIX)
- ENDIF()
- 
- IF(NOT WITHOUT_SERVER)
--  ADD_SUBDIRECTORY(testclients)
-   ADD_SUBDIRECTORY(sql)
-   OPTION (WITH_EMBEDDED_SERVER "Compile MySQL with embedded server" OFF)
-   IF(WITH_EMBEDDED_SERVER) 
-    ADD_SUBDIRECTORY(libmysqld)
--   ADD_SUBDIRECTORY(libmysqld/examples)
-   ENDIF(WITH_EMBEDDED_SERVER)
- ENDIF()
- 
-@@ -729,8 +727,6 @@ ENDIF()
- ADD_SUBDIRECTORY(scripts)
- 
- IF(NOT WITHOUT_SERVER)
--  ADD_SUBDIRECTORY(mysql-test)
--  ADD_SUBDIRECTORY(mysql-test/lib/My/SafeProcess)
-   ADD_SUBDIRECTORY(support-files)
-   IF(EXISTS ${CMAKE_SOURCE_DIR}/internal/CMakeLists.txt)
-     ADD_SUBDIRECTORY(internal)
-@@ -789,6 +785,7 @@ ENDIF()
- #
- # RPM installs documentation directly from the source tree
- #
-+IF(FALSE)
- IF(NOT INSTALL_LAYOUT MATCHES "RPM")
-   INSTALL(FILES
-     README
-@@ -808,6 +805,7 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM")
-     PATTERN "mysql.info" EXCLUDE
-     PATTERN "sp-imp-spec.txt" EXCLUDE
-   )
-+ENDIF()
- ENDIF()
- 
- INCLUDE(CPack)
diff --git a/databases/mysql57-server/files/patch-client_CMakeLists.txt b/databases/mysql57-server/files/patch-client_CMakeLists.txt
deleted file mode 100644
index 410731e9b81f..000000000000
--- a/databases/mysql57-server/files/patch-client_CMakeLists.txt
+++ /dev/null
@@ -1,75 +0,0 @@
---- client/CMakeLists.txt.orig	2019-09-27 09:00:15.000000000 +0200
-+++ client/CMakeLists.txt	2019-11-24 17:42:52.649644000 +0100
-@@ -38,17 +38,17 @@
- 
- ## Subdirectory with common client code.
- ADD_SUBDIRECTORY(base)
--## Subdirectory for mysqlpump code.
--ADD_SUBDIRECTORY(dump)
- 
- INCLUDE(${MYSQL_CMAKE_SCRIPT_DIR}/compile_flags.cmake)
- 
- ADD_DEFINITIONS(${SSL_DEFINES})
-+IF(FALSE)
- MYSQL_ADD_EXECUTABLE(mysql completion_hash.cc mysql.cc readline.cc ../sql-common/sql_string.cc)
- TARGET_LINK_LIBRARIES(mysql mysqlclient)
- IF(UNIX)
-   TARGET_LINK_LIBRARIES(mysql ${EDITLINE_LIBRARY})
- ENDIF(UNIX)
-+ENDIF()
- 
- IF(NOT WITHOUT_SERVER)
-   MYSQL_ADD_EXECUTABLE(mysql_upgrade
-@@ -69,6 +69,7 @@
- ADD_CONVENIENCE_LIBRARY(mysqlcheck_core check/mysqlcheck_core.cc)
- TARGET_LINK_LIBRARIES(mysqlcheck_core mysqlclient)
- 
-+IF(FALSE)
- MYSQL_ADD_EXECUTABLE(mysqlcheck check/mysqlcheck.cc)
- TARGET_LINK_LIBRARIES(mysqlcheck mysqlcheck_core)
- 
-@@ -81,10 +82,12 @@
- 
- MYSQL_ADD_EXECUTABLE(mysqlshow mysqlshow.c)
- TARGET_LINK_LIBRARIES(mysqlshow mysqlclient)
-+ENDIF()
- 
- MYSQL_ADD_EXECUTABLE(mysql_plugin mysql_plugin.c)
- TARGET_LINK_LIBRARIES(mysql_plugin mysqlclient)
- 
-+IF(FALSE)
- MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc)
- ADD_COMPILE_FLAGS(
-   mysqlbinlog.cc
-@@ -101,6 +104,7 @@
- 
- MYSQL_ADD_EXECUTABLE(mysql_config_editor mysql_config_editor.cc)
- TARGET_LINK_LIBRARIES(mysql_config_editor ${FORCE_SSL_SOLARIS} mysqlclient)
-+ENDIF()
- 
- MYSQL_ADD_EXECUTABLE(mysql_secure_installation mysql_secure_installation.cc)
- TARGET_LINK_LIBRARIES(mysql_secure_installation mysqlclient)
-@@ -116,9 +120,11 @@
-   ADD_DEPENDENCIES(mysql_install_db GenBootstrapPriv GenSysSchema)
- ENDIF()
- 
-+IF(FALSE)
- MYSQL_ADD_EXECUTABLE(mysql_ssl_rsa_setup mysql_ssl_rsa_setup.cc path.cc logger.cc)
- TARGET_LINK_LIBRARIES(mysql_ssl_rsa_setup mysys mysys_ssl)
- SET_TARGET_PROPERTIES(mysql_ssl_rsa_setup PROPERTIES LINKER_LANGUAGE CXX)
-+ENDIF()
- 
- # "WIN32" also covers 64 bit. "echo" is used in some files below "mysql-test/".
- IF(WIN32)
-@@ -127,11 +133,6 @@
- 
- SET_TARGET_PROPERTIES (
-   mysql_plugin
--  mysqlcheck
--  mysqldump
--  mysqlimport
--  mysqlshow
--  mysqlslap
- PROPERTIES HAS_CXX TRUE)
- 
- ADD_DEFINITIONS(-DHAVE_DLOPEN)
diff --git a/databases/mysql57-server/files/patch-cmake_build__configurations_compiler__options.cmake b/databases/mysql57-server/files/patch-cmake_build__configurations_compiler__options.cmake
deleted file mode 100644
index f8c13ec7c398..000000000000
--- a/databases/mysql57-server/files/patch-cmake_build__configurations_compiler__options.cmake
+++ /dev/null
@@ -1,20 +0,0 @@
---- cmake/build_configurations/compiler_options.cmake.orig	2016-08-25 11:52:06 UTC
-+++ cmake/build_configurations/compiler_options.cmake
-@@ -43,7 +43,7 @@ IF(UNIX)  
- 
-   # Default GCC flags
-   IF(CMAKE_COMPILER_IS_GNUCC)
--    SET(COMMON_C_FLAGS "-fabi-version=2 -fno-omit-frame-pointer -fno-strict-aliasing")
-+    SET(COMMON_C_FLAGS "-fno-omit-frame-pointer -fno-strict-aliasing")
-     # Disable inline optimizations for valgrind testing to avoid false positives
-     IF(WITH_VALGRIND)
-       STRING_PREPEND(COMMON_C_FLAGS "-fno-inline ")
-@@ -68,7 +68,7 @@ IF(UNIX)  
-     ENDIF()
-   ENDIF()
-   IF(CMAKE_COMPILER_IS_GNUCXX)
--    SET(COMMON_CXX_FLAGS               "-fabi-version=2 -fno-omit-frame-pointer -fno-strict-aliasing")
-+    SET(COMMON_CXX_FLAGS               "-fno-omit-frame-pointer -fno-strict-aliasing")
-     # GCC 6 has C++14 as default, set it explicitly to the old default.
-     EXECUTE_PROCESS(COMMAND ${CMAKE_CXX_COMPILER} -dumpversion
-                     OUTPUT_VARIABLE GXX_VERSION)
diff --git a/databases/mysql57-server/files/patch-cmake_os_FreeBSD.cmake b/databases/mysql57-server/files/patch-cmake_os_FreeBSD.cmake
deleted file mode 100644
index 64b809e3bd45..000000000000
--- a/databases/mysql57-server/files/patch-cmake_os_FreeBSD.cmake
+++ /dev/null
@@ -1,31 +0,0 @@
---- cmake/os/FreeBSD.cmake.orig	2018-10-04 05:48:22 UTC
-+++ cmake/os/FreeBSD.cmake
-@@ -30,6 +30,20 @@ IF(NOT FORCE_UNSUPPORTED_COMPILER)
-     IF(NOT HAVE_SUPPORTED_CLANG_VERSION)
-       MESSAGE(FATAL_ERROR "Clang 3.3 or newer is required!")
-     ENDIF()
-+    CHECK_C_SOURCE_RUNS("
-+      int main()
-+      {
-+        return (__clang_major__ >= 4);
-+      }" I386_ATOMIC_BUILTINS)
-+    IF((CMAKE_SYSTEM_PROCESSOR MATCHES "i386") AND (NOT I386_ATOMIC_BUILTINS))
-+      SET(HAVE_GCC_ATOMIC_BUILTINS CACHE  INTERNAL "")
-+    ENDIF()
-+  ELSEIF(CMAKE_COMPILER_IS_GNUCC)
-+    EXECUTE_PROCESS(COMMAND ${CMAKE_C_COMPILER} -dumpversion
-+                    OUTPUT_VARIABLE GCC_VERSION)
-+    IF(GCC_VERSION VERSION_LESS 4.4)
-+      MESSAGE(FATAL_ERROR "GCC 4.4 or newer is required!")
-+    ENDIF()
-   ELSE()
-     MESSAGE(FATAL_ERROR "Unsupported compiler!")
-   ENDIF()
-@@ -38,4 +52,6 @@ ENDIF()
- # Should not be needed any more, but kept for easy resurrection if needed
- #   #Legacy option, maybe not needed anymore , taken as is from autotools build
- #   ADD_DEFINITIONS(-DNET_RETRY_COUNT=1000000)
--
-+# For GCC maybe it's also good idea to use
-+#   ADD_DEFINITIONS(-D_GNU_SOURCE)
-+    
diff --git a/databases/mysql57-server/files/patch-cmake_plugin.cmake b/databases/mysql57-server/files/patch-cmake_plugin.cmake
deleted file mode 100644
index 77b38c747b61..000000000000
--- a/databases/mysql57-server/files/patch-cmake_plugin.cmake
+++ /dev/null
@@ -1,25 +0,0 @@
---- cmake/plugin.cmake.orig	2017-06-22 14:13:19 UTC
-+++ cmake/plugin.cmake
-@@ -263,13 +270,17 @@ MACRO(MYSQL_ADD_PLUGIN)
-       MYSQL_INSTALL_TARGETS(${target}
-         DESTINATION ${INSTALL_PLUGINDIR}
-         COMPONENT ${INSTALL_COMPONENT})
--      INSTALL_DEBUG_TARGET(${target}
--        DESTINATION ${INSTALL_PLUGINDIR}/debug
--        COMPONENT ${INSTALL_COMPONENT})
-+      IF(CMAKE_BUILD_TYPE MATCHES "Debug")
-+          INSTALL_DEBUG_TARGET(${target}
-+            DESTINATION ${INSTALL_PLUGINDIR}/debug
-+            COMPONENT ${INSTALL_COMPONENT})
-+          # Add installed files to list for RPMs
-+          FILE(APPEND ${CMAKE_BINARY_DIR}/support-files/plugins.files
-+                  "%attr(755, root, root) %{_prefix}/${INSTALL_PLUGINDIR}/debug/${ARG_MODULE_OUTPUT_NAME}.so\n")
-+      ENDIF()
-       # Add installed files to list for RPMs
-       FILE(APPEND ${CMAKE_BINARY_DIR}/support-files/plugins.files
--              "%attr(755, root, root) %{_prefix}/${INSTALL_PLUGINDIR}/${ARG_MODULE_OUTPUT_NAME}.so\n"
--              "%attr(755, root, root) %{_prefix}/${INSTALL_PLUGINDIR}/debug/${ARG_MODULE_OUTPUT_NAME}.so\n")
-+              "%attr(755, root, root) %{_prefix}/${INSTALL_PLUGINDIR}/${ARG_MODULE_OUTPUT_NAME}.so\n")
-       # For internal testing in PB2, append collections files
-       IF(DEFINED ENV{PB2WORKDIR})
-         PLUGIN_APPEND_COLLECTIONS(${plugin})
diff --git a/databases/mysql57-server/files/patch-cmake_ssl.cmake b/databases/mysql57-server/files/patch-cmake_ssl.cmake
deleted file mode 100644
index 0e70d693a90d..000000000000
--- a/databases/mysql57-server/files/patch-cmake_ssl.cmake
+++ /dev/null
@@ -1,54 +0,0 @@
---- cmake/ssl.cmake.orig	2019-12-06 10:41:47 UTC
-+++ cmake/ssl.cmake
-@@ -150,22 +150,12 @@ MACRO (MYSQL_CHECK_SSL)
-       MESSAGE(STATUS "OPENSSL_APPLINK_C ${OPENSSL_APPLINK_C}")
-     ENDIF()
- 
--    # On mac this list is <.dylib;.so;.a>
--    # We prefer static libraries, so we reverse it here.
--    IF (WITH_SSL_PATH)
--      LIST(REVERSE CMAKE_FIND_LIBRARY_SUFFIXES)
--      MESSAGE(STATUS "suffixes <${CMAKE_FIND_LIBRARY_SUFFIXES}>")
--    ENDIF()
--
-     FIND_LIBRARY(OPENSSL_LIBRARY
-                  NAMES ssl libssl ssleay32 ssleay32MD
-                  HINTS ${OPENSSL_ROOT_DIR}/lib)
-     FIND_LIBRARY(CRYPTO_LIBRARY
-                  NAMES crypto libcrypto libeay32
-                  HINTS ${OPENSSL_ROOT_DIR}/lib)
--    IF (WITH_SSL_PATH)
--      LIST(REVERSE CMAKE_FIND_LIBRARY_SUFFIXES)
--    ENDIF()
- 
-     IF(OPENSSL_INCLUDE_DIR)
-       # Verify version number. Version information looks like:
-@@ -193,9 +183,10 @@ MACRO (MYSQL_CHECK_SSL)
-       )
-     SET(OPENSSL_VERSION ${OPENSSL_VERSION} CACHE INTERNAL "")
- 
--    IF("${OPENSSL_VERSION}" VERSION_GREATER "1.1.0")
--       ADD_DEFINITIONS(-DHAVE_TLSv13)
--       SET(HAVE_TLSv13 1)
-+    CHECK_SYMBOL_EXISTS(TLS1_3_VERSION "openssl/tls1.h" HAVE_TLS1_3_VERSION)
-+    IF(HAVE_TLS1_3_VERSION)
-+       #ADD_DEFINITIONS(-DHAVE_TLSv13)
-+       #SET(HAVE_TLSv13 1)
-        IF(SOLARIS)
-          SET(FORCE_SSL_SOLARIS "-Wl,--undefined,address_of_sk_new_null")
-        ENDIF()
-@@ -203,7 +204,13 @@ MACRO (MYSQL_CHECK_SSL)
-     IF(OPENSSL_INCLUDE_DIR AND
-        OPENSSL_LIBRARY   AND
-        CRYPTO_LIBRARY      AND
--       OPENSSL_MAJOR_VERSION STREQUAL "1"
-+       OPENSSL_MAJOR_VERSION VERSION_GREATER_EQUAL "1"
-+      )
-+      SET(OPENSSL_FOUND TRUE)
-+    ELSEIF(OPENSSL_INCLUDE_DIR AND
-+       OPENSSL_LIBRARY   AND
-+       CRYPTO_LIBRARY      AND
-+       OPENSSL_MAJOR_VERSION STREQUAL "2"
-       )
-       SET(OPENSSL_FOUND TRUE)
-     ELSE()
diff --git a/databases/mysql57-server/files/patch-include_CMakeLists.txt b/databases/mysql57-server/files/patch-include_CMakeLists.txt
deleted file mode 100644
index cb451ddc6ac4..000000000000
--- a/databases/mysql57-server/files/patch-include_CMakeLists.txt
+++ /dev/null
@@ -1,19 +0,0 @@
---- include/CMakeLists.txt.orig	2016-03-28 18:06:12 UTC
-+++ include/CMakeLists.txt
-@@ -69,14 +69,13 @@ SET(HEADERS 
-   ${HEADERS_GEN_CONFIGURE}
- )
- 
-+IF(FALSE)
- INSTALL(FILES
-   ../libbinlogevents/export/binary_log_types.h
-   DESTINATION ${INSTALL_INCLUDEDIR}
--  COMPONENT Development)
--INSTALL(FILES ${HEADERS} DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT Development)
--INSTALL(DIRECTORY mysql/ DESTINATION ${INSTALL_INCLUDEDIR}/mysql COMPONENT Development 
-  PATTERN "*.h"
-  PATTERN "psi_abi*" EXCLUDE
- )
-+ENDIF()
- 
- 
diff --git a/databases/mysql57-server/files/patch-include_my__compare.h b/databases/mysql57-server/files/patch-include_my__compare.h
deleted file mode 100644
index 1a64142bb658..000000000000
--- a/databases/mysql57-server/files/patch-include_my__compare.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- include/my_compare.h.orig	2016-03-28 18:06:12 UTC
-+++ include/my_compare.h
-@@ -40,7 +40,7 @@ extern "C" {
-   But beware the dependency of MI_MAX_POSSIBLE_KEY_BUFF and HA_MAX_KEY_LENGTH.
- */
- 
--#define HA_MAX_KEY_LENGTH           1000        /* Max length in bytes */
-+#define HA_MAX_KEY_LENGTH           4000        /* Max length in bytes */
- #define HA_MAX_KEY_SEG              16          /* Max segments for key */
- 
- #define HA_MAX_POSSIBLE_KEY_BUFF    (HA_MAX_KEY_LENGTH + 24+ 6+6)
diff --git a/databases/mysql57-server/files/patch-include_my__thread__os__id.h b/databases/mysql57-server/files/patch-include_my__thread__os__id.h
deleted file mode 100644
index 60b111b88a10..000000000000
--- a/databases/mysql57-server/files/patch-include_my__thread__os__id.h
+++ /dev/null
@@ -1,15 +0,0 @@
---- include/my_thread_os_id.h.orig	2016-03-28 18:06:12 UTC
-+++ include/my_thread_os_id.h
-@@ -75,8 +75,12 @@ static inline my_thread_os_id_t my_threa
-   return pthread_getthreadid_np();
- #else
- #ifdef HAVE_INTEGER_PTHREAD_SELF
-+#  ifdef __DragonFly__
-+  return syscall(SYS_lwp_gettid);
-+#  else
-   /* Unknown platform, fallback. */
-   return pthread_self();
-+#  endif
- #else
-   /* Feature not available. */
-   return 0;
diff --git a/databases/mysql57-server/files/patch-include_my_openssl.h b/databases/mysql57-server/files/patch-include_my_openssl.h
deleted file mode 100644
index 43ddb2935038..000000000000
--- a/databases/mysql57-server/files/patch-include_my_openssl.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- include/my_openssl.h.orig	2020-03-23 17:35:17 UTC
-+++ include/my_openssl.h
-@@ -51,7 +51,7 @@ extern "C" {
-  */
- static inline int mysql_OPENSSL_init()
- {
--#if defined(HAVE_STATIC_OPENSSL)
-+#if defined(HAVE_STATIC_OPENSSL) && !defined(LIBRESSL_VERSION_NUMBER)
-   return OPENSSL_init_crypto(OPENSSL_INIT_NO_ATEXIT, NULL);
- #else
-   return SSL_library_init();
diff --git a/databases/mysql57-server/files/patch-include_myisam.h b/databases/mysql57-server/files/patch-include_myisam.h
deleted file mode 100644
index 0a4b795e9426..000000000000
--- a/databases/mysql57-server/files/patch-include_myisam.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- include/myisam.h.orig	2016-03-28 18:06:12 UTC
-+++ include/myisam.h
-@@ -45,7 +45,7 @@ extern "C" {
-   The following defines can be increased if necessary.
-   But beware the dependency of MI_MAX_POSSIBLE_KEY_BUFF and MI_MAX_KEY_LENGTH.
- */
--#define MI_MAX_KEY_LENGTH           1000            /* Max length in bytes */
-+#define MI_MAX_KEY_LENGTH           4000            /* Max length in bytes */
- #define MI_MAX_KEY_SEG              16              /* Max segments for key */
- 
- #define MI_MAX_KEY_BUFF  (MI_MAX_KEY_LENGTH+MI_MAX_KEY_SEG*6+8+8)
diff --git a/databases/mysql57-server/files/patch-libmysql_CMakeLists.txt b/databases/mysql57-server/files/patch-libmysql_CMakeLists.txt
deleted file mode 100644
index 2dfbc9d5acdd..000000000000
--- a/databases/mysql57-server/files/patch-libmysql_CMakeLists.txt
+++ /dev/null
@@ -1,30 +0,0 @@
---- libmysql/CMakeLists.txt.orig	2019-09-27 09:00:15.000000000 +0200
-+++ libmysql/CMakeLists.txt	2019-11-24 17:45:54.008082000 +0100
-@@ -266,7 +266,7 @@
- ADD_SUBDIRECTORY(authentication_ldap)
-   
- # Merge several convenience libraries into one big mysqlclient
--MERGE_CONVENIENCE_LIBRARIES(mysqlclient ${LIBS_TO_MERGE} COMPONENT Development)
-+MERGE_CONVENIENCE_LIBRARIES(mysqlclient ${LIBS_TO_MERGE} COMPONENT Development SKIP_INSTALL)
- TARGET_LINK_LIBRARIES(mysqlclient ${LIBS_TO_LINK})
- 
- # Visual Studio users need debug  static library for debug projects
-@@ -312,8 +312,9 @@
-   # and link them together into shared library.
-   MERGE_LIBRARIES_SHARED(libmysql ${LIBS_TO_MERGE}
-     EXPORTS ${CLIENT_API_FUNCTIONS} ${CLIENT_API_FUNCTIONS_UNDOCUMENTED}
--    COMPONENT SharedLibraries)
-+    COMPONENT SharedLibraries SKIP_INSTALL)
-   TARGET_LINK_LIBRARIES(libmysql ${LIBS_TO_LINK})
-+IF(FALSE)
-   IF(UNIX)
-     # libtool compatability
-     IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD" OR APPLE)
-@@ -369,6 +370,7 @@
- # to initialize api_calls[] array in api_test.c
- #
- SET(CLIENT_API_FUNCTION_LIST "")
-+ ENDIF()
- FOREACH(api ${CLIENT_API_FUNCTIONS})
-   SET(CLIENT_API_FUNCTION_LIST "${CLIENT_API_FUNCTION_LIST} ${api},")
- ENDFOREACH()
diff --git a/databases/mysql57-server/files/patch-libmysql_authentication__ldap_CMakeLists.txt b/databases/mysql57-server/files/patch-libmysql_authentication__ldap_CMakeLists.txt
deleted file mode 100644
index 109d4cc3c4d4..000000000000
--- a/databases/mysql57-server/files/patch-libmysql_authentication__ldap_CMakeLists.txt
+++ /dev/null
@@ -1,18 +0,0 @@
---- libmysql/authentication_ldap/CMakeLists.txt.orig	2020-01-16 09:39:09.585385000 +0100
-+++ libmysql/authentication_ldap/CMakeLists.txt	2020-01-16 09:41:59.054985000 +0100
-@@ -47,6 +47,7 @@ IF(NOT WIN32 AND NOT HAVE_LBER_H)
-   CROAK_AND_RETURN("Required LBER header is missing.")
- ENDIF()
- 
-+IF (WITH_AUTHENTICATION_LDAP)
- MYSQL_ADD_PLUGIN(authentication_ldap_sasl_client
-   auth_ldap_sasl_client.cc
-   log_client.cc
-@@ -57,6 +58,7 @@ MYSQL_ADD_PLUGIN(authentication_ldap_sasl_client
-   CLIENT_ONLY
-   MODULE_ONLY
-   MODULE_OUTPUT_NAME "authentication_ldap_sasl_client")
-+ENDIF ()
- 
- # The plugin may need symbols which are not loaded by the client.
- IF(STATIC_SASL_LIBRARY)
diff --git a/databases/mysql57-server/files/patch-libservices_CMakeLists.txt b/databases/mysql57-server/files/patch-libservices_CMakeLists.txt
deleted file mode 100644
index bfd6118b5648..000000000000
--- a/databases/mysql57-server/files/patch-libservices_CMakeLists.txt
+++ /dev/null
@@ -1,9 +0,0 @@
---- libservices/CMakeLists.txt.orig	2016-03-28 18:06:12 UTC
-+++ libservices/CMakeLists.txt
-@@ -35,4 +35,6 @@ SET(MYSQLSERVICES_SOURCES
-   mysql_keyring_service.c)
- 
- ADD_CONVENIENCE_LIBRARY(mysqlservices ${MYSQLSERVICES_SOURCES})
-+IF(FALSE)
- INSTALL(TARGETS mysqlservices DESTINATION ${INSTALL_LIBDIR} COMPONENT Development)
-+ENDIF()
diff --git a/databases/mysql57-server/files/patch-man_CMakeLists.txt b/databases/mysql57-server/files/patch-man_CMakeLists.txt
deleted file mode 100644
index b771ae6214f0..000000000000
--- a/databases/mysql57-server/files/patch-man_CMakeLists.txt
+++ /dev/null
@@ -1,11 +0,0 @@
---- man/CMakeLists.txt.orig	2015-11-29 19:16:24 UTC
-+++ man/CMakeLists.txt
-@@ -15,8 +15,6 @@
- 
- # Copy man pages
- FILE(GLOB MAN1_FILES *.1)
--FILE(GLOB MAN1_EXCLUDE make_win_bin_dist.1)
--FILE(GLOB MAN1_NDB ndb*.1)
- FILE(GLOB MAN8_FILES *.8)
- FILE(GLOB MAN8_NDB ndb*.8)
- IF(MAN1_FILES)
diff --git a/databases/mysql57-server/files/patch-mysys__ssl_my__default.cc b/databases/mysql57-server/files/patch-mysys__ssl_my__default.cc
deleted file mode 100644
index ea05679341fa..000000000000
--- a/databases/mysql57-server/files/patch-mysys__ssl_my__default.cc
+++ /dev/null
@@ -1,61 +0,0 @@
---- mysys_ssl/my_default.cc.orig	2016-08-25 11:52:06 UTC
-+++ mysys_ssl/my_default.cc
-@@ -114,7 +114,7 @@ static my_bool defaults_already_read= FA
- 
- /* Which directories are searched for options (and in which order) */
- 
--#define MAX_DEFAULT_DIRS 6
-+#define MAX_DEFAULT_DIRS 7
- #define DEFAULT_DIRS_SIZE (MAX_DEFAULT_DIRS + 1)  /* Terminate with NULL */
- static const char **default_directories = NULL;
- 
-@@ -914,6 +914,14 @@ static int search_default_file_with_ext(
-       return 1;                                 /* Ignore wrong files */
-   }
- 
-+  if (strstr(name, "/etc") == name)
-+  {
-+    fprintf(stderr,
-+             "error: Config file %s in invalid location, please move to or merge with /usr/local%s\n",
-+             name,name);
-+      goto err;
-+  }
-+
-   while (mysql_file_getline(buff, sizeof(buff) - 1, fp, is_login_file))
-   {
-     line++;
-@@ -1252,7 +1260,8 @@ void my_print_default_files(const char *
-             end[(strlen(end)-1)] = ' ';
-           else
-             strxmov(end, conf_file, *ext , " ",  NullS);
--          fputs(name, stdout);
-+          if (strstr(name, "/etc") != name)
-+            fputs(name, stdout);
-         }
-       }
-     }
-@@ -1411,13 +1420,8 @@ static const char **init_default_directo
- 
- #else
- 
--  errors += add_directory(alloc, "/etc/", dirs);
--  errors += add_directory(alloc, "/etc/mysql/", dirs);
--
--#if defined(DEFAULT_SYSCONFDIR)
--  if (DEFAULT_SYSCONFDIR[0])
--    errors += add_directory(alloc, DEFAULT_SYSCONFDIR, dirs);
--#endif /* DEFAULT_SYSCONFDIR */
-+  errors += add_directory(alloc, "/usr/local/etc/", dirs);
-+  errors += add_directory(alloc, "/usr/local/etc/mysql/", dirs);
- 
- #endif
- 
-@@ -1488,7 +1492,7 @@ int check_file_permissions(const char *f
-   MY_STAT stat_info;
- 
-   if (!my_stat(file_name,&stat_info,MYF(0)))
--    return 1;
-+    return 0;
-   /*
-     Ignore .mylogin.cnf file if not exclusively readable/writable
-     by current user.
diff --git a/databases/mysql57-server/files/patch-plugin_password__validation_validate__password.cc b/databases/mysql57-server/files/patch-plugin_password__validation_validate__password.cc
deleted file mode 100644
index 47fc0dc6b7e5..000000000000
--- a/databases/mysql57-server/files/patch-plugin_password__validation_validate__password.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- plugin/password_validation/validate_password.cc.orig	2016-03-28 18:06:12 UTC
-+++ plugin/password_validation/validate_password.cc
-@@ -18,6 +18,8 @@
- #include <mysql/plugin_validate_password.h>
- #include <mysql/service_my_plugin_log.h>
- #include <mysql/service_mysql_string.h>
-+/* solve clash between libc++ bitset::test() and test macro from my_global.h */
-+#undef test
- #include <set>
- #include <iostream>
- #include <fstream>
diff --git a/databases/mysql57-server/files/patch-rapid-plugin-x-ngs-include-ngs_common-protocol_protobuf.h b/databases/mysql57-server/files/patch-rapid-plugin-x-ngs-include-ngs_common-protocol_protobuf.h
deleted file mode 100644
index 2ebc71bd239a..000000000000
--- a/databases/mysql57-server/files/patch-rapid-plugin-x-ngs-include-ngs_common-protocol_protobuf.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- rapid/plugin/x/ngs/include/ngs_common/protocol_protobuf.h.orig	2019-04-13 13:32:15 UTC
-+++ rapid/plugin/x/ngs/include/ngs_common/protocol_protobuf.h
-@@ -29,7 +29,6 @@
- #include <google/protobuf/io/tokenizer.h>
- #include <google/protobuf/io/zero_copy_stream.h>
- #include <google/protobuf/wire_format_lite.h>
--#include <google/protobuf/wire_format_lite_inl.h>
- #include <google/protobuf/dynamic_message.h>
- 
- #include "mysqlx_connection.pb.h"
diff --git a/databases/mysql57-server/files/patch-rapid_plugin_group__replication_src_recovery_state_transfer.cc b/databases/mysql57-server/files/patch-rapid_plugin_group__replication_src_recovery_state_transfer.cc
deleted file mode 100644
index 42d191ec2da4..000000000000
--- a/databases/mysql57-server/files/patch-rapid_plugin_group__replication_src_recovery_state_transfer.cc
+++ /dev/null
@@ -1,20 +0,0 @@
---- rapid/plugin/group_replication/src/recovery_state_transfer.cc.orig	2021-03-26 06:58:52 UTC
-+++ rapid/plugin/group_replication/src/recovery_state_transfer.cc
-@@ -711,6 +711,7 @@ int Recovery_state_transfer::purge_recovery_slave_thre
-     donor_connection_interface.initialize_channel(const_cast<char*>("<NULL>"),
-                                                   0,
-                                                   NULL, NULL,
-+                                                  false,
-                                                   NULL,
-                                                   NULL,
-                                                   NULL,
-@@ -718,8 +719,7 @@ int Recovery_state_transfer::purge_recovery_slave_thre
-                                                   NULL,
-                                                   NULL,
-                                                   NULL,
--                                                  NULL,
--                                                  NULL,
-+                                                  false,
-                                                   DEFAULT_THREAD_PRIORITY,
-                                                   1, false, true, true);
- 
diff --git a/databases/mysql57-server/files/patch-rapid_plugin_group_replication_libmysqlgcs_src_bindings_xcom_xcom_xcom_ssl_transport.c b/databases/mysql57-server/files/patch-rapid_plugin_group_replication_libmysqlgcs_src_bindings_xcom_xcom_xcom_ssl_transport.c
deleted file mode 100644
index 44217e5fec58..000000000000
--- a/databases/mysql57-server/files/patch-rapid_plugin_group_replication_libmysqlgcs_src_bindings_xcom_xcom_xcom_ssl_transport.c
+++ /dev/null
@@ -1,37 +0,0 @@
---- rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_ssl_transport.c.orig	2020-03-23 17:35:17 UTC
-+++ rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_ssl_transport.c
-@@ -232,7 +232,7 @@ static int configure_ssl_algorithms(SSL_CTX* ssl_ctx, 
-                                     const char* tls_version)
- {
-   DH *dh= NULL;
--#ifdef HAVE_TLSv13
-+#if defined(HAVE_TLSv13) && !defined(LIBRESSL_VERSION_NUMBER)
-   /* We support TLS up to 1.2, so explicitly disable TLS 1.3. */
-   long ssl_ctx_options= SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3 | SSL_OP_NO_TLSv1_3;
- #else
-@@ -257,14 +257,14 @@ static int configure_ssl_algorithms(SSL_CTX* ssl_ctx, 
-                     SSL_OP_NO_TLSv1 |
-                     SSL_OP_NO_TLSv1_1
-                     | SSL_OP_NO_TLSv1_2
--#ifdef HAVE_TLSv13
-+#if defined(HAVE_TLSv13) && !defined(LIBRESSL_VERSION_NUMBER)
-                     | SSL_OP_NO_TLSv1_3
- #endif /* HAVE_TLSv13 */
-                    );
- 
-   SSL_CTX_set_options(ssl_ctx, ssl_ctx_options);
- 
--#ifdef HAVE_TLSv13
-+#if defined(HAVE_TLSv13) && !defined(LIBRESSL_VERSION_NUMBER)
-   /* We do not support TLS 1.3.
-      Setting empty TLS 1.3 ciphersuites disables them. */
-   if (SSL_CTX_set_ciphersuites(ssl_ctx, "") == 0)
-@@ -529,7 +529,7 @@ int xcom_init_ssl(const char *server_key_file, const c
-     break e.g. ODBC clients (if the client also uses SSL).
-   */
- 
--#if defined(HAVE_STATIC_OPENSSL)
-+#if defined(HAVE_STATIC_OPENSSL) && !defined(LIBRESSL_VERSION_NUMBER)
-   OPENSSL_init_crypto(OPENSSL_INIT_NO_ATEXIT, NULL);
- #else
-   SSL_library_init();
diff --git a/databases/mysql57-server/files/patch-rapid_plugin_x_CMakeLists.txt b/databases/mysql57-server/files/patch-rapid_plugin_x_CMakeLists.txt
deleted file mode 100644
index 5cad57c453d6..000000000000
--- a/databases/mysql57-server/files/patch-rapid_plugin_x_CMakeLists.txt
+++ /dev/null
@@ -1,19 +0,0 @@
---- rapid/plugin/x/CMakeLists.txt.orig	2017-03-18 07:45:14 UTC
-+++ rapid/plugin/x/CMakeLists.txt
-@@ -92,13 +92,14 @@ ELSE()
-     ${CMAKE_SOURCE_DIR}/include #temporary
-     ${CMAKE_CURRENT_SOURCE_DIR}/include/mysql
-     ${CMAKE_CURRENT_BINARY_DIR}/generated
--    ${SSL_INCLUDE_DIRS}
-+    ${BOOST_INCLUDE_DIR}
-   )
- 
-   INCLUDE_DIRECTORIES(SYSTEM
--    ${BOOST_INCLUDE_DIR}
-     ${PROTOBUF_INCLUDE_DIRS}
-     ${LIBEVENT_INCLUDE_DIRS}
-+    ${SSL_INCLUDE_DIRS}
-+    ${ZLIB_INCLUDE_DIR}
-   )
- 
-   IF(XPLUGIN_NO_LITE_PROTOBUF)
diff --git a/databases/mysql57-server/files/patch-rapid_plugin_x_mysqlx__configure.cmake b/databases/mysql57-server/files/patch-rapid_plugin_x_mysqlx__configure.cmake
deleted file mode 100644
index 52828f00f631..000000000000
--- a/databases/mysql57-server/files/patch-rapid_plugin_x_mysqlx__configure.cmake
+++ /dev/null
@@ -1,15 +0,0 @@
---- rapid/plugin/x/mysqlx_configure.cmake.orig	2016-09-14 15:25:26 UTC
-+++ rapid/plugin/x/mysqlx_configure.cmake
-@@ -29,6 +29,7 @@ CONFIGURE_FILE(${MYSQLX_PROJECT_DIR}/src
- CONFIGURE_FILE(${MYSQLX_PROJECT_DIR}/src/mysqlx_version.h.in
-                ${CMAKE_CURRENT_BINARY_DIR}/generated/mysqlx_version.h )
- 
-+IF(FALSE)
- INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/generated/mysqlx_error.h
-         DESTINATION ${INSTALL_INCLUDEDIR}
-         COMPONENT Developement)
-@@ -36,3 +37,4 @@ INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR
- INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/generated/mysqlx_version.h
-         DESTINATION ${INSTALL_INCLUDEDIR}
-         COMPONENT Developement)
-+ENDIF()
diff --git a/databases/mysql57-server/files/patch-rapid_unittest_gunit_xplugin_CMakeLists.txt b/databases/mysql57-server/files/patch-rapid_unittest_gunit_xplugin_CMakeLists.txt
deleted file mode 100644
index d968a7daa022..000000000000
--- a/databases/mysql57-server/files/patch-rapid_unittest_gunit_xplugin_CMakeLists.txt
+++ /dev/null
@@ -1,18 +0,0 @@
---- rapid/unittest/gunit/xplugin/CMakeLists.txt.orig	2016-03-28 18:06:12 UTC
-+++ rapid/unittest/gunit/xplugin/CMakeLists.txt
-@@ -65,7 +65,6 @@ ENDIF()
- ADD_DEFINITIONS(${GMOCK_CFLAGS} -DBOOST_ALL_NO_LIB -DBOOST_NO_AUTO_PTR -DUSE_MYSQLX_FULL_PROTO)
- 
- INCLUDE_DIRECTORIES(SYSTEM
--    ${BOOST_INCLUDE_DIR}
-     ${PROTOBUF_INCLUDE_DIRS}
-     ${SSL_INCLUDE_DIRS}
-     ${LIBEVENT_INCLUDE_DIR}
-@@ -75,6 +74,7 @@ INCLUDE_DIRECTORIES(SYSTEM
- )
- 
- INCLUDE_DIRECTORIES(
-+  ${BOOST_INCLUDE_DIR}
-   ${CMAKE_SOURCE_DIR}/testing/include
-   ${PROJECT_SOURCE_DIR}/rapid/plugin/x/ngs/include
-   ${PROJECT_SOURCE_DIR}/rapid/plugin/x/ngs/include/ngs
diff --git a/databases/mysql57-server/files/patch-scripts_CMakeLists.txt b/databases/mysql57-server/files/patch-scripts_CMakeLists.txt
deleted file mode 100644
index 6766227250a1..000000000000
--- a/databases/mysql57-server/files/patch-scripts_CMakeLists.txt
+++ /dev/null
@@ -1,45 +0,0 @@
---- scripts/CMakeLists.txt.orig	2019-06-10 10:43:20.000000000 -0400
-+++ scripts/CMakeLists.txt	2019-08-01 10:10:16.206052000 -0400
-@@ -326,6 +326,8 @@
-           GET_FILENAME_COMPONENT(lib "${lib}" NAME_WE)
-           STRING(REGEX REPLACE "^lib" "" lib "${lib}")
-           SET(${var} "${${var}}-l${lib} " )
-+        ELSEIF(lib STREQUAL "-pthread")
-+          SET(${var} "${${var}}-pthread " )
-         ELSE()
-           SET(${var} "${${var}}-l${lib} " )
-         ENDIF()
-@@ -411,14 +413,13 @@
-   # On Unix, most of the files end up in the bin directory
-   SET(mysql_config_COMPONENT COMPONENT Development)
- 
-+
-   IF(WITH_SYSTEMD)
-     SET(BIN_SCRIPTS
--      mysql_config
-       mysqldumpslow
-       )
-   ELSE()
-     SET(BIN_SCRIPTS
--      mysql_config
-       mysqldumpslow
-       mysqld_multi
-       mysqld_safe
-@@ -446,7 +447,7 @@
-     ${CMAKE_CURRENT_BINARY_DIR}/${PKGCONFIG_FILE}
-     ESCAPE_QUOTES @ONLY)
- 
--  IF(INSTALL_PKGCONFIGDIR)
-+  IF(FALSE)
-     MESSAGE(STATUS "INSTALL ${PKGCONFIG_FILE} ${INSTALL_PKGCONFIGDIR}")
-     INSTALL(FILES
-       ${CMAKE_CURRENT_BINARY_DIR}/${PKGCONFIG_FILE}
-@@ -452,7 +453,7 @@
-   FOREACH(file ${BIN_SCRIPTS})
-     IF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh)
-       CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh
--        ${CMAKE_CURRENT_BINARY_DIR}/${file} ESCAPE_QUOTES @ONLY)
-+        ${CMAKE_CURRENT_BINARY_DIR}/${file} @ONLY)
-     ELSEIF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${file})
-       CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${file}
-          ${CMAKE_CURRENT_BINARY_DIR}/${file} COPYONLY)
diff --git a/databases/mysql57-server/files/patch-scripts_mysqld__safe.txt b/databases/mysql57-server/files/patch-scripts_mysqld__safe.txt
deleted file mode 100644
index b81284dda894..000000000000
--- a/databases/mysql57-server/files/patch-scripts_mysqld__safe.txt
+++ /dev/null
@@ -1,19 +0,0 @@
---- scripts/mysqld_safe.sh.orig	2020-06-02 11:05:42 UTC
-+++ scripts/mysqld_safe.sh
-@@ -359,7 +359,7 @@ mysqld_ld_preload_text() {
- # running mysqld.  See ld.so for details.
- set_malloc_lib() {
-   # This list is kept intentionally simple.
--  malloc_dirs="/usr/lib /usr/lib64 /usr/lib/i386-linux-gnu /usr/lib/x86_64-linux-gnu"
-+  malloc_dirs="/usr/lib /usr/lib64 /usr/lib/i386-linux-gnu /usr/lib/x86_64-linux-gnu /usr/local/lib"
-   malloc_lib="$1"
- 
-   # Allow --malloc-lib='' to override other settings
-@@ -378,6 +378,7 @@ set_malloc_lib() {
-         /usr/lib64) ;;
-         /usr/lib/i386-linux-gnu) ;;
-         /usr/lib/x86_64-linux-gnu) ;;
-+        /usr/local/lib) ;;
-         *)
-           log_error "--malloc-lib must be located in one of the directories: $malloc_dirs"
-           exit 1
diff --git a/databases/mysql57-server/files/patch-sql_CMakeLists.txt b/databases/mysql57-server/files/patch-sql_CMakeLists.txt
deleted file mode 100644
index e29d4fc10a8e..000000000000
--- a/databases/mysql57-server/files/patch-sql_CMakeLists.txt
+++ /dev/null
@@ -1,11 +0,0 @@
---- sql/CMakeLists.txt.orig	2021-07-26 19:53:15.028262000 +0200
-+++ sql/CMakeLists.txt	2021-07-26 19:55:42.226384000 +0200
-@@ -30,6 +30,8 @@ INCLUDE_DIRECTORIES(
-   ${CMAKE_SOURCE_DIR}/regex 
-   ${SSL_INCLUDE_DIRS}
-   ${CMAKE_BINARY_DIR}/sql
-+  ${CMAKE_BINARY_DIR}/include
-+  ${CMAKE_BINARY_DIR}
- )
- 
- SET(CONF_SOURCES
diff --git a/databases/mysql57-server/files/patch-sql_auth_sha2_password_common.cc b/databases/mysql57-server/files/patch-sql_auth_sha2_password_common.cc
deleted file mode 100644
index 567a7da1628c..000000000000
--- a/databases/mysql57-server/files/patch-sql_auth_sha2_password_common.cc
+++ /dev/null
@@ -1,12 +0,0 @@
---- sql/auth/sha2_password_common.cc
-+++ sql/auth/sha2_password_common.cc
-@@ -116,7 +116,8 @@ bool SHA256_digest::retrieve_digest(unsigned char *digest,
-     DBUG_RETURN(true);
-   }
-   m_ok= EVP_DigestFinal_ex(md_context, m_digest, NULL);
--#if defined(HAVE_WOLFSSL) || OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if defined(HAVE_WOLFSSL) || OPENSSL_VERSION_NUMBER < 0x10100000L || \
-+    (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x02090000fL)
-   EVP_MD_CTX_cleanup(md_context);
- #else  /* OPENSSL_VERSION_NUMBER < 0x10100000L */
-   EVP_MD_CTX_reset(md_context);
diff --git a/databases/mysql57-server/files/patch-sql_binlog.cc b/databases/mysql57-server/files/patch-sql_binlog.cc
deleted file mode 100644
index 7367bc283603..000000000000
--- a/databases/mysql57-server/files/patch-sql_binlog.cc
+++ /dev/null
@@ -1,24 +0,0 @@
---- sql/binlog.cc.orig	2021-03-26 06:58:52 UTC
-+++ sql/binlog.cc
-@@ -9973,8 +9973,8 @@ void MYSQL_BIN_LOG::report_missing_purged_gtids(const 
- 
-   char* missing_gtids= NULL;
-   char* slave_executed_gtids= NULL;
--  gtid_missing.to_string(&missing_gtids, NULL);
--  slave_executed_gtid_set->to_string(&slave_executed_gtids, NULL);
-+  gtid_missing.to_string(&missing_gtids, false);
-+  slave_executed_gtid_set->to_string(&slave_executed_gtids, false);
- 
-   /*
-      Log the information about the missing purged GTIDs to the error log
-@@ -10045,8 +10045,8 @@ void MYSQL_BIN_LOG::report_missing_gtids(const Gtid_se
-   Gtid_set gtid_missing(slave_executed_gtid_set->get_sid_map());
-   gtid_missing.add_gtid_set(slave_executed_gtid_set);
-   gtid_missing.remove_gtid_set(previous_gtid_set);
--  gtid_missing.to_string(&missing_gtids, NULL);
--  slave_executed_gtid_set->to_string(&slave_executed_gtids, NULL);
-+  gtid_missing.to_string(&missing_gtids, false);
-+  slave_executed_gtid_set->to_string(&slave_executed_gtids, false);
- 
-   String tmp_uuid;
-   uchar name[]= "slave_uuid";
diff --git a/databases/mysql57-server/files/patch-sql_conn__handler_socket__connection.cc b/databases/mysql57-server/files/patch-sql_conn__handler_socket__connection.cc
deleted file mode 100644
index 2b5e80a44574..000000000000
--- a/databases/mysql57-server/files/patch-sql_conn__handler_socket__connection.cc
+++ /dev/null
@@ -1,32 +0,0 @@
---- sql/conn_handler/socket_connection.cc.orig	2017-03-18 07:45:14 UTC
-+++ sql/conn_handler/socket_connection.cc
-@@ -942,22 +942,25 @@ Channel_info* Mysqld_socket_listener::li
-     signal(SIGCHLD, SIG_DFL);
-     request_init(&req, RQ_DAEMON, m_libwrap_name, RQ_FILE,
-                  mysql_socket_getfd(connect_sock), NULL);
--    fromhost(&req);
-+    void (*my_fromhost) (void *) = (void (*)(void *)) fromhost;
-+    my_fromhost(&req);
- 
--    if (!hosts_access(&req))
-+    int (*my_hosts_access) (void *) = (int (*) (void *)) hosts_access;
-+    if (!my_hosts_access(&req))
-     {
-       /*
-         This may be stupid but refuse() includes an exit(0)
-         which we surely don't want...
-         clean_exit() - same stupid thing ...
-       */
-+      char *(*my_eval_client) (void *) = (char *(*) (void *)) eval_client;
-       syslog(LOG_AUTH | m_deny_severity,
--             "refused connect from %s", eval_client(&req));
-+             "refused connect from %s", my_eval_client(&req));
- 
- #ifdef HAVE_LIBWRAP_PROTOTYPES
-       // Some distros have patched tcpd.h to have proper prototypes
-       if (req.sink)
--        (req.sink)(req.fd);
-+        ((void (*)(int)) (req.sink))(req.fd);
- #else
-       // Some distros have not patched tcpd.h
-       if (req.sink)
diff --git a/databases/mysql57-server/files/patch-sql_locks_shared__spin__lock.cc b/databases/mysql57-server/files/patch-sql_locks_shared__spin__lock.cc
deleted file mode 100644
index ca63b9f31439..000000000000
--- a/databases/mysql57-server/files/patch-sql_locks_shared__spin__lock.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- sql/locks/shared_spin_lock.cc.orig 2021-05-20 11:22:55 UTC
-+++ sql/locks/shared_spin_lock.cc
-@@ -242,7 +242,7 @@ lock::Shared_spin_lock &lock::Shared_spin_lock::try_or
- #if defined(__APPLE__)
-   my_atomic_store64(&this->m_exclusive_owner, reinterpret_cast<int64>(self));
- #else
--  my_atomic_store64(&this->m_exclusive_owner, self);
-+  my_atomic_store64(&this->m_exclusive_owner, reinterpret_cast<int64>(self));
- #endif
-   return (*this);
- }
diff --git a/databases/mysql57-server/files/patch-sql_mysqld.cc b/databases/mysql57-server/files/patch-sql_mysqld.cc
deleted file mode 100644
index 75a57ce8688a..000000000000
--- a/databases/mysql57-server/files/patch-sql_mysqld.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- sql/mysqld.cc.orig	2019-09-27 09:00:15.000000000 +0200
-+++ sql/mysqld.cc	2019-11-24 17:47:52.395539000 +0100
-@@ -3419,7 +3419,7 @@
- static int init_ssl()
- {
- #ifdef HAVE_OPENSSL
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-   CRYPTO_malloc_init();
- #else /* OPENSSL_VERSION_NUMBER < 0x10100000L */
-   OPENSSL_malloc_init();
diff --git a/databases/mysql57-server/files/patch-sql_sys__vars.cc b/databases/mysql57-server/files/patch-sql_sys__vars.cc
deleted file mode 100644
index e21d62430970..000000000000
--- a/databases/mysql57-server/files/patch-sql_sys__vars.cc
+++ /dev/null
@@ -1,38 +0,0 @@
---- sql/sys_vars.cc.orig	2016-03-28 18:06:12 UTC
-+++ sql/sys_vars.cc
-@@ -1734,7 +1734,7 @@ static Sys_var_ulong Sys_interactive_tim
-        "connection before closing it",
-        SESSION_VAR(net_interactive_timeout),
-        CMD_LINE(REQUIRED_ARG),
--       VALID_RANGE(1, LONG_TIMEOUT), DEFAULT(NET_WAIT_TIMEOUT), BLOCK_SIZE(1));
-+       VALID_RANGE(1, INT_MAX32/1000), DEFAULT(NET_WAIT_TIMEOUT), BLOCK_SIZE(1));
- 
- static Sys_var_ulong Sys_join_buffer_size(
-        "join_buffer_size",
-@@ -2552,7 +2552,7 @@ static Sys_var_ulong Sys_net_read_timeou
-        "Number of seconds to wait for more data from a connection before "
-        "aborting the read",
-        SESSION_VAR(net_read_timeout), CMD_LINE(REQUIRED_ARG),
--       VALID_RANGE(1, LONG_TIMEOUT), DEFAULT(NET_READ_TIMEOUT), BLOCK_SIZE(1),
-+       VALID_RANGE(1, INT_MAX32/1000), DEFAULT(NET_READ_TIMEOUT), BLOCK_SIZE(1),
-        NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0),
-        ON_UPDATE(fix_net_read_timeout));
- 
-@@ -2568,7 +2568,7 @@ static Sys_var_ulong Sys_net_write_timeo
-        "Number of seconds to wait for a block to be written to a connection "
-        "before aborting the write",
-        SESSION_VAR(net_write_timeout), CMD_LINE(REQUIRED_ARG),
--       VALID_RANGE(1, LONG_TIMEOUT), DEFAULT(NET_WRITE_TIMEOUT), BLOCK_SIZE(1),
-+       VALID_RANGE(1, INT_MAX32/1000), DEFAULT(NET_WRITE_TIMEOUT), BLOCK_SIZE(1),
-        NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0),
-        ON_UPDATE(fix_net_write_timeout));
- 
-@@ -4083,7 +4083,7 @@ static Sys_var_ulong Sys_net_wait_timeou
-        "The number of seconds the server waits for activity on a "
-        "connection before closing it",
-        SESSION_VAR(net_wait_timeout), CMD_LINE(REQUIRED_ARG),
--       VALID_RANGE(1, IF_WIN(INT_MAX32/1000, LONG_TIMEOUT)),
-+       VALID_RANGE(1, INT_MAX32/1000),
-        DEFAULT(NET_WAIT_TIMEOUT), BLOCK_SIZE(1));
- 
- static Sys_var_plugin Sys_default_storage_engine(
diff --git a/databases/mysql57-server/files/patch-storage_innobase_fsp_fsp0fsp.cc b/databases/mysql57-server/files/patch-storage_innobase_fsp_fsp0fsp.cc
deleted file mode 100644
index 8d2627e75010..000000000000
--- a/databases/mysql57-server/files/patch-storage_innobase_fsp_fsp0fsp.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- storage/innobase/fsp/fsp0fsp.cc.orig	2021-03-26 06:58:52 UTC
-+++ storage/innobase/fsp/fsp0fsp.cc
-@@ -1281,7 +1281,7 @@ fsp_header_decode_encryption_info(
- 
- 	if (elen == MY_AES_BAD_DATA) {
- 		my_free(master_key);
--		return(NULL);
-+		return(false);
- 	}
- 
- 	/* Check checksum bytes. */
diff --git a/databases/mysql57-server/files/patch-storage_innobase_include_srv0mon.h b/databases/mysql57-server/files/patch-storage_innobase_include_srv0mon.h
deleted file mode 100644
index 8abbfcb04a31..000000000000
--- a/databases/mysql57-server/files/patch-storage_innobase_include_srv0mon.h
+++ /dev/null
@@ -1,13 +0,0 @@
---- storage/innobase/include/srv0mon.h.orig	2016-03-28 18:06:12 UTC
-+++ storage/innobase/include/srv0mon.h
-@@ -34,6 +34,10 @@ Created 12/15/2009	Jimmy Yang
- /* Required for FreeBSD so that INT64_MAX is defined. */
- #define __STDC_LIMIT_MACROS
- #endif /* __STDC_LIMIT_MACROS */
-+#ifdef __DragonFly__
-+/* The hack above doen't work for dragonfly, stdint.h already imported */
-+#include <machine/int_limits.h>
-+#endif
- 
- #include <stdint.h>
- 
diff --git a/databases/mysql57-server/files/patch-storage_myisam_mi__dynrec.c b/databases/mysql57-server/files/patch-storage_myisam_mi__dynrec.c
deleted file mode 100644
index 282cffdbcbc5..000000000000
--- a/databases/mysql57-server/files/patch-storage_myisam_mi__dynrec.c
+++ /dev/null
@@ -1,23 +0,0 @@
---- storage/myisam/mi_dynrec.c.orig	2016-03-28 18:06:12 UTC
-+++ storage/myisam/mi_dynrec.c
-@@ -65,18 +65,13 @@ my_bool mi_dynmap_file(MI_INFO *info, my
-     DBUG_RETURN(1);
-   }
-   /*
--    I wonder if it is good to use MAP_NORESERVE. From the Linux man page:
--    MAP_NORESERVE
--      Do not reserve swap space for this mapping. When swap space is
--      reserved, one has the guarantee that it is possible to modify the
--      mapping. When swap space is not reserved one might get SIGSEGV
--      upon a write if no physical memory is available.
-+    MAP_NORESERVE is unimplemented in FreeBSD
-   */
-   info->s->file_map= (uchar*)
-                   my_mmap(0, (size_t) size,
-                           info->s->mode==O_RDONLY ? PROT_READ :
-                           PROT_READ | PROT_WRITE,
--                          MAP_SHARED | MAP_NORESERVE,
-+                          MAP_SHARED,
-                           info->dfile, 0L);
-   if (info->s->file_map == (uchar*) MAP_FAILED)
-   {
diff --git a/databases/mysql57-server/files/patch-support-files_CMakeLists.txt b/databases/mysql57-server/files/patch-support-files_CMakeLists.txt
deleted file mode 100644
index 1d1999212ed5..000000000000
--- a/databases/mysql57-server/files/patch-support-files_CMakeLists.txt
+++ /dev/null
@@ -1,12 +0,0 @@
---- support-files/CMakeLists.txt.orig	2016-03-28 18:06:12 UTC
-+++ support-files/CMakeLists.txt
-@@ -69,7 +69,9 @@ IF(UNIX)
-     INSTALL(FILES magic DESTINATION ${inst_location} COMPONENT SupportFiles)
-   ENDIF()
- 
-+IF(FALSE)
-   INSTALL(FILES mysql.m4 DESTINATION ${INSTALL_SHAREDIR}/aclocal COMPONENT Development)
-+ENDIF()
-   
-   SET(bindir ${prefix}/${INSTALL_BINDIR})
-   SET(sbindir ${prefix}/${INSTALL_SBINDIR})
diff --git a/databases/mysql57-server/files/patch-vio_viosslfactories.c b/databases/mysql57-server/files/patch-vio_viosslfactories.c
deleted file mode 100644
index 00c32ea9dca3..000000000000
--- a/databases/mysql57-server/files/patch-vio_viosslfactories.c
+++ /dev/null
@@ -1,62 +0,0 @@
---- vio/viosslfactories.c
-+++ vio/viosslfactories.c
-@@ -123,21 +123,19 @@ static DH *get_dh2048(void)
-   DH *dh;
-   if ((dh=DH_new()))
-   {
--    BIGNUM *p= BN_bin2bn(dh2048_p, sizeof(dh2048_p), NULL);
--    BIGNUM *g= BN_bin2bn(dh2048_g, sizeof(dh2048_g), NULL);
--    if (!p || !g
--#if OPENSSL_VERSION_NUMBER >= 0x10100000L
--        || !DH_set0_pqg(dh, p, NULL, g)
--#endif /* OPENSSL_VERSION_NUMBER >= 0x10100000L */
--    ) {
--      /* DH_free() will free 'p' and 'g' at once. */
-+    BIGNUM *p = BN_bin2bn(dh2048_p,sizeof(dh2048_p), NULL);
-+    BIGNUM *g = BN_bin2bn(dh2048_g,sizeof(dh2048_g), NULL);
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-+    dh->p=p;
-+    dh->g=g;
-+    if (! dh->p || ! dh->g)
-+#else
-+    if (!DH_set0_pqg(dh, p, NULL, g))
-+#endif
-+    {
-       DH_free(dh);
--      return NULL;
-+      dh = NULL;
-     }
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
--    dh->p= p;
--    dh->g= g;
--#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */
-   }
-   return(dh);
- }
-@@ -503,7 +501,7 @@ new_VioSSLFd(const char *key_file, const char *cert_fi
-   struct st_VioSSLFd *ssl_fd;
-   /* MySQL 5.7 supports TLS up to v1.2, explicitly disable TLSv1.3. */
-   long ssl_ctx_options= SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3
--#ifdef HAVE_TLSv13
-+#if defined(HAVE_TLSv13) && !defined(LIBRESSL_VERSION_NUMBER)
-                         | SSL_OP_NO_TLSv1_3
- #endif /* HAVE_TLSv13 */
-                         ;
-@@ -536,7 +534,7 @@ new_VioSSLFd(const char *key_file, const char *cert_fi
-                     SSL_OP_NO_TLSv1 |
-                     SSL_OP_NO_TLSv1_1
-                     | SSL_OP_NO_TLSv1_2
--#ifdef HAVE_TLSv13
-+#if defined(HAVE_TLSv13) && !defined(LIBRESSL_VERSION_NUMBER)
-                     | SSL_OP_NO_TLSv1_3
- #endif /* HAVE_TLSv13 */
-                     | SSL_OP_NO_TICKET
-@@ -559,7 +557,7 @@ new_VioSSLFd(const char *key_file, const char *cert_fi
- 
-   SSL_CTX_set_options(ssl_fd->ssl_context, ssl_ctx_options);
- 
--#ifdef HAVE_TLSv13
-+#if defined(HAVE_TLSv13) && !defined(LIBRESSL_VERSION_NUMBER)
-   /*
-     MySQL 5.7 doesn't support TLSv1.3 - set empty TLSv1.3 ciphersuites.
-   */
diff --git a/databases/mysql57-server/files/pkg-message.in b/databases/mysql57-server/files/pkg-message.in
deleted file mode 100644
index c4a6facbf30c..000000000000
--- a/databases/mysql57-server/files/pkg-message.in
+++ /dev/null
@@ -1,19 +0,0 @@
-[
-{ type: install
-  message: <<EOM
-Initial password for first time use of MySQL is saved in $HOME/.mysql_secret
-ie. when you want to use "mysql -u root -p" first you should see password
-in /root/.mysql_secret
-
-MySQL57 has a default %%ETCDIR%%/my.cnf,
-remember to replace it with your own
-or set `mysql_optfile="$YOUR_CNF_FILE` in rc.conf.
-EOM
-}
-{ type: upgrade
-  message: <<EOM
-Remember to run mysql_upgrade the first time you start the MySQL server
-after an upgrade from an earlier version.
-EOM
-}
-]
diff --git a/databases/mysql57-server/pkg-descr b/databases/mysql57-server/pkg-descr
deleted file mode 100644
index 028ce03b0da2..000000000000
--- a/databases/mysql57-server/pkg-descr
+++ /dev/null
@@ -1,4 +0,0 @@
-MySQL is a very fast, multi-threaded, multi-user and robust SQL
-(Structured Query Language) database server.
-
-WWW: https://www.mysql.com/
diff --git a/databases/mysql57-server/pkg-plist b/databases/mysql57-server/pkg-plist
deleted file mode 100644
index 5964d7cd621b..000000000000
--- a/databases/mysql57-server/pkg-plist
+++ /dev/null
@@ -1,161 +0,0 @@
-bin/innochecksum
-bin/lz4_decompress
-bin/my_print_defaults
-bin/myisam_ftdump
-bin/myisamchk
-bin/myisamlog
-bin/myisampack
-bin/mysql_install_db
-bin/mysql_plugin
-bin/mysql_secure_installation
-bin/mysql_tzinfo_to_sql
-bin/mysql_upgrade
-bin/mysqld_multi
-bin/mysqld_safe
-bin/mysqldumpslow
-bin/mysqltest
-bin/mysqlxtest
-bin/perror
-bin/replace
-bin/resolve_stack_dump
-bin/resolveip
-bin/zlib_decompress
-lib/mysql/libmysqld.a
-lib/mysql/plugin/adt_null.so
-lib/mysql/plugin/auth.so
-lib/mysql/plugin/auth_test_plugin.so
-lib/mysql/plugin/connection_control.so
-lib/mysql/plugin/daemon_example.ini
-lib/mysql/plugin/group_replication.so
-%%NO_EXAMPLE%%lib/mysql/plugin/ha_example.so
-lib/mysql/plugin/keyring_file.so
-lib/mysql/plugin/keyring_udf.so
-lib/mysql/plugin/libdaemon_example.so
-lib/mysql/plugin/libtest_framework.so
-lib/mysql/plugin/libtest_services.so
-lib/mysql/plugin/libtest_services_threaded.so
-lib/mysql/plugin/libtest_session_detach.so
-lib/mysql/plugin/libtest_session_in_thd.so
-lib/mysql/plugin/libtest_session_info.so
-lib/mysql/plugin/libtest_sql_2_sessions.so
-lib/mysql/plugin/libtest_sql_all_col_types.so
-lib/mysql/plugin/libtest_sql_cmds_1.so
-lib/mysql/plugin/libtest_sql_commit.so
-lib/mysql/plugin/libtest_sql_complex.so
-lib/mysql/plugin/libtest_sql_errors.so
-lib/mysql/plugin/libtest_sql_lock.so
-lib/mysql/plugin/libtest_sql_processlist.so
-lib/mysql/plugin/libtest_sql_replication.so
-lib/mysql/plugin/libtest_sql_shutdown.so
-lib/mysql/plugin/libtest_sql_sqlmode.so
-lib/mysql/plugin/libtest_sql_stored_procedures_functions.so
-lib/mysql/plugin/libtest_sql_views_triggers.so
-lib/mysql/plugin/libtest_x_sessions_deinit.so
-lib/mysql/plugin/libtest_x_sessions_init.so
-lib/mysql/plugin/locking_service.so
-lib/mysql/plugin/mypluglib.so
-lib/mysql/plugin/mysql_no_login.so
-lib/mysql/plugin/mysqlx.so
-lib/mysql/plugin/qa_auth_client.so
-lib/mysql/plugin/qa_auth_interface.so
-lib/mysql/plugin/qa_auth_server.so
-lib/mysql/plugin/replication_observers_example_plugin.so
-lib/mysql/plugin/rewrite_example.so
-lib/mysql/plugin/rewriter.so
-lib/mysql/plugin/semisync_master.so
-lib/mysql/plugin/semisync_slave.so
-lib/mysql/plugin/test_security_context.so
-lib/mysql/plugin/test_udf_services.so
-%%EXAMPLE%%lib/mysql/plugin/udf_example.so
-lib/mysql/plugin/validate_password.so
-lib/mysql/plugin/version_token.so
-libexec/mysqld
-man/man1/my_print_defaults.1.gz
-man/man1/myisam_ftdump.1.gz
-man/man1/myisamchk.1.gz
-man/man1/myisamlog.1.gz
-man/man1/myisampack.1.gz
-man/man1/mysql.server.1.gz
-man/man1/mysql_install_db.1.gz
-man/man1/mysql_plugin.1.gz
-man/man1/mysql_secure_installation.1.gz
-man/man1/mysql_tzinfo_to_sql.1.gz
-man/man1/mysql_upgrade.1.gz
-man/man1/mysqld_multi.1.gz
-man/man1/mysqld_safe.1.gz
-man/man1/mysqldumpslow.1.gz
-man/man1/mysqlman.1.gz
-man/man1/perror.1.gz
-man/man1/replace.1.gz
-man/man1/resolve_stack_dump.1.gz
-man/man1/resolveip.1.gz
-man/man8/mysqld.8.gz
-%%DATADIR%%/bulgarian/errmsg.sys
-%%DATADIR%%/charsets/Index.xml
-%%DATADIR%%/charsets/README
-%%DATADIR%%/charsets/armscii8.xml
-%%DATADIR%%/charsets/ascii.xml
-%%DATADIR%%/charsets/cp1250.xml
-%%DATADIR%%/charsets/cp1251.xml
-%%DATADIR%%/charsets/cp1256.xml
-%%DATADIR%%/charsets/cp1257.xml
-%%DATADIR%%/charsets/cp850.xml
-%%DATADIR%%/charsets/cp852.xml
-%%DATADIR%%/charsets/cp866.xml
-%%DATADIR%%/charsets/dec8.xml
-%%DATADIR%%/charsets/geostd8.xml
-%%DATADIR%%/charsets/greek.xml
-%%DATADIR%%/charsets/hebrew.xml
-%%DATADIR%%/charsets/hp8.xml
-%%DATADIR%%/charsets/keybcs2.xml
-%%DATADIR%%/charsets/koi8r.xml
-%%DATADIR%%/charsets/koi8u.xml
-%%DATADIR%%/charsets/latin1.xml
-%%DATADIR%%/charsets/latin2.xml
-%%DATADIR%%/charsets/latin5.xml
-%%DATADIR%%/charsets/latin7.xml
-%%DATADIR%%/charsets/macce.xml
-%%DATADIR%%/charsets/macroman.xml
-%%DATADIR%%/charsets/swe7.xml
-%%DATADIR%%/czech/errmsg.sys
-%%DATADIR%%/danish/errmsg.sys
-%%DATADIR%%/dictionary.txt
-%%DATADIR%%/dutch/errmsg.sys
-%%DATADIR%%/english/errmsg.sys
-%%DATADIR%%/errmsg-utf8.txt
-%%DATADIR%%/estonian/errmsg.sys
-%%DATADIR%%/fill_help_tables.sql
-%%DATADIR%%/french/errmsg.sys
-%%DATADIR%%/german/errmsg.sys
-%%DATADIR%%/greek/errmsg.sys
-%%DATADIR%%/hungarian/errmsg.sys
-%%DATADIR%%/innodb_memcached_config.sql
-%%DATADIR%%/install_rewriter.sql
-%%DATADIR%%/italian/errmsg.sys
-%%DATADIR%%/japanese/errmsg.sys
-%%DATADIR%%/korean/errmsg.sys
-%%DATADIR%%/magic
-%%DATADIR%%/mysql-log-rotate
-%%DATADIR%%/mysql.server
-%%DATADIR%%/mysql_security_commands.sql
-%%DATADIR%%/mysql_sys_schema.sql
-%%DATADIR%%/mysql_system_tables.sql
-%%DATADIR%%/mysql_system_tables_data.sql
-%%DATADIR%%/mysql_test_data_timezone.sql
-%%DATADIR%%/mysqld_multi.server
-%%DATADIR%%/norwegian-ny/errmsg.sys
-%%DATADIR%%/norwegian/errmsg.sys
-%%DATADIR%%/polish/errmsg.sys
-%%DATADIR%%/portuguese/errmsg.sys
-%%DATADIR%%/romanian/errmsg.sys
-%%DATADIR%%/russian/errmsg.sys
-%%DATADIR%%/serbian/errmsg.sys
-%%DATADIR%%/slovak/errmsg.sys
-%%DATADIR%%/spanish/errmsg.sys
-%%DATADIR%%/swedish/errmsg.sys
-%%DATADIR%%/ukrainian/errmsg.sys
-%%DATADIR%%/uninstall_rewriter.sql
-@sample(root,wheel,0644) %%ETCDIR%%/my.cnf.sample
-@dir(mysql,mysql,0750) %%ETCDIR%%/keyring
-@dir(mysql,mysql,0750) %%MY_SECDIR%%
-@dir(mysql,mysql,0750) %%MY_TMPDIR%%
diff --git a/databases/mysql80-client/Makefile b/databases/mysql80-client/Makefile
index 1d43316113a1..57ea54fb66e6 100644
--- a/databases/mysql80-client/Makefile
+++ b/databases/mysql80-client/Makefile
@@ -1,5 +1,3 @@
-# Created by: "Mahdi Mokhtari <mokhi64@gmail.com>"
-
 PORTNAME=	mysql
 PORTREVISION=	0
 PKGNAMESUFFIX=	80-client
@@ -14,10 +12,10 @@ PKGMESSAGE=	${.CURDIR}/pkg-message
 PATCHDIR=	${MASTERDIR}/files
 PLIST=		${.CURDIR}/pkg-plist
 
-CONFLICTS_INSTALL=	mysql8[1-9]-client-* \
-			mysql[0-79][0-9]-client-* \
-			mariadb[0-9][0-9]-client-* \
-			percona[0-9][0-9]-client-*
+CONFLICTS_INSTALL=	mysql8[1-9]-client \
+			mysql[0-79][0-9]-client \
+			mariadb[0-9][0-9]-client \
+			percona[0-9][0-9]-client
 
 CMAKE_ARGS+=	-DWITHOUT_SERVER=1 -DINSTALL_SUPPORTFILESDIR=0
 
@@ -35,12 +33,16 @@ OPTIONS_GROUP_PLUGINS=	SASLCLIENT
 SASLCLIENT_DESC=	SASL client plugin module
 SASLCLIENT_CMAKE_BOOL=	WITH_AUTHENTICATION_LDAP
 SASLCLIENT_LIB_DEPENDS=	libsasl2.so:security/cyrus-sasl2
-SASLCLIENT_USE=		OPENLDAP=yes
+SASLCLIENT_USES=		ldap
+
 OPTIONS_DEFAULT+=	SASLCLIENT
 OPTIONS_SUB=	yes
 
 # issue 166367: adding symlinks for back-compatibility with ${lib}_r
 post-install:
+#	@${RM} ${STAGEDIR}${PREFIX}/lib/mysql/private/libprotobuf-lite.so.3.19.4
+#	@${RM} ${STAGEDIR}${PREFIX}/lib/mysql/private/libprotobuf.so.3.19.4
+	@${RM} -r ${STAGEDIR}${PREFIX}/lib/mysql/private
 	@${LN} -s libmysqlclient.a ${STAGEDIR}${PREFIX}/lib/mysql/libmysqlclient_r.a
 	@${LN} -s libmysqlclient.so ${STAGEDIR}${PREFIX}/lib/mysql/libmysqlclient_r.so
 	@${LN} -s libmysqlclient.so.21 ${STAGEDIR}${PREFIX}/lib/mysql/libmysqlclient_r.so.21
diff --git a/databases/mysql80-client/pkg-plist b/databases/mysql80-client/pkg-plist
index 1d2f6cfb9268..012af31d33c0 100644
--- a/databases/mysql80-client/pkg-plist
+++ b/databases/mysql80-client/pkg-plist
@@ -14,196 +14,45 @@ bin/mysqlshow
 bin/mysqlslap
 bin/perror
 @comment bin/zlib_decompress
-include/mysql/base64.h
-include/mysql/big_endian.h
-include/mysql/c_string_less.h
-include/mysql/crypt_genhash_impl.h
-include/mysql/decimal.h
-include/mysql/depth_first_search.h
-include/mysql/dur_prop.h
 include/mysql/errmsg.h
 include/mysql/field_types.h
-include/mysql/ft_global.h
-include/mysql/guard.h
-include/mysql/heap.h
-include/mysql/integer_digits.h
-include/mysql/keycache.h
-include/mysql/lex_string.h
-include/mysql/lf.h
-include/mysql/little_endian.h
-include/mysql/m_ctype.h
-include/mysql/m_string.h
-include/mysql/map_helpers.h
-include/mysql/mf_wcomp.h
-include/mysql/mutex_lock.h
-include/mysql/my_aes.h
-include/mysql/my_alloc.h
-include/mysql/my_atomic.h
-include/mysql/my_base.h
-include/mysql/my_bit.h
-include/mysql/my_bitmap.h
-include/mysql/my_byteorder.h
-include/mysql/my_check_opt.h
 include/mysql/my_command.h
-include/mysql/my_compare.h
-include/mysql/my_compiler.h
 include/mysql/my_compress.h
-include/mysql/my_dbug.h
-include/mysql/my_default.h
-include/mysql/my_dir.h
-include/mysql/my_double2ulonglong.h
-include/mysql/my_getopt.h
-include/mysql/my_hash_combine.h
-include/mysql/my_icp.h
-include/mysql/my_inttypes.h
-include/mysql/my_io.h
 include/mysql/my_list.h
-include/mysql/my_loglevel.h
-include/mysql/my_macros.h
-include/mysql/my_md5.h
-include/mysql/my_md5_size.h
-include/mysql/my_murmur3.h
-include/mysql/my_pointer_arithmetic.h
-include/mysql/my_psi_config.h
-include/mysql/my_rapidjson_size_t.h
-include/mysql/my_rdtsc.h
-include/mysql/my_rnd.h
-include/mysql/my_sharedlib.h
-include/mysql/my_shm_defaults.h
-include/mysql/my_sqlcommand.h
-include/mysql/my_stacktrace.h
-include/mysql/my_sys.h
-include/mysql/my_systime.h
-include/mysql/my_table_map.h
-include/mysql/my_thread.h
-include/mysql/my_thread_local.h
-include/mysql/my_thread_os_id.h
-include/mysql/my_time.h
-include/mysql/my_timer.h
-include/mysql/my_tree.h
-include/mysql/my_uctype.h
-include/mysql/my_user.h
-include/mysql/my_xml.h
-include/mysql/myisam.h
-include/mysql/myisammrg.h
-include/mysql/myisampack.h
 include/mysql/mysql.h
-include/mysql/mysql.h.pp
-include/mysql/mysql/client_authentication.h
 include/mysql/mysql/client_plugin.h
-include/mysql/mysql/client_plugin.h.pp
-include/mysql/mysql/com_data.h
-include/mysql/mysql/group_replication_priv.h
-include/mysql/mysql/innodb_priv.h
-include/mysql/mysql/mysql_lex_string.h
-include/mysql/mysql/plugin.h
-include/mysql/mysql/plugin_audit.h
-include/mysql/mysql/plugin_audit.h.pp
-include/mysql/mysql/plugin_auth.h
-include/mysql/mysql/plugin_auth.h.pp
 include/mysql/mysql/plugin_auth_common.h
-include/mysql/mysql/plugin_ftparser.h
-include/mysql/mysql/plugin_ftparser.h.pp
-include/mysql/mysql/plugin_group_replication.h
-include/mysql/mysql/plugin_keyring.h
-include/mysql/mysql/plugin_keyring.h.pp
-include/mysql/mysql/plugin_query_rewrite.h
-include/mysql/mysql/plugin_trace.h
-include/mysql/mysql/plugin_validate_password.h
-include/mysql/mysql/service_command.h
-include/mysql/mysql/service_locking.h
-include/mysql/mysql/service_my_plugin_log.h
-include/mysql/mysql/service_mysql_alloc.h
-include/mysql/mysql/service_mysql_keyring.h
-include/mysql/mysql/service_mysql_password_policy.h
-include/mysql/mysql/service_mysql_string.h
-include/mysql/mysql/service_parser.h
-include/mysql/mysql/service_plugin_registry.h
-include/mysql/mysql/service_rpl_transaction_ctx.h
-include/mysql/mysql/service_rpl_transaction_write_set.h
-include/mysql/mysql/service_rules_table.h
-include/mysql/mysql/service_security_context.h
-include/mysql/mysql/service_srv_session.h
-include/mysql/mysql/service_srv_session_info.h
-include/mysql/mysql/service_ssl_wrapper.h
-include/mysql/mysql/service_thd_alloc.h
-include/mysql/mysql/service_thd_engine_lock.h
-include/mysql/mysql/service_thd_wait.h
-include/mysql/mysql/service_thread_scheduler.h
-include/mysql/mysql/services.h
-include/mysql/mysql/services.h.pp
-include/mysql/mysql/thread_pool_priv.h
-include/mysql/mysql/thread_type.h
 include/mysql/mysql/udf_registration_types.h
 include/mysql/mysql_com.h
-include/mysql/mysql_com_server.h
 include/mysql/mysql_time.h
 include/mysql/mysql_version.h
-include/mysql/mysql_version.h.in
 include/mysql/mysqld_error.h
-include/mysql/mysys_err.h
-include/mysql/nullable.h
-include/mysql/password.h
-include/mysql/pfs_cond_provider.h
-include/mysql/pfs_error_provider.h
-include/mysql/pfs_file_provider.h
-include/mysql/pfs_idle_provider.h
-include/mysql/pfs_memory_provider.h
-include/mysql/pfs_metadata_provider.h
-include/mysql/pfs_mutex_provider.h
-include/mysql/pfs_rwlock_provider.h
-include/mysql/pfs_socket_provider.h
-include/mysql/pfs_stage_provider.h
-include/mysql/pfs_statement_provider.h
-include/mysql/pfs_table_provider.h
-include/mysql/pfs_thread_provider.h
-include/mysql/pfs_transaction_provider.h
-include/mysql/prealloced_array.h
-include/mysql/print_version.h
-include/mysql/priority_queue.h
-include/mysql/rwlock_scoped_lock.h
-include/mysql/scope_guard.h
-include/mysql/service_versions.h
-include/mysql/sha1.h
-include/mysql/sha2.h
-include/mysql/sql_chars.h
-include/mysql/sql_common.h
-include/mysql/sql_string.h
-include/mysql/sslopt-case.h
-include/mysql/sslopt-longopts.h
-include/mysql/sslopt-vars.h
-include/mysql/tables_contained_in.h
-include/mysql/template_utils.h
-include/mysql/thr_cond.h
-include/mysql/thr_lock.h
-include/mysql/thr_mutex.h
-include/mysql/thr_rwlock.h
-include/mysql/typelib.h
-include/mysql/varlen_sort.h
-include/mysql/violite.h
-include/mysql/welcome_copyright_notice.h
 lib/mysql/libmysqlclient.a
 lib/mysql/libmysqlclient.so
 lib/mysql/libmysqlclient.so.21
 lib/mysql/libmysqlclient_r.a
 lib/mysql/libmysqlclient_r.so
 lib/mysql/libmysqlclient_r.so.21
+@comment lib/private/libprotobuf-lite.so.3.19.4
+@comment lib/private/libprotobuf.so.3.19.4
 %%SASLCLIENT%%lib/mysql/plugin/authentication_ldap_sasl_client.so
+lib/mysql/plugin/authentication_fido_client.so
+lib/mysql/plugin/authentication_oci_client.so
 libdata/pkgconfig/mysqlclient.pc
-man/man1/comp_err.1.gz
-man/man1/lz4_decompress.1.gz
-man/man1/mysql.1.gz
-man/man1/mysql_config.1.gz
-man/man1/mysql_config_editor.1.gz
-man/man1/mysqladmin.1.gz
-man/man1/mysqlbinlog.1.gz
-man/man1/mysqlcheck.1.gz
-man/man1/mysqldump.1.gz
-man/man1/mysqlimport.1.gz
-man/man1/mysqlman.1.gz
-man/man1/mysqlpump.1.gz
-man/man1/mysqlshow.1.gz
-man/man1/mysqlslap.1.gz
-man/man1/perror.1.gz
-man/man1/zlib_decompress.1.gz
+@comment share/man/man1/comp_err.1.gz
+@comment share/man/man1/lz4_decompress.1.gz
+@comment share/man/man1/mysql.1.gz
+@comment share/man/man1/mysql_config.1.gz
+@comment share/man/man1/mysql_config_editor.1.gz
+@comment share/man/man1/mysqladmin.1.gz
+@comment share/man/man1/mysqlbinlog.1.gz
+@comment share/man/man1/mysqlcheck.1.gz
+@comment share/man/man1/mysqldump.1.gz
+@comment share/man/man1/mysqlimport.1.gz
+@comment share/man/man1/mysqlman.1.gz
+@comment share/man/man1/mysqlpump.1.gz
+@comment share/man/man1/mysqlshow.1.gz
+@comment share/man/man1/mysqlslap.1.gz
+@comment share/man/man1/perror.1.gz
+@comment share/man/man1/zlib_decompress.1.gz
 share/aclocal/mysql.m4
diff --git a/databases/mysql80-server/Makefile b/databases/mysql80-server/Makefile
index 771fef19bd1a..a729a8155f68 100644
--- a/databases/mysql80-server/Makefile
+++ b/databases/mysql80-server/Makefile
@@ -1,8 +1,6 @@
-# Created by: Mahdi Mokhtari <mokhi64@gmail.com>
-
 PORTNAME?=		mysql
-PORTVERSION=		8.0.26
-PORTREVISION?=		0
+PORTVERSION=		8.0.35
+PORTREVISION?=		1
 CATEGORIES=		databases
 MASTER_SITES=		MYSQL/MySQL-8.0
 PKGNAMESUFFIX?=		80-server
@@ -10,18 +8,19 @@ DISTNAME=		${PORTNAME}-boost-${PORTVERSION}${DISTVERSIONSUFFIX}
 
 MAINTAINER=		joneum@FreeBSD.org
 COMMENT?=		Multithreaded SQL database (server)
+WWW=		https://www.mysql.com/
 
 LICENSE=		GPLv2
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}${DISTVERSIONSUFFIX}
 
 SLAVEDIRS=	databases/mysql80-client
-USES=		bison:build cmake:noninja compiler:c++17-lang cpe \
-		groff:run libedit localbase ncurses perl5 pkgconfig shebangfix ssl
+USES=		bison:build cmake:noninja cpe groff:run libedit localbase \
+		ncurses perl5 pkgconfig shebangfix ssl
 
 CPE_VENDOR=	oracle
 
-USE_CXXSTD=	c++14
+USE_CXXSTD=	c++17
 USE_PERL5=	run
 
 MY_DBDIR=	/var/db/mysql
@@ -32,13 +31,14 @@ LIB_DEPENDS+=	libcurl.so:ftp/curl \
 		libevent.so:devel/libevent \
 		libicutu.so:devel/icu \
 		liblz4.so:archivers/liblz4 \
-		libzstd.so:archivers/zstd \
-		libprotobuf.so:devel/protobuf \
+		libfido2.so:security/libfido2 \
+		libhidapi.so:comms/hidapi \
 		${LIB_DEPENDS_${ARCH}}
 LIB_DEPENDS_aarch64=	libunwind.so:devel/libunwind
 LIB_DEPENDS_amd64=	libunwind.so:devel/libunwind
 LIB_DEPENDS_armv7=	libunwind.so:devel/libunwind
 LIB_DEPENDS_i386=	libunwind.so:devel/libunwind
+LIB_DEPENDS_powerpc=		libunwind.so:devel/libunwind
 LIB_DEPENDS_powerpc64=		libunwind.so:devel/libunwind
 LIB_DEPENDS_powerpc64le=	libunwind.so:devel/libunwind
 
@@ -48,11 +48,13 @@ BUILD_DEPENDS_aarch64=	libunwind>0:devel/libunwind
 BUILD_DEPENDS_amd64=	libunwind>0:devel/libunwind
 BUILD_DEPENDS_armv7=	libunwind>0:devel/libunwind
 BUILD_DEPENDS_i386=	libunwind>0:devel/libunwind
+BUILD_DEPENDS_powerpc=	libunwind>0:devel/libunwind
 BUILD_DEPENDS_powerpc64=	libunwind>0:devel/libunwind
 BUILD_DEPENDS_powerpc64le=	libunwind>0:devel/libunwind
 
 CMAKE_BUILD_TYPE=	Release
-CFLAGS+=		-fPIC -DNDEBUG -malign-double
+CFLAGS+=		-fPIC
+CFLAGS_aarch64?=	-march=armv8-a+crc+crypto
 
 CMAKE_ARGS+=	-DINSTALL_LAYOUT=FREEBSD \
 		-DINSTALL_LDCONFIGDIR="${LOCALBASE}/libdata/ldconfig" \
@@ -62,7 +64,8 @@ CMAKE_ARGS+=	-DINSTALL_LAYOUT=FREEBSD \
 		-DINSTALL_INCLUDEDIR="include/mysql" \
 		-DINSTALL_INFODIR="${INFO_PATH}" \
 		-DINSTALL_LIBDIR="lib/mysql" \
-		-DINSTALL_MANDIR="man" \
+		-DINSTALL_PRIV_LIBDIR="lib/mysql/private" \
+		-DINSTALL_MANDIR="share/man" \
 		-DINSTALL_MYSQLDATADIR="${MY_DBDIR}" \
 		-DINSTALL_MYSQLKEYRINGDIR="etc/mysql/keyring" \
 		-DINSTALL_MYSQLSHAREDIR="share/mysql" \
@@ -81,10 +84,10 @@ CMAKE_ARGS+=	-DINSTALL_LAYOUT=FREEBSD \
 		-DWITH_LZ4=system \
 		-DWITH_ICU=system \
 		-DWITH_CURL=system \
-		-DWITH_ZLIB=system \
-		-DWITH_ZSTD=system \
-		-DWITH_PROTOBUF=system \
-		-DWITH_SSL=${OPENSSLBASE} \
+		-DWITH_ZSTD=bundled \
+		-DWITH_PROTOBUF=bundled \
+		-DWITH_SSL=system \
+		-DWITH_AUTHENTICATION_FIDO=1 \
 		-DBUILD_BUNDLED_ZLIB=0 \
 		-DBUILD_BUNDLED_LZ4=0
 
@@ -115,11 +118,10 @@ PLIST_SUB=	MY_DBDIR=${MY_DBDIR} \
 .if !defined(CLIENT_ONLY)
 USES+=		mysql:80
 
-CONFLICTS_INSTALL=	mysql8[1-9]-server-* \
-			mysql[0-79][0-9]-server-* \
-			mysqlwsrep* \
-			mariadb[0-9][0-9]-server-* \
-			percona[0-9][0-9]-server-*
+CONFLICTS_INSTALL=	mysql*-server \
+			mysqlwsrep*-server \
+			mariadb*-server \
+			percona*-server
 
 USE_RC_SUBR=	mysql-server
 
@@ -138,6 +140,8 @@ MMAN8=		mysqld.8
 
 CMAKE_ARGS+=	-DWITH_EMBEDDED_SERVER="ON"
 CMAKE_ARGS+=	-DWITHOUT_CLIENTLIBS="ON"
+# Disable unit tests, it fails on !amd64 and <13.0 due to c++17 rules
+CMAKE_ARGS+=   -DWITH_UNIT_TESTS="OFF"
 
 OPTIONS_GROUP=		STORAGE
 OPTIONS_GROUP_STORAGE=	ARCHIVE BLACKHOLE EXAMPLE FEDERATED INNOBASE PARTITION PERFSCHEMA
@@ -177,28 +181,27 @@ FEDERATED_SUB_LIST_OFF+=	FEDER=""
 # which is broken on i386 due to different size of types and caused a
 # 'static_assert(alignof(T) <= alignof(std::max_align_t))' error
 .if ${ARCH} == i386
-CMAKE_ARGS+=	-DDISABLE_PSI_MEMORY=1
+#CMAKE_ARGS+=	-DDISABLE_PSI_MEMORY=1
+SSP_UNSAFE=	yes
 .endif
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1200057
-SUB_LIST+=	LEGACY_LIMITS="@comment " MODERN_LIMITS=""
+.if ${ARCH} == powerpc
+LDFLAGS+=	-latomic
+USES+=		compiler:gcc-c++11-lib
 .else
-SUB_LIST+=	LEGACY_LIMITS="" MODERN_LIMITS="@comment "
+USES+=		compiler:c++17-lang
 .endif
 
 .include <bsd.port.pre.mk>
 
-.if ${ARCH} == "i386" && ${OSVERSION} < 1200000
-# clang 7.x and 8.x do not build properly on 11i386
-CPP=		clang-cpp${LLVM_DEFAULT}
-CC=		clang${LLVM_DEFAULT}
-CXX=		clang++${LLVM_DEFAULT}
-BUILD_DEPENDS+=	clang${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT}
-.endif
-
 post-extract:
 	@${RM} -rv ${WRKSRC}/sql/sql_hints.yy.cc ${WRKSRC}/sql/sql_hints.yy.h
 
+# XXX MBi alignment issue
+.if ${ARCH} == i386
+EXTRA_PATCHES+=	${FILESDIR}/extra-patch-boost-boost_1_77_0-boost-move-detail-type_traits.hpp
+.endif
+
 .if !defined(CLIENT_ONLY)
 post-install:
 	${MKDIR} ${STAGEDIR}${ETCDIR}
diff --git a/databases/mysql80-server/distinfo b/databases/mysql80-server/distinfo
index 6b639dd456da..bc0a2dd68ade 100644
--- a/databases/mysql80-server/distinfo
+++ b/databases/mysql80-server/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1628702352
-SHA256 (mysql-boost-8.0.26.tar.gz) = 209442c1001c37bcbc001845e1dc623d654cefb555b47b528742a53bf21c0b4d
-SIZE (mysql-boost-8.0.26.tar.gz) = 291285918
+TIMESTAMP = 1700321902
+SHA256 (mysql-boost-8.0.35.tar.gz) = 41253c3a99cefcf6d806040c6687692eb0c37b4c7aae5882417dfb9c5d3ce4ce
+SIZE (mysql-boost-8.0.35.tar.gz) = 438111810
diff --git a/databases/mysql80-server/files/extra-patch-boost-boost_1_77_0-boost-move-detail-type_traits.hpp b/databases/mysql80-server/files/extra-patch-boost-boost_1_77_0-boost-move-detail-type_traits.hpp
new file mode 100644
index 000000000000..6365179f2bc4
--- /dev/null
+++ b/databases/mysql80-server/files/extra-patch-boost-boost_1_77_0-boost-move-detail-type_traits.hpp
@@ -0,0 +1,20 @@
+--- ./boost/boost_1_77_0/boost/move/detail/type_traits.hpp.ORIG	2021-08-05 11:42:11.000000000 +0200
++++ ./boost/boost_1_77_0/boost/move/detail/type_traits.hpp	2023-11-04 13:09:44.198320000 +0100
+@@ -1104,7 +1104,7 @@
+ typedef int (alignment_dummy::*member_ptr);
+ typedef int (alignment_dummy::*member_function_ptr)();
+ struct alignment_struct
+-{  long double dummy[4];  };
++{  double XXXdummy[4];  };
+ 
+ /////////////////////////////
+ //    max_align_t
+@@ -1122,7 +1122,7 @@
+    float       float_;
+    double      double_;
+    void *      void_ptr_;
+-   long double long_double_[4];
++   double XXXlong_double_[4];
+    alignment_dummy *unknown_class_ptr_;
+    function_ptr function_ptr_;
+    member_function_ptr member_function_ptr_;
diff --git a/databases/mysql80-server/files/extra-patch-config.h.cmake b/databases/mysql80-server/files/extra-patch-config.h.cmake
deleted file mode 100644
index 3ac1add1b9ce..000000000000
--- a/databases/mysql80-server/files/extra-patch-config.h.cmake
+++ /dev/null
@@ -1,12 +0,0 @@
---- config.h.cmake.orig	2014-12-05 16:24:02 UTC
-+++ config.h.cmake
-@@ -151,7 +151,8 @@
- #cmakedefine HAVE_FESETROUND 1
- #cmakedefine HAVE_FINITE 1
- #cmakedefine HAVE_FP_EXCEPT 1
--#cmakedefine HAVE_FPSETMASK 1
-+#cmakedefine HAVE_FPSETMASK 0
-+#cmakedefine HAVE_FEDISABLEEXCEPT 1
- #cmakedefine HAVE_FSEEKO 1
- #cmakedefine HAVE_FSYNC 1
- #cmakedefine HAVE_FTIME 1
diff --git a/databases/mysql80-server/files/my.cnf.sample.in b/databases/mysql80-server/files/my.cnf.sample.in
index 7fa72451dec3..3d1264c1bd61 100644
--- a/databases/mysql80-server/files/my.cnf.sample.in
+++ b/databases/mysql80-server/files/my.cnf.sample.in
@@ -14,19 +14,17 @@ bind-address                    = 127.0.0.1
 basedir                         = %%PREFIX%%
 datadir                         = %%MY_DBDIR%%
 tmpdir                          = %%MY_TMPDIR%%
-slave-load-tmpdir               = %%MY_TMPDIR%%
+replica-load-tmpdir             = %%MY_TMPDIR%%
 secure-file-priv                = %%MY_SECDIR%%
 log-bin                         = mysql-bin
 log-output                      = TABLE
-master-info-repository          = TABLE
-relay-log-info-repository       = TABLE
 relay-log-recovery              = 1
 slow-query-log                  = 1
 server-id                       = 1
 sync_binlog                     = 1
 sync_relay_log                  = 1
 binlog_cache_size               = 16M
-expire_logs_days                = 30
+binlog_expire_logs_seconds      = 2592000
 default_password_lifetime       = 0
 enforce-gtid-consistency        = 1
 gtid-mode                       = ON
@@ -47,12 +45,11 @@ innodb_log_group_home_dir       = %%MY_DBDIR%%
 innodb_data_file_path           = ibdata1:128M:autoextend
 innodb_temp_data_file_path      = ibtmp1:128M:autoextend
 innodb_flush_method             = O_DIRECT
-innodb_log_file_size            = 256M
+innodb_redo_log_capacity        = 512M
 innodb_log_buffer_size          = 16M
 innodb_write_io_threads         = 8
 innodb_read_io_threads          = 8
 innodb_autoinc_lock_mode        = 2
-skip-symbolic-links
 
 [mysqldump]
 max_allowed_packet              = 256M
diff --git a/databases/mysql80-server/files/mysql-server.in b/databases/mysql80-server/files/mysql-server.in
index b0297539a441..c79874df9f2c 100644
--- a/databases/mysql80-server/files/mysql-server.in
+++ b/databases/mysql80-server/files/mysql-server.in
@@ -8,9 +8,6 @@
 # Add the following line to /etc/rc.conf to enable mysql:
 # mysql_enable (bool):	Set to "NO" by default.
 #			Set it to "YES" to enable MySQL.
-%%LEGACY_LIMITS%%# mysql_limits (bool):	Set to "NO" by default.
-%%LEGACY_LIMITS%%#			Set it to yes to run `limits -e -U mysql`
-%%LEGACY_LIMITS%%#			just before mysql starts.
 # mysql_dbdir (str):	Default to "%%MY_DBDIR%%"
 #			Base database directory.
 # mysql_confdir (str):	Default to "%%ETCDIR%%"
@@ -19,7 +16,7 @@
 #			Set it in the rc.conf or default behaviour of
 #			`mysqld_safe` itself, will be picking
 #			${mysql_confdir}/my.cnf if it exists.
-# mysql_pidfile (str):	Custum PID file path and name.
+# mysql_pidfile (str):	Custom PID file path and name.
 #			Default to "${mysql_dbdir}/${hostname}.pid".
 # mysql_args (str):	Custom additional arguments to be passed
 #			to mysqld_safe (default empty).
@@ -33,7 +30,6 @@ rcvar=mysql_enable
 load_rc_config $name
 
 : ${mysql_enable="NO"}
-%%LEGACY_LIMITS%%: ${mysql_limits="NO"}
 : ${mysql_dbdir="%%MY_DBDIR%%"}
 : ${mysql_confdir="%%ETCDIR%%"}
 if [ -f "${mysql_confdir}/my.cnf" ]; then
@@ -46,7 +42,6 @@ mysql_extra="--defaults-extra-file=${mysql_optfile}"
 fi
 
 mysql_user="mysql"
-%%LEGACY_LIMITS%%mysql_limits_args="-e -U ${mysql_user}"
 : ${hostname:=`/bin/hostname`}
 pidfile=${mysql_pidfile:-"${mysql_dbdir}/${hostname}.pid"}
 command="/usr/sbin/daemon"
@@ -67,12 +62,7 @@ mysql_prestart()
 	if [ ! -d "${mysql_dbdir}/mysql/." ]; then
 		mysql_create_auth_tables || return 1
 	fi
-%%LEGACY_LIMITS%%	if checkyesno mysql_limits; then
-%%LEGACY_LIMITS%%		eval `/usr/bin/limits ${mysql_limits_args}` 2>/dev/null
-%%LEGACY_LIMITS%%	else
-%%LEGACY_LIMITS%%		return 0
-%%LEGACY_LIMITS%%	fi
-%%MODERN_LIMITS%%	return 0
+	return 0
 }
 
 mysql_poststart()
diff --git a/databases/mysql80-server/files/patch-CMakeLists.txt b/databases/mysql80-server/files/patch-CMakeLists.txt
index 1838577bde1c..625e0bac005c 100644
--- a/databases/mysql80-server/files/patch-CMakeLists.txt
+++ b/databases/mysql80-server/files/patch-CMakeLists.txt
@@ -1,22 +1,43 @@
---- CMakeLists.txt.orig	2020-09-23 12:37:48 UTC
+--- CMakeLists.txt.orig	2022-07-06 21:36:34 UTC
 +++ CMakeLists.txt
-@@ -1417,10 +1417,10 @@ IF(WITH_AUTHENTICATION_LDAP)
+@@ -1819,7 +1819,7 @@ IF(LINUX AND KNOWN_CUSTOM_LIBRARIES)
+ ENDIF()
+ 
+ IF(WITH_AUTHENTICATION_LDAP)
+-  IF(LINUX AND KNOWN_CUSTOM_LIBRARIES)
++  IF(LINUX OR FREEBSD AND KNOWN_CUSTOM_LIBRARIES)
+     # LDAP / SASL / KERBEROS / SSL must all be "system" or "custom", not a mix.
+     IF(WITH_LDAP STREQUAL "system" OR
+         WITH_SASL STREQUAL "system" OR
+@@ -1868,6 +1868,7 @@ IF(WITH_AUTHENTICATION_KERBEROS)
    ENDIF()
  ENDIF()
  
--# Add system/bundled editline.
--MYSQL_CHECK_EDITLINE()
- # Add libevent
--MYSQL_CHECK_LIBEVENT()
++IF(NOT WITHOUT_TOOLS)
+ # Add system/bundled editline.
+ MYSQL_CHECK_EDITLINE()
+ SET(EDITLINE_WARN_GIVEN)
+@@ -1878,7 +1879,9 @@ IF(EDITLINE_WARN_GIVEN)
+     "You can use -DWITH_EDITLINE=bundled instead."
+     )
+ ENDIF()
++ENDIF(NOT WITHOUT_TOOLS)
+ 
 +IF(NOT WITHOUT_SERVER)
-+  MYSQL_CHECK_LIBEVENT()
-+ENDIF()
+ # Add libevent
+ MYSQL_CHECK_LIBEVENT()
+ SET(LIBEVENT_WARN_GIVEN)
+@@ -1889,6 +1892,7 @@ IF(LIBEVENT_WARN_GIVEN)
+     "You can use -DWITH_LIBEVENT=bundled instead."
+     )
+ ENDIF()
++ENDIF(NOT WITHOUT_SERVER)
+ 
  # Add lz4 library
  MYSQL_CHECK_LZ4()
- # Add icu library
-@@ -1520,7 +1520,9 @@ IF(WITH_UNIT_TESTS)
-   INCLUDE(googletest)
- ENDIF()
+@@ -2142,7 +2146,9 @@ ADD_CUSTOM_TARGET(clang_tidy_prerequisites)
+ ADD_DEPENDENCIES(clang_tidy_prerequisites protobuf_generated_all)
+ ADD_DEPENDENCIES(clang_tidy_prerequisites GenError)
  
 -ADD_SUBDIRECTORY(include)
 +IF(NOT WITHOUT_CLIENTLIBS)
@@ -25,14 +46,12 @@
  ADD_SUBDIRECTORY(strings)
  ADD_SUBDIRECTORY(vio)
  ADD_SUBDIRECTORY(mysys)
-@@ -1562,12 +1564,17 @@ IF(WITH_UNIT_TESTS)
+@@ -2187,12 +2193,15 @@ IF(WITH_UNIT_TESTS)
    ADD_SUBDIRECTORY(unittest/mytap/t)
  ENDIF()
  
 -ADD_SUBDIRECTORY(client)
 +IF(NOT WITHOUT_TOOLS)
-+  # Add system/bundled editline
-+  MYSQL_CHECK_EDITLINE()
 +  ADD_SUBDIRECTORY(client)
 +ENDIF(NOT WITHOUT_TOOLS)
 +
@@ -45,7 +64,7 @@
    ADD_SUBDIRECTORY(testclients)
    ADD_SUBDIRECTORY(sql)
  ENDIF()
-@@ -1590,11 +1597,11 @@ ENDIF()
+@@ -2247,11 +2256,11 @@ ENDIF()
  # scripts/mysql_config depends on client and server targets loaded above.
  # It is referenced by some of the directories below, so we insert it here.
  ADD_SUBDIRECTORY(scripts)
@@ -58,7 +77,7 @@
    IF(WITH_INTERNAL)
      ADD_SUBDIRECTORY(internal)
    ENDIF()
-@@ -1703,6 +1710,7 @@ IF(PACK_SEPARATE_COMPONENTS)
+@@ -2361,6 +2370,7 @@ IF(PACK_SEPARATE_COMPONENTS)
    SET(CPACK_COMPONENTS_GROUPING IGNORE)
  ENDIF()
  
@@ -66,7 +85,7 @@
  IF(UNIX)
    INSTALL(FILES
      Docs/mysql.info
-@@ -1737,6 +1745,7 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM")
+@@ -2395,6 +2405,7 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM")
      PATTERN "sp-imp-spec.txt" EXCLUDE
      PATTERN "README.build" EXCLUDE
    )
diff --git a/databases/mysql80-server/files/patch-boost_boost__1__77__0_boost_mpl_aux___integral__wrapper.hpp b/databases/mysql80-server/files/patch-boost_boost__1__77__0_boost_mpl_aux___integral__wrapper.hpp
new file mode 100644
index 000000000000..66c430a4346f
--- /dev/null
+++ b/databases/mysql80-server/files/patch-boost_boost__1__77__0_boost_mpl_aux___integral__wrapper.hpp
@@ -0,0 +1,11 @@
+--- boost/boost_1_77_0/boost/mpl/aux_/integral_wrapper.hpp.orig	2021-08-05 09:42:13 UTC
++++ boost/boost_1_77_0/boost/mpl/aux_/integral_wrapper.hpp
+@@ -56,7 +56,7 @@ struct AUX_WRAPPER_NAME
+ // have to #ifdef here: some compilers don't like the 'N + 1' form (MSVC),
+ // while some other don't like 'value + 1' (Borland), and some don't like
+ // either
+-#if BOOST_WORKAROUND(__EDG_VERSION__, <= 243)
++#if 1 //BOOST_WORKAROUND(__EDG_VERSION__, <= 243)
+  private:
+     BOOST_STATIC_CONSTANT(AUX_WRAPPER_VALUE_TYPE, next_value = BOOST_MPL_AUX_STATIC_CAST(AUX_WRAPPER_VALUE_TYPE, (N + 1)));
+     BOOST_STATIC_CONSTANT(AUX_WRAPPER_VALUE_TYPE, prior_value = BOOST_MPL_AUX_STATIC_CAST(AUX_WRAPPER_VALUE_TYPE, (N - 1)));
diff --git a/databases/mysql80-server/files/patch-client_CMakeLists.txt b/databases/mysql80-server/files/patch-client_CMakeLists.txt
index bbfb4249c799..6a433a889e80 100644
--- a/databases/mysql80-server/files/patch-client_CMakeLists.txt
+++ b/databases/mysql80-server/files/patch-client_CMakeLists.txt
@@ -1,4 +1,4 @@
---- client/CMakeLists.txt.orig	2021-03-22 08:44:50 UTC
+--- client/CMakeLists.txt.orig	2021-09-28 11:46:34 UTC
 +++ client/CMakeLists.txt
 @@ -28,10 +28,13 @@ DISABLE_MISSING_PROFILE_WARNING()
  ## Subdirectory with common client code.
@@ -11,18 +11,18 @@
 +ENDIF()
  
 +IF(NOT WITHOUT_CLIENTLIBS)
- MYSQL_ADD_EXECUTABLE(mysql
-   ${CMAKE_SOURCE_DIR}/sql-common/net_ns.cc
-   completion_hash.cc
-@@ -41,6 +44,7 @@ MYSQL_ADD_EXECUTABLE(mysql
-   client_query_attributes.cc
+ INCLUDE_DIRECTORIES(
+   ${CMAKE_CURRENT_SOURCE_DIR}/include
+ )
+@@ -47,6 +50,7 @@ MYSQL_ADD_EXECUTABLE(mysql
+   ${CMAKE_CURRENT_SOURCE_DIR}/common/user_registration.cc
    LINK_LIBRARIES mysqlclient client_base ${EDITLINE_LIBRARY}
    )
 +ENDIF()
  
  IF(NOT WITHOUT_SERVER)
    MYSQL_ADD_EXECUTABLE(mysql_upgrade
-@@ -57,6 +61,7 @@ IF(SOLARIS_SPARC AND MY_COMPILER_IS_SUNPRO AND
+@@ -55,6 +59,7 @@ IF(NOT_WITHOUT_SERVER)
      )
  ENDIF()
  
@@ -30,7 +30,7 @@
  MYSQL_ADD_EXECUTABLE(mysqltest
    mysqltest.cc
    mysqltest/error_names.cc
-@@ -73,6 +78,9 @@ MYSQL_ADD_EXECUTABLE(mysqltest
+@@ -71,6 +76,9 @@ MYSQL_ADD_EXECUTABLE(mysqltest
    ENABLE_EXPORTS
    LINK_LIBRARIES mysqlclient
    )
@@ -40,7 +40,7 @@
  MYSQL_ADD_EXECUTABLE(mysqlcheck
    check/mysqlcheck.cc
    check/mysqlcheck_core.cc
-@@ -248,7 +256,9 @@ ENDIF()
+@@ -250,7 +258,9 @@ ENDIF()
  
  TARGET_COMPILE_DEFINITIONS(mysqlbinlog PRIVATE DISABLE_PSI_MUTEX)
  TARGET_INCLUDE_DIRECTORIES(mysqlbinlog PRIVATE ${CMAKE_SOURCE_DIR}/sql)
@@ -49,8 +49,8 @@
 +IF(WITHOUT_SERVER)
  MYSQL_ADD_EXECUTABLE(mysqladmin
    mysqladmin.cc
-   LINK_LIBRARIES mysqlclient
-@@ -261,6 +271,9 @@ MYSQL_ADD_EXECUTABLE(mysql_config_editor
+   multi_factor_passwordopt-vars.cc
+@@ -265,6 +275,9 @@ MYSQL_ADD_EXECUTABLE(mysql_config_editor
    mysql_config_editor.cc
    LINK_LIBRARIES mysqlclient
    )
@@ -60,7 +60,7 @@
  MYSQL_ADD_EXECUTABLE(mysql_secure_installation
    mysql_secure_installation.cc
    LINK_LIBRARIES mysqlclient
-@@ -271,6 +284,7 @@ MYSQL_ADD_EXECUTABLE(mysql_ssl_rsa_setup
+@@ -275,6 +288,7 @@ MYSQL_ADD_EXECUTABLE(mysql_ssl_rsa_setup
    path.cc
    LINK_LIBRARIES mysys
    )
diff --git a/databases/mysql80-server/files/patch-cmake_os_FreeBSD.cmake b/databases/mysql80-server/files/patch-cmake_os_FreeBSD.cmake
index 2f6f488d4abd..90629de01287 100644
--- a/databases/mysql80-server/files/patch-cmake_os_FreeBSD.cmake
+++ b/databases/mysql80-server/files/patch-cmake_os_FreeBSD.cmake
@@ -1,8 +1,8 @@
---- cmake/os/FreeBSD.cmake.orig	2019-09-20 08:30:51 UTC
+--- cmake/os/FreeBSD.cmake.orig	2021-12-17 16:07:27 UTC
 +++ cmake/os/FreeBSD.cmake
-@@ -45,8 +45,20 @@ IF(NOT FORCE_UNSUPPORTED_COMPILER)
-       MESSAGE(FATAL_ERROR
-         "GCC 5.3 or newer is required (-dumpversion says ${GCC_VERSION})")
+@@ -48,8 +48,20 @@ IF(NOT FORCE_UNSUPPORTED_COMPILER)
+     IF(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 7.1)
+       MESSAGE(FATAL_ERROR "GCC 7.1 or newer is required")
      ENDIF()
 -  ELSE()
 -    MESSAGE(FATAL_ERROR "Unsupported compiler!")
diff --git a/databases/mysql80-server/files/patch-cmake_plugin.cmake b/databases/mysql80-server/files/patch-cmake_plugin.cmake
index ecd2598f320e..874c450a4ef2 100644
--- a/databases/mysql80-server/files/patch-cmake_plugin.cmake
+++ b/databases/mysql80-server/files/patch-cmake_plugin.cmake
@@ -1,6 +1,6 @@
---- cmake/plugin.cmake.orig	2019-09-20 08:30:51 UTC
+--- cmake/plugin.cmake.orig	2021-12-17 16:07:27 UTC
 +++ cmake/plugin.cmake
-@@ -230,15 +230,15 @@ MACRO(MYSQL_ADD_PLUGIN plugin_arg)
+@@ -247,15 +247,15 @@ MACRO(MYSQL_ADD_PLUGIN plugin_arg)
  
        # For testing purposes, we need
        # <...>/lib/plugin/debug/authentication_ldap_sasl_client.so
diff --git a/databases/mysql80-server/files/patch-cmake_ssl.cmake b/databases/mysql80-server/files/patch-cmake_ssl.cmake
index 9173b842a952..e7688d6e50ad 100644
--- a/databases/mysql80-server/files/patch-cmake_ssl.cmake
+++ b/databases/mysql80-server/files/patch-cmake_ssl.cmake
@@ -1,29 +1,23 @@
---- cmake/ssl.cmake.orig	2019-09-20 08:30:51 UTC
+--- cmake/ssl.cmake.orig	2022-07-06 21:36:34 UTC
 +++ cmake/ssl.cmake
-@@ -199,7 +199,7 @@ MACRO (MYSQL_CHECK_SSL)
-       # Encoded as MNNFFPPS: major minor fix patch status
-       FILE(STRINGS "${OPENSSL_INCLUDE_DIR}/openssl/opensslv.h"
-         OPENSSL_VERSION_NUMBER
--        REGEX "^#[ ]*define[\t ]+OPENSSL_VERSION_NUMBER[\t ]+0x[0-9].*"
-+        REGEX "^#[\t ]*define[\t ]+OPENSSL_VERSION_NUMBER[\t ]+0x[0-9].*"
-         )
-       STRING(REGEX REPLACE
-         "^.*OPENSSL_VERSION_NUMBER[\t ]+0x([0-9]).*$" "\\1"
-@@ -222,13 +222,14 @@ MACRO (MYSQL_CHECK_SSL)
-         OPENSSL_FIX_VERSION "${OPENSSL_VERSION_NUMBER}"
-         )
+@@ -142,7 +142,7 @@ MACRO(FIND_OPENSSL_VERSION)
+     # Encoded as MNNFFPPS: major minor fix patch status
+     FILE(STRINGS "${OPENSSL_INCLUDE_DIR}/openssl/opensslv.h"
+       OPENSSL_VERSION_NUMBER
+-      REGEX "^#[ ]*define[\t ]+OPENSSL_VERSION_NUMBER[\t ]+0x[0-9].*"
++      REGEX "^#[\t ]*define[\t ]+OPENSSL_VERSION_NUMBER[\t ]+0x[0-9].*"
+       )
+     STRING(REGEX REPLACE
+       "^.*OPENSSL_VERSION_NUMBER[\t ]+0x([0-9]).*$" "\\1"
+@@ -380,8 +380,9 @@ MACRO (MYSQL_CHECK_SSL)
+         "Not a supported openssl version in WITH_SSL=${WITH_SSL}.")
      ENDIF()
--    IF("${OPENSSL_MAJOR_VERSION}.${OPENSSL_MINOR_VERSION}.${OPENSSL_FIX_VERSION}" VERSION_GREATER "1.1.0")
+ 
+-    IF("${OPENSSL_MAJOR_MINOR_FIX_VERSION}" VERSION_GREATER "1.1.0")
 -       ADD_DEFINITIONS(-DHAVE_TLSv13)
 +    CHECK_SYMBOL_EXISTS(TLS1_3_VERSION "openssl/tls1.h" HAVE_TLS1_3_VERSION)
 +    IF(HAVE_TLS1_3_VERSION)
 +       #ADD_DEFINITIONS(-DHAVE_TLSv13)
      ENDIF()
+ 
      IF(OPENSSL_INCLUDE_DIR AND
-        OPENSSL_LIBRARY   AND
-        CRYPTO_LIBRARY      AND
--       OPENSSL_MAJOR_VERSION STREQUAL "1"
-+       OPENSSL_MAJOR_VERSION VERSION_GREATER_EQUAL "1"
-       )
-       SET(OPENSSL_FOUND TRUE)
-       FIND_PROGRAM(OPENSSL_EXECUTABLE openssl
diff --git a/databases/mysql80-server/files/patch-include_CMakeLists.txt b/databases/mysql80-server/files/patch-include_CMakeLists.txt
deleted file mode 100644
index 11fed601d4f4..000000000000
--- a/databases/mysql80-server/files/patch-include_CMakeLists.txt
+++ /dev/null
@@ -1,176 +0,0 @@
---- include/CMakeLists.txt.orig	2019-12-09 19:53:17 UTC
-+++ include/CMakeLists.txt
-@@ -37,10 +37,173 @@ SET(HEADERS
-   ${CMAKE_CURRENT_BINARY_DIR}/mysql_version.h
-   ${CMAKE_CURRENT_BINARY_DIR}/mysqld_error.h
-   field_types.h
-+  base64.h
-+  big_endian.h
-+  c_string_less.h
-+  crypt_genhash_impl.h
-+  decimal.h
-+  depth_first_search.h
-+  dur_prop.h
-+  errmsg.h
-+  ft_global.h
-+  guard.h
-+  heap.h
-+  integer_digits.h
-+  keycache.h
-+  lex_string.h
-+  lf.h
-+  little_endian.h
-+  m_ctype.h
-+  m_string.h
-+  map_helpers.h
-+  mf_wcomp.h
-+  mutex_lock.h
-+  my_aes.h
-+  my_alloc.h
-+  my_atomic.h
-+  my_base.h
-+  my_bit.h
-+  my_bitmap.h
-+  my_byteorder.h
-+  my_check_opt.h
-+  my_command.h
-+  my_compare.h
-+  my_compiler.h
-+  my_dbug.h
-+  my_default.h
-+  my_dir.h
-+  my_double2ulonglong.h
-+  my_getopt.h
-+  my_hash_combine.h
-+  my_icp.h
-+  my_inttypes.h
-+  my_io.h
-+  my_list.h
-+  my_loglevel.h
-+  my_macros.h
-+  my_md5.h
-+  my_md5_size.h
-+  my_murmur3.h
-+  my_pointer_arithmetic.h
-+  my_psi_config.h
-+  my_rapidjson_size_t.h
-+  my_rdtsc.h
-+  my_rnd.h
-+  my_sharedlib.h
-+  my_shm_defaults.h
-+  my_sqlcommand.h
-+  my_stacktrace.h
-+  my_sys.h
-+  my_systime.h
-+  my_table_map.h
-+  my_thread.h
-+  my_thread_local.h
-+  my_thread_os_id.h
-+  my_time.h
-+  my_timer.h
-+  my_tree.h
-+  my_uctype.h
-+  my_user.h
-+  my_xml.h
-+  myisam.h
-+  myisammrg.h
-+  myisampack.h
-+  mysql.h
-+  mysql.h.pp
-+  mysql_com.h
-+  mysql_com_server.h
-+  mysql_time.h
-+  mysql_version.h.in
-+  mysys_err.h
-+  nullable.h
-+  password.h
-+  pfs_cond_provider.h
-+  pfs_error_provider.h
-+  pfs_file_provider.h
-+  pfs_idle_provider.h
-+  pfs_memory_provider.h
-+  pfs_metadata_provider.h
-+  pfs_mutex_provider.h
-+  pfs_rwlock_provider.h
-+  pfs_socket_provider.h
-+  pfs_stage_provider.h
-+  pfs_statement_provider.h
-+  pfs_table_provider.h
-+  pfs_thread_provider.h
-+  pfs_transaction_provider.h
-+  prealloced_array.h
-+  print_version.h
-+  priority_queue.h
-+  rwlock_scoped_lock.h
-+  scope_guard.h
-+  service_versions.h
-+  sha1.h
-+  sha2.h
-+  sql_chars.h
-+  sql_common.h
-+  sql_string.h
-+  sslopt-case.h
-+  sslopt-longopts.h
-+  sslopt-vars.h
-+  tables_contained_in.h
-+  template_utils.h
-+  thr_cond.h
-+  thr_lock.h
-+  thr_mutex.h
-+  thr_rwlock.h
-+  typelib.h
-+  varlen_sort.h
-+  violite.h
-+  welcome_copyright_notice.h
- )
- SET(HEADERS_MYSQL_DIR
-   mysql/client_plugin.h
-   mysql/plugin_auth_common.h
-+  mysql/udf_registration_types.h
-+  mysql/client_authentication.h
-+  mysql/client_plugin.h.pp
-+  mysql/com_data.h
-+  mysql/group_replication_priv.h
-+  mysql/innodb_priv.h
-+  mysql/mysql_lex_string.h
-+  mysql/plugin.h
-+  mysql/plugin_audit.h
-+  mysql/plugin_audit.h.pp
-+  mysql/plugin_auth.h
-+  mysql/plugin_auth.h.pp
-+  mysql/plugin_auth_common.h
-+  mysql/plugin_ftparser.h
-+  mysql/plugin_ftparser.h.pp
-+  mysql/plugin_group_replication.h
-+  mysql/plugin_keyring.h
-+  mysql/plugin_keyring.h.pp
-+  mysql/plugin_query_rewrite.h
-+  mysql/plugin_trace.h
-+  mysql/plugin_validate_password.h
-+  mysql/service_command.h
-+  mysql/service_locking.h
-+  mysql/service_my_plugin_log.h
-+  mysql/service_mysql_alloc.h
-+  mysql/service_mysql_keyring.h
-+  mysql/service_mysql_password_policy.h
-+  mysql/service_mysql_string.h
-+  mysql/service_parser.h
-+  mysql/service_plugin_registry.h
-+  mysql/service_rpl_transaction_ctx.h
-+  mysql/service_rpl_transaction_write_set.h
-+  mysql/service_rules_table.h
-+  mysql/service_security_context.h
-+  mysql/service_srv_session.h
-+  mysql/service_srv_session_info.h
-+  mysql/service_ssl_wrapper.h
-+  mysql/service_thd_alloc.h
-+  mysql/service_thd_engine_lock.h
-+  mysql/service_thd_wait.h
-+  mysql/service_thread_scheduler.h
-+  mysql/services.h
-+  mysql/services.h.pp
-+  mysql/thread_pool_priv.h
-+  mysql/thread_type.h
-   mysql/udf_registration_types.h
- )
- 
diff --git a/databases/mysql80-server/files/patch-include_dh__ecdh__config.h b/databases/mysql80-server/files/patch-include_dh__ecdh__config.h
new file mode 100644
index 000000000000..a33067bbd562
--- /dev/null
+++ b/databases/mysql80-server/files/patch-include_dh__ecdh__config.h
@@ -0,0 +1,63 @@
+--- include/dh_ecdh_config.h.orig	2023-12-03 10:42:56 UTC
++++ include/dh_ecdh_config.h
+@@ -38,7 +38,7 @@
+ #endif /* OPENSSL_VERSION_NUMBER < 0x10002000L */
+ 
+ namespace {
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+ /* Following primes are from https://www.rfc-editor.org/rfc/rfc7919#appendix-A
+  */
+ 
+@@ -257,6 +257,7 @@ bool set_dh(SSL_CTX *ctx) {
+ 
+   DH *dh = nullptr;
+ #if OPENSSL_VERSION_NUMBER >= 0x10100000L
++#if !defined(LIBRESSL_VERSION_NUMBER)
+   switch (security_level) {
+     case 1:
+       [[fallthrough]];
+@@ -275,6 +276,43 @@ bool set_dh(SSL_CTX *ctx) {
+     default:
+       break;
+   };
++#else
++  dh = DH_new();
++  if (!dh) return true;
++
++  BIGNUM *dhp = nullptr;
++  BIGNUM *dhg = nullptr;
++  switch (security_level) {
++    case 1:
++      [[fallthrough]];
++    case 2:
++      dhp =
++          BN_bin2bn(rfc7919_ffdhe2048_p, sizeof(rfc7919_ffdhe2048_p), nullptr);
++      break;
++    case 3:
++      dhp =
++          BN_bin2bn(rfc7919_ffdhe3072_p, sizeof(rfc7919_ffdhe3072_p), nullptr);
++      break;
++    case 4:
++      dhp =
++          BN_bin2bn(rfc7919_ffdhe8192_p, sizeof(rfc7919_ffdhe8192_p), nullptr);
++      break;
++    case 5:
++      /* There is no RFC7919 approved prime for sec level 5 */
++      [[fallthrough]];
++    default:
++      DH_free(dh);
++      return true;
++  };
++
++  dhg = BN_bin2bn(rfc7919_g, sizeof(rfc7919_g), nullptr);
++  if (!dhp || !dhg || !DH_set0_pqg(dh, dhp, nullptr, dhg)) {
++    DH_free(dh);
++    BN_free(dhg);
++    BN_free(dhp);
++    return true;
++  }
++#endif /* !defined(LIBRESSL_VERSION_NUMBER) */
+ #else  /* OPENSSL_VERSION_NUMBER >= 0x10100000L */
+   dh = DH_new();
+   if (!dh) return true;
diff --git a/databases/mysql80-server/files/patch-include_my__stacktrace.h b/databases/mysql80-server/files/patch-include_my__stacktrace.h
index 372aec242a8d..1654014bd77b 100644
--- a/databases/mysql80-server/files/patch-include_my__stacktrace.h
+++ b/databases/mysql80-server/files/patch-include_my__stacktrace.h
@@ -1,5 +1,5 @@
---- include/my_stacktrace.h.orig	2020-01-23 19:43:07.769584000 +0100
-+++ include/my_stacktrace.h	2020-01-23 19:43:48.684042000 +0100
+--- include/my_stacktrace.h.orig	2021-12-17 16:07:27 UTC
++++ include/my_stacktrace.h
 @@ -43,7 +43,7 @@
    HAVE_BACKTRACE - Linux, FreeBSD, OSX, Solaris
    _WIN32 - Windows
@@ -8,4 +8,4 @@
 +#if (defined(HAVE_BACKTRACE) || defined(_WIN32)) && (defined(__aarch64__) || defined(__amd64__) || defined(__i386__))
  #define HAVE_STACKTRACE 1
  void my_init_stacktrace();
- void my_print_stacktrace(uchar *stack_bottom, ulong thread_stack);
+ void my_print_stacktrace(const uchar *stack_bottom, ulong thread_stack);
diff --git a/databases/mysql80-server/files/patch-include_myisam.h b/databases/mysql80-server/files/patch-include_myisam.h
index b8f3ec7ef519..311c935fc115 100644
--- a/databases/mysql80-server/files/patch-include_myisam.h
+++ b/databases/mysql80-server/files/patch-include_myisam.h
@@ -1,6 +1,6 @@
---- include/myisam.h.orig	2019-09-20 08:30:51 UTC
+--- include/myisam.h.orig	2021-12-17 16:07:27 UTC
 +++ include/myisam.h
-@@ -59,7 +59,7 @@
+@@ -60,7 +60,7 @@
    The following defines can be increased if necessary.
    But beware the dependency of MI_MAX_POSSIBLE_KEY_BUFF and MI_MAX_KEY_LENGTH.
  */
diff --git a/databases/mysql80-server/files/patch-include_violite.h b/databases/mysql80-server/files/patch-include_violite.h
deleted file mode 100644
index 78d606a68c6c..000000000000
--- a/databases/mysql80-server/files/patch-include_violite.h
+++ /dev/null
@@ -1,14 +0,0 @@
---- include/violite.h.orig	2019-09-20 08:30:51 UTC
-+++ include/violite.h
-@@ -269,9 +269,11 @@ struct st_VioSSLFd *new_VioSSLConnectorFd(
- 
- long process_tls_version(const char *tls_version);
- 
-+#ifndef LIBRESSL_VERSION_NUMBER
- int set_fips_mode(const uint fips_mode, char *err_string);
- 
- uint get_fips_mode();
-+#endif
- 
- struct st_VioSSLFd *new_VioSSLAcceptorFd(
-     const char *key_file, const char *cert_file, const char *ca_file,
diff --git a/databases/mysql80-server/files/patch-libmysql_CMakeLists.txt b/databases/mysql80-server/files/patch-libmysql_CMakeLists.txt
index bfc8693d6480..44e1979f8075 100644
--- a/databases/mysql80-server/files/patch-libmysql_CMakeLists.txt
+++ b/databases/mysql80-server/files/patch-libmysql_CMakeLists.txt
@@ -1,6 +1,6 @@
---- libmysql/CMakeLists.txt.orig	2021-07-01 07:53:49 UTC
+--- libmysql/CMakeLists.txt.orig	2021-12-17 16:07:27 UTC
 +++ libmysql/CMakeLists.txt
-@@ -197,6 +197,11 @@ IF (WIN32 AND OPENSSL_APPLINK_C)
+@@ -198,6 +198,11 @@ IF (WIN32 AND OPENSSL_APPLINK_C)
    )
  ENDIF()
  
@@ -12,7 +12,7 @@
  #
  # Include protocol tracing infrastructure and the test
  # trace plugin if enabled by build options.
-@@ -270,8 +275,15 @@ IF(WIN32)
+@@ -271,8 +276,15 @@ IF(WIN32)
    LIST(APPEND LIBS_TO_MERGE auth_win_client)
  ENDIF()
  
@@ -28,9 +28,9 @@
 +  MESSAGE(STATUS "Creating LDAP authentication SASL client library.")
 +  ADD_SUBDIRECTORY(authentication_ldap)
  
- # authentication kerberos client plug-in
- ADD_SUBDIRECTORY(authentication_kerberos)
-@@ -281,6 +293,7 @@ MERGE_CONVENIENCE_LIBRARIES(mysqlclient ${LIBS_TO_MERG
+ # FIDO authentication client plugin
+ ADD_SUBDIRECTORY(authentication_fido)
+@@ -288,6 +300,7 @@ MERGE_CONVENIENCE_LIBRARIES(mysqlclient ${LIBS_TO_MERG
    COMPONENT Development
    LINK_LIBRARIES ${LIBS_TO_LINK}
    )
@@ -38,7 +38,7 @@
  
  # Visual Studio users need debug  static library for debug projects
  IF(MSVC)
-@@ -327,17 +340,27 @@ ENDIF()
+@@ -334,17 +347,27 @@ ENDIF()
  
  # Merge several convenience libraries into one big mysqlclient
  # and link them together into shared library.
@@ -64,5 +64,5 @@
    )
 +ENDIF(WITHOUT_CLIENTLIBS)
  
- IF(LINUX_STANDALONE AND KERBEROS_CUSTOM_LIBRARY)
-   ADD_DEPENDENCIES(libmysql ${kerberos_target})
+ # Downgrade warning for strncat in my_crypt_genhash.
+ IF((WITH_LTO OR CMAKE_COMPILER_FLAG_WITH_LTO) AND MY_COMPILER_IS_GNU)
diff --git a/databases/mysql80-server/files/patch-libservices_CMakeLists.txt b/databases/mysql80-server/files/patch-libservices_CMakeLists.txt
index 1fa50bdd2bca..95610f261f3a 100644
--- a/databases/mysql80-server/files/patch-libservices_CMakeLists.txt
+++ b/databases/mysql80-server/files/patch-libservices_CMakeLists.txt
@@ -1,6 +1,6 @@
---- libservices/CMakeLists.txt.orig	2019-09-20 08:30:51 UTC
+--- libservices/CMakeLists.txt.orig	2021-12-17 16:07:27 UTC
 +++ libservices/CMakeLists.txt
-@@ -45,7 +45,9 @@ SET(MYSQLSERVICES_SOURCES
+@@ -47,7 +47,9 @@ SET(MYSQLSERVICES_SOURCES
    plugin_registry_service.c)
  
  ADD_LIBRARY(mysqlservices STATIC ${MYSQLSERVICES_SOURCES})
diff --git a/databases/mysql80-server/files/patch-man_CMakeLists.txt b/databases/mysql80-server/files/patch-man_CMakeLists.txt
index a08c4ce564c0..9c95ebf65a2b 100644
--- a/databases/mysql80-server/files/patch-man_CMakeLists.txt
+++ b/databases/mysql80-server/files/patch-man_CMakeLists.txt
@@ -1,5 +1,5 @@
---- man/CMakeLists.txt.orig	2020-10-20 11:47:42.675974000 +0200
-+++ man/CMakeLists.txt	2020-10-20 13:53:03.993879000 +0200
+--- man/CMakeLists.txt.orig	2021-12-17 16:07:27 UTC
++++ man/CMakeLists.txt
 @@ -23,26 +23,14 @@
  # Copy man pages
  SET(MAN1
@@ -27,7 +27,7 @@
    mysqlimport.1
    mysqlman.1
    mysqlpump.1
-@@ -52,13 +41,23 @@ SET(MAN1
+@@ -52,13 +40,23 @@ SET(MAN1
    zlib_decompress.1
    )
  
@@ -56,8 +56,8 @@
 -ENDIF()
  
  SET(MAN1_NDB
-   ndb-common-options.1
-@@ -105,8 +104,14 @@ SET(MAN8_NDB
+   ndb_blob_tool.1
+@@ -103,8 +101,14 @@ SET(MAN8_NDB
    ndbmtd.8
  )
  
diff --git a/databases/mysql80-server/files/patch-mysys_my__default.cc b/databases/mysql80-server/files/patch-mysys_my__default.cc
index 6a8cb5ebbaf2..87b603301f41 100644
--- a/databases/mysql80-server/files/patch-mysys_my__default.cc
+++ b/databases/mysql80-server/files/patch-mysys_my__default.cc
@@ -1,4 +1,4 @@
---- mysys/my_default.cc.orig	2021-04-23 15:06:40 UTC
+--- mysys/my_default.cc.orig	2021-12-17 16:07:27 UTC
 +++ mysys/my_default.cc
 @@ -204,7 +204,7 @@ bool no_defaults = false;
  
@@ -9,7 +9,7 @@
  #define DEFAULT_DIRS_SIZE (MAX_DEFAULT_DIRS + 1) /* Terminate with NULL */
  static const char **default_directories = nullptr;
  
-@@ -915,6 +915,14 @@ static int search_default_file_with_ext(Process_option
+@@ -922,6 +922,14 @@ static int search_default_file_with_ext(Process_option
        return 1; /* Ignore wrong files */
    }
  
@@ -17,24 +17,24 @@
 +  {
 +    fprintf(stderr,
 +             "error: Config file %s in invalid location, please move to or merge with /usr/local%s\n",
-+             name,name);
++	     name,name);
 +      goto err;
 +  }
 +
    while (true) {
      auto fileline = mysql_file_getline(buff, sizeof(buff), fp, is_login_file);
      char *linebuff = fileline.get();
-@@ -1300,7 +1308,8 @@ void my_print_default_files(const char *conf_file) {
+@@ -1311,7 +1319,8 @@ void my_print_default_files(const char *conf_file) {
              end[(strlen(end) - 1)] = ' ';
            else
              strxmov(end, conf_file, *ext, " ", NullS);
 -          fputs(name, stdout);
-+          if (strstr(name, "/etc") != name)
-+            fputs(name, stdout);
++	  if (strstr(name, "/etc") != name)
++		  fputs(name, stdout);
          }
        }
      }
-@@ -1640,14 +1649,9 @@ static const char **init_default_directories(MEM_ROOT 
+@@ -1651,14 +1660,9 @@ static const char **init_default_directories(MEM_ROOT 
  
  #else
  
@@ -51,12 +51,12 @@
  #endif
  
    if ((env = getenv("MYSQL_HOME"))) errors += add_directory(alloc, env, dirs);
-@@ -1710,7 +1714,7 @@ int check_file_permissions(const char *file_name, bool
+@@ -1723,7 +1727,7 @@ int check_file_permissions(const char *file_name, bool
  #if !defined(_WIN32)
    MY_STAT stat_info;
  
--  if (!my_stat(file_name, &stat_info, MYF(0))) return 1;
-+  if (!my_stat(file_name, &stat_info, MYF(0))) return 0;
+-  if (!my_stat(file_name, &stat_info, flags)) return 1;
++  if (!my_stat(file_name, &stat_info, flags)) return 0;
    /*
      Ignore .mylogin.cnf file if not exclusively readable/writable
      by current user.
diff --git a/databases/mysql80-server/files/patch-mysys_my__kdf.cc b/databases/mysql80-server/files/patch-mysys_my__kdf.cc
new file mode 100644
index 000000000000..e4b12bfc09a0
--- /dev/null
+++ b/databases/mysql80-server/files/patch-mysys_my__kdf.cc
@@ -0,0 +1,20 @@
+--- mysys/my_kdf.cc.orig	2022-12-11 13:12:02 UTC
++++ mysys/my_kdf.cc
+@@ -56,7 +56,7 @@ int create_kdf_key(const unsigned char *key, const uns
+   std::unique_ptr<Key_derivation_function> kdf_function;
+ 
+   if (kdf_name == "hkdf") {
+-#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
+     kdf_function = std::make_unique<Key_hkdf_function>(kdf_options);
+ #else
+     return 1;
+@@ -71,7 +71,7 @@ int create_kdf_key(const unsigned char *key, const uns
+   return kdf_function->derive_key(key, key_length, rkey, rkey_size);
+ }
+ 
+-#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
+ Key_hkdf_function::Key_hkdf_function(vector<string> *kdf_options) {
+   kdf_options_ = {kdf_options};
+ }
diff --git a/databases/mysql80-server/files/patch-mysys_my__md5.cc b/databases/mysql80-server/files/patch-mysys_my__md5.cc
deleted file mode 100644
index 56986ec7f9b0..000000000000
--- a/databases/mysql80-server/files/patch-mysys_my__md5.cc
+++ /dev/null
@@ -1,12 +0,0 @@
---- mysys/my_md5.cc.orig	2019-09-20 08:30:51 UTC
-+++ mysys/my_md5.cc
-@@ -56,7 +56,9 @@ static void my_md5_hash(unsigned char *digest, unsigne
- int compute_md5_hash(char *digest, const char *buf, int len) {
-   int retval = 0;
-   int fips_mode = 0;
-+#ifndef LIBRESSL_VERSION_NUMBER
-   fips_mode = FIPS_mode();
-+#endif /* LIBRESSL_VERSION_NUMBER */
-   /* If fips mode is ON/STRICT restricted method calls will result into abort,
-    * skipping call. */
-   if (fips_mode == 0) {
diff --git a/databases/mysql80-server/files/patch-plugin_group__replication_libmysqlgcs_src_bindings_xcom_xcom_xcom__ssl__transport.c b/databases/mysql80-server/files/patch-plugin_group__replication_libmysqlgcs_src_bindings_xcom_xcom_xcom__ssl__transport.c
deleted file mode 100644
index 9dcdca8bd775..000000000000
--- a/databases/mysql80-server/files/patch-plugin_group__replication_libmysqlgcs_src_bindings_xcom_xcom_xcom__ssl__transport.c
+++ /dev/null
@@ -1,94 +0,0 @@
---- plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_ssl_transport.cc.orig	2019-09-20 08:30:51 UTC
-+++ plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_ssl_transport.cc
-@@ -175,7 +175,7 @@ SSL_CTX *client_ctx = NULL;
- static long process_tls_version(const char *tls_version) {
-   const char *separator = ", ";
-   char *token = NULL;
--#ifdef HAVE_TLSv13
-+#if defined(HAVE_TLSv13) && !defined(LIBRESSL_VERSION_NUMBER)
-   const char *tls_version_name_list[] = {"TLSv1", "TLSv1.1", "TLSv1.2",
-                                          "TLSv1.3"};
- #else
-@@ -184,7 +184,7 @@ static long process_tls_version(const char *tls_versio
- #define TLS_VERSIONS_COUNTS \
-   (sizeof(tls_version_name_list) / sizeof(*tls_version_name_list))
-   unsigned int tls_versions_count = TLS_VERSIONS_COUNTS;
--#ifdef HAVE_TLSv13
-+#if defined(HAVE_TLSv13) && !defined(LIBRESSL_VERSION_NUMBER)
-   const long tls_ctx_list[TLS_VERSIONS_COUNTS] = {
-       SSL_OP_NO_TLSv1, SSL_OP_NO_TLSv1_1, SSL_OP_NO_TLSv1_2, SSL_OP_NO_TLSv1_3};
-   const char *ctx_flag_default = "TLSv1,TLSv1.1,TLSv1.2,TLSv1.3";
-@@ -240,7 +240,7 @@ static int configure_ssl_algorithms(
-   long ssl_ctx_options = SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3;
-   char cipher_list[SSL_CIPHER_LIST_SIZE] = {0};
-   long ssl_ctx_flags = -1;
--#ifdef HAVE_TLSv13
-+#if defined(HAVE_TLSv13) && !defined(LIBRESSL_VERSION_NUMBER)
-   int tlsv1_3_enabled = 0;
- #endif /* HAVE_TLSv13 */
- 
-@@ -253,7 +253,7 @@ static int configure_ssl_algorithms(
-     goto error;
-   }
- 
--#ifdef HAVE_TLSv13
-+#if defined(HAVE_TLSv13) && !defined(LIBRESSL_VERSION_NUMBER)
-   ssl_ctx_options = (ssl_ctx_options | ssl_ctx_flags) &
-                     (SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3 | SSL_OP_NO_TLSv1 |
-                      SSL_OP_NO_TLSv1_1 | SSL_OP_NO_TLSv1_2 | SSL_OP_NO_TLSv1_3);
-@@ -265,7 +265,7 @@ static int configure_ssl_algorithms(
- 
-   SSL_CTX_set_options(ssl_ctx, ssl_ctx_options);
- 
--#ifdef HAVE_TLSv13
-+#if defined(HAVE_TLSv13) && !defined(LIBRESSL_VERSION_NUMBER)
-   tlsv1_3_enabled = ((ssl_ctx_options & SSL_OP_NO_TLSv1_3) == 0);
-   if (tlsv1_3_enabled) {
-     /* Set OpenSSL TLS v1.3 ciphersuites.
-@@ -325,6 +325,7 @@ error:
-   return 1;
- }
- 
-+#ifndef LIBRESSL_VERSION_NUMBER
- #define OPENSSL_ERROR_LENGTH 512
- static int configure_ssl_fips_mode(const uint fips_mode) {
-   int rc = -1;
-@@ -348,6 +349,7 @@ static int configure_ssl_fips_mode(const uint fips_mod
- EXIT:
-   return rc;
- }
-+#endif
- 
- static int configure_ssl_ca(SSL_CTX *ssl_ctx, const char *ca_file,
-                             const char *ca_path) {
-@@ -544,10 +546,12 @@ int xcom_init_ssl(const char *server_key_file, const c
-   int verify_server = SSL_VERIFY_NONE;
-   int verify_client = SSL_VERIFY_NONE;
- 
-+#ifndef LIBRESSL_VERSION_NUMBER
-   if (configure_ssl_fips_mode(ssl_fips_mode) != 1) {
-     G_ERROR("Error setting the ssl fips mode");
-     goto error;
-   }
-+#endif
- 
-   SSL_library_init();
-   SSL_load_error_strings();
-@@ -563,7 +567,7 @@ int xcom_init_ssl(const char *server_key_file, const c
-   }
- 
-   G_DEBUG("Configuring SSL for the server")
--#ifdef HAVE_TLSv13
-+#if defined(HAVE_TLSv13) && !defined(LIBRESSL_VERSION_NUMBER)
-   server_ctx = SSL_CTX_new(TLS_server_method());
- #else
-   server_ctx = SSL_CTX_new(SSLv23_server_method());
-@@ -582,7 +586,7 @@ int xcom_init_ssl(const char *server_key_file, const c
-   SSL_CTX_set_verify(server_ctx, verify_server, NULL);
- 
-   G_DEBUG("Configuring SSL for the client")
--#ifdef HAVE_TLSv13
-+#if defined(HAVE_TLSv13) && !defined(LIBRESSL_VERSION_NUMBER)
-   client_ctx = SSL_CTX_new(TLS_client_method());
- #else
-   client_ctx = SSL_CTX_new(SSLv23_client_method());
diff --git a/databases/mysql80-server/files/patch-plugin_x_CMakeLists.txt b/databases/mysql80-server/files/patch-plugin_x_CMakeLists.txt
index e3ee6f45bb06..58cb6a7922b1 100644
--- a/databases/mysql80-server/files/patch-plugin_x_CMakeLists.txt
+++ b/databases/mysql80-server/files/patch-plugin_x_CMakeLists.txt
@@ -1,4 +1,4 @@
---- plugin/x/CMakeLists.txt.orig	2019-09-20 08:30:51 UTC
+--- plugin/x/CMakeLists.txt.orig	2021-12-17 16:07:27 UTC
 +++ plugin/x/CMakeLists.txt
 @@ -77,6 +77,8 @@ INCLUDE_DIRECTORIES(
    ${MYSQLX_GENERATE_DIR}
@@ -8,4 +8,4 @@
 +  ${BOOST_INCLUDE_DIR}
  )
  
- MY_INCLUDE_SYSTEM_DIRECTORIES(PROTOBUF)
+ MY_INCLUDE_SYSTEM_DIRECTORIES(LIBEVENT)
diff --git a/databases/mysql80-server/files/patch-plugin_x_client_xconnection__impl.cc b/databases/mysql80-server/files/patch-plugin_x_client_xconnection__impl.cc
deleted file mode 100644
index df8f2bfd0942..000000000000
--- a/databases/mysql80-server/files/patch-plugin_x_client_xconnection__impl.cc
+++ /dev/null
@@ -1,33 +0,0 @@
---- plugin/x/client/xconnection_impl.cc.orig	2019-09-20 08:30:51 UTC
-+++ plugin/x/client/xconnection_impl.cc
-@@ -520,6 +520,7 @@ XError Connection_impl::get_ssl_error(const int error_
-   return XError(CR_SSL_CONNECTION_ERROR, buffer);
- }
- 
-+#ifndef LIBRESSL_VERSION_NUMBER
- /**
-   Set fips mode in openssl library,
-   When we set fips mode ON/STRICT, it will perform following operations:
-@@ -559,6 +560,7 @@ int set_fips_mode(const uint32_t fips_mode,
- EXIT:
-   return rc;
- }
-+#endif
- 
- XError Connection_impl::activate_tls() {
-   if (nullptr == m_vio) return get_socket_error(SOCKET_ECONNRESET);
-@@ -569,12 +571,14 @@ XError Connection_impl::activate_tls() {
-   if (!m_context->m_ssl_config.is_configured())
-     return XError{CR_SSL_CONNECTION_ERROR, ER_TEXT_TLS_NOT_CONFIGURATED, true};
- 
-+#ifndef LIBRESSL_VERSION_NUMBER
-   char err_string[OPENSSL_ERROR_LENGTH] = {'\0'};
-   if (set_fips_mode(
-           static_cast<uint32_t>(m_context->m_ssl_config.m_ssl_fips_mode),
-           err_string) != 1) {
-     return XError{CR_SSL_CONNECTION_ERROR, err_string, true};
-   }
-+#endif
-   auto ssl_ctx_flags = process_tls_version(
-       details::null_when_empty(m_context->m_ssl_config.m_tls_version));
- 
diff --git a/databases/mysql80-server/files/patch-router_src_harness_include_mysql_harness_net_ts_impl_kqueue_io_service.h b/databases/mysql80-server/files/patch-router_src_harness_include_mysql_harness_net_ts_impl_kqueue_io_service.h
index 8274f7e275ac..46d03cb9db69 100644
--- a/databases/mysql80-server/files/patch-router_src_harness_include_mysql_harness_net_ts_impl_kqueue_io_service.h
+++ b/databases/mysql80-server/files/patch-router_src_harness_include_mysql_harness_net_ts_impl_kqueue_io_service.h
@@ -7,7 +7,7 @@
 -        ts = {secs.count(),
 -              std::chrono::duration_cast<std::chrono::nanoseconds>(timeout)
 +        ts = {(time_t)secs.count(),
-+              (time_t)std::chrono::duration_cast<std::chrono::nanoseconds>(timeout)
++              (long)std::chrono::duration_cast<std::chrono::nanoseconds>(timeout)
                    .count()};
  
          p_ts = &ts;
diff --git a/databases/mysql80-server/files/patch-router_src_harness_src_CMakeLists.txt b/databases/mysql80-server/files/patch-router_src_harness_src_CMakeLists.txt
index 74d19b39f2d3..65fe02456eec 100644
--- a/databases/mysql80-server/files/patch-router_src_harness_src_CMakeLists.txt
+++ b/databases/mysql80-server/files/patch-router_src_harness_src_CMakeLists.txt
@@ -1,14 +1,14 @@
---- router/src/harness/src/CMakeLists.txt.orig	2019-12-09 19:53:17 UTC
+--- router/src/harness/src/CMakeLists.txt.orig	2021-12-17 16:07:27 UTC
 +++ router/src/harness/src/CMakeLists.txt
-@@ -205,7 +205,6 @@ IF(NOT WIN32)
+@@ -212,7 +212,6 @@ ELSE()
    INSTALL(TARGETS harness-library
      LIBRARY
      DESTINATION ${ROUTER_INSTALL_LIBDIR} COMPONENT Router
 -    NAMELINK_SKIP
      )
- ELSE()
-   INSTALL(TARGETS harness-library
-@@ -240,7 +239,6 @@ INSTALL(TARGETS harness_stdx
+ ENDIF()
+ 
+@@ -243,7 +242,6 @@ INSTALL(TARGETS harness_stdx
    RUNTIME DESTINATION ${ROUTER_INSTALL_BINDIR} COMPONENT Router
    ARCHIVE DESTINATION ${ROUTER_INSTALL_LIBDIR} COMPONENT Router
    LIBRARY DESTINATION ${ROUTER_INSTALL_LIBDIR} COMPONENT Router
@@ -16,7 +16,7 @@
    )
  
  ## harness_tls
-@@ -277,5 +275,4 @@ INSTALL(TARGETS harness_tls
+@@ -284,5 +282,4 @@ INSTALL(TARGETS harness_tls
    RUNTIME DESTINATION ${ROUTER_INSTALL_BINDIR} COMPONENT Router
    ARCHIVE DESTINATION ${ROUTER_INSTALL_LIBDIR} COMPONENT Router
    LIBRARY DESTINATION ${ROUTER_INSTALL_LIBDIR} COMPONENT Router
diff --git a/databases/mysql80-server/files/patch-router_src_harness_src_tls__client__context.cc b/databases/mysql80-server/files/patch-router_src_harness_src_tls__client__context.cc
index 3c9c3d70b23f..d4a5ef543b49 100644
--- a/databases/mysql80-server/files/patch-router_src_harness_src_tls__client__context.cc
+++ b/databases/mysql80-server/files/patch-router_src_harness_src_tls__client__context.cc
@@ -1,11 +1,11 @@
---- router/src/harness/src/tls_client_context.cc.orig	2019-09-20 08:30:51 UTC
+--- router/src/harness/src/tls_client_context.cc.orig	2021-12-17 16:07:27 UTC
 +++ router/src/harness/src/tls_client_context.cc
-@@ -54,7 +54,7 @@ void TlsClientContext::verify(TlsVerify verify) {
- 
- void TlsClientContext::cipher_suites(const std::string &ciphers) {
+@@ -61,7 +61,7 @@ stdx::expected<void, std::error_code> TlsClientContext
+ stdx::expected<void, std::error_code> TlsClientContext::cipher_suites(
+     const std::string &ciphers) {
  // TLSv1.3 ciphers are controlled via SSL_CTX_set_ciphersuites()
 -#if OPENSSL_VERSION_NUMBER >= ROUTER_OPENSSL_VERSION(1, 1, 1)
 +#ifdef TLS1_3_VERSION
    if (1 != SSL_CTX_set_ciphersuites(ssl_ctx_.get(), ciphers.c_str())) {
-     throw TlsError("set-cipher-suites");
+     return stdx::make_unexpected(make_tls_error());
    }
diff --git a/databases/mysql80-server/files/patch-router_src_harness_src_tls__context.cc b/databases/mysql80-server/files/patch-router_src_harness_src_tls__context.cc
index 9b53b3aae974..b1d818afe81a 100644
--- a/databases/mysql80-server/files/patch-router_src_harness_src_tls__context.cc
+++ b/databases/mysql80-server/files/patch-router_src_harness_src_tls__context.cc
@@ -1,6 +1,6 @@
---- router/src/harness/src/tls_context.cc.orig	2019-09-20 08:30:51 UTC
+--- router/src/harness/src/tls_context.cc.orig	2021-12-17 16:07:27 UTC
 +++ router/src/harness/src/tls_context.cc
-@@ -91,7 +91,7 @@ static constexpr int o11x_version(TlsVersion version) 
+@@ -241,7 +241,7 @@ static int o11x_version(TlsVersion version) {
        return TLS1_1_VERSION;
      case TlsVersion::TLS_1_2:
        return TLS1_2_VERSION;
@@ -9,19 +9,19 @@
      case TlsVersion::TLS_1_3:
        return TLS1_3_VERSION;
  #endif
-@@ -121,9 +121,11 @@ void TlsContext::version_range(TlsVersion min_version,
+@@ -272,9 +272,11 @@ stdx::expected<void, std::error_code> TlsContext::vers
      default:
        // unknown, leave all disabled
-       // fallthrough
+       [[fallthrough]];
 +#ifdef TLS1_3_VERSION
      case TlsVersion::TLS_1_3:
        opts |= SSL_OP_NO_TLSv1_2;
-       // fallthrough
+       [[fallthrough]];
 +#endif
      case TlsVersion::TLS_1_2:
        opts |= SSL_OP_NO_TLSv1_1;
-       // fallthrough
-@@ -170,8 +172,10 @@ TlsVersion TlsContext::min_version() const {
+       [[fallthrough]];
+@@ -322,8 +324,10 @@ TlsVersion TlsContext::min_version() const {
        return TlsVersion::TLS_1_1;
      case TLS1_2_VERSION:
        return TlsVersion::TLS_1_2;
@@ -32,7 +32,7 @@
      case 0:
        return TlsVersion::AUTO;
      default:
-@@ -230,7 +234,8 @@ TlsContext::InfoCallback TlsContext::info_callback() c
+@@ -382,7 +386,8 @@ TlsContext::InfoCallback TlsContext::info_callback() c
  }
  
  int TlsContext::security_level() const {
diff --git a/databases/mysql80-server/files/patch-router_src_harness_src_tls__server__context.cc b/databases/mysql80-server/files/patch-router_src_harness_src_tls__server__context.cc
index ac19ffd0c661..5a63eba14103 100644
--- a/databases/mysql80-server/files/patch-router_src_harness_src_tls__server__context.cc
+++ b/databases/mysql80-server/files/patch-router_src_harness_src_tls__server__context.cc
@@ -1,12 +1,12 @@
---- router/src/harness/src/tls_server_context.cc.orig	2019-09-20 08:30:51 UTC
-+++ router/src/harness/src/tls_server_context.cc
-@@ -166,7 +166,8 @@ void TlsServerContext::init_tmp_dh(const std::string &
-     }
+--- router/src/harness/src/tls_server_context.cc.orig	2023-11-18 19:39:18.923205000 +0100
++++ router/src/harness/src/tls_server_context.cc	2023-11-18 19:42:53.690094000 +0100
+@@ -474,7 +474,8 @@ int TlsServerContext::security_level() const {
+ }
  
-   } else {
+ int TlsServerContext::security_level() const {
 -#if OPENSSL_VERSION_NUMBER >= ROUTER_OPENSSL_VERSION(1, 1, 0)
-+#if OPENSSL_VERSION_NUMBER >= ROUTER_OPENSSL_VERSION(1, 1, 0) && \
-+    !defined(LIBRESSL_VERSION_NUMBER)
-     dh2048.reset(DH_get_2048_256());
- #else
-     /*
++#if OPENSSL_VERSION_NUMBER >= ROUTER_OPENSSL_VERSION(1, 1, 0) \
++  && !defined(LIBRESSL_VERSION_NUMBER)
+   int sec_level = SSL_CTX_get_security_level(ssl_ctx_.get());
+ 
+   assert(sec_level <= kMaxSecurityLevel);
diff --git a/databases/mysql80-server/files/patch-router_src_http_src_CMakeLists.txt b/databases/mysql80-server/files/patch-router_src_http_src_CMakeLists.txt
index cea2271c20d1..d6d71414449d 100644
--- a/databases/mysql80-server/files/patch-router_src_http_src_CMakeLists.txt
+++ b/databases/mysql80-server/files/patch-router_src_http_src_CMakeLists.txt
@@ -1,6 +1,6 @@
---- router/src/http/src/CMakeLists.txt.orig	2019-12-09 19:53:17 UTC
+--- router/src/http/src/CMakeLists.txt.orig	2021-12-17 16:07:27 UTC
 +++ router/src/http/src/CMakeLists.txt
-@@ -62,7 +62,6 @@ INSTALL(TARGETS http_common
+@@ -58,7 +58,6 @@ INSTALL(TARGETS http_common
    RUNTIME DESTINATION ${ROUTER_INSTALL_BINDIR} COMPONENT Router
    ARCHIVE DESTINATION ${ROUTER_INSTALL_LIBDIR} COMPONENT Router
    LIBRARY DESTINATION ${ROUTER_INSTALL_LIBDIR} COMPONENT Router
@@ -8,7 +8,7 @@
    )
  
  ## split library code from the plugin to use them _passwd and tests
-@@ -88,7 +87,6 @@ INSTALL(TARGETS http_auth_backend_lib
+@@ -84,7 +83,6 @@ INSTALL(TARGETS http_auth_backend_lib
    RUNTIME DESTINATION ${ROUTER_INSTALL_BINDIR} COMPONENT Router
    ARCHIVE DESTINATION ${ROUTER_INSTALL_LIBDIR} COMPONENT Router
    LIBRARY DESTINATION ${ROUTER_INSTALL_LIBDIR} COMPONENT Router
@@ -16,7 +16,7 @@
    )
  TARGET_INCLUDE_DIRECTORIES(http_auth_backend_lib PUBLIC
    ${CMAKE_CURRENT_SOURCE_DIR}
-@@ -141,7 +139,6 @@ INSTALL(TARGETS http_auth_realm_lib
+@@ -137,7 +135,6 @@ INSTALL(TARGETS http_auth_realm_lib
    RUNTIME DESTINATION ${ROUTER_INSTALL_BINDIR} COMPONENT Router
    ARCHIVE DESTINATION ${ROUTER_INSTALL_LIBDIR} COMPONENT Router
    LIBRARY DESTINATION ${ROUTER_INSTALL_LIBDIR} COMPONENT Router
diff --git a/databases/mysql80-server/files/patch-router_src_router_src_CMakeLists.txt b/databases/mysql80-server/files/patch-router_src_router_src_CMakeLists.txt
index cee2af2e2f73..ae48964a591e 100644
--- a/databases/mysql80-server/files/patch-router_src_router_src_CMakeLists.txt
+++ b/databases/mysql80-server/files/patch-router_src_router_src_CMakeLists.txt
@@ -1,6 +1,6 @@
---- router/src/router/src/CMakeLists.txt.orig	2019-12-09 19:53:17 UTC
+--- router/src/router/src/CMakeLists.txt.orig	2021-12-17 16:07:27 UTC
 +++ router/src/router/src/CMakeLists.txt
-@@ -119,7 +119,6 @@ INSTALL(TARGETS router_lib
+@@ -124,7 +124,6 @@ INSTALL(TARGETS router_lib
    RUNTIME DESTINATION ${ROUTER_INSTALL_BINDIR} COMPONENT Router
    ARCHIVE DESTINATION ${ROUTER_INSTALL_LIBDIR} COMPONENT Router
    LIBRARY DESTINATION ${ROUTER_INSTALL_LIBDIR} COMPONENT Router
diff --git a/databases/mysql80-server/files/patch-scripts_CMakeLists.txt b/databases/mysql80-server/files/patch-scripts_CMakeLists.txt
index 19e53914846e..d927dbe6a864 100644
--- a/databases/mysql80-server/files/patch-scripts_CMakeLists.txt
+++ b/databases/mysql80-server/files/patch-scripts_CMakeLists.txt
@@ -1,24 +1,15 @@
---- scripts/CMakeLists.txt.orig	2019-09-20 08:30:51 UTC
+--- scripts/CMakeLists.txt.orig	2022-07-06 21:36:34 UTC
 +++ scripts/CMakeLists.txt
-@@ -330,7 +330,7 @@ MACRO(EXTRACT_LINK_LIBRARIES target var)
-     LIST(REMOVE_DUPLICATES ${target}_LIB_DEPENDS)
-     FOREACH(lib ${${target}_LIB_DEPENDS})
-       # Filter out "general", it is not a library, just CMake hint
--      IF(NOT lib STREQUAL "general" AND NOT ${var}  MATCHES "-l${lib} ")
-+      IF(NOT lib STREQUAL "general" AND NOT ${var}  MATCHES "-l${lib} " AND NOT lib STREQUAL "imported_openssl" AND NOT lib STREQUAL "imported_crypto")
-         IF (lib MATCHES "^\\-l")
-           SET(${var} "${${var}} ${lib} ")
-         ELSEIF (lib MATCHES "^\\-L")
-@@ -340,6 +340,8 @@ MACRO(EXTRACT_LINK_LIBRARIES target var)
-           GET_FILENAME_COMPONENT(lib "${lib}" NAME_WE)
-           STRING(REGEX REPLACE "^lib" "" lib "${lib}")
-           SET(${var} "${${var}}-l${lib} " )
+@@ -332,6 +332,8 @@ MACRO(EXTRACT_LINK_LIBRARIES target var)
+           SET(${var} "${${var}}-L${dir} " )
+         ENDIF()
+         SET(${var} "${${var}}-l${lib} " )
 +        ELSEIF(lib STREQUAL "-pthread")
 +          SET(${var} "${${var}}-pthread " )
-         ELSE()
-           SET(${var} "${${var}}-l${lib} " )
-         ENDIF()
-@@ -414,7 +416,7 @@ ELSE()
+       ELSE()
+         SET(${var} "${${var}}-l${lib} " )
+       ENDIF()
+@@ -405,7 +407,7 @@ ELSE()
      ${CMAKE_CURRENT_BINARY_DIR}/${PKGCONFIG_FILE}
      ESCAPE_QUOTES @ONLY)
  
@@ -27,7 +18,7 @@
      MESSAGE(STATUS "INSTALL ${PKGCONFIG_FILE} ${INSTALL_PKGCONFIGDIR}")
      INSTALL(FILES
        ${CMAKE_CURRENT_BINARY_DIR}/${PKGCONFIG_FILE}
-@@ -427,23 +429,28 @@ ELSE()
+@@ -418,23 +420,28 @@ ELSE()
    # mysqld_safe used in mtr even for systemd platforms
    IF(WITH_SYSTEMD)
      SET(BIN_SCRIPTS
diff --git a/databases/mysql80-server/files/patch-scripts_mysqld__safe.sh b/databases/mysql80-server/files/patch-scripts_mysqld__safe.sh
new file mode 100644
index 000000000000..47bc81e3963b
--- /dev/null
+++ b/databases/mysql80-server/files/patch-scripts_mysqld__safe.sh
@@ -0,0 +1,19 @@
+--- scripts/mysqld_safe.sh.orig	2022-01-23 11:48:36 UTC
++++ scripts/mysqld_safe.sh
+@@ -360,7 +360,7 @@ mysqld_ld_preload_text() {
+ # running mysqld.  See ld.so for details.
+ set_malloc_lib() {
+   # This list is kept intentionally simple.
+-  malloc_dirs="/usr/lib /usr/lib64 /usr/lib/i386-linux-gnu /usr/lib/x86_64-linux-gnu"
++  malloc_dirs="/usr/lib /usr/lib64 /usr/lib/i386-linux-gnu /usr/lib/x86_64-linux-gnu /usr/local/lib"
+   malloc_lib="$1"
+ 
+   # Allow --malloc-lib='' to override other settings
+@@ -379,6 +379,7 @@ set_malloc_lib() {
+         /usr/lib64) ;;
+         /usr/lib/i386-linux-gnu) ;;
+         /usr/lib/x86_64-linux-gnu) ;;
++	/usr/local/lib) ;;
+         *)
+           log_error "--malloc-lib must be located in one of the directories: $malloc_dirs"
+           exit 1
diff --git a/databases/mysql80-server/files/patch-sql-common_client.cc b/databases/mysql80-server/files/patch-sql-common_client.cc
deleted file mode 100644
index acf9035fb33c..000000000000
--- a/databases/mysql80-server/files/patch-sql-common_client.cc
+++ /dev/null
@@ -1,18 +0,0 @@
---- sql-common/client.cc.orig	2020-03-26 13:31:45 UTC
-+++ sql-common/client.cc
-@@ -7752,6 +7752,7 @@ int STDCALL mysql_options(MYSQL *mysql, enum mysql_opt
-         return 1;
-       break;
-     case MYSQL_OPT_SSL_FIPS_MODE: {
-+#if !defined(LIBRESSL_VERSION_NUMBER)
-       char ssl_err_string[OPENSSL_ERROR_LENGTH] = {'\0'};
-       ENSURE_EXTENSIONS_PRESENT(&mysql->options);
-       mysql->options.extension->ssl_fips_mode = *static_cast<const uint *>(arg);
-@@ -7763,6 +7764,7 @@ int STDCALL mysql_options(MYSQL *mysql, enum mysql_opt
-             "Set Fips mode ON/STRICT failed, detail: '%s'.", ssl_err_string);
-         return 1;
-       }
-+#endif
-     } break;
-     case MYSQL_OPT_SSL_MODE:
-       ENSURE_EXTENSIONS_PRESENT(&mysql->options);
diff --git a/databases/mysql80-server/files/patch-sql_auth_sql__authorization.cc b/databases/mysql80-server/files/patch-sql_auth_sql__authorization.cc
new file mode 100644
index 000000000000..4d35279882d5
--- /dev/null
+++ b/databases/mysql80-server/files/patch-sql_auth_sql__authorization.cc
@@ -0,0 +1,13 @@
+--- sql/auth/sql_authorization.cc.orig	2023-03-16 17:22:37 UTC
++++ sql/auth/sql_authorization.cc
+@@ -7430,6 +7430,10 @@ bool operator==(const Role_id &a, const std::string &b
+   return tmp == b;
+ }
+ 
++bool operator==(const Role_id &a, const LEX_CSTRING &b) {
++  return a == to_string(b);
++}
++
+ bool operator==(const std::pair<Role_id, bool> &a, const std::string &b) {
+   return a.first == b;
+ }
diff --git a/databases/mysql80-server/files/patch-sql_conn__handler_socket__connection.cc b/databases/mysql80-server/files/patch-sql_conn__handler_socket__connection.cc
index edcba63dec28..8f5d99aa45b4 100644
--- a/databases/mysql80-server/files/patch-sql_conn__handler_socket__connection.cc
+++ b/databases/mysql80-server/files/patch-sql_conn__handler_socket__connection.cc
@@ -1,6 +1,6 @@
---- sql/conn_handler/socket_connection.cc.orig	2019-09-20 08:30:51 UTC
+--- sql/conn_handler/socket_connection.cc.orig	2021-12-17 16:07:27 UTC
 +++ sql/conn_handler/socket_connection.cc
-@@ -950,9 +950,11 @@ bool check_connection_refused_by_tcp_wrapper(MYSQL_SOC
+@@ -953,9 +953,11 @@ bool check_connection_refused_by_tcp_wrapper(MYSQL_SOC
    signal(SIGCHLD, SIG_DFL);
    request_init(&req, RQ_DAEMON, libwrap_name, RQ_FILE,
                 mysql_socket_getfd(connect_sock), NULL);
@@ -14,7 +14,7 @@
      /*
        This may be stupid but refuse() includes an exit(0)
        which we surely don't want...
-@@ -964,12 +966,13 @@ bool check_connection_refused_by_tcp_wrapper(MYSQL_SOC
+@@ -967,12 +969,13 @@ bool check_connection_refused_by_tcp_wrapper(MYSQL_SOC
        This is unproblematic as TCP-wrapper is unix specific,
        anyway.
      */
diff --git a/databases/mysql80-server/files/patch-sql_mysqld.cc b/databases/mysql80-server/files/patch-sql_mysqld.cc
index 39a7fb89844a..484af751b704 100644
--- a/databases/mysql80-server/files/patch-sql_mysqld.cc
+++ b/databases/mysql80-server/files/patch-sql_mysqld.cc
@@ -1,6 +1,6 @@
---- sql/mysqld.cc.orig	2019-09-20 08:30:51 UTC
+--- sql/mysqld.cc.orig	2022-07-06 21:36:34 UTC
 +++ sql/mysqld.cc
-@@ -5109,7 +5109,7 @@ static int init_thread_environment() {
+@@ -5299,7 +5299,7 @@ static int init_thread_environment() {
  
  static PSI_memory_key key_memory_openssl = PSI_NOT_INSTRUMENTED;
  
@@ -9,18 +9,3 @@
  #define FILE_LINE_ARGS
  #else
  #define FILE_LINE_ARGS , const char *, int
-@@ -5143,12 +5143,14 @@ static void init_ssl() {
- }
- 
- static int init_ssl_communication() {
-+#ifndef LIBRESSL_VERSION_NUMBER
-   char ssl_err_string[OPENSSL_ERROR_LENGTH] = {'\0'};
-   int ret_fips_mode = set_fips_mode(opt_ssl_fips_mode, ssl_err_string);
-   if (ret_fips_mode != 1) {
-     LogErr(ERROR_LEVEL, ER_SSL_FIPS_MODE_ERROR, ssl_err_string);
-     return 1;
-   }
-+#endif /* LIBRESSL_VERSION_NUMBER */
-   if (TLS_channel::singleton_init(&mysql_main, mysql_main_channel, opt_use_ssl,
-                                   &server_main_callback, opt_initialize))
-     return 1;
diff --git a/databases/mysql80-server/files/patch-sql_ssl__init__callback.cc b/databases/mysql80-server/files/patch-sql_ssl__init__callback.cc
new file mode 100644
index 000000000000..33f3d0645524
--- /dev/null
+++ b/databases/mysql80-server/files/patch-sql_ssl__init__callback.cc
@@ -0,0 +1,36 @@
+--- sql/ssl_init_callback.cc.orig	2021-12-17 16:07:27 UTC
++++ sql/ssl_init_callback.cc
+@@ -106,14 +106,14 @@ static Sys_var_charptr Sys_ssl_capath(
+ 
+ static Sys_var_charptr Sys_tls_version(
+     "tls_version",
+-#ifdef HAVE_TLSv13
++#if defined(HAVE_TLSv13) && !defined(LIBRESSL_VERSION_NUMBER)
+     "TLS version, permitted values are TLSv1.2, TLSv1.3",
+ #else
+     "TLS version, permitted values are TLSv1.2",
+ #endif
+     PERSIST_AS_READONLY GLOBAL_VAR(opt_tls_version),
+     CMD_LINE(REQUIRED_ARG, OPT_TLS_VERSION), IN_FS_CHARSET,
+-#ifdef HAVE_TLSv13
++#if defined(HAVE_TLSv13) && !defined(LIBRESSL_VERSION_NUMBER)
+     "TLSv1.2,TLSv1.3",
+ #else
+     "TLSv1.2",
+@@ -175,14 +175,14 @@ static Sys_var_charptr Sys_admin_ssl_capath(
+ 
+ static Sys_var_charptr Sys_admin_tls_version(
+     "admin_tls_version",
+-#ifdef HAVE_TLSv13
++#if defined(HAVE_TLSv13) && !defined(LIBRESSL_VERSION_NUMBER)
+     "TLS version for --admin-port, permitted values are TLSv1.2, TLSv1.3",
+ #else
+     "TLS version for --admin-port, permitted values are TLSv1.2",
+ #endif
+     PERSIST_AS_READONLY GLOBAL_VAR(opt_admin_tls_version),
+     CMD_LINE(REQUIRED_ARG, OPT_TLS_VERSION), IN_FS_CHARSET,
+-#ifdef HAVE_TLSv13
++#if defined(HAVE_TLSv13) && !defined(LIBRESSL_VERSION_NUMBER)
+     "TLSv1.2,TLSv1.3",
+ #else
+     "TLSv1.2",
diff --git a/databases/mysql80-server/files/patch-sql_sys__vars.cc b/databases/mysql80-server/files/patch-sql_sys__vars.cc
index 9c12715fd6df..39f72484c0bd 100644
--- a/databases/mysql80-server/files/patch-sql_sys__vars.cc
+++ b/databases/mysql80-server/files/patch-sql_sys__vars.cc
@@ -1,6 +1,6 @@
---- sql/sys_vars.cc.orig	2019-09-20 08:30:51 UTC
+--- sql/sys_vars.cc.orig	2022-07-06 21:36:34 UTC
 +++ sql/sys_vars.cc
-@@ -1875,7 +1875,7 @@ static Sys_var_ulong Sys_connect_timeout(
+@@ -2039,7 +2039,7 @@ static Sys_var_ulong Sys_connect_timeout(
      "The number of seconds the mysqld server is waiting for a connect "
      "packet before responding with 'Bad handshake'",
      GLOBAL_VAR(connect_timeout), CMD_LINE(REQUIRED_ARG),
@@ -9,7 +9,7 @@
  
  static Sys_var_ulong Sys_information_schema_stats_expiry(
      "information_schema_stats_expiry",
-@@ -2929,7 +2929,7 @@ static Sys_var_ulong Sys_net_read_timeout(
+@@ -3189,7 +3189,7 @@ static Sys_var_ulong Sys_net_read_timeout(
      "Number of seconds to wait for more data from a connection before "
      "aborting the read",
      SESSION_VAR(net_read_timeout), CMD_LINE(REQUIRED_ARG),
@@ -18,7 +18,7 @@
      NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(nullptr),
      ON_UPDATE(fix_net_read_timeout));
  
-@@ -2950,7 +2950,7 @@ static Sys_var_ulong Sys_net_write_timeout(
+@@ -3210,7 +3210,7 @@ static Sys_var_ulong Sys_net_write_timeout(
      "Number of seconds to wait for a block to be written to a connection "
      "before aborting the write",
      SESSION_VAR(net_write_timeout), CMD_LINE(REQUIRED_ARG),
@@ -27,44 +27,3 @@
      NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(nullptr),
      ON_UPDATE(fix_net_write_timeout));
  
-@@ -4459,6 +4459,7 @@ static Sys_var_ulong Sys_max_execution_time(
-     HINT_UPDATEABLE SESSION_VAR(max_execution_time), CMD_LINE(REQUIRED_ARG),
-     VALID_RANGE(0, ULONG_MAX), DEFAULT(0), BLOCK_SIZE(1));
- 
-+#ifndef LIBRESSL_VERSION_NUMBER
- static bool update_fips_mode(sys_var *, THD *, enum_var_type) {
-   char ssl_err_string[OPENSSL_ERROR_LENGTH] = {'\0'};
-   if (set_fips_mode(opt_ssl_fips_mode, ssl_err_string) != 1) {
-@@ -4470,14 +4471,30 @@ static bool update_fips_mode(sys_var *, THD *, enum_va
-   }
- }
- 
-+#endif
-+
-+#if defined(LIBRESSL_VERSION_NUMBER)
-+static const char *ssl_fips_mode_names[] = {"OFF", 0};
-+#else
- static const char *ssl_fips_mode_names[] = {"OFF", "ON", "STRICT", nullptr};
-+#endif
- static Sys_var_enum Sys_ssl_fips_mode(
-     "ssl_fips_mode",
-     "SSL FIPS mode (applies only for OpenSSL); "
--    "permitted values are: OFF, ON, STRICT",
-+#ifndef LIBRESSL_VERSION_NUMBER
-+     "permitted values are: OFF, ON, STRICT",
-+#else
-+    "permitted values are: OFF",
-+#endif
-     GLOBAL_VAR(opt_ssl_fips_mode), CMD_LINE(REQUIRED_ARG, OPT_SSL_FIPS_MODE),
-     ssl_fips_mode_names, DEFAULT(0), NO_MUTEX_GUARD, NOT_IN_BINLOG,
--    ON_CHECK(nullptr), ON_UPDATE(update_fips_mode), nullptr);
-+    ON_CHECK(NULL),
-+#ifndef LIBRESSL_VERSION_NUMBER
-+    ON_UPDATE(update_fips_mode),
-+#else
-+    ON_UPDATE(NULL),
-+#endif
-+    NULL);
- 
- static Sys_var_bool Sys_auto_generate_certs(
-     "auto_generate_certs",
diff --git a/databases/mysql80-server/files/patch-ssl__init__callback.cc b/databases/mysql80-server/files/patch-ssl__init__callback.cc
deleted file mode 100644
index 2d80cf5e6c78..000000000000
--- a/databases/mysql80-server/files/patch-ssl__init__callback.cc
+++ /dev/null
@@ -1,20 +0,0 @@
---- sql/ssl_init_callback.cc.orig	2020-12-11 07:42:20 UTC
-+++ sql/ssl_init_callback.cc
-@@ -88,7 +88,7 @@ static Sys_var_charptr Sys_tls_version(
-     "TLS version, permitted values are TLSv1, TLSv1.1, TLSv1.2, TLSv1.3",
-     PERSIST_AS_READONLY GLOBAL_VAR(opt_tls_version),
-     CMD_LINE(REQUIRED_ARG, OPT_TLS_VERSION), IN_FS_CHARSET,
--#ifdef HAVE_TLSv13
-+#if defined(HAVE_TLSv13) && !defined(LIBRESSL_VERSION_NUMBER)
-     "TLSv1,TLSv1.1,TLSv1.2,TLSv1.3",
- #else
-     "TLSv1,TLSv1.1,TLSv1.2",
-@@ -154,7 +154,7 @@ static Sys_var_charptr Sys_admin_tls_version(
-     "TLSv1.2, TLSv1.3",
-     PERSIST_AS_READONLY GLOBAL_VAR(opt_admin_tls_version),
-     CMD_LINE(REQUIRED_ARG, OPT_TLS_VERSION), IN_FS_CHARSET,
--#ifdef HAVE_TLSv13
-+#if defined(HAVE_TLSv13) && !defined(LIBRESSL_VERSION_NUMBER)
-     "TLSv1,TLSv1.1,TLSv1.2,TLSv1.3",
- #else
-     "TLSv1,TLSv1.1,TLSv1.2",
diff --git a/databases/mysql80-server/files/patch-storage_innobase_include_ut0crc32.h b/databases/mysql80-server/files/patch-storage_innobase_include_ut0crc32.h
new file mode 100644
index 000000000000..8ecb999b0221
--- /dev/null
+++ b/databases/mysql80-server/files/patch-storage_innobase_include_ut0crc32.h
@@ -0,0 +1,12 @@
+--- storage/innobase/include/ut0crc32.h.orig	2023-11-27 21:02:58.728994000 +0100
++++ storage/innobase/include/ut0crc32.h	2023-11-27 21:04:10.010362000 +0100
+@@ -132,7 +132,9 @@ CRC32_DEFAULT
+ #endif /* CRC32_ARM64 */
+ 
+ #ifdef CRC32_ARM64_DEFAULT
++#ifndef __FreeBSD__
+ #include <asm/hwcap.h>
++#endif /* __FreeBSD__ */
+ #include <sys/auxv.h>
+ #endif /* CRC32_ARM64_DEFAULT */
+ 
diff --git a/databases/mysql80-server/files/patch-storage_innobase_ut_crc32.cc b/databases/mysql80-server/files/patch-storage_innobase_ut_crc32.cc
new file mode 100644
index 000000000000..fabd5664cf94
--- /dev/null
+++ b/databases/mysql80-server/files/patch-storage_innobase_ut_crc32.cc
@@ -0,0 +1,104 @@
+--- storage/innobase/ut/crc32.cc.orig	2023-11-18 19:47:31.364606000 +0100
++++ storage/innobase/ut/crc32.cc	2023-11-18 20:51:42.956171000 +0100
+@@ -332,8 +332,25 @@ bool can_use_poly_mul() { return true; }
+ #endif /* CRC32_ARM64_APPLE */
+ 
+ #ifdef CRC32_ARM64_DEFAULT
++#ifdef __FreeBSD__
++bool can_use_crc32() {
++  unsigned long capabilities;
++
++  if (elf_aux_info(AT_HWCAP, &capabilities, sizeof(unsigned long)))
++    return false;
++  return capabilities & HWCAP_CRC32;
++}
++bool can_use_poly_mul() {
++  unsigned long capabilities;
++
++  if (elf_aux_info(AT_HWCAP, &capabilities, sizeof(unsigned long)))
++    return false;
++  return capabilities & HWCAP_CRC32;
++}
++#else
+ bool can_use_crc32() { return getauxval(AT_HWCAP) & HWCAP_CRC32; }
+ bool can_use_poly_mul() { return getauxval(AT_HWCAP) & HWCAP_PMULL; }
++#endif
+ #endif /* CRC32_ARM64_DEFAULT */
+ 
+ /** A helper template to statically unroll a loop with a fixed number of
+@@ -442,25 +459,39 @@ uint64_t crc32_impl::update(uint64_t crc, uint64_t dat
+ 
+ #ifdef CRC32_ARM64
+ #ifdef CRC32_ARM64_DEFAULT
++#ifndef __clang__
+ MY_ATTRIBUTE((target("+crc")))
++#else
++MY_ATTRIBUTE((target("crc")))
++#endif
+ #endif /* CRC32_ARM64_DEFAULT */
+ uint32_t crc32_impl::update(uint32_t crc, unsigned char data) {
+   return __crc32cb(crc, data);
+ }
+ #ifdef CRC32_ARM64_DEFAULT
++#ifndef __clang__
+ MY_ATTRIBUTE((target("+crc")))
++#endif
+ #endif /* CRC32_ARM64_DEFAULT */
+ uint32_t crc32_impl::update(uint32_t crc, uint16_t data) {
+   return __crc32ch(crc, data);
+ }
+ #ifdef CRC32_ARM64_DEFAULT
++#ifndef __clang__
+ MY_ATTRIBUTE((target("+crc")))
++#else
++MY_ATTRIBUTE((target("crc")))
++#endif
+ #endif /* CRC32_ARM64_DEFAULT */
+ uint32_t crc32_impl::update(uint32_t crc, uint32_t data) {
+   return __crc32cw(crc, data);
+ }
+ #ifdef CRC32_ARM64_DEFAULT
++#ifndef __clang__
+ MY_ATTRIBUTE((target("+crc")))
++#else
++MY_ATTRIBUTE((target("crc")))
++#endif
+ #endif /* CRC32_ARM64_DEFAULT */
+ uint64_t crc32_impl::update(uint64_t crc, uint64_t data) {
+   return (uint64_t)__crc32cd((uint32_t)crc, data);
+@@ -506,7 +537,11 @@ template <uint32_t w>
+ }
+ template <uint32_t w>
+ #ifdef CRC32_ARM64_DEFAULT
++#ifndef __clang__
+ MY_ATTRIBUTE((target("+crypto")))
++#else
++MY_ATTRIBUTE((target("crypto")))
++#endif
+ #endif /* CRC32_ARM64_DEFAULT */
+ uint64_t use_pclmul::polynomial_mul_rev(uint32_t rev_u) {
+   constexpr uint64_t flipped_w = flip_at_32(w);
+@@ -749,7 +784,11 @@ MY_ATTRIBUTE((flatten))
+ MY_ATTRIBUTE((flatten))
+ #endif /* CRC32_ARM64_APPLE */
+ #ifdef CRC32_ARM64_DEFAULT
++#ifndef __clang__
+ MY_ATTRIBUTE((target("+crc+crypto"), flatten))
++#else
++MY_ATTRIBUTE((target("crc,crypto")))
++#endif
+ #endif /* CRC32_ARM64_DEFAULT */
+ uint32_t crc32_using_pclmul(const byte *data, size_t len) {
+   return crc32<use_pclmul>(0, data, len);
+@@ -769,7 +808,11 @@ MY_ATTRIBUTE((flatten))
+ MY_ATTRIBUTE((flatten))
+ #endif /* CRC32_ARM64_APPLE */
+ #ifdef CRC32_ARM64_DEFAULT
++#ifndef __clang__
+ MY_ATTRIBUTE((target("+crc"), flatten))
++#else
++MY_ATTRIBUTE((target("crc")))
++#endif
+ #endif /* CRC32_ARM64_DEFAULT */
+ uint32_t crc32_using_unrolled_loop_poly_mul(const byte *data, size_t len) {
+   return crc32<use_unrolled_loop_poly_mul>(0, data, len);
diff --git a/databases/mysql80-server/files/patch-utilities_CMakeLists.txt b/databases/mysql80-server/files/patch-utilities_CMakeLists.txt
index 29c120a41e79..c68cd6aa532d 100644
--- a/databases/mysql80-server/files/patch-utilities_CMakeLists.txt
+++ b/databases/mysql80-server/files/patch-utilities_CMakeLists.txt
@@ -1,8 +1,8 @@
---- utilities/CMakeLists.txt.orig	2020-09-23 12:37:48 UTC
-+++ utilities/CMakeLists.txt
-@@ -23,13 +23,19 @@
- ADD_WSHADOW_WARNING()
+--- utilities/CMakeLists.txt.orig	2023-06-14 08:24:40.103026000 +0200
++++ utilities/CMakeLists.txt	2023-06-22 20:43:33.353592000 +0200
+@@ -24,13 +24,19 @@ MSVC_CPPCHECK_DISABLE()
  DISABLE_MISSING_PROFILE_WARNING()
+ MSVC_CPPCHECK_DISABLE()
  
 -IF(NOT CMAKE_CROSSCOMPILING)
 +IF(WITHOUT_CLIENTLIBS)
@@ -22,7 +22,7 @@
  
  MYSQL_ADD_EXECUTABLE(comp_client_err
    comp_client_err.cc
-@@ -112,10 +118,30 @@ MYSQL_ADD_EXECUTABLE(static_thread_local_test
+@@ -113,10 +119,30 @@ MYSQL_ADD_EXECUTABLE(static_thread_local_test
    EXCLUDE_FROM_ALL
    )
  
@@ -53,8 +53,8 @@
    )
  MYSQL_ADD_EXECUTABLE(perror
    perror.cc
-@@ -130,12 +156,23 @@ IF(BUILD_BUNDLED_LZ4)
-     LINK_LIBRARIES ${LZ4_LIBRARY} mysys
+@@ -131,12 +157,23 @@ ENDIF()
+     LINK_LIBRARIES ext::lz4 mysys
      )
  ENDIF()
 +ENDIF(WITHOUT_CLIENTLIBS)
@@ -63,7 +63,7 @@
  MYSQL_ADD_EXECUTABLE(zlib_decompress
    zlib_decompress.cc
    COMPONENT Server
-   LINK_LIBRARIES ${ZLIB_LIBRARY} mysys
+   LINK_LIBRARIES ext::zlib mysys
 +    SKIP_INSTALL )
 +ELSE(WITHOUT_CLIENTLIBS)
 +IF(BUILD_BUNDLED_ZLIB OR NOT OPENSSL_EXECUTABLE_HAS_ZLIB)
diff --git a/databases/mysql80-server/files/patch-vio_viossl.cc b/databases/mysql80-server/files/patch-vio_viossl.cc
deleted file mode 100644
index e7f2a2a7c952..000000000000
--- a/databases/mysql80-server/files/patch-vio_viossl.cc
+++ /dev/null
@@ -1,30 +0,0 @@
---- vio/viossl.cc.orig	2019-09-20 08:30:51 UTC
-+++ vio/viossl.cc
-@@ -45,7 +45,8 @@
-   BIO_set_callback_ex was added in openSSL 1.1.1
-   For older openSSL, use the deprecated BIO_set_callback.
- */
--#if OPENSSL_VERSION_NUMBER >= 0x10101000L
-+#if OPENSSL_VERSION_NUMBER >= 0x10101000L && \
-+    !defined(LIBRESSL_VERSION_NUMBER)
- #define HAVE_BIO_SET_CALLBACK_EX
- #endif
- 
-@@ -635,7 +636,7 @@ static int ssl_do(struct st_VioSSLFd *ptr, Vio *vio, l
- #if !defined(DBUG_OFF)
-     {
-       STACK_OF(SSL_COMP) *ssl_comp_methods = nullptr;
--      ssl_comp_methods = SSL_COMP_get_compression_methods();
-+      ssl_comp_methods = (STACK_OF(SSL_COMP) *)SSL_COMP_get_compression_methods();
-       n = sk_SSL_COMP_num(ssl_comp_methods);
-       DBUG_PRINT("info", ("Available compression methods:\n"));
-       if (n == 0)
-@@ -643,7 +644,7 @@ static int ssl_do(struct st_VioSSLFd *ptr, Vio *vio, l
-       else
-         for (j = 0; j < n; j++) {
-           SSL_COMP *c = sk_SSL_COMP_value(ssl_comp_methods, j);
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-           DBUG_PRINT("info", ("  %d: %s\n", c->id, c->name));
- #else  /* OPENSSL_VERSION_NUMBER < 0x10100000L */
-           DBUG_PRINT("info",
diff --git a/databases/mysql80-server/files/patch-vio_viosslfactories.cc b/databases/mysql80-server/files/patch-vio_viosslfactories.cc
deleted file mode 100644
index 6c0f821e8911..000000000000
--- a/databases/mysql80-server/files/patch-vio_viosslfactories.cc
+++ /dev/null
@@ -1,60 +0,0 @@
---- vio/viosslfactories.cc.orig	2019-09-20 08:30:51 UTC
-+++ vio/viosslfactories.cc
-@@ -40,6 +40,7 @@
- #include "vio/vio_priv.h"
- 
- #include <openssl/dh.h>
-+#include <openssl/crypto.h>
- 
- #if OPENSSL_VERSION_NUMBER < 0x10002000L
- #include <openssl/ec.h>
-@@ -472,6 +473,7 @@ void ssl_start() {
-   }
- }
- 
-+#ifndef LIBRESSL_VERSION_NUMBER
- /**
-   Set fips mode in openssl library,
-   When we set fips mode ON/STRICT, it will perform following operations:
-@@ -525,12 +527,13 @@ EXIT:
-   @returns openssl current fips mode
- */
- uint get_fips_mode() { return FIPS_mode(); }
-+#endif
- 
- long process_tls_version(const char *tls_version) {
-   const char *separator = ",";
-   char *token, *lasts = nullptr;
- 
--#ifdef HAVE_TLSv13
-+#if defined(HAVE_TLSv13) && !defined(LIBRESSL_VERSION_NUMBER)
-   const char *tls_version_name_list[] = {"TLSv1", "TLSv1.1", "TLSv1.2",
-                                          "TLSv1.3"};
-   const char ctx_flag_default[] = "TLSv1,TLSv1.1,TLSv1.2,TLSv1.3";
-@@ -609,7 +612,7 @@ static struct st_VioSSLFd *new_VioSSLFd(
-   ssl_ctx_options = (ssl_ctx_options | ssl_ctx_flags) &
-                     (SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3 | SSL_OP_NO_TLSv1 |
-                      SSL_OP_NO_TLSv1_1 | SSL_OP_NO_TLSv1_2
--#ifdef HAVE_TLSv13
-+#if defined(HAVE_TLSv13) && !defined(LIBRESSL_VERSION_NUMBER)
-                      | SSL_OP_NO_TLSv1_3
- #endif /* HAVE_TLSv13 */
-                      | SSL_OP_NO_TICKET);
-@@ -618,7 +621,7 @@ static struct st_VioSSLFd *new_VioSSLFd(
-     return nullptr;
- 
-   if (!(ssl_fd->ssl_context = SSL_CTX_new(is_client ?
--#ifdef HAVE_TLSv13
-+#if defined(HAVE_TLSv13) && !defined(LIBRESSL_VERSION_NUMBER)
-                                                     TLS_client_method()
-                                                     : TLS_server_method()
- #else  /* HAVE_TLSv13 */
-@@ -633,7 +636,7 @@ static struct st_VioSSLFd *new_VioSSLFd(
-     return nullptr;
-   }
- 
--#ifdef HAVE_TLSv13
-+#if defined(HAVE_TLSv13) && !defined(LIBRESSL_VERSION_NUMBER)
-   /*
-     Set OpenSSL TLS v1.3 ciphersuites.
-     Note that an empty list is permissible.
diff --git a/databases/mysql80-server/pkg-descr b/databases/mysql80-server/pkg-descr
index b23ead6c68a0..4893ba6f2444 100644
--- a/databases/mysql80-server/pkg-descr
+++ b/databases/mysql80-server/pkg-descr
@@ -10,6 +10,3 @@ The new features in MySQL 8.0. In addition to Data Dictionnary and CTEs are:
     Performance Schema, instrumenting data locks
     Performance Schema, instrumenting error messages
     Improved cost model with histograms
-
-
-WWW: https://www.mysql.com/
diff --git a/databases/mysql80-server/pkg-plist b/databases/mysql80-server/pkg-plist
index 880259841bf0..f9dbff562f49 100644
--- a/databases/mysql80-server/pkg-plist
+++ b/databases/mysql80-server/pkg-plist
@@ -6,7 +6,6 @@ bin/myisam_ftdump
 bin/myisamchk
 bin/myisamlog
 bin/myisampack
-bin/mysqldumpslow
 bin/mysql_client_test
 bin/mysql_keyring_encryption_test
 bin/mysql_secure_installation
@@ -15,6 +14,7 @@ bin/mysql_tzinfo_to_sql
 bin/mysql_upgrade
 bin/mysqld_multi
 bin/mysqld_safe
+bin/mysqldumpslow
 bin/mysqlrouter
 bin/mysqlrouter_keyring
 bin/mysqlrouter_passwd
@@ -31,6 +31,8 @@ lib/mysql/libmysqlharness_tls.so
 lib/mysql/libmysqlharness_tls.so.1
 lib/mysql/libmysqlrouter.so
 lib/mysql/libmysqlrouter.so.1
+lib/mysql/libmysqlrouter_connection_pool.so.1
+lib/mysql/libmysqlrouter_destination_status.so.1
 lib/mysql/libmysqlrouter_http.so
 lib/mysql/libmysqlrouter_http.so.1
 lib/mysql/libmysqlrouter_http_auth_backend.so
@@ -39,6 +41,11 @@ lib/mysql/libmysqlrouter_http_auth_realm.so
 lib/mysql/libmysqlrouter_http_auth_realm.so.1
 lib/mysql/libmysqlrouter_io_component.so
 lib/mysql/libmysqlrouter_io_component.so.1
+lib/mysql/libmysqlrouter_metadata_cache.so.1
+lib/mysql/libmysqlrouter_mysqlxmessages.so.1
+lib/mysql/libmysqlrouter_routing.so.1
+lib/mysql/mysqlrouter/connection_pool.so
+lib/mysql/mysqlrouter/destination_status.so
 lib/mysql/mysqlrouter/http_auth_backend.so
 lib/mysql/mysqlrouter/http_auth_realm.so
 lib/mysql/mysqlrouter/http_server.so
@@ -46,6 +53,7 @@ lib/mysql/mysqlrouter/io.so
 lib/mysql/mysqlrouter/keepalive.so
 lib/mysql/mysqlrouter/metadata_cache.so
 lib/mysql/mysqlrouter/rest_api.so
+lib/mysql/mysqlrouter/rest_connection_pool.so
 lib/mysql/mysqlrouter/rest_metadata_cache.so
 lib/mysql/mysqlrouter/rest_router.so
 lib/mysql/mysqlrouter/rest_routing.so
@@ -55,6 +63,7 @@ lib/mysql/mysqlrouter/routing.so
 lib/mysql/plugin/adt_null.so
 lib/mysql/plugin/auth.so
 lib/mysql/plugin/auth_test_plugin.so
+lib/mysql/plugin/conflicting_variables.so
 lib/mysql/plugin/component_audit_api_message_emit.so
 lib/mysql/plugin/component_example_component1.so
 lib/mysql/plugin/component_example_component2.so
@@ -74,11 +83,16 @@ lib/mysql/plugin/component_test_audit_api_message.so
 lib/mysql/plugin/component_test_backup_lock_service.so
 lib/mysql/plugin/component_test_component_deinit.so
 lib/mysql/plugin/component_test_host_application_signal.so
+lib/mysql/plugin/component_test_mysql_command_services.so
 lib/mysql/plugin/component_test_mysql_current_thread_reader.so
 lib/mysql/plugin/component_test_mysql_runtime_error.so
 lib/mysql/plugin/component_test_mysql_system_variable_set.so
+lib/mysql/plugin/component_test_mysql_thd_store_service.so
 lib/mysql/plugin/component_test_pfs_notification.so
 lib/mysql/plugin/component_test_pfs_resource_group.so
+lib/mysql/plugin/component_test_sensitive_system_variables.so
+lib/mysql/plugin/component_test_server_telemetry_traces.so
+lib/mysql/plugin/component_test_status_var_reader.so
 lib/mysql/plugin/component_test_status_var_service.so
 lib/mysql/plugin/component_test_status_var_service_int.so
 lib/mysql/plugin/component_test_status_var_service_reg_only.so
@@ -155,6 +169,7 @@ lib/mysql/plugin/semisync_replica.so
 lib/mysql/plugin/semisync_slave.so
 lib/mysql/plugin/semisync_source.so
 lib/mysql/plugin/test_security_context.so
+lib/mysql/plugin/test_services_command_services.so
 lib/mysql/plugin/test_services_host_application_signal.so
 lib/mysql/plugin/test_services_plugin_registry.so
 lib/mysql/plugin/udf_example.so
@@ -162,26 +177,29 @@ lib/mysql/plugin/keyring_udf.so
 lib/mysql/plugin/test_udf_services.so
 lib/mysql/plugin/validate_password.so
 lib/mysql/plugin/version_token.so
+lib/mysql/private/libprotobuf-lite.so.3.19.4
+lib/mysql/private/libprotobuf.so.3.19.4
+lib/mysql/libprotobuf-lite.so.3.19.4
 libexec/mysqld
-man/man1/ibd2sdi.1.gz
-man/man1/innochecksum.1.gz
-man/man1/my_print_defaults.1.gz
-man/man1/myisam_ftdump.1.gz
-man/man1/myisamchk.1.gz
-man/man1/myisamlog.1.gz
-man/man1/myisampack.1.gz
-man/man1/mysql_secure_installation.1.gz
-man/man1/mysql_ssl_rsa_setup.1.gz
-man/man1/mysql_tzinfo_to_sql.1.gz
-man/man1/mysql_upgrade.1.gz
-man/man1/mysql.server.1.gz
-man/man1/mysqld_multi.1.gz
-man/man1/mysqld_safe.1.gz
-man/man1/mysqldumpslow.1.gz
-man/man1/mysqlrouter_passwd.1.gz
-man/man1/mysqlrouter_plugin_info.1.gz
-man/man1/mysqlrouter.1.gz
-man/man8/mysqld.8.gz
+@comment share/man/man1/ibd2sdi.1.gz
+@comment share/man/man1/innochecksum.1.gz
+@comment share/man/man1/my_print_defaults.1.gz
+@comment share/man/man1/myisam_ftdump.1.gz
+@comment share/man/man1/myisamchk.1.gz
+@comment share/man/man1/myisamlog.1.gz
+@comment share/man/man1/myisampack.1.gz
+@comment share/man/man1/mysql_secure_installation.1.gz
+@comment share/man/man1/mysql_ssl_rsa_setup.1.gz
+@comment share/man/man1/mysql_tzinfo_to_sql.1.gz
+@comment share/man/man1/mysql_upgrade.1.gz
+@comment share/man/man1/mysql.server.1.gz
+@comment share/man/man1/mysqld_multi.1.gz
+@comment share/man/man1/mysqld_safe.1.gz
+@comment share/man/man1/mysqldumpslow.1.gz
+@comment share/man/man1/mysqlrouter_passwd.1.gz
+@comment share/man/man1/mysqlrouter_plugin_info.1.gz
+@comment share/man/man1/mysqlrouter.1.gz
+@comment share/man/man8/mysqld.8.gz
 %%DATADIR%%/bulgarian/errmsg.sys
 %%DATADIR%%/charsets/Index.xml
 %%DATADIR%%/charsets/README
diff --git a/databases/mysql81-client/Makefile b/databases/mysql81-client/Makefile
new file mode 100644
index 000000000000..398c1429a8d4
--- /dev/null
+++ b/databases/mysql81-client/Makefile
@@ -0,0 +1,47 @@
+PORTNAME=	mysql
+PORTREVISION=	0
+PKGNAMESUFFIX=	81-client
+
+COMMENT=	Multithreaded SQL database (client)
+
+LICENSE+=	LGPL21
+
+MASTERDIR=	${.CURDIR}/../mysql81-server
+
+PKGMESSAGE=	${.CURDIR}/pkg-message
+PATCHDIR=	${MASTERDIR}/files
+PLIST=		${.CURDIR}/pkg-plist
+
+CONFLICTS_INSTALL=	mysql8[1-9]-client \
+			mysql[0-79][0-9]-client \
+			mariadb[0-9][0-9]-client \
+			percona[0-9][0-9]-client
+
+CMAKE_ARGS+=	-DWITHOUT_SERVER=1 -DINSTALL_SUPPORTFILESDIR=0
+
+USE_LDCONFIG+=	${PREFIX}/lib/mysql
+
+MMAN1=		comp_err.1 lz4_decompress.1 mysql.1 mysql_config.1 mysql_config_editor.1 \
+		mysqladmin.1 mysqlbinlog.1 mysqlcheck.1 mysqldump.1 mysqlimport.1 mysqlman.1 \
+		mysqlpump.1 mysqlshow.1 mysqlslap.1 perror.1 zlib_decompress.1
+
+CLIENT_ONLY=	yes
+
+OPTIONS_GROUP+=	PLUGINS
+PLUGINS_DESC=	Default Client Plugins
+OPTIONS_GROUP_PLUGINS=	SASLCLIENT
+SASLCLIENT_DESC=	SASL client plugin module
+SASLCLIENT_CMAKE_BOOL=	WITH_AUTHENTICATION_LDAP
+SASLCLIENT_LIB_DEPENDS=	libsasl2.so:security/cyrus-sasl2
+SASLCLIENT_USES=		ldap
+
+OPTIONS_DEFAULT+=	SASLCLIENT
+OPTIONS_SUB=	yes
+
+post-install:
+	@${RM} -r ${STAGEDIR}${PREFIX}/lib/mysql/private
+	@${LN} -s libmysqlclient.a ${STAGEDIR}${PREFIX}/lib/mysql/libmysqlclient_r.a
+	@${LN} -s libmysqlclient.so ${STAGEDIR}${PREFIX}/lib/mysql/libmysqlclient_r.so
+	@${LN} -s libmysqlclient.so.22 ${STAGEDIR}${PREFIX}/lib/mysql/libmysqlclient_r.so.22
+
+.include "${MASTERDIR}/Makefile"
diff --git a/databases/mysql81-client/pkg-message b/databases/mysql81-client/pkg-message
new file mode 100644
index 000000000000..dbbd72fe1c67
--- /dev/null
+++ b/databases/mysql81-client/pkg-message
@@ -0,0 +1,8 @@
+[
+{ type: install
+  message: <<EOM
+This is the mysql CLIENT without the server.
+for complete server and client, please install databases/mysql80-server
+EOM
+}
+]
diff --git a/databases/mysql81-client/pkg-plist b/databases/mysql81-client/pkg-plist
new file mode 100644
index 000000000000..343d742a8e81
--- /dev/null
+++ b/databases/mysql81-client/pkg-plist
@@ -0,0 +1,40 @@
+bin/comp_err
+bin/my_print_defaults
+bin/mysql
+bin/mysql_config
+bin/mysql_config_editor
+bin/mysql_migrate_keyring
+bin/mysqladmin
+bin/mysqlbinlog
+bin/mysqlcheck
+bin/mysqldump
+bin/mysqlimport
+bin/mysqlpump
+bin/mysqlshow
+bin/mysqlslap
+bin/perror
+bin/zlib_decompress
+include/mysql/errmsg.h
+include/mysql/field_types.h
+include/mysql/my_command.h
+include/mysql/my_compress.h
+include/mysql/my_list.h
+include/mysql/mysql.h
+include/mysql/mysql/client_plugin.h
+include/mysql/mysql/plugin_auth_common.h
+include/mysql/mysql/udf_registration_types.h
+include/mysql/mysql_com.h
+include/mysql/mysql_time.h
+include/mysql/mysql_version.h
+include/mysql/mysqld_error.h
+lib/mysql/libmysqlclient.a
+lib/mysql/libmysqlclient.so
+lib/mysql/libmysqlclient.so.22
+lib/mysql/libmysqlclient_r.a
+lib/mysql/libmysqlclient_r.so
+lib/mysql/libmysqlclient_r.so.22
+lib/mysql/plugin/authentication_fido_client.so
+lib/mysql/plugin/authentication_ldap_sasl_client.so
+lib/mysql/plugin/authentication_oci_client.so
+libdata/pkgconfig/mysqlclient.pc
+share/aclocal/mysql.m4
diff --git a/databases/mysql81-server/Makefile b/databases/mysql81-server/Makefile
new file mode 100644
index 000000000000..8e1a1ab072de
--- /dev/null
+++ b/databases/mysql81-server/Makefile
@@ -0,0 +1,215 @@
+PORTNAME?=		mysql
+PORTVERSION=		8.1.0
+PORTREVISION?=		0
+CATEGORIES=		databases
+MASTER_SITES=		MYSQL/MySQL-8.1
+PKGNAMESUFFIX?=		81-server
+DISTNAME=		${PORTNAME}-boost-${PORTVERSION}${DISTVERSIONSUFFIX}
+
+MAINTAINER=		joneum@FreeBSD.org
+COMMENT?=		Multithreaded SQL database (server)
+WWW=		https://www.mysql.com/
+
+LICENSE=		GPLv2
+
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}${DISTVERSIONSUFFIX}
+
+SLAVEDIRS=	databases/mysql81-client
+USES=		bison:build cmake:noninja cpe groff:run libedit localbase \
+		ncurses perl5 pkgconfig shebangfix ssl
+
+CPE_VENDOR=	oracle
+
+USE_CXXSTD=	c++17
+USE_PERL5=	run
+
+MY_DBDIR=	/var/db/mysql
+MY_SECDIR=	/var/db/mysql_secure
+MY_TMPDIR=	/var/db/mysql_tmpdir
+
+LIB_DEPENDS+=	libcurl.so:ftp/curl \
+		libevent.so:devel/libevent \
+		libicutu.so:devel/icu \
+		liblz4.so:archivers/liblz4 \
+		libfido2.so:security/libfido2 \
+		libhidapi.so:comms/hidapi \
+		${LIB_DEPENDS_${ARCH}}
+LIB_DEPENDS_aarch64=	libunwind.so:devel/libunwind
+LIB_DEPENDS_amd64=	libunwind.so:devel/libunwind
+LIB_DEPENDS_armv7=	libunwind.so:devel/libunwind
+LIB_DEPENDS_i386=	libunwind.so:devel/libunwind
+LIB_DEPENDS_powerpc=		libunwind.so:devel/libunwind
+LIB_DEPENDS_powerpc64=		libunwind.so:devel/libunwind
+LIB_DEPENDS_powerpc64le=	libunwind.so:devel/libunwind
+
+BUILD_DEPENDS=	liblz4>0:archivers/liblz4 \
+		${BUILD_DEPENDS_${ARCH}}
+BUILD_DEPENDS_aarch64=	libunwind>0:devel/libunwind
+BUILD_DEPENDS_amd64=	libunwind>0:devel/libunwind
+BUILD_DEPENDS_armv7=	libunwind>0:devel/libunwind
+BUILD_DEPENDS_i386=	libunwind>0:devel/libunwind
+BUILD_DEPENDS_powerpc=	libunwind>0:devel/libunwind
+BUILD_DEPENDS_powerpc64=	libunwind>0:devel/libunwind
+BUILD_DEPENDS_powerpc64le=	libunwind>0:devel/libunwind
+
+CMAKE_BUILD_TYPE=	Release
+CFLAGS+=		-fPIC
+CFLAGS_aarch64?=	-march=armv8-a+crc+crypto
+
+CMAKE_ARGS+=	-DINSTALL_LAYOUT=FREEBSD \
+		-DINSTALL_LDCONFIGDIR="${LOCALBASE}/libdata/ldconfig" \
+		-DINSTALL_PKGCONFIGDIR="${LOCALBASE}/libdata/pkgconfig" \
+		-DINSTALL_DOCDIR="share/doc/mysql" \
+		-DINSTALL_DOCREADMEDIR="share/doc/mysql" \
+		-DINSTALL_INCLUDEDIR="include/mysql" \
+		-DINSTALL_INFODIR="${INFO_PATH}" \
+		-DINSTALL_LIBDIR="lib/mysql" \
+		-DINSTALL_PRIV_LIBDIR="lib/mysql/private" \
+		-DINSTALL_MANDIR="share/man" \
+		-DINSTALL_MYSQLDATADIR="${MY_DBDIR}" \
+		-DINSTALL_MYSQLKEYRINGDIR="etc/mysql/keyring" \
+		-DINSTALL_MYSQLSHAREDIR="share/mysql" \
+		-DINSTALL_MYSQLTESTDIR="" \
+		-DINSTALL_PLUGINDIR="lib/mysql/plugin" \
+		-DINSTALL_SBINDIR="libexec" \
+		-DINSTALL_SCRIPTDIR="bin" \
+		-DINSTALL_SECURE_FILE_PRIVDIR="${MY_SECDIR}" \
+		-DINSTALL_SHAREDIR="share" \
+		-DINSTALL_SUPPORTFILESDIR="share/mysql" \
+		-DMYSQL_KEYRINGDIR="${ETCDIR}/keyring" \
+		-DWITH_BOOST="${WRKSRC}/boost" \
+		-DWITH_SYSTEM_LIBS=1 \
+		-DWITH_EDITLINE=system \
+		-DWITH_LIBEVENT=system \
+		-DWITH_LZ4=system \
+		-DWITH_ICU=system \
+		-DWITH_CURL=system \
+		-DWITH_ZSTD=bundled \
+		-DWITH_PROTOBUF=bundled \
+		-DWITH_SSL=system \
+		-DWITH_AUTHENTICATION_FIDO=1 \
+		-DBUILD_BUNDLED_ZLIB=0 \
+		-DBUILD_BUNDLED_LZ4=0
+
+# The Mroonga, RocksDB, and TokuDB storage engines are disabled.
+# Mroonga is only buildable on little endian archs.
+# RocksDB is only buildable on little endian archs and requires POSIX timers.
+# TokuDB is only buildable on 64-bit little endian archs.
+CMAKE_ARGS+=	-DWITHOUT_MROONGA_STORAGE_ENGINE=1 \
+		-DWITHOUT_ROCKSDB_STORAGE_ENGINE=1 \
+		-DWITHOUT_TOKUDB_STORAGE_ENGINE=1
+
+SHEBANG_FILES=	scripts/*.pl* scripts/*.sh
+
+.ifdef USE_MYSQL
+IGNORE=		You have `USE_MYSQL' variable defined either in environment or in make(1) arguments. Please undefine and try again.
+.endif
+
+SUB_LIST=	MY_DBDIR=${MY_DBDIR} \
+		MY_SECDIR=${MY_SECDIR} \
+		MY_TMPDIR=${MY_TMPDIR}
+
+PLIST_SUB=	MY_DBDIR=${MY_DBDIR} \
+		MY_SECDIR=${MY_SECDIR} \
+		MY_TMPDIR=${MY_TMPDIR} \
+		MYSQL80_LIBVER=${MYSQL80_LIBVER}
+
+# MySQL-Server part
+.if !defined(CLIENT_ONLY)
+USES+=		mysql:81
+
+CONFLICTS_INSTALL=	mysql*-server \
+			mysqlwsrep*-server \
+			mariadb*-server \
+			percona*-server
+
+USE_RC_SUBR=	mysql-server
+
+SUB_FILES=	my.cnf.sample pkg-message
+
+USERS=		mysql
+GROUPS=		mysql
+
+USE_LDCONFIG+=	${PREFIX}/lib/mysql/plugin
+
+MMAN1=		ibd2sdi.1 innochecksum.1 my_print_defaults.1 myisam_ftdump.1 myisamchk.1 \
+		myisamlog.1 myisampack.1 mysql_secure_installation.1 mysql_ssl_rsa_setup.1 \
+		mysql_tzinfo_to_sql.1 mysql_upgrade.1 mysql.server.1 mysqldumpslow.1 mysqld_multi.1 \
+		mysqld_safe.1 mysqlrouter_passwd.1 mysqlrouter_plugin_info.1 mysqlrouter.1
+MMAN8=		mysqld.8
+
+CMAKE_ARGS+=	-DWITH_EMBEDDED_SERVER="ON"
+CMAKE_ARGS+=	-DWITHOUT_CLIENTLIBS="ON"
+# Disable unit tests, it fails on !amd64 and <13.0 due to c++17 rules
+CMAKE_ARGS+=	-DWITH_UNIT_TESTS="OFF"
+
+OPTIONS_GROUP=		STORAGE
+OPTIONS_GROUP_STORAGE=	ARCHIVE BLACKHOLE EXAMPLE FEDERATED INNOBASE PARTITION PERFSCHEMA
+OPTIONS_SUB=		YES
+STORAGE_DESC=		Permissible "Storage Engines" (to compile statically into the server)
+ARCHIVE_DESC=		Compile "Archive Storage" statically in server
+BLACKHOLE_DESC=		Compile "Blackhole Storage" statically in server
+EXAMPLE_DESC=		Compile "Example Storage" statically in server
+FEDERATED_DESC=		Compile "Federated Storage" statically in server
+INNOBASE_DESC=		Compile "InnoDB Storage" statically in server
+PARTITION_DESC=		Compile "Partitioning support Storage" statically in server
+PERFSCHEMA_DESC=	Compile "Performance Schema Storage" statically in server
+
+ARCHIVE_CMAKE_ON=	-DWITH_ARCHIVE_STORAGE_ENGINE=1
+BLACKHOLE_CMAKE_ON=	-DWITH_BLACKHOLE_STORAGE_ENGINE=1
+EXAMPLE_CMAKE_ON=	-DWITH_EXAMPLE_STORAGE_ENGINE=1
+FEDERATED_CMAKE_ON=	-DWITH_FEDERATED_STORAGE_ENGINE=1
+INNOBASE_CMAKE_ON=	-DWITH_INNOBASE_STORAGE_ENGINE=1
+PARTITION_CMAKE_ON=	-DWITH_PARTITION_STORAGE_ENGINE=1
+PERFSCHEMA_CMAKE_ON=	-DWITH_PERFSCHEMA_STORAGE_ENGINE=1
+
+OPTIONS_GROUP+=		FEATURES
+OPTIONS_GROUP_FEATURES=	PERFSCHM
+FEATURES_DESC=		Default features knobs
+PERFSCHM_DESC=		Enable "Performance Schema" by default (High RAM usage)
+OPTIONS_DEFAULT+=	PERFSCHM
+
+PERFSCHM_SUB_LIST+=		PERFSCHEMRC=""
+PERFSCHM_SUB_LIST_OFF+=		PERFSCHEMRC="--skip-performance-schema"
+FEDERATED_SUB_LIST+=		FEDER="--federated"
+FEDERATED_SUB_LIST_OFF+=	FEDER=""
+.endif
+
+.include <bsd.port.options.mk>
+
+# Since 8.0.20 release innodb engine uses new memory alligned allocator
+# which is broken on i386 due to different size of types and caused a
+# 'static_assert(alignof(T) <= alignof(std::max_align_t))' error
+.if ${ARCH} == i386
+CMAKE_ARGS+=	-DDISABLE_PSI_MEMORY=1
+SSP_UNSAFE=	yes
+.endif
+
+.if ${ARCH} == powerpc
+LDFLAGS+=	-latomic
+USES+=		compiler:gcc-c++11-lib
+.else
+USES+=		compiler:c++17-lang
+.endif
+
+.include <bsd.port.pre.mk>
+
+post-extract:
+	@${RM} -rv ${WRKSRC}/sql/sql_hints.yy.cc ${WRKSRC}/sql/sql_hints.yy.h
+
+# XXX MBi alignment issue
+.if ${ARCH} == i386
+EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-boost_boost__1__77__0_boost_move_detail_type__traits.hpp \
+	${PATCHDIR}/extra-patch-storage_innobase_log_log0recv.cc
+.endif
+
+.if !defined(CLIENT_ONLY)
+post-install:
+	${MKDIR} ${STAGEDIR}${ETCDIR}
+	${INSTALL_DATA} ${WRKDIR}/my.cnf.sample ${STAGEDIR}${ETCDIR}/my.cnf.sample
+	${MKDIR} ${STAGEDIR}${ETCDIR}/keyring
+	${MKDIR} ${STAGEDIR}${MY_SECDIR}
+	${MKDIR} ${STAGEDIR}${MY_TMPDIR}
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/databases/mysql81-server/distinfo b/databases/mysql81-server/distinfo
new file mode 100644
index 000000000000..13d3c57ad112
--- /dev/null
+++ b/databases/mysql81-server/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1695150470
+SHA256 (mysql-boost-8.1.0.tar.gz) = cb19648bc8719b9f6979924bfea806b278bd26b8d67740e5742c6f363f142188
+SIZE (mysql-boost-8.1.0.tar.gz) = 440038191
diff --git a/databases/mysql81-server/files/extra-patch-boost_boost__1__77__0_boost_move_detail_type__traits.hpp b/databases/mysql81-server/files/extra-patch-boost_boost__1__77__0_boost_move_detail_type__traits.hpp
new file mode 100644
index 000000000000..ee630b3a3655
--- /dev/null
+++ b/databases/mysql81-server/files/extra-patch-boost_boost__1__77__0_boost_move_detail_type__traits.hpp
@@ -0,0 +1,20 @@
+--- boost/boost_1_77_0/boost/move/detail/type_traits.hpp.orig	2021-08-05 09:42:11 UTC
++++ boost/boost_1_77_0/boost/move/detail/type_traits.hpp
+@@ -1104,7 +1104,7 @@ struct alignment_struct
+ typedef int (alignment_dummy::*member_ptr);
+ typedef int (alignment_dummy::*member_function_ptr)();
+ struct alignment_struct
+-{  long double dummy[4];  };
++{  double XXXdummy[4];  };
+ 
+ /////////////////////////////
+ //    max_align_t
+@@ -1122,7 +1122,7 @@ union max_align
+    float       float_;
+    double      double_;
+    void *      void_ptr_;
+-   long double long_double_[4];
++   double XXXlong_double_[4];
+    alignment_dummy *unknown_class_ptr_;
+    function_ptr function_ptr_;
+    member_function_ptr member_function_ptr_;
diff --git a/databases/mysql81-server/files/extra-patch-storage_innobase_log_log0recv.cc b/databases/mysql81-server/files/extra-patch-storage_innobase_log_log0recv.cc
new file mode 100644
index 000000000000..0a6d0d4ec0df
--- /dev/null
+++ b/databases/mysql81-server/files/extra-patch-storage_innobase_log_log0recv.cc
@@ -0,0 +1,11 @@
+--- storage/innobase/log/log0recv.cc.orig	2023-12-17 10:36:48 UTC
++++ storage/innobase/log/log0recv.cc
+@@ -3695,7 +3695,7 @@ static void recv_recovery_begin(log_t &log, const lsn_
+       than number of concurrent IOs we want to sustain. We should also keep in
+       mind that the limit for the deltas hashmap is not strictly enforced and
+       this number includes the not-well specified safety margin. */
+-      size_t{256} * srv_buf_pool_instances);
++      static_cast<unsigned int>(size_t{256} * srv_buf_pool_instances));
+   const size_t delta_hashmap_max_mem =
+       UNIV_PAGE_SIZE * (buf_pool_get_n_pages() - pages_to_be_kept_free);
+
diff --git a/databases/mysql81-server/files/my.cnf.sample.in b/databases/mysql81-server/files/my.cnf.sample.in
new file mode 100644
index 000000000000..3d1264c1bd61
--- /dev/null
+++ b/databases/mysql81-server/files/my.cnf.sample.in
@@ -0,0 +1,57 @@
+[client]
+port                            = 3306
+socket                          = /tmp/mysql.sock
+
+[mysql]
+prompt                          = \u@\h [\d]>\_
+no_auto_rehash
+
+[mysqld]
+user                            = mysql
+port                            = 3306
+socket                          = /tmp/mysql.sock
+bind-address                    = 127.0.0.1
+basedir                         = %%PREFIX%%
+datadir                         = %%MY_DBDIR%%
+tmpdir                          = %%MY_TMPDIR%%
+replica-load-tmpdir             = %%MY_TMPDIR%%
+secure-file-priv                = %%MY_SECDIR%%
+log-bin                         = mysql-bin
+log-output                      = TABLE
+relay-log-recovery              = 1
+slow-query-log                  = 1
+server-id                       = 1
+sync_binlog                     = 1
+sync_relay_log                  = 1
+binlog_cache_size               = 16M
+binlog_expire_logs_seconds      = 2592000
+default_password_lifetime       = 0
+enforce-gtid-consistency        = 1
+gtid-mode                       = ON
+safe-user-create                = 1
+lower_case_table_names          = 1
+explicit-defaults-for-timestamp = 1
+myisam-recover-options          = BACKUP,FORCE
+open_files_limit                = 32768
+table_open_cache                = 16384
+table_definition_cache          = 8192
+net_retry_count                 = 16384
+key_buffer_size                 = 256M
+max_allowed_packet              = 64M
+long_query_time                 = 0.5
+innodb_buffer_pool_size         = 1G
+innodb_data_home_dir            = %%MY_DBDIR%%
+innodb_log_group_home_dir       = %%MY_DBDIR%%
+innodb_data_file_path           = ibdata1:128M:autoextend
+innodb_temp_data_file_path      = ibtmp1:128M:autoextend
+innodb_flush_method             = O_DIRECT
+innodb_redo_log_capacity        = 512M
+innodb_log_buffer_size          = 16M
+innodb_write_io_threads         = 8
+innodb_read_io_threads          = 8
+innodb_autoinc_lock_mode        = 2
+
+[mysqldump]
+max_allowed_packet              = 256M
+quote_names
+quick
diff --git a/databases/mysql81-server/files/mysql-server.in b/databases/mysql81-server/files/mysql-server.in
new file mode 100644
index 000000000000..c79874df9f2c
--- /dev/null
+++ b/databases/mysql81-server/files/mysql-server.in
@@ -0,0 +1,78 @@
+#!/bin/sh
+
+# PROVIDE: mysql
+# REQUIRE: LOGIN
+# KEYWORD: shutdown
+
+#
+# Add the following line to /etc/rc.conf to enable mysql:
+# mysql_enable (bool):	Set to "NO" by default.
+#			Set it to "YES" to enable MySQL.
+# mysql_dbdir (str):	Default to "%%MY_DBDIR%%"
+#			Base database directory.
+# mysql_confdir (str):	Default to "%%ETCDIR%%"
+#			Base configuration directory.
+# mysql_optfile (str):	Server-specific option file.
+#			Set it in the rc.conf or default behaviour of
+#			`mysqld_safe` itself, will be picking
+#			${mysql_confdir}/my.cnf if it exists.
+# mysql_pidfile (str):	Custom PID file path and name.
+#			Default to "${mysql_dbdir}/${hostname}.pid".
+# mysql_args (str):	Custom additional arguments to be passed
+#			to mysqld_safe (default empty).
+#
+
+. /etc/rc.subr
+
+name="mysql"
+rcvar=mysql_enable
+
+load_rc_config $name
+
+: ${mysql_enable="NO"}
+: ${mysql_dbdir="%%MY_DBDIR%%"}
+: ${mysql_confdir="%%ETCDIR%%"}
+if [ -f "${mysql_confdir}/my.cnf" ]; then
+: ${mysql_optfile="${mysql_confdir}/my.cnf"}
+elif [ -f "${mysql_dbdir}/my.cnf" ]; then
+: ${mysql_optfile="${mysql_dbdir}/my.cnf"}
+fi
+if [ ! -z "${mysql_optfile}" ]; then
+mysql_extra="--defaults-extra-file=${mysql_optfile}"
+fi
+
+mysql_user="mysql"
+: ${hostname:=`/bin/hostname`}
+pidfile=${mysql_pidfile:-"${mysql_dbdir}/${hostname}.pid"}
+command="/usr/sbin/daemon"
+command_args="-c -f %%PREFIX%%/bin/mysqld_safe ${mysql_extra} --basedir=%%PREFIX%% --datadir=${mysql_dbdir} --pid-file=${pidfile} --user=${mysql_user} ${mysql_args} %%FEDER%% %%PERFSCHEMRC%%"
+procname="%%PREFIX%%/libexec/mysqld"
+start_precmd="${name}_prestart"
+start_postcmd="${name}_poststart"
+mysqld_init="${procname}"
+mysqld_init_args="${mysql_extra} --initialize-insecure --basedir=%%PREFIX%% --datadir=${mysql_dbdir} --user=${mysql_user}"
+
+mysql_create_auth_tables()
+{
+	eval $mysqld_init $mysqld_init_args >/dev/null 2>/dev/null
+}
+
+mysql_prestart()
+{
+	if [ ! -d "${mysql_dbdir}/mysql/." ]; then
+		mysql_create_auth_tables || return 1
+	fi
+	return 0
+}
+
+mysql_poststart()
+{
+	local timeout=15
+	while [ ! -f "${pidfile}" -a ${timeout} -gt 0 ]; do
+		timeout=$(( timeout - 1 ))
+		sleep 1
+	done
+	return 0
+}
+
+run_rc_command "$1"
diff --git a/databases/mysql81-server/files/patch-CMakeLists.txt b/databases/mysql81-server/files/patch-CMakeLists.txt
new file mode 100644
index 000000000000..a7c3d317d734
--- /dev/null
+++ b/databases/mysql81-server/files/patch-CMakeLists.txt
@@ -0,0 +1,95 @@
+--- CMakeLists.txt.orig	2023-06-21 07:52:10 UTC
++++ CMakeLists.txt
+@@ -1850,7 +1850,7 @@ IF(WITH_AUTHENTICATION_LDAP)
+ ENDIF()
+ 
+ IF(WITH_AUTHENTICATION_LDAP)
+-  IF(LINUX AND KNOWN_CUSTOM_LIBRARIES)
++  IF(LINUX OR FREEBSD AND KNOWN_CUSTOM_LIBRARIES)
+     # LDAP / SASL / KERBEROS / SSL must all be "system" or "custom", not a mix.
+     IF(WITH_LDAP STREQUAL "system" OR
+         WITH_SASL STREQUAL "system" OR
+@@ -1899,6 +1899,7 @@ ENDIF()
+   ENDIF()
+ ENDIF()
+ 
++IF(NOT WITHOUT_TOOLS)
+ # Add system/bundled editline.
+ MYSQL_CHECK_EDITLINE()
+ SET(EDITLINE_WARN_GIVEN)
+@@ -1909,7 +1910,9 @@ ENDIF()
+     "You can use -DWITH_EDITLINE=bundled instead."
+     )
+ ENDIF()
++ENDIF(NOT WITHOUT_TOOLS)
+ 
++IF(NOT WITHOUT_SERVER)
+ # Add libevent
+ MYSQL_CHECK_LIBEVENT()
+ UNSET(LIBEVENT_WARN_GIVEN)
+@@ -1920,6 +1923,7 @@ ENDIF()
+     "You can use -DWITH_LIBEVENT=bundled instead."
+     )
+ ENDIF()
++ENDIF(NOT WITHOUT_SERVER)
+ 
+ # Add lz4 library
+ MYSQL_CHECK_LZ4()
+@@ -2186,7 +2190,9 @@ ADD_DEPENDENCIES(clang_tidy_prerequisites GenError)
+ ADD_DEPENDENCIES(clang_tidy_prerequisites protobuf_generated_all)
+ ADD_DEPENDENCIES(clang_tidy_prerequisites GenError)
+ 
+-ADD_SUBDIRECTORY(include)
++IF(NOT WITHOUT_CLIENTLIBS)
++  ADD_SUBDIRECTORY(include)
++ENDIF(NOT WITHOUT_CLIENTLIBS)
+ ADD_SUBDIRECTORY(strings)
+ ADD_SUBDIRECTORY(vio)
+ ADD_SUBDIRECTORY(mysys)
+@@ -2232,12 +2238,15 @@ ENDIF()
+   ADD_SUBDIRECTORY(unittest/mytap/t)
+ ENDIF()
+ 
+-ADD_SUBDIRECTORY(client)
++IF(NOT WITHOUT_TOOLS)
++  ADD_SUBDIRECTORY(client)
++ENDIF(NOT WITHOUT_TOOLS)
++
+ ADD_SUBDIRECTORY(utilities)
+-ADD_SUBDIRECTORY(share)
+ ADD_SUBDIRECTORY(libservices)
+ 
+ IF(NOT WITHOUT_SERVER)
++  ADD_SUBDIRECTORY(share)
+   ADD_SUBDIRECTORY(testclients)
+   ADD_SUBDIRECTORY(sql)
+ ENDIF()
+@@ -2300,11 +2309,11 @@ ADD_SUBDIRECTORY(scripts)
+ # scripts/mysql_config depends on client and server targets loaded above.
+ # It is referenced by some of the directories below, so we insert it here.
+ ADD_SUBDIRECTORY(scripts)
++ADD_SUBDIRECTORY(support-files)
+ 
+ IF(NOT WITHOUT_SERVER)
+   ADD_SUBDIRECTORY(mysql-test)
+   ADD_SUBDIRECTORY(mysql-test/lib/My/SafeProcess)
+-  ADD_SUBDIRECTORY(support-files)
+   IF(WITH_INTERNAL)
+     ADD_SUBDIRECTORY(internal)
+   ENDIF()
+@@ -2331,6 +2340,7 @@ ENDIF()
+   INCLUDE(fastcov)
+ ENDIF()
+ 
++IF(FALSE)
+ IF(UNIX)
+   ADD_SUBDIRECTORY(man)
+ ENDIF()
+@@ -2530,6 +2540,7 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM")
+     PATTERN "sp-imp-spec.txt" EXCLUDE
+     PATTERN "README.build" EXCLUDE
+   )
++ENDIF()
+ ENDIF()
+ 
+ # Now that we're done with all ADD_SUBDIRECTORY and thus all feature tests,
diff --git a/databases/mysql81-server/files/patch-client_CMakeLists.txt b/databases/mysql81-server/files/patch-client_CMakeLists.txt
new file mode 100644
index 000000000000..55269b16ec3f
--- /dev/null
+++ b/databases/mysql81-server/files/patch-client_CMakeLists.txt
@@ -0,0 +1,70 @@
+--- client/CMakeLists.txt.orig	2023-06-21 07:52:10 UTC
++++ client/CMakeLists.txt
+@@ -28,10 +28,13 @@ ADD_SUBDIRECTORY(base)
+ ## Subdirectory with common client code.
+ ADD_SUBDIRECTORY(base)
+ ## Subdirectory for mysqlpump code.
++IF(WITHOUT_SERVER)
+ ADD_SUBDIRECTORY(dump)
+ ## Subdirectory for mysql_migrate_keyring code.
+ ADD_SUBDIRECTORY(migrate_keyring)
++ENDIF()
+ 
++IF(NOT WITHOUT_CLIENTLIBS)
+ INCLUDE_DIRECTORIES(
+   ${CMAKE_CURRENT_SOURCE_DIR}/include
+ )
+@@ -47,6 +50,7 @@ MYSQL_ADD_EXECUTABLE(mysql
+   ${CMAKE_CURRENT_SOURCE_DIR}/common/user_registration.cc
+   LINK_LIBRARIES mysqlclient client_base ${EDITLINE_LIBRARY}
+   )
++ENDIF()
+ 
+ IF(NOT WITHOUT_SERVER)
+   MYSQL_ADD_EXECUTABLE(mysql_upgrade
+@@ -55,6 +59,7 @@ ENDIF()
+     )
+ ENDIF()
+ 
++IF(NOT WITHOUT_SERVER)
+ MYSQL_ADD_EXECUTABLE(mysqltest
+   mysqltest.cc
+   mysqltest/error_names.cc
+@@ -71,6 +76,9 @@ MYSQL_ADD_EXECUTABLE(mysqltest
+   ENABLE_EXPORTS
+   LINK_LIBRARIES mysqlclient
+   )
++ENDIF()
++
++IF(WITHOUT_SERVER)
+ MYSQL_ADD_EXECUTABLE(mysqlcheck
+   check/mysqlcheck.cc
+   check/mysqlcheck_core.cc
+@@ -275,7 +283,9 @@ TARGET_INCLUDE_DIRECTORIES(mysqlbinlog PRIVATE ${CMAKE
+ 
+ TARGET_COMPILE_DEFINITIONS(mysqlbinlog PRIVATE DISABLE_PSI_MUTEX)
+ TARGET_INCLUDE_DIRECTORIES(mysqlbinlog PRIVATE ${CMAKE_SOURCE_DIR}/sql)
++ENDIF()
+ 
++IF(WITHOUT_SERVER)
+ MYSQL_ADD_EXECUTABLE(mysqladmin
+   mysqladmin.cc
+   multi_factor_passwordopt-vars.cc
+@@ -290,6 +300,9 @@ MYSQL_ADD_EXECUTABLE(mysql_config_editor
+   mysql_config_editor.cc
+   LINK_LIBRARIES mysqlclient
+   )
++ENDIF()
++
++IF(NOT WITHOUT_SERVER)
+ MYSQL_ADD_EXECUTABLE(mysql_secure_installation
+   mysql_secure_installation.cc
+   LINK_LIBRARIES mysqlclient
+@@ -300,6 +313,7 @@ MYSQL_ADD_EXECUTABLE(mysql_ssl_rsa_setup
+   path.cc
+   LINK_LIBRARIES mysys
+   )
++ENDIF()
+ 
+ # "WIN32" also covers 64 bit. "echo" is used in some files below "mysql-test/".
+ IF(WIN32)
diff --git a/databases/mysql81-server/files/patch-cmake_install__layout.cmake b/databases/mysql81-server/files/patch-cmake_install__layout.cmake
new file mode 100644
index 000000000000..ca0779443e0d
--- /dev/null
+++ b/databases/mysql81-server/files/patch-cmake_install__layout.cmake
@@ -0,0 +1,95 @@
+--- cmake/install_layout.cmake.orig	2023-06-21 07:52:10 UTC
++++ cmake/install_layout.cmake
+@@ -41,6 +41,10 @@
+ #    Build with prefix=/usr/local/mysql, create tarball with install prefix="."
+ #    and relative links.
+ #
++#  FREEBSD
++#    Build with prefix=/usr/local, create tarball with install prefix="."
++#    and relative links.
++#
+ # To force a directory layout, use -DINSTALL_LAYOUT=<layout>.
+ #
+ # The default is STANDALONE.
+@@ -80,7 +84,7 @@ SET(INSTALL_LAYOUT "${DEFAULT_INSTALL_LAYOUT}"
+ ENDIF()
+ 
+ SET(INSTALL_LAYOUT "${DEFAULT_INSTALL_LAYOUT}"
+-  CACHE STRING "Installation directory layout. Options are: TARGZ (as in tar.gz installer), STANDALONE, RPM, DEB, SVR4"
++  CACHE STRING "Installation directory layout. Options are: TARGZ (as in tar.gz installer), STANDALONE, FREEBSD, RPM, DEB, SVR4"
+   )
+ 
+ IF(UNIX)
+@@ -98,7 +102,7 @@ IF(UNIX)
+       CACHE PATH "install prefix" FORCE)
+   ENDIF()
+   SET(VALID_INSTALL_LAYOUTS
+-    "RPM" "DEB" "SVR4" "TARGZ" "STANDALONE")
++    "RPM" "DEB" "SVR4" "TARGZ" "FREEBSD" "STANDALONE")
+   LIST(FIND VALID_INSTALL_LAYOUTS "${INSTALL_LAYOUT}" ind)
+   IF(ind EQUAL -1)
+     MESSAGE(FATAL_ERROR "Invalid INSTALL_LAYOUT parameter:${INSTALL_LAYOUT}."
+@@ -167,6 +171,32 @@ SET(INSTALL_SECURE_FILE_PRIVDIR_STANDALONE ${secure_fi
+ SET(INSTALL_SECURE_FILE_PRIVDIR_STANDALONE ${secure_file_priv_path})
+ 
+ #
++# FREEBSD layout
++#
++SET(INSTALL_BINDIR_FREEBSD           "bin")
++SET(INSTALL_SBINDIR_FREEBSD          "bin")
++#
++SET(INSTALL_LIBDIR_FREEBSD           "lib")
++SET(INSTALL_PRIV_LIBDIR_FREEBSD      "lib/private")
++SET(INSTALL_PLUGINDIR_FREEBSD        "lib/plugin")
++#
++SET(INSTALL_INCLUDEDIR_FREEBSD       "include")
++#
++SET(INSTALL_DOCDIR_FREEBSD           "docs")
++SET(INSTALL_DOCREADMEDIR_FREEBSD     ".")
++SET(INSTALL_MANDIR_FREEBSD           "man")
++SET(INSTALL_INFODIR_FREEBSD          "docs")
++#
++SET(INSTALL_SHAREDIR_FREEBSD         "share")
++SET(INSTALL_MYSQLSHAREDIR_FREEBSD    "share")
++SET(INSTALL_MYSQLTESTDIR_FREEBSD     "mysql-test")
++SET(INSTALL_SUPPORTFILESDIR_FREEBSD  "support-files")
++#
++SET(INSTALL_MYSQLDATADIR_FREEBSD     "data")
++SET(INSTALL_MYSQLKEYRINGDIR_FREEBSD  "keyring")
++SET(INSTALL_SECURE_FILE_PRIVDIR_FREEBSD ${secure_file_priv_path})
++
++#
+ # TARGZ layout
+ #
+ SET(INSTALL_BINDIR_TARGZ           "bin")
+@@ -361,7 +391,7 @@ SET(ROUTER_INSTALL_LAYOUT "${DEFAULT_ROUTER_INSTALL_LA
+ SET(ROUTER_INSTALL_LAYOUT "${DEFAULT_ROUTER_INSTALL_LAYOUT}"
+   CACHE
+   STRING
+-  "Installation directory layout. Options are: STANDALONE RPM DEB SVR4 TARGZ")
++  "Installation directory layout. Options are: STANDALONE FREEBSD RPM DEB SVR4 TARGZ")
+ 
+ # If we are shared STANDALONE with the the server, we shouldn't write
+ # into the server's data/ as that would create a "schemadir" in
+@@ -405,6 +435,21 @@ ENDFOREACH()
+     )
+   SET(ROUTER_INSTALL_${var}DIR_TARGZ ${ROUTER_INSTALL_${var}DIR_STANDALONE})
+ ENDFOREACH()
++
++#
++# FreeBSD layout
++#
++SET(ROUTER_INSTALL_CONFIGDIR_FREEBSD  "/usr/local/etc/mysqlrouter")
++SET(ROUTER_INSTALL_DATADIR_FREEBSD    "/var/db/mysqlrouter")
++SET(ROUTER_INSTALL_LOGDIR_FREEBSD     "/var/log/mysqlrouter")
++SET(ROUTER_INSTALL_RUNTIMEDIR_FREEBSD "/var/run/mysqlrouter")
++
++SET(ROUTER_INSTALL_BINDIR_FREEBSD     "bin")
++SET(ROUTER_INSTALL_LIBDIR_FREEBSD     "lib/mysql")
++SET(ROUTER_INSTALL_PLUGINDIR_FREEBSD  "lib/mysql/mysqlrouter")
++SET(ROUTER_INSTALL_LOGROTATEDIR_FREEBSD "etc/logrotate.d")
++SET(ROUTER_INSTALL_LOGROTATEFILE_FREEBSD "mysqlrouter")
++SET(ROUTER_INSTALL_DOCDIR_FREEBSD     "share/mysqlrouter/docs")
+ 
+ FOREACH(var
+     LOGROTATE
diff --git a/databases/mysql57-client/files/patch-cmake_os_DragonFly.cmake b/databases/mysql81-server/files/patch-cmake_os_DragonFly.cmake
index 83c154ee3bcf..83c154ee3bcf 100644
--- a/databases/mysql57-client/files/patch-cmake_os_DragonFly.cmake
+++ b/databases/mysql81-server/files/patch-cmake_os_DragonFly.cmake
diff --git a/databases/mysql81-server/files/patch-cmake_os_FreeBSD.cmake b/databases/mysql81-server/files/patch-cmake_os_FreeBSD.cmake
new file mode 100644
index 000000000000..90629de01287
--- /dev/null
+++ b/databases/mysql81-server/files/patch-cmake_os_FreeBSD.cmake
@@ -0,0 +1,25 @@
+--- cmake/os/FreeBSD.cmake.orig	2021-12-17 16:07:27 UTC
++++ cmake/os/FreeBSD.cmake
+@@ -48,8 +48,20 @@ IF(NOT FORCE_UNSUPPORTED_COMPILER)
+     IF(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 7.1)
+       MESSAGE(FATAL_ERROR "GCC 7.1 or newer is required")
+     ENDIF()
+-  ELSE()
+-    MESSAGE(FATAL_ERROR "Unsupported compiler!")
++    CHECK_C_SOURCE_RUNS("
++      int main()
++      {
++        return (__clang_major__ >= 4);
++      }" I386_ATOMIC_BUILTINS)
++    IF((CMAKE_SYSTEM_PROCESSOR MATCHES "i386") AND (NOT I386_ATOMIC_BUILTINS))
++      SET(HAVE_GCC_ATOMIC_BUILTINS CACHE  INTERNAL "")
++    ENDIF()
++  ELSEIF(CMAKE_COMPILER_IS_GNUCC)
++    EXECUTE_PROCESS(COMMAND ${CMAKE_C_COMPILER} -dumpversion
++                    OUTPUT_VARIABLE GCC_VERSION)
++    IF(GCC_VERSION VERSION_LESS 4.4)
++      MESSAGE(FATAL_ERROR "GCC 4.4 or newer is required!")
++    ENDIF()
+   ENDIF()
+ ENDIF()
+ 
diff --git a/databases/mysql81-server/files/patch-cmake_plugin.cmake b/databases/mysql81-server/files/patch-cmake_plugin.cmake
new file mode 100644
index 000000000000..15406bae9ec0
--- /dev/null
+++ b/databases/mysql81-server/files/patch-cmake_plugin.cmake
@@ -0,0 +1,27 @@
+--- cmake/plugin.cmake.orig	2023-06-21 07:52:10 UTC
++++ cmake/plugin.cmake
+@@ -273,15 +273,15 @@ MACRO(MYSQL_ADD_PLUGIN plugin_arg)
+ 
+       # For testing purposes, we need
+       # <...>/lib/plugin/debug/authentication_ldap_sasl_client.so
+-      IF(ARG_CLIENT_ONLY)
+-        INSTALL_DEBUG_TARGET(${target}
+-          DESTINATION ${INSTALL_PLUGINDIR}/debug
+-          COMPONENT Test)
+-      ELSE()
+-        INSTALL_DEBUG_TARGET(${target}
+-          DESTINATION ${INSTALL_PLUGINDIR}/debug
+-          COMPONENT ${INSTALL_COMPONENT})
+-      ENDIF()
++#      IF(ARG_CLIENT_ONLY)
++#        INSTALL_DEBUG_TARGET(${target}
++#          DESTINATION ${INSTALL_PLUGINDIR}/debug
++#          COMPONENT Test)
++#      ELSE()
++#        INSTALL_DEBUG_TARGET(${target}
++#          DESTINATION ${INSTALL_PLUGINDIR}/debug
++#          COMPONENT ${INSTALL_COMPONENT})
++#      ENDIF()
+     ENDIF()
+   ELSE()
+     IF(WITHOUT_${plugin})
diff --git a/databases/mysql81-server/files/patch-cmake_ssl.cmake b/databases/mysql81-server/files/patch-cmake_ssl.cmake
new file mode 100644
index 000000000000..e7688d6e50ad
--- /dev/null
+++ b/databases/mysql81-server/files/patch-cmake_ssl.cmake
@@ -0,0 +1,23 @@
+--- cmake/ssl.cmake.orig	2022-07-06 21:36:34 UTC
++++ cmake/ssl.cmake
+@@ -142,7 +142,7 @@ MACRO(FIND_OPENSSL_VERSION)
+     # Encoded as MNNFFPPS: major minor fix patch status
+     FILE(STRINGS "${OPENSSL_INCLUDE_DIR}/openssl/opensslv.h"
+       OPENSSL_VERSION_NUMBER
+-      REGEX "^#[ ]*define[\t ]+OPENSSL_VERSION_NUMBER[\t ]+0x[0-9].*"
++      REGEX "^#[\t ]*define[\t ]+OPENSSL_VERSION_NUMBER[\t ]+0x[0-9].*"
+       )
+     STRING(REGEX REPLACE
+       "^.*OPENSSL_VERSION_NUMBER[\t ]+0x([0-9]).*$" "\\1"
+@@ -380,8 +380,9 @@ MACRO (MYSQL_CHECK_SSL)
+         "Not a supported openssl version in WITH_SSL=${WITH_SSL}.")
+     ENDIF()
+ 
+-    IF("${OPENSSL_MAJOR_MINOR_FIX_VERSION}" VERSION_GREATER "1.1.0")
+-       ADD_DEFINITIONS(-DHAVE_TLSv13)
++    CHECK_SYMBOL_EXISTS(TLS1_3_VERSION "openssl/tls1.h" HAVE_TLS1_3_VERSION)
++    IF(HAVE_TLS1_3_VERSION)
++       #ADD_DEFINITIONS(-DHAVE_TLSv13)
+     ENDIF()
+ 
+     IF(OPENSSL_INCLUDE_DIR AND
diff --git a/databases/mysql81-server/files/patch-include_my__compare.h b/databases/mysql81-server/files/patch-include_my__compare.h
new file mode 100644
index 000000000000..83e2c6f371ca
--- /dev/null
+++ b/databases/mysql81-server/files/patch-include_my__compare.h
@@ -0,0 +1,11 @@
+--- include/my_compare.h.orig	2019-09-20 08:30:51 UTC
++++ include/my_compare.h
+@@ -49,7 +49,7 @@
+   But beware the dependency of MI_MAX_POSSIBLE_KEY_BUFF and HA_MAX_KEY_LENGTH.
+ */
+ 
+-#define HA_MAX_KEY_LENGTH 1000 /* Max length in bytes */
++#define HA_MAX_KEY_LENGTH 4000 /* Max length in bytes */
+ #define HA_MAX_KEY_SEG 16      /* Max segments for key */
+ 
+ #define HA_MAX_POSSIBLE_KEY_BUFF (HA_MAX_KEY_LENGTH + 24 + 6 + 6)
diff --git a/databases/mysql81-server/files/patch-include_my__stacktrace.h b/databases/mysql81-server/files/patch-include_my__stacktrace.h
new file mode 100644
index 000000000000..1654014bd77b
--- /dev/null
+++ b/databases/mysql81-server/files/patch-include_my__stacktrace.h
@@ -0,0 +1,11 @@
+--- include/my_stacktrace.h.orig	2021-12-17 16:07:27 UTC
++++ include/my_stacktrace.h
+@@ -43,7 +43,7 @@
+   HAVE_BACKTRACE - Linux, FreeBSD, OSX, Solaris
+   _WIN32 - Windows
+ */
+-#if defined(HAVE_BACKTRACE) || defined(_WIN32)
++#if (defined(HAVE_BACKTRACE) || defined(_WIN32)) && (defined(__aarch64__) || defined(__amd64__) || defined(__i386__))
+ #define HAVE_STACKTRACE 1
+ void my_init_stacktrace();
+ void my_print_stacktrace(const uchar *stack_bottom, ulong thread_stack);
diff --git a/databases/mysql81-server/files/patch-include_my__thread__os__id.h b/databases/mysql81-server/files/patch-include_my__thread__os__id.h
new file mode 100644
index 000000000000..56af9be42579
--- /dev/null
+++ b/databases/mysql81-server/files/patch-include_my__thread__os__id.h
@@ -0,0 +1,15 @@
+--- include/my_thread_os_id.h.orig	2019-09-20 08:30:51 UTC
++++ include/my_thread_os_id.h
+@@ -84,8 +84,12 @@ static inline my_thread_os_id_t my_thread_os_id() {
+   return pthread_getthreadid_np();
+ #else
+ #ifdef HAVE_INTEGER_PTHREAD_SELF
++#  ifdef __DragonFly__
++  return syscall(SYS_lwp_gettid);
++#  else
+   /* Unknown platform, fallback. */
+   return pthread_self();
++#  endif
+ #else
+   /* Feature not available. */
+   return 0;
diff --git a/databases/mysql81-server/files/patch-include_myisam.h b/databases/mysql81-server/files/patch-include_myisam.h
new file mode 100644
index 000000000000..d47119576543
--- /dev/null
+++ b/databases/mysql81-server/files/patch-include_myisam.h
@@ -0,0 +1,11 @@
+--- include/myisam.h.orig	2023-06-21 07:52:10 UTC
++++ include/myisam.h
+@@ -59,7 +59,7 @@
+   The following defines can be increased if necessary.
+   But beware the dependency of MI_MAX_POSSIBLE_KEY_BUFF and MI_MAX_KEY_LENGTH.
+ */
+-#define MI_MAX_KEY_LENGTH 1000 /* Max length in bytes */
++#define MI_MAX_KEY_LENGTH 4000 /* Max length in bytes */
+ #define MI_MAX_KEY_SEG 16      /* Max segments for key */
+ 
+ #define MI_MAX_KEY_BUFF (MI_MAX_KEY_LENGTH + MI_MAX_KEY_SEG * 6 + 8 + 8)
diff --git a/databases/mysql81-server/files/patch-libmysql_CMakeLists.txt b/databases/mysql81-server/files/patch-libmysql_CMakeLists.txt
new file mode 100644
index 000000000000..453e0f37652f
--- /dev/null
+++ b/databases/mysql81-server/files/patch-libmysql_CMakeLists.txt
@@ -0,0 +1,68 @@
+--- libmysql/CMakeLists.txt.orig	2023-06-21 07:52:10 UTC
++++ libmysql/CMakeLists.txt
+@@ -206,6 +206,11 @@ ENDIF()
+   )
+ ENDIF()
+ 
++INCLUDE(${MYSQL_CMAKE_SCRIPT_DIR}/compile_flags.cmake)
++IF (CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
++  ADD_COMPILE_FLAGS(${CLIENT_SOURCES} COMPILE_FLAGS "-fPIC")
++ENDIF()
++
+ #
+ # Include protocol tracing infrastructure and the test
+ # trace plugin if enabled by build options.
+@@ -282,8 +287,15 @@ ENDIF()
+   LIST(APPEND LIBS_TO_MERGE auth_win_client)
+ ENDIF()
+ 
+-# LDAP authentication SASL client plug-in
+-ADD_SUBDIRECTORY(authentication_ldap)
++IF(WITHOUT_CLIENTLIBS)
++  # Merge several convenience libraries into one big mysqlclient
++  MERGE_CONVENIENCE_LIBRARIES(mysqlclient ${LIBS_TO_MERGE}
++  COMPONENT Development
++  SKIP_INSTALL)
++ELSE(WITHOUT_CLIENTLIBS)
++  # LDAP authentication SASL client plugin
++  MESSAGE(STATUS "Creating LDAP authentication SASL client library.")
++  ADD_SUBDIRECTORY(authentication_ldap)
+ 
+ # FIDO authentication client plugin
+ ADD_SUBDIRECTORY(authentication_fido)
+@@ -299,6 +311,7 @@ MERGE_CONVENIENCE_LIBRARIES(mysqlclient ${LIBS_TO_MERG
+   COMPONENT Development
+   LINK_LIBRARIES ${LIBS_TO_LINK}
+   )
++ENDIF(WITHOUT_CLIENTLIBS)
+ 
+ # Visual Studio users need debug  static library for debug projects
+ IF(MSVC)
+@@ -345,17 +358,27 @@ ENDIF()
+ 
+ # Merge several convenience libraries into one big mysqlclient
+ # and link them together into shared library.
++IF(WITHOUT_CLIENTLIBS)
+ MERGE_LIBRARIES_SHARED(libmysql ${LIBS_TO_MERGE}
+   EXPORTS
+   ${CLIENT_API_FUNCTIONS}
+   ${CLIENT_API_FUNCTIONS_UNDOCUMENTED}
+   ${CLIENT_API_NONBLOCKING_FUNCTIONS}
+   COMPONENT SharedLibraries
++  SKIP_INSTALL )
++ELSE(WITHOUT_CLIENTLIBS)
++MERGE_LIBRARIES_SHARED(libmysql ${LIBS_TO_MERGE}
++  EXPORTS
++  ${CLIENT_API_FUNCTIONS}
++  ${CLIENT_API_FUNCTIONS_UNDOCUMENTED}
++  ${CLIENT_API_NONBLOCKING_FUNCTIONS}
++  COMPONENT SharedLibraries
+   LINK_LIBRARIES ${LIBS_TO_LINK}
+   ${UNIX_OUTPUT_NAME}
+   ${UNIX_SOVERSION}
+   ${UNIX_VERSION}
+   )
++ENDIF(WITHOUT_CLIENTLIBS)
+ 
+ # Downgrade warning for strncat in my_crypt_genhash.
+ IF((WITH_LTO OR CMAKE_COMPILER_FLAG_WITH_LTO) AND MY_COMPILER_IS_GNU)
diff --git a/databases/mysql81-server/files/patch-libservices_CMakeLists.txt b/databases/mysql81-server/files/patch-libservices_CMakeLists.txt
new file mode 100644
index 000000000000..95610f261f3a
--- /dev/null
+++ b/databases/mysql81-server/files/patch-libservices_CMakeLists.txt
@@ -0,0 +1,12 @@
+--- libservices/CMakeLists.txt.orig	2021-12-17 16:07:27 UTC
++++ libservices/CMakeLists.txt
+@@ -47,7 +47,9 @@ SET(MYSQLSERVICES_SOURCES
+   plugin_registry_service.c)
+ 
+ ADD_LIBRARY(mysqlservices STATIC ${MYSQLSERVICES_SOURCES})
++IF(FALSE)
+ IF(INSTALL_STATIC_LIBRARIES)
+   INSTALL(TARGETS mysqlservices
+     DESTINATION ${INSTALL_LIBDIR} COMPONENT Development)
++ENDIF()
+ ENDIF()
diff --git a/databases/mysql81-server/files/patch-man_CMakeLists.txt b/databases/mysql81-server/files/patch-man_CMakeLists.txt
new file mode 100644
index 000000000000..eed2755a9e5d
--- /dev/null
+++ b/databases/mysql81-server/files/patch-man_CMakeLists.txt
@@ -0,0 +1,76 @@
+--- man/CMakeLists.txt.orig	2023-06-21 07:52:10 UTC
++++ man/CMakeLists.txt
+@@ -23,26 +23,14 @@ SET(MAN1
+ # Copy man pages
+ SET(MAN1
+   comp_err.1
+-  ibd2sdi.1
+-  innochecksum.1
+   lz4_decompress.1
+-  my_print_defaults.1
+-  myisam_ftdump.1
+-  myisamchk.1
+-  myisamlog.1
+-  myisampack.1
+   mysql.1
+   mysql_config.1
+   mysql_config_editor.1
+-  mysql_secure_installation.1
+-  mysql_ssl_rsa_setup.1
+-  mysql_tzinfo_to_sql.1
+-  mysql_upgrade.1
+   mysqladmin.1
+   mysqlbinlog.1
+   mysqlcheck.1
+   mysqldump.1
+-  mysqldumpslow.1
+   mysqlimport.1
+   mysqlman.1
+   mysqlpump.1
+@@ -52,13 +40,23 @@ SET(MAN1
+   zlib_decompress.1
+   )
+ 
+-IF(NOT WITH_SYSTEMD)
+-  LIST(APPEND MAN1
+-    mysql.server.1
+-    mysqld_multi.1
+-    mysqld_safe.1
++SET(MAN1_TOOLS
++  ibd2sdi.1
++  innochecksum.1
++  my_print_defaults.1
++  myisam_ftdump.1
++  myisamchk.1
++  myisamlog.1
++  myisampack.1
++  mysql.server.1
++  mysql_secure_installation.1
++  mysql_ssl_rsa_setup.1
++  mysql_tzinfo_to_sql.1
++  mysql_upgrade.1
++  mysqldumpslow.1
++  mysqld_multi.1
++  mysqld_safe.1
+   )
+-ENDIF()
+ 
+ SET(MAN1_NDB
+   ndb_blob_tool.1
+@@ -105,8 +103,14 @@ SET(MAN8_NDB
+   ndbmtd.8
+ )
+ 
+-INSTALL(FILES ${MAN1} DESTINATION ${INSTALL_MANDIR}/man1 COMPONENT ManPages)
+-INSTALL(FILES ${MAN8} DESTINATION ${INSTALL_MANDIR}/man8 COMPONENT ManPages)
++IF(NOT WITHOUT_CLIENTLIBS)
++    INSTALL(FILES ${MAN1} DESTINATION ${INSTALL_MANDIR}/man1 COMPONENT ManPages)
++ENDIF()
++
++IF(NOT WITHOUT_SERVER)
++    INSTALL(FILES ${MAN1_TOOLS} DESTINATION ${INSTALL_MANDIR}/man1 COMPONENT ManPages)
++    INSTALL(FILES ${MAN8} DESTINATION ${INSTALL_MANDIR}/man8 COMPONENT ManPages)
++ENDIF()
+ 
+ IF(WITH_ROUTER)
+   INSTALL(FILES ${MAN1_ROUTER}
diff --git a/databases/mysql81-server/files/patch-mysys_my__default.cc b/databases/mysql81-server/files/patch-mysys_my__default.cc
new file mode 100644
index 000000000000..eba6ce293b1f
--- /dev/null
+++ b/databases/mysql81-server/files/patch-mysys_my__default.cc
@@ -0,0 +1,62 @@
+--- mysys/my_default.cc.orig	2023-06-21 07:52:10 UTC
++++ mysys/my_default.cc
+@@ -207,7 +207,7 @@ bool no_defaults = false;
+ 
+ /* Which directories are searched for options (and in which order) */
+ 
+-#define MAX_DEFAULT_DIRS 6
++#define MAX_DEFAULT_DIRS 7
+ #define DEFAULT_DIRS_SIZE (MAX_DEFAULT_DIRS + 1) /* Terminate with NULL */
+ static const char **default_directories = nullptr;
+ 
+@@ -925,6 +925,14 @@ static int search_default_file_with_ext(Process_option
+       return 1; /* Ignore wrong files */
+   }
+ 
++  if (strstr(name, "/etc") == name)
++  {
++    fprintf(stderr,
++             "error: Config file %s in invalid location, please move to or merge with /usr/local%s\n",
++	     name,name);
++      goto err;
++  }
++
+   while (true) {
+     auto fileline = mysql_file_getline(buff, sizeof(buff), fp, is_login_file);
+     char *linebuff = fileline.get();
+@@ -1314,7 +1322,8 @@ void my_print_default_files(const char *conf_file) {
+             end[(strlen(end) - 1)] = ' ';
+           else
+             strxmov(end, conf_file, *ext, " ", NullS);
+-          fputs(name, stdout);
++	  if (strstr(name, "/etc") != name)
++		  fputs(name, stdout);
+         }
+       }
+     }
+@@ -1655,14 +1664,9 @@ static const char **init_default_directories(MEM_ROOT 
+ 
+ #else
+ 
+-  errors += add_directory(alloc, "/etc/", dirs);
+-  errors += add_directory(alloc, "/etc/mysql/", dirs);
++  errors += add_directory(alloc, "/usr/local/etc/", dirs);
++  errors += add_directory(alloc, "/usr/local/etc/mysql/", dirs);
+ 
+-#if defined(DEFAULT_SYSCONFDIR)
+-  if (DEFAULT_SYSCONFDIR[0])
+-    errors += add_directory(alloc, DEFAULT_SYSCONFDIR, dirs);
+-#endif /* DEFAULT_SYSCONFDIR */
+-
+ #endif
+ 
+   if ((env = getenv("MYSQL_HOME"))) errors += add_directory(alloc, env, dirs);
+@@ -1727,7 +1731,7 @@ int check_file_permissions(const char *file_name, bool
+ #if !defined(_WIN32)
+   MY_STAT stat_info;
+ 
+-  if (!my_stat(file_name, &stat_info, flags)) return 1;
++  if (!my_stat(file_name, &stat_info, flags)) return 0;
+   /*
+     Ignore .mylogin.cnf file if not exclusively readable/writable
+     by current user.
diff --git a/databases/mysql81-server/files/patch-mysys_my__kdf.cc b/databases/mysql81-server/files/patch-mysys_my__kdf.cc
new file mode 100644
index 000000000000..e4b12bfc09a0
--- /dev/null
+++ b/databases/mysql81-server/files/patch-mysys_my__kdf.cc
@@ -0,0 +1,20 @@
+--- mysys/my_kdf.cc.orig	2022-12-11 13:12:02 UTC
++++ mysys/my_kdf.cc
+@@ -56,7 +56,7 @@ int create_kdf_key(const unsigned char *key, const uns
+   std::unique_ptr<Key_derivation_function> kdf_function;
+ 
+   if (kdf_name == "hkdf") {
+-#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
+     kdf_function = std::make_unique<Key_hkdf_function>(kdf_options);
+ #else
+     return 1;
+@@ -71,7 +71,7 @@ int create_kdf_key(const unsigned char *key, const uns
+   return kdf_function->derive_key(key, key_length, rkey, rkey_size);
+ }
+ 
+-#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
+ Key_hkdf_function::Key_hkdf_function(vector<string> *kdf_options) {
+   kdf_options_ = {kdf_options};
+ }
diff --git a/databases/mysql81-server/files/patch-plugin_password__validation_validate__password.cc b/databases/mysql81-server/files/patch-plugin_password__validation_validate__password.cc
new file mode 100644
index 000000000000..4f1313993d21
--- /dev/null
+++ b/databases/mysql81-server/files/patch-plugin_password__validation_validate__password.cc
@@ -0,0 +1,11 @@
+--- plugin/password_validation/validate_password.cc.orig	2019-09-20 08:30:51 UTC
++++ plugin/password_validation/validate_password.cc
+@@ -25,6 +25,8 @@
+ #include <mysql/plugin_validate_password.h>
+ #include <mysql/service_my_plugin_log.h>
+ #include <mysql/service_mysql_string.h>
++/* solve clash between libc++ bitset::test() and test macro from my_global.h */
++#undef test
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
diff --git a/databases/mysql81-server/files/patch-plugin_x_CMakeLists.txt b/databases/mysql81-server/files/patch-plugin_x_CMakeLists.txt
new file mode 100644
index 000000000000..e1e9d8674c99
--- /dev/null
+++ b/databases/mysql81-server/files/patch-plugin_x_CMakeLists.txt
@@ -0,0 +1,11 @@
+--- plugin/x/CMakeLists.txt.orig	2023-06-21 07:52:10 UTC
++++ plugin/x/CMakeLists.txt
+@@ -81,6 +81,8 @@ INCLUDE_DIRECTORIES(
+   ${MYSQLX_GENERATE_DIR}
+   ${MYSQLX_PROTOCOL_INCLUDE_DIR}
+   ${MYSQLX_CLIENT_INCLUDE_DIR}
++  ${OPENSSL_INCLUDE_DIR}
++  ${BOOST_INCLUDE_DIR}
+ )
+ 
+ ADD_COMPILE_FLAGS(${XPLUGIN_SRC}
diff --git a/databases/mysql81-server/files/patch-plugin_x_client_authentication_sha256__scramble__generator.cc b/databases/mysql81-server/files/patch-plugin_x_client_authentication_sha256__scramble__generator.cc
new file mode 100644
index 000000000000..0e894219bb8d
--- /dev/null
+++ b/databases/mysql81-server/files/patch-plugin_x_client_authentication_sha256__scramble__generator.cc
@@ -0,0 +1,11 @@
+--- plugin/x/client/authentication/sha256_scramble_generator.cc.orig	2019-09-20 08:30:51 UTC
++++ plugin/x/client/authentication/sha256_scramble_generator.cc
+@@ -97,7 +97,7 @@ bool SHA256_digest::retrieve_digest(unsigned char *dig
+     return true;
+   }
+   m_ok = EVP_DigestFinal_ex(md_context, m_digest, nullptr);
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
++#if defined(LIBRESSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER < 0x10100000L
+   EVP_MD_CTX_cleanup(md_context);
+ #else  /* OPENSSL_VERSION_NUMBER < 0x10100000L */
+   EVP_MD_CTX_reset(md_context);
diff --git a/databases/mysql81-server/files/patch-plugin_x_configure.cmake b/databases/mysql81-server/files/patch-plugin_x_configure.cmake
new file mode 100644
index 000000000000..3d56059d869a
--- /dev/null
+++ b/databases/mysql81-server/files/patch-plugin_x_configure.cmake
@@ -0,0 +1,15 @@
+--- plugin/x/configure.cmake.orig	2019-09-20 08:30:51 UTC
++++ plugin/x/configure.cmake
+@@ -45,6 +45,7 @@ CONFIGURE_FILE(${MYSQLX_PROJECT_DIR}/src/config/mysqlx
+ CONFIGURE_FILE(${MYSQLX_PROJECT_DIR}/src/config/mysqlx_version.h.in
+                ${MYSQLX_GENERATE_DIR}/mysqlx_version.h )
+ 
++IF(FALSE)
+ INSTALL(FILES ${MYSQLX_GENERATE_DIR}/mysqlx_error.h
+         DESTINATION ${INSTALL_INCLUDEDIR}
+         COMPONENT Development)
+@@ -56,3 +57,4 @@ INSTALL(FILES ${MYSQLX_GENERATE_DIR}/mysqlx_ername.h
+ INSTALL(FILES ${MYSQLX_GENERATE_DIR}/mysqlx_version.h
+         DESTINATION ${INSTALL_INCLUDEDIR}
+         COMPONENT Development)
++ENDIF()
diff --git a/databases/mysql81-server/files/patch-router_src_harness_include_mysql_harness_net__ts_impl_kqueue__io__service.h b/databases/mysql81-server/files/patch-router_src_harness_include_mysql_harness_net__ts_impl_kqueue__io__service.h
new file mode 100644
index 000000000000..6e24f0300ecf
--- /dev/null
+++ b/databases/mysql81-server/files/patch-router_src_harness_include_mysql_harness_net__ts_impl_kqueue__io__service.h
@@ -0,0 +1,13 @@
+--- router/src/harness/include/mysql/harness/net_ts/impl/kqueue_io_service.h.orig	2023-06-21 07:52:10 UTC
++++ router/src/harness/include/mysql/harness/net_ts/impl/kqueue_io_service.h
+@@ -190,8 +190,8 @@ class kqueue_io_service : public IoServiceBase {
+         auto secs = std::chrono::duration_cast<std::chrono::seconds>(timeout);
+         timeout -= secs;
+ 
+-        ts = {secs.count(),
+-              std::chrono::duration_cast<std::chrono::nanoseconds>(timeout)
++        ts = {(time_t)secs.count(),
++              (long)std::chrono::duration_cast<std::chrono::nanoseconds>(timeout)
+                   .count()};
+ 
+         p_ts = &ts;
diff --git a/databases/mysql81-server/files/patch-router_src_harness_include_mysql_harness_net__ts_internet.h b/databases/mysql81-server/files/patch-router_src_harness_include_mysql_harness_net__ts_internet.h
new file mode 100644
index 000000000000..015c6839ada0
--- /dev/null
+++ b/databases/mysql81-server/files/patch-router_src_harness_include_mysql_harness_net__ts_internet.h
@@ -0,0 +1,10 @@
+--- router/src/harness/include/mysql/harness/net_ts/internet.h.orig	2020-11-09 00:30:01 UTC
++++ router/src/harness/include/mysql/harness/net_ts/internet.h
+@@ -43,6 +43,7 @@
+ #include <arpa/inet.h>    // inet_ntop
+ #include <netdb.h>        // getaddrinfo
+ #include <netinet/in.h>   // in_addr_t
++#include <sys/types.h>    // u_int32_t
+ #include <netinet/ip6.h>  // in6_addr_t
+ #include <netinet/tcp.h>  // TCP_NODELAY
+ #include <sys/ioctl.h>    // ioctl
diff --git a/databases/mysql81-server/files/patch-router_src_harness_src_CMakeLists.txt b/databases/mysql81-server/files/patch-router_src_harness_src_CMakeLists.txt
new file mode 100644
index 000000000000..1e4459495165
--- /dev/null
+++ b/databases/mysql81-server/files/patch-router_src_harness_src_CMakeLists.txt
@@ -0,0 +1,24 @@
+--- router/src/harness/src/CMakeLists.txt.orig	2023-06-21 07:52:10 UTC
++++ router/src/harness/src/CMakeLists.txt
+@@ -230,7 +230,6 @@ ELSE()
+   INSTALL(TARGETS harness-library
+     LIBRARY
+     DESTINATION ${ROUTER_INSTALL_LIBDIR} COMPONENT Router
+-    NAMELINK_SKIP
+     )
+ ENDIF()
+ 
+@@ -262,7 +261,6 @@ INSTALL(TARGETS harness_stdx
+   RUNTIME DESTINATION ${ROUTER_INSTALL_BINDIR} COMPONENT Router
+   ARCHIVE DESTINATION ${ROUTER_INSTALL_LIBDIR} COMPONENT Router
+   LIBRARY DESTINATION ${ROUTER_INSTALL_LIBDIR} COMPONENT Router
+-  NAMELINK_SKIP
+   )
+ 
+ ## harness_tls
+@@ -304,5 +302,4 @@ INSTALL(TARGETS harness_tls
+   RUNTIME DESTINATION ${ROUTER_INSTALL_BINDIR} COMPONENT Router
+   ARCHIVE DESTINATION ${ROUTER_INSTALL_LIBDIR} COMPONENT Router
+   LIBRARY DESTINATION ${ROUTER_INSTALL_LIBDIR} COMPONENT Router
+-  NAMELINK_SKIP
+   )
diff --git a/databases/mysql81-server/files/patch-router_src_harness_src_tls__client__context.cc b/databases/mysql81-server/files/patch-router_src_harness_src_tls__client__context.cc
new file mode 100644
index 000000000000..d366ee9f7425
--- /dev/null
+++ b/databases/mysql81-server/files/patch-router_src_harness_src_tls__client__context.cc
@@ -0,0 +1,11 @@
+--- router/src/harness/src/tls_client_context.cc.orig	2023-06-21 07:52:10 UTC
++++ router/src/harness/src/tls_client_context.cc
+@@ -101,7 +101,7 @@ stdx::expected<void, std::error_code> TlsClientContext
+ stdx::expected<void, std::error_code> TlsClientContext::cipher_suites(
+     const std::string &ciphers) {
+ // TLSv1.3 ciphers are controlled via SSL_CTX_set_ciphersuites()
+-#if OPENSSL_VERSION_NUMBER >= ROUTER_OPENSSL_VERSION(1, 1, 1)
++#ifdef TLS1_3_VERSION
+   if (1 != SSL_CTX_set_ciphersuites(ssl_ctx_.get(), ciphers.c_str())) {
+     return stdx::make_unexpected(make_tls_error());
+   }
diff --git a/databases/mysql81-server/files/patch-router_src_harness_src_tls__context.cc b/databases/mysql81-server/files/patch-router_src_harness_src_tls__context.cc
new file mode 100644
index 000000000000..b1d818afe81a
--- /dev/null
+++ b/databases/mysql81-server/files/patch-router_src_harness_src_tls__context.cc
@@ -0,0 +1,44 @@
+--- router/src/harness/src/tls_context.cc.orig	2021-12-17 16:07:27 UTC
++++ router/src/harness/src/tls_context.cc
+@@ -241,7 +241,7 @@ static int o11x_version(TlsVersion version) {
+       return TLS1_1_VERSION;
+     case TlsVersion::TLS_1_2:
+       return TLS1_2_VERSION;
+-#if OPENSSL_VERSION_NUMBER >= ROUTER_OPENSSL_VERSION(1, 1, 1)
++#ifdef TLS1_3_VERSION
+     case TlsVersion::TLS_1_3:
+       return TLS1_3_VERSION;
+ #endif
+@@ -272,9 +272,11 @@ stdx::expected<void, std::error_code> TlsContext::vers
+     default:
+       // unknown, leave all disabled
+       [[fallthrough]];
++#ifdef TLS1_3_VERSION
+     case TlsVersion::TLS_1_3:
+       opts |= SSL_OP_NO_TLSv1_2;
+       [[fallthrough]];
++#endif
+     case TlsVersion::TLS_1_2:
+       opts |= SSL_OP_NO_TLSv1_1;
+       [[fallthrough]];
+@@ -322,8 +324,10 @@ TlsVersion TlsContext::min_version() const {
+       return TlsVersion::TLS_1_1;
+     case TLS1_2_VERSION:
+       return TlsVersion::TLS_1_2;
++#ifdef TLS1_3_VERSION
+     case TLS1_3_VERSION:
+       return TlsVersion::TLS_1_3;
++#endif
+     case 0:
+       return TlsVersion::AUTO;
+     default:
+@@ -382,7 +386,8 @@ TlsContext::InfoCallback TlsContext::info_callback() c
+ }
+ 
+ int TlsContext::security_level() const {
+-#if OPENSSL_VERSION_NUMBER >= ROUTER_OPENSSL_VERSION(1, 1, 0)
++#if OPENSSL_VERSION_NUMBER >= ROUTER_OPENSSL_VERSION(1, 1, 0) && \
++    !defined(LIBRESSL_VERSION_NUMBER)
+   return SSL_CTX_get_security_level(ssl_ctx_.get());
+ #else
+   return 0;
diff --git a/databases/mysql81-server/files/patch-router_src_http_src_CMakeLists.txt b/databases/mysql81-server/files/patch-router_src_http_src_CMakeLists.txt
new file mode 100644
index 000000000000..d6d71414449d
--- /dev/null
+++ b/databases/mysql81-server/files/patch-router_src_http_src_CMakeLists.txt
@@ -0,0 +1,26 @@
+--- router/src/http/src/CMakeLists.txt.orig	2021-12-17 16:07:27 UTC
++++ router/src/http/src/CMakeLists.txt
+@@ -58,7 +58,6 @@ INSTALL(TARGETS http_common
+   RUNTIME DESTINATION ${ROUTER_INSTALL_BINDIR} COMPONENT Router
+   ARCHIVE DESTINATION ${ROUTER_INSTALL_LIBDIR} COMPONENT Router
+   LIBRARY DESTINATION ${ROUTER_INSTALL_LIBDIR} COMPONENT Router
+-  NAMELINK_SKIP
+   )
+ 
+ ## split library code from the plugin to use them _passwd and tests
+@@ -84,7 +83,6 @@ INSTALL(TARGETS http_auth_backend_lib
+   RUNTIME DESTINATION ${ROUTER_INSTALL_BINDIR} COMPONENT Router
+   ARCHIVE DESTINATION ${ROUTER_INSTALL_LIBDIR} COMPONENT Router
+   LIBRARY DESTINATION ${ROUTER_INSTALL_LIBDIR} COMPONENT Router
+-  NAMELINK_SKIP
+   )
+ TARGET_INCLUDE_DIRECTORIES(http_auth_backend_lib PUBLIC
+   ${CMAKE_CURRENT_SOURCE_DIR}
+@@ -137,7 +135,6 @@ INSTALL(TARGETS http_auth_realm_lib
+   RUNTIME DESTINATION ${ROUTER_INSTALL_BINDIR} COMPONENT Router
+   ARCHIVE DESTINATION ${ROUTER_INSTALL_LIBDIR} COMPONENT Router
+   LIBRARY DESTINATION ${ROUTER_INSTALL_LIBDIR} COMPONENT Router
+-  NAMELINK_SKIP
+   )
+ ## the rpath for the bundled openssl
+ ADD_INSTALL_RPATH_FOR_OPENSSL(http_auth_realm_lib)
diff --git a/databases/mysql81-server/files/patch-router_src_io_src_CMakeLists.txt b/databases/mysql81-server/files/patch-router_src_io_src_CMakeLists.txt
new file mode 100644
index 000000000000..474f473e1893
--- /dev/null
+++ b/databases/mysql81-server/files/patch-router_src_io_src_CMakeLists.txt
@@ -0,0 +1,10 @@
+--- router/src/io/src/CMakeLists.txt.orig	2020-09-23 12:37:48 UTC
++++ router/src/io/src/CMakeLists.txt
+@@ -47,7 +47,6 @@ INSTALL(TARGETS io_component
+   RUNTIME DESTINATION ${ROUTER_INSTALL_BINDIR} COMPONENT Router
+   ARCHIVE DESTINATION ${ROUTER_INSTALL_LIBDIR} COMPONENT Router
+   LIBRARY DESTINATION ${ROUTER_INSTALL_LIBDIR} COMPONENT Router
+-  NAMELINK_SKIP
+   )
+ 
+ GENERATE_EXPORT_HEADER(io_component
diff --git a/databases/mysql81-server/files/patch-router_src_router_src_CMakeLists.txt b/databases/mysql81-server/files/patch-router_src_router_src_CMakeLists.txt
new file mode 100644
index 000000000000..0a26f51a8ac9
--- /dev/null
+++ b/databases/mysql81-server/files/patch-router_src_router_src_CMakeLists.txt
@@ -0,0 +1,10 @@
+--- router/src/router/src/CMakeLists.txt.orig	2023-06-21 07:52:10 UTC
++++ router/src/router/src/CMakeLists.txt
+@@ -149,7 +149,6 @@ INSTALL(TARGETS router_lib
+   RUNTIME DESTINATION ${ROUTER_INSTALL_BINDIR} COMPONENT Router
+   ARCHIVE DESTINATION ${ROUTER_INSTALL_LIBDIR} COMPONENT Router
+   LIBRARY DESTINATION ${ROUTER_INSTALL_LIBDIR} COMPONENT Router
+-  NAMELINK_SKIP
+   )
+ 
+ MYSQL_ADD_EXECUTABLE(mysqlrouter_keyring
diff --git a/databases/mysql81-server/files/patch-scripts_CMakeLists.txt b/databases/mysql81-server/files/patch-scripts_CMakeLists.txt
new file mode 100644
index 000000000000..4f2f5afb57d4
--- /dev/null
+++ b/databases/mysql81-server/files/patch-scripts_CMakeLists.txt
@@ -0,0 +1,52 @@
+--- scripts/CMakeLists.txt.orig	2023-06-21 07:52:10 UTC
++++ scripts/CMakeLists.txt
+@@ -336,6 +336,8 @@ MACRO(EXTRACT_LINK_LIBRARIES target var)
+           SET(${var} "${${var}}-L${dir} " )
+         ENDIF()
+         SET(${var} "${${var}}-l${lib} " )
++        ELSEIF(lib STREQUAL "-pthread")
++          SET(${var} "${${var}}-pthread " )
+       ELSE()
+         SET(${var} "${${var}}-l${lib} " )
+       ENDIF()
+@@ -409,7 +411,7 @@ ELSE()
+     ${CMAKE_CURRENT_BINARY_DIR}/${PKGCONFIG_FILE}
+     ESCAPE_QUOTES @ONLY)
+ 
+-  IF(INSTALL_PKGCONFIGDIR)
++  IF(INSTALL_PKGCONFIGDIR AND NOT WITHOUT_CLIENTLIBS)
+     MESSAGE(STATUS "INSTALL ${PKGCONFIG_FILE} ${INSTALL_PKGCONFIGDIR}")
+     INSTALL(FILES
+       ${CMAKE_CURRENT_BINARY_DIR}/${PKGCONFIG_FILE}
+@@ -422,23 +424,28 @@ ELSE()
+   # mysqld_safe used in mtr even for systemd platforms
+   IF(WITH_SYSTEMD)
+     SET(BIN_SCRIPTS
+-      mysql_config
+       mysqldumpslow
+       mysqld_safe
+       )
+   ELSE()
+     SET(BIN_SCRIPTS
+-      mysql_config
+       mysqldumpslow
+       mysqld_multi
+       mysqld_safe
+       )
+   ENDIF()
+ 
++  IF(NOT WITHOUT_CLIENTLIBS)
++    SET(BIN_SCRIPTS
++      ${BIN_SCRIPTS}
++      mysql_config
++    )
++  ENDIF(NOT WITHOUT_CLIENTLIBS)
++
+   FOREACH(file ${BIN_SCRIPTS})
+     IF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh)
+       CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh
+-        ${CMAKE_CURRENT_BINARY_DIR}/${file} ESCAPE_QUOTES @ONLY
++        ${CMAKE_CURRENT_BINARY_DIR}/${file} @ONLY
+         )
+     ELSEIF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${file}.pl.in)
+       CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${file}.pl.in
diff --git a/databases/mysql81-server/files/patch-scripts_mysqld__safe.sh b/databases/mysql81-server/files/patch-scripts_mysqld__safe.sh
new file mode 100644
index 000000000000..47bc81e3963b
--- /dev/null
+++ b/databases/mysql81-server/files/patch-scripts_mysqld__safe.sh
@@ -0,0 +1,19 @@
+--- scripts/mysqld_safe.sh.orig	2022-01-23 11:48:36 UTC
++++ scripts/mysqld_safe.sh
+@@ -360,7 +360,7 @@ mysqld_ld_preload_text() {
+ # running mysqld.  See ld.so for details.
+ set_malloc_lib() {
+   # This list is kept intentionally simple.
+-  malloc_dirs="/usr/lib /usr/lib64 /usr/lib/i386-linux-gnu /usr/lib/x86_64-linux-gnu"
++  malloc_dirs="/usr/lib /usr/lib64 /usr/lib/i386-linux-gnu /usr/lib/x86_64-linux-gnu /usr/local/lib"
+   malloc_lib="$1"
+ 
+   # Allow --malloc-lib='' to override other settings
+@@ -379,6 +379,7 @@ set_malloc_lib() {
+         /usr/lib64) ;;
+         /usr/lib/i386-linux-gnu) ;;
+         /usr/lib/x86_64-linux-gnu) ;;
++	/usr/local/lib) ;;
+         *)
+           log_error "--malloc-lib must be located in one of the directories: $malloc_dirs"
+           exit 1
diff --git a/databases/mysql81-server/files/patch-sql_auth_sha2__password__common.cc b/databases/mysql81-server/files/patch-sql_auth_sha2__password__common.cc
new file mode 100644
index 000000000000..56f6dfb3fbb7
--- /dev/null
+++ b/databases/mysql81-server/files/patch-sql_auth_sha2__password__common.cc
@@ -0,0 +1,11 @@
+--- sql/auth/sha2_password_common.cc.orig	2019-09-20 08:30:51 UTC
++++ sql/auth/sha2_password_common.cc
+@@ -101,7 +101,7 @@ bool SHA256_digest::retrieve_digest(unsigned char *dig
+     return true;
+   }
+   m_ok = EVP_DigestFinal_ex(md_context, m_digest, nullptr);
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
++#if defined(LIBRESSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER < 0x10100000L
+   EVP_MD_CTX_cleanup(md_context);
+ #else  /* OPENSSL_VERSION_NUMBER < 0x10100000L */
+   EVP_MD_CTX_reset(md_context);
diff --git a/databases/mysql81-server/files/patch-sql_auth_sql__authorization.cc b/databases/mysql81-server/files/patch-sql_auth_sql__authorization.cc
new file mode 100644
index 000000000000..e9282f545a1c
--- /dev/null
+++ b/databases/mysql81-server/files/patch-sql_auth_sql__authorization.cc
@@ -0,0 +1,13 @@
+--- sql/auth/sql_authorization.cc.orig	2023-06-21 07:52:10 UTC
++++ sql/auth/sql_authorization.cc
+@@ -7437,6 +7437,10 @@ bool operator==(const Role_id &a, const std::string &b
+   return tmp == b;
+ }
+ 
++bool operator==(const Role_id &a, const LEX_CSTRING &b) {
++  return a == to_string(b);
++}
++
+ bool operator==(const std::pair<Role_id, bool> &a, const std::string &b) {
+   return a.first == b;
+ }
diff --git a/databases/mysql81-server/files/patch-sql_conn__handler_socket__connection.cc b/databases/mysql81-server/files/patch-sql_conn__handler_socket__connection.cc
new file mode 100644
index 000000000000..6aa01f9e3e3a
--- /dev/null
+++ b/databases/mysql81-server/files/patch-sql_conn__handler_socket__connection.cc
@@ -0,0 +1,32 @@
+--- sql/conn_handler/socket_connection.cc.orig	2023-06-21 07:52:10 UTC
++++ sql/conn_handler/socket_connection.cc
+@@ -960,9 +960,11 @@ bool check_connection_refused_by_tcp_wrapper(MYSQL_SOC
+   signal(SIGCHLD, SIG_DFL);
+   request_init(&req, RQ_DAEMON, libwrap_name, RQ_FILE,
+                mysql_socket_getfd(connect_sock), NULL);
+-  fromhost(&req);
++  void (*my_fromhost) (void *) = (void (*)(void *)) fromhost;
++  my_fromhost(&req);
+ 
+-  if (!hosts_access(&req)) {
++  int (*my_hosts_access) (void *) = (int (*) (void *)) hosts_access;
++  if (!my_hosts_access(&req)) {
+     /*
+       This may be stupid but refuse() includes an exit(0)
+       which we surely don't want...
+@@ -974,12 +976,13 @@ bool check_connection_refused_by_tcp_wrapper(MYSQL_SOC
+       This is unproblematic as TCP-wrapper is unix specific,
+       anyway.
+     */
++    char *(*my_eval_client) (void *) = (char *(*) (void *)) eval_client;
+     syslog(LOG_AUTH | LOG_WARNING, "refused connect from %s",
+-           eval_client(&req));
++           my_eval_client(&req));
+ 
+ #ifdef HAVE_LIBWRAP_PROTOTYPES
+     // Some distros have patched tcpd.h to have proper prototypes
+-    if (req.sink) (req.sink)(req.fd);
++    if (req.sink) ((void (*)(int)) (req.sink))(req.fd);
+ #else
+     // Some distros have not patched tcpd.h
+     if (req.sink) ((void (*)(int))req.sink)(req.fd);
diff --git a/databases/mysql81-server/files/patch-sql_mysqld.cc b/databases/mysql81-server/files/patch-sql_mysqld.cc
new file mode 100644
index 000000000000..6f0533832abb
--- /dev/null
+++ b/databases/mysql81-server/files/patch-sql_mysqld.cc
@@ -0,0 +1,11 @@
+--- sql/mysqld.cc.orig	2023-06-21 07:52:10 UTC
++++ sql/mysqld.cc
+@@ -5428,7 +5428,7 @@ static PSI_memory_key key_memory_openssl = PSI_NOT_INS
+ 
+ static PSI_memory_key key_memory_openssl = PSI_NOT_INSTRUMENTED;
+ 
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+ #define FILE_LINE_ARGS
+ #else
+ #define FILE_LINE_ARGS , const char *, int
diff --git a/databases/mysql81-server/files/patch-sql_ssl__init__callback.cc b/databases/mysql81-server/files/patch-sql_ssl__init__callback.cc
new file mode 100644
index 000000000000..96bd029197e9
--- /dev/null
+++ b/databases/mysql81-server/files/patch-sql_ssl__init__callback.cc
@@ -0,0 +1,36 @@
+--- sql/ssl_init_callback.cc.orig	2023-06-21 07:52:10 UTC
++++ sql/ssl_init_callback.cc
+@@ -110,14 +110,14 @@ static Sys_var_charptr Sys_tls_version(
+ 
+ static Sys_var_charptr Sys_tls_version(
+     "tls_version",
+-#ifdef HAVE_TLSv13
++#if defined(HAVE_TLSv13) && !defined(LIBRESSL_VERSION_NUMBER)
+     "TLS version, permitted values are TLSv1.2, TLSv1.3",
+ #else
+     "TLS version, permitted values are TLSv1.2",
+ #endif
+     PERSIST_AS_READONLY GLOBAL_VAR(opt_tls_version),
+     CMD_LINE(REQUIRED_ARG, OPT_TLS_VERSION), IN_FS_CHARSET,
+-#ifdef HAVE_TLSv13
++#if defined(HAVE_TLSv13) && !defined(LIBRESSL_VERSION_NUMBER)
+     "TLSv1.2,TLSv1.3",
+ #else
+     "TLSv1.2",
+@@ -197,14 +197,14 @@ static Sys_var_charptr Sys_admin_tls_version(
+ 
+ static Sys_var_charptr Sys_admin_tls_version(
+     "admin_tls_version",
+-#ifdef HAVE_TLSv13
++#if defined(HAVE_TLSv13) && !defined(LIBRESSL_VERSION_NUMBER)
+     "TLS version for --admin-port, permitted values are TLSv1.2, TLSv1.3",
+ #else
+     "TLS version for --admin-port, permitted values are TLSv1.2",
+ #endif
+     PERSIST_AS_READONLY GLOBAL_VAR(opt_admin_tls_version),
+     CMD_LINE(REQUIRED_ARG, OPT_TLS_VERSION), IN_FS_CHARSET,
+-#ifdef HAVE_TLSv13
++#if defined(HAVE_TLSv13) && !defined(LIBRESSL_VERSION_NUMBER)
+     "TLSv1.2,TLSv1.3",
+ #else
+     "TLSv1.2",
diff --git a/databases/mysql81-server/files/patch-sql_sys__vars.cc b/databases/mysql81-server/files/patch-sql_sys__vars.cc
new file mode 100644
index 000000000000..cfff31af4057
--- /dev/null
+++ b/databases/mysql81-server/files/patch-sql_sys__vars.cc
@@ -0,0 +1,29 @@
+--- sql/sys_vars.cc.orig	2023-06-21 07:52:10 UTC
++++ sql/sys_vars.cc
+@@ -2045,7 +2045,7 @@ static Sys_var_ulong Sys_connect_timeout(
+     "The number of seconds the mysqld server is waiting for a connect "
+     "packet before responding with 'Bad handshake'",
+     GLOBAL_VAR(connect_timeout), CMD_LINE(REQUIRED_ARG),
+-    VALID_RANGE(2, LONG_TIMEOUT), DEFAULT(CONNECT_TIMEOUT), BLOCK_SIZE(1));
++    VALID_RANGE(2, INT_MAX32 / 1000), DEFAULT(CONNECT_TIMEOUT), BLOCK_SIZE(1));
+ 
+ static Sys_var_ulong Sys_information_schema_stats_expiry(
+     "information_schema_stats_expiry",
+@@ -3201,7 +3201,7 @@ static Sys_var_ulong Sys_net_read_timeout(
+     "Number of seconds to wait for more data from a connection before "
+     "aborting the read",
+     SESSION_VAR(net_read_timeout), CMD_LINE(REQUIRED_ARG),
+-    VALID_RANGE(1, LONG_TIMEOUT), DEFAULT(NET_READ_TIMEOUT), BLOCK_SIZE(1),
++    VALID_RANGE(1, INT_MAX32 / 1000), DEFAULT(NET_READ_TIMEOUT), BLOCK_SIZE(1),
+     NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(nullptr),
+     ON_UPDATE(fix_net_read_timeout));
+ 
+@@ -3222,7 +3222,7 @@ static Sys_var_ulong Sys_net_write_timeout(
+     "Number of seconds to wait for a block to be written to a connection "
+     "before aborting the write",
+     SESSION_VAR(net_write_timeout), CMD_LINE(REQUIRED_ARG),
+-    VALID_RANGE(1, LONG_TIMEOUT), DEFAULT(NET_WRITE_TIMEOUT), BLOCK_SIZE(1),
++    VALID_RANGE(1, INT_MAX32 / 1000), DEFAULT(NET_WRITE_TIMEOUT), BLOCK_SIZE(1),
+     NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(nullptr),
+     ON_UPDATE(fix_net_write_timeout));
+ 
diff --git a/databases/mysql81-server/files/patch-storage_innobase_include_srv0mon.h b/databases/mysql81-server/files/patch-storage_innobase_include_srv0mon.h
new file mode 100644
index 000000000000..ee591adb8697
--- /dev/null
+++ b/databases/mysql81-server/files/patch-storage_innobase_include_srv0mon.h
@@ -0,0 +1,13 @@
+--- storage/innobase/include/srv0mon.h.orig	2019-09-20 08:30:51 UTC
++++ storage/innobase/include/srv0mon.h
+@@ -40,6 +40,10 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+ /* Required for FreeBSD so that INT64_MAX is defined. */
+ #define __STDC_LIMIT_MACROS
+ #endif /* __STDC_LIMIT_MACROS */
++#ifdef __DragonFly__
++/* The hack above doen't work for dragonfly, stdint.h already imported */
++#include <machine/int_limits.h>
++#endif
+ 
+ #include <stdint.h>
+ 
diff --git a/databases/mysql81-server/files/patch-storage_innobase_include_ut0crc32.h b/databases/mysql81-server/files/patch-storage_innobase_include_ut0crc32.h
new file mode 100644
index 000000000000..45695dfc36ad
--- /dev/null
+++ b/databases/mysql81-server/files/patch-storage_innobase_include_ut0crc32.h
@@ -0,0 +1,12 @@
+--- storage/innobase/include/ut0crc32.h.orig	2023-06-21 07:52:10 UTC
++++ storage/innobase/include/ut0crc32.h
+@@ -132,7 +132,9 @@ CRC32_DEFAULT
+ #endif /* CRC32_ARM64 */
+ 
+ #ifdef CRC32_ARM64_DEFAULT
++#ifndef __FreeBSD__
+ #include <asm/hwcap.h>
++#endif /* __FreeBSD__ */
+ #include <sys/auxv.h>
+ #endif /* CRC32_ARM64_DEFAULT */
+ 
diff --git a/databases/mysql81-server/files/patch-storage_innobase_ut_crc32.cc b/databases/mysql81-server/files/patch-storage_innobase_ut_crc32.cc
new file mode 100644
index 000000000000..d8662b03ba53
--- /dev/null
+++ b/databases/mysql81-server/files/patch-storage_innobase_ut_crc32.cc
@@ -0,0 +1,104 @@
+--- storage/innobase/ut/crc32.cc.orig	2023-06-21 07:52:10 UTC
++++ storage/innobase/ut/crc32.cc
+@@ -332,8 +332,25 @@ bool can_use_poly_mul() { return true; }
+ #endif /* CRC32_ARM64_APPLE */
+ 
+ #ifdef CRC32_ARM64_DEFAULT
++#ifdef __FreeBSD__
++bool can_use_crc32() {
++  unsigned long capabilities;
++
++  if (elf_aux_info(AT_HWCAP, &capabilities, sizeof(unsigned long)))
++    return false;
++  return capabilities & HWCAP_CRC32;
++}
++bool can_use_poly_mul() {
++  unsigned long capabilities;
++
++  if (elf_aux_info(AT_HWCAP, &capabilities, sizeof(unsigned long)))
++    return false;
++  return capabilities & HWCAP_CRC32;
++}
++#else
+ bool can_use_crc32() { return getauxval(AT_HWCAP) & HWCAP_CRC32; }
+ bool can_use_poly_mul() { return getauxval(AT_HWCAP) & HWCAP_PMULL; }
++#endif
+ #endif /* CRC32_ARM64_DEFAULT */
+ 
+ /** A helper template to statically unroll a loop with a fixed number of
+@@ -442,25 +459,39 @@ uint64_t crc32_impl::update(uint64_t crc, uint64_t dat
+ 
+ #ifdef CRC32_ARM64
+ #ifdef CRC32_ARM64_DEFAULT
++#ifndef __clang__
+ MY_ATTRIBUTE((target("+crc")))
++#else
++MY_ATTRIBUTE((target("crc")))
++#endif
+ #endif /* CRC32_ARM64_DEFAULT */
+ uint32_t crc32_impl::update(uint32_t crc, unsigned char data) {
+   return __crc32cb(crc, data);
+ }
+ #ifdef CRC32_ARM64_DEFAULT
++#ifndef __clang__
+ MY_ATTRIBUTE((target("+crc")))
++#endif
+ #endif /* CRC32_ARM64_DEFAULT */
+ uint32_t crc32_impl::update(uint32_t crc, uint16_t data) {
+   return __crc32ch(crc, data);
+ }
+ #ifdef CRC32_ARM64_DEFAULT
++#ifndef __clang__
+ MY_ATTRIBUTE((target("+crc")))
++#else
++MY_ATTRIBUTE((target("crc")))
++#endif
+ #endif /* CRC32_ARM64_DEFAULT */
+ uint32_t crc32_impl::update(uint32_t crc, uint32_t data) {
+   return __crc32cw(crc, data);
+ }
+ #ifdef CRC32_ARM64_DEFAULT
++#ifndef __clang__
+ MY_ATTRIBUTE((target("+crc")))
++#else
++MY_ATTRIBUTE((target("crc")))
++#endif
+ #endif /* CRC32_ARM64_DEFAULT */
+ uint64_t crc32_impl::update(uint64_t crc, uint64_t data) {
+   return (uint64_t)__crc32cd((uint32_t)crc, data);
+@@ -506,7 +537,11 @@ template <uint32_t w>
+ }
+ template <uint32_t w>
+ #ifdef CRC32_ARM64_DEFAULT
++#ifndef __clang__
+ MY_ATTRIBUTE((target("+crypto")))
++#else
++MY_ATTRIBUTE((target("crypto")))
++#endif
+ #endif /* CRC32_ARM64_DEFAULT */
+ uint64_t use_pclmul::polynomial_mul_rev(uint32_t rev_u) {
+   constexpr uint64_t flipped_w = flip_at_32(w);
+@@ -749,7 +784,11 @@ MY_ATTRIBUTE((flatten))
+ MY_ATTRIBUTE((flatten))
+ #endif /* CRC32_ARM64_APPLE */
+ #ifdef CRC32_ARM64_DEFAULT
++#ifndef __clang__
+ MY_ATTRIBUTE((target("+crc+crypto"), flatten))
++#else
++MY_ATTRIBUTE((target("crc,crypto")))
++#endif
+ #endif /* CRC32_ARM64_DEFAULT */
+ uint32_t crc32_using_pclmul(const byte *data, size_t len) {
+   return crc32<use_pclmul>(0, data, len);
+@@ -769,7 +808,11 @@ MY_ATTRIBUTE((flatten))
+ MY_ATTRIBUTE((flatten))
+ #endif /* CRC32_ARM64_APPLE */
+ #ifdef CRC32_ARM64_DEFAULT
++#ifndef __clang__
+ MY_ATTRIBUTE((target("+crc"), flatten))
++#else
++MY_ATTRIBUTE((target("crc")))
++#endif
+ #endif /* CRC32_ARM64_DEFAULT */
+ uint32_t crc32_using_unrolled_loop_poly_mul(const byte *data, size_t len) {
+   return crc32<use_unrolled_loop_poly_mul>(0, data, len);
diff --git a/databases/mysql81-server/files/patch-storage_myisam_mi__dynrec.cc b/databases/mysql81-server/files/patch-storage_myisam_mi__dynrec.cc
new file mode 100644
index 000000000000..4daceefef132
--- /dev/null
+++ b/databases/mysql81-server/files/patch-storage_myisam_mi__dynrec.cc
@@ -0,0 +1,22 @@
+--- storage/myisam/mi_dynrec.cc.orig	2019-09-20 08:30:51 UTC
++++ storage/myisam/mi_dynrec.cc
+@@ -85,17 +85,12 @@ bool mi_dynmap_file(MI_INFO *info, my_off_t size) {
+     return true;
+   }
+   /*
+-    I wonder if it is good to use MAP_NORESERVE. From the Linux man page:
+-    MAP_NORESERVE
+-      Do not reserve swap space for this mapping. When swap space is
+-      reserved, one has the guarantee that it is possible to modify the
+-      mapping. When swap space is not reserved one might get SIGSEGV
+-      upon a write if no physical memory is available.
++    MAP_NORESERVE is unimplemented in FreeBSD
+   */
+   info->s->file_map = (uchar *)my_mmap(
+       nullptr, (size_t)size,
+       info->s->mode == O_RDONLY ? PROT_READ : PROT_READ | PROT_WRITE,
+-      MAP_SHARED | MAP_NORESERVE, info->dfile, 0L);
++      MAP_SHARED, info->dfile, 0L);
+   if (info->s->file_map == (uchar *)MAP_FAILED) {
+     info->s->file_map = nullptr;
+     return true;
diff --git a/databases/mysql81-server/files/patch-storage_temptable_include_temptable_lock__free__type.h b/databases/mysql81-server/files/patch-storage_temptable_include_temptable_lock__free__type.h
new file mode 100644
index 000000000000..f0891fb365e2
--- /dev/null
+++ b/databases/mysql81-server/files/patch-storage_temptable_include_temptable_lock__free__type.h
@@ -0,0 +1,17 @@
+--- storage/temptable/include/temptable/lock_free_type.h.orig	2023-06-21 07:52:10 UTC
++++ storage/temptable/include/temptable/lock_free_type.h
+@@ -32,6 +32,14 @@ Lock-free type (selection) implementation. */
+ #include "my_config.h"
+ #include "storage/temptable/include/temptable/constants.h"
+ 
++#if defined(__i386__) //&& defined(__GCC_HAVE_SYNC_COMPARE_AND_SWAP_8)
++/* Fix for clang setting __GCC_ATOMIC_LLONG_LOCK_FREE incorrectly for x86
++ * https://llvm.org/bugs/show_bug.cgi?id=19355
++ */
++#undef ATOMIC_LLONG_LOCK_FREE
++#define ATOMIC_LLONG_LOCK_FREE 2
++#endif
++
+ namespace temptable {
+ 
+ /** Clang has a bug which causes ATOMIC_LLONG_LOCK_FREE to be defined as 1
diff --git a/databases/mysql81-server/files/patch-support-files_CMakeLists.txt b/databases/mysql81-server/files/patch-support-files_CMakeLists.txt
new file mode 100644
index 000000000000..88a193db5fdc
--- /dev/null
+++ b/databases/mysql81-server/files/patch-support-files_CMakeLists.txt
@@ -0,0 +1,39 @@
+--- support-files/CMakeLists.txt.orig	2023-06-21 07:52:10 UTC
++++ support-files/CMakeLists.txt
+@@ -24,8 +24,9 @@ ENDIF()
+   RETURN()
+ ENDIF()
+ 
+-INSTALL(FILES mysql.m4
+-  DESTINATION ${INSTALL_SHAREDIR}/aclocal COMPONENT Development)
++IF(NOT WITHOUT_CLIENTLIBS)
++  INSTALL(FILES mysql.m4 DESTINATION ${INSTALL_SHAREDIR}/aclocal COMPONENT Development)
++ENDIF(NOT WITHOUT_CLIENTLIBS)
+ 
+ SET(localstatedir "${MYSQL_DATADIR}")
+ 
+@@ -43,7 +44,7 @@ CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/mysql-log-r
+ CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/mysql-log-rotate.in
+   ${CMAKE_CURRENT_BINARY_DIR}/mysql-log-rotate @ONLY)
+ 
+-IF(NOT WITH_SYSTEMD)
++IF(NOT WITHOUT_SERVER)
+   CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/mysql.server.sh
+     ${CMAKE_CURRENT_BINARY_DIR}/mysql.server @ONLY
+   )
+@@ -59,6 +60,7 @@ ENDIF()
+   )
+ ENDIF()
+ 
++IF(NOT WITHOUT_SERVER)
+ INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/mysql-log-rotate
+   COMPONENT Server_Scripts
+   DESTINATION ${INSTALL_SUPPORTFILESDIR}
+@@ -66,6 +68,7 @@ INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/mysql-log-ro
+   OWNER_READ OWNER_WRITE
+   GROUP_READ WORLD_READ
+   )
++ENDIF()
+ 
+ IF(WITH_ROUTER)
+   IF(NOT WITH_SYSTEMD)
diff --git a/databases/mysql81-server/files/patch-utilities_CMakeLists.txt b/databases/mysql81-server/files/patch-utilities_CMakeLists.txt
new file mode 100644
index 000000000000..61f984d763b5
--- /dev/null
+++ b/databases/mysql81-server/files/patch-utilities_CMakeLists.txt
@@ -0,0 +1,79 @@
+--- utilities/CMakeLists.txt.orig	2023-06-21 07:52:10 UTC
++++ utilities/CMakeLists.txt
+@@ -24,13 +24,19 @@ MSVC_CPPCHECK_DISABLE()
+ DISABLE_MISSING_PROFILE_WARNING()
+ MSVC_CPPCHECK_DISABLE()
+ 
+-IF(NOT CMAKE_CROSSCOMPILING)
++IF(WITHOUT_CLIENTLIBS)
+   MYSQL_ADD_EXECUTABLE(comp_err
+     comp_err.cc
+     COMPONENT Test
+     LINK_LIBRARIES mysys
++    SKIP_INSTALL)
++ELSE(WITHOUT_CLIENTLIBS)
++  MYSQL_ADD_EXECUTABLE(comp_err
++    comp_err.cc
++    COMPONENT Test
++    LINK_LIBRARIES mysys
+     )
+-ENDIF()
++ENDIF(WITHOUT_CLIENTLIBS)
+ 
+ MYSQL_ADD_EXECUTABLE(comp_client_err
+   comp_client_err.cc
+@@ -113,10 +119,30 @@ MYSQL_ADD_EXECUTABLE(static_thread_local_test
+   EXCLUDE_FROM_ALL
+   )
+ 
++IF(WITHOUT_CLIENTLIBS)
+ MYSQL_ADD_EXECUTABLE(my_print_defaults
+   my_print_defaults.cc
+   COMPONENT Server
+   LINK_LIBRARIES mysys
++  SKIP_INSTALL )
++MYSQL_ADD_EXECUTABLE(perror
++  perror.cc
++  COMPONENT Server
++  DEPENDENCIES GenError
++  LINK_LIBRARIES mysys
++  SKIP_INSTALL )
++IF(BUILD_BUNDLED_LZ4)
++  MYSQL_ADD_EXECUTABLE(lz4_decompress
++    lz4_decompress.cc
++    COMPONENT Server
++    LINK_LIBRARIES ${LZ4_LIBRARY} mysys
++    SKIP_INSTALL )
++ENDIF()
++ELSE(WITHOUT_CLIENTLIBS)
++MYSQL_ADD_EXECUTABLE(my_print_defaults
++  my_print_defaults.cc
++  COMPONENT Server
++  LINK_LIBRARIES mysys
+   )
+ MYSQL_ADD_EXECUTABLE(perror
+   perror.cc
+@@ -131,12 +157,23 @@ ENDIF()
+     LINK_LIBRARIES ext::lz4 mysys
+     )
+ ENDIF()
++ENDIF(WITHOUT_CLIENTLIBS)
+ 
++IF(WITHOUT_CLIENTLIBS)
+ MYSQL_ADD_EXECUTABLE(zlib_decompress
+   zlib_decompress.cc
+   COMPONENT Server
+   LINK_LIBRARIES ext::zlib mysys
++    SKIP_INSTALL )
++ELSE(WITHOUT_CLIENTLIBS)
++IF(BUILD_BUNDLED_ZLIB OR NOT OPENSSL_EXECUTABLE_HAS_ZLIB)
++  MYSQL_ADD_EXECUTABLE(zlib_decompress
++    zlib_decompress.cc
++    COMPONENT Server
++    LINK_LIBRARIES ${ZLIB_LIBRARY} mysys
+   )
++ENDIF()
++ENDIF(WITHOUT_CLIENTLIBS)
+ 
+ # All targets below belong to COMPONENT Server and depend on InnoDB.
+ IF(WITHOUT_SERVER)
diff --git a/databases/mysql81-server/files/patch-vio_viossl.cc b/databases/mysql81-server/files/patch-vio_viossl.cc
new file mode 100644
index 000000000000..4a993d1fe051
--- /dev/null
+++ b/databases/mysql81-server/files/patch-vio_viossl.cc
@@ -0,0 +1,30 @@
+--- vio/viossl.cc.orig	2023-06-21 07:52:10 UTC
++++ vio/viossl.cc
+@@ -45,7 +45,8 @@
+   BIO_set_callback_ex was added in openSSL 1.1.1
+   For older openSSL, use the deprecated BIO_set_callback.
+ */
+-#if OPENSSL_VERSION_NUMBER >= 0x10101000L
++#if OPENSSL_VERSION_NUMBER >= 0x10101000L && \
++    !defined(LIBRESSL_VERSION_NUMBER)
+ #define HAVE_BIO_SET_CALLBACK_EX
+ #endif
+ 
+@@ -698,7 +699,7 @@ static int ssl_do(struct st_VioSSLFd *ptr, Vio *vio, l
+ #if !defined(NDEBUG)
+     {
+       STACK_OF(SSL_COMP) *ssl_comp_methods = nullptr;
+-      ssl_comp_methods = SSL_COMP_get_compression_methods();
++      ssl_comp_methods = (STACK_OF(SSL_COMP) *)SSL_COMP_get_compression_methods();
+       n = sk_SSL_COMP_num(ssl_comp_methods);
+       DBUG_PRINT("info", ("Available compression methods:\n"));
+       if (n == 0)
+@@ -706,7 +707,7 @@ static int ssl_do(struct st_VioSSLFd *ptr, Vio *vio, l
+       else
+         for (j = 0; j < n; j++) {
+           SSL_COMP *c = sk_SSL_COMP_value(ssl_comp_methods, j);
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+           DBUG_PRINT("info", ("  %d: %s\n", c->id, c->name));
+ #else  /* OPENSSL_VERSION_NUMBER < 0x10100000L */
+           DBUG_PRINT("info",
diff --git a/databases/mysql81-server/files/patch-vio_viosslfactories.cc b/databases/mysql81-server/files/patch-vio_viosslfactories.cc
new file mode 100644
index 000000000000..80e10a9495ad
--- /dev/null
+++ b/databases/mysql81-server/files/patch-vio_viosslfactories.cc
@@ -0,0 +1,46 @@
+--- vio/viosslfactories.cc.orig	2023-06-21 07:52:10 UTC
++++ vio/viosslfactories.cc
+@@ -45,6 +45,7 @@
+ #include <dh_ecdh_config.h>
+ 
+ #include "my_openssl_fips.h"
++#include "openssl/crypto.h"
+ #define TLS_VERSION_OPTION_SIZE 256
+ 
+ /*
+@@ -422,7 +423,7 @@ long process_tls_version(const char *tls_version) {
+   const char *separator = ",";
+   char *token, *lasts = nullptr;
+ 
+-#ifdef HAVE_TLSv13
++#if defined(HAVE_TLSv13) && !defined(LIBRESSL_VERSION_NUMBER)
+   const char *tls_version_name_list[] = {"TLSv1.2", "TLSv1.3"};
+   const char ctx_flag_default[] = "TLSv1.2,TLSv1.3";
+   const long tls_ctx_list[] = {SSL_OP_NO_TLSv1_2, SSL_OP_NO_TLSv1_3};
+@@ -494,7 +495,7 @@ static struct st_VioSSLFd *new_VioSSLFd(
+   ssl_ctx_options = (ssl_ctx_options | ssl_ctx_flags) &
+                     (SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3 | SSL_OP_NO_TLSv1 |
+                      SSL_OP_NO_TLSv1_1 | SSL_OP_NO_TLSv1_2
+-#ifdef HAVE_TLSv13
++#if defined(HAVE_TLSv13) && !defined(LIBRESSL_VERSION_NUMBER)
+                      | SSL_OP_NO_TLSv1_3
+ #endif /* HAVE_TLSv13 */
+                      | SSL_OP_NO_TICKET);
+@@ -503,7 +504,7 @@ static struct st_VioSSLFd *new_VioSSLFd(
+     return nullptr;
+ 
+   if (!(ssl_fd->ssl_context = SSL_CTX_new(is_client ?
+-#ifdef HAVE_TLSv13
++#if defined(HAVE_TLSv13) && !defined(LIBRESSL_VERSION_NUMBER)
+                                                     TLS_client_method()
+                                                     : TLS_server_method()
+ #else  /* HAVE_TLSv13 */
+@@ -518,7 +519,7 @@ static struct st_VioSSLFd *new_VioSSLFd(
+     return nullptr;
+   }
+ 
+-#ifdef HAVE_TLSv13
++#if defined(HAVE_TLSv13) && !defined(LIBRESSL_VERSION_NUMBER)
+   /*
+     Set OpenSSL TLS v1.3 ciphersuites.
+     Note that an empty list is permissible.
diff --git a/databases/mysql81-server/files/pkg-message.in b/databases/mysql81-server/files/pkg-message.in
new file mode 100644
index 000000000000..efe29e7bc126
--- /dev/null
+++ b/databases/mysql81-server/files/pkg-message.in
@@ -0,0 +1,21 @@
+[
+{ type: install
+  message: <<EOM
+There is no initial password for first time use of MySQL.
+Keep in mind to reset it to a secure password.
+
+MySQL80 has a default %%ETCDIR%%/my.cnf,
+remember to replace it with your own
+or set `mysql_optfile="$YOUR_CNF_FILE` in rc.conf.
+EOM
+}
+{ type: upgrade
+  message: <<EOM
+As of MySQL 8.0.16, the MySQL server performs the upgrade tasks previously
+handled by mysql_upgrade. Consequently, mysql_upgrade is unneeded and is
+deprecated as of that version, and will be removed in a future MySQL version.
+Because mysql_upgrade no longer performs upgrade tasks,
+it exits with status 0 unconditionally. 
+EOM
+}
+]
diff --git a/databases/mysql81-server/pkg-descr b/databases/mysql81-server/pkg-descr
new file mode 100644
index 000000000000..4893ba6f2444
--- /dev/null
+++ b/databases/mysql81-server/pkg-descr
@@ -0,0 +1,12 @@
+MySQL is a very fast, multi-threaded, multi-user and robust SQL
+(Structured Query Language) database server.
+The new features in MySQL 8.0. In addition to Data Dictionnary and CTEs are:
+    Move to utf8(mb4) as MySQL's default character set
+    Language specific case insensitive collation for 21 languages (utf8)
+    Invisible index
+    Descending indexes
+    Improve usability of UUID and IPV6 manipulations
+    SQL roles - SET PERSIST for global variable values
+    Performance Schema, instrumenting data locks
+    Performance Schema, instrumenting error messages
+    Improved cost model with histograms
diff --git a/databases/mysql81-server/pkg-plist b/databases/mysql81-server/pkg-plist
new file mode 100644
index 000000000000..eef9b2f59c0e
--- /dev/null
+++ b/databases/mysql81-server/pkg-plist
@@ -0,0 +1,253 @@
+LICENSE.router
+README.router
+bin/ibd2sdi
+bin/innochecksum
+bin/myisam_ftdump
+bin/myisamchk
+bin/myisamlog
+bin/myisampack
+bin/mysql_client_test
+bin/mysql_keyring_encryption_test
+bin/mysql_secure_installation
+bin/mysql_ssl_rsa_setup
+bin/mysql_test_event_tracking
+bin/mysql_tzinfo_to_sql
+bin/mysql_upgrade
+bin/mysqld_multi
+bin/mysqld_safe
+bin/mysqldumpslow
+bin/mysqlrouter
+bin/mysqlrouter_keyring
+bin/mysqlrouter_passwd
+bin/mysqlrouter_plugin_info
+bin/mysqltest
+bin/mysqltest_safe_process
+bin/mysqlxtest
+etc/logrotate.d/mysqlrouter
+%%ETCDIR%%/my.cnf.sample
+lib/mysql/libmysqlharness.so
+lib/mysql/libmysqlharness.so.1
+lib/mysql/libmysqlharness_stdx.so
+lib/mysql/libmysqlharness_stdx.so.1
+lib/mysql/libmysqlharness_tls.so
+lib/mysql/libmysqlharness_tls.so.1
+lib/mysql/libmysqlrouter.so
+lib/mysql/libmysqlrouter.so.1
+lib/mysql/libmysqlrouter_connection_pool.so.1
+lib/mysql/libmysqlrouter_destination_status.so.1
+lib/mysql/libmysqlrouter_http.so
+lib/mysql/libmysqlrouter_http.so.1
+lib/mysql/libmysqlrouter_http_auth_backend.so
+lib/mysql/libmysqlrouter_http_auth_backend.so.1
+lib/mysql/libmysqlrouter_http_auth_realm.so
+lib/mysql/libmysqlrouter_http_auth_realm.so.1
+lib/mysql/libmysqlrouter_io_component.so
+lib/mysql/libmysqlrouter_io_component.so.1
+lib/mysql/libmysqlrouter_metadata_cache.so.1
+lib/mysql/libmysqlrouter_mysqlxmessages.so.1
+lib/mysql/libmysqlrouter_routing.so.1
+lib/mysql/libprotobuf-lite.so.3.19.4
+lib/mysql/mysqlrouter/connection_pool.so
+lib/mysql/mysqlrouter/destination_status.so
+lib/mysql/mysqlrouter/http_auth_backend.so
+lib/mysql/mysqlrouter/http_auth_realm.so
+lib/mysql/mysqlrouter/http_server.so
+lib/mysql/mysqlrouter/io.so
+lib/mysql/mysqlrouter/keepalive.so
+lib/mysql/mysqlrouter/metadata_cache.so
+lib/mysql/mysqlrouter/rest_api.so
+lib/mysql/mysqlrouter/rest_connection_pool.so
+lib/mysql/mysqlrouter/rest_metadata_cache.so
+lib/mysql/mysqlrouter/rest_router.so
+lib/mysql/mysqlrouter/rest_routing.so
+lib/mysql/mysqlrouter/router_openssl.so
+lib/mysql/mysqlrouter/router_protobuf.so
+lib/mysql/mysqlrouter/routing.so
+lib/mysql/plugin/adt_null.so
+lib/mysql/plugin/auth.so
+lib/mysql/plugin/auth_test_plugin.so
+lib/mysql/plugin/component_audit_api_message_emit.so
+lib/mysql/plugin/component_example_component1.so
+lib/mysql/plugin/component_example_component2.so
+lib/mysql/plugin/component_example_component3.so
+lib/mysql/plugin/component_keyring_file.so
+lib/mysql/plugin/component_log_filter_dragnet.so
+lib/mysql/plugin/component_log_sink_json.so
+lib/mysql/plugin/component_log_sink_syseventlog.so
+lib/mysql/plugin/component_log_sink_test.so
+lib/mysql/plugin/component_mysqlbackup.so
+lib/mysql/plugin/component_mysqlx_global_reset.so
+lib/mysql/plugin/component_pfs_example.so
+lib/mysql/plugin/component_pfs_example_component_population.so
+lib/mysql/plugin/component_query_attributes.so
+lib/mysql/plugin/component_reference_cache.so
+lib/mysql/plugin/component_test_audit_api_message.so
+lib/mysql/plugin/component_test_backup_lock_service.so
+lib/mysql/plugin/component_test_component_deinit.so
+lib/mysql/plugin/component_test_event_tracking_consumer.so
+lib/mysql/plugin/component_test_event_tracking_consumer_a.so
+lib/mysql/plugin/component_test_event_tracking_consumer_b.so
+lib/mysql/plugin/component_test_event_tracking_consumer_c.so
+lib/mysql/plugin/component_test_event_tracking_producer_a.so
+lib/mysql/plugin/component_test_event_tracking_producer_b.so
+lib/mysql/plugin/component_test_host_application_signal.so
+lib/mysql/plugin/component_test_mysql_command_services.so
+lib/mysql/plugin/component_test_mysql_current_thread_reader.so
+lib/mysql/plugin/component_test_mysql_runtime_error.so
+lib/mysql/plugin/component_test_mysql_system_variable_set.so
+lib/mysql/plugin/component_test_mysql_thd_store_service.so
+lib/mysql/plugin/component_test_pfs_notification.so
+lib/mysql/plugin/component_test_pfs_resource_group.so
+lib/mysql/plugin/component_test_sensitive_system_variables.so
+lib/mysql/plugin/component_test_server_telemetry_traces.so
+lib/mysql/plugin/component_test_status_var_reader.so
+lib/mysql/plugin/component_test_status_var_service.so
+lib/mysql/plugin/component_test_status_var_service_int.so
+lib/mysql/plugin/component_test_status_var_service_reg_only.so
+lib/mysql/plugin/component_test_status_var_service_str.so
+lib/mysql/plugin/component_test_status_var_service_unreg_only.so
+lib/mysql/plugin/component_test_string_service.so
+lib/mysql/plugin/component_test_string_service_charset.so
+lib/mysql/plugin/component_test_string_service_long.so
+lib/mysql/plugin/component_test_sys_var_service.so
+lib/mysql/plugin/component_test_sys_var_service_int.so
+lib/mysql/plugin/component_test_sys_var_service_same.so
+lib/mysql/plugin/component_test_sys_var_service_str.so
+lib/mysql/plugin/component_test_system_variable_source.so
+lib/mysql/plugin/component_test_table_access.so
+lib/mysql/plugin/component_test_udf_registration.so
+lib/mysql/plugin/component_test_udf_services.so
+lib/mysql/plugin/component_udf_reg_3_func.so
+lib/mysql/plugin/component_udf_reg_avg_func.so
+lib/mysql/plugin/component_udf_reg_int_func.so
+lib/mysql/plugin/component_udf_reg_int_same_func.so
+lib/mysql/plugin/component_udf_reg_only_3_func.so
+lib/mysql/plugin/component_udf_reg_real_func.so
+lib/mysql/plugin/component_udf_unreg_3_func.so
+lib/mysql/plugin/component_udf_unreg_int_func.so
+lib/mysql/plugin/component_udf_unreg_real_func.so
+lib/mysql/plugin/component_validate_password.so
+lib/mysql/plugin/conflicting_variables.so
+lib/mysql/plugin/connection_control.so
+lib/mysql/plugin/daemon_example.ini
+lib/mysql/plugin/ddl_rewriter.so
+lib/mysql/plugin/group_replication.so
+lib/mysql/plugin/ha_example.so
+lib/mysql/plugin/ha_mock.so
+lib/mysql/plugin/keyring_file.so
+lib/mysql/plugin/keyring_udf.so
+lib/mysql/plugin/libdaemon_example.so
+lib/mysql/plugin/libtest_framework.so
+lib/mysql/plugin/libtest_services.so
+lib/mysql/plugin/libtest_services_threaded.so
+lib/mysql/plugin/libtest_session_attach.so
+lib/mysql/plugin/libtest_session_detach.so
+lib/mysql/plugin/libtest_session_in_thd.so
+lib/mysql/plugin/libtest_session_info.so
+lib/mysql/plugin/libtest_sql_2_sessions.so
+lib/mysql/plugin/libtest_sql_all_col_types.so
+lib/mysql/plugin/libtest_sql_cmds_1.so
+lib/mysql/plugin/libtest_sql_commit.so
+lib/mysql/plugin/libtest_sql_complex.so
+lib/mysql/plugin/libtest_sql_errors.so
+lib/mysql/plugin/libtest_sql_lock.so
+lib/mysql/plugin/libtest_sql_processlist.so
+lib/mysql/plugin/libtest_sql_replication.so
+lib/mysql/plugin/libtest_sql_reset_connection.so
+lib/mysql/plugin/libtest_sql_shutdown.so
+lib/mysql/plugin/libtest_sql_sleep_is_connected.so
+lib/mysql/plugin/libtest_sql_sqlmode.so
+lib/mysql/plugin/libtest_sql_stmt.so
+lib/mysql/plugin/libtest_sql_stored_procedures_functions.so
+lib/mysql/plugin/libtest_sql_views_triggers.so
+lib/mysql/plugin/libtest_x_sessions_deinit.so
+lib/mysql/plugin/libtest_x_sessions_init.so
+lib/mysql/plugin/locking_service.so
+lib/mysql/plugin/mypluglib.so
+lib/mysql/plugin/mysql_clone.so
+lib/mysql/plugin/mysql_no_login.so
+lib/mysql/plugin/pfs_example_plugin_employee.so
+lib/mysql/plugin/qa_auth_client.so
+lib/mysql/plugin/qa_auth_interface.so
+lib/mysql/plugin/qa_auth_server.so
+lib/mysql/plugin/replication_observers_example_plugin.so
+lib/mysql/plugin/rewrite_example.so
+lib/mysql/plugin/rewriter.so
+lib/mysql/plugin/semisync_master.so
+lib/mysql/plugin/semisync_replica.so
+lib/mysql/plugin/semisync_slave.so
+lib/mysql/plugin/semisync_source.so
+lib/mysql/plugin/test_security_context.so
+lib/mysql/plugin/test_services_command_services.so
+lib/mysql/plugin/test_services_host_application_signal.so
+lib/mysql/plugin/test_services_plugin_registry.so
+lib/mysql/plugin/test_udf_services.so
+lib/mysql/plugin/udf_example.so
+lib/mysql/plugin/validate_password.so
+lib/mysql/plugin/version_token.so
+lib/mysql/private/libprotobuf-lite.so.3.19.4
+lib/mysql/private/libprotobuf.so.3.19.4
+libexec/mysqld
+%%DATADIR%%/bulgarian/errmsg.sys
+%%DATADIR%%/charsets/Index.xml
+%%DATADIR%%/charsets/README
+%%DATADIR%%/charsets/armscii8.xml
+%%DATADIR%%/charsets/ascii.xml
+%%DATADIR%%/charsets/cp1250.xml
+%%DATADIR%%/charsets/cp1251.xml
+%%DATADIR%%/charsets/cp1256.xml
+%%DATADIR%%/charsets/cp1257.xml
+%%DATADIR%%/charsets/cp850.xml
+%%DATADIR%%/charsets/cp852.xml
+%%DATADIR%%/charsets/cp866.xml
+%%DATADIR%%/charsets/dec8.xml
+%%DATADIR%%/charsets/geostd8.xml
+%%DATADIR%%/charsets/greek.xml
+%%DATADIR%%/charsets/hebrew.xml
+%%DATADIR%%/charsets/hp8.xml
+%%DATADIR%%/charsets/keybcs2.xml
+%%DATADIR%%/charsets/koi8r.xml
+%%DATADIR%%/charsets/koi8u.xml
+%%DATADIR%%/charsets/latin1.xml
+%%DATADIR%%/charsets/latin2.xml
+%%DATADIR%%/charsets/latin5.xml
+%%DATADIR%%/charsets/latin7.xml
+%%DATADIR%%/charsets/macce.xml
+%%DATADIR%%/charsets/macroman.xml
+%%DATADIR%%/charsets/swe7.xml
+%%DATADIR%%/czech/errmsg.sys
+%%DATADIR%%/danish/errmsg.sys
+%%DATADIR%%/dictionary.txt
+%%DATADIR%%/dutch/errmsg.sys
+%%DATADIR%%/english/errmsg.sys
+%%DATADIR%%/estonian/errmsg.sys
+%%DATADIR%%/french/errmsg.sys
+%%DATADIR%%/german/errmsg.sys
+%%DATADIR%%/greek/errmsg.sys
+%%DATADIR%%/hungarian/errmsg.sys
+%%DATADIR%%/install_rewriter.sql
+%%DATADIR%%/italian/errmsg.sys
+%%DATADIR%%/japanese/errmsg.sys
+%%DATADIR%%/korean/errmsg.sys
+%%DATADIR%%/messages_to_clients.txt
+%%DATADIR%%/messages_to_error_log.txt
+%%DATADIR%%/mysql-log-rotate
+%%DATADIR%%/mysql.server
+%%DATADIR%%/mysqld_multi.server
+%%DATADIR%%/norwegian-ny/errmsg.sys
+%%DATADIR%%/norwegian/errmsg.sys
+%%DATADIR%%/polish/errmsg.sys
+%%DATADIR%%/portuguese/errmsg.sys
+%%DATADIR%%/romanian/errmsg.sys
+%%DATADIR%%/russian/errmsg.sys
+%%DATADIR%%/serbian/errmsg.sys
+%%DATADIR%%/slovak/errmsg.sys
+%%DATADIR%%/spanish/errmsg.sys
+%%DATADIR%%/swedish/errmsg.sys
+%%DATADIR%%/ukrainian/errmsg.sys
+%%DATADIR%%/uninstall_rewriter.sql
+%%DATADIR%%router/docs/sample_mysqlrouter.conf
+@dir %%ETCDIR%%/keyring
+@dir lib/mysql/plugin/debug
+@dir %%MY_SECDIR%%
+@dir %%MY_TMPDIR%%
diff --git a/databases/mysqlbackup/Makefile b/databases/mysqlbackup/Makefile
index bcaab56b5fdb..526a0da63807 100644
--- a/databases/mysqlbackup/Makefile
+++ b/databases/mysqlbackup/Makefile
@@ -1,5 +1,3 @@
-# Created by: Alexey Degtyarev <alexey@renatasystems.org>
-
 PORTNAME=	mysqlbackup
 PORTVERSION=	2.8
 CATEGORIES=	databases
@@ -7,6 +5,7 @@ MASTER_SITES=	ftp://ftp.renatasystems.org/pub/FreeBSD/ports/distfiles/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Creates MySQL backups on a periodic basis
+WWW=		https://code.google.com/archive/p/mysqlbackup/
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
@@ -21,7 +20,7 @@ PERIODICS=	200.mysqlbackup.daily \
 
 PLIST_FILES=	bin/mysqlbackup \
 		${PERIODICS:C,^(.*)\.(.*)$,\2/\1,:S,^,etc/periodic/,} \
-		man/man1/mysqlbackup.1.gz
+		share/man/man1/mysqlbackup.1.gz
 
 pre-install:
 	@${REINPLACE_CMD} ${SUB_LIST:S,$,!g,:S,^, -e s!%%,:S,=,%%!,} \
@@ -34,7 +33,7 @@ do-install:
 		${STAGEDIR}${PREFIX}/etc/periodic/${periodic:E}/${periodic:R}
 .endfor
 	${INSTALL_MAN} ${WRKSRC}/mysqlbackup.1 \
-		${STAGEDIR}${MANPREFIX}/man/man1/mysqlbackup.1
+		${STAGEDIR}${PREFIX}/share//man/man1/mysqlbackup.1
 	${INSTALL_SCRIPT} ${WRKSRC}/mysqlbackup \
 		${STAGEDIR}${PREFIX}/bin/mysqlbackup
 
diff --git a/databases/mysqlbackup/pkg-descr b/databases/mysqlbackup/pkg-descr
index 025ee43144a4..1b85611626c4 100644
--- a/databases/mysqlbackup/pkg-descr
+++ b/databases/mysqlbackup/pkg-descr
@@ -17,5 +17,3 @@ Why mysqlbackup?
 5. It can be safely used on a large MySQL installations (1000+ databases).
 
 6. It is written in sh - code interpreter available in a base system.
-
-WWW: https://code.google.com/archive/p/mysqlbackup/
diff --git a/databases/mysqlbigram/Makefile b/databases/mysqlbigram/Makefile
deleted file mode 100644
index 2bf4d8ecaa3f..000000000000
--- a/databases/mysqlbigram/Makefile
+++ /dev/null
@@ -1,29 +0,0 @@
-# Created by: Gea-Suan Lin <gslin@gslin.org>
-
-PORTNAME=	mysqlbigram
-PORTVERSION=	1.0.1
-PORTREVISION=	1
-CATEGORIES=	databases
-MASTER_SITES=	http://mysqlbigram.googlepages.com/
-DISTNAME=	bi_gram-src-${PORTVERSION}
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Simple n-gram (bi-gram) fulltext parser plugin for MySQL
-
-LICENSE=	LGPL21
-
-USES=		libtool mysql
-
-GNU_CONFIGURE=	yes
-IGNORE_WITH_MYSQL=	57 80 101m 102m 103m 57p 57w
-INSTALL_TARGET=	install-strip
-WRKSRC=		${WRKDIR}/bi_gram
-
-PLIST_FILES=	lib/mysql/bi_gramlib.so \
-		lib/mysql/bi_gramlib.so.0 \
-		lib/mysql/bi_gramlib.so.0.0.0
-
-post-patch:
-	@${REINPLACE_CMD} -e 's,bool ,my_&,' ${WRKSRC}/bi_gram_plugin.c
-
-.include <bsd.port.mk>
diff --git a/databases/mysqlbigram/distinfo b/databases/mysqlbigram/distinfo
deleted file mode 100644
index 25b0ab97ca40..000000000000
--- a/databases/mysqlbigram/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (bi_gram-src-1.0.1.tar.gz) = 06ebc2d61ac4809f3a3122def3600dbdcef15fb83a7277c4f8eba32e01b85ca8
-SIZE (bi_gram-src-1.0.1.tar.gz) = 308085
diff --git a/databases/mysqlbigram/pkg-descr b/databases/mysqlbigram/pkg-descr
deleted file mode 100644
index a1aefc5ab5a3..000000000000
--- a/databases/mysqlbigram/pkg-descr
+++ /dev/null
@@ -1,14 +0,0 @@
-MySQL has fulltext index search ability for text field, but it is word
-based index: it cannot be used for no word delimiter language like
-Japanese or Chinese.  It also can't search characters in the middle of
-a word (e.g. searching 'in' will not match word 'ping').
-
-Starting from MySQL 5.1, MySQL supports a plugin that allows to change
-server components (fulltext search parser) without restarting and/or
-recompiling the server.
-
-This n-gram parser uses this plugin interface to implement a simple
-n-gram (bi-gram) fulltext index parser which can be used for languages
-without word delimiters.
-
-WWW: http://mysqlbigram.googlepages.com/
diff --git a/databases/mysqldump-secure/Makefile b/databases/mysqldump-secure/Makefile
index bbd78ee932c5..3af572814a0b 100644
--- a/databases/mysqldump-secure/Makefile
+++ b/databases/mysqldump-secure/Makefile
@@ -1,11 +1,11 @@
-# Created by: <jsmith@resonatingmedia.com>
-
 PORTNAME=	mysqldump-secure
 PORTVERSION=	0.16.3
+PORTREVISION=	1
 CATEGORIES=	databases
 
 MAINTAINER=	jsmith@resonatingmedia.com
 COMMENT=	Simple tool for dumping/backing up MySQL and MariaDB databases
+WWW=		https://mysqldump-secure.org/
 
 LICENSE=	MIT
 
@@ -22,6 +22,6 @@ do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/build/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_DATA}  ${WRKSRC}/build/${PORTNAME}.conf ${STAGEDIR}${PREFIX}/etc/${PORTNAME}.conf.sample
 	${INSTALL_DATA}  ${WRKSRC}/build/${PORTNAME}.cnf ${STAGEDIR}${PREFIX}/etc/${PORTNAME}.cnf.sample
-	${INSTALL_MAN}  ${WRKSRC}/build/${PORTNAME}.1.gz ${STAGEDIR}${PREFIX}/man/man1
+	${INSTALL_MAN}  ${WRKSRC}/build/${PORTNAME}.1.gz ${STAGEDIR}${PREFIX}/share/man/man1
 
 .include <bsd.port.mk>
diff --git a/databases/mysqldump-secure/pkg-descr b/databases/mysqldump-secure/pkg-descr
index 727f88e5210c..ac501e8caa9a 100644
--- a/databases/mysqldump-secure/pkg-descr
+++ b/databases/mysqldump-secure/pkg-descr
@@ -2,5 +2,3 @@ Mysqldump-secure is a POSIX compliant open-source backup tool for MySQL
 databases with strong security in mind. It will backup every available database
 (which is readable by the specified user) as a separate file with the
 possibility to opt out via blacklisting.
-
-WWW: http://mysqldump-secure.org/
diff --git a/databases/mysqldump-secure/pkg-plist b/databases/mysqldump-secure/pkg-plist
index ff3c4bfecb62..6946b7d68884 100644
--- a/databases/mysqldump-secure/pkg-plist
+++ b/databases/mysqldump-secure/pkg-plist
@@ -1,4 +1,4 @@
 bin/mysqldump-secure
 @sample etc/mysqldump-secure.cnf.sample
 @sample etc/mysqldump-secure.conf.sample
-man/man1/mysqldump-secure.1.gz
+share/man/man1/mysqldump-secure.1.gz
diff --git a/databases/mysqlreport/Makefile b/databases/mysqlreport/Makefile
index 7c03e39476ac..86f6915797ca 100644
--- a/databases/mysqlreport/Makefile
+++ b/databases/mysqlreport/Makefile
@@ -1,23 +1,22 @@
-# Created by: Alexander Zhuravlev <zaa@zaa.pp.ru>
-
 PORTNAME=	mysqlreport
 PORTVERSION=	3.5
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	databases
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Mysqlreport makes a friendly report of important MySQL status values
+WWW=		https://hackmysql.com/mysqlreport
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS=	p5-DBD-mysql>=0:databases/p5-DBD-mysql \
+RUN_DEPENDS=	${DBD_MYSQL} \
 		p5-DBI>=0:databases/p5-DBI \
 		p5-Term-ReadKey>=0:devel/p5-Term-ReadKey
 
 NO_ARCH=	yes
 NO_BUILD=	yes
-USES=		perl5 shebangfix
+USES=		mysql perl5 shebangfix
 WRKSRC_SUBDIR=	${PORTNAME}
 
 PLIST_FILES=	bin/mysqlreport
diff --git a/databases/mysqlreport/pkg-descr b/databases/mysqlreport/pkg-descr
index 95fe30d921e0..8a7aa44c9ee3 100644
--- a/databases/mysqlreport/pkg-descr
+++ b/databases/mysqlreport/pkg-descr
@@ -4,5 +4,3 @@ report that provides a much more in-depth understanding of how well
 MySQL is running. For this and many other reasons, mysqlreport is
 a better alternative (and practically the only alternative) to
 manually interpreting SHOW STATUS.
-
-WWW: http://hackmysql.com/mysqlreport
diff --git a/databases/mysqlsla/Makefile b/databases/mysqlsla/Makefile
index 7fb57f4cae2a..8b3ccfa9615f 100644
--- a/databases/mysqlsla/Makefile
+++ b/databases/mysqlsla/Makefile
@@ -1,12 +1,11 @@
-# Created by: Alexander Zhuravlev <zaa@zaa.pp.ru>
-
 PORTNAME=	mysqlsla
 PORTVERSION=	2.03
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	databases
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Mysqlsla analyzes general, slow, and raw MySQL statement logs
+WWW=		https://hackmysql.com/mysqlsla
 
 LICENSE=	GPLv2+
 
@@ -18,7 +17,7 @@ USES=		perl5 shebangfix
 WRKSRC_SUBDIR=	${PORTNAME}
 
 PLIST_FILES=	bin/mysqlsla \
-		man/man3/mysqlsla.3.gz
+		share/man/man3/mysqlsla.3.gz
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	daniel-nichter
@@ -32,6 +31,6 @@ do-build:
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/bin/mysqlsla ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/mysqlsla.3 ${STAGEDIR}${MAN3PREFIX}/man/man3
+	${INSTALL_MAN} ${WRKSRC}/mysqlsla.3 ${STAGEDIR}${PREFIX}/share/man/man3
 
 .include <bsd.port.mk>
diff --git a/databases/mysqlsla/pkg-descr b/databases/mysqlsla/pkg-descr
index e45f297ee1fb..37df0fc0f7f5 100644
--- a/databases/mysqlsla/pkg-descr
+++ b/databases/mysqlsla/pkg-descr
@@ -8,5 +8,3 @@ output of each analysis to the top N queries, averaging execution
 time over N runs, customizing the order in which the analyses are
 ran, statement filtering, statement pattern matching, and
 mysqldumpslow-like formatting.
-
-WWW: http://hackmysql.com/mysqlsla
diff --git a/databases/mysqlsniffer/Makefile b/databases/mysqlsniffer/Makefile
deleted file mode 100644
index 84b70e5ab4b4..000000000000
--- a/databases/mysqlsniffer/Makefile
+++ /dev/null
@@ -1,30 +0,0 @@
-# Created by: Frederic Hardy <frederic.hardy@mageekbox.net>
-
-PORTNAME=	mysqlsniffer
-PORTVERSION=	1.2
-CATEGORIES=	databases
-
-MAINTAINER=	frederic.hardy@mageekbox.net
-COMMENT=	Tcpdump clone specifically for MySQL
-
-BROKEN_FreeBSD_13=	ld: error: duplicate symbol: decoded_len
-BROKEN_FreeBSD_14=	ld: error: duplicate symbol: decoded_len
-
-WRKSRC_SUBDIR=	${PORTNAME}
-
-PLIST_FILES=	bin/mysqlsniffer
-
-USE_GITHUB=	yes
-GH_ACCOUNT=	daniel-nichter
-GH_PROJECT=	hackmysql.com
-GH_TAGNAME=	ddb6f92
-
-do-build:
-	${CC} ${CFLAGS} -lpcap -o ${WRKSRC}/${PORTNAME} \
-		${WRKSRC}/mysqlsniffer.c ${WRKSRC}/packet_handlers.c \
-			${WRKSRC}/misc.c
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
-
-.include <bsd.port.mk>
diff --git a/databases/mysqlsniffer/distinfo b/databases/mysqlsniffer/distinfo
deleted file mode 100644
index 2190f1a58163..000000000000
--- a/databases/mysqlsniffer/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (daniel-nichter-hackmysql.com-1.2-ddb6f92_GH0.tar.gz) = ef8ce294e52a795388d96fb7fc8a3b1f7b90ac480b6c14683bcb8d3ce67571fb
-SIZE (daniel-nichter-hackmysql.com-1.2-ddb6f92_GH0.tar.gz) = 1954606
diff --git a/databases/mysqlsniffer/files/patch-misc.c b/databases/mysqlsniffer/files/patch-misc.c
deleted file mode 100644
index 9bdd2a82795b..000000000000
--- a/databases/mysqlsniffer/files/patch-misc.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- misc.c.orig	2006-08-18 14:37:02 UTC
-+++ misc.c
-@@ -4,6 +4,7 @@
- #include <stdlib.h>
- #include <string.h>
- #include <ctype.h>
-+#include <sys/types.h>
- #include "user_defines.h"
- #include "mysql_defines.h"
- #include "misc.h"
diff --git a/databases/mysqlsniffer/files/patch-mysqlsniffer.c b/databases/mysqlsniffer/files/patch-mysqlsniffer.c
deleted file mode 100644
index d233e4f6757c..000000000000
--- a/databases/mysqlsniffer/files/patch-mysqlsniffer.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- mysqlsniffer.c.orig	2006-08-18 14:52:52 UTC
-+++ mysqlsniffer.c
-@@ -31,6 +31,7 @@
- #include <getopt.h>
- #include <signal.h>
- #include <sys/socket.h>
-+#include <sys/types.h>
- #include <netinet/in.h>
- #include <arpa/inet.h>
- #include "user_defines.h"
diff --git a/databases/mysqlsniffer/files/patch-packet_handlers.c b/databases/mysqlsniffer/files/patch-packet_handlers.c
deleted file mode 100644
index 5d6e8f6ce526..000000000000
--- a/databases/mysqlsniffer/files/patch-packet_handlers.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- packet_handlers.c.orig	2006-08-18 14:37:02 UTC
-+++ packet_handlers.c
-@@ -3,6 +3,7 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
-+#include <sys/types.h>
- #include "mysql_defines.h"
- #include "user_defines.h"
- #include "state_map.h"
diff --git a/databases/mysqlsniffer/pkg-descr b/databases/mysqlsniffer/pkg-descr
deleted file mode 100644
index 106a00c090a6..000000000000
--- a/databases/mysqlsniffer/pkg-descr
+++ /dev/null
@@ -1,6 +0,0 @@
-mysqlsniffer is a tcpdump clone specifically for dumping/sniffing/watching MySQL
-network protocol traffic over TCP/IP networks.
-mysqlsniffer is coded in C using the pcap library and works with MySQL version
-4.0 and newer. mysqlsniffer is the only MySQL-specific network sniffer.
-
-WWW: http://hackmysql.com/mysqlsniffer
diff --git a/databases/mysqltcl/Makefile b/databases/mysqltcl/Makefile
index 6a1d7ef68575..17651078864a 100644
--- a/databases/mysqltcl/Makefile
+++ b/databases/mysqltcl/Makefile
@@ -1,21 +1,22 @@
-# Created by: Martin Matuska <martin@matuska.org>
-
 PORTNAME=	mysqltcl
 PORTVERSION=	3.052
+PORTREVISION=	2
 CATEGORIES=	databases tcl
 MASTER_SITES=	http://www.xdobry.de/mysqltcl/
 
 MAINTAINER=	tcltk@FreeBSD.org
 COMMENT=	TCL module for accessing MySQL databases based on msqltcl
+WWW=		http://www.xdobry.de/mysqltcl/
 
 USES=		mysql tcl
 USE_LDCONFIG=	yes
 
 PLIST_FILES=	lib/${PORTNAME}-${PORTVERSION}/libmysqltcl${PORTVERSION}.so \
 		lib/${PORTNAME}-${PORTVERSION}/pkgIndex.tcl \
-		man/mann/mysqltcl.n.gz
+		share/man/mann/mysqltcl.n.gz
 
 GNU_CONFIGURE=	yes
+GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
 
 CONFIGURE_ARGS+=--with-tcl=${TCL_LIBDIR} \
 		--with-mysql-include=${LOCALBASE}/include/mysql \
diff --git a/databases/mysqltcl/files/patch-generic_mysqltcl.c b/databases/mysqltcl/files/patch-generic_mysqltcl.c
new file mode 100644
index 000000000000..477c951daee7
--- /dev/null
+++ b/databases/mysqltcl/files/patch-generic_mysqltcl.c
@@ -0,0 +1,11 @@
+--- generic/mysqltcl.c.orig	2024-01-26 14:58:40 UTC
++++ generic/mysqltcl.c
+@@ -911,7 +911,7 @@ static int Mysqltcl_Connect(ClientData clientData, Tcl
+ #if (MYSQL_VERSION_ID>=32350)

+   if(mysql_options_reconnect)

+   {

+-      my_bool reconnect = 1;

++      bool reconnect = 1;

+       mysql_options(handle->connection, MYSQL_OPT_RECONNECT, &reconnect);

+   }

+   mysql_options(handle->connection,MYSQL_READ_DEFAULT_GROUP,groupname);

diff --git a/databases/mysqltcl/pkg-descr b/databases/mysqltcl/pkg-descr
index 5c9af5b384d0..ae5dc7391915 100644
--- a/databases/mysqltcl/pkg-descr
+++ b/databases/mysqltcl/pkg-descr
@@ -10,5 +10,3 @@ From the package man-page:
        use direkt official MySQL C-API. Almost all Tcl commands correspond  to
        MySQL  C-API functions.  For detail documentation see official MySQL C-
        API manual.
-
-WWW: http://www.xdobry.de/mysqltcl/
diff --git a/databases/mysqltuner/Makefile b/databases/mysqltuner/Makefile
index d816e36fb452..aa62986280be 100644
--- a/databases/mysqltuner/Makefile
+++ b/databases/mysqltuner/Makefile
@@ -1,11 +1,12 @@
-# Created by: Wen heping <wenheping@gmail.com>
-
 PORTNAME=	mysqltuner
-PORTVERSION=	1.7.21
+PORTVERSION=	2.5.2
+DISTVERSIONPREFIX=	v
+PORTREVISION=	1
 CATEGORIES=	databases
 
 MAINTAINER=	pi@FreeBSD.org
 COMMENT=	Assist you with MySQL Configuration
+WWW=		https://github.com/major/MySQLTuner-perl
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
diff --git a/databases/mysqltuner/distinfo b/databases/mysqltuner/distinfo
index ade4fcd5ca86..4614fa950c6b 100644
--- a/databases/mysqltuner/distinfo
+++ b/databases/mysqltuner/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1612602439
-SHA256 (major-MySQLTuner-perl-1.7.21_GH0.tar.gz) = b6e39f0768a132bca59708f4d7b0edba935a0f59bbb3ac38023d5835f7563caa
-SIZE (major-MySQLTuner-perl-1.7.21_GH0.tar.gz) = 223961
+TIMESTAMP = 1710071437
+SHA256 (major-MySQLTuner-perl-v2.5.2_GH0.tar.gz) = 4923ca0a6184c6b3e77a98dd097f99cbdb3adaf334e45a9e4b5aa620cd83ae68
+SIZE (major-MySQLTuner-perl-v2.5.2_GH0.tar.gz) = 5132683
diff --git a/databases/mysqltuner/files/patch-mysqltuner.pl b/databases/mysqltuner/files/patch-mysqltuner.pl
new file mode 100644
index 000000000000..29ba8d4e50a3
--- /dev/null
+++ b/databases/mysqltuner/files/patch-mysqltuner.pl
@@ -0,0 +1,7 @@
+--- mysqltuner.pl.orig	2024-03-14 16:58:27 UTC
++++ mysqltuner.pl
+@@ -1,3 +1,4 @@
++#!/usr/local/bin/perl
+ # mysqltuner.pl - Version 2.5.2
+ # High Performance MySQL Tuning Script
+ # Copyright (C) 2015-2023 Jean-Marie Renouard - jmrenouard@gmail.com
diff --git a/databases/mysqltuner/pkg-descr b/databases/mysqltuner/pkg-descr
index cb9b67f234fc..9dd6c6ed8d96 100644
--- a/databases/mysqltuner/pkg-descr
+++ b/databases/mysqltuner/pkg-descr
@@ -4,5 +4,3 @@ recommendations for increased performance and
 stability. Within seconds, it will display
 statistics about your MySQL installation and the
 areas where it can be improved.
-
-WWW: https://github.com/major/MySQLTuner-perl
diff --git a/databases/mysqlwsrep56-server/Makefile b/databases/mysqlwsrep56-server/Makefile
deleted file mode 100644
index 1930386321ac..000000000000
--- a/databases/mysqlwsrep56-server/Makefile
+++ /dev/null
@@ -1,164 +0,0 @@
-# Created by: Philip Stoev <philip.stoev@galeracluster.com>
-
-PORTNAME=	mysqlwsrep
-PORTVERSION?=	5.6.51
-DISTVERSIONPREFIX?=	wsrep_
-DISTVERSIONSUFFIX?=	-25.33
-PORTREVISION?=	0
-CATEGORIES=	databases
-PKGNAMESUFFIX=	56-server
-
-MAINTAINER=	devel@galeracluster.com
-COMMENT=	MySQL database enhanced with Galera replication (server package)
-
-LICENSE=	GPLv2
-
-NOT_FOR_ARCHS=		aarch64 armv6 armv7 powerpc64
-NOT_FOR_ARCHS_REASON=	error: Unsupported platform
-
-RUN_DEPENDS=	bash:shells/bash \
-		rsync:net/rsync \
-		socat:net/socat
-LIB_DEPENDS=	libevent.so:devel/libevent liblz4.so:archivers/liblz4
-
-USES=		bison \
-		cmake:noninja \
-		compiler:c++11-lib \
-		compiler:c11 \
-		mysql:56 \
-		libedit \
-		perl5 \
-		shebangfix \
-		ssl
-
-DATADIR=	${PREFIX}/share/mysql
-ETCDIR=		${PREFIX}/etc/mysql
-
-USE_PERL5=	run
-USE_LDCONFIG=	yes
-
-USE_GITHUB=	yes
-GH_TUPLE?=	codership:mysql-wsrep:${DISTVERSIONPREFIX}${PORTVERSION}${DISTVERSIONSUFFIX} \
-		codership:wsrep-API:eab2d5d5a31672c0b7d116ef1629ff18392fd7d0:dummy/wsrep/src
-
-MY_DBDIR=	/var/db/mysql
-MY_SECDIR=	/var/db/mysql_secure
-MY_TMPDIR=	/var/db/mysql_tmpdir
-
-CMAKE_ARGS+=	-DINSTALL_LAYOUT=FREEBSD \
-		-DINSTALL_LDCONFIGDIR="${LOCALBASE}/libdata/ldconfig" \
-		-DINSTALL_PKGCONFIGDIR="${LOCALBASE}/libdata/pkgconfig" \
-		-DINSTALL_DOCDIR="share/doc/mysql" \
-		-DINSTALL_DOCREADMEDIR="share/doc/mysql" \
-		-DINSTALL_INCLUDEDIR="include/mysql" \
-		-DINSTALL_INFODIR="info" \
-		-DINSTALL_LIBDIR="lib/mysql" \
-		-DINSTALL_MANDIR="man" \
-		-DINSTALL_MYSQLDATADIR="${MY_DBDIR}" \
-		-DINSTALL_MYSQLKEYRINGDIR="etc/mysql/keyring" \
-		-DINSTALL_MYSQLSHAREDIR="share/mysql" \
-		-DINSTALL_MYSQLTESTDIR="share/mysql/tests" \
-		-DINSTALL_PLUGINDIR="lib/mysql/plugin" \
-		-DINSTALL_SBINDIR="libexec" \
-		-DINSTALL_SCRIPTDIR="bin" \
-		-DINSTALL_SECURE_FILE_PRIVDIR="${MY_SECDIR}" \
-		-DINSTALL_SHAREDIR="share" \
-		-DINSTALL_SQLBENCHDIR="share/mysql" \
-		-DINSTALL_SUPPORTFILESDIR="share/mysql" \
-		-DMYSQL_KEYRINGDIR="${ETCDIR}/keyring" \
-		-DWITH_EDITLINE=system \
-		-DWITH_LIBEVENT=system \
-		-DWITH_LZ4=system \
-		-DWITH_ZLIB=system \
-		-DWITH_SSL=${OPENSSLBASE} \
-		-DCRYPTO_LIBRARY=${OPENSSLLIB}/libcrypto.so \
-		-DOPENSSL_LIBRARY=${OPENSSLLIB}/libssl.so \
-		-DINSTALL_MYSQLTESTDIR=0 \
-		-DWITH_LIBWRAP=1 \
-		-DWITHOUT_EXAMPLE_STORAGE_ENGINE=1 \
-		-DWITH_WSREP=1
-
-SHEBANG_FILES=	scripts/*.pl* scripts/*.sh scripts/wsrep_sst_*
-
-.ifdef USE_MYSQL
-.error You have USE_MYSQL variable defined either in environment or in make(1) arguments. Please undefine it and try again.
-.endif
-
-SUB_LIST=	MY_DBDIR=${MY_DBDIR} \
-		MY_SECDIR=${MY_SECDIR} \
-		MY_TMPDIR=${MY_TMPDIR}
-
-PLIST_SUB=	MY_DBDIR=${MY_DBDIR} \
-		MY_SECDIR=${MY_SECDIR} \
-		MY_TMPDIR=${MY_TMPDIR}
-
-CONFLICTS_INSTALL=	mariadb*-server-* \
-			mysql[0-9]*-server-* \
-			mysqlwsrep57*-server-* \
-			mysqlwsrep[1-489]*-server-* \
-			percona*-server-*
-
-USE_RC_SUBR=	mysql-server
-
-SUB_FILES=	my.cnf.sample
-
-USERS=		mysql
-GROUPS=		mysql
-
-MMAN1=		my_print_defaults.1 \
-		myisam_ftdump.1 \
-		myisamchk.1 \
-		myisamlog.1 \
-		myisampack.1 \
-		mysql.server.1 \
-		mysql_convert_table_format.1 \
-		mysql_fix_extensions.1 \
-		mysql_install_db.1 \
-		mysql_plugin.1 \
-		mysql_secure_installation.1 \
-		mysql_setpermission.1 \
-		mysql_tzinfo_to_sql.1 \
-		mysql_upgrade.1 \
-		mysql_zap.1 \
-		mysqlbug.1 \
-		mysqld_multi.1 \
-		mysqld_safe.1 \
-		mysqldumpslow.1 \
-		mysqlhotcopy.1 \
-		mysqlman.1 \
-		perror.1 \
-		replace.1 \
-		resolve_stack_dump.1 \
-		resolveip.1
-
-.include <bsd.port.options.mk>
-
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1200057
-SUB_LIST+=	LEGACY_LIMITS="@comment " MODERN_LIMITS=""
-.else
-SUB_LIST+=	LEGACY_LIMITS="" MODERN_LIMITS="@comment "
-.endif
-
-.include <bsd.port.pre.mk>
-
-# Plugin innodb_memcached requires -fcommon to avoid duplicate symbol linker
-# error with llmv11.
-.if ${CHOSEN_COMPILER_TYPE} == clang && ${OPSYS} == FreeBSD && ${OSVERSION} >= 1300109
-CFLAGS+=	-fcommon
-.endif
-
-post-patch:
-	${REINPLACE_CMD} 's/*.1/${MMAN1}/' ${WRKSRC}/man/CMakeLists.txt
-
-post-install:
-	${MKDIR} ${STAGEDIR}${ETCDIR}
-	${INSTALL_DATA} ${WRKDIR}/my.cnf.sample ${STAGEDIR}${ETCDIR}/my.cnf.sample
-	${MKDIR} ${STAGEDIR}${ETCDIR}/keyring
-	${MKDIR} ${STAGEDIR}${MY_SECDIR}
-	${MKDIR} ${STAGEDIR}${MY_TMPDIR}
-
-.if ${ARCH} == armv6 || ${ARCH} == armv7
-EXTRA_PATCHES+=	${FILESDIR}/extra-patch-config.h.cmake
-.endif
-
-.include <bsd.port.post.mk>
diff --git a/databases/mysqlwsrep56-server/distinfo b/databases/mysqlwsrep56-server/distinfo
deleted file mode 100644
index bcb28e57b01b..000000000000
--- a/databases/mysqlwsrep56-server/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-TIMESTAMP = 1617279623
-SHA256 (codership-mysql-wsrep-wsrep_5.6.51-25.33_GH0.tar.gz) = e5d8f959a2b3ece76475f4e8eb819d14b26fc53c8ce38cef63d1d2399353b727
-SIZE (codership-mysql-wsrep-wsrep_5.6.51-25.33_GH0.tar.gz) = 32718986
-SHA256 (codership-wsrep-API-eab2d5d5a31672c0b7d116ef1629ff18392fd7d0_GH0.tar.gz) = 3c235868ed330d8d702e7b7541c24c1926b1fd9e6b8aa673b032a2318896e8a0
-SIZE (codership-wsrep-API-eab2d5d5a31672c0b7d116ef1629ff18392fd7d0_GH0.tar.gz) = 47032
diff --git a/databases/mysqlwsrep56-server/files/extra-patch-config.h.cmake b/databases/mysqlwsrep56-server/files/extra-patch-config.h.cmake
deleted file mode 100644
index 3ac1add1b9ce..000000000000
--- a/databases/mysqlwsrep56-server/files/extra-patch-config.h.cmake
+++ /dev/null
@@ -1,12 +0,0 @@
---- config.h.cmake.orig	2014-12-05 16:24:02 UTC
-+++ config.h.cmake
-@@ -151,7 +151,8 @@
- #cmakedefine HAVE_FESETROUND 1
- #cmakedefine HAVE_FINITE 1
- #cmakedefine HAVE_FP_EXCEPT 1
--#cmakedefine HAVE_FPSETMASK 1
-+#cmakedefine HAVE_FPSETMASK 0
-+#cmakedefine HAVE_FEDISABLEEXCEPT 1
- #cmakedefine HAVE_FSEEKO 1
- #cmakedefine HAVE_FSYNC 1
- #cmakedefine HAVE_FTIME 1
diff --git a/databases/mysqlwsrep56-server/files/my.cnf.sample.in b/databases/mysqlwsrep56-server/files/my.cnf.sample.in
deleted file mode 100644
index 5d8056748079..000000000000
--- a/databases/mysqlwsrep56-server/files/my.cnf.sample.in
+++ /dev/null
@@ -1,61 +0,0 @@
-[client]
-port                            = 3306
-socket                          = /tmp/mysql.sock
-
-[mysql]
-prompt                          = \u@\h [\d]>\_
-no_auto_rehash
-
-[mysqld]
-user                            = mysql
-port                            = 3306
-socket                          = /tmp/mysql.sock
-bind-address                    = 127.0.0.1
-basedir                         = %%PREFIX%%
-datadir                         = %%MY_DBDIR%%
-tmpdir                          = %%MY_TMPDIR%%
-slave-load-tmpdir               = %%MY_TMPDIR%%
-secure-file-priv                = %%MY_SECDIR%%
-log-bin                         = mysql-bin
-log-output                      = TABLE
-master-info-repository          = TABLE
-relay-log-info-repository       = TABLE
-relay-log-recovery              = 1
-slow-query-log                  = 1
-server-id                       = 1
-sync_binlog                     = 1
-sync_relay_log                  = 1
-binlog_cache_size               = 16M
-expire_logs_days                = 30
-log-slave-updates               = 1
-enforce-gtid-consistency        = 1
-gtid-mode                       = ON
-safe-user-create                = 1
-lower_case_table_names          = 1
-explicit-defaults-for-timestamp = 1
-myisam-recover-options          = BACKUP,FORCE
-open_files_limit                = 32768
-table_open_cache                = 16384
-table_definition_cache          = 8192
-net_retry_count                 = 16384
-key_buffer_size                 = 256M
-max_allowed_packet              = 64M
-query_cache_type                = 0
-query_cache_size                = 0
-long_query_time                 = 0.5
-innodb_buffer_pool_size         = 1G
-innodb_data_home_dir            = %%MY_DBDIR%%
-innodb_log_group_home_dir       = %%MY_DBDIR%%
-innodb_data_file_path           = ibdata1:128M:autoextend
-innodb_flush_method             = O_DIRECT
-innodb_log_file_size            = 256M
-innodb_log_buffer_size          = 16M
-innodb_write_io_threads         = 8
-innodb_read_io_threads          = 8
-innodb_autoinc_lock_mode        = 2
-skip-symbolic-links
-
-[mysqldump]
-max_allowed_packet              = 256M
-quote_names
-quick
diff --git a/databases/mysqlwsrep56-server/files/mysql-server.in b/databases/mysqlwsrep56-server/files/mysql-server.in
deleted file mode 100644
index d6693957b2d4..000000000000
--- a/databases/mysqlwsrep56-server/files/mysql-server.in
+++ /dev/null
@@ -1,95 +0,0 @@
-#!/bin/sh
-
-# PROVIDE: mysql
-# REQUIRE: LOGIN
-# KEYWORD: shutdown
-
-#
-# Add the following line to /etc/rc.conf to enable mysql:
-# mysql_enable (bool):	Set to "NO" by default.
-#			Set it to "YES" to enable MySQL.
-%%LEGACY_LIMITS%%# mysql_limits (bool):	Set to "NO" by default.
-%%LEGACY_LIMITS%%#			Set it to yes to run `limits -e -U mysql`
-%%LEGACY_LIMITS%%#			just before mysql starts.
-# mysql_dbdir (str):	Default to "/var/db/mysql"
-#			Base database directory.
-# mysql_optfile (str):	Server-specific option file.
-#			Default to "${mysql_dbdir}/my.cnf".
-# mysql_pidfile (str):	Custum PID file path and name.
-#			Default to "${mysql_dbdir}/${hostname}.pid".
-# mysql_args (str):	Custom additional arguments to be passed
-#			to mysqld_safe (default empty).
-#
-
-. /etc/rc.subr
-
-name="mysql"
-rcvar=mysql_enable
-
-load_rc_config $name
-
-: ${mysql_enable="NO"}
-%%LEGACY_LIMITS%%: ${mysql_limits="NO"}
-: ${mysql_dbdir="/var/db/mysql"}
-: ${mysql_optfile="${mysql_dbdir}/my.cnf"}
-
-mysql_user="mysql"
-%%LEGACY_LIMITS%%mysql_limits_args="-e -U ${mysql_user}"
-: ${hostname:=`/bin/hostname`}
-pidfile=${mysql_pidfile:-"${mysql_dbdir}/${hostname}.pid"}
-command="/usr/sbin/daemon"
-command_args="-c -f %%PREFIX%%/bin/mysqld_safe --defaults-extra-file=${mysql_optfile} --user=${mysql_user} --datadir=${mysql_dbdir} --pid-file=${pidfile} ${mysql_args}"
-procname="%%PREFIX%%/libexec/mysqld"
-start_precmd="${name}_prestart"
-start_postcmd="${name}_poststart"
-mysql_install_db="%%PREFIX%%/bin/mysql_install_db"
-mysql_install_db_args="--basedir=%%PREFIX%% --defaults-extra-file=${mysql_optfile} --datadir=${mysql_dbdir} --force"
-service_startup_timeout=900
-startup_sleep=1
-sst_progress_file=${mysql_dbdir}/sst_in_progress
-extra_commands="bootstrap"
-bootstrap_cmd="mysql_bootstrap"
-
-mysql_bootstrap()
-{
-       # Bootstrap the cluster, start the first node that initiate the cluster
-       check_startmsgs && echo "Bootstrapping cluster"
-       shift
-       command_args="$command_args --wsrep-new-cluster"
-       run_rc_command ${_rc_prefix}start
-}
-
-mysql_create_auth_tables()
-{
-	eval $mysql_install_db $mysql_install_db_args >/dev/null 2>/dev/null
-        [ $? -eq 0 ] && chown -R ${mysql_user}:${mysql_user} ${mysql_dbdir}
-}
-
-mysql_prestart()
-{
-	if [ ! -d "${mysql_dbdir}/mysql/." ]; then
-		mysql_create_auth_tables || return 1
-	fi
-%%LEGACY_LIMITS%%	if checkyesno mysql_limits; then
-%%LEGACY_LIMITS%%		eval `/usr/bin/limits ${mysql_limits_args}` 2>/dev/null
-%%LEGACY_LIMITS%%	else
-%%LEGACY_LIMITS%%		return 0
-%%LEGACY_LIMITS%%	fi
-%%MODERN_LIMITS%%	return 0
-}
-
-mysql_poststart()
-{
-        local timeout=${service_startup_timeout}
-        while [ ! -f "${pidfile}" -a ${timeout} -gt 0 ]; do
-                if test -e $sst_progress_file && [ $startup_sleep -ne 100 ]; then
-                        check_startmsgs && echo "SST in progress, setting sleep higher"
-                        startup_sleep=100
-                fi
-                timeout=$(( timeout - 1 ))
-                sleep $startup_sleep
-        done
-        return 0
-}
-
-run_rc_command "$1"
diff --git a/databases/mysqlwsrep56-server/files/patch-CMakeLists.txt b/databases/mysqlwsrep56-server/files/patch-CMakeLists.txt
deleted file mode 100644
index 673eaff31676..000000000000
--- a/databases/mysqlwsrep56-server/files/patch-CMakeLists.txt
+++ /dev/null
@@ -1,42 +0,0 @@
---- CMakeLists.txt.orig	2019-10-21 05:17:49 UTC
-+++ CMakeLists.txt
-@@ -568,12 +568,10 @@ IF(UNIX)
- ENDIF()
- 
- IF(NOT WITHOUT_SERVER)
--  ADD_SUBDIRECTORY(tests)
-   ADD_SUBDIRECTORY(sql)
-   OPTION (WITH_EMBEDDED_SERVER "Compile MySQL with embedded server" OFF)
-   IF(WITH_EMBEDDED_SERVER) 
-    ADD_SUBDIRECTORY(libmysqld)
--   ADD_SUBDIRECTORY(libmysqld/examples)
-   ENDIF(WITH_EMBEDDED_SERVER)
- ENDIF()
- 
-@@ -582,10 +580,7 @@ ENDIF()
- ADD_SUBDIRECTORY(scripts)
- 
- IF(NOT WITHOUT_SERVER)
--  ADD_SUBDIRECTORY(mysql-test)
--  ADD_SUBDIRECTORY(mysql-test/lib/My/SafeProcess)
-   ADD_SUBDIRECTORY(support-files)
--  ADD_SUBDIRECTORY(sql-bench)
-   IF(EXISTS ${CMAKE_SOURCE_DIR}/internal/CMakeLists.txt)
-     ADD_SUBDIRECTORY(internal)
-   ENDIF()
-@@ -644,6 +639,7 @@ ENDIF()
- #
- # RPM installs documentation directly from the source tree
- #
-+IF(FALSE)
- IF(NOT INSTALL_LAYOUT MATCHES "RPM")
-   INSTALL(FILES
-     README
-@@ -664,6 +660,7 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM")
-     PATTERN "mysql.info" EXCLUDE
-     PATTERN "sp-imp-spec.txt" EXCLUDE
-   )
-+ENDIF()
- ENDIF()
- 
- INCLUDE(CPack)
diff --git a/databases/mysqlwsrep56-server/files/patch-client_CMakeLists.txt b/databases/mysqlwsrep56-server/files/patch-client_CMakeLists.txt
deleted file mode 100644
index d0de40f2a40a..000000000000
--- a/databases/mysqlwsrep56-server/files/patch-client_CMakeLists.txt
+++ /dev/null
@@ -1,65 +0,0 @@
---- client/CMakeLists.txt.orig	2019-10-21 05:17:49 UTC
-+++ client/CMakeLists.txt
-@@ -34,17 +34,20 @@ INCLUDE_DIRECTORIES(
- 
- 
- ADD_DEFINITIONS(${SSL_DEFINES})
-+IF(FALSE)
- MYSQL_ADD_EXECUTABLE(mysql completion_hash.cc mysql.cc readline.cc sql_string.cc)
- TARGET_LINK_LIBRARIES(mysql mysqlclient)
- IF(UNIX)
-   TARGET_LINK_LIBRARIES(mysql ${EDITLINE_LIBRARY})
- ENDIF(UNIX)
-+ENDIF()
- 
- MYSQL_ADD_EXECUTABLE(mysqltest mysqltest.cc COMPONENT Test)
- SET_SOURCE_FILES_PROPERTIES(mysqltest.cc PROPERTIES COMPILE_FLAGS "-DTHREADS")
- TARGET_LINK_LIBRARIES(mysqltest mysqlclient regex)
- ADD_DEPENDENCIES(mysqltest GenError)
- 
-+IF(FALSE)
- MYSQL_ADD_EXECUTABLE(mysqlcheck mysqlcheck.c)
- TARGET_LINK_LIBRARIES(mysqlcheck mysqlclient)
- 
-@@ -54,17 +57,21 @@ TARGET_LINK_LIBRARIES(mysqldump mysqlclient)
- MYSQL_ADD_EXECUTABLE(mysqlimport mysqlimport.c)
- SET_SOURCE_FILES_PROPERTIES(mysqlimport.c PROPERTIES COMPILE_FLAGS "-DTHREADS")
- TARGET_LINK_LIBRARIES(mysqlimport mysqlclient)
-+ENDIF()
- 
- MYSQL_ADD_EXECUTABLE(mysql_upgrade mysql_upgrade.c)
- TARGET_LINK_LIBRARIES(mysql_upgrade mysqlclient)
- ADD_DEPENDENCIES(mysql_upgrade GenFixPrivs)
- 
-+IF(FALSE)
- MYSQL_ADD_EXECUTABLE(mysqlshow mysqlshow.c)
- TARGET_LINK_LIBRARIES(mysqlshow mysqlclient)
-+ENDIF()
- 
- MYSQL_ADD_EXECUTABLE(mysql_plugin mysql_plugin.c)
- TARGET_LINK_LIBRARIES(mysql_plugin mysqlclient)
- 
-+IF(FALSE)
- MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc)
- TARGET_LINK_LIBRARIES(mysqlbinlog mysqlclient)
- 
-@@ -77,6 +84,7 @@ TARGET_LINK_LIBRARIES(mysqlslap mysqlclient)
- 
- MYSQL_ADD_EXECUTABLE(mysql_config_editor mysql_config_editor.cc)
- TARGET_LINK_LIBRARIES(mysql_config_editor mysqlclient)
-+ENDIF()
- 
- # "WIN32" also covers 64 bit. "echo" is used in some files below "mysql-test/".
- IF(WIN32)
-@@ -86,11 +94,6 @@ ENDIF(WIN32)
- SET_TARGET_PROPERTIES (
-   mysql_plugin 
-   mysql_upgrade
--  mysqlcheck
--  mysqldump
--  mysqlimport
--  mysqlshow
--  mysqlslap
- PROPERTIES HAS_CXX TRUE)
- 
- ADD_DEFINITIONS(-DHAVE_DLOPEN)
diff --git a/databases/mysqlwsrep56-server/files/patch-cmake_plugin.cmake b/databases/mysqlwsrep56-server/files/patch-cmake_plugin.cmake
deleted file mode 100644
index e37fb41a9736..000000000000
--- a/databases/mysqlwsrep56-server/files/patch-cmake_plugin.cmake
+++ /dev/null
@@ -1,12 +0,0 @@
---- cmake/plugin.cmake.orig	2019-10-21 05:17:49 UTC
-+++ cmake/plugin.cmake
-@@ -223,9 +223,6 @@ MACRO(MYSQL_ADD_PLUGIN)
-       MYSQL_INSTALL_TARGETS(${target}
-         DESTINATION ${INSTALL_PLUGINDIR}
-         COMPONENT ${INSTALL_COMPONENT})
--      INSTALL_DEBUG_TARGET(${target}
--        DESTINATION ${INSTALL_PLUGINDIR}/debug
--        COMPONENT ${INSTALL_COMPONENT})
-       # Add installed files to list for RPMs
-       FILE(APPEND ${CMAKE_BINARY_DIR}/support-files/plugins.files
-               "%attr(755, root, root) %{_prefix}/${INSTALL_PLUGINDIR}/${ARG_MODULE_OUTPUT_NAME}.so\n"
diff --git a/databases/mysqlwsrep56-server/files/patch-cmake_ssl.cmake b/databases/mysqlwsrep56-server/files/patch-cmake_ssl.cmake
deleted file mode 100644
index 560ea06d22e3..000000000000
--- a/databases/mysqlwsrep56-server/files/patch-cmake_ssl.cmake
+++ /dev/null
@@ -1,11 +0,0 @@
---- cmake/ssl.cmake.orig	2019-10-21 05:17:49 UTC
-+++ cmake/ssl.cmake
-@@ -195,7 +195,7 @@ MACRO (MYSQL_CHECK_SSL)
-     IF(OPENSSL_INCLUDE_DIR AND
-        OPENSSL_LIBRARY   AND
-        CRYPTO_LIBRARY      AND
--       OPENSSL_MAJOR_VERSION STREQUAL "1"
-+       OPENSSL_MAJOR_VERSION VERSION_GREATER_EQUAL "1"
-       )
-       SET(OPENSSL_FOUND TRUE)
-     ELSE()
diff --git a/databases/mysqlwsrep56-server/files/patch-extra_CMakeLists.txt b/databases/mysqlwsrep56-server/files/patch-extra_CMakeLists.txt
deleted file mode 100644
index c2075bc3c715..000000000000
--- a/databases/mysqlwsrep56-server/files/patch-extra_CMakeLists.txt
+++ /dev/null
@@ -1,13 +0,0 @@
---- extra/CMakeLists.txt.orig	2019-10-21 05:17:49 UTC
-+++ extra/CMakeLists.txt
-@@ -100,8 +100,10 @@ IF(UNIX)
-   MYSQL_ADD_EXECUTABLE(resolve_stack_dump resolve_stack_dump.cc)
-   TARGET_LINK_LIBRARIES(resolve_stack_dump mysys mysys_ssl)
- 
-+IF(FALSE)
-   MYSQL_ADD_EXECUTABLE(mysql_waitpid mysql_waitpid.c)
-   TARGET_LINK_LIBRARIES(mysql_waitpid mysys mysys_ssl)
-   SET_TARGET_PROPERTIES(mysql_waitpid PROPERTIES LINKER_LANGUAGE CXX)
-+ENDIF()
- ENDIF()
- 
diff --git a/databases/mysqlwsrep56-server/files/patch-include_CMakeLists.txt b/databases/mysqlwsrep56-server/files/patch-include_CMakeLists.txt
deleted file mode 100644
index 5ad91cba83d9..000000000000
--- a/databases/mysqlwsrep56-server/files/patch-include_CMakeLists.txt
+++ /dev/null
@@ -1,15 +0,0 @@
---- include/CMakeLists.txt.orig	2019-10-21 05:17:49 UTC
-+++ include/CMakeLists.txt
-@@ -72,10 +72,12 @@ SET(HEADERS 
-   ${HEADERS_GEN_CONFIGURE}
- )
- 
-+IF(FALSE)
- INSTALL(FILES ${HEADERS} DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT Development)
- INSTALL(DIRECTORY mysql/ DESTINATION ${INSTALL_INCLUDEDIR}/mysql COMPONENT Development 
-  PATTERN "*.h"
-  PATTERN "psi_abi*" EXCLUDE
- )
-+ENDIF()
- 
- 
diff --git a/databases/mysqlwsrep56-server/files/patch-include_my__compare.h b/databases/mysqlwsrep56-server/files/patch-include_my__compare.h
deleted file mode 100644
index b01230c2b09d..000000000000
--- a/databases/mysqlwsrep56-server/files/patch-include_my__compare.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- include/my_compare.h.orig	2019-10-21 05:17:49 UTC
-+++ include/my_compare.h
-@@ -46,7 +46,7 @@ extern "C" {
-   But beware the dependency of MI_MAX_POSSIBLE_KEY_BUFF and HA_MAX_KEY_LENGTH.
- */
- 
--#define HA_MAX_KEY_LENGTH           1000        /* Max length in bytes */
-+#define HA_MAX_KEY_LENGTH           4000        /* Max length in bytes */
- #define HA_MAX_KEY_SEG              16          /* Max segments for key */
- 
- #define HA_MAX_POSSIBLE_KEY_BUFF    (HA_MAX_KEY_LENGTH + 24+ 6+6)
diff --git a/databases/mysqlwsrep56-server/files/patch-include_myisam.h b/databases/mysqlwsrep56-server/files/patch-include_myisam.h
deleted file mode 100644
index 09c51708002e..000000000000
--- a/databases/mysqlwsrep56-server/files/patch-include_myisam.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- include/myisam.h.orig	2019-10-21 05:17:49 UTC
-+++ include/myisam.h
-@@ -56,7 +56,7 @@ extern "C" {
-   The following defines can be increased if necessary.
-   But beware the dependency of MI_MAX_POSSIBLE_KEY_BUFF and MI_MAX_KEY_LENGTH.
- */
--#define MI_MAX_KEY_LENGTH           1000            /* Max length in bytes */
-+#define MI_MAX_KEY_LENGTH           4000            /* Max length in bytes */
- #define MI_MAX_KEY_SEG              16              /* Max segments for key */
- 
- #define MI_MAX_KEY_BUFF  (MI_MAX_KEY_LENGTH+MI_MAX_KEY_SEG*6+8+8)
diff --git a/databases/mysqlwsrep56-server/files/patch-libmysql_CMakeLists.txt b/databases/mysqlwsrep56-server/files/patch-libmysql_CMakeLists.txt
deleted file mode 100644
index 6811d02c853d..000000000000
--- a/databases/mysqlwsrep56-server/files/patch-libmysql_CMakeLists.txt
+++ /dev/null
@@ -1,41 +0,0 @@
---- libmysql/CMakeLists.txt.orig	2019-10-21 05:17:49 UTC
-+++ libmysql/CMakeLists.txt
-@@ -205,7 +205,7 @@ IF(WIN32)
- ENDIF()
- 
- # Merge several convenience libraries into one big mysqlclient
--MERGE_LIBRARIES(mysqlclient STATIC ${LIBS_TO_MERGE} COMPONENT Development)
-+MERGE_LIBRARIES(mysqlclient STATIC ${LIBS_TO_MERGE} COMPONENT Development NOINSTALL)
- TARGET_LINK_LIBRARIES(mysqlclient ${LIBS_TO_LINK})
- 
- # Visual Studio users need debug  static library for debug projects
-@@ -234,19 +234,22 @@ IF(UNIX)
-   ENDMACRO()
- ENDIF()
- 
-+IF (FALSE)
- IF(UNIX)
-   GET_TARGET_NAME(mysqlclient lib_name)
-   INSTALL_SYMLINK(mysqlclient
-     ${lib_name} ${CMAKE_STATIC_LIBRARY_PREFIX}mysqlclient_r.a
-     ${INSTALL_LIBDIR} Development)
- ENDIF()
-+ENDIF()
- 
- IF(NOT DISABLE_SHARED)
-   # Merge several convenience libraries into one big mysqlclient
-   # and link them together into shared library.
-   MERGE_LIBRARIES(libmysql SHARED ${LIBS_TO_MERGE}
-     EXPORTS ${CLIENT_API_FUNCTIONS}
--    COMPONENT SharedLibraries)
-+    COMPONENT SharedLibraries NOINSTALL)
-+  IF (FALSE)
-   TARGET_LINK_LIBRARIES(libmysql ${LIBS_TO_LINK})
-   IF(UNIX)
-     # libtool compatability
-@@ -316,4 +319,5 @@ IF(NOT DISABLE_SHARED)
-         ${INSTALL_LIBDIR} SharedLibraries)
-     ENDFOREACH()
-   ENDIF()
-+ ENDIF()
- ENDIF()
diff --git a/databases/mysqlwsrep56-server/files/patch-libservices_CMakeLists.txt b/databases/mysqlwsrep56-server/files/patch-libservices_CMakeLists.txt
deleted file mode 100644
index fd69b64c6314..000000000000
--- a/databases/mysqlwsrep56-server/files/patch-libservices_CMakeLists.txt
+++ /dev/null
@@ -1,9 +0,0 @@
---- libservices/CMakeLists.txt.orig	2019-10-21 05:17:49 UTC
-+++ libservices/CMakeLists.txt
-@@ -31,4 +31,6 @@ SET(MYSQLSERVICES_SOURCES
-   mysql_string_service.c)
- 
- ADD_LIBRARY(mysqlservices ${MYSQLSERVICES_SOURCES})
-+IF(FALSE)
- INSTALL(TARGETS mysqlservices DESTINATION ${INSTALL_LIBDIR} COMPONENT Development)
-+ENDIF()
diff --git a/databases/mysqlwsrep56-server/files/patch-man_CMakeLists.txt b/databases/mysqlwsrep56-server/files/patch-man_CMakeLists.txt
deleted file mode 100644
index a3ee5ced8655..000000000000
--- a/databases/mysqlwsrep56-server/files/patch-man_CMakeLists.txt
+++ /dev/null
@@ -1,13 +0,0 @@
---- man/CMakeLists.txt.orig	2019-10-21 05:17:49 UTC
-+++ man/CMakeLists.txt
-@@ -21,9 +21,7 @@
- # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
- 
- # Copy man pages
--FILE(GLOB MAN1_FILES *.1)
--FILE(GLOB MAN1_EXCLUDE make_win_bin_dist.1)
--FILE(GLOB MAN1_NDB ndb*.1)
-+FILE(GLOB MAN1_FILES my_print_defaults.1 myisam_ftdump.1 myisamchk.1 myisamlog.1 myisampack.1  mysql.server.1 mysql_convert_table_format.1 mysql_fix_extensions.1  mysql_install_db.1 mysql_plugin.1 mysql_secure_installation.1 mysql_setpermission.1  mysql_tzinfo_to_sql.1 mysql_upgrade.1 mysql_zap.1 mysqlbug.1  mysqld_multi.1 mysqld_safe.1 mysqldumpslow.1 mysqlhotcopy.1 mysqlman.1  mysqltest.1 perror.1 replace.1 resolve_stack_dump.1 resolveip.1)
- FILE(GLOB MAN8_FILES *.8)
- FILE(GLOB MAN8_NDB ndb*.8)
- IF(MAN1_FILES)
diff --git a/databases/mysqlwsrep56-server/files/patch-mysys__ssl_my__default.cc b/databases/mysqlwsrep56-server/files/patch-mysys__ssl_my__default.cc
deleted file mode 100644
index fad1292c950f..000000000000
--- a/databases/mysqlwsrep56-server/files/patch-mysys__ssl_my__default.cc
+++ /dev/null
@@ -1,62 +0,0 @@
---- mysys_ssl/my_default.cc.orig	2019-10-21 05:17:49 UTC
-+++ mysys_ssl/my_default.cc
-@@ -128,7 +128,7 @@ char wsrep_defaults_group_suffix[FN_EXTLEN]={0,};
- #endif /* WITH_WREP */
- /* Which directories are searched for options (and in which order) */
- 
--#define MAX_DEFAULT_DIRS 6
-+#define MAX_DEFAULT_DIRS 7
- #define DEFAULT_DIRS_SIZE (MAX_DEFAULT_DIRS + 1)  /* Terminate with NULL */
- static const char **default_directories = NULL;
- 
-@@ -933,6 +933,14 @@ static int search_default_file_with_ext(Process_option
-     strncpy(wsrep_defaults_file, name, sizeof(wsrep_defaults_file) - 1);
- #endif /* WITH_WSREP */
- 
-+  if (strstr(name, "/etc") == name)
-+  {
-+    fprintf(stderr,
-+             "error: Config file %s in invalid location, please move to or merge with /usr/local%s\n",
-+             name,name);
-+      goto err;
-+  }
-+
-   while (mysql_file_getline(buff, sizeof(buff) - 1, fp, is_login_file))
-   {
-     line++;
-@@ -1271,7 +1279,8 @@ void my_print_default_files(const char *conf_file)
-             end[(strlen(end)-1)] = ' ';
-           else
-             strxmov(end, conf_file, *ext , " ",  NullS);
--          fputs(name, stdout);
-+          if (strstr(name, "/etc") != name)
-+            fputs(name, stdout);
-         }
-       }
-     }
-@@ -1430,14 +1439,9 @@ static const char **init_default_directories(MEM_ROOT 
- 
- #else
- 
--  errors += add_directory(alloc, "/etc/", dirs);
--  errors += add_directory(alloc, "/etc/mysql/", dirs);
-+  errors += add_directory(alloc, "/usr/local/etc/", dirs);
-+  errors += add_directory(alloc, "/usr/local/etc/mysql/", dirs);
- 
--#if defined(DEFAULT_SYSCONFDIR)
--  if (DEFAULT_SYSCONFDIR[0])
--    errors += add_directory(alloc, DEFAULT_SYSCONFDIR, dirs);
--#endif /* DEFAULT_SYSCONFDIR */
--
- #endif
- 
-   if ((env= getenv("MYSQL_HOME")))
-@@ -1507,7 +1511,7 @@ int check_file_permissions(const char *file_name, my_b
-   MY_STAT stat_info;
- 
-   if (!my_stat(file_name,&stat_info,MYF(0)))
--    return 1;
-+    return 0;
-   /*
-     Ignore .mylogin.cnf file if not exclusively readable/writable
-     by current user.
diff --git a/databases/mysqlwsrep56-server/files/patch-plugin_password__validation_validate__password.cc b/databases/mysqlwsrep56-server/files/patch-plugin_password__validation_validate__password.cc
deleted file mode 100644
index ac29f654290e..000000000000
--- a/databases/mysqlwsrep56-server/files/patch-plugin_password__validation_validate__password.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- plugin/password_validation/validate_password.cc.orig	2019-10-21 05:17:49 UTC
-+++ plugin/password_validation/validate_password.cc
-@@ -23,6 +23,8 @@
- #include <my_sys.h>
- #include <string>
- #include <mysql/plugin_validate_password.h>
-+/* solve clash between libc++ bitset::test() and test macro from my_global.h */
-+#undef test
- #include <set>
- #include <ios>       // std::streamoff
- #include <iostream>
diff --git a/databases/mysqlwsrep56-server/files/patch-scripts_CMakeLists.txt b/databases/mysqlwsrep56-server/files/patch-scripts_CMakeLists.txt
deleted file mode 100644
index 55ab59b29f1f..000000000000
--- a/databases/mysqlwsrep56-server/files/patch-scripts_CMakeLists.txt
+++ /dev/null
@@ -1,36 +0,0 @@
---- scripts/CMakeLists.txt.orig	2019-10-21 05:17:49 UTC
-+++ scripts/CMakeLists.txt
-@@ -311,6 +311,8 @@ MACRO(EXTRACT_LINK_LIBRARIES target var)
-           GET_FILENAME_COMPONENT(lib "${lib}" NAME_WE)
-           STRING(REGEX REPLACE "^lib" "" lib "${lib}")
-           SET(${var} "${${var}}-l${lib} " ) 
-+        ELSEIF(lib STREQUAL "-pthread")
-+          SET(${var} "${${var}}-pthread " ) 
-         ELSE()
-           SET(${var} "${${var}}-l${lib} " ) 
-         ENDIF()
-@@ -373,15 +375,10 @@ ELSE()
-   # On Unix, most of the files end up in the bin directory
-   SET(mysql_config_COMPONENT COMPONENT Development)
-   SET(BIN_SCRIPTS
--    msql2mysql
--    mysql_config
-     mysql_fix_extensions
-     mysql_setpermission
-     mysql_zap
--    mysqlaccess
--    mysqlaccess.conf
-     mysql_convert_table_format
--    mysql_find_rows
-     mysqlhotcopy
-     mysqldumpslow
-     mysqld_multi
-@@ -391,7 +388,7 @@ ELSE()
-   FOREACH(file ${BIN_SCRIPTS})
-     IF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh)
-       CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh
--        ${CMAKE_CURRENT_BINARY_DIR}/${file} ESCAPE_QUOTES @ONLY)
-+        ${CMAKE_CURRENT_BINARY_DIR}/${file} @ONLY)
-     ELSEIF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${file})
-       CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${file}
-          ${CMAKE_CURRENT_BINARY_DIR}/${file} COPYONLY)
diff --git a/databases/mysqlwsrep56-server/files/patch-scripts_mysqld__safe.sh b/databases/mysqlwsrep56-server/files/patch-scripts_mysqld__safe.sh
deleted file mode 100644
index e0aa5e3fa845..000000000000
--- a/databases/mysqlwsrep56-server/files/patch-scripts_mysqld__safe.sh
+++ /dev/null
@@ -1,24 +0,0 @@
---- scripts/mysqld_safe.sh.orig	2019-07-19 08:39:37 UTC
-+++ scripts/mysqld_safe.sh
-@@ -568,10 +568,10 @@ fi
- 
- if test -z "$MYSQL_HOME"
- then 
--  if test -r "$MY_BASEDIR_VERSION/my.cnf" && test -r "$DATADIR/my.cnf"
-+  if test -r "$MY_BASEDIR_VERSION/etc/my.cnf" && test -r "$DATADIR/my.cnf"
-   then
-     log_error "WARNING: Found two instances of my.cnf -
--$MY_BASEDIR_VERSION/my.cnf and
-+$MY_BASEDIR_VERSION/etc/my.cnf and
- $DATADIR/my.cnf
- IGNORING $DATADIR/my.cnf"
- 
-@@ -580,7 +580,7 @@ IGNORING $DATADIR/my.cnf"
-   then
-     log_error "WARNING: Found $DATADIR/my.cnf
- The data directory is a deprecated location for my.cnf, please move it to
--$MY_BASEDIR_VERSION/my.cnf"
-+$MY_BASEDIR_VERSION/etc/my.cnf"
-     MYSQL_HOME=$DATADIR
-   else
-     MYSQL_HOME=$MY_BASEDIR_VERSION
diff --git a/databases/mysqlwsrep56-server/files/patch-sql_CMakeLists.txt b/databases/mysqlwsrep56-server/files/patch-sql_CMakeLists.txt
deleted file mode 100644
index d46620dfd4c8..000000000000
--- a/databases/mysqlwsrep56-server/files/patch-sql_CMakeLists.txt
+++ /dev/null
@@ -1,35 +0,0 @@
---- sql/CMakeLists.txt.orig	2019-10-21 05:17:49 UTC
-+++ sql/CMakeLists.txt
-@@ -442,7 +442,7 @@ ADD_CUSTOM_TARGET( 
-         DEPENDS ${GEN_DIGEST_SOURCES}
- )
- 
--
-+IF(FALSE)
- MYSQL_ADD_PLUGIN(udf_example udf_example.cc
-                  MODULE_ONLY TEST_ONLY MODULE_OUTPUT_NAME "udf_example")
- IF(NOT DISABLE_SHARED)
-@@ -452,6 +452,7 @@ IF(NOT DISABLE_SHARED)
-       "/DEF:${CMAKE_CURRENT_SOURCE_DIR}/udf_example.def")
-   ENDIF()
- ENDIF()
-+ENDIF()
- 
- FOREACH(tool gtar tar git)
-   STRING(TOUPPER ${tool}  TOOL)
-@@ -477,6 +478,7 @@ ADD_CUSTOM_TARGET(distclean
- 
- IF(INSTALL_LAYOUT STREQUAL "STANDALONE")
- 
-+IF(FALSE)
- # Copy db.opt into data/test/
- SET(DBOPT_FILE ${CMAKE_CURRENT_SOURCE_DIR}/db.opt ) 
- INSTALL(FILES ${DBOPT_FILE} DESTINATION data/test COMPONENT DataFiles)
-@@ -519,6 +521,7 @@ IF(WIN32 AND MYSQLD_EXECUTABLE)
- ELSE()
-   # Not windows or cross compiling, just install an empty directory
-   INSTALL(FILES ${DUMMY_FILE} DESTINATION data/mysql COMPONENT DataFiles)
-+ENDIF()
- ENDIF()
- ENDIF()
- 
diff --git a/databases/mysqlwsrep56-server/files/patch-sql_sys__vars.cc b/databases/mysqlwsrep56-server/files/patch-sql_sys__vars.cc
deleted file mode 100644
index 872524393853..000000000000
--- a/databases/mysqlwsrep56-server/files/patch-sql_sys__vars.cc
+++ /dev/null
@@ -1,38 +0,0 @@
---- sql/sys_vars.cc.orig	2019-10-21 05:17:49 UTC
-+++ sql/sys_vars.cc
-@@ -1422,7 +1422,7 @@ static Sys_var_ulong Sys_interactive_timeout(
-        "connection before closing it",
-        SESSION_VAR(net_interactive_timeout),
-        CMD_LINE(REQUIRED_ARG),
--       VALID_RANGE(1, LONG_TIMEOUT), DEFAULT(NET_WAIT_TIMEOUT), BLOCK_SIZE(1));
-+       VALID_RANGE(1, INT_MAX32/1000), DEFAULT(NET_WAIT_TIMEOUT), BLOCK_SIZE(1));
- 
- static Sys_var_ulong Sys_join_buffer_size(
-        "join_buffer_size",
-@@ -2041,7 +2041,7 @@ static Sys_var_ulong Sys_net_read_timeout(
-        "Number of seconds to wait for more data from a connection before "
-        "aborting the read",
-        SESSION_VAR(net_read_timeout), CMD_LINE(REQUIRED_ARG),
--       VALID_RANGE(1, LONG_TIMEOUT), DEFAULT(NET_READ_TIMEOUT), BLOCK_SIZE(1),
-+       VALID_RANGE(1, INT_MAX32/1000), DEFAULT(NET_READ_TIMEOUT), BLOCK_SIZE(1),
-        NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0),
-        ON_UPDATE(fix_net_read_timeout));
- 
-@@ -2056,7 +2056,7 @@ static Sys_var_ulong Sys_net_write_timeout(
-        "Number of seconds to wait for a block to be written to a connection "
-        "before aborting the write",
-        SESSION_VAR(net_write_timeout), CMD_LINE(REQUIRED_ARG),
--       VALID_RANGE(1, LONG_TIMEOUT), DEFAULT(NET_WRITE_TIMEOUT), BLOCK_SIZE(1),
-+       VALID_RANGE(1, INT_MAX32/1000), DEFAULT(NET_WRITE_TIMEOUT), BLOCK_SIZE(1),
-        NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0),
-        ON_UPDATE(fix_net_write_timeout));
- 
-@@ -3189,7 +3189,7 @@ static Sys_var_ulong Sys_net_wait_timeout(
-        "The number of seconds the server waits for activity on a "
-        "connection before closing it",
-        SESSION_VAR(net_wait_timeout), CMD_LINE(REQUIRED_ARG),
--       VALID_RANGE(1, IF_WIN(INT_MAX32/1000, LONG_TIMEOUT)),
-+       VALID_RANGE(1, INT_MAX32/1000),
-        DEFAULT(NET_WAIT_TIMEOUT), BLOCK_SIZE(1));
- 
- static Sys_var_plugin Sys_default_storage_engine(
diff --git a/databases/mysqlwsrep56-server/files/patch-storage_innobase_handler_i__s.cc b/databases/mysqlwsrep56-server/files/patch-storage_innobase_handler_i__s.cc
deleted file mode 100644
index 8f6f031af3e9..000000000000
--- a/databases/mysqlwsrep56-server/files/patch-storage_innobase_handler_i__s.cc
+++ /dev/null
@@ -1,13 +0,0 @@
---- storage/innobase/handler/i_s.cc.orig	2020-05-23 20:11:13 UTC
-+++ storage/innobase/handler/i_s.cc
-@@ -43,6 +43,10 @@ Created July 18, 2007 Vasil Dimov
- #include <sql_plugin.h>
- #include <mysql/innodb_priv.h>
- 
-+#include <string>
-+#include <sstream>
-+#include <iostream>
-+
- #include "btr0pcur.h"
- #include "btr0types.h"
- #include "dict0dict.h"
diff --git a/databases/mysqlwsrep56-server/files/patch-support-files_CMakeLists.txt b/databases/mysqlwsrep56-server/files/patch-support-files_CMakeLists.txt
deleted file mode 100644
index e247fddc447b..000000000000
--- a/databases/mysqlwsrep56-server/files/patch-support-files_CMakeLists.txt
+++ /dev/null
@@ -1,12 +0,0 @@
---- support-files/CMakeLists.txt.orig	2019-10-21 05:17:49 UTC
-+++ support-files/CMakeLists.txt
-@@ -81,7 +81,9 @@ IF(UNIX)
-     INSTALL(FILES magic DESTINATION ${inst_location} COMPONENT SupportFiles)
-   ENDIF()
- 
-+IF(FALSE)
-   INSTALL(FILES mysql.m4 DESTINATION ${INSTALL_SHAREDIR}/aclocal COMPONENT Development)
-+ENDIF()
-   CONFIGURE_FILE(MySQL-shared-compat.spec.sh ${CMAKE_CURRENT_BINARY_DIR}/MySQL-shared-compat.spec @ONLY)
-   CONFIGURE_FILE(mysql.spec.sh ${CMAKE_CURRENT_BINARY_DIR}/mysql.spec @ONLY)
-   
diff --git a/databases/mysqlwsrep56-server/pkg-descr b/databases/mysqlwsrep56-server/pkg-descr
deleted file mode 100644
index f7761d10379c..000000000000
--- a/databases/mysqlwsrep56-server/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-MySQL built with WSREP patch to support replication using the Galera library.
-
-WWW: https://galeracluster.com/
diff --git a/databases/mysqlwsrep56-server/pkg-message b/databases/mysqlwsrep56-server/pkg-message
deleted file mode 100644
index e619c93e68e7..000000000000
--- a/databases/mysqlwsrep56-server/pkg-message
+++ /dev/null
@@ -1,8 +0,0 @@
-[
-{ type: upgrade
-  message: <<EOM
-Remember to run mysql_upgrade the first time you start the MySQL server
-after an upgrade from an earlier version.
-EOM
-}
-]
diff --git a/databases/mysqlwsrep56-server/pkg-plist b/databases/mysqlwsrep56-server/pkg-plist
deleted file mode 100644
index 5a0285da35d9..000000000000
--- a/databases/mysqlwsrep56-server/pkg-plist
+++ /dev/null
@@ -1,146 +0,0 @@
-bin/innochecksum
-bin/my_print_defaults
-bin/myisam_ftdump
-bin/myisamchk
-bin/myisamlog
-bin/myisampack
-bin/mysql_convert_table_format
-bin/mysql_fix_extensions
-bin/mysql_install_db
-bin/mysql_plugin
-bin/mysql_secure_installation
-bin/mysql_setpermission
-bin/mysql_tzinfo_to_sql
-bin/mysql_upgrade
-bin/mysql_zap
-bin/mysqlbug
-bin/mysqld_multi
-bin/mysqld_safe
-bin/mysqldumpslow
-bin/mysqlhotcopy
-bin/mysqltest
-bin/perror
-bin/replace
-bin/resolve_stack_dump
-bin/resolveip
-bin/wsrep_sst_common
-bin/wsrep_sst_mysqldump
-bin/wsrep_sst_rsync
-bin/wsrep_sst_xtrabackup
-bin/wsrep_sst_xtrabackup-v2
-lib/mysql/plugin/adt_null.so
-lib/mysql/plugin/audit_log.so
-lib/mysql/plugin/auth.so
-lib/mysql/plugin/auth_pam.so
-lib/mysql/plugin/auth_test_plugin.so
-lib/mysql/plugin/connection_control.so
-lib/mysql/plugin/daemon_example.ini
-lib/mysql/plugin/dialog.so
-lib/mysql/plugin/libdaemon_example.so
-lib/mysql/plugin/mypluglib.so
-lib/mysql/plugin/mysql_no_login.so
-lib/mysql/plugin/qa_auth_client.so
-lib/mysql/plugin/qa_auth_interface.so
-lib/mysql/plugin/qa_auth_server.so
-lib/mysql/plugin/semisync_master.so
-lib/mysql/plugin/semisync_slave.so
-lib/mysql/plugin/test_udf_services.so
-lib/mysql/plugin/validate_password.so
-lib/mysql/plugin/innodb_engine.so
-lib/mysql/plugin/libmemcached.so
-libexec/mysqld
-man/man1/my_print_defaults.1.gz
-man/man1/myisam_ftdump.1.gz
-man/man1/myisamchk.1.gz
-man/man1/myisamlog.1.gz
-man/man1/myisampack.1.gz
-man/man1/mysql.server.1.gz
-man/man1/mysql_convert_table_format.1.gz
-man/man1/mysql_fix_extensions.1.gz
-man/man1/mysql_install_db.1.gz
-man/man1/mysql_plugin.1.gz
-man/man1/mysql_secure_installation.1.gz
-man/man1/mysql_setpermission.1.gz
-man/man1/mysql_tzinfo_to_sql.1.gz
-man/man1/mysql_upgrade.1.gz
-man/man1/mysql_zap.1.gz
-man/man1/mysqlbug.1.gz
-man/man1/mysqld_multi.1.gz
-man/man1/mysqld_safe.1.gz
-man/man1/mysqldumpslow.1.gz
-man/man1/mysqlhotcopy.1.gz
-man/man1/mysqlman.1.gz
-man/man1/perror.1.gz
-man/man1/replace.1.gz
-man/man1/resolve_stack_dump.1.gz
-man/man1/resolveip.1.gz
-man/man8/mysqld.8.gz
-%%DATADIR%%/binary-configure
-%%DATADIR%%/bulgarian/errmsg.sys
-%%DATADIR%%/charsets/Index.xml
-%%DATADIR%%/charsets/README
-%%DATADIR%%/charsets/armscii8.xml
-%%DATADIR%%/charsets/ascii.xml
-%%DATADIR%%/charsets/cp1250.xml
-%%DATADIR%%/charsets/cp1251.xml
-%%DATADIR%%/charsets/cp1256.xml
-%%DATADIR%%/charsets/cp1257.xml
-%%DATADIR%%/charsets/cp850.xml
-%%DATADIR%%/charsets/cp852.xml
-%%DATADIR%%/charsets/cp866.xml
-%%DATADIR%%/charsets/dec8.xml
-%%DATADIR%%/charsets/geostd8.xml
-%%DATADIR%%/charsets/greek.xml
-%%DATADIR%%/charsets/hebrew.xml
-%%DATADIR%%/charsets/hp8.xml
-%%DATADIR%%/charsets/keybcs2.xml
-%%DATADIR%%/charsets/koi8r.xml
-%%DATADIR%%/charsets/koi8u.xml
-%%DATADIR%%/charsets/latin1.xml
-%%DATADIR%%/charsets/latin2.xml
-%%DATADIR%%/charsets/latin5.xml
-%%DATADIR%%/charsets/latin7.xml
-%%DATADIR%%/charsets/macce.xml
-%%DATADIR%%/charsets/macroman.xml
-%%DATADIR%%/charsets/swe7.xml
-%%DATADIR%%/czech/errmsg.sys
-%%DATADIR%%/danish/errmsg.sys
-%%DATADIR%%/dictionary.txt
-%%DATADIR%%/dutch/errmsg.sys
-%%DATADIR%%/english/errmsg.sys
-%%DATADIR%%/errmsg-utf8.txt
-%%DATADIR%%/estonian/errmsg.sys
-%%DATADIR%%/fill_help_tables.sql
-%%DATADIR%%/french/errmsg.sys
-%%DATADIR%%/german/errmsg.sys
-%%DATADIR%%/greek/errmsg.sys
-%%DATADIR%%/hungarian/errmsg.sys
-%%DATADIR%%/innodb_memcached_config.sql
-%%DATADIR%%/italian/errmsg.sys
-%%DATADIR%%/japanese/errmsg.sys
-%%DATADIR%%/korean/errmsg.sys
-%%DATADIR%%/magic
-%%DATADIR%%/my-default.cnf
-%%DATADIR%%/mysql-log-rotate
-%%DATADIR%%/mysql.server
-%%DATADIR%%/mysql_security_commands.sql
-%%DATADIR%%/mysql_system_tables.sql
-%%DATADIR%%/mysql_system_tables_data.sql
-%%DATADIR%%/mysql_test_data_timezone.sql
-%%DATADIR%%/mysqld_multi.server
-%%DATADIR%%/norwegian-ny/errmsg.sys
-%%DATADIR%%/norwegian/errmsg.sys
-%%DATADIR%%/polish/errmsg.sys
-%%DATADIR%%/portuguese/errmsg.sys
-%%DATADIR%%/romanian/errmsg.sys
-%%DATADIR%%/russian/errmsg.sys
-%%DATADIR%%/serbian/errmsg.sys
-%%DATADIR%%/slovak/errmsg.sys
-%%DATADIR%%/spanish/errmsg.sys
-%%DATADIR%%/swedish/errmsg.sys
-%%DATADIR%%/ukrainian/errmsg.sys
-%%DATADIR%%/wsrep_notify
-%%ETCDIR%%/my.cnf.sample
-@dir(mysql,mysql,0750) %%ETCDIR%%/keyring
-@dir(mysql,mysql,0750) %%MY_SECDIR%%
-@dir(mysql,mysql,0750) %%MY_TMPDIR%%
diff --git a/databases/mysqlwsrep57-server/Makefile b/databases/mysqlwsrep57-server/Makefile
deleted file mode 100644
index 70f20347216a..000000000000
--- a/databases/mysqlwsrep57-server/Makefile
+++ /dev/null
@@ -1,215 +0,0 @@
-# Created by: Vasil Dimov <vd@FreeBSD.org>
-
-PORTNAME=	mysqlwsrep
-PORTVERSION?=	5.7.34
-DISTVERSIONPREFIX?=	wsrep_
-DISTVERSIONSUFFIX?=	-25.26
-CATEGORIES=	databases
-MASTER_SITES+=	SF/boost/boost/1.59.0:boost
-PKGNAMESUFFIX=	57-server
-DISTFILES+=	boost_1_59_0${EXTRACT_SUFX}:boost
-
-MAINTAINER=	devel@galeracluster.com
-COMMENT=	MySQL database enhanced with Galera replication (server package)
-
-LICENSE=	GPLv2
-
-RUN_DEPENDS=	bash:shells/bash \
-		rsync:net/rsync \
-		socat:net/socat
-LIB_DEPENDS=	libevent.so:devel/libevent liblz4.so:archivers/liblz4
-
-USES=		bison \
-		cmake:noninja \
-		compiler:c++11-lib \
-		compiler:c11 \
-		libedit \
-		mysql:57 \
-		perl5 \
-		shebangfix \
-		ssl
-
-USE_PERL5=	run
-
-MY_DBDIR=	/var/db/mysql
-MY_SECDIR=	/var/db/mysql_secure
-MY_TMPDIR=	/var/db/mysql_tmpdir
-
-USE_GITHUB=	yes
-GH_TUPLE?=	codership:mysql-wsrep:${DISTVERSIONPREFIX}${PORTVERSION}${DISTVERSIONSUFFIX} \
-		codership:wsrep-API:eab2d5d5a31672c0b7d116ef1629ff18392fd7d0:dummy/wsrep/src
-
-DATADIR=	${PREFIX}/share/mysql
-ETCDIR=		${PREFIX}/etc/mysql
-
-CMAKE_ARGS+=	-DINSTALL_LAYOUT=FREEBSD \
-		-DINSTALL_PKGCONFIGDIR="${LOCALBASE}/libdata/pkgconfig" \
-		-DINSTALL_DOCDIR="share/doc/mysql" \
-		-DINSTALL_DOCREADMEDIR="share/doc/mysql" \
-		-DINSTALL_INCLUDEDIR="include/mysql" \
-		-DINSTALL_INFODIR="info" \
-		-DINSTALL_LDCONFIGDIR="${LOCALBASE}/libdata/ldconfig" \
-		-DINSTALL_LIBDIR="lib/mysql" \
-		-DINSTALL_MANDIR="man" \
-		-DINSTALL_MYSQLDATADIR="${MY_DBDIR}" \
-		-DINSTALL_MYSQLKEYRINGDIR="etc/mysql/keyring" \
-		-DINSTALL_MYSQLSHAREDIR="share/mysql" \
-		-DINSTALL_PLUGINDIR="lib/mysql/plugin" \
-		-DINSTALL_SBINDIR="libexec" \
-		-DINSTALL_SCRIPTDIR="bin" \
-		-DINSTALL_SECURE_FILE_PRIVDIR="${MY_SECDIR}" \
-		-DINSTALL_SHAREDIR="share" \
-		-DINSTALL_SUPPORTFILESDIR="share/mysql" \
-		-DMYSQL_KEYRINGDIR="${ETCDIR}/keyring" \
-		-DWITH_BOOST="${WRKDIR}/boost_1_59_0" \
-		-DWITH_EDITLINE=system \
-		-DWITH_LIBEVENT=system \
-		-DWITH_LZ4=system \
-		-DWITH_ZLIB=system \
-		-DINSTALL_MYSQLTESTDIR=0 \
-		-DDOWNLOAD_BOOST=1 \
-		-DWITH_WSREP=1
-
-SHEBANG_FILES=	scripts/*.pl* scripts/*.sh scripts/wsrep_sst_*
-
-.ifdef USE_MYSQL
-.error You have USE_MYSQL variable defined either in environment or in make(1) arguments. Please undefine it and try again.
-.endif
-
-SUB_LIST=	MY_DBDIR=${MY_DBDIR} \
-		MY_SECDIR=${MY_SECDIR} \
-		MY_TMPDIR=${MY_TMPDIR}
-
-PLIST_SUB=	MY_DBDIR=${MY_DBDIR} \
-		MY_SECDIR=${MY_SECDIR} \
-		MY_TMPDIR=${MY_TMPDIR}
-
-CONFLICTS_INSTALL=	mariadb*-server-* \
-			mysql[0-9]*-server-* \
-			mysqlwsrep56*-server-* \
-			mysqlwsrep[1-489]*-server-* \
-			percona*-server-*
-
-USE_RC_SUBR=	mysql-server
-
-SUB_FILES=	my.cnf.sample
-
-USERS=		mysql
-GROUPS=		mysql
-
-USE_CXXSTD=	c++11
-USE_LDCONFIG+=	${PREFIX}/lib/mysql/plugin
-
-MMAN1=		my_print_defaults.1 \
-		myisam_ftdump.1 \
-		myisamchk.1 \
-		myisamlog.1 \
-		myisampack.1 \
-		mysql.server.1 \
-		mysql_convert_table_format.1 \
-		mysql_fix_extensions.1 \
-		mysql_install_db.1 \
-		mysql_plugin.1 \
-		mysql_secure_installation.1 \
-		mysql_setpermission.1 \
-		mysql_tzinfo_to_sql.1 \
-		mysql_upgrade.1 \
-		mysql_zap.1 \
-		mysqlbug.1 \
-		mysqld_multi.1 \
-		mysqld_safe.1 \
-		mysqldumpslow.1 \
-		mysqlhotcopy.1 \
-		mysqlman.1 \
-		perror.1 \
-		replace.1 \
-		resolve_stack_dump.1 \
-		resolveip.1
-
-OPTIONS_GROUP=		STORAGE
-OPTIONS_GROUP_STORAGE=	ARCHIVE BLACKHOLE EXAMPLE FEDERATED INNOBASE PARTITION PERFSCHEMA
-OPTIONS_SUB=		YES
-STORAGE_DESC=		Permissible "Storage Engines" (to compile statically into the server)
-ARCHIVE_DESC=		Compile "Archive Storage" statically in server
-BLACKHOLE_DESC=		Compile "Blackhole Storage" statically in server
-EXAMPLE_DESC=		Compile "Example Storage" statically in server
-FEDERATED_DESC=		Compile "Federated Storage" statically in server
-INNOBASE_DESC=		Compile "InnoDB Storage" statically in server
-PARTITION_DESC=		Compile "Partitioning support Storage" statically in server
-PERFSCHEMA_DESC=	Compile "Performance Schema Storage" statically in server
-
-ARCHIVE_CMAKE_ON=	-DWITH_ARCHIVE_STORAGE_ENGINE=1
-BLACKHOLE_CMAKE_ON=	-DWITH_BLACKHOLE_STORAGE_ENGINE=1
-EXAMPLE_CMAKE_ON=	-DWITH_EXAMPLE_STORAGE_ENGINE=1
-FEDERATED_CMAKE_ON=	-DWITH_FEDERATED_STORAGE_ENGINE=1
-INNOBASE_CMAKE_ON=	-DWITH_INNOBASE_STORAGE_ENGINE=1
-PARTITION_CMAKE_ON=	-DWITH_PARTITION_STORAGE_ENGINE=1
-PERFSCHEMA_CMAKE_ON=	-DWITH_PERFSCHEMA_STORAGE_ENGINE=1
-
-OPTIONS_GROUP+=		FEATURES
-OPTIONS_GROUP_FEATURES=	PERFSCHM
-FEATURES_DESC=		Default features knobs
-PERFSCHM_DESC=		Enable "Performance Schema" by default (High RAM usage)
-OPTIONS_DEFAULT+=	PERFSCHM
-FEDERATED_SUB_LIST+=	FEDER="--federated"
-FEDERATED_SUB_LIST_OFF+=FEDER=""
-
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MPERFSCHM}
-SUB_LIST+=	PERFSCHEMRC=""
-.else
-SUB_LIST+=	PERFSCHEMRC="--skip-performance-schema"
-.endif
-
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1200057
-SUB_LIST+=	LEGACY_LIMITS="@comment " MODERN_LIMITS=""
-.else
-SUB_LIST+=	LEGACY_LIMITS="" MODERN_LIMITS="@comment "
-.endif
-
-.include <bsd.port.pre.mk>
-
-.if ${SSL_DEFAULT} == base
-CMAKE_ARGS+=		-DWITH_SSL=system
-.else
-CMAKE_ARGS+=		-DWITH_SSL=${OPENSSLBASE}
-.endif
-
-# ${LOCALBASE}/include/lz4.h does not compile with Clang 6.
-# Also MySQL code itself needs -Wno-c++11-narrowing when Clang 6 is used.
-.if ${OSVERSION} >= 1200056
-CFLAGS+=	-DLZ4_DISABLE_DEPRECATE_WARNINGS
-CXXFLAGS+=	-DLZ4_DISABLE_DEPRECATE_WARNINGS
-LDFLAGS+=	-L${LOCALBASE}/lib
-.  if ${CHOSEN_COMPILER_TYPE} == clang
-CXXFLAGS+=	-Wno-c++11-narrowing
-.  endif
-.endif
-
-# Ensure that assertions are not turned on in non-debug builds.
-.if !defined(WITH_DEBUG)
-CFLAGS+=	-DNDEBUG
-CXXFLAGS+=	-DNDEBUG
-.endif
-
-# Plugin innodb_memcached requires -fcommon to avoid duplicate symbol linker
-# error with llmv11.
-.if (${OPSYS} == FreeBSD && ${OSVERSION} >= 1300109) || ${CHOSEN_COMPILER_TYPE} == gcc
-CFLAGS+=	-fcommon
-.endif
-
-post-extract:
-	${RM} -fv ${WRKSRC}/sql/sql_hints.yy.cc ${WRKSRC}/sql/sql_hints.yy.h
-
-post-patch:
-	${REINPLACE_CMD} 's/*.1/${MMAN1}/' ${WRKSRC}/man/CMakeLists.txt
-
-post-install:
-	${MKDIR} ${STAGEDIR}${ETCDIR}
-	${INSTALL_DATA} ${WRKDIR}/my.cnf.sample ${STAGEDIR}${ETCDIR}/my.cnf.sample
-	${MKDIR} ${STAGEDIR}${ETCDIR}/keyring
-	${MKDIR} ${STAGEDIR}${MY_SECDIR}
-	${MKDIR} ${STAGEDIR}${MY_TMPDIR}
-
-.include <bsd.port.post.mk>
diff --git a/databases/mysqlwsrep57-server/distinfo b/databases/mysqlwsrep57-server/distinfo
deleted file mode 100644
index 4c464f3fbaef..000000000000
--- a/databases/mysqlwsrep57-server/distinfo
+++ /dev/null
@@ -1,7 +0,0 @@
-TIMESTAMP = 1627385828
-SHA256 (boost_1_59_0.tar.gz) = 47f11c8844e579d02691a607fbd32540104a9ac7a2534a8ddaef50daf502baac
-SIZE (boost_1_59_0.tar.gz) = 83709983
-SHA256 (codership-mysql-wsrep-wsrep_5.7.34-25.26_GH0.tar.gz) = da075a5b77104318bdd0b480e2e46b491b2410b2420c93985870c682d14ea0ef
-SIZE (codership-mysql-wsrep-wsrep_5.7.34-25.26_GH0.tar.gz) = 56513288
-SHA256 (codership-wsrep-API-eab2d5d5a31672c0b7d116ef1629ff18392fd7d0_GH0.tar.gz) = 3c235868ed330d8d702e7b7541c24c1926b1fd9e6b8aa673b032a2318896e8a0
-SIZE (codership-wsrep-API-eab2d5d5a31672c0b7d116ef1629ff18392fd7d0_GH0.tar.gz) = 47032
diff --git a/databases/mysqlwsrep57-server/files/my.cnf.sample.in b/databases/mysqlwsrep57-server/files/my.cnf.sample.in
deleted file mode 100644
index 55ba041bbc7b..000000000000
--- a/databases/mysqlwsrep57-server/files/my.cnf.sample.in
+++ /dev/null
@@ -1,62 +0,0 @@
-[client]
-port                            = 3306
-socket                          = /tmp/mysql.sock
-
-[mysql]
-prompt                          = \u@\h [\d]>\_
-no_auto_rehash
-
-[mysqld]
-user                            = mysql
-port                            = 3306
-socket                          = /tmp/mysql.sock
-bind-address                    = 127.0.0.1
-basedir                         = %%PREFIX%%
-datadir                         = %%MY_DBDIR%%
-tmpdir                          = %%MY_TMPDIR%%
-slave-load-tmpdir               = %%MY_TMPDIR%%
-secure-file-priv                = %%MY_SECDIR%%
-log-bin                         = mysql-bin
-log-output                      = TABLE
-master-info-repository          = TABLE
-relay-log-info-repository       = TABLE
-relay-log-recovery              = 1
-slow-query-log                  = 1
-server-id                       = 1
-sync_binlog                     = 1
-sync_relay_log                  = 1
-binlog_cache_size               = 16M
-expire_logs_days                = 30
-default_password_lifetime       = 0
-enforce-gtid-consistency        = 1
-gtid-mode                       = ON
-safe-user-create                = 1
-lower_case_table_names          = 1
-explicit-defaults-for-timestamp = 1
-myisam-recover-options          = BACKUP,FORCE
-open_files_limit                = 32768
-table_open_cache                = 16384
-table_definition_cache          = 8192
-net_retry_count                 = 16384
-key_buffer_size                 = 256M
-max_allowed_packet              = 64M
-query_cache_type                = 0
-query_cache_size                = 0
-long_query_time                 = 0.5
-innodb_buffer_pool_size         = 1G
-innodb_data_home_dir            = %%MY_DBDIR%%
-innodb_log_group_home_dir       = %%MY_DBDIR%%
-innodb_data_file_path           = ibdata1:128M:autoextend
-innodb_temp_data_file_path      = ibtmp1:128M:autoextend
-innodb_flush_method             = O_DIRECT
-innodb_log_file_size            = 256M
-innodb_log_buffer_size          = 16M
-innodb_write_io_threads         = 8
-innodb_read_io_threads          = 8
-innodb_autoinc_lock_mode        = 2
-skip-symbolic-links
-
-[mysqldump]
-max_allowed_packet              = 256M
-quote_names
-quick
diff --git a/databases/mysqlwsrep57-server/files/mysql-server.in b/databases/mysqlwsrep57-server/files/mysql-server.in
deleted file mode 100644
index 17320906bf56..000000000000
--- a/databases/mysqlwsrep57-server/files/mysql-server.in
+++ /dev/null
@@ -1,108 +0,0 @@
-#!/bin/sh
-
-# PROVIDE: mysql
-# REQUIRE: LOGIN
-# KEYWORD: shutdown
-
-#
-# Add the following line to /etc/rc.conf to enable mysql:
-# mysql_enable (bool):	Set to "NO" by default.
-#			Set it to "YES" to enable MySQL.
-%%LEGACY_LIMITS%%# mysql_limits (bool):	Set to "NO" by default.
-%%LEGACY_LIMITS%%#			Set it to yes to run `limits -e -U mysql`
-%%LEGACY_LIMITS%%#			just before mysql starts.
-# mysql_dbdir (str):	Default to "%%MY_DBDIR%%"
-#			Base database directory.
-# mysql_confdir (str):	Default to "%%ETCDIR%%"
-#			Base configuration directory.
-# mysql_optfile (str):	Server-specific option file.
-#			Set it in the rc.conf or default behaviour of
-#			`mysqld_safe` itself, will be picking
-#			${mysql_confdir}/my.cnf if it exists.
-# mysql_pidfile (str):	Custum PID file path and name.
-#			Default to "${mysql_dbdir}/${hostname}.pid".
-# mysql_args (str):	Custom additional arguments to be passed
-#			to mysqld_safe (default empty).
-# mysql_startup_timeout (int): How much time, in seconds, should
-#			we wait for mysqld to start (default 900).
-#
-
-. /etc/rc.subr
-
-name="mysql"
-rcvar=mysql_enable
-
-load_rc_config $name
-
-: ${mysql_enable="NO"}
-%%LEGACY_LIMITS%%: ${mysql_limits="NO"}
-: ${mysql_dbdir="%%MY_DBDIR%%"}
-: ${mysql_confdir="%%ETCDIR%%"}
-if [ -f "${mysql_confdir}/my.cnf" ]; then
-: ${mysql_optfile="${mysql_confdir}/my.cnf"}
-elif [ -f "${mysql_dbdir}/my.cnf" ]; then
-: ${mysql_optfile="${mysql_dbdir}/my.cnf"}
-fi
-if [ ! -z "${mysql_optfile}" ]; then
-mysql_extra="--defaults-extra-file=${mysql_optfile}"
-fi
-
-mysql_user="mysql"
-%%LEGACY_LIMITS%%mysql_limits_args="-e -U ${mysql_user}"
-: ${hostname:=`/bin/hostname`}
-pidfile=${mysql_pidfile:-"${mysql_dbdir}/${hostname}.pid"}
-command="/usr/sbin/daemon"
-command_args="-c -f %%PREFIX%%/bin/mysqld_safe ${mysql_extra} --basedir=%%PREFIX%% --datadir=${mysql_dbdir} --pid-file=${pidfile} --user=${mysql_user} ${mysql_args} %%FEDER%% %%PERFSCHEMRC%%"
-procname="%%PREFIX%%/libexec/mysqld"
-start_precmd="${name}_prestart"
-start_postcmd="${name}_poststart"
-mysql_install_db="${procname}"
-mysql_install_db_args="${mysql_extra} --basedir=%%PREFIX%% --datadir=${mysql_dbdir} --user=${mysql_user} --initialize"
-: ${mysql_startup_timeout=900}
-startup_sleep=1
-sst_progress_file=${mysql_dbdir}/sst_in_progress
-extra_commands="bootstrap"
-bootstrap_cmd="mysql_bootstrap"
-
-mysql_bootstrap()
-{
-	# Bootstrap the cluster: start the first node that initiates the cluster
-	check_startmsgs && echo "Bootstrapping cluster"
-	shift
-	command_args="${command_args} --wsrep-new-cluster"
-	run_rc_command ${_rc_prefix}start
-}
-
-mysql_create_auth_tables()
-{
-	eval $mysql_install_db $mysql_install_db_args >/dev/null 2>/dev/null
-}
-
-mysql_prestart()
-{
-	if [ ! -d "${mysql_dbdir}/mysql/." ]; then
-		mysql_create_auth_tables || return 1
-	fi
-%%LEGACY_LIMITS%%	if checkyesno mysql_limits; then
-%%LEGACY_LIMITS%%		eval `/usr/bin/limits ${mysql_limits_args}` 2>/dev/null
-%%LEGACY_LIMITS%%	else
-%%LEGACY_LIMITS%%		return 0
-%%LEGACY_LIMITS%%	fi
-%%MODERN_LIMITS%%	return 0
-}
-
-mysql_poststart()
-{
-	local timeout=${mysql_startup_timeout}
-	while [ ! -f "${pidfile}" -a ${timeout} -gt 0 ]; do
-		if test -e $sst_progress_file && [ $startup_sleep -ne 100 ]; then
-			check_startmsgs && echo "SST in progress, setting sleep higher"
-			startup_sleep=100
-		fi
-		timeout=$(( timeout - 1 ))
-		sleep $startup_sleep
-	done
-	return 0
-}
-
-run_rc_command "$1"
diff --git a/databases/mysqlwsrep57-server/files/patch-CMakeLists.txt b/databases/mysqlwsrep57-server/files/patch-CMakeLists.txt
deleted file mode 100644
index 6752c25fcd24..000000000000
--- a/databases/mysqlwsrep57-server/files/patch-CMakeLists.txt
+++ /dev/null
@@ -1,40 +0,0 @@
---- CMakeLists.txt.orig	2021-06-16 10:56:53 UTC
-+++ CMakeLists.txt
-@@ -712,12 +712,10 @@ IF(UNIX)
- ENDIF()
- 
- IF(NOT WITHOUT_SERVER)
--  ADD_SUBDIRECTORY(testclients)
-   ADD_SUBDIRECTORY(sql)
-   OPTION (WITH_EMBEDDED_SERVER "Compile MySQL with embedded server" OFF)
-   IF(WITH_EMBEDDED_SERVER) 
-    ADD_SUBDIRECTORY(libmysqld)
--   ADD_SUBDIRECTORY(libmysqld/examples)
-   ENDIF(WITH_EMBEDDED_SERVER)
- ENDIF()
- 
-@@ -726,8 +724,6 @@ ENDIF()
- ADD_SUBDIRECTORY(scripts)
- 
- IF(NOT WITHOUT_SERVER)
--  ADD_SUBDIRECTORY(mysql-test)
--  ADD_SUBDIRECTORY(mysql-test/lib/My/SafeProcess)
-   ADD_SUBDIRECTORY(support-files)
-   IF(EXISTS ${CMAKE_SOURCE_DIR}/internal/CMakeLists.txt)
-     ADD_SUBDIRECTORY(internal)
-@@ -786,6 +782,7 @@ ENDIF()
- #
- # RPM installs documentation directly from the source tree
- #
-+IF(FALSE)
- IF(NOT INSTALL_LAYOUT MATCHES "RPM")
-   INSTALL(FILES
-     README
-@@ -807,6 +804,7 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM")
-     PATTERN "mysql.info" EXCLUDE
-     PATTERN "sp-imp-spec.txt" EXCLUDE
-   )
-+ENDIF()
- ENDIF()
- 
- INCLUDE(CPack)
diff --git a/databases/mysqlwsrep57-server/files/patch-client_CMakeLists.txt b/databases/mysqlwsrep57-server/files/patch-client_CMakeLists.txt
deleted file mode 100644
index 4f8c6ebba7ef..000000000000
--- a/databases/mysqlwsrep57-server/files/patch-client_CMakeLists.txt
+++ /dev/null
@@ -1,75 +0,0 @@
---- client/CMakeLists.txt.orig	2019-10-21 05:21:41 UTC
-+++ client/CMakeLists.txt
-@@ -38,17 +38,17 @@ INCLUDE(${MYSQL_CMAKE_SCRIPT_DIR}/compile_flags.cmake)
- 
- ## Subdirectory with common client code.
- ADD_SUBDIRECTORY(base)
--## Subdirectory for mysqlpump code.
--ADD_SUBDIRECTORY(dump)
- 
- INCLUDE(${MYSQL_CMAKE_SCRIPT_DIR}/compile_flags.cmake)
- 
- ADD_DEFINITIONS(${SSL_DEFINES})
-+IF(FALSE)
- MYSQL_ADD_EXECUTABLE(mysql completion_hash.cc mysql.cc readline.cc ../sql-common/sql_string.cc)
- TARGET_LINK_LIBRARIES(mysql mysqlclient)
- IF(UNIX)
-   TARGET_LINK_LIBRARIES(mysql ${EDITLINE_LIBRARY})
- ENDIF(UNIX)
-+ENDIF()
- 
- IF(NOT WITHOUT_SERVER)
-   MYSQL_ADD_EXECUTABLE(mysql_upgrade
-@@ -69,6 +69,7 @@ ADD_DEPENDENCIES(mysqltest GenError)
- ADD_CONVENIENCE_LIBRARY(mysqlcheck_core check/mysqlcheck_core.cc)
- TARGET_LINK_LIBRARIES(mysqlcheck_core mysqlclient)
- 
-+IF(FALSE)
- MYSQL_ADD_EXECUTABLE(mysqlcheck check/mysqlcheck.cc)
- TARGET_LINK_LIBRARIES(mysqlcheck mysqlcheck_core)
- 
-@@ -81,10 +82,12 @@ TARGET_LINK_LIBRARIES(mysqlimport mysqlclient)
- 
- MYSQL_ADD_EXECUTABLE(mysqlshow mysqlshow.c)
- TARGET_LINK_LIBRARIES(mysqlshow mysqlclient)
-+ENDIF()
- 
- MYSQL_ADD_EXECUTABLE(mysql_plugin mysql_plugin.c)
- TARGET_LINK_LIBRARIES(mysql_plugin mysqlclient)
- 
-+IF(FALSE)
- MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc)
- ADD_COMPILE_FLAGS(
-   mysqlbinlog.cc
-@@ -101,6 +104,7 @@ TARGET_LINK_LIBRARIES(mysqlslap mysqlclient)
- 
- MYSQL_ADD_EXECUTABLE(mysql_config_editor mysql_config_editor.cc)
- TARGET_LINK_LIBRARIES(mysql_config_editor ${FORCE_SSL_SOLARIS} mysqlclient)
-+ENDIF()
- 
- MYSQL_ADD_EXECUTABLE(mysql_secure_installation mysql_secure_installation.cc)
- TARGET_LINK_LIBRARIES(mysql_secure_installation mysqlclient)
-@@ -116,9 +120,11 @@ IF(UNIX AND NOT WITHOUT_SERVER)
-   ADD_DEPENDENCIES(mysql_install_db GenBootstrapPriv GenSysSchema)
- ENDIF()
- 
-+IF(FALSE)
- MYSQL_ADD_EXECUTABLE(mysql_ssl_rsa_setup mysql_ssl_rsa_setup.cc path.cc logger.cc)
- TARGET_LINK_LIBRARIES(mysql_ssl_rsa_setup mysys mysys_ssl)
- SET_TARGET_PROPERTIES(mysql_ssl_rsa_setup PROPERTIES LINKER_LANGUAGE CXX)
-+ENDIF()
- 
- # "WIN32" also covers 64 bit. "echo" is used in some files below "mysql-test/".
- IF(WIN32)
-@@ -127,11 +133,6 @@ ENDIF(WIN32)
- 
- SET_TARGET_PROPERTIES (
-   mysql_plugin
--  mysqlcheck
--  mysqldump
--  mysqlimport
--  mysqlshow
--  mysqlslap
- PROPERTIES HAS_CXX TRUE)
- 
- ADD_DEFINITIONS(-DHAVE_DLOPEN)
diff --git a/databases/mysqlwsrep57-server/files/patch-cmake_os_FreeBSD.cmake b/databases/mysqlwsrep57-server/files/patch-cmake_os_FreeBSD.cmake
deleted file mode 100644
index 6778523e0797..000000000000
--- a/databases/mysqlwsrep57-server/files/patch-cmake_os_FreeBSD.cmake
+++ /dev/null
@@ -1,31 +0,0 @@
---- cmake/os/FreeBSD.cmake.orig	2020-10-07 08:29:27 UTC
-+++ cmake/os/FreeBSD.cmake
-@@ -45,6 +45,20 @@ IF(NOT FORCE_UNSUPPORTED_COMPILER)
-     IF(NOT HAVE_SUPPORTED_CLANG_VERSION)
-       MESSAGE(FATAL_ERROR "Clang 3.3 or newer is required!")
-     ENDIF()
-+    CHECK_C_SOURCE_RUNS("
-+      int main()
-+      {
-+        return (__clang_major__ >= 4);
-+      }" I386_ATOMIC_BUILTINS)
-+    IF((CMAKE_SYSTEM_PROCESSOR MATCHES "i386") AND (NOT I386_ATOMIC_BUILTINS))
-+      SET(HAVE_GCC_ATOMIC_BUILTINS CACHE  INTERNAL "")
-+    ENDIF()
-+  ELSEIF(CMAKE_COMPILER_IS_GNUCC)
-+    EXECUTE_PROCESS(COMMAND ${CMAKE_C_COMPILER} -dumpversion
-+                    OUTPUT_VARIABLE GCC_VERSION)
-+    IF(GCC_VERSION VERSION_LESS 4.4)
-+      MESSAGE(FATAL_ERROR "GCC 4.4 or newer is required!")
-+    ENDIF()
-   ELSE()
-     MESSAGE(FATAL_ERROR "Unsupported compiler!")
-   ENDIF()
-@@ -53,4 +67,6 @@ ENDIF()
- # Should not be needed any more, but kept for easy resurrection if needed
- #   #Legacy option, maybe not needed anymore , taken as is from autotools build
- #   ADD_DEFINITIONS(-DNET_RETRY_COUNT=1000000)
--
-+# For GCC maybe it's also good idea to use
-+#   ADD_DEFINITIONS(-D_GNU_SOURCE)
-+    
diff --git a/databases/mysqlwsrep57-server/files/patch-cmake_plugin.cmake b/databases/mysqlwsrep57-server/files/patch-cmake_plugin.cmake
deleted file mode 100644
index 5cb4a2dfe778..000000000000
--- a/databases/mysqlwsrep57-server/files/patch-cmake_plugin.cmake
+++ /dev/null
@@ -1,12 +0,0 @@
---- cmake/plugin.cmake.orig	2019-10-21 05:21:41 UTC
-+++ cmake/plugin.cmake
-@@ -282,9 +282,6 @@ MACRO(MYSQL_ADD_PLUGIN)
-       MYSQL_INSTALL_TARGETS(${target}
-         DESTINATION ${INSTALL_PLUGINDIR}
-         COMPONENT ${INSTALL_COMPONENT})
--      INSTALL_DEBUG_TARGET(${target}
--        DESTINATION ${INSTALL_PLUGINDIR}/debug
--        COMPONENT ${INSTALL_COMPONENT})
-       # Add installed files to list for RPMs
-       FILE(APPEND ${CMAKE_BINARY_DIR}/support-files/plugins.files
-               "%attr(755, root, root) %{_prefix}/${INSTALL_PLUGINDIR}/${ARG_MODULE_OUTPUT_NAME}.so\n"
diff --git a/databases/mysqlwsrep57-server/files/patch-cmake_ssl.cmake b/databases/mysqlwsrep57-server/files/patch-cmake_ssl.cmake
deleted file mode 100644
index 0dc10db09610..000000000000
--- a/databases/mysqlwsrep57-server/files/patch-cmake_ssl.cmake
+++ /dev/null
@@ -1,15 +0,0 @@
---- cmake/ssl.cmake.orig	2020-05-27 10:17:47 UTC
-+++ cmake/ssl.cmake
-@@ -206,6 +206,12 @@ MACRO (MYSQL_CHECK_SSL)
-        OPENSSL_MAJOR_VERSION STREQUAL "1"
-       )
-       SET(OPENSSL_FOUND TRUE)
-+    ELSEIF(OPENSSL_INCLUDE_DIR AND
-+       OPENSSL_LIBRARY   AND
-+       CRYPTO_LIBRARY      AND
-+       OPENSSL_MAJOR_VERSION STREQUAL "2"
-+      )
-+      SET(OPENSSL_FOUND TRUE)
-     ELSE()
-       SET(OPENSSL_FOUND FALSE)
-     ENDIF()
diff --git a/databases/mysqlwsrep57-server/files/patch-include_CMakeLists.txt b/databases/mysqlwsrep57-server/files/patch-include_CMakeLists.txt
deleted file mode 100644
index e77c3b510e4c..000000000000
--- a/databases/mysqlwsrep57-server/files/patch-include_CMakeLists.txt
+++ /dev/null
@@ -1,19 +0,0 @@
---- include/CMakeLists.txt.orig	2019-10-21 05:21:41 UTC
-+++ include/CMakeLists.txt
-@@ -76,14 +76,13 @@ SET(HEADERS 
-   ${HEADERS_GEN_CONFIGURE}
- )
- 
-+IF(FALSE)
- INSTALL(FILES
-   ../libbinlogevents/export/binary_log_types.h
-   DESTINATION ${INSTALL_INCLUDEDIR}
--  COMPONENT Development)
--INSTALL(FILES ${HEADERS} DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT Development)
--INSTALL(DIRECTORY mysql/ DESTINATION ${INSTALL_INCLUDEDIR}/mysql COMPONENT Development 
-  PATTERN "*.h"
-  PATTERN "psi_abi*" EXCLUDE
- )
-+ENDIF()
- 
- 
diff --git a/databases/mysqlwsrep57-server/files/patch-include_my__compare.h b/databases/mysqlwsrep57-server/files/patch-include_my__compare.h
deleted file mode 100644
index 24205abdee3e..000000000000
--- a/databases/mysqlwsrep57-server/files/patch-include_my__compare.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- include/my_compare.h.orig	2019-10-21 05:21:41 UTC
-+++ include/my_compare.h
-@@ -47,7 +47,7 @@ extern "C" {
-   But beware the dependency of MI_MAX_POSSIBLE_KEY_BUFF and HA_MAX_KEY_LENGTH.
- */
- 
--#define HA_MAX_KEY_LENGTH           1000        /* Max length in bytes */
-+#define HA_MAX_KEY_LENGTH           4000        /* Max length in bytes */
- #define HA_MAX_KEY_SEG              16          /* Max segments for key */
- 
- #define HA_MAX_POSSIBLE_KEY_BUFF    (HA_MAX_KEY_LENGTH + 24+ 6+6)
diff --git a/databases/mysqlwsrep57-server/files/patch-include_my__thread__os__id.h b/databases/mysqlwsrep57-server/files/patch-include_my__thread__os__id.h
deleted file mode 100644
index 08e6cd474251..000000000000
--- a/databases/mysqlwsrep57-server/files/patch-include_my__thread__os__id.h
+++ /dev/null
@@ -1,15 +0,0 @@
---- include/my_thread_os_id.h.orig	2019-10-21 05:21:41 UTC
-+++ include/my_thread_os_id.h
-@@ -88,8 +88,12 @@ static inline my_thread_os_id_t my_thread_os_id()
-   return pthread_getthreadid_np();
- #else
- #ifdef HAVE_INTEGER_PTHREAD_SELF
-+#  ifdef __DragonFly__
-+  return syscall(SYS_lwp_gettid);
-+#  else
-   /* Unknown platform, fallback. */
-   return pthread_self();
-+#  endif
- #else
-   /* Feature not available. */
-   return 0;
diff --git a/databases/mysqlwsrep57-server/files/patch-include_myisam.h b/databases/mysqlwsrep57-server/files/patch-include_myisam.h
deleted file mode 100644
index 228303eaf909..000000000000
--- a/databases/mysqlwsrep57-server/files/patch-include_myisam.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- include/myisam.h.orig	2019-10-21 05:21:41 UTC
-+++ include/myisam.h
-@@ -52,7 +52,7 @@ extern "C" {
-   The following defines can be increased if necessary.
-   But beware the dependency of MI_MAX_POSSIBLE_KEY_BUFF and MI_MAX_KEY_LENGTH.
- */
--#define MI_MAX_KEY_LENGTH           1000            /* Max length in bytes */
-+#define MI_MAX_KEY_LENGTH           4000            /* Max length in bytes */
- #define MI_MAX_KEY_SEG              16              /* Max segments for key */
- 
- #define MI_MAX_KEY_BUFF  (MI_MAX_KEY_LENGTH+MI_MAX_KEY_SEG*6+8+8)
diff --git a/databases/mysqlwsrep57-server/files/patch-libmysql_CMakeLists.txt b/databases/mysqlwsrep57-server/files/patch-libmysql_CMakeLists.txt
deleted file mode 100644
index 9e643a62c1f6..000000000000
--- a/databases/mysqlwsrep57-server/files/patch-libmysql_CMakeLists.txt
+++ /dev/null
@@ -1,36 +0,0 @@
---- libmysql/CMakeLists.txt.orig	2019-10-21 05:21:41 UTC
-+++ libmysql/CMakeLists.txt
-@@ -262,11 +262,11 @@ IF(WIN32)
- ENDIF()
- 
- # LDAP authentication SASL client plugin
--MESSAGE(STATUS "Creating LDAP authentication SASL client library.")
--ADD_SUBDIRECTORY(authentication_ldap)
-+# MESSAGE(STATUS "Creating LDAP authentication SASL client library.")
-+# ADD_SUBDIRECTORY(authentication_ldap)
-   
- # Merge several convenience libraries into one big mysqlclient
--MERGE_CONVENIENCE_LIBRARIES(mysqlclient ${LIBS_TO_MERGE} COMPONENT Development)
-+MERGE_CONVENIENCE_LIBRARIES(mysqlclient ${LIBS_TO_MERGE} COMPONENT Development SKIP_INSTALL)
- TARGET_LINK_LIBRARIES(mysqlclient ${LIBS_TO_LINK})
- 
- # Visual Studio users need debug  static library for debug projects
-@@ -312,8 +312,9 @@ IF(NOT DISABLE_SHARED)
-   # and link them together into shared library.
-   MERGE_LIBRARIES_SHARED(libmysql ${LIBS_TO_MERGE}
-     EXPORTS ${CLIENT_API_FUNCTIONS} ${CLIENT_API_FUNCTIONS_UNDOCUMENTED}
--    COMPONENT SharedLibraries)
-+    COMPONENT SharedLibraries SKIP_INSTALL)
-   TARGET_LINK_LIBRARIES(libmysql ${LIBS_TO_LINK})
-+  IF (FALSE)
-   IF(UNIX)
-     # libtool compatability
-     IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD" OR APPLE)
-@@ -357,6 +358,7 @@ IF(NOT DISABLE_SHARED)
-     SET_TARGET_PROPERTIES(mysqlclient PROPERTIES CLEAN_DIRECT_OUTPUT 1)
-     SET_TARGET_PROPERTIES(libmysql PROPERTIES CLEAN_DIRECT_OUTPUT 1)
- 
-+  ENDIF()
-   ENDIF()
- ENDIF()
- 
diff --git a/databases/mysqlwsrep57-server/files/patch-libservices_CMakeLists.txt b/databases/mysqlwsrep57-server/files/patch-libservices_CMakeLists.txt
deleted file mode 100644
index 11217752c637..000000000000
--- a/databases/mysqlwsrep57-server/files/patch-libservices_CMakeLists.txt
+++ /dev/null
@@ -1,9 +0,0 @@
---- libservices/CMakeLists.txt.orig	2019-10-21 05:21:41 UTC
-+++ libservices/CMakeLists.txt
-@@ -47,4 +47,6 @@ SET(MYSQLSERVICES_SOURCES
-   mysql_keyring_service.c)
- 
- ADD_CONVENIENCE_LIBRARY(mysqlservices ${MYSQLSERVICES_SOURCES})
-+IF(FALSE)
- INSTALL(TARGETS mysqlservices DESTINATION ${INSTALL_LIBDIR} COMPONENT Development)
-+ENDIF()
diff --git a/databases/mysqlwsrep57-server/files/patch-man_CMakeLists.txt b/databases/mysqlwsrep57-server/files/patch-man_CMakeLists.txt
deleted file mode 100644
index 990d98e30a8a..000000000000
--- a/databases/mysqlwsrep57-server/files/patch-man_CMakeLists.txt
+++ /dev/null
@@ -1,13 +0,0 @@
---- man/CMakeLists.txt.orig	2019-10-21 05:21:41 UTC
-+++ man/CMakeLists.txt
-@@ -21,9 +21,7 @@
- # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
- 
- # Copy man pages
--FILE(GLOB MAN1_FILES *.1)
--FILE(GLOB MAN1_EXCLUDE make_win_bin_dist.1)
--FILE(GLOB MAN1_NDB ndb*.1)
-+FILE(GLOB MAN1_FILES my_print_defaults.1  myisam_ftdump.1  myisamchk.1  myisamlog.1  myisampack.1  mysql.server.1  mysql_convert_table_format.1  mysql_fix_extensions.1  mysql_install_db.1  mysql_plugin.1  mysql_secure_installation.1  mysql_setpermission.1  mysql_tzinfo_to_sql.1  mysql_upgrade.1  mysql_zap.1  mysqlbug.1  mysqld_multi.1  mysqld_safe.1  mysqldumpslow.1  mysqlhotcopy.1  mysqlman.1  perror.1  replace.1  resolve_stack_dump.1  resolveip.1)
- FILE(GLOB MAN8_FILES *.8)
- FILE(GLOB MAN8_NDB ndb*.8)
- IF(MAN1_FILES)
diff --git a/databases/mysqlwsrep57-server/files/patch-mysys__ssl_my__default.cc b/databases/mysqlwsrep57-server/files/patch-mysys__ssl_my__default.cc
deleted file mode 100644
index bc88fe7a0b30..000000000000
--- a/databases/mysqlwsrep57-server/files/patch-mysys__ssl_my__default.cc
+++ /dev/null
@@ -1,62 +0,0 @@
---- mysys_ssl/my_default.cc.orig	2021-06-16 10:56:53 UTC
-+++ mysys_ssl/my_default.cc
-@@ -132,7 +132,7 @@ char wsrep_defaults_group_suffix[FN_EXTLEN]={0,};
- #endif /* WITH_WREP */
- /* Which directories are searched for options (and in which order) */
- 
--#define MAX_DEFAULT_DIRS 6
-+#define MAX_DEFAULT_DIRS 7
- #define DEFAULT_DIRS_SIZE (MAX_DEFAULT_DIRS + 1)  /* Terminate with NULL */
- static const char **default_directories = NULL;
- 
-@@ -948,6 +948,14 @@ static int search_default_file_with_ext(Process_option
-     strncpy(wsrep_defaults_file, name, sizeof(wsrep_defaults_file) - 1);
- #endif /* WITH_WSREP */
- 
-+  if (strstr(name, "/etc") == name)
-+  {
-+    fprintf(stderr,
-+             "error: Config file %s in invalid location, please move to or merge with /usr/local%s\n",
-+             name,name);
-+      goto err;
-+  }
-+
-   while (mysql_file_getline(buff, sizeof(buff) - 1, fp, is_login_file))
-   {
-     line++;
-@@ -1290,7 +1298,8 @@ void my_print_default_files(const char *conf_file)
-             end[(strlen(end)-1)] = ' ';
-           else
-             strxmov(end, conf_file, *ext , " ",  NullS);
--          fputs(name, stdout);
-+          if (strstr(name, "/etc") != name)
-+            fputs(name, stdout);
-         }
-       }
-     }
-@@ -1449,14 +1458,9 @@ static const char **init_default_directories(MEM_ROOT 
- 
- #else
- 
--  errors += add_directory(alloc, "/etc/", dirs);
--  errors += add_directory(alloc, "/etc/mysql/", dirs);
-+  errors += add_directory(alloc, "/usr/local/etc/", dirs);
-+  errors += add_directory(alloc, "/usr/local/etc/mysql/", dirs);
- 
--#if defined(DEFAULT_SYSCONFDIR)
--  if (DEFAULT_SYSCONFDIR[0])
--    errors += add_directory(alloc, DEFAULT_SYSCONFDIR, dirs);
--#endif /* DEFAULT_SYSCONFDIR */
--
- #endif
- 
-   if ((env= getenv("MYSQL_HOME")))
-@@ -1526,7 +1530,7 @@ int check_file_permissions(const char *file_name, my_b
-   MY_STAT stat_info;
- 
-   if (!my_stat(file_name,&stat_info,MYF(0)))
--    return 1;
-+    return 0;
-   /*
-     Ignore .mylogin.cnf file if not exclusively readable/writable
-     by current user.
diff --git a/databases/mysqlwsrep57-server/files/patch-plugin_password__validation_validate__password.cc b/databases/mysqlwsrep57-server/files/patch-plugin_password__validation_validate__password.cc
deleted file mode 100644
index 02a0b12caecb..000000000000
--- a/databases/mysqlwsrep57-server/files/patch-plugin_password__validation_validate__password.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- plugin/password_validation/validate_password.cc.orig	2019-10-21 05:21:41 UTC
-+++ plugin/password_validation/validate_password.cc
-@@ -25,6 +25,8 @@
- #include <mysql/plugin_validate_password.h>
- #include <mysql/service_my_plugin_log.h>
- #include <mysql/service_mysql_string.h>
-+/* solve clash between libc++ bitset::test() and test macro from my_global.h */
-+#undef test
- #include <set>
- #include <iostream>
- #include <fstream>
diff --git a/databases/mysqlwsrep57-server/files/patch-rapid_plugin_group__replication_src_recovery__state__transfer.cc b/databases/mysqlwsrep57-server/files/patch-rapid_plugin_group__replication_src_recovery__state__transfer.cc
deleted file mode 100644
index fd5f2169b959..000000000000
--- a/databases/mysqlwsrep57-server/files/patch-rapid_plugin_group__replication_src_recovery__state__transfer.cc
+++ /dev/null
@@ -1,20 +0,0 @@
---- rapid/plugin/group_replication/src/recovery_state_transfer.cc.orig	2021-06-16 10:56:53 UTC
-+++ rapid/plugin/group_replication/src/recovery_state_transfer.cc
-@@ -711,6 +711,7 @@ int Recovery_state_transfer::purge_recovery_slave_thre
-     donor_connection_interface.initialize_channel(const_cast<char*>("<NULL>"),
-                                                   0,
-                                                   NULL, NULL,
-+                                                  false,
-                                                   NULL,
-                                                   NULL,
-                                                   NULL,
-@@ -718,8 +719,7 @@ int Recovery_state_transfer::purge_recovery_slave_thre
-                                                   NULL,
-                                                   NULL,
-                                                   NULL,
--                                                  NULL,
--                                                  NULL,
-+                                                  false,
-                                                   DEFAULT_THREAD_PRIORITY,
-                                                   1, false, true, true);
- 
diff --git a/databases/mysqlwsrep57-server/files/patch-rapid_plugin_x_mysqlx__configure.cmake b/databases/mysqlwsrep57-server/files/patch-rapid_plugin_x_mysqlx__configure.cmake
deleted file mode 100644
index 52deee94ce89..000000000000
--- a/databases/mysqlwsrep57-server/files/patch-rapid_plugin_x_mysqlx__configure.cmake
+++ /dev/null
@@ -1,15 +0,0 @@
---- rapid/plugin/x/mysqlx_configure.cmake.orig	2019-10-21 05:21:41 UTC
-+++ rapid/plugin/x/mysqlx_configure.cmake
-@@ -42,6 +42,7 @@ CONFIGURE_FILE(${MYSQLX_PROJECT_DIR}/src/mysqlx_ername
- CONFIGURE_FILE(${MYSQLX_PROJECT_DIR}/src/mysqlx_version.h.in
-                ${CMAKE_CURRENT_BINARY_DIR}/generated/mysqlx_version.h )
- 
-+IF(FALSE)
- INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/generated/mysqlx_error.h
-         DESTINATION ${INSTALL_INCLUDEDIR}
-         COMPONENT Developement)
-@@ -53,3 +54,4 @@ INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/generated/my
- INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/generated/mysqlx_version.h
-         DESTINATION ${INSTALL_INCLUDEDIR}
-         COMPONENT Developement)
-+ENDIF()
diff --git a/databases/mysqlwsrep57-server/files/patch-rapid_unittest_gunit_xplugin_CMakeLists.txt b/databases/mysqlwsrep57-server/files/patch-rapid_unittest_gunit_xplugin_CMakeLists.txt
deleted file mode 100644
index bed7d2f42c67..000000000000
--- a/databases/mysqlwsrep57-server/files/patch-rapid_unittest_gunit_xplugin_CMakeLists.txt
+++ /dev/null
@@ -1,18 +0,0 @@
---- rapid/unittest/gunit/xplugin/CMakeLists.txt.orig	2019-10-21 05:21:41 UTC
-+++ rapid/unittest/gunit/xplugin/CMakeLists.txt
-@@ -78,7 +78,6 @@ ADD_DEFINITIONS(
- )
- 
- INCLUDE_DIRECTORIES(SYSTEM
--    ${BOOST_INCLUDE_DIR}
-     ${PROTOBUF_INCLUDE_DIRS}
-     ${SSL_INCLUDE_DIRS}
-     ${LIBEVENT_INCLUDE_DIRS}
-@@ -88,6 +87,7 @@ INCLUDE_DIRECTORIES(SYSTEM
- )
- 
- INCLUDE_DIRECTORIES(
-+  ${BOOST_INCLUDE_DIR}
-   ${CMAKE_SOURCE_DIR}/testing/include
-   ${PROJECT_SOURCE_DIR}/rapid/plugin/x/ngs/include
-   ${PROJECT_SOURCE_DIR}/rapid/plugin/x/ngs/include/ngs
diff --git a/databases/mysqlwsrep57-server/files/patch-scripts_CMakeLists.txt b/databases/mysqlwsrep57-server/files/patch-scripts_CMakeLists.txt
deleted file mode 100644
index 2c76de951e7e..000000000000
--- a/databases/mysqlwsrep57-server/files/patch-scripts_CMakeLists.txt
+++ /dev/null
@@ -1,36 +0,0 @@
---- scripts/CMakeLists.txt.orig	2021-06-16 10:56:53 UTC
-+++ scripts/CMakeLists.txt
-@@ -330,6 +330,8 @@ MACRO(EXTRACT_LINK_LIBRARIES target var)
-           GET_FILENAME_COMPONENT(lib "${lib}" NAME_WE)
-           STRING(REGEX REPLACE "^lib" "" lib "${lib}")
-           SET(${var} "${${var}}-l${lib} " )
-+        ELSEIF(lib STREQUAL "-pthread")
-+          SET(${var} "${${var}}-pthread " )
-         ELSE()
-           SET(${var} "${${var}}-l${lib} " )
-         ENDIF()
-@@ -422,14 +424,13 @@ ELSE()
-   # On Unix, most of the files end up in the bin directory
-   SET(mysql_config_COMPONENT COMPONENT Development)
- 
-+
-   IF(WITH_SYSTEMD)
-     SET(BIN_SCRIPTS
--      mysql_config
-       mysqldumpslow
-       )
-   ELSE()
-     SET(BIN_SCRIPTS
--      mysql_config
-       mysqldumpslow
-       mysqld_multi
-       mysqld_safe
-@@ -473,7 +474,7 @@ ELSE()
-   FOREACH(file ${BIN_SCRIPTS})
-     IF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh)
-       CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh
--        ${CMAKE_CURRENT_BINARY_DIR}/${file} ESCAPE_QUOTES @ONLY)
-+        ${CMAKE_CURRENT_BINARY_DIR}/${file} @ONLY)
-     ELSEIF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${file})
-       CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${file}
-          ${CMAKE_CURRENT_BINARY_DIR}/${file} COPYONLY)
diff --git a/databases/mysqlwsrep57-server/files/patch-sql_CMakeLists.txt b/databases/mysqlwsrep57-server/files/patch-sql_CMakeLists.txt
deleted file mode 100644
index e3b27523cfbe..000000000000
--- a/databases/mysqlwsrep57-server/files/patch-sql_CMakeLists.txt
+++ /dev/null
@@ -1,27 +0,0 @@
---- sql/CMakeLists.txt.orig	2021-06-16 10:56:53 UTC
-+++ sql/CMakeLists.txt
-@@ -29,6 +29,8 @@ INCLUDE_DIRECTORIES(
-   ${CMAKE_SOURCE_DIR}/regex 
-   ${SSL_INCLUDE_DIRS}
-   ${CMAKE_BINARY_DIR}/sql
-+  ${CMAKE_BINARY_DIR}/include
-+  ${CMAKE_BINARY_DIR}
-   ${WSREP_INCLUDES}
-   ${LZ4_INCLUDE_DIR}
- )
-@@ -663,6 +665,7 @@ ADD_CUSTOM_TARGET( 
- )
- 
- 
-+IF(FALSE)
- MYSQL_ADD_PLUGIN(udf_example udf_example.cc
-                  MODULE_ONLY TEST_ONLY MODULE_OUTPUT_NAME "udf_example")
- IF(NOT DISABLE_SHARED)
-@@ -671,6 +674,7 @@ IF(NOT DISABLE_SHARED)
-       PROPERTIES LINK_FLAGS
-       "/DEF:${CMAKE_CURRENT_SOURCE_DIR}/udf_example.def")
-   ENDIF()
-+ENDIF()
- ENDIF()
- 
- MYSQL_ADD_PLUGIN(locking_service locking_service_udf.cc
diff --git a/databases/mysqlwsrep57-server/files/patch-sql_binlog.cc b/databases/mysqlwsrep57-server/files/patch-sql_binlog.cc
deleted file mode 100644
index 5d99dc0814c2..000000000000
--- a/databases/mysqlwsrep57-server/files/patch-sql_binlog.cc
+++ /dev/null
@@ -1,24 +0,0 @@
---- sql/binlog.cc.orig	2021-06-16 10:56:53 UTC
-+++ sql/binlog.cc
-@@ -10149,8 +10149,8 @@ void MYSQL_BIN_LOG::report_missing_purged_gtids(const 
- 
-   char* missing_gtids= NULL;
-   char* slave_executed_gtids= NULL;
--  gtid_missing.to_string(&missing_gtids, NULL);
--  slave_executed_gtid_set->to_string(&slave_executed_gtids, NULL);
-+  gtid_missing.to_string(&missing_gtids, false);
-+  slave_executed_gtid_set->to_string(&slave_executed_gtids, false);
- 
-   /*
-      Log the information about the missing purged GTIDs to the error log
-@@ -10221,8 +10221,8 @@ void MYSQL_BIN_LOG::report_missing_gtids(const Gtid_se
-   Gtid_set gtid_missing(slave_executed_gtid_set->get_sid_map());
-   gtid_missing.add_gtid_set(slave_executed_gtid_set);
-   gtid_missing.remove_gtid_set(previous_gtid_set);
--  gtid_missing.to_string(&missing_gtids, NULL);
--  slave_executed_gtid_set->to_string(&slave_executed_gtids, NULL);
-+  gtid_missing.to_string(&missing_gtids, false);
-+  slave_executed_gtid_set->to_string(&slave_executed_gtids, false);
- 
-   String tmp_uuid;
-   uchar name[]= "slave_uuid";
diff --git a/databases/mysqlwsrep57-server/files/patch-sql_conn__handler_socket__connection.cc b/databases/mysqlwsrep57-server/files/patch-sql_conn__handler_socket__connection.cc
deleted file mode 100644
index 5afdb1cfd53e..000000000000
--- a/databases/mysqlwsrep57-server/files/patch-sql_conn__handler_socket__connection.cc
+++ /dev/null
@@ -1,32 +0,0 @@
---- sql/conn_handler/socket_connection.cc.orig	2019-10-21 05:21:41 UTC
-+++ sql/conn_handler/socket_connection.cc
-@@ -953,22 +953,25 @@ Channel_info* Mysqld_socket_listener::listen_for_conne
-     signal(SIGCHLD, SIG_DFL);
-     request_init(&req, RQ_DAEMON, m_libwrap_name, RQ_FILE,
-                  mysql_socket_getfd(connect_sock), NULL);
--    fromhost(&req);
-+    void (*my_fromhost) (void *) = (void (*)(void *)) fromhost;
-+    my_fromhost(&req);
- 
--    if (!hosts_access(&req))
-+    int (*my_hosts_access) (void *) = (int (*) (void *)) hosts_access;
-+    if (!my_hosts_access(&req))
-     {
-       /*
-         This may be stupid but refuse() includes an exit(0)
-         which we surely don't want...
-         clean_exit() - same stupid thing ...
-       */
-+      char *(*my_eval_client) (void *) = (char *(*) (void *)) eval_client;
-       syslog(LOG_AUTH | m_deny_severity,
--             "refused connect from %s", eval_client(&req));
-+             "refused connect from %s", my_eval_client(&req));
- 
- #ifdef HAVE_LIBWRAP_PROTOTYPES
-       // Some distros have patched tcpd.h to have proper prototypes
-       if (req.sink)
--        (req.sink)(req.fd);
-+        ((void (*)(int)) (req.sink))(req.fd);
- #else
-       // Some distros have not patched tcpd.h
-       if (req.sink)
diff --git a/databases/mysqlwsrep57-server/files/patch-sql_locks_shared__spin__lock.cc b/databases/mysqlwsrep57-server/files/patch-sql_locks_shared__spin__lock.cc
deleted file mode 100644
index e33c2943509a..000000000000
--- a/databases/mysqlwsrep57-server/files/patch-sql_locks_shared__spin__lock.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- sql/locks/shared_spin_lock.cc.orig	2021-06-22 10:50:24 UTC
-+++ sql/locks/shared_spin_lock.cc
-@@ -239,7 +239,7 @@ lock::Shared_spin_lock &lock::Shared_spin_lock::try_or
-   {
-     this->spin_exclusive_lock();
-   }
--#if defined(__APPLE__)
-+#if defined(__APPLE__) || defined(__FreeBSD__)
-   my_atomic_store64(&this->m_exclusive_owner, reinterpret_cast<int64>(self));
- #else
-   my_atomic_store64(&this->m_exclusive_owner, self);
diff --git a/databases/mysqlwsrep57-server/files/patch-sql_sys__vars.cc b/databases/mysqlwsrep57-server/files/patch-sql_sys__vars.cc
deleted file mode 100644
index 52c636089b2d..000000000000
--- a/databases/mysqlwsrep57-server/files/patch-sql_sys__vars.cc
+++ /dev/null
@@ -1,38 +0,0 @@
---- sql/sys_vars.cc.orig	2021-06-16 10:56:53 UTC
-+++ sql/sys_vars.cc
-@@ -1749,7 +1749,7 @@ static Sys_var_ulong Sys_interactive_timeout(
-        "connection before closing it",
-        SESSION_VAR(net_interactive_timeout),
-        CMD_LINE(REQUIRED_ARG),
--       VALID_RANGE(1, LONG_TIMEOUT), DEFAULT(NET_WAIT_TIMEOUT), BLOCK_SIZE(1));
-+       VALID_RANGE(1, INT_MAX32/1000), DEFAULT(NET_WAIT_TIMEOUT), BLOCK_SIZE(1));
- 
- static Sys_var_ulong Sys_join_buffer_size(
-        "join_buffer_size",
-@@ -2629,7 +2629,7 @@ static Sys_var_ulong Sys_net_read_timeout(
-        "Number of seconds to wait for more data from a connection before "
-        "aborting the read",
-        SESSION_VAR(net_read_timeout), CMD_LINE(REQUIRED_ARG),
--       VALID_RANGE(1, LONG_TIMEOUT), DEFAULT(NET_READ_TIMEOUT), BLOCK_SIZE(1),
-+       VALID_RANGE(1, INT_MAX32/1000), DEFAULT(NET_READ_TIMEOUT), BLOCK_SIZE(1),
-        NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0),
-        ON_UPDATE(fix_net_read_timeout));
- 
-@@ -2653,7 +2653,7 @@ static Sys_var_ulong Sys_net_write_timeout(
-        "Number of seconds to wait for a block to be written to a connection "
-        "before aborting the write",
-        SESSION_VAR(net_write_timeout), CMD_LINE(REQUIRED_ARG),
--       VALID_RANGE(1, LONG_TIMEOUT), DEFAULT(NET_WRITE_TIMEOUT), BLOCK_SIZE(1),
-+       VALID_RANGE(1, INT_MAX32/1000), DEFAULT(NET_WRITE_TIMEOUT), BLOCK_SIZE(1),
-        NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0),
-        ON_UPDATE(fix_net_write_timeout));
- 
-@@ -4389,7 +4389,7 @@ static Sys_var_ulong Sys_net_wait_timeout(
-        "The number of seconds the server waits for activity on a "
-        "connection before closing it",
-        SESSION_VAR(net_wait_timeout), CMD_LINE(REQUIRED_ARG),
--       VALID_RANGE(1, IF_WIN(INT_MAX32/1000, LONG_TIMEOUT)),
-+       VALID_RANGE(1, INT_MAX32/1000),
-        DEFAULT(NET_WAIT_TIMEOUT), BLOCK_SIZE(1));
- 
- static Sys_var_plugin Sys_default_storage_engine(
diff --git a/databases/mysqlwsrep57-server/files/patch-sql_wsrep__utils.cc b/databases/mysqlwsrep57-server/files/patch-sql_wsrep__utils.cc
deleted file mode 100644
index 3f64304a02db..000000000000
--- a/databases/mysqlwsrep57-server/files/patch-sql_wsrep__utils.cc
+++ /dev/null
@@ -1,10 +0,0 @@
---- sql/wsrep_utils.cc.orig	2017-06-12 10:31:29 UTC
-+++ sql/wsrep_utils.cc
-@@ -26,6 +26,7 @@
- #include <sql_class.h>
- #include <socket_connection.h>
- 
-+#include <signal.h>
- #include <spawn.h>    // posix_spawn()
- #include <unistd.h>   // pipe()
- #include <errno.h>    // errno
diff --git a/databases/mysqlwsrep57-server/files/patch-storage_innobase_fsp_fsp0fsp.cc b/databases/mysqlwsrep57-server/files/patch-storage_innobase_fsp_fsp0fsp.cc
deleted file mode 100644
index 05b88083b2b0..000000000000
--- a/databases/mysqlwsrep57-server/files/patch-storage_innobase_fsp_fsp0fsp.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- storage/innobase/fsp/fsp0fsp.cc.orig	2020-11-02 10:59:53 UTC
-+++ storage/innobase/fsp/fsp0fsp.cc
-@@ -1281,7 +1281,7 @@ fsp_header_decode_encryption_info(
- 
- 	if (elen == MY_AES_BAD_DATA) {
- 		my_free(master_key);
--		return(NULL);
-+		return(false);
- 	}
- 
- 	/* Check checksum bytes. */
diff --git a/databases/mysqlwsrep57-server/files/patch-storage_innobase_include_srv0mon.h b/databases/mysqlwsrep57-server/files/patch-storage_innobase_include_srv0mon.h
deleted file mode 100644
index 4554b5dd3490..000000000000
--- a/databases/mysqlwsrep57-server/files/patch-storage_innobase_include_srv0mon.h
+++ /dev/null
@@ -1,13 +0,0 @@
---- storage/innobase/include/srv0mon.h.orig	2019-10-21 05:21:41 UTC
-+++ storage/innobase/include/srv0mon.h
-@@ -41,6 +41,10 @@ Created 12/15/2009	Jimmy Yang
- /* Required for FreeBSD so that INT64_MAX is defined. */
- #define __STDC_LIMIT_MACROS
- #endif /* __STDC_LIMIT_MACROS */
-+#ifdef __DragonFly__
-+/* The hack above doen't work for dragonfly, stdint.h already imported */
-+#include <machine/int_limits.h>
-+#endif
- 
- #include <stdint.h>
- 
diff --git a/databases/mysqlwsrep57-server/files/patch-storage_myisam_mi__dynrec.c b/databases/mysqlwsrep57-server/files/patch-storage_myisam_mi__dynrec.c
deleted file mode 100644
index 6608a5526c77..000000000000
--- a/databases/mysqlwsrep57-server/files/patch-storage_myisam_mi__dynrec.c
+++ /dev/null
@@ -1,23 +0,0 @@
---- storage/myisam/mi_dynrec.c.orig	2019-10-21 05:21:41 UTC
-+++ storage/myisam/mi_dynrec.c
-@@ -72,18 +72,13 @@ my_bool mi_dynmap_file(MI_INFO *info, my_off_t size)
-     DBUG_RETURN(1);
-   }
-   /*
--    I wonder if it is good to use MAP_NORESERVE. From the Linux man page:
--    MAP_NORESERVE
--      Do not reserve swap space for this mapping. When swap space is
--      reserved, one has the guarantee that it is possible to modify the
--      mapping. When swap space is not reserved one might get SIGSEGV
--      upon a write if no physical memory is available.
-+    MAP_NORESERVE is unimplemented in FreeBSD
-   */
-   info->s->file_map= (uchar*)
-                   my_mmap(0, (size_t) size,
-                           info->s->mode==O_RDONLY ? PROT_READ :
-                           PROT_READ | PROT_WRITE,
--                          MAP_SHARED | MAP_NORESERVE,
-+                          MAP_SHARED,
-                           info->dfile, 0L);
-   if (info->s->file_map == (uchar*) MAP_FAILED)
-   {
diff --git a/databases/mysqlwsrep57-server/files/patch-support-files_CMakeLists.txt b/databases/mysqlwsrep57-server/files/patch-support-files_CMakeLists.txt
deleted file mode 100644
index cbb532b82281..000000000000
--- a/databases/mysqlwsrep57-server/files/patch-support-files_CMakeLists.txt
+++ /dev/null
@@ -1,12 +0,0 @@
---- support-files/CMakeLists.txt.orig	2019-10-21 05:21:41 UTC
-+++ support-files/CMakeLists.txt
-@@ -67,7 +67,9 @@ IF(UNIX)
-     INSTALL(FILES magic DESTINATION ${inst_location} COMPONENT SupportFiles)
-   ENDIF()
- 
-+IF(FALSE)
-   INSTALL(FILES mysql.m4 DESTINATION ${INSTALL_SHAREDIR}/aclocal COMPONENT Development)
-+ENDIF()
-   
-   SET(bindir ${prefix}/${INSTALL_BINDIR})
-   SET(sbindir ${prefix}/${INSTALL_SBINDIR})
diff --git a/databases/mysqlwsrep57-server/pkg-descr b/databases/mysqlwsrep57-server/pkg-descr
deleted file mode 100644
index 03d7408d7141..000000000000
--- a/databases/mysqlwsrep57-server/pkg-descr
+++ /dev/null
@@ -1,7 +0,0 @@
-MySQL is a very fast, multi-threaded, multi-user and robust SQL
-(Structured Query Language) database server.
-
-Modified to support replication using the Galera library.
-
-WWW: https://www.mysql.com/
-WWW: https://galeracluster.com/
diff --git a/databases/mysqlwsrep57-server/pkg-message b/databases/mysqlwsrep57-server/pkg-message
deleted file mode 100644
index e619c93e68e7..000000000000
--- a/databases/mysqlwsrep57-server/pkg-message
+++ /dev/null
@@ -1,8 +0,0 @@
-[
-{ type: upgrade
-  message: <<EOM
-Remember to run mysql_upgrade the first time you start the MySQL server
-after an upgrade from an earlier version.
-EOM
-}
-]
diff --git a/databases/mysqlwsrep57-server/pkg-plist b/databases/mysqlwsrep57-server/pkg-plist
deleted file mode 100644
index 168a5abbe347..000000000000
--- a/databases/mysqlwsrep57-server/pkg-plist
+++ /dev/null
@@ -1,171 +0,0 @@
-bin/innochecksum
-bin/lz4_decompress
-bin/my_print_defaults
-bin/myisam_ftdump
-bin/myisamchk
-bin/myisamlog
-bin/myisampack
-bin/mysql_install_db
-bin/mysql_plugin
-bin/mysql_secure_installation
-bin/mysql_tzinfo_to_sql
-bin/mysql_upgrade
-bin/mysqld_multi
-bin/mysqld_safe
-bin/mysqldumpslow
-bin/mysqltest
-bin/mysqlxtest
-bin/perror
-bin/replace
-bin/resolve_stack_dump
-bin/resolveip
-bin/zlib_decompress
-bin/wsrep_sst_common
-bin/wsrep_sst_mysqldump
-bin/wsrep_sst_rsync
-bin/wsrep_sst_xtrabackup
-bin/wsrep_sst_xtrabackup-v2
-lib/mysql/plugin/adt_null.so
-lib/mysql/plugin/audit_log.so
-lib/mysql/plugin/auth.so
-lib/mysql/plugin/auth_pam.so
-lib/mysql/plugin/auth_test_plugin.so
-lib/mysql/plugin/connection_control.so
-lib/mysql/plugin/daemon_example.ini
-lib/mysql/plugin/dialog.so
-lib/mysql/plugin/group_replication.so
-%%NO_EXAMPLE%%lib/mysql/plugin/ha_example.so
-lib/mysql/plugin/innodb_engine.so
-lib/mysql/plugin/keyring_file.so
-lib/mysql/plugin/keyring_udf.so
-lib/mysql/plugin/libdaemon_example.so
-lib/mysql/plugin/libmemcached.so
-lib/mysql/plugin/libtest_framework.so
-lib/mysql/plugin/libtest_services.so
-lib/mysql/plugin/libtest_services_threaded.so
-lib/mysql/plugin/libtest_session_detach.so
-lib/mysql/plugin/libtest_session_in_thd.so
-lib/mysql/plugin/libtest_session_info.so
-lib/mysql/plugin/libtest_sql_2_sessions.so
-lib/mysql/plugin/libtest_sql_all_col_types.so
-lib/mysql/plugin/libtest_sql_cmds_1.so
-lib/mysql/plugin/libtest_sql_commit.so
-lib/mysql/plugin/libtest_sql_complex.so
-lib/mysql/plugin/libtest_sql_errors.so
-lib/mysql/plugin/libtest_sql_lock.so
-lib/mysql/plugin/libtest_sql_processlist.so
-lib/mysql/plugin/libtest_sql_replication.so
-lib/mysql/plugin/libtest_sql_shutdown.so
-lib/mysql/plugin/libtest_sql_sqlmode.so
-lib/mysql/plugin/libtest_sql_stored_procedures_functions.so
-lib/mysql/plugin/libtest_sql_views_triggers.so
-lib/mysql/plugin/libtest_x_sessions_deinit.so
-lib/mysql/plugin/libtest_x_sessions_init.so
-lib/mysql/plugin/locking_service.so
-lib/mysql/plugin/mypluglib.so
-lib/mysql/plugin/mysql_no_login.so
-lib/mysql/plugin/mysqlx.so
-lib/mysql/plugin/qa_auth_client.so
-lib/mysql/plugin/qa_auth_interface.so
-lib/mysql/plugin/qa_auth_server.so
-lib/mysql/plugin/replication_observers_example_plugin.so
-lib/mysql/plugin/rewrite_example.so
-lib/mysql/plugin/rewriter.so
-lib/mysql/plugin/semisync_master.so
-lib/mysql/plugin/semisync_slave.so
-lib/mysql/plugin/test_security_context.so
-lib/mysql/plugin/test_udf_services.so
-lib/mysql/plugin/validate_password.so
-lib/mysql/plugin/version_token.so
-libdata/pkgconfig/LIBMYSQL_OS_OUTPUT_NAME-NOTFOUND.pc
-libexec/mysqld
-man/man1/my_print_defaults.1.gz
-man/man1/myisam_ftdump.1.gz
-man/man1/myisamchk.1.gz
-man/man1/myisamlog.1.gz
-man/man1/myisampack.1.gz
-man/man1/mysql.server.1.gz
-man/man1/mysql_install_db.1.gz
-man/man1/mysql_plugin.1.gz
-man/man1/mysql_secure_installation.1.gz
-man/man1/mysql_tzinfo_to_sql.1.gz
-man/man1/mysql_upgrade.1.gz
-man/man1/mysqld_multi.1.gz
-man/man1/mysqld_safe.1.gz
-man/man1/mysqldumpslow.1.gz
-man/man1/mysqlman.1.gz
-man/man1/perror.1.gz
-man/man1/replace.1.gz
-man/man1/resolve_stack_dump.1.gz
-man/man1/resolveip.1.gz
-man/man8/mysqld.8.gz
-%%DATADIR%%/bulgarian/errmsg.sys
-%%DATADIR%%/charsets/Index.xml
-%%DATADIR%%/charsets/README
-%%DATADIR%%/charsets/armscii8.xml
-%%DATADIR%%/charsets/ascii.xml
-%%DATADIR%%/charsets/cp1250.xml
-%%DATADIR%%/charsets/cp1251.xml
-%%DATADIR%%/charsets/cp1256.xml
-%%DATADIR%%/charsets/cp1257.xml
-%%DATADIR%%/charsets/cp850.xml
-%%DATADIR%%/charsets/cp852.xml
-%%DATADIR%%/charsets/cp866.xml
-%%DATADIR%%/charsets/dec8.xml
-%%DATADIR%%/charsets/geostd8.xml
-%%DATADIR%%/charsets/greek.xml
-%%DATADIR%%/charsets/hebrew.xml
-%%DATADIR%%/charsets/hp8.xml
-%%DATADIR%%/charsets/keybcs2.xml
-%%DATADIR%%/charsets/koi8r.xml
-%%DATADIR%%/charsets/koi8u.xml
-%%DATADIR%%/charsets/latin1.xml
-%%DATADIR%%/charsets/latin2.xml
-%%DATADIR%%/charsets/latin5.xml
-%%DATADIR%%/charsets/latin7.xml
-%%DATADIR%%/charsets/macce.xml
-%%DATADIR%%/charsets/macroman.xml
-%%DATADIR%%/charsets/swe7.xml
-%%DATADIR%%/czech/errmsg.sys
-%%DATADIR%%/danish/errmsg.sys
-%%DATADIR%%/dictionary.txt
-%%DATADIR%%/dutch/errmsg.sys
-%%DATADIR%%/english/errmsg.sys
-%%DATADIR%%/errmsg-utf8.txt
-%%DATADIR%%/estonian/errmsg.sys
-%%DATADIR%%/fill_help_tables.sql
-%%DATADIR%%/french/errmsg.sys
-%%DATADIR%%/german/errmsg.sys
-%%DATADIR%%/greek/errmsg.sys
-%%DATADIR%%/hungarian/errmsg.sys
-%%DATADIR%%/innodb_memcached_config.sql
-%%DATADIR%%/install_rewriter.sql
-%%DATADIR%%/italian/errmsg.sys
-%%DATADIR%%/japanese/errmsg.sys
-%%DATADIR%%/korean/errmsg.sys
-%%DATADIR%%/magic
-%%DATADIR%%/mysql-log-rotate
-%%DATADIR%%/mysql.server
-%%DATADIR%%/mysql_security_commands.sql
-%%DATADIR%%/mysql_sys_schema.sql
-%%DATADIR%%/mysql_system_tables.sql
-%%DATADIR%%/mysql_system_tables_data.sql
-%%DATADIR%%/mysql_test_data_timezone.sql
-%%DATADIR%%/mysqld_multi.server
-%%DATADIR%%/norwegian-ny/errmsg.sys
-%%DATADIR%%/norwegian/errmsg.sys
-%%DATADIR%%/polish/errmsg.sys
-%%DATADIR%%/portuguese/errmsg.sys
-%%DATADIR%%/romanian/errmsg.sys
-%%DATADIR%%/russian/errmsg.sys
-%%DATADIR%%/serbian/errmsg.sys
-%%DATADIR%%/slovak/errmsg.sys
-%%DATADIR%%/spanish/errmsg.sys
-%%DATADIR%%/swedish/errmsg.sys
-%%DATADIR%%/ukrainian/errmsg.sys
-%%DATADIR%%/uninstall_rewriter.sql
-%%DATADIR%%/wsrep_notify
-@sample(root,wheel,0644) %%ETCDIR%%/my.cnf.sample
-@dir(mysql,mysql,0750) %%ETCDIR%%/keyring
-@dir(mysql,mysql,0750) %%MY_SECDIR%%
-@dir(mysql,mysql,0750) %%MY_TMPDIR%%
diff --git a/databases/mytop/Makefile b/databases/mytop/Makefile
index 4a4e0cfc01bb..faee6e334d48 100644
--- a/databases/mytop/Makefile
+++ b/databases/mytop/Makefile
@@ -1,15 +1,15 @@
-# Created by: Yen-Ming Lee <leeym@FreeBSD.org>
-
 PORTNAME=	mytop
 PORTVERSION=	1.7
+PORTREVISION=	1
 CATEGORIES=	databases
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Top clone for MySQL
+WWW=		https://jeremy.zawodny.com/mysql/mytop/
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	p5-DBD-mysql>1.0:databases/p5-DBD-mysql \
+RUN_DEPENDS=	${DBD_MYSQL} \
 		p5-DBI>=1.13:databases/p5-DBI \
 		p5-Term-ReadKey>=2.10:devel/p5-Term-ReadKey
 
@@ -19,7 +19,7 @@ GH_TAGNAME=	437f2ef
 
 NO_ARCH=	yes
 
-USES+=		perl5
+USES+=		mysql perl5
 USE_PERL5=	configure
 
 PLIST_FILES=	bin/mytop \
diff --git a/databases/mytop/pkg-descr b/databases/mytop/pkg-descr
index 812243781c92..31e1f188f7d9 100644
--- a/databases/mytop/pkg-descr
+++ b/databases/mytop/pkg-descr
@@ -2,5 +2,3 @@ mytop is a non-gui tool for monitoring the threads and overall performance
 of MySQL 3.22.x and 3.23.x servers. It runs on most Unix systems which have
 Perl, DBI, and Term::ReadKey installed. And with Term::ANSIColor installed
 you even get color.
-
-WWW: http://jeremy.zawodny.com/mysql/mytop/
diff --git a/databases/nagios-check_mongodb/Makefile b/databases/nagios-check_mongodb/Makefile
index 9b11bac37fc6..1e92773e9ef7 100644
--- a/databases/nagios-check_mongodb/Makefile
+++ b/databases/nagios-check_mongodb/Makefile
@@ -1,5 +1,3 @@
-# Created by: Dmitry Sivachenko <demon@FreeBSD.org>
-
 PORTNAME=	check_mongodb
 PORTVERSION=	0.1
 CATEGORIES=	databases python
@@ -7,8 +5,9 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}nagios-
 
 MAINTAINER=	demon@FreeBSD.org
 COMMENT=	Nagios plugin to check mongodb server
+WWW=		https://github.com/mzupan/nagios-plugin-mongodb
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pymongo>=0:databases/pymongo@${PY_FLAVOR}
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pymongo>=0:databases/py-pymongo@${PY_FLAVOR}
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	mzupan
diff --git a/databases/nagios-check_mongodb/pkg-descr b/databases/nagios-check_mongodb/pkg-descr
index 11e0f976b534..f72840f10a63 100644
--- a/databases/nagios-check_mongodb/pkg-descr
+++ b/databases/nagios-check_mongodb/pkg-descr
@@ -1,3 +1 @@
 This is a simple Nagios check script to monitor your MongoDB server(s).
-
-WWW: https://github.com/mzupan/nagios-plugin-mongodb
diff --git a/databases/nagios-check_postgres_replication/Makefile b/databases/nagios-check_postgres_replication/Makefile
index 0facccf031da..f324a1da7636 100644
--- a/databases/nagios-check_postgres_replication/Makefile
+++ b/databases/nagios-check_postgres_replication/Makefile
@@ -8,8 +8,9 @@ PKGNAMEPREFIX=	nagios-
 DISTNAME=	check_postgres_replication.py
 EXTRACT_SUFX=	# empty
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	joneum@FreeBSD.org
 COMMENT=	Nagios plugin to check the lag between a postgresql replica and master
+WWW=		https://pypi.org/project/nagiosplugin/
 
 LICENSE=	MIT
 
diff --git a/databases/nagios-check_postgres_replication/pkg-descr b/databases/nagios-check_postgres_replication/pkg-descr
index 42af9aae4563..cf203f6cfab0 100644
--- a/databases/nagios-check_postgres_replication/pkg-descr
+++ b/databases/nagios-check_postgres_replication/pkg-descr
@@ -12,5 +12,3 @@ including:
  * Timeout handling
  * Default options
  * Persistent "cookies" to retain state information between check runs
-
-WWW: https://pypi.org/project/nagiosplugin/
diff --git a/databases/nagios-check_redis/Makefile b/databases/nagios-check_redis/Makefile
index 9dda2b6e363e..9df129539755 100644
--- a/databases/nagios-check_redis/Makefile
+++ b/databases/nagios-check_redis/Makefile
@@ -1,5 +1,3 @@
-# Created by: Dmitry Sivachenko <demon@FreeBSD.org>
-
 PORTNAME=	check_redis
 PORTVERSION=	0.1
 PORTREVISION=	1
@@ -10,6 +8,7 @@ DISTFILES=	# none
 
 MAINTAINER=	demon@FreeBSD.org
 COMMENT=	Nagios plugin to check redis server
+WWW=		https://exchange.nagios.org/directory/Plugins/Others/check_redis/details
 
 RUN_DEPENDS=	${LOCALBASE}/libexec/nagios/utils.pm:net-mgmt/nagios-plugins \
 		p5-Nagios-Plugin>=0:net-mgmt/p5-Nagios-Plugin \
diff --git a/databases/nagios-check_redis/pkg-descr b/databases/nagios-check_redis/pkg-descr
index 62897ef5bf2b..ebb6890ea9f8 100644
--- a/databases/nagios-check_redis/pkg-descr
+++ b/databases/nagios-check_redis/pkg-descr
@@ -1,4 +1,2 @@
 This plugin checks a redis server, expecting that a slave server is in sync
 with master, and the replication delay is not too high.
-
-WWW: http://exchange.nagios.org/directory/Plugins/Others/check_redis/details
diff --git a/databases/namazu2/Makefile b/databases/namazu2/Makefile
index 413d3ff9ac6d..8196f75be0fd 100644
--- a/databases/namazu2/Makefile
+++ b/databases/namazu2/Makefile
@@ -1,20 +1,20 @@
-# Created by: Akinori MUSHA aka knu <knu@idaemons.org>
-
 PORTNAME=	namazu
 PORTVERSION=	${NAMAZU_PORTVERSION}
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES+=	databases www textproc
 MASTER_SITES=	http://www.namazu.org/stable/
 PKGNAMESUFFIX=	2
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Full-text search system intended for easy use
+WWW=		http://www.namazu.org/
 
 BUILD_DEPENDS=	p5-File-MMagic>=0:devel/p5-File-MMagic
 RUN_DEPENDS=	p5-File-MMagic>=0:devel/p5-File-MMagic
 
 USES=		cpe gettext iconv libtool perl5
 GNU_CONFIGURE=	yes
+GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
 CONFIGURE_ARGS=	--with-perl5="${PERL}" \
 		--with-libintl-prefix=${LOCALBASE} \
 		--localstatedir=/var \
diff --git a/databases/namazu2/pkg-descr b/databases/namazu2/pkg-descr
index 26770b79aed7..aa4b0286c71d 100644
--- a/databases/namazu2/pkg-descr
+++ b/databases/namazu2/pkg-descr
@@ -3,5 +3,3 @@ as a CGI program for a small or medium scale Web search engine, but also works
 as a personal use search system for your pile of emails.
 
 (The Japanese word `Namazu' means `catfish' in English)
-
-WWW: http://www.namazu.org/
diff --git a/databases/namazu2/pkg-plist b/databases/namazu2/pkg-plist
index 7c5a77741318..b79d9913c0df 100644
--- a/databases/namazu2/pkg-plist
+++ b/databases/namazu2/pkg-plist
@@ -13,8 +13,8 @@ bin/nmzgrep
 bin/nmzmerge
 bin/rfnmz
 bin/vfnmz
-man/man1/mknmz.1.gz
-man/man1/namazu.1.gz
+share/man/man1/mknmz.1.gz
+share/man/man1/namazu.1.gz
 @sample etc/namazu/mknmzrc.sample
 @sample etc/namazu/namazurc.sample
 include/namazu/codeconv.h
diff --git a/databases/nanodbc/Makefile b/databases/nanodbc/Makefile
new file mode 100644
index 000000000000..27a4d5bdb189
--- /dev/null
+++ b/databases/nanodbc/Makefile
@@ -0,0 +1,31 @@
+PORTNAME=	nanodbc
+DISTVERSIONPREFIX=	v
+DISTVERSION=	2.14.0
+CATEGORIES=	databases devel
+
+MAINTAINER=	yuri@FreeBSD.org
+COMMENT=	Small C++ wrapper for the native C ODBC API
+WWW=		https://nanodbc.github.io/nanodbc/
+
+LICENSE=	MIT
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
+LIB_DEPENDS=	libodbc.so:databases/unixODBC
+
+USES=		cmake:testing compiler:c++14-lang localbase:ldflags # pkgconfig python:build
+USE_LDCONFIG=	yes
+USE_CXXSTD=	c++14 # fix build broken by deprecated feature std::char_traits, see https://github.com/nanodbc/nanodbc/issues/387
+
+USE_GITHUB=	yes
+
+CMAKE_ON=	BUILD_SHARED_LIBS \
+		NANODBC_DISABLE_TESTS NANODBC_DISABLE_EXAMPLES
+CMAKE_TESTING_ARGS=	-DNANODBC_DISABLE_TESTS=OFF # many tests fail: Data source name not found and no default
+
+.include <bsd.port.options.mk>
+
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 ))
+CFLAGS+=	-Wno-error=deprecated-declarations -Wno-error=unused-command-line-argument
+.endif
+
+.include <bsd.port.mk>
diff --git a/databases/nanodbc/distinfo b/databases/nanodbc/distinfo
new file mode 100644
index 000000000000..7ffc1a42114c
--- /dev/null
+++ b/databases/nanodbc/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1673647747
+SHA256 (nanodbc-nanodbc-v2.14.0_GH0.tar.gz) = 56228372042b689beccd96b0ac3476643ea85b3f57b3f23fb11ca4314e68b9a5
+SIZE (nanodbc-nanodbc-v2.14.0_GH0.tar.gz) = 707731
diff --git a/databases/nanodbc/pkg-descr b/databases/nanodbc/pkg-descr
new file mode 100644
index 000000000000..263198cfcd6f
--- /dev/null
+++ b/databases/nanodbc/pkg-descr
@@ -0,0 +1 @@
+nanodbc is a small library that makes ODBC API programming easy and fun again.
diff --git a/databases/nanodbc/pkg-plist b/databases/nanodbc/pkg-plist
new file mode 100644
index 000000000000..89ab018431f1
--- /dev/null
+++ b/databases/nanodbc/pkg-plist
@@ -0,0 +1,5 @@
+include/nanodbc/nanodbc.h
+lib/cmake/nanodbc/nanodbc-config-%%CMAKE_BUILD_TYPE%%.cmake
+lib/cmake/nanodbc/nanodbc-config.cmake
+lib/libnanodbc.so
+lib/libnanodbc.so.2.14.0
diff --git a/databases/neo4j/Makefile b/databases/neo4j/Makefile
index 501df41a209e..c65fa37845c4 100644
--- a/databases/neo4j/Makefile
+++ b/databases/neo4j/Makefile
@@ -1,11 +1,12 @@
 PORTNAME=	neo4j
-DISTVERSION=	3.5.28
+DISTVERSION=	4.4.27
 CATEGORIES=	databases java
 MASTER_SITES=	http://dist.neo4j.org/
 DISTNAME=	${PORTNAME}-community-${DISTVERSION}-unix
 
-MAINTAINER=	jonathan@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	High performance graph store and database
+WWW=		https://neo4j.com
 
 LICENSE=	GPLv3
 
@@ -14,8 +15,9 @@ RUN_DEPENDS=	bash:shells/bash
 WRKSRC=		${WRKDIR}/${DISTNAME:S,-unix,,}
 NO_BUILD=	yes
 USES=		cpe shebangfix
-SHEBANG_FILES=	bin/cypher-shell bin/neo4j-admin bin/neo4j-import
+SHEBANG_FILES=	bin/cypher-shell bin/neo4j-admin
 USE_JAVA=	yes
+JAVA_VERSION=	11
 USE_RC_SUBR=	${PORTNAME}
 SUB_FILES=	${PORTNAME}.sh
 SUB_LIST=	LOGDIR=${LOGDIR} RUNDIR=${RUNDIR}
@@ -25,18 +27,23 @@ PLIST_SUB=	DBDIR=${DBDIR} DISTVERSION=${DISTVERSION}
 DBDIR=		${DESTDIR}/var/db/${PORTNAME}
 LOGDIR=		${DESTDIR}/var/log/${PORTNAME}
 RUNDIR=		${DESTDIR}/var/run/
+NEO4JDIR=	${PREFIX}/${PORTNAME}
+NEO4J_CONFDIR=	${PREFIX}/etc
 
 post-patch:
 	${REINPLACE_CMD} 's,%%DBDIR%%,${DBDIR},g;s,%%JAVA_HOME%%,${JAVA_HOME},g;s,%%LOGDIR%%,${LOGDIR},g;s,%%PREFIX%%,${PREFIX},g;s,%%RUNDIR%%,${RUNDIR},g' \
 		${WRKSRC}/bin/cypher-shell ${WRKSRC}/bin/neo4j* \
 		${WRKSRC}/conf/neo4j.conf
 
+	${REINPLACE_CMD} 's,%%NEO4JDIR%%,${NEO4JDIR},g;s,%%NEO4J_CONFDIR%%,${NEO4J_CONFDIR},g' \
+		${WRKSRC}/bin/neo4j
+
 do-install:
 	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME}.sh ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
 	${MKDIR} ${STAGEDIR}${PREFIX}/${PORTNAME}/libexec/tools
 	${INSTALL_SCRIPT} ${WRKSRC}/bin/tools/* \
 		${STAGEDIR}${PREFIX}/${PORTNAME}/libexec/tools
-.for name in cypher-shell neo4j neo4j-admin neo4j-import
+.for name in cypher-shell neo4j neo4j-admin
 	${INSTALL_SCRIPT} ${WRKSRC}/bin/${name} ${STAGEDIR}${PREFIX}/bin
 .endfor
 	${MKDIR} ${STAGEDIR}${PREFIX}/${PORTNAME}/lib/plugins
@@ -46,4 +53,5 @@ do-install:
 		${STAGEDIR}${PREFIX}/etc/$f.sample
 .endfor
 	${MKDIR} ${STAGEDIR}${DBDIR} ${STAGEDIR}${PREFIX}/etc/neo4j-certificates
+
 .include <bsd.port.mk>
diff --git a/databases/neo4j/distinfo b/databases/neo4j/distinfo
index dae11a8d7a9b..0faaae011d5f 100644
--- a/databases/neo4j/distinfo
+++ b/databases/neo4j/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1627694914
-SHA256 (neo4j-community-3.5.28-unix.tar.gz) = d08415b80d4d6956ccd6063668b6d14d31905c41a712da1522b73079e7dc0aa1
-SIZE (neo4j-community-3.5.28-unix.tar.gz) = 138229560
+TIMESTAMP = 1699617629
+SHA256 (neo4j-community-4.4.27-unix.tar.gz) = f6eef5bcb224396393e67022c768c8fdb7a89bba6b926c622bc1093398f0ffcd
+SIZE (neo4j-community-4.4.27-unix.tar.gz) = 117546182
diff --git a/databases/neo4j/files/patch-bin_cypher-shell b/databases/neo4j/files/patch-bin_cypher-shell
index f68f5191ac8c..ad4d13823271 100644
--- a/databases/neo4j/files/patch-bin_cypher-shell
+++ b/databases/neo4j/files/patch-bin_cypher-shell
@@ -1,6 +1,6 @@
---- bin/cypher-shell.orig	2021-04-13 07:34:22 UTC
+--- bin/cypher-shell.orig	2022-05-11 06:09:41 UTC
 +++ bin/cypher-shell
-@@ -42,6 +42,8 @@ _find_java_cmd() {
+@@ -47,6 +47,8 @@ _find_java_cmd() {
  detect_os() {
    if uname -s | grep -q Darwin; then
      DIST_OS="macosx"
@@ -9,7 +9,7 @@
    elif [[ -e /etc/gentoo-release ]]; then
      DIST_OS="gentoo"
    else
-@@ -53,6 +55,9 @@ _find_java_home() {
+@@ -58,6 +60,9 @@ _find_java_home() {
    [[ "${JAVA_HOME:-}" ]] && return
  
    case "${DIST_OS}" in
@@ -17,9 +17,9 @@
 +      JAVA_HOME="%%JAVA_HOME%%"
 +      ;;
      "macosx")
-       JAVA_HOME="$(/usr/libexec/java_home -v 1.8)"
+       JAVA_HOME="$(/usr/libexec/java_home -v 1.8+)"
        ;;
-@@ -73,7 +78,7 @@ build_classpath() {
+@@ -78,7 +83,7 @@ build_classpath() {
  
    # Then try installation directory (prefix/bin and prefix/share/cypher-shell/lib)
    if [[ -z "${JARPATH}" ]]; then
diff --git a/databases/neo4j/files/patch-bin_neo4j b/databases/neo4j/files/patch-bin_neo4j
index dff9a32b726b..6e0bc1933b95 100644
--- a/databases/neo4j/files/patch-bin_neo4j
+++ b/databases/neo4j/files/patch-bin_neo4j
@@ -1,39 +1,28 @@
---- bin/neo4j.orig	2021-04-13 07:41:35 UTC
+--- bin/neo4j.orig	2023-06-26 13:12:30 UTC
 +++ bin/neo4j
-@@ -1,4 +1,4 @@
--#!/usr/bin/env bash
-+#!/usr/local/bin/bash
- # Copyright (c) "Neo4j"
- # Neo4j Sweden AB [http://neo4j.com]
- #
-@@ -74,6 +74,8 @@ build_classpath() {
- detect_os() {
-   if uname -s | grep -q Darwin; then
-     DIST_OS="macosx"
-+  elif uname -s | grep -q FreeBSD; then
-+    DIST_OS="freebsd"
-   elif [[ -e /etc/gentoo-release ]]; then
-     DIST_OS="gentoo"
-   else
-@@ -203,6 +205,9 @@ _find_java_home() {
-   [[ "${JAVA_HOME:-}" ]] && return
+@@ -33,7 +33,7 @@ PRGDIR=`dirname "$PRG"`
+ done
  
-   case "${DIST_OS}" in
-+    "freebsd")
-+      JAVA_HOME="%%JAVA_HOME%%"
-+      ;;
-     "macosx")
-       JAVA_HOME="$(/usr/libexec/java_home -v 1.8)"
-       ;;
-@@ -219,9 +224,9 @@ _show_java_help() {
+ PRGDIR=`dirname "$PRG"`
+-BASEDIR=`cd "$PRGDIR/.." >/dev/null; pwd`
++BASEDIR=%%PREFIX%%/neo4j
  
- _setup_calculated_paths() {
-   if [[ -z "${NEO4J_HOME:-}" ]]; then
--    NEO4J_HOME="$(cd "$(dirname "$0")"/.. && pwd)"
-+    NEO4J_HOME="$(cd "$(dirname "$0")"/../neo4j && pwd)"
-   fi
--  : "${NEO4J_CONF:="${NEO4J_HOME}/conf"}"
-+  : "${NEO4J_CONF:="${NEO4J_HOME}/../etc"}"
-   readonly NEO4J_HOME NEO4J_CONF
- }
+ # Reset the REPO variable. If you need to influence this use the environment setup file.
+ REPO=
+@@ -116,6 +116,9 @@ fi
+   [ -n "$BASEDIR" ] && BASEDIR=`cygpath --path --windows "$BASEDIR"`
+   [ -n "$REPO" ] && REPO=`cygpath --path --windows "$REPO"`
+ fi
++
++NEO4J_CONF=%%NEO4J_CONFDIR%%
++export NEO4J_CONF
  
+ exec "$JAVACMD" -Xmx128m \
+   -classpath "$CLASSPATH" \
+@@ -125,4 +128,4 @@ exec "$JAVACMD" -Xmx128m \
+   -Dapp.home="$BASEDIR" \
+   -Dbasedir="$BASEDIR" \
+   org.neo4j.server.startup.Neo4jBoot \
+-  "$@"
+\ No newline at end of file
++  "$@"
diff --git a/databases/neo4j/files/patch-bin_neo4j-admin b/databases/neo4j/files/patch-bin_neo4j-admin
index 939f310b84df..849a3609797f 100644
--- a/databases/neo4j/files/patch-bin_neo4j-admin
+++ b/databases/neo4j/files/patch-bin_neo4j-admin
@@ -1,37 +1,18 @@
---- bin/neo4j-admin.orig	2018-02-07 19:48:06 UTC
+--- bin/neo4j-admin.orig	2023-06-26 13:14:57 UTC
 +++ bin/neo4j-admin
-@@ -39,7 +39,9 @@ build_classpath() {
- detect_os() {
-   if uname -s | grep -q Darwin; then
-     DIST_OS="macosx"
--  elif [[ -e /etc/gentoo-release ]]; then
-+  elif uname -s | grep -q FreeBSD; then
-+    DIST_OS="freebsd"
-+   elif [[ -e /etc/gentoo-release ]]; then
-     DIST_OS="gentoo"
-   else
-     DIST_OS="other"
-@@ -122,7 +124,10 @@ _find_java_home() {
-   [[ "${JAVA_HOME:-}" ]] && return
-
-   case "${DIST_OS}" in
--    "macosx")
-+    "freebsd")
-+      JAVA_HOME="%%JAVA_HOME%%"
-+      ;;
-+     "macosx")
-       JAVA_HOME="$(/usr/libexec/java_home -v 1.8)"
-       ;;
-     "gentoo")
-@@ -138,9 +143,9 @@ _show_java_help() {
-
- _setup_calculated_paths() {
-   if [[ -z "${NEO4J_HOME:-}" ]]; then
--    NEO4J_HOME="$(cd "$(dirname "$0")"/.. && pwd)"
-+    NEO4J_HOME="$(cd "$(dirname "$0")"/../neo4j && pwd)"
-   fi
--  : "${NEO4J_CONF:="${NEO4J_HOME}/conf"}"
-+  : "${NEO4J_CONF:="${NEO4J_HOME}/../etc"}"
-   readonly NEO4J_HOME NEO4J_CONF
- }
-
+@@ -33,7 +33,7 @@ PRGDIR=`dirname "$PRG"`
+ done
+ 
+ PRGDIR=`dirname "$PRG"`
+-BASEDIR=`cd "$PRGDIR/.." >/dev/null; pwd`
++BASEDIR=%%PREFIX%%/neo4j
+ 
+ # Reset the REPO variable. If you need to influence this use the environment setup file.
+ REPO=
+@@ -125,4 +125,4 @@ exec "$JAVACMD" -Xmx128m \
+   -Dapp.home="$BASEDIR" \
+   -Dbasedir="$BASEDIR" \
+   org.neo4j.server.startup.Neo4jAdminBoot \
+-  "$@"
+\ No newline at end of file
++  "$@"
diff --git a/databases/neo4j/files/patch-bin_neo4j-import b/databases/neo4j/files/patch-bin_neo4j-import
deleted file mode 100644
index 6da8c0a2b58c..000000000000
--- a/databases/neo4j/files/patch-bin_neo4j-import
+++ /dev/null
@@ -1,33 +0,0 @@
---- bin/neo4j-import.orig	2018-02-07 19:48:06 UTC
-+++ bin/neo4j-import
-@@ -39,6 +39,8 @@ build_classpath() {
- detect_os() {
-   if uname -s | grep -q Darwin; then
-     DIST_OS="macosx"
-+  elif uname -s | grep -q FreeBSD; then
-+    DIST_OS="freebsd"
-   elif [[ -e /etc/gentoo-release ]]; then
-     DIST_OS="gentoo"
-   else
-@@ -122,6 +124,9 @@ _find_java_home() {
-   [[ "${JAVA_HOME:-}" ]] && return
-
-   case "${DIST_OS}" in
-+    "freebsd")
-+      JAVA_HOME="%%JAVA_HOME%%"
-+      ;;
-     "macosx")
-       JAVA_HOME="$(/usr/libexec/java_home -v 1.8)"
-       ;;
-@@ -138,9 +143,9 @@ _show_java_help() {
-
- _setup_calculated_paths() {
-   if [[ -z "${NEO4J_HOME:-}" ]]; then
--    NEO4J_HOME="$(cd "$(dirname "$0")"/.. && pwd)"
-+    NEO4J_HOME="$(cd "$(dirname "$0")"/../neo4j && pwd)"
-   fi
--  : "${NEO4J_CONF:="${NEO4J_HOME}/conf"}"
-+  : "${NEO4J_CONF:="${NEO4J_HOME}/../etc"}"
-   readonly NEO4J_HOME NEO4J_CONF
- }
-
diff --git a/databases/neo4j/files/patch-conf_neo4j.conf b/databases/neo4j/files/patch-conf_neo4j.conf
index d8ce8d572638..d7a5984f2abc 100644
--- a/databases/neo4j/files/patch-conf_neo4j.conf
+++ b/databases/neo4j/files/patch-conf_neo4j.conf
@@ -1,20 +1,17 @@
---- conf/neo4j.conf.orig	2018-01-16 09:38:48 UTC
+--- conf/neo4j.conf.orig	2022-05-06 21:00:03 UTC
 +++ conf/neo4j.conf
-@@ -9,12 +9,12 @@
- #dbms.active_database=graph.db
-
+@@ -9,11 +9,11 @@
+ #dbms.default_database=neo4j
+ 
  # Paths of directories in the installation.
 -#dbms.directories.data=data
--#dbms.directories.plugins=plugins
--#dbms.directories.certificates=certificates
++dbms.directories.data=/var/db/neo4j
+ #dbms.directories.plugins=plugins
 -#dbms.directories.logs=logs
-+dbms.directories.data=%%DBDIR%%
-+dbms.directories.plugins=%%PREFIX%%/lib/neo4j/plugins
-+dbms.directories.certificates=%%PREFIX%%/etc/neo4j-certificates
-+dbms.directories.logs=%%LOGDIR%%
++dbms.directories.logs=/var/log/neo4j
  #dbms.directories.lib=lib
 -#dbms.directories.run=run
-+dbms.directories.run=%%RUNDIR%%
-
- # This setting constrains all `LOAD CSV` import files to be under the `import` directory. Remove or comment it out to
- # allow files to be loaded from anywhere in the filesystem; this introduces possible security problems. See the
++dbms.directories.run=/var/run/
+ #dbms.directories.licenses=licenses
+ #dbms.directories.transaction.logs.root=data/transactions
+ 
diff --git a/databases/neo4j/pkg-descr b/databases/neo4j/pkg-descr
index c5090315d773..d08ee9b232fb 100644
--- a/databases/neo4j/pkg-descr
+++ b/databases/neo4j/pkg-descr
@@ -5,5 +5,3 @@ flexible network structure of nodes and relationships rather than static
 tables yet enjoys all the benefits of enterprise-quality database. For many
 applications, Neo4j offers orders of magnitude performance benefits compared
 to relational DBs.
-
-WWW: https://neo4j.com
diff --git a/databases/neo4j/pkg-plist b/databases/neo4j/pkg-plist
index c7698be21711..0596a2a6d9f8 100644
--- a/databases/neo4j/pkg-plist
+++ b/databases/neo4j/pkg-plist
@@ -1,131 +1,176 @@
 bin/cypher-shell
 bin/neo4j
 bin/neo4j-admin
-bin/neo4j-import
 @sample etc/neo4j.conf.sample
 neo4j/lib/FastInfoset-1.2.16.jar
-neo4j/lib/WMI4Java-1.6.1.jar
-neo4j/lib/activation-1.1.1.jar
-neo4j/lib/bcpkix-jdk15on-1.68.jar
-neo4j/lib/bcprov-jdk15on-1.68.jar
-neo4j/lib/caffeine-2.6.2.jar
-neo4j/lib/commons-compress-1.19.jar
-neo4j/lib/commons-configuration-1.10.jar
-neo4j/lib/commons-io-2.6.jar
-neo4j/lib/commons-lang-2.6.jar
-neo4j/lib/commons-lang3-3.8.jar
-neo4j/lib/commons-logging-1.1.1.jar
-neo4j/lib/commons-text-1.4.jar
-neo4j/lib/concurrentlinkedhashmap-lru-1.4.2.jar
-neo4j/lib/eclipse-collections-9.2.0.jar
-neo4j/lib/eclipse-collections-api-9.2.0.jar
+neo4j/lib/WMI4Java-1.6.3.jar
+neo4j/lib/annotations-%%DISTVERSION%%.jar
+neo4j/lib/bcpkix-jdk18on-1.75.jar
+neo4j/lib/bcprov-jdk18on-1.75.jar
+neo4j/lib/bcutil-jdk18on-1.75.jar
+neo4j/lib/caffeine-3.0.3.jar
+neo4j/lib/commons-beanutils-1.9.4.jar
+neo4j/lib/commons-collections-3.2.2.jar
+neo4j/lib/commons-compress-1.21.jar
+neo4j/lib/commons-io-2.11.0.jar
+neo4j/lib/commons-lang3-3.12.0.jar
+neo4j/lib/commons-logging-1.2.jar
+neo4j/lib/commons-text-1.10.0.jar
+neo4j/lib/cypher-ast-factory-%%DISTVERSION%%.jar
+neo4j/lib/eclipse-collections-10.4.0.jar
+neo4j/lib/eclipse-collections-api-10.4.0.jar
+neo4j/lib/hk2-api-2.6.1.jar
+neo4j/lib/hk2-locator-2.6.1.jar
+neo4j/lib/hk2-utils-2.6.1.jar
+neo4j/lib/ipaddress-5.3.3.jar
 neo4j/lib/istack-commons-runtime-3.0.8.jar
-neo4j/lib/jPowerShell-1.9.jar
-neo4j/lib/jProcesses-1.6.4.jar
-neo4j/lib/jackson-annotations-2.10.5.jar
-neo4j/lib/jackson-core-2.10.5.jar
-neo4j/lib/jackson-databind-2.10.5.1.jar
-neo4j/lib/jackson-jaxrs-base-2.10.5.jar
-neo4j/lib/jackson-jaxrs-json-provider-2.10.5.jar
-neo4j/lib/jackson-module-jaxb-annotations-2.10.5.jar
+neo4j/lib/jPowerShell-3.0.jar
+neo4j/lib/jProcesses-1.6.5.jar
+neo4j/lib/jackson-annotations-2.15.2.jar
+neo4j/lib/jackson-core-2.15.2.jar
+neo4j/lib/jackson-databind-2.15.2.jar
+neo4j/lib/jackson-jaxrs-base-2.15.2.jar
+neo4j/lib/jackson-jaxrs-json-provider-2.15.2.jar
+neo4j/lib/jackson-module-jaxb-annotations-2.15.2.jar
 neo4j/lib/jakarta.activation-api-1.2.1.jar
-neo4j/lib/jakarta.xml.bind-api-2.3.2.jar
+neo4j/lib/jakarta.annotation-api-1.3.5.jar
+neo4j/lib/jakarta.inject-2.6.1.jar
+neo4j/lib/jakarta.validation-api-2.0.2.jar
+neo4j/lib/jakarta.ws.rs-api-2.1.6.jar
+neo4j/lib/jamm-0.3.3.jar
+neo4j/lib/javassist-3.25.0-GA.jar
 neo4j/lib/javax.servlet-api-3.1.0.jar
+neo4j/lib/javax.ws.rs-api-2.1.1.jar
 neo4j/lib/jaxb-api-2.3.0.jar
 neo4j/lib/jaxb-runtime-2.3.2.jar
-neo4j/lib/jersey-core-1.19.3.jar
-neo4j/lib/jersey-server-1.19.3.jar
-neo4j/lib/jersey-servlet-1.19.3.jar
-neo4j/lib/jetty-http-9.4.39.v20210325.jar
-neo4j/lib/jetty-io-9.4.39.v20210325.jar
-neo4j/lib/jetty-security-9.4.39.v20210325.jar
-neo4j/lib/jetty-server-9.4.39.v20210325.jar
-neo4j/lib/jetty-servlet-9.4.39.v20210325.jar
-neo4j/lib/jetty-util-9.4.39.v20210325.jar
-neo4j/lib/jetty-webapp-9.4.39.v20210325.jar
-neo4j/lib/jetty-xml-9.4.39.v20210325.jar
-neo4j/lib/jsr311-api-1.1.2.r612.jar
-neo4j/lib/lucene-analyzers-common-5.5.5.jar
-neo4j/lib/lucene-codecs-5.5.5.jar
-neo4j/lib/lucene-core-5.5.5.jar
-neo4j/lib/lucene-queryparser-5.5.5.jar
+neo4j/lib/jctools-core-3.3.0.jar
+neo4j/lib/jersey-client-2.34.jar
+neo4j/lib/jersey-common-2.34.jar
+neo4j/lib/jersey-container-servlet-2.34.jar
+neo4j/lib/jersey-container-servlet-core-2.34.jar
+neo4j/lib/jersey-hk2-2.34.jar
+neo4j/lib/jersey-server-2.34.jar
+neo4j/lib/jettison-1.5.4.jar
+neo4j/lib/jetty-http-9.4.52.v20230823.jar
+neo4j/lib/jetty-io-9.4.52.v20230823.jar
+neo4j/lib/jetty-security-9.4.52.v20230823.jar
+neo4j/lib/jetty-server-9.4.52.v20230823.jar
+neo4j/lib/jetty-servlet-9.4.52.v20230823.jar
+neo4j/lib/jetty-util-9.4.52.v20230823.jar
+neo4j/lib/jetty-webapp-9.4.52.v20230823.jar
+neo4j/lib/jetty-xml-9.4.52.v20230823.jar
+neo4j/lib/jna-5.9.0.jar
+neo4j/lib/lucene-analyzers-common-8.11.2.jar
+neo4j/lib/lucene-backward-codecs-8.11.2.jar
+neo4j/lib/lucene-core-8.11.2.jar
+neo4j/lib/lucene-queryparser-8.11.2.jar
+neo4j/lib/magnolia_2.12-0.17.0.jar
+neo4j/lib/mercator_2.12-0.2.1.jar
 neo4j/lib/neo4j-%%DISTVERSION%%.jar
-neo4j/lib/neo4j-annotation-processors-%%DISTVERSION%%.jar
-neo4j/lib/neo4j-ast-3.5-%%DISTVERSION%%.jar
+neo4j/lib/neo4j-ast-%%DISTVERSION%%.jar
+neo4j/lib/neo4j-batch-insert-%%DISTVERSION%%.jar
 neo4j/lib/neo4j-bolt-%%DISTVERSION%%.jar
-neo4j/lib/neo4j-browser-4.2.5.jar
+neo4j/lib/neo4j-bootcheck-%%DISTVERSION%%.jar
+neo4j/lib/neo4j-browser-5.12.0.jar
+neo4j/lib/neo4j-buffers-%%DISTVERSION%%.jar
+neo4j/lib/neo4j-capabilities-%%DISTVERSION%%.jar
 neo4j/lib/neo4j-codegen-%%DISTVERSION%%.jar
 neo4j/lib/neo4j-collections-%%DISTVERSION%%.jar
 neo4j/lib/neo4j-command-line-%%DISTVERSION%%.jar
 neo4j/lib/neo4j-common-%%DISTVERSION%%.jar
-neo4j/lib/neo4j-configuration-%%DISTVERSION%%.jar
 neo4j/lib/neo4j-concurrent-%%DISTVERSION%%.jar
+neo4j/lib/neo4j-configuration-%%DISTVERSION%%.jar
 neo4j/lib/neo4j-consistency-check-%%DISTVERSION%%.jar
 neo4j/lib/neo4j-csv-%%DISTVERSION%%.jar
 neo4j/lib/neo4j-cypher-%%DISTVERSION%%.jar
-neo4j/lib/neo4j-cypher-compiler-2.3-2.3.12.jar
-neo4j/lib/neo4j-cypher-compiler-3.1-3.1.9.jar
-neo4j/lib/neo4j-cypher-expression-3.4-3.4.18.jar
+neo4j/lib/neo4j-cypher-ast-factory-%%DISTVERSION%%.jar
+neo4j/lib/neo4j-cypher-config-%%DISTVERSION%%.jar
+neo4j/lib/neo4j-storage-engine-util-%%DISTVERSION%%.jar
 neo4j/lib/neo4j-cypher-expression-evaluator-%%DISTVERSION%%.jar
-neo4j/lib/neo4j-cypher-frontend-2.3-2.3.12.jar
-neo4j/lib/neo4j-cypher-frontend-3.1-3.1.9.jar
 neo4j/lib/neo4j-cypher-interpreted-runtime-%%DISTVERSION%%.jar
-neo4j/lib/neo4j-cypher-ir-3.4-3.4.18.jar
-neo4j/lib/neo4j-cypher-ir-3.5-%%DISTVERSION%%.jar
-neo4j/lib/neo4j-cypher-logical-plans-3.4-3.4.18.jar
-neo4j/lib/neo4j-cypher-logical-plans-3.5-%%DISTVERSION%%.jar
-neo4j/lib/neo4j-cypher-planner-3.4-3.4.18.jar
-neo4j/lib/neo4j-cypher-planner-3.5-%%DISTVERSION%%.jar
-neo4j/lib/neo4j-cypher-planner-spi-3.4-3.4.18.jar
-neo4j/lib/neo4j-cypher-planner-spi-3.5-%%DISTVERSION%%.jar
+neo4j/lib/neo4j-cypher-ir-%%DISTVERSION%%.jar
+neo4j/lib/neo4j-cypher-javacc-parser-%%DISTVERSION%%.jar
+neo4j/lib/neo4j-cypher-logical-plans-%%DISTVERSION%%.jar
+neo4j/lib/neo4j-cypher-macros-%%DISTVERSION%%.jar
+neo4j/lib/neo4j-cypher-planner-%%DISTVERSION%%.jar
+neo4j/lib/neo4j-cypher-planner-spi-%%DISTVERSION%%.jar
 neo4j/lib/neo4j-cypher-runtime-util-%%DISTVERSION%%.jar
-neo4j/lib/neo4j-cypher-util-3.4-3.4.18.jar
 neo4j/lib/neo4j-data-collector-%%DISTVERSION%%.jar
-neo4j/lib/neo4j-diagnostics-%%DISTVERSION%%.jar
 neo4j/lib/neo4j-dbms-%%DISTVERSION%%.jar
-neo4j/lib/neo4j-expressions-3.5-%%DISTVERSION%%.jar
-neo4j/lib/neo4j-front-end-3.5-%%DISTVERSION%%.jar
+neo4j/lib/neo4j-diagnostics-%%DISTVERSION%%.jar
+neo4j/lib/neo4j-exceptions-%%DISTVERSION%%.jar
+neo4j/lib/neo4j-expressions-%%DISTVERSION%%.jar
+neo4j/lib/neo4j-fabric-%%DISTVERSION%%.jar
+neo4j/lib/neo4j-front-end-%%DISTVERSION%%.jar
 neo4j/lib/neo4j-fulltext-index-%%DISTVERSION%%.jar
 neo4j/lib/neo4j-graph-algo-%%DISTVERSION%%.jar
-neo4j/lib/neo4j-graph-matching-3.1.9.jar
 neo4j/lib/neo4j-graphdb-api-%%DISTVERSION%%.jar
+neo4j/lib/neo4j-id-generator-%%DISTVERSION%%.jar
 neo4j/lib/neo4j-import-tool-%%DISTVERSION%%.jar
+neo4j/lib/neo4j-import-util-%%DISTVERSION%%.jar
 neo4j/lib/neo4j-index-%%DISTVERSION%%.jar
 neo4j/lib/neo4j-io-%%DISTVERSION%%.jar
-neo4j/lib/neo4j-jmx-%%DISTVERSION%%.jar
 neo4j/lib/neo4j-kernel-%%DISTVERSION%%.jar
 neo4j/lib/neo4j-kernel-api-%%DISTVERSION%%.jar
-neo4j/lib/neo4j-legacy-%%DISTVERSION%%.jar
+neo4j/lib/neo4j-layout-%%DISTVERSION%%.jar
+neo4j/lib/neo4j-lock-%%DISTVERSION%%.jar
 neo4j/lib/neo4j-logging-%%DISTVERSION%%.jar
 neo4j/lib/neo4j-lucene-index-%%DISTVERSION%%.jar
-neo4j/lib/neo4j-lucene-upgrade-%%DISTVERSION%%.jar
-neo4j/lib/neo4j-parser-3.5-%%DISTVERSION%%.jar
+neo4j/lib/neo4j-monitoring-%%DISTVERSION%%.jar
+neo4j/lib/neo4j-native-%%DISTVERSION%%.jar
+neo4j/lib/neo4j-parser-%%DISTVERSION%%.jar
+neo4j/lib/neo4j-procedure-%%DISTVERSION%%.jar
 neo4j/lib/neo4j-procedure-api-%%DISTVERSION%%.jar
 neo4j/lib/neo4j-push-to-cloud-%%DISTVERSION%%.jar
+neo4j/lib/neo4j-record-storage-engine-%%DISTVERSION%%.jar
 neo4j/lib/neo4j-resource-%%DISTVERSION%%.jar
-neo4j/lib/neo4j-rewriting-3.5-%%DISTVERSION%%.jar
+neo4j/lib/neo4j-rewriting-%%DISTVERSION%%.jar
+neo4j/lib/neo4j-schema-%%DISTVERSION%%.jar
 neo4j/lib/neo4j-security-%%DISTVERSION%%.jar
 neo4j/lib/neo4j-server-%%DISTVERSION%%.jar
 neo4j/lib/neo4j-spatial-index-%%DISTVERSION%%.jar
 neo4j/lib/neo4j-ssl-%%DISTVERSION%%.jar
-neo4j/lib/neo4j-udc-%%DISTVERSION%%.jar
+neo4j/lib/neo4j-storage-engine-api-%%DISTVERSION%%.jar
+neo4j/lib/neo4j-token-api-%%DISTVERSION%%.jar
 neo4j/lib/neo4j-unsafe-%%DISTVERSION%%.jar
-neo4j/lib/neo4j-util-3.5-%%DISTVERSION%%.jar
+neo4j/lib/neo4j-util-%%DISTVERSION%%.jar
 neo4j/lib/neo4j-values-%%DISTVERSION%%.jar
-neo4j/lib/netty-all-4.1.48.Final.jar
-neo4j/lib/openCypher-frontend-1-3.4.18.jar
-neo4j/lib/opencsv-2.3.jar
-neo4j/lib/parboiled-core-1.1.7.jar
-neo4j/lib/parboiled-scala_2.11-1.1.7.jar
-neo4j/lib/scala-library-2.11.12.jar
-neo4j/lib/scala-reflect-2.11.12.jar
+neo4j/lib/neo4j-wal-%%DISTVERSION%%.jar
+neo4j/lib/netty-buffer-4.1.100.Final.jar
+neo4j/lib/netty-codec-4.1.100.Final.jar
+neo4j/lib/netty-codec-http-4.1.100.Final.jar
+neo4j/lib/netty-common-4.1.100.Final.jar
+neo4j/lib/netty-handler-4.1.100.Final.jar
+neo4j/lib/netty-resolver-4.1.100.Final.jar
+neo4j/lib/netty-transport-4.1.100.Final.jar
+neo4j/lib/netty-transport-classes-epoll-4.1.100.Final.jar
+neo4j/lib/netty-transport-native-epoll-4.1.100.Final-linux-aarch_64.jar
+neo4j/lib/netty-transport-native-epoll-4.1.100.Final-linux-x86_64.jar
+neo4j/lib/netty-transport-native-unix-common-4.1.100.Final.jar
+neo4j/lib/parboiled-core-1.2.0.jar
+neo4j/lib/parboiled-scala_2.12-1.2.0.jar
+neo4j/lib/picocli-4.6.1.jar
+neo4j/lib/reactive-streams-1.0.3.jar
+neo4j/lib/reactor-core-3.4.15.jar
+neo4j/lib/scala-library-2.12.13.jar
+neo4j/lib/scala-reflect-2.12.13.jar
 neo4j/lib/server-api-%%DISTVERSION%%.jar
+neo4j/lib/shiro-cache-1.12.0.jar
+neo4j/lib/shiro-config-core-1.12.0.jar
+neo4j/lib/shiro-config-ogdl-1.12.0.jar
+neo4j/lib/shiro-core-1.12.0.jar
+neo4j/lib/shiro-crypto-cipher-1.12.0.jar
+neo4j/lib/shiro-crypto-core-1.12.0.jar
+neo4j/lib/shiro-crypto-hash-1.12.0.jar
+neo4j/lib/shiro-event-1.12.0.jar
+neo4j/lib/shiro-lang-1.12.0.jar
+neo4j/lib/slf4j-api-1.7.30.jar
+neo4j/lib/slf4j-nop-1.7.30.jar
 neo4j/lib/stax-ex-1.8.1.jar
 neo4j/lib/txw2-2.3.2.jar
-neo4j/lib/zstd-jni-1.3.8-6.jar
+neo4j/lib/zstd-jni-1.5.0-4.jar
 neo4j/lib/zstd-proxy-%%DISTVERSION%%.jar
-neo4j/libexec/tools/2.x-config-migrator.jar
 neo4j/libexec/tools/cypher-shell.jar
+@dir etc/neo4j-certificates
 @dir neo4j/lib/plugins
 @dir %%DBDIR%%
-@dir etc/neo4j-certificates
diff --git a/databases/ocaml-dbm/Makefile b/databases/ocaml-dbm/Makefile
index d3ba2cb26f35..d85b05101b5b 100644
--- a/databases/ocaml-dbm/Makefile
+++ b/databases/ocaml-dbm/Makefile
@@ -1,7 +1,6 @@
-# Created by: Jaap Boender <jaapb@kerguelen.org>
-
 PORTNAME=	dbm
 PORTVERSION=	1.0
+PORTREVISION=	2
 CATEGORIES=	databases
 MASTER_SITES=	https://forge.ocamlcore.org/frs/download.php/728/
 PKGNAMEPREFIX=	ocaml-
@@ -9,6 +8,7 @@ DISTNAME=	caml${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	OCaml binding to the NDBM and GDBM database library
+WWW=		https://forge.ocamlcore.org/projects/camldbm/
 
 LICENSE=	LGPL20
 
diff --git a/databases/ocaml-dbm/pkg-descr b/databases/ocaml-dbm/pkg-descr
index f395263f8b2e..726edaafabb9 100644
--- a/databases/ocaml-dbm/pkg-descr
+++ b/databases/ocaml-dbm/pkg-descr
@@ -1,4 +1,2 @@
 This OCaml library is a binding to the NDBM/GDBM Unix "databases". It
 provides persistent storage of key-value pairs of strings.
-
-WWW: http://forge.ocamlcore.org/projects/camldbm/
diff --git a/databases/ocaml-mysql/Makefile b/databases/ocaml-mysql/Makefile
index a57567ff3447..7783983b5fb1 100644
--- a/databases/ocaml-mysql/Makefile
+++ b/databases/ocaml-mysql/Makefile
@@ -1,7 +1,6 @@
-# Created by: Jyun-Yan You <jyyou@cs.nctu.edu.tw>
-
 PORTNAME=	mysql
 PORTVERSION=	1.2.4
+PORTREVISION=	1
 CATEGORIES=	databases
 MASTER_SITES=	http://ygrek.org.ua/p/release/ocaml-mysql/
 PKGNAMEPREFIX=	ocaml-
@@ -9,10 +8,12 @@ DISTNAME=	${PKGNAMEPREFIX}${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	danfe@FreeBSD.org
 COMMENT=	OCaml bindings to libmysqlclient
+WWW=		http://ygrek.org.ua/p/ocaml-mysql/
 
 LICENSE=	LGPL21
 
 USES=		gmake mysql
+IGNORE_WITH_MYSQL=	80 81
 USE_OCAML=		yes
 USE_OCAML_FINDLIB=	yes
 USE_OCAML_CAMLP4=	yes
diff --git a/databases/ocaml-mysql/pkg-descr b/databases/ocaml-mysql/pkg-descr
index 243af7108dcc..715bcb94cca6 100644
--- a/databases/ocaml-mysql/pkg-descr
+++ b/databases/ocaml-mysql/pkg-descr
@@ -1,5 +1,3 @@
 ocaml-mysql is a package for OCaml that provides access to MySQL
 databases. It consists of low level functions implemented in C and a
 module MySQL intended for application development.
-
-WWW: http://ygrek.org.ua/p/ocaml-mysql/
diff --git a/databases/ocaml-sqlite3/Makefile b/databases/ocaml-sqlite3/Makefile
index eba0dd5fc993..a039f89f262f 100644
--- a/databases/ocaml-sqlite3/Makefile
+++ b/databases/ocaml-sqlite3/Makefile
@@ -1,13 +1,13 @@
-# Created by: "Meikel Brandmeyer" <ocaml-sqlite3-port@kotka.de>
-
 PORTNAME=	sqlite3
 PORTVERSION=	4.0.5
 DISTVERSIONPREFIX=	v
+PORTREVISION=	1
 CATEGORIES=	databases
 PKGNAMEPREFIX=	ocaml-
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	OCaml bindings to sqlite3 library
+WWW=		https://mmottl.github.io/sqlite3-ocaml/
 
 LICENSE=	OCSQLT3
 LICENSE_NAME=	OCaml-SQLite3 unique permissive license
@@ -30,15 +30,9 @@ GH_ACCOUNT=	mmottl
 GH_PROJECT=	${PORTNAME}-ocaml
 USE_GITHUB=	yes
 
-.include <bsd.port.pre.mk>
-
 post-patch:
 	@${REINPLACE_CMD} -e 's,"install" :: findlib_name,"install" :: "-destdir ${STAGEDIR}${PREFIX}/lib/ocaml/site-lib" :: "-ldconf /var/null" :: findlib_name,' \
 		${WRKSRC}/setup.ml
-.if ${COMPILER_TYPE} == gcc & ${COMPILER_VERSION} <= 42
-	@${REINPLACE_CMD} -e 's|-Wno-keyword-macro||' ${WRKSRC}/_oasis \
-		${WRKSRC}/myocamlbuild.ml ${WRKSRC}/setup.ml
-.endif
 
 do-configure:
 	(cd ${WRKSRC} && ocaml setup.ml -configure ${CONFIGURE_ARGS})
@@ -49,4 +43,4 @@ do-build:
 do-install:
 	(cd ${WRKSRC} && ocaml setup.ml -install)
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/databases/ocaml-sqlite3/pkg-descr b/databases/ocaml-sqlite3/pkg-descr
index 9ea7563015f1..93c401987849 100644
--- a/databases/ocaml-sqlite3/pkg-descr
+++ b/databases/ocaml-sqlite3/pkg-descr
@@ -5,5 +5,3 @@ Sqlite 3 is available from http://www.sqlite.org
 This wrapper is written in a way that enables a friendly
 coexistence with the old (version 2) sqlite and its
 ocaml wrapper ocaml-sqlite.
-
-WWW: http://mmottl.github.io/sqlite3-ocaml/
diff --git a/databases/octosql/Makefile b/databases/octosql/Makefile
new file mode 100644
index 000000000000..f3e9533449b5
--- /dev/null
+++ b/databases/octosql/Makefile
@@ -0,0 +1,26 @@
+PORTNAME=	octosql
+DISTVERSIONPREFIX=	v
+DISTVERSION=	0.12.2
+PORTREVISION=	6
+CATEGORIES=	databases
+
+MAINTAINER=	yuri@FreeBSD.org
+COMMENT=	OctoSQL is a query tool for databases, file formats, etc
+WWW=		https://github.com/cube2222/octosql
+
+LICENSE=	MIT
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
+USES=		go:modules
+USE_GITHUB=	nodefault
+GH_TUPLE=	golang:sys:v0.6.0:sys
+
+GO_MODULE=	github.com/cube2222/octosql
+
+PLIST_FILES=	bin/${PORTNAME}
+
+pre-patch:
+	${RM} -r ${WRKSRC}/vendor/golang.org/x/sys
+	${LN} -s ${WRKDIR}/sys-* ${WRKSRC}/vendor/golang.org/x/sys
+
+.include <bsd.port.mk>
diff --git a/databases/octosql/distinfo b/databases/octosql/distinfo
new file mode 100644
index 000000000000..5bca22debd00
--- /dev/null
+++ b/databases/octosql/distinfo
@@ -0,0 +1,7 @@
+TIMESTAMP = 1685548493
+SHA256 (go/databases_octosql/octosql-v0.12.2/v0.12.2.mod) = 63077a2ceef1402b8970ecf484743cc2de1468f05b7b8082daa9dfbe5b3a4792
+SIZE (go/databases_octosql/octosql-v0.12.2/v0.12.2.mod) = 3111
+SHA256 (go/databases_octosql/octosql-v0.12.2/v0.12.2.zip) = dfe5971a0e2c468e7a5ae244f692130c9b1b98e90d430cd9d69ed51f8a98431a
+SIZE (go/databases_octosql/octosql-v0.12.2/v0.12.2.zip) = 2336760
+SHA256 (go/databases_octosql/octosql-v0.12.2/golang-sys-v0.6.0_GH0.tar.gz) = b4f6d17c7a128f76169964b437cb66b3f2dbf9a33361928ec19dfecf7b03fc54
+SIZE (go/databases_octosql/octosql-v0.12.2/golang-sys-v0.6.0_GH0.tar.gz) = 1434234
diff --git a/databases/octosql/pkg-descr b/databases/octosql/pkg-descr
new file mode 100644
index 000000000000..5f6dd19c133a
--- /dev/null
+++ b/databases/octosql/pkg-descr
@@ -0,0 +1,6 @@
+OctoSQL is predominantly a CLI tool which lets you query a plethora of
+databases and file formats using SQL through a unified interface, even do JOINs
+between them.
+
+At the same time it's an easily extensible full-blown dataflow engine, and you
+can use it to add a SQL interface to your own applications.
diff --git a/databases/odbc-cpp-wrapper/Makefile b/databases/odbc-cpp-wrapper/Makefile
new file mode 100644
index 000000000000..93dfca02f7b8
--- /dev/null
+++ b/databases/odbc-cpp-wrapper/Makefile
@@ -0,0 +1,20 @@
+PORTNAME=	odbc-cpp-wrapper
+PORTVERSION=	1.1
+DISTVERSIONPREFIX=	v
+CATEGORIES=	databases
+
+MAINTAINER=	sunpoet@FreeBSD.org
+COMMENT=	Object-oriented C++-wrapper of the ODBC API
+WWW=		https://github.com/SAP/odbc-cpp-wrapper
+
+LICENSE=	APACHE20
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
+LIB_DEPENDS=	libodbc.so:databases/unixODBC
+
+USES=		cmake compiler:c++11-lang localbase
+
+USE_GITHUB=	yes
+GH_ACCOUNT=	SAP
+
+.include <bsd.port.mk>
diff --git a/databases/odbc-cpp-wrapper/distinfo b/databases/odbc-cpp-wrapper/distinfo
new file mode 100644
index 000000000000..35781d125c79
--- /dev/null
+++ b/databases/odbc-cpp-wrapper/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1663672720
+SHA256 (SAP-odbc-cpp-wrapper-v1.1_GH0.tar.gz) = 27b45ff65e2f2963bb642c91864892570a6a3867932a53db3b59d4179a650904
+SIZE (SAP-odbc-cpp-wrapper-v1.1_GH0.tar.gz) = 60600
diff --git a/databases/odbc-cpp-wrapper/files/patch-CMakeLists.txt b/databases/odbc-cpp-wrapper/files/patch-CMakeLists.txt
new file mode 100644
index 000000000000..699579b03eb3
--- /dev/null
+++ b/databases/odbc-cpp-wrapper/files/patch-CMakeLists.txt
@@ -0,0 +1,20 @@
+--- CMakeLists.txt.orig	2022-09-13 10:33:43 UTC
++++ CMakeLists.txt
+@@ -5,17 +5,9 @@ SET(CMAKE_CXX_STANDARD 11)
+ PROJECT(odbccpp)
+ 
+ FIND_PACKAGE(ODBC REQUIRED)
+-FIND_PACKAGE(Doxygen)
+-FIND_PACKAGE(GTest)
+ 
+ FILE(STRINGS cfg/VERSION version)
+ 
+ ENABLE_TESTING()
+ 
+ ADD_SUBDIRECTORY(src)
+-IF (GTEST_FOUND)
+-    ADD_SUBDIRECTORY(test)
+-ENDIF()
+-IF (DOXYGEN_FOUND)
+-    ADD_SUBDIRECTORY(doc)
+-ENDIF()
diff --git a/databases/odbc-cpp-wrapper/files/patch-src-odbc-CMakeLists.txt b/databases/odbc-cpp-wrapper/files/patch-src-odbc-CMakeLists.txt
new file mode 100644
index 000000000000..a9fa081c1b2d
--- /dev/null
+++ b/databases/odbc-cpp-wrapper/files/patch-src-odbc-CMakeLists.txt
@@ -0,0 +1,10 @@
+--- src/odbc/CMakeLists.txt.orig	2022-08-05 08:39:29 UTC
++++ src/odbc/CMakeLists.txt
+@@ -57,6 +57,7 @@ TARGET_COMPILE_DEFINITIONS(odbccpp_static
+         ODBC_STATIC
+ )
+ SET_PROPERTY(TARGET odbccpp_static PROPERTY POSITION_INDEPENDENT_CODE ON)
++SET_TARGET_PROPERTIES(odbccpp_static PROPERTIES OUTPUT_NAME "odbccpp")
+ 
+ # Shared library
+ ADD_LIBRARY(odbccpp
diff --git a/databases/odbc-cpp-wrapper/pkg-descr b/databases/odbc-cpp-wrapper/pkg-descr
new file mode 100644
index 000000000000..2b09872d7025
--- /dev/null
+++ b/databases/odbc-cpp-wrapper/pkg-descr
@@ -0,0 +1,13 @@
+odbc-cpp-wrapper is an object-oriented C++-wrapper of the ODBC API. It takes
+care of
+- managing the lifetime of ODBC resources,
+- allocating and managing resources needed for ODBC operations and
+- converting ODBC errors to exceptions and throwing them.
+
+The odbc-cpp-wrapper API attempts to make usage of ODBC as simple as possible.
+The API was designed to make wrong usage almost impossible and to ensure proper
+object lifetime management.
+
+odbc-cpp-wrapper was originally developed for exchanging spatial data with
+databases. It focuses on batch operations of variable-sized data, which is not
+very well supported by other ODBC wrappers.
diff --git a/databases/odbc-cpp-wrapper/pkg-plist b/databases/odbc-cpp-wrapper/pkg-plist
new file mode 100644
index 000000000000..188f59f948f9
--- /dev/null
+++ b/databases/odbc-cpp-wrapper/pkg-plist
@@ -0,0 +1,22 @@
+include/odbc/Config.h
+include/odbc/Connection.h
+include/odbc/DatabaseMetaData.h
+include/odbc/DatabaseMetaDataBase.h
+include/odbc/DatabaseMetaDataUnicode.h
+include/odbc/Environment.h
+include/odbc/Exception.h
+include/odbc/Forwards.h
+include/odbc/ParameterMetaData.h
+include/odbc/PreparedStatement.h
+include/odbc/RefCounted.h
+include/odbc/ResultSet.h
+include/odbc/ResultSetMetaData.h
+include/odbc/ResultSetMetaDataBase.h
+include/odbc/ResultSetMetaDataUnicode.h
+include/odbc/Statement.h
+include/odbc/StatementBase.h
+include/odbc/StringConverter.h
+include/odbc/Types.h
+include/odbc/Util.h
+lib/libodbccpp.a
+lib/libodbccpp.so
diff --git a/databases/ods2sql/Makefile b/databases/ods2sql/Makefile
index 41fccf2eca78..b71c1f59ccf2 100644
--- a/databases/ods2sql/Makefile
+++ b/databases/ods2sql/Makefile
@@ -1,10 +1,11 @@
 PORTNAME=	ods2sql
 DISTVERSION=	0.4.0
-PORTREVISION=	8
+PORTREVISION=	32
 CATEGORIES=	databases
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Create SQLite3 database from ODS spreadsheet
+WWW=		https://gitlab.com/zetok/ods2sql
 
 LICENSE=	AGPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
@@ -13,7 +14,7 @@ USES=		cargo sqlite
 
 USE_GITLAB=	yes
 GL_ACCOUNT=	zetok
-GL_COMMIT=	aca63183274038487cecb6be17d7f65e92178b8c
+GL_TAGNAME=	aca63183274038487cecb6be17d7f65e92178b8c
 
 CARGO_CRATES=	adler32-1.2.0 \
 		ahash-0.4.6 \
diff --git a/databases/ods2sql/pkg-descr b/databases/ods2sql/pkg-descr
index 8b1af13a5874..6bde141f6aea 100644
--- a/databases/ods2sql/pkg-descr
+++ b/databases/ods2sql/pkg-descr
@@ -1,3 +1 @@
 ods2sql creates SQLite database out of your ODS spreadsheet.
-
-WWW: https://gitlab.com/zetok/ods2sql
diff --git a/databases/opendbviewer/Makefile b/databases/opendbviewer/Makefile
index a89512df01f3..b0946c57cd19 100644
--- a/databases/opendbviewer/Makefile
+++ b/databases/opendbviewer/Makefile
@@ -1,21 +1,21 @@
 PORTNAME=	opendbviewer
 PORTVERSION=	1.1.1
+PORTREVISION=	1
 DISTVERSIONPREFIX=	v
 CATEGORIES=	databases
 
-MAINTAINER=	lbartoletti@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Simple database explorer
+WWW=		https://github.com/Jet1oeil/opendbviewer
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	convert:graphics/ImageMagick6
-
-USES=		cmake compiler:c++11-lang qt:5
+USES=		cmake compiler:c++11-lang magick:6,build qt:5
 USE_GITHUB=	yes
 GH_ACCOUNT=	Jet1oeil
 USE_QT=		core gui network sql sql-sqlite3 testlib widgets \
-		buildtools_build linguisttools_build qmake_build
+		buildtools:build linguisttools:build qmake:build
 
 OPTIONS_DEFINE=		DOCS PGSQL MYSQL
 OPTIONS_DEFAULT=	PGSQL
diff --git a/databases/opendbviewer/pkg-descr b/databases/opendbviewer/pkg-descr
index 352f49e9e347..0e24f66b0496 100644
--- a/databases/opendbviewer/pkg-descr
+++ b/databases/opendbviewer/pkg-descr
@@ -7,5 +7,3 @@ PostgreSQL databases.  It contains:
 - Open SQLite table directly with drag'n drop
 - History of last connection
 - Edit database directly from the table view
-
-WWW: https://github.com/Jet1oeil/opendbviewer
diff --git a/databases/opendbx/Makefile b/databases/opendbx/Makefile
index 84bffed75f0f..104dc05bfdf0 100644
--- a/databases/opendbx/Makefile
+++ b/databases/opendbx/Makefile
@@ -1,5 +1,3 @@
-# Created by: tremere@cainites.net
-
 PORTNAME=	opendbx
 PORTVERSION=	1.4.6
 PORTREVISION=	6
@@ -8,6 +6,7 @@ MASTER_SITES=	http://www.linuxnetworks.de/opendbx/download/
 
 MAINTAINER=	tremere@cainites.net
 COMMENT=	C library for accessing databases with a single API
+WWW=		http://www.linuxnetworks.de/opendbx/
 
 LICENSE=	LGPL21
 
diff --git a/databases/opendbx/files/patch-lib_odbx.cpp b/databases/opendbx/files/patch-lib_odbx.cpp
new file mode 100644
index 000000000000..339712693da0
--- /dev/null
+++ b/databases/opendbx/files/patch-lib_odbx.cpp
@@ -0,0 +1,268 @@
+--- lib/odbx.cpp.orig	2010-08-01 02:08:41 UTC
++++ lib/odbx.cpp
+@@ -54,7 +54,7 @@ namespace OpenDBX
+ 	*  OpenDBX large object interface
+ 	*/
+ 
+-	Lob::Lob( Lob_Iface* impl ) throw( std::exception )
++	Lob::Lob( Lob_Iface* impl ) noexcept(false)
+ 	{
+ 		m_impl = impl;
+ 		m_ref = new int;
+@@ -114,21 +114,21 @@ namespace OpenDBX
+ 
+ 
+ 
+-	void Lob::close() throw( std::exception )
++	void Lob::close() noexcept(false)
+ 	{
+ 		return m_impl->close();
+ 	}
+ 
+ 
+ 
+-	ssize_t Lob::read( void* buffer, size_t buflen ) throw( std::exception )
++	ssize_t Lob::read( void* buffer, size_t buflen ) noexcept(false)
+ 	{
+ 		return m_impl->read( buffer, buflen );
+ 	}
+ 
+ 
+ 
+-	ssize_t Lob::write( void* buffer, size_t buflen ) throw( std::exception )
++	ssize_t Lob::write( void* buffer, size_t buflen ) noexcept(false)
+ 	{
+ 		return m_impl->write( buffer, buflen );
+ 	}
+@@ -143,7 +143,7 @@ namespace OpenDBX
+ 
+ 
+ 
+-	Result::Result( Result_Iface* impl ) throw( std::exception )
++	Result::Result( Result_Iface* impl ) noexcept(false)
+ 	{
+ 		m_impl = impl;
+ 		m_ref = new int;
+@@ -204,76 +204,76 @@ namespace OpenDBX
+ 
+ 
+ 
+-	void Result::finish() throw( std::exception )
++	void Result::finish() noexcept(false)
+ 	{
+ 		return m_impl->finish();
+ 	}
+ 
+ 
+ 
+-	odbxres Result::getResult( struct timeval* timeout, unsigned long chunk ) throw( std::exception )
++	odbxres Result::getResult( struct timeval* timeout, unsigned long chunk ) noexcept(false)
+ 	{
+ 		return m_impl->getResult( timeout, chunk );
+ 	}
+ 
+ 
+ 
+-	odbxrow Result::getRow() throw( std::exception )
++	odbxrow Result::getRow() noexcept(false)
+ 	{
+ 		return m_impl->getRow();
+ 	}
+ 
+ 
+ 
+-	uint64_t Result::rowsAffected() throw( std::exception )
++	uint64_t Result::rowsAffected() noexcept(false)
+ 	{
+ 		return m_impl->rowsAffected();
+ 	}
+ 
+ 
+ 
+-	unsigned long Result::columnCount() throw( std::exception )
++	unsigned long Result::columnCount() noexcept(false)
+ 	{
+ 		return m_impl->columnCount();
+ 	}
+ 
+ 
+ 
+-	unsigned long Result::columnPos( const string& name ) throw( std::exception )
++	unsigned long Result::columnPos( const string& name ) noexcept(false)
+ 	{
+ 		return m_impl->columnPos( name );
+ 	}
+ 
+ 
+ 
+-	const string Result::columnName( unsigned long pos ) throw( std::exception )
++	const string Result::columnName( unsigned long pos ) noexcept(false)
+ 	{
+ 		return m_impl->columnName( pos );
+ 	}
+ 
+ 
+ 
+-	odbxtype Result::columnType( unsigned long pos ) throw( std::exception )
++	odbxtype Result::columnType( unsigned long pos ) noexcept(false)
+ 	{
+ 		return m_impl->columnType( pos );
+ 	}
+ 
+ 
+ 
+-	unsigned long Result::fieldLength( unsigned long pos ) throw( std::exception )
++	unsigned long Result::fieldLength( unsigned long pos ) noexcept(false)
+ 	{
+ 		return m_impl->fieldLength( pos );
+ 	}
+ 
+ 
+ 
+-	const char* Result::fieldValue( unsigned long pos ) throw( std::exception )
++	const char* Result::fieldValue( unsigned long pos ) noexcept(false)
+ 	{
+ 		return m_impl->fieldValue( pos );
+ 	}
+ 
+ 
+-	Lob Result::getLob( const char* value ) throw( std::exception )
++	Lob Result::getLob( const char* value ) noexcept(false)
+ 	{
+ 		return m_impl->getLob( value );
+ 	}
+@@ -288,7 +288,7 @@ namespace OpenDBX
+ 
+ 
+ 
+-	Stmt::Stmt( Stmt_Iface* impl ) throw( std::exception )
++	Stmt::Stmt( Stmt_Iface* impl ) noexcept(false)
+ 	{
+ 		m_impl = impl;
+ 		m_ref = new int;
+@@ -363,7 +363,7 @@ namespace OpenDBX
+ 
+ 
+ 
+-	Result Stmt::execute() throw( std::exception )
++	Result Stmt::execute() noexcept(false)
+ 	{
+ 		return Result( m_impl->execute() );
+ 	}
+@@ -384,7 +384,7 @@ namespace OpenDBX
+ 	}
+ 
+ 
+-	Conn::Conn( const char* backend, const char* host, const char* port ) throw( std::exception )
++	Conn::Conn( const char* backend, const char* host, const char* port ) noexcept(false)
+ 	{
+ 		m_impl = new Conn_Impl( backend, host, port );
+ 		m_ref = new int;
+@@ -393,7 +393,7 @@ namespace OpenDBX
+ 	}
+ 
+ 
+-	Conn::Conn( const string& backend, const string& host, const string& port ) throw( std::exception )
++	Conn::Conn( const string& backend, const string& host, const string& port ) noexcept(false)
+ 	{
+ 		m_impl = new Conn_Impl( backend.c_str(), host.c_str(), port.c_str() );
+ 		m_ref = new int;
+@@ -454,7 +454,7 @@ namespace OpenDBX
+ 
+ 
+ 
+-	void Conn::bind( const char* database, const char* who, const char* cred, odbxbind method ) throw( std::exception )
++	void Conn::bind( const char* database, const char* who, const char* cred, odbxbind method ) noexcept(false)
+ 	{
+ 		if( m_impl == NULL )
+ 		{
+@@ -466,7 +466,7 @@ namespace OpenDBX
+ 
+ 
+ 
+-	void Conn::bind( const string& database, const string& who, const string& cred, odbxbind method ) throw( std::exception )
++	void Conn::bind( const string& database, const string& who, const string& cred, odbxbind method ) noexcept(false)
+ 	{
+ 		if( m_impl == NULL )
+ 		{
+@@ -478,7 +478,7 @@ namespace OpenDBX
+ 
+ 
+ 
+-	void Conn::unbind() throw( std::exception )
++	void Conn::unbind() noexcept(false)
+ 	{
+ 		if( m_impl == NULL )
+ 		{
+@@ -490,7 +490,7 @@ namespace OpenDBX
+ 
+ 
+ 
+-	void Conn::finish() throw( std::exception )
++	void Conn::finish() noexcept(false)
+ 	{
+ 		if( m_impl == NULL )
+ 		{
+@@ -502,7 +502,7 @@ namespace OpenDBX
+ 
+ 
+ 
+-	bool Conn::getCapability( odbxcap cap ) throw( std::exception )
++	bool Conn::getCapability( odbxcap cap ) noexcept(false)
+ 	{
+ 		if( m_impl == NULL )
+ 		{
+@@ -514,7 +514,7 @@ namespace OpenDBX
+ 
+ 
+ 
+-	void Conn::getOption( odbxopt option, void* value ) throw( std::exception )
++	void Conn::getOption( odbxopt option, void* value ) noexcept(false)
+ 	{
+ 		if( m_impl == NULL )
+ 		{
+@@ -526,7 +526,7 @@ namespace OpenDBX
+ 
+ 
+ 
+-	void Conn::setOption( odbxopt option, void* value ) throw( std::exception )
++	void Conn::setOption( odbxopt option, void* value ) noexcept(false)
+ 	{
+ 		if( m_impl == NULL )
+ 		{
+@@ -538,7 +538,7 @@ namespace OpenDBX
+ 
+ 
+ 
+-	string& Conn::escape( const string& from, string& to ) throw( std::exception )
++	string& Conn::escape( const string& from, string& to ) noexcept(false)
+ 	{
+ 		if( m_impl == NULL )
+ 		{
+@@ -550,7 +550,7 @@ namespace OpenDBX
+ 
+ 
+ 
+-	string& Conn::escape( const char* from, unsigned long fromlen, string& to ) throw( std::exception )
++	string& Conn::escape( const char* from, unsigned long fromlen, string& to ) noexcept(false)
+ 	{
+ 		if( m_impl == NULL )
+ 		{
+@@ -562,7 +562,7 @@ namespace OpenDBX
+ 
+ 
+ 
+-	Stmt Conn::create( const char* sql, unsigned long length, Stmt::Type type ) throw( std::exception )
++	Stmt Conn::create( const char* sql, unsigned long length, Stmt::Type type ) noexcept(false)
+ 	{
+ 		if( length == 0 ) { length = (unsigned long) strlen( sql ); }
+ 
+@@ -571,7 +571,7 @@ namespace OpenDBX
+ 
+ 
+ 
+-	Stmt Conn::create( const string& sql, Stmt::Type type ) throw( std::exception )
++	Stmt Conn::create( const string& sql, Stmt::Type type ) noexcept(false)
+ 	{
+ 		if( m_impl == NULL )
+ 		{
diff --git a/databases/opendbx/files/patch-lib_odbx__iface.hpp b/databases/opendbx/files/patch-lib_odbx__iface.hpp
new file mode 100644
index 000000000000..cc7e4ba9f79a
--- /dev/null
+++ b/databases/opendbx/files/patch-lib_odbx__iface.hpp
@@ -0,0 +1,87 @@
+--- lib/odbx_iface.hpp.orig	2010-08-01 02:08:41 UTC
++++ lib/odbx_iface.hpp
+@@ -27,10 +27,10 @@ namespace OpenDBX
+ 	public:
+ 
+ 		virtual ~Lob_Iface() throw() {}
+-		virtual void close() throw( std::exception ) = 0;
++		virtual void close() noexcept(false) = 0;
+ 
+-		virtual ssize_t read( void* buffer, size_t buflen ) throw( std::exception ) = 0;
+-		virtual ssize_t write( void* buffer, size_t buflen ) throw( std::exception ) = 0;
++		virtual ssize_t read( void* buffer, size_t buflen ) noexcept(false) = 0;
++		virtual ssize_t write( void* buffer, size_t buflen ) noexcept(false) = 0;
+ 	};
+ 
+ 
+@@ -40,22 +40,22 @@ namespace OpenDBX
+ 	public:
+ 
+ 		virtual ~Result_Iface() throw() {}
+-		virtual void finish() throw( std::exception ) = 0;
++		virtual void finish() noexcept(false) = 0;
+ 
+-		virtual odbxres getResult( struct timeval* timeout, unsigned long chunk ) throw( std::exception ) = 0;
++		virtual odbxres getResult( struct timeval* timeout, unsigned long chunk ) noexcept(false) = 0;
+ 
+-		virtual odbxrow getRow() throw( std::exception ) = 0;
+-		virtual uint64_t rowsAffected() throw( std::exception ) = 0;
++		virtual odbxrow getRow() noexcept(false) = 0;
++		virtual uint64_t rowsAffected() noexcept(false) = 0;
+ 
+-		virtual unsigned long columnCount() throw( std::exception ) = 0;
+-		virtual unsigned long columnPos( const string& name ) throw( std::exception ) = 0;
+-		virtual const string columnName( unsigned long pos ) throw( std::exception ) = 0;
+-		virtual odbxtype columnType( unsigned long pos ) throw( std::exception ) = 0;
++		virtual unsigned long columnCount() noexcept(false) = 0;
++		virtual unsigned long columnPos( const string& name ) noexcept(false) = 0;
++		virtual const string columnName( unsigned long pos ) noexcept(false) = 0;
++		virtual odbxtype columnType( unsigned long pos ) noexcept(false) = 0;
+ 
+-		virtual unsigned long fieldLength( unsigned long pos ) throw( std::exception ) = 0;
+-		virtual const char* fieldValue( unsigned long pos ) throw( std::exception ) = 0;
++		virtual unsigned long fieldLength( unsigned long pos ) noexcept(false) = 0;
++		virtual const char* fieldValue( unsigned long pos ) noexcept(false) = 0;
+ 
+-		virtual Lob_Iface* getLob( const char* value ) throw( std::exception ) = 0;
++		virtual Lob_Iface* getLob( const char* value ) noexcept(false) = 0;
+ 	};
+ 
+ 
+@@ -65,7 +65,7 @@ namespace OpenDBX
+ 	public:
+ 
+ 		virtual ~Stmt_Iface() throw() {};
+-		virtual Result_Iface* execute() throw( std::exception ) = 0;
++		virtual Result_Iface* execute() noexcept(false) = 0;
+ 
+ // 		virtual void bind( const void* data, unsigned long size, size_t pos, int flags ) = 0;
+ // 		virtual size_t count() = 0;
+@@ -78,19 +78,19 @@ namespace OpenDBX
+ 	public:
+ 
+ 		virtual ~Conn_Iface() throw() {};
+-		virtual void finish() throw( std::exception ) = 0;
++		virtual void finish() noexcept(false) = 0;
+ 
+-		virtual void bind( const char* database, const char* who, const char* cred, odbxbind method = ODBX_BIND_SIMPLE ) throw( std::exception ) = 0;
+-		virtual void unbind() throw( std::exception ) = 0;
++		virtual void bind( const char* database, const char* who, const char* cred, odbxbind method = ODBX_BIND_SIMPLE ) noexcept(false) = 0;
++		virtual void unbind() noexcept(false) = 0;
+ 
+-		virtual bool getCapability( odbxcap cap ) throw( std::exception ) = 0;
++		virtual bool getCapability( odbxcap cap ) noexcept(false) = 0;
+ 
+-		virtual void getOption( odbxopt option, void* value ) throw( std::exception ) = 0;
+-		virtual void setOption( odbxopt option, void* value ) throw( std::exception ) = 0;
++		virtual void getOption( odbxopt option, void* value ) noexcept(false) = 0;
++		virtual void setOption( odbxopt option, void* value ) noexcept(false) = 0;
+ 
+-		virtual string& escape( const char* from, unsigned long fromlen, string& to ) throw( std::exception ) = 0;
++		virtual string& escape( const char* from, unsigned long fromlen, string& to ) noexcept(false) = 0;
+ 
+-		virtual Stmt_Iface* create( const string& sql, Stmt::Type type ) throw( std::exception ) = 0;
++		virtual Stmt_Iface* create( const string& sql, Stmt::Type type ) noexcept(false) = 0;
+ 	};
+ 
+ }   // namespace
diff --git a/databases/opendbx/files/patch-lib_odbx__impl.cpp b/databases/opendbx/files/patch-lib_odbx__impl.cpp
new file mode 100644
index 000000000000..42d698d833b6
--- /dev/null
+++ b/databases/opendbx/files/patch-lib_odbx__impl.cpp
@@ -0,0 +1,279 @@
+--- lib/odbx_impl.cpp.orig	2012-06-10 21:20:25 UTC
++++ lib/odbx_impl.cpp
+@@ -29,7 +29,7 @@ namespace OpenDBX
+ 	*  OpenDBX large object implementation
+ 	*/
+ 
+-	Lob_Impl::Lob_Impl( odbx_result_t* result, const char* value ) throw( std::exception )
++	Lob_Impl::Lob_Impl( odbx_result_t* result, const char* value ) noexcept(false)
+ 	{
+ 		int err;
+ 
+@@ -52,7 +52,7 @@ namespace OpenDBX
+ 
+ 
+ 
+-	void Lob_Impl::close() throw( std::exception )
++	void Lob_Impl::close() noexcept(false)
+ 	{
+ 		int err;
+ 
+@@ -66,7 +66,7 @@ namespace OpenDBX
+ 
+ 
+ 
+-	ssize_t Lob_Impl::read( void* buffer, size_t buflen ) throw( std::exception )
++	ssize_t Lob_Impl::read( void* buffer, size_t buflen ) noexcept(false)
+ 	{
+ 		ssize_t err;
+ 
+@@ -80,7 +80,7 @@ namespace OpenDBX
+ 
+ 
+ 
+-	ssize_t Lob_Impl::write( void* buffer, size_t buflen ) throw( std::exception )
++	ssize_t Lob_Impl::write( void* buffer, size_t buflen ) noexcept(false)
+ 	{
+ 		ssize_t err;
+ 
+@@ -102,7 +102,7 @@ namespace OpenDBX
+ 
+ 
+ 
+-	Result_Impl::Result_Impl( odbx_t* handle ) throw( std::exception )
++	Result_Impl::Result_Impl( odbx_t* handle ) noexcept(false)
+ 	{
+ 		m_handle = handle;
+ 		m_result = NULL;
+@@ -121,7 +121,7 @@ namespace OpenDBX
+ 
+ 
+ 
+-	void Result_Impl::finish() throw( std::exception )
++	void Result_Impl::finish() noexcept(false)
+ 	{
+ 		odbxres res;
+ 
+@@ -137,7 +137,7 @@ namespace OpenDBX
+ 
+ 
+ 
+-	odbxres Result_Impl::getResult( struct timeval* timeout, unsigned long chunk ) throw( std::exception )
++	odbxres Result_Impl::getResult( struct timeval* timeout, unsigned long chunk ) noexcept(false)
+ 	{
+ 		int err;
+ 
+@@ -162,7 +162,7 @@ namespace OpenDBX
+ 
+ 
+ 
+-	odbxrow Result_Impl::getRow() throw( std::exception )
++	odbxrow Result_Impl::getRow() noexcept(false)
+ 	{
+ 		int err;
+ 
+@@ -176,21 +176,21 @@ namespace OpenDBX
+ 
+ 
+ 
+-	uint64_t Result_Impl::rowsAffected() throw( std::exception )
++	uint64_t Result_Impl::rowsAffected() noexcept(false)
+ 	{
+ 		return odbx_rows_affected( m_result );
+ 	}
+ 
+ 
+ 
+-	unsigned long Result_Impl::columnCount() throw( std::exception )
++	unsigned long Result_Impl::columnCount() noexcept(false)
+ 	{
+ 		return odbx_column_count( m_result );
+ 	}
+ 
+ 
+ 
+-	unsigned long Result_Impl::columnPos( const string& name ) throw( std::exception )
++	unsigned long Result_Impl::columnPos( const string& name ) noexcept(false)
+ 	{
+ 		map<const string, unsigned long>::const_iterator it;
+ 
+@@ -213,7 +213,7 @@ namespace OpenDBX
+ 
+ 
+ 
+-	const string Result_Impl::columnName( unsigned long pos ) throw( std::exception )
++	const string Result_Impl::columnName( unsigned long pos ) noexcept(false)
+ 	{
+ 		if( pos < odbx_column_count( m_result ) )
+ 		{
+@@ -230,7 +230,7 @@ namespace OpenDBX
+ 
+ 
+ 
+-	odbxtype Result_Impl::columnType( unsigned long pos ) throw( std::exception )
++	odbxtype Result_Impl::columnType( unsigned long pos ) noexcept(false)
+ 	{
+ 		if( pos < odbx_column_count( m_result ) )
+ 		{
+@@ -242,7 +242,7 @@ namespace OpenDBX
+ 
+ 
+ 
+-	unsigned long Result_Impl::fieldLength( unsigned long pos ) throw( std::exception )
++	unsigned long Result_Impl::fieldLength( unsigned long pos ) noexcept(false)
+ 	{
+ 		if( pos < odbx_column_count( m_result ) )
+ 		{
+@@ -254,7 +254,7 @@ namespace OpenDBX
+ 
+ 
+ 
+-	const char* Result_Impl::fieldValue( unsigned long pos ) throw( std::exception )
++	const char* Result_Impl::fieldValue( unsigned long pos ) noexcept(false)
+ 	{
+ 		if( pos < odbx_column_count( m_result ) )
+ 		{
+@@ -265,7 +265,7 @@ namespace OpenDBX
+ 	}
+ 
+ 
+-	Lob_Iface* Result_Impl::getLob( const char* value ) throw( std::exception )
++	Lob_Iface* Result_Impl::getLob( const char* value ) noexcept(false)
+ 	{
+ 		return new Lob_Impl( m_result, value );
+ 	}
+@@ -280,7 +280,7 @@ namespace OpenDBX
+ 
+ 
+ 
+-	Stmt_Impl::Stmt_Impl( odbx_t* handle ) throw( std::exception )
++	Stmt_Impl::Stmt_Impl( odbx_t* handle ) noexcept(false)
+ 	{
+ 		m_handle = handle;
+ 	}
+@@ -301,7 +301,7 @@ namespace OpenDBX
+ 
+ 
+ 
+-	StmtSimple_Impl::StmtSimple_Impl( odbx_t* handle, const string& sql ) throw( std::exception ) : Stmt_Impl( handle )
++	StmtSimple_Impl::StmtSimple_Impl( odbx_t* handle, const string& sql ) noexcept(false) : Stmt_Impl( handle )
+ 	{
+ 		m_sql = sql;
+ /*		m_buffer = NULL;
+@@ -326,7 +326,7 @@ namespace OpenDBX
+ 
+ 
+ 
+-	StmtSimple_Impl::StmtSimple_Impl() throw( std::exception ) : Stmt_Impl( NULL )
++	StmtSimple_Impl::StmtSimple_Impl() noexcept(false) : Stmt_Impl( NULL )
+ 	{
+ // 		m_buffer = NULL;
+ // 		m_bufsize = 0;
+@@ -365,7 +365,7 @@ namespace OpenDBX
+ 
+ 
+ 
+-	Result_Iface* StmtSimple_Impl::execute() throw( std::exception )
++	Result_Iface* StmtSimple_Impl::execute() noexcept(false)
+ 	{
+ // 		if( m_binds.size() ) { _exec_params(); }
+ // 		else { _exec_noparams(); }
+@@ -377,7 +377,7 @@ namespace OpenDBX
+ 
+ 
+ 
+-	inline void StmtSimple_Impl::_exec_noparams() throw( std::exception )
++	inline void StmtSimple_Impl::_exec_noparams() noexcept(false)
+ 	{
+ 		int err;
+ 
+@@ -452,7 +452,7 @@ namespace OpenDBX
+ 
+ 
+ 
+-	Conn_Impl::Conn_Impl( const char* backend, const char* host, const char* port ) throw( std::exception )
++	Conn_Impl::Conn_Impl( const char* backend, const char* host, const char* port ) noexcept(false)
+ 	{
+ 		int err;
+ 
+@@ -480,7 +480,7 @@ namespace OpenDBX
+ 
+ 
+ 
+-	void Conn_Impl::bind( const char* database, const char* who, const char* cred, odbxbind method ) throw( std::exception )
++	void Conn_Impl::bind( const char* database, const char* who, const char* cred, odbxbind method ) noexcept(false)
+ 	{
+ 		int err;
+ 
+@@ -494,7 +494,7 @@ namespace OpenDBX
+ 
+ 
+ 
+-	void Conn_Impl::unbind() throw( std::exception )
++	void Conn_Impl::unbind() noexcept(false)
+ 	{
+ 		int err;
+ 
+@@ -508,7 +508,7 @@ namespace OpenDBX
+ 
+ 
+ 
+-	void Conn_Impl::finish() throw( std::exception )
++	void Conn_Impl::finish() noexcept(false)
+ 	{
+ 		int err;
+ 
+@@ -528,7 +528,7 @@ namespace OpenDBX
+ 
+ 
+ 
+-	bool Conn_Impl::getCapability( odbxcap cap ) throw( std::exception )
++	bool Conn_Impl::getCapability( odbxcap cap ) noexcept(false)
+ 	{
+ 		int err = odbx_capabilities( m_handle, (unsigned int) cap );
+ 
+@@ -545,7 +545,7 @@ namespace OpenDBX
+ 
+ 
+ 
+-	void Conn_Impl::getOption( odbxopt option, void* value ) throw( std::exception )
++	void Conn_Impl::getOption( odbxopt option, void* value ) noexcept(false)
+ 	{
+ 		int err;
+ 
+@@ -557,7 +557,7 @@ namespace OpenDBX
+ 
+ 
+ 
+-	void Conn_Impl::setOption( odbxopt option, void* value ) throw( std::exception )
++	void Conn_Impl::setOption( odbxopt option, void* value ) noexcept(false)
+ 	{
+ 		int err;
+ 
+@@ -569,7 +569,7 @@ namespace OpenDBX
+ 
+ 
+ 
+-	string& Conn_Impl::escape( const char* from, unsigned long fromlen, string& to ) throw( std::exception )
++	string& Conn_Impl::escape( const char* from, unsigned long fromlen, string& to ) noexcept(false)
+ 	{
+ 		int err;
+ 		unsigned long size = m_escsize;
+@@ -594,7 +594,7 @@ namespace OpenDBX
+ 
+ 
+ 
+-	Stmt_Iface* Conn_Impl::create( const string& sql, Stmt::Type type ) throw( std::exception )
++	Stmt_Iface* Conn_Impl::create( const string& sql, Stmt::Type type ) noexcept(false)
+ 	{
+ 		switch( type )
+ 		{
+@@ -607,7 +607,7 @@ namespace OpenDBX
+ 
+ 
+ 
+-	inline char* Conn_Impl::_resize( char* buffer, size_t size ) throw( std::exception )
++	inline char* Conn_Impl::_resize( char* buffer, size_t size ) noexcept(false)
+ 	{
+ 		if( ( buffer = (char*) std::realloc( buffer, size ) ) == NULL )
+ 		{
diff --git a/databases/opendbx/files/patch-lib_odbx__impl.hpp b/databases/opendbx/files/patch-lib_odbx__impl.hpp
new file mode 100644
index 000000000000..5e6c0d94f9e7
--- /dev/null
+++ b/databases/opendbx/files/patch-lib_odbx__impl.hpp
@@ -0,0 +1,128 @@
+--- lib/odbx_impl.hpp.orig	2010-08-01 02:08:41 UTC
++++ lib/odbx_impl.hpp
+@@ -37,13 +37,13 @@ namespace OpenDBX
+ 
+ 	public:
+ 
+-		Lob_Impl( odbx_result_t* result, const char* value ) throw( std::exception );
++		Lob_Impl( odbx_result_t* result, const char* value ) noexcept(false);
+ 		~Lob_Impl() throw();
+ 
+-		void close() throw( std::exception );
++		void close() noexcept(false);
+ 
+-		ssize_t read( void* buffer, size_t buflen ) throw( std::exception );
+-		ssize_t write( void* buffer, size_t buflen ) throw( std::exception );
++		ssize_t read( void* buffer, size_t buflen ) noexcept(false);
++		ssize_t write( void* buffer, size_t buflen ) noexcept(false);
+ 	};
+ 
+ 
+@@ -56,25 +56,25 @@ namespace OpenDBX
+ 
+ 	public:
+ 
+-		Result_Impl( odbx_t* handle ) throw( std::exception );
++		Result_Impl( odbx_t* handle ) noexcept(false);
+ 		~Result_Impl() throw();
+ 
+-		void finish() throw( std::exception );
++		void finish() noexcept(false);
+ 
+-		odbxres getResult( struct timeval* timeout, unsigned long chunk ) throw( std::exception );
++		odbxres getResult( struct timeval* timeout, unsigned long chunk ) noexcept(false);
+ 
+-		odbxrow getRow() throw( std::exception );
+-		uint64_t rowsAffected() throw( std::exception );
++		odbxrow getRow() noexcept(false);
++		uint64_t rowsAffected() noexcept(false);
+ 
+-		unsigned long columnCount() throw( std::exception );
+-		unsigned long columnPos( const string& name ) throw( std::exception );
+-		const string columnName( unsigned long pos ) throw( std::exception );
+-		odbxtype columnType( unsigned long pos ) throw( std::exception );
++		unsigned long columnCount() noexcept(false);
++		unsigned long columnPos( const string& name ) noexcept(false);
++		const string columnName( unsigned long pos ) noexcept(false);
++		odbxtype columnType( unsigned long pos ) noexcept(false);
+ 
+-		unsigned long fieldLength( unsigned long pos ) throw( std::exception );
+-		const char* fieldValue( unsigned long pos ) throw( std::exception );
++		unsigned long fieldLength( unsigned long pos ) noexcept(false);
++		const char* fieldValue( unsigned long pos ) noexcept(false);
+ 
+-		Lob_Iface* getLob( const char* value ) throw( std::exception );
++		Lob_Iface* getLob( const char* value ) noexcept(false);
+ 	};
+ 
+ 
+@@ -89,7 +89,7 @@ namespace OpenDBX
+ 
+ 	public:
+ 
+-		Stmt_Impl( odbx_t* handle ) throw( std::exception );
++		Stmt_Impl( odbx_t* handle ) noexcept(false);
+ 	};
+ 
+ 
+@@ -106,19 +106,19 @@ namespace OpenDBX
+ 
+ 	protected:
+ 
+-// 		inline void _exec_params() throw( std::exception );
+-		inline void _exec_noparams() throw( std::exception );
++// 		inline void _exec_params() noexcept(false);
++		inline void _exec_noparams() noexcept(false);
+ 
+ 	public:
+ 
+-		StmtSimple_Impl( odbx_t* handle, const string& sql ) throw( std::exception );
+-		StmtSimple_Impl() throw( std::exception );
++		StmtSimple_Impl( odbx_t* handle, const string& sql ) noexcept(false);
++		StmtSimple_Impl() noexcept(false);
+ 		~StmtSimple_Impl() throw();
+ 
+ // 		void bind( const void* data, unsigned long size, size_t pos, int flags );
+ // 		size_t count();
+ 
+-		Result_Iface* execute() throw( std::exception );
++		Result_Iface* execute() noexcept(false);
+ 	};
+ 
+ 
+@@ -132,25 +132,25 @@ namespace OpenDBX
+ 
+ 	protected:
+ 
+-		inline char* _resize( char* buffer, size_t size ) throw( std::exception );
++		inline char* _resize( char* buffer, size_t size ) noexcept(false);
+ 
+ 	public:
+ 
+-		Conn_Impl( const char* backend, const char* host, const char* port ) throw( std::exception );
++		Conn_Impl( const char* backend, const char* host, const char* port ) noexcept(false);
+ 		~Conn_Impl() throw();
+-		void finish() throw( std::exception );
++		void finish() noexcept(false);
+ 
+-		void bind( const char* database, const char* who, const char* cred, odbxbind method = ODBX_BIND_SIMPLE ) throw( std::exception );
+-		void unbind() throw( std::exception );
++		void bind( const char* database, const char* who, const char* cred, odbxbind method = ODBX_BIND_SIMPLE ) noexcept(false);
++		void unbind() noexcept(false);
+ 
+-		bool getCapability( odbxcap cap ) throw( std::exception );
++		bool getCapability( odbxcap cap ) noexcept(false);
+ 
+-		void getOption( odbxopt option, void* value ) throw( std::exception );
+-		void setOption( odbxopt option, void* value ) throw( std::exception );
++		void getOption( odbxopt option, void* value ) noexcept(false);
++		void setOption( odbxopt option, void* value ) noexcept(false);
+ 
+-		string& escape( const char* from, unsigned long fromlen, string& to ) throw( std::exception );
++		string& escape( const char* from, unsigned long fromlen, string& to ) noexcept(false);
+ 
+-		Stmt_Iface* create( const string& sql, Stmt::Type type ) throw( std::exception );
++		Stmt_Iface* create( const string& sql, Stmt::Type type ) noexcept(false);
+ 	};
+ 
+ }   // namespace
diff --git a/databases/opendbx/files/patch-lib_opendbx_api b/databases/opendbx/files/patch-lib_opendbx_api
new file mode 100644
index 000000000000..1194fc6bdb90
--- /dev/null
+++ b/databases/opendbx/files/patch-lib_opendbx_api
@@ -0,0 +1,281 @@
+--- lib/opendbx/api.orig	2010-08-01 02:08:41 UTC
++++ lib/opendbx/api
+@@ -265,7 +265,7 @@ namespace OpenDBX
+ 		 * @return Lob instance
+ 		 * @throws std::exception If an error occures
+ 		 */
+-		Lob( Lob_Iface* impl ) throw( std::exception );
++		Lob( Lob_Iface* impl ) noexcept(false);
+ 
+ 	public:
+ 
+@@ -319,7 +319,7 @@ namespace OpenDBX
+ 		 *
+ 		 * @throws OpenDBX::Exception If the underlying database library returns an error
+ 		 */
+-		void close() throw( std::exception );
++		void close() noexcept(false);
+ 
+ 		/**
+ 		 * Reads content from large object into the buffer.
+@@ -344,7 +344,7 @@ namespace OpenDBX
+ 		 * @return Number of bytes written into the buffer
+ 		 * @throws OpenDBX::Exception If the underlying database library returns an error
+ 		 */
+-		ssize_t read( void* buffer, size_t buflen ) throw( std::exception );
++		ssize_t read( void* buffer, size_t buflen ) noexcept(false);
+ 
+ 		/**
+ 		 * Writes data from the buffer into the large object.
+@@ -368,7 +368,7 @@ namespace OpenDBX
+ 		 * @return Number of bytes written into the large object
+ 		 * @throws OpenDBX::Exception If the underlying database library returns an error
+ 		 */
+-		ssize_t write( void* buffer, size_t buflen ) throw( std::exception );
++		ssize_t write( void* buffer, size_t buflen ) noexcept(false);
+ 	};
+ 
+ 
+@@ -417,7 +417,7 @@ namespace OpenDBX
+ 		 * @throws std::exception If an error occures
+ 		 * @return Result instance
+ 		 */
+-		Result( Result_Iface* impl ) throw( std::exception );
++		Result( Result_Iface* impl ) noexcept(false);
+ 
+ 	public:
+ 
+@@ -470,7 +470,7 @@ namespace OpenDBX
+ 		 *
+ 		 * @throws OpenDBX::Exception If the underlying database library returns an error
+ 		 */
+-		void finish() throw( std::exception );
++		void finish() noexcept(false);
+ 
+ 		/**
+ 		 * Fetches one result set from the database server.
+@@ -511,7 +511,7 @@ namespace OpenDBX
+ 		 * @throws OpenDBX::Exception If the underlying database library returns an error
+ 		 * @see odbxres
+ 		 */
+-		odbxres getResult( struct timeval* timeout = NULL, unsigned long chunk = 0 ) throw( std::exception );
++		odbxres getResult( struct timeval* timeout = NULL, unsigned long chunk = 0 ) noexcept(false);
+ 
+ 		/**
+ 		 * Makes data of next row available.
+@@ -529,7 +529,7 @@ namespace OpenDBX
+ 		 * @return Status of the attempt to fetch one more row
+ 		 * @throws OpenDBX::Exception If the underlying database library returns an error
+ 		 */
+-		odbxrow getRow() throw( std::exception );
++		odbxrow getRow() noexcept(false);
+ 
+ 		/**
+ 		 * Returns the number of rows affected by DELETE, INSERT of UPDATE statements.
+@@ -545,7 +545,7 @@ namespace OpenDBX
+ 		 * @return Number of rows touched
+ 		 * @throws OpenDBX::Exception If the underlying database library returns an error
+ 		 */
+-		uint64_t rowsAffected() throw( std::exception );
++		uint64_t rowsAffected() noexcept(false);
+ 
+ 		/**
+ 		 * Returns the number of columns available in this result set.
+@@ -559,7 +559,7 @@ namespace OpenDBX
+ 		 * @return Number of columns
+ 		 * @throws OpenDBX::Exception If the underlying database library returns an error
+ 		 */
+-		unsigned long columnCount() throw( std::exception );
++		unsigned long columnCount() noexcept(false);
+ 
+ 		/**
+ 		 * Maps the column name to the column number required by other methods.
+@@ -572,7 +572,7 @@ namespace OpenDBX
+ 		 * @return Position of column in result set
+ 		 * @throws OpenDBX::Exception If the underlying database library returns an error
+ 		 */
+-		unsigned long columnPos( const string& name ) throw( std::exception );
++		unsigned long columnPos( const string& name ) noexcept(false);
+ 
+ 		/**
+ 		 * Returns the name of the column in the current result set.
+@@ -586,7 +586,7 @@ namespace OpenDBX
+ 		 * @return Column name
+ 		 * @throws OpenDBX::Exception If the underlying database library returns an error
+ 		 */
+-		const string columnName( unsigned long pos ) throw( std::exception );
++		const string columnName( unsigned long pos ) noexcept(false);
+ 
+ 		/**
+ 		 * Returns the type of the column in the current result set.
+@@ -643,7 +643,7 @@ namespace OpenDBX
+ 		 * @throws OpenDBX::Exception If the underlying database library returns an error
+ 		 * @see odbxtype
+ 		 */
+-		odbxtype columnType( unsigned long pos ) throw( std::exception );
++		odbxtype columnType( unsigned long pos ) noexcept(false);
+ 
+ 		/**
+ 		 * Returns the size of the content in the current row at the specified postion.
+@@ -656,7 +656,7 @@ namespace OpenDBX
+ 		 * @return Size of the data in bytes
+ 		 * @throws OpenDBX::Exception If the underlying database library returns an error
+ 		 */
+-		unsigned long fieldLength( unsigned long pos ) throw( std::exception );
++		unsigned long fieldLength( unsigned long pos ) noexcept(false);
+ 
+ 		/**
+ 		 * Returns a pointer to the content in the current row at the specified postion.
+@@ -675,7 +675,7 @@ namespace OpenDBX
+ 		 * @return Pointer to the data
+ 		 * @throws OpenDBX::Exception If the underlying database library returns an error
+ 		 */
+-		const char* fieldValue( unsigned long pos ) throw( std::exception );
++		const char* fieldValue( unsigned long pos ) noexcept(false);
+ 
+ 		/**
+ 		 * Creates a large object instance if supported by the database.
+@@ -696,7 +696,7 @@ namespace OpenDBX
+ 		 * @throws OpenDBX::Exception If the underlying database library returns an error
+ 		 * @see Lob
+ 		 */
+-		Lob getLob( const char* value ) throw( std::exception );
++		Lob getLob( const char* value ) noexcept(false);
+ 	};
+ 
+ 
+@@ -745,7 +745,7 @@ namespace OpenDBX
+ 		 * @throws std::exception If an error occures
+ 		 * @return Statement instance
+ 		 */
+-		Stmt( Stmt_Iface* impl ) throw( std::exception );
++		Stmt( Stmt_Iface* impl ) noexcept(false);
+ 
+ 	public:
+ 
+@@ -808,7 +808,7 @@ namespace OpenDBX
+ 		 * @throws OpenDBX::Exception If the underlying database library returns an error
+ 		 * @see Result
+ 		 */
+-		Result execute() throw( std::exception );
++		Result execute() noexcept(false);
+ 	};
+ 
+ 
+@@ -894,7 +894,7 @@ namespace OpenDBX
+ 		 * @throws OpenDBX::Exception If the underlying database library returns an error
+ 		 * @see #Conn( const string&, const string&, const string& )
+ 		 */
+-		Conn( const char* backend, const char* host = "", const char* port = "" ) throw( std::exception );
++		Conn( const char* backend, const char* host = "", const char* port = "" ) noexcept(false);
+ 
+ 		/**
+ 		 * Creates a connection object using C++ style string parameters.
+@@ -936,7 +936,7 @@ namespace OpenDBX
+ 		 * @throws OpenDBX::Exception If the underlying database library returns an error
+ 		 * @see #Conn( const char*, const char*, const char* )
+ 		 */
+-		Conn( const string& backend, const string& host = "", const string& port = "" ) throw( std::exception );
++		Conn( const string& backend, const string& host = "", const string& port = "" ) noexcept(false);
+ 
+ 		/**
+ 		 * Destroys the connection instance if no other references exist.
+@@ -1009,7 +1009,7 @@ namespace OpenDBX
+ 		 * @throws std::invalid_argument If the object was only initialized by the default constructor
+ 		 * @throws OpenDBX::Exception If the underlying database library returns an error
+ 		 */
+-		void bind( const char* database, const char* who = "", const char* cred = "", odbxbind method = ODBX_BIND_SIMPLE ) throw( std::exception );
++		void bind( const char* database, const char* who = "", const char* cred = "", odbxbind method = ODBX_BIND_SIMPLE ) noexcept(false);
+ 
+ 		/**
+ 		 * Authenticates the user and selects the database using C++ style string
+@@ -1045,7 +1045,7 @@ namespace OpenDBX
+ 		 * @throws std::invalid_argument If the object was only initialized by the default constructor
+ 		 * @throws OpenDBX::Exception If the underlying database library returns an error
+ 		 */
+-		void bind( const string& database, const string& who = "", const string& cred = "", odbxbind method = ODBX_BIND_SIMPLE ) throw( std::exception );
++		void bind( const string& database, const string& who = "", const string& cred = "", odbxbind method = ODBX_BIND_SIMPLE ) noexcept(false);
+ 
+ 		/**
+ 		 * Releases the connection to the database and resets the authentication
+@@ -1054,7 +1054,7 @@ namespace OpenDBX
+ 		 * @throws std::invalid_argument If the object was only initialized by the default constructor
+ 		 * @throws OpenDBX::Exception If the underlying database library returns an error
+ 		 */
+-		void unbind() throw( std::exception );
++		void unbind() noexcept(false);
+ 
+ 		/**
+ 		 * Cleans up the connection object.
+@@ -1062,7 +1062,7 @@ namespace OpenDBX
+ 		 * @throws std::invalid_argument If the object was only initialized by the default constructor
+ 		 * @throws OpenDBX::Exception If the underlying database library returns an error
+ 		 */
+-		void finish() throw( std::exception );
++		void finish() noexcept(false);
+ 
+ 		/**
+ 		 * Tests if the database driver module does understand certain extensions.
+@@ -1098,7 +1098,7 @@ namespace OpenDBX
+ 		 * @throws std::invalid_argument If the object was only initialized by the default constructor
+ 		 * @throws OpenDBX::Exception If the underlying database library returns an error
+ 		 */
+-		bool getCapability( odbxcap cap ) throw( std::exception );
++		bool getCapability( odbxcap cap ) noexcept(false);
+ 
+ 		/**
+ 		 * Gets the value of a certain option provided by the database driver module.
+@@ -1155,7 +1155,7 @@ namespace OpenDBX
+ 		 * @throws std::invalid_argument If the object was only initialized by the default constructor
+ 		 * @throws OpenDBX::Exception If the underlying database library returns an error
+ 		 */
+-		void getOption( odbxopt option, void* value ) throw( std::exception );
++		void getOption( odbxopt option, void* value ) noexcept(false);
+ 
+ 		/**
+ 		 * Sets a certain option provided by the database driver module.
+@@ -1210,7 +1210,7 @@ namespace OpenDBX
+ 		 * @throws std::invalid_argument If the object was only initialized by the default constructor
+ 		 * @throws OpenDBX::Exception If the underlying database library returns an error
+ 		 */
+-		void setOption( odbxopt option, void* value ) throw( std::exception );
++		void setOption( odbxopt option, void* value ) noexcept(false);
+ 
+ 		/**
+ 		 * Escapes potentially dangerous characters in user input using a C style buffer.
+@@ -1244,7 +1244,7 @@ namespace OpenDBX
+ 		 * @throws std::invalid_argument If the object was only initialized by the default constructor
+ 		 * @throws OpenDBX::Exception If the underlying database library returns an error
+ 		 */
+-		string& escape( const char* from, unsigned long fromlen, string& to ) throw( std::exception );
++		string& escape( const char* from, unsigned long fromlen, string& to ) noexcept(false);
+ 
+ 		/**
+ 		 * Escapes potentially dangerous characters in user input using a C++
+@@ -1278,7 +1278,7 @@ namespace OpenDBX
+ 		 * @throws std::invalid_argument If the object was only initialized by the default constructor
+ 		 * @throws OpenDBX::Exception If the underlying database library returns an error
+ 		 */
+-		string& escape( const string& from, string& to ) throw( std::exception );
++		string& escape( const string& from, string& to ) noexcept(false);
+ 
+ 		/**
+ 		 * Creates a statement object from a SQL text string using a C style buffer.
+@@ -1327,7 +1327,7 @@ namespace OpenDBX
+ 		 * @throws OpenDBX::Exception If the underlying database library returns an error
+ 		 * @see Stmt
+ 		 */
+-		Stmt create( const char* sql, unsigned long size = 0, Stmt::Type type = Stmt::Simple ) throw( std::exception );
++		Stmt create( const char* sql, unsigned long size = 0, Stmt::Type type = Stmt::Simple ) noexcept(false);
+ 
+ 		/**
+ 		 * Creates a statement object from a SQL text string using a C++ string.
+@@ -1368,7 +1368,7 @@ namespace OpenDBX
+ 		 * @throws OpenDBX::Exception If the underlying database library returns an error
+ 		 * @see Stmt
+ 		 */
+-		Stmt create( const string& sql, Stmt::Type type = Stmt::Simple ) throw( std::exception );
++		Stmt create( const string& sql, Stmt::Type type = Stmt::Simple ) noexcept(false);
+ 	};
+ 
+ 
diff --git a/databases/opendbx/pkg-descr b/databases/opendbx/pkg-descr
index 3463853e0168..d8f50fbe2fb0 100644
--- a/databases/opendbx/pkg-descr
+++ b/databases/opendbx/pkg-descr
@@ -8,5 +8,3 @@ support different databases with little effort, this is definitively
 the right thing for you!
 
 License: LGPL
-
-WWW: http://www.linuxnetworks.de/opendbx/
diff --git a/databases/opentsdb/Makefile b/databases/opentsdb/Makefile
deleted file mode 100644
index 4ff8735e2df1..000000000000
--- a/databases/opentsdb/Makefile
+++ /dev/null
@@ -1,63 +0,0 @@
-# Created by: Johannes Meixner <johannes@perceivon.net>
-
-PORTNAME=	opentsdb
-PORTVERSION=	2.3.0
-PORTREVISION=	1
-CATEGORIES=	databases java
-MASTER_SITES=	https://github.com/OpenTSDB/opentsdb/releases/download/v${PORTVERSION}/
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Distributed, scalable Time Series Database
-
-LICENSE=	LGPL21+
-LICENSE_FILE=	${WRKSRC}/COPYING.LESSER
-
-BUILD_DEPENDS=	bash:shells/bash \
-		curl:ftp/curl \
-		gawk:lang/gawk
-LIB_DEPENDS=	libhadoop.so:devel/hadoop2
-RUN_DEPENDS=	hbase>0:databases/hbase
-
-USES=		cpe gmake python shebangfix
-USE_JAVA=	yes
-JAVA_VERSION=	1.8+
-SHEBANG_FILES=	tools/check_tsd tools/opentsdb_restart.py \
-		tools/tsddrain.py
-NO_ARCH=	yes
-
-OPTIONS_DEFINE=		GNUPLOT
-OPTIONS_DEFAULT=	GNUPLOT
-
-GNUPLOT_RUN_DEPENDS=	gnuplot:math/gnuplot
-
-HAS_CONFIGURE=	yes
-MAKE_JOBS_UNSAFE=	yes
-
-OPENTSDB_LOGDIR=	/var/log/${PORTNAME}
-OPENTSDB_RUNDIR=	/var/run/${PORTNAME}
-
-OPENTSDB_USER=	opentsdb
-OPENTSDB_GROUP=	opentsdb
-
-USERS=		${OPENTSDB_USER}
-GROUPS=		${OPENTSDB_GROUP}
-
-USE_RC_SUBR=	opentsdb
-
-SUB_LIST=	OPENTSDB_USER="${OPENTSDB_USER}" \
-		OPENTSDB_LOGDIR="${OPENTSDB_LOGDIR}" \
-		OPENTSDB_RUNDIR="${OPENTSDB_RUNDIR}"
-
-post-patch:
-	${REINPLACE_CMD} -i "" -e "s|python|${PYTHON_CMD}|" ${WRKSRC}/build-aux/gen_build_data.sh
-	${REINPLACE_CMD} -i "" -e "s|%%PREFIX%%|${PREFIX}|" ${WRKSRC}/src/utils/Config.java
-	${REINPLACE_CMD} -e "s#%%JAVA_VERSION%%#${JAVA_VERSION}#" ${WRKSRC}/tsdb.in
-	${REINPLACE_CMD} -i "" -e "s|tsd.http.staticroot =|tsd.http.staticroot = ${DATADIR}/static|; s|tsd.http.cachedir =|tsd.http.cachedir = /tmp/opentsdb|; s|tsd.network.port =|tsd.network.port = 4242|;" ${WRKSRC}/src/opentsdb.conf
-
-post-install:
-	${MKDIR} ${STAGEDIR}${ETCDIR} ${STAGEDIR}${OPENTSDB_LOGDIR} ${STAGEDIR}${OPENTSDB_RUNDIR}
-	${INSTALL_DATA} ${WRKSRC}/src/logback.xml ${STAGEDIR}${ETCDIR}
-	${INSTALL_DATA} ${WRKSRC}/src/opentsdb.conf ${STAGEDIR}${ETCDIR}/opentsdb.conf.sample
-	(cd "${STAGEDIR}${PREFIX}"; ${FIND} -s share/${PORTNAME}/static -name \*cache.html) >> ${TMPPLIST}
-
-.include <bsd.port.mk>
diff --git a/databases/opentsdb/distinfo b/databases/opentsdb/distinfo
deleted file mode 100644
index 8e2b115caa1e..000000000000
--- a/databases/opentsdb/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1484850686
-SHA256 (opentsdb-2.3.0.tar.gz) = 90e982fecf8a830741622004070fe13a55fb2c51d01fc1dc5785ee013320375a
-SIZE (opentsdb-2.3.0.tar.gz) = 78066230
diff --git a/databases/opentsdb/files/opentsdb.in b/databases/opentsdb/files/opentsdb.in
deleted file mode 100644
index 380b77b3f901..000000000000
--- a/databases/opentsdb/files/opentsdb.in
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/bin/sh -
-# Copyright (c) 2015 Johannes Meixner
-
-# PROVIDE: opentsdb
-# REQUIRE: LOGIN
-# KEYWORD: shutdown
-# opentsdb_enable (bool):        Set to NO by default.
-#                                Set it to YES to enable OpenTSDB
-
-. /etc/rc.subr
-
-export PATH=${PATH}:%%PREFIX%%/bin
-
-name=opentsdb
-rcvar=opentsdb_enable
-
-load_rc_config "${name}"
-
-: ${opentsdb_enable:=NO}
-: ${opentsdb_user:=opentsdb}
-: ${opentsdb_jvmargs:=-enableassertions -enablesystemassertions}
-: ${opentsdb_opts:=tsd 2> %%OPENTSDB_LOGDIR%%/error.log 1> %%OPENTSDB_LOGDIR%%/tsdb.log}
-
-pidfile="%%OPENTSDB_RUNDIR%%/${name}.pid"
-opentsdb_daemon="%%PREFIX%%/bin/tsdb"
-procname="daemon*"
-
-command="/usr/sbin/daemon"
-command_args="-P ${pidfile} ${opentsdb_daemon} ${opentsdb_opts}"
-
-export JVMARGS=${opentsdb_jvmargs}
-
-run_rc_command "$1"
diff --git a/databases/opentsdb/files/patch-Makefile.in b/databases/opentsdb/files/patch-Makefile.in
deleted file mode 100644
index d83a85474ed4..000000000000
--- a/databases/opentsdb/files/patch-Makefile.in
+++ /dev/null
@@ -1,24 +0,0 @@
-The first hunk is to allow building as a user.
-Do not remove it unless it really builds as a user.
-
---- Makefile.in.orig	2016-02-15 22:38:55 UTC
-+++ Makefile.in
-@@ -1511,7 +1511,9 @@ printdeps:
- install-exec-hook:
- 	script=tsdb; pkgdatadir='$(pkgdatadir)'; configdir='$(sysconfigdir)/etc/opentsdb'; \
-           abs_srcdir=''; abs_builddir=''; $(edit_tsdb_script)
-+	chmod u+w "$(DESTDIR)$(bindir)/tsdb"
- 	cat tsdb.tmp >"$(DESTDIR)$(bindir)/tsdb"
-+	chmod u-w "$(DESTDIR)$(bindir)/tsdb"
- 	rm -f tsdb.tmp
- 
- $(builddata_SRC): .git/HEAD $(tsdb_SRC) $(top_srcdir)/build-aux/gen_build_data.sh
-@@ -1562,7 +1564,7 @@ gwttsd: staticroot
- # how to tell it to install a bunch of files recursively for which I don't
- # know ahead of time what the file names are.
- install-data-local: staticroot install-data-lib install-data-tools \
--    install-data-bin install-data-etc
-+    install-data-bin
- 	@$(NORMAL_INSTALL)
- 	test -z "$(staticdir)" || $(mkdir_p) "$(DESTDIR)$(staticdir)"
- 	@set -e; pwd; ls -lFh; cd "$(DEV_TSD_STATICROOT)"; \
diff --git a/databases/opentsdb/files/patch-configure b/databases/opentsdb/files/patch-configure
deleted file mode 100644
index a1e2f7417690..000000000000
--- a/databases/opentsdb/files/patch-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig	2016-02-15 22:38:55 UTC
-+++ configure
-@@ -1714,7 +1714,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
- 
- 
- ac_aux_dir=
--for ac_dir in build-aux "$srcdir"/build-aux; do
-+for ac_dir in `pwd`/build-aux; do
-   if test -f "$ac_dir/install-sh"; then
-     ac_aux_dir=$ac_dir
-     ac_install_sh="$ac_aux_dir/install-sh -c"
diff --git a/databases/opentsdb/files/patch-src_utils_Config.java b/databases/opentsdb/files/patch-src_utils_Config.java
deleted file mode 100644
index c1b3af966a99..000000000000
--- a/databases/opentsdb/files/patch-src_utils_Config.java
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/utils/Config.java.orig	2016-02-15 22:56:56 UTC
-+++ src/utils/Config.java
-@@ -562,6 +562,7 @@ public class Config {
-     } else {
-       file_locations.add("/etc/opentsdb.conf");
-       file_locations.add("/etc/opentsdb/opentsdb.conf");
-+      file_locations.add("%%PREFIX%%/etc/opentsdb/opentsdb.conf");
-       file_locations.add("/opt/opentsdb/opentsdb.conf");
-     }
- 
diff --git a/databases/opentsdb/pkg-descr b/databases/opentsdb/pkg-descr
deleted file mode 100644
index 82a5f7879273..000000000000
--- a/databases/opentsdb/pkg-descr
+++ /dev/null
@@ -1,7 +0,0 @@
-OpenTSDB is a distributed, scalable Time Series Database (TSDB) written
-on top of HBase.  OpenTSDB was written to address a common need: store,
-index and serve metrics collected from computer systems (network gear,
-operating systems, applications) at a large scale, and make this data
-easily accessible and graphable.
-
-WWW: http://www.opentsdb.net/
diff --git a/databases/opentsdb/pkg-plist b/databases/opentsdb/pkg-plist
deleted file mode 100644
index 6dc3488998cf..000000000000
--- a/databases/opentsdb/pkg-plist
+++ /dev/null
@@ -1,50 +0,0 @@
-bin/tsdb
-%%DATADIR%%/bin/mygnuplot.bat
-%%DATADIR%%/bin/mygnuplot.sh
-%%DATADIR%%/bin/tsdb
-%%DATADIR%%/lib/async-1.4.0.jar
-%%DATADIR%%/lib/asynchbase-1.7.2.jar
-%%DATADIR%%/lib/commons-jexl-2.1.1.jar
-%%DATADIR%%/lib/commons-logging-1.1.1.jar
-%%DATADIR%%/lib/commons-math3-3.4.1.jar
-%%DATADIR%%/lib/guava-18.0.jar
-%%DATADIR%%/lib/jackson-annotations-2.4.3.jar
-%%DATADIR%%/lib/jackson-core-2.4.3.jar
-%%DATADIR%%/lib/jackson-databind-2.4.3.jar
-%%DATADIR%%/lib/javacc-6.1.2.jar
-%%DATADIR%%/lib/jgrapht-core-0.9.1.jar
-%%DATADIR%%/lib/log4j-over-slf4j-1.7.7.jar
-%%DATADIR%%/lib/logback-classic-1.0.13.jar
-%%DATADIR%%/lib/logback-core-1.0.13.jar
-%%DATADIR%%/lib/netty-3.9.4.Final.jar
-%%DATADIR%%/lib/protobuf-java-2.5.0.jar
-%%DATADIR%%/lib/slf4j-api-1.7.7.jar
-%%DATADIR%%/lib/tsdb-2.3.0.jar
-%%DATADIR%%/lib/zookeeper-3.4.6.jar
-%%DATADIR%%/static/clear.cache.gif
-%%DATADIR%%/static/opentsdb_header.jpg
-%%DATADIR%%/static/favicon.ico
-%%DATADIR%%/static/gwt/opentsdb/images/corner.png
-%%DATADIR%%/static/gwt/opentsdb/images/hborder.png
-%%DATADIR%%/static/gwt/opentsdb/images/ie6/corner_dialog_topleft.png
-%%DATADIR%%/static/gwt/opentsdb/images/ie6/corner_dialog_topright.png
-%%DATADIR%%/static/gwt/opentsdb/images/ie6/hborder_blue_shadow.png
-%%DATADIR%%/static/gwt/opentsdb/images/ie6/hborder_gray_shadow.png
-%%DATADIR%%/static/gwt/opentsdb/images/ie6/vborder_blue_shadow.png
-%%DATADIR%%/static/gwt/opentsdb/images/ie6/vborder_gray_shadow.png
-%%DATADIR%%/static/gwt/opentsdb/images/splitPanelThumb.png
-%%DATADIR%%/static/gwt/opentsdb/images/vborder.png
-%%DATADIR%%/static/gwt/opentsdb/opentsdb.css
-%%DATADIR%%/static/gwt/opentsdb/opentsdb_rtl.css
-%%DATADIR%%/static/hosted.html
-%%DATADIR%%/static/queryui.nocache.js
-%%DATADIR%%/tools/check_tsd
-%%DATADIR%%/tools/clean_cache.sh
-%%DATADIR%%/tools/create_table.sh
-%%DATADIR%%/tools/opentsdb_restart.py
-%%DATADIR%%/tools/tsddrain.py
-%%DATADIR%%/tools/upgrade_1to2.sh
-%%ETCDIR%%/logback.xml
-@sample %%ETCDIR%%/opentsdb.conf.sample
-@dir(opentsdb,opentsdb,750) /var/log/opentsdb
-@dir(opentsdb,opentsdb,750) /var/run/opentsdb
diff --git a/databases/ora2pg/Makefile b/databases/ora2pg/Makefile
index ba935adeb1fa..9b6f3ca34081 100644
--- a/databases/ora2pg/Makefile
+++ b/databases/ora2pg/Makefile
@@ -1,12 +1,11 @@
-# Created by: Jov amutu@amutu.com
-
 PORTNAME=	ora2pg
-PORTVERSION=	21.1
+PORTVERSION=	24.3
 DISTVERSIONPREFIX=	v
 CATEGORIES=	databases
 
 MAINTAINER=	wen@FreeBSD.org
 COMMENT=	Oracle to PostgreSQL database schema converter
+WWW=		https://github.com/darold/ora2pg
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
diff --git a/databases/ora2pg/distinfo b/databases/ora2pg/distinfo
index 1070f824d53d..ecf6ca227d97 100644
--- a/databases/ora2pg/distinfo
+++ b/databases/ora2pg/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1618020888
-SHA256 (darold-ora2pg-v21.1_GH0.tar.gz) = 3dd6def530ce9f9a06147af205307a419c711760572b2ab1ed25d41ae140aa09
-SIZE (darold-ora2pg-v21.1_GH0.tar.gz) = 465758
+TIMESTAMP = 1711709345
+SHA256 (darold-ora2pg-v24.3_GH0.tar.gz) = 7d031c033c31265cf1b2eeb3f654623af8211ea748798af289dedd394a5eb18c
+SIZE (darold-ora2pg-v24.3_GH0.tar.gz) = 576965
diff --git a/databases/ora2pg/pkg-descr b/databases/ora2pg/pkg-descr
index 38b8e4ed8b60..dbd3f5a55971 100644
--- a/databases/ora2pg/pkg-descr
+++ b/databases/ora2pg/pkg-descr
@@ -6,5 +6,3 @@ engineering Oracle database to huge enterprise database migration or simply
 to replicate some Oracle data into a PostgreSQL database. It is really easy
 to used and doesn't need any Oracle database knowledge than providing the
 parameters needed to connect to the Oracle database.
-
-WWW: https://github.com/darold/ora2pg
diff --git a/databases/ora2pg/pkg-plist b/databases/ora2pg/pkg-plist
index 6e309939ea94..ccffc5c6ea7f 100644
--- a/databases/ora2pg/pkg-plist
+++ b/databases/ora2pg/pkg-plist
@@ -3,7 +3,9 @@ bin/ora2pg_scanner
 %%ETCDIR%%/ora2pg.conf.dist
 %%SITE_PERL%%/Ora2Pg.pm
 %%SITE_PERL%%/Ora2Pg/GEOM.pm
+%%SITE_PERL%%/Ora2Pg/MSSQL.pm
 %%SITE_PERL%%/Ora2Pg/MySQL.pm
+%%SITE_PERL%%/Ora2Pg/Oracle.pm
 %%SITE_PERL%%/Ora2Pg/PLSQL.pm
 %%PERL5_MAN3%%/ora2pg.3.gz
 %%PORTDOCS%%%%DOCSDIR%%/README
diff --git a/databases/oracle8-client/Makefile b/databases/oracle8-client/Makefile
index 9d30cb254f70..aaa21b16e551 100644
--- a/databases/oracle8-client/Makefile
+++ b/databases/oracle8-client/Makefile
@@ -1,5 +1,3 @@
-# Created by: Max Khon <fjoe@FreeBSD.org>
-
 PORTNAME=	oracle8-client
 PORTVERSION=	0.2.0
 PORTREVISION=	2
@@ -9,6 +7,7 @@ MASTER_SITES=	LOCAL/fjoe \
 
 MAINTAINER=	bonkor@gmail.com
 COMMENT=	Oracle 8 client
+WWW=		http://www.grosbein.net/freebsd/oracle/
 
 USES=		tar:bzip2
 ONLY_FOR_ARCHS=	i386
diff --git a/databases/oracle8-client/pkg-descr b/databases/oracle8-client/pkg-descr
index cf9554339d57..ca6ed9aee29b 100644
--- a/databases/oracle8-client/pkg-descr
+++ b/databases/oracle8-client/pkg-descr
@@ -2,5 +2,3 @@ This is a FreeBSD binary port of Oracle client libraries (OCI) made from
 Oracle 8.1.7.1 for Linux.
 
 This port is not officially supported by Oracle. USE AT YOUR OWN RISK!
-
-WWW: http://www.grosbein.net/freebsd/oracle/
diff --git a/databases/p5-Amazon-SimpleDB/Makefile b/databases/p5-Amazon-SimpleDB/Makefile
index 0c3d0c2eec77..514c6e423492 100644
--- a/databases/p5-Amazon-SimpleDB/Makefile
+++ b/databases/p5-Amazon-SimpleDB/Makefile
@@ -1,5 +1,3 @@
-# Created by: Gea-Suan Lin <gslin@gslin.org>
-
 PORTNAME=	Amazon-SimpleDB
 PORTVERSION=	0.03
 PORTREVISION=	1
@@ -10,6 +8,7 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Low-level perlish interface for working with Amazon SimpleDB service
+WWW=		https://metacpan.org/release/Amazon-SimpleDB
 
 LICENSE=	ART10
 
diff --git a/databases/p5-Amazon-SimpleDB/pkg-descr b/databases/p5-Amazon-SimpleDB/pkg-descr
index 40379cf669c5..c9f23205234f 100644
--- a/databases/p5-Amazon-SimpleDB/pkg-descr
+++ b/databases/p5-Amazon-SimpleDB/pkg-descr
@@ -1,4 +1,2 @@
 Amazon::SimpleDB provides a "low-level" perlish interface for working with
 Amazon's SimpleDB (SMB) service.
-
-WWW: https://metacpan.org/release/Amazon-SimpleDB
diff --git a/databases/p5-Amon2-DBI/Makefile b/databases/p5-Amon2-DBI/Makefile
index 88be3f7cd8da..682a45731da2 100644
--- a/databases/p5-Amon2-DBI/Makefile
+++ b/databases/p5-Amon2-DBI/Makefile
@@ -5,8 +5,9 @@ CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension of simple DBI wrapper
+WWW=		https://metacpan.org/release/Amon2-DBI
 
 RUN_DEPENDS=	\
 	p5-Carp-Clan>0:devel/p5-Carp-Clan \
diff --git a/databases/p5-Amon2-DBI/pkg-descr b/databases/p5-Amon2-DBI/pkg-descr
index d81c9b96d29c..4dd876d58d11 100644
--- a/databases/p5-Amon2-DBI/pkg-descr
+++ b/databases/p5-Amon2-DBI/pkg-descr
@@ -1,4 +1,2 @@
 Amon2::DBI is a simple DBI wrapper.  It provides better usability for
 you.
-
-WWW: https://metacpan.org/release/Amon2-DBI
diff --git a/databases/p5-AnyEvent-BDB/Makefile b/databases/p5-AnyEvent-BDB/Makefile
index 2722af1f7038..4454841f048c 100644
--- a/databases/p5-AnyEvent-BDB/Makefile
+++ b/databases/p5-AnyEvent-BDB/Makefile
@@ -1,5 +1,3 @@
-# Created by: Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>
-
 PORTNAME=	AnyEvent-BDB
 PORTVERSION=	1.1
 PORTREVISION=	1
@@ -9,12 +7,13 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Truly asynchronous Berkeley DB access
+WWW=		https://metacpan.org/release/AnyEvent-BDB
 
 LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
-RUN_DEPENDS=	p5-AnyEvent>=3.81:devel/p5-AnyEvent \
+RUN_DEPENDS=	p5-AnyEvent>=3.81,1:devel/p5-AnyEvent \
 		p5-BDB>=1.5:databases/p5-BDB
 
 USES=		perl5
diff --git a/databases/p5-AnyEvent-BDB/pkg-descr b/databases/p5-AnyEvent-BDB/pkg-descr
index 5b365cbfa40c..90bf3561881a 100644
--- a/databases/p5-AnyEvent-BDB/pkg-descr
+++ b/databases/p5-AnyEvent-BDB/pkg-descr
@@ -8,5 +8,3 @@ case you don't).
 
 The AnyEvent watcher can be disabled by executing undef $AnyEvent::BDB::WATCHER.
 Please notify the author of when and why you think this was necessary.
-
-WWW: https://metacpan.org/release/AnyEvent-BDB
diff --git a/databases/p5-AnyEvent-CouchDB/Makefile b/databases/p5-AnyEvent-CouchDB/Makefile
index b529382f8047..1e8188e34ffa 100644
--- a/databases/p5-AnyEvent-CouchDB/Makefile
+++ b/databases/p5-AnyEvent-CouchDB/Makefile
@@ -1,5 +1,3 @@
-# Created by: Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>
-
 PORTNAME=	AnyEvent-CouchDB
 PORTVERSION=	1.31
 PORTREVISION=	4
@@ -9,6 +7,7 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Non-blocking CouchDB client based on jquery.couch.js
+WWW=		https://metacpan.org/release/AnyEvent-CouchDB
 
 LICENSE=	MIT
 
diff --git a/databases/p5-AnyEvent-CouchDB/pkg-descr b/databases/p5-AnyEvent-CouchDB/pkg-descr
index f83ea8558bf5..5f8bfc41d820 100644
--- a/databases/p5-AnyEvent-CouchDB/pkg-descr
+++ b/databases/p5-AnyEvent-CouchDB/pkg-descr
@@ -6,5 +6,3 @@ want.
 
 Its API is based on jquery.couch.js, but we've adapted the API slightly so that
 it makes sense in an asynchronous Perl environment.
-
-WWW: https://metacpan.org/release/AnyEvent-CouchDB
diff --git a/databases/p5-AnyEvent-DBD-Pg/Makefile b/databases/p5-AnyEvent-DBD-Pg/Makefile
index f86d7ca4af25..b82480fbfe9d 100644
--- a/databases/p5-AnyEvent-DBD-Pg/Makefile
+++ b/databases/p5-AnyEvent-DBD-Pg/Makefile
@@ -5,8 +5,9 @@ CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension for AnyEvent interface to DBD::Pg async interface
+WWW=		https://metacpan.org/release/AnyEvent-DBD-Pg
 
 BUILD_DEPENDS=	p5-AnyEvent>=5:devel/p5-AnyEvent \
 		p5-DBD-Pg>0:databases/p5-DBD-Pg \
diff --git a/databases/p5-AnyEvent-DBD-Pg/pkg-descr b/databases/p5-AnyEvent-DBD-Pg/pkg-descr
index 1225125eeac0..bce4683454fb 100644
--- a/databases/p5-AnyEvent-DBD-Pg/pkg-descr
+++ b/databases/p5-AnyEvent-DBD-Pg/pkg-descr
@@ -1,3 +1 @@
 AnyEvent interface to DBD::Pg's async interface.
-
-WWW: https://metacpan.org/release/AnyEvent-DBD-Pg
diff --git a/databases/p5-AnyEvent-Memcached/Makefile b/databases/p5-AnyEvent-Memcached/Makefile
index 0746f165c9cb..6ec5e3914b47 100644
--- a/databases/p5-AnyEvent-Memcached/Makefile
+++ b/databases/p5-AnyEvent-Memcached/Makefile
@@ -1,14 +1,12 @@
-# Created by: Anes Mukhametov <anes@anes.su>
-
 PORTNAME=	AnyEvent-Memcached
-PORTVERSION=	0.05
-PORTREVISION=	1
+PORTVERSION=	0.08
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	anes@anes.su
 COMMENT=	AnyEvent memcached client
+WWW=		https://metacpan.org/release/AnyEvent-Memcached
 
 LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
diff --git a/databases/p5-AnyEvent-Memcached/distinfo b/databases/p5-AnyEvent-Memcached/distinfo
index 8098f8e884da..dc06f13364ab 100644
--- a/databases/p5-AnyEvent-Memcached/distinfo
+++ b/databases/p5-AnyEvent-Memcached/distinfo
@@ -1,2 +1,3 @@
-SHA256 (AnyEvent-Memcached-0.05.tar.gz) = 78e5a1e3bf935e1720795eb3254ec7768c52f3d6e8a6b4a74d1c3260405b47a7
-SIZE (AnyEvent-Memcached-0.05.tar.gz) = 40120
+TIMESTAMP = 1634733721
+SHA256 (AnyEvent-Memcached-0.08.tar.gz) = 04da12bd31211538af20237a7abd8d474413d314b099c3400c13da64762e6236
+SIZE (AnyEvent-Memcached-0.08.tar.gz) = 43747
diff --git a/databases/p5-AnyEvent-Memcached/files/patch-lib__AnyEvent__Memcached.pm b/databases/p5-AnyEvent-Memcached/files/patch-lib__AnyEvent__Memcached.pm
deleted file mode 100644
index 95b6b5cc113b..000000000000
--- a/databases/p5-AnyEvent-Memcached/files/patch-lib__AnyEvent__Memcached.pm
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./lib/AnyEvent/Memcached.pm.orig	2010-07-11 12:00:08.000000000 +0200
-+++ ./lib/AnyEvent/Memcached.pm	2013-11-15 17:57:36.000000000 +0100
-@@ -822,7 +822,7 @@
- 				}
- 				else {
- 					#warn "add failed, try again";
--					$self->incr_add($key,$val,%args);
-+					$self->incadd($key,$val,%args);
- 				}
- 			});
- 		}
diff --git a/databases/p5-AnyEvent-Memcached/pkg-descr b/databases/p5-AnyEvent-Memcached/pkg-descr
index 8ced5975f678..5c70e8d5ef62 100644
--- a/databases/p5-AnyEvent-Memcached/pkg-descr
+++ b/databases/p5-AnyEvent-Memcached/pkg-descr
@@ -1,3 +1 @@
 Asyncronous memcached/memcachedb client for AnyEvent framework
-
-WWW: https://metacpan.org/release/AnyEvent-Memcached
diff --git a/databases/p5-AnyEvent-Redis/Makefile b/databases/p5-AnyEvent-Redis/Makefile
index 97739e6e4c10..98f50f8c7e3e 100644
--- a/databases/p5-AnyEvent-Redis/Makefile
+++ b/databases/p5-AnyEvent-Redis/Makefile
@@ -1,5 +1,3 @@
-# Created by: Anton Berezin <tobez@FreeBSD.org>
-
 PORTNAME=	AnyEvent-Redis
 PORTVERSION=	0.24
 PORTREVISION=	3
@@ -10,6 +8,7 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Non-blocking Redis client written in Perl
+WWW=		https://metacpan.org/release/AnyEvent-Redis
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
 RUN_DEPENDS=	p5-Try-Tiny>=0:lang/p5-Try-Tiny \
diff --git a/databases/p5-AnyEvent-Redis/pkg-descr b/databases/p5-AnyEvent-Redis/pkg-descr
index 3f9ed0e5e8a9..0cd0b9e7da49 100644
--- a/databases/p5-AnyEvent-Redis/pkg-descr
+++ b/databases/p5-AnyEvent-Redis/pkg-descr
@@ -1,3 +1 @@
 AnyEvent::Redis is a non-blocking (event-driven) Redis client.
-
-WWW: https://metacpan.org/release/AnyEvent-Redis
diff --git a/databases/p5-App-Sqitch/Makefile b/databases/p5-App-Sqitch/Makefile
index 9b54d33ec422..c47b846868b7 100644
--- a/databases/p5-App-Sqitch/Makefile
+++ b/databases/p5-App-Sqitch/Makefile
@@ -1,33 +1,39 @@
-# Created by: Henrik Hodne <henrik@hodne.io>
-
 PORTNAME=	App-Sqitch
-PORTVERSION=	0.9994
-PORTREVISION=	1
+PORTVERSION=	1.3.0
 CATEGORIES=	databases perl5
+DISTVERSIONPREFIX=	v
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	CPAN:MIYAGAWA
+MASTER_SITE_SUBDIR=	CPAN:DWHEELER
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	henrik@hodne.io
-COMMENT=	Sane database change management
+COMMENT=	Sensible database change management
+WWW=		https://metacpan.org/release/App-Sqitch
 
 LICENSE=	MIT
 
 TEST_DEPENDS=	p5-Capture-Tiny>=0:devel/p5-Capture-Tiny \
+		p5-IO-Pager>=0.34:devel/p5-IO-Pager \
 		p5-Test-Dir>=0:misc/p5-Test-Dir \
+		p5-Test-Exception>=0:devel/p5-Test-Exception \
+		p5-Test-Exit>=0:devel/p5-Test-Exit \
+		p5-Test-File>=0:devel/p5-Test-File \
 		p5-Test-File-Contents>=0:devel/p5-Test-File-Contents \
-		p5-Test-MockModule>=0:devel/p5-Test-MockModule
+		p5-Test-MockModule>=0:devel/p5-Test-MockModule \
+		p5-Module-Runtime>=0:devel/p5-Module-Runtime \
+		p5-Test-MockModule>=0.17:devel/p5-Test-MockModule \
+		p5-Test-Warn>=0:devel/p5-Test-Warn
 BUILD_DEPENDS=	${RUN_DEPENDS}
-RUN_DEPENDS=	p5-Clone>=0:devel/p5-Clone \
-		p5-Config-GitLike>=1.11:devel/p5-Config-GitLike \
+RUN_DEPENDS=	p5-Algorithm-Backoff>=0.006:devel/p5-Algorithm-Backoff \
+		p5-Clone>=0:devel/p5-Clone \
+		p5-Config-GitLike>=1.15:devel/p5-Config-GitLike \
 		p5-DBI>=0:databases/p5-DBI \
 		p5-DateTime>=0:devel/p5-DateTime \
-		p5-DateTime-TimeZone>=0:devel/p5-DateTime-TimeZone \
+		p5-DateTime-TimeZone>=1.04:devel/p5-DateTime-TimeZone \
 		p5-Devel-StackTrace>=1.30:devel/p5-Devel-StackTrace \
 		p5-Encode-Locale>=0:converters/p5-Encode-Locale \
-		p5-File-HomeDir>=0:devel/p5-File-HomeDir \
 		p5-Hash-Merge>=0:textproc/p5-Hash-Merge \
-		p5-IO-Pager>=0:devel/p5-IO-Pager \
+		p5-IO-Pager>=0.34:devel/p5-IO-Pager \
 		p5-IPC-Run3>=0:devel/p5-IPC-Run3 \
 		p5-IPC-System-Simple>=1.17:devel/p5-IPC-System-Simple \
 		p5-List-MoreUtils>=0:lang/p5-List-MoreUtils \
@@ -35,6 +41,8 @@ RUN_DEPENDS=	p5-Clone>=0:devel/p5-Clone \
 		p5-Moo>=1.002000:devel/p5-Moo \
 		p5-Path-Class>=0.33:devel/p5-Path-Class \
 		p5-PerlIO-utf8_strict>=0:devel/p5-PerlIO-utf8_strict \
+		p5-Pod-Escapes>=1.04:textproc/p5-Pod-Escapes \
+		p5-Pod-Parser>=0:textproc/p5-Pod-Parser \
 		p5-Template-Tiny>=0.11:textproc/p5-Template-Tiny \
 		p5-String-Formatter>=0:devel/p5-String-Formatter \
 		p5-String-ShellQuote>=0:textproc/p5-String-ShellQuote \
@@ -44,11 +52,10 @@ RUN_DEPENDS=	p5-Clone>=0:devel/p5-Clone \
 		p5-Try-Tiny>=0:lang/p5-Try-Tiny \
 		p5-Type-Tiny>=0.040:devel/p5-Type-Tiny \
 		p5-URI>=0:net/p5-URI \
-		p5-URI-db>=0.15:net/p5-URI-db \
+		p5-URI-db>=0.20:net/p5-URI-db \
 		p5-namespace-autoclean>=0.16:devel/p5-namespace-autoclean
 
-
-USES=		gettext perl5
+USES=		perl5
 USE_PERL5=	modbuild
 NO_ARCH=	YES
 
diff --git a/databases/p5-App-Sqitch/distinfo b/databases/p5-App-Sqitch/distinfo
index 68ab2d52a9ce..16cafd6e1336 100644
--- a/databases/p5-App-Sqitch/distinfo
+++ b/databases/p5-App-Sqitch/distinfo
@@ -1,2 +1,3 @@
-SHA256 (App-Sqitch-0.9994.tar.gz) = 24de7770884419f199d24fa2ce81f5e7a27583028f685e6973a06840be00c646
-SIZE (App-Sqitch-0.9994.tar.gz) = 490681
+TIMESTAMP = 1663422690
+SHA256 (App-Sqitch-v1.3.0.tar.gz) = 7d07635ec77a7faf3c50281c76ec833c68702f14470996cb2203a8bc6abc5bf2
+SIZE (App-Sqitch-v1.3.0.tar.gz) = 632394
diff --git a/databases/p5-App-Sqitch/pkg-descr b/databases/p5-App-Sqitch/pkg-descr
index fdf8e0b17880..986473b185ff 100644
--- a/databases/p5-App-Sqitch/pkg-descr
+++ b/databases/p5-App-Sqitch/pkg-descr
@@ -1,38 +1,8 @@
 Sqitch is a database change management application. What makes it
 different from your typical migration-style approaches? A few things:
 
-## No opinions
-
-Sqitch is not integrated with any framework, ORM, or platform.
-Rather, it is a standalone change management system with no opinions
-about your database engine, application framework, or development
-environment.
-
-## Native scripting
-
-Changes are implemented as scripts native to your selected database
-engine. Writing a PostgreSQL application? Write SQL scripts for
-psql. Writing a MySQL-backed app? Write SQL scripts for mysql.
-
-## Dependency resolution
-
-Database changes may declare dependencies on other changes -- even
-on changes from other Sqitch projects. This ensures proper order
-of execution, even when you've committed changes to your VCS
-out-of-order.
-
-## No numbering
-
-Change deployment is managed by maintaining a plan file. As such,
-there is no need to number your changes, although you can if you
-want. Sqitch doesn't much care how you name your changes.
-
-## Iterative development
-
-Up until you tag and release your application, you can modify your
-change deployment scripts as often as you like. They're not locked
-in just because they've been committed to your VCS. This allows you
-to take an iterative approach to developing your database schema.
-Or, better, you can do test-driven database development.
-
-WWW: https://metacpan.org/release/App-Sqitch
+* No opinions
+* Native scripting
+* Dependency resolution
+* Deployment integrity
+* Iterative development
diff --git a/databases/p5-App-Sqitch/pkg-plist b/databases/p5-App-Sqitch/pkg-plist
index fc7ce79e17c9..dc3804b06957 100644
--- a/databases/p5-App-Sqitch/pkg-plist
+++ b/databases/p5-App-Sqitch/pkg-plist
@@ -1,20 +1,26 @@
 bin/sqitch
+etc/sqitch/templates/deploy/exasol.tmpl
 etc/sqitch/templates/deploy/firebird.tmpl
 etc/sqitch/templates/deploy/mysql.tmpl
 etc/sqitch/templates/deploy/oracle.tmpl
 etc/sqitch/templates/deploy/pg.tmpl
+etc/sqitch/templates/deploy/snowflake.tmpl
 etc/sqitch/templates/deploy/sqlite.tmpl
 etc/sqitch/templates/deploy/vertica.tmpl
+etc/sqitch/templates/revert/exasol.tmpl
 etc/sqitch/templates/revert/firebird.tmpl
 etc/sqitch/templates/revert/mysql.tmpl
 etc/sqitch/templates/revert/oracle.tmpl
 etc/sqitch/templates/revert/pg.tmpl
+etc/sqitch/templates/revert/snowflake.tmpl
 etc/sqitch/templates/revert/sqlite.tmpl
 etc/sqitch/templates/revert/vertica.tmpl
+etc/sqitch/templates/verify/exasol.tmpl
 etc/sqitch/templates/verify/firebird.tmpl
 etc/sqitch/templates/verify/mysql.tmpl
 etc/sqitch/templates/verify/oracle.tmpl
 etc/sqitch/templates/verify/pg.tmpl
+etc/sqitch/templates/verify/snowflake.tmpl
 etc/sqitch/templates/verify/sqlite.tmpl
 etc/sqitch/templates/verify/vertica.tmpl
 etc/sqitch/tools/upgrade-registry-to-mysql-5.5.0.sql
@@ -23,6 +29,7 @@ etc/sqitch/tools/upgrade-registry-to-mysql-5.6.4.sql
 %%SITE_PERL%%/App/Sqitch/Command.pm
 %%SITE_PERL%%/App/Sqitch/Command/add.pm
 %%SITE_PERL%%/App/Sqitch/Command/bundle.pm
+%%SITE_PERL%%/App/Sqitch/Command/check.pm
 %%SITE_PERL%%/App/Sqitch/Command/checkout.pm
 %%SITE_PERL%%/App/Sqitch/Command/config.pm
 %%SITE_PERL%%/App/Sqitch/Command/deploy.pm
@@ -43,6 +50,10 @@ etc/sqitch/tools/upgrade-registry-to-mysql-5.6.4.sql
 %%SITE_PERL%%/App/Sqitch/Config.pm
 %%SITE_PERL%%/App/Sqitch/DateTime.pm
 %%SITE_PERL%%/App/Sqitch/Engine.pm
+%%SITE_PERL%%/App/Sqitch/Engine/Upgrade/cockroach-1.0.sql
+%%SITE_PERL%%/App/Sqitch/Engine/Upgrade/cockroach-1.1.sql
+%%SITE_PERL%%/App/Sqitch/Engine/Upgrade/exasol-1.0.sql
+%%SITE_PERL%%/App/Sqitch/Engine/Upgrade/exasol-1.1.sql
 %%SITE_PERL%%/App/Sqitch/Engine/Upgrade/firebird-1.0.sql
 %%SITE_PERL%%/App/Sqitch/Engine/Upgrade/firebird-1.1.sql
 %%SITE_PERL%%/App/Sqitch/Engine/Upgrade/mysql-1.0.sql
@@ -51,10 +62,16 @@ etc/sqitch/tools/upgrade-registry-to-mysql-5.6.4.sql
 %%SITE_PERL%%/App/Sqitch/Engine/Upgrade/oracle-1.1.sql
 %%SITE_PERL%%/App/Sqitch/Engine/Upgrade/pg-1.0.sql
 %%SITE_PERL%%/App/Sqitch/Engine/Upgrade/pg-1.1.sql
+%%SITE_PERL%%/App/Sqitch/Engine/Upgrade/snowflake-1.0.sql
+%%SITE_PERL%%/App/Sqitch/Engine/Upgrade/snowflake-1.1.sql
 %%SITE_PERL%%/App/Sqitch/Engine/Upgrade/sqlite-1.0.sql
 %%SITE_PERL%%/App/Sqitch/Engine/Upgrade/sqlite-1.1.sql
 %%SITE_PERL%%/App/Sqitch/Engine/Upgrade/vertica-1.0.sql
 %%SITE_PERL%%/App/Sqitch/Engine/Upgrade/vertica-1.1.sql
+%%SITE_PERL%%/App/Sqitch/Engine/cockroach.pm
+%%SITE_PERL%%/App/Sqitch/Engine/cockroach.sql
+%%SITE_PERL%%/App/Sqitch/Engine/exasol.pm
+%%SITE_PERL%%/App/Sqitch/Engine/exasol.sql
 %%SITE_PERL%%/App/Sqitch/Engine/firebird.pm
 %%SITE_PERL%%/App/Sqitch/Engine/firebird.sql
 %%SITE_PERL%%/App/Sqitch/Engine/mysql.pm
@@ -63,6 +80,8 @@ etc/sqitch/tools/upgrade-registry-to-mysql-5.6.4.sql
 %%SITE_PERL%%/App/Sqitch/Engine/oracle.sql
 %%SITE_PERL%%/App/Sqitch/Engine/pg.pm
 %%SITE_PERL%%/App/Sqitch/Engine/pg.sql
+%%SITE_PERL%%/App/Sqitch/Engine/snowflake.pm
+%%SITE_PERL%%/App/Sqitch/Engine/snowflake.sql
 %%SITE_PERL%%/App/Sqitch/Engine/sqlite.pm
 %%SITE_PERL%%/App/Sqitch/Engine/sqlite.sql
 %%SITE_PERL%%/App/Sqitch/Engine/vertica.pm
@@ -77,18 +96,22 @@ etc/sqitch/tools/upgrade-registry-to-mysql-5.6.4.sql
 %%SITE_PERL%%/App/Sqitch/Plan/LineList.pm
 %%SITE_PERL%%/App/Sqitch/Plan/Pragma.pm
 %%SITE_PERL%%/App/Sqitch/Plan/Tag.pm
+%%SITE_PERL%%/App/Sqitch/Role/ConnectingCommand.pm
+%%SITE_PERL%%/App/Sqitch/Role/ContextCommand.pm
 %%SITE_PERL%%/App/Sqitch/Role/DBIEngine.pm
 %%SITE_PERL%%/App/Sqitch/Role/RevertDeployCommand.pm
 %%SITE_PERL%%/App/Sqitch/Role/TargetConfigCommand.pm
 %%SITE_PERL%%/App/Sqitch/Target.pm
 %%SITE_PERL%%/App/Sqitch/Types.pm
 %%SITE_PERL%%/App/Sqitch/X.pm
-%%SITE_PERL%%/LocaleData/de/LC_MESSAGES/App-Sqitch.mo
-%%SITE_PERL%%/LocaleData/fr/LC_MESSAGES/App-Sqitch.mo
+%%SITE_PERL%%/LocaleData/de_DE/LC_MESSAGES/App-Sqitch.mo
+%%SITE_PERL%%/LocaleData/fr_FR/LC_MESSAGES/App-Sqitch.mo
+%%SITE_PERL%%/LocaleData/it_IT/LC_MESSAGES/App-Sqitch.mo
 %%PERL5_MAN3%%/App::Sqitch.3.gz
 %%PERL5_MAN3%%/App::Sqitch::Command.3.gz
 %%PERL5_MAN3%%/App::Sqitch::Command::add.3.gz
 %%PERL5_MAN3%%/App::Sqitch::Command::bundle.3.gz
+%%PERL5_MAN3%%/App::Sqitch::Command::check.3.gz
 %%PERL5_MAN3%%/App::Sqitch::Command::checkout.3.gz
 %%PERL5_MAN3%%/App::Sqitch::Command::config.3.gz
 %%PERL5_MAN3%%/App::Sqitch::Command::deploy.3.gz
@@ -109,10 +132,13 @@ etc/sqitch/tools/upgrade-registry-to-mysql-5.6.4.sql
 %%PERL5_MAN3%%/App::Sqitch::Config.3.gz
 %%PERL5_MAN3%%/App::Sqitch::DateTime.3.gz
 %%PERL5_MAN3%%/App::Sqitch::Engine.3.gz
+%%PERL5_MAN3%%/App::Sqitch::Engine::cockroach.3.gz
+%%PERL5_MAN3%%/App::Sqitch::Engine::exasol.3.gz
 %%PERL5_MAN3%%/App::Sqitch::Engine::firebird.3.gz
 %%PERL5_MAN3%%/App::Sqitch::Engine::mysql.3.gz
 %%PERL5_MAN3%%/App::Sqitch::Engine::oracle.3.gz
 %%PERL5_MAN3%%/App::Sqitch::Engine::pg.3.gz
+%%PERL5_MAN3%%/App::Sqitch::Engine::snowflake.3.gz
 %%PERL5_MAN3%%/App::Sqitch::Engine::sqlite.3.gz
 %%PERL5_MAN3%%/App::Sqitch::Engine::vertica.3.gz
 %%PERL5_MAN3%%/App::Sqitch::ItemFormatter.3.gz
@@ -125,6 +151,8 @@ etc/sqitch/tools/upgrade-registry-to-mysql-5.6.4.sql
 %%PERL5_MAN3%%/App::Sqitch::Plan::LineList.3.gz
 %%PERL5_MAN3%%/App::Sqitch::Plan::Pragma.3.gz
 %%PERL5_MAN3%%/App::Sqitch::Plan::Tag.3.gz
+%%PERL5_MAN3%%/App::Sqitch::Role::ConnectingCommand.3.gz
+%%PERL5_MAN3%%/App::Sqitch::Role::ContextCommand.3.gz
 %%PERL5_MAN3%%/App::Sqitch::Role::DBIEngine.3.gz
 %%PERL5_MAN3%%/App::Sqitch::Role::RevertDeployCommand.3.gz
 %%PERL5_MAN3%%/App::Sqitch::Role::TargetConfigCommand.3.gz
@@ -133,8 +161,11 @@ etc/sqitch/tools/upgrade-registry-to-mysql-5.6.4.sql
 %%PERL5_MAN3%%/App::Sqitch::X.3.gz
 %%PERL5_MAN3%%/sqitch-add-usage.3.gz
 %%PERL5_MAN3%%/sqitch-add.3.gz
+%%PERL5_MAN3%%/sqitch-authentication.3.gz
 %%PERL5_MAN3%%/sqitch-bundle-usage.3.gz
 %%PERL5_MAN3%%/sqitch-bundle.3.gz
+%%PERL5_MAN3%%/sqitch-check-usage.3.gz
+%%PERL5_MAN3%%/sqitch-check.3.gz
 %%PERL5_MAN3%%/sqitch-checkout-usage.3.gz
 %%PERL5_MAN3%%/sqitch-checkout.3.gz
 %%PERL5_MAN3%%/sqitch-config-usage.3.gz
@@ -176,17 +207,22 @@ etc/sqitch/tools/upgrade-registry-to-mysql-5.6.4.sql
 %%PERL5_MAN3%%/sqitchchanges.3.gz
 %%PERL5_MAN3%%/sqitchcommands.3.gz
 %%PERL5_MAN3%%/sqitchguides.3.gz
+%%PERL5_MAN3%%/sqitchtutorial-exasol.3.gz
 %%PERL5_MAN3%%/sqitchtutorial-firebird.3.gz
 %%PERL5_MAN3%%/sqitchtutorial-mysql.3.gz
 %%PERL5_MAN3%%/sqitchtutorial-oracle.3.gz
+%%PERL5_MAN3%%/sqitchtutorial-snowflake.3.gz
 %%PERL5_MAN3%%/sqitchtutorial-sqlite.3.gz
 %%PERL5_MAN3%%/sqitchtutorial-vertica.3.gz
 %%PERL5_MAN3%%/sqitchtutorial.3.gz
 %%PERL5_MAN3%%/sqitchusage.3.gz
 %%SITE_PERL%%/sqitch-add-usage.pod
 %%SITE_PERL%%/sqitch-add.pod
+%%SITE_PERL%%/sqitch-authentication.pod
 %%SITE_PERL%%/sqitch-bundle-usage.pod
 %%SITE_PERL%%/sqitch-bundle.pod
+%%SITE_PERL%%/sqitch-check-usage.pod
+%%SITE_PERL%%/sqitch-check.pod
 %%SITE_PERL%%/sqitch-checkout-usage.pod
 %%SITE_PERL%%/sqitch-checkout.pod
 %%SITE_PERL%%/sqitch-config-usage.pod
@@ -228,9 +264,11 @@ etc/sqitch/tools/upgrade-registry-to-mysql-5.6.4.sql
 %%SITE_PERL%%/sqitchchanges.pod
 %%SITE_PERL%%/sqitchcommands.pod
 %%SITE_PERL%%/sqitchguides.pod
+%%SITE_PERL%%/sqitchtutorial-exasol.pod
 %%SITE_PERL%%/sqitchtutorial-firebird.pod
 %%SITE_PERL%%/sqitchtutorial-mysql.pod
 %%SITE_PERL%%/sqitchtutorial-oracle.pod
+%%SITE_PERL%%/sqitchtutorial-snowflake.pod
 %%SITE_PERL%%/sqitchtutorial-sqlite.pod
 %%SITE_PERL%%/sqitchtutorial-vertica.pod
 %%SITE_PERL%%/sqitchtutorial.pod
diff --git a/databases/p5-AsciiDB-TagFile/Makefile b/databases/p5-AsciiDB-TagFile/Makefile
index 15216e67ad5c..d5f1df87040c 100644
--- a/databases/p5-AsciiDB-TagFile/Makefile
+++ b/databases/p5-AsciiDB-TagFile/Makefile
@@ -1,5 +1,3 @@
-# Created by: Anton Berezin <tobez@tobez.org>
-
 PORTNAME=	AsciiDB-TagFile
 PORTVERSION=	1.06
 PORTREVISION=	1
diff --git a/databases/p5-BDB/Makefile b/databases/p5-BDB/Makefile
index a87ec2d743e1..9642898ccd20 100644
--- a/databases/p5-BDB/Makefile
+++ b/databases/p5-BDB/Makefile
@@ -1,5 +1,3 @@
-# Created by: Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>
-
 PORTNAME=	BDB
 PORTVERSION=	1.92
 CATEGORIES=	databases perl5
@@ -9,6 +7,7 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Asynchronous Berkeley DB access
+WWW=		https://metacpan.org/release/BDB
 
 LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
diff --git a/databases/p5-BDB/pkg-descr b/databases/p5-BDB/pkg-descr
index 71b4be08b201..06e55d8a8596 100644
--- a/databases/p5-BDB/pkg-descr
+++ b/databases/p5-BDB/pkg-descr
@@ -1,3 +1 @@
 BDB is a Perl module to provide asynchronous Berkeley DB access.
-
-WWW: https://metacpan.org/release/BDB
diff --git a/databases/p5-BSON-XS/Makefile b/databases/p5-BSON-XS/Makefile
index 82068492b3cd..5ee4c23de182 100644
--- a/databases/p5-BSON-XS/Makefile
+++ b/databases/p5-BSON-XS/Makefile
@@ -1,5 +1,3 @@
-# Created by: Po-Chuan Hsieh <sunpoet@FreeBSD.org>
-
 PORTNAME=	BSON-XS
 PORTVERSION=	0.8.4
 DISTVERSIONPREFIX=	v
@@ -9,6 +7,7 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	XS implementation of MongoDB BSON serialization
+WWW=		https://metacpan.org/release/BSON-XS
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
diff --git a/databases/p5-BSON-XS/pkg-descr b/databases/p5-BSON-XS/pkg-descr
index 666f79398166..83c307cfd1cd 100644
--- a/databases/p5-BSON-XS/pkg-descr
+++ b/databases/p5-BSON-XS/pkg-descr
@@ -1,5 +1,3 @@
 BSON::XS contains an XS implementation for BSON encoding and decoding. There is
 no public API. Use the BSON module and it will choose the best implementation
 for you.
-
-WWW: https://metacpan.org/release/BSON-XS
diff --git a/databases/p5-BSON/Makefile b/databases/p5-BSON/Makefile
index c4df421369f7..ff3f47d736aa 100644
--- a/databases/p5-BSON/Makefile
+++ b/databases/p5-BSON/Makefile
@@ -1,5 +1,3 @@
-# Created by: Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>
-
 PORTNAME=	BSON
 PORTVERSION=	1.12.2
 DISTVERSIONPREFIX=	v
@@ -10,6 +8,7 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Pure Perl implementation of MongoDB BSON serialization
+WWW=		https://metacpan.org/release/BSON
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
diff --git a/databases/p5-BSON/pkg-descr b/databases/p5-BSON/pkg-descr
index c54011e34f1e..308c5aa33742 100644
--- a/databases/p5-BSON/pkg-descr
+++ b/databases/p5-BSON/pkg-descr
@@ -1,4 +1,2 @@
 This module implements BSON serialization and deserialization as described at
 http://bsonspec.org. BSON is the primary data representation for MongoDB.
-
-WWW: https://metacpan.org/release/BSON
diff --git a/databases/p5-BerkeleyDB/Makefile b/databases/p5-BerkeleyDB/Makefile
index d4c6361bef25..87d561d6cbf1 100644
--- a/databases/p5-BerkeleyDB/Makefile
+++ b/databases/p5-BerkeleyDB/Makefile
@@ -1,13 +1,12 @@
-# Created by: T. William Wells <bill@twwells.com>
-
 PORTNAME=	BerkeleyDB
-PORTVERSION=	0.64
+PORTVERSION=	0.65
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl5 interface to the Berkeley DB package
+WWW=		https://metacpan.org/release/BerkeleyDB
 
 LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
diff --git a/databases/p5-BerkeleyDB/distinfo b/databases/p5-BerkeleyDB/distinfo
index 896aeb12d497..e8f47dd53ae4 100644
--- a/databases/p5-BerkeleyDB/distinfo
+++ b/databases/p5-BerkeleyDB/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1600863396
-SHA256 (BerkeleyDB-0.64.tar.gz) = 535c85e8549c1ac43a20160fdc02f0a400614156fd76157fff28aa33fda3744b
-SIZE (BerkeleyDB-0.64.tar.gz) = 259656
+TIMESTAMP = 1652471235
+SHA256 (BerkeleyDB-0.65.tar.gz) = 410aa89e7232941d49106c9e048d6337475543ec1d233ea7cdb725cb5b963504
+SIZE (BerkeleyDB-0.65.tar.gz) = 258814
diff --git a/databases/p5-BerkeleyDB/pkg-descr b/databases/p5-BerkeleyDB/pkg-descr
index 2372982d31d1..aea3492a9ff3 100644
--- a/databases/p5-BerkeleyDB/pkg-descr
+++ b/databases/p5-BerkeleyDB/pkg-descr
@@ -5,5 +5,3 @@ You may want to use this, instead of the default dbm that perl provides,
 as that one is based on version 1, which is seriously buggy. E.g., if
 keys or data are over a hundred bytes or so, bad things may happen to
 your dbm files. Never mind all the extra features....
-
-WWW: https://metacpan.org/release/BerkeleyDB
diff --git a/databases/p5-Bucardo/Makefile b/databases/p5-Bucardo/Makefile
index d33bb1178a80..276c7189f1f2 100644
--- a/databases/p5-Bucardo/Makefile
+++ b/databases/p5-Bucardo/Makefile
@@ -7,6 +7,7 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	mat@FreeBSD.org
 COMMENT=	Asynchronous PostgreSQL replication system
+WWW=		https://bucardo.org/Bucardo/
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
diff --git a/databases/p5-Bucardo/pkg-descr b/databases/p5-Bucardo/pkg-descr
index ab7dd71fbde6..66eac1ead394 100644
--- a/databases/p5-Bucardo/pkg-descr
+++ b/databases/p5-Bucardo/pkg-descr
@@ -3,5 +3,3 @@ multi-master and multi-slave operations. It was developed at Backcountry.com by
 Jon Jensen and Greg Sabino Mullane of End Point Corporation, and is now in use
 at many other organizations. Bucardo is free and open source software released
 under the BSD license.
-
-WWW: https://bucardo.org/Bucardo/
diff --git a/databases/p5-CDB_File-Generator/Makefile b/databases/p5-CDB_File-Generator/Makefile
index ff210bfac2fb..0b8f8956999d 100644
--- a/databases/p5-CDB_File-Generator/Makefile
+++ b/databases/p5-CDB_File-Generator/Makefile
@@ -1,5 +1,3 @@
-# Created by: Seamus Venasse <svenasse@polaris.ca>
-
 PORTNAME=	CDB_File-Generator
 PORTVERSION=	0.030
 PORTREVISION=	1
@@ -9,6 +7,7 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Generate massive sorted CDB files simply
+WWW=		https://metacpan.org/release/CDB_File-Generator
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
 RUN_DEPENDS=	cdbmake:databases/cdb \
diff --git a/databases/p5-CDB_File-Generator/pkg-descr b/databases/p5-CDB_File-Generator/pkg-descr
index 77446773abec..b574a872a89e 100644
--- a/databases/p5-CDB_File-Generator/pkg-descr
+++ b/databases/p5-CDB_File-Generator/pkg-descr
@@ -1,5 +1,3 @@
 CDB::Generator is a designed for generating very large sorted CDB
 files.  This makes it easy to generate files in which cdbmultiget can
 return more than one key.
-
-WWW: https://metacpan.org/release/CDB_File-Generator
diff --git a/databases/p5-CDB_File/Makefile b/databases/p5-CDB_File/Makefile
index e0ce58415dfb..b7c4c9481d78 100644
--- a/databases/p5-CDB_File/Makefile
+++ b/databases/p5-CDB_File/Makefile
@@ -1,5 +1,3 @@
-# Created by: Jon Nistor <nistor@snickers.org>
-
 PORTNAME=	CDB_File
 PORTVERSION=	1.02
 CATEGORIES=	databases perl5
@@ -8,6 +6,7 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	nistor@snickers.org
 COMMENT=	Perl5 interface to the CDB package
+WWW=		https://metacpan.org/release/CDB_File
 
 LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
diff --git a/databases/p5-CDB_File/pkg-descr b/databases/p5-CDB_File/pkg-descr
index 4f74a78d22a0..7439740fb244 100644
--- a/databases/p5-CDB_File/pkg-descr
+++ b/databases/p5-CDB_File/pkg-descr
@@ -1,5 +1,3 @@
 This is the perl5 interface to CDB.
 Very useful for people who would like to export information from an SQL type
 database directly into a CDB file via $cdb->insert in a perl script.
-
-WWW: https://metacpan.org/release/CDB_File
diff --git a/databases/p5-CGI-Session-Driver-memcached/Makefile b/databases/p5-CGI-Session-Driver-memcached/Makefile
index a6076df0c6fd..737471359a19 100644
--- a/databases/p5-CGI-Session-Driver-memcached/Makefile
+++ b/databases/p5-CGI-Session-Driver-memcached/Makefile
@@ -5,8 +5,9 @@ CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension for persistent session data in CGI applications
+WWW=		https://metacpan.org/release/CGI-Session-Driver-memcached
 
 RUN_DEPENDS=	\
 	p5-CGI-Session>=4:www/p5-CGI-Session
diff --git a/databases/p5-CGI-Session-Driver-memcached/pkg-descr b/databases/p5-CGI-Session-Driver-memcached/pkg-descr
index 296575ac6f68..ecb9235042ed 100644
--- a/databases/p5-CGI-Session-Driver-memcached/pkg-descr
+++ b/databases/p5-CGI-Session-Driver-memcached/pkg-descr
@@ -1,5 +1,3 @@
 CGI::Session::Driver::memcache is a storage driver (only referred as
 'driver' in CGI::Session lingo) for persisting CGI Sessions into a
 fast memcached server.
-
-WWW: https://metacpan.org/release/CGI-Session-Driver-memcached
diff --git a/databases/p5-CHI-Driver-Memcached/Makefile b/databases/p5-CHI-Driver-Memcached/Makefile
index 033871e6e32c..46dc4d0ff9de 100644
--- a/databases/p5-CHI-Driver-Memcached/Makefile
+++ b/databases/p5-CHI-Driver-Memcached/Makefile
@@ -6,6 +6,7 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	bokutin@bokut.in
 COMMENT=	Memcached Driver to use with the Cache Handling Interface CHI
+WWW=		https://metacpan.org/pod/CHI::Driver::Memcached
 
 LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
diff --git a/databases/p5-CHI-Driver-Memcached/pkg-descr b/databases/p5-CHI-Driver-Memcached/pkg-descr
index 15e93a12f6e9..552cf7721635 100644
--- a/databases/p5-CHI-Driver-Memcached/pkg-descr
+++ b/databases/p5-CHI-Driver-Memcached/pkg-descr
@@ -1,5 +1,3 @@
 This implements a driver for the generic cache handling interface (CHI)
 that uses Cache::Memcached to store data in the specified memcached
 server(s).
-
-WWW: https://metacpan.org/pod/CHI::Driver::Memcached
diff --git a/databases/p5-CHI-Driver-Redis/Makefile b/databases/p5-CHI-Driver-Redis/Makefile
index 4a78a6014be0..554f8d5fce67 100644
--- a/databases/p5-CHI-Driver-Redis/Makefile
+++ b/databases/p5-CHI-Driver-Redis/Makefile
@@ -6,6 +6,7 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	bokutin@bokut.in
 COMMENT=	Redis driver for CHI
+WWW=		https://metacpan.org/pod/CHI::Driver::Redis
 
 LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
diff --git a/databases/p5-CHI-Driver-Redis/pkg-descr b/databases/p5-CHI-Driver-Redis/pkg-descr
index 2aad1c7d01a2..5916754775cf 100644
--- a/databases/p5-CHI-Driver-Redis/pkg-descr
+++ b/databases/p5-CHI-Driver-Redis/pkg-descr
@@ -1,3 +1 @@
 Redis driver for CHI
-
-WWW: https://metacpan.org/pod/CHI::Driver::Redis
diff --git a/databases/p5-CHI-Driver-TokyoTyrant/Makefile b/databases/p5-CHI-Driver-TokyoTyrant/Makefile
index fc903415aacb..8a81d06a98ab 100644
--- a/databases/p5-CHI-Driver-TokyoTyrant/Makefile
+++ b/databases/p5-CHI-Driver-TokyoTyrant/Makefile
@@ -6,6 +6,7 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	bokutin@bokut.in
 COMMENT=	TokyoTyrant Driver to use with the Cache Handling Interface CHI
+WWW=		https://metacpan.org/release/CHI-Driver-TokyoTyrant
 
 LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
diff --git a/databases/p5-CHI-Driver-TokyoTyrant/pkg-descr b/databases/p5-CHI-Driver-TokyoTyrant/pkg-descr
index 87373899fa50..ffdc091cc230 100644
--- a/databases/p5-CHI-Driver-TokyoTyrant/pkg-descr
+++ b/databases/p5-CHI-Driver-TokyoTyrant/pkg-descr
@@ -1,5 +1,3 @@
 This implements a driver for the generic cache handling interface (CHI)
 that uses TokyoTyrant to store data in the specified memcached
 server(s).
-
-WWW: https://metacpan.org/release/CHI-Driver-TokyoTyrant
diff --git a/databases/p5-Cache-BDB/Makefile b/databases/p5-Cache-BDB/Makefile
index c8e1bc44d914..0def037af764 100644
--- a/databases/p5-Cache-BDB/Makefile
+++ b/databases/p5-Cache-BDB/Makefile
@@ -1,5 +1,3 @@
-# Created by: Gea-Suan Lin <gslin@gslin.org>
-
 PORTNAME=	Cache-BDB
 PORTVERSION=	0.04
 PORTREVISION=	1
@@ -9,6 +7,7 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Object caching wrapper around BerkeleyDB
+WWW=		https://metacpan.org/release/Cache-BDB
 
 LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
diff --git a/databases/p5-Cache-BDB/pkg-descr b/databases/p5-Cache-BDB/pkg-descr
index e8f3f008cb20..beeba0f9a0ab 100644
--- a/databases/p5-Cache-BDB/pkg-descr
+++ b/databases/p5-Cache-BDB/pkg-descr
@@ -3,5 +3,3 @@ It implements the basic methods necessary to add, retrieve, and remove objects.
 The main advantage over other caching modules is performance. I've attempted to
 stick with a Cache::Cache-like interface as much as possible, though it may
 differ here and there.
-
-WWW: https://metacpan.org/release/Cache-BDB
diff --git a/databases/p5-Cache-Memcached-Fast/Makefile b/databases/p5-Cache-Memcached-Fast/Makefile
index edc2225c32b0..0ed665e2e9f5 100644
--- a/databases/p5-Cache-Memcached-Fast/Makefile
+++ b/databases/p5-Cache-Memcached-Fast/Makefile
@@ -1,17 +1,18 @@
-# Created by: Anton Berezin <tobez@FreeBSD.org>
-
 PORTNAME=	Cache-Memcached-Fast
-PORTVERSION=	0.27
+PORTVERSION=	0.28
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Fast Perl client for memcached, a distributed memory cache daemon
+WWW=		https://metacpan.org/release/Cache-Memcached-Fast
 
 LICENSE=	ART10 GPLv2+
 LICENSE_COMB=	dual
 
+TEST_DEPENDS=	p5-Test2-Suite>=0.000072:devel/p5-Test2-Suite
+
 USES=		perl5
 USE_PERL5=	configure
 
diff --git a/databases/p5-Cache-Memcached-Fast/distinfo b/databases/p5-Cache-Memcached-Fast/distinfo
index 4ef18e3c3149..a0b6f469bbf6 100644
--- a/databases/p5-Cache-Memcached-Fast/distinfo
+++ b/databases/p5-Cache-Memcached-Fast/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1622038056
-SHA256 (Cache-Memcached-Fast-0.27.tar.gz) = 21de7a0429cb49bbb7a8ad503a9b171e732d1a482d10f0ca4e6ce6619807a66b
-SIZE (Cache-Memcached-Fast-0.27.tar.gz) = 88712
+TIMESTAMP = 1664768190
+SHA256 (Cache-Memcached-Fast-0.28.tar.gz) = 7c424c253b65ff62cf1577bb418802192a18805ea31fafc0a7ae589e446c89d2
+SIZE (Cache-Memcached-Fast-0.28.tar.gz) = 96175
diff --git a/databases/p5-Cache-Memcached-Fast/pkg-descr b/databases/p5-Cache-Memcached-Fast/pkg-descr
index 1ba29b989d21..11a1946bb01b 100644
--- a/databases/p5-Cache-Memcached-Fast/pkg-descr
+++ b/databases/p5-Cache-Memcached-Fast/pkg-descr
@@ -2,5 +2,3 @@ Cache::Memchached::Fast is a Perl client for memcached, a memory cache
 daemon.  Module core is implemented in C and tries hard to minimize
 number of system calls and to avoid any key/value copying for speed.
 As a result, it has very low CPU consumption.
-
-WWW: https://metacpan.org/release/Cache-Memcached-Fast
diff --git a/databases/p5-Cache-Memcached-Managed/Makefile b/databases/p5-Cache-Memcached-Managed/Makefile
index a12105b8f8ef..9780c020edc9 100644
--- a/databases/p5-Cache-Memcached-Managed/Makefile
+++ b/databases/p5-Cache-Memcached-Managed/Makefile
@@ -1,5 +1,3 @@
-# Created by: Lars Balker Rasmussen <lbr@FreeBSD.org>
-
 PORTNAME=	Cache-Memcached-Managed
 PORTVERSION=	0.26
 CATEGORIES=	databases perl5
@@ -8,6 +6,7 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Provide API for managing cached information
+WWW=		https://metacpan.org/release/Cache-Memcached-Managed
 
 LICENSE=	GPLv2 GPLv3
 LICENSE_COMB=	dual
diff --git a/databases/p5-Cache-Memcached-Managed/pkg-descr b/databases/p5-Cache-Memcached-Managed/pkg-descr
index a93a7054e73b..301a57eb0dd9 100644
--- a/databases/p5-Cache-Memcached-Managed/pkg-descr
+++ b/databases/p5-Cache-Memcached-Managed/pkg-descr
@@ -3,5 +3,3 @@ one or more memcached servers.  Apart from being very similar to the API
 of Cache::Memcached, the Cached::Memcached::Managed API allows for
 management of groups of values, for simplified key generation and expiration,
 as well as version and namespace management and a few other goodies.
-
-WWW: https://metacpan.org/release/Cache-Memcached-Managed
diff --git a/databases/p5-Cache-Memcached-XS/Makefile b/databases/p5-Cache-Memcached-XS/Makefile
index 53258d2ebce6..a2518fd9dfe6 100644
--- a/databases/p5-Cache-Memcached-XS/Makefile
+++ b/databases/p5-Cache-Memcached-XS/Makefile
@@ -1,5 +1,3 @@
-# Created by: Sergey Skvortsov <skv@protey.ru>
-
 PORTNAME=	Cache-Memcached-XS
 PORTVERSION=	0.01
 PORTREVISION=	3
@@ -9,6 +7,7 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Client library for memcached using libmemcache
+WWW=		https://metacpan.org/release/Cache-Memcached-XS
 
 LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
diff --git a/databases/p5-Cache-Memcached-XS/pkg-descr b/databases/p5-Cache-Memcached-XS/pkg-descr
index c29f44800f84..9e31e44b80d6 100644
--- a/databases/p5-Cache-Memcached-XS/pkg-descr
+++ b/databases/p5-Cache-Memcached-XS/pkg-descr
@@ -1,4 +1,2 @@
 Cache::Memcached::XS is a memcached client using libmemcache.  It uses a
 lot less CPU than the original pure-perl client.
-
-WWW: https://metacpan.org/release/Cache-Memcached-XS
diff --git a/databases/p5-Cache-Memcached-libmemcached/Makefile b/databases/p5-Cache-Memcached-libmemcached/Makefile
index 21c9a39c7081..79a07b8bd3cb 100644
--- a/databases/p5-Cache-Memcached-libmemcached/Makefile
+++ b/databases/p5-Cache-Memcached-libmemcached/Makefile
@@ -1,5 +1,3 @@
-# Created by: Dmitry Liakh <dliakh@ukr.net>
-
 PORTNAME=	Cache-Memcached-libmemcached
 PORTVERSION=	0.02011
 PORTREVISION=	2
@@ -10,6 +8,7 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	dliakh@ukr.net
 COMMENT=	Cache::Memcached compatible interface to libmemcached
+WWW=		https://metacpan.org/release/Cache-Memcached-libmemcached
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
 RUN_DEPENDS=	p5-Memcached-libmemcached>=0.42.01:databases/p5-Memcached-libmemcached \
diff --git a/databases/p5-Cache-Memcached-libmemcached/pkg-descr b/databases/p5-Cache-Memcached-libmemcached/pkg-descr
index c1adcdccbc96..40fb2ad94761 100644
--- a/databases/p5-Cache-Memcached-libmemcached/pkg-descr
+++ b/databases/p5-Cache-Memcached-libmemcached/pkg-descr
@@ -1,4 +1,2 @@
 This is the Cache::Memcached compatible interface to libmemcached, a C library
 to interface with memcached.
-
-WWW: https://metacpan.org/release/Cache-Memcached-libmemcached
diff --git a/databases/p5-Cache-Memcached/Makefile b/databases/p5-Cache-Memcached/Makefile
index ee7252b89625..4fba4bbab8ce 100644
--- a/databases/p5-Cache-Memcached/Makefile
+++ b/databases/p5-Cache-Memcached/Makefile
@@ -1,5 +1,3 @@
-# Created by: michael johnson <ahze@ahze.net>
-
 PORTNAME=	Cache-Memcached
 PORTVERSION=	1.30
 PORTREVISION=	1
@@ -10,6 +8,7 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl API for memcached, a distributed memory cache daemon
+WWW=		https://metacpan.org/release/Cache-Memcached
 
 LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
diff --git a/databases/p5-Cache-Memcached/pkg-descr b/databases/p5-Cache-Memcached/pkg-descr
index dbb28c7bf412..c1f79b72955d 100644
--- a/databases/p5-Cache-Memcached/pkg-descr
+++ b/databases/p5-Cache-Memcached/pkg-descr
@@ -3,5 +3,4 @@ The API takes advantage of the server's opaque flag support and sets its
 scalar. In that case, the Storable module is used to freeze and thaw the
 value automatically going in and out of the memcached.
 
-WWW: https://metacpan.org/release/Cache-Memcached
-WWW: http://www.danga.com/memcached/
+See also: https://www.danga.com/memcached/
diff --git a/databases/p5-Class-DBI-AbstractSearch/Makefile b/databases/p5-Class-DBI-AbstractSearch/Makefile
index 6fcf55769c91..fa41951945d1 100644
--- a/databases/p5-Class-DBI-AbstractSearch/Makefile
+++ b/databases/p5-Class-DBI-AbstractSearch/Makefile
@@ -1,5 +1,3 @@
-# Created by: Mathieu Arnold <m@absolight.net>
-
 PORTNAME=	Class-DBI-AbstractSearch
 PORTVERSION=	0.07
 PORTREVISION=	1
@@ -9,6 +7,7 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Abstract Class::DBI SQL with SQL::Abstract
+WWW=		https://metacpan.org/release/Class-DBI-AbstractSearch
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
 RUN_DEPENDS=	p5-Class-DBI>=0:databases/p5-Class-DBI \
diff --git a/databases/p5-Class-DBI-AbstractSearch/pkg-descr b/databases/p5-Class-DBI-AbstractSearch/pkg-descr
index 9add267f070f..9c4b68d3094b 100644
--- a/databases/p5-Class-DBI-AbstractSearch/pkg-descr
+++ b/databases/p5-Class-DBI-AbstractSearch/pkg-descr
@@ -1,4 +1,2 @@
 Class::DBI::AbstractSearch is a Class::DBI plugin to glue SQL::Abstract into
 Class::DBI.
-
-WWW: https://metacpan.org/release/Class-DBI-AbstractSearch
diff --git a/databases/p5-Class-DBI-AsForm/Makefile b/databases/p5-Class-DBI-AsForm/Makefile
index 8bced240f7fb..17009bc4e572 100644
--- a/databases/p5-Class-DBI-AsForm/Makefile
+++ b/databases/p5-Class-DBI-AsForm/Makefile
@@ -1,5 +1,3 @@
-# Created by: Lars Thegler <lars@thegler.dk>
-
 PORTNAME=	Class-DBI-AsForm
 PORTVERSION=	2.42
 PORTREVISION=	1
@@ -9,6 +7,7 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Produce HTML form elements for database columns
+WWW=		https://metacpan.org/release/Class-DBI-AsForm
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
 RUN_DEPENDS=	p5-Class-DBI>=0:databases/p5-Class-DBI \
diff --git a/databases/p5-Class-DBI-AsForm/pkg-descr b/databases/p5-Class-DBI-AsForm/pkg-descr
index 9a6f271ff72f..77dd5e599bfb 100644
--- a/databases/p5-Class-DBI-AsForm/pkg-descr
+++ b/databases/p5-Class-DBI-AsForm/pkg-descr
@@ -4,5 +4,3 @@ table to HTML form elements which fit the schema. Large text fields
 are turned into textareas, and fields with a has-a relationship to
 other Class::DBI tables are turned into select drop-downs populated
 with objects from the joined class.
-
-WWW: https://metacpan.org/release/Class-DBI-AsForm
diff --git a/databases/p5-Class-DBI-AutoLoader/Makefile b/databases/p5-Class-DBI-AutoLoader/Makefile
index 71652f5e0663..4a3aa6075f60 100644
--- a/databases/p5-Class-DBI-AutoLoader/Makefile
+++ b/databases/p5-Class-DBI-AutoLoader/Makefile
@@ -1,5 +1,3 @@
-# Created by: ijliao
-
 PORTNAME=	Class-DBI-AutoLoader
 PORTVERSION=	0.12
 PORTREVISION=	1
@@ -9,6 +7,7 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Generates Class::DBI subclasses dynamically
+WWW=		https://metacpan.org/release/Class-DBI-AutoLoader
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
 RUN_DEPENDS=	p5-Class-DBI>=0:databases/p5-Class-DBI \
diff --git a/databases/p5-Class-DBI-AutoLoader/pkg-descr b/databases/p5-Class-DBI-AutoLoader/pkg-descr
index 8a9347a0d9ad..691c5c23768b 100644
--- a/databases/p5-Class-DBI-AutoLoader/pkg-descr
+++ b/databases/p5-Class-DBI-AutoLoader/pkg-descr
@@ -1,5 +1,3 @@
 Class::DBI::AutoLoader scans the tables in a given database, and auto-generates
 the Class::DBI classes. These are loaded into your package when you import
 Class::DBI::AutoLoader.
-
-WWW: https://metacpan.org/release/Class-DBI-AutoLoader
diff --git a/databases/p5-Class-DBI-BaseDSN/Makefile b/databases/p5-Class-DBI-BaseDSN/Makefile
index 907614ca346f..38d2e51997ab 100644
--- a/databases/p5-Class-DBI-BaseDSN/Makefile
+++ b/databases/p5-Class-DBI-BaseDSN/Makefile
@@ -7,6 +7,7 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	DSN sensitive base class
+WWW=		https://metacpan.org/release/Class-DBI-BaseDSN
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
 RUN_DEPENDS=	p5-Class-DBI>=0:databases/p5-Class-DBI
diff --git a/databases/p5-Class-DBI-BaseDSN/pkg-descr b/databases/p5-Class-DBI-BaseDSN/pkg-descr
index f23ac21b066c..2e60707eeb4b 100644
--- a/databases/p5-Class-DBI-BaseDSN/pkg-descr
+++ b/databases/p5-Class-DBI-BaseDSN/pkg-descr
@@ -1,5 +1,3 @@
 Class::DBI::BaseDSN acts as a placeholder for a base class which will be
 switched for a specific Class::DBI extension when you specify the dsn of the
 database to connect to.
-
-WWW: https://metacpan.org/release/Class-DBI-BaseDSN
diff --git a/databases/p5-Class-DBI-DATA-Schema/Makefile b/databases/p5-Class-DBI-DATA-Schema/Makefile
index f19b47713c1a..1f85fdceb1e3 100644
--- a/databases/p5-Class-DBI-DATA-Schema/Makefile
+++ b/databases/p5-Class-DBI-DATA-Schema/Makefile
@@ -1,5 +1,3 @@
-# Created by: Lars Thegler <lth@FreeBSD.org>
-
 PORTNAME=	Class-DBI-DATA-Schema
 PORTVERSION=	1.00
 PORTREVISION=	1
@@ -9,6 +7,7 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Execute Class::DBI SQL from DATA sections
+WWW=		https://metacpan.org/release/Class-DBI-DATA-Schema
 
 BUILD_DEPENDS=	${RUN_DEPENDS} \
 		p5-Test-Simple>=0:devel/p5-Test-Simple
diff --git a/databases/p5-Class-DBI-DATA-Schema/pkg-descr b/databases/p5-Class-DBI-DATA-Schema/pkg-descr
index 433060b72433..3320a6640697 100644
--- a/databases/p5-Class-DBI-DATA-Schema/pkg-descr
+++ b/databases/p5-Class-DBI-DATA-Schema/pkg-descr
@@ -1,5 +1,3 @@
 This is an extension to Class::DBI which injects a method into your
 class to find and execute all SQL statements in the DATA section
 of the package.
-
-WWW: https://metacpan.org/release/Class-DBI-DATA-Schema
diff --git a/databases/p5-Class-DBI-DDL/Makefile b/databases/p5-Class-DBI-DDL/Makefile
index 197f13a1f77f..5438e11cbae7 100644
--- a/databases/p5-Class-DBI-DDL/Makefile
+++ b/databases/p5-Class-DBI-DDL/Makefile
@@ -1,5 +1,3 @@
-# Created by: Daniel Wijnands <daniel@itxl.nl>
-
 PORTNAME=	Class-DBI-DDL
 PORTVERSION=	1.02
 PORTREVISION=	1
@@ -9,6 +7,7 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	DDL for Class-DBI
+WWW=		https://metacpan.org/release/Class-DBI-DDL
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
 RUN_DEPENDS=	p5-Class-DBI>=0:databases/p5-Class-DBI
diff --git a/databases/p5-Class-DBI-DDL/pkg-descr b/databases/p5-Class-DBI-DDL/pkg-descr
index 2fbff67af7fe..f7d26ff2aa0b 100644
--- a/databases/p5-Class-DBI-DDL/pkg-descr
+++ b/databases/p5-Class-DBI-DDL/pkg-descr
@@ -1,3 +1 @@
 Combined with Class::DBI to create and dispose of tables
-
-WWW: https://metacpan.org/release/Class-DBI-DDL
diff --git a/databases/p5-Class-DBI-FromCGI/Makefile b/databases/p5-Class-DBI-FromCGI/Makefile
index b9fc916500f8..ef60b636ab81 100644
--- a/databases/p5-Class-DBI-FromCGI/Makefile
+++ b/databases/p5-Class-DBI-FromCGI/Makefile
@@ -7,6 +7,7 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Update Class::DBI data using CGI::Untaint
+WWW=		https://metacpan.org/release/Class-DBI-FromCGI
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
 RUN_DEPENDS=	p5-Class-DBI>=0:databases/p5-Class-DBI \
diff --git a/databases/p5-Class-DBI-FromCGI/pkg-descr b/databases/p5-Class-DBI-FromCGI/pkg-descr
index f0f79bd9ebd1..ded2e1b9b5f0 100644
--- a/databases/p5-Class-DBI-FromCGI/pkg-descr
+++ b/databases/p5-Class-DBI-FromCGI/pkg-descr
@@ -14,5 +14,3 @@ It so happens that CGI::Untaint also plays well with Class::DBI. All you need
 to do is to 'use Class::DBI::FromCGI' in your class (or in your local
 Class::DBI subclass that all your other classes inherit from. You do do that,
 don't you?).
-
-WWW: https://metacpan.org/release/Class-DBI-FromCGI
diff --git a/databases/p5-Class-DBI-LazyInflate/Makefile b/databases/p5-Class-DBI-LazyInflate/Makefile
index e719ace8e3e1..64c6b434088d 100644
--- a/databases/p5-Class-DBI-LazyInflate/Makefile
+++ b/databases/p5-Class-DBI-LazyInflate/Makefile
@@ -1,5 +1,3 @@
-# Created by: Lars Thegler <lth@FreeBSD.org>
-
 PORTNAME=	Class-DBI-LazyInflate
 PORTVERSION=	0.06
 PORTREVISION=	1
@@ -9,6 +7,7 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Defer inflating of columns until they are used
+WWW=		https://metacpan.org/release/Class-DBI-LazyInflate
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
 RUN_DEPENDS=	p5-Data-Lazy>=0:devel/p5-Data-Lazy \
diff --git a/databases/p5-Class-DBI-LazyInflate/pkg-descr b/databases/p5-Class-DBI-LazyInflate/pkg-descr
index 8edcdbd58186..4cd588ae146c 100644
--- a/databases/p5-Class-DBI-LazyInflate/pkg-descr
+++ b/databases/p5-Class-DBI-LazyInflate/pkg-descr
@@ -3,5 +3,3 @@ DBI columns that only inflate to an object when it is required.
 When a row is fetched, columns specified via has_lazy() is wrapped
 by Data::Lazy, such that it is inflated only when the column is
 actually used.
-
-WWW: https://metacpan.org/release/Class-DBI-LazyInflate
diff --git a/databases/p5-Class-DBI-Loader-Relationship/Makefile b/databases/p5-Class-DBI-Loader-Relationship/Makefile
index d0a630198827..a22497cea421 100644
--- a/databases/p5-Class-DBI-Loader-Relationship/Makefile
+++ b/databases/p5-Class-DBI-Loader-Relationship/Makefile
@@ -1,5 +1,3 @@
-# Created by: Lars Thegler <lars@thegler.dk>
-
 PORTNAME=	Class-DBI-Loader-Relationship
 PORTVERSION=	1.3
 PORTREVISION=	1
@@ -10,6 +8,7 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Easier relationship specification in CDBI::L
+WWW=		https://metacpan.org/release/Class-DBI-Loader-Relationship
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
 RUN_DEPENDS=	p5-Class-DBI-Loader>=0:databases/p5-Class-DBI-Loader \
diff --git a/databases/p5-Class-DBI-Loader-Relationship/pkg-descr b/databases/p5-Class-DBI-Loader-Relationship/pkg-descr
index d391312a5481..17ae77c55259 100644
--- a/databases/p5-Class-DBI-Loader-Relationship/pkg-descr
+++ b/databases/p5-Class-DBI-Loader-Relationship/pkg-descr
@@ -5,5 +5,3 @@ the names.  In addition, it is common (but not universal) to want
 reverse relationships defined for has-many relationships, and for
 has-a relationships to be defined for the linkages surrounding a
 many-to-many table.
-
-WWW: https://metacpan.org/release/Class-DBI-Loader-Relationship
diff --git a/databases/p5-Class-DBI-Loader/Makefile b/databases/p5-Class-DBI-Loader/Makefile
index 3b71650c24bb..4ccbd8587560 100644
--- a/databases/p5-Class-DBI-Loader/Makefile
+++ b/databases/p5-Class-DBI-Loader/Makefile
@@ -8,6 +8,7 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Dynamic definition of Class::DBI sub classes
+WWW=		https://metacpan.org/release/Class-DBI-Loader
 
 LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
diff --git a/databases/p5-Class-DBI-Loader/pkg-descr b/databases/p5-Class-DBI-Loader/pkg-descr
index 3b0fe74b6af6..a88579f50006 100644
--- a/databases/p5-Class-DBI-Loader/pkg-descr
+++ b/databases/p5-Class-DBI-Loader/pkg-descr
@@ -11,5 +11,3 @@ class names are defined by table names and namespace option.
 +-----------+-----------+-----------+
 
 Class::DBI::Loader supports MySQL, Postgres and SQLite.
-
-WWW: https://metacpan.org/release/Class-DBI-Loader
diff --git a/databases/p5-Class-DBI-Oracle/Makefile b/databases/p5-Class-DBI-Oracle/Makefile
index 852ce761e89f..3ca705b82147 100644
--- a/databases/p5-Class-DBI-Oracle/Makefile
+++ b/databases/p5-Class-DBI-Oracle/Makefile
@@ -7,6 +7,7 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Extensions to Class::DBI for Oracle
+WWW=		https://metacpan.org/release/Class-DBI-Oracle
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
 RUN_DEPENDS=	p5-Class-DBI>=0:databases/p5-Class-DBI
diff --git a/databases/p5-Class-DBI-Oracle/pkg-descr b/databases/p5-Class-DBI-Oracle/pkg-descr
index 63af27d68268..ae1dffba3147 100644
--- a/databases/p5-Class-DBI-Oracle/pkg-descr
+++ b/databases/p5-Class-DBI-Oracle/pkg-descr
@@ -7,5 +7,3 @@ This is an extension to Class::DBI that currently implements:
 * Proper aliasing of reserved words.
 
 Instead of setting Class::DBI as your base class, use this.
-
-WWW: https://metacpan.org/release/Class-DBI-Oracle
diff --git a/databases/p5-Class-DBI-Pager/Makefile b/databases/p5-Class-DBI-Pager/Makefile
index 2cfcb1d37a45..c85fdabbf5b4 100644
--- a/databases/p5-Class-DBI-Pager/Makefile
+++ b/databases/p5-Class-DBI-Pager/Makefile
@@ -1,5 +1,3 @@
-# Created by: Mathieu Arnold <m@absolight.net>
-
 PORTNAME=	Class-DBI-Pager
 PORTVERSION=	0.08
 PORTREVISION=	1
@@ -9,6 +7,7 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Pager utility for Class::DBI
+WWW=		https://metacpan.org/release/Class-DBI-Pager
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
 RUN_DEPENDS=	p5-Class-DBI>=0:databases/p5-Class-DBI \
diff --git a/databases/p5-Class-DBI-Pager/pkg-descr b/databases/p5-Class-DBI-Pager/pkg-descr
index c2b806ab965f..c759dd82f176 100644
--- a/databases/p5-Class-DBI-Pager/pkg-descr
+++ b/databases/p5-Class-DBI-Pager/pkg-descr
@@ -7,5 +7,3 @@ do something like:
 
 In addition, your work will be reduced more, when you use Template-Toolkit as
 your templating engine
-
-WWW: https://metacpan.org/release/Class-DBI-Pager
diff --git a/databases/p5-Class-DBI-Pg/Makefile b/databases/p5-Class-DBI-Pg/Makefile
index 8192a692fde8..c2808b69df30 100644
--- a/databases/p5-Class-DBI-Pg/Makefile
+++ b/databases/p5-Class-DBI-Pg/Makefile
@@ -1,5 +1,3 @@
-# Created by: Mathieu Arnold <m@absolight.net>
-
 PORTNAME=	Class-DBI-Pg
 PORTVERSION=	0.09
 PORTREVISION=	4
@@ -9,6 +7,7 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Extensions to Class::DBI for PostgreSQL
+WWW=		https://metacpan.org/release/Class-DBI-Pg
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
 RUN_DEPENDS=	p5-Class-DBI>=0:databases/p5-Class-DBI \
diff --git a/databases/p5-Class-DBI-Pg/pkg-descr b/databases/p5-Class-DBI-Pg/pkg-descr
index 318da875d525..0eb51dcd98d3 100644
--- a/databases/p5-Class-DBI-Pg/pkg-descr
+++ b/databases/p5-Class-DBI-Pg/pkg-descr
@@ -3,5 +3,3 @@ Postgres.
 
 select Postgres system catalog and find out all columns, primary key and SERIAL
 type column.
-
-WWW: https://metacpan.org/release/Class-DBI-Pg
diff --git a/databases/p5-Class-DBI-Plugin-AbstractCount/Makefile b/databases/p5-Class-DBI-Plugin-AbstractCount/Makefile
index 4cef7a80c085..d1a26d16f19e 100644
--- a/databases/p5-Class-DBI-Plugin-AbstractCount/Makefile
+++ b/databases/p5-Class-DBI-Plugin-AbstractCount/Makefile
@@ -1,5 +1,3 @@
-# Created by: Lars Thegler <lth@FreeBSD.org>
-
 PORTNAME=	Class-DBI-Plugin-AbstractCount
 PORTVERSION=	0.08
 PORTREVISION=	1
@@ -9,6 +7,7 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Get COUNT(*) results with abstract SQL
+WWW=		https://metacpan.org/release/Class-DBI-Plugin-AbstractCount
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
 RUN_DEPENDS=	p5-Class-DBI-Plugin>=0.02:databases/p5-Class-DBI-Plugin \
diff --git a/databases/p5-Class-DBI-Plugin-AbstractCount/pkg-descr b/databases/p5-Class-DBI-Plugin-AbstractCount/pkg-descr
index dd67c0dcf00d..d4a3b3ed9f03 100644
--- a/databases/p5-Class-DBI-Plugin-AbstractCount/pkg-descr
+++ b/databases/p5-Class-DBI-Plugin-AbstractCount/pkg-descr
@@ -2,5 +2,3 @@ This Class::DBI plugin combines the functionality from
 Class::DBI::Plugin::CountSearch (counting objects without having
 to use an array or an iterator), and Class::DBI::AbstractSearch,
 which allows complex where-clauses a la SQL::Abstract.
-
-WWW: https://metacpan.org/release/Class-DBI-Plugin-AbstractCount
diff --git a/databases/p5-Class-DBI-Plugin-DeepAbstractSearch/Makefile b/databases/p5-Class-DBI-Plugin-DeepAbstractSearch/Makefile
index 0e6dd47b9182..c1f5356fa536 100644
--- a/databases/p5-Class-DBI-Plugin-DeepAbstractSearch/Makefile
+++ b/databases/p5-Class-DBI-Plugin-DeepAbstractSearch/Makefile
@@ -1,5 +1,3 @@
-# Created by: milki <milki@rescomp.berkeley.edy>
-
 PORTNAME=	Class-DBI-Plugin-DeepAbstractSearch
 PORTVERSION=	0.08
 PORTREVISION=	1
@@ -10,6 +8,7 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Provides deep_search_where() for Class::DBI
+WWW=		https://metacpan.org/release/Class-DBI-Plugin-DeepAbstractSearch
 
 LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
diff --git a/databases/p5-Class-DBI-Plugin-DeepAbstractSearch/pkg-descr b/databases/p5-Class-DBI-Plugin-DeepAbstractSearch/pkg-descr
index 4870018106f0..2fb1d8ee332c 100644
--- a/databases/p5-Class-DBI-Plugin-DeepAbstractSearch/pkg-descr
+++ b/databases/p5-Class-DBI-Plugin-DeepAbstractSearch/pkg-descr
@@ -1,5 +1,3 @@
 This plugin provides a SQL::Abstract search method for Class::DBI. It is
 similar to Class::DBI::AbstractSearch, but allows you to search and sort
 by fields from joined tables.
-
-WWW: https://metacpan.org/release/Class-DBI-Plugin-DeepAbstractSearch
diff --git a/databases/p5-Class-DBI-Plugin-Iterator/Makefile b/databases/p5-Class-DBI-Plugin-Iterator/Makefile
index 061be90bdf78..2fc4815d0669 100644
--- a/databases/p5-Class-DBI-Plugin-Iterator/Makefile
+++ b/databases/p5-Class-DBI-Plugin-Iterator/Makefile
@@ -5,8 +5,9 @@ CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	New iterator for p5-Class-DBI
+WWW=		https://metacpan.org/release/Class-DBI-Plugin-Iterator
 
 BUILD_DEPENDS=	p5-Class-DBI>=0:databases/p5-Class-DBI
 TEST_DEPENDS=	p5-DBD-SQLite>=1.27:databases/p5-DBD-SQLite \
diff --git a/databases/p5-Class-DBI-Plugin-Iterator/pkg-descr b/databases/p5-Class-DBI-Plugin-Iterator/pkg-descr
index d4b772d08c5b..4f31f15d3ff6 100644
--- a/databases/p5-Class-DBI-Plugin-Iterator/pkg-descr
+++ b/databases/p5-Class-DBI-Plugin-Iterator/pkg-descr
@@ -1,3 +1 @@
 New iterator for Class::DBI.
-
-WWW: https://metacpan.org/release/Class-DBI-Plugin-Iterator
diff --git a/databases/p5-Class-DBI-Plugin-Pager/Makefile b/databases/p5-Class-DBI-Plugin-Pager/Makefile
index 441c2980fc44..6c43dcc930fe 100644
--- a/databases/p5-Class-DBI-Plugin-Pager/Makefile
+++ b/databases/p5-Class-DBI-Plugin-Pager/Makefile
@@ -5,8 +5,9 @@ CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension to paged queries for CDBI
+WWW=		https://metacpan.org/release/Class-DBI-Plugin-Pager
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
 RUN_DEPENDS=	p5-Class-DBI>=0:databases/p5-Class-DBI \
diff --git a/databases/p5-Class-DBI-Plugin-Pager/pkg-descr b/databases/p5-Class-DBI-Plugin-Pager/pkg-descr
index 471d26dc4a5b..ca0f2eafbacb 100644
--- a/databases/p5-Class-DBI-Plugin-Pager/pkg-descr
+++ b/databases/p5-Class-DBI-Plugin-Pager/pkg-descr
@@ -3,5 +3,3 @@ Perl extension to paged queries for CDBI.
 Adds a pager method to your class that can query using SQL::Abstract
 where clauses, and limit the number of rows returned to a specific
 subset.
-
-WWW: https://metacpan.org/release/Class-DBI-Plugin-Pager
diff --git a/databases/p5-Class-DBI-Plugin-RetrieveAll/Makefile b/databases/p5-Class-DBI-Plugin-RetrieveAll/Makefile
index 774c0716c06f..791fe949a7a7 100644
--- a/databases/p5-Class-DBI-Plugin-RetrieveAll/Makefile
+++ b/databases/p5-Class-DBI-Plugin-RetrieveAll/Makefile
@@ -1,5 +1,3 @@
-# Created by: Lars Thegler <lars@thegler.dk>
-
 PORTNAME=	Class-DBI-Plugin-RetrieveAll
 PORTVERSION=	1.04
 PORTREVISION=	1
@@ -9,6 +7,7 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	More complex retrieve_all() for Class::DBI
+WWW=		https://metacpan.org/release/Class-DBI-Plugin-RetrieveAll
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
 RUN_DEPENDS=	p5-Class-DBI>=0:databases/p5-Class-DBI
diff --git a/databases/p5-Class-DBI-Plugin-RetrieveAll/pkg-descr b/databases/p5-Class-DBI-Plugin-RetrieveAll/pkg-descr
index cf357db74c56..0cc9a9e014de 100644
--- a/databases/p5-Class-DBI-Plugin-RetrieveAll/pkg-descr
+++ b/databases/p5-Class-DBI-Plugin-RetrieveAll/pkg-descr
@@ -1,4 +1,2 @@
 This is a simple plugin to a Class::DBI subclass which provides a
 'retrieve_all_sorted_by' method.
-
-WWW: https://metacpan.org/release/Class-DBI-Plugin-RetrieveAll
diff --git a/databases/p5-Class-DBI-Plugin-Senna/Makefile b/databases/p5-Class-DBI-Plugin-Senna/Makefile
index 68b5e0525109..71e54888ad27 100644
--- a/databases/p5-Class-DBI-Plugin-Senna/Makefile
+++ b/databases/p5-Class-DBI-Plugin-Senna/Makefile
@@ -1,12 +1,13 @@
 PORTNAME=	Class-DBI-Plugin-Senna
 PORTVERSION=	0.01
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Add Instant Fulltext Search Capability With Senna to Class::DBI
+WWW=		https://metacpan.org/release/Class-DBI-Plugin-Senna
 
 BUILD_DEPENDS=	p5-Class-DBI>=0:databases/p5-Class-DBI \
 	p5-Senna>=0:textproc/p5-Senna
diff --git a/databases/p5-Class-DBI-Plugin-Senna/pkg-descr b/databases/p5-Class-DBI-Plugin-Senna/pkg-descr
index 624da06f7bb6..2ab9d003afb0 100644
--- a/databases/p5-Class-DBI-Plugin-Senna/pkg-descr
+++ b/databases/p5-Class-DBI-Plugin-Senna/pkg-descr
@@ -3,5 +3,3 @@ Class::DBI::Plugin::Senna harnesses the power of Senna
 
 This module installs hooks in your Class::DBI package that automatically
 creates and updates a Senna index.
-
-WWW: https://metacpan.org/release/Class-DBI-Plugin-Senna
diff --git a/databases/p5-Class-DBI-Plugin-Type/Makefile b/databases/p5-Class-DBI-Plugin-Type/Makefile
index 2efcc5114b3e..03ac0cc4a489 100644
--- a/databases/p5-Class-DBI-Plugin-Type/Makefile
+++ b/databases/p5-Class-DBI-Plugin-Type/Makefile
@@ -1,5 +1,3 @@
-# Created by: Lars Thegler <lars@thegler.dk>
-
 PORTNAME=	Class-DBI-Plugin-Type
 PORTVERSION=	0.02
 PORTREVISION=	1
@@ -9,6 +7,7 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Determine type information for columns
+WWW=		https://metacpan.org/release/Class-DBI-Plugin-Type
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
 RUN_DEPENDS=	p5-Class-DBI>=0:databases/p5-Class-DBI
diff --git a/databases/p5-Class-DBI-Plugin-Type/pkg-descr b/databases/p5-Class-DBI-Plugin-Type/pkg-descr
index 505444e491d3..d5b4ad634d20 100644
--- a/databases/p5-Class-DBI-Plugin-Type/pkg-descr
+++ b/databases/p5-Class-DBI-Plugin-Type/pkg-descr
@@ -1,4 +1,2 @@
 This module allows Class::DBI-based classes to query their columns
 for data type information in a database-independent manner.
-
-WWW: https://metacpan.org/release/Class-DBI-Plugin-Type
diff --git a/databases/p5-Class-DBI-Plugin/Makefile b/databases/p5-Class-DBI-Plugin/Makefile
index 31bd94163e2e..4f6afd053195 100644
--- a/databases/p5-Class-DBI-Plugin/Makefile
+++ b/databases/p5-Class-DBI-Plugin/Makefile
@@ -1,5 +1,3 @@
-# Created by: Lars Thegler <lth@FreeBSD.org>
-
 PORTNAME=	Class-DBI-Plugin
 PORTVERSION=	0.03
 PORTREVISION=	1
@@ -9,6 +7,7 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Abstract base class for Class::DBI plugins
+WWW=		https://metacpan.org/release/Class-DBI-Plugin
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
 RUN_DEPENDS=	p5-Class-DBI>=0:databases/p5-Class-DBI
diff --git a/databases/p5-Class-DBI-Plugin/pkg-descr b/databases/p5-Class-DBI-Plugin/pkg-descr
index e952cadffd37..1a7160982b3d 100644
--- a/databases/p5-Class-DBI-Plugin/pkg-descr
+++ b/databases/p5-Class-DBI-Plugin/pkg-descr
@@ -3,5 +3,3 @@ Its purpose is to make writing plugins easier. Writers of plugins
 should be able to concentrate on the functionality their module
 provides, instead of having to deal with the symbol table hackery
 involved when writing a plugin module.
-
-WWW: https://metacpan.org/release/Class-DBI-Plugin
diff --git a/databases/p5-Class-DBI-Replication/Makefile b/databases/p5-Class-DBI-Replication/Makefile
index 831b36a089b0..1f59d37d6870 100644
--- a/databases/p5-Class-DBI-Replication/Makefile
+++ b/databases/p5-Class-DBI-Replication/Makefile
@@ -1,5 +1,3 @@
-# Created by: Mathieu Arnold <m@absolight.net>
-
 PORTNAME=	Class-DBI-Replication
 PORTVERSION=	0.01
 PORTREVISION=	1
@@ -9,6 +7,7 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Class::DBI for replicated database
+WWW=		https://metacpan.org/release/Class-DBI-Replication
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
 RUN_DEPENDS=	p5-Class-DBI>=0:databases/p5-Class-DBI
diff --git a/databases/p5-Class-DBI-Replication/pkg-descr b/databases/p5-Class-DBI-Replication/pkg-descr
index d2c5729520fd..9e2b775d624e 100644
--- a/databases/p5-Class-DBI-Replication/pkg-descr
+++ b/databases/p5-Class-DBI-Replication/pkg-descr
@@ -2,5 +2,3 @@ Classs::DBI::Replication extends Class::DBI's persistence for replicated
 databases.
 
 The idea is very simple. SELECT from slaves, INSERT/UPDATE/DELETE to master.
-
-WWW: https://metacpan.org/release/Class-DBI-Replication
diff --git a/databases/p5-Class-DBI-SAK/Makefile b/databases/p5-Class-DBI-SAK/Makefile
index a3c7894ace7d..db245b5d7dc6 100644
--- a/databases/p5-Class-DBI-SAK/Makefile
+++ b/databases/p5-Class-DBI-SAK/Makefile
@@ -1,5 +1,3 @@
-# Created by: Mathieu Arnold <m@absolight.net>
-
 PORTNAME=	Class-DBI-SAK
 PORTVERSION=	1.4
 PORTREVISION=	1
@@ -9,6 +7,7 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Class::DBI Swiss Army Knife (SAK)
+WWW=		https://metacpan.org/release/Class-DBI-SAK
 
 BUILD_DEPENDS=	${RUN_DEPENDS} \
 		p5-mixin>=0:devel/p5-mixin
diff --git a/databases/p5-Class-DBI-SAK/pkg-descr b/databases/p5-Class-DBI-SAK/pkg-descr
index 41caf97e910a..ef5a2be3eb91 100644
--- a/databases/p5-Class-DBI-SAK/pkg-descr
+++ b/databases/p5-Class-DBI-SAK/pkg-descr
@@ -2,5 +2,3 @@ By taking the busy work out of using Class::DBI as you see fit, your code
 becomes more useful by size. Most of us end up using at least a couple
 Class::DBI extensions in our programs, and it's just a pain. Enter the Swiss
 Army Knife.
-
-WWW: https://metacpan.org/release/Class-DBI-SAK
diff --git a/databases/p5-Class-DBI-SQLite/Makefile b/databases/p5-Class-DBI-SQLite/Makefile
index 7d6bee46bd4e..10e3de41d414 100644
--- a/databases/p5-Class-DBI-SQLite/Makefile
+++ b/databases/p5-Class-DBI-SQLite/Makefile
@@ -1,5 +1,3 @@
-# Created by: Mathieu Arnold <m@absolight.net>
-
 PORTNAME=	Class-DBI-SQLite
 PORTVERSION=	0.11
 PORTREVISION=	2
@@ -9,6 +7,7 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Extension to Class::DBI for sqlite
+WWW=		https://metacpan.org/release/Class-DBI-SQLite
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
 RUN_DEPENDS=	p5-Ima-DBI>=0:databases/p5-Ima-DBI \
diff --git a/databases/p5-Class-DBI-SQLite/pkg-descr b/databases/p5-Class-DBI-SQLite/pkg-descr
index 254e2beedc6d..8190f2407caa 100644
--- a/databases/p5-Class-DBI-SQLite/pkg-descr
+++ b/databases/p5-Class-DBI-SQLite/pkg-descr
@@ -1,4 +1,2 @@
 Class::DBI::SQLite is an extension to Class::DBI for DBD::SQLite, which allows
 you to populate auto incremented row id after insert.
-
-WWW: https://metacpan.org/release/Class-DBI-SQLite
diff --git a/databases/p5-Class-DBI-Sweet/Makefile b/databases/p5-Class-DBI-Sweet/Makefile
index 9ca7b201238b..ec5500f36dbe 100644
--- a/databases/p5-Class-DBI-Sweet/Makefile
+++ b/databases/p5-Class-DBI-Sweet/Makefile
@@ -1,5 +1,3 @@
-# Created by: Lars Balker Rasmussen <lbr@FreeBSD.org
-
 PORTNAME=	Class-DBI-Sweet
 PORTVERSION=	0.11
 PORTREVISION=	1
@@ -9,6 +7,7 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Extra sweet features for Class::DBI
+WWW=		https://metacpan.org/release/Class-DBI-Sweet
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
 RUN_DEPENDS=	p5-Class-DBI>=3.0.12:databases/p5-Class-DBI \
diff --git a/databases/p5-Class-DBI-Sweet/pkg-descr b/databases/p5-Class-DBI-Sweet/pkg-descr
index 90bed370b861..32cd25b5a678 100644
--- a/databases/p5-Class-DBI-Sweet/pkg-descr
+++ b/databases/p5-Class-DBI-Sweet/pkg-descr
@@ -1,5 +1,3 @@
 Class::DBI::Sweet provides convenient count, search, page, and cache
 functions in a sweet package. It integrates these functions with
 "Class::DBI" in a convenient and efficient way.
-
-WWW: https://metacpan.org/release/Class-DBI-Sweet
diff --git a/databases/p5-Class-DBI-ToSax/Makefile b/databases/p5-Class-DBI-ToSax/Makefile
index 1aaa4fab8d19..2c8cc8467d42 100644
--- a/databases/p5-Class-DBI-ToSax/Makefile
+++ b/databases/p5-Class-DBI-ToSax/Makefile
@@ -7,6 +7,7 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Extension to Class::DBI for sqlite
+WWW=		https://metacpan.org/release/Class-DBI-ToSax
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
 RUN_DEPENDS=	p5-Class-DBI>=0:databases/p5-Class-DBI \
diff --git a/databases/p5-Class-DBI-ToSax/pkg-descr b/databases/p5-Class-DBI-ToSax/pkg-descr
index f7d52a28591d..b459442f27d3 100644
--- a/databases/p5-Class-DBI-ToSax/pkg-descr
+++ b/databases/p5-Class-DBI-ToSax/pkg-descr
@@ -1,3 +1 @@
-
-
-WWW: https://metacpan.org/release/Class-DBI-ToSax
+Turn database objects to SAX events.
diff --git a/databases/p5-Class-DBI-Untaint/Makefile b/databases/p5-Class-DBI-Untaint/Makefile
index 5b2a8430d26a..b771a52f39c2 100644
--- a/databases/p5-Class-DBI-Untaint/Makefile
+++ b/databases/p5-Class-DBI-Untaint/Makefile
@@ -1,5 +1,3 @@
-# Created by: Lars Thegler <lars@thegler.dk>
-
 PORTNAME=	Class-DBI-Untaint
 PORTVERSION=	1.00
 PORTREVISION=	1
@@ -9,6 +7,7 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Class::DBI constraints using CGI::Untaint
+WWW=		https://metacpan.org/release/Class-DBI-Untaint
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
 RUN_DEPENDS=	p5-Class-DBI>=0:databases/p5-Class-DBI \
diff --git a/databases/p5-Class-DBI-Untaint/pkg-descr b/databases/p5-Class-DBI-Untaint/pkg-descr
index 6012b3fd7edf..6bb1a4c4c8d1 100644
--- a/databases/p5-Class-DBI-Untaint/pkg-descr
+++ b/databases/p5-Class-DBI-Untaint/pkg-descr
@@ -4,5 +4,3 @@ that uses CGI::Untaint.
 Any column can then be said to require untainting of a given type
 - i.e. that any value which you attempted to set that column to
 (include at create() time) must pass an untaint as_type() check.
-
-WWW: https://metacpan.org/release/Class-DBI-Untaint
diff --git a/databases/p5-Class-DBI-mysql/Makefile b/databases/p5-Class-DBI-mysql/Makefile
index 2a43473bd21e..81cb5f360027 100644
--- a/databases/p5-Class-DBI-mysql/Makefile
+++ b/databases/p5-Class-DBI-mysql/Makefile
@@ -1,20 +1,19 @@
-# Created by: andrew@scoop.co.nz
-
 PORTNAME=	Class-DBI-mysql
 PORTVERSION=	1.00
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Extensions to Class::DBI for MySQL
+WWW=		https://metacpan.org/release/Class-DBI-mysql
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
 RUN_DEPENDS=	p5-Class-DBI>=0:databases/p5-Class-DBI \
-		p5-DBD-mysql>=0:databases/p5-DBD-mysql
+		${DBD_MYSQL}
 
-USES=		perl5
+USES=		mysql perl5
 USE_PERL5=	configure
 
 .include <bsd.port.mk>
diff --git a/databases/p5-Class-DBI-mysql/pkg-descr b/databases/p5-Class-DBI-mysql/pkg-descr
index 3c8f7dd56ca5..e94070243e83 100644
--- a/databases/p5-Class-DBI-mysql/pkg-descr
+++ b/databases/p5-Class-DBI-mysql/pkg-descr
@@ -1,5 +1,3 @@
 This is an extension to Class::DBI, containing several functions and
 optimisations for the MySQL database. Instead of setting Class::DBI as
 your base class, use this instead.
-
-WWW: https://metacpan.org/release/Class-DBI-mysql
diff --git a/databases/p5-Class-DBI/Makefile b/databases/p5-Class-DBI/Makefile
index 70af4409f3e8..5083d0bad8d6 100644
--- a/databases/p5-Class-DBI/Makefile
+++ b/databases/p5-Class-DBI/Makefile
@@ -1,5 +1,3 @@
-# Created by: Sergey Skvortsov <skv@FreeBSD.org>
-
 PORTNAME=	Class-DBI
 PORTVERSION=	3.0.17
 DISTVERSIONPREFIX=	v
@@ -10,6 +8,7 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Simple Database Abstraction
+WWW=		https://metacpan.org/release/Class-DBI
 
 LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
diff --git a/databases/p5-Class-DBI/pkg-descr b/databases/p5-Class-DBI/pkg-descr
index 88c0e0c2d46a..ab652bcc3524 100644
--- a/databases/p5-Class-DBI/pkg-descr
+++ b/databases/p5-Class-DBI/pkg-descr
@@ -9,5 +9,3 @@ This is particularly useful when using a database which doesn't support
 these (such as MySQL), or when you would like your code to be portable
 across multiple databases which might implement these things in
 different ways.
-
-WWW: https://metacpan.org/release/Class-DBI
diff --git a/databases/p5-Class-Inflate/Makefile b/databases/p5-Class-Inflate/Makefile
index d19b5e6e8a62..e60a0dd45e84 100644
--- a/databases/p5-Class-Inflate/Makefile
+++ b/databases/p5-Class-Inflate/Makefile
@@ -1,5 +1,3 @@
-# Created by: Gea-Suan Lin <gslin@gslin.org>
-
 PORTNAME=	Class-Inflate
 PORTVERSION=	0.07
 PORTREVISION=	1
@@ -9,6 +7,7 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Inflate HASH Object from Values in Database
+WWW=		https://metacpan.org/release/Class-Inflate
 
 BUILD_DEPENDS=	${RUN_DEPENDS} \
 		p5-DBD-SQLite>=0:databases/p5-DBD-SQLite \
diff --git a/databases/p5-Class-Inflate/pkg-descr b/databases/p5-Class-Inflate/pkg-descr
index af279a392f22..3db7d0bfb5fa 100644
--- a/databases/p5-Class-Inflate/pkg-descr
+++ b/databases/p5-Class-Inflate/pkg-descr
@@ -1,4 +1,2 @@
 Allows for any blessed HASH object to be populated from a database, by
 describing table relationships to each method.
-
-WWW: https://metacpan.org/release/Class-Inflate
diff --git a/databases/p5-CouchDB-View/Makefile b/databases/p5-CouchDB-View/Makefile
index 7377157218be..f012c851f8b8 100644
--- a/databases/p5-CouchDB-View/Makefile
+++ b/databases/p5-CouchDB-View/Makefile
@@ -1,5 +1,3 @@
-# Created by: Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>
-
 PORTNAME=	CouchDB-View
 PORTVERSION=	0.003
 PORTREVISION=	1
@@ -9,6 +7,7 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Handle and create CouchDB views in Perl
+WWW=		https://metacpan.org/release/CouchDB-View
 
 LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
diff --git a/databases/p5-CouchDB-View/pkg-descr b/databases/p5-CouchDB-View/pkg-descr
index 89f7f1fdc299..486b5c12a43b 100644
--- a/databases/p5-CouchDB-View/pkg-descr
+++ b/databases/p5-CouchDB-View/pkg-descr
@@ -1,3 +1 @@
 CouchDB::View is a Perl module to handle and create CouchDB views.
-
-WWW: https://metacpan.org/release/CouchDB-View
diff --git a/databases/p5-DBD-AnyData/Makefile b/databases/p5-DBD-AnyData/Makefile
index db575f1c3309..1192acd13457 100644
--- a/databases/p5-DBD-AnyData/Makefile
+++ b/databases/p5-DBD-AnyData/Makefile
@@ -1,5 +1,3 @@
-# Created by: ijlioa
-
 PORTNAME=	DBD-AnyData
 PORTVERSION=	0.110
 PORTREVISION=	1
@@ -9,6 +7,7 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	DBI access to XML, CSV, and other formats
+WWW=		https://metacpan.org/release/DBD-AnyData
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
 RUN_DEPENDS=	p5-AnyData>=0.07:devel/p5-AnyData \
diff --git a/databases/p5-DBD-AnyData/pkg-descr b/databases/p5-DBD-AnyData/pkg-descr
index c75a6772554b..6a7a3d60bef8 100644
--- a/databases/p5-DBD-AnyData/pkg-descr
+++ b/databases/p5-DBD-AnyData/pkg-descr
@@ -15,5 +15,3 @@ database system without any file access or rdbms backend.
 
 The module also supports converting files between any of the supported formats
 (e.g. save selected data from MySQL or Oracle to an XML file).
-
-WWW: https://metacpan.org/release/DBD-AnyData
diff --git a/databases/p5-DBD-CSV/Makefile b/databases/p5-DBD-CSV/Makefile
index aab0f6b3dffa..ab50a7ecbdf9 100644
--- a/databases/p5-DBD-CSV/Makefile
+++ b/databases/p5-DBD-CSV/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	DBD-CSV
-PORTVERSION=	0.58
+PORTVERSION=	0.60
 PORTEPOCH=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
@@ -7,6 +7,7 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	DBI driver for CSV files
+WWW=		https://metacpan.org/release/DBD-CSV
 
 LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
diff --git a/databases/p5-DBD-CSV/distinfo b/databases/p5-DBD-CSV/distinfo
index da70dca29470..90df40be9887 100644
--- a/databases/p5-DBD-CSV/distinfo
+++ b/databases/p5-DBD-CSV/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1619605417
-SHA256 (DBD-CSV-0.58.tgz) = 6c26f710453b14d7b3cf5f3e1697e8ddaa48c0a66f5d811f4394bd8c32f287ef
-SIZE (DBD-CSV-0.58.tgz) = 43748
+TIMESTAMP = 1673654207
+SHA256 (DBD-CSV-0.60.tgz) = 018b83a30f799979bc8c3c3044c8b1c8001cdf60bdc3e746848818195254b4e7
+SIZE (DBD-CSV-0.60.tgz) = 43039
diff --git a/databases/p5-DBD-CSV/pkg-descr b/databases/p5-DBD-CSV/pkg-descr
index b185c91b726d..5535f455dd54 100644
--- a/databases/p5-DBD-CSV/pkg-descr
+++ b/databases/p5-DBD-CSV/pkg-descr
@@ -3,5 +3,3 @@ independent interface for Perl). This one is based on the SQL
 "engine" SQL::Statement and the abstract DBI driver DBD::File
 and implements access to so-called CSV files (Comma separated
 values).
-
-WWW: https://metacpan.org/release/DBD-CSV
diff --git a/databases/p5-DBD-Excel/Makefile b/databases/p5-DBD-Excel/Makefile
index 615cb446b157..bffa91f566e9 100644
--- a/databases/p5-DBD-Excel/Makefile
+++ b/databases/p5-DBD-Excel/Makefile
@@ -1,5 +1,3 @@
-# Created by: Seamus Venasse <svenasse@polaris.ca>
-
 PORTNAME=	DBD-Excel
 PORTVERSION=	0.06
 PORTREVISION=	1
@@ -9,6 +7,7 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	skreuzer@FreeBSD.org
 COMMENT=	Class for DBI drivers that acts on Excel files
+WWW=		https://metacpan.org/release/DBD-Excel
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
 RUN_DEPENDS=	p5-SQL-Statement>=0:databases/p5-SQL-Statement \
diff --git a/databases/p5-DBD-Excel/pkg-descr b/databases/p5-DBD-Excel/pkg-descr
index 804ae0358b49..333c9baf29da 100644
--- a/databases/p5-DBD-Excel/pkg-descr
+++ b/databases/p5-DBD-Excel/pkg-descr
@@ -1,3 +1 @@
 A class for DBI drivers that acts on Excel files
-
-WWW: https://metacpan.org/release/DBD-Excel
diff --git a/databases/p5-DBD-Google/Makefile b/databases/p5-DBD-Google/Makefile
index 26d7302b63a9..39fd9fb924cf 100644
--- a/databases/p5-DBD-Google/Makefile
+++ b/databases/p5-DBD-Google/Makefile
@@ -1,5 +1,3 @@
-# Created by: ijliao
-
 PORTNAME=	DBD-Google
 PORTVERSION=	0.51
 PORTREVISION=	2
@@ -9,6 +7,7 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Treat Google as a datasource for DBI
+WWW=		https://metacpan.org/release/DBD-Google
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
 RUN_DEPENDS=	p5-Net-Google>=0:net/p5-Net-Google \
diff --git a/databases/p5-DBD-Google/pkg-descr b/databases/p5-DBD-Google/pkg-descr
index 8e375f8e8752..d6abfeb2fe2f 100644
--- a/databases/p5-DBD-Google/pkg-descr
+++ b/databases/p5-DBD-Google/pkg-descr
@@ -1,4 +1,2 @@
 DBD::Google allows you to use Google as a datasource; Google can be queried
 using SQL SELECT statements, and iterated over using standard DBI conventions.
-
-WWW: https://metacpan.org/release/DBD-Google
diff --git a/databases/p5-DBD-InterBase/Makefile b/databases/p5-DBD-InterBase/Makefile
index 7a6b2d0fe552..c7dd922b2e9b 100644
--- a/databases/p5-DBD-InterBase/Makefile
+++ b/databases/p5-DBD-InterBase/Makefile
@@ -1,14 +1,15 @@
-# Created by: Sergey Skvortsov <skv@protey.ru>
-
 PORTNAME=	DBD-InterBase
 PORTVERSION=	0.48
-PORTREVISION=	4
+PORTREVISION=	7
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	yuri@rivera.ru
 COMMENT=	DBI driver for InterBase/Firebird/Yaffil RDBMS server
+WWW=		https://metacpan.org/release/DBD-InterBase
+
+LICENSE=	NONE
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
 RUN_DEPENDS=	p5-DBI>=0:databases/p5-DBI
@@ -16,6 +17,12 @@ RUN_DEPENDS=	p5-DBI>=0:databases/p5-DBI
 USES=		perl5 firebird
 USE_PERL5=	patch configure
 
+.include <bsd.port.options.mk>
+
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 ))
+CFLAGS+=	-Wno-error=int-conversion
+.endif
+
 post-patch:
 		@${PERL} -pi -e 's,%%IB_BASE%%,${LOCALBASE},g' \
 			${WRKSRC}/Makefile.PL
diff --git a/databases/p5-DBD-InterBase/files/patch-Makefile.PL b/databases/p5-DBD-InterBase/files/patch-Makefile.PL
index 16ffa097669d..e1f0348d9d2b 100644
--- a/databases/p5-DBD-InterBase/files/patch-Makefile.PL
+++ b/databases/p5-DBD-InterBase/files/patch-Makefile.PL
@@ -1,6 +1,6 @@
---- Makefile.PL.orig	Sat Nov 22 06:12:11 2003
-+++ Makefile.PL	Mon Dec  8 20:01:27 2003
-@@ -28,7 +28,7 @@
+--- Makefile.PL.orig	2008-01-08 05:28:47 UTC
++++ Makefile.PL
+@@ -29,7 +29,7 @@ use Test::More 0.4;
  use DBI::DBD;   # DBD creation tools
  
  my $ib_dir_prefix;
@@ -9,13 +9,13 @@
  # init stuff
  my $IB_Bin_path = '';
  my $isql_name;
-@@ -82,7 +82,12 @@
+@@ -83,7 +83,12 @@ else
      @ib_bin_dirs = (qw(/usr/interbase/bin /opt/interbase/bin /opt/firebird/bin /usr/bin /usr/local/bin));
      @ib_inc_dirs = (qw(/usr/interbase/include /opt/interbase/include /opt/firebird/include /usr/include));
  }
 -
 +=cut
-+my $IB_BASE='%%IB_BASE%%';
++my $IB_BASE='/usr/local';
 +my $IB_Bin_path = $IB_BASE.'/bin';
 +my $isql_name = 'isql';
 +my $ib_lib_dir = $IB_BASE.'/lib';
@@ -23,7 +23,7 @@
  sub locate_dbi_arch_dir {
      my $dbidir = dbd_dbi_dir();
      my @try = map { "$_/auto/DBI" } @INC;
-@@ -91,7 +96,7 @@
+@@ -92,7 +97,7 @@ sub locate_dbi_arch_dir {
      Carp::carp( "Multiple copies of Driver.xst found in: @xst") if @xst > 1;
      return $xst[0];
  }
@@ -32,7 +32,7 @@
  ################################################################################
  # sub test_files - checks if at least one of the files in the list exists
  # Paramters:
-@@ -296,13 +301,13 @@
+@@ -305,13 +310,13 @@ sub create_test_db
  
  # prompt for InterBase bin directory
  $IB_Bin_path = dir_choice("InterBase/Firebird bin directory", [@ib_bin_dirs], [qw(gfix gfix.exe)]);
@@ -48,17 +48,18 @@
  # get InterBase version
  my $IBVERSION;
  my $GFIX_PATH = $IB_Bin_path . "/" . test_files($IB_Bin_path, [qw(gfix gfix.exe)]);
-@@ -312,7 +317,7 @@
+@@ -321,8 +326,8 @@ my $is_final = $IBVERSION =~ /\.6\d+$/ ? 1 : 0;
  
  # prompt for IB include dir
  my $ib_inc = dir_choice("InterBase/Firebird include directory", [@ib_inc_dirs], [qw(gds.h ibase.h)]);
--
 +=cut
  
+-
  # we use a hash for the MakeMaker parameters
  my %MakeParams = (
-@@ -323,14 +328,14 @@
-     'CCFLAGS'       => '',
+     'NAME'          => 'DBD::InterBase',
+@@ -332,14 +337,14 @@ my %MakeParams = (
+     'CCFLAGS'       => '-Wall -fno-strict-aliasing',
      'INC'           => qq(-I"$ib_inc" -I"${\locate_dbi_arch_dir()}"),
      'OBJECT'        => "InterBase.o dbdimp.o",
 -    'LIBS'          => [''],
@@ -74,7 +75,7 @@
  # the OS specific build environment setup
  my $os = $Config::Config{'osname'};
  if ($os eq 'MSWin32')
-@@ -530,7 +535,7 @@
+@@ -545,7 +550,7 @@ else
  
  # create the test config file
  make_test_conf();
diff --git a/databases/p5-DBD-InterBase/files/patch-dbdimp.c b/databases/p5-DBD-InterBase/files/patch-dbdimp.c
index 6011ade07ef1..b37feb4ef19a 100644
--- a/databases/p5-DBD-InterBase/files/patch-dbdimp.c
+++ b/databases/p5-DBD-InterBase/files/patch-dbdimp.c
@@ -1,6 +1,6 @@
---- dbdimp.c.orig	2008-01-08 09:02:45.000000000 +0300
-+++ dbdimp.c		2014-01-27 13:58:49.202445490 +0400
-@@ -113,7 +113,7 @@
+--- dbdimp.c.orig	2008-01-08 06:02:45 UTC
++++ dbdimp.c
+@@ -113,7 +113,7 @@ void do_error(SV *h, int rc, char *what)
  
      if (DBIc_TRACE_LEVEL(imp_xxh) >= 2)
          PerlIO_printf(DBIc_LOGPIO(imp_xxh), "%s error %d recorded: %s\n", 
@@ -9,7 +9,7 @@
  }
  
  #define CALC_AVAILABLE(buff) sizeof(buff) - strlen(buff) - 1
-@@ -693,7 +693,7 @@
+@@ -693,7 +693,7 @@ SV *dbd_db_FETCH_attrib(SV *dbh, imp_dbh_t *imp_dbh, S
          return Nullsv;
      else
      {
@@ -18,7 +18,7 @@
              return result;
          else
              return sv_2mortal(result);
-@@ -1991,8 +1991,8 @@
+@@ -1991,8 +1991,8 @@ int dbd_discon_all(SV *drh, imp_drh_t *imp_drh)
          DBIh_EVENT2(drh, ERROR_event, DBIc_ERR(imp_drh), DBIc_ERRSTR(imp_drh));
          return FALSE;
      }
@@ -28,4 +28,4 @@
 +        PL_perl_destruct_level = 0;
      return FALSE;
  }
-
+ 
diff --git a/databases/p5-DBD-InterBase/pkg-descr b/databases/p5-DBD-InterBase/pkg-descr
index c41998a5148b..691ed86bbc7c 100644
--- a/databases/p5-DBD-InterBase/pkg-descr
+++ b/databases/p5-DBD-InterBase/pkg-descr
@@ -1,4 +1,2 @@
 DBD::InterBase is a Perl module which works with the DBI module to
 provide access to InterBase/Firebird/Yaffil databases.
-
-WWW: https://metacpan.org/release/DBD-InterBase
diff --git a/databases/p5-DBD-LDAP/Makefile b/databases/p5-DBD-LDAP/Makefile
index 80f2d7191df7..6fc6f9c97498 100644
--- a/databases/p5-DBD-LDAP/Makefile
+++ b/databases/p5-DBD-LDAP/Makefile
@@ -1,5 +1,3 @@
-# Created by: Seamus Venasse <svenasse@polaris.ca>
-
 PORTNAME=	DBD-LDAP
 PORTVERSION=	1.00
 CATEGORIES=	databases perl5
@@ -8,6 +6,7 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	DBI interface for accessing LDAP servers
+WWW=		https://metacpan.org/release/DBD-LDAP
 
 LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
diff --git a/databases/p5-DBD-LDAP/pkg-descr b/databases/p5-DBD-LDAP/pkg-descr
index 3ef5b3b91e02..aa7c4b4d3933 100644
--- a/databases/p5-DBD-LDAP/pkg-descr
+++ b/databases/p5-DBD-LDAP/pkg-descr
@@ -2,5 +2,3 @@ DBD::LDAP is a DBI extension module adding an SQL database interface to
 standard LDAP databases to Perl's database-independent database interface.
 You will need access to an existing LDAP database or set up your own using
 an LDAP server, ie. "OpenLDAP".
-
-WWW: https://metacpan.org/release/DBD-LDAP
diff --git a/databases/p5-DBD-MariaDB/Makefile b/databases/p5-DBD-MariaDB/Makefile
index 8b20e4cb2783..886c05aa4e78 100644
--- a/databases/p5-DBD-MariaDB/Makefile
+++ b/databases/p5-DBD-MariaDB/Makefile
@@ -1,5 +1,3 @@
-# Created by: Sergey Skvortsov <skv@FreeBSD.org>
-
 PORTNAME=	DBD-MariaDB
 PORTVERSION=	1.21
 CATEGORIES=	databases perl5
@@ -9,6 +7,7 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT?=	MariaDB driver for the Perl5 Database Interface (DBI)
+WWW=		https://metacpan.org/release/DBD-MariaDB
 
 LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
diff --git a/databases/p5-DBD-MariaDB/pkg-descr b/databases/p5-DBD-MariaDB/pkg-descr
index 39234d1c898f..62718bde4a9a 100644
--- a/databases/p5-DBD-MariaDB/pkg-descr
+++ b/databases/p5-DBD-MariaDB/pkg-descr
@@ -3,5 +3,3 @@ databases. In other words: DBD::MariaDB is an interface between the Perl
 programming language and the MariaDB/MySQL programming API that comes with the
 MariaDB/MySQL relational database management system. Most functions provided by
 this programming API are supported.
-
-WWW: https://metacpan.org/release/DBD-MariaDB
diff --git a/databases/p5-DBD-Mock/Makefile b/databases/p5-DBD-Mock/Makefile
index bc407933846a..803afab4b8bc 100644
--- a/databases/p5-DBD-Mock/Makefile
+++ b/databases/p5-DBD-Mock/Makefile
@@ -1,13 +1,13 @@
-# Created by: Espen Tagestad <espen@tagestad.no>
-
 PORTNAME=	DBD-Mock
 PORTVERSION=	1.59
+PORTREVISION=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Simple mock DBD implementation used for testing
+WWW=		https://metacpan.org/release/DBD-Mock
 
 LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
@@ -19,4 +19,6 @@ RUN_DEPENDS=	p5-DBI>=1.3:databases/p5-DBI \
 USES=		perl5
 USE_PERL5=	modbuildtiny
 
+NO_ARCH=	yes
+
 .include <bsd.port.mk>
diff --git a/databases/p5-DBD-Mock/pkg-descr b/databases/p5-DBD-Mock/pkg-descr
index e5d80a6f3f78..196b1ffc1590 100644
--- a/databases/p5-DBD-Mock/pkg-descr
+++ b/databases/p5-DBD-Mock/pkg-descr
@@ -2,5 +2,3 @@ The DBD::Mock perl module is a simple mock DBD implementation used for testing.
 It's entirely self-contained so that you can extract the single library file
 (DBD/Mock.pm), put it in your own distribution and be able to run DBI-based
 tests even though you don't have information about a database.
-
-WWW: https://metacpan.org/release/DBD-Mock
diff --git a/databases/p5-DBD-Mock/pkg-plist b/databases/p5-DBD-Mock/pkg-plist
index 7cbf11fbb7dc..c34b9166eab8 100644
--- a/databases/p5-DBD-Mock/pkg-plist
+++ b/databases/p5-DBD-Mock/pkg-plist
@@ -8,11 +8,3 @@
 %%SITE_PERL%%/DBD/Mock/Pool.pm
 %%SITE_PERL%%/DBD/Mock.pm
 %%PERL5_MAN3%%/DBD::Mock.3.gz
-%%PERL5_MAN3%%/DBD::Mock::Pool.3.gz
-%%PERL5_MAN3%%/DBD::Mock::Pool::db.3.gz
-%%PERL5_MAN3%%/DBD::Mock::Session.3.gz
-%%PERL5_MAN3%%/DBD::Mock::StatementTrack.3.gz
-%%PERL5_MAN3%%/DBD::Mock::StatementTrack::Iterator.3.gz
-%%PERL5_MAN3%%/DBD::Mock::db.3.gz
-%%PERL5_MAN3%%/DBD::Mock::dr.3.gz
-%%PERL5_MAN3%%/DBD::Mock::st.3.gz
diff --git a/databases/p5-DBD-Multi/Makefile b/databases/p5-DBD-Multi/Makefile
index 17da3cbf0415..8d78faa066e6 100644
--- a/databases/p5-DBD-Multi/Makefile
+++ b/databases/p5-DBD-Multi/Makefile
@@ -1,5 +1,3 @@
-# Created by: Tsung-Han Yeh <snowfly@yuntech.edu.tw>
-
 PORTNAME=	DBD-Multi
 PORTVERSION=	0.16
 PORTREVISION=	1
@@ -9,6 +7,7 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	snowfly@yuntech.edu.tw
 COMMENT=	Manage Multiple Data Sources with Failover and Load Balancing
+WWW=		https://metacpan.org/release/DBD-Multi
 
 LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
diff --git a/databases/p5-DBD-Multi/pkg-descr b/databases/p5-DBD-Multi/pkg-descr
index 3d0a6de340aa..5a1004c671d7 100644
--- a/databases/p5-DBD-Multi/pkg-descr
+++ b/databases/p5-DBD-Multi/pkg-descr
@@ -1,3 +1 @@
 DBD::Multi - Manage Multiple Data Sources with Failover and Load Balancing
-
-WWW: https://metacpan.org/release/DBD-Multi
diff --git a/databases/p5-DBD-ODBC/Makefile b/databases/p5-DBD-ODBC/Makefile
index c6b5cd914c1f..51403ac91555 100644
--- a/databases/p5-DBD-ODBC/Makefile
+++ b/databases/p5-DBD-ODBC/Makefile
@@ -1,5 +1,3 @@
-# Created by: clive@FreeBSD.org
-
 PORTNAME=	DBD-ODBC
 PORTVERSION=	1.61
 CATEGORIES=	databases perl5
@@ -8,6 +6,7 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	DBD module interfacing the ODBC databases
+WWW=		https://metacpan.org/release/DBD-ODBC
 
 LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
diff --git a/databases/p5-DBD-ODBC/pkg-descr b/databases/p5-DBD-ODBC/pkg-descr
index 8b8a22ea6d87..8566632783ea 100644
--- a/databases/p5-DBD-ODBC/pkg-descr
+++ b/databases/p5-DBD-ODBC/pkg-descr
@@ -1,3 +1 @@
 DBD module interfacing the ODBC databases.
-
-WWW: https://metacpan.org/release/DBD-ODBC
diff --git a/databases/p5-DBD-Oracle/Makefile b/databases/p5-DBD-Oracle/Makefile
index 7aa3efca2a0c..cf2b8c67a159 100644
--- a/databases/p5-DBD-Oracle/Makefile
+++ b/databases/p5-DBD-Oracle/Makefile
@@ -1,5 +1,3 @@
-# Created by: Sergey Skvortsov <skv@FreeBSD.org>
-
 PORTNAME=	DBD-Oracle
 PORTVERSION=	1.19
 PORTREVISION=	6
@@ -9,6 +7,7 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	eugen@FreeBSD.org
 COMMENT=	DBI driver for Oracle RDBMS server
+WWW=		https://metacpan.org/release/DBD-Oracle
 
 BUILD_DEPENDS=	p5-DBI>=0:databases/p5-DBI
 RUN_DEPENDS=	p5-DBI>=0:databases/p5-DBI
diff --git a/databases/p5-DBD-Oracle/pkg-descr b/databases/p5-DBD-Oracle/pkg-descr
index 3da9376ba12a..f9ae4ebcbf36 100644
--- a/databases/p5-DBD-Oracle/pkg-descr
+++ b/databases/p5-DBD-Oracle/pkg-descr
@@ -1,4 +1,2 @@
 DBD::Oracle is a Perl module which works with the DBI module to provide
 access to Oracle databases.
-
-WWW: https://metacpan.org/release/DBD-Oracle
diff --git a/databases/p5-DBD-Pg/Makefile b/databases/p5-DBD-Pg/Makefile
index 9d4392d2b747..431ef614804e 100644
--- a/databases/p5-DBD-Pg/Makefile
+++ b/databases/p5-DBD-Pg/Makefile
@@ -1,11 +1,12 @@
 PORTNAME=	DBD-Pg
-PORTVERSION=	3.15.0
+PORTVERSION=	3.18.0
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Provides access to PostgreSQL databases through the DBI
+WWW=		https://metacpan.org/release/DBD-Pg
 
 LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
diff --git a/databases/p5-DBD-Pg/distinfo b/databases/p5-DBD-Pg/distinfo
index 555e460db7f7..0bb494ace84f 100644
--- a/databases/p5-DBD-Pg/distinfo
+++ b/databases/p5-DBD-Pg/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1621699685
-SHA256 (DBD-Pg-3.15.0.tar.gz) = 69cc19870f9d935f16530be39d0ed60afadc5e560e29c3a17af4498e7e3082d9
-SIZE (DBD-Pg-3.15.0.tar.gz) = 284379
+TIMESTAMP = 1702028064
+SHA256 (DBD-Pg-3.18.0.tar.gz) = 92bbe8a363040f8ce6a3f1963f128132e245861a9b4dc5a84178b42d625a7807
+SIZE (DBD-Pg-3.18.0.tar.gz) = 288783
diff --git a/databases/p5-DBD-Pg/pkg-descr b/databases/p5-DBD-Pg/pkg-descr
index 93a81f4105ba..46cdafccdca8 100644
--- a/databases/p5-DBD-Pg/pkg-descr
+++ b/databases/p5-DBD-Pg/pkg-descr
@@ -2,5 +2,3 @@ DBD::Pg is an extension to Perl which allows access to
 PostgreSQL databases. It is built on top of the standard
 DBI extension and implements some of the methods that DBI
 defines.
-
-WWW: https://metacpan.org/release/DBD-Pg
diff --git a/databases/p5-DBD-PgLite/Makefile b/databases/p5-DBD-PgLite/Makefile
index 894bd730841e..8cd4bf5cb4d6 100644
--- a/databases/p5-DBD-PgLite/Makefile
+++ b/databases/p5-DBD-PgLite/Makefile
@@ -1,5 +1,3 @@
-# Created by: Lars Thegler <lth@FreeBSD.org>
-
 PORTNAME=	DBD-PgLite
 PORTVERSION=	0.11
 PORTREVISION=	2
@@ -9,6 +7,7 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	PostgreSQL emulation mode for SQLite
+WWW=		https://metacpan.org/release/DBD-PgLite
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
 RUN_DEPENDS=	p5-DBD-SQLite>=1.0:databases/p5-DBD-SQLite \
diff --git a/databases/p5-DBD-PgLite/pkg-descr b/databases/p5-DBD-PgLite/pkg-descr
index 0a1307fd02ee..a244d2f78241 100644
--- a/databases/p5-DBD-PgLite/pkg-descr
+++ b/databases/p5-DBD-PgLite/pkg-descr
@@ -2,5 +2,3 @@ The module automatically and transparently transforms a broad range of
 SQL statements typical of PostgreSQL into a form suitable for use in
 SQLite. This involves both (a) parsing and filtering of the SQL; and
 (b) the addition of several PostgreSQL-compatible functions to SQLite.
-
-WWW: https://metacpan.org/release/DBD-PgLite
diff --git a/databases/p5-DBD-PgPP/Makefile b/databases/p5-DBD-PgPP/Makefile
index 9ad34ca1c8a9..6a44a4a776c2 100644
--- a/databases/p5-DBD-PgPP/Makefile
+++ b/databases/p5-DBD-PgPP/Makefile
@@ -1,5 +1,3 @@
-# Created by: Lubomir Marinov <lubomir_m@abv.bg>
-
 PORTNAME=	DBD-PgPP
 PORTVERSION=	0.08
 PORTREVISION=	1
@@ -9,6 +7,7 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Pure Perl PostgreSQL driver for the DBI
+WWW=		https://metacpan.org/release/DBD-PgPP
 
 BUILD_DEPENDS+=	p5-DBI>=0:databases/p5-DBI
 RUN_DEPENDS+=	p5-DBI>=0:databases/p5-DBI
diff --git a/databases/p5-DBD-PgPP/pkg-descr b/databases/p5-DBD-PgPP/pkg-descr
index b26f200bc3de..9184eb13e811 100644
--- a/databases/p5-DBD-PgPP/pkg-descr
+++ b/databases/p5-DBD-PgPP/pkg-descr
@@ -3,5 +3,3 @@ It implements the PostgreSQL client/server network protocol and doesn't
 need an external PostgreSQL client library like "libpq" for it to work.
 Consequently, it allows one to connect to a PostgreSQL server from
 operating systems to which PostgreSQL has not been ported.
-
-WWW: https://metacpan.org/release/DBD-PgPP
diff --git a/databases/p5-DBD-SQLite/Makefile b/databases/p5-DBD-SQLite/Makefile
index 385bc4fa086b..e04213286dcb 100644
--- a/databases/p5-DBD-SQLite/Makefile
+++ b/databases/p5-DBD-SQLite/Makefile
@@ -1,13 +1,12 @@
-# Created by: nork@cityfujisawa.ne.jp
-
 PORTNAME=	DBD-SQLite
-PORTVERSION=	1.70
+PORTVERSION=	1.74
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Provides access to SQLite3 databases through the DBI
+WWW=		https://metacpan.org/release/DBD-SQLite
 
 LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
diff --git a/databases/p5-DBD-SQLite/distinfo b/databases/p5-DBD-SQLite/distinfo
index aa1cef0a75cb..6ec9f966ee74 100644
--- a/databases/p5-DBD-SQLite/distinfo
+++ b/databases/p5-DBD-SQLite/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1628103812
-SHA256 (DBD-SQLite-1.70.tar.gz) = 40fd8ddf539e0e773a7a4e6d376794c3301459f9ab0050978bdcf97113dafe3e
-SIZE (DBD-SQLite-1.70.tar.gz) = 2537672
+TIMESTAMP = 1695358189
+SHA256 (DBD-SQLite-1.74.tar.gz) = 8994997d84b9feb4547795f78746c661fb72e3cb6a25dbdd789b731f5688a4dd
+SIZE (DBD-SQLite-1.74.tar.gz) = 2656440
diff --git a/databases/p5-DBD-SQLite/pkg-descr b/databases/p5-DBD-SQLite/pkg-descr
index 4663894d2477..3558af8011c4 100644
--- a/databases/p5-DBD-SQLite/pkg-descr
+++ b/databases/p5-DBD-SQLite/pkg-descr
@@ -12,5 +12,4 @@ It supports quite a lot of features, such as transactions (atomic
 commit and rollback), indexes, DBA-free operation, a large subset
 of SQL92 supported, and more.
 
-WWW: https://metacpan.org/release/DBD-SQLite
-WWW: http://www.sqlite.org/
+See also: https://www.sqlite.org/
diff --git a/databases/p5-DBD-SQLite2/Makefile b/databases/p5-DBD-SQLite2/Makefile
index 222b90332c0a..4ef3ede7ceee 100644
--- a/databases/p5-DBD-SQLite2/Makefile
+++ b/databases/p5-DBD-SQLite2/Makefile
@@ -1,5 +1,3 @@
-# Created by: nork@cityfujisawa.ne.jp
-
 PORTNAME=	DBD-SQLite2
 PORTVERSION=	0.38
 CATEGORIES=	databases perl5
@@ -8,6 +6,7 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Provides access to SQLite2 databases through the DBI
+WWW=		https://www.sqlite.org/
 
 LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
diff --git a/databases/p5-DBD-SQLite2/pkg-descr b/databases/p5-DBD-SQLite2/pkg-descr
index 4fca15965e42..1d44a11a7c25 100644
--- a/databases/p5-DBD-SQLite2/pkg-descr
+++ b/databases/p5-DBD-SQLite2/pkg-descr
@@ -11,5 +11,3 @@ DBD::SQLite2 may be just what you need.
 It supports quite a lot of features, such as transactions (atomic
 commit and rollback), indexes, DBA-free operation, a large subset
 of SQL92 supported, and more.
-
-WWW: http://www.sqlite.org/
diff --git a/databases/p5-DBD-Sybase/Makefile b/databases/p5-DBD-Sybase/Makefile
index 2395cc00a5d7..56563e47aab2 100644
--- a/databases/p5-DBD-Sybase/Makefile
+++ b/databases/p5-DBD-Sybase/Makefile
@@ -1,25 +1,26 @@
-# Created by: Sheldon Hearn <sheldonh@FreeBSD.org>
-
 PORTNAME=	DBD-Sybase
-PORTVERSION=	1.16
+PORTVERSION=	1.24
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Sybase DBI driver for Perl 5
+WWW=		https://metacpan.org/release/DBD-Sybase
 
 LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
-RUN_DEPENDS=	p5-DBI>=0:databases/p5-DBI
+BUILD_DEPENDS+=	freetds>=1.3.10:databases/freetds
 LIB_DEPENDS=	libct.so:databases/freetds
+RUN_DEPENDS=	p5-DBI>=0:databases/p5-DBI
 
-CONFIGURE_ENV=	SYBASE=${LOCALBASE}
 USES=		gettext perl5
 USE_PERL5=	configure
 
+CONFIGURE_ENV=	SYBASE=${LOCALBASE}
+
 .if defined(BATCH)
 CONFIGURE_ARGS=	< /dev/null
 .endif
diff --git a/databases/p5-DBD-Sybase/distinfo b/databases/p5-DBD-Sybase/distinfo
index 1d0763fb4767..9ac0bf601183 100644
--- a/databases/p5-DBD-Sybase/distinfo
+++ b/databases/p5-DBD-Sybase/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1505127704
-SHA256 (DBD-Sybase-1.16.tar.gz) = 67f427e8b7ffae2acc3cc8984463d878abbb2289bc17db79a294e56c8311d6cc
-SIZE (DBD-Sybase-1.16.tar.gz) = 200419
+TIMESTAMP = 1711466408
+SHA256 (DBD-Sybase-1.24.tar.gz) = 27bf68b3f260e00e761b812561f0ee3208155850b21bab76a0a11338055bef88
+SIZE (DBD-Sybase-1.24.tar.gz) = 197494
diff --git a/databases/p5-DBD-Sybase/pkg-descr b/databases/p5-DBD-Sybase/pkg-descr
index 7d95fa8bbfd6..4e0afcefb079 100644
--- a/databases/p5-DBD-Sybase/pkg-descr
+++ b/databases/p5-DBD-Sybase/pkg-descr
@@ -1,5 +1,3 @@
 DBD::Sybase is DBI (Database Interface) driver for Perl, which uses the
 FreeTDS libraries to provide access to Sybase databases (including MSSQL
 7).
-
-WWW: https://metacpan.org/release/DBD-Sybase
diff --git a/databases/p5-DBD-Sybase/pkg-plist b/databases/p5-DBD-Sybase/pkg-plist
index 051fae63ead1..13ed01e67a32 100644
--- a/databases/p5-DBD-Sybase/pkg-plist
+++ b/databases/p5-DBD-Sybase/pkg-plist
@@ -1,4 +1,3 @@
 %%SITE_ARCH%%/DBD/Sybase.pm
-%%SITE_ARCH%%/DBD/dbd-sybase.pod
 %%SITE_ARCH%%/auto/DBD/Sybase/Sybase.so
 %%PERL5_MAN3%%/DBD::Sybase.3.gz
diff --git a/databases/p5-DBD-XBase/Makefile b/databases/p5-DBD-XBase/Makefile
index 32e184e78fe3..62280a3e21d8 100644
--- a/databases/p5-DBD-XBase/Makefile
+++ b/databases/p5-DBD-XBase/Makefile
@@ -1,5 +1,3 @@
-# Created by: Ilia Chipitsine <ilia@jane.cgu.chel.su>
-
 PORTNAME=	DBD-XBase
 PORTVERSION=	1.08
 CATEGORIES=	databases perl5
@@ -8,6 +6,7 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Provides access to XBase (dBase, Fox*) database files through DBI
+WWW=		https://metacpan.org/release/DBD-XBase
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
 RUN_DEPENDS=	p5-DBI>=0:databases/p5-DBI
@@ -15,6 +14,8 @@ RUN_DEPENDS=	p5-DBI>=0:databases/p5-DBI
 USES=		perl5
 USE_PERL5=	configure
 
+CONFLICTS_INSTALL=	shapelib
+
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/databases/p5-DBD-XBase/pkg-descr b/databases/p5-DBD-XBase/pkg-descr
index afedb00feda6..210f9e3e85b1 100644
--- a/databases/p5-DBD-XBase/pkg-descr
+++ b/databases/p5-DBD-XBase/pkg-descr
@@ -9,5 +9,3 @@ to work with the data, providing you with DBI compliant processing
 interface and SQL commands ($dbh->prepare("SELECT * FROM TABLE")). As
 an argument to DBI->connect, specify "dbi:XBase:$dir", where $dir is
 the directory with the data files.
-
-WWW: https://metacpan.org/release/DBD-XBase
diff --git a/databases/p5-DBD-cego/Makefile b/databases/p5-DBD-cego/Makefile
index 071773ee18b2..ef358152b51a 100644
--- a/databases/p5-DBD-cego/Makefile
+++ b/databases/p5-DBD-cego/Makefile
@@ -1,11 +1,12 @@
 PORTNAME=	DBD-cego
-PORTVERSION=	1.5.0
+PORTVERSION=	1.5.3
 CATEGORIES=	databases perl5
 MASTER_SITES=	http://www.lemke-it.com/
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	pi@FreeBSD.org
 COMMENT=	Cego DBI driver for Perl 5
+WWW=		https://www.lemke-it.com/
 
 LICENSE=	GPLv3
 
diff --git a/databases/p5-DBD-cego/distinfo b/databases/p5-DBD-cego/distinfo
index 4f1faff46080..4626aed9f252 100644
--- a/databases/p5-DBD-cego/distinfo
+++ b/databases/p5-DBD-cego/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1555833259
-SHA256 (DBD-cego-1.5.0.tar.gz) = 6f09425c801eac2509a5c75e7f7227a997f3927693abd5763d99b097148fd4fe
-SIZE (DBD-cego-1.5.0.tar.gz) = 28529
+TIMESTAMP = 1690739648
+SHA256 (DBD-cego-1.5.3.tar.gz) = 8ec5f6bfa69e75755ca490994d21944d72debed4b8f777ca9f592f860a2a1271
+SIZE (DBD-cego-1.5.3.tar.gz) = 36784
diff --git a/databases/p5-DBD-cego/pkg-descr b/databases/p5-DBD-cego/pkg-descr
index ccc0587062f1..29dd82917a42 100644
--- a/databases/p5-DBD-cego/pkg-descr
+++ b/databases/p5-DBD-cego/pkg-descr
@@ -1,5 +1,3 @@
 A DBI driver for the Cego database for Perl 5
 
 Many more details are available at:
-
-WWW: http://www.lemke-it.com/
diff --git a/databases/p5-DBD-mysql/Makefile b/databases/p5-DBD-mysql/Makefile
index 45615e7f1bfd..c5cdd232c009 100644
--- a/databases/p5-DBD-mysql/Makefile
+++ b/databases/p5-DBD-mysql/Makefile
@@ -1,15 +1,13 @@
-# Created by: Sergey Skvortsov <skv@FreeBSD.org>
-
 PORTNAME=	DBD-mysql
-PORTVERSION=	4.050
-PORTREVISION=	1
+PORTVERSION=	5.004
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	CPAN:CAPTTOFU
+MASTER_SITE_SUBDIR=	CPAN:DVEEDEN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	perl@FreeBSD.org
+MAINTAINER=	sirdice@gmail.com
 COMMENT=	MySQL driver for the Perl5 Database Interface (DBI)
+WWW=		https://metacpan.org/release/DBD-mysql
 
 LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
@@ -26,15 +24,7 @@ USE_PERL5=	configure
 CONFIGURE_ARGS=		${_CONFIGURE_ARGS_${CHOSEN_COMPILER_TYPE}}
 _CONFIGURE_ARGS_gcc=	--libs="-L${PREFIX}/lib/gcc${GCC_DEFAULT} `mysql_config --libs | ${SED} 's/-pthread //'`"
 
-CONFLICTS_INSTALL=	p5-DBD-mysql[45][0-9]-[0-9]*
-
-OPTIONS_DEFINE=		SSL
-OPTIONS_DEFAULT=	SSL
-
-SSL_RUN_DEPENDS=	p5-Crypt-SSLeay>=0:security/p5-Crypt-SSLeay
-SSL_USES=		ssl
-SSL_CONFIGURE_ON=	--ssl
-SSL_CONFIGURE_OFF=	--nossl
+CONFLICTS_INSTALL=	p5-DBD-mysql4
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/DBD/mysql/mysql.so
diff --git a/databases/p5-DBD-mysql/distinfo b/databases/p5-DBD-mysql/distinfo
index d1cd673c0463..a9cc98408822 100644
--- a/databases/p5-DBD-mysql/distinfo
+++ b/databases/p5-DBD-mysql/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1547619917
-SHA256 (DBD-mysql-4.050.tar.gz) = 4f48541ff15a0a7405f76adc10f81627c33996fbf56c95c26c094444c0928d78
-SIZE (DBD-mysql-4.050.tar.gz) = 161579
+TIMESTAMP = 1710964481
+SHA256 (DBD-mysql-5.004.tar.gz) = 33a6bf1b685cc50c46eb1187a3eb259ae240917bc189d26b81418790aa6da5df
+SIZE (DBD-mysql-5.004.tar.gz) = 156428
diff --git a/databases/p5-DBD-mysql/pkg-descr b/databases/p5-DBD-mysql/pkg-descr
index 30456e32f989..b07df5f5d210 100644
--- a/databases/p5-DBD-mysql/pkg-descr
+++ b/databases/p5-DBD-mysql/pkg-descr
@@ -4,5 +4,3 @@ programming language and the MySQL programming API that comes with the
 MySQL relational database management system.  Most functions provided by
 this programming API are supported.  Some rarely used functions are
 missing, mainly because noone ever requested them.
-
-WWW: https://metacpan.org/release/DBD-mysql
diff --git a/databases/p5-DBD-mysql/pkg-plist b/databases/p5-DBD-mysql/pkg-plist
index bac17eb1028f..4578ada060f1 100644
--- a/databases/p5-DBD-mysql/pkg-plist
+++ b/databases/p5-DBD-mysql/pkg-plist
@@ -1,8 +1,6 @@
-%%SITE_ARCH%%/Bundle/DBD/mysql.pm
 %%SITE_ARCH%%/DBD/mysql.pm
 %%SITE_ARCH%%/DBD/mysql/GetInfo.pm
 %%SITE_ARCH%%/DBD/mysql/INSTALL.pod
 %%SITE_ARCH%%/auto/DBD/mysql/mysql.so
-%%PERL5_MAN3%%/Bundle::DBD::mysql.3.gz
 %%PERL5_MAN3%%/DBD::mysql.3.gz
 %%PERL5_MAN3%%/DBD::mysql::INSTALL.3.gz
diff --git a/databases/p5-DBD-mysql4/Makefile b/databases/p5-DBD-mysql4/Makefile
new file mode 100644
index 000000000000..8adf523032ff
--- /dev/null
+++ b/databases/p5-DBD-mysql4/Makefile
@@ -0,0 +1,41 @@
+PORTNAME=	DBD-mysql
+PORTVERSION=	4.052
+CATEGORIES=	databases perl5
+MASTER_SITES=	CPAN
+MASTER_SITE_SUBDIR=	CPAN:DVEEDEN
+PKGNAMEPREFIX=	p5-
+PKGNAMESUFFIX=	4
+
+MAINTAINER=	sirdice@gmail.com
+COMMENT=	MySQL driver for the Perl5 Database Interface (DBI)
+WWW=		https://metacpan.org/release/DBD-mysql
+
+LICENSE=	ART10 GPLv1+
+LICENSE_COMB=	dual
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
+BUILD_DEPENDS=	${RUN_DEPENDS} \
+		p5-Devel-CheckLib>=1.09:devel/p5-Devel-CheckLib
+RUN_DEPENDS=	p5-DBI>=1.08:databases/p5-DBI
+TEST_DEPENDS=	p5-Test-Deep>=0:devel/p5-Test-Deep
+
+USES=		compiler:c11 mysql perl5
+USE_PERL5=	configure
+
+CONFIGURE_ARGS=		${_CONFIGURE_ARGS_${CHOSEN_COMPILER_TYPE}}
+_CONFIGURE_ARGS_gcc=	--libs="-L${PREFIX}/lib/gcc${GCC_DEFAULT} `mysql_config --libs | ${SED} 's/-pthread //'`"
+
+CONFLICTS_INSTALL=	p5-DBD-mysql
+
+OPTIONS_DEFINE=		SSL
+OPTIONS_DEFAULT=	SSL
+
+SSL_RUN_DEPENDS=	p5-Crypt-SSLeay>=0:security/p5-Crypt-SSLeay
+SSL_USES=		ssl
+SSL_CONFIGURE_ON=	--ssl
+SSL_CONFIGURE_OFF=	--nossl
+
+post-install:
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/DBD/mysql/mysql.so
+
+.include <bsd.port.mk>
diff --git a/databases/p5-DBD-mysql4/distinfo b/databases/p5-DBD-mysql4/distinfo
new file mode 100644
index 000000000000..f3ee23f99dbb
--- /dev/null
+++ b/databases/p5-DBD-mysql4/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1711540853
+SHA256 (DBD-mysql-4.052.tar.gz) = a83f57af7817787de0ef56fb15fdfaf4f1c952c8f32ff907153b66d2da78ff5b
+SIZE (DBD-mysql-4.052.tar.gz) = 162074
diff --git a/databases/p5-DBD-mysql4/pkg-descr b/databases/p5-DBD-mysql4/pkg-descr
new file mode 100644
index 000000000000..b07df5f5d210
--- /dev/null
+++ b/databases/p5-DBD-mysql4/pkg-descr
@@ -0,0 +1,6 @@
+DBD::mysql is the Perl5 Database Interface driver for the MySQL
+database.  In other words: DBD::mysql is an interface between the Perl
+programming language and the MySQL programming API that comes with the
+MySQL relational database management system.  Most functions provided by
+this programming API are supported.  Some rarely used functions are
+missing, mainly because noone ever requested them.
diff --git a/databases/p5-DBD-mysql4/pkg-plist b/databases/p5-DBD-mysql4/pkg-plist
new file mode 100644
index 000000000000..bac17eb1028f
--- /dev/null
+++ b/databases/p5-DBD-mysql4/pkg-plist
@@ -0,0 +1,8 @@
+%%SITE_ARCH%%/Bundle/DBD/mysql.pm
+%%SITE_ARCH%%/DBD/mysql.pm
+%%SITE_ARCH%%/DBD/mysql/GetInfo.pm
+%%SITE_ARCH%%/DBD/mysql/INSTALL.pod
+%%SITE_ARCH%%/auto/DBD/mysql/mysql.so
+%%PERL5_MAN3%%/Bundle::DBD::mysql.3.gz
+%%PERL5_MAN3%%/DBD::mysql.3.gz
+%%PERL5_MAN3%%/DBD::mysql::INSTALL.3.gz
diff --git a/databases/p5-DBI-Shell/Makefile b/databases/p5-DBI-Shell/Makefile
index f0308a373cd3..19fda6a7021f 100644
--- a/databases/p5-DBI-Shell/Makefile
+++ b/databases/p5-DBI-Shell/Makefile
@@ -1,5 +1,3 @@
-# Created by: dcf@aracnet.com
-
 PORTNAME=	DBI-Shell
 PORTVERSION=	11.97
 CATEGORIES=	databases perl5
diff --git a/databases/p5-DBI/Makefile b/databases/p5-DBI/Makefile
index a92f09b26b46..0c81526a77ed 100644
--- a/databases/p5-DBI/Makefile
+++ b/databases/p5-DBI/Makefile
@@ -1,5 +1,3 @@
-# Created by: James FitzGibbon <jfitz@FreeBSD.org>
-
 PORTNAME=	DBI
 PORTVERSION=	1.643
 CATEGORIES=	databases perl5
@@ -8,6 +6,7 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl5 Database Interface, required for DBD::* modules
+WWW=		https://metacpan.org/release/DBI
 
 LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
diff --git a/databases/p5-DBI/pkg-descr b/databases/p5-DBI/pkg-descr
index b95efea6ecb2..58d8c73b991f 100644
--- a/databases/p5-DBI/pkg-descr
+++ b/databases/p5-DBI/pkg-descr
@@ -10,5 +10,4 @@ This strategy enables the DBI and drivers to serve a useful purpose
 whilst allowing the real interface to evolve with experience behind the
 emulation interface.
 
-WWW: http://dbi.perl.org
-WWW: https://metacpan.org/release/DBI
+See also: https://dbi.perl.org
diff --git a/databases/p5-DBICx-Deploy/Makefile b/databases/p5-DBICx-Deploy/Makefile
index e3c90c4e3234..e2ccc5ecfd62 100644
--- a/databases/p5-DBICx-Deploy/Makefile
+++ b/databases/p5-DBICx-Deploy/Makefile
@@ -1,5 +1,3 @@
-# Created by: Martin Wilke <miwi@FreeBSD.org>
-
 PORTNAME=	DBICx-Deploy
 PORTVERSION=	0.02
 PORTREVISION=	4
@@ -10,6 +8,7 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl 5 module to deploy a DBIx::Class schema
+WWW=		https://metacpan.org/release/DBICx-Deploy
 
 LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
diff --git a/databases/p5-DBICx-Deploy/pkg-descr b/databases/p5-DBICx-Deploy/pkg-descr
index e81a8b80ea6c..f2205c005307 100644
--- a/databases/p5-DBICx-Deploy/pkg-descr
+++ b/databases/p5-DBICx-Deploy/pkg-descr
@@ -1,4 +1,2 @@
 The Perl 5 module DBICx::Deploy deploys a DBIx::Class schema to a
 database. A command line script, dbicdeploy, is provided.
-
-WWW: https://metacpan.org/release/DBICx-Deploy
diff --git a/databases/p5-DBICx-MapMaker/Makefile b/databases/p5-DBICx-MapMaker/Makefile
index a087545682d7..29b0c1c05d24 100644
--- a/databases/p5-DBICx-MapMaker/Makefile
+++ b/databases/p5-DBICx-MapMaker/Makefile
@@ -1,5 +1,3 @@
-# Created by: Martin Wilke <miwi@FreeBSD.org>
-
 PORTNAME=	DBICx-MapMaker
 PORTVERSION=	0.03
 PORTREVISION=	1
@@ -10,6 +8,7 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl 5 module to automatically create a DBIx::Class mapping table
+WWW=		https://metacpan.org/release/DBICx-MapMaker
 
 LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
diff --git a/databases/p5-DBICx-MapMaker/pkg-descr b/databases/p5-DBICx-MapMaker/pkg-descr
index c8b53a755629..13b9f18566e8 100644
--- a/databases/p5-DBICx-MapMaker/pkg-descr
+++ b/databases/p5-DBICx-MapMaker/pkg-descr
@@ -1,4 +1,2 @@
 The Perl 5 module DBICx::MapMaker automatically creates a DBIx::Class
 result source for "many to many" relationship.
-
-WWW: https://metacpan.org/release/DBICx-MapMaker
diff --git a/databases/p5-DBICx-Sugar/Makefile b/databases/p5-DBICx-Sugar/Makefile
index 4b158beb765b..53787dbd685f 100644
--- a/databases/p5-DBICx-Sugar/Makefile
+++ b/databases/p5-DBICx-Sugar/Makefile
@@ -1,5 +1,3 @@
-# Created by: Muhammad Moinur Rahman <bofh@FreeBSD.org>
-
 PORTNAME=	DBICx-Sugar
 PORTVERSION=	0.0200
 CATEGORIES=	databases perl5
@@ -9,6 +7,7 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	Just some syntax sugar for DBIx::Class
+WWW=		https://metacpan.org/release/DBICx-Sugar
 
 LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
diff --git a/databases/p5-DBICx-Sugar/pkg-descr b/databases/p5-DBICx-Sugar/pkg-descr
index 3ccd2df283d7..be588a0f1ec8 100644
--- a/databases/p5-DBICx-Sugar/pkg-descr
+++ b/databases/p5-DBICx-Sugar/pkg-descr
@@ -1,5 +1,3 @@
 Just some syntax sugar for your DBIx::Class applications. This was originally
 created to remove code duplication between Dancer::Plugin::DBIC and
 Dancer2::Plugin::DBIC.
-
-WWW: https://metacpan.org/release/DBICx-Sugar
diff --git a/databases/p5-DBICx-TestDatabase/Makefile b/databases/p5-DBICx-TestDatabase/Makefile
index 31247a25ba19..ecf13718f31a 100644
--- a/databases/p5-DBICx-TestDatabase/Makefile
+++ b/databases/p5-DBICx-TestDatabase/Makefile
@@ -1,5 +1,3 @@
-# Created by: Martin Wilke <miwi@FreeBSD.org>
-
 PORTNAME=	DBICx-TestDatabase
 PORTVERSION=	0.05
 PORTREVISION=	2
@@ -10,6 +8,7 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Module to create temporary database from a DBIx::Class::Schema
+WWW=		https://metacpan.org/release/DBICx-TestDatabase
 
 LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
diff --git a/databases/p5-DBICx-TestDatabase/pkg-descr b/databases/p5-DBICx-TestDatabase/pkg-descr
index 44185b4fb817..8bbd4faadf4f 100644
--- a/databases/p5-DBICx-TestDatabase/pkg-descr
+++ b/databases/p5-DBICx-TestDatabase/pkg-descr
@@ -3,5 +3,3 @@ database, deploys your DBIC schema, and then connects to it. This
 lets you easily test your DBIC schema. Since you have a fresh
 database for every test, you don't have to worry about cleaning up
 after your tests, ordering of tests affecting failure, etc.
-
-WWW: https://metacpan.org/release/DBICx-TestDatabase
diff --git a/databases/p5-DBICx-TxnInsert/Makefile b/databases/p5-DBICx-TxnInsert/Makefile
index c5cc7e276bfe..ab640868ca6c 100644
--- a/databases/p5-DBICx-TxnInsert/Makefile
+++ b/databases/p5-DBICx-TxnInsert/Makefile
@@ -1,5 +1,3 @@
-# Created by: Andrey Kostenko <andrey@kostenko.name>
-
 PORTNAME=	DBICx-TxnInsert
 PORTVERSION=	0.02
 PORTREVISION=	2
@@ -10,6 +8,7 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Wrap all inserts into transaction
+WWW=		https://metacpan.org/release/DBICx-TxnInsert
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
 RUN_DEPENDS=	p5-DBIx-Class>=0:databases/p5-DBIx-Class \
diff --git a/databases/p5-DBICx-TxnInsert/pkg-descr b/databases/p5-DBICx-TxnInsert/pkg-descr
index 758ebac2b83b..d605f49bc2d1 100644
--- a/databases/p5-DBICx-TxnInsert/pkg-descr
+++ b/databases/p5-DBICx-TxnInsert/pkg-descr
@@ -1,3 +1 @@
 Wrap all inserts into transactions.
-
-WWW: https://metacpan.org/release/DBICx-TxnInsert
diff --git a/databases/p5-DBIWrapper/Makefile b/databases/p5-DBIWrapper/Makefile
index 618a2e6f556b..623d8e083901 100644
--- a/databases/p5-DBIWrapper/Makefile
+++ b/databases/p5-DBIWrapper/Makefile
@@ -1,5 +1,3 @@
-# Created by: Pete Fritchman <petef@databits.net>
-
 PORTNAME=	DBIWrapper
 PORTVERSION=	0.30
 PORTREVISION=	1
@@ -10,6 +8,7 @@ DISTNAME=	libdbiwrapper-perl-${PORTVERSION}
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension for generic DBI database access
+WWW=		https://dbiwrapper.sourceforge.net/
 
 LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
diff --git a/databases/p5-DBIWrapper/pkg-descr b/databases/p5-DBIWrapper/pkg-descr
index d5e6d19598b9..9801078261cf 100644
--- a/databases/p5-DBIWrapper/pkg-descr
+++ b/databases/p5-DBIWrapper/pkg-descr
@@ -8,5 +8,3 @@ modules and how to work with them correctly.
 Support for transactions on MySQL is now checked for and
 if found to be available, the AutoCommit flag is turned
 off so that transactions will be used.
-
-WWW: http://dbiwrapper.sourceforge.net/
diff --git a/databases/p5-DBIx-Abstract/Makefile b/databases/p5-DBIx-Abstract/Makefile
index 720f7e3df278..305f1c477d8f 100644
--- a/databases/p5-DBIx-Abstract/Makefile
+++ b/databases/p5-DBIx-Abstract/Makefile
@@ -1,5 +1,3 @@
-# Created by: Jon Nistor <nistor@snickers.org>
-
 PORTNAME=	DBIx-Abstract
 PORTVERSION=	1.040
 CATEGORIES=	databases perl5
@@ -9,6 +7,7 @@ DISTNAME=	${PORTNAME}-${PORTVERSION:C/0$//}
 
 MAINTAINER=	nistor@snickers.org
 COMMENT=	Perl module for DBI SQL abstraction
+WWW=		https://metacpan.org/release/DBIx-Abstract
 
 LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
diff --git a/databases/p5-DBIx-Abstract/pkg-descr b/databases/p5-DBIx-Abstract/pkg-descr
index b72d974ba4c7..037b01302b7d 100644
--- a/databases/p5-DBIx-Abstract/pkg-descr
+++ b/databases/p5-DBIx-Abstract/pkg-descr
@@ -18,5 +18,3 @@ Notable features include:
   * Generates complex where clauses from hashes and arrays.
   * Shortcuts (convenience functions) for some common cases. (Like
     select_all_to_hashref.)
-
-WWW: https://metacpan.org/release/DBIx-Abstract
diff --git a/databases/p5-DBIx-Admin-CreateTable/Makefile b/databases/p5-DBIx-Admin-CreateTable/Makefile
index 49553f50152d..bb23e33934f1 100644
--- a/databases/p5-DBIx-Admin-CreateTable/Makefile
+++ b/databases/p5-DBIx-Admin-CreateTable/Makefile
@@ -1,5 +1,3 @@
-# Created by: Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>
-
 PORTNAME=	DBIx-Admin-CreateTable
 PORTVERSION=	2.11
 CATEGORIES=	databases perl5
@@ -8,6 +6,7 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Create and drop tables, primary indexes, and sequences
+WWW=		https://metacpan.org/release/DBIx-Admin-CreateTable
 
 LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
diff --git a/databases/p5-DBIx-Admin-CreateTable/pkg-descr b/databases/p5-DBIx-Admin-CreateTable/pkg-descr
index feed88bd6823..4186618f6714 100644
--- a/databases/p5-DBIx-Admin-CreateTable/pkg-descr
+++ b/databases/p5-DBIx-Admin-CreateTable/pkg-descr
@@ -15,5 +15,3 @@ Assumptions:
   sequence is called 't_id_seq': This is true for both Oracle and Postgres,
   which use sequences to populate primary key columns. The sequences are named
   after both the table and the column.
-
-WWW: https://metacpan.org/release/DBIx-Admin-CreateTable
diff --git a/databases/p5-DBIx-Admin-DSNManager/Makefile b/databases/p5-DBIx-Admin-DSNManager/Makefile
index 9f981c6748cc..48445434f799 100644
--- a/databases/p5-DBIx-Admin-DSNManager/Makefile
+++ b/databases/p5-DBIx-Admin-DSNManager/Makefile
@@ -1,5 +1,3 @@
-# Created by: Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>
-
 PORTNAME=	DBIx-Admin-DSNManager
 PORTVERSION=	2.02
 CATEGORIES=	databases perl5
@@ -8,6 +6,7 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Manage a file of DSNs, for both testing and production
+WWW=		https://metacpan.org/release/DBIx-Admin-DSNManager
 
 LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
diff --git a/databases/p5-DBIx-Admin-DSNManager/pkg-descr b/databases/p5-DBIx-Admin-DSNManager/pkg-descr
index ebf933c6f716..cf6352a8a3ed 100644
--- a/databases/p5-DBIx-Admin-DSNManager/pkg-descr
+++ b/databases/p5-DBIx-Admin-DSNManager/pkg-descr
@@ -20,5 +20,3 @@ database server, with awkward and hard-to-guess names. This is messy and
 obscure.
 
 DBIx::Admin::DSNManager is a solution to this problem.
-
-WWW: https://metacpan.org/release/DBIx-Admin-DSNManager
diff --git a/databases/p5-DBIx-Admin-TableInfo/Makefile b/databases/p5-DBIx-Admin-TableInfo/Makefile
index 4d704dca215b..96ad2b956e13 100644
--- a/databases/p5-DBIx-Admin-TableInfo/Makefile
+++ b/databases/p5-DBIx-Admin-TableInfo/Makefile
@@ -1,5 +1,3 @@
-# Created by: Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>
-
 PORTNAME=	DBIx-Admin-TableInfo
 PORTVERSION=	3.04
 CATEGORIES=	databases perl5
@@ -8,6 +6,7 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Wrapper for all of table_info(), column_info(), *_key_info()
+WWW=		https://metacpan.org/release/DBIx-Admin-TableInfo
 
 LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
diff --git a/databases/p5-DBIx-Admin-TableInfo/pkg-descr b/databases/p5-DBIx-Admin-TableInfo/pkg-descr
index c4d3252f4eb6..1cca44551d38 100644
--- a/databases/p5-DBIx-Admin-TableInfo/pkg-descr
+++ b/databases/p5-DBIx-Admin-TableInfo/pkg-descr
@@ -4,5 +4,3 @@ all of these DBI methods:
 - column_info()
 - primary_key_info()
 - foreign_key_info()
-
-WWW: https://metacpan.org/release/DBIx-Admin-TableInfo
diff --git a/databases/p5-DBIx-AnyDBD/Makefile b/databases/p5-DBIx-AnyDBD/Makefile
index 8ceb610f6d56..196f42cc59a4 100644
--- a/databases/p5-DBIx-AnyDBD/Makefile
+++ b/databases/p5-DBIx-AnyDBD/Makefile
@@ -1,5 +1,3 @@
-# Created by: Seamus Venasse <svenasse@polaris.ca>
-
 PORTNAME=	DBIx-AnyDBD
 PORTVERSION=	2.03
 CATEGORIES=	databases perl5
@@ -8,6 +6,7 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	DBD independent class
+WWW=		https://metacpan.org/release/DBIx-AnyDBD
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
 RUN_DEPENDS=	p5-DBI>=0:databases/p5-DBI
diff --git a/databases/p5-DBIx-AnyDBD/pkg-descr b/databases/p5-DBIx-AnyDBD/pkg-descr
index d864d191e6ab..1e207d9e7ce7 100644
--- a/databases/p5-DBIx-AnyDBD/pkg-descr
+++ b/databases/p5-DBIx-AnyDBD/pkg-descr
@@ -4,5 +4,3 @@ that works on multiple database platforms. The idea isn't to take
 away the responsibility for coding different SQL on different
 platforms, but to simply provide a platform that uses the right
 class at the right time for whatever DB is currently in use.
-
-WWW: https://metacpan.org/release/DBIx-AnyDBD
diff --git a/databases/p5-DBIx-Browse/Makefile b/databases/p5-DBIx-Browse/Makefile
index af4c9fa4f6db..bf1070eab447 100644
--- a/databases/p5-DBIx-Browse/Makefile
+++ b/databases/p5-DBIx-Browse/Makefile
@@ -1,5 +1,3 @@
-# Created by: Philip M. Gollucci <philip@p6m7g8.com>
-
 PORTNAME=	DBIx-Browse
 PORTVERSION=	2.09
 PORTREVISION=	1
@@ -9,6 +7,7 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension to browse tables
+WWW=		https://metacpan.org/release/DBIx-Browse
 
 BUILD_DEPENDS=	p5-DBI>=0:databases/p5-DBI
 RUN_DEPENDS=	p5-DBI>=0:databases/p5-DBI
diff --git a/databases/p5-DBIx-Browse/pkg-descr b/databases/p5-DBIx-Browse/pkg-descr
index e2ada1e020b6..ff53901d7f10 100644
--- a/databases/p5-DBIx-Browse/pkg-descr
+++ b/databases/p5-DBIx-Browse/pkg-descr
@@ -8,6 +8,4 @@ detail table has a reference (FOREIGN KEY) to a generic table (i.e.
 Customers and Bills) with some index (tipically an integer).
 
 
-WWW: https://metacpan.org/release/DBIx-Browse
-
 Philip M. Gollucci <philip@p6m7g8.com>
diff --git a/databases/p5-DBIx-Class-AsFdat/Makefile b/databases/p5-DBIx-Class-AsFdat/Makefile
index d6d6edb31d26..cf27029d644e 100644
--- a/databases/p5-DBIx-Class-AsFdat/Makefile
+++ b/databases/p5-DBIx-Class-AsFdat/Makefile
@@ -5,8 +5,9 @@ CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension like CDBI::Plugin::AsFdat
+WWW=		https://metacpan.org/release/DBIx-Class-AsFdat
 
 RUN_DEPENDS=	\
 	p5-DBIx-Class>0:databases/p5-DBIx-Class
diff --git a/databases/p5-DBIx-Class-AsFdat/pkg-descr b/databases/p5-DBIx-Class-AsFdat/pkg-descr
index f5e09e95f1fc..bfd7bfd34ab4 100644
--- a/databases/p5-DBIx-Class-AsFdat/pkg-descr
+++ b/databases/p5-DBIx-Class-AsFdat/pkg-descr
@@ -1,3 +1 @@
 DBIx::Class::AsFdat - like CDBI::Plugin::AsFdat.
-
-WWW: https://metacpan.org/release/DBIx-Class-AsFdat
diff --git a/databases/p5-DBIx-Class-AuditLog/Makefile b/databases/p5-DBIx-Class-AuditLog/Makefile
index 47eb807c5424..794d45b0e549 100644
--- a/databases/p5-DBIx-Class-AuditLog/Makefile
+++ b/databases/p5-DBIx-Class-AuditLog/Makefile
@@ -6,6 +6,7 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	bokutin@bokut.in
 COMMENT=	Simple activity audit logging for DBIx::Class
+WWW=		https://metacpan.org/release/DBIx-Class-AuditLog
 
 LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
diff --git a/databases/p5-DBIx-Class-AuditLog/pkg-descr b/databases/p5-DBIx-Class-AuditLog/pkg-descr
index 41563d1fb961..21c6a29ba60e 100644
--- a/databases/p5-DBIx-Class-AuditLog/pkg-descr
+++ b/databases/p5-DBIx-Class-AuditLog/pkg-descr
@@ -1,4 +1,2 @@
 Simple activity audit logging for DBIx::Class. Save the update contents in
 another tables.
-
-WWW: https://metacpan.org/release/DBIx-Class-AuditLog
diff --git a/databases/p5-DBIx-Class-BitField/Makefile b/databases/p5-DBIx-Class-BitField/Makefile
index 366ffd7dd86d..18db29814c7d 100644
--- a/databases/p5-DBIx-Class-BitField/Makefile
+++ b/databases/p5-DBIx-Class-BitField/Makefile
@@ -1,5 +1,3 @@
-# Created by: Ryan Steinmetz <zi@FreeBSD.org>
-
 PORTNAME=	DBIx-Class-BitField
 PORTVERSION=	0.13
 PORTREVISION=	1
@@ -9,6 +7,7 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Store multiple boolean fields in one integer field
+WWW=		https://metacpan.org/release/DBIx-Class-BitField
 
 RUN_DEPENDS=	p5-DBIx-Class>=0:databases/p5-DBIx-Class
 BUILD_DEPENDS=	${RUN_DEPENDS}
diff --git a/databases/p5-DBIx-Class-BitField/pkg-descr b/databases/p5-DBIx-Class-BitField/pkg-descr
index 936deedf1a00..d3d5e6d482c0 100644
--- a/databases/p5-DBIx-Class-BitField/pkg-descr
+++ b/databases/p5-DBIx-Class-BitField/pkg-descr
@@ -8,5 +8,3 @@ A bit field is a way to store multiple bit values on one integer field.
 The main benefit from this module is that you can add additional attributes
 to your result class whithout the need to deploy or change the schema on the
 data base.
-
-WWW: https://metacpan.org/release/DBIx-Class-BitField
diff --git a/databases/p5-DBIx-Class-Candy/Makefile b/databases/p5-DBIx-Class-Candy/Makefile
index 3dc0525f4d30..4faa1865ee45 100644
--- a/databases/p5-DBIx-Class-Candy/Makefile
+++ b/databases/p5-DBIx-Class-Candy/Makefile
@@ -1,5 +1,3 @@
-# Created by: Wen Heping <wen@FreeBSD.org>
-
 PORTNAME=	DBIx-Class-Candy
 PORTVERSION=	0.005003
 CATEGORIES=	databases perl5
@@ -8,6 +6,7 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Sugar for your favorite ORM, DBIx::Class
+WWW=		https://metacpan.org/release/DBIx-Class-Candy
 
 LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
diff --git a/databases/p5-DBIx-Class-Candy/pkg-descr b/databases/p5-DBIx-Class-Candy/pkg-descr
index f464b387ac3f..869978b85fd0 100644
--- a/databases/p5-DBIx-Class-Candy/pkg-descr
+++ b/databases/p5-DBIx-Class-Candy/pkg-descr
@@ -1,5 +1,3 @@
 DBIx::Class::Candy is a simple sugar layer for definition of DBIx::Class
 results. Note that it may later be expanded to add sugar for more
 DBIx::Class related things.
-
-WWW: https://metacpan.org/release/DBIx-Class-Candy
diff --git a/databases/p5-DBIx-Class-Cursor-Cached/Makefile b/databases/p5-DBIx-Class-Cursor-Cached/Makefile
index 95cab1a82d22..1cfcfff76c06 100644
--- a/databases/p5-DBIx-Class-Cursor-Cached/Makefile
+++ b/databases/p5-DBIx-Class-Cursor-Cached/Makefile
@@ -1,5 +1,3 @@
-# Created by: Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>
-
 PORTNAME=	DBIx-Class-Cursor-Cached
 PORTVERSION=	1.001004
 CATEGORIES=	databases perl5
@@ -8,6 +6,7 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Cursor class with built-in caching support
+WWW=		https://metacpan.org/release/DBIx-Class-Cursor-Cached
 
 LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
diff --git a/databases/p5-DBIx-Class-Cursor-Cached/pkg-descr b/databases/p5-DBIx-Class-Cursor-Cached/pkg-descr
index a07bb7026e3e..3848c3135932 100644
--- a/databases/p5-DBIx-Class-Cursor-Cached/pkg-descr
+++ b/databases/p5-DBIx-Class-Cursor-Cached/pkg-descr
@@ -1,3 +1 @@
 DBIx::Class::Cursor::Cached provides cursor class with built-in caching support.
-
-WWW: https://metacpan.org/release/DBIx-Class-Cursor-Cached
diff --git a/databases/p5-DBIx-Class-CustomPrefetch/Makefile b/databases/p5-DBIx-Class-CustomPrefetch/Makefile
index 4c80c34506d5..01a89c375470 100644
--- a/databases/p5-DBIx-Class-CustomPrefetch/Makefile
+++ b/databases/p5-DBIx-Class-CustomPrefetch/Makefile
@@ -1,5 +1,3 @@
-# Created by: Anes Mukhametov <anes@anes.su>
-
 PORTNAME=	DBIx-Class-CustomPrefetch
 PORTVERSION=	0.09
 PORTREVISION=	2
@@ -9,6 +7,7 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	anes@anes.su
 COMMENT=	Custom prefetches for DBIx::Class
+WWW=		https://metacpan.org/release/DBIx-Class-CustomPrefetch
 
 LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
diff --git a/databases/p5-DBIx-Class-CustomPrefetch/pkg-descr b/databases/p5-DBIx-Class-CustomPrefetch/pkg-descr
index d5fadf315575..2c0f9b6efdd2 100644
--- a/databases/p5-DBIx-Class-CustomPrefetch/pkg-descr
+++ b/databases/p5-DBIx-Class-CustomPrefetch/pkg-descr
@@ -5,5 +5,3 @@ E.g. for prefetching many related objects to resultset with paging.
 Also you can use this module to create cross-database prefetches.
 
 This module provides other logic for prefetching data to resultsets.
-
-WWW: https://metacpan.org/release/DBIx-Class-CustomPrefetch
diff --git a/databases/p5-DBIx-Class-DateTime-Epoch/Makefile b/databases/p5-DBIx-Class-DateTime-Epoch/Makefile
index 46aae5dcb26e..8e556103e691 100644
--- a/databases/p5-DBIx-Class-DateTime-Epoch/Makefile
+++ b/databases/p5-DBIx-Class-DateTime-Epoch/Makefile
@@ -1,5 +1,3 @@
-# Created by: Lars Balker Rasmussen <lbr@FreeBSD.org>
-
 PORTNAME=	DBIx-Class-DateTime-Epoch
 PORTVERSION=	0.10
 PORTREVISION=	1
@@ -9,6 +7,7 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Automatic inflation/deflation of epoch-based DateTime objects
+WWW=		https://metacpan.org/release/DBIx-Class-DateTime-Epoch
 
 LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
diff --git a/databases/p5-DBIx-Class-DateTime-Epoch/pkg-descr b/databases/p5-DBIx-Class-DateTime-Epoch/pkg-descr
index 6b845f01e0e1..53aa929b98be 100644
--- a/databases/p5-DBIx-Class-DateTime-Epoch/pkg-descr
+++ b/databases/p5-DBIx-Class-DateTime-Epoch/pkg-descr
@@ -3,5 +3,3 @@ corresponding to applicable columns. Columns may also be
 defined to specify their nature, such as columns representing a
 creation time (set at time of insertion) or a modification time
 (set at time of every update).
-
-WWW: https://metacpan.org/release/DBIx-Class-DateTime-Epoch
diff --git a/databases/p5-DBIx-Class-DeploymentHandler/Makefile b/databases/p5-DBIx-Class-DeploymentHandler/Makefile
index 9bac55c130c3..eac20bdf35aa 100644
--- a/databases/p5-DBIx-Class-DeploymentHandler/Makefile
+++ b/databases/p5-DBIx-Class-DeploymentHandler/Makefile
@@ -1,11 +1,12 @@
 PORTNAME=	DBIx-Class-DeploymentHandler
-PORTVERSION=	0.002230
+PORTVERSION=	0.002233
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension for extensible DBIx::Class deployment
+WWW=		https://metacpan.org/release/DBIx-Class-DeploymentHandler
 
 LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
@@ -17,13 +18,14 @@ RUN_DEPENDS=	\
 	p5-DBIx-Class>=0.08121:databases/p5-DBIx-Class \
 	p5-Log-Contextual>=0.005005:devel/p5-Log-Contextual \
 	p5-Method-Signatures-Simple>=0.05:devel/p5-Method-Signatures-Simple \
-	p5-Moo>=2:devel/p5-Moo \
-	p5-MooX-Role-Parameterized>=0.082:devel/p5-MooX-Role-Parameterized \
+	p5-Moose>=1:devel/p5-Moose \
+	p5-MooseX-Role-Parameterized>=0.18:devel/p5-MooseX-Role-Parameterized \
 	p5-SQL-Translator>=0.11005:databases/p5-SQL-Translator \
 	p5-Sub-Exporter-Progressive>0:devel/p5-Sub-Exporter-Progressive \
 	p5-Text-Brew>=0.02:textproc/p5-Text-Brew \
 	p5-Try-Tiny>0:lang/p5-Try-Tiny \
 	p5-Type-Tiny>=1.004004:devel/p5-Type-Tiny \
+	p5-YAML>0.66:textproc/p5-YAML \
 	p5-namespace-autoclean>0:devel/p5-namespace-autoclean
 
 USES=		perl5
diff --git a/databases/p5-DBIx-Class-DeploymentHandler/distinfo b/databases/p5-DBIx-Class-DeploymentHandler/distinfo
index 74c4439d3c57..90ef3e25ce98 100644
--- a/databases/p5-DBIx-Class-DeploymentHandler/distinfo
+++ b/databases/p5-DBIx-Class-DeploymentHandler/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1553479679
-SHA256 (DBIx-Class-DeploymentHandler-0.002230.tar.gz) = 0195c71a222049cfa9e3a24f282ff473100c4b897fb4627103baa4f333ed31c4
-SIZE (DBIx-Class-DeploymentHandler-0.002230.tar.gz) = 76230
+TIMESTAMP = 1648128476
+SHA256 (DBIx-Class-DeploymentHandler-0.002233.tar.gz) = 954016d0bb7423facc82558430ac3260deff37d675a2dc1cbc3dd43b70b833ae
+SIZE (DBIx-Class-DeploymentHandler-0.002233.tar.gz) = 78923
diff --git a/databases/p5-DBIx-Class-DeploymentHandler/pkg-descr b/databases/p5-DBIx-Class-DeploymentHandler/pkg-descr
index 650bc34647f5..025cbd70bd32 100644
--- a/databases/p5-DBIx-Class-DeploymentHandler/pkg-descr
+++ b/databases/p5-DBIx-Class-DeploymentHandler/pkg-descr
@@ -2,5 +2,3 @@ DBIx::Class::DeploymentHandler is, as its name suggests, a tool for
 deploying and upgrading databases with DBIx::Class.  It is designed to
 be much more flexible than DBIx::Class::Schema::Versioned, hence the
 use of Moose and lots of roles.
-
-WWW: https://metacpan.org/release/DBIx-Class-DeploymentHandler
diff --git a/databases/p5-DBIx-Class-DigestColumns/Makefile b/databases/p5-DBIx-Class-DigestColumns/Makefile
index cd18c55c6c54..8962a329107b 100644
--- a/databases/p5-DBIx-Class-DigestColumns/Makefile
+++ b/databases/p5-DBIx-Class-DigestColumns/Makefile
@@ -1,5 +1,3 @@
-# Created by: Lars Balker Rasmussen <lbr@FreeBSD.org>
-
 PORTNAME=	DBIx-Class-DigestColumns
 PORTVERSION=	0.06000
 PORTREVISION=	2
@@ -9,6 +7,7 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Automatic digest columns
+WWW=		https://metacpan.org/release/DBIx-Class-DigestColumns
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
 RUN_DEPENDS=	p5-DBIx-Class>=0.06002:databases/p5-DBIx-Class
diff --git a/databases/p5-DBIx-Class-DigestColumns/pkg-descr b/databases/p5-DBIx-Class-DigestColumns/pkg-descr
index 85a4a43aa26a..5c44ea4de384 100644
--- a/databases/p5-DBIx-Class-DigestColumns/pkg-descr
+++ b/databases/p5-DBIx-Class-DigestColumns/pkg-descr
@@ -1,5 +1,3 @@
 This DBIx::Class component can be used to automatically insert a message
 digest of selected columns. By default DigestColumns will use Digest::MD5
 to insert a 128-bit hexadecimal message digest of the column value.
-
-WWW: https://metacpan.org/release/DBIx-Class-DigestColumns
diff --git a/databases/p5-DBIx-Class-DynamicDefault/Makefile b/databases/p5-DBIx-Class-DynamicDefault/Makefile
index b64d446aa8be..c704479be540 100644
--- a/databases/p5-DBIx-Class-DynamicDefault/Makefile
+++ b/databases/p5-DBIx-Class-DynamicDefault/Makefile
@@ -1,5 +1,3 @@
-# Created by: Lars Thegler <lth@FreeBSD.org>
-
 PORTNAME=	DBIx-Class-DynamicDefault
 PORTVERSION=	0.04
 PORTREVISION=	1
@@ -9,6 +7,7 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Automatically set and update fields
+WWW=		https://metacpan.org/release/DBIx-Class-DynamicDefault
 
 LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
diff --git a/databases/p5-DBIx-Class-DynamicDefault/pkg-descr b/databases/p5-DBIx-Class-DynamicDefault/pkg-descr
index 913452bea0bb..91ad65d20bc3 100644
--- a/databases/p5-DBIx-Class-DynamicDefault/pkg-descr
+++ b/databases/p5-DBIx-Class-DynamicDefault/pkg-descr
@@ -1,3 +1 @@
 Automatically set and update fields with values calculated at runtime.
-
-WWW: https://metacpan.org/release/DBIx-Class-DynamicDefault
diff --git a/databases/p5-DBIx-Class-DynamicSubclass/Makefile b/databases/p5-DBIx-Class-DynamicSubclass/Makefile
index b402483dc7bd..b457a6fc03e5 100644
--- a/databases/p5-DBIx-Class-DynamicSubclass/Makefile
+++ b/databases/p5-DBIx-Class-DynamicSubclass/Makefile
@@ -1,5 +1,3 @@
-# Created by: Vladimir Timofeev <vovkasm@gmail.com>
-
 PORTNAME=	DBIx-Class-DynamicSubclass
 PORTVERSION=	0.03
 PORTREVISION=	1
@@ -9,6 +7,7 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	vovkasm@gmail.com
 COMMENT=	Use dynamic subclassing with DBIx::Class
+WWW=		https://metacpan.org/release/DBIx-Class-DynamicSubclass
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
 RUN_DEPENDS=	p5-DBIx-Class>=0.07003:databases/p5-DBIx-Class
diff --git a/databases/p5-DBIx-Class-DynamicSubclass/pkg-descr b/databases/p5-DBIx-Class-DynamicSubclass/pkg-descr
index 8c0a7ae7c15a..d903353fa60c 100644
--- a/databases/p5-DBIx-Class-DynamicSubclass/pkg-descr
+++ b/databases/p5-DBIx-Class-DynamicSubclass/pkg-descr
@@ -1,5 +1,3 @@
 Convenient way to use dynamic subclassing. This plugin implements
 methodics described in "Dynamic Sub-classing DBIx::Class proxy classes"
 in DBIx::Class::Manual::Cookbook.
-
-WWW: https://metacpan.org/release/DBIx-Class-DynamicSubclass
diff --git a/databases/p5-DBIx-Class-EncodeColumns/Makefile b/databases/p5-DBIx-Class-EncodeColumns/Makefile
index bbfba7dc9750..033b1c6893b7 100644
--- a/databases/p5-DBIx-Class-EncodeColumns/Makefile
+++ b/databases/p5-DBIx-Class-EncodeColumns/Makefile
@@ -1,5 +1,3 @@
-# Created by: Vladimir Timofeev <vovkasm@gmail.com>
-
 PORTNAME=	DBIx-Class-EncodeColumns
 PORTVERSION=	0.02
 PORTREVISION=	1
@@ -9,6 +7,7 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	vovkasm@gmail.com
 COMMENT=	Handle column encodings
+WWW=		https://metacpan.org/release/DBIx-Class-EncodeColumns
 
 RUN_DEPENDS=	p5-DBIx-Class>=0.06002:databases/p5-DBIx-Class
 BUILD_DEPENDS=	p5-DBIx-Class>=0.06002:databases/p5-DBIx-Class
diff --git a/databases/p5-DBIx-Class-EncodeColumns/pkg-descr b/databases/p5-DBIx-Class-EncodeColumns/pkg-descr
index 2720328faf29..9cda730652d4 100644
--- a/databases/p5-DBIx-Class-EncodeColumns/pkg-descr
+++ b/databases/p5-DBIx-Class-EncodeColumns/pkg-descr
@@ -1,3 +1 @@
 This module allows you to handle column encodings
-
-WWW: https://metacpan.org/release/DBIx-Class-EncodeColumns
diff --git a/databases/p5-DBIx-Class-EncodedColumn/Makefile b/databases/p5-DBIx-Class-EncodedColumn/Makefile
index 5413ae219761..16beb9771199 100644
--- a/databases/p5-DBIx-Class-EncodedColumn/Makefile
+++ b/databases/p5-DBIx-Class-EncodedColumn/Makefile
@@ -1,5 +1,3 @@
-# Created by: Lars Balker Rasmussen <lbr@FreeBSD.org>
-
 PORTNAME=	DBIx-Class-EncodedColumn
 PORTVERSION=	0.00020
 CATEGORIES=	databases perl5
@@ -8,6 +6,7 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Automatically encode columns
+WWW=		https://metacpan.org/release/DBIx-Class-EncodedColumn
 
 LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
diff --git a/databases/p5-DBIx-Class-EncodedColumn/pkg-descr b/databases/p5-DBIx-Class-EncodedColumn/pkg-descr
index 249f8e43cbee..71d1a3d25131 100644
--- a/databases/p5-DBIx-Class-EncodedColumn/pkg-descr
+++ b/databases/p5-DBIx-Class-EncodedColumn/pkg-descr
@@ -1,4 +1,2 @@
 This DBIx::Class component can be used to automatically encode a
 column's contents whenever the value of that column is set.
-
-WWW: https://metacpan.org/release/DBIx-Class-EncodedColumn
diff --git a/databases/p5-DBIx-Class-Fixtures/Makefile b/databases/p5-DBIx-Class-Fixtures/Makefile
index 65ce1bc11241..b53aa976b531 100644
--- a/databases/p5-DBIx-Class-Fixtures/Makefile
+++ b/databases/p5-DBIx-Class-Fixtures/Makefile
@@ -5,8 +5,9 @@ MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:SKAUFMAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension to use fixtures with DBIx::Class
+WWW=		https://metacpan.org/release/DBIx-Class-Fixtures
 
 LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
diff --git a/databases/p5-DBIx-Class-Fixtures/pkg-descr b/databases/p5-DBIx-Class-Fixtures/pkg-descr
index 53648e0d855b..08b578ad14de 100644
--- a/databases/p5-DBIx-Class-Fixtures/pkg-descr
+++ b/databases/p5-DBIx-Class-Fixtures/pkg-descr
@@ -3,5 +3,3 @@ another database (with same schema) at any time.  Use as a constant
 dataset for running tests against or for populating development
 databases when impractical to use production clones.  Describe fixture
 set using relations and conditions based on your DBIx::Class schema.
-
-WWW: https://metacpan.org/release/DBIx-Class-Fixtures
diff --git a/databases/p5-DBIx-Class-FrozenColumns/Makefile b/databases/p5-DBIx-Class-FrozenColumns/Makefile
index 809c3cf148bb..186d8c84a0f6 100644
--- a/databases/p5-DBIx-Class-FrozenColumns/Makefile
+++ b/databases/p5-DBIx-Class-FrozenColumns/Makefile
@@ -1,5 +1,3 @@
-# Created by: Vladimir Timofeev <vovkasm@gmail.com>
-
 PORTNAME=	DBIx-Class-FrozenColumns
 PORTVERSION=	0.09
 PORTREVISION=	2
@@ -9,6 +7,7 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	vovkasm@gmail.com
 COMMENT=	Store virtual columns inside another column
+WWW=		https://metacpan.org/release/DBIx-Class-FrozenColumns
 
 LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
diff --git a/databases/p5-DBIx-Class-FrozenColumns/pkg-descr b/databases/p5-DBIx-Class-FrozenColumns/pkg-descr
index 3746405d675d..b2cb2a1ac80c 100644
--- a/databases/p5-DBIx-Class-FrozenColumns/pkg-descr
+++ b/databases/p5-DBIx-Class-FrozenColumns/pkg-descr
@@ -1,5 +1,3 @@
 This module allows you to store multiple columns in one and
 transparently use this columns as if they were normal columns
 in your table.
-
-WWW: https://metacpan.org/release/DBIx-Class-FrozenColumns
diff --git a/databases/p5-DBIx-Class-Helpers/Makefile b/databases/p5-DBIx-Class-Helpers/Makefile
index ea115b53c1bc..f25950bca87d 100644
--- a/databases/p5-DBIx-Class-Helpers/Makefile
+++ b/databases/p5-DBIx-Class-Helpers/Makefile
@@ -1,5 +1,3 @@
-# Created by: Tom Judge <tj@FreeBSD.org>
-
 PORTNAME=	DBIx-Class-Helpers
 PORTVERSION=	2.036000
 CATEGORIES=	databases perl5
@@ -8,6 +6,7 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Simplify the common case stuff for DBIx::Class
+WWW=		https://metacpan.org/release/DBIx-Class-Helpers
 
 LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
diff --git a/databases/p5-DBIx-Class-Helpers/pkg-descr b/databases/p5-DBIx-Class-Helpers/pkg-descr
index ecbac804d8a3..073eb1c8fc50 100644
--- a/databases/p5-DBIx-Class-Helpers/pkg-descr
+++ b/databases/p5-DBIx-Class-Helpers/pkg-descr
@@ -1,4 +1,2 @@
 DBIx::Class::Helpers is a collection of tools to help simplify the
 common tasks in DBIx::Class.
-
-WWW: https://metacpan.org/release/DBIx-Class-Helpers
diff --git a/databases/p5-DBIx-Class-InflateColumn-Authen-Passphrase/Makefile b/databases/p5-DBIx-Class-InflateColumn-Authen-Passphrase/Makefile
index 54d96d1abb74..b77431dec6d1 100644
--- a/databases/p5-DBIx-Class-InflateColumn-Authen-Passphrase/Makefile
+++ b/databases/p5-DBIx-Class-InflateColumn-Authen-Passphrase/Makefile
@@ -7,6 +7,7 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	fw@moov.de
 COMMENT=	Inflate/deflate columns to Authen::Passphrase instances
+WWW=		https://metacpan.org/release/DBIx-Class-InflateColumn-Authen-Passphrase
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
 RUN_DEPENDS=	p5-DBIx-Class-DynamicDefault>=0.03:databases/p5-DBIx-Class-DynamicDefault \
diff --git a/databases/p5-DBIx-Class-InflateColumn-Authen-Passphrase/pkg-descr b/databases/p5-DBIx-Class-InflateColumn-Authen-Passphrase/pkg-descr
index fa04b77ecca9..e76a0eb984d7 100644
--- a/databases/p5-DBIx-Class-InflateColumn-Authen-Passphrase/pkg-descr
+++ b/databases/p5-DBIx-Class-InflateColumn-Authen-Passphrase/pkg-descr
@@ -1,4 +1,2 @@
 Provides inflation and deflation for Authen::Passphrase instances from
 and to either RFC 2307 or crypt encoding.
-
-WWW: https://metacpan.org/release/DBIx-Class-InflateColumn-Authen-Passphrase
diff --git a/databases/p5-DBIx-Class-InflateColumn-FS/Makefile b/databases/p5-DBIx-Class-InflateColumn-FS/Makefile
index 5dfd24ba85e4..f459c92d8751 100644
--- a/databases/p5-DBIx-Class-InflateColumn-FS/Makefile
+++ b/databases/p5-DBIx-Class-InflateColumn-FS/Makefile
@@ -5,8 +5,9 @@ CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension to {in,de}flate columns to Path::Class::File objects
+WWW=		https://metacpan.org/release/DBIx-Class-InflateColumn-FS
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
 RUN_DEPENDS=	\
diff --git a/databases/p5-DBIx-Class-InflateColumn-FS/pkg-descr b/databases/p5-DBIx-Class-InflateColumn-FS/pkg-descr
index beb33fd80bd7..c0f140589502 100644
--- a/databases/p5-DBIx-Class-InflateColumn-FS/pkg-descr
+++ b/databases/p5-DBIx-Class-InflateColumn-FS/pkg-descr
@@ -12,5 +12,3 @@ _fs_column_dirs in a derived class to change this behavior.
 
 fs_new_on_update will create a new file name if the file has been
 updated.
-
-WWW: https://metacpan.org/release/DBIx-Class-InflateColumn-FS
diff --git a/databases/p5-DBIx-Class-InflateColumn-IP/Makefile b/databases/p5-DBIx-Class-InflateColumn-IP/Makefile
index 092227aa62f9..687d407a0bcd 100644
--- a/databases/p5-DBIx-Class-InflateColumn-IP/Makefile
+++ b/databases/p5-DBIx-Class-InflateColumn-IP/Makefile
@@ -1,5 +1,3 @@
-# Created by: Martin Wilke <miwi@FreeBSD.org>
-
 PORTNAME=	DBIx-Class-InflateColumn-IP
 PORTVERSION=	0.02003
 PORTREVISION=	1
@@ -9,6 +7,7 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Component to auto-create NetAddr::IP objects from columns
+WWW=		https://metacpan.org/release/DBIx-Class-InflateColumn-IP
 
 BUILD_DEPENDS=	p5-DBIx-Class>=0.06002:databases/p5-DBIx-Class \
 		p5-NetAddr-IP>=4.00.7:net-mgmt/p5-NetAddr-IP
diff --git a/databases/p5-DBIx-Class-InflateColumn-IP/pkg-descr b/databases/p5-DBIx-Class-InflateColumn-IP/pkg-descr
index 184ec5f0dd78..9b1072e29fb8 100644
--- a/databases/p5-DBIx-Class-InflateColumn-IP/pkg-descr
+++ b/databases/p5-DBIx-Class-InflateColumn-IP/pkg-descr
@@ -1,5 +1,3 @@
 The Perl 5 module DBIx::Class::InflateColumn::IP is a DBIx::Class
 component to declare columns as IP addresses and treat them as
 NetAddr::IP objects.
-
-WWW: https://metacpan.org/release/DBIx-Class-InflateColumn-IP
diff --git a/databases/p5-DBIx-Class-InflateColumn-Serializer/Makefile b/databases/p5-DBIx-Class-InflateColumn-Serializer/Makefile
index 716f89a1cc67..4e67018d9c92 100644
--- a/databases/p5-DBIx-Class-InflateColumn-Serializer/Makefile
+++ b/databases/p5-DBIx-Class-InflateColumn-Serializer/Makefile
@@ -6,6 +6,7 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	bokutin@bokut.in
 COMMENT=	Inflators to serialize data structures for DBIx::Class
+WWW=		https://metacpan.org/release/DBIx-Class-InflateColumn-Serializer
 
 LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
diff --git a/databases/p5-DBIx-Class-InflateColumn-Serializer/pkg-descr b/databases/p5-DBIx-Class-InflateColumn-Serializer/pkg-descr
index b1c78ca9498f..88809abc8534 100644
--- a/databases/p5-DBIx-Class-InflateColumn-Serializer/pkg-descr
+++ b/databases/p5-DBIx-Class-InflateColumn-Serializer/pkg-descr
@@ -1,4 +1,2 @@
 These modules help you store and access serialized data structures
 in the columns of your DB from your DBIx::Classes.
-
-WWW: https://metacpan.org/release/DBIx-Class-InflateColumn-Serializer
diff --git a/databases/p5-DBIx-Class-IntrospectableM2M/Makefile b/databases/p5-DBIx-Class-IntrospectableM2M/Makefile
index 8a902e7c452d..4394bcf45b93 100644
--- a/databases/p5-DBIx-Class-IntrospectableM2M/Makefile
+++ b/databases/p5-DBIx-Class-IntrospectableM2M/Makefile
@@ -1,5 +1,3 @@
-# Created by: Martin Wilke <miwi@FreeBSD.org>
-
 PORTNAME=	DBIx-Class-IntrospectableM2M
 PORTVERSION=	0.001002
 CATEGORIES=	databases perl5
@@ -8,6 +6,7 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Introspect many-to-many shortcuts
+WWW=		https://metacpan.org/release/DBIx-Class-IntrospectableM2M
 
 LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
diff --git a/databases/p5-DBIx-Class-IntrospectableM2M/pkg-descr b/databases/p5-DBIx-Class-IntrospectableM2M/pkg-descr
index 831c9ce56617..752506b67f80 100644
--- a/databases/p5-DBIx-Class-IntrospectableM2M/pkg-descr
+++ b/databases/p5-DBIx-Class-IntrospectableM2M/pkg-descr
@@ -11,5 +11,3 @@ solution for whatever it is you are trying to do. Please be advised
 that compatibility is not guaranteed for DBIx::Class 0.09000+. We
 will try to mantain all compatibility, but internal changes might
 make it impossible.
-
-WWW: https://metacpan.org/release/DBIx-Class-IntrospectableM2M
diff --git a/databases/p5-DBIx-Class-Loader/Makefile b/databases/p5-DBIx-Class-Loader/Makefile
index 2a879034e585..122f307851dc 100644
--- a/databases/p5-DBIx-Class-Loader/Makefile
+++ b/databases/p5-DBIx-Class-Loader/Makefile
@@ -1,5 +1,3 @@
-# Created by: Lars Balker Rasmussen <lbr@FreeBSD.org>
-
 PORTNAME=	DBIx-Class-Loader
 PORTVERSION=	0.21
 PORTREVISION=	2
@@ -9,6 +7,7 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Dynamic definition of DBIx::Class sub classes
+WWW=		https://metacpan.org/release/DBIx-Class-Loader
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
 RUN_DEPENDS=	p5-DBI>=1.3:databases/p5-DBI \
diff --git a/databases/p5-DBIx-Class-Loader/pkg-descr b/databases/p5-DBIx-Class-Loader/pkg-descr
index 253366bce714..2981037c8757 100644
--- a/databases/p5-DBIx-Class-Loader/pkg-descr
+++ b/databases/p5-DBIx-Class-Loader/pkg-descr
@@ -1,3 +1 @@
 Dynamic definition of DBIx::Class sub classes.
-
-WWW: https://metacpan.org/release/DBIx-Class-Loader
diff --git a/databases/p5-DBIx-Class-Migration/Makefile b/databases/p5-DBIx-Class-Migration/Makefile
index e2e9f005ad16..2e8a7ea20414 100644
--- a/databases/p5-DBIx-Class-Migration/Makefile
+++ b/databases/p5-DBIx-Class-Migration/Makefile
@@ -1,15 +1,17 @@
 PORTNAME=	DBIx-Class-Migration
-PORTVERSION=	0.073
+PORTVERSION=	0.075
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension to make migrating your DBIx::Class databases easier
+WWW=		https://metacpan.org/release/DBIx-Class-Migration
 
 LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
 
+BUILD_DEPENDS=	${RUN_DEPENDS}
 RUN_DEPENDS=	\
 	p5-Class-Load>0.22:devel/p5-Class-Load \
 	p5-Config-MySQL>=0.02:devel/p5-Config-MySQL \
@@ -25,11 +27,10 @@ RUN_DEPENDS=	\
 	p5-MooX-Attribute-ENV>=0.02:devel/p5-MooX-Attribute-ENV \
 	p5-MooX-Options>=4.103:devel/p5-MooX-Options \
 	p5-MooX-Traits>=0.005:devel/p5-MooX-Traits \
-	${P5_POD_PARSER} \
+	p5-Pod-Parser>=1.63:textproc/p5-Pod-Parser \
 	p5-SQL-Translator>=0.11021:databases/p5-SQL-Translator \
 	p5-Text-Brew>=0.02:textproc/p5-Text-Brew \
 	p5-version>=0.9924:devel/p5-version
-BUILD_DEPENDS=	${RUN_DEPENDS}
 TEST_DEPENDS=	\
 	p5-Test-Most>=0.34:devel/p5-Test-Most \
 	p5-Test-Requires>=0.10:devel/p5-Test-Requires
diff --git a/databases/p5-DBIx-Class-Migration/distinfo b/databases/p5-DBIx-Class-Migration/distinfo
index c095e46134d4..b5bc1be072c8 100644
--- a/databases/p5-DBIx-Class-Migration/distinfo
+++ b/databases/p5-DBIx-Class-Migration/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1553473945
-SHA256 (DBIx-Class-Migration-0.073.tar.gz) = bdbd145cc0173fe274aed4412f84b93520053f2203c0748758b759ebd360735c
-SIZE (DBIx-Class-Migration-0.073.tar.gz) = 180194
+TIMESTAMP = 1634125535
+SHA256 (DBIx-Class-Migration-0.075.tar.gz) = e517362fcaca0d7bcd2cdc035841f8b49d686bbca5660c2e4387b11a0d739d61
+SIZE (DBIx-Class-Migration-0.075.tar.gz) = 188825
diff --git a/databases/p5-DBIx-Class-Migration/pkg-descr b/databases/p5-DBIx-Class-Migration/pkg-descr
index 26aa0b7b82f0..c816d7425722 100644
--- a/databases/p5-DBIx-Class-Migration/pkg-descr
+++ b/databases/p5-DBIx-Class-Migration/pkg-descr
@@ -1,3 +1 @@
 Tools to make migrating your DBIx::Class databases easier.
-
-WWW: https://metacpan.org/release/DBIx-Class-Migration
diff --git a/databases/p5-DBIx-Class-MooseColumns/Makefile b/databases/p5-DBIx-Class-MooseColumns/Makefile
index 170e54da957e..1c2e36773c3d 100644
--- a/databases/p5-DBIx-Class-MooseColumns/Makefile
+++ b/databases/p5-DBIx-Class-MooseColumns/Makefile
@@ -8,6 +8,7 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Allow write DBIC add_column definitions as attribute options
+WWW=		https://metacpan.org/release/DBIx-Class-MooseColumns
 
 LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
diff --git a/databases/p5-DBIx-Class-MooseColumns/pkg-descr b/databases/p5-DBIx-Class-MooseColumns/pkg-descr
index 769208e41271..5ad39a43d553 100644
--- a/databases/p5-DBIx-Class-MooseColumns/pkg-descr
+++ b/databases/p5-DBIx-Class-MooseColumns/pkg-descr
@@ -5,5 +5,3 @@ replaces the DBIx::Class-generated accessor methods (these are
 Class::Accessor::Grouped-generated accessor methods under the hood) with the
 Moose-generated accessor methods so that you can use more of the wonderful
 powers of Moose (eg. type constraints, triggers, ...).
-
-WWW: https://metacpan.org/release/DBIx-Class-MooseColumns
diff --git a/databases/p5-DBIx-Class-PassphraseColumn/Makefile b/databases/p5-DBIx-Class-PassphraseColumn/Makefile
index c8effc99c960..7beeee11b335 100644
--- a/databases/p5-DBIx-Class-PassphraseColumn/Makefile
+++ b/databases/p5-DBIx-Class-PassphraseColumn/Makefile
@@ -7,6 +7,7 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	fw@moov.de
 COMMENT=	Automatically hash password/passphrase columns
+WWW=		https://metacpan.org/release/DBIx-Class-PassphraseColumn
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
 RUN_DEPENDS=	p5-DBIx-Class-DynamicDefault>=0.03:databases/p5-DBIx-Class-DynamicDefault \
diff --git a/databases/p5-DBIx-Class-PassphraseColumn/pkg-descr b/databases/p5-DBIx-Class-PassphraseColumn/pkg-descr
index 09c8e176f71f..23181fcc05d4 100644
--- a/databases/p5-DBIx-Class-PassphraseColumn/pkg-descr
+++ b/databases/p5-DBIx-Class-PassphraseColumn/pkg-descr
@@ -1,3 +1 @@
 DBIx::Class::PassphraseColumn - Automatically hash password/passphrase columns
-
-WWW: https://metacpan.org/release/DBIx-Class-PassphraseColumn
diff --git a/databases/p5-DBIx-Class-QueryLog/Makefile b/databases/p5-DBIx-Class-QueryLog/Makefile
index 23d8b17b18ed..46725193db5c 100644
--- a/databases/p5-DBIx-Class-QueryLog/Makefile
+++ b/databases/p5-DBIx-Class-QueryLog/Makefile
@@ -1,5 +1,3 @@
-# Created by: Andrey Kostenko <andrey@kostenko.name>
-
 PORTNAME=	DBIx-Class-QueryLog
 PORTVERSION=	1.005.001
 CATEGORIES=	databases perl5
@@ -9,6 +7,7 @@ DISTNAME=	${PORTNAME}-${PORTVERSION:R}${PORTVERSION:E}
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Log queries for later analysis
+WWW=		https://metacpan.org/release/DBIx-Class-QueryLog
 
 LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
diff --git a/databases/p5-DBIx-Class-QueryLog/pkg-descr b/databases/p5-DBIx-Class-QueryLog/pkg-descr
index 0e067d17953b..90e305c18713 100644
--- a/databases/p5-DBIx-Class-QueryLog/pkg-descr
+++ b/databases/p5-DBIx-Class-QueryLog/pkg-descr
@@ -1,4 +1,2 @@
 DBIx::Class::QueryLog logs each transaction and query executed so you can
 analyze what happened in the session.
-
-WWW: https://metacpan.org/release/DBIx-Class-QueryLog
diff --git a/databases/p5-DBIx-Class-QueryProfiler/Makefile b/databases/p5-DBIx-Class-QueryProfiler/Makefile
index 0b4152439257..28fcd1af2a26 100644
--- a/databases/p5-DBIx-Class-QueryProfiler/Makefile
+++ b/databases/p5-DBIx-Class-QueryProfiler/Makefile
@@ -1,5 +1,3 @@
-# Created by: andrey@kostenko.name
-
 PORTNAME=	DBIx-Class-QueryProfiler
 PORTVERSION=	0.05
 PORTREVISION=	1
@@ -9,6 +7,7 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	DBIx::Class profiler
+WWW=		https://metacpan.org/release/DBIx-Class-QueryProfiler
 
 LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
diff --git a/databases/p5-DBIx-Class-QueryProfiler/pkg-descr b/databases/p5-DBIx-Class-QueryProfiler/pkg-descr
index d69cd4b011d7..55c4bed0ed2c 100644
--- a/databases/p5-DBIx-Class-QueryProfiler/pkg-descr
+++ b/databases/p5-DBIx-Class-QueryProfiler/pkg-descr
@@ -1,4 +1,2 @@
 DBIx::Class::QueryProfiler is a profiler for DBIx::Class. Also
 it provides more usable output or queries.
-
-WWW: https://metacpan.org/release/DBIx-Class-QueryProfiler
diff --git a/databases/p5-DBIx-Class-ResultSet-HashRef/Makefile b/databases/p5-DBIx-Class-ResultSet-HashRef/Makefile
index 84b3b2d85664..8747eab0bf18 100644
--- a/databases/p5-DBIx-Class-ResultSet-HashRef/Makefile
+++ b/databases/p5-DBIx-Class-ResultSet-HashRef/Makefile
@@ -1,5 +1,3 @@
-# Created by: Fernan Aguero <fernan@iib.unsam.edu.ar>
-
 PORTNAME=	DBIx-Class-ResultSet-HashRef
 PORTVERSION=	1.002
 PORTREVISION=	1
@@ -9,6 +7,7 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Adds syntactic sugar to skip the fancy objects
+WWW=		https://metacpan.org/release/DBIx-Class-ResultSet-HashRef
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
 RUN_DEPENDS=	p5-DBIx-Class>=0.04001:databases/p5-DBIx-Class
diff --git a/databases/p5-DBIx-Class-ResultSet-HashRef/pkg-descr b/databases/p5-DBIx-Class-ResultSet-HashRef/pkg-descr
index e80e4dcb44b0..214faefb9316 100644
--- a/databases/p5-DBIx-Class-ResultSet-HashRef/pkg-descr
+++ b/databases/p5-DBIx-Class-ResultSet-HashRef/pkg-descr
@@ -1,3 +1 @@
 Easy way to turn resultsets into hashrefs.
-
-WWW: https://metacpan.org/release/DBIx-Class-ResultSet-HashRef
diff --git a/databases/p5-DBIx-Class-ResultSet-RecursiveUpdate/Makefile b/databases/p5-DBIx-Class-ResultSet-RecursiveUpdate/Makefile
index 1b1d7b284677..f4d69655a592 100644
--- a/databases/p5-DBIx-Class-ResultSet-RecursiveUpdate/Makefile
+++ b/databases/p5-DBIx-Class-ResultSet-RecursiveUpdate/Makefile
@@ -1,5 +1,3 @@
-# Created by: Lars Balker Rasmussen <lbr@FreeBSD.org>
-
 PORTNAME=	DBIx-Class-ResultSet-RecursiveUpdate
 PORTVERSION=	0.42
 CATEGORIES=	databases perl5
@@ -8,6 +6,7 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Like update_or_create - but recursive
+WWW=		https://metacpan.org/release/DBIx-Class-ResultSet-RecursiveUpdate
 
 LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
diff --git a/databases/p5-DBIx-Class-ResultSet-RecursiveUpdate/pkg-descr b/databases/p5-DBIx-Class-ResultSet-RecursiveUpdate/pkg-descr
index 93a72bf766e6..9a661d4a3e74 100644
--- a/databases/p5-DBIx-Class-ResultSet-RecursiveUpdate/pkg-descr
+++ b/databases/p5-DBIx-Class-ResultSet-RecursiveUpdate/pkg-descr
@@ -7,5 +7,3 @@ example when you have a belongs_to relationship).  If not all colums
 comprising the primary key are specified - then a new row will be cre-
 ated, with the expectation that the missing columns will be filled by
 it (as in the case of auto_increment primary keys).
-
-WWW: https://metacpan.org/release/DBIx-Class-ResultSet-RecursiveUpdate
diff --git a/databases/p5-DBIx-Class-Schema-Config/Makefile b/databases/p5-DBIx-Class-Schema-Config/Makefile
index b4c9cf2fe23d..05504f1d5145 100644
--- a/databases/p5-DBIx-Class-Schema-Config/Makefile
+++ b/databases/p5-DBIx-Class-Schema-Config/Makefile
@@ -1,5 +1,3 @@
-# Created by: Espen Tagestad <espen@tagestad.no>
-
 PORTNAME=	DBIx-Class-Schema-Config
 PORTVERSION=	0.001008
 PORTREVISION=	1
@@ -9,6 +7,7 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	espen@tagestad.no
 COMMENT=	Credential Management for DBIx::Class
+WWW=		https://metacpan.org/release/DBIx-Class-Schema-Config
 
 LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
diff --git a/databases/p5-DBIx-Class-Schema-Config/pkg-descr b/databases/p5-DBIx-Class-Schema-Config/pkg-descr
index c54f2f4c8f64..7b744e4c443d 100644
--- a/databases/p5-DBIx-Class-Schema-Config/pkg-descr
+++ b/databases/p5-DBIx-Class-Schema-Config/pkg-descr
@@ -3,5 +3,3 @@ allows the loading of credentials from a file. The actual code itself
 would only need to know about the name used in the configuration file.
 This aims to make it simpler for operations teams to manage database
 credentials.
-
-WWW: https://metacpan.org/release/DBIx-Class-Schema-Config
diff --git a/databases/p5-DBIx-Class-Schema-Loader/Makefile b/databases/p5-DBIx-Class-Schema-Loader/Makefile
index c4845fbde437..6dd36de9e7af 100644
--- a/databases/p5-DBIx-Class-Schema-Loader/Makefile
+++ b/databases/p5-DBIx-Class-Schema-Loader/Makefile
@@ -1,5 +1,3 @@
-# Created by: Lars Balker Rasmussen <lbr@FreeBSD.org>
-
 PORTNAME=	DBIx-Class-Schema-Loader
 PORTVERSION=	0.07049
 CATEGORIES=	databases perl5
@@ -8,6 +6,7 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	des@FreeBSD.org
 COMMENT=	Dynamic definition of a DBIx::Class::Schema
+WWW=		https://metacpan.org/release/DBIx-Class-Schema-Loader
 
 LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
diff --git a/databases/p5-DBIx-Class-Schema-Loader/pkg-descr b/databases/p5-DBIx-Class-Schema-Loader/pkg-descr
index 71d901d59eca..8528c8d3bac1 100644
--- a/databases/p5-DBIx-Class-Schema-Loader/pkg-descr
+++ b/databases/p5-DBIx-Class-Schema-Loader/pkg-descr
@@ -18,5 +18,3 @@ DBIx::Class::Loader.
 This module is designed more to get you up and running quickly against
 an existing database, or to be effective for simple situations, rather
 than to be what you use in the long term for a complex database/project.
-
-WWW: https://metacpan.org/release/DBIx-Class-Schema-Loader
diff --git a/databases/p5-DBIx-Class-Schema-PopulateMore/Makefile b/databases/p5-DBIx-Class-Schema-PopulateMore/Makefile
index 87523ee0163b..e04b5944c498 100644
--- a/databases/p5-DBIx-Class-Schema-PopulateMore/Makefile
+++ b/databases/p5-DBIx-Class-Schema-PopulateMore/Makefile
@@ -1,5 +1,3 @@
-# Created by: Steve Wills <swills@FreeBSD.org>
-
 PORTNAME=	DBIx-Class-Schema-PopulateMore
 PORTVERSION=	0.19
 CATEGORIES=	databases perl5
@@ -8,6 +6,7 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Enhanced populate method
+WWW=		https://metacpan.org/release/DBIx-Class-Schema-PopulateMore
 
 LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
diff --git a/databases/p5-DBIx-Class-Schema-PopulateMore/pkg-descr b/databases/p5-DBIx-Class-Schema-PopulateMore/pkg-descr
index bf157e716a27..ea2734e08101 100644
--- a/databases/p5-DBIx-Class-Schema-PopulateMore/pkg-descr
+++ b/databases/p5-DBIx-Class-Schema-PopulateMore/pkg-descr
@@ -1,3 +1 @@
 A Perl module which provides an enhanced database populate method
-
-WWW: https://metacpan.org/release/DBIx-Class-Schema-PopulateMore
diff --git a/databases/p5-DBIx-Class-Storage-TxnEndHook/Makefile b/databases/p5-DBIx-Class-Storage-TxnEndHook/Makefile
index e6bc7d8c6a32..771f4b4f2e9a 100644
--- a/databases/p5-DBIx-Class-Storage-TxnEndHook/Makefile
+++ b/databases/p5-DBIx-Class-Storage-TxnEndHook/Makefile
@@ -6,6 +6,7 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	bokutin@bokut.in
 COMMENT=	Transaction hook provider for DBIx::Class
+WWW=		https://metacpan.org/release/DBIx-Class-Storage-TxnEndHook
 
 LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
diff --git a/databases/p5-DBIx-Class-Storage-TxnEndHook/pkg-descr b/databases/p5-DBIx-Class-Storage-TxnEndHook/pkg-descr
index 463cabe3c896..41981d649054 100644
--- a/databases/p5-DBIx-Class-Storage-TxnEndHook/pkg-descr
+++ b/databases/p5-DBIx-Class-Storage-TxnEndHook/pkg-descr
@@ -1,3 +1 @@
 DBIx::Class::Storage::TxnEndHook is transaction hook provider for DBIx::Class.
-
-WWW: https://metacpan.org/release/DBIx-Class-Storage-TxnEndHook
diff --git a/databases/p5-DBIx-Class-TimeStamp/Makefile b/databases/p5-DBIx-Class-TimeStamp/Makefile
index a050da853bdf..f8e020d02143 100644
--- a/databases/p5-DBIx-Class-TimeStamp/Makefile
+++ b/databases/p5-DBIx-Class-TimeStamp/Makefile
@@ -1,5 +1,3 @@
-# Created by: Lars Thegler <lth@FreeBSD.org>
-
 PORTNAME=	DBIx-Class-TimeStamp
 PORTVERSION=	0.14
 PORTREVISION=	2
@@ -9,6 +7,7 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	DBIx::Class extension to handle date and time based fields
+WWW=		https://metacpan.org/release/DBIx-Class-TimeStamp
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
 RUN_DEPENDS=	p5-DBIx-Class-DynamicDefault>=0.03:databases/p5-DBIx-Class-DynamicDefault \
diff --git a/databases/p5-DBIx-Class-TimeStamp/pkg-descr b/databases/p5-DBIx-Class-TimeStamp/pkg-descr
index ddce98895730..542de1e1f747 100644
--- a/databases/p5-DBIx-Class-TimeStamp/pkg-descr
+++ b/databases/p5-DBIx-Class-TimeStamp/pkg-descr
@@ -1,4 +1,2 @@
 Works in conjunction with InflateColumn::DateTime to automatically set update
 and create date and time based fields in a table.
-
-WWW: https://metacpan.org/release/DBIx-Class-TimeStamp
diff --git a/databases/p5-DBIx-Class-Tree-NestedSet/Makefile b/databases/p5-DBIx-Class-Tree-NestedSet/Makefile
index 325b047c20c3..0569f38236a3 100644
--- a/databases/p5-DBIx-Class-Tree-NestedSet/Makefile
+++ b/databases/p5-DBIx-Class-Tree-NestedSet/Makefile
@@ -5,8 +5,9 @@ CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension to manage trees of data using the nested set model
+WWW=		https://metacpan.org/release/DBIx-Class-Tree-NestedSet
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
 RUN_DEPENDS=	\
diff --git a/databases/p5-DBIx-Class-Tree-NestedSet/pkg-descr b/databases/p5-DBIx-Class-Tree-NestedSet/pkg-descr
index 4cedb890c23c..d45112b9a79b 100644
--- a/databases/p5-DBIx-Class-Tree-NestedSet/pkg-descr
+++ b/databases/p5-DBIx-Class-Tree-NestedSet/pkg-descr
@@ -3,5 +3,3 @@ nested tree model is a way of representing hierarchical information in
 a database.  This takes a different approach to the Adjacency List
 implementation.  (see DBIx::Class::Tree::AdjacencyList which uses
 parent relationships in a recursive manner).
-
-WWW: https://metacpan.org/release/DBIx-Class-Tree-NestedSet
diff --git a/databases/p5-DBIx-Class-Tree/Makefile b/databases/p5-DBIx-Class-Tree/Makefile
index 1220da1c10d5..9a89922db2c3 100644
--- a/databases/p5-DBIx-Class-Tree/Makefile
+++ b/databases/p5-DBIx-Class-Tree/Makefile
@@ -5,8 +5,9 @@ CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension to manipulate and analyze tree structured data
+WWW=		https://metacpan.org/release/DBIx-Class-Tree
 
 LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
diff --git a/databases/p5-DBIx-Class-Tree/pkg-descr b/databases/p5-DBIx-Class-Tree/pkg-descr
index 832d02be83f4..ecd7eaed7d56 100644
--- a/databases/p5-DBIx-Class-Tree/pkg-descr
+++ b/databases/p5-DBIx-Class-Tree/pkg-descr
@@ -7,5 +7,3 @@ some sort of integer.  The row with a parent ID of 0 is the root node
 and is usually the parent of all other rows.  Although, there is no
 limitation in this module that would stop you from having multiple
 root nodes.
-
-WWW: https://metacpan.org/release/DBIx-Class-Tree
diff --git a/databases/p5-DBIx-Class-UUIDColumns/Makefile b/databases/p5-DBIx-Class-UUIDColumns/Makefile
index c27d1209e769..ba6a7de3c582 100644
--- a/databases/p5-DBIx-Class-UUIDColumns/Makefile
+++ b/databases/p5-DBIx-Class-UUIDColumns/Makefile
@@ -1,5 +1,3 @@
-# Created by: Zach Thompson <hideo@lastamericanempire.com>
-
 PORTNAME=	DBIx-Class-UUIDColumns
 PORTVERSION=	0.02006
 PORTREVISION=	1
@@ -9,6 +7,7 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl module implementing implicit UUID columns
+WWW=		https://metacpan.org/release/DBIx-Class-UUIDColumns
 
 LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
diff --git a/databases/p5-DBIx-Class-UUIDColumns/pkg-descr b/databases/p5-DBIx-Class-UUIDColumns/pkg-descr
index fbc2d5eddcd5..e1f3ce83e7c5 100644
--- a/databases/p5-DBIx-Class-UUIDColumns/pkg-descr
+++ b/databases/p5-DBIx-Class-UUIDColumns/pkg-descr
@@ -1,4 +1,2 @@
 This DBIx::Class component resembles the behaviour of Class::DBI::UUID,
 implicitly creating columns as uuid.
-
-WWW: https://metacpan.org/release/DBIx-Class-UUIDColumns
diff --git a/databases/p5-DBIx-Class-VirtualColumns/Makefile b/databases/p5-DBIx-Class-VirtualColumns/Makefile
index 6b16ef426fad..5739335ec875 100644
--- a/databases/p5-DBIx-Class-VirtualColumns/Makefile
+++ b/databases/p5-DBIx-Class-VirtualColumns/Makefile
@@ -1,5 +1,3 @@
-# Created by: Anes Mukhametov <anes@anes.su>
-
 PORTNAME=	DBIx-Class-VirtualColumns
 PORTVERSION=	1.03
 PORTREVISION=	1
@@ -9,6 +7,7 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	anes@anes.su
 COMMENT=	Add virtual columns to DBIx::Class schemata
+WWW=		https://metacpan.org/release/DBIx-Class-VirtualColumns
 
 BUILD_DEPENDS=	p5-DBIx-Class>=0:databases/p5-DBIx-Class \
 		p5-Class-C3-XS>=0.02:devel/p5-Class-C3-XS \
diff --git a/databases/p5-DBIx-Class-VirtualColumns/pkg-descr b/databases/p5-DBIx-Class-VirtualColumns/pkg-descr
index 72a0bf7e35e1..82cee1ece943 100644
--- a/databases/p5-DBIx-Class-VirtualColumns/pkg-descr
+++ b/databases/p5-DBIx-Class-VirtualColumns/pkg-descr
@@ -7,5 +7,3 @@ interface.
 Most DBIx::Class methods like "set_column", "set_columns", "get_column",
 "get_columns", "column_info", ... will work with regular as well as
 virtual columns.
-
-WWW: https://metacpan.org/release/DBIx-Class-VirtualColumns
diff --git a/databases/p5-DBIx-Class-WebForm/Makefile b/databases/p5-DBIx-Class-WebForm/Makefile
index d4fc27ebd26e..4ebc88999d43 100644
--- a/databases/p5-DBIx-Class-WebForm/Makefile
+++ b/databases/p5-DBIx-Class-WebForm/Makefile
@@ -1,5 +1,3 @@
-# Created by: Lars Balker Rasmussen <lbr@FreeBSD.org>
-
 PORTNAME=	DBIx-Class-WebForm
 PORTVERSION=	0.02
 PORTREVISION=	2
@@ -9,6 +7,7 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	CRUD methods for DBIx::Class
+WWW=		https://metacpan.org/release/DBIx-Class-WebForm
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
 RUN_DEPENDS=	p5-DBIx-Class>=0:databases/p5-DBIx-Class \
diff --git a/databases/p5-DBIx-Class-WebForm/pkg-descr b/databases/p5-DBIx-Class-WebForm/pkg-descr
index 7daded06b487..e7741505184a 100644
--- a/databases/p5-DBIx-Class-WebForm/pkg-descr
+++ b/databases/p5-DBIx-Class-WebForm/pkg-descr
@@ -1,3 +1 @@
 CRUD methods for DBIx::Class
-
-WWW: https://metacpan.org/release/DBIx-Class-WebForm
diff --git a/databases/p5-DBIx-Class/Makefile b/databases/p5-DBIx-Class/Makefile
index 0a54ff38d5ce..ad8e27c20048 100644
--- a/databases/p5-DBIx-Class/Makefile
+++ b/databases/p5-DBIx-Class/Makefile
@@ -1,13 +1,12 @@
-# Created by: Lars Balker Rasmussen <lbr@FreeBSD.org>
-
 PORTNAME=	DBIx-Class
-PORTVERSION=	0.082842
+PORTVERSION=	0.082843
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Extensible and flexible object <-> relational mapper
+WWW=		https://metacpan.org/release/DBIx-Class
 
 LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
diff --git a/databases/p5-DBIx-Class/distinfo b/databases/p5-DBIx-Class/distinfo
index 741bab97a42b..b3f852e6b191 100644
--- a/databases/p5-DBIx-Class/distinfo
+++ b/databases/p5-DBIx-Class/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1595416713
-SHA256 (DBIx-Class-0.082842.tar.gz) = b05ed68172699ee12b77be0b773a05909241a656592915eb0f6cc525658b07e6
-SIZE (DBIx-Class-0.082842.tar.gz) = 879377
+TIMESTAMP = 1653151256
+SHA256 (DBIx-Class-0.082843.tar.gz) = 341e0b6ecb29d8c49174a6c09d7c6dbf38729ba4015ee7fd70360a4ffee1f251
+SIZE (DBIx-Class-0.082843.tar.gz) = 879391
diff --git a/databases/p5-DBIx-Class/pkg-descr b/databases/p5-DBIx-Class/pkg-descr
index 44b3ec013dd3..3de5b4672b1e 100644
--- a/databases/p5-DBIx-Class/pkg-descr
+++ b/databases/p5-DBIx-Class/pkg-descr
@@ -19,5 +19,3 @@ This project is still under rapid development, so large new features may be
 marked EXPERIMENTAL - such APIs are still usable but may have edge bugs.
 Failing test cases are *always* welcome and point releases are put out rapidly
 as bugs are found and fixed.
-
-WWW: https://metacpan.org/release/DBIx-Class
diff --git a/databases/p5-DBIx-Connector/Makefile b/databases/p5-DBIx-Connector/Makefile
index f9b688df0bea..b5971d29c339 100644
--- a/databases/p5-DBIx-Connector/Makefile
+++ b/databases/p5-DBIx-Connector/Makefile
@@ -1,18 +1,22 @@
 PORTNAME=	DBIx-Connector
-PORTVERSION=	0.56
+PORTVERSION=	0.59
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension for fast, safe DBI connection management
+WWW=		https://metacpan.org/release/DBIx-Connector
+
+LICENSE=	ART10 GPLv1+
+LICENSE_COMB=	dual
+LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
 RUN_DEPENDS=	p5-DBI>=1.605:databases/p5-DBI
-TEST_DEPENDS=	p5-Test-MockModule>=0:devel/p5-Test-MockModule
 
 USES=		perl5
-USE_PERL5=	modbuild
+USE_PERL5=	configure
 
 NO_ARCH=	yes
 
diff --git a/databases/p5-DBIx-Connector/distinfo b/databases/p5-DBIx-Connector/distinfo
index 4ade32cca9cf..d2e3418fd099 100644
--- a/databases/p5-DBIx-Connector/distinfo
+++ b/databases/p5-DBIx-Connector/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1479800255
-SHA256 (DBIx-Connector-0.56.tar.gz) = 57c08d2c1951486cb95cfb83f518f462a3dbf20d353f3eee4f46af44fa19c359
-SIZE (DBIx-Connector-0.56.tar.gz) = 36770
+TIMESTAMP = 1688902953
+SHA256 (DBIx-Connector-0.59.tar.gz) = 782994f13f49555840538494f8406b0bf2558f533ccda86c8d2b95e2301087f4
+SIZE (DBIx-Connector-0.59.tar.gz) = 38205
diff --git a/databases/p5-DBIx-Connector/pkg-descr b/databases/p5-DBIx-Connector/pkg-descr
index cb09af2292d9..d038e4163e6f 100644
--- a/databases/p5-DBIx-Connector/pkg-descr
+++ b/databases/p5-DBIx-Connector/pkg-descr
@@ -5,5 +5,3 @@ you need to run a query.  The efficient thing to do is to hang on to a
 database handle to maintain a connection to the database in order to
 minimize that overhead.  DBIx::Connector lets you do that without
 having to worry about dropped or corrupted connections.
-
-WWW: https://metacpan.org/release/DBIx-Connector
diff --git a/databases/p5-DBIx-ContextualFetch/Makefile b/databases/p5-DBIx-ContextualFetch/Makefile
index d28d7740467c..0297e141ae9a 100644
--- a/databases/p5-DBIx-ContextualFetch/Makefile
+++ b/databases/p5-DBIx-ContextualFetch/Makefile
@@ -1,5 +1,3 @@
-# Created by: Sergey Skvortsov <skv@protey.ru>
-
 PORTNAME=	DBIx-ContextualFetch
 PORTVERSION=	1.03
 PORTREVISION=	1
@@ -9,6 +7,7 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Add contextual fetches to DBI
+WWW=		https://metacpan.org/release/DBIx-ContextualFetch
 
 LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
diff --git a/databases/p5-DBIx-ContextualFetch/pkg-descr b/databases/p5-DBIx-ContextualFetch/pkg-descr
index 838fd2723921..1bb42fe5f7dd 100644
--- a/databases/p5-DBIx-ContextualFetch/pkg-descr
+++ b/databases/p5-DBIx-ContextualFetch/pkg-descr
@@ -1,4 +1,2 @@
 DBIx::ContextualFetch redefines some of the various fetch methods to
 add context sensitivity.
-
-WWW: https://metacpan.org/release/DBIx-ContextualFetch
diff --git a/databases/p5-DBIx-Custom/Makefile b/databases/p5-DBIx-Custom/Makefile
index 7fe7c8117867..99e0fa2d9d59 100644
--- a/databases/p5-DBIx-Custom/Makefile
+++ b/databases/p5-DBIx-Custom/Makefile
@@ -1,5 +1,3 @@
-# Created by: Andrey Kostenko <andrey@kostenko.name>
-
 PORTNAME=	DBIx-Custom
 PORTVERSION=	0.4000
 CATEGORIES=	databases perl5
@@ -9,6 +7,7 @@ DISTNAME=	${PORTNAME}-${PORTVERSION:C/00$//}
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Customizable DBI
+WWW=		https://metacpan.org/release/DBIx-Custom
 
 LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
diff --git a/databases/p5-DBIx-Custom/pkg-descr b/databases/p5-DBIx-Custom/pkg-descr
index 3e20318bf1a2..534421bff287 100644
--- a/databases/p5-DBIx-Custom/pkg-descr
+++ b/databases/p5-DBIx-Custom/pkg-descr
@@ -1,3 +1 @@
 Customizable DBI
-
-WWW: https://metacpan.org/release/DBIx-Custom
diff --git a/databases/p5-DBIx-DBHResolver/Makefile b/databases/p5-DBIx-DBHResolver/Makefile
index 2bccbe28f209..dcb3f2950c8a 100644
--- a/databases/p5-DBIx-DBHResolver/Makefile
+++ b/databases/p5-DBIx-DBHResolver/Makefile
@@ -5,8 +5,9 @@ CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension to resolve DB connection with many database servers
+WWW=		https://metacpan.org/release/DBIx-DBHResolver
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
 RUN_DEPENDS=	\
diff --git a/databases/p5-DBIx-DBHResolver/pkg-descr b/databases/p5-DBIx-DBHResolver/pkg-descr
index 80581e44bdf5..528f93b2dc4c 100644
--- a/databases/p5-DBIx-DBHResolver/pkg-descr
+++ b/databases/p5-DBIx-DBHResolver/pkg-descr
@@ -6,5 +6,3 @@ This module can retrieve DBI's database handle object or connection
 information (data source, user, credential...) by labeled name and
 treat same cluster consists many nodes as one labeled name, choose
 fetching strategy.
-
-WWW: https://metacpan.org/release/DBIx-DBHResolver
diff --git a/databases/p5-DBIx-DBSchema/Makefile b/databases/p5-DBIx-DBSchema/Makefile
index 2f27561b3e17..f6f91f759c2c 100644
--- a/databases/p5-DBIx-DBSchema/Makefile
+++ b/databases/p5-DBIx-DBSchema/Makefile
@@ -1,13 +1,12 @@
-# Created by: Peter Avalos <pavalos@theshell.com>
-
 PORTNAME=	DBIx-DBSchema
-PORTVERSION=	0.45
+PORTVERSION=	0.47
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	OO-interface to database schemas
+WWW=		https://metacpan.org/release/DBIx-DBSchema
 
 LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
@@ -15,13 +14,15 @@ LICENSE_COMB=	dual
 BUILD_DEPENDS=	${RUN_DEPENDS}
 RUN_DEPENDS=	p5-DBI>=0:databases/p5-DBI
 
-OPTIONS_DEFINE=	DOCS
-
 USES=		perl5
 USE_PERL5=	configure
 
+NO_ARCH=	yes
+
 PORTDOCS=	Changes README
 
+OPTIONS_DEFINE=	DOCS
+
 post-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
diff --git a/databases/p5-DBIx-DBSchema/distinfo b/databases/p5-DBIx-DBSchema/distinfo
index a50263e7e15c..9a35e76d520b 100644
--- a/databases/p5-DBIx-DBSchema/distinfo
+++ b/databases/p5-DBIx-DBSchema/distinfo
@@ -1,2 +1,3 @@
-SHA256 (DBIx-DBSchema-0.45.tar.gz) = 7a2a978fb6d9feaa3e4b109c71c963b26a008a2d130c5876ecf24c5a72338a1d
-SIZE (DBIx-DBSchema-0.45.tar.gz) = 29144
+TIMESTAMP = 1662820130
+SHA256 (DBIx-DBSchema-0.47.tar.gz) = eeee210dc14a8d63eb01ac2d66c67a1dc279f9289be96a61724c8951791c5212
+SIZE (DBIx-DBSchema-0.47.tar.gz) = 29763
diff --git a/databases/p5-DBIx-DBSchema/pkg-descr b/databases/p5-DBIx-DBSchema/pkg-descr
index 654a016fd159..009e7f9abdc8 100644
--- a/databases/p5-DBIx-DBSchema/pkg-descr
+++ b/databases/p5-DBIx-DBSchema/pkg-descr
@@ -4,5 +4,4 @@ schema from an existing database.  You can save the schema to disk and restore
 it in a different process.  Most importantly, DBIx::DBSchema can write SQL
 CREATE statements for different databases from a single source.
 
-WWW: https://metacpan.org/release/DBIx-DBSchema
-WWW: http://www.420.am/dbix-dbschema/
+See also: http://www.420.am/dbix-dbschema/
diff --git a/databases/p5-DBIx-DataSource/Makefile b/databases/p5-DBIx-DataSource/Makefile
index 8d061c04d580..9e516c94b71d 100644
--- a/databases/p5-DBIx-DataSource/Makefile
+++ b/databases/p5-DBIx-DataSource/Makefile
@@ -1,5 +1,3 @@
-# Created by: Anton Berezin <tobez@tobez.org>
-
 PORTNAME=	DBIx-DataSource
 PORTVERSION=	0.02
 PORTREVISION=	1
diff --git a/databases/p5-DBIx-DisconnectAll/Makefile b/databases/p5-DBIx-DisconnectAll/Makefile
index dd9e038b119f..5690518d39b9 100644
--- a/databases/p5-DBIx-DisconnectAll/Makefile
+++ b/databases/p5-DBIx-DisconnectAll/Makefile
@@ -1,5 +1,3 @@
-# Created by: Po-Chuan Hsieh <sunpoet@FreeBSD.org>
-
 PORTNAME=	DBIx-DisconnectAll
 PORTVERSION=	0.03
 CATEGORIES=	databases perl5
@@ -8,6 +6,7 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Disconnect all databases
+WWW=		https://metacpan.org/dist/DBIx-DisconnectAll
 
 LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
diff --git a/databases/p5-DBIx-DisconnectAll/pkg-descr b/databases/p5-DBIx-DisconnectAll/pkg-descr
index 02b4956e487e..143661299e8f 100644
--- a/databases/p5-DBIx-DisconnectAll/pkg-descr
+++ b/databases/p5-DBIx-DisconnectAll/pkg-descr
@@ -4,5 +4,3 @@ DBI has DBI->disconnect_all methods, but some DBD modules does not support it,
 so DBI->disconnect_all is undocumented yet and unusable.
 
 DBIx::DisconnectAll realizes disconnect_all from DBI's public API.
-
-WWW: https://metacpan.org/dist/DBIx-DisconnectAll
diff --git a/databases/p5-DBIx-Dump/Makefile b/databases/p5-DBIx-Dump/Makefile
index d511ef29f6dc..a5818b261342 100644
--- a/databases/p5-DBIx-Dump/Makefile
+++ b/databases/p5-DBIx-Dump/Makefile
@@ -1,5 +1,3 @@
-# Created by: Ryan Steinmetz <zi@FreeBSD.org>
-
 PORTNAME=	DBIx-Dump
 PORTVERSION=	0.04
 PORTREVISION=	2
@@ -9,6 +7,7 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Module for dumping database (DBI) data into a variety of formats
+WWW=		https://metacpan.org/release/DBIx-Dump
 
 BUILD_DEPENDS=	p5-DBI>=1.57:databases/p5-DBI
 RUN_DEPENDS:=	${BUILD_DEPENDS} \
diff --git a/databases/p5-DBIx-Dump/pkg-descr b/databases/p5-DBIx-Dump/pkg-descr
index d97676ca4172..3a3bf8896cfe 100644
--- a/databases/p5-DBIx-Dump/pkg-descr
+++ b/databases/p5-DBIx-Dump/pkg-descr
@@ -1,4 +1,2 @@
 DBIx::Dump allows you to easily dump database data, retrieved using DBI,
 into a variety of formats including Excel, CSV, etc...
-
-WWW: https://metacpan.org/release/DBIx-Dump
diff --git a/databases/p5-DBIx-HA/Makefile b/databases/p5-DBIx-HA/Makefile
index d6f561fb083e..b9807ccee9ba 100644
--- a/databases/p5-DBIx-HA/Makefile
+++ b/databases/p5-DBIx-HA/Makefile
@@ -1,5 +1,3 @@
-# Created by: Gea-Suan Lin <gslin@gslin.org>
-
 PORTNAME=	DBIx-HA
 PORTVERSION=	1.1
 PORTREVISION=	1
@@ -9,6 +7,7 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	High Availability package for DBI
+WWW=		https://metacpan.org/release/DBIx-HA
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/databases/p5-DBIx-HA/pkg-descr b/databases/p5-DBIx-HA/pkg-descr
index 3fcf278179b6..56454ea4da64 100644
--- a/databases/p5-DBIx-HA/pkg-descr
+++ b/databases/p5-DBIx-HA/pkg-descr
@@ -5,5 +5,3 @@ seamlessly used without code modification except for initialization.
 DBIx::HA also works seamlessly with Apache::DBI when available, and
 ensures that cached database handles in the Apache::DBI module are
 properly updated when failing over.
-
-WWW: https://metacpan.org/release/DBIx-HA
diff --git a/databases/p5-DBIx-Handler/Makefile b/databases/p5-DBIx-Handler/Makefile
index 20da872eabba..7de36b918faa 100644
--- a/databases/p5-DBIx-Handler/Makefile
+++ b/databases/p5-DBIx-Handler/Makefile
@@ -1,5 +1,3 @@
-# Created by: Sergei Vyshenski <svysh.fbsd@gmail.com>
-
 PORTNAME=	DBIx-Handler
 PORTVERSION=	0.15
 CATEGORIES=	databases perl5
@@ -8,6 +6,7 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	svysh.fbsd@gmail.com
 COMMENT=	Fork-safe and easy transaction handling DBI handler
+WWW=		https://metacpan.org/release/DBIx-Handler
 
 LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
diff --git a/databases/p5-DBIx-Handler/pkg-descr b/databases/p5-DBIx-Handler/pkg-descr
index 9795fd175b3c..4bee2045197f 100644
--- a/databases/p5-DBIx-Handler/pkg-descr
+++ b/databases/p5-DBIx-Handler/pkg-descr
@@ -1,4 +1,2 @@
 DBIx::Handler is fork-safe and easy transaction handling DBI handler.
 It provides scope base transaction, fork safe dbh handling.
-
-WWW: https://metacpan.org/release/DBIx-Handler
diff --git a/databases/p5-DBIx-Inspector/Makefile b/databases/p5-DBIx-Inspector/Makefile
index 64306b25392c..8b7aa7fc049a 100644
--- a/databases/p5-DBIx-Inspector/Makefile
+++ b/databases/p5-DBIx-Inspector/Makefile
@@ -6,8 +6,9 @@ MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:TOKUHIROM
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension to get information from $dbh
+WWW=		https://metacpan.org/release/DBIx-Inspector
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
 RUN_DEPENDS=	\
@@ -21,4 +22,6 @@ TEST_DEPENDS=	\
 USES=	perl5
 USE_PERL5=	modbuild
 
+NO_ARCH=	yes
+
 .include <bsd.port.mk>
diff --git a/databases/p5-DBIx-Inspector/pkg-descr b/databases/p5-DBIx-Inspector/pkg-descr
index 1dac41fea352..d057d61b282a 100644
--- a/databases/p5-DBIx-Inspector/pkg-descr
+++ b/databases/p5-DBIx-Inspector/pkg-descr
@@ -1,3 +1 @@
 Get information from $dbh.
-
-WWW: https://metacpan.org/release/DBIx-Inspector
diff --git a/databases/p5-DBIx-Introspector/Makefile b/databases/p5-DBIx-Introspector/Makefile
index db54dba3cb32..11bbef65b6a1 100644
--- a/databases/p5-DBIx-Introspector/Makefile
+++ b/databases/p5-DBIx-Introspector/Makefile
@@ -1,5 +1,3 @@
-# Created by: Tom Judge <tj@FreeBSD.org>
-
 PORTNAME=	DBIx-Introspector
 PORTVERSION=	0.001005
 CATEGORIES=	databases perl5
@@ -8,6 +6,7 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Detect what database you are connected to
+WWW=		https://metacpan.org/release/DBIx-Introspector
 
 LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
diff --git a/databases/p5-DBIx-Introspector/pkg-descr b/databases/p5-DBIx-Introspector/pkg-descr
index cf57e46cb915..676c58876c87 100644
--- a/databases/p5-DBIx-Introspector/pkg-descr
+++ b/databases/p5-DBIx-Introspector/pkg-descr
@@ -1,3 +1 @@
 Detect what database you are connected to.
-
-WWW: https://metacpan.org/release/DBIx-Introspector
diff --git a/databases/p5-DBIx-Lite/Makefile b/databases/p5-DBIx-Lite/Makefile
index 04717a3265b4..1428df447111 100644
--- a/databases/p5-DBIx-Lite/Makefile
+++ b/databases/p5-DBIx-Lite/Makefile
@@ -1,5 +1,3 @@
-# Created by: Wen Heping <wen@FreeBSD.org>
-
 PORTNAME=	DBIx-Lite
 PORTVERSION=	0.33
 CATEGORIES=	databases perl5
@@ -8,6 +6,7 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	wen@FreeBSD.org
 COMMENT=	Chained and minimal ORM
+WWW=		https://metacpan.org/release/DBIx-Lite
 
 LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
diff --git a/databases/p5-DBIx-Lite/pkg-descr b/databases/p5-DBIx-Lite/pkg-descr
index 85dbb4d337e5..115a9789b757 100644
--- a/databases/p5-DBIx-Lite/pkg-descr
+++ b/databases/p5-DBIx-Lite/pkg-descr
@@ -11,5 +11,3 @@ joins/relationships
 optional custom classes for results and resultsets with custom methods
 SQL::Abstract syntax
 paging features (with Data::Page)
-
-WWW: https://metacpan.org/release/DBIx-Lite
diff --git a/databases/p5-DBIx-Log4perl/Makefile b/databases/p5-DBIx-Log4perl/Makefile
index 15d41905da0d..a716ac09b1f5 100644
--- a/databases/p5-DBIx-Log4perl/Makefile
+++ b/databases/p5-DBIx-Log4perl/Makefile
@@ -1,5 +1,3 @@
-# Created by: Jin-Shan Tseng <tjs@cdpa.nsysu.edu.tw>
-
 PORTNAME=	DBIx-Log4perl
 PORTVERSION=	0.26
 PORTREVISION=	1
@@ -9,6 +7,7 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	For DBI to selectively log SQL, parameters, result-sets, transactions
+WWW=		https://metacpan.org/release/DBIx-Log4perl
 
 LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
diff --git a/databases/p5-DBIx-Log4perl/pkg-descr b/databases/p5-DBIx-Log4perl/pkg-descr
index b8026223dc0e..ca684c366851 100644
--- a/databases/p5-DBIx-Log4perl/pkg-descr
+++ b/databases/p5-DBIx-Log4perl/pkg-descr
@@ -7,5 +7,3 @@ changing your code.
 
 Different log levels allowing you to separate warnings, errors and fatals
 to different files.
-
-WWW: https://metacpan.org/release/DBIx-Log4perl
diff --git a/databases/p5-DBIx-MySQLSequence/Makefile b/databases/p5-DBIx-MySQLSequence/Makefile
index 37c2a8af7c70..b120bb8f6f28 100644
--- a/databases/p5-DBIx-MySQLSequence/Makefile
+++ b/databases/p5-DBIx-MySQLSequence/Makefile
@@ -1,23 +1,22 @@
-# Created by: Lars Thegler <lth@FreeBSD.org>
-
 PORTNAME=	DBIx-MySQLSequence
 PORTVERSION=	1.04
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Proper and correct (emulated) sequence support for MySQL
+WWW=		https://metacpan.org/release/DBIx-MySQLSequence
 
-BUILD_DEPENDS=	p5-DBD-mysql>0:databases/p5-DBD-mysql \
+BUILD_DEPENDS=	${DBD_MYSQL} \
 		p5-DBI>0:databases/p5-DBI \
 		p5-Params-Util>=0.26:devel/p5-Params-Util
-RUN_DEPENDS=	p5-DBD-mysql>0:databases/p5-DBD-mysql \
+RUN_DEPENDS=	${DBD_MYSQL} \
 		p5-DBI>0:databases/p5-DBI \
 		p5-Params-Util>=0.26:devel/p5-Params-Util
 
-USES=		perl5
+USES=		mysql perl5
 USE_PERL5=	configure
 
 post-patch:
diff --git a/databases/p5-DBIx-MySQLSequence/pkg-descr b/databases/p5-DBIx-MySQLSequence/pkg-descr
index 14870547ec80..46b2d090e000 100644
--- a/databases/p5-DBIx-MySQLSequence/pkg-descr
+++ b/databases/p5-DBIx-MySQLSequence/pkg-descr
@@ -3,5 +3,3 @@ provides "real" sequences on MySQL. The module works by creating a
 "sequence table", a single table where each record represents a
 single sequence, and performing some "magic" MySQL specific SQL to
 ensure the sequences will work correctly.
-
-WWW: https://metacpan.org/release/DBIx-MySQLSequence
diff --git a/databases/p5-DBIx-NoSQL/Makefile b/databases/p5-DBIx-NoSQL/Makefile
index 1453c862dad9..9cc56b424dec 100644
--- a/databases/p5-DBIx-NoSQL/Makefile
+++ b/databases/p5-DBIx-NoSQL/Makefile
@@ -1,5 +1,3 @@
-# Created by: Wen Heping <wen@FreeBSD.org>
-
 PORTNAME=	DBIx-NoSQL
 PORTVERSION=	0.0021
 CATEGORIES=	databases perl5
@@ -8,6 +6,7 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	NoSQL-ish overlay for an SQL database
+WWW=		https://metacpan.org/release/DBIx-NoSQL
 
 LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
diff --git a/databases/p5-DBIx-NoSQL/pkg-descr b/databases/p5-DBIx-NoSQL/pkg-descr
index 497443cf6755..897e008fa069 100644
--- a/databases/p5-DBIx-NoSQL/pkg-descr
+++ b/databases/p5-DBIx-NoSQL/pkg-descr
@@ -9,5 +9,3 @@ an SQLite backend.
 
 Retrieving data from the store is done by key lookup or by searching an
 SQL-based index. Once found, the data is deserialized via JSON and returned.
-
-WWW: https://metacpan.org/release/DBIx-NoSQL
diff --git a/databases/p5-DBIx-Password/Makefile b/databases/p5-DBIx-Password/Makefile
index ce5e7e719cc9..b9ea3e4c1a7c 100644
--- a/databases/p5-DBIx-Password/Makefile
+++ b/databases/p5-DBIx-Password/Makefile
@@ -1,5 +1,3 @@
-# Created by: Autrijus Tang <autrijus@autrijus.org>
-
 PORTNAME=	DBIx-Password
 PORTVERSION=	1.9
 PORTREVISION=	1
@@ -9,6 +7,7 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Allows you to create a global password file for DB passwords
+WWW=		https://metacpan.org/release/DBIx-Password
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
 RUN_DEPENDS=	p5-DBI>=0:databases/p5-DBI
diff --git a/databases/p5-DBIx-Password/pkg-descr b/databases/p5-DBIx-Password/pkg-descr
index 17c9493d3819..f4c8b6b61efc 100644
--- a/databases/p5-DBIx-Password/pkg-descr
+++ b/databases/p5-DBIx-Password/pkg-descr
@@ -1,3 +1 @@
 This module keeps track of database passwords.
-
-WWW: https://metacpan.org/release/DBIx-Password
diff --git a/databases/p5-DBIx-Perlish/Makefile b/databases/p5-DBIx-Perlish/Makefile
index 787042ea8289..605f891e8f37 100644
--- a/databases/p5-DBIx-Perlish/Makefile
+++ b/databases/p5-DBIx-Perlish/Makefile
@@ -1,5 +1,3 @@
-# Created by: Anton Berezin <tobez@FreeBSD.org>
-
 PORTNAME=	DBIx-Perlish
 PORTVERSION=	1.06
 CATEGORIES=	databases perl5
@@ -9,6 +7,7 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perlish interface to SQL databases
+WWW=		https://metacpan.org/release/DBIx-Perlish
 
 LICENSE=	BSD2CLAUSE
 
diff --git a/databases/p5-DBIx-Perlish/pkg-descr b/databases/p5-DBIx-Perlish/pkg-descr
index 0e8b3fd46e36..8da8fbae6bdd 100644
--- a/databases/p5-DBIx-Perlish/pkg-descr
+++ b/databases/p5-DBIx-Perlish/pkg-descr
@@ -1,5 +1,3 @@
 The DBIx::Perlish module provides the ability to work with databases
 supported by the DBI module using Perl's own syntax for four most common
 operations: SELECT, UPDATE, DELETE, and INSERT.
-
-WWW: https://metacpan.org/release/DBIx-Perlish
diff --git a/databases/p5-DBIx-QueryLog/Makefile b/databases/p5-DBIx-QueryLog/Makefile
index 0438580beec4..6fb12d5a52f7 100644
--- a/databases/p5-DBIx-QueryLog/Makefile
+++ b/databases/p5-DBIx-QueryLog/Makefile
@@ -1,26 +1,28 @@
 PORTNAME=	DBIx-QueryLog
-PORTVERSION=	0.41
+PORTVERSION=	0.42
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension for logging queries for DBI
+WWW=		https://metacpan.org/release/DBIx-QueryLog
 
 LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
+LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
-RUN_DEPENDS=	\
-	p5-DBI>0:databases/p5-DBI \
-	p5-Text-ASCIITable>0:textproc/p5-Text-ASCIITable
-TEST_DEPENDS=	\
-	p5-DBD-SQLite>0:databases/p5-DBD-SQLite \
-	p5-Class-Method-Modifiers>0:devel/p5-Class-Method-Modifiers \
-	p5-Test-Requires>0:devel/p5-Test-Requires
+RUN_DEPENDS=	p5-DBI>=0:databases/p5-DBI \
+		p5-Text-ASCIITable>=0:textproc/p5-Text-ASCIITable
+TEST_DEPENDS=	p5-Test-Requires>=0:devel/p5-Test-Requires
 
 USES=		perl5
-USE_PERL5=	modbuild
-NO_ARCH=	YES
+USE_PERL5=	modbuildtiny
+
+NO_ARCH=	yes
+
+post-patch:
+	@${RM} -r ${WRKSRC}/script/
 
 .include <bsd.port.mk>
diff --git a/databases/p5-DBIx-QueryLog/distinfo b/databases/p5-DBIx-QueryLog/distinfo
index 68b2cbb63e4a..e380b2d015df 100644
--- a/databases/p5-DBIx-QueryLog/distinfo
+++ b/databases/p5-DBIx-QueryLog/distinfo
@@ -1,2 +1,3 @@
-SHA256 (DBIx-QueryLog-0.41.tar.gz) = 20a0c13a3d1c75594b4f729b7c986487cec9677ebb80360abe0871a8fc66cb99
-SIZE (DBIx-QueryLog-0.41.tar.gz) = 24967
+TIMESTAMP = 1650228982
+SHA256 (DBIx-QueryLog-0.42.tar.gz) = 4f09674d7a2888b8c621f32b7b104aba80b7c88ae83b4855c712d31e49a532f5
+SIZE (DBIx-QueryLog-0.42.tar.gz) = 24689
diff --git a/databases/p5-DBIx-QueryLog/files/patch-Build.PL b/databases/p5-DBIx-QueryLog/files/patch-Build.PL
deleted file mode 100644
index cd02605f6967..000000000000
--- a/databases/p5-DBIx-QueryLog/files/patch-Build.PL
+++ /dev/null
@@ -1,11 +0,0 @@
---- Build.PL.orig	2014-11-20 15:07:02.244462087 +0900
-+++ Build.PL	2014-11-20 15:07:18.822650963 +0900
-@@ -25,7 +25,7 @@
-     module_name     => 'DBIx::QueryLog',
-     allow_pureperl => 0,
- 
--    script_files => [glob('script/*'), glob('bin/*')],
-+#    script_files => [glob('script/*'), glob('bin/*')],
-     c_source     => [qw()],
-     PL_files => {},
- 
diff --git a/databases/p5-DBIx-QueryLog/pkg-descr b/databases/p5-DBIx-QueryLog/pkg-descr
index 9d76fa0ae361..04d06f2d52ea 100644
--- a/databases/p5-DBIx-QueryLog/pkg-descr
+++ b/databases/p5-DBIx-QueryLog/pkg-descr
@@ -1,5 +1,3 @@
 DBIx::QueryLog is logs each execution time and the actual query.
 
 Currently, works on DBD::mysql and DBD::sqlite.
-
-WWW: https://metacpan.org/release/DBIx-QueryLog
diff --git a/databases/p5-DBIx-QuickDB/Makefile b/databases/p5-DBIx-QuickDB/Makefile
index f0e56c5dcd56..751aa51e6c4a 100644
--- a/databases/p5-DBIx-QuickDB/Makefile
+++ b/databases/p5-DBIx-QuickDB/Makefile
@@ -1,17 +1,16 @@
-# Created by: Po-Chuan Hsieh <sunpoet@FreeBSD.org>
-
 PORTNAME=	DBIx-QuickDB
-PORTVERSION=	0.000021
+PORTVERSION=	0.000026
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Quickly start a db server
+WWW=		https://metacpan.org/dist/DBIx-QuickDB
 
 LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
-LICENSE_FILE=	${WRKSRC}/LICENSE
+LICENSE_FILE_GPLv1+ =	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
 RUN_DEPENDS=	p5-File-Copy-Recursive>=0:devel/p5-File-Copy-Recursive \
diff --git a/databases/p5-DBIx-QuickDB/distinfo b/databases/p5-DBIx-QuickDB/distinfo
index c5e1a41ee1bc..3a8177041ab0 100644
--- a/databases/p5-DBIx-QuickDB/distinfo
+++ b/databases/p5-DBIx-QuickDB/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1626542783
-SHA256 (DBIx-QuickDB-0.000021.tar.gz) = 5fec94052cab1b22543818d094553f317013003b7797db11ed7a0261220bbce8
-SIZE (DBIx-QuickDB-0.000021.tar.gz) = 50141
+TIMESTAMP = 1713528506
+SHA256 (DBIx-QuickDB-0.000026.tar.gz) = 2e0777af92a8b4c9ec6f8eff640bbfe0b792748834c5f6ff37fc3c82d111c992
+SIZE (DBIx-QuickDB-0.000026.tar.gz) = 51822
diff --git a/databases/p5-DBIx-QuickDB/pkg-descr b/databases/p5-DBIx-QuickDB/pkg-descr
index d3428836f527..a062e067901f 100644
--- a/databases/p5-DBIx-QuickDB/pkg-descr
+++ b/databases/p5-DBIx-QuickDB/pkg-descr
@@ -1,4 +1,2 @@
 DBIx::QuickDB makes it easy to spin up a temporary database server for any
 supported driver. PostgreSQL and MySQL are the initially supported drivers.
-
-WWW: https://metacpan.org/dist/DBIx-QuickDB
diff --git a/databases/p5-DBIx-Recordset/Makefile b/databases/p5-DBIx-Recordset/Makefile
index f06f1bbf39bc..938f84ba2df6 100644
--- a/databases/p5-DBIx-Recordset/Makefile
+++ b/databases/p5-DBIx-Recordset/Makefile
@@ -1,5 +1,3 @@
-# Created by: Sergey Skvortsov <skv@protey.ru>
-
 PORTNAME=	DBIx-Recordset
 PORTVERSION=	0.26
 PORTREVISION=	1
@@ -9,6 +7,7 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl module for abstraction and simplification of database access
+WWW=		https://metacpan.org/release/DBIx-Recordset
 
 LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
diff --git a/databases/p5-DBIx-Recordset/pkg-descr b/databases/p5-DBIx-Recordset/pkg-descr
index 1065bb0fbc93..b404f8360dde 100644
--- a/databases/p5-DBIx-Recordset/pkg-descr
+++ b/databases/p5-DBIx-Recordset/pkg-descr
@@ -7,5 +7,3 @@ underlying DBMS.  Special attention is made on web applications to make
 it possible to handle the state-less access and to process the posted
 data of formfields, but DBIx::Recordset is not limited to web
 applications.
-
-WWW: https://metacpan.org/release/DBIx-Recordset
diff --git a/databases/p5-DBIx-RetryOverDisconnects/Makefile b/databases/p5-DBIx-RetryOverDisconnects/Makefile
index a913a3219d41..6e7609e35e37 100644
--- a/databases/p5-DBIx-RetryOverDisconnects/Makefile
+++ b/databases/p5-DBIx-RetryOverDisconnects/Makefile
@@ -1,5 +1,3 @@
-# Created by: Vladimir Timofeev <vovkasm@gmail.com>
-
 PORTNAME=	DBIx-RetryOverDisconnects
 PORTVERSION=	0.08
 PORTREVISION=	1
@@ -9,6 +7,7 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	vovkasm@gmail.com
 COMMENT=	Keeps database connection persistent
+WWW=		https://metacpan.org/release/DBIx-RetryOverDisconnects
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
 RUN_DEPENDS=	p5-DBI>0:databases/p5-DBI \
diff --git a/databases/p5-DBIx-RetryOverDisconnects/pkg-descr b/databases/p5-DBIx-RetryOverDisconnects/pkg-descr
index ca389219733c..a2c16a6df21b 100644
--- a/databases/p5-DBIx-RetryOverDisconnects/pkg-descr
+++ b/databases/p5-DBIx-RetryOverDisconnects/pkg-descr
@@ -1,3 +1 @@
 DBI wrapper that helps to deal with databases connection problems
-
-WWW: https://metacpan.org/release/DBIx-RetryOverDisconnects
diff --git a/databases/p5-DBIx-SQLEngine/Makefile b/databases/p5-DBIx-SQLEngine/Makefile
index ddd09e6a5abb..1bdb68c737ff 100644
--- a/databases/p5-DBIx-SQLEngine/Makefile
+++ b/databases/p5-DBIx-SQLEngine/Makefile
@@ -1,5 +1,3 @@
-# Created by: Hansjoerg Pehofer <hansjoerg.pehofer@uibk.ac.at>
-
 PORTNAME=	DBIx-SQLEngine
 PORTVERSION=	0.93
 PORTREVISION=	1
@@ -9,6 +7,7 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Extends DBI with high-level operations
+WWW=		https://metacpan.org/release/DBIx-SQLEngine
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
 RUN_DEPENDS=	p5-Class-MakeMethods>=0:devel/p5-Class-MakeMethods \
diff --git a/databases/p5-DBIx-SQLEngine/pkg-descr b/databases/p5-DBIx-SQLEngine/pkg-descr
index 3ba9ca5df3bd..ab5eaf3f37bc 100644
--- a/databases/p5-DBIx-SQLEngine/pkg-descr
+++ b/databases/p5-DBIx-SQLEngine/pkg-descr
@@ -3,5 +3,3 @@ database framework. Each SQLEngine object is a wrapper around a DBI
 database handle, adding methods that support ad-hoc SQL generation and
 query execution in a single call. Dynamic subclassing based on database
 server type enables cross-platform portability.
-
-WWW: https://metacpan.org/release/DBIx-SQLEngine
diff --git a/databases/p5-DBIx-SQLite-Simple/Makefile b/databases/p5-DBIx-SQLite-Simple/Makefile
index 16bab1bae21a..35a44f2baf8e 100644
--- a/databases/p5-DBIx-SQLite-Simple/Makefile
+++ b/databases/p5-DBIx-SQLite-Simple/Makefile
@@ -1,5 +1,3 @@
-# Created by: Andrew Pantyukhin <infofarmer@FreeBSD.org>
-
 PORTNAME=	DBIx-SQLite-Simple
 PORTVERSION=	0.35
 CATEGORIES=	databases perl5
@@ -8,6 +6,7 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	Easy access to SQLite databases using objects
+WWW=		https://metacpan.org/release/DBIx-SQLite-Simple
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
 RUN_DEPENDS=	p5-Class-Gomor>=0:devel/p5-Class-Gomor \
diff --git a/databases/p5-DBIx-SQLite-Simple/pkg-descr b/databases/p5-DBIx-SQLite-Simple/pkg-descr
index dfb35144cc61..be2363b2e39b 100644
--- a/databases/p5-DBIx-SQLite-Simple/pkg-descr
+++ b/databases/p5-DBIx-SQLite-Simple/pkg-descr
@@ -1,3 +1 @@
 DBIx::SQLite::Simple - easy access to SQLite databases using objects
-
-WWW: https://metacpan.org/release/DBIx-SQLite-Simple
diff --git a/databases/p5-DBIx-Safe/Makefile b/databases/p5-DBIx-Safe/Makefile
index 4e90bdf9419c..62b44b0452b1 100644
--- a/databases/p5-DBIx-Safe/Makefile
+++ b/databases/p5-DBIx-Safe/Makefile
@@ -1,5 +1,3 @@
-# Created by: Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>
-
 PORTNAME=	DBIx-Safe
 PORTVERSION=	1.2.5
 PORTREVISION=	3
@@ -10,6 +8,7 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Safer access to your database through a DBI database handle
+WWW=		https://metacpan.org/release/DBIx-Safe
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
diff --git a/databases/p5-DBIx-Safe/pkg-descr b/databases/p5-DBIx-Safe/pkg-descr
index b9cbc9d5b96d..6af712aa0bb2 100644
--- a/databases/p5-DBIx-Safe/pkg-descr
+++ b/databases/p5-DBIx-Safe/pkg-descr
@@ -20,5 +20,3 @@ specify a regular expression that is NOT allowed to run (e.g. qr(UPDATE xxx}).
 Finally, you can indicate which database attributes are allowed to be read and
 changed (e.g. 'PrintError'). For all of the above, there are matching methods to
 remove them as well.
-
-WWW: https://metacpan.org/release/DBIx-Safe
diff --git a/databases/p5-DBIx-SearchBuilder/Makefile b/databases/p5-DBIx-SearchBuilder/Makefile
index f35faaa132fe..0f36fb457a42 100644
--- a/databases/p5-DBIx-SearchBuilder/Makefile
+++ b/databases/p5-DBIx-SearchBuilder/Makefile
@@ -1,13 +1,12 @@
-# Created by: Anton Berezin <tobez@tobez.org>
-
 PORTNAME=	DBIx-SearchBuilder
-PORTVERSION=	1.68
+PORTVERSION=	1.77
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	michelle@sorbs.net
 COMMENT=	Perl extension for easy SQL SELECT Statement generation
+WWW=		https://metacpan.org/release/DBIx-SearchBuilder
 
 LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
diff --git a/databases/p5-DBIx-SearchBuilder/distinfo b/databases/p5-DBIx-SearchBuilder/distinfo
index 39fb86e73794..ca269b9c6cbe 100644
--- a/databases/p5-DBIx-SearchBuilder/distinfo
+++ b/databases/p5-DBIx-SearchBuilder/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1594975966
-SHA256 (DBIx-SearchBuilder-1.68.tar.gz) = be197c0f83c426996f77d22126f3103f958fc4bd1791c6962b793cc2779601f8
-SIZE (DBIx-SearchBuilder-1.68.tar.gz) = 115423
+TIMESTAMP = 1697793557
+SHA256 (DBIx-SearchBuilder-1.77.tar.gz) = 3bf8a5d5c8c5fdc60ad2f63f63f73dd1f6493ff4d82587283a3e22337e8fe070
+SIZE (DBIx-SearchBuilder-1.77.tar.gz) = 128544
diff --git a/databases/p5-DBIx-SearchBuilder/pkg-descr b/databases/p5-DBIx-SearchBuilder/pkg-descr
index 8ab35bfd100c..45d958f3be08 100644
--- a/databases/p5-DBIx-SearchBuilder/pkg-descr
+++ b/databases/p5-DBIx-SearchBuilder/pkg-descr
@@ -1,3 +1 @@
 Perl extension for easy SQL SELECT Statement generation.
-
-WWW: https://metacpan.org/release/DBIx-SearchBuilder
diff --git a/databases/p5-DBIx-Sequence/Makefile b/databases/p5-DBIx-Sequence/Makefile
index f110c2ee370d..b46239a3152b 100644
--- a/databases/p5-DBIx-Sequence/Makefile
+++ b/databases/p5-DBIx-Sequence/Makefile
@@ -1,5 +1,3 @@
-# Created by: Jon Nistor <nistor@snickers.org>
-
 PORTNAME=	DBIx-Sequence
 PORTVERSION=	1.5
 PORTREVISION=	1
@@ -9,6 +7,7 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	nistor@snickers.org
 COMMENT=	Simple SQL92 ID generator in Perl
+WWW=		https://metacpan.org/release/DBIx-Sequence
 
 BUILD_DEPENDS=	p5-DBI>=0:databases/p5-DBI
 RUN_DEPENDS=	p5-DBI>=0:databases/p5-DBI
diff --git a/databases/p5-DBIx-Sequence/pkg-descr b/databases/p5-DBIx-Sequence/pkg-descr
index 30e01c1d9b24..6b90f0209c16 100644
--- a/databases/p5-DBIx-Sequence/pkg-descr
+++ b/databases/p5-DBIx-Sequence/pkg-descr
@@ -11,5 +11,3 @@ to return a unique value every time it is called, even with concurrent
 processes. It uses your database for its state storage with ANSI SQL92
 compliant SQL. All SQL queries inside DBIx::Sequence are pre cached and
 very efficient especially under mod_perl.
-
-WWW: https://metacpan.org/release/DBIx-Sequence
diff --git a/databases/p5-DBIx-Simple/Makefile b/databases/p5-DBIx-Simple/Makefile
index cff559be096e..1bcec3ece250 100644
--- a/databases/p5-DBIx-Simple/Makefile
+++ b/databases/p5-DBIx-Simple/Makefile
@@ -1,5 +1,3 @@
-# Created by: Parv <parv@pair.org>
-
 PORTNAME=	DBIx-Simple
 PORTVERSION=	1.37
 CATEGORIES=	databases perl5
@@ -8,6 +6,7 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Simplified object oriented interface to Perl DBI
+WWW=		https://metacpan.org/release/DBIx-Simple
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
 RUN_DEPENDS=	p5-DBI>=1.21:databases/p5-DBI ${TEST_DEPENDS}
diff --git a/databases/p5-DBIx-Simple/pkg-descr b/databases/p5-DBIx-Simple/pkg-descr
index 612b72807b4a..e8d8bab5e462 100644
--- a/databases/p5-DBIx-Simple/pkg-descr
+++ b/databases/p5-DBIx-Simple/pkg-descr
@@ -10,5 +10,3 @@ DBI.  From its description ...
   boolean context, is false. The dummy object lets you postpone (or skip) error
   checking, but it also makes immediate error check simply " $db->query(...) or
   die $db->error".
-
-WWW: https://metacpan.org/release/DBIx-Simple
diff --git a/databases/p5-DBIx-Skinny-InflateColumn-DateTime/Makefile b/databases/p5-DBIx-Skinny-InflateColumn-DateTime/Makefile
index b008991c7641..2f77a0fb30e2 100644
--- a/databases/p5-DBIx-Skinny-InflateColumn-DateTime/Makefile
+++ b/databases/p5-DBIx-Skinny-InflateColumn-DateTime/Makefile
@@ -5,8 +5,9 @@ CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension to inflate/deflate DateTime for DBIx::Skinny
+WWW=		https://metacpan.org/release/DBIx-Skinny-InflateColumn-DateTime
 
 LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
diff --git a/databases/p5-DBIx-Skinny-InflateColumn-DateTime/pkg-descr b/databases/p5-DBIx-Skinny-InflateColumn-DateTime/pkg-descr
index 65e6b96d39f2..2b4438f96c2f 100644
--- a/databases/p5-DBIx-Skinny-InflateColumn-DateTime/pkg-descr
+++ b/databases/p5-DBIx-Skinny-InflateColumn-DateTime/pkg-descr
@@ -3,5 +3,3 @@ settings for *_at/*_on columns.
 
 If you want to set created_XX and updated_XX automatically, you can
 use DBIx::Class::InflateColumn::DateTime::Auto.
-
-WWW: https://metacpan.org/release/DBIx-Skinny-InflateColumn-DateTime
diff --git a/databases/p5-DBIx-Skinny-Mixin-DBHResolver/Makefile b/databases/p5-DBIx-Skinny-Mixin-DBHResolver/Makefile
index 241a150d06fa..409eb15b1480 100644
--- a/databases/p5-DBIx-Skinny-Mixin-DBHResolver/Makefile
+++ b/databases/p5-DBIx-Skinny-Mixin-DBHResolver/Makefile
@@ -5,8 +5,9 @@ CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension of DBIx::DBHResolver mixin for DBIx::Skinny
+WWW=		https://metacpan.org/release/DBIx-Skinny-Mixin-DBHResolver
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
 RUN_DEPENDS=	\
diff --git a/databases/p5-DBIx-Skinny-Mixin-DBHResolver/pkg-descr b/databases/p5-DBIx-Skinny-Mixin-DBHResolver/pkg-descr
index 253214d88315..0240bdec377f 100644
--- a/databases/p5-DBIx-Skinny-Mixin-DBHResolver/pkg-descr
+++ b/databases/p5-DBIx-Skinny-Mixin-DBHResolver/pkg-descr
@@ -1,3 +1 @@
 DBIx::DBHResolver mixin for DBIx::Skinny.
-
-WWW: https://metacpan.org/release/DBIx-Skinny-Mixin-DBHResolver
diff --git a/databases/p5-DBIx-Skinny-Pager/Makefile b/databases/p5-DBIx-Skinny-Pager/Makefile
index 5baf4f6e964b..21810c4191d7 100644
--- a/databases/p5-DBIx-Skinny-Pager/Makefile
+++ b/databases/p5-DBIx-Skinny-Pager/Makefile
@@ -5,8 +5,9 @@ CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension of resultset pager for DBIx::Skinny
+WWW=		https://metacpan.org/release/DBIx-Skinny-Pager
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
 RUN_DEPENDS=	\
diff --git a/databases/p5-DBIx-Skinny-Pager/pkg-descr b/databases/p5-DBIx-Skinny-Pager/pkg-descr
index b8793d6f81f5..6167a83bda42 100644
--- a/databases/p5-DBIx-Skinny-Pager/pkg-descr
+++ b/databases/p5-DBIx-Skinny-Pager/pkg-descr
@@ -1,5 +1,3 @@
 DBIx::Skinny::Pager is resultset pager interface for
 DBIx::Skinny. This module is not support for search_by_sql or
 search_named.
-
-WWW: https://metacpan.org/release/DBIx-Skinny-Pager
diff --git a/databases/p5-DBIx-Skinny-Schema-Loader/Makefile b/databases/p5-DBIx-Skinny-Schema-Loader/Makefile
index 19417513b5cd..893ac89cc079 100644
--- a/databases/p5-DBIx-Skinny-Schema-Loader/Makefile
+++ b/databases/p5-DBIx-Skinny-Schema-Loader/Makefile
@@ -6,8 +6,9 @@ MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:NEKOYA
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension to load schema for DBIx::Skinny
+WWW=		https://metacpan.org/release/DBIx-Skinny-Schema-Loader
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
 RUN_DEPENDS=	\
diff --git a/databases/p5-DBIx-Skinny-Schema-Loader/pkg-descr b/databases/p5-DBIx-Skinny-Schema-Loader/pkg-descr
index b14eadc88962..3ecabcdba371 100644
--- a/databases/p5-DBIx-Skinny-Schema-Loader/pkg-descr
+++ b/databases/p5-DBIx-Skinny-Schema-Loader/pkg-descr
@@ -2,5 +2,3 @@ DBIx::Skinny::Schema::Loader is schema loader for DBIx::Skinny.  It
 can dynamically load schema at run-time or statically publish them.
 
 It supports MySQL and SQLite, and PostgreSQL.
-
-WWW: https://metacpan.org/release/DBIx-Skinny-Schema-Loader
diff --git a/databases/p5-DBIx-Skinny/Makefile b/databases/p5-DBIx-Skinny/Makefile
index a2ccbf2d5842..01694934aa03 100644
--- a/databases/p5-DBIx-Skinny/Makefile
+++ b/databases/p5-DBIx-Skinny/Makefile
@@ -6,8 +6,9 @@ MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:NEKOKAK
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension for simple DBI wrapper/ORMapper
+WWW=		https://metacpan.org/release/DBIx-Skinny
 
 LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
diff --git a/databases/p5-DBIx-Skinny/pkg-descr b/databases/p5-DBIx-Skinny/pkg-descr
index 64990da69d0f..6d0c926c1803 100644
--- a/databases/p5-DBIx-Skinny/pkg-descr
+++ b/databases/p5-DBIx-Skinny/pkg-descr
@@ -1,4 +1,2 @@
 DBIx::Skinny is simple DBI wrapper and simple O/R Mapper.  It aims to
 be lightweight, with minimal dependencies so it's easier to install.
-
-WWW: https://metacpan.org/release/DBIx-Skinny
diff --git a/databases/p5-DBIx-Sunny/Makefile b/databases/p5-DBIx-Sunny/Makefile
index 18e74d4e64c1..1b4618815310 100644
--- a/databases/p5-DBIx-Sunny/Makefile
+++ b/databases/p5-DBIx-Sunny/Makefile
@@ -1,13 +1,12 @@
-# Created by: Cheng-Lung Sung <clsung@FreeBSD.org>
-
 PORTNAME=	DBIx-Sunny
-PORTVERSION=	0.9992
+PORTVERSION=	0.9993
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Simple DBI wrapper supports SQLite and MySQL
+WWW=		https://metacpan.org/release/DBIx-Sunny
 
 LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
diff --git a/databases/p5-DBIx-Sunny/distinfo b/databases/p5-DBIx-Sunny/distinfo
index ac110fb0a604..01a3998f903c 100644
--- a/databases/p5-DBIx-Sunny/distinfo
+++ b/databases/p5-DBIx-Sunny/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1598175268
-SHA256 (DBIx-Sunny-0.9992.tar.gz) = 3f5355036b2f074b67a8912bde8015770bf11fb160d903f7ff6e7d9ac97a2d69
-SIZE (DBIx-Sunny-0.9992.tar.gz) = 21604
+TIMESTAMP = 1697463216
+SHA256 (DBIx-Sunny-0.9993.tar.gz) = 29c10e5c5b6fd946406cc252c9e54de27c5de655dbd6b0c1508fa5cef507573d
+SIZE (DBIx-Sunny-0.9993.tar.gz) = 21965
diff --git a/databases/p5-DBIx-Sunny/pkg-descr b/databases/p5-DBIx-Sunny/pkg-descr
index 3510c8d54a04..625d66b174e5 100644
--- a/databases/p5-DBIx-Sunny/pkg-descr
+++ b/databases/p5-DBIx-Sunny/pkg-descr
@@ -1,4 +1,2 @@
 DBIx::Sunny is a simple DBI wrapper. It provides better usability for you.
 This module based on Amon2::DBI. DBIx::Sunny supports only SQLite and MySQL.
-
-WWW: https://metacpan.org/release/DBIx-Sunny
diff --git a/databases/p5-DBIx-Sunny/pkg-plist b/databases/p5-DBIx-Sunny/pkg-plist
index 6a9b6f3be5a3..a3dc50760f6b 100644
--- a/databases/p5-DBIx-Sunny/pkg-plist
+++ b/databases/p5-DBIx-Sunny/pkg-plist
@@ -3,4 +3,3 @@
 %%SITE_PERL%%/DBIx/Sunny/Util.pm
 %%PERL5_MAN3%%/DBIx::Sunny.3.gz
 %%PERL5_MAN3%%/DBIx::Sunny::Schema.3.gz
-%%PERL5_MAN3%%/DBIx::Sunny::Util.3.gz
diff --git a/databases/p5-DBIx-TableHash/Makefile b/databases/p5-DBIx-TableHash/Makefile
index e7600daa9704..9cf9567deeb7 100644
--- a/databases/p5-DBIx-TableHash/Makefile
+++ b/databases/p5-DBIx-TableHash/Makefile
@@ -1,20 +1,19 @@
-# Created by: ijliao
-
 PORTNAME=	DBIx-TableHash
 CATEGORIES=	databases perl5
 PORTVERSION=	1.05
-PORTREVISION=	1
+PORTREVISION=	2
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:CHTHORMAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Tie a hash to a MySQL table plus SQL utilities
+WWW=		https://christhorman.com/projects/perl/DBIx-TableHash/
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
-RUN_DEPENDS=	p5-DBD-mysql>=0:databases/p5-DBD-mysql
+RUN_DEPENDS=	${DBD_MYSQL}
 
-USES=		perl5
+USES=		mysql perl5
 USE_PERL5=	configure
 
 .include <bsd.port.mk>
diff --git a/databases/p5-DBIx-TableHash/pkg-descr b/databases/p5-DBIx-TableHash/pkg-descr
index ae457a24651b..77caa47858e3 100644
--- a/databases/p5-DBIx-TableHash/pkg-descr
+++ b/databases/p5-DBIx-TableHash/pkg-descr
@@ -1,5 +1,3 @@
 DBIx::TableHash is a perl module that ties a hash to a DBI/mysql table or
 slice of the table, along with some methods to build SQL for common
 database operations, returning data in convenient structures.
-
-WWW: http://christhorman.com/projects/perl/DBIx-TableHash/
diff --git a/databases/p5-DBIx-Tracer/Makefile b/databases/p5-DBIx-Tracer/Makefile
new file mode 100644
index 000000000000..5520bc7f4e89
--- /dev/null
+++ b/databases/p5-DBIx-Tracer/Makefile
@@ -0,0 +1,25 @@
+PORTNAME=	DBIx-Tracer
+PORTVERSION=	0.03
+CATEGORIES=	databases perl5
+MASTER_SITES=	CPAN
+PKGNAMEPREFIX=	p5-
+
+MAINTAINER=	sunpoet@FreeBSD.org
+COMMENT=	Easy tracer for DBI
+WWW=		https://metacpan.org/dist/DBIx-Tracer
+
+LICENSE=	ART10 GPLv1+
+LICENSE_COMB=	dual
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
+BUILD_DEPENDS=	${RUN_DEPENDS}
+RUN_DEPENDS=	p5-DBD-SQLite>=0:databases/p5-DBD-SQLite \
+		p5-DBI>=0:databases/p5-DBI
+TEST_DEPENDS=	p5-Test-Requires>=0:devel/p5-Test-Requires
+
+USES=		perl5
+USE_PERL5=	modbuildtiny
+
+NO_ARCH=	yes
+
+.include <bsd.port.mk>
diff --git a/databases/p5-DBIx-Tracer/distinfo b/databases/p5-DBIx-Tracer/distinfo
new file mode 100644
index 000000000000..e6fd025a5bae
--- /dev/null
+++ b/databases/p5-DBIx-Tracer/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1650970021
+SHA256 (DBIx-Tracer-0.03.tar.gz) = 78ab95d780bb877b40897631deab9a443508b2518d4190d3581582950ca9b3bc
+SIZE (DBIx-Tracer-0.03.tar.gz) = 13253
diff --git a/databases/p5-DBIx-Tracer/pkg-descr b/databases/p5-DBIx-Tracer/pkg-descr
new file mode 100644
index 000000000000..b6c6c69f68f1
--- /dev/null
+++ b/databases/p5-DBIx-Tracer/pkg-descr
@@ -0,0 +1,4 @@
+DBIx::Tracer is easy tracer for DBI. You can trace a SQL queries without
+modifying configuration in your application.
+
+You can insert snippets using DBIx::Tracer, and profile it.
diff --git a/databases/p5-DBIx-Tracer/pkg-plist b/databases/p5-DBIx-Tracer/pkg-plist
new file mode 100644
index 000000000000..2d50fff135cb
--- /dev/null
+++ b/databases/p5-DBIx-Tracer/pkg-plist
@@ -0,0 +1,2 @@
+%%SITE_PERL%%/DBIx/Tracer.pm
+%%PERL5_MAN3%%/DBIx::Tracer.3.gz
diff --git a/databases/p5-DBIx-TransactionManager/Makefile b/databases/p5-DBIx-TransactionManager/Makefile
index 544ac0927fee..a49362e2aa54 100644
--- a/databases/p5-DBIx-TransactionManager/Makefile
+++ b/databases/p5-DBIx-TransactionManager/Makefile
@@ -6,8 +6,9 @@ MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:NEKOKAK
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension for database transaction handling
+WWW=		https://metacpan.org/release/DBIx-TransactionManager
 
 LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
diff --git a/databases/p5-DBIx-TransactionManager/pkg-descr b/databases/p5-DBIx-TransactionManager/pkg-descr
index b217ab429ae2..267b220625bc 100644
--- a/databases/p5-DBIx-TransactionManager/pkg-descr
+++ b/databases/p5-DBIx-TransactionManager/pkg-descr
@@ -1,4 +1,2 @@
 DBIx::TransactionManager is a simple transaction manager.  Like
 DBIx::Class::Storage::TxnScopeGuard.
-
-WWW: https://metacpan.org/release/DBIx-TransactionManager
diff --git a/databases/p5-DBIx-Tree/Makefile b/databases/p5-DBIx-Tree/Makefile
index cd0d5e1d3003..06b907bffdd9 100644
--- a/databases/p5-DBIx-Tree/Makefile
+++ b/databases/p5-DBIx-Tree/Makefile
@@ -1,5 +1,3 @@
-# Created by: Philip M. Gollucci <philip@p6m7g8.com>
-
 PORTNAME=	DBIx-Tree
 PORTVERSION=	1.98
 CATEGORIES=	databases perl5
@@ -8,6 +6,7 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl module for generating a tree from a self-referential table
+WWW=		https://metacpan.org/release/DBIx-Tree
 
 LICENSE=	ART20
 
diff --git a/databases/p5-DBIx-Tree/pkg-descr b/databases/p5-DBIx-Tree/pkg-descr
index a744e0840f5d..fe8a5b2666a0 100644
--- a/databases/p5-DBIx-Tree/pkg-descr
+++ b/databases/p5-DBIx-Tree/pkg-descr
@@ -3,6 +3,4 @@ want to bust out into a tree, this is the module to check out.  Assum-
 ing there are no horribly broken nodes in your tree and (heaven forbid)
 any circular references
 
-WWW: https://metacpan.org/release/DBIx-Tree
-
 Philip M. Gollucci <philip@p6m7g8.com>
diff --git a/databases/p5-DBIx-VersionedDDL/Makefile b/databases/p5-DBIx-VersionedDDL/Makefile
index fb52f6517353..5c860d6de939 100644
--- a/databases/p5-DBIx-VersionedDDL/Makefile
+++ b/databases/p5-DBIx-VersionedDDL/Makefile
@@ -1,5 +1,3 @@
-# Created by: Alan Snelson <Alan@Wave2.org>
-
 PORTNAME=	DBIx-VersionedDDL
 PORTVERSION=	0.17
 PORTREVISION=	1
@@ -9,6 +7,7 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	Alan@Wave2.org
 COMMENT=	Upgrade and downgrade database schemas to a specified version
+WWW=		https://metacpan.org/release/DBIx-VersionedDDL
 
 LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
diff --git a/databases/p5-DBIx-VersionedDDL/pkg-descr b/databases/p5-DBIx-VersionedDDL/pkg-descr
index adc8426d0563..7faa0b42bc02 100644
--- a/databases/p5-DBIx-VersionedDDL/pkg-descr
+++ b/databases/p5-DBIx-VersionedDDL/pkg-descr
@@ -1,4 +1,2 @@
 DBIx::VersionedDDL is a perl module to upgrade and downgrade database
 schemas to a specified version.
-
-WWW: https://metacpan.org/release/DBIx-VersionedDDL
diff --git a/databases/p5-DBIx-Wrapper/Makefile b/databases/p5-DBIx-Wrapper/Makefile
index 4a8e58809bca..8ba749b3c9d3 100644
--- a/databases/p5-DBIx-Wrapper/Makefile
+++ b/databases/p5-DBIx-Wrapper/Makefile
@@ -1,5 +1,3 @@
-# Created by: Don Owens <don@regexguy.com>
-
 PORTNAME=	DBIx-Wrapper
 PORTVERSION=	0.29
 CATEGORIES=	databases perl5
@@ -8,6 +6,7 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	don@regexguy.com
 COMMENT=	Wrapper around Perl's DBI module
+WWW=		https://metacpan.org/release/DBIx-Wrapper
 
 LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
diff --git a/databases/p5-DBIx-Wrapper/pkg-descr b/databases/p5-DBIx-Wrapper/pkg-descr
index f3173ed3b870..3be3620e44a1 100644
--- a/databases/p5-DBIx-Wrapper/pkg-descr
+++ b/databases/p5-DBIx-Wrapper/pkg-descr
@@ -1,3 +1 @@
 This is the DBIx::Wrapper module -- a convenience wrapper around Perl's DBI.
-
-WWW: https://metacpan.org/release/DBIx-Wrapper
diff --git a/databases/p5-DBIx-XHTML_Table/Makefile b/databases/p5-DBIx-XHTML_Table/Makefile
index 048b81194b14..d1fd3c736c52 100644
--- a/databases/p5-DBIx-XHTML_Table/Makefile
+++ b/databases/p5-DBIx-XHTML_Table/Makefile
@@ -1,5 +1,3 @@
-# Created by: Seamus Venasse <svenasse@polaris.ca>
-
 PORTNAME=	DBIx-XHTML_Table
 PORTVERSION=	1.49
 CATEGORIES=	databases www perl5
@@ -8,6 +6,7 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Create XHTML tables from SQL queries
+WWW=		https://metacpan.org/release/DBIx-XHTML_Table
 
 LICENSE=	ART20
 
diff --git a/databases/p5-DBIx-XHTML_Table/pkg-descr b/databases/p5-DBIx-XHTML_Table/pkg-descr
index 63a7176d8298..f5d93c3ccb92 100644
--- a/databases/p5-DBIx-XHTML_Table/pkg-descr
+++ b/databases/p5-DBIx-XHTML_Table/pkg-descr
@@ -7,6 +7,4 @@ of 'quick and dirty' reporting. It is not intended for serious
 production use, although it use is viable for prototyping and just
 plain fun.
 
-WWW: https://metacpan.org/release/DBIx-XHTML_Table
-
 Seamus Venasse <svenasse@polaris.ca>
diff --git a/databases/p5-DBIx-XML_RDB/Makefile b/databases/p5-DBIx-XML_RDB/Makefile
index 318a06073a47..8368529eddf3 100644
--- a/databases/p5-DBIx-XML_RDB/Makefile
+++ b/databases/p5-DBIx-XML_RDB/Makefile
@@ -1,5 +1,3 @@
-# Created by: vanilla
-
 PORTNAME=	DBIx-XML_RDB
 PORTVERSION=	0.05
 PORTREVISION=	2
@@ -9,6 +7,7 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension for creating XML from existing DBI datasources
+WWW=		https://metacpan.org/release/DBIx-XML_RDB
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
 RUN_DEPENDS=	p5-DBI>=0:databases/p5-DBI \
diff --git a/databases/p5-DBIx-XML_RDB/pkg-descr b/databases/p5-DBIx-XML_RDB/pkg-descr
index f83658aa2aab..9fc911c5fc4a 100644
--- a/databases/p5-DBIx-XML_RDB/pkg-descr
+++ b/databases/p5-DBIx-XML_RDB/pkg-descr
@@ -1,4 +1,2 @@
 This module is a simple creator of XML data from DBI datasources. It allows you
 to easily extract data from a database, and manipulate later using XML::Parser.
-
-WWW: https://metacpan.org/release/DBIx-XML_RDB
diff --git a/databases/p5-DBM-Deep/Makefile b/databases/p5-DBM-Deep/Makefile
index 9849fd4c7595..8668587d975e 100644
--- a/databases/p5-DBM-Deep/Makefile
+++ b/databases/p5-DBM-Deep/Makefile
@@ -1,22 +1,22 @@
-# Created by: Janos.Mohacsi@bsd.hu
-
 PORTNAME=	DBM-Deep
-PORTVERSION=	2.0016
+DISTVERSION=	2.0019
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	jmohacsi@bsd.hu
 COMMENT=	Pure perl persistent multi-level hash/array DBM
+WWW=		https://metacpan.org/release/DBM-Deep
 
 LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
 
 BUILD_DEPENDS=	p5-FileHandle-Fmode>=0:devel/p5-FileHandle-Fmode
 RUN_DEPENDS=	p5-FileHandle-Fmode>=0:devel/p5-FileHandle-Fmode
-
 TEST_DEPENDS=	p5-Test-Deep>=0.095:devel/p5-Test-Deep \
 		p5-Test-Exception>=0.21:devel/p5-Test-Exception \
+		p5-Test-Pod>=1.14:devel/p5-Test-Pod \
+		p5-Test-Pod-Coverage>=1.04:devel/p5-Test-Pod-Coverage \
 		p5-Test-Warn>=0.08:devel/p5-Test-Warn
 
 USES=		perl5
diff --git a/databases/p5-DBM-Deep/distinfo b/databases/p5-DBM-Deep/distinfo
index 1c3125fa17cb..f18d334d7a50 100644
--- a/databases/p5-DBM-Deep/distinfo
+++ b/databases/p5-DBM-Deep/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1578328308
-SHA256 (DBM-Deep-2.0016.tar.gz) = 902a7c7aa0488d8d0a0e8a6cf3da0e96b4093ae471e6b772f0c6d5898e470e4d
-SIZE (DBM-Deep-2.0016.tar.gz) = 180410
+TIMESTAMP = 1700333040
+SHA256 (DBM-Deep-2.0019.tar.gz) = 5d61a5e6b4e4afc16d33e5290d5248b04a4fc4ee4c0a7dfc7fdd625968fba340
+SIZE (DBM-Deep-2.0019.tar.gz) = 181482
diff --git a/databases/p5-DBM-Deep/pkg-descr b/databases/p5-DBM-Deep/pkg-descr
index 4ca9a31ffe00..595d93662c40 100644
--- a/databases/p5-DBM-Deep/pkg-descr
+++ b/databases/p5-DBM-Deep/pkg-descr
@@ -4,5 +4,3 @@ cross-platform FTPable files, and quite fast. Can handle millions of keys and
 unlimited hash levels without significant slow-down. Written from the ground-up
 in pure perl -- this is NOT a wrapper around a C-based DBM.  Out-of-the-box
 compatibility with Unix, Mac OS X and Windows.
-
-WWW: https://metacpan.org/release/DBM-Deep
diff --git a/databases/p5-DR-Tarantool/Makefile b/databases/p5-DR-Tarantool/Makefile
index e965c7da7afa..206a7f829c4c 100644
--- a/databases/p5-DR-Tarantool/Makefile
+++ b/databases/p5-DR-Tarantool/Makefile
@@ -1,5 +1,3 @@
-# Created by: Veniamin Gvozdikov <vg@FreeBSD.org>
-
 PORTNAME=	DR-Tarantool
 PORTVERSION=	0.44
 PORTREVISION=	1
@@ -10,11 +8,12 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Perl driver for Tarantool
+WWW=		https://metacpan.org/release/DR-Tarantool
 
 LICENSE=	ART10
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
-RUN_DEPENDS=	p5-AnyEvent>=0:devel/p5-AnyEvent \
+RUN_DEPENDS=	p5-AnyEvent>=0,1:devel/p5-AnyEvent \
 		p5-Devel-GlobalDestruction>=0:devel/p5-Devel-GlobalDestruction \
 		p5-JSON-XS>=0:converters/p5-JSON-XS \
 		p5-List-MoreUtils>=0:lang/p5-List-MoreUtils
diff --git a/databases/p5-DR-Tarantool/pkg-descr b/databases/p5-DR-Tarantool/pkg-descr
index 66755992cc59..414d6888af60 100644
--- a/databases/p5-DR-Tarantool/pkg-descr
+++ b/databases/p5-DR-Tarantool/pkg-descr
@@ -4,5 +4,4 @@ The driver does not have external dependencies, but includes the official
 light-weight Tarantool C client (a single C header which implements all protocol
 formatting) for packing requests and unpacking server responses.
 
-WWW: https://metacpan.org/release/DR-Tarantool
-WWW: https://github.com/dr-co/dr-tarantool
+See also: https://github.com/dr-co/dr-tarantool
diff --git a/databases/p5-DWH_File/Makefile b/databases/p5-DWH_File/Makefile
index f43753133659..92f424238cbb 100644
--- a/databases/p5-DWH_File/Makefile
+++ b/databases/p5-DWH_File/Makefile
@@ -1,5 +1,3 @@
-# Created by: mharo@FreeBSD.org
-
 PORTNAME=	DWH_File
 PORTVERSION=	0.24
 PORTREVISION=	2
@@ -9,6 +7,7 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Store deep and wide hashes in single level tied hash
+WWW=		http://www.orqwood.dk/perl5/dwh/
 
 BUILD_DEPENDS=	p5-URI>=0:net/p5-URI
 RUN_DEPENDS=	p5-URI>=0:net/p5-URI
diff --git a/databases/p5-DWH_File/pkg-descr b/databases/p5-DWH_File/pkg-descr
index 6e80489df1b7..3dac087fc162 100644
--- a/databases/p5-DWH_File/pkg-descr
+++ b/databases/p5-DWH_File/pkg-descr
@@ -7,5 +7,3 @@ comply with some very simple rules which don't impose any limitations to
 their functionality or structure except that they can't themselves be tied
 to anyone else. See the "Models" section of the embedded documentation for
 details.
-
-WWW: http://www.orqwood.dk/perl5/dwh/
diff --git a/databases/p5-Dancer-Plugin-DBIC/Makefile b/databases/p5-Dancer-Plugin-DBIC/Makefile
index 4f9ef293698a..00972360d328 100644
--- a/databases/p5-Dancer-Plugin-DBIC/Makefile
+++ b/databases/p5-Dancer-Plugin-DBIC/Makefile
@@ -1,5 +1,3 @@
-# Created by: <ports@c0decafe.net>
-
 PORTNAME=	Dancer-Plugin-DBIC
 PORTVERSION=	0.2104
 CATEGORIES=	databases perl5
@@ -8,6 +6,7 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	DBIx::Class interface for Dancer applications
+WWW=		https://metacpan.org/release/Dancer-Plugin-DBIC
 
 LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
diff --git a/databases/p5-Dancer-Plugin-DBIC/pkg-descr b/databases/p5-Dancer-Plugin-DBIC/pkg-descr
index 7a60b7353a91..62fc0cdf8be6 100644
--- a/databases/p5-Dancer-Plugin-DBIC/pkg-descr
+++ b/databases/p5-Dancer-Plugin-DBIC/pkg-descr
@@ -1,3 +1 @@
 DBIx::Class interface for Dancer applications
-
-WWW: https://metacpan.org/release/Dancer-Plugin-DBIC
diff --git a/databases/p5-Dancer-Plugin-Database-Core/Makefile b/databases/p5-Dancer-Plugin-Database-Core/Makefile
index 2b0ee5699821..c02b3e9cbef0 100644
--- a/databases/p5-Dancer-Plugin-Database-Core/Makefile
+++ b/databases/p5-Dancer-Plugin-Database-Core/Makefile
@@ -1,5 +1,3 @@
-# Created by: Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>
-
 PORTNAME=	Dancer-Plugin-Database-Core
 PORTVERSION=	0.20
 CATEGORIES=	databases perl5
@@ -8,6 +6,7 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Shared core for D1 and D2 Database plugins
+WWW=		https://metacpan.org/release/Dancer-Plugin-Database-Core
 
 LICENSE=	ART20
 
diff --git a/databases/p5-Dancer-Plugin-Database-Core/pkg-descr b/databases/p5-Dancer-Plugin-Database-Core/pkg-descr
index 72f4dca68bdf..9dd62ca9ba62 100644
--- a/databases/p5-Dancer-Plugin-Database-Core/pkg-descr
+++ b/databases/p5-Dancer-Plugin-Database-Core/pkg-descr
@@ -1,4 +1,2 @@
 Dancer::Plugin::Database::Core is a shared library for Dancer::Plugin::Database
 and Dancer2::Plugin::Database modules.
-
-WWW: https://metacpan.org/release/Dancer-Plugin-Database-Core
diff --git a/databases/p5-Dancer-Plugin-Database/Makefile b/databases/p5-Dancer-Plugin-Database/Makefile
index c58022f6e0f7..500c7b579495 100644
--- a/databases/p5-Dancer-Plugin-Database/Makefile
+++ b/databases/p5-Dancer-Plugin-Database/Makefile
@@ -1,5 +1,3 @@
-# Created by: Wen Heping <wen@FreeBSD.org>
-
 PORTNAME=	Dancer-Plugin-Database
 PORTVERSION=	2.13
 CATEGORIES=	databases perl5
@@ -8,6 +6,7 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Easy database connections for Dancer applications
+WWW=		https://metacpan.org/release/Dancer-Plugin-Database
 
 LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
diff --git a/databases/p5-Dancer-Plugin-Database/pkg-descr b/databases/p5-Dancer-Plugin-Database/pkg-descr
index 2fead2c4611f..b5bf3416b962 100644
--- a/databases/p5-Dancer-Plugin-Database/pkg-descr
+++ b/databases/p5-Dancer-Plugin-Database/pkg-descr
@@ -5,5 +5,3 @@ Returns a Dancer::Plugin::Database::Handle object, which is a subclass of DBI's
 DBI::db connection handle object, so it does everything you'd expect to do with
 DBI, but also adds a few convenience methods. See the documentation for
 Dancer::Plugin::Database::Handle for full details of those.
-
-WWW: https://metacpan.org/release/Dancer-Plugin-Database
diff --git a/databases/p5-Dancer-Plugin-Redis/Makefile b/databases/p5-Dancer-Plugin-Redis/Makefile
index 5d85e2f5a748..8cc4df9458f3 100644
--- a/databases/p5-Dancer-Plugin-Redis/Makefile
+++ b/databases/p5-Dancer-Plugin-Redis/Makefile
@@ -1,5 +1,3 @@
-# Created by: Grzegorz Blach <gblach@FreeBSD.org>
-
 PORTNAME=	Dancer-Plugin-Redis
 PORTVERSION=	0.8
 PORTREVISION=	1
@@ -9,6 +7,7 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Redis database connector for Dancer
+WWW=		https://metacpan.org/release/Dancer-Plugin-Redis
 
 LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
diff --git a/databases/p5-Dancer-Plugin-Redis/pkg-descr b/databases/p5-Dancer-Plugin-Redis/pkg-descr
index 97865b2ee8dc..d491a132a615 100644
--- a/databases/p5-Dancer-Plugin-Redis/pkg-descr
+++ b/databases/p5-Dancer-Plugin-Redis/pkg-descr
@@ -1,4 +1,2 @@
 Dancer::Plugin::Redis provides an easy way to obtain a connected Redis database
 handle by simply calling the 'redis' keyword within a Dancer application.
-
-WWW: https://metacpan.org/release/Dancer-Plugin-Redis
diff --git a/databases/p5-Dancer-Session-Memcached/Makefile b/databases/p5-Dancer-Session-Memcached/Makefile
index 53d93344ffe3..0b3c8f013b7f 100644
--- a/databases/p5-Dancer-Session-Memcached/Makefile
+++ b/databases/p5-Dancer-Session-Memcached/Makefile
@@ -1,5 +1,3 @@
-# Created by: Grzegorz Blach <gblach@FreeBSD.org>
-
 PORTNAME=	Dancer-Session-Memcached
 PORTVERSION=	0.202
 CATEGORIES=	databases perl5
@@ -8,6 +6,7 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Memcached-based session backend for Dancer
+WWW=		https://metacpan.org/release/Dancer-Session-Memcached
 
 LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
diff --git a/databases/p5-Dancer-Session-Memcached/pkg-descr b/databases/p5-Dancer-Session-Memcached/pkg-descr
index 668bde84f5f7..0c5e1f575312 100644
--- a/databases/p5-Dancer-Session-Memcached/pkg-descr
+++ b/databases/p5-Dancer-Session-Memcached/pkg-descr
@@ -1,4 +1,2 @@
 A session engine for Dancer based on the Memcache API.
 Session are stored as memcache objects via a list of Memcached servers.
-
-WWW: https://metacpan.org/release/Dancer-Session-Memcached
diff --git a/databases/p5-Dancer2-Plugin-DBIC/Makefile b/databases/p5-Dancer2-Plugin-DBIC/Makefile
index c7e21d469854..214189ba61d8 100644
--- a/databases/p5-Dancer2-Plugin-DBIC/Makefile
+++ b/databases/p5-Dancer2-Plugin-DBIC/Makefile
@@ -1,5 +1,3 @@
-# Created by: <hvo.pm@xs4all.nl>
-
 PORTNAME=	Dancer2-Plugin-DBIC
 PORTVERSION=	0.0100
 CATEGORIES=	databases perl5
@@ -8,6 +6,7 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	DBIx::Class interface for Dancer2 applications
+WWW=		https://github.com/ironcamel/Dancer2-Plugin-DBIC
 
 LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
diff --git a/databases/p5-Dancer2-Plugin-DBIC/pkg-descr b/databases/p5-Dancer2-Plugin-DBIC/pkg-descr
index ab9f60bcf636..b6c602f89b50 100644
--- a/databases/p5-Dancer2-Plugin-DBIC/pkg-descr
+++ b/databases/p5-Dancer2-Plugin-DBIC/pkg-descr
@@ -3,5 +3,3 @@ interface with databases. It automatically exports the keyword `schema`
 which returns a DBIx::Class::Schema object. You just need to configure
 your database connection information. For performance, schema objects
 are cached in memory and are lazy loaded the first time they are accessed.
-
-WWW: https://github.com/ironcamel/Dancer2-Plugin-DBIC
diff --git a/databases/p5-Dancer2-Plugin-Database/Makefile b/databases/p5-Dancer2-Plugin-Database/Makefile
index e2c5bacdc5a5..467ae15b4efb 100644
--- a/databases/p5-Dancer2-Plugin-Database/Makefile
+++ b/databases/p5-Dancer2-Plugin-Database/Makefile
@@ -1,5 +1,3 @@
-# Created by: Henk van Oers <hvo.pm@xs4all.nl>
-
 PORTNAME=	Dancer2-Plugin-Database
 PORTVERSION=	2.17
 CATEGORIES=	databases perl5
@@ -8,6 +6,7 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Easy database connections for Dancer2 applications
+WWW=		https://metacpan.org/release/Dancer2-Plugin-Database
 
 LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
diff --git a/databases/p5-Dancer2-Plugin-Database/pkg-descr b/databases/p5-Dancer2-Plugin-Database/pkg-descr
index ea2ed8e031de..8c1dd1c425ec 100644
--- a/databases/p5-Dancer2-Plugin-Database/pkg-descr
+++ b/databases/p5-Dancer2-Plugin-Database/pkg-descr
@@ -7,5 +7,3 @@ subclass of DBI's DBI::db connection handle object, so it does
 everything you'd expect to do with DBI, but also adds a few convenience
 methods. See the documentation for Dancer2::Plugin::Database::Handle
 for full details of those.
-
-WWW: https://metacpan.org/release/Dancer2-Plugin-Database
diff --git a/databases/p5-Dancer2-Session-DBIC/Makefile b/databases/p5-Dancer2-Session-DBIC/Makefile
index 6778414927b1..3fa275d6771e 100644
--- a/databases/p5-Dancer2-Session-DBIC/Makefile
+++ b/databases/p5-Dancer2-Session-DBIC/Makefile
@@ -1,5 +1,3 @@
-# Created by: <hvo.pm@xs4all.nl>
-
 PORTNAME=	Dancer2-Session-DBIC
 PORTVERSION=	0.120
 CATEGORIES=	databases perl5
@@ -8,6 +6,7 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	DBIx::Class based session engine for Dancer2
+WWW=		https://metacpan.org/release/Dancer2-Session-DBIC
 
 LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
diff --git a/databases/p5-Dancer2-Session-DBIC/pkg-descr b/databases/p5-Dancer2-Session-DBIC/pkg-descr
index dfd8c1242301..6bec26fb7eee 100644
--- a/databases/p5-Dancer2-Session-DBIC/pkg-descr
+++ b/databases/p5-Dancer2-Session-DBIC/pkg-descr
@@ -3,5 +3,3 @@ the session, and storing it in a database via DBIx::Class.
 
 JSON was chosen as the default serialization format,
 as it is fast, terse, and portable.
-
-WWW: https://metacpan.org/release/Dancer2-Session-DBIC
diff --git a/databases/p5-Data-Page/Makefile b/databases/p5-Data-Page/Makefile
index be00014cd294..6c404cead01e 100644
--- a/databases/p5-Data-Page/Makefile
+++ b/databases/p5-Data-Page/Makefile
@@ -1,5 +1,3 @@
-# Created by: Mathieu Arnold <m@absolight.net>
-
 PORTNAME=	Data-Page
 PORTVERSION=	2.03
 CATEGORIES=	databases perl5
@@ -8,6 +6,7 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Pager utility for Class::DBI
+WWW=		https://metacpan.org/release/Data-Page
 
 LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
diff --git a/databases/p5-Data-Page/pkg-descr b/databases/p5-Data-Page/pkg-descr
index 620afef55298..4d18ae260e06 100644
--- a/databases/p5-Data-Page/pkg-descr
+++ b/databases/p5-Data-Page/pkg-descr
@@ -7,5 +7,3 @@ The main concept is that you pass in the number of total entries, the number of
 entries per page, and the current page number. You can then call methods to
 find out how many pages of information there are, and what number the first and
 last entries on the current page really are.
-
-WWW: https://metacpan.org/release/Data-Page
diff --git a/databases/p5-Data-Pageset/Makefile b/databases/p5-Data-Pageset/Makefile
index 5ca3c51397a8..41db192fa1d0 100644
--- a/databases/p5-Data-Pageset/Makefile
+++ b/databases/p5-Data-Pageset/Makefile
@@ -1,5 +1,3 @@
-# Created by: Aaron Dalton <aaron@FreeBSD.org>
-
 PORTNAME=	Data-Pageset
 PORTVERSION=	1.06
 PORTREVISION=	2
@@ -9,6 +7,7 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Page numbering and page sets
+WWW=		https://metacpan.org/release/Data-Pageset
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
 RUN_DEPENDS=	p5-Data-Page>=2:databases/p5-Data-Page
diff --git a/databases/p5-Data-Pageset/pkg-descr b/databases/p5-Data-Pageset/pkg-descr
index 30961f71f93e..65b8620d8cea 100644
--- a/databases/p5-Data-Pageset/pkg-descr
+++ b/databases/p5-Data-Pageset/pkg-descr
@@ -11,5 +11,3 @@ fassion.
 
 The object can easily be passed to a templating system such as Template
 Toolkit or be used within a script.
-
-WWW: https://metacpan.org/release/Data-Pageset
diff --git a/databases/p5-Exception-Class-DBI/Makefile b/databases/p5-Exception-Class-DBI/Makefile
index 76f70ca65473..9ba3778293fb 100644
--- a/databases/p5-Exception-Class-DBI/Makefile
+++ b/databases/p5-Exception-Class-DBI/Makefile
@@ -1,5 +1,3 @@
-# Created by: Rod Taylor <ports@rbt.ca>
-
 PORTNAME=	Exception-Class-DBI
 PORTVERSION=	1.04
 CATEGORIES=	databases perl5
@@ -8,6 +6,7 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	DBI Exception objects
+WWW=		https://metacpan.org/release/Exception-Class-DBI
 
 LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
diff --git a/databases/p5-Exception-Class-DBI/pkg-descr b/databases/p5-Exception-Class-DBI/pkg-descr
index 06fdfb0ecbd7..1c5b978f64b7 100644
--- a/databases/p5-Exception-Class-DBI/pkg-descr
+++ b/databases/p5-Exception-Class-DBI/pkg-descr
@@ -4,5 +4,3 @@ objects created by the Exception::Class module from the CPAN.
 Exception::Class::DBI itself offers a single class method, handler(),
 that returns a code reference appropriate for passing to the DBI
 HandleError attribute.
-
-WWW: https://metacpan.org/release/Exception-Class-DBI
diff --git a/databases/p5-File-Locate/Makefile b/databases/p5-File-Locate/Makefile
index 1c0b248ce027..4cf18befea1c 100644
--- a/databases/p5-File-Locate/Makefile
+++ b/databases/p5-File-Locate/Makefile
@@ -6,6 +6,7 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	pi@FreeBSD.org
 COMMENT=	Search the locate(1)-database from Perl
+WWW=		https://metacpan.org/release/File-Locate
 
 LICENSE=	GPLv2+
 
diff --git a/databases/p5-File-Locate/pkg-descr b/databases/p5-File-Locate/pkg-descr
index 674b1444318f..d23754f5cb07 100644
--- a/databases/p5-File-Locate/pkg-descr
+++ b/databases/p5-File-Locate/pkg-descr
@@ -2,5 +2,3 @@ File::Locate provides the locate() function that scans the locate
 database for a given substring or POSIX regular expression. The
 module can handle both plain old locate databases as well as the
 more hip slocate format.
-
-WWW: https://metacpan.org/release/File-Locate
diff --git a/databases/p5-GDBM/Makefile b/databases/p5-GDBM/Makefile
index a4b8ed0afc99..ae8fc7848b18 100644
--- a/databases/p5-GDBM/Makefile
+++ b/databases/p5-GDBM/Makefile
@@ -1,5 +1,3 @@
-# Created by: Nick Sayer <nsayer@FreeBSD.org>
-
 PORTNAME=	GDBM
 PORTVERSION=	1.14
 PORTREVISION=	5
diff --git a/databases/p5-Genezzo/Makefile b/databases/p5-Genezzo/Makefile
index c248d3308f1f..6a8eef32751b 100644
--- a/databases/p5-Genezzo/Makefile
+++ b/databases/p5-Genezzo/Makefile
@@ -1,5 +1,3 @@
-# Created by: Gea-Suan Lin <gslin@gslin.org>
-
 PORTNAME=	Genezzo
 PORTVERSION=	0.72
 PORTREVISION=	2
@@ -9,6 +7,7 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Extensible database with SQL and DBI
+WWW=		https://metacpan.org/release/Genezzo
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
 RUN_DEPENDS=	p5-Parse-RecDescent>=0:devel/p5-Parse-RecDescent
diff --git a/databases/p5-Genezzo/pkg-descr b/databases/p5-Genezzo/pkg-descr
index 5a3ce78336c4..ef27ea69c0bd 100644
--- a/databases/p5-Genezzo/pkg-descr
+++ b/databases/p5-Genezzo/pkg-descr
@@ -3,5 +3,3 @@ fixed amount of memory and disk.  This system is designed to be easily
 configured and extended with custom functions, persistent storage
 representations, and novel data access methods.  In its current
 incarnation it supports a subset of SQL and a partial DBI interface.
-
-WWW: https://metacpan.org/release/Genezzo
diff --git a/databases/p5-GitDDL-Migrator/Makefile b/databases/p5-GitDDL-Migrator/Makefile
index da526ea59da5..c66086753f90 100644
--- a/databases/p5-GitDDL-Migrator/Makefile
+++ b/databases/p5-GitDDL-Migrator/Makefile
@@ -5,8 +5,9 @@ MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:SONGMU
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension to extended p5-GitDDL
+WWW=		https://metacpan.org/release/GitDDL-Migrator
 
 LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
diff --git a/databases/p5-GitDDL-Migrator/pkg-descr b/databases/p5-GitDDL-Migrator/pkg-descr
index 774020080ab6..2f5e4ed92da8 100644
--- a/databases/p5-GitDDL-Migrator/pkg-descr
+++ b/databases/p5-GitDDL-Migrator/pkg-descr
@@ -7,5 +7,3 @@ Extended features are:
 - specify version
 - specify SQL (sometimes SQL::Translator's output is wrong)
 - check differences from versioned SQL and real database
-
-WWW: https://metacpan.org/release/GitDDL-Migrator
diff --git a/databases/p5-GitDDL/Makefile b/databases/p5-GitDDL/Makefile
index 4d5eac005938..01b2e43388c3 100644
--- a/databases/p5-GitDDL/Makefile
+++ b/databases/p5-GitDDL/Makefile
@@ -5,8 +5,9 @@ MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:TYPESTER
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension for database migration utility by git managed sql
+WWW=		https://metacpan.org/release/GitDDL
 
 LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
diff --git a/databases/p5-GitDDL/pkg-descr b/databases/p5-GitDDL/pkg-descr
index c04487c9b2b5..3f00dc1c50e3 100644
--- a/databases/p5-GitDDL/pkg-descr
+++ b/databases/p5-GitDDL/pkg-descr
@@ -4,5 +4,3 @@ schema version by single .sql file in git repository.
 By using this module, you can deploy .sql to database, check sql
 version between database and .sql file, make diff between them, and
 apply alter table to database.
-
-WWW: https://metacpan.org/release/GitDDL
diff --git a/databases/p5-GraphViz-DBI/Makefile b/databases/p5-GraphViz-DBI/Makefile
index 8b88ac867c88..a779ee88030b 100644
--- a/databases/p5-GraphViz-DBI/Makefile
+++ b/databases/p5-GraphViz-DBI/Makefile
@@ -1,5 +1,3 @@
-# Created by: tobez
-
 PORTNAME=	GraphViz-DBI
 PORTVERSION=	1.100860
 PORTREVISION=	2
@@ -10,6 +8,7 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl module for graph database tables and relations
+WWW=		https://metacpan.org/release/GraphViz-DBI
 
 BUILD_DEPENDS=	p5-DBI>=0:databases/p5-DBI \
 		p5-GraphViz>=0:graphics/p5-GraphViz
diff --git a/databases/p5-GraphViz-DBI/pkg-descr b/databases/p5-GraphViz-DBI/pkg-descr
index e71921f70394..395553329ed3 100644
--- a/databases/p5-GraphViz-DBI/pkg-descr
+++ b/databases/p5-GraphViz-DBI/pkg-descr
@@ -3,5 +3,3 @@ connecting them if they are related. While or after constructing the
 object, pass an open database handle, then call `graph_tables' to
 determine database metadata and construct a GraphViz graph from the
 table and field information.
-
-WWW: https://metacpan.org/release/GraphViz-DBI
diff --git a/databases/p5-HTML-FormHandler-Model-DBIC/Makefile b/databases/p5-HTML-FormHandler-Model-DBIC/Makefile
index 87b3cb2e41bc..1b21992d2070 100644
--- a/databases/p5-HTML-FormHandler-Model-DBIC/Makefile
+++ b/databases/p5-HTML-FormHandler-Model-DBIC/Makefile
@@ -1,5 +1,3 @@
-# Created by: Vladimir Timofeev <vovkasm@gmail.com>
-
 PORTNAME=	HTML-FormHandler-Model-DBIC
 PORTVERSION=	0.29
 CATEGORIES=	databases perl5 www
@@ -8,6 +6,7 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	bokutin@bokut.in
 COMMENT=	Model class for FormHandler unsing DBIx::Class
+WWW=		https://metacpan.org/release/HTML-FormHandler-Model-DBIC
 
 LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
diff --git a/databases/p5-HTML-FormHandler-Model-DBIC/pkg-descr b/databases/p5-HTML-FormHandler-Model-DBIC/pkg-descr
index 52e8c33a11c4..63afc0437a0f 100644
--- a/databases/p5-HTML-FormHandler-Model-DBIC/pkg-descr
+++ b/databases/p5-HTML-FormHandler-Model-DBIC/pkg-descr
@@ -1,3 +1 @@
 This is a separate DBIx::Class model class for HTML::FormHandler
-
-WWW: https://metacpan.org/release/HTML-FormHandler-Model-DBIC
diff --git a/databases/p5-Ima-DBI/Makefile b/databases/p5-Ima-DBI/Makefile
index 39cdba31d0cd..4a4ea26a33f0 100644
--- a/databases/p5-Ima-DBI/Makefile
+++ b/databases/p5-Ima-DBI/Makefile
@@ -1,5 +1,3 @@
-# Created by: Sergey Skvortsov <skv@protey.ru>
-
 PORTNAME=	Ima-DBI
 PORTVERSION=	0.35
 PORTREVISION=	1
@@ -10,6 +8,7 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Database connection caching and organization
+WWW=		https://metacpan.org/release/Ima-DBI
 
 LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
diff --git a/databases/p5-Ima-DBI/pkg-descr b/databases/p5-Ima-DBI/pkg-descr
index 67585098ea8f..1b8ff3cf52b6 100644
--- a/databases/p5-Ima-DBI/pkg-descr
+++ b/databases/p5-Ima-DBI/pkg-descr
@@ -3,5 +3,3 @@ use of database connections and statement handles by storing DBI and SQL
 information with your class (instead of as separate objects).  This
 allows you to pass around just one object without worrying about a trail
 of DBI handles behind it.
-
-WWW: https://metacpan.org/release/Ima-DBI
diff --git a/databases/p5-Interchange6-Schema/Makefile b/databases/p5-Interchange6-Schema/Makefile
index b62cdd8b4063..f2dda9b0c89d 100644
--- a/databases/p5-Interchange6-Schema/Makefile
+++ b/databases/p5-Interchange6-Schema/Makefile
@@ -1,5 +1,3 @@
-# Created by: <hvo.pm@xs4all.nl>
-
 PORTNAME=	Interchange6-Schema
 PORTVERSION=	0.133
 CATEGORIES=	databases perl5
@@ -9,6 +7,7 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Database Schema for Interchange 6
+WWW=		https://metacpan.org/release/Interchange6-Schema
 
 LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
diff --git a/databases/p5-Interchange6-Schema/pkg-descr b/databases/p5-Interchange6-Schema/pkg-descr
index bc5db6937bab..af6633e0a5a3 100644
--- a/databases/p5-Interchange6-Schema/pkg-descr
+++ b/databases/p5-Interchange6-Schema/pkg-descr
@@ -1,4 +1,2 @@
 Database schema classes for Interchange6
 Open Source eCommerce software.
-
-WWW: https://metacpan.org/release/Interchange6-Schema
diff --git a/databases/p5-Iterator-DBI/Makefile b/databases/p5-Iterator-DBI/Makefile
index 8b647e40fb79..f0a02083fdab 100644
--- a/databases/p5-Iterator-DBI/Makefile
+++ b/databases/p5-Iterator-DBI/Makefile
@@ -1,5 +1,3 @@
-# Created by: Aaron Dalton <aaron@FreeBSD.org>
-
 PORTNAME=	Iterator-DBI
 PORTVERSION=	0.02
 PORTREVISION=	1
@@ -9,6 +7,7 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	Iterator for returning DBI query results
+WWW=		https://metacpan.org/release/Iterator-DBI
 
 LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
diff --git a/databases/p5-Iterator-DBI/pkg-descr b/databases/p5-Iterator-DBI/pkg-descr
index 1018848d518d..bc7638a60a4c 100644
--- a/databases/p5-Iterator-DBI/pkg-descr
+++ b/databases/p5-Iterator-DBI/pkg-descr
@@ -10,5 +10,3 @@ together with other Iterator functions. The "idb_rows" iterator has the
 same interface as any other interface, making it interchangeable with
 iterators of any other source (for example, files), and usable with the
 iterator manipulation functions in the Iterator::Util module.
-
-WWW: https://metacpan.org/release/Iterator-DBI
diff --git a/databases/p5-Jifty-DBI/Makefile b/databases/p5-Jifty-DBI/Makefile
index 309c90302dd1..f72e135b0a3f 100644
--- a/databases/p5-Jifty-DBI/Makefile
+++ b/databases/p5-Jifty-DBI/Makefile
@@ -1,5 +1,3 @@
-# Created by: Anton Berezin <tobez@FreeBSD.org>
-
 PORTNAME=	Jifty-DBI
 PORTVERSION=	0.78
 CATEGORIES=	databases perl5
@@ -8,6 +6,7 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Object-relational persistence Perl framework
+WWW=		https://metacpan.org/release/Jifty-DBI
 
 LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
diff --git a/databases/p5-Jifty-DBI/pkg-descr b/databases/p5-Jifty-DBI/pkg-descr
index dee3ceef0be0..79e2a2273f4c 100644
--- a/databases/p5-Jifty-DBI/pkg-descr
+++ b/databases/p5-Jifty-DBI/pkg-descr
@@ -5,5 +5,3 @@ updating data in a DBI-accesible database.
 
 This module is the direct descendent of DBIx::SearchBuilder. If you're
 familiar with SearchBuilder, Jifty::DBI should be quite familiar to you.
-
-WWW: https://metacpan.org/release/Jifty-DBI
diff --git a/databases/p5-KyotoCabinet/Makefile b/databases/p5-KyotoCabinet/Makefile
index c562c67d0fab..7d19a04aaad8 100644
--- a/databases/p5-KyotoCabinet/Makefile
+++ b/databases/p5-KyotoCabinet/Makefile
@@ -1,5 +1,3 @@
-# Created by: Geraud CONTINSOUZAS <geraud@gcu.info>
-
 PORTNAME=	KyotoCabinet
 PORTVERSION=	1.20
 PORTREVISION=	2
@@ -10,6 +8,7 @@ DISTNAME=	kyotocabinet-perl-${PORTVERSION}
 
 MAINTAINER=	geraud@gcu.info
 COMMENT=	Perl extension for KyotoCabinet
+WWW=		https://dbmx.net/kyotocabinet/
 
 LICENSE=	GPLv3
 
diff --git a/databases/p5-KyotoCabinet/pkg-descr b/databases/p5-KyotoCabinet/pkg-descr
index 6de1b59dff72..687fe50fc28f 100644
--- a/databases/p5-KyotoCabinet/pkg-descr
+++ b/databases/p5-KyotoCabinet/pkg-descr
@@ -1,3 +1 @@
 Perl extension for KyotoCabinet.
-
-WWW: https://dbmx.net/kyotocabinet/
diff --git a/databases/p5-LMDB_File/Makefile b/databases/p5-LMDB_File/Makefile
index 7efd2b25ce8c..3277bbafd9ec 100644
--- a/databases/p5-LMDB_File/Makefile
+++ b/databases/p5-LMDB_File/Makefile
@@ -1,13 +1,12 @@
-# Created by: vanilla@
-
 PORTNAME=	LMDB_File
-PORTVERSION=	0.12
+PORTVERSION=	0.13
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	vanilla@FreeBSD.org
 COMMENT=	Perl wrapper around the OpenLDAP's LMDB
+WWW=		https://metacpan.org/release/LMDB_File
 
 LICENSE=	ART20
 
diff --git a/databases/p5-LMDB_File/distinfo b/databases/p5-LMDB_File/distinfo
index 89734e128015..dab7056736fa 100644
--- a/databases/p5-LMDB_File/distinfo
+++ b/databases/p5-LMDB_File/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1485539185
-SHA256 (LMDB_File-0.12.tar.gz) = 12bebaa48d22c1d825d8808fbf9923b518bcc9aa3dfb3f045f8fa9e7f2c08642
-SIZE (LMDB_File-0.12.tar.gz) = 87021
+TIMESTAMP = 1705973014
+SHA256 (LMDB_File-0.13.tar.gz) = 2bed727bbcea7be8e85316e2b6fc8e93295d50ed539eba4351eafe80b38c336c
+SIZE (LMDB_File-0.13.tar.gz) = 87846
diff --git a/databases/p5-LMDB_File/pkg-descr b/databases/p5-LMDB_File/pkg-descr
index 451285a3c272..42785f0423eb 100644
--- a/databases/p5-LMDB_File/pkg-descr
+++ b/databases/p5-LMDB_File/pkg-descr
@@ -7,5 +7,3 @@ by Symas for the OpenLDAP Project. See http://symas.com/mdb/ for details.
 LMDB_File provides full access to the complete C API, a thin Perl wrapper
 with an Object-Oriented interface and a simple Perl's tie interface
 compatible with others DBMs.
-
-WWW: https://metacpan.org/release/LMDB_File
diff --git a/databases/p5-MLDBM-Sync/Makefile b/databases/p5-MLDBM-Sync/Makefile
index f4a92b779a3b..1607d2bbdf6e 100644
--- a/databases/p5-MLDBM-Sync/Makefile
+++ b/databases/p5-MLDBM-Sync/Makefile
@@ -1,5 +1,3 @@
-# Created by: erwin@FreeBSD.org
-
 PORTNAME=	MLDBM-Sync
 PORTVERSION=	0.30
 PORTREVISION=	1
@@ -9,6 +7,7 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Safe concurrent access to MLDBM databases from Perl
+WWW=		https://metacpan.org/release/MLDBM-Sync
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
 RUN_DEPENDS=	p5-MLDBM>=0:databases/p5-MLDBM
diff --git a/databases/p5-MLDBM-Sync/pkg-descr b/databases/p5-MLDBM-Sync/pkg-descr
index 4333292d32ae..1f2986d2a294 100644
--- a/databases/p5-MLDBM-Sync/pkg-descr
+++ b/databases/p5-MLDBM-Sync/pkg-descr
@@ -3,5 +3,3 @@ to MLDBM databases with file locking, and flushes i/o explicity per
 lock/unlock.
 The new [Read]Lock()/UnLock() API can be used to serialize requests
 logically and improve performance for bundled reads & writes.
-
-WWW: https://metacpan.org/release/MLDBM-Sync
diff --git a/databases/p5-MLDBM/Makefile b/databases/p5-MLDBM/Makefile
index 0557b0dead60..45245d692e30 100644
--- a/databases/p5-MLDBM/Makefile
+++ b/databases/p5-MLDBM/Makefile
@@ -1,5 +1,3 @@
-# Created by: ache@FreeBSD.org
-
 PORTNAME=	MLDBM
 PORTVERSION=	2.05
 PORTREVISION=	1
@@ -9,6 +7,7 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Store multi-level hash structure in single level tied hash
+WWW=		https://metacpan.org/release/MLDBM
 
 LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
diff --git a/databases/p5-MLDBM/pkg-descr b/databases/p5-MLDBM/pkg-descr
index 1b1ca81d073b..ca4456462ded 100644
--- a/databases/p5-MLDBM/pkg-descr
+++ b/databases/p5-MLDBM/pkg-descr
@@ -7,5 +7,3 @@ store arbitrary perl data, including nested references.
 It works by converting the values in the hash that are references, to their
 string representation in perl syntax.  When using a DBM database, it is this
 string that gets stored.
-
-WWW: https://metacpan.org/release/MLDBM
diff --git a/databases/p5-MR-Tarantool/Makefile b/databases/p5-MR-Tarantool/Makefile
index b1ce10c08adb..7d7fcb4bd525 100644
--- a/databases/p5-MR-Tarantool/Makefile
+++ b/databases/p5-MR-Tarantool/Makefile
@@ -1,5 +1,3 @@
-# Created by: Veniamin Gvozdikov <vg@FreeBSD.org>
-
 PORTNAME=	MR-Tarantool
 PORTVERSION=	0.0.24
 PORTREVISION=	2
@@ -9,12 +7,13 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Driver for an efficient Tarantool/Box NoSQL in-memory storage
+WWW=		https://metacpan.org/release/MR-Tarantool
 
 LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
-RUN_DEPENDS=	p5-AnyEvent>=0:devel/p5-AnyEvent \
+RUN_DEPENDS=	p5-AnyEvent>=0,1:devel/p5-AnyEvent \
 		p5-Class-Singleton>=0:devel/p5-Class-Singleton \
 		p5-List-MoreUtils>=0:lang/p5-List-MoreUtils \
 		p5-MRO-Compat>=0:devel/p5-MRO-Compat \
diff --git a/databases/p5-MR-Tarantool/pkg-descr b/databases/p5-MR-Tarantool/pkg-descr
index 9d6353b96e0b..bc53b138bea6 100644
--- a/databases/p5-MR-Tarantool/pkg-descr
+++ b/databases/p5-MR-Tarantool/pkg-descr
@@ -1,3 +1 @@
 A driver for an efficient Tarantool/Box NoSQL in-memory storage.
-
-WWW: https://metacpan.org/release/MR-Tarantool
diff --git a/databases/p5-Mango/Makefile b/databases/p5-Mango/Makefile
index 3c652b2418fc..ccc126190043 100644
--- a/databases/p5-Mango/Makefile
+++ b/databases/p5-Mango/Makefile
@@ -1,8 +1,6 @@
-# Created by: Adam Weinberger <adamw@FreeBSD.org>
-
 PORTNAME=	Mango
 PORTVERSION=	1.30
-PORTREVISION=	2
+PORTREVISION=	4
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:ODC
@@ -10,13 +8,13 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Pure-Perl non-blocking I/O MongoDB driver
+WWW=		https://metacpan.org/release/Mango
 
 LICENSE=	ART20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
-RUN_DEPENDS=	mongo:databases/mongodb36 \
-		p5-Mojolicious>=5.40:www/p5-Mojolicious
+RUN_DEPENDS=	p5-Mojolicious>=5.40:www/p5-Mojolicious
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/databases/p5-Mango/pkg-descr b/databases/p5-Mango/pkg-descr
index be4d698d5494..5bd315572a96 100644
--- a/databases/p5-Mango/pkg-descr
+++ b/databases/p5-Mango/pkg-descr
@@ -8,5 +8,3 @@ to BSON with Mango::BSON, which provides many helper functions you can use to
 generate data types that are not available natively in Perl. All connections
 will be reset automatically if a new process has been forked, this allows
 multiple processes to share the same Mango object safely.
-
-WWW: https://metacpan.org/release/Mango
diff --git a/databases/p5-Memcached-libmemcached/Makefile b/databases/p5-Memcached-libmemcached/Makefile
index eec89adae1f3..80ca682db0de 100644
--- a/databases/p5-Memcached-libmemcached/Makefile
+++ b/databases/p5-Memcached-libmemcached/Makefile
@@ -1,5 +1,3 @@
-# Created by: Cheng-Lung Sung <clsung@FreeBSD.org>
-
 PORTNAME=	Memcached-libmemcached
 PORTVERSION=	1.001801
 PORTREVISION=	1
@@ -9,6 +7,10 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Thin fast full interface to the libmemcached client API
+WWW=		https://metacpan.org/release/Memcached-libmemcached
+
+LICENSE=	ART10 GPLv1+
+LICENSE_COMB=	dual
 
 LIB_DEPENDS=	libmemcached.so:databases/libmemcached
 
@@ -16,10 +18,16 @@ USES=		perl5
 USE_PERL5=	configure
 USE_LDCONFIG=	yes
 
+.include <bsd.port.pre.mk>
+
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 ))
+CFLAGS+=       -Wno-error=int-conversion
+.endif
+
 post-extract:
 	@${RM} -r ${WRKDIR}/src
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/Makefile.PL
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/databases/p5-Memcached-libmemcached/pkg-descr b/databases/p5-Memcached-libmemcached/pkg-descr
index 73798a15d01b..03ab91ee06d2 100644
--- a/databases/p5-Memcached-libmemcached/pkg-descr
+++ b/databases/p5-Memcached-libmemcached/pkg-descr
@@ -14,5 +14,3 @@ thread safe, and provide full access to server side methods.
     - Implementations of the new cas, replace, and append operators.
     - Man pages written up on entire API.
     - Implements both modulo and consistent hashing solutions.
-
-WWW: https://metacpan.org/release/Memcached-libmemcached
diff --git a/databases/p5-Metadata/Makefile b/databases/p5-Metadata/Makefile
index 875ebde154f8..035d07e944e1 100644
--- a/databases/p5-Metadata/Makefile
+++ b/databases/p5-Metadata/Makefile
@@ -1,5 +1,3 @@
-# Created by: Seamus Venasse <svenasse@polaris.ca>
-
 PORTNAME=	Metadata
 PORTVERSION=	0.24
 PORTREVISION=	1
@@ -9,6 +7,7 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	Perl implementation of Dublin Core compatible metadata
+WWW=		https://metacpan.org/release/Metadata
 
 LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
diff --git a/databases/p5-Metadata/pkg-descr b/databases/p5-Metadata/pkg-descr
index e0f5511dedb2..699ed6b85b5f 100644
--- a/databases/p5-Metadata/pkg-descr
+++ b/databases/p5-Metadata/pkg-descr
@@ -2,5 +2,3 @@ This collection of modules provide an implementation of Dublin Core
 compatible metadata and subclasses for IAFA Templates, SOIF (Harvest)
 and should be easily extendible to similar (fairly flat) metadata
 formats.
-
-WWW: https://metacpan.org/release/Metadata
diff --git a/databases/p5-Mojo-Pg/Makefile b/databases/p5-Mojo-Pg/Makefile
index d0f9e249ad8d..2330d966699c 100644
--- a/databases/p5-Mojo-Pg/Makefile
+++ b/databases/p5-Mojo-Pg/Makefile
@@ -1,7 +1,5 @@
-# Created by: Adam Weinberger <adamw@FreeBSD.org>
-
 PORTNAME=	Mojo-Pg
-PORTVERSION=	4.25
+PORTVERSION=	4.27
 CATEGORIES=	databases www perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:SRI
@@ -9,6 +7,7 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	PostgreSQL integration for p5-Mojolicious
+WWW=		https://metacpan.org/release/Mojo-Pg
 
 LICENSE=	ART20
 LICENSE_FILE=	${WRKSRC}/LICENSE
diff --git a/databases/p5-Mojo-Pg/distinfo b/databases/p5-Mojo-Pg/distinfo
index 6196d2062a96..da80b013f548 100644
--- a/databases/p5-Mojo-Pg/distinfo
+++ b/databases/p5-Mojo-Pg/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1614794228
-SHA256 (Mojo-Pg-4.25.tar.gz) = 1a20a2d5fe1a385ec72c424679a74a8b057436f918074e1243f23bcbc05836a0
-SIZE (Mojo-Pg-4.25.tar.gz) = 35526
+TIMESTAMP = 1648248858
+SHA256 (Mojo-Pg-4.27.tar.gz) = a322c8df00e3e5655fdf4d0b7ab9d799289320e29f64fe99ac7af124484ef9d8
+SIZE (Mojo-Pg-4.27.tar.gz) = 35673
diff --git a/databases/p5-Mojo-Pg/pkg-descr b/databases/p5-Mojo-Pg/pkg-descr
index fd499e75931e..7e51f6440117 100644
--- a/databases/p5-Mojo-Pg/pkg-descr
+++ b/databases/p5-Mojo-Pg/pkg-descr
@@ -4,5 +4,3 @@ use with the Mojolicious real-time web framework.
 Database handles are cached automatically, so they can be reused transparently
 to increase performance. And you can handle connection timeouts gracefully by
 holding on to them only for short amounts of time.
-
-WWW: https://metacpan.org/release/Mojo-Pg
diff --git a/databases/p5-MongoDB/Makefile b/databases/p5-MongoDB/Makefile
index 67291c4fa994..cc379503cc6a 100644
--- a/databases/p5-MongoDB/Makefile
+++ b/databases/p5-MongoDB/Makefile
@@ -1,5 +1,3 @@
-# Created by: Wen Heping <wen@FreeBSD.org>
-
 PORTNAME=	MongoDB
 PORTVERSION=	2.2.2
 DISTVERSIONPREFIX=	v
@@ -9,6 +7,7 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Mongo Driver for Perl
+WWW=		https://metacpan.org/release/MongoDB
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
diff --git a/databases/p5-MongoDB/pkg-descr b/databases/p5-MongoDB/pkg-descr
index 84080a53e25d..200b22696c9a 100644
--- a/databases/p5-MongoDB/pkg-descr
+++ b/databases/p5-MongoDB/pkg-descr
@@ -1,3 +1 @@
 p5-MongoDB is a Mongo Driver for Perl.
-
-WWW: https://metacpan.org/release/MongoDB
diff --git a/databases/p5-Mongoose/Makefile b/databases/p5-Mongoose/Makefile
index 6f40a3b2b10c..f471213b9f27 100644
--- a/databases/p5-Mongoose/Makefile
+++ b/databases/p5-Mongoose/Makefile
@@ -1,5 +1,3 @@
-# Created by: Nick Hibma <n_hibma@freebsd.org>
-
 PORTNAME=	Mongoose
 PORTVERSION=	2.00
 CATEGORIES=	databases perl5
@@ -9,6 +7,7 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	n_hibma@FreeBSD.org
 COMMENT=	MongoDB document to Moose object mapper
+WWW=		https://metacpan.org/release/Mongoose/
 
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
diff --git a/databases/p5-Mongoose/pkg-descr b/databases/p5-Mongoose/pkg-descr
index bf064c6611a8..03cfd93b3589 100644
--- a/databases/p5-Mongoose/pkg-descr
+++ b/databases/p5-Mongoose/pkg-descr
@@ -1,5 +1,3 @@
 This is a MongoDB to Moose object mapper. This module allows you to use
 the full power of MongoDB within your Moose classes, without sacrificing
 MongoDB's power, flexibility and speed.
-
-WWW: https://metacpan.org/release/Mongoose/
diff --git a/databases/p5-MySQL-Diff/Makefile b/databases/p5-MySQL-Diff/Makefile
index d5a8be81dbc4..1e62c43ba9cd 100644
--- a/databases/p5-MySQL-Diff/Makefile
+++ b/databases/p5-MySQL-Diff/Makefile
@@ -1,24 +1,24 @@
-# Created by: Andrew McNaughton <andrew@scoop.co.nz>
-
 PORTNAME=	MySQL-Diff
 PORTVERSION=	0.50
+PORTREVISION=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	skreuzer@FreeBSD.org
 COMMENT=	Perl module for comparing the table structure of two MySQL databases
+WWW=		https://metacpan.org/release/MySQL-Diff
 
 LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
 RUN_DEPENDS=	p5-Class-MakeMethods>=0:devel/p5-Class-MakeMethods \
-		p5-DBD-mysql>=0:databases/p5-DBD-mysql \
+		${DBD_MYSQL} \
 		p5-File-Slurp>=0:devel/p5-File-Slurp \
 		p5-String-ShellQuote>=0:textproc/p5-String-ShellQuote
 
-USES=		perl5 shebangfix
+USES=		mysql perl5 shebangfix
 USE_PERL5=	configure
 
 SHEBANG_FILES=	bin/mysqldiff
diff --git a/databases/p5-MySQL-Diff/pkg-descr b/databases/p5-MySQL-Diff/pkg-descr
index b8a2a12d1301..c11cbdb9362a 100644
--- a/databases/p5-MySQL-Diff/pkg-descr
+++ b/databases/p5-MySQL-Diff/pkg-descr
@@ -1,5 +1,4 @@
 MySQL::Diff is Perl module for comparing the table structure
 of two MySQL databases
 
-WWW: https://metacpan.org/release/MySQL-Diff
-WWW: http://adamspiers.org/computing/mysqldiff/
+See also: https://adamspiers.org/computing/mysqldiff/
diff --git a/databases/p5-Net-Async-CassandraCQL/Makefile b/databases/p5-Net-Async-CassandraCQL/Makefile
index 93f4da097a40..08b1c28b450a 100644
--- a/databases/p5-Net-Async-CassandraCQL/Makefile
+++ b/databases/p5-Net-Async-CassandraCQL/Makefile
@@ -1,5 +1,3 @@
-# Created by: Denis Shaposhnikov <dsh@bamus.cz>
-
 PORTNAME=	Net-Async-CassandraCQL
 PORTVERSION=	0.11
 PORTREVISION=	2
@@ -9,6 +7,7 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	admins@perceptyx.com
 COMMENT=	Use Cassandra databases with IO::Async using CQL
+WWW=		https://metacpan.org/release/Net-Async-CassandraCQL
 
 LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
diff --git a/databases/p5-Net-Async-CassandraCQL/pkg-descr b/databases/p5-Net-Async-CassandraCQL/pkg-descr
index 1a0d971fed77..c38d10c975e6 100644
--- a/databases/p5-Net-Async-CassandraCQL/pkg-descr
+++ b/databases/p5-Net-Async-CassandraCQL/pkg-descr
@@ -5,5 +5,3 @@ concurrently, if required. Alternatively, as the interface is entirely
 based on Future objects, it can be operated synchronously in a
 blocking fashion by simply awaiting each individual operation by
 calling the get method.
-
-WWW: https://metacpan.org/release/Net-Async-CassandraCQL
diff --git a/databases/p5-ORLite-Migrate/Makefile b/databases/p5-ORLite-Migrate/Makefile
index cf6e518670d2..8a9f4c82ffd2 100644
--- a/databases/p5-ORLite-Migrate/Makefile
+++ b/databases/p5-ORLite-Migrate/Makefile
@@ -1,5 +1,3 @@
-# Created by: Cezary Morga <cm@therek.net>
-
 PORTNAME=	ORLite-Migrate
 PORTVERSION=	1.10
 PORTREVISION=	2
@@ -10,6 +8,7 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	Light weight SQLite-specific schema migration
+WWW=		https://metacpan.org/release/ORLite-Migrate
 
 LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
diff --git a/databases/p5-ORLite-Migrate/pkg-descr b/databases/p5-ORLite-Migrate/pkg-descr
index d35db90d5e3a..404cbc29921d 100644
--- a/databases/p5-ORLite-Migrate/pkg-descr
+++ b/databases/p5-ORLite-Migrate/pkg-descr
@@ -2,5 +2,3 @@ ORLite::Migrate is a light weight single class Database Schema Migration
 enhancement for ORLite. It provides a simple implementation of schema
 versioning within the SQLite database using the built-in user_version pragma
 (which is set to zero by default).
-
-WWW: https://metacpan.org/release/ORLite-Migrate
diff --git a/databases/p5-ORLite/Makefile b/databases/p5-ORLite/Makefile
index 48c8b481eb06..4acc400869d9 100644
--- a/databases/p5-ORLite/Makefile
+++ b/databases/p5-ORLite/Makefile
@@ -1,5 +1,3 @@
-# Created by: Cezary Morga <cm@therek.net>
-
 PORTNAME=	ORLite
 PORTVERSION=	1.98
 PORTREVISION=	1
@@ -10,6 +8,7 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl5 extremely light weight SQLite-specific ORM
+WWW=		https://metacpan.org/release/ORLite
 
 LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
diff --git a/databases/p5-ORLite/pkg-descr b/databases/p5-ORLite/pkg-descr
index 40d2823391b7..5638458967ed 100644
--- a/databases/p5-ORLite/pkg-descr
+++ b/databases/p5-ORLite/pkg-descr
@@ -1,5 +1,3 @@
 ORLite is an object-relation system specifically tailored for SQLite that
 follows many of the same principles as the ::Tiny series of modules and has
 a design and feature set that aligns directly to the capabilities of SQLite.
-
-WWW: https://metacpan.org/release/ORLite
diff --git a/databases/p5-Oryx/Makefile b/databases/p5-Oryx/Makefile
index 179741fd9a20..0fa6665dcdda 100644
--- a/databases/p5-Oryx/Makefile
+++ b/databases/p5-Oryx/Makefile
@@ -1,5 +1,3 @@
-# Created by: Zach Thompson <hideo@lastamericanempire.com>
-
 PORTNAME=	Oryx
 PORTVERSION=	0.24
 PORTREVISION=	2
@@ -9,6 +7,7 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Meta-Model Driven Object Persistance with Multiple Inheritance
+WWW=		https://metacpan.org/release/Oryx
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
 RUN_DEPENDS=	p5-SQL-Abstract>=0:databases/p5-SQL-Abstract \
diff --git a/databases/p5-Oryx/pkg-descr b/databases/p5-Oryx/pkg-descr
index 109808a25f72..dfe2d884193e 100644
--- a/databases/p5-Oryx/pkg-descr
+++ b/databases/p5-Oryx/pkg-descr
@@ -3,5 +3,3 @@ mapping as well as DMB style databases and as such is not coupled with any
 particular storage back-end. In other words, you should be able to
 swap out an RDMBS with a DBM style database (and vice versa) without
 changing your persistent classes at all.
-
-WWW: https://metacpan.org/release/Oryx
diff --git a/databases/p5-POE-Component-DBIAgent/Makefile b/databases/p5-POE-Component-DBIAgent/Makefile
index 274c23d7e248..c71c7693bae6 100644
--- a/databases/p5-POE-Component-DBIAgent/Makefile
+++ b/databases/p5-POE-Component-DBIAgent/Makefile
@@ -1,5 +1,3 @@
-# Created by: Sergey Skvortsov <skv@protey.ru>
-
 PORTNAME=	POE-Component-DBIAgent
 PORTVERSION=	0.26
 PORTREVISION=	2
@@ -9,6 +7,7 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	POE Component for running asynchronous DBI calls
+WWW=		https://metacpan.org/release/POE-Component-DBIAgent
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
 RUN_DEPENDS=	p5-POE>=0:devel/p5-POE \
diff --git a/databases/p5-POE-Component-DBIAgent/pkg-descr b/databases/p5-POE-Component-DBIAgent/pkg-descr
index 83bc05d5269e..781f55cc7e3b 100644
--- a/databases/p5-POE-Component-DBIAgent/pkg-descr
+++ b/databases/p5-POE-Component-DBIAgent/pkg-descr
@@ -3,5 +3,3 @@ The DBIAgent is your answer to non-blocking DBI in POE.
 It fires off child processes (configurable, defaults to 3) and feeds
 database queries to it via two-way pipe (or however Wheel::Run is able
 to manage it).
-
-WWW: https://metacpan.org/release/POE-Component-DBIAgent
diff --git a/databases/p5-POE-Component-EasyDBI/Makefile b/databases/p5-POE-Component-EasyDBI/Makefile
index ec824ecf759d..a935ad8578ee 100644
--- a/databases/p5-POE-Component-EasyDBI/Makefile
+++ b/databases/p5-POE-Component-EasyDBI/Makefile
@@ -1,13 +1,12 @@
-# Created by: Zach Thompson <lin-chi@lastamericanempire.com>
-
 PORTNAME=	POE-Component-EasyDBI
-PORTVERSION=	1.28
+PORTVERSION=	1.30
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	POE Component for simplified DBI usage
+WWW=		https://metacpan.org/release/POE-Component-EasyDBI
 
 LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
@@ -20,6 +19,8 @@ RUN_DEPENDS=	p5-DBI>=1.38:databases/p5-DBI \
 TEST_DEPENDS=	p5-Test-Requires>=0.08:devel/p5-Test-Requires
 
 USES=		perl5
-USE_PERL5=	modbuild
+USE_PERL5=	modbuildtiny
+
+NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/databases/p5-POE-Component-EasyDBI/distinfo b/databases/p5-POE-Component-EasyDBI/distinfo
index 1b87cf364bec..6d0a5e214e36 100644
--- a/databases/p5-POE-Component-EasyDBI/distinfo
+++ b/databases/p5-POE-Component-EasyDBI/distinfo
@@ -1,2 +1,3 @@
-SHA256 (POE-Component-EasyDBI-1.28.tar.gz) = 5f10d4572cc7f64655cab1d5c209307fe87a0bdc2d02d049dc22bb5dfae6fc6b
-SIZE (POE-Component-EasyDBI-1.28.tar.gz) = 46383
+TIMESTAMP = 1669058263
+SHA256 (POE-Component-EasyDBI-1.30.tar.gz) = eaa4df9adbdcb7430c4b0087833ef9f61375ae4181a446a3246d8c4ea18f7746
+SIZE (POE-Component-EasyDBI-1.30.tar.gz) = 45895
diff --git a/databases/p5-POE-Component-EasyDBI/pkg-descr b/databases/p5-POE-Component-EasyDBI/pkg-descr
index 6361b00f248c..44630e25268d 100644
--- a/databases/p5-POE-Component-EasyDBI/pkg-descr
+++ b/databases/p5-POE-Component-EasyDBI/pkg-descr
@@ -1,3 +1 @@
 Simplified use of DBI in the POE environment.
-
-WWW: https://metacpan.org/release/POE-Component-EasyDBI
diff --git a/databases/p5-POE-Component-LaDBI/Makefile b/databases/p5-POE-Component-LaDBI/Makefile
index cbe193916a5f..3255d735ccd7 100644
--- a/databases/p5-POE-Component-LaDBI/Makefile
+++ b/databases/p5-POE-Component-LaDBI/Makefile
@@ -1,5 +1,3 @@
-# Created by: Sergey Skvortsov <skv@protey.ru>
-
 PORTNAME=	POE-Component-LaDBI
 PORTVERSION=	1.2.1
 PORTREVISION=	1
@@ -9,6 +7,7 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension for asynchronous non-blocking DBI calls in POE
+WWW=		https://metacpan.org/release/POE-Component-LaDBI
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
 RUN_DEPENDS=	p5-POE>=0:devel/p5-POE \
diff --git a/databases/p5-POE-Component-LaDBI/pkg-descr b/databases/p5-POE-Component-LaDBI/pkg-descr
index cbc4ad813e0a..2b2e9970be45 100644
--- a/databases/p5-POE-Component-LaDBI/pkg-descr
+++ b/databases/p5-POE-Component-LaDBI/pkg-descr
@@ -1,4 +1,2 @@
 POE Component that spawns a perl subprocess to handle non-blocking
 access to the DBI API.
-
-WWW: https://metacpan.org/release/POE-Component-LaDBI
diff --git a/databases/p5-POE-Component-RRDTool/Makefile b/databases/p5-POE-Component-RRDTool/Makefile
index 17450c6f2a49..907adc1166d8 100644
--- a/databases/p5-POE-Component-RRDTool/Makefile
+++ b/databases/p5-POE-Component-RRDTool/Makefile
@@ -1,5 +1,3 @@
-# Created by: Sergey Skvortsov <skv@protey.ru>
-
 PORTNAME=	POE-Component-RRDTool
 PORTVERSION=	0.18
 PORTREVISION=	6
@@ -10,6 +8,7 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	POE interface to Round Robin Database Tools
+WWW=		https://metacpan.org/release/TCAINE/POE-Component-RRDTool-0.18
 
 LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
diff --git a/databases/p5-POE-Component-RRDTool/pkg-descr b/databases/p5-POE-Component-RRDTool/pkg-descr
index 7b09da7181c1..7caeda4d5130 100644
--- a/databases/p5-POE-Component-RRDTool/pkg-descr
+++ b/databases/p5-POE-Component-RRDTool/pkg-descr
@@ -7,5 +7,3 @@ higher granularity.  RRDtool is specialized for time series data and can
 be used to create RRD files, update RRDs, retreive data from RRDs, and
 generate graphs from the databases.  This module provides a POE wrapper
 around the rrdtool command line interface.
-
-WWW: https://metacpan.org/release/TCAINE/POE-Component-RRDTool-0.18
diff --git a/databases/p5-Pg/Makefile b/databases/p5-Pg/Makefile
index 52f60e67d7db..b4f5b82c68a3 100644
--- a/databases/p5-Pg/Makefile
+++ b/databases/p5-Pg/Makefile
@@ -1,5 +1,3 @@
-# Created by: James FitzGibbon <jfitz@FreeBSD.org>
-
 PORTNAME=	Pg
 PORTVERSION=	2.1.1
 PORTREVISION=	6
@@ -11,6 +9,7 @@ DIST_SUBDIR=	postgresql
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Interface for using perl5 to access PostgreSQL databases
+WWW=		https://www.postgresql.org/
 
 LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
diff --git a/databases/p5-Pg/pkg-descr b/databases/p5-Pg/pkg-descr
index b148af110123..17c0fec4319d 100644
--- a/databases/p5-Pg/pkg-descr
+++ b/databases/p5-Pg/pkg-descr
@@ -1,5 +1,3 @@
 This is an API for using Perl5 to access PostgreSQL databases.
 
 This software is part of the standard PostgreSQL distribution.
-
-WWW: https://www.postgresql.org/
diff --git a/databases/p5-PostgreSQL-PLPerl-Call/Makefile b/databases/p5-PostgreSQL-PLPerl-Call/Makefile
index 7eed3f542dab..aac1f561721a 100644
--- a/databases/p5-PostgreSQL-PLPerl-Call/Makefile
+++ b/databases/p5-PostgreSQL-PLPerl-Call/Makefile
@@ -1,5 +1,3 @@
-# Created by: Sunpoet Po-Chuan Hsieh <sunpoet@sunpoet.net>
-
 PORTNAME=	PostgreSQL-PLPerl-Call
 PORTVERSION=	1.007
 CATEGORIES=	databases perl5
@@ -9,6 +7,7 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Simple interface for calling SQL functions from PostgreSQL PL/Perl
+WWW=		https://metacpan.org/release/PostgreSQL-PLPerl-Call
 
 LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
diff --git a/databases/p5-PostgreSQL-PLPerl-Call/pkg-descr b/databases/p5-PostgreSQL-PLPerl-Call/pkg-descr
index 45d1d3905c45..1bcb89e978d3 100644
--- a/databases/p5-PostgreSQL-PLPerl-Call/pkg-descr
+++ b/databases/p5-PostgreSQL-PLPerl-Call/pkg-descr
@@ -1,4 +1,2 @@
 PostgreSQL::PLPerl::Call is a simple interface for calling SQL functions
 from PostgreSQL PL/Perl.
-
-WWW: https://metacpan.org/release/PostgreSQL-PLPerl-Call
diff --git a/databases/p5-PostgreSQL-PLPerl-Trace/Makefile b/databases/p5-PostgreSQL-PLPerl-Trace/Makefile
index 56d6b95b019e..e00518b73ece 100644
--- a/databases/p5-PostgreSQL-PLPerl-Trace/Makefile
+++ b/databases/p5-PostgreSQL-PLPerl-Trace/Makefile
@@ -1,5 +1,3 @@
-# Created by: Sunpoet Po-Chuan Hsieh <sunpoet@sunpoet.net>
-
 PORTNAME=	PostgreSQL-PLPerl-Trace
 PORTVERSION=	1.001
 PORTREVISION=	1
@@ -10,6 +8,7 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Simple way to trace execution of Perl statements in PL/Perl
+WWW=		https://metacpan.org/release/PostgreSQL-PLPerl-Trace
 
 LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
diff --git a/databases/p5-PostgreSQL-PLPerl-Trace/pkg-descr b/databases/p5-PostgreSQL-PLPerl-Trace/pkg-descr
index c40167cc1975..e95e91063bc1 100644
--- a/databases/p5-PostgreSQL-PLPerl-Trace/pkg-descr
+++ b/databases/p5-PostgreSQL-PLPerl-Trace/pkg-descr
@@ -1,4 +1,2 @@
 PostgreSQL::PLPerl::Trace is a simple way to trace execution of
 Perl statements in PL/Perl.
-
-WWW: https://metacpan.org/release/PostgreSQL-PLPerl-Trace
diff --git a/databases/p5-Prophet/Makefile b/databases/p5-Prophet/Makefile
index cb8efca01088..ee533483b2c6 100644
--- a/databases/p5-Prophet/Makefile
+++ b/databases/p5-Prophet/Makefile
@@ -8,6 +8,7 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Distributed database system
+WWW=		https://metacpan.org/release/Prophet
 
 LICENSE=	MIT
 
diff --git a/databases/p5-Prophet/pkg-descr b/databases/p5-Prophet/pkg-descr
index 6aa8763115c2..f977baaf8cb0 100644
--- a/databases/p5-Prophet/pkg-descr
+++ b/databases/p5-Prophet/pkg-descr
@@ -1,4 +1,2 @@
 Prophet is a distributed database system designed for small to medium scale
 social database applications.
-
-WWW: https://metacpan.org/release/Prophet
diff --git a/databases/p5-Protocol-CassandraCQL/Makefile b/databases/p5-Protocol-CassandraCQL/Makefile
index 9a767c06adfb..76efaf6c3812 100644
--- a/databases/p5-Protocol-CassandraCQL/Makefile
+++ b/databases/p5-Protocol-CassandraCQL/Makefile
@@ -1,5 +1,3 @@
-# Created by: Denis Shaposhnikov <dsh@bamus.cz>
-
 PORTNAME=	Protocol-CassandraCQL
 PORTVERSION=	0.11
 PORTREVISION=	2
@@ -10,6 +8,7 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	admins@perceptyx.com
 COMMENT=	Wire protocol support functions for Cassandra CQL3
+WWW=		https://metacpan.org/release/Protocol-CassandraCQL
 
 LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
diff --git a/databases/p5-Protocol-CassandraCQL/pkg-descr b/databases/p5-Protocol-CassandraCQL/pkg-descr
index fe445f982891..fa0be53a9617 100644
--- a/databases/p5-Protocol-CassandraCQL/pkg-descr
+++ b/databases/p5-Protocol-CassandraCQL/pkg-descr
@@ -4,5 +4,3 @@ not in itself a CQL client; it simply provides the necessary support
 functions to allow one to be written.
 
 For a complete client, see instead Net::Async::CassandraCQL.
-
-WWW: https://metacpan.org/release/Protocol-CassandraCQL
diff --git a/databases/p5-RRD-Simple/Makefile b/databases/p5-RRD-Simple/Makefile
index 916bcab9237a..75baec8e799d 100644
--- a/databases/p5-RRD-Simple/Makefile
+++ b/databases/p5-RRD-Simple/Makefile
@@ -1,5 +1,3 @@
-# Created by: chinsan <chinsan.tw@gmail.com>
-
 PORTNAME=	RRD-Simple
 PORTVERSION=	1.44
 PORTREVISION=	7
@@ -9,6 +7,7 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Simple interface to create and store data in RRD files
+WWW=		https://metacpan.org/release/RRD-Simple
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
 RUN_DEPENDS=	rrdtool:databases/rrdtool
diff --git a/databases/p5-RRD-Simple/pkg-descr b/databases/p5-RRD-Simple/pkg-descr
index 7a987aa6a324..51633068ff68 100644
--- a/databases/p5-RRD-Simple/pkg-descr
+++ b/databases/p5-RRD-Simple/pkg-descr
@@ -7,5 +7,3 @@ existing RRD file.
 
 This module is ideal for quick and simple storage of data within an RRD file if
 you do not need to, nor want to, bother defining custom RRA definitions.
-
-WWW: https://metacpan.org/release/RRD-Simple
diff --git a/databases/p5-Redis-Fast/Makefile b/databases/p5-Redis-Fast/Makefile
index 456791d50dac..6ab8e29a27d9 100644
--- a/databases/p5-Redis-Fast/Makefile
+++ b/databases/p5-Redis-Fast/Makefile
@@ -1,13 +1,14 @@
 PORTNAME=	Redis-Fast
-PORTVERSION=	0.31
+DISTVERSION=	0.36
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	bokutin@bokut.in
 COMMENT=	Perl binding for Redis database
+WWW=		https://metacpan.org/release/Redis-Fast
 
-LICENSE=	ART10 GPLv1+
+LICENSE=	ARTPERL10 GPLv1+
 LICENSE_COMB=	dual
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
diff --git a/databases/p5-Redis-Fast/distinfo b/databases/p5-Redis-Fast/distinfo
index 56f76c1fc494..01c61c48a1f6 100644
--- a/databases/p5-Redis-Fast/distinfo
+++ b/databases/p5-Redis-Fast/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1627715472
-SHA256 (Redis-Fast-0.31.tar.gz) = f02f71bf5b566dbec6bf4e7f43049d18a479e016b52c57d8f5f73a29f41c24c2
-SIZE (Redis-Fast-0.31.tar.gz) = 146006
+TIMESTAMP = 1689631605
+SHA256 (Redis-Fast-0.36.tar.gz) = 249bf9a9eec3370ad1a55992b96760a9bdb97f6db6e28638e4e4f59ffbe3a2c8
+SIZE (Redis-Fast-0.36.tar.gz) = 169080
diff --git a/databases/p5-Redis-Fast/pkg-descr b/databases/p5-Redis-Fast/pkg-descr
index 1174d21042db..9fdbd70408ff 100644
--- a/databases/p5-Redis-Fast/pkg-descr
+++ b/databases/p5-Redis-Fast/pkg-descr
@@ -1,4 +1,2 @@
 Perl binding for Redis database.
 Redis::Fast is 4x faster than Redis.pm in pipeline mode.
-
-WWW: https://metacpan.org/release/Redis-Fast
diff --git a/databases/p5-Redis-JobQueue/Makefile b/databases/p5-Redis-JobQueue/Makefile
index 5ba9af2db511..0252dd248da4 100644
--- a/databases/p5-Redis-JobQueue/Makefile
+++ b/databases/p5-Redis-JobQueue/Makefile
@@ -1,5 +1,3 @@
-# Created by: Ryan Steinmetz <zi@FreeBSD.org>
-
 PORTNAME=	Redis-JobQueue
 PORTVERSION=	1.19
 CATEGORIES=	databases perl5
@@ -8,6 +6,7 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Job queue management implemented using Redis server
+WWW=		https://metacpan.org/release/Redis-JobQueue
 
 LICENSE=	ARTPERL10
 
diff --git a/databases/p5-Redis-JobQueue/pkg-descr b/databases/p5-Redis-JobQueue/pkg-descr
index 76d95473e834..d19caeb41d0b 100644
--- a/databases/p5-Redis-JobQueue/pkg-descr
+++ b/databases/p5-Redis-JobQueue/pkg-descr
@@ -8,5 +8,3 @@ a simple job queue based on Redis server capabilities.
 * Provides an object oriented API.
 * Support of storing arbitrary job-related data structures.
 * Simple methods for organizing producer, worker, and consumer clients.
-
-WWW: https://metacpan.org/release/Redis-JobQueue
diff --git a/databases/p5-Redis-RateLimit/Makefile b/databases/p5-Redis-RateLimit/Makefile
index 661be477d53d..7299551b1293 100644
--- a/databases/p5-Redis-RateLimit/Makefile
+++ b/databases/p5-Redis-RateLimit/Makefile
@@ -1,13 +1,12 @@
-# Created by: Davíð Steinn Geirsson <david@isnic.is>
-
 PORTNAME=	Redis-RateLimit
 PORTVERSION=	1.0002
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	david@isnic.is
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Sliding window rate limiting with Redis
+WWW=		https://metacpan.org/pod/Redis::RateLimit
 
 LICENSE=	MIT
 
diff --git a/databases/p5-Redis-RateLimit/pkg-descr b/databases/p5-Redis-RateLimit/pkg-descr
index d4f662db7e5f..c564605dfa6b 100644
--- a/databases/p5-Redis-RateLimit/pkg-descr
+++ b/databases/p5-Redis-RateLimit/pkg-descr
@@ -2,5 +2,3 @@ A Perl library for efficient rate limiting using sliding windows
 stored in Redis.
 
 This is a port of RateLimit.js without the non-blocking goodness.
-
-WWW: https://metacpan.org/pod/Redis::RateLimit
diff --git a/databases/p5-Redis-hiredis/Makefile b/databases/p5-Redis-hiredis/Makefile
index 1454fdd119b9..2d0cf99dd991 100644
--- a/databases/p5-Redis-hiredis/Makefile
+++ b/databases/p5-Redis-hiredis/Makefile
@@ -1,5 +1,3 @@
-# Created by: Grzegorz Blach <gblach@FreeBSD.org>
-
 PORTNAME=	Redis-hiredis
 PORTVERSION=	0.11.0
 PORTREVISION=	2
@@ -9,6 +7,7 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Simple wrapper around hiredis C client
+WWW=		https://metacpan.org/release/Redis-hiredis
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/databases/p5-Redis-hiredis/pkg-descr b/databases/p5-Redis-hiredis/pkg-descr
index 2d0d77aaa417..be321daf92be 100644
--- a/databases/p5-Redis-hiredis/pkg-descr
+++ b/databases/p5-Redis-hiredis/pkg-descr
@@ -1,5 +1,3 @@
 Redis::hiredis is a simple wrapper around Salvatore Sanfilippo's hiredis C
 client that allows connecting and sending any command just like you would
 from a command line Redis client.
-
-WWW: https://metacpan.org/release/Redis-hiredis
diff --git a/databases/p5-Redis/Makefile b/databases/p5-Redis/Makefile
index bf7c608214f8..8b494b4e24cc 100644
--- a/databases/p5-Redis/Makefile
+++ b/databases/p5-Redis/Makefile
@@ -1,5 +1,3 @@
-# Created by: Gea-Suan Lin <gslin@gslin.org>
-
 PORTNAME=	Redis
 PORTVERSION=	1.9950
 CATEGORIES=	databases perl5
@@ -9,6 +7,7 @@ DISTNAME=	${PORTNAME}-${PORTVERSION:C/0$//}
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl binding for Redis database
+WWW=		https://metacpan.org/release/Redis
 
 LICENSE=	ART20
 LICENSE_FILE=	${WRKSRC}/LICENSE
diff --git a/databases/p5-Redis/pkg-descr b/databases/p5-Redis/pkg-descr
index a544554788d3..e91c6f4d41c7 100644
--- a/databases/p5-Redis/pkg-descr
+++ b/databases/p5-Redis/pkg-descr
@@ -2,5 +2,3 @@ Pure perl bindings for http://code.google.com/p/redis/
 
 This version support git version 0.08 or later of Redis available at
 git://github.com/antirez/redis
-
-WWW: https://metacpan.org/release/Redis
diff --git a/databases/p5-RedisDB-Parser/Makefile b/databases/p5-RedisDB-Parser/Makefile
index fcfb668b6d06..0789a547e654 100644
--- a/databases/p5-RedisDB-Parser/Makefile
+++ b/databases/p5-RedisDB-Parser/Makefile
@@ -1,21 +1,25 @@
 PORTNAME=	RedisDB-Parser
-PORTVERSION=	2.22
-PORTREVISION=	0
+PORTVERSION=	2.23
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension for Redis protocol parser
+WWW=		https://metacpan.org/release/RedisDB-Parser
 
 LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
 
-RUN_DEPENDS=	\
-	p5-Try-Tiny>0:lang/p5-Try-Tiny
 BUILD_DEPENDS=	${RUN_DEPENDS}
+RUN_DEPENDS=	p5-Try-Tiny>=0:lang/p5-Try-Tiny
+TEST_DEPENDS=	p5-Test-FailWarnings>=0:devel/p5-Test-FailWarnings \
+		p5-Test-Most>=0.22:devel/p5-Test-Most
 
 USES=		perl5
 USE_PERL5=	configure
 
+post-install:
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/RedisDB/Parser/Parser.so
+
 .include <bsd.port.mk>
diff --git a/databases/p5-RedisDB-Parser/distinfo b/databases/p5-RedisDB-Parser/distinfo
index 26ec6f555f06..43f587c50380 100644
--- a/databases/p5-RedisDB-Parser/distinfo
+++ b/databases/p5-RedisDB-Parser/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1479811022
-SHA256 (RedisDB-Parser-2.22.tar.gz) = fcbd4dbd321d2de4113b21288db083e47d8647b50e5f1c115629de169a4004b1
-SIZE (RedisDB-Parser-2.22.tar.gz) = 31497
+TIMESTAMP = 1650228986
+SHA256 (RedisDB-Parser-2.23.tar.gz) = 46a635fc435f724b01e9ba99d407cf5aef1d9c2691256a8a2262163c4d4f5cfc
+SIZE (RedisDB-Parser-2.23.tar.gz) = 30675
diff --git a/databases/p5-RedisDB-Parser/pkg-descr b/databases/p5-RedisDB-Parser/pkg-descr
index 79fbf6aac4b6..cc3d32227860 100644
--- a/databases/p5-RedisDB-Parser/pkg-descr
+++ b/databases/p5-RedisDB-Parser/pkg-descr
@@ -1,4 +1,2 @@
 This module provides methods to build redis requests and parse replies
 from the server.
-
-WWW: https://metacpan.org/release/RedisDB-Parser
diff --git a/databases/p5-RedisDB-Parser/pkg-plist b/databases/p5-RedisDB-Parser/pkg-plist
index d3db3c4656b9..327bbcd0e511 100644
--- a/databases/p5-RedisDB-Parser/pkg-plist
+++ b/databases/p5-RedisDB-Parser/pkg-plist
@@ -1,9 +1,9 @@
-%%PERL5_MAN3%%/RedisDB::Parser.3.gz
-%%PERL5_MAN3%%/RedisDB::Parser::Error.3.gz
-%%PERL5_MAN3%%/RedisDB::Parser::PP.3.gz
-%%PERL5_MAN3%%/RedisDB::Parser::XS.3.gz
-%%SITE_ARCH%%/auto/RedisDB/Parser/Parser.so
 %%SITE_ARCH%%/RedisDB/Parser.pm
 %%SITE_ARCH%%/RedisDB/Parser/Error.pm
 %%SITE_ARCH%%/RedisDB/Parser/PP.pm
 %%SITE_ARCH%%/RedisDB/Parser/XS.pm
+%%SITE_ARCH%%/auto/RedisDB/Parser/Parser.so
+%%PERL5_MAN3%%/RedisDB::Parser.3.gz
+%%PERL5_MAN3%%/RedisDB::Parser::Error.3.gz
+%%PERL5_MAN3%%/RedisDB::Parser::PP.3.gz
+%%PERL5_MAN3%%/RedisDB::Parser::XS.3.gz
diff --git a/databases/p5-RedisDB/Makefile b/databases/p5-RedisDB/Makefile
index c2013e9c681a..9da8648deced 100644
--- a/databases/p5-RedisDB/Makefile
+++ b/databases/p5-RedisDB/Makefile
@@ -1,22 +1,28 @@
 PORTNAME=	RedisDB
-PORTVERSION=	2.53
+PORTVERSION=	2.57
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension to access redis database
+WWW=		https://metacpan.org/release/RedisDB
 
 LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
 
-RUN_DEPENDS=	\
-	p5-RedisDB-Parser>=2.21:databases/p5-RedisDB-Parser \
-	p5-Try-Tiny>0:lang/p5-Try-Tiny
 BUILD_DEPENDS=	${RUN_DEPENDS}
+RUN_DEPENDS=	p5-RedisDB-Parser>=2.21:databases/p5-RedisDB-Parser \
+		p5-Try-Tiny>=0:lang/p5-Try-Tiny \
+		p5-URI>=0:net/p5-URI
+TEST_DEPENDS=	p5-Test-Differences>=0.610,1:devel/p5-Test-Differences \
+		p5-Test-FailWarnings>=0:devel/p5-Test-FailWarnings \
+		p5-Test-Most>=0.22:devel/p5-Test-Most \
+		p5-Test-TCP>=1.17:devel/p5-Test-TCP
 
 USES=		perl5
 USE_PERL5=	configure
-NO_ARCH=	YES
+
+NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/databases/p5-RedisDB/distinfo b/databases/p5-RedisDB/distinfo
index ea246f6ffa21..32334a0cf5a3 100644
--- a/databases/p5-RedisDB/distinfo
+++ b/databases/p5-RedisDB/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1480126601
-SHA256 (RedisDB-2.53.tar.gz) = a51c571f058458ce936a696a5dc7d31d808674aea9d8577b35ba27a3959b3648
-SIZE (RedisDB-2.53.tar.gz) = 48918
+TIMESTAMP = 1650228984
+SHA256 (RedisDB-2.57.tar.gz) = dcb61d72d42611555b1e90b76f971e3e542d65b936d3a1f5d281fda95214e816
+SIZE (RedisDB-2.57.tar.gz) = 48581
diff --git a/databases/p5-RedisDB/pkg-descr b/databases/p5-RedisDB/pkg-descr
index 20b4c3c159d1..d972e04a92aa 100644
--- a/databases/p5-RedisDB/pkg-descr
+++ b/databases/p5-RedisDB/pkg-descr
@@ -2,5 +2,3 @@ This module provides interface to access redis key-value store, it
 transparently handles disconnects and forks, supports transactions,
 pipelining, and subscription mode.  Module includes XS and pure Perl
 versions of the parser.
-
-WWW: https://metacpan.org/release/RedisDB
diff --git a/databases/p5-RedisDB/pkg-plist b/databases/p5-RedisDB/pkg-plist
index 6f8c4f5a8d85..e97d51fd660c 100644
--- a/databases/p5-RedisDB/pkg-plist
+++ b/databases/p5-RedisDB/pkg-plist
@@ -1,10 +1,10 @@
-%%PERL5_MAN3%%/Test::RedisDB.3.gz
-%%PERL5_MAN3%%/RedisDB.3.gz
-%%PERL5_MAN3%%/RedisDB::Cluster.3.gz
-%%PERL5_MAN3%%/RedisDB::Error.3.gz
-%%PERL5_MAN3%%/RedisDB::Sentinel.3.gz
-%%SITE_PERL%%/Test/RedisDB.pm
 %%SITE_PERL%%/RedisDB.pm
 %%SITE_PERL%%/RedisDB/Cluster.pm
 %%SITE_PERL%%/RedisDB/Error.pm
 %%SITE_PERL%%/RedisDB/Sentinel.pm
+%%SITE_PERL%%/Test/RedisDB.pm
+%%PERL5_MAN3%%/RedisDB.3.gz
+%%PERL5_MAN3%%/RedisDB::Cluster.3.gz
+%%PERL5_MAN3%%/RedisDB::Error.3.gz
+%%PERL5_MAN3%%/RedisDB::Sentinel.3.gz
+%%PERL5_MAN3%%/Test::RedisDB.3.gz
diff --git a/databases/p5-Relations-Query/Makefile b/databases/p5-Relations-Query/Makefile
index 051350045726..1a0141bc1712 100644
--- a/databases/p5-Relations-Query/Makefile
+++ b/databases/p5-Relations-Query/Makefile
@@ -1,5 +1,3 @@
-# Created by: Timur I. Bakeyev <bat@cpan.org>
-
 PORTNAME=	Relations-Query
 PORTVERSION=	0.93
 PORTREVISION=	1
@@ -9,6 +7,7 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	Object for building queries with DBI/DBD::mysql
+WWW=		https://metacpan.org/pod/Relations::Query
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
 RUN_DEPENDS=	p5-Relations>=0:databases/p5-Relations
diff --git a/databases/p5-Relations-Query/pkg-descr b/databases/p5-Relations-Query/pkg-descr
index 2abd48adb6b2..a875dd83b928 100644
--- a/databases/p5-Relations-Query/pkg-descr
+++ b/databases/p5-Relations-Query/pkg-descr
@@ -5,5 +5,3 @@ by, etc.  You can also add and override clause info in the query as
 well,  on both a permanent and temporary basis. With the to_string()
 function, you can create a query string from a hash, query object or
 string.
-
-WWW: http://www.gaf3.com/
diff --git a/databases/p5-Relations/Makefile b/databases/p5-Relations/Makefile
index c9d63ff4615a..2041d618080d 100644
--- a/databases/p5-Relations/Makefile
+++ b/databases/p5-Relations/Makefile
@@ -1,5 +1,3 @@
-# Created by: Timur I. Bakeyev <bat@cpan.org>
-
 PORTNAME=	Relations
 PORTVERSION=	0.95
 PORTREVISION=	1
@@ -9,6 +7,7 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	Functions to Use with Databases and Queries
+WWW=		https://metacpan.org/pod/Relations
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/databases/p5-Relations/pkg-descr b/databases/p5-Relations/pkg-descr
index 54e47b1297dc..4744999823c2 100644
--- a/databases/p5-Relations/pkg-descr
+++ b/databases/p5-Relations/pkg-descr
@@ -7,5 +7,3 @@ from hashes, arrays and strings. It also has functions for converting
 strings to arrays or hashes, if they're not hashes or arrays already. It
 even has an argument parser, which is used quite heavily by the other
 Relations modules.
-
-WWW: http://www.gaf3.com/
diff --git a/databases/p5-ResourcePool-Resource-DBI/Makefile b/databases/p5-ResourcePool-Resource-DBI/Makefile
index 2b8a9d0869c2..89f8758f82c7 100644
--- a/databases/p5-ResourcePool-Resource-DBI/Makefile
+++ b/databases/p5-ResourcePool-Resource-DBI/Makefile
@@ -1,5 +1,3 @@
-# Created by: erwin@FreeBSD.org
-
 PORTNAME=	ResourcePool-Resource-DBI
 PORTVERSION=	1.0101
 PORTREVISION=	1
@@ -11,6 +9,7 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Resource pool wrapper for DBI Perl module
+WWW=		https://metacpan.org/release/ResourcePool-Resource-DBI
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
 RUN_DEPENDS=	p5-ResourcePool>=0:devel/p5-ResourcePool \
diff --git a/databases/p5-ResourcePool-Resource-DBI/pkg-descr b/databases/p5-ResourcePool-Resource-DBI/pkg-descr
index 8ee4c3d35694..63002143693b 100644
--- a/databases/p5-ResourcePool-Resource-DBI/pkg-descr
+++ b/databases/p5-ResourcePool-Resource-DBI/pkg-descr
@@ -2,5 +2,3 @@ This class is used by the ResourcePool internally to create DBI
 connections. Its called by the corresponding ResourcePool::Factory::DBI
 object which passes the parameters needed to establish the DBI
 connection.
-
-WWW: https://metacpan.org/release/ResourcePool-Resource-DBI
diff --git a/databases/p5-Rose-DB-Object/Makefile b/databases/p5-Rose-DB-Object/Makefile
index 791d1efb2bcc..12ee0e511116 100644
--- a/databases/p5-Rose-DB-Object/Makefile
+++ b/databases/p5-Rose-DB-Object/Makefile
@@ -1,5 +1,3 @@
-# Created by: Zach Thompson <hideo@lastamericanempire.com>
-
 PORTNAME=	Rose-DB-Object
 PORTVERSION=	0.8140
 PORTEPOCH=	1
@@ -10,6 +8,7 @@ DISTNAME=	${PORTNAME}-${PORTVERSION:C/0$//}
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Extensible, high performance RDBMS-OO mapper
+WWW=		https://metacpan.org/release/Rose-DB-Object
 
 LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
diff --git a/databases/p5-Rose-DB-Object/pkg-descr b/databases/p5-Rose-DB-Object/pkg-descr
index 41e5bbba7505..8ad4931d38e0 100644
--- a/databases/p5-Rose-DB-Object/pkg-descr
+++ b/databases/p5-Rose-DB-Object/pkg-descr
@@ -1,4 +1,2 @@
 Rose::DB::Object is a base class for objects that encapsulate a single row in a
 database table.
-
-WWW: https://metacpan.org/release/Rose-DB-Object
diff --git a/databases/p5-Rose-DB/Makefile b/databases/p5-Rose-DB/Makefile
index df36d7c256e2..dfcf3621f2be 100644
--- a/databases/p5-Rose-DB/Makefile
+++ b/databases/p5-Rose-DB/Makefile
@@ -1,7 +1,5 @@
-# Created by: Zach Thompson <hideo@lastamericanempire.com>
-
 PORTNAME=	Rose-DB
-PORTVERSION=	0.783
+PORTVERSION=	0.785
 PORTEPOCH=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
@@ -9,6 +7,7 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	DBI wrapper and abstraction layer
+WWW=		https://metacpan.org/release/Rose-DB
 
 LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
diff --git a/databases/p5-Rose-DB/distinfo b/databases/p5-Rose-DB/distinfo
index 7c0b63889ced..76dda7bdc630 100644
--- a/databases/p5-Rose-DB/distinfo
+++ b/databases/p5-Rose-DB/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1587721973
-SHA256 (Rose-DB-0.783.tar.gz) = 188c8e729cd899832a9c7fba2344d18cc2a98d7b6cbddfdbefb0e78fddb6e32d
-SIZE (Rose-DB-0.783.tar.gz) = 127290
+TIMESTAMP = 1679499146
+SHA256 (Rose-DB-0.785.tar.gz) = 7849307d748d9672b42ef3cd78f83d44dec034cdc94f4d4251d2761e27c67a3c
+SIZE (Rose-DB-0.785.tar.gz) = 128450
diff --git a/databases/p5-Rose-DB/pkg-descr b/databases/p5-Rose-DB/pkg-descr
index ef76eaf69329..e4fe8c5eac64 100644
--- a/databases/p5-Rose-DB/pkg-descr
+++ b/databases/p5-Rose-DB/pkg-descr
@@ -1,3 +1 @@
 Rose::DB is a wrapper and abstraction layer for DBI-related functionality.
-
-WWW: https://metacpan.org/release/Rose-DB
diff --git a/databases/p5-Rose-DBx-Object-MoreHelpers/Makefile b/databases/p5-Rose-DBx-Object-MoreHelpers/Makefile
index da24c9d641b3..a2c2e007803a 100644
--- a/databases/p5-Rose-DBx-Object-MoreHelpers/Makefile
+++ b/databases/p5-Rose-DBx-Object-MoreHelpers/Makefile
@@ -1,5 +1,3 @@
-# Created by: Martin Wilke <miwi@FreeBSD.org>
-
 PORTNAME=	Rose-DBx-Object-MoreHelpers
 PORTVERSION=	0.100
 PORTREVISION=	1
@@ -9,6 +7,7 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl 5 module to deploy a DBIx::Class schema
+WWW=		https://metacpan.org/release/Rose-DBx-Object-MoreHelpers
 
 LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
diff --git a/databases/p5-Rose-DBx-Object-MoreHelpers/pkg-descr b/databases/p5-Rose-DBx-Object-MoreHelpers/pkg-descr
index 5ba19e78f562..af5e341fca04 100644
--- a/databases/p5-Rose-DBx-Object-MoreHelpers/pkg-descr
+++ b/databases/p5-Rose-DBx-Object-MoreHelpers/pkg-descr
@@ -3,5 +3,3 @@ In the tradition of Rose::DB::Object::Helpers, more importable methods.
 This class inherits from Rose::Object::MixIn. See the Rose::Object::MixIn
 documentation for a full explanation of how to import methods from
 this class. The helper methods themselves are described below.
-
-WWW: https://metacpan.org/release/Rose-DBx-Object-MoreHelpers
diff --git a/databases/p5-Rose-DBx-Object-Renderer/Makefile b/databases/p5-Rose-DBx-Object-Renderer/Makefile
index 0433aacf2301..f2a1d80fbb26 100644
--- a/databases/p5-Rose-DBx-Object-Renderer/Makefile
+++ b/databases/p5-Rose-DBx-Object-Renderer/Makefile
@@ -1,5 +1,3 @@
-# Created by: Wen Heping
-
 PORTNAME=	Rose-DBx-Object-Renderer
 PORTVERSION=	0.77
 PORTREVISION=	1
@@ -9,6 +7,7 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Web UI Rendering for Rose::DB::Object
+WWW=		https://metacpan.org/release/Rose-DBx-Object-Renderer
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
 RUN_DEPENDS=	p5-Rose-DBx-Object-MoreHelpers>=0:databases/p5-Rose-DBx-Object-MoreHelpers \
diff --git a/databases/p5-Rose-DBx-Object-Renderer/pkg-descr b/databases/p5-Rose-DBx-Object-Renderer/pkg-descr
index ec3a8bfcc03b..ad67d39c78e7 100644
--- a/databases/p5-Rose-DBx-Object-Renderer/pkg-descr
+++ b/databases/p5-Rose-DBx-Object-Renderer/pkg-descr
@@ -8,5 +8,3 @@ Renderer uses CGI::FormBuilder to generate forms and the Google Chart
 API to render charts. Template::Toolkit is used for template processing,
 however, Renderer can dynamically generate a full set of UIs without
 any templates.
-
-WWW: https://metacpan.org/release/Rose-DBx-Object-Renderer
diff --git a/databases/p5-SQL-Abstract-Classic/Makefile b/databases/p5-SQL-Abstract-Classic/Makefile
index c4505ab8cef7..2af2864521d6 100644
--- a/databases/p5-SQL-Abstract-Classic/Makefile
+++ b/databases/p5-SQL-Abstract-Classic/Makefile
@@ -1,5 +1,3 @@
-# Created by: Po-Chuan Hsieh <sunpoet@FreeBSD.org>
-
 PORTNAME=	SQL-Abstract-Classic
 PORTVERSION=	1.91
 CATEGORIES=	databases perl5
@@ -8,6 +6,7 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Generate SQL from Perl data structures
+WWW=		https://metacpan.org/release/SQL-Abstract-Classic
 
 LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
diff --git a/databases/p5-SQL-Abstract-Classic/pkg-descr b/databases/p5-SQL-Abstract-Classic/pkg-descr
index d1d5d34420b8..690c1cd50409 100644
--- a/databases/p5-SQL-Abstract-Classic/pkg-descr
+++ b/databases/p5-SQL-Abstract-Classic/pkg-descr
@@ -10,5 +10,3 @@ IMO, more intuitive. The underlying idea is for this module to do what you mean,
 based on the data structures you provide it. The big advantage is that you don't
 have to modify your code every time your data changes, as this module figures it
 out.
-
-WWW: https://metacpan.org/release/SQL-Abstract-Classic
diff --git a/databases/p5-SQL-Abstract-Limit/Makefile b/databases/p5-SQL-Abstract-Limit/Makefile
index dc40443f583a..d135b3fe6db3 100644
--- a/databases/p5-SQL-Abstract-Limit/Makefile
+++ b/databases/p5-SQL-Abstract-Limit/Makefile
@@ -1,5 +1,3 @@
-# Created by: Lars Balker Rasmussen <lbr@FreeBSD.org>
-
 PORTNAME=	SQL-Abstract-Limit
 PORTVERSION=	0.143
 CATEGORIES=	databases perl5
@@ -8,6 +6,7 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	SQL Portability layer for LIMIT emulation
+WWW=		https://metacpan.org/release/SQL-Abstract-Limit
 
 LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
diff --git a/databases/p5-SQL-Abstract-Limit/pkg-descr b/databases/p5-SQL-Abstract-Limit/pkg-descr
index 52c16360e5cb..6eea3004cc61 100644
--- a/databases/p5-SQL-Abstract-Limit/pkg-descr
+++ b/databases/p5-SQL-Abstract-Limit/pkg-descr
@@ -1,3 +1 @@
 SQL portability layer for LIMIT emulation.
-
-WWW: https://metacpan.org/release/SQL-Abstract-Limit
diff --git a/databases/p5-SQL-Abstract-More/Makefile b/databases/p5-SQL-Abstract-More/Makefile
index 3d018b9a1a38..3ee4fb28b43d 100644
--- a/databases/p5-SQL-Abstract-More/Makefile
+++ b/databases/p5-SQL-Abstract-More/Makefile
@@ -1,29 +1,28 @@
-# Created by: Espen Tagestad <espen@tagestad.no>
-
 PORTNAME=	SQL-Abstract-More
-PORTVERSION=	1.37
+DISTVERSION=	1.40
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	svysh.fbsd@gmail.com
 COMMENT=	Extension of SQL::Abstract with more constructs and more flexible API
+WWW=		https://metacpan.org/release/SQL-Abstract-More
 
 LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
-LICENSE_FILE=	${WRKSRC}/README
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
 RUN_DEPENDS=	p5-MRO-Compat>0:devel/p5-MRO-Compat \
+		p5-namespace-clean>=0:devel/p5-namespace-clean \
 		p5-Params-Validate>0:devel/p5-Params-Validate \
-		p5-SQL-Abstract>=1.84:databases/p5-SQL-Abstract \
-		p5-namespace-clean>=0:devel/p5-namespace-clean
+		p5-SQL-Abstract-Classic>=1.91:databases/p5-SQL-Abstract-Classic \
+		p5-SQL-Abstract>=1.84:databases/p5-SQL-Abstract
 TEST_DEPENDS=	p5-List-MoreUtils>=0:lang/p5-List-MoreUtils \
 		p5-Test-Exception>=0:devel/p5-Test-Exception \
 		p5-Test-Pod>=0:devel/p5-Test-Pod
 
 USES=		perl5
-USE_PERL5=	configure
+USE_PERL5=	modbuild
 
 NO_ARCH=	yes
 
diff --git a/databases/p5-SQL-Abstract-More/distinfo b/databases/p5-SQL-Abstract-More/distinfo
index fce6775d2517..c21566c1eb09 100644
--- a/databases/p5-SQL-Abstract-More/distinfo
+++ b/databases/p5-SQL-Abstract-More/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1612023066
-SHA256 (SQL-Abstract-More-1.37.tar.gz) = f88095c5589b242424351eb4e319cf6545dce279b3988dcaea6f0f65e52ff2ac
-SIZE (SQL-Abstract-More-1.37.tar.gz) = 62733
+TIMESTAMP = 1700600254
+SHA256 (SQL-Abstract-More-1.40.tar.gz) = be180342158b822e7204aae8fc151d7e450694bfcc244f5fee477617e33b135d
+SIZE (SQL-Abstract-More-1.40.tar.gz) = 46185
diff --git a/databases/p5-SQL-Abstract-More/pkg-descr b/databases/p5-SQL-Abstract-More/pkg-descr
index 24a664bf0ad7..27fd45997fc1 100644
--- a/databases/p5-SQL-Abstract-More/pkg-descr
+++ b/databases/p5-SQL-Abstract-More/pkg-descr
@@ -7,5 +7,3 @@ identified.
 This module was designed for the specific needs of DBIx::DataModel, but is
 published as a standalone distribution, because it may possibly be useful for
 other needs.
-
-WWW: https://metacpan.org/release/SQL-Abstract-More
diff --git a/databases/p5-SQL-Abstract-Pg/Makefile b/databases/p5-SQL-Abstract-Pg/Makefile
index d2f06b345b95..f6b6e46a572f 100644
--- a/databases/p5-SQL-Abstract-Pg/Makefile
+++ b/databases/p5-SQL-Abstract-Pg/Makefile
@@ -1,5 +1,3 @@
-# Created by: Po-Chuan Hsieh <sunpoet@FreeBSD.org>
-
 PORTNAME=	SQL-Abstract-Pg
 PORTVERSION=	1.0
 CATEGORIES=	databases perl5
@@ -8,6 +6,7 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	PostgreSQL features for SQL::Abstract
+WWW=		https://metacpan.org/release/SQL-Abstract-Pg
 
 LICENSE=	ART20
 LICENSE_FILE=	${WRKSRC}/LICENSE
diff --git a/databases/p5-SQL-Abstract-Pg/pkg-descr b/databases/p5-SQL-Abstract-Pg/pkg-descr
index b1d4d0a153b6..dabce3c3feec 100644
--- a/databases/p5-SQL-Abstract-Pg/pkg-descr
+++ b/databases/p5-SQL-Abstract-Pg/pkg-descr
@@ -1,4 +1,2 @@
 SQL::Abstract::Pg extends SQL::Abstract with a few PostgreSQL features used by
 Mojo::Pg.
-
-WWW: https://metacpan.org/release/SQL-Abstract-Pg
diff --git a/databases/p5-SQL-Abstract-Plugin-InsertMulti/Makefile b/databases/p5-SQL-Abstract-Plugin-InsertMulti/Makefile
index 89f4ef65ec00..f6ca3288aa19 100644
--- a/databases/p5-SQL-Abstract-Plugin-InsertMulti/Makefile
+++ b/databases/p5-SQL-Abstract-Plugin-InsertMulti/Makefile
@@ -1,19 +1,20 @@
 PORTNAME=	SQL-Abstract-Plugin-InsertMulti
-PORTVERSION=	0.04
-PORTREVISION=	1
+PORTVERSION=	0.05
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension to add bulk insert for SQL::Abstract
+WWW=		https://metacpan.org/release/SQL-Abstract-Plugin-InsertMulti
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
-RUN_DEPENDS=	\
-	p5-SQL-Abstract>=1.6:databases/p5-SQL-Abstract \
-	p5-Sub-Exporter>0:devel/p5-Sub-Exporter
+RUN_DEPENDS=	p5-SQL-Abstract>=1.6:databases/p5-SQL-Abstract \
+		p5-Sub-Exporter>0:devel/p5-Sub-Exporter
 
 USES=		perl5
-USE_PERL5=	modbuild
+USE_PERL5=	modbuildtiny
+
+NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/databases/p5-SQL-Abstract-Plugin-InsertMulti/distinfo b/databases/p5-SQL-Abstract-Plugin-InsertMulti/distinfo
index 306bd4fef1d4..9087acbbe763 100644
--- a/databases/p5-SQL-Abstract-Plugin-InsertMulti/distinfo
+++ b/databases/p5-SQL-Abstract-Plugin-InsertMulti/distinfo
@@ -1,2 +1,3 @@
-SHA256 (SQL-Abstract-Plugin-InsertMulti-0.04.tar.gz) = e5ed3067830f4581d8788b98819791bf9db9f6d9e224c99f3efb08328c6c0257
-SIZE (SQL-Abstract-Plugin-InsertMulti-0.04.tar.gz) = 12808
+TIMESTAMP = 1647829337
+SHA256 (SQL-Abstract-Plugin-InsertMulti-0.05.tar.gz) = 61ef8a40634046618e04bd9e16df82bc651230894b5a6834825e27a833e9bf7f
+SIZE (SQL-Abstract-Plugin-InsertMulti-0.05.tar.gz) = 12510
diff --git a/databases/p5-SQL-Abstract-Plugin-InsertMulti/pkg-descr b/databases/p5-SQL-Abstract-Plugin-InsertMulti/pkg-descr
index 87c19f063ba2..155a0b82fa92 100644
--- a/databases/p5-SQL-Abstract-Plugin-InsertMulti/pkg-descr
+++ b/databases/p5-SQL-Abstract-Plugin-InsertMulti/pkg-descr
@@ -5,5 +5,3 @@ methods to SQL::Abstract namespace from
 SQL::Abstract::Plugin::InsertMulti.
 
 Plugin system is depends on 'into' options of Sub::Exporter.
-
-WWW: https://metacpan.org/release/SQL-Abstract-Plugin-InsertMulti
diff --git a/databases/p5-SQL-Abstract/Makefile b/databases/p5-SQL-Abstract/Makefile
index ed4f1f4c5a85..42bf0fa06e6c 100644
--- a/databases/p5-SQL-Abstract/Makefile
+++ b/databases/p5-SQL-Abstract/Makefile
@@ -1,5 +1,3 @@
-# Created by: Dominic Mitchell
-
 PORTNAME=	SQL-Abstract
 PORTVERSION=	2.000001
 CATEGORIES=	databases perl5
@@ -8,6 +6,7 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension to generate SQL from Perl data structures
+WWW=		https://metacpan.org/release/SQL-Abstract
 
 LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
diff --git a/databases/p5-SQL-Abstract/pkg-descr b/databases/p5-SQL-Abstract/pkg-descr
index 9185d16eecfa..57dccc75fe43 100644
--- a/databases/p5-SQL-Abstract/pkg-descr
+++ b/databases/p5-SQL-Abstract/pkg-descr
@@ -7,5 +7,3 @@ This module is based largely on DBIx::Abstract. However, there are
 several important differences, especially when it comes to WHERE
 clauses. I have modified the concepts used to make the SQL easier to
 generate from Perl data structures and, IMO, more intuitive.
-
-WWW: https://metacpan.org/release/SQL-Abstract
diff --git a/databases/p5-SQL-Interp/Makefile b/databases/p5-SQL-Interp/Makefile
index 7789eb4f428b..596b31daba68 100644
--- a/databases/p5-SQL-Interp/Makefile
+++ b/databases/p5-SQL-Interp/Makefile
@@ -1,5 +1,3 @@
-# Created by: Cheng-Lung Sung <clsung@FreeBSD.org>
-
 PORTNAME=	SQL-Interp
 PORTVERSION=	1.27
 CATEGORIES=	databases perl5
@@ -8,6 +6,7 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Interpolate Perl variables into SQL with DBI
+WWW=		https://metacpan.org/release/SQL-Interp
 
 LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
diff --git a/databases/p5-SQL-Interp/pkg-descr b/databases/p5-SQL-Interp/pkg-descr
index f3b316c151e4..98cf0efc8b76 100644
--- a/databases/p5-SQL-Interp/pkg-descr
+++ b/databases/p5-SQL-Interp/pkg-descr
@@ -11,5 +11,3 @@ documentation has several links on the topic.
 
 Besides the simple techniques shown above, The SQL-Interpolate
 distribution includes the optional DBIx::Interp module.
-
-WWW: https://metacpan.org/release/SQL-Interp
diff --git a/databases/p5-SQL-Maker/Makefile b/databases/p5-SQL-Maker/Makefile
index 72c72fba44c9..d96e62587ae2 100644
--- a/databases/p5-SQL-Maker/Makefile
+++ b/databases/p5-SQL-Maker/Makefile
@@ -1,12 +1,14 @@
 PORTNAME=	SQL-Maker
-PORTVERSION=	1.21
+PORTVERSION=	1.22
+PORTREVISION=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:TOKUHIROM
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension for yet another SQL builder
+WWW=		https://metacpan.org/release/SQL-Maker
 
 LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
diff --git a/databases/p5-SQL-Maker/distinfo b/databases/p5-SQL-Maker/distinfo
index f356fcaec5e2..56806b84ec89 100644
--- a/databases/p5-SQL-Maker/distinfo
+++ b/databases/p5-SQL-Maker/distinfo
@@ -1,2 +1,3 @@
-SHA256 (SQL-Maker-1.21.tar.gz) = 10e4d72d592cf19104c9d4fde0e866f0f0e2db7364a4956c1471f925cc95c9b0
-SIZE (SQL-Maker-1.21.tar.gz) = 43968
+TIMESTAMP = 1667913697
+SHA256 (SQL-Maker-1.22.tar.gz) = da6602a2f50d9bd594a6ed4ba031581eae424f07908ec9e39a0bd9781bb18b91
+SIZE (SQL-Maker-1.22.tar.gz) = 45158
diff --git a/databases/p5-SQL-Maker/pkg-descr b/databases/p5-SQL-Maker/pkg-descr
index 3b1f3bd1f417..b4c44a394898 100644
--- a/databases/p5-SQL-Maker/pkg-descr
+++ b/databases/p5-SQL-Maker/pkg-descr
@@ -1,4 +1,2 @@
 SQL::Maker is yet another SQL builder class.  It is based on
 DBIx::Skinny's SQL generator.
-
-WWW: https://metacpan.org/release/SQL-Maker
diff --git a/databases/p5-SQL-Maker/pkg-plist b/databases/p5-SQL-Maker/pkg-plist
index d338f5cb5091..6a34985e2bc1 100644
--- a/databases/p5-SQL-Maker/pkg-plist
+++ b/databases/p5-SQL-Maker/pkg-plist
@@ -13,6 +13,4 @@
 %%PERL5_MAN3%%/SQL::Maker::Plugin::InsertOnDuplicate.3.gz
 %%PERL5_MAN3%%/SQL::Maker::SQLType.3.gz
 %%PERL5_MAN3%%/SQL::Maker::Select.3.gz
-%%PERL5_MAN3%%/SQL::Maker::Select::Oracle.3.gz
 %%PERL5_MAN3%%/SQL::Maker::SelectSet.3.gz
-%%PERL5_MAN3%%/SQL::Maker::Util.3.gz
diff --git a/databases/p5-SQL-NamedPlaceholder/Makefile b/databases/p5-SQL-NamedPlaceholder/Makefile
index 9a0899f55cbb..e2e6bf15c792 100644
--- a/databases/p5-SQL-NamedPlaceholder/Makefile
+++ b/databases/p5-SQL-NamedPlaceholder/Makefile
@@ -7,6 +7,7 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	bokutin@bokut.in
 COMMENT=	Extension of placeholder
+WWW=		https://metacpan.org/release/SQL-NamedPlaceholder
 
 LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
diff --git a/databases/p5-SQL-NamedPlaceholder/pkg-descr b/databases/p5-SQL-NamedPlaceholder/pkg-descr
index 5e5c7e0e41e7..085bc7475bdc 100644
--- a/databases/p5-SQL-NamedPlaceholder/pkg-descr
+++ b/databases/p5-SQL-NamedPlaceholder/pkg-descr
@@ -1,4 +1,2 @@
 SQL::NamedPlaceholder is extension of placeholder.
 This enable more readable and robust code.
-
-WWW: https://metacpan.org/release/SQL-NamedPlaceholder
diff --git a/databases/p5-SQL-ReservedWords/Makefile b/databases/p5-SQL-ReservedWords/Makefile
index 1efee913254f..0ca4c425d32b 100644
--- a/databases/p5-SQL-ReservedWords/Makefile
+++ b/databases/p5-SQL-ReservedWords/Makefile
@@ -1,5 +1,3 @@
-# Created by: Zach Thompson <hideo@lastamericanempire.com>
-
 PORTNAME=	SQL-ReservedWords
 PORTVERSION=	0.8
 PORTREVISION=	1
@@ -9,6 +7,7 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Reserved SQL words by ANSI/ISO
+WWW=		https://metacpan.org/release/SQL-ReservedWords
 
 LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
diff --git a/databases/p5-SQL-ReservedWords/pkg-descr b/databases/p5-SQL-ReservedWords/pkg-descr
index 1030aee4ea74..de9d418724ba 100644
--- a/databases/p5-SQL-ReservedWords/pkg-descr
+++ b/databases/p5-SQL-ReservedWords/pkg-descr
@@ -1,3 +1 @@
 Determine if words are reserved by ANSI/ISO SQL standard.
-
-WWW: https://metacpan.org/release/SQL-ReservedWords
diff --git a/databases/p5-SQL-Statement/Makefile b/databases/p5-SQL-Statement/Makefile
index c7ddbf2dcf67..e71a41825ad7 100644
--- a/databases/p5-SQL-Statement/Makefile
+++ b/databases/p5-SQL-Statement/Makefile
@@ -1,5 +1,3 @@
-# Created by: wolman@cs.washington.edu
-
 PORTNAME=	SQL-Statement
 PORTVERSION=	1.414
 CATEGORIES=	databases perl5
@@ -8,6 +6,7 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl5 module for SQL parsing and processing
+WWW=		https://metacpan.org/release/SQL-Statement
 
 LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
diff --git a/databases/p5-SQL-Statement/pkg-descr b/databases/p5-SQL-Statement/pkg-descr
index 91f98a847fb1..00d23e2bce66 100644
--- a/databases/p5-SQL-Statement/pkg-descr
+++ b/databases/p5-SQL-Statement/pkg-descr
@@ -3,5 +3,3 @@ parsing an SQL query you create an SQL::Statement instance. This instance
 offers methods for retrieving syntax, for WHERE clause and statement
 evaluation.  The implementation is designed to work with the DBI driver
 DBD::CSV, and should be easily extensible.
-
-WWW: https://metacpan.org/release/SQL-Statement
diff --git a/databases/p5-SQL-Translator/Makefile b/databases/p5-SQL-Translator/Makefile
index 044a9c8fc133..bc68c6352563 100644
--- a/databases/p5-SQL-Translator/Makefile
+++ b/databases/p5-SQL-Translator/Makefile
@@ -1,13 +1,12 @@
-# Created by: Lars Thegler <lars@thegler.dk>
-
 PORTNAME=	SQL-Translator
-PORTVERSION=	1.62
+PORTVERSION=	1.65
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Manipulate structured data definitions (SQL and more)
+WWW=		https://metacpan.org/release/SQL-Translator
 
 LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
diff --git a/databases/p5-SQL-Translator/distinfo b/databases/p5-SQL-Translator/distinfo
index b5dc6ba3c10e..4694df14a22c 100644
--- a/databases/p5-SQL-Translator/distinfo
+++ b/databases/p5-SQL-Translator/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1600863398
-SHA256 (SQL-Translator-1.62.tar.gz) = 0acd4ff9ac3a2f8d5d67199aac02cdc127e03888e479c51c7bbdc21b85c1ce24
-SIZE (SQL-Translator-1.62.tar.gz) = 411750
+TIMESTAMP = 1706945415
+SHA256 (SQL-Translator-1.65.tar.gz) = 606750db6a4ebf2693aa9bc8444c998c169b76bc308f3d314ead5eac17bede4a
+SIZE (SQL-Translator-1.65.tar.gz) = 405476
diff --git a/databases/p5-SQL-Translator/pkg-descr b/databases/p5-SQL-Translator/pkg-descr
index 0bce3aac6b1c..f1564640b7a5 100644
--- a/databases/p5-SQL-Translator/pkg-descr
+++ b/databases/p5-SQL-Translator/pkg-descr
@@ -2,5 +2,3 @@ SQL::Translator is a group of Perl modules that converts vendor-specific
 SQL table definitions into other formats, such as other vendor-specific
 SQL, ER diagrams, documentation (POD and HTML), XML, and Class::DBI
 classes.
-
-WWW: https://metacpan.org/release/SQL-Translator
diff --git a/databases/p5-SQL-Translator/pkg-plist b/databases/p5-SQL-Translator/pkg-plist
index 9bff40d8bf7a..8dff1089b0e9 100644
--- a/databases/p5-SQL-Translator/pkg-plist
+++ b/databases/p5-SQL-Translator/pkg-plist
@@ -74,6 +74,7 @@ bin/sqlt-graph
 %%SITE_PERL%%/SQL/Translator/Schema/Constraint.pm
 %%SITE_PERL%%/SQL/Translator/Schema/Field.pm
 %%SITE_PERL%%/SQL/Translator/Schema/Index.pm
+%%SITE_PERL%%/SQL/Translator/Schema/IndexField.pm
 %%SITE_PERL%%/SQL/Translator/Schema/Object.pm
 %%SITE_PERL%%/SQL/Translator/Schema/Procedure.pm
 %%SITE_PERL%%/SQL/Translator/Schema/Role/Compare.pm
@@ -167,6 +168,7 @@ bin/sqlt-graph
 %%PERL5_MAN3%%/SQL::Translator::Schema::Constraint.3.gz
 %%PERL5_MAN3%%/SQL::Translator::Schema::Field.3.gz
 %%PERL5_MAN3%%/SQL::Translator::Schema::Index.3.gz
+%%PERL5_MAN3%%/SQL::Translator::Schema::IndexField.3.gz
 %%PERL5_MAN3%%/SQL::Translator::Schema::Object.3.gz
 %%PERL5_MAN3%%/SQL::Translator::Schema::Procedure.3.gz
 %%PERL5_MAN3%%/SQL::Translator::Schema::Role::Compare.3.gz
diff --git a/databases/p5-SQLite-Work/Makefile b/databases/p5-SQLite-Work/Makefile
index d67a0a1a4625..1fb21725a521 100644
--- a/databases/p5-SQLite-Work/Makefile
+++ b/databases/p5-SQLite-Work/Makefile
@@ -1,5 +1,3 @@
-# Created by: Chris Larsen <darth@vader.dk>
-
 PORTNAME=	SQLite-Work
 PORTVERSION=	0.16.01
 PORTREVISION=	1
@@ -11,6 +9,7 @@ DISTNAME=	${PORTNAME}-${PORTVERSION:R}${PORTVERSION:E}
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Report on and update an SQLite database
+WWW=		https://metacpan.org/release/SQLite-Work
 
 LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
diff --git a/databases/p5-SQLite-Work/pkg-descr b/databases/p5-SQLite-Work/pkg-descr
index 748f48468da4..8fbc3cbf1eb6 100644
--- a/databases/p5-SQLite-Work/pkg-descr
+++ b/databases/p5-SQLite-Work/pkg-descr
@@ -11,5 +11,3 @@ CGI module.
 
 The sqlreport script uses SQLite::Work to generate reports from the
 command-line.
-
-WWW: https://metacpan.org/release/SQLite-Work
diff --git a/databases/p5-Scope-Container-DBI/Makefile b/databases/p5-Scope-Container-DBI/Makefile
index 82b2c978a846..5a28e432d21f 100644
--- a/databases/p5-Scope-Container-DBI/Makefile
+++ b/databases/p5-Scope-Container-DBI/Makefile
@@ -6,6 +6,7 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	bokutin@bokut.in
 COMMENT=	DB connection manager with Scope::Container
+WWW=		https://metacpan.org/release/Scope-Container-DBI
 
 LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
diff --git a/databases/p5-Scope-Container-DBI/pkg-descr b/databases/p5-Scope-Container-DBI/pkg-descr
index 06ae74cc61c4..bb2cfcc9dab0 100644
--- a/databases/p5-Scope-Container-DBI/pkg-descr
+++ b/databases/p5-Scope-Container-DBI/pkg-descr
@@ -1,3 +1 @@
 DB connection manager with Scope::Container
-
-WWW: https://metacpan.org/release/Scope-Container-DBI
diff --git a/databases/p5-Search-InvertedIndex/Makefile b/databases/p5-Search-InvertedIndex/Makefile
index 12f10a139feb..0aaa9a2e9662 100644
--- a/databases/p5-Search-InvertedIndex/Makefile
+++ b/databases/p5-Search-InvertedIndex/Makefile
@@ -1,5 +1,3 @@
-# Created by: clsung@dragon2.net
-
 PORTNAME=	Search-InvertedIndex
 PORTVERSION=	1.17
 CATEGORIES=	databases perl5
@@ -8,6 +6,7 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Manager for inverted index maps
+WWW=		https://metacpan.org/release/Search-InvertedIndex
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
diff --git a/databases/p5-Search-InvertedIndex/pkg-descr b/databases/p5-Search-InvertedIndex/pkg-descr
index 73423f0bd15c..8184d471fc67 100644
--- a/databases/p5-Search-InvertedIndex/pkg-descr
+++ b/databases/p5-Search-InvertedIndex/pkg-descr
@@ -1,4 +1,2 @@
 A general purpose inverted indexing system suitable for medium
 scale searching.
-
-WWW: https://metacpan.org/release/Search-InvertedIndex
diff --git a/databases/p5-Search-Namazu/Makefile b/databases/p5-Search-Namazu/Makefile
index 197cc986533a..73d99e6e70f2 100644
--- a/databases/p5-Search-Namazu/Makefile
+++ b/databases/p5-Search-Namazu/Makefile
@@ -1,5 +1,3 @@
-# Created by: kuriyama
-
 PORTNAME=	Search-Namazu
 PORTVERSION=	0.96
 PORTREVISION=	5
@@ -7,8 +5,9 @@ CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Namazu library module for perl
+WWW=		https://www.akaneiro.jp/Search-Namazu/
 
 LIB_DEPENDS=	libnmz.so:databases/namazu2
 
diff --git a/databases/p5-Search-Namazu/pkg-descr b/databases/p5-Search-Namazu/pkg-descr
index 9d08e892a2c2..3f629c50e520 100644
--- a/databases/p5-Search-Namazu/pkg-descr
+++ b/databases/p5-Search-Namazu/pkg-descr
@@ -1,4 +1,2 @@
 This module is an interface for Namazu library. Namazu is an implement
 of full text retrieval search system.
-
-WWW: http://www.akaneiro.jp/Search-Namazu/
diff --git a/databases/p5-Search-Xapian/Makefile b/databases/p5-Search-Xapian/Makefile
index b89ec32e660c..32b473ee1c5a 100644
--- a/databases/p5-Search-Xapian/Makefile
+++ b/databases/p5-Search-Xapian/Makefile
@@ -1,7 +1,5 @@
-# Created by: Lars Balker Rasmussen <lbr@FreeBSD.org>
-
 PORTNAME=	Search-Xapian
-PORTVERSION=	1.2.25.4
+PORTVERSION=	1.2.25.5
 CATEGORIES=	databases perl5
 MASTER_SITES=	https://oligarchy.co.uk/xapian/${PORTVERSION:R}/ \
 		LOCAL/sunpoet \
@@ -10,6 +8,7 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Perl XS frontend to the Xapian C++ search library
+WWW=		https://metacpan.org/release/Search-Xapian
 
 LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
@@ -25,8 +24,7 @@ USE_PERL5=	configure
 CC=		${CXX}
 CONFIGURE_ARGS=	XAPIAN_CONFIG=${LOCALBASE}/bin/xapian-config
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|^if (defined $$builddir) {|if (0) {|' ${WRKSRC}/Makefile.PL
+CONFLICTS_INSTALL=	p5-Search-Xapian12 # lib/perl5/site_perl/mach/5.32/Search/Xapian.pm
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Search/Xapian/Xapian.so
diff --git a/databases/p5-Search-Xapian/distinfo b/databases/p5-Search-Xapian/distinfo
index 4c503355261a..d11c8b1fe5dd 100644
--- a/databases/p5-Search-Xapian/distinfo
+++ b/databases/p5-Search-Xapian/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1605901620
-SHA256 (Search-Xapian-1.2.25.4.tar.gz) = 871943199b80efd98e31f4b4711bb070a576c91be692193d8a43affad64574dd
-SIZE (Search-Xapian-1.2.25.4.tar.gz) = 75336
+TIMESTAMP = 1647264452
+SHA256 (Search-Xapian-1.2.25.5.tar.gz) = 204fbdc712d6711ffab668c1f4cfc007b639a9fb64ad7e19cb20fc10a910ba8b
+SIZE (Search-Xapian-1.2.25.5.tar.gz) = 74960
diff --git a/databases/p5-Search-Xapian/files/patch-Makefile.PL b/databases/p5-Search-Xapian/files/patch-Makefile.PL
new file mode 100644
index 000000000000..77d73a77d148
--- /dev/null
+++ b/databases/p5-Search-Xapian/files/patch-Makefile.PL
@@ -0,0 +1,11 @@
+--- Makefile.PL.orig	2020-11-22 06:53:13 UTC
++++ Makefile.PL
+@@ -268,7 +268,7 @@ if (scalar @bad) {
+ 
+ # If we're doing a fake VPATH build, add a stub Makefile which forwards all
+ # invocations (.DEFAULT is a GNU-make-ism).
+-if (defined $builddir) {
++if (0) {
+     open M, '>', "$builddir/Makefile~" or die $!;
+     print M <<"EOF";
+ all .DEFAULT:
diff --git a/databases/p5-Search-Xapian/pkg-descr b/databases/p5-Search-Xapian/pkg-descr
index a0b327ff2b5c..32313f7dacee 100644
--- a/databases/p5-Search-Xapian/pkg-descr
+++ b/databases/p5-Search-Xapian/pkg-descr
@@ -15,5 +15,3 @@ API documentation at http://www.xapian.org/docs/apidoc/html/annotated.html
 If you encounter problems, email either me or preferably the Xapian-discuss
 mailing list (which I am on - subscription details can be found on the Xapian
 web site).
-
-WWW: https://metacpan.org/release/Search-Xapian
diff --git a/databases/p5-Search-Xapian12/Makefile b/databases/p5-Search-Xapian12/Makefile
deleted file mode 100644
index a2fec91b721f..000000000000
--- a/databases/p5-Search-Xapian12/Makefile
+++ /dev/null
@@ -1,38 +0,0 @@
-# Created by: Lars Balker Rasmussen <lbr@FreeBSD.org>
-
-PORTNAME=	Search-Xapian
-PORTVERSION=	1.2.25.2
-CATEGORIES=	databases perl5
-MASTER_SITES=	https://oligarchy.co.uk/xapian/${PORTVERSION:R}/ \
-		LOCAL/sunpoet \
-		CPAN
-PKGNAMEPREFIX=	p5-
-PKGNAMESUFFIX=	12
-
-MAINTAINER=	sunpoet@FreeBSD.org
-COMMENT=	Perl XS frontend to the Xapian C++ search library
-
-LICENSE=	ART10 GPLv1+
-LICENSE_COMB=	dual
-
-LIB_DEPENDS=	libxapian.so:databases/xapian-core12
-TEST_DEPENDS=	p5-Devel-Leak>=0:devel/p5-Devel-Leak \
-		p5-Test-Pod>=1.14:devel/p5-Test-Pod \
-		p5-Test-Pod-Coverage>=1.04:devel/p5-Test-Pod-Coverage
-
-USES=		perl5
-USE_PERL5=	configure
-
-CC=		${CXX}
-CONFIGURE_ARGS=	XAPIAN_CONFIG=${LOCALBASE}/bin/xapian-config
-
-# later version does not support xapian-core 1.2.x
-PORTSCOUT=	ignore:1
-
-post-patch:
-	@${REINPLACE_CMD} -e 's|^if (defined $$builddir) {|if (0) {|' ${WRKSRC}/Makefile.PL
-
-post-install:
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Search/Xapian/Xapian.so
-
-.include <bsd.port.mk>
diff --git a/databases/p5-Search-Xapian12/distinfo b/databases/p5-Search-Xapian12/distinfo
deleted file mode 100644
index 3fc5711b4812..000000000000
--- a/databases/p5-Search-Xapian12/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1537451473
-SHA256 (Search-Xapian-1.2.25.2.tar.gz) = 24955a284279fdbc5a324a5b73b09585ae506932be19a7105e114834e243ea42
-SIZE (Search-Xapian-1.2.25.2.tar.gz) = 72424
diff --git a/databases/p5-Search-Xapian12/pkg-descr b/databases/p5-Search-Xapian12/pkg-descr
deleted file mode 100644
index a0b327ff2b5c..000000000000
--- a/databases/p5-Search-Xapian12/pkg-descr
+++ /dev/null
@@ -1,19 +0,0 @@
-This module wraps most methods of most Xapian classes. The missing classes and
-methods should be added in the future. It also provides a simplified, more
-'perlish' interface - as demonstrated above.
-
-The Xapian library is evolving very quickly at the time of writing, hence any
-documentation placed here would be likely to become out of date quite rapidly,
-and I do not have the patience to write some which could rapidly become
-redundant.
-
-Apologies to those of you considering using this module. For the time being, I
-would suggest garnering what you can from the tests and examples provided, or
-reading through the Xapian documentation on http://www.xapian.org/, notably the
-API documentation at http://www.xapian.org/docs/apidoc/html/annotated.html
-
-If you encounter problems, email either me or preferably the Xapian-discuss
-mailing list (which I am on - subscription details can be found on the Xapian
-web site).
-
-WWW: https://metacpan.org/release/Search-Xapian
diff --git a/databases/p5-Search-Xapian12/pkg-plist b/databases/p5-Search-Xapian12/pkg-plist
deleted file mode 100644
index e1dbd2d58c89..000000000000
--- a/databases/p5-Search-Xapian12/pkg-plist
+++ /dev/null
@@ -1,93 +0,0 @@
-%%SITE_ARCH%%/Search/Xapian.pm
-%%SITE_ARCH%%/Search/Xapian/AssertionError.pm
-%%SITE_ARCH%%/Search/Xapian/BM25Weight.pm
-%%SITE_ARCH%%/Search/Xapian/BoolWeight.pm
-%%SITE_ARCH%%/Search/Xapian/Database.pm
-%%SITE_ARCH%%/Search/Xapian/DatabaseCorruptError.pm
-%%SITE_ARCH%%/Search/Xapian/DatabaseCreateError.pm
-%%SITE_ARCH%%/Search/Xapian/DatabaseError.pm
-%%SITE_ARCH%%/Search/Xapian/DatabaseLockError.pm
-%%SITE_ARCH%%/Search/Xapian/DatabaseModifiedError.pm
-%%SITE_ARCH%%/Search/Xapian/DatabaseOpeningError.pm
-%%SITE_ARCH%%/Search/Xapian/DatabaseVersionError.pm
-%%SITE_ARCH%%/Search/Xapian/DocNotFoundError.pm
-%%SITE_ARCH%%/Search/Xapian/Document.pm
-%%SITE_ARCH%%/Search/Xapian/ESet.pm
-%%SITE_ARCH%%/Search/Xapian/ESetIterator.pm
-%%SITE_ARCH%%/Search/Xapian/Enquire.pm
-%%SITE_ARCH%%/Search/Xapian/Error.pm
-%%SITE_ARCH%%/Search/Xapian/FeatureUnavailableError.pm
-%%SITE_ARCH%%/Search/Xapian/InternalError.pm
-%%SITE_ARCH%%/Search/Xapian/InvalidArgumentError.pm
-%%SITE_ARCH%%/Search/Xapian/InvalidOperationError.pm
-%%SITE_ARCH%%/Search/Xapian/LogicError.pm
-%%SITE_ARCH%%/Search/Xapian/MSet.pm
-%%SITE_ARCH%%/Search/Xapian/MSet/Tied.pm
-%%SITE_ARCH%%/Search/Xapian/MSetIterator.pm
-%%SITE_ARCH%%/Search/Xapian/MatchSpy.pm
-%%SITE_ARCH%%/Search/Xapian/MultiValueSorter.pm
-%%SITE_ARCH%%/Search/Xapian/NetworkError.pm
-%%SITE_ARCH%%/Search/Xapian/NetworkTimeoutError.pm
-%%SITE_ARCH%%/Search/Xapian/PerlStopper.pm
-%%SITE_ARCH%%/Search/Xapian/PositionIterator.pm
-%%SITE_ARCH%%/Search/Xapian/PostingIterator.pm
-%%SITE_ARCH%%/Search/Xapian/Query.pm
-%%SITE_ARCH%%/Search/Xapian/QueryParser.pm
-%%SITE_ARCH%%/Search/Xapian/QueryParserError.pm
-%%SITE_ARCH%%/Search/Xapian/RSet.pm
-%%SITE_ARCH%%/Search/Xapian/RangeError.pm
-%%SITE_ARCH%%/Search/Xapian/RuntimeError.pm
-%%SITE_ARCH%%/Search/Xapian/SerialisationError.pm
-%%SITE_ARCH%%/Search/Xapian/SimpleStopper.pm
-%%SITE_ARCH%%/Search/Xapian/Stem.pm
-%%SITE_ARCH%%/Search/Xapian/Stopper.pm
-%%SITE_ARCH%%/Search/Xapian/TermGenerator.pm
-%%SITE_ARCH%%/Search/Xapian/TermIterator.pm
-%%SITE_ARCH%%/Search/Xapian/TradWeight.pm
-%%SITE_ARCH%%/Search/Xapian/UnimplementedError.pm
-%%SITE_ARCH%%/Search/Xapian/ValueCountMatchSpy.pm
-%%SITE_ARCH%%/Search/Xapian/ValueIterator.pm
-%%SITE_ARCH%%/Search/Xapian/Weight.pm
-%%SITE_ARCH%%/Search/Xapian/WritableDatabase.pm
-%%SITE_ARCH%%/auto/Search/Xapian/Xapian.so
-%%PERL5_MAN3%%/Search::Xapian.3.gz
-%%PERL5_MAN3%%/Search::Xapian::AssertionError.3.gz
-%%PERL5_MAN3%%/Search::Xapian::BM25Weight.3.gz
-%%PERL5_MAN3%%/Search::Xapian::BoolWeight.3.gz
-%%PERL5_MAN3%%/Search::Xapian::Database.3.gz
-%%PERL5_MAN3%%/Search::Xapian::DatabaseCorruptError.3.gz
-%%PERL5_MAN3%%/Search::Xapian::DatabaseCreateError.3.gz
-%%PERL5_MAN3%%/Search::Xapian::DatabaseError.3.gz
-%%PERL5_MAN3%%/Search::Xapian::DatabaseLockError.3.gz
-%%PERL5_MAN3%%/Search::Xapian::DatabaseModifiedError.3.gz
-%%PERL5_MAN3%%/Search::Xapian::DatabaseOpeningError.3.gz
-%%PERL5_MAN3%%/Search::Xapian::DatabaseVersionError.3.gz
-%%PERL5_MAN3%%/Search::Xapian::DocNotFoundError.3.gz
-%%PERL5_MAN3%%/Search::Xapian::Document.3.gz
-%%PERL5_MAN3%%/Search::Xapian::Enquire.3.gz
-%%PERL5_MAN3%%/Search::Xapian::Error.3.gz
-%%PERL5_MAN3%%/Search::Xapian::FeatureUnavailableError.3.gz
-%%PERL5_MAN3%%/Search::Xapian::InternalError.3.gz
-%%PERL5_MAN3%%/Search::Xapian::InvalidArgumentError.3.gz
-%%PERL5_MAN3%%/Search::Xapian::InvalidOperationError.3.gz
-%%PERL5_MAN3%%/Search::Xapian::LogicError.3.gz
-%%PERL5_MAN3%%/Search::Xapian::MatchSpy.3.gz
-%%PERL5_MAN3%%/Search::Xapian::MultiValueSorter.3.gz
-%%PERL5_MAN3%%/Search::Xapian::NetworkError.3.gz
-%%PERL5_MAN3%%/Search::Xapian::NetworkTimeoutError.3.gz
-%%PERL5_MAN3%%/Search::Xapian::PositionIterator.3.gz
-%%PERL5_MAN3%%/Search::Xapian::PostingIterator.3.gz
-%%PERL5_MAN3%%/Search::Xapian::QueryParser.3.gz
-%%PERL5_MAN3%%/Search::Xapian::QueryParserError.3.gz
-%%PERL5_MAN3%%/Search::Xapian::RangeError.3.gz
-%%PERL5_MAN3%%/Search::Xapian::RuntimeError.3.gz
-%%PERL5_MAN3%%/Search::Xapian::SerialisationError.3.gz
-%%PERL5_MAN3%%/Search::Xapian::Stem.3.gz
-%%PERL5_MAN3%%/Search::Xapian::TermGenerator.3.gz
-%%PERL5_MAN3%%/Search::Xapian::TermIterator.3.gz
-%%PERL5_MAN3%%/Search::Xapian::TradWeight.3.gz
-%%PERL5_MAN3%%/Search::Xapian::UnimplementedError.3.gz
-%%PERL5_MAN3%%/Search::Xapian::ValueCountMatchSpy.3.gz
-%%PERL5_MAN3%%/Search::Xapian::ValueIterator.3.gz
-%%PERL5_MAN3%%/Search::Xapian::Weight.3.gz
-%%PERL5_MAN3%%/Search::Xapian::WritableDatabase.3.gz
diff --git a/databases/p5-Store-CouchDB/Makefile b/databases/p5-Store-CouchDB/Makefile
index 70954b6ad3ab..73f3f7fd991b 100644
--- a/databases/p5-Store-CouchDB/Makefile
+++ b/databases/p5-Store-CouchDB/Makefile
@@ -7,6 +7,7 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	dch@FreeBSD.org
 COMMENT=	Perl interface to Apache CouchDB
+WWW=		https://metacpan.org/release/Store-CouchDB
 
 LICENSE=	ART10
 
diff --git a/databases/p5-Store-CouchDB/pkg-descr b/databases/p5-Store-CouchDB/pkg-descr
index bb95d76dc07b..f066f1769238 100644
--- a/databases/p5-Store-CouchDB/pkg-descr
+++ b/databases/p5-Store-CouchDB/pkg-descr
@@ -1,4 +1,2 @@
 Store::CouchDB provides a simple perlish interface for working with
 Apache CouchDB.
-
-WWW: https://metacpan.org/release/Store-CouchDB
diff --git a/databases/p5-T2/Makefile b/databases/p5-T2/Makefile
index 7dce6ecb686d..2e09cbd6e617 100644
--- a/databases/p5-T2/Makefile
+++ b/databases/p5-T2/Makefile
@@ -1,5 +1,3 @@
-# Created by: Scott McWhirter <scott@surreytech.co.uk>
-
 PORTNAME=	T2
 PORTVERSION=	0.10
 PORTREVISION=	3
@@ -10,6 +8,7 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Object Relational mapping system
+WWW=		https://metacpan.org/release/SAMV/T2-0.10
 
 LICENSE=	ART10 GPLv2
 LICENSE_COMB=	dual
diff --git a/databases/p5-T2/pkg-descr b/databases/p5-T2/pkg-descr
index e807c68afc07..1f9ad6442e3a 100644
--- a/databases/p5-T2/pkg-descr
+++ b/databases/p5-T2/pkg-descr
@@ -18,5 +18,3 @@ If you are familiar with DBI, it is somewhat similar to bless'ing the
 structures returned by $dbh->fetchrow_hashref, except that references and
 collections to other objects in the store are loaded `on demand' (aka
 Lazy-loading).
-
-WWW: https://metacpan.org/release/SAMV/T2-0.10
diff --git a/databases/p5-Tangram/Makefile b/databases/p5-Tangram/Makefile
index dc9cc67cb8db..43adf2790ef4 100644
--- a/databases/p5-Tangram/Makefile
+++ b/databases/p5-Tangram/Makefile
@@ -1,5 +1,3 @@
-# Created by: Sergey Skvortsov <skv@protey.ru>
-
 PORTNAME=	Tangram
 PORTVERSION=	2.12
 CATEGORIES=	databases perl5
@@ -8,6 +6,7 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Orthogonal Object Persistence in Relational Databases
+WWW=		https://metacpan.org/release/Tangram
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
diff --git a/databases/p5-Tangram/pkg-descr b/databases/p5-Tangram/pkg-descr
index 4d38aa4c4bc9..b1be6fa0eff6 100644
--- a/databases/p5-Tangram/pkg-descr
+++ b/databases/p5-Tangram/pkg-descr
@@ -4,5 +4,3 @@ Tangram fully supports object-oriented programming, including polymorphism,
 multiple inheritance and collections.  It does so in an orthogonal fashion,
 that is, it doesn't require your classes to implement support functions nor
 inherit from a utility class.
-
-WWW: https://metacpan.org/release/Tangram
diff --git a/databases/p5-Template-DBI/Makefile b/databases/p5-Template-DBI/Makefile
index 746ff4da327c..b2446e09bb03 100644
--- a/databases/p5-Template-DBI/Makefile
+++ b/databases/p5-Template-DBI/Makefile
@@ -1,5 +1,3 @@
-# Created by: Anton Berezin <tobez@FreeBSD.org>
-
 PORTNAME=	Template-DBI
 PORTVERSION=	2.65
 PORTREVISION=	1
@@ -9,6 +7,7 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Template interface to the DBI Perl module
+WWW=		https://metacpan.org/release/Template-DBI
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
 RUN_DEPENDS=	p5-Template-Toolkit>=0:www/p5-Template-Toolkit \
diff --git a/databases/p5-Template-DBI/pkg-descr b/databases/p5-Template-DBI/pkg-descr
index 46fb4951d927..1f6f34c07e99 100644
--- a/databases/p5-Template-DBI/pkg-descr
+++ b/databases/p5-Template-DBI/pkg-descr
@@ -3,5 +3,3 @@ DBI/DBD modules, allowing you to integrate SQL queries into your
 template documents.  It also provides an interface via the Tie::DBI
 module (if installed on your system) so that you can access database
 records without having to embed any SQL in your templates.
-
-WWW: https://metacpan.org/release/Template-DBI
diff --git a/databases/p5-Teng/Makefile b/databases/p5-Teng/Makefile
index db7434625bda..7563d218b5e4 100644
--- a/databases/p5-Teng/Makefile
+++ b/databases/p5-Teng/Makefile
@@ -1,12 +1,13 @@
 PORTNAME=	Teng
-PORTVERSION=	0.28
+PORTVERSION=	0.34
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	CPAN:SATOH
+MASTER_SITE_SUBDIR=	CPAN:ANATOFUZ
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension for simple DBI wrapper/ORMapper
+WWW=		https://metacpan.org/release/Teng
 
 LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
@@ -30,7 +31,7 @@ TEST_DEPENDS=	\
 	p5-Class-Method-Modifiers>0:devel/p5-Class-Method-Modifiers
 
 USES=		perl5
-USE_PERL5=	modbuild
+USE_PERL5=	modbuildtiny
 NO_ARCH=	YES
 
 .include <bsd.port.mk>
diff --git a/databases/p5-Teng/distinfo b/databases/p5-Teng/distinfo
index a2f376b7a248..f0f7c0027e38 100644
--- a/databases/p5-Teng/distinfo
+++ b/databases/p5-Teng/distinfo
@@ -1,2 +1,3 @@
-SHA256 (Teng-0.28.tar.gz) = c21bc6e84a6011139e4de4fe8112d1bc293fe80484ed47cc3b0a28d6e82357d9
-SIZE (Teng-0.28.tar.gz) = 62405
+TIMESTAMP = 1694691125
+SHA256 (Teng-0.34.tar.gz) = 72849702975bb813992584258065375606bbb4afb7dfdf001208583e734db92b
+SIZE (Teng-0.34.tar.gz) = 65939
diff --git a/databases/p5-Teng/pkg-descr b/databases/p5-Teng/pkg-descr
index 558cda4c9d70..5407d597edc7 100644
--- a/databases/p5-Teng/pkg-descr
+++ b/databases/p5-Teng/pkg-descr
@@ -1,4 +1,2 @@
 Teng is very simple DBI wrapper and simple O/R Mapper.  It aims to be
 lightweight, with minimal dependencies so it's easier to install.
-
-WWW: https://metacpan.org/release/Teng
diff --git a/databases/p5-Test-Cukes/Makefile b/databases/p5-Test-Cukes/Makefile
index 1015644daf28..78a432ccbe69 100644
--- a/databases/p5-Test-Cukes/Makefile
+++ b/databases/p5-Test-Cukes/Makefile
@@ -1,13 +1,13 @@
-# Created by: Wen Heping <wenheping@gmail.com>
-
 PORTNAME=	Test-Cukes
 PORTVERSION=	0.11
+PORTREVISION=	1
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	wen@FreeBSD.org
 COMMENT=	BBD test tool inspired by Cucumber
+WWW=		https://metacpan.org/release/Test-Cukes
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
 RUN_DEPENDS=	p5-Moose>=0:devel/p5-Moose \
@@ -18,4 +18,6 @@ RUN_DEPENDS=	p5-Moose>=0:devel/p5-Moose \
 USES=		perl5
 USE_PERL5=	modbuildtiny
 
+NO_ARCH=	yes
+
 .include <bsd.port.mk>
diff --git a/databases/p5-Test-Cukes/pkg-descr b/databases/p5-Test-Cukes/pkg-descr
index 6d86a2bcd6a6..ea708b27c936 100644
--- a/databases/p5-Test-Cukes/pkg-descr
+++ b/databases/p5-Test-Cukes/pkg-descr
@@ -1,3 +1 @@
 Test::Cukes is a BBD test tool inspired by Cucumber.
-
-WWW: https://metacpan.org/release/Test-Cukes
diff --git a/databases/p5-Test-Cukes/pkg-plist b/databases/p5-Test-Cukes/pkg-plist
index 36c262566799..39d69be5a6d4 100644
--- a/databases/p5-Test-Cukes/pkg-plist
+++ b/databases/p5-Test-Cukes/pkg-plist
@@ -2,5 +2,3 @@
 %%SITE_PERL%%/Test/Cukes/Feature.pm
 %%SITE_PERL%%/Test/Cukes/Scenario.pm
 %%PERL5_MAN3%%/Test::Cukes.3.gz
-%%PERL5_MAN3%%/Test::Cukes::Feature.3.gz
-%%PERL5_MAN3%%/Test::Cukes::Scenario.3.gz
diff --git a/databases/p5-Test-Database/Makefile b/databases/p5-Test-Database/Makefile
index 15a7ab66c5c3..7c7fa43cd14b 100644
--- a/databases/p5-Test-Database/Makefile
+++ b/databases/p5-Test-Database/Makefile
@@ -1,5 +1,3 @@
-# Created by: Wen Heping <wenheping@gmail.com>
-
 PORTNAME=	Test-Database
 PORTVERSION=	1.113
 PORTREVISION=	1
@@ -9,6 +7,7 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Database handles ready for testing
+WWW=		https://metacpan.org/release/Test-Database
 
 LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
diff --git a/databases/p5-Test-Database/pkg-descr b/databases/p5-Test-Database/pkg-descr
index 25a72b98b06c..245cd96fbc0c 100644
--- a/databases/p5-Test-Database/pkg-descr
+++ b/databases/p5-Test-Database/pkg-descr
@@ -5,5 +5,3 @@ install and each and every time they upgrade.
 Test::Database provides a simple way for test authors to request
 a test database, without worrying about environment variables or the
 test host configuration.
-
-WWW: https://metacpan.org/release/Test-Database
diff --git a/databases/p5-Test-DatabaseRow/Makefile b/databases/p5-Test-DatabaseRow/Makefile
index 9b099103186d..ad3f9277be05 100644
--- a/databases/p5-Test-DatabaseRow/Makefile
+++ b/databases/p5-Test-DatabaseRow/Makefile
@@ -1,5 +1,3 @@
-# Created by: Joshua D. Abraham <jabra@ccs.neu.edu>
-
 PORTNAME=	Test-DatabaseRow
 PORTVERSION=	2.04
 CATEGORIES=	databases perl5
@@ -8,6 +6,7 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Simple database tests
+WWW=		https://metacpan.org/release/Test-DatabaseRow
 
 LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
diff --git a/databases/p5-Test-DatabaseRow/pkg-descr b/databases/p5-Test-DatabaseRow/pkg-descr
index 28cf3ca79846..4a76166d0969 100644
--- a/databases/p5-Test-DatabaseRow/pkg-descr
+++ b/databases/p5-Test-DatabaseRow/pkg-descr
@@ -3,5 +3,3 @@ database, primarily designed to test if a row exists with the correct
 details in a table or not. For more advanced testing (joins, etc) it's
 probably easier for you to roll your own tests by hand than use this
 module.
-
-WWW: https://metacpan.org/release/Test-DatabaseRow
diff --git a/databases/p5-Test-Fixture-DBI/Makefile b/databases/p5-Test-Fixture-DBI/Makefile
index ae144d38a0a6..c10b9ccd8c2d 100644
--- a/databases/p5-Test-Fixture-DBI/Makefile
+++ b/databases/p5-Test-Fixture-DBI/Makefile
@@ -5,8 +5,9 @@ CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension to load fixture data into database
+WWW=		https://metacpan.org/release/Test-Fixture-DBI
 
 LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
diff --git a/databases/p5-Test-Fixture-DBI/pkg-descr b/databases/p5-Test-Fixture-DBI/pkg-descr
index e03e0a5f1f08..dd5166d1f441 100644
--- a/databases/p5-Test-Fixture-DBI/pkg-descr
+++ b/databases/p5-Test-Fixture-DBI/pkg-descr
@@ -1,3 +1 @@
 Test::Fixture::DBI is fixture test library for DBI.
-
-WWW: https://metacpan.org/release/Test-Fixture-DBI
diff --git a/databases/p5-Test-mysqld/Makefile b/databases/p5-Test-mysqld/Makefile
index 137149e925b4..c7a9fe9f398f 100644
--- a/databases/p5-Test-mysqld/Makefile
+++ b/databases/p5-Test-mysqld/Makefile
@@ -1,21 +1,36 @@
 PORTNAME=	Test-mysqld
-PORTVERSION=	0.17
-PORTREVISION=	1
+PORTVERSION=	1.0030
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension for mysqld test runner
+WWW=		https://metacpan.org/release/Test-mysqld
+
+LICENSE=	ART10 GPLv1+
+LICENSE_COMB=	dual
+LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
-RUN_DEPENDS=	\
-	p5-Class-Accessor-Lite>0:devel/p5-Class-Accessor-Lite \
-	p5-File-Copy-Recursive>0:devel/p5-File-Copy-Recursive \
-	p5-DBD-mysql>=0:databases/p5-DBD-mysql \
-	p5-Test-SharedFork>=0.06:devel/p5-Test-SharedFork
-
-USES=		perl5
-USE_PERL5=	configure
+RUN_DEPENDS=	p5-Class-Accessor-Lite>=0:devel/p5-Class-Accessor-Lite \
+		p5-DBI>=0:databases/p5-DBI \
+		p5-File-Copy-Recursive>=0:devel/p5-File-Copy-Recursive
+TEST_DEPENDS=	p5-Test-SharedFork>=0:devel/p5-Test-SharedFork
+
+USES=		mysql perl5
+USE_PERL5=	modbuildtiny
+
+NO_ARCH=	yes
+
+OPTIONS_SINGLE=	DB
+OPTIONS_SINGLE_DB=	MARIADB MYSQL
+OPTIONS_DEFAULT=MYSQL
+MARIADB_DESC=	MariaDB database support
+
+MARIADB_BUILD_DEPENDS=	p5-DBD-MariaDB>=0:databases/p5-DBD-MariaDB
+MARIADB_RUN_DEPENDS=	p5-DBD-MariaDB>=0:databases/p5-DBD-MariaDB
+MYSQL_BUILD_DEPENDS=	${DBD_MYSQL}
+MYSQL_RUN_DEPENDS=	${DBD_MYSQL}
 
 .include <bsd.port.mk>
diff --git a/databases/p5-Test-mysqld/distinfo b/databases/p5-Test-mysqld/distinfo
index 0c035346e9fb..fcd338f7b525 100644
--- a/databases/p5-Test-mysqld/distinfo
+++ b/databases/p5-Test-mysqld/distinfo
@@ -1,2 +1,3 @@
-SHA256 (Test-mysqld-0.17.tar.gz) = 824b87ab511b308ffb2f3f41f7ca5b41e39767f533a9b1a416a034362b1fd497
-SIZE (Test-mysqld-0.17.tar.gz) = 22861
+TIMESTAMP = 1712428000
+SHA256 (Test-mysqld-1.0030.tar.gz) = 45d26088eca2971752b4fbcd350f2cf3e0e54295fd93b74e1132e16152d00c03
+SIZE (Test-mysqld-1.0030.tar.gz) = 17462
diff --git a/databases/p5-Test-mysqld/pkg-descr b/databases/p5-Test-mysqld/pkg-descr
index aa59f1ec402c..5e8878371a34 100644
--- a/databases/p5-Test-mysqld/pkg-descr
+++ b/databases/p5-Test-mysqld/pkg-descr
@@ -1,4 +1,2 @@
 Test::mysqld automatically setups a mysqld instance in a temporary
 directory, and destroys it when the perl script exits.
-
-WWW: https://metacpan.org/release/Test-mysqld
diff --git a/databases/p5-Test-postgresql/Makefile b/databases/p5-Test-postgresql/Makefile
index de0a23ab8ba8..bb1c39879224 100644
--- a/databases/p5-Test-postgresql/Makefile
+++ b/databases/p5-Test-postgresql/Makefile
@@ -5,8 +5,9 @@ CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension of postgresql runner for tests
+WWW=		https://metacpan.org/release/SYSPETE/Test-postgresql-0.091
 
 LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
diff --git a/databases/p5-Test-postgresql/pkg-descr b/databases/p5-Test-postgresql/pkg-descr
index c2038e8a139a..19d695c3bd6b 100644
--- a/databases/p5-Test-postgresql/pkg-descr
+++ b/databases/p5-Test-postgresql/pkg-descr
@@ -1,4 +1,2 @@
 Test::postgresql automatically setups a postgresql instance in a
 temporary directory, and destroys it when the perl script exits.
-
-WWW: https://metacpan.org/release/SYSPETE/Test-postgresql-0.091
diff --git a/databases/p5-Text-Query-SQL/Makefile b/databases/p5-Text-Query-SQL/Makefile
index 15f306d69e2b..774978f05d5e 100644
--- a/databases/p5-Text-Query-SQL/Makefile
+++ b/databases/p5-Text-Query-SQL/Makefile
@@ -1,5 +1,3 @@
-# Created by: Anton Berezin <tobez@tobez.org>
-
 PORTNAME=	Text-Query-SQL
 PORTVERSION=	0.09
 PORTREVISION=	1
@@ -9,6 +7,7 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Text-Query-SQL provides query builders for SQL databases
+WWW=		https://metacpan.org/release/Text-Query-SQL
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
 RUN_DEPENDS=	p5-Text-Query>=0:textproc/p5-Text-Query
diff --git a/databases/p5-Text-Query-SQL/pkg-descr b/databases/p5-Text-Query-SQL/pkg-descr
index ffeb9b151cf5..675807b1b5bb 100644
--- a/databases/p5-Text-Query-SQL/pkg-descr
+++ b/databases/p5-Text-Query-SQL/pkg-descr
@@ -3,5 +3,3 @@ and bar' will retrieve rows containing the words foo and bar. It does it
 by generating the appropriate SQL request.
 
 Text-Query-SQL is derived from the Text-Query module.
-
-WWW: https://metacpan.org/release/Text-Query-SQL
diff --git a/databases/p5-Text-xSV/Makefile b/databases/p5-Text-xSV/Makefile
index e603dcd00813..d66f6d0746f1 100644
--- a/databases/p5-Text-xSV/Makefile
+++ b/databases/p5-Text-xSV/Makefile
@@ -1,5 +1,3 @@
-# Created by: Dmitry Liakh <dliakh@ukr.net>
-
 PORTNAME=	Text-xSV
 PORTVERSION=	0.21
 PORTREVISION=	1
@@ -9,6 +7,7 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	dliakh@ukr.net
 COMMENT=	Read character separated files
+WWW=		https://metacpan.org/release/Text-xSV
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/databases/p5-Text-xSV/pkg-descr b/databases/p5-Text-xSV/pkg-descr
index a8ade9a2d177..3841f80e1514 100644
--- a/databases/p5-Text-xSV/pkg-descr
+++ b/databases/p5-Text-xSV/pkg-descr
@@ -1,4 +1,2 @@
 This module is for reading and writing a common variation of character
 separated data.
-
-WWW: https://metacpan.org/release/Text-xSV
diff --git a/databases/p5-Tie-DBI/Makefile b/databases/p5-Tie-DBI/Makefile
index 70365080c735..6053da84a03f 100644
--- a/databases/p5-Tie-DBI/Makefile
+++ b/databases/p5-Tie-DBI/Makefile
@@ -1,5 +1,3 @@
-# Created by: clive
-
 PORTNAME=	Tie-DBI
 PORTVERSION=	1.08
 CATEGORIES=	databases perl5
@@ -8,6 +6,7 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl module implementing Tie hash to a DBI handle
+WWW=		https://metacpan.org/release/Tie-DBI
 
 LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
diff --git a/databases/p5-Tie-DBI/pkg-descr b/databases/p5-Tie-DBI/pkg-descr
index 01f3d0e30900..6fbf5f949eca 100644
--- a/databases/p5-Tie-DBI/pkg-descr
+++ b/databases/p5-Tie-DBI/pkg-descr
@@ -1,3 +1 @@
 Tie::DBI is a perl module implementing Tie hash to a DBI handle.
-
-WWW: https://metacpan.org/release/Tie-DBI
diff --git a/databases/p5-Tie-LevelDB/Makefile b/databases/p5-Tie-LevelDB/Makefile
index 98691d92f36c..a2fae8b2943f 100644
--- a/databases/p5-Tie-LevelDB/Makefile
+++ b/databases/p5-Tie-LevelDB/Makefile
@@ -1,5 +1,3 @@
-# Created by: Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>
-
 PORTNAME=	Tie-LevelDB
 PORTVERSION=	0.07
 PORTREVISION=	6
@@ -9,13 +7,13 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Perl Interface to the Google LevelDB NoSQL database
+WWW=		https://metacpan.org/release/Tie-LevelDB
 
 LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
 
 NOT_FOR_ARCHS=		aarch64 riscv64
 NOT_FOR_ARCHS_REASON=	does not build: Please implement AtomicPointer for this platform
-BROKEN_sparc64=	does not build: unrecognized command line options
 
 LIB_DEPENDS=	libleveldb.so:databases/leveldb
 
diff --git a/databases/p5-Tie-LevelDB/pkg-descr b/databases/p5-Tie-LevelDB/pkg-descr
index f8b3f1ecc71a..0938bad27afd 100644
--- a/databases/p5-Tie-LevelDB/pkg-descr
+++ b/databases/p5-Tie-LevelDB/pkg-descr
@@ -3,5 +3,3 @@ http://code.google.com/p/leveldb/ for more details.
 
 Interface is implemented both as a reflection of an original LevelDB C++ API and
 a Perl-ish TIEHASH mechanism.
-
-WWW: https://metacpan.org/release/Tie-LevelDB
diff --git a/databases/p5-Time-Piece-MySQL/Makefile b/databases/p5-Time-Piece-MySQL/Makefile
index 877eefb3dc68..f3316f299de3 100644
--- a/databases/p5-Time-Piece-MySQL/Makefile
+++ b/databases/p5-Time-Piece-MySQL/Makefile
@@ -1,5 +1,3 @@
-# Created by: Akinori MUSHA aka knu <knu@idaemons.org>
-
 PORTNAME=	Time-Piece-MySQL
 PORTVERSION=	0.06
 PORTREVISION=	2
@@ -9,6 +7,7 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	MySQL-specific methods for Time::Piece Perl module
+WWW=		https://metacpan.org/release/Time-Piece-MySQL
 
 LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
diff --git a/databases/p5-Time-Piece-MySQL/pkg-descr b/databases/p5-Time-Piece-MySQL/pkg-descr
index d86f19f26eb8..e135624ed019 100644
--- a/databases/p5-Time-Piece-MySQL/pkg-descr
+++ b/databases/p5-Time-Piece-MySQL/pkg-descr
@@ -1,4 +1,2 @@
 Using this module instead of, or in addition to Time::Piece adds a few
 MySQL-specific date/time methods to Time::Piece objects.
-
-WWW: https://metacpan.org/release/Time-Piece-MySQL
diff --git a/databases/p5-TokyoCabinet/Makefile b/databases/p5-TokyoCabinet/Makefile
index 3553fcc20bf5..575368e5c673 100644
--- a/databases/p5-TokyoCabinet/Makefile
+++ b/databases/p5-TokyoCabinet/Makefile
@@ -7,8 +7,9 @@ MASTER_SITES=	LOCAL/kuriyama \
 PKGNAMEPREFIX=	p5-
 DISTNAME=	tokyocabinet-perl-${PORTVERSION}
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension for TokyoCabinet
+WWW=		https://dbmx.net/tokyocabinet/
 
 LIB_DEPENDS=	libtokyocabinet.so:databases/tokyocabinet
 
diff --git a/databases/p5-TokyoCabinet/pkg-descr b/databases/p5-TokyoCabinet/pkg-descr
index 066a9dfa7528..0e4990b6d099 100644
--- a/databases/p5-TokyoCabinet/pkg-descr
+++ b/databases/p5-TokyoCabinet/pkg-descr
@@ -1,3 +1 @@
 Perl extension for TokyoCabinet.
-
-WWW: https://dbmx.net/tokyocabinet/
diff --git a/databases/p5-Xapian/Makefile b/databases/p5-Xapian/Makefile
index f8f71399637c..d1decc498b76 100644
--- a/databases/p5-Xapian/Makefile
+++ b/databases/p5-Xapian/Makefile
@@ -1,7 +1,5 @@
-# Created by: Po-Chuan Hsieh <sunpoet@FreeBSD.org>
-
 PORTNAME=	Xapian
-PORTVERSION=	1.4.18.0
+PORTVERSION=	1.4.25.0
 CATEGORIES=	databases perl5
 MASTER_SITES=	https://oligarchy.co.uk/xapian/${PORTVERSION:R}/ \
 		LOCAL/sunpoet
@@ -10,6 +8,7 @@ DISTNAME=	xapian-bindings-${PORTVERSION:R}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Perl binding for Xapian
+WWW=		https://xapian.org/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
@@ -28,7 +27,6 @@ CONFIGURE_ARGS=	--datarootdir=${DATADIR} \
 		--without-java \
 		--without-lua \
 		--without-php \
-		--without-php7 \
 		--without-python \
 		--without-python3 \
 		--without-ruby \
@@ -38,17 +36,11 @@ INSTALL_TARGET=	install-strip
 LDFLAGS+=	-L${LOCALBASE}/lib/perl5/${PERL_VER}/mach/CORE -lperl
 USE_CXXSTD=	c++11
 
-PORTDOCS=	*
-
 PORTSCOUT=	limitw:1,even
 
 OPTIONS_DEFINE=	DOCS
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|-lstdc++||g' ${WRKSRC}/configure
-
-post-patch-DOCS-off:
-	@${REINPLACE_CMD} -e 's| install-dist_exampledataDATA install-docdataDATA||' ${WRKSRC}/perl/Makefile.in
+DOCS_EXTRA_PATCHES_OFF=	${PATCHDIR}/extra-patch-perl-Makefile.in
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Xapian/Xapian.so
diff --git a/databases/p5-Xapian/distinfo b/databases/p5-Xapian/distinfo
index 8e9c9b5fa0f1..d7e8145d708e 100644
--- a/databases/p5-Xapian/distinfo
+++ b/databases/p5-Xapian/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1611665349
-SHA256 (xapian-bindings-1.4.18.tar.xz) = fe52064e90d202f7819130ae3ad013c8b2b9cb517ad9fd607cf41d0110c5f18f
-SIZE (xapian-bindings-1.4.18.tar.xz) = 1135644
+TIMESTAMP = 1710712354
+SHA256 (xapian-bindings-1.4.25.tar.xz) = 068314fca3f54524701492df432fa54c485fd4e39613ca2cd275e136964e81a9
+SIZE (xapian-bindings-1.4.25.tar.xz) = 1076644
diff --git a/databases/p5-Xapian/files/extra-patch-perl-Makefile.in b/databases/p5-Xapian/files/extra-patch-perl-Makefile.in
new file mode 100644
index 000000000000..ee0759f46388
--- /dev/null
+++ b/databases/p5-Xapian/files/extra-patch-perl-Makefile.in
@@ -0,0 +1,13 @@
+--- perl/Makefile.in.orig	2024-03-07 22:58:53 UTC
++++ perl/Makefile.in
+@@ -1379,8 +1379,8 @@ info-am:
+ 
+ info-am:
+ 
+-install-data-am: install-data-local install-dist_exampledataDATA \
+-	install-docdataDATA install-nobase_dist_perllibDATA \
++install-data-am: \
++	install-nobase_dist_perllibDATA \
+ 	install-perlarchLTLIBRARIES
+ 	@$(NORMAL_INSTALL)
+ 	$(MAKE) $(AM_MAKEFLAGS) install-data-hook
diff --git a/databases/p5-Xapian/files/patch-configure b/databases/p5-Xapian/files/patch-configure
new file mode 100644
index 000000000000..448fb0b83e91
--- /dev/null
+++ b/databases/p5-Xapian/files/patch-configure
@@ -0,0 +1,11 @@
+--- configure.orig	2023-07-07 02:00:23 UTC
++++ configure
+@@ -21048,7 +21048,7 @@ SWIG_CXXFLAGS=
+ if test yes = "$GXX" ; then
+                     SWIG_CXXFLAGS="-fno-strict-aliasing"
+ 
+-              XAPIAN_LIBS="$XAPIAN_LIBS -lstdc++"
++              XAPIAN_LIBS="$XAPIAN_LIBS"
+ 
+ 
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
diff --git a/databases/p5-Xapian/pkg-descr b/databases/p5-Xapian/pkg-descr
index 3e9226b569d5..f0a5cd65e2d0 100644
--- a/databases/p5-Xapian/pkg-descr
+++ b/databases/p5-Xapian/pkg-descr
@@ -6,5 +6,3 @@ The Xapian library is evolving very quickly at the time of writing, hence any
 documentation placed here would be likely to become out of date quite rapidly,
 and I do not have the patience to write some which could rapidly become
 redundant.
-
-WWW: https://xapian.org/
diff --git a/databases/p5-Xapian/pkg-plist b/databases/p5-Xapian/pkg-plist
index 6d69f4dbaa53..796d866c73a1 100644
--- a/databases/p5-Xapian/pkg-plist
+++ b/databases/p5-Xapian/pkg-plist
@@ -46,3 +46,55 @@
 %%SITE_PERL%%/Xapian/WritableDatabase.pm
 %%SITE_ARCH%%/auto/Xapian/Xapian.a
 %%SITE_ARCH%%/auto/Xapian/Xapian.so
+%%PORTDOCS%%%%DOCSDIR%%/perl/Xapian.html
+%%PORTDOCS%%%%DOCSDIR%%/perl/Xapian/AssertionError.html
+%%PORTDOCS%%%%DOCSDIR%%/perl/Xapian/BM25Weight.html
+%%PORTDOCS%%%%DOCSDIR%%/perl/Xapian/BoolWeight.html
+%%PORTDOCS%%%%DOCSDIR%%/perl/Xapian/Database.html
+%%PORTDOCS%%%%DOCSDIR%%/perl/Xapian/DatabaseCorruptError.html
+%%PORTDOCS%%%%DOCSDIR%%/perl/Xapian/DatabaseCreateError.html
+%%PORTDOCS%%%%DOCSDIR%%/perl/Xapian/DatabaseError.html
+%%PORTDOCS%%%%DOCSDIR%%/perl/Xapian/DatabaseLockError.html
+%%PORTDOCS%%%%DOCSDIR%%/perl/Xapian/DatabaseModifiedError.html
+%%PORTDOCS%%%%DOCSDIR%%/perl/Xapian/DatabaseOpeningError.html
+%%PORTDOCS%%%%DOCSDIR%%/perl/Xapian/DatabaseVersionError.html
+%%PORTDOCS%%%%DOCSDIR%%/perl/Xapian/DocNotFoundError.html
+%%PORTDOCS%%%%DOCSDIR%%/perl/Xapian/Document.html
+%%PORTDOCS%%%%DOCSDIR%%/perl/Xapian/ESet.html
+%%PORTDOCS%%%%DOCSDIR%%/perl/Xapian/ESetIterator.html
+%%PORTDOCS%%%%DOCSDIR%%/perl/Xapian/Enquire.html
+%%PORTDOCS%%%%DOCSDIR%%/perl/Xapian/Error.html
+%%PORTDOCS%%%%DOCSDIR%%/perl/Xapian/FeatureUnavailableError.html
+%%PORTDOCS%%%%DOCSDIR%%/perl/Xapian/InternalError.html
+%%PORTDOCS%%%%DOCSDIR%%/perl/Xapian/InvalidArgumentError.html
+%%PORTDOCS%%%%DOCSDIR%%/perl/Xapian/InvalidOperationError.html
+%%PORTDOCS%%%%DOCSDIR%%/perl/Xapian/LogicError.html
+%%PORTDOCS%%%%DOCSDIR%%/perl/Xapian/MSet.html
+%%PORTDOCS%%%%DOCSDIR%%/perl/Xapian/MSetIterator.html
+%%PORTDOCS%%%%DOCSDIR%%/perl/Xapian/MultiValueSorter.html
+%%PORTDOCS%%%%DOCSDIR%%/perl/Xapian/NetworkError.html
+%%PORTDOCS%%%%DOCSDIR%%/perl/Xapian/NetworkTimeoutError.html
+%%PORTDOCS%%%%DOCSDIR%%/perl/Xapian/PositionIterator.html
+%%PORTDOCS%%%%DOCSDIR%%/perl/Xapian/PostingIterator.html
+%%PORTDOCS%%%%DOCSDIR%%/perl/Xapian/Query.html
+%%PORTDOCS%%%%DOCSDIR%%/perl/Xapian/QueryParser.html
+%%PORTDOCS%%%%DOCSDIR%%/perl/Xapian/QueryParserError.html
+%%PORTDOCS%%%%DOCSDIR%%/perl/Xapian/RSet.html
+%%PORTDOCS%%%%DOCSDIR%%/perl/Xapian/RangeError.html
+%%PORTDOCS%%%%DOCSDIR%%/perl/Xapian/RuntimeError.html
+%%PORTDOCS%%%%DOCSDIR%%/perl/Xapian/SimpleStopper.html
+%%PORTDOCS%%%%DOCSDIR%%/perl/Xapian/Stem.html
+%%PORTDOCS%%%%DOCSDIR%%/perl/Xapian/Stopper.html
+%%PORTDOCS%%%%DOCSDIR%%/perl/Xapian/TermGenerator.html
+%%PORTDOCS%%%%DOCSDIR%%/perl/Xapian/TermIterator.html
+%%PORTDOCS%%%%DOCSDIR%%/perl/Xapian/TradWeight.html
+%%PORTDOCS%%%%DOCSDIR%%/perl/Xapian/UnimplementedError.html
+%%PORTDOCS%%%%DOCSDIR%%/perl/Xapian/ValueIterator.html
+%%PORTDOCS%%%%DOCSDIR%%/perl/Xapian/Weight.html
+%%PORTDOCS%%%%DOCSDIR%%/perl/Xapian/WritableDatabase.html
+%%PORTDOCS%%%%DOCSDIR%%/perl/examples/full-indexer.pl
+%%PORTDOCS%%%%DOCSDIR%%/perl/examples/full-searcher.pl
+%%PORTDOCS%%%%DOCSDIR%%/perl/examples/simpleexpand.pl
+%%PORTDOCS%%%%DOCSDIR%%/perl/examples/simpleindex.pl
+%%PORTDOCS%%%%DOCSDIR%%/perl/examples/simplematchdecider.pl
+%%PORTDOCS%%%%DOCSDIR%%/perl/examples/simplesearch.pl
diff --git a/databases/p5-mysql-genocide/Makefile b/databases/p5-mysql-genocide/Makefile
index 63cf5b46c589..11a3c59d46f3 100644
--- a/databases/p5-mysql-genocide/Makefile
+++ b/databases/p5-mysql-genocide/Makefile
@@ -1,8 +1,6 @@
-# Created by: chinsan
-
 PORTNAME=	mysql-genocide
 PORTVERSION=	0.03
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:RSOLIV
@@ -10,11 +8,12 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Parallel operation on MySQL processlist
+WWW=		https://metacpan.org/release/RSOLIV/mysql-genocide-0.03
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
-RUN_DEPENDS=	p5-DBD-mysql>=0:databases/p5-DBD-mysql
+RUN_DEPENDS=	${DBD_MYSQL}
 
-USES=		perl5
+USES=		mysql perl5
 USE_PERL5=	configure
 
 .include <bsd.port.mk>
diff --git a/databases/p5-mysql-genocide/pkg-descr b/databases/p5-mysql-genocide/pkg-descr
index 58807491273f..c8fe3a5c5156 100644
--- a/databases/p5-mysql-genocide/pkg-descr
+++ b/databases/p5-mysql-genocide/pkg-descr
@@ -2,5 +2,3 @@ mysql-genocide helps you play with big MySQL processlists. It can filter it
 using different criterias like execution time, query type, user or regexp
 matching of the SQL query etc. Actions can then be peformed on the result
 like killing, sorting or generating statistics.
-
-WWW: https://metacpan.org/release/RSOLIV/mysql-genocide-0.03
diff --git a/databases/p5-tokyotyrant/Makefile b/databases/p5-tokyotyrant/Makefile
index 13cfac63ea4b..658c204dc169 100644
--- a/databases/p5-tokyotyrant/Makefile
+++ b/databases/p5-tokyotyrant/Makefile
@@ -1,5 +1,3 @@
-# Created by: Hiroyuki Hanai <hanai@FreeBSD.org>
-
 PORTNAME=	tokyotyrant
 PORTVERSION=	1.16
 PORTREVISION=	3
@@ -8,8 +6,9 @@ MASTER_SITES=	https://dbmx.net/${PORTNAME}/perlpkg/
 PKGNAMEPREFIX=	p5-
 DISTNAME=	${PORTNAME}-perl-${PORTVERSION}
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl5 interface to the TokyoTyrant
+WWW=		https://dbmx.net/tokyotyrant/
 
 BUILD_DEPENDS=	tokyotyrant>=1.1.40:databases/tokyotyrant
 LIB_DEPENDS=	libtokyotyrant.so:databases/tokyotyrant
diff --git a/databases/p5-tokyotyrant/pkg-descr b/databases/p5-tokyotyrant/pkg-descr
index e6b6783a90bc..58437645230d 100644
--- a/databases/p5-tokyotyrant/pkg-descr
+++ b/databases/p5-tokyotyrant/pkg-descr
@@ -1,4 +1,2 @@
 TokyoTyrant-perl is an extenstion to Perl which allows access
 to TokyoTyrant dataabses.
-
-WWW: https://dbmx.net/tokyotyrant/
diff --git a/databases/pear-DB/Makefile b/databases/pear-DB/Makefile
index cf99998b7f2e..a46367e48dde 100644
--- a/databases/pear-DB/Makefile
+++ b/databases/pear-DB/Makefile
@@ -1,12 +1,12 @@
-# Created by: Thierry Thomas (<thierry@pompo.net>)
-
 PORTNAME=	DB
-PORTVERSION=	1.10.0
+PORTVERSION=	1.12.2
 PORTEPOCH=	1
 CATEGORIES=	databases www pear
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	PEAR Database Abstraction Layer
+WWW=		https://pear.php.net/package/DB \
+		https://github.com/pear/DB/
 
 LICENSE=	PHP301
 
diff --git a/databases/pear-DB/distinfo b/databases/pear-DB/distinfo
index f386021f8fdc..4cb1997a6890 100644
--- a/databases/pear-DB/distinfo
+++ b/databases/pear-DB/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1596360488
-SHA256 (PEAR/DB-1.10.0.tgz) = bd262072f2ab12bf1c06a7640876389963e58138da6bb1c697e0bb93ccc227fb
-SIZE (PEAR/DB-1.10.0.tgz) = 132485
+TIMESTAMP = 1713528514
+SHA256 (PEAR/DB-1.12.2.tgz) = d7badd369bb3fdd08cc843e6aed002d824a9b6e44dc44b28945245219947c8b4
+SIZE (PEAR/DB-1.12.2.tgz) = 137662
diff --git a/databases/pear-DB/pkg-descr b/databases/pear-DB/pkg-descr
index ba60c40dd90a..e8d9e06b8af6 100644
--- a/databases/pear-DB/pkg-descr
+++ b/databases/pear-DB/pkg-descr
@@ -15,5 +15,3 @@ DB is a database abstraction layer providing:
 - DocBook and phpDocumentor API documentation
 
 DB layers itself on top of PHP's existing database extensions.
-
-WWW: https://pear.php.net/package/DB
diff --git a/databases/pear-DBA/Makefile b/databases/pear-DBA/Makefile
index ff636bc74b7f..18c263838106 100644
--- a/databases/pear-DBA/Makefile
+++ b/databases/pear-DBA/Makefile
@@ -1,11 +1,10 @@
-# Created by: Antonio Carlos Venancio Junior (<antonio@inf.ufsc.br>)
-
 PORTNAME=	DBA
 PORTVERSION=	1.1.1
 CATEGORIES=	databases www pear
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Berkely-style database abstraction class
+WWW=		https://pear.php.net/package/DBA
 
 LICENSE=	LGPL3
 
diff --git a/databases/pear-DBA/pkg-descr b/databases/pear-DBA/pkg-descr
index 27c88332c221..b65d1ceeddf2 100644
--- a/databases/pear-DBA/pkg-descr
+++ b/databases/pear-DBA/pkg-descr
@@ -1,5 +1,3 @@
 PEAR::DBA is a wrapper for the php DBA functions. It includes a file-based
 emulator and provides a uniform, object-based interface for the
 Berkeley-style database systems.
-
-WWW: https://pear.php.net/package/DBA
diff --git a/databases/pear-DBA_Relational/Makefile b/databases/pear-DBA_Relational/Makefile
index 02b7e3747c71..e9f6866171f4 100644
--- a/databases/pear-DBA_Relational/Makefile
+++ b/databases/pear-DBA_Relational/Makefile
@@ -1,5 +1,3 @@
-# Created by: Martin Wilke <miwi@FreeBSD.org>
-
 PORTNAME=	DBA_Relational
 PORTVERSION=	0.2.0
 PORTREVISION=	1
@@ -7,6 +5,7 @@ CATEGORIES=	databases www pear
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Berkely-style database abstraction class
+WWW=		https://pear.php.net/package/DBA_Relational
 
 LICENSE=	LGPL3
 
diff --git a/databases/pear-DBA_Relational/pkg-descr b/databases/pear-DBA_Relational/pkg-descr
index 7319e97fdd20..74c9e6cf9ef2 100644
--- a/databases/pear-DBA_Relational/pkg-descr
+++ b/databases/pear-DBA_Relational/pkg-descr
@@ -1,3 +1 @@
 Table management extension to DBA
-
-WWW: https://pear.php.net/package/DBA_Relational
diff --git a/databases/pear-DB_DataObject/Makefile b/databases/pear-DB_DataObject/Makefile
index c3e3ecb0bb34..7c7195e6aee0 100644
--- a/databases/pear-DB_DataObject/Makefile
+++ b/databases/pear-DB_DataObject/Makefile
@@ -1,5 +1,3 @@
-# Created by: Antonio Carlos Venancio Junior (<antonio@php.net>)
-
 PORTNAME=	DB_DataObject
 PORTVERSION=	1.11.5
 PORTREVISION=	1
@@ -7,6 +5,7 @@ CATEGORIES=	databases pear
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	SQL Builder, Object Interface to Database Tables
+WWW=		https://pear.php.net/package/DB_DataObject
 
 LICENSE=	PHP301
 LICENSE_FILE=	${WRKSRC}/docs/LICENCE.txt
@@ -15,6 +14,8 @@ RUN_DEPENDS=	${PEAR_PKGNAMEPREFIX}Date>=1.4.3:devel/pear-Date@${PHP_FLAVOR}
 
 USES=		pear
 
+CONFLICTS_INSTALL=	php*-pear-DB_DataObject
+
 NO_ARCH=	yes
 
 OPTIONS_DEFINE=	DB MDB2 VALIDATE
diff --git a/databases/pear-DB_DataObject/pkg-descr b/databases/pear-DB_DataObject/pkg-descr
index e09c9e08a401..c47ffd94ecfe 100644
--- a/databases/pear-DB_DataObject/pkg-descr
+++ b/databases/pear-DB_DataObject/pkg-descr
@@ -5,5 +5,3 @@ DataObject performs 2 tasks:
 The core class is designed to be extended for each of your tables so that you
 put the data logic inside the data classes. A generator is included to make your
 configuration files and your base classes.
-
-WWW: https://pear.php.net/package/DB_DataObject
diff --git a/databases/pear-DB_DataObject_FormBuilder/Makefile b/databases/pear-DB_DataObject_FormBuilder/Makefile
index 9730d5e0c78c..5d9dec7962ac 100644
--- a/databases/pear-DB_DataObject_FormBuilder/Makefile
+++ b/databases/pear-DB_DataObject_FormBuilder/Makefile
@@ -1,11 +1,10 @@
-# Created by: Antonio Carlos Venancio Junior (<antonio@php.net>)
-
 PORTNAME=	DB_DataObject_FormBuilder
 PORTVERSION=	1.0.2
 CATEGORIES=	databases www pear
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Automatically build HTML_QuickForm objects using DB_DataObject
+WWW=		https://pear.php.net/package/DB_DataObject_FormBuilder
 
 LICENSE=	LGPL3
 
diff --git a/databases/pear-DB_DataObject_FormBuilder/pkg-descr b/databases/pear-DB_DataObject_FormBuilder/pkg-descr
index c38de4eee479..cdcf9e7ede88 100644
--- a/databases/pear-DB_DataObject_FormBuilder/pkg-descr
+++ b/databases/pear-DB_DataObject_FormBuilder/pkg-descr
@@ -1,4 +1,2 @@
 PEAR::DB_DataObject_FormBuilder will aid you in rapid application development
 using the packages DB_DataObject and HTML_QuickForm.
-
-WWW: https://pear.php.net/package/DB_DataObject_FormBuilder
diff --git a/databases/pear-DB_Pager/Makefile b/databases/pear-DB_Pager/Makefile
index 4cb356451982..67345ff1ea42 100644
--- a/databases/pear-DB_Pager/Makefile
+++ b/databases/pear-DB_Pager/Makefile
@@ -1,11 +1,10 @@
-# Created by: Toshiya Saitoh (<toshiya@saitoh.nu>)
-
 PORTNAME=	DB_Pager
 PORTVERSION=	0.7.2
 CATEGORIES=	databases www pear
 
 MAINTAINER=	toshiya@saitoh.nu
 COMMENT=	PEAR Database Abstraction Layer
+WWW=		https://pear.php.net/package/DB_Pager
 
 LICENSE=	GPLv3
 
diff --git a/databases/pear-DB_Pager/pkg-descr b/databases/pear-DB_Pager/pkg-descr
index 8bb34d05c261..495ba0924023 100644
--- a/databases/pear-DB_Pager/pkg-descr
+++ b/databases/pear-DB_Pager/pkg-descr
@@ -4,5 +4,3 @@ This class handles all the stuff needed for displaying
 paginated results from a database query of Pear DB.
 including fetching only the needed rows and giving extensive information
 for helping build an HTML or GTK query result display.
-
-WWW: https://pear.php.net/package/DB_Pager
diff --git a/databases/pear-DB_QueryTool/Makefile b/databases/pear-DB_QueryTool/Makefile
index f9a144937039..f156ac6f6a9f 100644
--- a/databases/pear-DB_QueryTool/Makefile
+++ b/databases/pear-DB_QueryTool/Makefile
@@ -1,11 +1,10 @@
-# Created by: Antonio Carlos Venancio Junior (<antonio@inf.ufsc.br>)
-
 PORTNAME=	DB_QueryTool
 PORTVERSION=	1.1.2
 CATEGORIES=	databases www pear
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	PEAR OO-interface for easily retrieving and modifying data in a DB
+WWW=		https://pear.php.net/package/DB_QueryTool
 
 LICENSE=	BSD2CLAUSE
 
diff --git a/databases/pear-DB_QueryTool/pkg-descr b/databases/pear-DB_QueryTool/pkg-descr
index 8dce754ec2c7..34940be27090 100644
--- a/databases/pear-DB_QueryTool/pkg-descr
+++ b/databases/pear-DB_QueryTool/pkg-descr
@@ -6,5 +6,3 @@ It also provides an easy to learn interface that interacts nicely with
 HTML-forms using arrays that contain the column data, that shall be
 updated/added in a DB. This package bases on an SQL-Builder which lets you
 easily build SQL-Statements and execute them.
-
-WWW: https://pear.php.net/package/DB_QueryTool
diff --git a/databases/pear-DB_Sqlite_Tools/Makefile b/databases/pear-DB_Sqlite_Tools/Makefile
index a66d0a585aea..d5e9a2645b0a 100644
--- a/databases/pear-DB_Sqlite_Tools/Makefile
+++ b/databases/pear-DB_Sqlite_Tools/Makefile
@@ -1,11 +1,10 @@
-# Created by: Martin Wilke <miwi@FreeBSD.org>
-
 PORTNAME=	DB_Sqlite_Tools
 PORTVERSION=	0.1.7
 CATEGORIES=	databases www pear
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Object-oriented interface to backup SQLite databases
+WWW=		https://pear.php.net/package/DB_Sqlite_Tools
 
 LICENSE=	BSD2CLAUSE
 
@@ -16,4 +15,7 @@ RUN_DEPENDS=	${PEARDIR}/DB.php:databases/pear-DB@${PHP_FLAVOR} \
 
 USES=		pear
 
+CONFLICTS_INSTALL=	php[0-9][0-9]-pear-Crypt_HMAC2 \
+			php[0-9][0-9]-pear-DB_Sqlite_Tools # share/pear/DB/Sqlite/Tools.php share/pear/generate_package_xml.php
+
 .include <bsd.port.mk>
diff --git a/databases/pear-DB_Sqlite_Tools/pkg-descr b/databases/pear-DB_Sqlite_Tools/pkg-descr
index 3ebc42cac874..b697aa9073ae 100644
--- a/databases/pear-DB_Sqlite_Tools/pkg-descr
+++ b/databases/pear-DB_Sqlite_Tools/pkg-descr
@@ -4,5 +4,3 @@ by providing a comprehensive solution for database backup, live replication,
 export in XML format, performance optmization and other functionalities like
 the insertion and retrieval of encrypted data from an Sqlite database without
 any external extension.
-
-WWW: https://pear.php.net/package/DB_Sqlite_Tools
diff --git a/databases/pear-DB_Table/Makefile b/databases/pear-DB_Table/Makefile
index f90dec30f8b8..c1fd26f9d992 100644
--- a/databases/pear-DB_Table/Makefile
+++ b/databases/pear-DB_Table/Makefile
@@ -1,5 +1,3 @@
-# Created by: Antonio Carlos Venancio Junior (<antonio@inf.ufsc.br>)
-
 PORTNAME=	DB_Table
 PORTVERSION=	1.5.6
 PORTREVISION=	1
@@ -8,6 +6,7 @@ CATEGORIES=	databases www pear
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	PEAR object-oriented interface to a database table
+WWW=		https://pear.php.net/package/DB_Table
 
 LICENSE=	BSD2CLAUSE
 
diff --git a/databases/pear-DB_Table/pkg-descr b/databases/pear-DB_Table/pkg-descr
index 20a7c005fe77..4133e50308db 100644
--- a/databases/pear-DB_Table/pkg-descr
+++ b/databases/pear-DB_Table/pkg-descr
@@ -2,5 +2,3 @@ PEAR::DB_Table builds on PEAR DB to abstract datatypes and automate table
 creation, data validation, insert, update, delete, and select; combines
 these with PEAR::HTML_QuickForm to automatically generate input forms
 that match the table column definitions.
-
-WWW: https://pear.php.net/package/DB_Table
diff --git a/databases/pear-DB_ldap/Makefile b/databases/pear-DB_ldap/Makefile
index bfab908efd37..5ba3654b824e 100644
--- a/databases/pear-DB_ldap/Makefile
+++ b/databases/pear-DB_ldap/Makefile
@@ -1,11 +1,10 @@
-# Created by: Antonio Carlos Venancio Junior (<antonio@inf.ufsc.br>)
-
 PORTNAME=	DB_ldap
 PORTVERSION=	1.2.1
 CATEGORIES=	databases net pear
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	PEAR DB compliant interface to LDAP servers
+WWW=		https://pear.php.net/package/DB_ldap
 
 LICENSE=	LGPL3
 
diff --git a/databases/pear-DB_ldap/pkg-descr b/databases/pear-DB_ldap/pkg-descr
index 723ddd21d63f..bf7f2a1642fe 100644
--- a/databases/pear-DB_ldap/pkg-descr
+++ b/databases/pear-DB_ldap/pkg-descr
@@ -1,3 +1 @@
 PEAR::DB_ldap class provides a DB compliant interface to LDAP servers.
-
-WWW: https://pear.php.net/package/DB_ldap
diff --git a/databases/pear-DB_ldap2/Makefile b/databases/pear-DB_ldap2/Makefile
index 7a751d37654f..08dc47284301 100644
--- a/databases/pear-DB_ldap2/Makefile
+++ b/databases/pear-DB_ldap2/Makefile
@@ -1,5 +1,3 @@
-# Created by: Wen heping <wenheping@gmail.com>
-
 PORTNAME=	DB_ldap2
 PORTVERSION=	0.5.1
 PORTREVISION=	1
@@ -7,6 +5,7 @@ CATEGORIES=	databases net pear
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	PEAR DB compliant interface to LDAP v2 and v3 database
+WWW=		https://pear.php.net/package/DB_ldap2
 
 LICENSE=	LGPL3
 
diff --git a/databases/pear-DB_ldap2/pkg-descr b/databases/pear-DB_ldap2/pkg-descr
index fd21a8abe735..4c88b55d5fdd 100644
--- a/databases/pear-DB_ldap2/pkg-descr
+++ b/databases/pear-DB_ldap2/pkg-descr
@@ -1,4 +1,2 @@
 PEAR::DB_ldap class provides a DB compliant
 interface to LDAP v2 and v3 database.
-
-WWW: https://pear.php.net/package/DB_ldap2
diff --git a/databases/pear-DoctrineCommon/Makefile b/databases/pear-DoctrineCommon/Makefile
index 8ac47e23bbcf..acfa26eec6d4 100644
--- a/databases/pear-DoctrineCommon/Makefile
+++ b/databases/pear-DoctrineCommon/Makefile
@@ -1,12 +1,11 @@
-# Created by: William Grzybowski <wg@FreeBSD.org>
-
 PORTNAME=	DoctrineCommon
 PORTVERSION=	2.3.0
 CATEGORIES=	databases pear
 MASTER_SITES=	http://pear.doctrine-project.org/get/
 
-MAINTAINER=	wg@FreeBSD.org
+MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	Shared code for Doctrine PHP object relational mapper
+WWW=		https://www.doctrine-project.org/
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
diff --git a/databases/pear-DoctrineCommon/pkg-descr b/databases/pear-DoctrineCommon/pkg-descr
index 3f870c2455be..0f931cc1cb18 100644
--- a/databases/pear-DoctrineCommon/pkg-descr
+++ b/databases/pear-DoctrineCommon/pkg-descr
@@ -1,3 +1 @@
 The Doctrine Common package contains shared code between the other packages.
-
-WWW: https://www.doctrine-project.org/
diff --git a/databases/pear-DoctrineDBAL/Makefile b/databases/pear-DoctrineDBAL/Makefile
index 6eed2b6c6592..3001ec4f6a0e 100644
--- a/databases/pear-DoctrineDBAL/Makefile
+++ b/databases/pear-DoctrineDBAL/Makefile
@@ -1,12 +1,11 @@
-# Created by: William Grzybowski <wg@FreeBSD.org>
-
 PORTNAME=	DoctrineDBAL
 PORTVERSION=	2.3.4
 CATEGORIES=	databases pear
 MASTER_SITES=	http://pear.doctrine-project.org/get/
 
-MAINTAINER=	wg@FreeBSD.org
+MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	Database abstraction layer used to power the ORM package
+WWW=		https://www.doctrine-project.org/
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
@@ -14,6 +13,8 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 RUN_DEPENDS=	${PEARDIR}/Doctrine/Common/Version.php:databases/pear-DoctrineCommon@${PHP_FLAVOR} \
 		${PEARDIR}/Symfony/Component/Console/Application.php:devel/pear-Symfony_Component_Console@${PHP_FLAVOR}
 
+CONFLICTS_INSTALL=	php*-pear-doctrine-DoctrineDBAL
+
 OPTIONS_DEFINE=	DBLIB MYSQL ODBC PGSQL SQLITE
 OPTIONS_DEFAULT=MYSQL
 
diff --git a/databases/pear-DoctrineDBAL/pkg-descr b/databases/pear-DoctrineDBAL/pkg-descr
index c3907f0522ed..335c18115564 100644
--- a/databases/pear-DoctrineDBAL/pkg-descr
+++ b/databases/pear-DoctrineDBAL/pkg-descr
@@ -1,4 +1,2 @@
 The Doctrine DBAL package is the database abstraction layer used to
 power the ORM package.
-
-WWW: https://www.doctrine-project.org/
diff --git a/databases/pear-Horde_Db/Makefile b/databases/pear-Horde_Db/Makefile
index 1bfe221fbff1..71ac31808f3c 100644
--- a/databases/pear-Horde_Db/Makefile
+++ b/databases/pear-Horde_Db/Makefile
@@ -1,17 +1,17 @@
 PORTNAME=	Horde_Db
-PORTVERSION=	2.4.0
-PORTREVISION=	2
+PORTVERSION=	2.4.1
 CATEGORIES=	databases www pear
 
 MAINTAINER=	horde@FreeBSD.org
 COMMENT=	Horde Database Libraries
+WWW=		https://pear.horde.org
 
 OPTIONS_DEFAULT=	MYSQLI
 OPTIONS_DEFINE=		MYSQLI PDO
 MYSQLI_DESC=		Depend on mysqli PHP extension
 PDO_DESC=		Depend on PDO PHP extension
 
-USES=	horde
+USES=		horde cpe
 USE_HORDE_RUN=	Horde_Date \
 		Horde_Exception \
 		Horde_Support
@@ -21,4 +21,6 @@ MYSQLI_USE=	PHP=mysqli
 PDO_USES=	php
 PDO_USE=	PHP=pdo
 
+CONFLICTS_INSTALL=	php*-pear-horde-Horde_Db
+
 .include <bsd.port.mk>
diff --git a/databases/pear-Horde_Db/distinfo b/databases/pear-Horde_Db/distinfo
index 0d5268d7df7d..de528ab82e2a 100644
--- a/databases/pear-Horde_Db/distinfo
+++ b/databases/pear-Horde_Db/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1488896477
-SHA256 (Horde/Horde_Db-2.4.0.tgz) = 69fecc955c21b9d5ae2d604c32edb6da48ba9f1305e55dd0187355bca59b2a06
-SIZE (Horde/Horde_Db-2.4.0.tgz) = 96916
+TIMESTAMP = 1641590338
+SHA256 (Horde/Horde_Db-2.4.1.tgz) = 0b89bbfd961a152ff23ce59b4d9aba2a98599b018777a7c7e44b22ea7b677c84
+SIZE (Horde/Horde_Db-2.4.1.tgz) = 98261
diff --git a/databases/pear-Horde_Db/files/patch-lib_Horde_Db_Adapter_Postgresql_Schema.php b/databases/pear-Horde_Db/files/patch-lib_Horde_Db_Adapter_Postgresql_Schema.php
deleted file mode 100644
index 5e503c401937..000000000000
--- a/databases/pear-Horde_Db/files/patch-lib_Horde_Db_Adapter_Postgresql_Schema.php
+++ /dev/null
@@ -1,141 +0,0 @@
---- lib/Horde/Db/Adapter/Postgresql/Schema.php.orig	2017-02-27 11:00:17.000000000 +0100
-+++ lib/Horde/Db/Adapter/Postgresql/Schema.php	2020-10-28 00:40:32.469743000 +0100
-@@ -3,12 +3,15 @@
-  * Copyright 2007 Maintainable Software, LLC
-  * Copyright 2008-2017 Horde LLC (http://www.horde.org/)
-  *
-+ * See the enclosed file LICENSE for license information (BSD). If you
-+ * did not receive this file, see http://www.horde.org/licenses/bsd.
-+ *
-  * @author     Mike Naberezny <mike@maintainable.com>
-  * @author     Derek DeVries <derek@maintainable.com>
-  * @author     Chuck Hagenbuch <chuck@horde.org>
-  * @author     Jan Schneider <jan@horde.org>
-- * @license    http://www.horde.org/licenses/bsd
-  * @category   Horde
-+ * @license    http://www.horde.org/licenses/bsd
-  * @package    Db
-  * @subpackage Adapter
-  */
-@@ -21,8 +24,10 @@
-  * @author     Derek DeVries <derek@maintainable.com>
-  * @author     Chuck Hagenbuch <chuck@horde.org>
-  * @author     Jan Schneider <jan@horde.org>
-- * @license    http://www.horde.org/licenses/bsd
-  * @category   Horde
-+ * @copyright  2007 Maintainable Software, LLC
-+ * @copyright  2008-2017 Horde LLC
-+ * @license    http://www.horde.org/licenses/bsd
-  * @package    Db
-  * @subpackage Adapter
-  */
-@@ -383,12 +388,13 @@ class Horde_Db_Adapter_Postgresql_Schema
-     {
-         /* @todo See if we can get this from information_schema instead */
-         return $this->selectAll('
--            SELECT a.attname, format_type(a.atttypid, a.atttypmod), d.adsrc, a.attnotnull
--              FROM pg_attribute a LEFT JOIN pg_attrdef d
--                ON a.attrelid = d.adrelid AND a.attnum = d.adnum
--             WHERE a.attrelid = ' . $this->quote($tableName) . '::regclass
--               AND a.attnum > 0 AND NOT a.attisdropped
--             ORDER BY a.attnum', $name);
-+          SELECT a.attname, format_type(a.atttypid, a.atttypmod),
-+            pg_get_expr(d.adbin, d.adrelid) AS adsrc, a.attnotnull
-+          FROM pg_attribute a
-+          LEFT JOIN pg_attrdef d ON a.attrelid = d.adrelid AND a.attnum = d.adnum
-+          WHERE a.attrelid = ' . $this->quote($tableName) . '::regclass
-+            AND a.attnum > 0 AND NOT a.attisdropped
-+          ORDER BY a.attnum;', $name);
-     }
- 
-     /**
-@@ -1057,13 +1063,32 @@ class Horde_Db_Adapter_Postgresql_Schema
-                 $quotedSequence = $this->quoteSequenceName($sequence);
-                 $quotedTable = $this->quoteTableName($table);
-                 $quotedPk = $this->quoteColumnName($pk);
--
--                $sql = sprintf('SELECT setval(%s, (SELECT COALESCE(MAX(%s) + (SELECT increment_by FROM %s), (SELECT min_value FROM %s)) FROM %s), false)',
--                               $quotedSequence,
--                               $quotedPk,
--                               $sequence,
--                               $sequence,
--                               $quotedTable);
-+                if ($this->postgresqlVersion() >= 100000) {
-+                    $sql = sprintf('
-+                        SELECT setval(
-+                            %s,
-+                            (SELECT COALESCE(
-+                                MAX(%s) + (SELECT increment_by FROM pg_sequences WHERE schemaname=ANY(CURRENT_SCHEMAS(false)) AND sequencename=%s),
-+                                (SELECT min_value FROM pg_sequences WHERE schemaname=ANY(CURRENT_SCHEMAS(false)) AND sequencename=%s)
-+                             ) FROM %s),
-+                             false
-+                         )',
-+                         $quotedSequence,
-+                         $quotedPk,
-+                         $quotedSequence,
-+                         $quotedSequence,
-+                         $quotedTable
-+                    );
-+                } else {
-+                    $sql = sprintf(
-+                        'SELECT setval(%s, (SELECT COALESCE(MAX(%s) + (SELECT increment_by FROM %s), (SELECT min_value FROM %s)) FROM %s), false)',
-+                        $quotedSequence,
-+                        $quotedPk,
-+                        $sequence,
-+                        $sequence,
-+                        $quotedTable
-+                    );
-+                }
-                 $this->selectValue($sql, 'Reset sequence');
-             } else {
-                 if ($this->_logger) {
-@@ -1103,28 +1128,20 @@ class Horde_Db_Adapter_Postgresql_Schema
-         $result = $this->selectOne($sql, 'PK and serial sequence');
- 
-         if (!$result) {
--            // If that fails, try parsing the primary key's default value.
--            // Support the 7.x and 8.0 nextval('foo'::text) as well as
--            // the 8.1+ nextval('foo'::regclass).
-             $sql = "
--            SELECT attr.attname,
--              CASE
--                WHEN split_part(def.adsrc, '''', 2) ~ '.' THEN
--                  substr(split_part(def.adsrc, '''', 2),
--                         strpos(split_part(def.adsrc, '''', 2), '.')+1)
--                ELSE split_part(def.adsrc, '''', 2)
--              END AS relname
--            FROM pg_class       t
--            JOIN pg_attribute   attr ON (t.oid = attrelid)
--            JOIN pg_attrdef     def  ON (adrelid = attrelid AND adnum = attnum)
--            JOIN pg_constraint  cons ON (conrelid = adrelid AND adnum = conkey[1])
--            WHERE t.oid = '$table'::regclass
--              AND cons.contype = 'p'
--              AND def.adsrc ~* 'nextval'";
--
-+              SELECT c.column_name, c.ordinal_position,
-+                  pg_get_serial_sequence(t.table_name, c.column_name) as relname
-+              FROM information_schema.key_column_usage AS c
-+              LEFT JOIN information_schema.table_constraints AS t
-+                ON t.constraint_name = c.constraint_name
-+              WHERE t.table_name = '$table' AND t.constraint_type = 'PRIMARY KEY';";
-             $result = $this->selectOne($sql, 'PK and custom sequence');
-         }
- 
-+        if (!$result) {
-+            return array(null, null);
-+        }
-+
-         // [primary_key, sequence]
-         return array($result['attname'], $result['relname']);
-     }
-@@ -1138,9 +1155,7 @@ class Horde_Db_Adapter_Postgresql_Schema
-     {
-         if (!$this->_version) {
-             try {
--                $version = $this->selectValue('SELECT version()');
--                if (preg_match('/PostgreSQL (\d+)\.(\d+)\.(\d+)/', $version, $matches))
--                    $this->_version = ($matches[1] * 10000) + ($matches[2] * 100) + $matches[3];
-+                $this->_version = $this->selectValue('SHOW server_version_num');
-             } catch (Exception $e) {
-                 return 0;
-             }
diff --git a/databases/pear-Horde_Db/pkg-descr b/databases/pear-Horde_Db/pkg-descr
index d68ed0c1c375..032c21d0479a 100644
--- a/databases/pear-Horde_Db/pkg-descr
+++ b/databases/pear-Horde_Db/pkg-descr
@@ -1,3 +1 @@
 Horde database/SQL abstraction layer
-
-WWW: http://pear.horde.org
diff --git a/databases/pear-Horde_HashTable/Makefile b/databases/pear-Horde_HashTable/Makefile
index a30740c2044a..7e246a1b94cf 100644
--- a/databases/pear-Horde_HashTable/Makefile
+++ b/databases/pear-Horde_HashTable/Makefile
@@ -4,9 +4,10 @@ CATEGORIES=	databases www pear
 
 MAINTAINER=	horde@FreeBSD.org
 COMMENT=	Horde Hash Table Interface
+WWW=		https://pear.horde.org
 
 OPTIONS_DEFINE=	MEMCACHE
-USES=	horde
+USES=		horde cpe
 USE_HORDE_RUN=	Horde_Exception
 
 MEMCACHE_USE=	HORDE_RUN=Horde_Memcache
diff --git a/databases/pear-Horde_HashTable/pkg-descr b/databases/pear-Horde_HashTable/pkg-descr
index 3dec9833b0cf..d6c9dca213a6 100644
--- a/databases/pear-Horde_HashTable/pkg-descr
+++ b/databases/pear-Horde_HashTable/pkg-descr
@@ -1,3 +1 @@
 Horde API to access various hash table implementations.
-
-WWW: http://pear.horde.org
diff --git a/databases/pear-Horde_Imsp/Makefile b/databases/pear-Horde_Imsp/Makefile
index f3c8bc88f26b..78ccec578788 100644
--- a/databases/pear-Horde_Imsp/Makefile
+++ b/databases/pear-Horde_Imsp/Makefile
@@ -1,13 +1,12 @@
-# Created by: Martin Matuska <mm@FreeBSD.org>
-
 PORTNAME=	Horde_Imsp
 DISTVERSION=	2.0.10
 CATEGORIES=	databases www pear
 
 MAINTAINER=	horde@FreeBSD.org
 COMMENT=	Horde IMSP API
+WWW=		https://pear.horde.org
 
-USES=	horde
+USES=		horde cpe
 USE_HORDE_RUN=	Horde_Translation
 
 .include <bsd.port.mk>
diff --git a/databases/pear-Horde_Imsp/pkg-descr b/databases/pear-Horde_Imsp/pkg-descr
index ac9e9cbdd3ae..69ec90c4c081 100644
--- a/databases/pear-Horde_Imsp/pkg-descr
+++ b/databases/pear-Horde_Imsp/pkg-descr
@@ -1,3 +1 @@
 Provides an API into an IMSP server for address books and options.
-
-WWW: http://pear.horde.org
diff --git a/databases/pear-Horde_Memcache/Makefile b/databases/pear-Horde_Memcache/Makefile
index 571ce61eb4f9..44b886b9a6ad 100644
--- a/databases/pear-Horde_Memcache/Makefile
+++ b/databases/pear-Horde_Memcache/Makefile
@@ -1,13 +1,13 @@
 PORTNAME=	Horde_Memcache
-DISTVERSION=	2.1.1
-PORTREVISION=	1
+DISTVERSION=	2.1.2
 CATEGORIES=	databases www pear
 
 MAINTAINER=	horde@FreeBSD.org
 COMMENT=	Horde Memcache API
+WWW=		https://pear.horde.org
 
 USES=		horde php
-USE_PHP=	memcache hash
+USE_PHP=	memcache
 USE_HORDE_RUN=	Horde_Exception
 
 .include <bsd.port.mk>
diff --git a/databases/pear-Horde_Memcache/distinfo b/databases/pear-Horde_Memcache/distinfo
index d6af43d0f2c7..6b96cb1304d4 100644
--- a/databases/pear-Horde_Memcache/distinfo
+++ b/databases/pear-Horde_Memcache/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1512587713
-SHA256 (Horde/Horde_Memcache-2.1.1.tgz) = 2862e8373737a43137d1a97be7fa982c656eee4f83629bd5a9f3ec21adb60497
-SIZE (Horde/Horde_Memcache-2.1.1.tgz) = 15009
+TIMESTAMP = 1641590382
+SHA256 (Horde/Horde_Memcache-2.1.2.tgz) = 8efb7c7893d40ab694abf5171df682cc7c433822f4923cd741433b3b8a849be6
+SIZE (Horde/Horde_Memcache-2.1.2.tgz) = 15406
diff --git a/databases/pear-Horde_Memcache/pkg-descr b/databases/pear-Horde_Memcache/pkg-descr
index f60a6d1de403..7541c9be65be 100644
--- a/databases/pear-Horde_Memcache/pkg-descr
+++ b/databases/pear-Horde_Memcache/pkg-descr
@@ -1,3 +1 @@
 Horde API to access a memcache server.
-
-WWW: http://pear.horde.org
diff --git a/databases/pear-Horde_Mongo/Makefile b/databases/pear-Horde_Mongo/Makefile
index 6d957a5c1e2a..c6e27a86ab02 100644
--- a/databases/pear-Horde_Mongo/Makefile
+++ b/databases/pear-Horde_Mongo/Makefile
@@ -4,7 +4,8 @@ CATEGORIES=	databases www pear
 
 MAINTAINER=	horde@FreeBSD.org
 COMMENT=	Horde Mongo Configuration
+WWW=		https://pear.horde.org
 
-USES=	horde
+USES=		horde cpe
 
 .include <bsd.port.mk>
diff --git a/databases/pear-Horde_Mongo/pkg-descr b/databases/pear-Horde_Mongo/pkg-descr
index 20fc26ce60b9..52bbfe0f776a 100644
--- a/databases/pear-Horde_Mongo/pkg-descr
+++ b/databases/pear-Horde_Mongo/pkg-descr
@@ -1,4 +1,2 @@
 Provides an API to ensure that the PECL Mongo extension can be used
 consistently across various Horde packages.
-
-WWW: http://pear.horde.org
diff --git a/databases/pear-MDB/Makefile b/databases/pear-MDB/Makefile
index ce7dfe0a1391..6564fb6e6adb 100644
--- a/databases/pear-MDB/Makefile
+++ b/databases/pear-MDB/Makefile
@@ -1,11 +1,10 @@
-# Created by: Oleg Sharoiko <os@rsu.ru>
-
 PORTNAME=	MDB
 PORTVERSION=	1.3.0
 CATEGORIES=	databases www pear
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	PEAR unified API for DB access, based on user meta data
+WWW=		https://pear.php.net/package/MDB
 
 LICENSE=	BSD2CLAUSE
 
diff --git a/databases/pear-MDB/pkg-descr b/databases/pear-MDB/pkg-descr
index 34558347927e..7adbb41da378 100644
--- a/databases/pear-MDB/pkg-descr
+++ b/databases/pear-MDB/pkg-descr
@@ -5,5 +5,3 @@ portability.
 
 Currently supported RDBMS are MySQL, PostGreSQL, Oracle, Frontbase, Querysim,
 Interbase/Firebird, and MSSQL
-
-WWW: https://pear.php.net/package/MDB
diff --git a/databases/pear-MDB2/Makefile b/databases/pear-MDB2/Makefile
index e01e295e73cc..9f1bf0c93c28 100644
--- a/databases/pear-MDB2/Makefile
+++ b/databases/pear-MDB2/Makefile
@@ -1,11 +1,11 @@
-# Created by: Antonio Carlos Venancio Junior (<antonio@inf.ufsc.br>)
-
 PORTNAME=	MDB2
 DISTVERSION=	2.5.0b5
+PORTREVISION=	1
 CATEGORIES=	databases www pear
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	PEAR database abstraction layer
+WWW=		https://pear.php.net/package/MDB2
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
diff --git a/databases/pear-MDB2/files/patch-MDB2.php b/databases/pear-MDB2/files/patch-MDB2.php
new file mode 100644
index 000000000000..a6f918aac6dd
--- /dev/null
+++ b/databases/pear-MDB2/files/patch-MDB2.php
@@ -0,0 +1,23 @@
+Obtained from:	https://github.com/pear/MDB2/commit/ee0563d1ac6ed2694c48701e24ed7c352edb6639
+
+--- MDB2.php.orig	2012-10-29 15:41:51 UTC
++++ MDB2.php
+@@ -575,7 +575,7 @@ class MDB2
+                          $dummy3 = false)
+     {
+         $pear = new PEAR;
+-        $err =& $pear->raiseError(null, $code, $mode, $options, $userinfo, 'MDB2_Error', true);
++        $err = $pear->raiseError(null, $code, $mode, $options, $userinfo, 'MDB2_Error', true);
+         return $err;
+     }
+ 
+@@ -823,7 +823,8 @@ class MDB2
+             $parsed['dbsyntax'] = $str;
+         }
+ 
+-        if (!count($dsn)) {
++        $dsn = trim($dsn);
++        if (!strlen($dsn)) {
+             return $parsed;
+         }
+ 
diff --git a/databases/pear-MDB2/pkg-descr b/databases/pear-MDB2/pkg-descr
index 24b330a2b353..c09b0fe831da 100644
--- a/databases/pear-MDB2/pkg-descr
+++ b/databases/pear-MDB2/pkg-descr
@@ -5,5 +5,3 @@ It provides a common API for all supported RDBMS. The main difference to most
 other DB abstraction packages is that MDB2 goes much further to ensure
 portability. MDB2 provides most of its many features optionally that can be used
 to construct portable SQL statements.
-
-WWW: https://pear.php.net/package/MDB2
diff --git a/databases/pear-MDB2_Driver_mysqli/Makefile b/databases/pear-MDB2_Driver_mysqli/Makefile
index 03b75b108e41..fb12be1ec064 100644
--- a/databases/pear-MDB2_Driver_mysqli/Makefile
+++ b/databases/pear-MDB2_Driver_mysqli/Makefile
@@ -1,11 +1,10 @@
-# Created by: Rong-En Fan <rafan@FreeBSD.org>
-
 PORTNAME=	MDB2_Driver_mysqli
 DISTVERSION=	1.5.0b4
 CATEGORIES=	databases www pear
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	PEAR MySQL MDB2 driver
+WWW=		https://pear.php.net/package/MDB2_Driver_mysqli
 
 LICENSE=	BSD3CLAUSE
 
diff --git a/databases/pear-MDB2_Driver_mysqli/pkg-descr b/databases/pear-MDB2_Driver_mysqli/pkg-descr
index e633c65906da..0d9be5c5f446 100644
--- a/databases/pear-MDB2_Driver_mysqli/pkg-descr
+++ b/databases/pear-MDB2_Driver_mysqli/pkg-descr
@@ -1,3 +1 @@
 This is the MySQLi MDB2 driver.
-
-WWW: https://pear.php.net/package/MDB2_Driver_mysqli
diff --git a/databases/pear-MDB2_Driver_pgsql/Makefile b/databases/pear-MDB2_Driver_pgsql/Makefile
index 8cc56b391bca..d766b24f7041 100644
--- a/databases/pear-MDB2_Driver_pgsql/Makefile
+++ b/databases/pear-MDB2_Driver_pgsql/Makefile
@@ -1,5 +1,3 @@
-# Created by: Rong-En Fan <rafan@FreeBSD.org>
-
 PORTNAME=	MDB2_Driver_pgsql
 DISTVERSION=	1.5.0b4
 PORTREVISION=	2
@@ -7,6 +5,7 @@ CATEGORIES=	databases www pear
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	PEAR pgsql MDB2 driver
+WWW=		https://pear.php.net/package/MDB2_Driver_pgsql
 
 LICENSE=	BSD3CLAUSE
 
diff --git a/databases/pear-MDB2_Driver_pgsql/pkg-descr b/databases/pear-MDB2_Driver_pgsql/pkg-descr
index 0f0ac4dd32a2..3987f509062d 100644
--- a/databases/pear-MDB2_Driver_pgsql/pkg-descr
+++ b/databases/pear-MDB2_Driver_pgsql/pkg-descr
@@ -1,3 +1 @@
 This is the PostgreSQL MDB2 driver.
-
-WWW: https://pear.php.net/package/MDB2_Driver_pgsql
diff --git a/databases/pear-MDB2_Schema/Makefile b/databases/pear-MDB2_Schema/Makefile
index 3f009c747717..57917742df52 100644
--- a/databases/pear-MDB2_Schema/Makefile
+++ b/databases/pear-MDB2_Schema/Makefile
@@ -1,11 +1,10 @@
-# Created by: Rong-En Fan <rafan@FreeBSD.org>
-
 PORTNAME=	MDB2_Schema
 PORTVERSION=	0.8.6
 CATEGORIES=	databases www pear
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	PEAR XML based database schema manager
+WWW=		https://pear.php.net/package/MDB2_Schema
 
 LICENSE=	BSD2CLAUSE
 
diff --git a/databases/pear-MDB2_Schema/pkg-descr b/databases/pear-MDB2_Schema/pkg-descr
index a4fcfb1545b1..4b39739663ce 100644
--- a/databases/pear-MDB2_Schema/pkg-descr
+++ b/databases/pear-MDB2_Schema/pkg-descr
@@ -3,5 +3,3 @@ files in XML that can be used to create, alter and drop database entities
 and insert data into a database. Reverse engineering database schemas from
 existing databases is also supported. The format is compatible with both
 PEAR::MDB and Metabase.
-
-WWW: https://pear.php.net/package/MDB2_Schema
diff --git a/databases/pear-MDB_QueryTool/Makefile b/databases/pear-MDB_QueryTool/Makefile
index b97cd47f7f52..6a9bd3edfa27 100644
--- a/databases/pear-MDB_QueryTool/Makefile
+++ b/databases/pear-MDB_QueryTool/Makefile
@@ -1,11 +1,10 @@
-# Created by: Antonio Carlos Venancio Junior (<antonio@inf.ufsc.br>)
-
 PORTNAME=	MDB_QueryTool
 PORTVERSION=	1.2.3
 CATEGORIES=	databases www pear
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	PEAR OO-interface for easily retrieving and modifying data in a DB
+WWW=		https://pear.php.net/package/MDB_QueryTool
 
 LICENSE=	BSD2CLAUSE
 
diff --git a/databases/pear-MDB_QueryTool/pkg-descr b/databases/pear-MDB_QueryTool/pkg-descr
index 4ff756a474f4..943f20e3c8c3 100644
--- a/databases/pear-MDB_QueryTool/pkg-descr
+++ b/databases/pear-MDB_QueryTool/pkg-descr
@@ -9,5 +9,3 @@ easily build SQL-Statements and execute them.
 
 NB: this is a PEAR::MDB porting from the original DB_QueryTool written by
 Wolfram Kriesing and Paolo Panto.
-
-WWW: https://pear.php.net/package/MDB_QueryTool
diff --git a/databases/pear-Structures_DataGrid_DataSource_Array/Makefile b/databases/pear-Structures_DataGrid_DataSource_Array/Makefile
index c2af9c483690..6fc9283ba25d 100644
--- a/databases/pear-Structures_DataGrid_DataSource_Array/Makefile
+++ b/databases/pear-Structures_DataGrid_DataSource_Array/Makefile
@@ -1,11 +1,10 @@
-# Created by: Martin Wilke <miwi@FreeBSD.org>
-
 PORTNAME=	Structures_DataGrid_DataSource_Array
 PORTVERSION=	0.1.4
 CATEGORIES=	databases www pear
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	DataSource driver using arrays
+WWW=		https://pear.php.net/package/Structures_DataGrid_DataSource_Array
 
 LICENSE=	BSD2CLAUSE
 
diff --git a/databases/pear-Structures_DataGrid_DataSource_Array/pkg-descr b/databases/pear-Structures_DataGrid_DataSource_Array/pkg-descr
index 155bc293dcbd..98268503bbb2 100644
--- a/databases/pear-Structures_DataGrid_DataSource_Array/pkg-descr
+++ b/databases/pear-Structures_DataGrid_DataSource_Array/pkg-descr
@@ -1,4 +1,2 @@
 This is a DataSource driver for Structures_DataGrid using arrays. It is a
 base package for some other DataSource drivers like CSV or XML.
-
-WWW: https://pear.php.net/package/Structures_DataGrid_DataSource_Array
diff --git a/databases/pear-Structures_DataGrid_DataSource_CSV/Makefile b/databases/pear-Structures_DataGrid_DataSource_CSV/Makefile
index 96bf82bdad53..785b1b5119a0 100644
--- a/databases/pear-Structures_DataGrid_DataSource_CSV/Makefile
+++ b/databases/pear-Structures_DataGrid_DataSource_CSV/Makefile
@@ -1,11 +1,10 @@
-# Created by: Martin Wilke <miwi@FreeBSD.org>
-
 PORTNAME=	Structures_DataGrid_DataSource_CSV
 PORTVERSION=	0.1.6
 CATEGORIES=	databases www pear
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	DataSource driver using CSV files
+WWW=		https://pear.php.net/package/Structures_DataGrid_DataSource_CSV
 
 LICENSE=	BSD2CLAUSE
 
diff --git a/databases/pear-Structures_DataGrid_DataSource_CSV/pkg-descr b/databases/pear-Structures_DataGrid_DataSource_CSV/pkg-descr
index 56d5e7c02c09..82caf1ec006a 100644
--- a/databases/pear-Structures_DataGrid_DataSource_CSV/pkg-descr
+++ b/databases/pear-Structures_DataGrid_DataSource_CSV/pkg-descr
@@ -1,3 +1 @@
 This is a DataSource driver for Structures_DataGrid using CSV files.
-
-WWW: https://pear.php.net/package/Structures_DataGrid_DataSource_CSV
diff --git a/databases/pear-Structures_DataGrid_DataSource_DB/Makefile b/databases/pear-Structures_DataGrid_DataSource_DB/Makefile
index 27a842ff9a62..3dd67cedda1c 100644
--- a/databases/pear-Structures_DataGrid_DataSource_DB/Makefile
+++ b/databases/pear-Structures_DataGrid_DataSource_DB/Makefile
@@ -1,11 +1,10 @@
-# Created by: Nick Hilliard <nick@foobar.org>
-
 PORTNAME=	Structures_DataGrid_DataSource_DB
 PORTVERSION=	0.1.1
 CATEGORIES=	databases www pear
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	DB datasource driver for pear-Structures_DataGrid
+WWW=		https://pear.php.net/package/Structures_DataGrid_DataSource_DB
 
 LICENSE=	BSD2CLAUSE
 
diff --git a/databases/pear-Structures_DataGrid_DataSource_DB/pkg-descr b/databases/pear-Structures_DataGrid_DataSource_DB/pkg-descr
index dfb6139c67ee..4ac745121600 100644
--- a/databases/pear-Structures_DataGrid_DataSource_DB/pkg-descr
+++ b/databases/pear-Structures_DataGrid_DataSource_DB/pkg-descr
@@ -1,5 +1,3 @@
 This is DataSource driver for Structures_DataGrid which uses PEAR::DB.
 Please note that this driver is deprecated. Consider using DBQuery or MDB2
 DataSource drivers instead.
-
-WWW: https://pear.php.net/package/Structures_DataGrid_DataSource_DB
diff --git a/databases/pear-Structures_DataGrid_DataSource_PDO/Makefile b/databases/pear-Structures_DataGrid_DataSource_PDO/Makefile
index 21a0fc6db5f3..c1c7817064f2 100644
--- a/databases/pear-Structures_DataGrid_DataSource_PDO/Makefile
+++ b/databases/pear-Structures_DataGrid_DataSource_PDO/Makefile
@@ -1,11 +1,10 @@
-# Created by: Martin Wilke <miwi@FreeBSD.org>
-
 PORTNAME=	Structures_DataGrid_DataSource_PDO
 PORTVERSION=	0.2.0
 CATEGORIES=	databases www pear
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	DataSource driver using PHP Data Objects (PDO) and an SQL query
+WWW=		https://pear.php.net/package/Structures_DataGrid_DataSource_PDO
 
 LICENSE=	BSD2CLAUSE
 
diff --git a/databases/pear-Structures_DataGrid_DataSource_PDO/pkg-descr b/databases/pear-Structures_DataGrid_DataSource_PDO/pkg-descr
index 3357dc3ec71c..c6ceeb96a346 100644
--- a/databases/pear-Structures_DataGrid_DataSource_PDO/pkg-descr
+++ b/databases/pear-Structures_DataGrid_DataSource_PDO/pkg-descr
@@ -1,4 +1,2 @@
 This is a DataSource driver for Structures_DataGrid using PHP Data Objects
 (PDO) and an SQL query.
-
-WWW: https://pear.php.net/package/Structures_DataGrid_DataSource_PDO
diff --git a/databases/pear-XML_Query2XML/Makefile b/databases/pear-XML_Query2XML/Makefile
index 800d12a61140..3e7413137c4b 100644
--- a/databases/pear-XML_Query2XML/Makefile
+++ b/databases/pear-XML_Query2XML/Makefile
@@ -1,11 +1,10 @@
-# Created by: wenheping<wenheping@gmail.com>
-
 PORTNAME=	XML_Query2XML
 PORTVERSION=	1.7.2
 CATEGORIES=	databases pear
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	PEAR class transform SQL queries into XML data
+WWW=		https://pear.php.net/package/XML_Query2XML
 
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/LICENSE
diff --git a/databases/pear-XML_Query2XML/pkg-descr b/databases/pear-XML_Query2XML/pkg-descr
index 31425d6be7bc..a5c3df08536c 100644
--- a/databases/pear-XML_Query2XML/pkg-descr
+++ b/databases/pear-XML_Query2XML/pkg-descr
@@ -2,5 +2,3 @@ XML_Query2XML allows you to transform the records retrieved with one or
 more SQL SELECT queries into XML data. Very simple to highly complex
 transformations are supported. Is was written with performance in mind
 and can handel large amounts of data.
-
-WWW: https://pear.php.net/package/XML_Query2XML
diff --git a/databases/pecl-cassandra/Makefile b/databases/pecl-cassandra/Makefile
deleted file mode 100644
index 7b8b0f20f0fb..000000000000
--- a/databases/pecl-cassandra/Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-PORTNAME=	cassandra
-PORTVERSION=	1.3.2
-CATEGORIES=	databases
-
-MAINTAINER=	daniel@blodan.se
-COMMENT=	Extension to access Cassandra
-
-LICENSE=	APACHE20
-LICENSE_FILE=	${WRKSRC}/LICENSE
-
-LIB_DEPENDS=	libuv.so:devel/libuv \
-		libcassandra.so:databases/cassandra-cpp-driver \
-		libgmp.so:math/gmp
-
-USES=		php:pecl localbase
-IGNORE_WITH_PHP=	74 80
-
-.include <bsd.port.mk>
diff --git a/databases/pecl-cassandra/distinfo b/databases/pecl-cassandra/distinfo
deleted file mode 100644
index 8ac7eb4fd113..000000000000
--- a/databases/pecl-cassandra/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1539110312
-SHA256 (PECL/cassandra-1.3.2.tgz) = ff80de20482021266426e8c431a2205bc9cb5c18caebe0219de709f6745025df
-SIZE (PECL/cassandra-1.3.2.tgz) = 163700
diff --git a/databases/pecl-cassandra/pkg-descr b/databases/pecl-cassandra/pkg-descr
deleted file mode 100644
index 32338c8a00ad..000000000000
--- a/databases/pecl-cassandra/pkg-descr
+++ /dev/null
@@ -1,7 +0,0 @@
-A modern, feature-rich and highly tunable PHP client 
-library for Apache Cassandra and DataStax Enterprise.
-
-Using exclusively Cassandra's binary protocol and 
-Cassandra Query Language v3.
-
-WWW: https://pecl.php.net/package/cassandra
diff --git a/databases/pecl-couchbase/Makefile b/databases/pecl-couchbase/Makefile
index 2a4d50f0375a..e9b2de931bd6 100644
--- a/databases/pecl-couchbase/Makefile
+++ b/databases/pecl-couchbase/Makefile
@@ -1,21 +1,17 @@
-# Created by: John Chen <johnpupu@gmail.com>
-
 PORTNAME=	couchbase
-DISTVERSION=	2.6.2
+PORTVERSION=	4.1.6
 CATEGORIES=	databases
+MASTER_SITES=	https://github.com/couchbase/couchbase-php-client/releases/download/${PORTVERSION}/
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Couchbase Server PHP extension
+WWW=		https://pecl.php.net/package/couchbase \
+		https://github.com/couchbase/couchbase-php-client
 
 LICENSE=	APACHE20
-LICENSE_FILE=	${WRKSRC}/LICENSE
-
-BUILD_DEPENDS=	libcouchbase>=2.10.7:databases/libcouchbase
-LIB_DEPENDS=	libcouchbase.so:databases/libcouchbase
 
-USES=		php:pecl
-USE_PHP=	json:build
+USES=		cmake:indirect compiler:c++17-lang php:build,pecl
 
-IGNORE_WITH_PHP=80
+CONFIGURE_ARGS=	COUCHBASE_CMAKE_EXTRA="-DCOUCHBASE_CXX_CLIENT_EMBED_MOZILLA_CA_BUNDLE=OFF"
 
 .include <bsd.port.mk>
diff --git a/databases/pecl-couchbase/distinfo b/databases/pecl-couchbase/distinfo
index 16aa418973b4..64cfcc96cead 100644
--- a/databases/pecl-couchbase/distinfo
+++ b/databases/pecl-couchbase/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1596360718
-SHA256 (PECL/couchbase-2.6.2.tgz) = 4f4c1a84edd05891925d7990e8425c00c064f8012ef711a1a7e222df9ad14252
-SIZE (PECL/couchbase-2.6.2.tgz) = 174899
+TIMESTAMP = 1697030426
+SHA256 (PECL/couchbase-4.1.6.tgz) = 43da457eceb494a8fee95cbb7ff9383efe66899f525cf530760507257080597f
+SIZE (PECL/couchbase-4.1.6.tgz) = 2134043
diff --git a/databases/pecl-couchbase/pkg-descr b/databases/pecl-couchbase/pkg-descr
index 2b5ef69318b6..bafbc4e44f73 100644
--- a/databases/pecl-couchbase/pkg-descr
+++ b/databases/pecl-couchbase/pkg-descr
@@ -1,4 +1,2 @@
 The PHP client library provides fast access to documents stored in
 a Couchbase Server.
-
-WWW: https://pecl.php.net/package/couchbase
diff --git a/databases/pecl-leveldb/Makefile b/databases/pecl-leveldb/Makefile
index bd7faf64bb97..e697c56d536f 100644
--- a/databases/pecl-leveldb/Makefile
+++ b/databases/pecl-leveldb/Makefile
@@ -1,11 +1,10 @@
-# Created by: johnpupu <johnpupu@gmail.com>
-
 PORTNAME=	leveldb
 PORTVERSION=	0.3.0
 CATEGORIES=	databases
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	PHP bindings for Google LevelDB
+WWW=		https://pecl.php.net/package/leveldb
 
 LICENSE=	PHP301
 
diff --git a/databases/pecl-leveldb/pkg-descr b/databases/pecl-leveldb/pkg-descr
index de839fbfc9c5..ed1fac5bff00 100644
--- a/databases/pecl-leveldb/pkg-descr
+++ b/databases/pecl-leveldb/pkg-descr
@@ -1,3 +1 @@
 This extension is a PHP binding for Google LevelDB
-
-WWW: https://pecl.php.net/package/leveldb
diff --git a/databases/pecl-memcache/Makefile b/databases/pecl-memcache/Makefile
index b81390c6050d..b3bc5bd35ebb 100644
--- a/databases/pecl-memcache/Makefile
+++ b/databases/pecl-memcache/Makefile
@@ -1,11 +1,10 @@
-# Created by: Gerrit Beine <tux@pinguru.net>
-
 PORTNAME=	memcache
-PORTVERSION=	8.0
+PORTVERSION=	8.2
 CATEGORIES=	databases
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Memcached extension
+WWW=		https://github.com/websupport-sk/pecl-memcache
 
 LICENSE=	PHP30
 LICENSE_FILE=	${WRKSRC}/LICENSE
diff --git a/databases/pecl-memcache/distinfo b/databases/pecl-memcache/distinfo
index d7f2cef5534a..e27df793a324 100644
--- a/databases/pecl-memcache/distinfo
+++ b/databases/pecl-memcache/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1608366120
-SHA256 (PECL/memcache-8.0.tgz) = defe33e6f7831d82b7283b95e14a531070531acbf21278f3f0d7050505cf3395
-SIZE (PECL/memcache-8.0.tgz) = 78448
+TIMESTAMP = 1684104356
+SHA256 (PECL/memcache-8.2.tgz) = b3f0640eacdeb9046c6c86a1546d7fb8a4e9f219e5d9a36a287e59b2dd8208e5
+SIZE (PECL/memcache-8.2.tgz) = 78413
diff --git a/databases/pecl-memcache/pkg-descr b/databases/pecl-memcache/pkg-descr
index 851bf2a4e2a5..3759e7a09fa2 100644
--- a/databases/pecl-memcache/pkg-descr
+++ b/databases/pecl-memcache/pkg-descr
@@ -1,5 +1,3 @@
 Memcached is a caching daemon designed especially for dynamic web applications
 to decrease database load by storing objects in memory. This extension allows
 you to work with memcached through handy OO and procedural interfaces.
-
-WWW: https://github.com/websupport-sk/pecl-memcache
diff --git a/databases/pecl-memcached/Makefile b/databases/pecl-memcached/Makefile
index e38771c7b724..90bded092a34 100644
--- a/databases/pecl-memcached/Makefile
+++ b/databases/pecl-memcached/Makefile
@@ -1,12 +1,11 @@
-# Created by: Gea-Suan Lin <gslin@gslin.org>
-
 PORTNAME=	memcached
-PORTVERSION=	3.1.5
-PORTREVISION=	1
+PORTVERSION=	3.2.0
 CATEGORIES=	databases
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	PHP extension for interfacing with memcached via libmemcached library
+WWW=		https://pecl.php.net/package/memcached \
+		https://github.com/php-memcached-dev/php-memcached
 
 LICENSE=	PHP30
 LICENSE_FILE=	${WRKSRC}/LICENSE
@@ -14,19 +13,14 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 BUILD_DEPENDS=	libmemcached>=1.0.18:databases/libmemcached
 LIB_DEPENDS=	libmemcached.so:databases/libmemcached
 
-USES=		php:pecl pkgconfig
-USE_PHP=	json:build session:build
+USES=		php:build,pecl pkgconfig
+USE_PHP=	session:build
 
 CONFIGURE_ARGS=	--enable-memcached-json \
 		--enable-memcached-protocol \
 		--enable-memcached-session \
 		--with-libmemcached-dir=${LOCALBASE}
 
-GH_ACCOUNT=	php-memcached-dev
-GH_PROJECT=	php-memcached
-GH_TAGNAME=	058e9f5
-USE_GITHUB=	yes
-
 OPTIONS_DEFINE=	IGBINARY MSGPACK SASL
 OPTIONS_DEFAULT=SASL
 IGBINARY_DESC=	Binary serializer support
diff --git a/databases/pecl-memcached/distinfo b/databases/pecl-memcached/distinfo
index 0a9dee308bf2..d2f23d9787b4 100644
--- a/databases/pecl-memcached/distinfo
+++ b/databases/pecl-memcached/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1626714774
-SHA256 (PECL/php-memcached-dev-php-memcached-3.1.5-058e9f5_GH0.tar.gz) = d043c984e66ece589bba3aab02aa7974ae36f9b67b39036bc00e574dab834ca9
-SIZE (PECL/php-memcached-dev-php-memcached-3.1.5-058e9f5_GH0.tar.gz) = 96398
+TIMESTAMP = 1649423734
+SHA256 (PECL/memcached-3.2.0.tgz) = 2a41143a7b29f4a962a3805b77aa207a99e4566e2d314ce98a051cd24d6e9636
+SIZE (PECL/memcached-3.2.0.tgz) = 90722
diff --git a/databases/pecl-memcached/pkg-descr b/databases/pecl-memcached/pkg-descr
index 0e244657969b..929f076f2e43 100644
--- a/databases/pecl-memcached/pkg-descr
+++ b/databases/pecl-memcached/pkg-descr
@@ -4,6 +4,3 @@ web applications by alleviating database load.
 
 This extension uses libmemcached library to provide API for
 communicating with memcached servers.
-
-WWW: https://pecl.php.net/package/memcached
-WWW: https://github.com/php-memcached-dev/php-memcached
diff --git a/databases/pecl-mongodb/Makefile b/databases/pecl-mongodb/Makefile
index 0ff560cd077e..7274712a2561 100644
--- a/databases/pecl-mongodb/Makefile
+++ b/databases/pecl-mongodb/Makefile
@@ -1,14 +1,13 @@
 PORTNAME=	mongodb
-PORTVERSION=	1.9.1
+PORTVERSION=	1.18.0
 CATEGORIES=	databases pear
 
 MAINTAINER=	pi@FreeBSD.org
 COMMENT=	PECL classes for MongoDB
+WWW=		https://docs.mongodb.org/ecosystem/drivers/php/
 
 LICENSE=	APACHE20
 
-USES=		gmake php:pecl ssl
-USE_PHP=	spl:build
-CFLAGS+=	-I${LOCALBASE}/include
+USES=		gmake localbase php:build,pecl ssl
 
 .include <bsd.port.mk>
diff --git a/databases/pecl-mongodb/distinfo b/databases/pecl-mongodb/distinfo
index 3d3a8ddccb1a..7c02c7bdfd7a 100644
--- a/databases/pecl-mongodb/distinfo
+++ b/databases/pecl-mongodb/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1619863338
-SHA256 (PECL/mongodb-1.9.1.tgz) = e9d1ce23168385aae24d9b516cab3d67504c85e800569e0fcf2f2125bcd6fed7
-SIZE (PECL/mongodb-1.9.1.tgz) = 1285984
+TIMESTAMP = 1711988801
+SHA256 (PECL/mongodb-1.18.0.tgz) = 6c36290441d72f2b0520bd8ab1d50c80de4c42240db6ff502e3db04c29bd8b54
+SIZE (PECL/mongodb-1.18.0.tgz) = 2074093
diff --git a/databases/pecl-mongodb/files/patch-src_libmongocrypt_src_os__posix_os__dll.c b/databases/pecl-mongodb/files/patch-src_libmongocrypt_src_os__posix_os__dll.c
new file mode 100644
index 000000000000..66969fe7aa00
--- /dev/null
+++ b/databases/pecl-mongodb/files/patch-src_libmongocrypt_src_os__posix_os__dll.c
@@ -0,0 +1,10 @@
+--- src/libmongocrypt/src/os_posix/os_dll.c.orig	2024-03-10 13:26:23.114373000 +0100
++++ src/libmongocrypt/src/os_posix/os_dll.c	2024-03-10 13:26:34.648726000 +0100
+@@ -98,6 +98,7 @@
+ #elif defined(__linux__) || defined(__FreeBSD__)
+ 
+ #include <link.h>
++#include <dlfcn.h>
+ 
+ mcr_dll_path_result mcr_dll_path(mcr_dll dll) {
+     struct link_map *map;
diff --git a/databases/pecl-mongodb/pkg-descr b/databases/pecl-mongodb/pkg-descr
index 3bdabdec2cc0..6e16dd8096d0 100644
--- a/databases/pecl-mongodb/pkg-descr
+++ b/databases/pecl-mongodb/pkg-descr
@@ -1,3 +1 @@
 pecl-mongodb provides an interface for communicating with MongoDB in PHP.
-
-WWW: https://docs.mongodb.org/ecosystem/drivers/php/
diff --git a/databases/pecl-redis/Makefile b/databases/pecl-redis/Makefile
index 0f57b912adf8..57d9a2dba39e 100644
--- a/databases/pecl-redis/Makefile
+++ b/databases/pecl-redis/Makefile
@@ -1,15 +1,17 @@
 PORTNAME=	redis
-PORTVERSION=	5.3.2
+PORTVERSION=	5.3.7
+PORTREVISION=	1
 CATEGORIES=	databases
 
 MAINTAINER=	daniel@blodan.se
 COMMENT=	Extension to access Redis
+WWW=		https://pecl.php.net/package/redis
 
 LICENSE=	PHP301
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-USES=		php:pecl
-USE_PHP=	hash:build json:build session:build
+USES=		php:build,pecl
+USE_PHP=	session:build
 
 OPTIONS_DEFINE=	IGBINARY
 IGBINARY_DESC=	Build with Igbinary serializer
diff --git a/databases/pecl-redis/distinfo b/databases/pecl-redis/distinfo
index c53894c88efc..79c03d9d7e45 100644
--- a/databases/pecl-redis/distinfo
+++ b/databases/pecl-redis/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1604390991
-SHA256 (PECL/redis-5.3.2.tgz) = f4e92de628abcb917cdc810df045ca3fa0f2af34673eaa2a03350e3c5c5fdab1
-SIZE (PECL/redis-5.3.2.tgz) = 266814
+TIMESTAMP = 1671186810
+SHA256 (PECL/redis-5.3.7.tgz) = b958166ccda4f40bd17c6998f9e2239021ae644467cd8ad5c15def420aad65b0
+SIZE (PECL/redis-5.3.7.tgz) = 275200
diff --git a/databases/pecl-redis/files/patch-redis.c b/databases/pecl-redis/files/patch-redis.c
new file mode 100644
index 000000000000..68a2dc1488f4
--- /dev/null
+++ b/databases/pecl-redis/files/patch-redis.c
@@ -0,0 +1,12 @@
+--- redis.c.orig	2022-02-15 18:25:22 UTC
++++ redis.c
+@@ -154,6 +154,9 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_pconnect, 0, 0, 1)
+     ZEND_ARG_INFO(0, host)
+     ZEND_ARG_INFO(0, port)
+     ZEND_ARG_INFO(0, timeout)
++    ZEND_ARG_INFO(0, persistent_id)
++    ZEND_ARG_INFO(0, retry_interval)
++    ZEND_ARG_INFO(0, read_timeout)
+ ZEND_END_ARG_INFO()
+ 
+ ZEND_BEGIN_ARG_INFO_EX(arginfo_mget, 0, 0, 1)
diff --git a/databases/pecl-redis/pkg-descr b/databases/pecl-redis/pkg-descr
index a23d5e2c08cf..722ecf4d04b5 100644
--- a/databases/pecl-redis/pkg-descr
+++ b/databases/pecl-redis/pkg-descr
@@ -1,5 +1,3 @@
 This extension provides an API for communicating with Redis database,
 a persistent key-value database with built-in net interface written
 in ANSI-C for Posix systems.
-
-WWW: https://pecl.php.net/package/redis
diff --git a/databases/pecl-rrd/Makefile b/databases/pecl-rrd/Makefile
index 0d9e2ef27b6b..12999f75834f 100644
--- a/databases/pecl-rrd/Makefile
+++ b/databases/pecl-rrd/Makefile
@@ -1,10 +1,10 @@
 PORTNAME=	rrd
-DISTVERSION=	2.0.1
-PORTREVISION=	1
+DISTVERSION=	2.0.3
 CATEGORIES=	databases pear
 
 MAINTAINER=	flo@FreeBSD.org
 COMMENT=	PHP bindings to rrd tool system
+WWW=		https://pecl.php.net/package/rrd
 
 LICENSE=	PHP301
 
diff --git a/databases/pecl-rrd/distinfo b/databases/pecl-rrd/distinfo
index e31049fe6644..c9a25a4b1ae6 100644
--- a/databases/pecl-rrd/distinfo
+++ b/databases/pecl-rrd/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1497340386
-SHA256 (PECL/rrd-2.0.1.tgz) = 39f5ae515de003d8dad6bfd77db60f5bd5b4a9f6caa41479b1b24b0d6592715d
-SIZE (PECL/rrd-2.0.1.tgz) = 18880
+TIMESTAMP = 1645296404
+SHA256 (PECL/rrd-2.0.3.tgz) = a42161e58cdc8a853b72cff298989dcbde82b0f76456dd59ce02854c92b730f7
+SIZE (PECL/rrd-2.0.3.tgz) = 19178
diff --git a/databases/pecl-rrd/files/patch-rrd.c b/databases/pecl-rrd/files/patch-rrd.c
deleted file mode 100644
index 943f0ed3f8f3..000000000000
--- a/databases/pecl-rrd/files/patch-rrd.c
+++ /dev/null
@@ -1,25 +0,0 @@
---- rrd.c.orig	2020-08-28 12:06:18 UTC
-+++ rrd.c
-@@ -55,7 +55,7 @@ PHP_FUNCTION(rrd_fetch)
- 	rrd_args *argv;
- 	/* returned values if rrd_fetch doesn't fail */
- 	time_t start, end;
--	ulong step,
-+	u_long step,
- 	ds_cnt; /* count of data sources */
- 	char **ds_namv; /* list of data source names */
- 	rrd_value_t *ds_data; /* all data from all sources */
-@@ -396,11 +396,11 @@ PHP_FUNCTION(rrd_xport)
- 	/* return values from rrd_xport */
- 	int xxsize;
- 	time_t start, end, time_index;
--	ulong step, outvar_count;
-+	u_long step, outvar_count;
- 	char **legend_v;
- 	rrd_value_t *data, *data_ptr;
- 	zval zv_data;
--	ulong outvar_index;
-+	u_long outvar_index;
- 
- 	if (zend_parse_parameters(ZEND_NUM_ARGS(), "a", &zv_arr_options) == FAILURE) {
- 		return;
diff --git a/databases/pecl-rrd/pkg-descr b/databases/pecl-rrd/pkg-descr
index c554acbebd09..dc984d85f549 100644
--- a/databases/pecl-rrd/pkg-descr
+++ b/databases/pecl-rrd/pkg-descr
@@ -1,4 +1,2 @@
 Procedural and simple OO wrapper for rrdtool - data logging and graphing system
 for time series data.
-
-WWW: http://www.pecl.php.net/package/rrd/
diff --git a/databases/percona-orchestrator/Makefile b/databases/percona-orchestrator/Makefile
new file mode 100644
index 000000000000..4bc9e2e72c6b
--- /dev/null
+++ b/databases/percona-orchestrator/Makefile
@@ -0,0 +1,100 @@
+PORTNAME=	orchestrator
+DISTVERSIONPREFIX=	v
+DISTVERSION=	3.2.6-12
+PORTREVISION=	1
+CATEGORIES=	databases
+PKGNAMEPREFIX=	percona-
+
+MAINTAINER=	zi@FreeBSD.org
+COMMENT=	Replication topology manager for MySQL
+WWW=		https://github.com/percona/orchestrator
+
+LICENSE=	APACHE20
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
+RUN_DEPENDS=	bash>0:shells/bash \
+		gsed>0:textproc/gsed \
+		jq>0:textproc/jq
+
+USES=		go mysql:server shebangfix
+
+USERS=		percona
+GROUPS=		percona
+
+USE_GITHUB=	yes
+GH_ACCOUNT=	percona
+USE_RC_SUBR=	${PKGNAMEPREFIX}${PORTNAME}
+SUB_FILES=	pkg-message
+SHEBANG_FILES=	resources/bin/orchestrator-client
+
+GO_PKGNAME=	github.com/openark/${PORTNAME}
+GO_TARGET=	./go/cmd/${PORTNAME}
+GO_BUILDFLAGS=	-ldflags '-X main.AppVersion=${DISTVERSION} -X main.BuildDescribe=${DISTVERSION}'
+
+GH_TUPLE=	\
+		Showmax:go-fqdn:v1.0.0:showmax_go_fqdn/vendor/github.com/Showmax/go-fqdn \
+		armon:consul-api:eb2c6b5be1b6:armon_consul_api/vendor/github.com/armon/consul-api \
+		armon:go-metrics:f0300d1749da:armon_go_metrics/vendor/github.com/armon/go-metrics \
+		codegangsta:inject:33e0aa1cb7c0:codegangsta_inject/vendor/github.com/codegangsta/inject \
+		cyberdelia:go-metrics-graphite:39f87cc3b432:cyberdelia_go_metrics_graphite/vendor/github.com/cyberdelia/go-metrics-graphite \
+		fatih:color:v1.10.0:fatih_color/vendor/github.com/fatih/color \
+		go-gcfg:gcfg:v1.2.3:go_gcfg_gcfg/vendor/gopkg.in/gcfg.v1 \
+		go-martini:martini:22fa46961aab:go_martini_martini/vendor/github.com/go-martini/martini \
+		go-sql-driver:mysql:v1.7.1:go_sql_driver_mysql/vendor/github.com/go-sql-driver/mysql \
+		go-warnings:warnings:v0.1.2:go_warnings_warnings/vendor/gopkg.in/warnings.v0 \
+		golang:crypto:630584e8d5aa:golang_crypto/vendor/golang.org/x/crypto \
+		golang:net:bea034e7d591:golang_net/vendor/golang.org/x/net \
+		golang:sys:3c1f35247d10:golang_sys/vendor/golang.org/x/sys \
+		golang:term:03fcf44c2211:golang_term/vendor/golang.org/x/term \
+		golang:text:v0.3.8:golang_text/vendor/golang.org/x/text \
+		google:btree:v1.0.0:google_btree/vendor/github.com/google/btree \
+		hashicorp:consul:v1.7.0:hashicorp_consul_api/vendor/github.com/hashicorp/consul \
+		hashicorp:go-cleanhttp:d3fcbee8e181:hashicorp_go_cleanhttp/vendor/github.com/hashicorp/go-cleanhttp \
+		hashicorp:go-hclog:59fbd7b93270:hashicorp_go_hclog/vendor/github.com/hashicorp/go-hclog \
+		hashicorp:go-immutable-radix:v1.3.0:hashicorp_go_immutable_radix/vendor/github.com/hashicorp/go-immutable-radix \
+		hashicorp:go-msgpack:v0.5.3:hashicorp_go_msgpack/vendor/github.com/hashicorp/go-msgpack \
+		hashicorp:go-rootcerts:c8a9a31cbd76:hashicorp_go_rootcerts/vendor/github.com/hashicorp/go-rootcerts \
+		hashicorp:go-sockaddr:v1.0.2:hashicorp_go_sockaddr/vendor/github.com/hashicorp/go-sockaddr \
+		hashicorp:go-uuid:v1.0.2:hashicorp_go_uuid/vendor/github.com/hashicorp/go-uuid \
+		hashicorp:golang-lru:v0.5.4:hashicorp_golang_lru/vendor/github.com/hashicorp/golang-lru \
+		hashicorp:serf:v0.9.5:hashicorp_serf/vendor/github.com/hashicorp/serf \
+		howeyc:gopass:7cb4b85ec19c:howeyc_gopass/vendor/github.com/howeyc/gopass \
+		martini-contrib:auth:fa62c19b7ae8:martini_contrib_auth/vendor/github.com/martini-contrib/auth \
+		martini-contrib:gzip:6c035326b43f:martini_contrib_gzip/vendor/github.com/martini-contrib/gzip \
+		martini-contrib:render:ec18f8345a11:martini_contrib_render/vendor/github.com/martini-contrib/render \
+		mattn:go-colorable:v0.1.8:mattn_go_colorable/vendor/github.com/mattn/go-colorable \
+		mattn:go-isatty:cb30d6282491:mattn_go_isatty/vendor/github.com/mattn/go-isatty \
+		mattn:go-sqlite3:v1.14.7:mattn_go_sqlite3/vendor/github.com/mattn/go-sqlite3 \
+		miekg:dns:v1.1.31:miekg_dns/vendor/github.com/miekg/dns \
+		mitchellh:go-homedir:v1.1.0:mitchellh_go_homedir/vendor/github.com/mitchellh/go-homedir \
+		mitchellh:go-testing-interface:v1.14.0:mitchellh_go_testing_interface/vendor/github.com/mitchellh/go-testing-interface \
+		mitchellh:mapstructure:v1.3.3:mitchellh_mapstructure/vendor/github.com/mitchellh/mapstructure \
+		montanaflynn:stats:f8cd06f93c6c:montanaflynn_stats/vendor/github.com/montanaflynn/stats \
+		openark:golib:827f3ea62180:openark_golib \
+		openark:raft:fba9f909f7fe:openark_raft/vendor/github.com/hashicorp/raft \
+		outbrain:golib:2531e5dbcc71:outbrain_golib/vendor/github.com/outbrain/golib \
+		oxtoacart:bpool:03653db5a59c:oxtoacart_bpool/vendor/github.com/oxtoacart/bpool \
+		patrickmn:go-cache:v2.1.0:patrickmn_go_cache/vendor/github.com/patrickmn/go-cache \
+		rcrowley:go-metrics:cf1acfcdf475:rcrowley_go_metrics/vendor/github.com/rcrowley/go-metrics \
+		samuel:go-zookeeper:7117e9ea2414:samuel_go_zookeeper/vendor/github.com/samuel/go-zookeeper \
+		sjmudd:stopwatch:637ef30077b7:sjmudd_stopwatch/vendor/github.com/sjmudd/stopwatch \
+		stretchr:testify:v1.6.1:stretchr_testify/vendor/github.com/stretchr/testify
+
+post-extract:
+	@${RLN} ${WRKSRC_openark_golib} ${WRKSRC}/go/golib
+
+post-patch:
+	@${REINPLACE_CMD} -e 's|"resources|"${DATADIR}|g' ${WRKSRC}/go/app/http.go
+
+do-install:
+	@${MKDIR} ${STAGEDIR}${PREFIX}/bin ${STAGEDIR}${PREFIX}/sbin
+	${INSTALL_SCRIPT} ${WRKSRC}/resources/bin/orchestrator-client ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKDIR}/bin/${PORTNAME} ${STAGEDIR}${PREFIX}/sbin
+
+post-install:
+	@${MKDIR} ${STAGEDIR}${ETCDIR} ${STAGEDIR}${DATADIR}
+	@(cd ${WRKSRC}/resources/ && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR})
+	${INSTALL_DATA} ${WRKSRC}/conf/orchestrator-simple.conf.json \
+		${STAGEDIR}${ETCDIR}/orchestrator.conf.sample
+
+.include <bsd.port.mk>
diff --git a/databases/percona-orchestrator/distinfo b/databases/percona-orchestrator/distinfo
new file mode 100644
index 000000000000..89ccfa17fce1
--- /dev/null
+++ b/databases/percona-orchestrator/distinfo
@@ -0,0 +1,97 @@
+TIMESTAMP = 1712256381
+SHA256 (percona-orchestrator-v3.2.6-12_GH0.tar.gz) = 6ea9d25494f66fd67b18c71e155bc810ee13ea499617ffe2ec5e3caf17197d93
+SIZE (percona-orchestrator-v3.2.6-12_GH0.tar.gz) = 7913143
+SHA256 (Showmax-go-fqdn-v1.0.0_GH0.tar.gz) = 99c53987211042ccd088193792c458e2c4abd2377b599ada4cfb6188752dec99
+SIZE (Showmax-go-fqdn-v1.0.0_GH0.tar.gz) = 7305
+SHA256 (armon-consul-api-eb2c6b5be1b6_GH0.tar.gz) = c4707c2cf495f918b229991c818fe59acd28259d7e2d738551312eb5c4347c39
+SIZE (armon-consul-api-eb2c6b5be1b6_GH0.tar.gz) = 17989
+SHA256 (armon-go-metrics-f0300d1749da_GH0.tar.gz) = 27ff0a7294f6c031e5ec6c52cc5664ea2bec19c18a09b4d01ec2aa17587e90e8
+SIZE (armon-go-metrics-f0300d1749da_GH0.tar.gz) = 23852
+SHA256 (codegangsta-inject-33e0aa1cb7c0_GH0.tar.gz) = 7626f355fd6782529c24b2538c12e0d612bff6e4298e055158d692961c9f83ae
+SIZE (codegangsta-inject-33e0aa1cb7c0_GH0.tar.gz) = 5061
+SHA256 (cyberdelia-go-metrics-graphite-39f87cc3b432_GH0.tar.gz) = 702a9c872e66b4797c682cc7d455c2bde25ee8032ee9f68afb88a36d8901e2e0
+SIZE (cyberdelia-go-metrics-graphite-39f87cc3b432_GH0.tar.gz) = 3915
+SHA256 (fatih-color-v1.10.0_GH0.tar.gz) = a00342a7ffb8b119346dce56e152a111cbb9eab3970c429cc2ed4272aec2858e
+SIZE (fatih-color-v1.10.0_GH0.tar.gz) = 1267532
+SHA256 (go-gcfg-gcfg-v1.2.3_GH0.tar.gz) = 3d60ba7a07e7d7d831a756f565c7fdc75895f294b2b69185674bb0ed70622645
+SIZE (go-gcfg-gcfg-v1.2.3_GH0.tar.gz) = 29146
+SHA256 (go-martini-martini-22fa46961aab_GH0.tar.gz) = 182c7c6237f9165adcde05bcbdab6ad493deb57cabd0c587d0f4c07e1aaca334
+SIZE (go-martini-martini-22fa46961aab_GH0.tar.gz) = 66070
+SHA256 (go-sql-driver-mysql-v1.7.1_GH0.tar.gz) = c6aaf1309cbeabdc43414a1230257b8943800643c581a3e2211d1efd5495a9c2
+SIZE (go-sql-driver-mysql-v1.7.1_GH0.tar.gz) = 95747
+SHA256 (go-warnings-warnings-v0.1.2_GH0.tar.gz) = 4712c4ceae321433d8c1d9ebc6afd154d7932c849129ded48b1c4a51c21275e8
+SIZE (go-warnings-warnings-v0.1.2_GH0.tar.gz) = 3769
+SHA256 (golang-crypto-630584e8d5aa_GH0.tar.gz) = 8e3a597010e5de9b02f1feae066510c52dd8de2b12069c24cff5424df833540b
+SIZE (golang-crypto-630584e8d5aa_GH0.tar.gz) = 1631349
+SHA256 (golang-net-bea034e7d591_GH0.tar.gz) = 72533b014a9e4185f38e84b82b52c9aaee212afcce7acddbcf7806647f749688
+SIZE (golang-net-bea034e7d591_GH0.tar.gz) = 1226414
+SHA256 (golang-sys-3c1f35247d10_GH0.tar.gz) = 27fdc75cc74da979f59142f1f5a1f08505c55918a0d5019ed4ebb04901834842
+SIZE (golang-sys-3c1f35247d10_GH0.tar.gz) = 1336787
+SHA256 (golang-term-03fcf44c2211_GH0.tar.gz) = 1919967c8fbf15de9261a2315d90072357524ee557d7df106b426def02a8e5f3
+SIZE (golang-term-03fcf44c2211_GH0.tar.gz) = 14972
+SHA256 (golang-text-v0.3.8_GH0.tar.gz) = f4f6c558d3b5530adbfc1e6787f82867801f86d9c7afc37f2ca03d630465a388
+SIZE (golang-text-v0.3.8_GH0.tar.gz) = 8358801
+SHA256 (google-btree-v1.0.0_GH0.tar.gz) = 9f53e0e1330a4dbe92100d516606791f7196bf828ba93d693ef4d5c1cbd5fe30
+SIZE (google-btree-v1.0.0_GH0.tar.gz) = 15292
+SHA256 (hashicorp-consul-v1.7.0_GH0.tar.gz) = 457162a2d5babe1f560c8e169528020d0c80e1fe5becc25fe286c4bf91f73bfb
+SIZE (hashicorp-consul-v1.7.0_GH0.tar.gz) = 22791557
+SHA256 (hashicorp-go-cleanhttp-d3fcbee8e181_GH0.tar.gz) = adc5cf3ec45757d574fab2aa1e744224b4963ed645a5444ce88f68f91d31a87a
+SIZE (hashicorp-go-cleanhttp-d3fcbee8e181_GH0.tar.gz) = 8063
+SHA256 (hashicorp-go-hclog-59fbd7b93270_GH0.tar.gz) = c81b79edb44e015054494655b0551b8657bd7eb0eb4f633bca2ce70fc276641d
+SIZE (hashicorp-go-hclog-59fbd7b93270_GH0.tar.gz) = 26159
+SHA256 (hashicorp-go-immutable-radix-v1.3.0_GH0.tar.gz) = 6072cfc76f23e45aee0a2a0d0a168d2005fdb15817ab4a23e52df40eb12cda38
+SIZE (hashicorp-go-immutable-radix-v1.3.0_GH0.tar.gz) = 25023
+SHA256 (hashicorp-go-msgpack-v0.5.3_GH0.tar.gz) = 6273c6c7c22d87d8bdbb08e50eb6cdcd1b6da79b577995c9fe70926b73b25938
+SIZE (hashicorp-go-msgpack-v0.5.3_GH0.tar.gz) = 49675
+SHA256 (hashicorp-go-rootcerts-c8a9a31cbd76_GH0.tar.gz) = 85cfbbb6e2570c4aae35a992f660bd8b5c728718202d040708d344e093077ae7
+SIZE (hashicorp-go-rootcerts-c8a9a31cbd76_GH0.tar.gz) = 12247
+SHA256 (hashicorp-go-sockaddr-v1.0.2_GH0.tar.gz) = ce70228b6c0ac432b97c2a98697600668bf7ac8b4cd21e7c6767bed1e755ae7f
+SIZE (hashicorp-go-sockaddr-v1.0.2_GH0.tar.gz) = 663049
+SHA256 (hashicorp-go-uuid-v1.0.2_GH0.tar.gz) = 2dee0f810c3e3a2cd3d49a075d0a64a88806c90712a4b66013b20a1ff0562eae
+SIZE (hashicorp-go-uuid-v1.0.2_GH0.tar.gz) = 7058
+SHA256 (hashicorp-golang-lru-v0.5.4_GH0.tar.gz) = d50c188af0cc8b22e7e4b79e9071694fa06428a9964b22d68dc997fa787a177a
+SIZE (hashicorp-golang-lru-v0.5.4_GH0.tar.gz) = 13428
+SHA256 (hashicorp-serf-v0.9.5_GH0.tar.gz) = a1ae9e387c9d5d7f58770d1864d72dbf0b8a27ba1595f07c3399a9dc7fbb9c50
+SIZE (hashicorp-serf-v0.9.5_GH0.tar.gz) = 2301292
+SHA256 (howeyc-gopass-7cb4b85ec19c_GH0.tar.gz) = f5f5131b92098d8b1bbf9645b9bfd1b22e6cce61807f97fab24dce79f7224073
+SIZE (howeyc-gopass-7cb4b85ec19c_GH0.tar.gz) = 11192
+SHA256 (martini-contrib-auth-fa62c19b7ae8_GH0.tar.gz) = 487ded1a35f74d22c0f9cc5459dec20f6cdb6abc103b19579df5ca0aba9031c0
+SIZE (martini-contrib-auth-fa62c19b7ae8_GH0.tar.gz) = 3227
+SHA256 (martini-contrib-gzip-6c035326b43f_GH0.tar.gz) = eba862e75a70f67d94db7f7d6a3e385a11a48f801aaa354a33e45661b681c33a
+SIZE (martini-contrib-gzip-6c035326b43f_GH0.tar.gz) = 3000
+SHA256 (martini-contrib-render-ec18f8345a11_GH0.tar.gz) = 42ce0fa9fe44c757cf586a92fa80032cab3e179ed92c8105f344f879d8f85050
+SIZE (martini-contrib-render-ec18f8345a11_GH0.tar.gz) = 7701
+SHA256 (mattn-go-colorable-v0.1.8_GH0.tar.gz) = 1027954f9abbe06b6e117e3047af70204dd0eb4f8c27fcd459fb2574b279755f
+SIZE (mattn-go-colorable-v0.1.8_GH0.tar.gz) = 9571
+SHA256 (mattn-go-isatty-cb30d6282491_GH0.tar.gz) = bfe6329ca6770ccd28796a63c3cbbce23663bc00960f80619ebd42a30d15d8c7
+SIZE (mattn-go-isatty-cb30d6282491_GH0.tar.gz) = 4470
+SHA256 (mattn-go-sqlite3-v1.14.7_GH0.tar.gz) = ed9922998dc82553a7cc5889747b123fc216a15036e7c3e1bdeea1acb68bc584
+SIZE (mattn-go-sqlite3-v1.14.7_GH0.tar.gz) = 2391718
+SHA256 (miekg-dns-v1.1.31_GH0.tar.gz) = f40eb494b6b14ba8796a3d561861bb7510031f29e780cfce0319419b1423776b
+SIZE (miekg-dns-v1.1.31_GH0.tar.gz) = 188593
+SHA256 (mitchellh-go-homedir-v1.1.0_GH0.tar.gz) = 646671c73a84a8dfb4a5a76b80c7b63549ffefa906524d45077301bc7da76600
+SIZE (mitchellh-go-homedir-v1.1.0_GH0.tar.gz) = 3362
+SHA256 (mitchellh-go-testing-interface-v1.14.0_GH0.tar.gz) = db647bce1fbe6a40c7fadc5a674377daaf26b34eeb1b8cb7888435669ea7d40a
+SIZE (mitchellh-go-testing-interface-v1.14.0_GH0.tar.gz) = 2753
+SHA256 (mitchellh-mapstructure-v1.3.3_GH0.tar.gz) = 660c2e8fd3c855022b2b566756eabe904167ce5ceb29ea3ce90ad0eb76ddd802
+SIZE (mitchellh-mapstructure-v1.3.3_GH0.tar.gz) = 26054
+SHA256 (montanaflynn-stats-f8cd06f93c6c_GH0.tar.gz) = daac2ec32e3591d0919959dcde756608aed6bfbc168765ae155bc6fd06a38acd
+SIZE (montanaflynn-stats-f8cd06f93c6c_GH0.tar.gz) = 17765
+SHA256 (openark-golib-827f3ea62180_GH0.tar.gz) = 144441e595c005522773b219d12369486bcfdda49f98209e7325432f894f2096
+SIZE (openark-golib-827f3ea62180_GH0.tar.gz) = 10019
+SHA256 (openark-raft-fba9f909f7fe_GH0.tar.gz) = 35a08131f4d9fc8f09403d76b6015b9e7ed93ec84ab49433946d5a8ab74197d8
+SIZE (openark-raft-fba9f909f7fe_GH0.tar.gz) = 68448
+SHA256 (outbrain-golib-2531e5dbcc71_GH0.tar.gz) = 16ea19c0580f681541b73ce3de9459190bcf7b53e28b48f091fbc6776c4a15b0
+SIZE (outbrain-golib-2531e5dbcc71_GH0.tar.gz) = 9387
+SHA256 (oxtoacart-bpool-03653db5a59c_GH0.tar.gz) = b5898969c50f5677fa8ea955bd7a06b77083b56ae76607f49ae1aed0abd61b41
+SIZE (oxtoacart-bpool-03653db5a59c_GH0.tar.gz) = 8478
+SHA256 (patrickmn-go-cache-v2.1.0_GH0.tar.gz) = 3ab025f2f580f8818a5357db52596fef1b0ad5945816a022c8b805ba46dc93be
+SIZE (patrickmn-go-cache-v2.1.0_GH0.tar.gz) = 13572
+SHA256 (rcrowley-go-metrics-cf1acfcdf475_GH0.tar.gz) = e15251850bd93b7e01a191d165a06027f7d8e9022e163c1b3a7cb58794de5d0c
+SIZE (rcrowley-go-metrics-cf1acfcdf475_GH0.tar.gz) = 37581
+SHA256 (samuel-go-zookeeper-7117e9ea2414_GH0.tar.gz) = 00664cc91bfbb4a0569c2f575934e707a10c25d3c4914bfc32e02e29146395ab
+SIZE (samuel-go-zookeeper-7117e9ea2414_GH0.tar.gz) = 40324
+SHA256 (sjmudd-stopwatch-637ef30077b7_GH0.tar.gz) = 107dd13b861b5c7d011e8bf4cc27e8e7dbeeae76d5818372248aad97594b18eb
+SIZE (sjmudd-stopwatch-637ef30077b7_GH0.tar.gz) = 3811
+SHA256 (stretchr-testify-v1.6.1_GH0.tar.gz) = 40fd7204ab72ca9d8759f1cc3604dd17f556a0f9177f6fc05dd0cad9f06e708f
+SIZE (stretchr-testify-v1.6.1_GH0.tar.gz) = 84215
diff --git a/databases/percona-orchestrator/files/patch-conf_orchestrator-simple.conf.json b/databases/percona-orchestrator/files/patch-conf_orchestrator-simple.conf.json
new file mode 100644
index 000000000000..873c1e67ce73
--- /dev/null
+++ b/databases/percona-orchestrator/files/patch-conf_orchestrator-simple.conf.json
@@ -0,0 +1,24 @@
+--- conf/orchestrator-simple.conf.json.orig	2024-04-05 14:26:48 UTC
++++ conf/orchestrator-simple.conf.json
+@@ -2,9 +2,9 @@
+   "#": "-----",
+   "#": "this is a comment. See further comment hints below.",
+   "#": "-----",
+-  "Debug": true,
+-  "EnableSyslog": false,
+-  "ListenAddress": ":3000",
++  "Debug": false,
++  "EnableSyslog": true,
++  "ListenAddress": "127.0.0.1:3000",
+   "MySQLTopologyUser": "orc_client_user",
+   "MySQLTopologyPassword": "orc_client_password",
+   "MySQLTopologyCredentialsConfigFile": "",
+@@ -58,7 +58,7 @@
+   "#": "-----",
+   "#": "security, access control:",
+   "#": "-----",
+-  "ReadOnly": false,
++  "ReadOnly": true,
+   "AuthenticationMethod": "",
+   "HTTPAuthUser": "",
+   "HTTPAuthPassword": "",
diff --git a/databases/percona-orchestrator/files/percona-orchestrator.in b/databases/percona-orchestrator/files/percona-orchestrator.in
new file mode 100644
index 000000000000..28ee4b357b33
--- /dev/null
+++ b/databases/percona-orchestrator/files/percona-orchestrator.in
@@ -0,0 +1,56 @@
+#!/bin/sh
+
+# PROVIDE: percona_orchestrator
+# REQUIRE: LOGIN mysql
+# KEYWORD: shutdown
+#
+# Add the following lines to /etc/rc.conf.local or /etc/rc.conf
+# to enable this service:
+#
+# percona_orchestrator_enable (bool):          Set to NO by default.
+#               Set it to YES to enable percona_orchestrator.
+# percona_orchestrator_user (string):          Set user that percona_orchestrator will run under
+#               Default is "percona".
+# percona_orchestrator_group (string):         Set group that percona_orchestrator will run under
+#               Default is "percona".
+# percona_orchestrator_config (string):        Set path to config file
+#               Default is "%%ETCDIR%%/orchestrator.cfg".
+# percona_orchestrator_args (string):          Set extra arguments to pass to percona_orchestrator
+#               Default is "".
+
+. /etc/rc.subr
+
+name=percona_orchestrator
+rcvar=percona_orchestrator_enable
+
+load_rc_config $name
+
+: ${percona_orchestrator_enable:="NO"}
+: ${percona_orchestrator_user:="percona"}
+: ${percona_orchestrator_group:="percona"}
+: ${percona_orchestrator_config:="%%ETCDIR%%/orchestrator.conf"}
+: ${percona_orchestrator_args:=""}
+: ${percona_orchestrator_restart_delay:="10"}
+
+
+pidfile="/var/run/orchestrator/orchestrator.pid"
+command="/usr/sbin/daemon"
+percona_orchestrator_command="%%PREFIX%%/sbin/orchestrator"
+command_args="-rP ${pidfile} -S -R ${percona_orchestrator_restart_delay} \
+    -T ${name} ${percona_orchestrator_command} \
+    -config ${percona_orchestrator_config} \
+    ${percona_orchestrator_args} http"
+required_files="${percona_orchestrator_config}"
+
+start_precmd=percona_start_precmd
+
+percona_start_precmd () {
+        local piddir
+        piddir=`/usr/bin/dirname "${pidfile}"`
+        if [ ! -d "${piddir}" ] ; then
+                /usr/bin/install -d -o "${percona_orchestrator_user}" -g "${percona_orchestrator_group}" "${piddir}"
+        fi
+}
+
+load_rc_config $name
+run_rc_command "$1"
diff --git a/databases/percona-orchestrator/files/pkg-message.in b/databases/percona-orchestrator/files/pkg-message.in
new file mode 100644
index 000000000000..23432d30ed6c
--- /dev/null
+++ b/databases/percona-orchestrator/files/pkg-message.in
@@ -0,0 +1,44 @@
+[
+{ type: install
+  message: <<EOM
+#### Setup backend MySQL server
+
+Setup a MySQL server for backend, and invoke the following:
+
+CREATE DATABASE IF NOT EXISTS orchestrator;
+CREATE USER 'orchestrator'@'127.0.0.1' IDENTIFIED BY 'orch_backend_password';
+GRANT ALL PRIVILEGES ON `orchestrator`.* TO 'orchestrator'@'127.0.0.1';
+
+Orchestrator uses a configuration file, located in:
+%%ETCDIR%%/orchestrator.conf.json
+
+Edit orchestrator.conf to match the above as follows:
+
+  ...
+  "MySQLOrchestratorHost": "127.0.0.1",
+  "MySQLOrchestratorPort": 3306,
+  "MySQLOrchestratorDatabase": "orchestrator",
+  "MySQLOrchestratorUser": "orchestrator",
+  "MySQLOrchestratorPassword": "orch_backend_password",
+  ...
+
+#### Grant access to orchestrator on all your MySQL servers
+
+CREATE USER 'orchestrator'@'orch_host' IDENTIFIED BY 'orch_topology_password';
+GRANT SUPER, PROCESS, REPLICATION SLAVE, RELOAD ON *.* TO 'orchestrator'@'orch_host';
+GRANT SELECT ON mysql.slave_master_info TO 'orchestrator'@'orch_host';
+GRANT SELECT ON ndbinfo.processes TO 'orchestrator'@'orch_host'; -- Only for NDB Cluster
+
+Replace `orch_host` with hostname or orchestrator machine (or do your
+wildcards thing). Choose your password wisely. Modify the configuration file to
+match:
+
+  "MySQLTopologyUser": "orchestrator",
+  "MySQLTopologyPassword": "orch_topology_password",
+
+By default, orchestrator listens on 127.0.0.1:3000 and is configured to be
+read-only.  Please update the configuration file if you would like to change
+this.
+EOM
+}
+]
diff --git a/databases/percona-orchestrator/pkg-descr b/databases/percona-orchestrator/pkg-descr
new file mode 100644
index 000000000000..0f8e8ab361e7
--- /dev/null
+++ b/databases/percona-orchestrator/pkg-descr
@@ -0,0 +1,22 @@
+Orchestrator is a replication topology manager for MySQL.
+
+Features include:
+
+* The topology and status of the replication tree is automatically detected
+  and monitored.
+* Either a GUI, CLI or API can be used to check the status and perform
+  operations.
+* Supports automatic failover of the master, and the replication tree can
+  be fixed when servers in the tree fail - either manually or automatically.
+* It is not dependent on any specific version or flavor of MySQL (MySQL,
+  Percona Server, MariaDB or even MaxScale binlog servers).
+* Orchestrator supports many different types of topologies, from a single
+  master -> slave  to complex multi-layered replication trees consisting of
+  hundreds of servers.
+* Orchestrator can make topology changes and will do so based on the state
+  at that moment; it does not require a configuration to be defined with what
+  corresponds to the database topology.
+* The GUI is not only there to report the status - one of the cooler things
+  you can do is change replication just by doing a drag and drop in the web
+  interface (of course you can do this and much more through the CLI and API
+  as well).
diff --git a/databases/percona-orchestrator/pkg-plist b/databases/percona-orchestrator/pkg-plist
new file mode 100644
index 000000000000..2e89b0b6bf0b
--- /dev/null
+++ b/databases/percona-orchestrator/pkg-plist
@@ -0,0 +1,83 @@
+bin/orchestrator-client
+sbin/orchestrator
+@sample %%ETCDIR%%/orchestrator.conf.sample
+@comment %%DATADIR%%/bin/orchestrator-client
+%%DATADIR%%/metrics/orchestrator-grafana.json
+%%DATADIR%%/pseudo-gtid/bin/pseudo-gtid
+%%DATADIR%%/pseudo-gtid/pseudo-gtid.sql
+%%DATADIR%%/pseudo-gtid/puppet/files/etc/init.d/pseudo-gtid
+%%DATADIR%%/pseudo-gtid/puppet/pseudo-gtid
+%%DATADIR%%/public/bootstrap/css/bootstrap-theme.css
+%%DATADIR%%/public/bootstrap/css/bootstrap-theme.css.map
+%%DATADIR%%/public/bootstrap/css/bootstrap-theme.min.css
+%%DATADIR%%/public/bootstrap/css/bootstrap-theme.min.css.map
+%%DATADIR%%/public/bootstrap/css/bootstrap.min.css
+%%DATADIR%%/public/bootstrap/css/bootstrap.min.css.map
+%%DATADIR%%/public/bootstrap/fonts/glyphicons-halflings-regular.eot
+%%DATADIR%%/public/bootstrap/fonts/glyphicons-halflings-regular.svg
+%%DATADIR%%/public/bootstrap/fonts/glyphicons-halflings-regular.ttf
+%%DATADIR%%/public/bootstrap/fonts/glyphicons-halflings-regular.woff
+%%DATADIR%%/public/bootstrap/fonts/glyphicons-halflings-regular.woff2
+%%DATADIR%%/public/bootstrap/js/bootstrap.min.js
+%%DATADIR%%/public/bootstrap/js/npm.js
+%%DATADIR%%/public/css/custom.css
+%%DATADIR%%/public/css/orchestrator.css
+%%DATADIR%%/public/images/ajax-loader.gif
+%%DATADIR%%/public/images/booking-logo-32.png
+%%DATADIR%%/public/images/booking-logo-s.png
+%%DATADIR%%/public/images/keep-calm-and-let-orchestrator-handle-it-transp-m.png
+%%DATADIR%%/public/images/octocat-logo-32.png
+%%DATADIR%%/public/images/orchestrator-logo-32-dark.png
+%%DATADIR%%/public/images/orchestrator-logo-32.png
+%%DATADIR%%/public/images/outbrain-logo-32.png
+%%DATADIR%%/public/images/outbrain-logo-s.png
+%%DATADIR%%/public/images/tile.png
+%%DATADIR%%/public/js/agent.js
+%%DATADIR%%/public/js/agents.js
+%%DATADIR%%/public/js/audit-failure-detection.js
+%%DATADIR%%/public/js/audit-recovery-shared.js
+%%DATADIR%%/public/js/audit-recovery.js
+%%DATADIR%%/public/js/audit.js
+%%DATADIR%%/public/js/bootbox.min.js
+%%DATADIR%%/public/js/cluster-analysis-shared.js
+%%DATADIR%%/public/js/cluster-pools.js
+%%DATADIR%%/public/js/cluster-tree.js
+%%DATADIR%%/public/js/cluster.js
+%%DATADIR%%/public/js/clusters-analysis.js
+%%DATADIR%%/public/js/clusters.js
+%%DATADIR%%/public/js/common.js
+%%DATADIR%%/public/js/corex-jquery.js
+%%DATADIR%%/public/js/corex.js
+%%DATADIR%%/public/js/custom.js
+%%DATADIR%%/public/js/d3.v3.min.js
+%%DATADIR%%/public/js/discover.js
+%%DATADIR%%/public/js/instance-problems.js
+%%DATADIR%%/public/js/jquery-ui.min.js
+%%DATADIR%%/public/js/jquery.cookie-1.4.1.min.js
+%%DATADIR%%/public/js/jquery.min.js
+%%DATADIR%%/public/js/md5.js
+%%DATADIR%%/public/js/orchestrator.js
+%%DATADIR%%/public/js/search.js
+%%DATADIR%%/public/js/seed-shared.js
+%%DATADIR%%/public/js/seed.js
+%%DATADIR%%/public/js/seeds.js
+%%DATADIR%%/public/js/status.js
+%%DATADIR%%/templates/about.tmpl
+%%DATADIR%%/templates/agent.tmpl
+%%DATADIR%%/templates/agent_seed_details.tmpl
+%%DATADIR%%/templates/agents.tmpl
+%%DATADIR%%/templates/audit.tmpl
+%%DATADIR%%/templates/audit_failure_detection.tmpl
+%%DATADIR%%/templates/audit_recovery.tmpl
+%%DATADIR%%/templates/cluster.tmpl
+%%DATADIR%%/templates/cluster_pools.tmpl
+%%DATADIR%%/templates/clusters.tmpl
+%%DATADIR%%/templates/clusters_analysis.tmpl
+%%DATADIR%%/templates/discover.tmpl
+%%DATADIR%%/templates/faq.tmpl
+%%DATADIR%%/templates/home.tmpl
+%%DATADIR%%/templates/keep-calm.tmpl
+%%DATADIR%%/templates/layout.tmpl
+%%DATADIR%%/templates/search.tmpl
+%%DATADIR%%/templates/seeds.tmpl
+%%DATADIR%%/templates/status.tmpl
diff --git a/databases/percona-pam-for-mysql/Makefile b/databases/percona-pam-for-mysql/Makefile
deleted file mode 100644
index 0e2c47110d7b..000000000000
--- a/databases/percona-pam-for-mysql/Makefile
+++ /dev/null
@@ -1,35 +0,0 @@
-# Created by: Mark Felder <feld@FreeBSD.org>
-
-PORTNAME=	percona
-PORTREVISION=	1
-PKGNAMESUFFIX=	-pam-for-mysql
-
-COMMENT=	PAM plugin for MySQL
-
-BROKEN_armv6=		fails to compile: cannot combine with previous 'type-name' declaration specifier
-BROKEN_armv7=		fails to compile: cannot combine with previous 'type-name' declaration specifier
-BROKEN_mips=		fails to configure: CMake Error: Generator: execution of make failed
-BROKEN_mips64=		fails to configure: CMake Error: Generator: execution of make failed
-
-MASTERDIR=	${.CURDIR}/../percona56-server
-
-PKGMESSAGE=	${.CURDIR}/pkg-message
-PATCHDIR=	${MASTERDIR}/files
-FILESDIR=	${.CURDIR}/files
-PLIST=		${.CURDIR}/pkg-plist
-DESCR=		${.CURDIR}/pkg-descr
-
-CMAKE_ARGS+=	-DWITH_PAM=1
-
-# Workaround to clang11/gcc10 with -fno-common by default
-CFLAGS+=        -fcommon
-
-PLUGIN_ONLY=	yes
-
-do-install:
-	(cd ${WRKSRC}/plugin/percona-pam-for-mysql && ${MAKE} ${MAKE_ARGS} install)
-	${INSTALL_DATA} ${FILESDIR}/pam.conf ${STAGEDIR}${PREFIX}/etc/pam.d/mysqld.sample
-
-.include "${MASTERDIR}/Makefile"
-
-RUN_DEPENDS= # This plugin has no run dependencies. It should work with any desired mysql client/server.
diff --git a/databases/percona-pam-for-mysql/files/pam.conf b/databases/percona-pam-for-mysql/files/pam.conf
deleted file mode 100644
index 0e75199574ba..000000000000
--- a/databases/percona-pam-for-mysql/files/pam.conf
+++ /dev/null
@@ -1,12 +0,0 @@
-#
-# PAM configuration for the "mysqld" service
-#
-
-# auth
-auth		include		system
-
-# account
-account		include		system
-
-# password
-password	include		system
diff --git a/databases/percona-pam-for-mysql/pkg-descr b/databases/percona-pam-for-mysql/pkg-descr
deleted file mode 100644
index b6160274578a..000000000000
--- a/databases/percona-pam-for-mysql/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-Percona PAM authentication plugin for MySQL.
-
-WWW: https://www.percona.com/
diff --git a/databases/percona-pam-for-mysql/pkg-message b/databases/percona-pam-for-mysql/pkg-message
deleted file mode 100644
index 6f658f86129e..000000000000
--- a/databases/percona-pam-for-mysql/pkg-message
+++ /dev/null
@@ -1,13 +0,0 @@
-[
-{ type: install
-  message: <<EOM
-Documentation for using percona-pam-for-mysql authentication plugin can
-be found at:
-
-https://www.percona.com/doc/percona-pam-for-mysql/index.html
-
-Please note that you need this plugin installed on both the client and
-server for authentication to be successful.
-EOM
-}
-]
diff --git a/databases/percona-pam-for-mysql/pkg-plist b/databases/percona-pam-for-mysql/pkg-plist
deleted file mode 100644
index 2e9835ca0098..000000000000
--- a/databases/percona-pam-for-mysql/pkg-plist
+++ /dev/null
@@ -1,10 +0,0 @@
-@sample etc/pam.d/mysqld.sample
-lib/mysql/plugin/auth_pam.so
-lib/mysql/plugin/auth_pam_compat.so
-lib/mysql/plugin/dialog.so
-%%DATADIR%%/tests/suite/percona-pam-for-mysql/auth_pam-master.opt
-%%DATADIR%%/tests/suite/percona-pam-for-mysql/auth_pam.result
-%%DATADIR%%/tests/suite/percona-pam-for-mysql/auth_pam.test
-%%DATADIR%%/tests/suite/percona-pam-for-mysql/auth_pam_compat-master.opt
-%%DATADIR%%/tests/suite/percona-pam-for-mysql/auth_pam_compat.result
-%%DATADIR%%/tests/suite/percona-pam-for-mysql/auth_pam_compat.test
diff --git a/databases/percona-toolkit/Makefile b/databases/percona-toolkit/Makefile
index 683ba32c71a8..bd9f994116d3 100644
--- a/databases/percona-toolkit/Makefile
+++ b/databases/percona-toolkit/Makefile
@@ -1,22 +1,29 @@
 PORTNAME=	percona-toolkit
-PORTVERSION=	3.3.0
+DISTVERSION=	3.5.2
+PORTREVISION=	1
 CATEGORIES=	databases
 MASTER_SITES=	https://www.percona.com/downloads/${PORTNAME}/${PORTVERSION}/source/tarball/
 
 MAINTAINER=	flo@FreeBSD.org
 COMMENT=	Collection of essential command-line utilities for MySQL
+WWW=		https://www.percona.com/software/percona-toolkit/
 
 LICENSE=	ARTPERL10 GPLv2
 LICENSE_COMB=	dual
 
 RUN_DEPENDS=	bash:shells/bash \
-		p5-DBD-mysql>=3:databases/p5-DBD-mysql \
+		${DBD_MYSQL} \
 		p5-DBI>=1.46:databases/p5-DBI \
-		p5-Term-ReadKey>=2.10:devel/p5-Term-ReadKey
+		p5-Term-ReadKey>=2.10:devel/p5-Term-ReadKey \
+		pidof:sysutils/pidof
 
-USES=		perl5
+USES=		mysql perl5 shebangfix
 USE_PERL5=	configure
 
+SHEBANG_FILES=	bin/pt-*
+
+CONFLICTS_INSTALL=	p5-Pipeline # lib/perl5/site_perl/Pipeline.pm
+
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/databases/percona-toolkit/distinfo b/databases/percona-toolkit/distinfo
index 39e6cfea3221..17ff0ccfffe2 100644
--- a/databases/percona-toolkit/distinfo
+++ b/databases/percona-toolkit/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1618179624
-SHA256 (percona-toolkit-3.3.0.tar.gz) = 0a71e3bfa1eec7c9d8941080d2852d4d4354c2c1fe303f2f28f6352627549d16
-SIZE (percona-toolkit-3.3.0.tar.gz) = 15342520
+TIMESTAMP = 1681751974
+SHA256 (percona-toolkit-3.5.2.tar.gz) = 79e22a97335275e19049c9c49b2d8008450de80f04eaf79586d38207fd4107c6
+SIZE (percona-toolkit-3.5.2.tar.gz) = 14681059
diff --git a/databases/percona-toolkit/files/patch-Makefile.PL b/databases/percona-toolkit/files/patch-Makefile.PL
index a582fe703d8a..da53fa76faeb 100644
--- a/databases/percona-toolkit/files/patch-Makefile.PL
+++ b/databases/percona-toolkit/files/patch-Makefile.PL
@@ -1,7 +1,7 @@
---- Makefile.PL.orig	2017-12-16 18:29:36 UTC
+--- Makefile.PL.orig	2022-11-28 18:41:57 UTC
 +++ Makefile.PL
 @@ -5,12 +5,12 @@ WriteMakefile(
-     VERSION   => '3.0.5',
+     VERSION   => '3.5.0',
      EXE_FILES => [ <bin/*> ],
      MAN1PODS  => {
 -      'docs/percona-toolkit.pod' => 'blib/man1/percona-toolkit.1p',
@@ -9,9 +9,9 @@
        map {
           (my $name = $_) =~ s/^bin.//;
           my $file_name = $_;
-          if ( $file_name !~ m/mongo/ ) {
+          if ( ( $file_name !~ m/mongo/ ) || ( $file_name !~ m/pg/ ) ) {
 -             $_ => "blib/man1/$name.1p";
 +             $_ => "blib/man1/$name.1";
-         }
+          }
        } <bin/*>
      },
diff --git a/databases/percona-toolkit/pkg-descr b/databases/percona-toolkit/pkg-descr
index 1fc880107f41..cba354ecacef 100644
--- a/databases/percona-toolkit/pkg-descr
+++ b/databases/percona-toolkit/pkg-descr
@@ -8,5 +8,3 @@ difficult or complex to perform manually, including:
     Summarize MySQL servers
     Analyze queries from logs and tcpdump
     Collect vital system information when problems occur
-
-WWW: http://www.percona.com/software/percona-toolkit/
diff --git a/databases/percona56-client/Makefile b/databases/percona56-client/Makefile
deleted file mode 100644
index 56272dfc0c7c..000000000000
--- a/databases/percona56-client/Makefile
+++ /dev/null
@@ -1,38 +0,0 @@
-# Created by: Alex Dupre <ale@FreeBSD.org>
-
-PORTNAME=	percona
-PKGNAMESUFFIX=	56-client
-
-COMMENT=	Multithreaded SQL database (client)
-
-MASTERDIR=	${.CURDIR}/../percona56-server
-
-OPTIONS_EXCLUDE=TOKUDB
-
-PKGMESSAGE=	${.CURDIR}/pkg-message
-PATCHDIR=	${.CURDIR}/files
-PLIST=		${.CURDIR}/pkg-plist
-
-CONFLICTS_INSTALL=	mysql*-client-* \
-			mariadb*-client-* \
-			percona5[0-57-9]-client-*
-
-CMAKE_ARGS+=	-DWITHOUT_SERVER=1
-
-USE_LDCONFIG=	${PREFIX}/lib/mysql
-
-MANPAGES=	comp_err.1 msql2mysql.1 mysql.1 mysql_config.1 mysql_find_rows.1 \
-		mysql_waitpid.1 mysqlaccess.1 mysqladmin.1 mysqlbinlog.1 \
-		mysqlcheck.1 mysqldump.1 mysqlimport.1 mysqlshow.1 mysqlslap.1
-
-CLIENT_ONLY=	yes
-
-# Percona renamed the libraries, until we decide how to deal with it create some symlinks
-# to prevent breaking installed ports.
-post-install:
-	${LN} -s libperconaserverclient.so ${STAGEDIR}${PREFIX}/lib/mysql/libmysqlclient.so
-	${LN} -s libperconaserverclient.so.18 ${STAGEDIR}${PREFIX}/lib/mysql/libmysqlclient.so.18
-	${LN} -s libperconaserverclient_r.so ${STAGEDIR}${PREFIX}/lib/mysql/libmysqlclient_r.so
-	${LN} -s libperconaserverclient_r.so.18 ${STAGEDIR}${PREFIX}/lib/mysql/libmysqlclient_r.so.18
-
-.include "${MASTERDIR}/Makefile"
diff --git a/databases/percona56-client/files/patch-CMakeLists.txt b/databases/percona56-client/files/patch-CMakeLists.txt
deleted file mode 100644
index b090d7519b10..000000000000
--- a/databases/percona56-client/files/patch-CMakeLists.txt
+++ /dev/null
@@ -1,74 +0,0 @@
---- CMakeLists.txt.orig	2017-05-29 12:44:32.006353000 +0200
-+++ CMakeLists.txt	2017-05-29 12:46:55.502845000 +0200
-@@ -486,42 +486,17 @@
- 
- ADD_SUBDIRECTORY(extra)
- ADD_SUBDIRECTORY(client)
--ADD_SUBDIRECTORY(sql/share)
- ADD_SUBDIRECTORY(libservices)
-+ADD_SUBDIRECTORY(support-files)
- 
- IF(UNIX)
-   ADD_SUBDIRECTORY(man)
- ENDIF()
- 
--IF(NOT WITHOUT_SERVER)
--  ADD_SUBDIRECTORY(tests)
--  ADD_SUBDIRECTORY(sql)
--  OPTION (WITH_EMBEDDED_SERVER "Compile MySQL with embedded server" OFF)
--  IF(WITH_EMBEDDED_SERVER) 
--   ADD_SUBDIRECTORY(libmysqld)
--   ADD_SUBDIRECTORY(libmysqld/examples)
--  ENDIF(WITH_EMBEDDED_SERVER)
--ENDIF()
--
- # scripts/mysql_config depends on client and server targets loaded above.
- # It is referenced by some of the directories below, so we insert it here.
- ADD_SUBDIRECTORY(scripts)
- 
--IF(NOT WITHOUT_SERVER)
--  ADD_SUBDIRECTORY(mysql-test)
--  ADD_SUBDIRECTORY(mysql-test/lib/My/SafeProcess)
--  ADD_SUBDIRECTORY(support-files)
--  ADD_SUBDIRECTORY(sql-bench)
--  IF(EXISTS ${CMAKE_SOURCE_DIR}/internal/CMakeLists.txt)
--    ADD_SUBDIRECTORY(internal)
--  ENDIF()
--  ADD_SUBDIRECTORY(packaging/rpm-oel)
--  ADD_SUBDIRECTORY(packaging/rpm-fedora)
--  ADD_SUBDIRECTORY(packaging/rpm-sles)
--  ADD_SUBDIRECTORY(packaging/rpm-docker)
--  ADD_SUBDIRECTORY(packaging/deb-in)
--ENDIF()
--
- INCLUDE(cmake/abi_check.cmake)
- INCLUDE(cmake/tags.cmake)
- 
-@@ -558,18 +533,17 @@
-   SET(CPACK_GENERATOR "TGZ")
- ENDIF() 
- ADD_SUBDIRECTORY(packaging/WiX)
--ADD_SUBDIRECTORY(packaging/solaris)
- 
- # Create a single package with "make package"
- # (see http://public.kitware.com/Bug/view.php?id=11452)
- SET(CPACK_MONOLITHIC_INSTALL 1 CACHE INTERNAL "")
- 
- IF(UNIX)
--  INSTALL(FILES Docs/mysql.info DESTINATION ${INSTALL_INFODIR} OPTIONAL COMPONENT Info)
- ENDIF()
- #
- # RPM installs documentation directly from the source tree
- #
-+IF(FALSE)
- IF(NOT INSTALL_LAYOUT MATCHES "RPM")
-   INSTALL(FILES COPYING LICENSE.mysql 
-   DESTINATION ${INSTALL_DOCREADMEDIR} 
-@@ -591,6 +565,7 @@
-     PATTERN "sp-imp-spec.txt" EXCLUDE
-   )
- ENDIF()
-+ENDIF()
- 
- INCLUDE(CPack)
- 
diff --git a/databases/percona56-client/files/patch-client_CMakeLists.txt b/databases/percona56-client/files/patch-client_CMakeLists.txt
deleted file mode 100644
index ef337915f997..000000000000
--- a/databases/percona56-client/files/patch-client_CMakeLists.txt
+++ /dev/null
@@ -1,44 +0,0 @@
---- client/CMakeLists.txt	2018-02-01 14:51:01.000000000 +0100
-+++ client/CMakeLists.txt.new	2018-02-20 15:53:56.534072000 +0100
-@@ -37,10 +37,12 @@
-   TARGET_LINK_LIBRARIES(mysql ${MY_READLINE_LIBRARY})
- ENDIF(UNIX)
- 
-+IF(FALSE)
- MYSQL_ADD_EXECUTABLE(mysqltest mysqltest.cc COMPONENT Test)
- SET_SOURCE_FILES_PROPERTIES(mysqltest.cc PROPERTIES COMPILE_FLAGS "-DTHREADS")
- TARGET_LINK_LIBRARIES(mysqltest perconaserverclient regex)
- ADD_DEPENDENCIES(mysqltest GenError)
-+ENDIF()
- 
- MYSQL_ADD_EXECUTABLE(mysqlcheck mysqlcheck.c)
- TARGET_LINK_LIBRARIES(mysqlcheck perconaserverclient)
-@@ -52,15 +54,19 @@
- TARGET_LINK_LIBRARIES(mysqlimport perconaserverclient)
- SET_SOURCE_FILES_PROPERTIES(mysqlimport.c PROPERTIES COMPILE_FLAGS "-DTHREADS")
- 
-+IF(FALSE)
- MYSQL_ADD_EXECUTABLE(mysql_upgrade mysql_upgrade.c)
- TARGET_LINK_LIBRARIES(mysql_upgrade perconaserverclient)
- ADD_DEPENDENCIES(mysql_upgrade GenFixPrivs)
-+ENDIF()
- 
- MYSQL_ADD_EXECUTABLE(mysqlshow mysqlshow.c)
- TARGET_LINK_LIBRARIES(mysqlshow perconaserverclient)
- 
-+IF(FALSE)
- MYSQL_ADD_EXECUTABLE(mysql_plugin mysql_plugin.c)
- TARGET_LINK_LIBRARIES(mysql_plugin perconaserverclient)
-+ENDIF()
- 
- MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc sql_string.cc
-                      ../sql/rpl_filter.cc ../sql/sql_list.cc)
-@@ -82,8 +88,6 @@
- ENDIF(WIN32)
- 
- SET_TARGET_PROPERTIES (
--  mysql_plugin 
--  mysql_upgrade
-   mysqlcheck
-   mysqldump
-   mysqlimport
diff --git a/databases/percona56-client/files/patch-client__mysql.cc b/databases/percona56-client/files/patch-client__mysql.cc
deleted file mode 100644
index b73e1052d30d..000000000000
--- a/databases/percona56-client/files/patch-client__mysql.cc
+++ /dev/null
@@ -1,16 +0,0 @@
---- client/mysql.cc.orig	2012-02-27 19:15:22.271243107 +0000
-+++ client/mysql.cc	2012-02-27 19:16:16.645241508 +0000
-@@ -1601,11 +1601,11 @@
- #endif
- 
- #ifdef HAVE_READLINE
--  printf("%s  Ver %s Distrib %s, for %s (%s) using %s %s\n",
-+  printf("%s  Ver %s Distrib %s Percona, for %s (%s) using %s %s\n",
- 	 my_progname, VER, MYSQL_SERVER_VERSION, SYSTEM_TYPE, MACHINE_TYPE,
-          readline, rl_library_version);
- #else
--  printf("%s  Ver %s Distrib %s, for %s (%s)\n", my_progname, VER,
-+  printf("%s  Ver %s Distrib %s Percona, for %s (%s)\n", my_progname, VER,
- 	MYSQL_SERVER_VERSION, SYSTEM_TYPE, MACHINE_TYPE);
- #endif
- 
diff --git a/databases/percona56-client/files/patch-client_mysql.cc b/databases/percona56-client/files/patch-client_mysql.cc
deleted file mode 100644
index 9d5bf7c18d88..000000000000
--- a/databases/percona56-client/files/patch-client_mysql.cc
+++ /dev/null
@@ -1,25 +0,0 @@
---- client/mysql.cc.orig	2017-05-29 12:49:44.423885000 +0200
-+++ client/mysql.cc	2017-05-29 12:55:13.604765000 +0200
-@@ -2784,9 +2784,11 @@
- #ifdef HAVE_LOCALE_H
-   setlocale(LC_ALL,""); /* so as libedit use isprint */
- #endif
--  rl_attempted_completion_function= (CPPFunction*)&new_mysql_completion;
--  rl_completion_entry_function= &no_completion;
-+  rl_attempted_completion_function= (rl_completion_func_t*)&new_mysql_completion;
-+  rl_completion_entry_function= (rl_compentry_func_t*)&no_completion;
-+  /*
-   rl_add_defun("magic-space", (Function*)&fake_magic_space, -1);
-+  */
- #else
-   rl_attempted_completion_function= (CPPFunction*)&new_mysql_completion;
-   rl_completion_entry_function= &no_completion;
-@@ -2805,7 +2807,7 @@
-                                    int end MY_ATTRIBUTE((unused)))
- {
-   if (!status.batch && !quick)
--#if defined(USE_NEW_XLINE_INTERFACE)
-+#if defined(USE_NEW_READLINE_INTERFACE) || defined(USE_LIBEDIT_INTERFACE)
-     return rl_completion_matches(text, new_command_generator);
- #else
-     return completion_matches((char *)text, (CPFunction *)new_command_generator);
diff --git a/databases/percona56-client/files/patch-cmake_readline.cmake b/databases/percona56-client/files/patch-cmake_readline.cmake
deleted file mode 100644
index 4c251b15fc56..000000000000
--- a/databases/percona56-client/files/patch-cmake_readline.cmake
+++ /dev/null
@@ -1,17 +0,0 @@
---- cmake/readline.cmake.orig	2016-09-30 11:41:40 UTC
-+++ cmake/readline.cmake
-@@ -173,11 +173,11 @@ MACRO (FIND_SYSTEM_EDITLINE)
-     #include <readline.h>
-     int main(int argc, char **argv)
-     {
--      typedef int MYFunction(const char*, int);
-+      typedef char *MYFunction(const char*, int);
-       MYFunction* myf= rl_completion_entry_function;
--      int res= (myf)(NULL, 0);
-+      char *res= (myf)(NULL, 0);
-       completion_matches(0,0);
--      return res;
-+      return (res != NULL);
-     }"
-     EDITLINE_HAVE_COMPLETION)
- 
diff --git a/databases/percona56-client/files/patch-extra_CMakeLists.txt b/databases/percona56-client/files/patch-extra_CMakeLists.txt
deleted file mode 100644
index 5235c53fe569..000000000000
--- a/databases/percona56-client/files/patch-extra_CMakeLists.txt
+++ /dev/null
@@ -1,24 +0,0 @@
---- extra/CMakeLists.txt.orig	2020-07-21 12:31:43.000000000 +0200
-+++ extra/CMakeLists.txt	2020-09-17 22:40:42.442794000 +0200
-@@ -58,6 +58,7 @@
-                   ${PROJECT_BINARY_DIR}/sql/share/english/errmsg.sys 
-                   ${PROJECT_SOURCE_DIR}/sql/share/errmsg-utf8.txt)
- 
-+IF(FALSE)
- MYSQL_ADD_EXECUTABLE(my_print_defaults my_print_defaults.c)
- TARGET_LINK_LIBRARIES(my_print_defaults mysys mysys_ssl)
- SET_TARGET_PROPERTIES(my_print_defaults PROPERTIES LINKER_LANGUAGE CXX)
-@@ -97,10 +98,13 @@
-   TARGET_LINK_LIBRARIES(innochecksum mysys mysys_ssl)
-   ADD_DEPENDENCIES(innochecksum GenError)
- ENDIF()
-+ENDIF()
- 
- IF(UNIX)
-+IF(FALSE)
-   MYSQL_ADD_EXECUTABLE(resolve_stack_dump resolve_stack_dump.cc)
-   TARGET_LINK_LIBRARIES(resolve_stack_dump mysys mysys_ssl)
-+ENDIF()
- 
-   MYSQL_ADD_EXECUTABLE(mysql_waitpid mysql_waitpid.c)
-   TARGET_LINK_LIBRARIES(mysql_waitpid mysys mysys_ssl)
diff --git a/databases/percona56-client/files/patch-include_my_compare.h b/databases/percona56-client/files/patch-include_my_compare.h
deleted file mode 100644
index 093c8ae37789..000000000000
--- a/databases/percona56-client/files/patch-include_my_compare.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- include/my_compare.h.orig	2011-05-10 09:46:46.000000000 +0200
-+++ include/my_compare.h	2011-05-10 09:47:01.000000000 +0200
-@@ -39,7 +39,7 @@
-   But beware the dependency of MI_MAX_POSSIBLE_KEY_BUFF and HA_MAX_KEY_LENGTH.
- */
- 
--#define HA_MAX_KEY_LENGTH           1000        /* Max length in bytes */
-+#define HA_MAX_KEY_LENGTH           4000        /* Max length in bytes */
- #define HA_MAX_KEY_SEG              16          /* Max segments for key */
- 
- #define HA_MAX_POSSIBLE_KEY_BUFF    (HA_MAX_KEY_LENGTH + 24+ 6+6)
diff --git a/databases/percona56-client/files/patch-include_myisam.h b/databases/percona56-client/files/patch-include_myisam.h
deleted file mode 100644
index 450645400dd5..000000000000
--- a/databases/percona56-client/files/patch-include_myisam.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- include/myisam.h.orig	2009-02-16 23:04:54.000000000 +0100
-+++ include/myisam.h	2009-02-16 23:10:08.000000000 +0100
-@@ -48,7 +48,7 @@
-   The following defines can be increased if necessary.
-   But beware the dependency of MI_MAX_POSSIBLE_KEY_BUFF and MI_MAX_KEY_LENGTH.
- */
--#define MI_MAX_KEY_LENGTH           1000            /* Max length in bytes */
-+#define MI_MAX_KEY_LENGTH           4000            /* Max length in bytes */
- #define MI_MAX_KEY_SEG              16              /* Max segments for key */
- 
- #define MI_MAX_KEY_BUFF  (MI_MAX_KEY_LENGTH+MI_MAX_KEY_SEG*6+8+8)
diff --git a/databases/percona56-client/files/patch-man_CMakeLists.txt b/databases/percona56-client/files/patch-man_CMakeLists.txt
deleted file mode 100644
index 0f79f3e2403d..000000000000
--- a/databases/percona56-client/files/patch-man_CMakeLists.txt
+++ /dev/null
@@ -1,13 +0,0 @@
---- man/CMakeLists.txt.orig	2011-10-22 14:08:32.000000000 +0200
-+++ man/CMakeLists.txt	2011-10-22 14:22:42.000000000 +0200
-@@ -15,10 +15,6 @@
- 
- # Copy man pages
- FILE(GLOB MAN1_FILES *.1)
--FILE(GLOB MAN1_EXCLUDE make_win_bin_dist.1)
--FILE(GLOB MAN1_NDB ndb*.1)
--FILE(GLOB MAN8_FILES *.8)
--FILE(GLOB MAN8_NDB ndb*.8)
- IF(MAN1_FILES)
-   IF(MAN1_EXCLUDE)
-     LIST(REMOVE_ITEM MAN1_FILES ${MAN1_EXCLUDE})
diff --git a/databases/percona56-client/files/patch-mysys__posix_timers.c b/databases/percona56-client/files/patch-mysys__posix_timers.c
deleted file mode 100644
index 52000de41a35..000000000000
--- a/databases/percona56-client/files/patch-mysys__posix_timers.c
+++ /dev/null
@@ -1,32 +0,0 @@
---- mysys/posix_timers.c.orig	2013-10-07 12:25:25.000000000 +0200
-+++ mysys/posix_timers.c	2013-10-07 21:04:37.090622581 +0200
-@@ -22,6 +22,10 @@
- #define sigev_notify_thread_id   _sigev_un._tid
- #endif
- 
-+#ifdef __FreeBSD__
-+typedef union sigval sigval_t;
-+#endif /* __FreeBSD__ */
-+
- #define MY_TIMER_EVENT_SIGNO  (SIGRTMIN)
- #define MY_TIMER_KILL_SIGNO   (SIGRTMIN+1)
- 
-@@ -68,7 +72,18 @@
-   sigaddset(&set, MY_TIMER_KILL_SIGNO);
- 
-   /* Get the thread ID of the current thread. */
-+
-+#ifdef __FreeBSD__
-+# if __FreeBSD__version > 900030
-+  thread_id= pthread_getthreadid_np();
-+# else
-+  long tid;
-+  syscall(SYS_thr_self, &tid);
-+  thread_id= (pid_t) tid;
-+# endif
-+#else
-   thread_id= (pid_t) syscall(SYS_gettid);
-+#endif
- 
-   /* Wake up parent thread, thread_id is available. */
-   pthread_barrier_wait(barrier);
diff --git a/databases/percona56-client/files/patch-mysys_ssl_my_default.cc b/databases/percona56-client/files/patch-mysys_ssl_my_default.cc
deleted file mode 100644
index f6f38decb8ec..000000000000
--- a/databases/percona56-client/files/patch-mysys_ssl_my_default.cc
+++ /dev/null
@@ -1,31 +0,0 @@
---- mysys_ssl/my_default.cc.orig	2013-01-22 17:54:49.000000000 +0100
-+++ mysys_ssl/my_default.cc	2013-02-13 11:08:15.000000000 +0100
-@@ -119,7 +119,7 @@
- 
- /* Which directories are searched for options (and in which order) */
- 
--#define MAX_DEFAULT_DIRS 6
-+#define MAX_DEFAULT_DIRS 7
- #define DEFAULT_DIRS_SIZE (MAX_DEFAULT_DIRS + 1)  /* Terminate with NULL */
- static const char **default_directories = NULL;
- 
-@@ -1395,7 +1395,10 @@
- 
- #if defined(DEFAULT_SYSCONFDIR)
-   if (DEFAULT_SYSCONFDIR[0])
-+  {
-     errors += add_directory(alloc, DEFAULT_SYSCONFDIR, dirs);
-+    errors += add_directory(alloc, DEFAULT_SYSCONFDIR "/mysql", dirs);
-+  }
- #endif /* DEFAULT_SYSCONFDIR */
- 
- #endif
-@@ -1466,7 +1469,7 @@
-   MY_STAT stat_info;
- 
-   if (!my_stat(file_name,&stat_info,MYF(0)))
--    return 1;
-+    return 0;
-   /*
-     Ignore .mylogin.cnf file if not exclusively readable/writable
-     by current user.
diff --git a/databases/percona56-client/files/patch-scripts_CMakeLists.txt b/databases/percona56-client/files/patch-scripts_CMakeLists.txt
deleted file mode 100644
index 34c0ce2ac758..000000000000
--- a/databases/percona56-client/files/patch-scripts_CMakeLists.txt
+++ /dev/null
@@ -1,93 +0,0 @@
---- scripts/CMakeLists.txt.orig	2015-02-05 14:28:58.000000000 +0100
-+++ scripts/CMakeLists.txt	2015-02-12 23:27:08.364991000 +0100
-@@ -71,6 +71,7 @@
- )
- ENDIF()
- 
-+IF(FALSE)
- INSTALL(FILES 
-   ${CMAKE_CURRENT_SOURCE_DIR}/mysql_system_tables.sql 
-   ${CMAKE_CURRENT_SOURCE_DIR}/mysql_system_tables_data.sql
-@@ -80,6 +81,7 @@
-   ${FIX_PRIVILEGES_SQL}
-   DESTINATION ${INSTALL_MYSQLSHAREDIR} COMPONENT Server
- )
-+ENDIF()
- 
- # TCMalloc hacks
- IF(MALLOC_LIB)
-@@ -143,6 +145,7 @@
- SET(HOSTNAME "hostname")
- SET(MYSQLD_USER "mysql")
- 
-+IF(FALSE)
- # Required for mysqlbug until autotools are deprecated, once done remove these
- # and expand default cmake variables
- SET(CC ${CMAKE_C_COMPILER})
-@@ -179,6 +182,7 @@
-   DESTINATION ${INSTALL_BINDIR}
-   COMPONENT Server
-   )
-+ENDIF()
- 
- ENDIF(UNIX)
- 
-@@ -203,6 +207,7 @@
-   SET(localstatedir ${MYSQL_DATADIR})
- ENDIF()
- 
-+IF(FALSE)
- IF(UNIX)
-   SET(EXT)
- ELSE()
-@@ -217,6 +222,7 @@
-   DESTINATION ${DEST}
-   COMPONENT Server
-   )
-+ENDIF()
- 
- SET(prefix "${CMAKE_INSTALL_PREFIX}")
- SET(sysconfdir ${prefix})
-@@ -273,6 +279,8 @@
-           GET_FILENAME_COMPONENT(lib "${lib}" NAME_WE)
-           STRING(REGEX REPLACE "^lib" "" lib "${lib}")
-           SET(${var} "${${var}}-l${lib} " ) 
-+        ELSEIF(lib STREQUAL "-pthread")
-+          SET(${var} "${${var}}-pthread " ) 
-         ELSE()
-           SET(${var} "${${var}}-l${lib} " ) 
-         ENDIF()
-@@ -328,17 +336,9 @@
-   SET(BIN_SCRIPTS
-     msql2mysql
-     mysql_config
--    mysql_fix_extensions
--    mysql_setpermission
--    mysql_zap
-     mysqlaccess
-     mysqlaccess.conf
--    mysql_convert_table_format
-     mysql_find_rows
--    mysqlhotcopy
--    mysqldumpslow
--    mysqld_multi
--    mysqld_safe
-     ps_tokudb_admin
-   )
-   FOREACH(file ${BIN_SCRIPTS})
-@@ -363,6 +363,7 @@
-      )
-   ENDFOREACH()
- 
-+IF(FALSE)
-   # Input files with pl.in extension - drop the extension completely
-   SET(PLIN_FILES mysql_secure_installation)
-   FOREACH(file ${PLIN_FILES})
-@@ -375,6 +376,7 @@
-     INSTALL_SCRIPT(${CMAKE_CURRENT_BINARY_DIR}/${file} COMPONENT ${${file}_COMPONENT})
-   ENDFOREACH()
- ENDIF()
-+ENDIF()
- 
- # Install libgcc as  mylibgcc.a
- IF(CMAKE_COMPILER_IS_GNUCXX AND CMAKE_CXX_FLAGS MATCHES "-static")
diff --git a/databases/percona56-client/files/patch-sql-common_client.c b/databases/percona56-client/files/patch-sql-common_client.c
deleted file mode 100644
index 2a6f3fe1a37f..000000000000
--- a/databases/percona56-client/files/patch-sql-common_client.c
+++ /dev/null
@@ -1,38 +0,0 @@
---- sql-common/client.c.orig	2018-01-17 11:39:51.315029000 +0000
-+++ sql-common/client.c	2018-01-17 11:44:53.493273000 +0000
-@@ -1884,7 +1884,7 @@
-     *errptr= "Failed to get DNS name from SAN list item";
-     DBUG_RETURN(1);
-   }
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-   cn= (const char *)ASN1_STRING_data(dns_name);
- #else
-   cn= (const char *)ASN1_STRING_get0_data(dns_name);
-@@ -1946,7 +1946,7 @@
-     *errptr= "Invalid IP address embedded in the certificate SAN IP address";
-     DBUG_RETURN(1);
-   }
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-   ip= ASN1_STRING_data(ip_address);
- #else
-   ip= ASN1_STRING_get0_data(ip_address);
-@@ -2111,7 +2111,7 @@
-   if(server_ip_address != NULL)
-   {
-     iplen= ASN1_STRING_length(server_ip_address);
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-     ipout= (const unsigned char *) ASN1_STRING_data(server_ip_address);
- #else
-     ipout= (const unsigned char *) ASN1_STRING_get0_data(server_ip_address);
-@@ -2163,7 +2163,7 @@
-       goto error;
-     }
- 
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-     cn= (const char *) ASN1_STRING_data(cn_asn1);
- #else
-     cn= (const char *) ASN1_STRING_get0_data(cn_asn1);
diff --git a/databases/percona56-client/files/patch-support-files_CMakeLists.txt b/databases/percona56-client/files/patch-support-files_CMakeLists.txt
deleted file mode 100644
index d11572f4c5f0..000000000000
--- a/databases/percona56-client/files/patch-support-files_CMakeLists.txt
+++ /dev/null
@@ -1,40 +0,0 @@
---- support-files/CMakeLists.txt.orig	2017-05-09 08:31:39.000000000 +0200
-+++ support-files/CMakeLists.txt	2017-05-29 13:10:29.832994000 +0200
-@@ -44,11 +44,13 @@
-   SET(inst_location ${INSTALL_SUPPORTFILESDIR})
- ENDIF()
- 
-+IF(FALSE)
- SET(inifile my-default)
- CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${inifile}.cnf.sh 
-                ${CMAKE_CURRENT_BINARY_DIR}/${inifile}.${ini_file_extension} @ONLY)
- INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${inifile}.${ini_file_extension}
-         DESTINATION ${inst_location} COMPONENT IniFiles)
-+ENDIF()
- 
- IF(UNIX)
-   IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
-@@ -57,6 +59,7 @@
-     SET (PIDOF "pgrep -d' ' -f")
-   ENDIF()
-   SET(prefix ${CMAKE_INSTALL_PREFIX})
-+IF(FALSE)
-   FOREACH(script  mysqld_multi.server mysql-log-rotate binary-configure)
-     CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${script}.sh 
-                    ${CMAKE_CURRENT_BINARY_DIR}/${script} @ONLY )
-@@ -73,8 +76,10 @@
-   IF(INSTALL_SUPPORTFILESDIR)
-     INSTALL(FILES magic DESTINATION ${inst_location} COMPONENT SupportFiles)
-   ENDIF()
-+ENDIF()
- 
-   INSTALL(FILES mysql.m4 DESTINATION ${INSTALL_SHAREDIR}/aclocal COMPONENT Development)
-+IF(FALSE)
-   CONFIGURE_FILE(MySQL-shared-compat.spec.sh ${CMAKE_CURRENT_BINARY_DIR}/MySQL-shared-compat.spec @ONLY)
-   CONFIGURE_FILE(mysql.spec.sh ${CMAKE_CURRENT_BINARY_DIR}/mysql.spec @ONLY)
-   
-@@ -99,3 +104,4 @@
-     PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ 
-     GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
- ENDIF()
-+ENDIF()
diff --git a/databases/percona56-client/files/patch-vio_viosocket.c b/databases/percona56-client/files/patch-vio_viosocket.c
deleted file mode 100644
index dee21830f520..000000000000
--- a/databases/percona56-client/files/patch-vio_viosocket.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- vio/viosocket.c.orig	2015-07-08 07:38:39 UTC
-+++ vio/viosocket.c
-@@ -33,6 +33,10 @@
- static void (*before_io_wait)(void)= 0;
- static void (*after_io_wait)(void)= 0;
- 
-+#ifdef __FreeBSD__
-+#define s6_addr32 __u6_addr.__u6_addr32
-+#endif
-+
- /* Wait callback macros (both performance schema and threadpool */
- #define START_SOCKET_WAIT(locker, state_ptr, sock, which, timeout) \
- do                                                                 \
diff --git a/databases/percona56-client/files/patch-vio_viosslfactories.c b/databases/percona56-client/files/patch-vio_viosslfactories.c
deleted file mode 100644
index 42a28cd67cdd..000000000000
--- a/databases/percona56-client/files/patch-vio_viosslfactories.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- vio/viosslfactories.c.orig	2020-07-21 12:31:43.000000000 +0200
-+++ vio/viosslfactories.c	2020-09-17 22:38:47.837385000 +0200
-@@ -128,7 +128,7 @@
-     BIGNUM *p= BN_bin2bn(dh2048_p, sizeof(dh2048_p), NULL);
-     BIGNUM *g= BN_bin2bn(dh2048_g, sizeof(dh2048_g), NULL);
-     if (!p || !g
--#if OPENSSL_VERSION_NUMBER >= 0x10100000L
-+#if OPENSSL_VERSION_NUMBER >= 0x10100000L || defined( LIBRESSL_VERSION_NUMBER )
-         || !DH_set0_pqg(dh, p, NULL, g)
- #endif /* OPENSSL_VERSION_NUMBER >= 0x10100000L */
-     ) {
-@@ -136,7 +136,7 @@
-       DH_free(dh);
-       return NULL;
-     }
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined( LIBRESSL_VERSION_NUMBER )
-     dh->p= p;
-     dh->g= g;
- #endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */
diff --git a/databases/percona56-client/pkg-message b/databases/percona56-client/pkg-message
deleted file mode 100644
index a71ac478bbf5..000000000000
--- a/databases/percona56-client/pkg-message
+++ /dev/null
@@ -1,16 +0,0 @@
-[
-{ type: install
-  message: <<EOM
-Please be aware the database client is vulnerable
-to CVE-2015-3152 - SSL Downgrade aka "BACKRONYM".
-You may find more information at the following URL:
-
-http://www.vuxml.org/freebsd/36bd352d-299b-11e5-86ff-14dae9d210b8.html
-
-Although this database client is not listed as
-"affected", it is vulnerable and will not be
-receiving a patch. Please take note of this when
-deploying this software.
-EOM
-}
-]
diff --git a/databases/percona56-client/pkg-plist b/databases/percona56-client/pkg-plist
deleted file mode 100644
index b65c2a2bbb7e..000000000000
--- a/databases/percona56-client/pkg-plist
+++ /dev/null
@@ -1,114 +0,0 @@
-bin/msql2mysql
-bin/mysql
-bin/mysql_config
-bin/mysql_config_editor
-bin/mysql_find_rows
-bin/mysql_waitpid
-bin/mysqlaccess
-bin/mysqlaccess.conf
-bin/mysqladmin
-bin/mysqlbinlog
-bin/mysqlcheck
-bin/mysqldump
-bin/mysqlimport
-bin/mysqlshow
-bin/mysqlslap
-bin/ps_tokudb_admin
-include/mysql/big_endian.h
-include/mysql/byte_order_generic.h
-include/mysql/byte_order_generic_x86.h
-include/mysql/byte_order_generic_x86_64.h
-include/mysql/decimal.h
-include/mysql/errmsg.h
-include/mysql/keycache.h
-include/mysql/little_endian.h
-include/mysql/m_ctype.h
-include/mysql/m_string.h
-include/mysql/my_alloc.h
-include/mysql/my_attribute.h
-include/mysql/my_byteorder.h
-include/mysql/my_compiler.h
-include/mysql/my_config.h
-include/mysql/my_dbug.h
-include/mysql/my_dir.h
-include/mysql/my_getopt.h
-include/mysql/my_global.h
-include/mysql/my_list.h
-include/mysql/my_net.h
-include/mysql/my_pthread.h
-include/mysql/my_sys.h
-include/mysql/my_xml.h
-include/mysql/mysql.h
-include/mysql/mysql/client_authentication.h
-include/mysql/mysql/client_plugin.h
-include/mysql/mysql/client_plugin.h.pp
-include/mysql/mysql/get_password.h
-include/mysql/mysql/innodb_priv.h
-include/mysql/mysql/plugin.h
-include/mysql/mysql/plugin_audit.h
-include/mysql/mysql/plugin_audit.h.pp
-include/mysql/mysql/plugin_auth.h
-include/mysql/mysql/plugin_auth.h.pp
-include/mysql/mysql/plugin_auth_common.h
-include/mysql/mysql/plugin_ftparser.h
-include/mysql/mysql/plugin_ftparser.h.pp
-include/mysql/mysql/plugin_validate_password.h
-include/mysql/mysql/psi/mysql_file.h
-include/mysql/mysql/psi/mysql_idle.h
-include/mysql/mysql/psi/mysql_socket.h
-include/mysql/mysql/psi/mysql_stage.h
-include/mysql/mysql/psi/mysql_statement.h
-include/mysql/mysql/psi/mysql_table.h
-include/mysql/mysql/psi/mysql_thread.h
-include/mysql/mysql/psi/psi.h
-include/mysql/mysql/service_my_plugin_log.h
-include/mysql/mysql/service_my_snprintf.h
-include/mysql/mysql/service_mysql_string.h
-include/mysql/mysql/service_thd_alloc.h
-include/mysql/mysql/service_thd_wait.h
-include/mysql/mysql/service_thread_scheduler.h
-include/mysql/mysql/services.h
-include/mysql/mysql/thread_pool_priv.h
-include/mysql/mysql_com.h
-include/mysql/mysql_com_server.h
-include/mysql/mysql_embed.h
-include/mysql/mysql_time.h
-include/mysql/mysql_version.h
-include/mysql/mysqld_ername.h
-include/mysql/mysqld_error.h
-include/mysql/plugin.h
-include/mysql/plugin_audit.h
-include/mysql/plugin_ftparser.h
-include/mysql/plugin_validate_password.h
-include/mysql/sql_common.h
-include/mysql/sql_state.h
-include/mysql/sslopt-case.h
-include/mysql/sslopt-longopts.h
-include/mysql/sslopt-vars.h
-include/mysql/typelib.h
-lib/mysql/libmysqlclient.so
-lib/mysql/libmysqlclient.so.18
-lib/mysql/libmysqlclient_r.so
-lib/mysql/libmysqlclient_r.so.18
-lib/mysql/libperconaserverclient.a
-lib/mysql/libperconaserverclient.so
-lib/mysql/libperconaserverclient.so.18
-lib/mysql/libperconaserverclient_r.a
-lib/mysql/libperconaserverclient_r.so
-lib/mysql/libperconaserverclient_r.so.18
-lib/mysql/libmysqlservices.a
-man/man1/comp_err.1.gz
-man/man1/msql2mysql.1.gz
-man/man1/mysql.1.gz
-man/man1/mysql_config.1.gz
-man/man1/mysql_find_rows.1.gz
-man/man1/mysql_waitpid.1.gz
-man/man1/mysqlaccess.1.gz
-man/man1/mysqladmin.1.gz
-man/man1/mysqlbinlog.1.gz
-man/man1/mysqlcheck.1.gz
-man/man1/mysqldump.1.gz
-man/man1/mysqlimport.1.gz
-man/man1/mysqlshow.1.gz
-man/man1/mysqlslap.1.gz
-share/aclocal/mysql.m4
diff --git a/databases/percona56-server/Makefile b/databases/percona56-server/Makefile
deleted file mode 100644
index 8347aaef1065..000000000000
--- a/databases/percona56-server/Makefile
+++ /dev/null
@@ -1,121 +0,0 @@
-# Created by: Alex Dupre <ale@FreeBSD.org>
-
-PORTNAME?=	percona
-DISTVERSION=	5.6.51-91.0
-PORTREVISION?=	0
-CATEGORIES=	databases
-MASTER_SITES=	http://www.percona.com/downloads/Percona-Server-5.6/Percona-Server-${DISTVERSION}/source/tarball/
-PKGNAMESUFFIX?=	56-server
-DISTNAME=	percona-server-${DISTVERSION}
-
-MAINTAINER=	flo@FreeBSD.org
-COMMENT?=	Multithreaded SQL database (server)
-
-LICENSE?=	GPLv2+
-
-BROKEN_armv6=		fails to compile: sql/mysqld.cc:198:19: error: cannot combine with previous 'type-name' declaration specifier
-BROKEN_armv7=		fails to compile: sql/mysqld.cc:198:19: error: cannot combine with previous 'type-name' declaration specifier
-
-SLAVEDIRS=	databases/percona56-client \
-		databases/percona-pam-for-mysql
-USES=		bison compiler:c++11-lang cmake:insource,noninja perl5 shebangfix
-
-OPTIONS_DEFINE=	OPENSSL FASTMTX INNODBMEMCACHED TOKUDB
-OPTIONS_DEFAULT=	OPENSSL INNODBMEMCACHED
-OPTIONS_SUB=	yes
-
-FASTMTX_DESC=	Replace mutexes with spinlocks
-FASTMTX_CMAKE_ON=	-DWITH_FAST_MUTEXES=1
-INNODBMEMCACHED_DESC=	InnoDB Memcached plugin
-INNODBMEMCACHED_CMAKE_ON=	-DWITH_INNODB_MEMCACHED=1
-OPENSSL_CMAKE_ON=	-DWITH_SSL=system
-OPENSSL_USES=	ssl
-TOKUDB_DESC=	TokuDB Engine (experimental)
-TOKUDB_CMAKE_ON=	-DUSE_CTAGS=0
-TOKUDB_EXTRA_PATCHES=${PATCHDIR}/extrapatch-tokudb
-
-DATADIR=	${PREFIX}/share/mysql
-
-CMAKE_ARGS+=	-DINSTALL_DOCDIR="share/doc/mysql" \
-		-DINSTALL_DOCREADMEDIR="share/doc/mysql" \
-		-DINSTALL_INCLUDEDIR="include/mysql" \
-		-DINSTALL_INFODIR="${INFO_PATH}" \
-		-DINSTALL_LIBDIR="lib/mysql" \
-		-DINSTALL_MANDIR="man" \
-		-DINSTALL_MYSQLDATADIR="/var/db/mysql" \
-		-DINSTALL_MYSQLSHAREDIR="share/mysql" \
-		-DINSTALL_MYSQLTESTDIR="share/mysql/tests" \
-		-DINSTALL_PLUGINDIR="lib/mysql/plugin" \
-		-DINSTALL_SBINDIR="libexec" \
-		-DINSTALL_SCRIPTDIR="bin" \
-		-DINSTALL_SHAREDIR="share" \
-		-DINSTALL_SQLBENCHDIR="share/mysql" \
-		-DINSTALL_SUPPORTFILESDIR="share/mysql" \
-		-DWITH_EDITLINE=system \
-		-DWITH_LIBWRAP=1
-
-SHEBANG_FILES=	scripts/*.pl* scripts/*.sh
-
-.ifdef USE_MYSQL
-.error You have `USE_MYSQL' variable defined either in environment or in make(1) arguments. Please undefine and try again.
-.endif
-
-.ifdef CLIENT_ONLY
-# Client part
-USES+=		libedit
-.elifdef PLUGIN_ONLY
-# For building plugins (percona-pam-for-mysql, etc)
-# Currently do nothing special
-USES+=		libedit
-.else
-# MySQL-Server part
-USES+=mysql:56p
-
-CONFLICTS_INSTALL=	mysql*-server-* \
-			mysqlwsrep* \
-			mariadb*-server-* \
-			percona5[0-57-9]-server-*
-
-USE_RC_SUBR=	mysql-server
-
-USERS=		mysql
-GROUPS=		mysql
-
-INFO=		mysql
-
-MANPAGES=	my_print_defaults.1 myisam_ftdump.1 myisamchk.1 myisamlog.1 myisampack.1 \
-		mysql.server.1 mysql_convert_table_format.1 mysql_fix_extensions.1 \
-		mysql_install_db.1 mysql_plugin.1 mysql_secure_installation.1 mysql_setpermission.1 \
-		mysql_tzinfo_to_sql.1 mysql_upgrade.1 mysql_zap.1 mysqlbug.1 \
-		mysqld_multi.1 mysqld_safe.1 mysqldumpslow.1 mysqlhotcopy.1 mysqlman.1 \
-		mysqltest.1 perror.1 replace.1 resolve_stack_dump.1 resolveip.1
-
-CMAKE_ARGS+=	-DWITH_EMBEDDED_SERVER="ON"
-
-.include <bsd.port.options.mk>
-
-# Workaround to clang11/gcc10 with -fno-common by default
-CFLAGS+=        -fcommon
-
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1200057
-SUB_LIST+=	LEGACY_LIMITS="@comment " MODERN_LIMITS=""
-.else
-SUB_LIST+=	LEGACY_LIMITS="" MODERN_LIMITS="@comment "
-.endif
-
-post-install:
-	@${MKDIR} ${STAGEDIR}/var/db/mysql
-.endif
-
-post-patch:
-	@${REINPLACE_CMD} 's/*.1/${MANPAGES}/' ${WRKSRC}/man/CMakeLists.txt
-
-.include <bsd.port.pre.mk>
-
-.if ${PORT_OPTIONS:MTOKUDB}
-NOT_FOR_ARCHS=	i386
-NOT_FOR_ARCHS_REASON=	TokuDB not supported on 32-bit platforms, see \
-			https://github.com/percona/PerconaFT/blob/master/README.md
-.endif
-
-.include <bsd.port.post.mk>
diff --git a/databases/percona56-server/distinfo b/databases/percona56-server/distinfo
deleted file mode 100644
index 6177029e19b4..000000000000
--- a/databases/percona56-server/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1618138467
-SHA256 (percona-server-5.6.51-91.0.tar.gz) = 4482c1d124ebb9561c64cf8cb54817ab355f58a4baa4d6427df6623def97dd2f
-SIZE (percona-server-5.6.51-91.0.tar.gz) = 53065258
diff --git a/databases/percona56-server/files/extra-patch-config.h.cmake b/databases/percona56-server/files/extra-patch-config.h.cmake
deleted file mode 100644
index 4ea465832fb4..000000000000
--- a/databases/percona56-server/files/extra-patch-config.h.cmake
+++ /dev/null
@@ -1,29 +0,0 @@
---- Makefile
-+++ Makefile
-@@ -95,8 +95,8 @@ post-patch:
- 
- .include <bsd.port.pre.mk>
- 
--.if ${ARCH} == "arm"
--BROKEN=		Does not compile on arm
-+.if ${ARCH} == "armv6"   
-+EXTRA_PATCHES+=	${FILESDIR}/extra-patch-config.h.cmake
- .endif
- 
- .include <bsd.port.post.mk>
-
---- /dev/null
-+++ files/extra-patch-config.h.cmake
-@@ -0,0 +1,12 @@
-+--- config.h.cmake.orig	2014-12-05 16:24:02 UTC
-++++ config.h.cmake
-+@@ -151,7 +151,8 @@
-+ #cmakedefine HAVE_FESETROUND 1
-+ #cmakedefine HAVE_FINITE 1
-+ #cmakedefine HAVE_FP_EXCEPT 1
-+-#cmakedefine HAVE_FPSETMASK 1
-++#cmakedefine HAVE_FPSETMASK 0
-++#cmakedefine HAVE_FEDISABLEEXCEPT 1
-+ #cmakedefine HAVE_FSEEKO 1
-+ #cmakedefine HAVE_FSYNC 1
-+ #cmakedefine HAVE_FTIME 1
diff --git a/databases/percona56-server/files/extrapatch-tokudb b/databases/percona56-server/files/extrapatch-tokudb
deleted file mode 100644
index 87ea439282e8..000000000000
--- a/databases/percona56-server/files/extrapatch-tokudb
+++ /dev/null
@@ -1,92 +0,0 @@
---- storage/tokudb/CMakeLists.txt.orig	2016-03-03 15:32:33.000000000 +0200
-+++ storage/tokudb/CMakeLists.txt	2016-03-08 10:13:58.000000000 +0200
-@@ -1,6 +1,6 @@
- SET(TOKUDB_VERSION 5.6.29-76.2)
- # PerconaFT only supports x86-64 and cmake-2.8.9+
--IF(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND
-+IF(CMAKE_SYSTEM_PROCESSOR STREQUAL "amd64" AND
-     NOT CMAKE_VERSION VERSION_LESS "2.8.9")
- CHECK_CXX_SOURCE_COMPILES(
- "
-@@ -118,5 +118,5 @@
-     tokudb_thread.cc)
- MYSQL_ADD_PLUGIN(tokudb ${TOKUDB_SOURCES} STORAGE_ENGINE MODULE_ONLY
-     LINK_LIBRARIES tokufractaltree_static tokuportability_static ${ZLIB_LIBRARY} stdc++)
--SET(CMAKE_MODULE_LINKER_FLAGS_RELEASE "${CMAKE_MODULE_LINKER_FLAGS_RELEASE} -flto -fuse-linker-plugin")
--SET(CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO "${CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO} -flto -fuse-linker-plugin")
-+SET(CMAKE_MODULE_LINKER_FLAGS_RELEASE "${CMAKE_MODULE_LINKER_FLAGS_RELEASE} ")
-+SET(CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO "${CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO} ")
---- plugin/tokudb-backup-plugin/Percona-TokuBackup/backup/CMakeLists.txt.orig	2016-03-03 15:31:53.000000000 +0200
-+++ plugin/tokudb-backup-plugin/Percona-TokuBackup/backup/CMakeLists.txt	2016-03-10 11:13:23.772664272 +0200
-@@ -69,7 +69,7 @@
-   endif ()
- endfunction(add_space_separated_property)
- 
--set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O3 -flto -UNDEBUG")
-+set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O3 -UNDEBUG")
- if (NOT CMAKE_CXX_COMPILER_ID MATCHES Clang)
-   set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -s")
- endif ()
---- plugin/tokudb-backup-plugin/Percona-TokuBackup/backup/backup.cc.orig	2016-03-03 15:31:53.000000000 +0200
-+++ plugin/tokudb-backup-plugin/Percona-TokuBackup/backup/backup.cc	2016-03-08 10:40:07.000000000 +0200
-@@ -85,7 +85,7 @@
-     if (oflag & O_CREAT) {
-         va_list ap;
-         va_start(ap, oflag);
--        mode_t mode = va_arg(ap, mode_t);
-+        mode_t mode = va_arg(ap, int);
-         va_end(ap);
-         the_manager.lock_file_op();
-         fd = call_real_open(file, oflag, mode);
---- plugin/tokudb-backup-plugin/Percona-TokuBackup/backup/file_hash_table.cc.orig	2016-03-03 15:31:53.000000000 +0200
-+++ plugin/tokudb-backup-plugin/Percona-TokuBackup/backup/file_hash_table.cc	2016-03-08 10:37:19.000000000 +0200
-@@ -36,7 +36,7 @@
- 
- #include <string.h>
- #include <pthread.h>
--#include <malloc.h>
-+#include <stdlib.h>
- #include <stdio.h>
- 
- #include "source_file.h"
---- plugin/tokudb-backup-plugin/Percona-TokuBackup/backup/real_syscalls.cc.orig	2016-03-03 15:31:53.000000000 +0200
-+++ plugin/tokudb-backup-plugin/Percona-TokuBackup/backup/real_syscalls.cc	2016-03-08 10:38:58.000000000 +0200
-@@ -104,7 +104,7 @@
-     if (oflag & O_CREAT) {
-         va_list op;
-         va_start(op, oflag);
--        mode_t mode = va_arg(op, mode_t);
-+        mode_t mode = va_arg(op, int);
-         va_end(op);
-         return real_open(file, oflag, mode);
-     } else {
---- storage/tokudb/PerconaFT/CMakeLists.txt.orig	2016-06-30 13:35:08.000000000 +0200
-+++ storage/tokudb/PerconaFT/CMakeLists.txt	2016-07-29 23:07:37.871068000 +0200
-@@ -82,7 +82,7 @@
- 
- install(
-   FILES README.md COPYING.AGPLv3 COPYING.GPLv2 PATENTS
--  DESTINATION .
-+  DESTINATION ${INSTALL_DOCDIR}
-   COMPONENT tokukv_misc
-   )
- 
---- storage/tokudb/PerconaFT/buildheader/CMakeLists.txt.orig	2016-07-29 23:30:26.557847000 +0200
-+++ storage/tokudb/PerconaFT/buildheader/CMakeLists.txt	2016-07-29 23:30:32.695950000 +0200
-@@ -1,6 +1,6 @@
- set_directory_properties(PROPERTIES INCLUDE_DIRECTORIES "")
- 
--file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/runcat.sh" "#!/bin/bash
-+file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/runcat.sh" "#!/bin/sh
- out=$1; shift
- exec \"$@\" >$out")
- 
-@@ -8,7 +8,7 @@
- set_property(TARGET make_tdb APPEND PROPERTY COMPILE_DEFINITIONS _GNU_SOURCE)
- add_custom_command(
-   OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/db.h"
--  COMMAND bash runcat.sh "${CMAKE_CURRENT_BINARY_DIR}/db.h" $<TARGET_FILE:make_tdb>
-+  COMMAND sh runcat.sh "${CMAKE_CURRENT_BINARY_DIR}/db.h" $<TARGET_FILE:make_tdb>
-   DEPENDS make_tdb)
- add_custom_target(install_tdb_h DEPENDS
-   "${CMAKE_CURRENT_BINARY_DIR}/db.h")
diff --git a/databases/percona56-server/files/mysql-server.in b/databases/percona56-server/files/mysql-server.in
deleted file mode 100644
index 62ab20cd1658..000000000000
--- a/databases/percona56-server/files/mysql-server.in
+++ /dev/null
@@ -1,77 +0,0 @@
-#!/bin/sh
-
-# PROVIDE: mysql
-# REQUIRE: LOGIN
-# KEYWORD: shutdown
-
-#
-# Add the following line to /etc/rc.conf to enable mysql:
-# mysql_enable (bool):	Set to "NO" by default.
-#			Set it to "YES" to enable MySQL.
-%%LEGACY_LIMITS%%# mysql_limits (bool):	Set to "NO" by default.
-%%LEGACY_LIMITS%%#			Set it to yes to run `limits -e -U mysql`
-%%LEGACY_LIMITS%%#			just before mysql starts.
-# mysql_dbdir (str):	Default to "/var/db/mysql"
-#			Base database directory.
-# mysql_optfile (str):	Server-specific option file.
-#			Default to "${mysql_dbdir}/my.cnf".
-# mysql_pidfile (str):	Custum PID file path and name.
-#			Default to "${mysql_dbdir}/${hostname}.pid".
-# mysql_args (str):	Custom additional arguments to be passed
-#			to mysqld_safe (default empty).
-#
-
-. /etc/rc.subr
-
-name="mysql"
-rcvar=mysql_enable
-
-load_rc_config $name
-
-: ${mysql_enable="NO"}
-%%LEGACY_LIMITS%%: ${mysql_limits="NO"}
-: ${mysql_dbdir="/var/db/mysql"}
-: ${mysql_optfile="${mysql_dbdir}/my.cnf"}
-
-mysql_user="mysql"
-%%LEGACY_LIMITS%%mysql_limits_args="-e -U ${mysql_user}"
-: ${hostname:=`/bin/hostname`}
-pidfile=${mysql_pidfile:-"${mysql_dbdir}/${hostname}.pid"}
-command="/usr/sbin/daemon"
-command_args="-c -f %%PREFIX%%/bin/mysqld_safe --defaults-extra-file=${mysql_optfile} --user=${mysql_user} --datadir=${mysql_dbdir} --pid-file=${pidfile} ${mysql_args}"
-procname="%%PREFIX%%/libexec/mysqld"
-start_precmd="${name}_prestart"
-start_postcmd="${name}_poststart"
-mysql_install_db="%%PREFIX%%/bin/mysql_install_db"
-mysql_install_db_args="--basedir=%%PREFIX%% --datadir=${mysql_dbdir} --defaults-extra-file=${mysql_optfile} --force"
-
-mysql_create_auth_tables()
-{
-	eval $mysql_install_db $mysql_install_db_args >/dev/null 2>/dev/null
-        [ $? -eq 0 ] && chown -R ${mysql_user}:${mysql_user} ${mysql_dbdir}
-}
-
-mysql_prestart()
-{
-	if [ ! -d "${mysql_dbdir}/mysql/." ]; then
-		mysql_create_auth_tables || return 1
-	fi
-%%LEGACY_LIMITS%%	if checkyesno mysql_limits; then
-%%LEGACY_LIMITS%%		eval `/usr/bin/limits ${mysql_limits_args}` 2>/dev/null
-%%LEGACY_LIMITS%%	else
-%%LEGACY_LIMITS%%		return 0
-%%LEGACY_LIMITS%%	fi
-%%MODERN_LIMITS%%	return 0
-}
-
-mysql_poststart()
-{
-	local timeout=15
-	while [ ! -f "${pidfile}" -a ${timeout} -gt 0 ]; do
-		timeout=$(( timeout - 1 ))
-		sleep 1
-	done
-	return 0
-}
-
-run_rc_command "$1"
diff --git a/databases/percona56-server/files/patch-CMakeLists.txt b/databases/percona56-server/files/patch-CMakeLists.txt
deleted file mode 100644
index 0ee4f37e358a..000000000000
--- a/databases/percona56-server/files/patch-CMakeLists.txt
+++ /dev/null
@@ -1,49 +0,0 @@
---- CMakeLists.txt.orig	2014-10-06 18:06:02.000000000 +0200
-+++ CMakeLists.txt	2014-10-18 18:37:40.964417855 +0200
-@@ -508,12 +508,10 @@
- ENDIF()
- 
- IF(NOT WITHOUT_SERVER)
--  ADD_SUBDIRECTORY(tests)
-   ADD_SUBDIRECTORY(sql)
-   OPTION (WITH_EMBEDDED_SERVER "Compile MySQL with embedded server" OFF)
-   IF(WITH_EMBEDDED_SERVER) 
-    ADD_SUBDIRECTORY(libmysqld)
--   ADD_SUBDIRECTORY(libmysqld/examples)
-   ENDIF(WITH_EMBEDDED_SERVER)
- ENDIF()
- 
-@@ -522,10 +520,7 @@
- ADD_SUBDIRECTORY(scripts)
- 
- IF(NOT WITHOUT_SERVER)
--  ADD_SUBDIRECTORY(mysql-test)
--  ADD_SUBDIRECTORY(mysql-test/lib/My/SafeProcess)
-   ADD_SUBDIRECTORY(support-files)
--  ADD_SUBDIRECTORY(sql-bench)
-   IF(EXISTS ${CMAKE_SOURCE_DIR}/internal/CMakeLists.txt)
-     ADD_SUBDIRECTORY(internal)
-   ENDIF()
-@@ -568,7 +563,6 @@
-   SET(CPACK_GENERATOR "TGZ")
- ENDIF() 
- ADD_SUBDIRECTORY(packaging/WiX)
--ADD_SUBDIRECTORY(packaging/solaris)
- 
- # Create a single package with "make package"
- # (see http://public.kitware.com/Bug/view.php?id=11452)
-@@ -580,6 +574,7 @@
- #
- # RPM installs documentation directly from the source tree
- #
-+IF(FALSE)
- IF(NOT INSTALL_LAYOUT MATCHES "RPM")
-   INSTALL(FILES COPYING LICENSE.mysql 
-   DESTINATION ${INSTALL_DOCREADMEDIR} 
-@@ -605,5 +600,6 @@
-     PATTERN "sp-imp-spec.txt" EXCLUDE
-   )
- ENDIF()
-+ENDIF()
- 
- INCLUDE(CPack)
diff --git a/databases/percona56-server/files/patch-client_CMakeLists.txt b/databases/percona56-server/files/patch-client_CMakeLists.txt
deleted file mode 100644
index 7d6e8486b988..000000000000
--- a/databases/percona56-server/files/patch-client_CMakeLists.txt
+++ /dev/null
@@ -1,65 +0,0 @@
---- client/CMakeLists.txt	2018-02-01 14:51:01.000000000 +0100
-+++ client/CMakeLists.txt.new	2018-02-20 13:41:20.066976000 +0100
-@@ -31,17 +31,20 @@
- COPY_OPENSSL_DLLS(copy_openssl_client)
- 
- ADD_DEFINITIONS(${SSL_DEFINES})
-+IF(FALSE)
- MYSQL_ADD_EXECUTABLE(mysql completion_hash.cc mysql.cc readline.cc sql_string.cc)
- TARGET_LINK_LIBRARIES(mysql perconaserverclient)
- IF(UNIX)
-   TARGET_LINK_LIBRARIES(mysql ${MY_READLINE_LIBRARY})
- ENDIF(UNIX)
-+ENDIF()
- 
- MYSQL_ADD_EXECUTABLE(mysqltest mysqltest.cc COMPONENT Test)
- SET_SOURCE_FILES_PROPERTIES(mysqltest.cc PROPERTIES COMPILE_FLAGS "-DTHREADS")
- TARGET_LINK_LIBRARIES(mysqltest perconaserverclient regex)
- ADD_DEPENDENCIES(mysqltest GenError)
- 
-+IF(FALSE)
- MYSQL_ADD_EXECUTABLE(mysqlcheck mysqlcheck.c)
- TARGET_LINK_LIBRARIES(mysqlcheck perconaserverclient)
- 
-@@ -51,17 +54,21 @@
- MYSQL_ADD_EXECUTABLE(mysqlimport mysqlimport.c)
- TARGET_LINK_LIBRARIES(mysqlimport perconaserverclient)
- SET_SOURCE_FILES_PROPERTIES(mysqlimport.c PROPERTIES COMPILE_FLAGS "-DTHREADS")
-+ENDIF()
- 
- MYSQL_ADD_EXECUTABLE(mysql_upgrade mysql_upgrade.c)
- TARGET_LINK_LIBRARIES(mysql_upgrade perconaserverclient)
- ADD_DEPENDENCIES(mysql_upgrade GenFixPrivs)
- 
-+IF(FALSE)
- MYSQL_ADD_EXECUTABLE(mysqlshow mysqlshow.c)
- TARGET_LINK_LIBRARIES(mysqlshow perconaserverclient)
-+ENDIF()
- 
- MYSQL_ADD_EXECUTABLE(mysql_plugin mysql_plugin.c)
- TARGET_LINK_LIBRARIES(mysql_plugin perconaserverclient)
- 
-+IF(FALSE)
- MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc sql_string.cc
-                      ../sql/rpl_filter.cc ../sql/sql_list.cc)
- TARGET_LINK_LIBRARIES(mysqlbinlog perconaserverclient)
-@@ -75,6 +82,7 @@
- 
- MYSQL_ADD_EXECUTABLE(mysql_config_editor mysql_config_editor.cc)
- TARGET_LINK_LIBRARIES(mysql_config_editor perconaserverclient)
-+ENDIF()
- 
- # "WIN32" also covers 64 bit. "echo" is used in some files below "mysql-test/".
- IF(WIN32)
-@@ -84,11 +92,6 @@
- SET_TARGET_PROPERTIES (
-   mysql_plugin 
-   mysql_upgrade
--  mysqlcheck
--  mysqldump
--  mysqlimport
--  mysqlshow
--  mysqlslap
- PROPERTIES HAS_CXX TRUE)
- 
- ADD_DEFINITIONS(-DHAVE_DLOPEN)
diff --git a/databases/percona56-server/files/patch-client_mysql.cc b/databases/percona56-server/files/patch-client_mysql.cc
deleted file mode 100644
index bf9ac389e7d3..000000000000
--- a/databases/percona56-server/files/patch-client_mysql.cc
+++ /dev/null
@@ -1,25 +0,0 @@
---- client/mysql.cc.orig	2017-05-09 08:31:39.000000000 +0200
-+++ client/mysql.cc	2017-05-29 13:24:38.665722000 +0200
-@@ -2784,9 +2784,11 @@
- #ifdef HAVE_LOCALE_H
-   setlocale(LC_ALL,""); /* so as libedit use isprint */
- #endif
--  rl_attempted_completion_function= (CPPFunction*)&new_mysql_completion;
--  rl_completion_entry_function= &no_completion;
-+  rl_attempted_completion_function= (rl_completion_func_t*)&new_mysql_completion;
-+  rl_completion_entry_function= (rl_compentry_func_t*)&no_completion;
-+  /*
-   rl_add_defun("magic-space", (Function*)&fake_magic_space, -1);
-+  */
- #else
-   rl_attempted_completion_function= (CPPFunction*)&new_mysql_completion;
-   rl_completion_entry_function= &no_completion;
-@@ -2805,7 +2807,7 @@
-                                    int end MY_ATTRIBUTE((unused)))
- {
-   if (!status.batch && !quick)
--#if defined(USE_NEW_XLINE_INTERFACE)
-+#if defined(USE_NEW_READLINE_INTERFACE) || defined(USE_LIBEDIT_INTERFACE)
-     return rl_completion_matches(text, new_command_generator);
- #else
-     return completion_matches((char *)text, (CPFunction *)new_command_generator);
diff --git a/databases/percona56-server/files/patch-cmake_plugin.cmake b/databases/percona56-server/files/patch-cmake_plugin.cmake
deleted file mode 100644
index da6476534102..000000000000
--- a/databases/percona56-server/files/patch-cmake_plugin.cmake
+++ /dev/null
@@ -1,12 +0,0 @@
---- cmake/plugin.cmake.orig	2019-07-20 08:37:32 UTC
-+++ cmake/plugin.cmake
-@@ -224,9 +224,6 @@ MACRO(MYSQL_ADD_PLUGIN)
-       MYSQL_INSTALL_TARGETS(${target}
-         DESTINATION ${INSTALL_PLUGINDIR}
-         COMPONENT ${INSTALL_COMPONENT})
--      INSTALL_DEBUG_TARGET(${target}
--        DESTINATION ${INSTALL_PLUGINDIR}/debug
--        COMPONENT ${INSTALL_COMPONENT})
-       # Add installed files to list for RPMs
-       FILE(APPEND ${CMAKE_BINARY_DIR}/support-files/plugins.files
-               "%attr(755, root, root) %{_prefix}/${INSTALL_PLUGINDIR}/${ARG_MODULE_OUTPUT_NAME}.so\n"
diff --git a/databases/percona56-server/files/patch-cmake_readline.cmake b/databases/percona56-server/files/patch-cmake_readline.cmake
deleted file mode 100644
index 4c251b15fc56..000000000000
--- a/databases/percona56-server/files/patch-cmake_readline.cmake
+++ /dev/null
@@ -1,17 +0,0 @@
---- cmake/readline.cmake.orig	2016-09-30 11:41:40 UTC
-+++ cmake/readline.cmake
-@@ -173,11 +173,11 @@ MACRO (FIND_SYSTEM_EDITLINE)
-     #include <readline.h>
-     int main(int argc, char **argv)
-     {
--      typedef int MYFunction(const char*, int);
-+      typedef char *MYFunction(const char*, int);
-       MYFunction* myf= rl_completion_entry_function;
--      int res= (myf)(NULL, 0);
-+      char *res= (myf)(NULL, 0);
-       completion_matches(0,0);
--      return res;
-+      return (res != NULL);
-     }"
-     EDITLINE_HAVE_COMPLETION)
- 
diff --git a/databases/percona56-server/files/patch-extra_CMakeLists.txt b/databases/percona56-server/files/patch-extra_CMakeLists.txt
deleted file mode 100644
index 6bd2fd069171..000000000000
--- a/databases/percona56-server/files/patch-extra_CMakeLists.txt
+++ /dev/null
@@ -1,13 +0,0 @@
---- extra/CMakeLists.txt.orig	2013-01-22 17:54:50.000000000 +0100
-+++ extra/CMakeLists.txt	2013-02-13 14:35:11.000000000 +0100
-@@ -102,8 +102,10 @@
-   TARGET_LINK_LIBRARIES(resolve_stack_dump mysys mysys_ssl)
-   SET_TARGET_PROPERTIES(resolve_stack_dump PROPERTIES LINKER_LANGUAGE CXX)
- 
-+IF(FALSE)
-   MYSQL_ADD_EXECUTABLE(mysql_waitpid mysql_waitpid.c)
-   TARGET_LINK_LIBRARIES(mysql_waitpid mysys mysys_ssl)
-   SET_TARGET_PROPERTIES(mysql_waitpid PROPERTIES LINKER_LANGUAGE CXX)
- ENDIF()
-+ENDIF()
- 
diff --git a/databases/percona56-server/files/patch-include_CMakeLists.txt b/databases/percona56-server/files/patch-include_CMakeLists.txt
deleted file mode 100644
index 5d5e96a0f1d7..000000000000
--- a/databases/percona56-server/files/patch-include_CMakeLists.txt
+++ /dev/null
@@ -1,15 +0,0 @@
---- include/CMakeLists.txt.orig	2013-01-22 17:54:49.000000000 +0100
-+++ include/CMakeLists.txt	2013-02-13 14:53:40.000000000 +0100
-@@ -65,10 +65,12 @@
-   ${HEADERS_GEN_CONFIGURE}
- )
- 
-+IF(FALSE)
- INSTALL(FILES ${HEADERS} DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT Development)
- INSTALL(DIRECTORY mysql/ DESTINATION ${INSTALL_INCLUDEDIR}/mysql COMPONENT Development 
-  PATTERN "*.h"
-  PATTERN "psi_abi*" EXCLUDE
- )
-+ENDIF()
- 
- 
diff --git a/databases/percona56-server/files/patch-include_my_compare.h b/databases/percona56-server/files/patch-include_my_compare.h
deleted file mode 100644
index 093c8ae37789..000000000000
--- a/databases/percona56-server/files/patch-include_my_compare.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- include/my_compare.h.orig	2011-05-10 09:46:46.000000000 +0200
-+++ include/my_compare.h	2011-05-10 09:47:01.000000000 +0200
-@@ -39,7 +39,7 @@
-   But beware the dependency of MI_MAX_POSSIBLE_KEY_BUFF and HA_MAX_KEY_LENGTH.
- */
- 
--#define HA_MAX_KEY_LENGTH           1000        /* Max length in bytes */
-+#define HA_MAX_KEY_LENGTH           4000        /* Max length in bytes */
- #define HA_MAX_KEY_SEG              16          /* Max segments for key */
- 
- #define HA_MAX_POSSIBLE_KEY_BUFF    (HA_MAX_KEY_LENGTH + 24+ 6+6)
diff --git a/databases/percona56-server/files/patch-include_myisam.h b/databases/percona56-server/files/patch-include_myisam.h
deleted file mode 100644
index 450645400dd5..000000000000
--- a/databases/percona56-server/files/patch-include_myisam.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- include/myisam.h.orig	2009-02-16 23:04:54.000000000 +0100
-+++ include/myisam.h	2009-02-16 23:10:08.000000000 +0100
-@@ -48,7 +48,7 @@
-   The following defines can be increased if necessary.
-   But beware the dependency of MI_MAX_POSSIBLE_KEY_BUFF and MI_MAX_KEY_LENGTH.
- */
--#define MI_MAX_KEY_LENGTH           1000            /* Max length in bytes */
-+#define MI_MAX_KEY_LENGTH           4000            /* Max length in bytes */
- #define MI_MAX_KEY_SEG              16              /* Max segments for key */
- 
- #define MI_MAX_KEY_BUFF  (MI_MAX_KEY_LENGTH+MI_MAX_KEY_SEG*6+8+8)
diff --git a/databases/percona56-server/files/patch-libmysql_CMakeLists.txt b/databases/percona56-server/files/patch-libmysql_CMakeLists.txt
deleted file mode 100644
index 07bcdd4863bf..000000000000
--- a/databases/percona56-server/files/patch-libmysql_CMakeLists.txt
+++ /dev/null
@@ -1,43 +0,0 @@
---- libmysql/CMakeLists.txt.orig
-+++ libmysql/CMakeLists.txt
-@@ -205,7 +205,7 @@
- ENDIF()
- 
- # Merge several convenience libraries into one big perconaserverclient
--MERGE_LIBRARIES(perconaserverclient STATIC ${LIBS_TO_MERGE} COMPONENT Development)
-+MERGE_LIBRARIES(perconaserverclient STATIC ${LIBS_TO_MERGE} COMPONENT Development NOINSTALL)
- TARGET_LINK_LIBRARIES(perconaserverclient ${LIBS_TO_LINK})
- 
- # Visual Studio users need debug  static library for debug projects
-@@ -220,6 +220,7 @@
-   SET(${out_name} ${name})
- ENDMACRO()
- 
-+IF(FALSE)
- IF(UNIX)
-   MACRO(GET_VERSIONED_LIBNAME LIBNAME EXTENSION VERSION OUTNAME)
-     SET(DOT_VERSION ".${VERSION}")
-@@ -240,14 +241,16 @@
-     ${lib_name} ${CMAKE_STATIC_LIBRARY_PREFIX}perconaserverclient_r.a
-     ${INSTALL_LIBDIR} Development)
- ENDIF()
-+ENDIF()
- 
- IF(NOT DISABLE_SHARED)
-   # Merge several convenience libraries into one big perconaserverclient
-   # and link them together into shared library.
-   MERGE_LIBRARIES(libmysql SHARED ${LIBS_TO_MERGE}
-     EXPORTS ${CLIENT_API_FUNCTIONS}
--    COMPONENT SharedLibraries)
-+    COMPONENT SharedLibraries NOINSTALL)
-   TARGET_LINK_LIBRARIES(libmysql ${LIBS_TO_LINK})
-+IF(FALSE)
-   IF(UNIX)
-     # libtool compatability
-     IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD" OR APPLE)
-@@ -316,4 +319,5 @@
-         ${INSTALL_LIBDIR} SharedLibraries)
-     ENDFOREACH()
-   ENDIF()
-+ENDIF()
- ENDIF()
diff --git a/databases/percona56-server/files/patch-libservices_CMakeLists.txt b/databases/percona56-server/files/patch-libservices_CMakeLists.txt
deleted file mode 100644
index fcbcea7aed21..000000000000
--- a/databases/percona56-server/files/patch-libservices_CMakeLists.txt
+++ /dev/null
@@ -1,9 +0,0 @@
---- libservices/CMakeLists.txt.orig	2010-12-23 17:13:03.000000000 +0100
-+++ libservices/CMakeLists.txt	2010-12-23 17:13:17.000000000 +0100
-@@ -22,4 +22,6 @@
-   my_thread_scheduler_service.c)
- 
- ADD_LIBRARY(mysqlservices ${MYSQLSERVICES_SOURCES})
-+IF(FALSE)
- INSTALL(TARGETS mysqlservices DESTINATION ${INSTALL_LIBDIR} COMPONENT Development)
-+ENDIF()
diff --git a/databases/percona56-server/files/patch-man_CMakeLists.txt b/databases/percona56-server/files/patch-man_CMakeLists.txt
deleted file mode 100644
index 7849c77af111..000000000000
--- a/databases/percona56-server/files/patch-man_CMakeLists.txt
+++ /dev/null
@@ -1,11 +0,0 @@
---- man/CMakeLists.txt.orig	2011-10-22 14:36:06.000000000 +0200
-+++ man/CMakeLists.txt	2011-10-22 14:36:23.000000000 +0200
-@@ -15,8 +15,6 @@
- 
- # Copy man pages
- FILE(GLOB MAN1_FILES *.1)
--FILE(GLOB MAN1_EXCLUDE make_win_bin_dist.1)
--FILE(GLOB MAN1_NDB ndb*.1)
- FILE(GLOB MAN8_FILES *.8)
- FILE(GLOB MAN8_NDB ndb*.8)
- IF(MAN1_FILES)
diff --git a/databases/percona56-server/files/patch-mysys__posix_timers.c b/databases/percona56-server/files/patch-mysys__posix_timers.c
deleted file mode 100644
index 52000de41a35..000000000000
--- a/databases/percona56-server/files/patch-mysys__posix_timers.c
+++ /dev/null
@@ -1,32 +0,0 @@
---- mysys/posix_timers.c.orig	2013-10-07 12:25:25.000000000 +0200
-+++ mysys/posix_timers.c	2013-10-07 21:04:37.090622581 +0200
-@@ -22,6 +22,10 @@
- #define sigev_notify_thread_id   _sigev_un._tid
- #endif
- 
-+#ifdef __FreeBSD__
-+typedef union sigval sigval_t;
-+#endif /* __FreeBSD__ */
-+
- #define MY_TIMER_EVENT_SIGNO  (SIGRTMIN)
- #define MY_TIMER_KILL_SIGNO   (SIGRTMIN+1)
- 
-@@ -68,7 +72,18 @@
-   sigaddset(&set, MY_TIMER_KILL_SIGNO);
- 
-   /* Get the thread ID of the current thread. */
-+
-+#ifdef __FreeBSD__
-+# if __FreeBSD__version > 900030
-+  thread_id= pthread_getthreadid_np();
-+# else
-+  long tid;
-+  syscall(SYS_thr_self, &tid);
-+  thread_id= (pid_t) tid;
-+# endif
-+#else
-   thread_id= (pid_t) syscall(SYS_gettid);
-+#endif
- 
-   /* Wake up parent thread, thread_id is available. */
-   pthread_barrier_wait(barrier);
diff --git a/databases/percona56-server/files/patch-mysys_ssl_my_default.cc b/databases/percona56-server/files/patch-mysys_ssl_my_default.cc
deleted file mode 100644
index f6f38decb8ec..000000000000
--- a/databases/percona56-server/files/patch-mysys_ssl_my_default.cc
+++ /dev/null
@@ -1,31 +0,0 @@
---- mysys_ssl/my_default.cc.orig	2013-01-22 17:54:49.000000000 +0100
-+++ mysys_ssl/my_default.cc	2013-02-13 11:08:15.000000000 +0100
-@@ -119,7 +119,7 @@
- 
- /* Which directories are searched for options (and in which order) */
- 
--#define MAX_DEFAULT_DIRS 6
-+#define MAX_DEFAULT_DIRS 7
- #define DEFAULT_DIRS_SIZE (MAX_DEFAULT_DIRS + 1)  /* Terminate with NULL */
- static const char **default_directories = NULL;
- 
-@@ -1395,7 +1395,10 @@
- 
- #if defined(DEFAULT_SYSCONFDIR)
-   if (DEFAULT_SYSCONFDIR[0])
-+  {
-     errors += add_directory(alloc, DEFAULT_SYSCONFDIR, dirs);
-+    errors += add_directory(alloc, DEFAULT_SYSCONFDIR "/mysql", dirs);
-+  }
- #endif /* DEFAULT_SYSCONFDIR */
- 
- #endif
-@@ -1466,7 +1469,7 @@
-   MY_STAT stat_info;
- 
-   if (!my_stat(file_name,&stat_info,MYF(0)))
--    return 1;
-+    return 0;
-   /*
-     Ignore .mylogin.cnf file if not exclusively readable/writable
-     by current user.
diff --git a/databases/percona56-server/files/patch-plugin_password_validation_validate_password.cc b/databases/percona56-server/files/patch-plugin_password_validation_validate_password.cc
deleted file mode 100644
index 653f03095030..000000000000
--- a/databases/percona56-server/files/patch-plugin_password_validation_validate_password.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- plugin/password_validation/validate_password.cc.orig	2013-09-10 07:38:25.000000000 +0000
-+++ plugin/password_validation/validate_password.cc	2013-10-05 15:40:20.790380179 +0000
-@@ -16,6 +16,8 @@
- #include <my_sys.h>
- #include <string>
- #include <mysql/plugin_validate_password.h>
-+/* solve clash between libc++ bitset::test() and test macro from my_global.h */
-+#undef test
- #include <set>
- #include <iostream>
- #include <fstream>
diff --git a/databases/percona56-server/files/patch-scripts_CMakeLists.txt b/databases/percona56-server/files/patch-scripts_CMakeLists.txt
deleted file mode 100644
index 1ba5136f14c3..000000000000
--- a/databases/percona56-server/files/patch-scripts_CMakeLists.txt
+++ /dev/null
@@ -1,38 +0,0 @@
---- scripts/CMakeLists.txt.orig	2015-02-05 14:28:58.000000000 +0100
-+++ scripts/CMakeLists.txt	2015-02-12 23:25:55.432292000 +0100
-@@ -273,6 +273,8 @@
-           GET_FILENAME_COMPONENT(lib "${lib}" NAME_WE)
-           STRING(REGEX REPLACE "^lib" "" lib "${lib}")
-           SET(${var} "${${var}}-l${lib} " ) 
-+        ELSEIF(lib STREQUAL "-pthread")
-+          SET(${var} "${${var}}-pthread " ) 
-         ELSE()
-           SET(${var} "${${var}}-l${lib} " ) 
-         ENDIF()
-@@ -326,25 +328,19 @@
-   # On Unix, most of the files end up in the bin directory
-   SET(mysql_config_COMPONENT COMPONENT Development)
-   SET(BIN_SCRIPTS
--    msql2mysql
--    mysql_config
-     mysql_fix_extensions
-     mysql_setpermission
-     mysql_zap
--    mysqlaccess
--    mysqlaccess.conf
-     mysql_convert_table_format
--    mysql_find_rows
-     mysqlhotcopy
-     mysqldumpslow
-     mysqld_multi
-     mysqld_safe
--    ps_tokudb_admin
-   )
-   FOREACH(file ${BIN_SCRIPTS})
-     IF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh)
-       CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh
--        ${CMAKE_CURRENT_BINARY_DIR}/${file} ESCAPE_QUOTES @ONLY)
-+        ${CMAKE_CURRENT_BINARY_DIR}/${file} @ONLY)
-     ELSEIF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${file})
-       CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${file}
-          ${CMAKE_CURRENT_BINARY_DIR}/${file} COPYONLY)
diff --git a/databases/percona56-server/files/patch-scripts_mysqld_safe.sh b/databases/percona56-server/files/patch-scripts_mysqld_safe.sh
deleted file mode 100644
index 2a30469922f0..000000000000
--- a/databases/percona56-server/files/patch-scripts_mysqld_safe.sh
+++ /dev/null
@@ -1,24 +0,0 @@
---- scripts/mysqld_safe.sh.orig	2007-10-08 10:39:23.000000000 +0200
-+++ scripts/mysqld_safe.sh	2007-10-08 10:40:52.000000000 +0200
-@@ -242,10 +242,10 @@
- 
- if test -z "$MYSQL_HOME"
- then 
--  if test -r "$MY_BASEDIR_VERSION/my.cnf" && test -r "$DATADIR/my.cnf"
-+  if test -r "$MY_BASEDIR_VERSION/etc/my.cnf" && test -r "$DATADIR/my.cnf"
-   then
-     log_error "WARNING: Found two instances of my.cnf -
--$MY_BASEDIR_VERSION/my.cnf and
-+$MY_BASEDIR_VERSION/etc/my.cnf and
- $DATADIR/my.cnf
- IGNORING $DATADIR/my.cnf"
- 
-@@ -254,7 +254,7 @@
-   then
-     log_error "WARNING: Found $DATADIR/my.cnf
- The data directory is a deprecated location for my.cnf, please move it to
--$MY_BASEDIR_VERSION/my.cnf"
-+$MY_BASEDIR_VERSION/etc/my.cnf"
-     MYSQL_HOME=$DATADIR
-   else
-     MYSQL_HOME=$MY_BASEDIR_VERSION
diff --git a/databases/percona56-server/files/patch-sql-common_client.c b/databases/percona56-server/files/patch-sql-common_client.c
deleted file mode 100644
index 2a6f3fe1a37f..000000000000
--- a/databases/percona56-server/files/patch-sql-common_client.c
+++ /dev/null
@@ -1,38 +0,0 @@
---- sql-common/client.c.orig	2018-01-17 11:39:51.315029000 +0000
-+++ sql-common/client.c	2018-01-17 11:44:53.493273000 +0000
-@@ -1884,7 +1884,7 @@
-     *errptr= "Failed to get DNS name from SAN list item";
-     DBUG_RETURN(1);
-   }
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-   cn= (const char *)ASN1_STRING_data(dns_name);
- #else
-   cn= (const char *)ASN1_STRING_get0_data(dns_name);
-@@ -1946,7 +1946,7 @@
-     *errptr= "Invalid IP address embedded in the certificate SAN IP address";
-     DBUG_RETURN(1);
-   }
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-   ip= ASN1_STRING_data(ip_address);
- #else
-   ip= ASN1_STRING_get0_data(ip_address);
-@@ -2111,7 +2111,7 @@
-   if(server_ip_address != NULL)
-   {
-     iplen= ASN1_STRING_length(server_ip_address);
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-     ipout= (const unsigned char *) ASN1_STRING_data(server_ip_address);
- #else
-     ipout= (const unsigned char *) ASN1_STRING_get0_data(server_ip_address);
-@@ -2163,7 +2163,7 @@
-       goto error;
-     }
- 
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-     cn= (const char *) ASN1_STRING_data(cn_asn1);
- #else
-     cn= (const char *) ASN1_STRING_get0_data(cn_asn1);
diff --git a/databases/percona56-server/files/patch-sql_CMakeLists.txt b/databases/percona56-server/files/patch-sql_CMakeLists.txt
deleted file mode 100644
index 60567b7b61cb..000000000000
--- a/databases/percona56-server/files/patch-sql_CMakeLists.txt
+++ /dev/null
@@ -1,18 +0,0 @@
---- sql/CMakeLists.txt.orig	2013-06-03 00:02:34.000000000 +0200
-+++ sql/CMakeLists.txt	2013-06-06 00:56:54.121744790 +0200
-@@ -430,6 +430,7 @@
- 
- IF(INSTALL_LAYOUT STREQUAL "STANDALONE")
- 
-+IF(FALSE)
- # Copy db.opt into data/test/
- SET(DBOPT_FILE ${CMAKE_CURRENT_SOURCE_DIR}/db.opt ) 
- INSTALL(FILES ${DBOPT_FILE} DESTINATION data/test COMPONENT DataFiles)
-@@ -474,6 +475,7 @@
-   INSTALL(FILES ${DUMMY_FILE} DESTINATION data/mysql COMPONENT DataFiles)
- ENDIF()
- ENDIF()
-+ENDIF()
- 
- ADD_CUSTOM_TARGET(show-dist-name
-   COMMAND ${CMAKE_COMMAND} -E echo "${CPACK_PACKAGE_FILE_NAME}"
diff --git a/databases/percona56-server/files/patch-sql_mysqld.cc b/databases/percona56-server/files/patch-sql_mysqld.cc
deleted file mode 100644
index 586f267f28c6..000000000000
--- a/databases/percona56-server/files/patch-sql_mysqld.cc
+++ /dev/null
@@ -1,19 +0,0 @@
---- sql/mysqld.cc.orig	2015-07-25 17:06:21 UTC
-+++ sql/mysqld.cc
-@@ -2117,6 +2117,16 @@
- #ifndef EMBEDDED_LIBRARY
-
- /* Initialise proxy protocol. */
-+
-+/* At least OpenBSD and NexentaCore do not
-+* define s6_addr32 for user land settings.
-+*/
-+#if !defined s6_addr32 && defined __sun__
-+#       define s6_addr32 _S6_un._S6_u32
-+#elif !defined s6_addr32 && ( defined __OpenBSD__ || defined __FreeBSD__ )
-+#       define s6_addr32 __u6_addr.__u6_addr32
-+#endif  /* !defined s6_addr32 */
-+
- static void set_proxy()
- {
-   const char *p;
diff --git a/databases/percona56-server/files/patch-sql_sys_vars.cc b/databases/percona56-server/files/patch-sql_sys_vars.cc
deleted file mode 100644
index e8f0caff4aff..000000000000
--- a/databases/percona56-server/files/patch-sql_sys_vars.cc
+++ /dev/null
@@ -1,38 +0,0 @@
---- sql/sys_vars.cc.orig	2012-06-15 17:03:32.000000000 +0200
-+++ sql/sys_vars.cc	2012-06-15 17:16:23.000000000 +0200
-@@ -900,7 +900,7 @@
-        "connection before closing it",
-        SESSION_VAR(net_interactive_timeout),
-        CMD_LINE(REQUIRED_ARG),
--       VALID_RANGE(1, LONG_TIMEOUT), DEFAULT(NET_WAIT_TIMEOUT), BLOCK_SIZE(1));
-+       VALID_RANGE(1, INT_MAX32/1000), DEFAULT(NET_WAIT_TIMEOUT), BLOCK_SIZE(1));
- 
- static Sys_var_ulong Sys_join_buffer_size(
-        "join_buffer_size",
-@@ -1401,7 +1401,7 @@
-        "Number of seconds to wait for more data from a connection before "
-        "aborting the read",
-        SESSION_VAR(net_read_timeout), CMD_LINE(REQUIRED_ARG),
--       VALID_RANGE(1, LONG_TIMEOUT), DEFAULT(NET_READ_TIMEOUT), BLOCK_SIZE(1),
-+       VALID_RANGE(1, INT_MAX32/1000), DEFAULT(NET_READ_TIMEOUT), BLOCK_SIZE(1),
-        NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0),
-        ON_UPDATE(fix_net_read_timeout));
- 
-@@ -1416,7 +1416,7 @@
-        "Number of seconds to wait for a block to be written to a connection "
-        "before aborting the write",
-        SESSION_VAR(net_write_timeout), CMD_LINE(REQUIRED_ARG),
--       VALID_RANGE(1, LONG_TIMEOUT), DEFAULT(NET_WRITE_TIMEOUT), BLOCK_SIZE(1),
-+       VALID_RANGE(1, INT_MAX32/1000), DEFAULT(NET_WRITE_TIMEOUT), BLOCK_SIZE(1),
-        NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0),
-        ON_UPDATE(fix_net_write_timeout));
- 
-@@ -2257,7 +2257,7 @@
-        "The number of seconds the server waits for activity on a "
-        "connection before closing it",
-        SESSION_VAR(net_wait_timeout), CMD_LINE(REQUIRED_ARG),
--       VALID_RANGE(1, IF_WIN(INT_MAX32/1000, LONG_TIMEOUT)),
-+       VALID_RANGE(1, INT_MAX32/1000),
-        DEFAULT(NET_WAIT_TIMEOUT), BLOCK_SIZE(1));
- 
- /** propagates changes to the relevant flag of @@optimizer_switch */
diff --git a/databases/percona56-server/files/patch-support-files_CMakeLists.txt b/databases/percona56-server/files/patch-support-files_CMakeLists.txt
deleted file mode 100644
index 159e1fa71ba2..000000000000
--- a/databases/percona56-server/files/patch-support-files_CMakeLists.txt
+++ /dev/null
@@ -1,12 +0,0 @@
---- support-files/CMakeLists.txt.orig	2010-12-23 17:38:19.000000000 +0100
-+++ support-files/CMakeLists.txt	2010-12-23 17:41:11.000000000 +0100
-@@ -74,7 +74,9 @@
-     INSTALL(FILES magic DESTINATION ${inst_location} COMPONENT SupportFiles)
-   ENDIF()
- 
-+IF(FALSE)
-   INSTALL(FILES mysql.m4 DESTINATION ${INSTALL_SHAREDIR}/aclocal COMPONENT Development)
-+ENDIF()
-   CONFIGURE_FILE(MySQL-shared-compat.spec.sh ${CMAKE_CURRENT_BINARY_DIR}/MySQL-shared-compat.spec @ONLY)
-   CONFIGURE_FILE(mysql.spec.sh ${CMAKE_CURRENT_BINARY_DIR}/mysql.spec @ONLY)
-   CONFIGURE_FILE(mysql.spec.sh ${CMAKE_CURRENT_BINARY_DIR}/mysql.${VERSION}.spec @ONLY)
diff --git a/databases/percona56-server/files/patch-vio_viosocket.c b/databases/percona56-server/files/patch-vio_viosocket.c
deleted file mode 100644
index dee21830f520..000000000000
--- a/databases/percona56-server/files/patch-vio_viosocket.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- vio/viosocket.c.orig	2015-07-08 07:38:39 UTC
-+++ vio/viosocket.c
-@@ -33,6 +33,10 @@
- static void (*before_io_wait)(void)= 0;
- static void (*after_io_wait)(void)= 0;
- 
-+#ifdef __FreeBSD__
-+#define s6_addr32 __u6_addr.__u6_addr32
-+#endif
-+
- /* Wait callback macros (both performance schema and threadpool */
- #define START_SOCKET_WAIT(locker, state_ptr, sock, which, timeout) \
- do                                                                 \
diff --git a/databases/percona56-server/files/patch-vio_viosslfactories.c b/databases/percona56-server/files/patch-vio_viosslfactories.c
deleted file mode 100644
index 42a28cd67cdd..000000000000
--- a/databases/percona56-server/files/patch-vio_viosslfactories.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- vio/viosslfactories.c.orig	2020-07-21 12:31:43.000000000 +0200
-+++ vio/viosslfactories.c	2020-09-17 22:38:47.837385000 +0200
-@@ -128,7 +128,7 @@
-     BIGNUM *p= BN_bin2bn(dh2048_p, sizeof(dh2048_p), NULL);
-     BIGNUM *g= BN_bin2bn(dh2048_g, sizeof(dh2048_g), NULL);
-     if (!p || !g
--#if OPENSSL_VERSION_NUMBER >= 0x10100000L
-+#if OPENSSL_VERSION_NUMBER >= 0x10100000L || defined( LIBRESSL_VERSION_NUMBER )
-         || !DH_set0_pqg(dh, p, NULL, g)
- #endif /* OPENSSL_VERSION_NUMBER >= 0x10100000L */
-     ) {
-@@ -136,7 +136,7 @@
-       DH_free(dh);
-       return NULL;
-     }
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined( LIBRESSL_VERSION_NUMBER )
-     dh->p= p;
-     dh->g= g;
- #endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */
diff --git a/databases/percona56-server/pkg-descr b/databases/percona56-server/pkg-descr
deleted file mode 100644
index cb5d1681d1bb..000000000000
--- a/databases/percona56-server/pkg-descr
+++ /dev/null
@@ -1,4 +0,0 @@
-MySQL replacement : Percona ServerPercona Server is a drop-in alternative
-for MySQL with enhanced performance and enterprise-grade features.
-
-WWW: http://www.percona.com/software/percona-server
diff --git a/databases/percona56-server/pkg-message b/databases/percona56-server/pkg-message
deleted file mode 100644
index e619c93e68e7..000000000000
--- a/databases/percona56-server/pkg-message
+++ /dev/null
@@ -1,8 +0,0 @@
-[
-{ type: upgrade
-  message: <<EOM
-Remember to run mysql_upgrade the first time you start the MySQL server
-after an upgrade from an earlier version.
-EOM
-}
-]
diff --git a/databases/percona56-server/pkg-plist b/databases/percona56-server/pkg-plist
deleted file mode 100644
index 5087e68c42f3..000000000000
--- a/databases/percona56-server/pkg-plist
+++ /dev/null
@@ -1,177 +0,0 @@
-bin/innochecksum
-bin/my_print_defaults
-bin/myisam_ftdump
-bin/myisamchk
-bin/myisamlog
-bin/myisampack
-bin/mysql_convert_table_format
-bin/mysql_fix_extensions
-bin/mysql_install_db
-bin/mysql_plugin
-bin/mysql_secure_installation
-bin/mysql_setpermission
-bin/mysql_tzinfo_to_sql
-bin/mysql_upgrade
-bin/mysql_zap
-bin/mysqlbug
-bin/mysqld_multi
-bin/mysqld_safe
-bin/mysqldumpslow
-bin/mysqlhotcopy
-bin/mysqltest
-bin/perror
-bin/replace
-bin/resolve_stack_dump
-bin/resolveip
-%%TOKUDB%%bin/tokuft_logprint
-%%TOKUDB%%bin/tokuftdump
-%%TOKUDB%%include/backup.h
-%%TOKUDB%%lib/mysql/libHotBackup.so
-lib/mysql/libmysqld.a
-lib/mysql/plugin/adt_null.so
-lib/mysql/plugin/audit_log.so
-lib/mysql/plugin/auth.so
-lib/mysql/plugin/auth_test_plugin.so
-lib/mysql/plugin/connection_control.so
-lib/mysql/plugin/daemon_example.ini
-lib/mysql/plugin/ha_example.so
-%%TOKUDB%%lib/mysql/plugin/ha_tokudb.so
-lib/mysql/plugin/handlersocket.so
-%%INNODBMEMCACHED%%lib/mysql/plugin/innodb_engine.so
-lib/mysql/plugin/libdaemon_example.so
-lib/mysql/plugin/libfnv1a_udf.so
-lib/mysql/plugin/libfnv_udf.so
-%%INNODBMEMCACHED%%lib/mysql/plugin/libmemcached.so
-lib/mysql/plugin/libmurmur_udf.so
-lib/mysql/plugin/mypluglib.so
-lib/mysql/plugin/mysql_no_login.so
-lib/mysql/plugin/qa_auth_client.so
-lib/mysql/plugin/qa_auth_interface.so
-lib/mysql/plugin/qa_auth_server.so
-lib/mysql/plugin/query_response_time.so
-lib/mysql/plugin/semisync_master.so
-lib/mysql/plugin/semisync_slave.so
-lib/mysql/plugin/test_udf_services.so
-%%TOKUDB%%lib/mysql/plugin/tokudb_backup.so
-lib/mysql/plugin/udf_example.so
-lib/mysql/plugin/validate_password.so
-libexec/mysqld
-man/man1/my_print_defaults.1.gz
-man/man1/myisam_ftdump.1.gz
-man/man1/myisamchk.1.gz
-man/man1/myisamlog.1.gz
-man/man1/myisampack.1.gz
-man/man1/mysql.server.1.gz
-man/man1/mysql_convert_table_format.1.gz
-man/man1/mysql_fix_extensions.1.gz
-man/man1/mysql_install_db.1.gz
-man/man1/mysql_plugin.1.gz
-man/man1/mysql_secure_installation.1.gz
-man/man1/mysql_setpermission.1.gz
-man/man1/mysql_tzinfo_to_sql.1.gz
-man/man1/mysql_upgrade.1.gz
-man/man1/mysql_zap.1.gz
-man/man1/mysqlbug.1.gz
-man/man1/mysqld_multi.1.gz
-man/man1/mysqld_safe.1.gz
-man/man1/mysqldumpslow.1.gz
-man/man1/mysqlhotcopy.1.gz
-man/man1/mysqlman.1.gz
-man/man1/perror.1.gz
-man/man1/replace.1.gz
-man/man1/resolve_stack_dump.1.gz
-man/man1/resolveip.1.gz
-man/man8/mysqld.8.gz
-%%TOKUDB%%share/doc/mysql/COPYING.AGPLv3
-%%TOKUDB%%share/doc/mysql/COPYING.GPLv2
-%%TOKUDB%%share/doc/mysql/PATENTS
-%%TOKUDB%%share/doc/mysql/README.md
-%%TOKUDB%%share/doc/mysql/README_tokudb_backup
-%%DATADIR%%/binary-configure
-%%DATADIR%%/bulgarian/errmsg.sys
-%%DATADIR%%/charsets/Index.xml
-%%DATADIR%%/charsets/README
-%%DATADIR%%/charsets/armscii8.xml
-%%DATADIR%%/charsets/ascii.xml
-%%DATADIR%%/charsets/cp1250.xml
-%%DATADIR%%/charsets/cp1251.xml
-%%DATADIR%%/charsets/cp1256.xml
-%%DATADIR%%/charsets/cp1257.xml
-%%DATADIR%%/charsets/cp850.xml
-%%DATADIR%%/charsets/cp852.xml
-%%DATADIR%%/charsets/cp866.xml
-%%DATADIR%%/charsets/dec8.xml
-%%DATADIR%%/charsets/geostd8.xml
-%%DATADIR%%/charsets/greek.xml
-%%DATADIR%%/charsets/hebrew.xml
-%%DATADIR%%/charsets/hp8.xml
-%%DATADIR%%/charsets/keybcs2.xml
-%%DATADIR%%/charsets/koi8r.xml
-%%DATADIR%%/charsets/koi8u.xml
-%%DATADIR%%/charsets/latin1.xml
-%%DATADIR%%/charsets/latin2.xml
-%%DATADIR%%/charsets/latin5.xml
-%%DATADIR%%/charsets/latin7.xml
-%%DATADIR%%/charsets/macce.xml
-%%DATADIR%%/charsets/macroman.xml
-%%DATADIR%%/charsets/swe7.xml
-%%DATADIR%%/czech/errmsg.sys
-%%DATADIR%%/danish/errmsg.sys
-%%DATADIR%%/dictionary.txt
-%%DATADIR%%/dutch/errmsg.sys
-%%DATADIR%%/english/errmsg.sys
-%%DATADIR%%/errmsg-utf8.txt
-%%DATADIR%%/estonian/errmsg.sys
-%%DATADIR%%/fill_help_tables.sql
-%%DATADIR%%/french/errmsg.sys
-%%DATADIR%%/german/errmsg.sys
-%%DATADIR%%/greek/errmsg.sys
-%%DATADIR%%/hungarian/errmsg.sys
-%%DATADIR%%/innodb_memcached_config.sql
-%%DATADIR%%/italian/errmsg.sys
-%%DATADIR%%/japanese/errmsg.sys
-%%DATADIR%%/korean/errmsg.sys
-%%DATADIR%%/magic
-%%DATADIR%%/my-default.cnf
-%%DATADIR%%/mysql-log-rotate
-%%DATADIR%%/mysql.server
-%%DATADIR%%/mysql_security_commands.sql
-%%DATADIR%%/mysql_system_tables.sql
-%%DATADIR%%/mysql_system_tables_data.sql
-%%DATADIR%%/mysql_test_data_timezone.sql
-%%DATADIR%%/mysqld_multi.server
-%%DATADIR%%/norwegian-ny/errmsg.sys
-%%DATADIR%%/norwegian/errmsg.sys
-%%DATADIR%%/polish/errmsg.sys
-%%DATADIR%%/portuguese/errmsg.sys
-%%DATADIR%%/romanian/errmsg.sys
-%%DATADIR%%/russian/errmsg.sys
-%%DATADIR%%/serbian/errmsg.sys
-%%DATADIR%%/slovak/errmsg.sys
-%%DATADIR%%/spanish/errmsg.sys
-%%DATADIR%%/swedish/errmsg.sys
-%%DATADIR%%/tests/suite/query_response_time/basic.result
-%%DATADIR%%/tests/suite/query_response_time/basic.test
-%%DATADIR%%/tests/suite/query_response_time/bug1453277-master.opt
-%%DATADIR%%/tests/suite/query_response_time/bug1453277.result
-%%DATADIR%%/tests/suite/query_response_time/bug1453277.test
-%%DATADIR%%/tests/suite/query_response_time/install_query_response_time-master.opt
-%%DATADIR%%/tests/suite/query_response_time/install_query_response_time.result
-%%DATADIR%%/tests/suite/query_response_time/install_query_response_time.test
-%%DATADIR%%/tests/suite/query_response_time/session_toggle.result
-%%DATADIR%%/tests/suite/query_response_time/query_response_time-rw-begin.inc
-%%DATADIR%%/tests/suite/query_response_time/query_response_time-rw-end.inc
-%%DATADIR%%/tests/suite/query_response_time/query_response_time-rw.result
-%%DATADIR%%/tests/suite/query_response_time/query_response_time-rw.test
-%%DATADIR%%/tests/suite/query_response_time/query_response_time-stored.inc
-%%DATADIR%%/tests/suite/query_response_time/query_response_time-stored.result
-%%DATADIR%%/tests/suite/query_response_time/query_response_time-stored.test
-%%DATADIR%%/tests/suite/query_response_time/query_response_time-check.inc
-%%DATADIR%%/tests/suite/query_response_time/query_response_time.inc
-%%DATADIR%%/tests/suite/query_response_time/query_response_time.result
-%%DATADIR%%/tests/suite/query_response_time/query_response_time.test
-%%DATADIR%%/tests/suite/query_response_time/session_toggle.test
-%%DATADIR%%/tests/suite/query_response_time/suite.opt
-%%DATADIR%%/tests/suite/query_response_time/suite.pm
-%%DATADIR%%/ukrainian/errmsg.sys
-@dir(mysql,mysql,) /var/db/mysql
diff --git a/databases/percona57-client/Makefile b/databases/percona57-client/Makefile
deleted file mode 100644
index e2492b832489..000000000000
--- a/databases/percona57-client/Makefile
+++ /dev/null
@@ -1,53 +0,0 @@
-# Created by: Mark Felder <feld@FreeBSD.org>
-
-PORTNAME=	percona
-PORTREVISION?=	0
-PKGNAMESUFFIX=	57-client
-
-COMMENT=	Multithreaded SQL database (client)
-
-LICENSE=	GPLv2+
-
-MASTERDIR=	${.CURDIR}/../percona57-server
-
-OPTIONS_EXCLUDE=TOKUDB
-
-PKGMESSAGE=	${.CURDIR}/pkg-message
-PATCHDIR=	${.CURDIR}/files
-PLIST=		${.CURDIR}/pkg-plist
-
-CONFLICTS_INSTALL=	mysql*-client-* \
-			mariadb*-client-* \
-			percona5[0-68-9]-client-*
-
-CMAKE_ARGS+=	-DWITHOUT_SERVER=1
-
-USE_LDCONFIG=	${PREFIX}/lib/mysql
-
-MANPAGES=	comp_err.1 mysql.1 mysql_config.1 mysql_config_editor.1 \
-		mysql_waitpid.1 mysqladmin.1 mysqlbinlog.1 \
-		mysqlcheck.1 mysqldump.1 mysqlimport.1 mysqlshow.1 mysqlslap.1
-
-CLIENT_ONLY=	yes
-
-OPTIONS_GROUP+=	PLUGINS
-PLUGINS_DESC=	Default Client Plugins
-OPTIONS_GROUP_PLUGINS=	SASLCLIENT
-SASLCLIENT_DESC=	SASL client plugin module
-SASLCLIENT_CMAKE_BOOL=	WITH_AUTHENTICATION_LDAP
-SASLCLIENT_LIB_DEPENDS=	libsasl2.so:security/cyrus-sasl2
-SASLCLIENT_USE=		OPENLDAP=yes
-OPTIONS_DEFAULT+=	SASLCLIENT
-OPTIONS_SUB=	yes
-
-# Percona renamed the libraries, until we decide how to deal with it create some symlinks
-# to prevent breaking installed ports.
-post-install:
-	${LN} -s libperconaserverclient.so ${STAGEDIR}${PREFIX}/lib/mysql/libmysqlclient.so
-	${LN} -s libperconaserverclient.so.20 ${STAGEDIR}${PREFIX}/lib/mysql/libmysqlclient.so.20
-	${LN} -s libperconaserverclient.a ${STAGEDIR}${PREFIX}/lib/mysql/libmysqlclient_r.a
-	${LN} -s libperconaserverclient.so ${STAGEDIR}${PREFIX}/lib/mysql/libmysqlclient_r.so
-	${LN} -s libperconaserverclient.so.20 ${STAGEDIR}${PREFIX}/lib/mysql/libmysqlclient_r.so.20
-	${LN} -s perconaserverclient.pc ${STAGEDIR}${PREFIX}/libdata/pkgconfig/mysqlclient.pc
-
-.include "${MASTERDIR}/Makefile"
diff --git a/databases/percona57-client/files/patch-CMakeLists.txt b/databases/percona57-client/files/patch-CMakeLists.txt
deleted file mode 100644
index 86b3aeb04103..000000000000
--- a/databases/percona57-client/files/patch-CMakeLists.txt
+++ /dev/null
@@ -1,36 +0,0 @@
---- CMakeLists.txt.orig	2016-11-27 19:44:54 UTC
-+++ CMakeLists.txt
-@@ -613,8 +613,8 @@ ENDIF()
- 
- ADD_SUBDIRECTORY(extra)
- ADD_SUBDIRECTORY(client)
--ADD_SUBDIRECTORY(sql/share)
- ADD_SUBDIRECTORY(libservices)
-+ADD_SUBDIRECTORY(support-files)
- 
- IF(UNIX)
-   ADD_SUBDIRECTORY(man)
-@@ -684,14 +684,13 @@ ELSE()
-   SET(CPACK_GENERATOR "TGZ")
- ENDIF() 
- ADD_SUBDIRECTORY(packaging/WiX)
--ADD_SUBDIRECTORY(packaging/solaris)
- 
- IF(UNIX)
--  INSTALL(FILES Docs/mysql.info DESTINATION ${INSTALL_INFODIR} OPTIONAL COMPONENT Info)
- ENDIF()
- #
- # RPM installs documentation directly from the source tree
- #
-+IF(FALSE)
- IF(NOT INSTALL_LAYOUT MATCHES "RPM")
-   INSTALL(FILES COPYING LICENSE.mysql 
-   DESTINATION ${INSTALL_DOCREADMEDIR} 
-@@ -714,6 +713,7 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM")
-     PATTERN "sp-imp-spec.txt" EXCLUDE
-   )
- ENDIF()
-+ENDIF()
- 
- INCLUDE(CPack)
- 
diff --git a/databases/percona57-client/files/patch-client_CMakeLists.txt b/databases/percona57-client/files/patch-client_CMakeLists.txt
deleted file mode 100644
index e61b2322f95c..000000000000
--- a/databases/percona57-client/files/patch-client_CMakeLists.txt
+++ /dev/null
@@ -1,44 +0,0 @@
---- client/CMakeLists.txt.orig	2018-02-16 07:57:38 UTC
-+++ client/CMakeLists.txt
-@@ -48,6 +48,7 @@ IF(UNIX)
-   TARGET_LINK_LIBRARIES(mysql ${MY_READLINE_LIBRARY})
- ENDIF(UNIX)
- 
-+IF(FALSE)
- IF(NOT WITHOUT_SERVER)
-   MYSQL_ADD_EXECUTABLE(mysql_upgrade
-     upgrade/program.cc
-@@ -58,11 +59,14 @@ ADD_COMPILE_FLAGS(
- TARGET_LINK_LIBRARIES(mysql_upgrade perconaserverclient client_base mysqlcheck_core)
- ADD_DEPENDENCIES(mysql_upgrade GenFixPrivs GenSysSchema)
- ENDIF()
-+ENDIF()
- 
-+IF(FALSE)
- MYSQL_ADD_EXECUTABLE(mysqltest mysqltest.cc COMPONENT Test)
- SET_SOURCE_FILES_PROPERTIES(mysqltest.cc PROPERTIES COMPILE_FLAGS "-DTHREADS")
- TARGET_LINK_LIBRARIES(mysqltest perconaserverclient regex)
- ADD_DEPENDENCIES(mysqltest GenError)
-+ENDIF()
- 
- ADD_CONVENIENCE_LIBRARY(mysqlcheck_core check/mysqlcheck_core.cc)
- TARGET_LINK_LIBRARIES(mysqlcheck_core perconaserverclient)
-@@ -80,8 +84,10 @@ TARGET_LINK_LIBRARIES(mysqlimport perconaserverclient)
- MYSQL_ADD_EXECUTABLE(mysqlshow mysqlshow.c)
- TARGET_LINK_LIBRARIES(mysqlshow perconaserverclient)
- 
-+IF(FALSE)
- MYSQL_ADD_EXECUTABLE(mysql_plugin mysql_plugin.c)
- TARGET_LINK_LIBRARIES(mysql_plugin perconaserverclient)
-+ENDIF()
- 
- MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc)
- ADD_COMPILE_FLAGS(
-@@ -124,7 +130,6 @@ IF(WIN32)
- ENDIF(WIN32)
- 
- SET_TARGET_PROPERTIES (
--  mysql_plugin
-   mysqlcheck
-   mysqldump
-   mysqlimport
diff --git a/databases/percona57-client/files/patch-client__mysql.cc b/databases/percona57-client/files/patch-client__mysql.cc
deleted file mode 100644
index cfa890924934..000000000000
--- a/databases/percona57-client/files/patch-client__mysql.cc
+++ /dev/null
@@ -1,40 +0,0 @@
---- client/mysql.cc.orig	2017-04-01 14:33:18 UTC
-+++ client/mysql.cc
-@@ -1903,11 +1903,11 @@ static void usage(int version)
- #endif
- 
- #ifdef HAVE_READLINE
--  printf("%s  Ver %s Distrib %s, for %s (%s) using %s %s\n",
-+  printf("%s  Ver %s Distrib %s Percona, for %s (%s) using %s %s\n",
- 	 my_progname, VER, MYSQL_SERVER_VERSION, SYSTEM_TYPE, MACHINE_TYPE,
-          readline, rl_library_version);
- #else
--  printf("%s  Ver %s Distrib %s, for %s (%s)\n", my_progname, VER,
-+  printf("%s  Ver %s Distrib %s Percona, for %s (%s)\n", my_progname, VER,
- 	MYSQL_SERVER_VERSION, SYSTEM_TYPE, MACHINE_TYPE);
- #endif
- 
-y@@ -2858,15 +2858,18 @@ static void initialize_readline (char *name)
- 
-   /* Tell the completer that we want a crack first. */
- #if defined(USE_NEW_XLINE_INTERFACE)
--  rl_attempted_completion_function= &new_mysql_completion;
--  rl_completion_entry_function= &no_completion;
--
-+  rl_attempted_completion_function= (rl_completion_func_t*)&new_mysql_completion;
-+  rl_completion_entry_function= (rl_compentry_func_t*)&no_completion;
-+/*
-   rl_add_defun("magic-space", &fake_magic_space, -1);
-+*/
- #elif defined(USE_LIBEDIT_INTERFACE)
-   setlocale(LC_ALL,""); /* so as libedit use isprint */
--  rl_attempted_completion_function= &new_mysql_completion;
--  rl_completion_entry_function= &no_completion;
-+  rl_attempted_completion_function= (rl_completion_func_t*)&new_mysql_completion;
-+  rl_completion_entry_function= (rl_compentry_func_t*)&no_completion;
-+/*
-   rl_add_defun("magic-space", &fake_magic_space, -1);
-+*/
- #else
-   rl_attempted_completion_function= (CPPFunction*)&new_mysql_completion;
-   rl_completion_entry_function= &no_completion;
diff --git a/databases/percona57-client/files/patch-cmake_build__configurations_compiler__options.cmake b/databases/percona57-client/files/patch-cmake_build__configurations_compiler__options.cmake
deleted file mode 100644
index 4eca5cfb5df9..000000000000
--- a/databases/percona57-client/files/patch-cmake_build__configurations_compiler__options.cmake
+++ /dev/null
@@ -1,20 +0,0 @@
---- cmake/build_configurations/compiler_options.cmake.orig	2016-08-25 11:52:06 UTC
-+++ cmake/build_configurations/compiler_options.cmake
-@@ -50,7 +50,7 @@ IF(UNIX)  
-   IF(CMAKE_COMPILER_IS_GNUCC)
-     SET(COMMON_C_FLAGS "-fno-omit-frame-pointer -fno-strict-aliasing")
-     IF(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 10.0)  # gcc-9 or older
--      SET(COMMON_C_FLAGS "-fabi-version=2 ${COMMON_C_FLAGS}")
-+      SET(COMMON_C_FLAGS "${COMMON_C_FLAGS}")
-     ENDIF()
-     # Disable inline optimizations for valgrind testing to avoid false positives
-     IF(WITH_VALGRIND)
-@@ -77,7 +77,7 @@ IF(UNIX)  
-   IF(CMAKE_COMPILER_IS_GNUCXX)
-     SET(COMMON_CXX_FLAGS               "-g -fno-omit-frame-pointer -fno-strict-aliasing")
-     IF(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 10.0)  # gcc-9 or older
--      SET(COMMON_CXX_FLAGS             "-fabi-version=2 ${COMMON_CXX_FLAGS}")
-+      SET(COMMON_CXX_FLAGS             "${COMMON_CXX_FLAGS}")
-     ENDIF()
-     # GCC 6 has C++14 as default, set it explicitly to the old default.
-     EXECUTE_PROCESS(COMMAND ${CMAKE_CXX_COMPILER} -dumpversion
diff --git a/databases/percona57-client/files/patch-cmake_os_DragonFly.cmake b/databases/percona57-client/files/patch-cmake_os_DragonFly.cmake
deleted file mode 100644
index 83c154ee3bcf..000000000000
--- a/databases/percona57-client/files/patch-cmake_os_DragonFly.cmake
+++ /dev/null
@@ -1,27 +0,0 @@
---- cmake/os/DragonFly.cmake.orig	2016-04-14 10:16:17 UTC
-+++ cmake/os/DragonFly.cmake
-@@ -0,0 +1,24 @@
-+INCLUDE(CheckCSourceRuns)
-+
-+# We require at least GCC 4.4 or Clang 3.3.
-+IF(NOT FORCE_UNSUPPORTED_COMPILER)
-+  IF(CMAKE_COMPILER_IS_GNUCC)
-+    EXECUTE_PROCESS(COMMAND ${CMAKE_C_COMPILER} -dumpversion
-+                    OUTPUT_VARIABLE GCC_VERSION)
-+    IF(GCC_VERSION VERSION_LESS 4.4)
-+      MESSAGE(FATAL_ERROR "GCC 4.4 or newer is required!")
-+    ENDIF()
-+  ELSEIF(CMAKE_C_COMPILER_ID MATCHES "Clang")
-+    CHECK_C_SOURCE_RUNS("
-+      int main()
-+      {
-+        return (__clang_major__ < 3) ||
-+               (__clang_major__ == 3 && __clang_minor__ < 3);
-+      }" HAVE_SUPPORTED_CLANG_VERSION)
-+    IF(NOT HAVE_SUPPORTED_CLANG_VERSION)
-+      MESSAGE(FATAL_ERROR "Clang 3.3 or newer is required!")
-+    ENDIF()
-+  ELSE()
-+    MESSAGE(FATAL_ERROR "Unsupported compiler!")
-+  ENDIF()
-+ENDIF()
diff --git a/databases/percona57-client/files/patch-cmake_os_FreeBSD.cmake b/databases/percona57-client/files/patch-cmake_os_FreeBSD.cmake
deleted file mode 100644
index 9e9043f341ae..000000000000
--- a/databases/percona57-client/files/patch-cmake_os_FreeBSD.cmake
+++ /dev/null
@@ -1,25 +0,0 @@
---- cmake/os/FreeBSD.cmake.orig	2018-10-04 05:48:22 UTC
-+++ cmake/os/FreeBSD.cmake
-@@ -37,8 +37,20 @@ IF(NOT FORCE_UNSUPPORTED_COMPILER)
-     IF(NOT HAVE_SUPPORTED_CLANG_VERSION)
-       MESSAGE(FATAL_ERROR "Clang 3.3 or newer is required!")
-     ENDIF()
--  ELSE()
--    MESSAGE(FATAL_ERROR "Unsupported compiler!")
-+    CHECK_C_SOURCE_RUNS("
-+      int main()
-+      {
-+        return (__clang_major__ >= 4);
-+      }" I386_ATOMIC_BUILTINS)
-+    IF((CMAKE_SYSTEM_PROCESSOR MATCHES "i386") AND (NOT I386_ATOMIC_BUILTINS))
-+      SET(HAVE_GCC_ATOMIC_BUILTINS CACHE  INTERNAL "")
-+    ENDIF()
-+  ELSEIF(CMAKE_COMPILER_IS_GNUCC)
-+    EXECUTE_PROCESS(COMMAND ${CMAKE_C_COMPILER} -dumpversion
-+                    OUTPUT_VARIABLE GCC_VERSION)
-+    IF(GCC_VERSION VERSION_LESS 4.4)
-+      MESSAGE(FATAL_ERROR "GCC 4.4 or newer is required!")
-+    ENDIF()
-   ENDIF()
- ENDIF()
- 
diff --git a/databases/percona57-client/files/patch-cmake_plugin.cmake b/databases/percona57-client/files/patch-cmake_plugin.cmake
deleted file mode 100644
index a52ef25c7b24..000000000000
--- a/databases/percona57-client/files/patch-cmake_plugin.cmake
+++ /dev/null
@@ -1,25 +0,0 @@
---- cmake/plugin.cmake.orig	2017-06-22 14:13:19 UTC
-+++ cmake/plugin.cmake
-@@ -278,13 +278,17 @@ MACRO(MYSQL_ADD_PLUGIN)
-       MYSQL_INSTALL_TARGETS(${target}
-         DESTINATION ${INSTALL_PLUGINDIR}
-         COMPONENT ${INSTALL_COMPONENT})
--      INSTALL_DEBUG_TARGET(${target}
--        DESTINATION ${INSTALL_PLUGINDIR}/debug
--        COMPONENT ${INSTALL_COMPONENT})
-+        IF(CMAKE_BUILD_TYPE MATCHES "Debug")
-+            INSTALL_DEBUG_TARGET(${target}
-+              DESTINATION ${INSTALL_PLUGINDIR}/debug
-+              COMPONENT ${INSTALL_COMPONENT})
-+            # Add installed files to list for RPMs
-+            FILE(APPEND ${CMAKE_BINARY_DIR}/support-files/plugins.files
-+              "%attr(755, root, root) %{_prefix}/${INSTALL_PLUGINDIR}/debug/${ARG_MODULE_OUTPUT_NAME}.so\n")
-+        ENDIF()
-       # Add installed files to list for RPMs
-       FILE(APPEND ${CMAKE_BINARY_DIR}/support-files/plugins.files
--              "%attr(755, root, root) %{_prefix}/${INSTALL_PLUGINDIR}/${ARG_MODULE_OUTPUT_NAME}.so\n"
--              "%attr(755, root, root) %{_prefix}/${INSTALL_PLUGINDIR}/debug/${ARG_MODULE_OUTPUT_NAME}.so\n")
-+              "%attr(755, root, root) %{_prefix}/${INSTALL_PLUGINDIR}/${ARG_MODULE_OUTPUT_NAME}.so\n")
-       # For internal testing in PB2, append collections files
-       IF(DEFINED ENV{PB2WORKDIR})
-         PLUGIN_APPEND_COLLECTIONS(${plugin})
diff --git a/databases/percona57-client/files/patch-cmake_ssl.cmake b/databases/percona57-client/files/patch-cmake_ssl.cmake
deleted file mode 100644
index 4dfe79fa311b..000000000000
--- a/databases/percona57-client/files/patch-cmake_ssl.cmake
+++ /dev/null
@@ -1,22 +0,0 @@
---- cmake/ssl.cmake.orig	2019-11-09 00:33:40.000000000 +1000
-+++ cmake/ssl.cmake	2019-12-13 23:08:53.686402000 +1000
-@@ -193,7 +193,8 @@ MACRO (MYSQL_CHECK_SSL)
-       )
-     SET(OPENSSL_VERSION ${OPENSSL_VERSION} CACHE INTERNAL "")
- 
--    IF("${OPENSSL_VERSION}" VERSION_GREATER "1.1.0")
-+    CHECK_SYMBOL_EXISTS(TLS1_3_VERSION "openssl/tls1.h" HAVE_TLS1_3_VERSION)
-+    IF(HAVE_TLS1_3_VERSION)
-        ADD_DEFINITIONS(-DHAVE_TLSv13)
-        SET(HAVE_TLSv13 1)
-        IF(SOLARIS)
-@@ -202,8 +203,7 @@ MACRO (MYSQL_CHECK_SSL)
-     ENDIF()
-     IF(OPENSSL_INCLUDE_DIR AND
-        OPENSSL_LIBRARY   AND
--       CRYPTO_LIBRARY      AND
--       OPENSSL_MAJOR_VERSION STREQUAL "1"
-+       CRYPTO_LIBRARY
-       )
-       SET(OPENSSL_FOUND TRUE)
-     ELSE()
diff --git a/databases/percona57-client/files/patch-configure.cmake b/databases/percona57-client/files/patch-configure.cmake
deleted file mode 100644
index 81ab9495aac3..000000000000
--- a/databases/percona57-client/files/patch-configure.cmake
+++ /dev/null
@@ -1,15 +0,0 @@
---- configure.cmake.orig	2018-01-16 23:26:09 UTC
-+++ configure.cmake
-@@ -43,6 +43,12 @@ IF(UNIX)
- ENDIF()
- 
- 
-+IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
-+  SET(CMAKE_SHARED_LIBRARY_C_FLAGS
-+    "${CMAKE_SHARED_LIBRARY_C_FLAGS} ${CMAKE_C_FLAGS} -L%%FREEBSD_LOCAL_LIB%%")
-+ENDIF()
-+
-+
- IF(CMAKE_SYSTEM_NAME MATCHES "SunOS" AND CMAKE_COMPILER_IS_GNUCXX)
-   ## We will be using gcc to generate .so files
-   ## Add C flags (e.g. -m64) to CMAKE_SHARED_LIBRARY_C_FLAGS
diff --git a/databases/percona57-client/files/patch-extra_CMakeLists.txt b/databases/percona57-client/files/patch-extra_CMakeLists.txt
deleted file mode 100644
index 50f6e806e8be..000000000000
--- a/databases/percona57-client/files/patch-extra_CMakeLists.txt
+++ /dev/null
@@ -1,33 +0,0 @@
---- extra/CMakeLists.txt.orig	2016-11-27 19:44:54 UTC
-+++ extra/CMakeLists.txt
-@@ -45,6 +45,7 @@ ENDIF()
- 
- ADD_CUSTOM_COMMAND(OUTPUT ${PROJECT_BINARY_DIR}/include/mysqld_error.h 
-                    ${PROJECT_BINARY_DIR}/sql/share/english/errmsg.sys
-+                   COMMAND mkdir -p ${PROJECT_BINARY_DIR}/sql/share/
-                    COMMAND comp_err
-                     --charset=${PROJECT_SOURCE_DIR}/sql/share/charsets 
-                     --out-dir=${PROJECT_BINARY_DIR}/sql/share/
-@@ -73,6 +74,7 @@ IF (WIN32 AND WITH_SSL_PATH AND HAVE_CRY
- ENDIF()
- 
- 
-+IF(FALSE)
- MYSQL_ADD_EXECUTABLE(my_print_defaults my_print_defaults.c)
- TARGET_LINK_LIBRARIES(my_print_defaults  mysys mysys_ssl)
- SET_TARGET_PROPERTIES(my_print_defaults PROPERTIES LINKER_LANGUAGE CXX)
-@@ -142,11 +144,14 @@ IF(WITH_INNOBASE_STORAGE_ENGINE)
-   TARGET_LINK_LIBRARIES(innochecksum mysys mysys_ssl ${LZ4_LIBRARY})
-   ADD_DEPENDENCIES(innochecksum GenError)
- ENDIF()
-+ENDIF()
- 
-+IF(FALSE)
- IF(UNIX)
-   MYSQL_ADD_EXECUTABLE(resolve_stack_dump resolve_stack_dump.cc)
-   TARGET_LINK_LIBRARIES(resolve_stack_dump mysys mysys_ssl)
- ENDIF()
-+ENDIF()
- 
- # In published release builds on Solaris, we need to bundle gcc source.
- # PB2 will take care of putting it in extra/ when needed
diff --git a/databases/percona57-client/files/patch-include_CMakeLists.txt b/databases/percona57-client/files/patch-include_CMakeLists.txt
deleted file mode 100644
index 488de8104854..000000000000
--- a/databases/percona57-client/files/patch-include_CMakeLists.txt
+++ /dev/null
@@ -1,10 +0,0 @@
---- include/CMakeLists.txt.orig	2016-11-27 19:44:54 UTC
-+++ include/CMakeLists.txt
-@@ -38,6 +38,7 @@ SET(HEADERS_ABI 
- 
- SET(HEADERS 
-   ${HEADERS_ABI} 
-+  hash.h
-   my_dbug.h 
-   m_string.h
-   my_sys.h 
diff --git a/databases/percona57-client/files/patch-include_my__compare.h b/databases/percona57-client/files/patch-include_my__compare.h
deleted file mode 100644
index 608e15dd8751..000000000000
--- a/databases/percona57-client/files/patch-include_my__compare.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- include/my_compare.h.orig	2016-11-27 19:44:54 UTC
-+++ include/my_compare.h
-@@ -40,7 +40,7 @@ extern "C" {
-   But beware the dependency of MI_MAX_POSSIBLE_KEY_BUFF and HA_MAX_KEY_LENGTH.
- */
- 
--#define HA_MAX_KEY_LENGTH           1000        /* Max length in bytes */
-+#define HA_MAX_KEY_LENGTH           4000        /* Max length in bytes */
- #define HA_MAX_KEY_SEG              16          /* Max segments for key */
- 
- #define HA_MAX_POSSIBLE_KEY_BUFF    (HA_MAX_KEY_LENGTH + 24+ 6+6)
diff --git a/databases/percona57-client/files/patch-include_my__openssl.h b/databases/percona57-client/files/patch-include_my__openssl.h
deleted file mode 100644
index 43ddb2935038..000000000000
--- a/databases/percona57-client/files/patch-include_my__openssl.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- include/my_openssl.h.orig	2020-03-23 17:35:17 UTC
-+++ include/my_openssl.h
-@@ -51,7 +51,7 @@ extern "C" {
-  */
- static inline int mysql_OPENSSL_init()
- {
--#if defined(HAVE_STATIC_OPENSSL)
-+#if defined(HAVE_STATIC_OPENSSL) && !defined(LIBRESSL_VERSION_NUMBER)
-   return OPENSSL_init_crypto(OPENSSL_INIT_NO_ATEXIT, NULL);
- #else
-   return SSL_library_init();
diff --git a/databases/percona57-client/files/patch-include_myisam.h b/databases/percona57-client/files/patch-include_myisam.h
deleted file mode 100644
index 96bc58628416..000000000000
--- a/databases/percona57-client/files/patch-include_myisam.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- include/myisam.h.orig	2016-11-27 19:44:54 UTC
-+++ include/myisam.h
-@@ -45,7 +45,7 @@ extern "C" {
-   The following defines can be increased if necessary.
-   But beware the dependency of MI_MAX_POSSIBLE_KEY_BUFF and MI_MAX_KEY_LENGTH.
- */
--#define MI_MAX_KEY_LENGTH           1000            /* Max length in bytes */
-+#define MI_MAX_KEY_LENGTH           4000            /* Max length in bytes */
- #define MI_MAX_KEY_SEG              16              /* Max segments for key */
- 
- #define MI_MAX_KEY_BUFF  (MI_MAX_KEY_LENGTH+MI_MAX_KEY_SEG*6+8+8)
diff --git a/databases/percona57-client/files/patch-man_CMakeLists.txt b/databases/percona57-client/files/patch-man_CMakeLists.txt
deleted file mode 100644
index e02a804949d8..000000000000
--- a/databases/percona57-client/files/patch-man_CMakeLists.txt
+++ /dev/null
@@ -1,13 +0,0 @@
---- man/CMakeLists.txt.orig	2015-11-29 19:16:24 UTC
-+++ man/CMakeLists.txt
-@@ -15,10 +15,6 @@
- 
- # Copy man pages
- FILE(GLOB MAN1_FILES *.1)
--FILE(GLOB MAN1_EXCLUDE make_win_bin_dist.1)
--FILE(GLOB MAN1_NDB ndb*.1)
--FILE(GLOB MAN8_FILES *.8)
--FILE(GLOB MAN8_NDB ndb*.8)
- IF(MAN1_FILES)
-   IF(MAN1_EXCLUDE)
-     LIST(REMOVE_ITEM MAN1_FILES ${MAN1_EXCLUDE})
diff --git a/databases/percona57-client/files/patch-mysys__ssl_my__crypt.cc b/databases/percona57-client/files/patch-mysys__ssl_my__crypt.cc
deleted file mode 100644
index 453c89a71c12..000000000000
--- a/databases/percona57-client/files/patch-mysys__ssl_my__crypt.cc
+++ /dev/null
@@ -1,39 +0,0 @@
---- mysys_ssl/my_crypt.cc.orig	2019-05-16 05:06:00 UTC
-+++ mysys_ssl/my_crypt.cc
-@@ -26,7 +26,7 @@
- #include <boost/move/unique_ptr.hpp>
- #include <boost/core/noncopyable.hpp>
- 
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- #define EVP_CIPHER_CTX_buf_noconst(ctx) ((ctx)->buf)
- #define RAND_OpenSSL() RAND_SSLeay()
- #endif
-@@ -80,7 +80,7 @@ class MyEncryptionCTX : private boost::noncopyable (pr
- 
- MyEncryptionCTX::MyEncryptionCTX()
- {
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-   ctx= new EVP_CIPHER_CTX();
-   EVP_CIPHER_CTX_init(ctx);
- #else
-@@ -91,7 +91,8 @@ MyEncryptionCTX::MyEncryptionCTX()
- MyEncryptionCTX::~MyEncryptionCTX()
- {
-   
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || \
-+    (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x02090000fL)
-   EVP_CIPHER_CTX_cleanup(ctx);
-   delete ctx;
-   ERR_remove_thread_state(0);
-@@ -340,7 +341,7 @@ int my_aes_crypt(const my_aes_mode mode, int flags,
-   res2= my_aes_crypt_finish(ctx, dst + d1, &d2);
-   if (res1 || res2)
-   {
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-     /* in case of failure clear error queue */
-     ERR_remove_thread_state(0);
- #endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */
diff --git a/databases/percona57-client/files/patch-mysys__ssl_my__default.cc b/databases/percona57-client/files/patch-mysys__ssl_my__default.cc
deleted file mode 100644
index 83a127b9602c..000000000000
--- a/databases/percona57-client/files/patch-mysys__ssl_my__default.cc
+++ /dev/null
@@ -1,31 +0,0 @@
---- mysys_ssl/my_default.cc.orig	2016-11-27 19:44:54 UTC
-+++ mysys_ssl/my_default.cc
-@@ -114,7 +114,7 @@ static my_bool defaults_already_read= FA
- 
- /* Which directories are searched for options (and in which order) */
- 
--#define MAX_DEFAULT_DIRS 6
-+#define MAX_DEFAULT_DIRS 7
- #define DEFAULT_DIRS_SIZE (MAX_DEFAULT_DIRS + 1)  /* Terminate with NULL */
- static const char **default_directories = NULL;
- 
-@@ -1416,7 +1416,10 @@ static const char **init_default_directo
- 
- #if defined(DEFAULT_SYSCONFDIR)
-   if (DEFAULT_SYSCONFDIR[0])
-+  {
-     errors += add_directory(alloc, DEFAULT_SYSCONFDIR, dirs);
-+    errors += add_directory(alloc, DEFAULT_SYSCONFDIR "/mysql", dirs);
-+  }
- #endif /* DEFAULT_SYSCONFDIR */
- 
- #endif
-@@ -1488,7 +1491,7 @@ int check_file_permissions(const char *f
-   MY_STAT stat_info;
- 
-   if (!my_stat(file_name,&stat_info,MYF(0)))
--    return 1;
-+    return 0;
-   /*
-     Ignore .mylogin.cnf file if not exclusively readable/writable
-     by current user.
diff --git a/databases/percona57-client/files/patch-mysys_mf__iocache2.c b/databases/percona57-client/files/patch-mysys_mf__iocache2.c
deleted file mode 100644
index e418e454e939..000000000000
--- a/databases/percona57-client/files/patch-mysys_mf__iocache2.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- mysys/mf_iocache2.c.orig	2019-02-18 09:11:31.000000000 +0300
-+++ mysys/mf_iocache2.c
-@@ -24,6 +24,7 @@
- #include <m_string.h>
- #include <stdarg.h>
- #include <m_ctype.h>
-+#include "mysql/psi/mysql_file.h"
- 
- /*
-   Copy contents of an IO_CACHE to a file.
diff --git a/databases/percona57-client/files/patch-scripts_CMakeLists.txt b/databases/percona57-client/files/patch-scripts_CMakeLists.txt
deleted file mode 100644
index a8cb6de9fb23..000000000000
--- a/databases/percona57-client/files/patch-scripts_CMakeLists.txt
+++ /dev/null
@@ -1,72 +0,0 @@
---- scripts/CMakeLists.txt.orig	2017-12-11 07:56:49.000000000 +0000
-+++ scripts/CMakeLists.txt	2017-12-31 14:31:35.649012000 +0000
-@@ -23,6 +23,7 @@
- SET(COMPILER_ID_AND_VERSION
-   "${CMAKE_CXX_COMPILER_ID} ${CMAKE_CXX_COMPILER_VERSION}")
- 
-+IF(FALSE)
- # Build mysql_fix_privilege_tables.sql (concatenate 2 sql scripts)
- IF(NOT WIN32 OR CMAKE_CROSSCOMPILING)
-   FIND_PROGRAM(CAT_EXECUTABLE cat DOC "path to the executable")
-@@ -65,7 +66,9 @@
-   ALL
-   DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/mysql_fix_privilege_tables_sql.c
-   ${CMAKE_CURRENT_BINARY_DIR}/sql_commands_sys_schema.h
-+ENDIF()
- )
-+ENDIF()
- 
- # If we do not have performance schema compiled in then sys will not work,
- # so only create an empty sys database with an auto-generated file,
-@@ -146,6 +149,7 @@
-   )
- ENDIF()
- 
-+IF(FALSE)
- IF(UNIX)
-  FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/make_binary_distribution 
-    "cd ${CMAKE_BINARY_DIR} && '${CMAKE_CPACK_COMMAND}' -G TGZ --config CPackConfig.cmake\n" )
-@@ -153,6 +157,7 @@
-   COMMAND chmod +x ${CMAKE_CURRENT_BINARY_DIR}/make_binary_distribution
- )
- ENDIF()
-+ENDIF()
- 
- IF(NOT WITHOUT_SERVER)
-   INSTALL(FILES
-@@ -332,6 +337,8 @@
-           GET_FILENAME_COMPONENT(lib "${lib}" NAME_WE)
-           STRING(REGEX REPLACE "^lib" "" lib "${lib}")
-           SET(${var} "${${var}}-l${lib} " )
-+        ELSEIF(lib STREQUAL "-pthread")
-+          SET(${var} "${${var}}-pthread " )
-         ELSE()
-           SET(${var} "${${var}}-l${lib} " )
-         ENDIF()
-@@ -417,25 +424,7 @@
-   # On Unix, most of the files end up in the bin directory
-   SET(mysql_config_COMPONENT COMPONENT Development)
- 
--  IF(WITH_SYSTEMD)
--    SET(BIN_SCRIPTS
--      mysql_config
--      mysqldumpslow
--      ps_tokudb_admin
--      ps_mysqld_helper
--      ps-admin
--      )
--  ELSE()
--    SET(BIN_SCRIPTS
--      mysql_config
--      mysqldumpslow
--      mysqld_multi
--      mysqld_safe
--      ps_tokudb_admin
--      ps_mysqld_helper
--      ps-admin
--      )
--  ENDIF()
-+  SET(BIN_SCRIPTS mysql_config)
- 
-   SET(PKGCONFIG_FILE ${LIBMYSQL_OS_OUTPUT_NAME}.pc)
-   STRING(REGEX REPLACE "/mysql$" "" PKGCONFIG_DIR "${INSTALL_LIBDIR}")
diff --git a/databases/percona57-client/files/patch-sql_auth_sha2__password__common.cc b/databases/percona57-client/files/patch-sql_auth_sha2__password__common.cc
deleted file mode 100644
index 1d2486c48d20..000000000000
--- a/databases/percona57-client/files/patch-sql_auth_sha2__password__common.cc
+++ /dev/null
@@ -1,12 +0,0 @@
---- sql/auth/sha2_password_common.cc.orig	2019-05-16 05:06:00 UTC
-+++ sql/auth/sha2_password_common.cc
-@@ -146,7 +146,8 @@ bool SHA256_digest::retrieve_digest(unsigned char *dig
-     DBUG_RETURN(true);
-   }
-   m_ok= EVP_DigestFinal_ex(md_context, m_digest, NULL);
--#if defined(HAVE_WOLFSSL) || OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if defined(HAVE_WOLFSSL) || OPENSSL_VERSION_NUMBER < 0x10100000L || \
-+    (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x02070000fL)
-   EVP_MD_CTX_cleanup(md_context);
- #else  /* OPENSSL_VERSION_NUMBER < 0x10100000L */
-   EVP_MD_CTX_reset(md_context);
diff --git a/databases/percona57-client/files/patch-support-files_CMakeLists.txt b/databases/percona57-client/files/patch-support-files_CMakeLists.txt
deleted file mode 100644
index 9dd13cfbe3b7..000000000000
--- a/databases/percona57-client/files/patch-support-files_CMakeLists.txt
+++ /dev/null
@@ -1,27 +0,0 @@
---- support-files/CMakeLists.txt.orig	2017-12-11 07:56:49.000000000 +0000
-+++ support-files/CMakeLists.txt	2017-12-31 14:35:25.047786000 +0000
-@@ -47,6 +47,7 @@
-     SET (PIDOF "pgrep -d' ' -f")
-   ENDIF()
-   SET(prefix ${CMAKE_INSTALL_PREFIX})
-+  IF(FALSE)
-   FOREACH(script  mysqld_multi.server mysql-log-rotate)
-     CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${script}.sh 
-                    ${CMAKE_CURRENT_BINARY_DIR}/${script} @ONLY )
-@@ -59,9 +60,11 @@
-   IF(INSTALL_SUPPORTFILESDIR)
-     INSTALL(FILES magic DESTINATION ${inst_location} COMPONENT SupportFiles)
-   ENDIF()
-+ENDIF()
- 
-   INSTALL(FILES mysql.m4 DESTINATION ${INSTALL_SHAREDIR}/aclocal COMPONENT Development)
-   
-+IF(FALSE)
-   SET(bindir ${prefix}/${INSTALL_BINDIR})
-   SET(sbindir ${prefix}/${INSTALL_SBINDIR})
-   SET(scriptdir ${prefix}/${INSTALL_SCRIPTDIR})
-@@ -74,3 +77,4 @@
-     PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ 
-     GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
- ENDIF()
-+ENDIF()
diff --git a/databases/percona57-client/files/patch-vio_viosocket.c b/databases/percona57-client/files/patch-vio_viosocket.c
deleted file mode 100644
index c03e19e9e86c..000000000000
--- a/databases/percona57-client/files/patch-vio_viosocket.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- vio/viosocket.c.orig	2016-11-27 19:44:54 UTC
-+++ vio/viosocket.c
-@@ -45,6 +45,10 @@
- static void (*before_io_wait)(void)= 0;
- static void (*after_io_wait)(void)= 0;
- 
-+#ifdef __FreeBSD__
-+#define s6_addr32 __u6_addr.__u6_addr32
-+#endif
-+
- /* Wait callback macros (both performance schema and threadpool */
- #define START_SOCKET_WAIT(locker, state_ptr, sock, which, timeout) \
- do                                                                 \
diff --git a/databases/percona57-client/files/patch-vio_viossl.c b/databases/percona57-client/files/patch-vio_viossl.c
deleted file mode 100644
index 39bcb6b765b5..000000000000
--- a/databases/percona57-client/files/patch-vio_viossl.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- vio/viossl.c.orig	2020-05-13 20:59:55 UTC
-+++ vio/viossl.c
-@@ -396,7 +396,7 @@ static int ssl_do(struct st_VioSSLFd *ptr, Vio *vio,
- #if !defined(DBUG_OFF)
-   {
-     STACK_OF(SSL_COMP) *ssl_comp_methods = NULL;
--    ssl_comp_methods = SSL_COMP_get_compression_methods();
-+    ssl_comp_methods = (STACK_OF(SSL_COMP) *)SSL_COMP_get_compression_methods();
-     n= sk_SSL_COMP_num(ssl_comp_methods);
-     DBUG_PRINT("info", ("Available compression methods:\n"));
-     if (n == 0)
-@@ -405,7 +405,7 @@ static int ssl_do(struct st_VioSSLFd *ptr, Vio *vio,
-       for (j = 0; j < n; j++)
-       {
-         SSL_COMP *c = sk_SSL_COMP_value(ssl_comp_methods, j);
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-         DBUG_PRINT("info", ("  %d: %s\n", c->id, c->name));
- #else /* OPENSSL_VERSION_NUMBER < 0x10100000L */
-         DBUG_PRINT("info", ("  %d: %s\n", SSL_COMP_get_id(c), SSL_COMP_get0_name(c)));
diff --git a/databases/percona57-client/files/patch-vio_viosslfactories.c b/databases/percona57-client/files/patch-vio_viosslfactories.c
deleted file mode 100644
index b37d41d49108..000000000000
--- a/databases/percona57-client/files/patch-vio_viosslfactories.c
+++ /dev/null
@@ -1,45 +0,0 @@
---- vio/viosslfactories.c.orig	2020-05-13 20:59:55 UTC
-+++ vio/viosslfactories.c
-@@ -126,7 +126,7 @@ static DH *get_dh2048(void)
-   {
-     BIGNUM* p= BN_bin2bn(dh2048_p,sizeof(dh2048_p),NULL);
-     BIGNUM* g= BN_bin2bn(dh2048_g,sizeof(dh2048_g),NULL);
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-     dh->p= p;
-     dh->g= g;
-     if (! dh->p || ! dh->g)
-@@ -500,7 +500,7 @@ new_VioSSLFd(const char *key_file, const char *cert_fi
-   struct st_VioSSLFd *ssl_fd;
-   /* MySQL 5.7 supports TLS up to v1.2, explicitly disable TLSv1.3. */
-   long ssl_ctx_options= SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3
--#ifdef HAVE_TLSv13
-+#if defined(HAVE_TLSv13) && !defined(LIBRESSL_VERSION_NUMBER)
-                         | SSL_OP_NO_TLSv1_3
- #endif /* HAVE_TLSv13 */
-                         ;
-@@ -536,7 +536,7 @@ new_VioSSLFd(const char *key_file, const char *cert_fi
-                     SSL_OP_NO_TLSv1 |
-                     SSL_OP_NO_TLSv1_1
-                     | SSL_OP_NO_TLSv1_2
--#ifdef HAVE_TLSv13
-+#if defined(HAVE_TLSv13) && !defined(LIBRESSL_VERSION_NUMBER)
-                     | SSL_OP_NO_TLSv1_3
- #endif /* HAVE_TLSv13 */
-                     | SSL_OP_NO_TICKET
-@@ -557,6 +557,7 @@ new_VioSSLFd(const char *key_file, const char *cert_fi
-     DBUG_RETURN(0);
-   }
- 
-+#ifndef LIBRESSL_VERSION_NUMBER
-   SSL_CTX_set_options(ssl_fd->ssl_context, ssl_ctx_options);
- 
- #ifdef HAVE_TLSv13
-@@ -573,6 +574,7 @@ new_VioSSLFd(const char *key_file, const char *cert_fi
-     DBUG_RETURN(0);
-   }
- #endif /* HAVE_TLSv13 */
-+#endif /* LIBRESSL_VERSION_NUMBER */
- 
-   /*
-     We explicitly prohibit weak ciphers.
diff --git a/databases/percona57-client/pkg-plist b/databases/percona57-client/pkg-plist
deleted file mode 100644
index 74b0a8c21d5b..000000000000
--- a/databases/percona57-client/pkg-plist
+++ /dev/null
@@ -1,144 +0,0 @@
-bin/mysql
-bin/mysqladmin
-bin/mysqlbinlog
-bin/mysqlcheck
-bin/mysql_config
-bin/mysql_config_editor
-bin/mysqldump
-bin/mysqlimport
-bin/mysqlpump
-bin/mysql_secure_installation
-bin/mysqlshow
-bin/mysqlslap
-bin/mysql_ssl_rsa_setup
-include/mysql/big_endian.h
-include/mysql/binary_log_types.h
-include/mysql/byte_order_generic.h
-include/mysql/byte_order_generic_x86.h
-include/mysql/decimal.h
-include/mysql/errmsg.h
-include/mysql/hash.h
-include/mysql/keycache.h
-include/mysql/little_endian.h
-include/mysql/m_ctype.h
-include/mysql/m_string.h
-include/mysql/my_alloc.h
-include/mysql/my_byteorder.h
-include/mysql/my_command.h
-include/mysql/my_compiler.h
-include/mysql/my_config.h
-include/mysql/my_dbug.h
-include/mysql/my_dir.h
-include/mysql/my_getopt.h
-include/mysql/my_global.h
-include/mysql/my_list.h
-include/mysql/mysql/client_authentication.h
-include/mysql/mysql/client_plugin.h
-include/mysql/mysql/client_plugin.h.pp
-include/mysql/mysql/com_data.h
-include/mysql/mysql_com.h
-include/mysql/mysql_com_server.h
-include/mysql/mysqld_ername.h
-include/mysql/mysqld_error.h
-include/mysql/mysql_embed.h
-include/mysql/mysql/get_password.h
-include/mysql/mysql/group_replication_priv.h
-include/mysql/mysql.h
-include/mysql/mysql/innodb_priv.h
-include/mysql/mysql/mysql_lex_string.h
-include/mysql/mysql/plugin_audit.h
-include/mysql/mysql/plugin_audit.h.pp
-include/mysql/mysql/plugin_auth_common.h
-include/mysql/mysql/plugin_auth.h
-include/mysql/mysql/plugin_auth.h.pp
-include/mysql/mysql/plugin_ftparser.h
-include/mysql/mysql/plugin_ftparser.h.pp
-include/mysql/mysql/plugin_group_replication.h
-include/mysql/mysql/plugin.h
-include/mysql/mysql/plugin_keyring.h
-include/mysql/mysql/plugin_keyring.h.pp
-include/mysql/mysql/plugin_trace.h
-include/mysql/mysql/plugin_validate_password.h
-include/mysql/mysql/psi/mysql_file.h
-include/mysql/mysql/psi/mysql_idle.h
-include/mysql/mysql/psi/mysql_mdl.h
-include/mysql/mysql/psi/mysql_memory.h
-include/mysql/mysql/psi/mysql_ps.h
-include/mysql/mysql/psi/mysql_socket.h
-include/mysql/mysql/psi/mysql_sp.h
-include/mysql/mysql/psi/mysql_stage.h
-include/mysql/mysql/psi/mysql_statement.h
-include/mysql/mysql/psi/mysql_table.h
-include/mysql/mysql/psi/mysql_thread.h
-include/mysql/mysql/psi/mysql_transaction.h
-include/mysql/mysql/psi/psi_base.h
-include/mysql/mysql/psi/psi.h
-include/mysql/mysql/psi/psi_memory.h
-include/mysql/mysql/service_command.h
-include/mysql/mysql/service_locking.h
-include/mysql/mysql/service_my_plugin_log.h
-include/mysql/mysql/service_my_snprintf.h
-include/mysql/mysql/service_mysql_alloc.h
-include/mysql/mysql/service_mysql_keyring.h
-include/mysql/mysql/service_mysql_password_policy.h
-include/mysql/mysql/service_mysql_string.h
-include/mysql/mysql/service_parser.h
-include/mysql/mysql/service_rpl_transaction_ctx.h
-include/mysql/mysql/service_rpl_transaction_write_set.h
-include/mysql/mysql/service_rules_table.h
-include/mysql/mysql/service_security_context.h
-include/mysql/mysql/services.h
-include/mysql/mysql/services.h.pp
-include/mysql/mysql/service_srv_session.h
-include/mysql/mysql/service_srv_session_info.h
-include/mysql/mysql/service_ssl_wrapper.h
-include/mysql/mysql/service_thd_alloc.h
-include/mysql/mysql/service_thd_engine_lock.h
-include/mysql/mysql/service_thd_wait.h
-include/mysql/mysql/service_thread_scheduler.h
-include/mysql/mysql/thread_pool_priv.h
-include/mysql/mysql/thread_type.h
-include/mysql/mysql_time.h
-include/mysql/mysql_version.h
-include/mysql/my_sys.h
-include/mysql/my_thread.h
-include/mysql/my_thread_local.h
-include/mysql/my_xml.h
-include/mysql/plugin_audit.h
-include/mysql/plugin_ftparser.h
-include/mysql/plugin_group_replication.h
-include/mysql/plugin.h
-include/mysql/plugin_keyring.h
-include/mysql/plugin_validate_password.h
-include/mysql/sql_common.h
-include/mysql/sql_state.h
-include/mysql/sslopt-case.h
-include/mysql/sslopt-longopts.h
-include/mysql/sslopt-vars.h
-include/mysql/thr_cond.h
-include/mysql/thr_mutex.h
-include/mysql/thr_rwlock.h
-include/mysql/typelib.h
-lib/mysql/libmysqlclient_r.a
-lib/mysql/libmysqlclient_r.so
-lib/mysql/libmysqlclient_r.so.20
-lib/mysql/libmysqlclient.so
-lib/mysql/libmysqlclient.so.20
-lib/mysql/libperconaserverclient.a
-lib/mysql/libperconaserverclient.so
-lib/mysql/libperconaserverclient.so.20
-%%SASLCLIENT%%lib/mysql/plugin/authentication_ldap_sasl_client.so
-libdata/pkgconfig/mysqlclient.pc
-libdata/pkgconfig/perconaserverclient.pc
-man/man1/comp_err.1.gz
-man/man1/mysql.1.gz
-man/man1/mysqladmin.1.gz
-man/man1/mysqlbinlog.1.gz
-man/man1/mysqlcheck.1.gz
-man/man1/mysql_config.1.gz
-man/man1/mysql_config_editor.1.gz
-man/man1/mysqldump.1.gz
-man/man1/mysqlimport.1.gz
-man/man1/mysqlshow.1.gz
-man/man1/mysqlslap.1.gz
-share/aclocal/mysql.m4
diff --git a/databases/percona57-pam-for-mysql/Makefile b/databases/percona57-pam-for-mysql/Makefile
deleted file mode 100644
index a9ca2e666bd6..000000000000
--- a/databases/percona57-pam-for-mysql/Makefile
+++ /dev/null
@@ -1,32 +0,0 @@
-# Created by: Mark Felder <feld@FreeBSD.org>
-
-PORTNAME=	percona57
-PORTREVISION?=	0
-PKGNAMESUFFIX=	-pam-for-mysql
-
-COMMENT=	PAM plugin for MySQL
-
-LICENSE=	GPLv2+
-
-RUN_DEPENDS=# This plugin has no run dependencies. It should work with any desired mysql client/server.
-
-MASTERDIR=	${.CURDIR}/../percona57-server
-
-PKGMESSAGE=	${.CURDIR}/pkg-message
-PATCHDIR=	${MASTERDIR}/files
-FILESDIR=	${.CURDIR}/files
-PLIST=		${.CURDIR}/pkg-plist
-DESCR=		${.CURDIR}/pkg-descr
-
-CONFLICTS_INSTALL=	percona5[0-68-9]-pam-for-mysql* \
-			percona-pam-for-mysql*
-
-CMAKE_ARGS+=	-DWITH_PAM=1
-
-PLUGIN_ONLY=	yes
-
-do-install:
-	(cd ${WRKSRC}/plugin/percona-pam-for-mysql && ${MAKE} ${MAKE_ARGS} install)
-	${INSTALL_DATA} ${FILESDIR}/pam.conf ${STAGEDIR}${PREFIX}/etc/pam.d/mysqld.sample
-
-.include "${MASTERDIR}/Makefile"
diff --git a/databases/percona57-pam-for-mysql/files/pam.conf b/databases/percona57-pam-for-mysql/files/pam.conf
deleted file mode 100644
index 0e75199574ba..000000000000
--- a/databases/percona57-pam-for-mysql/files/pam.conf
+++ /dev/null
@@ -1,12 +0,0 @@
-#
-# PAM configuration for the "mysqld" service
-#
-
-# auth
-auth		include		system
-
-# account
-account		include		system
-
-# password
-password	include		system
diff --git a/databases/percona57-pam-for-mysql/files/patch-cmake_build__configurations_compiler__options.cmake b/databases/percona57-pam-for-mysql/files/patch-cmake_build__configurations_compiler__options.cmake
deleted file mode 100644
index 4eca5cfb5df9..000000000000
--- a/databases/percona57-pam-for-mysql/files/patch-cmake_build__configurations_compiler__options.cmake
+++ /dev/null
@@ -1,20 +0,0 @@
---- cmake/build_configurations/compiler_options.cmake.orig	2016-08-25 11:52:06 UTC
-+++ cmake/build_configurations/compiler_options.cmake
-@@ -50,7 +50,7 @@ IF(UNIX)  
-   IF(CMAKE_COMPILER_IS_GNUCC)
-     SET(COMMON_C_FLAGS "-fno-omit-frame-pointer -fno-strict-aliasing")
-     IF(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 10.0)  # gcc-9 or older
--      SET(COMMON_C_FLAGS "-fabi-version=2 ${COMMON_C_FLAGS}")
-+      SET(COMMON_C_FLAGS "${COMMON_C_FLAGS}")
-     ENDIF()
-     # Disable inline optimizations for valgrind testing to avoid false positives
-     IF(WITH_VALGRIND)
-@@ -77,7 +77,7 @@ IF(UNIX)  
-   IF(CMAKE_COMPILER_IS_GNUCXX)
-     SET(COMMON_CXX_FLAGS               "-g -fno-omit-frame-pointer -fno-strict-aliasing")
-     IF(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 10.0)  # gcc-9 or older
--      SET(COMMON_CXX_FLAGS             "-fabi-version=2 ${COMMON_CXX_FLAGS}")
-+      SET(COMMON_CXX_FLAGS             "${COMMON_CXX_FLAGS}")
-     ENDIF()
-     # GCC 6 has C++14 as default, set it explicitly to the old default.
-     EXECUTE_PROCESS(COMMAND ${CMAKE_CXX_COMPILER} -dumpversion
diff --git a/databases/percona57-pam-for-mysql/files/patch-cmake_os_DragonFly.cmake b/databases/percona57-pam-for-mysql/files/patch-cmake_os_DragonFly.cmake
deleted file mode 100644
index 83c154ee3bcf..000000000000
--- a/databases/percona57-pam-for-mysql/files/patch-cmake_os_DragonFly.cmake
+++ /dev/null
@@ -1,27 +0,0 @@
---- cmake/os/DragonFly.cmake.orig	2016-04-14 10:16:17 UTC
-+++ cmake/os/DragonFly.cmake
-@@ -0,0 +1,24 @@
-+INCLUDE(CheckCSourceRuns)
-+
-+# We require at least GCC 4.4 or Clang 3.3.
-+IF(NOT FORCE_UNSUPPORTED_COMPILER)
-+  IF(CMAKE_COMPILER_IS_GNUCC)
-+    EXECUTE_PROCESS(COMMAND ${CMAKE_C_COMPILER} -dumpversion
-+                    OUTPUT_VARIABLE GCC_VERSION)
-+    IF(GCC_VERSION VERSION_LESS 4.4)
-+      MESSAGE(FATAL_ERROR "GCC 4.4 or newer is required!")
-+    ENDIF()
-+  ELSEIF(CMAKE_C_COMPILER_ID MATCHES "Clang")
-+    CHECK_C_SOURCE_RUNS("
-+      int main()
-+      {
-+        return (__clang_major__ < 3) ||
-+               (__clang_major__ == 3 && __clang_minor__ < 3);
-+      }" HAVE_SUPPORTED_CLANG_VERSION)
-+    IF(NOT HAVE_SUPPORTED_CLANG_VERSION)
-+      MESSAGE(FATAL_ERROR "Clang 3.3 or newer is required!")
-+    ENDIF()
-+  ELSE()
-+    MESSAGE(FATAL_ERROR "Unsupported compiler!")
-+  ENDIF()
-+ENDIF()
diff --git a/databases/percona57-pam-for-mysql/files/patch-cmake_os_FreeBSD.cmake b/databases/percona57-pam-for-mysql/files/patch-cmake_os_FreeBSD.cmake
deleted file mode 100644
index 9e9043f341ae..000000000000
--- a/databases/percona57-pam-for-mysql/files/patch-cmake_os_FreeBSD.cmake
+++ /dev/null
@@ -1,25 +0,0 @@
---- cmake/os/FreeBSD.cmake.orig	2018-10-04 05:48:22 UTC
-+++ cmake/os/FreeBSD.cmake
-@@ -37,8 +37,20 @@ IF(NOT FORCE_UNSUPPORTED_COMPILER)
-     IF(NOT HAVE_SUPPORTED_CLANG_VERSION)
-       MESSAGE(FATAL_ERROR "Clang 3.3 or newer is required!")
-     ENDIF()
--  ELSE()
--    MESSAGE(FATAL_ERROR "Unsupported compiler!")
-+    CHECK_C_SOURCE_RUNS("
-+      int main()
-+      {
-+        return (__clang_major__ >= 4);
-+      }" I386_ATOMIC_BUILTINS)
-+    IF((CMAKE_SYSTEM_PROCESSOR MATCHES "i386") AND (NOT I386_ATOMIC_BUILTINS))
-+      SET(HAVE_GCC_ATOMIC_BUILTINS CACHE  INTERNAL "")
-+    ENDIF()
-+  ELSEIF(CMAKE_COMPILER_IS_GNUCC)
-+    EXECUTE_PROCESS(COMMAND ${CMAKE_C_COMPILER} -dumpversion
-+                    OUTPUT_VARIABLE GCC_VERSION)
-+    IF(GCC_VERSION VERSION_LESS 4.4)
-+      MESSAGE(FATAL_ERROR "GCC 4.4 or newer is required!")
-+    ENDIF()
-   ENDIF()
- ENDIF()
- 
diff --git a/databases/percona57-pam-for-mysql/pkg-descr b/databases/percona57-pam-for-mysql/pkg-descr
deleted file mode 100644
index b6160274578a..000000000000
--- a/databases/percona57-pam-for-mysql/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-Percona PAM authentication plugin for MySQL.
-
-WWW: https://www.percona.com/
diff --git a/databases/percona57-pam-for-mysql/pkg-message b/databases/percona57-pam-for-mysql/pkg-message
deleted file mode 100644
index 4bade43b0850..000000000000
--- a/databases/percona57-pam-for-mysql/pkg-message
+++ /dev/null
@@ -1,16 +0,0 @@
-[
-{ type: install
-  message: <<EOM
-Documentation for using percona-pam-for-mysql authentication plugin can
-be found at:
-
-https://www.percona.com/doc/percona-pam-for-mysql/index.html
-
-Please note that you need this plugin installed on both the client and
-server for authentication to be successful.
-
-This version of the plugin is compatible with the new auth plugin API
-introduced in MySQL 5.7.
-EOM
-}
-]
diff --git a/databases/percona57-pam-for-mysql/pkg-plist b/databases/percona57-pam-for-mysql/pkg-plist
deleted file mode 100644
index 45350d3e7caf..000000000000
--- a/databases/percona57-pam-for-mysql/pkg-plist
+++ /dev/null
@@ -1,4 +0,0 @@
-@sample etc/pam.d/mysqld.sample
-lib/mysql/plugin/auth_pam.so
-lib/mysql/plugin/auth_pam_compat.so
-lib/mysql/plugin/dialog.so
diff --git a/databases/percona57-server/Makefile b/databases/percona57-server/Makefile
deleted file mode 100644
index 2c4ee43ab3f5..000000000000
--- a/databases/percona57-server/Makefile
+++ /dev/null
@@ -1,187 +0,0 @@
-# Created by: Mark Felder <feld@FreeBSD.org>
-
-PORTNAME?=	percona
-DISTVERSION=	5.7.34-37
-PORTREVISION?=	0
-CATEGORIES=	databases
-MASTER_SITES=	http://www.percona.com/downloads/Percona-Server-5.7/Percona-Server-${DISTVERSION}/source/tarball/:percona \
-		SF/boost/boost/1.59.0:boost
-PKGNAMESUFFIX?=	57-server
-DISTNAME=	percona-server-${DISTVERSION}
-DISTFILES=	percona-server-${DISTVERSION}${EXTRACT_SUFX}:percona \
-		boost_1_59_0${EXTRACT_SUFX}:boost
-
-MAINTAINER=	fluffy@FreeBSD.org
-COMMENT?=	Multithreaded SQL database (server)
-
-LICENSE?=	GPLv2+
-LICENSE_FILE=	${WRKSRC}/LICENSE
-
-CPE_VENDOR=	percona
-CPE_PRODUCT=	percona_server
-
-LIB_DEPENDS=	libevent.so:devel/libevent \
-		liblz4.so:archivers/liblz4 \
-		libzstd.so:archivers/zstd
-
-SLAVEDIRS=	databases/percona57-client \
-		databases/percona57-pam-for-mysql
-USES=		bison:build cmake:insource,noninja compiler:c11 \
-		cpe libedit localbase perl5 shebangfix ssl
-
-MY_DBDIR=	/var/db/mysql
-MY_SECDIR=	/var/db/mysql_secure
-MY_TMPDIR=	/var/db/mysql_tmpdir
-
-DATADIR=	${LOCALBASE}/share/mysql
-DOCSDIR=	${LOCALBASE}/share/doc/mysql
-
-CMAKE_ARGS+=	-DINSTALL_LAYOUT=FREEBSD \
-		-DINSTALL_DOCDIR="share/doc/mysql" \
-		-DINSTALL_LDCONFIGDIR="${LOCALBASE}/libdata/ldconfig" \
-		-DINSTALL_PKGCONFIGDIR="${LOCALBASE}/libdata/pkgconfig" \
-		-DINSTALL_DOCREADMEDIR="share/doc/mysql" \
-		-DINSTALL_INCLUDEDIR="include/mysql" \
-		-DINSTALL_INFODIR="${INFO_PATH}" \
-		-DINSTALL_LIBDIR="lib/mysql" \
-		-DINSTALL_MANDIR="man" \
-		-DINSTALL_MYSQLDATADIR="/var/db/mysql" \
-		-DINSTALL_SECURE_FILE_PRIVDIR="${MY_SECDIR}" \
-		-DINSTALL_MYSQLSHAREDIR="share/mysql" \
-		-DINSTALL_MYSQLTESTDIR=0 \
-		-DINSTALL_PLUGINDIR="lib/mysql/plugin" \
-		-DINSTALL_SBINDIR="libexec" \
-		-DINSTALL_SCRIPTDIR="bin" \
-		-DINSTALL_SHAREDIR="share" \
-		-DINSTALL_SQLBENCHDIR="share/mysql" \
-		-DINSTALL_SUPPORTFILESDIR="share/mysql" \
-		-DWITH_UNIT_TESTS=0 \
-		-DWITH_EDITLINE=system \
-		-DWITH_LIBEVENT=system \
-		-DWITH_LIBWRAP=0 \
-		-DWITH_LZ4=system \
-		-DWITH_ZLIB=system \
-		-DWITH_ZSTD=system \
-		-DWITH_ROCKSDB=0 \
-		-DWITH_BOOST="${WRKDIR}/boost_1_59_0"
-
-SHEBANG_FILES=	scripts/*.pl* scripts/*.sh
-
-.ifdef USE_MYSQL
-.error You have `USE_MYSQL' variable defined either in environment or in make(1) arguments. Please undefine and try again.
-.endif
-
-SUB_LIST=	MY_DBDIR=${MY_DBDIR} \
-		MY_SECDIR=${MY_SECDIR} \
-		MY_TMPDIR=${MY_TMPDIR}
-
-PLIST_SUB=	MY_DBDIR=${MY_DBDIR} \
-		MY_SECDIR=${MY_SECDIR} \
-		MY_TMPDIR=${MY_TMPDIR}
-
-.ifdef CLIENT_ONLY
-# Client part
-USES+=		libedit
-.elifdef PLUGIN_ONLY
-# For building plugins (percona-pam-for-mysql, etc)
-# Currently do nothing special
-USES+=		libedit
-.else
-LIB_DEPENDS+=	libcurl.so:ftp/curl
-
-# MySQL-Server part
-OPTIONS_DEFINE=	OPENSSL FASTMTX INNODBMEMCACHED TOKUDB
-OPTIONS_DEFAULT=	OPENSSL INNODBMEMCACHED
-OPTIONS_SUB=	yes
-
-FASTMTX_DESC=	Replace mutexes with spinlocks
-FASTMTX_CMAKE_ON=	-DWITH_FAST_MUTEXES=1
-INNODBMEMCACHED_DESC=	InnoDB Memcached plugin
-INNODBMEMCACHED_CMAKE_ON=	-DWITH_INNODB_MEMCACHED=1
-OPENSSL_CMAKE_ON=	-DWITH_SSL="${MY_SSL}"
-OPENSSL_USES=	ssl
-TOKUDB_DESC=	TokuDB Engine (experimental)
-TOKUDB_CMAKE_ON=	-DUSE_CTAGS=0
-TOKUDB_EXTRA_PATCHES=${PATCHDIR}/extrapatch-tokudb
-
-USES+=mysql:57p
-
-CONFLICTS_INSTALL=	mysql*-server-* \
-			mysqlwsrep* \
-			mariadb*-server-* \
-			percona5[0-68-9]-server-*
-
-USE_RC_SUBR=	mysql-server
-
-USERS=		mysql
-GROUPS=		mysql
-
-INFO=		mysql
-
-USE_LDCONFIG+=	${PREFIX}/lib/mysql/plugin
-
-MANPAGES=	my_print_defaults.1 myisam_ftdump.1 myisamchk.1 myisamlog.1 myisampack.1 \
-		mysql.server.1 mysql_convert_table_format.1 mysql_fix_extensions.1 \
-		mysql_install_db.1 mysql_plugin.1 mysql_secure_installation.1 mysql_setpermission.1 \
-		mysql_tzinfo_to_sql.1 mysql_upgrade.1 mysql_zap.1 mysqlbug.1 \
-		mysqld_multi.1 mysqld_safe.1 mysqldumpslow.1 mysqlhotcopy.1 mysqlman.1 \
-		mysqltest.1 perror.1 replace.1 resolve_stack_dump.1 resolveip.1
-
-CMAKE_ARGS+=	-DWITH_EMBEDDED_SERVER="ON"
-# issue 220865: Currently there's no source to be built with server-side support.
-# But this keeps the pkg-plist not overlaping
-CMAKE_ARGS+=	-DWITH_AUTHENTICATION_LDAP=0
-
-.include <bsd.port.options.mk>
-
-#.if !${SSL_DEFAULT:Mlibressl*}
-#MY_TESTDIR=	"share/mysql/tests"
-#.else
-#MY_TESTDIR=	""
-#.endif
-
-.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1200057
-SUB_LIST+=	LEGACY_LIMITS="@comment " MODERN_LIMITS=""
-.else
-SUB_LIST+=	LEGACY_LIMITS="" MODERN_LIMITS="@comment "
-.endif
-
-post-install:
-	${MKDIR} ${STAGEDIR}/var/db/mysql
-	${MKDIR} ${STAGEDIR}${ETCDIR}/keyring
-	${MKDIR} ${STAGEDIR}${MY_SECDIR}
-	${MKDIR} ${STAGEDIR}${MY_TMPDIR}
-.endif
-
-post-patch:
-	@${REINPLACE_CMD} 's/*.1/${MANPAGES}/' ${WRKSRC}/man/CMakeLists.txt
-	# issue 220865: MySQL developers forgot that FreeBSD != Linux
-	@${REINPLACE_CMD} -e 's|%%FREEBSD_LOCAL_LIB%%|${LOCALBASE}/lib|g' \
-	${WRKSRC}/configure.cmake
-
-.include <bsd.port.pre.mk>
-
-# Workaround to clang11/gcc10 with -fno-common by default
-CFLAGS+=	-fcommon
-
-.if ${CHOSEN_COMPILER_TYPE} == gcc
-CXXFLAGS+=	-fpermissive
-.endif
-
-.if ${ARCH} == "arm"
-BROKEN=		Does not compile on arm
-.endif
-
-.if ${SSL_DEFAULT} == base
-MY_SSL=		system
-.else
-MY_SSL=		${OPENSSLBASE}
-.endif
-
-.if ${PORT_OPTIONS:MTOKUDB}
-NOT_FOR_ARCHS=	i386
-NOT_FOR_ARCHS_REASON=	TokuDB not supported on 32-bit platforms, see \
-			https://github.com/percona/PerconaFT/blob/master/README.md
-.endif
-
-.include <bsd.port.post.mk>
diff --git a/databases/percona57-server/distinfo b/databases/percona57-server/distinfo
deleted file mode 100644
index 74d6b98d2593..000000000000
--- a/databases/percona57-server/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-TIMESTAMP = 1627600387
-SHA256 (percona-server-5.7.34-37.tar.gz) = 3fae914ffcdcae5f567c83427b6d7799296e46b9deb891dd8e268d307052ae48
-SIZE (percona-server-5.7.34-37.tar.gz) = 88187760
-SHA256 (boost_1_59_0.tar.gz) = 47f11c8844e579d02691a607fbd32540104a9ac7a2534a8ddaef50daf502baac
-SIZE (boost_1_59_0.tar.gz) = 83709983
diff --git a/databases/percona57-server/files/extra-patch-config.h.cmake b/databases/percona57-server/files/extra-patch-config.h.cmake
deleted file mode 100644
index 4ea465832fb4..000000000000
--- a/databases/percona57-server/files/extra-patch-config.h.cmake
+++ /dev/null
@@ -1,29 +0,0 @@
---- Makefile
-+++ Makefile
-@@ -95,8 +95,8 @@ post-patch:
- 
- .include <bsd.port.pre.mk>
- 
--.if ${ARCH} == "arm"
--BROKEN=		Does not compile on arm
-+.if ${ARCH} == "armv6"   
-+EXTRA_PATCHES+=	${FILESDIR}/extra-patch-config.h.cmake
- .endif
- 
- .include <bsd.port.post.mk>
-
---- /dev/null
-+++ files/extra-patch-config.h.cmake
-@@ -0,0 +1,12 @@
-+--- config.h.cmake.orig	2014-12-05 16:24:02 UTC
-++++ config.h.cmake
-+@@ -151,7 +151,8 @@
-+ #cmakedefine HAVE_FESETROUND 1
-+ #cmakedefine HAVE_FINITE 1
-+ #cmakedefine HAVE_FP_EXCEPT 1
-+-#cmakedefine HAVE_FPSETMASK 1
-++#cmakedefine HAVE_FPSETMASK 0
-++#cmakedefine HAVE_FEDISABLEEXCEPT 1
-+ #cmakedefine HAVE_FSEEKO 1
-+ #cmakedefine HAVE_FSYNC 1
-+ #cmakedefine HAVE_FTIME 1
diff --git a/databases/percona57-server/files/extrapatch-tokudb b/databases/percona57-server/files/extrapatch-tokudb
deleted file mode 100644
index bddd008e4ea5..000000000000
--- a/databases/percona57-server/files/extrapatch-tokudb
+++ /dev/null
@@ -1,95 +0,0 @@
---- storage/tokudb/CMakeLists.txt.orig	2016-03-03 15:32:33.000000000 +0200
-+++ storage/tokudb/CMakeLists.txt	2016-03-08 10:13:58.000000000 +0200
-@@ -40,8 +40,8 @@
- ENDIF ()
- 
- # check platform support, no 32 bit
--IF (NOT CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
--  MESSAGE (${TOKUDB_STATUS_MODE} "x86_64 is only platform supported. ${CMAKE_SYSTEM_PROCESSOR} found. Not building TokuDB")
-+IF (NOT CMAKE_SYSTEM_PROCESSOR STREQUAL "amd64")
-+  MESSAGE (${TOKUDB_STATUS_MODE} "amd64 is only platform supported. ${CMAKE_SYSTEM_PROCESSOR} found. Not building TokuDB")
-   RETURN ()
- ENDIF ()
- 
-@@ -118,5 +118,5 @@
-     tokudb_thread.cc)
- MYSQL_ADD_PLUGIN(tokudb ${TOKUDB_SOURCES} STORAGE_ENGINE MODULE_ONLY
-     LINK_LIBRARIES tokufractaltree_static tokuportability_static ${ZLIB_LIBRARY} stdc++)
--SET(CMAKE_MODULE_LINKER_FLAGS_RELEASE "${CMAKE_MODULE_LINKER_FLAGS_RELEASE} -flto -fuse-linker-plugin")
--SET(CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO "${CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO} -flto -fuse-linker-plugin")
-+SET(CMAKE_MODULE_LINKER_FLAGS_RELEASE "${CMAKE_MODULE_LINKER_FLAGS_RELEASE} ")
-+SET(CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO "${CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO} ")
---- plugin/tokudb-backup-plugin/Percona-TokuBackup/backup/CMakeLists.txt.orig	2016-03-03 15:31:53.000000000 +0200
-+++ plugin/tokudb-backup-plugin/Percona-TokuBackup/backup/CMakeLists.txt	2016-03-10 11:13:23.772664272 +0200
-@@ -69,7 +69,7 @@
-   endif ()
- endfunction(add_space_separated_property)
- 
--set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O3 -flto -UNDEBUG")
-+set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O3 -UNDEBUG")
- if (NOT CMAKE_CXX_COMPILER_ID MATCHES Clang)
-   set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -s")
- endif ()
---- plugin/tokudb-backup-plugin/Percona-TokuBackup/backup/backup.cc.orig	2016-03-03 15:31:53.000000000 +0200
-+++ plugin/tokudb-backup-plugin/Percona-TokuBackup/backup/backup.cc	2016-03-08 10:40:07.000000000 +0200
-@@ -85,7 +85,7 @@
-     if (oflag & O_CREAT) {
-         va_list ap;
-         va_start(ap, oflag);
--        mode_t mode = va_arg(ap, mode_t);
-+        mode_t mode = va_arg(ap, int);
-         va_end(ap);
-         the_manager.lock_file_op();
-         fd = call_real_open(file, oflag, mode);
---- plugin/tokudb-backup-plugin/Percona-TokuBackup/backup/file_hash_table.cc.orig	2016-03-03 15:31:53.000000000 +0200
-+++ plugin/tokudb-backup-plugin/Percona-TokuBackup/backup/file_hash_table.cc	2016-03-08 10:37:19.000000000 +0200
-@@ -36,7 +36,7 @@
- 
- #include <string.h>
- #include <pthread.h>
--#include <malloc.h>
-+#include <stdlib.h>
- #include <stdio.h>
- 
- #include "source_file.h"
---- plugin/tokudb-backup-plugin/Percona-TokuBackup/backup/real_syscalls.cc.orig	2016-03-03 15:31:53.000000000 +0200
-+++ plugin/tokudb-backup-plugin/Percona-TokuBackup/backup/real_syscalls.cc	2016-03-08 10:38:58.000000000 +0200
-@@ -104,7 +104,7 @@
-     if (oflag & O_CREAT) {
-         va_list op;
-         va_start(op, oflag);
--        mode_t mode = va_arg(op, mode_t);
-+        mode_t mode = va_arg(op, int);
-         va_end(op);
-         return real_open(file, oflag, mode);
-     } else {
---- storage/tokudb/PerconaFT/CMakeLists.txt.orig	2016-06-30 13:35:08.000000000 +0200
-+++ storage/tokudb/PerconaFT/CMakeLists.txt	2016-07-29 23:07:37.871068000 +0200
-@@ -82,7 +82,7 @@
- 
- install(
-   FILES README.md COPYING.AGPLv3 COPYING.GPLv2 PATENTS
--  DESTINATION .
-+  DESTINATION ${INSTALL_DOCDIR}
-   COMPONENT tokukv_misc
-   )
- 
---- storage/tokudb/PerconaFT/buildheader/CMakeLists.txt.orig	2016-07-29 23:30:26.557847000 +0200
-+++ storage/tokudb/PerconaFT/buildheader/CMakeLists.txt	2016-07-29 23:30:32.695950000 +0200
-@@ -1,6 +1,6 @@
- set_directory_properties(PROPERTIES INCLUDE_DIRECTORIES "")
- 
--file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/runcat.sh" "#!/bin/bash
-+file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/runcat.sh" "#!/bin/sh
- out=$1; shift
- exec \"$@\" >$out")
- 
-@@ -8,7 +8,7 @@
- set_property(TARGET make_tdb APPEND PROPERTY COMPILE_DEFINITIONS _GNU_SOURCE)
- add_custom_command(
-   OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/db.h"
--  COMMAND bash runcat.sh "${CMAKE_CURRENT_BINARY_DIR}/db.h" $<TARGET_FILE:make_tdb>
-+  COMMAND sh runcat.sh "${CMAKE_CURRENT_BINARY_DIR}/db.h" $<TARGET_FILE:make_tdb>
-   DEPENDS make_tdb)
- add_custom_target(install_tdb_h DEPENDS
-   "${CMAKE_CURRENT_BINARY_DIR}/db.h")
diff --git a/databases/percona57-server/files/mysql-server.in b/databases/percona57-server/files/mysql-server.in
deleted file mode 100644
index 41280227b18b..000000000000
--- a/databases/percona57-server/files/mysql-server.in
+++ /dev/null
@@ -1,94 +0,0 @@
-#!/bin/sh
-
-# PROVIDE: mysql
-# REQUIRE: LOGIN
-# KEYWORD: shutdown
-
-#
-# Add the following line to /etc/rc.conf to enable mysql:
-# mysql_enable (bool):	Set to "NO" by default.
-#			Set it to "YES" to enable MySQL.
-%%LEGACY_LIMITS%%# mysql_limits (bool):	Set to "NO" by default.
-%%LEGACY_LIMITS%%#			Set it to yes to run `limits -e -U mysql`
-%%LEGACY_LIMITS%%#			just before mysql starts.
-# mysql_dbdir (str):	Default to "%%MY_DBDIR%%"
-#			Base database directory.
-# mysql_confdir (str):	Default to "%%ETCDIR%%"
-#			Base configuration directory.
-# mysql_optfile (str):	Server-specific option file.
-#			Default to "${mysql_confdir}/my.cnf".
-# mysql_pidfile (str):	Custum PID file path and name.
-#			Default to "${mysql_dbdir}/${hostname}.pid".
-# mysql_args (str):	Custom additional arguments to be passed
-#			to mysqld_safe (default empty).
-#
-
-. /etc/rc.subr
-
-name="mysql"
-rcvar=mysql_enable
-
-load_rc_config $name
-
-: ${mysql_enable="NO"}
-%%LEGACY_LIMITS%%: ${mysql_limits="NO"}
-: ${mysql_dbdir="%%MY_DBDIR%%"}
-: ${mysql_confdir="%%ETCDIR%%"}
-if [ -f "${mysql_dbdir}/my.cnf" ]; then
-: ${mysql_optfile="${mysql_dbdir}/my.cnf"}
-else
-: ${mysql_optfile="${mysql_confdir}/my.cnf"}
-fi
-
-mysql_user="mysql"
-%%LEGACY_LIMITS%%mysql_limits_args="-e -U ${mysql_user}"
-: ${hostname:=`/bin/hostname`}
-pidfile=${mysql_pidfile:-"${mysql_dbdir}/${hostname}.pid"}
-command="/usr/sbin/daemon"
-command_args="-c -f %%PREFIX%%/bin/mysqld_safe --defaults-extra-file=${mysql_optfile} --basedir=%%PREFIX%% --datadir=${mysql_dbdir} --pid-file=${pidfile} --user=${mysql_user} ${mysql_args}"
-procname="%%PREFIX%%/libexec/mysqld"
-start_precmd="${name}_prestart"
-start_postcmd="${name}_poststart"
-mysql_install_db="%%PREFIX%%/bin/mysql_install_db"
-mysql_install_db_args="--defaults-extra-file=${mysql_optfile} --basedir=%%PREFIX%% --datadir=${mysql_dbdir} --mysqld-file=${procname} --user=${mysql_user}"
-
-mysql_create_auth_tables()
-{
-	eval $mysql_install_db $mysql_install_db_args >/dev/null 2>/dev/null
-}
-
-mysql_prestart()
-{
-	if [ -f "${mysql_dbdir}/my.cnf" ]; then
-		echo ""
-		echo "Please keep in mind that the default location for my.cnf has changed"
-		echo "from \"%%MY_DBDIR%%/my.cnf\" to \"%%ETCDIR%%/my.cnf\". "
-		echo "Please merge your existing my.cnf with the new default and move"
-		echo "it to \"%%ETCDIR%%/my.cnf\"."
-		echo "If you do not want to move your my.cnf to the new location then"
-		echo "you must set \"mysql_optfile\" in /etc/rc.conf to \"/var/db/mysql/my.cnf\"."
-		echo ""
-	fi
-
-	if [ ! -d "${mysql_dbdir}/mysql" ]; then
-		mysql_create_auth_tables || return 1
-	fi
-%%LEGACY_LIMITS%%	if checkyesno mysql_limits; then
-%%LEGACY_LIMITS%%		eval `/usr/bin/limits ${mysql_limits_args}` 2>/dev/null
-%%LEGACY_LIMITS%%	else
-%%LEGACY_LIMITS%%		return 0
-%%LEGACY_LIMITS%%	fi
-%%MODERN_LIMITS%%	return 0
-}
-
-mysql_poststart()
-{
-	local timeout=15
-	while [ ! -f "${pidfile}" -a ${timeout} -gt 0 ]; do
-		timeout=$(( timeout - 1 ))
-		sleep 1
-	done
-	return 0
-}
-
-run_rc_command "$1"
diff --git a/databases/percona57-server/files/patch-CMakeLists.txt b/databases/percona57-server/files/patch-CMakeLists.txt
deleted file mode 100644
index 47c8a57168cb..000000000000
--- a/databases/percona57-server/files/patch-CMakeLists.txt
+++ /dev/null
@@ -1,40 +0,0 @@
---- CMakeLists.txt.orig	2016-11-27 19:44:54 UTC
-+++ CMakeLists.txt
-@@ -621,12 +621,10 @@ IF(UNIX)
- ENDIF()
- 
- IF(NOT WITHOUT_SERVER)
--  ADD_SUBDIRECTORY(testclients)
-   ADD_SUBDIRECTORY(sql)
-   OPTION (WITH_EMBEDDED_SERVER "Compile MySQL with embedded server" OFF)
-   IF(WITH_EMBEDDED_SERVER) 
-    ADD_SUBDIRECTORY(libmysqld)
--   ADD_SUBDIRECTORY(libmysqld/examples)
-   ENDIF(WITH_EMBEDDED_SERVER)
- ENDIF()
- 
-@@ -635,8 +633,6 @@ ENDIF()
- ADD_SUBDIRECTORY(scripts)
- 
- IF(NOT WITHOUT_SERVER)
--  ADD_SUBDIRECTORY(mysql-test)
--  ADD_SUBDIRECTORY(mysql-test/lib/My/SafeProcess)
-   ADD_SUBDIRECTORY(support-files)
-   IF(EXISTS ${CMAKE_SOURCE_DIR}/internal/CMakeLists.txt)
-     ADD_SUBDIRECTORY(internal)
-@@ -692,6 +688,7 @@ ENDIF()
- #
- # RPM installs documentation directly from the source tree
- #
-+IF(FALSE)
- IF(NOT INSTALL_LAYOUT MATCHES "RPM")
-   INSTALL(FILES
-     README
-@@ -714,6 +711,7 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM")
-     PATTERN "sp-imp-spec.txt" EXCLUDE
-   )
- ENDIF()
-+ENDIF()
- 
- INCLUDE(CPack)
- 
diff --git a/databases/percona57-server/files/patch-client_CMakeLists.txt b/databases/percona57-server/files/patch-client_CMakeLists.txt
deleted file mode 100644
index e89ab375d99c..000000000000
--- a/databases/percona57-server/files/patch-client_CMakeLists.txt
+++ /dev/null
@@ -1,83 +0,0 @@
---- client/CMakeLists.txt.orig	2016-11-27 19:44:54 UTC
-+++ client/CMakeLists.txt
-@@ -32,8 +32,6 @@ INCLUDE(${MYSQL_CMAKE_SCRIPT_DIR}/compil
- 
- ## Subdirectory with common client code.
- ADD_SUBDIRECTORY(base)
--## Subdirectory for mysqlpump code.
--ADD_SUBDIRECTORY(dump)
- 
- ## We will need libeay32.dll and ssleay32.dll when running client executables.
- COPY_OPENSSL_DLLS(copy_openssl_client)
-@@ -41,11 +39,13 @@ COPY_OPENSSL_DLLS(copy_openssl_client)
- INCLUDE(${MYSQL_CMAKE_SCRIPT_DIR}/compile_flags.cmake)
- 
- ADD_DEFINITIONS(${SSL_DEFINES})
-+IF(FALSE)
- MYSQL_ADD_EXECUTABLE(mysql completion_hash.cc mysql.cc readline.cc ../sql-common/sql_string.cc)
- TARGET_LINK_LIBRARIES(mysql perconaserverclient)
- IF(UNIX)
-   TARGET_LINK_LIBRARIES(mysql ${MY_READLINE_LIBRARY})
- ENDIF(UNIX)
-+ENDIF()
- 
- IF(NOT WITHOUT_SERVER)
-   MYSQL_ADD_EXECUTABLE(mysql_upgrade
-@@ -65,6 +65,7 @@ TARGET_LINK_LIBRARIES(mysqltest perconas
- ADD_CONVENIENCE_LIBRARY(mysqlcheck_core check/mysqlcheck_core.cc)
- TARGET_LINK_LIBRARIES(mysqlcheck_core perconaserverclient)
- 
-+IF(FALSE)
- MYSQL_ADD_EXECUTABLE(mysqlcheck check/mysqlcheck.cc)
- TARGET_LINK_LIBRARIES(mysqlcheck mysqlcheck_core)
- 
-@@ -77,10 +78,12 @@ TARGET_LINK_LIBRARIES(mysqlimport percon
- 
- MYSQL_ADD_EXECUTABLE(mysqlshow mysqlshow.c)
- TARGET_LINK_LIBRARIES(mysqlshow perconaserverclient)
-+ENDIF()
- 
- MYSQL_ADD_EXECUTABLE(mysql_plugin mysql_plugin.c)
- TARGET_LINK_LIBRARIES(mysql_plugin perconaserverclient)
- 
-+IF(FALSE)
- MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc)
- ADD_COMPILE_FLAGS(
-   mysqlbinlog.cc
-@@ -97,9 +100,12 @@ TARGET_LINK_LIBRARIES(mysqlslap perconas
- 
- MYSQL_ADD_EXECUTABLE(mysql_config_editor mysql_config_editor.cc)
- TARGET_LINK_LIBRARIES(mysql_config_editor ${FORCE_SSL_SOLARIS} perconaserverclient)
-+ENDIF()
- 
-+IF(FALSE)
- MYSQL_ADD_EXECUTABLE(mysql_secure_installation mysql_secure_installation.cc)
- TARGET_LINK_LIBRARIES(mysql_secure_installation perconaserverclient)
-+ENDIF()
- 
- IF(UNIX AND NOT WITHOUT_SERVER)
-   MYSQL_ADD_EXECUTABLE(mysql_install_db
-@@ -112,9 +118,11 @@ IF(UNIX AND NOT WITHOUT_SERVER)
-   ADD_DEPENDENCIES(mysql_install_db GenBootstrapPriv GenSysSchema)
- ENDIF()
- 
-+IF(FALSE)
- MYSQL_ADD_EXECUTABLE(mysql_ssl_rsa_setup mysql_ssl_rsa_setup.cc path.cc logger.cc)
- TARGET_LINK_LIBRARIES(mysql_ssl_rsa_setup mysys mysys_ssl)
- SET_TARGET_PROPERTIES(mysql_ssl_rsa_setup PROPERTIES LINKER_LANGUAGE CXX)
-+ENDIF()
- 
- # "WIN32" also covers 64 bit. "echo" is used in some files below "mysql-test/".
- IF(WIN32)
-@@ -123,11 +131,6 @@ ENDIF(WIN32)
- 
- SET_TARGET_PROPERTIES (
-   mysql_plugin
--  mysqlcheck
--  mysqldump
--  mysqlimport
--  mysqlshow
--  mysqlslap
- PROPERTIES HAS_CXX TRUE)
- 
- ADD_DEFINITIONS(-DHAVE_DLOPEN)
diff --git a/databases/percona57-server/files/patch-cmake_build__configurations_compiler__options.cmake b/databases/percona57-server/files/patch-cmake_build__configurations_compiler__options.cmake
deleted file mode 100644
index 4eca5cfb5df9..000000000000
--- a/databases/percona57-server/files/patch-cmake_build__configurations_compiler__options.cmake
+++ /dev/null
@@ -1,20 +0,0 @@
---- cmake/build_configurations/compiler_options.cmake.orig	2016-08-25 11:52:06 UTC
-+++ cmake/build_configurations/compiler_options.cmake
-@@ -50,7 +50,7 @@ IF(UNIX)  
-   IF(CMAKE_COMPILER_IS_GNUCC)
-     SET(COMMON_C_FLAGS "-fno-omit-frame-pointer -fno-strict-aliasing")
-     IF(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 10.0)  # gcc-9 or older
--      SET(COMMON_C_FLAGS "-fabi-version=2 ${COMMON_C_FLAGS}")
-+      SET(COMMON_C_FLAGS "${COMMON_C_FLAGS}")
-     ENDIF()
-     # Disable inline optimizations for valgrind testing to avoid false positives
-     IF(WITH_VALGRIND)
-@@ -77,7 +77,7 @@ IF(UNIX)  
-   IF(CMAKE_COMPILER_IS_GNUCXX)
-     SET(COMMON_CXX_FLAGS               "-g -fno-omit-frame-pointer -fno-strict-aliasing")
-     IF(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 10.0)  # gcc-9 or older
--      SET(COMMON_CXX_FLAGS             "-fabi-version=2 ${COMMON_CXX_FLAGS}")
-+      SET(COMMON_CXX_FLAGS             "${COMMON_CXX_FLAGS}")
-     ENDIF()
-     # GCC 6 has C++14 as default, set it explicitly to the old default.
-     EXECUTE_PROCESS(COMMAND ${CMAKE_CXX_COMPILER} -dumpversion
diff --git a/databases/percona57-server/files/patch-cmake_os_DragonFly.cmake b/databases/percona57-server/files/patch-cmake_os_DragonFly.cmake
deleted file mode 100644
index 83c154ee3bcf..000000000000
--- a/databases/percona57-server/files/patch-cmake_os_DragonFly.cmake
+++ /dev/null
@@ -1,27 +0,0 @@
---- cmake/os/DragonFly.cmake.orig	2016-04-14 10:16:17 UTC
-+++ cmake/os/DragonFly.cmake
-@@ -0,0 +1,24 @@
-+INCLUDE(CheckCSourceRuns)
-+
-+# We require at least GCC 4.4 or Clang 3.3.
-+IF(NOT FORCE_UNSUPPORTED_COMPILER)
-+  IF(CMAKE_COMPILER_IS_GNUCC)
-+    EXECUTE_PROCESS(COMMAND ${CMAKE_C_COMPILER} -dumpversion
-+                    OUTPUT_VARIABLE GCC_VERSION)
-+    IF(GCC_VERSION VERSION_LESS 4.4)
-+      MESSAGE(FATAL_ERROR "GCC 4.4 or newer is required!")
-+    ENDIF()
-+  ELSEIF(CMAKE_C_COMPILER_ID MATCHES "Clang")
-+    CHECK_C_SOURCE_RUNS("
-+      int main()
-+      {
-+        return (__clang_major__ < 3) ||
-+               (__clang_major__ == 3 && __clang_minor__ < 3);
-+      }" HAVE_SUPPORTED_CLANG_VERSION)
-+    IF(NOT HAVE_SUPPORTED_CLANG_VERSION)
-+      MESSAGE(FATAL_ERROR "Clang 3.3 or newer is required!")
-+    ENDIF()
-+  ELSE()
-+    MESSAGE(FATAL_ERROR "Unsupported compiler!")
-+  ENDIF()
-+ENDIF()
diff --git a/databases/percona57-server/files/patch-cmake_os_FreeBSD.cmake b/databases/percona57-server/files/patch-cmake_os_FreeBSD.cmake
deleted file mode 100644
index 9e9043f341ae..000000000000
--- a/databases/percona57-server/files/patch-cmake_os_FreeBSD.cmake
+++ /dev/null
@@ -1,25 +0,0 @@
---- cmake/os/FreeBSD.cmake.orig	2018-10-04 05:48:22 UTC
-+++ cmake/os/FreeBSD.cmake
-@@ -37,8 +37,20 @@ IF(NOT FORCE_UNSUPPORTED_COMPILER)
-     IF(NOT HAVE_SUPPORTED_CLANG_VERSION)
-       MESSAGE(FATAL_ERROR "Clang 3.3 or newer is required!")
-     ENDIF()
--  ELSE()
--    MESSAGE(FATAL_ERROR "Unsupported compiler!")
-+    CHECK_C_SOURCE_RUNS("
-+      int main()
-+      {
-+        return (__clang_major__ >= 4);
-+      }" I386_ATOMIC_BUILTINS)
-+    IF((CMAKE_SYSTEM_PROCESSOR MATCHES "i386") AND (NOT I386_ATOMIC_BUILTINS))
-+      SET(HAVE_GCC_ATOMIC_BUILTINS CACHE  INTERNAL "")
-+    ENDIF()
-+  ELSEIF(CMAKE_COMPILER_IS_GNUCC)
-+    EXECUTE_PROCESS(COMMAND ${CMAKE_C_COMPILER} -dumpversion
-+                    OUTPUT_VARIABLE GCC_VERSION)
-+    IF(GCC_VERSION VERSION_LESS 4.4)
-+      MESSAGE(FATAL_ERROR "GCC 4.4 or newer is required!")
-+    ENDIF()
-   ENDIF()
- ENDIF()
- 
diff --git a/databases/percona57-server/files/patch-cmake_plugin.cmake b/databases/percona57-server/files/patch-cmake_plugin.cmake
deleted file mode 100644
index a52ef25c7b24..000000000000
--- a/databases/percona57-server/files/patch-cmake_plugin.cmake
+++ /dev/null
@@ -1,25 +0,0 @@
---- cmake/plugin.cmake.orig	2017-06-22 14:13:19 UTC
-+++ cmake/plugin.cmake
-@@ -278,13 +278,17 @@ MACRO(MYSQL_ADD_PLUGIN)
-       MYSQL_INSTALL_TARGETS(${target}
-         DESTINATION ${INSTALL_PLUGINDIR}
-         COMPONENT ${INSTALL_COMPONENT})
--      INSTALL_DEBUG_TARGET(${target}
--        DESTINATION ${INSTALL_PLUGINDIR}/debug
--        COMPONENT ${INSTALL_COMPONENT})
-+        IF(CMAKE_BUILD_TYPE MATCHES "Debug")
-+            INSTALL_DEBUG_TARGET(${target}
-+              DESTINATION ${INSTALL_PLUGINDIR}/debug
-+              COMPONENT ${INSTALL_COMPONENT})
-+            # Add installed files to list for RPMs
-+            FILE(APPEND ${CMAKE_BINARY_DIR}/support-files/plugins.files
-+              "%attr(755, root, root) %{_prefix}/${INSTALL_PLUGINDIR}/debug/${ARG_MODULE_OUTPUT_NAME}.so\n")
-+        ENDIF()
-       # Add installed files to list for RPMs
-       FILE(APPEND ${CMAKE_BINARY_DIR}/support-files/plugins.files
--              "%attr(755, root, root) %{_prefix}/${INSTALL_PLUGINDIR}/${ARG_MODULE_OUTPUT_NAME}.so\n"
--              "%attr(755, root, root) %{_prefix}/${INSTALL_PLUGINDIR}/debug/${ARG_MODULE_OUTPUT_NAME}.so\n")
-+              "%attr(755, root, root) %{_prefix}/${INSTALL_PLUGINDIR}/${ARG_MODULE_OUTPUT_NAME}.so\n")
-       # For internal testing in PB2, append collections files
-       IF(DEFINED ENV{PB2WORKDIR})
-         PLUGIN_APPEND_COLLECTIONS(${plugin})
diff --git a/databases/percona57-server/files/patch-cmake_ssl.cmake b/databases/percona57-server/files/patch-cmake_ssl.cmake
deleted file mode 100644
index 4dfe79fa311b..000000000000
--- a/databases/percona57-server/files/patch-cmake_ssl.cmake
+++ /dev/null
@@ -1,22 +0,0 @@
---- cmake/ssl.cmake.orig	2019-11-09 00:33:40.000000000 +1000
-+++ cmake/ssl.cmake	2019-12-13 23:08:53.686402000 +1000
-@@ -193,7 +193,8 @@ MACRO (MYSQL_CHECK_SSL)
-       )
-     SET(OPENSSL_VERSION ${OPENSSL_VERSION} CACHE INTERNAL "")
- 
--    IF("${OPENSSL_VERSION}" VERSION_GREATER "1.1.0")
-+    CHECK_SYMBOL_EXISTS(TLS1_3_VERSION "openssl/tls1.h" HAVE_TLS1_3_VERSION)
-+    IF(HAVE_TLS1_3_VERSION)
-        ADD_DEFINITIONS(-DHAVE_TLSv13)
-        SET(HAVE_TLSv13 1)
-        IF(SOLARIS)
-@@ -202,8 +203,7 @@ MACRO (MYSQL_CHECK_SSL)
-     ENDIF()
-     IF(OPENSSL_INCLUDE_DIR AND
-        OPENSSL_LIBRARY   AND
--       CRYPTO_LIBRARY      AND
--       OPENSSL_MAJOR_VERSION STREQUAL "1"
-+       CRYPTO_LIBRARY
-       )
-       SET(OPENSSL_FOUND TRUE)
-     ELSE()
diff --git a/databases/percona57-server/files/patch-configure.cmake b/databases/percona57-server/files/patch-configure.cmake
deleted file mode 100644
index 81ab9495aac3..000000000000
--- a/databases/percona57-server/files/patch-configure.cmake
+++ /dev/null
@@ -1,15 +0,0 @@
---- configure.cmake.orig	2018-01-16 23:26:09 UTC
-+++ configure.cmake
-@@ -43,6 +43,12 @@ IF(UNIX)
- ENDIF()
- 
- 
-+IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
-+  SET(CMAKE_SHARED_LIBRARY_C_FLAGS
-+    "${CMAKE_SHARED_LIBRARY_C_FLAGS} ${CMAKE_C_FLAGS} -L%%FREEBSD_LOCAL_LIB%%")
-+ENDIF()
-+
-+
- IF(CMAKE_SYSTEM_NAME MATCHES "SunOS" AND CMAKE_COMPILER_IS_GNUCXX)
-   ## We will be using gcc to generate .so files
-   ## Add C flags (e.g. -m64) to CMAKE_SHARED_LIBRARY_C_FLAGS
diff --git a/databases/percona57-server/files/patch-include_CMakeLists.txt b/databases/percona57-server/files/patch-include_CMakeLists.txt
deleted file mode 100644
index c047677002a0..000000000000
--- a/databases/percona57-server/files/patch-include_CMakeLists.txt
+++ /dev/null
@@ -1,19 +0,0 @@
---- include/CMakeLists.txt.orig	2016-11-27 19:44:54 UTC
-+++ include/CMakeLists.txt
-@@ -69,14 +69,13 @@ SET(HEADERS 
-   ${HEADERS_GEN_CONFIGURE}
- )
- 
-+IF(FALSE)
- INSTALL(FILES
-   ../libbinlogevents/export/binary_log_types.h
-   DESTINATION ${INSTALL_INCLUDEDIR}
--  COMPONENT Development)
--INSTALL(FILES ${HEADERS} DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT Development)
--INSTALL(DIRECTORY mysql/ DESTINATION ${INSTALL_INCLUDEDIR}/mysql COMPONENT Development 
-  PATTERN "*.h"
-  PATTERN "psi_abi*" EXCLUDE
- )
-+ENDIF()
- 
- 
diff --git a/databases/percona57-server/files/patch-include_my__compare.h b/databases/percona57-server/files/patch-include_my__compare.h
deleted file mode 100644
index 608e15dd8751..000000000000
--- a/databases/percona57-server/files/patch-include_my__compare.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- include/my_compare.h.orig	2016-11-27 19:44:54 UTC
-+++ include/my_compare.h
-@@ -40,7 +40,7 @@ extern "C" {
-   But beware the dependency of MI_MAX_POSSIBLE_KEY_BUFF and HA_MAX_KEY_LENGTH.
- */
- 
--#define HA_MAX_KEY_LENGTH           1000        /* Max length in bytes */
-+#define HA_MAX_KEY_LENGTH           4000        /* Max length in bytes */
- #define HA_MAX_KEY_SEG              16          /* Max segments for key */
- 
- #define HA_MAX_POSSIBLE_KEY_BUFF    (HA_MAX_KEY_LENGTH + 24+ 6+6)
diff --git a/databases/percona57-server/files/patch-include_my__openssl.h b/databases/percona57-server/files/patch-include_my__openssl.h
deleted file mode 100644
index 43ddb2935038..000000000000
--- a/databases/percona57-server/files/patch-include_my__openssl.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- include/my_openssl.h.orig	2020-03-23 17:35:17 UTC
-+++ include/my_openssl.h
-@@ -51,7 +51,7 @@ extern "C" {
-  */
- static inline int mysql_OPENSSL_init()
- {
--#if defined(HAVE_STATIC_OPENSSL)
-+#if defined(HAVE_STATIC_OPENSSL) && !defined(LIBRESSL_VERSION_NUMBER)
-   return OPENSSL_init_crypto(OPENSSL_INIT_NO_ATEXIT, NULL);
- #else
-   return SSL_library_init();
diff --git a/databases/percona57-server/files/patch-include_myisam.h b/databases/percona57-server/files/patch-include_myisam.h
deleted file mode 100644
index 96bc58628416..000000000000
--- a/databases/percona57-server/files/patch-include_myisam.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- include/myisam.h.orig	2016-11-27 19:44:54 UTC
-+++ include/myisam.h
-@@ -45,7 +45,7 @@ extern "C" {
-   The following defines can be increased if necessary.
-   But beware the dependency of MI_MAX_POSSIBLE_KEY_BUFF and MI_MAX_KEY_LENGTH.
- */
--#define MI_MAX_KEY_LENGTH           1000            /* Max length in bytes */
-+#define MI_MAX_KEY_LENGTH           4000            /* Max length in bytes */
- #define MI_MAX_KEY_SEG              16              /* Max segments for key */
- 
- #define MI_MAX_KEY_BUFF  (MI_MAX_KEY_LENGTH+MI_MAX_KEY_SEG*6+8+8)
diff --git a/databases/percona57-server/files/patch-libmysql_CMakeLists.txt b/databases/percona57-server/files/patch-libmysql_CMakeLists.txt
deleted file mode 100644
index d66517c9ed59..000000000000
--- a/databases/percona57-server/files/patch-libmysql_CMakeLists.txt
+++ /dev/null
@@ -1,29 +0,0 @@
---- libmysql/CMakeLists.txt.orig	2018-03-09 22:41:36 UTC
-+++ libmysql/CMakeLists.txt
-@@ -235,7 +235,7 @@
- ADD_SUBDIRECTORY(authentication_ldap)
-   
- # Merge several convenience libraries into one big perconaserverclient
--MERGE_CONVENIENCE_LIBRARIES(perconaserverclient ${LIBS_TO_MERGE} COMPONENT Development)
-+MERGE_CONVENIENCE_LIBRARIES(perconaserverclient ${LIBS_TO_MERGE} COMPONENT Development SKIP_INSTALL)
- TARGET_LINK_LIBRARIES(perconaserverclient ${LIBS_TO_LINK})
-
- # Visual Studio users need debug  static library for debug projects
-@@ -271,7 +271,8 @@
-   # and link them together into shared library.
-   MERGE_LIBRARIES_SHARED(libmysql ${LIBS_TO_MERGE}
-     EXPORTS ${CLIENT_API_FUNCTIONS} ${CLIENT_API_FUNCTIONS_UNDOCUMENTED}
--    COMPONENT SharedLibraries)
-+    COMPONENT SharedLibraries SKIP_INSTALL)
-   TARGET_LINK_LIBRARIES(libmysql ${LIBS_TO_LINK})
-+IF(FALSE)
-   IF(UNIX)
-     # libtool compatability
-@@ -327,6 +328,7 @@
- # to initialize api_calls[] array in api_test.c
- #
- SET(CLIENT_API_FUNCTION_LIST "")
-+ENDIF()
- FOREACH(api ${CLIENT_API_FUNCTIONS})
-   SET(CLIENT_API_FUNCTION_LIST "${CLIENT_API_FUNCTION_LIST} ${api},")
- ENDFOREACH()
diff --git a/databases/percona57-server/files/patch-libmysql_authentication__ldap_CMakeLists.txt b/databases/percona57-server/files/patch-libmysql_authentication__ldap_CMakeLists.txt
deleted file mode 100644
index 805875fb1787..000000000000
--- a/databases/percona57-server/files/patch-libmysql_authentication__ldap_CMakeLists.txt
+++ /dev/null
@@ -1,20 +0,0 @@
---- libmysql/authentication_ldap/CMakeLists.txt.orig	2019-02-18 09:11:31.000000000 +0300
-+++ libmysql/authentication_ldap/CMakeLists.txt
-@@ -47,7 +47,8 @@ IF(NOT WIN32 AND NOT HAVE_LBER_H)
-   CROAK_AND_RETURN("Required LBER header is missing.")
- ENDIF()
- 
--MYSQL_ADD_PLUGIN(authentication_ldap_sasl_client
-+IF (WITH_AUTHENTICATION_LDAP)
-+ MYSQL_ADD_PLUGIN(authentication_ldap_sasl_client
-   auth_ldap_sasl_client.cc
-   log_client.cc
-   LINK_LIBRARIES
-@@ -57,6 +58,7 @@ MYSQL_ADD_PLUGIN(authentication_ldap_sasl_client
-   CLIENT_ONLY
-   MODULE_ONLY
-   MODULE_OUTPUT_NAME "authentication_ldap_sasl_client")
-+ENDIF()
- 
- # The plugin may need symbols which are not loaded by the client.
- IF(STATIC_SASL_LIBRARY)
diff --git a/databases/percona57-server/files/patch-libservices_CMakeLists.txt b/databases/percona57-server/files/patch-libservices_CMakeLists.txt
deleted file mode 100644
index c9190039e613..000000000000
--- a/databases/percona57-server/files/patch-libservices_CMakeLists.txt
+++ /dev/null
@@ -1,9 +0,0 @@
---- libservices/CMakeLists.txt.orig	2016-11-27 19:44:54 UTC
-+++ libservices/CMakeLists.txt
-@@ -35,4 +35,6 @@ SET(MYSQLSERVICES_SOURCES
-   mysql_keyring_service.c)
- 
- ADD_CONVENIENCE_LIBRARY(mysqlservices ${MYSQLSERVICES_SOURCES})
-+IF(FALSE)
- INSTALL(TARGETS mysqlservices DESTINATION ${INSTALL_LIBDIR} COMPONENT Development)
-+ENDIF()
diff --git a/databases/percona57-server/files/patch-man_CMakeLists.txt b/databases/percona57-server/files/patch-man_CMakeLists.txt
deleted file mode 100644
index 0d3487cbefe6..000000000000
--- a/databases/percona57-server/files/patch-man_CMakeLists.txt
+++ /dev/null
@@ -1,13 +0,0 @@
---- man/CMakeLists.txt.orig	2016-11-27 19:44:54 UTC
-+++ man/CMakeLists.txt
-@@ -14,9 +14,7 @@
- # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
- 
- # Copy man pages
--FILE(GLOB MAN1_FILES *.1)
--FILE(GLOB MAN1_EXCLUDE make_win_bin_dist.1)
--FILE(GLOB MAN1_NDB ndb*.1)
-+FILE(GLOB MAN1_FILES my_print_defaults.1 myisam_ftdump.1 myisamchk.1 myisamlog.1 myisampack.1  mysql.server.1 mysql_convert_table_format.1 mysql_fix_extensions.1  mysql_install_db.1 mysql_plugin.1 mysql_secure_installation.1 mysql_setpermission.1  mysql_tzinfo_to_sql.1 mysql_upgrade.1 mysql_zap.1 mysqlbug.1  mysqld_multi.1 mysqld_safe.1 mysqldumpslow.1 mysqlhotcopy.1 mysqlman.1  mysqltest.1 perror.1 replace.1 resolve_stack_dump.1 resolveip.1)
- FILE(GLOB MAN8_FILES *.8)
- FILE(GLOB MAN8_NDB ndb*.8)
- IF(MAN1_FILES)
diff --git a/databases/percona57-server/files/patch-mysys__ssl_my__crypt.cc b/databases/percona57-server/files/patch-mysys__ssl_my__crypt.cc
deleted file mode 100644
index 453c89a71c12..000000000000
--- a/databases/percona57-server/files/patch-mysys__ssl_my__crypt.cc
+++ /dev/null
@@ -1,39 +0,0 @@
---- mysys_ssl/my_crypt.cc.orig	2019-05-16 05:06:00 UTC
-+++ mysys_ssl/my_crypt.cc
-@@ -26,7 +26,7 @@
- #include <boost/move/unique_ptr.hpp>
- #include <boost/core/noncopyable.hpp>
- 
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- #define EVP_CIPHER_CTX_buf_noconst(ctx) ((ctx)->buf)
- #define RAND_OpenSSL() RAND_SSLeay()
- #endif
-@@ -80,7 +80,7 @@ class MyEncryptionCTX : private boost::noncopyable (pr
- 
- MyEncryptionCTX::MyEncryptionCTX()
- {
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-   ctx= new EVP_CIPHER_CTX();
-   EVP_CIPHER_CTX_init(ctx);
- #else
-@@ -91,7 +91,8 @@ MyEncryptionCTX::MyEncryptionCTX()
- MyEncryptionCTX::~MyEncryptionCTX()
- {
-   
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || \
-+    (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x02090000fL)
-   EVP_CIPHER_CTX_cleanup(ctx);
-   delete ctx;
-   ERR_remove_thread_state(0);
-@@ -340,7 +341,7 @@ int my_aes_crypt(const my_aes_mode mode, int flags,
-   res2= my_aes_crypt_finish(ctx, dst + d1, &d2);
-   if (res1 || res2)
-   {
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-     /* in case of failure clear error queue */
-     ERR_remove_thread_state(0);
- #endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */
diff --git a/databases/percona57-server/files/patch-mysys__ssl_my__default.cc b/databases/percona57-server/files/patch-mysys__ssl_my__default.cc
deleted file mode 100644
index 83a127b9602c..000000000000
--- a/databases/percona57-server/files/patch-mysys__ssl_my__default.cc
+++ /dev/null
@@ -1,31 +0,0 @@
---- mysys_ssl/my_default.cc.orig	2016-11-27 19:44:54 UTC
-+++ mysys_ssl/my_default.cc
-@@ -114,7 +114,7 @@ static my_bool defaults_already_read= FA
- 
- /* Which directories are searched for options (and in which order) */
- 
--#define MAX_DEFAULT_DIRS 6
-+#define MAX_DEFAULT_DIRS 7
- #define DEFAULT_DIRS_SIZE (MAX_DEFAULT_DIRS + 1)  /* Terminate with NULL */
- static const char **default_directories = NULL;
- 
-@@ -1416,7 +1416,10 @@ static const char **init_default_directo
- 
- #if defined(DEFAULT_SYSCONFDIR)
-   if (DEFAULT_SYSCONFDIR[0])
-+  {
-     errors += add_directory(alloc, DEFAULT_SYSCONFDIR, dirs);
-+    errors += add_directory(alloc, DEFAULT_SYSCONFDIR "/mysql", dirs);
-+  }
- #endif /* DEFAULT_SYSCONFDIR */
- 
- #endif
-@@ -1488,7 +1491,7 @@ int check_file_permissions(const char *f
-   MY_STAT stat_info;
- 
-   if (!my_stat(file_name,&stat_info,MYF(0)))
--    return 1;
-+    return 0;
-   /*
-     Ignore .mylogin.cnf file if not exclusively readable/writable
-     by current user.
diff --git a/databases/percona57-server/files/patch-rapid_plugin_group_replication_libmysqlgcs_src_bindings_xcom_xcom_xcom_ssl_transport.c b/databases/percona57-server/files/patch-rapid_plugin_group_replication_libmysqlgcs_src_bindings_xcom_xcom_xcom_ssl_transport.c
deleted file mode 100644
index f4cadfc93dff..000000000000
--- a/databases/percona57-server/files/patch-rapid_plugin_group_replication_libmysqlgcs_src_bindings_xcom_xcom_xcom_ssl_transport.c
+++ /dev/null
@@ -1,37 +0,0 @@
---- rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_ssl_transport.c.orig	2020-03-23 17:35:17 UTC
-+++ rapid/plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_ssl_transport.c
-@@ -230,7 +230,7 @@ static int configure_ssl_algorithms(SSL_CTX* ssl_ctx, 
-                                     const char* tls_version)
- {
-   DH *dh= NULL;
--#ifdef HAVE_TLSv13
-+#if defined(HAVE_TLSv13) && !defined(LIBRESSL_VERSION_NUMBER)
-   /* We support TLS up to 1.2, so explicitly disable TLS 1.3. */
-   long ssl_ctx_options= SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3 | SSL_OP_NO_TLSv1_3;
- #else
-@@ -255,14 +255,14 @@ static int configure_ssl_algorithms(SSL_CTX* ssl_ctx, 
-                     SSL_OP_NO_TLSv1 |
-                     SSL_OP_NO_TLSv1_1
-                     | SSL_OP_NO_TLSv1_2
--#ifdef HAVE_TLSv13
-+#if defined(HAVE_TLSv13) && !defined(LIBRESSL_VERSION_NUMBER)
-                     | SSL_OP_NO_TLSv1_3
- #endif /* HAVE_TLSv13 */
-                    );
- 
-   SSL_CTX_set_options(ssl_ctx, ssl_ctx_options);
- 
--#ifdef HAVE_TLSv13
-+#if defined(HAVE_TLSv13) && !defined(LIBRESSL_VERSION_NUMBER)
-   /* We do not support TLS 1.3.
-      Setting empty TLS 1.3 ciphersuites disables them. */
-   if (SSL_CTX_set_ciphersuites(ssl_ctx, "") == 0)
-@@ -527,7 +527,7 @@ int xcom_init_ssl(const char *server_key_file, const c
-     break e.g. ODBC clients (if the client also uses SSL).
-   */
- 
--#if defined(HAVE_STATIC_OPENSSL)
-+#if defined(HAVE_STATIC_OPENSSL) && !defined(LIBRESSL_VERSION_NUMBER)
-   OPENSSL_init_crypto(OPENSSL_INIT_NO_ATEXIT, NULL);
- #else
-   SSL_library_init();
diff --git a/databases/percona57-server/files/patch-scripts_CMakeLists.txt b/databases/percona57-server/files/patch-scripts_CMakeLists.txt
deleted file mode 100644
index 27ef3bb01f37..000000000000
--- a/databases/percona57-server/files/patch-scripts_CMakeLists.txt
+++ /dev/null
@@ -1,45 +0,0 @@
---- scripts/CMakeLists.txt.orig	2017-12-11 07:56:49.000000000 +0000
-+++ scripts/CMakeLists.txt	2017-12-31 14:59:46.762799000 +0000
-@@ -332,6 +332,8 @@
-           GET_FILENAME_COMPONENT(lib "${lib}" NAME_WE)
-           STRING(REGEX REPLACE "^lib" "" lib "${lib}")
-           SET(${var} "${${var}}-l${lib} " )
-+        ELSEIF(lib STREQUAL "-pthread")
-+          SET(${var} "${${var}}-pthread " )
-         ELSE()
-           SET(${var} "${${var}}-l${lib} " )
-         ENDIF()
-@@ -419,7 +421,6 @@
- 
-   IF(WITH_SYSTEMD)
-     SET(BIN_SCRIPTS
--      mysql_config
-       mysqldumpslow
-       ps_tokudb_admin
-       ps_mysqld_helper
-@@ -427,7 +428,6 @@
-       )
-   ELSE()
-     SET(BIN_SCRIPTS
--      mysql_config
-       mysqldumpslow
-       mysqld_multi
-       mysqld_safe
-@@ -443,7 +443,7 @@
-     ${CMAKE_CURRENT_BINARY_DIR}/${PKGCONFIG_FILE}
-     ESCAPE_QUOTES @ONLY)
- 
--  IF(INSTALL_PKGCONFIGDIR)
-+  IF(FALSE)
-     MESSAGE(STATUS "INSTALL ${PKGCONFIG_FILE} ${INSTALL_PKGCONFIGDIR}")
-     INSTALL(FILES
-       ${CMAKE_CURRENT_BINARY_DIR}/${PKGCONFIG_FILE}
-@@ -464,7 +464,7 @@
-   FOREACH(file ${BIN_SCRIPTS})
-     IF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh)
-       CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh
--        ${CMAKE_CURRENT_BINARY_DIR}/${file} ESCAPE_QUOTES @ONLY)
-+        ${CMAKE_CURRENT_BINARY_DIR}/${file} @ONLY)
-     ELSEIF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${file})
-       CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${file}
-          ${CMAKE_CURRENT_BINARY_DIR}/${file} COPYONLY)
diff --git a/databases/percona57-server/files/patch-sql_auth_sha2__password__common.cc b/databases/percona57-server/files/patch-sql_auth_sha2__password__common.cc
deleted file mode 100644
index 1d2486c48d20..000000000000
--- a/databases/percona57-server/files/patch-sql_auth_sha2__password__common.cc
+++ /dev/null
@@ -1,12 +0,0 @@
---- sql/auth/sha2_password_common.cc.orig	2019-05-16 05:06:00 UTC
-+++ sql/auth/sha2_password_common.cc
-@@ -146,7 +146,8 @@ bool SHA256_digest::retrieve_digest(unsigned char *dig
-     DBUG_RETURN(true);
-   }
-   m_ok= EVP_DigestFinal_ex(md_context, m_digest, NULL);
--#if defined(HAVE_WOLFSSL) || OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if defined(HAVE_WOLFSSL) || OPENSSL_VERSION_NUMBER < 0x10100000L || \
-+    (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x02070000fL)
-   EVP_MD_CTX_cleanup(md_context);
- #else  /* OPENSSL_VERSION_NUMBER < 0x10100000L */
-   EVP_MD_CTX_reset(md_context);
diff --git a/databases/percona57-server/files/patch-sql_locks_shared__spin__lock.cc b/databases/percona57-server/files/patch-sql_locks_shared__spin__lock.cc
deleted file mode 100644
index ca63b9f31439..000000000000
--- a/databases/percona57-server/files/patch-sql_locks_shared__spin__lock.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- sql/locks/shared_spin_lock.cc.orig 2021-05-20 11:22:55 UTC
-+++ sql/locks/shared_spin_lock.cc
-@@ -242,7 +242,7 @@ lock::Shared_spin_lock &lock::Shared_spin_lock::try_or
- #if defined(__APPLE__)
-   my_atomic_store64(&this->m_exclusive_owner, reinterpret_cast<int64>(self));
- #else
--  my_atomic_store64(&this->m_exclusive_owner, self);
-+  my_atomic_store64(&this->m_exclusive_owner, reinterpret_cast<int64>(self));
- #endif
-   return (*this);
- }
diff --git a/databases/percona57-server/files/patch-sql_mysqld.cc b/databases/percona57-server/files/patch-sql_mysqld.cc
deleted file mode 100644
index 184ace5eab3e..000000000000
--- a/databases/percona57-server/files/patch-sql_mysqld.cc
+++ /dev/null
@@ -1,38 +0,0 @@
---- sql/mysqld.cc.orig	2016-11-27 19:44:54 UTC
-+++ sql/mysqld.cc
-@@ -1517,6 +1517,16 @@ static void clean_up_mutexes()
- ****************************************************************************/
- 
- /* Initialise proxy protocol. */
-+
-+/* At least OpenBSD and NexentaCore do not
-+* define s6_addr32 for user land settings.
-+*/
-+#if !defined s6_addr32 && defined __sun__
-+#       define s6_addr32 _S6_un._S6_u32
-+#elif !defined s6_addr32 && ( defined __OpenBSD__ || defined __FreeBSD__ )
-+#       define s6_addr32 __u6_addr.__u6_addr32
-+#endif  /* !defined s6_addr32 */
-+
- static void set_proxy()
- {
-   const char *p;
-@@ -3678,6 +3688,7 @@ static int init_ssl()
- {
- #ifdef HAVE_OPENSSL
-+#ifndef LIBRESSL_VERSION_NUMBER
-   int fips_mode= FIPS_mode();
-   if (fips_mode != 0)
-   {
-     /* FIPS is enabled, Log warning and Disable it now */
-@@ -3687,7 +3698,9 @@ static int init_ssl()
-         " Disabling FIPS.");
-     FIPS_mode_set(0);
-   }
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#endif
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || \
-+    defined(LIBRESSL_VERSION_NUMBER)
-   CRYPTO_malloc_init();
- #else /* OPENSSL_VERSION_NUMBER < 0x10100000L */
-   OPENSSL_malloc_init();
diff --git a/databases/percona57-server/files/patch-sql_sys__vars.cc b/databases/percona57-server/files/patch-sql_sys__vars.cc
deleted file mode 100644
index 1d1cb73e49a2..000000000000
--- a/databases/percona57-server/files/patch-sql_sys__vars.cc
+++ /dev/null
@@ -1,38 +0,0 @@
---- sql/sys_vars.cc.orig	2016-11-27 19:44:54 UTC
-+++ sql/sys_vars.cc
-@@ -1804,7 +1804,7 @@ static Sys_var_ulong Sys_interactive_tim
-        "connection before closing it",
-        SESSION_VAR(net_interactive_timeout),
-        CMD_LINE(REQUIRED_ARG),
--       VALID_RANGE(1, LONG_TIMEOUT), DEFAULT(NET_WAIT_TIMEOUT), BLOCK_SIZE(1));
-+       VALID_RANGE(1, INT_MAX32/1000), DEFAULT(NET_WAIT_TIMEOUT), BLOCK_SIZE(1));
- 
- static Sys_var_ulong Sys_join_buffer_size(
-        "join_buffer_size",
-@@ -2696,7 +2696,7 @@ static Sys_var_ulong Sys_net_read_timeou
-        "Number of seconds to wait for more data from a connection before "
-        "aborting the read",
-        SESSION_VAR(net_read_timeout), CMD_LINE(REQUIRED_ARG),
--       VALID_RANGE(1, LONG_TIMEOUT), DEFAULT(NET_READ_TIMEOUT), BLOCK_SIZE(1),
-+       VALID_RANGE(1, INT_MAX32/1000), DEFAULT(NET_READ_TIMEOUT), BLOCK_SIZE(1),
-        NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0),
-        ON_UPDATE(fix_net_read_timeout));
- 
-@@ -2720,7 +2720,7 @@ static Sys_var_ulong Sys_net_write_timeo
-        "Number of seconds to wait for a block to be written to a connection "
-        "before aborting the write",
-        SESSION_VAR(net_write_timeout), CMD_LINE(REQUIRED_ARG),
--       VALID_RANGE(1, LONG_TIMEOUT), DEFAULT(NET_WRITE_TIMEOUT), BLOCK_SIZE(1),
-+       VALID_RANGE(1, INT_MAX32/1000), DEFAULT(NET_WRITE_TIMEOUT), BLOCK_SIZE(1),
-        NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0),
-        ON_UPDATE(fix_net_write_timeout));
- 
-@@ -4406,7 +4406,7 @@ static Sys_var_ulong Sys_net_wait_timeou
-        "The number of seconds the server waits for activity on a "
-        "connection before closing it",
-        SESSION_VAR(net_wait_timeout), CMD_LINE(REQUIRED_ARG),
--       VALID_RANGE(1, IF_WIN(INT_MAX32/1000, LONG_TIMEOUT)),
-+       VALID_RANGE(1, INT_MAX32/1000),
-        DEFAULT(NET_WAIT_TIMEOUT), BLOCK_SIZE(1));
- 
- static Sys_var_plugin Sys_default_storage_engine(
diff --git a/databases/percona57-server/files/patch-storage_innobase_include_srv0mon.h b/databases/percona57-server/files/patch-storage_innobase_include_srv0mon.h
deleted file mode 100644
index e023ef0c7708..000000000000
--- a/databases/percona57-server/files/patch-storage_innobase_include_srv0mon.h
+++ /dev/null
@@ -1,13 +0,0 @@
---- storage/innobase/include/srv0mon.h.orig	2016-11-27 19:44:54 UTC
-+++ storage/innobase/include/srv0mon.h
-@@ -34,6 +34,10 @@ Created 12/15/2009	Jimmy Yang
- /* Required for FreeBSD so that INT64_MAX is defined. */
- #define __STDC_LIMIT_MACROS
- #endif /* __STDC_LIMIT_MACROS */
-+#ifdef __DragonFly__
-+/* The hack above doen't work for dragonfly, stdint.h already imported */
-+#include <machine/int_limits.h>
-+#endif
- 
- #include <stdint.h>
- 
diff --git a/databases/percona57-server/files/patch-storage_myisam_mi__dynrec.c b/databases/percona57-server/files/patch-storage_myisam_mi__dynrec.c
deleted file mode 100644
index 80b7192940ca..000000000000
--- a/databases/percona57-server/files/patch-storage_myisam_mi__dynrec.c
+++ /dev/null
@@ -1,23 +0,0 @@
---- storage/myisam/mi_dynrec.c.orig	2016-11-27 19:44:54 UTC
-+++ storage/myisam/mi_dynrec.c
-@@ -65,18 +65,13 @@ my_bool mi_dynmap_file(MI_INFO *info, my
-     DBUG_RETURN(1);
-   }
-   /*
--    I wonder if it is good to use MAP_NORESERVE. From the Linux man page:
--    MAP_NORESERVE
--      Do not reserve swap space for this mapping. When swap space is
--      reserved, one has the guarantee that it is possible to modify the
--      mapping. When swap space is not reserved one might get SIGSEGV
--      upon a write if no physical memory is available.
-+    MAP_NORESERVE is unimplemented in FreeBSD
-   */
-   info->s->file_map= (uchar*)
-                   my_mmap(0, (size_t) size,
-                           info->s->mode==O_RDONLY ? PROT_READ :
-                           PROT_READ | PROT_WRITE,
--                          MAP_SHARED | MAP_NORESERVE,
-+                          MAP_SHARED,
-                           info->dfile, 0L);
-   if (info->s->file_map == (uchar*) MAP_FAILED)
-   {
diff --git a/databases/percona57-server/files/patch-storage_rocksdb_CMakeLists.txt b/databases/percona57-server/files/patch-storage_rocksdb_CMakeLists.txt
deleted file mode 100644
index 1d6bfda7483e..000000000000
--- a/databases/percona57-server/files/patch-storage_rocksdb_CMakeLists.txt
+++ /dev/null
@@ -1,60 +0,0 @@
---- storage/rocksdb/CMakeLists.txt.orig	2021-07-30 02:26:13.135102000 +0300
-+++ storage/rocksdb/CMakeLists.txt	2021-07-30 02:29:42.990461000 +0300
-@@ -23,8 +23,8 @@
- ENDIF ()
- 
- # check platform support, no 32 bit
--IF (NOT CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
--  MESSAGE (${MYROCKS_STATUS_MODE} "x86_64 is only platform supported. ${CMAKE_SYSTEM_PROCESSOR} found. Not building MyRocks")
-+IF (NOT CMAKE_SYSTEM_PROCESSOR STREQUAL "amd64")
-+  MESSAGE (${MYROCKS_STATUS_MODE} "amd64 is only platform supported. ${CMAKE_SYSTEM_PROCESSOR} found. Not building MyRocks")
-   RETURN ()
- ENDIF ()
- 
-@@ -166,37 +166,6 @@
-   ${LZ4_INCLUDE_DIR}
- )
- 
--# add bundled compression code
--SET(ZSTD_SOURCES
--  ${CMAKE_CURRENT_SOURCE_DIR}/third_party/zstd/lib/common/entropy_common.c
--  ${CMAKE_CURRENT_SOURCE_DIR}/third_party/zstd/lib/common/error_private.c
--  ${CMAKE_CURRENT_SOURCE_DIR}/third_party/zstd/lib/common/fse_decompress.c
--  ${CMAKE_CURRENT_SOURCE_DIR}/third_party/zstd/lib/common/pool.c
--  ${CMAKE_CURRENT_SOURCE_DIR}/third_party/zstd/lib/common/threading.c
--  ${CMAKE_CURRENT_SOURCE_DIR}/third_party/zstd/lib/common/xxhash.c
--  ${CMAKE_CURRENT_SOURCE_DIR}/third_party/zstd/lib/common/zstd_common.c
--  ${CMAKE_CURRENT_SOURCE_DIR}/third_party/zstd/lib/compress/zstd_compress_literals.c
--  ${CMAKE_CURRENT_SOURCE_DIR}/third_party/zstd/lib/compress/zstd_compress_sequences.c
--  ${CMAKE_CURRENT_SOURCE_DIR}/third_party/zstd/lib/compress/zstd_double_fast.c
--  ${CMAKE_CURRENT_SOURCE_DIR}/third_party/zstd/lib/compress/zstd_fast.c
--  ${CMAKE_CURRENT_SOURCE_DIR}/third_party/zstd/lib/compress/zstd_lazy.c
--  ${CMAKE_CURRENT_SOURCE_DIR}/third_party/zstd/lib/compress/zstd_ldm.c
--  ${CMAKE_CURRENT_SOURCE_DIR}/third_party/zstd/lib/compress/zstd_opt.c
--  ${CMAKE_CURRENT_SOURCE_DIR}/third_party/zstd/lib/compress/hist.c
--  ${CMAKE_CURRENT_SOURCE_DIR}/third_party/zstd/lib/compress/fse_compress.c
--  ${CMAKE_CURRENT_SOURCE_DIR}/third_party/zstd/lib/compress/huf_compress.c
--  ${CMAKE_CURRENT_SOURCE_DIR}/third_party/zstd/lib/compress/zstd_compress.c
--  ${CMAKE_CURRENT_SOURCE_DIR}/third_party/zstd/lib/compress/zstdmt_compress.c
--  ${CMAKE_CURRENT_SOURCE_DIR}/third_party/zstd/lib/decompress/huf_decompress.c
--  ${CMAKE_CURRENT_SOURCE_DIR}/third_party/zstd/lib/decompress/zstd_decompress.c
--  ${CMAKE_CURRENT_SOURCE_DIR}/third_party/zstd/lib/decompress/zstd_decompress_block.c
--  ${CMAKE_CURRENT_SOURCE_DIR}/third_party/zstd/lib/decompress/zstd_ddict.c
--  ${CMAKE_CURRENT_SOURCE_DIR}/third_party/zstd/lib/dictBuilder/cover.c
--  ${CMAKE_CURRENT_SOURCE_DIR}/third_party/zstd/lib/dictBuilder/fastcover.c
--  ${CMAKE_CURRENT_SOURCE_DIR}/third_party/zstd/lib/dictBuilder/divsufsort.c
--  ${CMAKE_CURRENT_SOURCE_DIR}/third_party/zstd/lib/dictBuilder/zdict.c
--)
--
- SET(ROCKSDB_SOURCES
-   ${ROCKSDB_SOURCES}
-   ${ZSTD_SOURCES}
-@@ -230,7 +199,7 @@
-   SET(rocksdb_static_libs ${rocksdb_static_libs} "${ROCKSDB_LIB_PATH}/${ROCKSDB_LIB_NAME}")
- ENDIF()
- 
--SET(rocksdb_static_libs ${rocksdb_static_libs} ${ZLIB_LIBRARY} ${LZ4_LIBRARY} "-lrt" "-ldl")
-+SET(rocksdb_static_libs ${rocksdb_static_libs} ${ZLIB_LIBRARY} ${LZ4_LIBRARY} "-lrt" "-ldl -llz4 -lzstd")
- 
- MYSQL_ADD_PLUGIN(rocksdb ${ROCKSDB_SOURCES} STORAGE_ENGINE DEFAULT MODULE_ONLY
-   LINK_LIBRARIES ${rocksdb_static_libs}
diff --git a/databases/percona57-server/files/patch-support-files_CMakeLists.txt b/databases/percona57-server/files/patch-support-files_CMakeLists.txt
deleted file mode 100644
index 87658305530b..000000000000
--- a/databases/percona57-server/files/patch-support-files_CMakeLists.txt
+++ /dev/null
@@ -1,12 +0,0 @@
---- support-files/CMakeLists.txt.orig	2016-11-27 19:44:54 UTC
-+++ support-files/CMakeLists.txt
-@@ -69,7 +69,9 @@ IF(UNIX)
-     INSTALL(FILES magic DESTINATION ${inst_location} COMPONENT SupportFiles)
-   ENDIF()
- 
-+IF(FALSE)
-   INSTALL(FILES mysql.m4 DESTINATION ${INSTALL_SHAREDIR}/aclocal COMPONENT Development)
-+ENDIF()
-   
-   SET(bindir ${prefix}/${INSTALL_BINDIR})
-   SET(sbindir ${prefix}/${INSTALL_SBINDIR})
diff --git a/databases/percona57-server/files/patch-vio_viosocket.c b/databases/percona57-server/files/patch-vio_viosocket.c
deleted file mode 100644
index c03e19e9e86c..000000000000
--- a/databases/percona57-server/files/patch-vio_viosocket.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- vio/viosocket.c.orig	2016-11-27 19:44:54 UTC
-+++ vio/viosocket.c
-@@ -45,6 +45,10 @@
- static void (*before_io_wait)(void)= 0;
- static void (*after_io_wait)(void)= 0;
- 
-+#ifdef __FreeBSD__
-+#define s6_addr32 __u6_addr.__u6_addr32
-+#endif
-+
- /* Wait callback macros (both performance schema and threadpool */
- #define START_SOCKET_WAIT(locker, state_ptr, sock, which, timeout) \
- do                                                                 \
diff --git a/databases/percona57-server/files/patch-vio_viossl.c b/databases/percona57-server/files/patch-vio_viossl.c
deleted file mode 100644
index 39bcb6b765b5..000000000000
--- a/databases/percona57-server/files/patch-vio_viossl.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- vio/viossl.c.orig	2020-05-13 20:59:55 UTC
-+++ vio/viossl.c
-@@ -396,7 +396,7 @@ static int ssl_do(struct st_VioSSLFd *ptr, Vio *vio,
- #if !defined(DBUG_OFF)
-   {
-     STACK_OF(SSL_COMP) *ssl_comp_methods = NULL;
--    ssl_comp_methods = SSL_COMP_get_compression_methods();
-+    ssl_comp_methods = (STACK_OF(SSL_COMP) *)SSL_COMP_get_compression_methods();
-     n= sk_SSL_COMP_num(ssl_comp_methods);
-     DBUG_PRINT("info", ("Available compression methods:\n"));
-     if (n == 0)
-@@ -405,7 +405,7 @@ static int ssl_do(struct st_VioSSLFd *ptr, Vio *vio,
-       for (j = 0; j < n; j++)
-       {
-         SSL_COMP *c = sk_SSL_COMP_value(ssl_comp_methods, j);
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-         DBUG_PRINT("info", ("  %d: %s\n", c->id, c->name));
- #else /* OPENSSL_VERSION_NUMBER < 0x10100000L */
-         DBUG_PRINT("info", ("  %d: %s\n", SSL_COMP_get_id(c), SSL_COMP_get0_name(c)));
diff --git a/databases/percona57-server/files/patch-vio_viosslfactories.c b/databases/percona57-server/files/patch-vio_viosslfactories.c
deleted file mode 100644
index b37d41d49108..000000000000
--- a/databases/percona57-server/files/patch-vio_viosslfactories.c
+++ /dev/null
@@ -1,45 +0,0 @@
---- vio/viosslfactories.c.orig	2020-05-13 20:59:55 UTC
-+++ vio/viosslfactories.c
-@@ -126,7 +126,7 @@ static DH *get_dh2048(void)
-   {
-     BIGNUM* p= BN_bin2bn(dh2048_p,sizeof(dh2048_p),NULL);
-     BIGNUM* g= BN_bin2bn(dh2048_g,sizeof(dh2048_g),NULL);
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-     dh->p= p;
-     dh->g= g;
-     if (! dh->p || ! dh->g)
-@@ -500,7 +500,7 @@ new_VioSSLFd(const char *key_file, const char *cert_fi
-   struct st_VioSSLFd *ssl_fd;
-   /* MySQL 5.7 supports TLS up to v1.2, explicitly disable TLSv1.3. */
-   long ssl_ctx_options= SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3
--#ifdef HAVE_TLSv13
-+#if defined(HAVE_TLSv13) && !defined(LIBRESSL_VERSION_NUMBER)
-                         | SSL_OP_NO_TLSv1_3
- #endif /* HAVE_TLSv13 */
-                         ;
-@@ -536,7 +536,7 @@ new_VioSSLFd(const char *key_file, const char *cert_fi
-                     SSL_OP_NO_TLSv1 |
-                     SSL_OP_NO_TLSv1_1
-                     | SSL_OP_NO_TLSv1_2
--#ifdef HAVE_TLSv13
-+#if defined(HAVE_TLSv13) && !defined(LIBRESSL_VERSION_NUMBER)
-                     | SSL_OP_NO_TLSv1_3
- #endif /* HAVE_TLSv13 */
-                     | SSL_OP_NO_TICKET
-@@ -557,6 +557,7 @@ new_VioSSLFd(const char *key_file, const char *cert_fi
-     DBUG_RETURN(0);
-   }
- 
-+#ifndef LIBRESSL_VERSION_NUMBER
-   SSL_CTX_set_options(ssl_fd->ssl_context, ssl_ctx_options);
- 
- #ifdef HAVE_TLSv13
-@@ -573,6 +574,7 @@ new_VioSSLFd(const char *key_file, const char *cert_fi
-     DBUG_RETURN(0);
-   }
- #endif /* HAVE_TLSv13 */
-+#endif /* LIBRESSL_VERSION_NUMBER */
- 
-   /*
-     We explicitly prohibit weak ciphers.
diff --git a/databases/percona57-server/pkg-descr b/databases/percona57-server/pkg-descr
deleted file mode 100644
index cb5d1681d1bb..000000000000
--- a/databases/percona57-server/pkg-descr
+++ /dev/null
@@ -1,4 +0,0 @@
-MySQL replacement : Percona ServerPercona Server is a drop-in alternative
-for MySQL with enhanced performance and enterprise-grade features.
-
-WWW: http://www.percona.com/software/percona-server
diff --git a/databases/percona57-server/pkg-message b/databases/percona57-server/pkg-message
deleted file mode 100644
index c6e5d3df8100..000000000000
--- a/databases/percona57-server/pkg-message
+++ /dev/null
@@ -1,15 +0,0 @@
-[
-{ type: install
-  message: <<EOM
-Initial password for first time use of MySQL is saved in $HOME/.mysql_secret
-ie. when you want to use "mysql -u root -p" first you should see password
-in /root/.mysql_secret
-EOM
-}
-{ type: upgrade
-  message: <<EOM
-Remember to run mysql_upgrade the first time you start the MySQL server
-after an upgrade from an earlier version.
-EOM
-}
-]
diff --git a/databases/percona57-server/pkg-plist b/databases/percona57-server/pkg-plist
deleted file mode 100644
index c891a5017afa..000000000000
--- a/databases/percona57-server/pkg-plist
+++ /dev/null
@@ -1,187 +0,0 @@
-bin/innochecksum
-bin/lz4_decompress
-bin/myisamchk
-bin/myisam_ftdump
-bin/myisamlog
-bin/myisampack
-bin/my_print_defaults
-bin/mysqld_multi
-bin/mysqld_safe
-bin/mysqldumpslow
-bin/mysql_install_db
-bin/mysql_plugin
-bin/mysqltest
-bin/mysql_tzinfo_to_sql
-bin/mysql_upgrade
-bin/mysqlxtest
-bin/perror
-bin/ps-admin
-bin/ps_mysqld_helper
-bin/ps_tokudb_admin
-bin/replace
-bin/resolveip
-bin/resolve_stack_dump
-bin/zlib_decompress
-%%DATADIR%%/bulgarian/errmsg.sys
-%%DATADIR%%/charsets/armscii8.xml
-%%DATADIR%%/charsets/ascii.xml
-%%DATADIR%%/charsets/cp1250.xml
-%%DATADIR%%/charsets/cp1251.xml
-%%DATADIR%%/charsets/cp1256.xml
-%%DATADIR%%/charsets/cp1257.xml
-%%DATADIR%%/charsets/cp850.xml
-%%DATADIR%%/charsets/cp852.xml
-%%DATADIR%%/charsets/cp866.xml
-%%DATADIR%%/charsets/dec8.xml
-%%DATADIR%%/charsets/geostd8.xml
-%%DATADIR%%/charsets/greek.xml
-%%DATADIR%%/charsets/hebrew.xml
-%%DATADIR%%/charsets/hp8.xml
-%%DATADIR%%/charsets/Index.xml
-%%DATADIR%%/charsets/keybcs2.xml
-%%DATADIR%%/charsets/koi8r.xml
-%%DATADIR%%/charsets/koi8u.xml
-%%DATADIR%%/charsets/latin1.xml
-%%DATADIR%%/charsets/latin2.xml
-%%DATADIR%%/charsets/latin5.xml
-%%DATADIR%%/charsets/latin7.xml
-%%DATADIR%%/charsets/macce.xml
-%%DATADIR%%/charsets/macroman.xml
-%%DATADIR%%/charsets/README
-%%DATADIR%%/charsets/swe7.xml
-%%DATADIR%%/czech/errmsg.sys
-%%DATADIR%%/danish/errmsg.sys
-%%DATADIR%%/dictionary.txt
-%%DATADIR%%/dutch/errmsg.sys
-%%DATADIR%%/english/errmsg.sys
-%%DATADIR%%/errmsg-utf8.txt
-%%DATADIR%%/estonian/errmsg.sys
-%%DATADIR%%/fill_help_tables.sql
-%%DATADIR%%/french/errmsg.sys
-%%DATADIR%%/german/errmsg.sys
-%%DATADIR%%/greek/errmsg.sys
-%%DATADIR%%/hungarian/errmsg.sys
-%%DATADIR%%/innodb_memcached_config.sql
-%%DATADIR%%/install_rewriter.sql
-%%DATADIR%%/italian/errmsg.sys
-%%DATADIR%%/japanese/errmsg.sys
-%%DATADIR%%/korean/errmsg.sys
-%%DATADIR%%/magic
-%%DATADIR%%/mysqld_multi.server
-%%DATADIR%%/mysql-log-rotate
-%%DATADIR%%/mysql_security_commands.sql
-%%DATADIR%%/mysql.server
-%%DATADIR%%/mysql_sys_schema.sql
-%%DATADIR%%/mysql_system_tables_data.sql
-%%DATADIR%%/mysql_system_tables.sql
-%%DATADIR%%/mysql_test_data_timezone.sql
-%%DATADIR%%/norwegian/errmsg.sys
-%%DATADIR%%/norwegian-ny/errmsg.sys
-%%DATADIR%%/polish/errmsg.sys
-%%DATADIR%%/portuguese/errmsg.sys
-%%DATADIR%%/romanian/errmsg.sys
-%%DATADIR%%/russian/errmsg.sys
-%%DATADIR%%/serbian/errmsg.sys
-%%DATADIR%%/slovak/errmsg.sys
-%%DATADIR%%/spanish/errmsg.sys
-%%DATADIR%%/swedish/errmsg.sys
-%%DATADIR%%/ukrainian/errmsg.sys
-%%DATADIR%%/uninstall_rewriter.sql
-include/mysql/mysqlx_ername.h
-include/mysql/mysqlx_error.h
-include/mysql/mysqlx_version.h
-@dir(mysql,mysql,) /var/db/mysql
-%%INNODBMEMCACHED%%lib/mysql/plugin/innodb_engine.so
-%%INNODBMEMCACHED%%lib/mysql/plugin/libmemcached.so
-libexec/mysqld
-lib/mysql/libmysqld.a
-lib/mysql/plugin/adt_null.so
-lib/mysql/plugin/audit_log.so
-lib/mysql/plugin/auth.so
-lib/mysql/plugin/auth_test_plugin.so
-lib/mysql/plugin/connection_control.so
-lib/mysql/plugin/daemon_example.ini
-lib/mysql/plugin/data_masking.ini
-lib/mysql/plugin/data_masking.so
-lib/mysql/plugin/group_replication.so
-lib/mysql/plugin/ha_example.so
-lib/mysql/plugin/keyring_file.so
-lib/mysql/plugin/keyring_udf.so
-lib/mysql/plugin/keyring_vault.so
-lib/mysql/plugin/libdaemon_example.so
-lib/mysql/plugin/libfnv1a_udf.so
-lib/mysql/plugin/libfnv_udf.so
-lib/mysql/plugin/libmurmur_udf.so
-lib/mysql/plugin/libtest_framework.so
-lib/mysql/plugin/libtest_services.so
-lib/mysql/plugin/libtest_services_threaded.so
-lib/mysql/plugin/libtest_session_detach.so
-lib/mysql/plugin/libtest_session_info.so
-lib/mysql/plugin/libtest_session_in_thd.so
-lib/mysql/plugin/libtest_sql_2_sessions.so
-lib/mysql/plugin/libtest_sql_all_col_types.so
-lib/mysql/plugin/libtest_sql_cmds_1.so
-lib/mysql/plugin/libtest_sql_commit.so
-lib/mysql/plugin/libtest_sql_complex.so
-lib/mysql/plugin/libtest_sql_errors.so
-lib/mysql/plugin/libtest_sql_lock.so
-lib/mysql/plugin/libtest_sql_processlist.so
-lib/mysql/plugin/libtest_sql_replication.so
-lib/mysql/plugin/libtest_sql_shutdown.so
-lib/mysql/plugin/libtest_sql_sqlmode.so
-lib/mysql/plugin/libtest_sql_stored_procedures_functions.so
-lib/mysql/plugin/libtest_sql_views_triggers.so
-lib/mysql/plugin/libtest_x_sessions_deinit.so
-lib/mysql/plugin/libtest_x_sessions_init.so
-lib/mysql/plugin/locking_service.so
-lib/mysql/plugin/mypluglib.so
-lib/mysql/plugin/mysql_no_login.so
-lib/mysql/plugin/mysqlx.so
-lib/mysql/plugin/qa_auth_client.so
-lib/mysql/plugin/qa_auth_interface.so
-lib/mysql/plugin/qa_auth_server.so
-lib/mysql/plugin/query_response_time.so
-lib/mysql/plugin/replication_observers_example_plugin.so
-lib/mysql/plugin/rewrite_example.so
-lib/mysql/plugin/rewriter.so
-lib/mysql/plugin/semisync_master.so
-lib/mysql/plugin/semisync_slave.so
-lib/mysql/plugin/test_security_context.so
-lib/mysql/plugin/test_udf_services.so
-lib/mysql/plugin/udf_example.so
-lib/mysql/plugin/validate_password.so
-lib/mysql/plugin/version_token.so
-man/man1/myisamchk.1.gz
-man/man1/myisam_ftdump.1.gz
-man/man1/myisamlog.1.gz
-man/man1/myisampack.1.gz
-man/man1/my_print_defaults.1.gz
-man/man1/mysqld_multi.1.gz
-man/man1/mysqld_safe.1.gz
-man/man1/mysqldumpslow.1.gz
-man/man1/mysql_install_db.1.gz
-man/man1/mysqlman.1.gz
-man/man1/mysql_plugin.1.gz
-man/man1/mysql_secure_installation.1.gz
-man/man1/mysql.server.1.gz
-man/man1/mysql_tzinfo_to_sql.1.gz
-man/man1/mysql_upgrade.1.gz
-man/man1/perror.1.gz
-man/man1/replace.1.gz
-man/man1/resolveip.1.gz
-man/man1/resolve_stack_dump.1.gz
-man/man8/mysqld.8.gz
-%%TOKUDB%%bin/tokuftdump
-%%TOKUDB%%bin/tokuft_logprint
-%%TOKUDB%%include/backup.h
-%%TOKUDB%%lib/mysql/libHotBackup.so
-%%TOKUDB%%lib/mysql/plugin/ha_tokudb.so
-%%TOKUDB%%lib/mysql/plugin/tokudb_backup.so
-%%TOKUDB%%share/doc/mysql/COPYING.AGPLv3
-%%TOKUDB%%share/doc/mysql/COPYING.GPLv2
-%%TOKUDB%%share/doc/mysql/PATENTS
-%%TOKUDB%%share/doc/mysql/README.md
-%%TOKUDB%%share/doc/mysql/README_tokudb_backup
-@dir(mysql,mysql,0750) %%ETCDIR%%/keyring
-@dir(mysql,mysql,0750) %%MY_SECDIR%%  
-@dir(mysql,mysql,0750) %%MY_TMPDIR%%
diff --git a/databases/pg-gvm/Makefile b/databases/pg-gvm/Makefile
new file mode 100644
index 000000000000..930a5065903a
--- /dev/null
+++ b/databases/pg-gvm/Makefile
@@ -0,0 +1,26 @@
+PORTNAME=	pg-gvm
+DISTVERSION=	22.6.4
+DISTVERSIONPREFIX=v
+CATEGORIES=	databases devel
+
+MAINTAINER=	acm@FreeBSD.org
+COMMENT=	Greenbone Library for helper functions in PostgreSQL
+WWW=		https://github.com/greenbone/pg-gvm
+
+LICENSE=	GPLv3
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
+LIB_DEPENDS=	libgvm_base.so:security/gvm-libs \
+		libical.so:devel/libical
+
+USES=		cmake gnome pkgconfig pgsql
+USE_GNOME=	glib20
+
+USE_GITHUB=	yes
+GH_ACCOUNT=	greenbone
+GH_PROJECT=	pg-gvm
+
+post-patch:
+	@${REINPLACE_CMD} -e 's|find -type f|find * -type f|g' ${WRKSRC}/CMakeLists.txt
+
+.include <bsd.port.mk>
diff --git a/databases/pg-gvm/distinfo b/databases/pg-gvm/distinfo
new file mode 100644
index 000000000000..d360a08ceabf
--- /dev/null
+++ b/databases/pg-gvm/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1706304450
+SHA256 (greenbone-pg-gvm-v22.6.4_GH0.tar.gz) = a39abbc320694502ec79e6c7a8c3c867affbae379fdf1bdc6055eba0e1242e31
+SIZE (greenbone-pg-gvm-v22.6.4_GH0.tar.gz) = 39702
diff --git a/databases/pg-gvm/pkg-descr b/databases/pg-gvm/pkg-descr
new file mode 100644
index 000000000000..7578472f186f
--- /dev/null
+++ b/databases/pg-gvm/pkg-descr
@@ -0,0 +1,2 @@
+Greenbone Library for helper functions in PostgreSQL. This library contains
+functionality for ical object manipulation.
diff --git a/databases/pg-gvm/pkg-plist b/databases/pg-gvm/pkg-plist
new file mode 100644
index 000000000000..d14524a07c56
--- /dev/null
+++ b/databases/pg-gvm/pkg-plist
@@ -0,0 +1,7 @@
+lib/postgresql/libpg-gvm.so
+share/postgresql/extension/pg-gvm--1.0--1.1.sql
+share/postgresql/extension/pg-gvm--1.1--22.4.0.sql
+share/postgresql/extension/pg-gvm--22.4.0--22.5.sql
+share/postgresql/extension/pg-gvm--22.5--22.6.sql
+share/postgresql/extension/pg-gvm--22.6.sql
+share/postgresql/extension/pg-gvm.control
diff --git a/databases/pg.el/Makefile b/databases/pg.el/Makefile
index a42761e3ebae..8483ca38bda0 100644
--- a/databases/pg.el/Makefile
+++ b/databases/pg.el/Makefile
@@ -1,25 +1,29 @@
 PORTNAME=	pg.el
-DISTVERSION=	0.13
+DISTVERSIONPREFIX=	v
+DISTVERSION=	0.32
 CATEGORIES=	databases elisp
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
-MAINTAINER=	yasu@utahime.org
+MAINTAINER=	yasu@FreeBSD.org
 COMMENT=	PostgreSQL Elisp interface
+WWW=		https://github.com/emarsden/pg-el
 
 LICENSE=	GPLv2+
 
 USES=		emacs
 
 USE_GITHUB=	yes
-GH_ACCOUNT=	cbbrowne
-GH_TAGNAME=	4f6516e
+GH_ACCOUNT=	emarsden
+GH_PROJECT=	pg-el
+
+CONFLICTS_INSTALL=	pg.el pg.el-emacs_* # share/doc/pg.el/README
 
 NO_ARCH=	yes
 
 PLIST_FILES=	${EMACS_VERSION_SITE_LISPDIR}/pg.el \
 		${EMACS_VERSION_SITE_LISPDIR}/pg.elc
 
-PORTDOCS=	README
+PORTDOCS=	CHANGELOG.md README.md
 
 OPTIONS_DEFINE=	DOCS
 
@@ -34,6 +38,6 @@ do-install:
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:C/^/${WRKSRC}\//g} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/databases/pg.el/distinfo b/databases/pg.el/distinfo
index 95f6ff3bd11f..8e0014bf0ca9 100644
--- a/databases/pg.el/distinfo
+++ b/databases/pg.el/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1621273465
-SHA256 (cbbrowne-pg.el-0.13-4f6516e_GH0.tar.gz) = d040b0783c4700bd07b8cea803fb1da6e202979acbeeeea127cbe17784eafa6e
-SIZE (cbbrowne-pg.el-0.13-4f6516e_GH0.tar.gz) = 15299
+TIMESTAMP = 1713666122
+SHA256 (emarsden-pg-el-v0.32_GH0.tar.gz) = 7f19ea280fb3e4480e907cd079cc40ceef96ce8b385050f5cc1397064b2b532d
+SIZE (emarsden-pg-el-v0.32_GH0.tar.gz) = 86495
diff --git a/databases/pg.el/pkg-descr b/databases/pg.el/pkg-descr
index a5a87c95b434..b063bd1f6612 100644
--- a/databases/pg.el/pkg-descr
+++ b/databases/pg.el/pkg-descr
@@ -5,5 +5,3 @@ Emacs, using its socket-level frontend/backend protocol. The module is
 capable of automatic type coercions from a range of SQL types to the
 equivalent Emacs Lisp type. This is a low level API, and won't be
 useful to end users.
-
-WWW: https://github.com/cbbrowne/pg.el
diff --git a/databases/pgFormatter/Makefile b/databases/pgFormatter/Makefile
index 2b648c9a8581..bf6f04b2577d 100644
--- a/databases/pgFormatter/Makefile
+++ b/databases/pgFormatter/Makefile
@@ -1,12 +1,11 @@
-# Created by: Jov amutu@amutu.com
-
 PORTNAME=	pgFormatter
-PORTVERSION=	5.0
+PORTVERSION=	5.5
 DISTVERSIONPREFIX=	v
 CATEGORIES=	databases
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	PostgreSQL SQL syntax beautifier
+WWW=		https://github.com/darold/pgFormatter
 
 LICENSE=	PostgreSQL
 LICENSE_FILE=	${WRKSRC}/LICENSE
diff --git a/databases/pgFormatter/distinfo b/databases/pgFormatter/distinfo
index 9012703dc58d..ea3e17d4c6cf 100644
--- a/databases/pgFormatter/distinfo
+++ b/databases/pgFormatter/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1613478311
-SHA256 (darold-pgFormatter-v5.0_GH0.tar.gz) = 1bb5b2e2b4ca27789d617456e1a0301a0c2e3c4a32f93ccbf71bdf1ff0219217
-SIZE (darold-pgFormatter-v5.0_GH0.tar.gz) = 1311094
+TIMESTAMP = 1677770997
+SHA256 (darold-pgFormatter-v5.5_GH0.tar.gz) = 8ed79247afe41c145f6c5f3fa82d714e5fd4a9c20b5af0e1c817318f73fc7894
+SIZE (darold-pgFormatter-v5.5_GH0.tar.gz) = 1323353
diff --git a/databases/pgFormatter/pkg-descr b/databases/pgFormatter/pkg-descr
index 00b8fa28f4fa..a32118c3a202 100644
--- a/databases/pgFormatter/pkg-descr
+++ b/databases/pgFormatter/pkg-descr
@@ -6,5 +6,3 @@ pgFormatter can work as a console program or as a CGI. It will automatically
 detect his environment and output as text or as HTML following the context.
 
 Keywords highlighting will only be available in CGI context.
-
-WWW: https://github.com/darold/pgFormatter
diff --git a/databases/pg_activity/Makefile b/databases/pg_activity/Makefile
index 6649945dddbd..0884690dbdc1 100644
--- a/databases/pg_activity/Makefile
+++ b/databases/pg_activity/Makefile
@@ -1,30 +1,31 @@
-# Created by: Jason Helfman <jgh@FreeBSD.org>
-
 PORTNAME=	pg_activity
-PORTVERSION=	1.5.0
+PORTVERSION=	3.5.1
 DISTVERSIONPREFIX=	v
 CATEGORIES=	databases python
 
 MAINTAINER=	pgsql@FreeBSD.org
 COMMENT=	Htop like application for PostgreSQL server activity monitoring
+WWW=		https://github.com/dalibo/pg_activity
 
-LICENSE=	BSD3CLAUSE
+LICENSE=	PostgreSQL
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}psycopg2>=0:databases/py-psycopg2@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}psutil>=0:sysutils/py-psutil@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}psutil>=0:sysutils/py-psutil@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}blessed>=0:devel/py-blessed@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}attrs>=20.1.0:devel/py-attrs@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}humanize>=0:devel/py-humanize@${PY_FLAVOR}
 
-USES=		python:3.6+
+USES=		python
 
 OPTIONS_DEFINE=	DOCS
 
 USE_GITHUB=	yes
-GH_ACCOUNT=	julmon
+GH_ACCOUNT=	dalibo
 
 USE_PYTHON=	autoplist distutils noegginfo concurrent optsuffix
-PYDISTUTILS_INSTALLARGS=	--with-man
 
 post-patch:
-	${REINPLACE_CMD} -e 's|\/usr\/share|${MAN1PREFIX}|g' \
+	${REINPLACE_CMD} -e 's|\/usr\/share|${PREFIX}/share|g' \
 		${WRKSRC}/setup.py
 
 .include <bsd.port.mk>
diff --git a/databases/pg_activity/distinfo b/databases/pg_activity/distinfo
index 630ad583d6b2..285255bf1ff4 100644
--- a/databases/pg_activity/distinfo
+++ b/databases/pg_activity/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1565041543
-SHA256 (julmon-pg_activity-v1.5.0_GH0.tar.gz) = f27a8712591b8e1c0634f80b8c0724c1a62c88a5c52279e1545d1592745a0dd5
-SIZE (julmon-pg_activity-v1.5.0_GH0.tar.gz) = 92392
+TIMESTAMP = 1712151675
+SHA256 (dalibo-pg_activity-v3.5.1_GH0.tar.gz) = e74b4a6c9fe20c33fac00c97d0239c3e268f77f640b2fd3c6fec222f377acd61
+SIZE (dalibo-pg_activity-v3.5.1_GH0.tar.gz) = 436863
diff --git a/databases/pg_activity/files/patch-setup.py b/databases/pg_activity/files/patch-setup.py
deleted file mode 100644
index 138bf0a6545d..000000000000
--- a/databases/pg_activity/files/patch-setup.py
+++ /dev/null
@@ -1,8 +0,0 @@
---- setup.py.orig	2016-10-04 13:50:12 UTC
-+++ setup.py
-@@ -26,4 +26,5 @@ setup(
-         "psycopg2 >= 2.2.1",
-     ],
-     data_files = data_files,
-+    zip_safe=False,
- )
diff --git a/databases/pg_activity/pkg-descr b/databases/pg_activity/pkg-descr
index 7f13afa8d352..b1742ed4bb17 100644
--- a/databases/pg_activity/pkg-descr
+++ b/databases/pg_activity/pkg-descr
@@ -1,3 +1 @@
 Top like utility for PostgreSQL activity monitoring
-
-WWW: https://github.com/julmon/pg_activity
diff --git a/databases/pg_citus/Makefile b/databases/pg_citus/Makefile
index d68f007510fc..39d88b5e47f3 100644
--- a/databases/pg_citus/Makefile
+++ b/databases/pg_citus/Makefile
@@ -1,17 +1,17 @@
-# Created by: Matthew Seaman
-
 PORTNAME=	citus
-PORTVERSION=	10.1.2
+PORTVERSION=	12.1.2
 DISTVERSIONPREFIX=	v
 CATEGORIES=	databases
 PKGNAMEPREFIX=	pg_
 
 MAINTAINER=	matthew@FreeBSD.org
 COMMENT=	Horizontally scale Postgresql using sharding and replication
+WWW=		https://www.citusdata.com/
 
 LICENSE=	AGPLv3
 
-USES=		compiler:c11 gmake pgsql:12+ autoreconf readline ssl
+USES=		compiler:c11 gmake pgsql:14+ autoreconf readline ssl \
+		gettext-runtime
 
 LIB_DEPENDS=	liblz4.so:archivers/liblz4 \
 		libzstd.so:archivers/zstd
diff --git a/databases/pg_citus/distinfo b/databases/pg_citus/distinfo
index c8f6ed08dda9..fb5bcea1519e 100644
--- a/databases/pg_citus/distinfo
+++ b/databases/pg_citus/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1629196977
-SHA256 (citusdata-citus-v10.1.2_GH0.tar.gz) = cade8cfb842bac1b7522ed92f668293a316d0d3a383cca27ed7e9ef16be641d6
-SIZE (citusdata-citus-v10.1.2_GH0.tar.gz) = 5280795
+TIMESTAMP = 1709021068
+SHA256 (citusdata-citus-v12.1.2_GH0.tar.gz) = 61d959e8129df4613186841550ea29afb9348a7e6f871d5b5df4866777b82e24
+SIZE (citusdata-citus-v12.1.2_GH0.tar.gz) = 6897486
diff --git a/databases/pg_citus/files/patch-src_backend_distributed_commands_multi__copy.c b/databases/pg_citus/files/patch-src_backend_distributed_commands_multi__copy.c
index 790a9981cf97..01041d008b54 100644
--- a/databases/pg_citus/files/patch-src_backend_distributed_commands_multi__copy.c
+++ b/databases/pg_citus/files/patch-src_backend_distributed_commands_multi__copy.c
@@ -1,6 +1,6 @@
---- src/backend/distributed/commands/multi_copy.c.orig	2021-03-09 08:26:53 UTC
+--- src/backend/distributed/commands/multi_copy.c.orig	2023-02-03 08:13:35 UTC
 +++ src/backend/distributed/commands/multi_copy.c
-@@ -53,6 +53,7 @@
+@@ -50,6 +50,7 @@
  
  #include <arpa/inet.h> /* for htons */
  #include <netinet/in.h> /* for htons */
diff --git a/databases/pg_citus/pkg-descr b/databases/pg_citus/pkg-descr
index 949e9946f126..c53197f4e77d 100644
--- a/databases/pg_citus/pkg-descr
+++ b/databases/pg_citus/pkg-descr
@@ -9,5 +9,3 @@ Citus horizontally scales PostgreSQL across commodity servers using
 sharding and replication. Its query engine parallelizes incoming SQL
 queries across these servers to enable real-time responses on large
 datasets.
-
-WWW: https://www.citusdata.com/
diff --git a/databases/pg_citus/pkg-plist b/databases/pg_citus/pkg-plist
index 6400cc67cf94..6ea8fa811edc 100644
--- a/databases/pg_citus/pkg-plist
+++ b/databases/pg_citus/pkg-plist
@@ -2,10 +2,13 @@ include/postgresql/server/citus_version.h
 include/postgresql/server/distributed/adaptive_executor.h
 include/postgresql/server/distributed/argutils.h
 include/postgresql/server/distributed/backend_data.h
+include/postgresql/server/distributed/background_jobs.h
 include/postgresql/server/distributed/cancel_utils.h
+include/postgresql/server/distributed/causal_clock.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_depended_object.h
 include/postgresql/server/distributed/citus_nodefuncs.h
 include/postgresql/server/distributed/citus_nodes.h
 include/postgresql/server/distributed/citus_ruleutils.h
@@ -26,6 +29,7 @@ include/postgresql/server/distributed/distribution_column.h
 include/postgresql/server/distributed/enterprise.h
 include/postgresql/server/distributed/error_codes.h
 include/postgresql/server/distributed/errormessage.h
+include/postgresql/server/distributed/executor_util.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
@@ -35,6 +39,7 @@ include/postgresql/server/distributed/insert_select_executor.h
 include/postgresql/server/distributed/insert_select_planner.h
 include/postgresql/server/distributed/intermediate_result_pruning.h
 include/postgresql/server/distributed/intermediate_results.h
+include/postgresql/server/distributed/jsonbutils.h
 include/postgresql/server/distributed/listutils.h
 include/postgresql/server/distributed/local_distributed_join_planner.h
 include/postgresql/server/distributed/local_executor.h
@@ -45,21 +50,28 @@ include/postgresql/server/distributed/lock_graph.h
 include/postgresql/server/distributed/log_utils.h
 include/postgresql/server/distributed/maintenanced.h
 include/postgresql/server/distributed/memutils.h
+include/postgresql/server/distributed/merge_executor.h
+include/postgresql/server/distributed/merge_planner.h
 include/postgresql/server/distributed/metadata_cache.h
 include/postgresql/server/distributed/metadata_sync.h
 include/postgresql/server/distributed/metadata_utility.h
-include/postgresql/server/distributed/multi_client_executor.h
 include/postgresql/server/distributed/multi_executor.h
 include/postgresql/server/distributed/multi_explain.h
 include/postgresql/server/distributed/multi_join_order.h
 include/postgresql/server/distributed/multi_logical_optimizer.h
 include/postgresql/server/distributed/multi_logical_planner.h
+include/postgresql/server/distributed/multi_logical_replication.h
 include/postgresql/server/distributed/multi_partitioning_utils.h
 include/postgresql/server/distributed/multi_physical_planner.h
 include/postgresql/server/distributed/multi_progress.h
 include/postgresql/server/distributed/multi_router_planner.h
 include/postgresql/server/distributed/multi_server_executor.h
 include/postgresql/server/distributed/namespace_utils.h
+include/postgresql/server/distributed/param_utils.h
+include/postgresql/server/distributed/pg_dist_background_job.h
+include/postgresql/server/distributed/pg_dist_background_task.h
+include/postgresql/server/distributed/pg_dist_backrgound_task_depend.h
+include/postgresql/server/distributed/pg_dist_cleanup.h
 include/postgresql/server/distributed/pg_dist_colocation.h
 include/postgresql/server/distributed/pg_dist_local_group.h
 include/postgresql/server/distributed/pg_dist_node.h
@@ -67,11 +79,13 @@ include/postgresql/server/distributed/pg_dist_node_metadata.h
 include/postgresql/server/distributed/pg_dist_partition.h
 include/postgresql/server/distributed/pg_dist_placement.h
 include/postgresql/server/distributed/pg_dist_rebalance_strategy.h
+include/postgresql/server/distributed/pg_dist_schema.h
 include/postgresql/server/distributed/pg_dist_shard.h
 include/postgresql/server/distributed/pg_dist_transaction.h
 include/postgresql/server/distributed/pg_version_constants.h
 include/postgresql/server/distributed/placement_access.h
 include/postgresql/server/distributed/placement_connection.h
+include/postgresql/server/distributed/priority.h
 include/postgresql/server/distributed/query_colocation_checker.h
 include/postgresql/server/distributed/query_pushdown_planning.h
 include/postgresql/server/distributed/query_stats.h
@@ -84,15 +98,21 @@ 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_executor.h
 include/postgresql/server/distributed/repartition_join_execution.h
+include/postgresql/server/distributed/replicate_none_dist_table_shard.h
+include/postgresql/server/distributed/replication_origin_session_utils.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_split.h
+include/postgresql/server/distributed/shard_transfer.h
 include/postgresql/server/distributed/shard_utils.h
 include/postgresql/server/distributed/shardinterval_utils.h
+include/postgresql/server/distributed/shardsplit_logical_replication.h
+include/postgresql/server/distributed/shardsplit_shared_memory.h
 include/postgresql/server/distributed/shared_connection_stats.h
 include/postgresql/server/distributed/shared_library_init.h
 include/postgresql/server/distributed/statistics_collection.h
@@ -100,6 +120,7 @@ include/postgresql/server/distributed/string_utils.h
 include/postgresql/server/distributed/subplan_execution.h
 include/postgresql/server/distributed/task_execution_utils.h
 include/postgresql/server/distributed/tdigest_extension.h
+include/postgresql/server/distributed/tenant_schema_metadata.h
 include/postgresql/server/distributed/time_constants.h
 include/postgresql/server/distributed/transaction_identifier.h
 include/postgresql/server/distributed/transaction_management.h
@@ -107,18 +128,43 @@ include/postgresql/server/distributed/transaction_recovery.h
 include/postgresql/server/distributed/transmit.h
 include/postgresql/server/distributed/tuple_destination.h
 include/postgresql/server/distributed/tuplestore.h
+include/postgresql/server/distributed/type_utils.h
 include/postgresql/server/distributed/version_compat.h
 include/postgresql/server/distributed/worker_create_or_replace.h
 include/postgresql/server/distributed/worker_log_messages.h
 include/postgresql/server/distributed/worker_manager.h
 include/postgresql/server/distributed/worker_protocol.h
+include/postgresql/server/distributed/worker_shard_copy.h
 include/postgresql/server/distributed/worker_shard_visibility.h
 include/postgresql/server/distributed/worker_transaction.h
 lib/postgresql/citus.so
+lib/postgresql/citus_columnar.so
+lib/postgresql/citus_decoders/pgoutput.so
+lib/postgresql/citus_decoders/wal2json.so
+lib/postgresql/citus_pgoutput.so
+lib/postgresql/citus_wal2json.so
 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--10.2-2--10.2-3.sql
+share/postgresql/extension/citus--10.2-3--10.2-4.sql
+share/postgresql/extension/citus--10.2-4--10.2-5.sql
+share/postgresql/extension/citus--10.2-5--10.2-4.sql
+share/postgresql/extension/citus--10.2-5--11.0-1.sql
+share/postgresql/extension/citus--11.0-1--11.0-2.sql
+share/postgresql/extension/citus--11.0-2--11.0-3.sql
+share/postgresql/extension/citus--11.0-3--11.0-4.sql
+share/postgresql/extension/citus--11.0-4--11.0-3.sql
+share/postgresql/extension/citus--11.0-4--11.1-1.sql
+share/postgresql/extension/citus--11.1-1--11.2-1.sql
+share/postgresql/extension/citus--11.2-1--11.2-2.sql
+share/postgresql/extension/citus--11.2-2--11.3-1.sql
+share/postgresql/extension/citus--11.3-1--11.3-2.sql
+share/postgresql/extension/citus--11.3-2--12.0-1.sql
+share/postgresql/extension/citus--12.0-1--12.1-1.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
@@ -158,3 +204,18 @@ 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
+share/postgresql/extension/citus_columnar--11.1-0--11.1-1.sql
+share/postgresql/extension/citus_columnar--11.1-0.sql
+share/postgresql/extension/citus_columnar--11.1-1--11.2-1.sql
+share/postgresql/extension/citus_columnar--11.1-1.sql
+share/postgresql/extension/citus_columnar--11.2-1--11.3-1.sql
+share/postgresql/extension/citus_columnar.control
+share/postgresql/extension/columnar--10.0-1--10.0-2.sql
+share/postgresql/extension/columnar--10.0-3--10.1-1.sql
+share/postgresql/extension/columnar--10.1-1--10.2-1.sql
+share/postgresql/extension/columnar--10.2-1--10.2-2.sql
+share/postgresql/extension/columnar--10.2-2--10.2-3.sql
+share/postgresql/extension/columnar--10.2-3--10.2-4.sql
+share/postgresql/extension/columnar--11.0-2--11.0-3.sql
+share/postgresql/extension/columnar--11.0-3--11.1-1.sql
+share/postgresql/extension/columnar--9.5-1--10.0-1.sql
diff --git a/databases/pg_dirtyread/Makefile b/databases/pg_dirtyread/Makefile
index e753107b168a..6d3684a9198d 100644
--- a/databases/pg_dirtyread/Makefile
+++ b/databases/pg_dirtyread/Makefile
@@ -1,12 +1,11 @@
-# Created by: Jov <amutu@amutu.com>
-
 PORTNAME=	pg_dirtyread
-PORTVERSION=	2.3
+PORTVERSION=	2.6
 CATEGORIES=	databases
 PKGNAMEPREFIX=	postgresql${PGSQL_VER_NODOT}-
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Read dead but unvacuumed tuples from a PostgreSQL relation
+WWW=		https://github.com/df7cb/pg_dirtyread
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
diff --git a/databases/pg_dirtyread/distinfo b/databases/pg_dirtyread/distinfo
index d946126e24fc..1fd8e206f2f0 100644
--- a/databases/pg_dirtyread/distinfo
+++ b/databases/pg_dirtyread/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1608366104
-SHA256 (df7cb-pg_dirtyread-2.3_GH0.tar.gz) = fd866e50a55a2b310f112f2125763bdfb9de2efb93aa346fdf2b9cb2ceff298e
-SIZE (df7cb-pg_dirtyread-2.3_GH0.tar.gz) = 19342
+TIMESTAMP = 1701083344
+SHA256 (df7cb-pg_dirtyread-2.6_GH0.tar.gz) = a8ef0f29b6969e96465dc1f23aa4961451ec52d86ff882b2bc663e2ddff874d8
+SIZE (df7cb-pg_dirtyread-2.6_GH0.tar.gz) = 21137
diff --git a/databases/pg_dirtyread/pkg-descr b/databases/pg_dirtyread/pkg-descr
index 2ed5aab3f20e..5cd887149f53 100644
--- a/databases/pg_dirtyread/pkg-descr
+++ b/databases/pg_dirtyread/pkg-descr
@@ -1,4 +1,2 @@
 The pg_dirtyread extension provides the ability to read dead but unvacuumed rows
 from a relation.
-
-WWW: https://github.com/df7cb/pg_dirtyread
diff --git a/databases/pg_ed25519/Makefile b/databases/pg_ed25519/Makefile
index 2d572f3d5617..e4c4e38d1cbe 100644
--- a/databases/pg_ed25519/Makefile
+++ b/databases/pg_ed25519/Makefile
@@ -4,16 +4,17 @@ CATEGORIES=	databases
 
 MAINTAINER=	dmitry.wagin@ya.ru
 COMMENT=	PostgreSQL extension for ed25519 sign and verify
+WWW=		https://gitlab.com/dwagin/pg_ed25519
 
 LICENSE=	MIT
 
-USES=		gmake pgsql:9.4+
+USES=		gmake pgsql:11+
 LLD_UNSAFE=	yes
 WANT_PGSQL=	server
 
 USE_GITLAB=	yes
 GL_ACCOUNT=	dwagin
-GL_COMMIT=	203944dbd3444257490eb30d2f6363e391a23a6b
+GL_TAGNAME=	203944dbd3444257490eb30d2f6363e391a23a6b
 
 PLIST_FILES=	lib/postgresql/pg_ed25519.so \
 		share/postgresql/extension/pg_ed25519--${PORTVERSION}.sql \
diff --git a/databases/pg_ed25519/pkg-descr b/databases/pg_ed25519/pkg-descr
index b736d74375bf..dabbc65b95c3 100644
--- a/databases/pg_ed25519/pkg-descr
+++ b/databases/pg_ed25519/pkg-descr
@@ -1,3 +1 @@
 PostgreSQL extension for ed25519 sign and verify.
-
-WWW: https://gitlab.com/dwagin/pg_ed25519
diff --git a/databases/pg_filedump/Makefile b/databases/pg_filedump/Makefile
new file mode 100644
index 000000000000..a4b95f2b8f05
--- /dev/null
+++ b/databases/pg_filedump/Makefile
@@ -0,0 +1,22 @@
+PORTNAME=	pg_filedump
+DISTVERSIONPREFIX= REL_
+DISTVERSION=	16_0
+CATEGORIES=	databases
+
+MAINTAINER=	sunpoet@FreeBSD.org
+COMMENT=	Display formatted contents of a PostgreSQL heap, index, or control file
+WWW=		https://github.com/df7cb/pg_filedump
+
+LICENSE=	GPLv2+
+
+USES=		gmake pgsql
+
+MAKE_ARGS=	PG_LDFLAGS=-lintl
+WANT_PGSQL=	lib server
+
+PLIST_FILES=	bin/pg_filedump
+
+GH_ACCOUNT=	df7cb
+USE_GITHUB=	yes
+
+.include <bsd.port.mk>
diff --git a/databases/pg_filedump/distinfo b/databases/pg_filedump/distinfo
new file mode 100644
index 000000000000..4f944f05b085
--- /dev/null
+++ b/databases/pg_filedump/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1695143209
+SHA256 (df7cb-pg_filedump-REL_16_0_GH0.tar.gz) = 9ed1a30f719a5215ad5807c9094b987becc3ea6680979c20b874155c226075d7
+SIZE (df7cb-pg_filedump-REL_16_0_GH0.tar.gz) = 40518
diff --git a/databases/pg_filedump/pkg-descr b/databases/pg_filedump/pkg-descr
new file mode 100644
index 000000000000..6a84c88a4244
--- /dev/null
+++ b/databases/pg_filedump/pkg-descr
@@ -0,0 +1,15 @@
+pg_filedump is a utility to format PostgreSQL heap/index/control files into a
+human-readable form. You can format/dump the files several ways, as listed in
+the Invocation section, as well as dumping straight binary.
+
+The type of file (heap/index) can usually be determined automatically by the
+content of the blocks within the file. However, to format a pg_control file you
+must use the -c option.
+
+The default is to format the entire file using the block size listed in block 0
+and display block relative addresses. These defaults can be modified using
+run-time options.
+
+Some options may seem strange but they're there for a reason. For example, block
+size. It's there because if the header of block 0 is corrupt, you need a method
+of forcing a block size.
diff --git a/databases/pg_hashids/Makefile b/databases/pg_hashids/Makefile
index cde4b3d96e59..426cbd50a387 100644
--- a/databases/pg_hashids/Makefile
+++ b/databases/pg_hashids/Makefile
@@ -4,10 +4,11 @@ CATEGORIES=	databases
 
 MAINTAINER=	dmitry.wagin@ya.ru
 COMMENT=	PostgreSQL extension for generates short, unique, non-sequential ids from numbers
+WWW=		https://github.com/iCyberon/pg_hashids
 
 LICENSE=	MIT
 
-USES=		gmake pgsql:9.6+
+USES=		gmake pgsql:11+
 WANT_PGSQL=	server
 
 USE_GITHUB=	yes
diff --git a/databases/pg_hashids/pkg-descr b/databases/pg_hashids/pkg-descr
index d826ad8d39d9..7887e40b0a5a 100644
--- a/databases/pg_hashids/pkg-descr
+++ b/databases/pg_hashids/pkg-descr
@@ -1,4 +1,2 @@
 PostgreSQL extension for generates short, unique,
 non-sequential ids from numbers.
-
-WWW: https://github.com/iCyberon/pg_hashids
diff --git a/databases/pg_partman/Makefile b/databases/pg_partman/Makefile
index 25a8bb4c6da0..32224873b7ec 100644
--- a/databases/pg_partman/Makefile
+++ b/databases/pg_partman/Makefile
@@ -1,18 +1,19 @@
 PORTNAME=	pg_partman
 DISTVERSIONPREFIX=	v
-DISTVERSION=	4.5.1
+DISTVERSION=	4.6.0
 CATEGORIES=	databases
 
 MAINTAINER=	lacey.leanne@gmail.com
 COMMENT=	PostgreSQL Partition Manager
+WWW=		https://github.com/keithf4/pg_partman
 
 LICENSE=	PostgreSQL
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 RUN_DEPENDS=	${PYTHON_SITELIBDIR}/psycopg2/__init__.py:databases/py-psycopg2
 
-USES=		gmake pgsql:9.4+ python uidfix shebangfix
-LLD_UNSAFE=	yes
+USES=		cpe gmake pgsql:11+ python uidfix shebangfix
+CPE_VENDOR=	pgxn
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	keithf4
@@ -20,17 +21,9 @@ GH_ACCOUNT=	keithf4
 WANT_PGSQL=	server
 SHEBANG_GLOB=	*.py
 
-OPTIONS_DEFINE=	DOCS
-
-.include <bsd.port.pre.mk>
+LLD_UNSAFE=	yes
 
-# With PG11+ some scripts are only installed when they are common to
-# all PG versions.
-.if ${PGSQL_VER:R} < 11
-PLIST_SUB+=	OLDPG=""
-.else
-PLIST_SUB+=	OLDPG="@comment "
-.endif
+OPTIONS_DEFINE=	DOCS
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/postgresql/pg_partman_bgw.so
@@ -44,4 +37,4 @@ post-install-DOCS-on:
 post-install-DOCS-off:
 	${RM} -r ${STAGEDIR}${PREFIX}/share/doc/postgresql
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/databases/pg_partman/distinfo b/databases/pg_partman/distinfo
index 81729d35dcd3..b496981a4a44 100644
--- a/databases/pg_partman/distinfo
+++ b/databases/pg_partman/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1621839968
-SHA256 (keithf4-pg_partman-v4.5.1_GH0.tar.gz) = c37ca049d37eb5a6fceea805007acfadaadd2c2fa70938ffb6f7a918b5772c37
-SIZE (keithf4-pg_partman-v4.5.1_GH0.tar.gz) = 1161985
+TIMESTAMP = 1634246278
+SHA256 (keithf4-pg_partman-v4.6.0_GH0.tar.gz) = 6328ea55e20a4f090037035751a02ebb7965d9e305e3839ffceb4c06bbbfa42f
+SIZE (keithf4-pg_partman-v4.6.0_GH0.tar.gz) = 1200867
diff --git a/databases/pg_partman/pkg-descr b/databases/pg_partman/pkg-descr
index d7aaab6d6ce7..4a105a0d2818 100644
--- a/databases/pg_partman/pkg-descr
+++ b/databases/pg_partman/pkg-descr
@@ -6,5 +6,3 @@ easily managed smaller batches. Optional retention policy can automatically
 drop partitions no longer needed. A background worker (BGW) process is
 included to automatically run partition maintenance without the need of an
 external scheduler (cron, etc) in most cases.
-
-WWW: https://github.com/keithf4/pg_partman
diff --git a/databases/pg_partman/pkg-plist b/databases/pg_partman/pkg-plist
index 5032adb386e5..2dcfe76c29a4 100644
--- a/databases/pg_partman/pkg-plist
+++ b/databases/pg_partman/pkg-plist
@@ -1,10 +1,6 @@
 bin/check_unique_constraint.py
 bin/dump_partition.py
-%%OLDPG%%bin/partition_data.py
-%%OLDPG%%bin/reapply_constraints.py
-%%OLDPG%%bin/reapply_foreign_keys.py
 bin/reapply_indexes.py
-%%OLDPG%%bin/undo_partition.py
 bin/vacuum_maintenance.py
 lib/postgresql/pg_partman_bgw.so
 %%PORTDOCS%%%%DOCSDIR%%/migrate_to_native.md
@@ -88,5 +84,6 @@ share/postgresql/extension/pg_partman--4.3.1--4.4.0.sql
 share/postgresql/extension/pg_partman--4.4.0--4.5.0.sql
 share/postgresql/extension/pg_partman--4.4.1--4.5.0.sql
 share/postgresql/extension/pg_partman--4.5.0--4.5.1.sql
-share/postgresql/extension/pg_partman--4.5.1.sql
+share/postgresql/extension/pg_partman--4.5.1--4.6.0.sql
+share/postgresql/extension/pg_partman--4.6.0.sql
 share/postgresql/extension/pg_partman.control
diff --git a/databases/pg_qualstats/Makefile b/databases/pg_qualstats/Makefile
index 3eb81d355bb3..3e224aaa4c27 100644
--- a/databases/pg_qualstats/Makefile
+++ b/databases/pg_qualstats/Makefile
@@ -1,18 +1,17 @@
-# Created by: Palle Girgensohn <girgen@FreeBSD.org>
-
 PORTNAME=	pg_qualstats
-PORTVERSION=	2.0.3
+PORTVERSION=	2.1.0
 CATEGORIES=	databases
 
 MAINTAINER=	girgen@FreeBSD.org
 COMMENT=	PostgreSQL extension for collecting statistics about predicates
+WWW=		https://github.com/dalibo/pg_qualstats
 
 LICENSE=	PostgreSQL
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	powa-team
 
-USES=		gmake pgsql:9.4+
+USES=		gmake pgsql:11+
 LLD_UNSAFE=	yes
 WANT_PGSQL=	server
 
diff --git a/databases/pg_qualstats/distinfo b/databases/pg_qualstats/distinfo
index 2e58ee294a51..82971b01b52a 100644
--- a/databases/pg_qualstats/distinfo
+++ b/databases/pg_qualstats/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1623055823
-SHA256 (powa-team-pg_qualstats-2.0.3_GH0.tar.gz) = 4a2d9149d37f6e654dd195fb3d9c29fa2cfbc19b557f779cd91ccd3b17529b06
-SIZE (powa-team-pg_qualstats-2.0.3_GH0.tar.gz) = 33845
+TIMESTAMP = 1695027351
+SHA256 (powa-team-pg_qualstats-2.1.0_GH0.tar.gz) = 9727e6ba69a7bfac6c5b370125762bc56c1f170459e5d9bde0f82a004c736407
+SIZE (powa-team-pg_qualstats-2.1.0_GH0.tar.gz) = 37478
diff --git a/databases/pg_qualstats/pkg-descr b/databases/pg_qualstats/pkg-descr
index a29c17d8ee3b..8f350d1340b4 100644
--- a/databases/pg_qualstats/pkg-descr
+++ b/databases/pg_qualstats/pkg-descr
@@ -1,4 +1,2 @@
 pg_qualstats is a PostgreSQL extension keeping statistics on predicates found
 in WHERE statements and JOIN clauses.
-
-WWW: https://github.com/dalibo/pg_qualstats
diff --git a/databases/pg_qualstats/pkg-plist b/databases/pg_qualstats/pkg-plist
index 8a19590ba58e..4f76e9bf4b59 100644
--- a/databases/pg_qualstats/pkg-plist
+++ b/databases/pg_qualstats/pkg-plist
@@ -1,4 +1,6 @@
 lib/postgresql/pg_qualstats.so
-share/postgresql/extension/pg_qualstats--2.0.3.sql
+share/postgresql/extension/pg_qualstats--2.0.4--2.1.0.sql
+share/postgresql/extension/pg_qualstats--2.0.4.sql
+share/postgresql/extension/pg_qualstats--2.1.0.sql
 share/postgresql/extension/pg_qualstats.control
 share/doc/postgresql/extension/pg_qualstats-README.md
diff --git a/databases/pg_repack/Makefile b/databases/pg_repack/Makefile
index 3fa6efd350e0..7bdbb3c4be9b 100644
--- a/databases/pg_repack/Makefile
+++ b/databases/pg_repack/Makefile
@@ -1,17 +1,16 @@
-# Created by: Jov <amutu@amutu.com>
-
 PORTNAME=	pg_repack
-PORTVERSION=	1.4.6
+PORTVERSION=	1.4.8
 DISTVERSIONPREFIX=	ver_
 CATEGORIES=	databases
 PKGNAMEPREFIX=	postgresql${PGSQL_VER:S/.//}-
 
 MAINTAINER=	farrokhi@FreeBSD.org
 COMMENT=	Reorganize tables in PostgreSQL databases with minimal locks
+WWW=		https://github.com/reorg/pg_repack
 
 LICENSE=	BSD3CLAUSE
 
-USES=		gettext-runtime gmake pgsql:9.4+
+USES=		gettext-runtime gmake pgsql:11+
 LLD_UNSAFE=	yes
 USE_GITHUB=	yes
 GH_ACCOUNT=	reorg
diff --git a/databases/pg_repack/distinfo b/databases/pg_repack/distinfo
index 51c441654387..1064b657f457 100644
--- a/databases/pg_repack/distinfo
+++ b/databases/pg_repack/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1602331081
-SHA256 (reorg-pg_repack-ver_1.4.6_GH0.tar.gz) = 4987b34b07bc535cba7eb9ce53799228539f16d8272619b8eecaf9508492ded9
-SIZE (reorg-pg_repack-ver_1.4.6_GH0.tar.gz) = 94760
+TIMESTAMP = 1666366163
+SHA256 (reorg-pg_repack-ver_1.4.8_GH0.tar.gz) = 18b4d871c1abf78cf0b1b1fe6081d435d183a8dc5eb977576e7a47fe113dd4ec
+SIZE (reorg-pg_repack-ver_1.4.8_GH0.tar.gz) = 95801
diff --git a/databases/pg_repack/pkg-descr b/databases/pg_repack/pkg-descr
index 1d03b73a2dfb..feeb39d09429 100644
--- a/databases/pg_repack/pkg-descr
+++ b/databases/pg_repack/pkg-descr
@@ -3,5 +3,3 @@ indexes, and optionally restore the physical order of clustered indexes. Unlike
 CLUSTER and VACUUM FULL it works online, without holding an exclusive lock on
 the processed tables during processing. pg_repack is efficient to boot, with
 performance comparable to using CLUSTER directly.
-
-WWW: https://github.com/reorg/pg_repack
diff --git a/databases/pg_similarity/Makefile b/databases/pg_similarity/Makefile
index c602f77ce020..e13b392657d0 100644
--- a/databases/pg_similarity/Makefile
+++ b/databases/pg_similarity/Makefile
@@ -1,5 +1,3 @@
-# Created by: Jov <amutu@amutu.com>
-
 PORTNAME=	pg_similarity
 PORTVERSION=	20160917
 PORTREVISION=	2
@@ -8,10 +6,11 @@ PKGNAMEPREFIX=	postgresql${PGSQL_VER:S/.//}-
 
 MAINTAINER=	amutu@amutu.com
 COMMENT=	Set of functions and operators for executing similarity queries
+WWW=		http://pgsimilarity.projects.pgfoundry.org
 
 LICENSE=	BSD3CLAUSE
 
-USES=		gmake pgsql:9.1+
+USES=		gmake pgsql:11+
 USE_GITHUB=	yes
 GH_ACCOUNT=	eulerto
 GH_TAGNAME=	be1a8b0
diff --git a/databases/pg_similarity/pkg-descr b/databases/pg_similarity/pkg-descr
index a10bad66a970..61cf8df020bf 100644
--- a/databases/pg_similarity/pkg-descr
+++ b/databases/pg_similarity/pkg-descr
@@ -13,5 +13,3 @@ pg_similarity has three main components:
   value to a user-defined threshold to decide if it is a match or not;
 * Session Variables: a set of variables that store similarity function
   parameters. Theses variables can be defined at run time.
-
-WWW: http://pgsimilarity.projects.pgfoundry.org
diff --git a/databases/pg_stat_kcache/Makefile b/databases/pg_stat_kcache/Makefile
index b0210f9d90e1..47ad800dd7e7 100644
--- a/databases/pg_stat_kcache/Makefile
+++ b/databases/pg_stat_kcache/Makefile
@@ -1,16 +1,15 @@
-# Created by: Palle Girgensohn <girgen@FreeBSD.org>
-
 PORTNAME=	pg_stat_kcache
 DISTVERSIONPREFIX=	REL
-DISTVERSION=	2_2_0
+DISTVERSION=	2_2_3
 CATEGORIES=	databases
 
 MAINTAINER=	girgen@FreeBSD.org
 COMMENT=	Gather statistics about PostgreSQL I/O and CPU usage
+WWW=		https://github.com/dalibo/pg_stat_kcache
 
 LICENSE=	PostgreSQL
 
-USES=		gmake pgsql:9.6+
+USES=		gmake pgsql:11+
 LLD_UNSAFE=	yes
 WANT_PGSQL=	server contrib
 
diff --git a/databases/pg_stat_kcache/distinfo b/databases/pg_stat_kcache/distinfo
index e82d056d55e1..ba7672df9353 100644
--- a/databases/pg_stat_kcache/distinfo
+++ b/databases/pg_stat_kcache/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1629137149
-SHA256 (powa-team-pg_stat_kcache-REL2_2_0_GH0.tar.gz) = a6fe589c52a1dfa037c228c786e93c6b882a32e4378dc1a3b6416421db7bbd60
-SIZE (powa-team-pg_stat_kcache-REL2_2_0_GH0.tar.gz) = 21288
+TIMESTAMP = 1706175514
+SHA256 (powa-team-pg_stat_kcache-REL2_2_3_GH0.tar.gz) = a58032deb0267e6b6648120cd62f1baa10c2b9e97b2728ff7c99b2ebaac9ffb4
+SIZE (powa-team-pg_stat_kcache-REL2_2_3_GH0.tar.gz) = 23508
diff --git a/databases/pg_stat_kcache/pkg-descr b/databases/pg_stat_kcache/pkg-descr
index 8026f27c8af8..a1405fe374d8 100644
--- a/databases/pg_stat_kcache/pkg-descr
+++ b/databases/pg_stat_kcache/pkg-descr
@@ -1,4 +1,2 @@
 Gathers statistics about real reads and writes done by the filesystem layer. It
 is provided in the form of an extension for PostgreSQL >= 9.4.
-
-WWW: https://github.com/dalibo/pg_stat_kcache
diff --git a/databases/pg_stat_kcache/pkg-plist b/databases/pg_stat_kcache/pkg-plist
index de9d4c1b5528..9f8668ebf936 100644
--- a/databases/pg_stat_kcache/pkg-plist
+++ b/databases/pg_stat_kcache/pkg-plist
@@ -8,5 +8,11 @@ share/postgresql/extension/pg_stat_kcache--2.1.2--2.1.3.sql
 share/postgresql/extension/pg_stat_kcache--2.1.2.sql
 share/postgresql/extension/pg_stat_kcache--2.1.3--2.2.0.sql
 share/postgresql/extension/pg_stat_kcache--2.1.3.sql
+share/postgresql/extension/pg_stat_kcache--2.2.0--2.2.1.sql
 share/postgresql/extension/pg_stat_kcache--2.2.0.sql
+share/postgresql/extension/pg_stat_kcache--2.2.1--2.2.2.sql
+share/postgresql/extension/pg_stat_kcache--2.2.1.sql
+share/postgresql/extension/pg_stat_kcache--2.2.2--2.2.3.sql
+share/postgresql/extension/pg_stat_kcache--2.2.2.sql
+share/postgresql/extension/pg_stat_kcache--2.2.3.sql
 share/postgresql/extension/pg_stat_kcache.control
diff --git a/databases/pg_tileserv/Makefile b/databases/pg_tileserv/Makefile
index 56b928d1641e..4b5e15560523 100644
--- a/databases/pg_tileserv/Makefile
+++ b/databases/pg_tileserv/Makefile
@@ -1,63 +1,25 @@
 PORTNAME=	pg_tileserv
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.0.8
+DISTVERSION=	1.0.9
+PORTREVISION=	12
 CATEGORIES=	databases
 
 MAINTAINER=	lbartoletti@FreeBSD.org
 COMMENT=	PostGIS-only tile server written in Go
+WWW=		https://github.com/crunchydata/pg_tileserv/issues
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
-USES=		go:modules
-USE_GITHUB=	yes
-GH_ACCOUNT=	CrunchyData
-GH_TUPLE=	\
-		Masterminds:goutils:v1.1.0:masterminds_goutils/vendor/github.com/Masterminds/goutils \
-		Masterminds:semver:v3.1.0:masterminds_semver_v3/vendor/github.com/Masterminds/semver/v3 \
-		Masterminds:sprig:v3.1.0:masterminds_sprig_v3/vendor/github.com/Masterminds/sprig/v3 \
-		davecgh:go-spew:v1.1.1:davecgh_go_spew/vendor/github.com/davecgh/go-spew \
-		felixge:httpsnoop:v1.0.1:felixge_httpsnoop/vendor/github.com/felixge/httpsnoop \
-		fsnotify:fsnotify:v1.4.7:fsnotify_fsnotify/vendor/github.com/fsnotify/fsnotify \
-		go-ini:ini:v1.51.0:go_ini_ini/vendor/gopkg.in/ini.v1 \
-		go-yaml:yaml:9f266ea9e77c:go_yaml_yaml_1/vendor/gopkg.in/yaml.v3 \
-		go-yaml:yaml:v2.2.4:go_yaml_yaml/vendor/gopkg.in/yaml.v2 \
-		golang:crypto:75b288015ac9:golang_crypto/vendor/golang.org/x/crypto \
-		golang:sys:d5e6a3e2c0ae:golang_sys/vendor/golang.org/x/sys \
-		golang:text:v0.3.3:golang_text/vendor/golang.org/x/text \
-		golang:xerrors:9bdfabe68543:golang_xerrors/vendor/golang.org/x/xerrors \
-		google:uuid:v1.1.1:google_uuid/vendor/github.com/google/uuid \
-		gorilla:handlers:v1.5.1:gorilla_handlers/vendor/github.com/gorilla/handlers \
-		gorilla:mux:v1.8.0:gorilla_mux/vendor/github.com/gorilla/mux \
-		hashicorp:hcl:v1.0.0:hashicorp_hcl/vendor/github.com/hashicorp/hcl \
-		huandu:xstrings:v1.3.1:huandu_xstrings/vendor/github.com/huandu/xstrings \
-		imdario:mergo:v0.3.8:imdario_mergo/vendor/github.com/imdario/mergo \
-		jackc:chunkreader:v2.0.1:jackc_chunkreader_v2/vendor/github.com/jackc/chunkreader/v2 \
-		jackc:pgconn:v1.7.2:jackc_pgconn/vendor/github.com/jackc/pgconn \
-		jackc:pgio:v1.0.0:jackc_pgio/vendor/github.com/jackc/pgio \
-		jackc:pgpassfile:v1.0.0:jackc_pgpassfile/vendor/github.com/jackc/pgpassfile \
-		jackc:pgproto3:v2.0.6:jackc_pgproto3_v2/vendor/github.com/jackc/pgproto3/v2 \
-		jackc:pgservicefile:2b9c44734f2b:jackc_pgservicefile/vendor/github.com/jackc/pgservicefile \
-		jackc:pgtype:v1.6.1:jackc_pgtype/vendor/github.com/jackc/pgtype \
-		jackc:pgx:v4.9.2:jackc_pgx_v4/vendor/github.com/jackc/pgx/v4 \
-		jackc:puddle:v1.1.2:jackc_puddle/vendor/github.com/jackc/puddle \
-		magiconair:properties:v1.8.1:magiconair_properties/vendor/github.com/magiconair/properties \
-		mitchellh:copystructure:v1.0.0:mitchellh_copystructure/vendor/github.com/mitchellh/copystructure \
-		mitchellh:mapstructure:v1.1.2:mitchellh_mapstructure/vendor/github.com/mitchellh/mapstructure \
-		mitchellh:reflectwalk:v1.0.0:mitchellh_reflectwalk/vendor/github.com/mitchellh/reflectwalk \
-		pborman:getopt:v2.1.0:pborman_getopt_v2/vendor/github.com/pborman/getopt \
-		pelletier:go-toml:v1.2.0:pelletier_go_toml/vendor/github.com/pelletier/go-toml \
-		pmezard:go-difflib:v1.0.0:pmezard_go_difflib/vendor/github.com/pmezard/go-difflib \
-		sirupsen:logrus:v1.7.0:sirupsen_logrus/vendor/github.com/sirupsen/logrus \
-		spf13:afero:v1.1.2:spf13_afero/vendor/github.com/spf13/afero \
-		spf13:cast:v1.3.1:spf13_cast/vendor/github.com/spf13/cast \
-		spf13:jwalterweatherman:v1.0.0:spf13_jwalterweatherman/vendor/github.com/spf13/jwalterweatherman \
-		spf13:pflag:v1.0.3:spf13_pflag/vendor/github.com/spf13/pflag \
-		spf13:viper:v1.7.1:spf13_viper/vendor/github.com/spf13/viper \
-		stretchr:testify:v1.6.1:stretchr_testify/vendor/github.com/stretchr/testify \
-		subosito:gotenv:v1.2.0:subosito_gotenv/vendor/github.com/subosito/gotenv \
-		theckman:httpforwarded:v0.4.0:theckman_httpforwarded/vendor/github.com/theckman/httpforwarded
+USES=		go:1.20,modules
+USE_GITHUB=	nodefault
+GH_TUPLE=	golang:sys:v0.6.0:sys
+GO_MODULE=	github.com/crunchydata/pg_tileserv
 
 PLIST_FILES=	bin/${PORTNAME}
 
+pre-patch:
+	${RM} -r ${WRKSRC}/vendor/golang.org/x/sys
+	${LN} -s ${WRKDIR}/sys-* ${WRKSRC}/vendor/golang.org/x/sys
+
 .include <bsd.port.mk>
diff --git a/databases/pg_tileserv/distinfo b/databases/pg_tileserv/distinfo
index 731010d2604f..b33531c80862 100644
--- a/databases/pg_tileserv/distinfo
+++ b/databases/pg_tileserv/distinfo
@@ -1,91 +1,7 @@
-TIMESTAMP = 1625487300
-SHA256 (CrunchyData-pg_tileserv-v1.0.8_GH0.tar.gz) = d3850c49a8c2afffe7d1dd3c3e2326db14b1fb1198aed44612c83060da507937
-SIZE (CrunchyData-pg_tileserv-v1.0.8_GH0.tar.gz) = 2980352
-SHA256 (Masterminds-goutils-v1.1.0_GH0.tar.gz) = 053a61c4b0d78e6978600c99562f04d053993c428d549a20b627151cf1aabbae
-SIZE (Masterminds-goutils-v1.1.0_GH0.tar.gz) = 14610
-SHA256 (Masterminds-semver-v3.1.0_GH0.tar.gz) = a91e6fe3121bb0c158bbd89721be3f44cd84e1f76a6d89840e244c1f5524ee28
-SIZE (Masterminds-semver-v3.1.0_GH0.tar.gz) = 24481
-SHA256 (Masterminds-sprig-v3.1.0_GH0.tar.gz) = a9e5031c3891ce95e799c5b07de9572eed90acd716e458eb42f1bbcb1b17328a
-SIZE (Masterminds-sprig-v3.1.0_GH0.tar.gz) = 49979
-SHA256 (davecgh-go-spew-v1.1.1_GH0.tar.gz) = 7d82b9bb7291adbe7498fe946920ab3e7fc9e6cbfc3b2294693fad00bf0dd17e
-SIZE (davecgh-go-spew-v1.1.1_GH0.tar.gz) = 42152
-SHA256 (felixge-httpsnoop-v1.0.1_GH0.tar.gz) = 02f506689067855a2afcbea692a63f60bcb50a3994722650339c82027d1cbe3e
-SIZE (felixge-httpsnoop-v1.0.1_GH0.tar.gz) = 10725
-SHA256 (fsnotify-fsnotify-v1.4.7_GH0.tar.gz) = b7530d973d0ab0e58ad8ce1b9a4b963d6f57b3d72f2f9e13d49846976361b1cd
-SIZE (fsnotify-fsnotify-v1.4.7_GH0.tar.gz) = 31139
-SHA256 (go-ini-ini-v1.51.0_GH0.tar.gz) = 6c98311d375afbe36a246c5d29acb5cb428634a4186e591ce9b7fe2fa4f2a471
-SIZE (go-ini-ini-v1.51.0_GH0.tar.gz) = 43536
-SHA256 (go-yaml-yaml-9f266ea9e77c_GH0.tar.gz) = 63efc9aabcbb56b2c9469927784fd67ecb3a79720c4fa754c511335a04156d04
-SIZE (go-yaml-yaml-9f266ea9e77c_GH0.tar.gz) = 86898
-SHA256 (go-yaml-yaml-v2.2.4_GH0.tar.gz) = 9004c9709200d52ef6e5c69af3f71f3adb1a2b7e884ea7597f306bf54b1f007c
-SIZE (go-yaml-yaml-v2.2.4_GH0.tar.gz) = 72209
-SHA256 (golang-crypto-75b288015ac9_GH0.tar.gz) = 6e74e21bf9dfdbf0a8dac8cb205fbc3bfd8dff308a24080b9d6093a3858f0db2
-SIZE (golang-crypto-75b288015ac9_GH0.tar.gz) = 1729931
-SHA256 (golang-sys-d5e6a3e2c0ae_GH0.tar.gz) = 6cd44aa33cb0fc4caedadde44b3a943bece0aa67d803c00bfb09b03222845f19
-SIZE (golang-sys-d5e6a3e2c0ae_GH0.tar.gz) = 1539001
-SHA256 (golang-text-v0.3.3_GH0.tar.gz) = 1604233637e3593749fbbb13b5069b08e6feba6d2b55a02fd3148793d5871185
-SIZE (golang-text-v0.3.3_GH0.tar.gz) = 7747332
-SHA256 (golang-xerrors-9bdfabe68543_GH0.tar.gz) = 54bb4d99e6cba2e3e5331d064f46640cc01a0e630ee6a684ae810bd94a7e4eb7
-SIZE (golang-xerrors-9bdfabe68543_GH0.tar.gz) = 13657
-SHA256 (google-uuid-v1.1.1_GH0.tar.gz) = bebd4b0b4ea152a9793615ef23c83f688876d8c284a2092264d20a4bf4ffc423
-SIZE (google-uuid-v1.1.1_GH0.tar.gz) = 13543
-SHA256 (gorilla-handlers-v1.5.1_GH0.tar.gz) = be22eafc7020cba749c8638d0051c326f1b31b5a76a98d86beafc595079f6b09
-SIZE (gorilla-handlers-v1.5.1_GH0.tar.gz) = 20963
-SHA256 (gorilla-mux-v1.8.0_GH0.tar.gz) = ea2639259d2ce6f402636655e91eb93ba69c139e3cbf80b044ee393ada53757b
-SIZE (gorilla-mux-v1.8.0_GH0.tar.gz) = 45517
-SHA256 (hashicorp-hcl-v1.0.0_GH0.tar.gz) = 50632428210503070fd2fde748c88b7414bf84a6a0eadebf9d8e596a033bead2
-SIZE (hashicorp-hcl-v1.0.0_GH0.tar.gz) = 70658
-SHA256 (huandu-xstrings-v1.3.1_GH0.tar.gz) = d399f03735391073441145bac6b8d06b36f3b59e005db77ebafde130ddf215bf
-SIZE (huandu-xstrings-v1.3.1_GH0.tar.gz) = 17797
-SHA256 (imdario-mergo-v0.3.8_GH0.tar.gz) = 8722e1280a333b1b17541dc05102200e1c9e8ee85f45fc66a4ba629b97a870e6
-SIZE (imdario-mergo-v0.3.8_GH0.tar.gz) = 18180
-SHA256 (jackc-chunkreader-v2.0.1_GH0.tar.gz) = bf856bad6608fb7345707aba713a1d77eb984f1d217065738a12c97e37669be4
-SIZE (jackc-chunkreader-v2.0.1_GH0.tar.gz) = 3038
-SHA256 (jackc-pgconn-v1.7.2_GH0.tar.gz) = caefc475dbe66c3b6e642e41dbb37bfd0e235b399a93721ec11d45b947d09cc3
-SIZE (jackc-pgconn-v1.7.2_GH0.tar.gz) = 49797
-SHA256 (jackc-pgio-v1.0.0_GH0.tar.gz) = d36e367c877954acdc96b8cd1a0df417b4cfae80dae726474a8f0de3a68a68ab
-SIZE (jackc-pgio-v1.0.0_GH0.tar.gz) = 1884
-SHA256 (jackc-pgpassfile-v1.0.0_GH0.tar.gz) = df8904662382e1d0064ec7a5a8c36c49264d7128cea923d597802ada8c5b9603
-SIZE (jackc-pgpassfile-v1.0.0_GH0.tar.gz) = 3254
-SHA256 (jackc-pgproto3-v2.0.6_GH0.tar.gz) = 3d345e52e8414937255bdd795d9e97413dd3c52216c7cb3e273d5ef94f92f097
-SIZE (jackc-pgproto3-v2.0.6_GH0.tar.gz) = 16872
-SHA256 (jackc-pgservicefile-2b9c44734f2b_GH0.tar.gz) = dd6cf77deb2456b1c8e56875ed901a57eb887e63ae5de48f364906131275497e
-SIZE (jackc-pgservicefile-2b9c44734f2b_GH0.tar.gz) = 2991
-SHA256 (jackc-pgtype-v1.6.1_GH0.tar.gz) = f7f2a89bd2ca2d24c3b1c5ada999d80ced8f3db9b9a4f807a2d3fa12f10bae60
-SIZE (jackc-pgtype-v1.6.1_GH0.tar.gz) = 173007
-SHA256 (jackc-pgx-v4.9.2_GH0.tar.gz) = f49112c939036f6e2b310fca8f765bd30cdb720ec2f7736f0fd40a2025d3297a
-SIZE (jackc-pgx-v4.9.2_GH0.tar.gz) = 99181
-SHA256 (jackc-puddle-v1.1.2_GH0.tar.gz) = 6955b02c012468f3faa5988662e90254e0f9e35110d13edf2d8aa53881128aac
-SIZE (jackc-puddle-v1.1.2_GH0.tar.gz) = 10055
-SHA256 (magiconair-properties-v1.8.1_GH0.tar.gz) = 4449df3d2be86608bfc997228f66f1cff57bf620cc5bf9ba44339c7e4c5612dd
-SIZE (magiconair-properties-v1.8.1_GH0.tar.gz) = 29735
-SHA256 (mitchellh-copystructure-v1.0.0_GH0.tar.gz) = 0e04d8fe1065459ab234507b9a4b7164b05eda970fee6ffdf0219423c357fda8
-SIZE (mitchellh-copystructure-v1.0.0_GH0.tar.gz) = 8903
-SHA256 (mitchellh-mapstructure-v1.1.2_GH0.tar.gz) = 53fbc06b125ff1c9c73a4eb1764346932671a29c67a45a92e2ebc6855635069b
-SIZE (mitchellh-mapstructure-v1.1.2_GH0.tar.gz) = 20980
-SHA256 (mitchellh-reflectwalk-v1.0.0_GH0.tar.gz) = bd22df35225e4bfcecafb35ac4869911fafc356f5dadcfb141cd0caededc87c3
-SIZE (mitchellh-reflectwalk-v1.0.0_GH0.tar.gz) = 6143
-SHA256 (pborman-getopt-v2.1.0_GH0.tar.gz) = 00056fa164b1bf217eb249f5733c76fd6e18f3f55ae269286695705243f48fe2
-SIZE (pborman-getopt-v2.1.0_GH0.tar.gz) = 41182
-SHA256 (pelletier-go-toml-v1.2.0_GH0.tar.gz) = 1a5a620f680033f17e34148bee8f26d96d8c27ff1d7f56f0fe1c7253595b5244
-SIZE (pelletier-go-toml-v1.2.0_GH0.tar.gz) = 57496
-SHA256 (pmezard-go-difflib-v1.0.0_GH0.tar.gz) = 28f3dc1b5c0efd61203ab07233f774740d3bf08da4d8153fb5310db6cea0ebda
-SIZE (pmezard-go-difflib-v1.0.0_GH0.tar.gz) = 11398
-SHA256 (sirupsen-logrus-v1.7.0_GH0.tar.gz) = a7baaa1c646441d002f3867b5998b6b45b629ecfad317d468a981e23e0c9c6ca
-SIZE (sirupsen-logrus-v1.7.0_GH0.tar.gz) = 46392
-SHA256 (spf13-afero-v1.1.2_GH0.tar.gz) = 66554a6b09b0009340ae77c119d5a14e2460bb3aea56e75e138c87e621f3803b
-SIZE (spf13-afero-v1.1.2_GH0.tar.gz) = 45309
-SHA256 (spf13-cast-v1.3.1_GH0.tar.gz) = 4fa8d06903b490ae6f1316e55c5446d5648eea2b450671ebc54d4bbe79bc46b1
-SIZE (spf13-cast-v1.3.1_GH0.tar.gz) = 11102
-SHA256 (spf13-jwalterweatherman-v1.0.0_GH0.tar.gz) = 2ece12b964e0d230b10851555185d42d3c81b401efda044265ae716eb1d0bc2d
-SIZE (spf13-jwalterweatherman-v1.0.0_GH0.tar.gz) = 6392
-SHA256 (spf13-pflag-v1.0.3_GH0.tar.gz) = 9e57f86f493f04d9077fccd04e7139ebf243dd544e917ab83d35729b3e54a124
-SIZE (spf13-pflag-v1.0.3_GH0.tar.gz) = 46002
-SHA256 (spf13-viper-v1.7.1_GH0.tar.gz) = de85215b50e9fbb2cdf63b0aa9df826a866dff8f718ba2dc3f5866e98d5bd39a
-SIZE (spf13-viper-v1.7.1_GH0.tar.gz) = 82641
-SHA256 (stretchr-testify-v1.6.1_GH0.tar.gz) = 40fd7204ab72ca9d8759f1cc3604dd17f556a0f9177f6fc05dd0cad9f06e708f
-SIZE (stretchr-testify-v1.6.1_GH0.tar.gz) = 84215
-SHA256 (subosito-gotenv-v1.2.0_GH0.tar.gz) = 5f6826992c11981018c77377f33dbc56d0be932e0d38a2f51e795c99725e7ba5
-SIZE (subosito-gotenv-v1.2.0_GH0.tar.gz) = 7359
-SHA256 (theckman-httpforwarded-v0.4.0_GH0.tar.gz) = 5fd9a8721b599ab5bedf4535bed042f26ab15c44a82e69b5c0435140112333cd
-SIZE (theckman-httpforwarded-v0.4.0_GH0.tar.gz) = 5981
+TIMESTAMP = 1679154903
+SHA256 (go/databases_pg_tileserv/pg_tileserv-v1.0.9/v1.0.9.mod) = 7e1507419e12c656b79df9d382b93cff41a3e07f2930dfa196af32d91ac5ac93
+SIZE (go/databases_pg_tileserv/pg_tileserv-v1.0.9/v1.0.9.mod) = 570
+SHA256 (go/databases_pg_tileserv/pg_tileserv-v1.0.9/v1.0.9.zip) = e957c97526178d3c28f35ba0009e0f48dd972bd1a2f089e84eaaf1d6cab51e19
+SIZE (go/databases_pg_tileserv/pg_tileserv-v1.0.9/v1.0.9.zip) = 3066303
+SHA256 (go/databases_pg_tileserv/pg_tileserv-v1.0.9/golang-sys-v0.6.0_GH0.tar.gz) = b4f6d17c7a128f76169964b437cb66b3f2dbf9a33361928ec19dfecf7b03fc54
+SIZE (go/databases_pg_tileserv/pg_tileserv-v1.0.9/golang-sys-v0.6.0_GH0.tar.gz) = 1434234
diff --git a/databases/pg_tileserv/pkg-descr b/databases/pg_tileserv/pkg-descr
index 345d5736dafe..0f219b94d690 100644
--- a/databases/pg_tileserv/pkg-descr
+++ b/databases/pg_tileserv/pkg-descr
@@ -13,6 +13,3 @@ sources.
 using standard database access control. This means you can also use advanced
 access control techniques, like row-level security to dynamically filter
 access based on the login role.
-
-
-WWW: https://github.com/crunchydata/pg_tileserv/issues
diff --git a/databases/pgaccess/Makefile b/databases/pgaccess/Makefile
index 7ec0042de6a8..3197d7078c94 100644
--- a/databases/pgaccess/Makefile
+++ b/databases/pgaccess/Makefile
@@ -1,5 +1,3 @@
-# Created by: Palle Girgensohn <girgen@pingpong.net>
-
 PORTNAME=	pgaccess
 PORTVERSION=	1.00.20140902
 PORTREVISION=	3
@@ -8,6 +6,7 @@ MASTER_SITES=	https://BSDforge.com/projects/source/databases/pgaccess/
 
 MAINTAINER=	portmaster@bsdforge.com
 COMMENT=	Powerful PostgreSQL database GUI administration tool and toolkit
+WWW=		https://BSDforge.com/projects/databases/pgaccess/
 
 LICENSE=	BSD4CLAUSE
 
diff --git a/databases/pgaccess/pkg-descr b/databases/pgaccess/pkg-descr
index 88952eb759fd..6c0620f03667 100644
--- a/databases/pgaccess/pkg-descr
+++ b/databases/pgaccess/pkg-descr
@@ -9,5 +9,3 @@ database and remote clients).
 PgAccess was originally written by Constantin Teodorescu using Visual Tcl,
 "the best tool for developing Tcl/Tk applications I've ever seen."
 It is currently managed by the developers at BSDforge.com.
-
-WWW: https://BSDforge.com/projects/databases/pgaccess/
diff --git a/databases/pgadmin3/Makefile b/databases/pgadmin3/Makefile
index 51d6da16b960..0f0be75033d1 100644
--- a/databases/pgadmin3/Makefile
+++ b/databases/pgadmin3/Makefile
@@ -1,26 +1,24 @@
-# Created by: Max Khon
-
 PORTNAME=	pgadmin3
 PORTVERSION=	1.22.2
-PORTREVISION=	6
+PORTREVISION=	8
 CATEGORIES=	databases
 MASTER_SITES=	PGSQL/pgadmin/pgadmin3/v${PORTVERSION}/src
 DIST_SUBDIR=	postgresql
 
-MAINTAINER=	fjoe@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	PostgreSQL database design and management system
+WWW=		https://www.pgadmin.org/
 
 LICENSE=	PostgreSQL
 
 BUILD_DEPENDS=	sphinx-build:textproc/py-sphinx
 
-USES=		compiler:c++11-lib gettext gmake gnome pgsql:9.0+ ssl
+USES=		compiler:c++11-lib gettext gmake gnome pgsql:11+ ssl
 USE_GNOME=	libxml2 libxslt
 USE_WX=		3.0
 USE_CXXSTD=	c++11
 
 WX_COMPS=	wx
-INSTALLS_ICONS=	yes
 ICON_SIZES=	16 32
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-wx-version=${USE_WX} --enable-databasedesigner
@@ -32,6 +30,12 @@ PLIST_FILES+=	share/icons/hicolor/${SZ}x${SZ}/apps/pgAdmin3.png
 .endfor
 PORTDATA=	*
 
+.include <bsd.port.pre.mk>
+
+.if ${PGSQL_VER}>13
+EXTRA_PATCHES+=	${FILESDIR}/extrapatch-pg13
+.endif
+
 post-patch:
 	@${REINPLACE_CMD} -e 's,/wx-config,/${WX_CONFIG:T},' ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's,wxrc ,${WXRC_CMD:T} ,' ${WRKSRC}/pgadmin/ui/embed-xrc
@@ -51,4 +55,4 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/pgadmin/include/images/pgAdmin3-${SZ}.png ${STAGEDIR}${PREFIX}/share/icons/hicolor/${SZ}x${SZ}/apps/pgAdmin3.png
 .endfor
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/databases/pgadmin3/files/extrapatch-pg13 b/databases/pgadmin3/files/extrapatch-pg13
new file mode 100644
index 000000000000..fdcab829e84a
--- /dev/null
+++ b/databases/pgadmin3/files/extrapatch-pg13
@@ -0,0 +1,11 @@
+--- pgadmin/db/keywords.c.orig	2015-02-25 10:44:26 UTC
++++ 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>
+ };
diff --git a/databases/pgadmin3/pkg-descr b/databases/pgadmin3/pkg-descr
index f07934575d76..4a2802680453 100644
--- a/databases/pgadmin3/pkg-descr
+++ b/databases/pgadmin3/pkg-descr
@@ -3,5 +3,3 @@ system for *nix and Windows systems. It is freely available under the
 terms of the Artistic Licence and may be redistributed provided the terms
 of the licence are adhered to. The project is managed by the pgAdmin
 Development Team.
-
-WWW: https://www.pgadmin.org/
diff --git a/databases/pgagroal/Makefile b/databases/pgagroal/Makefile
new file mode 100644
index 000000000000..0821dd07c7c6
--- /dev/null
+++ b/databases/pgagroal/Makefile
@@ -0,0 +1,50 @@
+PORTNAME=	pgagroal
+PORTVERSION=	1.4.2
+CATEGORIES=	databases
+MASTER_SITES=	https://github.com/agroal/${PORTNAME}/releases/download/${PORTVERSION}/
+
+MAINTAINER=	bofh@FreeBSD.org
+COMMENT=	High-performance protocol-native connection pool for PostgreSQL
+WWW=		https://agroal.github.io/pgagroal/
+
+LICENSE=	BSD3CLAUSE
+
+BUILD_DEPENDS=	rst2man:textproc/py-docutils
+LIB_DEPENDS=	libev.so:devel/libev
+
+USES=		cmake pathfix ssl
+USE_LDCONFIG=	yes
+USE_RC_SUBR=	pgagroal
+
+SUB_LIST=	PGAGROAL_RUNDIR="${PGAGROAL_RUNDIR}"
+
+USERS=		pgagroal
+GROUPS=		pgagroal
+
+PLIST_SUB+=	PGAGROAL_GROUP="${GROUPS}" \
+		PGAGROAL_LOGDIR="${PGAGROAL_LOGDIR}" \
+		PGAGROAL_RUNDIR="${PGAGROAL_RUNDIR}" \
+		PGAGROAL_USER="${USERS}"
+
+PGAGROAL_GROUP?=	pgagroal
+PGAGROAL_USER?=		pgagroal
+
+PGAGROAL_RUNDIR?=	/var/run/pgagroal
+PGAGROAL_LOGDIR?=	/var/log/pgagroal
+
+post-patch:
+	@${MV} ${WRKSRC}/doc/etc/pgagroal.conf \
+		${WRKSRC}/doc/etc/pgagroal.conf.sample
+	@${MV} ${WRKSRC}/doc/etc/pgagroal_hba.conf \
+		${WRKSRC}/doc/etc/pgagroal_hba.conf.sample
+	@${REINPLACE_CMD} 's|etc/pgagroal.conf|etc/pgagroal.conf.sample|g; \
+		s|etc/pgagroal_hba.conf|etc/pgagroal_hba.conf.sample|g' \
+		${WRKSRC}/doc/CMakeLists.txt
+	@${REINPLACE_CMD} 's|pgagraol.%d.pid|pgagroal.pid|g' \
+		${WRKSRC}/src/libpgagroal/configuration.c
+
+post-install:
+	@${MKDIR} ${STAGEDIR}${PGAGROAL_RUNDIR} \
+		${STAGEDIR}${PGAGROAL_LOGDIR}
+
+.include <bsd.port.mk>
diff --git a/databases/pgagroal/distinfo b/databases/pgagroal/distinfo
new file mode 100644
index 000000000000..6bf13a32b3b2
--- /dev/null
+++ b/databases/pgagroal/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1656274963
+SHA256 (pgagroal-1.4.2.tar.gz) = 6feb76e59eb4163de423025a6a1fbe34a48fe6880741107ca1f73c617af4da31
+SIZE (pgagroal-1.4.2.tar.gz) = 256332
diff --git a/databases/pgagroal/files/patch-doc_etc_pgagroal.conf b/databases/pgagroal/files/patch-doc_etc_pgagroal.conf
new file mode 100644
index 000000000000..aa2bbe98f625
--- /dev/null
+++ b/databases/pgagroal/files/patch-doc_etc_pgagroal.conf
@@ -0,0 +1,20 @@
+--- doc/etc/pgagroal.conf.orig	2022-05-23 17:17:02 UTC
++++ doc/etc/pgagroal.conf
+@@ -2,14 +2,14 @@ port = 2345
+ host = localhost
+ port = 2345
+ 
+-log_type = console
++log_type = file
+ log_level = info
+-log_path = 
++log_path = /var/log/pgagroal/pgagroal.log
+ 
+ max_connections = 100
+ idle_timeout = 600
+ validation = off
+-unix_socket_dir = /tmp/
++unix_socket_dir = /var/run/pgagroal/
+ 
+ [primary]
+ host = localhost
diff --git a/databases/pgagroal/files/pgagroal.in b/databases/pgagroal/files/pgagroal.in
new file mode 100644
index 000000000000..a8feb75819cd
--- /dev/null
+++ b/databases/pgagroal/files/pgagroal.in
@@ -0,0 +1,35 @@
+#!/bin/sh
+
+# PROVIDE: pgagroal
+# REQUIRE: LOGIN
+# BEFORE:  securelevel
+# KEYWORD: shutdown
+
+# Add the following lines to /etc/rc.conf to enable pgagroal:
+#
+# pgagroal_enable (bool):      Set to "YES" to enable pgagroal
+#                               Default is "NO".
+# pgagroal_conf (path):        Set full path to configuration file.
+#                               Default is "%%PREFIX%%/etc/pgagroal.conf".
+# pgagroal_flags (string):     Additional flags passed to pgagroal.
+#                               Default is "".
+
+. /etc/rc.subr
+
+name="pgagroal"
+rcvar=pgagroal_enable
+
+load_rc_config "$name"
+: ${pgagroal_enable="NO"}
+: ${pgagroal_user="pgagroal"}
+: ${pgagroal_conf="%%PREFIX%%/etc/$name/$name.conf"}
+: ${pgagroal_hba_conf="%%PREFIX%%/etc/$name/pgagroal_hba.conf"}
+
+extra_commands="reload"
+
+command="%%PREFIX%%/bin/pgagroal"
+pidfile="%%PGAGROAL_RUNDIR%%/$name.pid"
+required_files="${pgagroal_conf} ${pgagroal_hba_conf}"
+command_args="-d -c ${pgagroal_conf} -a ${pgagroal_hba_conf}"
+
+run_rc_command "$1"
diff --git a/databases/pgagroal/pkg-descr b/databases/pgagroal/pkg-descr
new file mode 100644
index 000000000000..94afa4b97306
--- /dev/null
+++ b/databases/pgagroal/pkg-descr
@@ -0,0 +1,8 @@
+pgagroal is a high-performance protocol-native connection pool for
+PostgreSQL. Which features High performance, Connection pool, Limit
+connections for users and databases, Prefill support, Remove idle
+connections, Connection validation, Enable / disable database access,
+Graceful / fast shutdown, Prometheus support, Grafana 8 dashboard,
+Remote management, Authentication query support, Failover support,
+Transport Layer Security (TLS) v1.2+ support, Daemon support, User
+vault, Lightweight connection pooler for PostgreSQL.
diff --git a/databases/pgagroal/pkg-plist b/databases/pgagroal/pkg-plist
new file mode 100644
index 000000000000..ce32ef26fe91
--- /dev/null
+++ b/databases/pgagroal/pkg-plist
@@ -0,0 +1,16 @@
+bin/pgagroal
+bin/pgagroal-admin
+bin/pgagroal-cli
+@sample %%ETCDIR%%/pgagroal.conf.sample
+@sample %%ETCDIR%%/pgagroal_hba.conf.sample
+lib/libpgagroal.so
+lib/libpgagroal.so.1
+lib/libpgagroal.so.1.4.2
+share/man/man1/pgagroal-admin.1.gz
+share/man/man1/pgagroal-cli.1.gz
+share/man/man1/pgagroal.1.gz
+share/man/man5/pgagroal.conf.5.gz
+share/man/man5/pgagroal_databases.conf.5.gz
+share/man/man5/pgagroal_hba.conf.5.gz
+@dir(%%PGAGROAL_USER%%,%%PGAGROAL_GROUP%%,) %%PGAGROAL_LOGDIR%%
+@dir(%%PGAGROAL_USER%%,%%PGAGROAL_GROUP%%,) %%PGAGROAL_RUNDIR%%
diff --git a/databases/pgbackrest/Makefile b/databases/pgbackrest/Makefile
index 0df5f7b68f62..99d7f8a1cb99 100644
--- a/databases/pgbackrest/Makefile
+++ b/databases/pgbackrest/Makefile
@@ -1,21 +1,23 @@
 PORTNAME=	pgbackrest
-DISTVERSION=	2.33
+DISTVERSIONPREFIX=	release/
+DISTVERSION=	2.49
 CATEGORIES=	databases
 
 MAINTAINER=	schoutm@gmail.com
 COMMENT=	Reliable PostgreSQL Backup & Restore
+WWW=		https://pgbackrest.org/
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/../LICENSE
 
-LIB_DEPENDS=	liblz4.so:archivers/liblz4
+LIB_DEPENDS=	liblz4.so:archivers/liblz4 \
+		libyaml.so:textproc/libyaml
 
 USES=		gmake gnome pkgconfig pgsql ssl
 USE_GNOME=	libxml2
 GNU_CONFIGURE=	yes
 
 USE_GITHUB=	yes
-GH_TAGNAME=	release/${DISTVERSION}
 
 WRKSRC_SUBDIR=	src
 
diff --git a/databases/pgbackrest/distinfo b/databases/pgbackrest/distinfo
index 17541cb0679c..f3db3ba835a5 100644
--- a/databases/pgbackrest/distinfo
+++ b/databases/pgbackrest/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1618942356
-SHA256 (pgbackrest-pgbackrest-2.33-release-2.33_GH0.tar.gz) = 772afaf5cae17fa1fa102c84576b8d6a5074ba3ff510bb86d321c98feebff837
-SIZE (pgbackrest-pgbackrest-2.33-release-2.33_GH0.tar.gz) = 5642397
+TIMESTAMP = 1704919820
+SHA256 (pgbackrest-pgbackrest-release-2.49_GH0.tar.gz) = 32a2d1bd504cc13f6e01533811104da39e2e842cdd8a7ba87293021cf03162f3
+SIZE (pgbackrest-pgbackrest-release-2.49_GH0.tar.gz) = 6162457
diff --git a/databases/pgbackrest/pkg-descr b/databases/pgbackrest/pkg-descr
index 33b92b8d96c9..24ab6fd57d3e 100644
--- a/databases/pgbackrest/pkg-descr
+++ b/databases/pgbackrest/pkg-descr
@@ -1,5 +1,3 @@
 pgBackRest aims to be a reliable, easy-to-use backup and restore solution for
 PostgreSQL that can seamlessly scale up to the largest databases and workloads
 by utilizing algorithms that are optimized for database-specific requirements.
-
-WWW: https://pgbackrest.org/
diff --git a/databases/pgbadger/Makefile b/databases/pgbadger/Makefile
index 7063f72ca9fb..057a1667dc6e 100644
--- a/databases/pgbadger/Makefile
+++ b/databases/pgbadger/Makefile
@@ -1,12 +1,11 @@
-# Created by: Palle Girgensohn <girgen@FreeBSD.org>
-
 PORTNAME=	pgbadger
-PORTVERSION=	11.6
+PORTVERSION=	12.4
 DISTVERSIONPREFIX=v
 CATEGORIES=	databases
 
 MAINTAINER=	girgen@FreeBSD.org
 COMMENT=	Very competent log analyzer for PostgreSQL
+WWW=		http://dalibo.github.com/pgbadger/
 
 LICENSE=	PostgreSQL
 
diff --git a/databases/pgbadger/distinfo b/databases/pgbadger/distinfo
index 320b8c94f16b..095320fc2ae5 100644
--- a/databases/pgbadger/distinfo
+++ b/databases/pgbadger/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1630870159
-SHA256 (darold-pgbadger-v11.6_GH0.tar.gz) = 9c8744f76123021c2d15da8521d77b3f529e50702fb3518c4d0e0311e457a3ec
-SIZE (darold-pgbadger-v11.6_GH0.tar.gz) = 2974369
+TIMESTAMP = 1703610684
+SHA256 (darold-pgbadger-v12.4_GH0.tar.gz) = 25456f0ea76e1de946d2bf09d937e9e830ca953ae4544a72bb9b747f11b4711a
+SIZE (darold-pgbadger-v12.4_GH0.tar.gz) = 4062907
diff --git a/databases/pgbadger/pkg-descr b/databases/pgbadger/pkg-descr
index 7982a41d4283..18e7eae3e92f 100644
--- a/databases/pgbadger/pkg-descr
+++ b/databases/pgbadger/pkg-descr
@@ -1,3 +1 @@
 PostgreSQL log analyzer with fully detailed reports and charts.
-
-WWW: http://dalibo.github.com/pgbadger/
diff --git a/databases/pgbarman/Makefile b/databases/pgbarman/Makefile
index b335b9056545..0be1855d0c1f 100644
--- a/databases/pgbarman/Makefile
+++ b/databases/pgbarman/Makefile
@@ -1,26 +1,27 @@
-# Created by: Matthew Seaman
-
-PORTNAME=	barman
-DISTVERSION=	2.12
-CATEGORIES=	databases
-MASTER_SITES=	SF/${PKGNAMEPREFIX}${PORTNAME}/${DISTVERSION}
-PKGNAMEPREFIX=	pg
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} manual.pdf
-EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
+PORTNAME=		barman
+DISTVERSIONPREFIX=	release/
+DISTVERSION=		3.10.0
+PORTREVISION=	1
+CATEGORIES=		databases
+PKGNAMEPREFIX=		pg
+PKGNAMESUFFIX=		${PYTHON_PKGNAMESUFFIX}
 
 MAINTAINER=	matthew@FreeBSD.org
 COMMENT=	Backup and recovery manager for PostgreSQL
+WWW=		https://pgbarman.org/
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS=	rsync:net/rsync						\
-		${PYTHON_PKGNAMEPREFIX}psycopg2>0:databases/py-psycopg2@${PY_FLAVOR}	\
-		${PYTHON_PKGNAMEPREFIX}dateutil>=2.1:devel/py-dateutil@${PY_FLAVOR}	\
-		${PYTHON_PKGNAMEPREFIX}argh>=0.21.2:devel/py-argh@${PY_FLAVOR} \
+RUN_DEPENDS=	rsync:net/rsync									\
+		${PYTHON_PKGNAMEPREFIX}psycopg2>=2.4.2:databases/py-psycopg2@${PY_FLAVOR}	\
+		${PYTHON_PKGNAMEPREFIX}python-dateutil>0:devel/py-python-dateutil@${PY_FLAVOR}		\
 		${PYTHON_PKGNAMEPREFIX}argcomplete>0:devel/py-argcomplete@${PY_FLAVOR}
 
-USES=		pgsql python:3.6+
-USE_PYTHON=	autoplist distutils concurrent optsuffix
+USES=		python
+USE_PYTHON=	autoplist distutils
+
+USE_GITHUB=	yes
+GH_ACCOUNT=	EnterpriseDB
 
 WANT_PGSQL=	client
 NO_ARCH=	yes
@@ -28,20 +29,9 @@ NO_ARCH=	yes
 USERS=		barman
 GROUPS=		barman
 
-PORTDOCS=	manual.pdf
-
-OPTIONS_DEFINE=	DOCS
-
 .include <bsd.port.pre.mk>
 
-.if ${PGSQL_VER:M9\.[12345]}
 PGUSER=		pgsql
-.else
-PGUSER=		postgres
-.endif
-
-post-extract:
-	${CP} ${DISTDIR}/${PORTDOCS} ${WRKDIR}/
 
 post-patch:
 	${SED} -i -e "s@%%PREFIX%%@${PREFIX}@" ${WRKSRC}/barman/config.py
@@ -53,8 +43,4 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/doc/barman.conf \
 		${STAGEDIR}${ETCDIR}/barman.conf.sample
 
-post-install-DOCS-on:
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${WRKDIR}/${PORTDOCS} ${STAGEDIR}${DOCSDIR}
-
 .include <bsd.port.post.mk>
diff --git a/databases/pgbarman/distinfo b/databases/pgbarman/distinfo
index aff7e52a552d..1a2af626919f 100644
--- a/databases/pgbarman/distinfo
+++ b/databases/pgbarman/distinfo
@@ -1,5 +1,3 @@
-TIMESTAMP = 1604832658
-SHA256 (barman-2.12.tar.gz) = 4ecf08ead94fd86469f7438820a5f2f9c4565af50edd29bceb3ab676d54fe581
-SIZE (barman-2.12.tar.gz) = 1262415
-SHA256 (manual.pdf) = 67ffc0edc6132eb0ec0e3630ba12caeaa21c082ad26af021bbde9b3678c8c664
-SIZE (manual.pdf) = 1317206
+TIMESTAMP = 1706294722
+SHA256 (EnterpriseDB-barman-release-3.10.0_GH0.tar.gz) = 171c61f24d0ffa0c96427043d91c218afff893a34bfd4ca1cd0c10b768943c8e
+SIZE (EnterpriseDB-barman-release-3.10.0_GH0.tar.gz) = 1851778
diff --git a/databases/pgbarman/files/patch-barman_config.py b/databases/pgbarman/files/patch-barman_config.py
index 9c510c52f6b6..f5ff6b265be0 100644
--- a/databases/pgbarman/files/patch-barman_config.py
+++ b/databases/pgbarman/files/patch-barman_config.py
@@ -1,13 +1,13 @@
---- barman/config.py.orig	2019-12-02 10:19:28 UTC
+--- barman/config.py.orig	2023-10-03 12:56:33 UTC
 +++ barman/config.py
-@@ -592,8 +592,8 @@ class Config(object):
-     """
+@@ -802,8 +802,8 @@ class Config(object):
+ 
      CONFIG_FILES = [
-         '~/.barman.conf',
--        '/etc/barman.conf',
--        '/etc/barman/barman.conf',
-+        '%%PREFIX%%/etc/barman.conf',
-+        '%%PREFIX%%/etc/barman/barman.conf',
+         "~/.barman.conf",
+-        "/etc/barman.conf",
+-        "/etc/barman/barman.conf",
++        "%%PREFIX%%/etc/barman.conf",
++        "%%PREFIX%%/etc/barman/barman.conf",
      ]
  
      _QUOTE_RE = re.compile(r"""^(["'])(.*)\1$""")
diff --git a/databases/pgbarman/files/patch-doc_barman.5 b/databases/pgbarman/files/patch-doc_barman.5
index f753f01839fc..2f63c46013e8 100644
--- a/databases/pgbarman/files/patch-doc_barman.5
+++ b/databases/pgbarman/files/patch-doc_barman.5
@@ -1,12 +1,12 @@
---- doc/barman.5.orig	2019-12-02 10:19:28 UTC
+--- doc/barman.5.orig	2023-10-03 12:56:33 UTC
 +++ doc/barman.5
-@@ -17,7 +17,7 @@ The system-level Barman configuration file is located 
+@@ -17,7 +17,7 @@ The system\-level Barman configuration file is located
  .IP
  .nf
  \f[C]
 -/etc/barman.conf
 +%%PREFIX%%/etc/barman.conf
- \f[R]
+ \f[]
  .fi
  .PP
 @@ -25,7 +25,7 @@ or
@@ -15,44 +15,44 @@
  \f[C]
 -/etc/barman/barman.conf
 +%%PREFIX%%/etc/barman/barman.conf
- \f[R]
+ \f[]
  .fi
  .PP
-@@ -51,9 +51,9 @@ configurations.
- If the value of \f[C]configuration_files_directory\f[R] is a directory,
- Barman reads all files with \f[C].conf\f[R] extension that exist in that
- folder.
--For example, if you set it to \f[C]/etc/barman.d\f[R], you can specify
-+For example, if you set it to \f[C]%%PREFIX%%/etc/barman.d\f[R], you can specify
+@@ -51,9 +51,9 @@ that folder.
+ If the value of \f[C]configuration_files_directory\f[] is a directory,
+ Barman reads all files with \f[C]\&.conf\f[] extension that exist in
+ that folder.
+-For example, if you set it to \f[C]/etc/barman.d\f[], you can specify
++For example, if you set it to \f[C]%%PREFIX%%/etc/barman.d\f[], you can specify
  your PostgreSQL servers placing each section in a separate
--\f[C].conf\f[R] file inside the \f[C]/etc/barman.d\f[R] folder.
-+\f[C].conf\f[R] file inside the \f[C]%%PREFIX%%/etc/barman.d\f[R] folder.
+-\f[C]\&.conf\f[] file inside the \f[C]/etc/barman.d\f[] folder.
++\f[C]\&.conf\f[] file inside the \f[C]%%PREFIX%%/etc/barman.d\f[] folder.
  .SH OPTIONS
  .TP
- active
-@@ -632,7 +632,7 @@ Here is an example of configuration file:
+ .B active
+@@ -1082,7 +1082,7 @@ Here is an example of configuration file:
  \f[C]
  [barman]
- ; Main directory
--barman_home = /var/lib/barman
-+barman_home = /var/barman
+ ;\ Main\ directory
+-barman_home\ =\ /var/lib/barman
++barman_home\ =\ /var/barman
  
- ; System user
- barman_user = barman
-@@ -652,13 +652,13 @@ reuse_backup = link
- description =  \[dq]Main PostgreSQL Database\[dq]
+ ;\ System\ user
+ barman_user\ =\ barman
+@@ -1102,13 +1102,13 @@ description\ =\ \ "Main\ PostgreSQL\ Database"
+ description\ =\ \ "Main\ PostgreSQL\ Database"
  
- ; SSH options
--ssh_command = ssh postgres\[at]pg
-+ssh_command = ssh %%PGUSER%%\[at]pg
+ ;\ SSH\ options
+-ssh_command\ =\ ssh\ postgres\@pg
++ssh_command\ =\ ssh\ %%PGUSER%%\@pg
  
- ; PostgreSQL connection string
--conninfo = host=pg user=postgres
-+conninfo = host=pg user=%%PGUSER%%
+ ;\ PostgreSQL\ connection\ string
+-conninfo\ =\ host=pg\ user=postgres
++conninfo\ =\ host=pg\ user=%%PGUSER%%
  
- ; PostgreSQL streaming connection string
--streaming_conninfo = host=pg user=postgres
-+streaming_conninfo = host=pg user=%%PGUSER%%
+ ;\ PostgreSQL\ streaming\ connection\ string
+-streaming_conninfo\ =\ host=pg\ user=postgres
++streaming_conninfo\ =\ host=pg\ user=%%PGUSER%%
  
- ; Minimum number of required backups (redundancy)
- minimum_redundancy = 1
+ ;\ Minimum\ number\ of\ required\ backups\ (redundancy)
+ minimum_redundancy\ =\ 1
diff --git a/databases/pgbarman/files/patch-doc_barman.conf b/databases/pgbarman/files/patch-doc_barman.conf
index bc97a103b353..b2993aff915d 100644
--- a/databases/pgbarman/files/patch-doc_barman.conf
+++ b/databases/pgbarman/files/patch-doc_barman.conf
@@ -1,6 +1,6 @@
---- doc/barman.conf.orig	2016-09-23 12:56:55 UTC
+--- doc/barman.conf.orig	2023-10-03 12:56:33 UTC
 +++ doc/barman.conf
-@@ -8,11 +8,11 @@
+@@ -8,11 +8,11 @@ barman_user = barman
  barman_user = barman
  
  ; Directory of configuration files. Place your sections in separate files with .conf extension
diff --git a/databases/pgbarman/files/patch-setup.py b/databases/pgbarman/files/patch-setup.py
deleted file mode 100644
index 1dc83e103ea2..000000000000
--- a/databases/pgbarman/files/patch-setup.py
+++ /dev/null
@@ -1,27 +0,0 @@
---- setup.py.orig	2020-07-08 09:12:30 UTC
-+++ setup.py
-@@ -70,15 +70,15 @@ setup(
-     url='http://www.pgbarman.org/',
-     packages=find_packages(exclude=["tests"]),
-     data_files=[
--        ('share/man/man1', ['doc/barman.1',
--                            'doc/barman-cloud-backup.1',
--                            'doc/barman-cloud-backup-list.1',
--                            'doc/barman-cloud-restore.1',
--                            'doc/barman-cloud-wal-archive.1',
--                            'doc/barman-cloud-wal-restore.1',
--                            'doc/barman-wal-archive.1',
--                            'doc/barman-wal-restore.1']),
--        ('share/man/man5', ['doc/barman.5']),
-+        ('man/man1', ['doc/barman.1',
-+                      'doc/barman-cloud-backup.1',
-+                      'doc/barman-cloud-backup-list.1',
-+                      'doc/barman-cloud-restore.1',
-+                      'doc/barman-cloud-wal-archive.1',
-+                      'doc/barman-cloud-wal-restore.1',
-+                      'doc/barman-wal-archive.1',
-+                      'doc/barman-wal-restore.1']),
-+        ('man/man5', ['doc/barman.5']),
-     ],
-     entry_points={
-         'console_scripts': [
diff --git a/databases/pgbarman/pkg-descr b/databases/pgbarman/pkg-descr
index 993918f101e1..56f3babff464 100644
--- a/databases/pgbarman/pkg-descr
+++ b/databases/pgbarman/pkg-descr
@@ -7,5 +7,3 @@ PostgreSQL servers written in Python.
 It allows your organisation to perform remote backups of multiple
 servers in business critical environments and helps DBAs during the
 recovery phase.
-
-WWW: http://www.pgbarman.org/
diff --git a/databases/pgbouncer/Makefile b/databases/pgbouncer/Makefile
index 3f93989c4369..e61ea879ea40 100644
--- a/databases/pgbouncer/Makefile
+++ b/databases/pgbouncer/Makefile
@@ -1,60 +1,60 @@
-# Created by: Sergey Skvortsov <skv@protey.ru>
-
 PORTNAME=	pgbouncer
-PORTVERSION=	1.14.0
-PORTREVISION=	1
+PORTVERSION=	1.22.1
 CATEGORIES=	databases
-MASTER_SITES=	https://pgbouncer.github.io/downloads/files/${PORTVERSION}/ \
-		http://pgbouncer.github.io/downloads/files/${PORTVERSION}/
+MASTER_SITES=	https://www.pgbouncer.org/downloads/files/${PORTVERSION}/ \
+		http://www.pgbouncer.org/downloads/files/${PORTVERSION}/
 
-MAINTAINER=	m.tsatsenko@gmail.com
+MAINTAINER=	dmitry.wagin@ya.ru
 COMMENT=	Lightweight connection pooler for PostgreSQL
+WWW=		https://www.pgbouncer.org/
 
 LICENSE=	BSD2CLAUSE
 
 LIB_DEPENDS=	libevent.so:devel/libevent
-BUILD_DEPENDS+=	${LOCALBASE}/bin/gsed:textproc/gsed
 
-USES=		gmake ssl pkgconfig
+USES=		cpe gmake pkgconfig ssl
+USE_RC_SUBR=	pgbouncer
+
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--enable-evdns \
+		--with-libevent=${LOCALBASE}
+CONFIGURE_ENV+=	PTHREAD_LIBS="-lpthread"
 
 PORTSCOUT=	site:https://pgbouncer.github.io/downloads/
+SUB_FILES=	pkg-message
+SUB_LIST+=	PGBOUNCER_RUNDIR="${PGBOUNCER_RUNDIR}"
 
-USERS=		pgbouncer
-GROUPS=		pgbouncer
+USERS=		${PGBOUNCER_USER}
+GROUPS=		${PGBOUNCER_GROUP}
 
-USE_RC_SUBR=	pgbouncer
-GNU_CONFIGURE=	yes
+PLIST_SUB+=	PGBOUNCER_GROUP="${GROUPS}" \
+		PGBOUNCER_LOGDIR="${PGBOUNCER_LOGDIR}" \
+		PGBOUNCER_RUNDIR="${PGBOUNCER_RUNDIR}" \
+		PGBOUNCER_USER="${USERS}"
 
 OPTIONS_DEFINE=	CARES
+
 CARES_LIB_DEPENDS=	libcares.so:dns/c-ares
 CARES_CONFIGURE_WITH=	cares
 
-CONFIGURE_ARGS=	--with-libevent=${LOCALBASE} --enable-evdns
-CONFIGURE_ENV+=	PTHREAD_LIBS="-lpthread"
-
-PGBOUNCER_USER?=	pgbouncer
 PGBOUNCER_GROUP?=	pgbouncer
+PGBOUNCER_USER?=	pgbouncer
 
 PGBOUNCER_RUNDIR?=	/var/run/pgbouncer
 PGBOUNCER_LOGDIR?=	/var/log/pgbouncer
 
-PLIST_SUB+=	PGBOUNCER_USER="${USERS}" \
-		PGBOUNCER_GROUP="${GROUPS}" \
-		PGBOUNCER_LOGDIR="${PGBOUNCER_LOGDIR}" \
-		PGBOUNCER_RUNDIR="${PGBOUNCER_RUNDIR}"
-SUB_LIST+=	PGBOUNCER_RUNDIR="${PGBOUNCER_RUNDIR}"
-
 post-patch:
-	@${REINPLACE_CMD} -e "s|= pgbouncer.log|= ${PGBOUNCER_LOGDIR}/pgbouncer.log|g" \
-		-e "s|= pgbouncer.pid|= ${PGBOUNCER_RUNDIR}/pgbouncer.pid|g" \
+	@${REINPLACE_CMD} -e "s|= /etc/pgbouncer/userlist.txt|= ${PREFIX}/etc/pgbouncer.users|g" \
+		-e "s|= /var/log/pgbouncer/pgbouncer.log|= ${PGBOUNCER_LOGDIR}/pgbouncer.log|g" \
+		-e "s|= /var/run/pgbouncer/pgbouncer.pid|= ${PGBOUNCER_RUNDIR}/pgbouncer.pid|g" \
+		-e "s|= /etc/pgbouncer/resolv.conf|= ${PREFIX}/etc/pgbouncer-resolv.conf|g" \
+		-e "s|include /etc/pgbouncer/pgbouncer-other.ini|include ${PREFIX}/etc/pgbouncer-other.ini|g" \
 		${WRKSRC}/etc/pgbouncer.ini
-	@${REINPLACE_CMD} -e "s|sed -n|${LOCALBASE}/bin/gsed -n|g" \
-		${WRKSRC}/lib/find_modules.sh
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/pgbouncer ${STAGEDIR}${PREFIX}/bin/
-	${INSTALL_MAN} ${WRKSRC}/doc/pgbouncer.1 ${STAGEDIR}${PREFIX}/man/man1/
-	${INSTALL_MAN} ${WRKSRC}/doc/pgbouncer.5 ${STAGEDIR}${PREFIX}/man/man5/
+	${INSTALL_MAN} ${WRKSRC}/doc/pgbouncer.1 ${STAGEDIR}${PREFIX}/share/man/man1/
+	${INSTALL_MAN} ${WRKSRC}/doc/pgbouncer.5 ${STAGEDIR}${PREFIX}/share/man/man5/
 	${INSTALL_DATA} ${WRKSRC}/etc/pgbouncer.ini \
 		${STAGEDIR}${PREFIX}/etc/pgbouncer.ini.sample
 	${INSTALL_DATA} ${WRKSRC}/etc/userlist.txt \
diff --git a/databases/pgbouncer/distinfo b/databases/pgbouncer/distinfo
index b490dccd8afa..3a5f02bca9e9 100644
--- a/databases/pgbouncer/distinfo
+++ b/databases/pgbouncer/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1592427794
-SHA256 (pgbouncer-1.14.0.tar.gz) = a0c13d10148f557e36ff7ed31793abb7a49e1f8b09aa2d4695d1c28fa101fee7
-SIZE (pgbouncer-1.14.0.tar.gz) = 578955
+TIMESTAMP = 1709578392
+SHA256 (pgbouncer-1.22.1.tar.gz) = 2b018aa6ce7f592c9892bb9e0fd90262484eb73937fd2af929770a45373ba215
+SIZE (pgbouncer-1.22.1.tar.gz) = 677351
diff --git a/databases/pgbouncer/files/patch-src_pooler.c b/databases/pgbouncer/files/patch-src_pooler.c
deleted file mode 100644
index 6ea7b0c1dc0c..000000000000
--- a/databases/pgbouncer/files/patch-src_pooler.c
+++ /dev/null
@@ -1,25 +0,0 @@
---- src/pooler.c.orig	2020-05-26 09:38:55 UTC
-+++ src/pooler.c
-@@ -127,16 +127,16 @@ static bool add_listen(int af, const struct sockaddr *
- 	 * unportable, so perhaps better to avoid it.)
- 	 */
- 	if (af != AF_UNIX && cf_so_reuseport) {
--#if defined(SO_REUSEPORT)
-+#if defined(SO_REUSEPORT_LB)
- 		int val = 1;
--		errpos = "setsockopt/SO_REUSEPORT";
--		res = setsockopt(sock, SOL_SOCKET, SO_REUSEPORT, &val, sizeof(val));
-+		errpos = "setsockopt/SO_REUSEPORT_LB";
-+		res = setsockopt(sock, SOL_SOCKET, SO_REUSEPORT_LB, &val, sizeof(val));
- 		if (res < 0)
- 			goto failed;
--#elif defined(SO_REUSEPORT_LB)
-+#elif defined(SO_REUSEPORT)
- 		int val = 1;
--		errpos = "setsockopt/SO_REUSEPORT_LB";
--		res = setsockopt(sock, SOL_SOCKET, SO_REUSEPORT_LB, &val, sizeof(val));
-+		errpos = "setsockopt/SO_REUSEPORT";
-+		res = setsockopt(sock, SOL_SOCKET, SO_REUSEPORT, &val, sizeof(val));
- 		if (res < 0)
- 			goto failed;
- #else
diff --git a/databases/pgbouncer/files/pgbouncer.in b/databases/pgbouncer/files/pgbouncer.in
index 5abb3925c2cc..ded6ed6cc112 100644
--- a/databases/pgbouncer/files/pgbouncer.in
+++ b/databases/pgbouncer/files/pgbouncer.in
@@ -13,6 +13,7 @@
 #                               Default is "%%PREFIX%%/etc/pgbouncer.ini".
 # pgbouncer_flags (string):     Additional flags passed to pgbouncer.
 #                               Default is "".
+# pgbouncer_sig_stop (str):     Default to "TERM"
 
 . /etc/rc.subr
 
@@ -24,11 +25,26 @@ load_rc_config "$name"
 : ${pgbouncer_user="pgbouncer"}
 : ${pgbouncer_conf="%%PREFIX%%/etc/$name.ini"}
 
-extra_commands="reload"
+gracefulstop_cmd="pgbouncer_gracefulstop"
+stop_precmd="pgbouncer_prestop"
+
+extra_commands="reload gracefulstop"
 
 command="%%PREFIX%%/bin/pgbouncer"
 pidfile="%%PGBOUNCER_RUNDIR%%/$name.pid"
 required_files="${pgbouncer_conf}"
 command_args="-d ${pgbouncer_conf}"
 
+pgbouncer_gracefulstop()
+{
+	echo "Performing a graceful stop:"
+	sig_stop="INT"
+	run_rc_command ${rc_prefix}stop ${rc_extra_args} || return 1
+}
+
+pgbouncer_prestop()
+{
+	sig_stop="${pgbouncer_sig_stop:-TERM}"
+}
+
 run_rc_command "$1"
diff --git a/databases/pgbouncer/pkg-descr b/databases/pgbouncer/pkg-descr
index 331017a021ad..177292cc8c26 100644
--- a/databases/pgbouncer/pkg-descr
+++ b/databases/pgbouncer/pkg-descr
@@ -1,3 +1 @@
 Lightweight connection pooler for PostgreSQL.
-
-WWW: https://pgbouncer.github.io/
diff --git a/databases/pgbouncer/pkg-plist b/databases/pgbouncer/pkg-plist
index 83102507d2ae..7c83546fb43e 100644
--- a/databases/pgbouncer/pkg-plist
+++ b/databases/pgbouncer/pkg-plist
@@ -1,6 +1,6 @@
 bin/pgbouncer
-man/man1/pgbouncer.1.gz
-man/man5/pgbouncer.5.gz
+share/man/man1/pgbouncer.1.gz
+share/man/man5/pgbouncer.5.gz
 @sample etc/pgbouncer.ini.sample
 @sample etc/pgbouncer.users.sample
 @dir(%%PGBOUNCER_USER%%,%%PGBOUNCER_GROUP%%,) %%PGBOUNCER_LOGDIR%%
diff --git a/databases/pgdbf/Makefile b/databases/pgdbf/Makefile
index 3b15d0ac8c51..94d0fa3c346e 100644
--- a/databases/pgdbf/Makefile
+++ b/databases/pgdbf/Makefile
@@ -1,20 +1,21 @@
-# Created by: kirk@daycos.com
-
 PORTNAME=	pgdbf
 PORTVERSION=	0.6.2
+PORTREVISION=	1
 CATEGORIES=	databases
 MASTER_SITES=	SF
 
 MAINTAINER=	kirk@strauser.com
 COMMENT=	Convert XBase / FoxPro tables to PostgreSQL
+WWW=		https://pgdbf.sourceforge.net/
 
 LICENSE=	GPLv3
 
 USES=		gmake tar:xz
 GNU_CONFIGURE=	yes
+GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
 
 PLIST_FILES=	bin/pgdbf \
 		%%DOCSDIR%%/README \
-		man/man1/pgdbf.1.gz
+		share/man/man1/pgdbf.1.gz
 
 .include <bsd.port.mk>
diff --git a/databases/pgdbf/pkg-descr b/databases/pgdbf/pkg-descr
index 1c3f645f4d24..96fd8d1fea14 100644
--- a/databases/pgdbf/pkg-descr
+++ b/databases/pgdbf/pkg-descr
@@ -5,5 +5,3 @@ Unix libraries. While the project is relatively tiny and simple, it's also
 heavily optimized via profiling - routine benchmark were many times faster
 than with other Open Source programs. In fact, even on slower systems,
 conversions are typically limited by hard drive speed.
-
-WWW: http://pgdbf.sourceforge.net/
diff --git a/databases/pgfouine/Makefile b/databases/pgfouine/Makefile
index 301faf4026a1..76980a3d820d 100644
--- a/databases/pgfouine/Makefile
+++ b/databases/pgfouine/Makefile
@@ -1,5 +1,3 @@
-# Created by: Pierre-Emmanuel Andre <pea@raveland.org>
-
 PORTNAME=	pgfouine
 PORTVERSION=	1.2
 CATEGORIES=	databases
@@ -8,11 +6,12 @@ MASTER_SITES=	http://pgfoundry.org/frs/download.php/2575/ \
 
 MAINTAINER=	pea@raveland.org
 COMMENT=	PostgreSQL log analyzer
+WWW=		http://pgfouine.projects.postgresql.org/
 
 USES+=		php
 
-NO_BUILD=	Yes
-USE_PHP=	gd pcre
+NO_BUILD=	yes
+USE_PHP=	gd
 
 OPTIONS_DEFINE=	DOCS
 
diff --git a/databases/pgfouine/pkg-descr b/databases/pgfouine/pkg-descr
index 65d499e4b5fd..88ef712881a6 100644
--- a/databases/pgfouine/pkg-descr
+++ b/databases/pgfouine/pkg-descr
@@ -1,5 +1,3 @@
 pgFouine is a PostgreSQL log analyzer used to generate detailed reports
 from a PostgreSQL log file. pgFouine can help you to determine which
 queries you should optimize to speed up your PostgreSQL based application.
-
-WWW: http://pgfouine.projects.postgresql.org/
diff --git a/databases/pgloader3/Makefile b/databases/pgloader3/Makefile
index b8df536a940b..d8f1437e775f 100644
--- a/databases/pgloader3/Makefile
+++ b/databases/pgloader3/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	pgloader
-PORTVERSION=	3.6.2
+PORTVERSION=	3.6.3
 DISTVERSIONPREFIX=	v
 CATEGORIES=	databases
 MASTER_SITES=	https://beta.quicklisp.org/archive/alexandria/2020-09-25/:alexandria \
@@ -32,7 +32,7 @@ MASTER_SITES=	https://beta.quicklisp.org/archive/alexandria/2020-09-25/:alexandr
 		https://beta.quicklisp.org/archive/cxml/2020-06-10/:cxml \
 		https://beta.quicklisp.org/archive/drakma/2019-11-30/:drakma \
 		https://beta.quicklisp.org/archive/dynamic-classes/2013-01-28/:dynamicclasses \
-		https://beta.quicklisp.org/archive/esrap/2020-12-20/:esrap \
+		https://beta.quicklisp.org/archive/esrap/2021-10-20/:esrap \
 		https://beta.quicklisp.org/archive/flexi-streams/2020-09-25/:flexistreams \
 		https://beta.quicklisp.org/archive/garbage-pools/2021-01-24/:garbagepools \
 		https://beta.quicklisp.org/archive/global-vars/2014-11-06/:globalvars \
@@ -93,7 +93,7 @@ DISTFILES=	alexandria-20200925-git.tgz:alexandria \
 		cxml-20200610-git.tgz:cxml \
 		drakma-v2.0.7.tgz:drakma \
 		dynamic-classes-20130128-git.tgz:dynamicclasses \
-		esrap-20201220-git.tgz:esrap \
+		esrap-20211020-git.tgz:esrap \
 		flexi-streams-20200925-git.tgz:flexistreams \
 		garbage-pools-20210124-git.tgz:garbagepools \
 		global-vars-20141106-git.tgz:globalvars \
@@ -127,6 +127,7 @@ DIST_SUBDIR=	pgloader
 
 MAINTAINER=	freebsd-washroom@duhanic.com
 COMMENT=	Data loading and migration tool for PostgreSQL using the COPY command
+WWW=		https://pgloader.io
 
 LICENSE=	PostgreSQL
 
@@ -195,7 +196,7 @@ post-extract:
 	${RLN} ${WRKDIR}/cxml-20200610-git ${WRKSRC}/${MY_QL_SW}
 	${RLN} ${WRKDIR}/drakma-v2.0.7 ${WRKSRC}/${MY_QL_SW}
 	${RLN} ${WRKDIR}/dynamic-classes-20130128-git ${WRKSRC}/${MY_QL_SW}
-	${RLN} ${WRKDIR}/esrap-20201220-git ${WRKSRC}/${MY_QL_SW}
+	${RLN} ${WRKDIR}/esrap-20211020-git ${WRKSRC}/${MY_QL_SW}
 	${RLN} ${WRKDIR}/flexi-streams-20200925-git ${WRKSRC}/${MY_QL_SW}
 	${RLN} ${WRKDIR}/garbage-pools-20210124-git ${WRKSRC}/${MY_QL_SW}
 	${RLN} ${WRKDIR}/global-vars-20141106-git ${WRKSRC}/${MY_QL_SW}
diff --git a/databases/pgloader3/distinfo b/databases/pgloader3/distinfo
index 8de2074ffcf8..99984e666394 100644
--- a/databases/pgloader3/distinfo
+++ b/databases/pgloader3/distinfo
@@ -1,4 +1,4 @@
-TIMESTAMP = 1613813074
+TIMESTAMP = 1646149110
 SHA256 (pgloader/alexandria-20200925-git.tgz) = d425c4106dbdf879d900d5979189c6df675323bd13cd0c0f80ea00a4ddb7fbb2
 SIZE (pgloader/alexandria-20200925-git.tgz) = 54730
 SHA256 (pgloader/anaphora-20210124-git.tgz) = 9b44816fc9a76f9293f9e1a714206a75ec94dcca59cd3e3173fa00b06de69d2c
@@ -59,8 +59,8 @@ SHA256 (pgloader/drakma-v2.0.7.tgz) = fc4f54a4b21632ded510a58b420b5a61e6772ce2f2
 SIZE (pgloader/drakma-v2.0.7.tgz) = 74290
 SHA256 (pgloader/dynamic-classes-20130128-git.tgz) = 4a93d3a39dca61c87b29877fa9707b647fc08f117f80f2a741f649e4d04c4b44
 SIZE (pgloader/dynamic-classes-20130128-git.tgz) = 7148
-SHA256 (pgloader/esrap-20201220-git.tgz) = 33cf9f99a3ee0716bc69cd29c035f5b1f2af8218924a9f36b6014594bc22117a
-SIZE (pgloader/esrap-20201220-git.tgz) = 69184
+SHA256 (pgloader/esrap-20211020-git.tgz) = f0f43009dc763ab41faa935db22ce2af183f825b4c1186ac12a8458da9da9819
+SIZE (pgloader/esrap-20211020-git.tgz) = 69199
 SHA256 (pgloader/flexi-streams-20200925-git.tgz) = 623d80b3a6a5ddfeec8365c940ddf2edba70ee85430f80767b645a399dcfbac2
 SIZE (pgloader/flexi-streams-20200925-git.tgz) = 442184
 SHA256 (pgloader/garbage-pools-20210124-git.tgz) = adb00cf419feb7dd625df71ffa1789573978fc11e67baa1e6fd4c21e5d15d7eb
@@ -119,8 +119,8 @@ SHA256 (pgloader/yason-v0.7.8.tgz) = c1193980a3588f163ecfd7810f221fbafa9fb8d1032
 SIZE (pgloader/yason-v0.7.8.tgz) = 27918
 SHA256 (pgloader/zs3-1.3.3.tgz) = d6b5e2958f68957269147a1047e9a4f619d6e18be98e68021e2c8ef208fbccb5
 SIZE (pgloader/zs3-1.3.3.tgz) = 57149
-SHA256 (pgloader/dimitri-pgloader-v3.6.2_GH0.tar.gz) = 33f87df9cb8f9a36f9836cd691ad6dfa72ae76200a12fe01ee89584f3b771ae7
-SIZE (pgloader/dimitri-pgloader-v3.6.2_GH0.tar.gz) = 3717111
+SHA256 (pgloader/dimitri-pgloader-v3.6.3_GH0.tar.gz) = 9dae3ebd29923f62967f734dc60599fafb451e778cd5e5e92f95ec229892bc4c
+SIZE (pgloader/dimitri-pgloader-v3.6.3_GH0.tar.gz) = 3718218
 SHA256 (pgloader/quicklisp-quicklisp-bootstrap-version-2015-01-28_GH0.tar.gz) = 92aef100970de4e64b102be1f08de1c9a9e8f22d6711f6aad217ffb6d16fc82f
 SIZE (pgloader/quicklisp-quicklisp-bootstrap-version-2015-01-28_GH0.tar.gz) = 13942
 SHA256 (pgloader/quicklisp-quicklisp-client-version-2021-02-13_GH0.tar.gz) = b0606eb7da7d98111430342a5cd6c7a3f7e2a86bdc4b0350e095d8dc06a995a2
diff --git a/databases/pgloader3/pkg-descr b/databases/pgloader3/pkg-descr
index 9438138e4903..14e63e88a1cb 100644
--- a/databases/pgloader3/pkg-descr
+++ b/databases/pgloader3/pkg-descr
@@ -7,5 +7,3 @@ Thanks to being able to load data directly from a database source, pgloader
 also supports migrations from other productions to PostgreSQL. In this mode of
 operation, pgloader handles both the schema and data parts of the migration in a
 single unmanned command, allowing to implement Continuous Migration.
-
-WWW: https://pgloader.io
diff --git a/databases/pglogical/Makefile b/databases/pglogical/Makefile
index f7d15d341fdb..a7784667e23a 100644
--- a/databases/pglogical/Makefile
+++ b/databases/pglogical/Makefile
@@ -1,16 +1,16 @@
-# Created by: Matthew Seaman
-
 PORTNAME=	pglogical
 DISTVERSIONPREFIX=	REL
-DISTVERSION=	2_4_0
+DISTVERSION=	2_4_4
 CATEGORIES=	databases
 
 MAINTAINER=	matthew@FreeBSD.org
 COMMENT=	Logical replication system as a PostgreSQL extension
+WWW=		https://www.2ndquadrant.com/en/resources-old/pglogical/
 
 LICENSE=	PostgreSQL
 
-USES=		compiler:c11 gettext-runtime gmake pgsql
+USES=		compiler:c11 cpe gettext-runtime gmake pgsql
+CPE_VENDOR=	2ndquadrant
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	2ndQuadrant
diff --git a/databases/pglogical/distinfo b/databases/pglogical/distinfo
index 0ad7125aea76..711257f5efb0 100644
--- a/databases/pglogical/distinfo
+++ b/databases/pglogical/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1629218136
-SHA256 (2ndQuadrant-pglogical-REL2_4_0_GH0.tar.gz) = cf3185b1317206aa75e52fed4dfa2ec9842a3585ba53a1b89e05f62c18395ef8
-SIZE (2ndQuadrant-pglogical-REL2_4_0_GH0.tar.gz) = 276352
+TIMESTAMP = 1696399728
+SHA256 (2ndQuadrant-pglogical-REL2_4_4_GH0.tar.gz) = 433213ab0fd71e63330c8778795e563fb5d7e6faf70791c0ba2d5613dc360ca9
+SIZE (2ndQuadrant-pglogical-REL2_4_4_GH0.tar.gz) = 280564
 SHA256 (2ndQuadrant-pglogical_dump-f66606d_GH0.tar.gz) = 09666d5927fe071c9a2ef64eb7028f793cfea10510a3d17e8ef4335349291e63
 SIZE (2ndQuadrant-pglogical_dump-f66606d_GH0.tar.gz) = 206722
diff --git a/databases/pglogical/pkg-descr b/databases/pglogical/pkg-descr
index 6d627e92af11..d30eb4de343c 100644
--- a/databases/pglogical/pkg-descr
+++ b/databases/pglogical/pkg-descr
@@ -3,5 +3,3 @@ PostgreSQL extension. Fully integrated, it requires no triggers or
 external programs. This alternative to physical replication is a
 highly efficient method of replicating data using a publish/subscribe
 model for selective replication.
-
-WWW: http://2ndquadrant.com/en/resources/pglogical/
diff --git a/databases/pglogical/pkg-plist b/databases/pglogical/pkg-plist
index aa86e80a6cf9..9a73d2ff0c03 100644
--- a/databases/pglogical/pkg-plist
+++ b/databases/pglogical/pkg-plist
@@ -32,7 +32,15 @@ share/postgresql/extension/pglogical--2.3.3--2.3.4.sql
 share/postgresql/extension/pglogical--2.3.3.sql
 share/postgresql/extension/pglogical--2.3.4--2.4.0.sql
 share/postgresql/extension/pglogical--2.3.4.sql
+share/postgresql/extension/pglogical--2.4.0--2.4.1.sql
 share/postgresql/extension/pglogical--2.4.0.sql
+share/postgresql/extension/pglogical--2.4.1--2.4.2.sql
+share/postgresql/extension/pglogical--2.4.1.sql
+share/postgresql/extension/pglogical--2.4.2--2.4.3.sql
+share/postgresql/extension/pglogical--2.4.2.sql
+share/postgresql/extension/pglogical--2.4.3--2.4.4.sql
+share/postgresql/extension/pglogical--2.4.3.sql
+share/postgresql/extension/pglogical--2.4.4.sql
 share/postgresql/extension/pglogical.control
 share/postgresql/extension/pglogical_origin--1.0.0.sql
 share/postgresql/extension/pglogical_origin.control
diff --git a/databases/pgmetrics/Makefile b/databases/pgmetrics/Makefile
index 142253f7a797..7ff0f5dc7242 100644
--- a/databases/pgmetrics/Makefile
+++ b/databases/pgmetrics/Makefile
@@ -1,21 +1,22 @@
-# Created by: Palle Girgensohn <girgen@FreeBSD.org>
-
 PORTNAME=	pgmetrics
-PORTVERSION=	1.11.0
+PORTVERSION=	1.16.0
 DISTVERSIONPREFIX=v
+PORTREVISION=	4
 CATEGORIES=	databases
 
 MAINTAINER=	girgen@FreeBSD.org
 COMMENT=	Collect and display info & stats from a running PostgreSQL server
+WWW=		https://pgmetrics.io/
 
 LICENSE=	APACHE20
 
 USES=		go:modules
 
-USE_GITHUB=	yes
+GO_MODULE=	github.com/rapidloop/pgmetrics
+#USE_GITHUB=	yes
 
-GH_ACCOUNT=	rapidloop
-GH_TUPLE=	\
+#GH_ACCOUNT=	rapidloop
+#GH_TUPLE=	\
 		aws:aws-sdk-go:v1.29.29:aws_aws_sdk_go/vendor/github.com/aws/aws-sdk-go \
 		dustin:go-humanize:bb3d318650d4:dustin_go_humanize/vendor/github.com/dustin/go-humanize \
 		golang:crypto:e9b2fee46413:golang_crypto/vendor/golang.org/x/crypto \
diff --git a/databases/pgmetrics/distinfo b/databases/pgmetrics/distinfo
index b1d15e9569db..10db1905ac46 100644
--- a/databases/pgmetrics/distinfo
+++ b/databases/pgmetrics/distinfo
@@ -1,23 +1,5 @@
-TIMESTAMP = 1618559219
-SHA256 (rapidloop-pgmetrics-v1.11.0_GH0.tar.gz) = e93ec6b03a20faa07a3796db1f65116353274453ae51df26feac315a2fb1cdea
-SIZE (rapidloop-pgmetrics-v1.11.0_GH0.tar.gz) = 58047
-SHA256 (aws-aws-sdk-go-v1.29.29_GH0.tar.gz) = f0818823a2402900216295cc95e64ff8042d698e031cc2a660528866d0fc15ec
-SIZE (aws-aws-sdk-go-v1.29.29_GH0.tar.gz) = 14308891
-SHA256 (dustin-go-humanize-bb3d318650d4_GH0.tar.gz) = 2528a929daba61ff84ee81b397321b022b2f1cc134068f0afac5edaeb4894894
-SIZE (dustin-go-humanize-bb3d318650d4_GH0.tar.gz) = 16387
-SHA256 (golang-crypto-e9b2fee46413_GH0.tar.gz) = f89e92c1a49c1ab6baa5bf6ffec24c4ad9884f29ede5bf97e7b6c82de320d3ba
-SIZE (golang-crypto-e9b2fee46413_GH0.tar.gz) = 1719160
-SHA256 (golang-sys-97732733099d_GH0.tar.gz) = 8d60fa6ab0c2b099f2c7d6f8c0a5df177c5c524183a2a38e0e8d2d18cde53532
-SIZE (golang-sys-97732733099d_GH0.tar.gz) = 1350239
-SHA256 (golang-text-v0.3.0_GH0.tar.gz) = 8f4c9a048345befc7beccd09267737ee1f55c7b35e5ff80f344ec9e0aa90febb
-SIZE (golang-text-v0.3.0_GH0.tar.gz) = 6102619
-SHA256 (howeyc-gopass-bf9dde6d0d2c_GH0.tar.gz) = 4f69179eda2622017750b469868d78c72e9c83da8c8af4d06d758b0876515dfb
-SIZE (howeyc-gopass-bf9dde6d0d2c_GH0.tar.gz) = 11290
-SHA256 (jmespath-go-jmespath-c2b33e8439af_GH0.tar.gz) = 1ccd468fe91f58cd1b144f6317f06b53bf0a5da5e03e6a399a2d03f087db1fe9
-SIZE (jmespath-go-jmespath-c2b33e8439af_GH0.tar.gz) = 48265
-SHA256 (pborman-getopt-7148bc3a4c30_GH0.tar.gz) = 1bc9d6aaa4f6b267259f22210d8be705cb4a75311a30f0878e5611254e683bc8
-SIZE (pborman-getopt-7148bc3a4c30_GH0.tar.gz) = 37925
-SHA256 (rapidloop-pq-66681b501d6d_GH0.tar.gz) = 5336e151ce069089c3375eae6c1edc2c8bbd8db66aee8f5a61a52b6295cd3ae3
-SIZE (rapidloop-pq-66681b501d6d_GH0.tar.gz) = 94214
-SHA256 (xdg-go-stringprep-v1.0.0_GH0.tar.gz) = 6d2a1dd2a5f6a5d74d9ecd74c4812cadca7a74b8da22ac2da0d993697638e58e
-SIZE (xdg-go-stringprep-v1.0.0_GH0.tar.gz) = 28567
+TIMESTAMP = 1696431138
+SHA256 (go/databases_pgmetrics/pgmetrics-v1.16.0/v1.16.0.mod) = ff02d7687a17e818eeb7c091dd5794bc0bb50dbdac8cd6a38f9c315e16957894
+SIZE (go/databases_pgmetrics/pgmetrics-v1.16.0/v1.16.0.mod) = 1142
+SHA256 (go/databases_pgmetrics/pgmetrics-v1.16.0/v1.16.0.zip) = 33e694ba5b6d9b863ba37283c50dab039ec3e15ae6792e0ea72f2f01779abca0
+SIZE (go/databases_pgmetrics/pgmetrics-v1.16.0/v1.16.0.zip) = 83170
diff --git a/databases/pgmetrics/pkg-descr b/databases/pgmetrics/pkg-descr
index 090706e24309..c39bbeddfa23 100644
--- a/databases/pgmetrics/pkg-descr
+++ b/databases/pgmetrics/pkg-descr
@@ -1,4 +1,2 @@
 pgmetrics collects and displays various information and statistics from a
 running PostgreSQL server to aid in troubleshooting, monitoring and automation.
-
-WWW: https://pgmetrics.io/
diff --git a/databases/pgmodeler/Makefile b/databases/pgmodeler/Makefile
index f5c7f48a975d..91aab7e0a873 100644
--- a/databases/pgmodeler/Makefile
+++ b/databases/pgmodeler/Makefile
@@ -1,25 +1,21 @@
-# Created by: Loïc BARTOLETTI
-
 PORTNAME=	pgmodeler
-PORTVERSION=	0.9.3
+PORTVERSION=	1.1.2
 DISTVERSIONPREFIX=	v
-DISTVERSIONSUFFIX=	-beta
-PORTREVISION=	1
 CATEGORIES=	databases
 
 MAINTAINER=	lbartoletti@FreeBSD.org
 COMMENT=	PostgreSQL Database Modeler
+WWW=		http://pgmodeler.com.br/
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-USES=		compiler:c++11-lib gl gmake gnome pgsql pkgconfig qmake qt:5 \
+USES=		compiler:c++11-lib gl gmake gnome pgsql pkgconfig qmake qt:6 \
 		xorg
 USE_GITHUB=	yes
 USE_GNOME=	libxml2
 USE_GL=		gl
-USE_QT=		core gui network printsupport sql svg widgets testlib uitools \
-		buildtools_build 
+USE_QT=		base svg tools
 USE_XORG=	x11 xext
 
 USE_LDCONFIG=	yes
diff --git a/databases/pgmodeler/distinfo b/databases/pgmodeler/distinfo
index ac9fc307162a..42d0215498de 100644
--- a/databases/pgmodeler/distinfo
+++ b/databases/pgmodeler/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1596015979
-SHA256 (pgmodeler-pgmodeler-v0.9.3-beta_GH0.tar.gz) = 4fd0ae4bf71ce1de5d2d881a247a5347788361b2f9be8e0556e2556db6c03baf
-SIZE (pgmodeler-pgmodeler-v0.9.3-beta_GH0.tar.gz) = 3698476
+TIMESTAMP = 1712952029
+SHA256 (pgmodeler-pgmodeler-v1.1.2_GH0.tar.gz) = de6a345bd5f3f2360fe93e6242ed320e00724cc3be13d1ac34c77cc30c3af7af
+SIZE (pgmodeler-pgmodeler-v1.1.2_GH0.tar.gz) = 4202157
diff --git a/databases/pgmodeler/files/patch-main_main.pro b/databases/pgmodeler/files/patch-main_main.pro
deleted file mode 100644
index 8d237e6ceaf8..000000000000
--- a/databases/pgmodeler/files/patch-main_main.pro
+++ /dev/null
@@ -1,11 +0,0 @@
---- main/main.pro.orig	2015-07-30 16:48:48 UTC
-+++ main/main.pro
-@@ -21,7 +21,7 @@ HEADERS += src/application.h
- SOURCES += src/main.cpp \
-            src/application.cpp
- 
--unix|windows: LIBS += -L$$OUT_PWD/../libpgmodeler_ui/ -lpgmodeler_ui \
-+unix|windows: LIBS += $$QMAKE_LIBS_EXECINFO -L$$OUT_PWD/../libpgmodeler_ui/ -lpgmodeler_ui \
-                     -L$$OUT_PWD/../libobjrenderer/ -lobjrenderer \
-                     -L$$OUT_PWD/../libpgconnector/ -lpgconnector \
-                     -L$$OUT_PWD/../libpgmodeler/ -lpgmodeler \
diff --git a/databases/pgmodeler/pkg-descr b/databases/pgmodeler/pkg-descr
index 77b37369d156..eddd3e1d9432 100644
--- a/databases/pgmodeler/pkg-descr
+++ b/databases/pgmodeler/pkg-descr
@@ -3,5 +3,3 @@ tool designed for PostgreSQL. No more DDL commands written by hand: let
 pgModeler do the job for you! This software reunites the concepts of
 entity-relationship diagrams and the features that PostgreSQL implements as
 extensions of SQL standards.
-
-WWW: http://pgmodeler.com.br/
diff --git a/databases/pgmodeler/pkg-plist b/databases/pgmodeler/pkg-plist
index 04924da24e7b..1802ad250484 100644
--- a/databases/pgmodeler/pkg-plist
+++ b/databases/pgmodeler/pkg-plist
@@ -1,26 +1,31 @@
 bin/pgmodeler
 bin/pgmodeler-ch
 bin/pgmodeler-cli
-lib/pgmodeler/libobjrenderer.so
-lib/pgmodeler/libobjrenderer.so.1
-lib/pgmodeler/libobjrenderer.so.1.0
-lib/pgmodeler/libobjrenderer.so.1.0.0
+bin/pgmodeler-se
+lib/pgmodeler/libcanvas.so
+lib/pgmodeler/libcanvas.so.1
+lib/pgmodeler/libcanvas.so.1.0
+lib/pgmodeler/libcanvas.so.1.0.0
+lib/pgmodeler/libcli.so
+lib/pgmodeler/libcli.so.1
+lib/pgmodeler/libcli.so.1.0
+lib/pgmodeler/libcli.so.1.0.0
+lib/pgmodeler/libconnector.so
+lib/pgmodeler/libconnector.so.1
+lib/pgmodeler/libconnector.so.1.0
+lib/pgmodeler/libconnector.so.1.0.0
+lib/pgmodeler/libcore.so
+lib/pgmodeler/libcore.so.1
+lib/pgmodeler/libcore.so.1.0
+lib/pgmodeler/libcore.so.1.0.0
+lib/pgmodeler/libgui.so
+lib/pgmodeler/libgui.so.1
+lib/pgmodeler/libgui.so.1.0
+lib/pgmodeler/libgui.so.1.0.0
 lib/pgmodeler/libparsers.so
 lib/pgmodeler/libparsers.so.1
 lib/pgmodeler/libparsers.so.1.0
 lib/pgmodeler/libparsers.so.1.0.0
-lib/pgmodeler/libpgconnector.so
-lib/pgmodeler/libpgconnector.so.1
-lib/pgmodeler/libpgconnector.so.1.0
-lib/pgmodeler/libpgconnector.so.1.0.0
-lib/pgmodeler/libpgmodeler.so
-lib/pgmodeler/libpgmodeler.so.1
-lib/pgmodeler/libpgmodeler.so.1.0
-lib/pgmodeler/libpgmodeler.so.1.0.0
-lib/pgmodeler/libpgmodeler_ui.so
-lib/pgmodeler/libpgmodeler_ui.so.1
-lib/pgmodeler/libpgmodeler_ui.so.1.0
-lib/pgmodeler/libpgmodeler_ui.so.1.0.0
 lib/pgmodeler/libutils.so
 lib/pgmodeler/libutils.so.1
 lib/pgmodeler/libutils.so.1.0
@@ -29,43 +34,50 @@ lib/pgmodeler/libutils.so.1.0.0
 %%DATADIR%%/LICENSE
 %%DATADIR%%/README.md
 %%DATADIR%%/RELEASENOTES.md
+%%DATADIR%%/conf/appearance.conf
 %%DATADIR%%/conf/connections.conf
+%%DATADIR%%/conf/defaults/appearance.conf
 %%DATADIR%%/conf/defaults/connections.conf
 %%DATADIR%%/conf/defaults/diff-presets.conf
 %%DATADIR%%/conf/defaults/example.dbm
-%%DATADIR%%/conf/defaults/objects-style.conf
+%%DATADIR%%/conf/defaults/general.conf
 %%DATADIR%%/conf/defaults/pattern-highlight.conf
-%%DATADIR%%/conf/defaults/pgmodeler.conf
 %%DATADIR%%/conf/defaults/relationships.conf
+%%DATADIR%%/conf/defaults/sch-highlight.conf
 %%DATADIR%%/conf/defaults/snippets.conf
 %%DATADIR%%/conf/defaults/sql-highlight.conf
-%%DATADIR%%/conf/defaults/ui-style.conf
 %%DATADIR%%/conf/defaults/xml-highlight.conf
 %%DATADIR%%/conf/diff-presets.conf
+%%DATADIR%%/conf/dtd/appearance.dtd
 %%DATADIR%%/conf/dtd/connections.dtd
 %%DATADIR%%/conf/dtd/diff-presets.dtd
-%%DATADIR%%/conf/dtd/objects-style.dtd
-%%DATADIR%%/conf/dtd/pgmodeler.dtd
+%%DATADIR%%/conf/dtd/general.dtd
 %%DATADIR%%/conf/dtd/relationships.dtd
 %%DATADIR%%/conf/dtd/snippets.dtd
 %%DATADIR%%/conf/dtd/source-code-highlight.dtd
 %%DATADIR%%/conf/dtd/sql-history.dtd
 %%DATADIR%%/conf/example.dbm
-%%DATADIR%%/conf/objects-style.conf
+%%DATADIR%%/conf/general.conf
+%%DATADIR%%/conf/icons-big.conf
+%%DATADIR%%/conf/icons-medium.conf
+%%DATADIR%%/conf/icons-small.conf
 %%DATADIR%%/conf/pattern-highlight.conf
-%%DATADIR%%/conf/pgmodeler.conf
 %%DATADIR%%/conf/pgmodeler_dbm.png
 %%DATADIR%%/conf/pgmodeler_logo.png
+%%DATADIR%%/conf/pgmodeler_sch.png
 %%DATADIR%%/conf/relationships.conf
+%%DATADIR%%/conf/sch-highlight.conf
+%%DATADIR%%/conf/schemas/appearance.sch
 %%DATADIR%%/conf/schemas/application-dbm.sch
+%%DATADIR%%/conf/schemas/application-sch.sch
 %%DATADIR%%/conf/schemas/commands.sch
 %%DATADIR%%/conf/schemas/connections.sch
+%%DATADIR%%/conf/schemas/desktop-sch.sch
 %%DATADIR%%/conf/schemas/desktop.sch
 %%DATADIR%%/conf/schemas/diff-presets.sch
 %%DATADIR%%/conf/schemas/file.sch
-%%DATADIR%%/conf/schemas/objects-style.sch
+%%DATADIR%%/conf/schemas/general.sch
 %%DATADIR%%/conf/schemas/patterns.sch
-%%DATADIR%%/conf/schemas/pgmodeler.sch
 %%DATADIR%%/conf/schemas/preset.sch
 %%DATADIR%%/conf/schemas/relationships.sch
 %%DATADIR%%/conf/schemas/snippet.sch
@@ -74,31 +86,39 @@ lib/pgmodeler/libutils.so.1.0.0
 %%DATADIR%%/conf/schemas/widget.sch
 %%DATADIR%%/conf/snippets.conf
 %%DATADIR%%/conf/sql-highlight.conf
+%%DATADIR%%/conf/sql-history.conf
+%%DATADIR%%/conf/themes/dark/appearance.conf
+%%DATADIR%%/conf/themes/dark/extra-ui-style.conf
+%%DATADIR%%/conf/themes/dark/pattern-highlight.conf
+%%DATADIR%%/conf/themes/dark/sch-highlight.conf
+%%DATADIR%%/conf/themes/dark/sql-highlight.conf
+%%DATADIR%%/conf/themes/dark/xml-highlight.conf
+%%DATADIR%%/conf/themes/inksaver/appearance.conf
+%%DATADIR%%/conf/themes/inksaver/extra-ui-style.conf
+%%DATADIR%%/conf/themes/inksaver/pattern-highlight.conf
+%%DATADIR%%/conf/themes/inksaver/sch-highlight.conf
+%%DATADIR%%/conf/themes/inksaver/sql-highlight.conf
+%%DATADIR%%/conf/themes/inksaver/xml-highlight.conf
+%%DATADIR%%/conf/themes/light/appearance.conf
+%%DATADIR%%/conf/themes/light/extra-ui-style.conf
+%%DATADIR%%/conf/themes/light/pattern-highlight.conf
+%%DATADIR%%/conf/themes/light/sch-highlight.conf
+%%DATADIR%%/conf/themes/light/sql-highlight.conf
+%%DATADIR%%/conf/themes/light/xml-highlight.conf
 %%DATADIR%%/conf/ui-style.conf
 %%DATADIR%%/conf/xml-highlight.conf
-%%DATADIR%%/lang/es_ES.qm
-%%DATADIR%%/lang/es_ES.ts
-%%DATADIR%%/lang/fr_FR.qm
-%%DATADIR%%/lang/fr_FR.ts
-%%DATADIR%%/lang/nl_NL.qm
-%%DATADIR%%/lang/nl_NL.ts
-%%DATADIR%%/lang/pt_BR.qm
-%%DATADIR%%/lang/pt_BR.ts
-%%DATADIR%%/lang/zh_CN.qm
-%%DATADIR%%/lang/zh_CN.ts
 %%DATADIR%%/samples/3dcitydb.dbm
+%%DATADIR%%/samples/cryptoconcept.dbm
 %%DATADIR%%/samples/demo.dbm
-%%DATADIR%%/samples/oldsample.dbm
+%%DATADIR%%/samples/northwind.dbm
 %%DATADIR%%/samples/pagila.dbm
 %%DATADIR%%/samples/usda.dbm
-%%DATADIR%%/schemas/alter/collation.sch
 %%DATADIR%%/schemas/alter/column.sch
-%%DATADIR%%/schemas/alter/constraint.sch
+%%DATADIR%%/schemas/alter/confparam.sch
 %%DATADIR%%/schemas/alter/database.sch
 %%DATADIR%%/schemas/alter/diff.sch
 %%DATADIR%%/schemas/alter/domain.sch
 %%DATADIR%%/schemas/alter/domconstraint.sch
-%%DATADIR%%/schemas/alter/eventtrigger.sch
 %%DATADIR%%/schemas/alter/extension.sch
 %%DATADIR%%/schemas/alter/foreigndatawrapper.sch
 %%DATADIR%%/schemas/alter/foreignserver.sch
@@ -108,9 +128,11 @@ lib/pgmodeler/libutils.so.1.0.0
 %%DATADIR%%/schemas/alter/owner.sch
 %%DATADIR%%/schemas/alter/permission.sch
 %%DATADIR%%/schemas/alter/policy.sch
+%%DATADIR%%/schemas/alter/procedure.sch
 %%DATADIR%%/schemas/alter/relationship.sch
 %%DATADIR%%/schemas/alter/rename.sch
 %%DATADIR%%/schemas/alter/role.sch
+%%DATADIR%%/schemas/alter/rolemembers.sch
 %%DATADIR%%/schemas/alter/schema.sch
 %%DATADIR%%/schemas/alter/sequence.sch
 %%DATADIR%%/schemas/alter/table.sch
@@ -141,6 +163,7 @@ lib/pgmodeler/libutils.so.1.0.0
 %%DATADIR%%/schemas/catalog/operator.sch
 %%DATADIR%%/schemas/catalog/opfamily.sch
 %%DATADIR%%/schemas/catalog/policy.sch
+%%DATADIR%%/schemas/catalog/procedure.sch
 %%DATADIR%%/schemas/catalog/role.sch
 %%DATADIR%%/schemas/catalog/rule.sch
 %%DATADIR%%/schemas/catalog/schema.sch
@@ -149,6 +172,7 @@ lib/pgmodeler/libutils.so.1.0.0
 %%DATADIR%%/schemas/catalog/table.sch
 %%DATADIR%%/schemas/catalog/tablespace.sch
 %%DATADIR%%/schemas/catalog/template.sch
+%%DATADIR%%/schemas/catalog/transform.sch
 %%DATADIR%%/schemas/catalog/trigger.sch
 %%DATADIR%%/schemas/catalog/usermapping.sch
 %%DATADIR%%/schemas/catalog/usertype.sch
@@ -156,17 +180,22 @@ lib/pgmodeler/libutils.so.1.0.0
 %%DATADIR%%/schemas/datadict/column.sch
 %%DATADIR%%/schemas/datadict/constraint.sch
 %%DATADIR%%/schemas/datadict/datadict.sch
+%%DATADIR%%/schemas/datadict/datadictidx.sch
 %%DATADIR%%/schemas/datadict/index.sch
 %%DATADIR%%/schemas/datadict/item.sch
 %%DATADIR%%/schemas/datadict/link.sch
+%%DATADIR%%/schemas/datadict/objects.sch
+%%DATADIR%%/schemas/datadict/sequence.sch
 %%DATADIR%%/schemas/datadict/styles.sch
 %%DATADIR%%/schemas/datadict/table.sch
+%%DATADIR%%/schemas/datadict/trigger.sch
 %%DATADIR%%/schemas/datadict/view.sch
 %%DATADIR%%/schemas/sql/aggregate.sch
 %%DATADIR%%/schemas/sql/cast.sch
 %%DATADIR%%/schemas/sql/collation.sch
 %%DATADIR%%/schemas/sql/column.sch
 %%DATADIR%%/schemas/sql/comment.sch
+%%DATADIR%%/schemas/sql/confparam.sch
 %%DATADIR%%/schemas/sql/constraint.sch
 %%DATADIR%%/schemas/sql/conversion.sch
 %%DATADIR%%/schemas/sql/database.sch
@@ -193,13 +222,16 @@ lib/pgmodeler/libutils.so.1.0.0
 %%DATADIR%%/schemas/sql/partitionkey.sch
 %%DATADIR%%/schemas/sql/permission.sch
 %%DATADIR%%/schemas/sql/policy.sch
+%%DATADIR%%/schemas/sql/procedure.sch
 %%DATADIR%%/schemas/sql/relationship.sch
 %%DATADIR%%/schemas/sql/role.sch
 %%DATADIR%%/schemas/sql/rule.sch
 %%DATADIR%%/schemas/sql/schema.sch
 %%DATADIR%%/schemas/sql/sequence.sch
+%%DATADIR%%/schemas/sql/sessionopts.sch
 %%DATADIR%%/schemas/sql/table.sch
 %%DATADIR%%/schemas/sql/tablespace.sch
+%%DATADIR%%/schemas/sql/transform.sch
 %%DATADIR%%/schemas/sql/trigger.sch
 %%DATADIR%%/schemas/sql/typeattribute.sch
 %%DATADIR%%/schemas/sql/usermapping.sch
@@ -213,6 +245,7 @@ lib/pgmodeler/libutils.so.1.0.0
 %%DATADIR%%/schemas/xml/collation.sch
 %%DATADIR%%/schemas/xml/column.sch
 %%DATADIR%%/schemas/xml/comment.sch
+%%DATADIR%%/schemas/xml/confparam.sch
 %%DATADIR%%/schemas/xml/constraint.sch
 %%DATADIR%%/schemas/xml/conversion.sch
 %%DATADIR%%/schemas/xml/customidxs.sch
@@ -249,23 +282,29 @@ lib/pgmodeler/libutils.so.1.0.0
 %%DATADIR%%/schemas/xml/dtd/opclass.dtd
 %%DATADIR%%/schemas/xml/dtd/operator.dtd
 %%DATADIR%%/schemas/xml/dtd/opfamily.dtd
+%%DATADIR%%/schemas/xml/dtd/parameter.dtd
 %%DATADIR%%/schemas/xml/dtd/permission.dtd
 %%DATADIR%%/schemas/xml/dtd/policy.dtd
+%%DATADIR%%/schemas/xml/dtd/procedure.dtd
+%%DATADIR%%/schemas/xml/dtd/reference.dtd
 %%DATADIR%%/schemas/xml/dtd/relationship.dtd
 %%DATADIR%%/schemas/xml/dtd/role.dtd
 %%DATADIR%%/schemas/xml/dtd/rule.dtd
 %%DATADIR%%/schemas/xml/dtd/schema.dtd
 %%DATADIR%%/schemas/xml/dtd/sequence.dtd
+%%DATADIR%%/schemas/xml/dtd/simplecol.dtd
 %%DATADIR%%/schemas/xml/dtd/table.dtd
 %%DATADIR%%/schemas/xml/dtd/tablespace.dtd
 %%DATADIR%%/schemas/xml/dtd/tag.dtd
 %%DATADIR%%/schemas/xml/dtd/textbox.dtd
+%%DATADIR%%/schemas/xml/dtd/transform.dtd
 %%DATADIR%%/schemas/xml/dtd/trigger.dtd
 %%DATADIR%%/schemas/xml/dtd/usermapping.dtd
 %%DATADIR%%/schemas/xml/dtd/usertype.dtd
 %%DATADIR%%/schemas/xml/dtd/view.dtd
 %%DATADIR%%/schemas/xml/element.sch
 %%DATADIR%%/schemas/xml/entry.sch
+%%DATADIR%%/schemas/xml/enumeration.sch
 %%DATADIR%%/schemas/xml/eventtrigger.sch
 %%DATADIR%%/schemas/xml/excelement.sch
 %%DATADIR%%/schemas/xml/extension.sch
@@ -290,6 +329,7 @@ lib/pgmodeler/libutils.so.1.0.0
 %%DATADIR%%/schemas/xml/policy.sch
 %%DATADIR%%/schemas/xml/position.sch
 %%DATADIR%%/schemas/xml/prependedsql.sch
+%%DATADIR%%/schemas/xml/procedure.sch
 %%DATADIR%%/schemas/xml/reference.sch
 %%DATADIR%%/schemas/xml/reftable.sch
 %%DATADIR%%/schemas/xml/relationship.sch
@@ -297,11 +337,13 @@ lib/pgmodeler/libutils.so.1.0.0
 %%DATADIR%%/schemas/xml/rule.sch
 %%DATADIR%%/schemas/xml/schema.sch
 %%DATADIR%%/schemas/xml/sequence.sch
+%%DATADIR%%/schemas/xml/simplecol.sch
 %%DATADIR%%/schemas/xml/style.sch
 %%DATADIR%%/schemas/xml/table.sch
 %%DATADIR%%/schemas/xml/tablespace.sch
 %%DATADIR%%/schemas/xml/tag.sch
 %%DATADIR%%/schemas/xml/textbox.sch
+%%DATADIR%%/schemas/xml/transform.sch
 %%DATADIR%%/schemas/xml/trigger.sch
 %%DATADIR%%/schemas/xml/typeattribute.sch
 %%DATADIR%%/schemas/xml/usermapping.sch
diff --git a/databases/pgpool-II-36/Makefile b/databases/pgpool-II-36/Makefile
deleted file mode 100644
index 0a4f58bd1e5b..000000000000
--- a/databases/pgpool-II-36/Makefile
+++ /dev/null
@@ -1,41 +0,0 @@
-PORTNAME=	pgpool-II
-PORTVERSION=	3.6.21
-CATEGORIES=	databases
-MASTER_SITES=	http://www.pgpool.net/mediawiki/images/
-PKGNAMESUFFIX=	36
-
-MAINTAINER=	tz@FreeBSD.org
-COMMENT=	Connection pool server for PostgreSQL
-
-LICENSE=	MIT
-LICENSE_FILE=	${WRKSRC}/COPYING
-
-PORTSCOUT=	limit:^3.6.[0-9]*
-
-USES=		gmake libtool pgsql:9.3+
-GNU_CONFIGURE=	yes
-USE_LDCONFIG=	yes
-
-USE_RC_SUBR=	pgpool
-CONFLICTS=	pgpool-II-[0-9]*
-
-PORTDOCS=	*
-
-OPTIONS_DEFINE=	DOCS SSL
-OPTIONS_DEFAULT=	SSL
-
-SSL_CONFIGURE_WITH=	openssl
-SSL_USES=		ssl
-
-post-install:
-	@${MKDIR} ${STAGEDIR}/var/run/pgpool
-	${INSTALL_LIB} ${WRKSRC}/src/libs/pcp/.libs/libpcp.so.1.0.0 ${STAGEDIR}${PREFIX}/lib
-
-post-install-DOCS-on:
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	cd ${WRKSRC} && ${COPYTREE_SHARE} doc ${STAGEDIR}${DOCSDIR} "-not -name Makefile.\*"
-.for f in AUTHORS ChangeLog NEWS TODO
-	${INSTALL_DATA} ${WRKSRC}/$f ${STAGEDIR}${DOCSDIR}
-.endfor
-
-.include <bsd.port.mk>
diff --git a/databases/pgpool-II-36/distinfo b/databases/pgpool-II-36/distinfo
deleted file mode 100644
index 66984606487d..000000000000
--- a/databases/pgpool-II-36/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1594799235
-SHA256 (pgpool-II-3.6.21.tar.gz) = 5bd1b360f8ba0bc2467bebc48e2494ee2cf63206fc2a1092011e94e4b015af17
-SIZE (pgpool-II-3.6.21.tar.gz) = 3336009
diff --git a/databases/pgpool-II-36/files/pgpool.in b/databases/pgpool-II-36/files/pgpool.in
deleted file mode 100644
index ca1b4d136fe0..000000000000
--- a/databases/pgpool-II-36/files/pgpool.in
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/sh
-
-# PROVIDE: pgpool
-# REQUIRE: LOGIN
-# KEYWORD: shutdown
-#
-# Add the following lines to /etc/rc.conf.local or /etc/rc.conf
-# to enable this service:
-#
-# pgpool_enable (bool):		Set to NO by default.
-#				Set it to YES to enable pgpool.
-# pgpool_conf (file):		Set location of your config.
-#				Default is "%%PREFIX%%/etc/pgpool.conf"
-# pgpool_user (uid):		User ID to run as (default nobody)
-# pgpool_stop_mode (string): 	Shutdown mode
-#       			Default is "smart"
-#       			Possibilities are "smart", "fast", or "immediate"
-#
-
-. /etc/rc.subr
-
-name=pgpool
-rcvar=pgpool_enable
-
-load_rc_config $name
-
-: ${pgpool_enable="NO"}
-: ${pgpool_conf="%%PREFIX%%/etc/pgpool.conf"}
-: ${pgpool_user="nobody"}
-: ${pgpool_stop_mode="smart"}
-
-command="%%PREFIX%%/bin/pgpool"
-command_args="-f ${pgpool_conf}"
-stop_cmd="${command} -m ${pgpool_stop_mode} ${command_args} stop"
-
-required_files="${pgpool_conf}"
-
-run_rc_command "$1"
diff --git a/databases/pgpool-II-36/pkg-descr b/databases/pgpool-II-36/pkg-descr
deleted file mode 100644
index 474bcbe9a30e..000000000000
--- a/databases/pgpool-II-36/pkg-descr
+++ /dev/null
@@ -1,8 +0,0 @@
-pgpool is a connection pool server for PostgreSQL. pgpool runs between
-PostgreSQL's clients(front ends) and servers(back ends). A PostgreSQL client can
-connect to pgpool as if it were a standard PostgreSQL server.
-
-pgpool caches the connection to PostgreSQL server to reduce the overhead to
-establish the connection to it.
-
-WWW: https://pgpool.net/
diff --git a/databases/pgpool-II-36/pkg-plist b/databases/pgpool-II-36/pkg-plist
deleted file mode 100644
index b8c12002d758..000000000000
--- a/databases/pgpool-II-36/pkg-plist
+++ /dev/null
@@ -1,32 +0,0 @@
-bin/pcp_attach_node
-bin/pcp_detach_node
-bin/pcp_node_count
-bin/pcp_node_info
-bin/pcp_pool_status
-bin/pcp_proc_count
-bin/pcp_proc_info
-bin/pcp_promote_node
-bin/pcp_recovery_node
-bin/pcp_stop_pgpool
-bin/pcp_watchdog_info
-bin/pg_md5
-bin/pgpool
-bin/pgpool_setup
-bin/watchdog_setup
-@sample etc/pcp.conf.sample
-@sample etc/pgpool.conf.sample
-etc/pgpool.conf.sample-master-slave
-etc/pgpool.conf.sample-replication
-etc/pgpool.conf.sample-stream
-@sample etc/pool_hba.conf.sample
-include/libpcp_ext.h
-include/pcp.h
-include/pool_process_reporting.h
-include/pool_type.h
-lib/libpcp.a
-lib/libpcp.so
-lib/libpcp.so.1
-lib/libpcp.so.1.0.0
-%%DATADIR%%/insert_lock.sql
-%%DATADIR%%/pgpool.pam
-@dir /var/run/pgpool
diff --git a/databases/pgpool-II-37/Makefile b/databases/pgpool-II-37/Makefile
deleted file mode 100644
index d4d7a12cd957..000000000000
--- a/databases/pgpool-II-37/Makefile
+++ /dev/null
@@ -1,41 +0,0 @@
-PORTNAME=	pgpool-II
-PORTVERSION=	3.7.14
-CATEGORIES=	databases
-MASTER_SITES=	http://www.pgpool.net/mediawiki/images/
-PKGNAMESUFFIX=	37
-
-MAINTAINER=	tz@FreeBSD.org
-COMMENT=	Connection pool server for PostgreSQL
-
-LICENSE=	MIT
-LICENSE_FILE=	${WRKSRC}/COPYING
-
-PORTSCOUT=	limit:^3.7.[0-9]*
-
-USES=		gmake libtool pgsql:9.6+
-GNU_CONFIGURE=	yes
-USE_LDCONFIG=	yes
-
-USE_RC_SUBR=	pgpool
-CONFLICTS=	pgpool-II-[0-9]*
-
-PORTDOCS=	*
-
-OPTIONS_DEFINE=	DOCS SSL
-OPTIONS_DEFAULT=	SSL
-
-SSL_CONFIGURE_WITH=	openssl
-SSL_USES=		ssl
-
-post-install:
-	@${MKDIR} ${STAGEDIR}/var/run/pgpool
-	${INSTALL_LIB} ${WRKSRC}/src/libs/pcp/.libs/libpcp.so.1.0.0 ${STAGEDIR}${PREFIX}/lib
-
-post-install-DOCS-on:
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	cd ${WRKSRC} && ${COPYTREE_SHARE} doc ${STAGEDIR}${DOCSDIR} "-not -name Makefile.\*"
-.for f in AUTHORS ChangeLog NEWS TODO
-	${INSTALL_DATA} ${WRKSRC}/$f ${STAGEDIR}${DOCSDIR}
-.endfor
-
-.include <bsd.port.mk>
diff --git a/databases/pgpool-II-37/distinfo b/databases/pgpool-II-37/distinfo
deleted file mode 100644
index eb7e0d0855f2..000000000000
--- a/databases/pgpool-II-37/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1594799250
-SHA256 (pgpool-II-3.7.14.tar.gz) = d6276bf3eb85c21d68bcc6cae0f00740ce1ddd0959abb4aa2cc125f8d8f07c99
-SIZE (pgpool-II-3.7.14.tar.gz) = 3422189
diff --git a/databases/pgpool-II-37/files/patch-src_auth_pool__hba.c b/databases/pgpool-II-37/files/patch-src_auth_pool__hba.c
deleted file mode 100644
index 99d35e0be35f..000000000000
--- a/databases/pgpool-II-37/files/patch-src_auth_pool__hba.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/auth/pool_hba.c.orig	2018-04-11 05:37:54 UTC
-+++ src/auth/pool_hba.c
-@@ -29,6 +29,8 @@
- #include <string.h>
- #include <errno.h>
- #include <netdb.h>
-+#include <arpa/inet.h>
-+#include <netinet/in.h>
- 
- #include "pool.h"
- #include "auth/pool_hba.h"
diff --git a/databases/pgpool-II-37/files/pgpool.in b/databases/pgpool-II-37/files/pgpool.in
deleted file mode 100644
index ca1b4d136fe0..000000000000
--- a/databases/pgpool-II-37/files/pgpool.in
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/sh
-
-# PROVIDE: pgpool
-# REQUIRE: LOGIN
-# KEYWORD: shutdown
-#
-# Add the following lines to /etc/rc.conf.local or /etc/rc.conf
-# to enable this service:
-#
-# pgpool_enable (bool):		Set to NO by default.
-#				Set it to YES to enable pgpool.
-# pgpool_conf (file):		Set location of your config.
-#				Default is "%%PREFIX%%/etc/pgpool.conf"
-# pgpool_user (uid):		User ID to run as (default nobody)
-# pgpool_stop_mode (string): 	Shutdown mode
-#       			Default is "smart"
-#       			Possibilities are "smart", "fast", or "immediate"
-#
-
-. /etc/rc.subr
-
-name=pgpool
-rcvar=pgpool_enable
-
-load_rc_config $name
-
-: ${pgpool_enable="NO"}
-: ${pgpool_conf="%%PREFIX%%/etc/pgpool.conf"}
-: ${pgpool_user="nobody"}
-: ${pgpool_stop_mode="smart"}
-
-command="%%PREFIX%%/bin/pgpool"
-command_args="-f ${pgpool_conf}"
-stop_cmd="${command} -m ${pgpool_stop_mode} ${command_args} stop"
-
-required_files="${pgpool_conf}"
-
-run_rc_command "$1"
diff --git a/databases/pgpool-II-37/pkg-descr b/databases/pgpool-II-37/pkg-descr
deleted file mode 100644
index 474bcbe9a30e..000000000000
--- a/databases/pgpool-II-37/pkg-descr
+++ /dev/null
@@ -1,8 +0,0 @@
-pgpool is a connection pool server for PostgreSQL. pgpool runs between
-PostgreSQL's clients(front ends) and servers(back ends). A PostgreSQL client can
-connect to pgpool as if it were a standard PostgreSQL server.
-
-pgpool caches the connection to PostgreSQL server to reduce the overhead to
-establish the connection to it.
-
-WWW: https://pgpool.net/
diff --git a/databases/pgpool-II-37/pkg-plist b/databases/pgpool-II-37/pkg-plist
deleted file mode 100644
index 458bffbe8b06..000000000000
--- a/databases/pgpool-II-37/pkg-plist
+++ /dev/null
@@ -1,33 +0,0 @@
-bin/pcp_attach_node
-bin/pcp_detach_node
-bin/pcp_node_count
-bin/pcp_node_info
-bin/pcp_pool_status
-bin/pcp_proc_count
-bin/pcp_proc_info
-bin/pcp_promote_node
-bin/pcp_recovery_node
-bin/pcp_stop_pgpool
-bin/pcp_watchdog_info
-bin/pg_md5
-bin/pgpool
-bin/pgpool_setup
-bin/watchdog_setup
-@sample etc/pcp.conf.sample
-@sample etc/pgpool.conf.sample
-etc/pgpool.conf.sample-logical
-etc/pgpool.conf.sample-master-slave
-etc/pgpool.conf.sample-replication
-etc/pgpool.conf.sample-stream
-@sample etc/pool_hba.conf.sample
-include/libpcp_ext.h
-include/pcp.h
-include/pool_process_reporting.h
-include/pool_type.h
-lib/libpcp.a
-lib/libpcp.so
-lib/libpcp.so.1
-lib/libpcp.so.1.0.0
-%%DATADIR%%/insert_lock.sql
-%%DATADIR%%/pgpool.pam
-@dir /var/run/pgpool
diff --git a/databases/pgpool-II-40/Makefile b/databases/pgpool-II-40/Makefile
deleted file mode 100644
index 008f0c4ee1f8..000000000000
--- a/databases/pgpool-II-40/Makefile
+++ /dev/null
@@ -1,50 +0,0 @@
-PORTNAME=	pgpool-II
-PORTVERSION=	4.0.9
-CATEGORIES=	databases
-MASTER_SITES=	http://www.pgpool.net/mediawiki/images/
-PKGNAMESUFFIX=	40
-
-MAINTAINER=	tz@FreeBSD.org
-COMMENT=	Connection pool server for PostgreSQL
-
-LICENSE=	MIT
-LICENSE_FILE=	${WRKSRC}/COPYING
-
-PORTSCOUT=	limit:^4.0.[0-9]*
-
-USES=		gmake libtool pgsql:9.6+
-GNU_CONFIGURE=	yes
-USE_LDCONFIG=	yes
-
-USE_RC_SUBR=	pgpool
-CONFLICTS=	pgpool-II-[0-9]*
-
-PORTDOCS=	*
-
-PAM_DESC=	Build with PAM support
-SSL_DESC=	Build with OpenSSL support
-MEMCACHED_DESC =	Use memcached for in memory query cache
-
-OPTIONS_DEFINE=	DOCS SSL PAM MEMCACHED
-OPTIONS_DEFAULT=	SSL
-
-MEMCACHED_CONFIGURE_ON=	--with-memcached=${LOCALBASE}/include
-MEMCACHED_LIB_DEPENDS=	libmemcached.so:databases/libmemcached
-
-PAM_CONFIGURE_ON=	--with-pam
-
-SSL_CONFIGURE_WITH=	openssl
-SSL_USES=		ssl
-
-post-install:
-	@${MKDIR} ${STAGEDIR}/var/run/pgpool
-	${INSTALL_LIB} ${WRKSRC}/src/libs/pcp/.libs/libpcp.so.1.0.0 ${STAGEDIR}${PREFIX}/lib
-
-post-install-DOCS-on:
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	cd ${WRKSRC} && ${COPYTREE_SHARE} doc ${STAGEDIR}${DOCSDIR} "-not -name Makefile.\*"
-.for f in AUTHORS ChangeLog NEWS TODO
-	${INSTALL_DATA} ${WRKSRC}/$f ${STAGEDIR}${DOCSDIR}
-.endfor
-
-.include <bsd.port.mk>
diff --git a/databases/pgpool-II-40/distinfo b/databases/pgpool-II-40/distinfo
deleted file mode 100644
index 59d3eee5eca7..000000000000
--- a/databases/pgpool-II-40/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1594937232
-SHA256 (pgpool-II-4.0.9.tar.gz) = 10b22bd100595377283d61714d1d93946c6a6eada427f92f401d7d9cf86975a4
-SIZE (pgpool-II-4.0.9.tar.gz) = 3848814
diff --git a/databases/pgpool-II-40/files/patch-src_auth_pool__hba.c b/databases/pgpool-II-40/files/patch-src_auth_pool__hba.c
deleted file mode 100644
index 99d35e0be35f..000000000000
--- a/databases/pgpool-II-40/files/patch-src_auth_pool__hba.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/auth/pool_hba.c.orig	2018-04-11 05:37:54 UTC
-+++ src/auth/pool_hba.c
-@@ -29,6 +29,8 @@
- #include <string.h>
- #include <errno.h>
- #include <netdb.h>
-+#include <arpa/inet.h>
-+#include <netinet/in.h>
- 
- #include "pool.h"
- #include "auth/pool_hba.h"
diff --git a/databases/pgpool-II-40/pkg-descr b/databases/pgpool-II-40/pkg-descr
deleted file mode 100644
index 474bcbe9a30e..000000000000
--- a/databases/pgpool-II-40/pkg-descr
+++ /dev/null
@@ -1,8 +0,0 @@
-pgpool is a connection pool server for PostgreSQL. pgpool runs between
-PostgreSQL's clients(front ends) and servers(back ends). A PostgreSQL client can
-connect to pgpool as if it were a standard PostgreSQL server.
-
-pgpool caches the connection to PostgreSQL server to reduce the overhead to
-establish the connection to it.
-
-WWW: https://pgpool.net/
diff --git a/databases/pgpool-II-40/pkg-plist b/databases/pgpool-II-40/pkg-plist
deleted file mode 100644
index 5c127ed99fad..000000000000
--- a/databases/pgpool-II-40/pkg-plist
+++ /dev/null
@@ -1,35 +0,0 @@
-bin/pcp_attach_node
-bin/pcp_detach_node
-bin/pcp_node_count
-bin/pcp_node_info
-bin/pcp_pool_status
-bin/pcp_proc_count
-bin/pcp_proc_info
-bin/pcp_promote_node
-bin/pcp_recovery_node
-bin/pcp_stop_pgpool
-bin/pcp_watchdog_info
-bin/pg_enc
-bin/pg_md5
-bin/pgpool
-bin/pgpool_setup
-bin/pgproto
-bin/watchdog_setup
-@sample etc/pcp.conf.sample
-@sample etc/pgpool.conf.sample
-etc/pgpool.conf.sample-logical
-etc/pgpool.conf.sample-master-slave
-etc/pgpool.conf.sample-replication
-etc/pgpool.conf.sample-stream
-@sample etc/pool_hba.conf.sample
-include/libpcp_ext.h
-include/pcp.h
-include/pool_process_reporting.h
-include/pool_type.h
-lib/libpcp.a
-lib/libpcp.so
-lib/libpcp.so.1
-lib/libpcp.so.1.0.0
-%%DATADIR%%/insert_lock.sql
-%%DATADIR%%/pgpool.pam
-@dir /var/run/pgpool
diff --git a/databases/pgpool-II-41/Makefile b/databases/pgpool-II-41/Makefile
index 6a29cd2ee075..d4459c17e4a8 100644
--- a/databases/pgpool-II-41/Makefile
+++ b/databases/pgpool-II-41/Makefile
@@ -1,41 +1,49 @@
 PORTNAME=	pgpool-II
-PORTVERSION=	4.1.6
+PORTVERSION=	4.1.17
 CATEGORIES=	databases
 MASTER_SITES=	http://www.pgpool.net/mediawiki/images/
 PKGNAMESUFFIX=	41
 
 MAINTAINER=	tz@FreeBSD.org
 COMMENT=	Connection pool server for PostgreSQL
+WWW=		https://pgpool.net/
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-PORTSCOUT=	limit:^4.1.[0-9]*
+DEPRECATED=	Upstream EOL reaches on 2024-10-31
+EXPIRATION_DATE=	2024-12-31
 
-USES=		gmake libtool pgsql:9.6+
+USES=		gmake libtool pgsql:11+
 USE_LDCONFIG=	yes
 USE_RC_SUBR=	pgpool
 
 GNU_CONFIGURE=	yes
 
-CONFLICTS=	pgpool-II-[0-9]*
+CONFLICTS_INSTALL=	pgpool-II-[0-9][0-9] pgpool-II[0-9][0-9] # etc/failover.sh.sample etc/pcp.conf.sample
+
+PORTSCOUT=	limit:^4.1.[0-9]*
 
 PORTDOCS=	*
 
+OPTIONS_DEFINE=		DOCS MEMCACHED PAM SSL
+OPTIONS_DEFAULT=	SSL
+
+MEMCACHED_DESC=	Use memcached for in memory query cache
 PAM_DESC=	Build with PAM support
 SSL_DESC=	Build with OpenSSL support
-MEMCACHED_DESC =	Use memcached for in memory query cache
-
-OPTIONS_DEFINE=	DOCS SSL PAM MEMCACHED
-OPTIONS_DEFAULT=	SSL
 
-MEMCACHED_CONFIGURE_ON=	--with-memcached=${LOCALBASE}/include
 MEMCACHED_LIB_DEPENDS=	libmemcached.so:databases/libmemcached
-
+MEMCACHED_CONFIGURE_ON=	--with-memcached=${LOCALBASE}/include
 PAM_CONFIGURE_ON=	--with-pam
-
-SSL_CONFIGURE_WITH=	openssl
 SSL_USES=		ssl
+SSL_CONFIGURE_WITH=	openssl
+
+.include <bsd.port.options.mk>
+
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 ))
+CFLAGS+=	-Wno-error=int-conversion
+.endif
 
 post-install:
 	@${MKDIR} ${STAGEDIR}/var/run/pgpool
diff --git a/databases/pgpool-II-41/distinfo b/databases/pgpool-II-41/distinfo
index fe02ee957ebe..b46fb5c87dae 100644
--- a/databases/pgpool-II-41/distinfo
+++ b/databases/pgpool-II-41/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1620558382
-SHA256 (pgpool-II-4.1.6.tar.gz) = 9a94d92fbcbc33eb48814341faad0a19607f54ed174561f07846a143ab35c9e1
-SIZE (pgpool-II-4.1.6.tar.gz) = 4301444
+TIMESTAMP = 1692247761
+SHA256 (pgpool-II-4.1.17.tar.gz) = 9380669855e99f6db5bc2b9ec35884ad79458b5b8612e402559a6d810fde12fd
+SIZE (pgpool-II-4.1.17.tar.gz) = 4521098
diff --git a/databases/pgpool-II-41/pkg-descr b/databases/pgpool-II-41/pkg-descr
index 474bcbe9a30e..59d385596b8e 100644
--- a/databases/pgpool-II-41/pkg-descr
+++ b/databases/pgpool-II-41/pkg-descr
@@ -4,5 +4,3 @@ connect to pgpool as if it were a standard PostgreSQL server.
 
 pgpool caches the connection to PostgreSQL server to reduce the overhead to
 establish the connection to it.
-
-WWW: https://pgpool.net/
diff --git a/databases/pgpool-II-42/Makefile b/databases/pgpool-II-42/Makefile
index dbdd86f33c2c..a623ddc98918 100644
--- a/databases/pgpool-II-42/Makefile
+++ b/databases/pgpool-II-42/Makefile
@@ -1,41 +1,49 @@
 PORTNAME=	pgpool-II
-PORTVERSION=	4.2.3
+PORTVERSION=	4.2.12
 CATEGORIES=	databases
 MASTER_SITES=	http://www.pgpool.net/mediawiki/images/
 PKGNAMESUFFIX=	42
 
 MAINTAINER=	mike.jakubik@swiftsmsgateway.com
 COMMENT=	Connection pool server for PostgreSQL
+WWW=		https://pgpool.net/
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-PORTSCOUT=	limit:^4.2.[0-9]*
+DEPRECATED=	Upstream EOL reaches on 2025-11-30
+EXPIRATION_DATE=	2025-12-31
 
-USES=		gmake libtool pgsql:9.6+
+USES=		gmake libtool pgsql:11+
 USE_LDCONFIG=	yes
 USE_RC_SUBR=	pgpool
 
 GNU_CONFIGURE=	yes
 
-CONFLICTS=	pgpool-II-[0-9]*
+CONFLICTS_INSTALL=	pgpool-II-[0-9][0-9] pgpool-II[0-9][0-9] # etc/escalation.sh.sample etc/failover.sh.sample etc/pcp.conf.sample
 
-PORTDOCS=	*
+PORTSCOUT=	limit:^4.2.[0-9]*
 
-PAM_DESC=	Build with PAM support
-SSL_DESC=	Build with OpenSSL support
-MEMCACHED_DESC=	Use memcached for in memory query cache
+PORTDOCS=	*
 
 OPTIONS_DEFINE=		DOCS SSL PAM MEMCACHED
 OPTIONS_DEFAULT=	SSL
 
-MEMCACHED_CONFIGURE_ON=	--with-memcached=${LOCALBASE}/include
-MEMCACHED_LIB_DEPENDS=	libmemcached.so:databases/libmemcached
+MEMCACHED_DESC=	Use memcached for in memory query cache
+PAM_DESC=	Build with PAM support
+SSL_DESC=	Build with OpenSSL support
 
+MEMCACHED_LIB_DEPENDS=	libmemcached.so:databases/libmemcached
+MEMCACHED_CONFIGURE_ON=	--with-memcached=${LOCALBASE}/include
 PAM_CONFIGURE_ON=	--with-pam
-
-SSL_CONFIGURE_WITH=	openssl
 SSL_USES=		ssl
+SSL_CONFIGURE_WITH=	openssl
+
+.include <bsd.port.options.mk>
+
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 ))
+CFLAGS+=	-Wno-error=int-conversion
+.endif
 
 post-install:
 	@${MKDIR} ${STAGEDIR}/var/run/pgpool
diff --git a/databases/pgpool-II-42/distinfo b/databases/pgpool-II-42/distinfo
index f113343ee9ba..f867cfb1a3e1 100644
--- a/databases/pgpool-II-42/distinfo
+++ b/databases/pgpool-II-42/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1621536839
-SHA256 (pgpool-II-4.2.3.tar.gz) = 1cd3a9100aab6711050b291e94e4805287182054ce7811a697bc05723150d6cc
-SIZE (pgpool-II-4.2.3.tar.gz) = 4751944
+TIMESTAMP = 1682873414
+SHA256 (pgpool-II-4.2.12.tar.gz) = 9f4a770aba2a60b047996bd5fd9ec6bf974560e73d483aff68d7a9455e93c5d0
+SIZE (pgpool-II-4.2.12.tar.gz) = 4758162
diff --git a/databases/pgpool-II-42/pkg-descr b/databases/pgpool-II-42/pkg-descr
index 474bcbe9a30e..59d385596b8e 100644
--- a/databases/pgpool-II-42/pkg-descr
+++ b/databases/pgpool-II-42/pkg-descr
@@ -4,5 +4,3 @@ connect to pgpool as if it were a standard PostgreSQL server.
 
 pgpool caches the connection to PostgreSQL server to reduce the overhead to
 establish the connection to it.
-
-WWW: https://pgpool.net/
diff --git a/databases/pgpool-II-43/Makefile b/databases/pgpool-II-43/Makefile
new file mode 100644
index 000000000000..6c73d3d73bfb
--- /dev/null
+++ b/databases/pgpool-II-43/Makefile
@@ -0,0 +1,56 @@
+PORTNAME=	pgpool-II
+PORTVERSION=	4.3.9
+CATEGORIES=	databases
+MASTER_SITES=	http://www.pgpool.net/mediawiki/images/
+PKGNAMESUFFIX=	-43
+
+MAINTAINER=	bofh@FreeBSD.org
+COMMENT=	Connection pool server for PostgreSQL (4.3.X branch)
+WWW=		https://pgpool.net/
+
+LICENSE=	MIT
+LICENSE_FILE=	${WRKSRC}/COPYING
+
+USES=		gmake libtool pgsql:11+
+USE_LDCONFIG=	yes
+USE_RC_SUBR=	pgpool
+
+GNU_CONFIGURE=	yes
+
+CONFLICTS_INSTALL=	pgpool-II-[0-9][0-9] pgpool-II[0-9][0-9] # etc/escalation.sh.sample etc/failover.sh.sample etc/pcp.conf.sample
+
+PORTSCOUT=	limit:^4.3.[0-9]*
+
+PORTDOCS=	*
+
+OPTIONS_DEFINE=		DOCS MEMCACHED PAM SSL
+OPTIONS_DEFAULT=	SSL
+
+MEMCACHED_DESC=	Use memcached for in memory query cache
+PAM_DESC=	Build with PAM support
+SSL_DESC=	Build with OpenSSL support
+
+MEMCACHED_LIB_DEPENDS=	libmemcached.so:databases/libmemcached
+MEMCACHED_CONFIGURE_ON=	--with-memcached=${LOCALBASE}/include
+PAM_CONFIGURE_ON=	--with-pam
+SSL_USES=		ssl
+SSL_CONFIGURE_WITH=	openssl
+
+.include <bsd.port.options.mk>
+
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 ))
+CFLAGS+=	-Wno-error=int-conversion
+.endif
+
+post-install:
+	@${MKDIR} ${STAGEDIR}/var/run/pgpool
+	${INSTALL_LIB} ${WRKSRC}/src/libs/pcp/.libs/libpcp.so.2.0.0 ${STAGEDIR}${PREFIX}/lib
+
+post-install-DOCS-on:
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	cd ${WRKSRC} && ${COPYTREE_SHARE} doc ${STAGEDIR}${DOCSDIR} "-not -name Makefile.\*"
+.for f in AUTHORS ChangeLog NEWS TODO
+	${INSTALL_DATA} ${WRKSRC}/$f ${STAGEDIR}${DOCSDIR}
+.endfor
+
+.include <bsd.port.mk>
diff --git a/databases/pgpool-II-43/distinfo b/databases/pgpool-II-43/distinfo
new file mode 100644
index 000000000000..4c83bd548a8e
--- /dev/null
+++ b/databases/pgpool-II-43/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1709225967
+SHA256 (pgpool-II-4.3.9.tar.gz) = 955918b5c31dd0faf6ebaa2477d38e22d8336ea454d5e5234de0c7846eca982e
+SIZE (pgpool-II-4.3.9.tar.gz) = 4953346
diff --git a/databases/pgpool-II-40/files/pgpool.in b/databases/pgpool-II-43/files/pgpool.in
index cb76557e2e57..cb76557e2e57 100644
--- a/databases/pgpool-II-40/files/pgpool.in
+++ b/databases/pgpool-II-43/files/pgpool.in
diff --git a/databases/pgpool-II-43/pkg-descr b/databases/pgpool-II-43/pkg-descr
new file mode 100644
index 000000000000..59d385596b8e
--- /dev/null
+++ b/databases/pgpool-II-43/pkg-descr
@@ -0,0 +1,6 @@
+pgpool is a connection pool server for PostgreSQL. pgpool runs between
+PostgreSQL's clients(front ends) and servers(back ends). A PostgreSQL client can
+connect to pgpool as if it were a standard PostgreSQL server.
+
+pgpool caches the connection to PostgreSQL server to reduce the overhead to
+establish the connection to it.
diff --git a/databases/pgpool-II-36/pkg-message b/databases/pgpool-II-43/pkg-message
index 1df287cd433a..1df287cd433a 100644
--- a/databases/pgpool-II-36/pkg-message
+++ b/databases/pgpool-II-43/pkg-message
diff --git a/databases/pgpool-II-43/pkg-plist b/databases/pgpool-II-43/pkg-plist
new file mode 100644
index 000000000000..435e4c2729fd
--- /dev/null
+++ b/databases/pgpool-II-43/pkg-plist
@@ -0,0 +1,41 @@
+bin/pcp_attach_node
+bin/pcp_detach_node
+bin/pcp_health_check_stats
+bin/pcp_node_count
+bin/pcp_node_info
+bin/pcp_pool_status
+bin/pcp_proc_count
+bin/pcp_proc_info
+bin/pcp_promote_node
+bin/pcp_recovery_node
+bin/pcp_reload_config
+bin/pcp_stop_pgpool
+bin/pcp_watchdog_info
+bin/pg_enc
+bin/pg_md5
+bin/pgpool
+bin/pgpool_setup
+bin/pgproto
+bin/watchdog_setup
+bin/wd_cli
+@sample etc/escalation.sh.sample
+@sample etc/failover.sh.sample
+@sample etc/follow_primary.sh.sample
+@sample etc/pcp.conf.sample
+@sample etc/pgpool.conf.sample
+@sample etc/pgpool_remote_start.sample
+@sample etc/pool_hba.conf.sample
+@sample etc/replication_mode_recovery_1st_stage.sample
+@sample etc/replication_mode_recovery_2nd_stage.sample
+etc/recovery_1st_stage.sample
+include/libpcp_ext.h
+include/pcp.h
+include/pool_process_reporting.h
+include/pool_type.h
+lib/libpcp.a
+lib/libpcp.so
+lib/libpcp.so.2
+lib/libpcp.so.2.0.0
+%%DATADIR%%/insert_lock.sql
+%%DATADIR%%/pgpool.pam
+@dir /var/run/pgpool
diff --git a/databases/pgpool-II-44/Makefile b/databases/pgpool-II-44/Makefile
new file mode 100644
index 000000000000..9de73928f951
--- /dev/null
+++ b/databases/pgpool-II-44/Makefile
@@ -0,0 +1,50 @@
+PORTNAME=	pgpool-II
+PORTVERSION=	4.4.6
+CATEGORIES=	databases
+MASTER_SITES=	http://www.pgpool.net/mediawiki/images/
+PKGNAMESUFFIX=	-44
+
+MAINTAINER=	bofh@FreeBSD.org
+COMMENT=	Connection pool server for PostgreSQL (4.4.X branch)
+WWW=		https://pgpool.net/
+
+LICENSE=	MIT
+LICENSE_FILE=	${WRKSRC}/COPYING
+
+USES=		gmake libtool pgsql:11+
+USE_LDCONFIG=	yes
+USE_RC_SUBR=	pgpool
+
+GNU_CONFIGURE=	yes
+
+CONFLICTS_INSTALL=	pgpool-II-[0-9][0-9] pgpool-II[0-9][0-9] # etc/escalation.sh.sample etc/failover.sh.sample etc/pcp.conf.sample
+
+PORTSCOUT=	limit:^4.4.[0-9]*
+
+PORTDOCS=	*
+
+OPTIONS_DEFINE=		DOCS MEMCACHED PAM SSL
+OPTIONS_DEFAULT=	SSL
+
+MEMCACHED_DESC=	Use memcached for in memory query cache
+PAM_DESC=	Build with PAM support
+SSL_DESC=	Build with OpenSSL support
+
+MEMCACHED_LIB_DEPENDS=	libmemcached.so:databases/libmemcached
+MEMCACHED_CONFIGURE_ON=	--with-memcached=${LOCALBASE}/include
+PAM_CONFIGURE_ON=	--with-pam
+SSL_USES=		ssl
+SSL_CONFIGURE_WITH=	openssl
+
+post-install:
+	@${MKDIR} ${STAGEDIR}/var/run/pgpool
+	${INSTALL_LIB} ${WRKSRC}/src/libs/pcp/.libs/libpcp.so.2.0.0 ${STAGEDIR}${PREFIX}/lib
+
+post-install-DOCS-on:
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	cd ${WRKSRC} && ${COPYTREE_SHARE} doc ${STAGEDIR}${DOCSDIR} "-not -name Makefile.\*"
+.for f in AUTHORS ChangeLog NEWS TODO
+	${INSTALL_DATA} ${WRKSRC}/$f ${STAGEDIR}${DOCSDIR}
+.endfor
+
+.include <bsd.port.mk>
diff --git a/databases/pgpool-II-44/distinfo b/databases/pgpool-II-44/distinfo
new file mode 100644
index 000000000000..eed1923dd169
--- /dev/null
+++ b/databases/pgpool-II-44/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1709226143
+SHA256 (pgpool-II-4.4.6.tar.gz) = f14e5bee3c9411e856199096361efba0752550602903098d9e4cc57345aa8c0e
+SIZE (pgpool-II-4.4.6.tar.gz) = 5004807
diff --git a/databases/pgpool-II-44/files/pgpool.in b/databases/pgpool-II-44/files/pgpool.in
new file mode 100644
index 000000000000..cb76557e2e57
--- /dev/null
+++ b/databases/pgpool-II-44/files/pgpool.in
@@ -0,0 +1,48 @@
+#!/bin/sh
+
+# PROVIDE: pgpool
+# REQUIRE: LOGIN
+# KEYWORD: shutdown
+#
+# Add the following lines to /etc/rc.conf.local or /etc/rc.conf
+# to enable this service:
+#
+# pgpool_enable (bool):         Set to NO by default.
+#                               Set it to YES to enable pgpool.
+# pgpool_conf (file):           Set location of your config.
+#                               Default is "%%PREFIX%%/etc/pgpool.conf"
+# pgpool_hba (file):           Set location of your pool hba file.
+#               Default is "%%PREFIX%%/etc/pool_hba.conf"
+# pgpool_pcp (file):           Set location of your pcp conf file.
+#               Default is "%%PREFIX%%/etc/pcp.conf"
+# pgpool_user (uid):            User ID to run as (default nobody)
+# pgpool_stop_mode (string):    Shutdown mode
+#                               Default is "smart"
+#                               Possibilities are "smart", "fast", or "immediate"
+#
+
+. /etc/rc.subr
+
+name=pgpool
+rcvar=pgpool_enable
+
+load_rc_config $name
+
+: ${pgpool_enable="NO"}
+: ${pgpool_conf="%%PREFIX%%/etc/pgpool.conf"}
+: ${pgpool_hba="%%PREFIX%%/etc/pool_hba.conf"}
+: ${pgpool_pcp="%%PREFIX%%/etc/pcp.conf"}
+: ${pgpool_user="nobody"}
+: ${pgpool_stop_mode="smart"}
+
+command="%%PREFIX%%/bin/pgpool"
+command_args="-f ${pgpool_conf} -a ${pgpool_hba} -F ${pgpool_pcp}"
+stop_cmd="${command} -m ${pgpool_stop_mode} ${command_args} stop"
+reload_cmd="${command} ${command_args} reload"
+extra_commands="reload"
+
+required_files="${pgpool_conf}"
+
+
+run_rc_command "$1"
+
diff --git a/databases/pgpool-II-44/pkg-descr b/databases/pgpool-II-44/pkg-descr
new file mode 100644
index 000000000000..59d385596b8e
--- /dev/null
+++ b/databases/pgpool-II-44/pkg-descr
@@ -0,0 +1,6 @@
+pgpool is a connection pool server for PostgreSQL. pgpool runs between
+PostgreSQL's clients(front ends) and servers(back ends). A PostgreSQL client can
+connect to pgpool as if it were a standard PostgreSQL server.
+
+pgpool caches the connection to PostgreSQL server to reduce the overhead to
+establish the connection to it.
diff --git a/databases/pgpool-II-37/pkg-message b/databases/pgpool-II-44/pkg-message
index 1df287cd433a..1df287cd433a 100644
--- a/databases/pgpool-II-37/pkg-message
+++ b/databases/pgpool-II-44/pkg-message
diff --git a/databases/pgpool-II-44/pkg-plist b/databases/pgpool-II-44/pkg-plist
new file mode 100644
index 000000000000..b36861c8ffe1
--- /dev/null
+++ b/databases/pgpool-II-44/pkg-plist
@@ -0,0 +1,43 @@
+bin/pcp_attach_node
+bin/pcp_detach_node
+bin/pcp_health_check_stats
+bin/pcp_node_count
+bin/pcp_node_info
+bin/pcp_pool_status
+bin/pcp_proc_count
+bin/pcp_proc_info
+bin/pcp_promote_node
+bin/pcp_recovery_node
+bin/pcp_reload_config
+bin/pcp_stop_pgpool
+bin/pcp_watchdog_info
+bin/pg_enc
+bin/pg_md5
+bin/pgpool
+bin/pgpool_setup
+bin/pgproto
+bin/watchdog_setup
+bin/wd_cli
+@sample etc/aws_eip_if_cmd.sh.sample
+@sample etc/aws_rtb_if_cmd.sh.sample
+@sample etc/escalation.sh.sample
+@sample etc/failover.sh.sample
+@sample etc/follow_primary.sh.sample
+@sample etc/pcp.conf.sample
+@sample etc/pgpool.conf.sample
+@sample etc/pgpool_remote_start.sample
+@sample etc/pool_hba.conf.sample
+@sample etc/replication_mode_recovery_1st_stage.sample
+@sample etc/replication_mode_recovery_2nd_stage.sample
+etc/recovery_1st_stage.sample
+include/libpcp_ext.h
+include/pcp.h
+include/pool_process_reporting.h
+include/pool_type.h
+lib/libpcp.a
+lib/libpcp.so
+lib/libpcp.so.2
+lib/libpcp.so.2.0.0
+%%DATADIR%%/insert_lock.sql
+%%DATADIR%%/pgpool.pam
+@dir /var/run/pgpool
diff --git a/databases/pgpool-II-45/Makefile b/databases/pgpool-II-45/Makefile
new file mode 100644
index 000000000000..ca282f2ef646
--- /dev/null
+++ b/databases/pgpool-II-45/Makefile
@@ -0,0 +1,50 @@
+PORTNAME=	pgpool-II
+PORTVERSION=	4.5.0
+CATEGORIES=	databases
+MASTER_SITES=	http://www.pgpool.net/mediawiki/images/
+PKGNAMESUFFIX=	-45
+
+MAINTAINER=	bofh@FreeBSD.org
+COMMENT=	Connection pool server for PostgreSQL (4.4.X branch)
+WWW=		https://pgpool.net/
+
+LICENSE=	MIT
+LICENSE_FILE=	${WRKSRC}/COPYING
+
+USES=		gmake libtool pgsql:12+
+USE_LDCONFIG=	yes
+USE_RC_SUBR=	pgpool
+
+GNU_CONFIGURE=	yes
+
+CONFLICTS_INSTALL=	pgpool-II-[0-9][0-9] pgpool-II[0-9][0-9] # etc/escalation.sh.sample etc/failover.sh.sample etc/pcp.conf.sample
+
+PORTSCOUT=	limit:^4.4.[0-9]*
+
+PORTDOCS=	*
+
+OPTIONS_DEFINE=		DOCS MEMCACHED PAM SSL
+OPTIONS_DEFAULT=	SSL
+
+MEMCACHED_DESC=	Use memcached for in memory query cache
+PAM_DESC=	Build with PAM support
+SSL_DESC=	Build with OpenSSL support
+
+MEMCACHED_LIB_DEPENDS=	libmemcached.so:databases/libmemcached
+MEMCACHED_CONFIGURE_ON=	--with-memcached=${LOCALBASE}/include
+PAM_CONFIGURE_ON=	--with-pam
+SSL_USES=		ssl
+SSL_CONFIGURE_WITH=	openssl
+
+post-install:
+	@${MKDIR} ${STAGEDIR}/var/run/pgpool
+	${INSTALL_LIB} ${WRKSRC}/src/libs/pcp/.libs/libpcp.so.2.0.0 ${STAGEDIR}${PREFIX}/lib
+
+post-install-DOCS-on:
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	cd ${WRKSRC} && ${COPYTREE_SHARE} doc ${STAGEDIR}${DOCSDIR} "-not -name Makefile.\*"
+.for f in AUTHORS ChangeLog NEWS TODO
+	${INSTALL_DATA} ${WRKSRC}/$f ${STAGEDIR}${DOCSDIR}
+.endfor
+
+.include <bsd.port.mk>
diff --git a/databases/pgpool-II-45/distinfo b/databases/pgpool-II-45/distinfo
new file mode 100644
index 000000000000..c2c9106a1322
--- /dev/null
+++ b/databases/pgpool-II-45/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1709226440
+SHA256 (pgpool-II-4.5.0.tar.gz) = 5984aecdf2520872900356aced0c9aa6e96537c2e82297c6593ed9019118451a
+SIZE (pgpool-II-4.5.0.tar.gz) = 5138556
diff --git a/databases/pgpool-II-45/files/pgpool.in b/databases/pgpool-II-45/files/pgpool.in
new file mode 100644
index 000000000000..cb76557e2e57
--- /dev/null
+++ b/databases/pgpool-II-45/files/pgpool.in
@@ -0,0 +1,48 @@
+#!/bin/sh
+
+# PROVIDE: pgpool
+# REQUIRE: LOGIN
+# KEYWORD: shutdown
+#
+# Add the following lines to /etc/rc.conf.local or /etc/rc.conf
+# to enable this service:
+#
+# pgpool_enable (bool):         Set to NO by default.
+#                               Set it to YES to enable pgpool.
+# pgpool_conf (file):           Set location of your config.
+#                               Default is "%%PREFIX%%/etc/pgpool.conf"
+# pgpool_hba (file):           Set location of your pool hba file.
+#               Default is "%%PREFIX%%/etc/pool_hba.conf"
+# pgpool_pcp (file):           Set location of your pcp conf file.
+#               Default is "%%PREFIX%%/etc/pcp.conf"
+# pgpool_user (uid):            User ID to run as (default nobody)
+# pgpool_stop_mode (string):    Shutdown mode
+#                               Default is "smart"
+#                               Possibilities are "smart", "fast", or "immediate"
+#
+
+. /etc/rc.subr
+
+name=pgpool
+rcvar=pgpool_enable
+
+load_rc_config $name
+
+: ${pgpool_enable="NO"}
+: ${pgpool_conf="%%PREFIX%%/etc/pgpool.conf"}
+: ${pgpool_hba="%%PREFIX%%/etc/pool_hba.conf"}
+: ${pgpool_pcp="%%PREFIX%%/etc/pcp.conf"}
+: ${pgpool_user="nobody"}
+: ${pgpool_stop_mode="smart"}
+
+command="%%PREFIX%%/bin/pgpool"
+command_args="-f ${pgpool_conf} -a ${pgpool_hba} -F ${pgpool_pcp}"
+stop_cmd="${command} -m ${pgpool_stop_mode} ${command_args} stop"
+reload_cmd="${command} ${command_args} reload"
+extra_commands="reload"
+
+required_files="${pgpool_conf}"
+
+
+run_rc_command "$1"
+
diff --git a/databases/pgpool-II-45/pkg-descr b/databases/pgpool-II-45/pkg-descr
new file mode 100644
index 000000000000..59d385596b8e
--- /dev/null
+++ b/databases/pgpool-II-45/pkg-descr
@@ -0,0 +1,6 @@
+pgpool is a connection pool server for PostgreSQL. pgpool runs between
+PostgreSQL's clients(front ends) and servers(back ends). A PostgreSQL client can
+connect to pgpool as if it were a standard PostgreSQL server.
+
+pgpool caches the connection to PostgreSQL server to reduce the overhead to
+establish the connection to it.
diff --git a/databases/pgpool-II-40/pkg-message b/databases/pgpool-II-45/pkg-message
index 1df287cd433a..1df287cd433a 100644
--- a/databases/pgpool-II-40/pkg-message
+++ b/databases/pgpool-II-45/pkg-message
diff --git a/databases/pgpool-II-45/pkg-plist b/databases/pgpool-II-45/pkg-plist
new file mode 100644
index 000000000000..b36861c8ffe1
--- /dev/null
+++ b/databases/pgpool-II-45/pkg-plist
@@ -0,0 +1,43 @@
+bin/pcp_attach_node
+bin/pcp_detach_node
+bin/pcp_health_check_stats
+bin/pcp_node_count
+bin/pcp_node_info
+bin/pcp_pool_status
+bin/pcp_proc_count
+bin/pcp_proc_info
+bin/pcp_promote_node
+bin/pcp_recovery_node
+bin/pcp_reload_config
+bin/pcp_stop_pgpool
+bin/pcp_watchdog_info
+bin/pg_enc
+bin/pg_md5
+bin/pgpool
+bin/pgpool_setup
+bin/pgproto
+bin/watchdog_setup
+bin/wd_cli
+@sample etc/aws_eip_if_cmd.sh.sample
+@sample etc/aws_rtb_if_cmd.sh.sample
+@sample etc/escalation.sh.sample
+@sample etc/failover.sh.sample
+@sample etc/follow_primary.sh.sample
+@sample etc/pcp.conf.sample
+@sample etc/pgpool.conf.sample
+@sample etc/pgpool_remote_start.sample
+@sample etc/pool_hba.conf.sample
+@sample etc/replication_mode_recovery_1st_stage.sample
+@sample etc/replication_mode_recovery_2nd_stage.sample
+etc/recovery_1st_stage.sample
+include/libpcp_ext.h
+include/pcp.h
+include/pool_process_reporting.h
+include/pool_type.h
+lib/libpcp.a
+lib/libpcp.so
+lib/libpcp.so.2
+lib/libpcp.so.2.0.0
+%%DATADIR%%/insert_lock.sql
+%%DATADIR%%/pgpool.pam
+@dir /var/run/pgpool
diff --git a/databases/pgreplay/Makefile b/databases/pgreplay/Makefile
index c98027f7c27b..c0acb035d0aa 100644
--- a/databases/pgreplay/Makefile
+++ b/databases/pgreplay/Makefile
@@ -1,28 +1,26 @@
-# Created by: Matthew Seaman
-
 PORTNAME=	pgreplay
 DISTVERSIONPREFIX=	${PORTNAME:tu}_
 DISTVERSION=	1_3_0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	databases
 
 MAINTAINER=	matthew@FreeBSD.org
 COMMENT=	Replay SQL statements from a Postgresql Log
+WWW=		https://github.com/laurenz/pgreplay
 
 LICENSE=	PostgreSQL
 
+USES=		pgsql autoreconf
 USE_GITHUB=	yes
 GH_ACCOUNT=	laurenz
-
-USES=		pgsql autoreconf
 GNU_CONFIGURE=	yes
 
-PLIST_FILES=	bin/pgreplay man/man1/pgreplay.1.gz
+PLIST_FILES=	bin/pgreplay share/man/man1/pgreplay.1.gz
 
 ALL_TARGET=	${PORTNAME}
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/pgreplay ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/pgreplay.1 ${STAGEDIR}${PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/pgreplay.1 ${STAGEDIR}${PREFIX}/share/man/man1
 
 .include <bsd.port.mk>
diff --git a/databases/pgreplay/pkg-descr b/databases/pgreplay/pkg-descr
index 5740420cde29..6c85c432f24e 100644
--- a/databases/pgreplay/pkg-descr
+++ b/databases/pgreplay/pkg-descr
@@ -1,5 +1,3 @@
 pgreplay reads a PostgreSQL log file (*not* a WAL file), extracts the
 SQL statements and executes them in the same order and with the original
 timing against a PostgreSQL database.
-
-WWW: https://github.com/laurenz/pgreplay
diff --git a/databases/pgroonga/Makefile b/databases/pgroonga/Makefile
index 7fbd869e8922..cfce2e385887 100644
--- a/databases/pgroonga/Makefile
+++ b/databases/pgroonga/Makefile
@@ -1,40 +1,29 @@
-# Created by: Muhammad Moinur Rahman <bofh@FreeBSD.org>
-
 PORTNAME=	pgroonga
-PORTVERSION=	2.3.0
+PORTVERSION=	3.0.2
 CATEGORIES=	databases textproc
 MASTER_SITES=	http://packages.groonga.org/source/pgroonga/
 
 MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	Open-source fulltext search engine for PostGRESQL
+WWW=		https://pgroonga.github.io/
 
 LICENSE=	PostgreSQL
+LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libgroonga.so:textproc/groonga
 
-USES=		gmake pgsql:9.6+ pkgconfig
+USES=		gmake localbase pgsql:11+ pkgconfig
 
-CPPFLAGS+=	-I${LOCALBASE}/include -I${LOCALBASE}/include/groonga
+CPPFLAGS+=	-I${LOCALBASE}/include/groonga
 LLD_UNSAFE=	yes
 SUB_FILES=	pkg-message
 PLIST_SUB=	MVER=${PORTVERSION}
 
-OPTIONS_DEFINE=	MECAB
-MECAB_DESC=	Use MeCab as a tokenizer
+OPTIONS_DEFINE=		MECAB
+MECAB_DESC=		Use MeCab as a tokenizer
 MECAB_BUILD_DEPENDS=	mecab-ipadics>=0.996:japanese/mecab-ipadic
 
-.include <bsd.port.pre.mk>
-# With PG11+ some scripts are only installed when they are common to
-# all PG versions.
-.if ${PGSQL_VER:R} < 11
-PLIST_SUB+=	OLDPG="@comment "
-.else
-PLIST_SUB+=	OLDPG=""
-.endif
-
 post-install:
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/postgresql/pgroonga.so
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/postgresql/pgroonga_check.so
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/postgresql/pgroonga_database.so
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/postgresql/pgroonga*.so
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/databases/pgroonga/distinfo b/databases/pgroonga/distinfo
index 098a93f9dd3e..7e591e9ca95e 100644
--- a/databases/pgroonga/distinfo
+++ b/databases/pgroonga/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1621888624
-SHA256 (pgroonga-2.3.0.tar.gz) = 5b3c8f42989120c8954a03f9d78cdcf017e1bc655f8331a21bc79ecd3927b5f1
-SIZE (pgroonga-2.3.0.tar.gz) = 424579
+TIMESTAMP = 1683897735
+SHA256 (pgroonga-3.0.2.tar.gz) = 779a34ae8e0a9eceb657b5800e74117fd11afc53e7dbafa9d1ada97cbae78f5f
+SIZE (pgroonga-3.0.2.tar.gz) = 497883
diff --git a/databases/pgroonga/pkg-descr b/databases/pgroonga/pkg-descr
index 7518e18a1e86..2634b8ed07c3 100644
--- a/databases/pgroonga/pkg-descr
+++ b/databases/pgroonga/pkg-descr
@@ -10,5 +10,3 @@ alphabet and digit. It means that PostgreSQL doesn't support full text
 search against Japanese, Chinese and so on. You can use super fast full
 text search feature against all languages by installing PGroonga into your
 PostgreSQL!
-
-WWW: https://pgroonga.github.io/
diff --git a/databases/pgroonga/pkg-plist b/databases/pgroonga/pkg-plist
index ff7b86f78ec7..9501a8294800 100644
--- a/databases/pgroonga/pkg-plist
+++ b/databases/pgroonga/pkg-plist
@@ -1,109 +1,239 @@
-%%OLDPG%%include/postgresql/server/contrib/pgroonga_check/pgrn-alias.h
-%%OLDPG%%include/postgresql/server/contrib/pgroonga_check/pgrn-auto-close.h
-%%OLDPG%%include/postgresql/server/contrib/pgroonga_check/pgrn-column-name.h
-%%OLDPG%%include/postgresql/server/contrib/pgroonga_check/pgrn-command-escape-value.h
-%%OLDPG%%include/postgresql/server/contrib/pgroonga_check/pgrn-compatible.h
-%%OLDPG%%include/postgresql/server/contrib/pgroonga_check/pgrn-convert.h
-%%OLDPG%%include/postgresql/server/contrib/pgroonga_check/pgrn-create.h
-%%OLDPG%%include/postgresql/server/contrib/pgroonga_check/pgrn-ctid.h
-%%OLDPG%%include/postgresql/server/contrib/pgroonga_check/pgrn-database.h
-%%OLDPG%%include/postgresql/server/contrib/pgroonga_check/pgrn-full-text-search-condition.h
-%%OLDPG%%include/postgresql/server/contrib/pgroonga_check/pgrn-global.h
-%%OLDPG%%include/postgresql/server/contrib/pgroonga_check/pgrn-groonga-tuple-is-alive.h
-%%OLDPG%%include/postgresql/server/contrib/pgroonga_check/pgrn-groonga.h
-%%OLDPG%%include/postgresql/server/contrib/pgroonga_check/pgrn-highlight-html.h
-%%OLDPG%%include/postgresql/server/contrib/pgroonga_check/pgrn-index-status.h
-%%OLDPG%%include/postgresql/server/contrib/pgroonga_check/pgrn-jsonb.h
-%%OLDPG%%include/postgresql/server/contrib/pgroonga_check/pgrn-keywords.h
-%%OLDPG%%include/postgresql/server/contrib/pgroonga_check/pgrn-match-positions-byte.h
-%%OLDPG%%include/postgresql/server/contrib/pgroonga_check/pgrn-match-positions-character.h
-%%OLDPG%%include/postgresql/server/contrib/pgroonga_check/pgrn-normalize.h
-%%OLDPG%%include/postgresql/server/contrib/pgroonga_check/pgrn-options.h
-%%OLDPG%%include/postgresql/server/contrib/pgroonga_check/pgrn-pg.h
-%%OLDPG%%include/postgresql/server/contrib/pgroonga_check/pgrn-portable.h
-%%OLDPG%%include/postgresql/server/contrib/pgroonga_check/pgrn-query-expand.h
-%%OLDPG%%include/postgresql/server/contrib/pgroonga_check/pgrn-query-extract-keywords.h
-%%OLDPG%%include/postgresql/server/contrib/pgroonga_check/pgrn-result-converter.h
-%%OLDPG%%include/postgresql/server/contrib/pgroonga_check/pgrn-search.h
-%%OLDPG%%include/postgresql/server/contrib/pgroonga_check/pgrn-sequential-search.h
-%%OLDPG%%include/postgresql/server/contrib/pgroonga_check/pgrn-tokenize.h
-%%OLDPG%%include/postgresql/server/contrib/pgroonga_check/pgrn-value.h
-%%OLDPG%%include/postgresql/server/contrib/pgroonga_check/pgrn-variables.h
-%%OLDPG%%include/postgresql/server/contrib/pgroonga_check/pgrn-wal.h
-%%OLDPG%%include/postgresql/server/contrib/pgroonga_check/pgrn-writable.h
-%%OLDPG%%include/postgresql/server/contrib/pgroonga_check/pgroonga.h
-%%OLDPG%%include/postgresql/server/extension/pgroonga/pgrn-alias.h
-%%OLDPG%%include/postgresql/server/extension/pgroonga/pgrn-auto-close.h
-%%OLDPG%%include/postgresql/server/extension/pgroonga/pgrn-column-name.h
-%%OLDPG%%include/postgresql/server/extension/pgroonga/pgrn-command-escape-value.h
-%%OLDPG%%include/postgresql/server/extension/pgroonga/pgrn-compatible.h
-%%OLDPG%%include/postgresql/server/extension/pgroonga/pgrn-convert.h
-%%OLDPG%%include/postgresql/server/extension/pgroonga/pgrn-create.h
-%%OLDPG%%include/postgresql/server/extension/pgroonga/pgrn-ctid.h
-%%OLDPG%%include/postgresql/server/extension/pgroonga/pgrn-database.h
-%%OLDPG%%include/postgresql/server/extension/pgroonga/pgrn-full-text-search-condition.h
-%%OLDPG%%include/postgresql/server/extension/pgroonga/pgrn-global.h
-%%OLDPG%%include/postgresql/server/extension/pgroonga/pgrn-groonga-tuple-is-alive.h
-%%OLDPG%%include/postgresql/server/extension/pgroonga/pgrn-groonga.h
-%%OLDPG%%include/postgresql/server/extension/pgroonga/pgrn-highlight-html.h
-%%OLDPG%%include/postgresql/server/extension/pgroonga/pgrn-index-status.h
-%%OLDPG%%include/postgresql/server/extension/pgroonga/pgrn-jsonb.h
-%%OLDPG%%include/postgresql/server/extension/pgroonga/pgrn-keywords.h
-%%OLDPG%%include/postgresql/server/extension/pgroonga/pgrn-match-positions-byte.h
-%%OLDPG%%include/postgresql/server/extension/pgroonga/pgrn-match-positions-character.h
-%%OLDPG%%include/postgresql/server/extension/pgroonga/pgrn-normalize.h
-%%OLDPG%%include/postgresql/server/extension/pgroonga/pgrn-options.h
-%%OLDPG%%include/postgresql/server/extension/pgroonga/pgrn-pg.h
-%%OLDPG%%include/postgresql/server/extension/pgroonga/pgrn-portable.h
-%%OLDPG%%include/postgresql/server/extension/pgroonga/pgrn-query-expand.h
-%%OLDPG%%include/postgresql/server/extension/pgroonga/pgrn-query-extract-keywords.h
-%%OLDPG%%include/postgresql/server/extension/pgroonga/pgrn-result-converter.h
-%%OLDPG%%include/postgresql/server/extension/pgroonga/pgrn-search.h
-%%OLDPG%%include/postgresql/server/extension/pgroonga/pgrn-sequential-search.h
-%%OLDPG%%include/postgresql/server/extension/pgroonga/pgrn-tokenize.h
-%%OLDPG%%include/postgresql/server/extension/pgroonga/pgrn-value.h
-%%OLDPG%%include/postgresql/server/extension/pgroonga/pgrn-variables.h
-%%OLDPG%%include/postgresql/server/extension/pgroonga/pgrn-wal.h
-%%OLDPG%%include/postgresql/server/extension/pgroonga/pgrn-writable.h
-%%OLDPG%%include/postgresql/server/extension/pgroonga/pgroonga.h
-%%OLDPG%%include/postgresql/server/extension/pgroonga/xxhash.h
-%%OLDPG%%include/postgresql/server/extension/pgroonga_database/pgrn-alias.h
-%%OLDPG%%include/postgresql/server/extension/pgroonga_database/pgrn-auto-close.h
-%%OLDPG%%include/postgresql/server/extension/pgroonga_database/pgrn-column-name.h
-%%OLDPG%%include/postgresql/server/extension/pgroonga_database/pgrn-command-escape-value.h
-%%OLDPG%%include/postgresql/server/extension/pgroonga_database/pgrn-compatible.h
-%%OLDPG%%include/postgresql/server/extension/pgroonga_database/pgrn-convert.h
-%%OLDPG%%include/postgresql/server/extension/pgroonga_database/pgrn-create.h
-%%OLDPG%%include/postgresql/server/extension/pgroonga_database/pgrn-ctid.h
-%%OLDPG%%include/postgresql/server/extension/pgroonga_database/pgrn-database.h
-%%OLDPG%%include/postgresql/server/extension/pgroonga_database/pgrn-full-text-search-condition.h
-%%OLDPG%%include/postgresql/server/extension/pgroonga_database/pgrn-global.h
-%%OLDPG%%include/postgresql/server/extension/pgroonga_database/pgrn-groonga-tuple-is-alive.h
-%%OLDPG%%include/postgresql/server/extension/pgroonga_database/pgrn-groonga.h
-%%OLDPG%%include/postgresql/server/extension/pgroonga_database/pgrn-highlight-html.h
-%%OLDPG%%include/postgresql/server/extension/pgroonga_database/pgrn-index-status.h
-%%OLDPG%%include/postgresql/server/extension/pgroonga_database/pgrn-jsonb.h
-%%OLDPG%%include/postgresql/server/extension/pgroonga_database/pgrn-keywords.h
-%%OLDPG%%include/postgresql/server/extension/pgroonga_database/pgrn-match-positions-byte.h
-%%OLDPG%%include/postgresql/server/extension/pgroonga_database/pgrn-match-positions-character.h
-%%OLDPG%%include/postgresql/server/extension/pgroonga_database/pgrn-normalize.h
-%%OLDPG%%include/postgresql/server/extension/pgroonga_database/pgrn-options.h
-%%OLDPG%%include/postgresql/server/extension/pgroonga_database/pgrn-pg.h
-%%OLDPG%%include/postgresql/server/extension/pgroonga_database/pgrn-portable.h
-%%OLDPG%%include/postgresql/server/extension/pgroonga_database/pgrn-query-expand.h
-%%OLDPG%%include/postgresql/server/extension/pgroonga_database/pgrn-query-extract-keywords.h
-%%OLDPG%%include/postgresql/server/extension/pgroonga_database/pgrn-result-converter.h
-%%OLDPG%%include/postgresql/server/extension/pgroonga_database/pgrn-search.h
-%%OLDPG%%include/postgresql/server/extension/pgroonga_database/pgrn-sequential-search.h
-%%OLDPG%%include/postgresql/server/extension/pgroonga_database/pgrn-tokenize.h
-%%OLDPG%%include/postgresql/server/extension/pgroonga_database/pgrn-value.h
-%%OLDPG%%include/postgresql/server/extension/pgroonga_database/pgrn-variables.h
-%%OLDPG%%include/postgresql/server/extension/pgroonga_database/pgrn-wal.h
-%%OLDPG%%include/postgresql/server/extension/pgroonga_database/pgrn-writable.h
-%%OLDPG%%include/postgresql/server/extension/pgroonga_database/pgroonga.h
+include/postgresql/server/contrib/pgroonga_check/pgrn-alias.h
+include/postgresql/server/contrib/pgroonga_check/pgrn-auto-close.h
+include/postgresql/server/contrib/pgroonga_check/pgrn-column-name.h
+include/postgresql/server/contrib/pgroonga_check/pgrn-command-escape-value.h
+include/postgresql/server/contrib/pgroonga_check/pgrn-compatible.h
+include/postgresql/server/contrib/pgroonga_check/pgrn-convert.h
+include/postgresql/server/contrib/pgroonga_check/pgrn-crash-safer-statuses.h
+include/postgresql/server/contrib/pgroonga_check/pgrn-create.h
+include/postgresql/server/contrib/pgroonga_check/pgrn-ctid.h
+include/postgresql/server/contrib/pgroonga_check/pgrn-database.h
+include/postgresql/server/contrib/pgroonga_check/pgrn-file.h
+include/postgresql/server/contrib/pgroonga_check/pgrn-full-text-search-condition.h
+include/postgresql/server/contrib/pgroonga_check/pgrn-global.h
+include/postgresql/server/contrib/pgroonga_check/pgrn-groonga-tuple-is-alive.h
+include/postgresql/server/contrib/pgroonga_check/pgrn-groonga.h
+include/postgresql/server/contrib/pgroonga_check/pgrn-highlight-html.h
+include/postgresql/server/contrib/pgroonga_check/pgrn-index-status.h
+include/postgresql/server/contrib/pgroonga_check/pgrn-jsonb.h
+include/postgresql/server/contrib/pgroonga_check/pgrn-keywords.h
+include/postgresql/server/contrib/pgroonga_check/pgrn-match-positions-byte.h
+include/postgresql/server/contrib/pgroonga_check/pgrn-match-positions-character.h
+include/postgresql/server/contrib/pgroonga_check/pgrn-normalize.h
+include/postgresql/server/contrib/pgroonga_check/pgrn-options.h
+include/postgresql/server/contrib/pgroonga_check/pgrn-pg.h
+include/postgresql/server/contrib/pgroonga_check/pgrn-portable.h
+include/postgresql/server/contrib/pgroonga_check/pgrn-query-expand.h
+include/postgresql/server/contrib/pgroonga_check/pgrn-query-extract-keywords.h
+include/postgresql/server/contrib/pgroonga_check/pgrn-result-converter.h
+include/postgresql/server/contrib/pgroonga_check/pgrn-row-level-security.h
+include/postgresql/server/contrib/pgroonga_check/pgrn-search.h
+include/postgresql/server/contrib/pgroonga_check/pgrn-sequential-search.h
+include/postgresql/server/contrib/pgroonga_check/pgrn-string.h
+include/postgresql/server/contrib/pgroonga_check/pgrn-tokenize.h
+include/postgresql/server/contrib/pgroonga_check/pgrn-value.h
+include/postgresql/server/contrib/pgroonga_check/pgrn-variables.h
+include/postgresql/server/contrib/pgroonga_check/pgrn-wal.h
+include/postgresql/server/contrib/pgroonga_check/pgrn-writable.h
+include/postgresql/server/contrib/pgroonga_check/pgroonga.h
+include/postgresql/server/contrib/pgroonga_crash_safer/pgrn-alias.h
+include/postgresql/server/contrib/pgroonga_crash_safer/pgrn-auto-close.h
+include/postgresql/server/contrib/pgroonga_crash_safer/pgrn-column-name.h
+include/postgresql/server/contrib/pgroonga_crash_safer/pgrn-command-escape-value.h
+include/postgresql/server/contrib/pgroonga_crash_safer/pgrn-compatible.h
+include/postgresql/server/contrib/pgroonga_crash_safer/pgrn-convert.h
+include/postgresql/server/contrib/pgroonga_crash_safer/pgrn-crash-safer-statuses.h
+include/postgresql/server/contrib/pgroonga_crash_safer/pgrn-create.h
+include/postgresql/server/contrib/pgroonga_crash_safer/pgrn-ctid.h
+include/postgresql/server/contrib/pgroonga_crash_safer/pgrn-database.h
+include/postgresql/server/contrib/pgroonga_crash_safer/pgrn-file.h
+include/postgresql/server/contrib/pgroonga_crash_safer/pgrn-full-text-search-condition.h
+include/postgresql/server/contrib/pgroonga_crash_safer/pgrn-global.h
+include/postgresql/server/contrib/pgroonga_crash_safer/pgrn-groonga-tuple-is-alive.h
+include/postgresql/server/contrib/pgroonga_crash_safer/pgrn-groonga.h
+include/postgresql/server/contrib/pgroonga_crash_safer/pgrn-highlight-html.h
+include/postgresql/server/contrib/pgroonga_crash_safer/pgrn-index-status.h
+include/postgresql/server/contrib/pgroonga_crash_safer/pgrn-jsonb.h
+include/postgresql/server/contrib/pgroonga_crash_safer/pgrn-keywords.h
+include/postgresql/server/contrib/pgroonga_crash_safer/pgrn-match-positions-byte.h
+include/postgresql/server/contrib/pgroonga_crash_safer/pgrn-match-positions-character.h
+include/postgresql/server/contrib/pgroonga_crash_safer/pgrn-normalize.h
+include/postgresql/server/contrib/pgroonga_crash_safer/pgrn-options.h
+include/postgresql/server/contrib/pgroonga_crash_safer/pgrn-pg.h
+include/postgresql/server/contrib/pgroonga_crash_safer/pgrn-portable.h
+include/postgresql/server/contrib/pgroonga_crash_safer/pgrn-query-expand.h
+include/postgresql/server/contrib/pgroonga_crash_safer/pgrn-query-extract-keywords.h
+include/postgresql/server/contrib/pgroonga_crash_safer/pgrn-result-converter.h
+include/postgresql/server/contrib/pgroonga_crash_safer/pgrn-row-level-security.h
+include/postgresql/server/contrib/pgroonga_crash_safer/pgrn-search.h
+include/postgresql/server/contrib/pgroonga_crash_safer/pgrn-sequential-search.h
+include/postgresql/server/contrib/pgroonga_crash_safer/pgrn-string.h
+include/postgresql/server/contrib/pgroonga_crash_safer/pgrn-tokenize.h
+include/postgresql/server/contrib/pgroonga_crash_safer/pgrn-value.h
+include/postgresql/server/contrib/pgroonga_crash_safer/pgrn-variables.h
+include/postgresql/server/contrib/pgroonga_crash_safer/pgrn-wal.h
+include/postgresql/server/contrib/pgroonga_crash_safer/pgrn-writable.h
+include/postgresql/server/contrib/pgroonga_crash_safer/pgroonga.h
+include/postgresql/server/contrib/pgroonga_standby_maintainer/pgrn-alias.h
+include/postgresql/server/contrib/pgroonga_standby_maintainer/pgrn-auto-close.h
+include/postgresql/server/contrib/pgroonga_standby_maintainer/pgrn-column-name.h
+include/postgresql/server/contrib/pgroonga_standby_maintainer/pgrn-command-escape-value.h
+include/postgresql/server/contrib/pgroonga_standby_maintainer/pgrn-compatible.h
+include/postgresql/server/contrib/pgroonga_standby_maintainer/pgrn-convert.h
+include/postgresql/server/contrib/pgroonga_standby_maintainer/pgrn-crash-safer-statuses.h
+include/postgresql/server/contrib/pgroonga_standby_maintainer/pgrn-create.h
+include/postgresql/server/contrib/pgroonga_standby_maintainer/pgrn-ctid.h
+include/postgresql/server/contrib/pgroonga_standby_maintainer/pgrn-database.h
+include/postgresql/server/contrib/pgroonga_standby_maintainer/pgrn-file.h
+include/postgresql/server/contrib/pgroonga_standby_maintainer/pgrn-full-text-search-condition.h
+include/postgresql/server/contrib/pgroonga_standby_maintainer/pgrn-global.h
+include/postgresql/server/contrib/pgroonga_standby_maintainer/pgrn-groonga-tuple-is-alive.h
+include/postgresql/server/contrib/pgroonga_standby_maintainer/pgrn-groonga.h
+include/postgresql/server/contrib/pgroonga_standby_maintainer/pgrn-highlight-html.h
+include/postgresql/server/contrib/pgroonga_standby_maintainer/pgrn-index-status.h
+include/postgresql/server/contrib/pgroonga_standby_maintainer/pgrn-jsonb.h
+include/postgresql/server/contrib/pgroonga_standby_maintainer/pgrn-keywords.h
+include/postgresql/server/contrib/pgroonga_standby_maintainer/pgrn-match-positions-byte.h
+include/postgresql/server/contrib/pgroonga_standby_maintainer/pgrn-match-positions-character.h
+include/postgresql/server/contrib/pgroonga_standby_maintainer/pgrn-normalize.h
+include/postgresql/server/contrib/pgroonga_standby_maintainer/pgrn-options.h
+include/postgresql/server/contrib/pgroonga_standby_maintainer/pgrn-pg.h
+include/postgresql/server/contrib/pgroonga_standby_maintainer/pgrn-portable.h
+include/postgresql/server/contrib/pgroonga_standby_maintainer/pgrn-query-expand.h
+include/postgresql/server/contrib/pgroonga_standby_maintainer/pgrn-query-extract-keywords.h
+include/postgresql/server/contrib/pgroonga_standby_maintainer/pgrn-result-converter.h
+include/postgresql/server/contrib/pgroonga_standby_maintainer/pgrn-row-level-security.h
+include/postgresql/server/contrib/pgroonga_standby_maintainer/pgrn-search.h
+include/postgresql/server/contrib/pgroonga_standby_maintainer/pgrn-sequential-search.h
+include/postgresql/server/contrib/pgroonga_standby_maintainer/pgrn-string.h
+include/postgresql/server/contrib/pgroonga_standby_maintainer/pgrn-tokenize.h
+include/postgresql/server/contrib/pgroonga_standby_maintainer/pgrn-value.h
+include/postgresql/server/contrib/pgroonga_standby_maintainer/pgrn-variables.h
+include/postgresql/server/contrib/pgroonga_standby_maintainer/pgrn-wal.h
+include/postgresql/server/contrib/pgroonga_standby_maintainer/pgrn-writable.h
+include/postgresql/server/contrib/pgroonga_standby_maintainer/pgroonga.h
+include/postgresql/server/contrib/pgroonga_wal_applier/pgrn-alias.h
+include/postgresql/server/contrib/pgroonga_wal_applier/pgrn-auto-close.h
+include/postgresql/server/contrib/pgroonga_wal_applier/pgrn-column-name.h
+include/postgresql/server/contrib/pgroonga_wal_applier/pgrn-command-escape-value.h
+include/postgresql/server/contrib/pgroonga_wal_applier/pgrn-compatible.h
+include/postgresql/server/contrib/pgroonga_wal_applier/pgrn-convert.h
+include/postgresql/server/contrib/pgroonga_wal_applier/pgrn-crash-safer-statuses.h
+include/postgresql/server/contrib/pgroonga_wal_applier/pgrn-create.h
+include/postgresql/server/contrib/pgroonga_wal_applier/pgrn-ctid.h
+include/postgresql/server/contrib/pgroonga_wal_applier/pgrn-database.h
+include/postgresql/server/contrib/pgroonga_wal_applier/pgrn-file.h
+include/postgresql/server/contrib/pgroonga_wal_applier/pgrn-full-text-search-condition.h
+include/postgresql/server/contrib/pgroonga_wal_applier/pgrn-global.h
+include/postgresql/server/contrib/pgroonga_wal_applier/pgrn-groonga-tuple-is-alive.h
+include/postgresql/server/contrib/pgroonga_wal_applier/pgrn-groonga.h
+include/postgresql/server/contrib/pgroonga_wal_applier/pgrn-highlight-html.h
+include/postgresql/server/contrib/pgroonga_wal_applier/pgrn-index-status.h
+include/postgresql/server/contrib/pgroonga_wal_applier/pgrn-jsonb.h
+include/postgresql/server/contrib/pgroonga_wal_applier/pgrn-keywords.h
+include/postgresql/server/contrib/pgroonga_wal_applier/pgrn-match-positions-byte.h
+include/postgresql/server/contrib/pgroonga_wal_applier/pgrn-match-positions-character.h
+include/postgresql/server/contrib/pgroonga_wal_applier/pgrn-normalize.h
+include/postgresql/server/contrib/pgroonga_wal_applier/pgrn-options.h
+include/postgresql/server/contrib/pgroonga_wal_applier/pgrn-pg.h
+include/postgresql/server/contrib/pgroonga_wal_applier/pgrn-portable.h
+include/postgresql/server/contrib/pgroonga_wal_applier/pgrn-query-expand.h
+include/postgresql/server/contrib/pgroonga_wal_applier/pgrn-query-extract-keywords.h
+include/postgresql/server/contrib/pgroonga_wal_applier/pgrn-result-converter.h
+include/postgresql/server/contrib/pgroonga_wal_applier/pgrn-row-level-security.h
+include/postgresql/server/contrib/pgroonga_wal_applier/pgrn-search.h
+include/postgresql/server/contrib/pgroonga_wal_applier/pgrn-sequential-search.h
+include/postgresql/server/contrib/pgroonga_wal_applier/pgrn-string.h
+include/postgresql/server/contrib/pgroonga_wal_applier/pgrn-tokenize.h
+include/postgresql/server/contrib/pgroonga_wal_applier/pgrn-value.h
+include/postgresql/server/contrib/pgroonga_wal_applier/pgrn-variables.h
+include/postgresql/server/contrib/pgroonga_wal_applier/pgrn-wal.h
+include/postgresql/server/contrib/pgroonga_wal_applier/pgrn-writable.h
+include/postgresql/server/contrib/pgroonga_wal_applier/pgroonga.h
+include/postgresql/server/extension/pgroonga/pgrn-alias.h
+include/postgresql/server/extension/pgroonga/pgrn-auto-close.h
+include/postgresql/server/extension/pgroonga/pgrn-column-name.h
+include/postgresql/server/extension/pgroonga/pgrn-command-escape-value.h
+include/postgresql/server/extension/pgroonga/pgrn-compatible.h
+include/postgresql/server/extension/pgroonga/pgrn-convert.h
+include/postgresql/server/extension/pgroonga/pgrn-crash-safer-statuses.h
+include/postgresql/server/extension/pgroonga/pgrn-create.h
+include/postgresql/server/extension/pgroonga/pgrn-ctid.h
+include/postgresql/server/extension/pgroonga/pgrn-database.h
+include/postgresql/server/extension/pgroonga/pgrn-file.h
+include/postgresql/server/extension/pgroonga/pgrn-full-text-search-condition.h
+include/postgresql/server/extension/pgroonga/pgrn-global.h
+include/postgresql/server/extension/pgroonga/pgrn-groonga-tuple-is-alive.h
+include/postgresql/server/extension/pgroonga/pgrn-groonga.h
+include/postgresql/server/extension/pgroonga/pgrn-highlight-html.h
+include/postgresql/server/extension/pgroonga/pgrn-index-status.h
+include/postgresql/server/extension/pgroonga/pgrn-jsonb.h
+include/postgresql/server/extension/pgroonga/pgrn-keywords.h
+include/postgresql/server/extension/pgroonga/pgrn-match-positions-byte.h
+include/postgresql/server/extension/pgroonga/pgrn-match-positions-character.h
+include/postgresql/server/extension/pgroonga/pgrn-normalize.h
+include/postgresql/server/extension/pgroonga/pgrn-options.h
+include/postgresql/server/extension/pgroonga/pgrn-pg.h
+include/postgresql/server/extension/pgroonga/pgrn-portable.h
+include/postgresql/server/extension/pgroonga/pgrn-query-expand.h
+include/postgresql/server/extension/pgroonga/pgrn-query-extract-keywords.h
+include/postgresql/server/extension/pgroonga/pgrn-result-converter.h
+include/postgresql/server/extension/pgroonga/pgrn-row-level-security.h
+include/postgresql/server/extension/pgroonga/pgrn-search.h
+include/postgresql/server/extension/pgroonga/pgrn-sequential-search.h
+include/postgresql/server/extension/pgroonga/pgrn-string.h
+include/postgresql/server/extension/pgroonga/pgrn-tokenize.h
+include/postgresql/server/extension/pgroonga/pgrn-value.h
+include/postgresql/server/extension/pgroonga/pgrn-variables.h
+include/postgresql/server/extension/pgroonga/pgrn-wal.h
+include/postgresql/server/extension/pgroonga/pgrn-writable.h
+include/postgresql/server/extension/pgroonga/pgroonga.h
+include/postgresql/server/extension/pgroonga/xxhash.h
+include/postgresql/server/extension/pgroonga_database/pgrn-alias.h
+include/postgresql/server/extension/pgroonga_database/pgrn-auto-close.h
+include/postgresql/server/extension/pgroonga_database/pgrn-column-name.h
+include/postgresql/server/extension/pgroonga_database/pgrn-command-escape-value.h
+include/postgresql/server/extension/pgroonga_database/pgrn-compatible.h
+include/postgresql/server/extension/pgroonga_database/pgrn-convert.h
+include/postgresql/server/extension/pgroonga_database/pgrn-crash-safer-statuses.h
+include/postgresql/server/extension/pgroonga_database/pgrn-create.h
+include/postgresql/server/extension/pgroonga_database/pgrn-ctid.h
+include/postgresql/server/extension/pgroonga_database/pgrn-database.h
+include/postgresql/server/extension/pgroonga_database/pgrn-file.h
+include/postgresql/server/extension/pgroonga_database/pgrn-full-text-search-condition.h
+include/postgresql/server/extension/pgroonga_database/pgrn-global.h
+include/postgresql/server/extension/pgroonga_database/pgrn-groonga-tuple-is-alive.h
+include/postgresql/server/extension/pgroonga_database/pgrn-groonga.h
+include/postgresql/server/extension/pgroonga_database/pgrn-highlight-html.h
+include/postgresql/server/extension/pgroonga_database/pgrn-index-status.h
+include/postgresql/server/extension/pgroonga_database/pgrn-jsonb.h
+include/postgresql/server/extension/pgroonga_database/pgrn-keywords.h
+include/postgresql/server/extension/pgroonga_database/pgrn-match-positions-byte.h
+include/postgresql/server/extension/pgroonga_database/pgrn-match-positions-character.h
+include/postgresql/server/extension/pgroonga_database/pgrn-normalize.h
+include/postgresql/server/extension/pgroonga_database/pgrn-options.h
+include/postgresql/server/extension/pgroonga_database/pgrn-pg.h
+include/postgresql/server/extension/pgroonga_database/pgrn-portable.h
+include/postgresql/server/extension/pgroonga_database/pgrn-query-expand.h
+include/postgresql/server/extension/pgroonga_database/pgrn-query-extract-keywords.h
+include/postgresql/server/extension/pgroonga_database/pgrn-result-converter.h
+include/postgresql/server/extension/pgroonga_database/pgrn-row-level-security.h
+include/postgresql/server/extension/pgroonga_database/pgrn-search.h
+include/postgresql/server/extension/pgroonga_database/pgrn-sequential-search.h
+include/postgresql/server/extension/pgroonga_database/pgrn-string.h
+include/postgresql/server/extension/pgroonga_database/pgrn-tokenize.h
+include/postgresql/server/extension/pgroonga_database/pgrn-value.h
+include/postgresql/server/extension/pgroonga_database/pgrn-variables.h
+include/postgresql/server/extension/pgroonga_database/pgrn-wal.h
+include/postgresql/server/extension/pgroonga_database/pgrn-writable.h
+include/postgresql/server/extension/pgroonga_database/pgroonga.h
 lib/postgresql/pgroonga.so
 lib/postgresql/pgroonga_check.so
+lib/postgresql/pgroonga_crash_safer.so
 lib/postgresql/pgroonga_database.so
+lib/postgresql/pgroonga_standby_maintainer.so
+lib/postgresql/pgroonga_wal_applier.so
+share/postgresql/extension/pgroonga--%%MVER%%.sql
 share/postgresql/extension/pgroonga--1.0.0--1.0.1.sql
 share/postgresql/extension/pgroonga--1.0.1--1.0.2.sql
 share/postgresql/extension/pgroonga--1.0.2--1.0.3.sql
@@ -157,8 +287,27 @@ share/postgresql/extension/pgroonga--2.2.5--2.2.6.sql
 share/postgresql/extension/pgroonga--2.2.6--2.2.7.sql
 share/postgresql/extension/pgroonga--2.2.7--2.2.8.sql
 share/postgresql/extension/pgroonga--2.2.8--2.2.9.sql
-share/postgresql/extension/pgroonga--2.2.9--%%MVER%%.sql
-share/postgresql/extension/pgroonga--%%MVER%%.sql
+share/postgresql/extension/pgroonga--2.2.9--2.3.0.sql
+share/postgresql/extension/pgroonga--2.3.0--2.3.1.sql
+share/postgresql/extension/pgroonga--2.3.1--2.3.2.sql
+share/postgresql/extension/pgroonga--2.3.2--2.3.3.sql
+share/postgresql/extension/pgroonga--2.3.3--2.3.4.sql
+share/postgresql/extension/pgroonga--2.3.4--2.3.5.sql
+share/postgresql/extension/pgroonga--2.3.5--2.3.6.sql
+share/postgresql/extension/pgroonga--2.3.6--2.3.7.sql
+share/postgresql/extension/pgroonga--2.3.7--2.3.8.sql
+share/postgresql/extension/pgroonga--2.3.8--2.3.9.sql
+share/postgresql/extension/pgroonga--2.3.9--2.4.0.sql
+share/postgresql/extension/pgroonga--2.4.0--2.4.1.sql
+share/postgresql/extension/pgroonga--2.4.1--2.4.2.sql
+share/postgresql/extension/pgroonga--2.4.2--2.4.3.sql
+share/postgresql/extension/pgroonga--2.4.3--2.4.4.sql
+share/postgresql/extension/pgroonga--2.4.4--2.4.5.sql
+share/postgresql/extension/pgroonga--2.4.5--2.4.6.sql
+share/postgresql/extension/pgroonga--2.4.6--2.4.7.sql
+share/postgresql/extension/pgroonga--2.4.7--3.0.0.sql
+share/postgresql/extension/pgroonga--3.0.0--3.0.1.sql
+share/postgresql/extension/pgroonga--3.0.1--%%MVER%%.sql
+share/postgresql/extension/pgroonga.control
 share/postgresql/extension/pgroonga_database--%%MVER%%.sql
 share/postgresql/extension/pgroonga_database.control
-share/postgresql/extension/pgroonga.control
diff --git a/databases/pgrouting/Makefile b/databases/pgrouting/Makefile
index fec484547b8f..182f3c6b39b4 100644
--- a/databases/pgrouting/Makefile
+++ b/databases/pgrouting/Makefile
@@ -1,20 +1,19 @@
-# Created by: lbartoletti <lbartoletti@FreeBSD.org>
-
 PORTNAME=	pgrouting
 DISTVERSIONPREFIX=	v
-DISTVERSION=	3.2.0
+DISTVERSION=	3.6.2
 CATEGORIES=	databases geography
 
 MAINTAINER=	lbartoletti@FreeBSD.org
 COMMENT=	Extension to PostGIS to provide geospatial routing functionality
+WWW=		https://pgrouting.org/
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libboost_system.so:devel/boost-libs
-RUN_DEPENDS=	${LOCALBASE}/share/postgresql/extension/postgis.control:databases/postgis30
+RUN_DEPENDS=	${LOCALBASE}/share/postgresql/extension/postgis.control:databases/postgis33
 
-USES=		compiler:c++14-lang cmake localbase perl5 pgsql:9.1+ pkgconfig
+USES=		compiler:c++14-lang cmake localbase perl5 pgsql:11+ pkgconfig
 WANT_PGSQL=	lib server
 USE_LDCONFIG=	yes
 USE_GITHUB=	yes
diff --git a/databases/pgrouting/distinfo b/databases/pgrouting/distinfo
index 9dd19e5948d4..ff4c13f6828a 100644
--- a/databases/pgrouting/distinfo
+++ b/databases/pgrouting/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1622962123
-SHA256 (pgRouting-pgrouting-v3.2.0_GH0.tar.gz) = 5cf4d2147cf0897b5e2de9f1b526339abf293226c411882dba4901ba049092ab
-SIZE (pgRouting-pgrouting-v3.2.0_GH0.tar.gz) = 5924464
+TIMESTAMP = 1712951951
+SHA256 (pgRouting-pgrouting-v3.6.2_GH0.tar.gz) = f4a1ed79d6f714e52548eca3bb8e5593c6745f1bde92eb5fb858efd8984dffa2
+SIZE (pgRouting-pgrouting-v3.6.2_GH0.tar.gz) = 3873384
diff --git a/databases/pgrouting/files/patch-src_cpp__common_get__check__data.cpp b/databases/pgrouting/files/patch-src_cpp__common_get__check__data.cpp
new file mode 100644
index 000000000000..13f7a0dd577d
--- /dev/null
+++ b/databases/pgrouting/files/patch-src_cpp__common_get__check__data.cpp
@@ -0,0 +1,11 @@
+--- src/cpp_common/get_check_data.cpp.orig	2024-02-09 00:36:37 UTC
++++ src/cpp_common/get_check_data.cpp
+@@ -262,7 +262,7 @@ int64_t*
+  * @returns The resultant array
+  */
+ int64_t*
+-get_array(ArrayType *v, size_t *arrlen, bool allow_empty) {
++get_array(ArrayType *v, uint64_t *arrlen, bool allow_empty) {
+     int64_t *c_array = nullptr;
+ 
+     auto    element_type = ARR_ELEMTYPE(v);
diff --git a/databases/pgrouting/pkg-descr b/databases/pgrouting/pkg-descr
index a62d6ae85cdb..4326513879ad 100644
--- a/databases/pgrouting/pkg-descr
+++ b/databases/pgrouting/pkg-descr
@@ -1,4 +1,2 @@
 pgRouting extends the PostGIS / PostgreSQL geospatial database to provide
 geospatial routing functionality.
-
-WWW: http://pgrouting.org/
diff --git a/databases/pgrouting/pkg-plist b/databases/pgrouting/pkg-plist
index 453335746f0d..79064e921ae7 100644
--- a/databases/pgrouting/pkg-plist
+++ b/databases/pgrouting/pkg-plist
@@ -1,4 +1,4 @@
-lib/postgresql/libpgrouting-3.2.so
+lib/postgresql/libpgrouting-3.6.so
 share/postgresql/extension/pgrouting--2.6.0--%%DISTVERSION%%.sql
 share/postgresql/extension/pgrouting--2.6.1--%%DISTVERSION%%.sql
 share/postgresql/extension/pgrouting--2.6.2--%%DISTVERSION%%.sql
@@ -9,9 +9,27 @@ share/postgresql/extension/pgrouting--3.0.2--%%DISTVERSION%%.sql
 share/postgresql/extension/pgrouting--3.0.3--%%DISTVERSION%%.sql
 share/postgresql/extension/pgrouting--3.0.4--%%DISTVERSION%%.sql
 share/postgresql/extension/pgrouting--3.0.5--%%DISTVERSION%%.sql
+share/postgresql/extension/pgrouting--3.0.6--%%DISTVERSION%%.sql
 share/postgresql/extension/pgrouting--3.1.0--%%DISTVERSION%%.sql
 share/postgresql/extension/pgrouting--3.1.1--%%DISTVERSION%%.sql
 share/postgresql/extension/pgrouting--3.1.2--%%DISTVERSION%%.sql
 share/postgresql/extension/pgrouting--3.1.3--%%DISTVERSION%%.sql
+share/postgresql/extension/pgrouting--3.1.4--%%DISTVERSION%%.sql
+share/postgresql/extension/pgrouting--3.2.0--%%DISTVERSION%%.sql
+share/postgresql/extension/pgrouting--3.2.1--%%DISTVERSION%%.sql
+share/postgresql/extension/pgrouting--3.2.2--%%DISTVERSION%%.sql
+share/postgresql/extension/pgrouting--3.3.0--%%DISTVERSION%%.sql
+share/postgresql/extension/pgrouting--3.3.1--%%DISTVERSION%%.sql
+share/postgresql/extension/pgrouting--3.3.2--%%DISTVERSION%%.sql
+share/postgresql/extension/pgrouting--3.3.3--%%DISTVERSION%%.sql
+share/postgresql/extension/pgrouting--3.3.4--%%DISTVERSION%%.sql
+share/postgresql/extension/pgrouting--3.3.5--%%DISTVERSION%%.sql
+share/postgresql/extension/pgrouting--3.4.0--%%DISTVERSION%%.sql
+share/postgresql/extension/pgrouting--3.4.1--%%DISTVERSION%%.sql
+share/postgresql/extension/pgrouting--3.4.2--%%DISTVERSION%%.sql
+share/postgresql/extension/pgrouting--3.5.0--%%DISTVERSION%%.sql
+share/postgresql/extension/pgrouting--3.5.1--%%DISTVERSION%%.sql
+share/postgresql/extension/pgrouting--3.6.0--%%DISTVERSION%%.sql
+share/postgresql/extension/pgrouting--3.6.1--%%DISTVERSION%%.sql
 share/postgresql/extension/pgrouting--%%DISTVERSION%%.sql
 share/postgresql/extension/pgrouting.control
diff --git a/databases/pgsanity/Makefile b/databases/pgsanity/Makefile
index b40eadf2812b..97508d05f9bc 100644
--- a/databases/pgsanity/Makefile
+++ b/databases/pgsanity/Makefile
@@ -7,11 +7,12 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	0mp@FreeBSD.org
 COMMENT=	Check syntax of PostgreSQL SQL files
+WWW=		https://github.com/markdrago/pgsanity
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-USES=		pgsql python:3.6+
+USES=		pgsql python
 USE_PYTHON=	autoplist concurrent distutils
 
 USE_GITHUB=	yes
diff --git a/databases/pgsanity/pkg-descr b/databases/pgsanity/pkg-descr
index 2a72bd888704..b124f18f5b8a 100644
--- a/databases/pgsanity/pkg-descr
+++ b/databases/pgsanity/pkg-descr
@@ -10,5 +10,3 @@ So the approach that PgSanity takes is to take a file that has a list
 of bare SQL in it, make that file look like a C file with embedded
 SQL, run it through ecpg and let ecpg report on the syntax errors of
 the SQL.
-
-WWW: https://github.com/markdrago/pgsanity
diff --git a/databases/pgsphere/Makefile b/databases/pgsphere/Makefile
index 47c23d3b157a..a1e28cb09d78 100644
--- a/databases/pgsphere/Makefile
+++ b/databases/pgsphere/Makefile
@@ -1,5 +1,3 @@
-# Created by: Sunpoet Po-Chuan Hsieh <sunpoet@sunpoet.net>
-
 PORTNAME=	pgsphere
 PORTVERSION=	1.1.5
 PORTREVISION=	4
@@ -7,10 +5,14 @@ CATEGORIES=	databases geography
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Spherical data types, functions, and operators for PostgreSQL
+WWW=		https://pgsphere.github.io/
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYRIGHT.pg_sphere
 
+DEPRECATED=	The repository has been archived by the owner on 2023-08-09 and is inactive for almost 4.5 years
+EXPIRATION_DATE=2024-04-30
+
 OPTIONS_DEFINE=	DOCS
 
 USES=		gmake pgsql
diff --git a/databases/pgsphere/pkg-descr b/databases/pgsphere/pkg-descr
index 77c59692cf17..0de10b9db1ec 100644
--- a/databases/pgsphere/pkg-descr
+++ b/databases/pgsphere/pkg-descr
@@ -1,4 +1,2 @@
 PgSphere provides spherical data types, functions, operators, and indexing for
 PostgreSQL.
-
-WWW: https://pgsphere.github.io/
diff --git a/databases/pgtcl/Makefile b/databases/pgtcl/Makefile
index 3c124720dfe5..430a27b3dc09 100644
--- a/databases/pgtcl/Makefile
+++ b/databases/pgtcl/Makefile
@@ -1,5 +1,3 @@
-# Created by: Mikhail Teterin
-
 PORTNAME=	pgtcl
 PORTVERSION=	2.1.1
 PORTREVISION=	2
@@ -11,6 +9,7 @@ EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	mi@aldan.algebra.com
 COMMENT=	TCL extension for accessing a PostgreSQL server (PGTCL-NG)
+WWW=		https://sourceforge.net/projects/pgtclng/
 
 LICENSE=	PostgreSQL
 LICENSE_FILE=	${WRKSRC}/COPYRIGHT
@@ -27,6 +26,8 @@ USE_LDCONFIG=	${LIBDIR}
 PLIST_SUB+=	PORTVERSION=${PORTVERSION}
 MANUALREL=	20171113
 
+CONFLICTS_INSTALL?=	pgtcl pgtcl-postgresql[0-9][0-9] # lib/pgtcl/libpgtcl2.1.1.so
+
 PLIST_FILES=	lib/pgtcl/libpgtcl${PORTVERSION}.so \
 		lib/pgtcl/pkgIndex.tcl
 PORTDOCS=	*
diff --git a/databases/pgtcl/pkg-descr b/databases/pgtcl/pkg-descr
index 2dc0d403ac66..93b71c0e8fde 100644
--- a/databases/pgtcl/pkg-descr
+++ b/databases/pgtcl/pkg-descr
@@ -1,5 +1,3 @@
 A TCL extension for accessing PostgreSQL databases. This used
 to come bunlded with PostgreSQL itself, but was split into a
 separate project in more recent version (8+).
-
-WWW: https://sourceforge.net/projects/pgtclng/
diff --git a/databases/pgtop/Makefile b/databases/pgtop/Makefile
index 1852f5aa772f..b302c984b0ff 100644
--- a/databases/pgtop/Makefile
+++ b/databases/pgtop/Makefile
@@ -1,5 +1,3 @@
-# Created by: Bartek Rutkowski <r@robakdesign.com>
-
 PORTNAME=	pgtop
 PORTVERSION=	0.11
 CATEGORIES=	databases
@@ -8,6 +6,7 @@ MASTER_SITE_SUBDIR=	CPAN:COSIMO
 
 MAINTAINER=	wen@FreeBSD.org
 COMMENT=	Display PostgreSQL performance info like top(1)
+WWW=		https://metacpan.org/release/COSIMO/pgtop-0.05
 
 LICENSE=	GPLv2
 
diff --git a/databases/pgtop/pkg-descr b/databases/pgtop/pkg-descr
index 220ce901cd17..5526663a00fa 100644
--- a/databases/pgtop/pkg-descr
+++ b/databases/pgtop/pkg-descr
@@ -3,5 +3,3 @@ which in turn was inspired by the system monitoring tool top.
 pgtop will connect to a PostgreSQL server and periodically
 run queries against the pg_stat* relations and attempt
 to summarize the information from them in a useful format.
-
-WWW: https://metacpan.org/release/COSIMO/pgtop-0.05
diff --git a/databases/pguri/Makefile b/databases/pguri/Makefile
index a5d29213190c..7ea44d541924 100644
--- a/databases/pguri/Makefile
+++ b/databases/pguri/Makefile
@@ -1,5 +1,3 @@
-# Created by: Torsten Zuehlsdorff <ports@toco-domains.de>
-
 PORTNAME=	pguri
 PORTVERSION=	1.20151224
 PORTREVISION=	2
@@ -7,6 +5,7 @@ CATEGORIES=	databases
 
 MAINTAINER=	tz@FreeBSD.org
 COMMENT=	URI datatype for PostgreSQL
+WWW=		https://github.com/petere/pguri
 
 BUILD_DEPENDS=	uriparser>=0.8.0:net/uriparser
 RUN_DEPENDS=	uriparser>=0.8.0:net/uriparser
diff --git a/databases/pguri/pkg-descr b/databases/pguri/pkg-descr
index 6f3efd696bbc..d58b00ca3753 100644
--- a/databases/pguri/pkg-descr
+++ b/databases/pguri/pkg-descr
@@ -1,3 +1 @@
 URI datatype for PostgreSQL
-
-WWW: https://github.com/petere/pguri
diff --git a/databases/pgvector/Makefile b/databases/pgvector/Makefile
new file mode 100644
index 000000000000..78636fcc5905
--- /dev/null
+++ b/databases/pgvector/Makefile
@@ -0,0 +1,25 @@
+PORTNAME=	pgvector
+PORTVERSION=	0.6.2
+DISTVERSIONPREFIX=	v
+CATEGORIES=	databases
+PKGNAMEPREFIX=	postgresql${PGSQL_VER:S/.//}-
+
+MAINTAINER=	tz@FreeBSD.org
+COMMENT=	PostgreSQL extension for vector similarity search
+
+LICENSE=	PostgreSQL
+
+USES=		gmake pgsql:12+
+WANT_PGSQL=	server
+
+USE_GITHUB=	yes
+GH_ACCOUNT=	pgvector
+GH_PROJECT=	pgvector
+
+MAKE_ARGS=	OPTFLAGS=""
+MAKE_ENV=	USE_PGXS=1
+
+post-install:
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/postgresql/vector.so
+
+.include <bsd.port.mk>
diff --git a/databases/pgvector/distinfo b/databases/pgvector/distinfo
new file mode 100644
index 000000000000..5a63f8fa2e48
--- /dev/null
+++ b/databases/pgvector/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1711308303
+SHA256 (pgvector-pgvector-v0.6.2_GH0.tar.gz) = a11cc249a9f3f3d7b13069a1696f2915ac28991a72d7ba4e2bcfdceddbaeae49
+SIZE (pgvector-pgvector-v0.6.2_GH0.tar.gz) = 82070
diff --git a/databases/pgvector/pkg-descr b/databases/pgvector/pkg-descr
new file mode 100644
index 000000000000..25c86b693f5c
--- /dev/null
+++ b/databases/pgvector/pkg-descr
@@ -0,0 +1,10 @@
+Open-source vector similarity search for Postgres
+
+Store your vectors with the rest of your data. Supports:
+
+* exact and approximate nearest neighbor search
+* L2 distance, inner product, and cosine distance
+* any language with a Postgres client
+
+Plus ACID compliance, point-in-time recovery, JOINs, and all of the other great
+features of Postgres
diff --git a/databases/pgvector/pkg-plist b/databases/pgvector/pkg-plist
new file mode 100644
index 000000000000..b1d8776c7fc8
--- /dev/null
+++ b/databases/pgvector/pkg-plist
@@ -0,0 +1,32 @@
+include/postgresql/server/extension/vector/vector.h
+lib/postgresql/vector.so
+share/postgresql/extension/vector--0.1.0--0.1.1.sql
+share/postgresql/extension/vector--0.1.1--0.1.3.sql
+share/postgresql/extension/vector--0.1.3--0.1.4.sql
+share/postgresql/extension/vector--0.1.4--0.1.5.sql
+share/postgresql/extension/vector--0.1.5--0.1.6.sql
+share/postgresql/extension/vector--0.1.6--0.1.7.sql
+share/postgresql/extension/vector--0.1.7--0.1.8.sql
+share/postgresql/extension/vector--0.1.8--0.2.0.sql
+share/postgresql/extension/vector--0.2.0--0.2.1.sql
+share/postgresql/extension/vector--0.2.1--0.2.2.sql
+share/postgresql/extension/vector--0.2.2--0.2.3.sql
+share/postgresql/extension/vector--0.2.3--0.2.4.sql
+share/postgresql/extension/vector--0.2.4--0.2.5.sql
+share/postgresql/extension/vector--0.2.5--0.2.6.sql
+share/postgresql/extension/vector--0.2.6--0.2.7.sql
+share/postgresql/extension/vector--0.2.7--0.3.0.sql
+share/postgresql/extension/vector--0.3.0--0.3.1.sql
+share/postgresql/extension/vector--0.3.1--0.3.2.sql
+share/postgresql/extension/vector--0.3.2--0.4.0.sql
+share/postgresql/extension/vector--0.4.0--0.4.1.sql
+share/postgresql/extension/vector--0.4.1--0.4.2.sql
+share/postgresql/extension/vector--0.4.2--0.4.3.sql
+share/postgresql/extension/vector--0.4.3--0.4.4.sql
+share/postgresql/extension/vector--0.4.4--0.5.0.sql
+share/postgresql/extension/vector--0.5.0--0.5.1.sql
+share/postgresql/extension/vector--0.5.1--0.6.0.sql
+share/postgresql/extension/vector--0.6.0--0.6.1.sql
+share/postgresql/extension/vector--0.6.1--0.6.2.sql
+share/postgresql/extension/vector--0.6.2.sql
+share/postgresql/extension/vector.control
diff --git a/databases/php-tarantool/Makefile b/databases/php-tarantool/Makefile
index 06ce23a1fef3..7c6b5f05b87f 100644
--- a/databases/php-tarantool/Makefile
+++ b/databases/php-tarantool/Makefile
@@ -1,5 +1,3 @@
-# Created by: Veniamin Gvozdikov <vg@FreeBSD.org>
-
 PORTNAME=	tarantool
 PORTVERSION=	0.3.3
 CATEGORIES=	databases
@@ -7,6 +5,7 @@ PKGNAMEPREFIX=	${PHP_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	PECL PHP driver for Tarantool
+WWW=		https://github.com/tarantool/tarantool-php
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
diff --git a/databases/php-tarantool/pkg-descr b/databases/php-tarantool/pkg-descr
index 7e2d108603b3..877a45c7d604 100644
--- a/databases/php-tarantool/pkg-descr
+++ b/databases/php-tarantool/pkg-descr
@@ -1,3 +1 @@
 PECL PHP driver for Tarantool
-
-WWW: https://github.com/tarantool/tarantool-php
diff --git a/databases/php-xapian/Makefile b/databases/php-xapian/Makefile
index 7fcf46ccde51..58ca4d445c23 100644
--- a/databases/php-xapian/Makefile
+++ b/databases/php-xapian/Makefile
@@ -1,7 +1,5 @@
-# Created by: Po-Chuan Hsieh <sunpoet@FreeBSD.org>
-
 PORTNAME=	xapian
-PORTVERSION=	1.4.18
+PORTVERSION=	1.4.25
 DISTVERSIONPREFIX=	bindings-
 CATEGORIES=	databases
 MASTER_SITES=	https://oligarchy.co.uk/xapian/${PORTVERSION}/ \
@@ -10,6 +8,7 @@ PKGNAMEPREFIX=	${PHP_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	PHP binding for Xapian
+WWW=		https://xapian.org/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
@@ -23,19 +22,17 @@ CONFIGURE_ARGS=	--datarootdir=${DATADIR} \
 		--docdir=${DOCSDIR} \
 		--enable-shared \
 		--enable-static \
-		--with-php7 \
+		--with-php \
 		--without-csharp \
 		--without-java \
 		--without-lua \
 		--without-perl \
-		--without-php \
 		--without-python \
 		--without-python3 \
 		--without-ruby \
 		--without-tcl
 CONFIGURE_ENV=	PHP_CONFIG=${LOCALBASE}/bin/php-config
 GNU_CONFIGURE=	yes
-IGNORE_WITH_PHP=80
 INSTALL_TARGET=	install-strip
 USE_CXXSTD=	c++11
 
@@ -47,7 +44,4 @@ PORTSCOUT=	limitw:1,even
 
 OPTIONS_DEFINE=	DOCS
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|-lstdc++||g' ${WRKSRC}/configure
-
 .include <bsd.port.mk>
diff --git a/databases/php-xapian/distinfo b/databases/php-xapian/distinfo
index 4b1c24973ed4..ce89a054cc5f 100644
--- a/databases/php-xapian/distinfo
+++ b/databases/php-xapian/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1611665351
-SHA256 (xapian-bindings-1.4.18.tar.xz) = fe52064e90d202f7819130ae3ad013c8b2b9cb517ad9fd607cf41d0110c5f18f
-SIZE (xapian-bindings-1.4.18.tar.xz) = 1135644
+TIMESTAMP = 1710712356
+SHA256 (xapian-bindings-1.4.25.tar.xz) = 068314fca3f54524701492df432fa54c485fd4e39613ca2cd275e136964e81a9
+SIZE (xapian-bindings-1.4.25.tar.xz) = 1076644
diff --git a/databases/php-xapian/files/patch-configure b/databases/php-xapian/files/patch-configure
new file mode 100644
index 000000000000..6b9dce2bb21b
--- /dev/null
+++ b/databases/php-xapian/files/patch-configure
@@ -0,0 +1,11 @@
+--- configure.orig	2023-02-02 01:01:44 UTC
++++ configure
+@@ -21048,7 +21048,7 @@ SWIG_CXXFLAGS=
+ if test yes = "$GXX" ; then
+                     SWIG_CXXFLAGS="-fno-strict-aliasing"
+ 
+-              XAPIAN_LIBS="$XAPIAN_LIBS -lstdc++"
++              XAPIAN_LIBS="$XAPIAN_LIBS "
+ 
+ 
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
diff --git a/databases/php-xapian/pkg-descr b/databases/php-xapian/pkg-descr
index fe1471963663..ccacd8259a19 100644
--- a/databases/php-xapian/pkg-descr
+++ b/databases/php-xapian/pkg-descr
@@ -1,3 +1 @@
 PHP binding for Xapian
-
-WWW: https://xapian.org/
diff --git a/databases/php-xapian/pkg-plist b/databases/php-xapian/pkg-plist
index eddd492272ee..5a843ffc5d35 100644
--- a/databases/php-xapian/pkg-plist
+++ b/databases/php-xapian/pkg-plist
@@ -1,8 +1,7 @@
 lib/php/%%PHP_EXT_DIR%%/xapian.a
 lib/php/%%PHP_EXT_DIR%%/xapian.so
-%%PORTDOCS%%%%DOCSDIR%%/php/examples/simpleexpand.php7
-%%PORTDOCS%%%%DOCSDIR%%/php/examples/simpleindex.php7
-%%PORTDOCS%%%%DOCSDIR%%/php/examples/simplematchdecider.php7
-%%PORTDOCS%%%%DOCSDIR%%/php/examples/simplesearch.php7
+%%PORTDOCS%%%%DOCSDIR%%/php/examples/simpleexpand.php8
+%%PORTDOCS%%%%DOCSDIR%%/php/examples/simpleindex.php8
+%%PORTDOCS%%%%DOCSDIR%%/php/examples/simplematchdecider.php8
+%%PORTDOCS%%%%DOCSDIR%%/php/examples/simplesearch.php8
 %%PORTDOCS%%%%DOCSDIR%%/php/index.html
-%%DATADIR%%/php/xapian.php
diff --git a/databases/php73-dba/Makefile b/databases/php73-dba/Makefile
deleted file mode 100644
index 7fce740ef8d0..000000000000
--- a/databases/php73-dba/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-CATEGORIES=	databases
-
-MASTERDIR=	${.CURDIR}/../../lang/php73
-
-PKGNAMESUFFIX=	-dba
-
-TEST_TARGET=    test
-
-.include "${MASTERDIR}/Makefile"
diff --git a/databases/php73-interbase/Makefile b/databases/php73-interbase/Makefile
deleted file mode 100644
index 55c33a2b311a..000000000000
--- a/databases/php73-interbase/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-CATEGORIES=	databases
-
-MASTERDIR=	${.CURDIR}/../../lang/php73
-
-PKGNAMESUFFIX=	-interbase
-
-TEST_TARGET=    test
-
-.include "${MASTERDIR}/Makefile"
diff --git a/databases/php73-mysqli/Makefile b/databases/php73-mysqli/Makefile
deleted file mode 100644
index e12caa20cfd3..000000000000
--- a/databases/php73-mysqli/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-CATEGORIES=	databases
-
-MASTERDIR=	${.CURDIR}/../../lang/php73
-
-PKGNAMESUFFIX=	-mysqli
-
-TEST_TARGET=    test
-
-.include "${MASTERDIR}/Makefile"
diff --git a/databases/php73-mysqli/files/patch-mysqli__api.c b/databases/php73-mysqli/files/patch-mysqli__api.c
deleted file mode 100644
index 2d88e061f9da..000000000000
--- a/databases/php73-mysqli/files/patch-mysqli__api.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- mysqli_api.c.orig	2019-12-17 10:29:23 UTC
-+++ mysqli_api.c
-@@ -31,8 +31,9 @@
- #include "zend_smart_str.h"
- #include "php_mysqli_structs.h"
- #include "mysqli_priv.h"
-+#if defined(MYSQLI_USE_MYSQLND)
- #include "ext/mysqlnd/mysql_float_to_double.h"
--
-+#endif
- 
- #if !defined(MYSQLI_USE_MYSQLND)
- /* {{{ mysqli_tx_cor_options_to_string */
diff --git a/databases/php73-odbc/Makefile b/databases/php73-odbc/Makefile
deleted file mode 100644
index c59558a1d1e6..000000000000
--- a/databases/php73-odbc/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-CATEGORIES=	databases
-
-MASTERDIR=	${.CURDIR}/../../lang/php73
-
-PKGNAMESUFFIX=	-odbc
-
-TEST_TARGET=    test
-
-.include "${MASTERDIR}/Makefile"
diff --git a/databases/php73-odbc/files/patch-config.m4 b/databases/php73-odbc/files/patch-config.m4
deleted file mode 100644
index 46e76eeaab8e..000000000000
--- a/databases/php73-odbc/files/patch-config.m4
+++ /dev/null
@@ -1,111 +0,0 @@
---- config.m4.orig	2018-09-25 09:07:57 UTC
-+++ config.m4
-@@ -97,6 +97,9 @@ AC_DEFUN([PHP_ODBC_FIND_EMPRESS_BCS_LIBS
- dnl
- dnl configure options
- dnl
-+PHP_ARG_ENABLE(odbc,,
-+[  --enable-odbc             Enable ODBC support with selected driver])
-+
- 
- PHP_ARG_WITH(odbcver,,
- [  --with-odbcver[=HEX]      Force support for the passed ODBC version. A hex number is expected, default 0x0350.
-@@ -104,7 +107,7 @@ PHP_ARG_WITH(odbcver,,
- 
- if test -z "$ODBC_TYPE"; then
- PHP_ARG_WITH(adabas,,
--[  --with-adabas[=DIR]       Include Adabas D support [/usr/local]])
-+[  --with-adabas[=DIR]       Include Adabas D support [/usr/local]], no, no)
- 
-   AC_MSG_CHECKING([for Adabas support])
-   if test "$PHP_ADABAS" != "no"; then
-@@ -133,7 +136,7 @@ fi
- 
- if test -z "$ODBC_TYPE"; then
- PHP_ARG_WITH(sapdb,,
--[  --with-sapdb[=DIR]        Include SAP DB support [/usr/local]])
-+[  --with-sapdb[=DIR]        Include SAP DB support [/usr/local]], no, no)
- 
-   AC_MSG_CHECKING([for SAP DB support])
-   if test "$PHP_SAPDB" != "no"; then
-@@ -153,7 +156,7 @@ fi
- 
- if test -z "$ODBC_TYPE"; then
- PHP_ARG_WITH(solid,,
--[  --with-solid[=DIR]        Include Solid support [/usr/local/solid]])
-+[  --with-solid[=DIR]        Include Solid support [/usr/local/solid]], no, no)
- 
-   AC_MSG_CHECKING(for Solid support)
-   if test "$PHP_SOLID" != "no"; then
-@@ -180,7 +183,7 @@ fi
- 
- if test -z "$ODBC_TYPE"; then
- PHP_ARG_WITH(ibm-db2,,
--[  --with-ibm-db2[=DIR]      Include IBM DB2 support [/home/db2inst1/sqllib]])
-+[  --with-ibm-db2[=DIR]      Include IBM DB2 support [/home/db2inst1/sqllib]], no, no)
- 
-   AC_MSG_CHECKING(for IBM DB2 support)
-   if test "$PHP_IBM_DB2" != "no"; then
-@@ -220,7 +223,7 @@ fi
- if test -z "$ODBC_TYPE"; then
- PHP_ARG_WITH(empress,,
- [  --with-empress[=DIR]      Include Empress support [\$EMPRESSPATH]
--                          (Empress Version >= 8.60 required)])
-+                          (Empress Version >= 8.60 required)], no, no)
- 
-   AC_MSG_CHECKING(for Empress support)
-   if test "$PHP_EMPRESS" != "no"; then
-@@ -245,7 +248,7 @@ fi
- if test -z "$ODBC_TYPE"; then
- PHP_ARG_WITH(empress-bcs,,
- [  --with-empress-bcs[=DIR]  Include Empress Local Access support [\$EMPRESSPATH]
--                          (Empress Version >= 8.60 required)])
-+                          (Empress Version >= 8.60 required)], no, no)
- 
-   AC_MSG_CHECKING(for Empress local access support)
-   if test "$PHP_EMPRESS_BCS" != "no"; then
-@@ -292,7 +295,7 @@ PHP_ARG_WITH(custom-odbc,,
-                           running this configure script:
-                             CPPFLAGS=\"-DODBC_QNX -DSQLANY_BUG\"
-                             LDFLAGS=-lunix
--                            CUSTOM_ODBC_LIBS=\"-ldblib -lodbc\"])
-+                            CUSTOM_ODBC_LIBS=\"-ldblib -lodbc\"], no, no)
- 
-   AC_MSG_CHECKING(for a custom ODBC support)
-   if test "$PHP_CUSTOM_ODBC" != "no"; then
-@@ -314,7 +317,7 @@ fi
- 
- if test -z "$ODBC_TYPE"; then
- PHP_ARG_WITH(iodbc,,
--[  --with-iodbc[=DIR]        Include iODBC support [/usr/local]])
-+[  --with-iodbc[=DIR]        Include iODBC support [/usr/local]], no, no)
- 
-   AC_MSG_CHECKING(for iODBC support)
-   if test "$PHP_IODBC" != "no"; then
-@@ -352,7 +355,7 @@ fi
- 
- if test -z "$ODBC_TYPE"; then
- PHP_ARG_WITH(esoob,,
--[  --with-esoob[=DIR]        Include Easysoft OOB support [/usr/local/easysoft/oob/client]])
-+[  --with-esoob[=DIR]        Include Easysoft OOB support [/usr/local/easysoft/oob/client]], no, no)
- 
-   AC_MSG_CHECKING(for Easysoft ODBC-ODBC Bridge support)
-   if test "$PHP_ESOOB" != "no"; then
-@@ -374,7 +377,7 @@ fi
- 
- if test -z "$ODBC_TYPE"; then
- PHP_ARG_WITH(unixODBC,,
--[  --with-unixODBC[=DIR]     Include unixODBC support [/usr/local]])
-+[  --with-unixODBC[=DIR]     Include unixODBC support [/usr/local]], no, no)
- 
-   AC_MSG_CHECKING(for unixODBC support)
-   if test "$PHP_UNIXODBC" != "no"; then
-@@ -397,7 +400,7 @@ fi
- 
- if test -z "$ODBC_TYPE"; then
- PHP_ARG_WITH(dbmaker,,
--[  --with-dbmaker[=DIR]      Include DBMaker support])
-+[  --with-dbmaker[=DIR]      Include DBMaker support], no, no)
- 
-   AC_MSG_CHECKING(for DBMaker support)
-   if test "$PHP_DBMAKER" != "no"; then
diff --git a/databases/php73-pdo/Makefile b/databases/php73-pdo/Makefile
deleted file mode 100644
index 663724eec036..000000000000
--- a/databases/php73-pdo/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-CATEGORIES=	databases
-
-MASTERDIR=	${.CURDIR}/../../lang/php73
-
-PKGNAMESUFFIX=	-pdo
-
-TEST_TARGET=    test
-
-.include "${MASTERDIR}/Makefile"
diff --git a/databases/php73-pdo_dblib/Makefile b/databases/php73-pdo_dblib/Makefile
deleted file mode 100644
index cd8aba6a2781..000000000000
--- a/databases/php73-pdo_dblib/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-CATEGORIES=	databases
-
-MASTERDIR=	${.CURDIR}/../../lang/php73
-
-PKGNAMESUFFIX=	-pdo_dblib
-
-TEST_TARGET=    test
-
-.include "${MASTERDIR}/Makefile"
diff --git a/databases/php73-pdo_firebird/Makefile b/databases/php73-pdo_firebird/Makefile
deleted file mode 100644
index 4e227299030b..000000000000
--- a/databases/php73-pdo_firebird/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-CATEGORIES=	databases
-
-MASTERDIR=	${.CURDIR}/../../lang/php73
-
-PKGNAMESUFFIX=	-pdo_firebird
-
-TEST_TARGET=    test
-
-.include "${MASTERDIR}/Makefile"
diff --git a/databases/php73-pdo_mysql/Makefile b/databases/php73-pdo_mysql/Makefile
deleted file mode 100644
index 3803accafc2e..000000000000
--- a/databases/php73-pdo_mysql/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-CATEGORIES=	databases
-
-MASTERDIR=	${.CURDIR}/../../lang/php73
-
-PKGNAMESUFFIX=	-pdo_mysql
-
-TEST_TARGET=    test
-
-.include "${MASTERDIR}/Makefile"
diff --git a/databases/php73-pdo_odbc/Makefile b/databases/php73-pdo_odbc/Makefile
deleted file mode 100644
index d356d701a74a..000000000000
--- a/databases/php73-pdo_odbc/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-CATEGORIES=	databases
-
-MASTERDIR=	${.CURDIR}/../../lang/php73
-
-PKGNAMESUFFIX=	-pdo_odbc
-
-TEST_TARGET=    test
-
-.include "${MASTERDIR}/Makefile"
diff --git a/databases/php73-pdo_pgsql/Makefile b/databases/php73-pdo_pgsql/Makefile
deleted file mode 100644
index a3512fc57074..000000000000
--- a/databases/php73-pdo_pgsql/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-CATEGORIES=	databases
-
-MASTERDIR=	${.CURDIR}/../../lang/php73
-
-PKGNAMESUFFIX=	-pdo_pgsql
-
-TEST_TARGET=    test
-
-.include "${MASTERDIR}/Makefile"
diff --git a/databases/php73-pdo_sqlite/Makefile b/databases/php73-pdo_sqlite/Makefile
deleted file mode 100644
index 4ce8a34a4d30..000000000000
--- a/databases/php73-pdo_sqlite/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-CATEGORIES=	databases
-
-MASTERDIR=	${.CURDIR}/../../lang/php73
-
-PKGNAMESUFFIX=	-pdo_sqlite
-
-TEST_TARGET=    test
-
-.include "${MASTERDIR}/Makefile"
diff --git a/databases/php73-pgsql/Makefile b/databases/php73-pgsql/Makefile
deleted file mode 100644
index 6982f2577628..000000000000
--- a/databases/php73-pgsql/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-CATEGORIES=	databases
-
-MASTERDIR=	${.CURDIR}/../../lang/php73
-
-PKGNAMESUFFIX=	-pgsql
-
-TEST_TARGET=    test
-
-.include "${MASTERDIR}/Makefile"
diff --git a/databases/php73-sqlite3/Makefile b/databases/php73-sqlite3/Makefile
deleted file mode 100644
index ec15c618aab7..000000000000
--- a/databases/php73-sqlite3/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-CATEGORIES=	databases
-
-MASTERDIR=	${.CURDIR}/../../lang/php73
-
-PKGNAMESUFFIX=	-sqlite3
-
-TEST_TARGET=    test
-
-.include "${MASTERDIR}/Makefile"
diff --git a/databases/php74-dba/Makefile b/databases/php74-dba/Makefile
deleted file mode 100644
index 86f9b3f8a802..000000000000
--- a/databases/php74-dba/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-CATEGORIES=	databases
-
-MASTERDIR=	${.CURDIR}/../../lang/php74
-
-PKGNAMESUFFIX=	-dba
-
-TEST_TARGET=    test
-
-.include "${MASTERDIR}/Makefile"
diff --git a/databases/php74-mysqli/Makefile b/databases/php74-mysqli/Makefile
deleted file mode 100644
index 09a85eb27fc8..000000000000
--- a/databases/php74-mysqli/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-CATEGORIES=	databases
-
-MASTERDIR=	${.CURDIR}/../../lang/php74
-
-PKGNAMESUFFIX=	-mysqli
-
-TEST_TARGET=    test
-
-.include "${MASTERDIR}/Makefile"
diff --git a/databases/php74-mysqli/files/patch-mysqli__api.c b/databases/php74-mysqli/files/patch-mysqli__api.c
deleted file mode 100644
index 2d88e061f9da..000000000000
--- a/databases/php74-mysqli/files/patch-mysqli__api.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- mysqli_api.c.orig	2019-12-17 10:29:23 UTC
-+++ mysqli_api.c
-@@ -31,8 +31,9 @@
- #include "zend_smart_str.h"
- #include "php_mysqli_structs.h"
- #include "mysqli_priv.h"
-+#if defined(MYSQLI_USE_MYSQLND)
- #include "ext/mysqlnd/mysql_float_to_double.h"
--
-+#endif
- 
- #if !defined(MYSQLI_USE_MYSQLND)
- /* {{{ mysqli_tx_cor_options_to_string */
diff --git a/databases/php74-odbc/Makefile b/databases/php74-odbc/Makefile
deleted file mode 100644
index f8328ef98f17..000000000000
--- a/databases/php74-odbc/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-CATEGORIES=	databases
-
-MASTERDIR=	${.CURDIR}/../../lang/php74
-
-PKGNAMESUFFIX=	-odbc
-
-TEST_TARGET=    test
-
-.include "${MASTERDIR}/Makefile"
diff --git a/databases/php74-pdo/Makefile b/databases/php74-pdo/Makefile
deleted file mode 100644
index d3a517f8c554..000000000000
--- a/databases/php74-pdo/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-CATEGORIES=	databases
-
-MASTERDIR=	${.CURDIR}/../../lang/php74
-
-PKGNAMESUFFIX=	-pdo
-
-TEST_TARGET=    test
-
-.include "${MASTERDIR}/Makefile"
diff --git a/databases/php74-pdo_dblib/Makefile b/databases/php74-pdo_dblib/Makefile
deleted file mode 100644
index 7ca98393d92b..000000000000
--- a/databases/php74-pdo_dblib/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-CATEGORIES=	databases
-
-MASTERDIR=	${.CURDIR}/../../lang/php74
-
-PKGNAMESUFFIX=	-pdo_dblib
-
-TEST_TARGET=    test
-
-.include "${MASTERDIR}/Makefile"
diff --git a/databases/php74-pdo_firebird/Makefile b/databases/php74-pdo_firebird/Makefile
deleted file mode 100644
index 3b3baf1e5715..000000000000
--- a/databases/php74-pdo_firebird/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-CATEGORIES=	databases
-
-MASTERDIR=	${.CURDIR}/../../lang/php74
-
-PKGNAMESUFFIX=	-pdo_firebird
-
-TEST_TARGET=    test
-
-.include "${MASTERDIR}/Makefile"
diff --git a/databases/php74-pdo_mysql/Makefile b/databases/php74-pdo_mysql/Makefile
deleted file mode 100644
index be205b0a152e..000000000000
--- a/databases/php74-pdo_mysql/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-CATEGORIES=	databases
-
-MASTERDIR=	${.CURDIR}/../../lang/php74
-
-PKGNAMESUFFIX=	-pdo_mysql
-
-TEST_TARGET=    test
-
-.include "${MASTERDIR}/Makefile"
diff --git a/databases/php74-pdo_odbc/Makefile b/databases/php74-pdo_odbc/Makefile
deleted file mode 100644
index 96c7890dc276..000000000000
--- a/databases/php74-pdo_odbc/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-CATEGORIES=	databases
-
-MASTERDIR=	${.CURDIR}/../../lang/php74
-
-PKGNAMESUFFIX=	-pdo_odbc
-
-TEST_TARGET=    test
-
-.include "${MASTERDIR}/Makefile"
diff --git a/databases/php74-pdo_pgsql/Makefile b/databases/php74-pdo_pgsql/Makefile
deleted file mode 100644
index e72354243c4a..000000000000
--- a/databases/php74-pdo_pgsql/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-CATEGORIES=	databases
-
-MASTERDIR=	${.CURDIR}/../../lang/php74
-
-PKGNAMESUFFIX=	-pdo_pgsql
-
-TEST_TARGET=    test
-
-.include "${MASTERDIR}/Makefile"
diff --git a/databases/php74-pdo_sqlite/Makefile b/databases/php74-pdo_sqlite/Makefile
deleted file mode 100644
index 1d63c6ff41dd..000000000000
--- a/databases/php74-pdo_sqlite/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-CATEGORIES=	databases
-
-MASTERDIR=	${.CURDIR}/../../lang/php74
-
-PKGNAMESUFFIX=	-pdo_sqlite
-
-TEST_TARGET=    test
-
-.include "${MASTERDIR}/Makefile"
diff --git a/databases/php74-pgsql/Makefile b/databases/php74-pgsql/Makefile
deleted file mode 100644
index 75b60d40e82d..000000000000
--- a/databases/php74-pgsql/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-CATEGORIES=	databases
-
-MASTERDIR=	${.CURDIR}/../../lang/php74
-
-PKGNAMESUFFIX=	-pgsql
-
-TEST_TARGET=    test
-
-.include "${MASTERDIR}/Makefile"
diff --git a/databases/php74-sqlite3/Makefile b/databases/php74-sqlite3/Makefile
deleted file mode 100644
index b8047ecda0fc..000000000000
--- a/databases/php74-sqlite3/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-CATEGORIES=	databases
-
-MASTERDIR=	${.CURDIR}/../../lang/php74
-
-PKGNAMESUFFIX=	-sqlite3
-
-TEST_TARGET=    test
-
-.include "${MASTERDIR}/Makefile"
diff --git a/databases/php80-dba/Makefile b/databases/php80-dba/Makefile
deleted file mode 100644
index a9ef02c75291..000000000000
--- a/databases/php80-dba/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-CATEGORIES=	databases
-
-MASTERDIR=	${.CURDIR}/../../lang/php80
-
-PKGNAMESUFFIX=	-dba
-
-TEST_TARGET=    test
-
-.include "${MASTERDIR}/Makefile"
diff --git a/databases/php80-dba/files/patch-config.m4 b/databases/php80-dba/files/patch-config.m4
deleted file mode 100644
index 30f662138374..000000000000
--- a/databases/php80-dba/files/patch-config.m4
+++ /dev/null
@@ -1,50 +0,0 @@
---- config.m4.orig	2016-01-06 15:14:47 UTC
-+++ config.m4
-@@ -324,6 +324,38 @@ if test "$PHP_DB4" != "no"; then
-       THIS_PREFIX=$i
-       THIS_INCLUDE=$i/include/db5.3/db.h
-       break
-+    elif test -f "$i/include/db5/db.h"; then
-+      THIS_PREFIX=$i
-+      THIS_INCLUDE=$i/include/db5/db.h
-+      break
-+    elif test -f "$i/include/db48/db.h"; then
-+      THIS_PREFIX=$i
-+      THIS_INCLUDE=$i/include/db48/db.h
-+      break
-+    elif test -f "$i/include/db47/db.h"; then
-+      THIS_PREFIX=$i
-+      THIS_INCLUDE=$i/include/db47/db.h
-+      break
-+    elif test -f "$i/include/db46/db.h"; then
-+      THIS_PREFIX=$i
-+      THIS_INCLUDE=$i/include/db46/db.h
-+      break
-+    elif test -f "$i/include/db44/db.h"; then
-+      THIS_PREFIX=$i
-+      THIS_INCLUDE=$i/include/db44/db.h
-+      break
-+    elif test -f "$i/include/db43/db.h"; then
-+      THIS_PREFIX=$i
-+      THIS_INCLUDE=$i/include/db43/db.h
-+      break
-+    elif test -f "$i/include/db42/db.h"; then
-+      THIS_PREFIX=$i
-+      THIS_INCLUDE=$i/include/db42/db.h
-+      break
-+    elif test -f "$i/include/db41/db.h"; then
-+      THIS_PREFIX=$i
-+      THIS_INCLUDE=$i/include/db41/db.h
-+      break
-     elif test -f "$i/include/db5.1/db.h"; then
-       THIS_PREFIX=$i
-       THIS_INCLUDE=$i/include/db5.1/db.h
-@@ -366,7 +398,7 @@ if test "$PHP_DB4" != "no"; then
-       break
-     fi
-   done
--  PHP_DBA_DB_CHECK(4, db-5.3 db-5.1 db-5.0 db-4.8 db-4.7 db-4.6 db-4.5 db-4.4 db-4.3 db-4.2 db-4.1 db-4.0 db-4 db4 db, [(void)db_create((DB**)0, (DB_ENV*)0, 0)])
-+  PHP_DBA_DB_CHECK(4, db-5 db-5.3 db-5.1 db-5.0 db-4.8 db-4.7 db-4.6 db-4.5 db-4.4 db-4.3 db-4.2 db-4.1 db-4.0 db-4 db4 db, [(void)db_create((DB**)0, (DB_ENV*)0, 0)])
- fi
- PHP_DBA_STD_RESULT(db4,Berkeley DB4)
- 
diff --git a/databases/php80-mysqli/Makefile b/databases/php80-mysqli/Makefile
deleted file mode 100644
index 9c25581e2018..000000000000
--- a/databases/php80-mysqli/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-CATEGORIES=	databases
-
-MASTERDIR=	${.CURDIR}/../../lang/php80
-
-PKGNAMESUFFIX=	-mysqli
-
-TEST_TARGET=    test
-
-.include "${MASTERDIR}/Makefile"
diff --git a/databases/php80-mysqli/files/patch-php_mysqli_structs.h b/databases/php80-mysqli/files/patch-php_mysqli_structs.h
deleted file mode 100644
index 68568dd214fd..000000000000
--- a/databases/php80-mysqli/files/patch-php_mysqli_structs.h
+++ /dev/null
@@ -1,20 +0,0 @@
---- php_mysqli_structs.h.orig	2010-07-26 15:52:54.000000000 +0200
-+++ php_mysqli_structs.h	2010-07-26 15:53:14.000000000 +0200
-@@ -36,7 +36,7 @@
- #define FALSE 0
- #endif
- 
--#ifdef MYSQLI_USE_MYSQLND
-+#if defined(MYSQLI_USE_MYSQLND)
- #include "ext/mysqlnd/mysqlnd.h"
- #include "mysqli_mysqlnd.h"
- #else
-@@ -53,6 +53,8 @@
- #undef HAVE_MBSTATE_T
- #define WE_HAD_MBSTATE_T
- #endif
-+
-+typedef zend_ulong ulong;
- 
- #if defined(ulong) && !defined(HAVE_ULONG)
- #define HAVE_ULONG
diff --git a/databases/php80-odbc/Makefile b/databases/php80-odbc/Makefile
deleted file mode 100644
index 7aac0f1da017..000000000000
--- a/databases/php80-odbc/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-CATEGORIES=	databases
-
-MASTERDIR=	${.CURDIR}/../../lang/php80
-
-PKGNAMESUFFIX=	-odbc
-
-TEST_TARGET=    test
-
-.include "${MASTERDIR}/Makefile"
diff --git a/databases/php80-pdo/Makefile b/databases/php80-pdo/Makefile
deleted file mode 100644
index 8d5dea5fc4bc..000000000000
--- a/databases/php80-pdo/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-CATEGORIES=	databases
-
-MASTERDIR=	${.CURDIR}/../../lang/php80
-
-PKGNAMESUFFIX=	-pdo
-
-TEST_TARGET=    test
-
-.include "${MASTERDIR}/Makefile"
diff --git a/databases/php80-pdo_dblib/Makefile b/databases/php80-pdo_dblib/Makefile
deleted file mode 100644
index b75d68b8e5c6..000000000000
--- a/databases/php80-pdo_dblib/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-CATEGORIES=	databases
-
-MASTERDIR=	${.CURDIR}/../../lang/php80
-
-PKGNAMESUFFIX=	-pdo_dblib
-
-TEST_TARGET=    test
-
-.include "${MASTERDIR}/Makefile"
diff --git a/databases/php80-pdo_firebird/Makefile b/databases/php80-pdo_firebird/Makefile
deleted file mode 100644
index a60f84841472..000000000000
--- a/databases/php80-pdo_firebird/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-CATEGORIES=	databases
-
-MASTERDIR=	${.CURDIR}/../../lang/php80
-
-PKGNAMESUFFIX=	-pdo_firebird
-
-TEST_TARGET=    test
-
-.include "${MASTERDIR}/Makefile"
diff --git a/databases/php80-pdo_mysql/Makefile b/databases/php80-pdo_mysql/Makefile
deleted file mode 100644
index 509c01283d1a..000000000000
--- a/databases/php80-pdo_mysql/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-CATEGORIES=	databases
-
-MASTERDIR=	${.CURDIR}/../../lang/php80
-
-PKGNAMESUFFIX=	-pdo_mysql
-
-TEST_TARGET=    test
-
-.include "${MASTERDIR}/Makefile"
diff --git a/databases/php80-pdo_odbc/Makefile b/databases/php80-pdo_odbc/Makefile
deleted file mode 100644
index 6fb233fddb02..000000000000
--- a/databases/php80-pdo_odbc/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-CATEGORIES=	databases
-
-MASTERDIR=	${.CURDIR}/../../lang/php80
-
-PKGNAMESUFFIX=	-pdo_odbc
-
-TEST_TARGET=    test
-
-.include "${MASTERDIR}/Makefile"
diff --git a/databases/php80-pdo_pgsql/Makefile b/databases/php80-pdo_pgsql/Makefile
deleted file mode 100644
index 6d64dd6a473a..000000000000
--- a/databases/php80-pdo_pgsql/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-CATEGORIES=	databases
-
-MASTERDIR=	${.CURDIR}/../../lang/php80
-
-PKGNAMESUFFIX=	-pdo_pgsql
-
-TEST_TARGET=    test
-
-.include "${MASTERDIR}/Makefile"
diff --git a/databases/php80-pdo_sqlite/Makefile b/databases/php80-pdo_sqlite/Makefile
deleted file mode 100644
index c85dd9bc3627..000000000000
--- a/databases/php80-pdo_sqlite/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-CATEGORIES=	databases
-
-MASTERDIR=	${.CURDIR}/../../lang/php80
-
-PKGNAMESUFFIX=	-pdo_sqlite
-
-TEST_TARGET=    test
-
-.include "${MASTERDIR}/Makefile"
diff --git a/databases/php80-pgsql/Makefile b/databases/php80-pgsql/Makefile
deleted file mode 100644
index e9e99448008d..000000000000
--- a/databases/php80-pgsql/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-CATEGORIES=	databases
-
-MASTERDIR=	${.CURDIR}/../../lang/php80
-
-PKGNAMESUFFIX=	-pgsql
-
-TEST_TARGET=    test
-
-.include "${MASTERDIR}/Makefile"
diff --git a/databases/php80-sqlite3/Makefile b/databases/php80-sqlite3/Makefile
deleted file mode 100644
index 2316914f953e..000000000000
--- a/databases/php80-sqlite3/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-CATEGORIES=	databases
-
-MASTERDIR=	${.CURDIR}/../../lang/php80
-
-PKGNAMESUFFIX=	-sqlite3
-
-TEST_TARGET=    test
-
-.include "${MASTERDIR}/Makefile"
diff --git a/databases/php81-dba/Makefile b/databases/php81-dba/Makefile
new file mode 100644
index 000000000000..5c5380de17df
--- /dev/null
+++ b/databases/php81-dba/Makefile
@@ -0,0 +1,7 @@
+CATEGORIES=	databases
+
+MASTERDIR=	${.CURDIR}/../../lang/php81
+
+PKGNAMESUFFIX=	-dba
+
+.include "${MASTERDIR}/Makefile"
diff --git a/databases/php73-dba/files/patch-config.m4 b/databases/php81-dba/files/patch-config.m4
index 30f662138374..30f662138374 100644
--- a/databases/php73-dba/files/patch-config.m4
+++ b/databases/php81-dba/files/patch-config.m4
diff --git a/databases/php81-mysqli/Makefile b/databases/php81-mysqli/Makefile
new file mode 100644
index 000000000000..26619c0bed72
--- /dev/null
+++ b/databases/php81-mysqli/Makefile
@@ -0,0 +1,7 @@
+CATEGORIES=	databases
+
+MASTERDIR=	${.CURDIR}/../../lang/php81
+
+PKGNAMESUFFIX=	-mysqli
+
+.include "${MASTERDIR}/Makefile"
diff --git a/databases/php80-mysqli/files/patch-mysqli__api.c b/databases/php81-mysqli/files/patch-mysqli__api.c
index a100e8205fb6..a100e8205fb6 100644
--- a/databases/php80-mysqli/files/patch-mysqli__api.c
+++ b/databases/php81-mysqli/files/patch-mysqli__api.c
diff --git a/databases/php74-mysqli/files/patch-php_mysqli_structs.h b/databases/php81-mysqli/files/patch-php_mysqli_structs.h
index 68568dd214fd..68568dd214fd 100644
--- a/databases/php74-mysqli/files/patch-php_mysqli_structs.h
+++ b/databases/php81-mysqli/files/patch-php_mysqli_structs.h
diff --git a/databases/php81-odbc/Makefile b/databases/php81-odbc/Makefile
new file mode 100644
index 000000000000..8bc4a42dd7ce
--- /dev/null
+++ b/databases/php81-odbc/Makefile
@@ -0,0 +1,7 @@
+CATEGORIES=	databases
+
+MASTERDIR=	${.CURDIR}/../../lang/php81
+
+PKGNAMESUFFIX=	-odbc
+
+.include "${MASTERDIR}/Makefile"
diff --git a/databases/php74-odbc/files/patch-config.m4 b/databases/php81-odbc/files/patch-config.m4
index 04efc6ded7c9..04efc6ded7c9 100644
--- a/databases/php74-odbc/files/patch-config.m4
+++ b/databases/php81-odbc/files/patch-config.m4
diff --git a/databases/php81-pdo/Makefile b/databases/php81-pdo/Makefile
new file mode 100644
index 000000000000..436a6554b434
--- /dev/null
+++ b/databases/php81-pdo/Makefile
@@ -0,0 +1,7 @@
+CATEGORIES=	databases
+
+MASTERDIR=	${.CURDIR}/../../lang/php81
+
+PKGNAMESUFFIX=	-pdo
+
+.include "${MASTERDIR}/Makefile"
diff --git a/databases/php81-pdo_dblib/Makefile b/databases/php81-pdo_dblib/Makefile
new file mode 100644
index 000000000000..1634ef611565
--- /dev/null
+++ b/databases/php81-pdo_dblib/Makefile
@@ -0,0 +1,7 @@
+CATEGORIES=	databases
+
+MASTERDIR=	${.CURDIR}/../../lang/php81
+
+PKGNAMESUFFIX=	-pdo_dblib
+
+.include "${MASTERDIR}/Makefile"
diff --git a/databases/php81-pdo_firebird/Makefile b/databases/php81-pdo_firebird/Makefile
new file mode 100644
index 000000000000..03cd8115a6df
--- /dev/null
+++ b/databases/php81-pdo_firebird/Makefile
@@ -0,0 +1,9 @@
+CATEGORIES=	databases
+
+PORTREVISION=	1
+
+MASTERDIR=	${.CURDIR}/../../lang/php81
+
+PKGNAMESUFFIX=	-pdo_firebird
+
+.include "${MASTERDIR}/Makefile"
diff --git a/databases/php81-pdo_mysql/Makefile b/databases/php81-pdo_mysql/Makefile
new file mode 100644
index 000000000000..2f00ba00c8b9
--- /dev/null
+++ b/databases/php81-pdo_mysql/Makefile
@@ -0,0 +1,7 @@
+CATEGORIES=	databases
+
+MASTERDIR=	${.CURDIR}/../../lang/php81
+
+PKGNAMESUFFIX=	-pdo_mysql
+
+.include "${MASTERDIR}/Makefile"
diff --git a/databases/php81-pdo_odbc/Makefile b/databases/php81-pdo_odbc/Makefile
new file mode 100644
index 000000000000..ea600d80a450
--- /dev/null
+++ b/databases/php81-pdo_odbc/Makefile
@@ -0,0 +1,7 @@
+CATEGORIES=	databases
+
+MASTERDIR=	${.CURDIR}/../../lang/php81
+
+PKGNAMESUFFIX=	-pdo_odbc
+
+.include "${MASTERDIR}/Makefile"
diff --git a/databases/php81-pdo_pgsql/Makefile b/databases/php81-pdo_pgsql/Makefile
new file mode 100644
index 000000000000..f13461131114
--- /dev/null
+++ b/databases/php81-pdo_pgsql/Makefile
@@ -0,0 +1,7 @@
+CATEGORIES=	databases
+
+MASTERDIR=	${.CURDIR}/../../lang/php81
+
+PKGNAMESUFFIX=	-pdo_pgsql
+
+.include "${MASTERDIR}/Makefile"
diff --git a/databases/php81-pdo_sqlite/Makefile b/databases/php81-pdo_sqlite/Makefile
new file mode 100644
index 000000000000..c18088284a0b
--- /dev/null
+++ b/databases/php81-pdo_sqlite/Makefile
@@ -0,0 +1,7 @@
+CATEGORIES=	databases
+
+MASTERDIR=	${.CURDIR}/../../lang/php81
+
+PKGNAMESUFFIX=	-pdo_sqlite
+
+.include "${MASTERDIR}/Makefile"
diff --git a/databases/php81-pgsql/Makefile b/databases/php81-pgsql/Makefile
new file mode 100644
index 000000000000..f23a2e371612
--- /dev/null
+++ b/databases/php81-pgsql/Makefile
@@ -0,0 +1,7 @@
+CATEGORIES=	databases
+
+MASTERDIR=	${.CURDIR}/../../lang/php81
+
+PKGNAMESUFFIX=	-pgsql
+
+.include "${MASTERDIR}/Makefile"
diff --git a/databases/php81-sqlite3/Makefile b/databases/php81-sqlite3/Makefile
new file mode 100644
index 000000000000..c68eab2dfba2
--- /dev/null
+++ b/databases/php81-sqlite3/Makefile
@@ -0,0 +1,7 @@
+CATEGORIES=	databases
+
+MASTERDIR=	${.CURDIR}/../../lang/php81
+
+PKGNAMESUFFIX=	-sqlite3
+
+.include "${MASTERDIR}/Makefile"
diff --git a/databases/php82-dba/Makefile b/databases/php82-dba/Makefile
new file mode 100644
index 000000000000..f3e875ad10c8
--- /dev/null
+++ b/databases/php82-dba/Makefile
@@ -0,0 +1,7 @@
+CATEGORIES=	databases
+
+MASTERDIR=	${.CURDIR}/../../lang/php82
+
+PKGNAMESUFFIX=	-dba
+
+.include "${MASTERDIR}/Makefile"
diff --git a/databases/php74-dba/files/patch-config.m4 b/databases/php82-dba/files/patch-config.m4
index 30f662138374..30f662138374 100644
--- a/databases/php74-dba/files/patch-config.m4
+++ b/databases/php82-dba/files/patch-config.m4
diff --git a/databases/php82-mysqli/Makefile b/databases/php82-mysqli/Makefile
new file mode 100644
index 000000000000..68877e9623e6
--- /dev/null
+++ b/databases/php82-mysqli/Makefile
@@ -0,0 +1,7 @@
+CATEGORIES=	databases
+
+MASTERDIR=	${.CURDIR}/../../lang/php82
+
+PKGNAMESUFFIX=	-mysqli
+
+.include "${MASTERDIR}/Makefile"
diff --git a/databases/php82-mysqli/files/patch-mysqli__api.c b/databases/php82-mysqli/files/patch-mysqli__api.c
new file mode 100644
index 000000000000..a100e8205fb6
--- /dev/null
+++ b/databases/php82-mysqli/files/patch-mysqli__api.c
@@ -0,0 +1,12 @@
+--- mysqli_api.c.orig	2020-09-29 22:36:51 UTC
++++ mysqli_api.c
+@@ -29,7 +29,9 @@
+ #include "zend_smart_str.h"
+ #include "php_mysqli_structs.h"
+ #include "mysqli_priv.h"
++#if defined(MYSQLI_USE_MYSQLND)
+ #include "ext/mysqlnd/mysql_float_to_double.h"
++#endif
+ 
+ #define ERROR_ARG_POS(arg_num) (getThis() ? (arg_num-1) : (arg_num))
+ 
diff --git a/databases/php82-odbc/Makefile b/databases/php82-odbc/Makefile
new file mode 100644
index 000000000000..8ca9dd950242
--- /dev/null
+++ b/databases/php82-odbc/Makefile
@@ -0,0 +1,7 @@
+CATEGORIES=	databases
+
+MASTERDIR=	${.CURDIR}/../../lang/php82
+
+PKGNAMESUFFIX=	-odbc
+
+.include "${MASTERDIR}/Makefile"
diff --git a/databases/php80-odbc/files/patch-config.m4 b/databases/php82-odbc/files/patch-config.m4
index 04efc6ded7c9..04efc6ded7c9 100644
--- a/databases/php80-odbc/files/patch-config.m4
+++ b/databases/php82-odbc/files/patch-config.m4
diff --git a/databases/php82-pdo/Makefile b/databases/php82-pdo/Makefile
new file mode 100644
index 000000000000..791d03dd46c8
--- /dev/null
+++ b/databases/php82-pdo/Makefile
@@ -0,0 +1,7 @@
+CATEGORIES=	databases
+
+MASTERDIR=	${.CURDIR}/../../lang/php82
+
+PKGNAMESUFFIX=	-pdo
+
+.include "${MASTERDIR}/Makefile"
diff --git a/databases/php82-pdo_dblib/Makefile b/databases/php82-pdo_dblib/Makefile
new file mode 100644
index 000000000000..20e61241fe9b
--- /dev/null
+++ b/databases/php82-pdo_dblib/Makefile
@@ -0,0 +1,7 @@
+CATEGORIES=	databases
+
+MASTERDIR=	${.CURDIR}/../../lang/php82
+
+PKGNAMESUFFIX=	-pdo_dblib
+
+.include "${MASTERDIR}/Makefile"
diff --git a/databases/php82-pdo_firebird/Makefile b/databases/php82-pdo_firebird/Makefile
new file mode 100644
index 000000000000..a6b9d77f85e8
--- /dev/null
+++ b/databases/php82-pdo_firebird/Makefile
@@ -0,0 +1,9 @@
+CATEGORIES=	databases
+
+PORTREVISION=	0
+
+MASTERDIR=	${.CURDIR}/../../lang/php82
+
+PKGNAMESUFFIX=	-pdo_firebird
+
+.include "${MASTERDIR}/Makefile"
diff --git a/databases/php82-pdo_mysql/Makefile b/databases/php82-pdo_mysql/Makefile
new file mode 100644
index 000000000000..3fed135f7533
--- /dev/null
+++ b/databases/php82-pdo_mysql/Makefile
@@ -0,0 +1,7 @@
+CATEGORIES=	databases
+
+MASTERDIR=	${.CURDIR}/../../lang/php82
+
+PKGNAMESUFFIX=	-pdo_mysql
+
+.include "${MASTERDIR}/Makefile"
diff --git a/databases/php82-pdo_odbc/Makefile b/databases/php82-pdo_odbc/Makefile
new file mode 100644
index 000000000000..985fb1c67f4f
--- /dev/null
+++ b/databases/php82-pdo_odbc/Makefile
@@ -0,0 +1,7 @@
+CATEGORIES=	databases
+
+MASTERDIR=	${.CURDIR}/../../lang/php82
+
+PKGNAMESUFFIX=	-pdo_odbc
+
+.include "${MASTERDIR}/Makefile"
diff --git a/databases/php82-pdo_pgsql/Makefile b/databases/php82-pdo_pgsql/Makefile
new file mode 100644
index 000000000000..23349bb95e2d
--- /dev/null
+++ b/databases/php82-pdo_pgsql/Makefile
@@ -0,0 +1,7 @@
+CATEGORIES=	databases
+
+MASTERDIR=	${.CURDIR}/../../lang/php82
+
+PKGNAMESUFFIX=	-pdo_pgsql
+
+.include "${MASTERDIR}/Makefile"
diff --git a/databases/php82-pdo_sqlite/Makefile b/databases/php82-pdo_sqlite/Makefile
new file mode 100644
index 000000000000..d02383f6baa4
--- /dev/null
+++ b/databases/php82-pdo_sqlite/Makefile
@@ -0,0 +1,7 @@
+CATEGORIES=	databases
+
+MASTERDIR=	${.CURDIR}/../../lang/php82
+
+PKGNAMESUFFIX=	-pdo_sqlite
+
+.include "${MASTERDIR}/Makefile"
diff --git a/databases/php82-pgsql/Makefile b/databases/php82-pgsql/Makefile
new file mode 100644
index 000000000000..feebe96d8f1d
--- /dev/null
+++ b/databases/php82-pgsql/Makefile
@@ -0,0 +1,7 @@
+CATEGORIES=	databases
+
+MASTERDIR=	${.CURDIR}/../../lang/php82
+
+PKGNAMESUFFIX=	-pgsql
+
+.include "${MASTERDIR}/Makefile"
diff --git a/databases/php82-sqlite3/Makefile b/databases/php82-sqlite3/Makefile
new file mode 100644
index 000000000000..12e06e0d03cc
--- /dev/null
+++ b/databases/php82-sqlite3/Makefile
@@ -0,0 +1,7 @@
+CATEGORIES=	databases
+
+MASTERDIR=	${.CURDIR}/../../lang/php82
+
+PKGNAMESUFFIX=	-sqlite3
+
+.include "${MASTERDIR}/Makefile"
diff --git a/databases/php83-dba/Makefile b/databases/php83-dba/Makefile
new file mode 100644
index 000000000000..42731fa31770
--- /dev/null
+++ b/databases/php83-dba/Makefile
@@ -0,0 +1,7 @@
+CATEGORIES=	databases
+
+MASTERDIR=	${.CURDIR}/../../lang/php83
+
+PKGNAMESUFFIX=	-dba
+
+.include "${MASTERDIR}/Makefile"
diff --git a/databases/php83-dba/files/patch-config.m4 b/databases/php83-dba/files/patch-config.m4
new file mode 100644
index 000000000000..52274722f660
--- /dev/null
+++ b/databases/php83-dba/files/patch-config.m4
@@ -0,0 +1,26 @@
+--- config.m4.orig	2023-11-07 20:02:05 UTC
++++ config.m4
+@@ -387,6 +387,14 @@ if test "$PHP_DB4" != "no"; then
+       THIS_PREFIX=$i
+       THIS_INCLUDE=$i/include/db5.3/db.h
+       break
++    elif test -f "$i/include/db5/db.h"; then
++      THIS_PREFIX=$i
++      THIS_INCLUDE=$i/include/db5/db.h
++      break
++    elif test -f "$i/include/db18/db.h"; then
++      THIS_PREFIX=$i
++      THIS_INCLUDE=$i/include/db18/db.h
++      break
+     elif test -f "$i/include/db5.1/db.h"; then
+       THIS_PREFIX=$i
+       THIS_INCLUDE=$i/include/db5.1/db.h
+@@ -429,7 +437,7 @@ if test "$PHP_DB4" != "no"; then
+       break
+     fi
+   done
+-  PHP_DBA_DB_CHECK(4, db-5.3 db-5.1 db-5.0 db-4.8 db-4.7 db-4.6 db-4.5 db-4.4 db-4.3 db-4.2 db-4.1 db-4.0 db-4 db4 db, [(void)db_create((DB**)0, (DB_ENV*)0, 0)])
++  PHP_DBA_DB_CHECK(4, db-5 db-5.3 db-5.1 db-5.0 db-4.8 db-4.7 db-4.6 db-4.5 db-4.4 db-4.3 db-4.2 db-4.1 db-4.0 db-4 db-18 db4 db, [(void)db_create((DB**)0, (DB_ENV*)0, 0)])
+ fi
+ PHP_DBA_STD_RESULT(db4,Berkeley DB4)
+ 
diff --git a/databases/php83-mysqli/Makefile b/databases/php83-mysqli/Makefile
new file mode 100644
index 000000000000..7eaf262211a5
--- /dev/null
+++ b/databases/php83-mysqli/Makefile
@@ -0,0 +1,7 @@
+CATEGORIES=	databases
+
+MASTERDIR=	${.CURDIR}/../../lang/php83
+
+PKGNAMESUFFIX=	-mysqli
+
+.include "${MASTERDIR}/Makefile"
diff --git a/databases/php83-odbc/Makefile b/databases/php83-odbc/Makefile
new file mode 100644
index 000000000000..545e1942d5ce
--- /dev/null
+++ b/databases/php83-odbc/Makefile
@@ -0,0 +1,7 @@
+CATEGORIES=	databases
+
+MASTERDIR=	${.CURDIR}/../../lang/php83
+
+PKGNAMESUFFIX=	-odbc
+
+.include "${MASTERDIR}/Makefile"
diff --git a/databases/php83-odbc/files/patch-config.m4 b/databases/php83-odbc/files/patch-config.m4
new file mode 100644
index 000000000000..7cb9492b32f9
--- /dev/null
+++ b/databases/php83-odbc/files/patch-config.m4
@@ -0,0 +1,101 @@
+--- config.m4.orig	2023-11-07 20:02:05 UTC
++++ config.m4
+@@ -102,7 +102,7 @@ PHP_ARG_WITH([adabas],,
+ if test -z "$ODBC_TYPE"; then
+ PHP_ARG_WITH([adabas],,
+   [AS_HELP_STRING([[--with-adabas[=DIR]]],
+-    [Include Adabas D support [/usr/local]])])
++    [Include Adabas D support [/usr/local]])], [no], [no])
+ 
+   AC_MSG_CHECKING([for Adabas support])
+   if test "$PHP_ADABAS" != "no"; then
+@@ -132,7 +132,7 @@ PHP_ARG_WITH([sapdb],,
+ if test -z "$ODBC_TYPE"; then
+ PHP_ARG_WITH([sapdb],,
+   [AS_HELP_STRING([[--with-sapdb[=DIR]]],
+-    [Include SAP DB support [/usr/local]])])
++    [Include SAP DB support [/usr/local]])], [no], [no])
+ 
+   AC_MSG_CHECKING([for SAP DB support])
+   if test "$PHP_SAPDB" != "no"; then
+@@ -153,7 +153,7 @@ PHP_ARG_WITH([solid],,
+ if test -z "$ODBC_TYPE"; then
+ PHP_ARG_WITH([solid],,
+   [AS_HELP_STRING([[--with-solid[=DIR]]],
+-    [Include Solid support [/usr/local/solid]])])
++    [Include Solid support [/usr/local/solid]])], [no], [no])
+ 
+   AC_MSG_CHECKING(for Solid support)
+   if test "$PHP_SOLID" != "no"; then
+@@ -181,7 +181,7 @@ PHP_ARG_WITH([ibm-db2],,
+ if test -z "$ODBC_TYPE"; then
+ PHP_ARG_WITH([ibm-db2],,
+   [AS_HELP_STRING([[--with-ibm-db2[=DIR]]],
+-    [Include IBM DB2 support [/home/db2inst1/sqllib]])])
++    [Include IBM DB2 support [/home/db2inst1/sqllib]])], [no], [no])
+ 
+   AC_MSG_CHECKING(for IBM DB2 support)
+   if test "$PHP_IBM_DB2" != "no"; then
+@@ -222,7 +222,7 @@ PHP_ARG_WITH([empress],,
+ PHP_ARG_WITH([empress],,
+   [AS_HELP_STRING([[--with-empress[=DIR]]],
+     [Include Empress support $EMPRESSPATH (Empress Version >= 8.60
+-    required)])])
++    required)])], [no], [no])
+ 
+   AC_MSG_CHECKING(for Empress support)
+   if test "$PHP_EMPRESS" != "no"; then
+@@ -248,7 +248,7 @@ PHP_ARG_WITH([empress-bcs],,
+ PHP_ARG_WITH([empress-bcs],,
+   [AS_HELP_STRING([[--with-empress-bcs[=DIR]]],
+     [Include Empress Local Access support $EMPRESSPATH (Empress Version >=
+-    8.60 required)])])
++    8.60 required)])], [no], [no])
+ 
+   AC_MSG_CHECKING(for Empress local access support)
+   if test "$PHP_EMPRESS_BCS" != "no"; then
+@@ -294,7 +294,7 @@ PHP_ARG_WITH([custom-odbc],,
+     your include dirs. For example, you should define following for Sybase SQL
+     Anywhere 5.5.00 on QNX, prior to running this configure script:
+     CPPFLAGS="-DODBC_QNX -DSQLANY_BUG" LDFLAGS=-lunix
+-    CUSTOM_ODBC_LIBS="-ldblib -lodbc"])])
++    CUSTOM_ODBC_LIBS="-ldblib -lodbc"])], [no], [no])
+ 
+   AC_MSG_CHECKING(for a custom ODBC support)
+   if test "$PHP_CUSTOM_ODBC" != "no"; then
+@@ -317,7 +317,7 @@ PHP_ARG_WITH([iodbc],,
+ if test -z "$ODBC_TYPE"; then
+ PHP_ARG_WITH([iodbc],,
+   [AS_HELP_STRING([--with-iodbc],
+-    [Include iODBC support])])
++    [Include iODBC support])], [no], [no])
+ 
+   AC_MSG_CHECKING(whether to build with iODBC support)
+   if test "$PHP_IODBC" != "no"; then
+@@ -335,7 +335,7 @@ PHP_ARG_WITH([esoob],,
+ if test -z "$ODBC_TYPE"; then
+ PHP_ARG_WITH([esoob],,
+   [AS_HELP_STRING([[--with-esoob[=DIR]]],
+-    [Include Easysoft OOB support [/usr/local/easysoft/oob/client]])])
++    [Include Easysoft OOB support [/usr/local/easysoft/oob/client]])], [no], [no])
+ 
+   AC_MSG_CHECKING(for Easysoft ODBC-ODBC Bridge support)
+   if test "$PHP_ESOOB" != "no"; then
+@@ -358,7 +358,7 @@ PHP_ARG_WITH([unixODBC],,
+ if test -z "$ODBC_TYPE"; then
+ PHP_ARG_WITH([unixODBC],,
+   [AS_HELP_STRING([--with-unixODBC],
+-    [Include unixODBC support])])
++    [Include unixODBC support])], [no], [no])
+ 
+   AC_MSG_CHECKING(whether to build with unixODBC support)
+   if test "$PHP_UNIXODBC" != "no"; then
+@@ -386,7 +386,7 @@ PHP_ARG_WITH([dbmaker],,
+ if test -z "$ODBC_TYPE"; then
+ PHP_ARG_WITH([dbmaker],,
+   [AS_HELP_STRING([[--with-dbmaker[=DIR]]],
+-    [Include DBMaker support])])
++    [Include DBMaker support])], [no], [no])
+ 
+   AC_MSG_CHECKING(for DBMaker support)
+   if test "$PHP_DBMAKER" != "no"; then
diff --git a/databases/php83-pdo/Makefile b/databases/php83-pdo/Makefile
new file mode 100644
index 000000000000..1f11229df9e0
--- /dev/null
+++ b/databases/php83-pdo/Makefile
@@ -0,0 +1,7 @@
+CATEGORIES=	databases
+
+MASTERDIR=	${.CURDIR}/../../lang/php83
+
+PKGNAMESUFFIX=	-pdo
+
+.include "${MASTERDIR}/Makefile"
diff --git a/databases/php83-pdo_dblib/Makefile b/databases/php83-pdo_dblib/Makefile
new file mode 100644
index 000000000000..2067eb0985c9
--- /dev/null
+++ b/databases/php83-pdo_dblib/Makefile
@@ -0,0 +1,7 @@
+CATEGORIES=	databases
+
+MASTERDIR=	${.CURDIR}/../../lang/php83
+
+PKGNAMESUFFIX=	-pdo_dblib
+
+.include "${MASTERDIR}/Makefile"
diff --git a/databases/php83-pdo_firebird/Makefile b/databases/php83-pdo_firebird/Makefile
new file mode 100644
index 000000000000..6d34b8f4d406
--- /dev/null
+++ b/databases/php83-pdo_firebird/Makefile
@@ -0,0 +1,9 @@
+CATEGORIES=	databases
+
+PORTREVISION=	0
+
+MASTERDIR=	${.CURDIR}/../../lang/php83
+
+PKGNAMESUFFIX=	-pdo_firebird
+
+.include "${MASTERDIR}/Makefile"
diff --git a/databases/php83-pdo_mysql/Makefile b/databases/php83-pdo_mysql/Makefile
new file mode 100644
index 000000000000..6a9667b14bed
--- /dev/null
+++ b/databases/php83-pdo_mysql/Makefile
@@ -0,0 +1,7 @@
+CATEGORIES=	databases
+
+MASTERDIR=	${.CURDIR}/../../lang/php83
+
+PKGNAMESUFFIX=	-pdo_mysql
+
+.include "${MASTERDIR}/Makefile"
diff --git a/databases/php83-pdo_odbc/Makefile b/databases/php83-pdo_odbc/Makefile
new file mode 100644
index 000000000000..753ff0ef5600
--- /dev/null
+++ b/databases/php83-pdo_odbc/Makefile
@@ -0,0 +1,7 @@
+CATEGORIES=	databases
+
+MASTERDIR=	${.CURDIR}/../../lang/php83
+
+PKGNAMESUFFIX=	-pdo_odbc
+
+.include "${MASTERDIR}/Makefile"
diff --git a/databases/php83-pdo_pgsql/Makefile b/databases/php83-pdo_pgsql/Makefile
new file mode 100644
index 000000000000..1b005d44278a
--- /dev/null
+++ b/databases/php83-pdo_pgsql/Makefile
@@ -0,0 +1,7 @@
+CATEGORIES=	databases
+
+MASTERDIR=	${.CURDIR}/../../lang/php83
+
+PKGNAMESUFFIX=	-pdo_pgsql
+
+.include "${MASTERDIR}/Makefile"
diff --git a/databases/php83-pdo_sqlite/Makefile b/databases/php83-pdo_sqlite/Makefile
new file mode 100644
index 000000000000..916d47ab1219
--- /dev/null
+++ b/databases/php83-pdo_sqlite/Makefile
@@ -0,0 +1,7 @@
+CATEGORIES=	databases
+
+MASTERDIR=	${.CURDIR}/../../lang/php83
+
+PKGNAMESUFFIX=	-pdo_sqlite
+
+.include "${MASTERDIR}/Makefile"
diff --git a/databases/php83-pgsql/Makefile b/databases/php83-pgsql/Makefile
new file mode 100644
index 000000000000..3c7091a5e265
--- /dev/null
+++ b/databases/php83-pgsql/Makefile
@@ -0,0 +1,7 @@
+CATEGORIES=	databases
+
+MASTERDIR=	${.CURDIR}/../../lang/php83
+
+PKGNAMESUFFIX=	-pgsql
+
+.include "${MASTERDIR}/Makefile"
diff --git a/databases/php83-sqlite3/Makefile b/databases/php83-sqlite3/Makefile
new file mode 100644
index 000000000000..96e5277e3ac3
--- /dev/null
+++ b/databases/php83-sqlite3/Makefile
@@ -0,0 +1,7 @@
+CATEGORIES=	databases
+
+MASTERDIR=	${.CURDIR}/../../lang/php83
+
+PKGNAMESUFFIX=	-sqlite3
+
+.include "${MASTERDIR}/Makefile"
diff --git a/databases/phpliteadmin/Makefile b/databases/phpliteadmin/Makefile
index 846608cecb1b..e7ba00e9aa31 100644
--- a/databases/phpliteadmin/Makefile
+++ b/databases/phpliteadmin/Makefile
@@ -1,5 +1,3 @@
-# Created by: olevole@olevole.ru
-
 PORTNAME=	phpLiteAdmin
 DISTVERSION=	1-9-8-2
 CATEGORIES=	databases www
@@ -8,6 +6,7 @@ DISTNAME=	${PORTNAME}_v${DISTVERSION}
 
 MAINTAINER=	ports@freebsd.org
 COMMENT=	Web-based database management tool for Sqlite
+WWW=		https://www.phpliteadmin.org/
 
 LICENSE=	GPLv3
 
diff --git a/databases/phpliteadmin/pkg-descr b/databases/phpliteadmin/pkg-descr
index 21ea241e7604..7c707fb786d4 100644
--- a/databases/phpliteadmin/pkg-descr
+++ b/databases/phpliteadmin/pkg-descr
@@ -15,5 +15,3 @@ Features
 -   Import and export tables, structure, indexes, and data (SQL, CSV)
 -   View data as bar, pie, and line charts
 -   And many other...
-
-WWW: https://www.phpliteadmin.org/
diff --git a/databases/phpminiadmin/Makefile b/databases/phpminiadmin/Makefile
index 62b877d4a740..4f2677667c29 100644
--- a/databases/phpminiadmin/Makefile
+++ b/databases/phpminiadmin/Makefile
@@ -1,5 +1,3 @@
-# Created by: spam@rm-rf.kiev.ua
-
 PORTNAME=	phpminiadmin
 PORTVERSION=	1.9.170730
 CATEGORIES=	databases www
@@ -11,14 +9,16 @@ EXTRACT_ONLY=
 
 MAINTAINER=	cyberbotx@cyberbotx.com
 COMMENT=	Lightweight alternative to phpMyAdmin
+WWW=		https://phpminiadmin.sourceforge.net
 
 LICENSE=	GPLv2 MIT
 LICENSE_COMB=	dual
 
 NO_WRKSUBDIR=	yes
 NO_BUILD=	yes
-USES=		php
-USE_PHP=	mysqli pcre session
+USES=		cpe php
+CPE_VENDOR=	${PORTNAME}_project
+USE_PHP=	mysqli session
 NO_ARCH=	yes
 
 PLIST_FILES=	${WWWDIR_REL}/phpminiadmin.php
diff --git a/databases/phpminiadmin/pkg-descr b/databases/phpminiadmin/pkg-descr
index cda63cd4f04f..9ad63ca2f651 100644
--- a/databases/phpminiadmin/pkg-descr
+++ b/databases/phpminiadmin/pkg-descr
@@ -1,3 +1 @@
 Lightweight alternative to heavy phpMyAdmin for easy access MySQL databases.
-
-WWW: http://phpminiadmin.sourceforge.net
diff --git a/databases/phpmyadmin/Makefile b/databases/phpmyadmin/Makefile
index 6fbe1eba3753..c522bda70303 100644
--- a/databases/phpmyadmin/Makefile
+++ b/databases/phpmyadmin/Makefile
@@ -1,7 +1,6 @@
-# Created by: nbm
-
 PORTNAME=	phpMyAdmin
-DISTVERSION=	4.9.7
+DISTVERSION=	4.9.11
+PORTREVISION=	1
 CATEGORIES=	databases www
 MASTER_SITES=	https://files.phpmyadmin.net/${PORTNAME}/${DISTVERSION}/
 DISTNAME=	${PORTNAME}-${DISTVERSION}-all-languages
@@ -9,11 +8,12 @@ PKGNAMESUFFIX=	${PHP_PKGNAMESUFFIX}
 
 MAINTAINER=	joneum@FreeBSD.org
 COMMENT=	Set of PHP-scripts to manage MySQL over the web
+WWW=		https://www.phpmyadmin.net/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-CONFLICTS_INSTALL=	phpmyadmin5
+CONFLICTS_INSTALL=	phpMyAdmin-php[0-9][0-9] phpMyAdmin[0-9]-php[0-9][0-9] # www/phpMyAdmin/CONTRIBUTING.md
 
 USES=		cpe php:web,flavors tar:xz
 CPE_PRODUCT=	${PORTNAME:tl}
@@ -28,16 +28,16 @@ NO_BUILD=	yes
 # could, in principle, also use the PHP dbase extension, but it's not
 # available for PHP >= 7.0 and of only minority interest.
 
-USE_PHP=	ctype filter hash iconv json mysqli session spl xml
+USE_PHP=	ctype filter iconv mysqli session xml
 .endif
 
 # Note: default settings will pull in X11 client support.  If you don't
 # want this, either turn off GD in the config dialog, or else turn off
 # FONTCONFIG in the graphics/gd port options.
 
-OPTIONS_DEFINE=		BZ2 CURL GD GMP MBSTRING OPCACHE OPENSSL \
+OPTIONS_DEFINE=		BZ2 CURL GD GMP MBSTRING OPCACHE \
 			SODIUM ZIP ZLIB
-OPTIONS_DEFAULT=	BZ2 GD MBSTRING OPENSSL ZIP ZLIB
+OPTIONS_DEFAULT=	BZ2 GD MBSTRING ZIP ZLIB
 
 BZ2_DESC=	PHP bzip2 library support
 CURL_DESC=	PHP curl support
@@ -45,9 +45,7 @@ GD_DESC=	PHP GD library support (requires X11)
 GMP_DESC=	PHP GMP library support
 MBSTRING_DESC=	PHP Multi-byte String support
 OPCACHE_DESC=	PHP Opcache support
-OPENSSL_DESC=	PHP OpenSSL support
-PDF_DESC=	PHP PDFlib support
-SODIUM_DESC=	PHP libsodium support (only available for PHP >= 7.2)
+SODIUM_DESC=	PHP libsodium support
 ZIP_DESC=	PHP Zip compression support
 ZLIB_DESC=	PHP ZLIB support
 
@@ -63,10 +61,6 @@ SUB_LIST+=	PKGNAME=${PKGNAME}	        \
 		CFG_FILE=${WWWDIR}/${CFG_FILE}
 SUB_FILES+=	pkg-message
 
-.if ${FLAVOR} != php80
-OPTIONS_DEFINE+=	PDF
-.endif
-
 .if !defined(WITHOUT_PHP_DEPENDS)
 
 .for opt in ${OPTIONS_DEFINE}
diff --git a/databases/phpmyadmin/distinfo b/databases/phpmyadmin/distinfo
index 2d6b21dbfc8b..8c837f82056d 100644
--- a/databases/phpmyadmin/distinfo
+++ b/databases/phpmyadmin/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1604053316
-SHA256 (phpMyAdmin-4.9.7-all-languages.tar.xz) = 294ae6f299d88eb83c99464fab2266cb18bd0fcb54bfd0384016af4961291fba
-SIZE (phpMyAdmin-4.9.7-all-languages.tar.xz) = 6147004
+TIMESTAMP = 1675892463
+SHA256 (phpMyAdmin-4.9.11-all-languages.tar.xz) = 2b14737a2220e5ac9d2eaf683df6b56ebaa490d038ee980367cb4db909a57923
+SIZE (phpMyAdmin-4.9.11-all-languages.tar.xz) = 6102236
diff --git a/databases/phpmyadmin/files/pkg-message.in b/databases/phpmyadmin/files/pkg-message.in
index c59745d76ae7..8737150b6c95 100644
--- a/databases/phpmyadmin/files/pkg-message.in
+++ b/databases/phpmyadmin/files/pkg-message.in
@@ -10,30 +10,15 @@ Please edit config.inc.php to suit your needs.
 To make phpMyAdmin available through your web site, I suggest
 that you add something like the following to httpd.conf:
 
-For Apache versions earlier than 2.4:
+Alias /phpmyadmin/ "%%WWWDIR%%/"
 
-    Alias /phpmyadmin/ "%%WWWDIR%%/"
-
-    <Directory "%%WWWDIR%%/">
-	Options none
-	AllowOverride Limit
-
-	Order Deny,Allow
-	Deny from all
-	Allow from 127.0.0.1 .example.com
-    </Directory>
-
-For Apache version 2.4.x or above:
-
-    Alias /phpmyadmin/ "%%WWWDIR%%/"
-
-    <Directory "%%WWWDIR%%/">
+<Directory "%%WWWDIR%%/">
 	Options None
 	AllowOverride Limit
 
 	Require local
     	Require host .example.com
-    </Directory>
+</Directory>
 
 SECURITY NOTE: phpMyAdmin is an administrative tool that has had several
 remote vulnerabilities discovered in the past, some allowing remote
diff --git a/databases/phpmyadmin/pkg-descr b/databases/phpmyadmin/pkg-descr
index c81c2d88f74d..9a3b60f6a56a 100644
--- a/databases/phpmyadmin/pkg-descr
+++ b/databases/phpmyadmin/pkg-descr
@@ -30,5 +30,3 @@ Currently phpMyAdmin can:
       functions
     * create, edit, export and drop events and triggers
     * communicate in 62 different languages
-
-WWW: https://www.phpmyadmin.net/
diff --git a/databases/phpmyadmin5/Makefile b/databases/phpmyadmin5/Makefile
index a79e5dabf154..fbf4f1dc15cc 100644
--- a/databases/phpmyadmin5/Makefile
+++ b/databases/phpmyadmin5/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	phpMyAdmin
-DISTVERSION=	5.1.1
+DISTVERSION=	5.2.1
+PORTREVISION=	1
 CATEGORIES=	databases www
 MASTER_SITES=	https://files.phpmyadmin.net/${PORTNAME}/${DISTVERSION}/
 DISTNAME=	${PORTNAME}-${DISTVERSION}-all-languages
@@ -7,11 +8,12 @@ PKGNAMESUFFIX=	5${PHP_PKGNAMESUFFIX}
 
 MAINTAINER=	joneum@FreeBSD.org
 COMMENT=	Set of PHP-scripts to manage MySQL over the web
+WWW=		https://www.phpmyadmin.net/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-CONFLICTS_INSTALL=	phpmyadmin
+CONFLICTS_INSTALL=	phpMyAdmin-php[0-9][0-9] phpMyAdmin[0-9]-php[0-9][0-9] # www/phpMyAdmin/CONTRIBUTING.md
 
 USES=		cpe php:web,flavors tar:xz
 CPE_PRODUCT=	${PORTNAME:tl}
@@ -22,20 +24,21 @@ NO_BUILD=	yes
 
 # Note: composer.json files in the source list pcre as a required
 # extension, but pcre is compiled into PHP as standard on FreeBSD.
-# spl, libsodium are only required in the bundled vendor code. PMA
+# The same goes for the spl library.
+# libsodium are only required in the bundled vendor code. PMA
 # could, in principle, also use the PHP dbase extension, but it's not
 # available for PHP >= 7.0 and of only minority interest.
 
-USE_PHP=	ctype filter hash iconv json mysqli session spl xml xmlwriter
+USE_PHP=	ctype filter iconv mysqli session xml xmlwriter
 .endif
 
 # Note: default settings will pull in X11 client support.  If you don't
 # want this, either turn off GD in the config dialog, or else turn off
 # FONTCONFIG in the graphics/gd port options.
 
-OPTIONS_DEFINE=		BZ2 CURL GD GMP MBSTRING OPCACHE OPENSSL \
+OPTIONS_DEFINE=		BZ2 CURL GD GMP MBSTRING OPCACHE \
 			SODIUM ZIP ZLIB
-OPTIONS_DEFAULT=	BZ2 GD MBSTRING OPENSSL ZIP ZLIB
+OPTIONS_DEFAULT=	BZ2 GD MBSTRING ZIP ZLIB
 
 BZ2_DESC=	PHP bzip2 library support
 CURL_DESC=	PHP curl support
@@ -43,9 +46,8 @@ GD_DESC=	PHP GD library support (requires X11)
 GMP_DESC=	PHP GMP library support
 MBSTRING_DESC=	PHP Multi-byte String support
 OPCACHE_DESC=	PHP Opcache support
-OPENSSL_DESC=	PHP OpenSSL support
 PDF_DESC=	PHP PDFlib support
-SODIUM_DESC=	PHP libsodium support (only available for PHP >= 7.2)
+SODIUM_DESC=	PHP libsodium support
 ZIP_DESC=	PHP Zip compression support
 ZLIB_DESC=	PHP ZLIB support
 
diff --git a/databases/phpmyadmin5/distinfo b/databases/phpmyadmin5/distinfo
index 6f62960993d7..902165d95251 100644
--- a/databases/phpmyadmin5/distinfo
+++ b/databases/phpmyadmin5/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1625647632
-SHA256 (phpMyAdmin-5.1.1-all-languages.tar.xz) = 1964d7190223c11e89fa1b7970c618e3a3bae2e859f5f60383f64c3848ef6921
-SIZE (phpMyAdmin-5.1.1-all-languages.tar.xz) = 7751820
+TIMESTAMP = 1675892472
+SHA256 (phpMyAdmin-5.2.1-all-languages.tar.xz) = 373f9599dfbd96d6fe75316d5dad189e68c305f297edf42377db9dd6b41b2557
+SIZE (phpMyAdmin-5.2.1-all-languages.tar.xz) = 7461668
diff --git a/databases/phpmyadmin5/files/pkg-message.in b/databases/phpmyadmin5/files/pkg-message.in
index c59745d76ae7..8737150b6c95 100644
--- a/databases/phpmyadmin5/files/pkg-message.in
+++ b/databases/phpmyadmin5/files/pkg-message.in
@@ -10,30 +10,15 @@ Please edit config.inc.php to suit your needs.
 To make phpMyAdmin available through your web site, I suggest
 that you add something like the following to httpd.conf:
 
-For Apache versions earlier than 2.4:
+Alias /phpmyadmin/ "%%WWWDIR%%/"
 
-    Alias /phpmyadmin/ "%%WWWDIR%%/"
-
-    <Directory "%%WWWDIR%%/">
-	Options none
-	AllowOverride Limit
-
-	Order Deny,Allow
-	Deny from all
-	Allow from 127.0.0.1 .example.com
-    </Directory>
-
-For Apache version 2.4.x or above:
-
-    Alias /phpmyadmin/ "%%WWWDIR%%/"
-
-    <Directory "%%WWWDIR%%/">
+<Directory "%%WWWDIR%%/">
 	Options None
 	AllowOverride Limit
 
 	Require local
     	Require host .example.com
-    </Directory>
+</Directory>
 
 SECURITY NOTE: phpMyAdmin is an administrative tool that has had several
 remote vulnerabilities discovered in the past, some allowing remote
diff --git a/databases/phpmyadmin5/pkg-descr b/databases/phpmyadmin5/pkg-descr
index c81c2d88f74d..9a3b60f6a56a 100644
--- a/databases/phpmyadmin5/pkg-descr
+++ b/databases/phpmyadmin5/pkg-descr
@@ -30,5 +30,3 @@ Currently phpMyAdmin can:
       functions
     * create, edit, export and drop events and triggers
     * communicate in 62 different languages
-
-WWW: https://www.phpmyadmin.net/
diff --git a/databases/phppgadmin/Makefile b/databases/phppgadmin/Makefile
index 6a10cf22df20..45bf8e9d302c 100644
--- a/databases/phppgadmin/Makefile
+++ b/databases/phppgadmin/Makefile
@@ -1,14 +1,13 @@
-# Created by: nbm
-
 PORTNAME=	phppgadmin
-DISTVERSIONPREFIX=	REL_
-DISTVERSION=	7-13-0
-PORTREVISION=	0
+PORTVERSION=	7.14.7
+DISTVERSIONPREFIX=	v
+DISTVERSIONSUFFIX=	-mod
 CATEGORIES=	databases www
 PKGNAMESUFFIX=	${PHP_PKGNAMESUFFIX}
 
 MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	Web Based Postgres Administration
+WWW=		https://github.com/ReimuHakurei/phpPgAdmin
 
 LICENSE=	GPLv2
 
@@ -16,9 +15,11 @@ NO_ARCH=	yes
 NO_BUILD=	yes
 USES=		cpe tar:bzip2 php:web,flavors shebangfix
 USE_GITHUB=	yes
+GH_ACCOUNT=	ReimuHakurei
+WRKSRC=		${WRKDIR}/phpPgAdmin-${DISTVERSION}${DISTVERSIONSUFFIX}
 
 .if !defined(WITHOUT_PHP_DEPENDS)
-USE_PHP=	pgsql pcre session mbstring
+USE_PHP=	pgsql session mbstring
 .endif
 
 CPE_VENDOR=	phppgadmin_project
diff --git a/databases/phppgadmin/distinfo b/databases/phppgadmin/distinfo
index 764d6fc48901..03f979e075b0 100644
--- a/databases/phppgadmin/distinfo
+++ b/databases/phppgadmin/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1604814761
-SHA256 (phppgadmin-phppgadmin-REL_7-13-0_GH0.tar.gz) = 8694707ebff7bf4357b2920dacf12344e2c6d62c8143dc0f65794f50756c90fd
-SIZE (phppgadmin-phppgadmin-REL_7-13-0_GH0.tar.gz) = 804431
+TIMESTAMP = 1702923522
+SHA256 (ReimuHakurei-phppgadmin-v7.14.7-mod_GH0.tar.gz) = 7c0e89922abcf88fd81a52590930f3b5121032d1d37234a54a8f6415152dc292
+SIZE (ReimuHakurei-phppgadmin-v7.14.7-mod_GH0.tar.gz) = 1154132
diff --git a/databases/phppgadmin/pkg-descr b/databases/phppgadmin/pkg-descr
index b5543bb3cd2b..da671c1f0e74 100644
--- a/databases/phppgadmin/pkg-descr
+++ b/databases/phppgadmin/pkg-descr
@@ -15,5 +15,3 @@ Features include:
  - administer postgres users and groups
 
 LICENSE: GPL2 or later
-
-WWW: http://phppgadmin.sourceforge.net/
diff --git a/databases/phppgadmin/pkg-plist b/databases/phppgadmin/pkg-plist
index e4dbcd70a7d2..0e8b2df5cda6 100644
--- a/databases/phppgadmin/pkg-plist
+++ b/databases/phppgadmin/pkg-plist
@@ -261,44 +261,182 @@
 %%PGADMDIR%%/lang/turkish.php
 %%PGADMDIR%%/lang/ukrainian.php
 %%PGADMDIR%%/languages.php
+%%PGADMDIR%%/libraries/adodb/.editorconfig
+%%PGADMDIR%%/libraries/adodb/LICENSE.md
+%%PGADMDIR%%/libraries/adodb/README.md
+%%PGADMDIR%%/libraries/adodb/SECURITY.md
+%%PGADMDIR%%/libraries/adodb/adodb-active-record.inc.php
+%%PGADMDIR%%/libraries/adodb/adodb-active-recordx.inc.php
 %%PGADMDIR%%/libraries/adodb/adodb-csvlib.inc.php
 %%PGADMDIR%%/libraries/adodb/adodb-datadict.inc.php
 %%PGADMDIR%%/libraries/adodb/adodb-error.inc.php
-%%PGADMDIR%%/libraries/adodb/adodb-iterator.inc.php
+%%PGADMDIR%%/libraries/adodb/adodb-errorhandler.inc.php
+%%PGADMDIR%%/libraries/adodb/adodb-errorpear.inc.php
+%%PGADMDIR%%/libraries/adodb/adodb-exceptions.inc.php
 %%PGADMDIR%%/libraries/adodb/adodb-lib.inc.php
+%%PGADMDIR%%/libraries/adodb/adodb-loadbalancer.inc.php
+%%PGADMDIR%%/libraries/adodb/adodb-memcache.lib.inc.php
+%%PGADMDIR%%/libraries/adodb/adodb-pager.inc.php
+%%PGADMDIR%%/libraries/adodb/adodb-pear.inc.php
+%%PGADMDIR%%/libraries/adodb/adodb-perf.inc.php
 %%PGADMDIR%%/libraries/adodb/adodb-time.inc.php
+%%PGADMDIR%%/libraries/adodb/adodb-xmlschema.inc.php
+%%PGADMDIR%%/libraries/adodb/adodb-xmlschema03.inc.php
 %%PGADMDIR%%/libraries/adodb/adodb.inc.php
+%%PGADMDIR%%/libraries/adodb/composer.json
+%%PGADMDIR%%/libraries/adodb/datadict/datadict-access.inc.php
+%%PGADMDIR%%/libraries/adodb/datadict/datadict-db2.inc.php
+%%PGADMDIR%%/libraries/adodb/datadict/datadict-firebird.inc.php
+%%PGADMDIR%%/libraries/adodb/datadict/datadict-generic.inc.php
+%%PGADMDIR%%/libraries/adodb/datadict/datadict-ibase.inc.php
+%%PGADMDIR%%/libraries/adodb/datadict/datadict-informix.inc.php
+%%PGADMDIR%%/libraries/adodb/datadict/datadict-mssql.inc.php
+%%PGADMDIR%%/libraries/adodb/datadict/datadict-mssqlnative.inc.php
+%%PGADMDIR%%/libraries/adodb/datadict/datadict-mysql.inc.php
+%%PGADMDIR%%/libraries/adodb/datadict/datadict-oci8.inc.php
+%%PGADMDIR%%/libraries/adodb/datadict/datadict-postgres.inc.php
+%%PGADMDIR%%/libraries/adodb/datadict/datadict-sapdb.inc.php
+%%PGADMDIR%%/libraries/adodb/datadict/datadict-sqlite.inc.php
+%%PGADMDIR%%/libraries/adodb/datadict/datadict-sybase.inc.php
+%%PGADMDIR%%/libraries/adodb/docs/README.md
+%%PGADMDIR%%/libraries/adodb/docs/adodb.gif
+%%PGADMDIR%%/libraries/adodb/docs/adodb2.gif
+%%PGADMDIR%%/libraries/adodb/docs/changelog.md
+%%PGADMDIR%%/libraries/adodb/docs/changelog_v2.x.md
+%%PGADMDIR%%/libraries/adodb/docs/changelog_v3.x.md
+%%PGADMDIR%%/libraries/adodb/docs/changelog_v4+5.md
+%%PGADMDIR%%/libraries/adodb/docs/changelog_v4.x.md
+%%PGADMDIR%%/libraries/adodb/drivers/adodb-access.inc.php
+%%PGADMDIR%%/libraries/adodb/drivers/adodb-ado.inc.php
+%%PGADMDIR%%/libraries/adodb/drivers/adodb-ado5.inc.php
+%%PGADMDIR%%/libraries/adodb/drivers/adodb-ado_access.inc.php
+%%PGADMDIR%%/libraries/adodb/drivers/adodb-ado_mssql.inc.php
+%%PGADMDIR%%/libraries/adodb/drivers/adodb-ads.inc.php
+%%PGADMDIR%%/libraries/adodb/drivers/adodb-borland_ibase.inc.php
+%%PGADMDIR%%/libraries/adodb/drivers/adodb-csv.inc.php
+%%PGADMDIR%%/libraries/adodb/drivers/adodb-db2.inc.php
+%%PGADMDIR%%/libraries/adodb/drivers/adodb-db2oci.inc.php
+%%PGADMDIR%%/libraries/adodb/drivers/adodb-db2ora.inc.php
+%%PGADMDIR%%/libraries/adodb/drivers/adodb-fbsql.inc.php
+%%PGADMDIR%%/libraries/adodb/drivers/adodb-firebird.inc.php
+%%PGADMDIR%%/libraries/adodb/drivers/adodb-ibase.inc.php
+%%PGADMDIR%%/libraries/adodb/drivers/adodb-informix.inc.php
+%%PGADMDIR%%/libraries/adodb/drivers/adodb-informix72.inc.php
+%%PGADMDIR%%/libraries/adodb/drivers/adodb-ldap.inc.php
+%%PGADMDIR%%/libraries/adodb/drivers/adodb-mssql.inc.php
+%%PGADMDIR%%/libraries/adodb/drivers/adodb-mssql_n.inc.php
+%%PGADMDIR%%/libraries/adodb/drivers/adodb-mssqlnative.inc.php
+%%PGADMDIR%%/libraries/adodb/drivers/adodb-mssqlpo.inc.php
+%%PGADMDIR%%/libraries/adodb/drivers/adodb-mysqli.inc.php
+%%PGADMDIR%%/libraries/adodb/drivers/adodb-netezza.inc.php
+%%PGADMDIR%%/libraries/adodb/drivers/adodb-oci8.inc.php
+%%PGADMDIR%%/libraries/adodb/drivers/adodb-oci805.inc.php
+%%PGADMDIR%%/libraries/adodb/drivers/adodb-oci8po.inc.php
+%%PGADMDIR%%/libraries/adodb/drivers/adodb-oci8quercus.inc.php
+%%PGADMDIR%%/libraries/adodb/drivers/adodb-odbc.inc.php
+%%PGADMDIR%%/libraries/adodb/drivers/adodb-odbc_db2.inc.php
+%%PGADMDIR%%/libraries/adodb/drivers/adodb-odbc_mssql.inc.php
+%%PGADMDIR%%/libraries/adodb/drivers/adodb-odbc_mssql2012.inc.php
+%%PGADMDIR%%/libraries/adodb/drivers/adodb-odbc_oracle.inc.php
+%%PGADMDIR%%/libraries/adodb/drivers/adodb-odbtp.inc.php
+%%PGADMDIR%%/libraries/adodb/drivers/adodb-odbtp_unicode.inc.php
+%%PGADMDIR%%/libraries/adodb/drivers/adodb-oracle.inc.php
+%%PGADMDIR%%/libraries/adodb/drivers/adodb-pdo.inc.php
+%%PGADMDIR%%/libraries/adodb/drivers/adodb-pdo_dblib.inc.php
+%%PGADMDIR%%/libraries/adodb/drivers/adodb-pdo_firebird.inc.php
+%%PGADMDIR%%/libraries/adodb/drivers/adodb-pdo_mssql.inc.php
+%%PGADMDIR%%/libraries/adodb/drivers/adodb-pdo_mysql.inc.php
+%%PGADMDIR%%/libraries/adodb/drivers/adodb-pdo_oci.inc.php
+%%PGADMDIR%%/libraries/adodb/drivers/adodb-pdo_pgsql.inc.php
+%%PGADMDIR%%/libraries/adodb/drivers/adodb-pdo_sqlite.inc.php
+%%PGADMDIR%%/libraries/adodb/drivers/adodb-pdo_sqlsrv.inc.php
 %%PGADMDIR%%/libraries/adodb/drivers/adodb-postgres.inc.php
 %%PGADMDIR%%/libraries/adodb/drivers/adodb-postgres64.inc.php
 %%PGADMDIR%%/libraries/adodb/drivers/adodb-postgres7.inc.php
 %%PGADMDIR%%/libraries/adodb/drivers/adodb-postgres8.inc.php
+%%PGADMDIR%%/libraries/adodb/drivers/adodb-postgres9.inc.php
+%%PGADMDIR%%/libraries/adodb/drivers/adodb-proxy.inc.php
+%%PGADMDIR%%/libraries/adodb/drivers/adodb-sapdb.inc.php
+%%PGADMDIR%%/libraries/adodb/drivers/adodb-sqlanywhere.inc.php
+%%PGADMDIR%%/libraries/adodb/drivers/adodb-sqlite.inc.php
+%%PGADMDIR%%/libraries/adodb/drivers/adodb-sqlite3.inc.php
+%%PGADMDIR%%/libraries/adodb/drivers/adodb-sqlitepo.inc.php
+%%PGADMDIR%%/libraries/adodb/drivers/adodb-sybase.inc.php
+%%PGADMDIR%%/libraries/adodb/drivers/adodb-sybase_ase.inc.php
+%%PGADMDIR%%/libraries/adodb/drivers/adodb-text.inc.php
+%%PGADMDIR%%/libraries/adodb/drivers/adodb-vfp.inc.php
 %%PGADMDIR%%/libraries/adodb/lang/adodb-ar.inc.php
 %%PGADMDIR%%/libraries/adodb/lang/adodb-bg.inc.php
-%%PGADMDIR%%/libraries/adodb/lang/adodb-bgutf8.inc.php
 %%PGADMDIR%%/libraries/adodb/lang/adodb-ca.inc.php
 %%PGADMDIR%%/libraries/adodb/lang/adodb-cn.inc.php
 %%PGADMDIR%%/libraries/adodb/lang/adodb-cz.inc.php
 %%PGADMDIR%%/libraries/adodb/lang/adodb-da.inc.php
 %%PGADMDIR%%/libraries/adodb/lang/adodb-de.inc.php
 %%PGADMDIR%%/libraries/adodb/lang/adodb-en.inc.php
+%%PGADMDIR%%/libraries/adodb/lang/adodb-eo.inc.php
 %%PGADMDIR%%/libraries/adodb/lang/adodb-es.inc.php
-%%PGADMDIR%%/libraries/adodb/lang/adodb-esperanto.inc.php
 %%PGADMDIR%%/libraries/adodb/lang/adodb-fa.inc.php
 %%PGADMDIR%%/libraries/adodb/lang/adodb-fr.inc.php
 %%PGADMDIR%%/libraries/adodb/lang/adodb-hu.inc.php
+%%PGADMDIR%%/libraries/adodb/lang/adodb-id.inc.php
 %%PGADMDIR%%/libraries/adodb/lang/adodb-it.inc.php
 %%PGADMDIR%%/libraries/adodb/lang/adodb-nl.inc.php
+%%PGADMDIR%%/libraries/adodb/lang/adodb-oc.inc.php
 %%PGADMDIR%%/libraries/adodb/lang/adodb-pl.inc.php
 %%PGADMDIR%%/libraries/adodb/lang/adodb-pt-br.inc.php
 %%PGADMDIR%%/libraries/adodb/lang/adodb-ro.inc.php
-%%PGADMDIR%%/libraries/adodb/lang/adodb-ru1251.inc.php
+%%PGADMDIR%%/libraries/adodb/lang/adodb-ru.inc.php
 %%PGADMDIR%%/libraries/adodb/lang/adodb-sv.inc.php
-%%PGADMDIR%%/libraries/adodb/lang/adodb_th.inc.php
-%%PGADMDIR%%/libraries/adodb/lang/adodb-uk1251.inc.php
-%%PGADMDIR%%/libraries/adodb/license.txt
-%%PGADMDIR%%/libraries/adodb/readme.txt
+%%PGADMDIR%%/libraries/adodb/lang/adodb-th.inc.php
+%%PGADMDIR%%/libraries/adodb/lang/adodb-uk.inc.php
+%%PGADMDIR%%/libraries/adodb/pear/Auth/Container/ADOdb.php
+%%PGADMDIR%%/libraries/adodb/pear/auth_adodb_example.php
+%%PGADMDIR%%/libraries/adodb/pear/readme.Auth.txt
+%%PGADMDIR%%/libraries/adodb/perf/perf-db2.inc.php
+%%PGADMDIR%%/libraries/adodb/perf/perf-informix.inc.php
+%%PGADMDIR%%/libraries/adodb/perf/perf-mssql.inc.php
+%%PGADMDIR%%/libraries/adodb/perf/perf-mssqlnative.inc.php
+%%PGADMDIR%%/libraries/adodb/perf/perf-mysql.inc.php
+%%PGADMDIR%%/libraries/adodb/perf/perf-oci8.inc.php
+%%PGADMDIR%%/libraries/adodb/perf/perf-postgres.inc.php
+%%PGADMDIR%%/libraries/adodb/perf/perf-sqlite3.inc.php
+%%PGADMDIR%%/libraries/adodb/phpdoc
+%%PGADMDIR%%/libraries/adodb/phpdoc.dist.xml
+%%PGADMDIR%%/libraries/adodb/pivottable.inc.php
+%%PGADMDIR%%/libraries/adodb/rsfilter.inc.php
+%%PGADMDIR%%/libraries/adodb/session/adodb-compress-bzip2.php
+%%PGADMDIR%%/libraries/adodb/session/adodb-compress-gzip.php
+%%PGADMDIR%%/libraries/adodb/session/adodb-cryptsession.php
+%%PGADMDIR%%/libraries/adodb/session/adodb-cryptsession2.php
+%%PGADMDIR%%/libraries/adodb/session/adodb-encrypt-mcrypt.php
+%%PGADMDIR%%/libraries/adodb/session/adodb-encrypt-md5.php
+%%PGADMDIR%%/libraries/adodb/session/adodb-encrypt-secret.php
+%%PGADMDIR%%/libraries/adodb/session/adodb-encrypt-sha1.php
+%%PGADMDIR%%/libraries/adodb/session/adodb-sess.txt
+%%PGADMDIR%%/libraries/adodb/session/adodb-session-clob.php
+%%PGADMDIR%%/libraries/adodb/session/adodb-session-clob2.php
+%%PGADMDIR%%/libraries/adodb/session/adodb-session.php
+%%PGADMDIR%%/libraries/adodb/session/adodb-session2.php
+%%PGADMDIR%%/libraries/adodb/session/adodb-sessions.mysql.sql
+%%PGADMDIR%%/libraries/adodb/session/adodb-sessions.oracle.clob.sql
+%%PGADMDIR%%/libraries/adodb/session/adodb-sessions.oracle.sql
+%%PGADMDIR%%/libraries/adodb/session/crypt.inc.php
+%%PGADMDIR%%/libraries/adodb/session/old/adodb-cryptsession.php
+%%PGADMDIR%%/libraries/adodb/session/old/adodb-session-clob.php
+%%PGADMDIR%%/libraries/adodb/session/old/adodb-session.php
+%%PGADMDIR%%/libraries/adodb/session/old/crypt.inc.php
+%%PGADMDIR%%/libraries/adodb/session/session_schema.xml
+%%PGADMDIR%%/libraries/adodb/session/session_schema2.xml
 %%PGADMDIR%%/libraries/adodb/toexport.inc.php
 %%PGADMDIR%%/libraries/adodb/tohtml.inc.php
+%%PGADMDIR%%/libraries/adodb/xmlschema.dtd
+%%PGADMDIR%%/libraries/adodb/xmlschema03.dtd
+%%PGADMDIR%%/libraries/adodb/xsl/convert-0.1-0.2.xsl
+%%PGADMDIR%%/libraries/adodb/xsl/convert-0.1-0.3.xsl
+%%PGADMDIR%%/libraries/adodb/xsl/convert-0.2-0.1.xsl
+%%PGADMDIR%%/libraries/adodb/xsl/convert-0.2-0.3.xsl
+%%PGADMDIR%%/libraries/adodb/xsl/remove-0.2.xsl
+%%PGADMDIR%%/libraries/adodb/xsl/remove-0.3.xsl
 %%PGADMDIR%%/libraries/decorator.inc.php
 %%PGADMDIR%%/libraries/errorhandler.inc.php
 %%PGADMDIR%%/libraries/highlight.php
@@ -368,6 +506,7 @@
 %%PGADMDIR%%/tblproperties.php
 %%PGADMDIR%%/themes/bootstrap/global.css
 %%PGADMDIR%%/themes/bootstrap/title.png
+%%PGADMDIR%%/themes/dark/global.css
 %%PGADMDIR%%/themes/default/global.css
 %%PGADMDIR%%/themes/global.css
 %%PGADMDIR%%/themes/themes.php
diff --git a/databases/pldebugger/Makefile b/databases/pldebugger/Makefile
index 095b96414fab..196a89cafc9c 100644
--- a/databases/pldebugger/Makefile
+++ b/databases/pldebugger/Makefile
@@ -1,27 +1,31 @@
 PORTNAME=	pldebugger
-PORTVERSION=	1.0.20181016
+PORTVERSION=	1.5
+DISTVERSIONPREFIX=	v
 PORTEPOCH=	1
 CATEGORIES=	databases
-MASTER_SITES=	https://git.postgresql.org/gitweb/?p=pldebugger.git;a=snapshot;h=c3ac72942c6ba2e3b701a5291b1f6cf8f596b57c;sf=tgz;dummy=/
 
-MAINTAINER=	amdmi3@FreeBSD.org
+MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	PostgreSQL pl/pgsql Debugger API
+WWW=		https://github.com/EnterpriseDB/pldebugger
 
 LICENSE=	ART20
 
 USES=		gmake pgsql
+
 LLD_UNSAFE=	yes
+MAKE_ENV=	USE_PGXS=1
 WANT_PGSQL=	server
 
 DOCSDIR=	${PREFIX}/share/doc/postgresql/extension
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-c3ac729
+USE_GITHUB=	yes
+GH_ACCOUNT=	EnterpriseDB
 
-MAKE_ENV=	USE_PGXS=1
+PORTSCOUT=	limit:^v[0-9]
 
 OPTIONS_DEFINE=	DOCS
 
 post-install:
-	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/postgresql/plugin_debugger.so
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/postgresql/plugin_debugger.so
 
 .include <bsd.port.mk>
diff --git a/databases/pldebugger/distinfo b/databases/pldebugger/distinfo
index 695abd894a08..20750f3eab82 100644
--- a/databases/pldebugger/distinfo
+++ b/databases/pldebugger/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1566411551
-SHA256 (pldebugger-1.0.20181016.tar.gz) = 90479bfc0523e017898f981a58825867ad300bdeaf57e69a55a31bdc27bdfe39
-SIZE (pldebugger-1.0.20181016.tar.gz) = 48599
+TIMESTAMP = 1684104308
+SHA256 (EnterpriseDB-pldebugger-v1.5_GH0.tar.gz) = 99f0933ec15027ab9d5c3ae888d1d234b9b7589a8dd84337b0eb41f62e773b57
+SIZE (EnterpriseDB-pldebugger-v1.5_GH0.tar.gz) = 48745
diff --git a/databases/pldebugger/pkg-descr b/databases/pldebugger/pkg-descr
index bbf89e4045c2..9350e8cfdef3 100644
--- a/databases/pldebugger/pkg-descr
+++ b/databases/pldebugger/pkg-descr
@@ -1,4 +1,2 @@
-This module is a set of shared libraries which implement an API for
-debugging pl/pgsql functions on PostgreSQL 8.4 and above.
-
-WWW: https://git.postgresql.org/gitweb/?p=pldebugger.git;a=summary
+This module is a set of shared libraries which implement an API for debugging
+pl/pgsql functions on PostgreSQL 8.4 and above.
diff --git a/databases/plpgsql_check/Makefile b/databases/plpgsql_check/Makefile
index 6c3cab8af183..928316f4beab 100644
--- a/databases/plpgsql_check/Makefile
+++ b/databases/plpgsql_check/Makefile
@@ -1,20 +1,19 @@
-# Created by: Jov <amutu@amutu.com>
-
 PORTNAME=	plpgsql_check
-PORTVERSION=	1.17.1
+PORTVERSION=	2.7.5
 DISTVERSIONPREFIX=	v
 CATEGORIES=	databases
 PKGNAMEPREFIX=	postgresql${PGSQL_VER_NODOT}-
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	PostgreSQL extension to check PL/pgSQL code
+WWW=		https://github.com/okbob/plpgsql_check
 
 LICENSE=	UNKNOWN
 LICENSE_NAME=	postcardware
 LICENSE_FILE=	${WRKSRC}/LICENSE
 LICENSE_PERMS=	auto-accept dist-mirror dist-sell pkg-mirror pkg-sell
 
-USES=		compiler:c11 gmake pgsql:10+
+USES=		compiler:c11 gmake pgsql:12+
 
 LLD_UNSAFE=	yes
 MAKE_ARGS=	CC="${CC}"
diff --git a/databases/plpgsql_check/distinfo b/databases/plpgsql_check/distinfo
index 968d3aa7dc6d..00af076f3e26 100644
--- a/databases/plpgsql_check/distinfo
+++ b/databases/plpgsql_check/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1624630050
-SHA256 (okbob-plpgsql_check-v1.17.1_GH0.tar.gz) = a0441308ad47fdfdc88e7f8e36ce2bf3bcd5215bf4c23767787128e27c0a3990
-SIZE (okbob-plpgsql_check-v1.17.1_GH0.tar.gz) = 237452
+TIMESTAMP = 1712084456
+SHA256 (okbob-plpgsql_check-v2.7.5_GH0.tar.gz) = d067772c6a060702424aadb3d8adbbe513cfb41c839ed2cac52bced99c73b963
+SIZE (okbob-plpgsql_check-v2.7.5_GH0.tar.gz) = 254593
diff --git a/databases/plpgsql_check/pkg-descr b/databases/plpgsql_check/pkg-descr
index 52181a5ebc4a..db6aabb8904b 100644
--- a/databases/plpgsql_check/pkg-descr
+++ b/databases/plpgsql_check/pkg-descr
@@ -14,5 +14,3 @@ Features:
   unused indexes
 - possibility to collect relations and functions used by function
 - possibility to check EXECUTE stmt agaist SQL injection vulnerability
-
-WWW: https://github.com/okbob/plpgsql_check
diff --git a/databases/pointcloud/Makefile b/databases/pointcloud/Makefile
index 435d6b8b85c1..428b8b193ffd 100644
--- a/databases/pointcloud/Makefile
+++ b/databases/pointcloud/Makefile
@@ -1,33 +1,28 @@
-# Created by: lbartoletti <lbartoletti@FreeBSD.org>
-
 PORTNAME=	pointcloud
-PORTVERSION=	1.2.1
-PORTREVISION=	2
 DISTVERSIONPREFIX=	v
+DISTVERSION=	1.2.5
 CATEGORIES=	databases geography
 
-PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
-PATCHFILES=	270f3e112519.patch:-p1
-
 MAINTAINER=	lbartoletti@FreeBSD.org
 COMMENT=	LIDAR types for PostgreSQL
+WWW=		https://github.com/pgpointcloud/pointcloud/
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYRIGHT
 
-LIB_DEPENDS=	libght.so:devel/libght \
-		liblazperf.so:archivers/lazperf
+LIB_DEPENDS=	liblazperf.so:archivers/lazperf
 
 USES=		autoreconf compiler:c++0x gmake gnome pgsql
-WANT_PGSQL=	server
-USE_GNOME=	libxml2
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=	--with-lazperf=${LOCALBASE}
-USE_LDCONFIG=	yes
+WANT_PGSQL=	server
 USE_GITHUB=	yes
 GH_ACCOUNT=	pgpointcloud
+USE_GNOME=	libxml2
+USE_LDCONFIG=	yes
+
+CONFIGURE_ARGS=	--with-lazperf=${LOCALBASE}
 
 post-install:
-	${STRIP_CMD} ${STAGEDIR}${LOCALBASE}/lib/postgresql/pointcloud-${PORTVERSION:R}.so
+	${STRIP_CMD} ${STAGEDIR}${LOCALBASE}/lib/postgresql/pointcloud-${DISTVERSION:R}.so
 
 .include <bsd.port.mk>
diff --git a/databases/pointcloud/distinfo b/databases/pointcloud/distinfo
index 3152816466ab..63b9b81a052d 100644
--- a/databases/pointcloud/distinfo
+++ b/databases/pointcloud/distinfo
@@ -1,5 +1,3 @@
-TIMESTAMP = 1598684578
-SHA256 (pgpointcloud-pointcloud-v1.2.1_GH0.tar.gz) = 90742b6f5f9164e273afbb3d0f93335f44d202a8c2df3ff71769de6471d1e427
-SIZE (pgpointcloud-pointcloud-v1.2.1_GH0.tar.gz) = 317926
-SHA256 (270f3e112519.patch) = 81e4252ee94184f7572ee0a3c14d5fffe9104dd5c00b5628661ecbf5f4c79ec1
-SIZE (270f3e112519.patch) = 1571
+TIMESTAMP = 1700893680
+SHA256 (pgpointcloud-pointcloud-v1.2.5_GH0.tar.gz) = f3924f283345f2da46a971e65f0c6ce602640ecf88a2057293443ec2a7a56774
+SIZE (pgpointcloud-pointcloud-v1.2.5_GH0.tar.gz) = 348678
diff --git a/databases/pointcloud/files/patch-lib_sort__r_sort__r.h b/databases/pointcloud/files/patch-lib_sort__r_sort__r.h
new file mode 100644
index 000000000000..154155cde4c0
--- /dev/null
+++ b/databases/pointcloud/files/patch-lib_sort__r_sort__r.h
@@ -0,0 +1,24 @@
+--- lib/sort_r/sort_r.h.orig	2022-09-12 07:14:10 UTC
++++ lib/sort_r/sort_r.h
+@@ -27,10 +27,10 @@ void sort_r(void *base, size_t nel, size_t width,
+ #define _SORT_R_INLINE inline
+ 
+ #if (defined __APPLE__ || defined __MACH__ || defined __DARWIN__ || \
+-     defined __FreeBSD__ || defined __DragonFly__)
++     (defined __FreeBSD__ && !defined(qsort_r)) || defined __DragonFly__)
+ #  define _SORT_R_BSD
+ #elif (defined _GNU_SOURCE || defined __gnu_hurd__ || defined __GNU__ || \
+-       defined __linux__ || (defined __MINGW32__ && !defined __MINGW64_VERSION_MAJOR) || defined __GLIBC__)
++       defined __linux__ || (defined __MINGW32__ && !defined __MINGW64_VERSION_MAJOR) || defined __GLIBC__ || (defined (__FreeBSD__) && defined(qsort_r)))
+ #  define _SORT_R_LINUX
+ #elif (defined _WIN32 || defined _WIN64 || defined __WINDOWS__)
+ #  define _SORT_R_WINDOWS
+@@ -170,7 +170,7 @@ static _SORT_R_INLINE void sort_r_simple(void *base, s
+   #if defined _SORT_R_LINUX
+ 
+     typedef int(* __compar_d_fn_t)(const void *, const void *, void *);
+-    extern void qsort_r(void *base, size_t nel, size_t width,
++    extern void (qsort_r)(void *base, size_t nel, size_t width,
+                         __compar_d_fn_t __compar, void *arg)
+       __attribute__((nonnull (1, 4)));
+ 
diff --git a/databases/pointcloud/pkg-descr b/databases/pointcloud/pkg-descr
index 3f730f1dfbd3..d3ebd9e4a663 100644
--- a/databases/pointcloud/pkg-descr
+++ b/databases/pointcloud/pkg-descr
@@ -1,3 +1 @@
 A PostgreSQL extension for storing point cloud (LIDAR) data.
-
-WWW: https://github.com/pgpointcloud/pointcloud/
diff --git a/databases/pointcloud/pkg-plist b/databases/pointcloud/pkg-plist
index c5b5918acebd..42581db16c4b 100644
--- a/databases/pointcloud/pkg-plist
+++ b/databases/pointcloud/pkg-plist
@@ -1,10 +1,23 @@
 lib/postgresql/pointcloud-1.2.so
-share/postgresql/extension/pointcloud--1.1.0--1.2.1.sql
-share/postgresql/extension/pointcloud--1.1.1--1.2.1.sql
-share/postgresql/extension/pointcloud--1.2.0--1.2.1.sql
-share/postgresql/extension/pointcloud--1.2.1--1.2.1next.sql
-share/postgresql/extension/pointcloud--1.2.1.sql
-share/postgresql/extension/pointcloud--1.2.1next--1.2.1.sql
+share/postgresql/extension/pointcloud--1.1.0--1.2.5.sql
+share/postgresql/extension/pointcloud--1.1.1--1.2.5.sql
+share/postgresql/extension/pointcloud--1.2.0--1.2.5.sql
+share/postgresql/extension/pointcloud--1.2.1--1.2.5.sql
+share/postgresql/extension/pointcloud--1.2.2--1.2.5.sql
+share/postgresql/extension/pointcloud--1.2.3--1.2.5.sql
+share/postgresql/extension/pointcloud--1.2.4--1.2.5.sql
+share/postgresql/extension/pointcloud--1.2.5--1.2.5next.sql
+share/postgresql/extension/pointcloud--1.2.5.sql
+share/postgresql/extension/pointcloud--1.2.5next--1.2.5.sql
 share/postgresql/extension/pointcloud.control
-share/postgresql/extension/pointcloud_postgis--1.2.1.sql
+share/postgresql/extension/pointcloud_postgis--1.1.0--1.2.5.sql
+share/postgresql/extension/pointcloud_postgis--1.1.1--1.2.5.sql
+share/postgresql/extension/pointcloud_postgis--1.2.0--1.2.5.sql
+share/postgresql/extension/pointcloud_postgis--1.2.1--1.2.5.sql
+share/postgresql/extension/pointcloud_postgis--1.2.2--1.2.5.sql
+share/postgresql/extension/pointcloud_postgis--1.2.3--1.2.5.sql
+share/postgresql/extension/pointcloud_postgis--1.2.4--1.2.5.sql
+share/postgresql/extension/pointcloud_postgis--1.2.5--1.2.5next.sql
+share/postgresql/extension/pointcloud_postgis--1.2.5.sql
+share/postgresql/extension/pointcloud_postgis--1.2.5next--1.2.5.sql
 share/postgresql/extension/pointcloud_postgis.control
diff --git a/databases/postgis-jdbc/Makefile b/databases/postgis-jdbc/Makefile
index 5443cae50353..81e2fe13a02a 100644
--- a/databases/postgis-jdbc/Makefile
+++ b/databases/postgis-jdbc/Makefile
@@ -1,5 +1,3 @@
-# Created by: Sam Lawrance <boris@brooknet.com.au>
-
 PORTNAME=	postgis-jdbc
 PORTVERSION=	2.1.7
 CATEGORIES=	databases java geography
@@ -8,6 +6,7 @@ EXTRACT_SUFX=	.jar
 
 MAINTAINER=	rhurlin@FreeBSD.org
 COMMENT=	PostGIS spatial data structures for JDBC
+WWW=		http://postgis.refractions.net
 
 LICENSE=	GPLv2 LGPL21
 LICENSE_COMB=	multi
diff --git a/databases/postgis-jdbc/pkg-descr b/databases/postgis-jdbc/pkg-descr
index 74beaac5b923..708bcaa3df2d 100644
--- a/databases/postgis-jdbc/pkg-descr
+++ b/databases/postgis-jdbc/pkg-descr
@@ -1,4 +1,2 @@
 PostGIS-JDBC provides the spatial data structures needed to use
 PostgreSQL-JDBC with spatial tables.
-
-WWW: http://postgis.refractions.net
diff --git a/databases/postgis24/Makefile b/databases/postgis24/Makefile
deleted file mode 100644
index 2d2d968c1817..000000000000
--- a/databases/postgis24/Makefile
+++ /dev/null
@@ -1,65 +0,0 @@
-# Created by: Loïc BARTOLETTI <lbartoletti@FreeBSD.org>
-
-PORTNAME=	postgis
-PORTVERSION=	2.4.9
-PORTREVISION=	6
-CATEGORIES=	databases geography
-MASTER_SITES=	https://download.osgeo.org/postgis/source/
-PKGNAMESUFFIX=	24
-
-MAINTAINER=	lbartoletti@FreeBSD.org
-COMMENT=	Geographic objects support for PostgreSQL databases
-
-LICENSE=	GPLv2
-LICENSE_FILE=	${WRKSRC}/COPYING
-
-LIB_DEPENDS=	libproj.so:graphics/proj \
-		libgeos.so:graphics/geos \
-		libjson-c.so:devel/json-c \
-		libgdal.so:graphics/gdal
-
-USES=		alias cpe gettext gmake gnome iconv:wchar_t libtool:keepla \
-		localbase perl5 pkgconfig pgsql:9.5-12 shebangfix
-USE_GNOME=	libxml2
-USE_LDCONFIG=	yes
-USE_PERL5=	build
-
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	${ICONV_CONFIGURE_BASE} NUMERICFLAGS=${PORTVERSION}
-SHEBANG_FILES=	extensions/address_standardizer/*.pl raster/test/regress/*.pl \
-		raster/test/regress/loader/*.pl regress/run_test.pl \
-		utils/postgis_restore.pl.in utils/*.pl
-WANT_PGSQL=	server
-
-OPTIONS_DEFINE=	ADDRSTD LOADERGUI SFCGAL TOPOLOGY
-OPTIONS_DEFAULT=ADDRSTD SFCGAL TOPOLOGY
-OPTIONS_SUB=	yes
-
-LOADERGUI_DESC=	Enable shp2pgsql-gui
-TOPOLOGY_DESC=	Topology support
-SFCGAL_DESC=	Enable sfcgal
-ADDRSTD_DESC=	Enable address standardizer
-
-CONFLICTS_INSTALL=	postgis20 postgis21 postgis22 postgis23 postgis25 postgis30 postgis31
-
-LOADERGUI_CONFIGURE_WITH=	gui
-LOADERGUI_USE=			GNOME=gtk20
-TOPOLOGY_CONFIGURE_WITH=	topology
-SFCGAL_LIB_DEPENDS=		libSFCGAL.so:databases/sfcgal
-SFCGAL_CONFIGURE_WITH=		sfcgal=${LOCALBASE}/bin/sfcgal-config
-ADDRSTD_CONFIGURE_WITH=		address-standardizer
-ADDRSTD_LIB_DEPENDS=		libpcre.so:devel/pcre
-ADDRSTD_VARS=			WANT_PGSQL+=contrib
-
-PLIST_SUB=	PORTVERSION=${PORTVERSION}
-
-post-install:
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/*
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/liblwgeom-2.4.so.0.0.0
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/postgresql/*.so
-	${MKDIR} ${STAGEDIR}${DATADIR}/tiger_geocoder
-	(cd ${WRKSRC}/extras/tiger_geocoder && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/tiger_geocoder/ "! ( -name *\.orig -o -name *\.bak )" )
-	${MKDIR} ${STAGEDIR}${DATADIR}/utils
-	(cd ${WRKSRC}/utils/ && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/utils/ "! ( -name *\.orig -o -name *\.bak -o -name Makefile -o -name *\.in -o -name uninstall_script )" )
-
-.include <bsd.port.mk>
diff --git a/databases/postgis24/distinfo b/databases/postgis24/distinfo
deleted file mode 100644
index 40ee51fc118f..000000000000
--- a/databases/postgis24/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1598853355
-SHA256 (postgis-2.4.9.tar.gz) = 47125fdc7a7e8d3506e164aa4893d9f848b0d0e1c8eb007ac1e950ad4c31bb7e
-SIZE (postgis-2.4.9.tar.gz) = 12846316
diff --git a/databases/postgis24/pkg-descr b/databases/postgis24/pkg-descr
deleted file mode 100644
index 31c8f2a8dcd8..000000000000
--- a/databases/postgis24/pkg-descr
+++ /dev/null
@@ -1,15 +0,0 @@
-PostGIS adds support for geographic objects to the PostgreSQL
-object-relational database. In effect, PostGIS "spatially enables"
-the PostgreSQL server, allowing it to be used as a backend spatial
-database for geographic information systems (GIS), much like ESRI's
-SDE or Oracle's Spatial extension. PostGIS follows the OpenGIS
-"Simple Features Specification for SQL" and has been certified as
-compliant with the "Types and Functions" profile.
-
-PostGIS development was started by Refractions Research as a project
-in open source spatial database technology. PostGIS is released
-under the GNU General Public License. PostGIS continues to be
-developed by a group of contributors led by a Project Steering
-Committee and new features continue to be added.
-
-WWW: https://postgis.net/
diff --git a/databases/postgis24/pkg-plist b/databases/postgis24/pkg-plist
deleted file mode 100644
index bf998fa92b4a..000000000000
--- a/databases/postgis24/pkg-plist
+++ /dev/null
@@ -1,403 +0,0 @@
-bin/pgsql2shp
-bin/raster2pgsql
-bin/shp2pgsql
-%%LOADERGUI%%bin/shp2pgsql-gui
-include/liblwgeom.h
-include/liblwgeom_topo.h
-lib/liblwgeom-2.4.so.0
-lib/liblwgeom-2.4.so.0.0.0
-lib/liblwgeom.a
-lib/liblwgeom.la
-lib/liblwgeom.so
-%%ADDRSTD%%lib/postgresql/address_standardizer.so
-lib/postgresql/postgis-2.4.so
-%%TOPOLOGY%%lib/postgresql/postgis_topology-2.4.so
-lib/postgresql/rtpostgis-2.4.so
-%%ADDRSTD%%share/doc/postgresql/extension/README.address_standardizer
-%%DATADIR%%/tiger_geocoder/README
-%%DATADIR%%/tiger_geocoder/create_geocode.bat
-%%DATADIR%%/tiger_geocoder/create_geocode.sh
-%%DATADIR%%/tiger_geocoder/create_geocode.sql
-%%DATADIR%%/tiger_geocoder/geocode/census_tracts_functions.sql
-%%DATADIR%%/tiger_geocoder/geocode/geocode.sql
-%%DATADIR%%/tiger_geocoder/geocode/geocode_address.sql
-%%DATADIR%%/tiger_geocoder/geocode/geocode_intersection.sql
-%%DATADIR%%/tiger_geocoder/geocode/geocode_location.sql
-%%DATADIR%%/tiger_geocoder/geocode/includes_address.sql
-%%DATADIR%%/tiger_geocoder/geocode/interpolate_from_address.sql
-%%DATADIR%%/tiger_geocoder/geocode/other_helper_functions.sql
-%%DATADIR%%/tiger_geocoder/geocode/rate_attributes.sql
-%%DATADIR%%/tiger_geocoder/geocode/reverse_geocode.sql
-%%DATADIR%%/tiger_geocoder/geocode_settings.sql
-%%DATADIR%%/tiger_geocoder/legacy_import/tiger2008/import_tiger_shps.sh
-%%DATADIR%%/tiger_geocoder/normalize/count_words.sql
-%%DATADIR%%/tiger_geocoder/normalize/end_soundex.sql
-%%DATADIR%%/tiger_geocoder/normalize/get_last_words.sql
-%%DATADIR%%/tiger_geocoder/normalize/location_extract.sql
-%%DATADIR%%/tiger_geocoder/normalize/location_extract_countysub_exact.sql
-%%DATADIR%%/tiger_geocoder/normalize/location_extract_countysub_fuzzy.sql
-%%DATADIR%%/tiger_geocoder/normalize/location_extract_place_exact.sql
-%%DATADIR%%/tiger_geocoder/normalize/location_extract_place_fuzzy.sql
-%%DATADIR%%/tiger_geocoder/normalize/normalize_address.sql
-%%DATADIR%%/tiger_geocoder/normalize/pprint_addy.sql
-%%DATADIR%%/tiger_geocoder/normalize/state_extract.sql
-%%DATADIR%%/tiger_geocoder/pagc_normalize/pagc_normalize_address.sql
-%%DATADIR%%/tiger_geocoder/pagc_normalize/pagc_tables.sql
-%%DATADIR%%/tiger_geocoder/regress/geocode_regress
-%%DATADIR%%/tiger_geocoder/regress/geocode_regress.sql
-%%DATADIR%%/tiger_geocoder/regress/normalize_address_desired_regress
-%%DATADIR%%/tiger_geocoder/regress/normalize_address_regress
-%%DATADIR%%/tiger_geocoder/regress/normalize_address_regress.sql
-%%DATADIR%%/tiger_geocoder/regress/pagc_normalize_address_desired_regress
-%%DATADIR%%/tiger_geocoder/regress/pagc_normalize_address_regress
-%%DATADIR%%/tiger_geocoder/regress/pagc_normalize_address_regress.sql
-%%DATADIR%%/tiger_geocoder/regress/regress.sql
-%%DATADIR%%/tiger_geocoder/regress/reverse_geocode_regress
-%%DATADIR%%/tiger_geocoder/regress/reverse_geocode_regress.sql
-%%DATADIR%%/tiger_geocoder/tables/lookup_tables_2011.sql
-%%DATADIR%%/tiger_geocoder/tiger_loader_2011.sql
-%%DATADIR%%/tiger_geocoder/tiger_loader_2012.sql
-%%DATADIR%%/tiger_geocoder/tiger_loader_2013.sql
-%%DATADIR%%/tiger_geocoder/tiger_loader_2014.sql
-%%DATADIR%%/tiger_geocoder/tiger_loader_2015.sql
-%%DATADIR%%/tiger_geocoder/tiger_loader_2016.sql
-%%DATADIR%%/tiger_geocoder/tiger_loader_2017.sql
-%%DATADIR%%/tiger_geocoder/topology/README
-%%DATADIR%%/tiger_geocoder/topology/tiger_topology_loader.sql
-%%DATADIR%%/tiger_geocoder/upgrade_geocode.sql
-%%DATADIR%%/tiger_geocoder/upgrade_geocoder.bat
-%%DATADIR%%/tiger_geocoder/upgrade_geocoder.sh
-%%DATADIR%%/tiger_geocoder/utility/cull_null.sql
-%%DATADIR%%/tiger_geocoder/utility/levenshtein_ignore_case.sql
-%%DATADIR%%/tiger_geocoder/utility/nullable_levenshtein.sql
-%%DATADIR%%/tiger_geocoder/utility/set_search_path.sql
-%%DATADIR%%/tiger_geocoder/utility/standardize_tiger_data.sql
-%%DATADIR%%/tiger_geocoder/utility/utmzone.sql
-%%DATADIR%%/utils/README
-%%DATADIR%%/utils/check_all_upgrades.sh
-%%DATADIR%%/utils/create_spatial_ref_sys_config_dump.pl
-%%DATADIR%%/utils/create_undef.pl
-%%DATADIR%%/utils/create_unpackaged.pl
-%%DATADIR%%/utils/postgis_proc_set_search_path.pl
-%%DATADIR%%/utils/postgis_proc_upgrade.pl
-%%DATADIR%%/utils/postgis_restore.pl
-%%DATADIR%%/utils/profile_intersects.pl
-%%DATADIR%%/utils/read_scripts_version.pl
-%%DATADIR%%/utils/svn_repo_revision.pl
-%%DATADIR%%/utils/test_estimation.pl
-%%DATADIR%%/utils/test_geography_estimation.pl
-%%DATADIR%%/utils/test_geography_joinestimation.pl
-%%DATADIR%%/utils/test_joinestimation.pl
-%%LOADERGUI%%share/postgresql/applications/shp2pgsql-gui.desktop
-share/postgresql/contrib/postgis-2.4/legacy.sql
-share/postgresql/contrib/postgis-2.4/legacy_gist.sql
-share/postgresql/contrib/postgis-2.4/legacy_minimal.sql
-share/postgresql/contrib/postgis-2.4/postgis.sql
-share/postgresql/contrib/postgis-2.4/postgis_comments.sql
-share/postgresql/contrib/postgis-2.4/postgis_for_extension.sql
-share/postgresql/contrib/postgis-2.4/postgis_proc_set_search_path.sql
-share/postgresql/contrib/postgis-2.4/postgis_restore.pl
-share/postgresql/contrib/postgis-2.4/postgis_upgrade.sql
-share/postgresql/contrib/postgis-2.4/postgis_upgrade_for_extension.sql
-share/postgresql/contrib/postgis-2.4/raster_comments.sql
-share/postgresql/contrib/postgis-2.4/rtpostgis.sql
-share/postgresql/contrib/postgis-2.4/rtpostgis_for_extension.sql
-share/postgresql/contrib/postgis-2.4/rtpostgis_legacy.sql
-share/postgresql/contrib/postgis-2.4/rtpostgis_proc_set_search_path.sql
-share/postgresql/contrib/postgis-2.4/rtpostgis_upgrade.sql
-share/postgresql/contrib/postgis-2.4/rtpostgis_upgrade_for_extension.sql
-%%SFCGAL%%share/postgresql/contrib/postgis-2.4/sfcgal.sql
-%%SFCGAL%%share/postgresql/contrib/postgis-2.4/sfcgal_comments.sql
-%%SFCGAL%%share/postgresql/contrib/postgis-2.4/sfcgal_upgrade.sql
-share/postgresql/contrib/postgis-2.4/spatial_ref_sys.sql
-%%TOPOLOGY%%share/postgresql/contrib/postgis-2.4/topology.sql
-%%TOPOLOGY%%share/postgresql/contrib/postgis-2.4/topology_comments.sql
-%%TOPOLOGY%%share/postgresql/contrib/postgis-2.4/topology_upgrade.sql
-share/postgresql/contrib/postgis-2.4/uninstall_legacy.sql
-share/postgresql/contrib/postgis-2.4/uninstall_postgis.sql
-share/postgresql/contrib/postgis-2.4/uninstall_rtpostgis.sql
-%%SFCGAL%%share/postgresql/contrib/postgis-2.4/uninstall_sfcgal.sql
-%%TOPOLOGY%%share/postgresql/contrib/postgis-2.4/uninstall_topology.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--1.0--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.0.0--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.0.1--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.0.2--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.0.3--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.0.4--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.0.5--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.0.6--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.0.7--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.1.0--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.1.1--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.1.2--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.1.3--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.1.4--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.1.5--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.1.6--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.1.7--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.1.8--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.1.9--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.2.0--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.2.1--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.2.2--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.2.3--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.2.4--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.2.5--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.2.6--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.2.7--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.2.8--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.3.0--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.3.1--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.3.10--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.3.11--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.3.2--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.3.3--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.3.4--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.3.5--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.3.6--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.3.7--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.3.8--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.3.9--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.4.0--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.4.1--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.4.2--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.4.3--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.4.4--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.4.5--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.4.6--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.4.7--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.4.8--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--ANY--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--%%PORTVERSION%%--%%PORTVERSION%%next.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--%%PORTVERSION%%next--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer.control
-%%ADDRSTD%%share/postgresql/extension/address_standardizer.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--%%PORTVERSION%%--%%PORTVERSION%%next.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--%%PORTVERSION%%next--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us.control
-%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us.sql
-share/postgresql/extension/postgis--2.0.0--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--2.0.1--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--2.0.2--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--2.0.3--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--2.0.4--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--2.0.5--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--2.0.6--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--2.0.7--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--2.1.0--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--2.1.1--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--2.1.2--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--2.1.3--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--2.1.4--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--2.1.5--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--2.1.6--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--2.1.7--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--2.1.8--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--2.1.9--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--2.2.0--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--2.2.1--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--2.2.2--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--2.2.3--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--2.2.4--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--2.2.5--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--2.2.6--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--2.2.7--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--2.2.8--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--2.3.0--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--2.3.1--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--2.3.2--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--2.3.3--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--2.3.4--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--2.3.5--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--2.3.6--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--2.3.7--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--2.3.8--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--2.3.9--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--2.3.10--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--2.3.11--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--2.4.0--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--2.4.1--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--2.4.2--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--2.4.3--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--2.4.4--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--2.4.5--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--2.4.6--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--2.4.7--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--2.4.8--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--%%PORTVERSION%%--%%PORTVERSION%%next.sql
-share/postgresql/extension/postgis--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--%%PORTVERSION%%next--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--unpackaged--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis.control
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.0.0--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.0.1--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.0.2--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.0.3--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.0.4--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.0.5--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.0.6--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.0.7--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.1.0--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.1.1--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.1.2--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.1.3--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.1.4--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.1.5--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.1.6--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.1.7--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.1.8--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.1.9--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.2.0--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.2.1--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.2.2--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.2.3--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.2.4--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.2.5--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.2.6--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.2.7--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.2.8--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.3.0--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.3.1--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.3.2--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.3.3--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.3.4--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.3.5--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.3.6--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.3.7--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.3.8--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.3.9--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.3.10--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.3.11--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.4.0--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.4.1--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.4.2--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.4.3--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.4.4--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.4.5--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.4.6--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.4.7--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.4.8--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--%%PORTVERSION%%--%%PORTVERSION%%next.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--%%PORTVERSION%%next--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--unpackaged--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal.control
-share/postgresql/extension/postgis_tiger_geocoder--2.0.0--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--2.0.1--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--2.0.2--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--2.0.3--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--2.0.4--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--2.0.5--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--2.0.6--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--2.0.7--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--2.1.0--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--2.1.1--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--2.1.2--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--2.1.3--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--2.1.4--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--2.1.5--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--2.1.6--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--2.1.7--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--2.1.8--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--2.1.9--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--2.2.0--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--2.2.1--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--2.2.2--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--2.2.3--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--2.2.4--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--2.2.5--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--2.2.6--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--2.2.7--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--2.2.8--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--2.3.0--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--2.3.1--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--2.3.2--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--2.3.3--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--2.3.4--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--2.3.5--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--2.3.6--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--2.3.7--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--2.3.8--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--2.3.9--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--2.3.10--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--2.3.11--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--2.4.0--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--2.4.1--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--2.4.2--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--2.4.3--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--2.4.4--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--2.4.5--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--2.4.6--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--2.4.7--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--2.4.8--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--%%PORTVERSION%%--%%PORTVERSION%%next.sql
-share/postgresql/extension/postgis_tiger_geocoder--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--%%PORTVERSION%%next--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--unpackaged--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder.control
-share/postgresql/extension/postgis_tiger_geocoder.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.0.0--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.0.1--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.0.2--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.0.3--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.0.4--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.0.5--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.0.6--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.0.7--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.1.0--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.1.1--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.1.2--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.1.3--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.1.4--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.1.5--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.1.6--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.1.7--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.1.8--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.1.9--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.2.0--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.2.1--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.2.2--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.2.3--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.2.4--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.2.5--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.2.6--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.2.7--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.2.8--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.3.0--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.3.1--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.3.2--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.3.3--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.3.4--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.3.5--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.3.6--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.3.7--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.3.8--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.3.9--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.3.10--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.3.11--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.4.0--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.4.1--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.4.2--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.4.3--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.4.4--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.4.5--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.4.6--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.4.7--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.4.8--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--%%PORTVERSION%%--%%PORTVERSION%%next.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--%%PORTVERSION%%next--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--unpackaged--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology.control
-%%LOADERGUI%%share/postgresql/icons/hicolor/8x8/apps/shp2pgsql-gui.png
-%%LOADERGUI%%share/postgresql/icons/hicolor/16x16/apps/shp2pgsql-gui.png
-%%LOADERGUI%%share/postgresql/icons/hicolor/22x22/apps/shp2pgsql-gui.png
-%%LOADERGUI%%share/postgresql/icons/hicolor/24x24/apps/shp2pgsql-gui.png
-%%LOADERGUI%%share/postgresql/icons/hicolor/32x32/apps/shp2pgsql-gui.png
-%%LOADERGUI%%share/postgresql/icons/hicolor/36x36/apps/shp2pgsql-gui.png
-%%LOADERGUI%%share/postgresql/icons/hicolor/40x40/apps/shp2pgsql-gui.png
-%%LOADERGUI%%share/postgresql/icons/hicolor/42x42/apps/shp2pgsql-gui.png
-%%LOADERGUI%%share/postgresql/icons/hicolor/48x48/apps/shp2pgsql-gui.png
-%%LOADERGUI%%share/postgresql/icons/hicolor/64x64/apps/shp2pgsql-gui.png
diff --git a/databases/postgis25/Makefile b/databases/postgis25/Makefile
deleted file mode 100644
index 6bbd4a7ec419..000000000000
--- a/databases/postgis25/Makefile
+++ /dev/null
@@ -1,79 +0,0 @@
-# Created by: Loïc BARTOLETTI <lbartoletti@FreeBSD.org>
-
-PORTNAME=	postgis
-PORTVERSION=	2.5.5
-PORTREVISION=	5
-CATEGORIES=	databases geography
-MASTER_SITES=	https://download.osgeo.org/postgis/source/
-PKGNAMESUFFIX=	25
-
-MAINTAINER=	lbartoletti@FreeBSD.org
-COMMENT=	Geographic objects support for PostgreSQL databases
-
-LICENSE=	GPLv2
-LICENSE_FILE=	${WRKSRC}/COPYING
-
-LIB_DEPENDS=	libproj.so:graphics/proj \
-		libgeos.so:graphics/geos \
-		libjson-c.so:devel/json-c \
-		libgdal.so:graphics/gdal
-
-USES=		alias compiler cpe gmake gnome iconv:wchar_t libtool:keepla \
-		localbase perl5 pkgconfig pgsql:9.4+ shebangfix
-USE_GNOME=	libxml2
-USE_LDCONFIG=	yes
-USE_PERL5=	build
-
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	${ICONV_CONFIGURE_BASE} NUMERICFLAGS=${PORTVERSION}
-SHEBANG_FILES=	extensions/address_standardizer/*.pl raster/test/regress/*.pl \
-		raster/test/regress/loader/*.pl regress/run_test.pl \
-		utils/postgis_restore.pl.in utils/*.pl
-WANT_PGSQL=	server
-
-OPTIONS_DEFINE=	ADDRSTD LOADERGUI NLS SFCGAL TOPOLOGY
-OPTIONS_DEFAULT=ADDRSTD SFCGAL TOPOLOGY
-OPTIONS_SUB=	yes
-
-LOADERGUI_DESC=	Enable shp2pgsql-gui
-TOPOLOGY_DESC=	Topology support
-SFCGAL_DESC=	Enable sfcgal
-ADDRSTD_DESC=	Enable address standardizer
-
-ADDRSTD_CONFIGURE_WITH=		address-standardizer
-ADDRSTD_LIB_DEPENDS=		libpcre.so:devel/pcre
-ADDRSTD_VARS=			WANT_PGSQL+=contrib
-LOADERGUI_CONFIGURE_WITH=	gui
-LOADERGUI_USE=			GNOME=gtk20
-NLS_CONFIGURE_WITH=		nls
-NLS_USES=			gettext
-SFCGAL_LIB_DEPENDS=		libSFCGAL.so:databases/sfcgal
-SFCGAL_CONFIGURE_WITH=		sfcgal=${LOCALBASE}/bin/sfcgal-config
-TOPOLOGY_CONFIGURE_WITH=	topology
-
-CONFLICTS_INSTALL=	postgis20 postgis21 postgis22 postgis23 postgis24 postgis30 postgis31
-
-VER=		${PORTVERSION:R}
-
-PLIST_SUB=	PORTVERSION=${PORTVERSION} \
-		VER=${VER}
-
-.include <bsd.port.pre.mk>
-
-.if ${CHOSEN_COMPILER_TYPE} == gcc
-post-patch:
-	${REINPLACE_CMD} -e '/^#pragma GCC diagnostic/d' \
-		${WRKSRC}/postgis/lwgeom_functions_basic.c \
-		${WRKSRC}/postgis/lwgeom_geos.c
-.endif
-
-post-install:
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/*
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/liblwgeom-${VER}.so.0.0.0
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/postgresql/*.so
-	${MKDIR} ${STAGEDIR}${DATADIR}/tiger_geocoder
-	(cd ${WRKSRC}/extras/tiger_geocoder && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/tiger_geocoder/ "! ( -name *\.orig -o -name *\.bak )" )
-	${MKDIR} ${STAGEDIR}${DATADIR}/utils
-	(cd ${WRKSRC}/utils/ && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/utils/ "! ( -name *\.orig -o -name *\.bak -o -name Makefile -o -name *\.in -o -name uninstall_script )" )
-
-.include <bsd.port.post.mk>
diff --git a/databases/postgis25/distinfo b/databases/postgis25/distinfo
deleted file mode 100644
index ce3cf55230bf..000000000000
--- a/databases/postgis25/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1598844274
-SHA256 (postgis-2.5.5.tar.gz) = 1217a0212aaa143e44831849d1845b198f248923d7e96634219d3369a6ec8714
-SIZE (postgis-2.5.5.tar.gz) = 15936193
diff --git a/databases/postgis25/pkg-descr b/databases/postgis25/pkg-descr
deleted file mode 100644
index 31c8f2a8dcd8..000000000000
--- a/databases/postgis25/pkg-descr
+++ /dev/null
@@ -1,15 +0,0 @@
-PostGIS adds support for geographic objects to the PostgreSQL
-object-relational database. In effect, PostGIS "spatially enables"
-the PostgreSQL server, allowing it to be used as a backend spatial
-database for geographic information systems (GIS), much like ESRI's
-SDE or Oracle's Spatial extension. PostGIS follows the OpenGIS
-"Simple Features Specification for SQL" and has been certified as
-compliant with the "Types and Functions" profile.
-
-PostGIS development was started by Refractions Research as a project
-in open source spatial database technology. PostGIS is released
-under the GNU General Public License. PostGIS continues to be
-developed by a group of contributors led by a Project Steering
-Committee and new features continue to be added.
-
-WWW: https://postgis.net/
diff --git a/databases/postgis25/pkg-plist b/databases/postgis25/pkg-plist
deleted file mode 100644
index ab03d896a86c..000000000000
--- a/databases/postgis25/pkg-plist
+++ /dev/null
@@ -1,437 +0,0 @@
-bin/pgsql2shp
-bin/raster2pgsql
-bin/shp2pgsql
-%%LOADERGUI%%bin/shp2pgsql-gui
-include/liblwgeom.h
-include/liblwgeom_topo.h
-lib/liblwgeom-%%VER%%.so.0
-lib/liblwgeom-%%VER%%.so.0.0.0
-lib/liblwgeom.a
-lib/liblwgeom.la
-lib/liblwgeom.so
-%%ADDRSTD%%lib/postgresql/address_standardizer.so
-lib/postgresql/postgis-%%VER%%.so
-%%TOPOLOGY%%lib/postgresql/postgis_topology-%%VER%%.so
-lib/postgresql/rtpostgis-%%VER%%.so
-%%ADDRSTD%%share/doc/postgresql/extension/README.address_standardizer
-%%DATADIR%%/tiger_geocoder/COPYING
-%%DATADIR%%/tiger_geocoder/README
-%%DATADIR%%/tiger_geocoder/create_geocode.bat
-%%DATADIR%%/tiger_geocoder/create_geocode.sh
-%%DATADIR%%/tiger_geocoder/create_geocode.sql
-%%DATADIR%%/tiger_geocoder/geocode/census_tracts_functions.sql
-%%DATADIR%%/tiger_geocoder/geocode/geocode.sql
-%%DATADIR%%/tiger_geocoder/geocode/geocode_address.sql
-%%DATADIR%%/tiger_geocoder/geocode/geocode_intersection.sql
-%%DATADIR%%/tiger_geocoder/geocode/geocode_location.sql
-%%DATADIR%%/tiger_geocoder/geocode/includes_address.sql
-%%DATADIR%%/tiger_geocoder/geocode/interpolate_from_address.sql
-%%DATADIR%%/tiger_geocoder/geocode/other_helper_functions.sql
-%%DATADIR%%/tiger_geocoder/geocode/rate_attributes.sql
-%%DATADIR%%/tiger_geocoder/geocode/reverse_geocode.sql
-%%DATADIR%%/tiger_geocoder/geocode_settings.sql
-%%DATADIR%%/tiger_geocoder/legacy_import/tiger2008/import_tiger_shps.sh
-%%DATADIR%%/tiger_geocoder/normalize/count_words.sql
-%%DATADIR%%/tiger_geocoder/normalize/end_soundex.sql
-%%DATADIR%%/tiger_geocoder/normalize/get_last_words.sql
-%%DATADIR%%/tiger_geocoder/normalize/location_extract.sql
-%%DATADIR%%/tiger_geocoder/normalize/location_extract_countysub_exact.sql
-%%DATADIR%%/tiger_geocoder/normalize/location_extract_countysub_fuzzy.sql
-%%DATADIR%%/tiger_geocoder/normalize/location_extract_place_exact.sql
-%%DATADIR%%/tiger_geocoder/normalize/location_extract_place_fuzzy.sql
-%%DATADIR%%/tiger_geocoder/normalize/normalize_address.sql
-%%DATADIR%%/tiger_geocoder/normalize/pprint_addy.sql
-%%DATADIR%%/tiger_geocoder/normalize/state_extract.sql
-%%DATADIR%%/tiger_geocoder/pagc_normalize/pagc_normalize_address.sql
-%%DATADIR%%/tiger_geocoder/pagc_normalize/pagc_tables.sql
-%%DATADIR%%/tiger_geocoder/regress/geocode_regress
-%%DATADIR%%/tiger_geocoder/regress/geocode_regress.sql
-%%DATADIR%%/tiger_geocoder/regress/normalize_address_desired_regress
-%%DATADIR%%/tiger_geocoder/regress/normalize_address_regress
-%%DATADIR%%/tiger_geocoder/regress/normalize_address_regress.sql
-%%DATADIR%%/tiger_geocoder/regress/pagc_normalize_address_desired_regress
-%%DATADIR%%/tiger_geocoder/regress/pagc_normalize_address_regress
-%%DATADIR%%/tiger_geocoder/regress/pagc_normalize_address_regress.sql
-%%DATADIR%%/tiger_geocoder/regress/regress.sql
-%%DATADIR%%/tiger_geocoder/regress/reverse_geocode_regress
-%%DATADIR%%/tiger_geocoder/regress/reverse_geocode_regress.sql
-%%DATADIR%%/tiger_geocoder/tables/lookup_tables_2011.sql
-%%DATADIR%%/tiger_geocoder/tiger_loader_2011.sql
-%%DATADIR%%/tiger_geocoder/tiger_loader_2012.sql
-%%DATADIR%%/tiger_geocoder/tiger_loader_2013.sql
-%%DATADIR%%/tiger_geocoder/tiger_loader_2014.sql
-%%DATADIR%%/tiger_geocoder/tiger_loader_2015.sql
-%%DATADIR%%/tiger_geocoder/tiger_loader_2016.sql
-%%DATADIR%%/tiger_geocoder/tiger_loader_2017.sql
-%%DATADIR%%/tiger_geocoder/topology/README
-%%DATADIR%%/tiger_geocoder/topology/tiger_topology_loader.sql
-%%DATADIR%%/tiger_geocoder/upgrade_geocode.sql
-%%DATADIR%%/tiger_geocoder/upgrade_geocoder.bat
-%%DATADIR%%/tiger_geocoder/upgrade_geocoder.sh
-%%DATADIR%%/tiger_geocoder/utility/cull_null.sql
-%%DATADIR%%/tiger_geocoder/utility/levenshtein_ignore_case.sql
-%%DATADIR%%/tiger_geocoder/utility/nullable_levenshtein.sql
-%%DATADIR%%/tiger_geocoder/utility/set_search_path.sql
-%%DATADIR%%/tiger_geocoder/utility/standardize_tiger_data.sql
-%%DATADIR%%/tiger_geocoder/utility/utmzone.sql
-%%DATADIR%%/utils/README
-%%DATADIR%%/utils/check_all_upgrades.sh
-%%DATADIR%%/utils/create_spatial_ref_sys_config_dump.pl
-%%DATADIR%%/utils/create_undef.pl
-%%DATADIR%%/utils/create_unpackaged.pl
-%%DATADIR%%/utils/postgis_proc_set_search_path.pl
-%%DATADIR%%/utils/postgis_proc_upgrade.pl
-%%DATADIR%%/utils/postgis_restore.pl
-%%DATADIR%%/utils/profile_intersects.pl
-%%DATADIR%%/utils/read_scripts_version.pl
-%%DATADIR%%/utils/svn_repo_revision.pl
-%%DATADIR%%/utils/test_estimation.pl
-%%DATADIR%%/utils/test_geography_estimation.pl
-%%DATADIR%%/utils/test_geography_joinestimation.pl
-%%DATADIR%%/utils/test_joinestimation.pl
-%%LOADERGUI%%share/postgresql/applications/shp2pgsql-gui.desktop
-share/postgresql/contrib/postgis-%%VER%%/legacy.sql
-share/postgresql/contrib/postgis-%%VER%%/legacy_gist.sql
-share/postgresql/contrib/postgis-%%VER%%/legacy_minimal.sql
-share/postgresql/contrib/postgis-%%VER%%/postgis.sql
-share/postgresql/contrib/postgis-%%VER%%/postgis_comments.sql
-share/postgresql/contrib/postgis-%%VER%%/postgis_for_extension.sql
-share/postgresql/contrib/postgis-%%VER%%/postgis_proc_set_search_path.sql
-share/postgresql/contrib/postgis-%%VER%%/postgis_restore.pl
-share/postgresql/contrib/postgis-%%VER%%/postgis_upgrade.sql
-share/postgresql/contrib/postgis-%%VER%%/postgis_upgrade_for_extension.sql
-share/postgresql/contrib/postgis-%%VER%%/raster_comments.sql
-share/postgresql/contrib/postgis-%%VER%%/rtpostgis.sql
-share/postgresql/contrib/postgis-%%VER%%/rtpostgis_for_extension.sql
-share/postgresql/contrib/postgis-%%VER%%/rtpostgis_legacy.sql
-share/postgresql/contrib/postgis-%%VER%%/rtpostgis_proc_set_search_path.sql
-share/postgresql/contrib/postgis-%%VER%%/rtpostgis_upgrade.sql
-share/postgresql/contrib/postgis-%%VER%%/rtpostgis_upgrade_for_extension.sql
-%%SFCGAL%%share/postgresql/contrib/postgis-%%VER%%/sfcgal.sql
-%%SFCGAL%%share/postgresql/contrib/postgis-%%VER%%/sfcgal_comments.sql
-%%SFCGAL%%share/postgresql/contrib/postgis-%%VER%%/sfcgal_upgrade.sql
-share/postgresql/contrib/postgis-%%VER%%/spatial_ref_sys.sql
-%%TOPOLOGY%%share/postgresql/contrib/postgis-%%VER%%/topology.sql
-%%TOPOLOGY%%share/postgresql/contrib/postgis-%%VER%%/topology_comments.sql
-%%TOPOLOGY%%share/postgresql/contrib/postgis-%%VER%%/topology_upgrade.sql
-share/postgresql/contrib/postgis-%%VER%%/uninstall_legacy.sql
-share/postgresql/contrib/postgis-%%VER%%/uninstall_postgis.sql
-share/postgresql/contrib/postgis-%%VER%%/uninstall_rtpostgis.sql
-%%SFCGAL%%share/postgresql/contrib/postgis-%%VER%%/uninstall_sfcgal.sql
-%%TOPOLOGY%%share/postgresql/contrib/postgis-%%VER%%/uninstall_topology.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--1.0--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.0.0--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.0.1--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.0.2--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.0.3--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.0.4--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.0.5--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.0.6--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.0.7--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.1.0--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.1.1--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.1.2--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.1.3--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.1.4--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.1.5--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.1.6--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.1.7--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.1.8--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.1.9--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.2.0--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.2.1--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.2.2--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.2.3--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.2.4--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.2.5--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.2.6--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.2.7--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.2.8--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.3.0--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.3.1--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.3.2--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.3.3--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.3.4--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.3.5--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.3.6--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.3.7--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.3.8--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.3.9--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.3.10--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.3.11--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.4.0--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.4.1--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.4.2--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.4.3--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.4.4--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.4.5--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.4.6--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.4.7--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.4.8--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.4.9--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.5.0--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.5.1--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.5.2--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.5.3--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.5.4--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--ANY--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--%%PORTVERSION%%--%%PORTVERSION%%next.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--%%PORTVERSION%%next--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer.control
-%%ADDRSTD%%share/postgresql/extension/address_standardizer.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--%%PORTVERSION%%--%%PORTVERSION%%next.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--%%PORTVERSION%%next--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us.control
-%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us.sql
-share/postgresql/extension/postgis--2.0.0--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--2.0.1--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--2.0.2--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--2.0.3--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--2.0.4--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--2.0.5--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--2.0.6--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--2.0.7--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--2.1.0--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--2.1.1--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--2.1.2--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--2.1.3--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--2.1.4--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--2.1.5--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--2.1.6--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--2.1.7--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--2.1.8--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--2.1.9--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--2.2.0--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--2.2.1--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--2.2.2--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--2.2.3--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--2.2.4--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--2.2.5--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--2.2.6--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--2.2.7--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--2.2.8--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--2.3.0--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--2.3.1--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--2.3.2--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--2.3.3--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--2.3.4--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--2.3.5--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--2.3.6--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--2.3.7--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--2.3.8--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--2.3.9--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--2.3.10--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--2.3.11--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--2.4.0--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--2.4.1--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--2.4.2--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--2.4.3--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--2.4.4--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--2.4.5--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--2.4.6--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--2.4.7--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--2.4.8--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--2.4.9--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--2.5.0--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--2.5.1--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--2.5.2--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--2.5.3--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--2.5.4--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--%%PORTVERSION%%--%%PORTVERSION%%next.sql
-share/postgresql/extension/postgis--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--%%PORTVERSION%%next--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--ANY--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--unpackaged--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis.control
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.0.0--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.0.1--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.0.2--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.0.3--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.0.4--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.0.5--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.0.6--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.0.7--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.1.0--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.1.1--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.1.2--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.1.3--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.1.4--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.1.5--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.1.6--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.1.7--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.1.8--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.1.9--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.2.0--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.2.1--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.2.2--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.2.3--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.2.4--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.2.5--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.2.6--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.2.7--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.2.8--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.3.0--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.3.1--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.3.2--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.3.3--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.3.4--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.3.5--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.3.6--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.3.7--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.3.8--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.3.9--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.3.10--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.3.11--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.4.0--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.4.1--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.4.2--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.4.3--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.4.4--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.4.5--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.4.6--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.4.7--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.4.8--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.4.9--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.5.0--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.5.1--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.5.2--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.5.3--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.5.4--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--%%PORTVERSION%%--%%PORTVERSION%%next.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--%%PORTVERSION%%next--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--ANY--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--unpackaged--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal.control
-share/postgresql/extension/postgis_tiger_geocoder--2.0.0--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--2.0.1--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--2.0.2--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--2.0.3--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--2.0.4--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--2.0.5--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--2.0.6--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--2.0.7--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--2.1.0--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--2.1.1--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--2.1.2--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--2.1.3--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--2.1.4--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--2.1.5--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--2.1.6--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--2.1.7--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--2.1.8--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--2.1.9--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--2.2.0--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--2.2.1--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--2.2.2--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--2.2.3--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--2.2.4--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--2.2.5--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--2.2.6--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--2.2.7--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--2.2.8--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--2.3.0--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--2.3.1--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--2.3.2--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--2.3.3--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--2.3.4--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--2.3.5--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--2.3.6--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--2.3.7--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--2.3.8--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--2.3.9--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--2.3.10--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--2.3.11--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--2.4.0--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--2.4.1--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--2.4.2--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--2.4.3--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--2.4.4--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--2.4.5--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--2.4.6--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--2.4.7--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--2.4.8--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--2.4.9--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--2.5.0--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--2.5.1--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--2.5.2--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--2.5.3--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--2.5.4--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--%%PORTVERSION%%--%%PORTVERSION%%next.sql
-share/postgresql/extension/postgis_tiger_geocoder--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--%%PORTVERSION%%next--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--ANY--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--unpackaged--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder.control
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.0.0--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.0.1--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.0.2--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.0.3--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.0.4--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.0.5--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.0.6--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.0.7--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.1.0--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.1.1--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.1.2--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.1.3--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.1.4--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.1.5--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.1.6--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.1.7--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.1.8--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.1.9--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.2.0--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.2.1--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.2.2--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.2.3--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.2.4--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.2.5--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.2.6--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.2.7--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.2.8--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.3.0--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.3.1--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.3.2--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.3.3--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.3.4--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.3.5--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.3.6--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.3.7--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.3.8--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.3.9--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.3.10--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.3.11--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.4.0--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.4.1--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.4.2--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.4.3--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.4.4--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.4.5--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.4.6--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.4.7--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.4.8--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.4.9--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.5.0--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.5.1--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.5.2--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.5.3--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.5.4--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--%%PORTVERSION%%--%%PORTVERSION%%next.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--%%PORTVERSION%%next--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--ANY--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--unpackaged--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology.control
-%%LOADERGUI%%share/postgresql/icons/hicolor/8x8/apps/shp2pgsql-gui.png
-%%LOADERGUI%%share/postgresql/icons/hicolor/16x16/apps/shp2pgsql-gui.png
-%%LOADERGUI%%share/postgresql/icons/hicolor/22x22/apps/shp2pgsql-gui.png
-%%LOADERGUI%%share/postgresql/icons/hicolor/24x24/apps/shp2pgsql-gui.png
-%%LOADERGUI%%share/postgresql/icons/hicolor/32x32/apps/shp2pgsql-gui.png
-%%LOADERGUI%%share/postgresql/icons/hicolor/36x36/apps/shp2pgsql-gui.png
-%%LOADERGUI%%share/postgresql/icons/hicolor/40x40/apps/shp2pgsql-gui.png
-%%LOADERGUI%%share/postgresql/icons/hicolor/42x42/apps/shp2pgsql-gui.png
-%%LOADERGUI%%share/postgresql/icons/hicolor/48x48/apps/shp2pgsql-gui.png
-%%LOADERGUI%%share/postgresql/icons/hicolor/64x64/apps/shp2pgsql-gui.png
diff --git a/databases/postgis30/Makefile b/databases/postgis30/Makefile
deleted file mode 100644
index dc7ee4711311..000000000000
--- a/databases/postgis30/Makefile
+++ /dev/null
@@ -1,86 +0,0 @@
-# Created by: Loïc BARTOLETTI <lbartoletti@FreeBSD.org>
-
-PORTNAME=	postgis
-PORTVERSION=	3.0.4
-PORTREVISION=	1
-CATEGORIES=	databases geography
-MASTER_SITES=	https://download.osgeo.org/postgis/source/
-PKGNAMESUFFIX=	30
-
-MAINTAINER=	lbartoletti@FreeBSD.org
-COMMENT=	Geographic objects support for PostgreSQL databases
-
-LICENSE=	GPLv2
-LICENSE_FILE=	${WRKSRC}/COPYING
-
-LIB_DEPENDS=	libproj.so:graphics/proj \
-		libgeos.so:graphics/geos \
-		libjson-c.so:devel/json-c \
-		libgdal.so:graphics/gdal
-
-USES=		alias compiler:c++11-lang cpe gmake gnome iconv:wchar_t libtool:keepla \
-		localbase perl5 pkgconfig pgsql:9.5+ shebangfix
-USE_GNOME=	libxml2
-USE_PERL5=	build
-
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	${ICONV_CONFIGURE_BASE} NUMERICFLAGS=${PORTVERSION}
-SHEBANG_FILES=	extensions/address_standardizer/*.pl raster/test/regress/*.pl \
-		raster/test/regress/loader/*.pl regress/run_test.pl \
-		utils/postgis_restore.pl.in utils/*.pl
-WANT_PGSQL=	server
-
-OPTIONS_DEFINE=	ADDRSTD JSON LOADERGUI NLS PROTOBUF RASTER SFCGAL TOPOLOGY WAGYU
-OPTIONS_DEFAULT=ADDRSTD JSON NLS PROTOBUF RASTER SFCGAL TOPOLOGY WAGYU
-OPTIONS_SUB=	yes
-
-ADDRSTD_DESC=	Enable address standardizer
-JSON_DESC=	Enable JSON support
-LOADERGUI_DESC=	Enable shp2pgsql-gui
-PROTOBUF_DESC=	Enable protocol buffers
-RASTER_DESC=	Enable raster support
-SFCGAL_DESC=	Enable sfcgal
-TOPOLOGY_DESC=	Topology support
-WAGYU_DESC=	Enable WAGYU support
-
-ADDRSTD_CONFIGURE_WITH=		address-standardizer
-ADDRSTD_LIB_DEPENDS=		libpcre.so:devel/pcre
-ADDRSTD_VARS=			WANT_PGSQL+=contrib
-JSON_CONFIGURE_WITH=		json
-JSON_LIB_DEPENDS=		libjson-c.so:devel/json-c
-LOADERGUI_CONFIGURE_WITH=	gui
-LOADERGUI_USE=			GNOME=gtk20
-NLS_CONFIGURE_WITH=		nls
-NLS_USES=			gettext
-PROTOBUF_CONFIGURE_WITH=	protobuf
-PROTOBUF_LIB_DEPENDS=		libprotobuf-c.so:devel/protobuf-c
-SFCGAL_CONFIGURE_WITH=		sfcgal=${LOCALBASE}/bin/sfcgal-config
-SFCGAL_LIB_DEPENDS=		libSFCGAL.so:databases/sfcgal
-TOPOLOGY_CONFIGURE_WITH=	topology
-WAGYU_CONFIGURE_WITH=		wagyu
-
-CONFLICTS_INSTALL=	postgis20 postgis21 postgis22 postgis23 postgis24 postgis25 postgis31
-
-VER=		${PORTVERSION:R}
-
-PLIST_SUB=	PORTVERSION=${PORTVERSION} \
-		VER=${VER}
-
-.include <bsd.port.pre.mk>
-
-.if ${CHOSEN_COMPILER_TYPE} == gcc
-post-patch:
-	${REINPLACE_CMD} -e '/^#pragma GCC diagnostic/d' \
-		${WRKSRC}/postgis/lwgeom_functions_basic.c \
-		${WRKSRC}/postgis/lwgeom_geos.c
-.endif
-
-post-install:
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/*
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/postgresql/*.so
-	${MKDIR} ${STAGEDIR}${DATADIR}/tiger_geocoder
-	(cd ${WRKSRC}/extras/tiger_geocoder && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/tiger_geocoder/ "! ( -name *\.orig -o -name *\.bak )" )
-	${MKDIR} ${STAGEDIR}${DATADIR}/utils
-	(cd ${WRKSRC}/utils/ && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/utils/ "! ( -name *\.orig -o -name *\.bak -o -name Makefile -o -name *\.in -o -name uninstall_script )" )
-
-.include <bsd.port.post.mk>
diff --git a/databases/postgis30/distinfo b/databases/postgis30/distinfo
deleted file mode 100644
index cbbf69f88261..000000000000
--- a/databases/postgis30/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1630909642
-SHA256 (postgis-3.0.4.tar.gz) = aff0483929ef86333de3c2e65bc2716c98a5676a2b079dcc54557739996544b7
-SIZE (postgis-3.0.4.tar.gz) = 16871782
diff --git a/databases/postgis30/pkg-descr b/databases/postgis30/pkg-descr
deleted file mode 100644
index 31c8f2a8dcd8..000000000000
--- a/databases/postgis30/pkg-descr
+++ /dev/null
@@ -1,15 +0,0 @@
-PostGIS adds support for geographic objects to the PostgreSQL
-object-relational database. In effect, PostGIS "spatially enables"
-the PostgreSQL server, allowing it to be used as a backend spatial
-database for geographic information systems (GIS), much like ESRI's
-SDE or Oracle's Spatial extension. PostGIS follows the OpenGIS
-"Simple Features Specification for SQL" and has been certified as
-compliant with the "Types and Functions" profile.
-
-PostGIS development was started by Refractions Research as a project
-in open source spatial database technology. PostGIS is released
-under the GNU General Public License. PostGIS continues to be
-developed by a group of contributors led by a Project Steering
-Committee and new features continue to be added.
-
-WWW: https://postgis.net/
diff --git a/databases/postgis30/pkg-plist b/databases/postgis30/pkg-plist
deleted file mode 100644
index da81e9ded9f3..000000000000
--- a/databases/postgis30/pkg-plist
+++ /dev/null
@@ -1,520 +0,0 @@
-%%LOADERGUI%%bin/pgsql2shp
-%%RASTER%%bin/raster2pgsql
-%%LOADERGUI%%bin/shp2pgsql
-%%LOADERGUI%%bin/shp2pgsql-gui
-%%ADDRSTD%%lib/postgresql/address_standardizer-3.so
-lib/postgresql/postgis-3.so
-%%RASTER%%lib/postgresql/postgis_raster-3.so
-%%TOPOLOGY%%lib/postgresql/postgis_topology-3.so
-%%ADDRSTD%%share/doc/postgresql/extension/README.address_standardizer
-%%DATADIR%%/tiger_geocoder/COPYING
-%%DATADIR%%/tiger_geocoder/README
-%%DATADIR%%/tiger_geocoder/create_geocode.bat
-%%DATADIR%%/tiger_geocoder/create_geocode.sh
-%%DATADIR%%/tiger_geocoder/create_geocode.sql
-%%DATADIR%%/tiger_geocoder/geocode/census_tracts_functions.sql
-%%DATADIR%%/tiger_geocoder/geocode/geocode.sql
-%%DATADIR%%/tiger_geocoder/geocode/geocode_address.sql
-%%DATADIR%%/tiger_geocoder/geocode/geocode_intersection.sql
-%%DATADIR%%/tiger_geocoder/geocode/geocode_location.sql
-%%DATADIR%%/tiger_geocoder/geocode/includes_address.sql
-%%DATADIR%%/tiger_geocoder/geocode/interpolate_from_address.sql
-%%DATADIR%%/tiger_geocoder/geocode/other_helper_functions.sql
-%%DATADIR%%/tiger_geocoder/geocode/rate_attributes.sql
-%%DATADIR%%/tiger_geocoder/geocode/reverse_geocode.sql
-%%DATADIR%%/tiger_geocoder/geocode_settings.sql
-%%DATADIR%%/tiger_geocoder/legacy_import/tiger2008/import_tiger_shps.sh
-%%DATADIR%%/tiger_geocoder/normalize/count_words.sql
-%%DATADIR%%/tiger_geocoder/normalize/end_soundex.sql
-%%DATADIR%%/tiger_geocoder/normalize/get_last_words.sql
-%%DATADIR%%/tiger_geocoder/normalize/location_extract.sql
-%%DATADIR%%/tiger_geocoder/normalize/location_extract_countysub_exact.sql
-%%DATADIR%%/tiger_geocoder/normalize/location_extract_countysub_fuzzy.sql
-%%DATADIR%%/tiger_geocoder/normalize/location_extract_place_exact.sql
-%%DATADIR%%/tiger_geocoder/normalize/location_extract_place_fuzzy.sql
-%%DATADIR%%/tiger_geocoder/normalize/normalize_address.sql
-%%DATADIR%%/tiger_geocoder/normalize/pprint_addy.sql
-%%DATADIR%%/tiger_geocoder/normalize/state_extract.sql
-%%DATADIR%%/tiger_geocoder/pagc_normalize/pagc_normalize_address.sql
-%%DATADIR%%/tiger_geocoder/pagc_normalize/pagc_tables.sql
-%%DATADIR%%/tiger_geocoder/regress/geocode_regress
-%%DATADIR%%/tiger_geocoder/regress/geocode_regress.sql
-%%DATADIR%%/tiger_geocoder/regress/normalize_address_desired_regress
-%%DATADIR%%/tiger_geocoder/regress/normalize_address_regress
-%%DATADIR%%/tiger_geocoder/regress/normalize_address_regress.sql
-%%DATADIR%%/tiger_geocoder/regress/pagc_normalize_address_desired_regress
-%%DATADIR%%/tiger_geocoder/regress/pagc_normalize_address_regress
-%%DATADIR%%/tiger_geocoder/regress/pagc_normalize_address_regress.sql
-%%DATADIR%%/tiger_geocoder/regress/regress.sql
-%%DATADIR%%/tiger_geocoder/regress/reverse_geocode_regress
-%%DATADIR%%/tiger_geocoder/regress/reverse_geocode_regress.sql
-%%DATADIR%%/tiger_geocoder/tables/lookup_tables_2011.sql
-%%DATADIR%%/tiger_geocoder/tiger_loader_2011.sql
-%%DATADIR%%/tiger_geocoder/tiger_loader_2012.sql
-%%DATADIR%%/tiger_geocoder/tiger_loader_2013.sql
-%%DATADIR%%/tiger_geocoder/tiger_loader_2014.sql
-%%DATADIR%%/tiger_geocoder/tiger_loader_2015.sql
-%%DATADIR%%/tiger_geocoder/tiger_loader_2016.sql
-%%DATADIR%%/tiger_geocoder/tiger_loader_2017.sql
-%%DATADIR%%/tiger_geocoder/tiger_loader_2018.sql
-%%DATADIR%%/tiger_geocoder/tiger_loader_2019.sql
-%%TOPOLOGY%%%%DATADIR%%/tiger_geocoder/topology/README
-%%TOPOLOGY%%%%DATADIR%%/tiger_geocoder/topology/tiger_topology_loader.sql
-%%DATADIR%%/tiger_geocoder/upgrade_geocode.sql
-%%DATADIR%%/tiger_geocoder/upgrade_geocoder.bat
-%%DATADIR%%/tiger_geocoder/upgrade_geocoder.sh
-%%DATADIR%%/tiger_geocoder/utility/cull_null.sql
-%%DATADIR%%/tiger_geocoder/utility/levenshtein_ignore_case.sql
-%%DATADIR%%/tiger_geocoder/utility/nullable_levenshtein.sql
-%%DATADIR%%/tiger_geocoder/utility/set_search_path.sql
-%%DATADIR%%/tiger_geocoder/utility/standardize_tiger_data.sql
-%%DATADIR%%/tiger_geocoder/utility/utmzone.sql
-%%DATADIR%%/utils/README
-%%DATADIR%%/utils/check_all_upgrades.sh
-%%DATADIR%%/utils/check_news.sh
-%%DATADIR%%/utils/create_extension_unpackage.pl
-%%DATADIR%%/utils/create_spatial_ref_sys_config_dump.pl
-%%DATADIR%%/utils/create_undef.pl
-%%DATADIR%%/utils/create_unpackaged.pl
-%%DATADIR%%/utils/postgis_proc_set_search_path.pl
-%%DATADIR%%/utils/postgis_proc_upgrade.pl
-%%DATADIR%%/utils/postgis_restore.pl
-%%DATADIR%%/utils/profile_intersects.pl
-%%DATADIR%%/utils/read_scripts_version.pl
-%%DATADIR%%/utils/repo_revision.pl
-%%DATADIR%%/utils/test_estimation.pl
-%%DATADIR%%/utils/test_geography_estimation.pl
-%%DATADIR%%/utils/test_geography_joinestimation.pl
-%%DATADIR%%/utils/test_joinestimation.pl
-%%LOADERGUI%%share/postgresql/applications/shp2pgsql-gui.desktop
-share/postgresql/contrib/postgis-%%VER%%/legacy.sql
-share/postgresql/contrib/postgis-%%VER%%/legacy_gist.sql
-share/postgresql/contrib/postgis-%%VER%%/legacy_minimal.sql
-share/postgresql/contrib/postgis-%%VER%%/postgis.sql
-share/postgresql/contrib/postgis-%%VER%%/postgis_comments.sql
-share/postgresql/contrib/postgis-%%VER%%/postgis_proc_set_search_path.sql
-share/postgresql/contrib/postgis-%%VER%%/postgis_restore.pl
-share/postgresql/contrib/postgis-%%VER%%/postgis_upgrade.sql
-%%RASTER%%share/postgresql/contrib/postgis-%%VER%%/raster_comments.sql
-share/postgresql/contrib/postgis-%%VER%%/rtpostgis.sql
-share/postgresql/contrib/postgis-%%VER%%/rtpostgis_legacy.sql
-share/postgresql/contrib/postgis-%%VER%%/rtpostgis_proc_set_search_path.sql
-share/postgresql/contrib/postgis-%%VER%%/rtpostgis_upgrade.sql
-%%SFCGAL%%share/postgresql/contrib/postgis-%%VER%%/sfcgal.sql
-%%SFCGAL%%share/postgresql/contrib/postgis-%%VER%%/sfcgal_comments.sql
-%%SFCGAL%%share/postgresql/contrib/postgis-%%VER%%/sfcgal_upgrade.sql
-share/postgresql/contrib/postgis-%%VER%%/spatial_ref_sys.sql
-%%TOPOLOGY%%share/postgresql/contrib/postgis-%%VER%%/topology.sql
-%%TOPOLOGY%%share/postgresql/contrib/postgis-%%VER%%/topology_comments.sql
-%%TOPOLOGY%%share/postgresql/contrib/postgis-%%VER%%/topology_upgrade.sql
-share/postgresql/contrib/postgis-%%VER%%/uninstall_legacy.sql
-share/postgresql/contrib/postgis-%%VER%%/uninstall_postgis.sql
-share/postgresql/contrib/postgis-%%VER%%/uninstall_rtpostgis.sql
-%%SFCGAL%%share/postgresql/contrib/postgis-%%VER%%/uninstall_sfcgal.sql
-%%TOPOLOGY%%share/postgresql/contrib/postgis-%%VER%%/uninstall_topology.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--1.0--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.0.0--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.0.1--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.0.2--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.0.3--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.0.4--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.0.5--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.0.6--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.0.7--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.1.0--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.1.1--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.1.2--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.1.3--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.1.4--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.1.5--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.1.6--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.1.7--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.1.8--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.1.9--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.2.0--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.2.1--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.2.2--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.2.3--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.2.4--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.2.5--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.2.6--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.2.7--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.2.8--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.3.0--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.3.1--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.3.2--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.3.3--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.3.4--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.3.5--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.3.6--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.3.7--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.3.8--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.3.9--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.3.10--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.3.11--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.4.0--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.4.1--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.4.2--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.4.3--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.4.4--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.4.5--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.4.6--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.4.7--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.4.8--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.4.9--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.5.0--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.5.1--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.5.2--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.5.3--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.5.4--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.5.5--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--3.0.0--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--3.0.1--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--3.0.2--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--3.0.3--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--%%PORTVERSION%%--%%PORTVERSION%%next.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--%%PORTVERSION%%next--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer--ANY--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer.control
-%%ADDRSTD%%share/postgresql/extension/address_standardizer.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--%%PORTVERSION%%--%%PORTVERSION%%next.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--%%PORTVERSION%%next--%%PORTVERSION%%.sql
-%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us.control
-%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us.sql
-share/postgresql/extension/postgis--2.0.0--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--2.0.1--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--2.0.2--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--2.0.3--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--2.0.4--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--2.0.5--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--2.0.6--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--2.0.7--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--2.1.0--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--2.1.1--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--2.1.2--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--2.1.3--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--2.1.4--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--2.1.5--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--2.1.6--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--2.1.7--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--2.1.8--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--2.1.9--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--2.2.0--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--2.2.1--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--2.2.2--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--2.2.3--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--2.2.4--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--2.2.5--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--2.2.6--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--2.2.7--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--2.2.8--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--2.3.0--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--2.3.1--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--2.3.2--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--2.3.3--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--2.3.4--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--2.3.5--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--2.3.6--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--2.3.7--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--2.3.8--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--2.3.9--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--2.3.10--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--2.3.11--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--2.4.0--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--2.4.1--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--2.4.2--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--2.4.3--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--2.4.4--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--2.4.5--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--2.4.6--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--2.4.7--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--2.4.8--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--2.4.9--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--2.5.0--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--2.5.1--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--2.5.2--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--2.5.3--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--2.5.4--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--2.5.5--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--3.0.0--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--3.0.1--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--3.0.2--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--3.0.3--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--%%PORTVERSION%%--%%PORTVERSION%%next.sql
-share/postgresql/extension/postgis--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--%%PORTVERSION%%next--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--ANY--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis--unpackaged--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis.control
-%%RASTER%%share/postgresql/extension/postgis_raster--2.0.0--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis_raster--2.0.1--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis_raster--2.0.2--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis_raster--2.0.3--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis_raster--2.0.4--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis_raster--2.0.5--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis_raster--2.0.6--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis_raster--2.0.7--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis_raster--2.1.0--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis_raster--2.1.1--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis_raster--2.1.2--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis_raster--2.1.3--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis_raster--2.1.4--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis_raster--2.1.5--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis_raster--2.1.6--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis_raster--2.1.7--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis_raster--2.1.8--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis_raster--2.1.9--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis_raster--2.2.0--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis_raster--2.2.1--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis_raster--2.2.2--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis_raster--2.2.3--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis_raster--2.2.4--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis_raster--2.2.5--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis_raster--2.2.6--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis_raster--2.2.7--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis_raster--2.2.8--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis_raster--2.3.0--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis_raster--2.3.1--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis_raster--2.3.2--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis_raster--2.3.3--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis_raster--2.3.4--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis_raster--2.3.5--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis_raster--2.3.6--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis_raster--2.3.7--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis_raster--2.3.8--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis_raster--2.3.9--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis_raster--2.3.10--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis_raster--2.3.11--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis_raster--2.4.0--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis_raster--2.4.1--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis_raster--2.4.2--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis_raster--2.4.3--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis_raster--2.4.4--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis_raster--2.4.5--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis_raster--2.4.6--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis_raster--2.4.7--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis_raster--2.4.8--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis_raster--2.4.9--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis_raster--2.5.0--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis_raster--2.5.1--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis_raster--2.5.2--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis_raster--2.5.3--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis_raster--2.5.4--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis_raster--2.5.5--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis_raster--3.0.0--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis_raster--3.0.1--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis_raster--3.0.2--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis_raster--3.0.3--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis_raster--%%PORTVERSION%%--%%PORTVERSION%%next.sql
-%%RASTER%%share/postgresql/extension/postgis_raster--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis_raster--%%PORTVERSION%%next--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis_raster--ANY--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis_raster--unpackaged--%%PORTVERSION%%.sql
-%%RASTER%%share/postgresql/extension/postgis_raster.control
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.0.0--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.0.1--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.0.2--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.0.3--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.0.4--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.0.5--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.0.6--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.0.7--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.1.0--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.1.1--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.1.2--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.1.3--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.1.4--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.1.5--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.1.6--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.1.7--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.1.8--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.1.9--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.2.0--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.2.1--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.2.2--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.2.3--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.2.4--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.2.5--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.2.6--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.2.7--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.2.8--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.3.0--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.3.1--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.3.2--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.3.3--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.3.4--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.3.5--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.3.6--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.3.7--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.3.8--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.3.9--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.3.10--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.3.11--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.4.0--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.4.1--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.4.2--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.4.3--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.4.4--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.4.5--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.4.6--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.4.7--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.4.8--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.4.9--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.5.0--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.5.1--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.5.2--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.5.3--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.5.4--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.5.5--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--3.0.0--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--3.0.1--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--3.0.2--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--3.0.3--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--%%PORTVERSION%%--%%PORTVERSION%%next.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--%%PORTVERSION%%next--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--ANY--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--unpackaged--%%PORTVERSION%%.sql
-%%SFCGAL%%share/postgresql/extension/postgis_sfcgal.control
-share/postgresql/extension/postgis_tiger_geocoder--2.0.0--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--2.0.1--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--2.0.2--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--2.0.3--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--2.0.4--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--2.0.5--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--2.0.6--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--2.0.7--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--2.1.0--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--2.1.1--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--2.1.2--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--2.1.3--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--2.1.4--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--2.1.5--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--2.1.6--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--2.1.7--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--2.1.8--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--2.1.9--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--2.2.0--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--2.2.1--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--2.2.2--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--2.2.3--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--2.2.4--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--2.2.5--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--2.2.6--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--2.2.7--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--2.2.8--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--2.3.0--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--2.3.1--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--2.3.2--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--2.3.3--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--2.3.4--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--2.3.5--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--2.3.6--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--2.3.7--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--2.3.8--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--2.3.9--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--2.3.10--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--2.3.11--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--2.4.0--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--2.4.1--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--2.4.2--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--2.4.3--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--2.4.4--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--2.4.5--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--2.4.6--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--2.4.7--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--2.4.8--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--2.4.9--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--2.5.0--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--2.5.1--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--2.5.2--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--2.5.3--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--2.5.4--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--2.5.5--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--3.0.0--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--3.0.1--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--3.0.2--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--3.0.3--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--%%PORTVERSION%%--%%PORTVERSION%%next.sql
-share/postgresql/extension/postgis_tiger_geocoder--%%PORTVERSION%%next--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--ANY--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder--unpackaged--%%PORTVERSION%%.sql
-share/postgresql/extension/postgis_tiger_geocoder.control
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.0.0--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.0.1--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.0.2--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.0.3--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.0.4--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.0.5--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.0.6--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.0.7--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.1.0--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.1.1--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.1.2--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.1.3--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.1.4--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.1.5--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.1.6--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.1.7--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.1.8--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.1.9--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.2.0--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.2.1--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.2.2--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.2.3--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.2.4--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.2.5--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.2.6--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.2.7--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.2.8--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.3.0--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.3.1--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.3.2--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.3.3--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.3.4--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.3.5--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.3.6--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.3.7--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.3.8--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.3.9--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.3.10--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.3.11--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.4.0--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.4.1--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.4.2--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.4.3--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.4.4--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.4.5--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.4.6--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.4.7--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.4.8--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.4.9--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.5.0--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.5.1--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.5.2--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.5.3--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.5.4--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.5.5--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--3.0.0--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--3.0.1--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--3.0.2--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--3.0.3--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--%%PORTVERSION%%--%%PORTVERSION%%next.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--%%PORTVERSION%%next--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--ANY--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology--unpackaged--%%PORTVERSION%%.sql
-%%TOPOLOGY%%share/postgresql/extension/postgis_topology.control
-%%LOADERGUI%%share/postgresql/icons/hicolor/8x8/apps/shp2pgsql-gui.png
-%%LOADERGUI%%share/postgresql/icons/hicolor/16x16/apps/shp2pgsql-gui.png
-%%LOADERGUI%%share/postgresql/icons/hicolor/22x22/apps/shp2pgsql-gui.png
-%%LOADERGUI%%share/postgresql/icons/hicolor/24x24/apps/shp2pgsql-gui.png
-%%LOADERGUI%%share/postgresql/icons/hicolor/32x32/apps/shp2pgsql-gui.png
-%%LOADERGUI%%share/postgresql/icons/hicolor/36x36/apps/shp2pgsql-gui.png
-%%LOADERGUI%%share/postgresql/icons/hicolor/40x40/apps/shp2pgsql-gui.png
-%%LOADERGUI%%share/postgresql/icons/hicolor/42x42/apps/shp2pgsql-gui.png
-%%LOADERGUI%%share/postgresql/icons/hicolor/48x48/apps/shp2pgsql-gui.png
-%%LOADERGUI%%share/postgresql/icons/hicolor/64x64/apps/shp2pgsql-gui.png
diff --git a/databases/postgis31/Makefile b/databases/postgis31/Makefile
index 62381dc06b0f..a48f1e0abe8d 100644
--- a/databases/postgis31/Makefile
+++ b/databases/postgis31/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	postgis
-PORTVERSION=	3.1.4
+PORTVERSION=	3.1.11
 PORTREVISION=	1
 CATEGORIES=	databases geography
 MASTER_SITES=	https://download.osgeo.org/postgis/source/
@@ -7,6 +7,7 @@ PKGNAMESUFFIX=	31
 
 MAINTAINER=	lbartoletti@FreeBSD.org
 COMMENT=	Geographic objects support for PostgreSQL databases
+WWW=		https://postgis.net/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
@@ -17,7 +18,7 @@ LIB_DEPENDS=	libproj.so:graphics/proj \
 		libgdal.so:graphics/gdal
 
 USES=		alias compiler:c++11-lang cpe gmake gnome iconv:wchar_t libtool:keepla \
-		localbase perl5 pkgconfig pgsql:9.5+ shebangfix
+		localbase perl5 pkgconfig pgsql:11+ shebangfix
 USE_GNOME=	libxml2
 USE_PERL5=	build
 
@@ -57,7 +58,7 @@ SFCGAL_LIB_DEPENDS=		libSFCGAL.so:databases/sfcgal
 TOPOLOGY_CONFIGURE_WITH=	topology
 WAGYU_CONFIGURE_WITH=		wagyu
 
-CONFLICTS_INSTALL=	postgis20 postgis21 postgis22 postgis23 postgis24 postgis25 postgis30
+CONFLICTS_INSTALL=	postgis[0-9][0-9] # lib/postgresql/address_standardizer-3.so
 
 VER=		${PORTVERSION:R}
 
diff --git a/databases/postgis31/distinfo b/databases/postgis31/distinfo
index ed970cdda042..c049d0d0f7fa 100644
--- a/databases/postgis31/distinfo
+++ b/databases/postgis31/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1630909481
-SHA256 (postgis-3.1.4.tar.gz) = dc8e3fe8bc532e422f5d724c5a7c437f6555511716f6410d4d2db9762e1a3796
-SIZE (postgis-3.1.4.tar.gz) = 17269391
+TIMESTAMP = 1709194569
+SHA256 (postgis-3.1.11.tar.gz) = f5167b173399663263a9778dcfdd35afef40ae06fcfc99a2d33d9edd1d24c963
+SIZE (postgis-3.1.11.tar.gz) = 17283655
diff --git a/databases/postgis31/pkg-descr b/databases/postgis31/pkg-descr
index 31c8f2a8dcd8..a6e2deb0fbac 100644
--- a/databases/postgis31/pkg-descr
+++ b/databases/postgis31/pkg-descr
@@ -11,5 +11,3 @@ in open source spatial database technology. PostGIS is released
 under the GNU General Public License. PostGIS continues to be
 developed by a group of contributors led by a Project Steering
 Committee and new features continue to be added.
-
-WWW: https://postgis.net/
diff --git a/databases/postgis31/pkg-plist b/databases/postgis31/pkg-plist
index 5b98486ce7c1..b97616ac01c8 100644
--- a/databases/postgis31/pkg-plist
+++ b/databases/postgis31/pkg-plist
@@ -1,6 +1,6 @@
-%%LOADERGUI%%bin/pgsql2shp
+bin/pgsql2shp
 %%RASTER%%bin/raster2pgsql
-%%LOADERGUI%%bin/shp2pgsql
+bin/shp2pgsql
 %%LOADERGUI%%bin/shp2pgsql-gui
 %%ADDRSTD%%lib/postgresql/address_standardizer-3.so
 lib/postgresql/postgis-3.so
@@ -162,21 +162,39 @@ share/postgresql/contrib/postgis-%%VER%%/uninstall_rtpostgis.sql
 %%ADDRSTD%%share/postgresql/extension/address_standardizer--2.4.7--%%PORTVERSION%%.sql
 %%ADDRSTD%%share/postgresql/extension/address_standardizer--2.4.8--%%PORTVERSION%%.sql
 %%ADDRSTD%%share/postgresql/extension/address_standardizer--2.4.9--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.4.10--%%PORTVERSION%%.sql
 %%ADDRSTD%%share/postgresql/extension/address_standardizer--2.5.0--%%PORTVERSION%%.sql
 %%ADDRSTD%%share/postgresql/extension/address_standardizer--2.5.1--%%PORTVERSION%%.sql
 %%ADDRSTD%%share/postgresql/extension/address_standardizer--2.5.2--%%PORTVERSION%%.sql
 %%ADDRSTD%%share/postgresql/extension/address_standardizer--2.5.3--%%PORTVERSION%%.sql
 %%ADDRSTD%%share/postgresql/extension/address_standardizer--2.5.4--%%PORTVERSION%%.sql
 %%ADDRSTD%%share/postgresql/extension/address_standardizer--2.5.5--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.5.6--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.5.7--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.5.8--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.5.9--%%PORTVERSION%%.sql
 %%ADDRSTD%%share/postgresql/extension/address_standardizer--3.0.0--%%PORTVERSION%%.sql
 %%ADDRSTD%%share/postgresql/extension/address_standardizer--3.0.1--%%PORTVERSION%%.sql
 %%ADDRSTD%%share/postgresql/extension/address_standardizer--3.0.2--%%PORTVERSION%%.sql
 %%ADDRSTD%%share/postgresql/extension/address_standardizer--3.0.3--%%PORTVERSION%%.sql
 %%ADDRSTD%%share/postgresql/extension/address_standardizer--3.0.4--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--3.0.5--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--3.0.6--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--3.0.7--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--3.0.8--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--3.0.9--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--3.0.10--%%PORTVERSION%%.sql
 %%ADDRSTD%%share/postgresql/extension/address_standardizer--3.1.0--%%PORTVERSION%%.sql
 %%ADDRSTD%%share/postgresql/extension/address_standardizer--3.1.1--%%PORTVERSION%%.sql
 %%ADDRSTD%%share/postgresql/extension/address_standardizer--3.1.2--%%PORTVERSION%%.sql
 %%ADDRSTD%%share/postgresql/extension/address_standardizer--3.1.3--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--3.1.4--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--3.1.5--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--3.1.6--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--3.1.7--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--3.1.8--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--3.1.9--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--3.1.10--%%PORTVERSION%%.sql
 %%ADDRSTD%%share/postgresql/extension/address_standardizer--%%PORTVERSION%%.sql
 %%ADDRSTD%%share/postgresql/extension/address_standardizer--%%PORTVERSION%%--%%PORTVERSION%%next.sql
 %%ADDRSTD%%share/postgresql/extension/address_standardizer--%%PORTVERSION%%next--%%PORTVERSION%%.sql
@@ -237,21 +255,39 @@ share/postgresql/extension/postgis--2.4.6--%%PORTVERSION%%.sql
 share/postgresql/extension/postgis--2.4.7--%%PORTVERSION%%.sql
 share/postgresql/extension/postgis--2.4.8--%%PORTVERSION%%.sql
 share/postgresql/extension/postgis--2.4.9--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--2.4.10--%%PORTVERSION%%.sql
 share/postgresql/extension/postgis--2.5.0--%%PORTVERSION%%.sql
 share/postgresql/extension/postgis--2.5.1--%%PORTVERSION%%.sql
 share/postgresql/extension/postgis--2.5.2--%%PORTVERSION%%.sql
 share/postgresql/extension/postgis--2.5.3--%%PORTVERSION%%.sql
 share/postgresql/extension/postgis--2.5.4--%%PORTVERSION%%.sql
 share/postgresql/extension/postgis--2.5.5--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--2.5.6--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--2.5.7--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--2.5.8--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--2.5.9--%%PORTVERSION%%.sql
 share/postgresql/extension/postgis--3.0.0--%%PORTVERSION%%.sql
 share/postgresql/extension/postgis--3.0.1--%%PORTVERSION%%.sql
 share/postgresql/extension/postgis--3.0.2--%%PORTVERSION%%.sql
 share/postgresql/extension/postgis--3.0.3--%%PORTVERSION%%.sql
 share/postgresql/extension/postgis--3.0.4--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--3.0.5--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--3.0.6--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--3.0.7--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--3.0.8--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--3.0.9--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--3.0.10--%%PORTVERSION%%.sql
 share/postgresql/extension/postgis--3.1.0--%%PORTVERSION%%.sql
 share/postgresql/extension/postgis--3.1.1--%%PORTVERSION%%.sql
 share/postgresql/extension/postgis--3.1.2--%%PORTVERSION%%.sql
 share/postgresql/extension/postgis--3.1.3--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--3.1.4--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--3.1.5--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--3.1.6--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--3.1.7--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--3.1.8--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--3.1.9--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--3.1.10--%%PORTVERSION%%.sql
 share/postgresql/extension/postgis--%%PORTVERSION%%.sql
 share/postgresql/extension/postgis--%%PORTVERSION%%--%%PORTVERSION%%next.sql
 share/postgresql/extension/postgis--%%PORTVERSION%%next--%%PORTVERSION%%.sql
@@ -308,21 +344,39 @@ share/postgresql/extension/postgis.control
 %%RASTER%%share/postgresql/extension/postgis_raster--2.4.7--%%PORTVERSION%%.sql
 %%RASTER%%share/postgresql/extension/postgis_raster--2.4.8--%%PORTVERSION%%.sql
 %%RASTER%%share/postgresql/extension/postgis_raster--2.4.9--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--2.4.10--%%PORTVERSION%%.sql
 %%RASTER%%share/postgresql/extension/postgis_raster--2.5.0--%%PORTVERSION%%.sql
 %%RASTER%%share/postgresql/extension/postgis_raster--2.5.1--%%PORTVERSION%%.sql
 %%RASTER%%share/postgresql/extension/postgis_raster--2.5.2--%%PORTVERSION%%.sql
 %%RASTER%%share/postgresql/extension/postgis_raster--2.5.3--%%PORTVERSION%%.sql
 %%RASTER%%share/postgresql/extension/postgis_raster--2.5.4--%%PORTVERSION%%.sql
 %%RASTER%%share/postgresql/extension/postgis_raster--2.5.5--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--2.5.6--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--2.5.7--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--2.5.8--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--2.5.9--%%PORTVERSION%%.sql
 %%RASTER%%share/postgresql/extension/postgis_raster--3.0.0--%%PORTVERSION%%.sql
 %%RASTER%%share/postgresql/extension/postgis_raster--3.0.1--%%PORTVERSION%%.sql
 %%RASTER%%share/postgresql/extension/postgis_raster--3.0.2--%%PORTVERSION%%.sql
 %%RASTER%%share/postgresql/extension/postgis_raster--3.0.3--%%PORTVERSION%%.sql
 %%RASTER%%share/postgresql/extension/postgis_raster--3.0.4--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--3.0.5--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--3.0.6--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--3.0.7--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--3.0.8--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--3.0.9--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--3.0.10--%%PORTVERSION%%.sql
 %%RASTER%%share/postgresql/extension/postgis_raster--3.1.0--%%PORTVERSION%%.sql
 %%RASTER%%share/postgresql/extension/postgis_raster--3.1.1--%%PORTVERSION%%.sql
 %%RASTER%%share/postgresql/extension/postgis_raster--3.1.2--%%PORTVERSION%%.sql
 %%RASTER%%share/postgresql/extension/postgis_raster--3.1.3--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--3.1.4--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--3.1.5--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--3.1.6--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--3.1.7--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--3.1.8--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--3.1.9--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--3.1.10--%%PORTVERSION%%.sql
 %%RASTER%%share/postgresql/extension/postgis_raster--%%PORTVERSION%%.sql
 %%RASTER%%share/postgresql/extension/postgis_raster--%%PORTVERSION%%--%%PORTVERSION%%next.sql
 %%RASTER%%share/postgresql/extension/postgis_raster--%%PORTVERSION%%next--%%PORTVERSION%%.sql
@@ -379,21 +433,39 @@ share/postgresql/extension/postgis.control
 %%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.4.7--%%PORTVERSION%%.sql
 %%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.4.8--%%PORTVERSION%%.sql
 %%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.4.9--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.4.10--%%PORTVERSION%%.sql
 %%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.5.0--%%PORTVERSION%%.sql
 %%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.5.1--%%PORTVERSION%%.sql
 %%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.5.2--%%PORTVERSION%%.sql
 %%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.5.3--%%PORTVERSION%%.sql
 %%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.5.4--%%PORTVERSION%%.sql
 %%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.5.5--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.5.6--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.5.7--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.5.8--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.5.9--%%PORTVERSION%%.sql
 %%SFCGAL%%share/postgresql/extension/postgis_sfcgal--3.0.0--%%PORTVERSION%%.sql
 %%SFCGAL%%share/postgresql/extension/postgis_sfcgal--3.0.1--%%PORTVERSION%%.sql
 %%SFCGAL%%share/postgresql/extension/postgis_sfcgal--3.0.2--%%PORTVERSION%%.sql
 %%SFCGAL%%share/postgresql/extension/postgis_sfcgal--3.0.3--%%PORTVERSION%%.sql
 %%SFCGAL%%share/postgresql/extension/postgis_sfcgal--3.0.4--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--3.0.5--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--3.0.6--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--3.0.7--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--3.0.8--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--3.0.9--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--3.0.10--%%PORTVERSION%%.sql
 %%SFCGAL%%share/postgresql/extension/postgis_sfcgal--3.1.0--%%PORTVERSION%%.sql
 %%SFCGAL%%share/postgresql/extension/postgis_sfcgal--3.1.1--%%PORTVERSION%%.sql
 %%SFCGAL%%share/postgresql/extension/postgis_sfcgal--3.1.2--%%PORTVERSION%%.sql
 %%SFCGAL%%share/postgresql/extension/postgis_sfcgal--3.1.3--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--3.1.4--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--3.1.5--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--3.1.6--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--3.1.7--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--3.1.8--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--3.1.9--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--3.1.10--%%PORTVERSION%%.sql
 %%SFCGAL%%share/postgresql/extension/postgis_sfcgal--%%PORTVERSION%%.sql
 %%SFCGAL%%share/postgresql/extension/postgis_sfcgal--%%PORTVERSION%%--%%PORTVERSION%%next.sql
 %%SFCGAL%%share/postgresql/extension/postgis_sfcgal--%%PORTVERSION%%next--%%PORTVERSION%%.sql
@@ -450,21 +522,39 @@ share/postgresql/extension/postgis_tiger_geocoder--2.4.6--%%PORTVERSION%%.sql
 share/postgresql/extension/postgis_tiger_geocoder--2.4.7--%%PORTVERSION%%.sql
 share/postgresql/extension/postgis_tiger_geocoder--2.4.8--%%PORTVERSION%%.sql
 share/postgresql/extension/postgis_tiger_geocoder--2.4.9--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.4.10--%%PORTVERSION%%.sql
 share/postgresql/extension/postgis_tiger_geocoder--2.5.0--%%PORTVERSION%%.sql
 share/postgresql/extension/postgis_tiger_geocoder--2.5.1--%%PORTVERSION%%.sql
 share/postgresql/extension/postgis_tiger_geocoder--2.5.2--%%PORTVERSION%%.sql
 share/postgresql/extension/postgis_tiger_geocoder--2.5.3--%%PORTVERSION%%.sql
 share/postgresql/extension/postgis_tiger_geocoder--2.5.4--%%PORTVERSION%%.sql
 share/postgresql/extension/postgis_tiger_geocoder--2.5.5--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.5.6--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.5.7--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.5.8--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.5.9--%%PORTVERSION%%.sql
 share/postgresql/extension/postgis_tiger_geocoder--3.0.0--%%PORTVERSION%%.sql
 share/postgresql/extension/postgis_tiger_geocoder--3.0.1--%%PORTVERSION%%.sql
 share/postgresql/extension/postgis_tiger_geocoder--3.0.2--%%PORTVERSION%%.sql
 share/postgresql/extension/postgis_tiger_geocoder--3.0.3--%%PORTVERSION%%.sql
 share/postgresql/extension/postgis_tiger_geocoder--3.0.4--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--3.0.5--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--3.0.6--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--3.0.7--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--3.0.8--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--3.0.9--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--3.0.10--%%PORTVERSION%%.sql
 share/postgresql/extension/postgis_tiger_geocoder--3.1.0--%%PORTVERSION%%.sql
 share/postgresql/extension/postgis_tiger_geocoder--3.1.1--%%PORTVERSION%%.sql
 share/postgresql/extension/postgis_tiger_geocoder--3.1.2--%%PORTVERSION%%.sql
 share/postgresql/extension/postgis_tiger_geocoder--3.1.3--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--3.1.4--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--3.1.5--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--3.1.6--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--3.1.7--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--3.1.8--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--3.1.9--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--3.1.10--%%PORTVERSION%%.sql
 share/postgresql/extension/postgis_tiger_geocoder--%%PORTVERSION%%.sql
 share/postgresql/extension/postgis_tiger_geocoder--%%PORTVERSION%%--%%PORTVERSION%%next.sql
 share/postgresql/extension/postgis_tiger_geocoder--%%PORTVERSION%%next--%%PORTVERSION%%.sql
@@ -520,21 +610,39 @@ share/postgresql/extension/postgis_tiger_geocoder.control
 %%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.4.7--%%PORTVERSION%%.sql
 %%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.4.8--%%PORTVERSION%%.sql
 %%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.4.9--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.4.10--%%PORTVERSION%%.sql
 %%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.5.0--%%PORTVERSION%%.sql
 %%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.5.1--%%PORTVERSION%%.sql
 %%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.5.2--%%PORTVERSION%%.sql
 %%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.5.3--%%PORTVERSION%%.sql
 %%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.5.4--%%PORTVERSION%%.sql
 %%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.5.5--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.5.6--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.5.7--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.5.8--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.5.9--%%PORTVERSION%%.sql
 %%TOPOLOGY%%share/postgresql/extension/postgis_topology--3.0.0--%%PORTVERSION%%.sql
 %%TOPOLOGY%%share/postgresql/extension/postgis_topology--3.0.1--%%PORTVERSION%%.sql
 %%TOPOLOGY%%share/postgresql/extension/postgis_topology--3.0.2--%%PORTVERSION%%.sql
 %%TOPOLOGY%%share/postgresql/extension/postgis_topology--3.0.3--%%PORTVERSION%%.sql
 %%TOPOLOGY%%share/postgresql/extension/postgis_topology--3.0.4--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--3.0.5--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--3.0.6--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--3.0.7--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--3.0.8--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--3.0.9--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--3.0.10--%%PORTVERSION%%.sql
 %%TOPOLOGY%%share/postgresql/extension/postgis_topology--3.1.0--%%PORTVERSION%%.sql
 %%TOPOLOGY%%share/postgresql/extension/postgis_topology--3.1.1--%%PORTVERSION%%.sql
 %%TOPOLOGY%%share/postgresql/extension/postgis_topology--3.1.2--%%PORTVERSION%%.sql
 %%TOPOLOGY%%share/postgresql/extension/postgis_topology--3.1.3--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--3.1.4--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--3.1.5--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--3.1.6--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--3.1.7--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--3.1.8--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--3.1.9--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--3.1.10--%%PORTVERSION%%.sql
 %%TOPOLOGY%%share/postgresql/extension/postgis_topology--%%PORTVERSION%%.sql
 %%TOPOLOGY%%share/postgresql/extension/postgis_topology--%%PORTVERSION%%--%%PORTVERSION%%next.sql
 %%TOPOLOGY%%share/postgresql/extension/postgis_topology--%%PORTVERSION%%next--%%PORTVERSION%%.sql
diff --git a/databases/postgis32/Makefile b/databases/postgis32/Makefile
new file mode 100644
index 000000000000..d300e78d7b36
--- /dev/null
+++ b/databases/postgis32/Makefile
@@ -0,0 +1,87 @@
+PORTNAME=	postgis
+DISTVERSION=	3.2.7
+PORTREVISION=	1
+CATEGORIES=	databases geography
+MASTER_SITES=	https://download.osgeo.org/postgis/source/
+PKGNAMESUFFIX=	32
+
+MAINTAINER=	lbartoletti@FreeBSD.org
+COMMENT=	Geographic objects support for PostgreSQL databases
+WWW=		https://postgis.net/
+
+LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/COPYING
+
+LIB_DEPENDS=	libproj.so:graphics/proj \
+		libgeos.so:graphics/geos \
+		libjson-c.so:devel/json-c \
+		libgdal.so:graphics/gdal
+
+USES=		alias compiler:c++14-lang cpe gmake gnome iconv:wchar_t libtool:keepla \
+		localbase perl5 pkgconfig pgsql:11+ shebangfix
+USE_GNOME=	libxml2
+USE_PERL5=	build
+
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	${ICONV_CONFIGURE_BASE} NUMERICFLAGS=${PORTVERSION}
+USE_CXXSTD=	c++14
+SHEBANG_FILES=	extensions/address_standardizer/*.pl raster/test/regress/*.pl \
+		raster/test/regress/loader/*.pl regress/run_test.pl \
+		utils/postgis_restore.pl.in utils/*.pl
+WANT_PGSQL=	server
+
+OPTIONS_DEFINE=	ADDRSTD JSON LOADERGUI NLS PROTOBUF RASTER SFCGAL TOPOLOGY WAGYU
+OPTIONS_DEFAULT=ADDRSTD JSON NLS PROTOBUF RASTER SFCGAL TOPOLOGY WAGYU
+OPTIONS_SUB=	yes
+
+ADDRSTD_DESC=	Enable address standardizer
+JSON_DESC=	Enable JSON support
+LOADERGUI_DESC=	Enable shp2pgsql-gui
+PROTOBUF_DESC=	Enable protocol buffers
+RASTER_DESC=	Enable raster support
+SFCGAL_DESC=	Enable sfcgal
+TOPOLOGY_DESC=	Topology support
+WAGYU_DESC=	Enable WAGYU support
+
+ADDRSTD_CONFIGURE_WITH=		address-standardizer
+ADDRSTD_LIB_DEPENDS=		libpcre.so:devel/pcre
+ADDRSTD_VARS=			WANT_PGSQL+=contrib
+JSON_CONFIGURE_WITH=		json
+JSON_LIB_DEPENDS=		libjson-c.so:devel/json-c
+LOADERGUI_CONFIGURE_WITH=	gui
+LOADERGUI_LIB_DEPENDS=		libprotobuf-c.so:devel/protobuf-c
+LOADERGUI_USE=			GNOME=gtk20
+NLS_CONFIGURE_WITH=		nls
+NLS_USES=			gettext
+PROTOBUF_CONFIGURE_WITH=	protobuf
+PROTOBUF_LIB_DEPENDS=		libprotobuf-c.so:devel/protobuf-c
+SFCGAL_CONFIGURE_WITH=		sfcgal=${LOCALBASE}/bin/sfcgal-config
+SFCGAL_LIB_DEPENDS=		libSFCGAL.so:databases/sfcgal
+TOPOLOGY_CONFIGURE_WITH=	topology
+WAGYU_CONFIGURE_WITH=		wagyu
+
+CONFLICTS_INSTALL=	postgis[0-9][0-9] # lib/postgresql/address_standardizer-3.so
+
+VER=		${PORTVERSION:R}
+
+PLIST_SUB=	PORTVERSION=${PORTVERSION}${DISTVERSIONSUFFIX} \
+		VER=${VER}
+
+.include <bsd.port.pre.mk>
+
+.if ${CHOSEN_COMPILER_TYPE} == gcc
+post-patch:
+	${REINPLACE_CMD} -e '/^#pragma GCC diagnostic/d' \
+		${WRKSRC}/postgis/lwgeom_functions_basic.c \
+		${WRKSRC}/postgis/lwgeom_geos.c
+.endif
+
+post-install:
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/*
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/postgresql/*.so
+	${MKDIR} ${STAGEDIR}${DATADIR}/tiger_geocoder
+	(cd ${WRKSRC}/extras/tiger_geocoder && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/tiger_geocoder/ "! ( -name *\.orig -o -name *\.bak )" )
+	${MKDIR} ${STAGEDIR}${DATADIR}/utils
+	(cd ${WRKSRC}/utils/ && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/utils/ "! ( -name *\.orig -o -name *\.bak -o -name Makefile -o -name *\.in -o -name uninstall_script )" )
+
+.include <bsd.port.post.mk>
diff --git a/databases/postgis32/distinfo b/databases/postgis32/distinfo
new file mode 100644
index 000000000000..b7a619a897da
--- /dev/null
+++ b/databases/postgis32/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1709187826
+SHA256 (postgis-3.2.7.tar.gz) = 74146e6e7627cbec32f858aeea0f034a91c760cdb21e595071f7a93c95048646
+SIZE (postgis-3.2.7.tar.gz) = 16895005
diff --git a/databases/postgis32/pkg-descr b/databases/postgis32/pkg-descr
new file mode 100644
index 000000000000..a6e2deb0fbac
--- /dev/null
+++ b/databases/postgis32/pkg-descr
@@ -0,0 +1,13 @@
+PostGIS adds support for geographic objects to the PostgreSQL
+object-relational database. In effect, PostGIS "spatially enables"
+the PostgreSQL server, allowing it to be used as a backend spatial
+database for geographic information systems (GIS), much like ESRI's
+SDE or Oracle's Spatial extension. PostGIS follows the OpenGIS
+"Simple Features Specification for SQL" and has been certified as
+compliant with the "Types and Functions" profile.
+
+PostGIS development was started by Refractions Research as a project
+in open source spatial database technology. PostGIS is released
+under the GNU General Public License. PostGIS continues to be
+developed by a group of contributors led by a Project Steering
+Committee and new features continue to be added.
diff --git a/databases/postgis32/pkg-plist b/databases/postgis32/pkg-plist
new file mode 100644
index 000000000000..64dc64342fd9
--- /dev/null
+++ b/databases/postgis32/pkg-plist
@@ -0,0 +1,796 @@
+bin/pgsql2shp
+%%RASTER%%bin/raster2pgsql
+bin/shp2pgsql
+%%LOADERGUI%%bin/shp2pgsql-gui
+%%ADDRSTD%%lib/postgresql/address_standardizer-3.so
+lib/postgresql/postgis-3.so
+%%RASTER%%lib/postgresql/postgis_raster-3.so
+%%SFCGAL%%lib/postgresql/postgis_sfcgal-3.so
+%%TOPOLOGY%%lib/postgresql/postgis_topology-3.so
+%%ADDRSTD%%share/doc/postgresql/extension/README.address_standardizer
+%%DATADIR%%/tiger_geocoder/COPYING
+%%DATADIR%%/tiger_geocoder/README
+%%DATADIR%%/tiger_geocoder/create_geocode.bat
+%%DATADIR%%/tiger_geocoder/create_geocode.sh
+%%DATADIR%%/tiger_geocoder/create_geocode.sql
+%%DATADIR%%/tiger_geocoder/geocode/census_tracts_functions.sql
+%%DATADIR%%/tiger_geocoder/geocode/geocode.sql
+%%DATADIR%%/tiger_geocoder/geocode/geocode_address.sql
+%%DATADIR%%/tiger_geocoder/geocode/geocode_intersection.sql
+%%DATADIR%%/tiger_geocoder/geocode/geocode_location.sql
+%%DATADIR%%/tiger_geocoder/geocode/includes_address.sql
+%%DATADIR%%/tiger_geocoder/geocode/interpolate_from_address.sql
+%%DATADIR%%/tiger_geocoder/geocode/other_helper_functions.sql
+%%DATADIR%%/tiger_geocoder/geocode/rate_attributes.sql
+%%DATADIR%%/tiger_geocoder/geocode/reverse_geocode.sql
+%%DATADIR%%/tiger_geocoder/geocode_settings.sql
+%%DATADIR%%/tiger_geocoder/legacy_import/tiger2008/import_tiger_shps.sh
+%%DATADIR%%/tiger_geocoder/normalize/count_words.sql
+%%DATADIR%%/tiger_geocoder/normalize/end_soundex.sql
+%%DATADIR%%/tiger_geocoder/normalize/get_last_words.sql
+%%DATADIR%%/tiger_geocoder/normalize/location_extract.sql
+%%DATADIR%%/tiger_geocoder/normalize/location_extract_countysub_exact.sql
+%%DATADIR%%/tiger_geocoder/normalize/location_extract_countysub_fuzzy.sql
+%%DATADIR%%/tiger_geocoder/normalize/location_extract_place_exact.sql
+%%DATADIR%%/tiger_geocoder/normalize/location_extract_place_fuzzy.sql
+%%DATADIR%%/tiger_geocoder/normalize/normalize_address.sql
+%%DATADIR%%/tiger_geocoder/normalize/pprint_addy.sql
+%%DATADIR%%/tiger_geocoder/normalize/state_extract.sql
+%%DATADIR%%/tiger_geocoder/pagc_normalize/pagc_normalize_address.sql
+%%DATADIR%%/tiger_geocoder/pagc_normalize/pagc_tables.sql
+%%DATADIR%%/tiger_geocoder/regress/geocode_regress
+%%DATADIR%%/tiger_geocoder/regress/geocode_regress.sql
+%%DATADIR%%/tiger_geocoder/regress/normalize_address_desired_regress
+%%DATADIR%%/tiger_geocoder/regress/normalize_address_regress
+%%DATADIR%%/tiger_geocoder/regress/normalize_address_regress.sql
+%%DATADIR%%/tiger_geocoder/regress/pagc_normalize_address_desired_regress
+%%DATADIR%%/tiger_geocoder/regress/pagc_normalize_address_regress
+%%DATADIR%%/tiger_geocoder/regress/pagc_normalize_address_regress.sql
+%%DATADIR%%/tiger_geocoder/regress/regress.sql
+%%DATADIR%%/tiger_geocoder/regress/reverse_geocode_regress
+%%DATADIR%%/tiger_geocoder/regress/reverse_geocode_regress.sql
+%%DATADIR%%/tiger_geocoder/tables/lookup_tables_2011.sql
+%%DATADIR%%/tiger_geocoder/tiger_loader_2011.sql
+%%DATADIR%%/tiger_geocoder/tiger_loader_2012.sql
+%%DATADIR%%/tiger_geocoder/tiger_loader_2013.sql
+%%DATADIR%%/tiger_geocoder/tiger_loader_2014.sql
+%%DATADIR%%/tiger_geocoder/tiger_loader_2015.sql
+%%DATADIR%%/tiger_geocoder/tiger_loader_2016.sql
+%%DATADIR%%/tiger_geocoder/tiger_loader_2017.sql
+%%DATADIR%%/tiger_geocoder/tiger_loader_2018.sql
+%%DATADIR%%/tiger_geocoder/tiger_loader_2019.sql
+%%DATADIR%%/tiger_geocoder/tiger_loader_2020.sql
+%%DATADIR%%/tiger_geocoder/tiger_loader_2021.sql
+%%TOPOLOGY%%%%DATADIR%%/tiger_geocoder/topology/README
+%%TOPOLOGY%%%%DATADIR%%/tiger_geocoder/topology/tiger_topology_loader.sql
+%%DATADIR%%/tiger_geocoder/upgrade_geocode.sql
+%%DATADIR%%/tiger_geocoder/upgrade_geocoder.bat
+%%DATADIR%%/tiger_geocoder/upgrade_geocoder.sh
+%%DATADIR%%/tiger_geocoder/utility/cull_null.sql
+%%DATADIR%%/tiger_geocoder/utility/levenshtein_ignore_case.sql
+%%DATADIR%%/tiger_geocoder/utility/nullable_levenshtein.sql
+%%DATADIR%%/tiger_geocoder/utility/set_search_path.sql
+%%DATADIR%%/tiger_geocoder/utility/standardize_tiger_data.sql
+%%DATADIR%%/tiger_geocoder/utility/utmzone.sql
+%%DATADIR%%/utils/README
+%%DATADIR%%/utils/check_all_upgrades.sh
+%%DATADIR%%/utils/check_cluster_upgrade.sh
+%%DATADIR%%/utils/check_news.sh
+%%DATADIR%%/utils/create_extension_unpackage.pl
+%%DATADIR%%/utils/create_spatial_ref_sys_config_dump.pl
+%%DATADIR%%/utils/create_undef.pl
+%%DATADIR%%/utils/create_unpackaged.pl
+%%DATADIR%%/utils/postgis_proc_upgrade.pl
+%%DATADIR%%/utils/postgis_restore.pl
+%%DATADIR%%/utils/profile_intersects.pl
+%%DATADIR%%/utils/read_scripts_version.pl
+%%DATADIR%%/utils/repo_revision.pl
+%%DATADIR%%/utils/test_estimation.pl
+%%DATADIR%%/utils/test_geography_estimation.pl
+%%DATADIR%%/utils/test_geography_joinestimation.pl
+%%DATADIR%%/utils/test_joinestimation.pl
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--%%PORTVERSION%%--%%PORTVERSION%%next.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--%%PORTVERSION%%next--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--1.0--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.0.0--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.0.1--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.0.2--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.0.3--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.0.4--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.0.5--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.0.6--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.0.7--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.1.0--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.1.1--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.1.2--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.1.3--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.1.4--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.1.5--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.1.6--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.1.7--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.1.8--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.1.9--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.2.0--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.2.1--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.2.2--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.2.3--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.2.4--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.2.5--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.2.6--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.2.7--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.2.8--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.3.0--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.3.1--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.3.10--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.3.11--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.3.2--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.3.3--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.3.4--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.3.5--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.3.6--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.3.7--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.3.8--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.3.9--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.4.0--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.4.1--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.4.10--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.4.2--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.4.3--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.4.4--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.4.5--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.4.6--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.4.7--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.4.8--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.4.9--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.5.0--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.5.1--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.5.2--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.5.3--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.5.4--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.5.5--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.5.6--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.5.7--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.5.8--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.5.9--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--3.0.0--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--3.0.1--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--3.0.2--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--3.0.3--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--3.0.4--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--3.0.5--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--3.0.6--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--3.0.7--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--3.0.8--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--3.0.9--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--3.0.10--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--3.1.0--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--3.1.1--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--3.1.2--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--3.1.3--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--3.1.4--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--3.1.5--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--3.1.6--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--3.1.7--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--3.1.8--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--3.1.9--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--3.1.10--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--3.2.0--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--3.2.1--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--3.2.2--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--3.2.3--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--3.2.4--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--3.2.5--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--3.2.6--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--ANY--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer.control
+%%ADDRSTD%%share/postgresql/extension/address_standardizer.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--%%GTK3_VERSION%%--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--%%PORTVERSION%%--%%PORTVERSION%%next.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--%%PORTVERSION%%next--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--2.%%VER%%--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--2.0.0--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--2.0.1--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--2.0.2--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--2.0.3--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--2.0.4--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--2.0.5--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--2.0.6--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--2.0.7--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--2.1.0--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--2.1.1--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--2.1.2--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--2.1.3--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--2.1.4--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--2.1.5--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--2.1.6--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--2.1.7--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--2.1.8--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--2.1.9--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--2.2.0--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--2.2.1--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--2.2.2--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--2.2.3--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--2.2.4--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--2.2.5--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--2.2.6--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--2.2.7--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--2.2.8--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--2.3.0--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--2.3.1--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--2.3.10--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--2.3.11--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--2.3.3--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--2.3.4--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--2.3.5--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--2.3.6--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--2.3.7--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--2.3.8--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--2.3.9--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--2.4.0--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--2.4.1--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--2.4.10--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--2.4.2--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--2.4.3--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--2.4.4--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--2.4.5--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--2.4.6--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--2.4.7--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--2.4.8--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--2.4.9--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--2.5.0--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--2.5.1--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--2.5.2--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--2.5.3--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--2.5.4--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--2.5.5--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--2.5.6--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--2.5.7--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--2.5.8--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--2.5.9--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--3.0.1--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--3.0.2--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--3.0.3--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--3.0.4--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--3.0.5--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--3.0.6--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--3.0.7--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--3.0.8--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--3.0.9--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--3.0.10--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--3.1.0--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--3.1.1--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--3.1.2--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--3.1.3--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--3.1.4--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--3.1.5--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--3.1.6--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--3.1.7--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--3.1.8--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--3.1.9--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--3.1.10--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--3.2.0--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--3.2.1--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--3.2.2--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--3.2.3--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--3.2.4--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--3.2.5--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--3.2.6--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--ANY--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us.control
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us.sql
+%%DATADIR%%/utils/check_tests_enabled.sh
+%%LOADERGUI%%share/postgresql/applications/shp2pgsql-gui.desktop
+%%LOADERGUI%%share/postgresql/icons/hicolor/16x16/apps/shp2pgsql-gui.png
+%%LOADERGUI%%share/postgresql/icons/hicolor/22x22/apps/shp2pgsql-gui.png
+%%LOADERGUI%%share/postgresql/icons/hicolor/24x24/apps/shp2pgsql-gui.png
+%%LOADERGUI%%share/postgresql/icons/hicolor/32x32/apps/shp2pgsql-gui.png
+%%LOADERGUI%%share/postgresql/icons/hicolor/36x36/apps/shp2pgsql-gui.png
+%%LOADERGUI%%share/postgresql/icons/hicolor/40x40/apps/shp2pgsql-gui.png
+%%LOADERGUI%%share/postgresql/icons/hicolor/42x42/apps/shp2pgsql-gui.png
+%%LOADERGUI%%share/postgresql/icons/hicolor/48x48/apps/shp2pgsql-gui.png
+%%LOADERGUI%%share/postgresql/icons/hicolor/64x64/apps/shp2pgsql-gui.png
+%%LOADERGUI%%share/postgresql/icons/hicolor/8x8/apps/shp2pgsql-gui.png
+%%RASTER%%share/postgresql/contrib/postgis-%%VER%%/raster_comments.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--%%PORTVERSION%%--%%PORTVERSION%%next.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--%%PORTVERSION%%next--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--2.0.0--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--2.0.1--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--2.0.2--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--2.0.3--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--2.0.4--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--2.0.5--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--2.0.6--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--2.0.7--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--2.1.0--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--2.1.1--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--2.1.2--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--2.1.3--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--2.1.4--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--2.1.5--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--2.1.6--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--2.1.7--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--2.1.8--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--2.1.9--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--2.2.0--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--2.2.1--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--2.2.2--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--2.2.3--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--2.2.4--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--2.2.5--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--2.2.6--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--2.2.7--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--2.2.8--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--2.3.0--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--2.3.1--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--2.3.10--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--2.3.11--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--2.3.2--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--2.3.3--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--2.3.4--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--2.3.5--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--2.3.6--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--2.3.7--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--2.3.8--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--2.3.9--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--2.4.0--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--2.4.1--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--2.4.10--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--2.4.2--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--2.4.3--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--2.4.4--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--2.4.5--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--2.4.6--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--2.4.7--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--2.4.8--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--2.4.9--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--2.5.0--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--2.5.1--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--2.5.2--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--2.5.3--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--2.5.4--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--2.5.5--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--2.5.6--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--2.5.7--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--2.5.8--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--2.5.9--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--3.0.0--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--3.0.1--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--3.0.2--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--3.0.3--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--3.0.4--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--3.0.5--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--3.0.6--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--3.0.7--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--3.0.8--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--3.0.9--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--3.0.10--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--3.1.0--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--3.1.1--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--3.1.2--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--3.1.3--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--3.1.4--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--3.1.5--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--3.1.6--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--3.1.7--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--3.1.8--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--3.1.9--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--3.1.10--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--3.2.0--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--3.2.1--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--3.2.2--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--3.2.3--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--3.2.4--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--3.2.5--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--3.2.6--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--ANY--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--unpackaged--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--unpackaged.sql
+%%RASTER%%share/postgresql/extension/postgis_raster.control
+%%SFCGAL%%share/postgresql/contrib/postgis-%%VER%%/sfcgal.sql
+%%SFCGAL%%share/postgresql/contrib/postgis-%%VER%%/sfcgal_comments.sql
+%%SFCGAL%%share/postgresql/contrib/postgis-%%VER%%/sfcgal_upgrade.sql
+%%SFCGAL%%share/postgresql/contrib/postgis-%%VER%%/uninstall_sfcgal.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--%%PORTVERSION%%--%%PORTVERSION%%next.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--%%PORTVERSION%%next--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.0.0--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.0.1--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.0.2--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.0.3--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.0.4--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.0.5--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.0.6--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.0.7--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.1.0--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.1.1--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.1.2--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.1.3--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.1.4--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.1.5--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.1.6--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.1.7--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.1.8--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.1.9--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.2.0--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.2.1--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.2.2--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.2.3--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.2.4--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.2.5--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.2.6--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.2.7--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.2.8--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.3.0--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.3.1--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.3.10--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.3.11--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.3.2--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.3.3--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.3.4--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.3.5--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.3.6--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.3.7--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.3.8--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.3.9--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.4.0--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.4.1--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.4.10--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.4.2--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.4.3--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.4.4--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.4.5--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.4.6--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.4.7--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.4.8--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.4.9--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.5.0--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.5.1--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.5.2--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.5.3--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.5.4--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.5.5--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.5.6--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.5.7--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.5.8--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.5.9--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--3.0.0--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--3.0.1--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--3.0.2--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--3.0.3--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--3.0.4--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--3.0.5--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--3.0.6--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--3.0.7--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--3.0.8--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--3.0.9--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--3.0.10--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--3.1.0--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--3.1.1--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--3.1.2--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--3.1.3--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--3.1.4--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--3.1.5--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--3.1.6--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--3.1.7--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--3.1.8--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--3.1.9--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--3.1.10--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--3.2.0--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--3.2.1--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--3.2.2--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--3.2.3--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--3.2.4--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--3.2.5--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--3.2.6--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--ANY--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--unpackaged--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--unpackaged.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal.control
+%%TOPOLOGY%%share/postgresql/contrib/postgis-%%VER%%/topology.sql
+%%TOPOLOGY%%share/postgresql/contrib/postgis-%%VER%%/topology_comments.sql
+%%TOPOLOGY%%share/postgresql/contrib/postgis-%%VER%%/topology_upgrade.sql
+%%TOPOLOGY%%share/postgresql/contrib/postgis-%%VER%%/uninstall_topology.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--%%PORTVERSION%%--%%PORTVERSION%%next.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--%%PORTVERSION%%next--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.0.0--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.0.1--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.0.2--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.0.3--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.0.4--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.0.5--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.0.6--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.0.7--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.1.0--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.1.1--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.1.2--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.1.3--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.1.4--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.1.5--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.1.6--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.1.7--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.1.8--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.1.9--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.2.0--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.2.1--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.2.2--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.2.3--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.2.4--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.2.5--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.2.6--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.2.7--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.2.8--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.3.0--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.3.1--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.3.10--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.3.11--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.3.2--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.3.3--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.3.4--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.3.5--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.3.6--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.3.7--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.3.8--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.3.9--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.4.0--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.4.1--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.4.10--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.4.2--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.4.3--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.4.4--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.4.5--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.4.6--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.4.7--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.4.8--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.4.9--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.5.0--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.5.1--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.5.2--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.5.3--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.5.4--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.5.5--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.5.6--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.5.7--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.5.8--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.5.9--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--3.0.0--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--3.0.1--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--3.0.2--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--3.0.3--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--3.0.4--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--3.0.5--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--3.0.6--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--3.0.7--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--3.0.8--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--3.0.9--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--3.0.10--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--3.1.0--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--3.1.1--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--3.1.2--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--3.1.3--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--3.1.4--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--3.1.5--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--3.1.6--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--3.1.7--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--3.1.8--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--3.1.9--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--3.1.10--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--3.2.0--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--3.2.1--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--3.2.2--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--3.2.3--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--3.2.4--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--3.2.5--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--3.2.6--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--ANY--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--unpackaged--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--unpackaged.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology.control
+share/postgresql/contrib/postgis-%%VER%%/legacy.sql
+share/postgresql/contrib/postgis-%%VER%%/legacy_gist.sql
+share/postgresql/contrib/postgis-%%VER%%/legacy_minimal.sql
+share/postgresql/contrib/postgis-%%VER%%/postgis.sql
+share/postgresql/contrib/postgis-%%VER%%/postgis_comments.sql
+share/postgresql/contrib/postgis-%%VER%%/postgis_restore.pl
+share/postgresql/contrib/postgis-%%VER%%/postgis_upgrade.sql
+share/postgresql/contrib/postgis-%%VER%%/rtpostgis.sql
+share/postgresql/contrib/postgis-%%VER%%/rtpostgis_legacy.sql
+share/postgresql/contrib/postgis-%%VER%%/rtpostgis_upgrade.sql
+share/postgresql/contrib/postgis-%%VER%%/spatial_ref_sys.sql
+share/postgresql/contrib/postgis-%%VER%%/uninstall_legacy.sql
+share/postgresql/contrib/postgis-%%VER%%/uninstall_postgis.sql
+share/postgresql/contrib/postgis-%%VER%%/uninstall_rtpostgis.sql
+share/postgresql/extension/postgis--%%PORTVERSION%%--%%PORTVERSION%%next.sql
+share/postgresql/extension/postgis--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--%%PORTVERSION%%next--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--2.0.0--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--2.0.1--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--2.0.2--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--2.0.3--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--2.0.4--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--2.0.5--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--2.0.6--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--2.0.7--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--2.1.0--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--2.1.1--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--2.1.2--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--2.1.3--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--2.1.4--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--2.1.5--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--2.1.6--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--2.1.7--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--2.1.8--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--2.1.9--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--2.2.0--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--2.2.1--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--2.2.2--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--2.2.3--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--2.2.4--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--2.2.5--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--2.2.6--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--2.2.7--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--2.2.8--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--2.3.0--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--2.3.1--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--2.3.10--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--2.3.11--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--2.3.2--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--2.3.3--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--2.3.4--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--2.3.5--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--2.3.6--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--2.3.7--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--2.3.8--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--2.3.9--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--2.4.0--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--2.4.1--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--2.4.10--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--2.4.2--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--2.4.3--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--2.4.4--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--2.4.5--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--2.4.6--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--2.4.7--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--2.4.8--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--2.4.9--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--2.5.0--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--2.5.1--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--2.5.2--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--2.5.3--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--2.5.4--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--2.5.5--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--2.5.6--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--2.5.7--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--2.5.8--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--2.5.9--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--3.0.0--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--3.0.1--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--3.0.2--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--3.0.3--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--3.0.4--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--3.0.5--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--3.0.6--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--3.0.7--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--3.0.8--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--3.0.9--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--3.0.10--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--3.1.0--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--3.1.1--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--3.1.2--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--3.1.3--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--3.1.4--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--3.1.5--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--3.1.6--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--3.1.7--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--3.1.8--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--3.1.9--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--3.1.10--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--3.2.0--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--3.2.1--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--3.2.2--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--3.2.3--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--3.2.4--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--3.2.5--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--3.2.6--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--ANY--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--unpackaged--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--unpackaged.sql
+share/postgresql/extension/postgis.control
+share/postgresql/extension/postgis_tiger_geocoder--%%PORTVERSION%%--%%PORTVERSION%%next.sql
+share/postgresql/extension/postgis_tiger_geocoder--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--%%PORTVERSION%%next--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.0.0--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.0.1--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.0.2--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.0.3--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.0.4--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.0.5--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.0.6--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.0.7--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.1.0--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.1.1--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.1.2--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.1.3--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.1.4--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.1.5--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.1.6--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.1.7--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.1.8--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.1.9--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.2.0--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.2.1--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.2.2--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.2.3--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.2.4--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.2.5--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.2.6--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.2.7--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.2.8--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.3.0--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.3.1--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.3.10--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.3.11--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.3.2--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.3.3--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.3.4--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.3.5--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.3.6--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.3.7--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.3.8--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.3.9--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.4.0--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.4.1--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.4.10--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.4.2--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.4.3--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.4.4--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.4.5--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.4.6--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.4.7--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.4.8--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.4.9--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.5.0--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.5.1--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.5.2--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.5.3--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.5.4--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.5.5--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.5.6--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.5.7--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.5.8--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.5.9--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--3.0.0--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--3.0.1--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--3.0.2--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--3.0.3--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--3.0.4--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--3.0.5--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--3.0.6--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--3.0.7--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--3.0.8--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--3.0.9--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--3.0.10--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--3.1.0--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--3.1.1--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--3.1.2--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--3.1.3--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--3.1.4--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--3.1.5--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--3.1.6--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--3.1.7--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--3.1.8--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--3.1.9--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--3.1.10--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--3.2.0--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--3.2.1--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--3.2.2--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--3.2.3--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--3.2.4--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--3.2.5--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--3.2.6--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--ANY--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--unpackaged--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder.control
diff --git a/databases/postgis33/Makefile b/databases/postgis33/Makefile
new file mode 100644
index 000000000000..992b2e6b9a39
--- /dev/null
+++ b/databases/postgis33/Makefile
@@ -0,0 +1,90 @@
+PORTNAME=	postgis
+DISTVERSION=	3.3.6
+PORTREVISION=	1
+CATEGORIES=	databases geography
+MASTER_SITES=	https://download.osgeo.org/postgis/source/
+PKGNAMESUFFIX=	33
+
+MAINTAINER=	lbartoletti@FreeBSD.org
+COMMENT=	Geographic objects support for PostgreSQL databases
+WWW=		https://postgis.net/
+
+LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/COPYING
+
+LIB_DEPENDS=	libproj.so:graphics/proj \
+		libgeos.so:graphics/geos \
+		libjson-c.so:devel/json-c \
+		libgdal.so:graphics/gdal \
+		libpcre2-8.so:devel/pcre2
+
+USES=		alias compiler:c++14-lang cpe gmake gnome iconv:wchar_t libtool:keepla \
+		localbase perl5 pkgconfig pgsql:11+ shebangfix
+USE_GNOME=	libxml2
+USE_PERL5=	build
+
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	${ICONV_CONFIGURE_BASE} NUMERICFLAGS=${PORTVERSION}
+USE_CXXSTD=	c++14
+SHEBANG_FILES=	extensions/address_standardizer/*.pl regress/run_test.pl \
+		utils/postgis_restore.pl.in utils/*.pl
+WANT_PGSQL=	server
+
+OPTIONS_DEFINE=	ADDRSTD JSON LOADERGUI NLS PROTOBUF RASTER SFCGAL TOPOLOGY WAGYU
+OPTIONS_DEFAULT=ADDRSTD JSON NLS PROTOBUF RASTER SFCGAL TOPOLOGY WAGYU
+OPTIONS_SUB=	yes
+
+ADDRSTD_DESC=	Enable address standardizer
+JSON_DESC=	Enable JSON support
+NLS_DESC=	Enable international language support
+LOADERGUI_DESC=	Enable shp2pgsql-gui
+PROTOBUF_DESC=	Enable protocol buffers
+RASTER_DESC=	Enable raster support
+SFCGAL_DESC=	Enable sfcgal
+TOPOLOGY_DESC=	Topology support
+WAGYU_DESC=	Enable WAGYU support
+
+ADDRSTD_CONFIGURE_WITH=		address-standardizer
+ADDRSTD_LIB_DEPENDS=		libpcre.so:devel/pcre
+ADDRSTD_VARS=			WANT_PGSQL+=contrib
+JSON_CONFIGURE_WITH=		json
+JSON_LIB_DEPENDS=		libjson-c.so:devel/json-c
+LOADERGUI_CONFIGURE_WITH=	gui
+LOADERGUI_LIB_DEPENDS=		libprotobuf-c.so:devel/protobuf-c
+LOADERGUI_USE=			GNOME=gtk20
+LOADERGUI_USES=			desktop-file-utils
+NLS_CONFIGURE_WITH=		nls
+NLS_USES=			gettext
+PROTOBUF_CONFIGURE_WITH=	protobuf
+PROTOBUF_LIB_DEPENDS=		libprotobuf-c.so:devel/protobuf-c
+SFCGAL_CONFIGURE_WITH=		sfcgal=${LOCALBASE}/bin/sfcgal-config
+SFCGAL_LIB_DEPENDS=		libSFCGAL.so:databases/sfcgal
+TOPOLOGY_CONFIGURE_WITH=	topology
+WAGYU_CONFIGURE_WITH=		wagyu
+RASTER_CONFIGURE_WITH=		raster
+
+CONFLICTS_INSTALL=	postgis[0-9][0-9] # lib/postgresql/address_standardizer-3.so
+
+VER=		${PORTVERSION:R}
+
+PLIST_SUB=	PORTVERSION=${PORTVERSION}${DISTVERSIONSUFFIX} \
+		VER=${VER}
+
+.include <bsd.port.pre.mk>
+
+.if ${CHOSEN_COMPILER_TYPE} == gcc
+post-patch:
+	${REINPLACE_CMD} -e '/^#pragma GCC diagnostic/d' \
+		${WRKSRC}/postgis/lwgeom_functions_basic.c \
+		${WRKSRC}/postgis/lwgeom_geos.c
+.endif
+
+post-install:
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/pgs* ${STAGEDIR}${PREFIX}/bin/rast* ${STAGEDIR}${PREFIX}/bin/shp*
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/postgresql/*.so
+	${MKDIR} ${STAGEDIR}${DATADIR}/tiger_geocoder
+	(cd ${WRKSRC}/extras/tiger_geocoder && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/tiger_geocoder/ "! ( -name *\.orig -o -name *\.bak )" )
+	${MKDIR} ${STAGEDIR}${DATADIR}/utils
+	(cd ${WRKSRC}/utils/ && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/utils/ "! ( -name *\.orig -o -name *\.bak -o -name Makefile -o -name *\.in -o -name uninstall_script )" )
+
+.include <bsd.port.post.mk>
diff --git a/databases/postgis33/distinfo b/databases/postgis33/distinfo
new file mode 100644
index 000000000000..4acdb287ec80
--- /dev/null
+++ b/databases/postgis33/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1709187843
+SHA256 (postgis-3.3.6.tar.gz) = 7e898063a9f50f21f42277bfb687bbb9bf5cb6f61ce160031c825403a66911b5
+SIZE (postgis-3.3.6.tar.gz) = 17803608
diff --git a/databases/postgis33/pkg-descr b/databases/postgis33/pkg-descr
new file mode 100644
index 000000000000..a6e2deb0fbac
--- /dev/null
+++ b/databases/postgis33/pkg-descr
@@ -0,0 +1,13 @@
+PostGIS adds support for geographic objects to the PostgreSQL
+object-relational database. In effect, PostGIS "spatially enables"
+the PostgreSQL server, allowing it to be used as a backend spatial
+database for geographic information systems (GIS), much like ESRI's
+SDE or Oracle's Spatial extension. PostGIS follows the OpenGIS
+"Simple Features Specification for SQL" and has been certified as
+compliant with the "Types and Functions" profile.
+
+PostGIS development was started by Refractions Research as a project
+in open source spatial database technology. PostGIS is released
+under the GNU General Public License. PostGIS continues to be
+developed by a group of contributors led by a Project Steering
+Committee and new features continue to be added.
diff --git a/databases/postgis33/pkg-plist b/databases/postgis33/pkg-plist
new file mode 100644
index 000000000000..a5549cf47edb
--- /dev/null
+++ b/databases/postgis33/pkg-plist
@@ -0,0 +1,844 @@
+bin/pgsql2shp
+%%TOPOLOGY%%bin/pgtopo_export
+%%TOPOLOGY%%bin/pgtopo_import
+%%RASTER%%bin/raster2pgsql
+bin/shp2pgsql
+%%LOADERGUI%%bin/shp2pgsql-gui
+%%ADDRSTD%%lib/postgresql/address_standardizer-3.so
+lib/postgresql/postgis-3.so
+%%RASTER%%lib/postgresql/postgis_raster-3.so
+%%SFCGAL%%lib/postgresql/postgis_sfcgal-3.so
+%%TOPOLOGY%%lib/postgresql/postgis_topology-3.so
+%%DATADIR%%/tiger_geocoder/COPYING
+%%DATADIR%%/tiger_geocoder/README
+%%DATADIR%%/tiger_geocoder/create_geocode.bat
+%%DATADIR%%/tiger_geocoder/create_geocode.sh
+%%DATADIR%%/tiger_geocoder/create_geocode.sql
+%%DATADIR%%/tiger_geocoder/geocode/census_tracts_functions.sql
+%%DATADIR%%/tiger_geocoder/geocode/geocode.sql
+%%DATADIR%%/tiger_geocoder/geocode/geocode_address.sql
+%%DATADIR%%/tiger_geocoder/geocode/geocode_intersection.sql
+%%DATADIR%%/tiger_geocoder/geocode/geocode_location.sql
+%%DATADIR%%/tiger_geocoder/geocode/includes_address.sql
+%%DATADIR%%/tiger_geocoder/geocode/interpolate_from_address.sql
+%%DATADIR%%/tiger_geocoder/geocode/other_helper_functions.sql
+%%DATADIR%%/tiger_geocoder/geocode/rate_attributes.sql
+%%DATADIR%%/tiger_geocoder/geocode/reverse_geocode.sql
+%%DATADIR%%/tiger_geocoder/geocode_settings.sql
+%%DATADIR%%/tiger_geocoder/legacy_import/tiger2008/import_tiger_shps.sh
+%%DATADIR%%/tiger_geocoder/normalize/count_words.sql
+%%DATADIR%%/tiger_geocoder/normalize/end_soundex.sql
+%%DATADIR%%/tiger_geocoder/normalize/get_last_words.sql
+%%DATADIR%%/tiger_geocoder/normalize/location_extract.sql
+%%DATADIR%%/tiger_geocoder/normalize/location_extract_countysub_exact.sql
+%%DATADIR%%/tiger_geocoder/normalize/location_extract_countysub_fuzzy.sql
+%%DATADIR%%/tiger_geocoder/normalize/location_extract_place_exact.sql
+%%DATADIR%%/tiger_geocoder/normalize/location_extract_place_fuzzy.sql
+%%DATADIR%%/tiger_geocoder/normalize/normalize_address.sql
+%%DATADIR%%/tiger_geocoder/normalize/pprint_addy.sql
+%%DATADIR%%/tiger_geocoder/normalize/state_extract.sql
+%%DATADIR%%/tiger_geocoder/pagc_normalize/pagc_normalize_address.sql
+%%DATADIR%%/tiger_geocoder/pagc_normalize/pagc_tables.sql
+%%DATADIR%%/tiger_geocoder/regress/geocode_regress
+%%DATADIR%%/tiger_geocoder/regress/geocode_regress.sql
+%%DATADIR%%/tiger_geocoder/regress/normalize_address_desired_regress
+%%DATADIR%%/tiger_geocoder/regress/normalize_address_regress
+%%DATADIR%%/tiger_geocoder/regress/normalize_address_regress.sql
+%%DATADIR%%/tiger_geocoder/regress/pagc_normalize_address_desired_regress
+%%DATADIR%%/tiger_geocoder/regress/pagc_normalize_address_regress
+%%DATADIR%%/tiger_geocoder/regress/pagc_normalize_address_regress.sql
+%%DATADIR%%/tiger_geocoder/regress/regress.sql
+%%DATADIR%%/tiger_geocoder/regress/reverse_geocode_regress
+%%DATADIR%%/tiger_geocoder/regress/reverse_geocode_regress.sql
+%%DATADIR%%/tiger_geocoder/tables/lookup_tables_2011.sql
+%%DATADIR%%/tiger_geocoder/tiger_loader_2011.sql
+%%DATADIR%%/tiger_geocoder/tiger_loader_2012.sql
+%%DATADIR%%/tiger_geocoder/tiger_loader_2013.sql
+%%DATADIR%%/tiger_geocoder/tiger_loader_2014.sql
+%%DATADIR%%/tiger_geocoder/tiger_loader_2015.sql
+%%DATADIR%%/tiger_geocoder/tiger_loader_2016.sql
+%%DATADIR%%/tiger_geocoder/tiger_loader_2017.sql
+%%DATADIR%%/tiger_geocoder/tiger_loader_2018.sql
+%%DATADIR%%/tiger_geocoder/tiger_loader_2019.sql
+%%DATADIR%%/tiger_geocoder/tiger_loader_2020.sql
+%%DATADIR%%/tiger_geocoder/tiger_loader_2021.sql
+%%DATADIR%%/tiger_geocoder/tiger_loader_2022.sql
+%%TOPOLOGY%%%%DATADIR%%/tiger_geocoder/topology/README
+%%TOPOLOGY%%%%DATADIR%%/tiger_geocoder/topology/tiger_topology_loader.sql
+%%DATADIR%%/tiger_geocoder/upgrade_geocode.sql
+%%DATADIR%%/tiger_geocoder/upgrade_geocoder.bat
+%%DATADIR%%/tiger_geocoder/upgrade_geocoder.sh
+%%DATADIR%%/tiger_geocoder/utility/cull_null.sql
+%%DATADIR%%/tiger_geocoder/utility/levenshtein_ignore_case.sql
+%%DATADIR%%/tiger_geocoder/utility/nullable_levenshtein.sql
+%%DATADIR%%/tiger_geocoder/utility/set_search_path.sql
+%%DATADIR%%/tiger_geocoder/utility/standardize_tiger_data.sql
+%%DATADIR%%/tiger_geocoder/utility/utmzone.sql
+%%DATADIR%%/utils/README
+%%DATADIR%%/utils/check_all_upgrades.sh
+%%DATADIR%%/utils/check_cluster_upgrade.sh
+%%DATADIR%%/utils/check_distclean.sh
+%%DATADIR%%/utils/check_news.sh
+%%DATADIR%%/utils/check_tests_enabled.sh
+%%DATADIR%%/utils/create_extension_unpackage.pl
+%%DATADIR%%/utils/create_or_replace_to_create.pl
+%%DATADIR%%/utils/create_skip_signatures.pl
+%%DATADIR%%/utils/create_spatial_ref_sys_config_dump.pl
+%%DATADIR%%/utils/create_undef.pl
+%%DATADIR%%/utils/create_unpackaged.pl
+%%DATADIR%%/utils/create_upgrade.pl
+%%DATADIR%%/utils/postgis_restore.pl
+%%DATADIR%%/utils/postgis_restore_data.generated
+%%DATADIR%%/utils/postgis_restore_data.hardcoded
+%%DATADIR%%/utils/profile_intersects.pl
+%%DATADIR%%/utils/read_scripts_version.pl
+%%DATADIR%%/utils/repo_revision.pl
+%%DATADIR%%/utils/test_estimation.pl
+%%DATADIR%%/utils/test_geography_estimation.pl
+%%DATADIR%%/utils/test_geography_joinestimation.pl
+%%DATADIR%%/utils/test_joinestimation.pl
+%%ADDRSTD%%share/doc/postgresql/extension/README.address_standardizer
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--%%PORTVERSION%%--%%PORTVERSION%%next.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--%%PORTVERSION%%next--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--1.0--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.0.0--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.0.1--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.0.2--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.0.3--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.0.4--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.0.5--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.0.6--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.0.7--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.1.0--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.1.1--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.1.2--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.1.3--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.1.4--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.1.5--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.1.6--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.1.7--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.1.8--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.1.9--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.2.0--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.2.1--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.2.2--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.2.3--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.2.4--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.2.5--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.2.6--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.2.7--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.2.8--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.3.0--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.3.1--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.3.10--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.3.11--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.3.2--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.3.3--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.3.4--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.3.5--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.3.6--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.3.7--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.3.8--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.3.9--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.4.0--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.4.1--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.4.10--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.4.2--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.4.3--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.4.4--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.4.5--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.4.6--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.4.7--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.4.8--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.4.9--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.5.0--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.5.1--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.5.2--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.5.3--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.5.4--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.5.5--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.5.6--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.5.7--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.5.8--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.5.9--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--3.0.0--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--3.0.1--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--3.0.2--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--3.0.3--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--3.0.4--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--3.0.5--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--3.0.6--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--3.0.7--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--3.0.8--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--3.0.9--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--3.0.10--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--3.1.0--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--3.1.1--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--3.1.2--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--3.1.3--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--3.1.4--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--3.1.5--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--3.1.6--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--3.1.7--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--3.1.8--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--3.1.9--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--3.1.10--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--3.2.0--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--3.2.1--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--3.2.2--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--3.2.3--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--3.2.4--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--3.2.5--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--3.2.6--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--3.3.0--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--3.3.1--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--3.3.2--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--3.3.3--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--3.3.4--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--3.3.5--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--ANY--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer.control
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--%%GTK3_VERSION%%--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--%%PORTVERSION%%--%%PORTVERSION%%next.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--%%PORTVERSION%%next--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--2.%%VER%%--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--2.0.0--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--2.0.1--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--2.0.2--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--2.0.3--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--2.0.4--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--2.0.5--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--2.0.6--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--2.0.7--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--2.1.0--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--2.1.1--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--2.1.2--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--2.1.3--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--2.1.4--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--2.1.5--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--2.1.6--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--2.1.7--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--2.1.8--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--2.1.9--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--2.2.0--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--2.2.1--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--2.2.2--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--2.2.3--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--2.2.4--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--2.2.5--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--2.2.6--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--2.2.7--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--2.2.8--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--2.3.0--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--2.3.1--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--2.3.10--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--2.3.11--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--2.3.2--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--2.3.4--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--2.3.5--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--2.3.6--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--2.3.7--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--2.3.8--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--2.3.9--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--2.4.0--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--2.4.1--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--2.4.10--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--2.4.2--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--2.4.3--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--2.4.4--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--2.4.5--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--2.4.6--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--2.4.7--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--2.4.8--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--2.4.9--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--2.5.0--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--2.5.1--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--2.5.2--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--2.5.3--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--2.5.4--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--2.5.5--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--2.5.6--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--2.5.7--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--2.5.8--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--2.5.9--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--3.0.1--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--3.0.2--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--3.0.3--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--3.0.4--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--3.0.5--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--3.0.6--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--3.0.7--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--3.0.8--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--3.0.9--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--3.0.10--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--3.1.0--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--3.1.1--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--3.1.2--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--3.1.3--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--3.1.4--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--3.1.5--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--3.1.6--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--3.1.7--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--3.1.8--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--3.1.9--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--3.1.10--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--3.2.0--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--3.2.1--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--3.2.2--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--3.2.3--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--3.2.4--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--3.2.5--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--3.2.6--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--3.3.0--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--3.3.1--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--3.3.2--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--3.3.3--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--3.3.4--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--3.3.5--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--ANY--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us.control
+%%LOADERGUI%%share/postgresql/applications/shp2pgsql-gui.desktop
+%%LOADERGUI%%share/postgresql/icons/hicolor/16x16/apps/shp2pgsql-gui.png
+%%LOADERGUI%%share/postgresql/icons/hicolor/22x22/apps/shp2pgsql-gui.png
+%%LOADERGUI%%share/postgresql/icons/hicolor/24x24/apps/shp2pgsql-gui.png
+%%LOADERGUI%%share/postgresql/icons/hicolor/32x32/apps/shp2pgsql-gui.png
+%%LOADERGUI%%share/postgresql/icons/hicolor/36x36/apps/shp2pgsql-gui.png
+%%LOADERGUI%%share/postgresql/icons/hicolor/40x40/apps/shp2pgsql-gui.png
+%%LOADERGUI%%share/postgresql/icons/hicolor/42x42/apps/shp2pgsql-gui.png
+%%LOADERGUI%%share/postgresql/icons/hicolor/48x48/apps/shp2pgsql-gui.png
+%%LOADERGUI%%share/postgresql/icons/hicolor/64x64/apps/shp2pgsql-gui.png
+%%LOADERGUI%%share/postgresql/icons/hicolor/8x8/apps/shp2pgsql-gui.png
+%%RASTER%%share/postgresql/extension/postgis_raster--%%PORTVERSION%%--%%PORTVERSION%%next.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--%%PORTVERSION%%next--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--2.0.0--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--2.0.1--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--2.0.2--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--2.0.3--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--2.0.4--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--2.0.5--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--2.0.6--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--2.0.7--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--2.1.0--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--2.1.1--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--2.1.2--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--2.1.3--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--2.1.4--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--2.1.5--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--2.1.6--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--2.1.7--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--2.1.8--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--2.1.9--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--2.2.0--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--2.2.1--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--2.2.2--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--2.2.3--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--2.2.4--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--2.2.5--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--2.2.6--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--2.2.7--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--2.2.8--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--2.3.0--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--2.3.1--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--2.3.10--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--2.3.11--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--2.3.2--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--2.3.3--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--2.3.4--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--2.3.5--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--2.3.6--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--2.3.7--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--2.3.8--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--2.3.9--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--2.4.0--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--2.4.1--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--2.4.10--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--2.4.2--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--2.4.3--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--2.4.4--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--2.4.5--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--2.4.6--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--2.4.7--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--2.4.8--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--2.4.9--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--2.5.0--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--2.5.1--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--2.5.2--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--2.5.3--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--2.5.4--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--2.5.5--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--2.5.6--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--2.5.7--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--2.5.8--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--2.5.9--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--3.0.0--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--3.0.1--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--3.0.2--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--3.0.3--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--3.0.4--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--3.0.5--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--3.0.6--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--3.0.7--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--3.0.8--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--3.0.9--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--3.0.10--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--3.1.0--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--3.1.1--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--3.1.2--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--3.1.3--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--3.1.4--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--3.1.5--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--3.1.6--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--3.1.7--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--3.1.8--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--3.1.9--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--3.1.10--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--3.2.0--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--3.2.1--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--3.2.2--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--3.2.3--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--3.2.4--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--3.2.5--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--3.2.6--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--3.3.0--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--3.3.1--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--3.3.2--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--3.3.3--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--3.3.4--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--3.3.5--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--ANY--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--unpackaged--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--unpackaged.sql
+%%RASTER%%share/postgresql/extension/postgis_raster.control
+%%RASTER%%share/postgresql/contrib/postgis-%%VER%%/raster_comments.sql
+%%SFCGAL%%share/postgresql/contrib/postgis-%%VER%%/sfcgal.sql
+%%SFCGAL%%share/postgresql/contrib/postgis-%%VER%%/sfcgal_comments.sql
+%%SFCGAL%%share/postgresql/contrib/postgis-%%VER%%/sfcgal_upgrade.sql
+%%SFCGAL%%share/postgresql/contrib/postgis-%%VER%%/uninstall_sfcgal.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--%%PORTVERSION%%--%%PORTVERSION%%next.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--%%PORTVERSION%%next--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.0.0--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.0.1--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.0.2--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.0.3--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.0.4--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.0.5--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.0.6--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.0.7--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.1.0--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.1.1--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.1.2--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.1.3--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.1.4--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.1.5--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.1.6--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.1.7--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.1.8--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.1.9--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.2.0--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.2.1--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.2.2--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.2.3--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.2.4--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.2.5--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.2.6--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.2.7--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.2.8--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.3.0--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.3.1--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.3.10--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.3.11--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.3.2--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.3.3--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.3.4--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.3.5--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.3.6--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.3.7--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.3.8--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.3.9--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.4.0--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.4.1--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.4.10--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.4.2--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.4.3--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.4.4--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.4.5--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.4.6--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.4.7--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.4.8--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.4.9--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.5.0--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.5.1--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.5.2--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.5.3--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.5.4--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.5.5--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.5.6--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.5.7--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.5.8--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.5.9--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--3.0.0--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--3.0.1--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--3.0.2--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--3.0.3--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--3.0.4--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--3.0.5--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--3.0.6--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--3.0.7--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--3.0.8--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--3.0.9--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--3.0.10--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--3.1.0--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--3.1.1--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--3.1.2--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--3.1.3--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--3.1.4--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--3.1.5--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--3.1.6--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--3.1.7--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--3.1.8--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--3.1.9--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--3.1.10--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--3.2.0--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--3.2.1--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--3.2.2--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--3.2.3--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--3.2.4--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--3.2.5--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--3.2.6--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--3.3.0--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--3.3.1--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--3.3.2--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--3.3.3--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--3.3.4--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--3.3.5--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--ANY--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--unpackaged--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--unpackaged.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal.control
+%%TOPOLOGY%%share/postgresql/contrib/postgis-%%VER%%/topology.sql
+%%TOPOLOGY%%share/postgresql/contrib/postgis-%%VER%%/topology_comments.sql
+%%TOPOLOGY%%share/postgresql/contrib/postgis-%%VER%%/topology_upgrade.sql
+%%TOPOLOGY%%share/postgresql/contrib/postgis-%%VER%%/uninstall_topology.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--%%PORTVERSION%%--%%PORTVERSION%%next.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--%%PORTVERSION%%next--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.0.0--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.0.1--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.0.2--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.0.3--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.0.4--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.0.5--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.0.6--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.0.7--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.1.0--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.1.1--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.1.2--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.1.3--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.1.4--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.1.5--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.1.6--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.1.7--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.1.8--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.1.9--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.2.0--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.2.1--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.2.2--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.2.3--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.2.4--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.2.5--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.2.6--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.2.7--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.2.8--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.3.0--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.3.1--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.3.10--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.3.11--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.3.2--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.3.3--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.3.4--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.3.5--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.3.6--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.3.7--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.3.8--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.3.9--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.4.0--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.4.1--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.4.10--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.4.2--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.4.3--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.4.4--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.4.5--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.4.6--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.4.7--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.4.8--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.4.9--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.5.0--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.5.1--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.5.2--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.5.3--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.5.4--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.5.5--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.5.6--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.5.7--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.5.8--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.5.9--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--3.0.0--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--3.0.1--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--3.0.2--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--3.0.3--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--3.0.4--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--3.0.5--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--3.0.6--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--3.0.7--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--3.0.8--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--3.0.9--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--3.0.10--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--3.1.0--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--3.1.1--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--3.1.2--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--3.1.3--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--3.1.4--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--3.1.5--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--3.1.6--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--3.1.7--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--3.1.8--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--3.1.9--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--3.1.10--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--3.2.0--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--3.2.1--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--3.2.2--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--3.2.3--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--3.2.4--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--3.2.5--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--3.2.6--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--3.3.0--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--3.3.1--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--3.3.2--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--3.3.3--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--3.3.4--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--3.3.5--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--ANY--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--unpackaged--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--unpackaged.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology.control
+share/postgresql/contrib/postgis-%%VER%%/legacy.sql
+share/postgresql/contrib/postgis-%%VER%%/legacy_gist.sql
+share/postgresql/contrib/postgis-%%VER%%/legacy_minimal.sql
+share/postgresql/contrib/postgis-%%VER%%/postgis.sql
+share/postgresql/contrib/postgis-%%VER%%/postgis_comments.sql
+share/postgresql/contrib/postgis-%%VER%%/postgis_restore.pl
+share/postgresql/contrib/postgis-%%VER%%/postgis_upgrade.sql
+share/postgresql/contrib/postgis-%%VER%%/rtpostgis.sql
+share/postgresql/contrib/postgis-%%VER%%/rtpostgis_legacy.sql
+share/postgresql/contrib/postgis-%%VER%%/rtpostgis_upgrade.sql
+share/postgresql/contrib/postgis-%%VER%%/spatial_ref_sys.sql
+share/postgresql/contrib/postgis-%%VER%%/uninstall_legacy.sql
+share/postgresql/contrib/postgis-%%VER%%/uninstall_postgis.sql
+share/postgresql/contrib/postgis-%%VER%%/uninstall_rtpostgis.sql
+share/postgresql/extension/postgis--%%PORTVERSION%%--%%PORTVERSION%%next.sql
+share/postgresql/extension/postgis--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--%%PORTVERSION%%next--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--2.0.0--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--2.0.1--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--2.0.2--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--2.0.3--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--2.0.4--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--2.0.5--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--2.0.6--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--2.0.7--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--2.1.0--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--2.1.1--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--2.1.2--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--2.1.3--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--2.1.4--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--2.1.5--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--2.1.6--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--2.1.7--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--2.1.8--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--2.1.9--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--2.2.0--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--2.2.1--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--2.2.2--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--2.2.3--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--2.2.4--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--2.2.5--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--2.2.6--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--2.2.7--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--2.2.8--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--2.3.0--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--2.3.1--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--2.3.10--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--2.3.11--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--2.3.2--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--2.3.3--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--2.3.4--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--2.3.5--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--2.3.6--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--2.3.7--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--2.3.8--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--2.3.9--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--2.4.0--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--2.4.1--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--2.4.10--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--2.4.2--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--2.4.3--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--2.4.4--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--2.4.5--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--2.4.6--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--2.4.7--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--2.4.8--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--2.4.9--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--2.5.0--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--2.5.1--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--2.5.2--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--2.5.3--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--2.5.4--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--2.5.5--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--2.5.6--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--2.5.7--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--2.5.8--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--2.5.9--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--3.0.0--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--3.0.1--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--3.0.2--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--3.0.3--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--3.0.4--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--3.0.5--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--3.0.6--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--3.0.7--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--3.0.8--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--3.0.9--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--3.0.10--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--3.1.0--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--3.1.1--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--3.1.2--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--3.1.3--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--3.1.4--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--3.1.5--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--3.1.6--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--3.1.7--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--3.1.8--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--3.1.9--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--3.1.10--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--3.2.0--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--3.2.1--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--3.2.2--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--3.2.3--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--3.2.4--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--3.2.5--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--3.2.6--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--3.3.0--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--3.3.1--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--3.3.2--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--3.3.3--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--3.3.4--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--3.3.5--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--ANY--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--unpackaged--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--unpackaged.sql
+share/postgresql/extension/postgis.control
+share/postgresql/extension/postgis_tiger_geocoder--%%PORTVERSION%%--%%PORTVERSION%%next.sql
+share/postgresql/extension/postgis_tiger_geocoder--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--%%PORTVERSION%%next--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.0.0--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.0.1--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.0.2--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.0.3--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.0.4--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.0.5--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.0.6--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.0.7--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.1.0--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.1.1--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.1.2--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.1.3--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.1.4--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.1.5--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.1.6--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.1.7--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.1.8--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.1.9--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.2.0--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.2.1--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.2.2--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.2.3--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.2.4--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.2.5--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.2.6--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.2.7--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.2.8--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.3.0--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.3.1--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.3.10--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.3.11--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.3.2--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.3.3--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.3.4--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.3.5--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.3.6--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.3.7--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.3.8--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.3.9--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.4.0--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.4.1--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.4.10--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.4.2--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.4.3--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.4.4--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.4.5--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.4.6--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.4.7--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.4.8--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.4.9--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.5.0--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.5.1--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.5.2--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.5.3--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.5.4--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.5.5--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.5.6--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.5.7--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.5.8--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.5.9--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--3.0.0--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--3.0.1--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--3.0.2--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--3.0.3--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--3.0.4--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--3.0.5--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--3.0.6--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--3.0.7--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--3.0.8--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--3.0.9--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--3.0.10--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--3.1.0--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--3.1.1--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--3.1.2--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--3.1.3--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--3.1.4--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--3.1.5--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--3.1.6--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--3.1.7--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--3.1.8--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--3.1.9--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--3.1.10--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--3.2.0--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--3.2.1--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--3.2.2--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--3.2.3--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--3.2.4--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--3.2.5--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--3.2.6--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--3.3.0--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--3.3.1--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--3.3.2--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--3.3.3--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--3.3.4--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--3.3.5--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--ANY--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--unpackaged--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder.control
diff --git a/databases/postgis34/Makefile b/databases/postgis34/Makefile
new file mode 100644
index 000000000000..94a40164bf81
--- /dev/null
+++ b/databases/postgis34/Makefile
@@ -0,0 +1,88 @@
+PORTNAME=	postgis
+DISTVERSION=	3.4.2
+PORTREVISION=	2
+CATEGORIES=	databases geography
+MASTER_SITES=	https://download.osgeo.org/postgis/source/
+PKGNAMESUFFIX=	34
+
+MAINTAINER=	lbartoletti@FreeBSD.org
+COMMENT=	Geographic objects support for PostgreSQL databases
+WWW=		https://postgis.net/
+
+LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/COPYING
+
+LIB_DEPENDS=	libproj.so:graphics/proj \
+		libgeos.so:graphics/geos \
+		libjson-c.so:devel/json-c \
+		libgdal.so:graphics/gdal \
+		libpcre2-8.so:devel/pcre2
+
+USES=		alias compiler:c++11-lang cpe gmake gnome iconv:wchar_t libtool:keepla \
+		localbase perl5 pkgconfig pgsql:11+ shebangfix
+USE_GNOME=	libxml2
+USE_PERL5=	build
+
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	${ICONV_CONFIGURE_BASE} NUMERICFLAGS=${PORTVERSION}
+GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
+SHEBANG_FILES=	extensions/address_standardizer/*.pl regress/run_test.pl \
+		utils/postgis_restore.pl.in utils/*.pl loader/postgis.pl
+WANT_PGSQL=	server
+
+OPTIONS_DEFINE=	ADDRSTD JSON LOADERGUI NLS PROTOBUF RASTER SFCGAL TOPOLOGY
+OPTIONS_DEFAULT=ADDRSTD JSON NLS PROTOBUF RASTER SFCGAL TOPOLOGY LOADERGUI
+OPTIONS_SUB=	yes
+
+ADDRSTD_DESC=	Enable address standardizer
+JSON_DESC=	Enable JSON support
+NLS_DESC=	Enable international language support
+LOADERGUI_DESC=	Enable shp2pgsql-gui
+PROTOBUF_DESC=	Enable protocol buffers
+RASTER_DESC=	Enable raster support
+SFCGAL_DESC=	Enable sfcgal
+TOPOLOGY_DESC=	Topology support
+
+ADDRSTD_CONFIGURE_WITH=		address-standardizer
+ADDRSTD_LIB_DEPENDS=		libpcre.so:devel/pcre
+ADDRSTD_VARS=			WANT_PGSQL+=contrib
+JSON_CONFIGURE_WITH=		json
+JSON_LIB_DEPENDS=		libjson-c.so:devel/json-c
+LOADERGUI_CONFIGURE_WITH=	gui
+LOADERGUI_LIB_DEPENDS=		libprotobuf-c.so:devel/protobuf-c
+LOADERGUI_USE=			GNOME=gtk20
+LOADERGUI_USES=			desktop-file-utils
+NLS_CONFIGURE_WITH=		nls
+NLS_USES=			gettext
+PROTOBUF_CONFIGURE_WITH=	protobuf
+PROTOBUF_LIB_DEPENDS=		libprotobuf-c.so:devel/protobuf-c
+SFCGAL_CONFIGURE_WITH=		sfcgal=${LOCALBASE}/bin/sfcgal-config
+SFCGAL_LIB_DEPENDS=		libSFCGAL.so:databases/sfcgal
+TOPOLOGY_CONFIGURE_WITH=	topology
+RASTER_CONFIGURE_WITH=		raster
+
+CONFLICTS_INSTALL=	postgis[0-9][0-9] # lib/postgresql/address_standardizer-3.so
+
+VER=		${PORTVERSION:R}
+
+PLIST_SUB=	PORTVERSION=${PORTVERSION}${DISTVERSIONSUFFIX} \
+		VER=${VER}
+
+.include <bsd.port.pre.mk>
+
+.if ${CHOSEN_COMPILER_TYPE} == gcc
+post-patch:
+	${REINPLACE_CMD} -e '/^#pragma GCC diagnostic/d' \
+		${WRKSRC}/postgis/lwgeom_functions_basic.c \
+		${WRKSRC}/postgis/lwgeom_geos.c
+.endif
+
+post-install:
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/pgs* ${STAGEDIR}${PREFIX}/bin/rast* ${STAGEDIR}${PREFIX}/bin/shp*
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/postgresql/*.so
+	${MKDIR} ${STAGEDIR}${DATADIR}/tiger_geocoder
+	(cd ${WRKSRC}/extras/tiger_geocoder && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/tiger_geocoder/ "! ( -name *\.orig -o -name *\.bak )" )
+	${MKDIR} ${STAGEDIR}${DATADIR}/utils
+	(cd ${WRKSRC}/utils/ && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/utils/ "! ( -name *\.orig -o -name *\.bak -o -name Makefile -o -name *\.in -o -name uninstall_script )" )
+
+.include <bsd.port.post.mk>
diff --git a/databases/postgis34/distinfo b/databases/postgis34/distinfo
new file mode 100644
index 000000000000..81b5236b2f17
--- /dev/null
+++ b/databases/postgis34/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1709187859
+SHA256 (postgis-3.4.2.tar.gz) = c8c874c00ba4a984a87030af6bf9544821502060ad473d5c96f1d4d0835c5892
+SIZE (postgis-3.4.2.tar.gz) = 14957647
diff --git a/databases/postgis34/pkg-descr b/databases/postgis34/pkg-descr
new file mode 100644
index 000000000000..a6e2deb0fbac
--- /dev/null
+++ b/databases/postgis34/pkg-descr
@@ -0,0 +1,13 @@
+PostGIS adds support for geographic objects to the PostgreSQL
+object-relational database. In effect, PostGIS "spatially enables"
+the PostgreSQL server, allowing it to be used as a backend spatial
+database for geographic information systems (GIS), much like ESRI's
+SDE or Oracle's Spatial extension. PostGIS follows the OpenGIS
+"Simple Features Specification for SQL" and has been certified as
+compliant with the "Types and Functions" profile.
+
+PostGIS development was started by Refractions Research as a project
+in open source spatial database technology. PostGIS is released
+under the GNU General Public License. PostGIS continues to be
+developed by a group of contributors led by a Project Steering
+Committee and new features continue to be added.
diff --git a/databases/postgis34/pkg-plist b/databases/postgis34/pkg-plist
new file mode 100644
index 000000000000..d08364ff70b4
--- /dev/null
+++ b/databases/postgis34/pkg-plist
@@ -0,0 +1,872 @@
+bin/postgis
+bin/postgis_restore
+bin/pgsql2shp
+%%TOPOLOGY%%bin/pgtopo_export
+%%TOPOLOGY%%bin/pgtopo_import
+%%RASTER%%bin/raster2pgsql
+bin/shp2pgsql
+%%LOADERGUI%%bin/shp2pgsql-gui
+%%ADDRSTD%%lib/postgresql/address_standardizer-3.so
+lib/postgresql/postgis-3.so
+%%RASTER%%lib/postgresql/postgis_raster-3.so
+%%SFCGAL%%lib/postgresql/postgis_sfcgal-3.so
+%%TOPOLOGY%%lib/postgresql/postgis_topology-3.so
+share/man/man1/pgsql2shp.1.gz
+%%TOPOLOGY%%share/man/man1/pgtopo_export.1.gz
+%%TOPOLOGY%%share/man/man1/pgtopo_import.1.gz
+share/man/man1/postgis.1.gz
+share/man/man1/postgis_restore.1.gz
+share/man/man1/shp2pgsql.1.gz
+%%DATADIR%%/tiger_geocoder/COPYING
+%%DATADIR%%/tiger_geocoder/README
+%%DATADIR%%/tiger_geocoder/create_geocode.bat
+%%DATADIR%%/tiger_geocoder/create_geocode.sh
+%%DATADIR%%/tiger_geocoder/create_geocode.sql
+%%DATADIR%%/tiger_geocoder/geocode/census_tracts_functions.sql
+%%DATADIR%%/tiger_geocoder/geocode/geocode.sql
+%%DATADIR%%/tiger_geocoder/geocode/geocode_address.sql
+%%DATADIR%%/tiger_geocoder/geocode/geocode_intersection.sql
+%%DATADIR%%/tiger_geocoder/geocode/geocode_location.sql
+%%DATADIR%%/tiger_geocoder/geocode/includes_address.sql
+%%DATADIR%%/tiger_geocoder/geocode/interpolate_from_address.sql
+%%DATADIR%%/tiger_geocoder/geocode/other_helper_functions.sql
+%%DATADIR%%/tiger_geocoder/geocode/rate_attributes.sql
+%%DATADIR%%/tiger_geocoder/geocode/reverse_geocode.sql
+%%DATADIR%%/tiger_geocoder/geocode_settings.sql
+%%DATADIR%%/tiger_geocoder/legacy_import/tiger2008/import_tiger_shps.sh
+%%DATADIR%%/tiger_geocoder/normalize/count_words.sql
+%%DATADIR%%/tiger_geocoder/normalize/end_soundex.sql
+%%DATADIR%%/tiger_geocoder/normalize/get_last_words.sql
+%%DATADIR%%/tiger_geocoder/normalize/location_extract.sql
+%%DATADIR%%/tiger_geocoder/normalize/location_extract_countysub_exact.sql
+%%DATADIR%%/tiger_geocoder/normalize/location_extract_countysub_fuzzy.sql
+%%DATADIR%%/tiger_geocoder/normalize/location_extract_place_exact.sql
+%%DATADIR%%/tiger_geocoder/normalize/location_extract_place_fuzzy.sql
+%%DATADIR%%/tiger_geocoder/normalize/normalize_address.sql
+%%DATADIR%%/tiger_geocoder/normalize/pprint_addy.sql
+%%DATADIR%%/tiger_geocoder/normalize/state_extract.sql
+%%DATADIR%%/tiger_geocoder/pagc_normalize/pagc_normalize_address.sql
+%%DATADIR%%/tiger_geocoder/pagc_normalize/pagc_tables.sql
+%%DATADIR%%/tiger_geocoder/regress/geocode_regress
+%%DATADIR%%/tiger_geocoder/regress/geocode_regress.sql
+%%DATADIR%%/tiger_geocoder/regress/normalize_address_desired_regress
+%%DATADIR%%/tiger_geocoder/regress/normalize_address_regress
+%%DATADIR%%/tiger_geocoder/regress/normalize_address_regress.sql
+%%DATADIR%%/tiger_geocoder/regress/pagc_normalize_address_desired_regress
+%%DATADIR%%/tiger_geocoder/regress/pagc_normalize_address_regress
+%%DATADIR%%/tiger_geocoder/regress/pagc_normalize_address_regress.sql
+%%DATADIR%%/tiger_geocoder/regress/regress.sql
+%%DATADIR%%/tiger_geocoder/regress/reverse_geocode_regress
+%%DATADIR%%/tiger_geocoder/regress/reverse_geocode_regress.sql
+%%DATADIR%%/tiger_geocoder/tables/lookup_tables_2011.sql
+%%DATADIR%%/tiger_geocoder/tiger_loader_2011.sql
+%%DATADIR%%/tiger_geocoder/tiger_loader_2012.sql
+%%DATADIR%%/tiger_geocoder/tiger_loader_2013.sql
+%%DATADIR%%/tiger_geocoder/tiger_loader_2014.sql
+%%DATADIR%%/tiger_geocoder/tiger_loader_2015.sql
+%%DATADIR%%/tiger_geocoder/tiger_loader_2016.sql
+%%DATADIR%%/tiger_geocoder/tiger_loader_2017.sql
+%%DATADIR%%/tiger_geocoder/tiger_loader_2018.sql
+%%DATADIR%%/tiger_geocoder/tiger_loader_2019.sql
+%%DATADIR%%/tiger_geocoder/tiger_loader_2020.sql
+%%DATADIR%%/tiger_geocoder/tiger_loader_2021.sql
+%%DATADIR%%/tiger_geocoder/tiger_loader_2022.sql
+%%DATADIR%%/tiger_geocoder/tiger_loader_2023.sql
+%%TOPOLOGY%%%%DATADIR%%/tiger_geocoder/topology/README
+%%TOPOLOGY%%%%DATADIR%%/tiger_geocoder/topology/tiger_topology_loader.sql
+%%DATADIR%%/tiger_geocoder/upgrade_geocode.sql
+%%DATADIR%%/tiger_geocoder/upgrade_geocoder.bat
+%%DATADIR%%/tiger_geocoder/upgrade_geocoder.sh
+%%DATADIR%%/tiger_geocoder/utility/cull_null.sql
+%%DATADIR%%/tiger_geocoder/utility/levenshtein_ignore_case.sql
+%%DATADIR%%/tiger_geocoder/utility/nullable_levenshtein.sql
+%%DATADIR%%/tiger_geocoder/utility/set_search_path.sql
+%%DATADIR%%/tiger_geocoder/utility/standardize_tiger_data.sql
+%%DATADIR%%/tiger_geocoder/utility/utmzone.sql
+%%DATADIR%%/utils/README
+%%DATADIR%%/utils/check_all_upgrades.sh
+%%DATADIR%%/utils/check_cluster_upgrade.sh
+%%DATADIR%%/utils/check_distclean.sh
+%%DATADIR%%/utils/check_extension_downgrades.sql
+%%DATADIR%%/utils/check_localized_cheatsheets.sh
+%%DATADIR%%/utils/check_news.sh
+%%DATADIR%%/utils/check_tests_enabled.sh
+%%DATADIR%%/utils/create_extension_unpackage.pl
+%%DATADIR%%/utils/create_or_replace_to_create.pl
+%%DATADIR%%/utils/create_skip_signatures.pl
+%%DATADIR%%/utils/create_spatial_ref_sys_config_dump.pl
+%%DATADIR%%/utils/create_uninstall.pl
+%%DATADIR%%/utils/create_unpackaged.pl
+%%DATADIR%%/utils/create_upgrade.pl
+%%DATADIR%%/utils/extract_majmin_version.sh
+%%DATADIR%%/utils/fix_xml_entities.sh
+%%DATADIR%%/utils/postgis_restore.pl
+%%DATADIR%%/utils/postgis_restore_data.generated
+%%DATADIR%%/utils/postgis_restore_data.hardcoded
+%%DATADIR%%/utils/profile_intersects.pl
+%%DATADIR%%/utils/read_scripts_version.pl
+%%DATADIR%%/utils/repo_revision.pl
+%%DATADIR%%/utils/test_estimation.pl
+%%DATADIR%%/utils/test_geography_estimation.pl
+%%DATADIR%%/utils/test_geography_joinestimation.pl
+%%DATADIR%%/utils/test_joinestimation.pl
+%%ADDRSTD%%share/doc/postgresql/extension/README.address_standardizer
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--1.0--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.0.0--ANY.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.0.1--ANY.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.0.2--ANY.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.0.3--ANY.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.0.4--ANY.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.0.5--ANY.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.0.6--ANY.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.0.7--ANY.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.1.0--ANY.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.1.1--ANY.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.1.2--ANY.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.1.3--ANY.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.1.4--ANY.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.1.5--ANY.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.1.6--ANY.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.1.7--ANY.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.1.8--ANY.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.1.9--ANY.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.2.0--ANY.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.2.1--ANY.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.2.2--ANY.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.2.3--ANY.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.2.4--ANY.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.2.5--ANY.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.2.6--ANY.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.2.7--ANY.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.2.8--ANY.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.3.0--ANY.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.3.1--ANY.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.3.10--ANY.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.3.11--ANY.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.3.2--ANY.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.3.3--ANY.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.3.4--ANY.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.3.5--ANY.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.3.6--ANY.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.3.7--ANY.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.3.8--ANY.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.3.9--ANY.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.4.0--ANY.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.4.1--ANY.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.4.10--ANY.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.4.2--ANY.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.4.3--ANY.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.4.4--ANY.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.4.5--ANY.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.4.6--ANY.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.4.7--ANY.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.4.8--ANY.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.4.9--ANY.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.5.0--ANY.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.5.1--ANY.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.5.2--ANY.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.5.3--ANY.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.5.4--ANY.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.5.5--ANY.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.5.6--ANY.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.5.7--ANY.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.5.8--ANY.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--2.5.9--ANY.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--3.0.0--ANY.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--3.0.1--ANY.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--3.0.2--ANY.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--3.0.3--ANY.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--3.0.4--ANY.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--3.0.5--ANY.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--3.0.6--ANY.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--3.0.7--ANY.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--3.0.8--ANY.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--3.0.9--ANY.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--3.0.10--ANY.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--3.1.0--ANY.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--3.1.1--ANY.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--3.1.2--ANY.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--3.1.3--ANY.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--3.1.4--ANY.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--3.1.5--ANY.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--3.1.6--ANY.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--3.1.7--ANY.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--3.1.8--ANY.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--3.1.9--ANY.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--3.1.10--ANY.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--3.2.0--ANY.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--3.2.1--ANY.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--3.2.2--ANY.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--3.2.3--ANY.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--3.2.4--ANY.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--3.2.5--ANY.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--3.2.6--ANY.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--3.3.0--ANY.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--3.3.1--ANY.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--3.3.2--ANY.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--3.3.3--ANY.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--3.3.4--ANY.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--3.3.5--ANY.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--3.4.0--ANY.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--3.4.1--ANY.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--ANY--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--%%PORTVERSION%%--ANY.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer--TEMPLATED--TO--ANY.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer.control
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--%%PORTVERSION%%--ANY.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--%%PORTVERSION%%next--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--%%PORTVERSION%%--%%PORTVERSION%%next.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--2.0.0--ANY.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--2.0.1--ANY.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--2.0.2--ANY.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--2.0.3--ANY.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--2.0.4--ANY.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--2.0.5--ANY.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--2.0.6--ANY.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--2.0.7--ANY.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--2.1.0--ANY.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--2.1.1--ANY.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--2.1.2--ANY.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--2.1.3--ANY.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--2.1.4--ANY.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--2.1.5--ANY.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--2.1.6--ANY.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--2.1.7--ANY.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--2.1.8--ANY.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--2.1.9--ANY.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--2.2.0--ANY.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--2.2.1--ANY.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--2.2.2--ANY.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--2.2.3--ANY.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--2.2.4--ANY.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--2.2.5--ANY.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--2.2.6--ANY.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--2.2.7--ANY.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--2.2.8--ANY.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--2.3.0--ANY.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--2.3.1--ANY.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--2.3.10--ANY.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--2.3.11--ANY.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--2.3.2--ANY.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--2.3.3--ANY.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--2.3.4--ANY.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--2.3.5--ANY.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--2.3.6--ANY.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--2.3.7--ANY.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--2.3.8--ANY.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--2.3.9--ANY.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--2.4.0--ANY.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--2.4.1--ANY.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--2.4.10--ANY.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--2.4.2--ANY.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--2.4.3--ANY.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--2.4.4--ANY.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--2.4.5--ANY.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--2.4.6--ANY.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--2.4.7--ANY.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--2.4.8--ANY.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--2.4.9--ANY.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--2.5.0--ANY.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--2.5.1--ANY.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--2.5.2--ANY.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--2.5.3--ANY.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--2.5.4--ANY.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--2.5.5--ANY.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--2.5.6--ANY.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--2.5.7--ANY.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--2.5.8--ANY.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--2.5.9--ANY.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--3.0.0--ANY.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--3.0.1--ANY.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--3.0.2--ANY.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--3.0.3--ANY.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--3.0.4--ANY.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--3.0.5--ANY.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--3.0.6--ANY.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--3.0.7--ANY.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--3.0.8--ANY.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--3.0.9--ANY.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--3.0.10--ANY.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--3.1.0--ANY.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--3.1.1--ANY.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--3.1.2--ANY.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--3.1.3--ANY.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--3.1.4--ANY.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--3.1.5--ANY.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--3.1.6--ANY.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--3.1.7--ANY.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--3.1.8--ANY.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--3.1.9--ANY.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--3.1.10--ANY.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--3.2.0--ANY.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--3.2.1--ANY.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--3.2.2--ANY.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--3.2.3--ANY.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--3.2.4--ANY.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--3.2.5--ANY.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--3.2.6--ANY.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--3.3.0--ANY.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--3.3.1--ANY.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--3.3.2--ANY.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--3.3.3--ANY.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--3.3.4--ANY.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--3.3.5--ANY.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--3.4.0--ANY.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--3.4.1--ANY.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--ANY--%%PORTVERSION%%.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us--TEMPLATED--TO--ANY.sql
+%%ADDRSTD%%share/postgresql/extension/address_standardizer_data_us.control
+share/postgresql/extension/postgis--3.3.4--ANY.sql
+share/postgresql/extension/postgis--3.3.5--ANY.sql
+share/postgresql/extension/postgis--3.4.0--ANY.sql
+share/postgresql/extension/postgis--3.4.1--ANY.sql
+share/postgresql/extension/postgis--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--%%PORTVERSION%%--ANY.sql
+share/postgresql/extension/postgis--ANY--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis--TEMPLATED--TO--ANY.sql
+share/postgresql/extension/postgis--unpackaged--%%PORTVERSION%%.sql
+%%LOADERGUI%%share/applications/shp2pgsql-gui.desktop
+%%LOADERGUI%%share/icons/hicolor/16x16/apps/shp2pgsql-gui.png
+%%LOADERGUI%%share/icons/hicolor/22x22/apps/shp2pgsql-gui.png
+%%LOADERGUI%%share/icons/hicolor/24x24/apps/shp2pgsql-gui.png
+%%LOADERGUI%%share/icons/hicolor/32x32/apps/shp2pgsql-gui.png
+%%LOADERGUI%%share/icons/hicolor/36x36/apps/shp2pgsql-gui.png
+%%LOADERGUI%%share/icons/hicolor/40x40/apps/shp2pgsql-gui.png
+%%LOADERGUI%%share/icons/hicolor/42x42/apps/shp2pgsql-gui.png
+%%LOADERGUI%%share/icons/hicolor/48x48/apps/shp2pgsql-gui.png
+%%LOADERGUI%%share/icons/hicolor/64x64/apps/shp2pgsql-gui.png
+%%LOADERGUI%%share/icons/hicolor/8x8/apps/shp2pgsql-gui.png
+%%RASTER%%share/postgresql/contrib/postgis-%%VER%%/raster_comments.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--2.0.0--ANY.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--2.0.1--ANY.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--2.0.2--ANY.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--2.0.3--ANY.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--2.0.4--ANY.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--2.0.5--ANY.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--2.0.6--ANY.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--2.0.7--ANY.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--2.1.0--ANY.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--2.1.1--ANY.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--2.1.2--ANY.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--2.1.3--ANY.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--2.1.4--ANY.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--2.1.5--ANY.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--2.1.6--ANY.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--2.1.7--ANY.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--2.1.8--ANY.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--2.1.9--ANY.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--2.2.0--ANY.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--2.2.1--ANY.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--2.2.2--ANY.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--2.2.3--ANY.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--2.2.4--ANY.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--2.2.5--ANY.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--2.2.6--ANY.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--2.2.7--ANY.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--2.2.8--ANY.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--2.3.0--ANY.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--2.3.1--ANY.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--2.3.10--ANY.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--2.3.11--ANY.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--2.3.2--ANY.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--2.3.3--ANY.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--2.3.4--ANY.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--2.3.5--ANY.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--2.3.6--ANY.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--2.3.7--ANY.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--2.3.8--ANY.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--2.3.9--ANY.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--2.4.0--ANY.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--2.4.1--ANY.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--2.4.10--ANY.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--2.4.2--ANY.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--2.4.3--ANY.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--2.4.4--ANY.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--2.4.5--ANY.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--2.4.6--ANY.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--2.4.7--ANY.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--2.4.8--ANY.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--2.4.9--ANY.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--2.5.0--ANY.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--2.5.1--ANY.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--2.5.2--ANY.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--2.5.3--ANY.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--2.5.4--ANY.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--2.5.5--ANY.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--2.5.6--ANY.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--2.5.7--ANY.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--2.5.8--ANY.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--2.5.9--ANY.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--3.0.0--ANY.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--3.0.1--ANY.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--3.0.2--ANY.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--3.0.3--ANY.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--3.0.4--ANY.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--3.0.5--ANY.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--3.0.6--ANY.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--3.0.7--ANY.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--3.0.8--ANY.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--3.0.9--ANY.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--3.0.10--ANY.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--3.1.0--ANY.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--3.1.1--ANY.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--3.1.2--ANY.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--3.1.3--ANY.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--3.1.4--ANY.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--3.1.5--ANY.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--3.1.6--ANY.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--3.1.7--ANY.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--3.1.8--ANY.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--3.1.9--ANY.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--3.1.10--ANY.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--3.2.0--ANY.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--3.2.1--ANY.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--3.2.2--ANY.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--3.2.3--ANY.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--3.2.4--ANY.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--3.2.5--ANY.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--3.2.6--ANY.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--3.3.0--ANY.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--3.3.1--ANY.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--3.3.2--ANY.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--3.3.3--ANY.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--3.3.4--ANY.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--3.3.5--ANY.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--3.4.0--ANY.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--3.4.1--ANY.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--%%PORTVERSION%%--ANY.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--ANY--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--TEMPLATED--TO--ANY.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--unpackaged--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_raster--unpackaged.sql
+%%RASTER%%share/postgresql/extension/postgis_raster.control
+%%SFCGAL%%share/postgresql/contrib/postgis-%%VER%%/sfcgal.sql
+%%SFCGAL%%share/postgresql/contrib/postgis-%%VER%%/sfcgal_comments.sql
+%%SFCGAL%%share/postgresql/contrib/postgis-%%VER%%/sfcgal_upgrade.sql
+%%SFCGAL%%share/postgresql/contrib/postgis-%%VER%%/uninstall_sfcgal.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.0.0--ANY.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.0.1--ANY.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.0.2--ANY.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.0.3--ANY.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.0.4--ANY.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.0.5--ANY.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.0.6--ANY.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.0.7--ANY.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.1.0--ANY.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.1.1--ANY.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.1.2--ANY.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.1.3--ANY.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.1.4--ANY.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.1.5--ANY.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.1.6--ANY.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.1.7--ANY.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.1.8--ANY.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.1.9--ANY.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.2.0--ANY.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.2.1--ANY.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.2.2--ANY.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.2.3--ANY.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.2.4--ANY.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.2.5--ANY.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.2.6--ANY.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.2.7--ANY.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.2.8--ANY.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.3.0--ANY.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.3.1--ANY.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.3.10--ANY.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.3.11--ANY.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.3.2--ANY.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.3.3--ANY.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.3.4--ANY.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.3.5--ANY.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.3.6--ANY.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.3.7--ANY.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.3.8--ANY.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.3.9--ANY.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.4.0--ANY.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.4.1--ANY.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.4.10--ANY.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.4.2--ANY.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.4.3--ANY.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.4.4--ANY.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.4.5--ANY.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.4.6--ANY.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.4.7--ANY.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.4.8--ANY.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.4.9--ANY.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.5.0--ANY.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.5.1--ANY.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.5.2--ANY.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.5.3--ANY.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.5.4--ANY.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.5.5--ANY.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.5.6--ANY.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.5.7--ANY.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.5.8--ANY.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--2.5.9--ANY.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--3.0.0--ANY.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--3.0.1--ANY.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--3.0.2--ANY.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--3.0.3--ANY.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--3.0.4--ANY.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--3.0.5--ANY.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--3.0.6--ANY.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--3.0.7--ANY.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--3.0.8--ANY.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--3.0.9--ANY.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--3.0.10--ANY.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--3.1.0--ANY.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--3.1.1--ANY.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--3.1.2--ANY.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--3.1.3--ANY.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--3.1.4--ANY.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--3.1.5--ANY.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--3.1.6--ANY.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--3.1.7--ANY.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--3.1.8--ANY.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--3.1.9--ANY.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--3.1.10--ANY.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--3.2.0--ANY.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--3.2.1--ANY.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--3.2.2--ANY.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--3.2.3--ANY.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--3.2.4--ANY.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--3.2.5--ANY.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--3.2.6--ANY.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--3.3.0--ANY.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--3.3.1--ANY.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--3.3.2--ANY.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--3.3.3--ANY.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--3.3.4--ANY.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--3.3.5--ANY.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--3.4.0--ANY.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--3.4.1--ANY.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--%%PORTVERSION%%--ANY.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--ANY--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--TEMPLATED--TO--ANY.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--unpackaged--%%PORTVERSION%%.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal--unpackaged.sql
+%%SFCGAL%%share/postgresql/extension/postgis_sfcgal.control
+%%TOPOLOGY%%share/postgresql/contrib/postgis-%%VER%%/topology.sql
+%%TOPOLOGY%%share/postgresql/contrib/postgis-%%VER%%/topology_comments.sql
+%%TOPOLOGY%%share/postgresql/contrib/postgis-%%VER%%/topology_upgrade.sql
+%%TOPOLOGY%%share/postgresql/contrib/postgis-%%VER%%/uninstall_topology.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.0.0--ANY.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.0.1--ANY.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.0.2--ANY.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.0.3--ANY.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.0.4--ANY.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.0.5--ANY.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.0.6--ANY.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.0.7--ANY.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.1.0--ANY.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.1.1--ANY.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.1.2--ANY.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.1.3--ANY.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.1.4--ANY.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.1.5--ANY.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.1.6--ANY.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.1.7--ANY.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.1.8--ANY.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.1.9--ANY.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.2.0--ANY.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.2.1--ANY.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.2.2--ANY.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.2.3--ANY.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.2.4--ANY.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.2.5--ANY.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.2.6--ANY.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.2.7--ANY.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.2.8--ANY.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.3.0--ANY.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.3.1--ANY.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.3.10--ANY.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.3.11--ANY.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.3.2--ANY.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.3.3--ANY.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.3.4--ANY.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.3.5--ANY.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.3.6--ANY.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.3.7--ANY.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.3.8--ANY.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.3.9--ANY.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.4.0--ANY.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.4.1--ANY.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.4.10--ANY.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.4.2--ANY.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.4.3--ANY.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.4.4--ANY.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.4.5--ANY.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.4.6--ANY.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.4.7--ANY.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.4.8--ANY.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.4.9--ANY.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.5.0--ANY.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.5.1--ANY.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.5.2--ANY.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.5.3--ANY.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.5.4--ANY.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.5.5--ANY.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.5.6--ANY.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.5.7--ANY.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.5.8--ANY.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--2.5.9--ANY.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--3.0.0--ANY.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--3.0.1--ANY.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--3.0.2--ANY.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--3.0.3--ANY.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--3.0.4--ANY.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--3.0.5--ANY.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--3.0.6--ANY.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--3.0.7--ANY.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--3.0.8--ANY.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--3.0.9--ANY.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--3.0.10--ANY.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--3.1.0--ANY.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--3.1.1--ANY.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--3.1.2--ANY.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--3.1.3--ANY.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--3.1.4--ANY.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--3.1.5--ANY.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--3.1.6--ANY.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--3.1.7--ANY.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--3.1.8--ANY.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--3.1.9--ANY.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--3.1.10--ANY.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--3.2.0--ANY.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--3.2.1--ANY.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--3.2.2--ANY.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--3.2.3--ANY.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--3.2.4--ANY.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--3.2.5--ANY.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--3.2.6--ANY.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--3.3.0--ANY.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--3.3.1--ANY.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--3.3.2--ANY.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--3.3.3--ANY.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--3.3.4--ANY.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--3.3.5--ANY.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--3.4.0--ANY.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--3.4.1--ANY.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology.control
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--%%PORTVERSION%%--ANY.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--ANY--%%PORTVERSION%%.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--TEMPLATED--TO--ANY.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--unpackaged.sql
+%%TOPOLOGY%%share/postgresql/extension/postgis_topology--unpackaged--%%PORTVERSION%%.sql
+share/postgresql/contrib/postgis-%%VER%%/legacy.sql
+share/postgresql/contrib/postgis-%%VER%%/legacy_gist.sql
+share/postgresql/contrib/postgis-%%VER%%/legacy_minimal.sql
+share/postgresql/contrib/postgis-%%VER%%/postgis.sql
+share/postgresql/contrib/postgis-%%VER%%/postgis_comments.sql
+share/postgresql/contrib/postgis-%%VER%%/postgis_upgrade.sql
+share/postgresql/contrib/postgis-%%VER%%/rtpostgis.sql
+share/postgresql/contrib/postgis-%%VER%%/rtpostgis_legacy.sql
+share/postgresql/contrib/postgis-%%VER%%/rtpostgis_upgrade.sql
+share/postgresql/contrib/postgis-%%VER%%/spatial_ref_sys.sql
+share/postgresql/contrib/postgis-%%VER%%/uninstall_legacy.sql
+share/postgresql/contrib/postgis-%%VER%%/uninstall_postgis.sql
+share/postgresql/contrib/postgis-%%VER%%/uninstall_rtpostgis.sql
+share/postgresql/extension/postgis--2.0.0--ANY.sql
+share/postgresql/extension/postgis--2.0.1--ANY.sql
+share/postgresql/extension/postgis--2.0.2--ANY.sql
+share/postgresql/extension/postgis--2.0.3--ANY.sql
+share/postgresql/extension/postgis--2.0.4--ANY.sql
+share/postgresql/extension/postgis--2.0.5--ANY.sql
+share/postgresql/extension/postgis--2.0.6--ANY.sql
+share/postgresql/extension/postgis--2.0.7--ANY.sql
+share/postgresql/extension/postgis--2.1.0--ANY.sql
+share/postgresql/extension/postgis--2.1.1--ANY.sql
+share/postgresql/extension/postgis--2.1.2--ANY.sql
+share/postgresql/extension/postgis--2.1.3--ANY.sql
+share/postgresql/extension/postgis--2.1.4--ANY.sql
+share/postgresql/extension/postgis--2.1.5--ANY.sql
+share/postgresql/extension/postgis--2.1.6--ANY.sql
+share/postgresql/extension/postgis--2.1.7--ANY.sql
+share/postgresql/extension/postgis--2.1.8--ANY.sql
+share/postgresql/extension/postgis--2.1.9--ANY.sql
+share/postgresql/extension/postgis--2.2.0--ANY.sql
+share/postgresql/extension/postgis--2.2.1--ANY.sql
+share/postgresql/extension/postgis--2.2.2--ANY.sql
+share/postgresql/extension/postgis--2.2.3--ANY.sql
+share/postgresql/extension/postgis--2.2.4--ANY.sql
+share/postgresql/extension/postgis--2.2.5--ANY.sql
+share/postgresql/extension/postgis--2.2.6--ANY.sql
+share/postgresql/extension/postgis--2.2.7--ANY.sql
+share/postgresql/extension/postgis--2.2.8--ANY.sql
+share/postgresql/extension/postgis--2.3.0--ANY.sql
+share/postgresql/extension/postgis--2.3.1--ANY.sql
+share/postgresql/extension/postgis--2.3.10--ANY.sql
+share/postgresql/extension/postgis--2.3.11--ANY.sql
+share/postgresql/extension/postgis--2.3.2--ANY.sql
+share/postgresql/extension/postgis--2.3.3--ANY.sql
+share/postgresql/extension/postgis--2.3.4--ANY.sql
+share/postgresql/extension/postgis--2.3.5--ANY.sql
+share/postgresql/extension/postgis--2.3.6--ANY.sql
+share/postgresql/extension/postgis--2.3.7--ANY.sql
+share/postgresql/extension/postgis--2.3.8--ANY.sql
+share/postgresql/extension/postgis--2.3.9--ANY.sql
+share/postgresql/extension/postgis--2.4.0--ANY.sql
+share/postgresql/extension/postgis--2.4.1--ANY.sql
+share/postgresql/extension/postgis--2.4.10--ANY.sql
+share/postgresql/extension/postgis--2.4.2--ANY.sql
+share/postgresql/extension/postgis--2.4.3--ANY.sql
+share/postgresql/extension/postgis--2.4.4--ANY.sql
+share/postgresql/extension/postgis--2.4.5--ANY.sql
+share/postgresql/extension/postgis--2.4.6--ANY.sql
+share/postgresql/extension/postgis--2.4.7--ANY.sql
+share/postgresql/extension/postgis--2.4.8--ANY.sql
+share/postgresql/extension/postgis--2.4.9--ANY.sql
+share/postgresql/extension/postgis--2.5.0--ANY.sql
+share/postgresql/extension/postgis--2.5.1--ANY.sql
+share/postgresql/extension/postgis--2.5.2--ANY.sql
+share/postgresql/extension/postgis--2.5.3--ANY.sql
+share/postgresql/extension/postgis--2.5.4--ANY.sql
+share/postgresql/extension/postgis--2.5.5--ANY.sql
+share/postgresql/extension/postgis--2.5.6--ANY.sql
+share/postgresql/extension/postgis--2.5.7--ANY.sql
+share/postgresql/extension/postgis--2.5.8--ANY.sql
+share/postgresql/extension/postgis--2.5.9--ANY.sql
+share/postgresql/extension/postgis--3.0.0--ANY.sql
+share/postgresql/extension/postgis--3.0.1--ANY.sql
+share/postgresql/extension/postgis--3.0.2--ANY.sql
+share/postgresql/extension/postgis--3.0.3--ANY.sql
+share/postgresql/extension/postgis--3.0.4--ANY.sql
+share/postgresql/extension/postgis--3.0.5--ANY.sql
+share/postgresql/extension/postgis--3.0.6--ANY.sql
+share/postgresql/extension/postgis--3.0.7--ANY.sql
+share/postgresql/extension/postgis--3.0.8--ANY.sql
+share/postgresql/extension/postgis--3.0.9--ANY.sql
+share/postgresql/extension/postgis--3.0.10--ANY.sql
+share/postgresql/extension/postgis--3.1.0--ANY.sql
+share/postgresql/extension/postgis--3.1.1--ANY.sql
+share/postgresql/extension/postgis--3.1.2--ANY.sql
+share/postgresql/extension/postgis--3.1.3--ANY.sql
+share/postgresql/extension/postgis--3.1.4--ANY.sql
+share/postgresql/extension/postgis--3.1.5--ANY.sql
+share/postgresql/extension/postgis--3.1.6--ANY.sql
+share/postgresql/extension/postgis--3.1.7--ANY.sql
+share/postgresql/extension/postgis--3.1.8--ANY.sql
+share/postgresql/extension/postgis--3.1.9--ANY.sql
+share/postgresql/extension/postgis--3.1.10--ANY.sql
+share/postgresql/extension/postgis--3.2.0--ANY.sql
+share/postgresql/extension/postgis--3.2.1--ANY.sql
+share/postgresql/extension/postgis--3.2.2--ANY.sql
+share/postgresql/extension/postgis--3.2.3--ANY.sql
+share/postgresql/extension/postgis--3.2.4--ANY.sql
+share/postgresql/extension/postgis--3.2.5--ANY.sql
+share/postgresql/extension/postgis--3.2.6--ANY.sql
+share/postgresql/extension/postgis--3.3.0--ANY.sql
+share/postgresql/extension/postgis--3.3.1--ANY.sql
+share/postgresql/extension/postgis--3.3.2--ANY.sql
+share/postgresql/extension/postgis--3.3.3--ANY.sql
+share/postgresql/extension/postgis--unpackaged.sql
+share/postgresql/extension/postgis.control
+share/postgresql/extension/postgis_tiger_geocoder--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--%%PORTVERSION%%--ANY.sql
+share/postgresql/extension/postgis_tiger_geocoder--ANY--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--TEMPLATED--TO--ANY.sql
+share/postgresql/extension/postgis_tiger_geocoder--unpackaged--%%PORTVERSION%%.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.0.0--ANY.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.0.1--ANY.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.0.2--ANY.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.0.3--ANY.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.0.4--ANY.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.0.5--ANY.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.0.6--ANY.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.0.7--ANY.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.1.0--ANY.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.1.1--ANY.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.1.2--ANY.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.1.3--ANY.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.1.4--ANY.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.1.5--ANY.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.1.6--ANY.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.1.7--ANY.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.1.8--ANY.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.1.9--ANY.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.2.0--ANY.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.2.1--ANY.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.2.2--ANY.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.2.3--ANY.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.2.4--ANY.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.2.5--ANY.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.2.6--ANY.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.2.7--ANY.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.2.8--ANY.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.3.0--ANY.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.3.1--ANY.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.3.10--ANY.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.3.11--ANY.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.3.2--ANY.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.3.3--ANY.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.3.4--ANY.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.3.5--ANY.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.3.6--ANY.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.3.7--ANY.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.3.8--ANY.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.3.9--ANY.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.4.0--ANY.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.4.1--ANY.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.4.10--ANY.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.4.2--ANY.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.4.3--ANY.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.4.4--ANY.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.4.5--ANY.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.4.6--ANY.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.4.7--ANY.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.4.8--ANY.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.4.9--ANY.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.5.0--ANY.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.5.1--ANY.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.5.2--ANY.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.5.3--ANY.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.5.4--ANY.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.5.5--ANY.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.5.6--ANY.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.5.7--ANY.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.5.8--ANY.sql
+share/postgresql/extension/postgis_tiger_geocoder--2.5.9--ANY.sql
+share/postgresql/extension/postgis_tiger_geocoder--3.0.0--ANY.sql
+share/postgresql/extension/postgis_tiger_geocoder--3.0.1--ANY.sql
+share/postgresql/extension/postgis_tiger_geocoder--3.0.2--ANY.sql
+share/postgresql/extension/postgis_tiger_geocoder--3.0.3--ANY.sql
+share/postgresql/extension/postgis_tiger_geocoder--3.0.4--ANY.sql
+share/postgresql/extension/postgis_tiger_geocoder--3.0.5--ANY.sql
+share/postgresql/extension/postgis_tiger_geocoder--3.0.6--ANY.sql
+share/postgresql/extension/postgis_tiger_geocoder--3.0.7--ANY.sql
+share/postgresql/extension/postgis_tiger_geocoder--3.0.8--ANY.sql
+share/postgresql/extension/postgis_tiger_geocoder--3.0.9--ANY.sql
+share/postgresql/extension/postgis_tiger_geocoder--3.0.10--ANY.sql
+share/postgresql/extension/postgis_tiger_geocoder--3.1.0--ANY.sql
+share/postgresql/extension/postgis_tiger_geocoder--3.1.1--ANY.sql
+share/postgresql/extension/postgis_tiger_geocoder--3.1.2--ANY.sql
+share/postgresql/extension/postgis_tiger_geocoder--3.1.3--ANY.sql
+share/postgresql/extension/postgis_tiger_geocoder--3.1.4--ANY.sql
+share/postgresql/extension/postgis_tiger_geocoder--3.1.5--ANY.sql
+share/postgresql/extension/postgis_tiger_geocoder--3.1.6--ANY.sql
+share/postgresql/extension/postgis_tiger_geocoder--3.1.7--ANY.sql
+share/postgresql/extension/postgis_tiger_geocoder--3.1.8--ANY.sql
+share/postgresql/extension/postgis_tiger_geocoder--3.1.9--ANY.sql
+share/postgresql/extension/postgis_tiger_geocoder--3.1.10--ANY.sql
+share/postgresql/extension/postgis_tiger_geocoder--3.2.0--ANY.sql
+share/postgresql/extension/postgis_tiger_geocoder--3.2.1--ANY.sql
+share/postgresql/extension/postgis_tiger_geocoder--3.2.2--ANY.sql
+share/postgresql/extension/postgis_tiger_geocoder--3.2.3--ANY.sql
+share/postgresql/extension/postgis_tiger_geocoder--3.2.4--ANY.sql
+share/postgresql/extension/postgis_tiger_geocoder--3.2.5--ANY.sql
+share/postgresql/extension/postgis_tiger_geocoder--3.2.6--ANY.sql
+share/postgresql/extension/postgis_tiger_geocoder--3.3.0--ANY.sql
+share/postgresql/extension/postgis_tiger_geocoder--3.3.1--ANY.sql
+share/postgresql/extension/postgis_tiger_geocoder--3.3.2--ANY.sql
+share/postgresql/extension/postgis_tiger_geocoder--3.3.3--ANY.sql
+share/postgresql/extension/postgis_tiger_geocoder--3.3.4--ANY.sql
+share/postgresql/extension/postgis_tiger_geocoder--3.3.5--ANY.sql
+share/postgresql/extension/postgis_tiger_geocoder--3.4.0--ANY.sql
+share/postgresql/extension/postgis_tiger_geocoder--3.4.1--ANY.sql
+share/postgresql/extension/postgis_tiger_geocoder.control
diff --git a/databases/postgresql-cstore_fdw/Makefile b/databases/postgresql-cstore_fdw/Makefile
index 079f3f4c179b..0a383a2c81c5 100644
--- a/databases/postgresql-cstore_fdw/Makefile
+++ b/databases/postgresql-cstore_fdw/Makefile
@@ -1,20 +1,22 @@
-# Created by: Jov <amutu@amutu.com>
-
 PORTNAME=	cstore_fdw
 PORTVERSION=	1.7.0
 DISTVERSIONPREFIX=	v
 CATEGORIES=	databases
 PKGNAMEPREFIX=	postgresql${PGSQL_VER:S/.//}-
 
+PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
+PATCHFILES+=	2b6bf67ca60faf5a3ebe914fad53257a634ae48a.patch:-p1
+
 MAINTAINER=	farrokhi@FreeBSD.org
 COMMENT=	Columnar store for analytics with PostgreSQL
+WWW=		https://github.com/citusdata/cstore_fdw
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libprotobuf-c.so:devel/protobuf-c
 
-USES=		gmake pgsql:9.3+
+USES=		gmake pgsql:11-13
 
 SUB_FILES=	pkg-message
 
diff --git a/databases/postgresql-cstore_fdw/distinfo b/databases/postgresql-cstore_fdw/distinfo
index c1b1332bc28d..2e25673417c7 100644
--- a/databases/postgresql-cstore_fdw/distinfo
+++ b/databases/postgresql-cstore_fdw/distinfo
@@ -1,3 +1,5 @@
-TIMESTAMP = 1582106798
+TIMESTAMP = 1633795109
 SHA256 (citusdata-cstore_fdw-v1.7.0_GH0.tar.gz) = bd8a06654b483d27b48d8196cf6baac0c7828b431b49ac097923ac0c54a1c38c
 SIZE (citusdata-cstore_fdw-v1.7.0_GH0.tar.gz) = 93313
+SHA256 (2b6bf67ca60faf5a3ebe914fad53257a634ae48a.patch) = 5a396090cb99ae6af5774c65ed4e1d5e0f249b79e8d734624688fee174bd73d5
+SIZE (2b6bf67ca60faf5a3ebe914fad53257a634ae48a.patch) = 16786
diff --git a/databases/postgresql-cstore_fdw/pkg-descr b/databases/postgresql-cstore_fdw/pkg-descr
index 9c565723f0ba..5d25f11c952b 100644
--- a/databases/postgresql-cstore_fdw/pkg-descr
+++ b/databases/postgresql-cstore_fdw/pkg-descr
@@ -14,5 +14,3 @@ representations with this extension. This brings:
 	- Statistics collection. PostgreSQL's query optimizer uses these stats to
 	  evaluate different query plans and pick the best one.
 	- Simple setup. Create foreign table and copy data. Run SQL.
-
-WWW: https://github.com/citusdata/cstore_fdw
diff --git a/databases/postgresql-idn/Makefile b/databases/postgresql-idn/Makefile
new file mode 100644
index 000000000000..0bee9a4b11cb
--- /dev/null
+++ b/databases/postgresql-idn/Makefile
@@ -0,0 +1,41 @@
+PORTNAME=	idn
+PORTVERSION=	0.2
+CATEGORIES=	databases
+PKGNAMEPREFIX=	postgresql${PGSQL_VER:S/.//}-
+
+MAINTAINER=	bofh@FreeBSD.org
+COMMENT=	PostgreSQL extension for libidn2
+WWW=		https://github.com/dyninc/postgresql-idn
+
+LICENSE=	BSD3CLAUSE
+LICENSE_FILE=	${WRKSRC}/COPYRIGHT
+
+LIB_DEPENDS=	libidn.so:dns/libidn \
+		libidn2.so:dns/libidn2
+
+USES=		gmake pgsql
+WANT_PGSQL=	server
+USE_GITHUB=	yes
+GH_ACCOUNT=	dyninc
+GH_PROJECT=	postgresql-idn
+GH_TAGNAME=	d4ffaec
+
+BUILD_WRKSRC=	${WRKSRC}/sources
+
+PLIST_FILES=	\
+		lib/postgresql/idn.so \
+		share/postgresql/extension/idn.control \
+		share/postgresql/extension/idn--0.2.sql
+
+post-patch:
+	@${REINPLACE_CMD} -e 's|CreateTemplateTupleDesc(3, false)|CreateTemplateTupleDesc(3)|g' \
+		${BUILD_WRKSRC}/idn.c
+
+do-install:
+	${MKDIR} ${STAGEDIR}${PREFIX}/lib/postgresql
+	${MKDIR} ${STAGEDIR}${PREFIX}/share/postgresql/extension
+	${INSTALL_LIB} ${BUILD_WRKSRC}/idn.so ${STAGEDIR}${PREFIX}/lib/postgresql/idn.so
+	${INSTALL_DATA} ${BUILD_WRKSRC}/idn--0.2.sql ${STAGEDIR}${PREFIX}/share/postgresql/extension
+	${INSTALL_DATA} ${BUILD_WRKSRC}/idn.control ${STAGEDIR}${PREFIX}/share/postgresql/extension
+
+.include <bsd.port.mk>
diff --git a/databases/postgresql-idn/distinfo b/databases/postgresql-idn/distinfo
new file mode 100644
index 000000000000..3a8be0534f32
--- /dev/null
+++ b/databases/postgresql-idn/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1689853106
+SHA256 (dyninc-postgresql-idn-0.2-d4ffaec_GH0.tar.gz) = 77648e741c96ae186dcd4ce835cada228877864e390e1854c5099277337a0b06
+SIZE (dyninc-postgresql-idn-0.2-d4ffaec_GH0.tar.gz) = 14784
diff --git a/databases/postgresql-idn/pkg-descr b/databases/postgresql-idn/pkg-descr
new file mode 100644
index 000000000000..a3aca8a8234f
--- /dev/null
+++ b/databases/postgresql-idn/pkg-descr
@@ -0,0 +1,6 @@
+At a fundamental level, this extension grants access to a number of
+functions provided by the libidn and libidn2 libraries. Not all of the
+functions provided by these libraries are exposed.
+
+Whenever possible, the code will transform the encoding of the data in
+the database to UTF-8 before further processing.
diff --git a/databases/postgresql-jdbc/Makefile b/databases/postgresql-jdbc/Makefile
index a45474bfe159..e37c1c599221 100644
--- a/databases/postgresql-jdbc/Makefile
+++ b/databases/postgresql-jdbc/Makefile
@@ -1,7 +1,5 @@
-# Created by: Palle Girgensohn <girgen@partitur.se>
-
 PORTNAME=	postgresql
-PORTVERSION=	42.2.20
+PORTVERSION=	42.7.3
 CATEGORIES=	databases java
 MASTER_SITES=	http://jdbc.postgresql.org/download/
 PKGNAMESUFFIX=	-jdbc
@@ -10,10 +8,12 @@ EXTRACT_ONLY=
 
 MAINTAINER=	pgsql@FreeBSD.org
 COMMENT=	Java JDBC implementation for PostgreSQL
+WWW=		https://jdbc.postgresql.org/
 
 LICENSE=	BSD3CLAUSE
 
 USE_JAVA=	yes
+JAVA_VERSION=	8+
 NO_ARCH=	yes
 PLIST_FILES=	%%JAVAJARDIR%%/postgresql.jar
 
diff --git a/databases/postgresql-jdbc/distinfo b/databases/postgresql-jdbc/distinfo
index 54d551a69f45..59388562c389 100644
--- a/databases/postgresql-jdbc/distinfo
+++ b/databases/postgresql-jdbc/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1619185811
-SHA256 (postgresql-42.2.20.jar) = 708b2938aea81f32b8b35440da233828284a100e6f2212a7ab1eeaf4b3a6514e
-SIZE (postgresql-42.2.20.jar) = 1005347
+TIMESTAMP = 1710490233
+SHA256 (postgresql-42.7.3.jar) = a2644cbfba1baa145ff7e8c8ef582a6eed7a7ec4ca792f7f054122bdec756268
+SIZE (postgresql-42.7.3.jar) = 1089312
diff --git a/databases/postgresql-jdbc/pkg-descr b/databases/postgresql-jdbc/pkg-descr
index 1060c1d54b24..57ed865bbc56 100644
--- a/databases/postgresql-jdbc/pkg-descr
+++ b/databases/postgresql-jdbc/pkg-descr
@@ -1,4 +1,2 @@
 This is the official implementation of JDBC, the Java Database
 Connectivity API, for accessing PostgreSQL databases from Java.
-
-WWW: http://jdbc.postgresql.org/
diff --git a/databases/postgresql-libpgeasy/Makefile b/databases/postgresql-libpgeasy/Makefile
index 8da9389655ac..9fcaaead1d17 100644
--- a/databases/postgresql-libpgeasy/Makefile
+++ b/databases/postgresql-libpgeasy/Makefile
@@ -1,5 +1,3 @@
-# Created by: Palle Girgensohn <girgen@pingpong.net>
-
 PKGNAMEPREFIX=	postgresql-
 PORTNAME=	libpgeasy
 PORTVERSION=	3.0.4
@@ -10,6 +8,7 @@ DIST_SUBDIR=	postgresql
 
 MAINTAINER=	pgsql@FreeBSD.org
 COMMENT=	Easy-to-use C interface to PostgreSQL
+WWW=		https://www.postgresql.org/docs/7.2/static/pgeasy.html
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
diff --git a/databases/postgresql-libpgeasy/pkg-descr b/databases/postgresql-libpgeasy/pkg-descr
index edd3bdaf6c1b..c41b5a8352ca 100644
--- a/databases/postgresql-libpgeasy/pkg-descr
+++ b/databases/postgresql-libpgeasy/pkg-descr
@@ -3,5 +3,3 @@ library, more like an SQL 4GL interface.
 
 There are examples in share/examples/postgresql/libpqeasy
 and docs in share/doc/postgresql/libpqeasy
-
-WWW: https://www.postgresql.org/docs/7.2/static/pgeasy.html
diff --git a/databases/postgresql-libpqxx/Makefile b/databases/postgresql-libpqxx/Makefile
index ad34bae6c606..87fbe2694956 100644
--- a/databases/postgresql-libpqxx/Makefile
+++ b/databases/postgresql-libpqxx/Makefile
@@ -1,30 +1,30 @@
-# Created by: Palle Girgensohn <girgen@pingpong.net>
-
 PORTNAME=	libpqxx
-PORTVERSION=	7.2.0
+PORTVERSION=	7.9.0
 CATEGORIES=	databases
 PKGNAMEPREFIX=	postgresql-
 DIST_SUBDIR=	postgresql
 
 MAINTAINER=	pgsql@FreeBSD.org
 COMMENT=	New C++ interface for PostgreSQL
+WWW=		http://pqxx.org/
 
 LICENSE=	BSD3CLAUSE
 
 CONFLICTS=	postgresql-libpqxx-[1-5].* postgresql-libpqxx3-3.* \
 		postgresql-libpqxx4-4.*
 
-USES=		compiler:c++11-lang gmake libtool pathfix pgsql python:build shebangfix
+USES=		compiler:c++17-lang gmake libtool pathfix pgsql python:build shebangfix
 USE_GITHUB=	yes
 GH_ACCOUNT=	jtv
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
-SHEBANG_FILES=	${WRKSRC}/tools/splitconfig
+SHEBANG_FILES=	${WRKSRC}/tools/splitconfig.py
 INSTALL_TARGET=	install-strip
 PLIST_SUB=	PORTVERSION=${PORTVERSION:R}
 
 CONFIGURE_ARGS=	--enable-shared \
 		--disable-documentation \
 		--disable-dependency-tracking
+CXXFLAGS+=	-std=c++17
 
 .include <bsd.port.mk>
diff --git a/databases/postgresql-libpqxx/distinfo b/databases/postgresql-libpqxx/distinfo
index 54e68472f2b5..2b5756aafc64 100644
--- a/databases/postgresql-libpqxx/distinfo
+++ b/databases/postgresql-libpqxx/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1600331537
-SHA256 (postgresql/jtv-libpqxx-7.2.0_GH0.tar.gz) = c482a31c5d08402bc9e8df8291bed3555640ea80b3cb354fca958b1b469870dd
-SIZE (postgresql/jtv-libpqxx-7.2.0_GH0.tar.gz) = 707225
+TIMESTAMP = 1708424380
+SHA256 (postgresql/jtv-libpqxx-7.9.0_GH0.tar.gz) = a1fafd5f6455f6c66241fca1f35f5cb603251580b99f9a0cf1b5d0a586006f16
+SIZE (postgresql/jtv-libpqxx-7.9.0_GH0.tar.gz) = 787113
diff --git a/databases/postgresql-libpqxx/pkg-descr b/databases/postgresql-libpqxx/pkg-descr
index 5697d09a3e4d..2d82e5dece1f 100644
--- a/databases/postgresql-libpqxx/pkg-descr
+++ b/databases/postgresql-libpqxx/pkg-descr
@@ -14,5 +14,3 @@ of your hands; of constructors and destructors to bring resource
 management under control; and even basic object-orientation to give
 you some extra reliability features that would be hard to get with
 most other database interfaces.
-
-WWW: http://pqxx.org/
diff --git a/databases/postgresql-libpqxx/pkg-plist b/databases/postgresql-libpqxx/pkg-plist
index 76c7c6d75e7b..578af99171d9 100644
--- a/databases/postgresql-libpqxx/pkg-plist
+++ b/databases/postgresql-libpqxx/pkg-plist
@@ -2,7 +2,8 @@ include/pqxx/array
 include/pqxx/array.hxx
 include/pqxx/binarystring
 include/pqxx/binarystring.hxx
-include/pqxx/compiler-public.hxx
+include/pqxx/blob
+include/pqxx/blob.hxx
 include/pqxx/composite
 include/pqxx/composite.hxx
 include/pqxx/config-public-compiler.h
@@ -20,8 +21,7 @@ include/pqxx/field
 include/pqxx/field.hxx
 include/pqxx/internal/array-composite.hxx
 include/pqxx/internal/callgate.hxx
-include/pqxx/internal/compiler-internal-post.hxx
-include/pqxx/internal/compiler-internal-pre.hxx
+include/pqxx/internal/concat.hxx
 include/pqxx/internal/conversions.hxx
 include/pqxx/internal/encoding_group.hxx
 include/pqxx/internal/encodings.hxx
@@ -30,6 +30,8 @@ include/pqxx/internal/gates/connection-largeobject.hxx
 include/pqxx/internal/gates/connection-notification_receiver.hxx
 include/pqxx/internal/gates/connection-pipeline.hxx
 include/pqxx/internal/gates/connection-sql_cursor.hxx
+include/pqxx/internal/gates/connection-stream_from.hxx
+include/pqxx/internal/gates/connection-stream_to.hxx
 include/pqxx/internal/gates/connection-transaction.hxx
 include/pqxx/internal/gates/errorhandler-connection.hxx
 include/pqxx/internal/gates/icursor_iterator-icursorstream.hxx
@@ -39,15 +41,20 @@ include/pqxx/internal/gates/result-creation.hxx
 include/pqxx/internal/gates/result-pipeline.hxx
 include/pqxx/internal/gates/result-sql_cursor.hxx
 include/pqxx/internal/gates/transaction-sql_cursor.hxx
-include/pqxx/internal/gates/transaction-transactionfocus.hxx
+include/pqxx/internal/gates/transaction-transaction_focus.hxx
+include/pqxx/internal/header-post.hxx
+include/pqxx/internal/header-pre.hxx
 include/pqxx/internal/ignore-deprecated-post.hxx
 include/pqxx/internal/ignore-deprecated-pre.hxx
 include/pqxx/internal/libpq-forward.hxx
 include/pqxx/internal/result_iter.hxx
+include/pqxx/internal/result_iterator.hxx
 include/pqxx/internal/sql_cursor.hxx
 include/pqxx/internal/statement_parameters.hxx
+include/pqxx/internal/stream_query.hxx
+include/pqxx/internal/stream_query_impl.hxx
 include/pqxx/internal/stream_iterator.hxx
-include/pqxx/internal/transaction_focus.hxx
+include/pqxx/internal/wait.hxx
 include/pqxx/isolation
 include/pqxx/isolation.hxx
 include/pqxx/largeobject
@@ -56,14 +63,17 @@ include/pqxx/nontransaction
 include/pqxx/nontransaction.hxx
 include/pqxx/notification
 include/pqxx/notification.hxx
+include/pqxx/params
+include/pqxx/params.hxx
 include/pqxx/pipeline
 include/pqxx/pipeline.hxx
 include/pqxx/pqxx
 include/pqxx/prepared_statement
 include/pqxx/prepared_statement.hxx
+include/pqxx/range
+include/pqxx/range.hxx
 include/pqxx/result
 include/pqxx/result.hxx
-include/pqxx/result_iterator.hxx
 include/pqxx/robusttransaction
 include/pqxx/robusttransaction.hxx
 include/pqxx/row
@@ -78,10 +88,14 @@ include/pqxx/stream_to
 include/pqxx/stream_to.hxx
 include/pqxx/subtransaction
 include/pqxx/subtransaction.hxx
+include/pqxx/time
+include/pqxx/time.hxx
 include/pqxx/transaction
 include/pqxx/transaction.hxx
 include/pqxx/transaction_base
 include/pqxx/transaction_base.hxx
+include/pqxx/transaction_focus
+include/pqxx/transaction_focus.hxx
 include/pqxx/transactor
 include/pqxx/transactor.hxx
 include/pqxx/types
diff --git a/databases/postgresql-mysql_fdw/Makefile b/databases/postgresql-mysql_fdw/Makefile
index d5703189e024..30d005e44bb9 100644
--- a/databases/postgresql-mysql_fdw/Makefile
+++ b/databases/postgresql-mysql_fdw/Makefile
@@ -1,30 +1,23 @@
-# Created by: Jov <amutu@amutu.com>
-
 PORTNAME=	mysql_fdw
 DISTVERSIONPREFIX=	REL-
-DISTVERSION=	2_6_0
+DISTVERSION=	2_9_0
 CATEGORIES=	databases
 PKGNAMEPREFIX=	postgresql${PGSQL_VER:S/.//}-
 
 MAINTAINER=	tz@FreeBSD.org
 COMMENT=	PostgreSQL foreign data wrapper for MySQL
+WWW=		https://github.com/EnterpriseDB/mysql_fdw
 
 LICENSE=	PostgreSQL
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-USES=		gmake pgsql:9.6-13 mysql
+USES=		gmake mysql pgsql:11+
 WANT_PGSQL=	server
 USE_GITHUB=	yes
 GH_ACCOUNT=	EnterpriseDB
 
 MAKE_ENV=	USE_PGXS=1
 
-PLIST_FILES=	lib/postgresql/mysql_fdw.so \
-		share/postgresql/extension/mysql_fdw--1.0--1.1.sql \
-		share/postgresql/extension/mysql_fdw--1.0.sql \
-		share/postgresql/extension/mysql_fdw--1.1.sql \
-		share/postgresql/extension/mysql_fdw.control
-
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/postgresql/mysql_fdw.so
 
diff --git a/databases/postgresql-mysql_fdw/distinfo b/databases/postgresql-mysql_fdw/distinfo
index 35c2cee87013..6d6e506843a7 100644
--- a/databases/postgresql-mysql_fdw/distinfo
+++ b/databases/postgresql-mysql_fdw/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1621235314
-SHA256 (EnterpriseDB-mysql_fdw-REL-2_6_0_GH0.tar.gz) = 54cd664348eea774dc70954a1a83ae62c0ef931beed6781736f08d903555c2cd
-SIZE (EnterpriseDB-mysql_fdw-REL-2_6_0_GH0.tar.gz) = 112248
+TIMESTAMP = 1672510684
+SHA256 (EnterpriseDB-mysql_fdw-REL-2_9_0_GH0.tar.gz) = 5180d2347063739bb929ba2626bbed4af221fc15e5a979f6bb36e60dc8edfe99
+SIZE (EnterpriseDB-mysql_fdw-REL-2_9_0_GH0.tar.gz) = 167809
diff --git a/databases/postgresql-mysql_fdw/pkg-descr b/databases/postgresql-mysql_fdw/pkg-descr
index 3716b358922f..09f55f8a6af3 100644
--- a/databases/postgresql-mysql_fdw/pkg-descr
+++ b/databases/postgresql-mysql_fdw/pkg-descr
@@ -1,11 +1,9 @@
 This PostgreSQL extension implements a Foreign Data Wrapper (FDW) for MySQL.
 The following enhancements are added to the mysql_fdw:
 	Write-able FDW
-	Connection Pooling 
+	Connection Pooling
 	Where clause push-down
 	Column push-down
 	Prepared Statment
 Please note that this version of mysql_fdw works with PostgreSQL
-9.6, 10, 11, 12 and 13.
-
-WWW: https://github.com/EnterpriseDB/mysql_fdw
+10, 11, 12, 13, 14 and 15.
diff --git a/databases/postgresql-mysql_fdw/pkg-plist b/databases/postgresql-mysql_fdw/pkg-plist
new file mode 100644
index 000000000000..9e7fd026bdcc
--- /dev/null
+++ b/databases/postgresql-mysql_fdw/pkg-plist
@@ -0,0 +1,8 @@
+lib/postgresql/mysql_fdw.so
+share/postgresql/extension/mysql_fdw--1.0--1.1.sql
+share/postgresql/extension/mysql_fdw--1.0.sql
+share/postgresql/extension/mysql_fdw--1.1--1.2.sql
+share/postgresql/extension/mysql_fdw--1.1.sql
+share/postgresql/extension/mysql_fdw--1.2.sql
+share/postgresql/extension/mysql_fdw.control
+share/postgresql/extension/mysql_fdw_pushdown.config
diff --git a/databases/postgresql-odbc/Makefile b/databases/postgresql-odbc/Makefile
index 503682940aa0..0826b92db6f6 100644
--- a/databases/postgresql-odbc/Makefile
+++ b/databases/postgresql-odbc/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	postgresql
-PORTVERSION=	13.01.0000
+PORTVERSION=	16.00.0000
 CATEGORIES=	databases
 MASTER_SITES=	PGSQL/odbc/versions/src
 PKGNAMESUFFIX=	-odbc
@@ -8,6 +8,7 @@ DIST_SUBDIR=	postgresql
 
 MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	PostgreSQL ODBC driver
+WWW=		https://www.postgresql.org/ftp/odbc/versions/
 
 LICENSE=	LGPL20+
 LICENSE_FILE=	${WRKSRC}/license.txt
diff --git a/databases/postgresql-odbc/distinfo b/databases/postgresql-odbc/distinfo
index 97e4fbcb9674..5e421059e59b 100644
--- a/databases/postgresql-odbc/distinfo
+++ b/databases/postgresql-odbc/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1620410005
-SHA256 (postgresql/psqlodbc-13.01.0000.tar.gz) = 435de2ea38109b8384ed76d327032b73a53a915379a752a34b0f9c7539055da7
-SIZE (postgresql/psqlodbc-13.01.0000.tar.gz) = 941064
+TIMESTAMP = 1694949477
+SHA256 (postgresql/psqlodbc-16.00.0000.tar.gz) = afd892f89d2ecee8d3f3b2314f1bd5bf2d02201872c6e3431e5c31096eca4c8b
+SIZE (postgresql/psqlodbc-16.00.0000.tar.gz) = 946997
diff --git a/databases/postgresql-odbc/pkg-descr b/databases/postgresql-odbc/pkg-descr
index 0e50f148424b..c651e3e070e7 100644
--- a/databases/postgresql-odbc/pkg-descr
+++ b/databases/postgresql-odbc/pkg-descr
@@ -1,5 +1,3 @@
 The official ODBC driver for connecting to PostgreSQL Database; not a
 part of the PostgreSQL Database distribution, though -- developed and
 maintained separately.
-
-WWW: https://www.postgresql.org/ftp/odbc/versions/
diff --git a/databases/postgresql-ogr_fdw/Makefile b/databases/postgresql-ogr_fdw/Makefile
index 28b39383f1c9..d17a86961d9a 100644
--- a/databases/postgresql-ogr_fdw/Makefile
+++ b/databases/postgresql-ogr_fdw/Makefile
@@ -1,19 +1,19 @@
 PORTNAME=	ogr_fdw
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.1.0
-PORTREVISION=	1
+DISTVERSION=	1.1.4
 CATEGORIES=	databases
 PKGNAMEPREFIX=	postgresql${PGSQL_VER:S/.//}-
 
 MAINTAINER=	lbartoletti@FreeBSD.org
 COMMENT=	PostgreSQL foreign data wrapper for OGR
+WWW=		https://github.com/pramsey/pgsql-ogr-fdw
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
 LIB_DEPENDS=	libgdal.so:graphics/gdal
 
-USES=		gmake pgsql:9.3+
+USES=		gmake pgsql:11+
 WANT_PGSQL=	server
 USE_GITHUB=	yes
 GH_ACCOUNT=	pramsey
@@ -23,8 +23,8 @@ MAKE_ENV=	USE_PGXS=1
 
 PLIST_FILES=	bin/ogr_fdw_info \
 		lib/postgresql/ogr_fdw.so \
-		share/postgresql/extension/ogr_fdw--1.0--1.1.sql \
-		share/postgresql/extension/ogr_fdw--1.1.sql \
+		share/postgresql/extension/ogr_fdw--1.0--${PORTVERSION:R}.sql \
+		share/postgresql/extension/ogr_fdw--${PORTVERSION:R}.sql \
 		share/postgresql/extension/ogr_fdw.control
 
 post-install:
diff --git a/databases/postgresql-ogr_fdw/distinfo b/databases/postgresql-ogr_fdw/distinfo
index 2ed35ea58e99..588cab329a6f 100644
--- a/databases/postgresql-ogr_fdw/distinfo
+++ b/databases/postgresql-ogr_fdw/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1612594371
-SHA256 (pramsey-pgsql-ogr-fdw-v1.1.0_GH0.tar.gz) = 688729fb38c320b70e7ddeb629a9472efd3d2a7227816740d215c863958cff33
-SIZE (pramsey-pgsql-ogr-fdw-v1.1.0_GH0.tar.gz) = 252808
+TIMESTAMP = 1709187900
+SHA256 (pramsey-pgsql-ogr-fdw-v1.1.4_GH0.tar.gz) = 7bacb28ace465773544d76d8ad7b7bfb95245c6ad68aa2c58f785b54da93234a
+SIZE (pramsey-pgsql-ogr-fdw-v1.1.4_GH0.tar.gz) = 253512
diff --git a/databases/postgresql-ogr_fdw/pkg-descr b/databases/postgresql-ogr_fdw/pkg-descr
index 722c67c20d3e..2ffe033b9850 100644
--- a/databases/postgresql-ogr_fdw/pkg-descr
+++ b/databases/postgresql-ogr_fdw/pkg-descr
@@ -6,5 +6,3 @@ have some limitations:
 	Spatial restrictions are not pushed down.
 	OGR connections every time.
 	All columns are retrieved every time.
-
-WWW: https://github.com/pramsey/pgsql-ogr-fdw
diff --git a/databases/postgresql-orafce/Makefile b/databases/postgresql-orafce/Makefile
index 6812e147d33d..a9d606153d1d 100644
--- a/databases/postgresql-orafce/Makefile
+++ b/databases/postgresql-orafce/Makefile
@@ -1,38 +1,24 @@
-# Created by: Jov <amutu@amutu.com>
-
-PORTNAME=		orafce
+PORTNAME=	orafce
 DISTVERSIONPREFIX=	VERSION_
-DISTVERSION=		3_13_4
-CATEGORIES=		databases
-PKGNAMEPREFIX=		postgresql${PGSQL_VER:S/.//}-
+DISTVERSION=	4_9_4
+CATEGORIES=	databases
+PKGNAMEPREFIX=	postgresql-
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Oracle's compatibility functions and packages for PostgreSQL
+WWW=		https://github.com/orafce/orafce
 
-LICENSE=	0BSD
-LICENSE_NAME=	Zero-Clause BSD / Free Public License 1.0.0
+LICENSE=	BSD0CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYRIGHT.orafce
-LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
-USES=		gmake pgsql:9.5+
-USE_GITHUB=	yes
-LLD_UNSAFE=	yes
+USES=		gmake pgsql
 
+LLD_UNSAFE=	yes
 WANT_PGSQL=	server
 
-PORTDOCS=	COPYRIGHT.orafce NEWS README.asciidoc
-
-OPTIONS_DEFINE=	DOCS
-
-post-patch:
-	${REINPLACE_CMD} -e 's/DOCS = README/#&/' ${WRKSRC}/Makefile
+USE_GITHUB=	yes
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/postgresql/orafce.so
 
-post-install-DOCS-on:
-	${MKDIR} ${STAGEDIR}${DOCSDIR}
-	@(for f in ${PORTDOCS}; do \
-		${INSTALL_DATA} ${WRKSRC}/$${f} ${STAGEDIR}${DOCSDIR}; done)
-
 .include <bsd.port.mk>
diff --git a/databases/postgresql-orafce/distinfo b/databases/postgresql-orafce/distinfo
index b85d386ffc72..c7ed4f6a30ad 100644
--- a/databases/postgresql-orafce/distinfo
+++ b/databases/postgresql-orafce/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1598400973
-SHA256 (orafce-orafce-VERSION_3_13_4_GH0.tar.gz) = 52274fba50913dc157145ffa18ef8db5295476e8b7f40809d3c35eb22ca0ec40
-SIZE (orafce-orafce-VERSION_3_13_4_GH0.tar.gz) = 667854
+TIMESTAMP = 1713001112
+SHA256 (orafce-orafce-VERSION_4_9_4_GH0.tar.gz) = a188caa09f07c783a6b7f860d30f0cbf71695dbc32d94affb2e77a25d35fce54
+SIZE (orafce-orafce-VERSION_4_9_4_GH0.tar.gz) = 730312
diff --git a/databases/postgresql-orafce/files/patch-Makefile b/databases/postgresql-orafce/files/patch-Makefile
new file mode 100644
index 000000000000..17cd490fa697
--- /dev/null
+++ b/databases/postgresql-orafce/files/patch-Makefile
@@ -0,0 +1,11 @@
+--- Makefile.orig	2023-06-01 04:04:25 UTC
++++ Makefile
+@@ -60,8 +60,6 @@ DATA = orafce--4.3.sql\
+ 		orafce--4.2--4.3.sql
+ 
+ 
+-DOCS = README.asciidoc COPYRIGHT.orafce INSTALL.orafce
+-
+ PG_CONFIG ?= pg_config
+ 
+ # make "all" the default target
diff --git a/databases/postgresql-orafce/pkg-descr b/databases/postgresql-orafce/pkg-descr
index 587008572ea1..fc9cf2f84638 100644
--- a/databases/postgresql-orafce/pkg-descr
+++ b/databases/postgresql-orafce/pkg-descr
@@ -1,7 +1,5 @@
-The "orafce" is a module of PostgreSQL. It implements of some functions from
-the Oracle database. The functionality was verified on Oracle 10g, and the
-module is useful for production work. This module contains some useful function
-which can help with porting Oracle application to PostgreSQL or can be useful
-generally.
+Orafce provides the functions and operators that emulate a subset of functions
+and packages from the Oracle RDBMS.
 
-WWW: https://github.com/orafce/orafce
+The Orafce is supported in AWS Aurora with PostgreSQL Compatibility and also in
+Azure Database for PostgreSQL.
diff --git a/databases/postgresql-orafce/pkg-plist b/databases/postgresql-orafce/pkg-plist
index 92596114c017..3f5d39ee2f4f 100644
--- a/databases/postgresql-orafce/pkg-plist
+++ b/databases/postgresql-orafce/pkg-plist
@@ -2,8 +2,20 @@ lib/postgresql/orafce.so
 share/postgresql/extension/orafce--3.10--3.11.sql
 share/postgresql/extension/orafce--3.11--3.12.sql
 share/postgresql/extension/orafce--3.12--3.13.sql
-share/postgresql/extension/orafce--3.13.sql
+share/postgresql/extension/orafce--3.13--3.14.sql
+share/postgresql/extension/orafce--3.14--3.15.sql
+share/postgresql/extension/orafce--3.15--3.16.sql
+share/postgresql/extension/orafce--3.16--3.17.sql
+share/postgresql/extension/orafce--3.17--3.18.sql
+share/postgresql/extension/orafce--3.18--3.19.sql
+share/postgresql/extension/orafce--3.19--3.20.sql
 share/postgresql/extension/orafce--3.2--3.3.sql
+share/postgresql/extension/orafce--3.20--3.21.sql
+share/postgresql/extension/orafce--3.21--3.22.sql
+share/postgresql/extension/orafce--3.22--3.23.sql
+share/postgresql/extension/orafce--3.23--3.24.sql
+share/postgresql/extension/orafce--3.24--3.25.sql
+share/postgresql/extension/orafce--3.25--4.0.sql
 share/postgresql/extension/orafce--3.3--3.4.sql
 share/postgresql/extension/orafce--3.4--3.5.sql
 share/postgresql/extension/orafce--3.5--3.6.sql
@@ -11,4 +23,14 @@ share/postgresql/extension/orafce--3.6--3.7.sql
 share/postgresql/extension/orafce--3.7--3.8.sql
 share/postgresql/extension/orafce--3.8--3.9.sql
 share/postgresql/extension/orafce--3.9--3.10.sql
+share/postgresql/extension/orafce--4.0--4.1.sql
+share/postgresql/extension/orafce--4.1--4.2.sql
+share/postgresql/extension/orafce--4.2--4.3.sql
+share/postgresql/extension/orafce--4.3--4.4.sql
+share/postgresql/extension/orafce--4.4--4.5.sql
+share/postgresql/extension/orafce--4.5--4.6.sql
+share/postgresql/extension/orafce--4.6--4.7.sql
+share/postgresql/extension/orafce--4.7--4.8.sql
+share/postgresql/extension/orafce--4.8--4.9.sql
+share/postgresql/extension/orafce--4.9.sql
 share/postgresql/extension/orafce.control
diff --git a/databases/postgresql-pgaudit/Makefile b/databases/postgresql-pgaudit/Makefile
new file mode 100644
index 000000000000..134cbcf725cc
--- /dev/null
+++ b/databases/postgresql-pgaudit/Makefile
@@ -0,0 +1,27 @@
+PORTNAME=		pgaudit
+#DISTVERSIONPREFIX=	v
+PORTVERSION=	1.7.0
+CATEGORIES=		databases
+PKGNAMEPREFIX=	postgresql${PGSQL_VER:S|.||}-
+
+MAINTAINER=		gehaowu@bitmoe.com
+COMMENT=		PostgreSQL Audit Extension
+WWW=			https://www.pgaudit.org/
+
+LICENSE=		PostgreSQL
+
+USES=			gmake pgsql:14+
+WANT_PGSQL=		server
+USE_GITHUB=		yes
+GH_ACCOUNT=		pgaudit
+
+MAKE_ENV=		USE_PGXS=1
+
+PLIST_FILES=	lib/postgresql/pgaudit.so \
+				share/postgresql/extension/pgaudit--1.7.sql \
+				share/postgresql/extension/pgaudit.control
+
+post-install:
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/postgresql/pgaudit.so
+
+.include <bsd.port.mk>
diff --git a/databases/postgresql-pgaudit/distinfo b/databases/postgresql-pgaudit/distinfo
new file mode 100644
index 000000000000..e68311c8533d
--- /dev/null
+++ b/databases/postgresql-pgaudit/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1668774244
+SHA256 (pgaudit-pgaudit-1.7.0_GH0.tar.gz) = 8f4a73e451c88c567e516e6cba7dc1e23bc91686bb6f1f77f8f3126d428a8bd8
+SIZE (pgaudit-pgaudit-1.7.0_GH0.tar.gz) = 44151
diff --git a/databases/postgresql-pgaudit/pkg-descr b/databases/postgresql-pgaudit/pkg-descr
new file mode 100644
index 000000000000..5364ee696f17
--- /dev/null
+++ b/databases/postgresql-pgaudit/pkg-descr
@@ -0,0 +1,2 @@
+PostgreSQL Audit Extension (pgAudit) provides detailed session and/or
+object audit logging via the standard PostgreSQL logging facility.
diff --git a/databases/postgresql-plproxy/Makefile b/databases/postgresql-plproxy/Makefile
index b294bea80f29..37234a016d2c 100644
--- a/databases/postgresql-plproxy/Makefile
+++ b/databases/postgresql-plproxy/Makefile
@@ -1,5 +1,3 @@
-# Created by: Sergey Skvortsov <skv@protey.ru>
-
 PORTNAME=	plproxy
 PORTVERSION=	2.10.0
 CATEGORIES=	databases
@@ -8,6 +6,7 @@ PKGNAMEPREFIX=	postgresql-
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Function-based sharding for PostgreSQL
+WWW=		https://plproxy.github.io/
 
 LICENSE=	ISCL
 LICENSE_FILE=	${WRKSRC}/COPYRIGHT
diff --git a/databases/postgresql-plproxy/pkg-descr b/databases/postgresql-plproxy/pkg-descr
index 8d56a1b00df3..db63ed26ec5b 100644
--- a/databases/postgresql-plproxy/pkg-descr
+++ b/databases/postgresql-plproxy/pkg-descr
@@ -7,5 +7,3 @@ that handled all sharding decisions. This proved to be too complex setup and in
 version 2 it was re-written to current archtecture of PL that handles sharding
 and generic pooler process (PgBouncer) that is able to handle large amount of
 standard PostgreSQL connections that the PL makes.
-
-WWW: https://plproxy.github.io/
diff --git a/databases/postgresql-plv8js/Makefile b/databases/postgresql-plv8js/Makefile
index eda16eb751f4..e4cb04c2eabf 100644
--- a/databases/postgresql-plv8js/Makefile
+++ b/databases/postgresql-plv8js/Makefile
@@ -1,25 +1,30 @@
-# Created by: vanilla@
-
 PORTNAME=	plv8
-PORTVERSION=	1.4.8
+PORTVERSION=	3.2.2
 DISTVERSIONPREFIX=	v
-PORTREVISION=	6
 CATEGORIES=	databases
 PKGNAMEPREFIX=	postgresql${PGSQL_VER:S/.//}-
 PKGNAMESUFFIX=	js
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	mizhka@FreeBSD.org
 COMMENT=	PL/v8js procedural language for PostgreSQL database
+WWW=		https://plv8.github.io/
 
 LICENSE=	PostgreSQL
 
-BROKEN=		fails to build
-
+BUILD_DEPENDS=	bash:shells/bash
 LIB_DEPENDS=	libv8.so:lang/v8
 
-USES=		compiler:c++11-lang gmake perl5 pgsql:9.6-10
-USE_PERL5=	build
+USES=		compiler:c++17-lang gmake pgsql
 USE_GITHUB=	yes
 PLIST_SUB=	PORTVERSION="${PORTVERSION}"
 
+.include <bsd.port.options.mk>
+
+CXXFLAGS+=	-std=c++17 -fno-rtti
+# Only for 64-bit architectures
+.if ${ARCH} != armv6 && ${ARCH} != armv7 && ${ARCH} != i386 && ${ARCH} != mips && ${ARCH} != powerpc && ${ARCH} != powerpcspe
+CXXFLAGS+=	-DV8_COMPRESS_POINTERS=1 -DV8_31BIT_SMIS_ON_64BIT_ARCH=1
+.endif
+MAKE_ARGS=	CUSTOM_CC=${CXX} CCFLAGS="${CXXFLAGS}"
+
 .include <bsd.port.mk>
diff --git a/databases/postgresql-plv8js/distinfo b/databases/postgresql-plv8js/distinfo
index 3311176877e1..2217e5ce233a 100644
--- a/databases/postgresql-plv8js/distinfo
+++ b/databases/postgresql-plv8js/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1483464767
-SHA256 (plv8-plv8-v1.4.8_GH0.tar.gz) = 485c4bb02cc4e7300d249d9ec0dc2be8f7f6b69ded0fd91ba4f7a4ed90ad384a
-SIZE (plv8-plv8-v1.4.8_GH0.tar.gz) = 155736
+TIMESTAMP = 1706693702
+SHA256 (plv8-plv8-v3.2.2_GH0.tar.gz) = 2d1491280505afcdff629191451d0891d3258dbdc483992aa7449a8517335d98
+SIZE (plv8-plv8-v3.2.2_GH0.tar.gz) = 8994848
diff --git a/databases/postgresql-plv8js/files/patch-Makefile b/databases/postgresql-plv8js/files/patch-Makefile
index 87b4675891c8..6082926bcfc0 100644
--- a/databases/postgresql-plv8js/files/patch-Makefile
+++ b/databases/postgresql-plv8js/files/patch-Makefile
@@ -1,11 +1,30 @@
---- Makefile.orig	2015-05-26 17:46:56 UTC
+--- Makefile.orig	2023-08-02 04:10:12 UTC
 +++ Makefile
-@@ -21,7 +21,7 @@ PG_VERSION_NUM := $(shell cat `$(PG_CONF
- 		   | perl -ne 'print $$1 and exit if /PG_VERSION_NUM\s+(\d+)/')
- 
- # set your custom C++ compler
--CUSTOM_CC = g++
-+CUSTOM_CC := $(CXX)
- JSS  = coffee-script.js livescript.js
- # .cc created from .js
- JSCS = $(JSS:.js=.cc)
+@@ -36,17 +36,8 @@ SHLIB_LINK += -Ldeps/v8-cmake/build -g
+ 
+ SHLIB_LINK += -Ldeps/v8-cmake/build -g
+ 
+-all: v8 $(OBJS)
++all: $(OBJS)
+ 
+-# For some reason, this solves parallel make dependency.
+-plv8_config.h plv8.so: v8
+-
+-deps/v8-cmake/build/libv8_libbase.a:
+-	@git submodule update --init --recursive
+-	@cd deps/v8-cmake && mkdir -p build && cd build && cmake -Denable-fPIC=ON -DCMAKE_BUILD_TYPE=Release ../ && make -j $(NUMPROC)
+-
+-v8: deps/v8-cmake/build/libv8_libbase.a
+-
+ # enable direct jsonb conversion by default
+ CCFLAGS += -DJSONB_DIRECT_CONVERSION
+ 
+@@ -72,7 +63,7 @@ endif
+ 	REGRESS += bigint_graceful
+ endif
+ 
+-SHLIB_LINK += -lv8_base_without_compiler -lv8_compiler -lv8_snapshot -lv8_inspector -lv8_libplatform -lv8_base_without_compiler -lv8_libsampler -lv8_torque_generated -lv8_libbase
++SHLIB_LINK += -lv8_libbase -lv8 -lv8_libplatform 
+ 
+ OPTFLAGS = -std=c++17 -fno-rtti -O2
+ CCFLAGS += -Wall $(OPTFLAGS)
diff --git a/databases/postgresql-plv8js/files/patch-plv8.cc b/databases/postgresql-plv8js/files/patch-plv8.cc
deleted file mode 100644
index f58f12fe420f..000000000000
--- a/databases/postgresql-plv8js/files/patch-plv8.cc
+++ /dev/null
@@ -1,27 +0,0 @@
---- plv8.cc.orig	2015-05-26 19:46:56.000000000 +0200
-+++ plv8.cc	2016-04-04 17:11:11.340628000 +0200
-@@ -9,11 +9,6 @@
- #include <new>
- 
- extern "C" {
--#define delete		delete_
--#define namespace	namespace_
--#define	typeid		typeid_
--#define	typename	typename_
--#define	using		using_
- 
- #if PG_VERSION_NUM >= 90300
- #include "access/htup_details.h"
-@@ -32,12 +27,6 @@ extern "C" {
- #include "utils/rel.h"
- #include "utils/syscache.h"
- 
--#undef delete
--#undef namespace
--#undef typeid
--#undef typename
--#undef using
--
- PG_MODULE_MAGIC;
- 
- PG_FUNCTION_INFO_V1(plv8_call_handler);
diff --git a/databases/postgresql-plv8js/files/patch-plv8_func.cc b/databases/postgresql-plv8js/files/patch-plv8_func.cc
deleted file mode 100644
index 656f27398989..000000000000
--- a/databases/postgresql-plv8js/files/patch-plv8_func.cc
+++ /dev/null
@@ -1,26 +0,0 @@
---- plv8_func.cc.orig	2015-05-26 19:46:56.000000000 +0200
-+++ plv8_func.cc	2016-04-04 17:11:11.341047000 +0200
-@@ -10,11 +10,6 @@
- #include <sstream>
- 
- extern "C" {
--#define delete		delete_
--#define namespace	namespace_
--#define	typeid		typeid_
--#define	typename	typename_
--#define	using		using_
- 
- #include "access/xact.h"
- #include "catalog/pg_type.h"
-@@ -23,11 +18,6 @@ extern "C" {
- #include "utils/builtins.h"
- #include "utils/lsyscache.h"
- 
--#undef delete
--#undef namespace
--#undef typeid
--#undef typename
--#undef using
- } // extern "C"
- 
- using namespace v8;
diff --git a/databases/postgresql-plv8js/files/patch-plv8_type.cc b/databases/postgresql-plv8js/files/patch-plv8_type.cc
deleted file mode 100644
index e1713d73e77b..000000000000
--- a/databases/postgresql-plv8js/files/patch-plv8_type.cc
+++ /dev/null
@@ -1,26 +0,0 @@
---- plv8_type.cc.orig	2015-05-26 19:46:56.000000000 +0200
-+++ plv8_type.cc	2016-04-04 17:11:11.341361000 +0200
-@@ -8,11 +8,6 @@
- #include "plv8.h"
- 
- extern "C" {
--#define delete		delete_
--#define namespace	namespace_
--#define	typeid		typeid_
--#define	typename	typename_
--#define	using		using_
- 
- #if PG_VERSION_NUM >= 90300
- #include "access/htup_details.h"
-@@ -29,11 +24,6 @@ extern "C" {
- #include "utils/syscache.h"
- #include "utils/typcache.h"
- 
--#undef delete
--#undef namespace
--#undef typeid
--#undef typename
--#undef using
- } // extern "C"
- 
- //#define CHECK_INTEGER_OVERFLOW
diff --git a/databases/postgresql-plv8js/pkg-descr b/databases/postgresql-plv8js/pkg-descr
index e8ef618b4aa7..e1118acfc6b8 100644
--- a/databases/postgresql-plv8js/pkg-descr
+++ b/databases/postgresql-plv8js/pkg-descr
@@ -3,5 +3,3 @@ V8 Engine.  It can be used for stored procedures, triggers, etc.
 
 PLV8 works with most versions of Postgres, but works best with 9.1 and above,
 including 10.0 and 10.1.
-
-WWW: https://plv8.github.io/
diff --git a/databases/postgresql-plv8js/pkg-message b/databases/postgresql-plv8js/pkg-message
index 4a8c17a481fa..8f19104963ad 100644
--- a/databases/postgresql-plv8js/pkg-message
+++ b/databases/postgresql-plv8js/pkg-message
@@ -4,8 +4,6 @@
 Use the following sql script to create PL/v8js
 
 	psql -c 'CREATE EXTENSION plv8'
-	psql -c 'CREATE EXTENSION plls'
-	psql -c 'CREATE EXTENSION plcoffee'
 EOM
 }
 ]
diff --git a/databases/postgresql-plv8js/pkg-plist b/databases/postgresql-plv8js/pkg-plist
index 4aa9bc72976d..dcd63abeb425 100644
--- a/databases/postgresql-plv8js/pkg-plist
+++ b/databases/postgresql-plv8js/pkg-plist
@@ -1,7 +1,45 @@
-lib/postgresql/plv8.so
-share/postgresql/extension/plv8.control
+lib/postgresql/plv8-%%PORTVERSION%%.so
+share/postgresql/extension/plv8--1.5.0--%%PORTVERSION%%.sql
+share/postgresql/extension/plv8--1.5.1--%%PORTVERSION%%.sql
+share/postgresql/extension/plv8--1.5.2--%%PORTVERSION%%.sql
+share/postgresql/extension/plv8--1.5.3--%%PORTVERSION%%.sql
+share/postgresql/extension/plv8--1.5.4--%%PORTVERSION%%.sql
+share/postgresql/extension/plv8--1.5.5--%%PORTVERSION%%.sql
+share/postgresql/extension/plv8--1.5.6--%%PORTVERSION%%.sql
+share/postgresql/extension/plv8--1.5.7--%%PORTVERSION%%.sql
+share/postgresql/extension/plv8--2.0.0--%%PORTVERSION%%.sql
+share/postgresql/extension/plv8--2.0.1--%%PORTVERSION%%.sql
+share/postgresql/extension/plv8--2.0.3--%%PORTVERSION%%.sql
+share/postgresql/extension/plv8--2.1.0--%%PORTVERSION%%.sql
+share/postgresql/extension/plv8--2.1.2--%%PORTVERSION%%.sql
+share/postgresql/extension/plv8--2.3.0--%%PORTVERSION%%.sql
+share/postgresql/extension/plv8--2.3.1--%%PORTVERSION%%.sql
+share/postgresql/extension/plv8--2.3.10--%%PORTVERSION%%.sql
+share/postgresql/extension/plv8--2.3.11--%%PORTVERSION%%.sql
+share/postgresql/extension/plv8--2.3.12--%%PORTVERSION%%.sql
+share/postgresql/extension/plv8--2.3.13--%%PORTVERSION%%.sql
+share/postgresql/extension/plv8--2.3.14--%%PORTVERSION%%.sql
+share/postgresql/extension/plv8--2.3.15--%%PORTVERSION%%.sql
+share/postgresql/extension/plv8--2.3.2--%%PORTVERSION%%.sql
+share/postgresql/extension/plv8--2.3.3--%%PORTVERSION%%.sql
+share/postgresql/extension/plv8--2.3.4--%%PORTVERSION%%.sql
+share/postgresql/extension/plv8--2.3.5--%%PORTVERSION%%.sql
+share/postgresql/extension/plv8--2.3.6--%%PORTVERSION%%.sql
+share/postgresql/extension/plv8--2.3.7--%%PORTVERSION%%.sql
+share/postgresql/extension/plv8--2.3.8--%%PORTVERSION%%.sql
+share/postgresql/extension/plv8--2.3.9--%%PORTVERSION%%.sql
+share/postgresql/extension/plv8--3.0.0--%%PORTVERSION%%.sql
+share/postgresql/extension/plv8--3.0.1--%%PORTVERSION%%.sql
+share/postgresql/extension/plv8--3.1.0--%%PORTVERSION%%.sql
+share/postgresql/extension/plv8--3.1.1--%%PORTVERSION%%.sql
+share/postgresql/extension/plv8--3.1.2--%%PORTVERSION%%.sql
+share/postgresql/extension/plv8--3.1.3--%%PORTVERSION%%.sql
+share/postgresql/extension/plv8--3.1.4--%%PORTVERSION%%.sql
+share/postgresql/extension/plv8--3.1.5--%%PORTVERSION%%.sql
+share/postgresql/extension/plv8--3.1.6--%%PORTVERSION%%.sql
+share/postgresql/extension/plv8--3.1.7--%%PORTVERSION%%.sql
+share/postgresql/extension/plv8--3.1.8--%%PORTVERSION%%.sql
+share/postgresql/extension/plv8--3.2.0--%%PORTVERSION%%.sql
+share/postgresql/extension/plv8--3.2.1--%%PORTVERSION%%.sql
 share/postgresql/extension/plv8--%%PORTVERSION%%.sql
-share/postgresql/extension/plcoffee.control
-share/postgresql/extension/plcoffee--%%PORTVERSION%%.sql
-share/postgresql/extension/plls.control
-share/postgresql/extension/plls--%%PORTVERSION%%.sql
+share/postgresql/extension/plv8.control
diff --git a/databases/postgresql-prefix/Makefile b/databases/postgresql-prefix/Makefile
index 85b2e8ceb0fe..6df4eb918570 100644
--- a/databases/postgresql-prefix/Makefile
+++ b/databases/postgresql-prefix/Makefile
@@ -6,10 +6,11 @@ PKGNAMEPREFIX=	postgresql${PGSQL_VER:S/.//}-
 
 MAINTAINER=	lbartoletti@FreeBSD.org
 COMMENT=	Prefix Range module for PostgreSQL
+WWW=		https://github.com/dimitri/prefix
 
 LICENSE=	PostgreSQL
 
-USES=		gmake pgsql:9.1+
+USES=		gmake pgsql:11+
 WANT_PGSQL=	server
 USE_GITHUB=	yes
 GH_ACCOUNT=	dimitri
diff --git a/databases/postgresql-prefix/pkg-descr b/databases/postgresql-prefix/pkg-descr
index 325cb95aed6f..95a8e37d4887 100644
--- a/databases/postgresql-prefix/pkg-descr
+++ b/databases/postgresql-prefix/pkg-descr
@@ -9,5 +9,3 @@ SELECT *
   FROM prefixes
  WHERE prefix @> '0123456789'
 ORDER BY length(prefix) DESC LIMIT 1;
-
-WWW: https://github.com/dimitri/prefix
diff --git a/databases/postgresql-promscale/Makefile b/databases/postgresql-promscale/Makefile
new file mode 100644
index 000000000000..1fafd9388c8a
--- /dev/null
+++ b/databases/postgresql-promscale/Makefile
@@ -0,0 +1,46 @@
+PORTNAME=	promscale
+PORTVERSION=	0.8.0
+PORTREVISION=	11
+CATEGORIES=	databases
+PKGNAMEPREFIX=	postgresql${PGSQL_VER:S/.//}-
+
+MAINTAINER=	feld@FreeBSD.org
+COMMENT=	Tables, types and functions supporting Promscale
+WWW=		https://www.timescale.com/promscale
+
+LICENSE=	PostgreSQL
+
+ONLY_FOR_ARCHS=	aarch64 amd64
+
+RUN_DEPENDS=	timescaledb>=2.9.1:databases/timescaledb
+BUILD_DEPENDS=	bash>0:shells/bash
+
+USES=		cargo gmake pgsql:12+
+
+USE_GITHUB=	yes
+GH_ACCOUNT=	timescale
+GH_PROJECT=	promscale_extension
+
+WANT_PGSQL=	server
+
+MAKE_ARGS+=	PG_CONFIG=${LOCALBASE}/bin/pg_config
+MAKE_ENV+=	MAKE=gmake PATH=${PATH}:${WRKDIR}/.cargo/bin
+
+.include "${.CURDIR}/crates.mk"
+
+post-patch:
+	${REINPLACE_CMD} 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/cargo-crates/pgx-pg-sys-*/build.rs
+
+pre-build:
+	${RLN} ${WRKSRC}/cargo-crates/cargo-pgx-0.6.1 ${WRKDIR}/pgx
+	${SETENV} ${MAKE_ENV} cargo install --offline --path ${WRKDIR}/pgx cargo-pgx
+	${MKDIR} ${WRKDIR}/.pgx
+	${PRINTF} '[configs]\npg${PGSQL_VERSION}="${LOCALBASE}/bin/pg_config"\n' > ${WRKDIR}/.pgx/config.toml
+
+do-build:
+	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} package
+
+do-install:
+	cd ${WRKSRC}/target/release/promscale-pg${PGSQL_VER} && ${PAX} -rw . ${STAGEDIR}
+
+.include <bsd.port.mk>
diff --git a/databases/postgresql-promscale/crates.mk b/databases/postgresql-promscale/crates.mk
new file mode 100644
index 000000000000..95cdafbcaa7b
--- /dev/null
+++ b/databases/postgresql-promscale/crates.mk
@@ -0,0 +1,383 @@
+CARGO_CRATES+=	addr2line-0.17.0
+CARGO_CRATES+=	adler-1.0.2
+CARGO_CRATES+=	aho-corasick-0.7.18
+CARGO_CRATES+=	aho-corasick-0.7.20
+CARGO_CRATES+=	android_system_properties-0.1.5
+CARGO_CRATES+=	arrayvec-0.7.2
+CARGO_CRATES+=	askama-0.11.1
+CARGO_CRATES+=	askama_derive-0.11.2
+CARGO_CRATES+=	askama_escape-0.10.3
+CARGO_CRATES+=	askama_shared-0.12.2
+CARGO_CRATES+=	async-trait-0.1.56
+CARGO_CRATES+=	atomic-polyfill-0.1.8
+CARGO_CRATES+=	atomic-traits-0.3.0
+CARGO_CRATES+=	atty-0.2.14
+CARGO_CRATES+=	autocfg-1.1.0
+CARGO_CRATES+=	backtrace-0.3.66
+CARGO_CRATES+=	bare-metal-0.2.5
+CARGO_CRATES+=	bare-metal-1.0.0
+CARGO_CRATES+=	base64-0.13.0
+CARGO_CRATES+=	base64-0.13.1
+CARGO_CRATES+=	bincode-1.3.3
+CARGO_CRATES+=	bindgen-0.60.1
+CARGO_CRATES+=	bit-set-0.5.2
+CARGO_CRATES+=	bit-set-0.5.3
+CARGO_CRATES+=	bit-vec-0.6.3
+CARGO_CRATES+=	bit_field-0.10.1
+CARGO_CRATES+=	bitfield-0.13.2
+CARGO_CRATES+=	bitflags-1.3.2
+CARGO_CRATES+=	bitvec-1.0.1
+CARGO_CRATES+=	block-buffer-0.10.2
+CARGO_CRATES+=	bollard-stubs-1.41.0
+CARGO_CRATES+=	build-deps-0.1.4
+CARGO_CRATES+=	bumpalo-3.11.1
+CARGO_CRATES+=	byteorder-1.4.3
+CARGO_CRATES+=	bytes-1.1.0
+CARGO_CRATES+=	camino-1.1.1
+CARGO_CRATES+=	cargo-pgx-0.6.1
+CARGO_CRATES+=	cargo-platform-0.1.2
+CARGO_CRATES+=	cargo_metadata-0.15.2
+CARGO_CRATES+=	cargo_toml-0.11.8
+CARGO_CRATES+=	cc-1.0.77
+CARGO_CRATES+=	cexpr-0.6.0
+CARGO_CRATES+=	cfg-if-1.0.0
+CARGO_CRATES+=	chrono-0.4.23
+CARGO_CRATES+=	chunked_transfer-1.4.0
+CARGO_CRATES+=	clang-sys-1.3.3
+CARGO_CRATES+=	clap-4.0.29
+CARGO_CRATES+=	clap-cargo-0.10.0
+CARGO_CRATES+=	clap_derive-4.0.21
+CARGO_CRATES+=	clap_lex-0.3.0
+CARGO_CRATES+=	codespan-reporting-0.11.1
+CARGO_CRATES+=	color-eyre-0.6.2
+CARGO_CRATES+=	color-spantrace-0.2.0
+CARGO_CRATES+=	console-0.15.0
+CARGO_CRATES+=	convert_case-0.5.0
+CARGO_CRATES+=	core-foundation-0.9.3
+CARGO_CRATES+=	core-foundation-sys-0.8.3
+CARGO_CRATES+=	cortex-m-0.7.5
+CARGO_CRATES+=	cpufeatures-0.2.2
+CARGO_CRATES+=	crc32fast-1.3.2
+CARGO_CRATES+=	critical-section-0.2.7
+CARGO_CRATES+=	crossbeam-channel-0.5.5
+CARGO_CRATES+=	crossbeam-channel-0.5.6
+CARGO_CRATES+=	crossbeam-deque-0.8.1
+CARGO_CRATES+=	crossbeam-deque-0.8.2
+CARGO_CRATES+=	crossbeam-epoch-0.9.13
+CARGO_CRATES+=	crossbeam-epoch-0.9.9
+CARGO_CRATES+=	crossbeam-utils-0.8.10
+CARGO_CRATES+=	crossbeam-utils-0.8.14
+CARGO_CRATES+=	crypto-common-0.1.5
+CARGO_CRATES+=	cstr_core-0.2.6
+CARGO_CRATES+=	cty-0.2.2
+CARGO_CRATES+=	cxx-1.0.83
+CARGO_CRATES+=	cxx-build-1.0.83
+CARGO_CRATES+=	cxxbridge-flags-1.0.83
+CARGO_CRATES+=	cxxbridge-macro-1.0.83
+CARGO_CRATES+=	darling-0.13.4
+CARGO_CRATES+=	darling_core-0.13.4
+CARGO_CRATES+=	darling_macro-0.13.4
+CARGO_CRATES+=	digest-0.10.6
+CARGO_CRATES+=	dirs-4.0.0
+CARGO_CRATES+=	dirs-sys-0.3.7
+CARGO_CRATES+=	doc-comment-0.3.3
+CARGO_CRATES+=	duct-0.13.5
+CARGO_CRATES+=	either-1.7.0
+CARGO_CRATES+=	either-1.8.0
+CARGO_CRATES+=	embedded-hal-0.2.7
+CARGO_CRATES+=	encode_unicode-0.3.6
+CARGO_CRATES+=	env_logger-0.7.1
+CARGO_CRATES+=	env_proxy-0.4.1
+CARGO_CRATES+=	errno-0.2.8
+CARGO_CRATES+=	errno-dragonfly-0.1.2
+CARGO_CRATES+=	eyre-0.6.8
+CARGO_CRATES+=	fallible-iterator-0.2.0
+CARGO_CRATES+=	fancy-regex-0.7.1
+CARGO_CRATES+=	fastrand-1.7.0
+CARGO_CRATES+=	fastrand-1.8.0
+CARGO_CRATES+=	fixedbitset-0.4.2
+CARGO_CRATES+=	flate2-1.0.25
+CARGO_CRATES+=	fnv-1.0.7
+CARGO_CRATES+=	foreign-types-0.3.2
+CARGO_CRATES+=	foreign-types-shared-0.1.1
+CARGO_CRATES+=	fork-0.1.20
+CARGO_CRATES+=	form_urlencoded-1.1.0
+CARGO_CRATES+=	fuchsia-cprng-0.1.1
+CARGO_CRATES+=	funty-2.0.0
+CARGO_CRATES+=	futures-0.3.21
+CARGO_CRATES+=	futures-channel-0.3.21
+CARGO_CRATES+=	futures-core-0.3.21
+CARGO_CRATES+=	futures-executor-0.3.21
+CARGO_CRATES+=	futures-io-0.3.21
+CARGO_CRATES+=	futures-macro-0.3.21
+CARGO_CRATES+=	futures-sink-0.3.21
+CARGO_CRATES+=	futures-task-0.3.21
+CARGO_CRATES+=	futures-util-0.3.21
+CARGO_CRATES+=	generic-array-0.14.5
+CARGO_CRATES+=	getrandom-0.2.7
+CARGO_CRATES+=	getrandom-0.2.8
+CARGO_CRATES+=	gimli-0.26.2
+CARGO_CRATES+=	glob-0.3.0
+CARGO_CRATES+=	half-1.8.2
+CARGO_CRATES+=	hash32-0.2.1
+CARGO_CRATES+=	hashbrown-0.12.2
+CARGO_CRATES+=	hashbrown-0.12.3
+CARGO_CRATES+=	heapless-0.7.16
+CARGO_CRATES+=	heck-0.4.0
+CARGO_CRATES+=	hermit-abi-0.1.19
+CARGO_CRATES+=	hermit-abi-0.2.6
+CARGO_CRATES+=	hex-0.4.3
+CARGO_CRATES+=	hmac-0.12.1
+CARGO_CRATES+=	humansize-1.1.1
+CARGO_CRATES+=	humantime-1.3.0
+CARGO_CRATES+=	iana-time-zone-0.1.53
+CARGO_CRATES+=	iana-time-zone-haiku-0.1.1
+CARGO_CRATES+=	ident_case-1.0.1
+CARGO_CRATES+=	idna-0.3.0
+CARGO_CRATES+=	indenter-0.3.3
+CARGO_CRATES+=	indexmap-1.9.1
+CARGO_CRATES+=	indexmap-1.9.2
+CARGO_CRATES+=	insta-1.15.0
+CARGO_CRATES+=	instant-0.1.12
+CARGO_CRATES+=	io-lifetimes-1.0.3
+CARGO_CRATES+=	is-terminal-0.4.1
+CARGO_CRATES+=	is_ci-1.1.1
+CARGO_CRATES+=	itoa-1.0.2
+CARGO_CRATES+=	itoa-1.0.4
+CARGO_CRATES+=	js-sys-0.3.60
+CARGO_CRATES+=	lazy_static-1.4.0
+CARGO_CRATES+=	lazycell-1.3.0
+CARGO_CRATES+=	libc-0.2.138
+CARGO_CRATES+=	libloading-0.7.3
+CARGO_CRATES+=	libloading-0.7.4
+CARGO_CRATES+=	line-wrap-0.1.1
+CARGO_CRATES+=	link-cplusplus-1.0.7
+CARGO_CRATES+=	linked-hash-map-0.5.6
+CARGO_CRATES+=	linux-raw-sys-0.1.3
+CARGO_CRATES+=	lock_api-0.4.7
+CARGO_CRATES+=	log-0.4.17
+CARGO_CRATES+=	markdown-gen-1.2.1
+CARGO_CRATES+=	matchers-0.1.0
+CARGO_CRATES+=	md-5-0.10.1
+CARGO_CRATES+=	memchr-2.5.0
+CARGO_CRATES+=	memoffset-0.6.5
+CARGO_CRATES+=	memoffset-0.7.1
+CARGO_CRATES+=	mime-0.3.16
+CARGO_CRATES+=	mime_guess-2.0.4
+CARGO_CRATES+=	minimal-lexical-0.2.1
+CARGO_CRATES+=	miniz_oxide-0.5.4
+CARGO_CRATES+=	miniz_oxide-0.6.2
+CARGO_CRATES+=	mio-0.8.4
+CARGO_CRATES+=	native-tls-0.2.11
+CARGO_CRATES+=	nb-0.1.3
+CARGO_CRATES+=	nb-1.0.0
+CARGO_CRATES+=	nom-7.1.1
+CARGO_CRATES+=	nu-ansi-term-0.46.0
+CARGO_CRATES+=	num-integer-0.1.45
+CARGO_CRATES+=	num-traits-0.2.15
+CARGO_CRATES+=	num_cpus-1.13.1
+CARGO_CRATES+=	num_cpus-1.14.0
+CARGO_CRATES+=	object-0.28.4
+CARGO_CRATES+=	object-0.29.0
+CARGO_CRATES+=	once_cell-1.16.0
+CARGO_CRATES+=	openssl-0.10.44
+CARGO_CRATES+=	openssl-macros-0.1.0
+CARGO_CRATES+=	openssl-probe-0.1.5
+CARGO_CRATES+=	openssl-sys-0.9.79
+CARGO_CRATES+=	os_pipe-0.9.2
+CARGO_CRATES+=	os_str_bytes-6.4.1
+CARGO_CRATES+=	overload-0.1.1
+CARGO_CRATES+=	owo-colors-3.5.0
+CARGO_CRATES+=	parking_lot-0.12.1
+CARGO_CRATES+=	parking_lot_core-0.9.3
+CARGO_CRATES+=	peeking_take_while-0.1.2
+CARGO_CRATES+=	percent-encoding-2.2.0
+CARGO_CRATES+=	pest-2.1.3
+CARGO_CRATES+=	petgraph-0.6.2
+CARGO_CRATES+=	pgx-0.6.1
+CARGO_CRATES+=	pgx-macros-0.6.1
+CARGO_CRATES+=	pgx-pg-config-0.6.1
+CARGO_CRATES+=	pgx-pg-sys-0.6.1
+CARGO_CRATES+=	pgx-tests-0.6.1
+CARGO_CRATES+=	pgx-utils-0.6.1
+CARGO_CRATES+=	phf-0.11.1
+CARGO_CRATES+=	phf_shared-0.11.1
+CARGO_CRATES+=	pin-project-lite-0.2.9
+CARGO_CRATES+=	pin-utils-0.1.0
+CARGO_CRATES+=	pkg-config-0.3.26
+CARGO_CRATES+=	plist-1.3.1
+CARGO_CRATES+=	postgres-0.19.4
+CARGO_CRATES+=	postgres-protocol-0.6.4
+CARGO_CRATES+=	postgres-types-0.2.4
+CARGO_CRATES+=	ppv-lite86-0.2.16
+CARGO_CRATES+=	pretty_env_logger-0.4.0
+CARGO_CRATES+=	prettyplease-0.1.21
+CARGO_CRATES+=	proc-macro-error-1.0.4
+CARGO_CRATES+=	proc-macro-error-attr-1.0.4
+CARGO_CRATES+=	proc-macro2-0.4.30
+CARGO_CRATES+=	proc-macro2-1.0.47
+CARGO_CRATES+=	proptest-1.0.0
+CARGO_CRATES+=	quick-error-1.2.3
+CARGO_CRATES+=	quick-error-2.0.1
+CARGO_CRATES+=	quote-0.6.13
+CARGO_CRATES+=	quote-1.0.21
+CARGO_CRATES+=	radium-0.7.0
+CARGO_CRATES+=	rand-0.4.6
+CARGO_CRATES+=	rand-0.8.5
+CARGO_CRATES+=	rand_chacha-0.3.1
+CARGO_CRATES+=	rand_core-0.3.1
+CARGO_CRATES+=	rand_core-0.4.2
+CARGO_CRATES+=	rand_core-0.6.3
+CARGO_CRATES+=	rand_xorshift-0.3.0
+CARGO_CRATES+=	rayon-1.6.0
+CARGO_CRATES+=	rayon-core-1.10.1
+CARGO_CRATES+=	rdrand-0.4.0
+CARGO_CRATES+=	redox_syscall-0.2.13
+CARGO_CRATES+=	redox_syscall-0.2.16
+CARGO_CRATES+=	redox_users-0.4.3
+CARGO_CRATES+=	regex-1.7.0
+CARGO_CRATES+=	regex-automata-0.1.10
+CARGO_CRATES+=	regex-syntax-0.6.27
+CARGO_CRATES+=	regex-syntax-0.6.28
+CARGO_CRATES+=	remove_dir_all-0.5.3
+CARGO_CRATES+=	ring-0.16.20
+CARGO_CRATES+=	riscv-0.7.0
+CARGO_CRATES+=	riscv-target-0.1.2
+CARGO_CRATES+=	rustc-demangle-0.1.21
+CARGO_CRATES+=	rustc-hash-1.1.0
+CARGO_CRATES+=	rustc_version-0.2.3
+CARGO_CRATES+=	rustc_version-0.3.3
+CARGO_CRATES+=	rustc_version-0.4.0
+CARGO_CRATES+=	rustix-0.36.5
+CARGO_CRATES+=	rustls-0.20.7
+CARGO_CRATES+=	rusty-fork-0.3.0
+CARGO_CRATES+=	ryu-1.0.10
+CARGO_CRATES+=	ryu-1.0.11
+CARGO_CRATES+=	safemem-0.3.3
+CARGO_CRATES+=	same-file-1.0.6
+CARGO_CRATES+=	schannel-0.1.20
+CARGO_CRATES+=	scopeguard-1.1.0
+CARGO_CRATES+=	scratch-1.0.2
+CARGO_CRATES+=	sct-0.7.0
+CARGO_CRATES+=	seahash-4.1.0
+CARGO_CRATES+=	security-framework-2.7.0
+CARGO_CRATES+=	security-framework-sys-2.6.1
+CARGO_CRATES+=	semver-0.11.0
+CARGO_CRATES+=	semver-0.9.0
+CARGO_CRATES+=	semver-1.0.12
+CARGO_CRATES+=	semver-1.0.14
+CARGO_CRATES+=	semver-parser-0.10.2
+CARGO_CRATES+=	semver-parser-0.7.0
+CARGO_CRATES+=	seq-macro-0.3.1
+CARGO_CRATES+=	serde-1.0.149
+CARGO_CRATES+=	serde-xml-rs-0.5.1
+CARGO_CRATES+=	serde_cbor-0.11.2
+CARGO_CRATES+=	serde_derive-1.0.149
+CARGO_CRATES+=	serde_json-1.0.89
+CARGO_CRATES+=	serde_with-1.14.0
+CARGO_CRATES+=	serde_with_macros-1.5.2
+CARGO_CRATES+=	serde_yaml-0.8.25
+CARGO_CRATES+=	sha2-0.10.6
+CARGO_CRATES+=	sharded-slab-0.1.4
+CARGO_CRATES+=	shared_child-0.3.5
+CARGO_CRATES+=	shlex-1.1.0
+CARGO_CRATES+=	similar-2.1.0
+CARGO_CRATES+=	siphasher-0.3.10
+CARGO_CRATES+=	slab-0.4.6
+CARGO_CRATES+=	smallvec-1.10.0
+CARGO_CRATES+=	smallvec-1.9.0
+CARGO_CRATES+=	socket2-0.4.4
+CARGO_CRATES+=	spin-0.5.2
+CARGO_CRATES+=	spin-0.9.3
+CARGO_CRATES+=	sptr-0.3.2
+CARGO_CRATES+=	stable_deref_trait-1.2.0
+CARGO_CRATES+=	stringprep-0.1.2
+CARGO_CRATES+=	strsim-0.10.0
+CARGO_CRATES+=	subtle-2.4.1
+CARGO_CRATES+=	supports-color-1.3.1
+CARGO_CRATES+=	syn-0.15.44
+CARGO_CRATES+=	syn-1.0.105
+CARGO_CRATES+=	syntect-5.0.0
+CARGO_CRATES+=	tap-1.0.1
+CARGO_CRATES+=	tempdir-0.3.7
+CARGO_CRATES+=	tempfile-3.3.0
+CARGO_CRATES+=	termcolor-1.1.3
+CARGO_CRATES+=	terminal_size-0.1.17
+CARGO_CRATES+=	test-generator-0.3.0
+CARGO_CRATES+=	testcontainers-0.14.0
+CARGO_CRATES+=	thiserror-1.0.31
+CARGO_CRATES+=	thiserror-1.0.37
+CARGO_CRATES+=	thiserror-impl-1.0.31
+CARGO_CRATES+=	thiserror-impl-1.0.37
+CARGO_CRATES+=	thread_local-1.1.4
+CARGO_CRATES+=	time-0.1.44
+CARGO_CRATES+=	time-0.3.17
+CARGO_CRATES+=	time-core-0.1.0
+CARGO_CRATES+=	time-macros-0.2.6
+CARGO_CRATES+=	tinyvec-1.6.0
+CARGO_CRATES+=	tinyvec_macros-0.1.0
+CARGO_CRATES+=	tokio-1.19.2
+CARGO_CRATES+=	tokio-postgres-0.7.7
+CARGO_CRATES+=	tokio-util-0.7.3
+CARGO_CRATES+=	toml-0.5.9
+CARGO_CRATES+=	tracing-0.1.37
+CARGO_CRATES+=	tracing-attributes-0.1.23
+CARGO_CRATES+=	tracing-core-0.1.30
+CARGO_CRATES+=	tracing-error-0.2.0
+CARGO_CRATES+=	tracing-log-0.1.3
+CARGO_CRATES+=	tracing-subscriber-0.3.16
+CARGO_CRATES+=	typenum-1.15.0
+CARGO_CRATES+=	ucd-trie-0.1.4
+CARGO_CRATES+=	uluru-3.0.0
+CARGO_CRATES+=	unescape-0.1.0
+CARGO_CRATES+=	unicase-2.6.0
+CARGO_CRATES+=	unicode-bidi-0.3.8
+CARGO_CRATES+=	unicode-ident-1.0.1
+CARGO_CRATES+=	unicode-ident-1.0.5
+CARGO_CRATES+=	unicode-normalization-0.1.21
+CARGO_CRATES+=	unicode-normalization-0.1.22
+CARGO_CRATES+=	unicode-width-0.1.10
+CARGO_CRATES+=	unicode-xid-0.1.0
+CARGO_CRATES+=	untrusted-0.7.1
+CARGO_CRATES+=	ureq-2.5.0
+CARGO_CRATES+=	url-2.3.1
+CARGO_CRATES+=	uuid-1.2.2
+CARGO_CRATES+=	valuable-0.1.0
+CARGO_CRATES+=	vcell-0.1.3
+CARGO_CRATES+=	vcpkg-0.2.15
+CARGO_CRATES+=	version_check-0.9.4
+CARGO_CRATES+=	void-1.0.2
+CARGO_CRATES+=	volatile-register-0.2.1
+CARGO_CRATES+=	wait-timeout-0.2.0
+CARGO_CRATES+=	walkdir-2.3.2
+CARGO_CRATES+=	wasi-0.10.0+wasi-snapshot-preview1
+CARGO_CRATES+=	wasi-0.11.0+wasi-snapshot-preview1
+CARGO_CRATES+=	wasm-bindgen-0.2.83
+CARGO_CRATES+=	wasm-bindgen-backend-0.2.83
+CARGO_CRATES+=	wasm-bindgen-macro-0.2.83
+CARGO_CRATES+=	wasm-bindgen-macro-support-0.2.83
+CARGO_CRATES+=	wasm-bindgen-shared-0.2.83
+CARGO_CRATES+=	web-sys-0.3.60
+CARGO_CRATES+=	webpki-0.22.0
+CARGO_CRATES+=	webpki-roots-0.22.5
+CARGO_CRATES+=	winapi-0.3.9
+CARGO_CRATES+=	winapi-i686-pc-windows-gnu-0.4.0
+CARGO_CRATES+=	winapi-util-0.1.5
+CARGO_CRATES+=	winapi-x86_64-pc-windows-gnu-0.4.0
+CARGO_CRATES+=	windows-sys-0.36.1
+CARGO_CRATES+=	windows-sys-0.42.0
+CARGO_CRATES+=	windows_aarch64_gnullvm-0.42.0
+CARGO_CRATES+=	windows_aarch64_msvc-0.36.1
+CARGO_CRATES+=	windows_aarch64_msvc-0.42.0
+CARGO_CRATES+=	windows_i686_gnu-0.36.1
+CARGO_CRATES+=	windows_i686_gnu-0.42.0
+CARGO_CRATES+=	windows_i686_msvc-0.36.1
+CARGO_CRATES+=	windows_i686_msvc-0.42.0
+CARGO_CRATES+=	windows_x86_64_gnu-0.36.1
+CARGO_CRATES+=	windows_x86_64_gnu-0.42.0
+CARGO_CRATES+=	windows_x86_64_gnullvm-0.42.0
+CARGO_CRATES+=	windows_x86_64_msvc-0.36.1
+CARGO_CRATES+=	windows_x86_64_msvc-0.42.0
+CARGO_CRATES+=	wyz-0.5.0
+CARGO_CRATES+=	xml-rs-0.8.4
+CARGO_CRATES+=	yaml-rust-0.4.5
diff --git a/databases/postgresql-promscale/distinfo b/databases/postgresql-promscale/distinfo
new file mode 100644
index 000000000000..d808807d0cb3
--- /dev/null
+++ b/databases/postgresql-promscale/distinfo
@@ -0,0 +1,769 @@
+TIMESTAMP = 1674063374
+SHA256 (rust/crates/addr2line-0.17.0.crate) = b9ecd88a8c8378ca913a680cd98f0f13ac67383d35993f86c90a70e3f137816b
+SIZE (rust/crates/addr2line-0.17.0.crate) = 32260
+SHA256 (rust/crates/adler-1.0.2.crate) = f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe
+SIZE (rust/crates/adler-1.0.2.crate) = 12778
+SHA256 (rust/crates/aho-corasick-0.7.18.crate) = 1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f
+SIZE (rust/crates/aho-corasick-0.7.18.crate) = 112923
+SHA256 (rust/crates/aho-corasick-0.7.20.crate) = cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac
+SIZE (rust/crates/aho-corasick-0.7.20.crate) = 111440
+SHA256 (rust/crates/android_system_properties-0.1.5.crate) = 819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311
+SIZE (rust/crates/android_system_properties-0.1.5.crate) = 5243
+SHA256 (rust/crates/arrayvec-0.7.2.crate) = 8da52d66c7071e2e3fa2a1e5c6d088fec47b593032b254f5e980de8ea54454d6
+SIZE (rust/crates/arrayvec-0.7.2.crate) = 29341
+SHA256 (rust/crates/askama-0.11.1.crate) = fb98f10f371286b177db5eeb9a6e5396609555686a35e1d4f7b9a9c6d8af0139
+SIZE (rust/crates/askama-0.11.1.crate) = 8182
+SHA256 (rust/crates/askama_derive-0.11.2.crate) = 87bf87e6e8b47264efa9bde63d6225c6276a52e05e91bf37eaa8afd0032d6b71
+SIZE (rust/crates/askama_derive-0.11.2.crate) = 7097
+SHA256 (rust/crates/askama_escape-0.10.3.crate) = 619743e34b5ba4e9703bba34deac3427c72507c7159f5fd030aea8cac0cfe341
+SIZE (rust/crates/askama_escape-0.10.3.crate) = 8875
+SHA256 (rust/crates/askama_shared-0.12.2.crate) = bf722b94118a07fcbc6640190f247334027685d4e218b794dbfe17c32bf38ed0
+SIZE (rust/crates/askama_shared-0.12.2.crate) = 38015
+SHA256 (rust/crates/async-trait-0.1.56.crate) = 96cf8829f67d2eab0b2dfa42c5d0ef737e0724e4a82b01b3e292456202b19716
+SIZE (rust/crates/async-trait-0.1.56.crate) = 27425
+SHA256 (rust/crates/atomic-polyfill-0.1.8.crate) = e14bf7b4f565e5e717d7a7a65b2a05c0b8c96e4db636d6f780f03b15108cdd1b
+SIZE (rust/crates/atomic-polyfill-0.1.8.crate) = 12267
+SHA256 (rust/crates/atomic-traits-0.3.0.crate) = b29ec3788e96fb4fdb275ccb9d62811f2fa903d76c5eb4dd6fe7d09a7ed5871f
+SIZE (rust/crates/atomic-traits-0.3.0.crate) = 8745
+SHA256 (rust/crates/atty-0.2.14.crate) = d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8
+SIZE (rust/crates/atty-0.2.14.crate) = 5470
+SHA256 (rust/crates/autocfg-1.1.0.crate) = d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa
+SIZE (rust/crates/autocfg-1.1.0.crate) = 13272
+SHA256 (rust/crates/backtrace-0.3.66.crate) = cab84319d616cfb654d03394f38ab7e6f0919e181b1b57e1fd15e7fb4077d9a7
+SIZE (rust/crates/backtrace-0.3.66.crate) = 74397
+SHA256 (rust/crates/bare-metal-0.2.5.crate) = 5deb64efa5bd81e31fcd1938615a6d98c82eafcbcd787162b6f63b91d6bac5b3
+SIZE (rust/crates/bare-metal-0.2.5.crate) = 7923
+SHA256 (rust/crates/bare-metal-1.0.0.crate) = f8fe8f5a8a398345e52358e18ff07cc17a568fbca5c6f73873d3a62056309603
+SIZE (rust/crates/bare-metal-1.0.0.crate) = 10650
+SHA256 (rust/crates/base64-0.13.0.crate) = 904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd
+SIZE (rust/crates/base64-0.13.0.crate) = 62070
+SHA256 (rust/crates/base64-0.13.1.crate) = 9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8
+SIZE (rust/crates/base64-0.13.1.crate) = 61002
+SHA256 (rust/crates/bincode-1.3.3.crate) = b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad
+SIZE (rust/crates/bincode-1.3.3.crate) = 28958
+SHA256 (rust/crates/bindgen-0.60.1.crate) = 062dddbc1ba4aca46de6338e2bf87771414c335f7b2f2036e8f3e9befebf88e6
+SIZE (rust/crates/bindgen-0.60.1.crate) = 207507
+SHA256 (rust/crates/bit-set-0.5.2.crate) = 6e11e16035ea35e4e5997b393eacbf6f63983188f7a2ad25bfb13465f5ad59de
+SIZE (rust/crates/bit-set-0.5.2.crate) = 14093
+SHA256 (rust/crates/bit-set-0.5.3.crate) = 0700ddab506f33b20a03b13996eccd309a48e5ff77d0d95926aa0210fb4e95f1
+SIZE (rust/crates/bit-set-0.5.3.crate) = 14470
+SHA256 (rust/crates/bit-vec-0.6.3.crate) = 349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb
+SIZE (rust/crates/bit-vec-0.6.3.crate) = 19927
+SHA256 (rust/crates/bit_field-0.10.1.crate) = dcb6dd1c2376d2e096796e234a70e17e94cc2d5d54ff8ce42b28cef1d0d359a4
+SIZE (rust/crates/bit_field-0.10.1.crate) = 10576
+SHA256 (rust/crates/bitfield-0.13.2.crate) = 46afbd2983a5d5a7bd740ccb198caf5b82f45c40c09c0eed36052d91cb92e719
+SIZE (rust/crates/bitfield-0.13.2.crate) = 16479
+SHA256 (rust/crates/bitflags-1.3.2.crate) = bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a
+SIZE (rust/crates/bitflags-1.3.2.crate) = 23021
+SHA256 (rust/crates/bitvec-1.0.1.crate) = 1bc2832c24239b0141d5674bb9174f9d68a8b5b3f2753311927c172ca46f7e9c
+SIZE (rust/crates/bitvec-1.0.1.crate) = 224375
+SHA256 (rust/crates/block-buffer-0.10.2.crate) = 0bf7fe51849ea569fd452f37822f606a5cabb684dc918707a0193fd4664ff324
+SIZE (rust/crates/block-buffer-0.10.2.crate) = 10258
+SHA256 (rust/crates/bollard-stubs-1.41.0.crate) = ed2f2e73fffe9455141e170fb9c1feb0ac521ec7e7dcd47a7cab72a658490fb8
+SIZE (rust/crates/bollard-stubs-1.41.0.crate) = 43990
+SHA256 (rust/crates/build-deps-0.1.4.crate) = 64f14468960818ce4f3e3553c32d524446687884f8e7af5d3e252331d8a87e43
+SIZE (rust/crates/build-deps-0.1.4.crate) = 35939
+SHA256 (rust/crates/bumpalo-3.11.1.crate) = 572f695136211188308f16ad2ca5c851a712c464060ae6974944458eb83880ba
+SIZE (rust/crates/bumpalo-3.11.1.crate) = 81207
+SHA256 (rust/crates/byteorder-1.4.3.crate) = 14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610
+SIZE (rust/crates/byteorder-1.4.3.crate) = 22512
+SHA256 (rust/crates/bytes-1.1.0.crate) = c4872d67bab6358e59559027aa3b9157c53d9358c51423c17554809a8858e0f8
+SIZE (rust/crates/bytes-1.1.0.crate) = 49640
+SHA256 (rust/crates/camino-1.1.1.crate) = 88ad0e1e3e88dd237a156ab9f571021b8a158caa0ae44b1968a241efb5144c1e
+SIZE (rust/crates/camino-1.1.1.crate) = 30737
+SHA256 (rust/crates/cargo-pgx-0.6.1.crate) = ccb5ec51388843626d9b34a589da48f9f273755e702761ac9c7a1f328bb3faee
+SIZE (rust/crates/cargo-pgx-0.6.1.crate) = 48324
+SHA256 (rust/crates/cargo-platform-0.1.2.crate) = cbdb825da8a5df079a43676dbe042702f1707b1109f713a01420fbb4cc71fa27
+SIZE (rust/crates/cargo-platform-0.1.2.crate) = 11645
+SHA256 (rust/crates/cargo_metadata-0.15.2.crate) = 982a0cf6a99c350d7246035613882e376d58cebe571785abc5da4f648d53ac0a
+SIZE (rust/crates/cargo_metadata-0.15.2.crate) = 18528
+SHA256 (rust/crates/cargo_toml-0.11.8.crate) = e72c3ff59e3b7d24630206bb63a73af65da4ed5df1f76ee84dfafb9fee2ba60e
+SIZE (rust/crates/cargo_toml-0.11.8.crate) = 19410
+SHA256 (rust/crates/cc-1.0.77.crate) = e9f73505338f7d905b19d18738976aae232eb46b8efc15554ffc56deb5d9ebe4
+SIZE (rust/crates/cc-1.0.77.crate) = 60723
+SHA256 (rust/crates/cexpr-0.6.0.crate) = 6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766
+SIZE (rust/crates/cexpr-0.6.0.crate) = 17966
+SHA256 (rust/crates/cfg-if-1.0.0.crate) = baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd
+SIZE (rust/crates/cfg-if-1.0.0.crate) = 7934
+SHA256 (rust/crates/chrono-0.4.23.crate) = 16b0a3d9ed01224b22057780a37bb8c5dbfe1be8ba48678e7bf57ec4b385411f
+SIZE (rust/crates/chrono-0.4.23.crate) = 187259
+SHA256 (rust/crates/chunked_transfer-1.4.0.crate) = fff857943da45f546682664a79488be82e69e43c1a7a2307679ab9afb3a66d2e
+SIZE (rust/crates/chunked_transfer-1.4.0.crate) = 9238
+SHA256 (rust/crates/clang-sys-1.3.3.crate) = 5a050e2153c5be08febd6734e29298e844fdb0fa21aeddd63b4eb7baa106c69b
+SIZE (rust/crates/clang-sys-1.3.3.crate) = 37943
+SHA256 (rust/crates/clap-4.0.29.crate) = 4d63b9e9c07271b9957ad22c173bae2a4d9a81127680962039296abcd2f8251d
+SIZE (rust/crates/clap-4.0.29.crate) = 205982
+SHA256 (rust/crates/clap-cargo-0.10.0.crate) = eca953650a7350560b61db95a0ab1d9c6f7b74d146a9e08fb258b834f3cf7e2c
+SIZE (rust/crates/clap-cargo-0.10.0.crate) = 11039
+SHA256 (rust/crates/clap_derive-4.0.21.crate) = 0177313f9f02afc995627906bbd8967e2be069f5261954222dac78290c2b9014
+SIZE (rust/crates/clap_derive-4.0.21.crate) = 27567
+SHA256 (rust/crates/clap_lex-0.3.0.crate) = 0d4198f73e42b4936b35b5bb248d81d2b595ecb170da0bac7655c54eedfa8da8
+SIZE (rust/crates/clap_lex-0.3.0.crate) = 9671
+SHA256 (rust/crates/codespan-reporting-0.11.1.crate) = 3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e
+SIZE (rust/crates/codespan-reporting-0.11.1.crate) = 48963
+SHA256 (rust/crates/color-eyre-0.6.2.crate) = 5a667583cca8c4f8436db8de46ea8233c42a7d9ae424a82d338f2e4675229204
+SIZE (rust/crates/color-eyre-0.6.2.crate) = 635042
+SHA256 (rust/crates/color-spantrace-0.2.0.crate) = 1ba75b3d9449ecdccb27ecbc479fdc0b87fa2dd43d2f8298f9bf0e59aacc8dce
+SIZE (rust/crates/color-spantrace-0.2.0.crate) = 185098
+SHA256 (rust/crates/console-0.15.0.crate) = a28b32d32ca44b70c3e4acd7db1babf555fa026e385fb95f18028f88848b3c31
+SIZE (rust/crates/console-0.15.0.crate) = 23507
+SHA256 (rust/crates/convert_case-0.5.0.crate) = fb4a24b1aaf0fd0ce8b45161144d6f42cd91677fd5940fd431183eb023b3a2b8
+SIZE (rust/crates/convert_case-0.5.0.crate) = 17902
+SHA256 (rust/crates/core-foundation-0.9.3.crate) = 194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146
+SIZE (rust/crates/core-foundation-0.9.3.crate) = 27059
+SHA256 (rust/crates/core-foundation-sys-0.8.3.crate) = 5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc
+SIZE (rust/crates/core-foundation-sys-0.8.3.crate) = 17519
+SHA256 (rust/crates/cortex-m-0.7.5.crate) = cd20d4ac4aa86f4f75f239d59e542ef67de87cce2c282818dc6e84155d3ea126
+SIZE (rust/crates/cortex-m-0.7.5.crate) = 140834
+SHA256 (rust/crates/cpufeatures-0.2.2.crate) = 59a6001667ab124aebae2a495118e11d30984c3a653e99d86d58971708cf5e4b
+SIZE (rust/crates/cpufeatures-0.2.2.crate) = 10655
+SHA256 (rust/crates/crc32fast-1.3.2.crate) = b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d
+SIZE (rust/crates/crc32fast-1.3.2.crate) = 38661
+SHA256 (rust/crates/critical-section-0.2.7.crate) = 95da181745b56d4bd339530ec393508910c909c784e8962d15d722bacf0bcbcd
+SIZE (rust/crates/critical-section-0.2.7.crate) = 6094
+SHA256 (rust/crates/crossbeam-channel-0.5.5.crate) = 4c02a4d71819009c192cf4872265391563fd6a84c81ff2c0f2a7026ca4c1d85c
+SIZE (rust/crates/crossbeam-channel-0.5.5.crate) = 90326
+SHA256 (rust/crates/crossbeam-channel-0.5.6.crate) = c2dd04ddaf88237dc3b8d8f9a3c1004b506b54b3313403944054d23c0870c521
+SIZE (rust/crates/crossbeam-channel-0.5.6.crate) = 90292
+SHA256 (rust/crates/crossbeam-deque-0.8.1.crate) = 6455c0ca19f0d2fbf751b908d5c55c1f5cbc65e03c4225427254b46890bdde1e
+SIZE (rust/crates/crossbeam-deque-0.8.1.crate) = 20852
+SHA256 (rust/crates/crossbeam-deque-0.8.2.crate) = 715e8152b692bba2d374b53d4875445368fdf21a94751410af607a5ac677d1fc
+SIZE (rust/crates/crossbeam-deque-0.8.2.crate) = 21237
+SHA256 (rust/crates/crossbeam-epoch-0.9.13.crate) = 01a9af1f4c2ef74bb8aa1f7e19706bc72d03598c8a570bb5de72243c7a9d9d5a
+SIZE (rust/crates/crossbeam-epoch-0.9.13.crate) = 48313
+SHA256 (rust/crates/crossbeam-epoch-0.9.9.crate) = 07db9d94cbd326813772c968ccd25999e5f8ae22f4f8d1b11effa37ef6ce281d
+SIZE (rust/crates/crossbeam-epoch-0.9.9.crate) = 46185
+SHA256 (rust/crates/crossbeam-utils-0.8.10.crate) = 7d82ee10ce34d7bc12c2122495e7593a9c41347ecdd64185af4ecf72cb1a7f83
+SIZE (rust/crates/crossbeam-utils-0.8.10.crate) = 40672
+SHA256 (rust/crates/crossbeam-utils-0.8.14.crate) = 4fb766fa798726286dbbb842f174001dab8abc7b627a1dd86e0b7222a95d929f
+SIZE (rust/crates/crossbeam-utils-0.8.14.crate) = 42127
+SHA256 (rust/crates/crypto-common-0.1.5.crate) = 2ccfd8c0ee4cce11e45b3fd6f9d5e69e0cc62912aa6a0cb1bf4617b0eba5a12f
+SIZE (rust/crates/crypto-common-0.1.5.crate) = 8513
+SHA256 (rust/crates/cstr_core-0.2.6.crate) = dd98742e4fdca832d40cab219dc2e3048de17d873248f83f17df47c1bea70956
+SIZE (rust/crates/cstr_core-0.2.6.crate) = 17549
+SHA256 (rust/crates/cty-0.2.2.crate) = b365fabc795046672053e29c954733ec3b05e4be654ab130fe8f1f94d7051f35
+SIZE (rust/crates/cty-0.2.2.crate) = 7230
+SHA256 (rust/crates/cxx-1.0.83.crate) = bdf07d07d6531bfcdbe9b8b739b104610c6508dcc4d63b410585faf338241daf
+SIZE (rust/crates/cxx-1.0.83.crate) = 198262
+SHA256 (rust/crates/cxx-build-1.0.83.crate) = d2eb5b96ecdc99f72657332953d4d9c50135af1bac34277801cc3937906ebd39
+SIZE (rust/crates/cxx-build-1.0.83.crate) = 84791
+SHA256 (rust/crates/cxxbridge-flags-1.0.83.crate) = ac040a39517fd1674e0f32177648334b0f4074625b5588a64519804ba0553b12
+SIZE (rust/crates/cxxbridge-flags-1.0.83.crate) = 5635
+SHA256 (rust/crates/cxxbridge-macro-1.0.83.crate) = 1362b0ddcfc4eb0a1f57b68bd77dd99f0e826958a96abd0ae9bd092e114ffed6
+SIZE (rust/crates/cxxbridge-macro-1.0.83.crate) = 59869
+SHA256 (rust/crates/darling-0.13.4.crate) = a01d95850c592940db9b8194bc39f4bc0e89dee5c4265e4b1807c34a9aba453c
+SIZE (rust/crates/darling-0.13.4.crate) = 20895
+SHA256 (rust/crates/darling_core-0.13.4.crate) = 859d65a907b6852c9361e3185c862aae7fafd2887876799fa55f5f99dc40d610
+SIZE (rust/crates/darling_core-0.13.4.crate) = 52937
+SHA256 (rust/crates/darling_macro-0.13.4.crate) = 9c972679f83bdf9c42bd905396b6c3588a843a17f0f16dfcfa3e2c5d57441835
+SIZE (rust/crates/darling_macro-0.13.4.crate) = 1910
+SHA256 (rust/crates/digest-0.10.6.crate) = 8168378f4e5023e7218c89c891c0fd8ecdb5e5e4f18cb78f38cf245dd021e76f
+SIZE (rust/crates/digest-0.10.6.crate) = 19527
+SHA256 (rust/crates/dirs-4.0.0.crate) = ca3aa72a6f96ea37bbc5aa912f6788242832f75369bdfdadcb0e38423f100059
+SIZE (rust/crates/dirs-4.0.0.crate) = 12503
+SHA256 (rust/crates/dirs-sys-0.3.7.crate) = 1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6
+SIZE (rust/crates/dirs-sys-0.3.7.crate) = 10597
+SHA256 (rust/crates/doc-comment-0.3.3.crate) = fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10
+SIZE (rust/crates/doc-comment-0.3.3.crate) = 4123
+SHA256 (rust/crates/duct-0.13.5.crate) = 0fc6a0a59ed0888e0041cf708e66357b7ae1a82f1c67247e1f93b5e0818f7d8d
+SIZE (rust/crates/duct-0.13.5.crate) = 28838
+SHA256 (rust/crates/either-1.7.0.crate) = 3f107b87b6afc2a64fd13cac55fe06d6c8859f12d4b14cbcdd2c67d0976781be
+SIZE (rust/crates/either-1.7.0.crate) = 15492
+SHA256 (rust/crates/either-1.8.0.crate) = 90e5c1c8368803113bf0c9584fc495a58b86dc8a29edbf8fe877d21d9507e797
+SIZE (rust/crates/either-1.8.0.crate) = 15992
+SHA256 (rust/crates/embedded-hal-0.2.7.crate) = 35949884794ad573cf46071e41c9b60efb0cb311e3ca01f7af807af1debc66ff
+SIZE (rust/crates/embedded-hal-0.2.7.crate) = 32623
+SHA256 (rust/crates/encode_unicode-0.3.6.crate) = a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f
+SIZE (rust/crates/encode_unicode-0.3.6.crate) = 45741
+SHA256 (rust/crates/env_logger-0.7.1.crate) = 44533bbbb3bb3c1fa17d9f2e4e38bbbaf8396ba82193c4cb1b6445d711445d36
+SIZE (rust/crates/env_logger-0.7.1.crate) = 32281
+SHA256 (rust/crates/env_proxy-0.4.1.crate) = 3a5019be18538406a43b5419a5501461f0c8b49ea7dfda0cfc32f4e51fc44be1
+SIZE (rust/crates/env_proxy-0.4.1.crate) = 11256
+SHA256 (rust/crates/errno-0.2.8.crate) = f639046355ee4f37944e44f60642c6f3a7efa3cf6b78c78a0d989a8ce6c396a1
+SIZE (rust/crates/errno-0.2.8.crate) = 9276
+SHA256 (rust/crates/errno-dragonfly-0.1.2.crate) = aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf
+SIZE (rust/crates/errno-dragonfly-0.1.2.crate) = 1810
+SHA256 (rust/crates/eyre-0.6.8.crate) = 4c2b6b5a29c02cdc822728b7d7b8ae1bab3e3b05d44522770ddd49722eeac7eb
+SIZE (rust/crates/eyre-0.6.8.crate) = 41587
+SHA256 (rust/crates/fallible-iterator-0.2.0.crate) = 4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7
+SIZE (rust/crates/fallible-iterator-0.2.0.crate) = 18509
+SHA256 (rust/crates/fancy-regex-0.7.1.crate) = 9d6b8560a05112eb52f04b00e5d3790c0dd75d9d980eb8a122fb23b92a623ccf
+SIZE (rust/crates/fancy-regex-0.7.1.crate) = 78178
+SHA256 (rust/crates/fastrand-1.7.0.crate) = c3fcf0cee53519c866c09b5de1f6c56ff9d647101f81c1964fa632e148896cdf
+SIZE (rust/crates/fastrand-1.7.0.crate) = 11265
+SHA256 (rust/crates/fastrand-1.8.0.crate) = a7a407cfaa3385c4ae6b23e84623d48c2798d06e3e6a1878f7f59f17b3f86499
+SIZE (rust/crates/fastrand-1.8.0.crate) = 11369
+SHA256 (rust/crates/fixedbitset-0.4.2.crate) = 0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80
+SIZE (rust/crates/fixedbitset-0.4.2.crate) = 15954
+SHA256 (rust/crates/flate2-1.0.25.crate) = a8a2db397cb1c8772f31494cb8917e48cd1e64f0fa7efac59fbd741a0a8ce841
+SIZE (rust/crates/flate2-1.0.25.crate) = 70210
+SHA256 (rust/crates/fnv-1.0.7.crate) = 3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1
+SIZE (rust/crates/fnv-1.0.7.crate) = 11266
+SHA256 (rust/crates/foreign-types-0.3.2.crate) = f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1
+SIZE (rust/crates/foreign-types-0.3.2.crate) = 7504
+SHA256 (rust/crates/foreign-types-shared-0.1.1.crate) = 00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b
+SIZE (rust/crates/foreign-types-shared-0.1.1.crate) = 5672
+SHA256 (rust/crates/fork-0.1.20.crate) = 9788ce090af4bf8d6e8f43d3f7d12305c787456387bd2d88856fcda3aa1f0dca
+SIZE (rust/crates/fork-0.1.20.crate) = 4885
+SHA256 (rust/crates/form_urlencoded-1.1.0.crate) = a9c384f161156f5260c24a097c56119f9be8c798586aecc13afbcbe7b7e26bf8
+SIZE (rust/crates/form_urlencoded-1.1.0.crate) = 8734
+SHA256 (rust/crates/fuchsia-cprng-0.1.1.crate) = a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba
+SIZE (rust/crates/fuchsia-cprng-0.1.1.crate) = 2950
+SHA256 (rust/crates/funty-2.0.0.crate) = e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c
+SIZE (rust/crates/funty-2.0.0.crate) = 13160
+SHA256 (rust/crates/futures-0.3.21.crate) = f73fe65f54d1e12b726f517d3e2135ca3125a437b6d998caf1962961f7172d9e
+SIZE (rust/crates/futures-0.3.21.crate) = 49935
+SHA256 (rust/crates/futures-channel-0.3.21.crate) = c3083ce4b914124575708913bca19bfe887522d6e2e6d0952943f5eac4a74010
+SIZE (rust/crates/futures-channel-0.3.21.crate) = 31961
+SHA256 (rust/crates/futures-core-0.3.21.crate) = 0c09fd04b7e4073ac7156a9539b57a484a8ea920f79c7c675d05d289ab6110d3
+SIZE (rust/crates/futures-core-0.3.21.crate) = 14601
+SHA256 (rust/crates/futures-executor-0.3.21.crate) = 9420b90cfa29e327d0429f19be13e7ddb68fa1cccb09d65e5706b8c7a749b8a6
+SIZE (rust/crates/futures-executor-0.3.21.crate) = 17306
+SHA256 (rust/crates/futures-io-0.3.21.crate) = fc4045962a5a5e935ee2fdedaa4e08284547402885ab326734432bed5d12966b
+SIZE (rust/crates/futures-io-0.3.21.crate) = 8902
+SHA256 (rust/crates/futures-macro-0.3.21.crate) = 33c1e13800337f4d4d7a316bf45a567dbcb6ffe087f16424852d97e97a91f512
+SIZE (rust/crates/futures-macro-0.3.21.crate) = 11250
+SHA256 (rust/crates/futures-sink-0.3.21.crate) = 21163e139fa306126e6eedaf49ecdb4588f939600f0b1e770f4205ee4b7fa868
+SIZE (rust/crates/futures-sink-0.3.21.crate) = 7843
+SHA256 (rust/crates/futures-task-0.3.21.crate) = 57c66a976bf5909d801bbef33416c41372779507e7a6b3a5e25e4749c58f776a
+SIZE (rust/crates/futures-task-0.3.21.crate) = 11815
+SHA256 (rust/crates/futures-util-0.3.21.crate) = d8b7abd5d659d9b90c8cba917f6ec750a74e2dc23902ef9cd4cc8c8b22e6036a
+SIZE (rust/crates/futures-util-0.3.21.crate) = 153768
+SHA256 (rust/crates/generic-array-0.14.5.crate) = fd48d33ec7f05fbfa152300fdad764757cbded343c1aa1cff2fbaf4134851803
+SIZE (rust/crates/generic-array-0.14.5.crate) = 28915
+SHA256 (rust/crates/getrandom-0.2.7.crate) = 4eb1a864a501629691edf6c15a593b7a51eebaa1e8468e9ddc623de7c9b58ec6
+SIZE (rust/crates/getrandom-0.2.7.crate) = 28854
+SHA256 (rust/crates/getrandom-0.2.8.crate) = c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31
+SIZE (rust/crates/getrandom-0.2.8.crate) = 30553
+SHA256 (rust/crates/gimli-0.26.2.crate) = 22030e2c5a68ec659fde1e949a745124b48e6fa8b045b7ed5bd1fe4ccc5c4e5d
+SIZE (rust/crates/gimli-0.26.2.crate) = 717340
+SHA256 (rust/crates/glob-0.3.0.crate) = 9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574
+SIZE (rust/crates/glob-0.3.0.crate) = 18724
+SHA256 (rust/crates/half-1.8.2.crate) = eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7
+SIZE (rust/crates/half-1.8.2.crate) = 41874
+SHA256 (rust/crates/hash32-0.2.1.crate) = b0c35f58762feb77d74ebe43bdbc3210f09be9fe6742234d573bacc26ed92b67
+SIZE (rust/crates/hash32-0.2.1.crate) = 11168
+SHA256 (rust/crates/hashbrown-0.12.2.crate) = 607c8a29735385251a339424dd462993c0fed8fa09d378f259377df08c126022
+SIZE (rust/crates/hashbrown-0.12.2.crate) = 102346
+SHA256 (rust/crates/hashbrown-0.12.3.crate) = 8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888
+SIZE (rust/crates/hashbrown-0.12.3.crate) = 102968
+SHA256 (rust/crates/heapless-0.7.16.crate) = db04bc24a18b9ea980628ecf00e6c0264f3c1426dac36c00cb49b6fbad8b0743
+SIZE (rust/crates/heapless-0.7.16.crate) = 75999
+SHA256 (rust/crates/heck-0.4.0.crate) = 2540771e65fc8cb83cd6e8a237f70c319bd5c29f78ed1084ba5d50eeac86f7f9
+SIZE (rust/crates/heck-0.4.0.crate) = 11161
+SHA256 (rust/crates/hermit-abi-0.1.19.crate) = 62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33
+SIZE (rust/crates/hermit-abi-0.1.19.crate) = 9979
+SHA256 (rust/crates/hermit-abi-0.2.6.crate) = ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7
+SIZE (rust/crates/hermit-abi-0.2.6.crate) = 13027
+SHA256 (rust/crates/hex-0.4.3.crate) = 7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70
+SIZE (rust/crates/hex-0.4.3.crate) = 13299
+SHA256 (rust/crates/hmac-0.12.1.crate) = 6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e
+SIZE (rust/crates/hmac-0.12.1.crate) = 42657
+SHA256 (rust/crates/humansize-1.1.1.crate) = 02296996cb8796d7c6e3bc2d9211b7802812d36999a51bb754123ead7d37d026
+SIZE (rust/crates/humansize-1.1.1.crate) = 9131
+SHA256 (rust/crates/humantime-1.3.0.crate) = df004cfca50ef23c36850aaaa59ad52cc70d0e90243c3c7737a4dd32dc7a3c4f
+SIZE (rust/crates/humantime-1.3.0.crate) = 17020
+SHA256 (rust/crates/iana-time-zone-0.1.53.crate) = 64c122667b287044802d6ce17ee2ddf13207ed924c712de9a66a5814d5b64765
+SIZE (rust/crates/iana-time-zone-0.1.53.crate) = 20176
+SHA256 (rust/crates/iana-time-zone-haiku-0.1.1.crate) = 0703ae284fc167426161c2e3f1da3ea71d94b21bedbcc9494e92b28e334e3dca
+SIZE (rust/crates/iana-time-zone-haiku-0.1.1.crate) = 7200
+SHA256 (rust/crates/ident_case-1.0.1.crate) = b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39
+SIZE (rust/crates/ident_case-1.0.1.crate) = 3492
+SHA256 (rust/crates/idna-0.3.0.crate) = e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6
+SIZE (rust/crates/idna-0.3.0.crate) = 271128
+SHA256 (rust/crates/indenter-0.3.3.crate) = ce23b50ad8242c51a442f3ff322d56b02f08852c77e4c0b4d3fd684abc89c683
+SIZE (rust/crates/indenter-0.3.3.crate) = 6587
+SHA256 (rust/crates/indexmap-1.9.1.crate) = 10a35a97730320ffe8e2d410b5d3b69279b98d2c14bdb8b70ea89ecf7888d41e
+SIZE (rust/crates/indexmap-1.9.1.crate) = 54114
+SHA256 (rust/crates/indexmap-1.9.2.crate) = 1885e79c1fc4b10f0e172c475f458b7f7b93061064d98c3293e98c5ba0c8b399
+SIZE (rust/crates/indexmap-1.9.2.crate) = 54627
+SHA256 (rust/crates/insta-1.15.0.crate) = 4126dd76ebfe2561486a1bd6738a33d2029ffb068a99ac446b7f8c77b2e58dbc
+SIZE (rust/crates/insta-1.15.0.crate) = 520083
+SHA256 (rust/crates/instant-0.1.12.crate) = 7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c
+SIZE (rust/crates/instant-0.1.12.crate) = 6128
+SHA256 (rust/crates/io-lifetimes-1.0.3.crate) = 46112a93252b123d31a119a8d1a1ac19deac4fac6e0e8b0df58f0d4e5870e63c
+SIZE (rust/crates/io-lifetimes-1.0.3.crate) = 35650
+SHA256 (rust/crates/is-terminal-0.4.1.crate) = 927609f78c2913a6f6ac3c27a4fe87f43e2a35367c0c4b0f8265e8f49a104330
+SIZE (rust/crates/is-terminal-0.4.1.crate) = 6892
+SHA256 (rust/crates/is_ci-1.1.1.crate) = 616cde7c720bb2bb5824a224687d8f77bfd38922027f01d825cd7453be5099fb
+SIZE (rust/crates/is_ci-1.1.1.crate) = 4143
+SHA256 (rust/crates/itoa-1.0.2.crate) = 112c678d4050afce233f4f2852bb2eb519230b3cf12f33585275537d7e41578d
+SIZE (rust/crates/itoa-1.0.2.crate) = 11112
+SHA256 (rust/crates/itoa-1.0.4.crate) = 4217ad341ebadf8d8e724e264f13e593e0648f5b3e94b3896a5df283be015ecc
+SIZE (rust/crates/itoa-1.0.4.crate) = 10601
+SHA256 (rust/crates/js-sys-0.3.60.crate) = 49409df3e3bf0856b916e2ceaca09ee28e6871cf7d9ce97a692cacfdb2a25a47
+SIZE (rust/crates/js-sys-0.3.60.crate) = 79257
+SHA256 (rust/crates/lazy_static-1.4.0.crate) = e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646
+SIZE (rust/crates/lazy_static-1.4.0.crate) = 10443
+SHA256 (rust/crates/lazycell-1.3.0.crate) = 830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55
+SIZE (rust/crates/lazycell-1.3.0.crate) = 12502
+SHA256 (rust/crates/libc-0.2.138.crate) = db6d7e329c562c5dfab7a46a2afabc8b987ab9a4834c9d1ca04dc54c1546cef8
+SIZE (rust/crates/libc-0.2.138.crate) = 609081
+SHA256 (rust/crates/libloading-0.7.3.crate) = efbc0f03f9a775e9f6aed295c6a1ba2253c5757a9e03d55c6caa46a681abcddd
+SIZE (rust/crates/libloading-0.7.3.crate) = 27378
+SHA256 (rust/crates/libloading-0.7.4.crate) = b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f
+SIZE (rust/crates/libloading-0.7.4.crate) = 27580
+SHA256 (rust/crates/line-wrap-0.1.1.crate) = f30344350a2a51da54c1d53be93fade8a237e545dbcc4bdbe635413f2117cab9
+SIZE (rust/crates/line-wrap-0.1.1.crate) = 10010
+SHA256 (rust/crates/link-cplusplus-1.0.7.crate) = 9272ab7b96c9046fbc5bc56c06c117cb639fe2d509df0c421cad82d2915cf369
+SIZE (rust/crates/link-cplusplus-1.0.7.crate) = 7576
+SHA256 (rust/crates/linked-hash-map-0.5.6.crate) = 0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f
+SIZE (rust/crates/linked-hash-map-0.5.6.crate) = 15049
+SHA256 (rust/crates/linux-raw-sys-0.1.3.crate) = 8f9f08d8963a6c613f4b1a78f4f4a4dbfadf8e6545b2d72861731e4858b8b47f
+SIZE (rust/crates/linux-raw-sys-0.1.3.crate) = 878488
+SHA256 (rust/crates/lock_api-0.4.7.crate) = 327fa5b6a6940e4699ec49a9beae1ea4845c6bab9314e4f84ac68742139d8c53
+SIZE (rust/crates/lock_api-0.4.7.crate) = 25371
+SHA256 (rust/crates/log-0.4.17.crate) = abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e
+SIZE (rust/crates/log-0.4.17.crate) = 38028
+SHA256 (rust/crates/markdown-gen-1.2.1.crate) = 8034621d7f1258317ca1dfb9205e3925d27ee4aa2a46620a09c567daf0310562
+SIZE (rust/crates/markdown-gen-1.2.1.crate) = 6906
+SHA256 (rust/crates/matchers-0.1.0.crate) = 8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558
+SIZE (rust/crates/matchers-0.1.0.crate) = 6948
+SHA256 (rust/crates/md-5-0.10.1.crate) = 658646b21e0b72f7866c7038ab086d3d5e1cd6271f060fd37defb241949d0582
+SIZE (rust/crates/md-5-0.10.1.crate) = 14184
+SHA256 (rust/crates/memchr-2.5.0.crate) = 2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d
+SIZE (rust/crates/memchr-2.5.0.crate) = 65812
+SHA256 (rust/crates/memoffset-0.6.5.crate) = 5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce
+SIZE (rust/crates/memoffset-0.6.5.crate) = 7686
+SHA256 (rust/crates/memoffset-0.7.1.crate) = 5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4
+SIZE (rust/crates/memoffset-0.7.1.crate) = 8556
+SHA256 (rust/crates/mime-0.3.16.crate) = 2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d
+SIZE (rust/crates/mime-0.3.16.crate) = 15206
+SHA256 (rust/crates/mime_guess-2.0.4.crate) = 4192263c238a5f0d0c6bfd21f336a313a4ce1c450542449ca191bb657b4642ef
+SIZE (rust/crates/mime_guess-2.0.4.crate) = 26399
+SHA256 (rust/crates/minimal-lexical-0.2.1.crate) = 68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a
+SIZE (rust/crates/minimal-lexical-0.2.1.crate) = 94841
+SHA256 (rust/crates/miniz_oxide-0.5.4.crate) = 96590ba8f175222643a85693f33d26e9c8a015f599c216509b1a6894af675d34
+SIZE (rust/crates/miniz_oxide-0.5.4.crate) = 53485
+SHA256 (rust/crates/miniz_oxide-0.6.2.crate) = b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa
+SIZE (rust/crates/miniz_oxide-0.6.2.crate) = 54536
+SHA256 (rust/crates/mio-0.8.4.crate) = 57ee1c23c7c63b0c9250c339ffdc69255f110b298b901b9f6c82547b7b87caaf
+SIZE (rust/crates/mio-0.8.4.crate) = 93013
+SHA256 (rust/crates/native-tls-0.2.11.crate) = 07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e
+SIZE (rust/crates/native-tls-0.2.11.crate) = 29008
+SHA256 (rust/crates/nb-0.1.3.crate) = 801d31da0513b6ec5214e9bf433a77966320625a37860f910be265be6e18d06f
+SIZE (rust/crates/nb-0.1.3.crate) = 10112
+SHA256 (rust/crates/nb-1.0.0.crate) = 546c37ac5d9e56f55e73b677106873d9d9f5190605e41a856503623648488cae
+SIZE (rust/crates/nb-1.0.0.crate) = 11523
+SHA256 (rust/crates/nom-7.1.1.crate) = a8903e5a29a317527874d0402f867152a3d21c908bb0b933e416c65e301d4c36
+SIZE (rust/crates/nom-7.1.1.crate) = 115818
+SHA256 (rust/crates/nu-ansi-term-0.46.0.crate) = 77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84
+SIZE (rust/crates/nu-ansi-term-0.46.0.crate) = 24311
+SHA256 (rust/crates/num-integer-0.1.45.crate) = 225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9
+SIZE (rust/crates/num-integer-0.1.45.crate) = 22529
+SHA256 (rust/crates/num-traits-0.2.15.crate) = 578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd
+SIZE (rust/crates/num-traits-0.2.15.crate) = 49262
+SHA256 (rust/crates/num_cpus-1.13.1.crate) = 19e64526ebdee182341572e50e9ad03965aa510cd94427a4549448f285e957a1
+SIZE (rust/crates/num_cpus-1.13.1.crate) = 14752
+SHA256 (rust/crates/num_cpus-1.14.0.crate) = f6058e64324c71e02bc2b150e4f3bc8286db6c83092132ffa3f6b1eab0f9def5
+SIZE (rust/crates/num_cpus-1.14.0.crate) = 15673
+SHA256 (rust/crates/object-0.28.4.crate) = e42c982f2d955fac81dd7e1d0e1426a7d702acd9c98d19ab01083a6a0328c424
+SIZE (rust/crates/object-0.28.4.crate) = 237248
+SHA256 (rust/crates/object-0.29.0.crate) = 21158b2c33aa6d4561f1c0a6ea283ca92bc54802a93b263e910746d679a7eb53
+SIZE (rust/crates/object-0.29.0.crate) = 237723
+SHA256 (rust/crates/once_cell-1.16.0.crate) = 86f0b0d4bf799edbc74508c1e8bf170ff5f41238e5f8225603ca7caaae2b7860
+SIZE (rust/crates/once_cell-1.16.0.crate) = 32120
+SHA256 (rust/crates/openssl-0.10.44.crate) = 29d971fd5722fec23977260f6e81aa67d2f22cadbdc2aa049f1022d9a3be1566
+SIZE (rust/crates/openssl-0.10.44.crate) = 234682
+SHA256 (rust/crates/openssl-macros-0.1.0.crate) = b501e44f11665960c7e7fcf062c7d96a14ade4aa98116c004b2e37b5be7d736c
+SIZE (rust/crates/openssl-macros-0.1.0.crate) = 5566
+SHA256 (rust/crates/openssl-probe-0.1.5.crate) = ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf
+SIZE (rust/crates/openssl-probe-0.1.5.crate) = 7227
+SHA256 (rust/crates/openssl-sys-0.9.79.crate) = 5454462c0eced1e97f2ec09036abc8da362e66802f66fd20f86854d9d8cbcbc4
+SIZE (rust/crates/openssl-sys-0.9.79.crate) = 61400
+SHA256 (rust/crates/os_pipe-0.9.2.crate) = fb233f06c2307e1f5ce2ecad9f8121cffbbee2c95428f44ea85222e460d0d213
+SIZE (rust/crates/os_pipe-0.9.2.crate) = 9707
+SHA256 (rust/crates/os_str_bytes-6.4.1.crate) = 9b7820b9daea5457c9f21c69448905d723fbd21136ccf521748f23fd49e723ee
+SIZE (rust/crates/os_str_bytes-6.4.1.crate) = 23101
+SHA256 (rust/crates/overload-0.1.1.crate) = b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39
+SIZE (rust/crates/overload-0.1.1.crate) = 24439
+SHA256 (rust/crates/owo-colors-3.5.0.crate) = c1b04fb49957986fdce4d6ee7a65027d55d4b6d2265e5848bbb507b58ccfdb6f
+SIZE (rust/crates/owo-colors-3.5.0.crate) = 30310
+SHA256 (rust/crates/parking_lot-0.12.1.crate) = 3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f
+SIZE (rust/crates/parking_lot-0.12.1.crate) = 40967
+SHA256 (rust/crates/parking_lot_core-0.9.3.crate) = 09a279cbf25cb0757810394fbc1e359949b59e348145c643a939a525692e6929
+SIZE (rust/crates/parking_lot_core-0.9.3.crate) = 32256
+SHA256 (rust/crates/peeking_take_while-0.1.2.crate) = 19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099
+SIZE (rust/crates/peeking_take_while-0.1.2.crate) = 6697
+SHA256 (rust/crates/percent-encoding-2.2.0.crate) = 478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e
+SIZE (rust/crates/percent-encoding-2.2.0.crate) = 10075
+SHA256 (rust/crates/pest-2.1.3.crate) = 10f4872ae94d7b90ae48754df22fd42ad52ce740b8f370b03da4835417403e53
+SIZE (rust/crates/pest-2.1.3.crate) = 77986
+SHA256 (rust/crates/petgraph-0.6.2.crate) = e6d5014253a1331579ce62aa67443b4a658c5e7dd03d4bc6d302b94474888143
+SIZE (rust/crates/petgraph-0.6.2.crate) = 182513
+SHA256 (rust/crates/pgx-0.6.1.crate) = 708693428ee16491645c1c2795f6777a78b9b1d08ab2e481a82b7977c9814b56
+SIZE (rust/crates/pgx-0.6.1.crate) = 115884
+SHA256 (rust/crates/pgx-macros-0.6.1.crate) = 0050ca15df7dbfe718f9006d2b9a38d2a00a40934d8154450cdde6323b58b690
+SIZE (rust/crates/pgx-macros-0.6.1.crate) = 9858
+SHA256 (rust/crates/pgx-pg-config-0.6.1.crate) = 000bba0f67f2aa20e971a6127a8971bd85a6b724d3e95d9066f64816de3b4e67
+SIZE (rust/crates/pgx-pg-config-0.6.1.crate) = 6162
+SHA256 (rust/crates/pgx-pg-sys-0.6.1.crate) = b6bd3fd6e1bcbfed67da7ac2dc71986a9f1396aeaec3d449d0697eb54909b34a
+SIZE (rust/crates/pgx-pg-sys-0.6.1.crate) = 1658147
+SHA256 (rust/crates/pgx-tests-0.6.1.crate) = 44db59e5a5473f9192cff05a284677b8b491bffcf85dcc7b892339f084ad2f2b
+SIZE (rust/crates/pgx-tests-0.6.1.crate) = 39839
+SHA256 (rust/crates/pgx-utils-0.6.1.crate) = 62cdc413efcd90a1e94c7f09dea24ec1ecfa1275350cbe378a8776eb7b5448f9
+SIZE (rust/crates/pgx-utils-0.6.1.crate) = 70872
+SHA256 (rust/crates/phf-0.11.1.crate) = 928c6535de93548188ef63bb7c4036bd415cd8f36ad25af44b9789b2ee72a48c
+SIZE (rust/crates/phf-0.11.1.crate) = 17232
+SHA256 (rust/crates/phf_shared-0.11.1.crate) = e1fb5f6f826b772a8d4c0394209441e7d37cbbb967ae9c7e0e8134365c9ee676
+SIZE (rust/crates/phf_shared-0.11.1.crate) = 10320
+SHA256 (rust/crates/pin-project-lite-0.2.9.crate) = e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116
+SIZE (rust/crates/pin-project-lite-0.2.9.crate) = 27713
+SHA256 (rust/crates/pin-utils-0.1.0.crate) = 8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184
+SIZE (rust/crates/pin-utils-0.1.0.crate) = 7580
+SHA256 (rust/crates/pkg-config-0.3.26.crate) = 6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160
+SIZE (rust/crates/pkg-config-0.3.26.crate) = 18662
+SHA256 (rust/crates/plist-1.3.1.crate) = bd39bc6cdc9355ad1dc5eeedefee696bb35c34caf21768741e81826c0bbd7225
+SIZE (rust/crates/plist-1.3.1.crate) = 44772
+SHA256 (rust/crates/postgres-0.19.4.crate) = 960c214283ef8f0027974c03e9014517ced5db12f021a9abb66185a5751fab0a
+SIZE (rust/crates/postgres-0.19.4.crate) = 26288
+SHA256 (rust/crates/postgres-protocol-0.6.4.crate) = 878c6cbf956e03af9aa8204b407b9cbf47c072164800aa918c516cd4b056c50c
+SIZE (rust/crates/postgres-protocol-0.6.4.crate) = 24507
+SHA256 (rust/crates/postgres-types-0.2.4.crate) = 73d946ec7d256b04dfadc4e6a3292324e6f417124750fc5c0950f981b703a0f1
+SIZE (rust/crates/postgres-types-0.2.4.crate) = 28124
+SHA256 (rust/crates/ppv-lite86-0.2.16.crate) = eb9f9e6e233e5c4a35559a617bf40a4ec447db2e84c20b55a6f83167b7e57872
+SIZE (rust/crates/ppv-lite86-0.2.16.crate) = 22245
+SHA256 (rust/crates/pretty_env_logger-0.4.0.crate) = 926d36b9553851b8b0005f1275891b392ee4d2d833852c417ed025477350fb9d
+SIZE (rust/crates/pretty_env_logger-0.4.0.crate) = 8690
+SHA256 (rust/crates/prettyplease-0.1.21.crate) = c142c0e46b57171fe0c528bee8c5b7569e80f0c17e377cd0e30ea57dbc11bb51
+SIZE (rust/crates/prettyplease-0.1.21.crate) = 49522
+SHA256 (rust/crates/proc-macro-error-1.0.4.crate) = da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c
+SIZE (rust/crates/proc-macro-error-1.0.4.crate) = 25293
+SHA256 (rust/crates/proc-macro-error-attr-1.0.4.crate) = a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869
+SIZE (rust/crates/proc-macro-error-attr-1.0.4.crate) = 7971
+SHA256 (rust/crates/proc-macro2-0.4.30.crate) = cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759
+SIZE (rust/crates/proc-macro2-0.4.30.crate) = 34731
+SHA256 (rust/crates/proc-macro2-1.0.47.crate) = 5ea3d908b0e36316caf9e9e2c4625cdde190a7e6f440d794667ed17a1855e725
+SIZE (rust/crates/proc-macro2-1.0.47.crate) = 41955
+SHA256 (rust/crates/proptest-1.0.0.crate) = 1e0d9cc07f18492d879586c92b485def06bc850da3118075cd45d50e9c95b0e5
+SIZE (rust/crates/proptest-1.0.0.crate) = 189237
+SHA256 (rust/crates/quick-error-1.2.3.crate) = a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0
+SIZE (rust/crates/quick-error-1.2.3.crate) = 15066
+SHA256 (rust/crates/quick-error-2.0.1.crate) = a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3
+SIZE (rust/crates/quick-error-2.0.1.crate) = 14265
+SHA256 (rust/crates/quote-0.6.13.crate) = 6ce23b6b870e8f94f81fb0a363d65d86675884b34a09043c81e5562f11c1f8e1
+SIZE (rust/crates/quote-0.6.13.crate) = 17475
+SHA256 (rust/crates/quote-1.0.21.crate) = bbe448f377a7d6961e30f5955f9b8d106c3f5e449d493ee1b125c1d43c2b5179
+SIZE (rust/crates/quote-1.0.21.crate) = 28030
+SHA256 (rust/crates/radium-0.7.0.crate) = dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09
+SIZE (rust/crates/radium-0.7.0.crate) = 10906
+SHA256 (rust/crates/rand-0.4.6.crate) = 552840b97013b1a26992c11eac34bdd778e464601a4c2054b5f0bff7c6761293
+SIZE (rust/crates/rand-0.4.6.crate) = 76401
+SHA256 (rust/crates/rand-0.8.5.crate) = 34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404
+SIZE (rust/crates/rand-0.8.5.crate) = 87113
+SHA256 (rust/crates/rand_chacha-0.3.1.crate) = e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88
+SIZE (rust/crates/rand_chacha-0.3.1.crate) = 15251
+SHA256 (rust/crates/rand_core-0.3.1.crate) = 7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b
+SIZE (rust/crates/rand_core-0.3.1.crate) = 15483
+SHA256 (rust/crates/rand_core-0.4.2.crate) = 9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc
+SIZE (rust/crates/rand_core-0.4.2.crate) = 20243
+SHA256 (rust/crates/rand_core-0.6.3.crate) = d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7
+SIZE (rust/crates/rand_core-0.6.3.crate) = 21938
+SHA256 (rust/crates/rand_xorshift-0.3.0.crate) = d25bf25ec5ae4a3f1b92f929810509a2f53d7dca2f50b794ff57e3face536c8f
+SIZE (rust/crates/rand_xorshift-0.3.0.crate) = 9121
+SHA256 (rust/crates/rayon-1.6.0.crate) = 1e060280438193c554f654141c9ea9417886713b7acd75974c85b18a69a88e0b
+SIZE (rust/crates/rayon-1.6.0.crate) = 166335
+SHA256 (rust/crates/rayon-core-1.10.1.crate) = cac410af5d00ab6884528b4ab69d1e8e146e8d471201800fa1b4524126de6ad3
+SIZE (rust/crates/rayon-core-1.10.1.crate) = 70008
+SHA256 (rust/crates/rdrand-0.4.0.crate) = 678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2
+SIZE (rust/crates/rdrand-0.4.0.crate) = 6456
+SHA256 (rust/crates/redox_syscall-0.2.13.crate) = 62f25bc4c7e55e0b0b7a1d43fb893f4fa1361d0abe38b9ce4f323c2adfe6ef42
+SIZE (rust/crates/redox_syscall-0.2.13.crate) = 23759
+SHA256 (rust/crates/redox_syscall-0.2.16.crate) = fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a
+SIZE (rust/crates/redox_syscall-0.2.16.crate) = 24012
+SHA256 (rust/crates/redox_users-0.4.3.crate) = b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b
+SIZE (rust/crates/redox_users-0.4.3.crate) = 15353
+SHA256 (rust/crates/regex-1.7.0.crate) = e076559ef8e241f2ae3479e36f97bd5741c0330689e217ad51ce2c76808b868a
+SIZE (rust/crates/regex-1.7.0.crate) = 239421
+SHA256 (rust/crates/regex-automata-0.1.10.crate) = 6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132
+SIZE (rust/crates/regex-automata-0.1.10.crate) = 114533
+SHA256 (rust/crates/regex-syntax-0.6.27.crate) = a3f87b73ce11b1619a3c6332f45341e0047173771e8b8b73f87bfeefb7b56244
+SIZE (rust/crates/regex-syntax-0.6.27.crate) = 297300
+SHA256 (rust/crates/regex-syntax-0.6.28.crate) = 456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848
+SIZE (rust/crates/regex-syntax-0.6.28.crate) = 299288
+SHA256 (rust/crates/remove_dir_all-0.5.3.crate) = 3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7
+SIZE (rust/crates/remove_dir_all-0.5.3.crate) = 9184
+SHA256 (rust/crates/ring-0.16.20.crate) = 3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc
+SIZE (rust/crates/ring-0.16.20.crate) = 5082615
+SHA256 (rust/crates/riscv-0.7.0.crate) = 6907ccdd7a31012b70faf2af85cd9e5ba97657cc3987c4f13f8e4d2c2a088aba
+SIZE (rust/crates/riscv-0.7.0.crate) = 149655
+SHA256 (rust/crates/riscv-target-0.1.2.crate) = 88aa938cda42a0cf62a20cfe8d139ff1af20c2e681212b5b34adb5a58333f222
+SIZE (rust/crates/riscv-target-0.1.2.crate) = 7729
+SHA256 (rust/crates/rustc-demangle-0.1.21.crate) = 7ef03e0a2b150c7a90d01faf6254c9c48a41e95fb2a8c2ac1c6f0d2b9aefc342
+SIZE (rust/crates/rustc-demangle-0.1.21.crate) = 27920
+SHA256 (rust/crates/rustc-hash-1.1.0.crate) = 08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2
+SIZE (rust/crates/rustc-hash-1.1.0.crate) = 9331
+SHA256 (rust/crates/rustc_version-0.2.3.crate) = 138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a
+SIZE (rust/crates/rustc_version-0.2.3.crate) = 10210
+SHA256 (rust/crates/rustc_version-0.3.3.crate) = f0dfe2087c51c460008730de8b57e6a320782fbfb312e1f4d520e6c6fae155ee
+SIZE (rust/crates/rustc_version-0.3.3.crate) = 12119
+SHA256 (rust/crates/rustc_version-0.4.0.crate) = bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366
+SIZE (rust/crates/rustc_version-0.4.0.crate) = 12175
+SHA256 (rust/crates/rustix-0.36.5.crate) = a3807b5d10909833d3e9acd1eb5fb988f79376ff10fce42937de71a449c4c588
+SIZE (rust/crates/rustix-0.36.5.crate) = 287459
+SHA256 (rust/crates/rustls-0.20.7.crate) = 539a2bfe908f471bfa933876bd1eb6a19cf2176d375f82ef7f99530a40e48c2c
+SIZE (rust/crates/rustls-0.20.7.crate) = 268469
+SHA256 (rust/crates/rusty-fork-0.3.0.crate) = cb3dcc6e454c328bb824492db107ab7c0ae8fcffe4ad210136ef014458c1bc4f
+SIZE (rust/crates/rusty-fork-0.3.0.crate) = 19881
+SHA256 (rust/crates/ryu-1.0.10.crate) = f3f6f92acf49d1b98f7a81226834412ada05458b7364277387724a237f062695
+SIZE (rust/crates/ryu-1.0.10.crate) = 48485
+SHA256 (rust/crates/ryu-1.0.11.crate) = 4501abdff3ae82a1c1b477a17252eb69cee9e66eb915c1abaa4f44d873df9f09
+SIZE (rust/crates/ryu-1.0.11.crate) = 47007
+SHA256 (rust/crates/safemem-0.3.3.crate) = ef703b7cb59335eae2eb93ceb664c0eb7ea6bf567079d843e09420219668e072
+SIZE (rust/crates/safemem-0.3.3.crate) = 7778
+SHA256 (rust/crates/same-file-1.0.6.crate) = 93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502
+SIZE (rust/crates/same-file-1.0.6.crate) = 10183
+SHA256 (rust/crates/schannel-0.1.20.crate) = 88d6731146462ea25d9244b2ed5fd1d716d25c52e4d54aa4fb0f3c4e9854dbe2
+SIZE (rust/crates/schannel-0.1.20.crate) = 41579
+SHA256 (rust/crates/scopeguard-1.1.0.crate) = d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd
+SIZE (rust/crates/scopeguard-1.1.0.crate) = 11470
+SHA256 (rust/crates/scratch-1.0.2.crate) = 9c8132065adcfd6e02db789d9285a0deb2f3fcb04002865ab67d5fb103533898
+SIZE (rust/crates/scratch-1.0.2.crate) = 8152
+SHA256 (rust/crates/sct-0.7.0.crate) = d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4
+SIZE (rust/crates/sct-0.7.0.crate) = 27502
+SHA256 (rust/crates/seahash-4.1.0.crate) = 1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b
+SIZE (rust/crates/seahash-4.1.0.crate) = 31976
+SHA256 (rust/crates/security-framework-2.7.0.crate) = 2bc1bb97804af6631813c55739f771071e0f2ed33ee20b68c86ec505d906356c
+SIZE (rust/crates/security-framework-2.7.0.crate) = 72601
+SHA256 (rust/crates/security-framework-sys-2.6.1.crate) = 0160a13a177a45bfb43ce71c01580998474f556ad854dcbca936dd2841a5c556
+SIZE (rust/crates/security-framework-sys-2.6.1.crate) = 17717
+SHA256 (rust/crates/semver-0.11.0.crate) = f301af10236f6df4160f7c3f04eec6dbc70ace82d23326abad5edee88801c6b6
+SIZE (rust/crates/semver-0.11.0.crate) = 20826
+SHA256 (rust/crates/semver-0.9.0.crate) = 1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403
+SIZE (rust/crates/semver-0.9.0.crate) = 17344
+SHA256 (rust/crates/semver-1.0.12.crate) = a2333e6df6d6598f2b1974829f853c2b4c5f4a6e503c10af918081aa6f8564e1
+SIZE (rust/crates/semver-1.0.12.crate) = 29615
+SHA256 (rust/crates/semver-1.0.14.crate) = e25dfac463d778e353db5be2449d1cce89bd6fd23c9f1ea21310ce6e5a1b29c4
+SIZE (rust/crates/semver-1.0.14.crate) = 29813
+SHA256 (rust/crates/semver-parser-0.10.2.crate) = 00b0bef5b7f9e0df16536d3961cfb6e84331c065b4066afb39768d0e319411f7
+SIZE (rust/crates/semver-parser-0.10.2.crate) = 23176
+SHA256 (rust/crates/semver-parser-0.7.0.crate) = 388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3
+SIZE (rust/crates/semver-parser-0.7.0.crate) = 10268
+SHA256 (rust/crates/seq-macro-0.3.1.crate) = 0772c5c30e1a0d91f6834f8e545c69281c099dfa9a3ac58d96a9fd629c8d4898
+SIZE (rust/crates/seq-macro-0.3.1.crate) = 13502
+SHA256 (rust/crates/serde-1.0.149.crate) = 256b9932320c590e707b94576e3cc1f7c9024d0ee6612dfbcf1cb106cbe8e055
+SIZE (rust/crates/serde-1.0.149.crate) = 76702
+SHA256 (rust/crates/serde-xml-rs-0.5.1.crate) = 65162e9059be2f6a3421ebbb4fef3e74b7d9e7c60c50a0e292c6239f19f1edfa
+SIZE (rust/crates/serde-xml-rs-0.5.1.crate) = 19283
+SHA256 (rust/crates/serde_cbor-0.11.2.crate) = 2bef2ebfde456fb76bbcf9f59315333decc4fda0b2b44b420243c11e0f5ec1f5
+SIZE (rust/crates/serde_cbor-0.11.2.crate) = 44570
+SHA256 (rust/crates/serde_derive-1.0.149.crate) = b4eae9b04cbffdfd550eb462ed33bc6a1b68c935127d008b27444d08380f94e4
+SIZE (rust/crates/serde_derive-1.0.149.crate) = 55561
+SHA256 (rust/crates/serde_json-1.0.89.crate) = 020ff22c755c2ed3f8cf162dbb41a7268d934702f3ed3631656ea597e08fc3db
+SIZE (rust/crates/serde_json-1.0.89.crate) = 144638
+SHA256 (rust/crates/serde_with-1.14.0.crate) = 678b5a069e50bf00ecd22d0cd8ddf7c236f68581b03db652061ed5eb13a312ff
+SIZE (rust/crates/serde_with-1.14.0.crate) = 114325
+SHA256 (rust/crates/serde_with_macros-1.5.2.crate) = e182d6ec6f05393cc0e5ed1bf81ad6db3a8feedf8ee515ecdd369809bcce8082
+SIZE (rust/crates/serde_with_macros-1.5.2.crate) = 21426
+SHA256 (rust/crates/serde_yaml-0.8.25.crate) = 1ec0091e1f5aa338283ce049bd9dfefd55e1f168ac233e85c1ffe0038fb48cbe
+SIZE (rust/crates/serde_yaml-0.8.25.crate) = 40719
+SHA256 (rust/crates/sha2-0.10.6.crate) = 82e6b795fe2e3b1e845bafcb27aa35405c4d47cdfc92af5fc8d3002f76cebdc0
+SIZE (rust/crates/sha2-0.10.6.crate) = 20558
+SHA256 (rust/crates/sharded-slab-0.1.4.crate) = 900fba806f70c630b0a382d0d825e17a0f19fcd059a2ade1ff237bcddf446b31
+SIZE (rust/crates/sharded-slab-0.1.4.crate) = 52479
+SHA256 (rust/crates/shared_child-0.3.5.crate) = 6be9f7d5565b1483af3e72975e2dee33879b3b86bd48c0929fccf6585d79e65a
+SIZE (rust/crates/shared_child-0.3.5.crate) = 8333
+SHA256 (rust/crates/shlex-1.1.0.crate) = 43b2853a4d09f215c24cc5489c992ce46052d359b5109343cbafbf26bc62f8a3
+SIZE (rust/crates/shlex-1.1.0.crate) = 5199
+SHA256 (rust/crates/similar-2.1.0.crate) = 2e24979f63a11545f5f2c60141afe249d4f19f84581ea2138065e400941d83d3
+SIZE (rust/crates/similar-2.1.0.crate) = 50464
+SHA256 (rust/crates/siphasher-0.3.10.crate) = 7bd3e3206899af3f8b12af284fafc038cc1dc2b41d1b89dd17297221c5d225de
+SIZE (rust/crates/siphasher-0.3.10.crate) = 9889
+SHA256 (rust/crates/slab-0.4.6.crate) = eb703cfe953bccee95685111adeedb76fabe4e97549a58d16f03ea7b9367bb32
+SIZE (rust/crates/slab-0.4.6.crate) = 16067
+SHA256 (rust/crates/smallvec-1.10.0.crate) = a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0
+SIZE (rust/crates/smallvec-1.10.0.crate) = 31564
+SHA256 (rust/crates/smallvec-1.9.0.crate) = 2fd0db749597d91ff862fd1d55ea87f7855a744a8425a64695b6fca237d1dad1
+SIZE (rust/crates/smallvec-1.9.0.crate) = 28396
+SHA256 (rust/crates/socket2-0.4.4.crate) = 66d72b759436ae32898a2af0a14218dbf55efde3feeb170eb623637db85ee1e0
+SIZE (rust/crates/socket2-0.4.4.crate) = 44048
+SHA256 (rust/crates/spin-0.5.2.crate) = 6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d
+SIZE (rust/crates/spin-0.5.2.crate) = 12004
+SHA256 (rust/crates/spin-0.9.3.crate) = c530c2b0d0bf8b69304b39fe2001993e267461948b890cd037d8ad4293fa1a0d
+SIZE (rust/crates/spin-0.9.3.crate) = 29427
+SHA256 (rust/crates/sptr-0.3.2.crate) = 3b9b39299b249ad65f3b7e96443bad61c02ca5cd3589f46cb6d610a0fd6c0d6a
+SIZE (rust/crates/sptr-0.3.2.crate) = 14598
+SHA256 (rust/crates/stable_deref_trait-1.2.0.crate) = a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3
+SIZE (rust/crates/stable_deref_trait-1.2.0.crate) = 8054
+SHA256 (rust/crates/stringprep-0.1.2.crate) = 8ee348cb74b87454fff4b551cbf727025810a004f88aeacae7f85b87f4e9a1c1
+SIZE (rust/crates/stringprep-0.1.2.crate) = 22021
+SHA256 (rust/crates/strsim-0.10.0.crate) = 73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623
+SIZE (rust/crates/strsim-0.10.0.crate) = 11355
+SHA256 (rust/crates/subtle-2.4.1.crate) = 6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601
+SIZE (rust/crates/subtle-2.4.1.crate) = 12630
+SHA256 (rust/crates/supports-color-1.3.1.crate) = 8ba6faf2ca7ee42fdd458f4347ae0a9bd6bcc445ad7cb57ad82b383f18870d6f
+SIZE (rust/crates/supports-color-1.3.1.crate) = 9705
+SHA256 (rust/crates/syn-0.15.44.crate) = 9ca4b3b69a77cbe1ffc9e198781b7acb0c7365a883670e8f1c1bc66fba79a5c5
+SIZE (rust/crates/syn-0.15.44.crate) = 184212
+SHA256 (rust/crates/syn-1.0.105.crate) = 60b9b43d45702de4c839cb9b51d9f529c5dd26a4aff255b42b1ebc03e88ee908
+SIZE (rust/crates/syn-1.0.105.crate) = 237549
+SHA256 (rust/crates/syntect-5.0.0.crate) = c6c454c27d9d7d9a84c7803aaa3c50cd088d2906fe3c6e42da3209aa623576a8
+SIZE (rust/crates/syntect-5.0.0.crate) = 809452
+SHA256 (rust/crates/tap-1.0.1.crate) = 55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369
+SIZE (rust/crates/tap-1.0.1.crate) = 11316
+SHA256 (rust/crates/tempdir-0.3.7.crate) = 15f2b5fb00ccdf689e0149d1b1b3c03fead81c2b37735d812fa8bddbbf41b6d8
+SIZE (rust/crates/tempdir-0.3.7.crate) = 11468
+SHA256 (rust/crates/tempfile-3.3.0.crate) = 5cdb1ef4eaeeaddc8fbd371e5017057064af0911902ef36b39801f67cc6d79e4
+SIZE (rust/crates/tempfile-3.3.0.crate) = 27578
+SHA256 (rust/crates/termcolor-1.1.3.crate) = bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755
+SIZE (rust/crates/termcolor-1.1.3.crate) = 17242
+SHA256 (rust/crates/terminal_size-0.1.17.crate) = 633c1a546cee861a1a6d0dc69ebeca693bf4296661ba7852b9d21d159e0506df
+SIZE (rust/crates/terminal_size-0.1.17.crate) = 9141
+SHA256 (rust/crates/test-generator-0.3.0.crate) = ea97be90349ab3574f6e74d1566e1c5dd3a4bc74b89f4af4cc10ca010af103c0
+SIZE (rust/crates/test-generator-0.3.0.crate) = 36453
+SHA256 (rust/crates/testcontainers-0.14.0.crate) = 0e2b1567ca8a2b819ea7b28c92be35d9f76fb9edb214321dcc86eb96023d1f87
+SIZE (rust/crates/testcontainers-0.14.0.crate) = 31692
+SHA256 (rust/crates/thiserror-1.0.31.crate) = bd829fe32373d27f76265620b5309d0340cb8550f523c1dda251d6298069069a
+SIZE (rust/crates/thiserror-1.0.31.crate) = 18013
+SHA256 (rust/crates/thiserror-1.0.37.crate) = 10deb33631e3c9018b9baf9dcbbc4f737320d2b576bac10f6aefa048fa407e3e
+SIZE (rust/crates/thiserror-1.0.37.crate) = 18752
+SHA256 (rust/crates/thiserror-impl-1.0.31.crate) = 0396bc89e626244658bef819e22d0cc459e795a5ebe878e6ec336d1674a8d79a
+SIZE (rust/crates/thiserror-impl-1.0.31.crate) = 15283
+SHA256 (rust/crates/thiserror-impl-1.0.37.crate) = 982d17546b47146b28f7c22e3d08465f6b8903d0ea13c1660d9d84a6e7adcdbb
+SIZE (rust/crates/thiserror-impl-1.0.37.crate) = 15428
+SHA256 (rust/crates/thread_local-1.1.4.crate) = 5516c27b78311c50bf42c071425c560ac799b11c30b31f87e3081965fe5e0180
+SIZE (rust/crates/thread_local-1.1.4.crate) = 13106
+SHA256 (rust/crates/time-0.1.44.crate) = 6db9e6914ab8b1ae1c260a4ae7a49b6c5611b40328a735b21862567685e73255
+SIZE (rust/crates/time-0.1.44.crate) = 28885
+SHA256 (rust/crates/time-0.3.17.crate) = a561bf4617eebd33bca6434b988f39ed798e527f51a1e797d0ee4f61c0a38376
+SIZE (rust/crates/time-0.3.17.crate) = 99048
+SHA256 (rust/crates/time-core-0.1.0.crate) = 2e153e1f1acaef8acc537e68b44906d2db6436e2b35ac2c6b42640fff91f00fd
+SIZE (rust/crates/time-core-0.1.0.crate) = 6597
+SHA256 (rust/crates/time-macros-0.2.6.crate) = d967f99f534ca7e495c575c62638eebc2898a8c84c119b89e250477bc4ba16b2
+SIZE (rust/crates/time-macros-0.2.6.crate) = 19163
+SHA256 (rust/crates/tinyvec-1.6.0.crate) = 87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50
+SIZE (rust/crates/tinyvec-1.6.0.crate) = 45991
+SHA256 (rust/crates/tinyvec_macros-0.1.0.crate) = cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c
+SIZE (rust/crates/tinyvec_macros-0.1.0.crate) = 1817
+SHA256 (rust/crates/tokio-1.19.2.crate) = c51a52ed6686dd62c320f9b89299e9dfb46f730c7a48e635c19f21d116cb1439
+SIZE (rust/crates/tokio-1.19.2.crate) = 581250
+SHA256 (rust/crates/tokio-postgres-0.7.7.crate) = 29a12c1b3e0704ae7dfc25562629798b29c72e6b1d0a681b6f29ab4ae5e7f7bf
+SIZE (rust/crates/tokio-postgres-0.7.7.crate) = 72618
+SHA256 (rust/crates/tokio-util-0.7.3.crate) = cc463cd8deddc3770d20f9852143d50bf6094e640b485cb2e189a2099085ff45
+SIZE (rust/crates/tokio-util-0.7.3.crate) = 90513
+SHA256 (rust/crates/toml-0.5.9.crate) = 8d82e1a7758622a465f8cee077614c73484dac5b836c02ff6a40d5d1010324d7
+SIZE (rust/crates/toml-0.5.9.crate) = 55667
+SHA256 (rust/crates/tracing-0.1.37.crate) = 8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8
+SIZE (rust/crates/tracing-0.1.37.crate) = 73888
+SHA256 (rust/crates/tracing-attributes-0.1.23.crate) = 4017f8f45139870ca7e672686113917c71c7a6e02d4924eda67186083c03081a
+SIZE (rust/crates/tracing-attributes-0.1.23.crate) = 30450
+SHA256 (rust/crates/tracing-core-0.1.30.crate) = 24eb03ba0eab1fd845050058ce5e616558e8f8d8fca633e6b163fe25c797213a
+SIZE (rust/crates/tracing-core-0.1.30.crate) = 60351
+SHA256 (rust/crates/tracing-error-0.2.0.crate) = d686ec1c0f384b1277f097b2f279a2ecc11afe8c133c1aabf036a27cb4cd206e
+SIZE (rust/crates/tracing-error-0.2.0.crate) = 13938
+SHA256 (rust/crates/tracing-log-0.1.3.crate) = 78ddad33d2d10b1ed7eb9d1f518a5674713876e97e5bb9b7345a7984fbb4f922
+SIZE (rust/crates/tracing-log-0.1.3.crate) = 20549
+SHA256 (rust/crates/tracing-subscriber-0.3.16.crate) = a6176eae26dd70d0c919749377897b54a9276bd7061339665dd68777926b5a70
+SIZE (rust/crates/tracing-subscriber-0.3.16.crate) = 193572
+SHA256 (rust/crates/typenum-1.15.0.crate) = dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987
+SIZE (rust/crates/typenum-1.15.0.crate) = 40741
+SHA256 (rust/crates/ucd-trie-0.1.4.crate) = 89570599c4fe5585de2b388aab47e99f7fa4e9238a1399f707a02e356058141c
+SIZE (rust/crates/ucd-trie-0.1.4.crate) = 45365
+SHA256 (rust/crates/uluru-3.0.0.crate) = 794a32261a1f5eb6a4462c81b59cec87b5c27d5deea7dd1ac8fc781c41d226db
+SIZE (rust/crates/uluru-3.0.0.crate) = 9864
+SHA256 (rust/crates/unescape-0.1.0.crate) = ccb97dac3243214f8d8507998906ca3e2e0b900bf9bf4870477f125b82e68f6e
+SIZE (rust/crates/unescape-0.1.0.crate) = 2412
+SHA256 (rust/crates/unicase-2.6.0.crate) = 50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6
+SIZE (rust/crates/unicase-2.6.0.crate) = 23478
+SHA256 (rust/crates/unicode-bidi-0.3.8.crate) = 099b7128301d285f79ddd55b9a83d5e6b9e97c92e0ea0daebee7263e932de992
+SIZE (rust/crates/unicode-bidi-0.3.8.crate) = 36575
+SHA256 (rust/crates/unicode-ident-1.0.1.crate) = 5bd2fe26506023ed7b5e1e315add59d6f584c621d037f9368fea9cfb988f368c
+SIZE (rust/crates/unicode-ident-1.0.1.crate) = 33770
+SHA256 (rust/crates/unicode-ident-1.0.5.crate) = 6ceab39d59e4c9499d4e5a8ee0e2735b891bb7308ac83dfb4e80cad195c9f6f3
+SIZE (rust/crates/unicode-ident-1.0.5.crate) = 35455
+SHA256 (rust/crates/unicode-normalization-0.1.21.crate) = 854cbdc4f7bc6ae19c820d44abdc3277ac3e1b2b93db20a636825d9322fb60e6
+SIZE (rust/crates/unicode-normalization-0.1.21.crate) = 121745
+SHA256 (rust/crates/unicode-normalization-0.1.22.crate) = 5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921
+SIZE (rust/crates/unicode-normalization-0.1.22.crate) = 122604
+SHA256 (rust/crates/unicode-width-0.1.10.crate) = c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b
+SIZE (rust/crates/unicode-width-0.1.10.crate) = 18968
+SHA256 (rust/crates/unicode-xid-0.1.0.crate) = fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc
+SIZE (rust/crates/unicode-xid-0.1.0.crate) = 16000
+SHA256 (rust/crates/untrusted-0.7.1.crate) = a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a
+SIZE (rust/crates/untrusted-0.7.1.crate) = 7924
+SHA256 (rust/crates/ureq-2.5.0.crate) = b97acb4c28a254fd7a4aeec976c46a7fa404eac4d7c134b30c75144846d7cb8f
+SIZE (rust/crates/ureq-2.5.0.crate) = 98026
+SHA256 (rust/crates/url-2.3.1.crate) = 0d68c799ae75762b8c3fe375feb6600ef5602c883c5d21eb51c09f22b83c4643
+SIZE (rust/crates/url-2.3.1.crate) = 72777
+SHA256 (rust/crates/uuid-1.2.2.crate) = 422ee0de9031b5b948b97a8fc04e3aa35230001a722ddd27943e0be31564ce4c
+SIZE (rust/crates/uuid-1.2.2.crate) = 53669
+SHA256 (rust/crates/valuable-0.1.0.crate) = 830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d
+SIZE (rust/crates/valuable-0.1.0.crate) = 27718
+SHA256 (rust/crates/vcell-0.1.3.crate) = 77439c1b53d2303b20d9459b1ade71a83c716e3f9c34f3228c00e6f185d6c002
+SIZE (rust/crates/vcell-0.1.3.crate) = 6377
+SHA256 (rust/crates/vcpkg-0.2.15.crate) = accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426
+SIZE (rust/crates/vcpkg-0.2.15.crate) = 228735
+SHA256 (rust/crates/version_check-0.9.4.crate) = 49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f
+SIZE (rust/crates/version_check-0.9.4.crate) = 14895
+SHA256 (rust/crates/void-1.0.2.crate) = 6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d
+SIZE (rust/crates/void-1.0.2.crate) = 2356
+SHA256 (rust/crates/volatile-register-0.2.1.crate) = 9ee8f19f9d74293faf70901bc20ad067dc1ad390d2cbf1e3f75f721ffee908b6
+SIZE (rust/crates/volatile-register-0.2.1.crate) = 7541
+SHA256 (rust/crates/wait-timeout-0.2.0.crate) = 9f200f5b12eb75f8c1ed65abd4b2db8a6e1b138a20de009dacee265a2498f3f6
+SIZE (rust/crates/wait-timeout-0.2.0.crate) = 12441
+SHA256 (rust/crates/walkdir-2.3.2.crate) = 808cf2735cd4b6866113f648b791c6adc5714537bc222d9347bb203386ffda56
+SIZE (rust/crates/walkdir-2.3.2.crate) = 23516
+SHA256 (rust/crates/wasi-0.10.0+wasi-snapshot-preview1.crate) = 1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f
+SIZE (rust/crates/wasi-0.10.0+wasi-snapshot-preview1.crate) = 26964
+SHA256 (rust/crates/wasi-0.11.0+wasi-snapshot-preview1.crate) = 9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423
+SIZE (rust/crates/wasi-0.11.0+wasi-snapshot-preview1.crate) = 28131
+SHA256 (rust/crates/wasm-bindgen-0.2.83.crate) = eaf9f5aceeec8be17c128b2e93e031fb8a4d469bb9c4ae2d7dc1888b26887268
+SIZE (rust/crates/wasm-bindgen-0.2.83.crate) = 169618
+SHA256 (rust/crates/wasm-bindgen-backend-0.2.83.crate) = 4c8ffb332579b0557b52d268b91feab8df3615f265d5270fec2a8c95b17c1142
+SIZE (rust/crates/wasm-bindgen-backend-0.2.83.crate) = 25620
+SHA256 (rust/crates/wasm-bindgen-macro-0.2.83.crate) = 052be0f94026e6cbc75cdefc9bae13fd6052cdcaf532fa6c45e7ae33a1e6c810
+SIZE (rust/crates/wasm-bindgen-macro-0.2.83.crate) = 12075
+SHA256 (rust/crates/wasm-bindgen-macro-support-0.2.83.crate) = 07bc0c051dc5f23e307b13285f9d75df86bfdf816c5721e573dec1f9b8aa193c
+SIZE (rust/crates/wasm-bindgen-macro-support-0.2.83.crate) = 18530
+SHA256 (rust/crates/wasm-bindgen-shared-0.2.83.crate) = 1c38c045535d93ec4f0b4defec448e4291638ee608530863b1e2ba115d4fff7f
+SIZE (rust/crates/wasm-bindgen-shared-0.2.83.crate) = 7194
+SHA256 (rust/crates/web-sys-0.3.60.crate) = bcda906d8be16e728fd5adc5b729afad4e444e106ab28cd1c7256e54fa61510f
+SIZE (rust/crates/web-sys-0.3.60.crate) = 700485
+SHA256 (rust/crates/webpki-0.22.0.crate) = f095d78192e208183081cc07bc5515ef55216397af48b873e5edcd72637fa1bd
+SIZE (rust/crates/webpki-0.22.0.crate) = 58663
+SHA256 (rust/crates/webpki-roots-0.22.5.crate) = 368bfe657969fb01238bb756d351dcade285e0f6fcbd36dcb23359a5169975be
+SIZE (rust/crates/webpki-roots-0.22.5.crate) = 251914
+SHA256 (rust/crates/winapi-0.3.9.crate) = 5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419
+SIZE (rust/crates/winapi-0.3.9.crate) = 1200382
+SHA256 (rust/crates/winapi-i686-pc-windows-gnu-0.4.0.crate) = ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6
+SIZE (rust/crates/winapi-i686-pc-windows-gnu-0.4.0.crate) = 2918815
+SHA256 (rust/crates/winapi-util-0.1.5.crate) = 70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178
+SIZE (rust/crates/winapi-util-0.1.5.crate) = 10164
+SHA256 (rust/crates/winapi-x86_64-pc-windows-gnu-0.4.0.crate) = 712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f
+SIZE (rust/crates/winapi-x86_64-pc-windows-gnu-0.4.0.crate) = 2947998
+SHA256 (rust/crates/windows-sys-0.36.1.crate) = ea04155a16a59f9eab786fe12a4a450e75cdb175f9e0d80da1e17db09f55b8d2
+SIZE (rust/crates/windows-sys-0.36.1.crate) = 3347053
+SHA256 (rust/crates/windows-sys-0.42.0.crate) = 5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7
+SIZE (rust/crates/windows-sys-0.42.0.crate) = 3006791
+SHA256 (rust/crates/windows_aarch64_gnullvm-0.42.0.crate) = 41d2aa71f6f0cbe00ae5167d90ef3cfe66527d6f613ca78ac8024c3ccab9a19e
+SIZE (rust/crates/windows_aarch64_gnullvm-0.42.0.crate) = 357917
+SHA256 (rust/crates/windows_aarch64_msvc-0.36.1.crate) = 9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47
+SIZE (rust/crates/windows_aarch64_msvc-0.36.1.crate) = 661960
+SHA256 (rust/crates/windows_aarch64_msvc-0.42.0.crate) = dd0f252f5a35cac83d6311b2e795981f5ee6e67eb1f9a7f64eb4500fbc4dcdb4
+SIZE (rust/crates/windows_aarch64_msvc-0.42.0.crate) = 659424
+SHA256 (rust/crates/windows_i686_gnu-0.36.1.crate) = 180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6
+SIZE (rust/crates/windows_i686_gnu-0.36.1.crate) = 818115
+SHA256 (rust/crates/windows_i686_gnu-0.42.0.crate) = fbeae19f6716841636c28d695375df17562ca208b2b7d0dc47635a50ae6c5de7
+SIZE (rust/crates/windows_i686_gnu-0.42.0.crate) = 728570
+SHA256 (rust/crates/windows_i686_msvc-0.36.1.crate) = e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024
+SIZE (rust/crates/windows_i686_msvc-0.36.1.crate) = 724575
+SHA256 (rust/crates/windows_i686_msvc-0.42.0.crate) = 84c12f65daa39dd2babe6e442988fc329d6243fdce47d7d2d155b8d874862246
+SIZE (rust/crates/windows_i686_msvc-0.42.0.crate) = 717477
+SHA256 (rust/crates/windows_x86_64_gnu-0.36.1.crate) = 4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1
+SIZE (rust/crates/windows_x86_64_gnu-0.36.1.crate) = 790934
+SHA256 (rust/crates/windows_x86_64_gnu-0.42.0.crate) = bf7b1b21b5362cbc318f686150e5bcea75ecedc74dd157d874d754a2ca44b0ed
+SIZE (rust/crates/windows_x86_64_gnu-0.42.0.crate) = 692493
+SHA256 (rust/crates/windows_x86_64_gnullvm-0.42.0.crate) = 09d525d2ba30eeb3297665bd434a54297e4170c7f1a44cad4ef58095b4cd2028
+SIZE (rust/crates/windows_x86_64_gnullvm-0.42.0.crate) = 357906
+SHA256 (rust/crates/windows_x86_64_msvc-0.36.1.crate) = c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680
+SIZE (rust/crates/windows_x86_64_msvc-0.36.1.crate) = 661999
+SHA256 (rust/crates/windows_x86_64_msvc-0.42.0.crate) = f40009d85759725a34da6d89a94e63d7bdc50a862acf0dbc7c8e488f1edcb6f5
+SIZE (rust/crates/windows_x86_64_msvc-0.42.0.crate) = 659377
+SHA256 (rust/crates/wyz-0.5.0.crate) = 30b31594f29d27036c383b53b59ed3476874d518f0efb151b27a4c275141390e
+SIZE (rust/crates/wyz-0.5.0.crate) = 18578
+SHA256 (rust/crates/xml-rs-0.8.4.crate) = d2d7d3948613f75c98fd9328cfdcc45acc4d360655289d0a7d4ec931392200a3
+SIZE (rust/crates/xml-rs-0.8.4.crate) = 52690
+SHA256 (rust/crates/yaml-rust-0.4.5.crate) = 56c1936c4cc7a1c9ab21a1ebb602eb942ba868cbd44a99cb7cdc5892335e1c85
+SIZE (rust/crates/yaml-rust-0.4.5.crate) = 47783
+SHA256 (timescale-promscale_extension-0.8.0_GH0.tar.gz) = 00cbe3e41fbea435ed1afab20b639f9e41d821745c2b7c2481af809e7e91dd04
+SIZE (timescale-promscale_extension-0.8.0_GH0.tar.gz) = 681560
diff --git a/databases/postgresql-promscale/files/patch-Cargo.toml b/databases/postgresql-promscale/files/patch-Cargo.toml
new file mode 100644
index 000000000000..e2567f1a9686
--- /dev/null
+++ b/databases/postgresql-promscale/files/patch-Cargo.toml
@@ -0,0 +1,9 @@
+--- Cargo.toml.orig	2023-01-05 17:41:15 UTC
++++ Cargo.toml
+@@ -51,5 +51,5 @@ askama = "0.11.1"
+ pgx-tests = "0.6.1"
+ 
+ # from e2e workspace
+-test-generator = { git = "https://github.com/JamesGuthrie/test-generator" }
++#test-generator = { git = "https://github.com/JamesGuthrie/test-generator" }
+ test-common = { path = "./test-common" }
diff --git a/databases/postgresql-promscale/files/patch-cargo-crates_pgx-pg-sys-0.6.1_build.rs b/databases/postgresql-promscale/files/patch-cargo-crates_pgx-pg-sys-0.6.1_build.rs
new file mode 100644
index 000000000000..ecf78bd9a1bc
--- /dev/null
+++ b/databases/postgresql-promscale/files/patch-cargo-crates_pgx-pg-sys-0.6.1_build.rs
@@ -0,0 +1,10 @@
+--- cargo-crates/pgx-pg-sys-0.6.1/build.rs.orig	2006-07-24 01:21:28 UTC
++++ cargo-crates/pgx-pg-sys-0.6.1/build.rs
+@@ -566,6 +566,7 @@ fn run_bindgen(pg_config: &PgConfig, include_h: &PathB
+     let bindings = bindgen::Builder::default()
+         .header(include_h.display().to_string())
+         .clang_arg(&format!("-I{}", includedir_server.display()))
++        .clang_arg("-I/usr/local/include")
+         .clang_args(&extra_bindgen_clang_args(pg_config)?)
+         .parse_callbacks(Box::new(PgxOverrides::default()))
+         .blocklist_type("(Nullable)?Datum") // manually wrapping datum types for correctness
diff --git a/databases/postgresql-promscale/pkg-descr b/databases/postgresql-promscale/pkg-descr
new file mode 100644
index 000000000000..93e5ab388075
--- /dev/null
+++ b/databases/postgresql-promscale/pkg-descr
@@ -0,0 +1,2 @@
+PostgreSQL extension required for storing Prometheus metrics in
+PostgreSQL via TimescaleDB.
diff --git a/databases/postgresql-promscale/pkg-plist b/databases/postgresql-promscale/pkg-plist
new file mode 100644
index 000000000000..edb73dc4d1a2
--- /dev/null
+++ b/databases/postgresql-promscale/pkg-plist
@@ -0,0 +1,57 @@
+lib/postgresql/promscale-0.8.0.so
+share/postgresql/extension/promscale.control
+share/postgresql/extension/promscale--0.0.0.sql
+share/postgresql/extension/promscale--0.0.0--0.5.0.sql
+share/postgresql/extension/promscale--0.0.0--0.5.1.sql
+share/postgresql/extension/promscale--0.0.0--0.5.2.sql
+share/postgresql/extension/promscale--0.0.0--0.5.4.sql
+share/postgresql/extension/promscale--0.0.0--0.6.0.sql
+share/postgresql/extension/promscale--0.0.0--0.7.0.sql
+share/postgresql/extension/promscale--0.0.0--0.8.0.sql
+share/postgresql/extension/promscale--0.1.sql
+share/postgresql/extension/promscale--0.1--0.1.1.sql
+share/postgresql/extension/promscale--0.1.1.sql
+share/postgresql/extension/promscale--0.1.1--0.1.2.sql
+share/postgresql/extension/promscale--0.1.2.sql
+share/postgresql/extension/promscale--0.1.2--0.1.3-beta.sql
+share/postgresql/extension/promscale--0.1.3-beta.sql
+share/postgresql/extension/promscale--0.1.3-beta--0.2.0.sql
+share/postgresql/extension/promscale--0.2.0.sql
+share/postgresql/extension/promscale--0.2.0--0.3.0.sql
+share/postgresql/extension/promscale--0.3.0.sql
+share/postgresql/extension/promscale--0.3.0--0.3.1.sql
+share/postgresql/extension/promscale--0.3.1.sql
+share/postgresql/extension/promscale--0.3.1--0.3.2.sql
+share/postgresql/extension/promscale--0.3.2.sql
+share/postgresql/extension/promscale--0.5.0.sql
+share/postgresql/extension/promscale--0.5.0--0.5.1.sql
+share/postgresql/extension/promscale--0.5.0--0.5.2.sql
+share/postgresql/extension/promscale--0.5.0--0.5.4.sql
+share/postgresql/extension/promscale--0.5.0--0.6.0.sql
+share/postgresql/extension/promscale--0.5.0--0.7.0.sql
+share/postgresql/extension/promscale--0.5.0--0.8.0.sql
+share/postgresql/extension/promscale--0.5.1.sql
+share/postgresql/extension/promscale--0.5.1--0.5.2.sql
+share/postgresql/extension/promscale--0.5.1--0.5.4.sql
+share/postgresql/extension/promscale--0.5.1--0.6.0.sql
+share/postgresql/extension/promscale--0.5.1--0.7.0.sql
+share/postgresql/extension/promscale--0.5.1--0.8.0.sql
+share/postgresql/extension/promscale--0.5.2.sql
+share/postgresql/extension/promscale--0.5.2--0.5.4.sql
+share/postgresql/extension/promscale--0.5.2--0.6.0.sql
+share/postgresql/extension/promscale--0.5.2--0.7.0.sql
+share/postgresql/extension/promscale--0.5.2--0.8.0.sql
+share/postgresql/extension/promscale--0.5.3--0.5.4.sql
+share/postgresql/extension/promscale--0.5.3--0.6.0.sql
+share/postgresql/extension/promscale--0.5.3--0.7.0.sql
+share/postgresql/extension/promscale--0.5.3--0.8.0.sql
+share/postgresql/extension/promscale--0.5.4.sql
+share/postgresql/extension/promscale--0.5.4--0.6.0.sql
+share/postgresql/extension/promscale--0.5.4--0.7.0.sql
+share/postgresql/extension/promscale--0.5.4--0.8.0.sql
+share/postgresql/extension/promscale--0.6.0.sql
+share/postgresql/extension/promscale--0.6.0--0.7.0.sql
+share/postgresql/extension/promscale--0.6.0--0.8.0.sql
+share/postgresql/extension/promscale--0.7.0.sql
+share/postgresql/extension/promscale--0.7.0--0.8.0.sql
+share/postgresql/extension/promscale--0.8.0.sql
diff --git a/databases/postgresql-relay/Makefile b/databases/postgresql-relay/Makefile
index b64000cfd015..51d3c970a678 100644
--- a/databases/postgresql-relay/Makefile
+++ b/databases/postgresql-relay/Makefile
@@ -1,13 +1,12 @@
-# Created by: Edwin Groothuis (edwin@mavetju.org)
-
 PORTNAME=	postgresql-relay
 PORTVERSION=	1.3.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	databases net
 MASTER_SITES=	http://www.mavetju.org/download/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Multiplex multiple PostgreSQL databases to one relay
+WWW=		https://www.mavetju.org/unix/general.php
 
 LICENSE=	BSD2CLAUSE # from website
 
@@ -16,13 +15,13 @@ USE_PERL5=	build
 USE_RC_SUBR=	postgresql-relay
 
 PLIST_FILES=	bin/postgresql-relay etc/postgresql-relay.conf-sample \
-		man/man8/postgresql-relay.8.gz
+		share/man/man8/postgresql-relay.8.gz
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/postgresql-relay ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_DATA} ${WRKSRC}/postgresql-relay.conf-sample \
 		${STAGEDIR}${PREFIX}/etc/postgresql-relay.conf-sample
 	${INSTALL_MAN} ${WRKSRC}/postgresql-relay.8 \
-		${STAGEDIR}${MANPREFIX}/man/man8
+		${STAGEDIR}${PREFIX}/share/man/man8
 
 .include <bsd.port.mk>
diff --git a/databases/postgresql-relay/pkg-descr b/databases/postgresql-relay/pkg-descr
index 11a9a341d7fa..5ce099541798 100644
--- a/databases/postgresql-relay/pkg-descr
+++ b/databases/postgresql-relay/pkg-descr
@@ -6,5 +6,3 @@ machine and the name of the database. The postgresql-relay will
 then forward the connection to the proper database on the proper
 port of the proper server. No more changes in the hundreds of clients
 and scripts!
-
-WWW: http://www.mavetju.org/unix/general.php
diff --git a/databases/postgresql-repmgr/Makefile b/databases/postgresql-repmgr/Makefile
index 3b0d144d42d6..9cd267812aeb 100644
--- a/databases/postgresql-repmgr/Makefile
+++ b/databases/postgresql-repmgr/Makefile
@@ -1,37 +1,35 @@
-# Created by: alp@sfedu.ru
-
 PORTNAME=	postgresql-repmgr
-PORTVERSION=	5.2.0
+PORTVERSION=	5.4.1
 CATEGORIES=	databases
 MASTER_SITES=	http://www.repmgr.org/download/
 DISTNAME=	repmgr-${PORTVERSION}
 
 MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	PostgreSQL replication manager
+WWW=		https://repmgr.org/
 
 LICENSE=	GPLv3
 
+LIB_DEPENDS=	libcurl.so:ftp/curl \
+	libjson-c.so:devel/json-c
 RUN_DEPENDS=	rsync:net/rsync
 
 USES=		gettext gmake pgsql
+WANT_PGSQL=	server
+USE_RC_SUBR=	repmgrd
 
 GNU_CONFIGURE=	yes
-LLD_UNSAFE=	yes
-USE_RC_SUBR=	repmgrd
-WANT_PGSQL=	server
+
 MAKE_ENV=	USE_PGXS=1
+
 LIBS=		-L${LOCALBASE}/lib -lintl
 
-OPTIONS_DEFINE=	DOCS
+LLD_UNSAFE=	yes
 
-PORTDOCS=	CONTRIBUTING.md COPYRIGHT CREDITS FAQ.md HISTORY LICENSE PACKAGES.md \
-	       	README.md
+PORTDOCS=	CONTRIBUTING.md COPYRIGHT CREDITS FAQ.md HISTORY LICENSE \
+		PACKAGES.md README.md
 
-post-install:
-	${INSTALL_DATA} ${WRKSRC}/repmgr.conf.sample ${STAGEDIR}${PREFIX}/etc
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/repmgr
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/repmgrd
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/postgresql/repmgr.so
+OPTIONS_DEFINE=	DOCS
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
@@ -39,4 +37,10 @@ do-install-DOCS-on:
 	${INSTALL_DATA} ${WRKSRC}/$f ${STAGEDIR}${DOCSDIR}
 .endfor
 
+post-install:
+	${INSTALL_DATA} ${WRKSRC}/repmgr.conf.sample ${STAGEDIR}${PREFIX}/etc
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/repmgr
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/repmgrd
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/postgresql/repmgr.so
+
 .include <bsd.port.mk>
diff --git a/databases/postgresql-repmgr/distinfo b/databases/postgresql-repmgr/distinfo
index 362b8e6e2016..57cd321873f7 100644
--- a/databases/postgresql-repmgr/distinfo
+++ b/databases/postgresql-repmgr/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1603484572
-SHA256 (repmgr-5.2.0.tar.gz) = 7e4b6f2e60a90235db143d185e9f5b60db3f07c4610833129f8f90bd1c5d7b85
-SIZE (repmgr-5.2.0.tar.gz) = 446137
+TIMESTAMP = 1689430269
+SHA256 (repmgr-5.4.1.tar.gz) = a18d61a99df5d266bf29854ce10e6976661788ba09605d3263d6385ad4423b10
+SIZE (repmgr-5.4.1.tar.gz) = 461670
diff --git a/databases/postgresql-repmgr/pkg-descr b/databases/postgresql-repmgr/pkg-descr
index a45d06d0f05f..1067d80c5ab2 100644
--- a/databases/postgresql-repmgr/pkg-descr
+++ b/databases/postgresql-repmgr/pkg-descr
@@ -1,4 +1,2 @@
 repmgr allows you to monitor and manage your replicated PostgreSQL
 databases as a single cluster.
-
-WWW: http://projects.2ndquadrant.com/repmgr
diff --git a/databases/postgresql-repmgr/pkg-plist b/databases/postgresql-repmgr/pkg-plist
index c34fc85afa45..1556dc95df46 100644
--- a/databases/postgresql-repmgr/pkg-plist
+++ b/databases/postgresql-repmgr/pkg-plist
@@ -16,8 +16,13 @@ share/postgresql/extension/repmgr--5.0--5.1.sql
 share/postgresql/extension/repmgr--5.1.sql
 share/postgresql/extension/repmgr--5.1--5.2.sql
 share/postgresql/extension/repmgr--5.2.sql
+share/postgresql/extension/repmgr--5.2--5.3.sql
+share/postgresql/extension/repmgr--5.3.sql
+share/postgresql/extension/repmgr--5.3--5.4.sql
+share/postgresql/extension/repmgr--5.4.sql
 share/postgresql/extension/repmgr--unpackaged--4.0.sql
 share/postgresql/extension/repmgr--unpackaged--5.1.sql
 share/postgresql/extension/repmgr--unpackaged--5.2.sql
+share/postgresql/extension/repmgr--unpackaged--5.3.sql
 share/postgresql/extension/repmgr.control
 @sample etc/repmgr.conf.sample
diff --git a/databases/postgresql-rum/Makefile b/databases/postgresql-rum/Makefile
index 49cf9c63898e..c10ff224a6d5 100644
--- a/databases/postgresql-rum/Makefile
+++ b/databases/postgresql-rum/Makefile
@@ -1,15 +1,16 @@
 PORTNAME=	rum
-PORTVERSION=	1.3.7
+PORTVERSION=	1.3.13
 PORTREVISION=	0
 CATEGORIES=	databases
 PKGNAMEPREFIX=	postgresql${PGSQL_VER:S/.//}-
 
 MAINTAINER=	feld@FreeBSD.org
 COMMENT=	Inverted index with additional information in posting lists
+WWW=		https://github.com/postgrespro/rum
 
 LICENSE=	PostgreSQL
 
-USES=		gmake pgsql:9.6+
+USES=		gmake pgsql:11+
 
 LLD_UNSAFE=	yes
 USE_GITHUB=	yes
diff --git a/databases/postgresql-rum/distinfo b/databases/postgresql-rum/distinfo
index 1e4cdf497507..2d6e754e2c29 100644
--- a/databases/postgresql-rum/distinfo
+++ b/databases/postgresql-rum/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1602773819
-SHA256 (postgrespro-rum-1.3.7_GH0.tar.gz) = 691370e7b81f33de73746f688de84547bffaa481cf41aa0b7139ae9c4600d813
-SIZE (postgrespro-rum-1.3.7_GH0.tar.gz) = 314685
+TIMESTAMP = 1667425885
+SHA256 (postgrespro-rum-1.3.13_GH0.tar.gz) = 6ab370532c965568df6210bd844ac6ba649f53055e48243525b0b7e5c4d69a7d
+SIZE (postgrespro-rum-1.3.13_GH0.tar.gz) = 565701
diff --git a/databases/postgresql-rum/pkg-descr b/databases/postgresql-rum/pkg-descr
index e0094aae56c5..afa1310d3cda 100644
--- a/databases/postgresql-rum/pkg-descr
+++ b/databases/postgresql-rum/pkg-descr
@@ -1,4 +1,2 @@
 The rum module provides access method to work with RUM index. It is
 based on the GIN access methods code.
-
-WWW: https://github.com/postgrespro/rum
diff --git a/databases/postgresql-semver/Makefile b/databases/postgresql-semver/Makefile
new file mode 100644
index 000000000000..3013bf17330c
--- /dev/null
+++ b/databases/postgresql-semver/Makefile
@@ -0,0 +1,21 @@
+PORTNAME=	semver
+PORTVERSION=	0.31.2
+DISTVERSIONPREFIX=	v
+CATEGORIES=	databases
+PKGNAMEPREFIX=	postgresql${PGSQL_VER:S/.//}-
+
+MAINTAINER=	ports@xanderio.de
+COMMENT=	SemVer 2.0.0 compatible datatype for PostgreSQL database
+WWW=		https://github.com/theory/pg-semver/
+
+LICENSE=	PostgreSQL
+
+USES=		gmake pgsql
+WANT_PGSQL=	server
+USE_GITHUB=	yes
+GH_ACCOUNT=	theory
+GH_PROJECT=	pg-${PORTNAME}
+
+INSTALL_TARGET=	install-strip
+
+.include <bsd.port.mk>
diff --git a/databases/postgresql-semver/distinfo b/databases/postgresql-semver/distinfo
new file mode 100644
index 000000000000..c6ab7a1baffc
--- /dev/null
+++ b/databases/postgresql-semver/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1633684541
+SHA256 (theory-pg-semver-v0.31.2_GH0.tar.gz) = de9a0e271c13cd6083e934c0e0cb88d819af8aa2cb5356d6d934a0ef26f62149
+SIZE (theory-pg-semver-v0.31.2_GH0.tar.gz) = 39809
diff --git a/databases/postgresql-semver/pkg-descr b/databases/postgresql-semver/pkg-descr
new file mode 100644
index 000000000000..42cc77117bde
--- /dev/null
+++ b/databases/postgresql-semver/pkg-descr
@@ -0,0 +1,3 @@
+This library contains a single PostgreSQL extension, a semantic version data
+type called `semver`. It's an implementation of the version number format
+specified by the Semantic Versioning 2.0.0 Specification.
diff --git a/databases/postgresql-semver/pkg-message b/databases/postgresql-semver/pkg-message
new file mode 100644
index 000000000000..c17d7777569b
--- /dev/null
+++ b/databases/postgresql-semver/pkg-message
@@ -0,0 +1,9 @@
+[
+{ type: install
+  message: <<EOM
+Use the following sql script to create semver extension
+
+	psql -c 'CREATE EXTENSION semver'
+EOM
+}
+]
diff --git a/databases/postgresql-semver/pkg-plist b/databases/postgresql-semver/pkg-plist
new file mode 100644
index 000000000000..9ee3b4c1cbfe
--- /dev/null
+++ b/databases/postgresql-semver/pkg-plist
@@ -0,0 +1,23 @@
+lib/postgresql/semver.so
+share/doc/postgresql/extension/semver.mmd
+share/postgresql/extension/semver--0.10.0--0.11.0.sql
+share/postgresql/extension/semver--0.11.0--0.12.0.sql
+share/postgresql/extension/semver--0.12.0--0.13.0.sql
+share/postgresql/extension/semver--0.13.0--0.15.0.sql
+share/postgresql/extension/semver--0.15.0--0.16.0.sql
+share/postgresql/extension/semver--0.16.0--0.17.0.sql
+share/postgresql/extension/semver--0.17.0--0.20.0.sql
+share/postgresql/extension/semver--0.2.1--0.2.4.sql
+share/postgresql/extension/semver--0.2.4--0.3.0.sql
+share/postgresql/extension/semver--0.20.0--0.21.0.sql
+share/postgresql/extension/semver--0.21.0--0.22.0.sql
+share/postgresql/extension/semver--0.22.0--0.30.0.sql
+share/postgresql/extension/semver--0.3.0--0.4.0.sql
+share/postgresql/extension/semver--0.30.0--0.31.0.sql
+share/postgresql/extension/semver--0.31.0--0.31.1.sql
+share/postgresql/extension/semver--0.31.1--0.31.2.sql
+share/postgresql/extension/semver--0.31.2.sql
+share/postgresql/extension/semver--0.5.0--0.10.0.sql
+share/postgresql/extension/semver--unpackaged--0.2.1.sql
+share/postgresql/extension/semver.control
+share/postgresql/extension/semver.sql
diff --git a/databases/postgresql-tds_fdw/Makefile b/databases/postgresql-tds_fdw/Makefile
index 2f92cf2fb82a..8654640438e7 100644
--- a/databases/postgresql-tds_fdw/Makefile
+++ b/databases/postgresql-tds_fdw/Makefile
@@ -1,19 +1,18 @@
-# Created by: Jov amutu@amutu.com
-
 PORTNAME=	tds_fdw
+PORTVERSION=	2.0.3
 DISTVERSIONPREFIX=	v
-PORTVERSION=	2.0.2
 CATEGORIES=	databases
-PKGNAMEPREFIX=	postgresql${PGSQL_VER:S|.||}-
+PKGNAMEPREFIX=	postgresql${PGSQL_VER_NODOT}-
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	PostgreSQL foreign data wrapper to connect to TDS databases
+WWW=		https://github.com/tds-fdw/tds_fdw
 
 LICENSE=	PostgreSQL
 
 LIB_DEPENDS=	libsybdb.so:databases/freetds
 
-USES=		gmake pgsql:9.2+
+USES=		gmake pgsql:11+
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	tds-fdw
diff --git a/databases/postgresql-tds_fdw/distinfo b/databases/postgresql-tds_fdw/distinfo
index bbad8a3814a3..42339f2056d1 100644
--- a/databases/postgresql-tds_fdw/distinfo
+++ b/databases/postgresql-tds_fdw/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1601319666
-SHA256 (tds-fdw-tds_fdw-v2.0.2_GH0.tar.gz) = d34973a919a1b3baefe717e496920af26994adbb9ead0f82f6d2cc20bf9a8cbe
-SIZE (tds-fdw-tds_fdw-v2.0.2_GH0.tar.gz) = 63917
+TIMESTAMP = 1669057533
+SHA256 (tds-fdw-tds_fdw-v2.0.3_GH0.tar.gz) = fa51ca481ec5f53c6f53be65a958aa229faf5fcd5d089b7807583318a40dae6a
+SIZE (tds-fdw-tds_fdw-v2.0.3_GH0.tar.gz) = 72527
diff --git a/databases/postgresql-tds_fdw/pkg-descr b/databases/postgresql-tds_fdw/pkg-descr
index 6407355b84cd..cda3bb0408d6 100644
--- a/databases/postgresql-tds_fdw/pkg-descr
+++ b/databases/postgresql-tds_fdw/pkg-descr
@@ -9,5 +9,3 @@ proprietary implementations of DB-Library.
 The current version does not yet support JOIN push-down, or write operations.
 
 It does support WHERE and column pushdowns when match_column_names is enabled.
-
-WWW: https://github.com/tds-fdw/tds_fdw
diff --git a/databases/postgresql-wal2json/Makefile b/databases/postgresql-wal2json/Makefile
new file mode 100644
index 000000000000..7a7f1343bdc6
--- /dev/null
+++ b/databases/postgresql-wal2json/Makefile
@@ -0,0 +1,23 @@
+PORTNAME=	wal2json
+DISTVERSIONPREFIX=	${PORTNAME}_
+DISTVERSION=	2_5
+CATEGORIES=	databases
+PKGNAMEPREFIX=	postgresql${PGSQL_VER:S/.//}-
+
+MAINTAINER=	daniel@morante.net
+COMMENT=	JSON output plugin for changeset extraction for PostgreSQL databases
+WWW=		https://github.com/getsentry/wal2json/
+
+LICENSE=	BSD3CLAUSE
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
+USES=		gmake pgsql:11-14
+WANT_PGSQL=	server
+USE_GITHUB=	yes
+GH_ACCOUNT=	eulerto
+
+MAKE_ARGS=	PG_CONFIG=${LOCALBASE}/bin/pg_config
+
+PLIST_FILES=	lib/postgresql/wal2json.so
+
+.include <bsd.port.mk>
diff --git a/databases/postgresql-wal2json/distinfo b/databases/postgresql-wal2json/distinfo
new file mode 100644
index 000000000000..eb48d2c3fe89
--- /dev/null
+++ b/databases/postgresql-wal2json/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1692687620
+SHA256 (eulerto-wal2json-wal2json_2_5_GH0.tar.gz) = b516653575541cf221b99cf3f8be9b6821f6dbcfc125675c85f35090f824f00e
+SIZE (eulerto-wal2json-wal2json_2_5_GH0.tar.gz) = 91040
diff --git a/databases/postgresql-wal2json/pkg-descr b/databases/postgresql-wal2json/pkg-descr
new file mode 100644
index 000000000000..dc54712928f1
--- /dev/null
+++ b/databases/postgresql-wal2json/pkg-descr
@@ -0,0 +1,5 @@
+wal2json is an output plugin for logical decoding. It means that the plugin have
+access to tuples produced by INSERT and UPDATE. Also, UPDATE/DELETE old row
+versions can be accessed depending on the configured replica identity.
+Changes can be consumed using the streaming protocol (logical replication slots)
+or by a special SQL API.
diff --git a/databases/postgresql-wal2json/pkg-message b/databases/postgresql-wal2json/pkg-message
new file mode 100644
index 000000000000..9d3553ba00e8
--- /dev/null
+++ b/databases/postgresql-wal2json/pkg-message
@@ -0,0 +1,17 @@
+[
+{ type: install
+  message: <<EOM
+You need to set up at least two parameters in postgresql.conf:
+
+	wal_level = logical
+	#
+	# these parameters only need to set in versions 9.4, 9.5 and 9.6
+	# default values are ok in version 10 or later
+	#
+	max_replication_slots = 10
+	max_wal_senders = 10
+
+After changing these parameters, a restart is needed.
+EOM
+}
+]
diff --git a/databases/postgresql-zhparser/Makefile b/databases/postgresql-zhparser/Makefile
index 12308b23b4c5..d99db67d268e 100644
--- a/databases/postgresql-zhparser/Makefile
+++ b/databases/postgresql-zhparser/Makefile
@@ -1,20 +1,18 @@
-# Created by: Jov <amutu@amutu.com>
-
 PORTNAME=	zhparser
-PORTVERSION=	0.2.0
-PORTREVISION=	2
-DISTVERSIONPREFIX=	v
+PORTVERSION=	2.2
+DISTVERSIONPREFIX=	V
 CATEGORIES=	databases
 PKGNAMEPREFIX=	postgresql${PGSQL_VER:S/.//}-
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	PostgreSQL extension for full-text search of Chinese
+WWW=		https://github.com/amutu/zhparser
 
 LICENSE=	PostgreSQL
 
 LIB_DEPENDS=	libscws.so:textproc/scws
 
-USES=		gmake pgsql:9.2+
+USES=		gmake pgsql:11+
 LLD_UNSAFE=	yes
 USE_GITHUB=	yes
 GH_ACCOUNT=	amutu
@@ -23,13 +21,6 @@ WANT_PGSQL=	server
 
 MAKE_ENV=	SCWS_HOME=${PREFIX}
 
-PLIST_FILES=	lib/postgresql/zhparser.so \
-		share/postgresql/extension/zhparser--1.0.sql \
-		share/postgresql/extension/zhparser--unpackaged--1.0.sql \
-		share/postgresql/extension/zhparser.control \
-		share/postgresql/tsearch_data/dict.utf8.xdb \
-		share/postgresql/tsearch_data/rules.utf8.ini
-
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/postgresql/zhparser.so
 
diff --git a/databases/postgresql-zhparser/distinfo b/databases/postgresql-zhparser/distinfo
index 3042a2fbf416..6c3eae70bef4 100644
--- a/databases/postgresql-zhparser/distinfo
+++ b/databases/postgresql-zhparser/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1496108378
-SHA256 (amutu-zhparser-v0.2.0_GH0.tar.gz) = 993e4d6cc919f62d597c244f86a28fdbebbfd8c7b9cfaae12768a1e92688bc45
-SIZE (amutu-zhparser-v0.2.0_GH0.tar.gz) = 6101901
+TIMESTAMP = 1687689610
+SHA256 (amutu-zhparser-V2.2_GH0.tar.gz) = 1d0b0e834a3d0406a1c520e5b80886cd1c0bf3649d59f13b5f60e8c872a54a31
+SIZE (amutu-zhparser-V2.2_GH0.tar.gz) = 6103400
diff --git a/databases/postgresql-zhparser/pkg-descr b/databases/postgresql-zhparser/pkg-descr
index 9ab2d262444b..c7f925c724d1 100644
--- a/databases/postgresql-zhparser/pkg-descr
+++ b/databases/postgresql-zhparser/pkg-descr
@@ -1,7 +1,5 @@
-Zhparser is a PostgreSQL extension for full-text search of Chinese. It use
-Simple Chinese Word Segmentation (SCWS) as driver and highly configurable and
-easy to use. The default dictionary of Zhparser is for Simplified Chinese. If
-you use Tranditional Chinese,you can download the dicionary from SCWS offical
-site.
-
-WWW: https://github.com/amutu/zhparser
+Zhparser is a PostgreSQL extension for full-text search of Chinese.
+It uses Simple Chinese Word Segmentation (SCWS) as driver and is
+highly configurable and easy to use. The default dictionary of
+Zhparser is for Simplified Chinese. If you use Traditional Chinese,
+you can download the dictionary from the SCWS official site.
diff --git a/databases/postgresql-zhparser/pkg-plist b/databases/postgresql-zhparser/pkg-plist
new file mode 100644
index 000000000000..295cd9c2de8a
--- /dev/null
+++ b/databases/postgresql-zhparser/pkg-plist
@@ -0,0 +1,11 @@
+lib/postgresql/zhparser.so
+share/postgresql/extension/zhparser--unpackaged--1.0.sql
+share/postgresql/extension/zhparser.control
+share/postgresql/tsearch_data/dict.utf8.xdb
+share/postgresql/tsearch_data/rules.utf8.ini
+share/postgresql/extension/zhparser--1.0.sql
+share/postgresql/extension/zhparser--1.0--2.0.sql
+share/postgresql/extension/zhparser--2.0--2.1.sql
+share/postgresql/extension/zhparser--2.0.sql
+share/postgresql/extension/zhparser--2.1--2.2.sql
+share/postgresql/extension/zhparser--2.1.sql
diff --git a/databases/postgresql10-client/Makefile b/databases/postgresql10-client/Makefile
deleted file mode 100644
index a06bdd9622ad..000000000000
--- a/databases/postgresql10-client/Makefile
+++ /dev/null
@@ -1,20 +0,0 @@
-# Created by: Palle Girgensohn <girgen@FreeBSD.org>
-
-PORTNAME=	postgresql
-PORTREVISION=	0
-
-COMMENT=	PostgreSQL database (client)
-
-MASTERDIR=	${.CURDIR}/../postgresql10-server
-
-BUILD_DIRS=	config src/include src/interfaces src/port \
-		src/bin/pg_dump src/bin/psql src/bin/scripts src/bin/pg_config \
-		src/bin/pgbench doc src/makefiles src/test/regress
-INSTALL_DIRS=	${BUILD_DIRS}
-
-CLIENT_ONLY=	yes
-COMPONENT=	-client
-USE_LDCONFIG=	yes
-USES=		pkgconfig
-
-.include "${MASTERDIR}/Makefile"
diff --git a/databases/postgresql10-contrib/Makefile b/databases/postgresql10-contrib/Makefile
deleted file mode 100644
index 099c55e452fe..000000000000
--- a/databases/postgresql10-contrib/Makefile
+++ /dev/null
@@ -1,39 +0,0 @@
-# Created by: Palle Girgensohn <girgen@pingpong.net>
-
-PORTNAME=	postgresql
-PORTREVISION=	0
-CATEGORIES=	databases
-
-MAINTAINER=	pgsql@FreeBSD.org
-COMMENT=	The contrib utilities from the PostgreSQL distribution
-
-MASTERDIR=	${.CURDIR}/../postgresql10-server
-
-USES=		bison pgsql:${DISTVERSION:C/([0-9]\.?[0-9]).*/\1/g}
-
-BUILD_DIRS=	src/port src/include src/common contrib
-INSTALL_DIRS=	contrib
-
-# this port fails to build in parallel
-MAKE_JOBS_UNSAFE=	yes
-
-SLAVE_ONLY=	yes
-COMPONENT=	-contrib
-CONFIGURE_ARGS+=--with-openssl --disable-nls --with-uuid=bsd
-LDFLAGS+=	-lpthread -L${PREFIX}/lib
-
-OPTIONS_DEFINE=	DOCS XML
-OPTIONS_DEFAULT=XML
-OPTIONS_SUB=	yes
-
-XML_LIB_DEPENDS=libxslt.so:textproc/libxslt \
-		libxml2.so:textproc/libxml2
-XML_CONFIGURE_WITH=	libxml libxslt
-
-post-configure: 
-		@cd ${WRKSRC}/src/backend && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} symlinks
-
-post-install:
-	@- ${INSTALL_DATA} ${WRKSRC}/contrib/README ${STAGEDIR}${DOCSDIR}/extension/README
-
-.include "${MASTERDIR}/Makefile"
diff --git a/databases/postgresql10-contrib/pkg-descr b/databases/postgresql10-contrib/pkg-descr
deleted file mode 100644
index 18c3c1351c3b..000000000000
--- a/databases/postgresql10-contrib/pkg-descr
+++ /dev/null
@@ -1,23 +0,0 @@
-This is the port for all stuff that comes in the contrib subtree of
-the postgresql distribution. This subtree contains porting tools,
-analysis utilities, and plug-in features that are not part of the core
-PostgreSQL system, mainly because they address a limited audience or
-are too experimental to be part of the main source tree.  This does
-not preclude their usefulness.
-
-Each subdirectory contains a README file with information about the
-module. Some directories supply new user-defined functions, operators,
-or types.  After you have installed the files you need to register the
-new entities in the database system by running the commands in the
-supplied .sql file.  For example,
-
-        $ psql -d dbname -f module.sql
-
-The .sql files are installed into /usr/local/share/postgresql/contrib
-
-For more information, please see
-/usr/local/share/doc/postgresql/contrib/README*
-
-This software is part of the standard PostgreSQL distribution.
-
-WWW: https://www.postgresql.org/
diff --git a/databases/postgresql10-docs/Makefile b/databases/postgresql10-docs/Makefile
deleted file mode 100644
index 2b43293fada4..000000000000
--- a/databases/postgresql10-docs/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-# Created by: Palle Girgensohn <girgen@pingpong.net>
-
-WANT_PGSQL_VER=10
-
-.include "${.CURDIR}/../postgresql14-docs/Makefile"
diff --git a/databases/postgresql10-pgtcl/Makefile b/databases/postgresql10-pgtcl/Makefile
deleted file mode 100644
index b825c8936b99..000000000000
--- a/databases/postgresql10-pgtcl/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-PORTREVISION=	0
-PKGNAMESUFFIX=	-postgresql10
-
-CONFLICTS=	pgtcl-[0-9]* pgtcl-postgresql9[0123456]-[0-9]*
-
-PGTCL_SLAVE=	10
-MASTERDIR=	${.CURDIR}/../pgtcl
-
-.include "${MASTERDIR}/Makefile"
diff --git a/databases/postgresql10-plperl/Makefile b/databases/postgresql10-plperl/Makefile
deleted file mode 100644
index a2be7a0d101c..000000000000
--- a/databases/postgresql10-plperl/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-# Created by: Palle Girgensohn <girgen@partitur.se>
-
-WANT_PGSQL_VER=	10
-
-INSTALL_DIRS=	src/pl/plperl contrib/hstore_plperl
-
-# this port fails to build in parallel
-MAKE_JOBS_UNSAFE=	yes
-
-.include "${.CURDIR}/../postgresql14-plperl/Makefile"
diff --git a/databases/postgresql10-plpython/Makefile b/databases/postgresql10-plpython/Makefile
deleted file mode 100644
index bbcebffb4890..000000000000
--- a/databases/postgresql10-plpython/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-WANT_PGSQL_VER=	10
-
-INSTALL_DIRS=	src/pl/plpython contrib/hstore_plpython contrib/ltree_plpython
-
-# this port fails to build in parallel
-MAKE_JOBS_UNSAFE=	yes
-
-.include "${.CURDIR}/../postgresql14-plpython/Makefile"
diff --git a/databases/postgresql10-pltcl/Makefile b/databases/postgresql10-pltcl/Makefile
deleted file mode 100644
index d07e40e9e176..000000000000
--- a/databases/postgresql10-pltcl/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-# Created by: Palle Girgensohn <girgen@partitur.se>
-
-WANT_PGSQL_VER=	10
-
-# this port fails to build in parallel
-MAKE_JOBS_UNSAFE=	yes
-
-.include "${.CURDIR}/../postgresql14-pltcl/Makefile"
diff --git a/databases/postgresql10-server/Makefile b/databases/postgresql10-server/Makefile
deleted file mode 100644
index 5d8e31f09532..000000000000
--- a/databases/postgresql10-server/Makefile
+++ /dev/null
@@ -1,25 +0,0 @@
-# Created by: Marc G. Fournier <scrappy@FreeBSD.org>
-
-DISTVERSION?=	10.18
-# PORTREVISION must be ?= otherwise, all slave ports get this PORTREVISION and
-# not their own.  Probably best to keep it at ?=0 when reset here too.
-PORTREVISION?=	0
-
-MAINTAINER?=	pgsql@FreeBSD.org
-
-INSTALL_DIRS?=	src/common src/timezone src/backend \
-		src/backend/utils/mb/conversion_procs \
-		src/backend/snowball src/backend/replication/libpqwalreceiver \
-		src/backend/replication/pgoutput \
-		src/bin/initdb src/bin/pg_ctl \
-		src/bin/pg_controldata src/bin/pg_resetwal src/pl \
-		src/bin/pg_basebackup src/bin/pg_archivecleanup \
-		src/bin/pg_rewind \
-		src/bin/pg_test_fsync src/bin/pg_test_timing \
-		src/bin/pg_waldump src/bin/pg_upgrade
-
-PG_USER?=	postgres
-PG_GROUP?=	postgres
-PG_UID?=	770
-
-.include "${.CURDIR}/../postgresql14-server/Makefile"
diff --git a/databases/postgresql10-server/distinfo b/databases/postgresql10-server/distinfo
deleted file mode 100644
index 4262635f68ad..000000000000
--- a/databases/postgresql10-server/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1628577808
-SHA256 (postgresql/postgresql-10.18.tar.bz2) = 57477c2edc82c3f86a74747707b3babc1f301f389315ae14e819e025c0ba3801
-SIZE (postgresql/postgresql-10.18.tar.bz2) = 19197042
diff --git a/databases/postgresql10-server/files/502.pgsql.in b/databases/postgresql10-server/files/502.pgsql.in
deleted file mode 100644
index c2d5b885d2f1..000000000000
--- a/databases/postgresql10-server/files/502.pgsql.in
+++ /dev/null
@@ -1,114 +0,0 @@
-#!/bin/sh
-#
-# Maintenance shell script to vacuum and backup database
-# Put this in /usr/local/etc/periodic/daily, and it will be run 
-# every night
-#
-# Written by Palle Girgensohn <girgen@pingpong.net>
-#
-# In public domain, do what you like with it,
-# and use it at your own risk... :)
-#
-
-# Define these variables in either /etc/periodic.conf or
-# /etc/periodic.conf.local to override the default values.
-#
-# daily_pgsql_backup_enable="YES" # do backup of all databases
-# daily_pgsql_backup_enable="foo bar db1 db2" # only do backup of a limited selection of databases
-# daily_pgsql_vacuum_enable="YES" # do vacuum
-
-# If there is a global system configuration file, suck it in.
-#
-if [ -r /etc/defaults/periodic.conf ]
-then
-    . /etc/defaults/periodic.conf
-    source_periodic_confs
-fi
-
-: ${daily_pgsql_user:="%%PG_USER%%"}
-: ${daily_pgsql_port:=5432}
-: ${daily_pgsql_vacuum_args:="-U ${daily_pgsql_user} -p ${daily_pgsql_port} -qaz"}
-: ${daily_pgsql_pgdump_args:="-U ${daily_pgsql_user} -p ${daily_pgsql_port} -bF c"}
-: ${daily_pgsql_pgdumpall_globals_args:="-U ${daily_pgsql_user} -p ${daily_pgsql_port}"}
-# backupdir is relative to ~pgsql home directory unless it begins with a slash:
-: ${daily_pgsql_backupdir:="~${daily_pgsql_user}/backups"}
-: ${daily_pgsql_savedays:="7"}
-
-# allow '~´ in dir name
-eval backupdir=${daily_pgsql_backupdir}
-
-rc=0
-
-pgsql_backup() {
-	# daily_pgsql_backupdir must be writeable by user %%PG_USER%%
-	# ~%%PG_USER%% is just that under normal circumstances,
-	# but this might not be where you want the backups...
-	if [ ! -d ${backupdir} ] ; then 
-	    echo Creating ${backupdir}
-	    mkdir -m 700 ${backupdir}; chown ${daily_pgsql_user} ${backupdir}
-	fi
-
-	echo
-	echo "PostgreSQL backups"
-
-	# Protect the data
-	umask 077
-	rc=$?
-	now=`date "+%Y-%m-%dT%H:%M:%S"`
-	file=${daily_pgsql_backupdir}/pgglobals_${now}
-	su -l ${daily_pgsql_user} -c \
-		"umask 077; pg_dumpall -g ${daily_pgsql_pgdumpall_globals_args} | gzip -9 > ${file}.gz"
-
-	db=$1
-	while shift; do
-	    echo -n " $db"
-	    file=${backupdir}/pgdump_${db}_${now}
-	    su -l ${daily_pgsql_user} -c "umask 077; pg_dump ${daily_pgsql_pgdump_args} -f ${file} ${db}"
-	    [ $? -gt 0 ] && rc=3
-		db=$1
-	done
-
-	if [ $rc -gt 0 ]; then
-	    echo
-	    echo "Errors were reported during backup."
-	fi
-
-	# cleaning up old data
-	find ${backupdir} \( -name 'pgdump_*' -o -name 'pgglobals_*' -o -name '*.dat.gz' -o -name 'toc.dat' \) \
-	    -a -mtime +${daily_pgsql_savedays} -delete
-	echo
-}
-
-case "$daily_pgsql_backup_enable" in
-    [Yy][Ee][Ss])
-	dbnames=`su -l ${daily_pgsql_user} -c "umask 077; psql -U ${daily_pgsql_user} -p ${daily_pgsql_port} -q -t -A -d template1 -c SELECT\ datname\ FROM\ pg_database\ WHERE\ datname!=\'template0\'"`
-	pgsql_backup $dbnames
-	;;
-
-	[Nn][Oo])
-	;;
-
-	"")
-	;;
-
-	*)
-	pgsql_backup $daily_pgsql_backup_enable
-	;;
-esac
-
-case "$daily_pgsql_vacuum_enable" in
-    [Yy][Ee][Ss])
-
-	echo
-	echo "PostgreSQL vacuum"
-	su -l ${daily_pgsql_user} -c "vacuumdb ${daily_pgsql_vacuum_args}"
-	if [ $? -gt 0 ]
-	then
-	    echo
-	    echo "Errors were reported during vacuum."
-	    rc=3
-	fi
-	;;
-esac
-
-exit $rc
diff --git a/databases/postgresql10-server/files/patch-doc-src-sgml-Makefile b/databases/postgresql10-server/files/patch-doc-src-sgml-Makefile
deleted file mode 100644
index 7a1a5142f780..000000000000
--- a/databases/postgresql10-server/files/patch-doc-src-sgml-Makefile
+++ /dev/null
@@ -1,42 +0,0 @@
---- doc/src/sgml/Makefile.orig	2017-08-07 23:08:19.000000000 +0200
-+++ doc/src/sgml/Makefile	2017-08-08 14:07:11.461380000 +0200
-@@ -15,7 +15,7 @@
- 
- # Make "html" the default target, since that is what most people tend
- # to want to use.
--html:
-+man:
- 
- NO_TEMP_INSTALL=yes
- 
-@@ -24,7 +24,7 @@
- include $(top_builddir)/src/Makefile.global
- 
- 
--all: html man
-+all: man
- 
- distprep: html distprep-man
- 
-@@ -76,8 +76,6 @@
- ## Man pages
- ##
- 
--man distprep-man: man-stamp
--
- man-stamp: stylesheet-man.xsl postgres.xml
- 	$(XMLLINT) --noout --valid postgres.xml
- 	$(XSLTPROC) $(XSLTPROCFLAGS) $(XSLTPROC_MAN_FLAGS) $^
-@@ -245,10 +243,10 @@
- ## Install
- ##
- 
--install: install-html install-man
-+install: install-man
- 
- installdirs:
--	$(MKDIR_P) '$(DESTDIR)$(htmldir)'/html $(addprefix '$(DESTDIR)$(mandir)'/man, 1 3 $(sqlmansectnum))
-+	$(MKDIR_P) $(addprefix '$(DESTDIR)$(mandir)'/man, 1 3 $(sqlmansectnum))
- 
- # If the install used a man directory shared with other applications, this will remove all files.
- uninstall:
diff --git a/databases/postgresql10-server/files/patch-src-backend-Makefile b/databases/postgresql10-server/files/patch-src-backend-Makefile
deleted file mode 100644
index 4922d1436828..000000000000
--- a/databases/postgresql10-server/files/patch-src-backend-Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/backend/Makefile.orig	2009-07-07 15:58:33.000000000 +0200
-+++ src/backend/Makefile	2009-07-07 15:58:57.000000000 +0200
-@@ -107,6 +107,8 @@
- # Update the commonly used headers before building the subdirectories
- $(SUBDIRS:%=%-recursive): $(top_builddir)/src/include/parser/gram.h $(top_builddir)/src/include/utils/fmgroids.h $(top_builddir)/src/include/utils/probes.h
- 
-+symlinks: $(top_builddir)/src/include/parser/gram.h $(top_builddir)/src/include/utils/fmgroids.h $(top_builddir)/src/include/utils/fmgrprotos.h $(top_builddir)/src/include/utils/probes.h $(top_builddir)/src/include/storage/lwlocknames.h
-+
- 
- # The postgres.o target is needed by the rule in Makefile.global that
- # creates the exports file when MAKE_EXPORTS = true.
diff --git a/databases/postgresql10-server/files/patch-src_backend_utils_misc_postgresql.conf.sample b/databases/postgresql10-server/files/patch-src_backend_utils_misc_postgresql.conf.sample
deleted file mode 100644
index a82826b3b5f1..000000000000
--- a/databases/postgresql10-server/files/patch-src_backend_utils_misc_postgresql.conf.sample
+++ /dev/null
@@ -1,21 +0,0 @@
---- src/backend/utils/misc/postgresql.conf.sample.orig	2016-10-24 20:08:51 UTC
-+++ src/backend/utils/misc/postgresql.conf.sample
-@@ -330,6 +330,7 @@
- 
- # - Where to Log -
- 
-+log_destination = 'syslog'
- #log_destination = 'stderr'		# Valid values are combinations of
- 					# stderr, csvlog, syslog, and eventlog,
- 					# depending on platform.  csvlog
-@@ -464,7 +465,9 @@
- 
- #cluster_name = ''			# added to process titles if nonempty
- 					# (change requires restart)
--#update_process_title = on
-+
-+# On FreeBSD, this is a performance hog, so keep it off if you need speed
-+update_process_title = off
- 
- 
- #------------------------------------------------------------------------------
diff --git a/databases/postgresql10-server/files/patch-src_include_storage_s__lock.h b/databases/postgresql10-server/files/patch-src_include_storage_s__lock.h
deleted file mode 100644
index 19c945a36126..000000000000
--- a/databases/postgresql10-server/files/patch-src_include_storage_s__lock.h
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/include/storage/s_lock.h.orig	2021-04-15 09:05:25 UTC
-+++ src/include/storage/s_lock.h
-@@ -320,7 +320,7 @@ tas(volatile slock_t *lock)
-  * We use the int-width variant of the builtin because it works on more chips
-  * than other widths.
-  */
--#if defined(__arm__) || defined(__arm) || defined(__aarch64__) || defined(__aarch64)
-+#if defined(__arm__) || defined(__arm) || defined(__aarch64__) || defined(__aarch64) || defined(__riscv)
- #ifdef HAVE_GCC__SYNC_INT32_TAS
- #define HAS_TEST_AND_SET
- 
-@@ -337,7 +337,7 @@ tas(volatile slock_t *lock)
- #define S_UNLOCK(lock) __sync_lock_release(lock)
- 
- #endif	 /* HAVE_GCC__SYNC_INT32_TAS */
--#endif	 /* __arm__ || __arm || __aarch64__ || __aarch64 */
-+#endif	 /* __arm__ || __arm || __aarch64__ || __aarch64 || __riscv */
- 
- 
- /* S/390 and S/390x Linux (32- and 64-bit zSeries) */
diff --git a/databases/postgresql10-server/files/pkg-message-client.in b/databases/postgresql10-server/files/pkg-message-client.in
deleted file mode 100644
index 404124204b7d..000000000000
--- a/databases/postgresql10-server/files/pkg-message-client.in
+++ /dev/null
@@ -1,38 +0,0 @@
-[
-{ type: install
-  message: <<EOM
-The PostgreSQL port has a collection of "side orders":
-
-postgresql-docs
-  For all of the html documentation
-
-p5-Pg
-  A perl5 API for client access to PostgreSQL databases.
-
-postgresql-tcltk 
-  If you want tcl/tk client support.
-
-postgresql-jdbc
-  For Java JDBC support.
-
-postgresql-odbc
-  For client access from unix applications using ODBC as access
-  method. Not needed to access unix PostgreSQL servers from Win32
-  using ODBC. See below.
-
-ruby-postgres, py-psycopg2
-  For client access to PostgreSQL databases using the ruby & python
-  languages.
-
-postgresql-plperl, postgresql-pltcl & postgresql-plruby
-  For using perl5, tcl & ruby as procedural languages.
-
-postgresql-contrib
-  Lots of contributed utilities, postgresql functions and
-  datatypes. There you find pg_standby, pgcrypto and many other cool
-  things.
-
-etc...
-EOM
-}
-]
diff --git a/databases/postgresql10-server/files/pkg-message-server.in b/databases/postgresql10-server/files/pkg-message-server.in
deleted file mode 100644
index e2407c1d964f..000000000000
--- a/databases/postgresql10-server/files/pkg-message-server.in
+++ /dev/null
@@ -1,69 +0,0 @@
-[
-{ type: install
-  message: <<EOM
-For procedural languages and postgresql functions, please note that
-you might have to update them when updating the server.
-
-If you have many tables and many clients running, consider raising
-kern.maxfiles using sysctl(8), or reconfigure your kernel
-appropriately.
-
-The port is set up to use autovacuum for new databases, but you might
-also want to vacuum and perhaps backup your database regularly. There
-is a periodic script, %%PREFIX%%/etc/periodic/daily/502.pgsql, that
-you may find useful. You can use it to backup and perform vacuum on all
-databases nightly. Per default, it performs `vacuum analyze'. See the
-script for instructions. For autovacuum settings, please review
-~postgres/data/postgresql.conf.
-
-If you plan to access your PostgreSQL server using ODBC, please
-consider running the SQL script %%PREFIX%%/share/postgresql/odbc.sql
-to get the functions required for ODBC compliance.
-
-Please note that if you use the rc script,
-%%PREFIX%%/etc/rc.d/postgresql, to initialize the database, unicode
-(UTF-8) will be used to store character data by default.  Set
-postgresql_initdb_flags or use login.conf settings described below to
-alter this behaviour. See the start rc script for more info.
-
-To set limits, environment stuff like locale and collation and other
-things, you can set up a class in /etc/login.conf before initializing
-the database. Add something similar to this to /etc/login.conf:
----
-postgres:\
-	:lang=en_US.UTF-8:\
-	:setenv=LC_COLLATE=C:\
-	:tc=default:
----
-and run `cap_mkdb /etc/login.conf'.
-Then add 'postgresql_class="postgres"' to /etc/rc.conf.
-
-======================================================================
-
-To initialize the database, run
-
-  %%PREFIX%%/etc/rc.d/postgresql initdb
-
-You can then start PostgreSQL by running:
-
-  %%PREFIX%%/etc/rc.d/postgresql start
-
-For postmaster settings, see ~postgres/data/postgresql.conf
-
-NB. FreeBSD's PostgreSQL port logs to syslog by default
-    See ~postgres/data/postgresql.conf for more info
-
-NB. If you're not using a checksumming filesystem like ZFS, you might
-    wish to enable data checksumming. It can only be enabled during
-    the initdb phase, by adding the "--data-checksums" flag to
-    the postgresql_initdb_flags rcvar.  Check the initdb(1) manpage
-    for more info and make sure you understand the performance
-    implications.
-
-======================================================================
-
-To run PostgreSQL at startup, add
-'postgresql_enable="YES"' to /etc/rc.conf
-EOM
-}
-]
diff --git a/databases/postgresql10-server/files/postgresql.in b/databases/postgresql10-server/files/postgresql.in
deleted file mode 100644
index e012b35f9dc8..000000000000
--- a/databases/postgresql10-server/files/postgresql.in
+++ /dev/null
@@ -1,115 +0,0 @@
-#!/bin/sh
-
-# PROVIDE: postgresql
-# REQUIRE: DAEMON
-# KEYWORD: shutdown
-#
-# Add the following line to /etc/rc.conf to enable PostgreSQL:
-#
-#  postgresql_enable="YES"
-#  # optional
-#  postgresql_data="/var/db/%%PG_USER%%/data10"
-#  postgresql_flags="-w -s -m fast"
-#  postgresql_initdb_flags="--encoding=utf-8 --lc-collate=C"
-#  postgresql_login_class="default"
-#  postgresql_profiles=""
-#
-# See %%PREFIX%%/share/doc/postgresql/README-server for more info
-#
-# This scripts takes one of the following commands:
-#
-#   start stop restart reload status initdb
-#
-# For postmaster startup options, edit ${postgresql_data}/postgresql.conf
-
-command=%%PREFIX%%/bin/pg_ctl
-
-. /etc/rc.subr
-
-load_rc_config postgresql
-
-# set defaults
-postgresql_enable=${postgresql_enable:-"NO"}
-postgresql_flags=${postgresql_flags:-"-w -s -m fast"}
-postgresql_user=${postgresql_user:-"%%PG_USER%%"}
-eval postgresql_data=${postgresql_data:-"~${postgresql_user}/data10"}
-postgresql_login_class=${postgresql_login_class:-"default"}
-postgresql_initdb_flags=${postgresql_initdb_flags:-"--encoding=utf-8 --lc-collate=C"}
-
-name=postgresql
-rcvar=postgresql_enable
-extra_commands="reload initdb"
-
-start_cmd="postgresql_command start"
-stop_cmd="postgresql_command stop"
-restart_cmd="postgresql_command restart"
-reload_cmd="postgresql_command reload"
-status_cmd="postgresql_command status"
-promote_cmd="postgresql_command promote"
-
-initdb_cmd="postgresql_initdb"
-
-su_cmd="/usr/bin/su"
-
-if [ -n "$2" ]; then
-	profile="$2"
-	if [ "x${postgresql_profiles}" != "x" ]; then
-		eval postgresql_data="\${postgresql_${profile}_data:-}"
-		if [ "x${postgresql_data}" = "x" ]; then
-			echo "You must define a data directory (postgresql_${profile}_data)"
-			exit 1
-		fi
-		eval postgresql_enable="\${postgresql_${profile}_enable:-${postgresql_enable}}"
-		eval postgresql_data="\${postgresql_${profile}_data:-${postgresql_data}}"
-		eval postgresql_flags="\${postgresql_${profile}_flags:-${postgresql_flags}}"
-		eval postgresql_initdb_flags="\${postgresql_${profile}_initdb_flags:-${postgresql_initdb_flags}}"
-	fi
-else
-	if [ "x${postgresql_profiles}" != "x" -a "x$1" != "x" ]; then
-		for profile in ${postgresql_profiles}; do
-			eval _enable="\${postgresql_${profile}_enable}"
-			case "x${_enable:-${postgresql_enable}}" in
-			x|x[Nn][Oo]|x[Nn][Oo][Nn][Ee])
-				continue
-				;;
-			x[Yy][Ee][Ss])
-				;;
-			*)
-				if test -z "$_enable"; then
-					_var=postgresql_enable
-				else
-					_var=postgresql_"${profile}"_enable
-				fi
-				echo "Bad value" \
-					"'${_enable:-${postgresql_enable}}'" \
-					"for ${_var}. " \
-					"Profile ${profile} skipped."
-				continue
-				;;
-			esac
-			echo "===> postgresql profile: ${profile}"
-			%%PREFIX%%/etc/rc.d/postgresql $1 ${profile}
-			retcode="$?"
-			if [ "0${retcode}" -ne 0 ]; then
-				failed="${profile} (${retcode}) ${failed:-}"
-			else
-				success="${profile} ${success:-}"
-			fi
-		done
-		exit 0
-	fi
-fi
-
-command_args="-D ${postgresql_data} ${postgresql_flags}"
-
-postgresql_command()
-{
-    ${su_cmd} -l ${postgresql_user} -c "exec ${command} ${command_args} ${rc_arg}"
-}
-
-postgresql_initdb()
-{
-    ${su_cmd} -l -c ${postgresql_login_class} ${postgresql_user} -c "exec %%PREFIX%%/bin/initdb ${postgresql_initdb_flags} -D ${postgresql_data} -U ${postgresql_user}"
-}
-
-run_rc_command "$1"
diff --git a/databases/postgresql10-server/pkg-descr b/databases/postgresql10-server/pkg-descr
deleted file mode 100644
index 1b3c3db53e96..000000000000
--- a/databases/postgresql10-server/pkg-descr
+++ /dev/null
@@ -1,23 +0,0 @@
-PostgreSQL is a sophisticated Object-Relational DBMS, supporting
-almost all SQL constructs, including subselects, transactions, and
-user-defined types and functions. It is the most advanced open-source
-database available anywhere. Commercial Support is also available.
-
-The original Postgres code was the effort of many graduate students,
-undergraduate students, and staff programmers working under the direction of
-Professor Michael Stonebraker at the University of California, Berkeley. In
-1995, Andrew Yu and Jolly Chen took on the task of converting the DBMS query
-language to SQL and created a new database system which came to known as
-Postgres95. Many others contributed to the porting, testing, debugging and
-enhancement of the Postgres95 code. As the code improved, and 1995 faded into
-memory, PostgreSQL was born.
-
-PostgreSQL development is presently being performed by a team of Internet
-developers who are now responsible for all current and future development. The
-development team coordinator is Marc G. Fournier (scrappy@PostgreSQL.ORG).
-Support is available from the PostgreSQL developer/user community through the
-support mailing list (questions@PostgreSQL.ORG).
-
-PostgreSQL is free and the complete source is available.
-
-WWW: https://www.postgresql.org/
diff --git a/databases/postgresql10-server/pkg-install-server b/databases/postgresql10-server/pkg-install-server
deleted file mode 100644
index 07a10b84eaab..000000000000
--- a/databases/postgresql10-server/pkg-install-server
+++ /dev/null
@@ -1,22 +0,0 @@
-#! /bin/sh
-
-PATH=/bin:/usr/bin:/usr/sbin
-
-backupwarning() {
-cat <<EOF
-
-  =========== BACKUP YOUR DATA! =============
-  As always, backup your data before
-  upgrading. If the upgrade leads to a higher
-  minor revision (e.g. 8.3.x -> 8.4), a dump
-  and restore of all databases is
-  required. This is *NOT* done by the port!
-  ===========================================
-EOF
-}
-
-case $2 in
-PRE-INSTALL)
-	backupwarning
-	;;
-esac
diff --git a/databases/postgresql10-server/pkg-plist-client b/databases/postgresql10-server/pkg-plist-client
deleted file mode 100644
index ee789e17f8d6..000000000000
--- a/databases/postgresql10-server/pkg-plist-client
+++ /dev/null
@@ -1,1113 +0,0 @@
-bin/clusterdb
-bin/createdb
-bin/createuser
-bin/dropdb
-bin/dropuser
-bin/ecpg
-bin/pg_config
-bin/pg_dump
-bin/pg_dumpall
-bin/pg_isready
-bin/pg_restore
-bin/pgbench
-bin/psql
-bin/reindexdb
-bin/vacuumdb
-include/ecpg_config.h
-include/ecpg_informix.h
-include/ecpgerrno.h
-include/ecpglib.h
-include/ecpgtype.h
-include/libpq-events.h
-include/libpq-fe.h
-include/libpq/libpq-fs.h
-include/pg_config.h
-include/pg_config_ext.h
-include/pg_config_manual.h
-include/pg_config_os.h
-include/pgtypes.h
-include/pgtypes_date.h
-include/pgtypes_error.h
-include/pgtypes_interval.h
-include/pgtypes_numeric.h
-include/pgtypes_timestamp.h
-include/postgres_ext.h
-include/postgresql/informix/esql/datetime.h
-include/postgresql/informix/esql/decimal.h
-include/postgresql/informix/esql/sqltypes.h
-include/postgresql/internal/c.h
-include/postgresql/internal/libpq-int.h
-include/postgresql/internal/libpq/pqcomm.h
-include/postgresql/internal/port.h
-include/postgresql/internal/postgres_fe.h
-include/postgresql/internal/pqexpbuffer.h
-include/postgresql/server/access/amapi.h
-include/postgresql/server/access/amvalidate.h
-include/postgresql/server/access/attnum.h
-include/postgresql/server/access/brin.h
-include/postgresql/server/access/brin_internal.h
-include/postgresql/server/access/brin_page.h
-include/postgresql/server/access/brin_pageops.h
-include/postgresql/server/access/brin_revmap.h
-include/postgresql/server/access/brin_tuple.h
-include/postgresql/server/access/brin_xlog.h
-include/postgresql/server/access/bufmask.h
-include/postgresql/server/access/clog.h
-include/postgresql/server/access/commit_ts.h
-include/postgresql/server/access/genam.h
-include/postgresql/server/access/generic_xlog.h
-include/postgresql/server/access/gin.h
-include/postgresql/server/access/gin_private.h
-include/postgresql/server/access/ginblock.h
-include/postgresql/server/access/ginxlog.h
-include/postgresql/server/access/gist.h
-include/postgresql/server/access/gist_private.h
-include/postgresql/server/access/gistscan.h
-include/postgresql/server/access/gistxlog.h
-include/postgresql/server/access/hash.h
-include/postgresql/server/access/hash_xlog.h
-include/postgresql/server/access/heapam.h
-include/postgresql/server/access/heapam_xlog.h
-include/postgresql/server/access/hio.h
-include/postgresql/server/access/htup.h
-include/postgresql/server/access/htup_details.h
-include/postgresql/server/access/itup.h
-include/postgresql/server/access/multixact.h
-include/postgresql/server/access/nbtree.h
-include/postgresql/server/access/nbtxlog.h
-include/postgresql/server/access/parallel.h
-include/postgresql/server/access/printsimple.h
-include/postgresql/server/access/printtup.h
-include/postgresql/server/access/reloptions.h
-include/postgresql/server/access/relscan.h
-include/postgresql/server/access/rewriteheap.h
-include/postgresql/server/access/rmgr.h
-include/postgresql/server/access/rmgrlist.h
-include/postgresql/server/access/sdir.h
-include/postgresql/server/access/skey.h
-include/postgresql/server/access/slru.h
-include/postgresql/server/access/spgist.h
-include/postgresql/server/access/spgist_private.h
-include/postgresql/server/access/spgxlog.h
-include/postgresql/server/access/stratnum.h
-include/postgresql/server/access/subtrans.h
-include/postgresql/server/access/sysattr.h
-include/postgresql/server/access/timeline.h
-include/postgresql/server/access/transam.h
-include/postgresql/server/access/tsmapi.h
-include/postgresql/server/access/tupconvert.h
-include/postgresql/server/access/tupdesc.h
-include/postgresql/server/access/tupmacs.h
-include/postgresql/server/access/tuptoaster.h
-include/postgresql/server/access/twophase.h
-include/postgresql/server/access/twophase_rmgr.h
-include/postgresql/server/access/valid.h
-include/postgresql/server/access/visibilitymap.h
-include/postgresql/server/access/xact.h
-include/postgresql/server/access/xlog.h
-include/postgresql/server/access/xlog_internal.h
-include/postgresql/server/access/xlogdefs.h
-include/postgresql/server/access/xloginsert.h
-include/postgresql/server/access/xlogreader.h
-include/postgresql/server/access/xlogrecord.h
-include/postgresql/server/access/xlogutils.h
-include/postgresql/server/bootstrap/bootstrap.h
-include/postgresql/server/c.h
-include/postgresql/server/catalog/binary_upgrade.h
-include/postgresql/server/catalog/catalog.h
-include/postgresql/server/catalog/catversion.h
-include/postgresql/server/catalog/dependency.h
-include/postgresql/server/catalog/genbki.h
-include/postgresql/server/catalog/heap.h
-include/postgresql/server/catalog/index.h
-include/postgresql/server/catalog/indexing.h
-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_am.h
-include/postgresql/server/catalog/pg_amop.h
-include/postgresql/server/catalog/pg_amproc.h
-include/postgresql/server/catalog/pg_attrdef.h
-include/postgresql/server/catalog/pg_attribute.h
-include/postgresql/server/catalog/pg_auth_members.h
-include/postgresql/server/catalog/pg_authid.h
-include/postgresql/server/catalog/pg_cast.h
-include/postgresql/server/catalog/pg_class.h
-include/postgresql/server/catalog/pg_collation.h
-include/postgresql/server/catalog/pg_collation_fn.h
-include/postgresql/server/catalog/pg_constraint.h
-include/postgresql/server/catalog/pg_constraint_fn.h
-include/postgresql/server/catalog/pg_control.h
-include/postgresql/server/catalog/pg_conversion.h
-include/postgresql/server/catalog/pg_conversion_fn.h
-include/postgresql/server/catalog/pg_database.h
-include/postgresql/server/catalog/pg_db_role_setting.h
-include/postgresql/server/catalog/pg_default_acl.h
-include/postgresql/server/catalog/pg_depend.h
-include/postgresql/server/catalog/pg_description.h
-include/postgresql/server/catalog/pg_enum.h
-include/postgresql/server/catalog/pg_event_trigger.h
-include/postgresql/server/catalog/pg_extension.h
-include/postgresql/server/catalog/pg_foreign_data_wrapper.h
-include/postgresql/server/catalog/pg_foreign_server.h
-include/postgresql/server/catalog/pg_foreign_table.h
-include/postgresql/server/catalog/pg_index.h
-include/postgresql/server/catalog/pg_inherits.h
-include/postgresql/server/catalog/pg_inherits_fn.h
-include/postgresql/server/catalog/pg_init_privs.h
-include/postgresql/server/catalog/pg_language.h
-include/postgresql/server/catalog/pg_largeobject.h
-include/postgresql/server/catalog/pg_largeobject_metadata.h
-include/postgresql/server/catalog/pg_namespace.h
-include/postgresql/server/catalog/pg_opclass.h
-include/postgresql/server/catalog/pg_operator.h
-include/postgresql/server/catalog/pg_operator_fn.h
-include/postgresql/server/catalog/pg_opfamily.h
-include/postgresql/server/catalog/pg_partitioned_table.h
-include/postgresql/server/catalog/pg_pltemplate.h
-include/postgresql/server/catalog/pg_policy.h
-include/postgresql/server/catalog/pg_proc.h
-include/postgresql/server/catalog/pg_proc_fn.h
-include/postgresql/server/catalog/pg_publication.h
-include/postgresql/server/catalog/pg_publication_rel.h
-include/postgresql/server/catalog/pg_range.h
-include/postgresql/server/catalog/pg_replication_origin.h
-include/postgresql/server/catalog/pg_rewrite.h
-include/postgresql/server/catalog/pg_seclabel.h
-include/postgresql/server/catalog/pg_sequence.h
-include/postgresql/server/catalog/pg_shdepend.h
-include/postgresql/server/catalog/pg_shdescription.h
-include/postgresql/server/catalog/pg_shseclabel.h
-include/postgresql/server/catalog/pg_statistic.h
-include/postgresql/server/catalog/pg_statistic_ext.h
-include/postgresql/server/catalog/pg_subscription.h
-include/postgresql/server/catalog/pg_subscription_rel.h
-include/postgresql/server/catalog/pg_tablespace.h
-include/postgresql/server/catalog/pg_transform.h
-include/postgresql/server/catalog/pg_trigger.h
-include/postgresql/server/catalog/pg_ts_config.h
-include/postgresql/server/catalog/pg_ts_config_map.h
-include/postgresql/server/catalog/pg_ts_dict.h
-include/postgresql/server/catalog/pg_ts_parser.h
-include/postgresql/server/catalog/pg_ts_template.h
-include/postgresql/server/catalog/pg_type.h
-include/postgresql/server/catalog/pg_type_fn.h
-include/postgresql/server/catalog/pg_user_mapping.h
-include/postgresql/server/catalog/schemapg.h
-include/postgresql/server/catalog/storage.h
-include/postgresql/server/catalog/storage_xlog.h
-include/postgresql/server/catalog/toasting.h
-include/postgresql/server/commands/alter.h
-include/postgresql/server/commands/async.h
-include/postgresql/server/commands/cluster.h
-include/postgresql/server/commands/collationcmds.h
-include/postgresql/server/commands/comment.h
-include/postgresql/server/commands/conversioncmds.h
-include/postgresql/server/commands/copy.h
-include/postgresql/server/commands/createas.h
-include/postgresql/server/commands/dbcommands.h
-include/postgresql/server/commands/dbcommands_xlog.h
-include/postgresql/server/commands/defrem.h
-include/postgresql/server/commands/discard.h
-include/postgresql/server/commands/event_trigger.h
-include/postgresql/server/commands/explain.h
-include/postgresql/server/commands/extension.h
-include/postgresql/server/commands/lockcmds.h
-include/postgresql/server/commands/matview.h
-include/postgresql/server/commands/policy.h
-include/postgresql/server/commands/portalcmds.h
-include/postgresql/server/commands/prepare.h
-include/postgresql/server/commands/proclang.h
-include/postgresql/server/commands/progress.h
-include/postgresql/server/commands/publicationcmds.h
-include/postgresql/server/commands/schemacmds.h
-include/postgresql/server/commands/seclabel.h
-include/postgresql/server/commands/sequence.h
-include/postgresql/server/commands/subscriptioncmds.h
-include/postgresql/server/commands/tablecmds.h
-include/postgresql/server/commands/tablespace.h
-include/postgresql/server/commands/trigger.h
-include/postgresql/server/commands/typecmds.h
-include/postgresql/server/commands/user.h
-include/postgresql/server/commands/vacuum.h
-include/postgresql/server/commands/variable.h
-include/postgresql/server/commands/view.h
-include/postgresql/server/common/base64.h
-include/postgresql/server/common/config_info.h
-include/postgresql/server/common/connect.h
-include/postgresql/server/common/controldata_utils.h
-include/postgresql/server/common/fe_memutils.h
-include/postgresql/server/common/file_utils.h
-include/postgresql/server/common/int128.h
-include/postgresql/server/common/ip.h
-include/postgresql/server/common/keywords.h
-include/postgresql/server/common/md5.h
-include/postgresql/server/common/pg_lzcompress.h
-include/postgresql/server/common/relpath.h
-include/postgresql/server/common/restricted_token.h
-include/postgresql/server/common/saslprep.h
-include/postgresql/server/common/scram-common.h
-include/postgresql/server/common/sha2.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/timestamp.h
-include/postgresql/server/dynloader.h
-include/postgresql/server/executor/execExpr.h
-include/postgresql/server/executor/execParallel.h
-include/postgresql/server/executor/execdebug.h
-include/postgresql/server/executor/execdesc.h
-include/postgresql/server/executor/executor.h
-include/postgresql/server/executor/functions.h
-include/postgresql/server/executor/hashjoin.h
-include/postgresql/server/executor/instrument.h
-include/postgresql/server/executor/nodeAgg.h
-include/postgresql/server/executor/nodeAppend.h
-include/postgresql/server/executor/nodeBitmapAnd.h
-include/postgresql/server/executor/nodeBitmapHeapscan.h
-include/postgresql/server/executor/nodeBitmapIndexscan.h
-include/postgresql/server/executor/nodeBitmapOr.h
-include/postgresql/server/executor/nodeCtescan.h
-include/postgresql/server/executor/nodeCustom.h
-include/postgresql/server/executor/nodeForeignscan.h
-include/postgresql/server/executor/nodeFunctionscan.h
-include/postgresql/server/executor/nodeGather.h
-include/postgresql/server/executor/nodeGatherMerge.h
-include/postgresql/server/executor/nodeGroup.h
-include/postgresql/server/executor/nodeHash.h
-include/postgresql/server/executor/nodeHashjoin.h
-include/postgresql/server/executor/nodeIndexonlyscan.h
-include/postgresql/server/executor/nodeIndexscan.h
-include/postgresql/server/executor/nodeLimit.h
-include/postgresql/server/executor/nodeLockRows.h
-include/postgresql/server/executor/nodeMaterial.h
-include/postgresql/server/executor/nodeMergeAppend.h
-include/postgresql/server/executor/nodeMergejoin.h
-include/postgresql/server/executor/nodeModifyTable.h
-include/postgresql/server/executor/nodeNamedtuplestorescan.h
-include/postgresql/server/executor/nodeNestloop.h
-include/postgresql/server/executor/nodeProjectSet.h
-include/postgresql/server/executor/nodeRecursiveunion.h
-include/postgresql/server/executor/nodeResult.h
-include/postgresql/server/executor/nodeSamplescan.h
-include/postgresql/server/executor/nodeSeqscan.h
-include/postgresql/server/executor/nodeSetOp.h
-include/postgresql/server/executor/nodeSort.h
-include/postgresql/server/executor/nodeSubplan.h
-include/postgresql/server/executor/nodeSubqueryscan.h
-include/postgresql/server/executor/nodeTableFuncscan.h
-include/postgresql/server/executor/nodeTidscan.h
-include/postgresql/server/executor/nodeUnique.h
-include/postgresql/server/executor/nodeValuesscan.h
-include/postgresql/server/executor/nodeWindowAgg.h
-include/postgresql/server/executor/nodeWorktablescan.h
-include/postgresql/server/executor/spi.h
-include/postgresql/server/executor/spi_priv.h
-include/postgresql/server/executor/tablefunc.h
-include/postgresql/server/executor/tqueue.h
-include/postgresql/server/executor/tstoreReceiver.h
-include/postgresql/server/executor/tuptable.h
-include/postgresql/server/fe_utils/connect.h
-include/postgresql/server/fe_utils/mbprint.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/simple_list.h
-include/postgresql/server/fe_utils/string_utils.h
-include/postgresql/server/fmgr.h
-include/postgresql/server/foreign/fdwapi.h
-include/postgresql/server/foreign/foreign.h
-include/postgresql/server/funcapi.h
-include/postgresql/server/getaddrinfo.h
-include/postgresql/server/getopt_long.h
-include/postgresql/server/lib/binaryheap.h
-include/postgresql/server/lib/bipartite_match.h
-include/postgresql/server/lib/hyperloglog.h
-include/postgresql/server/lib/ilist.h
-include/postgresql/server/lib/knapsack.h
-include/postgresql/server/lib/pairingheap.h
-include/postgresql/server/lib/rbtree.h
-include/postgresql/server/lib/simplehash.h
-include/postgresql/server/lib/stringinfo.h
-include/postgresql/server/libpq/auth.h
-include/postgresql/server/libpq/be-fsstubs.h
-include/postgresql/server/libpq/crypt.h
-include/postgresql/server/libpq/hba.h
-include/postgresql/server/libpq/ifaddr.h
-include/postgresql/server/libpq/libpq-be.h
-include/postgresql/server/libpq/libpq-fs.h
-include/postgresql/server/libpq/libpq.h
-include/postgresql/server/libpq/pqcomm.h
-include/postgresql/server/libpq/pqformat.h
-include/postgresql/server/libpq/pqmq.h
-include/postgresql/server/libpq/pqsignal.h
-include/postgresql/server/libpq/scram.h
-include/postgresql/server/mb/pg_wchar.h
-include/postgresql/server/miscadmin.h
-include/postgresql/server/nodes/bitmapset.h
-include/postgresql/server/nodes/execnodes.h
-include/postgresql/server/nodes/extensible.h
-include/postgresql/server/nodes/lockoptions.h
-include/postgresql/server/nodes/makefuncs.h
-include/postgresql/server/nodes/memnodes.h
-include/postgresql/server/nodes/nodeFuncs.h
-include/postgresql/server/nodes/nodes.h
-include/postgresql/server/nodes/params.h
-include/postgresql/server/nodes/parsenodes.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/tidbitmap.h
-include/postgresql/server/nodes/value.h
-include/postgresql/server/optimizer/clauses.h
-include/postgresql/server/optimizer/cost.h
-include/postgresql/server/optimizer/geqo.h
-include/postgresql/server/optimizer/geqo_copy.h
-include/postgresql/server/optimizer/geqo_gene.h
-include/postgresql/server/optimizer/geqo_misc.h
-include/postgresql/server/optimizer/geqo_mutation.h
-include/postgresql/server/optimizer/geqo_pool.h
-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/joininfo.h
-include/postgresql/server/optimizer/orclauses.h
-include/postgresql/server/optimizer/paramassign.h
-include/postgresql/server/optimizer/pathnode.h
-include/postgresql/server/optimizer/paths.h
-include/postgresql/server/optimizer/placeholder.h
-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/analyze.h
-include/postgresql/server/parser/gram.h
-include/postgresql/server/parser/gramparse.h
-include/postgresql/server/parser/kwlist.h
-include/postgresql/server/parser/parse_agg.h
-include/postgresql/server/parser/parse_clause.h
-include/postgresql/server/parser/parse_coerce.h
-include/postgresql/server/parser/parse_collate.h
-include/postgresql/server/parser/parse_cte.h
-include/postgresql/server/parser/parse_enr.h
-include/postgresql/server/parser/parse_expr.h
-include/postgresql/server/parser/parse_func.h
-include/postgresql/server/parser/parse_node.h
-include/postgresql/server/parser/parse_oper.h
-include/postgresql/server/parser/parse_param.h
-include/postgresql/server/parser/parse_relation.h
-include/postgresql/server/parser/parse_target.h
-include/postgresql/server/parser/parse_type.h
-include/postgresql/server/parser/parse_utilcmd.h
-include/postgresql/server/parser/parser.h
-include/postgresql/server/parser/parsetree.h
-include/postgresql/server/parser/scanner.h
-include/postgresql/server/parser/scansup.h
-include/postgresql/server/pg_config.h
-include/postgresql/server/pg_config_ext.h
-include/postgresql/server/pg_config_manual.h
-include/postgresql/server/pg_config_os.h
-include/postgresql/server/pg_getopt.h
-include/postgresql/server/pg_trace.h
-include/postgresql/server/pgstat.h
-include/postgresql/server/pgtar.h
-include/postgresql/server/pgtime.h
-include/postgresql/server/port.h
-include/postgresql/server/port/aix.h
-include/postgresql/server/port/atomics.h
-include/postgresql/server/port/atomics/arch-arm.h
-include/postgresql/server/port/atomics/arch-hppa.h
-include/postgresql/server/port/atomics/arch-ia64.h
-include/postgresql/server/port/atomics/arch-ppc.h
-include/postgresql/server/port/atomics/arch-x86.h
-include/postgresql/server/port/atomics/fallback.h
-include/postgresql/server/port/atomics/generic-acc.h
-include/postgresql/server/port/atomics/generic-gcc.h
-include/postgresql/server/port/atomics/generic-msvc.h
-include/postgresql/server/port/atomics/generic-sunpro.h
-include/postgresql/server/port/atomics/generic-xlc.h
-include/postgresql/server/port/atomics/generic.h
-include/postgresql/server/port/cygwin.h
-include/postgresql/server/port/darwin.h
-include/postgresql/server/port/freebsd.h
-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_bswap.h
-include/postgresql/server/port/pg_crc32c.h
-include/postgresql/server/port/solaris.h
-include/postgresql/server/port/win32.h
-include/postgresql/server/port/win32/arpa/inet.h
-include/postgresql/server/port/win32/dlfcn.h
-include/postgresql/server/port/win32/grp.h
-include/postgresql/server/port/win32/netdb.h
-include/postgresql/server/port/win32/netinet/in.h
-include/postgresql/server/port/win32/pwd.h
-include/postgresql/server/port/win32/sys/socket.h
-include/postgresql/server/port/win32/sys/wait.h
-include/postgresql/server/port/win32_msvc/dirent.h
-include/postgresql/server/port/win32_msvc/sys/file.h
-include/postgresql/server/port/win32_msvc/sys/param.h
-include/postgresql/server/port/win32_msvc/sys/time.h
-include/postgresql/server/port/win32_msvc/unistd.h
-include/postgresql/server/port/win32_msvc/utime.h
-include/postgresql/server/portability/instr_time.h
-include/postgresql/server/portability/mem.h
-include/postgresql/server/postgres.h
-include/postgresql/server/postgres_ext.h
-include/postgresql/server/postgres_fe.h
-include/postgresql/server/postmaster/autovacuum.h
-include/postgresql/server/postmaster/bgworker.h
-include/postgresql/server/postmaster/bgworker_internals.h
-include/postgresql/server/postmaster/bgwriter.h
-include/postgresql/server/postmaster/fork_process.h
-include/postgresql/server/postmaster/pgarch.h
-include/postgresql/server/postmaster/postmaster.h
-include/postgresql/server/postmaster/startup.h
-include/postgresql/server/postmaster/syslogger.h
-include/postgresql/server/postmaster/walwriter.h
-include/postgresql/server/regex/regcustom.h
-include/postgresql/server/regex/regerrs.h
-include/postgresql/server/regex/regex.h
-include/postgresql/server/regex/regexport.h
-include/postgresql/server/regex/regguts.h
-include/postgresql/server/replication/basebackup.h
-include/postgresql/server/replication/decode.h
-include/postgresql/server/replication/logical.h
-include/postgresql/server/replication/logicalfuncs.h
-include/postgresql/server/replication/logicallauncher.h
-include/postgresql/server/replication/logicalproto.h
-include/postgresql/server/replication/logicalrelation.h
-include/postgresql/server/replication/logicalworker.h
-include/postgresql/server/replication/message.h
-include/postgresql/server/replication/origin.h
-include/postgresql/server/replication/output_plugin.h
-include/postgresql/server/replication/pgoutput.h
-include/postgresql/server/replication/reorderbuffer.h
-include/postgresql/server/replication/slot.h
-include/postgresql/server/replication/snapbuild.h
-include/postgresql/server/replication/syncrep.h
-include/postgresql/server/replication/walreceiver.h
-include/postgresql/server/replication/walsender.h
-include/postgresql/server/replication/walsender_private.h
-include/postgresql/server/replication/worker_internal.h
-include/postgresql/server/rewrite/prs2lock.h
-include/postgresql/server/rewrite/rewriteDefine.h
-include/postgresql/server/rewrite/rewriteHandler.h
-include/postgresql/server/rewrite/rewriteManip.h
-include/postgresql/server/rewrite/rewriteRemove.h
-include/postgresql/server/rewrite/rewriteSupport.h
-include/postgresql/server/rewrite/rowsecurity.h
-include/postgresql/server/rusagestub.h
-include/postgresql/server/snowball/header.h
-include/postgresql/server/snowball/libstemmer/api.h
-include/postgresql/server/snowball/libstemmer/header.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
-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_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_romanian.h
-include/postgresql/server/snowball/libstemmer/stem_KOI8_R_russian.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
-include/postgresql/server/snowball/libstemmer/stem_UTF_8_finnish.h
-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_italian.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
-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_spanish.h
-include/postgresql/server/snowball/libstemmer/stem_UTF_8_swedish.h
-include/postgresql/server/snowball/libstemmer/stem_UTF_8_turkish.h
-include/postgresql/server/statistics/extended_stats_internal.h
-include/postgresql/server/statistics/statistics.h
-include/postgresql/server/storage/backendid.h
-include/postgresql/server/storage/block.h
-include/postgresql/server/storage/buf.h
-include/postgresql/server/storage/buf_internals.h
-include/postgresql/server/storage/buffile.h
-include/postgresql/server/storage/bufmgr.h
-include/postgresql/server/storage/bufpage.h
-include/postgresql/server/storage/checksum.h
-include/postgresql/server/storage/checksum_impl.h
-include/postgresql/server/storage/condition_variable.h
-include/postgresql/server/storage/copydir.h
-include/postgresql/server/storage/dsm.h
-include/postgresql/server/storage/dsm_impl.h
-include/postgresql/server/storage/fd.h
-include/postgresql/server/storage/freespace.h
-include/postgresql/server/storage/fsm_internals.h
-include/postgresql/server/storage/indexfsm.h
-include/postgresql/server/storage/ipc.h
-include/postgresql/server/storage/item.h
-include/postgresql/server/storage/itemid.h
-include/postgresql/server/storage/itemptr.h
-include/postgresql/server/storage/large_object.h
-include/postgresql/server/storage/latch.h
-include/postgresql/server/storage/lmgr.h
-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/off.h
-include/postgresql/server/storage/pg_sema.h
-include/postgresql/server/storage/pg_shmem.h
-include/postgresql/server/storage/pmsignal.h
-include/postgresql/server/storage/predicate.h
-include/postgresql/server/storage/predicate_internals.h
-include/postgresql/server/storage/proc.h
-include/postgresql/server/storage/procarray.h
-include/postgresql/server/storage/proclist.h
-include/postgresql/server/storage/proclist_types.h
-include/postgresql/server/storage/procsignal.h
-include/postgresql/server/storage/reinit.h
-include/postgresql/server/storage/relfilenode.h
-include/postgresql/server/storage/s_lock.h
-include/postgresql/server/storage/shm_mq.h
-include/postgresql/server/storage/shm_toc.h
-include/postgresql/server/storage/shmem.h
-include/postgresql/server/storage/sinval.h
-include/postgresql/server/storage/sinvaladt.h
-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/tcop/deparse_utility.h
-include/postgresql/server/tcop/dest.h
-include/postgresql/server/tcop/fastpath.h
-include/postgresql/server/tcop/pquery.h
-include/postgresql/server/tcop/tcopprot.h
-include/postgresql/server/tcop/utility.h
-include/postgresql/server/tsearch/dicts/regis.h
-include/postgresql/server/tsearch/dicts/spell.h
-include/postgresql/server/tsearch/ts_cache.h
-include/postgresql/server/tsearch/ts_locale.h
-include/postgresql/server/tsearch/ts_public.h
-include/postgresql/server/tsearch/ts_type.h
-include/postgresql/server/tsearch/ts_utils.h
-include/postgresql/server/utils/acl.h
-include/postgresql/server/utils/aclchk_internal.h
-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
-include/postgresql/server/utils/catcache.h
-include/postgresql/server/utils/combocid.h
-include/postgresql/server/utils/date.h
-include/postgresql/server/utils/datetime.h
-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/fmgroids.h
-include/postgresql/server/utils/fmgrprotos.h
-include/postgresql/server/utils/fmgrtab.h
-include/postgresql/server/utils/formatting.h
-include/postgresql/server/utils/freepage.h
-include/postgresql/server/utils/geo_decls.h
-include/postgresql/server/utils/guc.h
-include/postgresql/server/utils/guc_tables.h
-include/postgresql/server/utils/hashutils.h
-include/postgresql/server/utils/help_config.h
-include/postgresql/server/utils/hsearch.h
-include/postgresql/server/utils/index_selfuncs.h
-include/postgresql/server/utils/inet.h
-include/postgresql/server/utils/int8.h
-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/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/pg_crc.h
-include/postgresql/server/utils/pg_locale.h
-include/postgresql/server/utils/pg_lsn.h
-include/postgresql/server/utils/pg_rusage.h
-include/postgresql/server/utils/pidfile.h
-include/postgresql/server/utils/plancache.h
-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/rangetypes.h
-include/postgresql/server/utils/regproc.h
-include/postgresql/server/utils/rel.h
-include/postgresql/server/utils/relcache.h
-include/postgresql/server/utils/relfilenodemap.h
-include/postgresql/server/utils/relmapper.h
-include/postgresql/server/utils/relptr.h
-include/postgresql/server/utils/reltrigger.h
-include/postgresql/server/utils/resowner.h
-include/postgresql/server/utils/resowner_private.h
-include/postgresql/server/utils/rls.h
-include/postgresql/server/utils/ruleutils.h
-include/postgresql/server/utils/sampling.h
-include/postgresql/server/utils/selfuncs.h
-include/postgresql/server/utils/snapmgr.h
-include/postgresql/server/utils/snapshot.h
-include/postgresql/server/utils/sortsupport.h
-include/postgresql/server/utils/spccache.h
-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
-include/postgresql/server/utils/tzparser.h
-include/postgresql/server/utils/uuid.h
-include/postgresql/server/utils/varbit.h
-include/postgresql/server/utils/varlena.h
-include/postgresql/server/utils/xml.h
-include/postgresql/server/windowapi.h
-include/sql3types.h
-include/sqlca.h
-include/sqlda-compat.h
-include/sqlda-native.h
-include/sqlda.h
-lib/libecpg.a
-lib/libecpg.so
-lib/libecpg.so.6
-lib/libecpg_compat.a
-lib/libecpg_compat.so
-lib/libecpg_compat.so.3
-lib/libpgport.a
-lib/libpgtypes.a
-lib/libpgtypes.so
-lib/libpgtypes.so.3
-lib/libpq.a
-lib/libpq.so
-lib/libpq.so.5
-lib/postgresql/pgxs/config/install-sh
-lib/postgresql/pgxs/config/missing
-lib/postgresql/pgxs/src/Makefile.global
-lib/postgresql/pgxs/src/Makefile.port
-lib/postgresql/pgxs/src/Makefile.shlib
-lib/postgresql/pgxs/src/makefiles/pgxs.mk
-lib/postgresql/pgxs/src/nls-global.mk
-lib/postgresql/pgxs/src/test/regress/pg_regress
-libdata/pkgconfig/libecpg.pc
-libdata/pkgconfig/libecpg_compat.pc
-libdata/pkgconfig/libpgtypes.pc
-libdata/pkgconfig/libpq.pc
-man/man1/clusterdb.1.gz
-man/man1/createdb.1.gz
-man/man1/createuser.1.gz
-man/man1/dropdb.1.gz
-man/man1/dropuser.1.gz
-man/man1/ecpg.1.gz
-man/man1/initdb.1.gz
-man/man1/oid2name.1.gz
-man/man1/pg_archivecleanup.1.gz
-man/man1/pg_basebackup.1.gz
-man/man1/pg_config.1.gz
-man/man1/pg_controldata.1.gz
-man/man1/pg_ctl.1.gz
-man/man1/pg_dump.1.gz
-man/man1/pg_dumpall.1.gz
-man/man1/pg_isready.1.gz
-man/man1/pg_receivewal.1.gz
-man/man1/pg_recvlogical.1.gz
-man/man1/pg_resetwal.1.gz
-man/man1/pg_restore.1.gz
-man/man1/pg_rewind.1.gz
-man/man1/pg_standby.1.gz
-man/man1/pg_test_fsync.1.gz
-man/man1/pg_test_timing.1.gz
-man/man1/pg_upgrade.1.gz
-man/man1/pg_waldump.1.gz
-man/man1/pgbench.1.gz
-man/man1/postgres.1.gz
-man/man1/postmaster.1.gz
-man/man1/psql.1.gz
-man/man1/reindexdb.1.gz
-man/man1/vacuumdb.1.gz
-man/man1/vacuumlo.1.gz
-man/man3/SPI_connect.3.gz
-man/man3/SPI_copytuple.3.gz
-man/man3/SPI_cursor_close.3.gz
-man/man3/SPI_cursor_fetch.3.gz
-man/man3/SPI_cursor_find.3.gz
-man/man3/SPI_cursor_move.3.gz
-man/man3/SPI_cursor_open.3.gz
-man/man3/SPI_cursor_open_with_args.3.gz
-man/man3/SPI_cursor_open_with_paramlist.3.gz
-man/man3/SPI_exec.3.gz
-man/man3/SPI_execp.3.gz
-man/man3/SPI_execute.3.gz
-man/man3/SPI_execute_plan.3.gz
-man/man3/SPI_execute_plan_with_paramlist.3.gz
-man/man3/SPI_execute_with_args.3.gz
-man/man3/SPI_finish.3.gz
-man/man3/SPI_fname.3.gz
-man/man3/SPI_fnumber.3.gz
-man/man3/SPI_freeplan.3.gz
-man/man3/SPI_freetuple.3.gz
-man/man3/SPI_freetuptable.3.gz
-man/man3/SPI_getargcount.3.gz
-man/man3/SPI_getargtypeid.3.gz
-man/man3/SPI_getbinval.3.gz
-man/man3/SPI_getnspname.3.gz
-man/man3/SPI_getrelname.3.gz
-man/man3/SPI_gettype.3.gz
-man/man3/SPI_gettypeid.3.gz
-man/man3/SPI_getvalue.3.gz
-man/man3/SPI_is_cursor_plan.3.gz
-man/man3/SPI_keepplan.3.gz
-man/man3/SPI_modifytuple.3.gz
-man/man3/SPI_palloc.3.gz
-man/man3/SPI_pfree.3.gz
-man/man3/SPI_prepare.3.gz
-man/man3/SPI_prepare_cursor.3.gz
-man/man3/SPI_prepare_params.3.gz
-man/man3/SPI_register_relation.3.gz
-man/man3/SPI_register_trigger_data.3.gz
-man/man3/SPI_repalloc.3.gz
-man/man3/SPI_returntuple.3.gz
-man/man3/SPI_saveplan.3.gz
-man/man3/SPI_scroll_cursor_fetch.3.gz
-man/man3/SPI_scroll_cursor_move.3.gz
-man/man3/SPI_unregister_relation.3.gz
-man/man3/dblink.3.gz
-man/man3/dblink_build_sql_delete.3.gz
-man/man3/dblink_build_sql_insert.3.gz
-man/man3/dblink_build_sql_update.3.gz
-man/man3/dblink_cancel_query.3.gz
-man/man3/dblink_close.3.gz
-man/man3/dblink_connect.3.gz
-man/man3/dblink_connect_u.3.gz
-man/man3/dblink_disconnect.3.gz
-man/man3/dblink_error_message.3.gz
-man/man3/dblink_exec.3.gz
-man/man3/dblink_fetch.3.gz
-man/man3/dblink_get_connections.3.gz
-man/man3/dblink_get_notify.3.gz
-man/man3/dblink_get_pkey.3.gz
-man/man3/dblink_get_result.3.gz
-man/man3/dblink_is_busy.3.gz
-man/man3/dblink_open.3.gz
-man/man3/dblink_send_query.3.gz
-man/man7/ABORT.7.gz
-man/man7/ALTER_AGGREGATE.7.gz
-man/man7/ALTER_COLLATION.7.gz
-man/man7/ALTER_CONVERSION.7.gz
-man/man7/ALTER_DATABASE.7.gz
-man/man7/ALTER_DEFAULT_PRIVILEGES.7.gz
-man/man7/ALTER_DOMAIN.7.gz
-man/man7/ALTER_EVENT_TRIGGER.7.gz
-man/man7/ALTER_EXTENSION.7.gz
-man/man7/ALTER_FOREIGN_DATA_WRAPPER.7.gz
-man/man7/ALTER_FOREIGN_TABLE.7.gz
-man/man7/ALTER_FUNCTION.7.gz
-man/man7/ALTER_GROUP.7.gz
-man/man7/ALTER_INDEX.7.gz
-man/man7/ALTER_LANGUAGE.7.gz
-man/man7/ALTER_LARGE_OBJECT.7.gz
-man/man7/ALTER_MATERIALIZED_VIEW.7.gz
-man/man7/ALTER_OPERATOR.7.gz
-man/man7/ALTER_OPERATOR_CLASS.7.gz
-man/man7/ALTER_OPERATOR_FAMILY.7.gz
-man/man7/ALTER_POLICY.7.gz
-man/man7/ALTER_PUBLICATION.7.gz
-man/man7/ALTER_ROLE.7.gz
-man/man7/ALTER_RULE.7.gz
-man/man7/ALTER_SCHEMA.7.gz
-man/man7/ALTER_SEQUENCE.7.gz
-man/man7/ALTER_SERVER.7.gz
-man/man7/ALTER_STATISTICS.7.gz
-man/man7/ALTER_SUBSCRIPTION.7.gz
-man/man7/ALTER_SYSTEM.7.gz
-man/man7/ALTER_TABLE.7.gz
-man/man7/ALTER_TABLESPACE.7.gz
-man/man7/ALTER_TEXT_SEARCH_CONFIGURATION.7.gz
-man/man7/ALTER_TEXT_SEARCH_DICTIONARY.7.gz
-man/man7/ALTER_TEXT_SEARCH_PARSER.7.gz
-man/man7/ALTER_TEXT_SEARCH_TEMPLATE.7.gz
-man/man7/ALTER_TRIGGER.7.gz
-man/man7/ALTER_TYPE.7.gz
-man/man7/ALTER_USER.7.gz
-man/man7/ALTER_USER_MAPPING.7.gz
-man/man7/ALTER_VIEW.7.gz
-man/man7/ANALYZE.7.gz
-man/man7/BEGIN.7.gz
-man/man7/CHECKPOINT.7.gz
-man/man7/CLOSE.7.gz
-man/man7/CLUSTER.7.gz
-man/man7/COMMENT.7.gz
-man/man7/COMMIT.7.gz
-man/man7/COMMIT_PREPARED.7.gz
-man/man7/COPY.7.gz
-man/man7/CREATE_ACCESS_METHOD.7.gz
-man/man7/CREATE_AGGREGATE.7.gz
-man/man7/CREATE_CAST.7.gz
-man/man7/CREATE_COLLATION.7.gz
-man/man7/CREATE_CONVERSION.7.gz
-man/man7/CREATE_DATABASE.7.gz
-man/man7/CREATE_DOMAIN.7.gz
-man/man7/CREATE_EVENT_TRIGGER.7.gz
-man/man7/CREATE_EXTENSION.7.gz
-man/man7/CREATE_FOREIGN_DATA_WRAPPER.7.gz
-man/man7/CREATE_FOREIGN_TABLE.7.gz
-man/man7/CREATE_FUNCTION.7.gz
-man/man7/CREATE_GROUP.7.gz
-man/man7/CREATE_INDEX.7.gz
-man/man7/CREATE_LANGUAGE.7.gz
-man/man7/CREATE_MATERIALIZED_VIEW.7.gz
-man/man7/CREATE_OPERATOR.7.gz
-man/man7/CREATE_OPERATOR_CLASS.7.gz
-man/man7/CREATE_OPERATOR_FAMILY.7.gz
-man/man7/CREATE_POLICY.7.gz
-man/man7/CREATE_PUBLICATION.7.gz
-man/man7/CREATE_ROLE.7.gz
-man/man7/CREATE_RULE.7.gz
-man/man7/CREATE_SCHEMA.7.gz
-man/man7/CREATE_SEQUENCE.7.gz
-man/man7/CREATE_SERVER.7.gz
-man/man7/CREATE_STATISTICS.7.gz
-man/man7/CREATE_SUBSCRIPTION.7.gz
-man/man7/CREATE_TABLE.7.gz
-man/man7/CREATE_TABLESPACE.7.gz
-man/man7/CREATE_TABLE_AS.7.gz
-man/man7/CREATE_TEXT_SEARCH_CONFIGURATION.7.gz
-man/man7/CREATE_TEXT_SEARCH_DICTIONARY.7.gz
-man/man7/CREATE_TEXT_SEARCH_PARSER.7.gz
-man/man7/CREATE_TEXT_SEARCH_TEMPLATE.7.gz
-man/man7/CREATE_TRANSFORM.7.gz
-man/man7/CREATE_TRIGGER.7.gz
-man/man7/CREATE_TYPE.7.gz
-man/man7/CREATE_USER.7.gz
-man/man7/CREATE_USER_MAPPING.7.gz
-man/man7/CREATE_VIEW.7.gz
-man/man7/DEALLOCATE.7.gz
-man/man7/DECLARE.7.gz
-man/man7/DELETE.7.gz
-man/man7/DISCARD.7.gz
-man/man7/DO.7.gz
-man/man7/DROP_ACCESS_METHOD.7.gz
-man/man7/DROP_AGGREGATE.7.gz
-man/man7/DROP_CAST.7.gz
-man/man7/DROP_COLLATION.7.gz
-man/man7/DROP_CONVERSION.7.gz
-man/man7/DROP_DATABASE.7.gz
-man/man7/DROP_DOMAIN.7.gz
-man/man7/DROP_EVENT_TRIGGER.7.gz
-man/man7/DROP_EXTENSION.7.gz
-man/man7/DROP_FOREIGN_DATA_WRAPPER.7.gz
-man/man7/DROP_FOREIGN_TABLE.7.gz
-man/man7/DROP_FUNCTION.7.gz
-man/man7/DROP_GROUP.7.gz
-man/man7/DROP_INDEX.7.gz
-man/man7/DROP_LANGUAGE.7.gz
-man/man7/DROP_MATERIALIZED_VIEW.7.gz
-man/man7/DROP_OPERATOR.7.gz
-man/man7/DROP_OPERATOR_CLASS.7.gz
-man/man7/DROP_OPERATOR_FAMILY.7.gz
-man/man7/DROP_OWNED.7.gz
-man/man7/DROP_POLICY.7.gz
-man/man7/DROP_PUBLICATION.7.gz
-man/man7/DROP_ROLE.7.gz
-man/man7/DROP_RULE.7.gz
-man/man7/DROP_SCHEMA.7.gz
-man/man7/DROP_SEQUENCE.7.gz
-man/man7/DROP_SERVER.7.gz
-man/man7/DROP_STATISTICS.7.gz
-man/man7/DROP_SUBSCRIPTION.7.gz
-man/man7/DROP_TABLE.7.gz
-man/man7/DROP_TABLESPACE.7.gz
-man/man7/DROP_TEXT_SEARCH_CONFIGURATION.7.gz
-man/man7/DROP_TEXT_SEARCH_DICTIONARY.7.gz
-man/man7/DROP_TEXT_SEARCH_PARSER.7.gz
-man/man7/DROP_TEXT_SEARCH_TEMPLATE.7.gz
-man/man7/DROP_TRANSFORM.7.gz
-man/man7/DROP_TRIGGER.7.gz
-man/man7/DROP_TYPE.7.gz
-man/man7/DROP_USER.7.gz
-man/man7/DROP_USER_MAPPING.7.gz
-man/man7/DROP_VIEW.7.gz
-man/man7/END.7.gz
-man/man7/EXECUTE.7.gz
-man/man7/EXPLAIN.7.gz
-man/man7/FETCH.7.gz
-man/man7/GRANT.7.gz
-man/man7/IMPORT_FOREIGN_SCHEMA.7.gz
-man/man7/INSERT.7.gz
-man/man7/LISTEN.7.gz
-man/man7/LOAD.7.gz
-man/man7/LOCK.7.gz
-man/man7/MOVE.7.gz
-man/man7/NOTIFY.7.gz
-man/man7/PREPARE.7.gz
-man/man7/PREPARE_TRANSACTION.7.gz
-man/man7/REASSIGN_OWNED.7.gz
-man/man7/REFRESH_MATERIALIZED_VIEW.7.gz
-man/man7/REINDEX.7.gz
-man/man7/RELEASE_SAVEPOINT.7.gz
-man/man7/RESET.7.gz
-man/man7/REVOKE.7.gz
-man/man7/ROLLBACK.7.gz
-man/man7/ROLLBACK_PREPARED.7.gz
-man/man7/ROLLBACK_TO_SAVEPOINT.7.gz
-man/man7/SAVEPOINT.7.gz
-man/man7/SECURITY_LABEL.7.gz
-man/man7/SELECT.7.gz
-man/man7/SELECT_INTO.7.gz
-man/man7/SET.7.gz
-man/man7/SET_CONSTRAINTS.7.gz
-man/man7/SET_ROLE.7.gz
-man/man7/SET_SESSION_AUTHORIZATION.7.gz
-man/man7/SET_TRANSACTION.7.gz
-man/man7/SHOW.7.gz
-man/man7/START_TRANSACTION.7.gz
-man/man7/TABLE.7.gz
-man/man7/TRUNCATE.7.gz
-man/man7/UNLISTEN.7.gz
-man/man7/UPDATE.7.gz
-man/man7/VACUUM.7.gz
-man/man7/VALUES.7.gz
-man/man7/WITH.7.gz
-%%PORTDOCS%%%%DOCSDIR%%/README-client
-%%NLS%%share/locale/cs/LC_MESSAGES/ecpg-10.mo
-%%NLS%%share/locale/cs/LC_MESSAGES/ecpglib6-10.mo
-%%NLS%%share/locale/cs/LC_MESSAGES/libpq5-10.mo
-%%NLS%%share/locale/cs/LC_MESSAGES/pg_config-10.mo
-%%NLS%%share/locale/cs/LC_MESSAGES/pg_dump-10.mo
-%%NLS%%share/locale/cs/LC_MESSAGES/pgscripts-10.mo
-%%NLS%%share/locale/cs/LC_MESSAGES/psql-10.mo
-%%NLS%%share/locale/de/LC_MESSAGES/ecpg-10.mo
-%%NLS%%share/locale/de/LC_MESSAGES/ecpglib6-10.mo
-%%NLS%%share/locale/de/LC_MESSAGES/libpq5-10.mo
-%%NLS%%share/locale/de/LC_MESSAGES/pg_config-10.mo
-%%NLS%%share/locale/de/LC_MESSAGES/pg_dump-10.mo
-%%NLS%%share/locale/de/LC_MESSAGES/pgscripts-10.mo
-%%NLS%%share/locale/de/LC_MESSAGES/psql-10.mo
-%%NLS%%share/locale/es/LC_MESSAGES/ecpg-10.mo
-%%NLS%%share/locale/es/LC_MESSAGES/ecpglib6-10.mo
-%%NLS%%share/locale/es/LC_MESSAGES/libpq5-10.mo
-%%NLS%%share/locale/es/LC_MESSAGES/pg_config-10.mo
-%%NLS%%share/locale/es/LC_MESSAGES/pg_dump-10.mo
-%%NLS%%share/locale/es/LC_MESSAGES/pgscripts-10.mo
-%%NLS%%share/locale/es/LC_MESSAGES/psql-10.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/ecpg-10.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/ecpglib6-10.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/libpq5-10.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/pg_config-10.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/pg_dump-10.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/pgscripts-10.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/psql-10.mo
-%%NLS%%share/locale/he/LC_MESSAGES/libpq5-10.mo
-%%NLS%%share/locale/he/LC_MESSAGES/pg_config-10.mo
-%%NLS%%share/locale/he/LC_MESSAGES/pg_dump-10.mo
-%%NLS%%share/locale/he/LC_MESSAGES/pgscripts-10.mo
-%%NLS%%share/locale/he/LC_MESSAGES/psql-10.mo
-%%NLS%%share/locale/it/LC_MESSAGES/ecpg-10.mo
-%%NLS%%share/locale/it/LC_MESSAGES/ecpglib6-10.mo
-%%NLS%%share/locale/it/LC_MESSAGES/libpq5-10.mo
-%%NLS%%share/locale/it/LC_MESSAGES/pg_config-10.mo
-%%NLS%%share/locale/it/LC_MESSAGES/pg_dump-10.mo
-%%NLS%%share/locale/it/LC_MESSAGES/pgscripts-10.mo
-%%NLS%%share/locale/it/LC_MESSAGES/psql-10.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/ecpg-10.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/ecpglib6-10.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/libpq5-10.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/pg_config-10.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/pg_dump-10.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/pgscripts-10.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/psql-10.mo
-%%NLS%%share/locale/ko/LC_MESSAGES/ecpg-10.mo
-%%NLS%%share/locale/ko/LC_MESSAGES/ecpglib6-10.mo
-%%NLS%%share/locale/ko/LC_MESSAGES/libpq5-10.mo
-%%NLS%%share/locale/ko/LC_MESSAGES/pg_config-10.mo
-%%NLS%%share/locale/ko/LC_MESSAGES/pg_dump-10.mo
-%%NLS%%share/locale/ko/LC_MESSAGES/pgscripts-10.mo
-%%NLS%%share/locale/ko/LC_MESSAGES/psql-10.mo
-%%NLS%%share/locale/nb/LC_MESSAGES/pg_config-10.mo
-%%NLS%%share/locale/pl/LC_MESSAGES/ecpg-10.mo
-%%NLS%%share/locale/pl/LC_MESSAGES/ecpglib6-10.mo
-%%NLS%%share/locale/pl/LC_MESSAGES/libpq5-10.mo
-%%NLS%%share/locale/pl/LC_MESSAGES/pg_config-10.mo
-%%NLS%%share/locale/pl/LC_MESSAGES/pg_dump-10.mo
-%%NLS%%share/locale/pl/LC_MESSAGES/pgscripts-10.mo
-%%NLS%%share/locale/pl/LC_MESSAGES/psql-10.mo
-%%NLS%%share/locale/pt_BR/LC_MESSAGES/ecpg-10.mo
-%%NLS%%share/locale/pt_BR/LC_MESSAGES/ecpglib6-10.mo
-%%NLS%%share/locale/pt_BR/LC_MESSAGES/libpq5-10.mo
-%%NLS%%share/locale/pt_BR/LC_MESSAGES/pg_config-10.mo
-%%NLS%%share/locale/pt_BR/LC_MESSAGES/pg_dump-10.mo
-%%NLS%%share/locale/pt_BR/LC_MESSAGES/pgscripts-10.mo
-%%NLS%%share/locale/pt_BR/LC_MESSAGES/psql-10.mo
-%%NLS%%share/locale/ro/LC_MESSAGES/pg_config-10.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/ecpg-10.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/ecpglib6-10.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/libpq5-10.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/pg_config-10.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/pg_dump-10.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/pgscripts-10.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/psql-10.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/ecpg-10.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/ecpglib6-10.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/libpq5-10.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/pg_config-10.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/pg_dump-10.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/pgscripts-10.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/psql-10.mo
-%%NLS%%share/locale/ta/LC_MESSAGES/pg_config-10.mo
-%%NLS%%share/locale/tr/LC_MESSAGES/ecpg-10.mo
-%%NLS%%share/locale/tr/LC_MESSAGES/ecpglib6-10.mo
-%%NLS%%share/locale/tr/LC_MESSAGES/libpq5-10.mo
-%%NLS%%share/locale/tr/LC_MESSAGES/pg_config-10.mo
-%%NLS%%share/locale/tr/LC_MESSAGES/pg_dump-10.mo
-%%NLS%%share/locale/tr/LC_MESSAGES/pgscripts-10.mo
-%%NLS%%share/locale/tr/LC_MESSAGES/psql-10.mo
-%%NLS%%share/locale/zh_CN/LC_MESSAGES/ecpg-10.mo
-%%NLS%%share/locale/zh_CN/LC_MESSAGES/ecpglib6-10.mo
-%%NLS%%share/locale/zh_CN/LC_MESSAGES/libpq5-10.mo
-%%NLS%%share/locale/zh_CN/LC_MESSAGES/pg_config-10.mo
-%%NLS%%share/locale/zh_CN/LC_MESSAGES/pg_dump-10.mo
-%%NLS%%share/locale/zh_CN/LC_MESSAGES/pgscripts-10.mo
-%%NLS%%share/locale/zh_CN/LC_MESSAGES/psql-10.mo
-%%NLS%%share/locale/zh_TW/LC_MESSAGES/ecpg-10.mo
-%%NLS%%share/locale/zh_TW/LC_MESSAGES/pg_config-10.mo
-%%DATADIR%%/pg_service.conf.sample
-%%DATADIR%%/psqlrc.sample
-
diff --git a/databases/postgresql10-server/pkg-plist-contrib b/databases/postgresql10-server/pkg-plist-contrib
deleted file mode 100644
index 205bd5d4dc43..000000000000
--- a/databases/postgresql10-server/pkg-plist-contrib
+++ /dev/null
@@ -1,252 +0,0 @@
-bin/oid2name
-bin/pg_standby
-bin/vacuumlo
-lib/postgresql/_int.so
-lib/postgresql/adminpack.so
-lib/postgresql/amcheck.so
-lib/postgresql/auth_delay.so
-lib/postgresql/auto_explain.so
-lib/postgresql/autoinc.so
-lib/postgresql/bloom.so
-lib/postgresql/btree_gin.so
-lib/postgresql/btree_gist.so
-lib/postgresql/chkpass.so
-lib/postgresql/citext.so
-lib/postgresql/cube.so
-lib/postgresql/dblink.so
-lib/postgresql/dict_int.so
-lib/postgresql/dict_xsyn.so
-lib/postgresql/earthdistance.so
-lib/postgresql/file_fdw.so
-lib/postgresql/fuzzystrmatch.so
-lib/postgresql/hstore.so
-lib/postgresql/insert_username.so
-lib/postgresql/isn.so
-lib/postgresql/lo.so
-lib/postgresql/ltree.so
-lib/postgresql/moddatetime.so
-lib/postgresql/pageinspect.so
-lib/postgresql/passwordcheck.so
-lib/postgresql/pg_buffercache.so
-lib/postgresql/pg_freespacemap.so
-lib/postgresql/pg_prewarm.so
-lib/postgresql/pg_stat_statements.so
-lib/postgresql/pg_trgm.so
-lib/postgresql/pg_visibility.so
-lib/postgresql/pgcrypto.so
-lib/postgresql/pgrowlocks.so
-lib/postgresql/pgstattuple.so
-%%XML%%lib/postgresql/pgxml.so
-lib/postgresql/postgres_fdw.so
-lib/postgresql/refint.so
-lib/postgresql/seg.so
-lib/postgresql/sslinfo.so
-lib/postgresql/tablefunc.so
-lib/postgresql/tcn.so
-lib/postgresql/test_decoding.so
-lib/postgresql/timetravel.so
-lib/postgresql/tsm_system_rows.so
-lib/postgresql/tsm_system_time.so
-lib/postgresql/unaccent.so
-lib/postgresql/uuid-ossp.so
-%%PORTDOCS%%%%DOCSDIR%%/README-contrib
-%%PORTDOCS%%%%DOCSDIR%%/extension/README
-%%PORTDOCS%%%%DOCSDIR%%/extension/autoinc.example
-%%PORTDOCS%%%%DOCSDIR%%/extension/insert_username.example
-%%PORTDOCS%%%%DOCSDIR%%/extension/moddatetime.example
-%%PORTDOCS%%%%DOCSDIR%%/extension/refint.example
-%%PORTDOCS%%%%DOCSDIR%%/extension/timetravel.example
-%%DATADIR%%/extension/adminpack--1.0--1.1.sql
-%%DATADIR%%/extension/adminpack--1.0.sql
-%%DATADIR%%/extension/adminpack.control
-%%DATADIR%%/extension/amcheck--1.0.sql
-%%DATADIR%%/extension/amcheck.control
-%%DATADIR%%/extension/autoinc--1.0.sql
-%%DATADIR%%/extension/autoinc--unpackaged--1.0.sql
-%%DATADIR%%/extension/autoinc.control
-%%DATADIR%%/extension/bloom--1.0.sql
-%%DATADIR%%/extension/bloom.control
-%%DATADIR%%/extension/btree_gin--1.0--1.1.sql
-%%DATADIR%%/extension/btree_gin--1.0.sql
-%%DATADIR%%/extension/btree_gin--1.1--1.2.sql
-%%DATADIR%%/extension/btree_gin--unpackaged--1.0.sql
-%%DATADIR%%/extension/btree_gin.control
-%%DATADIR%%/extension/btree_gist--1.0--1.1.sql
-%%DATADIR%%/extension/btree_gist--1.1--1.2.sql
-%%DATADIR%%/extension/btree_gist--1.2--1.3.sql
-%%DATADIR%%/extension/btree_gist--1.2.sql
-%%DATADIR%%/extension/btree_gist--1.3--1.4.sql
-%%DATADIR%%/extension/btree_gist--1.4--1.5.sql
-%%DATADIR%%/extension/btree_gist--unpackaged--1.0.sql
-%%DATADIR%%/extension/btree_gist.control
-%%DATADIR%%/extension/chkpass--1.0.sql
-%%DATADIR%%/extension/chkpass--unpackaged--1.0.sql
-%%DATADIR%%/extension/chkpass.control
-%%DATADIR%%/extension/citext--1.0--1.1.sql
-%%DATADIR%%/extension/citext--1.1--1.2.sql
-%%DATADIR%%/extension/citext--1.2--1.3.sql
-%%DATADIR%%/extension/citext--1.3--1.4.sql
-%%DATADIR%%/extension/citext--1.4.sql
-%%DATADIR%%/extension/citext--unpackaged--1.0.sql
-%%DATADIR%%/extension/citext.control
-%%DATADIR%%/extension/cube--1.0--1.1.sql
-%%DATADIR%%/extension/cube--1.1--1.2.sql
-%%DATADIR%%/extension/cube--1.2.sql
-%%DATADIR%%/extension/cube--unpackaged--1.0.sql
-%%DATADIR%%/extension/cube.control
-%%DATADIR%%/extension/dblink--1.0--1.1.sql
-%%DATADIR%%/extension/dblink--1.1--1.2.sql
-%%DATADIR%%/extension/dblink--1.2.sql
-%%DATADIR%%/extension/dblink--unpackaged--1.0.sql
-%%DATADIR%%/extension/dblink.control
-%%DATADIR%%/extension/dict_int--1.0.sql
-%%DATADIR%%/extension/dict_int--unpackaged--1.0.sql
-%%DATADIR%%/extension/dict_int.control
-%%DATADIR%%/extension/dict_xsyn--1.0.sql
-%%DATADIR%%/extension/dict_xsyn--unpackaged--1.0.sql
-%%DATADIR%%/extension/dict_xsyn.control
-%%DATADIR%%/extension/earthdistance--1.0--1.1.sql
-%%DATADIR%%/extension/earthdistance--1.1.sql
-%%DATADIR%%/extension/earthdistance--unpackaged--1.0.sql
-%%DATADIR%%/extension/earthdistance.control
-%%DATADIR%%/extension/file_fdw--1.0.sql
-%%DATADIR%%/extension/file_fdw.control
-%%DATADIR%%/extension/fuzzystrmatch--1.0--1.1.sql
-%%DATADIR%%/extension/fuzzystrmatch--1.1.sql
-%%DATADIR%%/extension/fuzzystrmatch--unpackaged--1.0.sql
-%%DATADIR%%/extension/fuzzystrmatch.control
-%%DATADIR%%/extension/hstore--1.0--1.1.sql
-%%DATADIR%%/extension/hstore--1.1--1.2.sql
-%%DATADIR%%/extension/hstore--1.2--1.3.sql
-%%DATADIR%%/extension/hstore--1.3--1.4.sql
-%%DATADIR%%/extension/hstore--1.4.sql
-%%DATADIR%%/extension/hstore--unpackaged--1.0.sql
-%%DATADIR%%/extension/hstore.control
-%%DATADIR%%/extension/insert_username--1.0.sql
-%%DATADIR%%/extension/insert_username--unpackaged--1.0.sql
-%%DATADIR%%/extension/insert_username.control
-%%DATADIR%%/extension/intagg--1.0--1.1.sql
-%%DATADIR%%/extension/intagg--1.1.sql
-%%DATADIR%%/extension/intagg--unpackaged--1.0.sql
-%%DATADIR%%/extension/intagg.control
-%%DATADIR%%/extension/intarray--1.0--1.1.sql
-%%DATADIR%%/extension/intarray--1.1--1.2.sql
-%%DATADIR%%/extension/intarray--1.2.sql
-%%DATADIR%%/extension/intarray--unpackaged--1.0.sql
-%%DATADIR%%/extension/intarray.control
-%%DATADIR%%/extension/isn--1.0--1.1.sql
-%%DATADIR%%/extension/isn--1.1.sql
-%%DATADIR%%/extension/isn--unpackaged--1.0.sql
-%%DATADIR%%/extension/isn.control
-%%DATADIR%%/extension/lo--1.0--1.1.sql
-%%DATADIR%%/extension/lo--1.1.sql
-%%DATADIR%%/extension/lo--unpackaged--1.0.sql
-%%DATADIR%%/extension/lo.control
-%%DATADIR%%/extension/ltree--1.0--1.1.sql
-%%DATADIR%%/extension/ltree--1.1.sql
-%%DATADIR%%/extension/ltree--unpackaged--1.0.sql
-%%DATADIR%%/extension/ltree.control
-%%DATADIR%%/extension/moddatetime--1.0.sql
-%%DATADIR%%/extension/moddatetime--unpackaged--1.0.sql
-%%DATADIR%%/extension/moddatetime.control
-%%DATADIR%%/extension/pageinspect--1.0--1.1.sql
-%%DATADIR%%/extension/pageinspect--1.1--1.2.sql
-%%DATADIR%%/extension/pageinspect--1.2--1.3.sql
-%%DATADIR%%/extension/pageinspect--1.3--1.4.sql
-%%DATADIR%%/extension/pageinspect--1.4--1.5.sql
-%%DATADIR%%/extension/pageinspect--1.5--1.6.sql
-%%DATADIR%%/extension/pageinspect--1.5.sql
-%%DATADIR%%/extension/pageinspect--unpackaged--1.0.sql
-%%DATADIR%%/extension/pageinspect.control
-%%DATADIR%%/extension/pg_buffercache--1.0--1.1.sql
-%%DATADIR%%/extension/pg_buffercache--1.1--1.2.sql
-%%DATADIR%%/extension/pg_buffercache--1.2--1.3.sql
-%%DATADIR%%/extension/pg_buffercache--1.2.sql
-%%DATADIR%%/extension/pg_buffercache--unpackaged--1.0.sql
-%%DATADIR%%/extension/pg_buffercache.control
-%%DATADIR%%/extension/pg_freespacemap--1.0--1.1.sql
-%%DATADIR%%/extension/pg_freespacemap--1.1--1.2.sql
-%%DATADIR%%/extension/pg_freespacemap--1.1.sql
-%%DATADIR%%/extension/pg_freespacemap--unpackaged--1.0.sql
-%%DATADIR%%/extension/pg_freespacemap.control
-%%DATADIR%%/extension/pg_prewarm--1.0--1.1.sql
-%%DATADIR%%/extension/pg_prewarm--1.1.sql
-%%DATADIR%%/extension/pg_prewarm.control
-%%DATADIR%%/extension/pg_stat_statements--1.0--1.1.sql
-%%DATADIR%%/extension/pg_stat_statements--1.1--1.2.sql
-%%DATADIR%%/extension/pg_stat_statements--1.2--1.3.sql
-%%DATADIR%%/extension/pg_stat_statements--1.3--1.4.sql
-%%DATADIR%%/extension/pg_stat_statements--1.4--1.5.sql
-%%DATADIR%%/extension/pg_stat_statements--1.5--1.6.sql
-%%DATADIR%%/extension/pg_stat_statements--1.4.sql
-%%DATADIR%%/extension/pg_stat_statements--unpackaged--1.0.sql
-%%DATADIR%%/extension/pg_stat_statements.control
-%%DATADIR%%/extension/pg_trgm--1.0--1.1.sql
-%%DATADIR%%/extension/pg_trgm--1.1--1.2.sql
-%%DATADIR%%/extension/pg_trgm--1.2--1.3.sql
-%%DATADIR%%/extension/pg_trgm--1.3.sql
-%%DATADIR%%/extension/pg_trgm--unpackaged--1.0.sql
-%%DATADIR%%/extension/pg_trgm.control
-%%DATADIR%%/extension/pg_visibility--1.0--1.1.sql
-%%DATADIR%%/extension/pg_visibility--1.1--1.2.sql
-%%DATADIR%%/extension/pg_visibility--1.1.sql
-%%DATADIR%%/extension/pg_visibility.control
-%%DATADIR%%/extension/pgcrypto--1.0--1.1.sql
-%%DATADIR%%/extension/pgcrypto--1.1--1.2.sql
-%%DATADIR%%/extension/pgcrypto--1.2--1.3.sql
-%%DATADIR%%/extension/pgcrypto--1.3.sql
-%%DATADIR%%/extension/pgcrypto--unpackaged--1.0.sql
-%%DATADIR%%/extension/pgcrypto.control
-%%DATADIR%%/extension/pgrowlocks--1.0--1.1.sql
-%%DATADIR%%/extension/pgrowlocks--1.1--1.2.sql
-%%DATADIR%%/extension/pgrowlocks--1.2.sql
-%%DATADIR%%/extension/pgrowlocks--unpackaged--1.0.sql
-%%DATADIR%%/extension/pgrowlocks.control
-%%DATADIR%%/extension/pgstattuple--1.0--1.1.sql
-%%DATADIR%%/extension/pgstattuple--1.1--1.2.sql
-%%DATADIR%%/extension/pgstattuple--1.2--1.3.sql
-%%DATADIR%%/extension/pgstattuple--1.3--1.4.sql
-%%DATADIR%%/extension/pgstattuple--1.4--1.5.sql
-%%DATADIR%%/extension/pgstattuple--1.4.sql
-%%DATADIR%%/extension/pgstattuple--unpackaged--1.0.sql
-%%DATADIR%%/extension/pgstattuple.control
-%%DATADIR%%/extension/postgres_fdw--1.0.sql
-%%DATADIR%%/extension/postgres_fdw.control
-%%DATADIR%%/extension/refint--1.0.sql
-%%DATADIR%%/extension/refint--unpackaged--1.0.sql
-%%DATADIR%%/extension/refint.control
-%%DATADIR%%/extension/seg--1.0--1.1.sql
-%%DATADIR%%/extension/seg--1.1.sql
-%%DATADIR%%/extension/seg--unpackaged--1.0.sql
-%%DATADIR%%/extension/seg.control
-%%DATADIR%%/extension/sslinfo--1.0--1.1.sql
-%%DATADIR%%/extension/sslinfo--1.1--1.2.sql
-%%DATADIR%%/extension/sslinfo--1.2.sql
-%%DATADIR%%/extension/sslinfo--unpackaged--1.0.sql
-%%DATADIR%%/extension/sslinfo.control
-%%DATADIR%%/extension/tablefunc--1.0.sql
-%%DATADIR%%/extension/tablefunc--unpackaged--1.0.sql
-%%DATADIR%%/extension/tablefunc.control
-%%DATADIR%%/extension/tcn--1.0.sql
-%%DATADIR%%/extension/tcn.control
-%%DATADIR%%/extension/timetravel--1.0.sql
-%%DATADIR%%/extension/timetravel--unpackaged--1.0.sql
-%%DATADIR%%/extension/timetravel.control
-%%DATADIR%%/extension/tsm_system_rows--1.0.sql
-%%DATADIR%%/extension/tsm_system_rows.control
-%%DATADIR%%/extension/tsm_system_time--1.0.sql
-%%DATADIR%%/extension/tsm_system_time.control
-%%DATADIR%%/extension/unaccent--1.0--1.1.sql
-%%DATADIR%%/extension/unaccent--1.1.sql
-%%DATADIR%%/extension/unaccent--unpackaged--1.0.sql
-%%DATADIR%%/extension/unaccent.control
-%%DATADIR%%/extension/uuid-ossp--1.0--1.1.sql
-%%DATADIR%%/extension/uuid-ossp--1.1.sql
-%%DATADIR%%/extension/uuid-ossp--unpackaged--1.0.sql
-%%DATADIR%%/extension/uuid-ossp.control
-%%XML%%%%DATADIR%%/extension/xml2--1.0--1.1.sql
-%%XML%%%%DATADIR%%/extension/xml2--1.1.sql
-%%XML%%%%DATADIR%%/extension/xml2--unpackaged--1.0.sql
-%%XML%%%%DATADIR%%/extension/xml2.control
-%%DATADIR%%/tsearch_data/unaccent.rules
-%%DATADIR%%/tsearch_data/xsyn_sample.rules
diff --git a/databases/postgresql10-server/pkg-plist-plperl b/databases/postgresql10-server/pkg-plist-plperl
deleted file mode 100644
index 60809e548820..000000000000
--- a/databases/postgresql10-server/pkg-plist-plperl
+++ /dev/null
@@ -1,15 +0,0 @@
-include/postgresql/server/plperl.h
-include/postgresql/server/ppport.h
-%%DATADIR%%/extension/plperlu--1.0.sql
-%%DATADIR%%/extension/plperl.control
-%%DATADIR%%/extension/plperl--1.0.sql
-%%DATADIR%%/extension/plperlu.control
-%%DATADIR%%/extension/plperlu--unpackaged--1.0.sql
-%%DATADIR%%/extension/plperl--unpackaged--1.0.sql
-%%DOCSDIR%%/README-plperl
-lib/postgresql/plperl.so
-lib/postgresql/hstore_plperl.so
-%%DATADIR%%/extension/hstore_plperl--1.0.sql
-%%DATADIR%%/extension/hstore_plperl.control
-%%DATADIR%%/extension/hstore_plperlu--1.0.sql
-%%DATADIR%%/extension/hstore_plperlu.control
diff --git a/databases/postgresql10-server/pkg-plist-plpython b/databases/postgresql10-server/pkg-plist-plpython
deleted file mode 100644
index 592925659278..000000000000
--- a/databases/postgresql10-server/pkg-plist-plpython
+++ /dev/null
@@ -1,28 +0,0 @@
-include/postgresql/server/plpy_util.h
-include/postgresql/server/plpython.h
-%%DOCSDIR%%/README-plpython
-%%PYTHON2%%lib/postgresql/plpython2.so
-%%PYTHON3%%lib/postgresql/plpython3.so
-%%PYTHON2%%%%DATADIR%%/extension/plpython2u--1.0.sql
-%%PYTHON2%%%%DATADIR%%/extension/plpython2u--unpackaged--1.0.sql
-%%PYTHON2%%%%DATADIR%%/extension/plpython2u.control
-%%PYTHON3%%%%DATADIR%%/extension/plpython3u--1.0.sql
-%%PYTHON3%%%%DATADIR%%/extension/plpython3u--unpackaged--1.0.sql
-%%PYTHON3%%%%DATADIR%%/extension/plpython3u.control
-%%PYTHON2%%%%DATADIR%%/extension/plpythonu--1.0.sql
-%%PYTHON2%%%%DATADIR%%/extension/plpythonu--unpackaged--1.0.sql
-%%PYTHON2%%%%DATADIR%%/extension/plpythonu.control
-lib/postgresql/hstore_plpython3.so
-lib/postgresql/ltree_plpython3.so
-%%DATADIR%%/extension/hstore_plpython2u--1.0.sql
-%%DATADIR%%/extension/hstore_plpython2u.control
-%%DATADIR%%/extension/hstore_plpython3u--1.0.sql
-%%DATADIR%%/extension/hstore_plpython3u.control
-%%DATADIR%%/extension/hstore_plpythonu--1.0.sql
-%%DATADIR%%/extension/hstore_plpythonu.control
-%%DATADIR%%/extension/ltree_plpython2u--1.0.sql
-%%DATADIR%%/extension/ltree_plpython2u.control
-%%DATADIR%%/extension/ltree_plpython3u--1.0.sql
-%%DATADIR%%/extension/ltree_plpython3u.control
-%%DATADIR%%/extension/ltree_plpythonu--1.0.sql
-%%DATADIR%%/extension/ltree_plpythonu.control
diff --git a/databases/postgresql10-server/pkg-plist-pltcl b/databases/postgresql10-server/pkg-plist-pltcl
deleted file mode 100644
index 348e5921ddce..000000000000
--- a/databases/postgresql10-server/pkg-plist-pltcl
+++ /dev/null
@@ -1,8 +0,0 @@
-%%DATADIR%%/extension/pltcl--1.0.sql
-%%DATADIR%%/extension/pltcl.control
-%%DATADIR%%/extension/pltclu.control
-%%DATADIR%%/extension/pltclu--1.0.sql
-%%DATADIR%%/extension/pltcl--unpackaged--1.0.sql
-%%DATADIR%%/extension/pltclu--unpackaged--1.0.sql
-%%DOCSDIR%%/README-pltcl
-lib/postgresql/pltcl.so
diff --git a/databases/postgresql10-server/pkg-plist-server b/databases/postgresql10-server/pkg-plist-server
deleted file mode 100644
index 8d3af831ba5f..000000000000
--- a/databases/postgresql10-server/pkg-plist-server
+++ /dev/null
@@ -1,847 +0,0 @@
-bin/initdb
-bin/pg_archivecleanup
-bin/pg_basebackup
-bin/pg_controldata
-bin/pg_ctl
-bin/pg_receivewal
-bin/pg_recvlogical
-bin/pg_resetwal
-bin/pg_rewind
-bin/pg_test_fsync
-bin/pg_test_timing
-bin/pg_upgrade
-bin/pg_waldump
-bin/postgres
-bin/postmaster
-etc/periodic/daily/502.pgsql
-include/postgresql/server/plpgsql.h
-lib/postgresql/ascii_and_mic.so
-lib/postgresql/cyrillic_and_mic.so
-lib/postgresql/dict_snowball.so
-lib/postgresql/euc2004_sjis2004.so
-lib/postgresql/euc_cn_and_mic.so
-lib/postgresql/euc_jp_and_sjis.so
-lib/postgresql/euc_kr_and_mic.so
-lib/postgresql/euc_tw_and_big5.so
-lib/postgresql/latin2_and_win1250.so
-lib/postgresql/latin_and_mic.so
-lib/postgresql/libpqwalreceiver.so
-lib/postgresql/pgoutput.so
-lib/postgresql/plpgsql.so
-lib/postgresql/utf8_and_ascii.so
-lib/postgresql/utf8_and_big5.so
-lib/postgresql/utf8_and_cyrillic.so
-lib/postgresql/utf8_and_euc2004.so
-lib/postgresql/utf8_and_euc_cn.so
-lib/postgresql/utf8_and_euc_jp.so
-lib/postgresql/utf8_and_euc_kr.so
-lib/postgresql/utf8_and_euc_tw.so
-lib/postgresql/utf8_and_gb18030.so
-lib/postgresql/utf8_and_gbk.so
-lib/postgresql/utf8_and_iso8859.so
-lib/postgresql/utf8_and_iso8859_1.so
-lib/postgresql/utf8_and_johab.so
-lib/postgresql/utf8_and_sjis.so
-lib/postgresql/utf8_and_sjis2004.so
-lib/postgresql/utf8_and_uhc.so
-lib/postgresql/utf8_and_win.so
-lib/libpgcommon.a
-%%PORTDOCS%%%%DOCSDIR%%/README-server
-%%DATADIR%%/conversion_create.sql
-%%DATADIR%%/information_schema.sql
-%%DATADIR%%/pg_hba.conf.sample
-%%DATADIR%%/pg_ident.conf.sample
-%%DATADIR%%/postgres.bki
-%%DATADIR%%/postgres.description
-%%DATADIR%%/postgresql.conf.sample
-%%DATADIR%%/recovery.conf.sample
-%%DATADIR%%/sql_features.txt
-%%DATADIR%%/system_views.sql
-%%DATADIR%%/extension/plpgsql--1.0.sql
-%%DATADIR%%/extension/plpgsql--unpackaged--1.0.sql
-%%DATADIR%%/extension/plpgsql.control
-%%DATADIR%%/postgres.shdescription
-%%NLS%%share/locale/cs/LC_MESSAGES/initdb-10.mo
-%%NLS%%share/locale/cs/LC_MESSAGES/pg_archivecleanup-10.mo
-%%NLS%%share/locale/cs/LC_MESSAGES/pg_basebackup-10.mo
-%%NLS%%share/locale/cs/LC_MESSAGES/pg_controldata-10.mo
-%%NLS%%share/locale/cs/LC_MESSAGES/pg_ctl-10.mo
-%%NLS%%share/locale/cs/LC_MESSAGES/pg_resetwal-10.mo
-%%NLS%%share/locale/cs/LC_MESSAGES/pg_rewind-10.mo
-%%NLS%%share/locale/cs/LC_MESSAGES/pg_test_fsync-10.mo
-%%NLS%%share/locale/cs/LC_MESSAGES/pg_test_timing-10.mo
-%%NLS%%share/locale/cs/LC_MESSAGES/pg_upgrade-10.mo
-%%NLS%%share/locale/cs/LC_MESSAGES/pg_waldump-10.mo
-%%NLS%%share/locale/cs/LC_MESSAGES/plpgsql-10.mo
-%%NLS%%share/locale/de/LC_MESSAGES/initdb-10.mo
-%%NLS%%share/locale/de/LC_MESSAGES/pg_archivecleanup-10.mo
-%%NLS%%share/locale/de/LC_MESSAGES/pg_basebackup-10.mo
-%%NLS%%share/locale/de/LC_MESSAGES/pg_controldata-10.mo
-%%NLS%%share/locale/de/LC_MESSAGES/pg_ctl-10.mo
-%%NLS%%share/locale/de/LC_MESSAGES/pg_resetwal-10.mo
-%%NLS%%share/locale/de/LC_MESSAGES/pg_rewind-10.mo
-%%NLS%%share/locale/de/LC_MESSAGES/pg_test_fsync-10.mo
-%%NLS%%share/locale/de/LC_MESSAGES/pg_test_timing-10.mo
-%%NLS%%share/locale/de/LC_MESSAGES/pg_upgrade-10.mo
-%%NLS%%share/locale/de/LC_MESSAGES/pg_waldump-10.mo
-%%NLS%%share/locale/de/LC_MESSAGES/plpgsql-10.mo
-%%NLS%%share/locale/de/LC_MESSAGES/postgres-10.mo
-%%NLS%%share/locale/es/LC_MESSAGES/initdb-10.mo
-%%NLS%%share/locale/es/LC_MESSAGES/pg_archivecleanup-10.mo
-%%NLS%%share/locale/es/LC_MESSAGES/pg_basebackup-10.mo
-%%NLS%%share/locale/es/LC_MESSAGES/pg_controldata-10.mo
-%%NLS%%share/locale/es/LC_MESSAGES/pg_ctl-10.mo
-%%NLS%%share/locale/es/LC_MESSAGES/pg_resetwal-10.mo
-%%NLS%%share/locale/es/LC_MESSAGES/pg_rewind-10.mo
-%%NLS%%share/locale/es/LC_MESSAGES/pg_test_fsync-10.mo
-%%NLS%%share/locale/es/LC_MESSAGES/pg_test_timing-10.mo
-%%NLS%%share/locale/es/LC_MESSAGES/pg_upgrade-10.mo
-%%NLS%%share/locale/es/LC_MESSAGES/pg_waldump-10.mo
-%%NLS%%share/locale/es/LC_MESSAGES/plpgsql-10.mo
-%%NLS%%share/locale/es/LC_MESSAGES/postgres-10.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/initdb-10.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/pg_archivecleanup-10.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/pg_basebackup-10.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/pg_controldata-10.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/pg_ctl-10.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/pg_resetwal-10.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/pg_rewind-10.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/pg_test_fsync-10.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/pg_test_timing-10.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/pg_upgrade-10.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/pg_waldump-10.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/plpgsql-10.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/postgres-10.mo
-%%NLS%%share/locale/he/LC_MESSAGES/initdb-10.mo
-%%NLS%%share/locale/he/LC_MESSAGES/pg_basebackup-10.mo
-%%NLS%%share/locale/he/LC_MESSAGES/pg_ctl-10.mo
-%%NLS%%share/locale/it/LC_MESSAGES/initdb-10.mo
-%%NLS%%share/locale/it/LC_MESSAGES/pg_basebackup-10.mo
-%%NLS%%share/locale/it/LC_MESSAGES/pg_controldata-10.mo
-%%NLS%%share/locale/it/LC_MESSAGES/pg_ctl-10.mo
-%%NLS%%share/locale/it/LC_MESSAGES/pg_rewind-10.mo
-%%NLS%%share/locale/it/LC_MESSAGES/plpgsql-10.mo
-%%NLS%%share/locale/it/LC_MESSAGES/postgres-10.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/initdb-10.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/pg_archivecleanup-10.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/pg_basebackup-10.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/pg_controldata-10.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/pg_ctl-10.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/pg_resetwal-10.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/pg_rewind-10.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/pg_test_fsync-10.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/pg_test_timing-10.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/pg_upgrade-10.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/pg_waldump-10.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/plpgsql-10.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/postgres-10.mo
-%%NLS%%share/locale/ko/LC_MESSAGES/initdb-10.mo
-%%NLS%%share/locale/ko/LC_MESSAGES/pg_archivecleanup-10.mo
-%%NLS%%share/locale/ko/LC_MESSAGES/pg_basebackup-10.mo
-%%NLS%%share/locale/ko/LC_MESSAGES/pg_controldata-10.mo
-%%NLS%%share/locale/ko/LC_MESSAGES/pg_ctl-10.mo
-%%NLS%%share/locale/ko/LC_MESSAGES/pg_resetwal-10.mo
-%%NLS%%share/locale/ko/LC_MESSAGES/pg_rewind-10.mo
-%%NLS%%share/locale/ko/LC_MESSAGES/pg_test_fsync-10.mo
-%%NLS%%share/locale/ko/LC_MESSAGES/pg_test_timing-10.mo
-%%NLS%%share/locale/ko/LC_MESSAGES/pg_upgrade-10.mo
-%%NLS%%share/locale/ko/LC_MESSAGES/pg_waldump-10.mo
-%%NLS%%share/locale/ko/LC_MESSAGES/plpgsql-10.mo
-%%NLS%%share/locale/ko/LC_MESSAGES/postgres-10.mo
-%%NLS%%share/locale/pl/LC_MESSAGES/initdb-10.mo
-%%NLS%%share/locale/pl/LC_MESSAGES/pg_archivecleanup-10.mo
-%%NLS%%share/locale/pl/LC_MESSAGES/pg_basebackup-10.mo
-%%NLS%%share/locale/pl/LC_MESSAGES/pg_controldata-10.mo
-%%NLS%%share/locale/pl/LC_MESSAGES/pg_ctl-10.mo
-%%NLS%%share/locale/pl/LC_MESSAGES/pg_resetwal-10.mo
-%%NLS%%share/locale/pl/LC_MESSAGES/pg_rewind-10.mo
-%%NLS%%share/locale/pl/LC_MESSAGES/pg_test_fsync-10.mo
-%%NLS%%share/locale/pl/LC_MESSAGES/pg_test_timing-10.mo
-%%NLS%%share/locale/pl/LC_MESSAGES/plpgsql-10.mo
-%%NLS%%share/locale/pl/LC_MESSAGES/postgres-10.mo
-%%NLS%%share/locale/pt_BR/LC_MESSAGES/initdb-10.mo
-%%NLS%%share/locale/pt_BR/LC_MESSAGES/pg_controldata-10.mo
-%%NLS%%share/locale/pt_BR/LC_MESSAGES/pg_ctl-10.mo
-%%NLS%%share/locale/pt_BR/LC_MESSAGES/pg_resetwal-10.mo
-%%NLS%%share/locale/pt_BR/LC_MESSAGES/pg_rewind-10.mo
-%%NLS%%share/locale/pt_BR/LC_MESSAGES/plpgsql-10.mo
-%%NLS%%share/locale/ro/LC_MESSAGES/plpgsql-10.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/initdb-10.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/pg_archivecleanup-10.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/pg_basebackup-10.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/pg_controldata-10.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/pg_ctl-10.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/pg_resetwal-10.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/pg_rewind-10.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/pg_test_fsync-10.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/pg_test_timing-10.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/pg_upgrade-10.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/pg_waldump-10.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/plpgsql-10.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/postgres-10.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/initdb-10.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/pg_archivecleanup-10.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/pg_basebackup-10.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/pg_controldata-10.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/pg_ctl-10.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/pg_resetwal-10.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/pg_rewind-10.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/pg_test_fsync-10.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/pg_test_timing-10.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/pg_upgrade-10.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/pg_waldump-10.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/plpgsql-10.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/postgres-10.mo
-%%NLS%%share/locale/tr/LC_MESSAGES/initdb-10.mo
-%%NLS%%share/locale/tr/LC_MESSAGES/pg_archivecleanup-10.mo
-%%NLS%%share/locale/tr/LC_MESSAGES/pg_basebackup-10.mo
-%%NLS%%share/locale/tr/LC_MESSAGES/pg_controldata-10.mo
-%%NLS%%share/locale/tr/LC_MESSAGES/pg_ctl-10.mo
-%%NLS%%share/locale/tr/LC_MESSAGES/pg_resetwal-10.mo
-%%NLS%%share/locale/tr/LC_MESSAGES/pg_rewind-10.mo
-%%NLS%%share/locale/tr/LC_MESSAGES/pg_test_fsync-10.mo
-%%NLS%%share/locale/tr/LC_MESSAGES/pg_test_timing-10.mo
-%%NLS%%share/locale/tr/LC_MESSAGES/pg_upgrade-10.mo
-%%NLS%%share/locale/tr/LC_MESSAGES/pg_waldump-10.mo
-%%NLS%%share/locale/tr/LC_MESSAGES/plpgsql-10.mo
-%%NLS%%share/locale/tr/LC_MESSAGES/postgres-10.mo
-%%NLS%%share/locale/zh_CN/LC_MESSAGES/initdb-10.mo
-%%NLS%%share/locale/zh_CN/LC_MESSAGES/pg_controldata-10.mo
-%%NLS%%share/locale/zh_CN/LC_MESSAGES/pg_ctl-10.mo
-%%NLS%%share/locale/zh_CN/LC_MESSAGES/pg_resetwal-10.mo
-%%NLS%%share/locale/zh_CN/LC_MESSAGES/pg_rewind-10.mo
-%%NLS%%share/locale/zh_CN/LC_MESSAGES/plpgsql-10.mo
-%%NLS%%share/locale/zh_CN/LC_MESSAGES/postgres-10.mo
-%%NLS%%share/locale/zh_TW/LC_MESSAGES/plpgsql-10.mo
-%%DATADIR%%/snowball_create.sql
-%%TZDATA%%%%DATADIR%%/timezone/Africa/Abidjan
-%%TZDATA%%%%DATADIR%%/timezone/Africa/Accra
-%%TZDATA%%%%DATADIR%%/timezone/Africa/Addis_Ababa
-%%TZDATA%%%%DATADIR%%/timezone/Africa/Algiers
-%%TZDATA%%%%DATADIR%%/timezone/Africa/Asmara
-%%TZDATA%%%%DATADIR%%/timezone/Africa/Asmera
-%%TZDATA%%%%DATADIR%%/timezone/Africa/Bamako
-%%TZDATA%%%%DATADIR%%/timezone/Africa/Bangui
-%%TZDATA%%%%DATADIR%%/timezone/Africa/Banjul
-%%TZDATA%%%%DATADIR%%/timezone/Africa/Bissau
-%%TZDATA%%%%DATADIR%%/timezone/Africa/Blantyre
-%%TZDATA%%%%DATADIR%%/timezone/Africa/Brazzaville
-%%TZDATA%%%%DATADIR%%/timezone/Africa/Bujumbura
-%%TZDATA%%%%DATADIR%%/timezone/Africa/Cairo
-%%TZDATA%%%%DATADIR%%/timezone/Africa/Casablanca
-%%TZDATA%%%%DATADIR%%/timezone/Africa/Ceuta
-%%TZDATA%%%%DATADIR%%/timezone/Africa/Conakry
-%%TZDATA%%%%DATADIR%%/timezone/Africa/Dakar
-%%TZDATA%%%%DATADIR%%/timezone/Africa/Dar_es_Salaam
-%%TZDATA%%%%DATADIR%%/timezone/Africa/Djibouti
-%%TZDATA%%%%DATADIR%%/timezone/Africa/Douala
-%%TZDATA%%%%DATADIR%%/timezone/Africa/El_Aaiun
-%%TZDATA%%%%DATADIR%%/timezone/Africa/Freetown
-%%TZDATA%%%%DATADIR%%/timezone/Africa/Gaborone
-%%TZDATA%%%%DATADIR%%/timezone/Africa/Harare
-%%TZDATA%%%%DATADIR%%/timezone/Africa/Johannesburg
-%%TZDATA%%%%DATADIR%%/timezone/Africa/Juba
-%%TZDATA%%%%DATADIR%%/timezone/Africa/Kampala
-%%TZDATA%%%%DATADIR%%/timezone/Africa/Khartoum
-%%TZDATA%%%%DATADIR%%/timezone/Africa/Kigali
-%%TZDATA%%%%DATADIR%%/timezone/Africa/Kinshasa
-%%TZDATA%%%%DATADIR%%/timezone/Africa/Lagos
-%%TZDATA%%%%DATADIR%%/timezone/Africa/Libreville
-%%TZDATA%%%%DATADIR%%/timezone/Africa/Lome
-%%TZDATA%%%%DATADIR%%/timezone/Africa/Luanda
-%%TZDATA%%%%DATADIR%%/timezone/Africa/Lubumbashi
-%%TZDATA%%%%DATADIR%%/timezone/Africa/Lusaka
-%%TZDATA%%%%DATADIR%%/timezone/Africa/Malabo
-%%TZDATA%%%%DATADIR%%/timezone/Africa/Maputo
-%%TZDATA%%%%DATADIR%%/timezone/Africa/Maseru
-%%TZDATA%%%%DATADIR%%/timezone/Africa/Mbabane
-%%TZDATA%%%%DATADIR%%/timezone/Africa/Mogadishu
-%%TZDATA%%%%DATADIR%%/timezone/Africa/Monrovia
-%%TZDATA%%%%DATADIR%%/timezone/Africa/Nairobi
-%%TZDATA%%%%DATADIR%%/timezone/Africa/Ndjamena
-%%TZDATA%%%%DATADIR%%/timezone/Africa/Niamey
-%%TZDATA%%%%DATADIR%%/timezone/Africa/Nouakchott
-%%TZDATA%%%%DATADIR%%/timezone/Africa/Ouagadougou
-%%TZDATA%%%%DATADIR%%/timezone/Africa/Porto-Novo
-%%TZDATA%%%%DATADIR%%/timezone/Africa/Sao_Tome
-%%TZDATA%%%%DATADIR%%/timezone/Africa/Timbuktu
-%%TZDATA%%%%DATADIR%%/timezone/Africa/Tripoli
-%%TZDATA%%%%DATADIR%%/timezone/Africa/Tunis
-%%TZDATA%%%%DATADIR%%/timezone/Africa/Windhoek
-%%TZDATA%%%%DATADIR%%/timezone/America/Adak
-%%TZDATA%%%%DATADIR%%/timezone/America/Anchorage
-%%TZDATA%%%%DATADIR%%/timezone/America/Anguilla
-%%TZDATA%%%%DATADIR%%/timezone/America/Antigua
-%%TZDATA%%%%DATADIR%%/timezone/America/Araguaina
-%%TZDATA%%%%DATADIR%%/timezone/America/Argentina/Buenos_Aires
-%%TZDATA%%%%DATADIR%%/timezone/America/Argentina/Catamarca
-%%TZDATA%%%%DATADIR%%/timezone/America/Argentina/ComodRivadavia
-%%TZDATA%%%%DATADIR%%/timezone/America/Argentina/Cordoba
-%%TZDATA%%%%DATADIR%%/timezone/America/Argentina/Jujuy
-%%TZDATA%%%%DATADIR%%/timezone/America/Argentina/La_Rioja
-%%TZDATA%%%%DATADIR%%/timezone/America/Argentina/Mendoza
-%%TZDATA%%%%DATADIR%%/timezone/America/Argentina/Rio_Gallegos
-%%TZDATA%%%%DATADIR%%/timezone/America/Argentina/Salta
-%%TZDATA%%%%DATADIR%%/timezone/America/Argentina/San_Juan
-%%TZDATA%%%%DATADIR%%/timezone/America/Argentina/San_Luis
-%%TZDATA%%%%DATADIR%%/timezone/America/Argentina/Tucuman
-%%TZDATA%%%%DATADIR%%/timezone/America/Argentina/Ushuaia
-%%TZDATA%%%%DATADIR%%/timezone/America/Aruba
-%%TZDATA%%%%DATADIR%%/timezone/America/Asuncion
-%%TZDATA%%%%DATADIR%%/timezone/America/Atikokan
-%%TZDATA%%%%DATADIR%%/timezone/America/Atka
-%%TZDATA%%%%DATADIR%%/timezone/America/Bahia
-%%TZDATA%%%%DATADIR%%/timezone/America/Bahia_Banderas
-%%TZDATA%%%%DATADIR%%/timezone/America/Barbados
-%%TZDATA%%%%DATADIR%%/timezone/America/Belem
-%%TZDATA%%%%DATADIR%%/timezone/America/Belize
-%%TZDATA%%%%DATADIR%%/timezone/America/Blanc-Sablon
-%%TZDATA%%%%DATADIR%%/timezone/America/Boa_Vista
-%%TZDATA%%%%DATADIR%%/timezone/America/Bogota
-%%TZDATA%%%%DATADIR%%/timezone/America/Boise
-%%TZDATA%%%%DATADIR%%/timezone/America/Buenos_Aires
-%%TZDATA%%%%DATADIR%%/timezone/America/Cambridge_Bay
-%%TZDATA%%%%DATADIR%%/timezone/America/Campo_Grande
-%%TZDATA%%%%DATADIR%%/timezone/America/Cancun
-%%TZDATA%%%%DATADIR%%/timezone/America/Caracas
-%%TZDATA%%%%DATADIR%%/timezone/America/Catamarca
-%%TZDATA%%%%DATADIR%%/timezone/America/Cayenne
-%%TZDATA%%%%DATADIR%%/timezone/America/Cayman
-%%TZDATA%%%%DATADIR%%/timezone/America/Chicago
-%%TZDATA%%%%DATADIR%%/timezone/America/Chihuahua
-%%TZDATA%%%%DATADIR%%/timezone/America/Coral_Harbour
-%%TZDATA%%%%DATADIR%%/timezone/America/Cordoba
-%%TZDATA%%%%DATADIR%%/timezone/America/Costa_Rica
-%%TZDATA%%%%DATADIR%%/timezone/America/Creston
-%%TZDATA%%%%DATADIR%%/timezone/America/Cuiaba
-%%TZDATA%%%%DATADIR%%/timezone/America/Curacao
-%%TZDATA%%%%DATADIR%%/timezone/America/Danmarkshavn
-%%TZDATA%%%%DATADIR%%/timezone/America/Dawson
-%%TZDATA%%%%DATADIR%%/timezone/America/Dawson_Creek
-%%TZDATA%%%%DATADIR%%/timezone/America/Denver
-%%TZDATA%%%%DATADIR%%/timezone/America/Detroit
-%%TZDATA%%%%DATADIR%%/timezone/America/Dominica
-%%TZDATA%%%%DATADIR%%/timezone/America/Edmonton
-%%TZDATA%%%%DATADIR%%/timezone/America/Eirunepe
-%%TZDATA%%%%DATADIR%%/timezone/America/El_Salvador
-%%TZDATA%%%%DATADIR%%/timezone/America/Ensenada
-%%TZDATA%%%%DATADIR%%/timezone/America/Fort_Nelson
-%%TZDATA%%%%DATADIR%%/timezone/America/Fort_Wayne
-%%TZDATA%%%%DATADIR%%/timezone/America/Fortaleza
-%%TZDATA%%%%DATADIR%%/timezone/America/Glace_Bay
-%%TZDATA%%%%DATADIR%%/timezone/America/Godthab
-%%TZDATA%%%%DATADIR%%/timezone/America/Goose_Bay
-%%TZDATA%%%%DATADIR%%/timezone/America/Grand_Turk
-%%TZDATA%%%%DATADIR%%/timezone/America/Grenada
-%%TZDATA%%%%DATADIR%%/timezone/America/Guadeloupe
-%%TZDATA%%%%DATADIR%%/timezone/America/Guatemala
-%%TZDATA%%%%DATADIR%%/timezone/America/Guayaquil
-%%TZDATA%%%%DATADIR%%/timezone/America/Guyana
-%%TZDATA%%%%DATADIR%%/timezone/America/Halifax
-%%TZDATA%%%%DATADIR%%/timezone/America/Havana
-%%TZDATA%%%%DATADIR%%/timezone/America/Hermosillo
-%%TZDATA%%%%DATADIR%%/timezone/America/Indiana/Indianapolis
-%%TZDATA%%%%DATADIR%%/timezone/America/Indiana/Knox
-%%TZDATA%%%%DATADIR%%/timezone/America/Indiana/Marengo
-%%TZDATA%%%%DATADIR%%/timezone/America/Indiana/Petersburg
-%%TZDATA%%%%DATADIR%%/timezone/America/Indiana/Tell_City
-%%TZDATA%%%%DATADIR%%/timezone/America/Indiana/Vevay
-%%TZDATA%%%%DATADIR%%/timezone/America/Indiana/Vincennes
-%%TZDATA%%%%DATADIR%%/timezone/America/Indiana/Winamac
-%%TZDATA%%%%DATADIR%%/timezone/America/Indianapolis
-%%TZDATA%%%%DATADIR%%/timezone/America/Inuvik
-%%TZDATA%%%%DATADIR%%/timezone/America/Iqaluit
-%%TZDATA%%%%DATADIR%%/timezone/America/Jamaica
-%%TZDATA%%%%DATADIR%%/timezone/America/Jujuy
-%%TZDATA%%%%DATADIR%%/timezone/America/Juneau
-%%TZDATA%%%%DATADIR%%/timezone/America/Kentucky/Louisville
-%%TZDATA%%%%DATADIR%%/timezone/America/Kentucky/Monticello
-%%TZDATA%%%%DATADIR%%/timezone/America/Knox_IN
-%%TZDATA%%%%DATADIR%%/timezone/America/Kralendijk
-%%TZDATA%%%%DATADIR%%/timezone/America/La_Paz
-%%TZDATA%%%%DATADIR%%/timezone/America/Lima
-%%TZDATA%%%%DATADIR%%/timezone/America/Los_Angeles
-%%TZDATA%%%%DATADIR%%/timezone/America/Louisville
-%%TZDATA%%%%DATADIR%%/timezone/America/Lower_Princes
-%%TZDATA%%%%DATADIR%%/timezone/America/Maceio
-%%TZDATA%%%%DATADIR%%/timezone/America/Managua
-%%TZDATA%%%%DATADIR%%/timezone/America/Manaus
-%%TZDATA%%%%DATADIR%%/timezone/America/Marigot
-%%TZDATA%%%%DATADIR%%/timezone/America/Martinique
-%%TZDATA%%%%DATADIR%%/timezone/America/Matamoros
-%%TZDATA%%%%DATADIR%%/timezone/America/Mazatlan
-%%TZDATA%%%%DATADIR%%/timezone/America/Mendoza
-%%TZDATA%%%%DATADIR%%/timezone/America/Menominee
-%%TZDATA%%%%DATADIR%%/timezone/America/Merida
-%%TZDATA%%%%DATADIR%%/timezone/America/Metlakatla
-%%TZDATA%%%%DATADIR%%/timezone/America/Mexico_City
-%%TZDATA%%%%DATADIR%%/timezone/America/Miquelon
-%%TZDATA%%%%DATADIR%%/timezone/America/Moncton
-%%TZDATA%%%%DATADIR%%/timezone/America/Monterrey
-%%TZDATA%%%%DATADIR%%/timezone/America/Montevideo
-%%TZDATA%%%%DATADIR%%/timezone/America/Montreal
-%%TZDATA%%%%DATADIR%%/timezone/America/Montserrat
-%%TZDATA%%%%DATADIR%%/timezone/America/Nassau
-%%TZDATA%%%%DATADIR%%/timezone/America/New_York
-%%TZDATA%%%%DATADIR%%/timezone/America/Nipigon
-%%TZDATA%%%%DATADIR%%/timezone/America/Nome
-%%TZDATA%%%%DATADIR%%/timezone/America/Noronha
-%%TZDATA%%%%DATADIR%%/timezone/America/North_Dakota/Beulah
-%%TZDATA%%%%DATADIR%%/timezone/America/North_Dakota/Center
-%%TZDATA%%%%DATADIR%%/timezone/America/North_Dakota/New_Salem
-%%TZDATA%%%%DATADIR%%/timezone/America/Nuuk
-%%TZDATA%%%%DATADIR%%/timezone/America/Ojinaga
-%%TZDATA%%%%DATADIR%%/timezone/America/Panama
-%%TZDATA%%%%DATADIR%%/timezone/America/Pangnirtung
-%%TZDATA%%%%DATADIR%%/timezone/America/Paramaribo
-%%TZDATA%%%%DATADIR%%/timezone/America/Phoenix
-%%TZDATA%%%%DATADIR%%/timezone/America/Port-au-Prince
-%%TZDATA%%%%DATADIR%%/timezone/America/Port_of_Spain
-%%TZDATA%%%%DATADIR%%/timezone/America/Porto_Acre
-%%TZDATA%%%%DATADIR%%/timezone/America/Porto_Velho
-%%TZDATA%%%%DATADIR%%/timezone/America/Puerto_Rico
-%%TZDATA%%%%DATADIR%%/timezone/America/Punta_Arenas
-%%TZDATA%%%%DATADIR%%/timezone/America/Rainy_River
-%%TZDATA%%%%DATADIR%%/timezone/America/Rankin_Inlet
-%%TZDATA%%%%DATADIR%%/timezone/America/Recife
-%%TZDATA%%%%DATADIR%%/timezone/America/Regina
-%%TZDATA%%%%DATADIR%%/timezone/America/Resolute
-%%TZDATA%%%%DATADIR%%/timezone/America/Rio_Branco
-%%TZDATA%%%%DATADIR%%/timezone/America/Rosario
-%%TZDATA%%%%DATADIR%%/timezone/America/Santa_Isabel
-%%TZDATA%%%%DATADIR%%/timezone/America/Santarem
-%%TZDATA%%%%DATADIR%%/timezone/America/Santiago
-%%TZDATA%%%%DATADIR%%/timezone/America/Santo_Domingo
-%%TZDATA%%%%DATADIR%%/timezone/America/Sao_Paulo
-%%TZDATA%%%%DATADIR%%/timezone/America/Scoresbysund
-%%TZDATA%%%%DATADIR%%/timezone/America/Shiprock
-%%TZDATA%%%%DATADIR%%/timezone/America/Sitka
-%%TZDATA%%%%DATADIR%%/timezone/America/St_Barthelemy
-%%TZDATA%%%%DATADIR%%/timezone/America/St_Johns
-%%TZDATA%%%%DATADIR%%/timezone/America/St_Kitts
-%%TZDATA%%%%DATADIR%%/timezone/America/St_Lucia
-%%TZDATA%%%%DATADIR%%/timezone/America/St_Thomas
-%%TZDATA%%%%DATADIR%%/timezone/America/St_Vincent
-%%TZDATA%%%%DATADIR%%/timezone/America/Swift_Current
-%%TZDATA%%%%DATADIR%%/timezone/America/Tegucigalpa
-%%TZDATA%%%%DATADIR%%/timezone/America/Thule
-%%TZDATA%%%%DATADIR%%/timezone/America/Thunder_Bay
-%%TZDATA%%%%DATADIR%%/timezone/America/Tijuana
-%%TZDATA%%%%DATADIR%%/timezone/America/Toronto
-%%TZDATA%%%%DATADIR%%/timezone/America/Tortola
-%%TZDATA%%%%DATADIR%%/timezone/America/Vancouver
-%%TZDATA%%%%DATADIR%%/timezone/America/Virgin
-%%TZDATA%%%%DATADIR%%/timezone/America/Whitehorse
-%%TZDATA%%%%DATADIR%%/timezone/America/Winnipeg
-%%TZDATA%%%%DATADIR%%/timezone/America/Yakutat
-%%TZDATA%%%%DATADIR%%/timezone/America/Yellowknife
-%%TZDATA%%%%DATADIR%%/timezone/Antarctica/Casey
-%%TZDATA%%%%DATADIR%%/timezone/Antarctica/Davis
-%%TZDATA%%%%DATADIR%%/timezone/Antarctica/DumontDUrville
-%%TZDATA%%%%DATADIR%%/timezone/Antarctica/Macquarie
-%%TZDATA%%%%DATADIR%%/timezone/Antarctica/Mawson
-%%TZDATA%%%%DATADIR%%/timezone/Antarctica/McMurdo
-%%TZDATA%%%%DATADIR%%/timezone/Antarctica/Palmer
-%%TZDATA%%%%DATADIR%%/timezone/Antarctica/Rothera
-%%TZDATA%%%%DATADIR%%/timezone/Antarctica/South_Pole
-%%TZDATA%%%%DATADIR%%/timezone/Antarctica/Syowa
-%%TZDATA%%%%DATADIR%%/timezone/Antarctica/Troll
-%%TZDATA%%%%DATADIR%%/timezone/Antarctica/Vostok
-%%TZDATA%%%%DATADIR%%/timezone/Arctic/Longyearbyen
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Aden
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Almaty
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Amman
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Anadyr
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Aqtau
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Aqtobe
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Ashgabat
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Ashkhabad
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Atyrau
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Baghdad
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Bahrain
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Baku
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Bangkok
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Barnaul
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Beirut
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Bishkek
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Brunei
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Calcutta
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Chita
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Choibalsan
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Chongqing
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Chungking
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Colombo
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Dacca
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Damascus
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Dhaka
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Dili
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Dubai
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Dushanbe
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Famagusta
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Gaza
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Harbin
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Hebron
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Ho_Chi_Minh
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Hong_Kong
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Hovd
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Irkutsk
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Istanbul
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Jakarta
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Jayapura
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Jerusalem
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Kabul
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Kamchatka
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Karachi
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Kashgar
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Kathmandu
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Katmandu
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Khandyga
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Kolkata
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Krasnoyarsk
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Kuala_Lumpur
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Kuching
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Kuwait
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Macao
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Macau
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Magadan
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Makassar
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Manila
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Muscat
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Nicosia
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Novokuznetsk
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Novosibirsk
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Omsk
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Oral
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Phnom_Penh
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Pontianak
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Pyongyang
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Qatar
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Qostanay
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Qyzylorda
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Rangoon
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Riyadh
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Saigon
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Sakhalin
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Samarkand
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Seoul
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Shanghai
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Singapore
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Srednekolymsk
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Taipei
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Tashkent
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Tbilisi
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Tehran
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Tel_Aviv
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Thimbu
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Thimphu
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Tokyo
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Tomsk
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Ujung_Pandang
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Ulaanbaatar
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Ulan_Bator
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Urumqi
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Ust-Nera
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Vientiane
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Vladivostok
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Yakutsk
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Yangon
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Yekaterinburg
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Yerevan
-%%TZDATA%%%%DATADIR%%/timezone/Atlantic/Azores
-%%TZDATA%%%%DATADIR%%/timezone/Atlantic/Bermuda
-%%TZDATA%%%%DATADIR%%/timezone/Atlantic/Canary
-%%TZDATA%%%%DATADIR%%/timezone/Atlantic/Cape_Verde
-%%TZDATA%%%%DATADIR%%/timezone/Atlantic/Faeroe
-%%TZDATA%%%%DATADIR%%/timezone/Atlantic/Faroe
-%%TZDATA%%%%DATADIR%%/timezone/Atlantic/Jan_Mayen
-%%TZDATA%%%%DATADIR%%/timezone/Atlantic/Madeira
-%%TZDATA%%%%DATADIR%%/timezone/Atlantic/Reykjavik
-%%TZDATA%%%%DATADIR%%/timezone/Atlantic/South_Georgia
-%%TZDATA%%%%DATADIR%%/timezone/Atlantic/St_Helena
-%%TZDATA%%%%DATADIR%%/timezone/Atlantic/Stanley
-%%TZDATA%%%%DATADIR%%/timezone/Australia/ACT
-%%TZDATA%%%%DATADIR%%/timezone/Australia/Adelaide
-%%TZDATA%%%%DATADIR%%/timezone/Australia/Brisbane
-%%TZDATA%%%%DATADIR%%/timezone/Australia/Broken_Hill
-%%TZDATA%%%%DATADIR%%/timezone/Australia/Canberra
-%%TZDATA%%%%DATADIR%%/timezone/Australia/Currie
-%%TZDATA%%%%DATADIR%%/timezone/Australia/Darwin
-%%TZDATA%%%%DATADIR%%/timezone/Australia/Eucla
-%%TZDATA%%%%DATADIR%%/timezone/Australia/Hobart
-%%TZDATA%%%%DATADIR%%/timezone/Australia/LHI
-%%TZDATA%%%%DATADIR%%/timezone/Australia/Lindeman
-%%TZDATA%%%%DATADIR%%/timezone/Australia/Lord_Howe
-%%TZDATA%%%%DATADIR%%/timezone/Australia/Melbourne
-%%TZDATA%%%%DATADIR%%/timezone/Australia/NSW
-%%TZDATA%%%%DATADIR%%/timezone/Australia/North
-%%TZDATA%%%%DATADIR%%/timezone/Australia/Perth
-%%TZDATA%%%%DATADIR%%/timezone/Australia/Queensland
-%%TZDATA%%%%DATADIR%%/timezone/Australia/South
-%%TZDATA%%%%DATADIR%%/timezone/Australia/Sydney
-%%TZDATA%%%%DATADIR%%/timezone/Australia/Tasmania
-%%TZDATA%%%%DATADIR%%/timezone/Australia/Victoria
-%%TZDATA%%%%DATADIR%%/timezone/Australia/West
-%%TZDATA%%%%DATADIR%%/timezone/Australia/Yancowinna
-%%TZDATA%%%%DATADIR%%/timezone/Brazil/Acre
-%%TZDATA%%%%DATADIR%%/timezone/Brazil/DeNoronha
-%%TZDATA%%%%DATADIR%%/timezone/Brazil/East
-%%TZDATA%%%%DATADIR%%/timezone/Brazil/West
-%%TZDATA%%%%DATADIR%%/timezone/CET
-%%TZDATA%%%%DATADIR%%/timezone/CST6CDT
-%%TZDATA%%%%DATADIR%%/timezone/Canada/Atlantic
-%%TZDATA%%%%DATADIR%%/timezone/Canada/Central
-%%TZDATA%%%%DATADIR%%/timezone/Canada/Eastern
-%%TZDATA%%%%DATADIR%%/timezone/Canada/Mountain
-%%TZDATA%%%%DATADIR%%/timezone/Canada/Newfoundland
-%%TZDATA%%%%DATADIR%%/timezone/Canada/Pacific
-%%TZDATA%%%%DATADIR%%/timezone/Canada/Saskatchewan
-%%TZDATA%%%%DATADIR%%/timezone/Canada/Yukon
-%%TZDATA%%%%DATADIR%%/timezone/Chile/Continental
-%%TZDATA%%%%DATADIR%%/timezone/Chile/EasterIsland
-%%TZDATA%%%%DATADIR%%/timezone/Cuba
-%%TZDATA%%%%DATADIR%%/timezone/EET
-%%TZDATA%%%%DATADIR%%/timezone/EST
-%%TZDATA%%%%DATADIR%%/timezone/EST5EDT
-%%TZDATA%%%%DATADIR%%/timezone/Egypt
-%%TZDATA%%%%DATADIR%%/timezone/Eire
-%%TZDATA%%%%DATADIR%%/timezone/Etc/GMT
-%%TZDATA%%%%DATADIR%%/timezone/Etc/GMT+0
-%%TZDATA%%%%DATADIR%%/timezone/Etc/GMT+1
-%%TZDATA%%%%DATADIR%%/timezone/Etc/GMT+10
-%%TZDATA%%%%DATADIR%%/timezone/Etc/GMT+11
-%%TZDATA%%%%DATADIR%%/timezone/Etc/GMT+12
-%%TZDATA%%%%DATADIR%%/timezone/Etc/GMT+2
-%%TZDATA%%%%DATADIR%%/timezone/Etc/GMT+3
-%%TZDATA%%%%DATADIR%%/timezone/Etc/GMT+4
-%%TZDATA%%%%DATADIR%%/timezone/Etc/GMT+5
-%%TZDATA%%%%DATADIR%%/timezone/Etc/GMT+6
-%%TZDATA%%%%DATADIR%%/timezone/Etc/GMT+7
-%%TZDATA%%%%DATADIR%%/timezone/Etc/GMT+8
-%%TZDATA%%%%DATADIR%%/timezone/Etc/GMT+9
-%%TZDATA%%%%DATADIR%%/timezone/Etc/GMT-0
-%%TZDATA%%%%DATADIR%%/timezone/Etc/GMT-1
-%%TZDATA%%%%DATADIR%%/timezone/Etc/GMT-10
-%%TZDATA%%%%DATADIR%%/timezone/Etc/GMT-11
-%%TZDATA%%%%DATADIR%%/timezone/Etc/GMT-12
-%%TZDATA%%%%DATADIR%%/timezone/Etc/GMT-13
-%%TZDATA%%%%DATADIR%%/timezone/Etc/GMT-14
-%%TZDATA%%%%DATADIR%%/timezone/Etc/GMT-2
-%%TZDATA%%%%DATADIR%%/timezone/Etc/GMT-3
-%%TZDATA%%%%DATADIR%%/timezone/Etc/GMT-4
-%%TZDATA%%%%DATADIR%%/timezone/Etc/GMT-5
-%%TZDATA%%%%DATADIR%%/timezone/Etc/GMT-6
-%%TZDATA%%%%DATADIR%%/timezone/Etc/GMT-7
-%%TZDATA%%%%DATADIR%%/timezone/Etc/GMT-8
-%%TZDATA%%%%DATADIR%%/timezone/Etc/GMT-9
-%%TZDATA%%%%DATADIR%%/timezone/Etc/GMT0
-%%TZDATA%%%%DATADIR%%/timezone/Etc/Greenwich
-%%TZDATA%%%%DATADIR%%/timezone/Etc/UCT
-%%TZDATA%%%%DATADIR%%/timezone/Etc/UTC
-%%TZDATA%%%%DATADIR%%/timezone/Etc/Universal
-%%TZDATA%%%%DATADIR%%/timezone/Etc/Zulu
-%%TZDATA%%%%DATADIR%%/timezone/Europe/Amsterdam
-%%TZDATA%%%%DATADIR%%/timezone/Europe/Andorra
-%%TZDATA%%%%DATADIR%%/timezone/Europe/Astrakhan
-%%TZDATA%%%%DATADIR%%/timezone/Europe/Athens
-%%TZDATA%%%%DATADIR%%/timezone/Europe/Belfast
-%%TZDATA%%%%DATADIR%%/timezone/Europe/Belgrade
-%%TZDATA%%%%DATADIR%%/timezone/Europe/Berlin
-%%TZDATA%%%%DATADIR%%/timezone/Europe/Bratislava
-%%TZDATA%%%%DATADIR%%/timezone/Europe/Brussels
-%%TZDATA%%%%DATADIR%%/timezone/Europe/Bucharest
-%%TZDATA%%%%DATADIR%%/timezone/Europe/Budapest
-%%TZDATA%%%%DATADIR%%/timezone/Europe/Busingen
-%%TZDATA%%%%DATADIR%%/timezone/Europe/Chisinau
-%%TZDATA%%%%DATADIR%%/timezone/Europe/Copenhagen
-%%TZDATA%%%%DATADIR%%/timezone/Europe/Dublin
-%%TZDATA%%%%DATADIR%%/timezone/Europe/Gibraltar
-%%TZDATA%%%%DATADIR%%/timezone/Europe/Guernsey
-%%TZDATA%%%%DATADIR%%/timezone/Europe/Helsinki
-%%TZDATA%%%%DATADIR%%/timezone/Europe/Isle_of_Man
-%%TZDATA%%%%DATADIR%%/timezone/Europe/Istanbul
-%%TZDATA%%%%DATADIR%%/timezone/Europe/Jersey
-%%TZDATA%%%%DATADIR%%/timezone/Europe/Kaliningrad
-%%TZDATA%%%%DATADIR%%/timezone/Europe/Kiev
-%%TZDATA%%%%DATADIR%%/timezone/Europe/Kirov
-%%TZDATA%%%%DATADIR%%/timezone/Europe/Lisbon
-%%TZDATA%%%%DATADIR%%/timezone/Europe/Ljubljana
-%%TZDATA%%%%DATADIR%%/timezone/Europe/London
-%%TZDATA%%%%DATADIR%%/timezone/Europe/Luxembourg
-%%TZDATA%%%%DATADIR%%/timezone/Europe/Madrid
-%%TZDATA%%%%DATADIR%%/timezone/Europe/Malta
-%%TZDATA%%%%DATADIR%%/timezone/Europe/Mariehamn
-%%TZDATA%%%%DATADIR%%/timezone/Europe/Minsk
-%%TZDATA%%%%DATADIR%%/timezone/Europe/Monaco
-%%TZDATA%%%%DATADIR%%/timezone/Europe/Moscow
-%%TZDATA%%%%DATADIR%%/timezone/Europe/Nicosia
-%%TZDATA%%%%DATADIR%%/timezone/Europe/Oslo
-%%TZDATA%%%%DATADIR%%/timezone/Europe/Paris
-%%TZDATA%%%%DATADIR%%/timezone/Europe/Podgorica
-%%TZDATA%%%%DATADIR%%/timezone/Europe/Prague
-%%TZDATA%%%%DATADIR%%/timezone/Europe/Riga
-%%TZDATA%%%%DATADIR%%/timezone/Europe/Rome
-%%TZDATA%%%%DATADIR%%/timezone/Europe/Samara
-%%TZDATA%%%%DATADIR%%/timezone/Europe/San_Marino
-%%TZDATA%%%%DATADIR%%/timezone/Europe/Sarajevo
-%%TZDATA%%%%DATADIR%%/timezone/Europe/Saratov
-%%TZDATA%%%%DATADIR%%/timezone/Europe/Simferopol
-%%TZDATA%%%%DATADIR%%/timezone/Europe/Skopje
-%%TZDATA%%%%DATADIR%%/timezone/Europe/Sofia
-%%TZDATA%%%%DATADIR%%/timezone/Europe/Stockholm
-%%TZDATA%%%%DATADIR%%/timezone/Europe/Tallinn
-%%TZDATA%%%%DATADIR%%/timezone/Europe/Tirane
-%%TZDATA%%%%DATADIR%%/timezone/Europe/Tiraspol
-%%TZDATA%%%%DATADIR%%/timezone/Europe/Ulyanovsk
-%%TZDATA%%%%DATADIR%%/timezone/Europe/Uzhgorod
-%%TZDATA%%%%DATADIR%%/timezone/Europe/Vaduz
-%%TZDATA%%%%DATADIR%%/timezone/Europe/Vatican
-%%TZDATA%%%%DATADIR%%/timezone/Europe/Vienna
-%%TZDATA%%%%DATADIR%%/timezone/Europe/Vilnius
-%%TZDATA%%%%DATADIR%%/timezone/Europe/Volgograd
-%%TZDATA%%%%DATADIR%%/timezone/Europe/Warsaw
-%%TZDATA%%%%DATADIR%%/timezone/Europe/Zagreb
-%%TZDATA%%%%DATADIR%%/timezone/Europe/Zaporozhye
-%%TZDATA%%%%DATADIR%%/timezone/Europe/Zurich
-%%TZDATA%%%%DATADIR%%/timezone/Factory
-%%TZDATA%%%%DATADIR%%/timezone/GB
-%%TZDATA%%%%DATADIR%%/timezone/GB-Eire
-%%TZDATA%%%%DATADIR%%/timezone/GMT
-%%TZDATA%%%%DATADIR%%/timezone/GMT+0
-%%TZDATA%%%%DATADIR%%/timezone/GMT-0
-%%TZDATA%%%%DATADIR%%/timezone/GMT0
-%%TZDATA%%%%DATADIR%%/timezone/Greenwich
-%%TZDATA%%%%DATADIR%%/timezone/HST
-%%TZDATA%%%%DATADIR%%/timezone/Hongkong
-%%TZDATA%%%%DATADIR%%/timezone/Iceland
-%%TZDATA%%%%DATADIR%%/timezone/Indian/Antananarivo
-%%TZDATA%%%%DATADIR%%/timezone/Indian/Chagos
-%%TZDATA%%%%DATADIR%%/timezone/Indian/Christmas
-%%TZDATA%%%%DATADIR%%/timezone/Indian/Cocos
-%%TZDATA%%%%DATADIR%%/timezone/Indian/Comoro
-%%TZDATA%%%%DATADIR%%/timezone/Indian/Kerguelen
-%%TZDATA%%%%DATADIR%%/timezone/Indian/Mahe
-%%TZDATA%%%%DATADIR%%/timezone/Indian/Maldives
-%%TZDATA%%%%DATADIR%%/timezone/Indian/Mauritius
-%%TZDATA%%%%DATADIR%%/timezone/Indian/Mayotte
-%%TZDATA%%%%DATADIR%%/timezone/Indian/Reunion
-%%TZDATA%%%%DATADIR%%/timezone/Iran
-%%TZDATA%%%%DATADIR%%/timezone/Israel
-%%TZDATA%%%%DATADIR%%/timezone/Jamaica
-%%TZDATA%%%%DATADIR%%/timezone/Japan
-%%TZDATA%%%%DATADIR%%/timezone/Kwajalein
-%%TZDATA%%%%DATADIR%%/timezone/Libya
-%%TZDATA%%%%DATADIR%%/timezone/MET
-%%TZDATA%%%%DATADIR%%/timezone/MST
-%%TZDATA%%%%DATADIR%%/timezone/MST7MDT
-%%TZDATA%%%%DATADIR%%/timezone/Mexico/BajaNorte
-%%TZDATA%%%%DATADIR%%/timezone/Mexico/BajaSur
-%%TZDATA%%%%DATADIR%%/timezone/Mexico/General
-%%TZDATA%%%%DATADIR%%/timezone/NZ
-%%TZDATA%%%%DATADIR%%/timezone/NZ-CHAT
-%%TZDATA%%%%DATADIR%%/timezone/Navajo
-%%TZDATA%%%%DATADIR%%/timezone/PRC
-%%TZDATA%%%%DATADIR%%/timezone/PST8PDT
-%%TZDATA%%%%DATADIR%%/timezone/Pacific/Apia
-%%TZDATA%%%%DATADIR%%/timezone/Pacific/Auckland
-%%TZDATA%%%%DATADIR%%/timezone/Pacific/Bougainville
-%%TZDATA%%%%DATADIR%%/timezone/Pacific/Chatham
-%%TZDATA%%%%DATADIR%%/timezone/Pacific/Chuuk
-%%TZDATA%%%%DATADIR%%/timezone/Pacific/Easter
-%%TZDATA%%%%DATADIR%%/timezone/Pacific/Efate
-%%TZDATA%%%%DATADIR%%/timezone/Pacific/Enderbury
-%%TZDATA%%%%DATADIR%%/timezone/Pacific/Fakaofo
-%%TZDATA%%%%DATADIR%%/timezone/Pacific/Fiji
-%%TZDATA%%%%DATADIR%%/timezone/Pacific/Funafuti
-%%TZDATA%%%%DATADIR%%/timezone/Pacific/Galapagos
-%%TZDATA%%%%DATADIR%%/timezone/Pacific/Gambier
-%%TZDATA%%%%DATADIR%%/timezone/Pacific/Guadalcanal
-%%TZDATA%%%%DATADIR%%/timezone/Pacific/Guam
-%%TZDATA%%%%DATADIR%%/timezone/Pacific/Honolulu
-%%TZDATA%%%%DATADIR%%/timezone/Pacific/Johnston
-%%TZDATA%%%%DATADIR%%/timezone/Pacific/Kiritimati
-%%TZDATA%%%%DATADIR%%/timezone/Pacific/Kosrae
-%%TZDATA%%%%DATADIR%%/timezone/Pacific/Kwajalein
-%%TZDATA%%%%DATADIR%%/timezone/Pacific/Majuro
-%%TZDATA%%%%DATADIR%%/timezone/Pacific/Marquesas
-%%TZDATA%%%%DATADIR%%/timezone/Pacific/Midway
-%%TZDATA%%%%DATADIR%%/timezone/Pacific/Nauru
-%%TZDATA%%%%DATADIR%%/timezone/Pacific/Niue
-%%TZDATA%%%%DATADIR%%/timezone/Pacific/Norfolk
-%%TZDATA%%%%DATADIR%%/timezone/Pacific/Noumea
-%%TZDATA%%%%DATADIR%%/timezone/Pacific/Pago_Pago
-%%TZDATA%%%%DATADIR%%/timezone/Pacific/Palau
-%%TZDATA%%%%DATADIR%%/timezone/Pacific/Pitcairn
-%%TZDATA%%%%DATADIR%%/timezone/Pacific/Pohnpei
-%%TZDATA%%%%DATADIR%%/timezone/Pacific/Ponape
-%%TZDATA%%%%DATADIR%%/timezone/Pacific/Port_Moresby
-%%TZDATA%%%%DATADIR%%/timezone/Pacific/Rarotonga
-%%TZDATA%%%%DATADIR%%/timezone/Pacific/Saipan
-%%TZDATA%%%%DATADIR%%/timezone/Pacific/Samoa
-%%TZDATA%%%%DATADIR%%/timezone/Pacific/Tahiti
-%%TZDATA%%%%DATADIR%%/timezone/Pacific/Tarawa
-%%TZDATA%%%%DATADIR%%/timezone/Pacific/Tongatapu
-%%TZDATA%%%%DATADIR%%/timezone/Pacific/Truk
-%%TZDATA%%%%DATADIR%%/timezone/Pacific/Wake
-%%TZDATA%%%%DATADIR%%/timezone/Pacific/Wallis
-%%TZDATA%%%%DATADIR%%/timezone/Pacific/Yap
-%%TZDATA%%%%DATADIR%%/timezone/Poland
-%%TZDATA%%%%DATADIR%%/timezone/Portugal
-%%TZDATA%%%%DATADIR%%/timezone/ROC
-%%TZDATA%%%%DATADIR%%/timezone/ROK
-%%TZDATA%%%%DATADIR%%/timezone/Singapore
-%%TZDATA%%%%DATADIR%%/timezone/Turkey
-%%TZDATA%%%%DATADIR%%/timezone/UCT
-%%TZDATA%%%%DATADIR%%/timezone/US/Alaska
-%%TZDATA%%%%DATADIR%%/timezone/US/Aleutian
-%%TZDATA%%%%DATADIR%%/timezone/US/Arizona
-%%TZDATA%%%%DATADIR%%/timezone/US/Central
-%%TZDATA%%%%DATADIR%%/timezone/US/East-Indiana
-%%TZDATA%%%%DATADIR%%/timezone/US/Eastern
-%%TZDATA%%%%DATADIR%%/timezone/US/Hawaii
-%%TZDATA%%%%DATADIR%%/timezone/US/Indiana-Starke
-%%TZDATA%%%%DATADIR%%/timezone/US/Michigan
-%%TZDATA%%%%DATADIR%%/timezone/US/Mountain
-%%TZDATA%%%%DATADIR%%/timezone/US/Pacific
-%%TZDATA%%%%DATADIR%%/timezone/US/Samoa
-%%TZDATA%%%%DATADIR%%/timezone/UTC
-%%TZDATA%%%%DATADIR%%/timezone/Universal
-%%TZDATA%%%%DATADIR%%/timezone/W-SU
-%%TZDATA%%%%DATADIR%%/timezone/WET
-%%TZDATA%%%%DATADIR%%/timezone/Zulu
-%%TZDATA%%%%DATADIR%%/timezone/posixrules
-%%DATADIR%%/timezonesets/Africa.txt
-%%DATADIR%%/timezonesets/America.txt
-%%DATADIR%%/timezonesets/Antarctica.txt
-%%DATADIR%%/timezonesets/Asia.txt
-%%DATADIR%%/timezonesets/Atlantic.txt
-%%DATADIR%%/timezonesets/Australia
-%%DATADIR%%/timezonesets/Australia.txt
-%%DATADIR%%/timezonesets/Default
-%%DATADIR%%/timezonesets/Etc.txt
-%%DATADIR%%/timezonesets/Europe.txt
-%%DATADIR%%/timezonesets/India
-%%DATADIR%%/timezonesets/Indian.txt
-%%DATADIR%%/timezonesets/Pacific.txt
-%%DATADIR%%/tsearch_data/danish.stop
-%%DATADIR%%/tsearch_data/dutch.stop
-%%DATADIR%%/tsearch_data/english.stop
-%%DATADIR%%/tsearch_data/finnish.stop
-%%DATADIR%%/tsearch_data/french.stop
-%%DATADIR%%/tsearch_data/german.stop
-%%DATADIR%%/tsearch_data/hungarian.stop
-%%DATADIR%%/tsearch_data/hunspell_sample.affix
-%%DATADIR%%/tsearch_data/hunspell_sample_long.affix
-%%DATADIR%%/tsearch_data/hunspell_sample_long.dict
-%%DATADIR%%/tsearch_data/hunspell_sample_num.affix
-%%DATADIR%%/tsearch_data/hunspell_sample_num.dict
-%%DATADIR%%/tsearch_data/ispell_sample.affix
-%%DATADIR%%/tsearch_data/ispell_sample.dict
-%%DATADIR%%/tsearch_data/italian.stop
-%%DATADIR%%/tsearch_data/norwegian.stop
-%%DATADIR%%/tsearch_data/portuguese.stop
-%%DATADIR%%/tsearch_data/russian.stop
-%%DATADIR%%/tsearch_data/spanish.stop
-%%DATADIR%%/tsearch_data/swedish.stop
-%%DATADIR%%/tsearch_data/synonym_sample.syn
-%%DATADIR%%/tsearch_data/thesaurus_sample.ths
-%%DATADIR%%/tsearch_data/turkish.stop
diff --git a/databases/postgresql11-client/Makefile b/databases/postgresql11-client/Makefile
deleted file mode 100644
index 924c243c76bb..000000000000
--- a/databases/postgresql11-client/Makefile
+++ /dev/null
@@ -1,20 +0,0 @@
-# Created by: Palle Girgensohn <girgen@FreeBSD.org>
-
-PORTNAME=	postgresql
-PORTREVISION=	0
-
-COMMENT=	PostgreSQL database (client)
-
-MASTERDIR=	${.CURDIR}/../postgresql11-server
-
-BUILD_DIRS=	config src/include src/interfaces src/port \
-		src/bin/pg_dump src/bin/psql src/bin/scripts src/bin/pg_config \
-		src/bin/pgbench doc src/makefiles src/test/regress
-INSTALL_DIRS=	${BUILD_DIRS}
-
-CLIENT_ONLY=	yes
-COMPONENT=	-client
-USE_LDCONFIG=	yes
-USES=		pkgconfig
-
-.include "${MASTERDIR}/Makefile"
diff --git a/databases/postgresql11-contrib/Makefile b/databases/postgresql11-contrib/Makefile
deleted file mode 100644
index 32385d215e0a..000000000000
--- a/databases/postgresql11-contrib/Makefile
+++ /dev/null
@@ -1,43 +0,0 @@
-# Created by: Palle Girgensohn <girgen@pingpong.net>
-
-PORTNAME=	postgresql
-PORTREVISION=	0
-CATEGORIES=	databases
-
-MAINTAINER=	pgsql@FreeBSD.org
-COMMENT=	The contrib utilities from the PostgreSQL distribution
-
-MASTERDIR=	${.CURDIR}/../postgresql11-server
-
-USES=		bison pgsql:${DISTVERSION:C/([0-9]\.?[0-9]).*/\1/g}
-
-BUILD_DIRS=	src/port src/include src/common contrib
-INSTALL_DIRS=	contrib
-
-# this port fails to build in parallel
-MAKE_JOBS_UNSAFE=	yes
-
-SLAVE_ONLY=	yes
-COMPONENT=	-contrib
-CONFIGURE_ARGS=	--disable-nls --with-uuid=bsd
-LDFLAGS+=	-lpthread -L${PREFIX}/lib
-
-OPTIONS_DEFINE=	DOCS OPENSSL XML
-OPTIONS_DEFAULT=OPENSSL XML
-OPTIONS_SUB=	yes
-
-OPENSSL_DESC=		Build with OpenSSL support
-OPENSSL_USES=		ssl
-OPENSSL_CONFIGURE_WITH=	openssl
-
-XML_LIB_DEPENDS=libxslt.so:textproc/libxslt \
-		libxml2.so:textproc/libxml2
-XML_CONFIGURE_WITH=	libxml libxslt
-
-post-configure:
-	@cd ${WRKSRC}/src/backend && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} symlinks
-
-post-install:
-	@- ${INSTALL_DATA} ${WRKSRC}/contrib/README ${STAGEDIR}${DOCSDIR}/extension/README
-
-.include "${MASTERDIR}/Makefile"
diff --git a/databases/postgresql11-contrib/pkg-descr b/databases/postgresql11-contrib/pkg-descr
deleted file mode 100644
index 18c3c1351c3b..000000000000
--- a/databases/postgresql11-contrib/pkg-descr
+++ /dev/null
@@ -1,23 +0,0 @@
-This is the port for all stuff that comes in the contrib subtree of
-the postgresql distribution. This subtree contains porting tools,
-analysis utilities, and plug-in features that are not part of the core
-PostgreSQL system, mainly because they address a limited audience or
-are too experimental to be part of the main source tree.  This does
-not preclude their usefulness.
-
-Each subdirectory contains a README file with information about the
-module. Some directories supply new user-defined functions, operators,
-or types.  After you have installed the files you need to register the
-new entities in the database system by running the commands in the
-supplied .sql file.  For example,
-
-        $ psql -d dbname -f module.sql
-
-The .sql files are installed into /usr/local/share/postgresql/contrib
-
-For more information, please see
-/usr/local/share/doc/postgresql/contrib/README*
-
-This software is part of the standard PostgreSQL distribution.
-
-WWW: https://www.postgresql.org/
diff --git a/databases/postgresql11-docs/Makefile b/databases/postgresql11-docs/Makefile
deleted file mode 100644
index ffddfe21e687..000000000000
--- a/databases/postgresql11-docs/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-# Created by: Palle Girgensohn <girgen@pingpong.net>
-
-WANT_PGSQL_VER=11
-
-.include "${.CURDIR}/../postgresql14-docs/Makefile"
diff --git a/databases/postgresql11-pgtcl/Makefile b/databases/postgresql11-pgtcl/Makefile
deleted file mode 100644
index 9db5b7ceb2c7..000000000000
--- a/databases/postgresql11-pgtcl/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-PORTREVISION=	0
-PKGNAMESUFFIX=	-postgresql11
-
-CONFLICTS=	pgtcl-[0-9]* pgtcl-postgresql9[0123456]-[0-9]* pgtcl-postgresql10-*
-
-PGTCL_SLAVE=	11
-MASTERDIR=	${.CURDIR}/../pgtcl
-
-.include "${MASTERDIR}/Makefile"
diff --git a/databases/postgresql11-plperl/Makefile b/databases/postgresql11-plperl/Makefile
deleted file mode 100644
index 009e2e80ab55..000000000000
--- a/databases/postgresql11-plperl/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-# Created by: Palle Girgensohn <girgen@partitur.se>
-
-WANT_PGSQL_VER=	11
-
-# this port fails to build in parallel
-MAKE_JOBS_UNSAFE=	yes
-
-.include "${.CURDIR}/../postgresql14-plperl/Makefile"
diff --git a/databases/postgresql11-plpython/Makefile b/databases/postgresql11-plpython/Makefile
deleted file mode 100644
index 2a5b929c4259..000000000000
--- a/databases/postgresql11-plpython/Makefile
+++ /dev/null
@@ -1,6 +0,0 @@
-WANT_PGSQL_VER=	11
-
-# this port fails to build in parallel
-MAKE_JOBS_UNSAFE=	yes
-
-.include "${.CURDIR}/../postgresql14-plpython/Makefile"
diff --git a/databases/postgresql11-pltcl/Makefile b/databases/postgresql11-pltcl/Makefile
deleted file mode 100644
index 0f03a652ba0e..000000000000
--- a/databases/postgresql11-pltcl/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-# Created by: Palle Girgensohn <girgen@partitur.se>
-
-WANT_PGSQL_VER=	11
-
-# this port fails to build in parallel
-MAKE_JOBS_UNSAFE=	yes
-
-.include "${.CURDIR}/../postgresql14-pltcl/Makefile"
diff --git a/databases/postgresql11-server/Makefile b/databases/postgresql11-server/Makefile
deleted file mode 100644
index 9e51fac93938..000000000000
--- a/databases/postgresql11-server/Makefile
+++ /dev/null
@@ -1,25 +0,0 @@
-# Created by: Marc G. Fournier <scrappy@FreeBSD.org>
-
-DISTVERSION?=	11.13
-# PORTREVISION must be ?= otherwise, all slave ports get this PORTREVISION and
-# not their own.  Probably best to keep it at ?=0 when reset here too.
-PORTREVISION?=	0
-
-MAINTAINER?=	pgsql@FreeBSD.org
-
-INSTALL_DIRS?=	src/common src/timezone src/backend \
-		src/backend/utils/mb/conversion_procs \
-		src/backend/snowball src/backend/replication/libpqwalreceiver \
-		src/backend/replication/pgoutput \
-		src/bin/initdb src/bin/pg_ctl \
-		src/bin/pg_controldata src/bin/pg_resetwal src/pl \
-		src/bin/pg_basebackup src/bin/pg_archivecleanup \
-		src/bin/pg_rewind \
-		src/bin/pg_test_fsync src/bin/pg_test_timing \
-		src/bin/pg_waldump src/bin/pg_upgrade
-
-PG_USER?=	postgres
-PG_GROUP?=	postgres
-PG_UID?=	770
-
-.include "${.CURDIR}/../postgresql14-server/Makefile"
diff --git a/databases/postgresql11-server/distinfo b/databases/postgresql11-server/distinfo
deleted file mode 100644
index a921df317132..000000000000
--- a/databases/postgresql11-server/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1628577840
-SHA256 (postgresql/postgresql-11.13.tar.bz2) = a0c3689ff7f565288002cbc138779d5121d74831a5e8341aea7aa86e99b6bc48
-SIZE (postgresql/postgresql-11.13.tar.bz2) = 20123787
diff --git a/databases/postgresql11-server/files/502.pgsql.in b/databases/postgresql11-server/files/502.pgsql.in
deleted file mode 100644
index c2d5b885d2f1..000000000000
--- a/databases/postgresql11-server/files/502.pgsql.in
+++ /dev/null
@@ -1,114 +0,0 @@
-#!/bin/sh
-#
-# Maintenance shell script to vacuum and backup database
-# Put this in /usr/local/etc/periodic/daily, and it will be run 
-# every night
-#
-# Written by Palle Girgensohn <girgen@pingpong.net>
-#
-# In public domain, do what you like with it,
-# and use it at your own risk... :)
-#
-
-# Define these variables in either /etc/periodic.conf or
-# /etc/periodic.conf.local to override the default values.
-#
-# daily_pgsql_backup_enable="YES" # do backup of all databases
-# daily_pgsql_backup_enable="foo bar db1 db2" # only do backup of a limited selection of databases
-# daily_pgsql_vacuum_enable="YES" # do vacuum
-
-# If there is a global system configuration file, suck it in.
-#
-if [ -r /etc/defaults/periodic.conf ]
-then
-    . /etc/defaults/periodic.conf
-    source_periodic_confs
-fi
-
-: ${daily_pgsql_user:="%%PG_USER%%"}
-: ${daily_pgsql_port:=5432}
-: ${daily_pgsql_vacuum_args:="-U ${daily_pgsql_user} -p ${daily_pgsql_port} -qaz"}
-: ${daily_pgsql_pgdump_args:="-U ${daily_pgsql_user} -p ${daily_pgsql_port} -bF c"}
-: ${daily_pgsql_pgdumpall_globals_args:="-U ${daily_pgsql_user} -p ${daily_pgsql_port}"}
-# backupdir is relative to ~pgsql home directory unless it begins with a slash:
-: ${daily_pgsql_backupdir:="~${daily_pgsql_user}/backups"}
-: ${daily_pgsql_savedays:="7"}
-
-# allow '~´ in dir name
-eval backupdir=${daily_pgsql_backupdir}
-
-rc=0
-
-pgsql_backup() {
-	# daily_pgsql_backupdir must be writeable by user %%PG_USER%%
-	# ~%%PG_USER%% is just that under normal circumstances,
-	# but this might not be where you want the backups...
-	if [ ! -d ${backupdir} ] ; then 
-	    echo Creating ${backupdir}
-	    mkdir -m 700 ${backupdir}; chown ${daily_pgsql_user} ${backupdir}
-	fi
-
-	echo
-	echo "PostgreSQL backups"
-
-	# Protect the data
-	umask 077
-	rc=$?
-	now=`date "+%Y-%m-%dT%H:%M:%S"`
-	file=${daily_pgsql_backupdir}/pgglobals_${now}
-	su -l ${daily_pgsql_user} -c \
-		"umask 077; pg_dumpall -g ${daily_pgsql_pgdumpall_globals_args} | gzip -9 > ${file}.gz"
-
-	db=$1
-	while shift; do
-	    echo -n " $db"
-	    file=${backupdir}/pgdump_${db}_${now}
-	    su -l ${daily_pgsql_user} -c "umask 077; pg_dump ${daily_pgsql_pgdump_args} -f ${file} ${db}"
-	    [ $? -gt 0 ] && rc=3
-		db=$1
-	done
-
-	if [ $rc -gt 0 ]; then
-	    echo
-	    echo "Errors were reported during backup."
-	fi
-
-	# cleaning up old data
-	find ${backupdir} \( -name 'pgdump_*' -o -name 'pgglobals_*' -o -name '*.dat.gz' -o -name 'toc.dat' \) \
-	    -a -mtime +${daily_pgsql_savedays} -delete
-	echo
-}
-
-case "$daily_pgsql_backup_enable" in
-    [Yy][Ee][Ss])
-	dbnames=`su -l ${daily_pgsql_user} -c "umask 077; psql -U ${daily_pgsql_user} -p ${daily_pgsql_port} -q -t -A -d template1 -c SELECT\ datname\ FROM\ pg_database\ WHERE\ datname!=\'template0\'"`
-	pgsql_backup $dbnames
-	;;
-
-	[Nn][Oo])
-	;;
-
-	"")
-	;;
-
-	*)
-	pgsql_backup $daily_pgsql_backup_enable
-	;;
-esac
-
-case "$daily_pgsql_vacuum_enable" in
-    [Yy][Ee][Ss])
-
-	echo
-	echo "PostgreSQL vacuum"
-	su -l ${daily_pgsql_user} -c "vacuumdb ${daily_pgsql_vacuum_args}"
-	if [ $? -gt 0 ]
-	then
-	    echo
-	    echo "Errors were reported during vacuum."
-	    rc=3
-	fi
-	;;
-esac
-
-exit $rc
diff --git a/databases/postgresql11-server/files/patch-src_backend_utils_misc_postgresql.conf.sample b/databases/postgresql11-server/files/patch-src_backend_utils_misc_postgresql.conf.sample
deleted file mode 100644
index a82826b3b5f1..000000000000
--- a/databases/postgresql11-server/files/patch-src_backend_utils_misc_postgresql.conf.sample
+++ /dev/null
@@ -1,21 +0,0 @@
---- src/backend/utils/misc/postgresql.conf.sample.orig	2016-10-24 20:08:51 UTC
-+++ src/backend/utils/misc/postgresql.conf.sample
-@@ -330,6 +330,7 @@
- 
- # - Where to Log -
- 
-+log_destination = 'syslog'
- #log_destination = 'stderr'		# Valid values are combinations of
- 					# stderr, csvlog, syslog, and eventlog,
- 					# depending on platform.  csvlog
-@@ -464,7 +465,9 @@
- 
- #cluster_name = ''			# added to process titles if nonempty
- 					# (change requires restart)
--#update_process_title = on
-+
-+# On FreeBSD, this is a performance hog, so keep it off if you need speed
-+update_process_title = off
- 
- 
- #------------------------------------------------------------------------------
diff --git a/databases/postgresql11-server/files/patch-src_include_storage_s__lock.h b/databases/postgresql11-server/files/patch-src_include_storage_s__lock.h
deleted file mode 100644
index 401a2a7337cb..000000000000
--- a/databases/postgresql11-server/files/patch-src_include_storage_s__lock.h
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/include/storage/s_lock.h.orig	2021-04-15 17:59:43 UTC
-+++ src/include/storage/s_lock.h
-@@ -320,7 +320,7 @@ tas(volatile slock_t *lock)
-  * We use the int-width variant of the builtin because it works on more chips
-  * than other widths.
-  */
--#if defined(__arm__) || defined(__arm) || defined(__aarch64__) || defined(__aarch64)
-+#if defined(__arm__) || defined(__arm) || defined(__aarch64__) || defined(__aarch64) || defined(__riscv)
- #ifdef HAVE_GCC__SYNC_INT32_TAS
- #define HAS_TEST_AND_SET
- 
-@@ -337,7 +337,7 @@ tas(volatile slock_t *lock)
- #define S_UNLOCK(lock) __sync_lock_release(lock)
- 
- #endif	 /* HAVE_GCC__SYNC_INT32_TAS */
--#endif	 /* __arm__ || __arm || __aarch64__ || __aarch64 */
-+#endif	 /* __arm__ || __arm || __aarch64__ || __aarch64  || __riscv */
- 
- 
- /* S/390 and S/390x Linux (32- and 64-bit zSeries) */
diff --git a/databases/postgresql11-server/files/pkg-message-client.in b/databases/postgresql11-server/files/pkg-message-client.in
deleted file mode 100644
index 404124204b7d..000000000000
--- a/databases/postgresql11-server/files/pkg-message-client.in
+++ /dev/null
@@ -1,38 +0,0 @@
-[
-{ type: install
-  message: <<EOM
-The PostgreSQL port has a collection of "side orders":
-
-postgresql-docs
-  For all of the html documentation
-
-p5-Pg
-  A perl5 API for client access to PostgreSQL databases.
-
-postgresql-tcltk 
-  If you want tcl/tk client support.
-
-postgresql-jdbc
-  For Java JDBC support.
-
-postgresql-odbc
-  For client access from unix applications using ODBC as access
-  method. Not needed to access unix PostgreSQL servers from Win32
-  using ODBC. See below.
-
-ruby-postgres, py-psycopg2
-  For client access to PostgreSQL databases using the ruby & python
-  languages.
-
-postgresql-plperl, postgresql-pltcl & postgresql-plruby
-  For using perl5, tcl & ruby as procedural languages.
-
-postgresql-contrib
-  Lots of contributed utilities, postgresql functions and
-  datatypes. There you find pg_standby, pgcrypto and many other cool
-  things.
-
-etc...
-EOM
-}
-]
diff --git a/databases/postgresql11-server/files/pkg-message-server.in b/databases/postgresql11-server/files/pkg-message-server.in
deleted file mode 100644
index e2407c1d964f..000000000000
--- a/databases/postgresql11-server/files/pkg-message-server.in
+++ /dev/null
@@ -1,69 +0,0 @@
-[
-{ type: install
-  message: <<EOM
-For procedural languages and postgresql functions, please note that
-you might have to update them when updating the server.
-
-If you have many tables and many clients running, consider raising
-kern.maxfiles using sysctl(8), or reconfigure your kernel
-appropriately.
-
-The port is set up to use autovacuum for new databases, but you might
-also want to vacuum and perhaps backup your database regularly. There
-is a periodic script, %%PREFIX%%/etc/periodic/daily/502.pgsql, that
-you may find useful. You can use it to backup and perform vacuum on all
-databases nightly. Per default, it performs `vacuum analyze'. See the
-script for instructions. For autovacuum settings, please review
-~postgres/data/postgresql.conf.
-
-If you plan to access your PostgreSQL server using ODBC, please
-consider running the SQL script %%PREFIX%%/share/postgresql/odbc.sql
-to get the functions required for ODBC compliance.
-
-Please note that if you use the rc script,
-%%PREFIX%%/etc/rc.d/postgresql, to initialize the database, unicode
-(UTF-8) will be used to store character data by default.  Set
-postgresql_initdb_flags or use login.conf settings described below to
-alter this behaviour. See the start rc script for more info.
-
-To set limits, environment stuff like locale and collation and other
-things, you can set up a class in /etc/login.conf before initializing
-the database. Add something similar to this to /etc/login.conf:
----
-postgres:\
-	:lang=en_US.UTF-8:\
-	:setenv=LC_COLLATE=C:\
-	:tc=default:
----
-and run `cap_mkdb /etc/login.conf'.
-Then add 'postgresql_class="postgres"' to /etc/rc.conf.
-
-======================================================================
-
-To initialize the database, run
-
-  %%PREFIX%%/etc/rc.d/postgresql initdb
-
-You can then start PostgreSQL by running:
-
-  %%PREFIX%%/etc/rc.d/postgresql start
-
-For postmaster settings, see ~postgres/data/postgresql.conf
-
-NB. FreeBSD's PostgreSQL port logs to syslog by default
-    See ~postgres/data/postgresql.conf for more info
-
-NB. If you're not using a checksumming filesystem like ZFS, you might
-    wish to enable data checksumming. It can only be enabled during
-    the initdb phase, by adding the "--data-checksums" flag to
-    the postgresql_initdb_flags rcvar.  Check the initdb(1) manpage
-    for more info and make sure you understand the performance
-    implications.
-
-======================================================================
-
-To run PostgreSQL at startup, add
-'postgresql_enable="YES"' to /etc/rc.conf
-EOM
-}
-]
diff --git a/databases/postgresql11-server/files/postgresql.in b/databases/postgresql11-server/files/postgresql.in
deleted file mode 100644
index fa88459a55cb..000000000000
--- a/databases/postgresql11-server/files/postgresql.in
+++ /dev/null
@@ -1,115 +0,0 @@
-#!/bin/sh
-
-# PROVIDE: postgresql
-# REQUIRE: DAEMON
-# KEYWORD: shutdown
-#
-# Add the following line to /etc/rc.conf to enable PostgreSQL:
-#
-#  postgresql_enable="YES"
-#  # optional
-#  postgresql_data="/var/db/%%PG_USER%%/data11"
-#  postgresql_flags="-w -s -m fast"
-#  postgresql_initdb_flags="--encoding=utf-8 --lc-collate=C"
-#  postgresql_login_class="default"
-#  postgresql_profiles=""
-#
-# See %%PREFIX%%/share/doc/postgresql/README-server for more info
-#
-# This scripts takes one of the following commands:
-#
-#   start stop restart reload status initdb
-#
-# For postmaster startup options, edit ${postgresql_data}/postgresql.conf
-
-command=%%PREFIX%%/bin/pg_ctl
-
-. /etc/rc.subr
-
-load_rc_config postgresql
-
-# set defaults
-postgresql_enable=${postgresql_enable:-"NO"}
-postgresql_flags=${postgresql_flags:-"-w -s -m fast"}
-postgresql_user=${postgresql_user:-"%%PG_USER%%"}
-eval postgresql_data=${postgresql_data:-"~${postgresql_user}/data11"}
-postgresql_login_class=${postgresql_login_class:-"default"}
-postgresql_initdb_flags=${postgresql_initdb_flags:-"--encoding=utf-8 --lc-collate=C"}
-
-name=postgresql
-rcvar=postgresql_enable
-extra_commands="reload initdb"
-
-start_cmd="postgresql_command start"
-stop_cmd="postgresql_command stop"
-restart_cmd="postgresql_command restart"
-reload_cmd="postgresql_command reload"
-status_cmd="postgresql_command status"
-promote_cmd="postgresql_command promote"
-
-initdb_cmd="postgresql_initdb"
-
-su_cmd="/usr/bin/su"
-
-if [ -n "$2" ]; then
-	profile="$2"
-	if [ "x${postgresql_profiles}" != "x" ]; then
-		eval postgresql_data="\${postgresql_${profile}_data:-}"
-		if [ "x${postgresql_data}" = "x" ]; then
-			echo "You must define a data directory (postgresql_${profile}_data)"
-			exit 1
-		fi
-		eval postgresql_enable="\${postgresql_${profile}_enable:-${postgresql_enable}}"
-		eval postgresql_data="\${postgresql_${profile}_data:-${postgresql_data}}"
-		eval postgresql_flags="\${postgresql_${profile}_flags:-${postgresql_flags}}"
-		eval postgresql_initdb_flags="\${postgresql_${profile}_initdb_flags:-${postgresql_initdb_flags}}"
-	fi
-else
-	if [ "x${postgresql_profiles}" != "x" -a "x$1" != "x" ]; then
-		for profile in ${postgresql_profiles}; do
-			eval _enable="\${postgresql_${profile}_enable}"
-			case "x${_enable:-${postgresql_enable}}" in
-			x|x[Nn][Oo]|x[Nn][Oo][Nn][Ee])
-				continue
-				;;
-			x[Yy][Ee][Ss])
-				;;
-			*)
-				if test -z "$_enable"; then
-					_var=postgresql_enable
-				else
-					_var=postgresql_"${profile}"_enable
-				fi
-				echo "Bad value" \
-					"'${_enable:-${postgresql_enable}}'" \
-					"for ${_var}. " \
-					"Profile ${profile} skipped."
-				continue
-				;;
-			esac
-			echo "===> postgresql profile: ${profile}"
-			%%PREFIX%%/etc/rc.d/postgresql $1 ${profile}
-			retcode="$?"
-			if [ "0${retcode}" -ne 0 ]; then
-				failed="${profile} (${retcode}) ${failed:-}"
-			else
-				success="${profile} ${success:-}"
-			fi
-		done
-		exit 0
-	fi
-fi
-
-command_args="-D ${postgresql_data} ${postgresql_flags}"
-
-postgresql_command()
-{
-    ${su_cmd} -l ${postgresql_user} -c "exec ${command} ${command_args} ${rc_arg}"
-}
-
-postgresql_initdb()
-{
-    ${su_cmd} -l -c ${postgresql_login_class} ${postgresql_user} -c "exec %%PREFIX%%/bin/initdb ${postgresql_initdb_flags} -D ${postgresql_data} -U ${postgresql_user}"
-}
-
-run_rc_command "$1"
diff --git a/databases/postgresql11-server/pkg-descr b/databases/postgresql11-server/pkg-descr
deleted file mode 100644
index 1b3c3db53e96..000000000000
--- a/databases/postgresql11-server/pkg-descr
+++ /dev/null
@@ -1,23 +0,0 @@
-PostgreSQL is a sophisticated Object-Relational DBMS, supporting
-almost all SQL constructs, including subselects, transactions, and
-user-defined types and functions. It is the most advanced open-source
-database available anywhere. Commercial Support is also available.
-
-The original Postgres code was the effort of many graduate students,
-undergraduate students, and staff programmers working under the direction of
-Professor Michael Stonebraker at the University of California, Berkeley. In
-1995, Andrew Yu and Jolly Chen took on the task of converting the DBMS query
-language to SQL and created a new database system which came to known as
-Postgres95. Many others contributed to the porting, testing, debugging and
-enhancement of the Postgres95 code. As the code improved, and 1995 faded into
-memory, PostgreSQL was born.
-
-PostgreSQL development is presently being performed by a team of Internet
-developers who are now responsible for all current and future development. The
-development team coordinator is Marc G. Fournier (scrappy@PostgreSQL.ORG).
-Support is available from the PostgreSQL developer/user community through the
-support mailing list (questions@PostgreSQL.ORG).
-
-PostgreSQL is free and the complete source is available.
-
-WWW: https://www.postgresql.org/
diff --git a/databases/postgresql11-server/pkg-install-server b/databases/postgresql11-server/pkg-install-server
deleted file mode 100644
index 07a10b84eaab..000000000000
--- a/databases/postgresql11-server/pkg-install-server
+++ /dev/null
@@ -1,22 +0,0 @@
-#! /bin/sh
-
-PATH=/bin:/usr/bin:/usr/sbin
-
-backupwarning() {
-cat <<EOF
-
-  =========== BACKUP YOUR DATA! =============
-  As always, backup your data before
-  upgrading. If the upgrade leads to a higher
-  minor revision (e.g. 8.3.x -> 8.4), a dump
-  and restore of all databases is
-  required. This is *NOT* done by the port!
-  ===========================================
-EOF
-}
-
-case $2 in
-PRE-INSTALL)
-	backupwarning
-	;;
-esac
diff --git a/databases/postgresql11-server/pkg-plist-client b/databases/postgresql11-server/pkg-plist-client
deleted file mode 100644
index 6fefde4d9f77..000000000000
--- a/databases/postgresql11-server/pkg-plist-client
+++ /dev/null
@@ -1,1203 +0,0 @@
-bin/clusterdb
-bin/createdb
-bin/createuser
-bin/dropdb
-bin/dropuser
-bin/ecpg
-bin/pg_config
-bin/pg_dump
-bin/pg_dumpall
-bin/pg_isready
-bin/pg_restore
-bin/pgbench
-bin/psql
-bin/reindexdb
-bin/vacuumdb
-include/ecpg_config.h
-include/ecpg_informix.h
-include/ecpgerrno.h
-include/ecpglib.h
-include/ecpgtype.h
-include/libpq-events.h
-include/libpq-fe.h
-include/libpq/libpq-fs.h
-include/pg_config.h
-include/pg_config_ext.h
-include/pg_config_manual.h
-include/pg_config_os.h
-include/pgtypes.h
-include/pgtypes_date.h
-include/pgtypes_error.h
-include/pgtypes_interval.h
-include/pgtypes_numeric.h
-include/pgtypes_timestamp.h
-include/postgres_ext.h
-include/postgresql/informix/esql/datetime.h
-include/postgresql/informix/esql/decimal.h
-include/postgresql/informix/esql/sqltypes.h
-include/postgresql/internal/c.h
-include/postgresql/internal/libpq-int.h
-include/postgresql/internal/libpq/pqcomm.h
-include/postgresql/internal/port.h
-include/postgresql/internal/postgres_fe.h
-include/postgresql/internal/pqexpbuffer.h
-include/postgresql/server/access/amapi.h
-include/postgresql/server/access/amvalidate.h
-include/postgresql/server/access/attnum.h
-include/postgresql/server/access/brin.h
-include/postgresql/server/access/brin_internal.h
-include/postgresql/server/access/brin_page.h
-include/postgresql/server/access/brin_pageops.h
-include/postgresql/server/access/brin_revmap.h
-include/postgresql/server/access/brin_tuple.h
-include/postgresql/server/access/brin_xlog.h
-include/postgresql/server/access/bufmask.h
-include/postgresql/server/access/clog.h
-include/postgresql/server/access/commit_ts.h
-include/postgresql/server/access/genam.h
-include/postgresql/server/access/generic_xlog.h
-include/postgresql/server/access/gin.h
-include/postgresql/server/access/gin_private.h
-include/postgresql/server/access/ginblock.h
-include/postgresql/server/access/ginxlog.h
-include/postgresql/server/access/gist.h
-include/postgresql/server/access/gist_private.h
-include/postgresql/server/access/gistscan.h
-include/postgresql/server/access/gistxlog.h
-include/postgresql/server/access/hash.h
-include/postgresql/server/access/hash_xlog.h
-include/postgresql/server/access/heapam.h
-include/postgresql/server/access/heapam_xlog.h
-include/postgresql/server/access/hio.h
-include/postgresql/server/access/htup.h
-include/postgresql/server/access/htup_details.h
-include/postgresql/server/access/itup.h
-include/postgresql/server/access/multixact.h
-include/postgresql/server/access/nbtree.h
-include/postgresql/server/access/nbtxlog.h
-include/postgresql/server/access/parallel.h
-include/postgresql/server/access/printsimple.h
-include/postgresql/server/access/printtup.h
-include/postgresql/server/access/reloptions.h
-include/postgresql/server/access/relscan.h
-include/postgresql/server/access/rewriteheap.h
-include/postgresql/server/access/rmgr.h
-include/postgresql/server/access/rmgrlist.h
-include/postgresql/server/access/sdir.h
-include/postgresql/server/access/session.h
-include/postgresql/server/access/skey.h
-include/postgresql/server/access/slru.h
-include/postgresql/server/access/spgist.h
-include/postgresql/server/access/spgist_private.h
-include/postgresql/server/access/spgxlog.h
-include/postgresql/server/access/stratnum.h
-include/postgresql/server/access/subtrans.h
-include/postgresql/server/access/sysattr.h
-include/postgresql/server/access/timeline.h
-include/postgresql/server/access/transam.h
-include/postgresql/server/access/tsmapi.h
-include/postgresql/server/access/tupconvert.h
-include/postgresql/server/access/tupdesc.h
-include/postgresql/server/access/tupdesc_details.h
-include/postgresql/server/access/tupmacs.h
-include/postgresql/server/access/tuptoaster.h
-include/postgresql/server/access/twophase.h
-include/postgresql/server/access/twophase_rmgr.h
-include/postgresql/server/access/valid.h
-include/postgresql/server/access/visibilitymap.h
-include/postgresql/server/access/xact.h
-include/postgresql/server/access/xlog.h
-include/postgresql/server/access/xlog_internal.h
-include/postgresql/server/access/xlogdefs.h
-include/postgresql/server/access/xloginsert.h
-include/postgresql/server/access/xlogreader.h
-include/postgresql/server/access/xlogrecord.h
-include/postgresql/server/access/xlogutils.h
-include/postgresql/server/bootstrap/bootstrap.h
-include/postgresql/server/c.h
-include/postgresql/server/catalog/binary_upgrade.h
-include/postgresql/server/catalog/catalog.h
-include/postgresql/server/catalog/catversion.h
-include/postgresql/server/catalog/dependency.h
-include/postgresql/server/catalog/genbki.h
-include/postgresql/server/catalog/heap.h
-include/postgresql/server/catalog/index.h
-include/postgresql/server/catalog/indexing.h
-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
-include/postgresql/server/catalog/pg_am.h
-include/postgresql/server/catalog/pg_am_d.h
-include/postgresql/server/catalog/pg_amop.h
-include/postgresql/server/catalog/pg_amop_d.h
-include/postgresql/server/catalog/pg_amproc.h
-include/postgresql/server/catalog/pg_amproc_d.h
-include/postgresql/server/catalog/pg_attrdef.h
-include/postgresql/server/catalog/pg_attrdef_d.h
-include/postgresql/server/catalog/pg_attribute.h
-include/postgresql/server/catalog/pg_attribute_d.h
-include/postgresql/server/catalog/pg_auth_members.h
-include/postgresql/server/catalog/pg_auth_members_d.h
-include/postgresql/server/catalog/pg_authid.h
-include/postgresql/server/catalog/pg_authid_d.h
-include/postgresql/server/catalog/pg_cast.h
-include/postgresql/server/catalog/pg_cast_d.h
-include/postgresql/server/catalog/pg_class.h
-include/postgresql/server/catalog/pg_class_d.h
-include/postgresql/server/catalog/pg_collation.h
-include/postgresql/server/catalog/pg_collation_d.h
-include/postgresql/server/catalog/pg_constraint.h
-include/postgresql/server/catalog/pg_constraint_d.h
-include/postgresql/server/catalog/pg_control.h
-include/postgresql/server/catalog/pg_conversion.h
-include/postgresql/server/catalog/pg_conversion_d.h
-include/postgresql/server/catalog/pg_database.h
-include/postgresql/server/catalog/pg_database_d.h
-include/postgresql/server/catalog/pg_db_role_setting.h
-include/postgresql/server/catalog/pg_db_role_setting_d.h
-include/postgresql/server/catalog/pg_default_acl.h
-include/postgresql/server/catalog/pg_default_acl_d.h
-include/postgresql/server/catalog/pg_depend.h
-include/postgresql/server/catalog/pg_depend_d.h
-include/postgresql/server/catalog/pg_description.h
-include/postgresql/server/catalog/pg_description_d.h
-include/postgresql/server/catalog/pg_enum.h
-include/postgresql/server/catalog/pg_enum_d.h
-include/postgresql/server/catalog/pg_event_trigger.h
-include/postgresql/server/catalog/pg_event_trigger_d.h
-include/postgresql/server/catalog/pg_extension.h
-include/postgresql/server/catalog/pg_extension_d.h
-include/postgresql/server/catalog/pg_foreign_data_wrapper.h
-include/postgresql/server/catalog/pg_foreign_data_wrapper_d.h
-include/postgresql/server/catalog/pg_foreign_server.h
-include/postgresql/server/catalog/pg_foreign_server_d.h
-include/postgresql/server/catalog/pg_foreign_table.h
-include/postgresql/server/catalog/pg_foreign_table_d.h
-include/postgresql/server/catalog/pg_index.h
-include/postgresql/server/catalog/pg_index_d.h
-include/postgresql/server/catalog/pg_inherits.h
-include/postgresql/server/catalog/pg_inherits_d.h
-include/postgresql/server/catalog/pg_init_privs.h
-include/postgresql/server/catalog/pg_init_privs_d.h
-include/postgresql/server/catalog/pg_language.h
-include/postgresql/server/catalog/pg_language_d.h
-include/postgresql/server/catalog/pg_largeobject.h
-include/postgresql/server/catalog/pg_largeobject_d.h
-include/postgresql/server/catalog/pg_largeobject_metadata.h
-include/postgresql/server/catalog/pg_largeobject_metadata_d.h
-include/postgresql/server/catalog/pg_namespace.h
-include/postgresql/server/catalog/pg_namespace_d.h
-include/postgresql/server/catalog/pg_opclass.h
-include/postgresql/server/catalog/pg_opclass_d.h
-include/postgresql/server/catalog/pg_operator.h
-include/postgresql/server/catalog/pg_operator_d.h
-include/postgresql/server/catalog/pg_opfamily.h
-include/postgresql/server/catalog/pg_opfamily_d.h
-include/postgresql/server/catalog/pg_partitioned_table.h
-include/postgresql/server/catalog/pg_partitioned_table_d.h
-include/postgresql/server/catalog/pg_pltemplate.h
-include/postgresql/server/catalog/pg_pltemplate_d.h
-include/postgresql/server/catalog/pg_policy.h
-include/postgresql/server/catalog/pg_policy_d.h
-include/postgresql/server/catalog/pg_proc.h
-include/postgresql/server/catalog/pg_proc_d.h
-include/postgresql/server/catalog/pg_publication.h
-include/postgresql/server/catalog/pg_publication_d.h
-include/postgresql/server/catalog/pg_publication_rel.h
-include/postgresql/server/catalog/pg_publication_rel_d.h
-include/postgresql/server/catalog/pg_range.h
-include/postgresql/server/catalog/pg_range_d.h
-include/postgresql/server/catalog/pg_replication_origin.h
-include/postgresql/server/catalog/pg_replication_origin_d.h
-include/postgresql/server/catalog/pg_rewrite.h
-include/postgresql/server/catalog/pg_rewrite_d.h
-include/postgresql/server/catalog/pg_seclabel.h
-include/postgresql/server/catalog/pg_seclabel_d.h
-include/postgresql/server/catalog/pg_sequence.h
-include/postgresql/server/catalog/pg_sequence_d.h
-include/postgresql/server/catalog/pg_shdepend.h
-include/postgresql/server/catalog/pg_shdepend_d.h
-include/postgresql/server/catalog/pg_shdescription.h
-include/postgresql/server/catalog/pg_shdescription_d.h
-include/postgresql/server/catalog/pg_shseclabel.h
-include/postgresql/server/catalog/pg_shseclabel_d.h
-include/postgresql/server/catalog/pg_statistic.h
-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_subscription.h
-include/postgresql/server/catalog/pg_subscription_d.h
-include/postgresql/server/catalog/pg_subscription_rel.h
-include/postgresql/server/catalog/pg_subscription_rel_d.h
-include/postgresql/server/catalog/pg_tablespace.h
-include/postgresql/server/catalog/pg_tablespace_d.h
-include/postgresql/server/catalog/pg_transform.h
-include/postgresql/server/catalog/pg_transform_d.h
-include/postgresql/server/catalog/pg_trigger.h
-include/postgresql/server/catalog/pg_trigger_d.h
-include/postgresql/server/catalog/pg_ts_config.h
-include/postgresql/server/catalog/pg_ts_config_d.h
-include/postgresql/server/catalog/pg_ts_config_map.h
-include/postgresql/server/catalog/pg_ts_config_map_d.h
-include/postgresql/server/catalog/pg_ts_dict.h
-include/postgresql/server/catalog/pg_ts_dict_d.h
-include/postgresql/server/catalog/pg_ts_parser.h
-include/postgresql/server/catalog/pg_ts_parser_d.h
-include/postgresql/server/catalog/pg_ts_template.h
-include/postgresql/server/catalog/pg_ts_template_d.h
-include/postgresql/server/catalog/pg_type.h
-include/postgresql/server/catalog/pg_type_d.h
-include/postgresql/server/catalog/pg_user_mapping.h
-include/postgresql/server/catalog/pg_user_mapping_d.h
-include/postgresql/server/catalog/schemapg.h
-include/postgresql/server/catalog/storage.h
-include/postgresql/server/catalog/storage_xlog.h
-include/postgresql/server/catalog/toasting.h
-include/postgresql/server/commands/alter.h
-include/postgresql/server/commands/async.h
-include/postgresql/server/commands/cluster.h
-include/postgresql/server/commands/collationcmds.h
-include/postgresql/server/commands/comment.h
-include/postgresql/server/commands/conversioncmds.h
-include/postgresql/server/commands/copy.h
-include/postgresql/server/commands/createas.h
-include/postgresql/server/commands/dbcommands.h
-include/postgresql/server/commands/dbcommands_xlog.h
-include/postgresql/server/commands/defrem.h
-include/postgresql/server/commands/discard.h
-include/postgresql/server/commands/event_trigger.h
-include/postgresql/server/commands/explain.h
-include/postgresql/server/commands/extension.h
-include/postgresql/server/commands/lockcmds.h
-include/postgresql/server/commands/matview.h
-include/postgresql/server/commands/policy.h
-include/postgresql/server/commands/portalcmds.h
-include/postgresql/server/commands/prepare.h
-include/postgresql/server/commands/proclang.h
-include/postgresql/server/commands/progress.h
-include/postgresql/server/commands/publicationcmds.h
-include/postgresql/server/commands/schemacmds.h
-include/postgresql/server/commands/seclabel.h
-include/postgresql/server/commands/sequence.h
-include/postgresql/server/commands/subscriptioncmds.h
-include/postgresql/server/commands/tablecmds.h
-include/postgresql/server/commands/tablespace.h
-include/postgresql/server/commands/trigger.h
-include/postgresql/server/commands/typecmds.h
-include/postgresql/server/commands/user.h
-include/postgresql/server/commands/vacuum.h
-include/postgresql/server/commands/variable.h
-include/postgresql/server/commands/view.h
-include/postgresql/server/common/base64.h
-include/postgresql/server/common/config_info.h
-include/postgresql/server/common/connect.h
-include/postgresql/server/common/controldata_utils.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/int.h
-include/postgresql/server/common/int128.h
-include/postgresql/server/common/ip.h
-include/postgresql/server/common/keywords.h
-include/postgresql/server/common/md5.h
-include/postgresql/server/common/pg_lzcompress.h
-include/postgresql/server/common/relpath.h
-include/postgresql/server/common/restricted_token.h
-include/postgresql/server/common/saslprep.h
-include/postgresql/server/common/scram-common.h
-include/postgresql/server/common/sha2.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/timestamp.h
-include/postgresql/server/dynloader.h
-include/postgresql/server/executor/execExpr.h
-include/postgresql/server/executor/execParallel.h
-include/postgresql/server/executor/execPartition.h
-include/postgresql/server/executor/execdebug.h
-include/postgresql/server/executor/execdesc.h
-include/postgresql/server/executor/executor.h
-include/postgresql/server/executor/functions.h
-include/postgresql/server/executor/hashjoin.h
-include/postgresql/server/executor/instrument.h
-include/postgresql/server/executor/nodeAgg.h
-include/postgresql/server/executor/nodeAppend.h
-include/postgresql/server/executor/nodeBitmapAnd.h
-include/postgresql/server/executor/nodeBitmapHeapscan.h
-include/postgresql/server/executor/nodeBitmapIndexscan.h
-include/postgresql/server/executor/nodeBitmapOr.h
-include/postgresql/server/executor/nodeCtescan.h
-include/postgresql/server/executor/nodeCustom.h
-include/postgresql/server/executor/nodeForeignscan.h
-include/postgresql/server/executor/nodeFunctionscan.h
-include/postgresql/server/executor/nodeGather.h
-include/postgresql/server/executor/nodeGatherMerge.h
-include/postgresql/server/executor/nodeGroup.h
-include/postgresql/server/executor/nodeHash.h
-include/postgresql/server/executor/nodeHashjoin.h
-include/postgresql/server/executor/nodeIndexonlyscan.h
-include/postgresql/server/executor/nodeIndexscan.h
-include/postgresql/server/executor/nodeLimit.h
-include/postgresql/server/executor/nodeLockRows.h
-include/postgresql/server/executor/nodeMaterial.h
-include/postgresql/server/executor/nodeMergeAppend.h
-include/postgresql/server/executor/nodeMergejoin.h
-include/postgresql/server/executor/nodeModifyTable.h
-include/postgresql/server/executor/nodeNamedtuplestorescan.h
-include/postgresql/server/executor/nodeNestloop.h
-include/postgresql/server/executor/nodeProjectSet.h
-include/postgresql/server/executor/nodeRecursiveunion.h
-include/postgresql/server/executor/nodeResult.h
-include/postgresql/server/executor/nodeSamplescan.h
-include/postgresql/server/executor/nodeSeqscan.h
-include/postgresql/server/executor/nodeSetOp.h
-include/postgresql/server/executor/nodeSort.h
-include/postgresql/server/executor/nodeSubplan.h
-include/postgresql/server/executor/nodeSubqueryscan.h
-include/postgresql/server/executor/nodeTableFuncscan.h
-include/postgresql/server/executor/nodeTidscan.h
-include/postgresql/server/executor/nodeUnique.h
-include/postgresql/server/executor/nodeValuesscan.h
-include/postgresql/server/executor/nodeWindowAgg.h
-include/postgresql/server/executor/nodeWorktablescan.h
-include/postgresql/server/executor/spi.h
-include/postgresql/server/executor/spi_priv.h
-include/postgresql/server/executor/tablefunc.h
-include/postgresql/server/executor/tqueue.h
-include/postgresql/server/executor/tstoreReceiver.h
-include/postgresql/server/executor/tuptable.h
-include/postgresql/server/fe_utils/conditional.h
-include/postgresql/server/fe_utils/connect.h
-include/postgresql/server/fe_utils/mbprint.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/simple_list.h
-include/postgresql/server/fe_utils/string_utils.h
-include/postgresql/server/fmgr.h
-include/postgresql/server/foreign/fdwapi.h
-include/postgresql/server/foreign/foreign.h
-include/postgresql/server/funcapi.h
-include/postgresql/server/getaddrinfo.h
-include/postgresql/server/getopt_long.h
-include/postgresql/server/jit/jit.h
-include/postgresql/server/jit/llvmjit.h
-include/postgresql/server/jit/llvmjit_emit.h
-include/postgresql/server/lib/binaryheap.h
-include/postgresql/server/lib/bipartite_match.h
-include/postgresql/server/lib/bloomfilter.h
-include/postgresql/server/lib/dshash.h
-include/postgresql/server/lib/hyperloglog.h
-include/postgresql/server/lib/ilist.h
-include/postgresql/server/lib/knapsack.h
-include/postgresql/server/lib/pairingheap.h
-include/postgresql/server/lib/rbtree.h
-include/postgresql/server/lib/simplehash.h
-include/postgresql/server/lib/stringinfo.h
-include/postgresql/server/libpq/auth.h
-include/postgresql/server/libpq/be-fsstubs.h
-include/postgresql/server/libpq/crypt.h
-include/postgresql/server/libpq/hba.h
-include/postgresql/server/libpq/ifaddr.h
-include/postgresql/server/libpq/libpq-be.h
-include/postgresql/server/libpq/libpq-fs.h
-include/postgresql/server/libpq/libpq.h
-include/postgresql/server/libpq/pqcomm.h
-include/postgresql/server/libpq/pqformat.h
-include/postgresql/server/libpq/pqmq.h
-include/postgresql/server/libpq/pqsignal.h
-include/postgresql/server/libpq/scram.h
-include/postgresql/server/mb/pg_wchar.h
-include/postgresql/server/miscadmin.h
-include/postgresql/server/nodes/bitmapset.h
-include/postgresql/server/nodes/execnodes.h
-include/postgresql/server/nodes/extensible.h
-include/postgresql/server/nodes/lockoptions.h
-include/postgresql/server/nodes/makefuncs.h
-include/postgresql/server/nodes/memnodes.h
-include/postgresql/server/nodes/nodeFuncs.h
-include/postgresql/server/nodes/nodes.h
-include/postgresql/server/nodes/params.h
-include/postgresql/server/nodes/parsenodes.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/tidbitmap.h
-include/postgresql/server/nodes/value.h
-include/postgresql/server/optimizer/clauses.h
-include/postgresql/server/optimizer/cost.h
-include/postgresql/server/optimizer/geqo.h
-include/postgresql/server/optimizer/geqo_copy.h
-include/postgresql/server/optimizer/geqo_gene.h
-include/postgresql/server/optimizer/geqo_misc.h
-include/postgresql/server/optimizer/geqo_mutation.h
-include/postgresql/server/optimizer/geqo_pool.h
-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/joininfo.h
-include/postgresql/server/optimizer/orclauses.h
-include/postgresql/server/optimizer/paramassign.h
-include/postgresql/server/optimizer/pathnode.h
-include/postgresql/server/optimizer/paths.h
-include/postgresql/server/optimizer/placeholder.h
-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/analyze.h
-include/postgresql/server/parser/gram.h
-include/postgresql/server/parser/gramparse.h
-include/postgresql/server/parser/kwlist.h
-include/postgresql/server/parser/parse_agg.h
-include/postgresql/server/parser/parse_clause.h
-include/postgresql/server/parser/parse_coerce.h
-include/postgresql/server/parser/parse_collate.h
-include/postgresql/server/parser/parse_cte.h
-include/postgresql/server/parser/parse_enr.h
-include/postgresql/server/parser/parse_expr.h
-include/postgresql/server/parser/parse_func.h
-include/postgresql/server/parser/parse_node.h
-include/postgresql/server/parser/parse_oper.h
-include/postgresql/server/parser/parse_param.h
-include/postgresql/server/parser/parse_relation.h
-include/postgresql/server/parser/parse_target.h
-include/postgresql/server/parser/parse_type.h
-include/postgresql/server/parser/parse_utilcmd.h
-include/postgresql/server/parser/parser.h
-include/postgresql/server/parser/parsetree.h
-include/postgresql/server/parser/scanner.h
-include/postgresql/server/parser/scansup.h
-include/postgresql/server/partitioning/partbounds.h
-include/postgresql/server/partitioning/partdefs.h
-include/postgresql/server/partitioning/partprune.h
-include/postgresql/server/pg_config.h
-include/postgresql/server/pg_config_ext.h
-include/postgresql/server/pg_config_manual.h
-include/postgresql/server/pg_config_os.h
-include/postgresql/server/pg_getopt.h
-include/postgresql/server/pg_trace.h
-include/postgresql/server/pgstat.h
-include/postgresql/server/pgtar.h
-include/postgresql/server/pgtime.h
-include/postgresql/server/port.h
-include/postgresql/server/port/aix.h
-include/postgresql/server/port/atomics.h
-include/postgresql/server/port/atomics/arch-arm.h
-include/postgresql/server/port/atomics/arch-hppa.h
-include/postgresql/server/port/atomics/arch-ia64.h
-include/postgresql/server/port/atomics/arch-ppc.h
-include/postgresql/server/port/atomics/arch-x86.h
-include/postgresql/server/port/atomics/fallback.h
-include/postgresql/server/port/atomics/generic-acc.h
-include/postgresql/server/port/atomics/generic-gcc.h
-include/postgresql/server/port/atomics/generic-msvc.h
-include/postgresql/server/port/atomics/generic-sunpro.h
-include/postgresql/server/port/atomics/generic-xlc.h
-include/postgresql/server/port/atomics/generic.h
-include/postgresql/server/port/cygwin.h
-include/postgresql/server/port/darwin.h
-include/postgresql/server/port/freebsd.h
-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_bswap.h
-include/postgresql/server/port/pg_crc32c.h
-include/postgresql/server/port/solaris.h
-include/postgresql/server/port/win32.h
-include/postgresql/server/port/win32/arpa/inet.h
-include/postgresql/server/port/win32/dlfcn.h
-include/postgresql/server/port/win32/grp.h
-include/postgresql/server/port/win32/netdb.h
-include/postgresql/server/port/win32/netinet/in.h
-include/postgresql/server/port/win32/pwd.h
-include/postgresql/server/port/win32/sys/socket.h
-include/postgresql/server/port/win32/sys/wait.h
-include/postgresql/server/port/win32_msvc/dirent.h
-include/postgresql/server/port/win32_msvc/sys/file.h
-include/postgresql/server/port/win32_msvc/sys/param.h
-include/postgresql/server/port/win32_msvc/sys/time.h
-include/postgresql/server/port/win32_msvc/unistd.h
-include/postgresql/server/port/win32_msvc/utime.h
-include/postgresql/server/port/win32_port.h
-include/postgresql/server/portability/instr_time.h
-include/postgresql/server/portability/mem.h
-include/postgresql/server/postgres.h
-include/postgresql/server/postgres_ext.h
-include/postgresql/server/postgres_fe.h
-include/postgresql/server/postmaster/autovacuum.h
-include/postgresql/server/postmaster/bgworker.h
-include/postgresql/server/postmaster/bgworker_internals.h
-include/postgresql/server/postmaster/bgwriter.h
-include/postgresql/server/postmaster/fork_process.h
-include/postgresql/server/postmaster/pgarch.h
-include/postgresql/server/postmaster/postmaster.h
-include/postgresql/server/postmaster/startup.h
-include/postgresql/server/postmaster/syslogger.h
-include/postgresql/server/postmaster/walwriter.h
-include/postgresql/server/regex/regcustom.h
-include/postgresql/server/regex/regerrs.h
-include/postgresql/server/regex/regex.h
-include/postgresql/server/regex/regexport.h
-include/postgresql/server/regex/regguts.h
-include/postgresql/server/replication/basebackup.h
-include/postgresql/server/replication/decode.h
-include/postgresql/server/replication/logical.h
-include/postgresql/server/replication/logicalfuncs.h
-include/postgresql/server/replication/logicallauncher.h
-include/postgresql/server/replication/logicalproto.h
-include/postgresql/server/replication/logicalrelation.h
-include/postgresql/server/replication/logicalworker.h
-include/postgresql/server/replication/message.h
-include/postgresql/server/replication/origin.h
-include/postgresql/server/replication/output_plugin.h
-include/postgresql/server/replication/pgoutput.h
-include/postgresql/server/replication/reorderbuffer.h
-include/postgresql/server/replication/slot.h
-include/postgresql/server/replication/snapbuild.h
-include/postgresql/server/replication/syncrep.h
-include/postgresql/server/replication/walreceiver.h
-include/postgresql/server/replication/walsender.h
-include/postgresql/server/replication/walsender_private.h
-include/postgresql/server/replication/worker_internal.h
-include/postgresql/server/rewrite/prs2lock.h
-include/postgresql/server/rewrite/rewriteDefine.h
-include/postgresql/server/rewrite/rewriteHandler.h
-include/postgresql/server/rewrite/rewriteManip.h
-include/postgresql/server/rewrite/rewriteRemove.h
-include/postgresql/server/rewrite/rewriteSupport.h
-include/postgresql/server/rewrite/rowsecurity.h
-include/postgresql/server/rusagestub.h
-include/postgresql/server/snowball/header.h
-include/postgresql/server/snowball/libstemmer/api.h
-include/postgresql/server/snowball/libstemmer/header.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
-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_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_romanian.h
-include/postgresql/server/snowball/libstemmer/stem_KOI8_R_russian.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
-include/postgresql/server/snowball/libstemmer/stem_UTF_8_finnish.h
-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_italian.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
-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_spanish.h
-include/postgresql/server/snowball/libstemmer/stem_UTF_8_swedish.h
-include/postgresql/server/snowball/libstemmer/stem_UTF_8_turkish.h
-include/postgresql/server/statistics/extended_stats_internal.h
-include/postgresql/server/statistics/statistics.h
-include/postgresql/server/storage/backendid.h
-include/postgresql/server/storage/barrier.h
-include/postgresql/server/storage/block.h
-include/postgresql/server/storage/buf.h
-include/postgresql/server/storage/buf_internals.h
-include/postgresql/server/storage/buffile.h
-include/postgresql/server/storage/bufmgr.h
-include/postgresql/server/storage/bufpage.h
-include/postgresql/server/storage/checksum.h
-include/postgresql/server/storage/checksum_impl.h
-include/postgresql/server/storage/condition_variable.h
-include/postgresql/server/storage/copydir.h
-include/postgresql/server/storage/dsm.h
-include/postgresql/server/storage/dsm_impl.h
-include/postgresql/server/storage/fd.h
-include/postgresql/server/storage/freespace.h
-include/postgresql/server/storage/fsm_internals.h
-include/postgresql/server/storage/indexfsm.h
-include/postgresql/server/storage/ipc.h
-include/postgresql/server/storage/item.h
-include/postgresql/server/storage/itemid.h
-include/postgresql/server/storage/itemptr.h
-include/postgresql/server/storage/large_object.h
-include/postgresql/server/storage/latch.h
-include/postgresql/server/storage/lmgr.h
-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/off.h
-include/postgresql/server/storage/pg_sema.h
-include/postgresql/server/storage/pg_shmem.h
-include/postgresql/server/storage/pmsignal.h
-include/postgresql/server/storage/predicate.h
-include/postgresql/server/storage/predicate_internals.h
-include/postgresql/server/storage/proc.h
-include/postgresql/server/storage/procarray.h
-include/postgresql/server/storage/proclist.h
-include/postgresql/server/storage/proclist_types.h
-include/postgresql/server/storage/procsignal.h
-include/postgresql/server/storage/reinit.h
-include/postgresql/server/storage/relfilenode.h
-include/postgresql/server/storage/s_lock.h
-include/postgresql/server/storage/sharedfileset.h
-include/postgresql/server/storage/shm_mq.h
-include/postgresql/server/storage/shm_toc.h
-include/postgresql/server/storage/shmem.h
-include/postgresql/server/storage/sinval.h
-include/postgresql/server/storage/sinvaladt.h
-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/tcop/deparse_utility.h
-include/postgresql/server/tcop/dest.h
-include/postgresql/server/tcop/fastpath.h
-include/postgresql/server/tcop/pquery.h
-include/postgresql/server/tcop/tcopprot.h
-include/postgresql/server/tcop/utility.h
-include/postgresql/server/tsearch/dicts/regis.h
-include/postgresql/server/tsearch/dicts/spell.h
-include/postgresql/server/tsearch/ts_cache.h
-include/postgresql/server/tsearch/ts_locale.h
-include/postgresql/server/tsearch/ts_public.h
-include/postgresql/server/tsearch/ts_type.h
-include/postgresql/server/tsearch/ts_utils.h
-include/postgresql/server/utils/acl.h
-include/postgresql/server/utils/aclchk_internal.h
-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
-include/postgresql/server/utils/catcache.h
-include/postgresql/server/utils/combocid.h
-include/postgresql/server/utils/date.h
-include/postgresql/server/utils/datetime.h
-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/fmgroids.h
-include/postgresql/server/utils/fmgrprotos.h
-include/postgresql/server/utils/fmgrtab.h
-include/postgresql/server/utils/formatting.h
-include/postgresql/server/utils/freepage.h
-include/postgresql/server/utils/geo_decls.h
-include/postgresql/server/utils/guc.h
-include/postgresql/server/utils/guc_tables.h
-include/postgresql/server/utils/hashutils.h
-include/postgresql/server/utils/help_config.h
-include/postgresql/server/utils/hsearch.h
-include/postgresql/server/utils/index_selfuncs.h
-include/postgresql/server/utils/inet.h
-include/postgresql/server/utils/int8.h
-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/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
-include/postgresql/server/utils/pg_crc.h
-include/postgresql/server/utils/pg_locale.h
-include/postgresql/server/utils/pg_lsn.h
-include/postgresql/server/utils/pg_rusage.h
-include/postgresql/server/utils/pidfile.h
-include/postgresql/server/utils/plancache.h
-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/rangetypes.h
-include/postgresql/server/utils/regproc.h
-include/postgresql/server/utils/rel.h
-include/postgresql/server/utils/relcache.h
-include/postgresql/server/utils/relfilenodemap.h
-include/postgresql/server/utils/relmapper.h
-include/postgresql/server/utils/relptr.h
-include/postgresql/server/utils/reltrigger.h
-include/postgresql/server/utils/resowner.h
-include/postgresql/server/utils/resowner_private.h
-include/postgresql/server/utils/rls.h
-include/postgresql/server/utils/ruleutils.h
-include/postgresql/server/utils/sampling.h
-include/postgresql/server/utils/selfuncs.h
-include/postgresql/server/utils/sharedtuplestore.h
-include/postgresql/server/utils/snapmgr.h
-include/postgresql/server/utils/snapshot.h
-include/postgresql/server/utils/sortsupport.h
-include/postgresql/server/utils/spccache.h
-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
-include/postgresql/server/utils/tzparser.h
-include/postgresql/server/utils/uuid.h
-include/postgresql/server/utils/varbit.h
-include/postgresql/server/utils/varlena.h
-include/postgresql/server/utils/xml.h
-include/postgresql/server/windowapi.h
-include/sql3types.h
-include/sqlca.h
-include/sqlda-compat.h
-include/sqlda-native.h
-include/sqlda.h
-lib/libecpg.a
-lib/libecpg.so
-lib/libecpg.so.6
-lib/libecpg_compat.a
-lib/libecpg_compat.so
-lib/libecpg_compat.so.3
-lib/libpgport.a
-lib/libpgtypes.a
-lib/libpgtypes.so
-lib/libpgtypes.so.3
-lib/libpq.a
-lib/libpq.so
-lib/libpq.so.5
-lib/postgresql/pgxs/config/install-sh
-lib/postgresql/pgxs/config/missing
-lib/postgresql/pgxs/src/Makefile.global
-lib/postgresql/pgxs/src/Makefile.port
-lib/postgresql/pgxs/src/Makefile.shlib
-lib/postgresql/pgxs/src/makefiles/pgxs.mk
-lib/postgresql/pgxs/src/nls-global.mk
-lib/postgresql/pgxs/src/test/regress/pg_regress
-libdata/pkgconfig/libecpg.pc
-libdata/pkgconfig/libecpg_compat.pc
-libdata/pkgconfig/libpgtypes.pc
-libdata/pkgconfig/libpq.pc
-man/man1/clusterdb.1.gz
-man/man1/createdb.1.gz
-man/man1/createuser.1.gz
-man/man1/dropdb.1.gz
-man/man1/dropuser.1.gz
-man/man1/ecpg.1.gz
-man/man1/initdb.1.gz
-man/man1/oid2name.1.gz
-man/man1/pg_archivecleanup.1.gz
-man/man1/pg_basebackup.1.gz
-man/man1/pg_config.1.gz
-man/man1/pg_controldata.1.gz
-man/man1/pg_ctl.1.gz
-man/man1/pg_dump.1.gz
-man/man1/pg_dumpall.1.gz
-man/man1/pg_isready.1.gz
-man/man1/pg_receivewal.1.gz
-man/man1/pg_recvlogical.1.gz
-man/man1/pg_resetwal.1.gz
-man/man1/pg_restore.1.gz
-man/man1/pg_rewind.1.gz
-man/man1/pg_standby.1.gz
-man/man1/pg_test_fsync.1.gz
-man/man1/pg_test_timing.1.gz
-man/man1/pg_upgrade.1.gz
-man/man1/pg_verify_checksums.1.gz
-man/man1/pg_waldump.1.gz
-man/man1/pgbench.1.gz
-man/man1/postgres.1.gz
-man/man1/postmaster.1.gz
-man/man1/psql.1.gz
-man/man1/reindexdb.1.gz
-man/man1/vacuumdb.1.gz
-man/man1/vacuumlo.1.gz
-man/man3/SPI_commit.3.gz
-man/man3/SPI_connect.3.gz
-man/man3/SPI_connect_ext.3.gz
-man/man3/SPI_copytuple.3.gz
-man/man3/SPI_cursor_close.3.gz
-man/man3/SPI_cursor_fetch.3.gz
-man/man3/SPI_cursor_find.3.gz
-man/man3/SPI_cursor_move.3.gz
-man/man3/SPI_cursor_open.3.gz
-man/man3/SPI_cursor_open_with_args.3.gz
-man/man3/SPI_cursor_open_with_paramlist.3.gz
-man/man3/SPI_exec.3.gz
-man/man3/SPI_execp.3.gz
-man/man3/SPI_execute.3.gz
-man/man3/SPI_execute_plan.3.gz
-man/man3/SPI_execute_plan_with_paramlist.3.gz
-man/man3/SPI_execute_with_args.3.gz
-man/man3/SPI_finish.3.gz
-man/man3/SPI_fname.3.gz
-man/man3/SPI_fnumber.3.gz
-man/man3/SPI_freeplan.3.gz
-man/man3/SPI_freetuple.3.gz
-man/man3/SPI_freetuptable.3.gz
-man/man3/SPI_getargcount.3.gz
-man/man3/SPI_getargtypeid.3.gz
-man/man3/SPI_getbinval.3.gz
-man/man3/SPI_getnspname.3.gz
-man/man3/SPI_getrelname.3.gz
-man/man3/SPI_gettype.3.gz
-man/man3/SPI_gettypeid.3.gz
-man/man3/SPI_getvalue.3.gz
-man/man3/SPI_is_cursor_plan.3.gz
-man/man3/SPI_keepplan.3.gz
-man/man3/SPI_modifytuple.3.gz
-man/man3/SPI_palloc.3.gz
-man/man3/SPI_pfree.3.gz
-man/man3/SPI_prepare.3.gz
-man/man3/SPI_prepare_cursor.3.gz
-man/man3/SPI_prepare_params.3.gz
-man/man3/SPI_register_relation.3.gz
-man/man3/SPI_register_trigger_data.3.gz
-man/man3/SPI_repalloc.3.gz
-man/man3/SPI_result_code_string.3.gz
-man/man3/SPI_returntuple.3.gz
-man/man3/SPI_rollback.3.gz
-man/man3/SPI_saveplan.3.gz
-man/man3/SPI_scroll_cursor_fetch.3.gz
-man/man3/SPI_scroll_cursor_move.3.gz
-man/man3/SPI_start_transaction.3.gz
-man/man3/SPI_unregister_relation.3.gz
-man/man3/dblink.3.gz
-man/man3/dblink_build_sql_delete.3.gz
-man/man3/dblink_build_sql_insert.3.gz
-man/man3/dblink_build_sql_update.3.gz
-man/man3/dblink_cancel_query.3.gz
-man/man3/dblink_close.3.gz
-man/man3/dblink_connect.3.gz
-man/man3/dblink_connect_u.3.gz
-man/man3/dblink_disconnect.3.gz
-man/man3/dblink_error_message.3.gz
-man/man3/dblink_exec.3.gz
-man/man3/dblink_fetch.3.gz
-man/man3/dblink_get_connections.3.gz
-man/man3/dblink_get_notify.3.gz
-man/man3/dblink_get_pkey.3.gz
-man/man3/dblink_get_result.3.gz
-man/man3/dblink_is_busy.3.gz
-man/man3/dblink_open.3.gz
-man/man3/dblink_send_query.3.gz
-man/man7/ABORT.7.gz
-man/man7/ALTER_AGGREGATE.7.gz
-man/man7/ALTER_COLLATION.7.gz
-man/man7/ALTER_CONVERSION.7.gz
-man/man7/ALTER_DATABASE.7.gz
-man/man7/ALTER_DEFAULT_PRIVILEGES.7.gz
-man/man7/ALTER_DOMAIN.7.gz
-man/man7/ALTER_EVENT_TRIGGER.7.gz
-man/man7/ALTER_EXTENSION.7.gz
-man/man7/ALTER_FOREIGN_DATA_WRAPPER.7.gz
-man/man7/ALTER_FOREIGN_TABLE.7.gz
-man/man7/ALTER_FUNCTION.7.gz
-man/man7/ALTER_GROUP.7.gz
-man/man7/ALTER_INDEX.7.gz
-man/man7/ALTER_LANGUAGE.7.gz
-man/man7/ALTER_LARGE_OBJECT.7.gz
-man/man7/ALTER_MATERIALIZED_VIEW.7.gz
-man/man7/ALTER_OPERATOR.7.gz
-man/man7/ALTER_OPERATOR_CLASS.7.gz
-man/man7/ALTER_OPERATOR_FAMILY.7.gz
-man/man7/ALTER_POLICY.7.gz
-man/man7/ALTER_PROCEDURE.7.gz
-man/man7/ALTER_PUBLICATION.7.gz
-man/man7/ALTER_ROLE.7.gz
-man/man7/ALTER_ROUTINE.7.gz
-man/man7/ALTER_RULE.7.gz
-man/man7/ALTER_SCHEMA.7.gz
-man/man7/ALTER_SEQUENCE.7.gz
-man/man7/ALTER_SERVER.7.gz
-man/man7/ALTER_STATISTICS.7.gz
-man/man7/ALTER_SUBSCRIPTION.7.gz
-man/man7/ALTER_SYSTEM.7.gz
-man/man7/ALTER_TABLE.7.gz
-man/man7/ALTER_TABLESPACE.7.gz
-man/man7/ALTER_TEXT_SEARCH_CONFIGURATION.7.gz
-man/man7/ALTER_TEXT_SEARCH_DICTIONARY.7.gz
-man/man7/ALTER_TEXT_SEARCH_PARSER.7.gz
-man/man7/ALTER_TEXT_SEARCH_TEMPLATE.7.gz
-man/man7/ALTER_TRIGGER.7.gz
-man/man7/ALTER_TYPE.7.gz
-man/man7/ALTER_USER.7.gz
-man/man7/ALTER_USER_MAPPING.7.gz
-man/man7/ALTER_VIEW.7.gz
-man/man7/ANALYZE.7.gz
-man/man7/BEGIN.7.gz
-man/man7/CALL.7.gz
-man/man7/CHECKPOINT.7.gz
-man/man7/CLOSE.7.gz
-man/man7/CLUSTER.7.gz
-man/man7/COMMENT.7.gz
-man/man7/COMMIT.7.gz
-man/man7/COMMIT_PREPARED.7.gz
-man/man7/COPY.7.gz
-man/man7/CREATE_ACCESS_METHOD.7.gz
-man/man7/CREATE_AGGREGATE.7.gz
-man/man7/CREATE_CAST.7.gz
-man/man7/CREATE_COLLATION.7.gz
-man/man7/CREATE_CONVERSION.7.gz
-man/man7/CREATE_DATABASE.7.gz
-man/man7/CREATE_DOMAIN.7.gz
-man/man7/CREATE_EVENT_TRIGGER.7.gz
-man/man7/CREATE_EXTENSION.7.gz
-man/man7/CREATE_FOREIGN_DATA_WRAPPER.7.gz
-man/man7/CREATE_FOREIGN_TABLE.7.gz
-man/man7/CREATE_FUNCTION.7.gz
-man/man7/CREATE_GROUP.7.gz
-man/man7/CREATE_INDEX.7.gz
-man/man7/CREATE_LANGUAGE.7.gz
-man/man7/CREATE_MATERIALIZED_VIEW.7.gz
-man/man7/CREATE_OPERATOR.7.gz
-man/man7/CREATE_OPERATOR_CLASS.7.gz
-man/man7/CREATE_OPERATOR_FAMILY.7.gz
-man/man7/CREATE_POLICY.7.gz
-man/man7/CREATE_PROCEDURE.7.gz
-man/man7/CREATE_PUBLICATION.7.gz
-man/man7/CREATE_ROLE.7.gz
-man/man7/CREATE_RULE.7.gz
-man/man7/CREATE_SCHEMA.7.gz
-man/man7/CREATE_SEQUENCE.7.gz
-man/man7/CREATE_SERVER.7.gz
-man/man7/CREATE_STATISTICS.7.gz
-man/man7/CREATE_SUBSCRIPTION.7.gz
-man/man7/CREATE_TABLE.7.gz
-man/man7/CREATE_TABLESPACE.7.gz
-man/man7/CREATE_TABLE_AS.7.gz
-man/man7/CREATE_TEXT_SEARCH_CONFIGURATION.7.gz
-man/man7/CREATE_TEXT_SEARCH_DICTIONARY.7.gz
-man/man7/CREATE_TEXT_SEARCH_PARSER.7.gz
-man/man7/CREATE_TEXT_SEARCH_TEMPLATE.7.gz
-man/man7/CREATE_TRANSFORM.7.gz
-man/man7/CREATE_TRIGGER.7.gz
-man/man7/CREATE_TYPE.7.gz
-man/man7/CREATE_USER.7.gz
-man/man7/CREATE_USER_MAPPING.7.gz
-man/man7/CREATE_VIEW.7.gz
-man/man7/DEALLOCATE.7.gz
-man/man7/DECLARE.7.gz
-man/man7/DELETE.7.gz
-man/man7/DISCARD.7.gz
-man/man7/DO.7.gz
-man/man7/DROP_ACCESS_METHOD.7.gz
-man/man7/DROP_AGGREGATE.7.gz
-man/man7/DROP_CAST.7.gz
-man/man7/DROP_COLLATION.7.gz
-man/man7/DROP_CONVERSION.7.gz
-man/man7/DROP_DATABASE.7.gz
-man/man7/DROP_DOMAIN.7.gz
-man/man7/DROP_EVENT_TRIGGER.7.gz
-man/man7/DROP_EXTENSION.7.gz
-man/man7/DROP_FOREIGN_DATA_WRAPPER.7.gz
-man/man7/DROP_FOREIGN_TABLE.7.gz
-man/man7/DROP_FUNCTION.7.gz
-man/man7/DROP_GROUP.7.gz
-man/man7/DROP_INDEX.7.gz
-man/man7/DROP_LANGUAGE.7.gz
-man/man7/DROP_MATERIALIZED_VIEW.7.gz
-man/man7/DROP_OPERATOR.7.gz
-man/man7/DROP_OPERATOR_CLASS.7.gz
-man/man7/DROP_OPERATOR_FAMILY.7.gz
-man/man7/DROP_OWNED.7.gz
-man/man7/DROP_POLICY.7.gz
-man/man7/DROP_PROCEDURE.7.gz
-man/man7/DROP_PUBLICATION.7.gz
-man/man7/DROP_ROLE.7.gz
-man/man7/DROP_ROUTINE.7.gz
-man/man7/DROP_RULE.7.gz
-man/man7/DROP_SCHEMA.7.gz
-man/man7/DROP_SEQUENCE.7.gz
-man/man7/DROP_SERVER.7.gz
-man/man7/DROP_STATISTICS.7.gz
-man/man7/DROP_SUBSCRIPTION.7.gz
-man/man7/DROP_TABLE.7.gz
-man/man7/DROP_TABLESPACE.7.gz
-man/man7/DROP_TEXT_SEARCH_CONFIGURATION.7.gz
-man/man7/DROP_TEXT_SEARCH_DICTIONARY.7.gz
-man/man7/DROP_TEXT_SEARCH_PARSER.7.gz
-man/man7/DROP_TEXT_SEARCH_TEMPLATE.7.gz
-man/man7/DROP_TRANSFORM.7.gz
-man/man7/DROP_TRIGGER.7.gz
-man/man7/DROP_TYPE.7.gz
-man/man7/DROP_USER.7.gz
-man/man7/DROP_USER_MAPPING.7.gz
-man/man7/DROP_VIEW.7.gz
-man/man7/END.7.gz
-man/man7/EXECUTE.7.gz
-man/man7/EXPLAIN.7.gz
-man/man7/FETCH.7.gz
-man/man7/GRANT.7.gz
-man/man7/IMPORT_FOREIGN_SCHEMA.7.gz
-man/man7/INSERT.7.gz
-man/man7/LISTEN.7.gz
-man/man7/LOAD.7.gz
-man/man7/LOCK.7.gz
-man/man7/MOVE.7.gz
-man/man7/NOTIFY.7.gz
-man/man7/PREPARE.7.gz
-man/man7/PREPARE_TRANSACTION.7.gz
-man/man7/REASSIGN_OWNED.7.gz
-man/man7/REFRESH_MATERIALIZED_VIEW.7.gz
-man/man7/REINDEX.7.gz
-man/man7/RELEASE_SAVEPOINT.7.gz
-man/man7/RESET.7.gz
-man/man7/REVOKE.7.gz
-man/man7/ROLLBACK.7.gz
-man/man7/ROLLBACK_PREPARED.7.gz
-man/man7/ROLLBACK_TO_SAVEPOINT.7.gz
-man/man7/SAVEPOINT.7.gz
-man/man7/SECURITY_LABEL.7.gz
-man/man7/SELECT.7.gz
-man/man7/SELECT_INTO.7.gz
-man/man7/SET.7.gz
-man/man7/SET_CONSTRAINTS.7.gz
-man/man7/SET_ROLE.7.gz
-man/man7/SET_SESSION_AUTHORIZATION.7.gz
-man/man7/SET_TRANSACTION.7.gz
-man/man7/SHOW.7.gz
-man/man7/START_TRANSACTION.7.gz
-man/man7/TABLE.7.gz
-man/man7/TRUNCATE.7.gz
-man/man7/UNLISTEN.7.gz
-man/man7/UPDATE.7.gz
-man/man7/VACUUM.7.gz
-man/man7/VALUES.7.gz
-man/man7/WITH.7.gz
-%%PORTDOCS%%%%DOCSDIR%%/README-client
-%%NLS%%share/locale/cs/LC_MESSAGES/ecpg-11.mo
-%%NLS%%share/locale/cs/LC_MESSAGES/ecpglib6-11.mo
-%%NLS%%share/locale/cs/LC_MESSAGES/libpq5-11.mo
-%%NLS%%share/locale/cs/LC_MESSAGES/pg_config-11.mo
-%%NLS%%share/locale/cs/LC_MESSAGES/pg_dump-11.mo
-%%NLS%%share/locale/cs/LC_MESSAGES/pgscripts-11.mo
-%%NLS%%share/locale/cs/LC_MESSAGES/psql-11.mo
-%%NLS%%share/locale/de/LC_MESSAGES/ecpg-11.mo
-%%NLS%%share/locale/de/LC_MESSAGES/ecpglib6-11.mo
-%%NLS%%share/locale/de/LC_MESSAGES/libpq5-11.mo
-%%NLS%%share/locale/de/LC_MESSAGES/pg_config-11.mo
-%%NLS%%share/locale/de/LC_MESSAGES/pg_dump-11.mo
-%%NLS%%share/locale/de/LC_MESSAGES/pgscripts-11.mo
-%%NLS%%share/locale/de/LC_MESSAGES/psql-11.mo
-%%NLS%%share/locale/es/LC_MESSAGES/ecpg-11.mo
-%%NLS%%share/locale/es/LC_MESSAGES/ecpglib6-11.mo
-%%NLS%%share/locale/es/LC_MESSAGES/libpq5-11.mo
-%%NLS%%share/locale/es/LC_MESSAGES/pg_config-11.mo
-%%NLS%%share/locale/es/LC_MESSAGES/pg_dump-11.mo
-%%NLS%%share/locale/es/LC_MESSAGES/pgscripts-11.mo
-%%NLS%%share/locale/es/LC_MESSAGES/psql-11.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/ecpg-11.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/ecpglib6-11.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/libpq5-11.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/pg_config-11.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/pg_dump-11.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/pgscripts-11.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/psql-11.mo
-%%NLS%%share/locale/he/LC_MESSAGES/libpq5-11.mo
-%%NLS%%share/locale/he/LC_MESSAGES/pg_config-11.mo
-%%NLS%%share/locale/he/LC_MESSAGES/pg_dump-11.mo
-%%NLS%%share/locale/he/LC_MESSAGES/pgscripts-11.mo
-%%NLS%%share/locale/he/LC_MESSAGES/psql-11.mo
-%%NLS%%share/locale/it/LC_MESSAGES/ecpg-11.mo
-%%NLS%%share/locale/it/LC_MESSAGES/ecpglib6-11.mo
-%%NLS%%share/locale/it/LC_MESSAGES/libpq5-11.mo
-%%NLS%%share/locale/it/LC_MESSAGES/pg_config-11.mo
-%%NLS%%share/locale/it/LC_MESSAGES/pg_dump-11.mo
-%%NLS%%share/locale/it/LC_MESSAGES/pgscripts-11.mo
-%%NLS%%share/locale/it/LC_MESSAGES/psql-11.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/ecpg-11.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/ecpglib6-11.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/libpq5-11.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/pg_config-11.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/pg_dump-11.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/pgscripts-11.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/psql-11.mo
-%%NLS%%share/locale/ko/LC_MESSAGES/ecpg-11.mo
-%%NLS%%share/locale/ko/LC_MESSAGES/ecpglib6-11.mo
-%%NLS%%share/locale/ko/LC_MESSAGES/libpq5-11.mo
-%%NLS%%share/locale/ko/LC_MESSAGES/pg_config-11.mo
-%%NLS%%share/locale/ko/LC_MESSAGES/pg_dump-11.mo
-%%NLS%%share/locale/ko/LC_MESSAGES/pgscripts-11.mo
-%%NLS%%share/locale/ko/LC_MESSAGES/psql-11.mo
-%%NLS%%share/locale/nb/LC_MESSAGES/pg_config-11.mo
-%%NLS%%share/locale/pl/LC_MESSAGES/ecpg-11.mo
-%%NLS%%share/locale/pl/LC_MESSAGES/ecpglib6-11.mo
-%%NLS%%share/locale/pl/LC_MESSAGES/libpq5-11.mo
-%%NLS%%share/locale/pl/LC_MESSAGES/pg_config-11.mo
-%%NLS%%share/locale/pl/LC_MESSAGES/pg_dump-11.mo
-%%NLS%%share/locale/pl/LC_MESSAGES/pgscripts-11.mo
-%%NLS%%share/locale/pl/LC_MESSAGES/psql-11.mo
-%%NLS%%share/locale/pt_BR/LC_MESSAGES/ecpg-11.mo
-%%NLS%%share/locale/pt_BR/LC_MESSAGES/ecpglib6-11.mo
-%%NLS%%share/locale/pt_BR/LC_MESSAGES/libpq5-11.mo
-%%NLS%%share/locale/pt_BR/LC_MESSAGES/pg_config-11.mo
-%%NLS%%share/locale/pt_BR/LC_MESSAGES/pg_dump-11.mo
-%%NLS%%share/locale/pt_BR/LC_MESSAGES/pgscripts-11.mo
-%%NLS%%share/locale/pt_BR/LC_MESSAGES/psql-11.mo
-%%NLS%%share/locale/ro/LC_MESSAGES/pg_config-11.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/ecpg-11.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/ecpglib6-11.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/libpq5-11.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/pg_config-11.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/pg_dump-11.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/pgscripts-11.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/psql-11.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/ecpg-11.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/ecpglib6-11.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/libpq5-11.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/pg_config-11.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/pg_dump-11.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/pgscripts-11.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/psql-11.mo
-%%NLS%%share/locale/ta/LC_MESSAGES/pg_config-11.mo
-%%NLS%%share/locale/tr/LC_MESSAGES/ecpg-11.mo
-%%NLS%%share/locale/tr/LC_MESSAGES/ecpglib6-11.mo
-%%NLS%%share/locale/tr/LC_MESSAGES/libpq5-11.mo
-%%NLS%%share/locale/tr/LC_MESSAGES/pg_config-11.mo
-%%NLS%%share/locale/tr/LC_MESSAGES/pg_dump-11.mo
-%%NLS%%share/locale/tr/LC_MESSAGES/pgscripts-11.mo
-%%NLS%%share/locale/tr/LC_MESSAGES/psql-11.mo
-%%NLS%%share/locale/vi/LC_MESSAGES/ecpg-11.mo
-%%NLS%%share/locale/vi/LC_MESSAGES/ecpglib6-11.mo
-%%NLS%%share/locale/vi/LC_MESSAGES/pg_config-11.mo
-%%NLS%%share/locale/zh_CN/LC_MESSAGES/ecpg-11.mo
-%%NLS%%share/locale/zh_CN/LC_MESSAGES/ecpglib6-11.mo
-%%NLS%%share/locale/zh_CN/LC_MESSAGES/libpq5-11.mo
-%%NLS%%share/locale/zh_CN/LC_MESSAGES/pg_config-11.mo
-%%NLS%%share/locale/zh_CN/LC_MESSAGES/pg_dump-11.mo
-%%NLS%%share/locale/zh_CN/LC_MESSAGES/pgscripts-11.mo
-%%NLS%%share/locale/zh_CN/LC_MESSAGES/psql-11.mo
-%%NLS%%share/locale/zh_TW/LC_MESSAGES/ecpg-11.mo
-%%NLS%%share/locale/zh_TW/LC_MESSAGES/pg_config-11.mo
-%%DATADIR%%/pg_service.conf.sample
-%%DATADIR%%/psqlrc.sample
-
diff --git a/databases/postgresql11-server/pkg-plist-contrib b/databases/postgresql11-server/pkg-plist-contrib
deleted file mode 100644
index bd1959351bb5..000000000000
--- a/databases/postgresql11-server/pkg-plist-contrib
+++ /dev/null
@@ -1,266 +0,0 @@
-bin/oid2name
-bin/pg_standby
-bin/vacuumlo
-include/postgresql/server/extension/cube/cubedata.h
-include/postgresql/server/extension/hstore/hstore.h
-include/postgresql/server/extension/isn/isn.h
-include/postgresql/server/extension/ltree/ltree.h
-include/postgresql/server/extension/seg/segdata.h
-lib/postgresql/_int.so
-lib/postgresql/adminpack.so
-lib/postgresql/amcheck.so
-lib/postgresql/auth_delay.so
-lib/postgresql/auto_explain.so
-lib/postgresql/autoinc.so
-lib/postgresql/bloom.so
-lib/postgresql/btree_gin.so
-lib/postgresql/btree_gist.so
-lib/postgresql/citext.so
-lib/postgresql/cube.so
-lib/postgresql/dblink.so
-lib/postgresql/dict_int.so
-lib/postgresql/dict_xsyn.so
-lib/postgresql/earthdistance.so
-lib/postgresql/file_fdw.so
-lib/postgresql/fuzzystrmatch.so
-lib/postgresql/hstore.so
-lib/postgresql/insert_username.so
-lib/postgresql/isn.so
-lib/postgresql/lo.so
-lib/postgresql/ltree.so
-lib/postgresql/moddatetime.so
-lib/postgresql/pageinspect.so
-lib/postgresql/passwordcheck.so
-lib/postgresql/pg_buffercache.so
-lib/postgresql/pg_freespacemap.so
-lib/postgresql/pg_prewarm.so
-lib/postgresql/pg_stat_statements.so
-lib/postgresql/pg_trgm.so
-lib/postgresql/pg_visibility.so
-lib/postgresql/pgcrypto.so
-lib/postgresql/pgrowlocks.so
-lib/postgresql/pgstattuple.so
-%%XML%%lib/postgresql/pgxml.so
-lib/postgresql/postgres_fdw.so
-lib/postgresql/refint.so
-lib/postgresql/seg.so
-%%OPENSSL%%lib/postgresql/sslinfo.so
-lib/postgresql/tablefunc.so
-lib/postgresql/tcn.so
-lib/postgresql/test_decoding.so
-lib/postgresql/timetravel.so
-lib/postgresql/tsm_system_rows.so
-lib/postgresql/tsm_system_time.so
-lib/postgresql/unaccent.so
-lib/postgresql/uuid-ossp.so
-%%PORTDOCS%%%%DOCSDIR%%/README-contrib
-%%PORTDOCS%%%%DOCSDIR%%/extension/README
-%%PORTDOCS%%%%DOCSDIR%%/extension/autoinc.example
-%%PORTDOCS%%%%DOCSDIR%%/extension/insert_username.example
-%%PORTDOCS%%%%DOCSDIR%%/extension/moddatetime.example
-%%PORTDOCS%%%%DOCSDIR%%/extension/refint.example
-%%PORTDOCS%%%%DOCSDIR%%/extension/timetravel.example
-%%DATADIR%%/extension/adminpack--1.0--1.1.sql
-%%DATADIR%%/extension/adminpack--1.0.sql
-%%DATADIR%%/extension/adminpack--1.1--2.0.sql
-%%DATADIR%%/extension/adminpack.control
-%%DATADIR%%/extension/amcheck--1.0--1.1.sql
-%%DATADIR%%/extension/amcheck--1.0.sql
-%%DATADIR%%/extension/amcheck.control
-%%DATADIR%%/extension/autoinc--1.0.sql
-%%DATADIR%%/extension/autoinc--unpackaged--1.0.sql
-%%DATADIR%%/extension/autoinc.control
-%%DATADIR%%/extension/bloom--1.0.sql
-%%DATADIR%%/extension/bloom.control
-%%DATADIR%%/extension/btree_gin--1.0--1.1.sql
-%%DATADIR%%/extension/btree_gin--1.0.sql
-%%DATADIR%%/extension/btree_gin--1.1--1.2.sql
-%%DATADIR%%/extension/btree_gin--1.2--1.3.sql
-%%DATADIR%%/extension/btree_gin--unpackaged--1.0.sql
-%%DATADIR%%/extension/btree_gin.control
-%%DATADIR%%/extension/btree_gist--1.0--1.1.sql
-%%DATADIR%%/extension/btree_gist--1.1--1.2.sql
-%%DATADIR%%/extension/btree_gist--1.2--1.3.sql
-%%DATADIR%%/extension/btree_gist--1.2.sql
-%%DATADIR%%/extension/btree_gist--1.3--1.4.sql
-%%DATADIR%%/extension/btree_gist--1.4--1.5.sql
-%%DATADIR%%/extension/btree_gist--unpackaged--1.0.sql
-%%DATADIR%%/extension/btree_gist.control
-%%DATADIR%%/extension/citext--1.0--1.1.sql
-%%DATADIR%%/extension/citext--1.1--1.2.sql
-%%DATADIR%%/extension/citext--1.2--1.3.sql
-%%DATADIR%%/extension/citext--1.3--1.4.sql
-%%DATADIR%%/extension/citext--1.4--1.5.sql
-%%DATADIR%%/extension/citext--1.4.sql
-%%DATADIR%%/extension/citext--unpackaged--1.0.sql
-%%DATADIR%%/extension/citext.control
-%%DATADIR%%/extension/cube--1.0--1.1.sql
-%%DATADIR%%/extension/cube--1.1--1.2.sql
-%%DATADIR%%/extension/cube--1.2--1.3.sql
-%%DATADIR%%/extension/cube--1.2.sql
-%%DATADIR%%/extension/cube--1.3--1.4.sql
-%%DATADIR%%/extension/cube--unpackaged--1.0.sql
-%%DATADIR%%/extension/cube.control
-%%DATADIR%%/extension/dblink--1.0--1.1.sql
-%%DATADIR%%/extension/dblink--1.1--1.2.sql
-%%DATADIR%%/extension/dblink--1.2.sql
-%%DATADIR%%/extension/dblink--unpackaged--1.0.sql
-%%DATADIR%%/extension/dblink.control
-%%DATADIR%%/extension/dict_int--1.0.sql
-%%DATADIR%%/extension/dict_int--unpackaged--1.0.sql
-%%DATADIR%%/extension/dict_int.control
-%%DATADIR%%/extension/dict_xsyn--1.0.sql
-%%DATADIR%%/extension/dict_xsyn--unpackaged--1.0.sql
-%%DATADIR%%/extension/dict_xsyn.control
-%%DATADIR%%/extension/earthdistance--1.0--1.1.sql
-%%DATADIR%%/extension/earthdistance--1.1.sql
-%%DATADIR%%/extension/earthdistance--unpackaged--1.0.sql
-%%DATADIR%%/extension/earthdistance.control
-%%DATADIR%%/extension/file_fdw--1.0.sql
-%%DATADIR%%/extension/file_fdw.control
-%%DATADIR%%/extension/fuzzystrmatch--1.0--1.1.sql
-%%DATADIR%%/extension/fuzzystrmatch--1.1.sql
-%%DATADIR%%/extension/fuzzystrmatch--unpackaged--1.0.sql
-%%DATADIR%%/extension/fuzzystrmatch.control
-%%DATADIR%%/extension/hstore--1.0--1.1.sql
-%%DATADIR%%/extension/hstore--1.1--1.2.sql
-%%DATADIR%%/extension/hstore--1.2--1.3.sql
-%%DATADIR%%/extension/hstore--1.3--1.4.sql
-%%DATADIR%%/extension/hstore--1.4--1.5.sql
-%%DATADIR%%/extension/hstore--1.4.sql
-%%DATADIR%%/extension/hstore--unpackaged--1.0.sql
-%%DATADIR%%/extension/hstore.control
-%%DATADIR%%/extension/insert_username--1.0.sql
-%%DATADIR%%/extension/insert_username--unpackaged--1.0.sql
-%%DATADIR%%/extension/insert_username.control
-%%DATADIR%%/extension/intagg--1.0--1.1.sql
-%%DATADIR%%/extension/intagg--1.1.sql
-%%DATADIR%%/extension/intagg--unpackaged--1.0.sql
-%%DATADIR%%/extension/intagg.control
-%%DATADIR%%/extension/intarray--1.0--1.1.sql
-%%DATADIR%%/extension/intarray--1.1--1.2.sql
-%%DATADIR%%/extension/intarray--1.2.sql
-%%DATADIR%%/extension/intarray--unpackaged--1.0.sql
-%%DATADIR%%/extension/intarray.control
-%%DATADIR%%/extension/isn--1.0--1.1.sql
-%%DATADIR%%/extension/isn--1.1--1.2.sql
-%%DATADIR%%/extension/isn--1.1.sql
-%%DATADIR%%/extension/isn--unpackaged--1.0.sql
-%%DATADIR%%/extension/isn.control
-%%DATADIR%%/extension/lo--1.0--1.1.sql
-%%DATADIR%%/extension/lo--1.1.sql
-%%DATADIR%%/extension/lo--unpackaged--1.0.sql
-%%DATADIR%%/extension/lo.control
-%%DATADIR%%/extension/ltree--1.0--1.1.sql
-%%DATADIR%%/extension/ltree--1.1.sql
-%%DATADIR%%/extension/ltree--unpackaged--1.0.sql
-%%DATADIR%%/extension/ltree.control
-%%DATADIR%%/extension/moddatetime--1.0.sql
-%%DATADIR%%/extension/moddatetime--unpackaged--1.0.sql
-%%DATADIR%%/extension/moddatetime.control
-%%DATADIR%%/extension/pageinspect--1.0--1.1.sql
-%%DATADIR%%/extension/pageinspect--1.1--1.2.sql
-%%DATADIR%%/extension/pageinspect--1.2--1.3.sql
-%%DATADIR%%/extension/pageinspect--1.3--1.4.sql
-%%DATADIR%%/extension/pageinspect--1.4--1.5.sql
-%%DATADIR%%/extension/pageinspect--1.5--1.6.sql
-%%DATADIR%%/extension/pageinspect--1.5.sql
-%%DATADIR%%/extension/pageinspect--1.6--1.7.sql
-%%DATADIR%%/extension/pageinspect--unpackaged--1.0.sql
-%%DATADIR%%/extension/pageinspect.control
-%%DATADIR%%/extension/pg_buffercache--1.0--1.1.sql
-%%DATADIR%%/extension/pg_buffercache--1.1--1.2.sql
-%%DATADIR%%/extension/pg_buffercache--1.2--1.3.sql
-%%DATADIR%%/extension/pg_buffercache--1.2.sql
-%%DATADIR%%/extension/pg_buffercache--unpackaged--1.0.sql
-%%DATADIR%%/extension/pg_buffercache.control
-%%DATADIR%%/extension/pg_freespacemap--1.0--1.1.sql
-%%DATADIR%%/extension/pg_freespacemap--1.1--1.2.sql
-%%DATADIR%%/extension/pg_freespacemap--1.1.sql
-%%DATADIR%%/extension/pg_freespacemap--unpackaged--1.0.sql
-%%DATADIR%%/extension/pg_freespacemap.control
-%%DATADIR%%/extension/pg_prewarm--1.0--1.1.sql
-%%DATADIR%%/extension/pg_prewarm--1.1--1.2.sql
-%%DATADIR%%/extension/pg_prewarm--1.1.sql
-%%DATADIR%%/extension/pg_prewarm.control
-%%DATADIR%%/extension/pg_stat_statements--1.0--1.1.sql
-%%DATADIR%%/extension/pg_stat_statements--1.1--1.2.sql
-%%DATADIR%%/extension/pg_stat_statements--1.2--1.3.sql
-%%DATADIR%%/extension/pg_stat_statements--1.3--1.4.sql
-%%DATADIR%%/extension/pg_stat_statements--1.4--1.5.sql
-%%DATADIR%%/extension/pg_stat_statements--1.4.sql
-%%DATADIR%%/extension/pg_stat_statements--1.5--1.6.sql
-%%DATADIR%%/extension/pg_stat_statements--unpackaged--1.0.sql
-%%DATADIR%%/extension/pg_stat_statements.control
-%%DATADIR%%/extension/pg_trgm--1.0--1.1.sql
-%%DATADIR%%/extension/pg_trgm--1.1--1.2.sql
-%%DATADIR%%/extension/pg_trgm--1.2--1.3.sql
-%%DATADIR%%/extension/pg_trgm--1.3--1.4.sql
-%%DATADIR%%/extension/pg_trgm--1.3.sql
-%%DATADIR%%/extension/pg_trgm--unpackaged--1.0.sql
-%%DATADIR%%/extension/pg_trgm.control
-%%DATADIR%%/extension/pg_visibility--1.0--1.1.sql
-%%DATADIR%%/extension/pg_visibility--1.1--1.2.sql
-%%DATADIR%%/extension/pg_visibility--1.1.sql
-%%DATADIR%%/extension/pg_visibility.control
-%%DATADIR%%/extension/pgcrypto--1.0--1.1.sql
-%%DATADIR%%/extension/pgcrypto--1.1--1.2.sql
-%%DATADIR%%/extension/pgcrypto--1.2--1.3.sql
-%%DATADIR%%/extension/pgcrypto--1.3.sql
-%%DATADIR%%/extension/pgcrypto--unpackaged--1.0.sql
-%%DATADIR%%/extension/pgcrypto.control
-%%DATADIR%%/extension/pgrowlocks--1.0--1.1.sql
-%%DATADIR%%/extension/pgrowlocks--1.1--1.2.sql
-%%DATADIR%%/extension/pgrowlocks--1.2.sql
-%%DATADIR%%/extension/pgrowlocks--unpackaged--1.0.sql
-%%DATADIR%%/extension/pgrowlocks.control
-%%DATADIR%%/extension/pgstattuple--1.0--1.1.sql
-%%DATADIR%%/extension/pgstattuple--1.1--1.2.sql
-%%DATADIR%%/extension/pgstattuple--1.2--1.3.sql
-%%DATADIR%%/extension/pgstattuple--1.3--1.4.sql
-%%DATADIR%%/extension/pgstattuple--1.4--1.5.sql
-%%DATADIR%%/extension/pgstattuple--1.4.sql
-%%DATADIR%%/extension/pgstattuple--unpackaged--1.0.sql
-%%DATADIR%%/extension/pgstattuple.control
-%%DATADIR%%/extension/postgres_fdw--1.0.sql
-%%DATADIR%%/extension/postgres_fdw.control
-%%DATADIR%%/extension/refint--1.0.sql
-%%DATADIR%%/extension/refint--unpackaged--1.0.sql
-%%DATADIR%%/extension/refint.control
-%%DATADIR%%/extension/seg--1.0--1.1.sql
-%%DATADIR%%/extension/seg--1.1--1.2.sql
-%%DATADIR%%/extension/seg--1.1.sql
-%%DATADIR%%/extension/seg--1.2--1.3.sql
-%%DATADIR%%/extension/seg--unpackaged--1.0.sql
-%%DATADIR%%/extension/seg.control
-%%OPENSSL%%%%DATADIR%%/extension/sslinfo--1.0--1.1.sql
-%%OPENSSL%%%%DATADIR%%/extension/sslinfo--1.1--1.2.sql
-%%OPENSSL%%%%DATADIR%%/extension/sslinfo--1.2.sql
-%%OPENSSL%%%%DATADIR%%/extension/sslinfo--unpackaged--1.0.sql
-%%OPENSSL%%%%DATADIR%%/extension/sslinfo.control
-%%DATADIR%%/extension/tablefunc--1.0.sql
-%%DATADIR%%/extension/tablefunc--unpackaged--1.0.sql
-%%DATADIR%%/extension/tablefunc.control
-%%DATADIR%%/extension/tcn--1.0.sql
-%%DATADIR%%/extension/tcn.control
-%%DATADIR%%/extension/timetravel--1.0.sql
-%%DATADIR%%/extension/timetravel--unpackaged--1.0.sql
-%%DATADIR%%/extension/timetravel.control
-%%DATADIR%%/extension/tsm_system_rows--1.0.sql
-%%DATADIR%%/extension/tsm_system_rows.control
-%%DATADIR%%/extension/tsm_system_time--1.0.sql
-%%DATADIR%%/extension/tsm_system_time.control
-%%DATADIR%%/extension/unaccent--1.0--1.1.sql
-%%DATADIR%%/extension/unaccent--1.1.sql
-%%DATADIR%%/extension/unaccent--unpackaged--1.0.sql
-%%DATADIR%%/extension/unaccent.control
-%%DATADIR%%/extension/uuid-ossp--1.0--1.1.sql
-%%DATADIR%%/extension/uuid-ossp--1.1.sql
-%%DATADIR%%/extension/uuid-ossp--unpackaged--1.0.sql
-%%DATADIR%%/extension/uuid-ossp.control
-%%XML%%%%DATADIR%%/extension/xml2--1.0--1.1.sql
-%%XML%%%%DATADIR%%/extension/xml2--1.1.sql
-%%XML%%%%DATADIR%%/extension/xml2--unpackaged--1.0.sql
-%%XML%%%%DATADIR%%/extension/xml2.control
-%%DATADIR%%/tsearch_data/unaccent.rules
-%%DATADIR%%/tsearch_data/xsyn_sample.rules
diff --git a/databases/postgresql11-server/pkg-plist-plperl b/databases/postgresql11-server/pkg-plist-plperl
deleted file mode 100644
index 93081938fd08..000000000000
--- a/databases/postgresql11-server/pkg-plist-plperl
+++ /dev/null
@@ -1,21 +0,0 @@
-include/postgresql/server/plperl.h
-include/postgresql/server/plperl_helpers.h
-include/postgresql/server/ppport.h
-%%DATADIR%%/extension/plperlu--1.0.sql
-%%DATADIR%%/extension/plperl.control
-%%DATADIR%%/extension/plperl--1.0.sql
-%%DATADIR%%/extension/plperlu.control
-%%DATADIR%%/extension/plperlu--unpackaged--1.0.sql
-%%DATADIR%%/extension/plperl--unpackaged--1.0.sql
-%%DOCSDIR%%/README-plperl
-lib/postgresql/plperl.so
-lib/postgresql/hstore_plperl.so
-lib/postgresql/jsonb_plperl.so
-%%DATADIR%%/extension/hstore_plperl--1.0.sql
-%%DATADIR%%/extension/hstore_plperl.control
-%%DATADIR%%/extension/hstore_plperlu--1.0.sql
-%%DATADIR%%/extension/hstore_plperlu.control
-%%DATADIR%%/extension/jsonb_plperl--1.0.sql
-%%DATADIR%%/extension/jsonb_plperl.control
-%%DATADIR%%/extension/jsonb_plperlu--1.0.sql
-%%DATADIR%%/extension/jsonb_plperlu.control
diff --git a/databases/postgresql11-server/pkg-plist-plpython b/databases/postgresql11-server/pkg-plist-plpython
deleted file mode 100644
index 8ecdbbea15a3..000000000000
--- a/databases/postgresql11-server/pkg-plist-plpython
+++ /dev/null
@@ -1,47 +0,0 @@
-include/postgresql/server/plpy_cursorobject.h
-include/postgresql/server/plpy_elog.h
-include/postgresql/server/plpy_exec.h
-include/postgresql/server/plpy_main.h
-include/postgresql/server/plpy_planobject.h
-include/postgresql/server/plpy_plpymodule.h
-include/postgresql/server/plpy_procedure.h
-include/postgresql/server/plpy_resultobject.h
-include/postgresql/server/plpy_spi.h
-include/postgresql/server/plpy_subxactobject.h
-include/postgresql/server/plpy_typeio.h
-include/postgresql/server/plpy_util.h
-include/postgresql/server/plpython.h
-lib/postgresql/pgxs/src/pl/plpython/regress-python3-mangle.mk
-%%DOCSDIR%%/README-plpython
-%%PYTHON2%%lib/postgresql/plpython2.so
-%%PYTHON3%%lib/postgresql/plpython3.so
-%%PYTHON2%%%%DATADIR%%/extension/plpython2u--1.0.sql
-%%PYTHON2%%%%DATADIR%%/extension/plpython2u--unpackaged--1.0.sql
-%%PYTHON2%%%%DATADIR%%/extension/plpython2u.control
-%%PYTHON3%%%%DATADIR%%/extension/plpython3u--1.0.sql
-%%PYTHON3%%%%DATADIR%%/extension/plpython3u--unpackaged--1.0.sql
-%%PYTHON3%%%%DATADIR%%/extension/plpython3u.control
-%%PYTHON2%%%%DATADIR%%/extension/plpythonu--1.0.sql
-%%PYTHON2%%%%DATADIR%%/extension/plpythonu--unpackaged--1.0.sql
-%%PYTHON2%%%%DATADIR%%/extension/plpythonu.control
-lib/postgresql/hstore_plpython3.so
-lib/postgresql/jsonb_plpython3.so
-lib/postgresql/ltree_plpython3.so
-%%DATADIR%%/extension/hstore_plpython2u--1.0.sql
-%%DATADIR%%/extension/hstore_plpython2u.control
-%%DATADIR%%/extension/hstore_plpython3u--1.0.sql
-%%DATADIR%%/extension/hstore_plpython3u.control
-%%DATADIR%%/extension/hstore_plpythonu--1.0.sql
-%%DATADIR%%/extension/hstore_plpythonu.control
-%%DATADIR%%/extension/jsonb_plpython2u--1.0.sql
-%%DATADIR%%/extension/jsonb_plpython2u.control
-%%DATADIR%%/extension/jsonb_plpython3u--1.0.sql
-%%DATADIR%%/extension/jsonb_plpython3u.control
-%%DATADIR%%/extension/jsonb_plpythonu--1.0.sql
-%%DATADIR%%/extension/jsonb_plpythonu.control
-%%DATADIR%%/extension/ltree_plpython2u--1.0.sql
-%%DATADIR%%/extension/ltree_plpython2u.control
-%%DATADIR%%/extension/ltree_plpython3u--1.0.sql
-%%DATADIR%%/extension/ltree_plpython3u.control
-%%DATADIR%%/extension/ltree_plpythonu--1.0.sql
-%%DATADIR%%/extension/ltree_plpythonu.control
diff --git a/databases/postgresql11-server/pkg-plist-pltcl b/databases/postgresql11-server/pkg-plist-pltcl
deleted file mode 100644
index 348e5921ddce..000000000000
--- a/databases/postgresql11-server/pkg-plist-pltcl
+++ /dev/null
@@ -1,8 +0,0 @@
-%%DATADIR%%/extension/pltcl--1.0.sql
-%%DATADIR%%/extension/pltcl.control
-%%DATADIR%%/extension/pltclu.control
-%%DATADIR%%/extension/pltclu--1.0.sql
-%%DATADIR%%/extension/pltcl--unpackaged--1.0.sql
-%%DATADIR%%/extension/pltclu--unpackaged--1.0.sql
-%%DOCSDIR%%/README-pltcl
-lib/postgresql/pltcl.so
diff --git a/databases/postgresql11-server/pkg-plist-server b/databases/postgresql11-server/pkg-plist-server
deleted file mode 100644
index 77ff3e4ed109..000000000000
--- a/databases/postgresql11-server/pkg-plist-server
+++ /dev/null
@@ -1,1514 +0,0 @@
-bin/initdb
-bin/pg_archivecleanup
-bin/pg_basebackup
-bin/pg_controldata
-bin/pg_ctl
-bin/pg_receivewal
-bin/pg_recvlogical
-bin/pg_resetwal
-bin/pg_rewind
-bin/pg_test_fsync
-bin/pg_test_timing
-bin/pg_upgrade
-bin/pg_waldump
-bin/postgres
-bin/postmaster
-etc/periodic/daily/502.pgsql
-include/postgresql/server/plpgsql.h
-lib/postgresql/ascii_and_mic.so
-lib/postgresql/cyrillic_and_mic.so
-lib/postgresql/dict_snowball.so
-lib/postgresql/euc2004_sjis2004.so
-lib/postgresql/euc_cn_and_mic.so
-lib/postgresql/euc_jp_and_sjis.so
-lib/postgresql/euc_kr_and_mic.so
-lib/postgresql/euc_tw_and_big5.so
-lib/postgresql/latin2_and_win1250.so
-lib/postgresql/latin_and_mic.so
-lib/postgresql/libpqwalreceiver.so
-lib/postgresql/pgoutput.so
-lib/postgresql/plpgsql.so
-lib/postgresql/utf8_and_ascii.so
-lib/postgresql/utf8_and_big5.so
-lib/postgresql/utf8_and_cyrillic.so
-lib/postgresql/utf8_and_euc2004.so
-lib/postgresql/utf8_and_euc_cn.so
-lib/postgresql/utf8_and_euc_jp.so
-lib/postgresql/utf8_and_euc_kr.so
-lib/postgresql/utf8_and_euc_tw.so
-lib/postgresql/utf8_and_gb18030.so
-lib/postgresql/utf8_and_gbk.so
-lib/postgresql/utf8_and_iso8859.so
-lib/postgresql/utf8_and_iso8859_1.so
-lib/postgresql/utf8_and_johab.so
-lib/postgresql/utf8_and_sjis.so
-lib/postgresql/utf8_and_sjis2004.so
-lib/postgresql/utf8_and_uhc.so
-lib/postgresql/utf8_and_win.so
-%%LLVM%%lib/postgresql/llvmjit.so
-%%LLVM%%lib/postgresql/llvmjit_types.bc
-%%LLVM%%lib/postgresql/bitcode/postgres.index.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/access/brin/brin.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/access/brin/brin_inclusion.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/access/brin/brin_minmax.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/access/brin/brin_pageops.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/access/brin/brin_revmap.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/access/brin/brin_tuple.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/access/brin/brin_validate.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/access/brin/brin_xlog.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/access/common/bufmask.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/access/common/heaptuple.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/access/common/indextuple.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/access/common/printsimple.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/access/common/printtup.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/access/common/reloptions.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/access/common/scankey.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/access/common/session.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/access/common/tupconvert.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/access/common/tupdesc.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/access/gin/ginarrayproc.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/access/gin/ginbtree.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/access/gin/ginbulk.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/access/gin/gindatapage.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/access/gin/ginentrypage.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/access/gin/ginfast.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/access/gin/ginget.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/access/gin/gininsert.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/access/gin/ginlogic.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/access/gin/ginpostinglist.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/access/gin/ginscan.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/access/gin/ginutil.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/access/gin/ginvacuum.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/access/gin/ginvalidate.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/access/gin/ginxlog.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/access/gist/gist.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/access/gist/gistbuild.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/access/gist/gistbuildbuffers.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/access/gist/gistget.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/access/gist/gistproc.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/access/gist/gistscan.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/access/gist/gistsplit.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/access/gist/gistutil.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/access/gist/gistvacuum.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/access/gist/gistvalidate.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/access/gist/gistxlog.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/access/hash/hash.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/access/hash/hash_xlog.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/access/hash/hashfunc.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/access/hash/hashinsert.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/access/hash/hashovfl.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/access/hash/hashpage.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/access/hash/hashsearch.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/access/hash/hashsort.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/access/hash/hashutil.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/access/hash/hashvalidate.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/access/heap/heapam.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/access/heap/hio.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/access/heap/pruneheap.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/access/heap/rewriteheap.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/access/heap/syncscan.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/access/heap/tuptoaster.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/access/heap/visibilitymap.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/access/index/amapi.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/access/index/amvalidate.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/access/index/genam.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/access/index/indexam.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/access/nbtree/nbtcompare.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/access/nbtree/nbtinsert.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/access/nbtree/nbtpage.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/access/nbtree/nbtree.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/access/nbtree/nbtsearch.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/access/nbtree/nbtsort.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/access/nbtree/nbtutils.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/access/nbtree/nbtvalidate.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/access/nbtree/nbtxlog.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/access/rmgrdesc/brindesc.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/access/rmgrdesc/clogdesc.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/access/rmgrdesc/committsdesc.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/access/rmgrdesc/dbasedesc.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/access/rmgrdesc/genericdesc.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/access/rmgrdesc/gindesc.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/access/rmgrdesc/gistdesc.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/access/rmgrdesc/hashdesc.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/access/rmgrdesc/heapdesc.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/access/rmgrdesc/logicalmsgdesc.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/access/rmgrdesc/mxactdesc.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/access/rmgrdesc/nbtdesc.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/access/rmgrdesc/relmapdesc.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/access/rmgrdesc/replorigindesc.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/access/rmgrdesc/seqdesc.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/access/rmgrdesc/smgrdesc.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/access/rmgrdesc/spgdesc.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/access/rmgrdesc/standbydesc.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/access/rmgrdesc/tblspcdesc.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/access/rmgrdesc/xactdesc.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/access/rmgrdesc/xlogdesc.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/access/spgist/spgdoinsert.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/access/spgist/spginsert.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/access/spgist/spgkdtreeproc.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/access/spgist/spgquadtreeproc.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/access/spgist/spgscan.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/access/spgist/spgtextproc.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/access/spgist/spgutils.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/access/spgist/spgvacuum.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/access/spgist/spgvalidate.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/access/spgist/spgxlog.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/access/tablesample/bernoulli.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/access/tablesample/system.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/access/tablesample/tablesample.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/access/transam/clog.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/access/transam/commit_ts.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/access/transam/generic_xlog.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/access/transam/multixact.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/access/transam/parallel.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/access/transam/rmgr.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/access/transam/slru.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/access/transam/subtrans.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/access/transam/timeline.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/access/transam/transam.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/access/transam/twophase.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/access/transam/twophase_rmgr.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/access/transam/varsup.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/access/transam/xact.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/access/transam/xlog.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/access/transam/xlogarchive.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/access/transam/xlogfuncs.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/access/transam/xloginsert.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/access/transam/xlogreader.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/access/transam/xlogutils.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/bootstrap/bootparse.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/bootstrap/bootstrap.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/catalog/aclchk.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/catalog/catalog.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/catalog/dependency.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/catalog/heap.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/catalog/index.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/catalog/indexing.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/catalog/namespace.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/catalog/objectaccess.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/catalog/objectaddress.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/catalog/partition.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/catalog/pg_aggregate.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/catalog/pg_collation.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/catalog/pg_constraint.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/catalog/pg_conversion.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/catalog/pg_db_role_setting.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/catalog/pg_depend.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/catalog/pg_enum.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/catalog/pg_inherits.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/catalog/pg_largeobject.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/catalog/pg_namespace.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/catalog/pg_operator.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/catalog/pg_proc.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/catalog/pg_publication.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/catalog/pg_range.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/catalog/pg_shdepend.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/catalog/pg_subscription.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/catalog/pg_type.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/catalog/storage.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/catalog/toasting.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/commands/aggregatecmds.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/commands/alter.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/commands/amcmds.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/commands/analyze.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/commands/async.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/commands/cluster.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/commands/collationcmds.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/commands/comment.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/commands/constraint.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/commands/conversioncmds.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/commands/copy.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/commands/createas.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/commands/dbcommands.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/commands/define.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/commands/discard.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/commands/dropcmds.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/commands/event_trigger.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/commands/explain.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/commands/extension.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/commands/foreigncmds.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/commands/functioncmds.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/commands/indexcmds.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/commands/lockcmds.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/commands/matview.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/commands/opclasscmds.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/commands/operatorcmds.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/commands/policy.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/commands/portalcmds.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/commands/prepare.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/commands/proclang.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/commands/publicationcmds.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/commands/schemacmds.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/commands/seclabel.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/commands/sequence.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/commands/statscmds.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/commands/subscriptioncmds.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/commands/tablecmds.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/commands/tablespace.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/commands/trigger.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/commands/tsearchcmds.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/commands/typecmds.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/commands/user.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/commands/vacuum.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/commands/vacuumlazy.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/commands/variable.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/commands/view.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/executor/execAmi.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/executor/execCurrent.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/executor/execExpr.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/executor/execExprInterp.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/executor/execGrouping.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/executor/execIndexing.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/executor/execJunk.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/executor/execMain.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/executor/execParallel.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/executor/execPartition.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/executor/execProcnode.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/executor/execReplication.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/executor/execSRF.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/executor/execScan.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/executor/execTuples.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/executor/execUtils.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/executor/functions.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/executor/instrument.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/executor/nodeAgg.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/executor/nodeAppend.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/executor/nodeBitmapAnd.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/executor/nodeBitmapHeapscan.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/executor/nodeBitmapIndexscan.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/executor/nodeBitmapOr.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/executor/nodeCtescan.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/executor/nodeCustom.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/executor/nodeForeignscan.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/executor/nodeFunctionscan.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/executor/nodeGather.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/executor/nodeGatherMerge.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/executor/nodeGroup.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/executor/nodeHash.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/executor/nodeHashjoin.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/executor/nodeIndexonlyscan.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/executor/nodeIndexscan.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/executor/nodeLimit.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/executor/nodeLockRows.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/executor/nodeMaterial.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/executor/nodeMergeAppend.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/executor/nodeMergejoin.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/executor/nodeModifyTable.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/executor/nodeNamedtuplestorescan.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/executor/nodeNestloop.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/executor/nodeProjectSet.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/executor/nodeRecursiveunion.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/executor/nodeResult.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/executor/nodeSamplescan.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/executor/nodeSeqscan.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/executor/nodeSetOp.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/executor/nodeSort.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/executor/nodeSubplan.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/executor/nodeSubqueryscan.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/executor/nodeTableFuncscan.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/executor/nodeTidscan.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/executor/nodeUnique.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/executor/nodeValuesscan.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/executor/nodeWindowAgg.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/executor/nodeWorktablescan.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/executor/spi.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/executor/tqueue.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/executor/tstoreReceiver.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/foreign/foreign.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/jit/jit.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/lib/binaryheap.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/lib/bipartite_match.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/lib/bloomfilter.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/lib/dshash.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/lib/hyperloglog.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/lib/ilist.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/lib/knapsack.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/lib/pairingheap.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/lib/rbtree.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/lib/stringinfo.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/libpq/auth-scram.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/libpq/auth.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/libpq/be-fsstubs.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/libpq/be-secure-common.bc
-%%LLVM%%%%SSL%%lib/postgresql/bitcode/postgres/libpq/be-secure-openssl.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/libpq/be-secure.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/libpq/crypt.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/libpq/hba.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/libpq/ifaddr.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/libpq/pqcomm.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/libpq/pqformat.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/libpq/pqmq.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/libpq/pqsignal.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/main/main.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/nodes/bitmapset.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/nodes/copyfuncs.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/nodes/equalfuncs.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/nodes/extensible.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/nodes/list.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/nodes/makefuncs.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/nodes/nodeFuncs.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/nodes/nodes.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/nodes/outfuncs.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/nodes/params.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/nodes/print.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/nodes/read.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/nodes/readfuncs.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/nodes/tidbitmap.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/nodes/value.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/optimizer/geqo/geqo_copy.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/optimizer/geqo/geqo_cx.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/optimizer/geqo/geqo_erx.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/optimizer/geqo/geqo_eval.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/optimizer/geqo/geqo_main.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/optimizer/geqo/geqo_misc.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/optimizer/geqo/geqo_mutation.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/optimizer/geqo/geqo_ox1.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/optimizer/geqo/geqo_ox2.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/optimizer/geqo/geqo_pmx.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/optimizer/geqo/geqo_pool.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/optimizer/geqo/geqo_px.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/optimizer/geqo/geqo_random.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/optimizer/geqo/geqo_recombination.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/optimizer/geqo/geqo_selection.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/optimizer/path/allpaths.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/optimizer/path/clausesel.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/optimizer/path/costsize.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/optimizer/path/equivclass.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/optimizer/path/indxpath.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/optimizer/path/joinpath.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/optimizer/path/joinrels.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/optimizer/path/pathkeys.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/optimizer/path/tidpath.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/optimizer/plan/analyzejoins.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/optimizer/plan/createplan.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/optimizer/plan/initsplan.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/optimizer/plan/planagg.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/optimizer/plan/planmain.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/optimizer/plan/planner.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/optimizer/plan/setrefs.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/optimizer/plan/subselect.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/optimizer/prep/prepjointree.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/optimizer/prep/prepqual.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/optimizer/prep/preptlist.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/optimizer/prep/prepunion.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/optimizer/util/clauses.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/optimizer/util/joininfo.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/optimizer/util/orclauses.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/optimizer/util/paramassign.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/optimizer/util/pathnode.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/optimizer/util/placeholder.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/optimizer/util/plancat.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/optimizer/util/predtest.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/optimizer/util/relnode.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/optimizer/util/restrictinfo.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/optimizer/util/tlist.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/optimizer/util/var.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/parser/analyze.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/parser/gram.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/parser/parse_agg.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/parser/parse_clause.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/parser/parse_coerce.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/parser/parse_collate.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/parser/parse_cte.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/parser/parse_enr.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/parser/parse_expr.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/parser/parse_func.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/parser/parse_node.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/parser/parse_oper.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/parser/parse_param.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/parser/parse_relation.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/parser/parse_target.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/parser/parse_type.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/parser/parse_utilcmd.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/parser/parser.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/parser/scan.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/parser/scansup.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/partitioning/partbounds.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/partitioning/partprune.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/port/atomics.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/port/dynloader.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/port/pg_sema.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/port/pg_shmem.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/postmaster/autovacuum.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/postmaster/bgworker.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/postmaster/bgwriter.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/postmaster/checkpointer.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/postmaster/fork_process.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/postmaster/pgarch.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/postmaster/pgstat.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/postmaster/postmaster.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/postmaster/startup.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/postmaster/syslogger.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/postmaster/walwriter.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/regex/regcomp.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/regex/regerror.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/regex/regexec.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/regex/regexport.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/regex/regfree.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/regex/regprefix.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/replication/basebackup.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/replication/logical/decode.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/replication/logical/launcher.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/replication/logical/logical.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/replication/logical/logicalfuncs.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/replication/logical/message.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/replication/logical/origin.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/replication/logical/proto.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/replication/logical/relation.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/replication/logical/reorderbuffer.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/replication/logical/snapbuild.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/replication/logical/tablesync.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/replication/logical/worker.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/replication/repl_gram.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/replication/slot.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/replication/slotfuncs.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/replication/syncrep.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/replication/syncrep_gram.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/replication/walreceiver.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/replication/walreceiverfuncs.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/replication/walsender.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/rewrite/rewriteDefine.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/rewrite/rewriteHandler.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/rewrite/rewriteManip.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/rewrite/rewriteRemove.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/rewrite/rewriteSupport.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/rewrite/rowsecurity.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/statistics/dependencies.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/statistics/extended_stats.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/statistics/mvdistinct.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/storage/buffer/buf_init.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/storage/buffer/buf_table.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/storage/buffer/bufmgr.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/storage/buffer/freelist.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/storage/buffer/localbuf.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/storage/file/buffile.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/storage/file/copydir.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/storage/file/fd.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/storage/file/reinit.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/storage/file/sharedfileset.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/storage/freespace/freespace.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/storage/freespace/fsmpage.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/storage/freespace/indexfsm.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/storage/ipc/barrier.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/storage/ipc/dsm.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/storage/ipc/dsm_impl.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/storage/ipc/ipc.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/storage/ipc/ipci.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/storage/ipc/latch.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/storage/ipc/pmsignal.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/storage/ipc/procarray.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/storage/ipc/procsignal.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/storage/ipc/shm_mq.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/storage/ipc/shm_toc.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/storage/ipc/shmem.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/storage/ipc/shmqueue.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/storage/ipc/sinval.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/storage/ipc/sinvaladt.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/storage/ipc/standby.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/storage/large_object/inv_api.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/storage/lmgr/condition_variable.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/storage/lmgr/deadlock.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/storage/lmgr/lmgr.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/storage/lmgr/lock.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/storage/lmgr/lwlock.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/storage/lmgr/lwlocknames.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/storage/lmgr/predicate.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/storage/lmgr/proc.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/storage/lmgr/s_lock.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/storage/lmgr/spin.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/storage/page/bufpage.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/storage/page/checksum.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/storage/page/itemptr.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/storage/smgr/md.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/storage/smgr/smgr.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/storage/smgr/smgrtype.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/tcop/dest.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/tcop/fastpath.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/tcop/postgres.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/tcop/pquery.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/tcop/utility.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/tsearch/dict.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/tsearch/dict_ispell.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/tsearch/dict_simple.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/tsearch/dict_synonym.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/tsearch/dict_thesaurus.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/tsearch/regis.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/tsearch/spell.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/tsearch/to_tsany.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/tsearch/ts_locale.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/tsearch/ts_parse.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/tsearch/ts_selfuncs.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/tsearch/ts_typanalyze.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/tsearch/ts_utils.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/tsearch/wparser.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/tsearch/wparser_def.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/acl.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/amutils.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/array_expanded.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/array_selfuncs.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/array_typanalyze.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/array_userfuncs.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/arrayfuncs.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/arrayutils.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/ascii.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/bool.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/cash.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/char.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/cryptohashes.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/date.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/datetime.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/datum.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/dbsize.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/domains.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/encode.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/enum.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/expandeddatum.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/expandedrecord.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/float.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/format_type.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/formatting.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/genfile.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/geo_ops.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/geo_selfuncs.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/geo_spgist.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/inet_cidr_ntop.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/inet_net_pton.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/int.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/int8.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/json.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/jsonb.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/jsonb_gin.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/jsonb_op.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/jsonb_util.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/jsonfuncs.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/like.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/lockfuncs.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/mac.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/mac8.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/misc.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/nabstime.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/name.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/network.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/network_gist.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/network_selfuncs.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/network_spgist.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/numeric.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/numutils.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/oid.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/oracle_compat.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/orderedsetaggs.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/pg_locale.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/pg_lsn.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/pg_upgrade_support.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/pgstatfuncs.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/pseudotypes.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/quote.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/rangetypes.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/rangetypes_gist.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/rangetypes_selfuncs.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/rangetypes_spgist.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/rangetypes_typanalyze.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/regexp.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/regproc.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/ri_triggers.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/rowtypes.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/ruleutils.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/selfuncs.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/tid.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/timestamp.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/trigfuncs.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/tsginidx.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/tsgistidx.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/tsquery.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/tsquery_cleanup.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/tsquery_gist.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/tsquery_op.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/tsquery_rewrite.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/tsquery_util.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/tsrank.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/tsvector.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/tsvector_op.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/tsvector_parser.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/txid.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/uuid.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/varbit.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/varchar.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/varlena.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/version.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/windowfuncs.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/xid.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/xml.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/utils/cache/attoptcache.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/utils/cache/catcache.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/utils/cache/evtcache.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/utils/cache/inval.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/utils/cache/lsyscache.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/utils/cache/partcache.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/utils/cache/plancache.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/utils/cache/relcache.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/utils/cache/relfilenodemap.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/utils/cache/relmapper.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/utils/cache/spccache.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/utils/cache/syscache.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/utils/cache/ts_cache.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/utils/cache/typcache.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/utils/error/assert.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/utils/error/elog.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/utils/fmgr/dfmgr.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/utils/fmgr/fmgr.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/utils/fmgr/funcapi.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/utils/fmgrtab.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/utils/hash/dynahash.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/utils/hash/hashfn.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/utils/hash/pg_crc.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/utils/init/globals.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/utils/init/miscinit.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/utils/init/postinit.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/utils/mb/conv.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/utils/mb/encnames.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/utils/mb/mbutils.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/utils/mb/wchar.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/utils/mb/wstrcmp.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/utils/mb/wstrncmp.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/utils/misc/backend_random.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/utils/misc/guc.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/utils/misc/help_config.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/utils/misc/pg_config.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/utils/misc/pg_controldata.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/utils/misc/pg_rusage.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/utils/misc/ps_status.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/utils/misc/queryenvironment.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/utils/misc/rls.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/utils/misc/sampling.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/utils/misc/superuser.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/utils/misc/timeout.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/utils/misc/tzparser.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/utils/mmgr/aset.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/utils/mmgr/dsa.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/utils/mmgr/freepage.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/utils/mmgr/generation.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/utils/mmgr/mcxt.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/utils/mmgr/memdebug.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/utils/mmgr/portalmem.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/utils/mmgr/slab.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/utils/resowner/resowner.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/utils/sort/logtape.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/utils/sort/sharedtuplestore.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/utils/sort/sortsupport.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/utils/sort/tuplesort.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/utils/sort/tuplestore.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/utils/time/combocid.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/utils/time/snapmgr.bc
-%%LLVM%%lib/postgresql/bitcode/postgres/utils/time/tqual.bc
-lib/libpgcommon.a
-%%PORTDOCS%%%%DOCSDIR%%/README-server
-%%DATADIR%%/conversion_create.sql
-%%DATADIR%%/errcodes.txt
-%%DATADIR%%/information_schema.sql
-%%DATADIR%%/pg_hba.conf.sample
-%%DATADIR%%/pg_ident.conf.sample
-%%DATADIR%%/postgres.bki
-%%DATADIR%%/postgres.description
-%%DATADIR%%/postgresql.conf.sample
-%%DATADIR%%/recovery.conf.sample
-%%DATADIR%%/sql_features.txt
-%%DATADIR%%/system_views.sql
-%%DATADIR%%/extension/plpgsql--1.0.sql
-%%DATADIR%%/extension/plpgsql--unpackaged--1.0.sql
-%%DATADIR%%/extension/plpgsql.control
-%%DATADIR%%/postgres.shdescription
-%%NLS%%share/locale/cs/LC_MESSAGES/initdb-11.mo
-%%NLS%%share/locale/cs/LC_MESSAGES/pg_archivecleanup-11.mo
-%%NLS%%share/locale/cs/LC_MESSAGES/pg_basebackup-11.mo
-%%NLS%%share/locale/cs/LC_MESSAGES/pg_controldata-11.mo
-%%NLS%%share/locale/cs/LC_MESSAGES/pg_ctl-11.mo
-%%NLS%%share/locale/cs/LC_MESSAGES/pg_resetwal-11.mo
-%%NLS%%share/locale/cs/LC_MESSAGES/pg_rewind-11.mo
-%%NLS%%share/locale/cs/LC_MESSAGES/pg_test_fsync-11.mo
-%%NLS%%share/locale/cs/LC_MESSAGES/pg_test_timing-11.mo
-%%NLS%%share/locale/cs/LC_MESSAGES/pg_upgrade-11.mo
-%%NLS%%share/locale/cs/LC_MESSAGES/pg_waldump-11.mo
-%%NLS%%share/locale/cs/LC_MESSAGES/plpgsql-11.mo
-%%NLS%%share/locale/de/LC_MESSAGES/initdb-11.mo
-%%NLS%%share/locale/de/LC_MESSAGES/pg_archivecleanup-11.mo
-%%NLS%%share/locale/de/LC_MESSAGES/pg_basebackup-11.mo
-%%NLS%%share/locale/de/LC_MESSAGES/pg_controldata-11.mo
-%%NLS%%share/locale/de/LC_MESSAGES/pg_ctl-11.mo
-%%NLS%%share/locale/de/LC_MESSAGES/pg_resetwal-11.mo
-%%NLS%%share/locale/de/LC_MESSAGES/pg_rewind-11.mo
-%%NLS%%share/locale/de/LC_MESSAGES/pg_test_fsync-11.mo
-%%NLS%%share/locale/de/LC_MESSAGES/pg_test_timing-11.mo
-%%NLS%%share/locale/de/LC_MESSAGES/pg_upgrade-11.mo
-%%NLS%%share/locale/de/LC_MESSAGES/pg_waldump-11.mo
-%%NLS%%share/locale/de/LC_MESSAGES/plpgsql-11.mo
-%%NLS%%share/locale/de/LC_MESSAGES/postgres-11.mo
-%%NLS%%share/locale/es/LC_MESSAGES/initdb-11.mo
-%%NLS%%share/locale/es/LC_MESSAGES/pg_archivecleanup-11.mo
-%%NLS%%share/locale/es/LC_MESSAGES/pg_basebackup-11.mo
-%%NLS%%share/locale/es/LC_MESSAGES/pg_controldata-11.mo
-%%NLS%%share/locale/es/LC_MESSAGES/pg_ctl-11.mo
-%%NLS%%share/locale/es/LC_MESSAGES/pg_resetwal-11.mo
-%%NLS%%share/locale/es/LC_MESSAGES/pg_rewind-11.mo
-%%NLS%%share/locale/es/LC_MESSAGES/pg_test_fsync-11.mo
-%%NLS%%share/locale/es/LC_MESSAGES/pg_test_timing-11.mo
-%%NLS%%share/locale/es/LC_MESSAGES/pg_waldump-11.mo
-%%NLS%%share/locale/es/LC_MESSAGES/pg_upgrade-11.mo
-%%NLS%%share/locale/es/LC_MESSAGES/plpgsql-11.mo
-%%NLS%%share/locale/es/LC_MESSAGES/postgres-11.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/initdb-11.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/pg_archivecleanup-11.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/pg_basebackup-11.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/pg_controldata-11.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/pg_ctl-11.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/pg_resetwal-11.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/pg_rewind-11.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/pg_test_fsync-11.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/pg_test_timing-11.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/pg_upgrade-11.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/pg_waldump-11.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/plpgsql-11.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/postgres-11.mo
-%%NLS%%share/locale/he/LC_MESSAGES/initdb-11.mo
-%%NLS%%share/locale/he/LC_MESSAGES/pg_basebackup-11.mo
-%%NLS%%share/locale/he/LC_MESSAGES/pg_ctl-11.mo
-%%NLS%%share/locale/it/LC_MESSAGES/initdb-11.mo
-%%NLS%%share/locale/it/LC_MESSAGES/pg_basebackup-11.mo
-%%NLS%%share/locale/it/LC_MESSAGES/pg_controldata-11.mo
-%%NLS%%share/locale/it/LC_MESSAGES/pg_ctl-11.mo
-%%NLS%%share/locale/it/LC_MESSAGES/pg_rewind-11.mo
-%%NLS%%share/locale/it/LC_MESSAGES/plpgsql-11.mo
-%%NLS%%share/locale/it/LC_MESSAGES/postgres-11.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/initdb-11.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/pg_archivecleanup-11.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/pg_basebackup-11.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/pg_controldata-11.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/pg_ctl-11.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/pg_resetwal-11.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/pg_rewind-11.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/pg_test_fsync-11.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/pg_test_timing-11.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/pg_upgrade-11.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/pg_waldump-11.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/plpgsql-11.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/postgres-11.mo
-%%NLS%%share/locale/ko/LC_MESSAGES/initdb-11.mo
-%%NLS%%share/locale/ko/LC_MESSAGES/pg_archivecleanup-11.mo
-%%NLS%%share/locale/ko/LC_MESSAGES/pg_basebackup-11.mo
-%%NLS%%share/locale/ko/LC_MESSAGES/pg_controldata-11.mo
-%%NLS%%share/locale/ko/LC_MESSAGES/pg_ctl-11.mo
-%%NLS%%share/locale/ko/LC_MESSAGES/pg_resetwal-11.mo
-%%NLS%%share/locale/ko/LC_MESSAGES/pg_rewind-11.mo
-%%NLS%%share/locale/ko/LC_MESSAGES/pg_test_fsync-11.mo
-%%NLS%%share/locale/ko/LC_MESSAGES/pg_test_timing-11.mo
-%%NLS%%share/locale/ko/LC_MESSAGES/pg_upgrade-11.mo
-%%NLS%%share/locale/ko/LC_MESSAGES/pg_waldump-11.mo
-%%NLS%%share/locale/ko/LC_MESSAGES/plpgsql-11.mo
-%%NLS%%share/locale/ko/LC_MESSAGES/postgres-11.mo
-%%NLS%%share/locale/pl/LC_MESSAGES/initdb-11.mo
-%%NLS%%share/locale/pl/LC_MESSAGES/pg_archivecleanup-11.mo
-%%NLS%%share/locale/pl/LC_MESSAGES/pg_basebackup-11.mo
-%%NLS%%share/locale/pl/LC_MESSAGES/pg_controldata-11.mo
-%%NLS%%share/locale/pl/LC_MESSAGES/pg_ctl-11.mo
-%%NLS%%share/locale/pl/LC_MESSAGES/pg_rewind-11.mo
-%%NLS%%share/locale/pl/LC_MESSAGES/pg_test_fsync-11.mo
-%%NLS%%share/locale/pl/LC_MESSAGES/pg_test_timing-11.mo
-%%NLS%%share/locale/pl/LC_MESSAGES/plpgsql-11.mo
-%%NLS%%share/locale/pl/LC_MESSAGES/postgres-11.mo
-%%NLS%%share/locale/pt_BR/LC_MESSAGES/initdb-11.mo
-%%NLS%%share/locale/pt_BR/LC_MESSAGES/pg_controldata-11.mo
-%%NLS%%share/locale/pt_BR/LC_MESSAGES/pg_ctl-11.mo
-%%NLS%%share/locale/pt_BR/LC_MESSAGES/pg_rewind-11.mo
-%%NLS%%share/locale/pt_BR/LC_MESSAGES/plpgsql-11.mo
-%%NLS%%share/locale/ro/LC_MESSAGES/plpgsql-11.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/initdb-11.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/pg_archivecleanup-11.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/pg_basebackup-11.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/pg_controldata-11.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/pg_ctl-11.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/pg_resetwal-11.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/pg_rewind-11.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/pg_test_fsync-11.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/pg_test_timing-11.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/pg_upgrade-11.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/pg_waldump-11.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/plpgsql-11.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/postgres-11.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/initdb-11.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/pg_archivecleanup-11.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/pg_basebackup-11.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/pg_controldata-11.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/pg_ctl-11.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/pg_resetwal-11.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/pg_rewind-11.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/pg_test_fsync-11.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/pg_test_timing-11.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/pg_upgrade-11.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/pg_waldump-11.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/plpgsql-11.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/postgres-11.mo
-%%NLS%%share/locale/tr/LC_MESSAGES/initdb-11.mo
-%%NLS%%share/locale/tr/LC_MESSAGES/pg_archivecleanup-11.mo
-%%NLS%%share/locale/tr/LC_MESSAGES/pg_basebackup-11.mo
-%%NLS%%share/locale/tr/LC_MESSAGES/pg_controldata-11.mo
-%%NLS%%share/locale/tr/LC_MESSAGES/pg_ctl-11.mo
-%%NLS%%share/locale/tr/LC_MESSAGES/pg_resetwal-11.mo
-%%NLS%%share/locale/tr/LC_MESSAGES/pg_rewind-11.mo
-%%NLS%%share/locale/tr/LC_MESSAGES/pg_test_fsync-11.mo
-%%NLS%%share/locale/tr/LC_MESSAGES/pg_test_timing-11.mo
-%%NLS%%share/locale/tr/LC_MESSAGES/pg_upgrade-11.mo
-%%NLS%%share/locale/tr/LC_MESSAGES/pg_waldump-11.mo
-%%NLS%%share/locale/tr/LC_MESSAGES/plpgsql-11.mo
-%%NLS%%share/locale/tr/LC_MESSAGES/postgres-11.mo
-%%NLS%%share/locale/vi/LC_MESSAGES/initdb-11.mo
-%%NLS%%share/locale/vi/LC_MESSAGES/pg_archivecleanup-11.mo
-%%NLS%%share/locale/vi/LC_MESSAGES/pg_basebackup-11.mo
-%%NLS%%share/locale/vi/LC_MESSAGES/pg_controldata-11.mo
-%%NLS%%share/locale/vi/LC_MESSAGES/pg_test_fsync-11.mo
-%%NLS%%share/locale/vi/LC_MESSAGES/pg_test_timing-11.mo
-%%NLS%%share/locale/vi/LC_MESSAGES/pg_waldump-11.mo
-%%NLS%%share/locale/vi/LC_MESSAGES/plpgsql-11.mo
-%%NLS%%share/locale/zh_CN/LC_MESSAGES/initdb-11.mo
-%%NLS%%share/locale/zh_CN/LC_MESSAGES/pg_archivecleanup-11.mo
-%%NLS%%share/locale/zh_CN/LC_MESSAGES/pg_basebackup-11.mo
-%%NLS%%share/locale/zh_CN/LC_MESSAGES/pg_controldata-11.mo
-%%NLS%%share/locale/zh_CN/LC_MESSAGES/pg_ctl-11.mo
-%%NLS%%share/locale/zh_CN/LC_MESSAGES/pg_resetwal-11.mo
-%%NLS%%share/locale/zh_CN/LC_MESSAGES/pg_rewind-11.mo
-%%NLS%%share/locale/zh_CN/LC_MESSAGES/pg_test_fsync-11.mo
-%%NLS%%share/locale/zh_CN/LC_MESSAGES/pg_test_timing-11.mo
-%%NLS%%share/locale/zh_CN/LC_MESSAGES/pg_upgrade-11.mo
-%%NLS%%share/locale/zh_CN/LC_MESSAGES/pg_waldump-11.mo
-%%NLS%%share/locale/zh_CN/LC_MESSAGES/plpgsql-11.mo
-%%NLS%%share/locale/zh_CN/LC_MESSAGES/postgres-11.mo
-%%DATADIR%%/snowball_create.sql
-%%TZDATA%%%%DATADIR%%/timezone/Africa/Abidjan
-%%TZDATA%%%%DATADIR%%/timezone/Africa/Accra
-%%TZDATA%%%%DATADIR%%/timezone/Africa/Addis_Ababa
-%%TZDATA%%%%DATADIR%%/timezone/Africa/Algiers
-%%TZDATA%%%%DATADIR%%/timezone/Africa/Asmara
-%%TZDATA%%%%DATADIR%%/timezone/Africa/Asmera
-%%TZDATA%%%%DATADIR%%/timezone/Africa/Bamako
-%%TZDATA%%%%DATADIR%%/timezone/Africa/Bangui
-%%TZDATA%%%%DATADIR%%/timezone/Africa/Banjul
-%%TZDATA%%%%DATADIR%%/timezone/Africa/Bissau
-%%TZDATA%%%%DATADIR%%/timezone/Africa/Blantyre
-%%TZDATA%%%%DATADIR%%/timezone/Africa/Brazzaville
-%%TZDATA%%%%DATADIR%%/timezone/Africa/Bujumbura
-%%TZDATA%%%%DATADIR%%/timezone/Africa/Cairo
-%%TZDATA%%%%DATADIR%%/timezone/Africa/Casablanca
-%%TZDATA%%%%DATADIR%%/timezone/Africa/Ceuta
-%%TZDATA%%%%DATADIR%%/timezone/Africa/Conakry
-%%TZDATA%%%%DATADIR%%/timezone/Africa/Dakar
-%%TZDATA%%%%DATADIR%%/timezone/Africa/Dar_es_Salaam
-%%TZDATA%%%%DATADIR%%/timezone/Africa/Djibouti
-%%TZDATA%%%%DATADIR%%/timezone/Africa/Douala
-%%TZDATA%%%%DATADIR%%/timezone/Africa/El_Aaiun
-%%TZDATA%%%%DATADIR%%/timezone/Africa/Freetown
-%%TZDATA%%%%DATADIR%%/timezone/Africa/Gaborone
-%%TZDATA%%%%DATADIR%%/timezone/Africa/Harare
-%%TZDATA%%%%DATADIR%%/timezone/Africa/Johannesburg
-%%TZDATA%%%%DATADIR%%/timezone/Africa/Juba
-%%TZDATA%%%%DATADIR%%/timezone/Africa/Kampala
-%%TZDATA%%%%DATADIR%%/timezone/Africa/Khartoum
-%%TZDATA%%%%DATADIR%%/timezone/Africa/Kigali
-%%TZDATA%%%%DATADIR%%/timezone/Africa/Kinshasa
-%%TZDATA%%%%DATADIR%%/timezone/Africa/Lagos
-%%TZDATA%%%%DATADIR%%/timezone/Africa/Libreville
-%%TZDATA%%%%DATADIR%%/timezone/Africa/Lome
-%%TZDATA%%%%DATADIR%%/timezone/Africa/Luanda
-%%TZDATA%%%%DATADIR%%/timezone/Africa/Lubumbashi
-%%TZDATA%%%%DATADIR%%/timezone/Africa/Lusaka
-%%TZDATA%%%%DATADIR%%/timezone/Africa/Malabo
-%%TZDATA%%%%DATADIR%%/timezone/Africa/Maputo
-%%TZDATA%%%%DATADIR%%/timezone/Africa/Maseru
-%%TZDATA%%%%DATADIR%%/timezone/Africa/Mbabane
-%%TZDATA%%%%DATADIR%%/timezone/Africa/Mogadishu
-%%TZDATA%%%%DATADIR%%/timezone/Africa/Monrovia
-%%TZDATA%%%%DATADIR%%/timezone/Africa/Nairobi
-%%TZDATA%%%%DATADIR%%/timezone/Africa/Ndjamena
-%%TZDATA%%%%DATADIR%%/timezone/Africa/Niamey
-%%TZDATA%%%%DATADIR%%/timezone/Africa/Nouakchott
-%%TZDATA%%%%DATADIR%%/timezone/Africa/Ouagadougou
-%%TZDATA%%%%DATADIR%%/timezone/Africa/Porto-Novo
-%%TZDATA%%%%DATADIR%%/timezone/Africa/Sao_Tome
-%%TZDATA%%%%DATADIR%%/timezone/Africa/Timbuktu
-%%TZDATA%%%%DATADIR%%/timezone/Africa/Tripoli
-%%TZDATA%%%%DATADIR%%/timezone/Africa/Tunis
-%%TZDATA%%%%DATADIR%%/timezone/Africa/Windhoek
-%%TZDATA%%%%DATADIR%%/timezone/America/Adak
-%%TZDATA%%%%DATADIR%%/timezone/America/Anchorage
-%%TZDATA%%%%DATADIR%%/timezone/America/Anguilla
-%%TZDATA%%%%DATADIR%%/timezone/America/Antigua
-%%TZDATA%%%%DATADIR%%/timezone/America/Araguaina
-%%TZDATA%%%%DATADIR%%/timezone/America/Argentina/Buenos_Aires
-%%TZDATA%%%%DATADIR%%/timezone/America/Argentina/Catamarca
-%%TZDATA%%%%DATADIR%%/timezone/America/Argentina/ComodRivadavia
-%%TZDATA%%%%DATADIR%%/timezone/America/Argentina/Cordoba
-%%TZDATA%%%%DATADIR%%/timezone/America/Argentina/Jujuy
-%%TZDATA%%%%DATADIR%%/timezone/America/Argentina/La_Rioja
-%%TZDATA%%%%DATADIR%%/timezone/America/Argentina/Mendoza
-%%TZDATA%%%%DATADIR%%/timezone/America/Argentina/Rio_Gallegos
-%%TZDATA%%%%DATADIR%%/timezone/America/Argentina/Salta
-%%TZDATA%%%%DATADIR%%/timezone/America/Argentina/San_Juan
-%%TZDATA%%%%DATADIR%%/timezone/America/Argentina/San_Luis
-%%TZDATA%%%%DATADIR%%/timezone/America/Argentina/Tucuman
-%%TZDATA%%%%DATADIR%%/timezone/America/Argentina/Ushuaia
-%%TZDATA%%%%DATADIR%%/timezone/America/Aruba
-%%TZDATA%%%%DATADIR%%/timezone/America/Asuncion
-%%TZDATA%%%%DATADIR%%/timezone/America/Atikokan
-%%TZDATA%%%%DATADIR%%/timezone/America/Atka
-%%TZDATA%%%%DATADIR%%/timezone/America/Bahia
-%%TZDATA%%%%DATADIR%%/timezone/America/Bahia_Banderas
-%%TZDATA%%%%DATADIR%%/timezone/America/Barbados
-%%TZDATA%%%%DATADIR%%/timezone/America/Belem
-%%TZDATA%%%%DATADIR%%/timezone/America/Belize
-%%TZDATA%%%%DATADIR%%/timezone/America/Blanc-Sablon
-%%TZDATA%%%%DATADIR%%/timezone/America/Boa_Vista
-%%TZDATA%%%%DATADIR%%/timezone/America/Bogota
-%%TZDATA%%%%DATADIR%%/timezone/America/Boise
-%%TZDATA%%%%DATADIR%%/timezone/America/Buenos_Aires
-%%TZDATA%%%%DATADIR%%/timezone/America/Cambridge_Bay
-%%TZDATA%%%%DATADIR%%/timezone/America/Campo_Grande
-%%TZDATA%%%%DATADIR%%/timezone/America/Cancun
-%%TZDATA%%%%DATADIR%%/timezone/America/Caracas
-%%TZDATA%%%%DATADIR%%/timezone/America/Catamarca
-%%TZDATA%%%%DATADIR%%/timezone/America/Cayenne
-%%TZDATA%%%%DATADIR%%/timezone/America/Cayman
-%%TZDATA%%%%DATADIR%%/timezone/America/Chicago
-%%TZDATA%%%%DATADIR%%/timezone/America/Chihuahua
-%%TZDATA%%%%DATADIR%%/timezone/America/Coral_Harbour
-%%TZDATA%%%%DATADIR%%/timezone/America/Cordoba
-%%TZDATA%%%%DATADIR%%/timezone/America/Costa_Rica
-%%TZDATA%%%%DATADIR%%/timezone/America/Creston
-%%TZDATA%%%%DATADIR%%/timezone/America/Cuiaba
-%%TZDATA%%%%DATADIR%%/timezone/America/Curacao
-%%TZDATA%%%%DATADIR%%/timezone/America/Danmarkshavn
-%%TZDATA%%%%DATADIR%%/timezone/America/Dawson
-%%TZDATA%%%%DATADIR%%/timezone/America/Dawson_Creek
-%%TZDATA%%%%DATADIR%%/timezone/America/Denver
-%%TZDATA%%%%DATADIR%%/timezone/America/Detroit
-%%TZDATA%%%%DATADIR%%/timezone/America/Dominica
-%%TZDATA%%%%DATADIR%%/timezone/America/Edmonton
-%%TZDATA%%%%DATADIR%%/timezone/America/Eirunepe
-%%TZDATA%%%%DATADIR%%/timezone/America/El_Salvador
-%%TZDATA%%%%DATADIR%%/timezone/America/Ensenada
-%%TZDATA%%%%DATADIR%%/timezone/America/Fort_Nelson
-%%TZDATA%%%%DATADIR%%/timezone/America/Fort_Wayne
-%%TZDATA%%%%DATADIR%%/timezone/America/Fortaleza
-%%TZDATA%%%%DATADIR%%/timezone/America/Glace_Bay
-%%TZDATA%%%%DATADIR%%/timezone/America/Godthab
-%%TZDATA%%%%DATADIR%%/timezone/America/Goose_Bay
-%%TZDATA%%%%DATADIR%%/timezone/America/Grand_Turk
-%%TZDATA%%%%DATADIR%%/timezone/America/Grenada
-%%TZDATA%%%%DATADIR%%/timezone/America/Guadeloupe
-%%TZDATA%%%%DATADIR%%/timezone/America/Guatemala
-%%TZDATA%%%%DATADIR%%/timezone/America/Guayaquil
-%%TZDATA%%%%DATADIR%%/timezone/America/Guyana
-%%TZDATA%%%%DATADIR%%/timezone/America/Halifax
-%%TZDATA%%%%DATADIR%%/timezone/America/Havana
-%%TZDATA%%%%DATADIR%%/timezone/America/Hermosillo
-%%TZDATA%%%%DATADIR%%/timezone/America/Indiana/Indianapolis
-%%TZDATA%%%%DATADIR%%/timezone/America/Indiana/Knox
-%%TZDATA%%%%DATADIR%%/timezone/America/Indiana/Marengo
-%%TZDATA%%%%DATADIR%%/timezone/America/Indiana/Petersburg
-%%TZDATA%%%%DATADIR%%/timezone/America/Indiana/Tell_City
-%%TZDATA%%%%DATADIR%%/timezone/America/Indiana/Vevay
-%%TZDATA%%%%DATADIR%%/timezone/America/Indiana/Vincennes
-%%TZDATA%%%%DATADIR%%/timezone/America/Indiana/Winamac
-%%TZDATA%%%%DATADIR%%/timezone/America/Indianapolis
-%%TZDATA%%%%DATADIR%%/timezone/America/Inuvik
-%%TZDATA%%%%DATADIR%%/timezone/America/Iqaluit
-%%TZDATA%%%%DATADIR%%/timezone/America/Jamaica
-%%TZDATA%%%%DATADIR%%/timezone/America/Jujuy
-%%TZDATA%%%%DATADIR%%/timezone/America/Juneau
-%%TZDATA%%%%DATADIR%%/timezone/America/Kentucky/Louisville
-%%TZDATA%%%%DATADIR%%/timezone/America/Kentucky/Monticello
-%%TZDATA%%%%DATADIR%%/timezone/America/Knox_IN
-%%TZDATA%%%%DATADIR%%/timezone/America/Kralendijk
-%%TZDATA%%%%DATADIR%%/timezone/America/La_Paz
-%%TZDATA%%%%DATADIR%%/timezone/America/Lima
-%%TZDATA%%%%DATADIR%%/timezone/America/Los_Angeles
-%%TZDATA%%%%DATADIR%%/timezone/America/Louisville
-%%TZDATA%%%%DATADIR%%/timezone/America/Lower_Princes
-%%TZDATA%%%%DATADIR%%/timezone/America/Maceio
-%%TZDATA%%%%DATADIR%%/timezone/America/Managua
-%%TZDATA%%%%DATADIR%%/timezone/America/Manaus
-%%TZDATA%%%%DATADIR%%/timezone/America/Marigot
-%%TZDATA%%%%DATADIR%%/timezone/America/Martinique
-%%TZDATA%%%%DATADIR%%/timezone/America/Matamoros
-%%TZDATA%%%%DATADIR%%/timezone/America/Mazatlan
-%%TZDATA%%%%DATADIR%%/timezone/America/Mendoza
-%%TZDATA%%%%DATADIR%%/timezone/America/Menominee
-%%TZDATA%%%%DATADIR%%/timezone/America/Merida
-%%TZDATA%%%%DATADIR%%/timezone/America/Metlakatla
-%%TZDATA%%%%DATADIR%%/timezone/America/Mexico_City
-%%TZDATA%%%%DATADIR%%/timezone/America/Miquelon
-%%TZDATA%%%%DATADIR%%/timezone/America/Moncton
-%%TZDATA%%%%DATADIR%%/timezone/America/Monterrey
-%%TZDATA%%%%DATADIR%%/timezone/America/Montevideo
-%%TZDATA%%%%DATADIR%%/timezone/America/Montreal
-%%TZDATA%%%%DATADIR%%/timezone/America/Montserrat
-%%TZDATA%%%%DATADIR%%/timezone/America/Nassau
-%%TZDATA%%%%DATADIR%%/timezone/America/New_York
-%%TZDATA%%%%DATADIR%%/timezone/America/Nipigon
-%%TZDATA%%%%DATADIR%%/timezone/America/Nome
-%%TZDATA%%%%DATADIR%%/timezone/America/Noronha
-%%TZDATA%%%%DATADIR%%/timezone/America/North_Dakota/Beulah
-%%TZDATA%%%%DATADIR%%/timezone/America/North_Dakota/Center
-%%TZDATA%%%%DATADIR%%/timezone/America/North_Dakota/New_Salem
-%%TZDATA%%%%DATADIR%%/timezone/America/Nuuk 
-%%TZDATA%%%%DATADIR%%/timezone/America/Ojinaga
-%%TZDATA%%%%DATADIR%%/timezone/America/Panama
-%%TZDATA%%%%DATADIR%%/timezone/America/Pangnirtung
-%%TZDATA%%%%DATADIR%%/timezone/America/Paramaribo
-%%TZDATA%%%%DATADIR%%/timezone/America/Phoenix
-%%TZDATA%%%%DATADIR%%/timezone/America/Port-au-Prince
-%%TZDATA%%%%DATADIR%%/timezone/America/Port_of_Spain
-%%TZDATA%%%%DATADIR%%/timezone/America/Porto_Acre
-%%TZDATA%%%%DATADIR%%/timezone/America/Porto_Velho
-%%TZDATA%%%%DATADIR%%/timezone/America/Puerto_Rico
-%%TZDATA%%%%DATADIR%%/timezone/America/Punta_Arenas
-%%TZDATA%%%%DATADIR%%/timezone/America/Rainy_River
-%%TZDATA%%%%DATADIR%%/timezone/America/Rankin_Inlet
-%%TZDATA%%%%DATADIR%%/timezone/America/Recife
-%%TZDATA%%%%DATADIR%%/timezone/America/Regina
-%%TZDATA%%%%DATADIR%%/timezone/America/Resolute
-%%TZDATA%%%%DATADIR%%/timezone/America/Rio_Branco
-%%TZDATA%%%%DATADIR%%/timezone/America/Rosario
-%%TZDATA%%%%DATADIR%%/timezone/America/Santa_Isabel
-%%TZDATA%%%%DATADIR%%/timezone/America/Santarem
-%%TZDATA%%%%DATADIR%%/timezone/America/Santiago
-%%TZDATA%%%%DATADIR%%/timezone/America/Santo_Domingo
-%%TZDATA%%%%DATADIR%%/timezone/America/Sao_Paulo
-%%TZDATA%%%%DATADIR%%/timezone/America/Scoresbysund
-%%TZDATA%%%%DATADIR%%/timezone/America/Shiprock
-%%TZDATA%%%%DATADIR%%/timezone/America/Sitka
-%%TZDATA%%%%DATADIR%%/timezone/America/St_Barthelemy
-%%TZDATA%%%%DATADIR%%/timezone/America/St_Johns
-%%TZDATA%%%%DATADIR%%/timezone/America/St_Kitts
-%%TZDATA%%%%DATADIR%%/timezone/America/St_Lucia
-%%TZDATA%%%%DATADIR%%/timezone/America/St_Thomas
-%%TZDATA%%%%DATADIR%%/timezone/America/St_Vincent
-%%TZDATA%%%%DATADIR%%/timezone/America/Swift_Current
-%%TZDATA%%%%DATADIR%%/timezone/America/Tegucigalpa
-%%TZDATA%%%%DATADIR%%/timezone/America/Thule
-%%TZDATA%%%%DATADIR%%/timezone/America/Thunder_Bay
-%%TZDATA%%%%DATADIR%%/timezone/America/Tijuana
-%%TZDATA%%%%DATADIR%%/timezone/America/Toronto
-%%TZDATA%%%%DATADIR%%/timezone/America/Tortola
-%%TZDATA%%%%DATADIR%%/timezone/America/Vancouver
-%%TZDATA%%%%DATADIR%%/timezone/America/Virgin
-%%TZDATA%%%%DATADIR%%/timezone/America/Whitehorse
-%%TZDATA%%%%DATADIR%%/timezone/America/Winnipeg
-%%TZDATA%%%%DATADIR%%/timezone/America/Yakutat
-%%TZDATA%%%%DATADIR%%/timezone/America/Yellowknife
-%%TZDATA%%%%DATADIR%%/timezone/Antarctica/Casey
-%%TZDATA%%%%DATADIR%%/timezone/Antarctica/Davis
-%%TZDATA%%%%DATADIR%%/timezone/Antarctica/DumontDUrville
-%%TZDATA%%%%DATADIR%%/timezone/Antarctica/Macquarie
-%%TZDATA%%%%DATADIR%%/timezone/Antarctica/Mawson
-%%TZDATA%%%%DATADIR%%/timezone/Antarctica/McMurdo
-%%TZDATA%%%%DATADIR%%/timezone/Antarctica/Palmer
-%%TZDATA%%%%DATADIR%%/timezone/Antarctica/Rothera
-%%TZDATA%%%%DATADIR%%/timezone/Antarctica/South_Pole
-%%TZDATA%%%%DATADIR%%/timezone/Antarctica/Syowa
-%%TZDATA%%%%DATADIR%%/timezone/Antarctica/Troll
-%%TZDATA%%%%DATADIR%%/timezone/Antarctica/Vostok
-%%TZDATA%%%%DATADIR%%/timezone/Arctic/Longyearbyen
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Aden
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Almaty
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Amman
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Anadyr
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Aqtau
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Aqtobe
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Ashgabat
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Ashkhabad
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Atyrau
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Baghdad
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Bahrain
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Baku
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Bangkok
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Barnaul
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Beirut
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Bishkek
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Brunei
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Calcutta
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Chita
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Choibalsan
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Chongqing
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Chungking
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Colombo
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Dacca
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Damascus
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Dhaka
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Dili
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Dubai
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Dushanbe
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Famagusta
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Gaza
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Harbin
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Hebron
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Ho_Chi_Minh
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Hong_Kong
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Hovd
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Irkutsk
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Istanbul
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Jakarta
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Jayapura
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Jerusalem
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Kabul
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Kamchatka
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Karachi
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Kashgar
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Kathmandu
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Katmandu
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Khandyga
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Kolkata
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Krasnoyarsk
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Kuala_Lumpur
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Kuching
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Kuwait
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Macao
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Macau
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Magadan
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Makassar
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Manila
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Muscat
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Nicosia
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Novokuznetsk
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Novosibirsk
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Omsk
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Oral
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Phnom_Penh
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Pontianak
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Pyongyang
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Qatar
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Qostanay
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Qyzylorda
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Rangoon
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Riyadh
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Saigon
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Sakhalin
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Samarkand
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Seoul
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Shanghai
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Singapore
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Srednekolymsk
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Taipei
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Tashkent
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Tbilisi
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Tehran
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Tel_Aviv
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Thimbu
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Thimphu
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Tokyo
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Tomsk
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Ujung_Pandang
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Ulaanbaatar
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Ulan_Bator
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Urumqi
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Ust-Nera
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Vientiane
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Vladivostok
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Yakutsk
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Yangon
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Yekaterinburg
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Yerevan
-%%TZDATA%%%%DATADIR%%/timezone/Atlantic/Azores
-%%TZDATA%%%%DATADIR%%/timezone/Atlantic/Bermuda
-%%TZDATA%%%%DATADIR%%/timezone/Atlantic/Canary
-%%TZDATA%%%%DATADIR%%/timezone/Atlantic/Cape_Verde
-%%TZDATA%%%%DATADIR%%/timezone/Atlantic/Faeroe
-%%TZDATA%%%%DATADIR%%/timezone/Atlantic/Faroe
-%%TZDATA%%%%DATADIR%%/timezone/Atlantic/Jan_Mayen
-%%TZDATA%%%%DATADIR%%/timezone/Atlantic/Madeira
-%%TZDATA%%%%DATADIR%%/timezone/Atlantic/Reykjavik
-%%TZDATA%%%%DATADIR%%/timezone/Atlantic/South_Georgia
-%%TZDATA%%%%DATADIR%%/timezone/Atlantic/St_Helena
-%%TZDATA%%%%DATADIR%%/timezone/Atlantic/Stanley
-%%TZDATA%%%%DATADIR%%/timezone/Australia/ACT
-%%TZDATA%%%%DATADIR%%/timezone/Australia/Adelaide
-%%TZDATA%%%%DATADIR%%/timezone/Australia/Brisbane
-%%TZDATA%%%%DATADIR%%/timezone/Australia/Broken_Hill
-%%TZDATA%%%%DATADIR%%/timezone/Australia/Canberra
-%%TZDATA%%%%DATADIR%%/timezone/Australia/Currie
-%%TZDATA%%%%DATADIR%%/timezone/Australia/Darwin
-%%TZDATA%%%%DATADIR%%/timezone/Australia/Eucla
-%%TZDATA%%%%DATADIR%%/timezone/Australia/Hobart
-%%TZDATA%%%%DATADIR%%/timezone/Australia/LHI
-%%TZDATA%%%%DATADIR%%/timezone/Australia/Lindeman
-%%TZDATA%%%%DATADIR%%/timezone/Australia/Lord_Howe
-%%TZDATA%%%%DATADIR%%/timezone/Australia/Melbourne
-%%TZDATA%%%%DATADIR%%/timezone/Australia/NSW
-%%TZDATA%%%%DATADIR%%/timezone/Australia/North
-%%TZDATA%%%%DATADIR%%/timezone/Australia/Perth
-%%TZDATA%%%%DATADIR%%/timezone/Australia/Queensland
-%%TZDATA%%%%DATADIR%%/timezone/Australia/South
-%%TZDATA%%%%DATADIR%%/timezone/Australia/Sydney
-%%TZDATA%%%%DATADIR%%/timezone/Australia/Tasmania
-%%TZDATA%%%%DATADIR%%/timezone/Australia/Victoria
-%%TZDATA%%%%DATADIR%%/timezone/Australia/West
-%%TZDATA%%%%DATADIR%%/timezone/Australia/Yancowinna
-%%TZDATA%%%%DATADIR%%/timezone/Brazil/Acre
-%%TZDATA%%%%DATADIR%%/timezone/Brazil/DeNoronha
-%%TZDATA%%%%DATADIR%%/timezone/Brazil/East
-%%TZDATA%%%%DATADIR%%/timezone/Brazil/West
-%%TZDATA%%%%DATADIR%%/timezone/CET
-%%TZDATA%%%%DATADIR%%/timezone/CST6CDT
-%%TZDATA%%%%DATADIR%%/timezone/Canada/Atlantic
-%%TZDATA%%%%DATADIR%%/timezone/Canada/Central
-%%TZDATA%%%%DATADIR%%/timezone/Canada/Eastern
-%%TZDATA%%%%DATADIR%%/timezone/Canada/Mountain
-%%TZDATA%%%%DATADIR%%/timezone/Canada/Newfoundland
-%%TZDATA%%%%DATADIR%%/timezone/Canada/Pacific
-%%TZDATA%%%%DATADIR%%/timezone/Canada/Saskatchewan
-%%TZDATA%%%%DATADIR%%/timezone/Canada/Yukon
-%%TZDATA%%%%DATADIR%%/timezone/Chile/Continental
-%%TZDATA%%%%DATADIR%%/timezone/Chile/EasterIsland
-%%TZDATA%%%%DATADIR%%/timezone/Cuba
-%%TZDATA%%%%DATADIR%%/timezone/EET
-%%TZDATA%%%%DATADIR%%/timezone/EST
-%%TZDATA%%%%DATADIR%%/timezone/EST5EDT
-%%TZDATA%%%%DATADIR%%/timezone/Egypt
-%%TZDATA%%%%DATADIR%%/timezone/Eire
-%%TZDATA%%%%DATADIR%%/timezone/Etc/GMT
-%%TZDATA%%%%DATADIR%%/timezone/Etc/GMT+0
-%%TZDATA%%%%DATADIR%%/timezone/Etc/GMT+1
-%%TZDATA%%%%DATADIR%%/timezone/Etc/GMT+10
-%%TZDATA%%%%DATADIR%%/timezone/Etc/GMT+11
-%%TZDATA%%%%DATADIR%%/timezone/Etc/GMT+12
-%%TZDATA%%%%DATADIR%%/timezone/Etc/GMT+2
-%%TZDATA%%%%DATADIR%%/timezone/Etc/GMT+3
-%%TZDATA%%%%DATADIR%%/timezone/Etc/GMT+4
-%%TZDATA%%%%DATADIR%%/timezone/Etc/GMT+5
-%%TZDATA%%%%DATADIR%%/timezone/Etc/GMT+6
-%%TZDATA%%%%DATADIR%%/timezone/Etc/GMT+7
-%%TZDATA%%%%DATADIR%%/timezone/Etc/GMT+8
-%%TZDATA%%%%DATADIR%%/timezone/Etc/GMT+9
-%%TZDATA%%%%DATADIR%%/timezone/Etc/GMT-0
-%%TZDATA%%%%DATADIR%%/timezone/Etc/GMT-1
-%%TZDATA%%%%DATADIR%%/timezone/Etc/GMT-10
-%%TZDATA%%%%DATADIR%%/timezone/Etc/GMT-11
-%%TZDATA%%%%DATADIR%%/timezone/Etc/GMT-12
-%%TZDATA%%%%DATADIR%%/timezone/Etc/GMT-13
-%%TZDATA%%%%DATADIR%%/timezone/Etc/GMT-14
-%%TZDATA%%%%DATADIR%%/timezone/Etc/GMT-2
-%%TZDATA%%%%DATADIR%%/timezone/Etc/GMT-3
-%%TZDATA%%%%DATADIR%%/timezone/Etc/GMT-4
-%%TZDATA%%%%DATADIR%%/timezone/Etc/GMT-5
-%%TZDATA%%%%DATADIR%%/timezone/Etc/GMT-6
-%%TZDATA%%%%DATADIR%%/timezone/Etc/GMT-7
-%%TZDATA%%%%DATADIR%%/timezone/Etc/GMT-8
-%%TZDATA%%%%DATADIR%%/timezone/Etc/GMT-9
-%%TZDATA%%%%DATADIR%%/timezone/Etc/GMT0
-%%TZDATA%%%%DATADIR%%/timezone/Etc/Greenwich
-%%TZDATA%%%%DATADIR%%/timezone/Etc/UCT
-%%TZDATA%%%%DATADIR%%/timezone/Etc/UTC
-%%TZDATA%%%%DATADIR%%/timezone/Etc/Universal
-%%TZDATA%%%%DATADIR%%/timezone/Etc/Zulu
-%%TZDATA%%%%DATADIR%%/timezone/Europe/Amsterdam
-%%TZDATA%%%%DATADIR%%/timezone/Europe/Andorra
-%%TZDATA%%%%DATADIR%%/timezone/Europe/Astrakhan
-%%TZDATA%%%%DATADIR%%/timezone/Europe/Athens
-%%TZDATA%%%%DATADIR%%/timezone/Europe/Belfast
-%%TZDATA%%%%DATADIR%%/timezone/Europe/Belgrade
-%%TZDATA%%%%DATADIR%%/timezone/Europe/Berlin
-%%TZDATA%%%%DATADIR%%/timezone/Europe/Bratislava
-%%TZDATA%%%%DATADIR%%/timezone/Europe/Brussels
-%%TZDATA%%%%DATADIR%%/timezone/Europe/Bucharest
-%%TZDATA%%%%DATADIR%%/timezone/Europe/Budapest
-%%TZDATA%%%%DATADIR%%/timezone/Europe/Busingen
-%%TZDATA%%%%DATADIR%%/timezone/Europe/Chisinau
-%%TZDATA%%%%DATADIR%%/timezone/Europe/Copenhagen
-%%TZDATA%%%%DATADIR%%/timezone/Europe/Dublin
-%%TZDATA%%%%DATADIR%%/timezone/Europe/Gibraltar
-%%TZDATA%%%%DATADIR%%/timezone/Europe/Guernsey
-%%TZDATA%%%%DATADIR%%/timezone/Europe/Helsinki
-%%TZDATA%%%%DATADIR%%/timezone/Europe/Isle_of_Man
-%%TZDATA%%%%DATADIR%%/timezone/Europe/Istanbul
-%%TZDATA%%%%DATADIR%%/timezone/Europe/Jersey
-%%TZDATA%%%%DATADIR%%/timezone/Europe/Kaliningrad
-%%TZDATA%%%%DATADIR%%/timezone/Europe/Kiev
-%%TZDATA%%%%DATADIR%%/timezone/Europe/Kirov
-%%TZDATA%%%%DATADIR%%/timezone/Europe/Lisbon
-%%TZDATA%%%%DATADIR%%/timezone/Europe/Ljubljana
-%%TZDATA%%%%DATADIR%%/timezone/Europe/London
-%%TZDATA%%%%DATADIR%%/timezone/Europe/Luxembourg
-%%TZDATA%%%%DATADIR%%/timezone/Europe/Madrid
-%%TZDATA%%%%DATADIR%%/timezone/Europe/Malta
-%%TZDATA%%%%DATADIR%%/timezone/Europe/Mariehamn
-%%TZDATA%%%%DATADIR%%/timezone/Europe/Minsk
-%%TZDATA%%%%DATADIR%%/timezone/Europe/Monaco
-%%TZDATA%%%%DATADIR%%/timezone/Europe/Moscow
-%%TZDATA%%%%DATADIR%%/timezone/Europe/Nicosia
-%%TZDATA%%%%DATADIR%%/timezone/Europe/Oslo
-%%TZDATA%%%%DATADIR%%/timezone/Europe/Paris
-%%TZDATA%%%%DATADIR%%/timezone/Europe/Podgorica
-%%TZDATA%%%%DATADIR%%/timezone/Europe/Prague
-%%TZDATA%%%%DATADIR%%/timezone/Europe/Riga
-%%TZDATA%%%%DATADIR%%/timezone/Europe/Rome
-%%TZDATA%%%%DATADIR%%/timezone/Europe/Samara
-%%TZDATA%%%%DATADIR%%/timezone/Europe/San_Marino
-%%TZDATA%%%%DATADIR%%/timezone/Europe/Sarajevo
-%%TZDATA%%%%DATADIR%%/timezone/Europe/Saratov
-%%TZDATA%%%%DATADIR%%/timezone/Europe/Simferopol
-%%TZDATA%%%%DATADIR%%/timezone/Europe/Skopje
-%%TZDATA%%%%DATADIR%%/timezone/Europe/Sofia
-%%TZDATA%%%%DATADIR%%/timezone/Europe/Stockholm
-%%TZDATA%%%%DATADIR%%/timezone/Europe/Tallinn
-%%TZDATA%%%%DATADIR%%/timezone/Europe/Tirane
-%%TZDATA%%%%DATADIR%%/timezone/Europe/Tiraspol
-%%TZDATA%%%%DATADIR%%/timezone/Europe/Ulyanovsk
-%%TZDATA%%%%DATADIR%%/timezone/Europe/Uzhgorod
-%%TZDATA%%%%DATADIR%%/timezone/Europe/Vaduz
-%%TZDATA%%%%DATADIR%%/timezone/Europe/Vatican
-%%TZDATA%%%%DATADIR%%/timezone/Europe/Vienna
-%%TZDATA%%%%DATADIR%%/timezone/Europe/Vilnius
-%%TZDATA%%%%DATADIR%%/timezone/Europe/Volgograd
-%%TZDATA%%%%DATADIR%%/timezone/Europe/Warsaw
-%%TZDATA%%%%DATADIR%%/timezone/Europe/Zagreb
-%%TZDATA%%%%DATADIR%%/timezone/Europe/Zaporozhye
-%%TZDATA%%%%DATADIR%%/timezone/Europe/Zurich
-%%TZDATA%%%%DATADIR%%/timezone/Factory
-%%TZDATA%%%%DATADIR%%/timezone/GB
-%%TZDATA%%%%DATADIR%%/timezone/GB-Eire
-%%TZDATA%%%%DATADIR%%/timezone/GMT
-%%TZDATA%%%%DATADIR%%/timezone/GMT+0
-%%TZDATA%%%%DATADIR%%/timezone/GMT-0
-%%TZDATA%%%%DATADIR%%/timezone/GMT0
-%%TZDATA%%%%DATADIR%%/timezone/Greenwich
-%%TZDATA%%%%DATADIR%%/timezone/HST
-%%TZDATA%%%%DATADIR%%/timezone/Hongkong
-%%TZDATA%%%%DATADIR%%/timezone/Iceland
-%%TZDATA%%%%DATADIR%%/timezone/Indian/Antananarivo
-%%TZDATA%%%%DATADIR%%/timezone/Indian/Chagos
-%%TZDATA%%%%DATADIR%%/timezone/Indian/Christmas
-%%TZDATA%%%%DATADIR%%/timezone/Indian/Cocos
-%%TZDATA%%%%DATADIR%%/timezone/Indian/Comoro
-%%TZDATA%%%%DATADIR%%/timezone/Indian/Kerguelen
-%%TZDATA%%%%DATADIR%%/timezone/Indian/Mahe
-%%TZDATA%%%%DATADIR%%/timezone/Indian/Maldives
-%%TZDATA%%%%DATADIR%%/timezone/Indian/Mauritius
-%%TZDATA%%%%DATADIR%%/timezone/Indian/Mayotte
-%%TZDATA%%%%DATADIR%%/timezone/Indian/Reunion
-%%TZDATA%%%%DATADIR%%/timezone/Iran
-%%TZDATA%%%%DATADIR%%/timezone/Israel
-%%TZDATA%%%%DATADIR%%/timezone/Jamaica
-%%TZDATA%%%%DATADIR%%/timezone/Japan
-%%TZDATA%%%%DATADIR%%/timezone/Kwajalein
-%%TZDATA%%%%DATADIR%%/timezone/Libya
-%%TZDATA%%%%DATADIR%%/timezone/MET
-%%TZDATA%%%%DATADIR%%/timezone/MST
-%%TZDATA%%%%DATADIR%%/timezone/MST7MDT
-%%TZDATA%%%%DATADIR%%/timezone/Mexico/BajaNorte
-%%TZDATA%%%%DATADIR%%/timezone/Mexico/BajaSur
-%%TZDATA%%%%DATADIR%%/timezone/Mexico/General
-%%TZDATA%%%%DATADIR%%/timezone/NZ
-%%TZDATA%%%%DATADIR%%/timezone/NZ-CHAT
-%%TZDATA%%%%DATADIR%%/timezone/Navajo
-%%TZDATA%%%%DATADIR%%/timezone/PRC
-%%TZDATA%%%%DATADIR%%/timezone/PST8PDT
-%%TZDATA%%%%DATADIR%%/timezone/Pacific/Apia
-%%TZDATA%%%%DATADIR%%/timezone/Pacific/Auckland
-%%TZDATA%%%%DATADIR%%/timezone/Pacific/Bougainville
-%%TZDATA%%%%DATADIR%%/timezone/Pacific/Chatham
-%%TZDATA%%%%DATADIR%%/timezone/Pacific/Chuuk
-%%TZDATA%%%%DATADIR%%/timezone/Pacific/Easter
-%%TZDATA%%%%DATADIR%%/timezone/Pacific/Efate
-%%TZDATA%%%%DATADIR%%/timezone/Pacific/Enderbury
-%%TZDATA%%%%DATADIR%%/timezone/Pacific/Fakaofo
-%%TZDATA%%%%DATADIR%%/timezone/Pacific/Fiji
-%%TZDATA%%%%DATADIR%%/timezone/Pacific/Funafuti
-%%TZDATA%%%%DATADIR%%/timezone/Pacific/Galapagos
-%%TZDATA%%%%DATADIR%%/timezone/Pacific/Gambier
-%%TZDATA%%%%DATADIR%%/timezone/Pacific/Guadalcanal
-%%TZDATA%%%%DATADIR%%/timezone/Pacific/Guam
-%%TZDATA%%%%DATADIR%%/timezone/Pacific/Honolulu
-%%TZDATA%%%%DATADIR%%/timezone/Pacific/Johnston
-%%TZDATA%%%%DATADIR%%/timezone/Pacific/Kiritimati
-%%TZDATA%%%%DATADIR%%/timezone/Pacific/Kosrae
-%%TZDATA%%%%DATADIR%%/timezone/Pacific/Kwajalein
-%%TZDATA%%%%DATADIR%%/timezone/Pacific/Majuro
-%%TZDATA%%%%DATADIR%%/timezone/Pacific/Marquesas
-%%TZDATA%%%%DATADIR%%/timezone/Pacific/Midway
-%%TZDATA%%%%DATADIR%%/timezone/Pacific/Nauru
-%%TZDATA%%%%DATADIR%%/timezone/Pacific/Niue
-%%TZDATA%%%%DATADIR%%/timezone/Pacific/Norfolk
-%%TZDATA%%%%DATADIR%%/timezone/Pacific/Noumea
-%%TZDATA%%%%DATADIR%%/timezone/Pacific/Pago_Pago
-%%TZDATA%%%%DATADIR%%/timezone/Pacific/Palau
-%%TZDATA%%%%DATADIR%%/timezone/Pacific/Pitcairn
-%%TZDATA%%%%DATADIR%%/timezone/Pacific/Pohnpei
-%%TZDATA%%%%DATADIR%%/timezone/Pacific/Ponape
-%%TZDATA%%%%DATADIR%%/timezone/Pacific/Port_Moresby
-%%TZDATA%%%%DATADIR%%/timezone/Pacific/Rarotonga
-%%TZDATA%%%%DATADIR%%/timezone/Pacific/Saipan
-%%TZDATA%%%%DATADIR%%/timezone/Pacific/Samoa
-%%TZDATA%%%%DATADIR%%/timezone/Pacific/Tahiti
-%%TZDATA%%%%DATADIR%%/timezone/Pacific/Tarawa
-%%TZDATA%%%%DATADIR%%/timezone/Pacific/Tongatapu
-%%TZDATA%%%%DATADIR%%/timezone/Pacific/Truk
-%%TZDATA%%%%DATADIR%%/timezone/Pacific/Wake
-%%TZDATA%%%%DATADIR%%/timezone/Pacific/Wallis
-%%TZDATA%%%%DATADIR%%/timezone/Pacific/Yap
-%%TZDATA%%%%DATADIR%%/timezone/Poland
-%%TZDATA%%%%DATADIR%%/timezone/Portugal
-%%TZDATA%%%%DATADIR%%/timezone/ROC
-%%TZDATA%%%%DATADIR%%/timezone/ROK
-%%TZDATA%%%%DATADIR%%/timezone/Singapore
-%%TZDATA%%%%DATADIR%%/timezone/Turkey
-%%TZDATA%%%%DATADIR%%/timezone/UCT
-%%TZDATA%%%%DATADIR%%/timezone/US/Alaska
-%%TZDATA%%%%DATADIR%%/timezone/US/Aleutian
-%%TZDATA%%%%DATADIR%%/timezone/US/Arizona
-%%TZDATA%%%%DATADIR%%/timezone/US/Central
-%%TZDATA%%%%DATADIR%%/timezone/US/East-Indiana
-%%TZDATA%%%%DATADIR%%/timezone/US/Eastern
-%%TZDATA%%%%DATADIR%%/timezone/US/Hawaii
-%%TZDATA%%%%DATADIR%%/timezone/US/Indiana-Starke
-%%TZDATA%%%%DATADIR%%/timezone/US/Michigan
-%%TZDATA%%%%DATADIR%%/timezone/US/Mountain
-%%TZDATA%%%%DATADIR%%/timezone/US/Pacific
-%%TZDATA%%%%DATADIR%%/timezone/US/Samoa
-%%TZDATA%%%%DATADIR%%/timezone/UTC
-%%TZDATA%%%%DATADIR%%/timezone/Universal
-%%TZDATA%%%%DATADIR%%/timezone/W-SU
-%%TZDATA%%%%DATADIR%%/timezone/WET
-%%TZDATA%%%%DATADIR%%/timezone/Zulu
-%%TZDATA%%%%DATADIR%%/timezone/posixrules
-%%DATADIR%%/timezonesets/Africa.txt
-%%DATADIR%%/timezonesets/America.txt
-%%DATADIR%%/timezonesets/Antarctica.txt
-%%DATADIR%%/timezonesets/Asia.txt
-%%DATADIR%%/timezonesets/Atlantic.txt
-%%DATADIR%%/timezonesets/Australia
-%%DATADIR%%/timezonesets/Australia.txt
-%%DATADIR%%/timezonesets/Default
-%%DATADIR%%/timezonesets/Etc.txt
-%%DATADIR%%/timezonesets/Europe.txt
-%%DATADIR%%/timezonesets/India
-%%DATADIR%%/timezonesets/Indian.txt
-%%DATADIR%%/timezonesets/Pacific.txt
-%%DATADIR%%/tsearch_data/danish.stop
-%%DATADIR%%/tsearch_data/dutch.stop
-%%DATADIR%%/tsearch_data/english.stop
-%%DATADIR%%/tsearch_data/finnish.stop
-%%DATADIR%%/tsearch_data/french.stop
-%%DATADIR%%/tsearch_data/german.stop
-%%DATADIR%%/tsearch_data/hungarian.stop
-%%DATADIR%%/tsearch_data/hunspell_sample.affix
-%%DATADIR%%/tsearch_data/hunspell_sample_long.affix
-%%DATADIR%%/tsearch_data/hunspell_sample_long.dict
-%%DATADIR%%/tsearch_data/hunspell_sample_num.affix
-%%DATADIR%%/tsearch_data/hunspell_sample_num.dict
-%%DATADIR%%/tsearch_data/ispell_sample.affix
-%%DATADIR%%/tsearch_data/ispell_sample.dict
-%%DATADIR%%/tsearch_data/italian.stop
-%%DATADIR%%/tsearch_data/norwegian.stop
-%%DATADIR%%/tsearch_data/portuguese.stop
-%%DATADIR%%/tsearch_data/russian.stop
-%%DATADIR%%/tsearch_data/spanish.stop
-%%DATADIR%%/tsearch_data/swedish.stop
-%%DATADIR%%/tsearch_data/synonym_sample.syn
-%%DATADIR%%/tsearch_data/thesaurus_sample.ths
-%%DATADIR%%/tsearch_data/turkish.stop
diff --git a/databases/postgresql12-client/Makefile b/databases/postgresql12-client/Makefile
index 08b5ab7af720..ef76a8c6ec70 100644
--- a/databases/postgresql12-client/Makefile
+++ b/databases/postgresql12-client/Makefile
@@ -1,5 +1,3 @@
-# Created by: Palle Girgensohn <girgen@FreeBSD.org>
-
 PORTNAME=	postgresql
 PORTREVISION=	0
 
diff --git a/databases/postgresql12-contrib/Makefile b/databases/postgresql12-contrib/Makefile
index 9f992af48438..af4be8ec800f 100644
--- a/databases/postgresql12-contrib/Makefile
+++ b/databases/postgresql12-contrib/Makefile
@@ -1,5 +1,3 @@
-# Created by: Palle Girgensohn <girgen@pingpong.net>
-
 PORTNAME=	postgresql
 PORTREVISION=	0
 CATEGORIES=	databases
diff --git a/databases/postgresql12-contrib/pkg-descr b/databases/postgresql12-contrib/pkg-descr
index 18c3c1351c3b..a384c76fdbde 100644
--- a/databases/postgresql12-contrib/pkg-descr
+++ b/databases/postgresql12-contrib/pkg-descr
@@ -19,5 +19,3 @@ For more information, please see
 /usr/local/share/doc/postgresql/contrib/README*
 
 This software is part of the standard PostgreSQL distribution.
-
-WWW: https://www.postgresql.org/
diff --git a/databases/postgresql12-docs/Makefile b/databases/postgresql12-docs/Makefile
index f977f2b8aeb4..9a7e76ea0885 100644
--- a/databases/postgresql12-docs/Makefile
+++ b/databases/postgresql12-docs/Makefile
@@ -1,5 +1,3 @@
-# Created by: Palle Girgensohn <girgen@pingpong.net>
-
 WANT_PGSQL_VER=12
 
-.include "${.CURDIR}/../postgresql14-docs/Makefile"
+.include "${.CURDIR}/../postgresql16-docs/Makefile"
diff --git a/databases/postgresql12-pgtcl/Makefile b/databases/postgresql12-pgtcl/Makefile
index 6bf1cf32f000..98a77ac548a2 100644
--- a/databases/postgresql12-pgtcl/Makefile
+++ b/databases/postgresql12-pgtcl/Makefile
@@ -1,7 +1,7 @@
 PORTREVISION=	0
 PKGNAMESUFFIX=	-postgresql12
 
-CONFLICTS=	pgtcl-[0-9]* pgtcl-postgresql9[0123456]-[0-9]* pgtcl-postgresql1[013-9]-*
+CONFLICTS=	pgtcl pgtcl-postgresql9[0123456] pgtcl-postgresql1[013-9]
 
 PGTCL_SLAVE=	12
 MASTERDIR=	${.CURDIR}/../pgtcl
diff --git a/databases/postgresql12-plperl/Makefile b/databases/postgresql12-plperl/Makefile
index 1ea65faa2b06..a92a6e1d5d82 100644
--- a/databases/postgresql12-plperl/Makefile
+++ b/databases/postgresql12-plperl/Makefile
@@ -1,5 +1,3 @@
-# Created by: Palle Girgensohn <girgen@partitur.se>
-
 PORTNAME=	postgresql
 # Keep the ?=, this port is used as master by the other plperl.
 PORTREVISION?=	0
diff --git a/databases/postgresql12-plpython/Makefile b/databases/postgresql12-plpython/Makefile
index ccdc2e2bc336..39890880e032 100644
--- a/databases/postgresql12-plpython/Makefile
+++ b/databases/postgresql12-plpython/Makefile
@@ -6,6 +6,7 @@ PKGNAMESUFFIX?=	${WANT_PGSQL_VER:S/.//}${COMPONENT}
 
 MAINTAINER=	pgsql@FreeBSD.org
 COMMENT=	Module for using Python to write SQL functions
+WWW=		https://www.postgresql.org/
 
 USES+=		pgsql:${WANT_PGSQL_VER} ${WANT_PYTHON_USE}
 WANT_PGSQL=	server
diff --git a/databases/postgresql12-plpython/pkg-descr b/databases/postgresql12-plpython/pkg-descr
index 416cce467d37..61c4875985f7 100644
--- a/databases/postgresql12-plpython/pkg-descr
+++ b/databases/postgresql12-plpython/pkg-descr
@@ -2,5 +2,3 @@ PL/Python allows one to write PostgeSQL stored functions and
 procedures in Python (http://www.python.org/).
 
 This software is part of the standard PostgreSQL distribution.
-
-WWW: https://www.postgresql.org/
diff --git a/databases/postgresql12-pltcl/Makefile b/databases/postgresql12-pltcl/Makefile
index dcb6be147cbe..2004114427ca 100644
--- a/databases/postgresql12-pltcl/Makefile
+++ b/databases/postgresql12-pltcl/Makefile
@@ -1,5 +1,3 @@
-# Created by: Palle Girgensohn <girgen@partitur.se>
-
 PORTNAME=	postgresql
 # Keep the ?=, it is used by the other pltcl ports.
 PORTREVISION?=	0
diff --git a/databases/postgresql12-server/Makefile b/databases/postgresql12-server/Makefile
index 67a88c130ae5..9a8fc4370856 100644
--- a/databases/postgresql12-server/Makefile
+++ b/databases/postgresql12-server/Makefile
@@ -1,6 +1,4 @@
-# Created by: Marc G. Fournier <scrappy@FreeBSD.org>
-
-DISTVERSION?=	12.8
+DISTVERSION?=	12.18
 # PORTREVISION must be ?= otherwise, all slave ports get this PORTREVISION and
 # not their own.  Probably best to keep it at ?=0 when reset here too.
 PORTREVISION?=	0
@@ -23,4 +21,4 @@ PG_USER?=	postgres
 PG_GROUP?=	postgres
 PG_UID?=	770
 
-.include "${.CURDIR}/../postgresql14-server/Makefile"
+.include "${.CURDIR}/../postgresql16-server/Makefile"
diff --git a/databases/postgresql12-server/distinfo b/databases/postgresql12-server/distinfo
index ebad7d7b460b..3c9545cf422b 100644
--- a/databases/postgresql12-server/distinfo
+++ b/databases/postgresql12-server/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1628577879
-SHA256 (postgresql/postgresql-12.8.tar.bz2) = e26401e090c34ccb15ffb33a111f340833833535a7b7c5cd11cd88ab57d9c62a
-SIZE (postgresql/postgresql-12.8.tar.bz2) = 20849478
+TIMESTAMP = 1707301238
+SHA256 (postgresql/postgresql-12.18.tar.bz2) = 4f9919725d941ce9868e07fe1ed1d3a86748599b483386547583928b74c3918a
+SIZE (postgresql/postgresql-12.18.tar.bz2) = 21208935
diff --git a/databases/postgresql12-server/files/502.pgsql.in b/databases/postgresql12-server/files/502.pgsql.in
index c2d5b885d2f1..604ad3dadab8 100644
--- a/databases/postgresql12-server/files/502.pgsql.in
+++ b/databases/postgresql12-server/files/502.pgsql.in
@@ -1,7 +1,7 @@
 #!/bin/sh
 #
 # Maintenance shell script to vacuum and backup database
-# Put this in /usr/local/etc/periodic/daily, and it will be run 
+# Put this in /usr/local/etc/periodic/daily, and it will be run
 # every night
 #
 # Written by Palle Girgensohn <girgen@pingpong.net>
@@ -34,7 +34,7 @@ fi
 : ${daily_pgsql_backupdir:="~${daily_pgsql_user}/backups"}
 : ${daily_pgsql_savedays:="7"}
 
-# allow '~´ in dir name
+# allow '~' in directory name
 eval backupdir=${daily_pgsql_backupdir}
 
 rc=0
@@ -43,7 +43,7 @@ pgsql_backup() {
 	# daily_pgsql_backupdir must be writeable by user %%PG_USER%%
 	# ~%%PG_USER%% is just that under normal circumstances,
 	# but this might not be where you want the backups...
-	if [ ! -d ${backupdir} ] ; then 
+	if [ ! -d ${backupdir} ] ; then
 	    echo Creating ${backupdir}
 	    mkdir -m 700 ${backupdir}; chown ${daily_pgsql_user} ${backupdir}
 	fi
diff --git a/databases/postgresql12-server/files/patch-src_backend_utils_misc_postgresql.conf.sample b/databases/postgresql12-server/files/patch-src_backend_utils_misc_postgresql.conf.sample
index a82826b3b5f1..9469421174a0 100644
--- a/databases/postgresql12-server/files/patch-src_backend_utils_misc_postgresql.conf.sample
+++ b/databases/postgresql12-server/files/patch-src_backend_utils_misc_postgresql.conf.sample
@@ -8,14 +8,3 @@
  #log_destination = 'stderr'		# Valid values are combinations of
  					# stderr, csvlog, syslog, and eventlog,
  					# depending on platform.  csvlog
-@@ -464,7 +465,9 @@
- 
- #cluster_name = ''			# added to process titles if nonempty
- 					# (change requires restart)
--#update_process_title = on
-+
-+# On FreeBSD, this is a performance hog, so keep it off if you need speed
-+update_process_title = off
- 
- 
- #------------------------------------------------------------------------------
diff --git a/databases/postgresql12-server/files/patch-src_include_storage_s__lock.h b/databases/postgresql12-server/files/patch-src_include_storage_s__lock.h
deleted file mode 100644
index 19c945a36126..000000000000
--- a/databases/postgresql12-server/files/patch-src_include_storage_s__lock.h
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/include/storage/s_lock.h.orig	2021-04-15 09:05:25 UTC
-+++ src/include/storage/s_lock.h
-@@ -320,7 +320,7 @@ tas(volatile slock_t *lock)
-  * We use the int-width variant of the builtin because it works on more chips
-  * than other widths.
-  */
--#if defined(__arm__) || defined(__arm) || defined(__aarch64__) || defined(__aarch64)
-+#if defined(__arm__) || defined(__arm) || defined(__aarch64__) || defined(__aarch64) || defined(__riscv)
- #ifdef HAVE_GCC__SYNC_INT32_TAS
- #define HAS_TEST_AND_SET
- 
-@@ -337,7 +337,7 @@ tas(volatile slock_t *lock)
- #define S_UNLOCK(lock) __sync_lock_release(lock)
- 
- #endif	 /* HAVE_GCC__SYNC_INT32_TAS */
--#endif	 /* __arm__ || __arm || __aarch64__ || __aarch64 */
-+#endif	 /* __arm__ || __arm || __aarch64__ || __aarch64 || __riscv */
- 
- 
- /* S/390 and S/390x Linux (32- and 64-bit zSeries) */
diff --git a/databases/postgresql12-server/files/pkg-message-server.in b/databases/postgresql12-server/files/pkg-message-server.in
index 9bfbcc7b4a83..6370d4a017cc 100644
--- a/databases/postgresql12-server/files/pkg-message-server.in
+++ b/databases/postgresql12-server/files/pkg-message-server.in
@@ -14,7 +14,7 @@ is a periodic script, %%PREFIX%%/etc/periodic/daily/502.pgsql, that
 you may find useful. You can use it to backup and perform vacuum on all
 databases nightly. Per default, it performs `vacuum analyze'. See the
 script for instructions. For autovacuum settings, please review
-~postgres/data/postgresql.conf.
+~%%PG_USER%%/data/postgresql.conf.
 
 If you plan to access your PostgreSQL server using ODBC, please
 consider running the SQL script %%PREFIX%%/share/postgresql/odbc.sql
@@ -30,28 +30,33 @@ To set limits, environment stuff like locale and collation and other
 things, you can set up a class in /etc/login.conf before initializing
 the database. Add something similar to this to /etc/login.conf:
 ---
-postgres:\
+%%PG_USER%%:\
 	:lang=en_US.UTF-8:\
 	:setenv=LC_COLLATE=C:\
 	:tc=default:
 ---
 and run `cap_mkdb /etc/login.conf'.
-Then add 'postgresql_class="postgres"' to /etc/rc.conf.
+Then add 'postgresql_login_class="%%PG_USER%%"' to /etc/rc.conf, or
+set it as the %%PG_USER%% user's login class in /etc/passwd.
 
 ======================================================================
 
+To use PostgreSQL, enable it in rc.conf using
+
+  sysrc postgresql_enable=yes
+
 To initialize the database, run
 
-  %%PREFIX%%/etc/rc.d/postgresql initdb
+  service postgresql initdb
 
 You can then start PostgreSQL by running:
 
-  %%PREFIX%%/etc/rc.d/postgresql start
+  service postgresql start
 
-For postmaster settings, see ~postgres/data/postgresql.conf
+For postmaster settings, see ~%%PG_USER%%/data/postgresql.conf
 
 NB. FreeBSD's PostgreSQL port logs to syslog by default
-    See ~postgres/data/postgresql.conf for more info
+    See ~%%PG_USER%%/data/postgresql.conf for more info
 
 NB. If you're not using a checksumming filesystem like ZFS, you might
     wish to enable data checksumming. It can be enabled during
@@ -61,9 +66,6 @@ NB. If you're not using a checksumming filesystem like ZFS, you might
     and make sure you understand the performance implications.
 
 ======================================================================
-
-To run PostgreSQL at startup, add
-'postgresql_enable="YES"' to /etc/rc.conf
 EOM
 }
 ]
diff --git a/databases/postgresql12-server/files/postgresql.in b/databases/postgresql12-server/files/postgresql.in
index fe60297a6c4f..08f6faf12c55 100644
--- a/databases/postgresql12-server/files/postgresql.in
+++ b/databases/postgresql12-server/files/postgresql.in
@@ -1,17 +1,18 @@
 #!/bin/sh
 
 # PROVIDE: postgresql
-# REQUIRE: DAEMON
+# REQUIRE: DAEMON mountlate
 # KEYWORD: shutdown
 #
 # Add the following line to /etc/rc.conf to enable PostgreSQL:
 #
 #  postgresql_enable="YES"
 #  # optional
-#  postgresql_data="/var/db/%%PG_USER%%/data12"
+#  postgresql_data="/var/db/%%PG_USER%%/data%%PG_VERSION%%"
 #  postgresql_flags="-w -s -m fast"
 #  postgresql_initdb_flags="--encoding=utf-8 --lc-collate=C"
-#  postgresql_login_class="default"
+#  # leave empty to use the login class set in in /etc/passwd:
+#  postgresql_login_class="my_custom_login_class"
 #  postgresql_profiles=""
 #
 # See %%PREFIX%%/share/doc/postgresql/README-server for more info
@@ -29,12 +30,13 @@ command=%%PREFIX%%/bin/pg_ctl
 load_rc_config postgresql
 
 # set defaults
-postgresql_enable=${postgresql_enable:-"NO"}
-postgresql_flags=${postgresql_flags:-"-w -s -m fast"}
-postgresql_user=${postgresql_user:-"%%PG_USER%%"}
-eval postgresql_data=${postgresql_data:-"~${postgresql_user}/data12"}
-postgresql_login_class=${postgresql_login_class:-"default"}
-postgresql_initdb_flags=${postgresql_initdb_flags:-"--encoding=utf-8 --lc-collate=C"}
+: ${postgresql_enable:="NO"}
+: ${postgresql_flags:="-w -s -m fast"}
+: ${postgresql_user:="%%PG_USER%%"}
+eval _pgdir="~${postgresql_user}/data%%PG_VERSION%%"
+: ${postgresql_data:="${_pgdir}"}
+: ${postgresql_login_class:=""}
+: ${postgresql_initdb_flags:="--encoding=utf-8 --lc-collate=C"}
 
 name=postgresql
 rcvar=postgresql_enable
@@ -62,6 +64,7 @@ if [ -n "$2" ]; then
 		eval postgresql_enable="\${postgresql_${profile}_enable:-${postgresql_enable}}"
 		eval postgresql_data="\${postgresql_${profile}_data:-${postgresql_data}}"
 		eval postgresql_flags="\${postgresql_${profile}_flags:-${postgresql_flags}}"
+		eval postgresql_login_class="\${postgresql_${profile}_login_class:-${postgresql_login_class}}"
 		eval postgresql_initdb_flags="\${postgresql_${profile}_initdb_flags:-${postgresql_initdb_flags}}"
 	fi
 else
@@ -104,12 +107,16 @@ command_args="-D ${postgresql_data} ${postgresql_flags}"
 
 postgresql_command()
 {
-    ${su_cmd} -l ${postgresql_user} -c "exec ${command} ${command_args} ${rc_arg}"
+    ${su_cmd} ${postgresql_login_class:+-c ${postgresql_login_class}} \
+	    -l ${postgresql_user} \
+	    -c "exec ${command} ${command_args} ${rc_arg}"
 }
 
 postgresql_initdb()
 {
-    ${su_cmd} -l -c ${postgresql_login_class} ${postgresql_user} -c "exec %%PREFIX%%/bin/initdb ${postgresql_initdb_flags} -D ${postgresql_data} -U ${postgresql_user}"
+    ${su_cmd} ${postgresql_login_class:+-c ${postgresql_login_class}} \
+	    -l ${postgresql_user} \
+	    -c "exec %%PREFIX%%/bin/initdb ${postgresql_initdb_flags} -D ${postgresql_data} -U ${postgresql_user}"
 }
 
 run_rc_command "$1"
diff --git a/databases/postgresql12-server/pkg-descr b/databases/postgresql12-server/pkg-descr
index 1b3c3db53e96..cbef6ffab2d8 100644
--- a/databases/postgresql12-server/pkg-descr
+++ b/databases/postgresql12-server/pkg-descr
@@ -19,5 +19,3 @@ Support is available from the PostgreSQL developer/user community through the
 support mailing list (questions@PostgreSQL.ORG).
 
 PostgreSQL is free and the complete source is available.
-
-WWW: https://www.postgresql.org/
diff --git a/databases/postgresql12-server/pkg-plist-client b/databases/postgresql12-server/pkg-plist-client
index 50e18f349224..6c22268d8ee7 100644
--- a/databases/postgresql12-server/pkg-plist-client
+++ b/databases/postgresql12-server/pkg-plist-client
@@ -472,9 +472,9 @@ include/postgresql/server/storage/sync.h
 include/postgresql/server/utils/float.h
 include/postgresql/server/utils/jsonpath.h
 lib/libpgport_shlib.a
-man/man1/pg_checksums.1.gz
-man/man3/SPI_commit_and_chain.3.gz
-man/man3/SPI_rollback_and_chain.3.gz
+share/man/man1/pg_checksums.1.gz
+share/man/man3/SPI_commit_and_chain.3.gz
+share/man/man3/SPI_rollback_and_chain.3.gz
 include/postgresql/server/optimizer/geqo_recombination.h
 include/postgresql/server/optimizer/geqo_selection.h
 include/postgresql/server/optimizer/joininfo.h
@@ -832,388 +832,388 @@ libdata/pkgconfig/libecpg.pc
 libdata/pkgconfig/libecpg_compat.pc
 libdata/pkgconfig/libpgtypes.pc
 libdata/pkgconfig/libpq.pc
-man/man1/clusterdb.1.gz
-man/man1/createdb.1.gz
-man/man1/createuser.1.gz
-man/man1/dropdb.1.gz
-man/man1/dropuser.1.gz
-man/man1/ecpg.1.gz
-man/man1/initdb.1.gz
-man/man1/oid2name.1.gz
-man/man1/pg_archivecleanup.1.gz
-man/man1/pg_basebackup.1.gz
-man/man1/pg_config.1.gz
-man/man1/pg_controldata.1.gz
-man/man1/pg_ctl.1.gz
-man/man1/pg_dump.1.gz
-man/man1/pg_dumpall.1.gz
-man/man1/pg_isready.1.gz
-man/man1/pg_receivewal.1.gz
-man/man1/pg_recvlogical.1.gz
-man/man1/pg_resetwal.1.gz
-man/man1/pg_restore.1.gz
-man/man1/pg_rewind.1.gz
-man/man1/pg_standby.1.gz
-man/man1/pg_test_fsync.1.gz
-man/man1/pg_test_timing.1.gz
-man/man1/pg_upgrade.1.gz
-man/man1/pg_waldump.1.gz
-man/man1/pgbench.1.gz
-man/man1/postgres.1.gz
-man/man1/postmaster.1.gz
-man/man1/psql.1.gz
-man/man1/reindexdb.1.gz
-man/man1/vacuumdb.1.gz
-man/man1/vacuumlo.1.gz
-man/man3/SPI_commit.3.gz
-man/man3/SPI_connect.3.gz
-man/man3/SPI_connect_ext.3.gz
-man/man3/SPI_copytuple.3.gz
-man/man3/SPI_cursor_close.3.gz
-man/man3/SPI_cursor_fetch.3.gz
-man/man3/SPI_cursor_find.3.gz
-man/man3/SPI_cursor_move.3.gz
-man/man3/SPI_cursor_open.3.gz
-man/man3/SPI_cursor_open_with_args.3.gz
-man/man3/SPI_cursor_open_with_paramlist.3.gz
-man/man3/SPI_exec.3.gz
-man/man3/SPI_execp.3.gz
-man/man3/SPI_execute.3.gz
-man/man3/SPI_execute_plan.3.gz
-man/man3/SPI_execute_plan_with_paramlist.3.gz
-man/man3/SPI_execute_with_args.3.gz
-man/man3/SPI_finish.3.gz
-man/man3/SPI_fname.3.gz
-man/man3/SPI_fnumber.3.gz
-man/man3/SPI_freeplan.3.gz
-man/man3/SPI_freetuple.3.gz
-man/man3/SPI_freetuptable.3.gz
-man/man3/SPI_getargcount.3.gz
-man/man3/SPI_getargtypeid.3.gz
-man/man3/SPI_getbinval.3.gz
-man/man3/SPI_getnspname.3.gz
-man/man3/SPI_getrelname.3.gz
-man/man3/SPI_gettype.3.gz
-man/man3/SPI_gettypeid.3.gz
-man/man3/SPI_getvalue.3.gz
-man/man3/SPI_is_cursor_plan.3.gz
-man/man3/SPI_keepplan.3.gz
-man/man3/SPI_modifytuple.3.gz
-man/man3/SPI_palloc.3.gz
-man/man3/SPI_pfree.3.gz
-man/man3/SPI_prepare.3.gz
-man/man3/SPI_prepare_cursor.3.gz
-man/man3/SPI_prepare_params.3.gz
-man/man3/SPI_register_relation.3.gz
-man/man3/SPI_register_trigger_data.3.gz
-man/man3/SPI_repalloc.3.gz
-man/man3/SPI_result_code_string.3.gz
-man/man3/SPI_returntuple.3.gz
-man/man3/SPI_rollback.3.gz
-man/man3/SPI_saveplan.3.gz
-man/man3/SPI_scroll_cursor_fetch.3.gz
-man/man3/SPI_scroll_cursor_move.3.gz
-man/man3/SPI_start_transaction.3.gz
-man/man3/SPI_unregister_relation.3.gz
-man/man3/dblink.3.gz
-man/man3/dblink_build_sql_delete.3.gz
-man/man3/dblink_build_sql_insert.3.gz
-man/man3/dblink_build_sql_update.3.gz
-man/man3/dblink_cancel_query.3.gz
-man/man3/dblink_close.3.gz
-man/man3/dblink_connect.3.gz
-man/man3/dblink_connect_u.3.gz
-man/man3/dblink_disconnect.3.gz
-man/man3/dblink_error_message.3.gz
-man/man3/dblink_exec.3.gz
-man/man3/dblink_fetch.3.gz
-man/man3/dblink_get_connections.3.gz
-man/man3/dblink_get_notify.3.gz
-man/man3/dblink_get_pkey.3.gz
-man/man3/dblink_get_result.3.gz
-man/man3/dblink_is_busy.3.gz
-man/man3/dblink_open.3.gz
-man/man3/dblink_send_query.3.gz
-man/man7/ABORT.7.gz
-man/man7/ALTER_AGGREGATE.7.gz
-man/man7/ALTER_COLLATION.7.gz
-man/man7/ALTER_CONVERSION.7.gz
-man/man7/ALTER_DATABASE.7.gz
-man/man7/ALTER_DEFAULT_PRIVILEGES.7.gz
-man/man7/ALTER_DOMAIN.7.gz
-man/man7/ALTER_EVENT_TRIGGER.7.gz
-man/man7/ALTER_EXTENSION.7.gz
-man/man7/ALTER_FOREIGN_DATA_WRAPPER.7.gz
-man/man7/ALTER_FOREIGN_TABLE.7.gz
-man/man7/ALTER_FUNCTION.7.gz
-man/man7/ALTER_GROUP.7.gz
-man/man7/ALTER_INDEX.7.gz
-man/man7/ALTER_LANGUAGE.7.gz
-man/man7/ALTER_LARGE_OBJECT.7.gz
-man/man7/ALTER_MATERIALIZED_VIEW.7.gz
-man/man7/ALTER_OPERATOR.7.gz
-man/man7/ALTER_OPERATOR_CLASS.7.gz
-man/man7/ALTER_OPERATOR_FAMILY.7.gz
-man/man7/ALTER_POLICY.7.gz
-man/man7/ALTER_PROCEDURE.7.gz
-man/man7/ALTER_PUBLICATION.7.gz
-man/man7/ALTER_ROLE.7.gz
-man/man7/ALTER_ROUTINE.7.gz
-man/man7/ALTER_RULE.7.gz
-man/man7/ALTER_SCHEMA.7.gz
-man/man7/ALTER_SEQUENCE.7.gz
-man/man7/ALTER_SERVER.7.gz
-man/man7/ALTER_STATISTICS.7.gz
-man/man7/ALTER_SUBSCRIPTION.7.gz
-man/man7/ALTER_SYSTEM.7.gz
-man/man7/ALTER_TABLE.7.gz
-man/man7/ALTER_TABLESPACE.7.gz
-man/man7/ALTER_TEXT_SEARCH_CONFIGURATION.7.gz
-man/man7/ALTER_TEXT_SEARCH_DICTIONARY.7.gz
-man/man7/ALTER_TEXT_SEARCH_PARSER.7.gz
-man/man7/ALTER_TEXT_SEARCH_TEMPLATE.7.gz
-man/man7/ALTER_TRIGGER.7.gz
-man/man7/ALTER_TYPE.7.gz
-man/man7/ALTER_USER.7.gz
-man/man7/ALTER_USER_MAPPING.7.gz
-man/man7/ALTER_VIEW.7.gz
-man/man7/ANALYZE.7.gz
-man/man7/BEGIN.7.gz
-man/man7/CALL.7.gz
-man/man7/CHECKPOINT.7.gz
-man/man7/CLOSE.7.gz
-man/man7/CLUSTER.7.gz
-man/man7/COMMENT.7.gz
-man/man7/COMMIT.7.gz
-man/man7/COMMIT_PREPARED.7.gz
-man/man7/COPY.7.gz
-man/man7/CREATE_ACCESS_METHOD.7.gz
-man/man7/CREATE_AGGREGATE.7.gz
-man/man7/CREATE_CAST.7.gz
-man/man7/CREATE_COLLATION.7.gz
-man/man7/CREATE_CONVERSION.7.gz
-man/man7/CREATE_DATABASE.7.gz
-man/man7/CREATE_DOMAIN.7.gz
-man/man7/CREATE_EVENT_TRIGGER.7.gz
-man/man7/CREATE_EXTENSION.7.gz
-man/man7/CREATE_FOREIGN_DATA_WRAPPER.7.gz
-man/man7/CREATE_FOREIGN_TABLE.7.gz
-man/man7/CREATE_FUNCTION.7.gz
-man/man7/CREATE_GROUP.7.gz
-man/man7/CREATE_INDEX.7.gz
-man/man7/CREATE_LANGUAGE.7.gz
-man/man7/CREATE_MATERIALIZED_VIEW.7.gz
-man/man7/CREATE_OPERATOR.7.gz
-man/man7/CREATE_OPERATOR_CLASS.7.gz
-man/man7/CREATE_OPERATOR_FAMILY.7.gz
-man/man7/CREATE_POLICY.7.gz
-man/man7/CREATE_PROCEDURE.7.gz
-man/man7/CREATE_PUBLICATION.7.gz
-man/man7/CREATE_ROLE.7.gz
-man/man7/CREATE_RULE.7.gz
-man/man7/CREATE_SCHEMA.7.gz
-man/man7/CREATE_SEQUENCE.7.gz
-man/man7/CREATE_SERVER.7.gz
-man/man7/CREATE_STATISTICS.7.gz
-man/man7/CREATE_SUBSCRIPTION.7.gz
-man/man7/CREATE_TABLE.7.gz
-man/man7/CREATE_TABLESPACE.7.gz
-man/man7/CREATE_TABLE_AS.7.gz
-man/man7/CREATE_TEXT_SEARCH_CONFIGURATION.7.gz
-man/man7/CREATE_TEXT_SEARCH_DICTIONARY.7.gz
-man/man7/CREATE_TEXT_SEARCH_PARSER.7.gz
-man/man7/CREATE_TEXT_SEARCH_TEMPLATE.7.gz
-man/man7/CREATE_TRANSFORM.7.gz
-man/man7/CREATE_TRIGGER.7.gz
-man/man7/CREATE_TYPE.7.gz
-man/man7/CREATE_USER.7.gz
-man/man7/CREATE_USER_MAPPING.7.gz
-man/man7/CREATE_VIEW.7.gz
-man/man7/DEALLOCATE.7.gz
-man/man7/DECLARE.7.gz
-man/man7/DELETE.7.gz
-man/man7/DISCARD.7.gz
-man/man7/DO.7.gz
-man/man7/DROP_ACCESS_METHOD.7.gz
-man/man7/DROP_AGGREGATE.7.gz
-man/man7/DROP_CAST.7.gz
-man/man7/DROP_COLLATION.7.gz
-man/man7/DROP_CONVERSION.7.gz
-man/man7/DROP_DATABASE.7.gz
-man/man7/DROP_DOMAIN.7.gz
-man/man7/DROP_EVENT_TRIGGER.7.gz
-man/man7/DROP_EXTENSION.7.gz
-man/man7/DROP_FOREIGN_DATA_WRAPPER.7.gz
-man/man7/DROP_FOREIGN_TABLE.7.gz
-man/man7/DROP_FUNCTION.7.gz
-man/man7/DROP_GROUP.7.gz
-man/man7/DROP_INDEX.7.gz
-man/man7/DROP_LANGUAGE.7.gz
-man/man7/DROP_MATERIALIZED_VIEW.7.gz
-man/man7/DROP_OPERATOR.7.gz
-man/man7/DROP_OPERATOR_CLASS.7.gz
-man/man7/DROP_OPERATOR_FAMILY.7.gz
-man/man7/DROP_OWNED.7.gz
-man/man7/DROP_POLICY.7.gz
-man/man7/DROP_PROCEDURE.7.gz
-man/man7/DROP_PUBLICATION.7.gz
-man/man7/DROP_ROLE.7.gz
-man/man7/DROP_ROUTINE.7.gz
-man/man7/DROP_RULE.7.gz
-man/man7/DROP_SCHEMA.7.gz
-man/man7/DROP_SEQUENCE.7.gz
-man/man7/DROP_SERVER.7.gz
-man/man7/DROP_STATISTICS.7.gz
-man/man7/DROP_SUBSCRIPTION.7.gz
-man/man7/DROP_TABLE.7.gz
-man/man7/DROP_TABLESPACE.7.gz
-man/man7/DROP_TEXT_SEARCH_CONFIGURATION.7.gz
-man/man7/DROP_TEXT_SEARCH_DICTIONARY.7.gz
-man/man7/DROP_TEXT_SEARCH_PARSER.7.gz
-man/man7/DROP_TEXT_SEARCH_TEMPLATE.7.gz
-man/man7/DROP_TRANSFORM.7.gz
-man/man7/DROP_TRIGGER.7.gz
-man/man7/DROP_TYPE.7.gz
-man/man7/DROP_USER.7.gz
-man/man7/DROP_USER_MAPPING.7.gz
-man/man7/DROP_VIEW.7.gz
-man/man7/END.7.gz
-man/man7/EXECUTE.7.gz
-man/man7/EXPLAIN.7.gz
-man/man7/FETCH.7.gz
-man/man7/GRANT.7.gz
-man/man7/IMPORT_FOREIGN_SCHEMA.7.gz
-man/man7/INSERT.7.gz
-man/man7/LISTEN.7.gz
-man/man7/LOAD.7.gz
-man/man7/LOCK.7.gz
-man/man7/MOVE.7.gz
-man/man7/NOTIFY.7.gz
-man/man7/PREPARE.7.gz
-man/man7/PREPARE_TRANSACTION.7.gz
-man/man7/REASSIGN_OWNED.7.gz
-man/man7/REFRESH_MATERIALIZED_VIEW.7.gz
-man/man7/REINDEX.7.gz
-man/man7/RELEASE_SAVEPOINT.7.gz
-man/man7/RESET.7.gz
-man/man7/REVOKE.7.gz
-man/man7/ROLLBACK.7.gz
-man/man7/ROLLBACK_PREPARED.7.gz
-man/man7/ROLLBACK_TO_SAVEPOINT.7.gz
-man/man7/SAVEPOINT.7.gz
-man/man7/SECURITY_LABEL.7.gz
-man/man7/SELECT.7.gz
-man/man7/SELECT_INTO.7.gz
-man/man7/SET.7.gz
-man/man7/SET_CONSTRAINTS.7.gz
-man/man7/SET_ROLE.7.gz
-man/man7/SET_SESSION_AUTHORIZATION.7.gz
-man/man7/SET_TRANSACTION.7.gz
-man/man7/SHOW.7.gz
-man/man7/START_TRANSACTION.7.gz
-man/man7/TABLE.7.gz
-man/man7/TRUNCATE.7.gz
-man/man7/UNLISTEN.7.gz
-man/man7/UPDATE.7.gz
-man/man7/VACUUM.7.gz
-man/man7/VALUES.7.gz
-man/man7/WITH.7.gz
+share/man/man1/clusterdb.1.gz
+share/man/man1/createdb.1.gz
+share/man/man1/createuser.1.gz
+share/man/man1/dropdb.1.gz
+share/man/man1/dropuser.1.gz
+share/man/man1/ecpg.1.gz
+share/man/man1/initdb.1.gz
+share/man/man1/oid2name.1.gz
+share/man/man1/pg_archivecleanup.1.gz
+share/man/man1/pg_basebackup.1.gz
+share/man/man1/pg_config.1.gz
+share/man/man1/pg_controldata.1.gz
+share/man/man1/pg_ctl.1.gz
+share/man/man1/pg_dump.1.gz
+share/man/man1/pg_dumpall.1.gz
+share/man/man1/pg_isready.1.gz
+share/man/man1/pg_receivewal.1.gz
+share/man/man1/pg_recvlogical.1.gz
+share/man/man1/pg_resetwal.1.gz
+share/man/man1/pg_restore.1.gz
+share/man/man1/pg_rewind.1.gz
+share/man/man1/pg_standby.1.gz
+share/man/man1/pg_test_fsync.1.gz
+share/man/man1/pg_test_timing.1.gz
+share/man/man1/pg_upgrade.1.gz
+share/man/man1/pg_waldump.1.gz
+share/man/man1/pgbench.1.gz
+share/man/man1/postgres.1.gz
+share/man/man1/postmaster.1.gz
+share/man/man1/psql.1.gz
+share/man/man1/reindexdb.1.gz
+share/man/man1/vacuumdb.1.gz
+share/man/man1/vacuumlo.1.gz
+share/man/man3/SPI_commit.3.gz
+share/man/man3/SPI_connect.3.gz
+share/man/man3/SPI_connect_ext.3.gz
+share/man/man3/SPI_copytuple.3.gz
+share/man/man3/SPI_cursor_close.3.gz
+share/man/man3/SPI_cursor_fetch.3.gz
+share/man/man3/SPI_cursor_find.3.gz
+share/man/man3/SPI_cursor_move.3.gz
+share/man/man3/SPI_cursor_open.3.gz
+share/man/man3/SPI_cursor_open_with_args.3.gz
+share/man/man3/SPI_cursor_open_with_paramlist.3.gz
+share/man/man3/SPI_exec.3.gz
+share/man/man3/SPI_execp.3.gz
+share/man/man3/SPI_execute.3.gz
+share/man/man3/SPI_execute_plan.3.gz
+share/man/man3/SPI_execute_plan_with_paramlist.3.gz
+share/man/man3/SPI_execute_with_args.3.gz
+share/man/man3/SPI_finish.3.gz
+share/man/man3/SPI_fname.3.gz
+share/man/man3/SPI_fnumber.3.gz
+share/man/man3/SPI_freeplan.3.gz
+share/man/man3/SPI_freetuple.3.gz
+share/man/man3/SPI_freetuptable.3.gz
+share/man/man3/SPI_getargcount.3.gz
+share/man/man3/SPI_getargtypeid.3.gz
+share/man/man3/SPI_getbinval.3.gz
+share/man/man3/SPI_getnspname.3.gz
+share/man/man3/SPI_getrelname.3.gz
+share/man/man3/SPI_gettype.3.gz
+share/man/man3/SPI_gettypeid.3.gz
+share/man/man3/SPI_getvalue.3.gz
+share/man/man3/SPI_is_cursor_plan.3.gz
+share/man/man3/SPI_keepplan.3.gz
+share/man/man3/SPI_modifytuple.3.gz
+share/man/man3/SPI_palloc.3.gz
+share/man/man3/SPI_pfree.3.gz
+share/man/man3/SPI_prepare.3.gz
+share/man/man3/SPI_prepare_cursor.3.gz
+share/man/man3/SPI_prepare_params.3.gz
+share/man/man3/SPI_register_relation.3.gz
+share/man/man3/SPI_register_trigger_data.3.gz
+share/man/man3/SPI_repalloc.3.gz
+share/man/man3/SPI_result_code_string.3.gz
+share/man/man3/SPI_returntuple.3.gz
+share/man/man3/SPI_rollback.3.gz
+share/man/man3/SPI_saveplan.3.gz
+share/man/man3/SPI_scroll_cursor_fetch.3.gz
+share/man/man3/SPI_scroll_cursor_move.3.gz
+share/man/man3/SPI_start_transaction.3.gz
+share/man/man3/SPI_unregister_relation.3.gz
+share/man/man3/dblink.3.gz
+share/man/man3/dblink_build_sql_delete.3.gz
+share/man/man3/dblink_build_sql_insert.3.gz
+share/man/man3/dblink_build_sql_update.3.gz
+share/man/man3/dblink_cancel_query.3.gz
+share/man/man3/dblink_close.3.gz
+share/man/man3/dblink_connect.3.gz
+share/man/man3/dblink_connect_u.3.gz
+share/man/man3/dblink_disconnect.3.gz
+share/man/man3/dblink_error_message.3.gz
+share/man/man3/dblink_exec.3.gz
+share/man/man3/dblink_fetch.3.gz
+share/man/man3/dblink_get_connections.3.gz
+share/man/man3/dblink_get_notify.3.gz
+share/man/man3/dblink_get_pkey.3.gz
+share/man/man3/dblink_get_result.3.gz
+share/man/man3/dblink_is_busy.3.gz
+share/man/man3/dblink_open.3.gz
+share/man/man3/dblink_send_query.3.gz
+share/man/man7/ABORT.7.gz
+share/man/man7/ALTER_AGGREGATE.7.gz
+share/man/man7/ALTER_COLLATION.7.gz
+share/man/man7/ALTER_CONVERSION.7.gz
+share/man/man7/ALTER_DATABASE.7.gz
+share/man/man7/ALTER_DEFAULT_PRIVILEGES.7.gz
+share/man/man7/ALTER_DOMAIN.7.gz
+share/man/man7/ALTER_EVENT_TRIGGER.7.gz
+share/man/man7/ALTER_EXTENSION.7.gz
+share/man/man7/ALTER_FOREIGN_DATA_WRAPPER.7.gz
+share/man/man7/ALTER_FOREIGN_TABLE.7.gz
+share/man/man7/ALTER_FUNCTION.7.gz
+share/man/man7/ALTER_GROUP.7.gz
+share/man/man7/ALTER_INDEX.7.gz
+share/man/man7/ALTER_LANGUAGE.7.gz
+share/man/man7/ALTER_LARGE_OBJECT.7.gz
+share/man/man7/ALTER_MATERIALIZED_VIEW.7.gz
+share/man/man7/ALTER_OPERATOR.7.gz
+share/man/man7/ALTER_OPERATOR_CLASS.7.gz
+share/man/man7/ALTER_OPERATOR_FAMILY.7.gz
+share/man/man7/ALTER_POLICY.7.gz
+share/man/man7/ALTER_PROCEDURE.7.gz
+share/man/man7/ALTER_PUBLICATION.7.gz
+share/man/man7/ALTER_ROLE.7.gz
+share/man/man7/ALTER_ROUTINE.7.gz
+share/man/man7/ALTER_RULE.7.gz
+share/man/man7/ALTER_SCHEMA.7.gz
+share/man/man7/ALTER_SEQUENCE.7.gz
+share/man/man7/ALTER_SERVER.7.gz
+share/man/man7/ALTER_STATISTICS.7.gz
+share/man/man7/ALTER_SUBSCRIPTION.7.gz
+share/man/man7/ALTER_SYSTEM.7.gz
+share/man/man7/ALTER_TABLE.7.gz
+share/man/man7/ALTER_TABLESPACE.7.gz
+share/man/man7/ALTER_TEXT_SEARCH_CONFIGURATION.7.gz
+share/man/man7/ALTER_TEXT_SEARCH_DICTIONARY.7.gz
+share/man/man7/ALTER_TEXT_SEARCH_PARSER.7.gz
+share/man/man7/ALTER_TEXT_SEARCH_TEMPLATE.7.gz
+share/man/man7/ALTER_TRIGGER.7.gz
+share/man/man7/ALTER_TYPE.7.gz
+share/man/man7/ALTER_USER.7.gz
+share/man/man7/ALTER_USER_MAPPING.7.gz
+share/man/man7/ALTER_VIEW.7.gz
+share/man/man7/ANALYZE.7.gz
+share/man/man7/BEGIN.7.gz
+share/man/man7/CALL.7.gz
+share/man/man7/CHECKPOINT.7.gz
+share/man/man7/CLOSE.7.gz
+share/man/man7/CLUSTER.7.gz
+share/man/man7/COMMENT.7.gz
+share/man/man7/COMMIT.7.gz
+share/man/man7/COMMIT_PREPARED.7.gz
+share/man/man7/COPY.7.gz
+share/man/man7/CREATE_ACCESS_METHOD.7.gz
+share/man/man7/CREATE_AGGREGATE.7.gz
+share/man/man7/CREATE_CAST.7.gz
+share/man/man7/CREATE_COLLATION.7.gz
+share/man/man7/CREATE_CONVERSION.7.gz
+share/man/man7/CREATE_DATABASE.7.gz
+share/man/man7/CREATE_DOMAIN.7.gz
+share/man/man7/CREATE_EVENT_TRIGGER.7.gz
+share/man/man7/CREATE_EXTENSION.7.gz
+share/man/man7/CREATE_FOREIGN_DATA_WRAPPER.7.gz
+share/man/man7/CREATE_FOREIGN_TABLE.7.gz
+share/man/man7/CREATE_FUNCTION.7.gz
+share/man/man7/CREATE_GROUP.7.gz
+share/man/man7/CREATE_INDEX.7.gz
+share/man/man7/CREATE_LANGUAGE.7.gz
+share/man/man7/CREATE_MATERIALIZED_VIEW.7.gz
+share/man/man7/CREATE_OPERATOR.7.gz
+share/man/man7/CREATE_OPERATOR_CLASS.7.gz
+share/man/man7/CREATE_OPERATOR_FAMILY.7.gz
+share/man/man7/CREATE_POLICY.7.gz
+share/man/man7/CREATE_PROCEDURE.7.gz
+share/man/man7/CREATE_PUBLICATION.7.gz
+share/man/man7/CREATE_ROLE.7.gz
+share/man/man7/CREATE_RULE.7.gz
+share/man/man7/CREATE_SCHEMA.7.gz
+share/man/man7/CREATE_SEQUENCE.7.gz
+share/man/man7/CREATE_SERVER.7.gz
+share/man/man7/CREATE_STATISTICS.7.gz
+share/man/man7/CREATE_SUBSCRIPTION.7.gz
+share/man/man7/CREATE_TABLE.7.gz
+share/man/man7/CREATE_TABLESPACE.7.gz
+share/man/man7/CREATE_TABLE_AS.7.gz
+share/man/man7/CREATE_TEXT_SEARCH_CONFIGURATION.7.gz
+share/man/man7/CREATE_TEXT_SEARCH_DICTIONARY.7.gz
+share/man/man7/CREATE_TEXT_SEARCH_PARSER.7.gz
+share/man/man7/CREATE_TEXT_SEARCH_TEMPLATE.7.gz
+share/man/man7/CREATE_TRANSFORM.7.gz
+share/man/man7/CREATE_TRIGGER.7.gz
+share/man/man7/CREATE_TYPE.7.gz
+share/man/man7/CREATE_USER.7.gz
+share/man/man7/CREATE_USER_MAPPING.7.gz
+share/man/man7/CREATE_VIEW.7.gz
+share/man/man7/DEALLOCATE.7.gz
+share/man/man7/DECLARE.7.gz
+share/man/man7/DELETE.7.gz
+share/man/man7/DISCARD.7.gz
+share/man/man7/DO.7.gz
+share/man/man7/DROP_ACCESS_METHOD.7.gz
+share/man/man7/DROP_AGGREGATE.7.gz
+share/man/man7/DROP_CAST.7.gz
+share/man/man7/DROP_COLLATION.7.gz
+share/man/man7/DROP_CONVERSION.7.gz
+share/man/man7/DROP_DATABASE.7.gz
+share/man/man7/DROP_DOMAIN.7.gz
+share/man/man7/DROP_EVENT_TRIGGER.7.gz
+share/man/man7/DROP_EXTENSION.7.gz
+share/man/man7/DROP_FOREIGN_DATA_WRAPPER.7.gz
+share/man/man7/DROP_FOREIGN_TABLE.7.gz
+share/man/man7/DROP_FUNCTION.7.gz
+share/man/man7/DROP_GROUP.7.gz
+share/man/man7/DROP_INDEX.7.gz
+share/man/man7/DROP_LANGUAGE.7.gz
+share/man/man7/DROP_MATERIALIZED_VIEW.7.gz
+share/man/man7/DROP_OPERATOR.7.gz
+share/man/man7/DROP_OPERATOR_CLASS.7.gz
+share/man/man7/DROP_OPERATOR_FAMILY.7.gz
+share/man/man7/DROP_OWNED.7.gz
+share/man/man7/DROP_POLICY.7.gz
+share/man/man7/DROP_PROCEDURE.7.gz
+share/man/man7/DROP_PUBLICATION.7.gz
+share/man/man7/DROP_ROLE.7.gz
+share/man/man7/DROP_ROUTINE.7.gz
+share/man/man7/DROP_RULE.7.gz
+share/man/man7/DROP_SCHEMA.7.gz
+share/man/man7/DROP_SEQUENCE.7.gz
+share/man/man7/DROP_SERVER.7.gz
+share/man/man7/DROP_STATISTICS.7.gz
+share/man/man7/DROP_SUBSCRIPTION.7.gz
+share/man/man7/DROP_TABLE.7.gz
+share/man/man7/DROP_TABLESPACE.7.gz
+share/man/man7/DROP_TEXT_SEARCH_CONFIGURATION.7.gz
+share/man/man7/DROP_TEXT_SEARCH_DICTIONARY.7.gz
+share/man/man7/DROP_TEXT_SEARCH_PARSER.7.gz
+share/man/man7/DROP_TEXT_SEARCH_TEMPLATE.7.gz
+share/man/man7/DROP_TRANSFORM.7.gz
+share/man/man7/DROP_TRIGGER.7.gz
+share/man/man7/DROP_TYPE.7.gz
+share/man/man7/DROP_USER.7.gz
+share/man/man7/DROP_USER_MAPPING.7.gz
+share/man/man7/DROP_VIEW.7.gz
+share/man/man7/END.7.gz
+share/man/man7/EXECUTE.7.gz
+share/man/man7/EXPLAIN.7.gz
+share/man/man7/FETCH.7.gz
+share/man/man7/GRANT.7.gz
+share/man/man7/IMPORT_FOREIGN_SCHEMA.7.gz
+share/man/man7/INSERT.7.gz
+share/man/man7/LISTEN.7.gz
+share/man/man7/LOAD.7.gz
+share/man/man7/LOCK.7.gz
+share/man/man7/MOVE.7.gz
+share/man/man7/NOTIFY.7.gz
+share/man/man7/PREPARE.7.gz
+share/man/man7/PREPARE_TRANSACTION.7.gz
+share/man/man7/REASSIGN_OWNED.7.gz
+share/man/man7/REFRESH_MATERIALIZED_VIEW.7.gz
+share/man/man7/REINDEX.7.gz
+share/man/man7/RELEASE_SAVEPOINT.7.gz
+share/man/man7/RESET.7.gz
+share/man/man7/REVOKE.7.gz
+share/man/man7/ROLLBACK.7.gz
+share/man/man7/ROLLBACK_PREPARED.7.gz
+share/man/man7/ROLLBACK_TO_SAVEPOINT.7.gz
+share/man/man7/SAVEPOINT.7.gz
+share/man/man7/SECURITY_LABEL.7.gz
+share/man/man7/SELECT.7.gz
+share/man/man7/SELECT_INTO.7.gz
+share/man/man7/SET.7.gz
+share/man/man7/SET_CONSTRAINTS.7.gz
+share/man/man7/SET_ROLE.7.gz
+share/man/man7/SET_SESSION_AUTHORIZATION.7.gz
+share/man/man7/SET_TRANSACTION.7.gz
+share/man/man7/SHOW.7.gz
+share/man/man7/START_TRANSACTION.7.gz
+share/man/man7/TABLE.7.gz
+share/man/man7/TRUNCATE.7.gz
+share/man/man7/UNLISTEN.7.gz
+share/man/man7/UPDATE.7.gz
+share/man/man7/VACUUM.7.gz
+share/man/man7/VALUES.7.gz
+share/man/man7/WITH.7.gz
 %%PORTDOCS%%%%DOCSDIR%%/README-client
-%%NLS%%share/locale/cs/LC_MESSAGES/ecpg-12.mo
-%%NLS%%share/locale/cs/LC_MESSAGES/ecpglib6-12.mo
-%%NLS%%share/locale/cs/LC_MESSAGES/libpq5-12.mo
-%%NLS%%share/locale/cs/LC_MESSAGES/pg_config-12.mo
-%%NLS%%share/locale/cs/LC_MESSAGES/pg_dump-12.mo
-%%NLS%%share/locale/cs/LC_MESSAGES/pgscripts-12.mo
-%%NLS%%share/locale/cs/LC_MESSAGES/psql-12.mo
-%%NLS%%share/locale/de/LC_MESSAGES/ecpg-12.mo
-%%NLS%%share/locale/de/LC_MESSAGES/ecpglib6-12.mo
-%%NLS%%share/locale/de/LC_MESSAGES/libpq5-12.mo
-%%NLS%%share/locale/de/LC_MESSAGES/pg_config-12.mo
-%%NLS%%share/locale/de/LC_MESSAGES/pg_dump-12.mo
-%%NLS%%share/locale/de/LC_MESSAGES/pgscripts-12.mo
-%%NLS%%share/locale/de/LC_MESSAGES/psql-12.mo
-%%NLS%%share/locale/es/LC_MESSAGES/ecpg-12.mo
-%%NLS%%share/locale/es/LC_MESSAGES/ecpglib6-12.mo
-%%NLS%%share/locale/es/LC_MESSAGES/libpq5-12.mo
-%%NLS%%share/locale/es/LC_MESSAGES/pg_config-12.mo
-%%NLS%%share/locale/es/LC_MESSAGES/pg_dump-12.mo
-%%NLS%%share/locale/es/LC_MESSAGES/pgscripts-12.mo
-%%NLS%%share/locale/es/LC_MESSAGES/psql-12.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/ecpg-12.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/ecpglib6-12.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/libpq5-12.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/pg_config-12.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/pg_dump-12.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/pgscripts-12.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/psql-12.mo
-%%NLS%%share/locale/he/LC_MESSAGES/libpq5-12.mo
-%%NLS%%share/locale/he/LC_MESSAGES/pg_config-12.mo
-%%NLS%%share/locale/it/LC_MESSAGES/ecpg-12.mo
-%%NLS%%share/locale/it/LC_MESSAGES/ecpglib6-12.mo
-%%NLS%%share/locale/it/LC_MESSAGES/libpq5-12.mo
-%%NLS%%share/locale/it/LC_MESSAGES/pg_config-12.mo
-%%NLS%%share/locale/it/LC_MESSAGES/psql-12.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/ecpg-12.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/ecpglib6-12.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/libpq5-12.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/pg_config-12.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/pg_dump-12.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/pgscripts-12.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/psql-12.mo
-%%NLS%%share/locale/ko/LC_MESSAGES/ecpg-12.mo
-%%NLS%%share/locale/ko/LC_MESSAGES/ecpglib6-12.mo
-%%NLS%%share/locale/ko/LC_MESSAGES/libpq5-12.mo
-%%NLS%%share/locale/ko/LC_MESSAGES/pg_config-12.mo
-%%NLS%%share/locale/ko/LC_MESSAGES/pg_dump-12.mo
-%%NLS%%share/locale/ko/LC_MESSAGES/pgscripts-12.mo
-%%NLS%%share/locale/ko/LC_MESSAGES/psql-12.mo
-%%NLS%%share/locale/pl/LC_MESSAGES/ecpg-12.mo
-%%NLS%%share/locale/pl/LC_MESSAGES/ecpglib6-12.mo
-%%NLS%%share/locale/pl/LC_MESSAGES/pg_config-12.mo
-%%NLS%%share/locale/pt_BR/LC_MESSAGES/ecpg-12.mo
-%%NLS%%share/locale/pt_BR/LC_MESSAGES/ecpglib6-12.mo
-%%NLS%%share/locale/pt_BR/LC_MESSAGES/pg_config-12.mo
-%%NLS%%share/locale/ro/LC_MESSAGES/pg_config-12.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/ecpg-12.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/ecpglib6-12.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/libpq5-12.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/pg_config-12.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/pg_dump-12.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/pgscripts-12.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/psql-12.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/ecpg-12.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/ecpglib6-12.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/libpq5-12.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/pg_config-12.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/pg_dump-12.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/pgscripts-12.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/psql-12.mo
-%%NLS%%share/locale/tr/LC_MESSAGES/ecpg-12.mo
-%%NLS%%share/locale/tr/LC_MESSAGES/ecpglib6-12.mo
-%%NLS%%share/locale/tr/LC_MESSAGES/libpq5-12.mo
-%%NLS%%share/locale/tr/LC_MESSAGES/pg_config-12.mo
-%%NLS%%share/locale/tr/LC_MESSAGES/pg_dump-12.mo
-%%NLS%%share/locale/tr/LC_MESSAGES/pgscripts-12.mo
-%%NLS%%share/locale/tr/LC_MESSAGES/psql-12.mo
-%%NLS%%share/locale/uk/LC_MESSAGES/ecpg-12.mo
-%%NLS%%share/locale/uk/LC_MESSAGES/ecpglib6-12.mo
-%%NLS%%share/locale/uk/LC_MESSAGES/libpq5-12.mo
-%%NLS%%share/locale/uk/LC_MESSAGES/pg_config-12.mo
-%%NLS%%share/locale/uk/LC_MESSAGES/pg_dump-12.mo
-%%NLS%%share/locale/uk/LC_MESSAGES/pgscripts-12.mo
-%%NLS%%share/locale/uk/LC_MESSAGES/psql-12.mo
-%%NLS%%share/locale/vi/LC_MESSAGES/ecpg-12.mo
-%%NLS%%share/locale/vi/LC_MESSAGES/ecpglib6-12.mo
-%%NLS%%share/locale/vi/LC_MESSAGES/pg_config-12.mo
-%%NLS%%share/locale/zh_CN/LC_MESSAGES/ecpg-12.mo
-%%NLS%%share/locale/zh_CN/LC_MESSAGES/ecpglib6-12.mo
-%%NLS%%share/locale/zh_CN/LC_MESSAGES/libpq5-12.mo
-%%NLS%%share/locale/zh_CN/LC_MESSAGES/pg_config-12.mo
-%%NLS%%share/locale/zh_CN/LC_MESSAGES/pg_dump-12.mo
-%%NLS%%share/locale/zh_CN/LC_MESSAGES/pgscripts-12.mo
-%%NLS%%share/locale/zh_CN/LC_MESSAGES/psql-12.mo
-%%NLS%%share/locale/zh_TW/LC_MESSAGES/ecpg-12.mo
-%%NLS%%share/locale/zh_TW/LC_MESSAGES/pg_config-12.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/ecpg-%%PG_VERSION%%.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/ecpglib6-%%PG_VERSION%%.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/libpq5-%%PG_VERSION%%.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/pg_config-%%PG_VERSION%%.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/pg_dump-%%PG_VERSION%%.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/pgscripts-%%PG_VERSION%%.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/psql-%%PG_VERSION%%.mo
+%%NLS%%share/locale/de/LC_MESSAGES/ecpg-%%PG_VERSION%%.mo
+%%NLS%%share/locale/de/LC_MESSAGES/ecpglib6-%%PG_VERSION%%.mo
+%%NLS%%share/locale/de/LC_MESSAGES/libpq5-%%PG_VERSION%%.mo
+%%NLS%%share/locale/de/LC_MESSAGES/pg_config-%%PG_VERSION%%.mo
+%%NLS%%share/locale/de/LC_MESSAGES/pg_dump-%%PG_VERSION%%.mo
+%%NLS%%share/locale/de/LC_MESSAGES/pgscripts-%%PG_VERSION%%.mo
+%%NLS%%share/locale/de/LC_MESSAGES/psql-%%PG_VERSION%%.mo
+%%NLS%%share/locale/es/LC_MESSAGES/ecpg-%%PG_VERSION%%.mo
+%%NLS%%share/locale/es/LC_MESSAGES/ecpglib6-%%PG_VERSION%%.mo
+%%NLS%%share/locale/es/LC_MESSAGES/libpq5-%%PG_VERSION%%.mo
+%%NLS%%share/locale/es/LC_MESSAGES/pg_config-%%PG_VERSION%%.mo
+%%NLS%%share/locale/es/LC_MESSAGES/pg_dump-%%PG_VERSION%%.mo
+%%NLS%%share/locale/es/LC_MESSAGES/pgscripts-%%PG_VERSION%%.mo
+%%NLS%%share/locale/es/LC_MESSAGES/psql-%%PG_VERSION%%.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/ecpg-%%PG_VERSION%%.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/ecpglib6-%%PG_VERSION%%.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/libpq5-%%PG_VERSION%%.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/pg_config-%%PG_VERSION%%.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/pg_dump-%%PG_VERSION%%.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/pgscripts-%%PG_VERSION%%.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/psql-%%PG_VERSION%%.mo
+%%NLS%%share/locale/he/LC_MESSAGES/libpq5-%%PG_VERSION%%.mo
+%%NLS%%share/locale/he/LC_MESSAGES/pg_config-%%PG_VERSION%%.mo
+%%NLS%%share/locale/it/LC_MESSAGES/ecpg-%%PG_VERSION%%.mo
+%%NLS%%share/locale/it/LC_MESSAGES/ecpglib6-%%PG_VERSION%%.mo
+%%NLS%%share/locale/it/LC_MESSAGES/libpq5-%%PG_VERSION%%.mo
+%%NLS%%share/locale/it/LC_MESSAGES/pg_config-%%PG_VERSION%%.mo
+%%NLS%%share/locale/it/LC_MESSAGES/psql-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/ecpg-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/ecpglib6-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/libpq5-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/pg_config-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/pg_dump-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/pgscripts-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/psql-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/ecpg-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/ecpglib6-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/libpq5-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/pg_config-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/pg_dump-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/pgscripts-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/psql-%%PG_VERSION%%.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/ecpg-%%PG_VERSION%%.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/ecpglib6-%%PG_VERSION%%.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/pg_config-%%PG_VERSION%%.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/ecpg-%%PG_VERSION%%.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/ecpglib6-%%PG_VERSION%%.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/pg_config-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ro/LC_MESSAGES/pg_config-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/ecpg-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/ecpglib6-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/libpq5-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/pg_config-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/pg_dump-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/pgscripts-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/psql-%%PG_VERSION%%.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/ecpg-%%PG_VERSION%%.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/ecpglib6-%%PG_VERSION%%.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/libpq5-%%PG_VERSION%%.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/pg_config-%%PG_VERSION%%.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/pg_dump-%%PG_VERSION%%.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/pgscripts-%%PG_VERSION%%.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/psql-%%PG_VERSION%%.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/ecpg-%%PG_VERSION%%.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/ecpglib6-%%PG_VERSION%%.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/libpq5-%%PG_VERSION%%.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/pg_config-%%PG_VERSION%%.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/pg_dump-%%PG_VERSION%%.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/pgscripts-%%PG_VERSION%%.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/psql-%%PG_VERSION%%.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/ecpg-%%PG_VERSION%%.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/ecpglib6-%%PG_VERSION%%.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/libpq5-%%PG_VERSION%%.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/pg_config-%%PG_VERSION%%.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/pg_dump-%%PG_VERSION%%.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/pgscripts-%%PG_VERSION%%.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/psql-%%PG_VERSION%%.mo
+%%NLS%%share/locale/vi/LC_MESSAGES/ecpg-%%PG_VERSION%%.mo
+%%NLS%%share/locale/vi/LC_MESSAGES/ecpglib6-%%PG_VERSION%%.mo
+%%NLS%%share/locale/vi/LC_MESSAGES/pg_config-%%PG_VERSION%%.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/ecpg-%%PG_VERSION%%.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/ecpglib6-%%PG_VERSION%%.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/libpq5-%%PG_VERSION%%.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/pg_config-%%PG_VERSION%%.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/pg_dump-%%PG_VERSION%%.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/pgscripts-%%PG_VERSION%%.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/psql-%%PG_VERSION%%.mo
+%%NLS%%share/locale/zh_TW/LC_MESSAGES/ecpg-%%PG_VERSION%%.mo
+%%NLS%%share/locale/zh_TW/LC_MESSAGES/pg_config-%%PG_VERSION%%.mo
 %%DATADIR%%/pg_service.conf.sample
 %%DATADIR%%/psqlrc.sample
diff --git a/databases/postgresql12-server/pkg-plist-plperl b/databases/postgresql12-server/pkg-plist-plperl
index 93081938fd08..1917659bd9e2 100644
--- a/databases/postgresql12-server/pkg-plist-plperl
+++ b/databases/postgresql12-server/pkg-plist-plperl
@@ -1,5 +1,6 @@
 include/postgresql/server/plperl.h
 include/postgresql/server/plperl_helpers.h
+include/postgresql/server/plperl_system.h
 include/postgresql/server/ppport.h
 %%DATADIR%%/extension/plperlu--1.0.sql
 %%DATADIR%%/extension/plperl.control
diff --git a/databases/postgresql12-server/pkg-plist-plpython b/databases/postgresql12-server/pkg-plist-plpython
index 8ecdbbea15a3..120047bc6e0d 100644
--- a/databases/postgresql12-server/pkg-plist-plpython
+++ b/databases/postgresql12-server/pkg-plist-plpython
@@ -11,6 +11,7 @@ include/postgresql/server/plpy_subxactobject.h
 include/postgresql/server/plpy_typeio.h
 include/postgresql/server/plpy_util.h
 include/postgresql/server/plpython.h
+include/postgresql/server/plpython_system.h
 lib/postgresql/pgxs/src/pl/plpython/regress-python3-mangle.mk
 %%DOCSDIR%%/README-plpython
 %%PYTHON2%%lib/postgresql/plpython2.so
diff --git a/databases/postgresql12-server/pkg-plist-server b/databases/postgresql12-server/pkg-plist-server
index 057666de9066..a584974a2e77 100644
--- a/databases/postgresql12-server/pkg-plist-server
+++ b/databases/postgresql12-server/pkg-plist-server
@@ -734,176 +734,176 @@ lib/libpgcommon.a
 %%DATADIR%%/extension/plpgsql--unpackaged--1.0.sql
 %%DATADIR%%/extension/plpgsql.control
 %%DATADIR%%/postgres.shdescription
-%%NLS%%share/locale/cs/LC_MESSAGES/initdb-12.mo
-%%NLS%%share/locale/cs/LC_MESSAGES/pg_archivecleanup-12.mo
-%%NLS%%share/locale/cs/LC_MESSAGES/pg_basebackup-12.mo
-%%NLS%%share/locale/cs/LC_MESSAGES/pg_checksums-12.mo
-%%NLS%%share/locale/cs/LC_MESSAGES/pg_controldata-12.mo
-%%NLS%%share/locale/cs/LC_MESSAGES/pg_ctl-12.mo
-%%NLS%%share/locale/cs/LC_MESSAGES/pg_resetwal-12.mo
-%%NLS%%share/locale/cs/LC_MESSAGES/pg_rewind-12.mo
-%%NLS%%share/locale/cs/LC_MESSAGES/pg_test_fsync-12.mo
-%%NLS%%share/locale/cs/LC_MESSAGES/pg_test_timing-12.mo
-%%NLS%%share/locale/cs/LC_MESSAGES/pg_upgrade-12.mo
-%%NLS%%share/locale/cs/LC_MESSAGES/pg_waldump-12.mo
-%%NLS%%share/locale/cs/LC_MESSAGES/plpgsql-12.mo
-%%NLS%%share/locale/de/LC_MESSAGES/initdb-12.mo
-%%NLS%%share/locale/de/LC_MESSAGES/pg_archivecleanup-12.mo
-%%NLS%%share/locale/de/LC_MESSAGES/pg_basebackup-12.mo
-%%NLS%%share/locale/de/LC_MESSAGES/pg_checksums-12.mo
-%%NLS%%share/locale/de/LC_MESSAGES/pg_controldata-12.mo
-%%NLS%%share/locale/de/LC_MESSAGES/pg_ctl-12.mo
-%%NLS%%share/locale/de/LC_MESSAGES/pg_resetwal-12.mo
-%%NLS%%share/locale/de/LC_MESSAGES/pg_rewind-12.mo
-%%NLS%%share/locale/de/LC_MESSAGES/pg_test_fsync-12.mo
-%%NLS%%share/locale/de/LC_MESSAGES/pg_test_timing-12.mo
-%%NLS%%share/locale/de/LC_MESSAGES/pg_upgrade-12.mo
-%%NLS%%share/locale/de/LC_MESSAGES/pg_waldump-12.mo
-%%NLS%%share/locale/de/LC_MESSAGES/plpgsql-12.mo
-%%NLS%%share/locale/de/LC_MESSAGES/postgres-12.mo
-%%NLS%%share/locale/es/LC_MESSAGES/initdb-12.mo
-%%NLS%%share/locale/es/LC_MESSAGES/pg_archivecleanup-12.mo
-%%NLS%%share/locale/es/LC_MESSAGES/pg_basebackup-12.mo
-%%NLS%%share/locale/es/LC_MESSAGES/pg_checksums-12.mo
-%%NLS%%share/locale/es/LC_MESSAGES/pg_controldata-12.mo
-%%NLS%%share/locale/es/LC_MESSAGES/pg_ctl-12.mo
-%%NLS%%share/locale/es/LC_MESSAGES/pg_resetwal-12.mo
-%%NLS%%share/locale/es/LC_MESSAGES/pg_rewind-12.mo
-%%NLS%%share/locale/es/LC_MESSAGES/pg_test_fsync-12.mo
-%%NLS%%share/locale/es/LC_MESSAGES/pg_test_timing-12.mo
-%%NLS%%share/locale/es/LC_MESSAGES/pg_upgrade-12.mo
-%%NLS%%share/locale/es/LC_MESSAGES/pg_waldump-12.mo
-%%NLS%%share/locale/es/LC_MESSAGES/plpgsql-12.mo
-%%NLS%%share/locale/es/LC_MESSAGES/postgres-12.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/initdb-12.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/pg_archivecleanup-12.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/pg_basebackup-12.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/pg_checksums-12.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/pg_controldata-12.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/pg_ctl-12.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/pg_resetwal-12.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/pg_rewind-12.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/pg_test_fsync-12.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/pg_test_timing-12.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/pg_upgrade-12.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/pg_waldump-12.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/plpgsql-12.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/postgres-12.mo
-%%NLS%%share/locale/he/LC_MESSAGES/pg_ctl-12.mo
-%%NLS%%share/locale/it/LC_MESSAGES/pg_controldata-12.mo
-%%NLS%%share/locale/it/LC_MESSAGES/pg_ctl-12.mo
-%%NLS%%share/locale/it/LC_MESSAGES/plpgsql-12.mo
-%%NLS%%share/locale/it/LC_MESSAGES/postgres-12.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/initdb-12.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/pg_archivecleanup-12.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/pg_basebackup-12.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/pg_checksums-12.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/pg_controldata-12.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/pg_ctl-12.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/pg_resetwal-12.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/pg_rewind-12.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/pg_test_fsync-12.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/pg_test_timing-12.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/pg_upgrade-12.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/pg_waldump-12.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/plpgsql-12.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/postgres-12.mo
-%%NLS%%share/locale/ko/LC_MESSAGES/initdb-12.mo
-%%NLS%%share/locale/ko/LC_MESSAGES/pg_archivecleanup-12.mo
-%%NLS%%share/locale/ko/LC_MESSAGES/pg_basebackup-12.mo
-%%NLS%%share/locale/ko/LC_MESSAGES/pg_checksums-12.mo
-%%NLS%%share/locale/ko/LC_MESSAGES/pg_controldata-12.mo
-%%NLS%%share/locale/ko/LC_MESSAGES/pg_ctl-12.mo
-%%NLS%%share/locale/ko/LC_MESSAGES/pg_resetwal-12.mo
-%%NLS%%share/locale/ko/LC_MESSAGES/pg_rewind-12.mo
-%%NLS%%share/locale/ko/LC_MESSAGES/pg_test_fsync-12.mo
-%%NLS%%share/locale/ko/LC_MESSAGES/pg_test_timing-12.mo
-%%NLS%%share/locale/ko/LC_MESSAGES/pg_upgrade-12.mo
-%%NLS%%share/locale/ko/LC_MESSAGES/pg_waldump-12.mo
-%%NLS%%share/locale/ko/LC_MESSAGES/plpgsql-12.mo
-%%NLS%%share/locale/ko/LC_MESSAGES/postgres-12.mo
-%%NLS%%share/locale/pl/LC_MESSAGES/pg_controldata-12.mo
-%%NLS%%share/locale/pl/LC_MESSAGES/pg_ctl-12.mo
-%%NLS%%share/locale/pl/LC_MESSAGES/pg_test_fsync-12.mo
-%%NLS%%share/locale/pl/LC_MESSAGES/pg_test_timing-12.mo
-%%NLS%%share/locale/pl/LC_MESSAGES/plpgsql-12.mo
-%%NLS%%share/locale/pl/LC_MESSAGES/postgres-12.mo
-%%NLS%%share/locale/pt_BR/LC_MESSAGES/plpgsql-12.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/initdb-12.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/pg_archivecleanup-12.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/pg_basebackup-12.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/pg_checksums-12.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/pg_controldata-12.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/pg_ctl-12.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/pg_resetwal-12.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/pg_rewind-12.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/pg_test_fsync-12.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/pg_test_timing-12.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/pg_upgrade-12.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/pg_waldump-12.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/plpgsql-12.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/postgres-12.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/initdb-12.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/pg_archivecleanup-12.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/pg_basebackup-12.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/pg_checksums-12.mo
 %%DATADIR%%/snowball_create.sql
-%%NLS%%share/locale/sv/LC_MESSAGES/pg_controldata-12.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/pg_ctl-12.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/pg_resetwal-12.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/pg_rewind-12.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/pg_test_fsync-12.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/pg_test_timing-12.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/pg_upgrade-12.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/pg_waldump-12.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/plpgsql-12.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/postgres-12.mo
-%%NLS%%share/locale/tr/LC_MESSAGES/initdb-12.mo
-%%NLS%%share/locale/tr/LC_MESSAGES/pg_archivecleanup-12.mo
-%%NLS%%share/locale/tr/LC_MESSAGES/pg_basebackup-12.mo
-%%NLS%%share/locale/tr/LC_MESSAGES/pg_checksums-12.mo
-%%NLS%%share/locale/tr/LC_MESSAGES/pg_controldata-12.mo
-%%NLS%%share/locale/tr/LC_MESSAGES/pg_ctl-12.mo
-%%NLS%%share/locale/tr/LC_MESSAGES/pg_resetwal-12.mo
-%%NLS%%share/locale/tr/LC_MESSAGES/pg_rewind-12.mo
-%%NLS%%share/locale/tr/LC_MESSAGES/pg_test_fsync-12.mo
-%%NLS%%share/locale/tr/LC_MESSAGES/pg_test_timing-12.mo
-%%NLS%%share/locale/tr/LC_MESSAGES/pg_upgrade-12.mo
-%%NLS%%share/locale/tr/LC_MESSAGES/pg_waldump-12.mo
-%%NLS%%share/locale/tr/LC_MESSAGES/plpgsql-12.mo
-%%NLS%%share/locale/tr/LC_MESSAGES/postgres-12.mo
-%%NLS%%share/locale/uk/LC_MESSAGES/initdb-12.mo
-%%NLS%%share/locale/uk/LC_MESSAGES/pg_archivecleanup-12.mo
-%%NLS%%share/locale/uk/LC_MESSAGES/pg_basebackup-12.mo
-%%NLS%%share/locale/uk/LC_MESSAGES/pg_checksums-12.mo
-%%NLS%%share/locale/uk/LC_MESSAGES/pg_controldata-12.mo
-%%NLS%%share/locale/uk/LC_MESSAGES/pg_ctl-12.mo
-%%NLS%%share/locale/uk/LC_MESSAGES/pg_resetwal-12.mo
-%%NLS%%share/locale/uk/LC_MESSAGES/pg_rewind-12.mo
-%%NLS%%share/locale/uk/LC_MESSAGES/pg_test_fsync-12.mo
-%%NLS%%share/locale/uk/LC_MESSAGES/pg_test_timing-12.mo
-%%NLS%%share/locale/uk/LC_MESSAGES/pg_waldump-12.mo
-%%NLS%%share/locale/uk/LC_MESSAGES/plpgsql-12.mo
-%%NLS%%share/locale/uk/LC_MESSAGES/pg_upgrade-12.mo
-%%NLS%%share/locale/uk/LC_MESSAGES/postgres-12.mo
-%%NLS%%share/locale/vi/LC_MESSAGES/pg_controldata-12.mo
-%%NLS%%share/locale/vi/LC_MESSAGES/pg_test_fsync-12.mo
-%%NLS%%share/locale/vi/LC_MESSAGES/pg_test_timing-12.mo
-%%NLS%%share/locale/vi/LC_MESSAGES/plpgsql-12.mo
-%%NLS%%share/locale/zh_CN/LC_MESSAGES/initdb-12.mo
-%%NLS%%share/locale/zh_CN/LC_MESSAGES/pg_archivecleanup-12.mo
-%%NLS%%share/locale/zh_CN/LC_MESSAGES/pg_basebackup-12.mo
-%%NLS%%share/locale/zh_CN/LC_MESSAGES/pg_checksums-12.mo
-%%NLS%%share/locale/zh_CN/LC_MESSAGES/pg_controldata-12.mo
-%%NLS%%share/locale/zh_CN/LC_MESSAGES/pg_ctl-12.mo
-%%NLS%%share/locale/zh_CN/LC_MESSAGES/pg_resetwal-12.mo
-%%NLS%%share/locale/zh_CN/LC_MESSAGES/pg_rewind-12.mo
-%%NLS%%share/locale/zh_CN/LC_MESSAGES/pg_test_fsync-12.mo
-%%NLS%%share/locale/zh_CN/LC_MESSAGES/pg_test_timing-12.mo
-%%NLS%%share/locale/zh_CN/LC_MESSAGES/pg_upgrade-12.mo
-%%NLS%%share/locale/zh_CN/LC_MESSAGES/pg_waldump-12.mo
-%%NLS%%share/locale/zh_CN/LC_MESSAGES/plpgsql-12.mo
-%%NLS%%share/locale/zh_CN/LC_MESSAGES/postgres-12.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/initdb-%%PG_VERSION%%.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/pg_archivecleanup-%%PG_VERSION%%.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/pg_basebackup-%%PG_VERSION%%.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/pg_checksums-%%PG_VERSION%%.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/pg_controldata-%%PG_VERSION%%.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/pg_ctl-%%PG_VERSION%%.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/pg_resetwal-%%PG_VERSION%%.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/pg_rewind-%%PG_VERSION%%.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/pg_test_fsync-%%PG_VERSION%%.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/pg_test_timing-%%PG_VERSION%%.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/pg_upgrade-%%PG_VERSION%%.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/pg_waldump-%%PG_VERSION%%.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/plpgsql-%%PG_VERSION%%.mo
+%%NLS%%share/locale/de/LC_MESSAGES/initdb-%%PG_VERSION%%.mo
+%%NLS%%share/locale/de/LC_MESSAGES/pg_archivecleanup-%%PG_VERSION%%.mo
+%%NLS%%share/locale/de/LC_MESSAGES/pg_basebackup-%%PG_VERSION%%.mo
+%%NLS%%share/locale/de/LC_MESSAGES/pg_checksums-%%PG_VERSION%%.mo
+%%NLS%%share/locale/de/LC_MESSAGES/pg_controldata-%%PG_VERSION%%.mo
+%%NLS%%share/locale/de/LC_MESSAGES/pg_ctl-%%PG_VERSION%%.mo
+%%NLS%%share/locale/de/LC_MESSAGES/pg_resetwal-%%PG_VERSION%%.mo
+%%NLS%%share/locale/de/LC_MESSAGES/pg_rewind-%%PG_VERSION%%.mo
+%%NLS%%share/locale/de/LC_MESSAGES/pg_test_fsync-%%PG_VERSION%%.mo
+%%NLS%%share/locale/de/LC_MESSAGES/pg_test_timing-%%PG_VERSION%%.mo
+%%NLS%%share/locale/de/LC_MESSAGES/pg_upgrade-%%PG_VERSION%%.mo
+%%NLS%%share/locale/de/LC_MESSAGES/pg_waldump-%%PG_VERSION%%.mo
+%%NLS%%share/locale/de/LC_MESSAGES/plpgsql-%%PG_VERSION%%.mo
+%%NLS%%share/locale/de/LC_MESSAGES/postgres-%%PG_VERSION%%.mo
+%%NLS%%share/locale/es/LC_MESSAGES/initdb-%%PG_VERSION%%.mo
+%%NLS%%share/locale/es/LC_MESSAGES/pg_archivecleanup-%%PG_VERSION%%.mo
+%%NLS%%share/locale/es/LC_MESSAGES/pg_basebackup-%%PG_VERSION%%.mo
+%%NLS%%share/locale/es/LC_MESSAGES/pg_checksums-%%PG_VERSION%%.mo
+%%NLS%%share/locale/es/LC_MESSAGES/pg_controldata-%%PG_VERSION%%.mo
+%%NLS%%share/locale/es/LC_MESSAGES/pg_ctl-%%PG_VERSION%%.mo
+%%NLS%%share/locale/es/LC_MESSAGES/pg_resetwal-%%PG_VERSION%%.mo
+%%NLS%%share/locale/es/LC_MESSAGES/pg_rewind-%%PG_VERSION%%.mo
+%%NLS%%share/locale/es/LC_MESSAGES/pg_test_fsync-%%PG_VERSION%%.mo
+%%NLS%%share/locale/es/LC_MESSAGES/pg_test_timing-%%PG_VERSION%%.mo
+%%NLS%%share/locale/es/LC_MESSAGES/pg_upgrade-%%PG_VERSION%%.mo
+%%NLS%%share/locale/es/LC_MESSAGES/pg_waldump-%%PG_VERSION%%.mo
+%%NLS%%share/locale/es/LC_MESSAGES/plpgsql-%%PG_VERSION%%.mo
+%%NLS%%share/locale/es/LC_MESSAGES/postgres-%%PG_VERSION%%.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/initdb-%%PG_VERSION%%.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/pg_archivecleanup-%%PG_VERSION%%.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/pg_basebackup-%%PG_VERSION%%.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/pg_checksums-%%PG_VERSION%%.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/pg_controldata-%%PG_VERSION%%.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/pg_ctl-%%PG_VERSION%%.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/pg_resetwal-%%PG_VERSION%%.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/pg_rewind-%%PG_VERSION%%.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/pg_test_fsync-%%PG_VERSION%%.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/pg_test_timing-%%PG_VERSION%%.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/pg_upgrade-%%PG_VERSION%%.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/pg_waldump-%%PG_VERSION%%.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/plpgsql-%%PG_VERSION%%.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/postgres-%%PG_VERSION%%.mo
+%%NLS%%share/locale/he/LC_MESSAGES/pg_ctl-%%PG_VERSION%%.mo
+%%NLS%%share/locale/it/LC_MESSAGES/pg_controldata-%%PG_VERSION%%.mo
+%%NLS%%share/locale/it/LC_MESSAGES/pg_ctl-%%PG_VERSION%%.mo
+%%NLS%%share/locale/it/LC_MESSAGES/plpgsql-%%PG_VERSION%%.mo
+%%NLS%%share/locale/it/LC_MESSAGES/postgres-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/initdb-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/pg_archivecleanup-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/pg_basebackup-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/pg_checksums-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/pg_controldata-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/pg_ctl-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/pg_resetwal-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/pg_rewind-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/pg_test_fsync-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/pg_test_timing-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/pg_upgrade-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/pg_waldump-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/plpgsql-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/postgres-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/initdb-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/pg_archivecleanup-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/pg_basebackup-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/pg_checksums-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/pg_controldata-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/pg_ctl-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/pg_resetwal-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/pg_rewind-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/pg_test_fsync-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/pg_test_timing-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/pg_upgrade-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/pg_waldump-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/plpgsql-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/postgres-%%PG_VERSION%%.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/pg_controldata-%%PG_VERSION%%.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/pg_ctl-%%PG_VERSION%%.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/pg_test_fsync-%%PG_VERSION%%.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/pg_test_timing-%%PG_VERSION%%.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/plpgsql-%%PG_VERSION%%.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/postgres-%%PG_VERSION%%.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/plpgsql-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/initdb-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/pg_archivecleanup-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/pg_basebackup-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/pg_checksums-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/pg_controldata-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/pg_ctl-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/pg_resetwal-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/pg_rewind-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/pg_test_fsync-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/pg_test_timing-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/pg_upgrade-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/pg_waldump-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/plpgsql-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/postgres-%%PG_VERSION%%.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/initdb-%%PG_VERSION%%.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/pg_archivecleanup-%%PG_VERSION%%.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/pg_basebackup-%%PG_VERSION%%.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/pg_checksums-%%PG_VERSION%%.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/pg_controldata-%%PG_VERSION%%.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/pg_ctl-%%PG_VERSION%%.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/pg_resetwal-%%PG_VERSION%%.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/pg_rewind-%%PG_VERSION%%.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/pg_test_fsync-%%PG_VERSION%%.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/pg_test_timing-%%PG_VERSION%%.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/pg_upgrade-%%PG_VERSION%%.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/pg_waldump-%%PG_VERSION%%.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/plpgsql-%%PG_VERSION%%.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/postgres-%%PG_VERSION%%.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/initdb-%%PG_VERSION%%.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/pg_archivecleanup-%%PG_VERSION%%.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/pg_basebackup-%%PG_VERSION%%.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/pg_checksums-%%PG_VERSION%%.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/pg_controldata-%%PG_VERSION%%.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/pg_ctl-%%PG_VERSION%%.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/pg_resetwal-%%PG_VERSION%%.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/pg_rewind-%%PG_VERSION%%.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/pg_test_fsync-%%PG_VERSION%%.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/pg_test_timing-%%PG_VERSION%%.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/pg_upgrade-%%PG_VERSION%%.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/pg_waldump-%%PG_VERSION%%.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/plpgsql-%%PG_VERSION%%.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/postgres-%%PG_VERSION%%.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/initdb-%%PG_VERSION%%.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/pg_archivecleanup-%%PG_VERSION%%.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/pg_basebackup-%%PG_VERSION%%.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/pg_checksums-%%PG_VERSION%%.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/pg_controldata-%%PG_VERSION%%.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/pg_ctl-%%PG_VERSION%%.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/pg_resetwal-%%PG_VERSION%%.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/pg_rewind-%%PG_VERSION%%.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/pg_test_fsync-%%PG_VERSION%%.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/pg_test_timing-%%PG_VERSION%%.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/pg_waldump-%%PG_VERSION%%.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/plpgsql-%%PG_VERSION%%.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/pg_upgrade-%%PG_VERSION%%.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/postgres-%%PG_VERSION%%.mo
+%%NLS%%share/locale/vi/LC_MESSAGES/pg_controldata-%%PG_VERSION%%.mo
+%%NLS%%share/locale/vi/LC_MESSAGES/pg_test_fsync-%%PG_VERSION%%.mo
+%%NLS%%share/locale/vi/LC_MESSAGES/pg_test_timing-%%PG_VERSION%%.mo
+%%NLS%%share/locale/vi/LC_MESSAGES/plpgsql-%%PG_VERSION%%.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/initdb-%%PG_VERSION%%.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/pg_archivecleanup-%%PG_VERSION%%.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/pg_basebackup-%%PG_VERSION%%.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/pg_checksums-%%PG_VERSION%%.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/pg_controldata-%%PG_VERSION%%.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/pg_ctl-%%PG_VERSION%%.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/pg_resetwal-%%PG_VERSION%%.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/pg_rewind-%%PG_VERSION%%.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/pg_test_fsync-%%PG_VERSION%%.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/pg_test_timing-%%PG_VERSION%%.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/pg_upgrade-%%PG_VERSION%%.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/pg_waldump-%%PG_VERSION%%.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/plpgsql-%%PG_VERSION%%.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/postgres-%%PG_VERSION%%.mo
 %%TZDATA%%%%DATADIR%%/timezone/Africa/Abidjan
 %%TZDATA%%%%DATADIR%%/timezone/Africa/Accra
 %%TZDATA%%%%DATADIR%%/timezone/Africa/Addis_Ababa
@@ -999,6 +999,7 @@ lib/libpgcommon.a
 %%TZDATA%%%%DATADIR%%/timezone/America/Cayman
 %%TZDATA%%%%DATADIR%%/timezone/America/Chicago
 %%TZDATA%%%%DATADIR%%/timezone/America/Chihuahua
+%%TZDATA%%%%DATADIR%%/timezone/America/Ciudad_Juarez
 %%TZDATA%%%%DATADIR%%/timezone/America/Coral_Harbour
 %%TZDATA%%%%DATADIR%%/timezone/America/Cordoba
 %%TZDATA%%%%DATADIR%%/timezone/America/Costa_Rica
@@ -1353,6 +1354,7 @@ lib/libpgcommon.a
 %%TZDATA%%%%DATADIR%%/timezone/Europe/Kaliningrad
 %%TZDATA%%%%DATADIR%%/timezone/Europe/Kiev
 %%TZDATA%%%%DATADIR%%/timezone/Europe/Kirov
+%%TZDATA%%%%DATADIR%%/timezone/Europe/Kyiv
 %%TZDATA%%%%DATADIR%%/timezone/Europe/Lisbon
 %%TZDATA%%%%DATADIR%%/timezone/Europe/Ljubljana
 %%TZDATA%%%%DATADIR%%/timezone/Europe/London
@@ -1448,6 +1450,7 @@ lib/libpgcommon.a
 %%TZDATA%%%%DATADIR%%/timezone/Pacific/Guam
 %%TZDATA%%%%DATADIR%%/timezone/Pacific/Honolulu
 %%TZDATA%%%%DATADIR%%/timezone/Pacific/Johnston
+%%TZDATA%%%%DATADIR%%/timezone/Pacific/Kanton
 %%TZDATA%%%%DATADIR%%/timezone/Pacific/Kiritimati
 %%TZDATA%%%%DATADIR%%/timezone/Pacific/Kosrae
 %%TZDATA%%%%DATADIR%%/timezone/Pacific/Kwajalein
diff --git a/databases/postgresql13-client/Makefile b/databases/postgresql13-client/Makefile
index dc8b25a62472..1958a960a653 100644
--- a/databases/postgresql13-client/Makefile
+++ b/databases/postgresql13-client/Makefile
@@ -1,5 +1,3 @@
-# Created by: Palle Girgensohn <girgen@FreeBSD.org>
-
 PORTNAME=	postgresql
 PORTREVISION=	0
 
diff --git a/databases/postgresql13-contrib/Makefile b/databases/postgresql13-contrib/Makefile
index 433ee810d618..4a03a65926a4 100644
--- a/databases/postgresql13-contrib/Makefile
+++ b/databases/postgresql13-contrib/Makefile
@@ -1,5 +1,3 @@
-# Created by: Palle Girgensohn <girgen@pingpong.net>
-
 PORTNAME=	postgresql
 PORTREVISION=	0
 CATEGORIES=	databases
diff --git a/databases/postgresql13-contrib/pkg-descr b/databases/postgresql13-contrib/pkg-descr
index 18c3c1351c3b..a384c76fdbde 100644
--- a/databases/postgresql13-contrib/pkg-descr
+++ b/databases/postgresql13-contrib/pkg-descr
@@ -19,5 +19,3 @@ For more information, please see
 /usr/local/share/doc/postgresql/contrib/README*
 
 This software is part of the standard PostgreSQL distribution.
-
-WWW: https://www.postgresql.org/
diff --git a/databases/postgresql13-docs/Makefile b/databases/postgresql13-docs/Makefile
index 73c942af5cab..8b62e05d816b 100644
--- a/databases/postgresql13-docs/Makefile
+++ b/databases/postgresql13-docs/Makefile
@@ -1,5 +1,3 @@
-# Created by: Palle Girgensohn <girgen@pingpong.net>
-
 WANT_PGSQL_VER=13
 
-.include "${.CURDIR}/../postgresql14-docs/Makefile"
+.include "${.CURDIR}/../postgresql16-docs/Makefile"
diff --git a/databases/postgresql13-pgtcl/Makefile b/databases/postgresql13-pgtcl/Makefile
index 6210c1a524ff..85e256b000b7 100644
--- a/databases/postgresql13-pgtcl/Makefile
+++ b/databases/postgresql13-pgtcl/Makefile
@@ -1,7 +1,7 @@
 PORTREVISION=	0
 PKGNAMESUFFIX=	-postgresql13
 
-CONFLICTS=	pgtcl-[0-9]* pgtcl-postgresql9[0123456]-[0-9]* pgtcl-postgresql1[012-49]-*
+CONFLICTS=	pgtcl pgtcl-postgresql9[0123456] pgtcl-postgresql1[012-49]
 
 PGTCL_SLAVE=	13
 MASTERDIR=	${.CURDIR}/../pgtcl
diff --git a/databases/postgresql13-plperl/Makefile b/databases/postgresql13-plperl/Makefile
index 080454ab5834..0fbc8e295468 100644
--- a/databases/postgresql13-plperl/Makefile
+++ b/databases/postgresql13-plperl/Makefile
@@ -1,5 +1,3 @@
-# Created by: Palle Girgensohn <girgen@partitur.se>
-
 PORTNAME=	postgresql
 # Keep the ?=, this port is used as master by the other plperl.
 PORTREVISION?=	0
diff --git a/databases/postgresql13-plpython/Makefile b/databases/postgresql13-plpython/Makefile
index a8103e4d0d58..f0b547833a63 100644
--- a/databases/postgresql13-plpython/Makefile
+++ b/databases/postgresql13-plpython/Makefile
@@ -6,6 +6,7 @@ PKGNAMESUFFIX?=	${WANT_PGSQL_VER:S/.//}${COMPONENT}
 
 MAINTAINER=	pgsql@FreeBSD.org
 COMMENT=	Module for using Python to write SQL functions
+WWW=		https://www.postgresql.org/
 
 USES+=		pgsql:${WANT_PGSQL_VER} ${WANT_PYTHON_USE}
 WANT_PGSQL=	server
diff --git a/databases/postgresql13-plpython/pkg-descr b/databases/postgresql13-plpython/pkg-descr
index 416cce467d37..61c4875985f7 100644
--- a/databases/postgresql13-plpython/pkg-descr
+++ b/databases/postgresql13-plpython/pkg-descr
@@ -2,5 +2,3 @@ PL/Python allows one to write PostgeSQL stored functions and
 procedures in Python (http://www.python.org/).
 
 This software is part of the standard PostgreSQL distribution.
-
-WWW: https://www.postgresql.org/
diff --git a/databases/postgresql13-pltcl/Makefile b/databases/postgresql13-pltcl/Makefile
index e8ad42f1d516..a91e161e41b4 100644
--- a/databases/postgresql13-pltcl/Makefile
+++ b/databases/postgresql13-pltcl/Makefile
@@ -1,5 +1,3 @@
-# Created by: Palle Girgensohn <girgen@partitur.se>
-
 PORTNAME=	postgresql
 # Keep the ?=, it is used by the other pltcl ports.
 PORTREVISION?=	0
diff --git a/databases/postgresql13-server/Makefile b/databases/postgresql13-server/Makefile
index 79503daa542f..7270ba17d2b6 100644
--- a/databases/postgresql13-server/Makefile
+++ b/databases/postgresql13-server/Makefile
@@ -1,6 +1,4 @@
-# Created by: Marc G. Fournier <scrappy@FreeBSD.org>
-
-DISTVERSION?=	13.4
+DISTVERSION?=	13.14
 # PORTREVISION must be ?= otherwise, all slave ports get this PORTREVISION and
 # not their own.  Probably best to keep it at ?=0 when reset here too.
 PORTREVISION?=	0
@@ -23,4 +21,4 @@ PG_USER?=	postgres
 PG_GROUP?=	postgres
 PG_UID?=	770
 
-.include "${.CURDIR}/../postgresql14-server/Makefile"
+.include "${.CURDIR}/../postgresql16-server/Makefile"
diff --git a/databases/postgresql13-server/distinfo b/databases/postgresql13-server/distinfo
index cc382c65db80..80076e8078ef 100644
--- a/databases/postgresql13-server/distinfo
+++ b/databases/postgresql13-server/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1628577935
-SHA256 (postgresql/postgresql-13.4.tar.bz2) = ea93e10390245f1ce461a54eb5f99a48d8cabd3a08ce4d652ec2169a357bc0cd
-SIZE (postgresql/postgresql-13.4.tar.bz2) = 21157443
+TIMESTAMP = 1707301284
+SHA256 (postgresql/postgresql-13.14.tar.bz2) = b8df078551898960bd500dc5d38a177e9905376df81fe7f2b660a1407fa6a5ed
+SIZE (postgresql/postgresql-13.14.tar.bz2) = 21584146
diff --git a/databases/postgresql13-server/files/502.pgsql.in b/databases/postgresql13-server/files/502.pgsql.in
index c2d5b885d2f1..604ad3dadab8 100644
--- a/databases/postgresql13-server/files/502.pgsql.in
+++ b/databases/postgresql13-server/files/502.pgsql.in
@@ -1,7 +1,7 @@
 #!/bin/sh
 #
 # Maintenance shell script to vacuum and backup database
-# Put this in /usr/local/etc/periodic/daily, and it will be run 
+# Put this in /usr/local/etc/periodic/daily, and it will be run
 # every night
 #
 # Written by Palle Girgensohn <girgen@pingpong.net>
@@ -34,7 +34,7 @@ fi
 : ${daily_pgsql_backupdir:="~${daily_pgsql_user}/backups"}
 : ${daily_pgsql_savedays:="7"}
 
-# allow '~´ in dir name
+# allow '~' in directory name
 eval backupdir=${daily_pgsql_backupdir}
 
 rc=0
@@ -43,7 +43,7 @@ pgsql_backup() {
 	# daily_pgsql_backupdir must be writeable by user %%PG_USER%%
 	# ~%%PG_USER%% is just that under normal circumstances,
 	# but this might not be where you want the backups...
-	if [ ! -d ${backupdir} ] ; then 
+	if [ ! -d ${backupdir} ] ; then
 	    echo Creating ${backupdir}
 	    mkdir -m 700 ${backupdir}; chown ${daily_pgsql_user} ${backupdir}
 	fi
diff --git a/databases/postgresql13-server/files/patch-src_backend_utils_misc_postgresql.conf.sample b/databases/postgresql13-server/files/patch-src_backend_utils_misc_postgresql.conf.sample
index a82826b3b5f1..9469421174a0 100644
--- a/databases/postgresql13-server/files/patch-src_backend_utils_misc_postgresql.conf.sample
+++ b/databases/postgresql13-server/files/patch-src_backend_utils_misc_postgresql.conf.sample
@@ -8,14 +8,3 @@
  #log_destination = 'stderr'		# Valid values are combinations of
  					# stderr, csvlog, syslog, and eventlog,
  					# depending on platform.  csvlog
-@@ -464,7 +465,9 @@
- 
- #cluster_name = ''			# added to process titles if nonempty
- 					# (change requires restart)
--#update_process_title = on
-+
-+# On FreeBSD, this is a performance hog, so keep it off if you need speed
-+update_process_title = off
- 
- 
- #------------------------------------------------------------------------------
diff --git a/databases/postgresql13-server/files/patch-src_include_storage_s__lock.h b/databases/postgresql13-server/files/patch-src_include_storage_s__lock.h
deleted file mode 100644
index 19c945a36126..000000000000
--- a/databases/postgresql13-server/files/patch-src_include_storage_s__lock.h
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/include/storage/s_lock.h.orig	2021-04-15 09:05:25 UTC
-+++ src/include/storage/s_lock.h
-@@ -320,7 +320,7 @@ tas(volatile slock_t *lock)
-  * We use the int-width variant of the builtin because it works on more chips
-  * than other widths.
-  */
--#if defined(__arm__) || defined(__arm) || defined(__aarch64__) || defined(__aarch64)
-+#if defined(__arm__) || defined(__arm) || defined(__aarch64__) || defined(__aarch64) || defined(__riscv)
- #ifdef HAVE_GCC__SYNC_INT32_TAS
- #define HAS_TEST_AND_SET
- 
-@@ -337,7 +337,7 @@ tas(volatile slock_t *lock)
- #define S_UNLOCK(lock) __sync_lock_release(lock)
- 
- #endif	 /* HAVE_GCC__SYNC_INT32_TAS */
--#endif	 /* __arm__ || __arm || __aarch64__ || __aarch64 */
-+#endif	 /* __arm__ || __arm || __aarch64__ || __aarch64 || __riscv */
- 
- 
- /* S/390 and S/390x Linux (32- and 64-bit zSeries) */
diff --git a/databases/postgresql13-server/files/pkg-message-server.in b/databases/postgresql13-server/files/pkg-message-server.in
index 9bfbcc7b4a83..6370d4a017cc 100644
--- a/databases/postgresql13-server/files/pkg-message-server.in
+++ b/databases/postgresql13-server/files/pkg-message-server.in
@@ -14,7 +14,7 @@ is a periodic script, %%PREFIX%%/etc/periodic/daily/502.pgsql, that
 you may find useful. You can use it to backup and perform vacuum on all
 databases nightly. Per default, it performs `vacuum analyze'. See the
 script for instructions. For autovacuum settings, please review
-~postgres/data/postgresql.conf.
+~%%PG_USER%%/data/postgresql.conf.
 
 If you plan to access your PostgreSQL server using ODBC, please
 consider running the SQL script %%PREFIX%%/share/postgresql/odbc.sql
@@ -30,28 +30,33 @@ To set limits, environment stuff like locale and collation and other
 things, you can set up a class in /etc/login.conf before initializing
 the database. Add something similar to this to /etc/login.conf:
 ---
-postgres:\
+%%PG_USER%%:\
 	:lang=en_US.UTF-8:\
 	:setenv=LC_COLLATE=C:\
 	:tc=default:
 ---
 and run `cap_mkdb /etc/login.conf'.
-Then add 'postgresql_class="postgres"' to /etc/rc.conf.
+Then add 'postgresql_login_class="%%PG_USER%%"' to /etc/rc.conf, or
+set it as the %%PG_USER%% user's login class in /etc/passwd.
 
 ======================================================================
 
+To use PostgreSQL, enable it in rc.conf using
+
+  sysrc postgresql_enable=yes
+
 To initialize the database, run
 
-  %%PREFIX%%/etc/rc.d/postgresql initdb
+  service postgresql initdb
 
 You can then start PostgreSQL by running:
 
-  %%PREFIX%%/etc/rc.d/postgresql start
+  service postgresql start
 
-For postmaster settings, see ~postgres/data/postgresql.conf
+For postmaster settings, see ~%%PG_USER%%/data/postgresql.conf
 
 NB. FreeBSD's PostgreSQL port logs to syslog by default
-    See ~postgres/data/postgresql.conf for more info
+    See ~%%PG_USER%%/data/postgresql.conf for more info
 
 NB. If you're not using a checksumming filesystem like ZFS, you might
     wish to enable data checksumming. It can be enabled during
@@ -61,9 +66,6 @@ NB. If you're not using a checksumming filesystem like ZFS, you might
     and make sure you understand the performance implications.
 
 ======================================================================
-
-To run PostgreSQL at startup, add
-'postgresql_enable="YES"' to /etc/rc.conf
 EOM
 }
 ]
diff --git a/databases/postgresql13-server/files/postgresql.in b/databases/postgresql13-server/files/postgresql.in
index d87774cee35f..08f6faf12c55 100644
--- a/databases/postgresql13-server/files/postgresql.in
+++ b/databases/postgresql13-server/files/postgresql.in
@@ -1,17 +1,18 @@
 #!/bin/sh
 
 # PROVIDE: postgresql
-# REQUIRE: DAEMON
+# REQUIRE: DAEMON mountlate
 # KEYWORD: shutdown
 #
 # Add the following line to /etc/rc.conf to enable PostgreSQL:
 #
 #  postgresql_enable="YES"
 #  # optional
-#  postgresql_data="/var/db/%%PG_USER%%/data13"
+#  postgresql_data="/var/db/%%PG_USER%%/data%%PG_VERSION%%"
 #  postgresql_flags="-w -s -m fast"
 #  postgresql_initdb_flags="--encoding=utf-8 --lc-collate=C"
-#  postgresql_login_class="default"
+#  # leave empty to use the login class set in in /etc/passwd:
+#  postgresql_login_class="my_custom_login_class"
 #  postgresql_profiles=""
 #
 # See %%PREFIX%%/share/doc/postgresql/README-server for more info
@@ -29,12 +30,13 @@ command=%%PREFIX%%/bin/pg_ctl
 load_rc_config postgresql
 
 # set defaults
-postgresql_enable=${postgresql_enable:-"NO"}
-postgresql_flags=${postgresql_flags:-"-w -s -m fast"}
-postgresql_user=${postgresql_user:-"%%PG_USER%%"}
-eval postgresql_data=${postgresql_data:-"~${postgresql_user}/data13"}
-postgresql_login_class=${postgresql_login_class:-"default"}
-postgresql_initdb_flags=${postgresql_initdb_flags:-"--encoding=utf-8 --lc-collate=C"}
+: ${postgresql_enable:="NO"}
+: ${postgresql_flags:="-w -s -m fast"}
+: ${postgresql_user:="%%PG_USER%%"}
+eval _pgdir="~${postgresql_user}/data%%PG_VERSION%%"
+: ${postgresql_data:="${_pgdir}"}
+: ${postgresql_login_class:=""}
+: ${postgresql_initdb_flags:="--encoding=utf-8 --lc-collate=C"}
 
 name=postgresql
 rcvar=postgresql_enable
@@ -62,6 +64,7 @@ if [ -n "$2" ]; then
 		eval postgresql_enable="\${postgresql_${profile}_enable:-${postgresql_enable}}"
 		eval postgresql_data="\${postgresql_${profile}_data:-${postgresql_data}}"
 		eval postgresql_flags="\${postgresql_${profile}_flags:-${postgresql_flags}}"
+		eval postgresql_login_class="\${postgresql_${profile}_login_class:-${postgresql_login_class}}"
 		eval postgresql_initdb_flags="\${postgresql_${profile}_initdb_flags:-${postgresql_initdb_flags}}"
 	fi
 else
@@ -104,12 +107,16 @@ command_args="-D ${postgresql_data} ${postgresql_flags}"
 
 postgresql_command()
 {
-    ${su_cmd} -l ${postgresql_user} -c "exec ${command} ${command_args} ${rc_arg}"
+    ${su_cmd} ${postgresql_login_class:+-c ${postgresql_login_class}} \
+	    -l ${postgresql_user} \
+	    -c "exec ${command} ${command_args} ${rc_arg}"
 }
 
 postgresql_initdb()
 {
-    ${su_cmd} -l -c ${postgresql_login_class} ${postgresql_user} -c "exec %%PREFIX%%/bin/initdb ${postgresql_initdb_flags} -D ${postgresql_data} -U ${postgresql_user}"
+    ${su_cmd} ${postgresql_login_class:+-c ${postgresql_login_class}} \
+	    -l ${postgresql_user} \
+	    -c "exec %%PREFIX%%/bin/initdb ${postgresql_initdb_flags} -D ${postgresql_data} -U ${postgresql_user}"
 }
 
 run_rc_command "$1"
diff --git a/databases/postgresql13-server/pkg-descr b/databases/postgresql13-server/pkg-descr
index 1b3c3db53e96..cbef6ffab2d8 100644
--- a/databases/postgresql13-server/pkg-descr
+++ b/databases/postgresql13-server/pkg-descr
@@ -19,5 +19,3 @@ Support is available from the PostgreSQL developer/user community through the
 support mailing list (questions@PostgreSQL.ORG).
 
 PostgreSQL is free and the complete source is available.
-
-WWW: https://www.postgresql.org/
diff --git a/databases/postgresql13-server/pkg-plist-client b/databases/postgresql13-server/pkg-plist-client
index 08e9bf92fc5b..7b9715f1833d 100644
--- a/databases/postgresql13-server/pkg-plist-client
+++ b/databases/postgresql13-server/pkg-plist-client
@@ -112,6 +112,7 @@ include/postgresql/server/access/twophase.h
 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
@@ -847,390 +848,390 @@ libdata/pkgconfig/libecpg.pc
 libdata/pkgconfig/libecpg_compat.pc
 libdata/pkgconfig/libpgtypes.pc
 libdata/pkgconfig/libpq.pc
-man/man1/clusterdb.1.gz
-man/man1/createdb.1.gz
-man/man1/createuser.1.gz
-man/man1/dropdb.1.gz
-man/man1/dropuser.1.gz
-man/man1/ecpg.1.gz
-man/man1/initdb.1.gz
-man/man1/oid2name.1.gz
-man/man1/pg_archivecleanup.1.gz
-man/man1/pg_basebackup.1.gz
-man/man1/pg_checksums.1.gz
-man/man1/pg_config.1.gz
-man/man1/pg_controldata.1.gz
-man/man1/pg_ctl.1.gz
-man/man1/pg_dump.1.gz
-man/man1/pg_dumpall.1.gz
-man/man1/pg_isready.1.gz
-man/man1/pg_receivewal.1.gz
-man/man1/pg_recvlogical.1.gz
-man/man1/pg_resetwal.1.gz
-man/man1/pg_restore.1.gz
-man/man1/pg_rewind.1.gz
-man/man1/pg_standby.1.gz
-man/man1/pg_test_fsync.1.gz
-man/man1/pg_test_timing.1.gz
-man/man1/pg_upgrade.1.gz
-man/man1/pg_verifybackup.1.gz
-man/man1/pg_waldump.1.gz
-man/man1/pgbench.1.gz
-man/man1/postgres.1.gz
-man/man1/postmaster.1.gz
-man/man1/psql.1.gz
-man/man1/reindexdb.1.gz
-man/man1/vacuumdb.1.gz
-man/man1/vacuumlo.1.gz
-man/man3/SPI_commit.3.gz
-man/man3/SPI_commit_and_chain.3.gz
-man/man3/SPI_connect.3.gz
-man/man3/SPI_connect_ext.3.gz
-man/man3/SPI_copytuple.3.gz
-man/man3/SPI_cursor_close.3.gz
-man/man3/SPI_cursor_fetch.3.gz
-man/man3/SPI_cursor_find.3.gz
-man/man3/SPI_cursor_move.3.gz
-man/man3/SPI_cursor_open.3.gz
-man/man3/SPI_cursor_open_with_args.3.gz
-man/man3/SPI_cursor_open_with_paramlist.3.gz
-man/man3/SPI_exec.3.gz
-man/man3/SPI_execp.3.gz
-man/man3/SPI_execute.3.gz
-man/man3/SPI_execute_plan.3.gz
-man/man3/SPI_execute_plan_with_paramlist.3.gz
-man/man3/SPI_execute_with_args.3.gz
-man/man3/SPI_finish.3.gz
-man/man3/SPI_fname.3.gz
-man/man3/SPI_fnumber.3.gz
-man/man3/SPI_freeplan.3.gz
-man/man3/SPI_freetuple.3.gz
-man/man3/SPI_freetuptable.3.gz
-man/man3/SPI_getargcount.3.gz
-man/man3/SPI_getargtypeid.3.gz
-man/man3/SPI_getbinval.3.gz
-man/man3/SPI_getnspname.3.gz
-man/man3/SPI_getrelname.3.gz
-man/man3/SPI_gettype.3.gz
-man/man3/SPI_gettypeid.3.gz
-man/man3/SPI_getvalue.3.gz
-man/man3/SPI_is_cursor_plan.3.gz
-man/man3/SPI_keepplan.3.gz
-man/man3/SPI_modifytuple.3.gz
-man/man3/SPI_palloc.3.gz
-man/man3/SPI_pfree.3.gz
-man/man3/SPI_prepare.3.gz
-man/man3/SPI_prepare_cursor.3.gz
-man/man3/SPI_prepare_params.3.gz
-man/man3/SPI_register_relation.3.gz
-man/man3/SPI_register_trigger_data.3.gz
-man/man3/SPI_repalloc.3.gz
-man/man3/SPI_result_code_string.3.gz
-man/man3/SPI_returntuple.3.gz
-man/man3/SPI_rollback.3.gz
-man/man3/SPI_rollback_and_chain.3.gz
-man/man3/SPI_saveplan.3.gz
-man/man3/SPI_scroll_cursor_fetch.3.gz
-man/man3/SPI_scroll_cursor_move.3.gz
-man/man3/SPI_start_transaction.3.gz
-man/man3/SPI_unregister_relation.3.gz
-man/man3/dblink.3.gz
-man/man3/dblink_build_sql_delete.3.gz
-man/man3/dblink_build_sql_insert.3.gz
-man/man3/dblink_build_sql_update.3.gz
-man/man3/dblink_cancel_query.3.gz
-man/man3/dblink_close.3.gz
-man/man3/dblink_connect.3.gz
-man/man3/dblink_connect_u.3.gz
-man/man3/dblink_disconnect.3.gz
-man/man3/dblink_error_message.3.gz
-man/man3/dblink_exec.3.gz
-man/man3/dblink_fetch.3.gz
-man/man3/dblink_get_connections.3.gz
-man/man3/dblink_get_notify.3.gz
-man/man3/dblink_get_pkey.3.gz
-man/man3/dblink_get_result.3.gz
-man/man3/dblink_is_busy.3.gz
-man/man3/dblink_open.3.gz
-man/man3/dblink_send_query.3.gz
-man/man7/ABORT.7.gz
-man/man7/ALTER_AGGREGATE.7.gz
-man/man7/ALTER_COLLATION.7.gz
-man/man7/ALTER_CONVERSION.7.gz
-man/man7/ALTER_DATABASE.7.gz
-man/man7/ALTER_DEFAULT_PRIVILEGES.7.gz
-man/man7/ALTER_DOMAIN.7.gz
-man/man7/ALTER_EVENT_TRIGGER.7.gz
-man/man7/ALTER_EXTENSION.7.gz
-man/man7/ALTER_FOREIGN_DATA_WRAPPER.7.gz
-man/man7/ALTER_FOREIGN_TABLE.7.gz
-man/man7/ALTER_FUNCTION.7.gz
-man/man7/ALTER_GROUP.7.gz
-man/man7/ALTER_INDEX.7.gz
-man/man7/ALTER_LANGUAGE.7.gz
-man/man7/ALTER_LARGE_OBJECT.7.gz
-man/man7/ALTER_MATERIALIZED_VIEW.7.gz
-man/man7/ALTER_OPERATOR.7.gz
-man/man7/ALTER_OPERATOR_CLASS.7.gz
-man/man7/ALTER_OPERATOR_FAMILY.7.gz
-man/man7/ALTER_POLICY.7.gz
-man/man7/ALTER_PROCEDURE.7.gz
-man/man7/ALTER_PUBLICATION.7.gz
-man/man7/ALTER_ROLE.7.gz
-man/man7/ALTER_ROUTINE.7.gz
-man/man7/ALTER_RULE.7.gz
-man/man7/ALTER_SCHEMA.7.gz
-man/man7/ALTER_SEQUENCE.7.gz
-man/man7/ALTER_SERVER.7.gz
-man/man7/ALTER_STATISTICS.7.gz
-man/man7/ALTER_SUBSCRIPTION.7.gz
-man/man7/ALTER_SYSTEM.7.gz
-man/man7/ALTER_TABLE.7.gz
-man/man7/ALTER_TABLESPACE.7.gz
-man/man7/ALTER_TEXT_SEARCH_CONFIGURATION.7.gz
-man/man7/ALTER_TEXT_SEARCH_DICTIONARY.7.gz
-man/man7/ALTER_TEXT_SEARCH_PARSER.7.gz
-man/man7/ALTER_TEXT_SEARCH_TEMPLATE.7.gz
-man/man7/ALTER_TRIGGER.7.gz
-man/man7/ALTER_TYPE.7.gz
-man/man7/ALTER_USER.7.gz
-man/man7/ALTER_USER_MAPPING.7.gz
-man/man7/ALTER_VIEW.7.gz
-man/man7/ANALYZE.7.gz
-man/man7/BEGIN.7.gz
-man/man7/CALL.7.gz
-man/man7/CHECKPOINT.7.gz
-man/man7/CLOSE.7.gz
-man/man7/CLUSTER.7.gz
-man/man7/COMMENT.7.gz
-man/man7/COMMIT.7.gz
-man/man7/COMMIT_PREPARED.7.gz
-man/man7/COPY.7.gz
-man/man7/CREATE_ACCESS_METHOD.7.gz
-man/man7/CREATE_AGGREGATE.7.gz
-man/man7/CREATE_CAST.7.gz
-man/man7/CREATE_COLLATION.7.gz
-man/man7/CREATE_CONVERSION.7.gz
-man/man7/CREATE_DATABASE.7.gz
-man/man7/CREATE_DOMAIN.7.gz
-man/man7/CREATE_EVENT_TRIGGER.7.gz
-man/man7/CREATE_EXTENSION.7.gz
-man/man7/CREATE_FOREIGN_DATA_WRAPPER.7.gz
-man/man7/CREATE_FOREIGN_TABLE.7.gz
-man/man7/CREATE_FUNCTION.7.gz
-man/man7/CREATE_GROUP.7.gz
-man/man7/CREATE_INDEX.7.gz
-man/man7/CREATE_LANGUAGE.7.gz
-man/man7/CREATE_MATERIALIZED_VIEW.7.gz
-man/man7/CREATE_OPERATOR.7.gz
-man/man7/CREATE_OPERATOR_CLASS.7.gz
-man/man7/CREATE_OPERATOR_FAMILY.7.gz
-man/man7/CREATE_POLICY.7.gz
-man/man7/CREATE_PROCEDURE.7.gz
-man/man7/CREATE_PUBLICATION.7.gz
-man/man7/CREATE_ROLE.7.gz
-man/man7/CREATE_RULE.7.gz
-man/man7/CREATE_SCHEMA.7.gz
-man/man7/CREATE_SEQUENCE.7.gz
-man/man7/CREATE_SERVER.7.gz
-man/man7/CREATE_STATISTICS.7.gz
-man/man7/CREATE_SUBSCRIPTION.7.gz
-man/man7/CREATE_TABLE.7.gz
-man/man7/CREATE_TABLESPACE.7.gz
-man/man7/CREATE_TABLE_AS.7.gz
-man/man7/CREATE_TEXT_SEARCH_CONFIGURATION.7.gz
-man/man7/CREATE_TEXT_SEARCH_DICTIONARY.7.gz
-man/man7/CREATE_TEXT_SEARCH_PARSER.7.gz
-man/man7/CREATE_TEXT_SEARCH_TEMPLATE.7.gz
-man/man7/CREATE_TRANSFORM.7.gz
-man/man7/CREATE_TRIGGER.7.gz
-man/man7/CREATE_TYPE.7.gz
-man/man7/CREATE_USER.7.gz
-man/man7/CREATE_USER_MAPPING.7.gz
-man/man7/CREATE_VIEW.7.gz
-man/man7/DEALLOCATE.7.gz
-man/man7/DECLARE.7.gz
-man/man7/DELETE.7.gz
-man/man7/DISCARD.7.gz
-man/man7/DO.7.gz
-man/man7/DROP_ACCESS_METHOD.7.gz
-man/man7/DROP_AGGREGATE.7.gz
-man/man7/DROP_CAST.7.gz
-man/man7/DROP_COLLATION.7.gz
-man/man7/DROP_CONVERSION.7.gz
-man/man7/DROP_DATABASE.7.gz
-man/man7/DROP_DOMAIN.7.gz
-man/man7/DROP_EVENT_TRIGGER.7.gz
-man/man7/DROP_EXTENSION.7.gz
-man/man7/DROP_FOREIGN_DATA_WRAPPER.7.gz
-man/man7/DROP_FOREIGN_TABLE.7.gz
-man/man7/DROP_FUNCTION.7.gz
-man/man7/DROP_GROUP.7.gz
-man/man7/DROP_INDEX.7.gz
-man/man7/DROP_LANGUAGE.7.gz
-man/man7/DROP_MATERIALIZED_VIEW.7.gz
-man/man7/DROP_OPERATOR.7.gz
-man/man7/DROP_OPERATOR_CLASS.7.gz
-man/man7/DROP_OPERATOR_FAMILY.7.gz
-man/man7/DROP_OWNED.7.gz
-man/man7/DROP_POLICY.7.gz
-man/man7/DROP_PROCEDURE.7.gz
-man/man7/DROP_PUBLICATION.7.gz
-man/man7/DROP_ROLE.7.gz
-man/man7/DROP_ROUTINE.7.gz
-man/man7/DROP_RULE.7.gz
-man/man7/DROP_SCHEMA.7.gz
-man/man7/DROP_SEQUENCE.7.gz
-man/man7/DROP_SERVER.7.gz
-man/man7/DROP_STATISTICS.7.gz
-man/man7/DROP_SUBSCRIPTION.7.gz
-man/man7/DROP_TABLE.7.gz
-man/man7/DROP_TABLESPACE.7.gz
-man/man7/DROP_TEXT_SEARCH_CONFIGURATION.7.gz
-man/man7/DROP_TEXT_SEARCH_DICTIONARY.7.gz
-man/man7/DROP_TEXT_SEARCH_PARSER.7.gz
-man/man7/DROP_TEXT_SEARCH_TEMPLATE.7.gz
-man/man7/DROP_TRANSFORM.7.gz
-man/man7/DROP_TRIGGER.7.gz
-man/man7/DROP_TYPE.7.gz
-man/man7/DROP_USER.7.gz
-man/man7/DROP_USER_MAPPING.7.gz
-man/man7/DROP_VIEW.7.gz
-man/man7/END.7.gz
-man/man7/EXECUTE.7.gz
-man/man7/EXPLAIN.7.gz
-man/man7/FETCH.7.gz
-man/man7/GRANT.7.gz
-man/man7/IMPORT_FOREIGN_SCHEMA.7.gz
-man/man7/INSERT.7.gz
-man/man7/LISTEN.7.gz
-man/man7/LOAD.7.gz
-man/man7/LOCK.7.gz
-man/man7/MOVE.7.gz
-man/man7/NOTIFY.7.gz
-man/man7/PREPARE.7.gz
-man/man7/PREPARE_TRANSACTION.7.gz
-man/man7/REASSIGN_OWNED.7.gz
-man/man7/REFRESH_MATERIALIZED_VIEW.7.gz
-man/man7/REINDEX.7.gz
-man/man7/RELEASE_SAVEPOINT.7.gz
-man/man7/RESET.7.gz
-man/man7/REVOKE.7.gz
-man/man7/ROLLBACK.7.gz
-man/man7/ROLLBACK_PREPARED.7.gz
-man/man7/ROLLBACK_TO_SAVEPOINT.7.gz
-man/man7/SAVEPOINT.7.gz
-man/man7/SECURITY_LABEL.7.gz
-man/man7/SELECT.7.gz
-man/man7/SELECT_INTO.7.gz
-man/man7/SET.7.gz
-man/man7/SET_CONSTRAINTS.7.gz
-man/man7/SET_ROLE.7.gz
-man/man7/SET_SESSION_AUTHORIZATION.7.gz
-man/man7/SET_TRANSACTION.7.gz
-man/man7/SHOW.7.gz
-man/man7/START_TRANSACTION.7.gz
-man/man7/TABLE.7.gz
-man/man7/TRUNCATE.7.gz
-man/man7/UNLISTEN.7.gz
-man/man7/UPDATE.7.gz
-man/man7/VACUUM.7.gz
-man/man7/VALUES.7.gz
-man/man7/WITH.7.gz
+share/man/man1/clusterdb.1.gz
+share/man/man1/createdb.1.gz
+share/man/man1/createuser.1.gz
+share/man/man1/dropdb.1.gz
+share/man/man1/dropuser.1.gz
+share/man/man1/ecpg.1.gz
+share/man/man1/initdb.1.gz
+share/man/man1/oid2name.1.gz
+share/man/man1/pg_archivecleanup.1.gz
+share/man/man1/pg_basebackup.1.gz
+share/man/man1/pg_checksums.1.gz
+share/man/man1/pg_config.1.gz
+share/man/man1/pg_controldata.1.gz
+share/man/man1/pg_ctl.1.gz
+share/man/man1/pg_dump.1.gz
+share/man/man1/pg_dumpall.1.gz
+share/man/man1/pg_isready.1.gz
+share/man/man1/pg_receivewal.1.gz
+share/man/man1/pg_recvlogical.1.gz
+share/man/man1/pg_resetwal.1.gz
+share/man/man1/pg_restore.1.gz
+share/man/man1/pg_rewind.1.gz
+share/man/man1/pg_standby.1.gz
+share/man/man1/pg_test_fsync.1.gz
+share/man/man1/pg_test_timing.1.gz
+share/man/man1/pg_upgrade.1.gz
+share/man/man1/pg_verifybackup.1.gz
+share/man/man1/pg_waldump.1.gz
+share/man/man1/pgbench.1.gz
+share/man/man1/postgres.1.gz
+share/man/man1/postmaster.1.gz
+share/man/man1/psql.1.gz
+share/man/man1/reindexdb.1.gz
+share/man/man1/vacuumdb.1.gz
+share/man/man1/vacuumlo.1.gz
+share/man/man3/SPI_commit.3.gz
+share/man/man3/SPI_commit_and_chain.3.gz
+share/man/man3/SPI_connect.3.gz
+share/man/man3/SPI_connect_ext.3.gz
+share/man/man3/SPI_copytuple.3.gz
+share/man/man3/SPI_cursor_close.3.gz
+share/man/man3/SPI_cursor_fetch.3.gz
+share/man/man3/SPI_cursor_find.3.gz
+share/man/man3/SPI_cursor_move.3.gz
+share/man/man3/SPI_cursor_open.3.gz
+share/man/man3/SPI_cursor_open_with_args.3.gz
+share/man/man3/SPI_cursor_open_with_paramlist.3.gz
+share/man/man3/SPI_exec.3.gz
+share/man/man3/SPI_execp.3.gz
+share/man/man3/SPI_execute.3.gz
+share/man/man3/SPI_execute_plan.3.gz
+share/man/man3/SPI_execute_plan_with_paramlist.3.gz
+share/man/man3/SPI_execute_with_args.3.gz
+share/man/man3/SPI_finish.3.gz
+share/man/man3/SPI_fname.3.gz
+share/man/man3/SPI_fnumber.3.gz
+share/man/man3/SPI_freeplan.3.gz
+share/man/man3/SPI_freetuple.3.gz
+share/man/man3/SPI_freetuptable.3.gz
+share/man/man3/SPI_getargcount.3.gz
+share/man/man3/SPI_getargtypeid.3.gz
+share/man/man3/SPI_getbinval.3.gz
+share/man/man3/SPI_getnspname.3.gz
+share/man/man3/SPI_getrelname.3.gz
+share/man/man3/SPI_gettype.3.gz
+share/man/man3/SPI_gettypeid.3.gz
+share/man/man3/SPI_getvalue.3.gz
+share/man/man3/SPI_is_cursor_plan.3.gz
+share/man/man3/SPI_keepplan.3.gz
+share/man/man3/SPI_modifytuple.3.gz
+share/man/man3/SPI_palloc.3.gz
+share/man/man3/SPI_pfree.3.gz
+share/man/man3/SPI_prepare.3.gz
+share/man/man3/SPI_prepare_cursor.3.gz
+share/man/man3/SPI_prepare_params.3.gz
+share/man/man3/SPI_register_relation.3.gz
+share/man/man3/SPI_register_trigger_data.3.gz
+share/man/man3/SPI_repalloc.3.gz
+share/man/man3/SPI_result_code_string.3.gz
+share/man/man3/SPI_returntuple.3.gz
+share/man/man3/SPI_rollback.3.gz
+share/man/man3/SPI_rollback_and_chain.3.gz
+share/man/man3/SPI_saveplan.3.gz
+share/man/man3/SPI_scroll_cursor_fetch.3.gz
+share/man/man3/SPI_scroll_cursor_move.3.gz
+share/man/man3/SPI_start_transaction.3.gz
+share/man/man3/SPI_unregister_relation.3.gz
+share/man/man3/dblink.3.gz
+share/man/man3/dblink_build_sql_delete.3.gz
+share/man/man3/dblink_build_sql_insert.3.gz
+share/man/man3/dblink_build_sql_update.3.gz
+share/man/man3/dblink_cancel_query.3.gz
+share/man/man3/dblink_close.3.gz
+share/man/man3/dblink_connect.3.gz
+share/man/man3/dblink_connect_u.3.gz
+share/man/man3/dblink_disconnect.3.gz
+share/man/man3/dblink_error_message.3.gz
+share/man/man3/dblink_exec.3.gz
+share/man/man3/dblink_fetch.3.gz
+share/man/man3/dblink_get_connections.3.gz
+share/man/man3/dblink_get_notify.3.gz
+share/man/man3/dblink_get_pkey.3.gz
+share/man/man3/dblink_get_result.3.gz
+share/man/man3/dblink_is_busy.3.gz
+share/man/man3/dblink_open.3.gz
+share/man/man3/dblink_send_query.3.gz
+share/man/man7/ABORT.7.gz
+share/man/man7/ALTER_AGGREGATE.7.gz
+share/man/man7/ALTER_COLLATION.7.gz
+share/man/man7/ALTER_CONVERSION.7.gz
+share/man/man7/ALTER_DATABASE.7.gz
+share/man/man7/ALTER_DEFAULT_PRIVILEGES.7.gz
+share/man/man7/ALTER_DOMAIN.7.gz
+share/man/man7/ALTER_EVENT_TRIGGER.7.gz
+share/man/man7/ALTER_EXTENSION.7.gz
+share/man/man7/ALTER_FOREIGN_DATA_WRAPPER.7.gz
+share/man/man7/ALTER_FOREIGN_TABLE.7.gz
+share/man/man7/ALTER_FUNCTION.7.gz
+share/man/man7/ALTER_GROUP.7.gz
+share/man/man7/ALTER_INDEX.7.gz
+share/man/man7/ALTER_LANGUAGE.7.gz
+share/man/man7/ALTER_LARGE_OBJECT.7.gz
+share/man/man7/ALTER_MATERIALIZED_VIEW.7.gz
+share/man/man7/ALTER_OPERATOR.7.gz
+share/man/man7/ALTER_OPERATOR_CLASS.7.gz
+share/man/man7/ALTER_OPERATOR_FAMILY.7.gz
+share/man/man7/ALTER_POLICY.7.gz
+share/man/man7/ALTER_PROCEDURE.7.gz
+share/man/man7/ALTER_PUBLICATION.7.gz
+share/man/man7/ALTER_ROLE.7.gz
+share/man/man7/ALTER_ROUTINE.7.gz
+share/man/man7/ALTER_RULE.7.gz
+share/man/man7/ALTER_SCHEMA.7.gz
+share/man/man7/ALTER_SEQUENCE.7.gz
+share/man/man7/ALTER_SERVER.7.gz
+share/man/man7/ALTER_STATISTICS.7.gz
+share/man/man7/ALTER_SUBSCRIPTION.7.gz
+share/man/man7/ALTER_SYSTEM.7.gz
+share/man/man7/ALTER_TABLE.7.gz
+share/man/man7/ALTER_TABLESPACE.7.gz
+share/man/man7/ALTER_TEXT_SEARCH_CONFIGURATION.7.gz
+share/man/man7/ALTER_TEXT_SEARCH_DICTIONARY.7.gz
+share/man/man7/ALTER_TEXT_SEARCH_PARSER.7.gz
+share/man/man7/ALTER_TEXT_SEARCH_TEMPLATE.7.gz
+share/man/man7/ALTER_TRIGGER.7.gz
+share/man/man7/ALTER_TYPE.7.gz
+share/man/man7/ALTER_USER.7.gz
+share/man/man7/ALTER_USER_MAPPING.7.gz
+share/man/man7/ALTER_VIEW.7.gz
+share/man/man7/ANALYZE.7.gz
+share/man/man7/BEGIN.7.gz
+share/man/man7/CALL.7.gz
+share/man/man7/CHECKPOINT.7.gz
+share/man/man7/CLOSE.7.gz
+share/man/man7/CLUSTER.7.gz
+share/man/man7/COMMENT.7.gz
+share/man/man7/COMMIT.7.gz
+share/man/man7/COMMIT_PREPARED.7.gz
+share/man/man7/COPY.7.gz
+share/man/man7/CREATE_ACCESS_METHOD.7.gz
+share/man/man7/CREATE_AGGREGATE.7.gz
+share/man/man7/CREATE_CAST.7.gz
+share/man/man7/CREATE_COLLATION.7.gz
+share/man/man7/CREATE_CONVERSION.7.gz
+share/man/man7/CREATE_DATABASE.7.gz
+share/man/man7/CREATE_DOMAIN.7.gz
+share/man/man7/CREATE_EVENT_TRIGGER.7.gz
+share/man/man7/CREATE_EXTENSION.7.gz
+share/man/man7/CREATE_FOREIGN_DATA_WRAPPER.7.gz
+share/man/man7/CREATE_FOREIGN_TABLE.7.gz
+share/man/man7/CREATE_FUNCTION.7.gz
+share/man/man7/CREATE_GROUP.7.gz
+share/man/man7/CREATE_INDEX.7.gz
+share/man/man7/CREATE_LANGUAGE.7.gz
+share/man/man7/CREATE_MATERIALIZED_VIEW.7.gz
+share/man/man7/CREATE_OPERATOR.7.gz
+share/man/man7/CREATE_OPERATOR_CLASS.7.gz
+share/man/man7/CREATE_OPERATOR_FAMILY.7.gz
+share/man/man7/CREATE_POLICY.7.gz
+share/man/man7/CREATE_PROCEDURE.7.gz
+share/man/man7/CREATE_PUBLICATION.7.gz
+share/man/man7/CREATE_ROLE.7.gz
+share/man/man7/CREATE_RULE.7.gz
+share/man/man7/CREATE_SCHEMA.7.gz
+share/man/man7/CREATE_SEQUENCE.7.gz
+share/man/man7/CREATE_SERVER.7.gz
+share/man/man7/CREATE_STATISTICS.7.gz
+share/man/man7/CREATE_SUBSCRIPTION.7.gz
+share/man/man7/CREATE_TABLE.7.gz
+share/man/man7/CREATE_TABLESPACE.7.gz
+share/man/man7/CREATE_TABLE_AS.7.gz
+share/man/man7/CREATE_TEXT_SEARCH_CONFIGURATION.7.gz
+share/man/man7/CREATE_TEXT_SEARCH_DICTIONARY.7.gz
+share/man/man7/CREATE_TEXT_SEARCH_PARSER.7.gz
+share/man/man7/CREATE_TEXT_SEARCH_TEMPLATE.7.gz
+share/man/man7/CREATE_TRANSFORM.7.gz
+share/man/man7/CREATE_TRIGGER.7.gz
+share/man/man7/CREATE_TYPE.7.gz
+share/man/man7/CREATE_USER.7.gz
+share/man/man7/CREATE_USER_MAPPING.7.gz
+share/man/man7/CREATE_VIEW.7.gz
+share/man/man7/DEALLOCATE.7.gz
+share/man/man7/DECLARE.7.gz
+share/man/man7/DELETE.7.gz
+share/man/man7/DISCARD.7.gz
+share/man/man7/DO.7.gz
+share/man/man7/DROP_ACCESS_METHOD.7.gz
+share/man/man7/DROP_AGGREGATE.7.gz
+share/man/man7/DROP_CAST.7.gz
+share/man/man7/DROP_COLLATION.7.gz
+share/man/man7/DROP_CONVERSION.7.gz
+share/man/man7/DROP_DATABASE.7.gz
+share/man/man7/DROP_DOMAIN.7.gz
+share/man/man7/DROP_EVENT_TRIGGER.7.gz
+share/man/man7/DROP_EXTENSION.7.gz
+share/man/man7/DROP_FOREIGN_DATA_WRAPPER.7.gz
+share/man/man7/DROP_FOREIGN_TABLE.7.gz
+share/man/man7/DROP_FUNCTION.7.gz
+share/man/man7/DROP_GROUP.7.gz
+share/man/man7/DROP_INDEX.7.gz
+share/man/man7/DROP_LANGUAGE.7.gz
+share/man/man7/DROP_MATERIALIZED_VIEW.7.gz
+share/man/man7/DROP_OPERATOR.7.gz
+share/man/man7/DROP_OPERATOR_CLASS.7.gz
+share/man/man7/DROP_OPERATOR_FAMILY.7.gz
+share/man/man7/DROP_OWNED.7.gz
+share/man/man7/DROP_POLICY.7.gz
+share/man/man7/DROP_PROCEDURE.7.gz
+share/man/man7/DROP_PUBLICATION.7.gz
+share/man/man7/DROP_ROLE.7.gz
+share/man/man7/DROP_ROUTINE.7.gz
+share/man/man7/DROP_RULE.7.gz
+share/man/man7/DROP_SCHEMA.7.gz
+share/man/man7/DROP_SEQUENCE.7.gz
+share/man/man7/DROP_SERVER.7.gz
+share/man/man7/DROP_STATISTICS.7.gz
+share/man/man7/DROP_SUBSCRIPTION.7.gz
+share/man/man7/DROP_TABLE.7.gz
+share/man/man7/DROP_TABLESPACE.7.gz
+share/man/man7/DROP_TEXT_SEARCH_CONFIGURATION.7.gz
+share/man/man7/DROP_TEXT_SEARCH_DICTIONARY.7.gz
+share/man/man7/DROP_TEXT_SEARCH_PARSER.7.gz
+share/man/man7/DROP_TEXT_SEARCH_TEMPLATE.7.gz
+share/man/man7/DROP_TRANSFORM.7.gz
+share/man/man7/DROP_TRIGGER.7.gz
+share/man/man7/DROP_TYPE.7.gz
+share/man/man7/DROP_USER.7.gz
+share/man/man7/DROP_USER_MAPPING.7.gz
+share/man/man7/DROP_VIEW.7.gz
+share/man/man7/END.7.gz
+share/man/man7/EXECUTE.7.gz
+share/man/man7/EXPLAIN.7.gz
+share/man/man7/FETCH.7.gz
+share/man/man7/GRANT.7.gz
+share/man/man7/IMPORT_FOREIGN_SCHEMA.7.gz
+share/man/man7/INSERT.7.gz
+share/man/man7/LISTEN.7.gz
+share/man/man7/LOAD.7.gz
+share/man/man7/LOCK.7.gz
+share/man/man7/MOVE.7.gz
+share/man/man7/NOTIFY.7.gz
+share/man/man7/PREPARE.7.gz
+share/man/man7/PREPARE_TRANSACTION.7.gz
+share/man/man7/REASSIGN_OWNED.7.gz
+share/man/man7/REFRESH_MATERIALIZED_VIEW.7.gz
+share/man/man7/REINDEX.7.gz
+share/man/man7/RELEASE_SAVEPOINT.7.gz
+share/man/man7/RESET.7.gz
+share/man/man7/REVOKE.7.gz
+share/man/man7/ROLLBACK.7.gz
+share/man/man7/ROLLBACK_PREPARED.7.gz
+share/man/man7/ROLLBACK_TO_SAVEPOINT.7.gz
+share/man/man7/SAVEPOINT.7.gz
+share/man/man7/SECURITY_LABEL.7.gz
+share/man/man7/SELECT.7.gz
+share/man/man7/SELECT_INTO.7.gz
+share/man/man7/SET.7.gz
+share/man/man7/SET_CONSTRAINTS.7.gz
+share/man/man7/SET_ROLE.7.gz
+share/man/man7/SET_SESSION_AUTHORIZATION.7.gz
+share/man/man7/SET_TRANSACTION.7.gz
+share/man/man7/SHOW.7.gz
+share/man/man7/START_TRANSACTION.7.gz
+share/man/man7/TABLE.7.gz
+share/man/man7/TRUNCATE.7.gz
+share/man/man7/UNLISTEN.7.gz
+share/man/man7/UPDATE.7.gz
+share/man/man7/VACUUM.7.gz
+share/man/man7/VALUES.7.gz
+share/man/man7/WITH.7.gz
 %%PORTDOCS%%%%DOCSDIR%%/README-client
-%%NLS%%share/locale/cs/LC_MESSAGES/ecpg-13.mo
-%%NLS%%share/locale/cs/LC_MESSAGES/ecpglib6-13.mo
-%%NLS%%share/locale/cs/LC_MESSAGES/libpq5-13.mo
-%%NLS%%share/locale/cs/LC_MESSAGES/pg_config-13.mo
-%%NLS%%share/locale/cs/LC_MESSAGES/pg_dump-13.mo
-%%NLS%%share/locale/cs/LC_MESSAGES/pgscripts-13.mo
-%%NLS%%share/locale/cs/LC_MESSAGES/psql-13.mo
-%%NLS%%share/locale/de/LC_MESSAGES/ecpg-13.mo
-%%NLS%%share/locale/de/LC_MESSAGES/ecpglib6-13.mo
-%%NLS%%share/locale/de/LC_MESSAGES/libpq5-13.mo
-%%NLS%%share/locale/de/LC_MESSAGES/pg_config-13.mo
-%%NLS%%share/locale/de/LC_MESSAGES/pg_dump-13.mo
-%%NLS%%share/locale/de/LC_MESSAGES/pgscripts-13.mo
-%%NLS%%share/locale/de/LC_MESSAGES/psql-13.mo
-%%NLS%%share/locale/es/LC_MESSAGES/ecpg-13.mo
-%%NLS%%share/locale/es/LC_MESSAGES/ecpglib6-13.mo
-%%NLS%%share/locale/es/LC_MESSAGES/libpq5-13.mo
-%%NLS%%share/locale/es/LC_MESSAGES/pg_config-13.mo
-%%NLS%%share/locale/es/LC_MESSAGES/pg_dump-13.mo
-%%NLS%%share/locale/es/LC_MESSAGES/pgscripts-13.mo
-%%NLS%%share/locale/es/LC_MESSAGES/psql-13.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/ecpg-13.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/ecpglib6-13.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/libpq5-13.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/pg_config-13.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/pg_dump-13.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/pgscripts-13.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/psql-13.mo
-%%NLS%%share/locale/he/LC_MESSAGES/pg_config-13.mo
-%%NLS%%share/locale/it/LC_MESSAGES/ecpg-13.mo
-%%NLS%%share/locale/it/LC_MESSAGES/ecpglib6-13.mo
-%%NLS%%share/locale/it/LC_MESSAGES/libpq5-13.mo
-%%NLS%%share/locale/it/LC_MESSAGES/pg_config-13.mo
-%%NLS%%share/locale/it/LC_MESSAGES/psql-13.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/ecpg-13.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/ecpglib6-13.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/libpq5-13.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/pg_config-13.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/pg_dump-13.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/pgscripts-13.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/psql-13.mo
-%%NLS%%share/locale/ko/LC_MESSAGES/ecpg-13.mo
-%%NLS%%share/locale/ko/LC_MESSAGES/ecpglib6-13.mo
-%%NLS%%share/locale/ko/LC_MESSAGES/libpq5-13.mo
-%%NLS%%share/locale/ko/LC_MESSAGES/pg_config-13.mo
-%%NLS%%share/locale/ko/LC_MESSAGES/pg_dump-13.mo
-%%NLS%%share/locale/ko/LC_MESSAGES/pgscripts-13.mo
-%%NLS%%share/locale/ko/LC_MESSAGES/psql-13.mo
-%%NLS%%share/locale/pl/LC_MESSAGES/ecpg-13.mo
-%%NLS%%share/locale/pl/LC_MESSAGES/ecpglib6-13.mo
-%%NLS%%share/locale/pl/LC_MESSAGES/pg_config-13.mo
-%%NLS%%share/locale/pt_BR/LC_MESSAGES/ecpg-13.mo
-%%NLS%%share/locale/pt_BR/LC_MESSAGES/ecpglib6-13.mo
-%%NLS%%share/locale/pt_BR/LC_MESSAGES/pg_config-13.mo
-%%NLS%%share/locale/pt_BR/LC_MESSAGES/pgscripts-13.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/ecpg-13.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/ecpglib6-13.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/libpq5-13.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/pg_config-13.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/pg_dump-13.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/pgscripts-13.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/psql-13.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/ecpg-13.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/ecpglib6-13.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/libpq5-13.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/pg_config-13.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/pg_dump-13.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/pgscripts-13.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/psql-13.mo
-%%NLS%%share/locale/tr/LC_MESSAGES/ecpg-13.mo
-%%NLS%%share/locale/tr/LC_MESSAGES/ecpglib6-13.mo
-%%NLS%%share/locale/tr/LC_MESSAGES/libpq5-13.mo
-%%NLS%%share/locale/tr/LC_MESSAGES/pg_config-13.mo
-%%NLS%%share/locale/tr/LC_MESSAGES/pg_dump-13.mo
-%%NLS%%share/locale/tr/LC_MESSAGES/pgscripts-13.mo
-%%NLS%%share/locale/tr/LC_MESSAGES/psql-13.mo
-%%NLS%%share/locale/uk/LC_MESSAGES/ecpg-13.mo
-%%NLS%%share/locale/uk/LC_MESSAGES/ecpglib6-13.mo
-%%NLS%%share/locale/uk/LC_MESSAGES/libpq5-13.mo
-%%NLS%%share/locale/uk/LC_MESSAGES/pg_config-13.mo
-%%NLS%%share/locale/uk/LC_MESSAGES/pg_dump-13.mo
-%%NLS%%share/locale/uk/LC_MESSAGES/pgscripts-13.mo
-%%NLS%%share/locale/uk/LC_MESSAGES/psql-13.mo
-%%NLS%%share/locale/vi/LC_MESSAGES/ecpg-13.mo
-%%NLS%%share/locale/vi/LC_MESSAGES/ecpglib6-13.mo
-%%NLS%%share/locale/vi/LC_MESSAGES/pg_config-13.mo
-%%NLS%%share/locale/zh_CN/LC_MESSAGES/ecpg-13.mo
-%%NLS%%share/locale/zh_CN/LC_MESSAGES/ecpglib6-13.mo
-%%NLS%%share/locale/zh_CN/LC_MESSAGES/libpq5-13.mo
-%%NLS%%share/locale/zh_CN/LC_MESSAGES/pg_config-13.mo
-%%NLS%%share/locale/zh_CN/LC_MESSAGES/pg_dump-13.mo
-%%NLS%%share/locale/zh_CN/LC_MESSAGES/pgscripts-13.mo
-%%NLS%%share/locale/zh_CN/LC_MESSAGES/psql-13.mo
-%%NLS%%share/locale/zh_TW/LC_MESSAGES/ecpg-13.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/ecpg-%%PG_VERSION%%.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/ecpglib6-%%PG_VERSION%%.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/libpq5-%%PG_VERSION%%.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/pg_config-%%PG_VERSION%%.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/pg_dump-%%PG_VERSION%%.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/pgscripts-%%PG_VERSION%%.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/psql-%%PG_VERSION%%.mo
+%%NLS%%share/locale/de/LC_MESSAGES/ecpg-%%PG_VERSION%%.mo
+%%NLS%%share/locale/de/LC_MESSAGES/ecpglib6-%%PG_VERSION%%.mo
+%%NLS%%share/locale/de/LC_MESSAGES/libpq5-%%PG_VERSION%%.mo
+%%NLS%%share/locale/de/LC_MESSAGES/pg_config-%%PG_VERSION%%.mo
+%%NLS%%share/locale/de/LC_MESSAGES/pg_dump-%%PG_VERSION%%.mo
+%%NLS%%share/locale/de/LC_MESSAGES/pgscripts-%%PG_VERSION%%.mo
+%%NLS%%share/locale/de/LC_MESSAGES/psql-%%PG_VERSION%%.mo
+%%NLS%%share/locale/es/LC_MESSAGES/ecpg-%%PG_VERSION%%.mo
+%%NLS%%share/locale/es/LC_MESSAGES/ecpglib6-%%PG_VERSION%%.mo
+%%NLS%%share/locale/es/LC_MESSAGES/libpq5-%%PG_VERSION%%.mo
+%%NLS%%share/locale/es/LC_MESSAGES/pg_config-%%PG_VERSION%%.mo
+%%NLS%%share/locale/es/LC_MESSAGES/pg_dump-%%PG_VERSION%%.mo
+%%NLS%%share/locale/es/LC_MESSAGES/pgscripts-%%PG_VERSION%%.mo
+%%NLS%%share/locale/es/LC_MESSAGES/psql-%%PG_VERSION%%.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/ecpg-%%PG_VERSION%%.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/ecpglib6-%%PG_VERSION%%.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/libpq5-%%PG_VERSION%%.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/pg_config-%%PG_VERSION%%.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/pg_dump-%%PG_VERSION%%.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/pgscripts-%%PG_VERSION%%.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/psql-%%PG_VERSION%%.mo
+%%NLS%%share/locale/he/LC_MESSAGES/pg_config-%%PG_VERSION%%.mo
+%%NLS%%share/locale/it/LC_MESSAGES/ecpg-%%PG_VERSION%%.mo
+%%NLS%%share/locale/it/LC_MESSAGES/ecpglib6-%%PG_VERSION%%.mo
+%%NLS%%share/locale/it/LC_MESSAGES/libpq5-%%PG_VERSION%%.mo
+%%NLS%%share/locale/it/LC_MESSAGES/pg_config-%%PG_VERSION%%.mo
+%%NLS%%share/locale/it/LC_MESSAGES/psql-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/ecpg-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/ecpglib6-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/libpq5-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/pg_config-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/pg_dump-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/pgscripts-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/psql-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/ecpg-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/ecpglib6-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/libpq5-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/pg_config-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/pg_dump-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/pgscripts-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/psql-%%PG_VERSION%%.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/ecpg-%%PG_VERSION%%.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/ecpglib6-%%PG_VERSION%%.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/pg_config-%%PG_VERSION%%.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/ecpg-%%PG_VERSION%%.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/ecpglib6-%%PG_VERSION%%.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/pg_config-%%PG_VERSION%%.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/pgscripts-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/ecpg-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/ecpglib6-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/libpq5-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/pg_config-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/pg_dump-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/pgscripts-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/psql-%%PG_VERSION%%.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/ecpg-%%PG_VERSION%%.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/ecpglib6-%%PG_VERSION%%.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/libpq5-%%PG_VERSION%%.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/pg_config-%%PG_VERSION%%.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/pg_dump-%%PG_VERSION%%.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/pgscripts-%%PG_VERSION%%.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/psql-%%PG_VERSION%%.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/ecpg-%%PG_VERSION%%.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/ecpglib6-%%PG_VERSION%%.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/libpq5-%%PG_VERSION%%.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/pg_config-%%PG_VERSION%%.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/pg_dump-%%PG_VERSION%%.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/pgscripts-%%PG_VERSION%%.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/psql-%%PG_VERSION%%.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/ecpg-%%PG_VERSION%%.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/ecpglib6-%%PG_VERSION%%.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/libpq5-%%PG_VERSION%%.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/pg_config-%%PG_VERSION%%.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/pg_dump-%%PG_VERSION%%.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/pgscripts-%%PG_VERSION%%.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/psql-%%PG_VERSION%%.mo
+%%NLS%%share/locale/vi/LC_MESSAGES/ecpg-%%PG_VERSION%%.mo
+%%NLS%%share/locale/vi/LC_MESSAGES/ecpglib6-%%PG_VERSION%%.mo
+%%NLS%%share/locale/vi/LC_MESSAGES/pg_config-%%PG_VERSION%%.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/ecpg-%%PG_VERSION%%.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/ecpglib6-%%PG_VERSION%%.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/libpq5-%%PG_VERSION%%.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/pg_config-%%PG_VERSION%%.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/pg_dump-%%PG_VERSION%%.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/pgscripts-%%PG_VERSION%%.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/psql-%%PG_VERSION%%.mo
+%%NLS%%share/locale/zh_TW/LC_MESSAGES/ecpg-%%PG_VERSION%%.mo
 %%DATADIR%%/pg_service.conf.sample
 %%DATADIR%%/psqlrc.sample
diff --git a/databases/postgresql13-server/pkg-plist-plperl b/databases/postgresql13-server/pkg-plist-plperl
index 865e061d1efc..d2b1c7fd3143 100644
--- a/databases/postgresql13-server/pkg-plist-plperl
+++ b/databases/postgresql13-server/pkg-plist-plperl
@@ -1,5 +1,6 @@
 include/postgresql/server/plperl.h
 include/postgresql/server/plperl_helpers.h
+include/postgresql/server/plperl_system.h
 include/postgresql/server/ppport.h
 %%DATADIR%%/extension/plperlu--1.0.sql
 %%DATADIR%%/extension/plperl.control
diff --git a/databases/postgresql13-server/pkg-plist-plpython b/databases/postgresql13-server/pkg-plist-plpython
index c7e8217d6332..6ae61647b4c7 100644
--- a/databases/postgresql13-server/pkg-plist-plpython
+++ b/databases/postgresql13-server/pkg-plist-plpython
@@ -11,6 +11,7 @@ include/postgresql/server/plpy_subxactobject.h
 include/postgresql/server/plpy_typeio.h
 include/postgresql/server/plpy_util.h
 include/postgresql/server/plpython.h
+include/postgresql/server/plpython_system.h
 lib/postgresql/pgxs/src/pl/plpython/regress-python3-mangle.mk
 %%DOCSDIR%%/README-plpython
 %%PYTHON2%%lib/postgresql/plpython2.so
diff --git a/databases/postgresql13-server/pkg-plist-server b/databases/postgresql13-server/pkg-plist-server
index 49f228f3eb28..f58235e4c4d2 100644
--- a/databases/postgresql13-server/pkg-plist-server
+++ b/databases/postgresql13-server/pkg-plist-server
@@ -737,178 +737,178 @@ lib/postgresql/utf8_and_win.so
 %%DATADIR%%/snowball_create.sql
 %%DATADIR%%/sql_features.txt
 %%DATADIR%%/system_views.sql
-%%NLS%%share/locale/cs/LC_MESSAGES/initdb-13.mo
-%%NLS%%share/locale/cs/LC_MESSAGES/pg_archivecleanup-13.mo
-%%NLS%%share/locale/cs/LC_MESSAGES/pg_basebackup-13.mo
-%%NLS%%share/locale/cs/LC_MESSAGES/pg_checksums-13.mo
-%%NLS%%share/locale/cs/LC_MESSAGES/pg_controldata-13.mo
-%%NLS%%share/locale/cs/LC_MESSAGES/pg_ctl-13.mo
-%%NLS%%share/locale/cs/LC_MESSAGES/pg_resetwal-13.mo
-%%NLS%%share/locale/cs/LC_MESSAGES/pg_rewind-13.mo
-%%NLS%%share/locale/cs/LC_MESSAGES/pg_test_fsync-13.mo
-%%NLS%%share/locale/cs/LC_MESSAGES/pg_test_timing-13.mo
-%%NLS%%share/locale/cs/LC_MESSAGES/pg_upgrade-13.mo
-%%NLS%%share/locale/cs/LC_MESSAGES/pg_waldump-13.mo
-%%NLS%%share/locale/cs/LC_MESSAGES/plpgsql-13.mo
-%%NLS%%share/locale/de/LC_MESSAGES/initdb-13.mo
-%%NLS%%share/locale/de/LC_MESSAGES/pg_archivecleanup-13.mo
-%%NLS%%share/locale/de/LC_MESSAGES/pg_basebackup-13.mo
-%%NLS%%share/locale/de/LC_MESSAGES/pg_checksums-13.mo
-%%NLS%%share/locale/de/LC_MESSAGES/pg_controldata-13.mo
-%%NLS%%share/locale/de/LC_MESSAGES/pg_ctl-13.mo
-%%NLS%%share/locale/de/LC_MESSAGES/pg_resetwal-13.mo
-%%NLS%%share/locale/de/LC_MESSAGES/pg_rewind-13.mo
-%%NLS%%share/locale/de/LC_MESSAGES/pg_test_fsync-13.mo
-%%NLS%%share/locale/de/LC_MESSAGES/pg_test_timing-13.mo
-%%NLS%%share/locale/de/LC_MESSAGES/pg_upgrade-13.mo
-%%NLS%%share/locale/de/LC_MESSAGES/pg_waldump-13.mo
-%%NLS%%share/locale/de/LC_MESSAGES/plpgsql-13.mo
-%%NLS%%share/locale/de/LC_MESSAGES/postgres-13.mo
-%%NLS%%share/locale/es/LC_MESSAGES/initdb-13.mo
-%%NLS%%share/locale/es/LC_MESSAGES/pg_archivecleanup-13.mo
-%%NLS%%share/locale/es/LC_MESSAGES/pg_basebackup-13.mo
-%%NLS%%share/locale/es/LC_MESSAGES/pg_checksums-13.mo
-%%NLS%%share/locale/es/LC_MESSAGES/pg_controldata-13.mo
-%%NLS%%share/locale/es/LC_MESSAGES/pg_ctl-13.mo
-%%NLS%%share/locale/es/LC_MESSAGES/pg_resetwal-13.mo
-%%NLS%%share/locale/es/LC_MESSAGES/pg_rewind-13.mo
-%%NLS%%share/locale/es/LC_MESSAGES/pg_test_fsync-13.mo
-%%NLS%%share/locale/es/LC_MESSAGES/pg_test_timing-13.mo
-%%NLS%%share/locale/es/LC_MESSAGES/pg_upgrade-13.mo
-%%NLS%%share/locale/es/LC_MESSAGES/pg_waldump-13.mo
-%%NLS%%share/locale/es/LC_MESSAGES/plpgsql-13.mo
-%%NLS%%share/locale/es/LC_MESSAGES/postgres-13.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/initdb-13.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/pg_archivecleanup-13.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/pg_basebackup-13.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/pg_checksums-13.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/pg_controldata-13.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/pg_ctl-13.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/pg_resetwal-13.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/pg_rewind-13.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/pg_test_fsync-13.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/pg_test_timing-13.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/pg_upgrade-13.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/pg_waldump-13.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/plpgsql-13.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/postgres-13.mo
-%%NLS%%share/locale/it/LC_MESSAGES/pg_controldata-13.mo
-%%NLS%%share/locale/it/LC_MESSAGES/pg_ctl-13.mo
-%%NLS%%share/locale/it/LC_MESSAGES/plpgsql-13.mo
-%%NLS%%share/locale/it/LC_MESSAGES/postgres-13.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/initdb-13.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/pg_archivecleanup-13.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/pg_basebackup-13.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/pg_checksums-13.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/pg_controldata-13.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/pg_ctl-13.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/pg_resetwal-13.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/pg_rewind-13.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/pg_test_fsync-13.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/pg_test_timing-13.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/pg_upgrade-13.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/pg_waldump-13.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/plpgsql-13.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/postgres-13.mo
-%%NLS%%share/locale/ko/LC_MESSAGES/initdb-13.mo
-%%NLS%%share/locale/ko/LC_MESSAGES/pg_archivecleanup-13.mo
-%%NLS%%share/locale/ko/LC_MESSAGES/pg_basebackup-13.mo
-%%NLS%%share/locale/ko/LC_MESSAGES/pg_checksums-13.mo
-%%NLS%%share/locale/ko/LC_MESSAGES/pg_controldata-13.mo
-%%NLS%%share/locale/ko/LC_MESSAGES/pg_ctl-13.mo
-%%NLS%%share/locale/ko/LC_MESSAGES/pg_resetwal-13.mo
-%%NLS%%share/locale/ko/LC_MESSAGES/pg_rewind-13.mo
-%%NLS%%share/locale/ko/LC_MESSAGES/pg_test_fsync-13.mo
-%%NLS%%share/locale/ko/LC_MESSAGES/pg_test_timing-13.mo
-%%NLS%%share/locale/ko/LC_MESSAGES/pg_upgrade-13.mo
-%%NLS%%share/locale/ko/LC_MESSAGES/pg_waldump-13.mo
-%%NLS%%share/locale/ko/LC_MESSAGES/plpgsql-13.mo
-%%NLS%%share/locale/ko/LC_MESSAGES/postgres-13.mo
-%%NLS%%share/locale/pl/LC_MESSAGES/pg_test_fsync-13.mo
-%%NLS%%share/locale/pl/LC_MESSAGES/pg_test_timing-13.mo
-%%NLS%%share/locale/pl/LC_MESSAGES/plpgsql-13.mo
-%%NLS%%share/locale/pt_BR/LC_MESSAGES/initdb-13.mo
-%%NLS%%share/locale/pt_BR/LC_MESSAGES/pg_archivecleanup-13.mo
-%%NLS%%share/locale/pt_BR/LC_MESSAGES/pg_checksums-13.mo
-%%NLS%%share/locale/pt_BR/LC_MESSAGES/pg_controldata-13.mo
-%%NLS%%share/locale/pt_BR/LC_MESSAGES/pg_ctl-13.mo
-%%NLS%%share/locale/pt_BR/LC_MESSAGES/pg_resetwal-13.mo
-%%NLS%%share/locale/pt_BR/LC_MESSAGES/pg_test_fsync-13.mo
-%%NLS%%share/locale/pt_BR/LC_MESSAGES/pg_test_timing-13.mo
-%%NLS%%share/locale/pt_BR/LC_MESSAGES/plpgsql-13.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/initdb-13.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/pg_archivecleanup-13.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/pg_basebackup-13.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/pg_checksums-13.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/pg_controldata-13.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/pg_ctl-13.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/pg_resetwal-13.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/pg_rewind-13.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/pg_test_fsync-13.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/pg_test_timing-13.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/pg_upgrade-13.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/pg_waldump-13.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/plpgsql-13.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/postgres-13.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/initdb-13.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/pg_archivecleanup-13.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/pg_basebackup-13.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/pg_checksums-13.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/pg_controldata-13.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/pg_ctl-13.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/pg_resetwal-13.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/pg_rewind-13.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/pg_test_fsync-13.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/pg_test_timing-13.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/pg_upgrade-13.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/pg_waldump-13.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/plpgsql-13.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/postgres-13.mo
-%%NLS%%share/locale/tr/LC_MESSAGES/initdb-13.mo
-%%NLS%%share/locale/tr/LC_MESSAGES/pg_archivecleanup-13.mo
-%%NLS%%share/locale/tr/LC_MESSAGES/pg_basebackup-13.mo
-%%NLS%%share/locale/tr/LC_MESSAGES/pg_checksums-13.mo
-%%NLS%%share/locale/tr/LC_MESSAGES/pg_controldata-13.mo
-%%NLS%%share/locale/tr/LC_MESSAGES/pg_ctl-13.mo
-%%NLS%%share/locale/tr/LC_MESSAGES/pg_resetwal-13.mo
-%%NLS%%share/locale/tr/LC_MESSAGES/pg_rewind-13.mo
-%%NLS%%share/locale/tr/LC_MESSAGES/pg_test_fsync-13.mo
-%%NLS%%share/locale/tr/LC_MESSAGES/pg_test_timing-13.mo
-%%NLS%%share/locale/tr/LC_MESSAGES/pg_upgrade-13.mo
-%%NLS%%share/locale/tr/LC_MESSAGES/pg_waldump-13.mo
-%%NLS%%share/locale/tr/LC_MESSAGES/plpgsql-13.mo
-%%NLS%%share/locale/tr/LC_MESSAGES/postgres-13.mo
-%%NLS%%share/locale/uk/LC_MESSAGES/initdb-13.mo
-%%NLS%%share/locale/uk/LC_MESSAGES/pg_archivecleanup-13.mo
-%%NLS%%share/locale/uk/LC_MESSAGES/pg_basebackup-13.mo
-%%NLS%%share/locale/uk/LC_MESSAGES/pg_checksums-13.mo
-%%NLS%%share/locale/uk/LC_MESSAGES/pg_controldata-13.mo
-%%NLS%%share/locale/uk/LC_MESSAGES/pg_ctl-13.mo
-%%NLS%%share/locale/uk/LC_MESSAGES/pg_resetwal-13.mo
-%%NLS%%share/locale/uk/LC_MESSAGES/pg_rewind-13.mo
-%%NLS%%share/locale/uk/LC_MESSAGES/pg_test_fsync-13.mo
-%%NLS%%share/locale/uk/LC_MESSAGES/pg_test_timing-13.mo
-%%NLS%%share/locale/uk/LC_MESSAGES/pg_upgrade-13.mo
-%%NLS%%share/locale/uk/LC_MESSAGES/pg_waldump-13.mo
-%%NLS%%share/locale/uk/LC_MESSAGES/plpgsql-13.mo
-%%NLS%%share/locale/uk/LC_MESSAGES/postgres-13.mo
-%%NLS%%share/locale/vi/LC_MESSAGES/pg_test_fsync-13.mo
-%%NLS%%share/locale/vi/LC_MESSAGES/pg_test_timing-13.mo
-%%NLS%%share/locale/vi/LC_MESSAGES/plpgsql-13.mo
-%%NLS%%share/locale/zh_CN/LC_MESSAGES/initdb-13.mo
-%%NLS%%share/locale/zh_CN/LC_MESSAGES/pg_archivecleanup-13.mo
-%%NLS%%share/locale/zh_CN/LC_MESSAGES/pg_basebackup-13.mo
-%%NLS%%share/locale/zh_CN/LC_MESSAGES/pg_checksums-13.mo
-%%NLS%%share/locale/zh_CN/LC_MESSAGES/pg_controldata-13.mo
-%%NLS%%share/locale/zh_CN/LC_MESSAGES/pg_ctl-13.mo
-%%NLS%%share/locale/zh_CN/LC_MESSAGES/pg_resetwal-13.mo
-%%NLS%%share/locale/zh_CN/LC_MESSAGES/pg_rewind-13.mo
-%%NLS%%share/locale/zh_CN/LC_MESSAGES/pg_test_fsync-13.mo
-%%NLS%%share/locale/zh_CN/LC_MESSAGES/pg_test_timing-13.mo
-%%NLS%%share/locale/zh_CN/LC_MESSAGES/pg_upgrade-13.mo
-%%NLS%%share/locale/zh_CN/LC_MESSAGES/pg_waldump-13.mo
-%%NLS%%share/locale/zh_CN/LC_MESSAGES/plpgsql-13.mo
-%%NLS%%share/locale/zh_CN/LC_MESSAGES/postgres-13.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/initdb-%%PG_VERSION%%.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/pg_archivecleanup-%%PG_VERSION%%.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/pg_basebackup-%%PG_VERSION%%.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/pg_checksums-%%PG_VERSION%%.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/pg_controldata-%%PG_VERSION%%.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/pg_ctl-%%PG_VERSION%%.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/pg_resetwal-%%PG_VERSION%%.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/pg_rewind-%%PG_VERSION%%.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/pg_test_fsync-%%PG_VERSION%%.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/pg_test_timing-%%PG_VERSION%%.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/pg_upgrade-%%PG_VERSION%%.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/pg_waldump-%%PG_VERSION%%.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/plpgsql-%%PG_VERSION%%.mo
+%%NLS%%share/locale/de/LC_MESSAGES/initdb-%%PG_VERSION%%.mo
+%%NLS%%share/locale/de/LC_MESSAGES/pg_archivecleanup-%%PG_VERSION%%.mo
+%%NLS%%share/locale/de/LC_MESSAGES/pg_basebackup-%%PG_VERSION%%.mo
+%%NLS%%share/locale/de/LC_MESSAGES/pg_checksums-%%PG_VERSION%%.mo
+%%NLS%%share/locale/de/LC_MESSAGES/pg_controldata-%%PG_VERSION%%.mo
+%%NLS%%share/locale/de/LC_MESSAGES/pg_ctl-%%PG_VERSION%%.mo
+%%NLS%%share/locale/de/LC_MESSAGES/pg_resetwal-%%PG_VERSION%%.mo
+%%NLS%%share/locale/de/LC_MESSAGES/pg_rewind-%%PG_VERSION%%.mo
+%%NLS%%share/locale/de/LC_MESSAGES/pg_test_fsync-%%PG_VERSION%%.mo
+%%NLS%%share/locale/de/LC_MESSAGES/pg_test_timing-%%PG_VERSION%%.mo
+%%NLS%%share/locale/de/LC_MESSAGES/pg_upgrade-%%PG_VERSION%%.mo
+%%NLS%%share/locale/de/LC_MESSAGES/pg_waldump-%%PG_VERSION%%.mo
+%%NLS%%share/locale/de/LC_MESSAGES/plpgsql-%%PG_VERSION%%.mo
+%%NLS%%share/locale/de/LC_MESSAGES/postgres-%%PG_VERSION%%.mo
+%%NLS%%share/locale/es/LC_MESSAGES/initdb-%%PG_VERSION%%.mo
+%%NLS%%share/locale/es/LC_MESSAGES/pg_archivecleanup-%%PG_VERSION%%.mo
+%%NLS%%share/locale/es/LC_MESSAGES/pg_basebackup-%%PG_VERSION%%.mo
+%%NLS%%share/locale/es/LC_MESSAGES/pg_checksums-%%PG_VERSION%%.mo
+%%NLS%%share/locale/es/LC_MESSAGES/pg_controldata-%%PG_VERSION%%.mo
+%%NLS%%share/locale/es/LC_MESSAGES/pg_ctl-%%PG_VERSION%%.mo
+%%NLS%%share/locale/es/LC_MESSAGES/pg_resetwal-%%PG_VERSION%%.mo
+%%NLS%%share/locale/es/LC_MESSAGES/pg_rewind-%%PG_VERSION%%.mo
+%%NLS%%share/locale/es/LC_MESSAGES/pg_test_fsync-%%PG_VERSION%%.mo
+%%NLS%%share/locale/es/LC_MESSAGES/pg_test_timing-%%PG_VERSION%%.mo
+%%NLS%%share/locale/es/LC_MESSAGES/pg_upgrade-%%PG_VERSION%%.mo
+%%NLS%%share/locale/es/LC_MESSAGES/pg_waldump-%%PG_VERSION%%.mo
+%%NLS%%share/locale/es/LC_MESSAGES/plpgsql-%%PG_VERSION%%.mo
+%%NLS%%share/locale/es/LC_MESSAGES/postgres-%%PG_VERSION%%.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/initdb-%%PG_VERSION%%.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/pg_archivecleanup-%%PG_VERSION%%.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/pg_basebackup-%%PG_VERSION%%.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/pg_checksums-%%PG_VERSION%%.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/pg_controldata-%%PG_VERSION%%.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/pg_ctl-%%PG_VERSION%%.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/pg_resetwal-%%PG_VERSION%%.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/pg_rewind-%%PG_VERSION%%.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/pg_test_fsync-%%PG_VERSION%%.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/pg_test_timing-%%PG_VERSION%%.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/pg_upgrade-%%PG_VERSION%%.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/pg_waldump-%%PG_VERSION%%.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/plpgsql-%%PG_VERSION%%.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/postgres-%%PG_VERSION%%.mo
+%%NLS%%share/locale/it/LC_MESSAGES/pg_controldata-%%PG_VERSION%%.mo
+%%NLS%%share/locale/it/LC_MESSAGES/pg_ctl-%%PG_VERSION%%.mo
+%%NLS%%share/locale/it/LC_MESSAGES/plpgsql-%%PG_VERSION%%.mo
+%%NLS%%share/locale/it/LC_MESSAGES/postgres-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/initdb-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/pg_archivecleanup-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/pg_basebackup-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/pg_checksums-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/pg_controldata-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/pg_ctl-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/pg_resetwal-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/pg_rewind-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/pg_test_fsync-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/pg_test_timing-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/pg_upgrade-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/pg_waldump-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/plpgsql-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/postgres-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/initdb-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/pg_archivecleanup-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/pg_basebackup-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/pg_checksums-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/pg_controldata-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/pg_ctl-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/pg_resetwal-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/pg_rewind-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/pg_test_fsync-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/pg_test_timing-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/pg_upgrade-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/pg_waldump-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/plpgsql-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/postgres-%%PG_VERSION%%.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/pg_test_fsync-%%PG_VERSION%%.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/pg_test_timing-%%PG_VERSION%%.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/plpgsql-%%PG_VERSION%%.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/initdb-%%PG_VERSION%%.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/pg_archivecleanup-%%PG_VERSION%%.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/pg_checksums-%%PG_VERSION%%.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/pg_controldata-%%PG_VERSION%%.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/pg_ctl-%%PG_VERSION%%.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/pg_resetwal-%%PG_VERSION%%.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/pg_test_fsync-%%PG_VERSION%%.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/pg_test_timing-%%PG_VERSION%%.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/plpgsql-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/initdb-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/pg_archivecleanup-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/pg_basebackup-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/pg_checksums-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/pg_controldata-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/pg_ctl-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/pg_resetwal-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/pg_rewind-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/pg_test_fsync-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/pg_test_timing-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/pg_upgrade-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/pg_waldump-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/plpgsql-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/postgres-%%PG_VERSION%%.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/initdb-%%PG_VERSION%%.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/pg_archivecleanup-%%PG_VERSION%%.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/pg_basebackup-%%PG_VERSION%%.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/pg_checksums-%%PG_VERSION%%.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/pg_controldata-%%PG_VERSION%%.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/pg_ctl-%%PG_VERSION%%.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/pg_resetwal-%%PG_VERSION%%.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/pg_rewind-%%PG_VERSION%%.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/pg_test_fsync-%%PG_VERSION%%.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/pg_test_timing-%%PG_VERSION%%.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/pg_upgrade-%%PG_VERSION%%.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/pg_waldump-%%PG_VERSION%%.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/plpgsql-%%PG_VERSION%%.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/postgres-%%PG_VERSION%%.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/initdb-%%PG_VERSION%%.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/pg_archivecleanup-%%PG_VERSION%%.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/pg_basebackup-%%PG_VERSION%%.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/pg_checksums-%%PG_VERSION%%.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/pg_controldata-%%PG_VERSION%%.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/pg_ctl-%%PG_VERSION%%.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/pg_resetwal-%%PG_VERSION%%.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/pg_rewind-%%PG_VERSION%%.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/pg_test_fsync-%%PG_VERSION%%.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/pg_test_timing-%%PG_VERSION%%.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/pg_upgrade-%%PG_VERSION%%.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/pg_waldump-%%PG_VERSION%%.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/plpgsql-%%PG_VERSION%%.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/postgres-%%PG_VERSION%%.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/initdb-%%PG_VERSION%%.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/pg_archivecleanup-%%PG_VERSION%%.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/pg_basebackup-%%PG_VERSION%%.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/pg_checksums-%%PG_VERSION%%.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/pg_controldata-%%PG_VERSION%%.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/pg_ctl-%%PG_VERSION%%.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/pg_resetwal-%%PG_VERSION%%.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/pg_rewind-%%PG_VERSION%%.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/pg_test_fsync-%%PG_VERSION%%.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/pg_test_timing-%%PG_VERSION%%.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/pg_upgrade-%%PG_VERSION%%.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/pg_waldump-%%PG_VERSION%%.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/plpgsql-%%PG_VERSION%%.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/postgres-%%PG_VERSION%%.mo
+%%NLS%%share/locale/vi/LC_MESSAGES/pg_test_fsync-%%PG_VERSION%%.mo
+%%NLS%%share/locale/vi/LC_MESSAGES/pg_test_timing-%%PG_VERSION%%.mo
+%%NLS%%share/locale/vi/LC_MESSAGES/plpgsql-%%PG_VERSION%%.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/initdb-%%PG_VERSION%%.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/pg_archivecleanup-%%PG_VERSION%%.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/pg_basebackup-%%PG_VERSION%%.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/pg_checksums-%%PG_VERSION%%.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/pg_controldata-%%PG_VERSION%%.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/pg_ctl-%%PG_VERSION%%.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/pg_resetwal-%%PG_VERSION%%.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/pg_rewind-%%PG_VERSION%%.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/pg_test_fsync-%%PG_VERSION%%.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/pg_test_timing-%%PG_VERSION%%.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/pg_upgrade-%%PG_VERSION%%.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/pg_waldump-%%PG_VERSION%%.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/plpgsql-%%PG_VERSION%%.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/postgres-%%PG_VERSION%%.mo
 %%TZDATA%%%%DATADIR%%/timezone/Africa/Abidjan
 %%TZDATA%%%%DATADIR%%/timezone/Africa/Accra
 %%TZDATA%%%%DATADIR%%/timezone/Africa/Addis_Ababa
@@ -1004,6 +1004,7 @@ lib/postgresql/utf8_and_win.so
 %%TZDATA%%%%DATADIR%%/timezone/America/Cayman
 %%TZDATA%%%%DATADIR%%/timezone/America/Chicago
 %%TZDATA%%%%DATADIR%%/timezone/America/Chihuahua
+%%TZDATA%%%%DATADIR%%/timezone/America/Ciudad_Juarez
 %%TZDATA%%%%DATADIR%%/timezone/America/Coral_Harbour
 %%TZDATA%%%%DATADIR%%/timezone/America/Cordoba
 %%TZDATA%%%%DATADIR%%/timezone/America/Costa_Rica
@@ -1358,6 +1359,7 @@ lib/postgresql/utf8_and_win.so
 %%TZDATA%%%%DATADIR%%/timezone/Europe/Kaliningrad
 %%TZDATA%%%%DATADIR%%/timezone/Europe/Kiev
 %%TZDATA%%%%DATADIR%%/timezone/Europe/Kirov
+%%TZDATA%%%%DATADIR%%/timezone/Europe/Kyiv
 %%TZDATA%%%%DATADIR%%/timezone/Europe/Lisbon
 %%TZDATA%%%%DATADIR%%/timezone/Europe/Ljubljana
 %%TZDATA%%%%DATADIR%%/timezone/Europe/London
@@ -1453,6 +1455,7 @@ lib/postgresql/utf8_and_win.so
 %%TZDATA%%%%DATADIR%%/timezone/Pacific/Guam
 %%TZDATA%%%%DATADIR%%/timezone/Pacific/Honolulu
 %%TZDATA%%%%DATADIR%%/timezone/Pacific/Johnston
+%%TZDATA%%%%DATADIR%%/timezone/Pacific/Kanton
 %%TZDATA%%%%DATADIR%%/timezone/Pacific/Kiritimati
 %%TZDATA%%%%DATADIR%%/timezone/Pacific/Kosrae
 %%TZDATA%%%%DATADIR%%/timezone/Pacific/Kwajalein
diff --git a/databases/postgresql14-client/Makefile b/databases/postgresql14-client/Makefile
index e49d6651bd5f..28d80a5e2858 100644
--- a/databases/postgresql14-client/Makefile
+++ b/databases/postgresql14-client/Makefile
@@ -1,5 +1,3 @@
-# Created by: Palle Girgensohn <girgen@FreeBSD.org>
-
 PORTNAME=	postgresql
 PORTREVISION=	0
 
@@ -7,7 +5,7 @@ COMMENT=	PostgreSQL database (client)
 
 MASTERDIR=	${.CURDIR}/../postgresql14-server
 
-BUILD_DIRS=	config src/include src/interfaces src/port \
+BUILD_DIRS=	config src/include src/interfaces src/port src/bin/pg_amcheck \
 		src/bin/pg_dump src/bin/psql src/bin/scripts src/bin/pg_config \
 		src/bin/pgbench doc src/makefiles src/test/regress
 INSTALL_DIRS=	${BUILD_DIRS}
diff --git a/databases/postgresql14-contrib/Makefile b/databases/postgresql14-contrib/Makefile
index 1506d473094e..5c4e80059c55 100644
--- a/databases/postgresql14-contrib/Makefile
+++ b/databases/postgresql14-contrib/Makefile
@@ -1,5 +1,3 @@
-# Created by: Palle Girgensohn <girgen@pingpong.net>
-
 PORTNAME=	postgresql
 PORTREVISION=	0
 CATEGORIES=	databases
diff --git a/databases/postgresql14-contrib/pkg-descr b/databases/postgresql14-contrib/pkg-descr
index 18c3c1351c3b..a384c76fdbde 100644
--- a/databases/postgresql14-contrib/pkg-descr
+++ b/databases/postgresql14-contrib/pkg-descr
@@ -19,5 +19,3 @@ For more information, please see
 /usr/local/share/doc/postgresql/contrib/README*
 
 This software is part of the standard PostgreSQL distribution.
-
-WWW: https://www.postgresql.org/
diff --git a/databases/postgresql14-docs/Makefile b/databases/postgresql14-docs/Makefile
index 93edc6e0a937..ced0a182a749 100644
--- a/databases/postgresql14-docs/Makefile
+++ b/databases/postgresql14-docs/Makefile
@@ -1,5 +1,3 @@
-# Created by: Palle Girgensohn <girgen@pingpong.net>
-
 PORTNAME=	postgresql
 PORTREVISION=	0
 PKGNAMESUFFIX?=	${WANT_PGSQL_VER:S,.,,}-docs
diff --git a/databases/postgresql14-pgtcl/Makefile b/databases/postgresql14-pgtcl/Makefile
index 3d8c061ea298..3aac14571fad 100644
--- a/databases/postgresql14-pgtcl/Makefile
+++ b/databases/postgresql14-pgtcl/Makefile
@@ -1,7 +1,7 @@
 PORTREVISION=	0
 PKGNAMESUFFIX=	-postgresql14
 
-CONFLICTS=	pgtcl-[0-9]* pgtcl-postgresql9[0123456]-[0-9]* pgtcl-postgresql1[0123-56789]-*
+CONFLICTS=	pgtcl pgtcl-postgresql9[0123456] pgtcl-postgresql1[0123-56789]
 
 PGTCL_SLAVE=	14
 MASTERDIR=	${.CURDIR}/../pgtcl
diff --git a/databases/postgresql14-plperl/Makefile b/databases/postgresql14-plperl/Makefile
index a4e1ff540304..6eb771999a68 100644
--- a/databases/postgresql14-plperl/Makefile
+++ b/databases/postgresql14-plperl/Makefile
@@ -1,5 +1,3 @@
-# Created by: Palle Girgensohn <girgen@partitur.se>
-
 PORTNAME=	postgresql
 # Keep the ?=, this port is used as master by the other plperl.
 PORTREVISION?=	0
diff --git a/databases/postgresql14-plpython/Makefile b/databases/postgresql14-plpython/Makefile
index 9f7f102c341a..44d70613b9b7 100644
--- a/databases/postgresql14-plpython/Makefile
+++ b/databases/postgresql14-plpython/Makefile
@@ -6,6 +6,7 @@ PKGNAMESUFFIX?=	${WANT_PGSQL_VER:S/.//}${COMPONENT}
 
 MAINTAINER=	pgsql@FreeBSD.org
 COMMENT=	Module for using Python to write SQL functions
+WWW=		https://www.postgresql.org/
 
 USES+=		pgsql:${WANT_PGSQL_VER} ${WANT_PYTHON_USE}
 WANT_PGSQL=	server
diff --git a/databases/postgresql14-plpython/pkg-descr b/databases/postgresql14-plpython/pkg-descr
index 416cce467d37..61c4875985f7 100644
--- a/databases/postgresql14-plpython/pkg-descr
+++ b/databases/postgresql14-plpython/pkg-descr
@@ -2,5 +2,3 @@ PL/Python allows one to write PostgeSQL stored functions and
 procedures in Python (http://www.python.org/).
 
 This software is part of the standard PostgreSQL distribution.
-
-WWW: https://www.postgresql.org/
diff --git a/databases/postgresql14-pltcl/Makefile b/databases/postgresql14-pltcl/Makefile
index 637b6de9f8b4..fe4078b0fe21 100644
--- a/databases/postgresql14-pltcl/Makefile
+++ b/databases/postgresql14-pltcl/Makefile
@@ -1,5 +1,3 @@
-# Created by: Palle Girgensohn <girgen@partitur.se>
-
 PORTNAME=	postgresql
 # Keep the ?=, it is used by the other pltcl ports.
 PORTREVISION?=	0
diff --git a/databases/postgresql14-server/Makefile b/databases/postgresql14-server/Makefile
index ac090ad8ebbf..a4599c1bb31c 100644
--- a/databases/postgresql14-server/Makefile
+++ b/databases/postgresql14-server/Makefile
@@ -1,53 +1,9 @@
-# Created by: Marc G. Fournier <scrappy@FreeBSD.org>
-
-PORTNAME?=	postgresql
-DISTVERSION?=	14beta3
+DISTVERSION?=	14.11
 # PORTREVISION must be ?= otherwise, all slave ports get this PORTREVISION and
 # not their own.  Probably best to keep it at ?=0 when reset here too.
 PORTREVISION?=	0
-CATEGORIES?=	databases
-MASTER_SITES=	PGSQL/source/v${DISTVERSION}
-PKGNAMESUFFIX?= ${PORTVERSION:R}${COMPONENT}
 
 MAINTAINER?=	pgsql@FreeBSD.org
-COMMENT?=	PostgreSQL is the most advanced open-source database available anywhere
-
-LICENSE=	PostgreSQL
-
-.if ${DISTVERSION:C/([0-9]*).*/\1/} >= 10
-CONFLICTS+=	${PORTNAME}9* ${PORTNAME}1[^${PORTVERSION:R:C/.*([0-9]$)/\\1/}]*
-.else
-CONFLICTS+=	${PORTNAME}9[^${PORTVERSION:R:E}]* ${PORTNAME}1[0-9]*
-.endif
-
-WRKSRC=		${WRKDIR}/postgresql-${DISTVERSION}
-DIST_SUBDIR=	postgresql
-
-OPTIONS_SUB=	yes
-
-PKGINSTALL?=	${PKGDIR}/pkg-install${COMPONENT}
-USES+=		tar:bzip2 cpe
-.if !defined(NO_BUILD)
-USES+=		gmake
-GNU_CONFIGURE=	yes
-.endif
-
-PG_USER?=	postgres
-PG_GROUP?=	postgres
-PG_UID?=	770
-
-LDFLAGS+=	-L${LOCALBASE}/lib
-INCLUDES+=	-I${LOCALBASE}/include
-CONFIGURE_ARGS+=--with-libraries=${PREFIX}/lib \
-		--with-includes=${PREFIX}/include \
-		--enable-thread-safety
-CONFIGURE_ENV+=	INCLUDES="${INCLUDES}" \
-		PTHREAD_LIBS="-lpthread" \
-		LDFLAGS_SL="${LDFLAGS_SL}"
-LDFLAGS+=	-lpthread
-MAKE_ENV=	MAKELEVEL=0
-
-PLIST=		${PKGDIR}/pkg-plist${COMPONENT}
 
 INSTALL_DIRS?=	src/common src/timezone src/backend \
 		src/backend/utils/mb/conversion_procs \
@@ -61,281 +17,8 @@ INSTALL_DIRS?=	src/common src/timezone src/backend \
 		src/bin/pg_test_fsync src/bin/pg_test_timing \
 		src/bin/pg_waldump src/bin/pg_upgrade
 
-BUILD_DIRS?=	src/port ${INSTALL_DIRS}
-INSTALL_TARGET?=install-strip
-
-.if !defined(CLIENT_ONLY) && !defined(SLAVE_ONLY)
-SERVER_ONLY=	yes
-COMPONENT=	-server
-USE_RC_SUBR=	postgresql
-USES+=		pgsql:${DISTVERSION:C/([0-9]\.?[0-9]).*/\1/g}
-USERS=		${PG_USER}
-GROUPS=	${PG_GROUP}
-SUB_FILES+=	502.pgsql
-.endif
-
-OPTIONS_SUB=	yes
-
-.if defined(CLIENT_ONLY)
-OPTIONS_DEFINE+=LIBEDIT DOCS
-LIBEDIT_DESC=	Use non-GPL libedit instead of readline
-.else
-MAKE_ENV+=	PATH=${PREFIX}/bin:${PATH}
-CONFIGURE_ENV+=	PATH=${PREFIX}/bin:${PATH}
-.endif
-
-.if defined(SERVER_ONLY)
-OPTIONS_DEFINE=	DTRACE LDAP INTDATE TZDATA XML DOCS
-LDAP_DESC=	Build with LDAP authentication support
-TZDATA_DESC=	Use internal timezone database
-XML_DESC=	Build with XML data type
-
-DTRACE_CONFIGURE_ENABLE=dtrace
-DTRACE_LDFLAGS=		-lelf
-DTRACE_INSTALL_TARGET=	install
-
-.if ${DISTVERSION:C/([0-9]*).*/\1/} >= 11
-OPTIONS_DEFINE+=	LLVM
-OPTIONS_DEFAULT+=	LLVM
-LLVM_DESC=		Build with support for JIT-compiling expressions
-OPTIONS_EXCLUDE+=	${OPTIONS_EXCLUDE_${ARCH}_${OSREL:R}}
-OPTIONS_EXCLUDE_powerpc64_12=	LLVM
-.endif
-
-.if ${DISTVERSION:C/([0-9]*).*/\1/} < 10
-# See http://people.freebsd.org/~girgen/postgresql-icu/README.html for more info
-OPTIONS_DEFINE+=	ICU
-ICU_DESC=	Use ICU for unicode collation
-.else
-CONFIGURE_ARGS+=--with-icu
-LIB_DEPENDS+=	libicudata.so:devel/icu
-USES+=		pkgconfig
-.endif
-
-# See http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/76999 for more info
-# (requires dump/restore if modified.)
-OPTIONS_DEFINE+=	INTDATE
-INTDATE_DESC=		Builds with 64-bit date/time type
-OPTIONS_DEFAULT+=	INTDATE
-.endif
-
-.if !defined(SLAVE_ONLY)
-OPTIONS_DEFINE+=	NLS PAM GSSAPI OPTIMIZED_CFLAGS DEBUG DOCS
-. if ${DISTVERSION:R} == 9.2 || ${DISTVERSION:R} == 9.3
-  OPTIONS_RADIO=	KRB5
-  OPTIONS_RADIO_KRB5=	MIT_KRB5 HEIMDAL_KRB5
-. endif
-
-KRB5_DESC=		Build with kerberos provider support
-NLS_DESC=		Use internationalized messages
-PAM_DESC=		Build with PAM Support
-MIT_KRB5_DESC=		Build with MIT kerberos support
-HEIMDAL_KRB5_DESC=	Builds with Heimdal kerberos
-GSSAPI_DESC=		Build with GSSAPI support
-OPTIMIZED_CFLAGS_DESC=	Builds with compiler optimizations (-O3)
-
-OPTIONS_DEFINE+=	SSL
-SSL_DESC=		Build with OpenSSL support
-
-OPTIONS_DEFAULT+=	SSL
-
-GSSAPI_CONFIGURE_WITH=	gssapi
-.endif # !SLAVE_ONLY
-
-.if defined(CLIENT_ONLY)
-LIBEDIT_CONFIGURE_ON+=--with-libedit-preferred
-LIBEDIT_USES=		libedit
-LIBEDIT_USES_OFF=	readline
-.endif # CLIENT_ONLY
-
-SSL_USES=		ssl
-SSL_CONFIGURE_WITH=	openssl
-
-PAM_CONFIGURE_WITH=	pam
-
-XML_CONFIGURE_WITH=	libxml
-XML_LIB_DEPENDS=	libxml2.so:textproc/libxml2
-
-TZDATA_CONFIGURE_OFF=	--with-system-tzdata=/usr/share/zoneinfo
-
-INTDATE_CONFIGURE_OFF=	--disable-integer-datetimes
-
-NLS_CONFIGURE_ENABLE=	nls
-NLS_USES=		gettext
-
-LDAP_CONFIGURE_WITH=	ldap
-LDAP_USE=		OPENLDAP=yes
-
-OPTIMIZED_CFLAGS_CFLAGS=-O3 -funroll-loops
-
-DEBUG_CONFIGURE_ENABLE=	debug
-
-PLIST_SUB+=		PG_USER=${PG_USER} \
-			PG_USER_regex=[[:<:]]${PG_USER}[[:>:]] \
-			PG_GROUP=${PG_GROUP} \
-			PG_GROUP_regex=[[:<:]]${PG_GROUP}[[:>:]]
-SUB_LIST+=		PG_GROUP=${PG_GROUP} \
-			PG_USER=${PG_USER} \
-			PG_UID=${PG_UID}
-
-.include <bsd.port.options.mk>
-
-.if ${ARCH} == "i386"
-USES+=		compiler:gcc-c++11-lib
-.else
-USES+=		compiler
-.endif
-
-.if ${DISTVERSION:C/([0-9]*).*/\1/} < 10
-.  if ( defined(SERVER_ONLY) && ${PORT_OPTIONS:MICU} ) || make(makesum)
-USES+=		autoreconf
-CONFIGURE_ARGS+=--with-icu
-PATCH_SITES+=	http://people.freebsd.org/~girgen/postgresql-icu/:icu
-PATCHFILES+=	${ICU_PATCHFILE}:icu
-LIB_DEPENDS+=	libicudata.so:devel/icu
-.  endif
-.endif # server && version < 10
-
-.if !defined(SLAVE_ONLY)
-
-PATCH_DIST_STRIP=-p1
-
-.if ${PORT_OPTIONS:MGSSAPI}
-.if empty(PORT_OPTIONS:MMIT_KRB5) && empty(PORT_OPTIONS:MHEIMDAL_KRB5)
-# Kerberos libraries will pull the proper GSSAPI library
-# via linker dependencies, but otherwise we must specify
-# it explicitely: ld --as-needed is used for compilation,
-# so configure's -lgssapi_krb5 won't go.
-LDFLAGS+=	-lgssapi
-LDFLAGS_SL+=	-lgssapi
-.endif
-.endif
-
-.  if ${PORT_OPTIONS:MMIT_KRB5}
-.   if defined(IGNORE_WITH_SRC_KRB5) && (exists(/usr/lib/libkrb5.so) || exists(/usr/bin/krb5-config))
-IGNORE=	requires that you remove heimdal\'s /usr/bin/krb5-config and /usr/lib/libkrb5.so*, and set NO_KERBEROS=true in /etc/src.conf to build successfully with MIT-KRB
-.   else
-CONFIGURE_ARGS+=--with-krb5
-# Allow defining a home built MIT Kerberos by setting KRB5_HOME
-.    if defined(KRB5_HOME) && exists(${KRB5_HOME}/lib/libgssapi_krb5.a) && exists(${KRB5_HOME}/bin/krb5-config)
-LIB_DEPENDS+=	libkrb5.so.3:security/krb5
-.    endif
-.   endif
-.  endif
-
-.  if ${PORT_OPTIONS:MHEIMDAL_KRB5}
-CONFIGURE_ARGS+=--with-krb5
-.  endif
-
-.endif # !SLAVE_ONLY
-
-# For testing files in FILESDIR
-.include <bsd.port.pre.mk>
-
-.if ${PORT_OPTIONS:MLLVM}
-CONFIGURE_ARGS+=	--with-llvm
-BUILD_DEPENDS+=		llvm${PG_LLVM_VERSION}>0:devel/llvm${PG_LLVM_VERSION}
-BUILD_DEPENDS+=		llvm-config${PG_LLVM_VERSION}:devel/llvm${PG_LLVM_VERSION}
-RUN_DEPENDS+=		llvm-config${PG_LLVM_VERSION}:devel/llvm${PG_LLVM_VERSION}
-CONFIGURE_ENV+=		LLVM_CONFIG=${LOCALBASE}/bin/llvm-config${PG_LLVM_VERSION}
-.endif
-
-# Convert LLVM_DEFAULT to COMPILER_VERSION format to make it
-# suitable for version comparison.
-.if ${LLVM_DEFAULT} >= 70 && ${LLVM_DEFAULT} <= 90
-LLVM_DEFAULT_VERSION=	${LLVM_DEFAULT}
-.else
-LLVM_DEFAULT_VERSION=	${LLVM_DEFAULT}0
-.endif
-
-# Convert COMPILER_VERSION to LLVM_DEFAULT format to make it
-# suitable for LLVM port name.
-# All supported FreeBSD versions have Clang 10.0.1 or later.
-LLVM_PORT_SUFFIX=	${COMPILER_VERSION:C/.$//}
-
-# sync LLVM to the preferred compiler if possible
-# or else use a lower version compiler that is compatible
-.if ${COMPILER_VERSION} > ${LLVM_DEFAULT_VERSION}
-# LLVM versions in ports are, in order, 70, 80 90, 10, 11, 12... where 10 > 90. [sic]
-.  if ${LLVM_PORT_SUFFIX} < 70
-PG_LLVM_VERSION=${LLVM_PORT_SUFFIX}
-PG_COMPILER_VERSION=${LLVM_PORT_SUFFIX}
-.  else
-PG_LLVM_VERSION=11
-PG_COMPILER_VERSION=11
-.  endif
-.else
-PG_LLVM_VERSION=${LLVM_DEFAULT}
-PG_COMPILER_VERSION=${LLVM_PORT_SUFFIX}
-.endif
-
-.if ${DISTVERSION:C/([0-9]*).*/\1/} >= 11
-.  if defined(SERVER_ONLY) && ${PORT_OPTIONS:MLLVM}
-INSTALL_DIRS+=		src/backend/jit/llvm
-.    if ${LLVM_PORT_SUFFIX} != ${PG_COMPILER_VERSION}
-LLVM_CONFIGURE_ARGS?=	CC=${LOCALBASE}/bin/clang${PG_COMPILER_VERSION}
-.    endif
-.  endif
-.endif
-
-.if defined(SERVER_ONLY)
-pre-build:
-	@${SH} ${PKGINSTALL} ${PORTNAME} PRE-INSTALL
-.endif
-
-.if !defined(NO_BUILD) && !target(do-build)
-
-do-build:
-	@ cd ${WRKSRC}/src/backend && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} symlinks
-	@ for dir in ${BUILD_DIRS}; do \
-		cd ${WRKSRC}/$${dir} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ; \
-	done
-
-.  if exists(${FILESDIR}/pkg-message${COMPONENT}.in)
-SUB_FILES+=	pkg-message${COMPONENT}
-PKGMESSAGE=	${WRKSRC}/pkg-message${COMPONENT}
-.  endif
-.  if exists(${FILESDIR}/pkg-install${COMPONENT}.in)
-SUB_FILES+=	pkg-install${COMPONENT}
-.  endif
-
-post-patch:
-.  if defined(SERVER_ONLY) && ${PORT_OPTIONS:MICU}
-	@${REINPLACE_CMD} \
-		-e '/m4_PACKAGE_VERSION/s/\[2\.6[0-9]\]/m4_defn([m4_PACKAGE_VERSION])/' \
-		-e '/icu/s/_57//' \
-		${WRKSRC}/configure.in
-.  endif
-
-do-install:
-	@for dir in ${INSTALL_DIRS}; do \
-	    cd ${WRKSRC}/$${dir} && \
-		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${INSTALL_TARGET}; \
-	done
-.  if defined(SERVER_ONLY)
-	@ ${MKDIR} ${STAGEDIR}${PREFIX}/share/postgresql ;\
-	${MKDIR} ${STAGEDIR}${PREFIX}/etc/periodic/daily ;\
-	${INSTALL_SCRIPT} ${WRKDIR}/502.pgsql \
-			${STAGEDIR}${PREFIX}/etc/periodic/daily
-.  endif # SERVER_ONLY
-.  if defined(CLIENT_ONLY)
-	@ cd ${WRKSRC}/src && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} install-local
-.  endif
-	@ if [ -r ${PKGMESSAGE} ]; then \
-		${MKDIR} ${STAGEDIR}${DOCSDIR} ;\
-		${INSTALL_DATA} ${PKGMESSAGE} ${STAGEDIR}${DOCSDIR}/README${COMPONENT} ;\
-	fi
-.endif # !NO_BUILD
-
-.if defined(SERVER_ONLY)
-check:
-	@if [ `id -u` != 0 ] ; then \
-	  ${ECHO} "Running postgresql regressions tests" ;\
-	  cd ${WRKSRC}; ${MAKE_CMD} check ;\
-	 else \
-	  ${ECHO} "You cannot run regression tests when postgresql is built as user root." ; \
-	  ${ECHO} "Clean and rebuild the port as a regular user to run the tests." ;\
-	 fi
-.endif
+PG_USER?=	postgres
+PG_GROUP?=	postgres
+PG_UID?=	770
 
-.include <bsd.port.post.mk>
+.include "${.CURDIR}/../postgresql16-server/Makefile"
diff --git a/databases/postgresql14-server/distinfo b/databases/postgresql14-server/distinfo
index b0a3db8a2ae2..6d31689b1b7b 100644
--- a/databases/postgresql14-server/distinfo
+++ b/databases/postgresql14-server/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1628577978
-SHA256 (postgresql/postgresql-14beta3.tar.bz2) = 2ea265980193db70106576201a2fee5b2d72bf9890d3911ddd374d4830624bfa
-SIZE (postgresql/postgresql-14beta3.tar.bz2) = 22584314
+TIMESTAMP = 1707301184
+SHA256 (postgresql/postgresql-14.11.tar.bz2) = a670bd7dce22dcad4297b261136b3b1d4a09a6f541719562aa14ca63bf2968a8
+SIZE (postgresql/postgresql-14.11.tar.bz2) = 22354758
diff --git a/databases/postgresql14-server/files/502.pgsql.in b/databases/postgresql14-server/files/502.pgsql.in
index 86848ad6efa3..604ad3dadab8 100644
--- a/databases/postgresql14-server/files/502.pgsql.in
+++ b/databases/postgresql14-server/files/502.pgsql.in
@@ -34,7 +34,7 @@ fi
 : ${daily_pgsql_backupdir:="~${daily_pgsql_user}/backups"}
 : ${daily_pgsql_savedays:="7"}
 
-# allow '~´ in dir name
+# allow '~' in directory name
 eval backupdir=${daily_pgsql_backupdir}
 
 rc=0
diff --git a/databases/postgresql14-server/files/patch-src_backend_utils_misc_postgresql.conf.sample b/databases/postgresql14-server/files/patch-src_backend_utils_misc_postgresql.conf.sample
index a82826b3b5f1..9469421174a0 100644
--- a/databases/postgresql14-server/files/patch-src_backend_utils_misc_postgresql.conf.sample
+++ b/databases/postgresql14-server/files/patch-src_backend_utils_misc_postgresql.conf.sample
@@ -8,14 +8,3 @@
  #log_destination = 'stderr'		# Valid values are combinations of
  					# stderr, csvlog, syslog, and eventlog,
  					# depending on platform.  csvlog
-@@ -464,7 +465,9 @@
- 
- #cluster_name = ''			# added to process titles if nonempty
- 					# (change requires restart)
--#update_process_title = on
-+
-+# On FreeBSD, this is a performance hog, so keep it off if you need speed
-+update_process_title = off
- 
- 
- #------------------------------------------------------------------------------
diff --git a/databases/postgresql14-server/files/patch-src_include_storage_s__lock.h b/databases/postgresql14-server/files/patch-src_include_storage_s__lock.h
deleted file mode 100644
index 19c945a36126..000000000000
--- a/databases/postgresql14-server/files/patch-src_include_storage_s__lock.h
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/include/storage/s_lock.h.orig	2021-04-15 09:05:25 UTC
-+++ src/include/storage/s_lock.h
-@@ -320,7 +320,7 @@ tas(volatile slock_t *lock)
-  * We use the int-width variant of the builtin because it works on more chips
-  * than other widths.
-  */
--#if defined(__arm__) || defined(__arm) || defined(__aarch64__) || defined(__aarch64)
-+#if defined(__arm__) || defined(__arm) || defined(__aarch64__) || defined(__aarch64) || defined(__riscv)
- #ifdef HAVE_GCC__SYNC_INT32_TAS
- #define HAS_TEST_AND_SET
- 
-@@ -337,7 +337,7 @@ tas(volatile slock_t *lock)
- #define S_UNLOCK(lock) __sync_lock_release(lock)
- 
- #endif	 /* HAVE_GCC__SYNC_INT32_TAS */
--#endif	 /* __arm__ || __arm || __aarch64__ || __aarch64 */
-+#endif	 /* __arm__ || __arm || __aarch64__ || __aarch64 || __riscv */
- 
- 
- /* S/390 and S/390x Linux (32- and 64-bit zSeries) */
diff --git a/databases/postgresql14-server/files/pkg-message-server.in b/databases/postgresql14-server/files/pkg-message-server.in
index 9bfbcc7b4a83..6370d4a017cc 100644
--- a/databases/postgresql14-server/files/pkg-message-server.in
+++ b/databases/postgresql14-server/files/pkg-message-server.in
@@ -14,7 +14,7 @@ is a periodic script, %%PREFIX%%/etc/periodic/daily/502.pgsql, that
 you may find useful. You can use it to backup and perform vacuum on all
 databases nightly. Per default, it performs `vacuum analyze'. See the
 script for instructions. For autovacuum settings, please review
-~postgres/data/postgresql.conf.
+~%%PG_USER%%/data/postgresql.conf.
 
 If you plan to access your PostgreSQL server using ODBC, please
 consider running the SQL script %%PREFIX%%/share/postgresql/odbc.sql
@@ -30,28 +30,33 @@ To set limits, environment stuff like locale and collation and other
 things, you can set up a class in /etc/login.conf before initializing
 the database. Add something similar to this to /etc/login.conf:
 ---
-postgres:\
+%%PG_USER%%:\
 	:lang=en_US.UTF-8:\
 	:setenv=LC_COLLATE=C:\
 	:tc=default:
 ---
 and run `cap_mkdb /etc/login.conf'.
-Then add 'postgresql_class="postgres"' to /etc/rc.conf.
+Then add 'postgresql_login_class="%%PG_USER%%"' to /etc/rc.conf, or
+set it as the %%PG_USER%% user's login class in /etc/passwd.
 
 ======================================================================
 
+To use PostgreSQL, enable it in rc.conf using
+
+  sysrc postgresql_enable=yes
+
 To initialize the database, run
 
-  %%PREFIX%%/etc/rc.d/postgresql initdb
+  service postgresql initdb
 
 You can then start PostgreSQL by running:
 
-  %%PREFIX%%/etc/rc.d/postgresql start
+  service postgresql start
 
-For postmaster settings, see ~postgres/data/postgresql.conf
+For postmaster settings, see ~%%PG_USER%%/data/postgresql.conf
 
 NB. FreeBSD's PostgreSQL port logs to syslog by default
-    See ~postgres/data/postgresql.conf for more info
+    See ~%%PG_USER%%/data/postgresql.conf for more info
 
 NB. If you're not using a checksumming filesystem like ZFS, you might
     wish to enable data checksumming. It can be enabled during
@@ -61,9 +66,6 @@ NB. If you're not using a checksumming filesystem like ZFS, you might
     and make sure you understand the performance implications.
 
 ======================================================================
-
-To run PostgreSQL at startup, add
-'postgresql_enable="YES"' to /etc/rc.conf
 EOM
 }
 ]
diff --git a/databases/postgresql14-server/files/postgresql.in b/databases/postgresql14-server/files/postgresql.in
index 06673e8e4e63..08f6faf12c55 100644
--- a/databases/postgresql14-server/files/postgresql.in
+++ b/databases/postgresql14-server/files/postgresql.in
@@ -1,17 +1,18 @@
 #!/bin/sh
 
 # PROVIDE: postgresql
-# REQUIRE: DAEMON
+# REQUIRE: DAEMON mountlate
 # KEYWORD: shutdown
 #
 # Add the following line to /etc/rc.conf to enable PostgreSQL:
 #
 #  postgresql_enable="YES"
 #  # optional
-#  postgresql_data="/var/db/%%PG_USER%%/data14"
+#  postgresql_data="/var/db/%%PG_USER%%/data%%PG_VERSION%%"
 #  postgresql_flags="-w -s -m fast"
 #  postgresql_initdb_flags="--encoding=utf-8 --lc-collate=C"
-#  postgresql_login_class="default"
+#  # leave empty to use the login class set in in /etc/passwd:
+#  postgresql_login_class="my_custom_login_class"
 #  postgresql_profiles=""
 #
 # See %%PREFIX%%/share/doc/postgresql/README-server for more info
@@ -29,12 +30,13 @@ command=%%PREFIX%%/bin/pg_ctl
 load_rc_config postgresql
 
 # set defaults
-postgresql_enable=${postgresql_enable:-"NO"}
-postgresql_flags=${postgresql_flags:-"-w -s -m fast"}
-postgresql_user=${postgresql_user:-"%%PG_USER%%"}
-eval postgresql_data=${postgresql_data:-"~${postgresql_user}/data14"}
-postgresql_login_class=${postgresql_login_class:-"default"}
-postgresql_initdb_flags=${postgresql_initdb_flags:-"--encoding=utf-8 --lc-collate=C"}
+: ${postgresql_enable:="NO"}
+: ${postgresql_flags:="-w -s -m fast"}
+: ${postgresql_user:="%%PG_USER%%"}
+eval _pgdir="~${postgresql_user}/data%%PG_VERSION%%"
+: ${postgresql_data:="${_pgdir}"}
+: ${postgresql_login_class:=""}
+: ${postgresql_initdb_flags:="--encoding=utf-8 --lc-collate=C"}
 
 name=postgresql
 rcvar=postgresql_enable
@@ -62,6 +64,7 @@ if [ -n "$2" ]; then
 		eval postgresql_enable="\${postgresql_${profile}_enable:-${postgresql_enable}}"
 		eval postgresql_data="\${postgresql_${profile}_data:-${postgresql_data}}"
 		eval postgresql_flags="\${postgresql_${profile}_flags:-${postgresql_flags}}"
+		eval postgresql_login_class="\${postgresql_${profile}_login_class:-${postgresql_login_class}}"
 		eval postgresql_initdb_flags="\${postgresql_${profile}_initdb_flags:-${postgresql_initdb_flags}}"
 	fi
 else
@@ -104,12 +107,16 @@ command_args="-D ${postgresql_data} ${postgresql_flags}"
 
 postgresql_command()
 {
-    ${su_cmd} -l ${postgresql_user} -c "exec ${command} ${command_args} ${rc_arg}"
+    ${su_cmd} ${postgresql_login_class:+-c ${postgresql_login_class}} \
+	    -l ${postgresql_user} \
+	    -c "exec ${command} ${command_args} ${rc_arg}"
 }
 
 postgresql_initdb()
 {
-    ${su_cmd} -l -c ${postgresql_login_class} ${postgresql_user} -c "exec %%PREFIX%%/bin/initdb ${postgresql_initdb_flags} -D ${postgresql_data} -U ${postgresql_user}"
+    ${su_cmd} ${postgresql_login_class:+-c ${postgresql_login_class}} \
+	    -l ${postgresql_user} \
+	    -c "exec %%PREFIX%%/bin/initdb ${postgresql_initdb_flags} -D ${postgresql_data} -U ${postgresql_user}"
 }
 
 run_rc_command "$1"
diff --git a/databases/postgresql14-server/pkg-descr b/databases/postgresql14-server/pkg-descr
index 1b3c3db53e96..cbef6ffab2d8 100644
--- a/databases/postgresql14-server/pkg-descr
+++ b/databases/postgresql14-server/pkg-descr
@@ -19,5 +19,3 @@ Support is available from the PostgreSQL developer/user community through the
 support mailing list (questions@PostgreSQL.ORG).
 
 PostgreSQL is free and the complete source is available.
-
-WWW: https://www.postgresql.org/
diff --git a/databases/postgresql14-server/pkg-plist-client b/databases/postgresql14-server/pkg-plist-client
index 95ffef6fcd15..e1558ef88990 100644
--- a/databases/postgresql14-server/pkg-plist-client
+++ b/databases/postgresql14-server/pkg-plist-client
@@ -4,6 +4,7 @@ bin/createuser
 bin/dropdb
 bin/dropuser
 bin/ecpg
+bin/pg_amcheck
 bin/pg_config
 bin/pg_dump
 bin/pg_dumpall
@@ -114,6 +115,7 @@ include/postgresql/server/access/twophase.h
 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
@@ -314,7 +316,6 @@ 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/hex.h
 include/postgresql/server/common/hmac.h
 include/postgresql/server/common/int.h
 include/postgresql/server/common/int128.h
@@ -881,417 +882,407 @@ libdata/pkgconfig/libecpg.pc
 libdata/pkgconfig/libecpg_compat.pc
 libdata/pkgconfig/libpgtypes.pc
 libdata/pkgconfig/libpq.pc
-man/man1/clusterdb.1.gz
-man/man1/createdb.1.gz
-man/man1/createuser.1.gz
-man/man1/dropdb.1.gz
-man/man1/dropuser.1.gz
-man/man1/ecpg.1.gz
-man/man1/initdb.1.gz
-man/man1/oid2name.1.gz
-man/man1/pg_amcheck.1.gz
-man/man1/pg_archivecleanup.1.gz
-man/man1/pg_basebackup.1.gz
-man/man1/pg_checksums.1.gz
-man/man1/pg_config.1.gz
-man/man1/pg_controldata.1.gz
-man/man1/pg_ctl.1.gz
-man/man1/pg_dump.1.gz
-man/man1/pg_dumpall.1.gz
-man/man1/pg_isready.1.gz
-man/man1/pg_receivewal.1.gz
-man/man1/pg_recvlogical.1.gz
-man/man1/pg_resetwal.1.gz
-man/man1/pg_restore.1.gz
-man/man1/pg_rewind.1.gz
-man/man1/pg_test_fsync.1.gz
-man/man1/pg_test_timing.1.gz
-man/man1/pg_upgrade.1.gz
-man/man1/pg_verifybackup.1.gz
-man/man1/pg_waldump.1.gz
-man/man1/pgbench.1.gz
-man/man1/postgres.1.gz
-man/man1/postmaster.1.gz
-man/man1/psql.1.gz
-man/man1/reindexdb.1.gz
-man/man1/vacuumdb.1.gz
-man/man1/vacuumlo.1.gz
-man/man3/SPI_commit.3.gz
-man/man3/SPI_commit_and_chain.3.gz
-man/man3/SPI_connect.3.gz
-man/man3/SPI_connect_ext.3.gz
-man/man3/SPI_copytuple.3.gz
-man/man3/SPI_cursor_close.3.gz
-man/man3/SPI_cursor_fetch.3.gz
-man/man3/SPI_cursor_find.3.gz
-man/man3/SPI_cursor_move.3.gz
-man/man3/SPI_cursor_open.3.gz
-man/man3/SPI_cursor_open_with_args.3.gz
-man/man3/SPI_cursor_open_with_paramlist.3.gz
-man/man3/SPI_cursor_parse_open.3.gz
-man/man3/SPI_exec.3.gz
-man/man3/SPI_execp.3.gz
-man/man3/SPI_execute.3.gz
-man/man3/SPI_execute_extended.3.gz
-man/man3/SPI_execute_plan.3.gz
-man/man3/SPI_execute_plan_extended.3.gz
-man/man3/SPI_execute_plan_with_paramlist.3.gz
-man/man3/SPI_execute_with_args.3.gz
-man/man3/SPI_finish.3.gz
-man/man3/SPI_fname.3.gz
-man/man3/SPI_fnumber.3.gz
-man/man3/SPI_freeplan.3.gz
-man/man3/SPI_freetuple.3.gz
-man/man3/SPI_freetuptable.3.gz
-man/man3/SPI_getargcount.3.gz
-man/man3/SPI_getargtypeid.3.gz
-man/man3/SPI_getbinval.3.gz
-man/man3/SPI_getnspname.3.gz
-man/man3/SPI_getrelname.3.gz
-man/man3/SPI_gettype.3.gz
-man/man3/SPI_gettypeid.3.gz
-man/man3/SPI_getvalue.3.gz
-man/man3/SPI_is_cursor_plan.3.gz
-man/man3/SPI_keepplan.3.gz
-man/man3/SPI_modifytuple.3.gz
-man/man3/SPI_palloc.3.gz
-man/man3/SPI_pfree.3.gz
-man/man3/SPI_prepare.3.gz
-man/man3/SPI_prepare_cursor.3.gz
-man/man3/SPI_prepare_extended.3.gz
-man/man3/SPI_prepare_params.3.gz
-man/man3/SPI_register_relation.3.gz
-man/man3/SPI_register_trigger_data.3.gz
-man/man3/SPI_repalloc.3.gz
-man/man3/SPI_result_code_string.3.gz
-man/man3/SPI_returntuple.3.gz
-man/man3/SPI_rollback.3.gz
-man/man3/SPI_rollback_and_chain.3.gz
-man/man3/SPI_saveplan.3.gz
-man/man3/SPI_scroll_cursor_fetch.3.gz
-man/man3/SPI_scroll_cursor_move.3.gz
-man/man3/SPI_start_transaction.3.gz
-man/man3/SPI_unregister_relation.3.gz
-man/man3/dblink.3.gz
-man/man3/dblink_build_sql_delete.3.gz
-man/man3/dblink_build_sql_insert.3.gz
-man/man3/dblink_build_sql_update.3.gz
-man/man3/dblink_cancel_query.3.gz
-man/man3/dblink_close.3.gz
-man/man3/dblink_connect.3.gz
-man/man3/dblink_connect_u.3.gz
-man/man3/dblink_disconnect.3.gz
-man/man3/dblink_error_message.3.gz
-man/man3/dblink_exec.3.gz
-man/man3/dblink_fetch.3.gz
-man/man3/dblink_get_connections.3.gz
-man/man3/dblink_get_notify.3.gz
-man/man3/dblink_get_pkey.3.gz
-man/man3/dblink_get_result.3.gz
-man/man3/dblink_is_busy.3.gz
-man/man3/dblink_open.3.gz
-man/man3/dblink_send_query.3.gz
-man/man7/ABORT.7.gz
-man/man7/ALTER_AGGREGATE.7.gz
-man/man7/ALTER_COLLATION.7.gz
-man/man7/ALTER_CONVERSION.7.gz
-man/man7/ALTER_DATABASE.7.gz
-man/man7/ALTER_DEFAULT_PRIVILEGES.7.gz
-man/man7/ALTER_DOMAIN.7.gz
-man/man7/ALTER_EVENT_TRIGGER.7.gz
-man/man7/ALTER_EXTENSION.7.gz
-man/man7/ALTER_FOREIGN_DATA_WRAPPER.7.gz
-man/man7/ALTER_FOREIGN_TABLE.7.gz
-man/man7/ALTER_FUNCTION.7.gz
-man/man7/ALTER_GROUP.7.gz
-man/man7/ALTER_INDEX.7.gz
-man/man7/ALTER_LANGUAGE.7.gz
-man/man7/ALTER_LARGE_OBJECT.7.gz
-man/man7/ALTER_MATERIALIZED_VIEW.7.gz
-man/man7/ALTER_OPERATOR.7.gz
-man/man7/ALTER_OPERATOR_CLASS.7.gz
-man/man7/ALTER_OPERATOR_FAMILY.7.gz
-man/man7/ALTER_POLICY.7.gz
-man/man7/ALTER_PROCEDURE.7.gz
-man/man7/ALTER_PUBLICATION.7.gz
-man/man7/ALTER_ROLE.7.gz
-man/man7/ALTER_ROUTINE.7.gz
-man/man7/ALTER_RULE.7.gz
-man/man7/ALTER_SCHEMA.7.gz
-man/man7/ALTER_SEQUENCE.7.gz
-man/man7/ALTER_SERVER.7.gz
-man/man7/ALTER_STATISTICS.7.gz
-man/man7/ALTER_SUBSCRIPTION.7.gz
-man/man7/ALTER_SYSTEM.7.gz
-man/man7/ALTER_TABLE.7.gz
-man/man7/ALTER_TABLESPACE.7.gz
-man/man7/ALTER_TEXT_SEARCH_CONFIGURATION.7.gz
-man/man7/ALTER_TEXT_SEARCH_DICTIONARY.7.gz
-man/man7/ALTER_TEXT_SEARCH_PARSER.7.gz
-man/man7/ALTER_TEXT_SEARCH_TEMPLATE.7.gz
-man/man7/ALTER_TRIGGER.7.gz
-man/man7/ALTER_TYPE.7.gz
-man/man7/ALTER_USER.7.gz
-man/man7/ALTER_USER_MAPPING.7.gz
-man/man7/ALTER_VIEW.7.gz
-man/man7/ANALYZE.7.gz
-man/man7/BEGIN.7.gz
-man/man7/CALL.7.gz
-man/man7/CHECKPOINT.7.gz
-man/man7/CLOSE.7.gz
-man/man7/CLUSTER.7.gz
-man/man7/COMMENT.7.gz
-man/man7/COMMIT.7.gz
-man/man7/COMMIT_PREPARED.7.gz
-man/man7/COPY.7.gz
-man/man7/CREATE_ACCESS_METHOD.7.gz
-man/man7/CREATE_AGGREGATE.7.gz
-man/man7/CREATE_CAST.7.gz
-man/man7/CREATE_COLLATION.7.gz
-man/man7/CREATE_CONVERSION.7.gz
-man/man7/CREATE_DATABASE.7.gz
-man/man7/CREATE_DOMAIN.7.gz
-man/man7/CREATE_EVENT_TRIGGER.7.gz
-man/man7/CREATE_EXTENSION.7.gz
-man/man7/CREATE_FOREIGN_DATA_WRAPPER.7.gz
-man/man7/CREATE_FOREIGN_TABLE.7.gz
-man/man7/CREATE_FUNCTION.7.gz
-man/man7/CREATE_GROUP.7.gz
-man/man7/CREATE_INDEX.7.gz
-man/man7/CREATE_LANGUAGE.7.gz
-man/man7/CREATE_MATERIALIZED_VIEW.7.gz
-man/man7/CREATE_OPERATOR.7.gz
-man/man7/CREATE_OPERATOR_CLASS.7.gz
-man/man7/CREATE_OPERATOR_FAMILY.7.gz
-man/man7/CREATE_POLICY.7.gz
-man/man7/CREATE_PROCEDURE.7.gz
-man/man7/CREATE_PUBLICATION.7.gz
-man/man7/CREATE_ROLE.7.gz
-man/man7/CREATE_RULE.7.gz
-man/man7/CREATE_SCHEMA.7.gz
-man/man7/CREATE_SEQUENCE.7.gz
-man/man7/CREATE_SERVER.7.gz
-man/man7/CREATE_STATISTICS.7.gz
-man/man7/CREATE_SUBSCRIPTION.7.gz
-man/man7/CREATE_TABLE.7.gz
-man/man7/CREATE_TABLESPACE.7.gz
-man/man7/CREATE_TABLE_AS.7.gz
-man/man7/CREATE_TEXT_SEARCH_CONFIGURATION.7.gz
-man/man7/CREATE_TEXT_SEARCH_DICTIONARY.7.gz
-man/man7/CREATE_TEXT_SEARCH_PARSER.7.gz
-man/man7/CREATE_TEXT_SEARCH_TEMPLATE.7.gz
-man/man7/CREATE_TRANSFORM.7.gz
-man/man7/CREATE_TRIGGER.7.gz
-man/man7/CREATE_TYPE.7.gz
-man/man7/CREATE_USER.7.gz
-man/man7/CREATE_USER_MAPPING.7.gz
-man/man7/CREATE_VIEW.7.gz
-man/man7/DEALLOCATE.7.gz
-man/man7/DECLARE.7.gz
-man/man7/DELETE.7.gz
-man/man7/DISCARD.7.gz
-man/man7/DO.7.gz
-man/man7/DROP_ACCESS_METHOD.7.gz
-man/man7/DROP_AGGREGATE.7.gz
-man/man7/DROP_CAST.7.gz
-man/man7/DROP_COLLATION.7.gz
-man/man7/DROP_CONVERSION.7.gz
-man/man7/DROP_DATABASE.7.gz
-man/man7/DROP_DOMAIN.7.gz
-man/man7/DROP_EVENT_TRIGGER.7.gz
-man/man7/DROP_EXTENSION.7.gz
-man/man7/DROP_FOREIGN_DATA_WRAPPER.7.gz
-man/man7/DROP_FOREIGN_TABLE.7.gz
-man/man7/DROP_FUNCTION.7.gz
-man/man7/DROP_GROUP.7.gz
-man/man7/DROP_INDEX.7.gz
-man/man7/DROP_LANGUAGE.7.gz
-man/man7/DROP_MATERIALIZED_VIEW.7.gz
-man/man7/DROP_OPERATOR.7.gz
-man/man7/DROP_OPERATOR_CLASS.7.gz
-man/man7/DROP_OPERATOR_FAMILY.7.gz
-man/man7/DROP_OWNED.7.gz
-man/man7/DROP_POLICY.7.gz
-man/man7/DROP_PROCEDURE.7.gz
-man/man7/DROP_PUBLICATION.7.gz
-man/man7/DROP_ROLE.7.gz
-man/man7/DROP_ROUTINE.7.gz
-man/man7/DROP_RULE.7.gz
-man/man7/DROP_SCHEMA.7.gz
-man/man7/DROP_SEQUENCE.7.gz
-man/man7/DROP_SERVER.7.gz
-man/man7/DROP_STATISTICS.7.gz
-man/man7/DROP_SUBSCRIPTION.7.gz
-man/man7/DROP_TABLE.7.gz
-man/man7/DROP_TABLESPACE.7.gz
-man/man7/DROP_TEXT_SEARCH_CONFIGURATION.7.gz
-man/man7/DROP_TEXT_SEARCH_DICTIONARY.7.gz
-man/man7/DROP_TEXT_SEARCH_PARSER.7.gz
-man/man7/DROP_TEXT_SEARCH_TEMPLATE.7.gz
-man/man7/DROP_TRANSFORM.7.gz
-man/man7/DROP_TRIGGER.7.gz
-man/man7/DROP_TYPE.7.gz
-man/man7/DROP_USER.7.gz
-man/man7/DROP_USER_MAPPING.7.gz
-man/man7/DROP_VIEW.7.gz
-man/man7/END.7.gz
-man/man7/EXECUTE.7.gz
-man/man7/EXPLAIN.7.gz
-man/man7/FETCH.7.gz
-man/man7/GRANT.7.gz
-man/man7/IMPORT_FOREIGN_SCHEMA.7.gz
-man/man7/INSERT.7.gz
-man/man7/LISTEN.7.gz
-man/man7/LOAD.7.gz
-man/man7/LOCK.7.gz
-man/man7/MOVE.7.gz
-man/man7/NOTIFY.7.gz
-man/man7/PREPARE.7.gz
-man/man7/PREPARE_TRANSACTION.7.gz
-man/man7/REASSIGN_OWNED.7.gz
-man/man7/REFRESH_MATERIALIZED_VIEW.7.gz
-man/man7/REINDEX.7.gz
-man/man7/RELEASE_SAVEPOINT.7.gz
-man/man7/RESET.7.gz
-man/man7/REVOKE.7.gz
-man/man7/ROLLBACK.7.gz
-man/man7/ROLLBACK_PREPARED.7.gz
-man/man7/ROLLBACK_TO_SAVEPOINT.7.gz
-man/man7/SAVEPOINT.7.gz
-man/man7/SECURITY_LABEL.7.gz
-man/man7/SELECT.7.gz
-man/man7/SELECT_INTO.7.gz
-man/man7/SET.7.gz
-man/man7/SET_CONSTRAINTS.7.gz
-man/man7/SET_ROLE.7.gz
-man/man7/SET_SESSION_AUTHORIZATION.7.gz
-man/man7/SET_TRANSACTION.7.gz
-man/man7/SHOW.7.gz
-man/man7/START_TRANSACTION.7.gz
-man/man7/TABLE.7.gz
-man/man7/TRUNCATE.7.gz
-man/man7/UNLISTEN.7.gz
-man/man7/UPDATE.7.gz
-man/man7/VACUUM.7.gz
-man/man7/VALUES.7.gz
-man/man7/WITH.7.gz
+share/man/man1/clusterdb.1.gz
+share/man/man1/createdb.1.gz
+share/man/man1/createuser.1.gz
+share/man/man1/dropdb.1.gz
+share/man/man1/dropuser.1.gz
+share/man/man1/ecpg.1.gz
+share/man/man1/initdb.1.gz
+share/man/man1/oid2name.1.gz
+share/man/man1/pg_amcheck.1.gz
+share/man/man1/pg_archivecleanup.1.gz
+share/man/man1/pg_basebackup.1.gz
+share/man/man1/pg_checksums.1.gz
+share/man/man1/pg_config.1.gz
+share/man/man1/pg_controldata.1.gz
+share/man/man1/pg_ctl.1.gz
+share/man/man1/pg_dump.1.gz
+share/man/man1/pg_dumpall.1.gz
+share/man/man1/pg_isready.1.gz
+share/man/man1/pg_receivewal.1.gz
+share/man/man1/pg_recvlogical.1.gz
+share/man/man1/pg_resetwal.1.gz
+share/man/man1/pg_restore.1.gz
+share/man/man1/pg_rewind.1.gz
+share/man/man1/pg_test_fsync.1.gz
+share/man/man1/pg_test_timing.1.gz
+share/man/man1/pg_upgrade.1.gz
+share/man/man1/pg_verifybackup.1.gz
+share/man/man1/pg_waldump.1.gz
+share/man/man1/pgbench.1.gz
+share/man/man1/postgres.1.gz
+share/man/man1/postmaster.1.gz
+share/man/man1/psql.1.gz
+share/man/man1/reindexdb.1.gz
+share/man/man1/vacuumdb.1.gz
+share/man/man1/vacuumlo.1.gz
+share/man/man3/SPI_commit.3.gz
+share/man/man3/SPI_commit_and_chain.3.gz
+share/man/man3/SPI_connect.3.gz
+share/man/man3/SPI_connect_ext.3.gz
+share/man/man3/SPI_copytuple.3.gz
+share/man/man3/SPI_cursor_close.3.gz
+share/man/man3/SPI_cursor_fetch.3.gz
+share/man/man3/SPI_cursor_find.3.gz
+share/man/man3/SPI_cursor_move.3.gz
+share/man/man3/SPI_cursor_open.3.gz
+share/man/man3/SPI_cursor_open_with_args.3.gz
+share/man/man3/SPI_cursor_open_with_paramlist.3.gz
+share/man/man3/SPI_cursor_parse_open.3.gz
+share/man/man3/SPI_exec.3.gz
+share/man/man3/SPI_execp.3.gz
+share/man/man3/SPI_execute.3.gz
+share/man/man3/SPI_execute_extended.3.gz
+share/man/man3/SPI_execute_plan.3.gz
+share/man/man3/SPI_execute_plan_extended.3.gz
+share/man/man3/SPI_execute_plan_with_paramlist.3.gz
+share/man/man3/SPI_execute_with_args.3.gz
+share/man/man3/SPI_finish.3.gz
+share/man/man3/SPI_fname.3.gz
+share/man/man3/SPI_fnumber.3.gz
+share/man/man3/SPI_freeplan.3.gz
+share/man/man3/SPI_freetuple.3.gz
+share/man/man3/SPI_freetuptable.3.gz
+share/man/man3/SPI_getargcount.3.gz
+share/man/man3/SPI_getargtypeid.3.gz
+share/man/man3/SPI_getbinval.3.gz
+share/man/man3/SPI_getnspname.3.gz
+share/man/man3/SPI_getrelname.3.gz
+share/man/man3/SPI_gettype.3.gz
+share/man/man3/SPI_gettypeid.3.gz
+share/man/man3/SPI_getvalue.3.gz
+share/man/man3/SPI_is_cursor_plan.3.gz
+share/man/man3/SPI_keepplan.3.gz
+share/man/man3/SPI_modifytuple.3.gz
+share/man/man3/SPI_palloc.3.gz
+share/man/man3/SPI_pfree.3.gz
+share/man/man3/SPI_prepare.3.gz
+share/man/man3/SPI_prepare_cursor.3.gz
+share/man/man3/SPI_prepare_extended.3.gz
+share/man/man3/SPI_prepare_params.3.gz
+share/man/man3/SPI_register_relation.3.gz
+share/man/man3/SPI_register_trigger_data.3.gz
+share/man/man3/SPI_repalloc.3.gz
+share/man/man3/SPI_result_code_string.3.gz
+share/man/man3/SPI_returntuple.3.gz
+share/man/man3/SPI_rollback.3.gz
+share/man/man3/SPI_rollback_and_chain.3.gz
+share/man/man3/SPI_saveplan.3.gz
+share/man/man3/SPI_scroll_cursor_fetch.3.gz
+share/man/man3/SPI_scroll_cursor_move.3.gz
+share/man/man3/SPI_start_transaction.3.gz
+share/man/man3/SPI_unregister_relation.3.gz
+share/man/man3/dblink.3.gz
+share/man/man3/dblink_build_sql_delete.3.gz
+share/man/man3/dblink_build_sql_insert.3.gz
+share/man/man3/dblink_build_sql_update.3.gz
+share/man/man3/dblink_cancel_query.3.gz
+share/man/man3/dblink_close.3.gz
+share/man/man3/dblink_connect.3.gz
+share/man/man3/dblink_connect_u.3.gz
+share/man/man3/dblink_disconnect.3.gz
+share/man/man3/dblink_error_message.3.gz
+share/man/man3/dblink_exec.3.gz
+share/man/man3/dblink_fetch.3.gz
+share/man/man3/dblink_get_connections.3.gz
+share/man/man3/dblink_get_notify.3.gz
+share/man/man3/dblink_get_pkey.3.gz
+share/man/man3/dblink_get_result.3.gz
+share/man/man3/dblink_is_busy.3.gz
+share/man/man3/dblink_open.3.gz
+share/man/man3/dblink_send_query.3.gz
+share/man/man7/ABORT.7.gz
+share/man/man7/ALTER_AGGREGATE.7.gz
+share/man/man7/ALTER_COLLATION.7.gz
+share/man/man7/ALTER_CONVERSION.7.gz
+share/man/man7/ALTER_DATABASE.7.gz
+share/man/man7/ALTER_DEFAULT_PRIVILEGES.7.gz
+share/man/man7/ALTER_DOMAIN.7.gz
+share/man/man7/ALTER_EVENT_TRIGGER.7.gz
+share/man/man7/ALTER_EXTENSION.7.gz
+share/man/man7/ALTER_FOREIGN_DATA_WRAPPER.7.gz
+share/man/man7/ALTER_FOREIGN_TABLE.7.gz
+share/man/man7/ALTER_FUNCTION.7.gz
+share/man/man7/ALTER_GROUP.7.gz
+share/man/man7/ALTER_INDEX.7.gz
+share/man/man7/ALTER_LANGUAGE.7.gz
+share/man/man7/ALTER_LARGE_OBJECT.7.gz
+share/man/man7/ALTER_MATERIALIZED_VIEW.7.gz
+share/man/man7/ALTER_OPERATOR.7.gz
+share/man/man7/ALTER_OPERATOR_CLASS.7.gz
+share/man/man7/ALTER_OPERATOR_FAMILY.7.gz
+share/man/man7/ALTER_POLICY.7.gz
+share/man/man7/ALTER_PROCEDURE.7.gz
+share/man/man7/ALTER_PUBLICATION.7.gz
+share/man/man7/ALTER_ROLE.7.gz
+share/man/man7/ALTER_ROUTINE.7.gz
+share/man/man7/ALTER_RULE.7.gz
+share/man/man7/ALTER_SCHEMA.7.gz
+share/man/man7/ALTER_SEQUENCE.7.gz
+share/man/man7/ALTER_SERVER.7.gz
+share/man/man7/ALTER_STATISTICS.7.gz
+share/man/man7/ALTER_SUBSCRIPTION.7.gz
+share/man/man7/ALTER_SYSTEM.7.gz
+share/man/man7/ALTER_TABLE.7.gz
+share/man/man7/ALTER_TABLESPACE.7.gz
+share/man/man7/ALTER_TEXT_SEARCH_CONFIGURATION.7.gz
+share/man/man7/ALTER_TEXT_SEARCH_DICTIONARY.7.gz
+share/man/man7/ALTER_TEXT_SEARCH_PARSER.7.gz
+share/man/man7/ALTER_TEXT_SEARCH_TEMPLATE.7.gz
+share/man/man7/ALTER_TRIGGER.7.gz
+share/man/man7/ALTER_TYPE.7.gz
+share/man/man7/ALTER_USER.7.gz
+share/man/man7/ALTER_USER_MAPPING.7.gz
+share/man/man7/ALTER_VIEW.7.gz
+share/man/man7/ANALYZE.7.gz
+share/man/man7/BEGIN.7.gz
+share/man/man7/CALL.7.gz
+share/man/man7/CHECKPOINT.7.gz
+share/man/man7/CLOSE.7.gz
+share/man/man7/CLUSTER.7.gz
+share/man/man7/COMMENT.7.gz
+share/man/man7/COMMIT.7.gz
+share/man/man7/COMMIT_PREPARED.7.gz
+share/man/man7/COPY.7.gz
+share/man/man7/CREATE_ACCESS_METHOD.7.gz
+share/man/man7/CREATE_AGGREGATE.7.gz
+share/man/man7/CREATE_CAST.7.gz
+share/man/man7/CREATE_COLLATION.7.gz
+share/man/man7/CREATE_CONVERSION.7.gz
+share/man/man7/CREATE_DATABASE.7.gz
+share/man/man7/CREATE_DOMAIN.7.gz
+share/man/man7/CREATE_EVENT_TRIGGER.7.gz
+share/man/man7/CREATE_EXTENSION.7.gz
+share/man/man7/CREATE_FOREIGN_DATA_WRAPPER.7.gz
+share/man/man7/CREATE_FOREIGN_TABLE.7.gz
+share/man/man7/CREATE_FUNCTION.7.gz
+share/man/man7/CREATE_GROUP.7.gz
+share/man/man7/CREATE_INDEX.7.gz
+share/man/man7/CREATE_LANGUAGE.7.gz
+share/man/man7/CREATE_MATERIALIZED_VIEW.7.gz
+share/man/man7/CREATE_OPERATOR.7.gz
+share/man/man7/CREATE_OPERATOR_CLASS.7.gz
+share/man/man7/CREATE_OPERATOR_FAMILY.7.gz
+share/man/man7/CREATE_POLICY.7.gz
+share/man/man7/CREATE_PROCEDURE.7.gz
+share/man/man7/CREATE_PUBLICATION.7.gz
+share/man/man7/CREATE_ROLE.7.gz
+share/man/man7/CREATE_RULE.7.gz
+share/man/man7/CREATE_SCHEMA.7.gz
+share/man/man7/CREATE_SEQUENCE.7.gz
+share/man/man7/CREATE_SERVER.7.gz
+share/man/man7/CREATE_STATISTICS.7.gz
+share/man/man7/CREATE_SUBSCRIPTION.7.gz
+share/man/man7/CREATE_TABLE.7.gz
+share/man/man7/CREATE_TABLESPACE.7.gz
+share/man/man7/CREATE_TABLE_AS.7.gz
+share/man/man7/CREATE_TEXT_SEARCH_CONFIGURATION.7.gz
+share/man/man7/CREATE_TEXT_SEARCH_DICTIONARY.7.gz
+share/man/man7/CREATE_TEXT_SEARCH_PARSER.7.gz
+share/man/man7/CREATE_TEXT_SEARCH_TEMPLATE.7.gz
+share/man/man7/CREATE_TRANSFORM.7.gz
+share/man/man7/CREATE_TRIGGER.7.gz
+share/man/man7/CREATE_TYPE.7.gz
+share/man/man7/CREATE_USER.7.gz
+share/man/man7/CREATE_USER_MAPPING.7.gz
+share/man/man7/CREATE_VIEW.7.gz
+share/man/man7/DEALLOCATE.7.gz
+share/man/man7/DECLARE.7.gz
+share/man/man7/DELETE.7.gz
+share/man/man7/DISCARD.7.gz
+share/man/man7/DO.7.gz
+share/man/man7/DROP_ACCESS_METHOD.7.gz
+share/man/man7/DROP_AGGREGATE.7.gz
+share/man/man7/DROP_CAST.7.gz
+share/man/man7/DROP_COLLATION.7.gz
+share/man/man7/DROP_CONVERSION.7.gz
+share/man/man7/DROP_DATABASE.7.gz
+share/man/man7/DROP_DOMAIN.7.gz
+share/man/man7/DROP_EVENT_TRIGGER.7.gz
+share/man/man7/DROP_EXTENSION.7.gz
+share/man/man7/DROP_FOREIGN_DATA_WRAPPER.7.gz
+share/man/man7/DROP_FOREIGN_TABLE.7.gz
+share/man/man7/DROP_FUNCTION.7.gz
+share/man/man7/DROP_GROUP.7.gz
+share/man/man7/DROP_INDEX.7.gz
+share/man/man7/DROP_LANGUAGE.7.gz
+share/man/man7/DROP_MATERIALIZED_VIEW.7.gz
+share/man/man7/DROP_OPERATOR.7.gz
+share/man/man7/DROP_OPERATOR_CLASS.7.gz
+share/man/man7/DROP_OPERATOR_FAMILY.7.gz
+share/man/man7/DROP_OWNED.7.gz
+share/man/man7/DROP_POLICY.7.gz
+share/man/man7/DROP_PROCEDURE.7.gz
+share/man/man7/DROP_PUBLICATION.7.gz
+share/man/man7/DROP_ROLE.7.gz
+share/man/man7/DROP_ROUTINE.7.gz
+share/man/man7/DROP_RULE.7.gz
+share/man/man7/DROP_SCHEMA.7.gz
+share/man/man7/DROP_SEQUENCE.7.gz
+share/man/man7/DROP_SERVER.7.gz
+share/man/man7/DROP_STATISTICS.7.gz
+share/man/man7/DROP_SUBSCRIPTION.7.gz
+share/man/man7/DROP_TABLE.7.gz
+share/man/man7/DROP_TABLESPACE.7.gz
+share/man/man7/DROP_TEXT_SEARCH_CONFIGURATION.7.gz
+share/man/man7/DROP_TEXT_SEARCH_DICTIONARY.7.gz
+share/man/man7/DROP_TEXT_SEARCH_PARSER.7.gz
+share/man/man7/DROP_TEXT_SEARCH_TEMPLATE.7.gz
+share/man/man7/DROP_TRANSFORM.7.gz
+share/man/man7/DROP_TRIGGER.7.gz
+share/man/man7/DROP_TYPE.7.gz
+share/man/man7/DROP_USER.7.gz
+share/man/man7/DROP_USER_MAPPING.7.gz
+share/man/man7/DROP_VIEW.7.gz
+share/man/man7/END.7.gz
+share/man/man7/EXECUTE.7.gz
+share/man/man7/EXPLAIN.7.gz
+share/man/man7/FETCH.7.gz
+share/man/man7/GRANT.7.gz
+share/man/man7/IMPORT_FOREIGN_SCHEMA.7.gz
+share/man/man7/INSERT.7.gz
+share/man/man7/LISTEN.7.gz
+share/man/man7/LOAD.7.gz
+share/man/man7/LOCK.7.gz
+share/man/man7/MOVE.7.gz
+share/man/man7/NOTIFY.7.gz
+share/man/man7/PREPARE.7.gz
+share/man/man7/PREPARE_TRANSACTION.7.gz
+share/man/man7/REASSIGN_OWNED.7.gz
+share/man/man7/REFRESH_MATERIALIZED_VIEW.7.gz
+share/man/man7/REINDEX.7.gz
+share/man/man7/RELEASE_SAVEPOINT.7.gz
+share/man/man7/RESET.7.gz
+share/man/man7/REVOKE.7.gz
+share/man/man7/ROLLBACK.7.gz
+share/man/man7/ROLLBACK_PREPARED.7.gz
+share/man/man7/ROLLBACK_TO_SAVEPOINT.7.gz
+share/man/man7/SAVEPOINT.7.gz
+share/man/man7/SECURITY_LABEL.7.gz
+share/man/man7/SELECT.7.gz
+share/man/man7/SELECT_INTO.7.gz
+share/man/man7/SET.7.gz
+share/man/man7/SET_CONSTRAINTS.7.gz
+share/man/man7/SET_ROLE.7.gz
+share/man/man7/SET_SESSION_AUTHORIZATION.7.gz
+share/man/man7/SET_TRANSACTION.7.gz
+share/man/man7/SHOW.7.gz
+share/man/man7/START_TRANSACTION.7.gz
+share/man/man7/TABLE.7.gz
+share/man/man7/TRUNCATE.7.gz
+share/man/man7/UNLISTEN.7.gz
+share/man/man7/UPDATE.7.gz
+share/man/man7/VACUUM.7.gz
+share/man/man7/VALUES.7.gz
+share/man/man7/WITH.7.gz
 %%PORTDOCS%%%%DOCSDIR%%/README-client
-%%NLS%%share/locale/cs/LC_MESSAGES/ecpg-14.mo
-%%NLS%%share/locale/cs/LC_MESSAGES/ecpglib6-14.mo
-%%NLS%%share/locale/cs/LC_MESSAGES/libpq5-14.mo
-%%NLS%%share/locale/cs/LC_MESSAGES/pg_config-14.mo
-%%NLS%%share/locale/cs/LC_MESSAGES/pg_dump-14.mo
-%%NLS%%share/locale/cs/LC_MESSAGES/pgscripts-14.mo
-%%NLS%%share/locale/cs/LC_MESSAGES/psql-14.mo
-%%NLS%%share/locale/de/LC_MESSAGES/ecpg-14.mo
-%%NLS%%share/locale/de/LC_MESSAGES/ecpglib6-14.mo
-%%NLS%%share/locale/de/LC_MESSAGES/libpq5-14.mo
-%%NLS%%share/locale/de/LC_MESSAGES/pg_config-14.mo
-%%NLS%%share/locale/de/LC_MESSAGES/pg_dump-14.mo
-%%NLS%%share/locale/de/LC_MESSAGES/pgscripts-14.mo
-%%NLS%%share/locale/de/LC_MESSAGES/psql-14.mo
-%%NLS%%share/locale/el/LC_MESSAGES/libpq5-14.mo
-%%NLS%%share/locale/el/LC_MESSAGES/pg_config-14.mo
-%%NLS%%share/locale/el/LC_MESSAGES/pg_dump-14.mo
-%%NLS%%share/locale/el/LC_MESSAGES/psql-14.mo
-%%NLS%%share/locale/es/LC_MESSAGES/ecpg-14.mo
-%%NLS%%share/locale/es/LC_MESSAGES/ecpglib6-14.mo
-%%NLS%%share/locale/es/LC_MESSAGES/libpq5-14.mo
-%%NLS%%share/locale/es/LC_MESSAGES/pg_config-14.mo
-%%NLS%%share/locale/es/LC_MESSAGES/pg_dump-14.mo
-%%NLS%%share/locale/es/LC_MESSAGES/pgscripts-14.mo
-%%NLS%%share/locale/es/LC_MESSAGES/psql-14.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/ecpg-14.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/ecpglib6-14.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/libpq5-14.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/pg_config-14.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/pg_dump-14.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/pgscripts-14.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/psql-14.mo
-%%NLS%%share/locale/he/LC_MESSAGES/libpq5-14.mo
-%%NLS%%share/locale/he/LC_MESSAGES/pg_config-14.mo
-%%NLS%%share/locale/he/LC_MESSAGES/pg_dump-14.mo
-%%NLS%%share/locale/he/LC_MESSAGES/pgscripts-14.mo
-%%NLS%%share/locale/he/LC_MESSAGES/psql-14.mo
-%%NLS%%share/locale/it/LC_MESSAGES/ecpg-14.mo
-%%NLS%%share/locale/it/LC_MESSAGES/ecpglib6-14.mo
-%%NLS%%share/locale/it/LC_MESSAGES/libpq5-14.mo
-%%NLS%%share/locale/it/LC_MESSAGES/pg_config-14.mo
-%%NLS%%share/locale/it/LC_MESSAGES/pg_dump-14.mo
-%%NLS%%share/locale/it/LC_MESSAGES/pgscripts-14.mo
-%%NLS%%share/locale/it/LC_MESSAGES/psql-14.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/ecpg-14.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/ecpglib6-14.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/libpq5-14.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/pg_config-14.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/pg_dump-14.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/pgscripts-14.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/psql-14.mo
-%%NLS%%share/locale/ko/LC_MESSAGES/ecpg-14.mo
-%%NLS%%share/locale/ko/LC_MESSAGES/ecpglib6-14.mo
-%%NLS%%share/locale/ko/LC_MESSAGES/libpq5-14.mo
-%%NLS%%share/locale/ko/LC_MESSAGES/pg_config-14.mo
-%%NLS%%share/locale/ko/LC_MESSAGES/pg_dump-14.mo
-%%NLS%%share/locale/ko/LC_MESSAGES/pgscripts-14.mo
-%%NLS%%share/locale/ko/LC_MESSAGES/psql-14.mo
-%%NLS%%share/locale/nb/LC_MESSAGES/pg_config-14.mo
-%%NLS%%share/locale/pl/LC_MESSAGES/ecpg-14.mo
-%%NLS%%share/locale/pl/LC_MESSAGES/ecpglib6-14.mo
-%%NLS%%share/locale/pl/LC_MESSAGES/libpq5-14.mo
-%%NLS%%share/locale/pl/LC_MESSAGES/pg_config-14.mo
-%%NLS%%share/locale/pl/LC_MESSAGES/pg_dump-14.mo
-%%NLS%%share/locale/pl/LC_MESSAGES/pgscripts-14.mo
-%%NLS%%share/locale/pl/LC_MESSAGES/psql-14.mo
-%%NLS%%share/locale/pt_BR/LC_MESSAGES/ecpg-14.mo
-%%NLS%%share/locale/pt_BR/LC_MESSAGES/ecpglib6-14.mo
-%%NLS%%share/locale/pt_BR/LC_MESSAGES/libpq5-14.mo
-%%NLS%%share/locale/pt_BR/LC_MESSAGES/pg_config-14.mo
-%%NLS%%share/locale/pt_BR/LC_MESSAGES/pg_dump-14.mo
-%%NLS%%share/locale/pt_BR/LC_MESSAGES/pgscripts-14.mo
-%%NLS%%share/locale/pt_BR/LC_MESSAGES/psql-14.mo
-%%NLS%%share/locale/ro/LC_MESSAGES/pg_config-14.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/ecpg-14.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/ecpglib6-14.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/libpq5-14.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/pg_config-14.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/pg_dump-14.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/pgscripts-14.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/psql-14.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/ecpg-14.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/ecpglib6-14.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/libpq5-14.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/pg_config-14.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/pg_dump-14.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/pgscripts-14.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/psql-14.mo
-%%NLS%%share/locale/ta/LC_MESSAGES/pg_config-14.mo
-%%NLS%%share/locale/tr/LC_MESSAGES/ecpg-14.mo
-%%NLS%%share/locale/tr/LC_MESSAGES/ecpglib6-14.mo
-%%NLS%%share/locale/tr/LC_MESSAGES/libpq5-14.mo
-%%NLS%%share/locale/tr/LC_MESSAGES/pg_config-14.mo
-%%NLS%%share/locale/tr/LC_MESSAGES/pg_dump-14.mo
-%%NLS%%share/locale/tr/LC_MESSAGES/pgscripts-14.mo
-%%NLS%%share/locale/tr/LC_MESSAGES/psql-14.mo
-%%NLS%%share/locale/uk/LC_MESSAGES/ecpg-14.mo
-%%NLS%%share/locale/uk/LC_MESSAGES/ecpglib6-14.mo
-%%NLS%%share/locale/uk/LC_MESSAGES/libpq5-14.mo
-%%NLS%%share/locale/uk/LC_MESSAGES/pg_config-14.mo
-%%NLS%%share/locale/uk/LC_MESSAGES/pg_dump-14.mo
-%%NLS%%share/locale/uk/LC_MESSAGES/pgscripts-14.mo
-%%NLS%%share/locale/uk/LC_MESSAGES/psql-14.mo
-%%NLS%%share/locale/vi/LC_MESSAGES/ecpg-14.mo
-%%NLS%%share/locale/vi/LC_MESSAGES/ecpglib6-14.mo
-%%NLS%%share/locale/vi/LC_MESSAGES/pg_config-14.mo
-%%NLS%%share/locale/zh_CN/LC_MESSAGES/ecpg-14.mo
-%%NLS%%share/locale/zh_CN/LC_MESSAGES/ecpglib6-14.mo
-%%NLS%%share/locale/zh_CN/LC_MESSAGES/libpq5-14.mo
-%%NLS%%share/locale/zh_CN/LC_MESSAGES/pg_config-14.mo
-%%NLS%%share/locale/zh_CN/LC_MESSAGES/pg_dump-14.mo
-%%NLS%%share/locale/zh_CN/LC_MESSAGES/pgscripts-14.mo
-%%NLS%%share/locale/zh_CN/LC_MESSAGES/psql-14.mo
-%%NLS%%share/locale/zh_TW/LC_MESSAGES/ecpg-14.mo
-%%NLS%%share/locale/zh_TW/LC_MESSAGES/libpq5-14.mo
-%%NLS%%share/locale/zh_TW/LC_MESSAGES/pg_config-14.mo
-%%NLS%%share/locale/zh_TW/LC_MESSAGES/psql-14.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/ecpg-%%PG_VERSION%%.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/ecpglib6-%%PG_VERSION%%.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/libpq5-%%PG_VERSION%%.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/pg_config-%%PG_VERSION%%.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/pg_dump-%%PG_VERSION%%.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/pgscripts-%%PG_VERSION%%.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/psql-%%PG_VERSION%%.mo
+%%NLS%%share/locale/de/LC_MESSAGES/ecpg-%%PG_VERSION%%.mo
+%%NLS%%share/locale/de/LC_MESSAGES/ecpglib6-%%PG_VERSION%%.mo
+%%NLS%%share/locale/de/LC_MESSAGES/libpq5-%%PG_VERSION%%.mo
+%%NLS%%share/locale/de/LC_MESSAGES/pg_amcheck-%%PG_VERSION%%.mo
+%%NLS%%share/locale/de/LC_MESSAGES/pg_config-%%PG_VERSION%%.mo
+%%NLS%%share/locale/de/LC_MESSAGES/pg_dump-%%PG_VERSION%%.mo
+%%NLS%%share/locale/de/LC_MESSAGES/pgscripts-%%PG_VERSION%%.mo
+%%NLS%%share/locale/de/LC_MESSAGES/psql-%%PG_VERSION%%.mo
+%%NLS%%share/locale/el/LC_MESSAGES/ecpg-%%PG_VERSION%%.mo
+%%NLS%%share/locale/el/LC_MESSAGES/ecpglib6-%%PG_VERSION%%.mo
+%%NLS%%share/locale/el/LC_MESSAGES/libpq5-%%PG_VERSION%%.mo
+%%NLS%%share/locale/el/LC_MESSAGES/pg_amcheck-%%PG_VERSION%%.mo
+%%NLS%%share/locale/el/LC_MESSAGES/pg_config-%%PG_VERSION%%.mo
+%%NLS%%share/locale/el/LC_MESSAGES/pg_dump-%%PG_VERSION%%.mo
+%%NLS%%share/locale/el/LC_MESSAGES/pgscripts-%%PG_VERSION%%.mo
+%%NLS%%share/locale/el/LC_MESSAGES/psql-%%PG_VERSION%%.mo
+%%NLS%%share/locale/es/LC_MESSAGES/ecpg-%%PG_VERSION%%.mo
+%%NLS%%share/locale/es/LC_MESSAGES/ecpglib6-%%PG_VERSION%%.mo
+%%NLS%%share/locale/es/LC_MESSAGES/libpq5-%%PG_VERSION%%.mo
+%%NLS%%share/locale/es/LC_MESSAGES/pg_amcheck-%%PG_VERSION%%.mo
+%%NLS%%share/locale/es/LC_MESSAGES/pg_config-%%PG_VERSION%%.mo
+%%NLS%%share/locale/es/LC_MESSAGES/pg_dump-%%PG_VERSION%%.mo
+%%NLS%%share/locale/es/LC_MESSAGES/pgscripts-%%PG_VERSION%%.mo
+%%NLS%%share/locale/es/LC_MESSAGES/psql-%%PG_VERSION%%.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/ecpg-%%PG_VERSION%%.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/ecpglib6-%%PG_VERSION%%.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/libpq5-%%PG_VERSION%%.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/pg_amcheck-%%PG_VERSION%%.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/pg_config-%%PG_VERSION%%.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/pg_dump-%%PG_VERSION%%.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/pgscripts-%%PG_VERSION%%.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/psql-%%PG_VERSION%%.mo
+%%NLS%%share/locale/he/LC_MESSAGES/pg_config-%%PG_VERSION%%.mo
+%%NLS%%share/locale/it/LC_MESSAGES/ecpg-%%PG_VERSION%%.mo
+%%NLS%%share/locale/it/LC_MESSAGES/ecpglib6-%%PG_VERSION%%.mo
+%%NLS%%share/locale/it/LC_MESSAGES/pg_config-%%PG_VERSION%%.mo
+%%NLS%%share/locale/it/LC_MESSAGES/psql-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/ecpg-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/ecpglib6-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/libpq5-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/pg_amcheck-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/pg_config-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/pg_dump-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/pgscripts-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/psql-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/ecpg-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/ecpglib6-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/libpq5-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/pg_config-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/pg_dump-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/pgscripts-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/psql-%%PG_VERSION%%.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/ecpg-%%PG_VERSION%%.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/ecpglib6-%%PG_VERSION%%.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/pg_config-%%PG_VERSION%%.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/ecpg-%%PG_VERSION%%.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/ecpglib6-%%PG_VERSION%%.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/pg_config-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/ecpg-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/ecpglib6-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/libpq5-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/pg_amcheck-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/pg_config-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/pg_dump-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/pgscripts-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/psql-%%PG_VERSION%%.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/ecpg-%%PG_VERSION%%.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/ecpglib6-%%PG_VERSION%%.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/libpq5-%%PG_VERSION%%.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/pg_amcheck-%%PG_VERSION%%.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/pg_config-%%PG_VERSION%%.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/pg_dump-%%PG_VERSION%%.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/pgscripts-%%PG_VERSION%%.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/psql-%%PG_VERSION%%.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/ecpg-%%PG_VERSION%%.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/ecpglib6-%%PG_VERSION%%.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/pg_config-%%PG_VERSION%%.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/pg_dump-%%PG_VERSION%%.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/pgscripts-%%PG_VERSION%%.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/psql-%%PG_VERSION%%.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/ecpg-%%PG_VERSION%%.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/ecpglib6-%%PG_VERSION%%.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/libpq5-%%PG_VERSION%%.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/pg_amcheck-%%PG_VERSION%%.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/pg_config-%%PG_VERSION%%.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/pg_dump-%%PG_VERSION%%.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/pgscripts-%%PG_VERSION%%.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/psql-%%PG_VERSION%%.mo
+%%NLS%%share/locale/vi/LC_MESSAGES/ecpg-%%PG_VERSION%%.mo
+%%NLS%%share/locale/vi/LC_MESSAGES/ecpglib6-%%PG_VERSION%%.mo
+%%NLS%%share/locale/vi/LC_MESSAGES/pg_config-%%PG_VERSION%%.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/ecpg-%%PG_VERSION%%.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/ecpglib6-%%PG_VERSION%%.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/libpq5-%%PG_VERSION%%.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/pg_amcheck-%%PG_VERSION%%.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/pg_config-%%PG_VERSION%%.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/pg_dump-%%PG_VERSION%%.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/pgscripts-%%PG_VERSION%%.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/psql-%%PG_VERSION%%.mo
+%%NLS%%share/locale/zh_TW/LC_MESSAGES/ecpg-%%PG_VERSION%%.mo
 %%DATADIR%%/pg_service.conf.sample
 %%DATADIR%%/psqlrc.sample
diff --git a/databases/postgresql14-server/pkg-plist-plperl b/databases/postgresql14-server/pkg-plist-plperl
index 865e061d1efc..d2b1c7fd3143 100644
--- a/databases/postgresql14-server/pkg-plist-plperl
+++ b/databases/postgresql14-server/pkg-plist-plperl
@@ -1,5 +1,6 @@
 include/postgresql/server/plperl.h
 include/postgresql/server/plperl_helpers.h
+include/postgresql/server/plperl_system.h
 include/postgresql/server/ppport.h
 %%DATADIR%%/extension/plperlu--1.0.sql
 %%DATADIR%%/extension/plperl.control
diff --git a/databases/postgresql14-server/pkg-plist-plpython b/databases/postgresql14-server/pkg-plist-plpython
index c7e8217d6332..6ae61647b4c7 100644
--- a/databases/postgresql14-server/pkg-plist-plpython
+++ b/databases/postgresql14-server/pkg-plist-plpython
@@ -11,6 +11,7 @@ include/postgresql/server/plpy_subxactobject.h
 include/postgresql/server/plpy_typeio.h
 include/postgresql/server/plpy_util.h
 include/postgresql/server/plpython.h
+include/postgresql/server/plpython_system.h
 lib/postgresql/pgxs/src/pl/plpython/regress-python3-mangle.mk
 %%DOCSDIR%%/README-plpython
 %%PYTHON2%%lib/postgresql/plpython2.so
diff --git a/databases/postgresql14-server/pkg-plist-server b/databases/postgresql14-server/pkg-plist-server
index f500adab3972..15de69ff20f5 100644
--- a/databases/postgresql14-server/pkg-plist-server
+++ b/databases/postgresql14-server/pkg-plist-server
@@ -737,6 +737,7 @@ lib/postgresql/utf8_and_win.so
 %%LLVM%%lib/postgresql/bitcode/postgres/utils/mmgr/slab.bc
 %%LLVM%%lib/postgresql/bitcode/postgres/utils/resowner/resowner.bc
 %%LLVM%%lib/postgresql/bitcode/postgres/utils/sort/logtape.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/sort/qsort_interruptible.bc
 %%LLVM%%lib/postgresql/bitcode/postgres/utils/sort/sharedtuplestore.bc
 %%LLVM%%lib/postgresql/bitcode/postgres/utils/sort/sortsupport.bc
 %%LLVM%%lib/postgresql/bitcode/postgres/utils/sort/tuplesort.bc
@@ -759,210 +760,174 @@ lib/postgresql/utf8_and_win.so
 %%DATADIR%%/system_constraints.sql
 %%DATADIR%%/system_functions.sql
 %%DATADIR%%/system_views.sql
-%%NLS%%share/locale/cs/LC_MESSAGES/initdb-14.mo
-%%NLS%%share/locale/cs/LC_MESSAGES/pg_archivecleanup-14.mo
-%%NLS%%share/locale/cs/LC_MESSAGES/pg_basebackup-14.mo
-%%NLS%%share/locale/cs/LC_MESSAGES/pg_checksums-14.mo
-%%NLS%%share/locale/cs/LC_MESSAGES/pg_controldata-14.mo
-%%NLS%%share/locale/cs/LC_MESSAGES/pg_ctl-14.mo
-%%NLS%%share/locale/cs/LC_MESSAGES/pg_resetwal-14.mo
-%%NLS%%share/locale/cs/LC_MESSAGES/pg_rewind-14.mo
-%%NLS%%share/locale/cs/LC_MESSAGES/pg_test_fsync-14.mo
-%%NLS%%share/locale/cs/LC_MESSAGES/pg_test_timing-14.mo
-%%NLS%%share/locale/cs/LC_MESSAGES/pg_upgrade-14.mo
-%%NLS%%share/locale/cs/LC_MESSAGES/pg_waldump-14.mo
-%%NLS%%share/locale/cs/LC_MESSAGES/plpgsql-14.mo
-%%NLS%%share/locale/de/LC_MESSAGES/initdb-14.mo
-%%NLS%%share/locale/de/LC_MESSAGES/pg_archivecleanup-14.mo
-%%NLS%%share/locale/de/LC_MESSAGES/pg_basebackup-14.mo
-%%NLS%%share/locale/de/LC_MESSAGES/pg_checksums-14.mo
-%%NLS%%share/locale/de/LC_MESSAGES/pg_controldata-14.mo
-%%NLS%%share/locale/de/LC_MESSAGES/pg_ctl-14.mo
-%%NLS%%share/locale/de/LC_MESSAGES/pg_resetwal-14.mo
-%%NLS%%share/locale/de/LC_MESSAGES/pg_rewind-14.mo
-%%NLS%%share/locale/de/LC_MESSAGES/pg_test_fsync-14.mo
-%%NLS%%share/locale/de/LC_MESSAGES/pg_test_timing-14.mo
-%%NLS%%share/locale/de/LC_MESSAGES/pg_upgrade-14.mo
-%%NLS%%share/locale/de/LC_MESSAGES/pg_waldump-14.mo
-%%NLS%%share/locale/de/LC_MESSAGES/plpgsql-14.mo
-%%NLS%%share/locale/de/LC_MESSAGES/postgres-14.mo
-%%NLS%%share/locale/el/LC_MESSAGES/initdb-14.mo
-%%NLS%%share/locale/el/LC_MESSAGES/pg_archivecleanup-14.mo
-%%NLS%%share/locale/el/LC_MESSAGES/pg_checksums-14.mo
-%%NLS%%share/locale/el/LC_MESSAGES/pg_controldata-14.mo
-%%NLS%%share/locale/el/LC_MESSAGES/pg_ctl-14.mo
-%%NLS%%share/locale/el/LC_MESSAGES/pg_resetwal-14.mo
-%%NLS%%share/locale/el/LC_MESSAGES/pg_rewind-14.mo
-%%NLS%%share/locale/el/LC_MESSAGES/pg_test_fsync-14.mo
-%%NLS%%share/locale/el/LC_MESSAGES/pg_test_timing-14.mo
-%%NLS%%share/locale/el/LC_MESSAGES/pg_waldump-14.mo
-%%NLS%%share/locale/es/LC_MESSAGES/initdb-14.mo
-%%NLS%%share/locale/es/LC_MESSAGES/pg_archivecleanup-14.mo
-%%NLS%%share/locale/es/LC_MESSAGES/pg_basebackup-14.mo
-%%NLS%%share/locale/es/LC_MESSAGES/pg_checksums-14.mo
-%%NLS%%share/locale/es/LC_MESSAGES/pg_controldata-14.mo
-%%NLS%%share/locale/es/LC_MESSAGES/pg_ctl-14.mo
-%%NLS%%share/locale/es/LC_MESSAGES/pg_resetwal-14.mo
-%%NLS%%share/locale/es/LC_MESSAGES/pg_rewind-14.mo
-%%NLS%%share/locale/es/LC_MESSAGES/pg_test_fsync-14.mo
-%%NLS%%share/locale/es/LC_MESSAGES/pg_test_timing-14.mo
-%%NLS%%share/locale/es/LC_MESSAGES/pg_upgrade-14.mo
-%%NLS%%share/locale/es/LC_MESSAGES/pg_waldump-14.mo
-%%NLS%%share/locale/es/LC_MESSAGES/plpgsql-14.mo
-%%NLS%%share/locale/es/LC_MESSAGES/postgres-14.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/initdb-14.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/pg_archivecleanup-14.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/pg_basebackup-14.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/pg_checksums-14.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/pg_controldata-14.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/pg_ctl-14.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/pg_resetwal-14.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/pg_rewind-14.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/pg_test_fsync-14.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/pg_test_timing-14.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/pg_upgrade-14.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/pg_waldump-14.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/plpgsql-14.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/postgres-14.mo
-%%NLS%%share/locale/he/LC_MESSAGES/initdb-14.mo
-%%NLS%%share/locale/he/LC_MESSAGES/pg_basebackup-14.mo
-%%NLS%%share/locale/he/LC_MESSAGES/pg_ctl-14.mo
-%%NLS%%share/locale/id/LC_MESSAGES/%%PG_USER%%-14.mo
-%%NLS%%share/locale/it/LC_MESSAGES/initdb-14.mo
-%%NLS%%share/locale/it/LC_MESSAGES/pg_basebackup-14.mo
-%%NLS%%share/locale/it/LC_MESSAGES/pg_controldata-14.mo
-%%NLS%%share/locale/it/LC_MESSAGES/pg_ctl-14.mo
-%%NLS%%share/locale/it/LC_MESSAGES/pg_resetwal-14.mo
-%%NLS%%share/locale/it/LC_MESSAGES/pg_rewind-14.mo
-%%NLS%%share/locale/it/LC_MESSAGES/plpgsql-14.mo
-%%NLS%%share/locale/it/LC_MESSAGES/postgres-14.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/initdb-14.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/pg_archivecleanup-14.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/pg_basebackup-14.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/pg_checksums-14.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/pg_controldata-14.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/pg_ctl-14.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/pg_resetwal-14.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/pg_rewind-14.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/pg_test_fsync-14.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/pg_test_timing-14.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/pg_upgrade-14.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/pg_waldump-14.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/plpgsql-14.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/postgres-14.mo
-%%NLS%%share/locale/ko/LC_MESSAGES/initdb-14.mo
-%%NLS%%share/locale/ko/LC_MESSAGES/pg_archivecleanup-14.mo
-%%NLS%%share/locale/ko/LC_MESSAGES/pg_basebackup-14.mo
-%%NLS%%share/locale/ko/LC_MESSAGES/pg_checksums-14.mo
-%%NLS%%share/locale/ko/LC_MESSAGES/pg_controldata-14.mo
-%%NLS%%share/locale/ko/LC_MESSAGES/pg_ctl-14.mo
-%%NLS%%share/locale/ko/LC_MESSAGES/pg_resetwal-14.mo
-%%NLS%%share/locale/ko/LC_MESSAGES/pg_rewind-14.mo
-%%NLS%%share/locale/ko/LC_MESSAGES/pg_test_fsync-14.mo
-%%NLS%%share/locale/ko/LC_MESSAGES/pg_test_timing-14.mo
-%%NLS%%share/locale/ko/LC_MESSAGES/pg_upgrade-14.mo
-%%NLS%%share/locale/ko/LC_MESSAGES/pg_waldump-14.mo
-%%NLS%%share/locale/ko/LC_MESSAGES/plpgsql-14.mo
-%%NLS%%share/locale/ko/LC_MESSAGES/postgres-14.mo
-%%NLS%%share/locale/pl/LC_MESSAGES/%%PG_USER%%-14.mo
-%%NLS%%share/locale/pl/LC_MESSAGES/initdb-14.mo
-%%NLS%%share/locale/pl/LC_MESSAGES/pg_archivecleanup-14.mo
-%%NLS%%share/locale/pl/LC_MESSAGES/pg_basebackup-14.mo
-%%NLS%%share/locale/pl/LC_MESSAGES/pg_controldata-14.mo
-%%NLS%%share/locale/pl/LC_MESSAGES/pg_ctl-14.mo
-%%NLS%%share/locale/pl/LC_MESSAGES/pg_resetwal-14.mo
-%%NLS%%share/locale/pl/LC_MESSAGES/pg_rewind-14.mo
-%%NLS%%share/locale/pl/LC_MESSAGES/pg_test_fsync-14.mo
-%%NLS%%share/locale/pl/LC_MESSAGES/pg_test_timing-14.mo
-%%NLS%%share/locale/pl/LC_MESSAGES/plpgsql-14.mo
-%%NLS%%share/locale/pt_BR/LC_MESSAGES/%%PG_USER%%-14.mo
-%%NLS%%share/locale/pt_BR/LC_MESSAGES/initdb-14.mo
-%%NLS%%share/locale/pt_BR/LC_MESSAGES/pg_basebackup-14.mo
-%%NLS%%share/locale/pt_BR/LC_MESSAGES/pg_controldata-14.mo
-%%NLS%%share/locale/pt_BR/LC_MESSAGES/pg_ctl-14.mo
-%%NLS%%share/locale/pt_BR/LC_MESSAGES/pg_resetwal-14.mo
-%%NLS%%share/locale/pt_BR/LC_MESSAGES/pg_rewind-14.mo
-%%NLS%%share/locale/pt_BR/LC_MESSAGES/plpgsql-14.mo
-%%NLS%%share/locale/ro/LC_MESSAGES/plpgsql-14.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/initdb-14.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/pg_archivecleanup-14.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/pg_basebackup-14.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/pg_checksums-14.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/pg_controldata-14.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/pg_ctl-14.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/pg_resetwal-14.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/pg_rewind-14.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/pg_test_fsync-14.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/pg_test_timing-14.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/pg_upgrade-14.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/pg_waldump-14.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/plpgsql-14.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/postgres-14.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/initdb-14.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/pg_archivecleanup-14.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/pg_basebackup-14.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/pg_checksums-14.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/pg_controldata-14.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/pg_ctl-14.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/pg_resetwal-14.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/pg_rewind-14.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/pg_test_fsync-14.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/pg_test_timing-14.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/pg_upgrade-14.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/pg_waldump-14.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/plpgsql-14.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/postgres-14.mo
-%%NLS%%share/locale/tr/LC_MESSAGES/initdb-14.mo
-%%NLS%%share/locale/tr/LC_MESSAGES/pg_archivecleanup-14.mo
-%%NLS%%share/locale/tr/LC_MESSAGES/pg_basebackup-14.mo
-%%NLS%%share/locale/tr/LC_MESSAGES/pg_checksums-14.mo
-%%NLS%%share/locale/tr/LC_MESSAGES/pg_controldata-14.mo
-%%NLS%%share/locale/tr/LC_MESSAGES/pg_ctl-14.mo
-%%NLS%%share/locale/tr/LC_MESSAGES/pg_resetwal-14.mo
-%%NLS%%share/locale/tr/LC_MESSAGES/pg_rewind-14.mo
-%%NLS%%share/locale/tr/LC_MESSAGES/pg_test_fsync-14.mo
-%%NLS%%share/locale/tr/LC_MESSAGES/pg_test_timing-14.mo
-%%NLS%%share/locale/tr/LC_MESSAGES/pg_upgrade-14.mo
-%%NLS%%share/locale/tr/LC_MESSAGES/pg_waldump-14.mo
-%%NLS%%share/locale/tr/LC_MESSAGES/plpgsql-14.mo
-%%NLS%%share/locale/tr/LC_MESSAGES/postgres-14.mo
-%%NLS%%share/locale/uk/LC_MESSAGES/initdb-14.mo
-%%NLS%%share/locale/uk/LC_MESSAGES/pg_archivecleanup-14.mo
-%%NLS%%share/locale/uk/LC_MESSAGES/pg_basebackup-14.mo
-%%NLS%%share/locale/uk/LC_MESSAGES/pg_checksums-14.mo
-%%NLS%%share/locale/uk/LC_MESSAGES/pg_controldata-14.mo
-%%NLS%%share/locale/uk/LC_MESSAGES/pg_ctl-14.mo
-%%NLS%%share/locale/uk/LC_MESSAGES/pg_resetwal-14.mo
-%%NLS%%share/locale/uk/LC_MESSAGES/pg_rewind-14.mo
-%%NLS%%share/locale/uk/LC_MESSAGES/pg_test_fsync-14.mo
-%%NLS%%share/locale/uk/LC_MESSAGES/pg_test_timing-14.mo
-%%NLS%%share/locale/uk/LC_MESSAGES/pg_upgrade-14.mo
-%%NLS%%share/locale/uk/LC_MESSAGES/pg_waldump-14.mo
-%%NLS%%share/locale/uk/LC_MESSAGES/plpgsql-14.mo
-%%NLS%%share/locale/uk/LC_MESSAGES/postgres-14.mo
-%%NLS%%share/locale/vi/LC_MESSAGES/initdb-14.mo
-%%NLS%%share/locale/vi/LC_MESSAGES/pg_archivecleanup-14.mo
-%%NLS%%share/locale/vi/LC_MESSAGES/pg_basebackup-14.mo
-%%NLS%%share/locale/vi/LC_MESSAGES/pg_controldata-14.mo
-%%NLS%%share/locale/vi/LC_MESSAGES/pg_test_fsync-14.mo
-%%NLS%%share/locale/vi/LC_MESSAGES/pg_test_timing-14.mo
-%%NLS%%share/locale/vi/LC_MESSAGES/pg_waldump-14.mo
-%%NLS%%share/locale/vi/LC_MESSAGES/plpgsql-14.mo
-%%NLS%%share/locale/zh_CN/LC_MESSAGES/initdb-14.mo
-%%NLS%%share/locale/zh_CN/LC_MESSAGES/pg_archivecleanup-14.mo
-%%NLS%%share/locale/zh_CN/LC_MESSAGES/pg_basebackup-14.mo
-%%NLS%%share/locale/zh_CN/LC_MESSAGES/pg_checksums-14.mo
-%%NLS%%share/locale/zh_CN/LC_MESSAGES/pg_controldata-14.mo
-%%NLS%%share/locale/zh_CN/LC_MESSAGES/pg_ctl-14.mo
-%%NLS%%share/locale/zh_CN/LC_MESSAGES/pg_resetwal-14.mo
-%%NLS%%share/locale/zh_CN/LC_MESSAGES/pg_rewind-14.mo
-%%NLS%%share/locale/zh_CN/LC_MESSAGES/pg_test_fsync-14.mo
-%%NLS%%share/locale/zh_CN/LC_MESSAGES/pg_test_timing-14.mo
-%%NLS%%share/locale/zh_CN/LC_MESSAGES/pg_upgrade-14.mo
-%%NLS%%share/locale/zh_CN/LC_MESSAGES/pg_waldump-14.mo
-%%NLS%%share/locale/zh_CN/LC_MESSAGES/plpgsql-14.mo
-%%NLS%%share/locale/zh_CN/LC_MESSAGES/postgres-14.mo
-%%NLS%%share/locale/zh_TW/LC_MESSAGES/plpgsql-14.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/initdb-%%PG_VERSION%%.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/pg_archivecleanup-%%PG_VERSION%%.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/pg_basebackup-%%PG_VERSION%%.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/pg_checksums-%%PG_VERSION%%.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/pg_controldata-%%PG_VERSION%%.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/pg_ctl-%%PG_VERSION%%.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/pg_resetwal-%%PG_VERSION%%.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/pg_rewind-%%PG_VERSION%%.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/pg_test_fsync-%%PG_VERSION%%.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/pg_upgrade-%%PG_VERSION%%.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/pg_waldump-%%PG_VERSION%%.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/plpgsql-%%PG_VERSION%%.mo
+%%NLS%%share/locale/de/LC_MESSAGES/initdb-%%PG_VERSION%%.mo
+%%NLS%%share/locale/de/LC_MESSAGES/pg_archivecleanup-%%PG_VERSION%%.mo
+%%NLS%%share/locale/de/LC_MESSAGES/pg_basebackup-%%PG_VERSION%%.mo
+%%NLS%%share/locale/de/LC_MESSAGES/pg_checksums-%%PG_VERSION%%.mo
+%%NLS%%share/locale/de/LC_MESSAGES/pg_controldata-%%PG_VERSION%%.mo
+%%NLS%%share/locale/de/LC_MESSAGES/pg_ctl-%%PG_VERSION%%.mo
+%%NLS%%share/locale/de/LC_MESSAGES/pg_resetwal-%%PG_VERSION%%.mo
+%%NLS%%share/locale/de/LC_MESSAGES/pg_rewind-%%PG_VERSION%%.mo
+%%NLS%%share/locale/de/LC_MESSAGES/pg_test_fsync-%%PG_VERSION%%.mo
+%%NLS%%share/locale/de/LC_MESSAGES/pg_test_timing-%%PG_VERSION%%.mo
+%%NLS%%share/locale/de/LC_MESSAGES/pg_upgrade-%%PG_VERSION%%.mo
+%%NLS%%share/locale/de/LC_MESSAGES/pg_waldump-%%PG_VERSION%%.mo
+%%NLS%%share/locale/de/LC_MESSAGES/plpgsql-%%PG_VERSION%%.mo
+%%NLS%%share/locale/de/LC_MESSAGES/postgres-%%PG_VERSION%%.mo
+%%NLS%%share/locale/el/LC_MESSAGES/initdb-%%PG_VERSION%%.mo
+%%NLS%%share/locale/el/LC_MESSAGES/pg_archivecleanup-%%PG_VERSION%%.mo
+%%NLS%%share/locale/el/LC_MESSAGES/pg_basebackup-%%PG_VERSION%%.mo
+%%NLS%%share/locale/el/LC_MESSAGES/pg_checksums-%%PG_VERSION%%.mo
+%%NLS%%share/locale/el/LC_MESSAGES/pg_controldata-%%PG_VERSION%%.mo
+%%NLS%%share/locale/el/LC_MESSAGES/pg_ctl-%%PG_VERSION%%.mo
+%%NLS%%share/locale/el/LC_MESSAGES/pg_resetwal-%%PG_VERSION%%.mo
+%%NLS%%share/locale/el/LC_MESSAGES/pg_rewind-%%PG_VERSION%%.mo
+%%NLS%%share/locale/el/LC_MESSAGES/pg_test_fsync-%%PG_VERSION%%.mo
+%%NLS%%share/locale/el/LC_MESSAGES/pg_test_timing-%%PG_VERSION%%.mo
+%%NLS%%share/locale/el/LC_MESSAGES/pg_waldump-%%PG_VERSION%%.mo
+%%NLS%%share/locale/el/LC_MESSAGES/plpgsql-%%PG_VERSION%%.mo
+%%NLS%%share/locale/es/LC_MESSAGES/initdb-%%PG_VERSION%%.mo
+%%NLS%%share/locale/es/LC_MESSAGES/pg_archivecleanup-%%PG_VERSION%%.mo
+%%NLS%%share/locale/es/LC_MESSAGES/pg_basebackup-%%PG_VERSION%%.mo
+%%NLS%%share/locale/es/LC_MESSAGES/pg_checksums-%%PG_VERSION%%.mo
+%%NLS%%share/locale/es/LC_MESSAGES/pg_controldata-%%PG_VERSION%%.mo
+%%NLS%%share/locale/es/LC_MESSAGES/pg_ctl-%%PG_VERSION%%.mo
+%%NLS%%share/locale/es/LC_MESSAGES/pg_resetwal-%%PG_VERSION%%.mo
+%%NLS%%share/locale/es/LC_MESSAGES/pg_rewind-%%PG_VERSION%%.mo
+%%NLS%%share/locale/es/LC_MESSAGES/pg_test_fsync-%%PG_VERSION%%.mo
+%%NLS%%share/locale/es/LC_MESSAGES/pg_test_timing-%%PG_VERSION%%.mo
+%%NLS%%share/locale/es/LC_MESSAGES/pg_upgrade-%%PG_VERSION%%.mo
+%%NLS%%share/locale/es/LC_MESSAGES/pg_waldump-%%PG_VERSION%%.mo
+%%NLS%%share/locale/es/LC_MESSAGES/plpgsql-%%PG_VERSION%%.mo
+%%NLS%%share/locale/es/LC_MESSAGES/postgres-%%PG_VERSION%%.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/initdb-%%PG_VERSION%%.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/pg_archivecleanup-%%PG_VERSION%%.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/pg_basebackup-%%PG_VERSION%%.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/pg_checksums-%%PG_VERSION%%.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/pg_controldata-%%PG_VERSION%%.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/pg_ctl-%%PG_VERSION%%.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/pg_resetwal-%%PG_VERSION%%.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/pg_rewind-%%PG_VERSION%%.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/pg_test_fsync-%%PG_VERSION%%.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/pg_test_timing-%%PG_VERSION%%.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/pg_upgrade-%%PG_VERSION%%.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/pg_waldump-%%PG_VERSION%%.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/plpgsql-%%PG_VERSION%%.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/postgres-%%PG_VERSION%%.mo
+%%NLS%%share/locale/it/LC_MESSAGES/pg_controldata-%%PG_VERSION%%.mo
+%%NLS%%share/locale/it/LC_MESSAGES/pg_ctl-%%PG_VERSION%%.mo
+%%NLS%%share/locale/it/LC_MESSAGES/plpgsql-%%PG_VERSION%%.mo
+%%NLS%%share/locale/it/LC_MESSAGES/postgres-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/initdb-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/pg_archivecleanup-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/pg_basebackup-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/pg_checksums-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/pg_controldata-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/pg_ctl-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/pg_resetwal-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/pg_rewind-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/pg_test_fsync-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/pg_test_timing-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/pg_upgrade-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/pg_waldump-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/plpgsql-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/postgres-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/initdb-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/pg_archivecleanup-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/pg_basebackup-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/pg_checksums-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/pg_controldata-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/pg_ctl-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/pg_resetwal-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/pg_test_fsync-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/pg_upgrade-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/pg_waldump-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/plpgsql-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/postgres-%%PG_VERSION%%.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/pg_test_fsync-%%PG_VERSION%%.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/plpgsql-%%PG_VERSION%%.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/plpgsql-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/initdb-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/pg_archivecleanup-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/pg_basebackup-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/pg_checksums-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/pg_controldata-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/pg_ctl-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/pg_resetwal-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/pg_rewind-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/pg_test_fsync-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/pg_test_timing-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/pg_upgrade-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/pg_waldump-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/plpgsql-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/postgres-%%PG_VERSION%%.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/initdb-%%PG_VERSION%%.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/pg_archivecleanup-%%PG_VERSION%%.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/pg_basebackup-%%PG_VERSION%%.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/pg_checksums-%%PG_VERSION%%.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/pg_controldata-%%PG_VERSION%%.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/pg_ctl-%%PG_VERSION%%.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/pg_resetwal-%%PG_VERSION%%.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/pg_rewind-%%PG_VERSION%%.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/pg_test_fsync-%%PG_VERSION%%.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/pg_test_timing-%%PG_VERSION%%.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/pg_upgrade-%%PG_VERSION%%.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/pg_waldump-%%PG_VERSION%%.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/plpgsql-%%PG_VERSION%%.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/postgres-%%PG_VERSION%%.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/initdb-%%PG_VERSION%%.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/pg_archivecleanup-%%PG_VERSION%%.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/pg_basebackup-%%PG_VERSION%%.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/pg_checksums-%%PG_VERSION%%.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/pg_controldata-%%PG_VERSION%%.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/pg_ctl-%%PG_VERSION%%.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/pg_resetwal-%%PG_VERSION%%.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/pg_test_fsync-%%PG_VERSION%%.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/pg_upgrade-%%PG_VERSION%%.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/pg_waldump-%%PG_VERSION%%.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/plpgsql-%%PG_VERSION%%.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/initdb-%%PG_VERSION%%.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/pg_archivecleanup-%%PG_VERSION%%.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/pg_basebackup-%%PG_VERSION%%.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/pg_checksums-%%PG_VERSION%%.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/pg_controldata-%%PG_VERSION%%.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/pg_ctl-%%PG_VERSION%%.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/pg_resetwal-%%PG_VERSION%%.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/pg_rewind-%%PG_VERSION%%.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/pg_test_fsync-%%PG_VERSION%%.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/pg_test_timing-%%PG_VERSION%%.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/pg_upgrade-%%PG_VERSION%%.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/pg_waldump-%%PG_VERSION%%.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/plpgsql-%%PG_VERSION%%.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/postgres-%%PG_VERSION%%.mo
+%%NLS%%share/locale/vi/LC_MESSAGES/pg_test_fsync-%%PG_VERSION%%.mo
+%%NLS%%share/locale/vi/LC_MESSAGES/plpgsql-%%PG_VERSION%%.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/initdb-%%PG_VERSION%%.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/pg_archivecleanup-%%PG_VERSION%%.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/pg_basebackup-%%PG_VERSION%%.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/pg_checksums-%%PG_VERSION%%.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/pg_controldata-%%PG_VERSION%%.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/pg_ctl-%%PG_VERSION%%.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/pg_resetwal-%%PG_VERSION%%.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/pg_rewind-%%PG_VERSION%%.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/pg_test_fsync-%%PG_VERSION%%.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/pg_test_timing-%%PG_VERSION%%.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/pg_upgrade-%%PG_VERSION%%.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/pg_waldump-%%PG_VERSION%%.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/plpgsql-%%PG_VERSION%%.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/postgres-%%PG_VERSION%%.mo
 %%TZDATA%%%%DATADIR%%/timezone/Africa/Abidjan
 %%TZDATA%%%%DATADIR%%/timezone/Africa/Accra
 %%TZDATA%%%%DATADIR%%/timezone/Africa/Addis_Ababa
@@ -1042,6 +1007,7 @@ lib/postgresql/utf8_and_win.so
 %%TZDATA%%%%DATADIR%%/timezone/America/Bahia
 %%TZDATA%%%%DATADIR%%/timezone/America/Bahia_Banderas
 %%TZDATA%%%%DATADIR%%/timezone/America/Barbados
+%%TZDATA%%%%DATADIR%%/timezone/America/Ciudad_Juarez
 %%TZDATA%%%%DATADIR%%/timezone/America/Belem
 %%TZDATA%%%%DATADIR%%/timezone/America/Belize
 %%TZDATA%%%%DATADIR%%/timezone/America/Blanc-Sablon
@@ -1412,6 +1378,7 @@ lib/postgresql/utf8_and_win.so
 %%TZDATA%%%%DATADIR%%/timezone/Europe/Kaliningrad
 %%TZDATA%%%%DATADIR%%/timezone/Europe/Kiev
 %%TZDATA%%%%DATADIR%%/timezone/Europe/Kirov
+%%TZDATA%%%%DATADIR%%/timezone/Europe/Kyiv
 %%TZDATA%%%%DATADIR%%/timezone/Europe/Lisbon
 %%TZDATA%%%%DATADIR%%/timezone/Europe/Ljubljana
 %%TZDATA%%%%DATADIR%%/timezone/Europe/London
@@ -1507,6 +1474,7 @@ lib/postgresql/utf8_and_win.so
 %%TZDATA%%%%DATADIR%%/timezone/Pacific/Guam
 %%TZDATA%%%%DATADIR%%/timezone/Pacific/Honolulu
 %%TZDATA%%%%DATADIR%%/timezone/Pacific/Johnston
+%%TZDATA%%%%DATADIR%%/timezone/Pacific/Kanton
 %%TZDATA%%%%DATADIR%%/timezone/Pacific/Kiritimati
 %%TZDATA%%%%DATADIR%%/timezone/Pacific/Kosrae
 %%TZDATA%%%%DATADIR%%/timezone/Pacific/Kwajalein
diff --git a/databases/postgresql15-client/Makefile b/databases/postgresql15-client/Makefile
new file mode 100644
index 000000000000..7c66f707ba1d
--- /dev/null
+++ b/databases/postgresql15-client/Makefile
@@ -0,0 +1,18 @@
+PORTNAME=	postgresql
+PORTREVISION=	0
+
+COMMENT=	PostgreSQL database (client)
+
+MASTERDIR=	${.CURDIR}/../postgresql15-server
+
+BUILD_DIRS=	config src/include src/interfaces src/port src/bin/pg_amcheck \
+		src/bin/pg_dump src/bin/psql src/bin/scripts src/bin/pg_config \
+		src/bin/pgbench doc src/makefiles src/test/regress
+INSTALL_DIRS=	${BUILD_DIRS}
+
+CLIENT_ONLY=	yes
+COMPONENT=	-client
+USE_LDCONFIG=	yes
+USES=		pkgconfig
+
+.include "${MASTERDIR}/Makefile"
diff --git a/databases/postgresql15-contrib/Makefile b/databases/postgresql15-contrib/Makefile
new file mode 100644
index 000000000000..4db178d55483
--- /dev/null
+++ b/databases/postgresql15-contrib/Makefile
@@ -0,0 +1,41 @@
+PORTNAME=	postgresql
+PORTREVISION=	0
+CATEGORIES=	databases
+
+MAINTAINER=	pgsql@FreeBSD.org
+COMMENT=	The contrib utilities from the PostgreSQL distribution
+
+MASTERDIR=	${.CURDIR}/../postgresql15-server
+
+USES=		bison pgsql:${DISTVERSION:C/([0-9]\.?[0-9]).*/\1/g}
+
+BUILD_DIRS=	src/port src/include src/common contrib
+INSTALL_DIRS=	contrib
+
+# this port fails to build in parallel
+MAKE_JOBS_UNSAFE=	yes
+
+SLAVE_ONLY=	yes
+COMPONENT=	-contrib
+CONFIGURE_ARGS=	--disable-nls --with-uuid=bsd
+LDFLAGS+=	-lpthread -L${PREFIX}/lib
+
+OPTIONS_DEFINE=	DOCS OPENSSL XML
+OPTIONS_DEFAULT=OPENSSL XML
+OPTIONS_SUB=	yes
+
+OPENSSL_DESC=		Build with OpenSSL support
+OPENSSL_USES=		ssl
+OPENSSL_CONFIGURE_WITH=	openssl
+
+XML_CONFIGURE_WITH=	libxslt libxml
+XML_LIB_DEPENDS=libxslt.so:textproc/libxslt \
+		libxml2.so:textproc/libxml2
+
+post-configure:
+	@cd ${WRKSRC}/src/backend && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} symlinks
+
+post-install:
+	@- ${INSTALL_DATA} ${WRKSRC}/contrib/README ${STAGEDIR}${DOCSDIR}/extension/README
+
+.include "${MASTERDIR}/Makefile"
diff --git a/databases/postgresql15-contrib/pkg-descr b/databases/postgresql15-contrib/pkg-descr
new file mode 100644
index 000000000000..a384c76fdbde
--- /dev/null
+++ b/databases/postgresql15-contrib/pkg-descr
@@ -0,0 +1,21 @@
+This is the port for all stuff that comes in the contrib subtree of
+the postgresql distribution. This subtree contains porting tools,
+analysis utilities, and plug-in features that are not part of the core
+PostgreSQL system, mainly because they address a limited audience or
+are too experimental to be part of the main source tree.  This does
+not preclude their usefulness.
+
+Each subdirectory contains a README file with information about the
+module. Some directories supply new user-defined functions, operators,
+or types.  After you have installed the files you need to register the
+new entities in the database system by running the commands in the
+supplied .sql file.  For example,
+
+        $ psql -d dbname -f module.sql
+
+The .sql files are installed into /usr/local/share/postgresql/contrib
+
+For more information, please see
+/usr/local/share/doc/postgresql/contrib/README*
+
+This software is part of the standard PostgreSQL distribution.
diff --git a/databases/postgresql15-docs/Makefile b/databases/postgresql15-docs/Makefile
new file mode 100644
index 000000000000..3946e7890607
--- /dev/null
+++ b/databases/postgresql15-docs/Makefile
@@ -0,0 +1,41 @@
+PORTNAME=	postgresql
+PORTREVISION=	0
+PKGNAMESUFFIX?=	${WANT_PGSQL_VER:S,.,,}-docs
+
+MAINTAINER=	pgsql@FreeBSD.org
+COMMENT=	The PostgreSQL documentation set
+
+MASTERDIR=	${.CURDIR}/../../databases/postgresql${WANT_PGSQL_VER:S/.//}-server
+WANT_PGSQL_VER?=15
+
+DISTV=		${DISTVERSION:R}
+
+SLAVE_ONLY=	YES
+COMPONENT=	-docs
+
+PGDOCSREL?=	${DOCSDIR_REL}/release-${WANT_PGSQL_VER}
+PGDOCSDIR?=	${PREFIX}/${PGDOCSREL}
+
+sgmldir=	${LOCALBASE}/share/sgml
+dbdir=		${sgmldir}/docbook
+
+BUILD_DEPENDS+=	onsgmls:textproc/opensp			\
+		openjade:textproc/openjade			\
+		${sgmldir}/iso8879/catalog:textproc/iso8879	\
+		${dbdir}/dsssl/modular/catalog:textproc/dsssl-docbook-modular \
+		docbook-sgml>0:textproc/docbook-sgml
+CONFIGURE_ARGS=	--without-readline
+NO_ARCH=	yes
+
+do-build:
+	${MAKE_CMD} -C ${WRKSRC} html
+
+do-install:
+	@ ${MKDIR} ${STAGEDIR}${PGDOCSDIR}
+	( cd ${WRKSRC}/doc/src/sgml/html && \
+		${COPYTREE_SHARE} . ${STAGEDIR}${PGDOCSDIR} )
+
+post-install:
+	@(cd ${STAGEDIR}${PREFIX} && ${FIND} ${PGDOCSREL} -type f) >> ${TMPPLIST}
+
+.include "${MASTERDIR}/Makefile"
diff --git a/databases/postgresql15-pgtcl/Makefile b/databases/postgresql15-pgtcl/Makefile
new file mode 100644
index 000000000000..52031c0226d7
--- /dev/null
+++ b/databases/postgresql15-pgtcl/Makefile
@@ -0,0 +1,9 @@
+PORTREVISION=	0
+PKGNAMESUFFIX=	-postgresql15
+
+CONFLICTS=	pgtcl pgtcl-postgresql9[0123456] pgtcl-postgresql1[0123-56789]
+
+PGTCL_SLAVE=	15
+MASTERDIR=	${.CURDIR}/../pgtcl
+
+.include "${MASTERDIR}/Makefile"
diff --git a/databases/postgresql15-plperl/Makefile b/databases/postgresql15-plperl/Makefile
new file mode 100644
index 000000000000..f6e703bde82d
--- /dev/null
+++ b/databases/postgresql15-plperl/Makefile
@@ -0,0 +1,27 @@
+PORTNAME=	postgresql
+# Keep the ?=, this port is used as master by the other plperl.
+PORTREVISION?=	0
+CATEGORIES=	databases perl5
+PKGNAMESUFFIX?=	${WANT_PGSQL_VER:S/.//}${COMPONENT}
+
+MAINTAINER=	pgsql@FreeBSD.org
+COMMENT=	Write SQL functions for PostgreSQL using Perl5
+
+RUN_DEPENDS=	postgres:databases/postgresql${WANT_PGSQL_VER:S/.//}-server
+
+MASTERDIR=	${.CURDIR}/../../databases/postgresql${WANT_PGSQL_VER:S/.//}-server
+
+WANT_PGSQL_VER?=15
+
+USES+=		perl5 readline
+CONFIGURE_ARGS=	--with-perl
+
+BUILD_DIRS=	src/backend ${INSTALL_DIRS}
+INSTALL_DIRS?=	src/pl/plperl contrib/bool_plperl contrib/hstore_plperl contrib/jsonb_plperl
+SLAVE_ONLY=	yes
+COMPONENT=	-plperl
+
+# this port fails to build in parallel
+MAKE_JOBS_UNSAFE=	yes
+
+.include "${MASTERDIR}/Makefile"
diff --git a/databases/postgresql15-plpython/Makefile b/databases/postgresql15-plpython/Makefile
new file mode 100644
index 000000000000..838960cf4f27
--- /dev/null
+++ b/databases/postgresql15-plpython/Makefile
@@ -0,0 +1,29 @@
+PORTNAME=	postgresql
+CATEGORIES=	databases python
+# Keep the ?=, it is used as master by the other plpython ports.
+PORTREVISION?=	0
+PKGNAMESUFFIX?=	${WANT_PGSQL_VER:S/.//}${COMPONENT}
+
+MAINTAINER=	pgsql@FreeBSD.org
+COMMENT=	Module for using Python to write SQL functions
+WWW=		https://www.postgresql.org/
+
+USES+=		pgsql:${WANT_PGSQL_VER} ${WANT_PYTHON_USE}
+WANT_PGSQL=	server
+
+MASTERDIR=	${.CURDIR}/../postgresql${WANT_PGSQL_VER:S/.//}-server
+
+WANT_PGSQL_VER?=	15
+WANT_PYTHON_USE?=	python
+
+CONFIGURE_ARGS=	--with-python
+COMPONENT=	-plpython
+
+BUILD_DIRS=	src/backend ${INSTALL_DIRS}
+INSTALL_DIRS?=	src/pl/plpython contrib/hstore_plpython contrib/jsonb_plpython contrib/ltree_plpython
+SLAVE_ONLY=	yes
+
+# this port fails to build in parallel
+MAKE_JOBS_UNSAFE=	yes
+
+.include "${MASTERDIR}/Makefile"
diff --git a/databases/postgresql15-plpython/pkg-descr b/databases/postgresql15-plpython/pkg-descr
new file mode 100644
index 000000000000..61c4875985f7
--- /dev/null
+++ b/databases/postgresql15-plpython/pkg-descr
@@ -0,0 +1,4 @@
+PL/Python allows one to write PostgeSQL stored functions and
+procedures in Python (http://www.python.org/).
+
+This software is part of the standard PostgreSQL distribution.
diff --git a/databases/postgresql15-pltcl/Makefile b/databases/postgresql15-pltcl/Makefile
new file mode 100644
index 000000000000..d62ee99fdc36
--- /dev/null
+++ b/databases/postgresql15-pltcl/Makefile
@@ -0,0 +1,32 @@
+PORTNAME=	postgresql
+# Keep the ?=, it is used by the other pltcl ports.
+PORTREVISION?=	0
+CATEGORIES=	databases tcl
+PKGNAMESUFFIX?=	${WANT_PGSQL_VER:S/.//}${COMPONENT}
+
+MAINTAINER=	pgsql@FreeBSD.org
+COMMENT=	Module for using Tcl to write SQL functions
+
+MASTERDIR=	${.CURDIR}/../../databases/postgresql${WANT_PGSQL_VER:S/.//}-server
+
+WANT_PGSQL_VER?=15
+
+USES+=		tcl pgsql:${WANT_PGSQL_VER}
+WANT_PGSQL=	server
+
+CONFIGURE_ARGS=	--with-tcl --without-tk \
+		--with-tclconfig="${TCL_LIBDIR}" \
+		--with-includes="${TCL_INCLUDEDIR}"
+
+CONFIGURE_ENV+=	TCLSH="${TCLSH}"
+MAKE_ENV+=	TCL_INCDIR="${TCL_INCLUDEDIR}"
+
+BUILD_DIRS=	src/backend src/pl/tcl
+INSTALL_DIRS=	src/pl/tcl
+SLAVE_ONLY=	yes
+COMPONENT=	-pltcl
+
+# this port fails to build in parallel
+MAKE_JOBS_UNSAFE=	yes
+
+.include "${MASTERDIR}/Makefile"
diff --git a/databases/postgresql15-server/Makefile b/databases/postgresql15-server/Makefile
new file mode 100644
index 000000000000..73cdb6c2b2da
--- /dev/null
+++ b/databases/postgresql15-server/Makefile
@@ -0,0 +1,24 @@
+DISTVERSION?=	15.6
+# PORTREVISION must be ?= otherwise, all slave ports get this PORTREVISION and
+# not their own.  Probably best to keep it at ?=0 when reset here too.
+PORTREVISION?=	0
+
+MAINTAINER?=	pgsql@FreeBSD.org
+
+INSTALL_DIRS?=	src/common src/timezone src/backend \
+		src/backend/utils/mb/conversion_procs \
+		src/backend/snowball src/backend/replication/libpqwalreceiver \
+		src/backend/replication/pgoutput \
+		src/bin/initdb src/bin/pg_ctl \
+		src/bin/pg_archivecleanup src/bin/pg_basebackup \
+		src/bin/pg_checksums \
+		src/bin/pg_controldata src/bin/pg_resetwal src/pl \
+		src/bin/pg_rewind \
+		src/bin/pg_test_fsync src/bin/pg_test_timing \
+		src/bin/pg_waldump src/bin/pg_upgrade
+
+PG_USER?=	postgres
+PG_GROUP?=	postgres
+PG_UID?=	770
+
+.include "${.CURDIR}/../postgresql16-server/Makefile"
diff --git a/databases/postgresql15-server/distinfo b/databases/postgresql15-server/distinfo
new file mode 100644
index 000000000000..b23b22c9acc4
--- /dev/null
+++ b/databases/postgresql15-server/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1707301241
+SHA256 (postgresql/postgresql-15.6.tar.bz2) = 8455146ed9c69c93a57de954aead0302cafad035c2b242175d6aa1e17ebcb2fb
+SIZE (postgresql/postgresql-15.6.tar.bz2) = 23093967
diff --git a/databases/postgresql15-server/files/502.pgsql.in b/databases/postgresql15-server/files/502.pgsql.in
new file mode 100644
index 000000000000..604ad3dadab8
--- /dev/null
+++ b/databases/postgresql15-server/files/502.pgsql.in
@@ -0,0 +1,114 @@
+#!/bin/sh
+#
+# Maintenance shell script to vacuum and backup database
+# Put this in /usr/local/etc/periodic/daily, and it will be run
+# every night
+#
+# Written by Palle Girgensohn <girgen@pingpong.net>
+#
+# In public domain, do what you like with it,
+# and use it at your own risk... :)
+#
+
+# Define these variables in either /etc/periodic.conf or
+# /etc/periodic.conf.local to override the default values.
+#
+# daily_pgsql_backup_enable="YES" # do backup of all databases
+# daily_pgsql_backup_enable="foo bar db1 db2" # only do backup of a limited selection of databases
+# daily_pgsql_vacuum_enable="YES" # do vacuum
+
+# If there is a global system configuration file, suck it in.
+#
+if [ -r /etc/defaults/periodic.conf ]
+then
+    . /etc/defaults/periodic.conf
+    source_periodic_confs
+fi
+
+: ${daily_pgsql_user:="%%PG_USER%%"}
+: ${daily_pgsql_port:=5432}
+: ${daily_pgsql_vacuum_args:="-U ${daily_pgsql_user} -p ${daily_pgsql_port} -qaz"}
+: ${daily_pgsql_pgdump_args:="-U ${daily_pgsql_user} -p ${daily_pgsql_port} -bF c"}
+: ${daily_pgsql_pgdumpall_globals_args:="-U ${daily_pgsql_user} -p ${daily_pgsql_port}"}
+# backupdir is relative to ~pgsql home directory unless it begins with a slash:
+: ${daily_pgsql_backupdir:="~${daily_pgsql_user}/backups"}
+: ${daily_pgsql_savedays:="7"}
+
+# allow '~' in directory name
+eval backupdir=${daily_pgsql_backupdir}
+
+rc=0
+
+pgsql_backup() {
+	# daily_pgsql_backupdir must be writeable by user %%PG_USER%%
+	# ~%%PG_USER%% is just that under normal circumstances,
+	# but this might not be where you want the backups...
+	if [ ! -d ${backupdir} ] ; then
+	    echo Creating ${backupdir}
+	    mkdir -m 700 ${backupdir}; chown ${daily_pgsql_user} ${backupdir}
+	fi
+
+	echo
+	echo "PostgreSQL backups"
+
+	# Protect the data
+	umask 077
+	rc=$?
+	now=`date "+%Y-%m-%dT%H:%M:%S"`
+	file=${daily_pgsql_backupdir}/pgglobals_${now}
+	su -l ${daily_pgsql_user} -c \
+		"umask 077; pg_dumpall -g ${daily_pgsql_pgdumpall_globals_args} | gzip -9 > ${file}.gz"
+
+	db=$1
+	while shift; do
+	    echo -n " $db"
+	    file=${backupdir}/pgdump_${db}_${now}
+	    su -l ${daily_pgsql_user} -c "umask 077; pg_dump ${daily_pgsql_pgdump_args} -f ${file} ${db}"
+	    [ $? -gt 0 ] && rc=3
+		db=$1
+	done
+
+	if [ $rc -gt 0 ]; then
+	    echo
+	    echo "Errors were reported during backup."
+	fi
+
+	# cleaning up old data
+	find ${backupdir} \( -name 'pgdump_*' -o -name 'pgglobals_*' -o -name '*.dat.gz' -o -name 'toc.dat' \) \
+	    -a -mtime +${daily_pgsql_savedays} -delete
+	echo
+}
+
+case "$daily_pgsql_backup_enable" in
+    [Yy][Ee][Ss])
+	dbnames=`su -l ${daily_pgsql_user} -c "umask 077; psql -U ${daily_pgsql_user} -p ${daily_pgsql_port} -q -t -A -d template1 -c SELECT\ datname\ FROM\ pg_database\ WHERE\ datname!=\'template0\'"`
+	pgsql_backup $dbnames
+	;;
+
+	[Nn][Oo])
+	;;
+
+	"")
+	;;
+
+	*)
+	pgsql_backup $daily_pgsql_backup_enable
+	;;
+esac
+
+case "$daily_pgsql_vacuum_enable" in
+    [Yy][Ee][Ss])
+
+	echo
+	echo "PostgreSQL vacuum"
+	su -l ${daily_pgsql_user} -c "vacuumdb ${daily_pgsql_vacuum_args}"
+	if [ $? -gt 0 ]
+	then
+	    echo
+	    echo "Errors were reported during vacuum."
+	    rc=3
+	fi
+	;;
+esac
+
+exit $rc
diff --git a/databases/postgresql10-server/files/dot.cshrc.in b/databases/postgresql15-server/files/dot.cshrc.in
index 17c9ee69a7d0..17c9ee69a7d0 100644
--- a/databases/postgresql10-server/files/dot.cshrc.in
+++ b/databases/postgresql15-server/files/dot.cshrc.in
diff --git a/databases/postgresql10-server/files/dot.profile.in b/databases/postgresql15-server/files/dot.profile.in
index 5be3e6a36ca9..5be3e6a36ca9 100644
--- a/databases/postgresql10-server/files/dot.profile.in
+++ b/databases/postgresql15-server/files/dot.profile.in
diff --git a/databases/postgresql15-server/files/patch-disable-llvm-jit-inlining-with-tls b/databases/postgresql15-server/files/patch-disable-llvm-jit-inlining-with-tls
new file mode 100644
index 000000000000..02686061ce99
--- /dev/null
+++ b/databases/postgresql15-server/files/patch-disable-llvm-jit-inlining-with-tls
@@ -0,0 +1,24 @@
+Do not inline functions which access TLS in LLVM JIT, as
+this leads to crashes with unsupported relocation error
+
+diff --git src/backend/jit/llvm/llvmjit_inline.cpp src/backend/jit/llvm/llvmjit_inline.cpp
+index 2617a46..a063edb 100644
+--- src/backend/jit/llvm/llvmjit_inline.cpp
++++ src/backend/jit/llvm/llvmjit_inline.cpp
+@@ -608,6 +608,16 @@ function_inlinable(llvm::Function &F,
+ 		if (rv->materialize())
+ 			elog(FATAL, "failed to materialize metadata");
+ 
++		/*
++		 * Don't inline functions with thread-local variables until
++		 * related crashes are investigated (see BUG #16696)
++		 */
++		if (rv->isThreadLocal()) {
++			ilog(DEBUG1, "cannot inline %s due to thread-local variable %s",
++				F.getName().data(), rv->getName().data());
++			return false;
++		}
++
+ 		/*
+ 		 * Never want to inline externally visible vars, cheap enough to
+ 		 * reference.
diff --git a/databases/postgresql10-server/files/patch-doc-Makefile b/databases/postgresql15-server/files/patch-doc-Makefile
index d5176bfb64b5..d5176bfb64b5 100644
--- a/databases/postgresql10-server/files/patch-doc-Makefile
+++ b/databases/postgresql15-server/files/patch-doc-Makefile
diff --git a/databases/postgresql11-server/files/patch-doc-src-sgml-Makefile b/databases/postgresql15-server/files/patch-doc-src-sgml-Makefile
index 36f5d2a8224c..36f5d2a8224c 100644
--- a/databases/postgresql11-server/files/patch-doc-src-sgml-Makefile
+++ b/databases/postgresql15-server/files/patch-doc-src-sgml-Makefile
diff --git a/databases/postgresql10-server/files/patch-src-Makefile.shlib b/databases/postgresql15-server/files/patch-src-Makefile.shlib
index 2435ffe1d280..2435ffe1d280 100644
--- a/databases/postgresql10-server/files/patch-src-Makefile.shlib
+++ b/databases/postgresql15-server/files/patch-src-Makefile.shlib
diff --git a/databases/postgresql11-server/files/patch-src-backend-Makefile b/databases/postgresql15-server/files/patch-src-backend-Makefile
index ce8a8d558de1..ce8a8d558de1 100644
--- a/databases/postgresql11-server/files/patch-src-backend-Makefile
+++ b/databases/postgresql15-server/files/patch-src-backend-Makefile
diff --git a/databases/postgresql15-server/files/patch-src_backend_utils_misc_postgresql.conf.sample b/databases/postgresql15-server/files/patch-src_backend_utils_misc_postgresql.conf.sample
new file mode 100644
index 000000000000..9469421174a0
--- /dev/null
+++ b/databases/postgresql15-server/files/patch-src_backend_utils_misc_postgresql.conf.sample
@@ -0,0 +1,10 @@
+--- src/backend/utils/misc/postgresql.conf.sample.orig	2016-10-24 20:08:51 UTC
++++ src/backend/utils/misc/postgresql.conf.sample
+@@ -330,6 +330,7 @@
+ 
+ # - Where to Log -
+ 
++log_destination = 'syslog'
+ #log_destination = 'stderr'		# Valid values are combinations of
+ 					# stderr, csvlog, syslog, and eventlog,
+ 					# depending on platform.  csvlog
diff --git a/databases/postgresql15-server/files/pkg-message-client.in b/databases/postgresql15-server/files/pkg-message-client.in
new file mode 100644
index 000000000000..8cc91d484fcb
--- /dev/null
+++ b/databases/postgresql15-server/files/pkg-message-client.in
@@ -0,0 +1,38 @@
+[
+{ type: install
+  message: <<EOM
+The PostgreSQL port has a collection of "side orders":
+
+postgresql-docs
+  For all of the html documentation
+
+p5-Pg
+  A perl5 API for client access to PostgreSQL databases.
+
+postgresql-tcltk
+  If you want tcl/tk client support.
+
+postgresql-jdbc
+  For Java JDBC support.
+
+postgresql-odbc
+  For client access from unix applications using ODBC as access
+  method. Not needed to access unix PostgreSQL servers from Win32
+  using ODBC. See below.
+
+ruby-postgres, py-psycopg2
+  For client access to PostgreSQL databases using the ruby & python
+  languages.
+
+postgresql-plperl, postgresql-pltcl & postgresql-plruby
+  For using perl5, tcl & ruby as procedural languages.
+
+postgresql-contrib
+  Lots of contributed utilities, postgresql functions and
+  datatypes. There you find pg_standby, pgcrypto and many other cool
+  things.
+
+etc...
+EOM
+}
+]
diff --git a/databases/postgresql10-server/files/pkg-message-contrib.in b/databases/postgresql15-server/files/pkg-message-contrib.in
index 2d9f3d86e71c..2d9f3d86e71c 100644
--- a/databases/postgresql10-server/files/pkg-message-contrib.in
+++ b/databases/postgresql15-server/files/pkg-message-contrib.in
diff --git a/databases/postgresql10-server/files/pkg-message-plperl.in b/databases/postgresql15-server/files/pkg-message-plperl.in
index dbda7daff5c2..dbda7daff5c2 100644
--- a/databases/postgresql10-server/files/pkg-message-plperl.in
+++ b/databases/postgresql15-server/files/pkg-message-plperl.in
diff --git a/databases/postgresql10-server/files/pkg-message-plpython.in b/databases/postgresql15-server/files/pkg-message-plpython.in
index 3bd80d73d177..3bd80d73d177 100644
--- a/databases/postgresql10-server/files/pkg-message-plpython.in
+++ b/databases/postgresql15-server/files/pkg-message-plpython.in
diff --git a/databases/postgresql10-server/files/pkg-message-pltcl.in b/databases/postgresql15-server/files/pkg-message-pltcl.in
index c1776f7d6fb3..c1776f7d6fb3 100644
--- a/databases/postgresql10-server/files/pkg-message-pltcl.in
+++ b/databases/postgresql15-server/files/pkg-message-pltcl.in
diff --git a/databases/postgresql15-server/files/pkg-message-server.in b/databases/postgresql15-server/files/pkg-message-server.in
new file mode 100644
index 000000000000..6370d4a017cc
--- /dev/null
+++ b/databases/postgresql15-server/files/pkg-message-server.in
@@ -0,0 +1,71 @@
+[
+{ type: install
+  message: <<EOM
+For procedural languages and postgresql functions, please note that
+you might have to update them when updating the server.
+
+If you have many tables and many clients running, consider raising
+kern.maxfiles using sysctl(8), or reconfigure your kernel
+appropriately.
+
+The port is set up to use autovacuum for new databases, but you might
+also want to vacuum and perhaps backup your database regularly. There
+is a periodic script, %%PREFIX%%/etc/periodic/daily/502.pgsql, that
+you may find useful. You can use it to backup and perform vacuum on all
+databases nightly. Per default, it performs `vacuum analyze'. See the
+script for instructions. For autovacuum settings, please review
+~%%PG_USER%%/data/postgresql.conf.
+
+If you plan to access your PostgreSQL server using ODBC, please
+consider running the SQL script %%PREFIX%%/share/postgresql/odbc.sql
+to get the functions required for ODBC compliance.
+
+Please note that if you use the rc script,
+%%PREFIX%%/etc/rc.d/postgresql, to initialize the database, unicode
+(UTF-8) will be used to store character data by default.  Set
+postgresql_initdb_flags or use login.conf settings described below to
+alter this behaviour. See the start rc script for more info.
+
+To set limits, environment stuff like locale and collation and other
+things, you can set up a class in /etc/login.conf before initializing
+the database. Add something similar to this to /etc/login.conf:
+---
+%%PG_USER%%:\
+	:lang=en_US.UTF-8:\
+	:setenv=LC_COLLATE=C:\
+	:tc=default:
+---
+and run `cap_mkdb /etc/login.conf'.
+Then add 'postgresql_login_class="%%PG_USER%%"' to /etc/rc.conf, or
+set it as the %%PG_USER%% user's login class in /etc/passwd.
+
+======================================================================
+
+To use PostgreSQL, enable it in rc.conf using
+
+  sysrc postgresql_enable=yes
+
+To initialize the database, run
+
+  service postgresql initdb
+
+You can then start PostgreSQL by running:
+
+  service postgresql start
+
+For postmaster settings, see ~%%PG_USER%%/data/postgresql.conf
+
+NB. FreeBSD's PostgreSQL port logs to syslog by default
+    See ~%%PG_USER%%/data/postgresql.conf for more info
+
+NB. If you're not using a checksumming filesystem like ZFS, you might
+    wish to enable data checksumming. It can be enabled during
+    the initdb phase, by adding the "--data-checksums" flag to
+    the postgresql_initdb_flags rcvar. Otherwise you can enable it later by
+    pg_checksums.  Check the initdb(1) manpage for more info
+    and make sure you understand the performance implications.
+
+======================================================================
+EOM
+}
+]
diff --git a/databases/postgresql10-server/files/pkgIndex.tcl.in b/databases/postgresql15-server/files/pkgIndex.tcl.in
index bd8329b15c69..bd8329b15c69 100644
--- a/databases/postgresql10-server/files/pkgIndex.tcl.in
+++ b/databases/postgresql15-server/files/pkgIndex.tcl.in
diff --git a/databases/postgresql15-server/files/postgresql.in b/databases/postgresql15-server/files/postgresql.in
new file mode 100644
index 000000000000..08f6faf12c55
--- /dev/null
+++ b/databases/postgresql15-server/files/postgresql.in
@@ -0,0 +1,122 @@
+#!/bin/sh
+
+# PROVIDE: postgresql
+# REQUIRE: DAEMON mountlate
+# KEYWORD: shutdown
+#
+# Add the following line to /etc/rc.conf to enable PostgreSQL:
+#
+#  postgresql_enable="YES"
+#  # optional
+#  postgresql_data="/var/db/%%PG_USER%%/data%%PG_VERSION%%"
+#  postgresql_flags="-w -s -m fast"
+#  postgresql_initdb_flags="--encoding=utf-8 --lc-collate=C"
+#  # leave empty to use the login class set in in /etc/passwd:
+#  postgresql_login_class="my_custom_login_class"
+#  postgresql_profiles=""
+#
+# See %%PREFIX%%/share/doc/postgresql/README-server for more info
+#
+# This scripts takes one of the following commands:
+#
+#   start stop restart reload status initdb
+#
+# For postmaster startup options, edit ${postgresql_data}/postgresql.conf
+
+command=%%PREFIX%%/bin/pg_ctl
+
+. /etc/rc.subr
+
+load_rc_config postgresql
+
+# set defaults
+: ${postgresql_enable:="NO"}
+: ${postgresql_flags:="-w -s -m fast"}
+: ${postgresql_user:="%%PG_USER%%"}
+eval _pgdir="~${postgresql_user}/data%%PG_VERSION%%"
+: ${postgresql_data:="${_pgdir}"}
+: ${postgresql_login_class:=""}
+: ${postgresql_initdb_flags:="--encoding=utf-8 --lc-collate=C"}
+
+name=postgresql
+rcvar=postgresql_enable
+extra_commands="reload initdb"
+
+start_cmd="postgresql_command start"
+stop_cmd="postgresql_command stop"
+restart_cmd="postgresql_command restart"
+reload_cmd="postgresql_command reload"
+status_cmd="postgresql_command status"
+promote_cmd="postgresql_command promote"
+
+initdb_cmd="postgresql_initdb"
+
+su_cmd="/usr/bin/su"
+
+if [ -n "$2" ]; then
+	profile="$2"
+	if [ "x${postgresql_profiles}" != "x" ]; then
+		eval postgresql_data="\${postgresql_${profile}_data:-}"
+		if [ "x${postgresql_data}" = "x" ]; then
+			echo "You must define a data directory (postgresql_${profile}_data)"
+			exit 1
+		fi
+		eval postgresql_enable="\${postgresql_${profile}_enable:-${postgresql_enable}}"
+		eval postgresql_data="\${postgresql_${profile}_data:-${postgresql_data}}"
+		eval postgresql_flags="\${postgresql_${profile}_flags:-${postgresql_flags}}"
+		eval postgresql_login_class="\${postgresql_${profile}_login_class:-${postgresql_login_class}}"
+		eval postgresql_initdb_flags="\${postgresql_${profile}_initdb_flags:-${postgresql_initdb_flags}}"
+	fi
+else
+	if [ "x${postgresql_profiles}" != "x" -a "x$1" != "x" ]; then
+		for profile in ${postgresql_profiles}; do
+			eval _enable="\${postgresql_${profile}_enable}"
+			case "x${_enable:-${postgresql_enable}}" in
+			x|x[Nn][Oo]|x[Nn][Oo][Nn][Ee])
+				continue
+				;;
+			x[Yy][Ee][Ss])
+				;;
+			*)
+				if test -z "$_enable"; then
+					_var=postgresql_enable
+				else
+					_var=postgresql_"${profile}"_enable
+				fi
+				echo "Bad value" \
+					"'${_enable:-${postgresql_enable}}'" \
+					"for ${_var}. " \
+					"Profile ${profile} skipped."
+				continue
+				;;
+			esac
+			echo "===> postgresql profile: ${profile}"
+			%%PREFIX%%/etc/rc.d/postgresql $1 ${profile}
+			retcode="$?"
+			if [ "0${retcode}" -ne 0 ]; then
+				failed="${profile} (${retcode}) ${failed:-}"
+			else
+				success="${profile} ${success:-}"
+			fi
+		done
+		exit 0
+	fi
+fi
+
+command_args="-D ${postgresql_data} ${postgresql_flags}"
+
+postgresql_command()
+{
+    ${su_cmd} ${postgresql_login_class:+-c ${postgresql_login_class}} \
+	    -l ${postgresql_user} \
+	    -c "exec ${command} ${command_args} ${rc_arg}"
+}
+
+postgresql_initdb()
+{
+    ${su_cmd} ${postgresql_login_class:+-c ${postgresql_login_class}} \
+	    -l ${postgresql_user} \
+	    -c "exec %%PREFIX%%/bin/initdb ${postgresql_initdb_flags} -D ${postgresql_data} -U ${postgresql_user}"
+}
+
+run_rc_command "$1"
diff --git a/databases/postgresql15-server/pkg-descr b/databases/postgresql15-server/pkg-descr
new file mode 100644
index 000000000000..cbef6ffab2d8
--- /dev/null
+++ b/databases/postgresql15-server/pkg-descr
@@ -0,0 +1,21 @@
+PostgreSQL is a sophisticated Object-Relational DBMS, supporting
+almost all SQL constructs, including subselects, transactions, and
+user-defined types and functions. It is the most advanced open-source
+database available anywhere. Commercial Support is also available.
+
+The original Postgres code was the effort of many graduate students,
+undergraduate students, and staff programmers working under the direction of
+Professor Michael Stonebraker at the University of California, Berkeley. In
+1995, Andrew Yu and Jolly Chen took on the task of converting the DBMS query
+language to SQL and created a new database system which came to known as
+Postgres95. Many others contributed to the porting, testing, debugging and
+enhancement of the Postgres95 code. As the code improved, and 1995 faded into
+memory, PostgreSQL was born.
+
+PostgreSQL development is presently being performed by a team of Internet
+developers who are now responsible for all current and future development. The
+development team coordinator is Marc G. Fournier (scrappy@PostgreSQL.ORG).
+Support is available from the PostgreSQL developer/user community through the
+support mailing list (questions@PostgreSQL.ORG).
+
+PostgreSQL is free and the complete source is available.
diff --git a/databases/postgresql15-server/pkg-install-server b/databases/postgresql15-server/pkg-install-server
new file mode 100644
index 000000000000..94486e0dff98
--- /dev/null
+++ b/databases/postgresql15-server/pkg-install-server
@@ -0,0 +1,23 @@
+#! /bin/sh
+
+PATH=/bin:/usr/bin:/usr/sbin
+
+backupwarning() {
+cat <<EOF
+
+  =========== BACKUP YOUR DATA! =============
+  As always, backup your data before
+  upgrading. If the upgrade leads to a higher
+  major revision (e.g. 9.6 -> 10), a dump
+  and restore of all databases is
+  required. This is *NOT* done by the port!
+  See https://www.postgresql.org/docs/current/upgrading.html
+  ===========================================
+EOF
+}
+
+case $2 in
+PRE-INSTALL)
+	backupwarning
+	;;
+esac
diff --git a/databases/postgresql15-server/pkg-plist-client b/databases/postgresql15-server/pkg-plist-client
new file mode 100644
index 000000000000..a3a38a2a994e
--- /dev/null
+++ b/databases/postgresql15-server/pkg-plist-client
@@ -0,0 +1,1316 @@
+bin/clusterdb
+bin/createdb
+bin/createuser
+bin/dropdb
+bin/dropuser
+bin/ecpg
+bin/pg_amcheck
+bin/pg_config
+bin/pg_dump
+bin/pg_dumpall
+bin/pg_isready
+bin/pg_restore
+bin/pgbench
+bin/psql
+bin/reindexdb
+bin/vacuumdb
+include/ecpg_config.h
+include/ecpg_informix.h
+include/ecpgerrno.h
+include/ecpglib.h
+include/ecpgtype.h
+include/libpq-events.h
+include/libpq-fe.h
+include/libpq/libpq-fs.h
+include/pg_config.h
+include/pg_config_ext.h
+include/pg_config_manual.h
+include/pg_config_os.h
+include/pgtypes.h
+include/pgtypes_date.h
+include/pgtypes_error.h
+include/pgtypes_interval.h
+include/pgtypes_numeric.h
+include/pgtypes_timestamp.h
+include/postgres_ext.h
+include/postgresql/informix/esql/datetime.h
+include/postgresql/informix/esql/decimal.h
+include/postgresql/informix/esql/sqltypes.h
+include/postgresql/internal/c.h
+include/postgresql/internal/fe-auth-sasl.h
+include/postgresql/internal/libpq-int.h
+include/postgresql/internal/libpq/pqcomm.h
+include/postgresql/internal/port.h
+include/postgresql/internal/postgres_fe.h
+include/postgresql/internal/pqexpbuffer.h
+include/postgresql/server/access/amapi.h
+include/postgresql/server/access/amvalidate.h
+include/postgresql/server/access/attmap.h
+include/postgresql/server/access/attnum.h
+include/postgresql/server/access/brin.h
+include/postgresql/server/access/brin_internal.h
+include/postgresql/server/access/brin_page.h
+include/postgresql/server/access/brin_pageops.h
+include/postgresql/server/access/brin_revmap.h
+include/postgresql/server/access/brin_tuple.h
+include/postgresql/server/access/brin_xlog.h
+include/postgresql/server/access/bufmask.h
+include/postgresql/server/access/clog.h
+include/postgresql/server/access/commit_ts.h
+include/postgresql/server/access/detoast.h
+include/postgresql/server/access/genam.h
+include/postgresql/server/access/generic_xlog.h
+include/postgresql/server/access/gin.h
+include/postgresql/server/access/gin_private.h
+include/postgresql/server/access/ginblock.h
+include/postgresql/server/access/ginxlog.h
+include/postgresql/server/access/gist.h
+include/postgresql/server/access/gist_private.h
+include/postgresql/server/access/gistscan.h
+include/postgresql/server/access/gistxlog.h
+include/postgresql/server/access/hash.h
+include/postgresql/server/access/hash_xlog.h
+include/postgresql/server/access/heapam.h
+include/postgresql/server/access/heapam_xlog.h
+include/postgresql/server/access/heaptoast.h
+include/postgresql/server/access/hio.h
+include/postgresql/server/access/htup.h
+include/postgresql/server/access/htup_details.h
+include/postgresql/server/access/itup.h
+include/postgresql/server/access/multixact.h
+include/postgresql/server/access/nbtree.h
+include/postgresql/server/access/nbtxlog.h
+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
+include/postgresql/server/access/rmgr.h
+include/postgresql/server/access/rmgrlist.h
+include/postgresql/server/access/sdir.h
+include/postgresql/server/access/session.h
+include/postgresql/server/access/skey.h
+include/postgresql/server/access/slru.h
+include/postgresql/server/access/spgist.h
+include/postgresql/server/access/spgist_private.h
+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
+include/postgresql/server/access/tsmapi.h
+include/postgresql/server/access/tupconvert.h
+include/postgresql/server/access/tupdesc.h
+include/postgresql/server/access/tupdesc_details.h
+include/postgresql/server/access/tupmacs.h
+include/postgresql/server/access/twophase.h
+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
+include/postgresql/server/access/xlogarchive.h
+include/postgresql/server/access/xlogdefs.h
+include/postgresql/server/access/xloginsert.h
+include/postgresql/server/access/xlogprefetcher.h
+include/postgresql/server/access/xlogreader.h
+include/postgresql/server/access/xlogrecord.h
+include/postgresql/server/access/xlogrecovery.h
+include/postgresql/server/access/xlogstats.h
+include/postgresql/server/access/xlogutils.h
+include/postgresql/server/bootstrap/bootstrap.h
+include/postgresql/server/c.h
+include/postgresql/server/catalog/binary_upgrade.h
+include/postgresql/server/catalog/catalog.h
+include/postgresql/server/catalog/catversion.h
+include/postgresql/server/catalog/dependency.h
+include/postgresql/server/catalog/genbki.h
+include/postgresql/server/catalog/heap.h
+include/postgresql/server/catalog/index.h
+include/postgresql/server/catalog/indexing.h
+include/postgresql/server/catalog/namespace.h
+include/postgresql/server/catalog/objectaccess.h
+include/postgresql/server/catalog/objectaddress.h
+include/postgresql/server/catalog/partition.h
+include/postgresql/server/catalog/pg_aggregate.h
+include/postgresql/server/catalog/pg_aggregate_d.h
+include/postgresql/server/catalog/pg_am.h
+include/postgresql/server/catalog/pg_am_d.h
+include/postgresql/server/catalog/pg_amop.h
+include/postgresql/server/catalog/pg_amop_d.h
+include/postgresql/server/catalog/pg_amproc.h
+include/postgresql/server/catalog/pg_amproc_d.h
+include/postgresql/server/catalog/pg_attrdef.h
+include/postgresql/server/catalog/pg_attrdef_d.h
+include/postgresql/server/catalog/pg_attribute.h
+include/postgresql/server/catalog/pg_attribute_d.h
+include/postgresql/server/catalog/pg_auth_members.h
+include/postgresql/server/catalog/pg_auth_members_d.h
+include/postgresql/server/catalog/pg_authid.h
+include/postgresql/server/catalog/pg_authid_d.h
+include/postgresql/server/catalog/pg_cast.h
+include/postgresql/server/catalog/pg_cast_d.h
+include/postgresql/server/catalog/pg_class.h
+include/postgresql/server/catalog/pg_class_d.h
+include/postgresql/server/catalog/pg_collation.h
+include/postgresql/server/catalog/pg_collation_d.h
+include/postgresql/server/catalog/pg_constraint.h
+include/postgresql/server/catalog/pg_constraint_d.h
+include/postgresql/server/catalog/pg_control.h
+include/postgresql/server/catalog/pg_conversion.h
+include/postgresql/server/catalog/pg_conversion_d.h
+include/postgresql/server/catalog/pg_database.h
+include/postgresql/server/catalog/pg_database_d.h
+include/postgresql/server/catalog/pg_db_role_setting.h
+include/postgresql/server/catalog/pg_db_role_setting_d.h
+include/postgresql/server/catalog/pg_default_acl.h
+include/postgresql/server/catalog/pg_default_acl_d.h
+include/postgresql/server/catalog/pg_depend.h
+include/postgresql/server/catalog/pg_depend_d.h
+include/postgresql/server/catalog/pg_description.h
+include/postgresql/server/catalog/pg_description_d.h
+include/postgresql/server/catalog/pg_enum.h
+include/postgresql/server/catalog/pg_enum_d.h
+include/postgresql/server/catalog/pg_event_trigger.h
+include/postgresql/server/catalog/pg_event_trigger_d.h
+include/postgresql/server/catalog/pg_extension.h
+include/postgresql/server/catalog/pg_extension_d.h
+include/postgresql/server/catalog/pg_foreign_data_wrapper.h
+include/postgresql/server/catalog/pg_foreign_data_wrapper_d.h
+include/postgresql/server/catalog/pg_foreign_server.h
+include/postgresql/server/catalog/pg_foreign_server_d.h
+include/postgresql/server/catalog/pg_foreign_table.h
+include/postgresql/server/catalog/pg_foreign_table_d.h
+include/postgresql/server/catalog/pg_index.h
+include/postgresql/server/catalog/pg_index_d.h
+include/postgresql/server/catalog/pg_inherits.h
+include/postgresql/server/catalog/pg_inherits_d.h
+include/postgresql/server/catalog/pg_init_privs.h
+include/postgresql/server/catalog/pg_init_privs_d.h
+include/postgresql/server/catalog/pg_language.h
+include/postgresql/server/catalog/pg_language_d.h
+include/postgresql/server/catalog/pg_largeobject.h
+include/postgresql/server/catalog/pg_largeobject_d.h
+include/postgresql/server/catalog/pg_largeobject_metadata.h
+include/postgresql/server/catalog/pg_largeobject_metadata_d.h
+include/postgresql/server/catalog/pg_namespace.h
+include/postgresql/server/catalog/pg_namespace_d.h
+include/postgresql/server/catalog/pg_opclass.h
+include/postgresql/server/catalog/pg_opclass_d.h
+include/postgresql/server/catalog/pg_operator.h
+include/postgresql/server/catalog/pg_operator_d.h
+include/postgresql/server/catalog/pg_opfamily.h
+include/postgresql/server/catalog/pg_opfamily_d.h
+include/postgresql/server/catalog/pg_parameter_acl.h
+include/postgresql/server/catalog/pg_parameter_acl_d.h
+include/postgresql/server/catalog/pg_partitioned_table.h
+include/postgresql/server/catalog/pg_partitioned_table_d.h
+include/postgresql/server/catalog/pg_policy.h
+include/postgresql/server/catalog/pg_policy_d.h
+include/postgresql/server/catalog/pg_proc.h
+include/postgresql/server/catalog/pg_proc_d.h
+include/postgresql/server/catalog/pg_publication.h
+include/postgresql/server/catalog/pg_publication_d.h
+include/postgresql/server/catalog/pg_publication_namespace.h
+include/postgresql/server/catalog/pg_publication_namespace_d.h
+include/postgresql/server/catalog/pg_publication_rel.h
+include/postgresql/server/catalog/pg_publication_rel_d.h
+include/postgresql/server/catalog/pg_range.h
+include/postgresql/server/catalog/pg_range_d.h
+include/postgresql/server/catalog/pg_replication_origin.h
+include/postgresql/server/catalog/pg_replication_origin_d.h
+include/postgresql/server/catalog/pg_rewrite.h
+include/postgresql/server/catalog/pg_rewrite_d.h
+include/postgresql/server/catalog/pg_seclabel.h
+include/postgresql/server/catalog/pg_seclabel_d.h
+include/postgresql/server/catalog/pg_sequence.h
+include/postgresql/server/catalog/pg_sequence_d.h
+include/postgresql/server/catalog/pg_shdepend.h
+include/postgresql/server/catalog/pg_shdepend_d.h
+include/postgresql/server/catalog/pg_shdescription.h
+include/postgresql/server/catalog/pg_shdescription_d.h
+include/postgresql/server/catalog/pg_shseclabel.h
+include/postgresql/server/catalog/pg_shseclabel_d.h
+include/postgresql/server/catalog/pg_statistic.h
+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
+include/postgresql/server/catalog/pg_subscription_rel_d.h
+include/postgresql/server/catalog/pg_tablespace.h
+include/postgresql/server/catalog/pg_tablespace_d.h
+include/postgresql/server/catalog/pg_transform.h
+include/postgresql/server/catalog/pg_transform_d.h
+include/postgresql/server/catalog/pg_trigger.h
+include/postgresql/server/catalog/pg_trigger_d.h
+include/postgresql/server/catalog/pg_ts_config.h
+include/postgresql/server/catalog/pg_ts_config_d.h
+include/postgresql/server/catalog/pg_ts_config_map.h
+include/postgresql/server/catalog/pg_ts_config_map_d.h
+include/postgresql/server/catalog/pg_ts_dict.h
+include/postgresql/server/catalog/pg_ts_dict_d.h
+include/postgresql/server/catalog/pg_ts_parser.h
+include/postgresql/server/catalog/pg_ts_parser_d.h
+include/postgresql/server/catalog/pg_ts_template.h
+include/postgresql/server/catalog/pg_ts_template_d.h
+include/postgresql/server/catalog/pg_type.h
+include/postgresql/server/catalog/pg_type_d.h
+include/postgresql/server/catalog/pg_user_mapping.h
+include/postgresql/server/catalog/pg_user_mapping_d.h
+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/alter.h
+include/postgresql/server/commands/async.h
+include/postgresql/server/commands/cluster.h
+include/postgresql/server/commands/collationcmds.h
+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
+include/postgresql/server/commands/defrem.h
+include/postgresql/server/commands/discard.h
+include/postgresql/server/commands/event_trigger.h
+include/postgresql/server/commands/explain.h
+include/postgresql/server/commands/extension.h
+include/postgresql/server/commands/lockcmds.h
+include/postgresql/server/commands/matview.h
+include/postgresql/server/commands/policy.h
+include/postgresql/server/commands/portalcmds.h
+include/postgresql/server/commands/prepare.h
+include/postgresql/server/commands/proclang.h
+include/postgresql/server/commands/progress.h
+include/postgresql/server/commands/publicationcmds.h
+include/postgresql/server/commands/schemacmds.h
+include/postgresql/server/commands/seclabel.h
+include/postgresql/server/commands/sequence.h
+include/postgresql/server/commands/subscriptioncmds.h
+include/postgresql/server/commands/tablecmds.h
+include/postgresql/server/commands/tablespace.h
+include/postgresql/server/commands/trigger.h
+include/postgresql/server/commands/typecmds.h
+include/postgresql/server/commands/user.h
+include/postgresql/server/commands/vacuum.h
+include/postgresql/server/commands/variable.h
+include/postgresql/server/commands/view.h
+include/postgresql/server/common/archive.h
+include/postgresql/server/common/base64.h
+include/postgresql/server/common/checksum_helper.h
+include/postgresql/server/common/compression.h
+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
+include/postgresql/server/common/jsonapi.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/openssl.h
+include/postgresql/server/common/pg_lzcompress.h
+include/postgresql/server/common/pg_prng.h
+include/postgresql/server/common/relpath.h
+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_east_asian_fw_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/timestamp.h
+include/postgresql/server/executor/execAsync.h
+include/postgresql/server/executor/execExpr.h
+include/postgresql/server/executor/execParallel.h
+include/postgresql/server/executor/execPartition.h
+include/postgresql/server/executor/execdebug.h
+include/postgresql/server/executor/execdesc.h
+include/postgresql/server/executor/executor.h
+include/postgresql/server/executor/functions.h
+include/postgresql/server/executor/hashjoin.h
+include/postgresql/server/executor/instrument.h
+include/postgresql/server/executor/nodeAgg.h
+include/postgresql/server/executor/nodeAppend.h
+include/postgresql/server/executor/nodeBitmapAnd.h
+include/postgresql/server/executor/nodeBitmapHeapscan.h
+include/postgresql/server/executor/nodeBitmapIndexscan.h
+include/postgresql/server/executor/nodeBitmapOr.h
+include/postgresql/server/executor/nodeCtescan.h
+include/postgresql/server/executor/nodeCustom.h
+include/postgresql/server/executor/nodeForeignscan.h
+include/postgresql/server/executor/nodeFunctionscan.h
+include/postgresql/server/executor/nodeGather.h
+include/postgresql/server/executor/nodeGatherMerge.h
+include/postgresql/server/executor/nodeGroup.h
+include/postgresql/server/executor/nodeHash.h
+include/postgresql/server/executor/nodeHashjoin.h
+include/postgresql/server/executor/nodeIncrementalSort.h
+include/postgresql/server/executor/nodeIndexonlyscan.h
+include/postgresql/server/executor/nodeIndexscan.h
+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
+include/postgresql/server/executor/nodeNamedtuplestorescan.h
+include/postgresql/server/executor/nodeNestloop.h
+include/postgresql/server/executor/nodeProjectSet.h
+include/postgresql/server/executor/nodeRecursiveunion.h
+include/postgresql/server/executor/nodeResult.h
+include/postgresql/server/executor/nodeSamplescan.h
+include/postgresql/server/executor/nodeSeqscan.h
+include/postgresql/server/executor/nodeSetOp.h
+include/postgresql/server/executor/nodeSort.h
+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
+include/postgresql/server/executor/nodeWindowAgg.h
+include/postgresql/server/executor/nodeWorktablescan.h
+include/postgresql/server/executor/spi.h
+include/postgresql/server/executor/spi_priv.h
+include/postgresql/server/executor/tablefunc.h
+include/postgresql/server/executor/tqueue.h
+include/postgresql/server/executor/tstoreReceiver.h
+include/postgresql/server/executor/tuptable.h
+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
+include/postgresql/server/fmgr.h
+include/postgresql/server/foreign/fdwapi.h
+include/postgresql/server/foreign/foreign.h
+include/postgresql/server/funcapi.h
+include/postgresql/server/getaddrinfo.h
+include/postgresql/server/getopt_long.h
+include/postgresql/server/jit/jit.h
+include/postgresql/server/jit/llvmjit.h
+include/postgresql/server/jit/llvmjit_emit.h
+include/postgresql/server/lib/binaryheap.h
+include/postgresql/server/lib/bipartite_match.h
+include/postgresql/server/lib/bloomfilter.h
+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/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/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
+include/postgresql/server/libpq/libpq-be.h
+include/postgresql/server/libpq/libpq-fs.h
+include/postgresql/server/libpq/libpq.h
+include/postgresql/server/libpq/pqcomm.h
+include/postgresql/server/libpq/pqformat.h
+include/postgresql/server/libpq/pqmq.h
+include/postgresql/server/libpq/pqsignal.h
+include/postgresql/server/libpq/sasl.h
+include/postgresql/server/libpq/scram.h
+include/postgresql/server/mb/pg_wchar.h
+include/postgresql/server/mb/stringinfo_mb.h
+include/postgresql/server/miscadmin.h
+include/postgresql/server/nodes/bitmapset.h
+include/postgresql/server/nodes/execnodes.h
+include/postgresql/server/nodes/extensible.h
+include/postgresql/server/nodes/lockoptions.h
+include/postgresql/server/nodes/makefuncs.h
+include/postgresql/server/nodes/memnodes.h
+include/postgresql/server/nodes/nodeFuncs.h
+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/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
+include/postgresql/server/optimizer/appendinfo.h
+include/postgresql/server/optimizer/clauses.h
+include/postgresql/server/optimizer/cost.h
+include/postgresql/server/optimizer/geqo.h
+include/postgresql/server/optimizer/geqo_copy.h
+include/postgresql/server/optimizer/geqo_gene.h
+include/postgresql/server/optimizer/geqo_misc.h
+include/postgresql/server/optimizer/geqo_mutation.h
+include/postgresql/server/optimizer/geqo_pool.h
+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
+include/postgresql/server/optimizer/paths.h
+include/postgresql/server/optimizer/placeholder.h
+include/postgresql/server/optimizer/plancat.h
+include/postgresql/server/optimizer/planmain.h
+include/postgresql/server/optimizer/planner.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/parser/analyze.h
+include/postgresql/server/parser/gram.h
+include/postgresql/server/parser/gramparse.h
+include/postgresql/server/parser/kwlist.h
+include/postgresql/server/parser/parse_agg.h
+include/postgresql/server/parser/parse_clause.h
+include/postgresql/server/parser/parse_coerce.h
+include/postgresql/server/parser/parse_collate.h
+include/postgresql/server/parser/parse_cte.h
+include/postgresql/server/parser/parse_enr.h
+include/postgresql/server/parser/parse_expr.h
+include/postgresql/server/parser/parse_func.h
+include/postgresql/server/parser/parse_merge.h
+include/postgresql/server/parser/parse_node.h
+include/postgresql/server/parser/parse_oper.h
+include/postgresql/server/parser/parse_param.h
+include/postgresql/server/parser/parse_relation.h
+include/postgresql/server/parser/parse_target.h
+include/postgresql/server/parser/parse_type.h
+include/postgresql/server/parser/parse_utilcmd.h
+include/postgresql/server/parser/parser.h
+include/postgresql/server/parser/parsetree.h
+include/postgresql/server/parser/scanner.h
+include/postgresql/server/parser/scansup.h
+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
+include/postgresql/server/pg_config_manual.h
+include/postgresql/server/pg_config_os.h
+include/postgresql/server/pg_getopt.h
+include/postgresql/server/pg_trace.h
+include/postgresql/server/pgstat.h
+include/postgresql/server/pgtar.h
+include/postgresql/server/pgtime.h
+include/postgresql/server/port.h
+include/postgresql/server/port/aix.h
+include/postgresql/server/port/atomics.h
+include/postgresql/server/port/atomics/arch-arm.h
+include/postgresql/server/port/atomics/arch-hppa.h
+include/postgresql/server/port/atomics/arch-ia64.h
+include/postgresql/server/port/atomics/arch-ppc.h
+include/postgresql/server/port/atomics/arch-x86.h
+include/postgresql/server/port/atomics/fallback.h
+include/postgresql/server/port/atomics/generic-acc.h
+include/postgresql/server/port/atomics/generic-gcc.h
+include/postgresql/server/port/atomics/generic-msvc.h
+include/postgresql/server/port/atomics/generic-sunpro.h
+include/postgresql/server/port/atomics/generic.h
+include/postgresql/server/port/cygwin.h
+include/postgresql/server/port/darwin.h
+include/postgresql/server/port/freebsd.h
+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/pg_iovec.h
+include/postgresql/server/port/pg_pthread.h
+include/postgresql/server/port/solaris.h
+include/postgresql/server/port/win32.h
+include/postgresql/server/port/win32/arpa/inet.h
+include/postgresql/server/port/win32/dlfcn.h
+include/postgresql/server/port/win32/grp.h
+include/postgresql/server/port/win32/netdb.h
+include/postgresql/server/port/win32/netinet/in.h
+include/postgresql/server/port/win32/pwd.h
+include/postgresql/server/port/win32/sys/socket.h
+include/postgresql/server/port/win32/sys/wait.h
+include/postgresql/server/port/win32_msvc/dirent.h
+include/postgresql/server/port/win32_msvc/sys/file.h
+include/postgresql/server/port/win32_msvc/sys/param.h
+include/postgresql/server/port/win32_msvc/sys/time.h
+include/postgresql/server/port/win32_msvc/unistd.h
+include/postgresql/server/port/win32_msvc/utime.h
+include/postgresql/server/port/win32_port.h
+include/postgresql/server/port/win32ntdll.h
+include/postgresql/server/portability/instr_time.h
+include/postgresql/server/portability/mem.h
+include/postgresql/server/postgres.h
+include/postgresql/server/postgres_ext.h
+include/postgresql/server/postgres_fe.h
+include/postgresql/server/postmaster/autovacuum.h
+include/postgresql/server/postmaster/auxprocess.h
+include/postgresql/server/postmaster/bgworker.h
+include/postgresql/server/postmaster/bgworker_internals.h
+include/postgresql/server/postmaster/bgwriter.h
+include/postgresql/server/postmaster/fork_process.h
+include/postgresql/server/postmaster/interrupt.h
+include/postgresql/server/postmaster/pgarch.h
+include/postgresql/server/postmaster/postmaster.h
+include/postgresql/server/postmaster/startup.h
+include/postgresql/server/postmaster/syslogger.h
+include/postgresql/server/postmaster/walwriter.h
+include/postgresql/server/regex/regcustom.h
+include/postgresql/server/regex/regerrs.h
+include/postgresql/server/regex/regex.h
+include/postgresql/server/regex/regexport.h
+include/postgresql/server/regex/regguts.h
+include/postgresql/server/replication/decode.h
+include/postgresql/server/replication/logical.h
+include/postgresql/server/replication/logicallauncher.h
+include/postgresql/server/replication/logicalproto.h
+include/postgresql/server/replication/logicalrelation.h
+include/postgresql/server/replication/logicalworker.h
+include/postgresql/server/replication/message.h
+include/postgresql/server/replication/origin.h
+include/postgresql/server/replication/output_plugin.h
+include/postgresql/server/replication/pgoutput.h
+include/postgresql/server/replication/reorderbuffer.h
+include/postgresql/server/replication/slot.h
+include/postgresql/server/replication/snapbuild.h
+include/postgresql/server/replication/syncrep.h
+include/postgresql/server/replication/walreceiver.h
+include/postgresql/server/replication/walsender.h
+include/postgresql/server/replication/walsender_private.h
+include/postgresql/server/replication/worker_internal.h
+include/postgresql/server/rewrite/prs2lock.h
+include/postgresql/server/rewrite/rewriteDefine.h
+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
+include/postgresql/server/snowball/header.h
+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
+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_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_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
+include/postgresql/server/snowball/libstemmer/stem_UTF_8_finnish.h
+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
+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
+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/extended_stats_internal.h
+include/postgresql/server/statistics/statistics.h
+include/postgresql/server/storage/backendid.h
+include/postgresql/server/storage/barrier.h
+include/postgresql/server/storage/block.h
+include/postgresql/server/storage/buf.h
+include/postgresql/server/storage/buf_internals.h
+include/postgresql/server/storage/buffile.h
+include/postgresql/server/storage/bufmgr.h
+include/postgresql/server/storage/bufpage.h
+include/postgresql/server/storage/checksum.h
+include/postgresql/server/storage/checksum_impl.h
+include/postgresql/server/storage/condition_variable.h
+include/postgresql/server/storage/copydir.h
+include/postgresql/server/storage/dsm.h
+include/postgresql/server/storage/dsm_impl.h
+include/postgresql/server/storage/fd.h
+include/postgresql/server/storage/fileset.h
+include/postgresql/server/storage/freespace.h
+include/postgresql/server/storage/fsm_internals.h
+include/postgresql/server/storage/indexfsm.h
+include/postgresql/server/storage/ipc.h
+include/postgresql/server/storage/item.h
+include/postgresql/server/storage/itemid.h
+include/postgresql/server/storage/itemptr.h
+include/postgresql/server/storage/large_object.h
+include/postgresql/server/storage/latch.h
+include/postgresql/server/storage/lmgr.h
+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
+include/postgresql/server/storage/pmsignal.h
+include/postgresql/server/storage/predicate.h
+include/postgresql/server/storage/predicate_internals.h
+include/postgresql/server/storage/proc.h
+include/postgresql/server/storage/procarray.h
+include/postgresql/server/storage/proclist.h
+include/postgresql/server/storage/proclist_types.h
+include/postgresql/server/storage/procsignal.h
+include/postgresql/server/storage/reinit.h
+include/postgresql/server/storage/relfilenode.h
+include/postgresql/server/storage/s_lock.h
+include/postgresql/server/storage/sharedfileset.h
+include/postgresql/server/storage/shm_mq.h
+include/postgresql/server/storage/shm_toc.h
+include/postgresql/server/storage/shmem.h
+include/postgresql/server/storage/sinval.h
+include/postgresql/server/storage/sinvaladt.h
+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/cmdtag.h
+include/postgresql/server/tcop/cmdtaglist.h
+include/postgresql/server/tcop/deparse_utility.h
+include/postgresql/server/tcop/dest.h
+include/postgresql/server/tcop/fastpath.h
+include/postgresql/server/tcop/pquery.h
+include/postgresql/server/tcop/tcopprot.h
+include/postgresql/server/tcop/utility.h
+include/postgresql/server/tsearch/dicts/regis.h
+include/postgresql/server/tsearch/dicts/spell.h
+include/postgresql/server/tsearch/ts_cache.h
+include/postgresql/server/tsearch/ts_locale.h
+include/postgresql/server/tsearch/ts_public.h
+include/postgresql/server/tsearch/ts_type.h
+include/postgresql/server/tsearch/ts_utils.h
+include/postgresql/server/utils/acl.h
+include/postgresql/server/utils/aclchk_internal.h
+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
+include/postgresql/server/utils/catcache.h
+include/postgresql/server/utils/combocid.h
+include/postgresql/server/utils/date.h
+include/postgresql/server/utils/datetime.h
+include/postgresql/server/utils/datum.h
+include/postgresql/server/utils/dsa.h
+include/postgresql/server/utils/dynahash.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
+include/postgresql/server/utils/formatting.h
+include/postgresql/server/utils/freepage.h
+include/postgresql/server/utils/geo_decls.h
+include/postgresql/server/utils/guc.h
+include/postgresql/server/utils/guc_tables.h
+include/postgresql/server/utils/help_config.h
+include/postgresql/server/utils/hsearch.h
+include/postgresql/server/utils/index_selfuncs.h
+include/postgresql/server/utils/inet.h
+include/postgresql/server/utils/inval.h
+include/postgresql/server/utils/json.h
+include/postgresql/server/utils/jsonb.h
+include/postgresql/server/utils/jsonfuncs.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/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
+include/postgresql/server/utils/pg_locale.h
+include/postgresql/server/utils/pg_lsn.h
+include/postgresql/server/utils/pg_rusage.h
+include/postgresql/server/utils/pgstat_internal.h
+include/postgresql/server/utils/pidfile.h
+include/postgresql/server/utils/plancache.h
+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
+include/postgresql/server/utils/relcache.h
+include/postgresql/server/utils/relfilenodemap.h
+include/postgresql/server/utils/relmapper.h
+include/postgresql/server/utils/relptr.h
+include/postgresql/server/utils/reltrigger.h
+include/postgresql/server/utils/resowner.h
+include/postgresql/server/utils/resowner_private.h
+include/postgresql/server/utils/rls.h
+include/postgresql/server/utils/ruleutils.h
+include/postgresql/server/utils/sampling.h
+include/postgresql/server/utils/selfuncs.h
+include/postgresql/server/utils/sharedtuplestore.h
+include/postgresql/server/utils/snapmgr.h
+include/postgresql/server/utils/snapshot.h
+include/postgresql/server/utils/sortsupport.h
+include/postgresql/server/utils/spccache.h
+include/postgresql/server/utils/syscache.h
+include/postgresql/server/utils/timeout.h
+include/postgresql/server/utils/timestamp.h
+include/postgresql/server/utils/tuplesort.h
+include/postgresql/server/utils/tuplestore.h
+include/postgresql/server/utils/typcache.h
+include/postgresql/server/utils/tzparser.h
+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
+include/sql3types.h
+include/sqlca.h
+include/sqlda-compat.h
+include/sqlda-native.h
+include/sqlda.h
+lib/libecpg.a
+lib/libecpg.so
+lib/libecpg.so.6
+lib/libecpg_compat.a
+lib/libecpg_compat.so
+lib/libecpg_compat.so.3
+lib/libpgport.a
+lib/libpgport_shlib.a
+lib/libpgtypes.a
+lib/libpgtypes.so
+lib/libpgtypes.so.3
+lib/libpq.a
+lib/libpq.so
+lib/libpq.so.5
+lib/postgresql/pgxs/config/install-sh
+lib/postgresql/pgxs/config/missing
+lib/postgresql/pgxs/src/Makefile.global
+lib/postgresql/pgxs/src/Makefile.port
+lib/postgresql/pgxs/src/Makefile.shlib
+lib/postgresql/pgxs/src/makefiles/pgxs.mk
+lib/postgresql/pgxs/src/nls-global.mk
+lib/postgresql/pgxs/src/test/regress/pg_regress
+libdata/pkgconfig/libecpg.pc
+libdata/pkgconfig/libecpg_compat.pc
+libdata/pkgconfig/libpgtypes.pc
+libdata/pkgconfig/libpq.pc
+share/man/man1/clusterdb.1.gz
+share/man/man1/createdb.1.gz
+share/man/man1/createuser.1.gz
+share/man/man1/dropdb.1.gz
+share/man/man1/dropuser.1.gz
+share/man/man1/ecpg.1.gz
+share/man/man1/initdb.1.gz
+share/man/man1/oid2name.1.gz
+share/man/man1/pg_amcheck.1.gz
+share/man/man1/pg_archivecleanup.1.gz
+share/man/man1/pg_basebackup.1.gz
+share/man/man1/pg_checksums.1.gz
+share/man/man1/pg_config.1.gz
+share/man/man1/pg_controldata.1.gz
+share/man/man1/pg_ctl.1.gz
+share/man/man1/pg_dump.1.gz
+share/man/man1/pg_dumpall.1.gz
+share/man/man1/pg_isready.1.gz
+share/man/man1/pg_receivewal.1.gz
+share/man/man1/pg_recvlogical.1.gz
+share/man/man1/pg_resetwal.1.gz
+share/man/man1/pg_restore.1.gz
+share/man/man1/pg_rewind.1.gz
+share/man/man1/pg_test_fsync.1.gz
+share/man/man1/pg_test_timing.1.gz
+share/man/man1/pg_upgrade.1.gz
+share/man/man1/pg_verifybackup.1.gz
+share/man/man1/pg_waldump.1.gz
+share/man/man1/pgbench.1.gz
+share/man/man1/postgres.1.gz
+share/man/man1/postmaster.1.gz
+share/man/man1/psql.1.gz
+share/man/man1/reindexdb.1.gz
+share/man/man1/vacuumdb.1.gz
+share/man/man1/vacuumlo.1.gz
+share/man/man3/SPI_commit.3.gz
+share/man/man3/SPI_commit_and_chain.3.gz
+share/man/man3/SPI_connect.3.gz
+share/man/man3/SPI_connect_ext.3.gz
+share/man/man3/SPI_copytuple.3.gz
+share/man/man3/SPI_cursor_close.3.gz
+share/man/man3/SPI_cursor_fetch.3.gz
+share/man/man3/SPI_cursor_find.3.gz
+share/man/man3/SPI_cursor_move.3.gz
+share/man/man3/SPI_cursor_open.3.gz
+share/man/man3/SPI_cursor_open_with_args.3.gz
+share/man/man3/SPI_cursor_open_with_paramlist.3.gz
+share/man/man3/SPI_cursor_parse_open.3.gz
+share/man/man3/SPI_exec.3.gz
+share/man/man3/SPI_execp.3.gz
+share/man/man3/SPI_execute.3.gz
+share/man/man3/SPI_execute_extended.3.gz
+share/man/man3/SPI_execute_plan.3.gz
+share/man/man3/SPI_execute_plan_extended.3.gz
+share/man/man3/SPI_execute_plan_with_paramlist.3.gz
+share/man/man3/SPI_execute_with_args.3.gz
+share/man/man3/SPI_finish.3.gz
+share/man/man3/SPI_fname.3.gz
+share/man/man3/SPI_fnumber.3.gz
+share/man/man3/SPI_freeplan.3.gz
+share/man/man3/SPI_freetuple.3.gz
+share/man/man3/SPI_freetuptable.3.gz
+share/man/man3/SPI_getargcount.3.gz
+share/man/man3/SPI_getargtypeid.3.gz
+share/man/man3/SPI_getbinval.3.gz
+share/man/man3/SPI_getnspname.3.gz
+share/man/man3/SPI_getrelname.3.gz
+share/man/man3/SPI_gettype.3.gz
+share/man/man3/SPI_gettypeid.3.gz
+share/man/man3/SPI_getvalue.3.gz
+share/man/man3/SPI_is_cursor_plan.3.gz
+share/man/man3/SPI_keepplan.3.gz
+share/man/man3/SPI_modifytuple.3.gz
+share/man/man3/SPI_palloc.3.gz
+share/man/man3/SPI_pfree.3.gz
+share/man/man3/SPI_prepare.3.gz
+share/man/man3/SPI_prepare_cursor.3.gz
+share/man/man3/SPI_prepare_extended.3.gz
+share/man/man3/SPI_prepare_params.3.gz
+share/man/man3/SPI_register_relation.3.gz
+share/man/man3/SPI_register_trigger_data.3.gz
+share/man/man3/SPI_repalloc.3.gz
+share/man/man3/SPI_result_code_string.3.gz
+share/man/man3/SPI_returntuple.3.gz
+share/man/man3/SPI_rollback.3.gz
+share/man/man3/SPI_rollback_and_chain.3.gz
+share/man/man3/SPI_saveplan.3.gz
+share/man/man3/SPI_scroll_cursor_fetch.3.gz
+share/man/man3/SPI_scroll_cursor_move.3.gz
+share/man/man3/SPI_start_transaction.3.gz
+share/man/man3/SPI_unregister_relation.3.gz
+share/man/man3/dblink.3.gz
+share/man/man3/dblink_build_sql_delete.3.gz
+share/man/man3/dblink_build_sql_insert.3.gz
+share/man/man3/dblink_build_sql_update.3.gz
+share/man/man3/dblink_cancel_query.3.gz
+share/man/man3/dblink_close.3.gz
+share/man/man3/dblink_connect.3.gz
+share/man/man3/dblink_connect_u.3.gz
+share/man/man3/dblink_disconnect.3.gz
+share/man/man3/dblink_error_message.3.gz
+share/man/man3/dblink_exec.3.gz
+share/man/man3/dblink_fetch.3.gz
+share/man/man3/dblink_get_connections.3.gz
+share/man/man3/dblink_get_notify.3.gz
+share/man/man3/dblink_get_pkey.3.gz
+share/man/man3/dblink_get_result.3.gz
+share/man/man3/dblink_is_busy.3.gz
+share/man/man3/dblink_open.3.gz
+share/man/man3/dblink_send_query.3.gz
+share/man/man7/ABORT.7.gz
+share/man/man7/ALTER_AGGREGATE.7.gz
+share/man/man7/ALTER_COLLATION.7.gz
+share/man/man7/ALTER_CONVERSION.7.gz
+share/man/man7/ALTER_DATABASE.7.gz
+share/man/man7/ALTER_DEFAULT_PRIVILEGES.7.gz
+share/man/man7/ALTER_DOMAIN.7.gz
+share/man/man7/ALTER_EVENT_TRIGGER.7.gz
+share/man/man7/ALTER_EXTENSION.7.gz
+share/man/man7/ALTER_FOREIGN_DATA_WRAPPER.7.gz
+share/man/man7/ALTER_FOREIGN_TABLE.7.gz
+share/man/man7/ALTER_FUNCTION.7.gz
+share/man/man7/ALTER_GROUP.7.gz
+share/man/man7/ALTER_INDEX.7.gz
+share/man/man7/ALTER_LANGUAGE.7.gz
+share/man/man7/ALTER_LARGE_OBJECT.7.gz
+share/man/man7/ALTER_MATERIALIZED_VIEW.7.gz
+share/man/man7/ALTER_OPERATOR.7.gz
+share/man/man7/ALTER_OPERATOR_CLASS.7.gz
+share/man/man7/ALTER_OPERATOR_FAMILY.7.gz
+share/man/man7/ALTER_POLICY.7.gz
+share/man/man7/ALTER_PROCEDURE.7.gz
+share/man/man7/ALTER_PUBLICATION.7.gz
+share/man/man7/ALTER_ROLE.7.gz
+share/man/man7/ALTER_ROUTINE.7.gz
+share/man/man7/ALTER_RULE.7.gz
+share/man/man7/ALTER_SCHEMA.7.gz
+share/man/man7/ALTER_SEQUENCE.7.gz
+share/man/man7/ALTER_SERVER.7.gz
+share/man/man7/ALTER_STATISTICS.7.gz
+share/man/man7/ALTER_SUBSCRIPTION.7.gz
+share/man/man7/ALTER_SYSTEM.7.gz
+share/man/man7/ALTER_TABLE.7.gz
+share/man/man7/ALTER_TABLESPACE.7.gz
+share/man/man7/ALTER_TEXT_SEARCH_CONFIGURATION.7.gz
+share/man/man7/ALTER_TEXT_SEARCH_DICTIONARY.7.gz
+share/man/man7/ALTER_TEXT_SEARCH_PARSER.7.gz
+share/man/man7/ALTER_TEXT_SEARCH_TEMPLATE.7.gz
+share/man/man7/ALTER_TRIGGER.7.gz
+share/man/man7/ALTER_TYPE.7.gz
+share/man/man7/ALTER_USER.7.gz
+share/man/man7/ALTER_USER_MAPPING.7.gz
+share/man/man7/ALTER_VIEW.7.gz
+share/man/man7/ANALYZE.7.gz
+share/man/man7/BEGIN.7.gz
+share/man/man7/CALL.7.gz
+share/man/man7/CHECKPOINT.7.gz
+share/man/man7/CLOSE.7.gz
+share/man/man7/CLUSTER.7.gz
+share/man/man7/COMMENT.7.gz
+share/man/man7/COMMIT.7.gz
+share/man/man7/COMMIT_PREPARED.7.gz
+share/man/man7/COPY.7.gz
+share/man/man7/CREATE_ACCESS_METHOD.7.gz
+share/man/man7/CREATE_AGGREGATE.7.gz
+share/man/man7/CREATE_CAST.7.gz
+share/man/man7/CREATE_COLLATION.7.gz
+share/man/man7/CREATE_CONVERSION.7.gz
+share/man/man7/CREATE_DATABASE.7.gz
+share/man/man7/CREATE_DOMAIN.7.gz
+share/man/man7/CREATE_EVENT_TRIGGER.7.gz
+share/man/man7/CREATE_EXTENSION.7.gz
+share/man/man7/CREATE_FOREIGN_DATA_WRAPPER.7.gz
+share/man/man7/CREATE_FOREIGN_TABLE.7.gz
+share/man/man7/CREATE_FUNCTION.7.gz
+share/man/man7/CREATE_GROUP.7.gz
+share/man/man7/CREATE_INDEX.7.gz
+share/man/man7/CREATE_LANGUAGE.7.gz
+share/man/man7/CREATE_MATERIALIZED_VIEW.7.gz
+share/man/man7/CREATE_OPERATOR.7.gz
+share/man/man7/CREATE_OPERATOR_CLASS.7.gz
+share/man/man7/CREATE_OPERATOR_FAMILY.7.gz
+share/man/man7/CREATE_POLICY.7.gz
+share/man/man7/CREATE_PROCEDURE.7.gz
+share/man/man7/CREATE_PUBLICATION.7.gz
+share/man/man7/CREATE_ROLE.7.gz
+share/man/man7/CREATE_RULE.7.gz
+share/man/man7/CREATE_SCHEMA.7.gz
+share/man/man7/CREATE_SEQUENCE.7.gz
+share/man/man7/CREATE_SERVER.7.gz
+share/man/man7/CREATE_STATISTICS.7.gz
+share/man/man7/CREATE_SUBSCRIPTION.7.gz
+share/man/man7/CREATE_TABLE.7.gz
+share/man/man7/CREATE_TABLESPACE.7.gz
+share/man/man7/CREATE_TABLE_AS.7.gz
+share/man/man7/CREATE_TEXT_SEARCH_CONFIGURATION.7.gz
+share/man/man7/CREATE_TEXT_SEARCH_DICTIONARY.7.gz
+share/man/man7/CREATE_TEXT_SEARCH_PARSER.7.gz
+share/man/man7/CREATE_TEXT_SEARCH_TEMPLATE.7.gz
+share/man/man7/CREATE_TRANSFORM.7.gz
+share/man/man7/CREATE_TRIGGER.7.gz
+share/man/man7/CREATE_TYPE.7.gz
+share/man/man7/CREATE_USER.7.gz
+share/man/man7/CREATE_USER_MAPPING.7.gz
+share/man/man7/CREATE_VIEW.7.gz
+share/man/man7/DEALLOCATE.7.gz
+share/man/man7/DECLARE.7.gz
+share/man/man7/DELETE.7.gz
+share/man/man7/DISCARD.7.gz
+share/man/man7/DO.7.gz
+share/man/man7/DROP_ACCESS_METHOD.7.gz
+share/man/man7/DROP_AGGREGATE.7.gz
+share/man/man7/DROP_CAST.7.gz
+share/man/man7/DROP_COLLATION.7.gz
+share/man/man7/DROP_CONVERSION.7.gz
+share/man/man7/DROP_DATABASE.7.gz
+share/man/man7/DROP_DOMAIN.7.gz
+share/man/man7/DROP_EVENT_TRIGGER.7.gz
+share/man/man7/DROP_EXTENSION.7.gz
+share/man/man7/DROP_FOREIGN_DATA_WRAPPER.7.gz
+share/man/man7/DROP_FOREIGN_TABLE.7.gz
+share/man/man7/DROP_FUNCTION.7.gz
+share/man/man7/DROP_GROUP.7.gz
+share/man/man7/DROP_INDEX.7.gz
+share/man/man7/DROP_LANGUAGE.7.gz
+share/man/man7/DROP_MATERIALIZED_VIEW.7.gz
+share/man/man7/DROP_OPERATOR.7.gz
+share/man/man7/DROP_OPERATOR_CLASS.7.gz
+share/man/man7/DROP_OPERATOR_FAMILY.7.gz
+share/man/man7/DROP_OWNED.7.gz
+share/man/man7/DROP_POLICY.7.gz
+share/man/man7/DROP_PROCEDURE.7.gz
+share/man/man7/DROP_PUBLICATION.7.gz
+share/man/man7/DROP_ROLE.7.gz
+share/man/man7/DROP_ROUTINE.7.gz
+share/man/man7/DROP_RULE.7.gz
+share/man/man7/DROP_SCHEMA.7.gz
+share/man/man7/DROP_SEQUENCE.7.gz
+share/man/man7/DROP_SERVER.7.gz
+share/man/man7/DROP_STATISTICS.7.gz
+share/man/man7/DROP_SUBSCRIPTION.7.gz
+share/man/man7/DROP_TABLE.7.gz
+share/man/man7/DROP_TABLESPACE.7.gz
+share/man/man7/DROP_TEXT_SEARCH_CONFIGURATION.7.gz
+share/man/man7/DROP_TEXT_SEARCH_DICTIONARY.7.gz
+share/man/man7/DROP_TEXT_SEARCH_PARSER.7.gz
+share/man/man7/DROP_TEXT_SEARCH_TEMPLATE.7.gz
+share/man/man7/DROP_TRANSFORM.7.gz
+share/man/man7/DROP_TRIGGER.7.gz
+share/man/man7/DROP_TYPE.7.gz
+share/man/man7/DROP_USER.7.gz
+share/man/man7/DROP_USER_MAPPING.7.gz
+share/man/man7/DROP_VIEW.7.gz
+share/man/man7/END.7.gz
+share/man/man7/EXECUTE.7.gz
+share/man/man7/EXPLAIN.7.gz
+share/man/man7/FETCH.7.gz
+share/man/man7/GRANT.7.gz
+share/man/man7/IMPORT_FOREIGN_SCHEMA.7.gz
+share/man/man7/INSERT.7.gz
+share/man/man7/LISTEN.7.gz
+share/man/man7/LOAD.7.gz
+share/man/man7/LOCK.7.gz
+share/man/man7/MERGE.7.gz
+share/man/man7/MOVE.7.gz
+share/man/man7/NOTIFY.7.gz
+share/man/man7/PREPARE.7.gz
+share/man/man7/PREPARE_TRANSACTION.7.gz
+share/man/man7/REASSIGN_OWNED.7.gz
+share/man/man7/REFRESH_MATERIALIZED_VIEW.7.gz
+share/man/man7/REINDEX.7.gz
+share/man/man7/RELEASE_SAVEPOINT.7.gz
+share/man/man7/RESET.7.gz
+share/man/man7/REVOKE.7.gz
+share/man/man7/ROLLBACK.7.gz
+share/man/man7/ROLLBACK_PREPARED.7.gz
+share/man/man7/ROLLBACK_TO_SAVEPOINT.7.gz
+share/man/man7/SAVEPOINT.7.gz
+share/man/man7/SECURITY_LABEL.7.gz
+share/man/man7/SELECT.7.gz
+share/man/man7/SELECT_INTO.7.gz
+share/man/man7/SET.7.gz
+share/man/man7/SET_CONSTRAINTS.7.gz
+share/man/man7/SET_ROLE.7.gz
+share/man/man7/SET_SESSION_AUTHORIZATION.7.gz
+share/man/man7/SET_TRANSACTION.7.gz
+share/man/man7/SHOW.7.gz
+share/man/man7/START_TRANSACTION.7.gz
+share/man/man7/TABLE.7.gz
+share/man/man7/TRUNCATE.7.gz
+share/man/man7/UNLISTEN.7.gz
+share/man/man7/UPDATE.7.gz
+share/man/man7/VACUUM.7.gz
+share/man/man7/VALUES.7.gz
+share/man/man7/WITH.7.gz
+%%PORTDOCS%%%%DOCSDIR%%/README-client
+%%NLS%%share/locale/cs/LC_MESSAGES/ecpg-%%PG_VERSION%%.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/ecpglib6-%%PG_VERSION%%.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/libpq5-%%PG_VERSION%%.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/pg_config-%%PG_VERSION%%.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/pg_dump-%%PG_VERSION%%.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/pgscripts-%%PG_VERSION%%.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/psql-%%PG_VERSION%%.mo
+%%NLS%%share/locale/de/LC_MESSAGES/ecpg-%%PG_VERSION%%.mo
+%%NLS%%share/locale/de/LC_MESSAGES/ecpglib6-%%PG_VERSION%%.mo
+%%NLS%%share/locale/de/LC_MESSAGES/libpq5-%%PG_VERSION%%.mo
+%%NLS%%share/locale/de/LC_MESSAGES/pg_amcheck-%%PG_VERSION%%.mo
+%%NLS%%share/locale/de/LC_MESSAGES/pg_config-%%PG_VERSION%%.mo
+%%NLS%%share/locale/de/LC_MESSAGES/pg_dump-%%PG_VERSION%%.mo
+%%NLS%%share/locale/de/LC_MESSAGES/pgscripts-%%PG_VERSION%%.mo
+%%NLS%%share/locale/de/LC_MESSAGES/psql-%%PG_VERSION%%.mo
+%%NLS%%share/locale/el/LC_MESSAGES/ecpg-%%PG_VERSION%%.mo
+%%NLS%%share/locale/el/LC_MESSAGES/ecpglib6-%%PG_VERSION%%.mo
+%%NLS%%share/locale/el/LC_MESSAGES/libpq5-%%PG_VERSION%%.mo
+%%NLS%%share/locale/el/LC_MESSAGES/pg_amcheck-%%PG_VERSION%%.mo
+%%NLS%%share/locale/el/LC_MESSAGES/pg_config-%%PG_VERSION%%.mo
+%%NLS%%share/locale/el/LC_MESSAGES/pg_dump-%%PG_VERSION%%.mo
+%%NLS%%share/locale/el/LC_MESSAGES/pgscripts-%%PG_VERSION%%.mo
+%%NLS%%share/locale/el/LC_MESSAGES/psql-%%PG_VERSION%%.mo
+%%NLS%%share/locale/es/LC_MESSAGES/ecpg-%%PG_VERSION%%.mo
+%%NLS%%share/locale/es/LC_MESSAGES/ecpglib6-%%PG_VERSION%%.mo
+%%NLS%%share/locale/es/LC_MESSAGES/libpq5-%%PG_VERSION%%.mo
+%%NLS%%share/locale/es/LC_MESSAGES/pg_amcheck-%%PG_VERSION%%.mo
+%%NLS%%share/locale/es/LC_MESSAGES/pg_config-%%PG_VERSION%%.mo
+%%NLS%%share/locale/es/LC_MESSAGES/pg_dump-%%PG_VERSION%%.mo
+%%NLS%%share/locale/es/LC_MESSAGES/pgscripts-%%PG_VERSION%%.mo
+%%NLS%%share/locale/es/LC_MESSAGES/psql-%%PG_VERSION%%.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/ecpg-%%PG_VERSION%%.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/ecpglib6-%%PG_VERSION%%.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/libpq5-%%PG_VERSION%%.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/pg_amcheck-%%PG_VERSION%%.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/pg_config-%%PG_VERSION%%.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/pg_dump-%%PG_VERSION%%.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/pgscripts-%%PG_VERSION%%.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/psql-%%PG_VERSION%%.mo
+%%NLS%%share/locale/he/LC_MESSAGES/pg_config-%%PG_VERSION%%.mo
+%%NLS%%share/locale/it/LC_MESSAGES/ecpg-%%PG_VERSION%%.mo
+%%NLS%%share/locale/it/LC_MESSAGES/ecpglib6-%%PG_VERSION%%.mo
+%%NLS%%share/locale/it/LC_MESSAGES/libpq5-%%PG_VERSION%%.mo
+%%NLS%%share/locale/it/LC_MESSAGES/pg_amcheck-%%PG_VERSION%%.mo
+%%NLS%%share/locale/it/LC_MESSAGES/pg_config-%%PG_VERSION%%.mo
+%%NLS%%share/locale/it/LC_MESSAGES/pg_dump-%%PG_VERSION%%.mo
+%%NLS%%share/locale/it/LC_MESSAGES/pgscripts-%%PG_VERSION%%.mo
+%%NLS%%share/locale/it/LC_MESSAGES/psql-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/ecpg-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/ecpglib6-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/libpq5-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/pg_amcheck-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/pg_config-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/pg_dump-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/pgscripts-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/psql-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ka/LC_MESSAGES/ecpg-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ka/LC_MESSAGES/ecpglib6-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ka/LC_MESSAGES/libpq5-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ka/LC_MESSAGES/pg_amcheck-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ka/LC_MESSAGES/pg_config-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ka/LC_MESSAGES/pg_dump-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ka/LC_MESSAGES/pgscripts-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ka/LC_MESSAGES/psql-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/ecpg-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/ecpglib6-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/libpq5-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/pg_amcheck-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/pg_config-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/pg_dump-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/pgscripts-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/psql-%%PG_VERSION%%.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/ecpg-%%PG_VERSION%%.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/ecpglib6-%%PG_VERSION%%.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/pg_config-%%PG_VERSION%%.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/ecpg-%%PG_VERSION%%.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/ecpglib6-%%PG_VERSION%%.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/pg_config-%%PG_VERSION%%.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/pgscripts-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/ecpg-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/ecpglib6-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/libpq5-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/pg_amcheck-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/pg_config-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/pg_dump-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/pgscripts-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/psql-%%PG_VERSION%%.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/ecpg-%%PG_VERSION%%.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/ecpglib6-%%PG_VERSION%%.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/libpq5-%%PG_VERSION%%.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/pg_amcheck-%%PG_VERSION%%.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/pg_config-%%PG_VERSION%%.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/pg_dump-%%PG_VERSION%%.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/pgscripts-%%PG_VERSION%%.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/psql-%%PG_VERSION%%.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/ecpg-%%PG_VERSION%%.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/ecpglib6-%%PG_VERSION%%.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/pg_config-%%PG_VERSION%%.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/pg_dump-%%PG_VERSION%%.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/pgscripts-%%PG_VERSION%%.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/ecpg-%%PG_VERSION%%.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/ecpglib6-%%PG_VERSION%%.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/libpq5-%%PG_VERSION%%.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/pg_amcheck-%%PG_VERSION%%.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/pg_config-%%PG_VERSION%%.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/pg_dump-%%PG_VERSION%%.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/pgscripts-%%PG_VERSION%%.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/psql-%%PG_VERSION%%.mo
+%%NLS%%share/locale/vi/LC_MESSAGES/ecpg-%%PG_VERSION%%.mo
+%%NLS%%share/locale/vi/LC_MESSAGES/ecpglib6-%%PG_VERSION%%.mo
+%%NLS%%share/locale/vi/LC_MESSAGES/pg_config-%%PG_VERSION%%.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/ecpg-%%PG_VERSION%%.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/ecpglib6-%%PG_VERSION%%.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/libpq5-%%PG_VERSION%%.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/pg_amcheck-%%PG_VERSION%%.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/pg_config-%%PG_VERSION%%.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/pg_dump-%%PG_VERSION%%.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/pgscripts-%%PG_VERSION%%.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/psql-%%PG_VERSION%%.mo
+%%NLS%%share/locale/zh_TW/LC_MESSAGES/ecpg-%%PG_VERSION%%.mo
+%%DATADIR%%/pg_service.conf.sample
+%%DATADIR%%/psqlrc.sample
diff --git a/databases/postgresql15-server/pkg-plist-contrib b/databases/postgresql15-server/pkg-plist-contrib
new file mode 100644
index 000000000000..a957bae789cf
--- /dev/null
+++ b/databases/postgresql15-server/pkg-plist-contrib
@@ -0,0 +1,263 @@
+bin/oid2name
+bin/vacuumlo
+include/postgresql/server/extension/cube/cubedata.h
+include/postgresql/server/extension/hstore/hstore.h
+include/postgresql/server/extension/isn/isn.h
+include/postgresql/server/extension/ltree/ltree.h
+include/postgresql/server/extension/seg/segdata.h
+lib/postgresql/_int.so
+lib/postgresql/adminpack.so
+lib/postgresql/amcheck.so
+lib/postgresql/auth_delay.so
+lib/postgresql/auto_explain.so
+lib/postgresql/autoinc.so
+lib/postgresql/basebackup_to_shell.so
+lib/postgresql/basic_archive.so
+lib/postgresql/bloom.so
+lib/postgresql/btree_gin.so
+lib/postgresql/btree_gist.so
+lib/postgresql/citext.so
+lib/postgresql/cube.so
+lib/postgresql/dblink.so
+lib/postgresql/dict_int.so
+lib/postgresql/dict_xsyn.so
+lib/postgresql/earthdistance.so
+lib/postgresql/file_fdw.so
+lib/postgresql/fuzzystrmatch.so
+lib/postgresql/hstore.so
+lib/postgresql/insert_username.so
+lib/postgresql/isn.so
+lib/postgresql/lo.so
+lib/postgresql/ltree.so
+lib/postgresql/moddatetime.so
+lib/postgresql/old_snapshot.so
+lib/postgresql/pageinspect.so
+lib/postgresql/passwordcheck.so
+lib/postgresql/pg_buffercache.so
+lib/postgresql/pg_freespacemap.so
+lib/postgresql/pg_prewarm.so
+lib/postgresql/pg_stat_statements.so
+lib/postgresql/pg_surgery.so
+lib/postgresql/pg_trgm.so
+lib/postgresql/pg_visibility.so
+lib/postgresql/pg_walinspect.so
+lib/postgresql/pgcrypto.so
+lib/postgresql/pgrowlocks.so
+lib/postgresql/pgstattuple.so
+%%XML%%lib/postgresql/pgxml.so
+lib/postgresql/postgres_fdw.so
+lib/postgresql/refint.so
+lib/postgresql/seg.so
+%%OPENSSL%%lib/postgresql/sslinfo.so
+lib/postgresql/tablefunc.so
+lib/postgresql/tcn.so
+lib/postgresql/test_decoding.so
+lib/postgresql/tsm_system_rows.so
+lib/postgresql/tsm_system_time.so
+lib/postgresql/unaccent.so
+lib/postgresql/uuid-ossp.so
+%%PORTDOCS%%%%DOCSDIR%%/README-contrib
+%%PORTDOCS%%%%DOCSDIR%%/extension/README
+%%PORTDOCS%%%%DOCSDIR%%/extension/autoinc.example
+%%PORTDOCS%%%%DOCSDIR%%/extension/insert_username.example
+%%PORTDOCS%%%%DOCSDIR%%/extension/moddatetime.example
+%%PORTDOCS%%%%DOCSDIR%%/extension/refint.example
+%%DATADIR%%/extension/adminpack--1.0--1.1.sql
+%%DATADIR%%/extension/adminpack--1.0.sql
+%%DATADIR%%/extension/adminpack--1.1--2.0.sql
+%%DATADIR%%/extension/adminpack--2.0--2.1.sql
+%%DATADIR%%/extension/adminpack.control
+%%DATADIR%%/extension/amcheck--1.0--1.1.sql
+%%DATADIR%%/extension/amcheck--1.0.sql
+%%DATADIR%%/extension/amcheck--1.1--1.2.sql
+%%DATADIR%%/extension/amcheck--1.2--1.3.sql
+%%DATADIR%%/extension/amcheck.control
+%%DATADIR%%/extension/autoinc--1.0.sql
+%%DATADIR%%/extension/autoinc.control
+%%DATADIR%%/extension/bloom--1.0.sql
+%%DATADIR%%/extension/bloom.control
+%%DATADIR%%/extension/btree_gin--1.0--1.1.sql
+%%DATADIR%%/extension/btree_gin--1.0.sql
+%%DATADIR%%/extension/btree_gin--1.1--1.2.sql
+%%DATADIR%%/extension/btree_gin--1.2--1.3.sql
+%%DATADIR%%/extension/btree_gin.control
+%%DATADIR%%/extension/btree_gist--1.0--1.1.sql
+%%DATADIR%%/extension/btree_gist--1.1--1.2.sql
+%%DATADIR%%/extension/btree_gist--1.2--1.3.sql
+%%DATADIR%%/extension/btree_gist--1.2.sql
+%%DATADIR%%/extension/btree_gist--1.3--1.4.sql
+%%DATADIR%%/extension/btree_gist--1.4--1.5.sql
+%%DATADIR%%/extension/btree_gist--1.5--1.6.sql
+%%DATADIR%%/extension/btree_gist--1.6--1.7.sql
+%%DATADIR%%/extension/btree_gist.control
+%%DATADIR%%/extension/citext--1.0--1.1.sql
+%%DATADIR%%/extension/citext--1.1--1.2.sql
+%%DATADIR%%/extension/citext--1.2--1.3.sql
+%%DATADIR%%/extension/citext--1.3--1.4.sql
+%%DATADIR%%/extension/citext--1.4--1.5.sql
+%%DATADIR%%/extension/citext--1.4.sql
+%%DATADIR%%/extension/citext--1.5--1.6.sql
+%%DATADIR%%/extension/citext.control
+%%DATADIR%%/extension/cube--1.0--1.1.sql
+%%DATADIR%%/extension/cube--1.1--1.2.sql
+%%DATADIR%%/extension/cube--1.2--1.3.sql
+%%DATADIR%%/extension/cube--1.2.sql
+%%DATADIR%%/extension/cube--1.3--1.4.sql
+%%DATADIR%%/extension/cube--1.4--1.5.sql
+%%DATADIR%%/extension/cube.control
+%%DATADIR%%/extension/dblink--1.0--1.1.sql
+%%DATADIR%%/extension/dblink--1.1--1.2.sql
+%%DATADIR%%/extension/dblink--1.2.sql
+%%DATADIR%%/extension/dblink.control
+%%DATADIR%%/extension/dict_int--1.0.sql
+%%DATADIR%%/extension/dict_int.control
+%%DATADIR%%/extension/dict_xsyn--1.0.sql
+%%DATADIR%%/extension/dict_xsyn.control
+%%DATADIR%%/extension/earthdistance--1.0--1.1.sql
+%%DATADIR%%/extension/earthdistance--1.1.sql
+%%DATADIR%%/extension/earthdistance.control
+%%DATADIR%%/extension/file_fdw--1.0.sql
+%%DATADIR%%/extension/file_fdw.control
+%%DATADIR%%/extension/fuzzystrmatch--1.0--1.1.sql
+%%DATADIR%%/extension/fuzzystrmatch--1.1.sql
+%%DATADIR%%/extension/fuzzystrmatch.control
+%%DATADIR%%/extension/hstore--1.1--1.2.sql
+%%DATADIR%%/extension/hstore--1.2--1.3.sql
+%%DATADIR%%/extension/hstore--1.3--1.4.sql
+%%DATADIR%%/extension/hstore--1.4--1.5.sql
+%%DATADIR%%/extension/hstore--1.4.sql
+%%DATADIR%%/extension/hstore--1.5--1.6.sql
+%%DATADIR%%/extension/hstore--1.6--1.7.sql
+%%DATADIR%%/extension/hstore--1.7--1.8.sql
+%%DATADIR%%/extension/hstore.control
+%%DATADIR%%/extension/insert_username--1.0.sql
+%%DATADIR%%/extension/insert_username.control
+%%DATADIR%%/extension/intagg--1.0--1.1.sql
+%%DATADIR%%/extension/intagg--1.1.sql
+%%DATADIR%%/extension/intagg.control
+%%DATADIR%%/extension/intarray--1.0--1.1.sql
+%%DATADIR%%/extension/intarray--1.1--1.2.sql
+%%DATADIR%%/extension/intarray--1.2--1.3.sql
+%%DATADIR%%/extension/intarray--1.2.sql
+%%DATADIR%%/extension/intarray--1.3--1.4.sql
+%%DATADIR%%/extension/intarray--1.4--1.5.sql
+%%DATADIR%%/extension/intarray.control
+%%DATADIR%%/extension/isn--1.0--1.1.sql
+%%DATADIR%%/extension/isn--1.1--1.2.sql
+%%DATADIR%%/extension/isn--1.1.sql
+%%DATADIR%%/extension/isn.control
+%%DATADIR%%/extension/lo--1.0--1.1.sql
+%%DATADIR%%/extension/lo--1.1.sql
+%%DATADIR%%/extension/lo.control
+%%DATADIR%%/extension/ltree--1.0--1.1.sql
+%%DATADIR%%/extension/ltree--1.1--1.2.sql
+%%DATADIR%%/extension/ltree--1.1.sql
+%%DATADIR%%/extension/ltree.control
+%%DATADIR%%/extension/moddatetime--1.0.sql
+%%DATADIR%%/extension/moddatetime.control
+%%DATADIR%%/extension/old_snapshot--1.0.sql
+%%DATADIR%%/extension/old_snapshot.control
+%%DATADIR%%/extension/pageinspect--1.0--1.1.sql
+%%DATADIR%%/extension/pageinspect--1.1--1.2.sql
+%%DATADIR%%/extension/pageinspect--1.10--1.11.sql
+%%DATADIR%%/extension/pageinspect--1.2--1.3.sql
+%%DATADIR%%/extension/pageinspect--1.3--1.4.sql
+%%DATADIR%%/extension/pageinspect--1.4--1.5.sql
+%%DATADIR%%/extension/pageinspect--1.5--1.6.sql
+%%DATADIR%%/extension/pageinspect--1.5.sql
+%%DATADIR%%/extension/pageinspect--1.6--1.7.sql
+%%DATADIR%%/extension/pageinspect--1.7--1.8.sql
+%%DATADIR%%/extension/pageinspect--1.8--1.9.sql
+%%DATADIR%%/extension/pageinspect--1.9--1.10.sql
+%%DATADIR%%/extension/pageinspect.control
+%%DATADIR%%/extension/pg_buffercache--1.0--1.1.sql
+%%DATADIR%%/extension/pg_buffercache--1.1--1.2.sql
+%%DATADIR%%/extension/pg_buffercache--1.2--1.3.sql
+%%DATADIR%%/extension/pg_buffercache--1.2.sql
+%%DATADIR%%/extension/pg_buffercache.control
+%%DATADIR%%/extension/pg_freespacemap--1.0--1.1.sql
+%%DATADIR%%/extension/pg_freespacemap--1.1--1.2.sql
+%%DATADIR%%/extension/pg_freespacemap--1.1.sql
+%%DATADIR%%/extension/pg_freespacemap.control
+%%DATADIR%%/extension/pg_prewarm--1.0--1.1.sql
+%%DATADIR%%/extension/pg_prewarm--1.1--1.2.sql
+%%DATADIR%%/extension/pg_prewarm--1.1.sql
+%%DATADIR%%/extension/pg_prewarm.control
+%%DATADIR%%/extension/pg_stat_statements--1.0--1.1.sql
+%%DATADIR%%/extension/pg_stat_statements--1.1--1.2.sql
+%%DATADIR%%/extension/pg_stat_statements--1.2--1.3.sql
+%%DATADIR%%/extension/pg_stat_statements--1.3--1.4.sql
+%%DATADIR%%/extension/pg_stat_statements--1.4--1.5.sql
+%%DATADIR%%/extension/pg_stat_statements--1.4.sql
+%%DATADIR%%/extension/pg_stat_statements--1.5--1.6.sql
+%%DATADIR%%/extension/pg_stat_statements--1.6--1.7.sql
+%%DATADIR%%/extension/pg_stat_statements--1.7--1.8.sql
+%%DATADIR%%/extension/pg_stat_statements--1.8--1.9.sql
+%%DATADIR%%/extension/pg_stat_statements--1.9--1.10.sql
+%%DATADIR%%/extension/pg_stat_statements.control
+%%DATADIR%%/extension/pg_surgery--1.0.sql
+%%DATADIR%%/extension/pg_surgery.control
+%%DATADIR%%/extension/pg_trgm--1.0--1.1.sql
+%%DATADIR%%/extension/pg_trgm--1.1--1.2.sql
+%%DATADIR%%/extension/pg_trgm--1.2--1.3.sql
+%%DATADIR%%/extension/pg_trgm--1.3--1.4.sql
+%%DATADIR%%/extension/pg_trgm--1.3.sql
+%%DATADIR%%/extension/pg_trgm--1.4--1.5.sql
+%%DATADIR%%/extension/pg_trgm--1.5--1.6.sql
+%%DATADIR%%/extension/pg_trgm.control
+%%DATADIR%%/extension/pg_visibility--1.0--1.1.sql
+%%DATADIR%%/extension/pg_visibility--1.1--1.2.sql
+%%DATADIR%%/extension/pg_visibility--1.1.sql
+%%DATADIR%%/extension/pg_visibility.control
+%%DATADIR%%/extension/pg_walinspect--1.0.sql
+%%DATADIR%%/extension/pg_walinspect.control
+%%DATADIR%%/extension/pgcrypto--1.0--1.1.sql
+%%DATADIR%%/extension/pgcrypto--1.1--1.2.sql
+%%DATADIR%%/extension/pgcrypto--1.2--1.3.sql
+%%DATADIR%%/extension/pgcrypto--1.3.sql
+%%DATADIR%%/extension/pgcrypto.control
+%%DATADIR%%/extension/pgrowlocks--1.0--1.1.sql
+%%DATADIR%%/extension/pgrowlocks--1.1--1.2.sql
+%%DATADIR%%/extension/pgrowlocks--1.2.sql
+%%DATADIR%%/extension/pgrowlocks.control
+%%DATADIR%%/extension/pgstattuple--1.0--1.1.sql
+%%DATADIR%%/extension/pgstattuple--1.1--1.2.sql
+%%DATADIR%%/extension/pgstattuple--1.2--1.3.sql
+%%DATADIR%%/extension/pgstattuple--1.3--1.4.sql
+%%DATADIR%%/extension/pgstattuple--1.4--1.5.sql
+%%DATADIR%%/extension/pgstattuple--1.4.sql
+%%DATADIR%%/extension/pgstattuple.control
+%%DATADIR%%/extension/postgres_fdw--1.0--1.1.sql
+%%DATADIR%%/extension/postgres_fdw--1.0.sql
+%%DATADIR%%/extension/postgres_fdw.control
+%%DATADIR%%/extension/refint--1.0.sql
+%%DATADIR%%/extension/refint.control
+%%DATADIR%%/extension/seg--1.0--1.1.sql
+%%DATADIR%%/extension/seg--1.1--1.2.sql
+%%DATADIR%%/extension/seg--1.1.sql
+%%DATADIR%%/extension/seg--1.2--1.3.sql
+%%DATADIR%%/extension/seg--1.3--1.4.sql
+%%DATADIR%%/extension/seg.control
+%%OPENSSL%%%%DATADIR%%/extension/sslinfo--1.0--1.1.sql
+%%OPENSSL%%%%DATADIR%%/extension/sslinfo--1.1--1.2.sql
+%%OPENSSL%%%%DATADIR%%/extension/sslinfo--1.2.sql
+%%OPENSSL%%%%DATADIR%%/extension/sslinfo.control
+%%DATADIR%%/extension/tablefunc--1.0.sql
+%%DATADIR%%/extension/tablefunc.control
+%%DATADIR%%/extension/tcn--1.0.sql
+%%DATADIR%%/extension/tcn.control
+%%DATADIR%%/extension/tsm_system_rows--1.0.sql
+%%DATADIR%%/extension/tsm_system_rows.control
+%%DATADIR%%/extension/tsm_system_time--1.0.sql
+%%DATADIR%%/extension/tsm_system_time.control
+%%DATADIR%%/extension/unaccent--1.0--1.1.sql
+%%DATADIR%%/extension/unaccent--1.1.sql
+%%DATADIR%%/extension/unaccent.control
+%%DATADIR%%/extension/uuid-ossp--1.0--1.1.sql
+%%DATADIR%%/extension/uuid-ossp--1.1.sql
+%%DATADIR%%/extension/uuid-ossp.control
+%%XML%%%%DATADIR%%/extension/xml2--1.0--1.1.sql
+%%XML%%%%DATADIR%%/extension/xml2--1.1.sql
+%%XML%%%%DATADIR%%/extension/xml2.control
+%%DATADIR%%/tsearch_data/unaccent.rules
+%%DATADIR%%/tsearch_data/xsyn_sample.rules
diff --git a/databases/postgresql15-server/pkg-plist-plperl b/databases/postgresql15-server/pkg-plist-plperl
new file mode 100644
index 000000000000..d2b1c7fd3143
--- /dev/null
+++ b/databases/postgresql15-server/pkg-plist-plperl
@@ -0,0 +1,25 @@
+include/postgresql/server/plperl.h
+include/postgresql/server/plperl_helpers.h
+include/postgresql/server/plperl_system.h
+include/postgresql/server/ppport.h
+%%DATADIR%%/extension/plperlu--1.0.sql
+%%DATADIR%%/extension/plperl.control
+%%DATADIR%%/extension/plperl--1.0.sql
+%%DATADIR%%/extension/plperlu.control
+%%DOCSDIR%%/README-plperl
+lib/postgresql/bool_plperl.so
+lib/postgresql/hstore_plperl.so
+lib/postgresql/jsonb_plperl.so
+lib/postgresql/plperl.so
+%%DATADIR%%/extension/bool_plperl--1.0.sql
+%%DATADIR%%/extension/bool_plperl.control
+%%DATADIR%%/extension/bool_plperlu--1.0.sql
+%%DATADIR%%/extension/bool_plperlu.control
+%%DATADIR%%/extension/hstore_plperl--1.0.sql
+%%DATADIR%%/extension/hstore_plperl.control
+%%DATADIR%%/extension/hstore_plperlu--1.0.sql
+%%DATADIR%%/extension/hstore_plperlu.control
+%%DATADIR%%/extension/jsonb_plperl--1.0.sql
+%%DATADIR%%/extension/jsonb_plperl.control
+%%DATADIR%%/extension/jsonb_plperlu--1.0.sql
+%%DATADIR%%/extension/jsonb_plperlu.control
diff --git a/databases/postgresql15-server/pkg-plist-plpython b/databases/postgresql15-server/pkg-plist-plpython
new file mode 100644
index 000000000000..23631de669b7
--- /dev/null
+++ b/databases/postgresql15-server/pkg-plist-plpython
@@ -0,0 +1,32 @@
+include/postgresql/server/plpy_cursorobject.h
+include/postgresql/server/plpy_elog.h
+include/postgresql/server/plpy_exec.h
+include/postgresql/server/plpy_main.h
+include/postgresql/server/plpy_planobject.h
+include/postgresql/server/plpy_plpymodule.h
+include/postgresql/server/plpy_procedure.h
+include/postgresql/server/plpy_resultobject.h
+include/postgresql/server/plpy_spi.h
+include/postgresql/server/plpy_subxactobject.h
+include/postgresql/server/plpy_typeio.h
+include/postgresql/server/plpy_util.h
+include/postgresql/server/plpython.h
+include/postgresql/server/plpython_system.h
+%%DOCSDIR%%/README-plpython
+%%PYTHON2%%lib/postgresql/plpython2.so
+%%PYTHON3%%lib/postgresql/plpython3.so
+%%PYTHON2%%%%DATADIR%%/extension/plpython2u--1.0.sql
+%%PYTHON2%%%%DATADIR%%/extension/plpython2u.control
+%%PYTHON3%%%%DATADIR%%/extension/plpython3u--1.0.sql
+%%PYTHON3%%%%DATADIR%%/extension/plpython3u.control
+%%PYTHON2%%%%DATADIR%%/extension/plpythonu--1.0.sql
+%%PYTHON2%%%%DATADIR%%/extension/plpythonu.control
+lib/postgresql/hstore_plpython3.so
+lib/postgresql/jsonb_plpython3.so
+lib/postgresql/ltree_plpython3.so
+%%DATADIR%%/extension/hstore_plpython3u--1.0.sql
+%%DATADIR%%/extension/hstore_plpython3u.control
+%%DATADIR%%/extension/jsonb_plpython3u--1.0.sql
+%%DATADIR%%/extension/jsonb_plpython3u.control
+%%DATADIR%%/extension/ltree_plpython3u--1.0.sql
+%%DATADIR%%/extension/ltree_plpython3u.control
diff --git a/databases/postgresql15-server/pkg-plist-pltcl b/databases/postgresql15-server/pkg-plist-pltcl
new file mode 100644
index 000000000000..05cf5edaac03
--- /dev/null
+++ b/databases/postgresql15-server/pkg-plist-pltcl
@@ -0,0 +1,6 @@
+%%DATADIR%%/extension/pltcl--1.0.sql
+%%DATADIR%%/extension/pltcl.control
+%%DATADIR%%/extension/pltclu.control
+%%DATADIR%%/extension/pltclu--1.0.sql
+%%DOCSDIR%%/README-pltcl
+lib/postgresql/pltcl.so
diff --git a/databases/postgresql15-server/pkg-plist-server b/databases/postgresql15-server/pkg-plist-server
new file mode 100644
index 000000000000..4399bd1bd895
--- /dev/null
+++ b/databases/postgresql15-server/pkg-plist-server
@@ -0,0 +1,1615 @@
+bin/initdb
+bin/pg_archivecleanup
+bin/pg_basebackup
+bin/pg_checksums
+bin/pg_controldata
+bin/pg_ctl
+bin/pg_receivewal
+bin/pg_recvlogical
+bin/pg_resetwal
+bin/pg_rewind
+bin/pg_test_fsync
+bin/pg_test_timing
+bin/pg_upgrade
+bin/pg_waldump
+bin/postgres
+bin/postmaster
+etc/periodic/daily/502.pgsql
+include/postgresql/server/plpgsql.h
+lib/libpgcommon.a
+lib/libpgcommon_shlib.a
+lib/postgresql/cyrillic_and_mic.so
+lib/postgresql/dict_snowball.so
+lib/postgresql/euc2004_sjis2004.so
+lib/postgresql/euc_cn_and_mic.so
+lib/postgresql/euc_jp_and_sjis.so
+lib/postgresql/euc_kr_and_mic.so
+lib/postgresql/euc_tw_and_big5.so
+lib/postgresql/latin2_and_win1250.so
+lib/postgresql/latin_and_mic.so
+lib/postgresql/libpqwalreceiver.so
+lib/postgresql/pgoutput.so
+lib/postgresql/plpgsql.so
+lib/postgresql/utf8_and_big5.so
+lib/postgresql/utf8_and_cyrillic.so
+lib/postgresql/utf8_and_euc2004.so
+lib/postgresql/utf8_and_euc_cn.so
+lib/postgresql/utf8_and_euc_jp.so
+lib/postgresql/utf8_and_euc_kr.so
+lib/postgresql/utf8_and_euc_tw.so
+lib/postgresql/utf8_and_gb18030.so
+lib/postgresql/utf8_and_gbk.so
+lib/postgresql/utf8_and_iso8859.so
+lib/postgresql/utf8_and_iso8859_1.so
+lib/postgresql/utf8_and_johab.so
+lib/postgresql/utf8_and_sjis.so
+lib/postgresql/utf8_and_sjis2004.so
+lib/postgresql/utf8_and_uhc.so
+lib/postgresql/utf8_and_win.so
+%%LLVM%%%%GSSAPI%%lib/postgresql/bitcode/postgres/libpq/be-gssapi-common.bc
+%%LLVM%%%%GSSAPI%%lib/postgresql/bitcode/postgres/libpq/be-secure-gssapi.bc
+%%LLVM%%%%SSL%%lib/postgresql/bitcode/postgres/libpq/be-secure-openssl.bc
+%%LLVM%%lib/postgresql/bitcode/postgres.index.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/brin/brin.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/brin/brin_bloom.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/brin/brin_inclusion.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/brin/brin_minmax.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/brin/brin_minmax_multi.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/brin/brin_pageops.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/brin/brin_revmap.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/brin/brin_tuple.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/brin/brin_validate.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/brin/brin_xlog.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/common/attmap.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/common/bufmask.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/common/detoast.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/common/heaptuple.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/common/indextuple.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/common/printsimple.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/common/printtup.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/common/relation.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/common/reloptions.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/common/scankey.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/common/session.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/common/syncscan.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/common/toast_compression.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/common/toast_internals.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/common/tupconvert.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/common/tupdesc.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/gin/ginarrayproc.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/gin/ginbtree.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/gin/ginbulk.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/gin/gindatapage.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/gin/ginentrypage.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/gin/ginfast.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/gin/ginget.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/gin/gininsert.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/gin/ginlogic.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/gin/ginpostinglist.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/gin/ginscan.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/gin/ginutil.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/gin/ginvacuum.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/gin/ginvalidate.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/gin/ginxlog.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/gist/gist.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/gist/gistbuild.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/gist/gistbuildbuffers.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/gist/gistget.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/gist/gistproc.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/gist/gistscan.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/gist/gistsplit.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/gist/gistutil.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/gist/gistvacuum.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/gist/gistvalidate.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/gist/gistxlog.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/hash/hash.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/hash/hash_xlog.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/hash/hashfunc.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/hash/hashinsert.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/hash/hashovfl.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/hash/hashpage.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/hash/hashsearch.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/hash/hashsort.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/hash/hashutil.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/hash/hashvalidate.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/heap/heapam.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/heap/heapam_handler.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/heap/heapam_visibility.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/heap/heaptoast.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/heap/hio.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/heap/pruneheap.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/heap/rewriteheap.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/heap/vacuumlazy.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/heap/visibilitymap.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/index/amapi.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/index/amvalidate.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/index/genam.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/index/indexam.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/nbtree/nbtcompare.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/nbtree/nbtdedup.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/nbtree/nbtinsert.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/nbtree/nbtpage.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/nbtree/nbtree.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/nbtree/nbtsearch.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/nbtree/nbtsort.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/nbtree/nbtsplitloc.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/nbtree/nbtutils.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/nbtree/nbtvalidate.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/nbtree/nbtxlog.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/rmgrdesc/brindesc.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/rmgrdesc/clogdesc.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/rmgrdesc/committsdesc.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/rmgrdesc/dbasedesc.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/rmgrdesc/genericdesc.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/rmgrdesc/gindesc.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/rmgrdesc/gistdesc.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/rmgrdesc/hashdesc.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/rmgrdesc/heapdesc.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/rmgrdesc/logicalmsgdesc.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/rmgrdesc/mxactdesc.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/rmgrdesc/nbtdesc.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/rmgrdesc/relmapdesc.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/rmgrdesc/replorigindesc.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/rmgrdesc/seqdesc.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/rmgrdesc/smgrdesc.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/rmgrdesc/spgdesc.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/rmgrdesc/standbydesc.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/rmgrdesc/tblspcdesc.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/rmgrdesc/xactdesc.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/rmgrdesc/xlogdesc.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/spgist/spgdoinsert.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/spgist/spginsert.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/spgist/spgkdtreeproc.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/spgist/spgproc.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/spgist/spgquadtreeproc.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/spgist/spgscan.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/spgist/spgtextproc.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/spgist/spgutils.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/spgist/spgvacuum.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/spgist/spgvalidate.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/spgist/spgxlog.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/table/table.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/table/tableam.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/table/tableamapi.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/table/toast_helper.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/tablesample/bernoulli.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/tablesample/system.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/tablesample/tablesample.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/transam/clog.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/transam/commit_ts.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/transam/generic_xlog.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/transam/multixact.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/transam/parallel.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/transam/rmgr.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/transam/slru.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/transam/subtrans.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/transam/timeline.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/transam/transam.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/transam/twophase.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/transam/twophase_rmgr.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/transam/varsup.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/transam/xact.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/transam/xlog.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/transam/xlogarchive.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/transam/xlogfuncs.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/transam/xloginsert.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/transam/xlogprefetcher.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/transam/xlogreader.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/transam/xlogrecovery.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/transam/xlogstats.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/transam/xlogutils.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/bootstrap/bootparse.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/bootstrap/bootstrap.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/catalog/aclchk.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/catalog/catalog.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/catalog/dependency.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/catalog/heap.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/catalog/index.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/catalog/indexing.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/catalog/namespace.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/catalog/objectaccess.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/catalog/objectaddress.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/catalog/partition.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/catalog/pg_aggregate.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/catalog/pg_attrdef.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/catalog/pg_cast.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/catalog/pg_class.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/catalog/pg_collation.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/catalog/pg_constraint.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/catalog/pg_conversion.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/catalog/pg_db_role_setting.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/catalog/pg_depend.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/catalog/pg_enum.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/catalog/pg_inherits.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/catalog/pg_largeobject.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/catalog/pg_namespace.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/catalog/pg_operator.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/catalog/pg_parameter_acl.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/catalog/pg_proc.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/catalog/pg_publication.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/catalog/pg_range.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/catalog/pg_shdepend.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/catalog/pg_subscription.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/catalog/pg_type.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/catalog/storage.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/catalog/toasting.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/commands/aggregatecmds.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/commands/alter.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/commands/amcmds.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/commands/analyze.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/commands/async.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/commands/cluster.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/commands/collationcmds.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/commands/comment.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/commands/constraint.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/commands/conversioncmds.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/commands/copy.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/commands/copyfrom.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/commands/copyfromparse.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/commands/copyto.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/commands/createas.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/commands/dbcommands.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/commands/define.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/commands/discard.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/commands/dropcmds.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/commands/event_trigger.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/commands/explain.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/commands/extension.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/commands/foreigncmds.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/commands/functioncmds.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/commands/indexcmds.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/commands/lockcmds.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/commands/matview.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/commands/opclasscmds.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/commands/operatorcmds.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/commands/policy.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/commands/portalcmds.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/commands/prepare.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/commands/proclang.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/commands/publicationcmds.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/commands/schemacmds.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/commands/seclabel.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/commands/sequence.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/commands/statscmds.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/commands/subscriptioncmds.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/commands/tablecmds.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/commands/tablespace.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/commands/trigger.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/commands/tsearchcmds.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/commands/typecmds.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/commands/user.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/commands/vacuum.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/commands/vacuumparallel.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/commands/variable.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/commands/view.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/executor/execAmi.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/executor/execAsync.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/executor/execCurrent.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/executor/execExpr.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/executor/execExprInterp.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/executor/execGrouping.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/executor/execIndexing.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/executor/execJunk.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/executor/execMain.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/executor/execParallel.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/executor/execPartition.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/executor/execProcnode.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/executor/execReplication.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/executor/execSRF.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/executor/execScan.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/executor/execTuples.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/executor/execUtils.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/executor/functions.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/executor/instrument.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/executor/nodeAgg.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/executor/nodeAppend.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/executor/nodeBitmapAnd.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/executor/nodeBitmapHeapscan.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/executor/nodeBitmapIndexscan.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/executor/nodeBitmapOr.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/executor/nodeCtescan.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/executor/nodeCustom.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/executor/nodeForeignscan.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/executor/nodeFunctionscan.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/executor/nodeGather.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/executor/nodeGatherMerge.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/executor/nodeGroup.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/executor/nodeHash.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/executor/nodeHashjoin.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/executor/nodeIncrementalSort.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/executor/nodeIndexonlyscan.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/executor/nodeIndexscan.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/executor/nodeLimit.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/executor/nodeLockRows.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/executor/nodeMaterial.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/executor/nodeMemoize.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/executor/nodeMergeAppend.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/executor/nodeMergejoin.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/executor/nodeModifyTable.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/executor/nodeNamedtuplestorescan.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/executor/nodeNestloop.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/executor/nodeProjectSet.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/executor/nodeRecursiveunion.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/executor/nodeResult.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/executor/nodeSamplescan.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/executor/nodeSeqscan.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/executor/nodeSetOp.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/executor/nodeSort.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/executor/nodeSubplan.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/executor/nodeSubqueryscan.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/executor/nodeTableFuncscan.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/executor/nodeTidrangescan.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/executor/nodeTidscan.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/executor/nodeUnique.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/executor/nodeValuesscan.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/executor/nodeWindowAgg.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/executor/nodeWorktablescan.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/executor/spi.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/executor/tqueue.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/executor/tstoreReceiver.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/foreign/foreign.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/jit/jit.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/lib/binaryheap.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/lib/bipartite_match.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/lib/bloomfilter.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/lib/dshash.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/lib/hyperloglog.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/lib/ilist.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/lib/integerset.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/lib/knapsack.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/lib/pairingheap.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/lib/rbtree.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/libpq/auth-sasl.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/libpq/auth-scram.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/libpq/auth.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/libpq/be-fsstubs.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/libpq/be-secure-common.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/libpq/be-secure.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/libpq/crypt.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/libpq/hba.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/libpq/ifaddr.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/libpq/pqcomm.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/libpq/pqformat.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/libpq/pqmq.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/libpq/pqsignal.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/main/main.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/nodes/bitmapset.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/nodes/copyfuncs.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/nodes/equalfuncs.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/nodes/extensible.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/nodes/list.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/nodes/makefuncs.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/nodes/nodeFuncs.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/nodes/nodes.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/nodes/outfuncs.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/nodes/params.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/nodes/print.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/nodes/read.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/nodes/readfuncs.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/nodes/tidbitmap.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/nodes/value.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/optimizer/geqo/geqo_copy.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/optimizer/geqo/geqo_cx.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/optimizer/geqo/geqo_erx.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/optimizer/geqo/geqo_eval.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/optimizer/geqo/geqo_main.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/optimizer/geqo/geqo_misc.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/optimizer/geqo/geqo_mutation.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/optimizer/geqo/geqo_ox1.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/optimizer/geqo/geqo_ox2.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/optimizer/geqo/geqo_pmx.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/optimizer/geqo/geqo_pool.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/optimizer/geqo/geqo_px.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/optimizer/geqo/geqo_random.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/optimizer/geqo/geqo_recombination.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/optimizer/geqo/geqo_selection.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/optimizer/path/allpaths.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/optimizer/path/clausesel.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/optimizer/path/costsize.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/optimizer/path/equivclass.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/optimizer/path/indxpath.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/optimizer/path/joinpath.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/optimizer/path/joinrels.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/optimizer/path/pathkeys.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/optimizer/path/tidpath.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/optimizer/plan/analyzejoins.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/optimizer/plan/createplan.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/optimizer/plan/initsplan.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/optimizer/plan/planagg.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/optimizer/plan/planmain.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/optimizer/plan/planner.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/optimizer/plan/setrefs.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/optimizer/plan/subselect.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/optimizer/prep/prepagg.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/optimizer/prep/prepjointree.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/optimizer/prep/prepqual.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/optimizer/prep/preptlist.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/optimizer/prep/prepunion.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/optimizer/util/appendinfo.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/optimizer/util/clauses.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/optimizer/util/inherit.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/optimizer/util/joininfo.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/optimizer/util/orclauses.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/optimizer/util/paramassign.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/optimizer/util/pathnode.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/optimizer/util/placeholder.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/optimizer/util/plancat.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/optimizer/util/predtest.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/optimizer/util/relnode.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/optimizer/util/restrictinfo.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/optimizer/util/tlist.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/optimizer/util/var.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/parser/analyze.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/parser/gram.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/parser/parse_agg.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/parser/parse_clause.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/parser/parse_coerce.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/parser/parse_collate.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/parser/parse_cte.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/parser/parse_enr.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/parser/parse_expr.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/parser/parse_func.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/parser/parse_merge.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/parser/parse_node.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/parser/parse_oper.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/parser/parse_param.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/parser/parse_relation.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/parser/parse_target.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/parser/parse_type.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/parser/parse_utilcmd.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/parser/parser.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/parser/scan.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/parser/scansup.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/partitioning/partbounds.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/partitioning/partdesc.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/partitioning/partprune.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/port/atomics.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/port/pg_sema.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/port/pg_shmem.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/postmaster/autovacuum.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/postmaster/auxprocess.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/postmaster/bgworker.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/postmaster/bgwriter.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/postmaster/checkpointer.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/postmaster/fork_process.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/postmaster/interrupt.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/postmaster/pgarch.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/postmaster/postmaster.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/postmaster/shell_archive.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/postmaster/startup.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/postmaster/syslogger.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/postmaster/walwriter.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/regex/regcomp.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/regex/regerror.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/regex/regexec.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/regex/regexport.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/regex/regfree.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/regex/regprefix.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/backup/backup_manifest.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/backup/basebackup.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/backup/basebackup_copy.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/backup/basebackup_gzip.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/backup/basebackup_lz4.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/backup/basebackup_progress.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/backup/basebackup_server.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/backup/basebackup_sink.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/backup/basebackup_target.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/backup/basebackup_throttle.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/backup/basebackup_zstd.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/replication/logical/decode.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/replication/logical/launcher.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/replication/logical/logical.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/replication/logical/logicalfuncs.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/replication/logical/message.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/replication/logical/origin.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/replication/logical/proto.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/replication/logical/relation.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/replication/logical/reorderbuffer.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/replication/logical/snapbuild.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/replication/logical/tablesync.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/replication/logical/worker.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/replication/repl_gram.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/replication/slot.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/replication/slotfuncs.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/replication/syncrep.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/replication/syncrep_gram.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/replication/walreceiver.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/replication/walreceiverfuncs.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/replication/walsender.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/rewrite/rewriteDefine.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/rewrite/rewriteHandler.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/rewrite/rewriteManip.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/rewrite/rewriteRemove.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/rewrite/rewriteSearchCycle.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/rewrite/rewriteSupport.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/rewrite/rowsecurity.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/statistics/dependencies.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/statistics/extended_stats.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/statistics/mcv.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/statistics/mvdistinct.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/storage/buffer/buf_init.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/storage/buffer/buf_table.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/storage/buffer/bufmgr.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/storage/buffer/freelist.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/storage/buffer/localbuf.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/storage/file/buffile.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/storage/file/copydir.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/storage/file/fd.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/storage/file/fileset.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/storage/file/reinit.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/storage/file/sharedfileset.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/storage/freespace/freespace.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/storage/freespace/fsmpage.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/storage/freespace/indexfsm.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/storage/ipc/barrier.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/storage/ipc/dsm.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/storage/ipc/dsm_impl.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/storage/ipc/ipc.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/storage/ipc/ipci.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/storage/ipc/latch.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/storage/ipc/pmsignal.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/storage/ipc/procarray.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/storage/ipc/procsignal.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/storage/ipc/shm_mq.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/storage/ipc/shm_toc.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/storage/ipc/shmem.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/storage/ipc/shmqueue.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/storage/ipc/signalfuncs.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/storage/ipc/sinval.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/storage/ipc/sinvaladt.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/storage/ipc/standby.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/storage/large_object/inv_api.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/storage/lmgr/condition_variable.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/storage/lmgr/deadlock.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/storage/lmgr/lmgr.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/storage/lmgr/lock.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/storage/lmgr/lwlock.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/storage/lmgr/lwlocknames.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/storage/lmgr/predicate.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/storage/lmgr/proc.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/storage/lmgr/s_lock.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/storage/lmgr/spin.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/storage/page/bufpage.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/storage/page/checksum.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/storage/page/itemptr.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/storage/smgr/md.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/storage/smgr/smgr.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/storage/sync/sync.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/tcop/cmdtag.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/tcop/dest.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/tcop/fastpath.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/tcop/postgres.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/tcop/pquery.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/tcop/utility.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/tsearch/dict.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/tsearch/dict_ispell.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/tsearch/dict_simple.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/tsearch/dict_synonym.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/tsearch/dict_thesaurus.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/tsearch/regis.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/tsearch/spell.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/tsearch/to_tsany.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/tsearch/ts_locale.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/tsearch/ts_parse.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/tsearch/ts_selfuncs.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/tsearch/ts_typanalyze.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/tsearch/ts_utils.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/tsearch/wparser.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/tsearch/wparser_def.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/activity/backend_progress.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/activity/backend_status.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/activity/pgstat.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/activity/pgstat_archiver.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/activity/pgstat_bgwriter.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/activity/pgstat_checkpointer.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/activity/pgstat_database.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/activity/pgstat_function.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/activity/pgstat_relation.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/activity/pgstat_replslot.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/activity/pgstat_shmem.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/activity/pgstat_slru.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/activity/pgstat_subscription.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/activity/pgstat_wal.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/activity/pgstat_xact.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/activity/wait_event.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/acl.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/amutils.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/array_expanded.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/array_selfuncs.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/array_typanalyze.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/array_userfuncs.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/arrayfuncs.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/arraysubs.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/arrayutils.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/ascii.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/bool.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/cash.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/char.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/cryptohashfuncs.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/date.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/datetime.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/datum.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/dbsize.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/domains.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/encode.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/enum.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/expandeddatum.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/expandedrecord.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/float.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/format_type.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/formatting.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/genfile.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/geo_ops.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/geo_selfuncs.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/geo_spgist.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/hbafuncs.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/inet_cidr_ntop.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/inet_net_pton.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/int.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/int8.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/json.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/jsonb.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/jsonb_gin.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/jsonb_op.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/jsonb_util.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/jsonbsubs.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/jsonfuncs.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/jsonpath.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/jsonpath_exec.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/jsonpath_gram.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/like.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/like_support.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/lockfuncs.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/mac.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/mac8.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/mcxtfuncs.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/misc.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/multirangetypes.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/multirangetypes_selfuncs.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/name.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/network.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/network_gist.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/network_selfuncs.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/network_spgist.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/numeric.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/numutils.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/oid.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/oracle_compat.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/orderedsetaggs.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/partitionfuncs.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/pg_locale.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/pg_lsn.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/pg_upgrade_support.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/pgstatfuncs.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/pseudotypes.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/quote.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/rangetypes.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/rangetypes_gist.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/rangetypes_selfuncs.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/rangetypes_spgist.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/rangetypes_typanalyze.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/regexp.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/regproc.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/ri_triggers.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/rowtypes.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/ruleutils.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/selfuncs.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/tid.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/timestamp.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/trigfuncs.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/tsginidx.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/tsgistidx.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/tsquery.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/tsquery_cleanup.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/tsquery_gist.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/tsquery_op.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/tsquery_rewrite.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/tsquery_util.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/tsrank.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/tsvector.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/tsvector_op.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/tsvector_parser.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/uuid.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/varbit.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/varchar.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/varlena.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/version.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/windowfuncs.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/xid.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/xid8funcs.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/xml.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/cache/attoptcache.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/cache/catcache.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/cache/evtcache.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/cache/inval.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/cache/lsyscache.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/cache/partcache.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/cache/plancache.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/cache/relcache.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/cache/relfilenodemap.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/cache/relmapper.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/cache/spccache.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/cache/syscache.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/cache/ts_cache.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/cache/typcache.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/error/assert.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/error/csvlog.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/error/elog.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/error/jsonlog.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/fmgr/dfmgr.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/fmgr/fmgr.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/fmgr/funcapi.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/fmgrtab.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/hash/dynahash.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/hash/pg_crc.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/init/globals.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/init/miscinit.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/init/postinit.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/mb/conv.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/mb/mbutils.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/mb/stringinfo_mb.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/mb/wstrcmp.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/mb/wstrncmp.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/misc/guc.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/misc/help_config.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/misc/pg_config.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/misc/pg_controldata.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/misc/pg_rusage.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/misc/ps_status.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/misc/queryenvironment.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/misc/queryjumble.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/misc/rls.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/misc/sampling.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/misc/superuser.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/misc/timeout.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/misc/tzparser.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/mmgr/aset.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/mmgr/dsa.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/mmgr/freepage.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/mmgr/generation.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/mmgr/mcxt.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/mmgr/memdebug.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/mmgr/portalmem.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/mmgr/slab.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/resowner/resowner.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/sort/logtape.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/sort/qsort_interruptible.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/sort/sharedtuplestore.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/sort/sortsupport.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/sort/tuplesort.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/sort/tuplestore.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/time/combocid.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/time/snapmgr.bc
+%%LLVM%%lib/postgresql/llvmjit.so
+%%LLVM%%lib/postgresql/llvmjit_types.bc
+%%PORTDOCS%%%%DOCSDIR%%/README-server
+%%DATADIR%%/errcodes.txt
+%%DATADIR%%/extension/plpgsql--1.0.sql
+%%DATADIR%%/extension/plpgsql.control
+%%DATADIR%%/information_schema.sql
+%%DATADIR%%/pg_hba.conf.sample
+%%DATADIR%%/pg_ident.conf.sample
+%%DATADIR%%/postgres.bki
+%%DATADIR%%/postgresql.conf.sample
+%%DATADIR%%/snowball_create.sql
+%%DATADIR%%/sql_features.txt
+%%DATADIR%%/system_constraints.sql
+%%DATADIR%%/system_functions.sql
+%%DATADIR%%/system_views.sql
+%%NLS%%share/locale/cs/LC_MESSAGES/pg_archivecleanup-%%PG_VERSION%%.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/pg_controldata-%%PG_VERSION%%.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/pg_ctl-%%PG_VERSION%%.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/pg_resetwal-%%PG_VERSION%%.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/pg_upgrade-%%PG_VERSION%%.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/plpgsql-%%PG_VERSION%%.mo
+%%NLS%%share/locale/de/LC_MESSAGES/initdb-%%PG_VERSION%%.mo
+%%NLS%%share/locale/de/LC_MESSAGES/pg_archivecleanup-%%PG_VERSION%%.mo
+%%NLS%%share/locale/de/LC_MESSAGES/pg_basebackup-%%PG_VERSION%%.mo
+%%NLS%%share/locale/de/LC_MESSAGES/pg_checksums-%%PG_VERSION%%.mo
+%%NLS%%share/locale/de/LC_MESSAGES/pg_controldata-%%PG_VERSION%%.mo
+%%NLS%%share/locale/de/LC_MESSAGES/pg_ctl-%%PG_VERSION%%.mo
+%%NLS%%share/locale/de/LC_MESSAGES/pg_resetwal-%%PG_VERSION%%.mo
+%%NLS%%share/locale/de/LC_MESSAGES/pg_rewind-%%PG_VERSION%%.mo
+%%NLS%%share/locale/de/LC_MESSAGES/pg_test_fsync-%%PG_VERSION%%.mo
+%%NLS%%share/locale/de/LC_MESSAGES/pg_test_timing-%%PG_VERSION%%.mo
+%%NLS%%share/locale/de/LC_MESSAGES/pg_upgrade-%%PG_VERSION%%.mo
+%%NLS%%share/locale/de/LC_MESSAGES/pg_waldump-%%PG_VERSION%%.mo
+%%NLS%%share/locale/de/LC_MESSAGES/plpgsql-%%PG_VERSION%%.mo
+%%NLS%%share/locale/de/LC_MESSAGES/postgres-%%PG_VERSION%%.mo
+%%NLS%%share/locale/el/LC_MESSAGES/initdb-%%PG_VERSION%%.mo
+%%NLS%%share/locale/el/LC_MESSAGES/pg_archivecleanup-%%PG_VERSION%%.mo
+%%NLS%%share/locale/el/LC_MESSAGES/pg_basebackup-%%PG_VERSION%%.mo
+%%NLS%%share/locale/el/LC_MESSAGES/pg_checksums-%%PG_VERSION%%.mo
+%%NLS%%share/locale/el/LC_MESSAGES/pg_controldata-%%PG_VERSION%%.mo
+%%NLS%%share/locale/el/LC_MESSAGES/pg_ctl-%%PG_VERSION%%.mo
+%%NLS%%share/locale/el/LC_MESSAGES/pg_resetwal-%%PG_VERSION%%.mo
+%%NLS%%share/locale/el/LC_MESSAGES/pg_rewind-%%PG_VERSION%%.mo
+%%NLS%%share/locale/el/LC_MESSAGES/pg_test_fsync-%%PG_VERSION%%.mo
+%%NLS%%share/locale/el/LC_MESSAGES/pg_test_timing-%%PG_VERSION%%.mo
+%%NLS%%share/locale/el/LC_MESSAGES/pg_waldump-%%PG_VERSION%%.mo
+%%NLS%%share/locale/el/LC_MESSAGES/plpgsql-%%PG_VERSION%%.mo
+%%NLS%%share/locale/es/LC_MESSAGES/initdb-%%PG_VERSION%%.mo
+%%NLS%%share/locale/es/LC_MESSAGES/pg_archivecleanup-%%PG_VERSION%%.mo
+%%NLS%%share/locale/es/LC_MESSAGES/pg_basebackup-%%PG_VERSION%%.mo
+%%NLS%%share/locale/es/LC_MESSAGES/pg_checksums-%%PG_VERSION%%.mo
+%%NLS%%share/locale/es/LC_MESSAGES/pg_controldata-%%PG_VERSION%%.mo
+%%NLS%%share/locale/es/LC_MESSAGES/pg_ctl-%%PG_VERSION%%.mo
+%%NLS%%share/locale/es/LC_MESSAGES/pg_resetwal-%%PG_VERSION%%.mo
+%%NLS%%share/locale/es/LC_MESSAGES/pg_rewind-%%PG_VERSION%%.mo
+%%NLS%%share/locale/es/LC_MESSAGES/pg_test_fsync-%%PG_VERSION%%.mo
+%%NLS%%share/locale/es/LC_MESSAGES/pg_test_timing-%%PG_VERSION%%.mo
+%%NLS%%share/locale/es/LC_MESSAGES/pg_upgrade-%%PG_VERSION%%.mo
+%%NLS%%share/locale/es/LC_MESSAGES/pg_waldump-%%PG_VERSION%%.mo
+%%NLS%%share/locale/es/LC_MESSAGES/plpgsql-%%PG_VERSION%%.mo
+%%NLS%%share/locale/es/LC_MESSAGES/postgres-%%PG_VERSION%%.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/initdb-%%PG_VERSION%%.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/pg_archivecleanup-%%PG_VERSION%%.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/pg_basebackup-%%PG_VERSION%%.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/pg_checksums-%%PG_VERSION%%.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/pg_controldata-%%PG_VERSION%%.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/pg_ctl-%%PG_VERSION%%.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/pg_resetwal-%%PG_VERSION%%.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/pg_rewind-%%PG_VERSION%%.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/pg_test_fsync-%%PG_VERSION%%.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/pg_test_timing-%%PG_VERSION%%.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/pg_upgrade-%%PG_VERSION%%.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/pg_waldump-%%PG_VERSION%%.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/plpgsql-%%PG_VERSION%%.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/postgres-%%PG_VERSION%%.mo
+%%NLS%%share/locale/it/LC_MESSAGES/initdb-%%PG_VERSION%%.mo
+%%NLS%%share/locale/it/LC_MESSAGES/pg_archivecleanup-%%PG_VERSION%%.mo
+%%NLS%%share/locale/it/LC_MESSAGES/pg_basebackup-%%PG_VERSION%%.mo
+%%NLS%%share/locale/it/LC_MESSAGES/pg_checksums-%%PG_VERSION%%.mo
+%%NLS%%share/locale/it/LC_MESSAGES/pg_controldata-%%PG_VERSION%%.mo
+%%NLS%%share/locale/it/LC_MESSAGES/pg_ctl-%%PG_VERSION%%.mo
+%%NLS%%share/locale/it/LC_MESSAGES/pg_resetwal-%%PG_VERSION%%.mo
+%%NLS%%share/locale/it/LC_MESSAGES/pg_rewind-%%PG_VERSION%%.mo
+%%NLS%%share/locale/it/LC_MESSAGES/pg_test_fsync-%%PG_VERSION%%.mo
+%%NLS%%share/locale/it/LC_MESSAGES/pg_test_timing-%%PG_VERSION%%.mo
+%%NLS%%share/locale/it/LC_MESSAGES/pg_upgrade-%%PG_VERSION%%.mo
+%%NLS%%share/locale/it/LC_MESSAGES/pg_waldump-%%PG_VERSION%%.mo
+%%NLS%%share/locale/it/LC_MESSAGES/plpgsql-%%PG_VERSION%%.mo
+%%NLS%%share/locale/it/LC_MESSAGES/postgres-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/initdb-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/pg_archivecleanup-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/pg_basebackup-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/pg_checksums-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/pg_controldata-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/pg_ctl-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/pg_resetwal-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/pg_rewind-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/pg_test_fsync-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/pg_test_timing-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/pg_upgrade-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/pg_waldump-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/plpgsql-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/postgres-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ka/LC_MESSAGES/initdb-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ka/LC_MESSAGES/pg_archivecleanup-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ka/LC_MESSAGES/pg_basebackup-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ka/LC_MESSAGES/pg_checksums-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ka/LC_MESSAGES/pg_controldata-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ka/LC_MESSAGES/pg_ctl-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ka/LC_MESSAGES/pg_resetwal-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ka/LC_MESSAGES/pg_rewind-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ka/LC_MESSAGES/pg_test_fsync-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ka/LC_MESSAGES/pg_test_timing-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ka/LC_MESSAGES/pg_upgrade-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ka/LC_MESSAGES/pg_waldump-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ka/LC_MESSAGES/plpgsql-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ka/LC_MESSAGES/postgres-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/initdb-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/pg_archivecleanup-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/pg_basebackup-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/pg_checksums-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/pg_controldata-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/pg_ctl-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/pg_resetwal-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/pg_rewind-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/pg_test_fsync-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/pg_test_timing-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/pg_upgrade-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/pg_waldump-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/plpgsql-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/postgres-%%PG_VERSION%%.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/plpgsql-%%PG_VERSION%%.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/initdb-%%PG_VERSION%%.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/pg_archivecleanup-%%PG_VERSION%%.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/pg_checksums-%%PG_VERSION%%.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/pg_controldata-%%PG_VERSION%%.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/pg_ctl-%%PG_VERSION%%.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/pg_resetwal-%%PG_VERSION%%.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/pg_test_fsync-%%PG_VERSION%%.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/pg_test_timing-%%PG_VERSION%%.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/plpgsql-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/initdb-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/pg_archivecleanup-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/pg_basebackup-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/pg_checksums-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/pg_controldata-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/pg_ctl-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/pg_resetwal-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/pg_rewind-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/pg_test_fsync-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/pg_test_timing-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/pg_upgrade-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/pg_waldump-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/plpgsql-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/postgres-%%PG_VERSION%%.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/initdb-%%PG_VERSION%%.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/pg_archivecleanup-%%PG_VERSION%%.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/pg_basebackup-%%PG_VERSION%%.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/pg_checksums-%%PG_VERSION%%.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/pg_controldata-%%PG_VERSION%%.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/pg_ctl-%%PG_VERSION%%.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/pg_resetwal-%%PG_VERSION%%.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/pg_rewind-%%PG_VERSION%%.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/pg_test_fsync-%%PG_VERSION%%.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/pg_test_timing-%%PG_VERSION%%.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/pg_upgrade-%%PG_VERSION%%.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/pg_waldump-%%PG_VERSION%%.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/plpgsql-%%PG_VERSION%%.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/postgres-%%PG_VERSION%%.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/pg_archivecleanup-%%PG_VERSION%%.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/pg_controldata-%%PG_VERSION%%.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/pg_ctl-%%PG_VERSION%%.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/plpgsql-%%PG_VERSION%%.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/initdb-%%PG_VERSION%%.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/pg_archivecleanup-%%PG_VERSION%%.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/pg_basebackup-%%PG_VERSION%%.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/pg_checksums-%%PG_VERSION%%.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/pg_controldata-%%PG_VERSION%%.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/pg_ctl-%%PG_VERSION%%.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/pg_resetwal-%%PG_VERSION%%.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/pg_rewind-%%PG_VERSION%%.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/pg_test_fsync-%%PG_VERSION%%.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/pg_test_timing-%%PG_VERSION%%.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/pg_upgrade-%%PG_VERSION%%.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/pg_waldump-%%PG_VERSION%%.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/plpgsql-%%PG_VERSION%%.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/postgres-%%PG_VERSION%%.mo
+%%NLS%%share/locale/vi/LC_MESSAGES/plpgsql-%%PG_VERSION%%.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/initdb-%%PG_VERSION%%.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/pg_archivecleanup-%%PG_VERSION%%.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/pg_controldata-%%PG_VERSION%%.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/pg_ctl-%%PG_VERSION%%.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/pg_resetwal-%%PG_VERSION%%.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/pg_rewind-%%PG_VERSION%%.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/pg_test_timing-%%PG_VERSION%%.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/pg_upgrade-%%PG_VERSION%%.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/plpgsql-%%PG_VERSION%%.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/postgres-%%PG_VERSION%%.mo
+%%TZDATA%%%%DATADIR%%/timezone/Africa/Abidjan
+%%TZDATA%%%%DATADIR%%/timezone/Africa/Accra
+%%TZDATA%%%%DATADIR%%/timezone/Africa/Addis_Ababa
+%%TZDATA%%%%DATADIR%%/timezone/Africa/Algiers
+%%TZDATA%%%%DATADIR%%/timezone/Africa/Asmara
+%%TZDATA%%%%DATADIR%%/timezone/Africa/Asmera
+%%TZDATA%%%%DATADIR%%/timezone/Africa/Bamako
+%%TZDATA%%%%DATADIR%%/timezone/Africa/Bangui
+%%TZDATA%%%%DATADIR%%/timezone/Africa/Banjul
+%%TZDATA%%%%DATADIR%%/timezone/Africa/Bissau
+%%TZDATA%%%%DATADIR%%/timezone/Africa/Blantyre
+%%TZDATA%%%%DATADIR%%/timezone/Africa/Brazzaville
+%%TZDATA%%%%DATADIR%%/timezone/Africa/Bujumbura
+%%TZDATA%%%%DATADIR%%/timezone/Africa/Cairo
+%%TZDATA%%%%DATADIR%%/timezone/Africa/Casablanca
+%%TZDATA%%%%DATADIR%%/timezone/Africa/Ceuta
+%%TZDATA%%%%DATADIR%%/timezone/Africa/Conakry
+%%TZDATA%%%%DATADIR%%/timezone/Africa/Dakar
+%%TZDATA%%%%DATADIR%%/timezone/Africa/Dar_es_Salaam
+%%TZDATA%%%%DATADIR%%/timezone/Africa/Djibouti
+%%TZDATA%%%%DATADIR%%/timezone/Africa/Douala
+%%TZDATA%%%%DATADIR%%/timezone/Africa/El_Aaiun
+%%TZDATA%%%%DATADIR%%/timezone/Africa/Freetown
+%%TZDATA%%%%DATADIR%%/timezone/Africa/Gaborone
+%%TZDATA%%%%DATADIR%%/timezone/Africa/Harare
+%%TZDATA%%%%DATADIR%%/timezone/Africa/Johannesburg
+%%TZDATA%%%%DATADIR%%/timezone/Africa/Juba
+%%TZDATA%%%%DATADIR%%/timezone/Africa/Kampala
+%%TZDATA%%%%DATADIR%%/timezone/Africa/Khartoum
+%%TZDATA%%%%DATADIR%%/timezone/Africa/Kigali
+%%TZDATA%%%%DATADIR%%/timezone/Africa/Kinshasa
+%%TZDATA%%%%DATADIR%%/timezone/Africa/Lagos
+%%TZDATA%%%%DATADIR%%/timezone/Africa/Libreville
+%%TZDATA%%%%DATADIR%%/timezone/Africa/Lome
+%%TZDATA%%%%DATADIR%%/timezone/Africa/Luanda
+%%TZDATA%%%%DATADIR%%/timezone/Africa/Lubumbashi
+%%TZDATA%%%%DATADIR%%/timezone/Africa/Lusaka
+%%TZDATA%%%%DATADIR%%/timezone/Africa/Malabo
+%%TZDATA%%%%DATADIR%%/timezone/Africa/Maputo
+%%TZDATA%%%%DATADIR%%/timezone/Africa/Maseru
+%%TZDATA%%%%DATADIR%%/timezone/Africa/Mbabane
+%%TZDATA%%%%DATADIR%%/timezone/Africa/Mogadishu
+%%TZDATA%%%%DATADIR%%/timezone/Africa/Monrovia
+%%TZDATA%%%%DATADIR%%/timezone/Africa/Nairobi
+%%TZDATA%%%%DATADIR%%/timezone/Africa/Ndjamena
+%%TZDATA%%%%DATADIR%%/timezone/Africa/Niamey
+%%TZDATA%%%%DATADIR%%/timezone/Africa/Nouakchott
+%%TZDATA%%%%DATADIR%%/timezone/Africa/Ouagadougou
+%%TZDATA%%%%DATADIR%%/timezone/Africa/Porto-Novo
+%%TZDATA%%%%DATADIR%%/timezone/Africa/Sao_Tome
+%%TZDATA%%%%DATADIR%%/timezone/Africa/Timbuktu
+%%TZDATA%%%%DATADIR%%/timezone/Africa/Tripoli
+%%TZDATA%%%%DATADIR%%/timezone/Africa/Tunis
+%%TZDATA%%%%DATADIR%%/timezone/Africa/Windhoek
+%%TZDATA%%%%DATADIR%%/timezone/America/Adak
+%%TZDATA%%%%DATADIR%%/timezone/America/Anchorage
+%%TZDATA%%%%DATADIR%%/timezone/America/Anguilla
+%%TZDATA%%%%DATADIR%%/timezone/America/Antigua
+%%TZDATA%%%%DATADIR%%/timezone/America/Araguaina
+%%TZDATA%%%%DATADIR%%/timezone/America/Argentina/Buenos_Aires
+%%TZDATA%%%%DATADIR%%/timezone/America/Argentina/Catamarca
+%%TZDATA%%%%DATADIR%%/timezone/America/Argentina/ComodRivadavia
+%%TZDATA%%%%DATADIR%%/timezone/America/Argentina/Cordoba
+%%TZDATA%%%%DATADIR%%/timezone/America/Argentina/Jujuy
+%%TZDATA%%%%DATADIR%%/timezone/America/Argentina/La_Rioja
+%%TZDATA%%%%DATADIR%%/timezone/America/Argentina/Mendoza
+%%TZDATA%%%%DATADIR%%/timezone/America/Argentina/Rio_Gallegos
+%%TZDATA%%%%DATADIR%%/timezone/America/Argentina/Salta
+%%TZDATA%%%%DATADIR%%/timezone/America/Argentina/San_Juan
+%%TZDATA%%%%DATADIR%%/timezone/America/Argentina/San_Luis
+%%TZDATA%%%%DATADIR%%/timezone/America/Argentina/Tucuman
+%%TZDATA%%%%DATADIR%%/timezone/America/Argentina/Ushuaia
+%%TZDATA%%%%DATADIR%%/timezone/America/Aruba
+%%TZDATA%%%%DATADIR%%/timezone/America/Asuncion
+%%TZDATA%%%%DATADIR%%/timezone/America/Atikokan
+%%TZDATA%%%%DATADIR%%/timezone/America/Atka
+%%TZDATA%%%%DATADIR%%/timezone/America/Bahia
+%%TZDATA%%%%DATADIR%%/timezone/America/Bahia_Banderas
+%%TZDATA%%%%DATADIR%%/timezone/America/Barbados
+%%TZDATA%%%%DATADIR%%/timezone/America/Belem
+%%TZDATA%%%%DATADIR%%/timezone/America/Belize
+%%TZDATA%%%%DATADIR%%/timezone/America/Blanc-Sablon
+%%TZDATA%%%%DATADIR%%/timezone/America/Boa_Vista
+%%TZDATA%%%%DATADIR%%/timezone/America/Bogota
+%%TZDATA%%%%DATADIR%%/timezone/America/Boise
+%%TZDATA%%%%DATADIR%%/timezone/America/Buenos_Aires
+%%TZDATA%%%%DATADIR%%/timezone/America/Cambridge_Bay
+%%TZDATA%%%%DATADIR%%/timezone/America/Campo_Grande
+%%TZDATA%%%%DATADIR%%/timezone/America/Cancun
+%%TZDATA%%%%DATADIR%%/timezone/America/Caracas
+%%TZDATA%%%%DATADIR%%/timezone/America/Catamarca
+%%TZDATA%%%%DATADIR%%/timezone/America/Cayenne
+%%TZDATA%%%%DATADIR%%/timezone/America/Cayman
+%%TZDATA%%%%DATADIR%%/timezone/America/Chicago
+%%TZDATA%%%%DATADIR%%/timezone/America/Chihuahua
+%%TZDATA%%%%DATADIR%%/timezone/America/Ciudad_Juarez
+%%TZDATA%%%%DATADIR%%/timezone/America/Coral_Harbour
+%%TZDATA%%%%DATADIR%%/timezone/America/Cordoba
+%%TZDATA%%%%DATADIR%%/timezone/America/Costa_Rica
+%%TZDATA%%%%DATADIR%%/timezone/America/Creston
+%%TZDATA%%%%DATADIR%%/timezone/America/Cuiaba
+%%TZDATA%%%%DATADIR%%/timezone/America/Curacao
+%%TZDATA%%%%DATADIR%%/timezone/America/Danmarkshavn
+%%TZDATA%%%%DATADIR%%/timezone/America/Dawson
+%%TZDATA%%%%DATADIR%%/timezone/America/Dawson_Creek
+%%TZDATA%%%%DATADIR%%/timezone/America/Denver
+%%TZDATA%%%%DATADIR%%/timezone/America/Detroit
+%%TZDATA%%%%DATADIR%%/timezone/America/Dominica
+%%TZDATA%%%%DATADIR%%/timezone/America/Edmonton
+%%TZDATA%%%%DATADIR%%/timezone/America/Eirunepe
+%%TZDATA%%%%DATADIR%%/timezone/America/El_Salvador
+%%TZDATA%%%%DATADIR%%/timezone/America/Ensenada
+%%TZDATA%%%%DATADIR%%/timezone/America/Fort_Nelson
+%%TZDATA%%%%DATADIR%%/timezone/America/Fort_Wayne
+%%TZDATA%%%%DATADIR%%/timezone/America/Fortaleza
+%%TZDATA%%%%DATADIR%%/timezone/America/Glace_Bay
+%%TZDATA%%%%DATADIR%%/timezone/America/Godthab
+%%TZDATA%%%%DATADIR%%/timezone/America/Goose_Bay
+%%TZDATA%%%%DATADIR%%/timezone/America/Grand_Turk
+%%TZDATA%%%%DATADIR%%/timezone/America/Grenada
+%%TZDATA%%%%DATADIR%%/timezone/America/Guadeloupe
+%%TZDATA%%%%DATADIR%%/timezone/America/Guatemala
+%%TZDATA%%%%DATADIR%%/timezone/America/Guayaquil
+%%TZDATA%%%%DATADIR%%/timezone/America/Guyana
+%%TZDATA%%%%DATADIR%%/timezone/America/Halifax
+%%TZDATA%%%%DATADIR%%/timezone/America/Havana
+%%TZDATA%%%%DATADIR%%/timezone/America/Hermosillo
+%%TZDATA%%%%DATADIR%%/timezone/America/Indiana/Indianapolis
+%%TZDATA%%%%DATADIR%%/timezone/America/Indiana/Knox
+%%TZDATA%%%%DATADIR%%/timezone/America/Indiana/Marengo
+%%TZDATA%%%%DATADIR%%/timezone/America/Indiana/Petersburg
+%%TZDATA%%%%DATADIR%%/timezone/America/Indiana/Tell_City
+%%TZDATA%%%%DATADIR%%/timezone/America/Indiana/Vevay
+%%TZDATA%%%%DATADIR%%/timezone/America/Indiana/Vincennes
+%%TZDATA%%%%DATADIR%%/timezone/America/Indiana/Winamac
+%%TZDATA%%%%DATADIR%%/timezone/America/Indianapolis
+%%TZDATA%%%%DATADIR%%/timezone/America/Inuvik
+%%TZDATA%%%%DATADIR%%/timezone/America/Iqaluit
+%%TZDATA%%%%DATADIR%%/timezone/America/Jamaica
+%%TZDATA%%%%DATADIR%%/timezone/America/Jujuy
+%%TZDATA%%%%DATADIR%%/timezone/America/Juneau
+%%TZDATA%%%%DATADIR%%/timezone/America/Kentucky/Louisville
+%%TZDATA%%%%DATADIR%%/timezone/America/Kentucky/Monticello
+%%TZDATA%%%%DATADIR%%/timezone/America/Knox_IN
+%%TZDATA%%%%DATADIR%%/timezone/America/Kralendijk
+%%TZDATA%%%%DATADIR%%/timezone/America/La_Paz
+%%TZDATA%%%%DATADIR%%/timezone/America/Lima
+%%TZDATA%%%%DATADIR%%/timezone/America/Los_Angeles
+%%TZDATA%%%%DATADIR%%/timezone/America/Louisville
+%%TZDATA%%%%DATADIR%%/timezone/America/Lower_Princes
+%%TZDATA%%%%DATADIR%%/timezone/America/Maceio
+%%TZDATA%%%%DATADIR%%/timezone/America/Managua
+%%TZDATA%%%%DATADIR%%/timezone/America/Manaus
+%%TZDATA%%%%DATADIR%%/timezone/America/Marigot
+%%TZDATA%%%%DATADIR%%/timezone/America/Martinique
+%%TZDATA%%%%DATADIR%%/timezone/America/Matamoros
+%%TZDATA%%%%DATADIR%%/timezone/America/Mazatlan
+%%TZDATA%%%%DATADIR%%/timezone/America/Mendoza
+%%TZDATA%%%%DATADIR%%/timezone/America/Menominee
+%%TZDATA%%%%DATADIR%%/timezone/America/Merida
+%%TZDATA%%%%DATADIR%%/timezone/America/Metlakatla
+%%TZDATA%%%%DATADIR%%/timezone/America/Mexico_City
+%%TZDATA%%%%DATADIR%%/timezone/America/Miquelon
+%%TZDATA%%%%DATADIR%%/timezone/America/Moncton
+%%TZDATA%%%%DATADIR%%/timezone/America/Monterrey
+%%TZDATA%%%%DATADIR%%/timezone/America/Montevideo
+%%TZDATA%%%%DATADIR%%/timezone/America/Montreal
+%%TZDATA%%%%DATADIR%%/timezone/America/Montserrat
+%%TZDATA%%%%DATADIR%%/timezone/America/Nassau
+%%TZDATA%%%%DATADIR%%/timezone/America/New_York
+%%TZDATA%%%%DATADIR%%/timezone/America/Nipigon
+%%TZDATA%%%%DATADIR%%/timezone/America/Nome
+%%TZDATA%%%%DATADIR%%/timezone/America/Noronha
+%%TZDATA%%%%DATADIR%%/timezone/America/North_Dakota/Beulah
+%%TZDATA%%%%DATADIR%%/timezone/America/North_Dakota/Center
+%%TZDATA%%%%DATADIR%%/timezone/America/North_Dakota/New_Salem
+%%TZDATA%%%%DATADIR%%/timezone/America/Nuuk
+%%TZDATA%%%%DATADIR%%/timezone/America/Ojinaga
+%%TZDATA%%%%DATADIR%%/timezone/America/Panama
+%%TZDATA%%%%DATADIR%%/timezone/America/Pangnirtung
+%%TZDATA%%%%DATADIR%%/timezone/America/Paramaribo
+%%TZDATA%%%%DATADIR%%/timezone/America/Phoenix
+%%TZDATA%%%%DATADIR%%/timezone/America/Port-au-Prince
+%%TZDATA%%%%DATADIR%%/timezone/America/Port_of_Spain
+%%TZDATA%%%%DATADIR%%/timezone/America/Porto_Acre
+%%TZDATA%%%%DATADIR%%/timezone/America/Porto_Velho
+%%TZDATA%%%%DATADIR%%/timezone/America/Puerto_Rico
+%%TZDATA%%%%DATADIR%%/timezone/America/Punta_Arenas
+%%TZDATA%%%%DATADIR%%/timezone/America/Rainy_River
+%%TZDATA%%%%DATADIR%%/timezone/America/Rankin_Inlet
+%%TZDATA%%%%DATADIR%%/timezone/America/Recife
+%%TZDATA%%%%DATADIR%%/timezone/America/Regina
+%%TZDATA%%%%DATADIR%%/timezone/America/Resolute
+%%TZDATA%%%%DATADIR%%/timezone/America/Rio_Branco
+%%TZDATA%%%%DATADIR%%/timezone/America/Rosario
+%%TZDATA%%%%DATADIR%%/timezone/America/Santa_Isabel
+%%TZDATA%%%%DATADIR%%/timezone/America/Santarem
+%%TZDATA%%%%DATADIR%%/timezone/America/Santiago
+%%TZDATA%%%%DATADIR%%/timezone/America/Santo_Domingo
+%%TZDATA%%%%DATADIR%%/timezone/America/Sao_Paulo
+%%TZDATA%%%%DATADIR%%/timezone/America/Scoresbysund
+%%TZDATA%%%%DATADIR%%/timezone/America/Shiprock
+%%TZDATA%%%%DATADIR%%/timezone/America/Sitka
+%%TZDATA%%%%DATADIR%%/timezone/America/St_Barthelemy
+%%TZDATA%%%%DATADIR%%/timezone/America/St_Johns
+%%TZDATA%%%%DATADIR%%/timezone/America/St_Kitts
+%%TZDATA%%%%DATADIR%%/timezone/America/St_Lucia
+%%TZDATA%%%%DATADIR%%/timezone/America/St_Thomas
+%%TZDATA%%%%DATADIR%%/timezone/America/St_Vincent
+%%TZDATA%%%%DATADIR%%/timezone/America/Swift_Current
+%%TZDATA%%%%DATADIR%%/timezone/America/Tegucigalpa
+%%TZDATA%%%%DATADIR%%/timezone/America/Thule
+%%TZDATA%%%%DATADIR%%/timezone/America/Thunder_Bay
+%%TZDATA%%%%DATADIR%%/timezone/America/Tijuana
+%%TZDATA%%%%DATADIR%%/timezone/America/Toronto
+%%TZDATA%%%%DATADIR%%/timezone/America/Tortola
+%%TZDATA%%%%DATADIR%%/timezone/America/Vancouver
+%%TZDATA%%%%DATADIR%%/timezone/America/Virgin
+%%TZDATA%%%%DATADIR%%/timezone/America/Whitehorse
+%%TZDATA%%%%DATADIR%%/timezone/America/Winnipeg
+%%TZDATA%%%%DATADIR%%/timezone/America/Yakutat
+%%TZDATA%%%%DATADIR%%/timezone/America/Yellowknife
+%%TZDATA%%%%DATADIR%%/timezone/Antarctica/Casey
+%%TZDATA%%%%DATADIR%%/timezone/Antarctica/Davis
+%%TZDATA%%%%DATADIR%%/timezone/Antarctica/DumontDUrville
+%%TZDATA%%%%DATADIR%%/timezone/Antarctica/Macquarie
+%%TZDATA%%%%DATADIR%%/timezone/Antarctica/Mawson
+%%TZDATA%%%%DATADIR%%/timezone/Antarctica/McMurdo
+%%TZDATA%%%%DATADIR%%/timezone/Antarctica/Palmer
+%%TZDATA%%%%DATADIR%%/timezone/Antarctica/Rothera
+%%TZDATA%%%%DATADIR%%/timezone/Antarctica/South_Pole
+%%TZDATA%%%%DATADIR%%/timezone/Antarctica/Syowa
+%%TZDATA%%%%DATADIR%%/timezone/Antarctica/Troll
+%%TZDATA%%%%DATADIR%%/timezone/Antarctica/Vostok
+%%TZDATA%%%%DATADIR%%/timezone/Arctic/Longyearbyen
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Aden
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Almaty
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Amman
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Anadyr
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Aqtau
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Aqtobe
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Ashgabat
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Ashkhabad
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Atyrau
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Baghdad
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Bahrain
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Baku
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Bangkok
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Barnaul
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Beirut
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Bishkek
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Brunei
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Calcutta
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Chita
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Choibalsan
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Chongqing
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Chungking
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Colombo
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Dacca
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Damascus
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Dhaka
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Dili
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Dubai
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Dushanbe
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Famagusta
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Gaza
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Harbin
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Hebron
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Ho_Chi_Minh
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Hong_Kong
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Hovd
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Irkutsk
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Istanbul
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Jakarta
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Jayapura
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Jerusalem
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Kabul
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Kamchatka
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Karachi
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Kashgar
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Kathmandu
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Katmandu
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Khandyga
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Kolkata
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Krasnoyarsk
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Kuala_Lumpur
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Kuching
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Kuwait
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Macao
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Macau
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Magadan
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Makassar
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Manila
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Muscat
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Nicosia
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Novokuznetsk
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Novosibirsk
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Omsk
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Oral
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Phnom_Penh
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Pontianak
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Pyongyang
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Qatar
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Qostanay
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Qyzylorda
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Rangoon
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Riyadh
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Saigon
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Sakhalin
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Samarkand
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Seoul
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Shanghai
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Singapore
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Srednekolymsk
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Taipei
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Tashkent
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Tbilisi
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Tehran
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Tel_Aviv
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Thimbu
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Thimphu
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Tokyo
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Tomsk
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Ujung_Pandang
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Ulaanbaatar
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Ulan_Bator
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Urumqi
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Ust-Nera
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Vientiane
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Vladivostok
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Yakutsk
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Yangon
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Yekaterinburg
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Yerevan
+%%TZDATA%%%%DATADIR%%/timezone/Atlantic/Azores
+%%TZDATA%%%%DATADIR%%/timezone/Atlantic/Bermuda
+%%TZDATA%%%%DATADIR%%/timezone/Atlantic/Canary
+%%TZDATA%%%%DATADIR%%/timezone/Atlantic/Cape_Verde
+%%TZDATA%%%%DATADIR%%/timezone/Atlantic/Faeroe
+%%TZDATA%%%%DATADIR%%/timezone/Atlantic/Faroe
+%%TZDATA%%%%DATADIR%%/timezone/Atlantic/Jan_Mayen
+%%TZDATA%%%%DATADIR%%/timezone/Atlantic/Madeira
+%%TZDATA%%%%DATADIR%%/timezone/Atlantic/Reykjavik
+%%TZDATA%%%%DATADIR%%/timezone/Atlantic/South_Georgia
+%%TZDATA%%%%DATADIR%%/timezone/Atlantic/St_Helena
+%%TZDATA%%%%DATADIR%%/timezone/Atlantic/Stanley
+%%TZDATA%%%%DATADIR%%/timezone/Australia/ACT
+%%TZDATA%%%%DATADIR%%/timezone/Australia/Adelaide
+%%TZDATA%%%%DATADIR%%/timezone/Australia/Brisbane
+%%TZDATA%%%%DATADIR%%/timezone/Australia/Broken_Hill
+%%TZDATA%%%%DATADIR%%/timezone/Australia/Canberra
+%%TZDATA%%%%DATADIR%%/timezone/Australia/Currie
+%%TZDATA%%%%DATADIR%%/timezone/Australia/Darwin
+%%TZDATA%%%%DATADIR%%/timezone/Australia/Eucla
+%%TZDATA%%%%DATADIR%%/timezone/Australia/Hobart
+%%TZDATA%%%%DATADIR%%/timezone/Australia/LHI
+%%TZDATA%%%%DATADIR%%/timezone/Australia/Lindeman
+%%TZDATA%%%%DATADIR%%/timezone/Australia/Lord_Howe
+%%TZDATA%%%%DATADIR%%/timezone/Australia/Melbourne
+%%TZDATA%%%%DATADIR%%/timezone/Australia/NSW
+%%TZDATA%%%%DATADIR%%/timezone/Australia/North
+%%TZDATA%%%%DATADIR%%/timezone/Australia/Perth
+%%TZDATA%%%%DATADIR%%/timezone/Australia/Queensland
+%%TZDATA%%%%DATADIR%%/timezone/Australia/South
+%%TZDATA%%%%DATADIR%%/timezone/Australia/Sydney
+%%TZDATA%%%%DATADIR%%/timezone/Australia/Tasmania
+%%TZDATA%%%%DATADIR%%/timezone/Australia/Victoria
+%%TZDATA%%%%DATADIR%%/timezone/Australia/West
+%%TZDATA%%%%DATADIR%%/timezone/Australia/Yancowinna
+%%TZDATA%%%%DATADIR%%/timezone/Brazil/Acre
+%%TZDATA%%%%DATADIR%%/timezone/Brazil/DeNoronha
+%%TZDATA%%%%DATADIR%%/timezone/Brazil/East
+%%TZDATA%%%%DATADIR%%/timezone/Brazil/West
+%%TZDATA%%%%DATADIR%%/timezone/CET
+%%TZDATA%%%%DATADIR%%/timezone/CST6CDT
+%%TZDATA%%%%DATADIR%%/timezone/Canada/Atlantic
+%%TZDATA%%%%DATADIR%%/timezone/Canada/Central
+%%TZDATA%%%%DATADIR%%/timezone/Canada/Eastern
+%%TZDATA%%%%DATADIR%%/timezone/Canada/Mountain
+%%TZDATA%%%%DATADIR%%/timezone/Canada/Newfoundland
+%%TZDATA%%%%DATADIR%%/timezone/Canada/Pacific
+%%TZDATA%%%%DATADIR%%/timezone/Canada/Saskatchewan
+%%TZDATA%%%%DATADIR%%/timezone/Canada/Yukon
+%%TZDATA%%%%DATADIR%%/timezone/Chile/Continental
+%%TZDATA%%%%DATADIR%%/timezone/Chile/EasterIsland
+%%TZDATA%%%%DATADIR%%/timezone/Cuba
+%%TZDATA%%%%DATADIR%%/timezone/EET
+%%TZDATA%%%%DATADIR%%/timezone/EST
+%%TZDATA%%%%DATADIR%%/timezone/EST5EDT
+%%TZDATA%%%%DATADIR%%/timezone/Egypt
+%%TZDATA%%%%DATADIR%%/timezone/Eire
+%%TZDATA%%%%DATADIR%%/timezone/Etc/GMT
+%%TZDATA%%%%DATADIR%%/timezone/Etc/GMT+0
+%%TZDATA%%%%DATADIR%%/timezone/Etc/GMT+1
+%%TZDATA%%%%DATADIR%%/timezone/Etc/GMT+10
+%%TZDATA%%%%DATADIR%%/timezone/Etc/GMT+11
+%%TZDATA%%%%DATADIR%%/timezone/Etc/GMT+12
+%%TZDATA%%%%DATADIR%%/timezone/Etc/GMT+2
+%%TZDATA%%%%DATADIR%%/timezone/Etc/GMT+3
+%%TZDATA%%%%DATADIR%%/timezone/Etc/GMT+4
+%%TZDATA%%%%DATADIR%%/timezone/Etc/GMT+5
+%%TZDATA%%%%DATADIR%%/timezone/Etc/GMT+6
+%%TZDATA%%%%DATADIR%%/timezone/Etc/GMT+7
+%%TZDATA%%%%DATADIR%%/timezone/Etc/GMT+8
+%%TZDATA%%%%DATADIR%%/timezone/Etc/GMT+9
+%%TZDATA%%%%DATADIR%%/timezone/Etc/GMT-0
+%%TZDATA%%%%DATADIR%%/timezone/Etc/GMT-1
+%%TZDATA%%%%DATADIR%%/timezone/Etc/GMT-10
+%%TZDATA%%%%DATADIR%%/timezone/Etc/GMT-11
+%%TZDATA%%%%DATADIR%%/timezone/Etc/GMT-12
+%%TZDATA%%%%DATADIR%%/timezone/Etc/GMT-13
+%%TZDATA%%%%DATADIR%%/timezone/Etc/GMT-14
+%%TZDATA%%%%DATADIR%%/timezone/Etc/GMT-2
+%%TZDATA%%%%DATADIR%%/timezone/Etc/GMT-3
+%%TZDATA%%%%DATADIR%%/timezone/Etc/GMT-4
+%%TZDATA%%%%DATADIR%%/timezone/Etc/GMT-5
+%%TZDATA%%%%DATADIR%%/timezone/Etc/GMT-6
+%%TZDATA%%%%DATADIR%%/timezone/Etc/GMT-7
+%%TZDATA%%%%DATADIR%%/timezone/Etc/GMT-8
+%%TZDATA%%%%DATADIR%%/timezone/Etc/GMT-9
+%%TZDATA%%%%DATADIR%%/timezone/Etc/GMT0
+%%TZDATA%%%%DATADIR%%/timezone/Etc/Greenwich
+%%TZDATA%%%%DATADIR%%/timezone/Etc/UCT
+%%TZDATA%%%%DATADIR%%/timezone/Etc/UTC
+%%TZDATA%%%%DATADIR%%/timezone/Etc/Universal
+%%TZDATA%%%%DATADIR%%/timezone/Etc/Zulu
+%%TZDATA%%%%DATADIR%%/timezone/Europe/Amsterdam
+%%TZDATA%%%%DATADIR%%/timezone/Europe/Andorra
+%%TZDATA%%%%DATADIR%%/timezone/Europe/Astrakhan
+%%TZDATA%%%%DATADIR%%/timezone/Europe/Athens
+%%TZDATA%%%%DATADIR%%/timezone/Europe/Belfast
+%%TZDATA%%%%DATADIR%%/timezone/Europe/Belgrade
+%%TZDATA%%%%DATADIR%%/timezone/Europe/Berlin
+%%TZDATA%%%%DATADIR%%/timezone/Europe/Bratislava
+%%TZDATA%%%%DATADIR%%/timezone/Europe/Brussels
+%%TZDATA%%%%DATADIR%%/timezone/Europe/Bucharest
+%%TZDATA%%%%DATADIR%%/timezone/Europe/Budapest
+%%TZDATA%%%%DATADIR%%/timezone/Europe/Busingen
+%%TZDATA%%%%DATADIR%%/timezone/Europe/Chisinau
+%%TZDATA%%%%DATADIR%%/timezone/Europe/Copenhagen
+%%TZDATA%%%%DATADIR%%/timezone/Europe/Dublin
+%%TZDATA%%%%DATADIR%%/timezone/Europe/Gibraltar
+%%TZDATA%%%%DATADIR%%/timezone/Europe/Guernsey
+%%TZDATA%%%%DATADIR%%/timezone/Europe/Helsinki
+%%TZDATA%%%%DATADIR%%/timezone/Europe/Isle_of_Man
+%%TZDATA%%%%DATADIR%%/timezone/Europe/Istanbul
+%%TZDATA%%%%DATADIR%%/timezone/Europe/Jersey
+%%TZDATA%%%%DATADIR%%/timezone/Europe/Kaliningrad
+%%TZDATA%%%%DATADIR%%/timezone/Europe/Kiev
+%%TZDATA%%%%DATADIR%%/timezone/Europe/Kirov
+%%TZDATA%%%%DATADIR%%/timezone/Europe/Kyiv
+%%TZDATA%%%%DATADIR%%/timezone/Europe/Lisbon
+%%TZDATA%%%%DATADIR%%/timezone/Europe/Ljubljana
+%%TZDATA%%%%DATADIR%%/timezone/Europe/London
+%%TZDATA%%%%DATADIR%%/timezone/Europe/Luxembourg
+%%TZDATA%%%%DATADIR%%/timezone/Europe/Madrid
+%%TZDATA%%%%DATADIR%%/timezone/Europe/Malta
+%%TZDATA%%%%DATADIR%%/timezone/Europe/Mariehamn
+%%TZDATA%%%%DATADIR%%/timezone/Europe/Minsk
+%%TZDATA%%%%DATADIR%%/timezone/Europe/Monaco
+%%TZDATA%%%%DATADIR%%/timezone/Europe/Moscow
+%%TZDATA%%%%DATADIR%%/timezone/Europe/Nicosia
+%%TZDATA%%%%DATADIR%%/timezone/Europe/Oslo
+%%TZDATA%%%%DATADIR%%/timezone/Europe/Paris
+%%TZDATA%%%%DATADIR%%/timezone/Europe/Podgorica
+%%TZDATA%%%%DATADIR%%/timezone/Europe/Prague
+%%TZDATA%%%%DATADIR%%/timezone/Europe/Riga
+%%TZDATA%%%%DATADIR%%/timezone/Europe/Rome
+%%TZDATA%%%%DATADIR%%/timezone/Europe/Samara
+%%TZDATA%%%%DATADIR%%/timezone/Europe/San_Marino
+%%TZDATA%%%%DATADIR%%/timezone/Europe/Sarajevo
+%%TZDATA%%%%DATADIR%%/timezone/Europe/Saratov
+%%TZDATA%%%%DATADIR%%/timezone/Europe/Simferopol
+%%TZDATA%%%%DATADIR%%/timezone/Europe/Skopje
+%%TZDATA%%%%DATADIR%%/timezone/Europe/Sofia
+%%TZDATA%%%%DATADIR%%/timezone/Europe/Stockholm
+%%TZDATA%%%%DATADIR%%/timezone/Europe/Tallinn
+%%TZDATA%%%%DATADIR%%/timezone/Europe/Tirane
+%%TZDATA%%%%DATADIR%%/timezone/Europe/Tiraspol
+%%TZDATA%%%%DATADIR%%/timezone/Europe/Ulyanovsk
+%%TZDATA%%%%DATADIR%%/timezone/Europe/Uzhgorod
+%%TZDATA%%%%DATADIR%%/timezone/Europe/Vaduz
+%%TZDATA%%%%DATADIR%%/timezone/Europe/Vatican
+%%TZDATA%%%%DATADIR%%/timezone/Europe/Vienna
+%%TZDATA%%%%DATADIR%%/timezone/Europe/Vilnius
+%%TZDATA%%%%DATADIR%%/timezone/Europe/Volgograd
+%%TZDATA%%%%DATADIR%%/timezone/Europe/Warsaw
+%%TZDATA%%%%DATADIR%%/timezone/Europe/Zagreb
+%%TZDATA%%%%DATADIR%%/timezone/Europe/Zaporozhye
+%%TZDATA%%%%DATADIR%%/timezone/Europe/Zurich
+%%TZDATA%%%%DATADIR%%/timezone/Factory
+%%TZDATA%%%%DATADIR%%/timezone/GB
+%%TZDATA%%%%DATADIR%%/timezone/GB-Eire
+%%TZDATA%%%%DATADIR%%/timezone/GMT
+%%TZDATA%%%%DATADIR%%/timezone/GMT+0
+%%TZDATA%%%%DATADIR%%/timezone/GMT-0
+%%TZDATA%%%%DATADIR%%/timezone/GMT0
+%%TZDATA%%%%DATADIR%%/timezone/Greenwich
+%%TZDATA%%%%DATADIR%%/timezone/HST
+%%TZDATA%%%%DATADIR%%/timezone/Hongkong
+%%TZDATA%%%%DATADIR%%/timezone/Iceland
+%%TZDATA%%%%DATADIR%%/timezone/Indian/Antananarivo
+%%TZDATA%%%%DATADIR%%/timezone/Indian/Chagos
+%%TZDATA%%%%DATADIR%%/timezone/Indian/Christmas
+%%TZDATA%%%%DATADIR%%/timezone/Indian/Cocos
+%%TZDATA%%%%DATADIR%%/timezone/Indian/Comoro
+%%TZDATA%%%%DATADIR%%/timezone/Indian/Kerguelen
+%%TZDATA%%%%DATADIR%%/timezone/Indian/Mahe
+%%TZDATA%%%%DATADIR%%/timezone/Indian/Maldives
+%%TZDATA%%%%DATADIR%%/timezone/Indian/Mauritius
+%%TZDATA%%%%DATADIR%%/timezone/Indian/Mayotte
+%%TZDATA%%%%DATADIR%%/timezone/Indian/Reunion
+%%TZDATA%%%%DATADIR%%/timezone/Iran
+%%TZDATA%%%%DATADIR%%/timezone/Israel
+%%TZDATA%%%%DATADIR%%/timezone/Jamaica
+%%TZDATA%%%%DATADIR%%/timezone/Japan
+%%TZDATA%%%%DATADIR%%/timezone/Kwajalein
+%%TZDATA%%%%DATADIR%%/timezone/Libya
+%%TZDATA%%%%DATADIR%%/timezone/MET
+%%TZDATA%%%%DATADIR%%/timezone/MST
+%%TZDATA%%%%DATADIR%%/timezone/MST7MDT
+%%TZDATA%%%%DATADIR%%/timezone/Mexico/BajaNorte
+%%TZDATA%%%%DATADIR%%/timezone/Mexico/BajaSur
+%%TZDATA%%%%DATADIR%%/timezone/Mexico/General
+%%TZDATA%%%%DATADIR%%/timezone/NZ
+%%TZDATA%%%%DATADIR%%/timezone/NZ-CHAT
+%%TZDATA%%%%DATADIR%%/timezone/Navajo
+%%TZDATA%%%%DATADIR%%/timezone/PRC
+%%TZDATA%%%%DATADIR%%/timezone/PST8PDT
+%%TZDATA%%%%DATADIR%%/timezone/Pacific/Apia
+%%TZDATA%%%%DATADIR%%/timezone/Pacific/Auckland
+%%TZDATA%%%%DATADIR%%/timezone/Pacific/Bougainville
+%%TZDATA%%%%DATADIR%%/timezone/Pacific/Chatham
+%%TZDATA%%%%DATADIR%%/timezone/Pacific/Chuuk
+%%TZDATA%%%%DATADIR%%/timezone/Pacific/Easter
+%%TZDATA%%%%DATADIR%%/timezone/Pacific/Efate
+%%TZDATA%%%%DATADIR%%/timezone/Pacific/Enderbury
+%%TZDATA%%%%DATADIR%%/timezone/Pacific/Fakaofo
+%%TZDATA%%%%DATADIR%%/timezone/Pacific/Fiji
+%%TZDATA%%%%DATADIR%%/timezone/Pacific/Funafuti
+%%TZDATA%%%%DATADIR%%/timezone/Pacific/Galapagos
+%%TZDATA%%%%DATADIR%%/timezone/Pacific/Gambier
+%%TZDATA%%%%DATADIR%%/timezone/Pacific/Guadalcanal
+%%TZDATA%%%%DATADIR%%/timezone/Pacific/Guam
+%%TZDATA%%%%DATADIR%%/timezone/Pacific/Honolulu
+%%TZDATA%%%%DATADIR%%/timezone/Pacific/Johnston
+%%TZDATA%%%%DATADIR%%/timezone/Pacific/Kanton
+%%TZDATA%%%%DATADIR%%/timezone/Pacific/Kiritimati
+%%TZDATA%%%%DATADIR%%/timezone/Pacific/Kosrae
+%%TZDATA%%%%DATADIR%%/timezone/Pacific/Kwajalein
+%%TZDATA%%%%DATADIR%%/timezone/Pacific/Majuro
+%%TZDATA%%%%DATADIR%%/timezone/Pacific/Marquesas
+%%TZDATA%%%%DATADIR%%/timezone/Pacific/Midway
+%%TZDATA%%%%DATADIR%%/timezone/Pacific/Nauru
+%%TZDATA%%%%DATADIR%%/timezone/Pacific/Niue
+%%TZDATA%%%%DATADIR%%/timezone/Pacific/Norfolk
+%%TZDATA%%%%DATADIR%%/timezone/Pacific/Noumea
+%%TZDATA%%%%DATADIR%%/timezone/Pacific/Pago_Pago
+%%TZDATA%%%%DATADIR%%/timezone/Pacific/Palau
+%%TZDATA%%%%DATADIR%%/timezone/Pacific/Pitcairn
+%%TZDATA%%%%DATADIR%%/timezone/Pacific/Pohnpei
+%%TZDATA%%%%DATADIR%%/timezone/Pacific/Ponape
+%%TZDATA%%%%DATADIR%%/timezone/Pacific/Port_Moresby
+%%TZDATA%%%%DATADIR%%/timezone/Pacific/Rarotonga
+%%TZDATA%%%%DATADIR%%/timezone/Pacific/Saipan
+%%TZDATA%%%%DATADIR%%/timezone/Pacific/Samoa
+%%TZDATA%%%%DATADIR%%/timezone/Pacific/Tahiti
+%%TZDATA%%%%DATADIR%%/timezone/Pacific/Tarawa
+%%TZDATA%%%%DATADIR%%/timezone/Pacific/Tongatapu
+%%TZDATA%%%%DATADIR%%/timezone/Pacific/Truk
+%%TZDATA%%%%DATADIR%%/timezone/Pacific/Wake
+%%TZDATA%%%%DATADIR%%/timezone/Pacific/Wallis
+%%TZDATA%%%%DATADIR%%/timezone/Pacific/Yap
+%%TZDATA%%%%DATADIR%%/timezone/Poland
+%%TZDATA%%%%DATADIR%%/timezone/Portugal
+%%TZDATA%%%%DATADIR%%/timezone/ROC
+%%TZDATA%%%%DATADIR%%/timezone/ROK
+%%TZDATA%%%%DATADIR%%/timezone/Singapore
+%%TZDATA%%%%DATADIR%%/timezone/Turkey
+%%TZDATA%%%%DATADIR%%/timezone/UCT
+%%TZDATA%%%%DATADIR%%/timezone/US/Alaska
+%%TZDATA%%%%DATADIR%%/timezone/US/Aleutian
+%%TZDATA%%%%DATADIR%%/timezone/US/Arizona
+%%TZDATA%%%%DATADIR%%/timezone/US/Central
+%%TZDATA%%%%DATADIR%%/timezone/US/East-Indiana
+%%TZDATA%%%%DATADIR%%/timezone/US/Eastern
+%%TZDATA%%%%DATADIR%%/timezone/US/Hawaii
+%%TZDATA%%%%DATADIR%%/timezone/US/Indiana-Starke
+%%TZDATA%%%%DATADIR%%/timezone/US/Michigan
+%%TZDATA%%%%DATADIR%%/timezone/US/Mountain
+%%TZDATA%%%%DATADIR%%/timezone/US/Pacific
+%%TZDATA%%%%DATADIR%%/timezone/US/Samoa
+%%TZDATA%%%%DATADIR%%/timezone/UTC
+%%TZDATA%%%%DATADIR%%/timezone/Universal
+%%TZDATA%%%%DATADIR%%/timezone/W-SU
+%%TZDATA%%%%DATADIR%%/timezone/WET
+%%TZDATA%%%%DATADIR%%/timezone/Zulu
+%%DATADIR%%/timezonesets/Africa.txt
+%%DATADIR%%/timezonesets/America.txt
+%%DATADIR%%/timezonesets/Antarctica.txt
+%%DATADIR%%/timezonesets/Asia.txt
+%%DATADIR%%/timezonesets/Atlantic.txt
+%%DATADIR%%/timezonesets/Australia
+%%DATADIR%%/timezonesets/Australia.txt
+%%DATADIR%%/timezonesets/Default
+%%DATADIR%%/timezonesets/Etc.txt
+%%DATADIR%%/timezonesets/Europe.txt
+%%DATADIR%%/timezonesets/India
+%%DATADIR%%/timezonesets/Indian.txt
+%%DATADIR%%/timezonesets/Pacific.txt
+%%DATADIR%%/tsearch_data/danish.stop
+%%DATADIR%%/tsearch_data/dutch.stop
+%%DATADIR%%/tsearch_data/english.stop
+%%DATADIR%%/tsearch_data/finnish.stop
+%%DATADIR%%/tsearch_data/french.stop
+%%DATADIR%%/tsearch_data/german.stop
+%%DATADIR%%/tsearch_data/hungarian.stop
+%%DATADIR%%/tsearch_data/hunspell_sample.affix
+%%DATADIR%%/tsearch_data/hunspell_sample_long.affix
+%%DATADIR%%/tsearch_data/hunspell_sample_long.dict
+%%DATADIR%%/tsearch_data/hunspell_sample_num.affix
+%%DATADIR%%/tsearch_data/hunspell_sample_num.dict
+%%DATADIR%%/tsearch_data/ispell_sample.affix
+%%DATADIR%%/tsearch_data/ispell_sample.dict
+%%DATADIR%%/tsearch_data/italian.stop
+%%DATADIR%%/tsearch_data/norwegian.stop
+%%DATADIR%%/tsearch_data/portuguese.stop
+%%DATADIR%%/tsearch_data/russian.stop
+%%DATADIR%%/tsearch_data/spanish.stop
+%%DATADIR%%/tsearch_data/swedish.stop
+%%DATADIR%%/tsearch_data/synonym_sample.syn
+%%DATADIR%%/tsearch_data/thesaurus_sample.ths
+%%DATADIR%%/tsearch_data/turkish.stop
+%%DATADIR%%/tsearch_data/nepali.stop
diff --git a/databases/postgresql16-client/Makefile b/databases/postgresql16-client/Makefile
new file mode 100644
index 000000000000..f610a9931796
--- /dev/null
+++ b/databases/postgresql16-client/Makefile
@@ -0,0 +1,18 @@
+PORTNAME=	postgresql
+PORTREVISION=	0
+
+COMMENT=	PostgreSQL database (client)
+
+MASTERDIR=	${.CURDIR}/../postgresql16-server
+
+BUILD_DIRS=	config src/include src/interfaces src/port src/bin/pg_amcheck \
+		src/bin/pg_dump src/bin/psql src/bin/scripts src/bin/pg_config \
+		src/bin/pgbench doc src/makefiles src/test/regress
+INSTALL_DIRS=	${BUILD_DIRS}
+
+CLIENT_ONLY=	yes
+COMPONENT=	-client
+USE_LDCONFIG=	yes
+USES=		pkgconfig
+
+.include "${MASTERDIR}/Makefile"
diff --git a/databases/postgresql16-contrib/Makefile b/databases/postgresql16-contrib/Makefile
new file mode 100644
index 000000000000..cc85d3203809
--- /dev/null
+++ b/databases/postgresql16-contrib/Makefile
@@ -0,0 +1,41 @@
+PORTNAME=	postgresql
+PORTREVISION=	0
+CATEGORIES=	databases
+
+MAINTAINER=	pgsql@FreeBSD.org
+COMMENT=	The contrib utilities from the PostgreSQL distribution
+
+MASTERDIR=	${.CURDIR}/../postgresql16-server
+
+USES=		bison pgsql:${DISTVERSION:C/([0-9]\.?[0-9]).*/\1/g}
+
+BUILD_DIRS=	src/port src/include src/common contrib
+INSTALL_DIRS=	contrib
+
+# this port fails to build in parallel
+MAKE_JOBS_UNSAFE=	yes
+
+SLAVE_ONLY=	yes
+COMPONENT=	-contrib
+CONFIGURE_ARGS=	--disable-nls --with-uuid=bsd
+LDFLAGS+=	-lpthread -L${PREFIX}/lib
+
+OPTIONS_DEFINE=	DOCS OPENSSL XML
+OPTIONS_DEFAULT=OPENSSL XML
+OPTIONS_SUB=	yes
+
+OPENSSL_DESC=		Build with OpenSSL support
+OPENSSL_USES=		ssl
+OPENSSL_CONFIGURE_WITH=	openssl
+
+XML_CONFIGURE_WITH=	libxslt libxml
+XML_LIB_DEPENDS=libxslt.so:textproc/libxslt \
+		libxml2.so:textproc/libxml2
+
+post-configure:
+	@cd ${WRKSRC}/src/backend && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} generated-headers
+
+post-install:
+	@- ${INSTALL_DATA} ${WRKSRC}/contrib/README ${STAGEDIR}${DOCSDIR}/extension/README
+
+.include "${MASTERDIR}/Makefile"
diff --git a/databases/postgresql16-contrib/pkg-descr b/databases/postgresql16-contrib/pkg-descr
new file mode 100644
index 000000000000..a384c76fdbde
--- /dev/null
+++ b/databases/postgresql16-contrib/pkg-descr
@@ -0,0 +1,21 @@
+This is the port for all stuff that comes in the contrib subtree of
+the postgresql distribution. This subtree contains porting tools,
+analysis utilities, and plug-in features that are not part of the core
+PostgreSQL system, mainly because they address a limited audience or
+are too experimental to be part of the main source tree.  This does
+not preclude their usefulness.
+
+Each subdirectory contains a README file with information about the
+module. Some directories supply new user-defined functions, operators,
+or types.  After you have installed the files you need to register the
+new entities in the database system by running the commands in the
+supplied .sql file.  For example,
+
+        $ psql -d dbname -f module.sql
+
+The .sql files are installed into /usr/local/share/postgresql/contrib
+
+For more information, please see
+/usr/local/share/doc/postgresql/contrib/README*
+
+This software is part of the standard PostgreSQL distribution.
diff --git a/databases/postgresql16-docs/Makefile b/databases/postgresql16-docs/Makefile
new file mode 100644
index 000000000000..5b17a6c2acb8
--- /dev/null
+++ b/databases/postgresql16-docs/Makefile
@@ -0,0 +1,41 @@
+PORTNAME=	postgresql
+PORTREVISION=	0
+PKGNAMESUFFIX?=	${WANT_PGSQL_VER:S,.,,}-docs
+
+MAINTAINER=	pgsql@FreeBSD.org
+COMMENT=	The PostgreSQL documentation set
+
+MASTERDIR=	${.CURDIR}/../../databases/postgresql${WANT_PGSQL_VER:S/.//}-server
+WANT_PGSQL_VER?=16
+
+DISTV=		${DISTVERSION:R}
+
+SLAVE_ONLY=	YES
+COMPONENT=	-docs
+
+PGDOCSREL?=	${DOCSDIR_REL}/release-${WANT_PGSQL_VER}
+PGDOCSDIR?=	${PREFIX}/${PGDOCSREL}
+
+sgmldir=	${LOCALBASE}/share/sgml
+dbdir=		${sgmldir}/docbook
+
+BUILD_DEPENDS+=	onsgmls:textproc/opensp			\
+		openjade:textproc/openjade			\
+		${sgmldir}/iso8879/catalog:textproc/iso8879	\
+		${dbdir}/dsssl/modular/catalog:textproc/dsssl-docbook-modular \
+		docbook-sgml>0:textproc/docbook-sgml
+CONFIGURE_ARGS=	--without-readline --without-icu
+NO_ARCH=	yes
+
+do-build:
+	${MAKE_CMD} -C ${WRKSRC} html
+
+do-install:
+	@ ${MKDIR} ${STAGEDIR}${PGDOCSDIR}
+	( cd ${WRKSRC}/doc/src/sgml/html && \
+		${COPYTREE_SHARE} . ${STAGEDIR}${PGDOCSDIR} )
+
+post-install:
+	@(cd ${STAGEDIR}${PREFIX} && ${FIND} ${PGDOCSREL} -type f) >> ${TMPPLIST}
+
+.include "${MASTERDIR}/Makefile"
diff --git a/databases/postgresql16-pgtcl/Makefile b/databases/postgresql16-pgtcl/Makefile
new file mode 100644
index 000000000000..d00c1675f6a7
--- /dev/null
+++ b/databases/postgresql16-pgtcl/Makefile
@@ -0,0 +1,9 @@
+PORTREVISION=	0
+PKGNAMESUFFIX=	-postgresql16
+
+CONFLICTS=	pgtcl pgtcl-postgresql9[0123456] pgtcl-postgresql1[012345-789]
+
+PGTCL_SLAVE=	16
+MASTERDIR=	${.CURDIR}/../pgtcl
+
+.include "${MASTERDIR}/Makefile"
diff --git a/databases/postgresql16-plperl/Makefile b/databases/postgresql16-plperl/Makefile
new file mode 100644
index 000000000000..0e1cd98fb533
--- /dev/null
+++ b/databases/postgresql16-plperl/Makefile
@@ -0,0 +1,27 @@
+PORTNAME=	postgresql
+# Keep the ?=, this port is used as master by the other plperl.
+PORTREVISION?=	0
+CATEGORIES=	databases perl5
+PKGNAMESUFFIX?=	${WANT_PGSQL_VER:S/.//}${COMPONENT}
+
+MAINTAINER=	pgsql@FreeBSD.org
+COMMENT=	Write SQL functions for PostgreSQL using Perl5
+
+RUN_DEPENDS=	postgres:databases/postgresql${WANT_PGSQL_VER:S/.//}-server
+
+MASTERDIR=	${.CURDIR}/../../databases/postgresql${WANT_PGSQL_VER:S/.//}-server
+
+WANT_PGSQL_VER?=16
+
+USES+=		perl5 readline
+CONFIGURE_ARGS=	--with-perl
+
+BUILD_DIRS=	src/backend ${INSTALL_DIRS}
+INSTALL_DIRS?=	src/pl/plperl contrib/bool_plperl contrib/hstore_plperl contrib/jsonb_plperl
+SLAVE_ONLY=	yes
+COMPONENT=	-plperl
+
+# this port fails to build in parallel
+MAKE_JOBS_UNSAFE=	yes
+
+.include "${MASTERDIR}/Makefile"
diff --git a/databases/postgresql16-plpython/Makefile b/databases/postgresql16-plpython/Makefile
new file mode 100644
index 000000000000..55bb8de1ab4e
--- /dev/null
+++ b/databases/postgresql16-plpython/Makefile
@@ -0,0 +1,29 @@
+PORTNAME=	postgresql
+CATEGORIES=	databases python
+# Keep the ?=, it is used as master by the other plpython ports.
+PORTREVISION?=	0
+PKGNAMESUFFIX?=	${WANT_PGSQL_VER:S/.//}${COMPONENT}
+
+MAINTAINER=	pgsql@FreeBSD.org
+COMMENT=	Module for using Python to write SQL functions
+WWW=		https://www.postgresql.org/
+
+USES+=		pgsql:${WANT_PGSQL_VER} ${WANT_PYTHON_USE}
+WANT_PGSQL=	server
+
+MASTERDIR=	${.CURDIR}/../postgresql${WANT_PGSQL_VER:S/.//}-server
+
+WANT_PGSQL_VER?=	16
+WANT_PYTHON_USE?=	python
+
+CONFIGURE_ARGS=	--with-python
+COMPONENT=	-plpython
+
+BUILD_DIRS=	src/backend ${INSTALL_DIRS}
+INSTALL_DIRS?=	src/pl/plpython contrib/hstore_plpython contrib/jsonb_plpython contrib/ltree_plpython
+SLAVE_ONLY=	yes
+
+# this port fails to build in parallel
+MAKE_JOBS_UNSAFE=	yes
+
+.include "${MASTERDIR}/Makefile"
diff --git a/databases/postgresql16-plpython/pkg-descr b/databases/postgresql16-plpython/pkg-descr
new file mode 100644
index 000000000000..61c4875985f7
--- /dev/null
+++ b/databases/postgresql16-plpython/pkg-descr
@@ -0,0 +1,4 @@
+PL/Python allows one to write PostgeSQL stored functions and
+procedures in Python (http://www.python.org/).
+
+This software is part of the standard PostgreSQL distribution.
diff --git a/databases/postgresql16-pltcl/Makefile b/databases/postgresql16-pltcl/Makefile
new file mode 100644
index 000000000000..05ae8083d026
--- /dev/null
+++ b/databases/postgresql16-pltcl/Makefile
@@ -0,0 +1,32 @@
+PORTNAME=	postgresql
+# Keep the ?=, it is used by the other pltcl ports.
+PORTREVISION?=	0
+CATEGORIES=	databases tcl
+PKGNAMESUFFIX?=	${WANT_PGSQL_VER:S/.//}${COMPONENT}
+
+MAINTAINER=	pgsql@FreeBSD.org
+COMMENT=	Module for using Tcl to write SQL functions
+
+MASTERDIR=	${.CURDIR}/../../databases/postgresql${WANT_PGSQL_VER:S/.//}-server
+
+WANT_PGSQL_VER?=16
+
+USES+=		tcl pgsql:${WANT_PGSQL_VER}
+WANT_PGSQL=	server
+
+CONFIGURE_ARGS=	--with-tcl --without-tk \
+		--with-tclconfig="${TCL_LIBDIR}" \
+		--with-includes="${TCL_INCLUDEDIR}"
+
+CONFIGURE_ENV+=	TCLSH="${TCLSH}"
+MAKE_ENV+=	TCL_INCDIR="${TCL_INCLUDEDIR}"
+
+BUILD_DIRS=	src/backend src/pl/tcl
+INSTALL_DIRS=	src/pl/tcl
+SLAVE_ONLY=	yes
+COMPONENT=	-pltcl
+
+# this port fails to build in parallel
+MAKE_JOBS_UNSAFE=	yes
+
+.include "${MASTERDIR}/Makefile"
diff --git a/databases/postgresql16-server/Makefile b/databases/postgresql16-server/Makefile
new file mode 100644
index 000000000000..bb6e623c3449
--- /dev/null
+++ b/databases/postgresql16-server/Makefile
@@ -0,0 +1,295 @@
+PORTNAME?=	postgresql
+DISTVERSION?=	16.2
+# PORTREVISION must be ?= otherwise, all slave ports get this PORTREVISION and
+# not their own.  Probably best to keep it at ?=0 when reset here too.
+PORTREVISION?=	0
+CATEGORIES?=	databases
+MASTER_SITES=	PGSQL/source/v${DISTVERSION}
+PKGNAMESUFFIX?= ${PORTVERSION:R}${COMPONENT}
+
+MAINTAINER?=	pgsql@FreeBSD.org
+COMMENT?=	PostgreSQL is the most advanced open-source database available anywhere
+WWW=		https://www.postgresql.org/
+
+LICENSE=	PostgreSQL
+
+CONFLICTS+=	${PORTNAME}1[^${PORTVERSION:R:C/.*([0-9]$)/\\1/}]*
+
+WRKSRC=		${WRKDIR}/postgresql-${DISTVERSION}
+DIST_SUBDIR=	postgresql
+
+OPTIONS_SUB=	yes
+
+PKGINSTALL?=	${PKGDIR}/pkg-install${COMPONENT}
+USES+=		tar:bzip2 cpe
+.if !defined(NO_BUILD)
+USES+=		gmake
+GNU_CONFIGURE=	yes
+GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
+.endif
+
+PG_USER?=	postgres
+PG_GROUP?=	postgres
+PG_UID?=	770
+
+LDFLAGS+=	-L${LOCALBASE}/lib
+INCLUDES+=	-I${LOCALBASE}/include
+CONFIGURE_ARGS+=--with-libraries=${PREFIX}/lib \
+		--with-includes=${PREFIX}/include \
+		--enable-thread-safety
+CONFIGURE_ENV+=	INCLUDES="${INCLUDES}" \
+		PTHREAD_LIBS="-lpthread" \
+		LDFLAGS_SL="${LDFLAGS_SL}"
+LDFLAGS+=	-lpthread
+MAKE_ENV=	MAKELEVEL=0
+
+PLIST=		${PKGDIR}/pkg-plist${COMPONENT}
+
+INSTALL_DIRS?=	src/common src/timezone src/backend \
+		src/backend/utils/mb/conversion_procs \
+		src/backend/snowball src/backend/replication/libpqwalreceiver \
+		src/backend/replication/pgoutput \
+		src/bin/initdb src/bin/pg_ctl \
+		src/bin/pg_archivecleanup src/bin/pg_basebackup \
+		src/bin/pg_checksums \
+		src/bin/pg_controldata src/bin/pg_resetwal src/pl \
+		src/bin/pg_rewind \
+		src/bin/pg_test_fsync src/bin/pg_test_timing \
+		src/bin/pg_waldump src/bin/pg_upgrade
+
+BUILD_DIRS?=	src/port ${INSTALL_DIRS}
+INSTALL_TARGET?=install-strip
+
+.if !defined(CLIENT_ONLY) && !defined(SLAVE_ONLY)
+SERVER_ONLY=	yes
+COMPONENT=	-server
+USE_RC_SUBR=	postgresql
+USES+=		pgsql:${DISTVERSION:C/([0-9]\.?[0-9]).*/\1/g}
+USERS=		${PG_USER}
+GROUPS=	${PG_GROUP}
+SUB_FILES+=	502.pgsql
+.endif
+
+OPTIONS_SUB=	yes
+
+.if defined(CLIENT_ONLY)
+OPTIONS_DEFINE+=LIBEDIT DOCS
+LIBEDIT_DESC=	Use non-GPL libedit instead of readline
+.else
+MAKE_ENV+=	PATH=${PREFIX}/bin:${PATH}
+CONFIGURE_ENV+=	PATH=${PREFIX}/bin:${PATH}
+.endif
+
+.if defined(SERVER_ONLY)
+OPTIONS_DEFINE=	DTRACE LDAP INTDATE TZDATA XML DOCS
+LDAP_DESC=	Build with LDAP authentication support
+TZDATA_DESC=	Use internal timezone database
+XML_DESC=	Build with XML data type
+
+DTRACE_CONFIGURE_ENABLE=dtrace
+DTRACE_LDFLAGS=		-lelf
+DTRACE_INSTALL_TARGET=	install
+
+.  if ${DISTVERSION:C/([0-9][0-9]).*/\1/g} >= 14
+OPTIONS_DEFINE+=	LZ4
+OPTIONS_DEFAULT+=	LZ4
+LZ4_DESC=		Build with LZ4 compression support
+LZ4_CONFIGURE_WITH=	lz4
+LZ4_LIB_DEPENDS+=	liblz4.so:archivers/liblz4
+.  endif
+
+.  if ${DISTVERSION:C/([0-9][0-9]).*/\1/g} >= 15
+OPTIONS_DEFINE+=	ZSTD
+OPTIONS_DEFAULT+=	ZSTD
+ZSTD_DESC=		Build with ZSTD compression support
+ZSTD_CONFIGURE_WITH=	zstd
+ZSTD_LIB_DEPENDS+=	libzstd.so:archivers/zstd
+.  endif
+
+OPTIONS_DEFINE+=	LLVM
+OPTIONS_DEFAULT+=	LLVM
+LLVM_DESC=		Build with support for JIT-compiling expressions
+LLVM_CONFIGURE_WITH=	llvm
+LLVM_CONFIGURE_ENV=	LLVM_CONFIG=${LLVM_CONFIG} \
+			CLANG=${LOCALBASE}/bin/clang${LLVM_VERSION}
+LLVM_USES=		llvm:max=15,min=11,lib
+
+# See http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/76999 for more info
+# (requires dump/restore if modified.)
+OPTIONS_DEFINE+=	INTDATE
+INTDATE_DESC=		Builds with 64-bit date/time type
+OPTIONS_DEFAULT+=	INTDATE
+
+CONFIGURE_ARGS+=	--with-icu
+LIB_DEPENDS+=		libicudata.so:devel/icu
+USES+=			pkgconfig
+.else
+CONFIGURE_ARGS+=	--without-icu
+.endif
+
+
+.if !defined(SLAVE_ONLY)
+OPTIONS_DEFINE+=	NLS PAM GSSAPI OPTIMIZED_CFLAGS DEBUG DOCS
+KRB5_DESC=		Build with kerberos provider support
+NLS_DESC=		Use internationalized messages
+PAM_DESC=		Build with PAM Support
+MIT_KRB5_DESC=		Build with MIT kerberos support
+HEIMDAL_KRB5_DESC=	Builds with Heimdal kerberos
+GSSAPI_DESC=		Build with GSSAPI support
+OPTIMIZED_CFLAGS_DESC=	Builds with compiler optimizations (-O3)
+
+OPTIONS_DEFINE+=	SSL
+SSL_DESC=		Build with OpenSSL support
+
+OPTIONS_DEFAULT+=	SSL
+
+GSSAPI_CONFIGURE_WITH=	gssapi
+.endif # !SLAVE_ONLY
+
+.if defined(CLIENT_ONLY)
+LIBEDIT_CONFIGURE_ON+=--with-libedit-preferred
+LIBEDIT_USES=		libedit
+LIBEDIT_USES_OFF=	readline
+.endif # CLIENT_ONLY
+
+SSL_USES=		ssl
+SSL_CONFIGURE_WITH=	openssl
+
+PAM_CONFIGURE_WITH=	pam
+
+XML_CONFIGURE_WITH=	libxml
+XML_LIB_DEPENDS=	libxml2.so:textproc/libxml2
+
+TZDATA_CONFIGURE_OFF=	--with-system-tzdata=/usr/share/zoneinfo
+
+INTDATE_CONFIGURE_OFF=	--disable-integer-datetimes
+
+NLS_CONFIGURE_ENABLE=	nls
+NLS_USES=		gettext
+
+LDAP_CONFIGURE_WITH=	ldap
+LDAP_USES=		ldap
+
+OPTIMIZED_CFLAGS_CFLAGS=-O3 -funroll-loops
+
+DEBUG_CONFIGURE_ENABLE=	debug
+
+PLIST_SUB+=		PG_VERSION=${PORTVERSION:R} \
+			PG_USER=${PG_USER} \
+			PG_USER_regex=[[:<:]]${PG_USER}[[:>:]] \
+			PG_GROUP=${PG_GROUP} \
+			PG_GROUP_regex=[[:<:]]${PG_GROUP}[[:>:]]
+SUB_LIST+=		PG_VERSION=${PORTVERSION:R} \
+			PG_GROUP=${PG_GROUP} \
+			PG_USER=${PG_USER} \
+			PG_UID=${PG_UID}
+
+.include <bsd.port.options.mk>
+
+# i386 older than Pentium lacks SSE2 so the binary will not run if we build with clang -msse2
+# For such ancient CPUs, gcc must be used to build PostgreSQL.
+# https://www.postgresql.org/message-id/20190307140421.GA8362%40gate.oper.dinoex.org
+.if ${ARCH} == "i386"
+CFLAGS+=	-msse2
+.endif
+
+.if !defined(SLAVE_ONLY)
+
+PATCH_DIST_STRIP=-p1
+
+.if ${PORT_OPTIONS:MGSSAPI}
+.if empty(PORT_OPTIONS:MMIT_KRB5) && empty(PORT_OPTIONS:MHEIMDAL_KRB5)
+# Kerberos libraries will pull the proper GSSAPI library
+# via linker dependencies, but otherwise we must specify
+# it explicitely: ld --as-needed is used for compilation,
+# so configure's -lgssapi_krb5 won't go.
+LDFLAGS+=	-lgssapi
+LDFLAGS_SL+=	-lgssapi
+.endif
+.endif
+
+.  if ${PORT_OPTIONS:MMIT_KRB5}
+.   if defined(IGNORE_WITH_SRC_KRB5) && (exists(/usr/lib/libkrb5.so) || exists(/usr/bin/krb5-config))
+IGNORE=	requires that you remove heimdal\'s /usr/bin/krb5-config and /usr/lib/libkrb5.so*, and set NO_KERBEROS=true in /etc/src.conf to build successfully with MIT-KRB
+.   else
+CONFIGURE_ARGS+=--with-krb5
+# Allow defining a home built MIT Kerberos by setting KRB5_HOME
+.    if defined(KRB5_HOME) && exists(${KRB5_HOME}/lib/libgssapi_krb5.a) && exists(${KRB5_HOME}/bin/krb5-config)
+LIB_DEPENDS+=	libkrb5.so.3:security/krb5
+.    endif
+.   endif
+.  endif
+
+.  if ${PORT_OPTIONS:MHEIMDAL_KRB5}
+CONFIGURE_ARGS+=--with-krb5
+.  endif
+
+.endif # !SLAVE_ONLY
+
+# For testing files in FILESDIR
+.include <bsd.port.pre.mk>
+
+.if ${PORT_OPTIONS:MLLVM}
+INSTALL_DIRS+=		src/backend/jit/llvm
+.endif
+
+.if defined(SERVER_ONLY)
+pre-build:
+	@${SH} ${PKGINSTALL} ${PORTNAME} PRE-INSTALL
+.endif
+
+.if !defined(NO_BUILD) && !target(do-build)
+
+do-build:
+	@ cd ${WRKSRC}/src/backend && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} generated-headers
+	@ for dir in ${BUILD_DIRS}; do \
+		cd ${WRKSRC}/$${dir} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ; \
+	done
+
+.  if exists(${FILESDIR}/pkg-message${COMPONENT}.in)
+SUB_FILES+=	pkg-message${COMPONENT}
+PKGMESSAGE=	${WRKSRC}/pkg-message${COMPONENT}
+.  endif
+.  if exists(${FILESDIR}/pkg-install${COMPONENT}.in)
+SUB_FILES+=	pkg-install${COMPONENT}
+.  endif
+
+post-patch:
+.  if defined(CLIENT_ONLY) && !defined(OPENSSL_PORT)
+	@${REINPLACE_CMD} \
+		-e '/^PKG_CONFIG_REQUIRES_PRIVATE = libssl libcrypto/d' \
+		${WRKSRC}/src/interfaces/libpq/Makefile
+.  endif
+
+do-install:
+	@for dir in ${INSTALL_DIRS}; do \
+	    cd ${WRKSRC}/$${dir} && \
+		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${INSTALL_TARGET}; \
+	done
+.  if defined(SERVER_ONLY)
+	@ ${MKDIR} ${STAGEDIR}${PREFIX}/share/postgresql ;\
+	${MKDIR} ${STAGEDIR}${PREFIX}/etc/periodic/daily ;\
+	${INSTALL_SCRIPT} ${WRKDIR}/502.pgsql \
+			${STAGEDIR}${PREFIX}/etc/periodic/daily
+.  endif # SERVER_ONLY
+.  if defined(CLIENT_ONLY)
+	@ cd ${WRKSRC}/src && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} install-local
+.  endif
+	@ if [ -r ${PKGMESSAGE} ]; then \
+		${MKDIR} ${STAGEDIR}${DOCSDIR} ;\
+		${INSTALL_DATA} ${PKGMESSAGE} ${STAGEDIR}${DOCSDIR}/README${COMPONENT} ;\
+	fi
+.endif # !NO_BUILD
+
+.if defined(SERVER_ONLY)
+check:
+	@if [ `id -u` != 0 ] ; then \
+	  ${ECHO} "Running postgresql regressions tests" ;\
+	  cd ${WRKSRC}; ${MAKE_CMD} check ;\
+	 else \
+	  ${ECHO} "You cannot run regression tests when postgresql is built as user root." ; \
+	  ${ECHO} "Clean and rebuild the port as a regular user to run the tests." ;\
+	 fi
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/databases/postgresql16-server/distinfo b/databases/postgresql16-server/distinfo
new file mode 100644
index 000000000000..bb2283ecf3ea
--- /dev/null
+++ b/databases/postgresql16-server/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1707301242
+SHA256 (postgresql/postgresql-16.2.tar.bz2) = 446e88294dbc2c9085ab4b7061a646fa604b4bec03521d5ea671c2e5ad9b2952
+SIZE (postgresql/postgresql-16.2.tar.bz2) = 24711703
diff --git a/databases/postgresql16-server/files/502.pgsql.in b/databases/postgresql16-server/files/502.pgsql.in
new file mode 100644
index 000000000000..604ad3dadab8
--- /dev/null
+++ b/databases/postgresql16-server/files/502.pgsql.in
@@ -0,0 +1,114 @@
+#!/bin/sh
+#
+# Maintenance shell script to vacuum and backup database
+# Put this in /usr/local/etc/periodic/daily, and it will be run
+# every night
+#
+# Written by Palle Girgensohn <girgen@pingpong.net>
+#
+# In public domain, do what you like with it,
+# and use it at your own risk... :)
+#
+
+# Define these variables in either /etc/periodic.conf or
+# /etc/periodic.conf.local to override the default values.
+#
+# daily_pgsql_backup_enable="YES" # do backup of all databases
+# daily_pgsql_backup_enable="foo bar db1 db2" # only do backup of a limited selection of databases
+# daily_pgsql_vacuum_enable="YES" # do vacuum
+
+# If there is a global system configuration file, suck it in.
+#
+if [ -r /etc/defaults/periodic.conf ]
+then
+    . /etc/defaults/periodic.conf
+    source_periodic_confs
+fi
+
+: ${daily_pgsql_user:="%%PG_USER%%"}
+: ${daily_pgsql_port:=5432}
+: ${daily_pgsql_vacuum_args:="-U ${daily_pgsql_user} -p ${daily_pgsql_port} -qaz"}
+: ${daily_pgsql_pgdump_args:="-U ${daily_pgsql_user} -p ${daily_pgsql_port} -bF c"}
+: ${daily_pgsql_pgdumpall_globals_args:="-U ${daily_pgsql_user} -p ${daily_pgsql_port}"}
+# backupdir is relative to ~pgsql home directory unless it begins with a slash:
+: ${daily_pgsql_backupdir:="~${daily_pgsql_user}/backups"}
+: ${daily_pgsql_savedays:="7"}
+
+# allow '~' in directory name
+eval backupdir=${daily_pgsql_backupdir}
+
+rc=0
+
+pgsql_backup() {
+	# daily_pgsql_backupdir must be writeable by user %%PG_USER%%
+	# ~%%PG_USER%% is just that under normal circumstances,
+	# but this might not be where you want the backups...
+	if [ ! -d ${backupdir} ] ; then
+	    echo Creating ${backupdir}
+	    mkdir -m 700 ${backupdir}; chown ${daily_pgsql_user} ${backupdir}
+	fi
+
+	echo
+	echo "PostgreSQL backups"
+
+	# Protect the data
+	umask 077
+	rc=$?
+	now=`date "+%Y-%m-%dT%H:%M:%S"`
+	file=${daily_pgsql_backupdir}/pgglobals_${now}
+	su -l ${daily_pgsql_user} -c \
+		"umask 077; pg_dumpall -g ${daily_pgsql_pgdumpall_globals_args} | gzip -9 > ${file}.gz"
+
+	db=$1
+	while shift; do
+	    echo -n " $db"
+	    file=${backupdir}/pgdump_${db}_${now}
+	    su -l ${daily_pgsql_user} -c "umask 077; pg_dump ${daily_pgsql_pgdump_args} -f ${file} ${db}"
+	    [ $? -gt 0 ] && rc=3
+		db=$1
+	done
+
+	if [ $rc -gt 0 ]; then
+	    echo
+	    echo "Errors were reported during backup."
+	fi
+
+	# cleaning up old data
+	find ${backupdir} \( -name 'pgdump_*' -o -name 'pgglobals_*' -o -name '*.dat.gz' -o -name 'toc.dat' \) \
+	    -a -mtime +${daily_pgsql_savedays} -delete
+	echo
+}
+
+case "$daily_pgsql_backup_enable" in
+    [Yy][Ee][Ss])
+	dbnames=`su -l ${daily_pgsql_user} -c "umask 077; psql -U ${daily_pgsql_user} -p ${daily_pgsql_port} -q -t -A -d template1 -c SELECT\ datname\ FROM\ pg_database\ WHERE\ datname!=\'template0\'"`
+	pgsql_backup $dbnames
+	;;
+
+	[Nn][Oo])
+	;;
+
+	"")
+	;;
+
+	*)
+	pgsql_backup $daily_pgsql_backup_enable
+	;;
+esac
+
+case "$daily_pgsql_vacuum_enable" in
+    [Yy][Ee][Ss])
+
+	echo
+	echo "PostgreSQL vacuum"
+	su -l ${daily_pgsql_user} -c "vacuumdb ${daily_pgsql_vacuum_args}"
+	if [ $? -gt 0 ]
+	then
+	    echo
+	    echo "Errors were reported during vacuum."
+	    rc=3
+	fi
+	;;
+esac
+
+exit $rc
diff --git a/databases/postgresql11-server/files/dot.cshrc.in b/databases/postgresql16-server/files/dot.cshrc.in
index 17c9ee69a7d0..17c9ee69a7d0 100644
--- a/databases/postgresql11-server/files/dot.cshrc.in
+++ b/databases/postgresql16-server/files/dot.cshrc.in
diff --git a/databases/postgresql11-server/files/dot.profile.in b/databases/postgresql16-server/files/dot.profile.in
index 5be3e6a36ca9..5be3e6a36ca9 100644
--- a/databases/postgresql11-server/files/dot.profile.in
+++ b/databases/postgresql16-server/files/dot.profile.in
diff --git a/databases/postgresql16-server/files/patch-disable-llvm-jit-inlining-with-tls b/databases/postgresql16-server/files/patch-disable-llvm-jit-inlining-with-tls
new file mode 100644
index 000000000000..02686061ce99
--- /dev/null
+++ b/databases/postgresql16-server/files/patch-disable-llvm-jit-inlining-with-tls
@@ -0,0 +1,24 @@
+Do not inline functions which access TLS in LLVM JIT, as
+this leads to crashes with unsupported relocation error
+
+diff --git src/backend/jit/llvm/llvmjit_inline.cpp src/backend/jit/llvm/llvmjit_inline.cpp
+index 2617a46..a063edb 100644
+--- src/backend/jit/llvm/llvmjit_inline.cpp
++++ src/backend/jit/llvm/llvmjit_inline.cpp
+@@ -608,6 +608,16 @@ function_inlinable(llvm::Function &F,
+ 		if (rv->materialize())
+ 			elog(FATAL, "failed to materialize metadata");
+ 
++		/*
++		 * Don't inline functions with thread-local variables until
++		 * related crashes are investigated (see BUG #16696)
++		 */
++		if (rv->isThreadLocal()) {
++			ilog(DEBUG1, "cannot inline %s due to thread-local variable %s",
++				F.getName().data(), rv->getName().data());
++			return false;
++		}
++
+ 		/*
+ 		 * Never want to inline externally visible vars, cheap enough to
+ 		 * reference.
diff --git a/databases/postgresql11-server/files/patch-doc-Makefile b/databases/postgresql16-server/files/patch-doc-Makefile
index d5176bfb64b5..d5176bfb64b5 100644
--- a/databases/postgresql11-server/files/patch-doc-Makefile
+++ b/databases/postgresql16-server/files/patch-doc-Makefile
diff --git a/databases/postgresql16-server/files/patch-doc-src-sgml-Makefile b/databases/postgresql16-server/files/patch-doc-src-sgml-Makefile
new file mode 100644
index 000000000000..36f5d2a8224c
--- /dev/null
+++ b/databases/postgresql16-server/files/patch-doc-src-sgml-Makefile
@@ -0,0 +1,41 @@
+--- doc/src/sgml/Makefile.orig	2018-10-15 23:12:02.000000000 +0200
++++ doc/src/sgml/Makefile	2018-10-18 22:34:13.656029000 +0200
+@@ -15,7 +15,7 @@
+ 
+ # Make "html" the default target, since that is what most people tend
+ # to want to use.
+-html:
++man:
+ 
+ # We don't need the tree-wide headers or install support here.
+ NO_GENERATED_HEADERS=yes
+@@ -26,7 +26,7 @@
+ include $(top_builddir)/src/Makefile.global
+ 
+ 
+-all: html man
++all: man
+ 
+ distprep: html distprep-man
+ 
+@@ -62,7 +62,6 @@
+ ## Man pages
+ ##
+ 
+-man distprep-man: man-stamp
+ 
+ man-stamp: stylesheet-man.xsl postgres.sgml $(ALLSGML)
+ 	$(XMLLINT) $(XMLINCLUDE) --noout --valid $(word 2,$^)
+@@ -212,10 +211,10 @@
+ ## Install
+ ##
+ 
+-install: install-html install-man
++install: install-man
+ 
+ installdirs:
+-	$(MKDIR_P) '$(DESTDIR)$(htmldir)'/html $(addprefix '$(DESTDIR)$(mandir)'/man, 1 3 $(sqlmansectnum))
++	$(MKDIR_P) $(addprefix '$(DESTDIR)$(mandir)'/man, 1 3 $(sqlmansectnum))
+ 
+ # If the install used a man directory shared with other applications, this will remove all files.
+ uninstall:
diff --git a/databases/postgresql11-server/files/patch-src-Makefile.shlib b/databases/postgresql16-server/files/patch-src-Makefile.shlib
index 2435ffe1d280..2435ffe1d280 100644
--- a/databases/postgresql11-server/files/patch-src-Makefile.shlib
+++ b/databases/postgresql16-server/files/patch-src-Makefile.shlib
diff --git a/databases/postgresql16-server/files/patch-src-backend-Makefile b/databases/postgresql16-server/files/patch-src-backend-Makefile
new file mode 100644
index 000000000000..ce8a8d558de1
--- /dev/null
+++ b/databases/postgresql16-server/files/patch-src-backend-Makefile
@@ -0,0 +1,11 @@
+--- src/backend/Makefile.orig	2009-07-07 15:58:33.000000000 +0200
++++ src/backend/Makefile	2009-07-07 15:58:57.000000000 +0200
+@@ -107,6 +107,8 @@
+ # Update the commonly used headers before building the subdirectories
+ $(SUBDIRS:%=%-recursive): $(top_builddir)/src/include/parser/gram.h $(top_builddir)/src/include/utils/fmgroids.h $(top_builddir)/src/include/utils/probes.h
+ 
++symlinks: $(top_builddir)/src/include/parser/gram.h $(top_builddir)/src/include/storage/lwlocknames.h
++
+ 
+ # The postgres.o target is needed by the rule in Makefile.global that
+ # creates the exports file when MAKE_EXPORTS = true.
diff --git a/databases/postgresql16-server/files/patch-src_backend_utils_misc_postgresql.conf.sample b/databases/postgresql16-server/files/patch-src_backend_utils_misc_postgresql.conf.sample
new file mode 100644
index 000000000000..9469421174a0
--- /dev/null
+++ b/databases/postgresql16-server/files/patch-src_backend_utils_misc_postgresql.conf.sample
@@ -0,0 +1,10 @@
+--- src/backend/utils/misc/postgresql.conf.sample.orig	2016-10-24 20:08:51 UTC
++++ src/backend/utils/misc/postgresql.conf.sample
+@@ -330,6 +330,7 @@
+ 
+ # - Where to Log -
+ 
++log_destination = 'syslog'
+ #log_destination = 'stderr'		# Valid values are combinations of
+ 					# stderr, csvlog, syslog, and eventlog,
+ 					# depending on platform.  csvlog
diff --git a/databases/postgresql16-server/files/pkg-message-client.in b/databases/postgresql16-server/files/pkg-message-client.in
new file mode 100644
index 000000000000..8cc91d484fcb
--- /dev/null
+++ b/databases/postgresql16-server/files/pkg-message-client.in
@@ -0,0 +1,38 @@
+[
+{ type: install
+  message: <<EOM
+The PostgreSQL port has a collection of "side orders":
+
+postgresql-docs
+  For all of the html documentation
+
+p5-Pg
+  A perl5 API for client access to PostgreSQL databases.
+
+postgresql-tcltk
+  If you want tcl/tk client support.
+
+postgresql-jdbc
+  For Java JDBC support.
+
+postgresql-odbc
+  For client access from unix applications using ODBC as access
+  method. Not needed to access unix PostgreSQL servers from Win32
+  using ODBC. See below.
+
+ruby-postgres, py-psycopg2
+  For client access to PostgreSQL databases using the ruby & python
+  languages.
+
+postgresql-plperl, postgresql-pltcl & postgresql-plruby
+  For using perl5, tcl & ruby as procedural languages.
+
+postgresql-contrib
+  Lots of contributed utilities, postgresql functions and
+  datatypes. There you find pg_standby, pgcrypto and many other cool
+  things.
+
+etc...
+EOM
+}
+]
diff --git a/databases/postgresql11-server/files/pkg-message-contrib.in b/databases/postgresql16-server/files/pkg-message-contrib.in
index 2d9f3d86e71c..2d9f3d86e71c 100644
--- a/databases/postgresql11-server/files/pkg-message-contrib.in
+++ b/databases/postgresql16-server/files/pkg-message-contrib.in
diff --git a/databases/postgresql11-server/files/pkg-message-plperl.in b/databases/postgresql16-server/files/pkg-message-plperl.in
index dbda7daff5c2..dbda7daff5c2 100644
--- a/databases/postgresql11-server/files/pkg-message-plperl.in
+++ b/databases/postgresql16-server/files/pkg-message-plperl.in
diff --git a/databases/postgresql11-server/files/pkg-message-plpython.in b/databases/postgresql16-server/files/pkg-message-plpython.in
index 3bd80d73d177..3bd80d73d177 100644
--- a/databases/postgresql11-server/files/pkg-message-plpython.in
+++ b/databases/postgresql16-server/files/pkg-message-plpython.in
diff --git a/databases/postgresql11-server/files/pkg-message-pltcl.in b/databases/postgresql16-server/files/pkg-message-pltcl.in
index c1776f7d6fb3..c1776f7d6fb3 100644
--- a/databases/postgresql11-server/files/pkg-message-pltcl.in
+++ b/databases/postgresql16-server/files/pkg-message-pltcl.in
diff --git a/databases/postgresql16-server/files/pkg-message-server.in b/databases/postgresql16-server/files/pkg-message-server.in
new file mode 100644
index 000000000000..6370d4a017cc
--- /dev/null
+++ b/databases/postgresql16-server/files/pkg-message-server.in
@@ -0,0 +1,71 @@
+[
+{ type: install
+  message: <<EOM
+For procedural languages and postgresql functions, please note that
+you might have to update them when updating the server.
+
+If you have many tables and many clients running, consider raising
+kern.maxfiles using sysctl(8), or reconfigure your kernel
+appropriately.
+
+The port is set up to use autovacuum for new databases, but you might
+also want to vacuum and perhaps backup your database regularly. There
+is a periodic script, %%PREFIX%%/etc/periodic/daily/502.pgsql, that
+you may find useful. You can use it to backup and perform vacuum on all
+databases nightly. Per default, it performs `vacuum analyze'. See the
+script for instructions. For autovacuum settings, please review
+~%%PG_USER%%/data/postgresql.conf.
+
+If you plan to access your PostgreSQL server using ODBC, please
+consider running the SQL script %%PREFIX%%/share/postgresql/odbc.sql
+to get the functions required for ODBC compliance.
+
+Please note that if you use the rc script,
+%%PREFIX%%/etc/rc.d/postgresql, to initialize the database, unicode
+(UTF-8) will be used to store character data by default.  Set
+postgresql_initdb_flags or use login.conf settings described below to
+alter this behaviour. See the start rc script for more info.
+
+To set limits, environment stuff like locale and collation and other
+things, you can set up a class in /etc/login.conf before initializing
+the database. Add something similar to this to /etc/login.conf:
+---
+%%PG_USER%%:\
+	:lang=en_US.UTF-8:\
+	:setenv=LC_COLLATE=C:\
+	:tc=default:
+---
+and run `cap_mkdb /etc/login.conf'.
+Then add 'postgresql_login_class="%%PG_USER%%"' to /etc/rc.conf, or
+set it as the %%PG_USER%% user's login class in /etc/passwd.
+
+======================================================================
+
+To use PostgreSQL, enable it in rc.conf using
+
+  sysrc postgresql_enable=yes
+
+To initialize the database, run
+
+  service postgresql initdb
+
+You can then start PostgreSQL by running:
+
+  service postgresql start
+
+For postmaster settings, see ~%%PG_USER%%/data/postgresql.conf
+
+NB. FreeBSD's PostgreSQL port logs to syslog by default
+    See ~%%PG_USER%%/data/postgresql.conf for more info
+
+NB. If you're not using a checksumming filesystem like ZFS, you might
+    wish to enable data checksumming. It can be enabled during
+    the initdb phase, by adding the "--data-checksums" flag to
+    the postgresql_initdb_flags rcvar. Otherwise you can enable it later by
+    pg_checksums.  Check the initdb(1) manpage for more info
+    and make sure you understand the performance implications.
+
+======================================================================
+EOM
+}
+]
diff --git a/databases/postgresql11-server/files/pkgIndex.tcl.in b/databases/postgresql16-server/files/pkgIndex.tcl.in
index bd8329b15c69..bd8329b15c69 100644
--- a/databases/postgresql11-server/files/pkgIndex.tcl.in
+++ b/databases/postgresql16-server/files/pkgIndex.tcl.in
diff --git a/databases/postgresql16-server/files/postgresql.in b/databases/postgresql16-server/files/postgresql.in
new file mode 100644
index 000000000000..08f6faf12c55
--- /dev/null
+++ b/databases/postgresql16-server/files/postgresql.in
@@ -0,0 +1,122 @@
+#!/bin/sh
+
+# PROVIDE: postgresql
+# REQUIRE: DAEMON mountlate
+# KEYWORD: shutdown
+#
+# Add the following line to /etc/rc.conf to enable PostgreSQL:
+#
+#  postgresql_enable="YES"
+#  # optional
+#  postgresql_data="/var/db/%%PG_USER%%/data%%PG_VERSION%%"
+#  postgresql_flags="-w -s -m fast"
+#  postgresql_initdb_flags="--encoding=utf-8 --lc-collate=C"
+#  # leave empty to use the login class set in in /etc/passwd:
+#  postgresql_login_class="my_custom_login_class"
+#  postgresql_profiles=""
+#
+# See %%PREFIX%%/share/doc/postgresql/README-server for more info
+#
+# This scripts takes one of the following commands:
+#
+#   start stop restart reload status initdb
+#
+# For postmaster startup options, edit ${postgresql_data}/postgresql.conf
+
+command=%%PREFIX%%/bin/pg_ctl
+
+. /etc/rc.subr
+
+load_rc_config postgresql
+
+# set defaults
+: ${postgresql_enable:="NO"}
+: ${postgresql_flags:="-w -s -m fast"}
+: ${postgresql_user:="%%PG_USER%%"}
+eval _pgdir="~${postgresql_user}/data%%PG_VERSION%%"
+: ${postgresql_data:="${_pgdir}"}
+: ${postgresql_login_class:=""}
+: ${postgresql_initdb_flags:="--encoding=utf-8 --lc-collate=C"}
+
+name=postgresql
+rcvar=postgresql_enable
+extra_commands="reload initdb"
+
+start_cmd="postgresql_command start"
+stop_cmd="postgresql_command stop"
+restart_cmd="postgresql_command restart"
+reload_cmd="postgresql_command reload"
+status_cmd="postgresql_command status"
+promote_cmd="postgresql_command promote"
+
+initdb_cmd="postgresql_initdb"
+
+su_cmd="/usr/bin/su"
+
+if [ -n "$2" ]; then
+	profile="$2"
+	if [ "x${postgresql_profiles}" != "x" ]; then
+		eval postgresql_data="\${postgresql_${profile}_data:-}"
+		if [ "x${postgresql_data}" = "x" ]; then
+			echo "You must define a data directory (postgresql_${profile}_data)"
+			exit 1
+		fi
+		eval postgresql_enable="\${postgresql_${profile}_enable:-${postgresql_enable}}"
+		eval postgresql_data="\${postgresql_${profile}_data:-${postgresql_data}}"
+		eval postgresql_flags="\${postgresql_${profile}_flags:-${postgresql_flags}}"
+		eval postgresql_login_class="\${postgresql_${profile}_login_class:-${postgresql_login_class}}"
+		eval postgresql_initdb_flags="\${postgresql_${profile}_initdb_flags:-${postgresql_initdb_flags}}"
+	fi
+else
+	if [ "x${postgresql_profiles}" != "x" -a "x$1" != "x" ]; then
+		for profile in ${postgresql_profiles}; do
+			eval _enable="\${postgresql_${profile}_enable}"
+			case "x${_enable:-${postgresql_enable}}" in
+			x|x[Nn][Oo]|x[Nn][Oo][Nn][Ee])
+				continue
+				;;
+			x[Yy][Ee][Ss])
+				;;
+			*)
+				if test -z "$_enable"; then
+					_var=postgresql_enable
+				else
+					_var=postgresql_"${profile}"_enable
+				fi
+				echo "Bad value" \
+					"'${_enable:-${postgresql_enable}}'" \
+					"for ${_var}. " \
+					"Profile ${profile} skipped."
+				continue
+				;;
+			esac
+			echo "===> postgresql profile: ${profile}"
+			%%PREFIX%%/etc/rc.d/postgresql $1 ${profile}
+			retcode="$?"
+			if [ "0${retcode}" -ne 0 ]; then
+				failed="${profile} (${retcode}) ${failed:-}"
+			else
+				success="${profile} ${success:-}"
+			fi
+		done
+		exit 0
+	fi
+fi
+
+command_args="-D ${postgresql_data} ${postgresql_flags}"
+
+postgresql_command()
+{
+    ${su_cmd} ${postgresql_login_class:+-c ${postgresql_login_class}} \
+	    -l ${postgresql_user} \
+	    -c "exec ${command} ${command_args} ${rc_arg}"
+}
+
+postgresql_initdb()
+{
+    ${su_cmd} ${postgresql_login_class:+-c ${postgresql_login_class}} \
+	    -l ${postgresql_user} \
+	    -c "exec %%PREFIX%%/bin/initdb ${postgresql_initdb_flags} -D ${postgresql_data} -U ${postgresql_user}"
+}
+
+run_rc_command "$1"
diff --git a/databases/postgresql16-server/pkg-descr b/databases/postgresql16-server/pkg-descr
new file mode 100644
index 000000000000..cbef6ffab2d8
--- /dev/null
+++ b/databases/postgresql16-server/pkg-descr
@@ -0,0 +1,21 @@
+PostgreSQL is a sophisticated Object-Relational DBMS, supporting
+almost all SQL constructs, including subselects, transactions, and
+user-defined types and functions. It is the most advanced open-source
+database available anywhere. Commercial Support is also available.
+
+The original Postgres code was the effort of many graduate students,
+undergraduate students, and staff programmers working under the direction of
+Professor Michael Stonebraker at the University of California, Berkeley. In
+1995, Andrew Yu and Jolly Chen took on the task of converting the DBMS query
+language to SQL and created a new database system which came to known as
+Postgres95. Many others contributed to the porting, testing, debugging and
+enhancement of the Postgres95 code. As the code improved, and 1995 faded into
+memory, PostgreSQL was born.
+
+PostgreSQL development is presently being performed by a team of Internet
+developers who are now responsible for all current and future development. The
+development team coordinator is Marc G. Fournier (scrappy@PostgreSQL.ORG).
+Support is available from the PostgreSQL developer/user community through the
+support mailing list (questions@PostgreSQL.ORG).
+
+PostgreSQL is free and the complete source is available.
diff --git a/databases/postgresql16-server/pkg-install-server b/databases/postgresql16-server/pkg-install-server
new file mode 100644
index 000000000000..94486e0dff98
--- /dev/null
+++ b/databases/postgresql16-server/pkg-install-server
@@ -0,0 +1,23 @@
+#! /bin/sh
+
+PATH=/bin:/usr/bin:/usr/sbin
+
+backupwarning() {
+cat <<EOF
+
+  =========== BACKUP YOUR DATA! =============
+  As always, backup your data before
+  upgrading. If the upgrade leads to a higher
+  major revision (e.g. 9.6 -> 10), a dump
+  and restore of all databases is
+  required. This is *NOT* done by the port!
+  See https://www.postgresql.org/docs/current/upgrading.html
+  ===========================================
+EOF
+}
+
+case $2 in
+PRE-INSTALL)
+	backupwarning
+	;;
+esac
diff --git a/databases/postgresql16-server/pkg-plist-client b/databases/postgresql16-server/pkg-plist-client
new file mode 100644
index 000000000000..0ece905e787c
--- /dev/null
+++ b/databases/postgresql16-server/pkg-plist-client
@@ -0,0 +1,1350 @@
+bin/clusterdb
+bin/createdb
+bin/createuser
+bin/dropdb
+bin/dropuser
+bin/ecpg
+bin/pg_amcheck
+bin/pg_config
+bin/pg_dump
+bin/pg_dumpall
+bin/pg_isready
+bin/pg_restore
+bin/pgbench
+bin/psql
+bin/reindexdb
+bin/vacuumdb
+include/ecpg_config.h
+include/ecpg_informix.h
+include/ecpgerrno.h
+include/ecpglib.h
+include/ecpgtype.h
+include/libpq-events.h
+include/libpq-fe.h
+include/libpq/libpq-fs.h
+include/pg_config.h
+include/pg_config_ext.h
+include/pg_config_manual.h
+include/pg_config_os.h
+include/pgtypes.h
+include/pgtypes_date.h
+include/pgtypes_error.h
+include/pgtypes_interval.h
+include/pgtypes_numeric.h
+include/pgtypes_timestamp.h
+include/postgres_ext.h
+include/postgresql/informix/esql/datetime.h
+include/postgresql/informix/esql/decimal.h
+include/postgresql/informix/esql/sqltypes.h
+include/postgresql/internal/c.h
+include/postgresql/internal/fe-auth-sasl.h
+include/postgresql/internal/libpq-int.h
+include/postgresql/internal/libpq/pqcomm.h
+include/postgresql/internal/port.h
+include/postgresql/internal/postgres_fe.h
+include/postgresql/internal/pqexpbuffer.h
+include/postgresql/server/access/amapi.h
+include/postgresql/server/access/amvalidate.h
+include/postgresql/server/access/attmap.h
+include/postgresql/server/access/attnum.h
+include/postgresql/server/access/brin.h
+include/postgresql/server/access/brin_internal.h
+include/postgresql/server/access/brin_page.h
+include/postgresql/server/access/brin_pageops.h
+include/postgresql/server/access/brin_revmap.h
+include/postgresql/server/access/brin_tuple.h
+include/postgresql/server/access/brin_xlog.h
+include/postgresql/server/access/bufmask.h
+include/postgresql/server/access/clog.h
+include/postgresql/server/access/commit_ts.h
+include/postgresql/server/access/detoast.h
+include/postgresql/server/access/genam.h
+include/postgresql/server/access/generic_xlog.h
+include/postgresql/server/access/gin.h
+include/postgresql/server/access/gin_private.h
+include/postgresql/server/access/ginblock.h
+include/postgresql/server/access/ginxlog.h
+include/postgresql/server/access/gist.h
+include/postgresql/server/access/gist_private.h
+include/postgresql/server/access/gistscan.h
+include/postgresql/server/access/gistxlog.h
+include/postgresql/server/access/hash.h
+include/postgresql/server/access/hash_xlog.h
+include/postgresql/server/access/heapam.h
+include/postgresql/server/access/heapam_xlog.h
+include/postgresql/server/access/heaptoast.h
+include/postgresql/server/access/hio.h
+include/postgresql/server/access/htup.h
+include/postgresql/server/access/htup_details.h
+include/postgresql/server/access/itup.h
+include/postgresql/server/access/multixact.h
+include/postgresql/server/access/nbtree.h
+include/postgresql/server/access/nbtxlog.h
+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
+include/postgresql/server/access/rmgr.h
+include/postgresql/server/access/rmgrdesc_utils.h
+include/postgresql/server/access/rmgrlist.h
+include/postgresql/server/access/sdir.h
+include/postgresql/server/access/session.h
+include/postgresql/server/access/skey.h
+include/postgresql/server/access/slru.h
+include/postgresql/server/access/spgist.h
+include/postgresql/server/access/spgist_private.h
+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
+include/postgresql/server/access/tsmapi.h
+include/postgresql/server/access/tupconvert.h
+include/postgresql/server/access/tupdesc.h
+include/postgresql/server/access/tupdesc_details.h
+include/postgresql/server/access/tupmacs.h
+include/postgresql/server/access/twophase.h
+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
+include/postgresql/server/access/xlogarchive.h
+include/postgresql/server/access/xlogbackup.h
+include/postgresql/server/access/xlogdefs.h
+include/postgresql/server/access/xloginsert.h
+include/postgresql/server/access/xlogprefetcher.h
+include/postgresql/server/access/xlogreader.h
+include/postgresql/server/access/xlogrecord.h
+include/postgresql/server/access/xlogrecovery.h
+include/postgresql/server/access/xlogstats.h
+include/postgresql/server/access/xlogutils.h
+include/postgresql/server/archive/archive_module.h
+include/postgresql/server/archive/shell_archive.h
+include/postgresql/server/bootstrap/bootstrap.h
+include/postgresql/server/c.h
+include/postgresql/server/catalog/binary_upgrade.h
+include/postgresql/server/catalog/catalog.h
+include/postgresql/server/catalog/catversion.h
+include/postgresql/server/catalog/dependency.h
+include/postgresql/server/catalog/genbki.h
+include/postgresql/server/catalog/heap.h
+include/postgresql/server/catalog/index.h
+include/postgresql/server/catalog/indexing.h
+include/postgresql/server/catalog/namespace.h
+include/postgresql/server/catalog/objectaccess.h
+include/postgresql/server/catalog/objectaddress.h
+include/postgresql/server/catalog/partition.h
+include/postgresql/server/catalog/pg_aggregate.h
+include/postgresql/server/catalog/pg_aggregate_d.h
+include/postgresql/server/catalog/pg_am.h
+include/postgresql/server/catalog/pg_am_d.h
+include/postgresql/server/catalog/pg_amop.h
+include/postgresql/server/catalog/pg_amop_d.h
+include/postgresql/server/catalog/pg_amproc.h
+include/postgresql/server/catalog/pg_amproc_d.h
+include/postgresql/server/catalog/pg_attrdef.h
+include/postgresql/server/catalog/pg_attrdef_d.h
+include/postgresql/server/catalog/pg_attribute.h
+include/postgresql/server/catalog/pg_attribute_d.h
+include/postgresql/server/catalog/pg_auth_members.h
+include/postgresql/server/catalog/pg_auth_members_d.h
+include/postgresql/server/catalog/pg_authid.h
+include/postgresql/server/catalog/pg_authid_d.h
+include/postgresql/server/catalog/pg_cast.h
+include/postgresql/server/catalog/pg_cast_d.h
+include/postgresql/server/catalog/pg_class.h
+include/postgresql/server/catalog/pg_class_d.h
+include/postgresql/server/catalog/pg_collation.h
+include/postgresql/server/catalog/pg_collation_d.h
+include/postgresql/server/catalog/pg_constraint.h
+include/postgresql/server/catalog/pg_constraint_d.h
+include/postgresql/server/catalog/pg_control.h
+include/postgresql/server/catalog/pg_conversion.h
+include/postgresql/server/catalog/pg_conversion_d.h
+include/postgresql/server/catalog/pg_database.h
+include/postgresql/server/catalog/pg_database_d.h
+include/postgresql/server/catalog/pg_db_role_setting.h
+include/postgresql/server/catalog/pg_db_role_setting_d.h
+include/postgresql/server/catalog/pg_default_acl.h
+include/postgresql/server/catalog/pg_default_acl_d.h
+include/postgresql/server/catalog/pg_depend.h
+include/postgresql/server/catalog/pg_depend_d.h
+include/postgresql/server/catalog/pg_description.h
+include/postgresql/server/catalog/pg_description_d.h
+include/postgresql/server/catalog/pg_enum.h
+include/postgresql/server/catalog/pg_enum_d.h
+include/postgresql/server/catalog/pg_event_trigger.h
+include/postgresql/server/catalog/pg_event_trigger_d.h
+include/postgresql/server/catalog/pg_extension.h
+include/postgresql/server/catalog/pg_extension_d.h
+include/postgresql/server/catalog/pg_foreign_data_wrapper.h
+include/postgresql/server/catalog/pg_foreign_data_wrapper_d.h
+include/postgresql/server/catalog/pg_foreign_server.h
+include/postgresql/server/catalog/pg_foreign_server_d.h
+include/postgresql/server/catalog/pg_foreign_table.h
+include/postgresql/server/catalog/pg_foreign_table_d.h
+include/postgresql/server/catalog/pg_index.h
+include/postgresql/server/catalog/pg_index_d.h
+include/postgresql/server/catalog/pg_inherits.h
+include/postgresql/server/catalog/pg_inherits_d.h
+include/postgresql/server/catalog/pg_init_privs.h
+include/postgresql/server/catalog/pg_init_privs_d.h
+include/postgresql/server/catalog/pg_language.h
+include/postgresql/server/catalog/pg_language_d.h
+include/postgresql/server/catalog/pg_largeobject.h
+include/postgresql/server/catalog/pg_largeobject_d.h
+include/postgresql/server/catalog/pg_largeobject_metadata.h
+include/postgresql/server/catalog/pg_largeobject_metadata_d.h
+include/postgresql/server/catalog/pg_namespace.h
+include/postgresql/server/catalog/pg_namespace_d.h
+include/postgresql/server/catalog/pg_opclass.h
+include/postgresql/server/catalog/pg_opclass_d.h
+include/postgresql/server/catalog/pg_operator.h
+include/postgresql/server/catalog/pg_operator_d.h
+include/postgresql/server/catalog/pg_opfamily.h
+include/postgresql/server/catalog/pg_opfamily_d.h
+include/postgresql/server/catalog/pg_parameter_acl.h
+include/postgresql/server/catalog/pg_parameter_acl_d.h
+include/postgresql/server/catalog/pg_partitioned_table.h
+include/postgresql/server/catalog/pg_partitioned_table_d.h
+include/postgresql/server/catalog/pg_policy.h
+include/postgresql/server/catalog/pg_policy_d.h
+include/postgresql/server/catalog/pg_proc.h
+include/postgresql/server/catalog/pg_proc_d.h
+include/postgresql/server/catalog/pg_publication.h
+include/postgresql/server/catalog/pg_publication_d.h
+include/postgresql/server/catalog/pg_publication_namespace.h
+include/postgresql/server/catalog/pg_publication_namespace_d.h
+include/postgresql/server/catalog/pg_publication_rel.h
+include/postgresql/server/catalog/pg_publication_rel_d.h
+include/postgresql/server/catalog/pg_range.h
+include/postgresql/server/catalog/pg_range_d.h
+include/postgresql/server/catalog/pg_replication_origin.h
+include/postgresql/server/catalog/pg_replication_origin_d.h
+include/postgresql/server/catalog/pg_rewrite.h
+include/postgresql/server/catalog/pg_rewrite_d.h
+include/postgresql/server/catalog/pg_seclabel.h
+include/postgresql/server/catalog/pg_seclabel_d.h
+include/postgresql/server/catalog/pg_sequence.h
+include/postgresql/server/catalog/pg_sequence_d.h
+include/postgresql/server/catalog/pg_shdepend.h
+include/postgresql/server/catalog/pg_shdepend_d.h
+include/postgresql/server/catalog/pg_shdescription.h
+include/postgresql/server/catalog/pg_shdescription_d.h
+include/postgresql/server/catalog/pg_shseclabel.h
+include/postgresql/server/catalog/pg_shseclabel_d.h
+include/postgresql/server/catalog/pg_statistic.h
+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
+include/postgresql/server/catalog/pg_subscription_rel_d.h
+include/postgresql/server/catalog/pg_tablespace.h
+include/postgresql/server/catalog/pg_tablespace_d.h
+include/postgresql/server/catalog/pg_transform.h
+include/postgresql/server/catalog/pg_transform_d.h
+include/postgresql/server/catalog/pg_trigger.h
+include/postgresql/server/catalog/pg_trigger_d.h
+include/postgresql/server/catalog/pg_ts_config.h
+include/postgresql/server/catalog/pg_ts_config_d.h
+include/postgresql/server/catalog/pg_ts_config_map.h
+include/postgresql/server/catalog/pg_ts_config_map_d.h
+include/postgresql/server/catalog/pg_ts_dict.h
+include/postgresql/server/catalog/pg_ts_dict_d.h
+include/postgresql/server/catalog/pg_ts_parser.h
+include/postgresql/server/catalog/pg_ts_parser_d.h
+include/postgresql/server/catalog/pg_ts_template.h
+include/postgresql/server/catalog/pg_ts_template_d.h
+include/postgresql/server/catalog/pg_type.h
+include/postgresql/server/catalog/pg_type_d.h
+include/postgresql/server/catalog/pg_user_mapping.h
+include/postgresql/server/catalog/pg_user_mapping_d.h
+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/alter.h
+include/postgresql/server/commands/async.h
+include/postgresql/server/commands/cluster.h
+include/postgresql/server/commands/collationcmds.h
+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
+include/postgresql/server/commands/defrem.h
+include/postgresql/server/commands/discard.h
+include/postgresql/server/commands/event_trigger.h
+include/postgresql/server/commands/explain.h
+include/postgresql/server/commands/extension.h
+include/postgresql/server/commands/lockcmds.h
+include/postgresql/server/commands/matview.h
+include/postgresql/server/commands/policy.h
+include/postgresql/server/commands/portalcmds.h
+include/postgresql/server/commands/prepare.h
+include/postgresql/server/commands/proclang.h
+include/postgresql/server/commands/progress.h
+include/postgresql/server/commands/publicationcmds.h
+include/postgresql/server/commands/schemacmds.h
+include/postgresql/server/commands/seclabel.h
+include/postgresql/server/commands/sequence.h
+include/postgresql/server/commands/subscriptioncmds.h
+include/postgresql/server/commands/tablecmds.h
+include/postgresql/server/commands/tablespace.h
+include/postgresql/server/commands/trigger.h
+include/postgresql/server/commands/typecmds.h
+include/postgresql/server/commands/user.h
+include/postgresql/server/commands/vacuum.h
+include/postgresql/server/commands/view.h
+include/postgresql/server/common/archive.h
+include/postgresql/server/common/base64.h
+include/postgresql/server/common/checksum_helper.h
+include/postgresql/server/common/compression.h
+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
+include/postgresql/server/common/jsonapi.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/openssl.h
+include/postgresql/server/common/percentrepl.h
+include/postgresql/server/common/pg_lzcompress.h
+include/postgresql/server/common/pg_prng.h
+include/postgresql/server/common/relpath.h
+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_east_asian_fw_table.h
+include/postgresql/server/common/unicode_nonspacing_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/timestamp.h
+include/postgresql/server/executor/execAsync.h
+include/postgresql/server/executor/execExpr.h
+include/postgresql/server/executor/execParallel.h
+include/postgresql/server/executor/execPartition.h
+include/postgresql/server/executor/execdebug.h
+include/postgresql/server/executor/execdesc.h
+include/postgresql/server/executor/executor.h
+include/postgresql/server/executor/functions.h
+include/postgresql/server/executor/hashjoin.h
+include/postgresql/server/executor/instrument.h
+include/postgresql/server/executor/nodeAgg.h
+include/postgresql/server/executor/nodeAppend.h
+include/postgresql/server/executor/nodeBitmapAnd.h
+include/postgresql/server/executor/nodeBitmapHeapscan.h
+include/postgresql/server/executor/nodeBitmapIndexscan.h
+include/postgresql/server/executor/nodeBitmapOr.h
+include/postgresql/server/executor/nodeCtescan.h
+include/postgresql/server/executor/nodeCustom.h
+include/postgresql/server/executor/nodeForeignscan.h
+include/postgresql/server/executor/nodeFunctionscan.h
+include/postgresql/server/executor/nodeGather.h
+include/postgresql/server/executor/nodeGatherMerge.h
+include/postgresql/server/executor/nodeGroup.h
+include/postgresql/server/executor/nodeHash.h
+include/postgresql/server/executor/nodeHashjoin.h
+include/postgresql/server/executor/nodeIncrementalSort.h
+include/postgresql/server/executor/nodeIndexonlyscan.h
+include/postgresql/server/executor/nodeIndexscan.h
+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
+include/postgresql/server/executor/nodeNamedtuplestorescan.h
+include/postgresql/server/executor/nodeNestloop.h
+include/postgresql/server/executor/nodeProjectSet.h
+include/postgresql/server/executor/nodeRecursiveunion.h
+include/postgresql/server/executor/nodeResult.h
+include/postgresql/server/executor/nodeSamplescan.h
+include/postgresql/server/executor/nodeSeqscan.h
+include/postgresql/server/executor/nodeSetOp.h
+include/postgresql/server/executor/nodeSort.h
+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
+include/postgresql/server/executor/nodeWindowAgg.h
+include/postgresql/server/executor/nodeWorktablescan.h
+include/postgresql/server/executor/spi.h
+include/postgresql/server/executor/spi_priv.h
+include/postgresql/server/executor/tablefunc.h
+include/postgresql/server/executor/tqueue.h
+include/postgresql/server/executor/tstoreReceiver.h
+include/postgresql/server/executor/tuptable.h
+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
+include/postgresql/server/fmgr.h
+include/postgresql/server/foreign/fdwapi.h
+include/postgresql/server/foreign/foreign.h
+include/postgresql/server/funcapi.h
+include/postgresql/server/getopt_long.h
+include/postgresql/server/jit/jit.h
+include/postgresql/server/jit/llvmjit.h
+include/postgresql/server/jit/llvmjit_emit.h
+include/postgresql/server/lib/binaryheap.h
+include/postgresql/server/lib/bipartite_match.h
+include/postgresql/server/lib/bloomfilter.h
+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/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/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
+include/postgresql/server/libpq/libpq-be-fe-helpers.h
+include/postgresql/server/libpq/libpq-be.h
+include/postgresql/server/libpq/libpq-fs.h
+include/postgresql/server/libpq/libpq.h
+include/postgresql/server/libpq/pqcomm.h
+include/postgresql/server/libpq/pqformat.h
+include/postgresql/server/libpq/pqmq.h
+include/postgresql/server/libpq/pqsignal.h
+include/postgresql/server/libpq/sasl.h
+include/postgresql/server/libpq/scram.h
+include/postgresql/server/mb/pg_wchar.h
+include/postgresql/server/mb/stringinfo_mb.h
+include/postgresql/server/miscadmin.h
+include/postgresql/server/nodes/bitmapset.h
+include/postgresql/server/nodes/execnodes.h
+include/postgresql/server/nodes/extensible.h
+include/postgresql/server/nodes/lockoptions.h
+include/postgresql/server/nodes/makefuncs.h
+include/postgresql/server/nodes/memnodes.h
+include/postgresql/server/nodes/miscnodes.h
+include/postgresql/server/nodes/multibitmapset.h
+include/postgresql/server/nodes/nodeFuncs.h
+include/postgresql/server/nodes/nodes.h
+include/postgresql/server/nodes/nodetags.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/queryjumble.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
+include/postgresql/server/optimizer/appendinfo.h
+include/postgresql/server/optimizer/clauses.h
+include/postgresql/server/optimizer/cost.h
+include/postgresql/server/optimizer/geqo.h
+include/postgresql/server/optimizer/geqo_copy.h
+include/postgresql/server/optimizer/geqo_gene.h
+include/postgresql/server/optimizer/geqo_misc.h
+include/postgresql/server/optimizer/geqo_mutation.h
+include/postgresql/server/optimizer/geqo_pool.h
+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
+include/postgresql/server/optimizer/paths.h
+include/postgresql/server/optimizer/placeholder.h
+include/postgresql/server/optimizer/plancat.h
+include/postgresql/server/optimizer/planmain.h
+include/postgresql/server/optimizer/planner.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/parser/analyze.h
+include/postgresql/server/parser/kwlist.h
+include/postgresql/server/parser/parse_agg.h
+include/postgresql/server/parser/parse_clause.h
+include/postgresql/server/parser/parse_coerce.h
+include/postgresql/server/parser/parse_collate.h
+include/postgresql/server/parser/parse_cte.h
+include/postgresql/server/parser/parse_enr.h
+include/postgresql/server/parser/parse_expr.h
+include/postgresql/server/parser/parse_func.h
+include/postgresql/server/parser/parse_merge.h
+include/postgresql/server/parser/parse_node.h
+include/postgresql/server/parser/parse_oper.h
+include/postgresql/server/parser/parse_param.h
+include/postgresql/server/parser/parse_relation.h
+include/postgresql/server/parser/parse_target.h
+include/postgresql/server/parser/parse_type.h
+include/postgresql/server/parser/parse_utilcmd.h
+include/postgresql/server/parser/parser.h
+include/postgresql/server/parser/parsetree.h
+include/postgresql/server/parser/scanner.h
+include/postgresql/server/parser/scansup.h
+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
+include/postgresql/server/pg_config_manual.h
+include/postgresql/server/pg_config_os.h
+include/postgresql/server/pg_getopt.h
+include/postgresql/server/pg_trace.h
+include/postgresql/server/pgstat.h
+include/postgresql/server/pgtar.h
+include/postgresql/server/pgtime.h
+include/postgresql/server/port.h
+include/postgresql/server/port/aix.h
+include/postgresql/server/port/atomics.h
+include/postgresql/server/port/atomics/arch-arm.h
+include/postgresql/server/port/atomics/arch-hppa.h
+include/postgresql/server/port/atomics/arch-ppc.h
+include/postgresql/server/port/atomics/arch-x86.h
+include/postgresql/server/port/atomics/fallback.h
+include/postgresql/server/port/atomics/generic-gcc.h
+include/postgresql/server/port/atomics/generic-msvc.h
+include/postgresql/server/port/atomics/generic-sunpro.h
+include/postgresql/server/port/atomics/generic.h
+include/postgresql/server/port/cygwin.h
+include/postgresql/server/port/darwin.h
+include/postgresql/server/port/freebsd.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/pg_iovec.h
+include/postgresql/server/port/pg_lfind.h
+include/postgresql/server/port/pg_pthread.h
+include/postgresql/server/port/simd.h
+include/postgresql/server/port/solaris.h
+include/postgresql/server/port/win32.h
+include/postgresql/server/port/win32/arpa/inet.h
+include/postgresql/server/port/win32/dlfcn.h
+include/postgresql/server/port/win32/grp.h
+include/postgresql/server/port/win32/netdb.h
+include/postgresql/server/port/win32/netinet/in.h
+include/postgresql/server/port/win32/netinet/tcp.h
+include/postgresql/server/port/win32/pwd.h
+include/postgresql/server/port/win32/sys/resource.h
+include/postgresql/server/port/win32/sys/select.h
+include/postgresql/server/port/win32/sys/socket.h
+include/postgresql/server/port/win32/sys/un.h
+include/postgresql/server/port/win32/sys/wait.h
+include/postgresql/server/port/win32_msvc/dirent.h
+include/postgresql/server/port/win32_msvc/sys/file.h
+include/postgresql/server/port/win32_msvc/sys/param.h
+include/postgresql/server/port/win32_msvc/sys/time.h
+include/postgresql/server/port/win32_msvc/unistd.h
+include/postgresql/server/port/win32_msvc/utime.h
+include/postgresql/server/port/win32_port.h
+include/postgresql/server/port/win32ntdll.h
+include/postgresql/server/portability/instr_time.h
+include/postgresql/server/portability/mem.h
+include/postgresql/server/postgres.h
+include/postgresql/server/postgres_ext.h
+include/postgresql/server/postgres_fe.h
+include/postgresql/server/postmaster/autovacuum.h
+include/postgresql/server/postmaster/auxprocess.h
+include/postgresql/server/postmaster/bgworker.h
+include/postgresql/server/postmaster/bgworker_internals.h
+include/postgresql/server/postmaster/bgwriter.h
+include/postgresql/server/postmaster/fork_process.h
+include/postgresql/server/postmaster/interrupt.h
+include/postgresql/server/postmaster/pgarch.h
+include/postgresql/server/postmaster/postmaster.h
+include/postgresql/server/postmaster/startup.h
+include/postgresql/server/postmaster/syslogger.h
+include/postgresql/server/postmaster/walwriter.h
+include/postgresql/server/regex/regcustom.h
+include/postgresql/server/regex/regerrs.h
+include/postgresql/server/regex/regex.h
+include/postgresql/server/regex/regexport.h
+include/postgresql/server/regex/regguts.h
+include/postgresql/server/replication/decode.h
+include/postgresql/server/replication/logical.h
+include/postgresql/server/replication/logicallauncher.h
+include/postgresql/server/replication/logicalproto.h
+include/postgresql/server/replication/logicalrelation.h
+include/postgresql/server/replication/logicalworker.h
+include/postgresql/server/replication/message.h
+include/postgresql/server/replication/origin.h
+include/postgresql/server/replication/output_plugin.h
+include/postgresql/server/replication/pgoutput.h
+include/postgresql/server/replication/reorderbuffer.h
+include/postgresql/server/replication/slot.h
+include/postgresql/server/replication/snapbuild.h
+include/postgresql/server/replication/syncrep.h
+include/postgresql/server/replication/walreceiver.h
+include/postgresql/server/replication/walsender.h
+include/postgresql/server/replication/walsender_private.h
+include/postgresql/server/replication/worker_internal.h
+include/postgresql/server/rewrite/prs2lock.h
+include/postgresql/server/rewrite/rewriteDefine.h
+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/snowball/header.h
+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
+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_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_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
+include/postgresql/server/snowball/libstemmer/stem_UTF_8_finnish.h
+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
+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
+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/extended_stats_internal.h
+include/postgresql/server/statistics/statistics.h
+include/postgresql/server/storage/backendid.h
+include/postgresql/server/storage/barrier.h
+include/postgresql/server/storage/block.h
+include/postgresql/server/storage/buf.h
+include/postgresql/server/storage/buf_internals.h
+include/postgresql/server/storage/buffile.h
+include/postgresql/server/storage/bufmgr.h
+include/postgresql/server/storage/bufpage.h
+include/postgresql/server/storage/checksum.h
+include/postgresql/server/storage/checksum_impl.h
+include/postgresql/server/storage/condition_variable.h
+include/postgresql/server/storage/copydir.h
+include/postgresql/server/storage/dsm.h
+include/postgresql/server/storage/dsm_impl.h
+include/postgresql/server/storage/fd.h
+include/postgresql/server/storage/fileset.h
+include/postgresql/server/storage/freespace.h
+include/postgresql/server/storage/fsm_internals.h
+include/postgresql/server/storage/indexfsm.h
+include/postgresql/server/storage/ipc.h
+include/postgresql/server/storage/item.h
+include/postgresql/server/storage/itemid.h
+include/postgresql/server/storage/itemptr.h
+include/postgresql/server/storage/large_object.h
+include/postgresql/server/storage/latch.h
+include/postgresql/server/storage/lmgr.h
+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
+include/postgresql/server/storage/pmsignal.h
+include/postgresql/server/storage/predicate.h
+include/postgresql/server/storage/predicate_internals.h
+include/postgresql/server/storage/proc.h
+include/postgresql/server/storage/procarray.h
+include/postgresql/server/storage/proclist.h
+include/postgresql/server/storage/proclist_types.h
+include/postgresql/server/storage/procsignal.h
+include/postgresql/server/storage/reinit.h
+include/postgresql/server/storage/relfilelocator.h
+include/postgresql/server/storage/s_lock.h
+include/postgresql/server/storage/sharedfileset.h
+include/postgresql/server/storage/shm_mq.h
+include/postgresql/server/storage/shm_toc.h
+include/postgresql/server/storage/shmem.h
+include/postgresql/server/storage/sinval.h
+include/postgresql/server/storage/sinvaladt.h
+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/cmdtag.h
+include/postgresql/server/tcop/cmdtaglist.h
+include/postgresql/server/tcop/deparse_utility.h
+include/postgresql/server/tcop/dest.h
+include/postgresql/server/tcop/fastpath.h
+include/postgresql/server/tcop/pquery.h
+include/postgresql/server/tcop/tcopprot.h
+include/postgresql/server/tcop/utility.h
+include/postgresql/server/tsearch/dicts/regis.h
+include/postgresql/server/tsearch/dicts/spell.h
+include/postgresql/server/tsearch/ts_cache.h
+include/postgresql/server/tsearch/ts_locale.h
+include/postgresql/server/tsearch/ts_public.h
+include/postgresql/server/tsearch/ts_type.h
+include/postgresql/server/tsearch/ts_utils.h
+include/postgresql/server/utils/acl.h
+include/postgresql/server/utils/aclchk_internal.h
+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
+include/postgresql/server/utils/catcache.h
+include/postgresql/server/utils/combocid.h
+include/postgresql/server/utils/conffiles.h
+include/postgresql/server/utils/date.h
+include/postgresql/server/utils/datetime.h
+include/postgresql/server/utils/datum.h
+include/postgresql/server/utils/dsa.h
+include/postgresql/server/utils/dynahash.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
+include/postgresql/server/utils/formatting.h
+include/postgresql/server/utils/freepage.h
+include/postgresql/server/utils/geo_decls.h
+include/postgresql/server/utils/guc.h
+include/postgresql/server/utils/guc_hooks.h
+include/postgresql/server/utils/guc_tables.h
+include/postgresql/server/utils/help_config.h
+include/postgresql/server/utils/hsearch.h
+include/postgresql/server/utils/index_selfuncs.h
+include/postgresql/server/utils/inet.h
+include/postgresql/server/utils/inval.h
+include/postgresql/server/utils/json.h
+include/postgresql/server/utils/jsonb.h
+include/postgresql/server/utils/jsonfuncs.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/memutils_internal.h
+include/postgresql/server/utils/memutils_memorychunk.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
+include/postgresql/server/utils/pg_locale.h
+include/postgresql/server/utils/pg_lsn.h
+include/postgresql/server/utils/pg_rusage.h
+include/postgresql/server/utils/pgstat_internal.h
+include/postgresql/server/utils/pidfile.h
+include/postgresql/server/utils/plancache.h
+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/rangetypes.h
+include/postgresql/server/utils/regproc.h
+include/postgresql/server/utils/rel.h
+include/postgresql/server/utils/relcache.h
+include/postgresql/server/utils/relfilenumbermap.h
+include/postgresql/server/utils/relmapper.h
+include/postgresql/server/utils/relptr.h
+include/postgresql/server/utils/reltrigger.h
+include/postgresql/server/utils/resowner.h
+include/postgresql/server/utils/resowner_private.h
+include/postgresql/server/utils/rls.h
+include/postgresql/server/utils/ruleutils.h
+include/postgresql/server/utils/sampling.h
+include/postgresql/server/utils/selfuncs.h
+include/postgresql/server/utils/sharedtuplestore.h
+include/postgresql/server/utils/snapmgr.h
+include/postgresql/server/utils/snapshot.h
+include/postgresql/server/utils/sortsupport.h
+include/postgresql/server/utils/spccache.h
+include/postgresql/server/utils/syscache.h
+include/postgresql/server/utils/timeout.h
+include/postgresql/server/utils/timestamp.h
+include/postgresql/server/utils/tuplesort.h
+include/postgresql/server/utils/tuplestore.h
+include/postgresql/server/utils/typcache.h
+include/postgresql/server/utils/tzparser.h
+include/postgresql/server/utils/usercontext.h
+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/varatt.h
+include/postgresql/server/windowapi.h
+include/sql3types.h
+include/sqlca.h
+include/sqlda-compat.h
+include/sqlda-native.h
+include/sqlda.h
+lib/libecpg.a
+lib/libecpg.so
+lib/libecpg.so.6
+lib/libecpg_compat.a
+lib/libecpg_compat.so
+lib/libecpg_compat.so.3
+lib/libpgport.a
+lib/libpgport_shlib.a
+lib/libpgtypes.a
+lib/libpgtypes.so
+lib/libpgtypes.so.3
+lib/libpq.a
+lib/libpq.so
+lib/libpq.so.5
+lib/postgresql/pgxs/config/install-sh
+lib/postgresql/pgxs/config/missing
+lib/postgresql/pgxs/src/Makefile.global
+lib/postgresql/pgxs/src/Makefile.port
+lib/postgresql/pgxs/src/Makefile.shlib
+lib/postgresql/pgxs/src/makefiles/pgxs.mk
+lib/postgresql/pgxs/src/nls-global.mk
+lib/postgresql/pgxs/src/test/regress/pg_regress
+libdata/pkgconfig/libecpg.pc
+libdata/pkgconfig/libecpg_compat.pc
+libdata/pkgconfig/libpgtypes.pc
+libdata/pkgconfig/libpq.pc
+share/man/man1/clusterdb.1.gz
+share/man/man1/createdb.1.gz
+share/man/man1/createuser.1.gz
+share/man/man1/dropdb.1.gz
+share/man/man1/dropuser.1.gz
+share/man/man1/ecpg.1.gz
+share/man/man1/initdb.1.gz
+share/man/man1/oid2name.1.gz
+share/man/man1/pg_amcheck.1.gz
+share/man/man1/pg_archivecleanup.1.gz
+share/man/man1/pg_basebackup.1.gz
+share/man/man1/pg_checksums.1.gz
+share/man/man1/pg_config.1.gz
+share/man/man1/pg_controldata.1.gz
+share/man/man1/pg_ctl.1.gz
+share/man/man1/pg_dump.1.gz
+share/man/man1/pg_dumpall.1.gz
+share/man/man1/pg_isready.1.gz
+share/man/man1/pg_receivewal.1.gz
+share/man/man1/pg_recvlogical.1.gz
+share/man/man1/pg_resetwal.1.gz
+share/man/man1/pg_restore.1.gz
+share/man/man1/pg_rewind.1.gz
+share/man/man1/pg_test_fsync.1.gz
+share/man/man1/pg_test_timing.1.gz
+share/man/man1/pg_upgrade.1.gz
+share/man/man1/pg_verifybackup.1.gz
+share/man/man1/pg_waldump.1.gz
+share/man/man1/pgbench.1.gz
+share/man/man1/postgres.1.gz
+share/man/man1/psql.1.gz
+share/man/man1/reindexdb.1.gz
+share/man/man1/vacuumdb.1.gz
+share/man/man1/vacuumlo.1.gz
+share/man/man3/SPI_commit.3.gz
+share/man/man3/SPI_commit_and_chain.3.gz
+share/man/man3/SPI_connect.3.gz
+share/man/man3/SPI_connect_ext.3.gz
+share/man/man3/SPI_copytuple.3.gz
+share/man/man3/SPI_cursor_close.3.gz
+share/man/man3/SPI_cursor_fetch.3.gz
+share/man/man3/SPI_cursor_find.3.gz
+share/man/man3/SPI_cursor_move.3.gz
+share/man/man3/SPI_cursor_open.3.gz
+share/man/man3/SPI_cursor_open_with_args.3.gz
+share/man/man3/SPI_cursor_open_with_paramlist.3.gz
+share/man/man3/SPI_cursor_parse_open.3.gz
+share/man/man3/SPI_exec.3.gz
+share/man/man3/SPI_execp.3.gz
+share/man/man3/SPI_execute.3.gz
+share/man/man3/SPI_execute_extended.3.gz
+share/man/man3/SPI_execute_plan.3.gz
+share/man/man3/SPI_execute_plan_extended.3.gz
+share/man/man3/SPI_execute_plan_with_paramlist.3.gz
+share/man/man3/SPI_execute_with_args.3.gz
+share/man/man3/SPI_finish.3.gz
+share/man/man3/SPI_fname.3.gz
+share/man/man3/SPI_fnumber.3.gz
+share/man/man3/SPI_freeplan.3.gz
+share/man/man3/SPI_freetuple.3.gz
+share/man/man3/SPI_freetuptable.3.gz
+share/man/man3/SPI_getargcount.3.gz
+share/man/man3/SPI_getargtypeid.3.gz
+share/man/man3/SPI_getbinval.3.gz
+share/man/man3/SPI_getnspname.3.gz
+share/man/man3/SPI_getrelname.3.gz
+share/man/man3/SPI_gettype.3.gz
+share/man/man3/SPI_gettypeid.3.gz
+share/man/man3/SPI_getvalue.3.gz
+share/man/man3/SPI_is_cursor_plan.3.gz
+share/man/man3/SPI_keepplan.3.gz
+share/man/man3/SPI_modifytuple.3.gz
+share/man/man3/SPI_palloc.3.gz
+share/man/man3/SPI_pfree.3.gz
+share/man/man3/SPI_prepare.3.gz
+share/man/man3/SPI_prepare_cursor.3.gz
+share/man/man3/SPI_prepare_extended.3.gz
+share/man/man3/SPI_prepare_params.3.gz
+share/man/man3/SPI_register_relation.3.gz
+share/man/man3/SPI_register_trigger_data.3.gz
+share/man/man3/SPI_repalloc.3.gz
+share/man/man3/SPI_result_code_string.3.gz
+share/man/man3/SPI_returntuple.3.gz
+share/man/man3/SPI_rollback.3.gz
+share/man/man3/SPI_rollback_and_chain.3.gz
+share/man/man3/SPI_saveplan.3.gz
+share/man/man3/SPI_scroll_cursor_fetch.3.gz
+share/man/man3/SPI_scroll_cursor_move.3.gz
+share/man/man3/SPI_start_transaction.3.gz
+share/man/man3/SPI_unregister_relation.3.gz
+share/man/man3/dblink.3.gz
+share/man/man3/dblink_build_sql_delete.3.gz
+share/man/man3/dblink_build_sql_insert.3.gz
+share/man/man3/dblink_build_sql_update.3.gz
+share/man/man3/dblink_cancel_query.3.gz
+share/man/man3/dblink_close.3.gz
+share/man/man3/dblink_connect.3.gz
+share/man/man3/dblink_connect_u.3.gz
+share/man/man3/dblink_disconnect.3.gz
+share/man/man3/dblink_error_message.3.gz
+share/man/man3/dblink_exec.3.gz
+share/man/man3/dblink_fetch.3.gz
+share/man/man3/dblink_get_connections.3.gz
+share/man/man3/dblink_get_notify.3.gz
+share/man/man3/dblink_get_pkey.3.gz
+share/man/man3/dblink_get_result.3.gz
+share/man/man3/dblink_is_busy.3.gz
+share/man/man3/dblink_open.3.gz
+share/man/man3/dblink_send_query.3.gz
+share/man/man7/ABORT.7.gz
+share/man/man7/ALTER_AGGREGATE.7.gz
+share/man/man7/ALTER_COLLATION.7.gz
+share/man/man7/ALTER_CONVERSION.7.gz
+share/man/man7/ALTER_DATABASE.7.gz
+share/man/man7/ALTER_DEFAULT_PRIVILEGES.7.gz
+share/man/man7/ALTER_DOMAIN.7.gz
+share/man/man7/ALTER_EVENT_TRIGGER.7.gz
+share/man/man7/ALTER_EXTENSION.7.gz
+share/man/man7/ALTER_FOREIGN_DATA_WRAPPER.7.gz
+share/man/man7/ALTER_FOREIGN_TABLE.7.gz
+share/man/man7/ALTER_FUNCTION.7.gz
+share/man/man7/ALTER_GROUP.7.gz
+share/man/man7/ALTER_INDEX.7.gz
+share/man/man7/ALTER_LANGUAGE.7.gz
+share/man/man7/ALTER_LARGE_OBJECT.7.gz
+share/man/man7/ALTER_MATERIALIZED_VIEW.7.gz
+share/man/man7/ALTER_OPERATOR.7.gz
+share/man/man7/ALTER_OPERATOR_CLASS.7.gz
+share/man/man7/ALTER_OPERATOR_FAMILY.7.gz
+share/man/man7/ALTER_POLICY.7.gz
+share/man/man7/ALTER_PROCEDURE.7.gz
+share/man/man7/ALTER_PUBLICATION.7.gz
+share/man/man7/ALTER_ROLE.7.gz
+share/man/man7/ALTER_ROUTINE.7.gz
+share/man/man7/ALTER_RULE.7.gz
+share/man/man7/ALTER_SCHEMA.7.gz
+share/man/man7/ALTER_SEQUENCE.7.gz
+share/man/man7/ALTER_SERVER.7.gz
+share/man/man7/ALTER_STATISTICS.7.gz
+share/man/man7/ALTER_SUBSCRIPTION.7.gz
+share/man/man7/ALTER_SYSTEM.7.gz
+share/man/man7/ALTER_TABLE.7.gz
+share/man/man7/ALTER_TABLESPACE.7.gz
+share/man/man7/ALTER_TEXT_SEARCH_CONFIGURATION.7.gz
+share/man/man7/ALTER_TEXT_SEARCH_DICTIONARY.7.gz
+share/man/man7/ALTER_TEXT_SEARCH_PARSER.7.gz
+share/man/man7/ALTER_TEXT_SEARCH_TEMPLATE.7.gz
+share/man/man7/ALTER_TRIGGER.7.gz
+share/man/man7/ALTER_TYPE.7.gz
+share/man/man7/ALTER_USER.7.gz
+share/man/man7/ALTER_USER_MAPPING.7.gz
+share/man/man7/ALTER_VIEW.7.gz
+share/man/man7/ANALYZE.7.gz
+share/man/man7/BEGIN.7.gz
+share/man/man7/CALL.7.gz
+share/man/man7/CHECKPOINT.7.gz
+share/man/man7/CLOSE.7.gz
+share/man/man7/CLUSTER.7.gz
+share/man/man7/COMMENT.7.gz
+share/man/man7/COMMIT.7.gz
+share/man/man7/COMMIT_PREPARED.7.gz
+share/man/man7/COPY.7.gz
+share/man/man7/CREATE_ACCESS_METHOD.7.gz
+share/man/man7/CREATE_AGGREGATE.7.gz
+share/man/man7/CREATE_CAST.7.gz
+share/man/man7/CREATE_COLLATION.7.gz
+share/man/man7/CREATE_CONVERSION.7.gz
+share/man/man7/CREATE_DATABASE.7.gz
+share/man/man7/CREATE_DOMAIN.7.gz
+share/man/man7/CREATE_EVENT_TRIGGER.7.gz
+share/man/man7/CREATE_EXTENSION.7.gz
+share/man/man7/CREATE_FOREIGN_DATA_WRAPPER.7.gz
+share/man/man7/CREATE_FOREIGN_TABLE.7.gz
+share/man/man7/CREATE_FUNCTION.7.gz
+share/man/man7/CREATE_GROUP.7.gz
+share/man/man7/CREATE_INDEX.7.gz
+share/man/man7/CREATE_LANGUAGE.7.gz
+share/man/man7/CREATE_MATERIALIZED_VIEW.7.gz
+share/man/man7/CREATE_OPERATOR.7.gz
+share/man/man7/CREATE_OPERATOR_CLASS.7.gz
+share/man/man7/CREATE_OPERATOR_FAMILY.7.gz
+share/man/man7/CREATE_POLICY.7.gz
+share/man/man7/CREATE_PROCEDURE.7.gz
+share/man/man7/CREATE_PUBLICATION.7.gz
+share/man/man7/CREATE_ROLE.7.gz
+share/man/man7/CREATE_RULE.7.gz
+share/man/man7/CREATE_SCHEMA.7.gz
+share/man/man7/CREATE_SEQUENCE.7.gz
+share/man/man7/CREATE_SERVER.7.gz
+share/man/man7/CREATE_STATISTICS.7.gz
+share/man/man7/CREATE_SUBSCRIPTION.7.gz
+share/man/man7/CREATE_TABLE.7.gz
+share/man/man7/CREATE_TABLESPACE.7.gz
+share/man/man7/CREATE_TABLE_AS.7.gz
+share/man/man7/CREATE_TEXT_SEARCH_CONFIGURATION.7.gz
+share/man/man7/CREATE_TEXT_SEARCH_DICTIONARY.7.gz
+share/man/man7/CREATE_TEXT_SEARCH_PARSER.7.gz
+share/man/man7/CREATE_TEXT_SEARCH_TEMPLATE.7.gz
+share/man/man7/CREATE_TRANSFORM.7.gz
+share/man/man7/CREATE_TRIGGER.7.gz
+share/man/man7/CREATE_TYPE.7.gz
+share/man/man7/CREATE_USER.7.gz
+share/man/man7/CREATE_USER_MAPPING.7.gz
+share/man/man7/CREATE_VIEW.7.gz
+share/man/man7/DEALLOCATE.7.gz
+share/man/man7/DECLARE.7.gz
+share/man/man7/DELETE.7.gz
+share/man/man7/DISCARD.7.gz
+share/man/man7/DO.7.gz
+share/man/man7/DROP_ACCESS_METHOD.7.gz
+share/man/man7/DROP_AGGREGATE.7.gz
+share/man/man7/DROP_CAST.7.gz
+share/man/man7/DROP_COLLATION.7.gz
+share/man/man7/DROP_CONVERSION.7.gz
+share/man/man7/DROP_DATABASE.7.gz
+share/man/man7/DROP_DOMAIN.7.gz
+share/man/man7/DROP_EVENT_TRIGGER.7.gz
+share/man/man7/DROP_EXTENSION.7.gz
+share/man/man7/DROP_FOREIGN_DATA_WRAPPER.7.gz
+share/man/man7/DROP_FOREIGN_TABLE.7.gz
+share/man/man7/DROP_FUNCTION.7.gz
+share/man/man7/DROP_GROUP.7.gz
+share/man/man7/DROP_INDEX.7.gz
+share/man/man7/DROP_LANGUAGE.7.gz
+share/man/man7/DROP_MATERIALIZED_VIEW.7.gz
+share/man/man7/DROP_OPERATOR.7.gz
+share/man/man7/DROP_OPERATOR_CLASS.7.gz
+share/man/man7/DROP_OPERATOR_FAMILY.7.gz
+share/man/man7/DROP_OWNED.7.gz
+share/man/man7/DROP_POLICY.7.gz
+share/man/man7/DROP_PROCEDURE.7.gz
+share/man/man7/DROP_PUBLICATION.7.gz
+share/man/man7/DROP_ROLE.7.gz
+share/man/man7/DROP_ROUTINE.7.gz
+share/man/man7/DROP_RULE.7.gz
+share/man/man7/DROP_SCHEMA.7.gz
+share/man/man7/DROP_SEQUENCE.7.gz
+share/man/man7/DROP_SERVER.7.gz
+share/man/man7/DROP_STATISTICS.7.gz
+share/man/man7/DROP_SUBSCRIPTION.7.gz
+share/man/man7/DROP_TABLE.7.gz
+share/man/man7/DROP_TABLESPACE.7.gz
+share/man/man7/DROP_TEXT_SEARCH_CONFIGURATION.7.gz
+share/man/man7/DROP_TEXT_SEARCH_DICTIONARY.7.gz
+share/man/man7/DROP_TEXT_SEARCH_PARSER.7.gz
+share/man/man7/DROP_TEXT_SEARCH_TEMPLATE.7.gz
+share/man/man7/DROP_TRANSFORM.7.gz
+share/man/man7/DROP_TRIGGER.7.gz
+share/man/man7/DROP_TYPE.7.gz
+share/man/man7/DROP_USER.7.gz
+share/man/man7/DROP_USER_MAPPING.7.gz
+share/man/man7/DROP_VIEW.7.gz
+share/man/man7/END.7.gz
+share/man/man7/EXECUTE.7.gz
+share/man/man7/EXPLAIN.7.gz
+share/man/man7/FETCH.7.gz
+share/man/man7/GRANT.7.gz
+share/man/man7/IMPORT_FOREIGN_SCHEMA.7.gz
+share/man/man7/INSERT.7.gz
+share/man/man7/LISTEN.7.gz
+share/man/man7/LOAD.7.gz
+share/man/man7/LOCK.7.gz
+share/man/man7/MERGE.7.gz
+share/man/man7/MOVE.7.gz
+share/man/man7/NOTIFY.7.gz
+share/man/man7/PREPARE.7.gz
+share/man/man7/PREPARE_TRANSACTION.7.gz
+share/man/man7/REASSIGN_OWNED.7.gz
+share/man/man7/REFRESH_MATERIALIZED_VIEW.7.gz
+share/man/man7/REINDEX.7.gz
+share/man/man7/RELEASE_SAVEPOINT.7.gz
+share/man/man7/RESET.7.gz
+share/man/man7/REVOKE.7.gz
+share/man/man7/ROLLBACK.7.gz
+share/man/man7/ROLLBACK_PREPARED.7.gz
+share/man/man7/ROLLBACK_TO_SAVEPOINT.7.gz
+share/man/man7/SAVEPOINT.7.gz
+share/man/man7/SECURITY_LABEL.7.gz
+share/man/man7/SELECT.7.gz
+share/man/man7/SELECT_INTO.7.gz
+share/man/man7/SET.7.gz
+share/man/man7/SET_CONSTRAINTS.7.gz
+share/man/man7/SET_ROLE.7.gz
+share/man/man7/SET_SESSION_AUTHORIZATION.7.gz
+share/man/man7/SET_TRANSACTION.7.gz
+share/man/man7/SHOW.7.gz
+share/man/man7/START_TRANSACTION.7.gz
+share/man/man7/TABLE.7.gz
+share/man/man7/TRUNCATE.7.gz
+share/man/man7/UNLISTEN.7.gz
+share/man/man7/UPDATE.7.gz
+share/man/man7/VACUUM.7.gz
+share/man/man7/VALUES.7.gz
+share/man/man7/WITH.7.gz
+%%PORTDOCS%%%%DOCSDIR%%/README-client
+%%NLS%%share/locale/cs/LC_MESSAGES/ecpg-%%PG_VERSION%%.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/ecpglib6-%%PG_VERSION%%.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/libpq5-%%PG_VERSION%%.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/pg_config-%%PG_VERSION%%.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/pg_dump-%%PG_VERSION%%.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/pgscripts-%%PG_VERSION%%.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/psql-%%PG_VERSION%%.mo
+%%NLS%%share/locale/de/LC_MESSAGES/ecpg-%%PG_VERSION%%.mo
+%%NLS%%share/locale/de/LC_MESSAGES/ecpglib6-%%PG_VERSION%%.mo
+%%NLS%%share/locale/de/LC_MESSAGES/libpq5-%%PG_VERSION%%.mo
+%%NLS%%share/locale/de/LC_MESSAGES/pg_amcheck-%%PG_VERSION%%.mo
+%%NLS%%share/locale/de/LC_MESSAGES/pg_config-%%PG_VERSION%%.mo
+%%NLS%%share/locale/de/LC_MESSAGES/pg_dump-%%PG_VERSION%%.mo
+%%NLS%%share/locale/de/LC_MESSAGES/pgscripts-%%PG_VERSION%%.mo
+%%NLS%%share/locale/de/LC_MESSAGES/psql-%%PG_VERSION%%.mo
+%%NLS%%share/locale/el/LC_MESSAGES/ecpg-%%PG_VERSION%%.mo
+%%NLS%%share/locale/el/LC_MESSAGES/ecpglib6-%%PG_VERSION%%.mo
+%%NLS%%share/locale/el/LC_MESSAGES/libpq5-%%PG_VERSION%%.mo
+%%NLS%%share/locale/el/LC_MESSAGES/pg_amcheck-%%PG_VERSION%%.mo
+%%NLS%%share/locale/el/LC_MESSAGES/pg_config-%%PG_VERSION%%.mo
+%%NLS%%share/locale/el/LC_MESSAGES/pg_dump-%%PG_VERSION%%.mo
+%%NLS%%share/locale/el/LC_MESSAGES/pgscripts-%%PG_VERSION%%.mo
+%%NLS%%share/locale/el/LC_MESSAGES/psql-%%PG_VERSION%%.mo
+%%NLS%%share/locale/es/LC_MESSAGES/ecpg-%%PG_VERSION%%.mo
+%%NLS%%share/locale/es/LC_MESSAGES/ecpglib6-%%PG_VERSION%%.mo
+%%NLS%%share/locale/es/LC_MESSAGES/libpq5-%%PG_VERSION%%.mo
+%%NLS%%share/locale/es/LC_MESSAGES/pg_amcheck-%%PG_VERSION%%.mo
+%%NLS%%share/locale/es/LC_MESSAGES/pg_config-%%PG_VERSION%%.mo
+%%NLS%%share/locale/es/LC_MESSAGES/pg_dump-%%PG_VERSION%%.mo
+%%NLS%%share/locale/es/LC_MESSAGES/pgscripts-%%PG_VERSION%%.mo
+%%NLS%%share/locale/es/LC_MESSAGES/psql-%%PG_VERSION%%.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/ecpg-%%PG_VERSION%%.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/ecpglib6-%%PG_VERSION%%.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/libpq5-%%PG_VERSION%%.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/pg_amcheck-%%PG_VERSION%%.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/pg_config-%%PG_VERSION%%.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/pg_dump-%%PG_VERSION%%.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/pgscripts-%%PG_VERSION%%.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/psql-%%PG_VERSION%%.mo
+%%NLS%%share/locale/he/LC_MESSAGES/libpq5-%%PG_VERSION%%.mo
+%%NLS%%share/locale/he/LC_MESSAGES/pg_config-%%PG_VERSION%%.mo
+%%NLS%%share/locale/he/LC_MESSAGES/pg_dump-%%PG_VERSION%%.mo
+%%NLS%%share/locale/he/LC_MESSAGES/pgscripts-%%PG_VERSION%%.mo
+%%NLS%%share/locale/he/LC_MESSAGES/psql-%%PG_VERSION%%.mo
+%%NLS%%share/locale/it/LC_MESSAGES/ecpg-%%PG_VERSION%%.mo
+%%NLS%%share/locale/it/LC_MESSAGES/ecpglib6-%%PG_VERSION%%.mo
+%%NLS%%share/locale/it/LC_MESSAGES/libpq5-%%PG_VERSION%%.mo
+%%NLS%%share/locale/it/LC_MESSAGES/pg_amcheck-%%PG_VERSION%%.mo
+%%NLS%%share/locale/it/LC_MESSAGES/pg_config-%%PG_VERSION%%.mo
+%%NLS%%share/locale/it/LC_MESSAGES/pg_dump-%%PG_VERSION%%.mo
+%%NLS%%share/locale/it/LC_MESSAGES/pgscripts-%%PG_VERSION%%.mo
+%%NLS%%share/locale/it/LC_MESSAGES/psql-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/ecpg-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/ecpglib6-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/libpq5-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/pg_amcheck-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/pg_config-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/pg_dump-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/pgscripts-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/psql-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ka/LC_MESSAGES/ecpg-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ka/LC_MESSAGES/ecpglib6-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ka/LC_MESSAGES/libpq5-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ka/LC_MESSAGES/pg_amcheck-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ka/LC_MESSAGES/pg_config-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ka/LC_MESSAGES/pg_dump-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ka/LC_MESSAGES/pgscripts-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ka/LC_MESSAGES/psql-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/ecpg-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/ecpglib6-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/libpq5-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/pg_amcheck-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/pg_config-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/pg_dump-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/pgscripts-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/psql-%%PG_VERSION%%.mo
+%%NLS%%share/locale/nb/LC_MESSAGES/pg_config-%%PG_VERSION%%.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/ecpg-%%PG_VERSION%%.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/ecpglib6-%%PG_VERSION%%.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/libpq5-%%PG_VERSION%%.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/pg_config-%%PG_VERSION%%.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/pg_dump-%%PG_VERSION%%.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/pgscripts-%%PG_VERSION%%.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/psql-%%PG_VERSION%%.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/ecpg-%%PG_VERSION%%.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/ecpglib6-%%PG_VERSION%%.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/libpq5-%%PG_VERSION%%.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/pg_config-%%PG_VERSION%%.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/pg_dump-%%PG_VERSION%%.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/pgscripts-%%PG_VERSION%%.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/psql-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ro/LC_MESSAGES/pg_config-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/ecpg-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/ecpglib6-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/libpq5-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/pg_amcheck-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/pg_config-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/pg_dump-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/pgscripts-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/psql-%%PG_VERSION%%.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/ecpg-%%PG_VERSION%%.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/ecpglib6-%%PG_VERSION%%.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/libpq5-%%PG_VERSION%%.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/pg_amcheck-%%PG_VERSION%%.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/pg_config-%%PG_VERSION%%.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/pg_dump-%%PG_VERSION%%.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/pgscripts-%%PG_VERSION%%.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/psql-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ta/LC_MESSAGES/pg_config-%%PG_VERSION%%.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/ecpg-%%PG_VERSION%%.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/ecpglib6-%%PG_VERSION%%.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/libpq5-%%PG_VERSION%%.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/pg_config-%%PG_VERSION%%.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/pg_dump-%%PG_VERSION%%.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/pgscripts-%%PG_VERSION%%.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/psql-%%PG_VERSION%%.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/ecpg-%%PG_VERSION%%.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/ecpglib6-%%PG_VERSION%%.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/libpq5-%%PG_VERSION%%.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/pg_amcheck-%%PG_VERSION%%.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/pg_config-%%PG_VERSION%%.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/pg_dump-%%PG_VERSION%%.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/pgscripts-%%PG_VERSION%%.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/psql-%%PG_VERSION%%.mo
+%%NLS%%share/locale/vi/LC_MESSAGES/ecpg-%%PG_VERSION%%.mo
+%%NLS%%share/locale/vi/LC_MESSAGES/ecpglib6-%%PG_VERSION%%.mo
+%%NLS%%share/locale/vi/LC_MESSAGES/pg_config-%%PG_VERSION%%.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/ecpg-%%PG_VERSION%%.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/ecpglib6-%%PG_VERSION%%.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/libpq5-%%PG_VERSION%%.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/pg_amcheck-%%PG_VERSION%%.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/pg_config-%%PG_VERSION%%.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/pg_dump-%%PG_VERSION%%.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/pgscripts-%%PG_VERSION%%.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/psql-%%PG_VERSION%%.mo
+%%NLS%%share/locale/zh_TW/LC_MESSAGES/ecpg-%%PG_VERSION%%.mo
+%%NLS%%share/locale/zh_TW/LC_MESSAGES/ecpglib6-%%PG_VERSION%%.mo
+%%NLS%%share/locale/zh_TW/LC_MESSAGES/libpq5-%%PG_VERSION%%.mo
+%%NLS%%share/locale/zh_TW/LC_MESSAGES/pg_amcheck-%%PG_VERSION%%.mo
+%%NLS%%share/locale/zh_TW/LC_MESSAGES/pg_config-%%PG_VERSION%%.mo
+%%NLS%%share/locale/zh_TW/LC_MESSAGES/pg_dump-%%PG_VERSION%%.mo
+%%NLS%%share/locale/zh_TW/LC_MESSAGES/psql-%%PG_VERSION%%.mo
+%%DATADIR%%/pg_service.conf.sample
+%%DATADIR%%/psqlrc.sample
diff --git a/databases/postgresql16-server/pkg-plist-contrib b/databases/postgresql16-server/pkg-plist-contrib
new file mode 100644
index 000000000000..9010a8b464f3
--- /dev/null
+++ b/databases/postgresql16-server/pkg-plist-contrib
@@ -0,0 +1,267 @@
+bin/oid2name
+bin/vacuumlo
+include/postgresql/server/extension/cube/cubedata.h
+include/postgresql/server/extension/hstore/hstore.h
+include/postgresql/server/extension/isn/isn.h
+include/postgresql/server/extension/ltree/ltree.h
+include/postgresql/server/extension/seg/segdata.h
+lib/postgresql/_int.so
+lib/postgresql/adminpack.so
+lib/postgresql/amcheck.so
+lib/postgresql/auth_delay.so
+lib/postgresql/auto_explain.so
+lib/postgresql/autoinc.so
+lib/postgresql/basebackup_to_shell.so
+lib/postgresql/basic_archive.so
+lib/postgresql/bloom.so
+lib/postgresql/btree_gin.so
+lib/postgresql/btree_gist.so
+lib/postgresql/citext.so
+lib/postgresql/cube.so
+lib/postgresql/dblink.so
+lib/postgresql/dict_int.so
+lib/postgresql/dict_xsyn.so
+lib/postgresql/earthdistance.so
+lib/postgresql/file_fdw.so
+lib/postgresql/fuzzystrmatch.so
+lib/postgresql/hstore.so
+lib/postgresql/insert_username.so
+lib/postgresql/isn.so
+lib/postgresql/lo.so
+lib/postgresql/ltree.so
+lib/postgresql/moddatetime.so
+lib/postgresql/old_snapshot.so
+lib/postgresql/pageinspect.so
+lib/postgresql/passwordcheck.so
+lib/postgresql/pg_buffercache.so
+lib/postgresql/pg_freespacemap.so
+lib/postgresql/pg_prewarm.so
+lib/postgresql/pg_stat_statements.so
+lib/postgresql/pg_surgery.so
+lib/postgresql/pg_trgm.so
+lib/postgresql/pg_visibility.so
+lib/postgresql/pg_walinspect.so
+lib/postgresql/pgcrypto.so
+lib/postgresql/pgrowlocks.so
+lib/postgresql/pgstattuple.so
+%%XML%%lib/postgresql/pgxml.so
+lib/postgresql/postgres_fdw.so
+lib/postgresql/refint.so
+lib/postgresql/seg.so
+%%OPENSSL%%lib/postgresql/sslinfo.so
+lib/postgresql/tablefunc.so
+lib/postgresql/tcn.so
+lib/postgresql/test_decoding.so
+lib/postgresql/tsm_system_rows.so
+lib/postgresql/tsm_system_time.so
+lib/postgresql/unaccent.so
+lib/postgresql/uuid-ossp.so
+%%PORTDOCS%%%%DOCSDIR%%/README-contrib
+%%PORTDOCS%%%%DOCSDIR%%/extension/README
+%%PORTDOCS%%%%DOCSDIR%%/extension/autoinc.example
+%%PORTDOCS%%%%DOCSDIR%%/extension/insert_username.example
+%%PORTDOCS%%%%DOCSDIR%%/extension/moddatetime.example
+%%PORTDOCS%%%%DOCSDIR%%/extension/refint.example
+%%DATADIR%%/extension/adminpack--1.0--1.1.sql
+%%DATADIR%%/extension/adminpack--1.0.sql
+%%DATADIR%%/extension/adminpack--1.1--2.0.sql
+%%DATADIR%%/extension/adminpack--2.0--2.1.sql
+%%DATADIR%%/extension/adminpack.control
+%%DATADIR%%/extension/amcheck--1.0--1.1.sql
+%%DATADIR%%/extension/amcheck--1.0.sql
+%%DATADIR%%/extension/amcheck--1.1--1.2.sql
+%%DATADIR%%/extension/amcheck--1.2--1.3.sql
+%%DATADIR%%/extension/amcheck.control
+%%DATADIR%%/extension/autoinc--1.0.sql
+%%DATADIR%%/extension/autoinc.control
+%%DATADIR%%/extension/bloom--1.0.sql
+%%DATADIR%%/extension/bloom.control
+%%DATADIR%%/extension/btree_gin--1.0--1.1.sql
+%%DATADIR%%/extension/btree_gin--1.0.sql
+%%DATADIR%%/extension/btree_gin--1.1--1.2.sql
+%%DATADIR%%/extension/btree_gin--1.2--1.3.sql
+%%DATADIR%%/extension/btree_gin.control
+%%DATADIR%%/extension/btree_gist--1.0--1.1.sql
+%%DATADIR%%/extension/btree_gist--1.1--1.2.sql
+%%DATADIR%%/extension/btree_gist--1.2--1.3.sql
+%%DATADIR%%/extension/btree_gist--1.2.sql
+%%DATADIR%%/extension/btree_gist--1.3--1.4.sql
+%%DATADIR%%/extension/btree_gist--1.4--1.5.sql
+%%DATADIR%%/extension/btree_gist--1.5--1.6.sql
+%%DATADIR%%/extension/btree_gist--1.6--1.7.sql
+%%DATADIR%%/extension/btree_gist.control
+%%DATADIR%%/extension/citext--1.0--1.1.sql
+%%DATADIR%%/extension/citext--1.1--1.2.sql
+%%DATADIR%%/extension/citext--1.2--1.3.sql
+%%DATADIR%%/extension/citext--1.3--1.4.sql
+%%DATADIR%%/extension/citext--1.4--1.5.sql
+%%DATADIR%%/extension/citext--1.4.sql
+%%DATADIR%%/extension/citext--1.5--1.6.sql
+%%DATADIR%%/extension/citext.control
+%%DATADIR%%/extension/cube--1.0--1.1.sql
+%%DATADIR%%/extension/cube--1.1--1.2.sql
+%%DATADIR%%/extension/cube--1.2--1.3.sql
+%%DATADIR%%/extension/cube--1.2.sql
+%%DATADIR%%/extension/cube--1.3--1.4.sql
+%%DATADIR%%/extension/cube--1.4--1.5.sql
+%%DATADIR%%/extension/cube.control
+%%DATADIR%%/extension/dblink--1.0--1.1.sql
+%%DATADIR%%/extension/dblink--1.1--1.2.sql
+%%DATADIR%%/extension/dblink--1.2.sql
+%%DATADIR%%/extension/dblink.control
+%%DATADIR%%/extension/dict_int--1.0.sql
+%%DATADIR%%/extension/dict_int.control
+%%DATADIR%%/extension/dict_xsyn--1.0.sql
+%%DATADIR%%/extension/dict_xsyn.control
+%%DATADIR%%/extension/earthdistance--1.0--1.1.sql
+%%DATADIR%%/extension/earthdistance--1.1.sql
+%%DATADIR%%/extension/earthdistance.control
+%%DATADIR%%/extension/file_fdw--1.0.sql
+%%DATADIR%%/extension/file_fdw.control
+%%DATADIR%%/extension/fuzzystrmatch--1.0--1.1.sql
+%%DATADIR%%/extension/fuzzystrmatch--1.1--1.2.sql
+%%DATADIR%%/extension/fuzzystrmatch--1.1.sql
+%%DATADIR%%/extension/fuzzystrmatch.control
+%%DATADIR%%/extension/hstore--1.1--1.2.sql
+%%DATADIR%%/extension/hstore--1.2--1.3.sql
+%%DATADIR%%/extension/hstore--1.3--1.4.sql
+%%DATADIR%%/extension/hstore--1.4--1.5.sql
+%%DATADIR%%/extension/hstore--1.4.sql
+%%DATADIR%%/extension/hstore--1.5--1.6.sql
+%%DATADIR%%/extension/hstore--1.6--1.7.sql
+%%DATADIR%%/extension/hstore--1.7--1.8.sql
+%%DATADIR%%/extension/hstore.control
+%%DATADIR%%/extension/insert_username--1.0.sql
+%%DATADIR%%/extension/insert_username.control
+%%DATADIR%%/extension/intagg--1.0--1.1.sql
+%%DATADIR%%/extension/intagg--1.1.sql
+%%DATADIR%%/extension/intagg.control
+%%DATADIR%%/extension/intarray--1.0--1.1.sql
+%%DATADIR%%/extension/intarray--1.1--1.2.sql
+%%DATADIR%%/extension/intarray--1.2--1.3.sql
+%%DATADIR%%/extension/intarray--1.2.sql
+%%DATADIR%%/extension/intarray--1.3--1.4.sql
+%%DATADIR%%/extension/intarray--1.4--1.5.sql
+%%DATADIR%%/extension/intarray.control
+%%DATADIR%%/extension/isn--1.0--1.1.sql
+%%DATADIR%%/extension/isn--1.1--1.2.sql
+%%DATADIR%%/extension/isn--1.1.sql
+%%DATADIR%%/extension/isn.control
+%%DATADIR%%/extension/lo--1.0--1.1.sql
+%%DATADIR%%/extension/lo--1.1.sql
+%%DATADIR%%/extension/lo.control
+%%DATADIR%%/extension/ltree--1.0--1.1.sql
+%%DATADIR%%/extension/ltree--1.1--1.2.sql
+%%DATADIR%%/extension/ltree--1.1.sql
+%%DATADIR%%/extension/ltree.control
+%%DATADIR%%/extension/moddatetime--1.0.sql
+%%DATADIR%%/extension/moddatetime.control
+%%DATADIR%%/extension/old_snapshot--1.0.sql
+%%DATADIR%%/extension/old_snapshot.control
+%%DATADIR%%/extension/pageinspect--1.0--1.1.sql
+%%DATADIR%%/extension/pageinspect--1.1--1.2.sql
+%%DATADIR%%/extension/pageinspect--1.10--1.11.sql
+%%DATADIR%%/extension/pageinspect--1.11--1.12.sql
+%%DATADIR%%/extension/pageinspect--1.2--1.3.sql
+%%DATADIR%%/extension/pageinspect--1.3--1.4.sql
+%%DATADIR%%/extension/pageinspect--1.4--1.5.sql
+%%DATADIR%%/extension/pageinspect--1.5--1.6.sql
+%%DATADIR%%/extension/pageinspect--1.5.sql
+%%DATADIR%%/extension/pageinspect--1.6--1.7.sql
+%%DATADIR%%/extension/pageinspect--1.7--1.8.sql
+%%DATADIR%%/extension/pageinspect--1.8--1.9.sql
+%%DATADIR%%/extension/pageinspect--1.9--1.10.sql
+%%DATADIR%%/extension/pageinspect.control
+%%DATADIR%%/extension/pg_buffercache--1.0--1.1.sql
+%%DATADIR%%/extension/pg_buffercache--1.1--1.2.sql
+%%DATADIR%%/extension/pg_buffercache--1.2--1.3.sql
+%%DATADIR%%/extension/pg_buffercache--1.2.sql
+%%DATADIR%%/extension/pg_buffercache--1.3--1.4.sql
+%%DATADIR%%/extension/pg_buffercache.control
+%%DATADIR%%/extension/pg_freespacemap--1.0--1.1.sql
+%%DATADIR%%/extension/pg_freespacemap--1.1--1.2.sql
+%%DATADIR%%/extension/pg_freespacemap--1.1.sql
+%%DATADIR%%/extension/pg_freespacemap.control
+%%DATADIR%%/extension/pg_prewarm--1.0--1.1.sql
+%%DATADIR%%/extension/pg_prewarm--1.1--1.2.sql
+%%DATADIR%%/extension/pg_prewarm--1.1.sql
+%%DATADIR%%/extension/pg_prewarm.control
+%%DATADIR%%/extension/pg_stat_statements--1.0--1.1.sql
+%%DATADIR%%/extension/pg_stat_statements--1.1--1.2.sql
+%%DATADIR%%/extension/pg_stat_statements--1.2--1.3.sql
+%%DATADIR%%/extension/pg_stat_statements--1.3--1.4.sql
+%%DATADIR%%/extension/pg_stat_statements--1.4--1.5.sql
+%%DATADIR%%/extension/pg_stat_statements--1.4.sql
+%%DATADIR%%/extension/pg_stat_statements--1.5--1.6.sql
+%%DATADIR%%/extension/pg_stat_statements--1.6--1.7.sql
+%%DATADIR%%/extension/pg_stat_statements--1.7--1.8.sql
+%%DATADIR%%/extension/pg_stat_statements--1.8--1.9.sql
+%%DATADIR%%/extension/pg_stat_statements--1.9--1.10.sql
+%%DATADIR%%/extension/pg_stat_statements.control
+%%DATADIR%%/extension/pg_surgery--1.0.sql
+%%DATADIR%%/extension/pg_surgery.control
+%%DATADIR%%/extension/pg_trgm--1.0--1.1.sql
+%%DATADIR%%/extension/pg_trgm--1.1--1.2.sql
+%%DATADIR%%/extension/pg_trgm--1.2--1.3.sql
+%%DATADIR%%/extension/pg_trgm--1.3--1.4.sql
+%%DATADIR%%/extension/pg_trgm--1.3.sql
+%%DATADIR%%/extension/pg_trgm--1.4--1.5.sql
+%%DATADIR%%/extension/pg_trgm--1.5--1.6.sql
+%%DATADIR%%/extension/pg_trgm.control
+%%DATADIR%%/extension/pg_visibility--1.0--1.1.sql
+%%DATADIR%%/extension/pg_visibility--1.1--1.2.sql
+%%DATADIR%%/extension/pg_visibility--1.1.sql
+%%DATADIR%%/extension/pg_visibility.control
+%%DATADIR%%/extension/pg_walinspect--1.0--1.1.sql
+%%DATADIR%%/extension/pg_walinspect--1.0.sql
+%%DATADIR%%/extension/pg_walinspect.control
+%%DATADIR%%/extension/pgcrypto--1.0--1.1.sql
+%%DATADIR%%/extension/pgcrypto--1.1--1.2.sql
+%%DATADIR%%/extension/pgcrypto--1.2--1.3.sql
+%%DATADIR%%/extension/pgcrypto--1.3.sql
+%%DATADIR%%/extension/pgcrypto.control
+%%DATADIR%%/extension/pgrowlocks--1.0--1.1.sql
+%%DATADIR%%/extension/pgrowlocks--1.1--1.2.sql
+%%DATADIR%%/extension/pgrowlocks--1.2.sql
+%%DATADIR%%/extension/pgrowlocks.control
+%%DATADIR%%/extension/pgstattuple--1.0--1.1.sql
+%%DATADIR%%/extension/pgstattuple--1.1--1.2.sql
+%%DATADIR%%/extension/pgstattuple--1.2--1.3.sql
+%%DATADIR%%/extension/pgstattuple--1.3--1.4.sql
+%%DATADIR%%/extension/pgstattuple--1.4--1.5.sql
+%%DATADIR%%/extension/pgstattuple--1.4.sql
+%%DATADIR%%/extension/pgstattuple.control
+%%DATADIR%%/extension/postgres_fdw--1.0--1.1.sql
+%%DATADIR%%/extension/postgres_fdw--1.0.sql
+%%DATADIR%%/extension/postgres_fdw.control
+%%DATADIR%%/extension/refint--1.0.sql
+%%DATADIR%%/extension/refint.control
+%%DATADIR%%/extension/seg--1.0--1.1.sql
+%%DATADIR%%/extension/seg--1.1--1.2.sql
+%%DATADIR%%/extension/seg--1.1.sql
+%%DATADIR%%/extension/seg--1.2--1.3.sql
+%%DATADIR%%/extension/seg--1.3--1.4.sql
+%%DATADIR%%/extension/seg.control
+%%DATADIR%%/extension/tablefunc--1.0.sql
+%%DATADIR%%/extension/tablefunc.control
+%%DATADIR%%/extension/tcn--1.0.sql
+%%DATADIR%%/extension/tcn.control
+%%DATADIR%%/extension/tsm_system_rows--1.0.sql
+%%DATADIR%%/extension/tsm_system_rows.control
+%%DATADIR%%/extension/tsm_system_time--1.0.sql
+%%DATADIR%%/extension/tsm_system_time.control
+%%DATADIR%%/extension/unaccent--1.0--1.1.sql
+%%DATADIR%%/extension/unaccent--1.1.sql
+%%DATADIR%%/extension/unaccent.control
+%%DATADIR%%/extension/uuid-ossp--1.0--1.1.sql
+%%DATADIR%%/extension/uuid-ossp--1.1.sql
+%%DATADIR%%/extension/uuid-ossp.control
+%%DATADIR%%/tsearch_data/unaccent.rules
+%%DATADIR%%/tsearch_data/xsyn_sample.rules
+%%OPENSSL%%%%DATADIR%%/extension/sslinfo--1.0--1.1.sql
+%%OPENSSL%%%%DATADIR%%/extension/sslinfo--1.1--1.2.sql
+%%OPENSSL%%%%DATADIR%%/extension/sslinfo--1.2.sql
+%%OPENSSL%%%%DATADIR%%/extension/sslinfo.control
+%%XML%%%%DATADIR%%/extension/xml2--1.0--1.1.sql
+%%XML%%%%DATADIR%%/extension/xml2--1.1.sql
+%%XML%%%%DATADIR%%/extension/xml2.control
diff --git a/databases/postgresql16-server/pkg-plist-plperl b/databases/postgresql16-server/pkg-plist-plperl
new file mode 100644
index 000000000000..67112b25bfb0
--- /dev/null
+++ b/databases/postgresql16-server/pkg-plist-plperl
@@ -0,0 +1,24 @@
+include/postgresql/server/plperl.h
+include/postgresql/server/ppport.h
+include/postgresql/server/plperl_system.h
+%%DATADIR%%/extension/plperlu--1.0.sql
+%%DATADIR%%/extension/plperl.control
+%%DATADIR%%/extension/plperl--1.0.sql
+%%DATADIR%%/extension/plperlu.control
+%%DOCSDIR%%/README-plperl
+lib/postgresql/bool_plperl.so
+lib/postgresql/hstore_plperl.so
+lib/postgresql/jsonb_plperl.so
+lib/postgresql/plperl.so
+%%DATADIR%%/extension/bool_plperl--1.0.sql
+%%DATADIR%%/extension/bool_plperl.control
+%%DATADIR%%/extension/bool_plperlu--1.0.sql
+%%DATADIR%%/extension/bool_plperlu.control
+%%DATADIR%%/extension/hstore_plperl--1.0.sql
+%%DATADIR%%/extension/hstore_plperl.control
+%%DATADIR%%/extension/hstore_plperlu--1.0.sql
+%%DATADIR%%/extension/hstore_plperlu.control
+%%DATADIR%%/extension/jsonb_plperl--1.0.sql
+%%DATADIR%%/extension/jsonb_plperl.control
+%%DATADIR%%/extension/jsonb_plperlu--1.0.sql
+%%DATADIR%%/extension/jsonb_plperlu.control
diff --git a/databases/postgresql16-server/pkg-plist-plpython b/databases/postgresql16-server/pkg-plist-plpython
new file mode 100644
index 000000000000..23631de669b7
--- /dev/null
+++ b/databases/postgresql16-server/pkg-plist-plpython
@@ -0,0 +1,32 @@
+include/postgresql/server/plpy_cursorobject.h
+include/postgresql/server/plpy_elog.h
+include/postgresql/server/plpy_exec.h
+include/postgresql/server/plpy_main.h
+include/postgresql/server/plpy_planobject.h
+include/postgresql/server/plpy_plpymodule.h
+include/postgresql/server/plpy_procedure.h
+include/postgresql/server/plpy_resultobject.h
+include/postgresql/server/plpy_spi.h
+include/postgresql/server/plpy_subxactobject.h
+include/postgresql/server/plpy_typeio.h
+include/postgresql/server/plpy_util.h
+include/postgresql/server/plpython.h
+include/postgresql/server/plpython_system.h
+%%DOCSDIR%%/README-plpython
+%%PYTHON2%%lib/postgresql/plpython2.so
+%%PYTHON3%%lib/postgresql/plpython3.so
+%%PYTHON2%%%%DATADIR%%/extension/plpython2u--1.0.sql
+%%PYTHON2%%%%DATADIR%%/extension/plpython2u.control
+%%PYTHON3%%%%DATADIR%%/extension/plpython3u--1.0.sql
+%%PYTHON3%%%%DATADIR%%/extension/plpython3u.control
+%%PYTHON2%%%%DATADIR%%/extension/plpythonu--1.0.sql
+%%PYTHON2%%%%DATADIR%%/extension/plpythonu.control
+lib/postgresql/hstore_plpython3.so
+lib/postgresql/jsonb_plpython3.so
+lib/postgresql/ltree_plpython3.so
+%%DATADIR%%/extension/hstore_plpython3u--1.0.sql
+%%DATADIR%%/extension/hstore_plpython3u.control
+%%DATADIR%%/extension/jsonb_plpython3u--1.0.sql
+%%DATADIR%%/extension/jsonb_plpython3u.control
+%%DATADIR%%/extension/ltree_plpython3u--1.0.sql
+%%DATADIR%%/extension/ltree_plpython3u.control
diff --git a/databases/postgresql16-server/pkg-plist-pltcl b/databases/postgresql16-server/pkg-plist-pltcl
new file mode 100644
index 000000000000..05cf5edaac03
--- /dev/null
+++ b/databases/postgresql16-server/pkg-plist-pltcl
@@ -0,0 +1,6 @@
+%%DATADIR%%/extension/pltcl--1.0.sql
+%%DATADIR%%/extension/pltcl.control
+%%DATADIR%%/extension/pltclu.control
+%%DATADIR%%/extension/pltclu--1.0.sql
+%%DOCSDIR%%/README-pltcl
+lib/postgresql/pltcl.so
diff --git a/databases/postgresql16-server/pkg-plist-server b/databases/postgresql16-server/pkg-plist-server
new file mode 100644
index 000000000000..7e434ac68e7b
--- /dev/null
+++ b/databases/postgresql16-server/pkg-plist-server
@@ -0,0 +1,1687 @@
+bin/initdb
+bin/pg_archivecleanup
+bin/pg_basebackup
+bin/pg_checksums
+bin/pg_controldata
+bin/pg_ctl
+bin/pg_receivewal
+bin/pg_recvlogical
+bin/pg_resetwal
+bin/pg_rewind
+bin/pg_test_fsync
+bin/pg_test_timing
+bin/pg_upgrade
+bin/pg_waldump
+bin/postgres
+etc/periodic/daily/502.pgsql
+include/postgresql/server/plpgsql.h
+lib/libpgcommon.a
+lib/libpgcommon_shlib.a
+lib/postgresql/cyrillic_and_mic.so
+lib/postgresql/dict_snowball.so
+lib/postgresql/euc2004_sjis2004.so
+lib/postgresql/euc_cn_and_mic.so
+lib/postgresql/euc_jp_and_sjis.so
+lib/postgresql/euc_kr_and_mic.so
+lib/postgresql/euc_tw_and_big5.so
+lib/postgresql/latin2_and_win1250.so
+lib/postgresql/latin_and_mic.so
+lib/postgresql/libpqwalreceiver.so
+lib/postgresql/pgoutput.so
+lib/postgresql/plpgsql.so
+lib/postgresql/utf8_and_big5.so
+lib/postgresql/utf8_and_cyrillic.so
+lib/postgresql/utf8_and_euc2004.so
+lib/postgresql/utf8_and_euc_cn.so
+lib/postgresql/utf8_and_euc_jp.so
+lib/postgresql/utf8_and_euc_kr.so
+lib/postgresql/utf8_and_euc_tw.so
+lib/postgresql/utf8_and_gb18030.so
+lib/postgresql/utf8_and_gbk.so
+lib/postgresql/utf8_and_iso8859.so
+lib/postgresql/utf8_and_iso8859_1.so
+lib/postgresql/utf8_and_johab.so
+lib/postgresql/utf8_and_sjis.so
+lib/postgresql/utf8_and_sjis2004.so
+lib/postgresql/utf8_and_uhc.so
+lib/postgresql/utf8_and_win.so
+%%LLVM%%%%GSSAPI%%lib/postgresql/bitcode/postgres/libpq/be-gssapi-common.bc
+%%LLVM%%%%GSSAPI%%lib/postgresql/bitcode/postgres/libpq/be-secure-gssapi.bc
+%%LLVM%%%%SSL%%lib/postgresql/bitcode/postgres/libpq/be-secure-openssl.bc
+%%LLVM%%lib/postgresql/bitcode/postgres.index.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/brin/brin.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/brin/brin_bloom.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/brin/brin_inclusion.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/brin/brin_minmax.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/brin/brin_minmax_multi.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/brin/brin_pageops.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/brin/brin_revmap.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/brin/brin_tuple.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/brin/brin_validate.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/brin/brin_xlog.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/common/attmap.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/common/bufmask.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/common/detoast.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/common/heaptuple.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/common/indextuple.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/common/printsimple.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/common/printtup.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/common/relation.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/common/reloptions.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/common/scankey.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/common/session.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/common/syncscan.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/common/toast_compression.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/common/toast_internals.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/common/tupconvert.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/common/tupdesc.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/gin/ginarrayproc.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/gin/ginbtree.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/gin/ginbulk.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/gin/gindatapage.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/gin/ginentrypage.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/gin/ginfast.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/gin/ginget.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/gin/gininsert.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/gin/ginlogic.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/gin/ginpostinglist.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/gin/ginscan.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/gin/ginutil.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/gin/ginvacuum.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/gin/ginvalidate.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/gin/ginxlog.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/gist/gist.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/gist/gistbuild.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/gist/gistbuildbuffers.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/gist/gistget.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/gist/gistproc.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/gist/gistscan.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/gist/gistsplit.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/gist/gistutil.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/gist/gistvacuum.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/gist/gistvalidate.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/gist/gistxlog.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/hash/hash.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/hash/hash_xlog.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/hash/hashfunc.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/hash/hashinsert.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/hash/hashovfl.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/hash/hashpage.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/hash/hashsearch.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/hash/hashsort.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/hash/hashutil.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/hash/hashvalidate.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/heap/heapam.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/heap/heapam_handler.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/heap/heapam_visibility.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/heap/heaptoast.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/heap/hio.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/heap/pruneheap.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/heap/rewriteheap.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/heap/vacuumlazy.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/heap/visibilitymap.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/index/amapi.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/index/amvalidate.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/index/genam.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/index/indexam.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/nbtree/nbtcompare.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/nbtree/nbtdedup.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/nbtree/nbtinsert.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/nbtree/nbtpage.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/nbtree/nbtree.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/nbtree/nbtsearch.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/nbtree/nbtsort.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/nbtree/nbtsplitloc.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/nbtree/nbtutils.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/nbtree/nbtvalidate.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/nbtree/nbtxlog.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/rmgrdesc/brindesc.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/rmgrdesc/clogdesc.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/rmgrdesc/committsdesc.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/rmgrdesc/dbasedesc.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/rmgrdesc/genericdesc.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/rmgrdesc/gindesc.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/rmgrdesc/gistdesc.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/rmgrdesc/hashdesc.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/rmgrdesc/heapdesc.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/rmgrdesc/logicalmsgdesc.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/rmgrdesc/mxactdesc.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/rmgrdesc/nbtdesc.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/rmgrdesc/relmapdesc.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/rmgrdesc/replorigindesc.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/rmgrdesc/rmgrdesc_utils.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/rmgrdesc/seqdesc.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/rmgrdesc/smgrdesc.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/rmgrdesc/spgdesc.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/rmgrdesc/standbydesc.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/rmgrdesc/tblspcdesc.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/rmgrdesc/xactdesc.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/rmgrdesc/xlogdesc.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/spgist/spgdoinsert.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/spgist/spginsert.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/spgist/spgkdtreeproc.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/spgist/spgproc.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/spgist/spgquadtreeproc.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/spgist/spgscan.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/spgist/spgtextproc.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/spgist/spgutils.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/spgist/spgvacuum.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/spgist/spgvalidate.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/spgist/spgxlog.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/table/table.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/table/tableam.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/table/tableamapi.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/table/toast_helper.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/tablesample/bernoulli.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/tablesample/system.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/tablesample/tablesample.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/transam/clog.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/transam/commit_ts.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/transam/generic_xlog.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/transam/multixact.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/transam/parallel.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/transam/rmgr.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/transam/slru.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/transam/subtrans.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/transam/timeline.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/transam/transam.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/transam/twophase.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/transam/twophase_rmgr.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/transam/varsup.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/transam/xact.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/transam/xlog.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/transam/xlogarchive.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/transam/xlogbackup.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/transam/xlogfuncs.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/transam/xloginsert.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/transam/xlogprefetcher.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/transam/xlogreader.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/transam/xlogrecovery.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/transam/xlogstats.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/access/transam/xlogutils.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/archive/shell_archive.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/backup/backup_manifest.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/backup/basebackup.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/backup/basebackup_copy.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/backup/basebackup_gzip.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/backup/basebackup_lz4.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/backup/basebackup_progress.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/backup/basebackup_server.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/backup/basebackup_sink.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/backup/basebackup_target.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/backup/basebackup_throttle.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/backup/basebackup_zstd.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/bootstrap/bootparse.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/bootstrap/bootscanner.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/bootstrap/bootstrap.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/catalog/aclchk.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/catalog/catalog.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/catalog/dependency.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/catalog/heap.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/catalog/index.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/catalog/indexing.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/catalog/namespace.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/catalog/objectaccess.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/catalog/objectaddress.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/catalog/partition.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/catalog/pg_aggregate.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/catalog/pg_attrdef.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/catalog/pg_cast.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/catalog/pg_class.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/catalog/pg_collation.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/catalog/pg_constraint.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/catalog/pg_conversion.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/catalog/pg_db_role_setting.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/catalog/pg_depend.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/catalog/pg_enum.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/catalog/pg_inherits.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/catalog/pg_largeobject.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/catalog/pg_namespace.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/catalog/pg_operator.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/catalog/pg_parameter_acl.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/catalog/pg_proc.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/catalog/pg_publication.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/catalog/pg_range.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/catalog/pg_shdepend.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/catalog/pg_subscription.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/catalog/pg_type.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/catalog/storage.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/catalog/toasting.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/commands/aggregatecmds.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/commands/alter.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/commands/amcmds.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/commands/analyze.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/commands/async.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/commands/cluster.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/commands/collationcmds.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/commands/comment.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/commands/constraint.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/commands/conversioncmds.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/commands/copy.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/commands/copyfrom.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/commands/copyfromparse.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/commands/copyto.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/commands/createas.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/commands/dbcommands.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/commands/define.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/commands/discard.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/commands/dropcmds.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/commands/event_trigger.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/commands/explain.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/commands/extension.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/commands/foreigncmds.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/commands/functioncmds.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/commands/indexcmds.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/commands/lockcmds.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/commands/matview.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/commands/opclasscmds.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/commands/operatorcmds.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/commands/policy.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/commands/portalcmds.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/commands/prepare.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/commands/proclang.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/commands/publicationcmds.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/commands/schemacmds.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/commands/seclabel.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/commands/sequence.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/commands/statscmds.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/commands/subscriptioncmds.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/commands/tablecmds.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/commands/tablespace.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/commands/trigger.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/commands/tsearchcmds.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/commands/typecmds.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/commands/user.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/commands/vacuum.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/commands/vacuumparallel.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/commands/variable.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/commands/view.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/executor/execAmi.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/executor/execAsync.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/executor/execCurrent.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/executor/execExpr.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/executor/execExprInterp.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/executor/execGrouping.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/executor/execIndexing.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/executor/execJunk.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/executor/execMain.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/executor/execParallel.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/executor/execPartition.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/executor/execProcnode.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/executor/execReplication.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/executor/execSRF.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/executor/execScan.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/executor/execTuples.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/executor/execUtils.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/executor/functions.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/executor/instrument.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/executor/nodeAgg.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/executor/nodeAppend.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/executor/nodeBitmapAnd.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/executor/nodeBitmapHeapscan.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/executor/nodeBitmapIndexscan.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/executor/nodeBitmapOr.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/executor/nodeCtescan.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/executor/nodeCustom.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/executor/nodeForeignscan.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/executor/nodeFunctionscan.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/executor/nodeGather.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/executor/nodeGatherMerge.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/executor/nodeGroup.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/executor/nodeHash.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/executor/nodeHashjoin.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/executor/nodeIncrementalSort.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/executor/nodeIndexonlyscan.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/executor/nodeIndexscan.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/executor/nodeLimit.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/executor/nodeLockRows.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/executor/nodeMaterial.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/executor/nodeMemoize.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/executor/nodeMergeAppend.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/executor/nodeMergejoin.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/executor/nodeModifyTable.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/executor/nodeNamedtuplestorescan.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/executor/nodeNestloop.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/executor/nodeProjectSet.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/executor/nodeRecursiveunion.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/executor/nodeResult.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/executor/nodeSamplescan.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/executor/nodeSeqscan.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/executor/nodeSetOp.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/executor/nodeSort.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/executor/nodeSubplan.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/executor/nodeSubqueryscan.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/executor/nodeTableFuncscan.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/executor/nodeTidrangescan.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/executor/nodeTidscan.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/executor/nodeUnique.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/executor/nodeValuesscan.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/executor/nodeWindowAgg.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/executor/nodeWorktablescan.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/executor/spi.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/executor/tqueue.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/executor/tstoreReceiver.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/foreign/foreign.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/jit/jit.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/lib/binaryheap.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/lib/bipartite_match.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/lib/bloomfilter.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/lib/dshash.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/lib/hyperloglog.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/lib/ilist.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/lib/integerset.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/lib/knapsack.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/lib/pairingheap.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/lib/rbtree.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/libpq/auth-sasl.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/libpq/auth-scram.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/libpq/auth.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/libpq/be-fsstubs.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/libpq/be-secure-common.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/libpq/be-secure.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/libpq/crypt.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/libpq/hba.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/libpq/ifaddr.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/libpq/pqcomm.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/libpq/pqformat.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/libpq/pqmq.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/libpq/pqsignal.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/main/main.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/nodes/bitmapset.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/nodes/copyfuncs.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/nodes/equalfuncs.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/nodes/extensible.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/nodes/list.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/nodes/makefuncs.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/nodes/multibitmapset.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/nodes/nodeFuncs.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/nodes/nodes.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/nodes/outfuncs.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/nodes/params.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/nodes/print.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/nodes/queryjumblefuncs.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/nodes/read.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/nodes/readfuncs.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/nodes/tidbitmap.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/nodes/value.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/optimizer/geqo/geqo_copy.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/optimizer/geqo/geqo_cx.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/optimizer/geqo/geqo_erx.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/optimizer/geqo/geqo_eval.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/optimizer/geqo/geqo_main.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/optimizer/geqo/geqo_misc.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/optimizer/geqo/geqo_mutation.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/optimizer/geqo/geqo_ox1.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/optimizer/geqo/geqo_ox2.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/optimizer/geqo/geqo_pmx.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/optimizer/geqo/geqo_pool.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/optimizer/geqo/geqo_px.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/optimizer/geqo/geqo_random.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/optimizer/geqo/geqo_recombination.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/optimizer/geqo/geqo_selection.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/optimizer/path/allpaths.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/optimizer/path/clausesel.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/optimizer/path/costsize.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/optimizer/path/equivclass.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/optimizer/path/indxpath.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/optimizer/path/joinpath.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/optimizer/path/joinrels.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/optimizer/path/pathkeys.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/optimizer/path/tidpath.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/optimizer/plan/analyzejoins.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/optimizer/plan/createplan.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/optimizer/plan/initsplan.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/optimizer/plan/planagg.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/optimizer/plan/planmain.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/optimizer/plan/planner.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/optimizer/plan/setrefs.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/optimizer/plan/subselect.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/optimizer/prep/prepagg.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/optimizer/prep/prepjointree.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/optimizer/prep/prepqual.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/optimizer/prep/preptlist.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/optimizer/prep/prepunion.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/optimizer/util/appendinfo.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/optimizer/util/clauses.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/optimizer/util/inherit.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/optimizer/util/joininfo.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/optimizer/util/orclauses.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/optimizer/util/paramassign.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/optimizer/util/pathnode.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/optimizer/util/placeholder.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/optimizer/util/plancat.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/optimizer/util/predtest.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/optimizer/util/relnode.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/optimizer/util/restrictinfo.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/optimizer/util/tlist.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/optimizer/util/var.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/parser/analyze.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/parser/gram.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/parser/parse_agg.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/parser/parse_clause.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/parser/parse_coerce.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/parser/parse_collate.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/parser/parse_cte.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/parser/parse_enr.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/parser/parse_expr.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/parser/parse_func.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/parser/parse_merge.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/parser/parse_node.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/parser/parse_oper.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/parser/parse_param.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/parser/parse_relation.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/parser/parse_target.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/parser/parse_type.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/parser/parse_utilcmd.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/parser/parser.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/parser/scan.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/parser/scansup.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/partitioning/partbounds.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/partitioning/partdesc.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/partitioning/partprune.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/port/atomics.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/port/pg_sema.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/port/pg_shmem.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/postmaster/autovacuum.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/postmaster/auxprocess.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/postmaster/bgworker.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/postmaster/bgwriter.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/postmaster/checkpointer.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/postmaster/fork_process.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/postmaster/interrupt.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/postmaster/pgarch.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/postmaster/postmaster.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/postmaster/startup.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/postmaster/syslogger.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/postmaster/walwriter.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/regex/regcomp.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/regex/regerror.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/regex/regexec.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/regex/regexport.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/regex/regfree.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/regex/regprefix.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/replication/logical/applyparallelworker.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/replication/logical/decode.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/replication/logical/launcher.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/replication/logical/logical.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/replication/logical/logicalfuncs.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/replication/logical/message.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/replication/logical/origin.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/replication/logical/proto.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/replication/logical/relation.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/replication/logical/reorderbuffer.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/replication/logical/snapbuild.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/replication/logical/tablesync.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/replication/logical/worker.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/replication/repl_gram.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/replication/repl_scanner.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/replication/slot.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/replication/slotfuncs.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/replication/syncrep.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/replication/syncrep_gram.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/replication/syncrep_scanner.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/replication/walreceiver.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/replication/walreceiverfuncs.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/replication/walsender.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/rewrite/rewriteDefine.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/rewrite/rewriteHandler.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/rewrite/rewriteManip.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/rewrite/rewriteRemove.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/rewrite/rewriteSearchCycle.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/rewrite/rewriteSupport.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/rewrite/rowsecurity.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/statistics/dependencies.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/statistics/extended_stats.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/statistics/mcv.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/statistics/mvdistinct.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/storage/buffer/buf_init.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/storage/buffer/buf_table.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/storage/buffer/bufmgr.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/storage/buffer/freelist.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/storage/buffer/localbuf.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/storage/file/buffile.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/storage/file/copydir.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/storage/file/fd.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/storage/file/fileset.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/storage/file/reinit.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/storage/file/sharedfileset.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/storage/freespace/freespace.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/storage/freespace/fsmpage.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/storage/freespace/indexfsm.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/storage/ipc/barrier.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/storage/ipc/dsm.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/storage/ipc/dsm_impl.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/storage/ipc/ipc.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/storage/ipc/ipci.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/storage/ipc/latch.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/storage/ipc/pmsignal.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/storage/ipc/procarray.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/storage/ipc/procsignal.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/storage/ipc/shm_mq.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/storage/ipc/shm_toc.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/storage/ipc/shmem.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/storage/ipc/signalfuncs.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/storage/ipc/sinval.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/storage/ipc/sinvaladt.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/storage/ipc/standby.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/storage/large_object/inv_api.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/storage/lmgr/condition_variable.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/storage/lmgr/deadlock.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/storage/lmgr/lmgr.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/storage/lmgr/lock.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/storage/lmgr/lwlock.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/storage/lmgr/lwlocknames.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/storage/lmgr/predicate.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/storage/lmgr/proc.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/storage/lmgr/s_lock.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/storage/lmgr/spin.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/storage/page/bufpage.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/storage/page/checksum.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/storage/page/itemptr.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/storage/smgr/md.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/storage/smgr/smgr.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/storage/sync/sync.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/tcop/cmdtag.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/tcop/dest.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/tcop/fastpath.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/tcop/postgres.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/tcop/pquery.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/tcop/utility.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/tsearch/dict.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/tsearch/dict_ispell.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/tsearch/dict_simple.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/tsearch/dict_synonym.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/tsearch/dict_thesaurus.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/tsearch/regis.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/tsearch/spell.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/tsearch/to_tsany.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/tsearch/ts_locale.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/tsearch/ts_parse.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/tsearch/ts_selfuncs.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/tsearch/ts_typanalyze.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/tsearch/ts_utils.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/tsearch/wparser.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/tsearch/wparser_def.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/activity/backend_progress.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/activity/backend_status.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/activity/pgstat.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/activity/pgstat_archiver.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/activity/pgstat_bgwriter.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/activity/pgstat_checkpointer.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/activity/pgstat_database.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/activity/pgstat_function.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/activity/pgstat_io.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/activity/pgstat_relation.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/activity/pgstat_replslot.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/activity/pgstat_shmem.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/activity/pgstat_slru.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/activity/pgstat_subscription.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/activity/pgstat_wal.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/activity/pgstat_xact.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/activity/wait_event.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/acl.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/amutils.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/array_expanded.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/array_selfuncs.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/array_typanalyze.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/array_userfuncs.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/arrayfuncs.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/arraysubs.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/arrayutils.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/ascii.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/bool.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/cash.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/char.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/cryptohashfuncs.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/date.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/datetime.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/datum.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/dbsize.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/domains.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/encode.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/enum.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/expandeddatum.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/expandedrecord.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/float.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/format_type.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/formatting.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/genfile.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/geo_ops.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/geo_selfuncs.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/geo_spgist.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/hbafuncs.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/inet_cidr_ntop.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/inet_net_pton.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/int.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/int8.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/json.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/jsonb.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/jsonb_gin.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/jsonb_op.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/jsonb_util.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/jsonbsubs.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/jsonfuncs.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/jsonpath.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/jsonpath_exec.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/jsonpath_gram.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/jsonpath_scan.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/like.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/like_support.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/lockfuncs.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/mac.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/mac8.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/mcxtfuncs.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/misc.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/multirangetypes.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/multirangetypes_selfuncs.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/name.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/network.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/network_gist.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/network_selfuncs.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/network_spgist.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/numeric.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/numutils.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/oid.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/oracle_compat.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/orderedsetaggs.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/partitionfuncs.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/pg_locale.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/pg_lsn.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/pg_upgrade_support.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/pgstatfuncs.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/pseudotypes.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/quote.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/rangetypes.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/rangetypes_gist.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/rangetypes_selfuncs.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/rangetypes_spgist.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/rangetypes_typanalyze.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/regexp.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/regproc.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/ri_triggers.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/rowtypes.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/ruleutils.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/selfuncs.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/tid.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/timestamp.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/trigfuncs.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/tsginidx.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/tsgistidx.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/tsquery.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/tsquery_cleanup.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/tsquery_gist.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/tsquery_op.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/tsquery_rewrite.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/tsquery_util.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/tsrank.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/tsvector.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/tsvector_op.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/tsvector_parser.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/uuid.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/varbit.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/varchar.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/varlena.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/version.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/windowfuncs.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/xid.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/xid8funcs.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/adt/xml.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/cache/attoptcache.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/cache/catcache.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/cache/evtcache.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/cache/inval.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/cache/lsyscache.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/cache/partcache.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/cache/plancache.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/cache/relcache.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/cache/relfilenumbermap.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/cache/relmapper.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/cache/spccache.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/cache/syscache.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/cache/ts_cache.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/cache/typcache.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/error/assert.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/error/csvlog.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/error/elog.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/error/jsonlog.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/fmgr/dfmgr.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/fmgr/fmgr.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/fmgr/funcapi.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/fmgrtab.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/hash/dynahash.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/hash/pg_crc.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/init/globals.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/init/miscinit.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/init/postinit.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/init/usercontext.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/mb/conv.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/mb/mbutils.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/mb/stringinfo_mb.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/mb/wstrcmp.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/mb/wstrncmp.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/misc/conffiles.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/misc/guc-file.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/misc/guc.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/misc/guc_funcs.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/misc/guc_tables.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/misc/help_config.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/misc/pg_config.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/misc/pg_controldata.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/misc/pg_rusage.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/misc/ps_status.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/misc/queryenvironment.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/misc/rls.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/misc/sampling.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/misc/superuser.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/misc/timeout.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/misc/tzparser.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/mmgr/alignedalloc.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/mmgr/aset.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/mmgr/dsa.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/mmgr/freepage.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/mmgr/generation.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/mmgr/mcxt.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/mmgr/memdebug.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/mmgr/portalmem.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/mmgr/slab.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/resowner/resowner.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/sort/logtape.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/sort/qsort_interruptible.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/sort/sharedtuplestore.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/sort/sortsupport.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/sort/tuplesort.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/sort/tuplesortvariants.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/sort/tuplestore.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/time/combocid.bc
+%%LLVM%%lib/postgresql/bitcode/postgres/utils/time/snapmgr.bc
+%%LLVM%%lib/postgresql/llvmjit.so
+%%LLVM%%lib/postgresql/llvmjit_types.bc
+%%PORTDOCS%%%%DOCSDIR%%/README-server
+%%DATADIR%%/errcodes.txt
+%%DATADIR%%/extension/plpgsql--1.0.sql
+%%DATADIR%%/extension/plpgsql.control
+%%DATADIR%%/information_schema.sql
+%%DATADIR%%/pg_hba.conf.sample
+%%DATADIR%%/pg_ident.conf.sample
+%%DATADIR%%/postgres.bki
+%%DATADIR%%/postgresql.conf.sample
+%%DATADIR%%/snowball_create.sql
+%%DATADIR%%/sql_features.txt
+%%DATADIR%%/system_constraints.sql
+%%DATADIR%%/system_functions.sql
+%%DATADIR%%/system_views.sql
+%%NLS%%share/locale/cs/LC_MESSAGES/initdb-%%PG_VERSION%%.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/pg_archivecleanup-%%PG_VERSION%%.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/pg_basebackup-%%PG_VERSION%%.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/pg_checksums-%%PG_VERSION%%.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/pg_controldata-%%PG_VERSION%%.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/pg_ctl-%%PG_VERSION%%.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/pg_resetwal-%%PG_VERSION%%.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/pg_rewind-%%PG_VERSION%%.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/pg_test_fsync-%%PG_VERSION%%.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/pg_test_timing-%%PG_VERSION%%.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/pg_upgrade-%%PG_VERSION%%.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/pg_waldump-%%PG_VERSION%%.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/plpgsql-%%PG_VERSION%%.mo
+%%NLS%%share/locale/de/LC_MESSAGES/initdb-%%PG_VERSION%%.mo
+%%NLS%%share/locale/de/LC_MESSAGES/pg_archivecleanup-%%PG_VERSION%%.mo
+%%NLS%%share/locale/de/LC_MESSAGES/pg_basebackup-%%PG_VERSION%%.mo
+%%NLS%%share/locale/de/LC_MESSAGES/pg_checksums-%%PG_VERSION%%.mo
+%%NLS%%share/locale/de/LC_MESSAGES/pg_controldata-%%PG_VERSION%%.mo
+%%NLS%%share/locale/de/LC_MESSAGES/pg_ctl-%%PG_VERSION%%.mo
+%%NLS%%share/locale/de/LC_MESSAGES/pg_resetwal-%%PG_VERSION%%.mo
+%%NLS%%share/locale/de/LC_MESSAGES/pg_rewind-%%PG_VERSION%%.mo
+%%NLS%%share/locale/de/LC_MESSAGES/pg_test_fsync-%%PG_VERSION%%.mo
+%%NLS%%share/locale/de/LC_MESSAGES/pg_test_timing-%%PG_VERSION%%.mo
+%%NLS%%share/locale/de/LC_MESSAGES/pg_upgrade-%%PG_VERSION%%.mo
+%%NLS%%share/locale/de/LC_MESSAGES/pg_waldump-%%PG_VERSION%%.mo
+%%NLS%%share/locale/de/LC_MESSAGES/plpgsql-%%PG_VERSION%%.mo
+%%NLS%%share/locale/de/LC_MESSAGES/postgres-%%PG_VERSION%%.mo
+%%NLS%%share/locale/el/LC_MESSAGES/initdb-%%PG_VERSION%%.mo
+%%NLS%%share/locale/el/LC_MESSAGES/pg_archivecleanup-%%PG_VERSION%%.mo
+%%NLS%%share/locale/el/LC_MESSAGES/pg_basebackup-%%PG_VERSION%%.mo
+%%NLS%%share/locale/el/LC_MESSAGES/pg_checksums-%%PG_VERSION%%.mo
+%%NLS%%share/locale/el/LC_MESSAGES/pg_controldata-%%PG_VERSION%%.mo
+%%NLS%%share/locale/el/LC_MESSAGES/pg_ctl-%%PG_VERSION%%.mo
+%%NLS%%share/locale/el/LC_MESSAGES/pg_resetwal-%%PG_VERSION%%.mo
+%%NLS%%share/locale/el/LC_MESSAGES/pg_rewind-%%PG_VERSION%%.mo
+%%NLS%%share/locale/el/LC_MESSAGES/pg_test_fsync-%%PG_VERSION%%.mo
+%%NLS%%share/locale/el/LC_MESSAGES/pg_test_timing-%%PG_VERSION%%.mo
+%%NLS%%share/locale/el/LC_MESSAGES/pg_waldump-%%PG_VERSION%%.mo
+%%NLS%%share/locale/el/LC_MESSAGES/plpgsql-%%PG_VERSION%%.mo
+%%NLS%%share/locale/es/LC_MESSAGES/initdb-%%PG_VERSION%%.mo
+%%NLS%%share/locale/es/LC_MESSAGES/pg_archivecleanup-%%PG_VERSION%%.mo
+%%NLS%%share/locale/es/LC_MESSAGES/pg_basebackup-%%PG_VERSION%%.mo
+%%NLS%%share/locale/es/LC_MESSAGES/pg_checksums-%%PG_VERSION%%.mo
+%%NLS%%share/locale/es/LC_MESSAGES/pg_controldata-%%PG_VERSION%%.mo
+%%NLS%%share/locale/es/LC_MESSAGES/pg_ctl-%%PG_VERSION%%.mo
+%%NLS%%share/locale/es/LC_MESSAGES/pg_resetwal-%%PG_VERSION%%.mo
+%%NLS%%share/locale/es/LC_MESSAGES/pg_rewind-%%PG_VERSION%%.mo
+%%NLS%%share/locale/es/LC_MESSAGES/pg_test_fsync-%%PG_VERSION%%.mo
+%%NLS%%share/locale/es/LC_MESSAGES/pg_test_timing-%%PG_VERSION%%.mo
+%%NLS%%share/locale/es/LC_MESSAGES/pg_upgrade-%%PG_VERSION%%.mo
+%%NLS%%share/locale/es/LC_MESSAGES/pg_waldump-%%PG_VERSION%%.mo
+%%NLS%%share/locale/es/LC_MESSAGES/plpgsql-%%PG_VERSION%%.mo
+%%NLS%%share/locale/es/LC_MESSAGES/postgres-%%PG_VERSION%%.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/initdb-%%PG_VERSION%%.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/pg_archivecleanup-%%PG_VERSION%%.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/pg_basebackup-%%PG_VERSION%%.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/pg_checksums-%%PG_VERSION%%.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/pg_controldata-%%PG_VERSION%%.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/pg_ctl-%%PG_VERSION%%.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/pg_resetwal-%%PG_VERSION%%.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/pg_rewind-%%PG_VERSION%%.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/pg_test_fsync-%%PG_VERSION%%.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/pg_test_timing-%%PG_VERSION%%.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/pg_upgrade-%%PG_VERSION%%.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/pg_waldump-%%PG_VERSION%%.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/plpgsql-%%PG_VERSION%%.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/postgres-%%PG_VERSION%%.mo
+%%NLS%%share/locale/he/LC_MESSAGES/initdb-%%PG_VERSION%%.mo
+%%NLS%%share/locale/he/LC_MESSAGES/pg_basebackup-%%PG_VERSION%%.mo
+%%NLS%%share/locale/he/LC_MESSAGES/pg_ctl-%%PG_VERSION%%.mo
+%%NLS%%share/locale/id/LC_MESSAGES/%%PG_USER%%-%%PG_VERSION%%.mo
+%%NLS%%share/locale/it/LC_MESSAGES/initdb-%%PG_VERSION%%.mo
+%%NLS%%share/locale/it/LC_MESSAGES/pg_archivecleanup-%%PG_VERSION%%.mo
+%%NLS%%share/locale/it/LC_MESSAGES/pg_basebackup-%%PG_VERSION%%.mo
+%%NLS%%share/locale/it/LC_MESSAGES/pg_checksums-%%PG_VERSION%%.mo
+%%NLS%%share/locale/it/LC_MESSAGES/pg_controldata-%%PG_VERSION%%.mo
+%%NLS%%share/locale/it/LC_MESSAGES/pg_ctl-%%PG_VERSION%%.mo
+%%NLS%%share/locale/it/LC_MESSAGES/pg_resetwal-%%PG_VERSION%%.mo
+%%NLS%%share/locale/it/LC_MESSAGES/pg_rewind-%%PG_VERSION%%.mo
+%%NLS%%share/locale/it/LC_MESSAGES/pg_test_fsync-%%PG_VERSION%%.mo
+%%NLS%%share/locale/it/LC_MESSAGES/pg_test_timing-%%PG_VERSION%%.mo
+%%NLS%%share/locale/it/LC_MESSAGES/pg_waldump-%%PG_VERSION%%.mo
+%%NLS%%share/locale/it/LC_MESSAGES/plpgsql-%%PG_VERSION%%.mo
+%%NLS%%share/locale/it/LC_MESSAGES/postgres-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/initdb-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/pg_archivecleanup-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/pg_basebackup-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/pg_checksums-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/pg_controldata-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/pg_ctl-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/pg_resetwal-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/pg_rewind-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/pg_test_fsync-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/pg_test_timing-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/pg_upgrade-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/pg_waldump-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/plpgsql-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/postgres-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ka/LC_MESSAGES/initdb-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ka/LC_MESSAGES/pg_archivecleanup-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ka/LC_MESSAGES/pg_basebackup-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ka/LC_MESSAGES/pg_checksums-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ka/LC_MESSAGES/pg_controldata-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ka/LC_MESSAGES/pg_ctl-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ka/LC_MESSAGES/pg_resetwal-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ka/LC_MESSAGES/pg_rewind-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ka/LC_MESSAGES/pg_test_fsync-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ka/LC_MESSAGES/pg_test_timing-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ka/LC_MESSAGES/pg_upgrade-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ka/LC_MESSAGES/pg_waldump-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ka/LC_MESSAGES/plpgsql-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ka/LC_MESSAGES/postgres-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/initdb-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/pg_archivecleanup-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/pg_basebackup-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/pg_checksums-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/pg_controldata-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/pg_ctl-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/pg_resetwal-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/pg_rewind-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/pg_test_fsync-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/pg_test_timing-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/pg_upgrade-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/pg_waldump-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/plpgsql-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/postgres-%%PG_VERSION%%.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/%%PG_USER%%-%%PG_VERSION%%.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/initdb-%%PG_VERSION%%.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/pg_archivecleanup-%%PG_VERSION%%.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/pg_basebackup-%%PG_VERSION%%.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/pg_controldata-%%PG_VERSION%%.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/pg_ctl-%%PG_VERSION%%.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/pg_resetwal-%%PG_VERSION%%.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/pg_rewind-%%PG_VERSION%%.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/pg_test_fsync-%%PG_VERSION%%.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/pg_test_timing-%%PG_VERSION%%.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/plpgsql-%%PG_VERSION%%.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/%%PG_USER%%-%%PG_VERSION%%.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/initdb-%%PG_VERSION%%.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/pg_archivecleanup-%%PG_VERSION%%.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/pg_basebackup-%%PG_VERSION%%.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/pg_checksums-%%PG_VERSION%%.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/pg_controldata-%%PG_VERSION%%.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/pg_ctl-%%PG_VERSION%%.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/pg_resetwal-%%PG_VERSION%%.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/pg_rewind-%%PG_VERSION%%.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/pg_test_fsync-%%PG_VERSION%%.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/pg_test_timing-%%PG_VERSION%%.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/plpgsql-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ro/LC_MESSAGES/plpgsql-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/initdb-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/pg_archivecleanup-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/pg_basebackup-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/pg_checksums-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/pg_controldata-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/pg_ctl-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/pg_resetwal-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/pg_rewind-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/pg_test_fsync-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/pg_test_timing-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/pg_upgrade-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/pg_waldump-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/plpgsql-%%PG_VERSION%%.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/postgres-%%PG_VERSION%%.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/initdb-%%PG_VERSION%%.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/pg_archivecleanup-%%PG_VERSION%%.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/pg_basebackup-%%PG_VERSION%%.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/pg_checksums-%%PG_VERSION%%.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/pg_controldata-%%PG_VERSION%%.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/pg_ctl-%%PG_VERSION%%.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/pg_resetwal-%%PG_VERSION%%.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/pg_rewind-%%PG_VERSION%%.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/pg_test_fsync-%%PG_VERSION%%.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/pg_test_timing-%%PG_VERSION%%.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/pg_upgrade-%%PG_VERSION%%.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/pg_waldump-%%PG_VERSION%%.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/plpgsql-%%PG_VERSION%%.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/postgres-%%PG_VERSION%%.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/%%PG_USER%%-%%PG_VERSION%%.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/initdb-%%PG_VERSION%%.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/pg_archivecleanup-%%PG_VERSION%%.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/pg_basebackup-%%PG_VERSION%%.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/pg_checksums-%%PG_VERSION%%.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/pg_controldata-%%PG_VERSION%%.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/pg_ctl-%%PG_VERSION%%.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/pg_resetwal-%%PG_VERSION%%.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/pg_rewind-%%PG_VERSION%%.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/pg_test_fsync-%%PG_VERSION%%.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/pg_test_timing-%%PG_VERSION%%.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/pg_upgrade-%%PG_VERSION%%.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/pg_waldump-%%PG_VERSION%%.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/plpgsql-%%PG_VERSION%%.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/initdb-%%PG_VERSION%%.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/pg_archivecleanup-%%PG_VERSION%%.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/pg_basebackup-%%PG_VERSION%%.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/pg_checksums-%%PG_VERSION%%.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/pg_controldata-%%PG_VERSION%%.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/pg_ctl-%%PG_VERSION%%.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/pg_resetwal-%%PG_VERSION%%.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/pg_rewind-%%PG_VERSION%%.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/pg_test_fsync-%%PG_VERSION%%.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/pg_test_timing-%%PG_VERSION%%.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/pg_upgrade-%%PG_VERSION%%.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/pg_waldump-%%PG_VERSION%%.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/plpgsql-%%PG_VERSION%%.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/postgres-%%PG_VERSION%%.mo
+%%NLS%%share/locale/vi/LC_MESSAGES/initdb-%%PG_VERSION%%.mo
+%%NLS%%share/locale/vi/LC_MESSAGES/pg_archivecleanup-%%PG_VERSION%%.mo
+%%NLS%%share/locale/vi/LC_MESSAGES/pg_basebackup-%%PG_VERSION%%.mo
+%%NLS%%share/locale/vi/LC_MESSAGES/pg_controldata-%%PG_VERSION%%.mo
+%%NLS%%share/locale/vi/LC_MESSAGES/pg_test_fsync-%%PG_VERSION%%.mo
+%%NLS%%share/locale/vi/LC_MESSAGES/pg_test_timing-%%PG_VERSION%%.mo
+%%NLS%%share/locale/vi/LC_MESSAGES/pg_waldump-%%PG_VERSION%%.mo
+%%NLS%%share/locale/vi/LC_MESSAGES/plpgsql-%%PG_VERSION%%.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/initdb-%%PG_VERSION%%.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/pg_archivecleanup-%%PG_VERSION%%.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/pg_basebackup-%%PG_VERSION%%.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/pg_checksums-%%PG_VERSION%%.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/pg_controldata-%%PG_VERSION%%.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/pg_ctl-%%PG_VERSION%%.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/pg_resetwal-%%PG_VERSION%%.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/pg_rewind-%%PG_VERSION%%.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/pg_test_fsync-%%PG_VERSION%%.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/pg_test_timing-%%PG_VERSION%%.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/pg_upgrade-%%PG_VERSION%%.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/pg_waldump-%%PG_VERSION%%.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/plpgsql-%%PG_VERSION%%.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/postgres-%%PG_VERSION%%.mo
+%%NLS%%share/locale/zh_TW/LC_MESSAGES/initdb-%%PG_VERSION%%.mo
+%%NLS%%share/locale/zh_TW/LC_MESSAGES/pg_archivecleanup-%%PG_VERSION%%.mo
+%%NLS%%share/locale/zh_TW/LC_MESSAGES/pg_basebackup-%%PG_VERSION%%.mo
+%%NLS%%share/locale/zh_TW/LC_MESSAGES/pg_checksums-%%PG_VERSION%%.mo
+%%NLS%%share/locale/zh_TW/LC_MESSAGES/pg_controldata-%%PG_VERSION%%.mo
+%%NLS%%share/locale/zh_TW/LC_MESSAGES/pg_ctl-%%PG_VERSION%%.mo
+%%NLS%%share/locale/zh_TW/LC_MESSAGES/pg_resetwal-%%PG_VERSION%%.mo
+%%NLS%%share/locale/zh_TW/LC_MESSAGES/pg_rewind-%%PG_VERSION%%.mo
+%%NLS%%share/locale/zh_TW/LC_MESSAGES/pg_test_fsync-%%PG_VERSION%%.mo
+%%NLS%%share/locale/zh_TW/LC_MESSAGES/pg_test_timing-%%PG_VERSION%%.mo
+%%NLS%%share/locale/zh_TW/LC_MESSAGES/pg_upgrade-%%PG_VERSION%%.mo
+%%NLS%%share/locale/zh_TW/LC_MESSAGES/pg_waldump-%%PG_VERSION%%.mo
+%%NLS%%share/locale/zh_TW/LC_MESSAGES/plpgsql-%%PG_VERSION%%.mo
+%%TZDATA%%%%DATADIR%%/timezone/Africa/Abidjan
+%%TZDATA%%%%DATADIR%%/timezone/Africa/Accra
+%%TZDATA%%%%DATADIR%%/timezone/Africa/Addis_Ababa
+%%TZDATA%%%%DATADIR%%/timezone/Africa/Algiers
+%%TZDATA%%%%DATADIR%%/timezone/Africa/Asmara
+%%TZDATA%%%%DATADIR%%/timezone/Africa/Asmera
+%%TZDATA%%%%DATADIR%%/timezone/Africa/Bamako
+%%TZDATA%%%%DATADIR%%/timezone/Africa/Bangui
+%%TZDATA%%%%DATADIR%%/timezone/Africa/Banjul
+%%TZDATA%%%%DATADIR%%/timezone/Africa/Bissau
+%%TZDATA%%%%DATADIR%%/timezone/Africa/Blantyre
+%%TZDATA%%%%DATADIR%%/timezone/Africa/Brazzaville
+%%TZDATA%%%%DATADIR%%/timezone/Africa/Bujumbura
+%%TZDATA%%%%DATADIR%%/timezone/Africa/Cairo
+%%TZDATA%%%%DATADIR%%/timezone/Africa/Casablanca
+%%TZDATA%%%%DATADIR%%/timezone/Africa/Ceuta
+%%TZDATA%%%%DATADIR%%/timezone/Africa/Conakry
+%%TZDATA%%%%DATADIR%%/timezone/Africa/Dakar
+%%TZDATA%%%%DATADIR%%/timezone/Africa/Dar_es_Salaam
+%%TZDATA%%%%DATADIR%%/timezone/Africa/Djibouti
+%%TZDATA%%%%DATADIR%%/timezone/Africa/Douala
+%%TZDATA%%%%DATADIR%%/timezone/Africa/El_Aaiun
+%%TZDATA%%%%DATADIR%%/timezone/Africa/Freetown
+%%TZDATA%%%%DATADIR%%/timezone/Africa/Gaborone
+%%TZDATA%%%%DATADIR%%/timezone/Africa/Harare
+%%TZDATA%%%%DATADIR%%/timezone/Africa/Johannesburg
+%%TZDATA%%%%DATADIR%%/timezone/Africa/Juba
+%%TZDATA%%%%DATADIR%%/timezone/Africa/Kampala
+%%TZDATA%%%%DATADIR%%/timezone/Africa/Khartoum
+%%TZDATA%%%%DATADIR%%/timezone/Africa/Kigali
+%%TZDATA%%%%DATADIR%%/timezone/Africa/Kinshasa
+%%TZDATA%%%%DATADIR%%/timezone/Africa/Lagos
+%%TZDATA%%%%DATADIR%%/timezone/Africa/Libreville
+%%TZDATA%%%%DATADIR%%/timezone/Africa/Lome
+%%TZDATA%%%%DATADIR%%/timezone/Africa/Luanda
+%%TZDATA%%%%DATADIR%%/timezone/Africa/Lubumbashi
+%%TZDATA%%%%DATADIR%%/timezone/Africa/Lusaka
+%%TZDATA%%%%DATADIR%%/timezone/Africa/Malabo
+%%TZDATA%%%%DATADIR%%/timezone/Africa/Maputo
+%%TZDATA%%%%DATADIR%%/timezone/Africa/Maseru
+%%TZDATA%%%%DATADIR%%/timezone/Africa/Mbabane
+%%TZDATA%%%%DATADIR%%/timezone/Africa/Mogadishu
+%%TZDATA%%%%DATADIR%%/timezone/Africa/Monrovia
+%%TZDATA%%%%DATADIR%%/timezone/Africa/Nairobi
+%%TZDATA%%%%DATADIR%%/timezone/Africa/Ndjamena
+%%TZDATA%%%%DATADIR%%/timezone/Africa/Niamey
+%%TZDATA%%%%DATADIR%%/timezone/Africa/Nouakchott
+%%TZDATA%%%%DATADIR%%/timezone/Africa/Ouagadougou
+%%TZDATA%%%%DATADIR%%/timezone/Africa/Porto-Novo
+%%TZDATA%%%%DATADIR%%/timezone/Africa/Sao_Tome
+%%TZDATA%%%%DATADIR%%/timezone/Africa/Timbuktu
+%%TZDATA%%%%DATADIR%%/timezone/Africa/Tripoli
+%%TZDATA%%%%DATADIR%%/timezone/Africa/Tunis
+%%TZDATA%%%%DATADIR%%/timezone/Africa/Windhoek
+%%TZDATA%%%%DATADIR%%/timezone/America/Adak
+%%TZDATA%%%%DATADIR%%/timezone/America/Anchorage
+%%TZDATA%%%%DATADIR%%/timezone/America/Anguilla
+%%TZDATA%%%%DATADIR%%/timezone/America/Antigua
+%%TZDATA%%%%DATADIR%%/timezone/America/Araguaina
+%%TZDATA%%%%DATADIR%%/timezone/America/Argentina/Buenos_Aires
+%%TZDATA%%%%DATADIR%%/timezone/America/Argentina/Catamarca
+%%TZDATA%%%%DATADIR%%/timezone/America/Argentina/ComodRivadavia
+%%TZDATA%%%%DATADIR%%/timezone/America/Argentina/Cordoba
+%%TZDATA%%%%DATADIR%%/timezone/America/Argentina/Jujuy
+%%TZDATA%%%%DATADIR%%/timezone/America/Argentina/La_Rioja
+%%TZDATA%%%%DATADIR%%/timezone/America/Argentina/Mendoza
+%%TZDATA%%%%DATADIR%%/timezone/America/Argentina/Rio_Gallegos
+%%TZDATA%%%%DATADIR%%/timezone/America/Argentina/Salta
+%%TZDATA%%%%DATADIR%%/timezone/America/Argentina/San_Juan
+%%TZDATA%%%%DATADIR%%/timezone/America/Argentina/San_Luis
+%%TZDATA%%%%DATADIR%%/timezone/America/Argentina/Tucuman
+%%TZDATA%%%%DATADIR%%/timezone/America/Argentina/Ushuaia
+%%TZDATA%%%%DATADIR%%/timezone/America/Aruba
+%%TZDATA%%%%DATADIR%%/timezone/America/Asuncion
+%%TZDATA%%%%DATADIR%%/timezone/America/Atikokan
+%%TZDATA%%%%DATADIR%%/timezone/America/Atka
+%%TZDATA%%%%DATADIR%%/timezone/America/Bahia
+%%TZDATA%%%%DATADIR%%/timezone/America/Bahia_Banderas
+%%TZDATA%%%%DATADIR%%/timezone/America/Barbados
+%%TZDATA%%%%DATADIR%%/timezone/America/Belem
+%%TZDATA%%%%DATADIR%%/timezone/America/Belize
+%%TZDATA%%%%DATADIR%%/timezone/America/Blanc-Sablon
+%%TZDATA%%%%DATADIR%%/timezone/America/Boa_Vista
+%%TZDATA%%%%DATADIR%%/timezone/America/Bogota
+%%TZDATA%%%%DATADIR%%/timezone/America/Boise
+%%TZDATA%%%%DATADIR%%/timezone/America/Buenos_Aires
+%%TZDATA%%%%DATADIR%%/timezone/America/Cambridge_Bay
+%%TZDATA%%%%DATADIR%%/timezone/America/Campo_Grande
+%%TZDATA%%%%DATADIR%%/timezone/America/Cancun
+%%TZDATA%%%%DATADIR%%/timezone/America/Caracas
+%%TZDATA%%%%DATADIR%%/timezone/America/Catamarca
+%%TZDATA%%%%DATADIR%%/timezone/America/Cayenne
+%%TZDATA%%%%DATADIR%%/timezone/America/Cayman
+%%TZDATA%%%%DATADIR%%/timezone/America/Chicago
+%%TZDATA%%%%DATADIR%%/timezone/America/Chihuahua
+%%TZDATA%%%%DATADIR%%/timezone/America/Ciudad_Juarez
+%%TZDATA%%%%DATADIR%%/timezone/America/Coral_Harbour
+%%TZDATA%%%%DATADIR%%/timezone/America/Cordoba
+%%TZDATA%%%%DATADIR%%/timezone/America/Costa_Rica
+%%TZDATA%%%%DATADIR%%/timezone/America/Creston
+%%TZDATA%%%%DATADIR%%/timezone/America/Cuiaba
+%%TZDATA%%%%DATADIR%%/timezone/America/Curacao
+%%TZDATA%%%%DATADIR%%/timezone/America/Danmarkshavn
+%%TZDATA%%%%DATADIR%%/timezone/America/Dawson
+%%TZDATA%%%%DATADIR%%/timezone/America/Dawson_Creek
+%%TZDATA%%%%DATADIR%%/timezone/America/Denver
+%%TZDATA%%%%DATADIR%%/timezone/America/Detroit
+%%TZDATA%%%%DATADIR%%/timezone/America/Dominica
+%%TZDATA%%%%DATADIR%%/timezone/America/Edmonton
+%%TZDATA%%%%DATADIR%%/timezone/America/Eirunepe
+%%TZDATA%%%%DATADIR%%/timezone/America/El_Salvador
+%%TZDATA%%%%DATADIR%%/timezone/America/Ensenada
+%%TZDATA%%%%DATADIR%%/timezone/America/Fort_Nelson
+%%TZDATA%%%%DATADIR%%/timezone/America/Fort_Wayne
+%%TZDATA%%%%DATADIR%%/timezone/America/Fortaleza
+%%TZDATA%%%%DATADIR%%/timezone/America/Glace_Bay
+%%TZDATA%%%%DATADIR%%/timezone/America/Godthab
+%%TZDATA%%%%DATADIR%%/timezone/America/Goose_Bay
+%%TZDATA%%%%DATADIR%%/timezone/America/Grand_Turk
+%%TZDATA%%%%DATADIR%%/timezone/America/Grenada
+%%TZDATA%%%%DATADIR%%/timezone/America/Guadeloupe
+%%TZDATA%%%%DATADIR%%/timezone/America/Guatemala
+%%TZDATA%%%%DATADIR%%/timezone/America/Guayaquil
+%%TZDATA%%%%DATADIR%%/timezone/America/Guyana
+%%TZDATA%%%%DATADIR%%/timezone/America/Halifax
+%%TZDATA%%%%DATADIR%%/timezone/America/Havana
+%%TZDATA%%%%DATADIR%%/timezone/America/Hermosillo
+%%TZDATA%%%%DATADIR%%/timezone/America/Indiana/Indianapolis
+%%TZDATA%%%%DATADIR%%/timezone/America/Indiana/Knox
+%%TZDATA%%%%DATADIR%%/timezone/America/Indiana/Marengo
+%%TZDATA%%%%DATADIR%%/timezone/America/Indiana/Petersburg
+%%TZDATA%%%%DATADIR%%/timezone/America/Indiana/Tell_City
+%%TZDATA%%%%DATADIR%%/timezone/America/Indiana/Vevay
+%%TZDATA%%%%DATADIR%%/timezone/America/Indiana/Vincennes
+%%TZDATA%%%%DATADIR%%/timezone/America/Indiana/Winamac
+%%TZDATA%%%%DATADIR%%/timezone/America/Indianapolis
+%%TZDATA%%%%DATADIR%%/timezone/America/Inuvik
+%%TZDATA%%%%DATADIR%%/timezone/America/Iqaluit
+%%TZDATA%%%%DATADIR%%/timezone/America/Jamaica
+%%TZDATA%%%%DATADIR%%/timezone/America/Jujuy
+%%TZDATA%%%%DATADIR%%/timezone/America/Juneau
+%%TZDATA%%%%DATADIR%%/timezone/America/Kentucky/Louisville
+%%TZDATA%%%%DATADIR%%/timezone/America/Kentucky/Monticello
+%%TZDATA%%%%DATADIR%%/timezone/America/Knox_IN
+%%TZDATA%%%%DATADIR%%/timezone/America/Kralendijk
+%%TZDATA%%%%DATADIR%%/timezone/America/La_Paz
+%%TZDATA%%%%DATADIR%%/timezone/America/Lima
+%%TZDATA%%%%DATADIR%%/timezone/America/Los_Angeles
+%%TZDATA%%%%DATADIR%%/timezone/America/Louisville
+%%TZDATA%%%%DATADIR%%/timezone/America/Lower_Princes
+%%TZDATA%%%%DATADIR%%/timezone/America/Maceio
+%%TZDATA%%%%DATADIR%%/timezone/America/Managua
+%%TZDATA%%%%DATADIR%%/timezone/America/Manaus
+%%TZDATA%%%%DATADIR%%/timezone/America/Marigot
+%%TZDATA%%%%DATADIR%%/timezone/America/Martinique
+%%TZDATA%%%%DATADIR%%/timezone/America/Matamoros
+%%TZDATA%%%%DATADIR%%/timezone/America/Mazatlan
+%%TZDATA%%%%DATADIR%%/timezone/America/Mendoza
+%%TZDATA%%%%DATADIR%%/timezone/America/Menominee
+%%TZDATA%%%%DATADIR%%/timezone/America/Merida
+%%TZDATA%%%%DATADIR%%/timezone/America/Metlakatla
+%%TZDATA%%%%DATADIR%%/timezone/America/Mexico_City
+%%TZDATA%%%%DATADIR%%/timezone/America/Miquelon
+%%TZDATA%%%%DATADIR%%/timezone/America/Moncton
+%%TZDATA%%%%DATADIR%%/timezone/America/Monterrey
+%%TZDATA%%%%DATADIR%%/timezone/America/Montevideo
+%%TZDATA%%%%DATADIR%%/timezone/America/Montreal
+%%TZDATA%%%%DATADIR%%/timezone/America/Montserrat
+%%TZDATA%%%%DATADIR%%/timezone/America/Nassau
+%%TZDATA%%%%DATADIR%%/timezone/America/New_York
+%%TZDATA%%%%DATADIR%%/timezone/America/Nipigon
+%%TZDATA%%%%DATADIR%%/timezone/America/Nome
+%%TZDATA%%%%DATADIR%%/timezone/America/Noronha
+%%TZDATA%%%%DATADIR%%/timezone/America/North_Dakota/Beulah
+%%TZDATA%%%%DATADIR%%/timezone/America/North_Dakota/Center
+%%TZDATA%%%%DATADIR%%/timezone/America/North_Dakota/New_Salem
+%%TZDATA%%%%DATADIR%%/timezone/America/Nuuk
+%%TZDATA%%%%DATADIR%%/timezone/America/Ojinaga
+%%TZDATA%%%%DATADIR%%/timezone/America/Panama
+%%TZDATA%%%%DATADIR%%/timezone/America/Pangnirtung
+%%TZDATA%%%%DATADIR%%/timezone/America/Paramaribo
+%%TZDATA%%%%DATADIR%%/timezone/America/Phoenix
+%%TZDATA%%%%DATADIR%%/timezone/America/Port-au-Prince
+%%TZDATA%%%%DATADIR%%/timezone/America/Port_of_Spain
+%%TZDATA%%%%DATADIR%%/timezone/America/Porto_Acre
+%%TZDATA%%%%DATADIR%%/timezone/America/Porto_Velho
+%%TZDATA%%%%DATADIR%%/timezone/America/Puerto_Rico
+%%TZDATA%%%%DATADIR%%/timezone/America/Punta_Arenas
+%%TZDATA%%%%DATADIR%%/timezone/America/Rainy_River
+%%TZDATA%%%%DATADIR%%/timezone/America/Rankin_Inlet
+%%TZDATA%%%%DATADIR%%/timezone/America/Recife
+%%TZDATA%%%%DATADIR%%/timezone/America/Regina
+%%TZDATA%%%%DATADIR%%/timezone/America/Resolute
+%%TZDATA%%%%DATADIR%%/timezone/America/Rio_Branco
+%%TZDATA%%%%DATADIR%%/timezone/America/Rosario
+%%TZDATA%%%%DATADIR%%/timezone/America/Santa_Isabel
+%%TZDATA%%%%DATADIR%%/timezone/America/Santarem
+%%TZDATA%%%%DATADIR%%/timezone/America/Santiago
+%%TZDATA%%%%DATADIR%%/timezone/America/Santo_Domingo
+%%TZDATA%%%%DATADIR%%/timezone/America/Sao_Paulo
+%%TZDATA%%%%DATADIR%%/timezone/America/Scoresbysund
+%%TZDATA%%%%DATADIR%%/timezone/America/Shiprock
+%%TZDATA%%%%DATADIR%%/timezone/America/Sitka
+%%TZDATA%%%%DATADIR%%/timezone/America/St_Barthelemy
+%%TZDATA%%%%DATADIR%%/timezone/America/St_Johns
+%%TZDATA%%%%DATADIR%%/timezone/America/St_Kitts
+%%TZDATA%%%%DATADIR%%/timezone/America/St_Lucia
+%%TZDATA%%%%DATADIR%%/timezone/America/St_Thomas
+%%TZDATA%%%%DATADIR%%/timezone/America/St_Vincent
+%%TZDATA%%%%DATADIR%%/timezone/America/Swift_Current
+%%TZDATA%%%%DATADIR%%/timezone/America/Tegucigalpa
+%%TZDATA%%%%DATADIR%%/timezone/America/Thule
+%%TZDATA%%%%DATADIR%%/timezone/America/Thunder_Bay
+%%TZDATA%%%%DATADIR%%/timezone/America/Tijuana
+%%TZDATA%%%%DATADIR%%/timezone/America/Toronto
+%%TZDATA%%%%DATADIR%%/timezone/America/Tortola
+%%TZDATA%%%%DATADIR%%/timezone/America/Vancouver
+%%TZDATA%%%%DATADIR%%/timezone/America/Virgin
+%%TZDATA%%%%DATADIR%%/timezone/America/Whitehorse
+%%TZDATA%%%%DATADIR%%/timezone/America/Winnipeg
+%%TZDATA%%%%DATADIR%%/timezone/America/Yakutat
+%%TZDATA%%%%DATADIR%%/timezone/America/Yellowknife
+%%TZDATA%%%%DATADIR%%/timezone/Antarctica/Casey
+%%TZDATA%%%%DATADIR%%/timezone/Antarctica/Davis
+%%TZDATA%%%%DATADIR%%/timezone/Antarctica/DumontDUrville
+%%TZDATA%%%%DATADIR%%/timezone/Antarctica/Macquarie
+%%TZDATA%%%%DATADIR%%/timezone/Antarctica/Mawson
+%%TZDATA%%%%DATADIR%%/timezone/Antarctica/McMurdo
+%%TZDATA%%%%DATADIR%%/timezone/Antarctica/Palmer
+%%TZDATA%%%%DATADIR%%/timezone/Antarctica/Rothera
+%%TZDATA%%%%DATADIR%%/timezone/Antarctica/South_Pole
+%%TZDATA%%%%DATADIR%%/timezone/Antarctica/Syowa
+%%TZDATA%%%%DATADIR%%/timezone/Antarctica/Troll
+%%TZDATA%%%%DATADIR%%/timezone/Antarctica/Vostok
+%%TZDATA%%%%DATADIR%%/timezone/Arctic/Longyearbyen
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Aden
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Almaty
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Amman
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Anadyr
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Aqtau
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Aqtobe
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Ashgabat
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Ashkhabad
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Atyrau
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Baghdad
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Bahrain
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Baku
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Bangkok
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Barnaul
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Beirut
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Bishkek
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Brunei
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Calcutta
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Chita
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Choibalsan
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Chongqing
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Chungking
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Colombo
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Dacca
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Damascus
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Dhaka
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Dili
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Dubai
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Dushanbe
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Famagusta
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Gaza
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Harbin
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Hebron
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Ho_Chi_Minh
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Hong_Kong
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Hovd
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Irkutsk
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Istanbul
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Jakarta
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Jayapura
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Jerusalem
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Kabul
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Kamchatka
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Karachi
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Kashgar
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Kathmandu
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Katmandu
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Khandyga
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Kolkata
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Krasnoyarsk
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Kuala_Lumpur
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Kuching
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Kuwait
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Macao
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Macau
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Magadan
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Makassar
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Manila
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Muscat
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Nicosia
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Novokuznetsk
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Novosibirsk
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Omsk
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Oral
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Phnom_Penh
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Pontianak
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Pyongyang
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Qatar
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Qostanay
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Qyzylorda
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Rangoon
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Riyadh
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Saigon
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Sakhalin
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Samarkand
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Seoul
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Shanghai
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Singapore
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Srednekolymsk
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Taipei
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Tashkent
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Tbilisi
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Tehran
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Tel_Aviv
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Thimbu
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Thimphu
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Tokyo
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Tomsk
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Ujung_Pandang
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Ulaanbaatar
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Ulan_Bator
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Urumqi
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Ust-Nera
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Vientiane
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Vladivostok
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Yakutsk
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Yangon
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Yekaterinburg
+%%TZDATA%%%%DATADIR%%/timezone/Asia/Yerevan
+%%TZDATA%%%%DATADIR%%/timezone/Atlantic/Azores
+%%TZDATA%%%%DATADIR%%/timezone/Atlantic/Bermuda
+%%TZDATA%%%%DATADIR%%/timezone/Atlantic/Canary
+%%TZDATA%%%%DATADIR%%/timezone/Atlantic/Cape_Verde
+%%TZDATA%%%%DATADIR%%/timezone/Atlantic/Faeroe
+%%TZDATA%%%%DATADIR%%/timezone/Atlantic/Faroe
+%%TZDATA%%%%DATADIR%%/timezone/Atlantic/Jan_Mayen
+%%TZDATA%%%%DATADIR%%/timezone/Atlantic/Madeira
+%%TZDATA%%%%DATADIR%%/timezone/Atlantic/Reykjavik
+%%TZDATA%%%%DATADIR%%/timezone/Atlantic/South_Georgia
+%%TZDATA%%%%DATADIR%%/timezone/Atlantic/St_Helena
+%%TZDATA%%%%DATADIR%%/timezone/Atlantic/Stanley
+%%TZDATA%%%%DATADIR%%/timezone/Australia/ACT
+%%TZDATA%%%%DATADIR%%/timezone/Australia/Adelaide
+%%TZDATA%%%%DATADIR%%/timezone/Australia/Brisbane
+%%TZDATA%%%%DATADIR%%/timezone/Australia/Broken_Hill
+%%TZDATA%%%%DATADIR%%/timezone/Australia/Canberra
+%%TZDATA%%%%DATADIR%%/timezone/Australia/Currie
+%%TZDATA%%%%DATADIR%%/timezone/Australia/Darwin
+%%TZDATA%%%%DATADIR%%/timezone/Australia/Eucla
+%%TZDATA%%%%DATADIR%%/timezone/Australia/Hobart
+%%TZDATA%%%%DATADIR%%/timezone/Australia/LHI
+%%TZDATA%%%%DATADIR%%/timezone/Australia/Lindeman
+%%TZDATA%%%%DATADIR%%/timezone/Australia/Lord_Howe
+%%TZDATA%%%%DATADIR%%/timezone/Australia/Melbourne
+%%TZDATA%%%%DATADIR%%/timezone/Australia/NSW
+%%TZDATA%%%%DATADIR%%/timezone/Australia/North
+%%TZDATA%%%%DATADIR%%/timezone/Australia/Perth
+%%TZDATA%%%%DATADIR%%/timezone/Australia/Queensland
+%%TZDATA%%%%DATADIR%%/timezone/Australia/South
+%%TZDATA%%%%DATADIR%%/timezone/Australia/Sydney
+%%TZDATA%%%%DATADIR%%/timezone/Australia/Tasmania
+%%TZDATA%%%%DATADIR%%/timezone/Australia/Victoria
+%%TZDATA%%%%DATADIR%%/timezone/Australia/West
+%%TZDATA%%%%DATADIR%%/timezone/Australia/Yancowinna
+%%TZDATA%%%%DATADIR%%/timezone/Brazil/Acre
+%%TZDATA%%%%DATADIR%%/timezone/Brazil/DeNoronha
+%%TZDATA%%%%DATADIR%%/timezone/Brazil/East
+%%TZDATA%%%%DATADIR%%/timezone/Brazil/West
+%%TZDATA%%%%DATADIR%%/timezone/CET
+%%TZDATA%%%%DATADIR%%/timezone/CST6CDT
+%%TZDATA%%%%DATADIR%%/timezone/Canada/Atlantic
+%%TZDATA%%%%DATADIR%%/timezone/Canada/Central
+%%TZDATA%%%%DATADIR%%/timezone/Canada/Eastern
+%%TZDATA%%%%DATADIR%%/timezone/Canada/Mountain
+%%TZDATA%%%%DATADIR%%/timezone/Canada/Newfoundland
+%%TZDATA%%%%DATADIR%%/timezone/Canada/Pacific
+%%TZDATA%%%%DATADIR%%/timezone/Canada/Saskatchewan
+%%TZDATA%%%%DATADIR%%/timezone/Canada/Yukon
+%%TZDATA%%%%DATADIR%%/timezone/Chile/Continental
+%%TZDATA%%%%DATADIR%%/timezone/Chile/EasterIsland
+%%TZDATA%%%%DATADIR%%/timezone/Cuba
+%%TZDATA%%%%DATADIR%%/timezone/EET
+%%TZDATA%%%%DATADIR%%/timezone/EST
+%%TZDATA%%%%DATADIR%%/timezone/EST5EDT
+%%TZDATA%%%%DATADIR%%/timezone/Egypt
+%%TZDATA%%%%DATADIR%%/timezone/Eire
+%%TZDATA%%%%DATADIR%%/timezone/Etc/GMT
+%%TZDATA%%%%DATADIR%%/timezone/Etc/GMT+0
+%%TZDATA%%%%DATADIR%%/timezone/Etc/GMT+1
+%%TZDATA%%%%DATADIR%%/timezone/Etc/GMT+10
+%%TZDATA%%%%DATADIR%%/timezone/Etc/GMT+11
+%%TZDATA%%%%DATADIR%%/timezone/Etc/GMT+12
+%%TZDATA%%%%DATADIR%%/timezone/Etc/GMT+2
+%%TZDATA%%%%DATADIR%%/timezone/Etc/GMT+3
+%%TZDATA%%%%DATADIR%%/timezone/Etc/GMT+4
+%%TZDATA%%%%DATADIR%%/timezone/Etc/GMT+5
+%%TZDATA%%%%DATADIR%%/timezone/Etc/GMT+6
+%%TZDATA%%%%DATADIR%%/timezone/Etc/GMT+7
+%%TZDATA%%%%DATADIR%%/timezone/Etc/GMT+8
+%%TZDATA%%%%DATADIR%%/timezone/Etc/GMT+9
+%%TZDATA%%%%DATADIR%%/timezone/Etc/GMT-0
+%%TZDATA%%%%DATADIR%%/timezone/Etc/GMT-1
+%%TZDATA%%%%DATADIR%%/timezone/Etc/GMT-10
+%%TZDATA%%%%DATADIR%%/timezone/Etc/GMT-11
+%%TZDATA%%%%DATADIR%%/timezone/Etc/GMT-12
+%%TZDATA%%%%DATADIR%%/timezone/Etc/GMT-13
+%%TZDATA%%%%DATADIR%%/timezone/Etc/GMT-14
+%%TZDATA%%%%DATADIR%%/timezone/Etc/GMT-2
+%%TZDATA%%%%DATADIR%%/timezone/Etc/GMT-3
+%%TZDATA%%%%DATADIR%%/timezone/Etc/GMT-4
+%%TZDATA%%%%DATADIR%%/timezone/Etc/GMT-5
+%%TZDATA%%%%DATADIR%%/timezone/Etc/GMT-6
+%%TZDATA%%%%DATADIR%%/timezone/Etc/GMT-7
+%%TZDATA%%%%DATADIR%%/timezone/Etc/GMT-8
+%%TZDATA%%%%DATADIR%%/timezone/Etc/GMT-9
+%%TZDATA%%%%DATADIR%%/timezone/Etc/GMT0
+%%TZDATA%%%%DATADIR%%/timezone/Etc/Greenwich
+%%TZDATA%%%%DATADIR%%/timezone/Etc/UCT
+%%TZDATA%%%%DATADIR%%/timezone/Etc/UTC
+%%TZDATA%%%%DATADIR%%/timezone/Etc/Universal
+%%TZDATA%%%%DATADIR%%/timezone/Etc/Zulu
+%%TZDATA%%%%DATADIR%%/timezone/Europe/Amsterdam
+%%TZDATA%%%%DATADIR%%/timezone/Europe/Andorra
+%%TZDATA%%%%DATADIR%%/timezone/Europe/Astrakhan
+%%TZDATA%%%%DATADIR%%/timezone/Europe/Athens
+%%TZDATA%%%%DATADIR%%/timezone/Europe/Belfast
+%%TZDATA%%%%DATADIR%%/timezone/Europe/Belgrade
+%%TZDATA%%%%DATADIR%%/timezone/Europe/Berlin
+%%TZDATA%%%%DATADIR%%/timezone/Europe/Bratislava
+%%TZDATA%%%%DATADIR%%/timezone/Europe/Brussels
+%%TZDATA%%%%DATADIR%%/timezone/Europe/Bucharest
+%%TZDATA%%%%DATADIR%%/timezone/Europe/Budapest
+%%TZDATA%%%%DATADIR%%/timezone/Europe/Busingen
+%%TZDATA%%%%DATADIR%%/timezone/Europe/Chisinau
+%%TZDATA%%%%DATADIR%%/timezone/Europe/Copenhagen
+%%TZDATA%%%%DATADIR%%/timezone/Europe/Dublin
+%%TZDATA%%%%DATADIR%%/timezone/Europe/Gibraltar
+%%TZDATA%%%%DATADIR%%/timezone/Europe/Guernsey
+%%TZDATA%%%%DATADIR%%/timezone/Europe/Helsinki
+%%TZDATA%%%%DATADIR%%/timezone/Europe/Isle_of_Man
+%%TZDATA%%%%DATADIR%%/timezone/Europe/Istanbul
+%%TZDATA%%%%DATADIR%%/timezone/Europe/Jersey
+%%TZDATA%%%%DATADIR%%/timezone/Europe/Kaliningrad
+%%TZDATA%%%%DATADIR%%/timezone/Europe/Kiev
+%%TZDATA%%%%DATADIR%%/timezone/Europe/Kirov
+%%TZDATA%%%%DATADIR%%/timezone/Europe/Kyiv
+%%TZDATA%%%%DATADIR%%/timezone/Europe/Lisbon
+%%TZDATA%%%%DATADIR%%/timezone/Europe/Ljubljana
+%%TZDATA%%%%DATADIR%%/timezone/Europe/London
+%%TZDATA%%%%DATADIR%%/timezone/Europe/Luxembourg
+%%TZDATA%%%%DATADIR%%/timezone/Europe/Madrid
+%%TZDATA%%%%DATADIR%%/timezone/Europe/Malta
+%%TZDATA%%%%DATADIR%%/timezone/Europe/Mariehamn
+%%TZDATA%%%%DATADIR%%/timezone/Europe/Minsk
+%%TZDATA%%%%DATADIR%%/timezone/Europe/Monaco
+%%TZDATA%%%%DATADIR%%/timezone/Europe/Moscow
+%%TZDATA%%%%DATADIR%%/timezone/Europe/Nicosia
+%%TZDATA%%%%DATADIR%%/timezone/Europe/Oslo
+%%TZDATA%%%%DATADIR%%/timezone/Europe/Paris
+%%TZDATA%%%%DATADIR%%/timezone/Europe/Podgorica
+%%TZDATA%%%%DATADIR%%/timezone/Europe/Prague
+%%TZDATA%%%%DATADIR%%/timezone/Europe/Riga
+%%TZDATA%%%%DATADIR%%/timezone/Europe/Rome
+%%TZDATA%%%%DATADIR%%/timezone/Europe/Samara
+%%TZDATA%%%%DATADIR%%/timezone/Europe/San_Marino
+%%TZDATA%%%%DATADIR%%/timezone/Europe/Sarajevo
+%%TZDATA%%%%DATADIR%%/timezone/Europe/Saratov
+%%TZDATA%%%%DATADIR%%/timezone/Europe/Simferopol
+%%TZDATA%%%%DATADIR%%/timezone/Europe/Skopje
+%%TZDATA%%%%DATADIR%%/timezone/Europe/Sofia
+%%TZDATA%%%%DATADIR%%/timezone/Europe/Stockholm
+%%TZDATA%%%%DATADIR%%/timezone/Europe/Tallinn
+%%TZDATA%%%%DATADIR%%/timezone/Europe/Tirane
+%%TZDATA%%%%DATADIR%%/timezone/Europe/Tiraspol
+%%TZDATA%%%%DATADIR%%/timezone/Europe/Ulyanovsk
+%%TZDATA%%%%DATADIR%%/timezone/Europe/Uzhgorod
+%%TZDATA%%%%DATADIR%%/timezone/Europe/Vaduz
+%%TZDATA%%%%DATADIR%%/timezone/Europe/Vatican
+%%TZDATA%%%%DATADIR%%/timezone/Europe/Vienna
+%%TZDATA%%%%DATADIR%%/timezone/Europe/Vilnius
+%%TZDATA%%%%DATADIR%%/timezone/Europe/Volgograd
+%%TZDATA%%%%DATADIR%%/timezone/Europe/Warsaw
+%%TZDATA%%%%DATADIR%%/timezone/Europe/Zagreb
+%%TZDATA%%%%DATADIR%%/timezone/Europe/Zaporozhye
+%%TZDATA%%%%DATADIR%%/timezone/Europe/Zurich
+%%TZDATA%%%%DATADIR%%/timezone/Factory
+%%TZDATA%%%%DATADIR%%/timezone/GB
+%%TZDATA%%%%DATADIR%%/timezone/GB-Eire
+%%TZDATA%%%%DATADIR%%/timezone/GMT
+%%TZDATA%%%%DATADIR%%/timezone/GMT+0
+%%TZDATA%%%%DATADIR%%/timezone/GMT-0
+%%TZDATA%%%%DATADIR%%/timezone/GMT0
+%%TZDATA%%%%DATADIR%%/timezone/Greenwich
+%%TZDATA%%%%DATADIR%%/timezone/HST
+%%TZDATA%%%%DATADIR%%/timezone/Hongkong
+%%TZDATA%%%%DATADIR%%/timezone/Iceland
+%%TZDATA%%%%DATADIR%%/timezone/Indian/Antananarivo
+%%TZDATA%%%%DATADIR%%/timezone/Indian/Chagos
+%%TZDATA%%%%DATADIR%%/timezone/Indian/Christmas
+%%TZDATA%%%%DATADIR%%/timezone/Indian/Cocos
+%%TZDATA%%%%DATADIR%%/timezone/Indian/Comoro
+%%TZDATA%%%%DATADIR%%/timezone/Indian/Kerguelen
+%%TZDATA%%%%DATADIR%%/timezone/Indian/Mahe
+%%TZDATA%%%%DATADIR%%/timezone/Indian/Maldives
+%%TZDATA%%%%DATADIR%%/timezone/Indian/Mauritius
+%%TZDATA%%%%DATADIR%%/timezone/Indian/Mayotte
+%%TZDATA%%%%DATADIR%%/timezone/Indian/Reunion
+%%TZDATA%%%%DATADIR%%/timezone/Iran
+%%TZDATA%%%%DATADIR%%/timezone/Israel
+%%TZDATA%%%%DATADIR%%/timezone/Jamaica
+%%TZDATA%%%%DATADIR%%/timezone/Japan
+%%TZDATA%%%%DATADIR%%/timezone/Kwajalein
+%%TZDATA%%%%DATADIR%%/timezone/Libya
+%%TZDATA%%%%DATADIR%%/timezone/MET
+%%TZDATA%%%%DATADIR%%/timezone/MST
+%%TZDATA%%%%DATADIR%%/timezone/MST7MDT
+%%TZDATA%%%%DATADIR%%/timezone/Mexico/BajaNorte
+%%TZDATA%%%%DATADIR%%/timezone/Mexico/BajaSur
+%%TZDATA%%%%DATADIR%%/timezone/Mexico/General
+%%TZDATA%%%%DATADIR%%/timezone/NZ
+%%TZDATA%%%%DATADIR%%/timezone/NZ-CHAT
+%%TZDATA%%%%DATADIR%%/timezone/Navajo
+%%TZDATA%%%%DATADIR%%/timezone/PRC
+%%TZDATA%%%%DATADIR%%/timezone/PST8PDT
+%%TZDATA%%%%DATADIR%%/timezone/Pacific/Apia
+%%TZDATA%%%%DATADIR%%/timezone/Pacific/Auckland
+%%TZDATA%%%%DATADIR%%/timezone/Pacific/Bougainville
+%%TZDATA%%%%DATADIR%%/timezone/Pacific/Chatham
+%%TZDATA%%%%DATADIR%%/timezone/Pacific/Chuuk
+%%TZDATA%%%%DATADIR%%/timezone/Pacific/Easter
+%%TZDATA%%%%DATADIR%%/timezone/Pacific/Efate
+%%TZDATA%%%%DATADIR%%/timezone/Pacific/Enderbury
+%%TZDATA%%%%DATADIR%%/timezone/Pacific/Fakaofo
+%%TZDATA%%%%DATADIR%%/timezone/Pacific/Fiji
+%%TZDATA%%%%DATADIR%%/timezone/Pacific/Funafuti
+%%TZDATA%%%%DATADIR%%/timezone/Pacific/Galapagos
+%%TZDATA%%%%DATADIR%%/timezone/Pacific/Gambier
+%%TZDATA%%%%DATADIR%%/timezone/Pacific/Guadalcanal
+%%TZDATA%%%%DATADIR%%/timezone/Pacific/Guam
+%%TZDATA%%%%DATADIR%%/timezone/Pacific/Honolulu
+%%TZDATA%%%%DATADIR%%/timezone/Pacific/Johnston
+%%TZDATA%%%%DATADIR%%/timezone/Pacific/Kanton
+%%TZDATA%%%%DATADIR%%/timezone/Pacific/Kiritimati
+%%TZDATA%%%%DATADIR%%/timezone/Pacific/Kosrae
+%%TZDATA%%%%DATADIR%%/timezone/Pacific/Kwajalein
+%%TZDATA%%%%DATADIR%%/timezone/Pacific/Majuro
+%%TZDATA%%%%DATADIR%%/timezone/Pacific/Marquesas
+%%TZDATA%%%%DATADIR%%/timezone/Pacific/Midway
+%%TZDATA%%%%DATADIR%%/timezone/Pacific/Nauru
+%%TZDATA%%%%DATADIR%%/timezone/Pacific/Niue
+%%TZDATA%%%%DATADIR%%/timezone/Pacific/Norfolk
+%%TZDATA%%%%DATADIR%%/timezone/Pacific/Noumea
+%%TZDATA%%%%DATADIR%%/timezone/Pacific/Pago_Pago
+%%TZDATA%%%%DATADIR%%/timezone/Pacific/Palau
+%%TZDATA%%%%DATADIR%%/timezone/Pacific/Pitcairn
+%%TZDATA%%%%DATADIR%%/timezone/Pacific/Pohnpei
+%%TZDATA%%%%DATADIR%%/timezone/Pacific/Ponape
+%%TZDATA%%%%DATADIR%%/timezone/Pacific/Port_Moresby
+%%TZDATA%%%%DATADIR%%/timezone/Pacific/Rarotonga
+%%TZDATA%%%%DATADIR%%/timezone/Pacific/Saipan
+%%TZDATA%%%%DATADIR%%/timezone/Pacific/Samoa
+%%TZDATA%%%%DATADIR%%/timezone/Pacific/Tahiti
+%%TZDATA%%%%DATADIR%%/timezone/Pacific/Tarawa
+%%TZDATA%%%%DATADIR%%/timezone/Pacific/Tongatapu
+%%TZDATA%%%%DATADIR%%/timezone/Pacific/Truk
+%%TZDATA%%%%DATADIR%%/timezone/Pacific/Wake
+%%TZDATA%%%%DATADIR%%/timezone/Pacific/Wallis
+%%TZDATA%%%%DATADIR%%/timezone/Pacific/Yap
+%%TZDATA%%%%DATADIR%%/timezone/Poland
+%%TZDATA%%%%DATADIR%%/timezone/Portugal
+%%TZDATA%%%%DATADIR%%/timezone/ROC
+%%TZDATA%%%%DATADIR%%/timezone/ROK
+%%TZDATA%%%%DATADIR%%/timezone/Singapore
+%%TZDATA%%%%DATADIR%%/timezone/Turkey
+%%TZDATA%%%%DATADIR%%/timezone/UCT
+%%TZDATA%%%%DATADIR%%/timezone/US/Alaska
+%%TZDATA%%%%DATADIR%%/timezone/US/Aleutian
+%%TZDATA%%%%DATADIR%%/timezone/US/Arizona
+%%TZDATA%%%%DATADIR%%/timezone/US/Central
+%%TZDATA%%%%DATADIR%%/timezone/US/East-Indiana
+%%TZDATA%%%%DATADIR%%/timezone/US/Eastern
+%%TZDATA%%%%DATADIR%%/timezone/US/Hawaii
+%%TZDATA%%%%DATADIR%%/timezone/US/Indiana-Starke
+%%TZDATA%%%%DATADIR%%/timezone/US/Michigan
+%%TZDATA%%%%DATADIR%%/timezone/US/Mountain
+%%TZDATA%%%%DATADIR%%/timezone/US/Pacific
+%%TZDATA%%%%DATADIR%%/timezone/US/Samoa
+%%TZDATA%%%%DATADIR%%/timezone/UTC
+%%TZDATA%%%%DATADIR%%/timezone/Universal
+%%TZDATA%%%%DATADIR%%/timezone/W-SU
+%%TZDATA%%%%DATADIR%%/timezone/WET
+%%TZDATA%%%%DATADIR%%/timezone/Zulu
+%%DATADIR%%/timezonesets/Africa.txt
+%%DATADIR%%/timezonesets/America.txt
+%%DATADIR%%/timezonesets/Antarctica.txt
+%%DATADIR%%/timezonesets/Asia.txt
+%%DATADIR%%/timezonesets/Atlantic.txt
+%%DATADIR%%/timezonesets/Australia
+%%DATADIR%%/timezonesets/Australia.txt
+%%DATADIR%%/timezonesets/Default
+%%DATADIR%%/timezonesets/Etc.txt
+%%DATADIR%%/timezonesets/Europe.txt
+%%DATADIR%%/timezonesets/India
+%%DATADIR%%/timezonesets/Indian.txt
+%%DATADIR%%/timezonesets/Pacific.txt
+%%DATADIR%%/tsearch_data/danish.stop
+%%DATADIR%%/tsearch_data/dutch.stop
+%%DATADIR%%/tsearch_data/english.stop
+%%DATADIR%%/tsearch_data/finnish.stop
+%%DATADIR%%/tsearch_data/french.stop
+%%DATADIR%%/tsearch_data/german.stop
+%%DATADIR%%/tsearch_data/hungarian.stop
+%%DATADIR%%/tsearch_data/hunspell_sample.affix
+%%DATADIR%%/tsearch_data/hunspell_sample_long.affix
+%%DATADIR%%/tsearch_data/hunspell_sample_long.dict
+%%DATADIR%%/tsearch_data/hunspell_sample_num.affix
+%%DATADIR%%/tsearch_data/hunspell_sample_num.dict
+%%DATADIR%%/tsearch_data/ispell_sample.affix
+%%DATADIR%%/tsearch_data/ispell_sample.dict
+%%DATADIR%%/tsearch_data/italian.stop
+%%DATADIR%%/tsearch_data/norwegian.stop
+%%DATADIR%%/tsearch_data/portuguese.stop
+%%DATADIR%%/tsearch_data/russian.stop
+%%DATADIR%%/tsearch_data/spanish.stop
+%%DATADIR%%/tsearch_data/swedish.stop
+%%DATADIR%%/tsearch_data/synonym_sample.syn
+%%DATADIR%%/tsearch_data/thesaurus_sample.ths
+%%DATADIR%%/tsearch_data/turkish.stop
+%%DATADIR%%/tsearch_data/nepali.stop
diff --git a/databases/postgresql96-client/Makefile b/databases/postgresql96-client/Makefile
deleted file mode 100644
index a627f1c34c5e..000000000000
--- a/databases/postgresql96-client/Makefile
+++ /dev/null
@@ -1,20 +0,0 @@
-# Created by: Palle Girgensohn <girgen@FreeBSD.org>
-
-PORTNAME=	postgresql
-PORTREVISION=	0
-
-COMMENT=	PostgreSQL database (client)
-
-MASTERDIR=	${.CURDIR}/../postgresql96-server
-
-BUILD_DIRS=	config src/include src/interfaces src/port \
-		src/bin/pg_dump src/bin/psql src/bin/scripts src/bin/pg_config \
-		src/bin/pgbench doc src/makefiles src/test/regress
-INSTALL_DIRS=	${BUILD_DIRS}
-
-CLIENT_ONLY=	yes
-COMPONENT=	-client
-USE_LDCONFIG=	yes
-USES=		pkgconfig
-
-.include "${MASTERDIR}/Makefile"
diff --git a/databases/postgresql96-contrib/Makefile b/databases/postgresql96-contrib/Makefile
deleted file mode 100644
index 9f0a34777cc4..000000000000
--- a/databases/postgresql96-contrib/Makefile
+++ /dev/null
@@ -1,39 +0,0 @@
-# Created by: Palle Girgensohn <girgen@pingpong.net>
-
-PORTNAME=	postgresql
-PORTREVISION=	0
-CATEGORIES=	databases
-
-MAINTAINER=	pgsql@FreeBSD.org
-COMMENT=	The contrib utilities from the PostgreSQL distribution
-
-MASTERDIR=	${.CURDIR}/../postgresql96-server
-
-USES=		bison pgsql:9.6 ssl
-
-BUILD_DIRS=	src/port src/include src/common contrib
-INSTALL_DIRS=	contrib
-
-# this port fails to build in parallel
-MAKE_JOBS_UNSAFE=	yes
-
-SLAVE_ONLY=	yes
-COMPONENT=	-contrib
-CONFIGURE_ARGS+=--with-openssl --disable-nls --with-uuid=bsd
-LDFLAGS+=	-lpthread -L${PREFIX}/lib
-
-OPTIONS_DEFINE=	DOCS XML
-OPTIONS_DEFAULT=XML
-OPTIONS_SUB=	yes
-
-XML_LIB_DEPENDS=libxslt.so:textproc/libxslt \
-		libxml2.so:textproc/libxml2
-XML_CONFIGURE_WITH=	libxml libxslt
-
-post-configure: 
-		@cd ${WRKSRC}/src/backend && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} symlinks
-
-post-install:
-	@- ${INSTALL_DATA} ${WRKSRC}/contrib/README ${STAGEDIR}${DOCSDIR}/extension/README
-
-.include "${MASTERDIR}/Makefile"
diff --git a/databases/postgresql96-contrib/pkg-descr b/databases/postgresql96-contrib/pkg-descr
deleted file mode 100644
index 18c3c1351c3b..000000000000
--- a/databases/postgresql96-contrib/pkg-descr
+++ /dev/null
@@ -1,23 +0,0 @@
-This is the port for all stuff that comes in the contrib subtree of
-the postgresql distribution. This subtree contains porting tools,
-analysis utilities, and plug-in features that are not part of the core
-PostgreSQL system, mainly because they address a limited audience or
-are too experimental to be part of the main source tree.  This does
-not preclude their usefulness.
-
-Each subdirectory contains a README file with information about the
-module. Some directories supply new user-defined functions, operators,
-or types.  After you have installed the files you need to register the
-new entities in the database system by running the commands in the
-supplied .sql file.  For example,
-
-        $ psql -d dbname -f module.sql
-
-The .sql files are installed into /usr/local/share/postgresql/contrib
-
-For more information, please see
-/usr/local/share/doc/postgresql/contrib/README*
-
-This software is part of the standard PostgreSQL distribution.
-
-WWW: https://www.postgresql.org/
diff --git a/databases/postgresql96-docs/Makefile b/databases/postgresql96-docs/Makefile
deleted file mode 100644
index fca44214c67d..000000000000
--- a/databases/postgresql96-docs/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-# Created by: Palle Girgensohn <girgen@pingpong.net>
-
-WANT_PGSQL_VER=9.6
-
-.include "${.CURDIR}/../postgresql14-docs/Makefile"
diff --git a/databases/postgresql96-pgtcl/Makefile b/databases/postgresql96-pgtcl/Makefile
deleted file mode 100644
index 761f1c4a8264..000000000000
--- a/databases/postgresql96-pgtcl/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-PORTREVISION=	0
-PKGNAMESUFFIX=	-postgresql96
-
-CONFLICTS=	pgtcl-[0-9]* pgtcl-postgresql9[01234]-[0-9]*
-
-PGTCL_SLAVE=	9.6
-MASTERDIR=	${.CURDIR}/../pgtcl
-
-.include "${MASTERDIR}/Makefile"
diff --git a/databases/postgresql96-plperl/Makefile b/databases/postgresql96-plperl/Makefile
deleted file mode 100644
index e3954311fb71..000000000000
--- a/databases/postgresql96-plperl/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-# Created by: Palle Girgensohn <girgen@partitur.se>
-
-WANT_PGSQL_VER=	9.6
-
-INSTALL_DIRS=	src/pl/plperl contrib/hstore_plperl
-
-# this port fails to build in parallel
-MAKE_JOBS_UNSAFE=	yes
-
-.include "${.CURDIR}/../postgresql14-plperl/Makefile"
diff --git a/databases/postgresql96-plpython/Makefile b/databases/postgresql96-plpython/Makefile
deleted file mode 100644
index 0419cfc0b0c0..000000000000
--- a/databases/postgresql96-plpython/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-WANT_PGSQL_VER=	9.6
-
-INSTALL_DIRS=	src/pl/plpython contrib/hstore_plpython contrib/ltree_plpython
-
-# this port fails to build in parallel
-MAKE_JOBS_UNSAFE=	yes
-
-.include "${.CURDIR}/../postgresql14-plpython/Makefile"
diff --git a/databases/postgresql96-pltcl/Makefile b/databases/postgresql96-pltcl/Makefile
deleted file mode 100644
index 328f4a504afe..000000000000
--- a/databases/postgresql96-pltcl/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-# Created by: Palle Girgensohn <girgen@partitur.se>
-
-WANT_PGSQL_VER=	9.6
-
-# this port fails to build in parallel
-MAKE_JOBS_UNSAFE=	yes
-
-.include "${.CURDIR}/../postgresql14-pltcl/Makefile"
diff --git a/databases/postgresql96-server/Makefile b/databases/postgresql96-server/Makefile
deleted file mode 100644
index 787639aa3c8b..000000000000
--- a/databases/postgresql96-server/Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
-# Created by: Marc G. Fournier <scrappy@FreeBSD.org>
-
-DISTVERSION?=	9.6.23
-# PORTREVISION must be ?= otherwise, all slave ports get this PORTREVISION and
-# not their own.  Probably best to keep it at ?=0 when reset here too.
-PORTREVISION?=	0
-PKGNAMESUFFIX?=	${PORTVERSION:R:S/.//}${COMPONENT}
-
-MAINTAINER?=	pgsql@FreeBSD.org
-
-INSTALL_DIRS?=	src/common src/timezone src/backend \
-		src/backend/utils/mb/conversion_procs \
-		src/backend/snowball src/backend/replication/libpqwalreceiver \
-		src/bin/initdb src/bin/pg_ctl \
-		src/bin/pg_controldata src/bin/pg_resetxlog src/pl \
-		src/bin/pg_basebackup src/bin/pg_archivecleanup \
-		src/bin/pg_rewind \
-		src/bin/pg_test_fsync src/bin/pg_test_timing \
-		src/bin/pg_xlogdump src/bin/pg_upgrade
-
-ICU_PATCHFILE=	pg-96b4-icu-2016-10-02.diff.gz
-OPTIONS_DEFAULT+=ICU
-
-.include "${.CURDIR}/../postgresql14-server/Makefile"
diff --git a/databases/postgresql96-server/distinfo b/databases/postgresql96-server/distinfo
deleted file mode 100644
index b199b580028d..000000000000
--- a/databases/postgresql96-server/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-TIMESTAMP = 1628577739
-SHA256 (postgresql/postgresql-9.6.23.tar.bz2) = a849f798401ab8c6dfa653ebbcd853b43f2200b4e3bc1ea3cb5bec9a691947b9
-SIZE (postgresql/postgresql-9.6.23.tar.bz2) = 19013235
-SHA256 (postgresql/pg-96b4-icu-2016-10-02.diff.gz) = 85f81baa0fc8f692bcf802c8645196d9e3afdef4f760cef712d940b87655486e
-SIZE (postgresql/pg-96b4-icu-2016-10-02.diff.gz) = 5998
diff --git a/databases/postgresql96-server/files/502.pgsql.in b/databases/postgresql96-server/files/502.pgsql.in
deleted file mode 100644
index c2d5b885d2f1..000000000000
--- a/databases/postgresql96-server/files/502.pgsql.in
+++ /dev/null
@@ -1,114 +0,0 @@
-#!/bin/sh
-#
-# Maintenance shell script to vacuum and backup database
-# Put this in /usr/local/etc/periodic/daily, and it will be run 
-# every night
-#
-# Written by Palle Girgensohn <girgen@pingpong.net>
-#
-# In public domain, do what you like with it,
-# and use it at your own risk... :)
-#
-
-# Define these variables in either /etc/periodic.conf or
-# /etc/periodic.conf.local to override the default values.
-#
-# daily_pgsql_backup_enable="YES" # do backup of all databases
-# daily_pgsql_backup_enable="foo bar db1 db2" # only do backup of a limited selection of databases
-# daily_pgsql_vacuum_enable="YES" # do vacuum
-
-# If there is a global system configuration file, suck it in.
-#
-if [ -r /etc/defaults/periodic.conf ]
-then
-    . /etc/defaults/periodic.conf
-    source_periodic_confs
-fi
-
-: ${daily_pgsql_user:="%%PG_USER%%"}
-: ${daily_pgsql_port:=5432}
-: ${daily_pgsql_vacuum_args:="-U ${daily_pgsql_user} -p ${daily_pgsql_port} -qaz"}
-: ${daily_pgsql_pgdump_args:="-U ${daily_pgsql_user} -p ${daily_pgsql_port} -bF c"}
-: ${daily_pgsql_pgdumpall_globals_args:="-U ${daily_pgsql_user} -p ${daily_pgsql_port}"}
-# backupdir is relative to ~pgsql home directory unless it begins with a slash:
-: ${daily_pgsql_backupdir:="~${daily_pgsql_user}/backups"}
-: ${daily_pgsql_savedays:="7"}
-
-# allow '~´ in dir name
-eval backupdir=${daily_pgsql_backupdir}
-
-rc=0
-
-pgsql_backup() {
-	# daily_pgsql_backupdir must be writeable by user %%PG_USER%%
-	# ~%%PG_USER%% is just that under normal circumstances,
-	# but this might not be where you want the backups...
-	if [ ! -d ${backupdir} ] ; then 
-	    echo Creating ${backupdir}
-	    mkdir -m 700 ${backupdir}; chown ${daily_pgsql_user} ${backupdir}
-	fi
-
-	echo
-	echo "PostgreSQL backups"
-
-	# Protect the data
-	umask 077
-	rc=$?
-	now=`date "+%Y-%m-%dT%H:%M:%S"`
-	file=${daily_pgsql_backupdir}/pgglobals_${now}
-	su -l ${daily_pgsql_user} -c \
-		"umask 077; pg_dumpall -g ${daily_pgsql_pgdumpall_globals_args} | gzip -9 > ${file}.gz"
-
-	db=$1
-	while shift; do
-	    echo -n " $db"
-	    file=${backupdir}/pgdump_${db}_${now}
-	    su -l ${daily_pgsql_user} -c "umask 077; pg_dump ${daily_pgsql_pgdump_args} -f ${file} ${db}"
-	    [ $? -gt 0 ] && rc=3
-		db=$1
-	done
-
-	if [ $rc -gt 0 ]; then
-	    echo
-	    echo "Errors were reported during backup."
-	fi
-
-	# cleaning up old data
-	find ${backupdir} \( -name 'pgdump_*' -o -name 'pgglobals_*' -o -name '*.dat.gz' -o -name 'toc.dat' \) \
-	    -a -mtime +${daily_pgsql_savedays} -delete
-	echo
-}
-
-case "$daily_pgsql_backup_enable" in
-    [Yy][Ee][Ss])
-	dbnames=`su -l ${daily_pgsql_user} -c "umask 077; psql -U ${daily_pgsql_user} -p ${daily_pgsql_port} -q -t -A -d template1 -c SELECT\ datname\ FROM\ pg_database\ WHERE\ datname!=\'template0\'"`
-	pgsql_backup $dbnames
-	;;
-
-	[Nn][Oo])
-	;;
-
-	"")
-	;;
-
-	*)
-	pgsql_backup $daily_pgsql_backup_enable
-	;;
-esac
-
-case "$daily_pgsql_vacuum_enable" in
-    [Yy][Ee][Ss])
-
-	echo
-	echo "PostgreSQL vacuum"
-	su -l ${daily_pgsql_user} -c "vacuumdb ${daily_pgsql_vacuum_args}"
-	if [ $? -gt 0 ]
-	then
-	    echo
-	    echo "Errors were reported during vacuum."
-	    rc=3
-	fi
-	;;
-esac
-
-exit $rc
diff --git a/databases/postgresql96-server/files/dot.cshrc.in b/databases/postgresql96-server/files/dot.cshrc.in
deleted file mode 100644
index 17c9ee69a7d0..000000000000
--- a/databases/postgresql96-server/files/dot.cshrc.in
+++ /dev/null
@@ -1,11 +0,0 @@
-setenv PGLIB %%PREFIX%%/lib
-
-# note: PGDATA can be overridden by the -D startup option
-setenv PGDATA $HOME/data96
-
-#You might want to set some locale stuff here
-#setenv PGDATESTYLE ISO
-#setenv LC_ALL sv_SE.ISO_8859-1
-
-# if you want to make regression tests use this TZ
-#setenv TZ PST8PDT
diff --git a/databases/postgresql96-server/files/dot.profile.in b/databases/postgresql96-server/files/dot.profile.in
deleted file mode 100644
index 5be3e6a36ca9..000000000000
--- a/databases/postgresql96-server/files/dot.profile.in
+++ /dev/null
@@ -1,22 +0,0 @@
-PGLIB=%%PREFIX%%/lib
-
-# note: PGDATA can be overridden by the -D startup option
-PGDATA=${HOME}/data96
-
-export PATH PGLIB PGDATA
-
-# if you use the periodic script from share/postgresql/502.pgsql, you
-# can set these
-#PGDUMP_ARGS="-b -F c"
-#PGBACKUPDIR=${HOME}/backups
-#PGBACKUP_SAVE_DAYS=7
-#export PGBACKUPDIR PGDUMP_ARGS PGBACKUP_SAVE_DAYS
-
-#You might want to set some locale stuff here
-#PGDATESTYLE=ISO
-#LC_ALL=sv_SE.ISO_8859-1
-#export PGDATESTYLE LC_ALL
-
-# if you want to make regression tests use this TZ
-#TZ=PST8PDT
-#export TZ
diff --git a/databases/postgresql96-server/files/patch-doc-Makefile b/databases/postgresql96-server/files/patch-doc-Makefile
deleted file mode 100644
index d5176bfb64b5..000000000000
--- a/databases/postgresql96-server/files/patch-doc-Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
---- doc/Makefile.orig	2015-10-08 21:45:57.360084007 +0200
-+++ doc/Makefile	2015-10-08 21:46:04.353084097 +0200
-@@ -12,5 +12,5 @@
- top_builddir = ..
- include $(top_builddir)/src/Makefile.global
- 
--all distprep html man install installdirs uninstall clean distclean maintainer-clean:
-+all distprep man install installdirs uninstall clean distclean maintainer-clean:
- 	$(MAKE) -C src $@
diff --git a/databases/postgresql96-server/files/patch-doc-src-sgml-Makefile b/databases/postgresql96-server/files/patch-doc-src-sgml-Makefile
deleted file mode 100644
index 6e9522b1e45a..000000000000
--- a/databases/postgresql96-server/files/patch-doc-src-sgml-Makefile
+++ /dev/null
@@ -1,46 +0,0 @@
---- doc/src/sgml/Makefile.orig	2015-10-05 21:09:44.000000000 +0200
-+++ doc/src/sgml/Makefile	2015-10-09 01:02:37.164797000 +0200
-@@ -15,7 +15,7 @@
- 
- # Make "html" the default target, since that is what most people tend
- # to want to use.
--html:
-+man:
- 
- NO_TEMP_INSTALL=yes
- 
-@@ -24,7 +24,7 @@
- include $(top_builddir)/src/Makefile.global
- 
- 
--all: html man
-+all: man
- 
- distprep: html distprep-man
- 
-@@ -81,8 +81,6 @@
- ## Man pages
- ##
- 
--man distprep-man: man-stamp
--
- man-stamp: stylesheet-man.xsl postgres.xml
- 	$(XMLLINT) --noout --valid postgres.xml
- 	$(XSLTPROC) $(XSLTPROCFLAGS) $(XSLTPROC_MAN_FLAGS) $^
-@@ -326,14 +324,14 @@
- ## Install
- ##
- 
--install: install-html
-+install: install-man
- 
- ifneq ($(PORTNAME), sco)
- install: install-man
- endif
- 
- installdirs:
--	$(MKDIR_P) '$(DESTDIR)$(htmldir)'/html $(addprefix '$(DESTDIR)$(mandir)'/man, 1 3 $(sqlmansectnum))
-+	$(MKDIR_P) $(addprefix '$(DESTDIR)$(mandir)'/man, 1 3 $(sqlmansectnum))
- 
- # If the install used a man directory shared with other applications, this will remove all files.
- uninstall:
diff --git a/databases/postgresql96-server/files/patch-icu68 b/databases/postgresql96-server/files/patch-icu68
deleted file mode 100644
index 90cd386d9480..000000000000
--- a/databases/postgresql96-server/files/patch-icu68
+++ /dev/null
@@ -1,278 +0,0 @@
-Regressed by https://github.com/unicode-org/icu/commit/c3fe7e09d844
-
-dbcommands.c:770:1: error: conflicting types for 'dropdb'
-dropdb(const char *dbname, bool missing_ok)
-^
-../../../src/include/commands/dbcommands.h:23:13: note: previous declaration is here
-extern void dropdb(const char *dbname, bool missing_ok);
-            ^
-dbcommands.c:1367:1: error: conflicting types for 'AlterDatabase'
-AlterDatabase(AlterDatabaseStmt *stmt, bool isTopLevel)
-^
-../../../src/include/commands/dbcommands.h:25:12: note: previous declaration is here
-extern Oid      AlterDatabase(AlterDatabaseStmt *stmt, bool isTopLevel);
-                ^
-dbcommands.c:1977:1: error: conflicting types for 'get_database_oid'
-get_database_oid(const char *dbname, bool missing_ok)
-^
-../../../src/include/commands/dbcommands.h:29:12: note: previous declaration is here
-extern Oid      get_database_oid(const char *dbname, bool missingok);
-                ^
-indxpath.c:2917:1: error: conflicting types for 'relation_has_unique_index_for'
-relation_has_unique_index_for(PlannerInfo *root, RelOptInfo *rel,
-^
-../../../../src/include/optimizer/paths.h:66:13: note: previous declaration is here
-extern bool relation_has_unique_index_for(PlannerInfo *root, RelOptInfo *rel,
-            ^
-indxpath.c:3091:1: error: conflicting types for 'match_index_to_operand'
-match_index_to_operand(Node *operand,
-^
-../../../../src/include/optimizer/paths.h:69:13: note: previous declaration is here
-extern bool match_index_to_operand(Node *operand, int indexcol,
-            ^
-indxpath.c:3735:1: error: conflicting types for 'adjust_rowcompare_for_index'
-adjust_rowcompare_for_index(RowCompareExpr *clause,
-^
-../../../../src/include/optimizer/paths.h:75:14: note: previous declaration is here
-extern Expr *adjust_rowcompare_for_index(RowCompareExpr *clause,
-             ^
-regis.c:31:1: error: conflicting types for 'RS_isRegis'
-RS_isRegis(const char *str)
-^
-../../../src/include/tsearch/dicts/regis.h:41:7: note: previous declaration is here
-bool            RS_isRegis(const char *str);
-                ^
-regis.c:85:1: error: conflicting types for 'RS_compile'
-RS_compile(Regis *r, bool issuffix, const char *str)
-^
-../../../src/include/tsearch/dicts/regis.h:43:7: note: previous declaration is here
-void            RS_compile(Regis *r, bool issuffix, const char *str);
-                ^
-regis.c:218:1: error: conflicting types for 'RS_execute'
-RS_execute(Regis *r, char *str)
-^
-../../../src/include/tsearch/dicts/regis.h:47:7: note: previous declaration is here
-bool            RS_execute(Regis *r, char *str);
-                ^
-varlena.c:1845:1: error: conflicting types for 'varstr_sortsupport'
-varstr_sortsupport(SortSupport ssup, Oid collid, bool bpchar)
-^
-../../../../src/include/utils/builtins.h:849:13: note: previous declaration is here
-extern void varstr_sortsupport(SortSupport ssup, Oid collid, bool bpchar);
-            ^
-varlena.c:3264:1: error: conflicting types for 'SplitIdentifierString'
-SplitIdentifierString(char *rawstring, char separator,
-^
-../../../../src/include/utils/builtins.h:859:13: note: previous declaration is here
-extern bool SplitIdentifierString(char *rawstring, char separator,
-            ^
-varlena.c:3389:1: error: conflicting types for 'SplitDirectoriesString'
-SplitDirectoriesString(char *rawstring, char separator,
-^
-../../../../src/include/utils/builtins.h:861:13: note: previous declaration is here
-extern bool SplitDirectoriesString(char *rawstring, char separator,
-            ^
-varlena.c:3510:1: error: conflicting types for 'SplitGUCList'
-SplitGUCList(char *rawstring, char separator,
-^
-../../../../src/include/utils/builtins.h:863:13: note: previous declaration is here
-extern bool SplitGUCList(char *rawstring, char separator,
-            ^
-varlena.c:4022:1: error: conflicting types for 'replace_text_regexp'
-replace_text_regexp(text *src_text, void *regexp,
-^
-../../../../src/include/utils/builtins.h:866:14: note: previous declaration is here
-extern text *replace_text_regexp(text *src_text, void *regexp,
-             ^
-In file included from varlena.c:5586:
-./levenshtein.c:73:1: error: conflicting types for 'varstr_levenshtein'
-varstr_levenshtein(const char *source, int slen,
-^
-../../../../src/include/utils/builtins.h:850:12: note: previous declaration is here
-extern int varstr_levenshtein(const char *source, int slen,
-           ^
-In file included from varlena.c:5588:
-./levenshtein.c:68:1: error: conflicting types for 'varstr_levenshtein_less_equal'
-varstr_levenshtein_less_equal(const char *source, int slen,
-^
-../../../../src/include/utils/builtins.h:854:12: note: previous declaration is here
-extern int varstr_levenshtein_less_equal(const char *source, int slen,
-           ^
-guc.c:408:7: error: redefinition of 'log_duration' with a different type: 'bool' vs 'bool' (aka 'char')
-bool            log_duration = false;
-                ^
-../../../../src/include/utils/guc.h:233:13: note: previous declaration is here
-extern bool log_duration;
-            ^
-guc.c:409:7: error: redefinition of 'Debug_print_plan' with a different type: 'bool' vs 'bool' (aka 'char')
-bool            Debug_print_plan = false;
-                ^
-../../../../src/include/utils/guc.h:234:13: note: previous declaration is here
-extern bool Debug_print_plan;
-            ^
-guc.c:410:7: error: redefinition of 'Debug_print_parse' with a different type: 'bool' vs 'bool' (aka 'char')
-bool            Debug_print_parse = false;
-                ^
-../../../../src/include/utils/guc.h:235:13: note: previous declaration is here
-extern bool Debug_print_parse;
-            ^
-guc.c:411:7: error: redefinition of 'Debug_print_rewritten' with a different type: 'bool' vs 'bool' (aka 'char')
-bool            Debug_print_rewritten = false;
-                ^
-../../../../src/include/utils/guc.h:236:13: note: previous declaration is here
-extern bool Debug_print_rewritten;
-            ^
-guc.c:412:7: error: redefinition of 'Debug_pretty_print' with a different type: 'bool' vs 'bool' (aka 'char')
-bool            Debug_pretty_print = true;
-                ^
-../../../../src/include/utils/guc.h:237:13: note: previous declaration is here
-extern bool Debug_pretty_print;
-            ^
-guc.c:414:7: error: redefinition of 'log_parser_stats' with a different type: 'bool' vs 'bool' (aka 'char')
-bool            log_parser_stats = false;
-                ^
-../../../../src/include/utils/guc.h:239:13: note: previous declaration is here
-extern bool log_parser_stats;
-            ^
-guc.c:415:7: error: redefinition of 'log_planner_stats' with a different type: 'bool' vs 'bool' (aka 'char')
-bool            log_planner_stats = false;
-                ^
-../../../../src/include/utils/guc.h:240:13: note: previous declaration is here
-extern bool log_planner_stats;
-            ^
-guc.c:416:7: error: redefinition of 'log_executor_stats' with a different type: 'bool' vs 'bool' (aka 'char')
-bool            log_executor_stats = false;
-                ^
-../../../../src/include/utils/guc.h:241:13: note: previous declaration is here
-extern bool log_executor_stats;
-            ^
-guc.c:417:7: error: redefinition of 'log_statement_stats' with a different type: 'bool' vs 'bool' (aka 'char')
-bool            log_statement_stats = false;            /* this is sort of all three
-                ^
-../../../../src/include/utils/guc.h:242:13: note: previous declaration is here
-extern bool log_statement_stats;
-            ^
-guc.c:419:7: error: redefinition of 'log_btree_build_stats' with a different type: 'bool' vs 'bool' (aka 'char')
-bool            log_btree_build_stats = false;
-                ^
-../../../../src/include/utils/guc.h:243:13: note: previous declaration is here
-extern bool log_btree_build_stats;
-            ^
-guc.c:423:7: error: redefinition of 'check_function_bodies' with a different type: 'bool' vs 'bool' (aka 'char')
-bool            check_function_bodies = true;
-                ^
-../../../../src/include/utils/guc.h:245:25: note: previous declaration is here
-extern PGDLLIMPORT bool check_function_bodies;
-                        ^
-guc.c:424:7: error: redefinition of 'default_with_oids' with a different type: 'bool' vs 'bool' (aka 'char')
-bool            default_with_oids = false;
-                ^
-../../../../src/include/utils/guc.h:246:13: note: previous declaration is here
-extern bool default_with_oids;
-            ^
-guc.c:425:7: error: redefinition of 'SQL_inheritance' with a different type: 'bool' vs 'bool' (aka 'char')
-bool            SQL_inheritance = true;
-                ^
-../../../../src/include/utils/guc.h:247:13: note: previous declaration is here
-extern bool SQL_inheritance;
-            ^
-guc.c:428:7: error: redefinition of 'session_auth_is_superuser' with a different type: 'bool' vs 'bool' (aka 'char')
-bool            session_auth_is_superuser;
-                ^
-../../../../src/include/utils/guc.h:248:13: note: previous declaration is here
-extern bool     session_auth_is_superuser;
-                ^
-guc.c:4599:1: error: conflicting types for 'SelectConfigFiles'
-SelectConfigFiles(const char *userDoption, const char *progname)
-^
-../../../../src/include/utils/guc.h:355:13: note: previous declaration is here
-extern bool SelectConfigFiles(const char *userDoption, const char *progname);
-            ^
-guc.c:4989:1: error: conflicting types for 'AtEOXact_GUC'
-AtEOXact_GUC(bool isCommit, int nestLevel)
-^
-../../../../src/include/utils/guc.h:359:13: note: previous declaration is here
-extern void AtEOXact_GUC(bool isCommit, int nestLevel);
-            ^
-guc.c:5407:1: error: conflicting types for 'parse_int'
-parse_int(const char *value, int *result, int flags, const char **hintmsg)
-^
-../../../../src/include/utils/guc.h:362:13: note: previous declaration is here
-extern bool parse_int(const char *value, int *result, int flags,
-            ^
-guc.c:5493:1: error: conflicting types for 'parse_real'
-parse_real(const char *value, double *result)
-^
-../../../../src/include/utils/guc.h:364:13: note: previous declaration is here
-extern bool parse_real(const char *value, double *result);
-            ^
-guc.c:5554:1: error: conflicting types for 'config_enum_lookup_by_name'
-config_enum_lookup_by_name(struct config_enum * record, const char *value,
-^
-../../../../src/include/utils/guc_tables.h:264:13: note: previous declaration is here
-extern bool config_enum_lookup_by_name(struct config_enum * record,
-            ^
-fatal error: too many errors emitted, stopping now [-ferror-limit=]
-
---- src/backend/commands/dbcommands.c.orig	2020-08-10 21:21:12 UTC
-+++ src/backend/commands/dbcommands.c
-@@ -19,6 +19,7 @@
-  */
- #include "postgres.h"
- 
-+#include <stdbool.h>
- #include <fcntl.h>
- #include <locale.h>
- #include <unistd.h>
---- src/backend/optimizer/path/indxpath.c.orig	2020-08-10 21:21:12 UTC
-+++ src/backend/optimizer/path/indxpath.c
-@@ -15,6 +15,7 @@
-  */
- #include "postgres.h"
- 
-+#include <stdbool.h>
- #include <math.h>
- 
- #include "access/stratnum.h"
---- src/backend/tsearch/regis.c.orig	2020-08-10 21:21:12 UTC
-+++ src/backend/tsearch/regis.c
-@@ -14,6 +14,8 @@
- 
- #include "postgres.h"
- 
-+#include <stdbool.h>
-+
- #include "tsearch/dicts/regis.h"
- #include "tsearch/ts_locale.h"
- 
---- src/backend/utils/adt/levenshtein.c.orig	2020-08-10 21:21:12 UTC
-+++ src/backend/utils/adt/levenshtein.c
-@@ -23,6 +23,8 @@
-  *
-  *-------------------------------------------------------------------------
-  */
-+#include <stdbool.h>
-+
- #define MAX_LEVENSHTEIN_STRLEN		255
- 
- /*
---- src/backend/utils/adt/varlena.c.orig	2020-08-10 21:21:12 UTC
-+++ src/backend/utils/adt/varlena.c
-@@ -14,6 +14,7 @@
-  */
- #include "postgres.h"
- 
-+#include <stdbool.h>
- #include <ctype.h>
- #include <limits.h>
- 
---- src/backend/utils/misc/guc.c.orig	2020-08-10 21:21:12 UTC
-+++ src/backend/utils/misc/guc.c
-@@ -16,6 +16,7 @@
-  */
- #include "postgres.h"
- 
-+#include <stdbool.h>
- #include <ctype.h>
- #include <float.h>
- #include <math.h>
diff --git a/databases/postgresql96-server/files/patch-src-Makefile.shlib b/databases/postgresql96-server/files/patch-src-Makefile.shlib
deleted file mode 100644
index 2435ffe1d280..000000000000
--- a/databases/postgresql96-server/files/patch-src-Makefile.shlib
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/Makefile.shlib.bak	2013-05-06 22:57:06.000000000 +0200
-+++ src/Makefile.shlib	2013-05-12 23:33:16.000000000 +0200
-@@ -87,7 +87,7 @@
- # Testing the soname variable is a reliable way to determine whether a
- # linkable library is being built.
- soname		= $(shlib_major)
--pkgconfigdir = $(libdir)/pkgconfig
-+pkgconfigdir = $(prefix)/libdata/pkgconfig
- else
- # Naming convention for dynamically loadable modules
- shlib		= $(NAME)$(DLSUFFIX)
diff --git a/databases/postgresql96-server/files/patch-src-backend-Makefile b/databases/postgresql96-server/files/patch-src-backend-Makefile
deleted file mode 100644
index d44406c3edd4..000000000000
--- a/databases/postgresql96-server/files/patch-src-backend-Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/backend/Makefile.orig	2009-07-07 15:58:33.000000000 +0200
-+++ src/backend/Makefile	2009-07-07 15:58:57.000000000 +0200
-@@ -107,6 +107,8 @@
- # Update the commonly used headers before building the subdirectories
- $(SUBDIRS:%=%-recursive): $(top_builddir)/src/include/parser/gram.h $(top_builddir)/src/include/utils/fmgroids.h $(top_builddir)/src/include/utils/probes.h
- 
-+symlinks: $(top_builddir)/src/include/parser/gram.h $(top_builddir)/src/include/utils/fmgroids.h $(top_builddir)/src/include/utils/probes.h $(top_builddir)/src/include/storage/lwlocknames.h
-+
- 
- # The postgres.o target is needed by the rule in Makefile.global that
- # creates the exports file when MAKE_EXPORTS = true.
diff --git a/databases/postgresql96-server/files/patch-src_backend_utils_misc_postgresql.conf.sample b/databases/postgresql96-server/files/patch-src_backend_utils_misc_postgresql.conf.sample
deleted file mode 100644
index a82826b3b5f1..000000000000
--- a/databases/postgresql96-server/files/patch-src_backend_utils_misc_postgresql.conf.sample
+++ /dev/null
@@ -1,21 +0,0 @@
---- src/backend/utils/misc/postgresql.conf.sample.orig	2016-10-24 20:08:51 UTC
-+++ src/backend/utils/misc/postgresql.conf.sample
-@@ -330,6 +330,7 @@
- 
- # - Where to Log -
- 
-+log_destination = 'syslog'
- #log_destination = 'stderr'		# Valid values are combinations of
- 					# stderr, csvlog, syslog, and eventlog,
- 					# depending on platform.  csvlog
-@@ -464,7 +465,9 @@
- 
- #cluster_name = ''			# added to process titles if nonempty
- 					# (change requires restart)
--#update_process_title = on
-+
-+# On FreeBSD, this is a performance hog, so keep it off if you need speed
-+update_process_title = off
- 
- 
- #------------------------------------------------------------------------------
diff --git a/databases/postgresql96-server/files/pkg-message-client.in b/databases/postgresql96-server/files/pkg-message-client.in
deleted file mode 100644
index 404124204b7d..000000000000
--- a/databases/postgresql96-server/files/pkg-message-client.in
+++ /dev/null
@@ -1,38 +0,0 @@
-[
-{ type: install
-  message: <<EOM
-The PostgreSQL port has a collection of "side orders":
-
-postgresql-docs
-  For all of the html documentation
-
-p5-Pg
-  A perl5 API for client access to PostgreSQL databases.
-
-postgresql-tcltk 
-  If you want tcl/tk client support.
-
-postgresql-jdbc
-  For Java JDBC support.
-
-postgresql-odbc
-  For client access from unix applications using ODBC as access
-  method. Not needed to access unix PostgreSQL servers from Win32
-  using ODBC. See below.
-
-ruby-postgres, py-psycopg2
-  For client access to PostgreSQL databases using the ruby & python
-  languages.
-
-postgresql-plperl, postgresql-pltcl & postgresql-plruby
-  For using perl5, tcl & ruby as procedural languages.
-
-postgresql-contrib
-  Lots of contributed utilities, postgresql functions and
-  datatypes. There you find pg_standby, pgcrypto and many other cool
-  things.
-
-etc...
-EOM
-}
-]
diff --git a/databases/postgresql96-server/files/pkg-message-contrib.in b/databases/postgresql96-server/files/pkg-message-contrib.in
deleted file mode 100644
index 2d9f3d86e71c..000000000000
--- a/databases/postgresql96-server/files/pkg-message-contrib.in
+++ /dev/null
@@ -1,9 +0,0 @@
-[
-{ type: install
-  message: <<EOM
-The PostgreSQL contrib utilities have been installed. Please see
-%%PREFIX%%/share/doc/postgresql/contrib/README
-for more information.
-EOM
-}
-]
diff --git a/databases/postgresql96-server/files/pkg-message-plperl.in b/databases/postgresql96-server/files/pkg-message-plperl.in
deleted file mode 100644
index dbda7daff5c2..000000000000
--- a/databases/postgresql96-server/files/pkg-message-plperl.in
+++ /dev/null
@@ -1,9 +0,0 @@
-[
-{ type: install
-  message: <<EOM
-PL/Perl has been installed. Check the createlang(l) manpage for more
-info. You can install PL/Perl as trusted or untrusted, by using either
-"createlang plperl" or "createlang plperlu".
-EOM
-}
-]
diff --git a/databases/postgresql96-server/files/pkg-message-plpython.in b/databases/postgresql96-server/files/pkg-message-plpython.in
deleted file mode 100644
index 3bd80d73d177..000000000000
--- a/databases/postgresql96-server/files/pkg-message-plpython.in
+++ /dev/null
@@ -1,9 +0,0 @@
-[
-{ type: install
-  message: <<EOM
-PL/Python has been installed. Check the createlang(l) manpage for more
-info. You can install PL/Python by using "createlang plpythonu" (it
-exists as an untrusted language only).
-EOM
-}
-]
diff --git a/databases/postgresql96-server/files/pkg-message-pltcl.in b/databases/postgresql96-server/files/pkg-message-pltcl.in
deleted file mode 100644
index c1776f7d6fb3..000000000000
--- a/databases/postgresql96-server/files/pkg-message-pltcl.in
+++ /dev/null
@@ -1,9 +0,0 @@
-[
-{ type: install
-  message: <<EOM
-PL/Tcl has been  installed. Check the createlang(l) manpage for more
-info. You can install pltcl as trusted or untrusted, by using either
-"createlang pltcl" or "createlang pltclu".
-EOM
-}
-]
diff --git a/databases/postgresql96-server/files/pkg-message-server.in b/databases/postgresql96-server/files/pkg-message-server.in
deleted file mode 100644
index e2407c1d964f..000000000000
--- a/databases/postgresql96-server/files/pkg-message-server.in
+++ /dev/null
@@ -1,69 +0,0 @@
-[
-{ type: install
-  message: <<EOM
-For procedural languages and postgresql functions, please note that
-you might have to update them when updating the server.
-
-If you have many tables and many clients running, consider raising
-kern.maxfiles using sysctl(8), or reconfigure your kernel
-appropriately.
-
-The port is set up to use autovacuum for new databases, but you might
-also want to vacuum and perhaps backup your database regularly. There
-is a periodic script, %%PREFIX%%/etc/periodic/daily/502.pgsql, that
-you may find useful. You can use it to backup and perform vacuum on all
-databases nightly. Per default, it performs `vacuum analyze'. See the
-script for instructions. For autovacuum settings, please review
-~postgres/data/postgresql.conf.
-
-If you plan to access your PostgreSQL server using ODBC, please
-consider running the SQL script %%PREFIX%%/share/postgresql/odbc.sql
-to get the functions required for ODBC compliance.
-
-Please note that if you use the rc script,
-%%PREFIX%%/etc/rc.d/postgresql, to initialize the database, unicode
-(UTF-8) will be used to store character data by default.  Set
-postgresql_initdb_flags or use login.conf settings described below to
-alter this behaviour. See the start rc script for more info.
-
-To set limits, environment stuff like locale and collation and other
-things, you can set up a class in /etc/login.conf before initializing
-the database. Add something similar to this to /etc/login.conf:
----
-postgres:\
-	:lang=en_US.UTF-8:\
-	:setenv=LC_COLLATE=C:\
-	:tc=default:
----
-and run `cap_mkdb /etc/login.conf'.
-Then add 'postgresql_class="postgres"' to /etc/rc.conf.
-
-======================================================================
-
-To initialize the database, run
-
-  %%PREFIX%%/etc/rc.d/postgresql initdb
-
-You can then start PostgreSQL by running:
-
-  %%PREFIX%%/etc/rc.d/postgresql start
-
-For postmaster settings, see ~postgres/data/postgresql.conf
-
-NB. FreeBSD's PostgreSQL port logs to syslog by default
-    See ~postgres/data/postgresql.conf for more info
-
-NB. If you're not using a checksumming filesystem like ZFS, you might
-    wish to enable data checksumming. It can only be enabled during
-    the initdb phase, by adding the "--data-checksums" flag to
-    the postgresql_initdb_flags rcvar.  Check the initdb(1) manpage
-    for more info and make sure you understand the performance
-    implications.
-
-======================================================================
-
-To run PostgreSQL at startup, add
-'postgresql_enable="YES"' to /etc/rc.conf
-EOM
-}
-]
diff --git a/databases/postgresql96-server/files/pkgIndex.tcl.in b/databases/postgresql96-server/files/pkgIndex.tcl.in
deleted file mode 100644
index bd8329b15c69..000000000000
--- a/databases/postgresql96-server/files/pkgIndex.tcl.in
+++ /dev/null
@@ -1,4 +0,0 @@
-# Package-index file for Pgtcl-package. Enables you to load PostgreSQL
-# interface functions right into you TCL-interpreter as simply as
-#	package require Pgtcl
-package ifneeded Pgtcl 1.3 "load %%PREFIX%%/lib/libpgtcl.so"
diff --git a/databases/postgresql96-server/files/postgresql.in b/databases/postgresql96-server/files/postgresql.in
deleted file mode 100644
index 6cdd1f252383..000000000000
--- a/databases/postgresql96-server/files/postgresql.in
+++ /dev/null
@@ -1,115 +0,0 @@
-#!/bin/sh
-
-# PROVIDE: postgresql
-# REQUIRE: DAEMON
-# KEYWORD: shutdown
-#
-# Add the following line to /etc/rc.conf to enable PostgreSQL:
-#
-#  postgresql_enable="YES"
-#  # optional
-#  postgresql_data="/var/db/%%PG_USER%%/data96"
-#  postgresql_flags="-w -s -m fast"
-#  postgresql_initdb_flags="--encoding=utf-8 --lc-collate=C"
-#  postgresql_login_class="default"
-#  postgresql_profiles=""
-#
-# See %%PREFIX%%/share/doc/postgresql/README-server for more info
-#
-# This scripts takes one of the following commands:
-#
-#   start stop restart reload status initdb
-#
-# For postmaster startup options, edit ${postgresql_data}/postgresql.conf
-
-command=%%PREFIX%%/bin/pg_ctl
-
-. /etc/rc.subr
-
-load_rc_config postgresql
-
-# set defaults
-postgresql_enable=${postgresql_enable:-"NO"}
-postgresql_flags=${postgresql_flags:-"-w -s -m fast"}
-postgresql_user=${postgresql_user:-"%%PG_USER%%"}
-eval postgresql_data=${postgresql_data:-"~${postgresql_user}/data96"}
-postgresql_login_class=${postgresql_login_class:-"default"}
-postgresql_initdb_flags=${postgresql_initdb_flags:-"--encoding=utf-8 --lc-collate=C"}
-
-name=postgresql
-rcvar=postgresql_enable
-extra_commands="reload initdb"
-
-start_cmd="postgresql_command start"
-stop_cmd="postgresql_command stop"
-restart_cmd="postgresql_command restart"
-reload_cmd="postgresql_command reload"
-status_cmd="postgresql_command status"
-promote_cmd="postgresql_command promote"
-
-initdb_cmd="postgresql_initdb"
-
-su_cmd="/usr/bin/su"
-
-if [ -n "$2" ]; then
-	profile="$2"
-	if [ "x${postgresql_profiles}" != "x" ]; then
-		eval postgresql_data="\${postgresql_${profile}_data:-}"
-		if [ "x${postgresql_data}" = "x" ]; then
-			echo "You must define a data directory (postgresql_${profile}_data)"
-			exit 1
-		fi
-		eval postgresql_enable="\${postgresql_${profile}_enable:-${postgresql_enable}}"
-		eval postgresql_data="\${postgresql_${profile}_data:-${postgresql_data}}"
-		eval postgresql_flags="\${postgresql_${profile}_flags:-${postgresql_flags}}"
-		eval postgresql_initdb_flags="\${postgresql_${profile}_initdb_flags:-${postgresql_initdb_flags}}"
-	fi
-else
-	if [ "x${postgresql_profiles}" != "x" -a "x$1" != "x" ]; then
-		for profile in ${postgresql_profiles}; do
-			eval _enable="\${postgresql_${profile}_enable}"
-			case "x${_enable:-${postgresql_enable}}" in
-			x|x[Nn][Oo]|x[Nn][Oo][Nn][Ee])
-				continue
-				;;
-			x[Yy][Ee][Ss])
-				;;
-			*)
-				if test -z "$_enable"; then
-					_var=postgresql_enable
-				else
-					_var=postgresql_"${profile}"_enable
-				fi
-				echo "Bad value" \
-					"'${_enable:-${postgresql_enable}}'" \
-					"for ${_var}. " \
-					"Profile ${profile} skipped."
-				continue
-				;;
-			esac
-			echo "===> postgresql profile: ${profile}"
-			%%PREFIX%%/etc/rc.d/postgresql $1 ${profile}
-			retcode="$?"
-			if [ "0${retcode}" -ne 0 ]; then
-				failed="${profile} (${retcode}) ${failed:-}"
-			else
-				success="${profile} ${success:-}"
-			fi
-		done
-		exit 0
-	fi
-fi
-
-command_args="-D ${postgresql_data} ${postgresql_flags}"
-
-postgresql_command()
-{
-    ${su_cmd} -l ${postgresql_user} -c "exec ${command} ${command_args} ${rc_arg}"
-}
-
-postgresql_initdb()
-{
-    ${su_cmd} -l -c ${postgresql_login_class} ${postgresql_user} -c "exec %%PREFIX%%/bin/initdb ${postgresql_initdb_flags} -D ${postgresql_data} -U ${postgresql_user}"
-}
-
-run_rc_command "$1"
diff --git a/databases/postgresql96-server/pkg-descr b/databases/postgresql96-server/pkg-descr
deleted file mode 100644
index 1b3c3db53e96..000000000000
--- a/databases/postgresql96-server/pkg-descr
+++ /dev/null
@@ -1,23 +0,0 @@
-PostgreSQL is a sophisticated Object-Relational DBMS, supporting
-almost all SQL constructs, including subselects, transactions, and
-user-defined types and functions. It is the most advanced open-source
-database available anywhere. Commercial Support is also available.
-
-The original Postgres code was the effort of many graduate students,
-undergraduate students, and staff programmers working under the direction of
-Professor Michael Stonebraker at the University of California, Berkeley. In
-1995, Andrew Yu and Jolly Chen took on the task of converting the DBMS query
-language to SQL and created a new database system which came to known as
-Postgres95. Many others contributed to the porting, testing, debugging and
-enhancement of the Postgres95 code. As the code improved, and 1995 faded into
-memory, PostgreSQL was born.
-
-PostgreSQL development is presently being performed by a team of Internet
-developers who are now responsible for all current and future development. The
-development team coordinator is Marc G. Fournier (scrappy@PostgreSQL.ORG).
-Support is available from the PostgreSQL developer/user community through the
-support mailing list (questions@PostgreSQL.ORG).
-
-PostgreSQL is free and the complete source is available.
-
-WWW: https://www.postgresql.org/
diff --git a/databases/postgresql96-server/pkg-install-server b/databases/postgresql96-server/pkg-install-server
deleted file mode 100644
index 07a10b84eaab..000000000000
--- a/databases/postgresql96-server/pkg-install-server
+++ /dev/null
@@ -1,22 +0,0 @@
-#! /bin/sh
-
-PATH=/bin:/usr/bin:/usr/sbin
-
-backupwarning() {
-cat <<EOF
-
-  =========== BACKUP YOUR DATA! =============
-  As always, backup your data before
-  upgrading. If the upgrade leads to a higher
-  minor revision (e.g. 8.3.x -> 8.4), a dump
-  and restore of all databases is
-  required. This is *NOT* done by the port!
-  ===========================================
-EOF
-}
-
-case $2 in
-PRE-INSTALL)
-	backupwarning
-	;;
-esac
diff --git a/databases/postgresql96-server/pkg-plist-client b/databases/postgresql96-server/pkg-plist-client
deleted file mode 100644
index 55aba039917c..000000000000
--- a/databases/postgresql96-server/pkg-plist-client
+++ /dev/null
@@ -1,1051 +0,0 @@
-bin/clusterdb
-bin/createdb
-bin/createlang
-bin/createuser
-bin/dropdb
-bin/droplang
-bin/dropuser
-bin/ecpg
-bin/pg_config
-bin/pg_dump
-bin/pg_dumpall
-bin/pg_isready
-bin/pg_restore
-bin/pgbench
-bin/psql
-bin/reindexdb
-bin/vacuumdb
-include/ecpg_config.h
-include/ecpg_informix.h
-include/ecpgerrno.h
-include/ecpglib.h
-include/ecpgtype.h
-include/libpq-events.h
-include/libpq-fe.h
-include/libpq/libpq-fs.h
-include/pg_config.h
-include/pg_config_ext.h
-include/pg_config_manual.h
-include/pg_config_os.h
-include/pgtypes.h
-include/pgtypes_date.h
-include/pgtypes_error.h
-include/pgtypes_interval.h
-include/pgtypes_numeric.h
-include/pgtypes_timestamp.h
-include/postgres_ext.h
-include/postgresql/informix/esql/datetime.h
-include/postgresql/informix/esql/decimal.h
-include/postgresql/informix/esql/sqltypes.h
-include/postgresql/internal/c.h
-include/postgresql/internal/libpq-int.h
-include/postgresql/internal/libpq/pqcomm.h
-include/postgresql/internal/port.h
-include/postgresql/internal/postgres_fe.h
-include/postgresql/internal/pqexpbuffer.h
-include/postgresql/server/access/amapi.h
-include/postgresql/server/access/amvalidate.h
-include/postgresql/server/access/attnum.h
-include/postgresql/server/access/brin.h
-include/postgresql/server/access/brin_internal.h
-include/postgresql/server/access/brin_page.h
-include/postgresql/server/access/brin_pageops.h
-include/postgresql/server/access/brin_revmap.h
-include/postgresql/server/access/brin_tuple.h
-include/postgresql/server/access/brin_xlog.h
-include/postgresql/server/access/clog.h
-include/postgresql/server/access/commit_ts.h
-include/postgresql/server/access/genam.h
-include/postgresql/server/access/generic_xlog.h
-include/postgresql/server/access/gin.h
-include/postgresql/server/access/gin_private.h
-include/postgresql/server/access/gist.h
-include/postgresql/server/access/gist_private.h
-include/postgresql/server/access/gistscan.h
-include/postgresql/server/access/hash.h
-include/postgresql/server/access/heapam.h
-include/postgresql/server/access/heapam_xlog.h
-include/postgresql/server/access/hio.h
-include/postgresql/server/access/htup.h
-include/postgresql/server/access/htup_details.h
-include/postgresql/server/access/itup.h
-include/postgresql/server/access/multixact.h
-include/postgresql/server/access/nbtree.h
-include/postgresql/server/access/parallel.h
-include/postgresql/server/access/printtup.h
-include/postgresql/server/access/reloptions.h
-include/postgresql/server/access/relscan.h
-include/postgresql/server/access/rewriteheap.h
-include/postgresql/server/access/rmgr.h
-include/postgresql/server/access/rmgrlist.h
-include/postgresql/server/access/sdir.h
-include/postgresql/server/access/skey.h
-include/postgresql/server/access/slru.h
-include/postgresql/server/access/spgist.h
-include/postgresql/server/access/spgist_private.h
-include/postgresql/server/access/stratnum.h
-include/postgresql/server/access/subtrans.h
-include/postgresql/server/access/sysattr.h
-include/postgresql/server/access/timeline.h
-include/postgresql/server/access/transam.h
-include/postgresql/server/access/tsmapi.h
-include/postgresql/server/access/tupconvert.h
-include/postgresql/server/access/tupdesc.h
-include/postgresql/server/access/tupmacs.h
-include/postgresql/server/access/tuptoaster.h
-include/postgresql/server/access/twophase.h
-include/postgresql/server/access/twophase_rmgr.h
-include/postgresql/server/access/valid.h
-include/postgresql/server/access/visibilitymap.h
-include/postgresql/server/access/xact.h
-include/postgresql/server/access/xlog.h
-include/postgresql/server/access/xlog_fn.h
-include/postgresql/server/access/xlog_internal.h
-include/postgresql/server/access/xlogdefs.h
-include/postgresql/server/access/xloginsert.h
-include/postgresql/server/access/xlogreader.h
-include/postgresql/server/access/xlogrecord.h
-include/postgresql/server/access/xlogutils.h
-include/postgresql/server/bootstrap/bootstrap.h
-include/postgresql/server/c.h
-include/postgresql/server/catalog/binary_upgrade.h
-include/postgresql/server/catalog/catalog.h
-include/postgresql/server/catalog/catversion.h
-include/postgresql/server/catalog/dependency.h
-include/postgresql/server/catalog/genbki.h
-include/postgresql/server/catalog/heap.h
-include/postgresql/server/catalog/index.h
-include/postgresql/server/catalog/indexing.h
-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/pg_aggregate.h
-include/postgresql/server/catalog/pg_am.h
-include/postgresql/server/catalog/pg_amop.h
-include/postgresql/server/catalog/pg_amproc.h
-include/postgresql/server/catalog/pg_attrdef.h
-include/postgresql/server/catalog/pg_attribute.h
-include/postgresql/server/catalog/pg_auth_members.h
-include/postgresql/server/catalog/pg_authid.h
-include/postgresql/server/catalog/pg_cast.h
-include/postgresql/server/catalog/pg_class.h
-include/postgresql/server/catalog/pg_collation.h
-include/postgresql/server/catalog/pg_collation_fn.h
-include/postgresql/server/catalog/pg_constraint.h
-include/postgresql/server/catalog/pg_constraint_fn.h
-include/postgresql/server/catalog/pg_control.h
-include/postgresql/server/catalog/pg_conversion.h
-include/postgresql/server/catalog/pg_conversion_fn.h
-include/postgresql/server/catalog/pg_database.h
-include/postgresql/server/catalog/pg_db_role_setting.h
-include/postgresql/server/catalog/pg_default_acl.h
-include/postgresql/server/catalog/pg_depend.h
-include/postgresql/server/catalog/pg_description.h
-include/postgresql/server/catalog/pg_enum.h
-include/postgresql/server/catalog/pg_event_trigger.h
-include/postgresql/server/catalog/pg_extension.h
-include/postgresql/server/catalog/pg_foreign_data_wrapper.h
-include/postgresql/server/catalog/pg_foreign_server.h
-include/postgresql/server/catalog/pg_foreign_table.h
-include/postgresql/server/catalog/pg_index.h
-include/postgresql/server/catalog/pg_inherits.h
-include/postgresql/server/catalog/pg_inherits_fn.h
-include/postgresql/server/catalog/pg_init_privs.h
-include/postgresql/server/catalog/pg_language.h
-include/postgresql/server/catalog/pg_largeobject.h
-include/postgresql/server/catalog/pg_largeobject_metadata.h
-include/postgresql/server/catalog/pg_namespace.h
-include/postgresql/server/catalog/pg_opclass.h
-include/postgresql/server/catalog/pg_operator.h
-include/postgresql/server/catalog/pg_operator_fn.h
-include/postgresql/server/catalog/pg_opfamily.h
-include/postgresql/server/catalog/pg_pltemplate.h
-include/postgresql/server/catalog/pg_policy.h
-include/postgresql/server/catalog/pg_proc.h
-include/postgresql/server/catalog/pg_proc_fn.h
-include/postgresql/server/catalog/pg_range.h
-include/postgresql/server/catalog/pg_replication_origin.h
-include/postgresql/server/catalog/pg_rewrite.h
-include/postgresql/server/catalog/pg_seclabel.h
-include/postgresql/server/catalog/pg_shdepend.h
-include/postgresql/server/catalog/pg_shdescription.h
-include/postgresql/server/catalog/pg_shseclabel.h
-include/postgresql/server/catalog/pg_statistic.h
-include/postgresql/server/catalog/pg_tablespace.h
-include/postgresql/server/catalog/pg_transform.h
-include/postgresql/server/catalog/pg_trigger.h
-include/postgresql/server/catalog/pg_ts_config.h
-include/postgresql/server/catalog/pg_ts_config_map.h
-include/postgresql/server/catalog/pg_ts_dict.h
-include/postgresql/server/catalog/pg_ts_parser.h
-include/postgresql/server/catalog/pg_ts_template.h
-include/postgresql/server/catalog/pg_type.h
-include/postgresql/server/catalog/pg_type_fn.h
-include/postgresql/server/catalog/pg_user_mapping.h
-include/postgresql/server/catalog/schemapg.h
-include/postgresql/server/catalog/storage.h
-include/postgresql/server/catalog/storage_xlog.h
-include/postgresql/server/catalog/toasting.h
-include/postgresql/server/commands/alter.h
-include/postgresql/server/commands/async.h
-include/postgresql/server/commands/cluster.h
-include/postgresql/server/commands/collationcmds.h
-include/postgresql/server/commands/comment.h
-include/postgresql/server/commands/conversioncmds.h
-include/postgresql/server/commands/copy.h
-include/postgresql/server/commands/createas.h
-include/postgresql/server/commands/dbcommands.h
-include/postgresql/server/commands/dbcommands_xlog.h
-include/postgresql/server/commands/defrem.h
-include/postgresql/server/commands/discard.h
-include/postgresql/server/commands/event_trigger.h
-include/postgresql/server/commands/explain.h
-include/postgresql/server/commands/extension.h
-include/postgresql/server/commands/lockcmds.h
-include/postgresql/server/commands/matview.h
-include/postgresql/server/commands/policy.h
-include/postgresql/server/commands/portalcmds.h
-include/postgresql/server/commands/prepare.h
-include/postgresql/server/commands/proclang.h
-include/postgresql/server/commands/progress.h
-include/postgresql/server/commands/schemacmds.h
-include/postgresql/server/commands/seclabel.h
-include/postgresql/server/commands/sequence.h
-include/postgresql/server/commands/tablecmds.h
-include/postgresql/server/commands/tablespace.h
-include/postgresql/server/commands/trigger.h
-include/postgresql/server/commands/typecmds.h
-include/postgresql/server/commands/user.h
-include/postgresql/server/commands/vacuum.h
-include/postgresql/server/commands/variable.h
-include/postgresql/server/commands/view.h
-include/postgresql/server/common/config_info.h
-include/postgresql/server/common/controldata_utils.h
-include/postgresql/server/common/fe_memutils.h
-include/postgresql/server/common/int128.h
-include/postgresql/server/common/keywords.h
-include/postgresql/server/common/pg_lzcompress.h
-include/postgresql/server/common/relpath.h
-include/postgresql/server/common/restricted_token.h
-include/postgresql/server/common/string.h
-include/postgresql/server/common/username.h
-include/postgresql/server/datatype/timestamp.h
-include/postgresql/server/dynloader.h
-include/postgresql/server/executor/execParallel.h
-include/postgresql/server/executor/execdebug.h
-include/postgresql/server/executor/execdesc.h
-include/postgresql/server/executor/executor.h
-include/postgresql/server/executor/functions.h
-include/postgresql/server/executor/hashjoin.h
-include/postgresql/server/executor/instrument.h
-include/postgresql/server/executor/nodeAgg.h
-include/postgresql/server/executor/nodeAppend.h
-include/postgresql/server/executor/nodeBitmapAnd.h
-include/postgresql/server/executor/nodeBitmapHeapscan.h
-include/postgresql/server/executor/nodeBitmapIndexscan.h
-include/postgresql/server/executor/nodeBitmapOr.h
-include/postgresql/server/executor/nodeCtescan.h
-include/postgresql/server/executor/nodeCustom.h
-include/postgresql/server/executor/nodeForeignscan.h
-include/postgresql/server/executor/nodeFunctionscan.h
-include/postgresql/server/executor/nodeGather.h
-include/postgresql/server/executor/nodeGroup.h
-include/postgresql/server/executor/nodeHash.h
-include/postgresql/server/executor/nodeHashjoin.h
-include/postgresql/server/executor/nodeIndexonlyscan.h
-include/postgresql/server/executor/nodeIndexscan.h
-include/postgresql/server/executor/nodeLimit.h
-include/postgresql/server/executor/nodeLockRows.h
-include/postgresql/server/executor/nodeMaterial.h
-include/postgresql/server/executor/nodeMergeAppend.h
-include/postgresql/server/executor/nodeMergejoin.h
-include/postgresql/server/executor/nodeModifyTable.h
-include/postgresql/server/executor/nodeNestloop.h
-include/postgresql/server/executor/nodeRecursiveunion.h
-include/postgresql/server/executor/nodeResult.h
-include/postgresql/server/executor/nodeSamplescan.h
-include/postgresql/server/executor/nodeSeqscan.h
-include/postgresql/server/executor/nodeSetOp.h
-include/postgresql/server/executor/nodeSort.h
-include/postgresql/server/executor/nodeSubplan.h
-include/postgresql/server/executor/nodeSubqueryscan.h
-include/postgresql/server/executor/nodeTidscan.h
-include/postgresql/server/executor/nodeUnique.h
-include/postgresql/server/executor/nodeValuesscan.h
-include/postgresql/server/executor/nodeWindowAgg.h
-include/postgresql/server/executor/nodeWorktablescan.h
-include/postgresql/server/executor/spi.h
-include/postgresql/server/executor/spi_priv.h
-include/postgresql/server/executor/tqueue.h
-include/postgresql/server/executor/tstoreReceiver.h
-include/postgresql/server/executor/tuptable.h
-include/postgresql/server/fe_utils/connect.h
-include/postgresql/server/fe_utils/mbprint.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/simple_list.h
-include/postgresql/server/fe_utils/string_utils.h
-include/postgresql/server/fmgr.h
-include/postgresql/server/foreign/fdwapi.h
-include/postgresql/server/foreign/foreign.h
-include/postgresql/server/funcapi.h
-include/postgresql/server/getaddrinfo.h
-include/postgresql/server/getopt_long.h
-include/postgresql/server/lib/binaryheap.h
-include/postgresql/server/lib/bipartite_match.h
-include/postgresql/server/lib/hyperloglog.h
-include/postgresql/server/lib/ilist.h
-include/postgresql/server/lib/pairingheap.h
-include/postgresql/server/lib/rbtree.h
-include/postgresql/server/lib/stringinfo.h
-include/postgresql/server/libpq/auth.h
-include/postgresql/server/libpq/be-fsstubs.h
-include/postgresql/server/libpq/crypt.h
-include/postgresql/server/libpq/hba.h
-include/postgresql/server/libpq/ip.h
-include/postgresql/server/libpq/libpq-be.h
-include/postgresql/server/libpq/libpq-fs.h
-include/postgresql/server/libpq/libpq.h
-include/postgresql/server/libpq/md5.h
-include/postgresql/server/libpq/pqcomm.h
-include/postgresql/server/libpq/pqformat.h
-include/postgresql/server/libpq/pqmq.h
-include/postgresql/server/libpq/pqsignal.h
-include/postgresql/server/mb/pg_wchar.h
-include/postgresql/server/miscadmin.h
-include/postgresql/server/nodes/bitmapset.h
-include/postgresql/server/nodes/execnodes.h
-include/postgresql/server/nodes/extensible.h
-include/postgresql/server/nodes/lockoptions.h
-include/postgresql/server/nodes/makefuncs.h
-include/postgresql/server/nodes/memnodes.h
-include/postgresql/server/nodes/nodeFuncs.h
-include/postgresql/server/nodes/nodes.h
-include/postgresql/server/nodes/params.h
-include/postgresql/server/nodes/parsenodes.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/tidbitmap.h
-include/postgresql/server/nodes/value.h
-include/postgresql/server/optimizer/clauses.h
-include/postgresql/server/optimizer/cost.h
-include/postgresql/server/optimizer/geqo.h
-include/postgresql/server/optimizer/geqo_copy.h
-include/postgresql/server/optimizer/geqo_gene.h
-include/postgresql/server/optimizer/geqo_misc.h
-include/postgresql/server/optimizer/geqo_mutation.h
-include/postgresql/server/optimizer/geqo_pool.h
-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/joininfo.h
-include/postgresql/server/optimizer/orclauses.h
-include/postgresql/server/optimizer/paramassign.h
-include/postgresql/server/optimizer/pathnode.h
-include/postgresql/server/optimizer/paths.h
-include/postgresql/server/optimizer/placeholder.h
-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/analyze.h
-include/postgresql/server/parser/gram.h
-include/postgresql/server/parser/gramparse.h
-include/postgresql/server/parser/kwlist.h
-include/postgresql/server/parser/parse_agg.h
-include/postgresql/server/parser/parse_clause.h
-include/postgresql/server/parser/parse_coerce.h
-include/postgresql/server/parser/parse_collate.h
-include/postgresql/server/parser/parse_cte.h
-include/postgresql/server/parser/parse_expr.h
-include/postgresql/server/parser/parse_func.h
-include/postgresql/server/parser/parse_node.h
-include/postgresql/server/parser/parse_oper.h
-include/postgresql/server/parser/parse_param.h
-include/postgresql/server/parser/parse_relation.h
-include/postgresql/server/parser/parse_target.h
-include/postgresql/server/parser/parse_type.h
-include/postgresql/server/parser/parse_utilcmd.h
-include/postgresql/server/parser/parser.h
-include/postgresql/server/parser/parsetree.h
-include/postgresql/server/parser/scanner.h
-include/postgresql/server/parser/scansup.h
-include/postgresql/server/pg_config.h
-include/postgresql/server/pg_config_ext.h
-include/postgresql/server/pg_config_manual.h
-include/postgresql/server/pg_config_os.h
-include/postgresql/server/pg_getopt.h
-include/postgresql/server/pg_trace.h
-include/postgresql/server/pgstat.h
-include/postgresql/server/pgtar.h
-include/postgresql/server/pgtime.h
-include/postgresql/server/port.h
-include/postgresql/server/port/aix.h
-include/postgresql/server/port/atomics.h
-include/postgresql/server/port/atomics/arch-arm.h
-include/postgresql/server/port/atomics/arch-hppa.h
-include/postgresql/server/port/atomics/arch-ia64.h
-include/postgresql/server/port/atomics/arch-ppc.h
-include/postgresql/server/port/atomics/arch-x86.h
-include/postgresql/server/port/atomics/fallback.h
-include/postgresql/server/port/atomics/generic-acc.h
-include/postgresql/server/port/atomics/generic-gcc.h
-include/postgresql/server/port/atomics/generic-msvc.h
-include/postgresql/server/port/atomics/generic-sunpro.h
-include/postgresql/server/port/atomics/generic-xlc.h
-include/postgresql/server/port/atomics/generic.h
-include/postgresql/server/port/cygwin.h
-include/postgresql/server/port/darwin.h
-include/postgresql/server/port/freebsd.h
-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_bswap.h
-include/postgresql/server/port/pg_crc32c.h
-include/postgresql/server/port/sco.h
-include/postgresql/server/port/solaris.h
-include/postgresql/server/port/unixware.h
-include/postgresql/server/port/win32.h
-include/postgresql/server/port/win32/arpa/inet.h
-include/postgresql/server/port/win32/dlfcn.h
-include/postgresql/server/port/win32/grp.h
-include/postgresql/server/port/win32/netdb.h
-include/postgresql/server/port/win32/netinet/in.h
-include/postgresql/server/port/win32/pwd.h
-include/postgresql/server/port/win32/sys/socket.h
-include/postgresql/server/port/win32/sys/wait.h
-include/postgresql/server/port/win32_msvc/dirent.h
-include/postgresql/server/port/win32_msvc/sys/file.h
-include/postgresql/server/port/win32_msvc/sys/param.h
-include/postgresql/server/port/win32_msvc/sys/time.h
-include/postgresql/server/port/win32_msvc/unistd.h
-include/postgresql/server/port/win32_msvc/utime.h
-include/postgresql/server/portability/instr_time.h
-include/postgresql/server/portability/mem.h
-include/postgresql/server/postgres.h
-include/postgresql/server/postgres_ext.h
-include/postgresql/server/postgres_fe.h
-include/postgresql/server/postmaster/autovacuum.h
-include/postgresql/server/postmaster/bgworker.h
-include/postgresql/server/postmaster/bgworker_internals.h
-include/postgresql/server/postmaster/bgwriter.h
-include/postgresql/server/postmaster/fork_process.h
-include/postgresql/server/postmaster/pgarch.h
-include/postgresql/server/postmaster/postmaster.h
-include/postgresql/server/postmaster/startup.h
-include/postgresql/server/postmaster/syslogger.h
-include/postgresql/server/postmaster/walwriter.h
-include/postgresql/server/regex/regcustom.h
-include/postgresql/server/regex/regerrs.h
-include/postgresql/server/regex/regex.h
-include/postgresql/server/regex/regexport.h
-include/postgresql/server/regex/regguts.h
-include/postgresql/server/replication/basebackup.h
-include/postgresql/server/replication/decode.h
-include/postgresql/server/replication/logical.h
-include/postgresql/server/replication/logicalfuncs.h
-include/postgresql/server/replication/message.h
-include/postgresql/server/replication/origin.h
-include/postgresql/server/replication/output_plugin.h
-include/postgresql/server/replication/reorderbuffer.h
-include/postgresql/server/replication/slot.h
-include/postgresql/server/replication/snapbuild.h
-include/postgresql/server/replication/syncrep.h
-include/postgresql/server/replication/walreceiver.h
-include/postgresql/server/replication/walsender.h
-include/postgresql/server/replication/walsender_private.h
-include/postgresql/server/rewrite/prs2lock.h
-include/postgresql/server/rewrite/rewriteDefine.h
-include/postgresql/server/rewrite/rewriteHandler.h
-include/postgresql/server/rewrite/rewriteManip.h
-include/postgresql/server/rewrite/rewriteRemove.h
-include/postgresql/server/rewrite/rewriteSupport.h
-include/postgresql/server/rewrite/rowsecurity.h
-include/postgresql/server/rusagestub.h
-include/postgresql/server/snowball/header.h
-include/postgresql/server/snowball/libstemmer/api.h
-include/postgresql/server/snowball/libstemmer/header.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
-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_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_romanian.h
-include/postgresql/server/snowball/libstemmer/stem_KOI8_R_russian.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
-include/postgresql/server/snowball/libstemmer/stem_UTF_8_finnish.h
-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_italian.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
-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_spanish.h
-include/postgresql/server/snowball/libstemmer/stem_UTF_8_swedish.h
-include/postgresql/server/snowball/libstemmer/stem_UTF_8_turkish.h
-include/postgresql/server/storage/backendid.h
-include/postgresql/server/storage/barrier.h
-include/postgresql/server/storage/block.h
-include/postgresql/server/storage/buf.h
-include/postgresql/server/storage/buf_internals.h
-include/postgresql/server/storage/buffile.h
-include/postgresql/server/storage/bufmgr.h
-include/postgresql/server/storage/bufpage.h
-include/postgresql/server/storage/checksum.h
-include/postgresql/server/storage/checksum_impl.h
-include/postgresql/server/storage/copydir.h
-include/postgresql/server/storage/dsm.h
-include/postgresql/server/storage/dsm_impl.h
-include/postgresql/server/storage/fd.h
-include/postgresql/server/storage/freespace.h
-include/postgresql/server/storage/fsm_internals.h
-include/postgresql/server/storage/indexfsm.h
-include/postgresql/server/storage/ipc.h
-include/postgresql/server/storage/item.h
-include/postgresql/server/storage/itemid.h
-include/postgresql/server/storage/itemptr.h
-include/postgresql/server/storage/large_object.h
-include/postgresql/server/storage/latch.h
-include/postgresql/server/storage/lmgr.h
-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/off.h
-include/postgresql/server/storage/pg_sema.h
-include/postgresql/server/storage/pg_shmem.h
-include/postgresql/server/storage/pmsignal.h
-include/postgresql/server/storage/pos.h
-include/postgresql/server/storage/predicate.h
-include/postgresql/server/storage/predicate_internals.h
-include/postgresql/server/storage/proc.h
-include/postgresql/server/storage/procarray.h
-include/postgresql/server/storage/procsignal.h
-include/postgresql/server/storage/reinit.h
-include/postgresql/server/storage/relfilenode.h
-include/postgresql/server/storage/s_lock.h
-include/postgresql/server/storage/shm_mq.h
-include/postgresql/server/storage/shm_toc.h
-include/postgresql/server/storage/shmem.h
-include/postgresql/server/storage/sinval.h
-include/postgresql/server/storage/sinvaladt.h
-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/tcop/deparse_utility.h
-include/postgresql/server/tcop/dest.h
-include/postgresql/server/tcop/fastpath.h
-include/postgresql/server/tcop/pquery.h
-include/postgresql/server/tcop/tcopprot.h
-include/postgresql/server/tcop/utility.h
-include/postgresql/server/tsearch/dicts/regis.h
-include/postgresql/server/tsearch/dicts/spell.h
-include/postgresql/server/tsearch/ts_cache.h
-include/postgresql/server/tsearch/ts_locale.h
-include/postgresql/server/tsearch/ts_public.h
-include/postgresql/server/tsearch/ts_type.h
-include/postgresql/server/tsearch/ts_utils.h
-include/postgresql/server/utils/acl.h
-include/postgresql/server/utils/aclchk_internal.h
-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/builtins.h
-include/postgresql/server/utils/bytea.h
-include/postgresql/server/utils/cash.h
-include/postgresql/server/utils/catcache.h
-include/postgresql/server/utils/combocid.h
-include/postgresql/server/utils/date.h
-include/postgresql/server/utils/datetime.h
-include/postgresql/server/utils/datum.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/fmgroids.h
-include/postgresql/server/utils/fmgrtab.h
-include/postgresql/server/utils/formatting.h
-include/postgresql/server/utils/geo_decls.h
-include/postgresql/server/utils/guc.h
-include/postgresql/server/utils/guc_tables.h
-include/postgresql/server/utils/help_config.h
-include/postgresql/server/utils/hsearch.h
-include/postgresql/server/utils/index_selfuncs.h
-include/postgresql/server/utils/inet.h
-include/postgresql/server/utils/int8.h
-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/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/pg_crc.h
-include/postgresql/server/utils/pg_locale.h
-include/postgresql/server/utils/pg_lsn.h
-include/postgresql/server/utils/pg_rusage.h
-include/postgresql/server/utils/plancache.h
-include/postgresql/server/utils/portal.h
-include/postgresql/server/utils/probes.h
-include/postgresql/server/utils/ps_status.h
-include/postgresql/server/utils/rangetypes.h
-include/postgresql/server/utils/rel.h
-include/postgresql/server/utils/relcache.h
-include/postgresql/server/utils/relfilenodemap.h
-include/postgresql/server/utils/relmapper.h
-include/postgresql/server/utils/reltrigger.h
-include/postgresql/server/utils/resowner.h
-include/postgresql/server/utils/resowner_private.h
-include/postgresql/server/utils/rls.h
-include/postgresql/server/utils/ruleutils.h
-include/postgresql/server/utils/sampling.h
-include/postgresql/server/utils/selfuncs.h
-include/postgresql/server/utils/snapmgr.h
-include/postgresql/server/utils/snapshot.h
-include/postgresql/server/utils/sortsupport.h
-include/postgresql/server/utils/spccache.h
-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
-include/postgresql/server/utils/tzparser.h
-include/postgresql/server/utils/uuid.h
-include/postgresql/server/utils/varbit.h
-include/postgresql/server/utils/xml.h
-include/postgresql/server/windowapi.h
-include/sql3types.h
-include/sqlca.h
-include/sqlda-compat.h
-include/sqlda-native.h
-include/sqlda.h
-lib/libecpg.a
-lib/libecpg.so
-lib/libecpg.so.6
-lib/libecpg_compat.a
-lib/libecpg_compat.so
-lib/libecpg_compat.so.3
-lib/libpgport.a
-lib/libpgtypes.a
-lib/libpgtypes.so
-lib/libpgtypes.so.3
-lib/libpq.a
-lib/libpq.so
-lib/libpq.so.5
-lib/postgresql/pgxs/config/install-sh
-lib/postgresql/pgxs/config/missing
-lib/postgresql/pgxs/src/Makefile.global
-lib/postgresql/pgxs/src/Makefile.port
-lib/postgresql/pgxs/src/Makefile.shlib
-lib/postgresql/pgxs/src/makefiles/pgxs.mk
-lib/postgresql/pgxs/src/nls-global.mk
-lib/postgresql/pgxs/src/test/regress/pg_regress
-libdata/pkgconfig/libecpg.pc
-libdata/pkgconfig/libecpg_compat.pc
-libdata/pkgconfig/libpgtypes.pc
-libdata/pkgconfig/libpq.pc
-man/man1/clusterdb.1.gz
-man/man1/createdb.1.gz
-man/man1/createlang.1.gz
-man/man1/createuser.1.gz
-man/man1/dropdb.1.gz
-man/man1/droplang.1.gz
-man/man1/dropuser.1.gz
-man/man1/ecpg.1.gz
-man/man1/initdb.1.gz
-man/man1/oid2name.1.gz
-man/man1/pg_archivecleanup.1.gz
-man/man1/pg_basebackup.1.gz
-man/man1/pg_config.1.gz
-man/man1/pg_controldata.1.gz
-man/man1/pg_ctl.1.gz
-man/man1/pg_dump.1.gz
-man/man1/pg_dumpall.1.gz
-man/man1/pg_isready.1.gz
-man/man1/pg_receivexlog.1.gz
-man/man1/pg_recvlogical.1.gz
-man/man1/pg_resetxlog.1.gz
-man/man1/pg_restore.1.gz
-man/man1/pg_rewind.1.gz
-man/man1/pg_standby.1.gz
-man/man1/pg_test_fsync.1.gz
-man/man1/pg_test_timing.1.gz
-man/man1/pg_upgrade.1.gz
-man/man1/pg_xlogdump.1.gz
-man/man1/pgbench.1.gz
-man/man1/postgres.1.gz
-man/man1/postmaster.1.gz
-man/man1/psql.1.gz
-man/man1/reindexdb.1.gz
-man/man1/vacuumdb.1.gz
-man/man1/vacuumlo.1.gz
-man/man3/SPI_connect.3.gz
-man/man3/SPI_copytuple.3.gz
-man/man3/SPI_cursor_close.3.gz
-man/man3/SPI_cursor_fetch.3.gz
-man/man3/SPI_cursor_find.3.gz
-man/man3/SPI_cursor_move.3.gz
-man/man3/SPI_cursor_open.3.gz
-man/man3/SPI_cursor_open_with_args.3.gz
-man/man3/SPI_cursor_open_with_paramlist.3.gz
-man/man3/SPI_exec.3.gz
-man/man3/SPI_execp.3.gz
-man/man3/SPI_execute.3.gz
-man/man3/SPI_execute_plan.3.gz
-man/man3/SPI_execute_plan_with_paramlist.3.gz
-man/man3/SPI_execute_with_args.3.gz
-man/man3/SPI_finish.3.gz
-man/man3/SPI_fname.3.gz
-man/man3/SPI_fnumber.3.gz
-man/man3/SPI_freeplan.3.gz
-man/man3/SPI_freetuple.3.gz
-man/man3/SPI_freetuptable.3.gz
-man/man3/SPI_getargcount.3.gz
-man/man3/SPI_getargtypeid.3.gz
-man/man3/SPI_getbinval.3.gz
-man/man3/SPI_getnspname.3.gz
-man/man3/SPI_getrelname.3.gz
-man/man3/SPI_gettype.3.gz
-man/man3/SPI_gettypeid.3.gz
-man/man3/SPI_getvalue.3.gz
-man/man3/SPI_is_cursor_plan.3.gz
-man/man3/SPI_keepplan.3.gz
-man/man3/SPI_modifytuple.3.gz
-man/man3/SPI_palloc.3.gz
-man/man3/SPI_pfree.3.gz
-man/man3/SPI_pop.3.gz
-man/man3/SPI_prepare.3.gz
-man/man3/SPI_prepare_cursor.3.gz
-man/man3/SPI_prepare_params.3.gz
-man/man3/SPI_push.3.gz
-man/man3/SPI_repalloc.3.gz
-man/man3/SPI_returntuple.3.gz
-man/man3/SPI_saveplan.3.gz
-man/man3/SPI_scroll_cursor_fetch.3.gz
-man/man3/SPI_scroll_cursor_move.3.gz
-man/man3/dblink.3.gz
-man/man3/dblink_build_sql_delete.3.gz
-man/man3/dblink_build_sql_insert.3.gz
-man/man3/dblink_build_sql_update.3.gz
-man/man3/dblink_cancel_query.3.gz
-man/man3/dblink_close.3.gz
-man/man3/dblink_connect.3.gz
-man/man3/dblink_connect_u.3.gz
-man/man3/dblink_disconnect.3.gz
-man/man3/dblink_error_message.3.gz
-man/man3/dblink_exec.3.gz
-man/man3/dblink_fetch.3.gz
-man/man3/dblink_get_connections.3.gz
-man/man3/dblink_get_notify.3.gz
-man/man3/dblink_get_pkey.3.gz
-man/man3/dblink_get_result.3.gz
-man/man3/dblink_is_busy.3.gz
-man/man3/dblink_open.3.gz
-man/man3/dblink_send_query.3.gz
-man/man7/ABORT.7.gz
-man/man7/ALTER_AGGREGATE.7.gz
-man/man7/ALTER_COLLATION.7.gz
-man/man7/ALTER_CONVERSION.7.gz
-man/man7/ALTER_DATABASE.7.gz
-man/man7/ALTER_DEFAULT_PRIVILEGES.7.gz
-man/man7/ALTER_DOMAIN.7.gz
-man/man7/ALTER_EVENT_TRIGGER.7.gz
-man/man7/ALTER_EXTENSION.7.gz
-man/man7/ALTER_FOREIGN_DATA_WRAPPER.7.gz
-man/man7/ALTER_FOREIGN_TABLE.7.gz
-man/man7/ALTER_FUNCTION.7.gz
-man/man7/ALTER_GROUP.7.gz
-man/man7/ALTER_INDEX.7.gz
-man/man7/ALTER_LANGUAGE.7.gz
-man/man7/ALTER_LARGE_OBJECT.7.gz
-man/man7/ALTER_MATERIALIZED_VIEW.7.gz
-man/man7/ALTER_OPERATOR.7.gz
-man/man7/ALTER_OPERATOR_CLASS.7.gz
-man/man7/ALTER_OPERATOR_FAMILY.7.gz
-man/man7/ALTER_POLICY.7.gz
-man/man7/ALTER_ROLE.7.gz
-man/man7/ALTER_RULE.7.gz
-man/man7/ALTER_SCHEMA.7.gz
-man/man7/ALTER_SEQUENCE.7.gz
-man/man7/ALTER_SERVER.7.gz
-man/man7/ALTER_SYSTEM.7.gz
-man/man7/ALTER_TABLE.7.gz
-man/man7/ALTER_TABLESPACE.7.gz
-man/man7/ALTER_TEXT_SEARCH_CONFIGURATION.7.gz
-man/man7/ALTER_TEXT_SEARCH_DICTIONARY.7.gz
-man/man7/ALTER_TEXT_SEARCH_PARSER.7.gz
-man/man7/ALTER_TEXT_SEARCH_TEMPLATE.7.gz
-man/man7/ALTER_TRIGGER.7.gz
-man/man7/ALTER_TYPE.7.gz
-man/man7/ALTER_USER.7.gz
-man/man7/ALTER_USER_MAPPING.7.gz
-man/man7/ALTER_VIEW.7.gz
-man/man7/ANALYZE.7.gz
-man/man7/BEGIN.7.gz
-man/man7/CHECKPOINT.7.gz
-man/man7/CLOSE.7.gz
-man/man7/CLUSTER.7.gz
-man/man7/COMMENT.7.gz
-man/man7/COMMIT.7.gz
-man/man7/COMMIT_PREPARED.7.gz
-man/man7/COPY.7.gz
-man/man7/CREATE_ACCESS_METHOD.7.gz
-man/man7/CREATE_AGGREGATE.7.gz
-man/man7/CREATE_CAST.7.gz
-man/man7/CREATE_COLLATION.7.gz
-man/man7/CREATE_CONVERSION.7.gz
-man/man7/CREATE_DATABASE.7.gz
-man/man7/CREATE_DOMAIN.7.gz
-man/man7/CREATE_EVENT_TRIGGER.7.gz
-man/man7/CREATE_EXTENSION.7.gz
-man/man7/CREATE_FOREIGN_DATA_WRAPPER.7.gz
-man/man7/CREATE_FOREIGN_TABLE.7.gz
-man/man7/CREATE_FUNCTION.7.gz
-man/man7/CREATE_GROUP.7.gz
-man/man7/CREATE_INDEX.7.gz
-man/man7/CREATE_LANGUAGE.7.gz
-man/man7/CREATE_MATERIALIZED_VIEW.7.gz
-man/man7/CREATE_OPERATOR.7.gz
-man/man7/CREATE_OPERATOR_CLASS.7.gz
-man/man7/CREATE_OPERATOR_FAMILY.7.gz
-man/man7/CREATE_POLICY.7.gz
-man/man7/CREATE_ROLE.7.gz
-man/man7/CREATE_RULE.7.gz
-man/man7/CREATE_SCHEMA.7.gz
-man/man7/CREATE_SEQUENCE.7.gz
-man/man7/CREATE_SERVER.7.gz
-man/man7/CREATE_TABLE.7.gz
-man/man7/CREATE_TABLESPACE.7.gz
-man/man7/CREATE_TABLE_AS.7.gz
-man/man7/CREATE_TEXT_SEARCH_CONFIGURATION.7.gz
-man/man7/CREATE_TEXT_SEARCH_DICTIONARY.7.gz
-man/man7/CREATE_TEXT_SEARCH_PARSER.7.gz
-man/man7/CREATE_TEXT_SEARCH_TEMPLATE.7.gz
-man/man7/CREATE_TRANSFORM.7.gz
-man/man7/CREATE_TRIGGER.7.gz
-man/man7/CREATE_TYPE.7.gz
-man/man7/CREATE_USER.7.gz
-man/man7/CREATE_USER_MAPPING.7.gz
-man/man7/CREATE_VIEW.7.gz
-man/man7/DEALLOCATE.7.gz
-man/man7/DECLARE.7.gz
-man/man7/DELETE.7.gz
-man/man7/DISCARD.7.gz
-man/man7/DO.7.gz
-man/man7/DROP_ACCESS_METHOD.7.gz
-man/man7/DROP_AGGREGATE.7.gz
-man/man7/DROP_CAST.7.gz
-man/man7/DROP_COLLATION.7.gz
-man/man7/DROP_CONVERSION.7.gz
-man/man7/DROP_DATABASE.7.gz
-man/man7/DROP_DOMAIN.7.gz
-man/man7/DROP_EVENT_TRIGGER.7.gz
-man/man7/DROP_EXTENSION.7.gz
-man/man7/DROP_FOREIGN_DATA_WRAPPER.7.gz
-man/man7/DROP_FOREIGN_TABLE.7.gz
-man/man7/DROP_FUNCTION.7.gz
-man/man7/DROP_GROUP.7.gz
-man/man7/DROP_INDEX.7.gz
-man/man7/DROP_LANGUAGE.7.gz
-man/man7/DROP_MATERIALIZED_VIEW.7.gz
-man/man7/DROP_OPERATOR.7.gz
-man/man7/DROP_OPERATOR_CLASS.7.gz
-man/man7/DROP_OPERATOR_FAMILY.7.gz
-man/man7/DROP_OWNED.7.gz
-man/man7/DROP_POLICY.7.gz
-man/man7/DROP_ROLE.7.gz
-man/man7/DROP_RULE.7.gz
-man/man7/DROP_SCHEMA.7.gz
-man/man7/DROP_SEQUENCE.7.gz
-man/man7/DROP_SERVER.7.gz
-man/man7/DROP_TABLE.7.gz
-man/man7/DROP_TABLESPACE.7.gz
-man/man7/DROP_TEXT_SEARCH_CONFIGURATION.7.gz
-man/man7/DROP_TEXT_SEARCH_DICTIONARY.7.gz
-man/man7/DROP_TEXT_SEARCH_PARSER.7.gz
-man/man7/DROP_TEXT_SEARCH_TEMPLATE.7.gz
-man/man7/DROP_TRANSFORM.7.gz
-man/man7/DROP_TRIGGER.7.gz
-man/man7/DROP_TYPE.7.gz
-man/man7/DROP_USER.7.gz
-man/man7/DROP_USER_MAPPING.7.gz
-man/man7/DROP_VIEW.7.gz
-man/man7/END.7.gz
-man/man7/EXECUTE.7.gz
-man/man7/EXPLAIN.7.gz
-man/man7/FETCH.7.gz
-man/man7/GRANT.7.gz
-man/man7/IMPORT_FOREIGN_SCHEMA.7.gz
-man/man7/INSERT.7.gz
-man/man7/LISTEN.7.gz
-man/man7/LOAD.7.gz
-man/man7/LOCK.7.gz
-man/man7/MOVE.7.gz
-man/man7/NOTIFY.7.gz
-man/man7/PREPARE.7.gz
-man/man7/PREPARE_TRANSACTION.7.gz
-man/man7/REASSIGN_OWNED.7.gz
-man/man7/REFRESH_MATERIALIZED_VIEW.7.gz
-man/man7/REINDEX.7.gz
-man/man7/RELEASE_SAVEPOINT.7.gz
-man/man7/RESET.7.gz
-man/man7/REVOKE.7.gz
-man/man7/ROLLBACK.7.gz
-man/man7/ROLLBACK_PREPARED.7.gz
-man/man7/ROLLBACK_TO_SAVEPOINT.7.gz
-man/man7/SAVEPOINT.7.gz
-man/man7/SECURITY_LABEL.7.gz
-man/man7/SELECT.7.gz
-man/man7/SELECT_INTO.7.gz
-man/man7/SET.7.gz
-man/man7/SET_CONSTRAINTS.7.gz
-man/man7/SET_ROLE.7.gz
-man/man7/SET_SESSION_AUTHORIZATION.7.gz
-man/man7/SET_TRANSACTION.7.gz
-man/man7/SHOW.7.gz
-man/man7/START_TRANSACTION.7.gz
-man/man7/TABLE.7.gz
-man/man7/TRUNCATE.7.gz
-man/man7/UNLISTEN.7.gz
-man/man7/UPDATE.7.gz
-man/man7/VACUUM.7.gz
-man/man7/VALUES.7.gz
-man/man7/WITH.7.gz
-%%PORTDOCS%%%%DOCSDIR%%/README-client
-%%NLS%%share/locale/cs/LC_MESSAGES/ecpg-9.6.mo
-%%NLS%%share/locale/cs/LC_MESSAGES/ecpglib6-9.6.mo
-%%NLS%%share/locale/cs/LC_MESSAGES/libpq5-9.6.mo
-%%NLS%%share/locale/cs/LC_MESSAGES/pg_config-9.6.mo
-%%NLS%%share/locale/cs/LC_MESSAGES/pg_dump-9.6.mo
-%%NLS%%share/locale/cs/LC_MESSAGES/pgscripts-9.6.mo
-%%NLS%%share/locale/cs/LC_MESSAGES/psql-9.6.mo
-%%NLS%%share/locale/de/LC_MESSAGES/ecpg-9.6.mo
-%%NLS%%share/locale/de/LC_MESSAGES/ecpglib6-9.6.mo
-%%NLS%%share/locale/de/LC_MESSAGES/libpq5-9.6.mo
-%%NLS%%share/locale/de/LC_MESSAGES/pg_config-9.6.mo
-%%NLS%%share/locale/de/LC_MESSAGES/pg_dump-9.6.mo
-%%NLS%%share/locale/de/LC_MESSAGES/pgscripts-9.6.mo
-%%NLS%%share/locale/de/LC_MESSAGES/psql-9.6.mo
-%%NLS%%share/locale/es/LC_MESSAGES/ecpg-9.6.mo
-%%NLS%%share/locale/es/LC_MESSAGES/ecpglib6-9.6.mo
-%%NLS%%share/locale/es/LC_MESSAGES/libpq5-9.6.mo
-%%NLS%%share/locale/es/LC_MESSAGES/pg_config-9.6.mo
-%%NLS%%share/locale/es/LC_MESSAGES/pg_dump-9.6.mo
-%%NLS%%share/locale/es/LC_MESSAGES/pgscripts-9.6.mo
-%%NLS%%share/locale/es/LC_MESSAGES/psql-9.6.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/ecpg-9.6.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/ecpglib6-9.6.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/libpq5-9.6.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/pg_config-9.6.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/pg_dump-9.6.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/pgscripts-9.6.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/psql-9.6.mo
-%%NLS%%share/locale/it/LC_MESSAGES/ecpg-9.6.mo
-%%NLS%%share/locale/it/LC_MESSAGES/ecpglib6-9.6.mo
-%%NLS%%share/locale/it/LC_MESSAGES/libpq5-9.6.mo
-%%NLS%%share/locale/it/LC_MESSAGES/pg_config-9.6.mo
-%%NLS%%share/locale/it/LC_MESSAGES/pg_dump-9.6.mo
-%%NLS%%share/locale/it/LC_MESSAGES/pgscripts-9.6.mo
-%%NLS%%share/locale/it/LC_MESSAGES/psql-9.6.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/ecpg-9.6.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/ecpglib6-9.6.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/libpq5-9.6.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/pg_config-9.6.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/pg_dump-9.6.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/pgscripts-9.6.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/psql-9.6.mo
-%%NLS%%share/locale/ko/LC_MESSAGES/ecpg-9.6.mo
-%%NLS%%share/locale/ko/LC_MESSAGES/ecpglib6-9.6.mo
-%%NLS%%share/locale/ko/LC_MESSAGES/libpq5-9.6.mo
-%%NLS%%share/locale/ko/LC_MESSAGES/pg_config-9.6.mo
-%%NLS%%share/locale/ko/LC_MESSAGES/pg_dump-9.6.mo
-%%NLS%%share/locale/ko/LC_MESSAGES/pgscripts-9.6.mo
-%%NLS%%share/locale/ko/LC_MESSAGES/psql-9.6.mo
-%%NLS%%share/locale/nb/LC_MESSAGES/pg_config-9.6.mo
-%%NLS%%share/locale/pl/LC_MESSAGES/ecpg-9.6.mo
-%%NLS%%share/locale/pl/LC_MESSAGES/ecpglib6-9.6.mo
-%%NLS%%share/locale/pl/LC_MESSAGES/libpq5-9.6.mo
-%%NLS%%share/locale/pl/LC_MESSAGES/pg_config-9.6.mo
-%%NLS%%share/locale/pl/LC_MESSAGES/pg_dump-9.6.mo
-%%NLS%%share/locale/pl/LC_MESSAGES/pgscripts-9.6.mo
-%%NLS%%share/locale/pl/LC_MESSAGES/psql-9.6.mo
-%%NLS%%share/locale/pt_BR/LC_MESSAGES/ecpg-9.6.mo
-%%NLS%%share/locale/pt_BR/LC_MESSAGES/ecpglib6-9.6.mo
-%%NLS%%share/locale/pt_BR/LC_MESSAGES/libpq5-9.6.mo
-%%NLS%%share/locale/pt_BR/LC_MESSAGES/pg_config-9.6.mo
-%%NLS%%share/locale/pt_BR/LC_MESSAGES/pg_dump-9.6.mo
-%%NLS%%share/locale/pt_BR/LC_MESSAGES/pgscripts-9.6.mo
-%%NLS%%share/locale/pt_BR/LC_MESSAGES/psql-9.6.mo
-%%NLS%%share/locale/ro/LC_MESSAGES/pg_config-9.6.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/ecpg-9.6.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/ecpglib6-9.6.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/libpq5-9.6.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/pg_config-9.6.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/pg_dump-9.6.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/pgscripts-9.6.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/psql-9.6.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/ecpg-9.6.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/ecpglib6-9.6.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/libpq5-9.6.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/pg_config-9.6.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/pg_dump-9.6.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/pgscripts-9.6.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/psql-9.6.mo
-%%NLS%%share/locale/ta/LC_MESSAGES/pg_config-9.6.mo
-%%NLS%%share/locale/tr/LC_MESSAGES/ecpg-9.6.mo
-%%NLS%%share/locale/tr/LC_MESSAGES/ecpglib6-9.6.mo
-%%NLS%%share/locale/tr/LC_MESSAGES/libpq5-9.6.mo
-%%NLS%%share/locale/tr/LC_MESSAGES/pg_config-9.6.mo
-%%NLS%%share/locale/tr/LC_MESSAGES/pg_dump-9.6.mo
-%%NLS%%share/locale/tr/LC_MESSAGES/pgscripts-9.6.mo
-%%NLS%%share/locale/tr/LC_MESSAGES/psql-9.6.mo
-%%NLS%%share/locale/zh_CN/LC_MESSAGES/ecpg-9.6.mo
-%%NLS%%share/locale/zh_CN/LC_MESSAGES/ecpglib6-9.6.mo
-%%NLS%%share/locale/zh_CN/LC_MESSAGES/libpq5-9.6.mo
-%%NLS%%share/locale/zh_CN/LC_MESSAGES/pg_config-9.6.mo
-%%NLS%%share/locale/zh_CN/LC_MESSAGES/pg_dump-9.6.mo
-%%NLS%%share/locale/zh_CN/LC_MESSAGES/pgscripts-9.6.mo
-%%NLS%%share/locale/zh_CN/LC_MESSAGES/psql-9.6.mo
-%%NLS%%share/locale/zh_TW/LC_MESSAGES/ecpg-9.6.mo
-%%NLS%%share/locale/zh_TW/LC_MESSAGES/libpq5-9.6.mo
-%%NLS%%share/locale/zh_TW/LC_MESSAGES/pg_config-9.6.mo
-%%NLS%%share/locale/zh_TW/LC_MESSAGES/psql-9.6.mo
-%%DATADIR%%/pg_service.conf.sample
-%%DATADIR%%/psqlrc.sample
-
diff --git a/databases/postgresql96-server/pkg-plist-contrib b/databases/postgresql96-server/pkg-plist-contrib
deleted file mode 100644
index d3763be7b720..000000000000
--- a/databases/postgresql96-server/pkg-plist-contrib
+++ /dev/null
@@ -1,241 +0,0 @@
-bin/oid2name
-bin/pg_standby
-bin/vacuumlo
-lib/postgresql/_int.so
-lib/postgresql/adminpack.so
-lib/postgresql/auth_delay.so
-lib/postgresql/auto_explain.so
-lib/postgresql/autoinc.so
-lib/postgresql/bloom.so
-lib/postgresql/btree_gin.so
-lib/postgresql/btree_gist.so
-lib/postgresql/chkpass.so
-lib/postgresql/citext.so
-lib/postgresql/cube.so
-lib/postgresql/dblink.so
-lib/postgresql/dict_int.so
-lib/postgresql/dict_xsyn.so
-lib/postgresql/earthdistance.so
-lib/postgresql/file_fdw.so
-lib/postgresql/fuzzystrmatch.so
-lib/postgresql/hstore.so
-lib/postgresql/insert_username.so
-lib/postgresql/isn.so
-lib/postgresql/lo.so
-lib/postgresql/ltree.so
-lib/postgresql/moddatetime.so
-lib/postgresql/pageinspect.so
-lib/postgresql/passwordcheck.so
-lib/postgresql/pg_buffercache.so
-lib/postgresql/pg_freespacemap.so
-lib/postgresql/pg_prewarm.so
-lib/postgresql/pg_stat_statements.so
-lib/postgresql/pg_trgm.so
-lib/postgresql/pg_visibility.so
-lib/postgresql/pgcrypto.so
-lib/postgresql/pgrowlocks.so
-lib/postgresql/pgstattuple.so
-%%XML%%lib/postgresql/pgxml.so
-lib/postgresql/postgres_fdw.so
-lib/postgresql/refint.so
-lib/postgresql/seg.so
-lib/postgresql/sslinfo.so
-lib/postgresql/tablefunc.so
-lib/postgresql/tcn.so
-lib/postgresql/test_decoding.so
-lib/postgresql/timetravel.so
-lib/postgresql/tsearch2.so
-lib/postgresql/tsm_system_rows.so
-lib/postgresql/tsm_system_time.so
-lib/postgresql/unaccent.so
-lib/postgresql/uuid-ossp.so
-%%PORTDOCS%%%%DOCSDIR%%/README-contrib
-%%PORTDOCS%%%%DOCSDIR%%/extension/README
-%%PORTDOCS%%%%DOCSDIR%%/extension/autoinc.example
-%%PORTDOCS%%%%DOCSDIR%%/extension/insert_username.example
-%%PORTDOCS%%%%DOCSDIR%%/extension/moddatetime.example
-%%PORTDOCS%%%%DOCSDIR%%/extension/refint.example
-%%PORTDOCS%%%%DOCSDIR%%/extension/timetravel.example
-%%DATADIR%%/extension/adminpack--1.0--1.1.sql
-%%DATADIR%%/extension/adminpack--1.0.sql
-%%DATADIR%%/extension/adminpack--1.1.sql
-%%DATADIR%%/extension/adminpack.control
-%%DATADIR%%/extension/autoinc--1.0.sql
-%%DATADIR%%/extension/autoinc--unpackaged--1.0.sql
-%%DATADIR%%/extension/autoinc.control
-%%DATADIR%%/extension/bloom--1.0.sql
-%%DATADIR%%/extension/bloom.control
-%%DATADIR%%/extension/btree_gin--1.0.sql
-%%DATADIR%%/extension/btree_gin--unpackaged--1.0.sql
-%%DATADIR%%/extension/btree_gin.control
-%%DATADIR%%/extension/btree_gist--1.0--1.1.sql
-%%DATADIR%%/extension/btree_gist--1.1--1.2.sql
-%%DATADIR%%/extension/btree_gist--1.2.sql
-%%DATADIR%%/extension/btree_gist--unpackaged--1.0.sql
-%%DATADIR%%/extension/btree_gist.control
-%%DATADIR%%/extension/chkpass--1.0.sql
-%%DATADIR%%/extension/chkpass--unpackaged--1.0.sql
-%%DATADIR%%/extension/chkpass.control
-%%DATADIR%%/extension/citext--1.0--1.1.sql
-%%DATADIR%%/extension/citext--1.1--1.2.sql
-%%DATADIR%%/extension/citext--1.2--1.3.sql
-%%DATADIR%%/extension/citext--1.3.sql
-%%DATADIR%%/extension/citext--unpackaged--1.0.sql
-%%DATADIR%%/extension/citext.control
-%%DATADIR%%/extension/cube--1.0--1.1.sql
-%%DATADIR%%/extension/cube--1.1--1.2.sql
-%%DATADIR%%/extension/cube--1.2.sql
-%%DATADIR%%/extension/cube--unpackaged--1.0.sql
-%%DATADIR%%/extension/cube.control
-%%DATADIR%%/extension/dblink--1.0--1.1.sql
-%%DATADIR%%/extension/dblink--1.1--1.2.sql
-%%DATADIR%%/extension/dblink--1.2.sql
-%%DATADIR%%/extension/dblink--unpackaged--1.0.sql
-%%DATADIR%%/extension/dblink.control
-%%DATADIR%%/extension/dict_int--1.0.sql
-%%DATADIR%%/extension/dict_int--unpackaged--1.0.sql
-%%DATADIR%%/extension/dict_int.control
-%%DATADIR%%/extension/dict_xsyn--1.0.sql
-%%DATADIR%%/extension/dict_xsyn--unpackaged--1.0.sql
-%%DATADIR%%/extension/dict_xsyn.control
-%%DATADIR%%/extension/earthdistance--1.0--1.1.sql
-%%DATADIR%%/extension/earthdistance--1.1.sql
-%%DATADIR%%/extension/earthdistance--unpackaged--1.0.sql
-%%DATADIR%%/extension/earthdistance.control
-%%DATADIR%%/extension/file_fdw--1.0.sql
-%%DATADIR%%/extension/file_fdw.control
-%%DATADIR%%/extension/fuzzystrmatch--1.0--1.1.sql
-%%DATADIR%%/extension/fuzzystrmatch--1.1.sql
-%%DATADIR%%/extension/fuzzystrmatch--unpackaged--1.0.sql
-%%DATADIR%%/extension/fuzzystrmatch.control
-%%DATADIR%%/extension/hstore--1.0--1.1.sql
-%%DATADIR%%/extension/hstore--1.1--1.2.sql
-%%DATADIR%%/extension/hstore--1.2--1.3.sql
-%%DATADIR%%/extension/hstore--1.3--1.4.sql
-%%DATADIR%%/extension/hstore--1.4.sql
-%%DATADIR%%/extension/hstore--unpackaged--1.0.sql
-%%DATADIR%%/extension/hstore.control
-%%DATADIR%%/extension/insert_username--1.0.sql
-%%DATADIR%%/extension/insert_username--unpackaged--1.0.sql
-%%DATADIR%%/extension/insert_username.control
-%%DATADIR%%/extension/intagg--1.0--1.1.sql
-%%DATADIR%%/extension/intagg--1.1.sql
-%%DATADIR%%/extension/intagg--unpackaged--1.0.sql
-%%DATADIR%%/extension/intagg.control
-%%DATADIR%%/extension/intarray--1.0--1.1.sql
-%%DATADIR%%/extension/intarray--1.1--1.2.sql
-%%DATADIR%%/extension/intarray--1.2.sql
-%%DATADIR%%/extension/intarray--unpackaged--1.0.sql
-%%DATADIR%%/extension/intarray.control
-%%DATADIR%%/extension/isn--1.0--1.1.sql
-%%DATADIR%%/extension/isn--1.1.sql
-%%DATADIR%%/extension/isn--unpackaged--1.0.sql
-%%DATADIR%%/extension/isn.control
-%%DATADIR%%/extension/lo--1.0--1.1.sql
-%%DATADIR%%/extension/lo--1.1.sql
-%%DATADIR%%/extension/lo--unpackaged--1.0.sql
-%%DATADIR%%/extension/lo.control
-%%DATADIR%%/extension/ltree--1.0--1.1.sql
-%%DATADIR%%/extension/ltree--1.1.sql
-%%DATADIR%%/extension/ltree--unpackaged--1.0.sql
-%%DATADIR%%/extension/ltree.control
-%%DATADIR%%/extension/moddatetime--1.0.sql
-%%DATADIR%%/extension/moddatetime--unpackaged--1.0.sql
-%%DATADIR%%/extension/moddatetime.control
-%%DATADIR%%/extension/pageinspect--1.0--1.1.sql
-%%DATADIR%%/extension/pageinspect--1.1--1.2.sql
-%%DATADIR%%/extension/pageinspect--1.2--1.3.sql
-%%DATADIR%%/extension/pageinspect--1.3--1.4.sql
-%%DATADIR%%/extension/pageinspect--1.4--1.5.sql
-%%DATADIR%%/extension/pageinspect--1.5.sql
-%%DATADIR%%/extension/pageinspect--unpackaged--1.0.sql
-%%DATADIR%%/extension/pageinspect.control
-%%DATADIR%%/extension/pg_buffercache--1.0--1.1.sql
-%%DATADIR%%/extension/pg_buffercache--1.1--1.2.sql
-%%DATADIR%%/extension/pg_buffercache--1.2.sql
-%%DATADIR%%/extension/pg_buffercache--unpackaged--1.0.sql
-%%DATADIR%%/extension/pg_buffercache.control
-%%DATADIR%%/extension/pg_freespacemap--1.0--1.1.sql
-%%DATADIR%%/extension/pg_freespacemap--1.1.sql
-%%DATADIR%%/extension/pg_freespacemap--unpackaged--1.0.sql
-%%DATADIR%%/extension/pg_freespacemap.control
-%%DATADIR%%/extension/pg_prewarm--1.0--1.1.sql
-%%DATADIR%%/extension/pg_prewarm--1.1.sql
-%%DATADIR%%/extension/pg_prewarm.control
-%%DATADIR%%/extension/pg_stat_statements--1.0--1.1.sql
-%%DATADIR%%/extension/pg_stat_statements--1.1--1.2.sql
-%%DATADIR%%/extension/pg_stat_statements--1.2--1.3.sql
-%%DATADIR%%/extension/pg_stat_statements--1.3--1.4.sql
-%%DATADIR%%/extension/pg_stat_statements--1.4.sql
-%%DATADIR%%/extension/pg_stat_statements--unpackaged--1.0.sql
-%%DATADIR%%/extension/pg_stat_statements.control
-%%DATADIR%%/extension/pg_trgm--1.0--1.1.sql
-%%DATADIR%%/extension/pg_trgm--1.1--1.2.sql
-%%DATADIR%%/extension/pg_trgm--1.2--1.3.sql
-%%DATADIR%%/extension/pg_trgm--1.3.sql
-%%DATADIR%%/extension/pg_trgm--unpackaged--1.0.sql
-%%DATADIR%%/extension/pg_trgm.control
-%%DATADIR%%/extension/pg_visibility--1.0--1.1.sql
-%%DATADIR%%/extension/pg_visibility--1.1.sql
-%%DATADIR%%/extension/pg_visibility.control
-%%DATADIR%%/extension/pgcrypto--1.0--1.1.sql
-%%DATADIR%%/extension/pgcrypto--1.1--1.2.sql
-%%DATADIR%%/extension/pgcrypto--1.2--1.3.sql
-%%DATADIR%%/extension/pgcrypto--1.3.sql
-%%DATADIR%%/extension/pgcrypto--unpackaged--1.0.sql
-%%DATADIR%%/extension/pgcrypto.control
-%%DATADIR%%/extension/pgrowlocks--1.0--1.1.sql
-%%DATADIR%%/extension/pgrowlocks--1.1--1.2.sql
-%%DATADIR%%/extension/pgrowlocks--1.2.sql
-%%DATADIR%%/extension/pgrowlocks--unpackaged--1.0.sql
-%%DATADIR%%/extension/pgrowlocks.control
-%%DATADIR%%/extension/pgstattuple--1.0--1.1.sql
-%%DATADIR%%/extension/pgstattuple--1.1--1.2.sql
-%%DATADIR%%/extension/pgstattuple--1.2--1.3.sql
-%%DATADIR%%/extension/pgstattuple--1.3--1.4.sql
-%%DATADIR%%/extension/pgstattuple--1.4.sql
-%%DATADIR%%/extension/pgstattuple--unpackaged--1.0.sql
-%%DATADIR%%/extension/pgstattuple.control
-%%DATADIR%%/extension/postgres_fdw--1.0.sql
-%%DATADIR%%/extension/postgres_fdw.control
-%%DATADIR%%/extension/refint--1.0.sql
-%%DATADIR%%/extension/refint--unpackaged--1.0.sql
-%%DATADIR%%/extension/refint.control
-%%DATADIR%%/extension/seg--1.0--1.1.sql
-%%DATADIR%%/extension/seg--1.1.sql
-%%DATADIR%%/extension/seg--unpackaged--1.0.sql
-%%DATADIR%%/extension/seg.control
-%%DATADIR%%/extension/sslinfo--1.0--1.1.sql
-%%DATADIR%%/extension/sslinfo--1.1--1.2.sql
-%%DATADIR%%/extension/sslinfo--1.2.sql
-%%DATADIR%%/extension/sslinfo--unpackaged--1.0.sql
-%%DATADIR%%/extension/sslinfo.control
-%%DATADIR%%/extension/tablefunc--1.0.sql
-%%DATADIR%%/extension/tablefunc--unpackaged--1.0.sql
-%%DATADIR%%/extension/tablefunc.control
-%%DATADIR%%/extension/tcn--1.0.sql
-%%DATADIR%%/extension/tcn.control
-%%DATADIR%%/extension/timetravel--1.0.sql
-%%DATADIR%%/extension/timetravel--unpackaged--1.0.sql
-%%DATADIR%%/extension/timetravel.control
-%%DATADIR%%/extension/tsearch2--1.0.sql
-%%DATADIR%%/extension/tsearch2--unpackaged--1.0.sql
-%%DATADIR%%/extension/tsearch2.control
-%%DATADIR%%/extension/tsm_system_rows--1.0.sql
-%%DATADIR%%/extension/tsm_system_rows.control
-%%DATADIR%%/extension/tsm_system_time--1.0.sql
-%%DATADIR%%/extension/tsm_system_time.control
-%%DATADIR%%/extension/unaccent--1.0--1.1.sql
-%%DATADIR%%/extension/unaccent--1.1.sql
-%%DATADIR%%/extension/unaccent--unpackaged--1.0.sql
-%%DATADIR%%/extension/unaccent.control
-%%DATADIR%%/extension/uuid-ossp--1.0--1.1.sql
-%%DATADIR%%/extension/uuid-ossp--1.1.sql
-%%DATADIR%%/extension/uuid-ossp--unpackaged--1.0.sql
-%%DATADIR%%/extension/uuid-ossp.control
-%%XML%%%%DATADIR%%/extension/xml2--1.0--1.1.sql
-%%XML%%%%DATADIR%%/extension/xml2--1.1.sql
-%%XML%%%%DATADIR%%/extension/xml2--unpackaged--1.0.sql
-%%XML%%%%DATADIR%%/extension/xml2.control
-%%DATADIR%%/tsearch_data/unaccent.rules
-%%DATADIR%%/tsearch_data/xsyn_sample.rules
diff --git a/databases/postgresql96-server/pkg-plist-plperl b/databases/postgresql96-server/pkg-plist-plperl
deleted file mode 100644
index 38794a4209ac..000000000000
--- a/databases/postgresql96-server/pkg-plist-plperl
+++ /dev/null
@@ -1,15 +0,0 @@
-include/postgresql/server/plperl.h
-include/postgresql/server/ppport.h
-%%DATADIR%%/extension/plperlu--1.0.sql
-%%DATADIR%%/extension/plperl.control
-%%DATADIR%%/extension/plperl--1.0.sql
-%%DATADIR%%/extension/plperlu.control
-%%DATADIR%%/extension/plperlu--unpackaged--1.0.sql
-%%DATADIR%%/extension/plperl--unpackaged--1.0.sql
-%%DOCSDIR%%/README-plperl
-lib/postgresql/hstore_plperl.so
-lib/postgresql/plperl.so
-%%DATADIR%%/extension/hstore_plperl--1.0.sql
-%%DATADIR%%/extension/hstore_plperl.control
-%%DATADIR%%/extension/hstore_plperlu--1.0.sql
-%%DATADIR%%/extension/hstore_plperlu.control
diff --git a/databases/postgresql96-server/pkg-plist-plpython b/databases/postgresql96-server/pkg-plist-plpython
deleted file mode 100644
index 592925659278..000000000000
--- a/databases/postgresql96-server/pkg-plist-plpython
+++ /dev/null
@@ -1,28 +0,0 @@
-include/postgresql/server/plpy_util.h
-include/postgresql/server/plpython.h
-%%DOCSDIR%%/README-plpython
-%%PYTHON2%%lib/postgresql/plpython2.so
-%%PYTHON3%%lib/postgresql/plpython3.so
-%%PYTHON2%%%%DATADIR%%/extension/plpython2u--1.0.sql
-%%PYTHON2%%%%DATADIR%%/extension/plpython2u--unpackaged--1.0.sql
-%%PYTHON2%%%%DATADIR%%/extension/plpython2u.control
-%%PYTHON3%%%%DATADIR%%/extension/plpython3u--1.0.sql
-%%PYTHON3%%%%DATADIR%%/extension/plpython3u--unpackaged--1.0.sql
-%%PYTHON3%%%%DATADIR%%/extension/plpython3u.control
-%%PYTHON2%%%%DATADIR%%/extension/plpythonu--1.0.sql
-%%PYTHON2%%%%DATADIR%%/extension/plpythonu--unpackaged--1.0.sql
-%%PYTHON2%%%%DATADIR%%/extension/plpythonu.control
-lib/postgresql/hstore_plpython3.so
-lib/postgresql/ltree_plpython3.so
-%%DATADIR%%/extension/hstore_plpython2u--1.0.sql
-%%DATADIR%%/extension/hstore_plpython2u.control
-%%DATADIR%%/extension/hstore_plpython3u--1.0.sql
-%%DATADIR%%/extension/hstore_plpython3u.control
-%%DATADIR%%/extension/hstore_plpythonu--1.0.sql
-%%DATADIR%%/extension/hstore_plpythonu.control
-%%DATADIR%%/extension/ltree_plpython2u--1.0.sql
-%%DATADIR%%/extension/ltree_plpython2u.control
-%%DATADIR%%/extension/ltree_plpython3u--1.0.sql
-%%DATADIR%%/extension/ltree_plpython3u.control
-%%DATADIR%%/extension/ltree_plpythonu--1.0.sql
-%%DATADIR%%/extension/ltree_plpythonu.control
diff --git a/databases/postgresql96-server/pkg-plist-pltcl b/databases/postgresql96-server/pkg-plist-pltcl
deleted file mode 100644
index f5fe8c74be5c..000000000000
--- a/databases/postgresql96-server/pkg-plist-pltcl
+++ /dev/null
@@ -1,12 +0,0 @@
-%%DATADIR%%/extension/pltcl--1.0.sql
-%%DATADIR%%/extension/pltcl.control
-%%DATADIR%%/extension/pltclu.control
-%%DATADIR%%/extension/pltclu--1.0.sql
-%%DATADIR%%/extension/pltcl--unpackaged--1.0.sql
-%%DATADIR%%/extension/pltclu--unpackaged--1.0.sql
-%%DOCSDIR%%/README-pltcl
-lib/postgresql/pltcl.so
-bin/pltcl_loadmod
-bin/pltcl_delmod
-bin/pltcl_listmod
-%%DATADIR%%/unknown.pltcl
diff --git a/databases/postgresql96-server/pkg-plist-server b/databases/postgresql96-server/pkg-plist-server
deleted file mode 100644
index 8ce8a9b27b00..000000000000
--- a/databases/postgresql96-server/pkg-plist-server
+++ /dev/null
@@ -1,800 +0,0 @@
-bin/initdb
-bin/pg_controldata
-bin/pg_ctl
-bin/pg_receivexlog
-bin/pg_resetxlog
-bin/pg_recvlogical
-bin/pg_archivecleanup
-bin/pg_basebackup
-bin/pg_rewind
-bin/pg_test_fsync
-bin/pg_test_timing
-bin/pg_xlogdump
-bin/pg_upgrade
-bin/postgres
-bin/postmaster
-etc/periodic/daily/502.pgsql
-include/postgresql/server/plpgsql.h
-lib/postgresql/ascii_and_mic.so
-lib/postgresql/cyrillic_and_mic.so
-lib/postgresql/dict_snowball.so
-lib/postgresql/euc2004_sjis2004.so
-lib/postgresql/euc_cn_and_mic.so
-lib/postgresql/euc_jp_and_sjis.so
-lib/postgresql/euc_kr_and_mic.so
-lib/postgresql/euc_tw_and_big5.so
-lib/postgresql/latin2_and_win1250.so
-lib/postgresql/latin_and_mic.so
-lib/postgresql/libpqwalreceiver.so
-lib/postgresql/plpgsql.so
-lib/postgresql/utf8_and_ascii.so
-lib/postgresql/utf8_and_big5.so
-lib/postgresql/utf8_and_cyrillic.so
-lib/postgresql/utf8_and_euc2004.so
-lib/postgresql/utf8_and_euc_cn.so
-lib/postgresql/utf8_and_euc_jp.so
-lib/postgresql/utf8_and_euc_kr.so
-lib/postgresql/utf8_and_euc_tw.so
-lib/postgresql/utf8_and_gb18030.so
-lib/postgresql/utf8_and_gbk.so
-lib/postgresql/utf8_and_iso8859.so
-lib/postgresql/utf8_and_iso8859_1.so
-lib/postgresql/utf8_and_johab.so
-lib/postgresql/utf8_and_sjis.so
-lib/postgresql/utf8_and_sjis2004.so
-lib/postgresql/utf8_and_uhc.so
-lib/postgresql/utf8_and_win.so
-lib/libpgcommon.a
-%%PORTDOCS%%%%DOCSDIR%%/README-server
-%%DATADIR%%/conversion_create.sql
-%%DATADIR%%/information_schema.sql
-%%DATADIR%%/pg_hba.conf.sample
-%%DATADIR%%/pg_ident.conf.sample
-%%DATADIR%%/postgres.bki
-%%DATADIR%%/postgres.description
-%%DATADIR%%/postgresql.conf.sample
-%%DATADIR%%/recovery.conf.sample
-%%DATADIR%%/sql_features.txt
-%%DATADIR%%/system_views.sql
-%%DATADIR%%/extension/plpgsql--1.0.sql
-%%DATADIR%%/extension/plpgsql--unpackaged--1.0.sql
-%%DATADIR%%/extension/plpgsql.control
-%%DATADIR%%/postgres.shdescription
-%%NLS%%share/locale/cs/LC_MESSAGES/initdb-9.6.mo
-%%NLS%%share/locale/cs/LC_MESSAGES/pg_basebackup-9.6.mo
-%%NLS%%share/locale/cs/LC_MESSAGES/pg_controldata-9.6.mo
-%%NLS%%share/locale/cs/LC_MESSAGES/pg_ctl-9.6.mo
-%%NLS%%share/locale/cs/LC_MESSAGES/pg_resetxlog-9.6.mo
-%%NLS%%share/locale/cs/LC_MESSAGES/pg_rewind-9.6.mo
-%%NLS%%share/locale/cs/LC_MESSAGES/plpgsql-9.6.mo
-%%NLS%%share/locale/de/LC_MESSAGES/initdb-9.6.mo
-%%NLS%%share/locale/de/LC_MESSAGES/pg_basebackup-9.6.mo
-%%NLS%%share/locale/de/LC_MESSAGES/pg_controldata-9.6.mo
-%%NLS%%share/locale/de/LC_MESSAGES/pg_ctl-9.6.mo
-%%NLS%%share/locale/de/LC_MESSAGES/pg_resetxlog-9.6.mo
-%%NLS%%share/locale/de/LC_MESSAGES/pg_rewind-9.6.mo
-%%NLS%%share/locale/de/LC_MESSAGES/plpgsql-9.6.mo
-%%NLS%%share/locale/de/LC_MESSAGES/postgres-9.6.mo
-%%NLS%%share/locale/es/LC_MESSAGES/initdb-9.6.mo
-%%NLS%%share/locale/es/LC_MESSAGES/pg_basebackup-9.6.mo
-%%NLS%%share/locale/es/LC_MESSAGES/pg_controldata-9.6.mo
-%%NLS%%share/locale/es/LC_MESSAGES/pg_ctl-9.6.mo
-%%NLS%%share/locale/es/LC_MESSAGES/pg_resetxlog-9.6.mo
-%%NLS%%share/locale/es/LC_MESSAGES/pg_rewind-9.6.mo
-%%NLS%%share/locale/es/LC_MESSAGES/plpgsql-9.6.mo
-%%NLS%%share/locale/es/LC_MESSAGES/postgres-9.6.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/initdb-9.6.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/pg_basebackup-9.6.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/pg_controldata-9.6.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/pg_ctl-9.6.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/pg_resetxlog-9.6.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/pg_rewind-9.6.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/plpgsql-9.6.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/postgres-9.6.mo
-%%NLS%%share/locale/id/LC_MESSAGES/postgres-9.6.mo
-%%NLS%%share/locale/it/LC_MESSAGES/initdb-9.6.mo
-%%NLS%%share/locale/it/LC_MESSAGES/pg_basebackup-9.6.mo
-%%NLS%%share/locale/it/LC_MESSAGES/pg_controldata-9.6.mo
-%%NLS%%share/locale/it/LC_MESSAGES/pg_ctl-9.6.mo
-%%NLS%%share/locale/it/LC_MESSAGES/pg_resetxlog-9.6.mo
-%%NLS%%share/locale/it/LC_MESSAGES/pg_rewind-9.6.mo
-%%NLS%%share/locale/it/LC_MESSAGES/plpgsql-9.6.mo
-%%NLS%%share/locale/it/LC_MESSAGES/postgres-9.6.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/initdb-9.6.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/pg_basebackup-9.6.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/pg_controldata-9.6.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/pg_ctl-9.6.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/pg_resetxlog-9.6.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/pg_rewind-9.6.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/plpgsql-9.6.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/postgres-9.6.mo
-%%NLS%%share/locale/ko/LC_MESSAGES/initdb-9.6.mo
-%%NLS%%share/locale/ko/LC_MESSAGES/pg_basebackup-9.6.mo
-%%NLS%%share/locale/ko/LC_MESSAGES/pg_controldata-9.6.mo
-%%NLS%%share/locale/ko/LC_MESSAGES/pg_ctl-9.6.mo
-%%NLS%%share/locale/ko/LC_MESSAGES/pg_resetxlog-9.6.mo
-%%NLS%%share/locale/ko/LC_MESSAGES/pg_rewind-9.6.mo
-%%NLS%%share/locale/ko/LC_MESSAGES/plpgsql-9.6.mo
-%%NLS%%share/locale/ko/LC_MESSAGES/postgres-9.6.mo
-%%NLS%%share/locale/pl/LC_MESSAGES/initdb-9.6.mo
-%%NLS%%share/locale/pl/LC_MESSAGES/pg_basebackup-9.6.mo
-%%NLS%%share/locale/pl/LC_MESSAGES/pg_controldata-9.6.mo
-%%NLS%%share/locale/pl/LC_MESSAGES/pg_ctl-9.6.mo
-%%NLS%%share/locale/pl/LC_MESSAGES/pg_resetxlog-9.6.mo
-%%NLS%%share/locale/pl/LC_MESSAGES/pg_rewind-9.6.mo
-%%NLS%%share/locale/pl/LC_MESSAGES/plpgsql-9.6.mo
-%%NLS%%share/locale/pl/LC_MESSAGES/postgres-9.6.mo
-%%NLS%%share/locale/pt_BR/LC_MESSAGES/initdb-9.6.mo
-%%NLS%%share/locale/pt_BR/LC_MESSAGES/pg_basebackup-9.6.mo
-%%NLS%%share/locale/pt_BR/LC_MESSAGES/pg_controldata-9.6.mo
-%%NLS%%share/locale/pt_BR/LC_MESSAGES/pg_ctl-9.6.mo
-%%NLS%%share/locale/pt_BR/LC_MESSAGES/pg_resetxlog-9.6.mo
-%%NLS%%share/locale/pt_BR/LC_MESSAGES/pg_rewind-9.6.mo
-%%NLS%%share/locale/pt_BR/LC_MESSAGES/plpgsql-9.6.mo
-%%NLS%%share/locale/pt_BR/LC_MESSAGES/postgres-9.6.mo
-%%NLS%%share/locale/ro/LC_MESSAGES/plpgsql-9.6.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/initdb-9.6.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/pg_basebackup-9.6.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/pg_controldata-9.6.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/pg_ctl-9.6.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/pg_resetxlog-9.6.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/pg_rewind-9.6.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/plpgsql-9.6.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/postgres-9.6.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/initdb-9.6.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/pg_basebackup-9.6.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/pg_controldata-9.6.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/pg_ctl-9.6.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/pg_resetxlog-9.6.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/pg_rewind-9.6.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/plpgsql-9.6.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/postgres-9.6.mo
-%%NLS%%share/locale/tr/LC_MESSAGES/initdb-9.6.mo
-%%NLS%%share/locale/tr/LC_MESSAGES/pg_basebackup-9.6.mo
-%%NLS%%share/locale/tr/LC_MESSAGES/pg_controldata-9.6.mo
-%%NLS%%share/locale/tr/LC_MESSAGES/pg_ctl-9.6.mo
-%%NLS%%share/locale/tr/LC_MESSAGES/pg_resetxlog-9.6.mo
-%%NLS%%share/locale/tr/LC_MESSAGES/pg_rewind-9.6.mo
-%%NLS%%share/locale/tr/LC_MESSAGES/plpgsql-9.6.mo
-%%NLS%%share/locale/tr/LC_MESSAGES/postgres-9.6.mo
-%%NLS%%share/locale/zh_CN/LC_MESSAGES/initdb-9.6.mo
-%%NLS%%share/locale/zh_CN/LC_MESSAGES/pg_basebackup-9.6.mo
-%%NLS%%share/locale/zh_CN/LC_MESSAGES/pg_controldata-9.6.mo
-%%NLS%%share/locale/zh_CN/LC_MESSAGES/pg_ctl-9.6.mo
-%%NLS%%share/locale/zh_CN/LC_MESSAGES/pg_resetxlog-9.6.mo
-%%NLS%%share/locale/zh_CN/LC_MESSAGES/pg_rewind-9.6.mo
-%%NLS%%share/locale/zh_CN/LC_MESSAGES/plpgsql-9.6.mo
-%%NLS%%share/locale/zh_CN/LC_MESSAGES/postgres-9.6.mo
-%%NLS%%share/locale/zh_TW/LC_MESSAGES/plpgsql-9.6.mo
-%%DATADIR%%/snowball_create.sql
-%%TZDATA%%%%DATADIR%%/timezone/Africa/Abidjan
-%%TZDATA%%%%DATADIR%%/timezone/Africa/Accra
-%%TZDATA%%%%DATADIR%%/timezone/Africa/Addis_Ababa
-%%TZDATA%%%%DATADIR%%/timezone/Africa/Algiers
-%%TZDATA%%%%DATADIR%%/timezone/Africa/Asmara
-%%TZDATA%%%%DATADIR%%/timezone/Africa/Asmera
-%%TZDATA%%%%DATADIR%%/timezone/Africa/Bamako
-%%TZDATA%%%%DATADIR%%/timezone/Africa/Bangui
-%%TZDATA%%%%DATADIR%%/timezone/Africa/Banjul
-%%TZDATA%%%%DATADIR%%/timezone/Africa/Bissau
-%%TZDATA%%%%DATADIR%%/timezone/Africa/Blantyre
-%%TZDATA%%%%DATADIR%%/timezone/Africa/Brazzaville
-%%TZDATA%%%%DATADIR%%/timezone/Africa/Bujumbura
-%%TZDATA%%%%DATADIR%%/timezone/Africa/Cairo
-%%TZDATA%%%%DATADIR%%/timezone/Africa/Casablanca
-%%TZDATA%%%%DATADIR%%/timezone/Africa/Ceuta
-%%TZDATA%%%%DATADIR%%/timezone/Africa/Conakry
-%%TZDATA%%%%DATADIR%%/timezone/Africa/Dakar
-%%TZDATA%%%%DATADIR%%/timezone/Africa/Dar_es_Salaam
-%%TZDATA%%%%DATADIR%%/timezone/Africa/Djibouti
-%%TZDATA%%%%DATADIR%%/timezone/Africa/Douala
-%%TZDATA%%%%DATADIR%%/timezone/Africa/El_Aaiun
-%%TZDATA%%%%DATADIR%%/timezone/Africa/Freetown
-%%TZDATA%%%%DATADIR%%/timezone/Africa/Gaborone
-%%TZDATA%%%%DATADIR%%/timezone/Africa/Harare
-%%TZDATA%%%%DATADIR%%/timezone/Africa/Johannesburg
-%%TZDATA%%%%DATADIR%%/timezone/Africa/Juba
-%%TZDATA%%%%DATADIR%%/timezone/Africa/Kampala
-%%TZDATA%%%%DATADIR%%/timezone/Africa/Khartoum
-%%TZDATA%%%%DATADIR%%/timezone/Africa/Kigali
-%%TZDATA%%%%DATADIR%%/timezone/Africa/Kinshasa
-%%TZDATA%%%%DATADIR%%/timezone/Africa/Lagos
-%%TZDATA%%%%DATADIR%%/timezone/Africa/Libreville
-%%TZDATA%%%%DATADIR%%/timezone/Africa/Lome
-%%TZDATA%%%%DATADIR%%/timezone/Africa/Luanda
-%%TZDATA%%%%DATADIR%%/timezone/Africa/Lubumbashi
-%%TZDATA%%%%DATADIR%%/timezone/Africa/Lusaka
-%%TZDATA%%%%DATADIR%%/timezone/Africa/Malabo
-%%TZDATA%%%%DATADIR%%/timezone/Africa/Maputo
-%%TZDATA%%%%DATADIR%%/timezone/Africa/Maseru
-%%TZDATA%%%%DATADIR%%/timezone/Africa/Mbabane
-%%TZDATA%%%%DATADIR%%/timezone/Africa/Mogadishu
-%%TZDATA%%%%DATADIR%%/timezone/Africa/Monrovia
-%%TZDATA%%%%DATADIR%%/timezone/Africa/Nairobi
-%%TZDATA%%%%DATADIR%%/timezone/Africa/Ndjamena
-%%TZDATA%%%%DATADIR%%/timezone/Africa/Niamey
-%%TZDATA%%%%DATADIR%%/timezone/Africa/Nouakchott
-%%TZDATA%%%%DATADIR%%/timezone/Africa/Ouagadougou
-%%TZDATA%%%%DATADIR%%/timezone/Africa/Porto-Novo
-%%TZDATA%%%%DATADIR%%/timezone/Africa/Sao_Tome
-%%TZDATA%%%%DATADIR%%/timezone/Africa/Timbuktu
-%%TZDATA%%%%DATADIR%%/timezone/Africa/Tripoli
-%%TZDATA%%%%DATADIR%%/timezone/Africa/Tunis
-%%TZDATA%%%%DATADIR%%/timezone/Africa/Windhoek
-%%TZDATA%%%%DATADIR%%/timezone/America/Adak
-%%TZDATA%%%%DATADIR%%/timezone/America/Anchorage
-%%TZDATA%%%%DATADIR%%/timezone/America/Anguilla
-%%TZDATA%%%%DATADIR%%/timezone/America/Antigua
-%%TZDATA%%%%DATADIR%%/timezone/America/Araguaina
-%%TZDATA%%%%DATADIR%%/timezone/America/Argentina/Buenos_Aires
-%%TZDATA%%%%DATADIR%%/timezone/America/Argentina/Catamarca
-%%TZDATA%%%%DATADIR%%/timezone/America/Argentina/ComodRivadavia
-%%TZDATA%%%%DATADIR%%/timezone/America/Argentina/Cordoba
-%%TZDATA%%%%DATADIR%%/timezone/America/Argentina/Jujuy
-%%TZDATA%%%%DATADIR%%/timezone/America/Argentina/La_Rioja
-%%TZDATA%%%%DATADIR%%/timezone/America/Argentina/Mendoza
-%%TZDATA%%%%DATADIR%%/timezone/America/Argentina/Rio_Gallegos
-%%TZDATA%%%%DATADIR%%/timezone/America/Argentina/Salta
-%%TZDATA%%%%DATADIR%%/timezone/America/Argentina/San_Juan
-%%TZDATA%%%%DATADIR%%/timezone/America/Argentina/San_Luis
-%%TZDATA%%%%DATADIR%%/timezone/America/Argentina/Tucuman
-%%TZDATA%%%%DATADIR%%/timezone/America/Argentina/Ushuaia
-%%TZDATA%%%%DATADIR%%/timezone/America/Aruba
-%%TZDATA%%%%DATADIR%%/timezone/America/Asuncion
-%%TZDATA%%%%DATADIR%%/timezone/America/Atikokan
-%%TZDATA%%%%DATADIR%%/timezone/America/Atka
-%%TZDATA%%%%DATADIR%%/timezone/America/Bahia
-%%TZDATA%%%%DATADIR%%/timezone/America/Bahia_Banderas
-%%TZDATA%%%%DATADIR%%/timezone/America/Barbados
-%%TZDATA%%%%DATADIR%%/timezone/America/Belem
-%%TZDATA%%%%DATADIR%%/timezone/America/Belize
-%%TZDATA%%%%DATADIR%%/timezone/America/Blanc-Sablon
-%%TZDATA%%%%DATADIR%%/timezone/America/Boa_Vista
-%%TZDATA%%%%DATADIR%%/timezone/America/Bogota
-%%TZDATA%%%%DATADIR%%/timezone/America/Boise
-%%TZDATA%%%%DATADIR%%/timezone/America/Buenos_Aires
-%%TZDATA%%%%DATADIR%%/timezone/America/Cambridge_Bay
-%%TZDATA%%%%DATADIR%%/timezone/America/Campo_Grande
-%%TZDATA%%%%DATADIR%%/timezone/America/Cancun
-%%TZDATA%%%%DATADIR%%/timezone/America/Caracas
-%%TZDATA%%%%DATADIR%%/timezone/America/Catamarca
-%%TZDATA%%%%DATADIR%%/timezone/America/Cayenne
-%%TZDATA%%%%DATADIR%%/timezone/America/Cayman
-%%TZDATA%%%%DATADIR%%/timezone/America/Chicago
-%%TZDATA%%%%DATADIR%%/timezone/America/Chihuahua
-%%TZDATA%%%%DATADIR%%/timezone/America/Coral_Harbour
-%%TZDATA%%%%DATADIR%%/timezone/America/Cordoba
-%%TZDATA%%%%DATADIR%%/timezone/America/Costa_Rica
-%%TZDATA%%%%DATADIR%%/timezone/America/Creston
-%%TZDATA%%%%DATADIR%%/timezone/America/Cuiaba
-%%TZDATA%%%%DATADIR%%/timezone/America/Curacao
-%%TZDATA%%%%DATADIR%%/timezone/America/Danmarkshavn
-%%TZDATA%%%%DATADIR%%/timezone/America/Dawson
-%%TZDATA%%%%DATADIR%%/timezone/America/Dawson_Creek
-%%TZDATA%%%%DATADIR%%/timezone/America/Denver
-%%TZDATA%%%%DATADIR%%/timezone/America/Detroit
-%%TZDATA%%%%DATADIR%%/timezone/America/Dominica
-%%TZDATA%%%%DATADIR%%/timezone/America/Edmonton
-%%TZDATA%%%%DATADIR%%/timezone/America/Eirunepe
-%%TZDATA%%%%DATADIR%%/timezone/America/El_Salvador
-%%TZDATA%%%%DATADIR%%/timezone/America/Ensenada
-%%TZDATA%%%%DATADIR%%/timezone/America/Fort_Nelson
-%%TZDATA%%%%DATADIR%%/timezone/America/Fort_Wayne
-%%TZDATA%%%%DATADIR%%/timezone/America/Fortaleza
-%%TZDATA%%%%DATADIR%%/timezone/America/Glace_Bay
-%%TZDATA%%%%DATADIR%%/timezone/America/Godthab
-%%TZDATA%%%%DATADIR%%/timezone/America/Goose_Bay
-%%TZDATA%%%%DATADIR%%/timezone/America/Grand_Turk
-%%TZDATA%%%%DATADIR%%/timezone/America/Grenada
-%%TZDATA%%%%DATADIR%%/timezone/America/Guadeloupe
-%%TZDATA%%%%DATADIR%%/timezone/America/Guatemala
-%%TZDATA%%%%DATADIR%%/timezone/America/Guayaquil
-%%TZDATA%%%%DATADIR%%/timezone/America/Guyana
-%%TZDATA%%%%DATADIR%%/timezone/America/Halifax
-%%TZDATA%%%%DATADIR%%/timezone/America/Havana
-%%TZDATA%%%%DATADIR%%/timezone/America/Hermosillo
-%%TZDATA%%%%DATADIR%%/timezone/America/Indiana/Indianapolis
-%%TZDATA%%%%DATADIR%%/timezone/America/Indiana/Knox
-%%TZDATA%%%%DATADIR%%/timezone/America/Indiana/Marengo
-%%TZDATA%%%%DATADIR%%/timezone/America/Indiana/Petersburg
-%%TZDATA%%%%DATADIR%%/timezone/America/Indiana/Tell_City
-%%TZDATA%%%%DATADIR%%/timezone/America/Indiana/Vevay
-%%TZDATA%%%%DATADIR%%/timezone/America/Indiana/Vincennes
-%%TZDATA%%%%DATADIR%%/timezone/America/Indiana/Winamac
-%%TZDATA%%%%DATADIR%%/timezone/America/Indianapolis
-%%TZDATA%%%%DATADIR%%/timezone/America/Inuvik
-%%TZDATA%%%%DATADIR%%/timezone/America/Iqaluit
-%%TZDATA%%%%DATADIR%%/timezone/America/Jamaica
-%%TZDATA%%%%DATADIR%%/timezone/America/Jujuy
-%%TZDATA%%%%DATADIR%%/timezone/America/Juneau
-%%TZDATA%%%%DATADIR%%/timezone/America/Kentucky/Louisville
-%%TZDATA%%%%DATADIR%%/timezone/America/Kentucky/Monticello
-%%TZDATA%%%%DATADIR%%/timezone/America/Knox_IN
-%%TZDATA%%%%DATADIR%%/timezone/America/Kralendijk
-%%TZDATA%%%%DATADIR%%/timezone/America/La_Paz
-%%TZDATA%%%%DATADIR%%/timezone/America/Lima
-%%TZDATA%%%%DATADIR%%/timezone/America/Los_Angeles
-%%TZDATA%%%%DATADIR%%/timezone/America/Louisville
-%%TZDATA%%%%DATADIR%%/timezone/America/Lower_Princes
-%%TZDATA%%%%DATADIR%%/timezone/America/Maceio
-%%TZDATA%%%%DATADIR%%/timezone/America/Managua
-%%TZDATA%%%%DATADIR%%/timezone/America/Manaus
-%%TZDATA%%%%DATADIR%%/timezone/America/Marigot
-%%TZDATA%%%%DATADIR%%/timezone/America/Martinique
-%%TZDATA%%%%DATADIR%%/timezone/America/Matamoros
-%%TZDATA%%%%DATADIR%%/timezone/America/Mazatlan
-%%TZDATA%%%%DATADIR%%/timezone/America/Mendoza
-%%TZDATA%%%%DATADIR%%/timezone/America/Menominee
-%%TZDATA%%%%DATADIR%%/timezone/America/Merida
-%%TZDATA%%%%DATADIR%%/timezone/America/Metlakatla
-%%TZDATA%%%%DATADIR%%/timezone/America/Mexico_City
-%%TZDATA%%%%DATADIR%%/timezone/America/Miquelon
-%%TZDATA%%%%DATADIR%%/timezone/America/Moncton
-%%TZDATA%%%%DATADIR%%/timezone/America/Monterrey
-%%TZDATA%%%%DATADIR%%/timezone/America/Montevideo
-%%TZDATA%%%%DATADIR%%/timezone/America/Montreal
-%%TZDATA%%%%DATADIR%%/timezone/America/Montserrat
-%%TZDATA%%%%DATADIR%%/timezone/America/Nassau
-%%TZDATA%%%%DATADIR%%/timezone/America/New_York
-%%TZDATA%%%%DATADIR%%/timezone/America/Nipigon
-%%TZDATA%%%%DATADIR%%/timezone/America/Nome
-%%TZDATA%%%%DATADIR%%/timezone/America/Noronha
-%%TZDATA%%%%DATADIR%%/timezone/America/North_Dakota/Beulah
-%%TZDATA%%%%DATADIR%%/timezone/America/North_Dakota/Center
-%%TZDATA%%%%DATADIR%%/timezone/America/North_Dakota/New_Salem
-%%TZDATA%%%%DATADIR%%/timezone/America/Nuuk 
-%%TZDATA%%%%DATADIR%%/timezone/America/Ojinaga
-%%TZDATA%%%%DATADIR%%/timezone/America/Panama
-%%TZDATA%%%%DATADIR%%/timezone/America/Pangnirtung
-%%TZDATA%%%%DATADIR%%/timezone/America/Paramaribo
-%%TZDATA%%%%DATADIR%%/timezone/America/Phoenix
-%%TZDATA%%%%DATADIR%%/timezone/America/Port-au-Prince
-%%TZDATA%%%%DATADIR%%/timezone/America/Port_of_Spain
-%%TZDATA%%%%DATADIR%%/timezone/America/Porto_Acre
-%%TZDATA%%%%DATADIR%%/timezone/America/Porto_Velho
-%%TZDATA%%%%DATADIR%%/timezone/America/Puerto_Rico
-%%TZDATA%%%%DATADIR%%/timezone/America/Punta_Arenas
-%%TZDATA%%%%DATADIR%%/timezone/America/Rainy_River
-%%TZDATA%%%%DATADIR%%/timezone/America/Rankin_Inlet
-%%TZDATA%%%%DATADIR%%/timezone/America/Recife
-%%TZDATA%%%%DATADIR%%/timezone/America/Regina
-%%TZDATA%%%%DATADIR%%/timezone/America/Resolute
-%%TZDATA%%%%DATADIR%%/timezone/America/Rio_Branco
-%%TZDATA%%%%DATADIR%%/timezone/America/Rosario
-%%TZDATA%%%%DATADIR%%/timezone/America/Santa_Isabel
-%%TZDATA%%%%DATADIR%%/timezone/America/Santarem
-%%TZDATA%%%%DATADIR%%/timezone/America/Santiago
-%%TZDATA%%%%DATADIR%%/timezone/America/Santo_Domingo
-%%TZDATA%%%%DATADIR%%/timezone/America/Sao_Paulo
-%%TZDATA%%%%DATADIR%%/timezone/America/Scoresbysund
-%%TZDATA%%%%DATADIR%%/timezone/America/Shiprock
-%%TZDATA%%%%DATADIR%%/timezone/America/Sitka
-%%TZDATA%%%%DATADIR%%/timezone/America/St_Barthelemy
-%%TZDATA%%%%DATADIR%%/timezone/America/St_Johns
-%%TZDATA%%%%DATADIR%%/timezone/America/St_Kitts
-%%TZDATA%%%%DATADIR%%/timezone/America/St_Lucia
-%%TZDATA%%%%DATADIR%%/timezone/America/St_Thomas
-%%TZDATA%%%%DATADIR%%/timezone/America/St_Vincent
-%%TZDATA%%%%DATADIR%%/timezone/America/Swift_Current
-%%TZDATA%%%%DATADIR%%/timezone/America/Tegucigalpa
-%%TZDATA%%%%DATADIR%%/timezone/America/Thule
-%%TZDATA%%%%DATADIR%%/timezone/America/Thunder_Bay
-%%TZDATA%%%%DATADIR%%/timezone/America/Tijuana
-%%TZDATA%%%%DATADIR%%/timezone/America/Toronto
-%%TZDATA%%%%DATADIR%%/timezone/America/Tortola
-%%TZDATA%%%%DATADIR%%/timezone/America/Vancouver
-%%TZDATA%%%%DATADIR%%/timezone/America/Virgin
-%%TZDATA%%%%DATADIR%%/timezone/America/Whitehorse
-%%TZDATA%%%%DATADIR%%/timezone/America/Winnipeg
-%%TZDATA%%%%DATADIR%%/timezone/America/Yakutat
-%%TZDATA%%%%DATADIR%%/timezone/America/Yellowknife
-%%TZDATA%%%%DATADIR%%/timezone/Antarctica/Casey
-%%TZDATA%%%%DATADIR%%/timezone/Antarctica/Davis
-%%TZDATA%%%%DATADIR%%/timezone/Antarctica/DumontDUrville
-%%TZDATA%%%%DATADIR%%/timezone/Antarctica/Macquarie
-%%TZDATA%%%%DATADIR%%/timezone/Antarctica/Mawson
-%%TZDATA%%%%DATADIR%%/timezone/Antarctica/McMurdo
-%%TZDATA%%%%DATADIR%%/timezone/Antarctica/Palmer
-%%TZDATA%%%%DATADIR%%/timezone/Antarctica/Rothera
-%%TZDATA%%%%DATADIR%%/timezone/Antarctica/South_Pole
-%%TZDATA%%%%DATADIR%%/timezone/Antarctica/Syowa
-%%TZDATA%%%%DATADIR%%/timezone/Antarctica/Troll
-%%TZDATA%%%%DATADIR%%/timezone/Antarctica/Vostok
-%%TZDATA%%%%DATADIR%%/timezone/Arctic/Longyearbyen
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Aden
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Almaty
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Amman
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Anadyr
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Aqtau
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Aqtobe
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Ashgabat
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Ashkhabad
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Atyrau
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Baghdad
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Bahrain
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Baku
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Bangkok
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Barnaul
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Beirut
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Bishkek
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Brunei
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Calcutta
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Chita
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Choibalsan
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Chongqing
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Chungking
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Colombo
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Dacca
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Damascus
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Dhaka
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Dili
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Dubai
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Dushanbe
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Famagusta
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Gaza
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Harbin
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Hebron
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Ho_Chi_Minh
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Hong_Kong
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Hovd
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Irkutsk
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Istanbul
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Jakarta
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Jayapura
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Jerusalem
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Kabul
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Kamchatka
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Karachi
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Kashgar
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Kathmandu
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Katmandu
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Khandyga
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Kolkata
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Krasnoyarsk
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Kuala_Lumpur
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Kuching
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Kuwait
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Macao
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Macau
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Magadan
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Makassar
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Manila
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Muscat
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Nicosia
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Novokuznetsk
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Novosibirsk
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Omsk
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Oral
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Phnom_Penh
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Pontianak
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Pyongyang
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Qatar
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Qostanay
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Qyzylorda
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Rangoon
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Riyadh
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Saigon
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Sakhalin
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Samarkand
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Seoul
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Shanghai
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Singapore
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Srednekolymsk
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Taipei
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Tashkent
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Tbilisi
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Tehran
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Tel_Aviv
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Thimbu
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Thimphu
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Tokyo
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Tomsk
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Ujung_Pandang
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Ulaanbaatar
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Ulan_Bator
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Urumqi
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Ust-Nera
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Vientiane
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Vladivostok
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Yakutsk
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Yangon
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Yekaterinburg
-%%TZDATA%%%%DATADIR%%/timezone/Asia/Yerevan
-%%TZDATA%%%%DATADIR%%/timezone/Atlantic/Azores
-%%TZDATA%%%%DATADIR%%/timezone/Atlantic/Bermuda
-%%TZDATA%%%%DATADIR%%/timezone/Atlantic/Canary
-%%TZDATA%%%%DATADIR%%/timezone/Atlantic/Cape_Verde
-%%TZDATA%%%%DATADIR%%/timezone/Atlantic/Faeroe
-%%TZDATA%%%%DATADIR%%/timezone/Atlantic/Faroe
-%%TZDATA%%%%DATADIR%%/timezone/Atlantic/Jan_Mayen
-%%TZDATA%%%%DATADIR%%/timezone/Atlantic/Madeira
-%%TZDATA%%%%DATADIR%%/timezone/Atlantic/Reykjavik
-%%TZDATA%%%%DATADIR%%/timezone/Atlantic/South_Georgia
-%%TZDATA%%%%DATADIR%%/timezone/Atlantic/St_Helena
-%%TZDATA%%%%DATADIR%%/timezone/Atlantic/Stanley
-%%TZDATA%%%%DATADIR%%/timezone/Australia/ACT
-%%TZDATA%%%%DATADIR%%/timezone/Australia/Adelaide
-%%TZDATA%%%%DATADIR%%/timezone/Australia/Brisbane
-%%TZDATA%%%%DATADIR%%/timezone/Australia/Broken_Hill
-%%TZDATA%%%%DATADIR%%/timezone/Australia/Canberra
-%%TZDATA%%%%DATADIR%%/timezone/Australia/Currie
-%%TZDATA%%%%DATADIR%%/timezone/Australia/Darwin
-%%TZDATA%%%%DATADIR%%/timezone/Australia/Eucla
-%%TZDATA%%%%DATADIR%%/timezone/Australia/Hobart
-%%TZDATA%%%%DATADIR%%/timezone/Australia/LHI
-%%TZDATA%%%%DATADIR%%/timezone/Australia/Lindeman
-%%TZDATA%%%%DATADIR%%/timezone/Australia/Lord_Howe
-%%TZDATA%%%%DATADIR%%/timezone/Australia/Melbourne
-%%TZDATA%%%%DATADIR%%/timezone/Australia/NSW
-%%TZDATA%%%%DATADIR%%/timezone/Australia/North
-%%TZDATA%%%%DATADIR%%/timezone/Australia/Perth
-%%TZDATA%%%%DATADIR%%/timezone/Australia/Queensland
-%%TZDATA%%%%DATADIR%%/timezone/Australia/South
-%%TZDATA%%%%DATADIR%%/timezone/Australia/Sydney
-%%TZDATA%%%%DATADIR%%/timezone/Australia/Tasmania
-%%TZDATA%%%%DATADIR%%/timezone/Australia/Victoria
-%%TZDATA%%%%DATADIR%%/timezone/Australia/West
-%%TZDATA%%%%DATADIR%%/timezone/Australia/Yancowinna
-%%TZDATA%%%%DATADIR%%/timezone/Brazil/Acre
-%%TZDATA%%%%DATADIR%%/timezone/Brazil/DeNoronha
-%%TZDATA%%%%DATADIR%%/timezone/Brazil/East
-%%TZDATA%%%%DATADIR%%/timezone/Brazil/West
-%%TZDATA%%%%DATADIR%%/timezone/CET
-%%TZDATA%%%%DATADIR%%/timezone/CST6CDT
-%%TZDATA%%%%DATADIR%%/timezone/Canada/Atlantic
-%%TZDATA%%%%DATADIR%%/timezone/Canada/Central
-%%TZDATA%%%%DATADIR%%/timezone/Canada/Eastern
-%%TZDATA%%%%DATADIR%%/timezone/Canada/Mountain
-%%TZDATA%%%%DATADIR%%/timezone/Canada/Newfoundland
-%%TZDATA%%%%DATADIR%%/timezone/Canada/Pacific
-%%TZDATA%%%%DATADIR%%/timezone/Canada/Saskatchewan
-%%TZDATA%%%%DATADIR%%/timezone/Canada/Yukon
-%%TZDATA%%%%DATADIR%%/timezone/Chile/Continental
-%%TZDATA%%%%DATADIR%%/timezone/Chile/EasterIsland
-%%TZDATA%%%%DATADIR%%/timezone/Cuba
-%%TZDATA%%%%DATADIR%%/timezone/EET
-%%TZDATA%%%%DATADIR%%/timezone/EST
-%%TZDATA%%%%DATADIR%%/timezone/EST5EDT
-%%TZDATA%%%%DATADIR%%/timezone/Egypt
-%%TZDATA%%%%DATADIR%%/timezone/Eire
-%%TZDATA%%%%DATADIR%%/timezone/Etc/GMT
-%%TZDATA%%%%DATADIR%%/timezone/Etc/GMT+0
-%%TZDATA%%%%DATADIR%%/timezone/Etc/GMT+1
-%%TZDATA%%%%DATADIR%%/timezone/Etc/GMT+10
-%%TZDATA%%%%DATADIR%%/timezone/Etc/GMT+11
-%%TZDATA%%%%DATADIR%%/timezone/Etc/GMT+12
-%%TZDATA%%%%DATADIR%%/timezone/Etc/GMT+2
-%%TZDATA%%%%DATADIR%%/timezone/Etc/GMT+3
-%%TZDATA%%%%DATADIR%%/timezone/Etc/GMT+4
-%%TZDATA%%%%DATADIR%%/timezone/Etc/GMT+5
-%%TZDATA%%%%DATADIR%%/timezone/Etc/GMT+6
-%%TZDATA%%%%DATADIR%%/timezone/Etc/GMT+7
-%%TZDATA%%%%DATADIR%%/timezone/Etc/GMT+8
-%%TZDATA%%%%DATADIR%%/timezone/Etc/GMT+9
-%%TZDATA%%%%DATADIR%%/timezone/Etc/GMT-0
-%%TZDATA%%%%DATADIR%%/timezone/Etc/GMT-1
-%%TZDATA%%%%DATADIR%%/timezone/Etc/GMT-10
-%%TZDATA%%%%DATADIR%%/timezone/Etc/GMT-11
-%%TZDATA%%%%DATADIR%%/timezone/Etc/GMT-12
-%%TZDATA%%%%DATADIR%%/timezone/Etc/GMT-13
-%%TZDATA%%%%DATADIR%%/timezone/Etc/GMT-14
-%%TZDATA%%%%DATADIR%%/timezone/Etc/GMT-2
-%%TZDATA%%%%DATADIR%%/timezone/Etc/GMT-3
-%%TZDATA%%%%DATADIR%%/timezone/Etc/GMT-4
-%%TZDATA%%%%DATADIR%%/timezone/Etc/GMT-5
-%%TZDATA%%%%DATADIR%%/timezone/Etc/GMT-6
-%%TZDATA%%%%DATADIR%%/timezone/Etc/GMT-7
-%%TZDATA%%%%DATADIR%%/timezone/Etc/GMT-8
-%%TZDATA%%%%DATADIR%%/timezone/Etc/GMT-9
-%%TZDATA%%%%DATADIR%%/timezone/Etc/GMT0
-%%TZDATA%%%%DATADIR%%/timezone/Etc/Greenwich
-%%TZDATA%%%%DATADIR%%/timezone/Etc/UCT
-%%TZDATA%%%%DATADIR%%/timezone/Etc/UTC
-%%TZDATA%%%%DATADIR%%/timezone/Etc/Universal
-%%TZDATA%%%%DATADIR%%/timezone/Etc/Zulu
-%%TZDATA%%%%DATADIR%%/timezone/Europe/Amsterdam
-%%TZDATA%%%%DATADIR%%/timezone/Europe/Andorra
-%%TZDATA%%%%DATADIR%%/timezone/Europe/Astrakhan
-%%TZDATA%%%%DATADIR%%/timezone/Europe/Athens
-%%TZDATA%%%%DATADIR%%/timezone/Europe/Belfast
-%%TZDATA%%%%DATADIR%%/timezone/Europe/Belgrade
-%%TZDATA%%%%DATADIR%%/timezone/Europe/Berlin
-%%TZDATA%%%%DATADIR%%/timezone/Europe/Bratislava
-%%TZDATA%%%%DATADIR%%/timezone/Europe/Brussels
-%%TZDATA%%%%DATADIR%%/timezone/Europe/Bucharest
-%%TZDATA%%%%DATADIR%%/timezone/Europe/Budapest
-%%TZDATA%%%%DATADIR%%/timezone/Europe/Busingen
-%%TZDATA%%%%DATADIR%%/timezone/Europe/Chisinau
-%%TZDATA%%%%DATADIR%%/timezone/Europe/Copenhagen
-%%TZDATA%%%%DATADIR%%/timezone/Europe/Dublin
-%%TZDATA%%%%DATADIR%%/timezone/Europe/Gibraltar
-%%TZDATA%%%%DATADIR%%/timezone/Europe/Guernsey
-%%TZDATA%%%%DATADIR%%/timezone/Europe/Helsinki
-%%TZDATA%%%%DATADIR%%/timezone/Europe/Isle_of_Man
-%%TZDATA%%%%DATADIR%%/timezone/Europe/Istanbul
-%%TZDATA%%%%DATADIR%%/timezone/Europe/Jersey
-%%TZDATA%%%%DATADIR%%/timezone/Europe/Kaliningrad
-%%TZDATA%%%%DATADIR%%/timezone/Europe/Kiev
-%%TZDATA%%%%DATADIR%%/timezone/Europe/Kirov
-%%TZDATA%%%%DATADIR%%/timezone/Europe/Lisbon
-%%TZDATA%%%%DATADIR%%/timezone/Europe/Ljubljana
-%%TZDATA%%%%DATADIR%%/timezone/Europe/London
-%%TZDATA%%%%DATADIR%%/timezone/Europe/Luxembourg
-%%TZDATA%%%%DATADIR%%/timezone/Europe/Madrid
-%%TZDATA%%%%DATADIR%%/timezone/Europe/Malta
-%%TZDATA%%%%DATADIR%%/timezone/Europe/Mariehamn
-%%TZDATA%%%%DATADIR%%/timezone/Europe/Minsk
-%%TZDATA%%%%DATADIR%%/timezone/Europe/Monaco
-%%TZDATA%%%%DATADIR%%/timezone/Europe/Moscow
-%%TZDATA%%%%DATADIR%%/timezone/Europe/Nicosia
-%%TZDATA%%%%DATADIR%%/timezone/Europe/Oslo
-%%TZDATA%%%%DATADIR%%/timezone/Europe/Paris
-%%TZDATA%%%%DATADIR%%/timezone/Europe/Podgorica
-%%TZDATA%%%%DATADIR%%/timezone/Europe/Prague
-%%TZDATA%%%%DATADIR%%/timezone/Europe/Riga
-%%TZDATA%%%%DATADIR%%/timezone/Europe/Rome
-%%TZDATA%%%%DATADIR%%/timezone/Europe/Samara
-%%TZDATA%%%%DATADIR%%/timezone/Europe/San_Marino
-%%TZDATA%%%%DATADIR%%/timezone/Europe/Sarajevo
-%%TZDATA%%%%DATADIR%%/timezone/Europe/Saratov
-%%TZDATA%%%%DATADIR%%/timezone/Europe/Simferopol
-%%TZDATA%%%%DATADIR%%/timezone/Europe/Skopje
-%%TZDATA%%%%DATADIR%%/timezone/Europe/Sofia
-%%TZDATA%%%%DATADIR%%/timezone/Europe/Stockholm
-%%TZDATA%%%%DATADIR%%/timezone/Europe/Tallinn
-%%TZDATA%%%%DATADIR%%/timezone/Europe/Tirane
-%%TZDATA%%%%DATADIR%%/timezone/Europe/Tiraspol
-%%TZDATA%%%%DATADIR%%/timezone/Europe/Ulyanovsk
-%%TZDATA%%%%DATADIR%%/timezone/Europe/Uzhgorod
-%%TZDATA%%%%DATADIR%%/timezone/Europe/Vaduz
-%%TZDATA%%%%DATADIR%%/timezone/Europe/Vatican
-%%TZDATA%%%%DATADIR%%/timezone/Europe/Vienna
-%%TZDATA%%%%DATADIR%%/timezone/Europe/Vilnius
-%%TZDATA%%%%DATADIR%%/timezone/Europe/Volgograd
-%%TZDATA%%%%DATADIR%%/timezone/Europe/Warsaw
-%%TZDATA%%%%DATADIR%%/timezone/Europe/Zagreb
-%%TZDATA%%%%DATADIR%%/timezone/Europe/Zaporozhye
-%%TZDATA%%%%DATADIR%%/timezone/Europe/Zurich
-%%TZDATA%%%%DATADIR%%/timezone/Factory
-%%TZDATA%%%%DATADIR%%/timezone/GB
-%%TZDATA%%%%DATADIR%%/timezone/GB-Eire
-%%TZDATA%%%%DATADIR%%/timezone/GMT
-%%TZDATA%%%%DATADIR%%/timezone/GMT+0
-%%TZDATA%%%%DATADIR%%/timezone/GMT-0
-%%TZDATA%%%%DATADIR%%/timezone/GMT0
-%%TZDATA%%%%DATADIR%%/timezone/Greenwich
-%%TZDATA%%%%DATADIR%%/timezone/HST
-%%TZDATA%%%%DATADIR%%/timezone/Hongkong
-%%TZDATA%%%%DATADIR%%/timezone/Iceland
-%%TZDATA%%%%DATADIR%%/timezone/Indian/Antananarivo
-%%TZDATA%%%%DATADIR%%/timezone/Indian/Chagos
-%%TZDATA%%%%DATADIR%%/timezone/Indian/Christmas
-%%TZDATA%%%%DATADIR%%/timezone/Indian/Cocos
-%%TZDATA%%%%DATADIR%%/timezone/Indian/Comoro
-%%TZDATA%%%%DATADIR%%/timezone/Indian/Kerguelen
-%%TZDATA%%%%DATADIR%%/timezone/Indian/Mahe
-%%TZDATA%%%%DATADIR%%/timezone/Indian/Maldives
-%%TZDATA%%%%DATADIR%%/timezone/Indian/Mauritius
-%%TZDATA%%%%DATADIR%%/timezone/Indian/Mayotte
-%%TZDATA%%%%DATADIR%%/timezone/Indian/Reunion
-%%TZDATA%%%%DATADIR%%/timezone/Iran
-%%TZDATA%%%%DATADIR%%/timezone/Israel
-%%TZDATA%%%%DATADIR%%/timezone/Jamaica
-%%TZDATA%%%%DATADIR%%/timezone/Japan
-%%TZDATA%%%%DATADIR%%/timezone/Kwajalein
-%%TZDATA%%%%DATADIR%%/timezone/Libya
-%%TZDATA%%%%DATADIR%%/timezone/MET
-%%TZDATA%%%%DATADIR%%/timezone/MST
-%%TZDATA%%%%DATADIR%%/timezone/MST7MDT
-%%TZDATA%%%%DATADIR%%/timezone/Mexico/BajaNorte
-%%TZDATA%%%%DATADIR%%/timezone/Mexico/BajaSur
-%%TZDATA%%%%DATADIR%%/timezone/Mexico/General
-%%TZDATA%%%%DATADIR%%/timezone/NZ
-%%TZDATA%%%%DATADIR%%/timezone/NZ-CHAT
-%%TZDATA%%%%DATADIR%%/timezone/Navajo
-%%TZDATA%%%%DATADIR%%/timezone/PRC
-%%TZDATA%%%%DATADIR%%/timezone/PST8PDT
-%%TZDATA%%%%DATADIR%%/timezone/Pacific/Apia
-%%TZDATA%%%%DATADIR%%/timezone/Pacific/Auckland
-%%TZDATA%%%%DATADIR%%/timezone/Pacific/Bougainville
-%%TZDATA%%%%DATADIR%%/timezone/Pacific/Chatham
-%%TZDATA%%%%DATADIR%%/timezone/Pacific/Chuuk
-%%TZDATA%%%%DATADIR%%/timezone/Pacific/Easter
-%%TZDATA%%%%DATADIR%%/timezone/Pacific/Efate
-%%TZDATA%%%%DATADIR%%/timezone/Pacific/Enderbury
-%%TZDATA%%%%DATADIR%%/timezone/Pacific/Fakaofo
-%%TZDATA%%%%DATADIR%%/timezone/Pacific/Fiji
-%%TZDATA%%%%DATADIR%%/timezone/Pacific/Funafuti
-%%TZDATA%%%%DATADIR%%/timezone/Pacific/Galapagos
-%%TZDATA%%%%DATADIR%%/timezone/Pacific/Gambier
-%%TZDATA%%%%DATADIR%%/timezone/Pacific/Guadalcanal
-%%TZDATA%%%%DATADIR%%/timezone/Pacific/Guam
-%%TZDATA%%%%DATADIR%%/timezone/Pacific/Honolulu
-%%TZDATA%%%%DATADIR%%/timezone/Pacific/Johnston
-%%TZDATA%%%%DATADIR%%/timezone/Pacific/Kiritimati
-%%TZDATA%%%%DATADIR%%/timezone/Pacific/Kosrae
-%%TZDATA%%%%DATADIR%%/timezone/Pacific/Kwajalein
-%%TZDATA%%%%DATADIR%%/timezone/Pacific/Majuro
-%%TZDATA%%%%DATADIR%%/timezone/Pacific/Marquesas
-%%TZDATA%%%%DATADIR%%/timezone/Pacific/Midway
-%%TZDATA%%%%DATADIR%%/timezone/Pacific/Nauru
-%%TZDATA%%%%DATADIR%%/timezone/Pacific/Niue
-%%TZDATA%%%%DATADIR%%/timezone/Pacific/Norfolk
-%%TZDATA%%%%DATADIR%%/timezone/Pacific/Noumea
-%%TZDATA%%%%DATADIR%%/timezone/Pacific/Pago_Pago
-%%TZDATA%%%%DATADIR%%/timezone/Pacific/Palau
-%%TZDATA%%%%DATADIR%%/timezone/Pacific/Pitcairn
-%%TZDATA%%%%DATADIR%%/timezone/Pacific/Pohnpei
-%%TZDATA%%%%DATADIR%%/timezone/Pacific/Ponape
-%%TZDATA%%%%DATADIR%%/timezone/Pacific/Port_Moresby
-%%TZDATA%%%%DATADIR%%/timezone/Pacific/Rarotonga
-%%TZDATA%%%%DATADIR%%/timezone/Pacific/Saipan
-%%TZDATA%%%%DATADIR%%/timezone/Pacific/Samoa
-%%TZDATA%%%%DATADIR%%/timezone/Pacific/Tahiti
-%%TZDATA%%%%DATADIR%%/timezone/Pacific/Tarawa
-%%TZDATA%%%%DATADIR%%/timezone/Pacific/Tongatapu
-%%TZDATA%%%%DATADIR%%/timezone/Pacific/Truk
-%%TZDATA%%%%DATADIR%%/timezone/Pacific/Wake
-%%TZDATA%%%%DATADIR%%/timezone/Pacific/Wallis
-%%TZDATA%%%%DATADIR%%/timezone/Pacific/Yap
-%%TZDATA%%%%DATADIR%%/timezone/Poland
-%%TZDATA%%%%DATADIR%%/timezone/Portugal
-%%TZDATA%%%%DATADIR%%/timezone/ROC
-%%TZDATA%%%%DATADIR%%/timezone/ROK
-%%TZDATA%%%%DATADIR%%/timezone/Singapore
-%%TZDATA%%%%DATADIR%%/timezone/Turkey
-%%TZDATA%%%%DATADIR%%/timezone/UCT
-%%TZDATA%%%%DATADIR%%/timezone/US/Alaska
-%%TZDATA%%%%DATADIR%%/timezone/US/Aleutian
-%%TZDATA%%%%DATADIR%%/timezone/US/Arizona
-%%TZDATA%%%%DATADIR%%/timezone/US/Central
-%%TZDATA%%%%DATADIR%%/timezone/US/East-Indiana
-%%TZDATA%%%%DATADIR%%/timezone/US/Eastern
-%%TZDATA%%%%DATADIR%%/timezone/US/Hawaii
-%%TZDATA%%%%DATADIR%%/timezone/US/Indiana-Starke
-%%TZDATA%%%%DATADIR%%/timezone/US/Michigan
-%%TZDATA%%%%DATADIR%%/timezone/US/Mountain
-%%TZDATA%%%%DATADIR%%/timezone/US/Pacific
-%%TZDATA%%%%DATADIR%%/timezone/US/Samoa
-%%TZDATA%%%%DATADIR%%/timezone/UTC
-%%TZDATA%%%%DATADIR%%/timezone/Universal
-%%TZDATA%%%%DATADIR%%/timezone/W-SU
-%%TZDATA%%%%DATADIR%%/timezone/WET
-%%TZDATA%%%%DATADIR%%/timezone/Zulu
-%%TZDATA%%%%DATADIR%%/timezone/posixrules
-%%DATADIR%%/timezonesets/Africa.txt
-%%DATADIR%%/timezonesets/America.txt
-%%DATADIR%%/timezonesets/Antarctica.txt
-%%DATADIR%%/timezonesets/Asia.txt
-%%DATADIR%%/timezonesets/Atlantic.txt
-%%DATADIR%%/timezonesets/Australia
-%%DATADIR%%/timezonesets/Australia.txt
-%%DATADIR%%/timezonesets/Default
-%%DATADIR%%/timezonesets/Etc.txt
-%%DATADIR%%/timezonesets/Europe.txt
-%%DATADIR%%/timezonesets/India
-%%DATADIR%%/timezonesets/Indian.txt
-%%DATADIR%%/timezonesets/Pacific.txt
-%%DATADIR%%/tsearch_data/danish.stop
-%%DATADIR%%/tsearch_data/dutch.stop
-%%DATADIR%%/tsearch_data/english.stop
-%%DATADIR%%/tsearch_data/finnish.stop
-%%DATADIR%%/tsearch_data/french.stop
-%%DATADIR%%/tsearch_data/german.stop
-%%DATADIR%%/tsearch_data/hungarian.stop
-%%DATADIR%%/tsearch_data/hunspell_sample.affix
-%%DATADIR%%/tsearch_data/hunspell_sample_long.affix
-%%DATADIR%%/tsearch_data/hunspell_sample_long.dict
-%%DATADIR%%/tsearch_data/hunspell_sample_num.affix
-%%DATADIR%%/tsearch_data/hunspell_sample_num.dict
-%%DATADIR%%/tsearch_data/ispell_sample.affix
-%%DATADIR%%/tsearch_data/ispell_sample.dict
-%%DATADIR%%/tsearch_data/italian.stop
-%%DATADIR%%/tsearch_data/norwegian.stop
-%%DATADIR%%/tsearch_data/portuguese.stop
-%%DATADIR%%/tsearch_data/russian.stop
-%%DATADIR%%/tsearch_data/spanish.stop
-%%DATADIR%%/tsearch_data/swedish.stop
-%%DATADIR%%/tsearch_data/synonym_sample.syn
-%%DATADIR%%/tsearch_data/thesaurus_sample.ths
-%%DATADIR%%/tsearch_data/turkish.stop
diff --git a/databases/powa-archivist/Makefile b/databases/powa-archivist/Makefile
index 7d3e4d1d2b2b..b33be2e11ac2 100644
--- a/databases/powa-archivist/Makefile
+++ b/databases/powa-archivist/Makefile
@@ -1,12 +1,11 @@
-# Created by: Palle Girgensohn <girgen@FreeBSD.org>
-
 PORTNAME=	powa-archivist
 DISTVERSIONPREFIX=	REL_
-DISTVERSION=	4_0_1
+DISTVERSION=	4_2_2
 CATEGORIES=	databases
 
 MAINTAINER=	girgen@FreeBSD.org
 COMMENT=	PostgreSQL workload analyzer background worker
+WWW=		http://powa.readthedocs.org/en/latest/powa-archivist/index.html
 
 LICENSE=	PostgreSQL
 
@@ -16,7 +15,7 @@ RUN_DEPENDS=	${LOCALBASE}/lib/postgresql/pg_stat_kcache.so:databases/pg_stat_kca
 USE_GITHUB=	yes
 GH_ACCOUNT=	powa-team
 
-USES=		gmake pgsql:9.4+
+USES=		gmake pgsql:11+
 WANT_PGSQL=	server contrib
 
 pre-patch:
diff --git a/databases/powa-archivist/distinfo b/databases/powa-archivist/distinfo
index 2904d997b719..5436a9040036 100644
--- a/databases/powa-archivist/distinfo
+++ b/databases/powa-archivist/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1592989329
-SHA256 (powa-team-powa-archivist-REL_4_0_1_GH0.tar.gz) = 703f9c331e3a992634031f3339e7123ef05eac2f9bba3883e69c354bc1da2db9
-SIZE (powa-team-powa-archivist-REL_4_0_1_GH0.tar.gz) = 67679
+TIMESTAMP = 1700727867
+SHA256 (powa-team-powa-archivist-REL_4_2_2_GH0.tar.gz) = b8b632f822ee90ed6c2d67d623b7942123650660886b27616c60439cd02ff9a0
+SIZE (powa-team-powa-archivist-REL_4_2_2_GH0.tar.gz) = 260530
diff --git a/databases/powa-archivist/pkg-descr b/databases/powa-archivist/pkg-descr
index d53ccccfcf4c..8583242c19d2 100644
--- a/databases/powa-archivist/pkg-descr
+++ b/databases/powa-archivist/pkg-descr
@@ -1,5 +1,3 @@
 This project is the core extension of the PoWA project, a PostgreSQL Workload
 Analyzer that gathers performance stats and provides real-time charts and
 graphs to help monitor and tune your PostgreSQL servers.
-
-WWW: http://powa.readthedocs.org/en/latest/powa-archivist/index.html
diff --git a/databases/powa-archivist/pkg-plist b/databases/powa-archivist/pkg-plist
index 4724ed98c742..566c6b7733cd 100644
--- a/databases/powa-archivist/pkg-plist
+++ b/databases/powa-archivist/pkg-plist
@@ -5,8 +5,24 @@ share/doc/postgresql/extension/powa-INSTALL.md
 share/doc/postgresql/extension/powa-LICENSE.md
 share/doc/postgresql/extension/powa-PL_funcs.md
 share/doc/postgresql/extension/powa-README.md
-share/postgresql/extension/powa--3.2.0.sql
 share/postgresql/extension/powa--4.0.0--4.0.1.sql
 share/postgresql/extension/powa--4.0.0.sql
+share/postgresql/extension/powa--4.0.1--4.1.0.sql
 share/postgresql/extension/powa--4.0.1.sql
+share/postgresql/extension/powa--4.1.0--4.1.1.sql
+share/postgresql/extension/powa--4.1.0.sql
+share/postgresql/extension/powa--4.1.1--4.1.2.sql
+share/postgresql/extension/powa--4.1.1.sql
+share/postgresql/extension/powa--4.1.2--4.1.3.sql
+share/postgresql/extension/powa--4.1.2.sql
+share/postgresql/extension/powa--4.1.3--4.1.4.sql
+share/postgresql/extension/powa--4.1.3.sql
+share/postgresql/extension/powa--4.1.4--4.2.0.sql
+share/postgresql/extension/powa--4.1.4--4.2.1.sql
+share/postgresql/extension/powa--4.1.4.sql
+share/postgresql/extension/powa--4.2.0--4.2.1.sql
+share/postgresql/extension/powa--4.2.0.sql
+share/postgresql/extension/powa--4.2.1--4.2.2.sql
+share/postgresql/extension/powa--4.2.1.sql
+share/postgresql/extension/powa--4.2.2.sql
 share/postgresql/extension/powa.control
diff --git a/databases/powa-web/Makefile b/databases/powa-web/Makefile
index 6cdd2a6013b6..2dc5ad9fb75a 100644
--- a/databases/powa-web/Makefile
+++ b/databases/powa-web/Makefile
@@ -1,13 +1,12 @@
-# Created by: Palle Girgensohn <girgen@FreeBSD.org>
-
 PORTNAME=	powa-web
-PORTVERSION=	4.0.2
+PORTVERSION=	4.2.0
 CATEGORIES=	databases python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	girgen@FreeBSD.org
 COMMENT=	PostgreSQL Workload Analyzer is a performance tool for PostgreSQL
+WWW=		https://powa.readthedocs.org/
 
 LICENSE=	PostgreSQL
 
@@ -15,7 +14,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}psycopg2>0:databases/py-psycopg2@${PY_FLAVOR
 		${PYTHON_PKGNAMEPREFIX}sqlalchemy10>=1.0:databases/py-sqlalchemy10@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}tornado>=2.0:www/py-tornado@${PY_FLAVOR}
 
-USES=		python:3.6+
+USES=		python
 USE_PYTHON=	distutils autoplist
 NO_ARCH=	yes
 
diff --git a/databases/powa-web/distinfo b/databases/powa-web/distinfo
index 088c7cf538bf..5ec3ecebcfc9 100644
--- a/databases/powa-web/distinfo
+++ b/databases/powa-web/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1598863311
-SHA256 (powa-web-4.0.2.tar.gz) = f1fb85293f4eac7b6d283422b4268605dec371d794a45b9f623b772cd593988a
-SIZE (powa-web-4.0.2.tar.gz) = 8175439
+TIMESTAMP = 1695198248
+SHA256 (powa-web-4.2.0.tar.gz) = 2347c06d2bd8fb9f76b2b440fef9e740839eedf9a01564a7e4364b0391544754
+SIZE (powa-web-4.2.0.tar.gz) = 648657
diff --git a/databases/powa-web/pkg-descr b/databases/powa-web/pkg-descr
index 130ec99a680a..d20aaae34018 100644
--- a/databases/powa-web/pkg-descr
+++ b/databases/powa-web/pkg-descr
@@ -4,6 +4,4 @@ PostgreSQL instance from various sources. It is implemented as a background
 worker.
 
 Install databases/powa-archivist on your database servers, and this port
-on any achine with psql access to the databases.
-
-WWW: http://powa.readthedocs.org/
+on any machine with psql access to the databases.
diff --git a/databases/powerarchitect/Makefile b/databases/powerarchitect/Makefile
index 2308e98bbb90..8d63f5ef50ae 100644
--- a/databases/powerarchitect/Makefile
+++ b/databases/powerarchitect/Makefile
@@ -1,24 +1,23 @@
-# Created by: Jose Garcia Juanino <jjuanino@gmail.com>
-
 PORTNAME=	powerarchitect
-PORTVERSION=	1.0.8
-PORTREVISION=	1
+PORTVERSION=	1.0.9
 CATEGORIES=	databases java
-MASTER_SITES=	http://download.sqlpower.ca/architect/1.0.8/community/
-DISTNAME=	SQL-Power-Architect-generic-jdbc-${PORTVERSION}
+MASTER_SITES=	http://www.bestofbi.com/downloads/architect/${PORTVERSION}/
+DISTNAME=	SQL-Power-Architect-generic-${PORTVERSION}
 
-MAINTAINER=	jjuanino@gmail.com
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Data modeling and profiling tool
+WWW=		http://www.bestofbi.com/page/architect
 
 LICENSE=	GPLv3
 
 USE_JAVA=	yes
+NO_ARCH=	yes
 NO_BUILD=	yes
+SUB_FILES=	${PORTNAME}
 
 PORTDOCS=	*
 DATADIR=	${JAVASHAREDIR}/${PORTNAME}
 WRKSRC=		${WRKDIR}/architect-${PORTVERSION}
-SUB_FILES=	${PORTNAME}
 
 OPTIONS_DEFINE=	DOCS MYSQL_JDBC PGSQL_JDBC
 
@@ -26,15 +25,17 @@ MYSQL_JDBC_RUN_DEPENDS=	${JAVALIBDIR}/mysql-connector-java.jar:databases/mysql-c
 PGSQL_JDBC_RUN_DEPENDS=	${JAVALIBDIR}/postgresql.jar:databases/postgresql-jdbc
 
 do-install:
-	@${MKDIR} ${STAGEDIR}/${DATADIR}/jdbc
+	@${MKDIR} ${STAGEDIR}/${DATADIR}
 	(cd ${WRKSRC}/ && \
-	    ${INSTALL_DATA} architect.jar ${STAGEDIR}/${DATADIR}/ && \
-	    ${INSTALL_DATA} jdbc/sqlserver_2005.jar ${STAGEDIR}/${DATADIR}/jdbc/ && \
-	    ${COPYTREE_SHARE} lib ${STAGEDIR}/${DATADIR})
-	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${STAGEDIR}/${PREFIX}/bin/${PORTNAME}
+		${INSTALL_DATA} architect.jar \
+		${STAGEDIR}/${DATADIR}/ && \
+		${COPYTREE_SHARE} lib ${STAGEDIR}/${DATADIR})
+	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} \
+		${STAGEDIR}/${PREFIX}/bin/${PORTNAME}
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}/${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/README.generic ${STAGEDIR}/${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/README.generic \
+		${STAGEDIR}/${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/databases/powerarchitect/distinfo b/databases/powerarchitect/distinfo
index d02603234702..8140c419cb90 100644
--- a/databases/powerarchitect/distinfo
+++ b/databases/powerarchitect/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1490528072
-SHA256 (SQL-Power-Architect-generic-jdbc-1.0.8.tar.gz) = 1e17e1f8b3277509d5e4e6dbc524831c7591c43b64c7f6c3b53044ebe741886b
-SIZE (SQL-Power-Architect-generic-jdbc-1.0.8.tar.gz) = 25106766
+TIMESTAMP = 1636225865
+SHA256 (SQL-Power-Architect-generic-1.0.9.tar.gz) = 2817d634965530792bf51a1d8b5d308b665915b94fa7a560612d4fbd21a6ef6f
+SIZE (SQL-Power-Architect-generic-1.0.9.tar.gz) = 27822585
diff --git a/databases/powerarchitect/pkg-descr b/databases/powerarchitect/pkg-descr
index 0bf0820ca8bb..55baf403472c 100644
--- a/databases/powerarchitect/pkg-descr
+++ b/databases/powerarchitect/pkg-descr
@@ -8,5 +8,3 @@ metadata.
 
 Plus, the Power*Architect has the ability to take snapshots of database
 structures, allowing users to design DW data models while working offline.
-
-WWW: http://software.sqlpower.ca/page/demos
diff --git a/databases/powerarchitect/pkg-plist b/databases/powerarchitect/pkg-plist
index b8136c283e04..2f46646d7b98 100644
--- a/databases/powerarchitect/pkg-plist
+++ b/databases/powerarchitect/pkg-plist
@@ -1,9 +1,9 @@
 bin/powerarchitect
 %%DATADIR%%/architect.jar
-%%DATADIR%%/jdbc/sqlserver_2005.jar
 %%DATADIR%%/lib/activation.jar
 %%DATADIR%%/lib/annotations.jar
 %%DATADIR%%/lib/apache-mime4j-0.6.jar
+%%DATADIR%%/lib/architecthelp.jar
 %%DATADIR%%/lib/commons-beanutils-bean-collections.jar
 %%DATADIR%%/lib/commons-beanutils-core.jar
 %%DATADIR%%/lib/commons-beanutils.jar
@@ -21,6 +21,7 @@ bin/powerarchitect
 %%DATADIR%%/lib/eigenbase-properties.jar
 %%DATADIR%%/lib/forms-1.3.0.jar
 %%DATADIR%%/lib/guava-11.0.2.jar
+%%DATADIR%%/lib/hamcrest-core-1.3.jar
 %%DATADIR%%/lib/httpclient-4.0.jar
 %%DATADIR%%/lib/httpcore-4.0.1.jar
 %%DATADIR%%/lib/httpmime-4.0.jar
@@ -30,7 +31,7 @@ bin/powerarchitect
 %%DATADIR%%/lib/jfreechart-1.0.1.jar
 %%DATADIR%%/lib/jmdns-2.1.jar
 %%DATADIR%%/lib/jsr305.jar
-%%DATADIR%%/lib/junit-3.8.2.jar
+%%DATADIR%%/lib/junit-4.12.jar
 %%DATADIR%%/lib/kettle-core-3.2.2.jar
 %%DATADIR%%/lib/kettle-db-3.2.2.jar
 %%DATADIR%%/lib/kettle-engine-3.2.2.jar
@@ -39,6 +40,7 @@ bin/powerarchitect
 %%DATADIR%%/lib/miglayout-3.7-swing.jar
 %%DATADIR%%/lib/olap4j-0.9.7.302.jar
 %%DATADIR%%/lib/opencsv-1.8.jar
+%%DATADIR%%/lib/osx_adapter.jar
 %%DATADIR%%/lib/piccolo.jar
 %%DATADIR%%/lib/piccolox.jar
 %%DATADIR%%/lib/rsyntaxtextarea.jar
diff --git a/databases/proftpd-mod_sql_mysql/Makefile b/databases/proftpd-mod_sql_mysql/Makefile
index 5de47240bb9e..f3329ae3517b 100644
--- a/databases/proftpd-mod_sql_mysql/Makefile
+++ b/databases/proftpd-mod_sql_mysql/Makefile
@@ -1,11 +1,10 @@
-# Created by: Martin Matuska <mm@FreeBSD.org>
-
 PORTNAME=	mod_sql_mysql
 CATEGORIES=	databases ftp
 PKGNAMEPREFIX=	proftpd-
 
 MAINTAINER=	mm@FreeBSD.org
 COMMENT=	MySQL ProFTPD module
+WWW=		http://www.proftpd.org/docs/contrib/mod_sql.html
 
 LICENSE=	GPLv2
 
diff --git a/databases/proftpd-mod_sql_mysql/pkg-descr b/databases/proftpd-mod_sql_mysql/pkg-descr
index 42ec81308495..54f369dbb3b0 100644
--- a/databases/proftpd-mod_sql_mysql/pkg-descr
+++ b/databases/proftpd-mod_sql_mysql/pkg-descr
@@ -1,3 +1 @@
 MySQL backend module for mod_sql of ProFTPD
-
-WWW: http://www.proftpd.org/docs/contrib/mod_sql.html
diff --git a/databases/proftpd-mod_sql_odbc/Makefile b/databases/proftpd-mod_sql_odbc/Makefile
index eec50b2cbe6c..349c714ca7ce 100644
--- a/databases/proftpd-mod_sql_odbc/Makefile
+++ b/databases/proftpd-mod_sql_odbc/Makefile
@@ -1,11 +1,10 @@
-# Created by: Martin Matuska <mm@FreeBSD.org>
-
 PORTNAME=	mod_sql_odbc
 CATEGORIES=	databases ftp
 PKGNAMEPREFIX=	proftpd-
 
 MAINTAINER=	mm@FreeBSD.org
 COMMENT=	ODBC ProFTPD module
+WWW=		http://www.proftpd.org/docs/contrib/mod_sql.html
 
 LICENSE=	GPLv2
 
diff --git a/databases/proftpd-mod_sql_odbc/pkg-descr b/databases/proftpd-mod_sql_odbc/pkg-descr
index a6ad4d0ec942..ebd8a1108c37 100644
--- a/databases/proftpd-mod_sql_odbc/pkg-descr
+++ b/databases/proftpd-mod_sql_odbc/pkg-descr
@@ -1,3 +1 @@
 ODBC backend module for mod_sql of ProFTPD
-
-WWW: http://www.proftpd.org/docs/contrib/mod_sql.html
diff --git a/databases/proftpd-mod_sql_postgres/Makefile b/databases/proftpd-mod_sql_postgres/Makefile
index ce24871d4ef2..9cd1632766e8 100644
--- a/databases/proftpd-mod_sql_postgres/Makefile
+++ b/databases/proftpd-mod_sql_postgres/Makefile
@@ -1,5 +1,3 @@
-# Created by: Martin Matuska <mm@FreeBSD.org>
-
 PORTNAME=	mod_sql_postgres
 PORTREVISION=	2
 CATEGORIES=	databases ftp
@@ -7,6 +5,7 @@ PKGNAMEPREFIX=	proftpd-
 
 MAINTAINER=	mm@FreeBSD.org
 COMMENT=	PostgreSQL ProFTPD module
+WWW=		http://www.proftpd.org/docs/contrib/mod_sql.html
 
 LICENSE=	GPLv2
 
diff --git a/databases/proftpd-mod_sql_postgres/pkg-descr b/databases/proftpd-mod_sql_postgres/pkg-descr
index e6d171eb2e46..346f19498415 100644
--- a/databases/proftpd-mod_sql_postgres/pkg-descr
+++ b/databases/proftpd-mod_sql_postgres/pkg-descr
@@ -1,3 +1 @@
 PostgreSQL backend module for mod_sql of ProFTPD
-
-WWW: http://www.proftpd.org/docs/contrib/mod_sql.html
diff --git a/databases/proftpd-mod_sql_sqlite/Makefile b/databases/proftpd-mod_sql_sqlite/Makefile
index bd123bb412d8..6b963e7c28dd 100644
--- a/databases/proftpd-mod_sql_sqlite/Makefile
+++ b/databases/proftpd-mod_sql_sqlite/Makefile
@@ -1,5 +1,3 @@
-# Created by: Martin Matuska <mm@FreeBSD.org>
-
 PORTNAME=	mod_sql_sqlite
 PORTREVISION=	3
 CATEGORIES=	databases ftp
@@ -7,6 +5,7 @@ PKGNAMEPREFIX=	proftpd-
 
 MAINTAINER=	mm@FreeBSD.org
 COMMENT=	SQLite ProFTPD module
+WWW=		http://www.proftpd.org/docs/contrib/mod_sql.html
 
 LICENSE=	GPLv2
 
diff --git a/databases/proftpd-mod_sql_sqlite/pkg-descr b/databases/proftpd-mod_sql_sqlite/pkg-descr
index 8de6a98dbcc0..d284654001e7 100644
--- a/databases/proftpd-mod_sql_sqlite/pkg-descr
+++ b/databases/proftpd-mod_sql_sqlite/pkg-descr
@@ -1,3 +1 @@
 SQLite backend module for mod_sql of ProFTPD
-
-WWW: http://www.proftpd.org/docs/contrib/mod_sql.html
diff --git a/databases/proftpd-mod_sql_tds/Makefile b/databases/proftpd-mod_sql_tds/Makefile
index d8a0419d2828..f352426348fc 100644
--- a/databases/proftpd-mod_sql_tds/Makefile
+++ b/databases/proftpd-mod_sql_tds/Makefile
@@ -1,5 +1,3 @@
-# Created by: Martin Matuska <mm@FreeBSD.org>
-
 PORTNAME=	mod_sql_tds
 DISTVERSION=	4.13
 PORTREVISION=	2
@@ -8,6 +6,7 @@ PKGNAMEPREFIX=	proftpd-
 
 MAINTAINER=	mm@FreeBSD.org
 COMMENT=	TDS ProFTPD module
+WWW=		http://labratsoftware.com/mod_sql_tds/
 
 LICENSE=	GPLv2
 
diff --git a/databases/proftpd-mod_sql_tds/distinfo b/databases/proftpd-mod_sql_tds/distinfo
index 9d46581fc619..09787482e586 100644
--- a/databases/proftpd-mod_sql_tds/distinfo
+++ b/databases/proftpd-mod_sql_tds/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1630315047
-SHA256 (proftpd-1.3.7c.tar.gz) = 7070968b9b6cf614ce7f756c8c1a66c32c1afa4f961784a62301790a801400da
-SIZE (proftpd-1.3.7c.tar.gz) = 20428648
+TIMESTAMP = 1704671177
+SHA256 (proftpd-1.3.8b.tar.gz) = 183ab7c6107de271a2959ff268f55c9b6c76b2cf0029e6584fccc019686601e0
+SIZE (proftpd-1.3.8b.tar.gz) = 19752808
 SHA256 (mod_sql_tds-4.13.tar.gz) = 9d9fb6c4b9a952739a84e166ed8b0d93f539c7bcf73e32923318e00cbd7eea08
 SIZE (mod_sql_tds-4.13.tar.gz) = 11688
diff --git a/databases/proftpd-mod_sql_tds/pkg-descr b/databases/proftpd-mod_sql_tds/pkg-descr
index 4cddc74f0e8d..1e8da4258c37 100644
--- a/databases/proftpd-mod_sql_tds/pkg-descr
+++ b/databases/proftpd-mod_sql_tds/pkg-descr
@@ -1,3 +1 @@
 TDS backend module for mod_sql of ProFTPD
-
-WWW: http://labratsoftware.com/mod_sql_tds/
diff --git a/databases/prometheus-postgresql-adapter/Makefile b/databases/prometheus-postgresql-adapter/Makefile
index caea3dba4b63..76a9ea591d65 100644
--- a/databases/prometheus-postgresql-adapter/Makefile
+++ b/databases/prometheus-postgresql-adapter/Makefile
@@ -1,10 +1,12 @@
 PORTNAME=	prometheus-postgresql-adapter
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.6.0
+PORTREVISION=	18
 CATEGORIES=	databases
 
 MAINTAINER=	felix@userspace.com.au
 COMMENT=	Use PostgreSQL as a remote storage database for Prometheus
+WWW=		https://github.com/timescale/prometheus-postgresql-adapter
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
diff --git a/databases/prometheus-postgresql-adapter/pkg-descr b/databases/prometheus-postgresql-adapter/pkg-descr
index 37419f35209f..efb51b49c334 100644
--- a/databases/prometheus-postgresql-adapter/pkg-descr
+++ b/databases/prometheus-postgresql-adapter/pkg-descr
@@ -1,3 +1 @@
 Use PostgreSQL as a remote storage database for Prometheus
-
-WWW: https://github.com/timescale/prometheus-postgresql-adapter
diff --git a/databases/proxysql/Makefile b/databases/proxysql/Makefile
new file mode 100644
index 000000000000..c67986117e8e
--- /dev/null
+++ b/databases/proxysql/Makefile
@@ -0,0 +1,78 @@
+PORTNAME=	proxysql
+PORTVERSION=	2.6.2
+CATEGORIES=	databases
+
+MAINTAINER=	zi@FreeBSD.org
+COMMENT=	High performance, high availability, protocol-aware proxy for MySQL
+WWW=		https://www.proxysql.com/
+
+LICENSE=	GPLv3
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
+BUILD_DEPENDS=	aclocal:devel/automake \
+		autoreconf:devel/autoconf \
+		bash:shells/bash \
+		cmake:devel/cmake-core \
+		${LOCALBASE}/bin/grep:textproc/gnugrep \
+		libgcrypt>0:security/libgcrypt \
+		libtoolize:devel/libtool \
+		e2fsprogs-libuuid>0:misc/e2fsprogs-libuuid \
+		gnutls>0:security/gnutls
+RUN_DEPENDS=	libgcrypt>0:security/libgcrypt \
+		e2fsprogs-libuuid>0:misc/e2fsprogs-libuuid \
+		gnutls>0:security/gnutls
+
+USES=		compiler:c++11-lang gmake libtool perl5 python:build shebangfix
+USE_PERL5=	build
+USE_GCC=	yes
+MAKE_ENV=	GIT_VERSION=${PORTVERSION}
+USE_GITHUB=	yes
+ALL_TARGET=	build_deps default
+SHEBANG_FILES=	deps/libssl/verify-bio_st-match.sh
+LDFLAGS+=	-L${LOCALBASE}/lib
+BINARY_ALIAS=	python3=${PYTHON_CMD}
+USE_RC_SUBR=	${PORTNAME}
+
+USERS=		${PORTNAME}
+GROUPS=		${PORTNAME}
+
+GH_ACCOUNT=	sysown
+
+post-patch:
+	@${REINPLACE_CMD} -e 's,/etc/,${ETCDIR}/,g' ${WRKSRC}/lib/ProxySQL_GloVars.cpp
+	@${REINPLACE_CMD} \
+		-e 's|strftime(__buffer, 25, "%Y-%m-%d %H:%M:%S", __tm_info);|snprintf(__buffer, 3, "%s", "");|g' \
+		-e 's,"%s \[,"%s\[,g' \
+		-e '/__timer/d' \
+		-e '/__tm_info/d' \
+		${WRKSRC}/include/proxysql_debug.h
+	@${REINPLACE_CMD} \
+		-e 's,/var/lib,/var/db,g' \
+		-e '7s/^/errorlog="\/var\/log\/proxysql\/proxysql-error.log"\n\n/g' \
+		-e '7s/^/pid="\/var\/run\/${PORTNAME}\/${PORTNAME}.pid"\n/g' \
+		${WRKSRC}/src/proxysql.cfg
+	@${REINPLACE_CMD} \
+		-e 's,grep,${LOCALBASE}/bin/grep,g' \
+		-e 's,ln -fsT,ln -fs,' \
+		-e 's,PROXYSQLCLICKHOUSE=1 ,,g' \
+		-e 's,--enable-fastopen=false ,--enable-fastopen=false --enable-shared=no ,g' \
+		${WRKSRC}/Makefile ${WRKSRC}/deps/Makefile \
+		${WRKSRC}/lib/Makefile ${WRKSRC}/src/Makefile
+
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/src/proxysql ${STAGEDIR}${LOCALBASE}/sbin
+
+post-install:
+	${MKDIR} ${STAGEDIR}${ETCDIR} ${STAGEDIR}/var/db/${PORTNAME} \
+		${STAGEDIR}/var/run/${PORTNAME} \
+		${STAGEDIR}${LOCALBASE}/etc/syslog.d \
+		${STAGEDIR}${PREFIX}/etc/newsyslog.conf.d \
+		${STAGEDIR}/var/log/${PORTNAME}
+	${INSTALL_DATA} ${FILESDIR}/${PORTNAME}.conf \
+		${STAGEDIR}${LOCALBASE}/etc/syslog.d
+	${INSTALL_DATA} ${FILESDIR}/proxysql.conf-newsyslog \
+		${STAGEDIR}${PREFIX}/etc/newsyslog.conf.d/proxysql.conf.sample
+	${INSTALL_DATA} ${WRKSRC}/src/proxysql.cfg \
+		${STAGEDIR}${ETCDIR}/proxysql.cfg.sample
+
+.include <bsd.port.mk>
diff --git a/databases/proxysql/distinfo b/databases/proxysql/distinfo
new file mode 100644
index 000000000000..835f10ae1ca2
--- /dev/null
+++ b/databases/proxysql/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1712301882
+SHA256 (sysown-proxysql-2.6.2_GH0.tar.gz) = dc0bd1cf9261ba8277a94da4db9a5fe4d628d1b21c201424c783f715d0d394db
+SIZE (sysown-proxysql-2.6.2_GH0.tar.gz) = 50030275
diff --git a/databases/proxysql/files/patch-lib_ProxySQL__RESTAPI__Server.cpp b/databases/proxysql/files/patch-lib_ProxySQL__RESTAPI__Server.cpp
new file mode 100644
index 000000000000..72ae22c8e798
--- /dev/null
+++ b/databases/proxysql/files/patch-lib_ProxySQL__RESTAPI__Server.cpp
@@ -0,0 +1,11 @@
+--- lib/ProxySQL_RESTAPI_Server.cpp.orig	2024-04-01 15:50:50 UTC
++++ lib/ProxySQL_RESTAPI_Server.cpp
+@@ -346,7 +346,7 @@ ProxySQL_RESTAPI_Server::ProxySQL_RESTAPI_Server(
+ 	// NOTE: Right now ProxySQL is using the simplest mode of 'libhttpserver' for serving 'REST' queries,
+ 	// in the current mode concurrency on serving requests is low, and throughput is directly related with
+ 	// the time required to execute the target script, since each of the calls are blocking.
+-	ws = std::unique_ptr<httpserver::webserver>(new webserver(create_webserver(p)));
++	ws = std::unique_ptr<httpserver::webserver>(new webserver(create_webserver(p).start_method(http::http_utils::start_method_T::THREAD_PER_CONNECTION)));
+ 	// NOTE: Enable for benchmarking purposes. In this mode each request will be served by it's own thread.
+ 	// ws = std::unique_ptr<httpserver::webserver>(new webserver(create_webserver(p).start_method(http::http_utils::start_method_T::THREAD_PER_CONNECTION)));
+ 	auto sr = new sync_resource();
diff --git a/databases/proxysql/files/proxysql.conf b/databases/proxysql/files/proxysql.conf
new file mode 100644
index 000000000000..68fbfbcf23e8
--- /dev/null
+++ b/databases/proxysql/files/proxysql.conf
@@ -0,0 +1,2 @@
+!proxysql
+*.*						/var/log/proxysql.log
diff --git a/databases/proxysql/files/proxysql.conf-newsyslog b/databases/proxysql/files/proxysql.conf-newsyslog
new file mode 100644
index 000000000000..8a51ca3a6927
--- /dev/null
+++ b/databases/proxysql/files/proxysql.conf-newsyslog
@@ -0,0 +1 @@
+/var/log/proxysql.log	root:wheel	640  10	   1000	*     JC
diff --git a/databases/proxysql/files/proxysql.in b/databases/proxysql/files/proxysql.in
new file mode 100644
index 000000000000..9220f30c0889
--- /dev/null
+++ b/databases/proxysql/files/proxysql.in
@@ -0,0 +1,61 @@
+#!/bin/sh
+
+# PROVIDE: proxysql
+# REQUIRE: LOGIN mysql
+# KEYWORD: shutdown
+#
+# Add the following lines to /etc/rc.conf.local or /etc/rc.conf
+# to enable this service:
+#
+# proxysql_enable (bool):          Set to NO by default.
+#               Set it to YES to enable proxysql.
+# proxysql_user (string):          Set user that proxysql will run under
+#               Default is "proxysql".
+# proxysql_group (string):         Set group that proxysql will run under
+#               Default is "proxysql".
+# proxysql_config (string):        Set path to config file
+#               Default is "%%ETCDIR%%/proxysql.cfg".
+# proxysql_args (string):          Set extra arguments to pass to proxysql
+#               Default is "".
+
+. /etc/rc.subr
+
+name=proxysql
+rcvar=proxysql_enable
+
+load_rc_config $name
+
+: ${proxysql_enable:="NO"}
+: ${proxysql_user:="proxysql"}
+: ${proxysql_group:="proxysql"}
+: ${proxysql_config:="%%ETCDIR%%/proxysql.cfg"}
+: ${proxysql_datadir:="/var/db/proxysql"}
+: ${proxysql_args:=""}
+: ${proxysql_restart_delay:="10"}
+
+
+pidfile="/var/run/proxysql/proxysql.pid"
+command="/usr/sbin/daemon"
+proxysql_command="%%PREFIX%%/sbin/proxysql"
+command_args="-rP ${pidfile} -S -R ${proxysql_restart_delay} \
+    -T ${name} ${proxysql_command} \
+    -f -c ${proxysql_config} \
+    -D ${proxysql_datadir} \
+    --no-version-check ${proxysql_args}"
+required_files="${proxysql_config}"
+extra_commands="reload initial"
+reload_cmd=proxysql_reload
+initial_cmd=proxysql_initial
+
+proxysql_initial()
+{
+    su -m ${proxysql_user} -c "${proxysql_command} --initial"
+}
+
+proxysql_reload()
+{
+    su -m ${proxysql_user} -c "${proxysql_command} --reload"
+}
+
+load_rc_config $name
+run_rc_command "$1"
diff --git a/databases/proxysql/pkg-descr b/databases/proxysql/pkg-descr
new file mode 100644
index 000000000000..265692c0bee4
--- /dev/null
+++ b/databases/proxysql/pkg-descr
@@ -0,0 +1,9 @@
+ProxySQL is a high performance, high availability, protocol aware proxy for
+MySQL and forks (like Percona Server and MariaDB).
+
+With its ability to intelligently route queries, balance loads, and provide
+failover handling, ProxySQL empowers organizations to harness the full
+potential of their database infrastructure. Whether grappling with
+scalability challenges, striving to enhance performance, or seeking to
+ensure high availability, ProxySQL emerges as a versatile ally, capable of
+addressing diverse needs across various database environments.
diff --git a/databases/proxysql/pkg-message b/databases/proxysql/pkg-message
new file mode 100644
index 000000000000..f8af81593652
--- /dev/null
+++ b/databases/proxysql/pkg-message
@@ -0,0 +1,9 @@
+[
+{ type: install
+  message: <<EOM
+In order for logging to function, you must restart syslogd:
+
+# service syslogd restart
+EOM
+}
+]
diff --git a/databases/proxysql/pkg-plist b/databases/proxysql/pkg-plist
new file mode 100644
index 000000000000..f49b893c5a16
--- /dev/null
+++ b/databases/proxysql/pkg-plist
@@ -0,0 +1,10 @@
+etc/syslog.d/proxysql.conf
+sbin/proxysql
+@dir(,proxysql,0750) %%ETCDIR%%
+@sample(,proxysql,0640) %%ETCDIR%%/proxysql.cfg.sample
+@sample %%LOCALBASE%%/etc/newsyslog.conf.d/proxysql.conf.sample
+@dir(proxysql,proxysql,0750) /var/db/proxysql
+@dir(proxysql,proxysql,0750) /var/run/proxysql
+@dir(proxysql,proxysql,0750) /var/log/proxysql
+@postexec test -f /var/log/proxysql.log || touch /var/log/proxysql.log
+@postexec chmod 600 /var/log/proxysql.log
diff --git a/databases/pspg/Makefile b/databases/pspg/Makefile
index 3b9c89b43e3d..3b0153c6080b 100644
--- a/databases/pspg/Makefile
+++ b/databases/pspg/Makefile
@@ -1,9 +1,11 @@
 PORTNAME=	pspg
-DISTVERSION=	5.3.4
+DISTVERSION=	5.7.4
+PORTREVISION=	1
 CATEGORIES=	databases
 
 MAINTAINER=	dmgk@FreeBSD.org
 COMMENT=	Tabular data pager designed to be used with psql
+WWW=		https://github.com/okbob/pspg
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
@@ -18,7 +20,7 @@ GNU_CONFIGURE=	yes
 
 SUB_FILES=	pkg-message
 
-PLIST_FILES=	bin/pspg
+PLIST_FILES=	bin/pspg share/man/man1/pspg.1.gz
 PORTDOCS=	README.md
 
 OPTIONS_DEFINE=		DOCS INOTIFY PGSQL
@@ -38,6 +40,7 @@ PGSQL_VARS=		WANT_PGSQL=client
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/pspg
+	${INSTALL_MAN} ${WRKSRC}/pspg.1 ${STAGEDIR}${PREFIX}/share/man/man1/
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
diff --git a/databases/pspg/distinfo b/databases/pspg/distinfo
index 6424286d788e..ca01d4415cd4 100644
--- a/databases/pspg/distinfo
+++ b/databases/pspg/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1629296277
-SHA256 (okbob-pspg-5.3.4_GH0.tar.gz) = 598c672d955b4f9ae6ddfe638b2f2604830525b4d871f0ff360a451ff7af4fda
-SIZE (okbob-pspg-5.3.4_GH0.tar.gz) = 1834528
+TIMESTAMP = 1676490245
+SHA256 (okbob-pspg-5.7.4_GH0.tar.gz) = c7bec2a4640f6255b32c698c1c6d9e3e868585137016f35a1a5bc7c25dcd67b5
+SIZE (okbob-pspg-5.7.4_GH0.tar.gz) = 2440477
diff --git a/databases/pspg/pkg-descr b/databases/pspg/pkg-descr
index 5956d33dcfc6..473128550fa7 100644
--- a/databases/pspg/pkg-descr
+++ b/databases/pspg/pkg-descr
@@ -2,5 +2,3 @@ pspg is a small specialized pager designed to work with tables. Its primary
 purpose is to work as PostgreSQL pager, but MySQL is supported too. Main
 features include the ability to freeze first few rows/columns, possibility to
 sort data by specified numeric column and configurable color themes.
-
-WWW: https://github.com/okbob/pspg
diff --git a/databases/puppetdb-terminus6/Makefile b/databases/puppetdb-terminus6/Makefile
deleted file mode 100644
index 28e7d9f5f510..000000000000
--- a/databases/puppetdb-terminus6/Makefile
+++ /dev/null
@@ -1,26 +0,0 @@
-PORTNAME=	puppetdb-terminus
-PORTVERSION=	6.18.0
-CATEGORIES=	databases ruby
-MASTER_SITES=	https://downloads.puppetlabs.com/puppetdb/
-PKGNAMESUFFIX=	6
-DISTNAME=	puppetdb-${PORTVERSION}
-
-MAINTAINER=	puppet@FreeBSD.org
-COMMENT=	PuppetDB storeconfigs backend terminus module
-
-LICENSE=	APACHE20
-
-BUILD_DEPENDS=	puppet6>=0:sysutils/puppet6
-
-CONFLICTS_INSTALL=	puppetdb-terminus5-* puppetdb-terminus7-*
-USE_RUBY=	yes
-NO_BUILD=	yes
-USES=		gmake
-
-post-patch:
-	@${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|" ${WRKSRC}/Makefile
-
-do-install:
-	@cd ${WRKSRC} && ${SETENV} DESTDIR=${STAGEDIR} ${GMAKE} install-puppetdb-termini
-
-.include <bsd.port.mk>
diff --git a/databases/puppetdb-terminus6/distinfo b/databases/puppetdb-terminus6/distinfo
deleted file mode 100644
index ea2db49de485..000000000000
--- a/databases/puppetdb-terminus6/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1626931664
-SHA256 (puppetdb-6.18.0.tar.gz) = 150c4ef06c265f38ef4dd73c6dfd54fd7fa0a71e1400a2ba2fd4c1b227cfdfea
-SIZE (puppetdb-6.18.0.tar.gz) = 47459324
diff --git a/databases/puppetdb-terminus6/files/patch-Makefile b/databases/puppetdb-terminus6/files/patch-Makefile
deleted file mode 100644
index 4e72558864c8..000000000000
--- a/databases/puppetdb-terminus6/files/patch-Makefile
+++ /dev/null
@@ -1,62 +0,0 @@
---- Makefile.orig	2021-07-13 22:34:05 UTC
-+++ Makefile
-@@ -1,7 +1,7 @@
- prefix = /usr/local
- datadir = $(prefix)/share
- confdir = /etc
--rubylibdir = $(shell ruby -rrbconfig -e "puts RbConfig::CONFIG['sitelibdir']")
-+rubylibdir = $(shell %%PREFIX%%/bin/ruby -rrbconfig -e "puts RbConfig::CONFIG['sitelibdir']")
- rundir = /var/run
- bindir = /usr/bin
- 
-@@ -36,22 +36,34 @@ install-puppetdb:
- 
- 
- install-puppetdb-termini:
--	install -Dm 0644 puppet/functions/puppetdb_query.rb "$(DESTDIR)$(rubylibdir)/puppet/functions/puppetdb_query.rb"
--	install -Dm 0644 puppet/indirector/catalog/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/indirector/catalog/puppetdb.rb"
--	install -Dm 0644 puppet/indirector/facts/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/indirector/facts/puppetdb.rb"
--	install -Dm 0644 puppet/indirector/facts/puppetdb_apply.rb "$(DESTDIR)$(rubylibdir)/puppet/indirector/facts/puppetdb_apply.rb"
--	install -Dm 0644 puppet/indirector/node/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/indirector/node/puppetdb.rb"
--	install -Dm 0644 puppet/indirector/resource/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/indirector/resource/puppetdb.rb"
--	install -Dm 0644 puppet/util/puppetdb/command.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/command.rb"
--	install -Dm 0644 puppet/util/puppetdb/command_names.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/command_names.rb"
--	install -Dm 0644 puppet/util/puppetdb/char_encoding.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/char_encoding.rb"
--	install -Dm 0644 puppet/util/puppetdb/http.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/http.rb"
--	install -Dm 0644 puppet/util/puppetdb/atom.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/atom.rb"
--	install -Dm 0644 puppet/util/puppetdb/config.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/config.rb"
--	install -Dm 0644 puppet/util/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb.rb"
--	install -Dm 0644 puppet/face/node/deactivate.rb "$(DESTDIR)$(rubylibdir)/puppet/face/node/deactivate.rb"
--	install -Dm 0644 puppet/face/node/status.rb "$(DESTDIR)$(rubylibdir)/puppet/face/node/status.rb"
--	install -Dm 0644 puppet/reports/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/reports/puppetdb.rb"
-+	install -d -m 0755 "$(DESTDIR)$(rubylibdir)/puppet"
-+	install -d -m 0755 "$(DESTDIR)$(rubylibdir)/puppet/face"
-+	install -d -m 0755 "$(DESTDIR)$(rubylibdir)/puppet/face/node"
-+	install -d -m 0755 "$(DESTDIR)$(rubylibdir)/puppet/functions"
-+	install -d -m 0755 "$(DESTDIR)$(rubylibdir)/puppet/indirector"
-+	install -d -m 0755 "$(DESTDIR)$(rubylibdir)/puppet/indirector/catalog"
-+	install -d -m 0755 "$(DESTDIR)$(rubylibdir)/puppet/indirector/facts"
-+	install -d -m 0755 "$(DESTDIR)$(rubylibdir)/puppet/indirector/node"
-+	install -d -m 0755 "$(DESTDIR)$(rubylibdir)/puppet/indirector/resource"
-+	install -d -m 0755 "$(DESTDIR)$(rubylibdir)/puppet/reports"
-+	install -d -m 0755 "$(DESTDIR)$(rubylibdir)/puppet/util"
-+	install -d -m 0755 "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb"
-+	install -m 0644 puppet/functions/puppetdb_query.rb "$(DESTDIR)$(rubylibdir)/puppet/functions/puppetdb_query.rb"
-+	install -m 0644 puppet/indirector/catalog/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/indirector/catalog/puppetdb.rb"
-+	install -m 0644 puppet/indirector/facts/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/indirector/facts/puppetdb.rb"
-+	install -m 0644 puppet/indirector/facts/puppetdb_apply.rb "$(DESTDIR)$(rubylibdir)/puppet/indirector/facts/puppetdb_apply.rb"
-+	install -m 0644 puppet/indirector/node/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/indirector/node/puppetdb.rb"
-+	install -m 0644 puppet/indirector/resource/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/indirector/resource/puppetdb.rb"
-+	install -m 0644 puppet/util/puppetdb/command.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/command.rb"
-+	install -m 0644 puppet/util/puppetdb/command_names.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/command_names.rb"
-+	install -m 0644 puppet/util/puppetdb/char_encoding.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/char_encoding.rb"
-+	install -m 0644 puppet/util/puppetdb/http.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/http.rb"
-+	install -m 0644 puppet/util/puppetdb/atom.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/atom.rb"
-+	install -m 0644 puppet/util/puppetdb/config.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/config.rb"
-+	install -m 0644 puppet/util/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb.rb"
-+	install -m 0644 puppet/face/node/deactivate.rb "$(DESTDIR)$(rubylibdir)/puppet/face/node/deactivate.rb"
-+	install -m 0644 puppet/face/node/status.rb "$(DESTDIR)$(rubylibdir)/puppet/face/node/status.rb"
-+	install -m 0644 puppet/reports/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/reports/puppetdb.rb"
- 
- install-rpm-sysv-init: install-rpm-preinst
- 	install -d -m 0755 "$(DESTDIR)$(initdir)"
diff --git a/databases/puppetdb-terminus6/pkg-descr b/databases/puppetdb-terminus6/pkg-descr
deleted file mode 100644
index 82720763fd9c..000000000000
--- a/databases/puppetdb-terminus6/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-The PuppetDB storeconfigs backend terminus module.
-
-WWW: https://docs.puppetlabs.com/puppetdb/latest/
diff --git a/databases/puppetdb-terminus7/Makefile b/databases/puppetdb-terminus7/Makefile
index 434a827b517c..db62e7ea507c 100644
--- a/databases/puppetdb-terminus7/Makefile
+++ b/databases/puppetdb-terminus7/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	puppetdb-terminus
-PORTVERSION=	7.6.0
+PORTVERSION=	7.18.0
 CATEGORIES=	databases ruby
 MASTER_SITES=	https://downloads.puppetlabs.com/puppetdb/
 PKGNAMESUFFIX=	7
@@ -7,15 +7,13 @@ DISTNAME=	puppetdb-${PORTVERSION}
 
 MAINTAINER=	puppet@FreeBSD.org
 COMMENT=	PuppetDB storeconfigs backend terminus module
+WWW=		https://docs.puppetlabs.com/puppetdb/latest/
 
 LICENSE=	APACHE20
 
-BUILD_DEPENDS=	puppet7>=0:sysutils/puppet7
-
-CONFLICTS_INSTALL=	puppetdb-terminus5-* puppetdb-terminus6-*
-USE_RUBY=	yes
+CONFLICTS_INSTALL=	puppetdb-terminus[0-9]
 NO_BUILD=	yes
-USES=		gmake
+USES=		gmake ruby
 
 post-patch:
 	@${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|" ${WRKSRC}/Makefile
diff --git a/databases/puppetdb-terminus7/distinfo b/databases/puppetdb-terminus7/distinfo
index fa9679ee9931..46bfac7d20fd 100644
--- a/databases/puppetdb-terminus7/distinfo
+++ b/databases/puppetdb-terminus7/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1631829212
-SHA256 (puppetdb-7.6.0.tar.gz) = 830dd308f1967e55f87dc0901d4c188614e3f71fc54f92c44d6e0dd0b51fe9fd
-SIZE (puppetdb-7.6.0.tar.gz) = 48023530
+TIMESTAMP = 1713224942
+SHA256 (puppetdb-7.18.0.tar.gz) = 851789bfacb640ed2938dc9559a2fb7db5dc69516484abd86091c04a25e2bb6f
+SIZE (puppetdb-7.18.0.tar.gz) = 52327161
diff --git a/databases/puppetdb-terminus7/files/patch-Makefile b/databases/puppetdb-terminus7/files/patch-Makefile
index 721c6d7c4c6b..dbc0ec99562c 100644
--- a/databases/puppetdb-terminus7/files/patch-Makefile
+++ b/databases/puppetdb-terminus7/files/patch-Makefile
@@ -1,6 +1,6 @@
---- Makefile.orig	2021-09-15 15:05:13 UTC
+--- Makefile.orig	2024-04-05 22:04:28 UTC
 +++ Makefile
-@@ -1,7 +1,7 @@
+@@ -1,7 +1,7 @@ confdir = /etc
  prefix = /usr/local
  datadir = $(prefix)/share
  confdir = /etc
@@ -9,51 +9,51 @@
  rundir = /var/run
  bindir = /usr/bin
  
-@@ -36,22 +36,31 @@ install-puppetdb:
+@@ -36,22 +36,31 @@ install-puppetdb-termini:
  
  
  install-puppetdb-termini:
 -	install -Dm 0644 puppet/indirector/catalog/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/indirector/catalog/puppetdb.rb"
--	install -Dm 0644 puppet/indirector/facts/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/indirector/facts/puppetdb.rb"
 -	install -Dm 0644 puppet/indirector/facts/puppetdb_apply.rb "$(DESTDIR)$(rubylibdir)/puppet/indirector/facts/puppetdb_apply.rb"
+-	install -Dm 0644 puppet/indirector/facts/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/indirector/facts/puppetdb.rb"
 -	install -Dm 0644 puppet/indirector/node/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/indirector/node/puppetdb.rb"
 -	install -Dm 0644 puppet/indirector/resource/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/indirector/resource/puppetdb.rb"
 -	install -Dm 0644 puppet/face/node/status.rb "$(DESTDIR)$(rubylibdir)/puppet/face/node/status.rb"
 -	install -Dm 0644 puppet/face/node/deactivate.rb "$(DESTDIR)$(rubylibdir)/puppet/face/node/deactivate.rb"
--	install -Dm 0644 puppet/util/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb.rb"
+-	install -Dm 0644 puppet/reports/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/reports/puppetdb.rb"
+-	install -Dm 0644 puppet/functions/puppetdb_query.rb "$(DESTDIR)$(rubylibdir)/puppet/functions/puppetdb_query.rb"
 -	install -Dm 0644 puppet/util/puppetdb/http.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/http.rb"
--	install -Dm 0644 puppet/util/puppetdb/char_encoding.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/char_encoding.rb"
 -	install -Dm 0644 puppet/util/puppetdb/atom.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/atom.rb"
 -	install -Dm 0644 puppet/util/puppetdb/config.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/config.rb"
+-	install -Dm 0644 puppet/util/puppetdb/char_encoding.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/char_encoding.rb"
 -	install -Dm 0644 puppet/util/puppetdb/command.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/command.rb"
 -	install -Dm 0644 puppet/util/puppetdb/command_names.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/command_names.rb"
--	install -Dm 0644 puppet/functions/puppetdb_query.rb "$(DESTDIR)$(rubylibdir)/puppet/functions/puppetdb_query.rb"
--	install -Dm 0644 puppet/reports/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/reports/puppetdb.rb"
-+	install -d -m 755 "$(DESTDIR)$(rubylibdir)/puppet/indirector/catalog"
-+	install -d -m 755 "$(DESTDIR)$(rubylibdir)/puppet/indirector/facts"
-+	install -d -m 755 "$(DESTDIR)$(rubylibdir)/puppet/indirector/node"
-+	install -d -m 755 "$(DESTDIR)$(rubylibdir)/puppet/indirector/resource"
-+	install -d -m 755 "$(DESTDIR)$(rubylibdir)/puppet/face/node"
-+	install -d -m 755 "$(DESTDIR)$(rubylibdir)/puppet/util"
-+	install -d -m 755 "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb"
-+	install -d -m 755 "$(DESTDIR)$(rubylibdir)/puppet/functions"
-+	install -d -m 755 "$(DESTDIR)$(rubylibdir)/puppet/reports"
+-	install -Dm 0644 puppet/util/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb.rb"
++	install -d -m 0755 "$(DESTDIR)$(rubylibdir)/puppet/indirector/catalog"
++	install -d -m 0755 "$(DESTDIR)$(rubylibdir)/puppet/indirector/facts"
++	install -d -m 0755 "$(DESTDIR)$(rubylibdir)/puppet/indirector/node"
++	install -d -m 0755 "$(DESTDIR)$(rubylibdir)/puppet/indirector/resource"
++	install -d -m 0755 "$(DESTDIR)$(rubylibdir)/puppet/face/node"
++	install -d -m 0755 "$(DESTDIR)$(rubylibdir)/puppet/reports"
++	install -d -m 0755 "$(DESTDIR)$(rubylibdir)/puppet/functions"
++	install -d -m 0755 "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb"
++	install -d -m 0755 "$(DESTDIR)$(rubylibdir)/puppet/util"
 +	install -m 0644 puppet/indirector/catalog/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/indirector/catalog/puppetdb.rb"
-+	install -m 0644 puppet/indirector/facts/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/indirector/facts/puppetdb.rb"
 +	install -m 0644 puppet/indirector/facts/puppetdb_apply.rb "$(DESTDIR)$(rubylibdir)/puppet/indirector/facts/puppetdb_apply.rb"
++	install -m 0644 puppet/indirector/facts/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/indirector/facts/puppetdb.rb"
 +	install -m 0644 puppet/indirector/node/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/indirector/node/puppetdb.rb"
 +	install -m 0644 puppet/indirector/resource/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/indirector/resource/puppetdb.rb"
 +	install -m 0644 puppet/face/node/status.rb "$(DESTDIR)$(rubylibdir)/puppet/face/node/status.rb"
 +	install -m 0644 puppet/face/node/deactivate.rb "$(DESTDIR)$(rubylibdir)/puppet/face/node/deactivate.rb"
-+	install -m 0644 puppet/util/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb.rb"
++	install -m 0644 puppet/reports/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/reports/puppetdb.rb"
++	install -m 0644 puppet/functions/puppetdb_query.rb "$(DESTDIR)$(rubylibdir)/puppet/functions/puppetdb_query.rb"
 +	install -m 0644 puppet/util/puppetdb/http.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/http.rb"
-+	install -m 0644 puppet/util/puppetdb/char_encoding.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/char_encoding.rb"
 +	install -m 0644 puppet/util/puppetdb/atom.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/atom.rb"
 +	install -m 0644 puppet/util/puppetdb/config.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/config.rb"
++	install -m 0644 puppet/util/puppetdb/char_encoding.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/char_encoding.rb"
 +	install -m 0644 puppet/util/puppetdb/command.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/command.rb"
 +	install -m 0644 puppet/util/puppetdb/command_names.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/command_names.rb"
-+	install -m 0644 puppet/functions/puppetdb_query.rb "$(DESTDIR)$(rubylibdir)/puppet/functions/puppetdb_query.rb"
-+	install -m 0644 puppet/reports/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/reports/puppetdb.rb"
++	install -m 0644 puppet/util/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb.rb"
  
  install-rpm-sysv-init: install-rpm-preinst
  	install -d -m 0755 "$(DESTDIR)$(initdir)"
diff --git a/databases/puppetdb-terminus7/pkg-descr b/databases/puppetdb-terminus7/pkg-descr
index 82720763fd9c..4d64063e8c6e 100644
--- a/databases/puppetdb-terminus7/pkg-descr
+++ b/databases/puppetdb-terminus7/pkg-descr
@@ -1,3 +1 @@
 The PuppetDB storeconfigs backend terminus module.
-
-WWW: https://docs.puppetlabs.com/puppetdb/latest/
diff --git a/databases/puppetdb-terminus8/Makefile b/databases/puppetdb-terminus8/Makefile
new file mode 100644
index 000000000000..a58a15a085d6
--- /dev/null
+++ b/databases/puppetdb-terminus8/Makefile
@@ -0,0 +1,24 @@
+PORTNAME=	puppetdb-terminus
+PORTVERSION=	8.5.0
+CATEGORIES=	databases ruby
+MASTER_SITES=	https://downloads.puppetlabs.com/puppetdb/
+PKGNAMESUFFIX=	8
+DISTNAME=	puppetdb-${PORTVERSION}
+
+MAINTAINER=	puppet@FreeBSD.org
+COMMENT=	PuppetDB storeconfigs backend terminus module
+WWW=		https://docs.puppetlabs.com/puppetdb/latest/
+
+LICENSE=	APACHE20
+
+CONFLICTS_INSTALL=	puppetdb-terminus[0-9]
+NO_BUILD=	yes
+USES=		gmake ruby
+
+post-patch:
+	@${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|" ${WRKSRC}/Makefile
+
+do-install:
+	@cd ${WRKSRC} && ${SETENV} DESTDIR=${STAGEDIR} ${GMAKE} install-puppetdb-termini
+
+.include <bsd.port.mk>
diff --git a/databases/puppetdb-terminus8/distinfo b/databases/puppetdb-terminus8/distinfo
new file mode 100644
index 000000000000..9d89bcf967ee
--- /dev/null
+++ b/databases/puppetdb-terminus8/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1713224949
+SHA256 (puppetdb-8.5.0.tar.gz) = 63ad507c87f0466d30340f8dcc5019ea28261215d0644b82a900b613e24faaef
+SIZE (puppetdb-8.5.0.tar.gz) = 60440356
diff --git a/databases/puppetdb-terminus8/files/patch-Makefile b/databases/puppetdb-terminus8/files/patch-Makefile
new file mode 100644
index 000000000000..bafe04e89912
--- /dev/null
+++ b/databases/puppetdb-terminus8/files/patch-Makefile
@@ -0,0 +1,59 @@
+--- Makefile.orig	2024-04-05 22:05:56 UTC
++++ Makefile
+@@ -1,7 +1,7 @@ confdir = /etc
+ prefix = /usr/local
+ datadir = $(prefix)/share
+ confdir = /etc
+-rubylibdir = $(shell ruby -rrbconfig -e "puts RbConfig::CONFIG['sitelibdir']")
++rubylibdir = $(shell %%PREFIX%%/bin/ruby -rrbconfig -e "puts RbConfig::CONFIG['sitelibdir']")
+ rundir = /var/run
+ bindir = /usr/bin
+ 
+@@ -36,22 +36,31 @@ install-puppetdb-termini:
+ 
+ 
+ install-puppetdb-termini:
+-	install -Dm 0644 puppet/indirector/catalog/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/indirector/catalog/puppetdb.rb"
+-	install -Dm 0644 puppet/indirector/facts/puppetdb_apply.rb "$(DESTDIR)$(rubylibdir)/puppet/indirector/facts/puppetdb_apply.rb"
+-	install -Dm 0644 puppet/indirector/facts/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/indirector/facts/puppetdb.rb"
+-	install -Dm 0644 puppet/indirector/node/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/indirector/node/puppetdb.rb"
+-	install -Dm 0644 puppet/indirector/resource/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/indirector/resource/puppetdb.rb"
+-	install -Dm 0644 puppet/face/node/status.rb "$(DESTDIR)$(rubylibdir)/puppet/face/node/status.rb"
+-	install -Dm 0644 puppet/face/node/deactivate.rb "$(DESTDIR)$(rubylibdir)/puppet/face/node/deactivate.rb"
+-	install -Dm 0644 puppet/reports/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/reports/puppetdb.rb"
+-	install -Dm 0644 puppet/functions/puppetdb_query.rb "$(DESTDIR)$(rubylibdir)/puppet/functions/puppetdb_query.rb"
+-	install -Dm 0644 puppet/util/puppetdb/http.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/http.rb"
+-	install -Dm 0644 puppet/util/puppetdb/atom.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/atom.rb"
+-	install -Dm 0644 puppet/util/puppetdb/config.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/config.rb"
+-	install -Dm 0644 puppet/util/puppetdb/char_encoding.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/char_encoding.rb"
+-	install -Dm 0644 puppet/util/puppetdb/command.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/command.rb"
+-	install -Dm 0644 puppet/util/puppetdb/command_names.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/command_names.rb"
+-	install -Dm 0644 puppet/util/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb.rb"
++	install -d -m 0755 "$(DESTDIR)$(rubylibdir)/puppet/indirector/catalog"
++	install -d -m 0755 "$(DESTDIR)$(rubylibdir)/puppet/indirector/facts"
++	install -d -m 0755 "$(DESTDIR)$(rubylibdir)/puppet/indirector/node"
++	install -d -m 0755 "$(DESTDIR)$(rubylibdir)/puppet/indirector/resource"
++	install -d -m 0755 "$(DESTDIR)$(rubylibdir)/puppet/face/node"
++	install -d -m 0755 "$(DESTDIR)$(rubylibdir)/puppet/reports"
++	install -d -m 0755 "$(DESTDIR)$(rubylibdir)/puppet/functions"
++	install -d -m 0755 "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb"
++	install -d -m 0755 "$(DESTDIR)$(rubylibdir)/puppet/util"
++	install -m 0644 puppet/indirector/catalog/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/indirector/catalog/puppetdb.rb"
++	install -m 0644 puppet/indirector/facts/puppetdb_apply.rb "$(DESTDIR)$(rubylibdir)/puppet/indirector/facts/puppetdb_apply.rb"
++	install -m 0644 puppet/indirector/facts/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/indirector/facts/puppetdb.rb"
++	install -m 0644 puppet/indirector/node/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/indirector/node/puppetdb.rb"
++	install -m 0644 puppet/indirector/resource/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/indirector/resource/puppetdb.rb"
++	install -m 0644 puppet/face/node/status.rb "$(DESTDIR)$(rubylibdir)/puppet/face/node/status.rb"
++	install -m 0644 puppet/face/node/deactivate.rb "$(DESTDIR)$(rubylibdir)/puppet/face/node/deactivate.rb"
++	install -m 0644 puppet/reports/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/reports/puppetdb.rb"
++	install -m 0644 puppet/functions/puppetdb_query.rb "$(DESTDIR)$(rubylibdir)/puppet/functions/puppetdb_query.rb"
++	install -m 0644 puppet/util/puppetdb/http.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/http.rb"
++	install -m 0644 puppet/util/puppetdb/atom.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/atom.rb"
++	install -m 0644 puppet/util/puppetdb/config.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/config.rb"
++	install -m 0644 puppet/util/puppetdb/char_encoding.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/char_encoding.rb"
++	install -m 0644 puppet/util/puppetdb/command.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/command.rb"
++	install -m 0644 puppet/util/puppetdb/command_names.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb/command_names.rb"
++	install -m 0644 puppet/util/puppetdb.rb "$(DESTDIR)$(rubylibdir)/puppet/util/puppetdb.rb"
+ 
+ install-rpm-sysv-init: install-rpm-preinst
+ 	install -d -m 0755 "$(DESTDIR)$(initdir)"
diff --git a/databases/puppetdb-terminus8/pkg-descr b/databases/puppetdb-terminus8/pkg-descr
new file mode 100644
index 000000000000..4d64063e8c6e
--- /dev/null
+++ b/databases/puppetdb-terminus8/pkg-descr
@@ -0,0 +1 @@
+The PuppetDB storeconfigs backend terminus module.
diff --git a/databases/puppetdb-terminus6/pkg-plist b/databases/puppetdb-terminus8/pkg-plist
index a12b86eb6a1a..a12b86eb6a1a 100644
--- a/databases/puppetdb-terminus6/pkg-plist
+++ b/databases/puppetdb-terminus8/pkg-plist
diff --git a/databases/puppetdb6/Makefile b/databases/puppetdb6/Makefile
deleted file mode 100644
index 62b9579601c0..000000000000
--- a/databases/puppetdb6/Makefile
+++ /dev/null
@@ -1,48 +0,0 @@
-PORTNAME=	puppetdb
-PORTVERSION=	6.18.0
-CATEGORIES=	databases java
-MASTER_SITES=	https://downloads.puppetlabs.com/puppetdb/
-PKGNAMESUFFIX=	6
-
-MAINTAINER=	puppet@FreeBSD.org
-COMMENT=	PuppetDB storeconfigs backend
-
-LICENSE=	APACHE20
-
-RUN_DEPENDS=	bash:shells/bash
-
-USE_RC_SUBR=	puppetdb
-
-CONFLICTS_INSTALL=	puppetdb5-* puppetdb7-*
-USES=		shebangfix
-SHEBANG_FILES=	ext/bin/puppetdb \
-		ext/cli/anonymize \
-		ext/cli/config-migration \
-		ext/cli/foreground \
-		ext/cli/ssl-setup \
-		ext/cli/start \
-		ext/cli/stop \
-		ext/cli/reload \
-		ext/cli/upgrade \
-		ext/ezbake-functions.sh
-USE_JAVA=	yes
-NO_ARCH=	yes
-NO_BUILD=	yes
-
-USERS=		puppetdb
-GROUPS=		puppetdb
-
-SUB_LIST=	JAVA_HOME=${JAVA_HOME}
-SUB_FILES=	pkg-message
-
-post-patch:
-.for file in Makefile ext/bin/puppetdb ext/cli/ssl-setup \
-	ext/config/conf.d/jetty.ini ext/config/conf.d/config.ini
-	@${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|" ${WRKSRC}/${file}
-.endfor
-	@${REINPLACE_CMD} -e "s|%%DATADIR%%|${DATADIR}|" ${WRKSRC}/ext/bin/puppetdb
-
-do-install:
-	@cd ${WRKSRC} && ${SETENV} DESTDIR=${STAGEDIR} make install-puppetdb
-
-.include <bsd.port.mk>
diff --git a/databases/puppetdb6/distinfo b/databases/puppetdb6/distinfo
deleted file mode 100644
index ef518f535118..000000000000
--- a/databases/puppetdb6/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1626931697
-SHA256 (puppetdb-6.18.0.tar.gz) = 150c4ef06c265f38ef4dd73c6dfd54fd7fa0a71e1400a2ba2fd4c1b227cfdfea
-SIZE (puppetdb-6.18.0.tar.gz) = 47459324
diff --git a/databases/puppetdb6/files/patch-Makefile b/databases/puppetdb6/files/patch-Makefile
deleted file mode 100644
index 792f7b753c8c..000000000000
--- a/databases/puppetdb6/files/patch-Makefile
+++ /dev/null
@@ -1,39 +0,0 @@
---- Makefile.orig	2021-07-13 22:34:05 UTC
-+++ Makefile
-@@ -1,24 +1,24 @@
--prefix = /usr/local
-+prefix = %%PREFIX%%
- datadir = $(prefix)/share
--confdir = /etc
-+confdir = %%PREFIX%%/etc
- rubylibdir = $(shell ruby -rrbconfig -e "puts RbConfig::CONFIG['sitelibdir']")
- rundir = /var/run
--bindir = /usr/bin
-+bindir = %%PREFIX%%/bin
- 
- install-puppetdb:
- 	install -d -m 0755 "$(DESTDIR)$(datadir)/puppetdb"
- 	install -m 0644 puppetdb.jar "$(DESTDIR)$(datadir)/puppetdb"
- 	install -m 0774 ext/ezbake-functions.sh "$(DESTDIR)$(datadir)/puppetdb"
- 	install -m 0644 ext/ezbake.manifest "$(DESTDIR)$(datadir)/puppetdb"
--	install -d -m 0755 "$(DESTDIR)$(confdir)/puppetlabs/puppetdb/conf.d"
--	install -m 0644 ext/config/conf.d/database.ini "$(DESTDIR)$(confdir)/puppetlabs/puppetdb/conf.d/database.ini"
--	install -m 0644 ext/config/conf.d/jetty.ini "$(DESTDIR)$(confdir)/puppetlabs/puppetdb/conf.d/jetty.ini"
--	install -m 0644 ext/config/conf.d/repl.ini "$(DESTDIR)$(confdir)/puppetlabs/puppetdb/conf.d/repl.ini"
--	install -m 0644 ext/config/conf.d/config.ini "$(DESTDIR)$(confdir)/puppetlabs/puppetdb/conf.d/config.ini"
--	install -m 0644 ext/config/conf.d/auth.conf "$(DESTDIR)$(confdir)/puppetlabs/puppetdb/conf.d/auth.conf"
--	install -m 0644 ext/config/request-logging.xml "$(DESTDIR)$(confdir)/puppetlabs/puppetdb/request-logging.xml"
--	install -m 0644 ext/config/bootstrap.cfg "$(DESTDIR)$(confdir)/puppetlabs/puppetdb/bootstrap.cfg"
--	install -m 0644 ext/config/logback.xml "$(DESTDIR)$(confdir)/puppetlabs/puppetdb/logback.xml"
-+	install -d -m 0755 "$(DESTDIR)$(confdir)/puppetdb/conf.d"
-+	install -m 0644 ext/config/conf.d/database.ini "$(DESTDIR)$(confdir)/puppetdb/conf.d/database.ini.sample"
-+	install -m 0644 ext/config/conf.d/jetty.ini "$(DESTDIR)$(confdir)/puppetdb/conf.d/jetty.ini.sample"
-+	install -m 0644 ext/config/conf.d/repl.ini "$(DESTDIR)$(confdir)/puppetdb/conf.d/repl.ini.sample"
-+	install -m 0644 ext/config/conf.d/config.ini "$(DESTDIR)$(confdir)/puppetdb/conf.d/config.ini.sample"
-+	install -m 0644 ext/config/conf.d/auth.conf "$(DESTDIR)$(confdir)/puppetdb/conf.d/auth.conf.sample"
-+	install -m 0644 ext/config/request-logging.xml "$(DESTDIR)$(confdir)/puppetdb/request-logging.xml.sample"
-+	install -m 0644 ext/config/bootstrap.cfg "$(DESTDIR)$(confdir)/puppetdb/bootstrap.cfg.sample"
-+	install -m 0644 ext/config/logback.xml "$(DESTDIR)$(confdir)/puppetdb/logback.xml.sample"
- 	install -d -m 0755 "$(DESTDIR)$(datadir)/puppetdb/cli"
- 	install -d -m 0755 "$(DESTDIR)$(datadir)/puppetdb/cli/apps"
- 	install -d -m 0755 "$(DESTDIR)$(bindir)"
diff --git a/databases/puppetdb6/files/puppetdb.in b/databases/puppetdb6/files/puppetdb.in
deleted file mode 100644
index 4e2f85a2d366..000000000000
--- a/databases/puppetdb6/files/puppetdb.in
+++ /dev/null
@@ -1,89 +0,0 @@
-#!/bin/sh
-
-# PROVIDE: puppetdb
-# REQUIRE: LOGIN
-# KEYWORD: shutdown
-
-#
-# Configuration settings for puppetdb in /etc/rc.conf:
-#
-# puppetdb_enable (bool):
-#   Set to "NO" by default.
-#   Set it to "YES" to enable puppetdb
-#
-# puppetdb_args (str):
-#   Extra arguments passed to start command
-#
-# puppetdb_java_home (str):
-#   Set to "%%JAVA_HOME%%" by default.
-#   Set the Java virtual machine to run puppetdb
-#
-# puppetdb_java_opts (str):
-#   Set to "" by default.
-#   Java VM args to use.
-#
-# puppetdb_user (str):
-#   Set to "puppetdb" by default.
-#   User to run puppetdb as.
-#
-# puppetdb_group (str):
-#   Set to "puppetdb" by default.
-#   Group for data file ownership.
-#
-# puppetdb_log_file (str):
-#   Set to "/var/log/puppetdb/puppetdb.log" by default.
-#   Log file location.
-#
-
-. /etc/rc.subr
-
-name="puppetdb"
-rcvar=puppetdb_enable
-
-load_rc_config "${name}"
-
-: ${puppetdb_enable="NO"}
-: ${puppetdb_args="services -c %%PREFIX%%/etc/puppetdb/conf.d"}
-: ${puppetdb_java_home="%%JAVA_HOME%%"}
-: ${puppetdb_user="puppetdb"}
-: ${puppetdb_group="puppetdb"}
-: ${puppetdb_log_file="/var/log/puppetdb/puppetdb.log"}
-
-pidfile="/var/run/puppetdb/puppetdb.pid"
-command="/usr/sbin/daemon"
-java_cmd="${puppetdb_java_home}/bin/java"
-procname="${java_cmd}"
-command_args="-p ${pidfile} ${java_cmd} ${puppetdb_java_opts} -Djava.security.egd=/dev/urandom -cp %%DATADIR%%/puppetdb.jar clojure.main -m puppetlabs.puppetdb.core  ${puppetdb_args} > ${puppetdb_log_file} 2>&1"
-
-
-required_files="${java_cmd}"
-
-start_precmd="puppetdb_prestart"
-
-puppetdb_prestart() {
-  if [ ! -d "/var/log/puppetdb" ]; then
-    install -d -o "${puppetdb_user}" -g "${puppetdb_group}" -m 750 "/var/log/puppetdb"
-  fi
-  if [ ! -f "${puppetdb_log_file}" ]; then
-    touch "${puppetdb_log_file}"
-    chown "${puppetdb_user}:${puppetdb_group}" "${puppetdb_log_file}"
-    chmod 640 "${puppetdb_log_file}"
-  fi
-  if [ ! -d "/var/run/puppetdb" ]; then
-    install -d -o "${puppetdb_user}" -g "${puppetdb_group}" -m 750 "/var/run/puppetdb"
-  fi
-
-  chown -R "root:${puppetdb_group}" "%%PREFIX%%/etc/puppetdb/conf.d"
-  chmod 0750 "%%PREFIX%%/etc/puppetdb/conf.d"
-
-  chown "root:${puppetdb_group}" "%%PREFIX%%/etc/puppetdb/logback.xml"
-  chmod 0640 "%%PREFIX%%/etc/puppetdb/logback.xml"
-
-  if [ ! -d "/var/db/puppetdb" ]; then
-    install -d -o "${puppetdb_user}" -g "${puppetdb_group}" -m 750 "/var/db/puppetdb"
-  fi
-  chown -R "${puppetdb_user}:${puppetdb_group}" "/var/db/puppetdb"
-  chmod 0750 "/var/db/puppetdb"
-}
-
-run_rc_command "$1"
diff --git a/databases/puppetdb6/pkg-descr b/databases/puppetdb6/pkg-descr
deleted file mode 100644
index 47fcde3773c6..000000000000
--- a/databases/puppetdb6/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-The PuppetDB storeconfigs backend
-
-WWW: https://docs.puppetlabs.com/puppetdb/latest/
diff --git a/databases/puppetdb7/Makefile b/databases/puppetdb7/Makefile
index eb1887b9c101..787a09fc0bae 100644
--- a/databases/puppetdb7/Makefile
+++ b/databases/puppetdb7/Makefile
@@ -1,11 +1,12 @@
 PORTNAME=	puppetdb
-PORTVERSION=	7.6.0
+PORTVERSION=	7.18.0
 CATEGORIES=	databases java
 MASTER_SITES=	https://downloads.puppetlabs.com/puppetdb/
 PKGNAMESUFFIX=	7
 
 MAINTAINER=	puppet@FreeBSD.org
 COMMENT=	PuppetDB storeconfigs backend
+WWW=		https://docs.puppetlabs.com/puppetdb/latest/
 
 LICENSE=	APACHE20
 
@@ -13,8 +14,9 @@ RUN_DEPENDS=	bash:shells/bash
 
 USE_RC_SUBR=	puppetdb
 
-CONFLICTS_INSTALL=	puppetdb5-* puppetdb6-*
-USES=		shebangfix
+CONFLICTS_INSTALL=	puppetdb[0-9] # etc/puppetdb/bootstrap.cfg.sample
+USES=		cpe shebangfix
+CPE_VENDOR=	puppet
 SHEBANG_FILES=	ext/bin/puppetdb \
 		ext/cli/anonymize \
 		ext/cli/config-migration \
diff --git a/databases/puppetdb7/distinfo b/databases/puppetdb7/distinfo
index 292ccd13e2ba..e6f3c42ed2e3 100644
--- a/databases/puppetdb7/distinfo
+++ b/databases/puppetdb7/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1631829200
-SHA256 (puppetdb-7.6.0.tar.gz) = 830dd308f1967e55f87dc0901d4c188614e3f71fc54f92c44d6e0dd0b51fe9fd
-SIZE (puppetdb-7.6.0.tar.gz) = 48023530
+TIMESTAMP = 1713224912
+SHA256 (puppetdb-7.18.0.tar.gz) = 851789bfacb640ed2938dc9559a2fb7db5dc69516484abd86091c04a25e2bb6f
+SIZE (puppetdb-7.18.0.tar.gz) = 52327161
diff --git a/databases/puppetdb7/files/patch-Makefile b/databases/puppetdb7/files/patch-Makefile
index eebb83ea8465..43a358e4f5b6 100644
--- a/databases/puppetdb7/files/patch-Makefile
+++ b/databases/puppetdb7/files/patch-Makefile
@@ -1,4 +1,4 @@
---- Makefile.orig	2021-09-15 15:05:13 UTC
+--- Makefile.orig	2024-04-05 22:04:28 UTC
 +++ Makefile
 @@ -1,24 +1,24 @@
 -prefix = /usr/local
@@ -17,23 +17,23 @@
  	install -m 0774 ext/ezbake-functions.sh "$(DESTDIR)$(datadir)/puppetdb"
  	install -m 0644 ext/ezbake.manifest "$(DESTDIR)$(datadir)/puppetdb"
 -	install -d -m 0755 "$(DESTDIR)$(confdir)/puppetlabs/puppetdb/conf.d"
--	install -m 0644 ext/config/logback.xml "$(DESTDIR)$(confdir)/puppetlabs/puppetdb/logback.xml"
 -	install -m 0644 ext/config/bootstrap.cfg "$(DESTDIR)$(confdir)/puppetlabs/puppetdb/bootstrap.cfg"
--	install -m 0644 ext/config/request-logging.xml "$(DESTDIR)$(confdir)/puppetlabs/puppetdb/request-logging.xml"
+-	install -m 0644 ext/config/logback.xml "$(DESTDIR)$(confdir)/puppetlabs/puppetdb/logback.xml"
 -	install -m 0644 ext/config/conf.d/config.ini "$(DESTDIR)$(confdir)/puppetlabs/puppetdb/conf.d/config.ini"
+-	install -m 0644 ext/config/conf.d/jetty.ini "$(DESTDIR)$(confdir)/puppetlabs/puppetdb/conf.d/jetty.ini"
+-	install -m 0644 ext/config/conf.d/database.ini "$(DESTDIR)$(confdir)/puppetlabs/puppetdb/conf.d/database.ini"
 -	install -m 0644 ext/config/conf.d/repl.ini "$(DESTDIR)$(confdir)/puppetlabs/puppetdb/conf.d/repl.ini"
 -	install -m 0644 ext/config/conf.d/auth.conf "$(DESTDIR)$(confdir)/puppetlabs/puppetdb/conf.d/auth.conf"
--	install -m 0644 ext/config/conf.d/database.ini "$(DESTDIR)$(confdir)/puppetlabs/puppetdb/conf.d/database.ini"
--	install -m 0644 ext/config/conf.d/jetty.ini "$(DESTDIR)$(confdir)/puppetlabs/puppetdb/conf.d/jetty.ini"
+-	install -m 0644 ext/config/request-logging.xml "$(DESTDIR)$(confdir)/puppetlabs/puppetdb/request-logging.xml"
 +	install -d -m 0755 "$(DESTDIR)$(confdir)/puppetdb/conf.d"
-+	install -m 0644 ext/config/logback.xml "$(DESTDIR)$(confdir)/puppetdb/logback.xml.sample"
 +	install -m 0644 ext/config/bootstrap.cfg "$(DESTDIR)$(confdir)/puppetdb/bootstrap.cfg.sample"
-+	install -m 0644 ext/config/request-logging.xml "$(DESTDIR)$(confdir)/puppetdb/request-logging.xml.sample"
++	install -m 0644 ext/config/logback.xml "$(DESTDIR)$(confdir)/puppetdb/logback.xml.sample"
 +	install -m 0644 ext/config/conf.d/config.ini "$(DESTDIR)$(confdir)/puppetdb/conf.d/config.ini.sample"
++	install -m 0644 ext/config/conf.d/jetty.ini "$(DESTDIR)$(confdir)/puppetdb/conf.d/jetty.ini.sample"
++	install -m 0644 ext/config/conf.d/database.ini "$(DESTDIR)$(confdir)/puppetdb/conf.d/database.ini.sample"
 +	install -m 0644 ext/config/conf.d/repl.ini "$(DESTDIR)$(confdir)/puppetdb/conf.d/repl.ini.sample"
 +	install -m 0644 ext/config/conf.d/auth.conf "$(DESTDIR)$(confdir)/puppetdb/conf.d/auth.conf.sample"
-+	install -m 0644 ext/config/conf.d/database.ini "$(DESTDIR)$(confdir)/puppetdb/conf.d/database.ini.sample"
-+	install -m 0644 ext/config/conf.d/jetty.ini "$(DESTDIR)$(confdir)/puppetdb/conf.d/jetty.ini.sample"
++	install -m 0644 ext/config/request-logging.xml "$(DESTDIR)$(confdir)/puppetdb/request-logging.xml.sample"
  	install -d -m 0755 "$(DESTDIR)$(datadir)/puppetdb/cli"
  	install -d -m 0755 "$(DESTDIR)$(datadir)/puppetdb/cli/apps"
  	install -d -m 0755 "$(DESTDIR)$(bindir)"
diff --git a/databases/puppetdb7/files/puppetdb.in b/databases/puppetdb7/files/puppetdb.in
index 4e2f85a2d366..eb761d7ab425 100644
--- a/databases/puppetdb7/files/puppetdb.in
+++ b/databases/puppetdb7/files/puppetdb.in
@@ -53,7 +53,7 @@ pidfile="/var/run/puppetdb/puppetdb.pid"
 command="/usr/sbin/daemon"
 java_cmd="${puppetdb_java_home}/bin/java"
 procname="${java_cmd}"
-command_args="-p ${pidfile} ${java_cmd} ${puppetdb_java_opts} -Djava.security.egd=/dev/urandom -cp %%DATADIR%%/puppetdb.jar clojure.main -m puppetlabs.puppetdb.core  ${puppetdb_args} > ${puppetdb_log_file} 2>&1"
+command_args="-p ${pidfile} ${java_cmd} -Djruby.logger.class=com.puppetlabs.jruby_utils.jruby.Slf4jLogger -Dlogappender=F1 ${puppetdb_java_opts} -Djava.security.egd=/dev/urandom -cp %%DATADIR%%/puppetdb.jar clojure.main -m puppetlabs.puppetdb.core  ${puppetdb_args} > ${puppetdb_log_file} 2>&1"
 
 
 required_files="${java_cmd}"
diff --git a/databases/puppetdb7/pkg-descr b/databases/puppetdb7/pkg-descr
index 47fcde3773c6..b76f9bc98577 100644
--- a/databases/puppetdb7/pkg-descr
+++ b/databases/puppetdb7/pkg-descr
@@ -1,3 +1 @@
 The PuppetDB storeconfigs backend
-
-WWW: https://docs.puppetlabs.com/puppetdb/latest/
diff --git a/databases/puppetdb8/Makefile b/databases/puppetdb8/Makefile
new file mode 100644
index 000000000000..a0c1f000d591
--- /dev/null
+++ b/databases/puppetdb8/Makefile
@@ -0,0 +1,51 @@
+PORTNAME=	puppetdb
+PORTVERSION=	8.5.0
+CATEGORIES=	databases java
+MASTER_SITES=	https://downloads.puppetlabs.com/puppetdb/
+PKGNAMESUFFIX=	8
+
+MAINTAINER=	puppet@FreeBSD.org
+COMMENT=	PuppetDB storeconfigs backend
+WWW=		https://docs.puppetlabs.com/puppetdb/latest/
+
+LICENSE=	APACHE20
+
+RUN_DEPENDS=	bash:shells/bash
+
+USE_RC_SUBR=	puppetdb
+
+CONFLICTS_INSTALL=	puppetdb[0-9] # etc/puppetdb/bootstrap.cfg.sample
+USES=		cpe shebangfix
+CPE_VENDOR=	puppet
+SHEBANG_FILES=	ext/bin/puppetdb \
+		ext/cli/anonymize \
+		ext/cli/config-migration \
+		ext/cli/foreground \
+		ext/cli/ssl-setup \
+		ext/cli/start \
+		ext/cli/stop \
+		ext/cli/reload \
+		ext/cli/upgrade \
+		ext/ezbake-functions.sh
+USE_JAVA=	yes
+JAVA_VERSION=	11+
+NO_ARCH=	yes
+NO_BUILD=	yes
+
+USERS=		puppetdb
+GROUPS=		puppetdb
+
+SUB_LIST=	JAVA_HOME=${JAVA_HOME}
+SUB_FILES=	pkg-message
+
+post-patch:
+.for file in Makefile ext/bin/puppetdb ext/cli/ssl-setup \
+	ext/config/conf.d/jetty.ini ext/config/conf.d/config.ini
+	@${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|" ${WRKSRC}/${file}
+.endfor
+	@${REINPLACE_CMD} -e "s|%%DATADIR%%|${DATADIR}|" ${WRKSRC}/ext/bin/puppetdb
+
+do-install:
+	@cd ${WRKSRC} && ${SETENV} DESTDIR=${STAGEDIR} make install-puppetdb
+
+.include <bsd.port.mk>
diff --git a/databases/puppetdb8/distinfo b/databases/puppetdb8/distinfo
new file mode 100644
index 000000000000..53edc086fbdd
--- /dev/null
+++ b/databases/puppetdb8/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1713224932
+SHA256 (puppetdb-8.5.0.tar.gz) = 63ad507c87f0466d30340f8dcc5019ea28261215d0644b82a900b613e24faaef
+SIZE (puppetdb-8.5.0.tar.gz) = 60440356
diff --git a/databases/puppetdb8/files/patch-Makefile b/databases/puppetdb8/files/patch-Makefile
new file mode 100644
index 000000000000..197f476d4814
--- /dev/null
+++ b/databases/puppetdb8/files/patch-Makefile
@@ -0,0 +1,39 @@
+--- Makefile.orig	2024-04-05 22:05:56 UTC
++++ Makefile
+@@ -1,24 +1,24 @@
+-prefix = /usr/local
++prefix = %%PREFIX%%
+ datadir = $(prefix)/share
+-confdir = /etc
++confdir = %%PREFIX%%/etc
+ rubylibdir = $(shell ruby -rrbconfig -e "puts RbConfig::CONFIG['sitelibdir']")
+ rundir = /var/run
+-bindir = /usr/bin
++bindir = %%PREFIX%%/bin
+ 
+ install-puppetdb:
+ 	install -d -m 0755 "$(DESTDIR)$(datadir)/puppetdb"
+ 	install -m 0644 puppetdb.jar "$(DESTDIR)$(datadir)/puppetdb"
+ 	install -m 0774 ext/ezbake-functions.sh "$(DESTDIR)$(datadir)/puppetdb"
+ 	install -m 0644 ext/ezbake.manifest "$(DESTDIR)$(datadir)/puppetdb"
+-	install -d -m 0755 "$(DESTDIR)$(confdir)/puppetlabs/puppetdb/conf.d"
+-	install -m 0644 ext/config/bootstrap.cfg "$(DESTDIR)$(confdir)/puppetlabs/puppetdb/bootstrap.cfg"
+-	install -m 0644 ext/config/logback.xml "$(DESTDIR)$(confdir)/puppetlabs/puppetdb/logback.xml"
+-	install -m 0644 ext/config/conf.d/config.ini "$(DESTDIR)$(confdir)/puppetlabs/puppetdb/conf.d/config.ini"
+-	install -m 0644 ext/config/conf.d/jetty.ini "$(DESTDIR)$(confdir)/puppetlabs/puppetdb/conf.d/jetty.ini"
+-	install -m 0644 ext/config/conf.d/database.ini "$(DESTDIR)$(confdir)/puppetlabs/puppetdb/conf.d/database.ini"
+-	install -m 0644 ext/config/conf.d/repl.ini "$(DESTDIR)$(confdir)/puppetlabs/puppetdb/conf.d/repl.ini"
+-	install -m 0644 ext/config/conf.d/auth.conf "$(DESTDIR)$(confdir)/puppetlabs/puppetdb/conf.d/auth.conf"
+-	install -m 0644 ext/config/request-logging.xml "$(DESTDIR)$(confdir)/puppetlabs/puppetdb/request-logging.xml"
++	install -d -m 0755 "$(DESTDIR)$(confdir)/puppetdb/conf.d"
++	install -m 0644 ext/config/bootstrap.cfg "$(DESTDIR)$(confdir)/puppetdb/bootstrap.cfg.sample"
++	install -m 0644 ext/config/logback.xml "$(DESTDIR)$(confdir)/puppetdb/logback.xml.sample"
++	install -m 0644 ext/config/conf.d/config.ini "$(DESTDIR)$(confdir)/puppetdb/conf.d/config.ini.sample"
++	install -m 0644 ext/config/conf.d/jetty.ini "$(DESTDIR)$(confdir)/puppetdb/conf.d/jetty.ini.sample"
++	install -m 0644 ext/config/conf.d/database.ini "$(DESTDIR)$(confdir)/puppetdb/conf.d/database.ini.sample"
++	install -m 0644 ext/config/conf.d/repl.ini "$(DESTDIR)$(confdir)/puppetdb/conf.d/repl.ini.sample"
++	install -m 0644 ext/config/conf.d/auth.conf "$(DESTDIR)$(confdir)/puppetdb/conf.d/auth.conf.sample"
++	install -m 0644 ext/config/request-logging.xml "$(DESTDIR)$(confdir)/puppetdb/request-logging.xml.sample"
+ 	install -d -m 0755 "$(DESTDIR)$(datadir)/puppetdb/cli"
+ 	install -d -m 0755 "$(DESTDIR)$(datadir)/puppetdb/cli/apps"
+ 	install -d -m 0755 "$(DESTDIR)$(bindir)"
diff --git a/databases/puppetdb6/files/patch-ext_bin_puppetdb b/databases/puppetdb8/files/patch-ext_bin_puppetdb
index 0a139b110d2e..0a139b110d2e 100644
--- a/databases/puppetdb6/files/patch-ext_bin_puppetdb
+++ b/databases/puppetdb8/files/patch-ext_bin_puppetdb
diff --git a/databases/puppetdb6/files/patch-ext_cli_ssl-setup b/databases/puppetdb8/files/patch-ext_cli_ssl-setup
index ab86d849142d..ab86d849142d 100644
--- a/databases/puppetdb6/files/patch-ext_cli_ssl-setup
+++ b/databases/puppetdb8/files/patch-ext_cli_ssl-setup
diff --git a/databases/puppetdb6/files/patch-ext_config_conf.d_config.ini b/databases/puppetdb8/files/patch-ext_config_conf.d_config.ini
index 390068840508..390068840508 100644
--- a/databases/puppetdb6/files/patch-ext_config_conf.d_config.ini
+++ b/databases/puppetdb8/files/patch-ext_config_conf.d_config.ini
diff --git a/databases/puppetdb6/files/patch-ext_config_conf.d_jetty.ini b/databases/puppetdb8/files/patch-ext_config_conf.d_jetty.ini
index 42d5665a0f64..42d5665a0f64 100644
--- a/databases/puppetdb6/files/patch-ext_config_conf.d_jetty.ini
+++ b/databases/puppetdb8/files/patch-ext_config_conf.d_jetty.ini
diff --git a/databases/puppetdb6/files/patch-ext_config_logback.xml b/databases/puppetdb8/files/patch-ext_config_logback.xml
index 08cb543440aa..08cb543440aa 100644
--- a/databases/puppetdb6/files/patch-ext_config_logback.xml
+++ b/databases/puppetdb8/files/patch-ext_config_logback.xml
diff --git a/databases/puppetdb6/files/patch-ext_config_request-logging.xml b/databases/puppetdb8/files/patch-ext_config_request-logging.xml
index 51b90d0e844e..51b90d0e844e 100644
--- a/databases/puppetdb6/files/patch-ext_config_request-logging.xml
+++ b/databases/puppetdb8/files/patch-ext_config_request-logging.xml
diff --git a/databases/puppetdb6/files/pkg-message.in b/databases/puppetdb8/files/pkg-message.in
index fba773047854..fba773047854 100644
--- a/databases/puppetdb6/files/pkg-message.in
+++ b/databases/puppetdb8/files/pkg-message.in
diff --git a/databases/puppetdb8/files/puppetdb.in b/databases/puppetdb8/files/puppetdb.in
new file mode 100644
index 000000000000..eb761d7ab425
--- /dev/null
+++ b/databases/puppetdb8/files/puppetdb.in
@@ -0,0 +1,89 @@
+#!/bin/sh
+
+# PROVIDE: puppetdb
+# REQUIRE: LOGIN
+# KEYWORD: shutdown
+
+#
+# Configuration settings for puppetdb in /etc/rc.conf:
+#
+# puppetdb_enable (bool):
+#   Set to "NO" by default.
+#   Set it to "YES" to enable puppetdb
+#
+# puppetdb_args (str):
+#   Extra arguments passed to start command
+#
+# puppetdb_java_home (str):
+#   Set to "%%JAVA_HOME%%" by default.
+#   Set the Java virtual machine to run puppetdb
+#
+# puppetdb_java_opts (str):
+#   Set to "" by default.
+#   Java VM args to use.
+#
+# puppetdb_user (str):
+#   Set to "puppetdb" by default.
+#   User to run puppetdb as.
+#
+# puppetdb_group (str):
+#   Set to "puppetdb" by default.
+#   Group for data file ownership.
+#
+# puppetdb_log_file (str):
+#   Set to "/var/log/puppetdb/puppetdb.log" by default.
+#   Log file location.
+#
+
+. /etc/rc.subr
+
+name="puppetdb"
+rcvar=puppetdb_enable
+
+load_rc_config "${name}"
+
+: ${puppetdb_enable="NO"}
+: ${puppetdb_args="services -c %%PREFIX%%/etc/puppetdb/conf.d"}
+: ${puppetdb_java_home="%%JAVA_HOME%%"}
+: ${puppetdb_user="puppetdb"}
+: ${puppetdb_group="puppetdb"}
+: ${puppetdb_log_file="/var/log/puppetdb/puppetdb.log"}
+
+pidfile="/var/run/puppetdb/puppetdb.pid"
+command="/usr/sbin/daemon"
+java_cmd="${puppetdb_java_home}/bin/java"
+procname="${java_cmd}"
+command_args="-p ${pidfile} ${java_cmd} -Djruby.logger.class=com.puppetlabs.jruby_utils.jruby.Slf4jLogger -Dlogappender=F1 ${puppetdb_java_opts} -Djava.security.egd=/dev/urandom -cp %%DATADIR%%/puppetdb.jar clojure.main -m puppetlabs.puppetdb.core  ${puppetdb_args} > ${puppetdb_log_file} 2>&1"
+
+
+required_files="${java_cmd}"
+
+start_precmd="puppetdb_prestart"
+
+puppetdb_prestart() {
+  if [ ! -d "/var/log/puppetdb" ]; then
+    install -d -o "${puppetdb_user}" -g "${puppetdb_group}" -m 750 "/var/log/puppetdb"
+  fi
+  if [ ! -f "${puppetdb_log_file}" ]; then
+    touch "${puppetdb_log_file}"
+    chown "${puppetdb_user}:${puppetdb_group}" "${puppetdb_log_file}"
+    chmod 640 "${puppetdb_log_file}"
+  fi
+  if [ ! -d "/var/run/puppetdb" ]; then
+    install -d -o "${puppetdb_user}" -g "${puppetdb_group}" -m 750 "/var/run/puppetdb"
+  fi
+
+  chown -R "root:${puppetdb_group}" "%%PREFIX%%/etc/puppetdb/conf.d"
+  chmod 0750 "%%PREFIX%%/etc/puppetdb/conf.d"
+
+  chown "root:${puppetdb_group}" "%%PREFIX%%/etc/puppetdb/logback.xml"
+  chmod 0640 "%%PREFIX%%/etc/puppetdb/logback.xml"
+
+  if [ ! -d "/var/db/puppetdb" ]; then
+    install -d -o "${puppetdb_user}" -g "${puppetdb_group}" -m 750 "/var/db/puppetdb"
+  fi
+  chown -R "${puppetdb_user}:${puppetdb_group}" "/var/db/puppetdb"
+  chmod 0750 "/var/db/puppetdb"
+}
+
+run_rc_command "$1"
diff --git a/databases/puppetdb8/pkg-descr b/databases/puppetdb8/pkg-descr
new file mode 100644
index 000000000000..b76f9bc98577
--- /dev/null
+++ b/databases/puppetdb8/pkg-descr
@@ -0,0 +1 @@
+The PuppetDB storeconfigs backend
diff --git a/databases/puppetdb6/pkg-plist b/databases/puppetdb8/pkg-plist
index 91c4e1df6246..91c4e1df6246 100644
--- a/databases/puppetdb6/pkg-plist
+++ b/databases/puppetdb8/pkg-plist
diff --git a/databases/puredb/Makefile b/databases/puredb/Makefile
index cccad29be88a..a58b8f8322d8 100644
--- a/databases/puredb/Makefile
+++ b/databases/puredb/Makefile
@@ -1,5 +1,3 @@
-# Created by: Sergei Kolobov <sergei@kolobov.com>
-
 PORTNAME=	puredb
 PORTVERSION=	2.1
 PORTREVISION=	2
@@ -9,6 +7,7 @@ DISTNAME=	pure-db-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Set of libraries for creating and reading constant databases
+WWW=		https://pureftpd.sourceforge.net/puredb/
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYING
diff --git a/databases/puredb/pkg-descr b/databases/puredb/pkg-descr
index 6eaf6f23338a..ac8a6af2f489 100644
--- a/databases/puredb/pkg-descr
+++ b/databases/puredb/pkg-descr
@@ -5,5 +5,3 @@ disk access to match a hash value), overhead is low (a database is 1028
 bytes plus only 16 extra bytes per record), multiple concurrent read access
 are supported, and databases can be up to 4 Gb long, and they are portable
 across architectures.
-
-WWW: http://pureftpd.sourceforge.net/puredb/
diff --git a/databases/pxlib/Makefile b/databases/pxlib/Makefile
index 7817f241b055..035e8398db3c 100644
--- a/databases/pxlib/Makefile
+++ b/databases/pxlib/Makefile
@@ -1,5 +1,3 @@
-# Created by: Sergey Matveychuk <sem@FreeBSD.org>
-
 PORTNAME=	pxlib
 PORTVERSION=	0.6.8
 CATEGORIES=	databases
@@ -7,27 +5,34 @@ MASTER_SITES=	SF
 
 MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	C library to read various Paradox files
+WWW=		https://pxlib.sourceforge.net
 
 LICENSE=	GPLv2
 
 BUILD_DEPENDS=	p5-XML-Parser>=0:textproc/p5-XML-Parser
 
-USES=		gmake gnome iconv libtool pathfix perl5 pkgconfig
+USES=		gmake gnome iconv libtool localbase:ldflags pathfix perl5 pkgconfig
 USE_GNOME=	intltool
+USE_LDCONFIG=	yes
+
 GNU_CONFIGURE=	yes
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
+GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
 
-USE_LDCONFIG=	yes
+INSTALL_TARGET=	install-strip
 
 OPTIONS_DEFINE=	MANPAGES NLS
 OPTIONS_SUB=	yes
 
 MANPAGES_BUILD_DEPENDS=	docbook-to-man:textproc/docbook-to-man \
 			docbook2man:textproc/docbook-utils
-NLS_CONFIGURE_OFF=	--disable-nls
 NLS_USES=	gettext
-INSTALL_TARGET=	install-strip
+NLS_CONFIGURE_OFF=	--disable-nls
+
+.include <bsd.port.options.mk>
+
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 ))
+CFLAGS+=	-Wno-error=incompatible-function-pointer-types
+.endif
 
 pre-build-MANPAGES-off:
 	${REINPLACE_CMD} -e 's/^DOCDIR =.*/DOCDIR =/' ${WRKSRC}/Makefile
diff --git a/databases/pxlib/pkg-descr b/databases/pxlib/pkg-descr
index 88168ea828bc..e1502c278245 100644
--- a/databases/pxlib/pkg-descr
+++ b/databases/pxlib/pkg-descr
@@ -2,5 +2,3 @@ pxlib is shared C library to read various Paradox files. Currently .DB
 files are best supported. pxlib provides a very simple api to read the
 header and the data records of Paradox files. I also provides functions
 to convert the data into the hosts data format (little or big endian).
-
-WWW: http://pxlib.sourceforge.net
diff --git a/databases/pxlib/pkg-plist b/databases/pxlib/pkg-plist
index d5a49f8126d3..f5f34aee2132 100644
--- a/databases/pxlib/pkg-plist
+++ b/databases/pxlib/pkg-plist
@@ -7,71 +7,71 @@ lib/libpx.so
 lib/libpx.so.0
 lib/libpx.so.0.6.8
 libdata/pkgconfig/pxlib.pc
-%%MANPAGES%%man/man3/PX_add_primary_index.3.gz
-%%MANPAGES%%man/man3/PX_close.3.gz
-%%MANPAGES%%man/man3/PX_close_blob.3.gz
-%%MANPAGES%%man/man3/PX_create_blob_file.3.gz
-%%MANPAGES%%man/man3/PX_create_file.3.gz
-%%MANPAGES%%man/man3/PX_create_fp.3.gz
-%%MANPAGES%%man/man3/PX_date2string.3.gz
-%%MANPAGES%%man/man3/PX_delete.3.gz
-%%MANPAGES%%man/man3/PX_delete_record.3.gz
-%%MANPAGES%%man/man3/PX_get_data_alpha.3.gz
-%%MANPAGES%%man/man3/PX_get_data_bcd.3.gz
-%%MANPAGES%%man/man3/PX_get_data_blob.3.gz
-%%MANPAGES%%man/man3/PX_get_data_byte.3.gz
-%%MANPAGES%%man/man3/PX_get_data_bytes.3.gz
-%%MANPAGES%%man/man3/PX_get_data_double.3.gz
-%%MANPAGES%%man/man3/PX_get_data_graphic.3.gz
-%%MANPAGES%%man/man3/PX_get_data_long.3.gz
-%%MANPAGES%%man/man3/PX_get_data_short.3.gz
-%%MANPAGES%%man/man3/PX_get_field.3.gz
-%%MANPAGES%%man/man3/PX_get_fields.3.gz
-%%MANPAGES%%man/man3/PX_get_majorversion.3.gz
-%%MANPAGES%%man/man3/PX_get_minorversion.3.gz
-%%MANPAGES%%man/man3/PX_get_num_fields.3.gz
-%%MANPAGES%%man/man3/PX_get_num_records.3.gz
-%%MANPAGES%%man/man3/PX_get_opaque.3.gz
-%%MANPAGES%%man/man3/PX_get_parameter.3.gz
-%%MANPAGES%%man/man3/PX_get_record.3.gz
-%%MANPAGES%%man/man3/PX_get_record2.3.gz
-%%MANPAGES%%man/man3/PX_get_recordsize.3.gz
-%%MANPAGES%%man/man3/PX_get_subminorversion.3.gz
-%%MANPAGES%%man/man3/PX_get_value.3.gz
-%%MANPAGES%%man/man3/PX_insert_record.3.gz
-%%MANPAGES%%man/man3/PX_new.3.gz
-%%MANPAGES%%man/man3/PX_new2.3.gz
-%%MANPAGES%%man/man3/PX_new3.3.gz
-%%MANPAGES%%man/man3/PX_new_blob.3.gz
-%%MANPAGES%%man/man3/PX_open_blob_file.3.gz
-%%MANPAGES%%man/man3/PX_open_blob_fp.3.gz
-%%MANPAGES%%man/man3/PX_open_file.3.gz
-%%MANPAGES%%man/man3/PX_open_fp.3.gz
-%%MANPAGES%%man/man3/PX_open_gsf.3.gz
-%%MANPAGES%%man/man3/PX_put_data_alpha.3.gz
-%%MANPAGES%%man/man3/PX_put_data_bcd.3.gz
-%%MANPAGES%%man/man3/PX_put_data_byte.3.gz
-%%MANPAGES%%man/man3/PX_put_data_bytes.3.gz
-%%MANPAGES%%man/man3/PX_put_data_double.3.gz
-%%MANPAGES%%man/man3/PX_put_data_long.3.gz
-%%MANPAGES%%man/man3/PX_put_data_short.3.gz
-%%MANPAGES%%man/man3/PX_put_record.3.gz
-%%MANPAGES%%man/man3/PX_put_recordn.3.gz
-%%MANPAGES%%man/man3/PX_read_blobdata.3.gz
-%%MANPAGES%%man/man3/PX_read_primary_index.3.gz
-%%MANPAGES%%man/man3/PX_retrieve_record.3.gz
-%%MANPAGES%%man/man3/PX_set_blob_file.3.gz
-%%MANPAGES%%man/man3/PX_set_inputencoding.3.gz
-%%MANPAGES%%man/man3/PX_set_parameter.3.gz
-%%MANPAGES%%man/man3/PX_set_tablename.3.gz
-%%MANPAGES%%man/man3/PX_set_targetencoding.3.gz
-%%MANPAGES%%man/man3/PX_set_value.3.gz
-%%MANPAGES%%man/man3/PX_strdup.3.gz
-%%MANPAGES%%man/man3/PX_time2string.3.gz
-%%MANPAGES%%man/man3/PX_timestamp2string.3.gz
-%%MANPAGES%%man/man3/PX_update_record.3.gz
-%%MANPAGES%%man/man3/PX_write_primary_index.3.gz
-%%MANPAGES%%man/man3/pxlib.3.gz
 %%NLS%%share/locale/de/LC_MESSAGES/pxlib.mo
 %%NLS%%share/locale/es/LC_MESSAGES/pxlib.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/pxlib.mo
+%%MANPAGES%%share/man/man3/PX_add_primary_index.3.gz
+%%MANPAGES%%share/man/man3/PX_close.3.gz
+%%MANPAGES%%share/man/man3/PX_close_blob.3.gz
+%%MANPAGES%%share/man/man3/PX_create_blob_file.3.gz
+%%MANPAGES%%share/man/man3/PX_create_file.3.gz
+%%MANPAGES%%share/man/man3/PX_create_fp.3.gz
+%%MANPAGES%%share/man/man3/PX_date2string.3.gz
+%%MANPAGES%%share/man/man3/PX_delete.3.gz
+%%MANPAGES%%share/man/man3/PX_delete_record.3.gz
+%%MANPAGES%%share/man/man3/PX_get_data_alpha.3.gz
+%%MANPAGES%%share/man/man3/PX_get_data_bcd.3.gz
+%%MANPAGES%%share/man/man3/PX_get_data_blob.3.gz
+%%MANPAGES%%share/man/man3/PX_get_data_byte.3.gz
+%%MANPAGES%%share/man/man3/PX_get_data_bytes.3.gz
+%%MANPAGES%%share/man/man3/PX_get_data_double.3.gz
+%%MANPAGES%%share/man/man3/PX_get_data_graphic.3.gz
+%%MANPAGES%%share/man/man3/PX_get_data_long.3.gz
+%%MANPAGES%%share/man/man3/PX_get_data_short.3.gz
+%%MANPAGES%%share/man/man3/PX_get_field.3.gz
+%%MANPAGES%%share/man/man3/PX_get_fields.3.gz
+%%MANPAGES%%share/man/man3/PX_get_majorversion.3.gz
+%%MANPAGES%%share/man/man3/PX_get_minorversion.3.gz
+%%MANPAGES%%share/man/man3/PX_get_num_fields.3.gz
+%%MANPAGES%%share/man/man3/PX_get_num_records.3.gz
+%%MANPAGES%%share/man/man3/PX_get_opaque.3.gz
+%%MANPAGES%%share/man/man3/PX_get_parameter.3.gz
+%%MANPAGES%%share/man/man3/PX_get_record.3.gz
+%%MANPAGES%%share/man/man3/PX_get_record2.3.gz
+%%MANPAGES%%share/man/man3/PX_get_recordsize.3.gz
+%%MANPAGES%%share/man/man3/PX_get_subminorversion.3.gz
+%%MANPAGES%%share/man/man3/PX_get_value.3.gz
+%%MANPAGES%%share/man/man3/PX_insert_record.3.gz
+%%MANPAGES%%share/man/man3/PX_new.3.gz
+%%MANPAGES%%share/man/man3/PX_new2.3.gz
+%%MANPAGES%%share/man/man3/PX_new3.3.gz
+%%MANPAGES%%share/man/man3/PX_new_blob.3.gz
+%%MANPAGES%%share/man/man3/PX_open_blob_file.3.gz
+%%MANPAGES%%share/man/man3/PX_open_blob_fp.3.gz
+%%MANPAGES%%share/man/man3/PX_open_file.3.gz
+%%MANPAGES%%share/man/man3/PX_open_fp.3.gz
+%%MANPAGES%%share/man/man3/PX_open_gsf.3.gz
+%%MANPAGES%%share/man/man3/PX_put_data_alpha.3.gz
+%%MANPAGES%%share/man/man3/PX_put_data_bcd.3.gz
+%%MANPAGES%%share/man/man3/PX_put_data_byte.3.gz
+%%MANPAGES%%share/man/man3/PX_put_data_bytes.3.gz
+%%MANPAGES%%share/man/man3/PX_put_data_double.3.gz
+%%MANPAGES%%share/man/man3/PX_put_data_long.3.gz
+%%MANPAGES%%share/man/man3/PX_put_data_short.3.gz
+%%MANPAGES%%share/man/man3/PX_put_record.3.gz
+%%MANPAGES%%share/man/man3/PX_put_recordn.3.gz
+%%MANPAGES%%share/man/man3/PX_read_blobdata.3.gz
+%%MANPAGES%%share/man/man3/PX_read_primary_index.3.gz
+%%MANPAGES%%share/man/man3/PX_retrieve_record.3.gz
+%%MANPAGES%%share/man/man3/PX_set_blob_file.3.gz
+%%MANPAGES%%share/man/man3/PX_set_inputencoding.3.gz
+%%MANPAGES%%share/man/man3/PX_set_parameter.3.gz
+%%MANPAGES%%share/man/man3/PX_set_tablename.3.gz
+%%MANPAGES%%share/man/man3/PX_set_targetencoding.3.gz
+%%MANPAGES%%share/man/man3/PX_set_value.3.gz
+%%MANPAGES%%share/man/man3/PX_strdup.3.gz
+%%MANPAGES%%share/man/man3/PX_time2string.3.gz
+%%MANPAGES%%share/man/man3/PX_timestamp2string.3.gz
+%%MANPAGES%%share/man/man3/PX_update_record.3.gz
+%%MANPAGES%%share/man/man3/PX_write_primary_index.3.gz
+%%MANPAGES%%share/man/man3/pxlib.3.gz
diff --git a/databases/pxtools/Makefile b/databases/pxtools/Makefile
index bf05e3b1c68c..38fe46299974 100644
--- a/databases/pxtools/Makefile
+++ b/databases/pxtools/Makefile
@@ -1,5 +1,3 @@
-# Created by: Chris D. Faulhaber <jedgar@FreeBSD.org>
-
 PORTNAME=	pxtools
 PORTVERSION=	0.0.20
 PORTREVISION=	4
@@ -8,6 +6,7 @@ MASTER_SITES=	http://jan.kneschke.de/downloads/pxtools/
 
 MAINTAINER=	danfe@FreeBSD.org
 COMMENT=	Collection of tools to work with Paradox databases
+WWW=		https://jan.kneschke.de/projects/pxtools/
 
 LICENSE=	GPLv2
 
diff --git a/databases/pxtools/pkg-descr b/databases/pxtools/pkg-descr
index 6acba2f272cf..998f55561a7e 100644
--- a/databases/pxtools/pkg-descr
+++ b/databases/pxtools/pkg-descr
@@ -6,5 +6,3 @@ pxtools consists of the following:
 * pxsqldump/pxcsvdump are utilities to extract the data from a
   Paradox-database.  The output is an SQL-/CSV-dump that can be
   used to recreate the database in an SQL environment.
-
-WWW: http://jan.kneschke.de/projects/pxtools/
diff --git a/databases/py-Elixir/Makefile b/databases/py-Elixir/Makefile
index 5d9255b2c298..b6effc52f9f4 100644
--- a/databases/py-Elixir/Makefile
+++ b/databases/py-Elixir/Makefile
@@ -1,21 +1,20 @@
-# Created by: Nicola Vitale <nivit@FreeBSD.org>
-
 PORTNAME=	Elixir
 PORTVERSION=	0.7.1
 PORTREVISION=	3
 CATEGORIES=	databases python
-MASTER_SITES=	CHEESESHOP \
+MASTER_SITES=	PYPI \
 		http://nivi.interfree.it/distfiles/${PORTNAME}/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	nivit@FreeBSD.org
 COMMENT=	Declarative Mapper for SQLAlchemy
+WWW=		http://elixir.ematia.de/
 
 LICENSE=	MIT
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlalchemy10>=0.4.0:databases/py-sqlalchemy10@${PY_FLAVOR}
 
-USES=		python:3.6+
+USES=		python
 USE_PYTHON=	distutils autoplist
 
 .include <bsd.port.mk>
diff --git a/databases/py-Elixir/files/patch-2to3 b/databases/py-Elixir/files/patch-2to3
new file mode 100644
index 000000000000..ab5974dac8a3
--- /dev/null
+++ b/databases/py-Elixir/files/patch-2to3
@@ -0,0 +1,190 @@
+--- elixir/entity.py.orig	2009-11-13 19:50:38 UTC
++++ elixir/entity.py
+@@ -3,7 +3,7 @@ This module provides the ``Entity`` base class, as wel
+ ``EntityMeta``.
+ '''
+ 
+-from py23compat import sorted
++from .py23compat import sorted
+ 
+ import sys
+ import types
+@@ -172,7 +172,7 @@ class EntityDescriptor(object):
+             self.identity = self.identity(entity)
+ 
+         if self.polymorphic:
+-            if not isinstance(self.polymorphic, basestring):
++            if not isinstance(self.polymorphic, str):
+                 self.polymorphic = options.DEFAULT_POLYMORPHIC_COL_NAME
+ 
+     #---------------------
+@@ -226,7 +226,7 @@ class EntityDescriptor(object):
+                         if col.primary_key:
+                             self.add_column(col.copy())
+             elif not self.has_pk and self.auto_primarykey:
+-                if isinstance(self.auto_primarykey, basestring):
++                if isinstance(self.auto_primarykey, str):
+                     colname = self.auto_primarykey
+                 else:
+                     colname = options.DEFAULT_AUTO_PRIMARYKEY_NAME
+@@ -298,7 +298,7 @@ class EntityDescriptor(object):
+                                        options.POLYMORPHIC_COL_TYPE))
+ 
+             if self.version_id_col:
+-                if not isinstance(self.version_id_col, basestring):
++                if not isinstance(self.version_id_col, str):
+                     self.version_id_col = options.DEFAULT_VERSION_ID_COL_NAME
+                 self.add_column(Column(self.version_id_col, Integer))
+ 
+@@ -306,7 +306,7 @@ class EntityDescriptor(object):
+         self.entity.table = Table(self.tablename, self.metadata,
+                                   *args, **kwargs)
+         if DEBUG:
+-            print self.entity.table.repr2()
++            print(self.entity.table.repr2())
+ 
+     def setup_reltables(self):
+         self.call_builders('create_tables')
+@@ -365,7 +365,7 @@ class EntityDescriptor(object):
+         return children
+ 
+     def translate_order_by(self, order_by):
+-        if isinstance(order_by, basestring):
++        if isinstance(order_by, str):
+             order_by = [order_by]
+ 
+         order = []
+@@ -505,12 +505,12 @@ class EntityDescriptor(object):
+         # get one in any case.
+         table = type.__getattribute__(self.entity, 'table')
+         if table is not None:
+-            if check_duplicate and col.key in table.columns.keys():
++            if check_duplicate and col.key in list(table.columns.keys()):
+                 raise Exception("Column '%s' already exist in table '%s' ! " %
+                                 (col.key, table.name))
+             table.append_column(col)
+             if DEBUG:
+-                print "table.append_column(%s)" % col
++                print("table.append_column(%s)" % col)
+ 
+     def add_constraint(self, constraint):
+         self.constraints.append(constraint)
+@@ -537,7 +537,7 @@ class EntityDescriptor(object):
+         if mapper:
+             mapper.add_property(name, property)
+             if DEBUG:
+-                print "mapper.add_property('%s', %s)" % (name, repr(property))
++                print("mapper.add_property('%s', %s)" % (name, repr(property)))
+ 
+     def add_mapper_extension(self, extension):
+         extensions = self.mapper_options.get('extension', [])
+@@ -795,7 +795,7 @@ def instrument_class(cls):
+ 
+     # Process attributes (using the assignment syntax), looking for
+     # 'Property' instances and attaching them to this entity.
+-    properties = [(name, attr) for name, attr in cls.__dict__.iteritems()
++    properties = [(name, attr) for name, attr in cls.__dict__.items()
+                                if isinstance(attr, Property)]
+     sorted_props = sorted(base_props + properties,
+                           key=lambda i: i[1]._counter)
+@@ -924,7 +924,7 @@ def setup_entities(entities):
+         # delete all Elixir properties so that it doesn't interfere with
+         # SQLAlchemy. At this point they should have be converted to
+         # builders.
+-        for name, attr in entity.__dict__.items():
++        for name, attr in list(entity.__dict__.items()):
+             if isinstance(attr, Property):
+                 delattr(entity, name)
+ 
+@@ -1004,7 +1004,7 @@ class EntityBase(object):
+         self.set(**kwargs)
+ 
+     def set(self, **kwargs):
+-        for key, value in kwargs.iteritems():
++        for key, value in kwargs.items():
+             setattr(self, key, value)
+ 
+     def update_or_create(cls, data, surrogate=True):
+@@ -1038,7 +1038,7 @@ class EntityBase(object):
+ 
+         mapper = sqlalchemy.orm.object_mapper(self)
+ 
+-        for key, value in data.iteritems():
++        for key, value in data.items():
+             if isinstance(value, dict):
+                 dbvalue = getattr(self, key)
+                 rel_class = mapper.get_property(key).mapper.class_
+@@ -1074,7 +1074,7 @@ class EntityBase(object):
+                                       if isinstance(p, ColumnProperty)]
+         data = dict([(name, getattr(self, name))
+                      for name in col_prop_names if name not in exclude])
+-        for rname, rdeep in deep.iteritems():
++        for rname, rdeep in deep.items():
+             dbdata = getattr(self, rname)
+             #FIXME: use attribute names (ie coltoprop) instead of column names
+             fks = self.mapper.get_property(rname).remote_side
+@@ -1145,7 +1145,7 @@ class EntityBase(object):
+     get = classmethod(get)
+ 
+ 
+-class Entity(EntityBase):
++class Entity(EntityBase, metaclass=EntityMeta):
+     '''
+     The base class for all entities
+ 
+@@ -1167,6 +1167,5 @@ class Entity(EntityBase):
+     For further information, please refer to the provided examples or
+     tutorial.
+     '''
+-    __metaclass__ = EntityMeta
+ 
+ 
+--- elixir/py23compat.py.orig	2009-10-02 10:19:50 UTC
++++ elixir/py23compat.py
+@@ -11,7 +11,7 @@ orig_cmp = cmp
+ def sort_list(l, cmp=None, key=None, reverse=False):
+     try:
+         l.sort(cmp, key, reverse)
+-    except TypeError, e:
++    except TypeError as e:
+         if not str(e).startswith('sort expected at most 1 arguments'):
+             raise
+         if cmp is None:
+--- elixir/relationships.py.orig	2009-11-13 20:04:26 UTC
++++ elixir/relationships.py
+@@ -412,7 +412,7 @@ from sqlalchemy import ForeignKeyConstraint, Column, T
+ from sqlalchemy.orm import relation, backref, class_mapper
+ from sqlalchemy.ext.associationproxy import association_proxy
+ 
+-import options
++from . import options
+ from elixir.statements import ClassMutator
+ from elixir.properties import Property
+ from elixir.entity import EntityMeta, DEBUG
+@@ -495,7 +495,7 @@ class Relationship(Property):
+ 
+     def target(self):
+         if not self._target:
+-            if isinstance(self.of_kind, basestring):
++            if isinstance(self.of_kind, str):
+                 collection = self.entity._descriptor.collection
+                 self._target = collection.resolve(self.of_kind, self.entity)
+             else:
+@@ -1115,7 +1115,7 @@ class ManyToMany(Relationship):
+             self.table = Table(tablename, e1_desc.metadata,
+                                schema=schema, *args, **complete_kwargs)
+             if DEBUG:
+-                print self.table.repr2()
++                print(self.table.repr2())
+ 
+     def _build_join_clauses(self):
+         # In the case we have a self-reference, we need to build join clauses
+@@ -1222,7 +1222,7 @@ def _get_join_clauses(local_table, local_cols1, local_
+     # match.
+ 
+ #TODO: rewrite this. Even with the comment, I don't even understand it myself.
+-    for cols, constraint in constraint_map.iteritems():
++    for cols, constraint in constraint_map.items():
+         if cols == cols1 or (cols != cols2 and
+                              not cols1 and (cols2 in constraint_map or
+                                             cols2 is None)):
diff --git a/databases/py-Elixir/pkg-descr b/databases/py-Elixir/pkg-descr
index a9df924b8374..2c716b6ea0ca 100644
--- a/databases/py-Elixir/pkg-descr
+++ b/databases/py-Elixir/pkg-descr
@@ -9,5 +9,3 @@ not need the full expressiveness of SQLAlchemy's manual mapper definitions.
 
 Elixir is intended to replace the ActiveMapper SQLAlchemy extension, and the
 TurboEntity project.
-
-WWW: http://elixir.ematia.de/
diff --git a/databases/py-PyGreSQL/Makefile b/databases/py-PyGreSQL/Makefile
index 9e560a353cc6..58970f7641b0 100644
--- a/databases/py-PyGreSQL/Makefile
+++ b/databases/py-PyGreSQL/Makefile
@@ -1,19 +1,18 @@
-# Created by: nectar@FreeBSD.org
-
 PORTNAME=	PyGreSQL
-PORTVERSION=	5.2
+PORTVERSION=	6.0
 PORTEPOCH=	1
 CATEGORIES=	databases python
 MASTER_SITES=	http://www.pygresql.org/files/ \
-		CHEESESHOP
+		PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	wen@FreeBSD.org
 COMMENT=	Python interface to PostgreSQL, both classic and DP-API 2.0
+WWW=		http://www.pygresql.org/
 
 LICENSE=	PSFL
 
-USES=		pgsql python:3.6+
+USES=		pgsql python
 USE_PYTHON=	autoplist distutils
 
 PORTDOCS=	*
@@ -21,7 +20,7 @@ PORTDOCS=	*
 OPTIONS_DEFINE=	DOCS
 
 post-install:
-	${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/_pg*.so
+	${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/pg/_pg*.so
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	(cd ${WRKSRC}/docs/ && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR})
 
diff --git a/databases/py-PyGreSQL/distinfo b/databases/py-PyGreSQL/distinfo
index 4738d355c6d3..eeb4074d72fc 100644
--- a/databases/py-PyGreSQL/distinfo
+++ b/databases/py-PyGreSQL/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1594975967
-SHA256 (PyGreSQL-5.2.tar.gz) = 762da84860edef0a3f9119483ee35340636d5c69abd3825fd1bc8d7e73bc6ecd
-SIZE (PyGreSQL-5.2.tar.gz) = 267557
+TIMESTAMP = 1699664733
+SHA256 (PyGreSQL-6.0.tar.gz) = 19b0c1e95d00aadd423f44a0be8efcd9938c1ec83a338da456bfbd4416815409
+SIZE (PyGreSQL-6.0.tar.gz) = 271585
diff --git a/databases/py-PyGreSQL/pkg-descr b/databases/py-PyGreSQL/pkg-descr
index 9fbde26ab37d..ba871b352b76 100644
--- a/databases/py-PyGreSQL/pkg-descr
+++ b/databases/py-PyGreSQL/pkg-descr
@@ -2,5 +2,3 @@ PyGreSQL is a python module that interfaces to a PostgreSQL database. It embeds
 the PostgreSQL query library to allow easy use of the powerful PostgreSQL
 features from a Python script.
 PyGreSQL includes a DB-API 2.0 compliant API wrapper.
-
-WWW: http://www.pygresql.org/
diff --git a/databases/py-Pyrseas/Makefile b/databases/py-Pyrseas/Makefile
index 58e0be9f4a98..5027a88af18d 100644
--- a/databases/py-Pyrseas/Makefile
+++ b/databases/py-Pyrseas/Makefile
@@ -1,11 +1,11 @@
 PORTNAME=	Pyrseas
-PORTVERSION=	0.9.0
-DISTVERSIONPREFIX=	v
+PORTVERSION=	0.9.1
 CATEGORIES=	databases python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	arcade@b1t.name
 COMMENT=	Framework and utilities to upgrade and maintain a relational database
+WWW=		https://github.com/perseas/Pyrseas
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
@@ -15,7 +15,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}psycopg2>=2.5:databases/py-psycopg2@${PY_FLA
 		${PYTHON_PKGNAMEPREFIX}yaml>=3.10:devel/py-yaml@${PY_FLAVOR}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR}
 
-USES=		python:3.6+
+USES=		python
 USE_PYTHON=	distutils autoplist
 
 USE_GITHUB=	yes
diff --git a/databases/py-Pyrseas/distinfo b/databases/py-Pyrseas/distinfo
index aaa57c5c3a9c..ca10865755f6 100644
--- a/databases/py-Pyrseas/distinfo
+++ b/databases/py-Pyrseas/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1567194448
-SHA256 (perseas-Pyrseas-v0.9.0_GH0.tar.gz) = e013e3776ae52f1b71c3b46f25946962355fa3f816c6925cf85ff14e332429eb
-SIZE (perseas-Pyrseas-v0.9.0_GH0.tar.gz) = 176948
+TIMESTAMP = 1633310255
+SHA256 (perseas-Pyrseas-0.9.1_GH0.tar.gz) = 5d413579a9f3e840b9494d54f761c47389990165fac976eeb8c7922e9d00a883
+SIZE (perseas-Pyrseas-0.9.1_GH0.tar.gz) = 177861
diff --git a/databases/py-Pyrseas/pkg-descr b/databases/py-Pyrseas/pkg-descr
index fdeeb66b85d0..52313e4e727b 100644
--- a/databases/py-Pyrseas/pkg-descr
+++ b/databases/py-Pyrseas/pkg-descr
@@ -1,5 +1,3 @@
-Pyrseas provides a framework and utilities to upgrade and maintain a relational
-database. Its purpose is to enhance and follow through on the concepts of the
-Andromeda Project (http://www.andromeda-project.org/)
-
-WWW: http://pgfoundry.org/projects/pyrseas
+Pyrseas provides utilities to describe a PostgreSQL database schema as YAML, to
+verify the schema against the same or a different database and to generate SQL
+that will modify the schema to match the YAML description.
diff --git a/databases/py-aesqlapius/Makefile b/databases/py-aesqlapius/Makefile
index 2cff260218ed..1f792d553eb3 100644
--- a/databases/py-aesqlapius/Makefile
+++ b/databases/py-aesqlapius/Makefile
@@ -1,16 +1,18 @@
 PORTNAME=	aesqlapius
 PORTVERSION=	0.0.9
 CATEGORIES=	databases python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Manage SQL queries as a Python API
+WWW=		https://pypi.org/project/aesqlapius/
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pytest-asyncio>=0:devel/py-pytest-asyncio@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytest-datadir>=0:devel/py-pytest-datadir@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3@${PY_FLAVOR}
 
diff --git a/databases/py-aesqlapius/files/patch-setup.cfg b/databases/py-aesqlapius/files/patch-setup.cfg
new file mode 100644
index 000000000000..026b7ff58869
--- /dev/null
+++ b/databases/py-aesqlapius/files/patch-setup.cfg
@@ -0,0 +1,8 @@
+--- setup.cfg.orig	2021-08-31 15:37:59.070322000 +0300
++++ setup.cfg	2022-11-07 15:05:28.655713000 +0300
+@@ -26,3 +26,5 @@
+ tag_build = 
+ tag_date = 0
+ 
++[tool:pytest]
++asyncio_mode = auto
diff --git a/databases/py-aesqlapius/pkg-descr b/databases/py-aesqlapius/pkg-descr
index a7c84680032a..865bd48bb40f 100644
--- a/databases/py-aesqlapius/pkg-descr
+++ b/databases/py-aesqlapius/pkg-descr
@@ -15,5 +15,3 @@ output types and patterns (you may specify whether a method returns
 iterator, list, dict of rows, or a single row, where row may
 be represented as a tuple, list, dict, single value or a custom
 type such as a dataclass).
-
-WWW: https://pypi.org/project/aesqlapius/
diff --git a/databases/py-agate-sql/Makefile b/databases/py-agate-sql/Makefile
index 86311dd1fcaa..d60ce4d1e242 100644
--- a/databases/py-agate-sql/Makefile
+++ b/databases/py-agate-sql/Makefile
@@ -1,18 +1,19 @@
 PORTNAME=	agate-sql
-PORTVERSION=	0.5.7
+PORTVERSION=	0.7.2
 CATEGORIES=	databases textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	matthew@FreeBSD.org
 COMMENT=	Add SQL read/write support to agate
+WWW=		https://agate-sql.rtfd.org/
 
 LICENSE=	MIT
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}agate>=1.5.0:textproc/py-agate@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}sqlalchemy10>=1.0.8:databases/py-sqlalchemy10@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}sqlalchemy20>=1.4:databases/py-sqlalchemy20@${PY_FLAVOR}
 
-USES=		python:3.6+
+USES=		python
 USE_PYTHON=	autoplist distutils
 
 NO_ARCH=	yes
diff --git a/databases/py-agate-sql/distinfo b/databases/py-agate-sql/distinfo
index 9ba52c31b0e9..9552f7b28695 100644
--- a/databases/py-agate-sql/distinfo
+++ b/databases/py-agate-sql/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1626264578
-SHA256 (agate-sql-0.5.7.tar.gz) = 7622c1f243b5a9a5efddfe28c36eeeb30081e43e3eb72e8f3da22c2edaecf4d8
-SIZE (agate-sql-0.5.7.tar.gz) = 14975
+TIMESTAMP = 1704873020
+SHA256 (agate-sql-0.7.2.tar.gz) = 9b1b30284a573fd416759437273dcc5c81022bdf2facb24b4aa029a62afd53b0
+SIZE (agate-sql-0.7.2.tar.gz) = 13695
diff --git a/databases/py-agate-sql/pkg-descr b/databases/py-agate-sql/pkg-descr
index 3951d91287ea..8d5269df8097 100644
--- a/databases/py-agate-sql/pkg-descr
+++ b/databases/py-agate-sql/pkg-descr
@@ -1,3 +1 @@
 agate-sql adds SQL read/write support to agate.
-
-WWW: http://agate-sql.rtfd.org/
diff --git a/databases/py-aiomcache/Makefile b/databases/py-aiomcache/Makefile
new file mode 100644
index 000000000000..8db0c3192985
--- /dev/null
+++ b/databases/py-aiomcache/Makefile
@@ -0,0 +1,22 @@
+PORTNAME=	aiomcache
+DISTVERSION=	0.7.0
+PORTREVISION=	1
+CATEGORIES=	databases python
+MASTER_SITES=	PYPI
+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+
+MAINTAINER=	acm@FreeBSD.org
+COMMENT=	Minimal asyncio memcached client
+WWW=		https://github.com/aio-libs/aiomcache/
+
+LICENSE=	BSD
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
+USES=		cpe python
+CPE_VENDOR=	${PORTNAME}_project
+USE_PYTHON=	autoplist distutils cython
+
+post-extract:
+	@${MV} ${WRKSRC}/tests ${WRKSRC}/aiomcache/
+
+.include <bsd.port.mk>
diff --git a/databases/py-aiomcache/distinfo b/databases/py-aiomcache/distinfo
new file mode 100644
index 000000000000..c0055786e7c2
--- /dev/null
+++ b/databases/py-aiomcache/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1664422512
+SHA256 (aiomcache-0.7.0.tar.gz) = a73fd33bc9b4b2dad051d2b7ad0d14087491d87eb0a3d741c9c51a53665bf500
+SIZE (aiomcache-0.7.0.tar.gz) = 12392
diff --git a/databases/py-aiomcache/pkg-descr b/databases/py-aiomcache/pkg-descr
new file mode 100644
index 000000000000..854706512677
--- /dev/null
+++ b/databases/py-aiomcache/pkg-descr
@@ -0,0 +1 @@
+Asyncio (PEP 3156) library to work with memcached
diff --git a/databases/py-aiomysql/Makefile b/databases/py-aiomysql/Makefile
index e97c4470694d..d03bef4877b5 100644
--- a/databases/py-aiomysql/Makefile
+++ b/databases/py-aiomysql/Makefile
@@ -1,21 +1,24 @@
-# Created by: Po-Chuan Hsieh <sunpoet@FreeBSD.org>
-
 PORTNAME=	aiomysql
-PORTVERSION=	0.0.21
+PORTVERSION=	0.2.0
 CATEGORIES=	databases python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	MySQL driver for asyncio
+WWW=		https://github.com/aio-libs/aiomysql
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pymysql>=0.9:databases/py-pymysql@${PY_FLAVOR}
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools>=42:devel/py-setuptools@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}setuptools-scm>=6.4:devel/py-setuptools-scm@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}setuptools_scm_git_archive>=1.1:devel/py-setuptools_scm_git_archive@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR}
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pymysql>=1.0:databases/py-pymysql@${PY_FLAVOR}
 
 USES=		python
-USE_PYTHON=	autoplist concurrent distutils
+USE_PYTHON=	autoplist concurrent pep517
 
 NO_ARCH=	yes
 
diff --git a/databases/py-aiomysql/distinfo b/databases/py-aiomysql/distinfo
index e54ceececd53..fedaeff43f95 100644
--- a/databases/py-aiomysql/distinfo
+++ b/databases/py-aiomysql/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1612519091
-SHA256 (aiomysql-0.0.21.tar.gz) = 811569c0db118dd2685f0878f5cebf17a11e89a995fa14261d5fa0254113842c
-SIZE (aiomysql-0.0.21.tar.gz) = 61286
+TIMESTAMP = 1688166150
+SHA256 (aiomysql-0.2.0.tar.gz) = 558b9c26d580d08b8c5fd1be23c5231ce3aeff2dadad989540fee740253deb67
+SIZE (aiomysql-0.2.0.tar.gz) = 114706
diff --git a/databases/py-aiomysql/files/patch-pyproject.toml b/databases/py-aiomysql/files/patch-pyproject.toml
new file mode 100644
index 000000000000..01823cd2153d
--- /dev/null
+++ b/databases/py-aiomysql/files/patch-pyproject.toml
@@ -0,0 +1,11 @@
+--- pyproject.toml.orig	2023-06-11 19:29:20 UTC
++++ pyproject.toml
+@@ -4,7 +4,7 @@ requires = [
+     "setuptools >= 42",
+ 
+     # Plugins
+-    "setuptools_scm[toml] >= 6.4, < 7",
++    "setuptools_scm[toml] >= 6.4",
+     "setuptools_scm_git_archive >= 1.1",
+ ]
+ build-backend = "setuptools.build_meta"
diff --git a/databases/py-aiomysql/files/patch-setup.py b/databases/py-aiomysql/files/patch-setup.py
deleted file mode 100644
index 56904b48871d..000000000000
--- a/databases/py-aiomysql/files/patch-setup.py
+++ /dev/null
@@ -1,11 +0,0 @@
---- setup.py.orig	2020-11-26 16:45:41 UTC
-+++ setup.py
-@@ -4,7 +4,7 @@ import sys
- from setuptools import setup, find_packages
- 
- 
--install_requires = ['PyMySQL>=0.9,<=0.9.3']
-+install_requires = ['PyMySQL>=0.9']
- 
- PY_VER = sys.version_info
- 
diff --git a/databases/py-aiomysql/pkg-descr b/databases/py-aiomysql/pkg-descr
index 73047421865f..56a60c5a0049 100644
--- a/databases/py-aiomysql/pkg-descr
+++ b/databases/py-aiomysql/pkg-descr
@@ -6,5 +6,3 @@ feel.
 Internally aiomysql is copy of PyMySQL, underlying io calls switched to async,
 basically yield from and asyncio.coroutine added in proper places)). sqlalchemy
 support ported from aiopg.
-
-WWW: https://github.com/aio-libs/aiomysql
diff --git a/databases/py-aiopg/Makefile b/databases/py-aiopg/Makefile
index 00716a9c5b76..ba71c25def46 100644
--- a/databases/py-aiopg/Makefile
+++ b/databases/py-aiopg/Makefile
@@ -1,20 +1,20 @@
-# Created by: Babak Farrokhi <farrokhi@FreeBSD.org>
-
 PORTNAME=	aiopg
-PORTVERSION=	1.3.1
+PORTVERSION=	1.4.0
 CATEGORIES=	databases python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	farrokhi@FreeBSD.org
 COMMENT=	Python library for accessing PostgreSQL database using asyncio
+WWW=		https://github.com/aio-libs/aiopg
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}psycopg2>=2.7.0:databases/py-psycopg2@${PY_FLAVOR}
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}psycopg2>=2.7.0:databases/py-psycopg2@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}async_timeout>=3.0.0:devel/py-async_timeout@${PY_FLAVOR}
 
-USES=		pgsql:9.2+ python:3.4+
+USES=		pgsql:11+ python
 USE_PYTHON=	autoplist concurrent distutils
 NO_ARCH=	yes
 
diff --git a/databases/py-aiopg/distinfo b/databases/py-aiopg/distinfo
index 69c870f692e0..1be76ac18132 100644
--- a/databases/py-aiopg/distinfo
+++ b/databases/py-aiopg/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1625815614
-SHA256 (aiopg-1.3.1.tar.gz) = 837fb1cbc84fc95be78e4b1a1e3ff176eee836051b957304b10b18ee30f999b6
-SIZE (aiopg-1.3.1.tar.gz) = 35917
+TIMESTAMP = 1669451182
+SHA256 (aiopg-1.4.0.tar.gz) = 116253bef86b4d954116716d181e9a0294037f266718b2e1c9766af995639d71
+SIZE (aiopg-1.4.0.tar.gz) = 35593
diff --git a/databases/py-aiopg/pkg-descr b/databases/py-aiopg/pkg-descr
index 21ccccdd128f..42349d4c0a79 100644
--- a/databases/py-aiopg/pkg-descr
+++ b/databases/py-aiopg/pkg-descr
@@ -1,5 +1,3 @@
 aiopg is a library for accessing a PostgreSQL database from the asyncio
 (PEP-3156/tulip) framework. It wraps asynchronous features of the Psycopg
 database driver.
-
-WWW: https://github.com/aio-libs/aiopg
diff --git a/databases/py-aioredis/Makefile b/databases/py-aioredis/Makefile
index f6c1371d562c..c260158c386d 100644
--- a/databases/py-aioredis/Makefile
+++ b/databases/py-aioredis/Makefile
@@ -1,20 +1,19 @@
-# Created by: Babak Farrokhi <farrokhi@FreeBSD.org>
-
 PORTNAME=	aioredis
 PORTVERSION=	1.3.1
 CATEGORIES=	databases python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	farrokhi@FreeBSD.org
 COMMENT=	Python asyncio (PEP 3156) Redis client library
+WWW=		https://github.com/aio-libs/aioredis
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}async_timeout>0:devel/py-async_timeout@${PY_FLAVOR}
 
-USES=		python:3.5+
+USES=		python
 USE_PYTHON=	distutils autoplist
 
 OPTIONS_DEFINE=	HIREDIS
diff --git a/databases/py-aioredis/pkg-descr b/databases/py-aioredis/pkg-descr
index ac225c27d916..9383d9de6a1e 100644
--- a/databases/py-aioredis/pkg-descr
+++ b/databases/py-aioredis/pkg-descr
@@ -2,5 +2,3 @@ asyncio (PEP 3156) Redis client library.
 
 The library is intended to provide simple and clear interface
 to Redis based on asyncio.
-
-WWW: https://github.com/aio-libs/aioredis
diff --git a/databases/py-aiosqlite/Makefile b/databases/py-aiosqlite/Makefile
index a2e79565429f..5635d7dd07f0 100644
--- a/databases/py-aiosqlite/Makefile
+++ b/databases/py-aiosqlite/Makefile
@@ -1,17 +1,23 @@
 PORTNAME=	aiosqlite
-PORTVERSION=	0.17.0
+PORTVERSION=	0.19.0
 CATEGORIES=	databases python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	romain@FreeBSD.org
-COMMENT=	AsyncIO bridge to the standard sqlite3 module for Python 3.5+
+COMMENT=	AsyncIO bridge to the standard sqlite3 module for Python 3.7+
+WWW=		https://pypi.python.org/pypi/aiosqlite
 
 LICENSE=	MIT
 
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}flit-core>2:devel/py-flit-core@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR}
 
-USES=		python:3.5+
-USE_PYTHON=	autoplist distutils
+USES=		python
+USE_PYTHON=	autoplist pep517
+
+NO_ARCH=	yes
+MAKE_ENV+=	PYTHONDONTWRITEBYTECODE=1
 
 .include <bsd.port.mk>
diff --git a/databases/py-aiosqlite/distinfo b/databases/py-aiosqlite/distinfo
index 05ea489caa56..c2184a68521e 100644
--- a/databases/py-aiosqlite/distinfo
+++ b/databases/py-aiosqlite/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1621230469
-SHA256 (aiosqlite-0.17.0.tar.gz) = f0e6acc24bc4864149267ac82fb46dfb3be4455f99fe21df82609cc6e6baee51
-SIZE (aiosqlite-0.17.0.tar.gz) = 25941
+TIMESTAMP = 1691193160
+SHA256 (aiosqlite-0.19.0.tar.gz) = 95ee77b91c8d2808bd08a59fbebf66270e9090c3d92ffbf260dc0db0b979577d
+SIZE (aiosqlite-0.19.0.tar.gz) = 21832
diff --git a/databases/py-aiosqlite/pkg-descr b/databases/py-aiosqlite/pkg-descr
index dd2b1aa9c3f9..fc71cfde6196 100644
--- a/databases/py-aiosqlite/pkg-descr
+++ b/databases/py-aiosqlite/pkg-descr
@@ -8,5 +8,3 @@ Connection objects are proxies to the real connections, contain the shared
 execution thread, and provide context managers to handle automatically closing
 connections. Cursors are similarly proxies to the real cursors, and provide
 async iterators to query results.
-
-WWW: https://pypi.python.org/pypi/aiosqlite
diff --git a/databases/py-alembic/Makefile b/databases/py-alembic/Makefile
index e9385e992675..823fe3d030d5 100644
--- a/databases/py-alembic/Makefile
+++ b/databases/py-alembic/Makefile
@@ -1,24 +1,29 @@
 PORTNAME=	alembic
-PORTVERSION=	1.4.3
+PORTVERSION=	1.13.1
+PORTREVISION=	1
 CATEGORIES=	databases python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	Database migration tool for SQLAlchemy
+WWW=		https://alembic.zzzcomputing.com/
 
 LICENSE=	MIT
+LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dateutil>=0:devel/py-dateutil@${PY_FLAVOR} \
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}python-dateutil>0:devel/py-python-dateutil@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}importlib-metadata>0:devel/py-importlib-metadata@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}importlib-resources>0:devel/py-importlib-resources@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}mako>=0:textproc/py-mako@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}python-editor>=0:devel/py-python-editor@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}sqlalchemy12>=0:databases/py-sqlalchemy12@${PY_FLAVOR}
-
+		${PYTHON_PKGNAMEPREFIX}sqlalchemy14>=1.3.0:databases/py-sqlalchemy14@${PY_FLAVOR}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}tox>0:devel/py-tox@${PY_FLAVOR}
 
-USES=		python:3.6+
-USE_PYTHON=	distutils autoplist
+USES=		python
+USE_PYTHON=	autoplist concurrent distutils
+
+CONFLICTS_INSTALL=	py*-alembic* # lib/python3.8/site-packages/alembic/__init__.py'
 
 NO_ARCH=	yes
 
diff --git a/databases/py-alembic/distinfo b/databases/py-alembic/distinfo
index 4fec524ff11a..831154b80003 100644
--- a/databases/py-alembic/distinfo
+++ b/databases/py-alembic/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1601486131
-SHA256 (alembic-1.4.3.tar.gz) = 5334f32314fb2a56d86b4c4dd1ae34b08c03cae4cb888bc699942104d66bc245
-SIZE (alembic-1.4.3.tar.gz) = 1108131
+TIMESTAMP = 1703248282
+SHA256 (alembic-1.13.1.tar.gz) = 4932c8558bf68f2ee92b9bbcb8218671c627064d5b08939437af6d77dc05e595
+SIZE (alembic-1.13.1.tar.gz) = 1213288
diff --git a/databases/py-alembic/pkg-descr b/databases/py-alembic/pkg-descr
index a921927d7568..515e826ec887 100644
--- a/databases/py-alembic/pkg-descr
+++ b/databases/py-alembic/pkg-descr
@@ -8,5 +8,3 @@ SQLAlchemy. A migrations tool offers the following functionality:
   database to a new version, and optionally a series of steps that can
   "downgrade" similarly, doing the same steps in reverse.
 - Allows the scripts to execute in some sequential manner.
-
-WWW: http://alembic.zzzcomputing.com/
diff --git a/databases/py-alembic14/Makefile b/databases/py-alembic14/Makefile
new file mode 100644
index 000000000000..466d18dacd2d
--- /dev/null
+++ b/databases/py-alembic14/Makefile
@@ -0,0 +1,35 @@
+PORTNAME=	alembic
+PORTVERSION=	1.4.3
+PORTREVISION=	1
+CATEGORIES=	databases python
+MASTER_SITES=	PYPI
+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+PKGNAMESUFFIX=	14
+
+MAINTAINER=	bofh@FreeBSD.org
+COMMENT=	Database migration tool for SQLAlchemy (1.4.X branch)
+WWW=		https://alembic.zzzcomputing.com/
+
+LICENSE=	MIT
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}python-dateutil>=0:devel/py-python-dateutil@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}mako>=0:textproc/py-mako@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}python-editor>=0.3:devel/py-python-editor@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}sqlalchemy12>=1.1.0:databases/py-sqlalchemy12@${PY_FLAVOR}
+
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}tox>0:devel/py-tox@${PY_FLAVOR}
+
+USES=		python
+USE_PYTHON=	autoplist concurrent distutils
+
+CONFLICTS_INSTALL=	py*-alembic* # lib/python3.8/site-packages/alembic/__init__.py'
+
+NO_ARCH=	yes
+PORTSCOUT=	limit:^1\.4\.
+
+do-test:
+	@cd ${WRKSRC} && ${LOCALBASE}/bin/tox -e ${PY_FLAVOR}
+
+.include <bsd.port.mk>
diff --git a/databases/py-alembic14/distinfo b/databases/py-alembic14/distinfo
new file mode 100644
index 000000000000..4fec524ff11a
--- /dev/null
+++ b/databases/py-alembic14/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1601486131
+SHA256 (alembic-1.4.3.tar.gz) = 5334f32314fb2a56d86b4c4dd1ae34b08c03cae4cb888bc699942104d66bc245
+SIZE (alembic-1.4.3.tar.gz) = 1108131
diff --git a/databases/py-alembic14/pkg-descr b/databases/py-alembic14/pkg-descr
new file mode 100644
index 000000000000..4592a8bd3c1c
--- /dev/null
+++ b/databases/py-alembic14/pkg-descr
@@ -0,0 +1,12 @@
+Alembic is a new database migrations tool, written by the author of
+SQLAlchemy. A migrations tool offers the following functionality:
+
+- Can emit ALTER statements to a database in order to change the structure of
+  tables and other constructs
+- Provides a system whereby "migration scripts" may be constructed; each
+  script indicates a particular series of steps that can "upgrade" a target
+  database to a new version, and optionally a series of steps that can
+  "downgrade" similarly, doing the same steps in reverse.
+- Allows the scripts to execute in some sequential manner.
+
+This is 1.4.X branch that works with sqlalchemy 1.2.X branch.
diff --git a/databases/py-apache-arrow/Makefile b/databases/py-apache-arrow/Makefile
new file mode 100644
index 000000000000..fa95cfc3a17c
--- /dev/null
+++ b/databases/py-apache-arrow/Makefile
@@ -0,0 +1,35 @@
+PORTNAME=	apache-arrow
+DISTVERSION=	15.0.2
+CATEGORIES=	databases python
+MASTER_SITES=	APACHE/arrow/arrow-${DISTVERSION}
+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+DISTNAME=	${PORTNAME}-${DISTVERSION}
+
+MAINTAINER=	yuri@FreeBSD.org
+COMMENT=	Columnar in-memory analytics layer for big data
+WWW=		https://arrow.apache.org/
+
+LICENSE=	APACHE20
+LICENSE_FILE=	${WRKSRC}/../LICENSE.txt
+
+BUILD_DEPENDS=	cmake:devel/cmake-core \
+		${PYNUMPY} \
+		${PYTHON_PKGNAMEPREFIX}setuptools-scm>0:devel/py-setuptools-scm@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pip>0:devel/py-pip@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR}
+RUN_DEPENDS=	${PYNUMPY}
+LIB_DEPENDS=	libarrow.so:databases/arrow # assumes that arrow is built with PYTHON=ON (python support is built)
+
+USES=		compiler:c++11-lang pkgconfig python
+USE_PYTHON=	distutils cython # autoplist is broken, see https://issues.apache.org/jira/browse/ARROW-16820
+
+WRKSRC_SUBDIR=	python
+
+MAKE_ENV=	FREEBSD_PYTHON_SUFFIX=${PYTHON_SUFFIX}
+
+post-install:
+	@${STRIP_CMD} \
+		${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/pyarrow/*.cpython-${PYTHON_SUFFIX}.so \
+		${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/pyarrow/libarrow_python.so
+
+.include <bsd.port.mk>
diff --git a/databases/py-apache-arrow/distinfo b/databases/py-apache-arrow/distinfo
new file mode 100644
index 000000000000..bf812a2a9abf
--- /dev/null
+++ b/databases/py-apache-arrow/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1711275907
+SHA256 (apache-arrow-15.0.2.tar.gz) = abbf97176db6a9e8186fe005e93320dac27c64562755c77de50a882eb6179ac6
+SIZE (apache-arrow-15.0.2.tar.gz) = 21503812
diff --git a/databases/py-apache-arrow/files/patch-pyproject.toml b/databases/py-apache-arrow/files/patch-pyproject.toml
new file mode 100644
index 000000000000..923321e89970
--- /dev/null
+++ b/databases/py-apache-arrow/files/patch-pyproject.toml
@@ -0,0 +1,13 @@
+--- pyproject.toml.orig	2024-03-24 19:23:05 UTC
++++ pyproject.toml
+@@ -18,8 +18,8 @@ requires = [
+ [build-system]
+ requires = [
+     "cython >= 0.29.31",
+-    "oldest-supported-numpy>=0.14",
+-    "setuptools_scm < 8.0.0",
++    "numpy>=0.14",
++    "setuptools_scm",
+     "setuptools >= 40.1.0",
+     "wheel"
+ ]
diff --git a/databases/py-apache-arrow/files/patch-setup.py b/databases/py-apache-arrow/files/patch-setup.py
new file mode 100644
index 000000000000..3b820b3b1183
--- /dev/null
+++ b/databases/py-apache-arrow/files/patch-setup.py
@@ -0,0 +1,11 @@
+--- setup.py.orig	2024-03-24 19:24:16 UTC
++++ setup.py
+@@ -492,7 +492,7 @@ setup(
+                                  'pyarrow/_generated_version.py'),
+         'version_scheme': guess_next_dev_version
+     },
+-    setup_requires=['setuptools_scm < 8.0.0', 'cython >= 0.29.31'] + setup_requires,
++    setup_requires=['setuptools_scm', 'cython >= 0.29.31'] + setup_requires,
+     install_requires=install_requires,
+     tests_require=['pytest', 'pandas', 'hypothesis'],
+     python_requires='>=3.8',
diff --git a/databases/py-apache-arrow/pkg-descr b/databases/py-apache-arrow/pkg-descr
new file mode 100644
index 000000000000..ec828e923540
--- /dev/null
+++ b/databases/py-apache-arrow/pkg-descr
@@ -0,0 +1,5 @@
+Apache Arrow is a cross-language development platform for in-memory data. It
+specifies a standardized language-independent columnar memory format for flat
+and hierarchical data, organized for efficient analytic operations on modern
+hardware. It also provides computational libraries and zero-copy streaming
+messaging and interprocess communication.
diff --git a/databases/py-apache-arrow/pkg-plist b/databases/py-apache-arrow/pkg-plist
new file mode 100644
index 000000000000..a886692d9a21
--- /dev/null
+++ b/databases/py-apache-arrow/pkg-plist
@@ -0,0 +1,847 @@
+%%PYTHON_SITELIBDIR%%/pyarrow-15.0.2-py%%PYTHON_VER%%.egg-info/PKG-INFO
+%%PYTHON_SITELIBDIR%%/pyarrow-15.0.2-py%%PYTHON_VER%%.egg-info/SOURCES.txt
+%%PYTHON_SITELIBDIR%%/pyarrow-15.0.2-py%%PYTHON_VER%%.egg-info/dependency_links.txt
+%%PYTHON_SITELIBDIR%%/pyarrow-15.0.2-py%%PYTHON_VER%%.egg-info/not-zip-safe
+%%PYTHON_SITELIBDIR%%/pyarrow-15.0.2-py%%PYTHON_VER%%.egg-info/requires.txt
+%%PYTHON_SITELIBDIR%%/pyarrow-15.0.2-py%%PYTHON_VER%%.egg-info/top_level.txt
+%%PYTHON_SITELIBDIR%%/pyarrow/__init__.pxd
+%%PYTHON_SITELIBDIR%%/pyarrow/__init__.py
+%%PYTHON_SITELIBDIR%%/pyarrow/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/pyarrow/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/pyarrow/__pycache__/_compute_docstrings%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/pyarrow/__pycache__/_compute_docstrings%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/pyarrow/__pycache__/_generated_version%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/pyarrow/__pycache__/_generated_version%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/pyarrow/__pycache__/acero%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/pyarrow/__pycache__/acero%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/pyarrow/__pycache__/benchmark%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/pyarrow/__pycache__/benchmark%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/pyarrow/__pycache__/cffi%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/pyarrow/__pycache__/cffi%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/pyarrow/__pycache__/compute%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/pyarrow/__pycache__/compute%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/pyarrow/__pycache__/conftest%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/pyarrow/__pycache__/conftest%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/pyarrow/__pycache__/csv%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/pyarrow/__pycache__/csv%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/pyarrow/__pycache__/cuda%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/pyarrow/__pycache__/cuda%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/pyarrow/__pycache__/dataset%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/pyarrow/__pycache__/dataset%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/pyarrow/__pycache__/feather%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/pyarrow/__pycache__/feather%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/pyarrow/__pycache__/filesystem%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/pyarrow/__pycache__/filesystem%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/pyarrow/__pycache__/flight%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/pyarrow/__pycache__/flight%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/pyarrow/__pycache__/fs%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/pyarrow/__pycache__/fs%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/pyarrow/__pycache__/hdfs%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/pyarrow/__pycache__/hdfs%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/pyarrow/__pycache__/ipc%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/pyarrow/__pycache__/ipc%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/pyarrow/__pycache__/json%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/pyarrow/__pycache__/json%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/pyarrow/__pycache__/jvm%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/pyarrow/__pycache__/jvm%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/pyarrow/__pycache__/orc%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/pyarrow/__pycache__/orc%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/pyarrow/__pycache__/pandas_compat%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/pyarrow/__pycache__/pandas_compat%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/pyarrow/__pycache__/substrait%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/pyarrow/__pycache__/substrait%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/pyarrow/__pycache__/types%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/pyarrow/__pycache__/types%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/pyarrow/__pycache__/util%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/pyarrow/__pycache__/util%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/pyarrow/_acero.pxd
+%%PYTHON_SITELIBDIR%%/pyarrow/_acero.pyx
+%%PYTHON_SITELIBDIR%%/pyarrow/_compute%%PYTHON_EXT_SUFFIX%%.so
+%%PYTHON_SITELIBDIR%%/pyarrow/_compute.pxd
+%%PYTHON_SITELIBDIR%%/pyarrow/_compute.pyx
+%%PYTHON_SITELIBDIR%%/pyarrow/_compute_docstrings.py
+%%PYTHON_SITELIBDIR%%/pyarrow/_csv%%PYTHON_EXT_SUFFIX%%.so
+%%PYTHON_SITELIBDIR%%/pyarrow/_csv.pxd
+%%PYTHON_SITELIBDIR%%/pyarrow/_csv.pyx
+%%PYTHON_SITELIBDIR%%/pyarrow/_cuda.pxd
+%%PYTHON_SITELIBDIR%%/pyarrow/_cuda.pyx
+%%PYTHON_SITELIBDIR%%/pyarrow/_dataset.pxd
+%%PYTHON_SITELIBDIR%%/pyarrow/_dataset.pyx
+%%PYTHON_SITELIBDIR%%/pyarrow/_dataset_orc.pyx
+%%PYTHON_SITELIBDIR%%/pyarrow/_dataset_parquet.pxd
+%%PYTHON_SITELIBDIR%%/pyarrow/_dataset_parquet.pyx
+%%PYTHON_SITELIBDIR%%/pyarrow/_dataset_parquet_encryption.pyx
+%%PYTHON_SITELIBDIR%%/pyarrow/_dlpack.pxi
+%%PYTHON_SITELIBDIR%%/pyarrow/_feather%%PYTHON_EXT_SUFFIX%%.so
+%%PYTHON_SITELIBDIR%%/pyarrow/_feather.pyx
+%%PYTHON_SITELIBDIR%%/pyarrow/_flight.pyx
+%%PYTHON_SITELIBDIR%%/pyarrow/_fs%%PYTHON_EXT_SUFFIX%%.so
+%%PYTHON_SITELIBDIR%%/pyarrow/_fs.pxd
+%%PYTHON_SITELIBDIR%%/pyarrow/_fs.pyx
+%%PYTHON_SITELIBDIR%%/pyarrow/_gcsfs.pyx
+%%PYTHON_SITELIBDIR%%/pyarrow/_generated_version.py
+%%PYTHON_SITELIBDIR%%/pyarrow/_hdfs.pyx
+%%PYTHON_SITELIBDIR%%/pyarrow/_hdfsio%%PYTHON_EXT_SUFFIX%%.so
+%%PYTHON_SITELIBDIR%%/pyarrow/_hdfsio.pyx
+%%PYTHON_SITELIBDIR%%/pyarrow/_json%%PYTHON_EXT_SUFFIX%%.so
+%%PYTHON_SITELIBDIR%%/pyarrow/_json.pxd
+%%PYTHON_SITELIBDIR%%/pyarrow/_json.pyx
+%%PYTHON_SITELIBDIR%%/pyarrow/_orc.pxd
+%%PYTHON_SITELIBDIR%%/pyarrow/_orc.pyx
+%%PYTHON_SITELIBDIR%%/pyarrow/_parquet.pxd
+%%PYTHON_SITELIBDIR%%/pyarrow/_parquet.pyx
+%%PYTHON_SITELIBDIR%%/pyarrow/_parquet_encryption.pxd
+%%PYTHON_SITELIBDIR%%/pyarrow/_parquet_encryption.pyx
+%%PYTHON_SITELIBDIR%%/pyarrow/_pyarrow_cpp_tests%%PYTHON_EXT_SUFFIX%%.so
+%%PYTHON_SITELIBDIR%%/pyarrow/_pyarrow_cpp_tests.pxd
+%%PYTHON_SITELIBDIR%%/pyarrow/_pyarrow_cpp_tests.pyx
+%%PYTHON_SITELIBDIR%%/pyarrow/_s3fs.pyx
+%%PYTHON_SITELIBDIR%%/pyarrow/_substrait.pyx
+%%PYTHON_SITELIBDIR%%/pyarrow/acero.py
+%%PYTHON_SITELIBDIR%%/pyarrow/array.pxi
+%%PYTHON_SITELIBDIR%%/pyarrow/benchmark.pxi
+%%PYTHON_SITELIBDIR%%/pyarrow/benchmark.py
+%%PYTHON_SITELIBDIR%%/pyarrow/builder.pxi
+%%PYTHON_SITELIBDIR%%/pyarrow/cffi.py
+%%PYTHON_SITELIBDIR%%/pyarrow/compat.pxi
+%%PYTHON_SITELIBDIR%%/pyarrow/compute.py
+%%PYTHON_SITELIBDIR%%/pyarrow/config.pxi
+%%PYTHON_SITELIBDIR%%/pyarrow/conftest.py
+%%PYTHON_SITELIBDIR%%/pyarrow/csv.py
+%%PYTHON_SITELIBDIR%%/pyarrow/cuda.py
+%%PYTHON_SITELIBDIR%%/pyarrow/dataset.py
+%%PYTHON_SITELIBDIR%%/pyarrow/error.pxi
+%%PYTHON_SITELIBDIR%%/pyarrow/feather.py
+%%PYTHON_SITELIBDIR%%/pyarrow/filesystem.py
+%%PYTHON_SITELIBDIR%%/pyarrow/flight.py
+%%PYTHON_SITELIBDIR%%/pyarrow/fs.py
+%%PYTHON_SITELIBDIR%%/pyarrow/gandiva.pyx
+%%PYTHON_SITELIBDIR%%/pyarrow/hdfs.py
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/acero/accumulation_queue.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/acero/aggregate_node.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/acero/api.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/acero/asof_join_node.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/acero/backpressure_handler.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/acero/benchmark_util.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/acero/bloom_filter.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/acero/exec_plan.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/acero/hash_join.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/acero/hash_join_dict.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/acero/hash_join_node.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/acero/map_node.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/acero/options.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/acero/order_by_impl.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/acero/partition_util.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/acero/pch.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/acero/query_context.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/acero/schema_util.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/acero/task_util.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/acero/test_nodes.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/acero/time_series_util.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/acero/tpch_node.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/acero/type_fwd.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/acero/unmaterialized_table.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/acero/util.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/acero/visibility.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/api.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/array.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/array/array_base.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/array/array_binary.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/array/array_decimal.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/array/array_dict.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/array/array_nested.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/array/array_primitive.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/array/array_run_end.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/array/builder_adaptive.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/array/builder_base.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/array/builder_binary.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/array/builder_decimal.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/array/builder_dict.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/array/builder_nested.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/array/builder_primitive.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/array/builder_run_end.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/array/builder_time.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/array/builder_union.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/array/concatenate.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/array/data.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/array/diff.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/array/util.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/array/validate.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/buffer.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/buffer_builder.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/builder.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/c/abi.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/c/bridge.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/c/dlpack.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/c/dlpack_abi.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/c/helpers.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/chunk_resolver.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/chunked_array.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/compare.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/compute/api.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/compute/api_aggregate.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/compute/api_scalar.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/compute/api_vector.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/compute/cast.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/compute/exec.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/compute/expression.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/compute/function.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/compute/function_options.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/compute/kernel.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/compute/key_hash.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/compute/key_map.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/compute/light_array.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/compute/ordering.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/compute/registry.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/compute/row/grouper.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/compute/type_fwd.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/compute/util.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/config.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/csv/api.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/csv/chunker.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/csv/column_builder.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/csv/column_decoder.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/csv/converter.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/csv/invalid_row.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/csv/options.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/csv/parser.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/csv/reader.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/csv/test_common.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/csv/type_fwd.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/csv/writer.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/dataset/api.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/dataset/dataset.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/dataset/dataset_writer.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/dataset/discovery.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/dataset/file_base.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/dataset/file_csv.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/dataset/file_ipc.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/dataset/file_json.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/dataset/file_orc.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/dataset/file_parquet.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/dataset/parquet_encryption_config.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/dataset/partition.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/dataset/pch.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/dataset/plan.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/dataset/projector.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/dataset/scanner.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/dataset/type_fwd.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/dataset/visibility.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/datum.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/device.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/extension/fixed_shape_tensor.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/extension_type.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/filesystem/api.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/filesystem/azurefs.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/filesystem/filesystem.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/filesystem/gcsfs.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/filesystem/hdfs.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/filesystem/localfs.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/filesystem/mockfs.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/filesystem/path_util.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/filesystem/s3_test_util.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/filesystem/s3fs.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/filesystem/test_util.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/filesystem/type_fwd.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/io/api.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/io/buffered.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/io/caching.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/io/compressed.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/io/concurrency.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/io/file.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/io/hdfs.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/io/interfaces.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/io/memory.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/io/mman.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/io/slow.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/io/stdio.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/io/test_common.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/io/transform.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/io/type_fwd.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/ipc/api.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/ipc/dictionary.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/ipc/feather.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/ipc/json_simple.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/ipc/message.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/ipc/options.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/ipc/reader.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/ipc/test_common.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/ipc/type_fwd.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/ipc/util.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/ipc/writer.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/json/api.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/json/chunked_builder.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/json/chunker.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/json/converter.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/json/object_parser.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/json/object_writer.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/json/options.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/json/parser.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/json/rapidjson_defs.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/json/reader.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/json/test_common.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/json/type_fwd.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/memory_pool.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/memory_pool_test.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/pch.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/pretty_print.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/python/api.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/python/arrow_to_pandas.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/python/async.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/python/benchmark.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/python/common.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/python/csv.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/python/datetime.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/python/decimal.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/python/deserialize.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/python/extension_type.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/python/filesystem.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/python/flight.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/python/gdb.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/python/helpers.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/python/inference.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/python/init.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/python/io.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/python/ipc.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/python/iterators.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/python/lib.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/python/lib_api.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/python/numpy_convert.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/python/numpy_interop.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/python/numpy_to_arrow.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/python/parquet_encryption.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/python/pch.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/python/platform.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/python/pyarrow.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/python/pyarrow_api.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/python/pyarrow_lib.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/python/python_test.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/python/python_to_arrow.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/python/serialize.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/python/type_traits.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/python/udf.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/python/visibility.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/record_batch.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/result.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/scalar.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/sparse_tensor.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/status.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/stl.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/stl_allocator.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/stl_iterator.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/table.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/table_builder.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/tensor.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/tensor/converter.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/testing/async_test_util.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/testing/builder.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/testing/executor_util.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/testing/extension_type.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/testing/future_util.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/testing/generator.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/testing/gtest_compat.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/testing/gtest_util.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/testing/matchers.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/testing/pch.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/testing/random.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/testing/uniform_real.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/testing/util.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/testing/visibility.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/type.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/type_fwd.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/type_traits.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/util/algorithm.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/util/align_util.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/util/aligned_storage.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/util/async_generator.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/util/async_generator_fwd.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/util/async_util.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/util/base64.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/util/basic_decimal.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/util/benchmark_util.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/util/binary_view_util.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/util/bit_block_counter.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/util/bit_run_reader.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/util/bit_stream_utils.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/util/bit_util.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/util/bitmap.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/util/bitmap_builders.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/util/bitmap_generate.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/util/bitmap_ops.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/util/bitmap_reader.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/util/bitmap_visit.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/util/bitmap_writer.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/util/bitset_stack.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/util/bpacking.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/util/bpacking64_default.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/util/bpacking_avx2.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/util/bpacking_avx512.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/util/bpacking_default.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/util/bpacking_neon.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/util/byte_size.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/util/cancel.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/util/checked_cast.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/util/compare.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/util/compression.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/util/concurrent_map.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/util/config.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/util/converter.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/util/counting_semaphore.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/util/cpu_info.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/util/crc32.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/util/debug.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/util/decimal.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/util/delimiting.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/util/dict_util.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/util/dispatch.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/util/double_conversion.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/util/endian.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/util/float16.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/util/formatting.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/util/functional.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/util/future.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/util/hash_util.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/util/hashing.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/util/int_util.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/util/int_util_overflow.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/util/io_util.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/util/iterator.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/util/key_value_metadata.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/util/launder.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/util/list_util.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/util/logging.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/util/macros.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/util/map.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/util/math_constants.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/util/memory.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/util/mutex.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/util/parallel.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/util/pcg_random.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/util/print.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/util/queue.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/util/range.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/util/ree_util.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/util/regex.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/util/rle_encoding.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/util/rows_to_batches.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/util/simd.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/util/small_vector.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/util/sort.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/util/spaced.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/util/span.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/util/stopwatch.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/util/string.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/util/string_builder.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/util/task_group.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/util/tdigest.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/util/test_common.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/util/thread_pool.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/util/time.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/util/tracing.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/util/trie.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/util/type_fwd.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/util/type_traits.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/util/ubsan.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/util/union_util.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/util/unreachable.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/util/uri.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/util/utf8.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/util/value_parsing.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/util/vector.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/util/visibility.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/util/windows_compatibility.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/util/windows_fixup.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/vendored/ProducerConsumerQueue.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/vendored/datetime.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/vendored/datetime/date.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/vendored/datetime/ios.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/vendored/datetime/tz.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/vendored/datetime/tz_private.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/vendored/datetime/visibility.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/vendored/double-conversion/bignum-dtoa.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/vendored/double-conversion/bignum.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/vendored/double-conversion/cached-powers.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/vendored/double-conversion/diy-fp.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/vendored/double-conversion/double-conversion.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/vendored/double-conversion/double-to-string.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/vendored/double-conversion/fast-dtoa.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/vendored/double-conversion/fixed-dtoa.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/vendored/double-conversion/ieee.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/vendored/double-conversion/string-to-double.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/vendored/double-conversion/strtod.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/vendored/double-conversion/utils.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/vendored/pcg/pcg_extras.hpp
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/vendored/pcg/pcg_random.hpp
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/vendored/pcg/pcg_uint128.hpp
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/vendored/portable-snippets/debug-trap.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/vendored/portable-snippets/safe-math.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/vendored/strptime.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/vendored/xxhash.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/vendored/xxhash/xxhash.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/visit_array_inline.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/visit_data_inline.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/visit_scalar_inline.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/visit_type_inline.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/visitor.h
+%%PYTHON_SITELIBDIR%%/pyarrow/include/arrow/visitor_generate.h
+%%PYTHON_SITELIBDIR%%/pyarrow/includes/__init__.pxd
+%%PYTHON_SITELIBDIR%%/pyarrow/includes/common.pxd
+%%PYTHON_SITELIBDIR%%/pyarrow/includes/libarrow.pxd
+%%PYTHON_SITELIBDIR%%/pyarrow/includes/libarrow_acero.pxd
+%%PYTHON_SITELIBDIR%%/pyarrow/includes/libarrow_cuda.pxd
+%%PYTHON_SITELIBDIR%%/pyarrow/includes/libarrow_dataset.pxd
+%%PYTHON_SITELIBDIR%%/pyarrow/includes/libarrow_dataset_parquet.pxd
+%%PYTHON_SITELIBDIR%%/pyarrow/includes/libarrow_feather.pxd
+%%PYTHON_SITELIBDIR%%/pyarrow/includes/libarrow_flight.pxd
+%%PYTHON_SITELIBDIR%%/pyarrow/includes/libarrow_fs.pxd
+%%PYTHON_SITELIBDIR%%/pyarrow/includes/libarrow_python.pxd
+%%PYTHON_SITELIBDIR%%/pyarrow/includes/libarrow_substrait.pxd
+%%PYTHON_SITELIBDIR%%/pyarrow/includes/libgandiva.pxd
+%%PYTHON_SITELIBDIR%%/pyarrow/includes/libparquet_encryption.pxd
+%%PYTHON_SITELIBDIR%%/pyarrow/interchange/__init__.py
+%%PYTHON_SITELIBDIR%%/pyarrow/interchange/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/pyarrow/interchange/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/pyarrow/interchange/__pycache__/buffer%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/pyarrow/interchange/__pycache__/buffer%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/pyarrow/interchange/__pycache__/column%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/pyarrow/interchange/__pycache__/column%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/pyarrow/interchange/__pycache__/dataframe%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/pyarrow/interchange/__pycache__/dataframe%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/pyarrow/interchange/__pycache__/from_dataframe%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/pyarrow/interchange/__pycache__/from_dataframe%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/pyarrow/interchange/buffer.py
+%%PYTHON_SITELIBDIR%%/pyarrow/interchange/column.py
+%%PYTHON_SITELIBDIR%%/pyarrow/interchange/dataframe.py
+%%PYTHON_SITELIBDIR%%/pyarrow/interchange/from_dataframe.py
+%%PYTHON_SITELIBDIR%%/pyarrow/io.pxi
+%%PYTHON_SITELIBDIR%%/pyarrow/ipc.pxi
+%%PYTHON_SITELIBDIR%%/pyarrow/ipc.py
+%%PYTHON_SITELIBDIR%%/pyarrow/json.py
+%%PYTHON_SITELIBDIR%%/pyarrow/jvm.py
+%%PYTHON_SITELIBDIR%%/pyarrow/lib%%PYTHON_EXT_SUFFIX%%.so
+%%PYTHON_SITELIBDIR%%/pyarrow/lib.h
+%%PYTHON_SITELIBDIR%%/pyarrow/lib.pxd
+%%PYTHON_SITELIBDIR%%/pyarrow/lib.pyx
+%%PYTHON_SITELIBDIR%%/pyarrow/lib_api.h
+%%PYTHON_SITELIBDIR%%/pyarrow/libarrow_python.so
+%%PYTHON_SITELIBDIR%%/pyarrow/memory.pxi
+%%PYTHON_SITELIBDIR%%/pyarrow/orc.py
+%%PYTHON_SITELIBDIR%%/pyarrow/pandas-shim.pxi
+%%PYTHON_SITELIBDIR%%/pyarrow/pandas_compat.py
+%%PYTHON_SITELIBDIR%%/pyarrow/parquet/__init__.py
+%%PYTHON_SITELIBDIR%%/pyarrow/parquet/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/pyarrow/parquet/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/pyarrow/parquet/__pycache__/core%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/pyarrow/parquet/__pycache__/core%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/pyarrow/parquet/__pycache__/encryption%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/pyarrow/parquet/__pycache__/encryption%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/pyarrow/parquet/core.py
+%%PYTHON_SITELIBDIR%%/pyarrow/parquet/encryption.py
+%%PYTHON_SITELIBDIR%%/pyarrow/public-api.pxi
+%%PYTHON_SITELIBDIR%%/pyarrow/scalar.pxi
+%%PYTHON_SITELIBDIR%%/pyarrow/src/arrow/python/CMakeLists.txt
+%%PYTHON_SITELIBDIR%%/pyarrow/src/arrow/python/api.h
+%%PYTHON_SITELIBDIR%%/pyarrow/src/arrow/python/arrow_to_pandas.cc
+%%PYTHON_SITELIBDIR%%/pyarrow/src/arrow/python/arrow_to_pandas.h
+%%PYTHON_SITELIBDIR%%/pyarrow/src/arrow/python/arrow_to_python_internal.h
+%%PYTHON_SITELIBDIR%%/pyarrow/src/arrow/python/async.h
+%%PYTHON_SITELIBDIR%%/pyarrow/src/arrow/python/benchmark.cc
+%%PYTHON_SITELIBDIR%%/pyarrow/src/arrow/python/benchmark.h
+%%PYTHON_SITELIBDIR%%/pyarrow/src/arrow/python/common.cc
+%%PYTHON_SITELIBDIR%%/pyarrow/src/arrow/python/common.h
+%%PYTHON_SITELIBDIR%%/pyarrow/src/arrow/python/csv.cc
+%%PYTHON_SITELIBDIR%%/pyarrow/src/arrow/python/csv.h
+%%PYTHON_SITELIBDIR%%/pyarrow/src/arrow/python/datetime.cc
+%%PYTHON_SITELIBDIR%%/pyarrow/src/arrow/python/datetime.h
+%%PYTHON_SITELIBDIR%%/pyarrow/src/arrow/python/decimal.cc
+%%PYTHON_SITELIBDIR%%/pyarrow/src/arrow/python/decimal.h
+%%PYTHON_SITELIBDIR%%/pyarrow/src/arrow/python/deserialize.cc
+%%PYTHON_SITELIBDIR%%/pyarrow/src/arrow/python/deserialize.h
+%%PYTHON_SITELIBDIR%%/pyarrow/src/arrow/python/extension_type.cc
+%%PYTHON_SITELIBDIR%%/pyarrow/src/arrow/python/extension_type.h
+%%PYTHON_SITELIBDIR%%/pyarrow/src/arrow/python/filesystem.cc
+%%PYTHON_SITELIBDIR%%/pyarrow/src/arrow/python/filesystem.h
+%%PYTHON_SITELIBDIR%%/pyarrow/src/arrow/python/flight.cc
+%%PYTHON_SITELIBDIR%%/pyarrow/src/arrow/python/flight.h
+%%PYTHON_SITELIBDIR%%/pyarrow/src/arrow/python/gdb.cc
+%%PYTHON_SITELIBDIR%%/pyarrow/src/arrow/python/gdb.h
+%%PYTHON_SITELIBDIR%%/pyarrow/src/arrow/python/helpers.cc
+%%PYTHON_SITELIBDIR%%/pyarrow/src/arrow/python/helpers.h
+%%PYTHON_SITELIBDIR%%/pyarrow/src/arrow/python/inference.cc
+%%PYTHON_SITELIBDIR%%/pyarrow/src/arrow/python/inference.h
+%%PYTHON_SITELIBDIR%%/pyarrow/src/arrow/python/init.cc
+%%PYTHON_SITELIBDIR%%/pyarrow/src/arrow/python/init.h
+%%PYTHON_SITELIBDIR%%/pyarrow/src/arrow/python/io.cc
+%%PYTHON_SITELIBDIR%%/pyarrow/src/arrow/python/io.h
+%%PYTHON_SITELIBDIR%%/pyarrow/src/arrow/python/ipc.cc
+%%PYTHON_SITELIBDIR%%/pyarrow/src/arrow/python/ipc.h
+%%PYTHON_SITELIBDIR%%/pyarrow/src/arrow/python/iterators.h
+%%PYTHON_SITELIBDIR%%/pyarrow/src/arrow/python/numpy_convert.cc
+%%PYTHON_SITELIBDIR%%/pyarrow/src/arrow/python/numpy_convert.h
+%%PYTHON_SITELIBDIR%%/pyarrow/src/arrow/python/numpy_internal.h
+%%PYTHON_SITELIBDIR%%/pyarrow/src/arrow/python/numpy_interop.h
+%%PYTHON_SITELIBDIR%%/pyarrow/src/arrow/python/numpy_to_arrow.cc
+%%PYTHON_SITELIBDIR%%/pyarrow/src/arrow/python/numpy_to_arrow.h
+%%PYTHON_SITELIBDIR%%/pyarrow/src/arrow/python/parquet_encryption.cc
+%%PYTHON_SITELIBDIR%%/pyarrow/src/arrow/python/parquet_encryption.h
+%%PYTHON_SITELIBDIR%%/pyarrow/src/arrow/python/pch.h
+%%PYTHON_SITELIBDIR%%/pyarrow/src/arrow/python/platform.h
+%%PYTHON_SITELIBDIR%%/pyarrow/src/arrow/python/pyarrow.cc
+%%PYTHON_SITELIBDIR%%/pyarrow/src/arrow/python/pyarrow.h
+%%PYTHON_SITELIBDIR%%/pyarrow/src/arrow/python/pyarrow_api.h
+%%PYTHON_SITELIBDIR%%/pyarrow/src/arrow/python/pyarrow_lib.h
+%%PYTHON_SITELIBDIR%%/pyarrow/src/arrow/python/python_test.cc
+%%PYTHON_SITELIBDIR%%/pyarrow/src/arrow/python/python_test.h
+%%PYTHON_SITELIBDIR%%/pyarrow/src/arrow/python/python_to_arrow.cc
+%%PYTHON_SITELIBDIR%%/pyarrow/src/arrow/python/python_to_arrow.h
+%%PYTHON_SITELIBDIR%%/pyarrow/src/arrow/python/serialize.cc
+%%PYTHON_SITELIBDIR%%/pyarrow/src/arrow/python/serialize.h
+%%PYTHON_SITELIBDIR%%/pyarrow/src/arrow/python/type_traits.h
+%%PYTHON_SITELIBDIR%%/pyarrow/src/arrow/python/udf.cc
+%%PYTHON_SITELIBDIR%%/pyarrow/src/arrow/python/udf.h
+%%PYTHON_SITELIBDIR%%/pyarrow/src/arrow/python/visibility.h
+%%PYTHON_SITELIBDIR%%/pyarrow/substrait.py
+%%PYTHON_SITELIBDIR%%/pyarrow/table.pxi
+%%PYTHON_SITELIBDIR%%/pyarrow/tensor.pxi
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/__init__.py
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/__pycache__/arrow_16597%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/__pycache__/arrow_16597%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/__pycache__/arrow_39313%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/__pycache__/arrow_39313%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/__pycache__/arrow_7980%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/__pycache__/arrow_7980%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/__pycache__/conftest%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/__pycache__/conftest%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/__pycache__/pandas_examples%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/__pycache__/pandas_examples%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/__pycache__/pandas_threaded_import%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/__pycache__/pandas_threaded_import%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/__pycache__/read_record_batch%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/__pycache__/read_record_batch%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/__pycache__/strategies%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/__pycache__/strategies%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/__pycache__/test_acero%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/__pycache__/test_acero%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/__pycache__/test_adhoc_memory_leak%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/__pycache__/test_adhoc_memory_leak%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/__pycache__/test_array%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/__pycache__/test_array%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/__pycache__/test_builder%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/__pycache__/test_builder%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/__pycache__/test_cffi%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/__pycache__/test_cffi%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/__pycache__/test_compute%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/__pycache__/test_compute%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/__pycache__/test_convert_builtin%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/__pycache__/test_convert_builtin%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/__pycache__/test_cpp_internals%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/__pycache__/test_cpp_internals%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/__pycache__/test_csv%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/__pycache__/test_csv%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/__pycache__/test_cuda%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/__pycache__/test_cuda%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/__pycache__/test_cuda_numba_interop%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/__pycache__/test_cuda_numba_interop%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/__pycache__/test_cython%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/__pycache__/test_cython%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/__pycache__/test_dataset%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/__pycache__/test_dataset%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/__pycache__/test_dataset_encryption%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/__pycache__/test_dataset_encryption%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/__pycache__/test_deprecations%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/__pycache__/test_deprecations%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/__pycache__/test_dlpack%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/__pycache__/test_dlpack%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/__pycache__/test_exec_plan%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/__pycache__/test_exec_plan%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/__pycache__/test_extension_type%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/__pycache__/test_extension_type%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/__pycache__/test_feather%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/__pycache__/test_feather%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/__pycache__/test_filesystem%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/__pycache__/test_filesystem%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/__pycache__/test_flight%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/__pycache__/test_flight%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/__pycache__/test_flight_async%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/__pycache__/test_flight_async%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/__pycache__/test_fs%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/__pycache__/test_fs%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/__pycache__/test_gandiva%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/__pycache__/test_gandiva%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/__pycache__/test_gdb%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/__pycache__/test_gdb%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/__pycache__/test_hdfs%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/__pycache__/test_hdfs%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/__pycache__/test_io%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/__pycache__/test_io%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/__pycache__/test_ipc%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/__pycache__/test_ipc%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/__pycache__/test_json%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/__pycache__/test_json%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/__pycache__/test_jvm%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/__pycache__/test_jvm%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/__pycache__/test_memory%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/__pycache__/test_memory%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/__pycache__/test_misc%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/__pycache__/test_misc%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/__pycache__/test_orc%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/__pycache__/test_orc%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/__pycache__/test_pandas%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/__pycache__/test_pandas%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/__pycache__/test_scalars%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/__pycache__/test_scalars%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/__pycache__/test_schema%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/__pycache__/test_schema%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/__pycache__/test_sparse_tensor%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/__pycache__/test_sparse_tensor%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/__pycache__/test_strategies%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/__pycache__/test_strategies%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/__pycache__/test_substrait%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/__pycache__/test_substrait%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/__pycache__/test_table%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/__pycache__/test_table%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/__pycache__/test_tensor%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/__pycache__/test_tensor%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/__pycache__/test_types%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/__pycache__/test_types%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/__pycache__/test_udf%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/__pycache__/test_udf%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/__pycache__/test_util%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/__pycache__/test_util%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/__pycache__/util%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/__pycache__/util%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/arrow_16597.py
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/arrow_39313.py
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/arrow_7980.py
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/bound_function_visit_strings.pyx
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/conftest.py
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/data/feather/v0.17.0.version.2-compression.lz4.feather
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/data/orc/README.md
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/data/orc/TestOrcFile.emptyFile.jsn.gz
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/data/orc/TestOrcFile.emptyFile.orc
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/data/orc/TestOrcFile.test1.jsn.gz
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/data/orc/TestOrcFile.test1.orc
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/data/orc/TestOrcFile.testDate1900.jsn.gz
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/data/orc/TestOrcFile.testDate1900.orc
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/data/orc/decimal.jsn.gz
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/data/orc/decimal.orc
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/data/parquet/v0.7.1.all-named-index.parquet
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/data/parquet/v0.7.1.column-metadata-handling.parquet
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/data/parquet/v0.7.1.parquet
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/data/parquet/v0.7.1.some-named-index.parquet
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/extensions.pyx
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/interchange/__init__.py
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/interchange/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/interchange/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/interchange/__pycache__/test_conversion%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/interchange/__pycache__/test_conversion%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/interchange/__pycache__/test_interchange_spec%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/interchange/__pycache__/test_interchange_spec%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/interchange/test_conversion.py
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/interchange/test_interchange_spec.py
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/pandas_examples.py
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/pandas_threaded_import.py
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/parquet/__init__.py
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/parquet/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/parquet/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/parquet/__pycache__/common%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/parquet/__pycache__/common%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/parquet/__pycache__/conftest%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/parquet/__pycache__/conftest%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/parquet/__pycache__/encryption%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/parquet/__pycache__/encryption%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/parquet/__pycache__/test_basic%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/parquet/__pycache__/test_basic%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/parquet/__pycache__/test_compliant_nested_type%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/parquet/__pycache__/test_compliant_nested_type%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/parquet/__pycache__/test_data_types%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/parquet/__pycache__/test_data_types%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/parquet/__pycache__/test_dataset%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/parquet/__pycache__/test_dataset%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/parquet/__pycache__/test_datetime%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/parquet/__pycache__/test_datetime%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/parquet/__pycache__/test_encryption%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/parquet/__pycache__/test_encryption%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/parquet/__pycache__/test_metadata%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/parquet/__pycache__/test_metadata%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/parquet/__pycache__/test_pandas%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/parquet/__pycache__/test_pandas%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/parquet/__pycache__/test_parquet_file%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/parquet/__pycache__/test_parquet_file%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/parquet/__pycache__/test_parquet_writer%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/parquet/__pycache__/test_parquet_writer%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/parquet/common.py
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/parquet/conftest.py
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/parquet/encryption.py
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/parquet/test_basic.py
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/parquet/test_compliant_nested_type.py
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/parquet/test_data_types.py
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/parquet/test_dataset.py
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/parquet/test_datetime.py
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/parquet/test_encryption.py
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/parquet/test_metadata.py
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/parquet/test_pandas.py
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/parquet/test_parquet_file.py
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/parquet/test_parquet_writer.py
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/pyarrow_cython_example.pyx
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/read_record_batch.py
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/strategies.py
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/test_acero.py
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/test_adhoc_memory_leak.py
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/test_array.py
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/test_builder.py
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/test_cffi.py
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/test_compute.py
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/test_convert_builtin.py
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/test_cpp_internals.py
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/test_csv.py
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/test_cuda.py
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/test_cuda_numba_interop.py
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/test_cython.py
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/test_dataset.py
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/test_dataset_encryption.py
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/test_deprecations.py
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/test_dlpack.py
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/test_exec_plan.py
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/test_extension_type.py
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/test_feather.py
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/test_filesystem.py
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/test_flight.py
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/test_flight_async.py
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/test_fs.py
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/test_gandiva.py
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/test_gdb.py
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/test_hdfs.py
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/test_io.py
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/test_ipc.py
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/test_json.py
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/test_jvm.py
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/test_memory.py
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/test_misc.py
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/test_orc.py
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/test_pandas.py
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/test_scalars.py
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/test_schema.py
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/test_sparse_tensor.py
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/test_strategies.py
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/test_substrait.py
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/test_table.py
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/test_tensor.py
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/test_types.py
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/test_udf.py
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/test_util.py
+%%PYTHON_SITELIBDIR%%/pyarrow/tests/util.py
+%%PYTHON_SITELIBDIR%%/pyarrow/types.pxi
+%%PYTHON_SITELIBDIR%%/pyarrow/types.py
+%%PYTHON_SITELIBDIR%%/pyarrow/util.py
+%%PYTHON_SITELIBDIR%%/pyarrow/vendored/__init__.py
+%%PYTHON_SITELIBDIR%%/pyarrow/vendored/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/pyarrow/vendored/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/pyarrow/vendored/__pycache__/docscrape%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/pyarrow/vendored/__pycache__/docscrape%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/pyarrow/vendored/__pycache__/version%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/pyarrow/vendored/__pycache__/version%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/pyarrow/vendored/docscrape.py
+%%PYTHON_SITELIBDIR%%/pyarrow/vendored/version.py
diff --git a/databases/py-apsw/Makefile b/databases/py-apsw/Makefile
index d205bea531e5..5fb819924b3a 100644
--- a/databases/py-apsw/Makefile
+++ b/databases/py-apsw/Makefile
@@ -1,35 +1,30 @@
-# Created by: Rusty Nejdl
-
 PORTNAME=	apsw
-PORTVERSION=	3.35.4
-DISTVERSIONSUFFIX=	-r1
-PORTREVISION=	1
+PORTVERSION=	3.45.3.0
 CATEGORIES=	databases python
-MASTER_SITES=	https://github.com/rogerbinns/apsw/releases/download/${PORTVERSION}${DISTVERSIONSUFFIX}/
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Another Python SQLite Wrapper
+WWW=		https://rogerbinns.github.io/apsw/ \
+		https://github.com/rogerbinns/apsw
 
 LICENSE=	ZLIB
+LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	sqlite3>=${PORTVERSION:R},1:databases/sqlite3
-
-USES=		localbase python:3.6+ sqlite:3 zip
-USE_PYTHON=	autoplist concurrent distutils
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR}
 
-OPTIONS_DEFINE=	EXTENSION
-OPTIONS_DEFAULT=	EXTENSION
+USES=		localbase python sqlite
+USE_PYTHON=	autoplist concurrent pep517 unittest
 
-EXTENSION_DESC=	Allow loadable extensions
+TEST_ARGS=	discover -s ${WRKSRC}/apsw
+TEST_ENV=	PYTHONPATH=${STAGEDIR}${PYTHON_SITELIBDIR}
 
-EXTENSION_VARS=	PYDISTUTILS_BUILDARGS+=--enable=load_extension
-EXTENSION_VARS_OFF=	PYDISTUTILS_BUILDARGS+=--omit=load_extension
+post-patch:
+	@${PRINTF} '[build_ext]\nuse_system_sqlite_config = True\n' > ${WRKSRC}/setup.apsw
 
 post-install:
-	${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/apsw*.so
-
-do-test:
-	cd ${WRKSRC}/ && ${PYTHON_CMD} setup.py test
+	${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR} -name '*.so' -exec ${STRIP_CMD} {} +
 
 .include <bsd.port.mk>
diff --git a/databases/py-apsw/distinfo b/databases/py-apsw/distinfo
index 1956a4b6851a..004e3645d70d 100644
--- a/databases/py-apsw/distinfo
+++ b/databases/py-apsw/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1619910315
-SHA256 (apsw-3.35.4-r1.zip) = 3d02d0259f7ad7ed6bbde1f2a83e814a9f5a7eed7a3eb1ab7ea2374096ae178f
-SIZE (apsw-3.35.4-r1.zip) = 685034
+TIMESTAMP = 1713528518
+SHA256 (apsw-3.45.3.0.tar.gz) = e538e439b1bd0f4e8347db623d50c83f66c662432827a1113bfbad298764fbc5
+SIZE (apsw-3.45.3.0.tar.gz) = 398710
diff --git a/databases/py-apsw/pkg-descr b/databases/py-apsw/pkg-descr
index 093c28031e6c..0157975438a8 100644
--- a/databases/py-apsw/pkg-descr
+++ b/databases/py-apsw/pkg-descr
@@ -3,5 +3,3 @@ SQLite database library possible. Everything you can do from the SQLite C API,
 you can do from Python. Although APSW looks vaguely similar to the PEP 249
 (DBAPI), it is not compliant with that API because instead it works the way
 SQLite 3 does.
-
-WWW: https://rogerbinns.github.io/apsw/
diff --git a/databases/py-asyncmy/Makefile b/databases/py-asyncmy/Makefile
new file mode 100644
index 000000000000..55ef1c3d29bb
--- /dev/null
+++ b/databases/py-asyncmy/Makefile
@@ -0,0 +1,26 @@
+PORTNAME=	asyncmy
+PORTVERSION=	0.2.9
+CATEGORIES=	databases python
+MASTER_SITES=	PYPI
+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+
+MAINTAINER=	sunpoet@FreeBSD.org
+COMMENT=	Fast asyncio MySQL driver
+WWW=		https://github.com/long2ice/asyncmy
+
+LICENSE=	APACHE20
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}poetry-core>=0:devel/py-poetry-core@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLAVOR}
+
+USES=		python
+USE_PYTHON=	autoplist concurrent cython pep517
+
+post-patch:
+	@${MV} ${WRKSRC}/build.py ${WRKSRC}/build_cython.py
+
+post-install:
+	${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR} -name '*.so' -exec ${STRIP_CMD} {} +
+
+.include <bsd.port.mk>
diff --git a/databases/py-asyncmy/distinfo b/databases/py-asyncmy/distinfo
new file mode 100644
index 000000000000..c402e7f0d370
--- /dev/null
+++ b/databases/py-asyncmy/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1701363690
+SHA256 (asyncmy-0.2.9.tar.gz) = da188be013291d1f831d63cdd3614567f4c63bfdcde73631ddff8df00c56d614
+SIZE (asyncmy-0.2.9.tar.gz) = 63350
diff --git a/databases/py-asyncmy/files/patch-pyproject.toml b/databases/py-asyncmy/files/patch-pyproject.toml
new file mode 100644
index 000000000000..db77b5d46fd6
--- /dev/null
+++ b/databases/py-asyncmy/files/patch-pyproject.toml
@@ -0,0 +1,19 @@
+--- pyproject.toml.orig	2023-02-15 05:35:05 UTC
++++ pyproject.toml
+@@ -3,7 +3,6 @@ authors = ["long2ice <long2ice@gmail.com>"]
+ description = "A fast asyncio MySQL driver"
+ documentation = "https://github.com/long2ice/asyncmy"
+ homepage = "https://github.com/long2ice/asyncmy"
+-include = ["CHANGELOG.md", "LICENSE", "README.md"]
+ keywords = ["driver", "asyncio", "mysql"]
+ license = "Apache-2.0"
+ name = "asyncmy"
+@@ -40,7 +39,7 @@ uvloop = { version = "*", markers = "sys_platform != '
+ 
+ [tool.poetry.build]
+ generate-setup-file = true
+-script = "build.py"
++script = "build_cython.py"
+ 
+ [build-system]
+ build-backend = "poetry.core.masonry.api"
diff --git a/databases/py-asyncmy/files/patch-setup.py b/databases/py-asyncmy/files/patch-setup.py
new file mode 100644
index 000000000000..b1b6ed798b00
--- /dev/null
+++ b/databases/py-asyncmy/files/patch-setup.py
@@ -0,0 +1,11 @@
+--- setup.py.orig	1970-01-01 00:00:00 UTC
++++ setup.py
+@@ -21,7 +21,7 @@ setup_kwargs = {
+     'package_data': package_data,
+     'python_requires': '>=3.7,<4.0',
+ }
+-from build import *
++from build_cython import *
+ build(setup_kwargs)
+ 
+ setup(**setup_kwargs)
diff --git a/databases/py-asyncmy/pkg-descr b/databases/py-asyncmy/pkg-descr
new file mode 100644
index 000000000000..977dddc29373
--- /dev/null
+++ b/databases/py-asyncmy/pkg-descr
@@ -0,0 +1,2 @@
+asyncmy is a fast asyncio MySQL driver, which reuse most of pymysql and aiomysql
+but rewrite core protocol with cython to speedup.
diff --git a/databases/py-asyncpg/Makefile b/databases/py-asyncpg/Makefile
index 06fa632fd16b..04e295b749fa 100644
--- a/databases/py-asyncpg/Makefile
+++ b/databases/py-asyncpg/Makefile
@@ -1,23 +1,27 @@
-# Created by: Babak Farrokhi <farrokhi@FreeBSD.org>
-
 PORTNAME=	asyncpg
-PORTVERSION=	0.24.0
+PORTVERSION=	0.29.0
 CATEGORIES=	databases python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	farrokhi@FreeBSD.org
 COMMENT=	High performance PostgreSQL Client Library for Python/asyncio
+WWW=		https://github.com/MagicStack/asyncpg/
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-USES=		pgsql:9.2+ python:3.6+
-USE_PYTHON=	autoplist concurrent distutils
+USES=		cpe pgsql:11+ python
+CPE_VENDOR=	magic
+USE_PYTHON=	autoplist concurrent cython distutils
 
 OPTIONS_DEFINE=	DOCS
 PORTDOCS=	PKG-INFO README.rst
 
+post-extract:
+	@${RM} ${WRKSRC}/asyncpg/pgproto/*.c
+	@${RM} ${WRKSRC}/asyncpg/protocol/*.c
+
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/asyncpg/protocol/protocol*.so
 	@${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/asyncpg/pgproto/pgproto*.so
diff --git a/databases/py-asyncpg/distinfo b/databases/py-asyncpg/distinfo
index 905e1a143732..6b6c81418834 100644
--- a/databases/py-asyncpg/distinfo
+++ b/databases/py-asyncpg/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1629090313
-SHA256 (asyncpg-0.24.0.tar.gz) = dd2fa063c3344823487d9ddccb40802f02622ddf8bf8a6cc53885ee7a2c1c0c6
-SIZE (asyncpg-0.24.0.tar.gz) = 787494
+TIMESTAMP = 1711968399
+SHA256 (asyncpg-0.29.0.tar.gz) = d1c49e1f44fffafd9a55e1a9b101590859d881d639ea2922516f5d9c512d354e
+SIZE (asyncpg-0.29.0.tar.gz) = 820455
diff --git a/databases/py-asyncpg/files/patch-setup.py b/databases/py-asyncpg/files/patch-setup.py
new file mode 100644
index 000000000000..ed2110d636d1
--- /dev/null
+++ b/databases/py-asyncpg/files/patch-setup.py
@@ -0,0 +1,11 @@
+--- setup.py.orig	2021-11-16 22:38:59 UTC
++++ setup.py
+@@ -25,7 +25,7 @@ from setuptools.command import sdist as setuptools_sdi
+ from setuptools.command import build_ext as setuptools_build_ext
+ 
+ 
+-CYTHON_DEPENDENCY = 'Cython(>=0.29.24,<0.30.0)'
++CYTHON_DEPENDENCY = 'Cython(>=0.29.24)'
+ 
+ # Minimal dependencies required to test asyncpg.
+ TEST_DEPENDENCIES = [
diff --git a/databases/py-asyncpg/pkg-descr b/databases/py-asyncpg/pkg-descr
index f07c4e5c424c..d2f4c7176b2d 100644
--- a/databases/py-asyncpg/pkg-descr
+++ b/databases/py-asyncpg/pkg-descr
@@ -1,5 +1,3 @@
 asyncpg is a database interface library designed specifically for PostgreSQL
 and Python/asyncio. asyncpg is an efficient, clean implementation of PostgreSQL
 server binary protocol for use with Python's asyncio framework.
-
-WWW: https://github.com/MagicStack/asyncpg/
diff --git a/databases/py-berkeleydb/Makefile b/databases/py-berkeleydb/Makefile
index a3c4e26d6558..deb7bf3a5c0c 100644
--- a/databases/py-berkeleydb/Makefile
+++ b/databases/py-berkeleydb/Makefile
@@ -1,18 +1,17 @@
-# Created by: Hye-Shik Chang <perky@python.or.kr>
-
 PORTNAME=	berkeleydb
-PORTVERSION=	18.1.4
+PORTVERSION=	18.1.8
 CATEGORIES=	databases python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	Python bindings for Oracle Berkeley DB
+WWW=		https://www.jcea.es/programacion/pybsddb.htm
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-USES=		bdb python:3.6+
+USES=		bdb python
 USE_PYTHON=	distutils autoplist
 
 PYDISTUTILS_CONFIGUREARGS=--libs="-l${BDB_LIB_NAME}" --berkeley-db=${LOCALBASE}
@@ -24,6 +23,12 @@ DOCSDIR=	${PREFIX}/share/doc/${PYTHON_PKGNAMEPREFIX}${PORTNAME}
 
 OPTIONS_DEFINE=	DOCS
 
+.include <bsd.port.pre.mk>
+
+.if ${BDB_VER} > 5
+MAKE_ENV=	YES_I_HAVE_THE_RIGHT_TO_USE_THIS_BERKELEY_DB_VERSION=yes
+.endif
+
 post-patch:
 	@${REINPLACE_CMD} 's|%%DBVERSION%%|${BDB_LIB_NAME}| ; \
 		s|%%BDB_INCLUDE_DIR%%|${BDB_INCLUDE_DIR}| ; \
@@ -31,6 +36,9 @@ post-patch:
 		${WRKSRC}/setup3.py
 	@${REINPLACE_CMD} 's|<db\.h>|<${BDB_INCLUDE_DIR}/db.h>|' ${WRKSRC}/src/Module/berkeleydb.h
 
+post-install:
+	@${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/${PORTNAME}/_${PORTNAME}.cpython-*.so
+
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	@(cd ${WRKSRC}/docs && ${COPYTREE_SHARE} \* ${STAGEDIR}${DOCSDIR})
@@ -38,4 +46,4 @@ post-install-DOCS-on:
 do-test:
 	@(cd ${WRKSRC} && ${SETENV} ${TEST_ENV} ${PYTHON_CMD} ./test.py
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/databases/py-berkeleydb/distinfo b/databases/py-berkeleydb/distinfo
index 815905527a76..34251241cd57 100644
--- a/databases/py-berkeleydb/distinfo
+++ b/databases/py-berkeleydb/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1621889489
-SHA256 (berkeleydb-18.1.4.tar.gz) = 3f6da579e727cdec7cdf192feaeb2ad58dca7a8479902f20cc2d73b2027b9e54
-SIZE (berkeleydb-18.1.4.tar.gz) = 129690
+TIMESTAMP = 1696622779
+SHA256 (berkeleydb-18.1.8.tar.gz) = e1831a790bfd855740e5c12f952f19f646c269806cfc362775afd9878cf32557
+SIZE (berkeleydb-18.1.8.tar.gz) = 294803
diff --git a/databases/py-berkeleydb/pkg-descr b/databases/py-berkeleydb/pkg-descr
index 0e1de142d551..5b66d8f43feb 100644
--- a/databases/py-berkeleydb/pkg-descr
+++ b/databases/py-berkeleydb/pkg-descr
@@ -10,5 +10,3 @@ Please see the documents in the docs directory of the source distribution or at
 the website for more details on the types and methods provided. The goal is to
 mirror most of the real Oracle Berkeley DB API so fall back to the Oracle
 Berkeley DB documentation as appropriate.
-
-WWW: https://www.jcea.es/programacion/pybsddb.htm
diff --git a/databases/py-bsddb3/Makefile b/databases/py-bsddb3/Makefile
deleted file mode 100644
index e17fa00b1a9f..000000000000
--- a/databases/py-bsddb3/Makefile
+++ /dev/null
@@ -1,38 +0,0 @@
-# Created by: Hye-Shik Chang <perky@python.or.kr>
-
-PORTNAME=	bsddb3
-PORTVERSION=	6.2.9
-CATEGORIES=	databases python
-MASTER_SITES=	CHEESESHOP
-PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
-
-MAINTAINER=	bofh@FreeBSD.org
-COMMENT=	Python extension module for BerkeleyDB 4.7, 4.8, 5.1, 5.3, 6.1 and 6.2
-
-LICENSE=	BSD3CLAUSE
-LICENSE_FILE=	${WRKSRC}/LICENSE.txt
-
-USES=		bdb python:3.6+
-USE_PYTHON=	distutils autoplist
-
-PYDISTUTILS_CONFIGUREARGS=--libs="-l${BDB_LIB_NAME}" --berkeley-db=${LOCALBASE}
-PYDISTUTILS_BUILDARGS=	--libs="-l${BDB_LIB_NAME}" --berkeley-db=${LOCALBASE}
-PYDISTUTILS_INSTALLARGS=-c -O1 --prefix=${PREFIX} --berkeley-db=${LOCALBASE}
-
-PORTDOCS=	*
-DOCSDIR=	${PREFIX}/share/doc/${PYTHON_PKGNAMEPREFIX}${PORTNAME}
-
-OPTIONS_DEFINE=	DOCS
-
-post-patch:
-	@${REINPLACE_CMD} 's,%%DBVERSION%%,${BDB_LIB_NAME},g' ${WRKSRC}/setup2.py ${WRKSRC}/setup3.py
-	@${REINPLACE_CMD} 's,<db\.h>,<${BDB_INCLUDE_DIR}/db.h>,' ${WRKSRC}/Modules/bsddb.h
-	@${REINPLACE_CMD} 's,%%BDB_INCLUDE_DIR%%,${BDB_INCLUDE_DIR},' ${WRKSRC}/setup2.py ${WRKSRC}/setup3.py
-	@${REINPLACE_CMD} 's,%%BDB_LIB_NAME%%,${BDB_LIB_NAME},' ${WRKSRC}/setup3.py
-
-post-install:
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	@(cd ${WRKSRC}/docs && ${COPYTREE_SHARE} \* ${STAGEDIR}${DOCSDIR})
-	@${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/bsddb3/_pybsddb*.so
-
-.include <bsd.port.mk>
diff --git a/databases/py-bsddb3/distinfo b/databases/py-bsddb3/distinfo
deleted file mode 100644
index f20e3e92035b..000000000000
--- a/databases/py-bsddb3/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1609332820
-SHA256 (bsddb3-6.2.9.tar.gz) = 70d05ec8dc568f42e70fc919a442e0daadc2a905a1cfb7ca77f549d49d6e7801
-SIZE (bsddb3-6.2.9.tar.gz) = 230475
diff --git a/databases/py-bsddb3/files/patch-setup2.py b/databases/py-bsddb3/files/patch-setup2.py
deleted file mode 100644
index 4ed3fdfd8d8f..000000000000
--- a/databases/py-bsddb3/files/patch-setup2.py
+++ /dev/null
@@ -1,35 +0,0 @@
---- setup2.py.orig	2016-02-08 21:14:26 UTC
-+++ setup2.py
-@@ -81,11 +81,7 @@ if (sys.version_info[0] < 3) and (sys.ve
-             category=DeprecationWarning)
- 
- 
--try :
--  from setuptools import setup, Extension
--except :
--  from distutils.core import setup, Extension
--
-+from distutils.core import setup, Extension
- from distutils.dep_util import newer
- import distutils.ccompiler
- 
-@@ -288,8 +284,8 @@ if os.name == 'posix':
-         incdir = os.path.join(BERKELEYDB_DIR, 'include')
-     if not libdir:
-         libdir = os.path.join(BERKELEYDB_DIR, 'lib')
--    if not '-ldb' in LIBS:
--        libname = [dblib]
-+    if not '-l%%DBVERSION%%' in LIBS:
-+        libname = ['%%DBVERSION%%']
-     else:
-         if debug: print "LIBS already contains '-ldb' not adding our own", "'-l"+dblib+"'"
-         libname = []
-@@ -328,7 +324,7 @@ if os.name == 'posix':
- 
-     # read db.h to figure out what version of Berkeley DB this is
-     ver = None
--    with open(os.path.join(incdir, 'db.h'), 'r') as f :
-+    with open('%%BDB_INCLUDE_DIR%%/db.h', 'r') as f :
-         db_h_lines = f.readlines()
-     db_ver_re = re.compile(
-         r'^#define\s+DB_VERSION_STRING\s.*Berkeley DB (\d+\.\d+).*')
diff --git a/databases/py-bsddb3/files/patch-setup3.py b/databases/py-bsddb3/files/patch-setup3.py
deleted file mode 100644
index 3ff9359b825d..000000000000
--- a/databases/py-bsddb3/files/patch-setup3.py
+++ /dev/null
@@ -1,35 +0,0 @@
---- setup3.py.orig	2016-02-08 21:18:47 UTC
-+++ setup3.py
-@@ -81,11 +81,7 @@ if (sys.version_info[0] < 3) and (sys.ve
-             category=DeprecationWarning)
- 
- 
--try :
--  from setuptools import setup, Extension
--except :
--  from distutils.core import setup, Extension
--
-+from distutils.core import setup, Extension
- from distutils.dep_util import newer
- import distutils.ccompiler
- 
-@@ -288,8 +284,8 @@ if os.name == 'posix':
-         incdir = os.path.join(BERKELEYDB_DIR, 'include')
-     if not libdir:
-         libdir = os.path.join(BERKELEYDB_DIR, 'lib')
--    if not '-ldb' in LIBS:
--        libname = [dblib]
-+    if not '-l%%BDB_LIB_NAME%%' in LIBS:
-+        libname = ['%%BDB_LIB_NAME%%']
-     else:
-         if debug: print("LIBS already contains '-ldb' not adding our own", "'-l"+dblib+"'")
-         libname = []
-@@ -328,7 +324,7 @@ if os.name == 'posix':
- 
-     # read db.h to figure out what version of Berkeley DB this is
-     ver = None
--    with open(os.path.join(incdir, 'db.h'), 'r') as f :
-+    with open('%%BDB_INCLUDE_DIR%%/db.h', 'r') as f :
-         db_h_lines = f.readlines()
-     db_ver_re = re.compile(
-         r'^#define\s+DB_VERSION_STRING\s.*Berkeley DB (\d+\.\d+).*')
diff --git a/databases/py-bsddb3/pkg-descr b/databases/py-bsddb3/pkg-descr
deleted file mode 100644
index 96b435f1479e..000000000000
--- a/databases/py-bsddb3/pkg-descr
+++ /dev/null
@@ -1,10 +0,0 @@
-This module provides a nearly complete wrapping of the Sleepycat C API
-for the Database Environment, Database, Cursor, and Transaction
-objects, and each of these is exposed as a Python Type in the
-bsddb3.db module.  The database objects can use different access
-methods, btree, hash, recno, and queue.  For the first time all of
-these are fully supported in the Python wrappers.  Please see the
-document in developers' web site for more details on the types and
-methods provided.
-
-WWW: https://www.jcea.es/programacion/pybsddb.htm
diff --git a/databases/py-carbon/Makefile b/databases/py-carbon/Makefile
index 829d0d776099..89318ac71662 100644
--- a/databases/py-carbon/Makefile
+++ b/databases/py-carbon/Makefile
@@ -1,33 +1,39 @@
-# Created by: Evan Sarmiento <bsdports@wayfair.com>
-
 PORTNAME=	carbon
-PORTVERSION=	1.1.8
+PORTVERSION=	1.1.10
+PORTREVISION=	3
 CATEGORIES=	databases python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	Backend storage application for graphite
+WWW=		https://github.com/graphite-project/carbon
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cachetools>=1.1.0:devel/py-cachetools@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}service_identity>=0:security/py-service_identity@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}service-identity>=0:security/py-service-identity@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}twisted>=13.2.0:devel/py-twisted@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}txamqp>=0.3:net/py-txamqp@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}urllib3>=0:net/py-urllib3@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}whisper>=0.9.10:databases/py-whisper@${PY_FLAVOR}
 
-USES=		python:3.6+
-USE_PYTHON=	distutils py3kplist
-USE_RC_SUBR=	carbon
+USES=		python
 USE_GITHUB=	yes
 GH_ACCOUNT=	graphite-project
+USE_PYTHON=	distutils py3kplist
+USE_RC_SUBR=	carbon
 
 MAKE_ENV=	GRAPHITE_NO_PREFIX=yes
-SUB_LIST=	PYTHON_CMD=${PYTHON_CMD}
 
 NO_ARCH=	yes
+SUB_LIST=	PYTHON_CMD=${PYTHON_CMD}
+
+.include <bsd.port.pre.mk>
+
+.if ${PYTHON_REL} > 30900
+BROKEN=		Python-3.9 is not supported
+.endif
 
 post-patch:
 	@${REINPLACE_CMD} 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/setup.py
@@ -36,4 +42,4 @@ post-install:
 	${RM} -r ${STAGEDIR}${PREFIX}/examples/init.d
 	${RMDIR} ${STAGEDIR}${PREFIX}/examples
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/databases/py-carbon/distinfo b/databases/py-carbon/distinfo
index 2618c409cc52..a0654da937cb 100644
--- a/databases/py-carbon/distinfo
+++ b/databases/py-carbon/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1618863185
-SHA256 (graphite-project-carbon-1.1.8_GH0.tar.gz) = 88040b06ff50d111c7b237b4fedbc90173c51c3be7b66dda5a2369165c11df47
-SIZE (graphite-project-carbon-1.1.8_GH0.tar.gz) = 99421
+TIMESTAMP = 1654145258
+SHA256 (graphite-project-carbon-1.1.10_GH0.tar.gz) = 1916df4d51f4260baee0d0665aae8c75e3350f0fcb826e26514c0abfe2d74f15
+SIZE (graphite-project-carbon-1.1.10_GH0.tar.gz) = 99444
diff --git a/databases/py-carbon/files/carbon.in b/databases/py-carbon/files/carbon.in
index edc4535df7f2..a3f98eae28eb 100644
--- a/databases/py-carbon/files/carbon.in
+++ b/databases/py-carbon/files/carbon.in
@@ -1,9 +1,10 @@
 #!/bin/sh
 
 # PROVIDE: carbon
+# REQUIRE: LOGIN
 # KEYWORD: shutdown
 
-# 
+#
 # Add the following lines to /etc/rc.conf.local or /etc/rc.conf
 # to enable this service:
 #
@@ -28,7 +29,7 @@
 #			in debug by default.
 # carbon_logdir:	Directory where carbon logs are stored.
 #			Default: /var/db/carbon/log
-# 
+#
 
 . /etc/rc.subr
 
@@ -114,4 +115,3 @@ carbon_stop()
 }
 
 run_rc_command "$1"
-
diff --git a/databases/py-carbon/pkg-descr b/databases/py-carbon/pkg-descr
index 2f4b423a4aa0..faa5f106a704 100644
--- a/databases/py-carbon/pkg-descr
+++ b/databases/py-carbon/pkg-descr
@@ -1,3 +1 @@
 Carbon is a backend data caching and persistence daemon for Graphite
-
-WWW: https://github.com/graphite-project/carbon
diff --git a/databases/py-cassandra-driver/Makefile b/databases/py-cassandra-driver/Makefile
index 9ccc566ec3a4..8a120269118c 100644
--- a/databases/py-cassandra-driver/Makefile
+++ b/databases/py-cassandra-driver/Makefile
@@ -1,11 +1,12 @@
 PORTNAME=	cassandra-driver
 DISTVERSION=	3.18.0
 CATEGORIES=	databases python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sergey@akhmatov.ru
 COMMENT=	Python client library for Apache Cassandra
+WWW=		https://github.com/datastax/python-driver
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
@@ -17,7 +18,7 @@ TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}nose>=0:devel/py-nose@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sure>0:devel/py-sure@${PY_FLAVOR}
 
-USES=		python:3.6+
+USES=		python
 USE_PYTHON=	autoplist cython distutils
 
 OPTIONS_DEFINE=	LIBEV MURMUR3
diff --git a/databases/py-cassandra-driver/pkg-descr b/databases/py-cassandra-driver/pkg-descr
index 0eb493af75b7..102ce2262279 100644
--- a/databases/py-cassandra-driver/pkg-descr
+++ b/databases/py-cassandra-driver/pkg-descr
@@ -1,5 +1,3 @@
 A modern, feature-rich and highly-tunable Python client library for
 Apache Cassandra (2.1+) using exclusively Cassandra's binary protocol
 and Cassandra Query Language v3.
-
-WWW: https://github.com/datastax/python-driver
diff --git a/databases/py-couchdb/Makefile b/databases/py-couchdb/Makefile
index ff082fbfd38f..64ede9fd0cb1 100644
--- a/databases/py-couchdb/Makefile
+++ b/databases/py-couchdb/Makefile
@@ -1,21 +1,20 @@
-# Created by: Andrei Antoukh <niwi@niwi.be>
-
 PORTNAME=	CouchDB
 PORTVERSION=	1.1
 PORTREVISION=	1
 CATEGORIES=	databases python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DIST_SUBDIR=	python
 
 MAINTAINER=	niwi@niwi.be
 COMMENT=	Simple Library to Allow Python Applications to Use CouchDB
+WWW=		https://code.google.com/p/couchdb-python/
 
 LICENSE=	BSD3CLAUSE
 
-RUN_DEPENDS=    ${PYTHON_PKGNAMEPREFIX}simplejson>=0:devel/py-simplejson@${PY_FLAVOR}
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}simplejson>=0:devel/py-simplejson@${PY_FLAVOR}
 
-USES=		python:3.6+
+USES=		python
 USE_PYTHON=	distutils autoplist concurrent pythonprefix
 
 .include <bsd.port.mk>
diff --git a/databases/py-couchdb/pkg-descr b/databases/py-couchdb/pkg-descr
index 64832559fada..5d6e496200e0 100644
--- a/databases/py-couchdb/pkg-descr
+++ b/databases/py-couchdb/pkg-descr
@@ -1,4 +1,2 @@
 This package provides a Python fast and full featured interface
 to CouchDB.
-
-WWW: http://code.google.com/p/couchdb-python/
diff --git a/databases/py-databases/Makefile b/databases/py-databases/Makefile
new file mode 100644
index 000000000000..e44c0bef9694
--- /dev/null
+++ b/databases/py-databases/Makefile
@@ -0,0 +1,48 @@
+PORTNAME=	databases
+DISTVERSION=	0.8.0
+CATEGORIES=	databases python
+MASTER_SITES=	PYPI
+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+
+MAINTAINER=	meka@tilda.center
+COMMENT=	Async database support for Python
+WWW=		https://github.com/encode/databases
+
+LICENSE=	BSD3CLAUSE
+
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlalchemy14<=1.5:databases/py-sqlalchemy14@${PY_FLAVOR}
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}aiomysql>0:databases/py-aiomysql@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}aiopg>0:databases/py-aiopg@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}async_timeout>0:devel/py-async_timeout@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}asyncmy>0:databases/py-asyncmy@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}asyncpg>0:databases/py-asyncpg@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}httpx>0:www/py-httpx@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}starlette>=0:www/py-starlette@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}typing-extensions>0:devel/py-typing-extensions@${PY_FLAVOR}
+
+USES=		python
+USE_PYTHON=	autoplist concurrent distutils pytest
+
+USE_GITHUB=	yes
+GH_ACCOUNT=	encode
+
+NO_ARCH=	yes
+
+OPTIONS_GROUP=			DATABASES
+OPTIONS_GROUP_DATABASES=	MYSQL PGSQL SQLITE
+OPTIONS_DEFAULT=		SQLITE
+DATABASES_DESC=			Database Support
+
+MYSQL_USES=		mysql
+MYSQL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}aiomysql>0:databases/py-aiomysql@${PY_FLAVOR}
+PGSQL_USES=		pgsql
+PGSQL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}aiopg>0:databases/py-aiopg@${PY_FLAVOR}
+SQLITE_USES=		sqlite
+SQLITE_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}aiosqlite>0:databases/py-aiosqlite@${PY_FLAVOR}
+
+TEST_ENV+=	TEST_DATABASE_URLS="sqlite:///testsuite"
+
+post-extract:
+	${TOUCH} ${WRKSRC}/tests/__init__.py
+
+.include <bsd.port.mk>
diff --git a/databases/py-databases/distinfo b/databases/py-databases/distinfo
new file mode 100644
index 000000000000..7f9c10fbec48
--- /dev/null
+++ b/databases/py-databases/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1695799345
+SHA256 (encode-databases-0.8.0_GH0.tar.gz) = 4fc6b57c4fcd58cf1d4dbe73e2f09bded9694e3148b4d7b4186616a786065f21
+SIZE (encode-databases-0.8.0_GH0.tar.gz) = 36454
diff --git a/databases/py-databases/pkg-descr b/databases/py-databases/pkg-descr
new file mode 100644
index 000000000000..ebff60ffb3f7
--- /dev/null
+++ b/databases/py-databases/pkg-descr
@@ -0,0 +1,7 @@
+Databases gives you simple asyncio support for a range of databases.
+
+It allows you to make queries using the powerful SQLAlchemy Core expression
+language, and provides support for PostgreSQL, MySQL, and SQLite.
+
+Databases is suitable for integrating against any async Web framework, such as
+Starlette, Sanic, Responder, Quart, aiohttp, Tornado, or FastAPI.
diff --git a/databases/py-dbf/Makefile b/databases/py-dbf/Makefile
index 787ab8e1fd9c..01177476ba87 100644
--- a/databases/py-dbf/Makefile
+++ b/databases/py-dbf/Makefile
@@ -1,17 +1,16 @@
-# Created by: Wen Heping <wen@FreeBSD.org>
-
 PORTNAME=	dbf
-PORTVERSION=	0.99.1
+PORTVERSION=	0.99.3
 CATEGORIES=	databases python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	wen@FreeBSD.org
 COMMENT=	Pure python package for reading/writing dbf files
+WWW=		https://pypi.org/project/dbf/
 
 LICENSE=	BSD3CLAUSE
 
-USES=		python:3.6+
+USES=		dos2unix python
 USE_PYTHON=	autoplist distutils
 NO_ARCH=	yes
 
diff --git a/databases/py-dbf/distinfo b/databases/py-dbf/distinfo
index 0e478bacece0..f60277b9bda1 100644
--- a/databases/py-dbf/distinfo
+++ b/databases/py-dbf/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1614999774
-SHA256 (dbf-0.99.1.tar.gz) = 4ed598a3866dfe7761b8099cf53ab44cb6ed5e4a7dbffb0da8c67a4af8d62fc5
-SIZE (dbf-0.99.1.tar.gz) = 104251
+TIMESTAMP = 1676334423
+SHA256 (dbf-0.99.3.tar.gz) = 940272a72ac27d16a1db69aafef820684012cc3553ffe9875d5cd2e3a9cb69dc
+SIZE (dbf-0.99.3.tar.gz) = 104801
diff --git a/databases/py-dbf/files/patch-2to3 b/databases/py-dbf/files/patch-2to3
new file mode 100644
index 000000000000..f9ad71a6c72a
--- /dev/null
+++ b/databases/py-dbf/files/patch-2to3
@@ -0,0 +1,13 @@
+--- dbf/_index.py.orig	2022-03-15 19:06:56 UTC
++++ dbf/_index.py
+@@ -9,8 +9,8 @@ class IndexFile(object):
+         filename += '.pdx'
+         if not os.path.exists(filename):
+             self.index_file = open(filename, 'r+b')
+-            self.index_file.write('\xea\xaf\x37\xbf'    # signature
+-                '\x00'*8                                # two non-existant lists
++            self.index_file.write('\xea\xaf\x37\xbf',   # signature
++                '\x00'*8,                               # two non-existant lists
+                 '\x00'*500)                             # and no indices
+             return
+         index_file = self.index_file = open(filename, 'r+b')
diff --git a/databases/py-dbf/pkg-descr b/databases/py-dbf/pkg-descr
index 87bb6caffc2a..04b1c800ea74 100644
--- a/databases/py-dbf/pkg-descr
+++ b/databases/py-dbf/pkg-descr
@@ -5,5 +5,3 @@ Currently supports dBase III, and FoxPro - Visual FoxPro 6 tables.
 Text is returned as unicode, and codepage settings in tables are
 honored. Documentation needs work, but author is very responsive
 to e-mails.
-
-WWW: https://pypi.org/project/dbf/
diff --git a/databases/py-dbt-core/Makefile b/databases/py-dbt-core/Makefile
new file mode 100644
index 000000000000..8ab5eed7a5a7
--- /dev/null
+++ b/databases/py-dbt-core/Makefile
@@ -0,0 +1,42 @@
+PORTNAME=	dbt-core
+PORTVERSION=	1.7.3
+PORTREVISION=	2
+CATEGORIES=	databases python
+MASTER_SITES=	PYPI
+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+
+MAINTAINER=	pat@patmaddox.com
+COMMENT=	With dbt, build analytics the way engineers build applications
+WWW=		https://github.com/dbt-labs/dbt-core
+
+LICENSE=	APACHE20
+
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}agate>=1.7,<2:textproc/py-agate@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}Jinja2>=3.1.2,<4:devel/py-Jinja2@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}mashumaro>=3.9,<4:devel/py-mashumaro@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}msgpack>0.5.6:devel/py-msgpack@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}logbook>0:devel/py-logbook@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}click>=8.0.2,<9:devel/py-click@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}networkx>=2.3:math/py-networkx@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}colorama>=0.3.9,<0.5:devel/py-colorama@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pathspec>=0.9,<0.13:devel/py-pathspec@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}isodate>=0.6,<0.7:devel/py-isodate@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}sqlparse>=0.2.3,<0.6:databases/py-sqlparse@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}dbt-extractor>=0.5:devel/py-dbt-extractor@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}minimal-snowplow-tracker>=0.0.2,<0.1:devel/py-minimal-snowplow-tracker@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}dbt-semantic-interfaces>=0.4.0,<0.5:databases/py-dbt-semantic-interfaces@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}jsonschema>=3.0:devel/py-jsonschema@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}packaging>20.9:devel/py-packaging@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}protobuf>=4.0.0:devel/py-protobuf@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pytz>=2015.7:devel/py-pytz@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}yaml>=6.0:devel/py-yaml@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}typing-extensions>=3.7.4:devel/py-typing-extensions@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}cffi>=1.9,<2:devel/py-cffi@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}idna>=2.5,<4:dns/py-idna@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}requests<3:www/py-requests@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}urllib3>=1.0:net/py-urllib3@${PY_FLAVOR}
+
+USES=		python
+USE_PYTHON=	autoplist concurrent distutils
+
+.include <bsd.port.mk>
diff --git a/databases/py-dbt-core/distinfo b/databases/py-dbt-core/distinfo
new file mode 100644
index 000000000000..db9f705948e8
--- /dev/null
+++ b/databases/py-dbt-core/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1701374624
+SHA256 (dbt-core-1.7.3.tar.gz) = a8f06203cd003ebcdda2af953f60c2b44fc0c69bd6cba79338225daedb1f41e1
+SIZE (dbt-core-1.7.3.tar.gz) = 913570
diff --git a/databases/py-dbt-core/files/patch-setup.py b/databases/py-dbt-core/files/patch-setup.py
new file mode 100644
index 000000000000..986026cad15e
--- /dev/null
+++ b/databases/py-dbt-core/files/patch-setup.py
@@ -0,0 +1,11 @@
+--- setup.py.orig	2023-11-29 15:45:26 UTC
++++ setup.py
+@@ -68,7 +68,7 @@ setup(
+         "pathspec>=0.9,<0.12",
+         "isodate>=0.6,<0.7",
+         # ----
+-        "sqlparse>=0.2.3,<0.5",
++        "sqlparse>=0.2.3,<0.6",
+         # ----
+         # These are major-version-0 packages also maintained by dbt-labs. Accept patches.
+         "dbt-extractor~=0.5.0",
diff --git a/databases/py-dbt-core/pkg-descr b/databases/py-dbt-core/pkg-descr
new file mode 100644
index 000000000000..17c93078fe10
--- /dev/null
+++ b/databases/py-dbt-core/pkg-descr
@@ -0,0 +1,11 @@
+dbt enables data analysts and engineers to transform their data using the same
+practices that software engineers use to build applications.
+
+Analysts using dbt can transform their data by simply writing select statements,
+while dbt handles turning these statements into tables and views in a data
+warehouse.
+
+These select statements, or "models", form a dbt project. Models frequently
+build on top of one another - dbt makes it easy to manage relationships between
+models, and visualize these relationships, as well as assure the quality of your
+transformations through testing.
diff --git a/databases/py-dbt-duckdb/Makefile b/databases/py-dbt-duckdb/Makefile
new file mode 100644
index 000000000000..17dc4ccf12fc
--- /dev/null
+++ b/databases/py-dbt-duckdb/Makefile
@@ -0,0 +1,36 @@
+PORTNAME=	dbt-duckdb
+PORTVERSION=	1.7.0
+CATEGORIES=	databases python
+MASTER_SITES=	PYPI
+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+
+MAINTAINER=	pat@patmaddox.com
+COMMENT=	DuckDB adapter plugin for dbt (data build tool)
+WWW=		https://github.com/jwills/dbt-duckdb
+
+LICENSE=	APACHE20
+
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dbt-core>=1.7.0,<2:databases/py-dbt-core@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}duckdb>=0.7.0:databases/py-duckdb@${PY_FLAVOR}
+
+USES=		python
+USE_PYTHON=	autoplist concurrent distutils
+
+# py-dbt-duckdb attempts to install __init__.py and the generated bytecode into
+# these directories which conflicts with those installed by py-dbt-core. We need to
+# delete these files and their entries in the generated plist post-install.
+COMMON_DIRS=	dbt \
+		dbt/adapters \
+		dbt/include
+
+post-stage:
+.for dir in ${COMMON_DIRS:S|/|\/|g}
+	@${REINPLACE_CMD} -e '/.*\/${dir}\/__init__.py/d' \
+		-e '/.*\/${dir}\/__pycache__.*/d' \
+		${WRKDIR}/.PLIST.pymodtmp
+.endfor
+.for dir in ${COMMON_DIRS}
+	@(cd ${STAGEDIR}${PYTHON_SITELIBDIR}/${dir} && ${RM} -r __pycache__ __init__.py)
+.endfor
+
+.include <bsd.port.mk>
diff --git a/databases/py-dbt-duckdb/distinfo b/databases/py-dbt-duckdb/distinfo
new file mode 100644
index 000000000000..88d9ce3d1f74
--- /dev/null
+++ b/databases/py-dbt-duckdb/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1701384521
+SHA256 (dbt-duckdb-1.7.0.tar.gz) = e2479f5fdd5177eea37c081d8ea126d80ec51d95e69ea31132ade396538bf0a0
+SIZE (dbt-duckdb-1.7.0.tar.gz) = 49217
diff --git a/databases/py-dbt-duckdb/pkg-descr b/databases/py-dbt-duckdb/pkg-descr
new file mode 100644
index 000000000000..577c7c7003d8
--- /dev/null
+++ b/databases/py-dbt-duckdb/pkg-descr
@@ -0,0 +1,11 @@
+dbt-duckdb
+
+DuckDB is an embedded database, similar to SQLite, but designed for OLAP-style
+analytics. It is crazy fast and allows you to read and write data stored in CSV,
+JSON, and Parquet files directly, without requiring you to load them into the
+database first.
+
+dbt is the best way to manage a collection of data transformations written in
+SQL or Python for analytics and data science. dbt-duckdb is the project that
+ties DuckDB and dbt together, allowing you to create a Modern Data Stack In A
+Box or a simple and powerful data lakehouse with Python.
diff --git a/databases/py-dbt-semantic-interfaces/Makefile b/databases/py-dbt-semantic-interfaces/Makefile
new file mode 100644
index 000000000000..60bdca3c9616
--- /dev/null
+++ b/databases/py-dbt-semantic-interfaces/Makefile
@@ -0,0 +1,33 @@
+PORTNAME=	dbt-semantic-interfaces
+PORTVERSION=	0.4.1
+PORTREVISION=	1
+CATEGORIES=	databases python
+MASTER_SITES=	PYPI
+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+DISTNAME=	dbt_semantic_interfaces-${PORTVERSION}
+
+MAINTAINER=	pat@patmaddox.com
+COMMENT=	Shared semantic layer definitions that dbt-core and MetricFlow use
+WWW=		https://github.com/dbt-labs/dbt-semantic-interfaces
+
+LICENSE=	APACHE20
+
+BUILD_DEPENDS=	hatch:devel/py-hatch@${PY_FLAVOR} \
+		hatchling:devel/py-hatchling@${PY_FLAVOR}
+
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pydantic>=1.10:devel/py-pydantic@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}jsonschema>=4,<5:devel/py-jsonschema@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}yaml>=6,<7:devel/py-yaml@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}more-itertools>=8,<11:devel/py-more-itertools@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}Jinja2>=3,<4:devel/py-Jinja2@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}click>=7,<9:devel/py-click@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}python-dateutil>=2,<3:devel/py-python-dateutil@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}importlib-metadata>=6:devel/py-importlib-metadata@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}typing-extensions>=4.4,<5:devel/py-typing-extensions@${PY_FLAVOR}
+
+USES=		python
+USE_PYTHON=	autoplist concurrent pep517
+
+NO_ARCH=	yes
+
+.include <bsd.port.mk>
diff --git a/databases/py-dbt-semantic-interfaces/distinfo b/databases/py-dbt-semantic-interfaces/distinfo
new file mode 100644
index 000000000000..c9d68933a768
--- /dev/null
+++ b/databases/py-dbt-semantic-interfaces/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1701246479
+SHA256 (dbt_semantic_interfaces-0.4.1.tar.gz) = d79cb4b5e5103099874530735a117db61f7dcbb1a774f9ce65068c24cb7e874e
+SIZE (dbt_semantic_interfaces-0.4.1.tar.gz) = 72398
diff --git a/databases/py-dbt-semantic-interfaces/pkg-descr b/databases/py-dbt-semantic-interfaces/pkg-descr
new file mode 100644
index 000000000000..99bb3bc9aee7
--- /dev/null
+++ b/databases/py-dbt-semantic-interfaces/pkg-descr
@@ -0,0 +1,13 @@
+dbt-semantic-interfaces contains the shared semantic classes, default
+validation, and tests designed to be used by both the dbt-core and MetricFlow
+projects. By centralizing these shared resources, we aim to maintain consistency
+and reduce code duplication across both projects.
+
+Features:
+
+- Protocols for shared semantic classes: Define the interfaces and common
+  attributes that must be implemented by the objects in both projects.
+- Validation: Ensure that the objects comply with the expected structure and
+  constraints.
+- Tests: Ensure that the objects' behavior is consistent and correct across both
+  projects.
diff --git a/databases/py-dbt-snowflake/Makefile b/databases/py-dbt-snowflake/Makefile
new file mode 100644
index 000000000000..b607a740db4d
--- /dev/null
+++ b/databases/py-dbt-snowflake/Makefile
@@ -0,0 +1,40 @@
+PORTNAME=	dbt-snowflake
+PORTVERSION=	1.7.0
+CATEGORIES=	databases python
+MASTER_SITES=	PYPI
+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+
+MAINTAINER=	pat@patmaddox.com
+COMMENT=	Snowflake adapter plugin for dbt
+WWW=		https://github.com/dbt-labs/dbt-snowflake
+
+LICENSE=	APACHE20
+
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}agate>0:textproc/py-agate@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}dbt-core>=1.7.3,<2:databases/py-dbt-core@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}snowflake-connector-python>=3.0,<4:databases/py-snowflake-connector-python@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}keyring>=16.1.1:security/py-keyring@${PY_FLAVOR}
+
+USES=		python
+USE_PYTHON=	autoplist concurrent distutils
+
+NO_ARCH=	yes
+
+# py-dbt-snowflake attempts to install __init__.py and the generated bytecode into
+# these directories which conflicts with those installed by py-dbt-core. We need to
+# delete these files and their entries in the generated plist post-install.
+COMMON_DIRS=	dbt \
+		dbt/adapters \
+		dbt/include
+
+post-stage:
+.for dir in ${COMMON_DIRS:S|/|\/|g}
+	@${REINPLACE_CMD} -e '/.*\/${dir}\/__init__.py/d' \
+		-e '/.*\/${dir}\/__pycache__.*/d' \
+		${WRKDIR}/.PLIST.pymodtmp
+.endfor
+.for dir in ${COMMON_DIRS}
+	@(cd ${STAGEDIR}${PYTHON_SITELIBDIR}/${dir} && ${RM} -r __pycache__ __init__.py)
+.endfor
+
+.include <bsd.port.mk>
diff --git a/databases/py-dbt-snowflake/distinfo b/databases/py-dbt-snowflake/distinfo
new file mode 100644
index 000000000000..193ce8059ffd
--- /dev/null
+++ b/databases/py-dbt-snowflake/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1701935407
+SHA256 (dbt-snowflake-1.7.0.tar.gz) = 959943cdb0bcedc67203f0205a9ae21fba13f4c95ddf7089848a77b8c8a8d5f1
+SIZE (dbt-snowflake-1.7.0.tar.gz) = 33622
diff --git a/databases/py-dbt-snowflake/pkg-descr b/databases/py-dbt-snowflake/pkg-descr
new file mode 100644
index 000000000000..0c0b89753a9a
--- /dev/null
+++ b/databases/py-dbt-snowflake/pkg-descr
@@ -0,0 +1,2 @@
+The dbt-snowflake package contains all of the code enabling dbt to work with
+Snowflake.
diff --git a/databases/py-dbutils/Makefile b/databases/py-dbutils/Makefile
index 07e15a59fe07..a42cfc3728a6 100644
--- a/databases/py-dbutils/Makefile
+++ b/databases/py-dbutils/Makefile
@@ -1,20 +1,23 @@
-# Created by: Choe, Cheng-Dae
-
 PORTNAME=	dbutils
-PORTVERSION=	2.0
+PORTVERSION=	3.1.0
 CATEGORIES=	databases python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	DBUtils-${PORTVERSION}
 
 MAINTAINER=	python@FreeBSD.org
 COMMENT=	Providing solid, persistent, and pooled connections to a database
+WWW=		https://webwareforpython.github.io/DBUtils/ \
+		https://github.com/WebwareForPython/DBUtils
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-USES=		python:3.6+
-USE_PYTHON=	autoplist distutils
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools>=61:devel/py-setuptools@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR}
+
+USES=		python
+USE_PYTHON=	autoplist concurrent pep517
 
 NO_ARCH=	yes
 
diff --git a/databases/py-dbutils/distinfo b/databases/py-dbutils/distinfo
index 5ff99349c56c..4191fce33241 100644
--- a/databases/py-dbutils/distinfo
+++ b/databases/py-dbutils/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1601754224
-SHA256 (DBUtils-2.0.tar.gz) = 4f3cb5279560b0b5197c22f7b0b1980da829b743f1a422e38deb28c14475318c
-SIZE (DBUtils-2.0.tar.gz) = 92911
+TIMESTAMP = 1711466422
+SHA256 (DBUtils-3.1.0.tar.gz) = ea528ba11063240eea82345ebc6f7cc9324c06e42e9420b00bcd245a95bfcc24
+SIZE (DBUtils-3.1.0.tar.gz) = 94672
diff --git a/databases/py-dbutils/files/patch-pyproject.toml b/databases/py-dbutils/files/patch-pyproject.toml
new file mode 100644
index 000000000000..8616d188fc8d
--- /dev/null
+++ b/databases/py-dbutils/files/patch-pyproject.toml
@@ -0,0 +1,16 @@
+--- pyproject.toml.orig	2024-03-17 13:17:26 UTC
++++ pyproject.toml
+@@ -1,11 +1,11 @@ requires = [
+ [build-system]
+ build-backend = "setuptools.build_meta"
+ requires = [
+-  "setuptools>=68",
++  "setuptools>=61",
+ ]
+ 
+ [project]
+-name = "DBUtils"
++name = "dbutils"
+ version = "3.1.0"
+ description = "Database connections for multi-threaded environments."
+ license = {text = "MIT License"}
diff --git a/databases/py-dbutils/pkg-descr b/databases/py-dbutils/pkg-descr
index 3fe5fb34bf87..8639313b888a 100644
--- a/databases/py-dbutils/pkg-descr
+++ b/databases/py-dbutils/pkg-descr
@@ -2,5 +2,3 @@ DBUtils is a suite of tools providing solid, persistent and pooled connections
 to a database that can be used in all kinds of multi-threaded environments like
 Webware for Python or other web application servers. The suite supports DB-API 2
 compliant database interfaces and the classic PyGreSQL interface.
-
-WWW: https://webwareforpython.github.io/DBUtils/
diff --git a/databases/py-duckdb/Makefile b/databases/py-duckdb/Makefile
new file mode 100644
index 000000000000..90bc1f262302
--- /dev/null
+++ b/databases/py-duckdb/Makefile
@@ -0,0 +1,34 @@
+PORTNAME=	duckdb
+DISTVERSION=	0.10.2
+CATEGORIES=	databases python
+MASTER_SITES=	PYPI
+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+
+MAINTAINER=	yuri@FreeBSD.org
+COMMENT=	In-process SQL OLAP database management system
+WWW=		https://duckdb.org/
+
+LICENSE=	MIT
+
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pybind11>=2.6.0:devel/py-pybind11@${PY_FLAVOR} \
+		${PYNUMPY}
+RUN_DEPENDS=	${PYNUMPY} \
+		${PYTHON_PKGNAMEPREFIX}pandas>0:math/py-pandas@${PY_FLAVOR}
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}fsspec>0:devel/py-fsspec@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}google-cloud-storage>0:www/py-google-cloud-storage@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}mypy>0:devel/py-mypy@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR}
+#TEST_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}pyarrow>0:databases/py-pyarrow@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}polars>0:misc/py-polars@${PY_FLAVOR}
+
+USES=		python
+USE_PYTHON=	distutils autoplist pytest
+
+MAKE_ENV=	OVERRIDE_GIT_DESCRIBE=v${DISTVERSION}-g00000000-0
+TEST_WRKSRC=	${WRKDIR} # tests fail when run from the build directory due to a name collision with duckdb directory
+TEST_ENV=	${MAKE_ENV} PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR} # 2 tests fail, see https://github.com/duckdb/duckdb/issues/5642
+
+post-install:
+	@${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/duckdb/duckdb${PYTHON_EXT_SUFFIX}.so
+
+.include <bsd.port.mk>
diff --git a/databases/py-duckdb/distinfo b/databases/py-duckdb/distinfo
new file mode 100644
index 000000000000..8f033ea2c629
--- /dev/null
+++ b/databases/py-duckdb/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1713476700
+SHA256 (duckdb-0.10.2.tar.gz) = 0f609c9d5f941f1ecde810f010dd9321cd406a552c1df20318a13fa64247f67f
+SIZE (duckdb-0.10.2.tar.gz) = 11248689
diff --git a/databases/py-duckdb/pkg-descr b/databases/py-duckdb/pkg-descr
new file mode 100644
index 000000000000..5220ad7c3441
--- /dev/null
+++ b/databases/py-duckdb/pkg-descr
@@ -0,0 +1,5 @@
+DuckDB is a high-performance analytical database system. It is
+designed to be fast, reliable and easy to use. DuckDB provides a rich
+SQL dialect, with support far beyond basic SQL. DuckDB supports
+arbitrary and nested correlated subqueries, window functions,
+collations, complex types (arrays, structs), and more.
diff --git a/databases/py-fakeredis/Makefile b/databases/py-fakeredis/Makefile
index c16d450deb88..543522dd3b0c 100644
--- a/databases/py-fakeredis/Makefile
+++ b/databases/py-fakeredis/Makefile
@@ -1,34 +1,38 @@
 PORTNAME=	fakeredis
-PORTVERSION=	1.5.2
+PORTVERSION=	2.22.0
 CATEGORIES=	databases python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Fake version of databases/py-redis for unit testing
+WWW=		https://github.com/cunla/fakeredis-py
 
-LICENSE=	BSD3CLAUSE
-LICENSE_FILE=	${WRKSRC}/COPYING
+LICENSE=	BSD3CLAUSE MIT
+LICENSE_COMB=	multi
+LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}redis>=0<3.6:databases/py-redis@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}six>=1.12:devel/py-six@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}sortedcontainers>=2.1.0:devel/py-sortedcontainers@${PY_FLAVOR}
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest<5.0:devel/py-pytest@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}pytest-cov<3.0:devel/py-pytest-cov@${PY_FLAVOR}
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}poetry-core>=0:devel/py-poetry-core@${PY_FLAVOR}
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}redis>=4:databases/py-redis@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}sortedcontainers>=2<3:devel/py-sortedcontainers@${PY_FLAVOR}
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}hypothesis>=0:devel/py-hypothesis@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}jsonpath-ng>=1.5<2:devel/py-jsonpath-ng@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}lupa>=1.14<2:lang/py-lupa@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pytest-asyncio>=0:devel/py-pytest-asyncio@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pytest-cov>=0:devel/py-pytest-cov@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pytest-mock>=0:devel/py-pytest-mock@${PY_FLAVOR}
 
-USES=		python:3.6+
-USE_PYTHON=	autoplist concurrent distutils
+USES=		python
+USE_PYTHON=	autoplist concurrent pep517 pytest
 
 NO_ARCH=	yes
 
-OPTIONS_DEFINE=	AIOREDIS LUA
-AIOREDIS_DESC=	Asyncio redis support
-LUA_DESC=	Lua support
+OPTIONS_DEFINE=	JSON LUA PROBABILISTIC
+LUA_DESC=		Lua support
+PROBABILISTIC_DESC=	Probabilistic data structure support
 
-AIOREDIS_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}aioredis>=0<2:databases/py-aioredis@${PY_FLAVOR}
-LUA_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}lupa>=0:lang/py-lupa@${PY_FLAVOR}
-
-do-test:
-	cd ${WRKSRC} && ${PYTHON_CMD} test_fakeredis.py
+JSON_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}jsonpath-ng>=1.5<2:devel/py-jsonpath-ng@${PY_FLAVOR}
+LUA_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}lupa>=1.14<3.0:lang/py-lupa@${PY_FLAVOR}
+PROBABILISTIC_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyprobables>=0.6<1:math/py-pyprobables@${PY_FLAVOR}
 
 .include <bsd.port.mk>
diff --git a/databases/py-fakeredis/distinfo b/databases/py-fakeredis/distinfo
index de2630deeed5..aefa5918c0b1 100644
--- a/databases/py-fakeredis/distinfo
+++ b/databases/py-fakeredis/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1622214042
-SHA256 (fakeredis-1.5.2.tar.gz) = 18fc1808d2ce72169d3f11acdb524a00ef96bd29970c6d34cfeb2edb3fc0c020
-SIZE (fakeredis-1.5.2.tar.gz) = 78710
+TIMESTAMP = 1713624678
+SHA256 (fakeredis-2.22.0.tar.gz) = d063085fe962d16637cfe21044f277cfc54d6fb456d12a7c87514990c3fac98e
+SIZE (fakeredis-2.22.0.tar.gz) = 130074
diff --git a/databases/py-fakeredis/files/patch-pyproject.toml b/databases/py-fakeredis/files/patch-pyproject.toml
new file mode 100644
index 000000000000..7feaf196da04
--- /dev/null
+++ b/databases/py-fakeredis/files/patch-pyproject.toml
@@ -0,0 +1,11 @@
+--- pyproject.toml.orig	2024-02-15 14:54:18 UTC
++++ pyproject.toml
+@@ -46,7 +46,7 @@ lupa = { version = ">=1.14,<3.0", optional = true }
+ redis = ">=4"
+ sortedcontainers = "^2"
+ lupa = { version = ">=1.14,<3.0", optional = true }
+-jsonpath-ng = { version = "^1.6", optional = true }
++jsonpath-ng = { version = "^1.5", optional = true }
+ pyprobables = { version = "^0.6", optional = true }
+ 
+ [tool.poetry.extras]
diff --git a/databases/py-fakeredis/pkg-descr b/databases/py-fakeredis/pkg-descr
index 3231f5222d15..45ab53de7203 100644
--- a/databases/py-fakeredis/pkg-descr
+++ b/databases/py-fakeredis/pkg-descr
@@ -3,5 +3,3 @@ simulates talking to a redis server. This was created for a single purpose: to
 write unittests. Setting up redis is not hard, but many times you want to write
 unittests that do not talk to an external server (such as redis). This module
 now allows tests to simply use this module as a reasonable substitute for redis.
-
-WWW: https://github.com/jamesls/fakeredis
diff --git a/databases/py-fastapi-users-db-ormar/Makefile b/databases/py-fastapi-users-db-ormar/Makefile
new file mode 100644
index 000000000000..678cca86f132
--- /dev/null
+++ b/databases/py-fastapi-users-db-ormar/Makefile
@@ -0,0 +1,24 @@
+PORTNAME=	fastapi-users-db-ormar
+DISTVERSION=	1.0.0
+CATEGORIES=	databases python
+MASTER_SITES=	PYPI
+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+
+MAINTAINER=	meka@tilda.center
+COMMENT=	FastAPI-Users Ormar database adapter
+WWW=		https://github.com/fastapi-users/fastapi-users-db-ormar
+
+LICENSE=	MIT
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
+BROKEN=	pkg-static: py39-pydantic-1.10.13,1 conflicts with py39-pydantic2-2.5.3 (installs files into the same place)
+
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}fastapi-users>=6.1.2:www/py-fastapi-users@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}ormar>=0.10.16:databases/py-ormar@${PY_FLAVOR}
+
+USES=		python
+USE_PYTHON=	autoplist concurrent distutils
+
+NO_ARCH=	yes
+
+.include <bsd.port.mk>
diff --git a/databases/py-fastapi-users-db-ormar/distinfo b/databases/py-fastapi-users-db-ormar/distinfo
new file mode 100644
index 000000000000..3dbc82a931af
--- /dev/null
+++ b/databases/py-fastapi-users-db-ormar/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1632917589
+SHA256 (fastapi-users-db-ormar-1.0.0.tar.gz) = 5e5bcf83ca7512d026a2fb55290a7858f8e9a31c33154c9ef73b593876a9e3f6
+SIZE (fastapi-users-db-ormar-1.0.0.tar.gz) = 9456
diff --git a/databases/py-fastapi-users-db-ormar/pkg-descr b/databases/py-fastapi-users-db-ormar/pkg-descr
new file mode 100644
index 000000000000..643a0b81b22d
--- /dev/null
+++ b/databases/py-fastapi-users-db-ormar/pkg-descr
@@ -0,0 +1 @@
+Sub-package for Ormar support in FastAPI Users.
diff --git a/databases/py-fastparquet/Makefile b/databases/py-fastparquet/Makefile
new file mode 100644
index 000000000000..3c5aeabe6268
--- /dev/null
+++ b/databases/py-fastparquet/Makefile
@@ -0,0 +1,31 @@
+PORTNAME=	fastparquet
+PORTVERSION=	2024.2.0
+CATEGORIES=	databases python
+MASTER_SITES=	PYPI
+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+
+MAINTAINER=	sunpoet@FreeBSD.org
+COMMENT=	Python support for Parquet file format
+WWW=		https://github.com/dask/fastparquet
+
+LICENSE=	APACHE20
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}numpy>=0,1:math/py-numpy@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}setuptools-scm>=1.5.4:devel/py-setuptools-scm@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR} \
+		thrift:devel/thrift
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cramjam>=2.3:archivers/py-cramjam@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}fsspec>=0:devel/py-fsspec@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}numpy>=1.20.3,1:math/py-numpy@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}packaging>=0:devel/py-packaging@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pandas>=1.5.0,1:math/py-pandas@${PY_FLAVOR}
+
+USES=		python
+USE_PYTHON=	autoplist concurrent cython pep517
+
+post-install:
+	${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR} -name '*.so' -exec ${STRIP_CMD} {} +
+
+.include <bsd.port.mk>
diff --git a/databases/py-fastparquet/distinfo b/databases/py-fastparquet/distinfo
new file mode 100644
index 000000000000..3b45f116da68
--- /dev/null
+++ b/databases/py-fastparquet/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1710712396
+SHA256 (fastparquet-2024.2.0.tar.gz) = 81a8f60c51793eb2436b4fdbbf115ff8578a4a457a179240bc08f9d9573d57a4
+SIZE (fastparquet-2024.2.0.tar.gz) = 465078
diff --git a/databases/py-fastparquet/files/patch-pyproject.toml b/databases/py-fastparquet/files/patch-pyproject.toml
new file mode 100644
index 000000000000..d5a65bd2f937
--- /dev/null
+++ b/databases/py-fastparquet/files/patch-pyproject.toml
@@ -0,0 +1,6 @@
+--- pyproject.toml.orig	2023-04-20 20:00:36 UTC
++++ pyproject.toml
+@@ -1,2 +1,2 @@
+ [build-system]
+-requires = ["setuptools", "wheel", "Cython >= 0.29.23", "oldest-supported-numpy", "pytest-runner"]
++requires = ["setuptools", "wheel", "Cython >= 0.29.23", "numpy"]
diff --git a/databases/py-fastparquet/files/patch-setup.py b/databases/py-fastparquet/files/patch-setup.py
new file mode 100644
index 000000000000..aa3535977588
--- /dev/null
+++ b/databases/py-fastparquet/files/patch-setup.py
@@ -0,0 +1,20 @@
+--- setup.py.orig	2022-11-18 01:33:09 UTC
++++ setup.py
+@@ -44,7 +44,6 @@ else:
+     extra = {'ext_modules': cythonize(modules, language_level=3)}
+ 
+ install_requires = open('requirements.txt').read().strip().split('\n')
+-subprocess.call(["git", "status"], stdout=sys.stdout, stderr=sys.stderr)
+ 
+ setup(
+     name='fastparquet',
+@@ -57,8 +56,7 @@ setup(
+         'setuptools>18.0',
+         'setuptools-scm>1.5.4',
+         'Cython',
+-        'pytest-runner',
+-        'oldest-supported-numpy'
++        'numpy'
+     ],
+     description='Python support for Parquet file format',
+     author='Martin Durant',
diff --git a/databases/py-fastparquet/pkg-descr b/databases/py-fastparquet/pkg-descr
new file mode 100644
index 000000000000..d8b5b47d5700
--- /dev/null
+++ b/databases/py-fastparquet/pkg-descr
@@ -0,0 +1,6 @@
+fastparquet is a python implementation of the parquet format, aiming integrate
+into python-based big data work-flows. It is used implicitly by the projects
+Dask, Pandas and intake-parquet.
+
+We offer a high degree of support for the features of the parquet format, and
+very competitive performance, in a small install size and codebase.
diff --git a/databases/py-fdb/Makefile b/databases/py-fdb/Makefile
index 7dc500277f8f..a8d3214ffcec 100644
--- a/databases/py-fdb/Makefile
+++ b/databases/py-fdb/Makefile
@@ -1,19 +1,18 @@
-# Created by: Jose Jachuf <jjachuf@gmail.com>
-
 PORTNAME=	fdb
 PORTVERSION=	2.0.1
-PORTREVISION=	1
+PORTREVISION=	3
 CATEGORIES=	databases python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	jjachuf@gmail.com
 COMMENT=	Firebird RDBMS bindings for Python
+WWW=		https://pythonhosted.org/fdb/
 
 LICENSE=	ISCL
 LICENSE_FILE=	${WRKSRC}/LICENSE.TXT
 
-USES=		firebird python:3.6+
+USES=		firebird python
 USE_PYTHON=	autoplist distutils
 
 NO_ARCH=	yes
diff --git a/databases/py-fdb/pkg-descr b/databases/py-fdb/pkg-descr
index d9c18bcc8876..61a4231aa282 100644
--- a/databases/py-fdb/pkg-descr
+++ b/databases/py-fdb/pkg-descr
@@ -1,5 +1,3 @@
 Firebird RDBMS bindings for Python.
 fdb package is a set of Firebird RDBMS bindings for python.
 It works on Python 2.6+ and Python 3.x
-
-WWW: https://pythonhosted.org/fdb/
diff --git a/databases/py-firebirdsql/Makefile b/databases/py-firebirdsql/Makefile
index 5610f55d0f75..47479f1f44f2 100644
--- a/databases/py-firebirdsql/Makefile
+++ b/databases/py-firebirdsql/Makefile
@@ -1,18 +1,17 @@
-# Created by: Jose Jachuf <jjachuf@gmail.com>
-
 PORTNAME=	firebirdsql
 DISTVERSION=	1.1.4
 CATEGORIES=	databases python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	jjachuf@gmail.com
 COMMENT=	Python DBAPI module for FirebirdSQL
+WWW=		https://github.com/nakagami/pyfirebirdsql
 
 LICENSE=	BSD2CLAUSE
 
 NO_ARCH=	yes
-USES=		python:3.6+
+USES=		python:3.8-3.9
 USE_PYTHON=	autoplist distutils
 
 .include <bsd.port.mk>
diff --git a/databases/py-firebirdsql/pkg-descr b/databases/py-firebirdsql/pkg-descr
index a5ad59284bfa..1ce4156a8425 100644
--- a/databases/py-firebirdsql/pkg-descr
+++ b/databases/py-firebirdsql/pkg-descr
@@ -1,5 +1,3 @@
 FirebirdSQL package is a set of Firebird RDBMS bindings for python.
 It works on Python 2.5+ (including Python 3.x).
 It was tested with cpython, jython, ironpython and pypy.
-
-WWW: https://github.com/nakagami/pyfirebirdsql
diff --git a/databases/py-flask-sqlalchemy/Makefile b/databases/py-flask-sqlalchemy/Makefile
index 6aace2837e12..c6bf5494d9e7 100644
--- a/databases/py-flask-sqlalchemy/Makefile
+++ b/databases/py-flask-sqlalchemy/Makefile
@@ -1,24 +1,27 @@
-# Created by: Olivier Duchateau <duchateau.olivier@gmail.com>
-
 PORTNAME=	flask-sqlalchemy
-PORTVERSION=	2.5.1
+PORTVERSION=	3.1.1
 CATEGORIES=	databases python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI \
+		https://github.com/pallets-eco/flask-sqlalchemy/releases/download/${PORTVERSION}/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
-DISTNAME=	Flask-SQLAlchemy-${PORTVERSION}
+DISTNAME=	flask_sqlalchemy-${PORTVERSION}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Add SQLAlchemy support to your Flask application
+WWW=		https://flask-sqlalchemy.palletsprojects.com/en/3.1.x/ \
+		https://github.com/pallets-eco/flask-sqlalchemy
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE.rst
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Flask>=0.10:www/py-flask@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}sqlalchemy12>=0.8:databases/py-sqlalchemy12@${PY_FLAVOR}
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}flit-core>=0<4:devel/py-flit-core@${PY_FLAVOR}
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}flask>=2.2.5:www/py-flask@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}sqlalchemy20>=2.0.16:databases/py-sqlalchemy20@${PY_FLAVOR}
 
-USES=		python:3.6+
-USE_PYTHON=	autoplist concurrent distutils
+USES=		python
+USE_PYTHON=	autoplist concurrent pep517 pytest
 
 NO_ARCH=	yes
+TEST_ENV=	PYTHONPATH=${STAGEDIR}${PYTHON_SITELIBDIR}
 
 .include <bsd.port.mk>
diff --git a/databases/py-flask-sqlalchemy/distinfo b/databases/py-flask-sqlalchemy/distinfo
index de44997cab45..fbb5e4bfd707 100644
--- a/databases/py-flask-sqlalchemy/distinfo
+++ b/databases/py-flask-sqlalchemy/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1618320096
-SHA256 (Flask-SQLAlchemy-2.5.1.tar.gz) = 2bda44b43e7cacb15d4e05ff3cc1f8bc97936cc464623424102bfc2c35e95912
-SIZE (Flask-SQLAlchemy-2.5.1.tar.gz) = 132750
+TIMESTAMP = 1708449094
+SHA256 (flask_sqlalchemy-3.1.1.tar.gz) = e4b68bb881802dda1a7d878b2fc84c06d1ee57fb40b874d3dc97dabfa36b8312
+SIZE (flask_sqlalchemy-3.1.1.tar.gz) = 81899
diff --git a/databases/py-flask-sqlalchemy/files/patch-pyproject.toml b/databases/py-flask-sqlalchemy/files/patch-pyproject.toml
new file mode 100644
index 000000000000..a7ef6ffd37fe
--- /dev/null
+++ b/databases/py-flask-sqlalchemy/files/patch-pyproject.toml
@@ -0,0 +1,9 @@
+--- pyproject.toml.orig	2023-09-11 21:34:49 UTC
++++ pyproject.toml
+@@ -1,5 +1,5 @@
+ [project]
+-name = "Flask-SQLAlchemy"
++name = "flask-sqlalchemy"
+ version = "3.1.1"
+ description = "Add SQLAlchemy support to your Flask application."
+ readme = "README.rst"
diff --git a/databases/py-flask-sqlalchemy/pkg-descr b/databases/py-flask-sqlalchemy/pkg-descr
index de3f3e419f36..c76a3179685a 100644
--- a/databases/py-flask-sqlalchemy/pkg-descr
+++ b/databases/py-flask-sqlalchemy/pkg-descr
@@ -1,3 +1 @@
 Flask-SQLAlchemy adds support for SQLAlchemy to your Flask application.
-
-WWW: https://github.com/pallets/flask-sqlalchemy
diff --git a/databases/py-flask-sqlalchemy30/Makefile b/databases/py-flask-sqlalchemy30/Makefile
new file mode 100644
index 000000000000..755a118c0d12
--- /dev/null
+++ b/databases/py-flask-sqlalchemy30/Makefile
@@ -0,0 +1,28 @@
+PORTNAME=	flask-sqlalchemy
+PORTVERSION=	3.0.3
+CATEGORIES=	databases python
+MASTER_SITES=	PYPI
+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+PKGNAMESUFFIX=	30
+DISTNAME=	Flask-SQLAlchemy-${PORTVERSION}
+
+MAINTAINER=	sunpoet@FreeBSD.org
+COMMENT=	Add SQLAlchemy support to your Flask application
+WWW=		https://github.com/pallets-eco/flask-sqlalchemy
+
+LICENSE=	BSD3CLAUSE
+LICENSE_FILE=	${WRKSRC}/LICENSE.rst
+
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pdm-pep517>=1.0.0:devel/py-pdm-pep517@${PY_FLAVOR}
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}flask>=2.2:www/py-flask@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}sqlalchemy14>=1.4.18:databases/py-sqlalchemy14@${PY_FLAVOR}
+
+USES=		python
+USE_PYTHON=	autoplist concurrent pep517
+
+NO_ARCH=	yes
+TEST_ENV=	PYTHONPATH=${STAGEDIR}${PYTHON_SITELIBDIR}
+
+PORTSCOUT=	limit:^3\.0\.
+
+.include <bsd.port.mk>
diff --git a/databases/py-flask-sqlalchemy30/distinfo b/databases/py-flask-sqlalchemy30/distinfo
new file mode 100644
index 000000000000..f3dd21ab424d
--- /dev/null
+++ b/databases/py-flask-sqlalchemy30/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1677771171
+SHA256 (Flask-SQLAlchemy-3.0.3.tar.gz) = 2764335f3c9d7ebdc9ed6044afaf98aae9fa50d7a074cef55dde307ec95903ec
+SIZE (Flask-SQLAlchemy-3.0.3.tar.gz) = 135538
diff --git a/databases/py-flask-sqlalchemy30/files/patch-pyproject.toml b/databases/py-flask-sqlalchemy30/files/patch-pyproject.toml
new file mode 100644
index 000000000000..a3d429149630
--- /dev/null
+++ b/databases/py-flask-sqlalchemy30/files/patch-pyproject.toml
@@ -0,0 +1,9 @@
+--- pyproject.toml.orig	2023-01-31 16:07:22 UTC
++++ pyproject.toml
+@@ -1,5 +1,5 @@
+ [project]
+-name = "Flask-SQLAlchemy"
++name = "flask-sqlalchemy"
+ description = "Add SQLAlchemy support to your Flask application."
+ readme = "README.rst"
+ authors = [
diff --git a/databases/py-flask-sqlalchemy30/pkg-descr b/databases/py-flask-sqlalchemy30/pkg-descr
new file mode 100644
index 000000000000..c76a3179685a
--- /dev/null
+++ b/databases/py-flask-sqlalchemy30/pkg-descr
@@ -0,0 +1 @@
+Flask-SQLAlchemy adds support for SQLAlchemy to your Flask application.
diff --git a/databases/py-gdbm/Makefile b/databases/py-gdbm/Makefile
index e7c6ac145091..17034fe06914 100644
--- a/databases/py-gdbm/Makefile
+++ b/databases/py-gdbm/Makefile
@@ -1,12 +1,11 @@
-# Created by: Thomas Gellekum <tg@FreeBSD.org>
-
 PORTNAME=	gdbm
 DISTVERSION=	${PYTHON_DISTVERSION}
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	databases python
 MASTER_SITES=	PYTHON/ftp/python/${DISTVERSION}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	Python-${DISTVERSION}
+DIST_SUBDIR=	python
 
 MAINTAINER=	python@FreeBSD.org
 COMMENT=	Python bindings to the GNU dbm library (Python ${PYTHON_VER})
@@ -15,18 +14,19 @@ LICENSE=	PSFL
 
 LIB_DEPENDS=	libgdbm.so:databases/gdbm
 
-PORTSCOUT=	ignore:1
-
-USES=		compiler:c11 python:3.6+ tar:xz
-USE_PYTHON=	distutils autoplist allflavors
+USES=		compiler:c11 python tar:xz
+USE_PYTHON=	allflavors autoplist distutils
 
+DISTINFO_FILE=	${.CURDIR}/../../lang/python${PYTHON_SUFFIX}/distinfo
 PYDISTUTILS_INSTALLARGS+=	--install-lib ${PYTHONPREFIX_LIBDIR}/lib-dynload
-
-DIST_SUBDIR=	python
-DISTINFO_FILE=	${PORTSDIR}/lang/python${PYTHON_SUFFIX}/distinfo
 WRKSRC_SUBDIR=	Modules
 
+PORTSCOUT=	ignore:1
+
 post-extract:
-	@${CP} ${FILESDIR}/setup3.py ${WRKSRC}/setup.py
+	@${CP} ${FILESDIR}/setup.py ${WRKSRC}/setup.py
+
+post-install:
+	${STRIP_CMD} ${STAGEDIR}${PYTHON_LIBDIR}/lib-dynload/_gdbm.cpython-${PYTHON_SUFFIX}.so
 
 .include <bsd.port.mk>
diff --git a/databases/py-gdbm/files/setup.py b/databases/py-gdbm/files/setup.py
index 9acb68c35da1..0a947466d03e 100644
--- a/databases/py-gdbm/files/setup.py
+++ b/databases/py-gdbm/files/setup.py
@@ -9,10 +9,9 @@ try:
     from distutils.command.install import install
     from distutils.core import setup, Extension
 except:
-    raise SystemExit, "Distutils problem"
+    raise SystemExit("Distutils problem")
 
-install.sub_commands = filter(lambda (cmd, avl): 'egg' not in cmd,
-                              install.sub_commands)
+install.sub_commands = [x for x in install.sub_commands if 'egg' not in x[0]]
 
 prefix = sysconfig.PREFIX
 inc_dirs = [prefix + "/include"]
@@ -22,7 +21,7 @@ libs = ["gdbm"]
 setup(name = "gdbm",
       description = "GDBM Extension to Python",
 
-      ext_modules = [Extension('gdbm', ['gdbmmodule.c'],
+      ext_modules = [Extension('_gdbm', ['_gdbmmodule.c'],
                                include_dirs = inc_dirs,
                                libraries = libs,
                                library_dirs = lib_dirs)]
diff --git a/databases/py-gdbm/files/setup3.py b/databases/py-gdbm/files/setup3.py
deleted file mode 100644
index 0a947466d03e..000000000000
--- a/databases/py-gdbm/files/setup3.py
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/usr/bin/env python
-# To use:
-#       python setup.py install
-#
-
-try:
-    import distutils
-    from distutils import sysconfig
-    from distutils.command.install import install
-    from distutils.core import setup, Extension
-except:
-    raise SystemExit("Distutils problem")
-
-install.sub_commands = [x for x in install.sub_commands if 'egg' not in x[0]]
-
-prefix = sysconfig.PREFIX
-inc_dirs = [prefix + "/include"]
-lib_dirs = [prefix + "/lib"]
-libs = ["gdbm"]
-
-setup(name = "gdbm",
-      description = "GDBM Extension to Python",
-
-      ext_modules = [Extension('_gdbm', ['_gdbmmodule.c'],
-                               include_dirs = inc_dirs,
-                               libraries = libs,
-                               library_dirs = lib_dirs)]
-      )
diff --git a/databases/py-geoalchemy2/Makefile b/databases/py-geoalchemy2/Makefile
index 9a77a0bba32c..4472d20331f6 100644
--- a/databases/py-geoalchemy2/Makefile
+++ b/databases/py-geoalchemy2/Makefile
@@ -1,24 +1,32 @@
-# Created by: Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>
-
 PORTNAME=	geoalchemy2
-PORTVERSION=	0.9.3
+PORTVERSION=	0.14.7
 CATEGORIES=	databases geography python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	GeoAlchemy2-${PORTVERSION}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Using SQLAlchemy with Spatial Databases
+WWW=		https://geoalchemy-2.readthedocs.io/en/stable/ \
+		https://github.com/geoalchemy/geoalchemy2
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYING.rst
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools_scm>=0:devel/py-setuptools_scm@${PY_FLAVOR}
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlalchemy14>=1.1:databases/py-sqlalchemy14@${PY_FLAVOR}
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools>=42:devel/py-setuptools@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}setuptools-scm>=3.4:devel/py-setuptools-scm@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR}
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}packaging>=0:devel/py-packaging@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}sqlalchemy14>=1.4:databases/py-sqlalchemy14@${PY_FLAVOR}
 
-USES=		python:3.6+
-USE_PYTHON=	autoplist concurrent distutils
+USES=		python
+USE_PYTHON=	autoplist concurrent pep517
 
 NO_ARCH=	yes
 
+OPTIONS_DEFINE=	SHAPELY
+SHAPELY_DESC=	Shapely integration
+
+SHAPELY_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}shapely>=1.7:devel/py-shapely@${PY_FLAVOR}
+
 .include <bsd.port.mk>
diff --git a/databases/py-geoalchemy2/distinfo b/databases/py-geoalchemy2/distinfo
index c547460b6add..872eaa9b25f5 100644
--- a/databases/py-geoalchemy2/distinfo
+++ b/databases/py-geoalchemy2/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1628103094
-SHA256 (GeoAlchemy2-0.9.3.tar.gz) = 56f969cf4ad6629ebcde73e807f7dac0a9375c79991b4f93efab191f37737a00
-SIZE (GeoAlchemy2-0.9.3.tar.gz) = 130261
+TIMESTAMP = 1712084480
+SHA256 (GeoAlchemy2-0.14.7.tar.gz) = 9ff731c4e5b955525cb128ee7173222365e7f084d4b99f6f68e491bac6b44d21
+SIZE (GeoAlchemy2-0.14.7.tar.gz) = 223148
diff --git a/databases/py-geoalchemy2/files/patch-setup.py b/databases/py-geoalchemy2/files/patch-setup.py
new file mode 100644
index 000000000000..2e2e4884c6d2
--- /dev/null
+++ b/databases/py-geoalchemy2/files/patch-setup.py
@@ -0,0 +1,11 @@
+--- setup.py.orig	2023-05-18 09:18:05 UTC
++++ setup.py
+@@ -2,7 +2,7 @@ from setuptools import find_namespace_packages
+ from setuptools import setup
+ 
+ setup(
+-    name="GeoAlchemy2",
++    name="geoalchemy2",
+     use_scm_version=True,
+     description="Using SQLAlchemy with Spatial Databases",
+     long_description=open("README.rst", encoding="utf-8").read(),
diff --git a/databases/py-geoalchemy2/pkg-descr b/databases/py-geoalchemy2/pkg-descr
index db1bb907e108..416c9b698326 100644
--- a/databases/py-geoalchemy2/pkg-descr
+++ b/databases/py-geoalchemy2/pkg-descr
@@ -2,5 +2,3 @@ GeoAlchemy 2 provides extensions to SQLAlchemy for working with spatial
 databases. GeoAlchemy 2 focuses on PostGIS. PostGIS 1.5 and PostGIS 2 are
 supported. GeoAlchemy 2 aims to be simpler than its predecessor, GeoAlchemy.
 Simpler to use, and simpler to maintain.
-
-WWW: https://github.com/geoalchemy/geoalchemy2
diff --git a/databases/py-hiredis/Makefile b/databases/py-hiredis/Makefile
index dca662751805..91b010f7c7bd 100644
--- a/databases/py-hiredis/Makefile
+++ b/databases/py-hiredis/Makefile
@@ -1,19 +1,18 @@
-# Created by: Denis Generalov <gd@rambler-co.ru>
-
 PORTNAME=	hiredis
-PORTVERSION=	0.2.0
+PORTVERSION=	2.0.0
 CATEGORIES=	databases python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	gd.workbox@gmail.com
 COMMENT=	Python extension that wraps hiredis
+WWW=		https://github.com/pietern/hiredis-py
 
 LICENSE=	BSD3CLAUSE
 
 LIB_DEPENDS=	libhiredis.so:databases/hiredis
 
-USES=		python:3.6+
+USES=		python
 USE_PYTHON=	distutils autoplist
 
 post-patch:
diff --git a/databases/py-hiredis/distinfo b/databases/py-hiredis/distinfo
index 819017feb32e..f8fd6ec61c8c 100644
--- a/databases/py-hiredis/distinfo
+++ b/databases/py-hiredis/distinfo
@@ -1,2 +1,3 @@
-SHA256 (hiredis-0.2.0.tar.gz) = ca958e13128e49674aa4a96f02746f5de5973f39b57297b84d59fd44d314d5b5
-SIZE (hiredis-0.2.0.tar.gz) = 46113
+TIMESTAMP = 1651161094
+SHA256 (hiredis-2.0.0.tar.gz) = 81d6d8e39695f2c37954d1011c0480ef7cf444d4e3ae24bc5e89ee5de360139a
+SIZE (hiredis-2.0.0.tar.gz) = 75807
diff --git a/databases/py-hiredis/files/patch-setup.py b/databases/py-hiredis/files/patch-setup.py
index 28a5f8da45e4..248919915e4a 100644
--- a/databases/py-hiredis/files/patch-setup.py
+++ b/databases/py-hiredis/files/patch-setup.py
@@ -1,21 +1,16 @@
---- setup.py.orig	2015-04-03 14:08:45 UTC
+--- setup.py.orig	2021-03-28 15:11:23 UTC
 +++ setup.py
-@@ -45,7 +45,9 @@ lib = ("hiredis_for_hiredis_py", {
+@@ -11,9 +11,10 @@ def version():
+   return module.__version__
  
  ext = Extension("hiredis.hiredis",
-   sources=glob.glob("src/*.c"),
+-  sources=sorted(glob.glob("src/*.c") +
+-                 ["vendor/hiredis/%s.c" % src for src in ("alloc", "read", "sds")]),
 -  include_dirs=["vendor"])
++  sources=sorted(glob.glob("src/*.c")),
 +  include_dirs=["%%LOCALBASE%%/include"],
 +  library_dirs=["%%LOCALBASE%%/lib"],
-+  libraries=["hiredis"],)
++  libraries=["hiredis"])
  
  setup(
    name="hiredis",
-@@ -57,7 +59,6 @@ setup(
-   keywords=["Redis"],
-   license="BSD",
-   packages=["hiredis"],
--  libraries=[lib],
-   ext_modules=[ext],
- 
-   # Override "install_lib" command
diff --git a/databases/py-hiredis/pkg-descr b/databases/py-hiredis/pkg-descr
index 58c2a0c11da2..3d9aea00518c 100644
--- a/databases/py-hiredis/pkg-descr
+++ b/databases/py-hiredis/pkg-descr
@@ -1,3 +1 @@
 Python extension that wraps hiredis.
-
-WWW: https://github.com/pietern/hiredis-py
diff --git a/databases/py-influxdb/Makefile b/databases/py-influxdb/Makefile
index b9301ff0ef48..3d6b9d4b1046 100644
--- a/databases/py-influxdb/Makefile
+++ b/databases/py-influxdb/Makefile
@@ -1,22 +1,23 @@
 PORTNAME=	influxdb
 PORTVERSION=	5.0.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	databases python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	vladimirv@ixsystems.com
 COMMENT=	Python Client for InfluxDB
+WWW=		https://github.com/influxdata/influxdb-python
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil@${PY_FLAVOR} \
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}python-dateutil>0:devel/py-python-dateutil@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR}
 
-USES=		python:3.6+
+USES=		python
 USE_PYTHON=	distutils concurrent autoplist
 NO_ARCH=	yes
 
diff --git a/databases/py-influxdb/pkg-descr b/databases/py-influxdb/pkg-descr
index b5e7478373ce..871918c63991 100644
--- a/databases/py-influxdb/pkg-descr
+++ b/databases/py-influxdb/pkg-descr
@@ -1,3 +1 @@
 InfluxDB-Python is a client for interacting with InfluxDB.
-
-WWW: https://github.com/influxdata/influxdb-python
diff --git a/databases/py-kyotocabinet/Makefile b/databases/py-kyotocabinet/Makefile
index bbb096afa05b..88e263383eb0 100644
--- a/databases/py-kyotocabinet/Makefile
+++ b/databases/py-kyotocabinet/Makefile
@@ -1,8 +1,7 @@
-# Created by: Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>
-
 PORTNAME=	kyotocabinet
 PORTVERSION=	1.23
 DISTVERSIONPREFIX=	python-
+PORTREVISION=	2
 CATEGORIES=	databases python
 MASTER_SITES=	https://dbmx.net/kyotocabinet/pythonpkg/ \
 		LOCAL/sunpoet
@@ -10,13 +9,19 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Python binding of kyotocabinet
+WWW=		https://dbmx.net/kyotocabinet/
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR}
 LIB_DEPENDS=	libkyotocabinet.so:databases/kyotocabinet
 
-USES=		python:3.4+
-USE_PYTHON=	autoplist concurrent distutils
+USES=		python
+USE_PYTHON=	autoplist concurrent pep517
+
+post-install:
+	${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR} -name '*.so' -exec ${STRIP_CMD} {} +
 
 .include <bsd.port.mk>
diff --git a/databases/py-kyotocabinet/files/patch-setup.py b/databases/py-kyotocabinet/files/patch-setup.py
new file mode 100644
index 000000000000..d50a2aa8a424
--- /dev/null
+++ b/databases/py-kyotocabinet/files/patch-setup.py
@@ -0,0 +1,13 @@
+--- setup.py.orig	2010-12-16 23:41:42 UTC
++++ setup.py
+@@ -1,8 +1,8 @@ from subprocess import *
+ from distutils.core import *
+ from subprocess import *
+ 
+-package_name = 'Kyoto Cabinet'
+-package_version = '1.5'
++package_name = 'kyotocabinet'
++package_version = '1.23'
+ package_description = 'a straightforward implementation of DBM'
+ package_author = 'FAL Labs'
+ package_author_email = 'info@fallabs.com'
diff --git a/databases/py-kyotocabinet/pkg-descr b/databases/py-kyotocabinet/pkg-descr
index 6ad2eb1a0dfb..70047cfaa2a8 100644
--- a/databases/py-kyotocabinet/pkg-descr
+++ b/databases/py-kyotocabinet/pkg-descr
@@ -1,3 +1 @@
 Python binding of kyotocabinet.
-
-WWW: https://dbmx.net/kyotocabinet/
diff --git a/databases/py-leveldb/Makefile b/databases/py-leveldb/Makefile
index 88601f8687fb..470beacfa752 100644
--- a/databases/py-leveldb/Makefile
+++ b/databases/py-leveldb/Makefile
@@ -1,27 +1,29 @@
-# Created by: Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>
-
 PORTNAME=	leveldb
 PORTVERSION=	0.201
+PORTREVISION=	1
 CATEGORIES=	databases python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Thread-safe Python binding for LevelDB
+WWW=		https://github.com/rjpower/py-leveldb
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR}
 LIB_DEPENDS=	libleveldb.so:databases/leveldb
 
-USES=		compiler:c11 localbase python:3.6+
-USE_PYTHON=	autoplist concurrent distutils
+USES=		compiler:c11 localbase python
+USE_PYTHON=	autoplist concurrent pep517
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' ${WRKSRC}/setup.py
 	@${RM} -r ${WRKSRC}/leveldb/ ${WRKSRC}/snappy/
 
 post-install:
-	${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/leveldb*.so
+	${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR} -name '*.so' -exec ${STRIP_CMD} {} +
 
 .include <bsd.port.mk>
diff --git a/databases/py-leveldb/pkg-descr b/databases/py-leveldb/pkg-descr
index 6f7805822c29..80d567dcc52f 100644
--- a/databases/py-leveldb/pkg-descr
+++ b/databases/py-leveldb/pkg-descr
@@ -3,6 +3,3 @@ from the LevelDB API, except for:
 - Arbitrary key comparison
 - Snapshots
 - All iteration except for single-step forward
-
-WWW: https://pypi.org/project/leveldb/
-WWW: https://github.com/rjpower/py-leveldb
diff --git a/databases/py-litecli/Makefile b/databases/py-litecli/Makefile
index 1884fafd4404..329c5390b4ed 100644
--- a/databases/py-litecli/Makefile
+++ b/databases/py-litecli/Makefile
@@ -1,26 +1,28 @@
-# Created by: Po-Chuan Hsieh <sunpoet@FreeBSD.org>
-
 PORTNAME=	litecli
-PORTVERSION=	1.6.0
+PORTVERSION=	1.10.1
 CATEGORIES=	databases python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	CLI for SQLite Databases with auto-completion and syntax highlighting
+WWW=		https://litecli.com/ \
+		https://github.com/dbcli/litecli
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cli-helpers>=1.0.1:devel/py-cli-helpers@${PY_FLAVOR} \
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR}
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cli-helpers>=2.2.1:devel/py-cli-helpers@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}click>=4.1:devel/py-click@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}configobj>=5.0.5:devel/py-configobj@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}prompt-toolkit>=3.0.3<4.0.0:devel/py-prompt-toolkit@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pygments>=1.6:textproc/py-pygments@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sqlparse>=0:databases/py-sqlparse@${PY_FLAVOR}
 
-USES=		python:3.6+
-USE_PYTHON=	autoplist concurrent distutils
+USES=		python
+USE_PYTHON=	autoplist concurrent pep517
 
 NO_ARCH=	yes
 
diff --git a/databases/py-litecli/distinfo b/databases/py-litecli/distinfo
index e1ea4daa0acb..e55d8b90e3c0 100644
--- a/databases/py-litecli/distinfo
+++ b/databases/py-litecli/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1618320100
-SHA256 (litecli-1.6.0.tar.gz) = 4d274e1475b4d3bb32384838830bc4a8388992b7cb8119aa8cffc7ffaa0167f9
-SIZE (litecli-1.6.0.tar.gz) = 56547
+TIMESTAMP = 1711466110
+SHA256 (litecli-1.10.1.tar.gz) = 37e6801f6be00d5d5853b8881db1ffdbbe9b0817c6c61bb2d9c7962f6cffa08f
+SIZE (litecli-1.10.1.tar.gz) = 60866
diff --git a/databases/py-litecli/pkg-descr b/databases/py-litecli/pkg-descr
index 13dfa3892e9d..a5d0aaac66a8 100644
--- a/databases/py-litecli/pkg-descr
+++ b/databases/py-litecli/pkg-descr
@@ -1,5 +1,2 @@
 LiteCLI is a command-line client for SQLite databases that has auto-completion
 and syntax highlighting.
-
-WWW: https://github.com/dbcli/litecli
-WWW: https://litecli.com/
diff --git a/databases/py-lmdb/Makefile b/databases/py-lmdb/Makefile
index 54a3a41f3ed4..2f15e7478f16 100644
--- a/databases/py-lmdb/Makefile
+++ b/databases/py-lmdb/Makefile
@@ -1,13 +1,12 @@
-# Created by: Keith Gaughan <k@sterechro.me>
-
 PORTNAME=	lmdb
 PORTVERSION=	0.97
 CATEGORIES=	databases python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	k@stereochro.me
 COMMENT=	Python bindings for LMDB
+WWW=		https://github.com/jnwatson/py-lmdb
 
 LICENSE=	OPENLDAP
 LICENSE_NAME=	OpenLDAP Public LIcense
@@ -18,7 +17,7 @@ BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cffi>0.8:devel/py-cffi@${PY_FLAVOR}
 LIB_DEPENDS=	liblmdb.so:databases/lmdb
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR}
 
-USES=		localbase python:3.6+
+USES=		localbase python
 USE_PYTHON=	autoplist distutils
 
 MAKE_ENV=	LMDB_FORCE_SYSTEM=1 \
diff --git a/databases/py-lmdb/pkg-descr b/databases/py-lmdb/pkg-descr
index 3ab4d51e882f..eed463146a0c 100644
--- a/databases/py-lmdb/pkg-descr
+++ b/databases/py-lmdb/pkg-descr
@@ -1,4 +1,2 @@
 This is a port of py-lmdb, which provides bindings for OpenLDAP's Lightning
 Memory-mapped Database (LMDB).
-
-WWW: https://github.com/jnwatson/py-lmdb
diff --git a/databases/py-marshmallow-sqlalchemy/Makefile b/databases/py-marshmallow-sqlalchemy/Makefile
index 77f8c9e0b1e7..27713bc7e725 100644
--- a/databases/py-marshmallow-sqlalchemy/Makefile
+++ b/databases/py-marshmallow-sqlalchemy/Makefile
@@ -1,28 +1,27 @@
-# Created by: Mark Felder <feld@FreeBSD.org>
-
 PORTNAME=	marshmallow-sqlalchemy
-PORTVERSION=	0.26.1
+PORTVERSION=	1.0.0
 CATEGORIES=	databases python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+DISTNAME=	marshmallow_sqlalchemy-${PORTVERSION}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	SQLAlchemy integration with the marshmallow serialization library
+WWW=		https://marshmallow-sqlalchemy.readthedocs.io/en/latest/ \
+		https://github.com/marshmallow-code/marshmallow-sqlalchemy
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}marshmallow>=3.0.0:devel/py-marshmallow@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}sqlalchemy12>=1.2.0:databases/py-sqlalchemy12@${PY_FLAVOR}
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}pytest-lazy-fixture>=0:devel/py-pytest-lazy-fixture@${PY_FLAVOR} \
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}flit-core>=0<4:devel/py-flit-core@${PY_FLAVOR}
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}marshmallow>=3.10.0:devel/py-marshmallow@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}sqlalchemy20>=1.4.40<3.0:databases/py-sqlalchemy20@${PY_FLAVOR}
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest-lazy-fixture>=0.6.2:devel/py-pytest-lazy-fixture@${PY_FLAVOR} \
 
-USES=		python:3.6+
-USE_PYTHON=	autoplist concurrent distutils
+USES=		python
+USE_PYTHON=	autoplist concurrent pep517 pytest
 
 NO_ARCH=	yes
-
-do-test:
-	cd ${WRKSRC} && ${SETENV} PYTHONPATH=${STAGEDIR}${PYTHON_SITELIBDIR} ${PYTHON_CMD} -m pytest -rs -v
+TEST_ENV=	PYTHONPATH=${STAGEDIR}${PYTHON_SITELIBDIR}
 
 .include <bsd.port.mk>
diff --git a/databases/py-marshmallow-sqlalchemy/distinfo b/databases/py-marshmallow-sqlalchemy/distinfo
index b6291d88f9f4..4bd0eb0b9da9 100644
--- a/databases/py-marshmallow-sqlalchemy/distinfo
+++ b/databases/py-marshmallow-sqlalchemy/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1622214046
-SHA256 (marshmallow-sqlalchemy-0.26.1.tar.gz) = d8525f74de51554b5c8491effe036f60629a426229befa33ff614c8569a16a73
-SIZE (marshmallow-sqlalchemy-0.26.1.tar.gz) = 49540
+TIMESTAMP = 1709390502
+SHA256 (marshmallow_sqlalchemy-1.0.0.tar.gz) = 20a0f2fcdd5bddc86444fa01461f17f9b6a12a8ddd4ca8c9b34fe2f2e35d00a2
+SIZE (marshmallow_sqlalchemy-1.0.0.tar.gz) = 49747
diff --git a/databases/py-marshmallow-sqlalchemy/pkg-descr b/databases/py-marshmallow-sqlalchemy/pkg-descr
index 5292f9cdc161..bf18b6d6eca1 100644
--- a/databases/py-marshmallow-sqlalchemy/pkg-descr
+++ b/databases/py-marshmallow-sqlalchemy/pkg-descr
@@ -1,3 +1 @@
 SQLAlchemy integration with the marshmallow (de)serialization library.
-
-WWW: https://github.com/marshmallow-code/marshmallow-sqlalchemy
diff --git a/databases/py-minidb/Makefile b/databases/py-minidb/Makefile
index bc0cbc1105ca..eeece23ef995 100644
--- a/databases/py-minidb/Makefile
+++ b/databases/py-minidb/Makefile
@@ -1,23 +1,22 @@
 PORTNAME=	minidb
-DISTVERSION=	2.0.4
+DISTVERSION=	2.0.7
 CATEGORIES=	databases python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	kai@FreeBSD.org
 COMMENT=	Simple SQLite3-based store for Python objects
+WWW=		https://github.com/thp/minidb
 
 LICENSE=	ISCL
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR}
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR}
 
-USES=		python:3.3+
-USE_PYTHON=	distutils autoplist
+USES=		python
+USE_PYTHON=	autoplist distutils pytest
 
-NO_ARCH=	yes
+TEST_ENV=	PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}
 
-do-test:
-	@cd ${WRKSRC} && ${PYTHON_CMD} -m pytest -v -rs
+NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/databases/py-minidb/distinfo b/databases/py-minidb/distinfo
index 56b8057f039f..eb6a9fbc1362 100644
--- a/databases/py-minidb/distinfo
+++ b/databases/py-minidb/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1588621078
-SHA256 (minidb-2.0.4.tar.gz) = c1c62be076a1e4bb9dd880504dd81a3e7e027b7657e8a54a83c5a2727f09520a
-SIZE (minidb-2.0.4.tar.gz) = 14104
+TIMESTAMP = 1671614230
+SHA256 (minidb-2.0.7.tar.gz) = 339fd231e3b34daecd3160946e0141585666ac57583882a14c4c69e597accca1
+SIZE (minidb-2.0.7.tar.gz) = 12282
diff --git a/databases/py-minidb/pkg-descr b/databases/py-minidb/pkg-descr
index ee2a23fcbab3..98728c309e26 100644
--- a/databases/py-minidb/pkg-descr
+++ b/databases/py-minidb/pkg-descr
@@ -1,4 +1,2 @@
 Provides easy storaging of Python objects in a SQLite 3 database and working
 with the data in an easy way with concise syntax.
-
-WWW: https://github.com/thp/minidb
diff --git a/databases/py-mongoengine/Makefile b/databases/py-mongoengine/Makefile
index 7dcf73e00ebf..629aeb662add 100644
--- a/databases/py-mongoengine/Makefile
+++ b/databases/py-mongoengine/Makefile
@@ -1,21 +1,21 @@
-# Created by: Mirko Zinn <mail@derzinn.de>
-
 PORTNAME=	mongoengine
-PORTVERSION=	0.20.0
+PORTVERSION=	0.28.2
 CATEGORIES=	databases python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	python@FreeBSD.org
 COMMENT=	Object-Document-Mapper for working with MongoDB
+WWW=		http://mongoengine.org/ \
+		https://github.com/MongoEngine/mongoengine
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pymongo>=3.4<4.0:databases/pymongo@${PY_FLAVOR}
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pymongo>=3.4<5.0:databases/py-pymongo@${PY_FLAVOR}
 
-USES=		python:3.5+
-USE_PYTHON=	autoplist distutils
+USES=		python
+USE_PYTHON=	autoplist concurrent distutils
 
 NO_ARCH=	yes
 
diff --git a/databases/py-mongoengine/distinfo b/databases/py-mongoengine/distinfo
index 8f8135f75029..a2943652dd0f 100644
--- a/databases/py-mongoengine/distinfo
+++ b/databases/py-mongoengine/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1588524861
-SHA256 (mongoengine-0.20.0.tar.gz) = db9e5d587e5d74e52851e0e4a53fd744725bfa9918ae6070139f5ba9c62c6edf
-SIZE (mongoengine-0.20.0.tar.gz) = 158735
+TIMESTAMP = 1710712800
+SHA256 (mongoengine-0.28.2.tar.gz) = 67c35a2ebe0ee7fd8eda3766dc251b9e0aada4489bb935f7a55b4c570d148ca7
+SIZE (mongoengine-0.28.2.tar.gz) = 169033
diff --git a/databases/py-mongoengine/pkg-descr b/databases/py-mongoengine/pkg-descr
index 625ff632a25e..30b361f37e99 100644
--- a/databases/py-mongoengine/pkg-descr
+++ b/databases/py-mongoengine/pkg-descr
@@ -1,5 +1,3 @@
 MongoEngine is an ORM-like layer on top of PyMongo. It allows you to define
 schemas for documents and query collections using syntax inspired by the
 Django ORM.
-
-WWW: http://mongoengine.org/
diff --git a/databases/py-motor/Makefile b/databases/py-motor/Makefile
index beb46ba86bcf..b876a2e4e752 100644
--- a/databases/py-motor/Makefile
+++ b/databases/py-motor/Makefile
@@ -1,19 +1,18 @@
-# Created by: Dmitry Sivachenko <mitya@yandex-team.ru>
-
 PORTNAME=	motor
 PORTVERSION=	1.0
 CATEGORIES=	databases python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	demon@FreeBSD.org
 COMMENT=	Non-blocking MongoDB driver for Tornado or asyncio
+WWW=		https://pypi.org/project/motor/
 
 LICENSE=	APACHE20
 
-RUN_DEPENDS=    ${PYTHON_PKGNAMEPREFIX}pymongo>=3.3:databases/pymongo@${PY_FLAVOR}
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pymongo>=3.3:databases/py-pymongo@${PY_FLAVOR}
 
-USES=		python:3.6+
+USES=		python
 USE_PYTHON=	distutils autoplist
 
 .include <bsd.port.mk>
diff --git a/databases/py-motor/files/patch-asyncio b/databases/py-motor/files/patch-asyncio
new file mode 100644
index 000000000000..fa2ae83652ad
--- /dev/null
+++ b/databases/py-motor/files/patch-asyncio
@@ -0,0 +1,16 @@
+The asyncio package has been included in the standard library since Python 3.4.
+
+--- motor/frameworks/asyncio/__init__.py.orig	2016-10-26 16:39:52 UTC
++++ motor/frameworks/asyncio/__init__.py
+@@ -25,10 +25,7 @@ import multiprocessing
+ import sys
+ from concurrent.futures import ThreadPoolExecutor
+ 
+-try:
+-    from asyncio import ensure_future
+-except ImportError:
+-    from asyncio import async as ensure_future
++from asyncio import ensure_future
+ 
+ CLASS_PREFIX = 'AsyncIO'
+ 
diff --git a/databases/py-motor/pkg-descr b/databases/py-motor/pkg-descr
index 70f520eeeae2..b5bd5dd261ea 100644
--- a/databases/py-motor/pkg-descr
+++ b/databases/py-motor/pkg-descr
@@ -1,4 +1,2 @@
 Motor presents a callback- or Future-based API for non-blocking access to
 MongoDB from Tornado or asyncio.
-
-WWW: https://pypi.org/project/motor/
diff --git a/databases/py-mycli/Makefile b/databases/py-mycli/Makefile
index 305456c296de..a138cf6d5f84 100644
--- a/databases/py-mycli/Makefile
+++ b/databases/py-mycli/Makefile
@@ -1,30 +1,44 @@
-# Created by: Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>
-
 PORTNAME=	mycli
-PORTVERSION=	1.23.2
+PORTVERSION=	1.27.2
+PORTREVISION=	1
 CATEGORIES=	databases python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	CLI for MySQL Database with auto-completion and syntax highlighting
+WWW=		https://www.mycli.net/ \
+		https://github.com/dbcli/mycli
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cli-helpers>=2.0.1:devel/py-cli-helpers@${PY_FLAVOR} \
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR}
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cli-helpers>=2.2.1:devel/py-cli-helpers@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}click>=7.0:devel/py-click@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}configobj>=5.0.5:devel/py-configobj@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}cryptography>=1.0.0:security/py-cryptography@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}prompt-toolkit>=3.0.6<4.0.0:devel/py-prompt-toolkit@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pyaes>=1.6.1:security/py-pyaes@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pygments>=1.6:textproc/py-pygments@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pymysql>=0.9.2:databases/py-pymysql@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyperclip>=1.7.0:devel/py-pyperclip@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}sqlparse>=0.3.0:databases/py-sqlparse@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}sqlglot>=5.1.3:databases/py-sqlglot@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}sqlparse>=0.3.0<0.6.0:databases/py-sqlparse@${PY_FLAVOR}
 
-USES=		mysql python:3.6+
-USE_PYTHON=	autoplist concurrent distutils
+USES=		mysql python
+USE_PYTHON=	autoplist concurrent cryptography pep517
 
 NO_ARCH=	yes
 
-.include <bsd.port.mk>
+OPTIONS_DEFINE=	SSH
+
+SSH_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}paramiko>=0:security/py-paramiko@${PY_FLAVOR}
+
+.include <bsd.port.pre.mk>
+
+.if ${PYTHON_REL} < 30900
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}importlib-resources>=5.0.0:devel/py-importlib-resources@${PY_FLAVOR}
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/databases/py-mycli/distinfo b/databases/py-mycli/distinfo
index 11c036c75acd..74b79a48da9e 100644
--- a/databases/py-mycli/distinfo
+++ b/databases/py-mycli/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1612519123
-SHA256 (mycli-1.23.2.tar.gz) = 6ae19b140bf02d1eda0c286181e3593d93cd189a3e6fd4384c50da3ab994db32
-SIZE (mycli-1.23.2.tar.gz) = 274481
+TIMESTAMP = 1712330581
+SHA256 (mycli-1.27.2.tar.gz) = d11da4e614640096ea8066443d75946f8f281714ca30a89065c91fdc5f950b72
+SIZE (mycli-1.27.2.tar.gz) = 286459
diff --git a/databases/py-mycli/files/patch-setup.py b/databases/py-mycli/files/patch-setup.py
index f5355401ddb9..a3e389a87a78 100644
--- a/databases/py-mycli/files/patch-setup.py
+++ b/databases/py-mycli/files/patch-setup.py
@@ -1,16 +1,16 @@
---- setup.py.orig	2021-01-07 01:54:09 UTC
+--- setup.py.orig	2024-03-29 05:11:01 UTC
 +++ setup.py
-@@ -21,11 +21,11 @@ install_requirements = [
-     'Pygments >= 1.6',
+@@ -24,11 +24,11 @@ install_requirements = [
+     'Pygments>=1.6',
      'prompt_toolkit>=3.0.6,<4.0.0',
      'PyMySQL >= 0.9.2',
--    'sqlparse>=0.3.0,<0.4.0',
-+    'sqlparse>=0.3.0',
+-    'sqlparse>=0.3.0,<0.5.0',
++    'sqlparse>=0.3.0,<0.6.0',
+     'sqlglot>=5.1.3',
      'configobj >= 5.0.5',
-     'cryptography >= 1.0.0',
-     'cli_helpers[styles] >= 2.0.1',
--    'pyperclip >= 1.8.1'
-+    'pyperclip >= 1.7.0'
+     'cli_helpers[styles] >= 2.2.1',
+-    'pyperclip >= 1.8.1',
++    'pyperclip >= 1.7.0',
+     'pyaes >= 1.6.1'
  ]
  
- 
diff --git a/databases/py-mycli/pkg-descr b/databases/py-mycli/pkg-descr
index ff81a4f495fe..5b9bbc145878 100644
--- a/databases/py-mycli/pkg-descr
+++ b/databases/py-mycli/pkg-descr
@@ -1,5 +1,2 @@
 mycli is a command line interface for MySQL, MariaDB, and Percona with
 auto-completion and syntax highlighting.
-
-WWW: https://www.mycli.net/
-WWW: https://github.com/dbcli/mycli
diff --git a/databases/py-mysql-connector-python/Makefile b/databases/py-mysql-connector-python/Makefile
index c5cab0e3f895..1fbc84c1a376 100644
--- a/databases/py-mysql-connector-python/Makefile
+++ b/databases/py-mysql-connector-python/Makefile
@@ -1,26 +1,45 @@
 PORTNAME=	mysql-connector-python
-PORTVERSION=	8.0.23
+PORTVERSION=	8.2.0
 CATEGORIES=	databases python
-MASTER_SITES=	MYSQL/Connector-Python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	MySQL driver written in Python
+WWW=		https://dev.mysql.com/doc/connector-python/en
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dnspython>0:dns/py-dnspython@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}protobuf>=3.7.1:devel/py-protobuf@${PY_FLAVOR}
+BUILD_DEPENDS=	${PY_SETUPTOOLS} \
+		${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR}
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}protobuf>=4.21.1:devel/py-protobuf@${PY_FLAVOR}
 
-USES=		python:3.6+
-USE_PYTHON=	autoplist distutils
+USES=		python
+USE_GITHUB=	yes
+GH_ACCOUNT=	mysql
+USE_PYTHON=	autoplist pep517
 
 NO_ARCH=	yes
-.include <bsd.port.pre.mk>
 
-PYDISTUTILS_INSTALLARGS:=	${PYDISTUTILS_INSTALLARGS:N--single-version-externally-managed}
+PORTSCOUT=	skipv:init
+
+OPTIONS_DEFINE=	COMPRESSION DNS GSSAPI
+
+COMPRESSION_DESC=	Compression Support
+DNS_DESC=		DNS Support
+
+COMPRESSION_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}lz4>=2.1.6:archivers/py-lz4@${PY_FLAVOR} \
+				${PYTHON_PKGNAMEPREFIX}zstandard>=0.12.0:archivers/py-zstandard@${PY_FLAVOR}
+DNS_RUN_DEPENDS=		${PYTHON_PKGNAMEPREFIX}dnspython>=1.16.0:dns/py-dnspython@${PY_FLAVOR}
+GSSAPI_RUN_DEPENDS=		${PYTHON_PKGNAMEPREFIX}gssapi>=1.6.9:security/py-gssapi@${PY_FLAVOR}
+
+post-patch:
+	@${REINPLACE_CMD} -e 's|"gcc"|"${CC}"|g ; \
+		s|"g++"|"${CXX}"|g' \
+		${WRKSRC}/cpydist/__init__.py
+	@${REINPLACE_CMD} -e 's|protobuf>=4.21.1,<=4.21.12|protobuf>=4.21.1|g' \
+		${WRKSRC}/setup.py
 
 do-test:
 	@(cd ${TEST_WRKSRC} && ${SETENV} ${TEST_ENV} ${PYTHON_CMD} ./unittests.py)
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/databases/py-mysql-connector-python/distinfo b/databases/py-mysql-connector-python/distinfo
index 4b6aa7cc7d2e..9e14729b57a9 100644
--- a/databases/py-mysql-connector-python/distinfo
+++ b/databases/py-mysql-connector-python/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1613071132
-SHA256 (mysql-connector-python-8.0.23.tar.gz) = 5e84dcc25d4b505118e0c28f07de496a41bc0ab121232a2aba83d0248cd49257
-SIZE (mysql-connector-python-8.0.23.tar.gz) = 12095843
+TIMESTAMP = 1698407657
+SHA256 (mysql-mysql-connector-python-8.2.0_GH0.tar.gz) = 29a7cb0b24a4f5ccda597c211254db8377493e95e36ca4ee05b15dba6e9c6e78
+SIZE (mysql-mysql-connector-python-8.2.0_GH0.tar.gz) = 15137061
diff --git a/databases/py-mysql-connector-python/pkg-descr b/databases/py-mysql-connector-python/pkg-descr
index aef91a9527b0..5ef650077635 100644
--- a/databases/py-mysql-connector-python/pkg-descr
+++ b/databases/py-mysql-connector-python/pkg-descr
@@ -1,4 +1,2 @@
 MySQL driver written in Python which does not depend on MySQL C client
 libraries and implements the DB API v2.0 specification (PEP-249).
-
-WWW: http://dev.mysql.com/doc/connector-python/en
diff --git a/databases/py-mysqlclient/Makefile b/databases/py-mysqlclient/Makefile
index 17461c0b73d9..0e89dd503d4d 100644
--- a/databases/py-mysqlclient/Makefile
+++ b/databases/py-mysqlclient/Makefile
@@ -1,21 +1,25 @@
 PORTNAME=	mysqlclient
-DISTVERSION=	2.0.3
+DISTVERSION=	2.2.1
 CATEGORIES=	databases python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	fluffy@FreeBSD.org
 COMMENT=	MySQL database connector for Python
+WWW=		https://pypi.org/project/mysqlclient
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-USES=		compiler:c11 iconv mysql python:3.6+ ssl
-USE_PYTHON=	autoplist concurrent distutils
+BUILD_DEPENDS=	${PY_SETUPTOOLS} \
+		${PYTHON_PKGNAMEPREFIX}wheel>=0.37:devel/py-wheel@${PY_FLAVOR}
+
+USES=		compiler:c11 dos2unix iconv mysql pkgconfig python ssl
+USE_PYTHON=	autoplist concurrent pep517
 
 PORTDOCS=	*
 
-CONFLICTS=	py*-MySQLdb-[0-9]* py*-MySQLdb5[0-9]-[0-9]* py*-MySQLdb
+CONFLICTS=	py*-MySQLdb py*-MySQLdb5[0-9] py*-MySQLdb
 
 OPTIONS_DEFINE=		DOCS
 
diff --git a/databases/py-mysqlclient/distinfo b/databases/py-mysqlclient/distinfo
index 4b2b6fe0cabe..62d1cf5eb845 100644
--- a/databases/py-mysqlclient/distinfo
+++ b/databases/py-mysqlclient/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1629115406
-SHA256 (mysqlclient-2.0.3.tar.gz) = f6ebea7c008f155baeefe16c56cd3ee6239f7a5a9ae42396c2f1860f08a7c432
-SIZE (mysqlclient-2.0.3.tar.gz) = 88886
+TIMESTAMP = 1703603120
+SHA256 (mysqlclient-2.2.1.tar.gz) = 2c7ad15b87293b12fd44b47c46879ec95ec647f4567e866ccd70b8337584e9b2
+SIZE (mysqlclient-2.2.1.tar.gz) = 89966
diff --git a/databases/py-mysqlclient/pkg-descr b/databases/py-mysqlclient/pkg-descr
index 88ff9792abc9..3ce21293dde5 100644
--- a/databases/py-mysqlclient/pkg-descr
+++ b/databases/py-mysqlclient/pkg-descr
@@ -1,3 +1 @@
 MySQL database connector for Python (with Python 3 support).
-
-WWW: https://pypi.org/project/mysqlclient
diff --git a/databases/py-ormar/Makefile b/databases/py-ormar/Makefile
new file mode 100644
index 000000000000..a46b4cfe354e
--- /dev/null
+++ b/databases/py-ormar/Makefile
@@ -0,0 +1,61 @@
+PORTNAME=	ormar
+DISTVERSION=	0.20.0
+CATEGORIES=	databases python
+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+
+MAINTAINER=	meka@tilda.center
+COMMENT=	Simple async ORM with fastapi in mind and pydantic validation
+WWW=		https://github.com/collerek/ormar
+
+LICENSE=	MIT
+LICENSE_FILE=	${WRKSRC}/LICENSE.md
+
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cryptography>=0:security/py-cryptography@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}databases>=0.3.2,<0.9.0:databases/py-databases@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pydantic-extra-types>=0:devel/py-pydantic-extra-types@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pydantic2>=0:devel/py-pydantic2@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}sqlalchemy14>=1.4.0:databases/py-sqlalchemy14@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}typing-extensions>=3.7:devel/py-typing-extensions@${PY_FLAVOR}
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}asgi-lifespan>=0:devel/py-asgi-lifespan@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}async_timeout>0:devel/py-async_timeout@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}asyncpg>=0:databases/py-asyncpg@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}fastapi>=0:www/py-fastapi@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}httpx>=0:www/py-httpx@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}nest-asyncio>=0:devel/py-nest-asyncio@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}poetry>=0:devel/py-poetry@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pymysql>=0:databases/py-pymysql@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pytest-asyncio>=0:devel/py-pytest-asyncio@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pytest-benchmark>=0:devel/py-pytest-benchmark@${PY_FLAVOR}
+
+USES=		python
+USE_GITHUB=	YES
+USE_PYTHON=	autoplist concurrent pep517 pytest
+GH_ACCOUNT=	collerek
+PEP517_BUILD_DEPEND=	${PYTHON_PKGNAMEPREFIX}poetry>=0:devel/py-poetry@${PY_FLAVOR}
+
+TEST_ENV=	PYTHONPATH=${WRKSRC}
+NO_ARCH=	yes
+PYTEST_BROKEN_TESTS=	test_read_main test_signal_functions \
+			test_multiple_signals test_static_methods_as_signals \
+			test_methods_as_signals test_multiple_senders_signal \
+			test_modifing_the_instance test_custom_signal \
+			test_relation_signal_functions
+
+OPTIONS_DEFINE=			CRYPTO
+OPTIONS_GROUP=			DATABASES
+OPTIONS_GROUP_DATABASES=	MYSQL PGSQL SQLITE
+OPTIONS_DEFAULT=		SQLITE
+DATABASES_DESC=			Database Support
+
+CRYPTO_DESC=		Support for password encryption
+CRYPTO_USE=		PYTHON=cryptography
+SQLITE_USES=		sqlite
+SQLITE_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}aiosqlite>0:databases/py-aiosqlite@${PY_FLAVOR}
+MYSQL_USES=		mysql
+MYSQL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}aiomysql>0:databases/py-aiomysql@${PY_FLAVOR} \
+			${PYTHON_PKGNAMEPREFIX}pymysql>0:databases/py-pymysql@${PY_FLAVOR}
+PGSQL_USES=		pgsql
+PGSQL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}asyncpg>0:databases/py-asyncpg@${PY_FLAVOR} \
+			${PYTHON_PKGNAMEPREFIX}psycopg2>0:databases/py-psycopg2@${PY_FLAVOR}
+
+.include <bsd.port.mk>
diff --git a/databases/py-ormar/distinfo b/databases/py-ormar/distinfo
new file mode 100644
index 000000000000..78d78505e3f9
--- /dev/null
+++ b/databases/py-ormar/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1710767351
+SHA256 (collerek-ormar-0.20.0_GH0.tar.gz) = 7e00fdefce42ebd19836599645f299fc75ab27ca0ad1f385b4007cd6aefac4c5
+SIZE (collerek-ormar-0.20.0_GH0.tar.gz) = 381644
diff --git a/databases/py-ormar/pkg-descr b/databases/py-ormar/pkg-descr
new file mode 100644
index 000000000000..fa3e4bd7e82a
--- /dev/null
+++ b/databases/py-ormar/pkg-descr
@@ -0,0 +1,11 @@
+The ormar package is an async mini ORM for Python, with support for Postgres,
+MySQL, and SQLite.
+
+The main benefit of using ormar are:
+* getting an async ORM that can be used with async frameworks (fastapi,
+  starlette etc.)
+* getting just one model to maintain - you don't have to maintain pydantic and
+  other orm model (sqlalchemy, peewee, gino etc.)
+
+The goal was to create a simple ORM that can be used directly (as request and
+response models) with fastapi that bases it's data validation on pydantic.
diff --git a/databases/py-partd/Makefile b/databases/py-partd/Makefile
index 0b6da6d16a5e..1238f5ea70e3 100644
--- a/databases/py-partd/Makefile
+++ b/databases/py-partd/Makefile
@@ -1,19 +1,22 @@
-# Created by: Po-Chuan Hsieh <sunpoet@FreeBSD.org>
-
 PORTNAME=	partd
-PORTVERSION=	1.2.0
+PORTVERSION=	1.4.1
+PORTREVISION=	1
 CATEGORIES=	databases python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Appendable key-value storage
+WWW=		https://github.com/dask/partd
 
 LICENSE=	BSD4CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-USES=		python:3.5+
-USE_PYTHON=	autoplist concurrent distutils
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR}
+
+USES=		python
+USE_PYTHON=	autoplist concurrent pep517
 
 NO_ARCH=	yes
 
diff --git a/databases/py-partd/distinfo b/databases/py-partd/distinfo
index 27d0232007dc..22bc05284d08 100644
--- a/databases/py-partd/distinfo
+++ b/databases/py-partd/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1619198467
-SHA256 (partd-1.2.0.tar.gz) = aa67897b84d522dcbc86a98b942afab8c6aa2f7f677d904a616b74ef5ddbc3eb
-SIZE (partd-1.2.0.tar.gz) = 36720
+TIMESTAMP = 1696001328
+SHA256 (partd-1.4.1.tar.gz) = 56c25dd49e6fea5727e731203c466c6e092f308d8f0024e199d02f6aa2167f67
+SIZE (partd-1.4.1.tar.gz) = 36272
diff --git a/databases/py-partd/pkg-descr b/databases/py-partd/pkg-descr
index 184a39e11dc2..b269ae1eba12 100644
--- a/databases/py-partd/pkg-descr
+++ b/databases/py-partd/pkg-descr
@@ -1,5 +1,3 @@
 PartD provides key-value byte store with appendable values. It stores key-value
 pairs. Values are raw bytes. We append on old values. PartD excels at shuffling
 operations.
-
-WWW: https://github.com/dask/partd
diff --git a/databases/py-peewee/Makefile b/databases/py-peewee/Makefile
index 77edb22e30cf..2929198bc1e6 100644
--- a/databases/py-peewee/Makefile
+++ b/databases/py-peewee/Makefile
@@ -1,13 +1,12 @@
-# Created by: Matthias Petermann <matthias@petermann-it.de>
-
 PORTNAME=	peewee
-DISTVERSION=	3.14.4
+DISTVERSION=	3.15.0
 CATEGORIES=	databases python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	matthias@petermann-it.de
 COMMENT=	Small, expressive Python ORM
+WWW=		https://peewee.readthedocs.org
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
@@ -15,7 +14,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 OPTIONS_DEFINE=		SQLITE PGSQL
 OPTIONS_DEFAULT=	SQLITE
 
-USES=			localbase:ldflags python:3.6+ sqlite
+USES=			localbase:ldflags python sqlite
 USE_PYTHON=		distutils cython autoplist concurrent
 
 SQLITE_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR}
diff --git a/databases/py-peewee/distinfo b/databases/py-peewee/distinfo
index 5cf6d8cea53a..a3eeb346e4d5 100644
--- a/databases/py-peewee/distinfo
+++ b/databases/py-peewee/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1622105258
-SHA256 (peewee-3.14.4.tar.gz) = 9e356b327c2eaec6dd42ecea6f4ddded025793dba906a3d065a0452e726c51a2
-SIZE (peewee-3.14.4.tar.gz) = 2292581
+TIMESTAMP = 1655506394
+SHA256 (peewee-3.15.0.tar.gz) = 48eac70be812ac84daa5400fb8e7b545e0c83adcfa05c8e2a8612f9ced4da495
+SIZE (peewee-3.15.0.tar.gz) = 859070
diff --git a/databases/py-peewee/pkg-descr b/databases/py-peewee/pkg-descr
index b7bc3d55611b..e864bba38f47 100644
--- a/databases/py-peewee/pkg-descr
+++ b/databases/py-peewee/pkg-descr
@@ -1,4 +1,2 @@
 Peewee is a small, expressive ORM written in Python. It supports
 PostgreSQL and SQLite.
-
-WWW: http://peewee.readthedocs.org
diff --git a/databases/py-peewee_migrate/Makefile b/databases/py-peewee_migrate/Makefile
index 3adffcb09ec3..19b4a691a6bd 100644
--- a/databases/py-peewee_migrate/Makefile
+++ b/databases/py-peewee_migrate/Makefile
@@ -1,34 +1,30 @@
 PORTNAME=	peewee_migrate
-PORTVERSION=	1.4.6
+DISTVERSION=	1.12.2
 CATEGORIES=	databases devel python
-MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	meka@tilda.center
 COMMENT=	Simple migration engine for Peewee
+WWW=		https://github.com/klen/peewee_migrate
 
 LICENSE=	BSD3CLAUSE
-LICENSE_FILE=	${WRKSRC}/LICENSE
 
-MY_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cached-property>=0:devel/py-cached-property@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}click>=0:devel/py-click@${PY_FLAVOR} \
+MY_DEPENDS=	${PYTHON_PKGNAMEPREFIX}click>=0:devel/py-click@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py-mock@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}peewee>=0:databases/py-peewee@${PY_FLAVOR}
-BUILD_DEPENDS=	${MY_DEPENDS}
+BUILD_DEPENDS=	${MY_DEPENDS} \
+		${PYTHON_PKGNAMEPREFIX}poetry-core>=1.0.0:devel/py-poetry-core@${PY_FLAVOR}
 RUN_DEPENDS=	${MY_DEPENDS}
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}psycopg2>=0:databases/py-psycopg2@${PY_FLAVOR}
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}psycopg2>=0:databases/py-psycopg2@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3@${PY_FLAVOR}
 
-USES=		python:3.6+
+USES=		python
 USE_GITHUB=	yes # tests not shipped with sdist
-USE_PYTHON=	autoplist concurrent distutils
-
 GH_ACCOUNT=	klen
+USE_PYTHON=	autoplist concurrent pep517 pytest
+
 TEST_ENV=	PYTHONPATH=${WRKSRC}/src
 
 NO_ARCH=	yes
 
-do-test:
-	cd ${WRKSRC} && ${SETENV} ${TEST_ENV} ${PYTHON_CMD} -m pytest -v -rs -o addopts=
-
 .include <bsd.port.mk>
diff --git a/databases/py-peewee_migrate/distinfo b/databases/py-peewee_migrate/distinfo
index b6f3b2fe8887..f563a1b3cc3d 100644
--- a/databases/py-peewee_migrate/distinfo
+++ b/databases/py-peewee_migrate/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1628788444
-SHA256 (klen-peewee_migrate-1.4.6_GH0.tar.gz) = 1f6899ed6379dd3d7618ad023f0610d67ab118a62acb1b358461f8be3bc40a39
-SIZE (klen-peewee_migrate-1.4.6_GH0.tar.gz) = 24678
+TIMESTAMP = 1693323480
+SHA256 (klen-peewee_migrate-1.12.2_GH0.tar.gz) = 84ed9e5b12bb381f7ebc6595bc787b6e9ab1a0f0aa65e0636e10737f69b2a1bd
+SIZE (klen-peewee_migrate-1.12.2_GH0.tar.gz) = 40738
diff --git a/databases/py-peewee_migrate/pkg-descr b/databases/py-peewee_migrate/pkg-descr
index 2a6adde0b695..caca05833c7c 100644
--- a/databases/py-peewee_migrate/pkg-descr
+++ b/databases/py-peewee_migrate/pkg-descr
@@ -1,3 +1,2 @@
-Simple migration engine for Peewee
-
-WWW: https://github.com/klen/peewee_migrate
+Simple migration engine and tools for SQL using Peewee with automatic field
+detection.
diff --git a/databases/py-pg8000-112/Makefile b/databases/py-pg8000-112/Makefile
deleted file mode 100644
index 825fc4e02efc..000000000000
--- a/databases/py-pg8000-112/Makefile
+++ /dev/null
@@ -1,22 +0,0 @@
-# Created by: Wen Heping <wenheping@gmail.com>
-
-PORTNAME=	pg8000
-PORTVERSION=	1.12.5
-CATEGORIES=	databases python
-MASTER_SITES=	CHEESESHOP
-PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
-PKGNAMESUFFIX=	-112
-
-MAINTAINER=	wen@FreeBSD.org
-COMMENT=	Pure-Python Interface to the PostgreSQL Database
-
-LICENSE=	BSD3CLAUSE
-
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${PY_FLAVOR}
-
-USES=		python:3.6+
-USE_PYTHON=	autoplist distutils
-
-NO_ARCH=	yes
-
-.include <bsd.port.mk>
diff --git a/databases/py-pg8000-112/distinfo b/databases/py-pg8000-112/distinfo
deleted file mode 100644
index 20692de7a133..000000000000
--- a/databases/py-pg8000-112/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1550111139
-SHA256 (pg8000-1.12.5.tar.gz) = 5d07ac0afc154897eaa2faff27b8f71e1d85719de5b92896cca33324a09d83f9
-SIZE (pg8000-1.12.5.tar.gz) = 55513
diff --git a/databases/py-pg8000-112/pkg-descr b/databases/py-pg8000-112/pkg-descr
deleted file mode 100644
index 97e2905eb32f..000000000000
--- a/databases/py-pg8000-112/pkg-descr
+++ /dev/null
@@ -1,9 +0,0 @@
-pg8000 is a Pure-Python interface to the PostgreSQL database
-engine. It is one of many PostgreSQL interfaces for the Python
-programming language. pg8000 is somewhat distinctive in that
-it is written entirely in Python and does not rely on any
-external libraries (such as a compiled python module, or
-PostgreSQL's libpq library). pg8000 supports the standard
-Python DB-API version 2.0.
-
-WWW: https://github.com/mfenniak/pg8000
diff --git a/databases/py-pg8000/Makefile b/databases/py-pg8000/Makefile
index ef749ece13e4..5b904e186318 100644
--- a/databases/py-pg8000/Makefile
+++ b/databases/py-pg8000/Makefile
@@ -1,21 +1,28 @@
-# Created by: Wen Heping <wenheping@gmail.com>
-
 PORTNAME=	pg8000
-PORTVERSION=	1.21.2
+PORTVERSION=	1.31.1
+PORTREVISION=	1
 CATEGORIES=	databases python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	wen@FreeBSD.org
 COMMENT=	Pure-Python Interface to the PostgreSQL Database
+WWW=		https://github.com/tlocke/pg8000
 
 LICENSE=	BSD3CLAUSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}passlib>=0:security/py-passlib@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}scramp>=0:security/py-scramp@${PY_FLAVOR}
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}hatch>=0:devel/py-hatch@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}versioningit>=3.1.0:devel/py-versioningit@${PY_FLAVOR}
+
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}python-dateutil>=2.8.2:devel/py-python-dateutil@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}scramp>=1.4.4:security/py-scramp@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}asn1crypto>=1.5.0:devel/py-asn1crypto@${PY_FLAVOR}
+
+USES=		python
+USE_PYTHON=	autoplist pep517
 
-USES=		python:3.6+
-USE_PYTHON=	autoplist distutils
+CONFLICTS_INSTALL=	${PYTHON_PKGNAMEPREFIX}pg8000-112 # lib/python3.8/site-packages/pg8000/__init__.py
 
 NO_ARCH=	yes
 
diff --git a/databases/py-pg8000/distinfo b/databases/py-pg8000/distinfo
index 7de7c4bfe334..a6e0c8a64231 100644
--- a/databases/py-pg8000/distinfo
+++ b/databases/py-pg8000/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1631758765
-SHA256 (pg8000-1.21.2.tar.gz) = 36a3b517408334967c1fa0d29656da03608d63122a372ec92c85f49aed2d24e3
-SIZE (pg8000-1.21.2.tar.gz) = 118673
+TIMESTAMP = 1712623264
+SHA256 (pg8000-1.31.1.tar.gz) = b11130d4c615dd3062ea8fed8143064a7978b7fe6d44f14b72261d43c8e27087
+SIZE (pg8000-1.31.1.tar.gz) = 112923
diff --git a/databases/py-pg8000/pkg-descr b/databases/py-pg8000/pkg-descr
index 90b6dd4f1af0..c2c0e91d3eb7 100644
--- a/databases/py-pg8000/pkg-descr
+++ b/databases/py-pg8000/pkg-descr
@@ -5,5 +5,3 @@ it is written entirely in Python and does not rely on any
 external libraries (such as a compiled python module, or
 PostgreSQL's libpq library). pg8000 supports the standard
 Python DB-API version 2.0.
-
-WWW: https://github.com/tlocke/pg8000
diff --git a/databases/py-pgcli/Makefile b/databases/py-pgcli/Makefile
index a51b5006df43..08afbb5a665b 100644
--- a/databases/py-pgcli/Makefile
+++ b/databases/py-pgcli/Makefile
@@ -1,42 +1,43 @@
-# Created by: Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>
-
 PORTNAME=	pgcli
-PORTVERSION=	3.1.0
+PORTVERSION=	4.0.1
+PORTREVISION=	2
 CATEGORIES=	databases python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	CLI for Postgres Database with auto-completion and syntax highlighting
+WWW=		https://www.pgcli.com/ \
+		https://github.com/dbcli/pgcli
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cli-helpers>=2.0.0:devel/py-cli-helpers@${PY_FLAVOR} \
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR}
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cli-helpers>=2.1.1:devel/py-cli-helpers@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}click>=4.1:devel/py-click@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}configobj>=5.0.6:devel/py-configobj@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pendulum>=2.1.0:devel/py-pendulum@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}pgspecial>=1.11.8:databases/py-pgspecial@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pgspecial>=2.0.0:databases/py-pgspecial@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}prompt-toolkit>=2.0.6<4.0.0:devel/py-prompt-toolkit@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}psycopg2>=2.8:databases/py-psycopg2@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}psycopg>=3.0.14:databases/py-psycopg@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pygments>=2.0:textproc/py-pygments@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}setproctitle>=1.1.9:devel/py-setproctitle@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}sqlparse>=0.3.0<0.5:databases/py-sqlparse@${PY_FLAVOR}
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>=2.7.0:devel/py-pytest@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}mock>=1.0.1:devel/py-mock@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}pexpect>=0:misc/py-pexpect@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}sqlparse>=0.3.0<0.6:databases/py-sqlparse@${PY_FLAVOR}
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mock>=1.0.1:devel/py-mock@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pexpect>=0:misc/py-pexpect@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}sshtunnel>=0:net/py-sshtunnel@${PY_FLAVOR}
 
-USES=		pgsql python:3.6+
-USE_PYTHON=	autoplist concurrent distutils
+USES=		pgsql python
+USE_PYTHON=	autoplist concurrent pep517 pytest
 
 NO_ARCH=	yes
+PYTEST_BROKEN_TESTS=	test_obfuscate_process_password
 
 OPTIONS_DEFINE=	KEYRING
 KEYRING_DESC=	keyring support
 
 KEYRING_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}keyring>=12.2.0,1:security/py-keyring@${PY_FLAVOR}
 
-do-test:
-	cd ${WRKSRC} && ${PYTHON_CMD} -m pytest -rs -v
-
 .include <bsd.port.mk>
diff --git a/databases/py-pgcli/distinfo b/databases/py-pgcli/distinfo
index be520ccffb7e..c090ff390c8b 100644
--- a/databases/py-pgcli/distinfo
+++ b/databases/py-pgcli/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1607879396
-SHA256 (pgcli-3.1.0.tar.gz) = d5b2d803f7e4e7fe679306a000bde5d14d15ec590ddd108f3dc4c0ecad169d2b
-SIZE (pgcli-3.1.0.tar.gz) = 121630
+TIMESTAMP = 1698848726
+SHA256 (pgcli-4.0.1.tar.gz) = f2feea2099ce1ad5e8a9d5d93b0edaf60dc61e97b21b75e91d9723939ce53bd2
+SIZE (pgcli-4.0.1.tar.gz) = 141846
diff --git a/databases/py-pgcli/files/patch-setup.py b/databases/py-pgcli/files/patch-setup.py
new file mode 100644
index 000000000000..7dbff68285bf
--- /dev/null
+++ b/databases/py-pgcli/files/patch-setup.py
@@ -0,0 +1,11 @@
+--- setup.py.orig	2023-10-29 23:11:56 UTC
++++ setup.py
+@@ -13,7 +13,7 @@ install_requirements = [
+     # see: https://github.com/dbcli/pgcli/pull/1197
+     "prompt_toolkit>=2.0.6,<4.0.0",
+     "psycopg >= 3.0.14",
+-    "sqlparse >=0.3.0,<0.5",
++    "sqlparse >=0.3.0,<0.6",
+     "configobj >= 5.0.6",
+     "pendulum>=2.1.0",
+     "cli_helpers[styles] >= 2.2.1",
diff --git a/databases/py-pgcli/pkg-descr b/databases/py-pgcli/pkg-descr
index 4d987e4a5c4a..3eca11a2e5ae 100644
--- a/databases/py-pgcli/pkg-descr
+++ b/databases/py-pgcli/pkg-descr
@@ -1,5 +1,2 @@
 pgcli is a command line interface for Postgres with auto-completion and syntax
 highlighting.
-
-WWW: https://www.pgcli.com/
-WWW: https://github.com/dbcli/pgcli
diff --git a/databases/py-pgdbconn/Makefile b/databases/py-pgdbconn/Makefile
index e155644375a0..bf3a688bf8d6 100644
--- a/databases/py-pgdbconn/Makefile
+++ b/databases/py-pgdbconn/Makefile
@@ -2,18 +2,19 @@ PORTNAME=	pgdbconn
 PORTVERSION=	0.8.0
 PORTREVISION=	2
 CATEGORIES=	databases python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	python@FreeBSD.org
 COMMENT=	Object-oriented layer to connect and interact with PostgreSQL databases
+WWW=		https://pypi.org/project/pgdbconn/
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}psycopg2>=2.5:databases/py-psycopg2@${PY_FLAVOR}
 
-USES=		python:3.6+
+USES=		python
 USE_PYTHON=	distutils autoplist
 
 .include <bsd.port.mk>
diff --git a/databases/py-pgdbconn/pkg-descr b/databases/py-pgdbconn/pkg-descr
index 6b663f2b0432..03cbbed51a39 100644
--- a/databases/py-pgdbconn/pkg-descr
+++ b/databases/py-pgdbconn/pkg-descr
@@ -2,5 +2,3 @@ PgDbConn is an offshoot from the Perseas project (started as Pyrseas) to
 isolate and generalize the Postgres database connection code so that it can be
 used in other Perseas products, such as a web application to update Postgres
 tables.
-
-WWW: https://pypi.org/project/pgdbconn/
diff --git a/databases/py-pglast/Makefile b/databases/py-pglast/Makefile
index 8bd3d66b1fbf..5513f52b58a3 100644
--- a/databases/py-pglast/Makefile
+++ b/databases/py-pglast/Makefile
@@ -1,21 +1,18 @@
-# Created by: Po-Chuan Hsieh <sunpoet@FreeBSD.org>
-
 PORTNAME=	pglast
-PORTVERSION=	1.2
+PORTVERSION=	5.8
 CATEGORIES=	databases python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	a.wolk@fudosecurity.com
 COMMENT=	PostgreSQL Languages AST and statements prettifier
+WWW=		https://github.com/lelit/pglast
 
 LICENSE=	GPLv3+
 
 BROKEN_riscv64=		fails to build: PostgreSQL does not have native spinlock support on this platform
-NOT_FOR_ARCHS=		aarch64 armv6 armv7
-NOT_FOR_ARCHS_REASON=	port/atomics/arch-<arch>.h: No such file or directory
 
-USES=		gmake python:3.4+
+USES=		gmake python
 USE_PYTHON=	autoplist distutils
 
 post-patch:
diff --git a/databases/py-pglast/distinfo b/databases/py-pglast/distinfo
index c86a4fb40f44..d4a26ce15abb 100644
--- a/databases/py-pglast/distinfo
+++ b/databases/py-pglast/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1551904223
-SHA256 (pglast-1.2.tar.gz) = e9d9026fc2ee86983a16679670bc85b6273d8266128185f90b7c84b3965bb1ee
-SIZE (pglast-1.2.tar.gz) = 1486757
+TIMESTAMP = 1705823669
+SHA256 (pglast-5.8.tar.gz) = fb7cac42e1ab007e7108129a3f44ff3cb7db98bbb188a1cf07eefa0f7d861bd1
+SIZE (pglast-5.8.tar.gz) = 3144521
diff --git a/databases/py-pglast/files/patch-src_postgres_include_port_atomics_arch-ppc.h b/databases/py-pglast/files/patch-src_postgres_include_port_atomics_arch-ppc.h
deleted file mode 100644
index 9ba30dc1eef3..000000000000
--- a/databases/py-pglast/files/patch-src_postgres_include_port_atomics_arch-ppc.h
+++ /dev/null
@@ -1,257 +0,0 @@
---- libpg_query/src/postgres/include/port/atomics/arch-ppc.h.orig	2020-12-28 19:58:43 UTC
-+++ libpg_query/src/postgres/include/port/atomics/arch-ppc.h
-@@ -0,0 +1,254 @@
-+/*-------------------------------------------------------------------------
-+ *
-+ * arch-ppc.h
-+ *	  Atomic operations considerations specific to PowerPC
-+ *
-+ * Portions Copyright (c) 1996-2020, PostgreSQL Global Development Group
-+ * Portions Copyright (c) 1994, Regents of the University of California
-+ *
-+ * NOTES:
-+ *
-+ * src/include/port/atomics/arch-ppc.h
-+ *
-+ *-------------------------------------------------------------------------
-+ */
-+
-+#if defined(__GNUC__)
-+
-+/*
-+ * lwsync orders loads with respect to each other, and similarly with stores.
-+ * But a load can be performed before a subsequent store, so sync must be used
-+ * for a full memory barrier.
-+ */
-+#define pg_memory_barrier_impl()	__asm__ __volatile__ ("sync" : : : "memory")
-+#define pg_read_barrier_impl()		__asm__ __volatile__ ("lwsync" : : : "memory")
-+#define pg_write_barrier_impl()		__asm__ __volatile__ ("lwsync" : : : "memory")
-+#endif
-+
-+#define PG_HAVE_ATOMIC_U32_SUPPORT
-+typedef struct pg_atomic_uint32
-+{
-+	volatile uint32 value;
-+} pg_atomic_uint32;
-+
-+/* 64bit atomics are only supported in 64bit mode */
-+#if SIZEOF_VOID_P >= 8
-+#define PG_HAVE_ATOMIC_U64_SUPPORT
-+typedef struct pg_atomic_uint64
-+{
-+	volatile uint64 value pg_attribute_aligned(8);
-+} pg_atomic_uint64;
-+
-+#endif
-+
-+/*
-+ * This mimics gcc __atomic_compare_exchange_n(..., __ATOMIC_SEQ_CST), but
-+ * code generation differs at the end.  __atomic_compare_exchange_n():
-+ *  100:	isync
-+ *  104:	mfcr    r3
-+ *  108:	rlwinm  r3,r3,3,31,31
-+ *  10c:	bne     120 <.eb+0x10>
-+ *  110:	clrldi  r3,r3,63
-+ *  114:	addi    r1,r1,112
-+ *  118:	blr
-+ *  11c:	nop
-+ *  120:	clrldi  r3,r3,63
-+ *  124:	stw     r9,0(r4)
-+ *  128:	addi    r1,r1,112
-+ *  12c:	blr
-+ *
-+ * This:
-+ *   f0:	isync
-+ *   f4:	mfcr    r9
-+ *   f8:	rldicl. r3,r9,35,63
-+ *   fc:	bne     104 <.eb>
-+ *  100:	stw     r10,0(r4)
-+ *  104:	addi    r1,r1,112
-+ *  108:	blr
-+ *
-+ * This implementation may or may not have materially different performance.
-+ * It's not exploiting the fact that cr0 still holds the relevant comparison
-+ * bits, set during the __asm__.  One could fix that by moving more code into
-+ * the __asm__.  (That would remove the freedom to eliminate dead stores when
-+ * the caller ignores "expected", but few callers do.)
-+ *
-+ * Recognizing constant "newval" would be superfluous, because there's no
-+ * immediate-operand version of stwcx.
-+ */
-+#define PG_HAVE_ATOMIC_COMPARE_EXCHANGE_U32
-+static inline bool
-+pg_atomic_compare_exchange_u32_impl(volatile pg_atomic_uint32 *ptr,
-+									uint32 *expected, uint32 newval)
-+{
-+	uint32 found;
-+	uint32 condition_register;
-+	bool ret;
-+
-+#ifdef HAVE_I_CONSTRAINT__BUILTIN_CONSTANT_P
-+	if (__builtin_constant_p(*expected) &&
-+		(int32) *expected <= PG_INT16_MAX &&
-+		(int32) *expected >= PG_INT16_MIN)
-+		__asm__ __volatile__(
-+			"	sync				\n"
-+			"	lwarx   %0,0,%5		\n"
-+			"	cmpwi   %0,%3		\n"
-+			"	bne     $+12		\n"		/* branch to isync */
-+			"	stwcx.  %4,0,%5		\n"
-+			"	bne     $-16		\n"		/* branch to lwarx */
-+			"	isync				\n"
-+			"	mfcr    %1          \n"
-+:			"=&r"(found), "=r"(condition_register), "+m"(ptr->value)
-+:			"i"(*expected), "r"(newval), "r"(&ptr->value)
-+:			"memory", "cc");
-+	else
-+#endif
-+		__asm__ __volatile__(
-+			"	sync				\n"
-+			"	lwarx   %0,0,%5		\n"
-+			"	cmpw    %0,%3		\n"
-+			"	bne     $+12		\n"		/* branch to isync */
-+			"	stwcx.  %4,0,%5		\n"
-+			"	bne     $-16		\n"		/* branch to lwarx */
-+			"	isync				\n"
-+			"	mfcr    %1          \n"
-+:			"=&r"(found), "=r"(condition_register), "+m"(ptr->value)
-+:			"r"(*expected), "r"(newval), "r"(&ptr->value)
-+:			"memory", "cc");
-+
-+	ret = (condition_register >> 29) & 1;	/* test eq bit of cr0 */
-+	if (!ret)
-+		*expected = found;
-+	return ret;
-+}
-+
-+/*
-+ * This mirrors gcc __sync_fetch_and_add().
-+ *
-+ * Like tas(), use constraint "=&b" to avoid allocating r0.
-+ */
-+#define PG_HAVE_ATOMIC_FETCH_ADD_U32
-+static inline uint32
-+pg_atomic_fetch_add_u32_impl(volatile pg_atomic_uint32 *ptr, int32 add_)
-+{
-+	uint32 _t;
-+	uint32 res;
-+
-+#ifdef HAVE_I_CONSTRAINT__BUILTIN_CONSTANT_P
-+	if (__builtin_constant_p(add_) &&
-+		add_ <= PG_INT16_MAX && add_ >= PG_INT16_MIN)
-+		__asm__ __volatile__(
-+			"	sync				\n"
-+			"	lwarx   %1,0,%4		\n"
-+			"	addi    %0,%1,%3	\n"
-+			"	stwcx.  %0,0,%4		\n"
-+			"	bne     $-12		\n"		/* branch to lwarx */
-+			"	isync				\n"
-+:			"=&r"(_t), "=&b"(res), "+m"(ptr->value)
-+:			"i"(add_), "r"(&ptr->value)
-+:			"memory", "cc");
-+	else
-+#endif
-+		__asm__ __volatile__(
-+			"	sync				\n"
-+			"	lwarx   %1,0,%4		\n"
-+			"	add     %0,%1,%3	\n"
-+			"	stwcx.  %0,0,%4		\n"
-+			"	bne     $-12		\n"		/* branch to lwarx */
-+			"	isync				\n"
-+:			"=&r"(_t), "=&r"(res), "+m"(ptr->value)
-+:			"r"(add_), "r"(&ptr->value)
-+:			"memory", "cc");
-+
-+	return res;
-+}
-+
-+#ifdef PG_HAVE_ATOMIC_U64_SUPPORT
-+
-+#define PG_HAVE_ATOMIC_COMPARE_EXCHANGE_U64
-+static inline bool
-+pg_atomic_compare_exchange_u64_impl(volatile pg_atomic_uint64 *ptr,
-+									uint64 *expected, uint64 newval)
-+{
-+	uint64 found;
-+	uint32 condition_register;
-+	bool ret;
-+
-+	/* Like u32, but s/lwarx/ldarx/; s/stwcx/stdcx/; s/cmpw/cmpd/ */
-+#ifdef HAVE_I_CONSTRAINT__BUILTIN_CONSTANT_P
-+	if (__builtin_constant_p(*expected) &&
-+		(int64) *expected <= PG_INT16_MAX &&
-+		(int64) *expected >= PG_INT16_MIN)
-+		__asm__ __volatile__(
-+			"	sync				\n"
-+			"	ldarx   %0,0,%5		\n"
-+			"	cmpdi   %0,%3		\n"
-+			"	bne     $+12		\n"		/* branch to isync */
-+			"	stdcx.  %4,0,%5		\n"
-+			"	bne     $-16		\n"		/* branch to ldarx */
-+			"	isync				\n"
-+			"	mfcr    %1          \n"
-+:			"=&r"(found), "=r"(condition_register), "+m"(ptr->value)
-+:			"i"(*expected), "r"(newval), "r"(&ptr->value)
-+:			"memory", "cc");
-+	else
-+#endif
-+		__asm__ __volatile__(
-+			"	sync				\n"
-+			"	ldarx   %0,0,%5		\n"
-+			"	cmpd    %0,%3		\n"
-+			"	bne     $+12		\n"		/* branch to isync */
-+			"	stdcx.  %4,0,%5		\n"
-+			"	bne     $-16		\n"		/* branch to ldarx */
-+			"	isync				\n"
-+			"	mfcr    %1          \n"
-+:			"=&r"(found), "=r"(condition_register), "+m"(ptr->value)
-+:			"r"(*expected), "r"(newval), "r"(&ptr->value)
-+:			"memory", "cc");
-+
-+	ret = (condition_register >> 29) & 1;	/* test eq bit of cr0 */
-+	if (!ret)
-+		*expected = found;
-+	return ret;
-+}
-+
-+#define PG_HAVE_ATOMIC_FETCH_ADD_U64
-+static inline uint64
-+pg_atomic_fetch_add_u64_impl(volatile pg_atomic_uint64 *ptr, int64 add_)
-+{
-+	uint64 _t;
-+	uint64 res;
-+
-+	/* Like u32, but s/lwarx/ldarx/; s/stwcx/stdcx/ */
-+#ifdef HAVE_I_CONSTRAINT__BUILTIN_CONSTANT_P
-+	if (__builtin_constant_p(add_) &&
-+		add_ <= PG_INT16_MAX && add_ >= PG_INT16_MIN)
-+		__asm__ __volatile__(
-+			"	sync				\n"
-+			"	ldarx   %1,0,%4		\n"
-+			"	addi    %0,%1,%3	\n"
-+			"	stdcx.  %0,0,%4		\n"
-+			"	bne     $-12		\n"		/* branch to ldarx */
-+			"	isync				\n"
-+:			"=&r"(_t), "=&b"(res), "+m"(ptr->value)
-+:			"i"(add_), "r"(&ptr->value)
-+:			"memory", "cc");
-+	else
-+#endif
-+		__asm__ __volatile__(
-+			"	sync				\n"
-+			"	ldarx   %1,0,%4		\n"
-+			"	add     %0,%1,%3	\n"
-+			"	stdcx.  %0,0,%4		\n"
-+			"	bne     $-12		\n"		/* branch to ldarx */
-+			"	isync				\n"
-+:			"=&r"(_t), "=&r"(res), "+m"(ptr->value)
-+:			"r"(add_), "r"(&ptr->value)
-+:			"memory", "cc");
-+
-+	return res;
-+}
-+
-+#endif /* PG_HAVE_ATOMIC_U64_SUPPORT */
-+
-+/* per architecture manual doubleword accesses have single copy atomicity */
-+#define PG_HAVE_8BYTE_SINGLE_COPY_ATOMICITY
diff --git a/databases/py-pglast/pkg-descr b/databases/py-pglast/pkg-descr
index a75d68fa617b..34c16a4c7ac4 100644
--- a/databases/py-pglast/pkg-descr
+++ b/databases/py-pglast/pkg-descr
@@ -3,5 +3,3 @@ PostgreSQL Languages AST and statements prettifier
 Exposes the parse tree of a PostgreSQL statement (extracted by the almost
 standard PG parser repackaged as a standalone static library by libpg_query)
 as set of interconnected nodes, usually called an abstract syntax tree.
-
-WWW: https://github.com/lelit/pglast
diff --git a/databases/py-pglite/Makefile b/databases/py-pglite/Makefile
index 58f63504c132..53ba7bef7abe 100644
--- a/databases/py-pglite/Makefile
+++ b/databases/py-pglite/Makefile
@@ -1,15 +1,16 @@
 PORTNAME=	pglite
 DISTVERSION=	1.0.13
 CATEGORIES=	databases python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	lbartoletti@FreeBSD.org
 COMMENT=	Light PostgreSQL: use PostgreSQL as a simple SQLite database
+WWW=		https://github.com/Oslandia/pglite
 
 LICENSE=	LGPL20+
 
-USES=		python:3.6+ pgsql
+USES=		python pgsql
 USE_PYTHON=	autoplist distutils
 NO_ARCH=	yes
 WANT_PGSQL=	server
diff --git a/databases/py-pglite/pkg-descr b/databases/py-pglite/pkg-descr
index 7922140ff4e2..bd75458348b9 100644
--- a/databases/py-pglite/pkg-descr
+++ b/databases/py-pglite/pkg-descr
@@ -4,5 +4,3 @@ simple SQLite database: no admin privileges, no configuration needed.
 It manages a "local" PostgreSQL cluster in user's home (~/.pglite)
 
 By default it opens a TCP port 55432 on localhost.
-
-WWW: https://github.com/Oslandia/pglite
diff --git a/databases/py-pgmigrate/Makefile b/databases/py-pgmigrate/Makefile
index 806e3fb25a73..70a93898a68b 100644
--- a/databases/py-pgmigrate/Makefile
+++ b/databases/py-pgmigrate/Makefile
@@ -1,19 +1,20 @@
 PORTNAME=	pgmigrate
-PORTVERSION=	1.0.6
+PORTVERSION=	1.0.8
 CATEGORIES=	databases python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	dmitry.wagin@ya.ru
 COMMENT=	PostgreSQL migrations made easy
+WWW=		https://github.com/yandex/pgmigrate
 
 LICENSE=	PostgreSQL
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}psycopg2>=2.8.2:databases/py-psycopg2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sqlparse>=0.3.0:databases/py-sqlparse@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}yaml>=5.3.1<6.0:devel/py-yaml@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}yaml>=5.2:devel/py-yaml@${PY_FLAVOR}
 
-USES=		python:3.6+
+USES=		python
 USE_GITHUB=	yes
 GH_ACCOUNT=	yandex
 USE_PYTHON=	autoplist concurrent distutils
diff --git a/databases/py-pgmigrate/distinfo b/databases/py-pgmigrate/distinfo
index b4b267712369..892c779dfb75 100644
--- a/databases/py-pgmigrate/distinfo
+++ b/databases/py-pgmigrate/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1614010295
-SHA256 (yandex-pgmigrate-1.0.6_GH0.tar.gz) = e8381ef62b22997abfe0240130ac56a720fed4e934408056320e535362d8e3d3
-SIZE (yandex-pgmigrate-1.0.6_GH0.tar.gz) = 26828
+TIMESTAMP = 1710627814
+SHA256 (yandex-pgmigrate-1.0.8_GH0.tar.gz) = d54679b5c7395d183c92d3a6f1a01186454768bb4c75385adc14fa9ef812afb5
+SIZE (yandex-pgmigrate-1.0.8_GH0.tar.gz) = 31152
diff --git a/databases/py-pgmigrate/pkg-descr b/databases/py-pgmigrate/pkg-descr
index 9932b01b823f..c29f4bf1d15e 100644
--- a/databases/py-pgmigrate/pkg-descr
+++ b/databases/py-pgmigrate/pkg-descr
@@ -1,3 +1 @@
 PGmigrate is a database migration tool developed by Yandex.
-
-WWW: https://github.com/yandex/pgmigrate
diff --git a/databases/py-pgspecial/Makefile b/databases/py-pgspecial/Makefile
index b6a15c743233..863b2f9d13ac 100644
--- a/databases/py-pgspecial/Makefile
+++ b/databases/py-pgspecial/Makefile
@@ -1,22 +1,24 @@
-# Created by: Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>
-
 PORTNAME=	pgspecial
-PORTVERSION=	1.13.0
+PORTVERSION=	2.1.1
 CATEGORIES=	databases python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Meta-commands handler for Postgres Database
+WWW=		https://github.com/dbcli/pgspecial
 
 LICENSE=	BSD3CLAUSE
+LICENSE_FILE=	${WRKSRC}/License.txt
 
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}click>=4.1:devel/py-click@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}psycopg2>=2.7.4:databases/py-psycopg2@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}psycopg>=3.0.10:databases/py-psycopg@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sqlparse>=0.1.19:databases/py-sqlparse@${PY_FLAVOR}
 
-USES=		python:3.6+
-USE_PYTHON=	autoplist concurrent distutils
+USES=		python
+USE_PYTHON=	autoplist concurrent pep517
 
 NO_ARCH=	yes
 
diff --git a/databases/py-pgspecial/distinfo b/databases/py-pgspecial/distinfo
index 52c2033c420b..36182329c15a 100644
--- a/databases/py-pgspecial/distinfo
+++ b/databases/py-pgspecial/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1621699703
-SHA256 (pgspecial-1.13.0.tar.gz) = 3847e205b19469f16ded05bda24b4758056d67ade4075a5ded4ce6628a9bad01
-SIZE (pgspecial-1.13.0.tar.gz) = 47855
+TIMESTAMP = 1698848728
+SHA256 (pgspecial-2.1.1.tar.gz) = a38239cd961fac33ce6da35c466d758acb6f942901598d7df74e5b82fe6f5636
+SIZE (pgspecial-2.1.1.tar.gz) = 51017
diff --git a/databases/py-pgspecial/pkg-descr b/databases/py-pgspecial/pkg-descr
index d861fc1db423..6777276ab47f 100644
--- a/databases/py-pgspecial/pkg-descr
+++ b/databases/py-pgspecial/pkg-descr
@@ -1,4 +1,2 @@
 This package provides an API to execute meta-commands (AKA "special", or
 "backslash commands") on PostgreSQL.
-
-WWW: https://github.com/dbcli/pgspecial
diff --git a/databases/py-pgspecial1/Makefile b/databases/py-pgspecial1/Makefile
new file mode 100644
index 000000000000..04dd342ee493
--- /dev/null
+++ b/databases/py-pgspecial1/Makefile
@@ -0,0 +1,29 @@
+PORTNAME=	pgspecial
+PORTVERSION=	1.13.1
+PORTREVISION=	1
+CATEGORIES=	databases python
+MASTER_SITES=	PYPI
+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+PKGNAMESUFFIX=	1
+
+MAINTAINER=	sunpoet@FreeBSD.org
+COMMENT=	Meta-commands handler for Postgres Database
+WWW=		https://github.com/dbcli/pgspecial
+
+LICENSE=	BSD3CLAUSE
+LICENSE_FILE=	${WRKSRC}/License.txt
+
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR}
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}click>=4.1:devel/py-click@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}psycopg2>=2.7.4:databases/py-psycopg2@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}sqlparse>=0.1.19:databases/py-sqlparse@${PY_FLAVOR}
+
+USES=		python
+USE_PYTHON=	autoplist concurrent pep517
+
+NO_ARCH=	yes
+
+PORTSCOUT=	limit:^1\.
+
+.include <bsd.port.mk>
diff --git a/databases/py-pgspecial1/distinfo b/databases/py-pgspecial1/distinfo
new file mode 100644
index 000000000000..e53bf912c541
--- /dev/null
+++ b/databases/py-pgspecial1/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1647264496
+SHA256 (pgspecial-1.13.1.tar.gz) = d5dab96690908275916dc2c622efae217f142e08165fa366949d41cbc5658701
+SIZE (pgspecial-1.13.1.tar.gz) = 49822
diff --git a/databases/py-pgspecial1/pkg-descr b/databases/py-pgspecial1/pkg-descr
new file mode 100644
index 000000000000..6777276ab47f
--- /dev/null
+++ b/databases/py-pgspecial1/pkg-descr
@@ -0,0 +1,2 @@
+This package provides an API to execute meta-commands (AKA "special", or
+"backslash commands") on PostgreSQL.
diff --git a/databases/py-pgxnclient/Makefile b/databases/py-pgxnclient/Makefile
index 555c32a303af..b24d944d5cdb 100644
--- a/databases/py-pgxnclient/Makefile
+++ b/databases/py-pgxnclient/Makefile
@@ -1,12 +1,12 @@
-# Created by: Li-Wen Hsu <lwhsu@FreeBSD.org>
-
 PORTNAME=	pgxnclient
-PORTVERSION=	1.3.1
+PORTVERSION=	1.3.2
+PORTREVISION=	1
 CATEGORIES=	databases python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 
 MAINTAINER=	lwhsu@FreeBSD.org
 COMMENT=	Command line tool to interact with the PostgreSQL Extension Network
+WWW=		https://pgxn.github.io/pgxnclient/
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYING
@@ -14,6 +14,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pip>0:devel/py-pip@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytest-runner>=0:devel/py-pytest-runner@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR}
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR}
 
 USES=		python shebangfix
 USE_PYTHON=	autoplist concurrent distutils optsuffix
diff --git a/databases/py-pgxnclient/distinfo b/databases/py-pgxnclient/distinfo
index e81cec5b5b3f..0692a8e63040 100644
--- a/databases/py-pgxnclient/distinfo
+++ b/databases/py-pgxnclient/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1627256012
-SHA256 (pgxnclient-1.3.1.tar.gz) = b1131862bb3e3d0201e2fe4d8140c493d3f0035819d7a3feeaa42d7b72e9ef45
-SIZE (pgxnclient-1.3.1.tar.gz) = 80554
+TIMESTAMP = 1633506334
+SHA256 (pgxnclient-1.3.2.tar.gz) = b0343e044b8d0044ff4be585ecce0147b1007db7ae8b12743bf222758a4ec7d9
+SIZE (pgxnclient-1.3.2.tar.gz) = 86146
diff --git a/databases/py-pgxnclient/pkg-descr b/databases/py-pgxnclient/pkg-descr
index 85f02e98e2b5..2a113df6990e 100644
--- a/databases/py-pgxnclient/pkg-descr
+++ b/databases/py-pgxnclient/pkg-descr
@@ -1,5 +1,3 @@
 The PGXN Client is a command line tool designed to interact with the
 PostgreSQL Extension Network allowing searching, compiling, installing,
 and removing extensions in PostgreSQL databases.
-
-WWW: https://pgxn.github.io/pgxnclient/
diff --git a/databases/py-pickledb/Makefile b/databases/py-pickledb/Makefile
index da1e3cf36c24..f7576b1d3d9e 100644
--- a/databases/py-pickledb/Makefile
+++ b/databases/py-pickledb/Makefile
@@ -1,20 +1,21 @@
-# Created by: Olivier Duchateau <duchateau.olivier@gmail.com>
-
-PORTNAME=	pickleDB
-PORTVERSION=	0.6.2
+PORTNAME=	pickledb
+PORTVERSION=	0.9.2
 CATEGORIES=	databases python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+DISTNAME=	pickleDB-${PORTVERSION}
 
 MAINTAINER=	python@FreeBSD.org
 COMMENT=	Lightweight, fast, and simple key-value store
+WWW=		https://github.com/patx/pickledb
 
 LICENSE=	BSD3CLAUSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}simplejson>=0:devel/py-simplejson@${PY_FLAVOR}
 
-USES=		python:3.6+
-USE_PYTHON=	autoplist distutils
+USES=		python
+USE_PYTHON=	autoplist concurrent distutils
+
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/databases/py-pickledb/distinfo b/databases/py-pickledb/distinfo
index bc9239ca0c04..87f4f1bbdd48 100644
--- a/databases/py-pickledb/distinfo
+++ b/databases/py-pickledb/distinfo
@@ -1,2 +1,3 @@
-SHA256 (pickleDB-0.6.2.tar.gz) = 0dc2f5fa0d5fad415aeafac25f3f4992a6d77e182087df6ea90e63b457c92cac
-SIZE (pickleDB-0.6.2.tar.gz) = 2958
+TIMESTAMP = 1660576932
+SHA256 (pickleDB-0.9.2.tar.gz) = ec6973e65d7d112849e78ce522840aa908efb2523470bb8ce5c7942310192240
+SIZE (pickleDB-0.9.2.tar.gz) = 3745
diff --git a/databases/py-pickledb/pkg-descr b/databases/py-pickledb/pkg-descr
index d6e81f9adba3..58a802041b08 100644
--- a/databases/py-pickledb/pkg-descr
+++ b/databases/py-pickledb/pkg-descr
@@ -1,5 +1,2 @@
 pickleDB is a lightweight, fast, and simple database based on Python's own
 json module.
-
-WWW: https://pypi.org/project/pickleDB/
-WWW: https://github.com/patx/pickledb
diff --git a/databases/py-pickleshare/Makefile b/databases/py-pickleshare/Makefile
index 0ab06aff2cea..d177e2ef1dd7 100644
--- a/databases/py-pickleshare/Makefile
+++ b/databases/py-pickleshare/Makefile
@@ -1,18 +1,17 @@
-# Created by: Yuri Victorovich <yuri@rawbw.com>
-
 PORTNAME=	pickleshare
 PORTVERSION=	0.7.5
 CATEGORIES=	databases python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Tiny shelve-like database with concurrency support
+WWW=		https://github.com/pickleshare/pickleshare
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-USES=		python:3.6+
+USES=		python
 USE_PYTHON=	distutils autoplist
 NO_ARCH=	yes
 
diff --git a/databases/py-pickleshare/pkg-descr b/databases/py-pickleshare/pkg-descr
index 9c488030fef6..9df67588052a 100644
--- a/databases/py-pickleshare/pkg-descr
+++ b/databases/py-pickleshare/pkg-descr
@@ -4,5 +4,3 @@ Like shelve, a PickleShareDB object acts like a normal dictionary.
 Unlike shelve, many processes can access the database simultaneously.
 Changing a value in database is immediately visible to other processes
 accessing the same database.
-
-WWW: https://github.com/pickleshare/pickleshare
diff --git a/databases/py-pony/Makefile b/databases/py-pony/Makefile
index 40d528cd0c7d..b1a388b3b762 100644
--- a/databases/py-pony/Makefile
+++ b/databases/py-pony/Makefile
@@ -1,18 +1,19 @@
 PORTNAME=	pony
-PORTVERSION=	0.7.14
+PORTVERSION=	0.7.17
 CATEGORIES=	databases devel python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	meka@tilda.center
 COMMENT=	Pony ORM is easy to use and powerful object-relational mapper
+WWW=		https://ponyorm.org/
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3@${PY_FLAVOR}
 
-USES=		python:3.5+
+USES=		python
 USE_PYTHON=	autoplist concurrent distutils
 
 TEST_ENV=	PYTHONPATH=${WRKSRC}/src
diff --git a/databases/py-pony/distinfo b/databases/py-pony/distinfo
index adda9301e902..56c9091392a1 100644
--- a/databases/py-pony/distinfo
+++ b/databases/py-pony/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1610007613
-SHA256 (pony-0.7.14.tar.gz) = 2f01e84e79ea7a14040225cb6c079bb266e7ba147346356c266490b18c77ce82
-SIZE (pony-0.7.14.tar.gz) = 290604
+TIMESTAMP = 1696586592
+SHA256 (pony-0.7.17.tar.gz) = b72172d57abd5e0846cd8d71231572da20f526327bf0d33348a9276f624d8aa7
+SIZE (pony-0.7.17.tar.gz) = 257961
diff --git a/databases/py-pony/pkg-descr b/databases/py-pony/pkg-descr
index 6dc6a7121393..78dd11cf1f72 100644
--- a/databases/py-pony/pkg-descr
+++ b/databases/py-pony/pkg-descr
@@ -2,5 +2,3 @@ Using Pony object-relational mapper you can concentrate on writing business
 logic of your application and use Python syntax for interacting with the
 database. Pony translates such queries into SQL and executes them in the
 database in the most efficient way.
-
-WWW: https://ponyorm.org/
diff --git a/databases/py-postgresql/Makefile b/databases/py-postgresql/Makefile
index d0369c68f9de..450162745b85 100644
--- a/databases/py-postgresql/Makefile
+++ b/databases/py-postgresql/Makefile
@@ -1,19 +1,24 @@
 PORTNAME=	postgresql
-PORTVERSION=	1.1.0
-PORTREVISION=	5
+PORTVERSION=	1.3.0
 CATEGORIES=	databases python
-MASTER_SITES=	CHEESESHOP \
-		http://python.projects.postgresql.org/files/
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	py-${PORTNAME}-${PORTVERSION}
 DIST_SUBDIR=	postgresql
 
-MAINTAINER=	c.kworr@gmail.com
+MAINTAINER=	arcade@b1t.name
 COMMENT=	Python 3 compatible PostgreSQL database driver and tools
+WWW=		https://github.com/python-postgres/fe
 
 LICENSE=	BSD3CLAUSE
 
-USES=		zip pgsql python:3.3+
+USES=		pgsql python
 USE_PYTHON=	distutils autoplist
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 ))
+CFLAGS+=	-Wno-error=int-conversion
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/databases/py-postgresql/distinfo b/databases/py-postgresql/distinfo
index ef7338bb8f50..75b600794bc4 100644
--- a/databases/py-postgresql/distinfo
+++ b/databases/py-postgresql/distinfo
@@ -1,2 +1,3 @@
-SHA256 (postgresql/py-postgresql-1.1.0.zip) = 4bae6e15bf0be03294240acc5b27f5aa2d9649188bc4528cd5b5512582e0ea93
-SIZE (postgresql/py-postgresql-1.1.0.zip) = 254537
+TIMESTAMP = 1676332838
+SHA256 (postgresql/py-postgresql-1.3.0.tar.gz) = fca0f04d3f7478bd59c29c051e979d75b54be01545bd619eba2a3ed322a32c6e
+SIZE (postgresql/py-postgresql-1.3.0.tar.gz) = 273764
diff --git a/databases/py-postgresql/pkg-descr b/databases/py-postgresql/pkg-descr
index d10539af00e4..ba1c80219944 100644
--- a/databases/py-postgresql/pkg-descr
+++ b/databases/py-postgresql/pkg-descr
@@ -18,5 +18,3 @@ objects that provide access to the elements within.
 "pg_python" Quick Console
 Get a Python console with a connection to PostgreSQL for quick tests and simple
 scripts.
-
-WWW: http://python.projects.postgresql.org/
diff --git a/databases/py-psycogreen/Makefile b/databases/py-psycogreen/Makefile
index b966fbfc4eee..4f3c7e0df5b5 100644
--- a/databases/py-psycogreen/Makefile
+++ b/databases/py-psycogreen/Makefile
@@ -1,13 +1,14 @@
 PORTNAME=	psycogreen
-PORTVERSION=	1.0
+PORTVERSION=	1.0.2
 CATEGORIES=	databases python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	loic.blot@unix-experience.fr
 COMMENT=	Python library to enable psycopg2 to work with coroutine libraries
+WWW=		https://bitbucket.org/dvarrazzo/psycogreen
 
-USES=		python:3.6+
+USES=		python
 USE_PYTHON=	distutils autoplist
 
 .include <bsd.port.mk>
diff --git a/databases/py-psycogreen/distinfo b/databases/py-psycogreen/distinfo
index 067d489fc6c8..0868158ac4fb 100644
--- a/databases/py-psycogreen/distinfo
+++ b/databases/py-psycogreen/distinfo
@@ -1,2 +1,3 @@
-SHA256 (psycogreen-1.0.tar.gz) = 9acfa6cb5373bcf1eaf27c904d98d59c9f3bb0065cbb005f83ccc45055ace9a1
-SIZE (psycogreen-1.0.tar.gz) = 5052
+TIMESTAMP = 1698310512
+SHA256 (psycogreen-1.0.2.tar.gz) = c429845a8a49cf2f76b71265008760bcd7c7c77d80b806db4dc81116dbcd130d
+SIZE (psycogreen-1.0.2.tar.gz) = 5411
diff --git a/databases/py-psycogreen/pkg-descr b/databases/py-psycogreen/pkg-descr
index 329c25e07285..4b0c97bc0338 100644
--- a/databases/py-psycogreen/pkg-descr
+++ b/databases/py-psycogreen/pkg-descr
@@ -1,5 +1,3 @@
 The psycogreen package enables psycopg2 to work with coroutine libraries,
 using asynchronous calls internally but offering a blocking interface so
 that regular code can run unmodified.
-
-WWW: https://bitbucket.org/dvarrazzo/psycogreen
diff --git a/databases/py-psycopg-c/Makefile b/databases/py-psycopg-c/Makefile
new file mode 100644
index 000000000000..124ebded1fcf
--- /dev/null
+++ b/databases/py-psycopg-c/Makefile
@@ -0,0 +1,25 @@
+PORTNAME=	psycopg-c
+PORTVERSION=	3.1.18
+CATEGORIES=	databases python
+MASTER_SITES=	PYPI
+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+
+MAINTAINER=	sunpoet@FreeBSD.org
+COMMENT=	PostgreSQL database adapter for Python - C optimization distribution
+WWW=		https://www.psycopg.org/psycopg3/ \
+		https://github.com/psycopg/psycopg/tree/master/psycopg_c
+
+LICENSE=	LGPL3
+LICENSE_FILE=	${WRKSRC}/LICENSE.txt
+
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools>=49.2.0:devel/py-setuptools@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}tomli>=2.0.1:textproc/py-tomli@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}wheel>=0.37:devel/py-wheel@${PY_FLAVOR}
+
+USES=		pgsql python
+USE_PYTHON=	autoplist concurrent cython pep517
+
+post-install:
+	${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR} -name '*.so' -exec ${STRIP_CMD} {} +
+
+.include <bsd.port.mk>
diff --git a/databases/py-psycopg-c/distinfo b/databases/py-psycopg-c/distinfo
new file mode 100644
index 000000000000..d6394255bd99
--- /dev/null
+++ b/databases/py-psycopg-c/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1708449102
+SHA256 (psycopg-c-3.1.18.tar.gz) = ffff0c4a9c0e0b7aadb1acb7b61eb8f886365dd8ef00120ce14676235846ba73
+SIZE (psycopg-c-3.1.18.tar.gz) = 561356
diff --git a/databases/py-psycopg-c/pkg-descr b/databases/py-psycopg-c/pkg-descr
new file mode 100644
index 000000000000..304f1b7fe017
--- /dev/null
+++ b/databases/py-psycopg-c/pkg-descr
@@ -0,0 +1,3 @@
+PostgreSQL database adapter for Python - optimization package
+
+Psycopg 3 is a modern implementation of a PostgreSQL adapter for Python.
diff --git a/databases/py-psycopg-pool/Makefile b/databases/py-psycopg-pool/Makefile
new file mode 100644
index 000000000000..5f8bbdc1dba0
--- /dev/null
+++ b/databases/py-psycopg-pool/Makefile
@@ -0,0 +1,24 @@
+PORTNAME=	psycopg-pool
+PORTVERSION=	3.2.1
+CATEGORIES=	databases python
+MASTER_SITES=	PYPI
+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+
+MAINTAINER=	sunpoet@FreeBSD.org
+COMMENT=	Connection Pool for Psycopg
+WWW=		https://www.psycopg.org/psycopg3/ \
+		https://github.com/psycopg/psycopg/tree/master/psycopg_pool
+
+LICENSE=	LGPL3
+LICENSE_FILE=	${WRKSRC}/LICENSE.txt
+
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools>=49.2.0:devel/py-setuptools@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}wheel>=0.37:devel/py-wheel@${PY_FLAVOR}
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}typing-extensions>=4.4:devel/py-typing-extensions@${PY_FLAVOR}
+
+USES=		python
+USE_PYTHON=	autoplist concurrent pep517
+
+NO_ARCH=	yes
+
+.include <bsd.port.mk>
diff --git a/databases/py-psycopg-pool/distinfo b/databases/py-psycopg-pool/distinfo
new file mode 100644
index 000000000000..44179745baa4
--- /dev/null
+++ b/databases/py-psycopg-pool/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1708449104
+SHA256 (psycopg-pool-3.2.1.tar.gz) = 6509a75c073590952915eddbba7ce8b8332a440a31e77bba69561483492829ad
+SIZE (psycopg-pool-3.2.1.tar.gz) = 29264
diff --git a/databases/py-psycopg-pool/pkg-descr b/databases/py-psycopg-pool/pkg-descr
new file mode 100644
index 000000000000..e71a66522da6
--- /dev/null
+++ b/databases/py-psycopg-pool/pkg-descr
@@ -0,0 +1,5 @@
+PostgreSQL database adapter for Python - Connection Pool
+
+This distribution contains the optional connection pool package psycopg_pool.
+This package is kept separate from the main psycopg package because it is likely
+that it will follow a different release cycle.
diff --git a/databases/py-psycopg/Makefile b/databases/py-psycopg/Makefile
new file mode 100644
index 000000000000..8c588b0d051b
--- /dev/null
+++ b/databases/py-psycopg/Makefile
@@ -0,0 +1,41 @@
+PORTNAME=	psycopg
+PORTVERSION=	3.1.18
+CATEGORIES=	databases python
+MASTER_SITES=	PYPI
+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+
+MAINTAINER=	sunpoet@FreeBSD.org
+COMMENT=	PostgreSQL database adapter for Python
+WWW=		https://www.psycopg.org/psycopg3/ \
+		https://github.com/psycopg/psycopg
+
+LICENSE=	LGPL3
+LICENSE_FILE=	${WRKSRC}/LICENSE.txt
+
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools>=49.2.0:devel/py-setuptools@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}wheel>=0.37:devel/py-wheel@${PY_FLAVOR}
+
+USES=		pgsql python
+USE_PYTHON=	autoplist concurrent pep517
+
+NO_ARCH=	yes
+
+OPTIONS_DEFINE=	C POOL
+OPTIONS_DEFAULT=C POOL
+C_DESC=		C extension support
+POOL_DESC=	Connection pool support
+
+C_RUN_DEPENDS=		${PYTHON_PKGNAMEPREFIX}psycopg-c>=${PORTVERSION}<${PORTVERSION}_99:databases/py-psycopg-c@${PY_FLAVOR}
+POOL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}psycopg-pool>=0:databases/py-psycopg-pool@${PY_FLAVOR}
+
+.include <bsd.port.pre.mk>
+
+.if ${PYTHON_REL} < 30900
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}backports.zoneinfo>=0.2.0:devel/py-backports.zoneinfo@${PY_FLAVOR}
+.endif
+
+.if ${PYTHON_REL} < 31100
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}typing-extensions>=4.1:devel/py-typing-extensions@${PY_FLAVOR}
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/databases/py-psycopg/distinfo b/databases/py-psycopg/distinfo
new file mode 100644
index 000000000000..ca2b5d3ae7d5
--- /dev/null
+++ b/databases/py-psycopg/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1708449100
+SHA256 (psycopg-3.1.18.tar.gz) = 31144d3fb4c17d78094d9e579826f047d4af1da6a10427d91dfcfb6ecdf6f12b
+SIZE (psycopg-3.1.18.tar.gz) = 145973
diff --git a/databases/py-psycopg/pkg-descr b/databases/py-psycopg/pkg-descr
new file mode 100644
index 000000000000..71f2c910757c
--- /dev/null
+++ b/databases/py-psycopg/pkg-descr
@@ -0,0 +1,3 @@
+PostgreSQL database adapter for Python
+
+Psycopg 3 is a modern implementation of a PostgreSQL adapter for Python.
diff --git a/databases/py-psycopg2/Makefile b/databases/py-psycopg2/Makefile
index ac2571607730..e531f74809c5 100644
--- a/databases/py-psycopg2/Makefile
+++ b/databases/py-psycopg2/Makefile
@@ -1,21 +1,25 @@
-# Created by: Martin Wilke <miwi@FreeBSD.org>
-
 PORTNAME=	psycopg2
-PORTVERSION=	2.9.1
+PORTVERSION=	2.9.9
+PORTREVISION=	1
 CATEGORIES=	databases python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	High performance Python adapter for PostgreSQL
+WWW=		https://www.psycopg.org/ \
+		https://github.com/psycopg/psycopg2
 
 LICENSE=	LGPL3
 LICENSE_FILE=	${WRKSRC}/doc/COPYING.LESSER
 
-USES=		pgsql python:3.6+
-USE_PYTHON=	autoplist concurrent distutils
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR}
+
+USES=		pgsql python
+USE_PYTHON=	autoplist concurrent pep517
 
 post-install:
-	${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/psycopg2/_psycopg*.so
+	${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR} -name '*.so' -exec ${STRIP_CMD} {} +
 
 .include <bsd.port.mk>
diff --git a/databases/py-psycopg2/distinfo b/databases/py-psycopg2/distinfo
index 600a465ccf83..77526a504395 100644
--- a/databases/py-psycopg2/distinfo
+++ b/databases/py-psycopg2/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1624189713
-SHA256 (psycopg2-2.9.1.tar.gz) = de5303a6f1d0a7a34b9d40e4d3bef684ccc44a49bbe3eb85e3c0bffb4a131b7c
-SIZE (psycopg2-2.9.1.tar.gz) = 379972
+TIMESTAMP = 1696432898
+SHA256 (psycopg2-2.9.9.tar.gz) = d1454bde93fb1e224166811694d600e746430c006fbb031ea06ecc2ea41bf156
+SIZE (psycopg2-2.9.9.tar.gz) = 384926
diff --git a/databases/py-psycopg2/pkg-descr b/databases/py-psycopg2/pkg-descr
index c876db6deb37..60a21ba272b6 100644
--- a/databases/py-psycopg2/pkg-descr
+++ b/databases/py-psycopg2/pkg-descr
@@ -10,6 +10,3 @@ database. Every time a new cursor is created, a new connection does not need to
 be opened; instead one of the unused connections from the pool is used. That
 makes psycopg very fast in typical client-server applications that create a
 servicing thread every time a client request arrives.
-
-WWW: http://initd.org/psycopg/
-WWW: https://github.com/psycopg/psycopg2
diff --git a/databases/py-psycopg2cffi/Makefile b/databases/py-psycopg2cffi/Makefile
index 80b4deff59fb..85bfd16e0a77 100644
--- a/databases/py-psycopg2cffi/Makefile
+++ b/databases/py-psycopg2cffi/Makefile
@@ -1,11 +1,12 @@
 PORTNAME=	psycopg2cffi
 DISTVERSION=	2.9.0
 CATEGORIES=	databases python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	jrm@FreeBSD.org
 COMMENT=	Implementation of the psycopg2 module using cffi
+WWW=		https://github.com/chtd/psycopg2cffi
 
 LICENSE=	LGPL3+
 LICENSE_FILE=	${WRKSRC}/LICENSE
@@ -13,7 +14,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cffi>0:devel/py-cffi@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cffi>0:devel/py-cffi@${PY_FLAVOR}
 
-USES=		pgsql python:3.6+
+USES=		pgsql python
 USE_PYTHON=	autoplist concurrent distutils
 
 post-install:
diff --git a/databases/py-psycopg2cffi/pkg-descr b/databases/py-psycopg2cffi/pkg-descr
index 3346ba258109..0960f27b89a4 100644
--- a/databases/py-psycopg2cffi/pkg-descr
+++ b/databases/py-psycopg2cffi/pkg-descr
@@ -1,5 +1,3 @@
 psycopg2cffi is an implementation of the psycopg2 module using cffi, the C
 Foreign Function Interface for Python.  psycopg2 is a PostgreSQL database
 adapter for the Python programming language.
-
-WWW: https://github.com/chtd/psycopg2cffi
diff --git a/databases/py-pum/Makefile b/databases/py-pum/Makefile
index f2edb48d291f..70a0983df4ff 100644
--- a/databases/py-pum/Makefile
+++ b/databases/py-pum/Makefile
@@ -1,18 +1,19 @@
 PORTNAME=	pum
 DISTVERSION=	0.9.14
 CATEGORIES=	databases python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	lbartoletti@FreeBSD.org
 COMMENT=	Postgres upgrade manager
+WWW=		https://github.com/opengisch/pum
 
 LICENSE=	GPLv2
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}psycopg2>=2.7.3:databases/py-psycopg2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR}
 
-USES=		python:3.4+
+USES=		python
 USE_PYTHON=	autoplist concurrent distutils
 
 NO_ARCH=	yes
diff --git a/databases/py-pum/pkg-descr b/databases/py-pum/pkg-descr
index 4324d2f084db..ff908b85b38c 100644
--- a/databases/py-pum/pkg-descr
+++ b/databases/py-pum/pkg-descr
@@ -13,5 +13,3 @@ Pum permits the followings operations on Postgres databases:
   - upgrade a database applying delta files
 
 and some other useful operations.
-
-WWW: https://github.com/opengisch/pum
diff --git a/databases/py-pyarrow/Makefile b/databases/py-pyarrow/Makefile
new file mode 100644
index 000000000000..554b0734500d
--- /dev/null
+++ b/databases/py-pyarrow/Makefile
@@ -0,0 +1,29 @@
+PORTNAME=	pyarrow
+PORTVERSION=	15.0.2
+CATEGORIES=	databases python
+MASTER_SITES=	PYPI
+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+
+MAINTAINER=	sunpoet@FreeBSD.org
+COMMENT=	Python library for Apache Arrow
+WWW=		https://arrow.apache.org/ \
+		https://github.com/apache/arrow/tree/main/python
+
+LICENSE=	APACHE20
+
+BUILD_DEPENDS=	arrow>=${PORTVERSION}<${PORTVERSION}_99:databases/arrow \
+		cmake:devel/cmake-core \
+		${PYTHON_PKGNAMEPREFIX}numpy>=0.14,1:math/py-numpy@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}setuptools>=40.1.0:devel/py-setuptools@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}setuptools-scm>=0:devel/py-setuptools-scm@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR}
+LIB_DEPENDS=	libarrow.so:databases/arrow
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}numpy>=1.16.6,1<2,1:math/py-numpy@${PY_FLAVOR}
+
+USES=		python
+USE_PYTHON=	autoplist concurrent cython pep517
+
+post-install:
+	${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR} -name '*.so' -exec ${STRIP_CMD} {} +
+
+.include <bsd.port.mk>
diff --git a/databases/py-pyarrow/distinfo b/databases/py-pyarrow/distinfo
new file mode 100644
index 000000000000..5d0227c493ba
--- /dev/null
+++ b/databases/py-pyarrow/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1711222294
+SHA256 (pyarrow-15.0.2.tar.gz) = 9c9bc803cb3b7bfacc1e96ffbfd923601065d9d3f911179d81e72d99fd74a3d9
+SIZE (pyarrow-15.0.2.tar.gz) = 1064226
diff --git a/databases/py-pyarrow/files/patch-pyproject.toml b/databases/py-pyarrow/files/patch-pyproject.toml
new file mode 100644
index 000000000000..8f3006b047e2
--- /dev/null
+++ b/databases/py-pyarrow/files/patch-pyproject.toml
@@ -0,0 +1,13 @@
+--- pyproject.toml.orig	2024-03-13 13:39:08 UTC
++++ pyproject.toml
+@@ -18,8 +18,8 @@ requires = [
+ [build-system]
+ requires = [
+     "cython >= 0.29.31",
+-    "oldest-supported-numpy>=0.14",
+-    "setuptools_scm < 8.0.0",
++    "numpy>=0.14",
++    "setuptools_scm",
+     "setuptools >= 40.1.0",
+     "wheel"
+ ]
diff --git a/databases/py-pyarrow/files/patch-setup.py b/databases/py-pyarrow/files/patch-setup.py
new file mode 100644
index 000000000000..4fbe0ee5b7c6
--- /dev/null
+++ b/databases/py-pyarrow/files/patch-setup.py
@@ -0,0 +1,11 @@
+--- setup.py.orig	2024-03-24 09:40:30 UTC
++++ setup.py
+@@ -492,7 +492,7 @@ setup(
+                                  'pyarrow/_generated_version.py'),
+         'version_scheme': guess_next_dev_version
+     },
+-    setup_requires=['setuptools_scm < 8.0.0', 'cython >= 0.29.31'] + setup_requires,
++    setup_requires=['setuptools_scm', 'cython >= 0.29.31'] + setup_requires,
+     install_requires=install_requires,
+     tests_require=['pytest', 'pandas', 'hypothesis'],
+     python_requires='>=3.8',
diff --git a/databases/py-pyarrow/pkg-descr b/databases/py-pyarrow/pkg-descr
new file mode 100644
index 000000000000..1bf07a7bd17e
--- /dev/null
+++ b/databases/py-pyarrow/pkg-descr
@@ -0,0 +1,3 @@
+Python library for Apache Arrow provides a Python API for functionality provided
+by the Arrow C++ libraries, along with tools for Arrow integration and
+interoperability with pandas, NumPy, and other software in the Python ecosystem.
diff --git a/databases/py-pycql/Makefile b/databases/py-pycql/Makefile
index fa79e25bd238..c70c8e9628ad 100644
--- a/databases/py-pycql/Makefile
+++ b/databases/py-pycql/Makefile
@@ -1,22 +1,24 @@
-# Created by: Po-Chuan Hsieh <sunpoet@FreeBSD.org>
-
 PORTNAME=	pycql
 PORTVERSION=	0.0.12
+PORTREVISION=	1
 CATEGORIES=	databases python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Pure Python parser implementation of the OGC CQL standard
+WWW=		https://github.com/geopython/pycql
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dateparser>=0:devel/py-dateparser@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}ply>=0:devel/py-ply@${PY_FLAVOR}
 
-USES=		python:3.5+
-USE_PYTHON=	autoplist concurrent distutils
+USES=		python
+USE_PYTHON=	autoplist concurrent pep517
 
 NO_ARCH=	yes
 
diff --git a/databases/py-pycql/pkg-descr b/databases/py-pycql/pkg-descr
index 17af61be9a49..01117dd9c193 100644
--- a/databases/py-pycql/pkg-descr
+++ b/databases/py-pycql/pkg-descr
@@ -1,3 +1 @@
 pycql is a pure Python CQL parser.
-
-WWW: https://github.com/geopython/pycql
diff --git a/databases/py-pylibmc/Makefile b/databases/py-pylibmc/Makefile
index 7a38284f4b8c..29f624b8f713 100644
--- a/databases/py-pylibmc/Makefile
+++ b/databases/py-pylibmc/Makefile
@@ -1,23 +1,21 @@
-# Created by: Gea-Suan Lin <gslin@gslin.org>
-
 PORTNAME=	pylibmc
-PORTVERSION=	1.6.0
+PORTVERSION=	1.6.3
 CATEGORIES=	databases python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
-MAINTAINER=	koobs@FreeBSD.org
+MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	Quick and small memcached client for Python
+WWW=		https://sendapatch.se/projects/pylibmc
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libmemcached.so:databases/libmemcached
-TEST_DEPENDS=	memcached:databases/memcached \
-		${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${PY_FLAVOR}
+TEST_DEPENDS=	memcached:databases/memcached
 
-USES=		python:3.6+
-USE_PYTHON=	autoplist distutils
+USES=		python
+USE_PYTHON=	autoplist distutils nose
 
 MAKE_ENV+=	LIBMEMCACHED="${LOCALBASE}"
 
@@ -25,8 +23,6 @@ post-install:
 	${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/_pylibmc*.so
 
 # Note: memcached needs to be running first for this to work
-
-do-test:
-	@cd ${WRKSRC} && ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test
+#do-test:
 
 .include <bsd.port.mk>
diff --git a/databases/py-pylibmc/distinfo b/databases/py-pylibmc/distinfo
index 8cb8f7545d9b..4aa21f399dfd 100644
--- a/databases/py-pylibmc/distinfo
+++ b/databases/py-pylibmc/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1555754813
-SHA256 (pylibmc-1.6.0.tar.gz) = 5ef97be4ca5527d5b87dbe77cfdd94b427028caf4136feff7da23c40e1ded6d8
-SIZE (pylibmc-1.6.0.tar.gz) = 65925
+TIMESTAMP = 1662314766
+SHA256 (pylibmc-1.6.3.tar.gz) = eefa46115537abad65fbe2e032acd1b3463d9bf9e335af4b0916df4e4d3206e0
+SIZE (pylibmc-1.6.3.tar.gz) = 63224
diff --git a/databases/py-pylibmc/files/patch-setup.py b/databases/py-pylibmc/files/patch-setup.py
index d3170b4f5a1b..b19bf43ae8e4 100644
--- a/databases/py-pylibmc/files/patch-setup.py
+++ b/databases/py-pylibmc/files/patch-setup.py
@@ -1,8 +1,8 @@
---- setup.py.orig	2016-08-09 16:06:26 UTC
+--- setup.py.orig	2022-08-06 21:23:04 UTC
 +++ setup.py
 @@ -123,4 +123,5 @@ setup(
-         'Programming Language :: Python :: 3.4',
-         'Programming Language :: Python :: 3.5',
+         'Programming Language :: Python :: 3.10',
+         'Programming Language :: Python :: 3 :: Only',
      ],
 +    test_suite = 'nose.collector'
  )
diff --git a/databases/py-pylibmc/pkg-descr b/databases/py-pylibmc/pkg-descr
index 55968e713b11..fbe5912d164f 100644
--- a/databases/py-pylibmc/pkg-descr
+++ b/databases/py-pylibmc/pkg-descr
@@ -7,5 +7,3 @@ so that applications can drop-in replace it.
 pylibmc leverages among other things configurable behaviors, data pickling,
 data compression, battle-tested GIL retention, consistent distribution, and
 the binary memcached protocol.
-
-WWW: http://sendapatch.se/projects/pylibmc
diff --git a/databases/py-pymemcache/Makefile b/databases/py-pymemcache/Makefile
index d57e6158de65..db82df01fb00 100644
--- a/databases/py-pymemcache/Makefile
+++ b/databases/py-pymemcache/Makefile
@@ -1,20 +1,26 @@
-# Created by: Alessando Sagratini <ale_sagra@hotmail.com>
-
 PORTNAME=	pymemcache
-PORTVERSION=	3.5.0
+PORTVERSION=	4.0.0
 CATEGORIES=	databases python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	ale_sagra@hotmail.com
 COMMENT=	Comprehensive, fast, pure-Python memcached client
+WWW=		https://github.com/pinterest/pymemcache
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR}
-
-USES=		python:3.6+
+TEST_DEPENDS=   ${PYTHON_PKGNAMEPREFIX}Faker>0:devel/py-Faker@${PY_FLAVOR} \
+                ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \
+                ${PYTHON_PKGNAMEPREFIX}pytest-cov>0:devel/py-pytest-cov@${PY_FLAVOR} \
+                ${PYTHON_PKGNAMEPREFIX}gevent>0:devel/py-gevent@${PY_FLAVOR} \
+                ${PYTHON_PKGNAMEPREFIX}pylibmc>0:databases/py-pylibmc@${PY_FLAVOR} \
+                ${PYTHON_PKGNAMEPREFIX}python-memcached>0:databases/py-python-memcached@${PY_FLAVOR} \
+                ${PYTHON_PKGNAMEPREFIX}zstd>0:archivers/py-zstd@${PY_FLAVOR}
+
+USES=		python
 USE_PYTHON=	autoplist concurrent distutils
 
 NO_ARCH=	yes
diff --git a/databases/py-pymemcache/distinfo b/databases/py-pymemcache/distinfo
index 9535f429c5ec..943ce1038b58 100644
--- a/databases/py-pymemcache/distinfo
+++ b/databases/py-pymemcache/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1626227445
-SHA256 (pymemcache-3.5.0.tar.gz) = 5bf9c94a6bc9ad081dc9b5808284e027d755a0518f6375a57405552938c74d91
-SIZE (pymemcache-3.5.0.tar.gz) = 64763
+TIMESTAMP = 1666026624
+SHA256 (pymemcache-4.0.0.tar.gz) = 27bf9bd1bbc1e20f83633208620d56de50f14185055e49504f4f5e94e94aff94
+SIZE (pymemcache-4.0.0.tar.gz) = 70176
diff --git a/databases/py-pymemcache/pkg-descr b/databases/py-pymemcache/pkg-descr
index b72248edfdc5..3ade3aaa47fe 100644
--- a/databases/py-pymemcache/pkg-descr
+++ b/databases/py-pymemcache/pkg-descr
@@ -9,5 +9,3 @@ pymemcache supports the following features:
  * Flexible, modular and simple approach to serialization and deserialization.
  * The (optional) ability to treat network and memcached errors as cache
    misses.
-
-WWW: https://github.com/pinterest/pymemcache
diff --git a/databases/py-pymongo/Makefile b/databases/py-pymongo/Makefile
new file mode 100644
index 000000000000..419ce78e0b53
--- /dev/null
+++ b/databases/py-pymongo/Makefile
@@ -0,0 +1,22 @@
+PORTNAME=	pymongo
+PORTVERSION=	3.13.0
+CATEGORIES=	databases python
+MASTER_SITES=	PYPI
+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+
+MAINTAINER=	farrokhi@FreeBSD.org
+COMMENT=	Python driver for MongoDB
+WWW=		https://github.com/mongodb/mongo-python-driver
+
+LICENSE=	APACHE20
+
+USES=		python
+USE_PYTHON=	autoplist concurrent distutils
+
+CONFLICTS_INSTALL=	py[0-9][0-9]-pymongo28
+
+post-install:
+	        ${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/bson/_cbson${PYTHON_EXT_SUFFIX}.so
+	        ${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/pymongo/_cmessage${PYTHON_EXT_SUFFIX}.so
+
+.include <bsd.port.mk>
diff --git a/databases/py-pymongo/distinfo b/databases/py-pymongo/distinfo
new file mode 100644
index 000000000000..d19199da1443
--- /dev/null
+++ b/databases/py-pymongo/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1669452165
+SHA256 (pymongo-3.13.0.tar.gz) = e22d6cf5802cd09b674c307cc9e03870b8c37c503ebec3d25b86f2ce8c535dc7
+SIZE (pymongo-3.13.0.tar.gz) = 804388
diff --git a/databases/py-pymongo/pkg-descr b/databases/py-pymongo/pkg-descr
new file mode 100644
index 000000000000..4a2444db4737
--- /dev/null
+++ b/databases/py-pymongo/pkg-descr
@@ -0,0 +1,4 @@
+The PyMongo distribution contains tools for interacting with
+the Mongo database from Python. The pymongo package is a native
+Python driver for the Mongo database. The gridfs package is a
+gridfs implementation on top of pymongo.
diff --git a/databases/py-pymssql/Makefile b/databases/py-pymssql/Makefile
index 439d8a0dfa32..61ee4ccbbc7b 100644
--- a/databases/py-pymssql/Makefile
+++ b/databases/py-pymssql/Makefile
@@ -1,11 +1,12 @@
 PORTNAME=	pymssql
-PORTVERSION=	2.1.4
+PORTVERSION=	2.1.5
 CATEGORIES=	databases python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	ports@thelanman.net
 COMMENT=	Python database interface for MS-SQL. Version 2
+WWW=		https://www.pymssql.org/
 
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/LICENSE
@@ -13,7 +14,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools-git>0:devel/py-setuptools-git@${PY_FLAVOR}
 LIB_DEPENDS=	libsybdb.so:databases/freetds
 
-USES=		python:3.6+
+USES=		python
 USE_PYTHON=	autoplist distutils cython
 
 post-extract:
diff --git a/databases/py-pymssql/distinfo b/databases/py-pymssql/distinfo
index e26d7eb7b807..30b119792d67 100644
--- a/databases/py-pymssql/distinfo
+++ b/databases/py-pymssql/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1554391425
-SHA256 (pymssql-2.1.4.tar.gz) = 3201eb1b1263ad55b555d727ed8bed0b12b7b9de3ce5e529206e36d4be1a7afb
-SIZE (pymssql-2.1.4.tar.gz) = 691589
+TIMESTAMP = 1681699079
+SHA256 (pymssql-2.1.5.tar.gz) = d60f5f90337399668e10ab6a23a1657f190c9585401eb96a5456261f7c414864
+SIZE (pymssql-2.1.5.tar.gz) = 167928
diff --git a/databases/py-pymssql/pkg-descr b/databases/py-pymssql/pkg-descr
index d640b407beec..a15657bb3abf 100644
--- a/databases/py-pymssql/pkg-descr
+++ b/databases/py-pymssql/pkg-descr
@@ -3,5 +3,4 @@ language. It was written from scratch using FreeTDS library.
 
 This is the version 2 release branch.
 
-WWW: http://www.pymssql.org/
-WWW: https://github.com/pymssql/pymssql
+See also: https://github.com/pymssql/pymssql
diff --git a/databases/py-pymysql/Makefile b/databases/py-pymysql/Makefile
index 4bfc7f9c3033..6180683948cd 100644
--- a/databases/py-pymysql/Makefile
+++ b/databases/py-pymysql/Makefile
@@ -1,12 +1,13 @@
 PORTNAME=	pymysql
 PORTVERSION=	1.0.2
 CATEGORIES=	databases python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	PyMySQL-${PORTVERSION}
 
 MAINTAINER=	lwhsu@FreeBSD.org
 COMMENT=	Pure Python MySQL Driver
+WWW=		https://github.com/PyMySQL/PyMySQL
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
diff --git a/databases/py-pymysql/pkg-descr b/databases/py-pymysql/pkg-descr
index c56ad8a070c0..03db44b6acca 100644
--- a/databases/py-pymysql/pkg-descr
+++ b/databases/py-pymysql/pkg-descr
@@ -1,4 +1,2 @@
 This pure Python MySQL client provides a DB-API to a MySQL database by
 talking directly to the server via the binary client/server protocol.
-
-WWW: https://github.com/PyMySQL/PyMySQL
diff --git a/databases/py-pyodbc/Makefile b/databases/py-pyodbc/Makefile
index 8449be5216b7..4011fe79c881 100644
--- a/databases/py-pyodbc/Makefile
+++ b/databases/py-pyodbc/Makefile
@@ -1,13 +1,12 @@
-# Created by: Robert Kruus <rob.kruus@gmail.com>
-
 PORTNAME=	pyodbc
-PORTVERSION=	4.0.30
+PORTVERSION=	5.0.1
 CATEGORIES=	databases python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	rob.kruus@gmail.com
 COMMENT=	ODBC connections for python
+WWW=		https://github.com/mkleehammer/pyodbc
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
@@ -15,7 +14,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 LIB_DEPENDS=	libodbc.so:databases/unixODBC
 BUILD_DEPENDS=	unixODBC>=2.2.14:databases/unixODBC
 
-USES=		localbase python:3.6+
+USES=		localbase python
 USE_PYTHON=	autoplist distutils
 
 post-install:
diff --git a/databases/py-pyodbc/distinfo b/databases/py-pyodbc/distinfo
index 095053def18f..3bafab715411 100644
--- a/databases/py-pyodbc/distinfo
+++ b/databases/py-pyodbc/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1582597228
-SHA256 (pyodbc-4.0.30.tar.gz) = 852b5deeeb3366af8b4408efed993501708be45d221881bce60c9aac54be726a
-SIZE (pyodbc-4.0.30.tar.gz) = 266286
+TIMESTAMP = 1705824189
+SHA256 (pyodbc-5.0.1.tar.gz) = 03d7d0b04d5a9156099ce8d03e92f3956783746fa9234eb6f5b5cfc12b645011
+SIZE (pyodbc-5.0.1.tar.gz) = 115228
diff --git a/databases/py-pyodbc/pkg-descr b/databases/py-pyodbc/pkg-descr
index 97a4279bf0f1..ee37dbc495e9 100644
--- a/databases/py-pyodbc/pkg-descr
+++ b/databases/py-pyodbc/pkg-descr
@@ -4,5 +4,3 @@ almost any database from Windows, Linux, OS/X, and more.
 It implements the Python Database API Specification v2.0, but
 additional features have been added to simplify database
 programming even more.
-
-WWW: https://github.com/mkleehammer/pyodbc
diff --git a/databases/py-pypuppetdb/Makefile b/databases/py-pypuppetdb/Makefile
index 1317be51a4cb..47f37a80b82a 100644
--- a/databases/py-pypuppetdb/Makefile
+++ b/databases/py-pypuppetdb/Makefile
@@ -1,20 +1,22 @@
 PORTNAME=	pypuppetdb
-PORTVERSION=	2.4.0
-DISTVERSIONPREFIX=	v
+PORTVERSION=	3.2.0
 CATEGORIES=	databases python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	puppet@FreeBSD.org
 COMMENT=	Library to work with PuppetDB's REST API
+WWW=		https://github.com/voxpupuli/pypuppetdb
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-USES=		python:3.6+
+USES=		python
 USE_GITHUB=	yes
 USE_PYTHON=	autoplist distutils
 
-CONFLICTS_INSTALL=	pypuppetdb03-*
+NO_ARCH=	yes
+
+CONFLICTS_INSTALL=	pypuppetdb03
 
 GH_ACCOUNT=	voxpupuli
 
diff --git a/databases/py-pypuppetdb/distinfo b/databases/py-pypuppetdb/distinfo
index ec2cbcada863..f7ca48da1c01 100644
--- a/databases/py-pypuppetdb/distinfo
+++ b/databases/py-pypuppetdb/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1621133202
-SHA256 (voxpupuli-pypuppetdb-v2.4.0_GH0.tar.gz) = 8390812d6b12c33f905be430fb55468d43a3533ffe74fdd8cf1f0e5e40e2ccb0
-SIZE (voxpupuli-pypuppetdb-v2.4.0_GH0.tar.gz) = 53487
+TIMESTAMP = 1699636570
+SHA256 (voxpupuli-pypuppetdb-3.2.0_GH0.tar.gz) = a5a3e127023e272266da0f91d67abc96da5f9445f662d7228a4bbec49fd7c5d8
+SIZE (voxpupuli-pypuppetdb-3.2.0_GH0.tar.gz) = 55154
diff --git a/databases/py-pypuppetdb/pkg-descr b/databases/py-pypuppetdb/pkg-descr
index 0fd5731c4374..20f14862a7ea 100644
--- a/databases/py-pypuppetdb/pkg-descr
+++ b/databases/py-pypuppetdb/pkg-descr
@@ -1,4 +1,2 @@
 This library is a thin wrapper around the PuppetDB REST API providing some
 convinience functions and objects to request and hold data from PuppetDB.
-
-WWW: https://github.com/voxpupuli/pypuppetdb
diff --git a/databases/py-python-arango/Makefile b/databases/py-python-arango/Makefile
index 672beb7437c6..cf975478390f 100644
--- a/databases/py-python-arango/Makefile
+++ b/databases/py-python-arango/Makefile
@@ -1,11 +1,13 @@
 PORTNAME=	python-arango
 DISTVERSION=	7.2.0
+PORTREVISION=	2
 CATEGORIES=	databases python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Python driver for ArangoDB
+WWW=		https://github.com/joowani/python-arango
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
@@ -13,14 +15,14 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 PY_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyjwt>0:www/py-pyjwt@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests-toolbelt>0:www/py-requests-toolbelt@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}setuptools-scm>0:devel/py-setuptools-scm@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}urllib3>=1.26.0:net/py-urllib3@${PY_FLAVOR}
 BUILD_DEPENDS=	${PY_DEPENDS} \
 		${PYTHON_PKGNAMEPREFIX}pip>0:devel/py-pip@${PY_FLAVOR}
 RUN_DEPENDS=	${PY_DEPENDS}
 
-USES=		python:3.7+
+USES=		python
 USE_PYTHON=	distutils autoplist
 NO_ARCH=	yes
 
diff --git a/databases/py-python-arango/pkg-descr b/databases/py-python-arango/pkg-descr
index 26b5e893ace8..ffb46b8b8c21 100644
--- a/databases/py-python-arango/pkg-descr
+++ b/databases/py-python-arango/pkg-descr
@@ -4,5 +4,3 @@ Features:
 * Clean, Pythonic interface
 * Lightweight
 * High ArangoDB REST API coverage
-
-WWW: https://github.com/joowani/python-arango
diff --git a/databases/py-python-binary-memcached/Makefile b/databases/py-python-binary-memcached/Makefile
index 8a57bfeeeff2..7bcd5856491d 100644
--- a/databases/py-python-binary-memcached/Makefile
+++ b/databases/py-python-binary-memcached/Makefile
@@ -1,26 +1,27 @@
-# Created by: Po-Chuan Hsieh <sunpoet@FreeBSD.org>
-
 PORTNAME=	python-binary-memcached
-PORTVERSION=	0.30.1
+PORTVERSION=	0.31.2
+PORTREVISION=	1
 CATEGORIES=	databases python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Pure python module to access memcached via its binary protocol
+WWW=		https://github.com/jaysonsantos/python-binary-memcached
 
 LICENSE=	MIT
 
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}uhashring>=0:security/py-uhashring@${PY_FLAVOR}
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR}
+TEST_DEPENDS=	memcached:databases/memcached \
+		${PYTHON_PKGNAMEPREFIX}trustme>=0:security/py-trustme@${PY_FLAVOR}
 
-USES=		python:3.6+
-USE_PYTHON=	autoplist concurrent distutils
+USES=		python
+USE_PYTHON=	autoplist concurrent pep517 pytest
 
 NO_ARCH=	yes
-
-do-test:
-	cd ${WRKSRC} && ${SETENV} ${PYTHON_CMD} -m pytest
+TEST_ENV=	MEMCACHED_HOST=localhost
 
 .include <bsd.port.mk>
diff --git a/databases/py-python-binary-memcached/distinfo b/databases/py-python-binary-memcached/distinfo
index cb8eaced9033..a42df7ef4753 100644
--- a/databases/py-python-binary-memcached/distinfo
+++ b/databases/py-python-binary-memcached/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1602524155
-SHA256 (python-binary-memcached-0.30.1.tar.gz) = f91c3d79d022121c22ef733e9beee86e0598e29ffec67401c68cece1ba7f036a
-SIZE (python-binary-memcached-0.30.1.tar.gz) = 95123
+TIMESTAMP = 1674589718
+SHA256 (python-binary-memcached-0.31.2.tar.gz) = 290f70451e277df6a39aa0eea3cb6ca2eefcf5d601f957cf2ec1d353d7676c03
+SIZE (python-binary-memcached-0.31.2.tar.gz) = 96474
diff --git a/databases/py-python-binary-memcached/pkg-descr b/databases/py-python-binary-memcached/pkg-descr
index 2a84fced4383..eabf7bd075f2 100644
--- a/databases/py-python-binary-memcached/pkg-descr
+++ b/databases/py-python-binary-memcached/pkg-descr
@@ -4,5 +4,3 @@ binary with SASL auth support.
 The main purpose of this module it to be able to communicate with memcached
 using binary protocol and support authentication, so it can work with Heroku for
 example.
-
-WWW: https://github.com/jaysonsantos/python-binary-memcached
diff --git a/databases/py-python-memcached/Makefile b/databases/py-python-memcached/Makefile
index 7a5a35e08728..468a82be98c5 100644
--- a/databases/py-python-memcached/Makefile
+++ b/databases/py-python-memcached/Makefile
@@ -1,20 +1,23 @@
-# Created by: Michael Johnson <ahze@ahze.net>
-
 PORTNAME=	python-memcached
-PORTVERSION=	1.59
+PORTVERSION=	1.62
+PORTREVISION=	1
 CATEGORIES=	databases python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI \
+		https://github.com/linsomniac/python-memcached/releases/download/${PORTVERSION}/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Python API for memcached, a distributed memory cache daemon
+WWW=		https://github.com/linsomniac/python-memcached
 
 LICENSE=	PSFL
+LICENSE_FILE=	${WRKSRC}/PSF.LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>=1.4.0:devel/py-six@${PY_FLAVOR}
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR}
 
-USES=		python:3.6+
-USE_PYTHON=	autoplist concurrent distutils
+USES=		python
+USE_PYTHON=	autoplist concurrent pep517
 
 NO_ARCH=	yes
 
diff --git a/databases/py-python-memcached/distinfo b/databases/py-python-memcached/distinfo
index 755b99cf399e..78d80ab45cf0 100644
--- a/databases/py-python-memcached/distinfo
+++ b/databases/py-python-memcached/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1513430364
-SHA256 (python-memcached-1.59.tar.gz) = a2e28637be13ee0bf1a8b6843e7490f9456fd3f2a4cb60471733c7b5d5557e4f
-SIZE (python-memcached-1.59.tar.gz) = 22210
+TIMESTAMP = 1708449106
+SHA256 (python-memcached-1.62.tar.gz) = 0285470599b7f593fbf3bec084daa1f483221e68c1db2cf1d846a9f7c2655103
+SIZE (python-memcached-1.62.tar.gz) = 28591
diff --git a/databases/py-python-memcached/pkg-descr b/databases/py-python-memcached/pkg-descr
index e49d81ef8e84..45fbcf0bd817 100644
--- a/databases/py-python-memcached/pkg-descr
+++ b/databases/py-python-memcached/pkg-descr
@@ -4,5 +4,3 @@ scalar. In that case, the Storable module is used to freeze and thaw the
 value automatically going in and out of the memcached.
 
 The Python API, while tested, has not experienced real-world production use.
-
-WWW: https://github.com/linsomniac/python-memcached
diff --git a/databases/py-python-sql/Makefile b/databases/py-python-sql/Makefile
index fb07e3827bb3..12b375d57e12 100644
--- a/databases/py-python-sql/Makefile
+++ b/databases/py-python-sql/Makefile
@@ -1,15 +1,16 @@
 PORTNAME=	python-sql
-PORTVERSION=	0.9
+PORTVERSION=	1.4.3
 CATEGORIES=	databases python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	wen@FreeBSD.org
 COMMENT=	Library to write SQL queries
+WWW=		https://python-sql.tryton.org/
 
 LICENSE=	BSD3CLAUSE
 
-USES=		pkgconfig python:3.6+
+USES=		pkgconfig python
 USE_PYTHON=	autoplist distutils
 NO_ARCH=	yes
 
diff --git a/databases/py-python-sql/distinfo b/databases/py-python-sql/distinfo
index 90254eaa6f9f..bc23b62b2af2 100644
--- a/databases/py-python-sql/distinfo
+++ b/databases/py-python-sql/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1493251861
-SHA256 (python-sql-0.9.tar.gz) = 07b51cc1c977ef5480fe671cae5075ad4b68a6fc67f4569782e06f012456d35c
-SIZE (python-sql-0.9.tar.gz) = 30219
+TIMESTAMP = 1704527050
+SHA256 (python-sql-1.4.3.tar.gz) = 6260beff835a35d3a0aec4f1da351b0be9caa1a0d94a6cba940a7cd8dcf66269
+SIZE (python-sql-1.4.3.tar.gz) = 33404
diff --git a/databases/py-python-sql/pkg-descr b/databases/py-python-sql/pkg-descr
index 16022d1e7333..56134c219536 100644
--- a/databases/py-python-sql/pkg-descr
+++ b/databases/py-python-sql/pkg-descr
@@ -1,3 +1 @@
 python-sql is a library to write SQL queries in a pythonic way.
-
-WWW: https://python-sql.tryton.org/
diff --git a/databases/py-python-swiftclient/Makefile b/databases/py-python-swiftclient/Makefile
index 117e13ff3cae..33ef7a1bf3f0 100644
--- a/databases/py-python-swiftclient/Makefile
+++ b/databases/py-python-swiftclient/Makefile
@@ -1,13 +1,13 @@
-# Created by: Mikolaj Golub <trociny@FreeBSD.org>
-
 PORTNAME=	python-swiftclient
-PORTVERSION=	3.12.0
+PORTVERSION=	3.13.1
+PORTREVISION=	1
 CATEGORIES=	databases python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	trociny@FreeBSD.org
 COMMENT=	Python client library for OpenStack Object Storage (Swift)
+WWW=		https://launchpad.net/python-swiftclient
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
@@ -18,12 +18,12 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>=1.1:www/py-requests@${PY_FLAVOR}
 
-USES=		python:3.6+
+USES=		python
 USE_PYTHON=	distutils autoplist
 NO_ARCH=	yes
 
 post-install:
 	${INSTALL_MAN} ${WRKSRC}/doc/manpages/swift.1 \
-	    ${STAGEDIR}${MANPREFIX}/man/man1
+	    ${STAGEDIR}${PREFIX}/share/man/man1
 
 .include <bsd.port.mk>
diff --git a/databases/py-python-swiftclient/distinfo b/databases/py-python-swiftclient/distinfo
index f8f45656d32f..8d3bf05b0326 100644
--- a/databases/py-python-swiftclient/distinfo
+++ b/databases/py-python-swiftclient/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1623601991
-SHA256 (python-swiftclient-3.12.0.tar.gz) = 313b444a14d0f9b628cbf3e8c52f2c4271658f9e8a33d4222851c2e4f0f7b7a0
-SIZE (python-swiftclient-3.12.0.tar.gz) = 201199
+TIMESTAMP = 1651593142
+SHA256 (python-swiftclient-3.13.1.tar.gz) = 2d26c90b6392f6befa7fbb16fcda7be44aa26e2ae8a5bee2705d1d1c813833f0
+SIZE (python-swiftclient-3.13.1.tar.gz) = 201632
diff --git a/databases/py-python-swiftclient/pkg-descr b/databases/py-python-swiftclient/pkg-descr
index 16f52c0645e8..1132c3d5ad78 100644
--- a/databases/py-python-swiftclient/pkg-descr
+++ b/databases/py-python-swiftclient/pkg-descr
@@ -4,5 +4,3 @@ This is a python client for the Swift API. There's a Python API (the
 This code is based on the original client previously included with
 OpenStack's swift -- a highly available, distributed, eventually
 consistent object/blob store.
-
-WWW: https://launchpad.net/python-swiftclient
diff --git a/databases/py-python-swiftclient/pkg-plist b/databases/py-python-swiftclient/pkg-plist
deleted file mode 100644
index ff38fac69677..000000000000
--- a/databases/py-python-swiftclient/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-man/man1/swift.1.gz
diff --git a/databases/py-qt5-sql/Makefile b/databases/py-qt5-sql/Makefile
deleted file mode 100644
index 49e84b325471..000000000000
--- a/databases/py-qt5-sql/Makefile
+++ /dev/null
@@ -1,30 +0,0 @@
-PORTNAME=	sql
-PORTREVISION=	3
-CATEGORIES=	databases devel python
-
-MAINTAINER=	kde@FreeBSD.org
-COMMENT=	Python bindings for the Qt5 toolkit, QtSql module
-
-CONFIGURE_ARGS=	--enable QtSql
-PYQT_DIST=	yes
-
-USES=		gl python:3.5+ pyqt:5 qt:5
-USE_GL=		gl
-USE_PYQT=	sip_build core_run widgets_run
-USE_PYTHON=	concurrent flavors py3kplist
-USE_QT=		core gui sql widgets buildtools_build qmake_build
-
-OPTIONS_DEFINE=	API DEBUG
-OPTIONS_DEFAULT=API
-OPTIONS_SUB=	yes
-
-API_DESC=		Install QtSql API for QScintilla2
-API_CONFIGURE_ON=	--qsci-api --qsci-api-destdir=${PYQT_APIDIR}
-API_CONFIGURE_OFF=	--no-qsci-api
-API_LIB_DEPENDS=	libqscintilla2_qt5.so:devel/qscintilla2-qt5
-DEBUG_CONFIGURE_ON=	--debug --trace
-
-post-install:
-	${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/PyQt5/QtSql.so
-
-.include <bsd.port.mk>
diff --git a/databases/py-qt5-sql/pkg-descr b/databases/py-qt5-sql/pkg-descr
deleted file mode 100644
index 908ca9499f17..000000000000
--- a/databases/py-qt5-sql/pkg-descr
+++ /dev/null
@@ -1,4 +0,0 @@
-PyQt5 is a set of Python bindings for Qt5 application framework.
-This package provides the QtSql module.
-
-WWW: https://riverbankcomputing.com/software/pyqt
diff --git a/databases/py-qt5-sql/pkg-plist b/databases/py-qt5-sql/pkg-plist
deleted file mode 100644
index 5d573f92e755..000000000000
--- a/databases/py-qt5-sql/pkg-plist
+++ /dev/null
@@ -1,18 +0,0 @@
-%%PYTHON_SITELIBDIR%%/PyQt5/QtSql.so
-%%PYTHON_SITELIBDIR%%/PyQt5/QtSql.pyi
-%%PYQT_SIPDIR%%/QtSql/QtSqlmod.sip
-%%PYQT_SIPDIR%%/QtSql/qsql.sip
-%%PYQT_SIPDIR%%/QtSql/qsqldatabase.sip
-%%PYQT_SIPDIR%%/QtSql/qsqldriver.sip
-%%PYQT_SIPDIR%%/QtSql/qsqlerror.sip
-%%PYQT_SIPDIR%%/QtSql/qsqlfield.sip
-%%PYQT_SIPDIR%%/QtSql/qtsqlglobal.sip
-%%PYQT_SIPDIR%%/QtSql/qsqlindex.sip
-%%PYQT_SIPDIR%%/QtSql/qsqlquery.sip
-%%PYQT_SIPDIR%%/QtSql/qsqlquerymodel.sip
-%%PYQT_SIPDIR%%/QtSql/qsqlrecord.sip
-%%PYQT_SIPDIR%%/QtSql/qsqlrelationaldelegate.sip
-%%PYQT_SIPDIR%%/QtSql/qsqlrelationaltablemodel.sip
-%%PYQT_SIPDIR%%/QtSql/qsqlresult.sip
-%%PYQT_SIPDIR%%/QtSql/qsqltablemodel.sip
-%%API%%%%PYQT_APIDIR%%/api/python/QtSql.api
diff --git a/databases/py-queries/Makefile b/databases/py-queries/Makefile
index 0bb320f365b8..2b00368bb200 100644
--- a/databases/py-queries/Makefile
+++ b/databases/py-queries/Makefile
@@ -1,22 +1,23 @@
-# Created by: Grzegorz Blach <gblach@FreeBSD.org>
-
 PORTNAME=	queries
-PORTVERSION=	2.1.0
+PORTVERSION=	2.1.1
 PORTREVISION=	1
 CATEGORIES=	databases python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Simplified PostgreSQL client built upon Psycopg2
+WWW=		https://github.com/gmr/queries
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}psycopg2>=2.5.1<3:databases/py-psycopg2@${PY_FLAVOR}
 
-USES=		python:3.6+
-USE_PYTHON=	autoplist concurrent distutils
+USES=		python
+USE_PYTHON=	autoplist concurrent pep517
 
 NO_ARCH=	yes
 
diff --git a/databases/py-queries/distinfo b/databases/py-queries/distinfo
index d24dd49d7fee..d1c3a739c14c 100644
--- a/databases/py-queries/distinfo
+++ b/databases/py-queries/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1585063907
-SHA256 (queries-2.1.0.tar.gz) = 0215a841fd09c3ccfa6ffc74258e7e93d4d6f98e64ded18ed2a9a4e8ec59f8ec
-SIZE (queries-2.1.0.tar.gz) = 18632
+TIMESTAMP = 1638556542
+SHA256 (queries-2.1.1.tar.gz) = fd49447358a4d83b432cf0b4d34af60fb9c887a6e879b1795412e3424c5f8cd2
+SIZE (queries-2.1.1.tar.gz) = 21223
diff --git a/databases/py-queries/files/patch-setup.py b/databases/py-queries/files/patch-setup.py
deleted file mode 100644
index 817559c5582e..000000000000
--- a/databases/py-queries/files/patch-setup.py
+++ /dev/null
@@ -1,11 +0,0 @@
---- setup.py.orig	2020-03-09 17:39:51 UTC
-+++ setup.py
-@@ -7,7 +7,7 @@ import setuptools
- if platform.python_implementation() == 'PyPy':
-     install_requires = ['psycopg2cffi>=2.7.2,<2.9']
- else:
--    install_requires = ['psycopg2>=2.5.1,<2.9']
-+    install_requires = ['psycopg2>=2.5.1,<3']
- 
- # Install tornado if generating docs on readthedocs
- if os.environ.get('READTHEDOCS', None) == 'True':
diff --git a/databases/py-queries/pkg-descr b/databases/py-queries/pkg-descr
index 44e7c9ce7da6..eba692f34782 100644
--- a/databases/py-queries/pkg-descr
+++ b/databases/py-queries/pkg-descr
@@ -6,5 +6,3 @@ a developer, you're often repeating the same steps to get started with your
 applications that use it. Queries aims to reduce the complexity of psycopg2
 while adding additional features to make writing PostgreSQL client applications
 both fast and easy.
-
-WWW: https://github.com/gmr/queries
diff --git a/databases/py-rb/Makefile b/databases/py-rb/Makefile
index 084c17a8caf8..dfb111e0835c 100644
--- a/databases/py-rb/Makefile
+++ b/databases/py-rb/Makefile
@@ -1,23 +1,26 @@
-# Created by: Tom Judge <tj@FreeBSD.org>
-
 PORTNAME=	rb
-PORTVERSION=	1.9.0
+PORTVERSION=	1.10.0
+PORTREVISION=	1
 CATEGORIES=	databases python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Redis blaster
+WWW=		https://github.com/getsentry/rb
 
 LICENSE=	APACHE20
+LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}redis2>=2.6<3.5:databases/py-redis2@${PY_FLAVOR}
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR}
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}redis2>=2.6:databases/py-redis2@${PY_FLAVOR}
 
-USES=		python:3.6+
-USE_PYTHON=	autoplist concurrent distutils
+USES=		python
+USE_PYTHON=	autoplist concurrent pep517
 
 NO_ARCH=	yes
 
-GH_ACCOUNT=	getsentry
 USE_GITHUB=	yes
+GH_ACCOUNT=	getsentry
 
 .include <bsd.port.mk>
diff --git a/databases/py-rb/distinfo b/databases/py-rb/distinfo
index a4b6c74adadc..259b2b0354f3 100644
--- a/databases/py-rb/distinfo
+++ b/databases/py-rb/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1620405381
-SHA256 (getsentry-rb-1.9.0_GH0.tar.gz) = 7990b9f2a26a27bbae18c3fb78fa91038a3072ca02488f92ec1efbe2546a424a
-SIZE (getsentry-rb-1.9.0_GH0.tar.gz) = 168973
+TIMESTAMP = 1680726102
+SHA256 (getsentry-rb-1.10.0_GH0.tar.gz) = facdc408926c34c2e8ba7ad9d042183dbdd7f2967348147bd7d72e8876addddc
+SIZE (getsentry-rb-1.10.0_GH0.tar.gz) = 169263
diff --git a/databases/py-rb/pkg-descr b/databases/py-rb/pkg-descr
index f3a90acc0ae4..84e8310bfdf1 100644
--- a/databases/py-rb/pkg-descr
+++ b/databases/py-rb/pkg-descr
@@ -1,4 +1,2 @@
 Rb is the fastest way to talk to many redis nodes. It can do routing as well as
 blindly blasting commands to many nodes.
-
-WWW: https://github.com/getsentry/rb
diff --git a/databases/py-redis/Makefile b/databases/py-redis/Makefile
index a8d477d92275..8b353e8c62eb 100644
--- a/databases/py-redis/Makefile
+++ b/databases/py-redis/Makefile
@@ -1,36 +1,38 @@
-# Created by: Cheng-Lung Sung <clsung@FreeBSD.org>
-
 PORTNAME=	redis
-PORTVERSION=	3.5.3
+PORTVERSION=	5.0.3
 PORTREVISION=	1
 CATEGORIES=	databases python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
-MAINTAINER=	koobs@FreeBSD.org
+MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Python client for Redis key-value store
+WWW=		https://github.com/redis/redis-py
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}pytest>=2.7.0:devel/py-pytest@${PY_FLAVOR} \
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR}
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py-mock@${PY_FLAVOR} \
 		redis-server:databases/redis
 
-USES=		python:3.6+
-USE_PYTHON=	distutils autoplist concurrent
+USES=		python
+USE_PYTHON=	autoplist concurrent pep517 pytest
 
-OPTIONS_DEFINE=	HIREDIS
+NO_ARCH=	yes
 
-HIREDIS_DESC=	High performance response parser (via hiredis)
+CONFLICTS_INSTALL=	${PYTHON_PKGNAMEPREFIX}redis[0-9]
 
-HIREDIS_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}hiredis>=0.1.3:databases/py-hiredis@${PY_FLAVOR}
+OPTIONS_DEFINE=	HIREDIS
+HIREDIS_DESC=	High performance response parser
 
-NO_ARCH=	yes
-CONFLICTS_INSTALL=	${PYTHON_PKGNAMEPREFIX}redis2
+HIREDIS_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}hiredis>=1.0.0:databases/py-hiredis@${PY_FLAVOR}
+
+.include <bsd.port.pre.mk>
 
-# Needs redis-server to be running
-do-test:
-	@cd ${WRKSRC} && ${PYTHON_CMD} -m pytest -v -rs
+.if ${PYTHON_REL} < 31103
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}async_timeout>=4.0.3:devel/py-async_timeout@${PY_FLAVOR}
+.endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/databases/py-redis/distinfo b/databases/py-redis/distinfo
index 395e5ca00294..4bc2c2c7de4b 100644
--- a/databases/py-redis/distinfo
+++ b/databases/py-redis/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1591983753
-SHA256 (redis-3.5.3.tar.gz) = 0e7e0cfca8660dea8b7d5cd8c4f6c5e29e11f31158c0b0ae91a397f00e5a05a2
-SIZE (redis-3.5.3.tar.gz) = 141112
+TIMESTAMP = 1710712398
+SHA256 (redis-5.0.3.tar.gz) = 4973bae7444c0fbed64a06b87446f79361cb7e4ec1538c022d696ed7a5015580
+SIZE (redis-5.0.3.tar.gz) = 4580976
diff --git a/databases/py-redis/pkg-descr b/databases/py-redis/pkg-descr
index 332817e4e430..2058c4d187a8 100644
--- a/databases/py-redis/pkg-descr
+++ b/databases/py-redis/pkg-descr
@@ -1,3 +1 @@
 This is the Python interface to the Redis key-value store.
-
-WWW: https://github.com/andymccurdy/redis-py
diff --git a/databases/py-redis2/Makefile b/databases/py-redis2/Makefile
index b8300bca1a9d..3dd33db0f6fd 100644
--- a/databases/py-redis2/Makefile
+++ b/databases/py-redis2/Makefile
@@ -1,39 +1,40 @@
-# Created by: Cheng-Lung Sung <clsung@FreeBSD.org>
-
 PORTNAME=	redis
 PORTVERSION=	2.10.6
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	databases python
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 PKGNAMESUFFIX=	2
 
-MAINTAINER=	koobs@FreeBSD.org
+MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Python client for Redis key-value store
+WWW=		https://github.com/redis/redis-py
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-TEST_DEPENDS=	redis-server:databases/redis
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR}
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py-mock@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pytest>=2.5.0,1:devel/py-pytest@${PY_FLAVOR} \
+		redis-server:databases/redis
 
-OPTIONS_DEFINE=	HIREDIS
+USES=		python
+USE_PYTHON=	autoplist concurrent pep517
 
-HIREDIS_DESC=	High performance response parser (via hiredis)
+NO_ARCH=	yes
 
-HIREDIS_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}hiredis>0:databases/py-hiredis@${PY_FLAVOR}
+CONFLICTS_INSTALL=	${PYTHON_PKGNAMEPREFIX}redis \
+			${PYTHON_PKGNAMEPREFIX}redis[0-9]
 
-USES=		python:3.6+
-USE_PYTHON=	distutils autoplist concurrent
+PORTSCOUT=	limit:^2\.
 
-USE_GITHUB=	yes
-GH_ACCOUNT=	andymccurdy
-GH_PROJECT=	${PORTNAME}-py
+OPTIONS_DEFINE=	HIREDIS
+HIREDIS_DESC=	High performance response parser
 
-NO_ARCH=	yes
-CONFLICTS_INSTALL=	${PYTHON_PKGNAMEPREFIX}redis
-PORTSCOUT=	limit:^2\.
+HIREDIS_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}hiredis>=0:databases/py-hiredis@${PY_FLAVOR}
 
-# Needs redis-server to be running
 do-test:
-	@cd ${WRKSRC} && ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test
+	cd ${WRKSRC} && ${PYTHON_CMD} -m pytest -rs -v
 
 .include <bsd.port.mk>
diff --git a/databases/py-redis2/distinfo b/databases/py-redis2/distinfo
index 4a453d1f3ff6..8f3d4e051c0a 100644
--- a/databases/py-redis2/distinfo
+++ b/databases/py-redis2/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1508148992
-SHA256 (andymccurdy-redis-py-2.10.6_GH0.tar.gz) = e28e24539d6590a8b88498f2d30f7fe3e2be1171d7a91fe1fa6c5b6982519015
-SIZE (andymccurdy-redis-py-2.10.6_GH0.tar.gz) = 94869
+TIMESTAMP = 1649423748
+SHA256 (redis-2.10.6.tar.gz) = a22ca993cea2962dbb588f9f30d0015ac4afcc45bee27d3978c0dbe9e97c6c0f
+SIZE (redis-2.10.6.tar.gz) = 97299
diff --git a/databases/py-redis2/pkg-descr b/databases/py-redis2/pkg-descr
index 332817e4e430..2058c4d187a8 100644
--- a/databases/py-redis2/pkg-descr
+++ b/databases/py-redis2/pkg-descr
@@ -1,3 +1 @@
 This is the Python interface to the Redis key-value store.
-
-WWW: https://github.com/andymccurdy/redis-py
diff --git a/databases/py-redis3/Makefile b/databases/py-redis3/Makefile
new file mode 100644
index 000000000000..39c5a361c510
--- /dev/null
+++ b/databases/py-redis3/Makefile
@@ -0,0 +1,36 @@
+PORTNAME=	redis
+PORTVERSION=	3.5.3
+PORTREVISION=	1
+CATEGORIES=	databases python
+MASTER_SITES=	PYPI
+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+PKGNAMESUFFIX=	3
+
+MAINTAINER=	sunpoet@FreeBSD.org
+COMMENT=	Python client for Redis key-value store
+WWW=		https://github.com/redis/redis-py
+
+LICENSE=	MIT
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR}
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py-mock@${PY_FLAVOR} \
+		redis-server:databases/redis
+
+USES=		python
+USE_PYTHON=	autoplist concurrent pep517 pytest
+
+NO_ARCH=	yes
+
+CONFLICTS_INSTALL=	${PYTHON_PKGNAMEPREFIX}redis \
+			${PYTHON_PKGNAMEPREFIX}redis2
+
+PORTSCOUT=	limit:^3\.
+
+OPTIONS_DEFINE=	HIREDIS
+HIREDIS_DESC=	High performance response parser
+
+HIREDIS_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}hiredis>=0.1.3:databases/py-hiredis@${PY_FLAVOR}
+
+.include <bsd.port.mk>
diff --git a/databases/py-redis3/distinfo b/databases/py-redis3/distinfo
new file mode 100644
index 000000000000..71e7e1348570
--- /dev/null
+++ b/databases/py-redis3/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1647264502
+SHA256 (redis-3.5.3.tar.gz) = 0e7e0cfca8660dea8b7d5cd8c4f6c5e29e11f31158c0b0ae91a397f00e5a05a2
+SIZE (redis-3.5.3.tar.gz) = 141112
diff --git a/databases/py-redis3/pkg-descr b/databases/py-redis3/pkg-descr
new file mode 100644
index 000000000000..2058c4d187a8
--- /dev/null
+++ b/databases/py-redis3/pkg-descr
@@ -0,0 +1 @@
+This is the Python interface to the Redis key-value store.
diff --git a/databases/py-redis4/Makefile b/databases/py-redis4/Makefile
new file mode 100644
index 000000000000..855a70250f11
--- /dev/null
+++ b/databases/py-redis4/Makefile
@@ -0,0 +1,41 @@
+PORTNAME=	redis
+PORTVERSION=	4.6.0
+PORTREVISION=	1
+CATEGORIES=	databases python
+MASTER_SITES=	PYPI
+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+PKGNAMESUFFIX=	4
+
+MAINTAINER=	sunpoet@FreeBSD.org
+COMMENT=	Python client for Redis key-value store
+WWW=		https://github.com/redis/redis-py
+
+LICENSE=	MIT
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR}
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py-mock@${PY_FLAVOR} \
+		redis-server:databases/redis
+
+USES=		python
+USE_PYTHON=	autoplist concurrent pep517 pytest
+
+NO_ARCH=	yes
+
+CONFLICTS_INSTALL=	${PYTHON_PKGNAMEPREFIX}redis[0-9]
+
+PORTSCOUT=	limit:^4\.
+
+OPTIONS_DEFINE=	HIREDIS
+HIREDIS_DESC=	High performance response parser
+
+HIREDIS_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}hiredis>=1.0.0:databases/py-hiredis@${PY_FLAVOR}
+
+.include <bsd.port.pre.mk>
+
+.if ${PYTHON_REL} <= 31102
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}async_timeout>=4.0.2:devel/py-async_timeout@${PY_FLAVOR}
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/databases/py-redis4/distinfo b/databases/py-redis4/distinfo
new file mode 100644
index 000000000000..a6fb3703b05e
--- /dev/null
+++ b/databases/py-redis4/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1688166154
+SHA256 (redis-4.6.0.tar.gz) = 585dc516b9eb042a619ef0a39c3d7d55fe81bdb4df09a52c9cdde0d07bf1aa7d
+SIZE (redis-4.6.0.tar.gz) = 4561721
diff --git a/databases/py-redis4/pkg-descr b/databases/py-redis4/pkg-descr
new file mode 100644
index 000000000000..2058c4d187a8
--- /dev/null
+++ b/databases/py-redis4/pkg-descr
@@ -0,0 +1 @@
+This is the Python interface to the Redis key-value store.
diff --git a/databases/py-rrdtool/Makefile b/databases/py-rrdtool/Makefile
index 125055a5caca..24570c694249 100644
--- a/databases/py-rrdtool/Makefile
+++ b/databases/py-rrdtool/Makefile
@@ -1,22 +1,20 @@
-# Created by: Daniel O'Connor
-
 PORTNAME=	rrdtool
-DISTVERSION=	0.1.15
+DISTVERSION=	0.1.16
 CATEGORIES=	databases python
-MASTER_SITES=	CHEESESHOP
-# Bindings name is different from https://pypi.org/project/rrdtool/
-PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+MASTER_SITES=	PYPI
+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX} # Bindings name is different from https://pypi.org/project/rrdtool/
 
 MAINTAINER=	darius@dons.net.au
 COMMENT=	Python interface to RRDTool, the graphing and logging utility
+WWW=		https://github.com/commx/python-rrdtool
 
 LICENSE=	LGPL21+
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	librrd.so:databases/rrdtool
 
-USES=		python:3.6+
-USE_PYTHON=	distutils autoplist
+USES=		python
+USE_PYTHON=	autoplist distutils
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/rrdtool*.so
diff --git a/databases/py-rrdtool/distinfo b/databases/py-rrdtool/distinfo
index 2bc1a503462a..3a18f5135c1d 100644
--- a/databases/py-rrdtool/distinfo
+++ b/databases/py-rrdtool/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1607259691
-SHA256 (rrdtool-0.1.15.tar.gz) = 951d2c23121dbe94859ea46bc9ed54e908e2f2ee60eff3c505db0778a3212732
-SIZE (rrdtool-0.1.15.tar.gz) = 21864
+TIMESTAMP = 1659532096
+SHA256 (rrdtool-0.1.16.tar.gz) = 5f0aff8b3e0a0f701652fa88bf605a54be9e6b25fba52a13b67c71f7b35a1451
+SIZE (rrdtool-0.1.16.tar.gz) = 22088
diff --git a/databases/py-rrdtool/pkg-descr b/databases/py-rrdtool/pkg-descr
index bd6fa4dd54c7..a86364a0db5e 100644
--- a/databases/py-rrdtool/pkg-descr
+++ b/databases/py-rrdtool/pkg-descr
@@ -8,5 +8,3 @@ bindings module for rrdtool by Hye-Shik Chang and are now
 shipped with the RRDtool distribution. This project is
 maintained separately to provide a more pythonic way to
 install those bindings via PyPI.
-
-WWW: https://github.com/commx/python-rrdtool
diff --git a/databases/py-schemachange/Makefile b/databases/py-schemachange/Makefile
new file mode 100644
index 000000000000..e6c205fbf0a7
--- /dev/null
+++ b/databases/py-schemachange/Makefile
@@ -0,0 +1,33 @@
+PORTNAME=	schemachange
+PORTVERSION=	3.6.0
+CATEGORIES=	databases python
+MASTER_SITES=	PYPI
+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+
+MAINTAINER=	pat@patmaddox.com
+COMMENT=	Database Change Management tool for Snowflake
+WWW=		https://github.com/Snowflake-Labs/schemachange
+
+LICENSE=	APACHE20
+
+BUILD_DEPENDS=	${PY_DEPENDS} \
+		${PYTHON_PKGNAMEPREFIX}setuptools>=40.9.0:devel/py-setuptools@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR}
+
+RUN_DEPENDS=	${PY_DEPENDS}
+
+TEST_DEPENDS=	${PY_DEPENDS} \
+		${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR}
+
+USES=		python
+USE_PYTHON=	autoplist concurrent pep517
+
+PY_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Jinja2>=3.0,<4:devel/py-Jinja2@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pandas>=1.3:math/py-pandas@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}yaml>=6.0,<7:devel/py-yaml@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}snowflake-connector-python>=2.8,<4:databases/py-snowflake-connector-python@${PY_FLAVOR}
+
+do-test:
+	@(cd ${TEST_WRKSRC} && ${SETENV} ${TEST_ENV} ${PYTHON_CMD} -m pytest)
+
+.include <bsd.port.mk>
diff --git a/databases/py-schemachange/distinfo b/databases/py-schemachange/distinfo
new file mode 100644
index 000000000000..3270042c2566
--- /dev/null
+++ b/databases/py-schemachange/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1696274412
+SHA256 (schemachange-3.6.0.tar.gz) = 2fc6feb231282659a9056d41f6ae661735ac703e992c30ae96df4c353a031d8d
+SIZE (schemachange-3.6.0.tar.gz) = 48688
diff --git a/databases/py-schemachange/pkg-descr b/databases/py-schemachange/pkg-descr
new file mode 100644
index 000000000000..3631861d1c67
--- /dev/null
+++ b/databases/py-schemachange/pkg-descr
@@ -0,0 +1,6 @@
+schemachange is a simple python based tool to manage all of your Snowflake
+objects. It follows an Imperative-style approach to Database Change Management
+(DCM) and was inspired by the Flyway database migration tool. When combined with
+a version control system and a CI/CD tool, database changes can be approved and
+deployed through a pipeline using modern software delivery practices. As such
+schemachange plays a critical role in enabling Database (or Data) DevOps.
diff --git a/databases/py-sispy/Makefile b/databases/py-sispy/Makefile
index 118ea3d17167..a76ff0c2c1d1 100644
--- a/databases/py-sispy/Makefile
+++ b/databases/py-sispy/Makefile
@@ -1,19 +1,18 @@
-# Created by: Rick Miller
-
 PORTNAME=	sispy
 PORTVERSION=	1.1.0
 CATEGORIES=	databases python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	vrwmiller@gmail.com
 COMMENT=	Python client library for interacting with the SIS RESTful API
+WWW=		https://github.com/sis-cmdb/sis-python
 
 LICENSE=	BSD3CLAUSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR}
 
-USES=		python:3.6+
+USES=		python
 USE_PYTHON=	autoplist distutils
 NO_ARCH=	yes
 
diff --git a/databases/py-sispy/pkg-descr b/databases/py-sispy/pkg-descr
index be8eedfd61d8..1505fdaf6f90 100644
--- a/databases/py-sispy/pkg-descr
+++ b/databases/py-sispy/pkg-descr
@@ -1,3 +1 @@
 Client library for interacting with the SIS RESTful API.
-
-WWW: https://github.com/sis-cmdb/sis-python
diff --git a/databases/py-snowddl/Makefile b/databases/py-snowddl/Makefile
new file mode 100644
index 000000000000..6f5f07c1a97f
--- /dev/null
+++ b/databases/py-snowddl/Makefile
@@ -0,0 +1,25 @@
+PORTNAME=	snowddl
+DISTVERSION=	0.25.2
+CATEGORIES=	databases python
+MASTER_SITES=	PYPI
+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+
+MAINTAINER=	pat@patmaddox.com
+COMMENT=	Object management automation tool for Snowflake
+WWW=		https://docs.snowddl.com/
+
+LICENSE=	APACHE20
+
+BUILD_DEPENDS=	${PY_DEPENDS} \
+		wheel-${PYTHON_VER}:devel/py-wheel@${PY_FLAVOR}
+RUN_DEPENDS=	${PY_DEPENDS}
+
+USES=		python
+USE_PYTHON=	autoplist concurrent pep517
+
+PY_DEPENDS=	${PYTHON_PKGNAMEPREFIX}jsonschema>=4.18,<5:devel/py-jsonschema@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pydantic2>=2.4,<3:devel/py-pydantic2@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}yaml>=6.0,<7:devel/py-yaml@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}snowflake-connector-python>=3.0,<4:databases/py-snowflake-connector-python@${PY_FLAVOR}
+
+.include <bsd.port.mk>
diff --git a/databases/py-snowddl/distinfo b/databases/py-snowddl/distinfo
new file mode 100644
index 000000000000..c823d8205a27
--- /dev/null
+++ b/databases/py-snowddl/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1712267805
+SHA256 (snowddl-0.25.2.tar.gz) = 7de98bafad79b00fae83d5e7bcf1e38d6377c3b120a27ab365c81d0be8b26250
+SIZE (snowddl-0.25.2.tar.gz) = 112636
diff --git a/databases/py-snowddl/pkg-descr b/databases/py-snowddl/pkg-descr
new file mode 100644
index 000000000000..d3444485605d
--- /dev/null
+++ b/databases/py-snowddl/pkg-descr
@@ -0,0 +1,14 @@
+SnowDDL is a declarative-style tool for object management automation in
+Snowflake.
+
+It is not intended to replace other tools entirely, but to provide an
+alternative approach focused on practical data engineering challenges.
+
+You may find SnowDDL useful if:
+
+- complexity of object schema grows exponentially, and it becomes hard to manage
+- your organization maintains multiple Snowflake accounts (dev, stage, prod)
+- your organization has multiple developers sharing the same Snowflake account
+  and suffering from conflicts
+- it is necessary to generate some part of configuration dynamically using
+  Python
diff --git a/databases/py-snowflake-connector-python/Makefile b/databases/py-snowflake-connector-python/Makefile
new file mode 100644
index 000000000000..915908ea09d5
--- /dev/null
+++ b/databases/py-snowflake-connector-python/Makefile
@@ -0,0 +1,42 @@
+PORTNAME=	snowflake-connector-python
+PORTVERSION=	3.5.0
+PORTREVISION=	1
+CATEGORIES=	databases python
+MASTER_SITES=	PYPI
+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+
+MAINTAINER=	pat@patmaddox.com
+COMMENT=	Snowflake Connector for Python
+WWW=		https://github.com/snowflakedb/snowflake-connector-python
+
+LICENSE=	APACHE20
+
+BUILD_DEPENDS=	${PY_DEPENDS} \
+		${PYTHON_PKGNAMEPREFIX}cython3>0:lang/cython3@${PY_FLAVOR}
+
+RUN_DEPENDS=	${PY_DEPENDS}
+
+USES=		python
+USE_PYTHON=	autoplist concurrent distutils
+
+PY_DEPENDS=	${PYTHON_PKGNAMEPREFIX}asn1crypto>0.24.0,<2.0.0:devel/py-asn1crypto@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}cffi>=1.9,<2:devel/py-cffi@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}cryptography>=3.1.0:security/py-cryptography@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}oscrypto<2.0:security/py-oscrypto@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}openssl>=16.2.0:security/py-openssl@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pyjwt<3.0:www/py-pyjwt@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}requests<3.0:www/py-requests@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}importlib-metadata>0:devel/py-importlib-metadata@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}packaging>0:devel/py-packaging@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}charset-normalizer>=2,<4:textproc/py-charset-normalizer@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}idna>=2.5,<4.0:dns/py-idna@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}urllib3>=1.21.1:net/py-urllib3@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}certifi>=2017.4.17:security/py-certifi@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}typing-extensions>=4.3,<5.0:devel/py-typing-extensions@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}filelock>=3.5,<4.0:sysutils/py-filelock@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}sortedcontainers>=2.4.0:devel/py-sortedcontainers@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}platformdirs>=2.6.0,<5.0.0:devel/py-platformdirs@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}tomlkit>0:textproc/py-tomlkit@${PY_FLAVOR}
+
+.include <bsd.port.mk>
diff --git a/databases/py-snowflake-connector-python/distinfo b/databases/py-snowflake-connector-python/distinfo
new file mode 100644
index 000000000000..7ef6b3e3b074
--- /dev/null
+++ b/databases/py-snowflake-connector-python/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1701367506
+SHA256 (snowflake-connector-python-3.5.0.tar.gz) = 654e4a1f68a491544bd8f7c5ab02eb8531df67c5f4309d5253bd204044f8a1b3
+SIZE (snowflake-connector-python-3.5.0.tar.gz) = 702274
diff --git a/databases/py-snowflake-connector-python/files/patch-setup.cfg b/databases/py-snowflake-connector-python/files/patch-setup.cfg
new file mode 100644
index 000000000000..bb597af1f64a
--- /dev/null
+++ b/databases/py-snowflake-connector-python/files/patch-setup.cfg
@@ -0,0 +1,13 @@
+Obtained from:	https://github.com/snowflakedb/snowflake-connector-python/commit/1718a94804e1c737c2f7d7e52d6aafcd8ae3c506
+
+--- setup.cfg.orig	2023-11-13 17:55:47 UTC
++++ setup.cfg
+@@ -58,7 +58,7 @@ install_requires = 
+ 	typing_extensions>=4.3,<5
+ 	filelock>=3.5,<4
+ 	sortedcontainers>=2.4.0
+-	platformdirs>=2.6.0,<4.0.0
++	platformdirs>=2.6.0,<5.0.0
+ 	tomlkit
+ include_package_data = True
+ package_dir = 
diff --git a/databases/py-snowflake-connector-python/files/patch-src_snowflake_connector_nanoarrow__cpp_ArrowIterator_nanoarrow__ipc.c b/databases/py-snowflake-connector-python/files/patch-src_snowflake_connector_nanoarrow__cpp_ArrowIterator_nanoarrow__ipc.c
new file mode 100644
index 000000000000..46bb0a440466
--- /dev/null
+++ b/databases/py-snowflake-connector-python/files/patch-src_snowflake_connector_nanoarrow__cpp_ArrowIterator_nanoarrow__ipc.c
@@ -0,0 +1,29 @@
+--- src/snowflake/connector/nanoarrow_cpp/ArrowIterator/nanoarrow_ipc.c.orig	2023-11-30 19:17:00 UTC
++++ src/snowflake/connector/nanoarrow_cpp/ArrowIterator/nanoarrow_ipc.c
+@@ -21239,7 +21239,7 @@ static inline int ArrowIpcDecoderReadHeaderPrefix(stru
+ 
+   if (header_body_size_bytes == 0) {
+     ArrowErrorSet(error, "End of Arrow stream");
+-    return ENODATA;
++    return ENOATTR;
+   }
+ 
+   return NANOARROW_OK;
+@@ -22194,7 +22194,7 @@ static int ArrowIpcArrayStreamReaderNextHeader(
+     // is one of the valid outcomes) but we set the error anyway in case it gets
+     // propagated higher (e.g., if the stream is empty and there's no schema message)
+     ArrowErrorSet(&private_data->error, "No data available on stream");
+-    return ENODATA;
++    return ENOATTR;
+   } else if (bytes_read != 8) {
+     ArrowErrorSet(&private_data->error,
+                   "Expected at least 8 bytes in remainder of stream");
+@@ -22338,7 +22338,7 @@ static int ArrowIpcArrayStreamReaderGetNext(struct Arr
+   // Read + decode the next header
+   int result = ArrowIpcArrayStreamReaderNextHeader(
+       private_data, NANOARROW_IPC_MESSAGE_TYPE_RECORD_BATCH);
+-  if (result == ENODATA) {
++  if (result == ENOATTR) {
+     // Stream is finished either because there is no input or because
+     // end of stream bytes were read.
+     out->release = NULL;
diff --git a/databases/py-snowflake-connector-python/files/patch-src_snowflake_connector_nanoarrow__cpp_ArrowIterator_nanoarrow__ipc.h b/databases/py-snowflake-connector-python/files/patch-src_snowflake_connector_nanoarrow__cpp_ArrowIterator_nanoarrow__ipc.h
new file mode 100644
index 000000000000..cf93c5d9c978
--- /dev/null
+++ b/databases/py-snowflake-connector-python/files/patch-src_snowflake_connector_nanoarrow__cpp_ArrowIterator_nanoarrow__ipc.h
@@ -0,0 +1,11 @@
+--- src/snowflake/connector/nanoarrow_cpp/ArrowIterator/nanoarrow_ipc.h.orig	2023-11-30 19:16:47 UTC
++++ src/snowflake/connector/nanoarrow_cpp/ArrowIterator/nanoarrow_ipc.h
+@@ -193,7 +193,7 @@ void ArrowIpcDecoderReset(struct ArrowIpcDecoder* deco
+ /// The first 8 bytes of an Arrow IPC message are 0xFFFFFF followed by the size
+ /// of the header as a little-endian 32-bit integer. ArrowIpcDecoderPeekHeader() reads
+ /// these bytes and returns ESPIPE if there are not enough remaining bytes in data to read
+-/// the entire header message, EINVAL if the first 8 bytes are not valid, ENODATA if the
++/// the entire header message, EINVAL if the first 8 bytes are not valid, ENOATTR if the
+ /// Arrow end-of-stream indicator has been reached, or NANOARROW_OK otherwise.
+ ArrowErrorCode ArrowIpcDecoderPeekHeader(struct ArrowIpcDecoder* decoder,
+                                          struct ArrowBufferView data,
diff --git a/databases/py-snowflake-connector-python/pkg-descr b/databases/py-snowflake-connector-python/pkg-descr
new file mode 100644
index 000000000000..bd32aa3fd179
--- /dev/null
+++ b/databases/py-snowflake-connector-python/pkg-descr
@@ -0,0 +1,11 @@
+The Snowflake Connector for Python conforms to the Python DB API 2.0
+specification.
+
+The Snowflake Connector for Python provides an interface for developing Python
+applications that can connect to Snowflake and perform all standard
+operations. It provides a programming alternative to developing applications in
+Java or C/C++ using the Snowflake JDBC or ODBC drivers.
+
+The connector has no dependencies on JDBC or ODBC. It can be installed using pip
+on Linux, Mac OSX, and Windows platforms where Python 3.8.0 (or higher) is
+installed.
diff --git a/databases/py-south/Makefile b/databases/py-south/Makefile
index 2ae53beee01b..8a19af999eca 100644
--- a/databases/py-south/Makefile
+++ b/databases/py-south/Makefile
@@ -1,18 +1,17 @@
-# Created by: Stanislav Svirid <count@211.ru>
-
 PORTNAME=	south
 PORTVERSION=	1.0.2
 CATEGORIES=	databases python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	South-${PORTVERSION}
 
-MAINTAINER=	wg@FreeBSD.org
+MAINTAINER=	wen@FreeBSD.org
 COMMENT=	Intelligent schema migrations for Django apps
+WWW=		https://south.aeracode.org/
 
 LICENSE=	APACHE20
 
-USES=		python:3.6+
+USES=		python
 USE_PYTHON=	distutils autoplist
 
 .include <bsd.port.mk>
diff --git a/databases/py-south/pkg-descr b/databases/py-south/pkg-descr
index ac6484477440..0d806fec7679 100644
--- a/databases/py-south/pkg-descr
+++ b/databases/py-south/pkg-descr
@@ -11,5 +11,3 @@ South is:
       use syncdb for your non-migrated apps without it interfering.
     * Useful for data too; you can write migrations to transform legacy data.
     * Better (we think, anyway) than the alternatives.
-
-WWW: http://south.aeracode.org/
diff --git a/databases/py-sqlalchemy-json/Makefile b/databases/py-sqlalchemy-json/Makefile
index e6105b5885b4..8c89b2caf668 100644
--- a/databases/py-sqlalchemy-json/Makefile
+++ b/databases/py-sqlalchemy-json/Makefile
@@ -1,22 +1,23 @@
-# Created by: Po-Chuan Hsieh <sunpoet@FreeBSD.org>
-
 PORTNAME=	sqlalchemy-json
-PORTVERSION=	0.4.0
+PORTVERSION=	0.7.0
 PORTREVISION=	1
 CATEGORIES=	databases python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	JSON type with nested change tracking for SQLAlchemy
+WWW=		https://github.com/edelooff/sqlalchemy-json
 
 LICENSE=	BSD2CLAUSE
+LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}sqlalchemy14>=0.7:databases/py-sqlalchemy14@${PY_FLAVOR}
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR}
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlalchemy14>=0.7:databases/py-sqlalchemy14@${PY_FLAVOR}
 
-USES=		python:3.6+
-USE_PYTHON=	autoplist concurrent distutils
+USES=		python
+USE_PYTHON=	autoplist concurrent pep517 pytest
 
 NO_ARCH=	yes
 
diff --git a/databases/py-sqlalchemy-json/distinfo b/databases/py-sqlalchemy-json/distinfo
index fb67652a0fcb..878d6b093ac7 100644
--- a/databases/py-sqlalchemy-json/distinfo
+++ b/databases/py-sqlalchemy-json/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1601754184
-SHA256 (sqlalchemy-json-0.4.0.tar.gz) = d8e72cac50724a17cc137c98bec5cb5990e9f1e8fc3eb30dd225fb47c087ea27
-SIZE (sqlalchemy-json-0.4.0.tar.gz) = 5583
+TIMESTAMP = 1693823857
+SHA256 (sqlalchemy-json-0.7.0.tar.gz) = 620d0b26f648f21a8fa9127df66f55f83a5ab4ae010e5397a5c6989a08238561
+SIZE (sqlalchemy-json-0.7.0.tar.gz) = 8848
diff --git a/databases/py-sqlalchemy-json/pkg-descr b/databases/py-sqlalchemy-json/pkg-descr
index 0edf4c6442d7..bc56ff665e6a 100644
--- a/databases/py-sqlalchemy-json/pkg-descr
+++ b/databases/py-sqlalchemy-json/pkg-descr
@@ -1,3 +1 @@
 SQLAlchemy-JSON provides mutation-tracked JSON types to SQLAlchemy.
-
-WWW: https://github.com/edelooff/sqlalchemy-json
diff --git a/databases/py-sqlalchemy-migrate/Makefile b/databases/py-sqlalchemy-migrate/Makefile
index d942656025b7..08c14b607d59 100644
--- a/databases/py-sqlalchemy-migrate/Makefile
+++ b/databases/py-sqlalchemy-migrate/Makefile
@@ -1,26 +1,26 @@
-# Created by: elvstone@gmail.com
-
 PORTNAME=	sqlalchemy-migrate
 PORTVERSION=	0.13.0
+PORTREVISION=	1
 CATEGORIES=	databases python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	lwhsu@FreeBSD.org
 COMMENT=	Database schema migrations for SQLAlchemy
+WWW=		https://opendev.org/x/sqlalchemy-migrate
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pbr>=1.3:devel/py-pbr@${PY_FLAVOR}
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlalchemy12>=0.7.8:databases/py-sqlalchemy12@${PY_FLAVOR} \
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlalchemy14>=0.7.8:databases/py-sqlalchemy14@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}Tempita>=0.4:textproc/py-Tempita@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}decorator>0:devel/py-decorator@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sqlparse>0:databases/py-sqlparse@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}six>=1.7.0:devel/py-six@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pbr>=1.3:devel/py-pbr@${PY_FLAVOR}
 
-USES=		python:3.5+
+USES=		python
 USE_PYTHON=	distutils concurrent autoplist
 
 NO_ARCH=	yes
diff --git a/databases/py-sqlalchemy-migrate/pkg-descr b/databases/py-sqlalchemy-migrate/pkg-descr
index 3248f4845952..166cb63a045f 100644
--- a/databases/py-sqlalchemy-migrate/pkg-descr
+++ b/databases/py-sqlalchemy-migrate/pkg-descr
@@ -3,5 +3,3 @@ with database schema changes in SQLAlchemy projects. Migrate extends
 SQLAlchemy to have database changeset handling. It provides a database
 change repository mechanism which can be used from the command line as
 well as from inside python code.
-
-WWW: https://opendev.org/x/sqlalchemy-migrate
diff --git a/databases/py-sqlalchemy-utils/Makefile b/databases/py-sqlalchemy-utils/Makefile
index 32f9b872ea0e..9c07c2a1f924 100644
--- a/databases/py-sqlalchemy-utils/Makefile
+++ b/databases/py-sqlalchemy-utils/Makefile
@@ -1,28 +1,28 @@
-# Created by: Po-Chuan Hsieh <sunpoet@FreeBSD.org>
-
 PORTNAME=	sqlalchemy-utils
-PORTVERSION=	0.37.8
+PORTVERSION=	0.41.2
+PORTREVISION=	1
 CATEGORIES=	databases python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	SQLAlchemy-Utils-${PORTVERSION}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Various utility functions for SQLAlchemy
+WWW=		https://github.com/kvesteri/sqlalchemy-utils
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}sqlalchemy13>=1.0:databases/py-sqlalchemy13@${PY_FLAVOR}
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR}
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlalchemy14>=1.3:databases/py-sqlalchemy14@${PY_FLAVOR}
 
-USES=		python:3.4+
-USE_PYTHON=	autoplist concurrent distutils
+USES=		python
+USE_PYTHON=	autoplist concurrent pep517
 
 NO_ARCH=	yes
 
-OPTIONS_DEFINE=	ANYJSON ARROW BABEL COLOR ENCRYPTED INTERVALS PASSWORD PENDULUM PHONE TIMEZONE URL
-ANYJSON_DESC=	JSON support
+OPTIONS_DEFINE=	ARROW BABEL COLOR ENCRYPTED INTERVALS PASSWORD PENDULUM PHONE TIMEZONE URL
 ARROW_DESC=	Arrow type support
 BABEL_DESC=	Babel locale type support
 COLOR_DESC=	Color type support
@@ -34,16 +34,15 @@ PHONE_DESC=	Phone number type support
 TIMEZONE_DESC=	Timezone support
 URL_DESC=	URL type support
 
-ANYJSON_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}anyjson>=0.3.3:devel/py-anyjson@${PY_FLAVOR}
 ARROW_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}arrow>=0.3.4:devel/py-arrow@${PY_FLAVOR}
 BABEL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Babel>=1.3:devel/py-babel@${PY_FLAVOR}
 COLOR_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}colour>=0.0.4:graphics/py-colour@${PY_FLAVOR}
-ENCRYPTED_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cryptography>=0.6:security/py-cryptography@${PY_FLAVOR}
+ENCRYPTED_USE=		PYTHON=cryptography
 INTERVALS_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}intervals>=0.7.1:net/py-intervals@${PY_FLAVOR}
 PASSWORD_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}passlib>=1.6<2.0:security/py-passlib@${PY_FLAVOR}
 PENDULUM_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pendulum>=2.0.5:devel/py-pendulum@${PY_FLAVOR}
 PHONE_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}phonenumbers>=5.9.2:devel/py-phonenumbers@${PY_FLAVOR}
-TIMEZONE_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dateutil>=0:devel/py-dateutil@${PY_FLAVOR}
+TIMEZONE_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}python-dateutil>=0:devel/py-python-dateutil@${PY_FLAVOR}
 URL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}furl>=0.4.1:devel/py-furl@${PY_FLAVOR}
 
 .include <bsd.port.mk>
diff --git a/databases/py-sqlalchemy-utils/distinfo b/databases/py-sqlalchemy-utils/distinfo
index 64e14c993ada..528316f9ac80 100644
--- a/databases/py-sqlalchemy-utils/distinfo
+++ b/databases/py-sqlalchemy-utils/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1625323559
-SHA256 (SQLAlchemy-Utils-0.37.8.tar.gz) = a6aaee154f798be4e479af0ceffaa5034d35fcf6f40707c0947d21bde64e05e5
-SIZE (SQLAlchemy-Utils-0.37.8.tar.gz) = 136623
+TIMESTAMP = 1711466112
+SHA256 (SQLAlchemy-Utils-0.41.2.tar.gz) = bc599c8c3b3319e53ce6c5c3c471120bd325d0071fb6f38a10e924e3d07b9990
+SIZE (SQLAlchemy-Utils-0.41.2.tar.gz) = 138017
diff --git a/databases/py-sqlalchemy-utils/files/patch-setup.py b/databases/py-sqlalchemy-utils/files/patch-setup.py
new file mode 100644
index 000000000000..370e47f32a1e
--- /dev/null
+++ b/databases/py-sqlalchemy-utils/files/patch-setup.py
@@ -0,0 +1,11 @@
+--- setup.py.orig	2023-04-27 07:33:40 UTC
++++ setup.py
+@@ -60,7 +60,7 @@ setup(
+ 
+ 
+ setup(
+-    name='SQLAlchemy-Utils',
++    name='sqlalchemy-utils',
+     version=get_version(),
+     url='https://github.com/kvesteri/sqlalchemy-utils',
+     license='BSD',
diff --git a/databases/py-sqlalchemy-utils/pkg-descr b/databases/py-sqlalchemy-utils/pkg-descr
index 8d03b6fdcb00..5af256d4753a 100644
--- a/databases/py-sqlalchemy-utils/pkg-descr
+++ b/databases/py-sqlalchemy-utils/pkg-descr
@@ -1,4 +1,2 @@
 SQLAlchemy-Utils provides various utility functions, new data types and helpers
 for SQLAlchemy.
-
-WWW: https://github.com/kvesteri/sqlalchemy-utils
diff --git a/databases/py-sqlalchemy10/Makefile b/databases/py-sqlalchemy10/Makefile
index 9f27a35a29ec..2d03d0fe65c9 100644
--- a/databases/py-sqlalchemy10/Makefile
+++ b/databases/py-sqlalchemy10/Makefile
@@ -1,29 +1,28 @@
-# Created by: Dryice Dong Liu <dryice@dryice.name>
-
 PORTNAME=	sqlalchemy
 PORTVERSION=	1.0.14
 CATEGORIES=	databases python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 PKGNAMESUFFIX=	10
 DISTNAME=	SQLAlchemy-${DISTVERSION}
 
 MAINTAINER=	m.tsatsenko@gmail.com
 COMMENT=	Python SQL toolkit and Object Relational Mapper 1.0.x
+WWW=		https://www.sqlalchemy.org/
 
 LICENSE=	MIT
 
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR}
 
-USES=		cpe python:3.6+
+USES=		cpe python
 USE_PYTHON=	distutils autoplist
 
 PY2TO3_CMD=	${LOCALBASE}/bin/2to3-${PYTHON_VER}
 PY2TO3_ARGS=	--no-diffs --nobackups --verbose --write
 TEST_TARGET=	do-test
 
-CONFLICTS_INSTALL=	${PYTHON_PKGNAMEPREFIX}sqlalchemy0[6789]* ${PYTHON_PKGNAMEPREFIX}sqlalchemy1[12]
+CONFLICTS_INSTALL=	${PYTHON_PKGNAMEPREFIX}sqlalchemy[0-9][0-9] # lib/python3.8/site-packages/sqlalchemy/__init__.py
 
 OPTIONS_DEFINE=		DOCS EXAMPLES
 OPTIONS_MULTI=		BACKEND
diff --git a/databases/py-sqlalchemy10/pkg-descr b/databases/py-sqlalchemy10/pkg-descr
index 84d56454ff4e..a12f439e6f85 100644
--- a/databases/py-sqlalchemy10/pkg-descr
+++ b/databases/py-sqlalchemy10/pkg-descr
@@ -6,5 +6,3 @@ gives application developers the full power and flexibility of SQL.
 It provides a full suite of well known enterprise-level persistence
 patterns, designed for efficient and high-performing database access,
 adapted into a simple and Pythonic domain language.
-
-WWW: http://www.sqlalchemy.org/
diff --git a/databases/py-sqlalchemy11/Makefile b/databases/py-sqlalchemy11/Makefile
index 8f0efecad9ef..a6674ce07d19 100644
--- a/databases/py-sqlalchemy11/Makefile
+++ b/databases/py-sqlalchemy11/Makefile
@@ -1,25 +1,31 @@
 PORTNAME=	sqlalchemy
 PORTVERSION=	1.1.18
 CATEGORIES=	databases python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 PKGNAMESUFFIX=	11
 DISTNAME=	SQLAlchemy-${PORTVERSION}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Python SQL toolkit and Object Relational Mapper 1.1.x
+WWW=		https://www.sqlalchemy.org/
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
+DEPRECATED=	Upstream makred EOL in Release Status
+EXPIRATION_DATE=2024-04-30
+
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py-mock@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytest>=2.5.2:devel/py-pytest@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}pytest-xdist>=0:devel/py-pytest-xdist@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}pytest-xdist>=0,1:devel/py-pytest-xdist@${PY_FLAVOR}
 
-USES=		cpe python:3.6+
+USES=		cpe python
 USE_PYTHON=	autoplist concurrent distutils
 
-CONFLICTS_INSTALL=	${PYTHON_PKGNAMEPREFIX}sqlalchemy1[0234]
+CONFLICTS_INSTALL=	${PYTHON_PKGNAMEPREFIX}sqlalchemy[0-9][0-9]
+
+PORTSCOUT=	limit:^1\.1\.
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 OPTIONS_MULTI=	BACKEND
@@ -32,7 +38,7 @@ PGSQL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}psycopg2>=2.5.0:databases/py-psycopg2@
 SQLITE_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3@${PY_FLAVOR}
 
 post-install:
-	${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/sqlalchemy/*.so
+	${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR} -name '*.so' -exec ${STRIP_CMD} {} +
 
 post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}/
diff --git a/databases/py-sqlalchemy11/pkg-descr b/databases/py-sqlalchemy11/pkg-descr
index af68df3b6dbb..9b3aa1a4d21e 100644
--- a/databases/py-sqlalchemy11/pkg-descr
+++ b/databases/py-sqlalchemy11/pkg-descr
@@ -6,5 +6,3 @@ application developers the full power and flexibility of SQL.
 It provides a full suite of well known enterprise-level persistence patterns,
 designed for efficient and high-performing database access, adapted into a
 simple and Pythonic domain language.
-
-WWW: https://www.sqlalchemy.org/
diff --git a/databases/py-sqlalchemy12/Makefile b/databases/py-sqlalchemy12/Makefile
index bba3933c3288..85c2109316c1 100644
--- a/databases/py-sqlalchemy12/Makefile
+++ b/databases/py-sqlalchemy12/Makefile
@@ -1,25 +1,32 @@
 PORTNAME=	sqlalchemy
 PORTVERSION=	1.2.19
 CATEGORIES=	databases python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 PKGNAMESUFFIX=	12
 DISTNAME=	SQLAlchemy-${PORTVERSION}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Python SQL toolkit and Object Relational Mapper 1.2.x
+WWW=		https://www.sqlalchemy.org/ \
+		https://github.com/sqlalchemy/sqlalchemy
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
+DEPRECATED=	Upstream makred EOL in Release Status
+EXPIRATION_DATE=2024-04-30
+
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py-mock@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytest>=2.5.2:devel/py-pytest@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}pytest-xdist>=0:devel/py-pytest-xdist@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}pytest-xdist>=0,1:devel/py-pytest-xdist@${PY_FLAVOR}
 
-USES=		cpe python:3.6+
+USES=		cpe python
 USE_PYTHON=	autoplist concurrent distutils
 
-CONFLICTS_INSTALL=	${PYTHON_PKGNAMEPREFIX}sqlalchemy1[0134]
+CONFLICTS_INSTALL=	${PYTHON_PKGNAMEPREFIX}sqlalchemy[0-9][0-9]
+
+PORTSCOUT=	limit:^1\.2\.
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 OPTIONS_MULTI=	BACKEND
@@ -32,7 +39,7 @@ PGSQL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}psycopg2>=2.5.0:databases/py-psycopg2@
 SQLITE_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3@${PY_FLAVOR}
 
 post-install:
-	${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/sqlalchemy/*.so
+	${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR} -name '*.so' -exec ${STRIP_CMD} {} +
 
 post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}/
diff --git a/databases/py-sqlalchemy12/pkg-descr b/databases/py-sqlalchemy12/pkg-descr
index af68df3b6dbb..9b3aa1a4d21e 100644
--- a/databases/py-sqlalchemy12/pkg-descr
+++ b/databases/py-sqlalchemy12/pkg-descr
@@ -6,5 +6,3 @@ application developers the full power and flexibility of SQL.
 It provides a full suite of well known enterprise-level persistence patterns,
 designed for efficient and high-performing database access, adapted into a
 simple and Pythonic domain language.
-
-WWW: https://www.sqlalchemy.org/
diff --git a/databases/py-sqlalchemy13/Makefile b/databases/py-sqlalchemy13/Makefile
index 0fcb7544bf45..7cb083e76ae5 100644
--- a/databases/py-sqlalchemy13/Makefile
+++ b/databases/py-sqlalchemy13/Makefile
@@ -1,25 +1,32 @@
 PORTNAME=	sqlalchemy
 PORTVERSION=	1.3.24
 CATEGORIES=	databases python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 PKGNAMESUFFIX=	13
 DISTNAME=	SQLAlchemy-${PORTVERSION}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Python SQL toolkit and Object Relational Mapper 1.3.x
+WWW=		https://www.sqlalchemy.org/ \
+		https://github.com/sqlalchemy/sqlalchemy
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
+DEPRECATED=	Upstream makred EOL in Release Status
+EXPIRATION_DATE=2024-04-30
+
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py-mock@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytest>=2.5.2:devel/py-pytest@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}pytest-xdist>=0:devel/py-pytest-xdist@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}pytest-xdist>=0,1:devel/py-pytest-xdist@${PY_FLAVOR}
 
-USES=		cpe python:3.6+
+USES=		cpe python
 USE_PYTHON=	autoplist concurrent distutils
 
-CONFLICTS_INSTALL=	${PYTHON_PKGNAMEPREFIX}sqlalchemy1[0124]
+CONFLICTS_INSTALL=	${PYTHON_PKGNAMEPREFIX}sqlalchemy[0-9][0-9]
+
+PORTSCOUT=	limit:^1\.3\.
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 OPTIONS_MULTI=	BACKEND
@@ -32,7 +39,7 @@ PGSQL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}psycopg2>=2.5.0:databases/py-psycopg2@
 SQLITE_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3@${PY_FLAVOR}
 
 post-install:
-	${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/sqlalchemy/*.so
+	${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR} -name '*.so' -exec ${STRIP_CMD} {} +
 
 post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}/
diff --git a/databases/py-sqlalchemy13/pkg-descr b/databases/py-sqlalchemy13/pkg-descr
index af68df3b6dbb..9b3aa1a4d21e 100644
--- a/databases/py-sqlalchemy13/pkg-descr
+++ b/databases/py-sqlalchemy13/pkg-descr
@@ -6,5 +6,3 @@ application developers the full power and flexibility of SQL.
 It provides a full suite of well known enterprise-level persistence patterns,
 designed for efficient and high-performing database access, adapted into a
 simple and Pythonic domain language.
-
-WWW: https://www.sqlalchemy.org/
diff --git a/databases/py-sqlalchemy14/Makefile b/databases/py-sqlalchemy14/Makefile
index f1fe5f058561..1cd3393828ac 100644
--- a/databases/py-sqlalchemy14/Makefile
+++ b/databases/py-sqlalchemy14/Makefile
@@ -1,26 +1,32 @@
 PORTNAME=	sqlalchemy
-PORTVERSION=	1.4.22
+PORTVERSION=	1.4.52
 CATEGORIES=	databases python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 PKGNAMESUFFIX=	14
 DISTNAME=	SQLAlchemy-${PORTVERSION}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Python SQL toolkit and Object Relational Mapper 1.4.x
+WWW=		https://www.sqlalchemy.org/ \
+		https://github.com/sqlalchemy/sqlalchemy
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}greenlet>=0:devel/py-greenlet@${PY_FLAVOR}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py-mock@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytest>=2.5.2:devel/py-pytest@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}pytest-xdist>=0:devel/py-pytest-xdist@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}pytest-xdist>=0,1:devel/py-pytest-xdist@${PY_FLAVOR}
 
-USES=		cpe python:3.6+
-USE_PYTHON=	autoplist concurrent distutils
+USES=		cpe python
+USE_PYTHON=	autoplist concurrent pep517
 
-CONFLICTS_INSTALL=	${PYTHON_PKGNAMEPREFIX}sqlalchemy1[0123]
+CONFLICTS_INSTALL=	${PYTHON_PKGNAMEPREFIX}sqlalchemy[0-9][0-9]
+
+PORTSCOUT=	limit:^1\.4\.
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 OPTIONS_MULTI=	BACKEND
@@ -32,14 +38,8 @@ MYSQL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pymysql>=0:databases/py-pymysql@${PY_F
 PGSQL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}psycopg2>=2.7:databases/py-psycopg2@${PY_FLAVOR}
 SQLITE_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3@${PY_FLAVOR}
 
-.include <bsd.port.pre.mk>
-
-.if ${PYTHON_REL} < 30800
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}importlib-metadata>=0:devel/py-importlib-metadata@${PY_FLAVOR}
-.endif
-
 post-install:
-	${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/sqlalchemy/*.so
+	${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR} -name '*.so' -exec ${STRIP_CMD} {} +
 
 post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}/
@@ -49,4 +49,4 @@ post-install-EXAMPLES-on:
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/
 	cd ${WRKSRC}/examples/ && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/databases/py-sqlalchemy14/distinfo b/databases/py-sqlalchemy14/distinfo
index b0bbd5f07dbb..8732594a6fa6 100644
--- a/databases/py-sqlalchemy14/distinfo
+++ b/databases/py-sqlalchemy14/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1627120832
-SHA256 (SQLAlchemy-1.4.22.tar.gz) = ec1be26cdccd60d180359a527d5980d959a26269a2c7b1b327a1eea0cab37ed8
-SIZE (SQLAlchemy-1.4.22.tar.gz) = 7709437
+TIMESTAMP = 1710712400
+SHA256 (SQLAlchemy-1.4.52.tar.gz) = 80e63bbdc5217dad3485059bdf6f65a7d43f33c8bde619df5c220edf03d87296
+SIZE (SQLAlchemy-1.4.52.tar.gz) = 8514200
diff --git a/databases/py-sqlalchemy14/files/patch-setup.cfg b/databases/py-sqlalchemy14/files/patch-setup.cfg
new file mode 100644
index 000000000000..14cb230abd41
--- /dev/null
+++ b/databases/py-sqlalchemy14/files/patch-setup.cfg
@@ -0,0 +1,9 @@
+--- setup.cfg.orig	2024-03-04 13:25:08 UTC
++++ setup.cfg
+@@ -1,5 +1,5 @@
+ [metadata]
+-name = SQLAlchemy
++name = sqlalchemy
+ description = Database Abstraction Library
+ long_description = file: README.rst
+ long_description_content_type = text/x-rst
diff --git a/databases/py-sqlalchemy14/pkg-descr b/databases/py-sqlalchemy14/pkg-descr
index af68df3b6dbb..9b3aa1a4d21e 100644
--- a/databases/py-sqlalchemy14/pkg-descr
+++ b/databases/py-sqlalchemy14/pkg-descr
@@ -6,5 +6,3 @@ application developers the full power and flexibility of SQL.
 It provides a full suite of well known enterprise-level persistence patterns,
 designed for efficient and high-performing database access, adapted into a
 simple and Pythonic domain language.
-
-WWW: https://www.sqlalchemy.org/
diff --git a/databases/py-sqlalchemy14/pkg-plist b/databases/py-sqlalchemy14/pkg-plist
index b8ab3fa130cd..9c33014cf15b 100644
--- a/databases/py-sqlalchemy14/pkg-plist
+++ b/databases/py-sqlalchemy14/pkg-plist
@@ -6,6 +6,7 @@
 %%PORTDOCS%%%%DOCSDIR%%/_modules/examples/association/proxied_association.html
 %%PORTDOCS%%%%DOCSDIR%%/_modules/examples/asyncio/async_orm.html
 %%PORTDOCS%%%%DOCSDIR%%/_modules/examples/asyncio/basic.html
+%%PORTDOCS%%%%DOCSDIR%%/_modules/examples/asyncio/gather_orm_statements.html
 %%PORTDOCS%%%%DOCSDIR%%/_modules/examples/asyncio/greenlet_orm.html
 %%PORTDOCS%%%%DOCSDIR%%/_modules/examples/custom_attributes/active_column_defaults.html
 %%PORTDOCS%%%%DOCSDIR%%/_modules/examples/custom_attributes/custom_management.html
@@ -45,6 +46,7 @@
 %%PORTDOCS%%%%DOCSDIR%%/_modules/examples/performance/single_inserts.html
 %%PORTDOCS%%%%DOCSDIR%%/_modules/examples/postgis/postgis.html
 %%PORTDOCS%%%%DOCSDIR%%/_modules/examples/sharding/separate_databases.html
+%%PORTDOCS%%%%DOCSDIR%%/_modules/examples/sharding/separate_schema_translates.html
 %%PORTDOCS%%%%DOCSDIR%%/_modules/examples/sharding/separate_tables.html
 %%PORTDOCS%%%%DOCSDIR%%/_modules/examples/space_invaders/space_invaders.html
 %%PORTDOCS%%%%DOCSDIR%%/_modules/examples/versioned_history/history_meta.html
@@ -56,11 +58,16 @@
 %%PORTDOCS%%%%DOCSDIR%%/_modules/examples/vertical/dictlike-polymorphic.html
 %%PORTDOCS%%%%DOCSDIR%%/_modules/examples/vertical/dictlike.html
 %%PORTDOCS%%%%DOCSDIR%%/_modules/index.html
+%%PORTDOCS%%%%DOCSDIR%%/_static/_sphinx_javascript_frameworks_compat.js
+%%PORTDOCS%%%%DOCSDIR%%/_static/annotated.png
 %%PORTDOCS%%%%DOCSDIR%%/_static/basic.css
 %%PORTDOCS%%%%DOCSDIR%%/_static/changelog.css
+%%PORTDOCS%%%%DOCSDIR%%/_static/clipboard.min.js
+%%PORTDOCS%%%%DOCSDIR%%/_static/copybutton.css
+%%PORTDOCS%%%%DOCSDIR%%/_static/copybutton.js
+%%PORTDOCS%%%%DOCSDIR%%/_static/copybutton_funcs.js
 %%PORTDOCS%%%%DOCSDIR%%/_static/deepalchemy.png
 %%PORTDOCS%%%%DOCSDIR%%/_static/deepalchemy_original.png
-%%PORTDOCS%%%%DOCSDIR%%/_static/detectmobile.js
 %%PORTDOCS%%%%DOCSDIR%%/_static/docs.css
 %%PORTDOCS%%%%DOCSDIR%%/_static/doctools.js
 %%PORTDOCS%%%%DOCSDIR%%/_static/documentation_options.js
@@ -68,16 +75,15 @@
 %%PORTDOCS%%%%DOCSDIR%%/_static/dragons_original.png
 %%PORTDOCS%%%%DOCSDIR%%/_static/file.png
 %%PORTDOCS%%%%DOCSDIR%%/_static/init.js
-%%PORTDOCS%%%%DOCSDIR%%/_static/jquery-3.5.1.js
 %%PORTDOCS%%%%DOCSDIR%%/_static/jquery.js
 %%PORTDOCS%%%%DOCSDIR%%/_static/language_data.js
 %%PORTDOCS%%%%DOCSDIR%%/_static/minus.png
+%%PORTDOCS%%%%DOCSDIR%%/_static/nonannotated.png
 %%PORTDOCS%%%%DOCSDIR%%/_static/plus.png
 %%PORTDOCS%%%%DOCSDIR%%/_static/pygments.css
 %%PORTDOCS%%%%DOCSDIR%%/_static/searchtools.js
+%%PORTDOCS%%%%DOCSDIR%%/_static/sphinx_highlight.js
 %%PORTDOCS%%%%DOCSDIR%%/_static/sphinx_paramlinks.css
-%%PORTDOCS%%%%DOCSDIR%%/_static/underscore-1.13.1.js
-%%PORTDOCS%%%%DOCSDIR%%/_static/underscore.js
 %%PORTDOCS%%%%DOCSDIR%%/build/Makefile
 %%PORTDOCS%%%%DOCSDIR%%/build/changelog/README.txt
 %%PORTDOCS%%%%DOCSDIR%%/build/changelog/changelog_01.rst
@@ -113,6 +119,7 @@
 %%PORTDOCS%%%%DOCSDIR%%/build/changelog/unreleased_13/6182.rst
 %%PORTDOCS%%%%DOCSDIR%%/build/changelog/unreleased_13/6392.rst
 %%PORTDOCS%%%%DOCSDIR%%/build/changelog/unreleased_13/6589.rst
+%%PORTDOCS%%%%DOCSDIR%%/build/changelog/unreleased_13/7115.rst
 %%PORTDOCS%%%%DOCSDIR%%/build/changelog/unreleased_13/README.txt
 %%PORTDOCS%%%%DOCSDIR%%/build/changelog/unreleased_14/README.txt
 %%PORTDOCS%%%%DOCSDIR%%/build/conf.py
@@ -132,6 +139,7 @@
 %%PORTDOCS%%%%DOCSDIR%%/build/core/events.rst
 %%PORTDOCS%%%%DOCSDIR%%/build/core/exceptions.rst
 %%PORTDOCS%%%%DOCSDIR%%/build/core/expression_api.rst
+%%PORTDOCS%%%%DOCSDIR%%/build/core/foundation.rst
 %%PORTDOCS%%%%DOCSDIR%%/build/core/functions.rst
 %%PORTDOCS%%%%DOCSDIR%%/build/core/future.rst
 %%PORTDOCS%%%%DOCSDIR%%/build/core/index.rst
@@ -162,6 +170,7 @@
 %%PORTDOCS%%%%DOCSDIR%%/build/errors.rst
 %%PORTDOCS%%%%DOCSDIR%%/build/faq/connections.rst
 %%PORTDOCS%%%%DOCSDIR%%/build/faq/index.rst
+%%PORTDOCS%%%%DOCSDIR%%/build/faq/installation.rst
 %%PORTDOCS%%%%DOCSDIR%%/build/faq/metadata_schema.rst
 %%PORTDOCS%%%%DOCSDIR%%/build/faq/ormconfiguration.rst
 %%PORTDOCS%%%%DOCSDIR%%/build/faq/performance.rst
@@ -179,9 +188,11 @@
 %%PORTDOCS%%%%DOCSDIR%%/build/orm/composites.rst
 %%PORTDOCS%%%%DOCSDIR%%/build/orm/constructors.rst
 %%PORTDOCS%%%%DOCSDIR%%/build/orm/contextual.rst
+%%PORTDOCS%%%%DOCSDIR%%/build/orm/dataclasses.rst
 %%PORTDOCS%%%%DOCSDIR%%/build/orm/declarative_config.rst
 %%PORTDOCS%%%%DOCSDIR%%/build/orm/declarative_mapping.rst
 %%PORTDOCS%%%%DOCSDIR%%/build/orm/declarative_mixins.rst
+%%PORTDOCS%%%%DOCSDIR%%/build/orm/declarative_styles.rst
 %%PORTDOCS%%%%DOCSDIR%%/build/orm/declarative_tables.rst
 %%PORTDOCS%%%%DOCSDIR%%/build/orm/events.rst
 %%PORTDOCS%%%%DOCSDIR%%/build/orm/examples.rst
@@ -225,6 +236,7 @@
 %%PORTDOCS%%%%DOCSDIR%%/build/orm/persistence_techniques.rst
 %%PORTDOCS%%%%DOCSDIR%%/build/orm/query.rst
 %%PORTDOCS%%%%DOCSDIR%%/build/orm/queryguide.rst
+%%PORTDOCS%%%%DOCSDIR%%/build/orm/quickstart.rst
 %%PORTDOCS%%%%DOCSDIR%%/build/orm/relationship_api.rst
 %%PORTDOCS%%%%DOCSDIR%%/build/orm/relationship_persistence.rst
 %%PORTDOCS%%%%DOCSDIR%%/build/orm/relationships.rst
@@ -236,6 +248,7 @@
 %%PORTDOCS%%%%DOCSDIR%%/build/orm/session_events.rst
 %%PORTDOCS%%%%DOCSDIR%%/build/orm/session_state_management.rst
 %%PORTDOCS%%%%DOCSDIR%%/build/orm/session_transaction.rst
+%%PORTDOCS%%%%DOCSDIR%%/build/orm/space_invaders.jpg
 %%PORTDOCS%%%%DOCSDIR%%/build/orm/tutorial.rst
 %%PORTDOCS%%%%DOCSDIR%%/build/orm/versioning.rst
 %%PORTDOCS%%%%DOCSDIR%%/build/requirements.txt
@@ -297,6 +310,7 @@
 %%PORTDOCS%%%%DOCSDIR%%/core/events.html
 %%PORTDOCS%%%%DOCSDIR%%/core/exceptions.html
 %%PORTDOCS%%%%DOCSDIR%%/core/expression_api.html
+%%PORTDOCS%%%%DOCSDIR%%/core/foundation.html
 %%PORTDOCS%%%%DOCSDIR%%/core/functions.html
 %%PORTDOCS%%%%DOCSDIR%%/core/future.html
 %%PORTDOCS%%%%DOCSDIR%%/core/index.html
@@ -326,6 +340,7 @@
 %%PORTDOCS%%%%DOCSDIR%%/errors.html
 %%PORTDOCS%%%%DOCSDIR%%/faq/connections.html
 %%PORTDOCS%%%%DOCSDIR%%/faq/index.html
+%%PORTDOCS%%%%DOCSDIR%%/faq/installation.html
 %%PORTDOCS%%%%DOCSDIR%%/faq/metadata_schema.html
 %%PORTDOCS%%%%DOCSDIR%%/faq/ormconfiguration.html
 %%PORTDOCS%%%%DOCSDIR%%/faq/performance.html
@@ -345,9 +360,11 @@
 %%PORTDOCS%%%%DOCSDIR%%/orm/composites.html
 %%PORTDOCS%%%%DOCSDIR%%/orm/constructors.html
 %%PORTDOCS%%%%DOCSDIR%%/orm/contextual.html
+%%PORTDOCS%%%%DOCSDIR%%/orm/dataclasses.html
 %%PORTDOCS%%%%DOCSDIR%%/orm/declarative_config.html
 %%PORTDOCS%%%%DOCSDIR%%/orm/declarative_mapping.html
 %%PORTDOCS%%%%DOCSDIR%%/orm/declarative_mixins.html
+%%PORTDOCS%%%%DOCSDIR%%/orm/declarative_styles.html
 %%PORTDOCS%%%%DOCSDIR%%/orm/declarative_tables.html
 %%PORTDOCS%%%%DOCSDIR%%/orm/events.html
 %%PORTDOCS%%%%DOCSDIR%%/orm/examples.html
@@ -391,6 +408,7 @@
 %%PORTDOCS%%%%DOCSDIR%%/orm/persistence_techniques.html
 %%PORTDOCS%%%%DOCSDIR%%/orm/query.html
 %%PORTDOCS%%%%DOCSDIR%%/orm/queryguide.html
+%%PORTDOCS%%%%DOCSDIR%%/orm/quickstart.html
 %%PORTDOCS%%%%DOCSDIR%%/orm/relationship_api.html
 %%PORTDOCS%%%%DOCSDIR%%/orm/relationship_persistence.html
 %%PORTDOCS%%%%DOCSDIR%%/orm/relationships.html
@@ -417,7 +435,6 @@
 %%PORTDOCS%%%%DOCSDIR%%/tutorial/metadata.html
 %%PORTDOCS%%%%DOCSDIR%%/tutorial/orm_data_manipulation.html
 %%PORTDOCS%%%%DOCSDIR%%/tutorial/orm_related_objects.html
-%%PORTDOCS%%%%DOCSDIR%%/tutorial/tutorial_nav_include.html
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/__init__.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/adjacency_list/__init__.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/adjacency_list/adjacency_list.py
@@ -428,6 +445,7 @@
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/asyncio/__init__.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/asyncio/async_orm.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/asyncio/basic.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/asyncio/gather_orm_statements.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/asyncio/greenlet_orm.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/custom_attributes/__init__.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/custom_attributes/active_column_defaults.py
@@ -485,6 +503,7 @@
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/postgis/postgis.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/sharding/__init__.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/sharding/separate_databases.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sharding/separate_schema_translates.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/sharding/separate_tables.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/space_invaders/__init__.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/space_invaders/space_invaders.py
diff --git a/databases/py-sqlalchemy20/Makefile b/databases/py-sqlalchemy20/Makefile
new file mode 100644
index 000000000000..411cb12dc32d
--- /dev/null
+++ b/databases/py-sqlalchemy20/Makefile
@@ -0,0 +1,53 @@
+PORTNAME=	sqlalchemy
+PORTVERSION=	2.0.29
+CATEGORIES=	databases python
+MASTER_SITES=	PYPI
+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+PKGNAMESUFFIX=	20
+DISTNAME=	SQLAlchemy-${PORTVERSION}
+
+MAINTAINER=	sunpoet@FreeBSD.org
+COMMENT=	Python SQL toolkit and Object Relational Mapper 2.0.x
+WWW=		https://www.sqlalchemy.org/ \
+		https://github.com/sqlalchemy/sqlalchemy
+
+LICENSE=	MIT
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools>=47:devel/py-setuptools@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR}
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}greenlet>=0:devel/py-greenlet@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}typing-extensions>=4.6.0:devel/py-typing-extensions@${PY_FLAVOR}
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py-mock@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pytest>=2.5.2:devel/py-pytest@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pytest-xdist>=0,1:devel/py-pytest-xdist@${PY_FLAVOR}
+
+USES=		cpe python
+USE_PYTHON=	autoplist concurrent cython pep517
+
+CONFLICTS_INSTALL=	${PYTHON_PKGNAMEPREFIX}sqlalchemy[0-9][0-9]
+
+PORTSCOUT=	limit:^2\.0\.
+
+OPTIONS_DEFINE=	DOCS EXAMPLES
+OPTIONS_MULTI=	BACKEND
+OPTIONS_MULTI_BACKEND=	MSSQL MYSQL PGSQL SQLITE
+OPTIONS_DEFAULT=SQLITE
+
+MSSQL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pymssql>=0:databases/py-pymssql@${PY_FLAVOR}
+MYSQL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pymysql>=0:databases/py-pymysql@${PY_FLAVOR}
+PGSQL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}psycopg>=3.0.7:databases/py-psycopg@${PY_FLAVOR}
+SQLITE_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3@${PY_FLAVOR}
+
+post-install:
+	${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR} -name '*.so' -exec ${STRIP_CMD} {} +
+
+post-install-DOCS-on:
+	${MKDIR} ${STAGEDIR}${DOCSDIR}/
+	cd ${WRKSRC}/doc/ && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}
+
+post-install-EXAMPLES-on:
+	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/
+	cd ${WRKSRC}/examples/ && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}
+
+.include <bsd.port.mk>
diff --git a/databases/py-sqlalchemy20/distinfo b/databases/py-sqlalchemy20/distinfo
new file mode 100644
index 000000000000..8b06caec820f
--- /dev/null
+++ b/databases/py-sqlalchemy20/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1711466114
+SHA256 (SQLAlchemy-2.0.29.tar.gz) = bd9566b8e58cabd700bc367b60e90d9349cd16f0984973f98a9a09f9c64e86f0
+SIZE (SQLAlchemy-2.0.29.tar.gz) = 9543967
diff --git a/databases/py-sqlalchemy20/files/patch-setup.cfg b/databases/py-sqlalchemy20/files/patch-setup.cfg
new file mode 100644
index 000000000000..fe3a5141bc47
--- /dev/null
+++ b/databases/py-sqlalchemy20/files/patch-setup.cfg
@@ -0,0 +1,9 @@
+--- setup.cfg.orig	2023-05-20 00:17:24 UTC
++++ setup.cfg
+@@ -1,5 +1,5 @@
+ [metadata]
+-name = SQLAlchemy
++name = sqlalchemy
+ version = attr: sqlalchemy.__version__
+ description = Database Abstraction Library
+ long_description = file: README.rst
diff --git a/databases/py-sqlalchemy20/pkg-descr b/databases/py-sqlalchemy20/pkg-descr
new file mode 100644
index 000000000000..9b3aa1a4d21e
--- /dev/null
+++ b/databases/py-sqlalchemy20/pkg-descr
@@ -0,0 +1,8 @@
+The Python SQL Toolkit and Object Relational Mapper
+
+SQLAlchemy is the Python SQL toolkit and Object Relational Mapper that gives
+application developers the full power and flexibility of SQL.
+
+It provides a full suite of well known enterprise-level persistence patterns,
+designed for efficient and high-performing database access, adapted into a
+simple and Pythonic domain language.
diff --git a/databases/py-sqlalchemy20/pkg-plist b/databases/py-sqlalchemy20/pkg-plist
new file mode 100644
index 000000000000..51f33c535eef
--- /dev/null
+++ b/databases/py-sqlalchemy20/pkg-plist
@@ -0,0 +1,537 @@
+%%PORTDOCS%%%%DOCSDIR%%/_images/sqla_arch_small.png
+%%PORTDOCS%%%%DOCSDIR%%/_images/sqla_engine_arch.png
+%%PORTDOCS%%%%DOCSDIR%%/_modules/examples/adjacency_list/adjacency_list.html
+%%PORTDOCS%%%%DOCSDIR%%/_modules/examples/association/basic_association.html
+%%PORTDOCS%%%%DOCSDIR%%/_modules/examples/association/dict_of_sets_with_default.html
+%%PORTDOCS%%%%DOCSDIR%%/_modules/examples/association/proxied_association.html
+%%PORTDOCS%%%%DOCSDIR%%/_modules/examples/asyncio/async_orm.html
+%%PORTDOCS%%%%DOCSDIR%%/_modules/examples/asyncio/async_orm_writeonly.html
+%%PORTDOCS%%%%DOCSDIR%%/_modules/examples/asyncio/basic.html
+%%PORTDOCS%%%%DOCSDIR%%/_modules/examples/asyncio/gather_orm_statements.html
+%%PORTDOCS%%%%DOCSDIR%%/_modules/examples/asyncio/greenlet_orm.html
+%%PORTDOCS%%%%DOCSDIR%%/_modules/examples/custom_attributes/active_column_defaults.html
+%%PORTDOCS%%%%DOCSDIR%%/_modules/examples/custom_attributes/custom_management.html
+%%PORTDOCS%%%%DOCSDIR%%/_modules/examples/custom_attributes/listen_for_events.html
+%%PORTDOCS%%%%DOCSDIR%%/_modules/examples/dogpile_caching/advanced.html
+%%PORTDOCS%%%%DOCSDIR%%/_modules/examples/dogpile_caching/caching_query.html
+%%PORTDOCS%%%%DOCSDIR%%/_modules/examples/dogpile_caching/environment.html
+%%PORTDOCS%%%%DOCSDIR%%/_modules/examples/dogpile_caching/fixture_data.html
+%%PORTDOCS%%%%DOCSDIR%%/_modules/examples/dogpile_caching/helloworld.html
+%%PORTDOCS%%%%DOCSDIR%%/_modules/examples/dogpile_caching/local_session_caching.html
+%%PORTDOCS%%%%DOCSDIR%%/_modules/examples/dogpile_caching/model.html
+%%PORTDOCS%%%%DOCSDIR%%/_modules/examples/dogpile_caching/relationship_caching.html
+%%PORTDOCS%%%%DOCSDIR%%/_modules/examples/dynamic_dict/dynamic_dict.html
+%%PORTDOCS%%%%DOCSDIR%%/_modules/examples/extending_query/filter_public.html
+%%PORTDOCS%%%%DOCSDIR%%/_modules/examples/extending_query/temporal_range.html
+%%PORTDOCS%%%%DOCSDIR%%/_modules/examples/generic_associations/discriminator_on_association.html
+%%PORTDOCS%%%%DOCSDIR%%/_modules/examples/generic_associations/generic_fk.html
+%%PORTDOCS%%%%DOCSDIR%%/_modules/examples/generic_associations/table_per_association.html
+%%PORTDOCS%%%%DOCSDIR%%/_modules/examples/generic_associations/table_per_related.html
+%%PORTDOCS%%%%DOCSDIR%%/_modules/examples/graphs/directed_graph.html
+%%PORTDOCS%%%%DOCSDIR%%/_modules/examples/inheritance/concrete.html
+%%PORTDOCS%%%%DOCSDIR%%/_modules/examples/inheritance/joined.html
+%%PORTDOCS%%%%DOCSDIR%%/_modules/examples/inheritance/single.html
+%%PORTDOCS%%%%DOCSDIR%%/_modules/examples/materialized_paths/materialized_paths.html
+%%PORTDOCS%%%%DOCSDIR%%/_modules/examples/nested_sets/nested_sets.html
+%%PORTDOCS%%%%DOCSDIR%%/_modules/examples/performance/__main__.html
+%%PORTDOCS%%%%DOCSDIR%%/_modules/examples/performance/bulk_inserts.html
+%%PORTDOCS%%%%DOCSDIR%%/_modules/examples/performance/bulk_updates.html
+%%PORTDOCS%%%%DOCSDIR%%/_modules/examples/performance/large_resultsets.html
+%%PORTDOCS%%%%DOCSDIR%%/_modules/examples/performance/short_selects.html
+%%PORTDOCS%%%%DOCSDIR%%/_modules/examples/performance/single_inserts.html
+%%PORTDOCS%%%%DOCSDIR%%/_modules/examples/sharding/asyncio.html
+%%PORTDOCS%%%%DOCSDIR%%/_modules/examples/sharding/separate_databases.html
+%%PORTDOCS%%%%DOCSDIR%%/_modules/examples/sharding/separate_schema_translates.html
+%%PORTDOCS%%%%DOCSDIR%%/_modules/examples/sharding/separate_tables.html
+%%PORTDOCS%%%%DOCSDIR%%/_modules/examples/space_invaders/space_invaders.html
+%%PORTDOCS%%%%DOCSDIR%%/_modules/examples/versioned_history/history_meta.html
+%%PORTDOCS%%%%DOCSDIR%%/_modules/examples/versioned_history/test_versioning.html
+%%PORTDOCS%%%%DOCSDIR%%/_modules/examples/versioned_rows/versioned_map.html
+%%PORTDOCS%%%%DOCSDIR%%/_modules/examples/versioned_rows/versioned_rows.html
+%%PORTDOCS%%%%DOCSDIR%%/_modules/examples/versioned_rows/versioned_rows_w_versionid.html
+%%PORTDOCS%%%%DOCSDIR%%/_modules/examples/versioned_rows/versioned_update_old_row.html
+%%PORTDOCS%%%%DOCSDIR%%/_modules/examples/vertical/dictlike-polymorphic.html
+%%PORTDOCS%%%%DOCSDIR%%/_modules/examples/vertical/dictlike.html
+%%PORTDOCS%%%%DOCSDIR%%/_modules/index.html
+%%PORTDOCS%%%%DOCSDIR%%/_static/_sphinx_javascript_frameworks_compat.js
+%%PORTDOCS%%%%DOCSDIR%%/_static/annotated.png
+%%PORTDOCS%%%%DOCSDIR%%/_static/basic.css
+%%PORTDOCS%%%%DOCSDIR%%/_static/changelog.css
+%%PORTDOCS%%%%DOCSDIR%%/_static/clipboard.min.js
+%%PORTDOCS%%%%DOCSDIR%%/_static/copybutton.css
+%%PORTDOCS%%%%DOCSDIR%%/_static/copybutton.js
+%%PORTDOCS%%%%DOCSDIR%%/_static/copybutton_funcs.js
+%%PORTDOCS%%%%DOCSDIR%%/_static/deepalchemy.png
+%%PORTDOCS%%%%DOCSDIR%%/_static/deepalchemy_original.png
+%%PORTDOCS%%%%DOCSDIR%%/_static/docs.css
+%%PORTDOCS%%%%DOCSDIR%%/_static/doctools.js
+%%PORTDOCS%%%%DOCSDIR%%/_static/documentation_options.js
+%%PORTDOCS%%%%DOCSDIR%%/_static/dragons.png
+%%PORTDOCS%%%%DOCSDIR%%/_static/dragons_original.png
+%%PORTDOCS%%%%DOCSDIR%%/_static/file.png
+%%PORTDOCS%%%%DOCSDIR%%/_static/init.js
+%%PORTDOCS%%%%DOCSDIR%%/_static/jquery.js
+%%PORTDOCS%%%%DOCSDIR%%/_static/language_data.js
+%%PORTDOCS%%%%DOCSDIR%%/_static/minus.png
+%%PORTDOCS%%%%DOCSDIR%%/_static/nonannotated.png
+%%PORTDOCS%%%%DOCSDIR%%/_static/plus.png
+%%PORTDOCS%%%%DOCSDIR%%/_static/pygments.css
+%%PORTDOCS%%%%DOCSDIR%%/_static/searchtools.js
+%%PORTDOCS%%%%DOCSDIR%%/_static/sphinx_highlight.js
+%%PORTDOCS%%%%DOCSDIR%%/_static/sphinx_paramlinks.css
+%%PORTDOCS%%%%DOCSDIR%%/build/Makefile
+%%PORTDOCS%%%%DOCSDIR%%/build/changelog/README.txt
+%%PORTDOCS%%%%DOCSDIR%%/build/changelog/changelog_01.rst
+%%PORTDOCS%%%%DOCSDIR%%/build/changelog/changelog_02.rst
+%%PORTDOCS%%%%DOCSDIR%%/build/changelog/changelog_03.rst
+%%PORTDOCS%%%%DOCSDIR%%/build/changelog/changelog_04.rst
+%%PORTDOCS%%%%DOCSDIR%%/build/changelog/changelog_05.rst
+%%PORTDOCS%%%%DOCSDIR%%/build/changelog/changelog_06.rst
+%%PORTDOCS%%%%DOCSDIR%%/build/changelog/changelog_07.rst
+%%PORTDOCS%%%%DOCSDIR%%/build/changelog/changelog_08.rst
+%%PORTDOCS%%%%DOCSDIR%%/build/changelog/changelog_09.rst
+%%PORTDOCS%%%%DOCSDIR%%/build/changelog/changelog_10.rst
+%%PORTDOCS%%%%DOCSDIR%%/build/changelog/changelog_11.rst
+%%PORTDOCS%%%%DOCSDIR%%/build/changelog/changelog_12.rst
+%%PORTDOCS%%%%DOCSDIR%%/build/changelog/changelog_13.rst
+%%PORTDOCS%%%%DOCSDIR%%/build/changelog/changelog_14.rst
+%%PORTDOCS%%%%DOCSDIR%%/build/changelog/changelog_20.rst
+%%PORTDOCS%%%%DOCSDIR%%/build/changelog/index.rst
+%%PORTDOCS%%%%DOCSDIR%%/build/changelog/migration_04.rst
+%%PORTDOCS%%%%DOCSDIR%%/build/changelog/migration_05.rst
+%%PORTDOCS%%%%DOCSDIR%%/build/changelog/migration_06.rst
+%%PORTDOCS%%%%DOCSDIR%%/build/changelog/migration_07.rst
+%%PORTDOCS%%%%DOCSDIR%%/build/changelog/migration_08.rst
+%%PORTDOCS%%%%DOCSDIR%%/build/changelog/migration_09.rst
+%%PORTDOCS%%%%DOCSDIR%%/build/changelog/migration_10.rst
+%%PORTDOCS%%%%DOCSDIR%%/build/changelog/migration_11.rst
+%%PORTDOCS%%%%DOCSDIR%%/build/changelog/migration_12.rst
+%%PORTDOCS%%%%DOCSDIR%%/build/changelog/migration_13.rst
+%%PORTDOCS%%%%DOCSDIR%%/build/changelog/migration_14.rst
+%%PORTDOCS%%%%DOCSDIR%%/build/changelog/migration_20.rst
+%%PORTDOCS%%%%DOCSDIR%%/build/changelog/unreleased_11/README.txt
+%%PORTDOCS%%%%DOCSDIR%%/build/changelog/unreleased_12/README.txt
+%%PORTDOCS%%%%DOCSDIR%%/build/changelog/unreleased_13/6135.rst
+%%PORTDOCS%%%%DOCSDIR%%/build/changelog/unreleased_13/6182.rst
+%%PORTDOCS%%%%DOCSDIR%%/build/changelog/unreleased_13/6392.rst
+%%PORTDOCS%%%%DOCSDIR%%/build/changelog/unreleased_13/6589.rst
+%%PORTDOCS%%%%DOCSDIR%%/build/changelog/unreleased_13/7115.rst
+%%PORTDOCS%%%%DOCSDIR%%/build/changelog/unreleased_13/README.txt
+%%PORTDOCS%%%%DOCSDIR%%/build/changelog/unreleased_14/README.txt
+%%PORTDOCS%%%%DOCSDIR%%/build/changelog/unreleased_20/README.txt
+%%PORTDOCS%%%%DOCSDIR%%/build/changelog/whatsnew_20.rst
+%%PORTDOCS%%%%DOCSDIR%%/build/conf.py
+%%PORTDOCS%%%%DOCSDIR%%/build/contents.rst
+%%PORTDOCS%%%%DOCSDIR%%/build/copyright.rst
+%%PORTDOCS%%%%DOCSDIR%%/build/core/api_basics.rst
+%%PORTDOCS%%%%DOCSDIR%%/build/core/compiler.rst
+%%PORTDOCS%%%%DOCSDIR%%/build/core/connections.rst
+%%PORTDOCS%%%%DOCSDIR%%/build/core/constraints.rst
+%%PORTDOCS%%%%DOCSDIR%%/build/core/custom_types.rst
+%%PORTDOCS%%%%DOCSDIR%%/build/core/ddl.rst
+%%PORTDOCS%%%%DOCSDIR%%/build/core/defaults.rst
+%%PORTDOCS%%%%DOCSDIR%%/build/core/dml.rst
+%%PORTDOCS%%%%DOCSDIR%%/build/core/engines.rst
+%%PORTDOCS%%%%DOCSDIR%%/build/core/engines_connections.rst
+%%PORTDOCS%%%%DOCSDIR%%/build/core/event.rst
+%%PORTDOCS%%%%DOCSDIR%%/build/core/events.rst
+%%PORTDOCS%%%%DOCSDIR%%/build/core/exceptions.rst
+%%PORTDOCS%%%%DOCSDIR%%/build/core/expression_api.rst
+%%PORTDOCS%%%%DOCSDIR%%/build/core/foundation.rst
+%%PORTDOCS%%%%DOCSDIR%%/build/core/functions.rst
+%%PORTDOCS%%%%DOCSDIR%%/build/core/future.rst
+%%PORTDOCS%%%%DOCSDIR%%/build/core/index.rst
+%%PORTDOCS%%%%DOCSDIR%%/build/core/inspection.rst
+%%PORTDOCS%%%%DOCSDIR%%/build/core/internals.rst
+%%PORTDOCS%%%%DOCSDIR%%/build/core/metadata.rst
+%%PORTDOCS%%%%DOCSDIR%%/build/core/operators.rst
+%%PORTDOCS%%%%DOCSDIR%%/build/core/pooling.rst
+%%PORTDOCS%%%%DOCSDIR%%/build/core/reflection.rst
+%%PORTDOCS%%%%DOCSDIR%%/build/core/schema.rst
+%%PORTDOCS%%%%DOCSDIR%%/build/core/selectable.rst
+%%PORTDOCS%%%%DOCSDIR%%/build/core/serializer.rst
+%%PORTDOCS%%%%DOCSDIR%%/build/core/sqla_engine_arch.png
+%%PORTDOCS%%%%DOCSDIR%%/build/core/sqlelement.rst
+%%PORTDOCS%%%%DOCSDIR%%/build/core/tutorial.rst
+%%PORTDOCS%%%%DOCSDIR%%/build/core/type_api.rst
+%%PORTDOCS%%%%DOCSDIR%%/build/core/type_basics.rst
+%%PORTDOCS%%%%DOCSDIR%%/build/core/types.rst
+%%PORTDOCS%%%%DOCSDIR%%/build/core/visitors.rst
+%%PORTDOCS%%%%DOCSDIR%%/build/dialects/index.rst
+%%PORTDOCS%%%%DOCSDIR%%/build/dialects/mssql.rst
+%%PORTDOCS%%%%DOCSDIR%%/build/dialects/mysql.rst
+%%PORTDOCS%%%%DOCSDIR%%/build/dialects/oracle.rst
+%%PORTDOCS%%%%DOCSDIR%%/build/dialects/postgresql.rst
+%%PORTDOCS%%%%DOCSDIR%%/build/dialects/sqlite.rst
+%%PORTDOCS%%%%DOCSDIR%%/build/errors.rst
+%%PORTDOCS%%%%DOCSDIR%%/build/faq/connections.rst
+%%PORTDOCS%%%%DOCSDIR%%/build/faq/index.rst
+%%PORTDOCS%%%%DOCSDIR%%/build/faq/installation.rst
+%%PORTDOCS%%%%DOCSDIR%%/build/faq/metadata_schema.rst
+%%PORTDOCS%%%%DOCSDIR%%/build/faq/ormconfiguration.rst
+%%PORTDOCS%%%%DOCSDIR%%/build/faq/performance.rst
+%%PORTDOCS%%%%DOCSDIR%%/build/faq/sessions.rst
+%%PORTDOCS%%%%DOCSDIR%%/build/faq/sqlexpressions.rst
+%%PORTDOCS%%%%DOCSDIR%%/build/faq/thirdparty.rst
+%%PORTDOCS%%%%DOCSDIR%%/build/glossary.rst
+%%PORTDOCS%%%%DOCSDIR%%/build/index.rst
+%%PORTDOCS%%%%DOCSDIR%%/build/intro.rst
+%%PORTDOCS%%%%DOCSDIR%%/build/orm/backref.rst
+%%PORTDOCS%%%%DOCSDIR%%/build/orm/basic_relationships.rst
+%%PORTDOCS%%%%DOCSDIR%%/build/orm/cascades.rst
+%%PORTDOCS%%%%DOCSDIR%%/build/orm/classical.rst
+%%PORTDOCS%%%%DOCSDIR%%/build/orm/collection_api.rst
+%%PORTDOCS%%%%DOCSDIR%%/build/orm/collections.rst
+%%PORTDOCS%%%%DOCSDIR%%/build/orm/composites.rst
+%%PORTDOCS%%%%DOCSDIR%%/build/orm/constructors.rst
+%%PORTDOCS%%%%DOCSDIR%%/build/orm/contextual.rst
+%%PORTDOCS%%%%DOCSDIR%%/build/orm/dataclasses.rst
+%%PORTDOCS%%%%DOCSDIR%%/build/orm/declarative_config.rst
+%%PORTDOCS%%%%DOCSDIR%%/build/orm/declarative_mapping.rst
+%%PORTDOCS%%%%DOCSDIR%%/build/orm/declarative_mixins.rst
+%%PORTDOCS%%%%DOCSDIR%%/build/orm/declarative_styles.rst
+%%PORTDOCS%%%%DOCSDIR%%/build/orm/declarative_tables.rst
+%%PORTDOCS%%%%DOCSDIR%%/build/orm/events.rst
+%%PORTDOCS%%%%DOCSDIR%%/build/orm/examples.rst
+%%PORTDOCS%%%%DOCSDIR%%/build/orm/exceptions.rst
+%%PORTDOCS%%%%DOCSDIR%%/build/orm/extending.rst
+%%PORTDOCS%%%%DOCSDIR%%/build/orm/extensions/associationproxy.rst
+%%PORTDOCS%%%%DOCSDIR%%/build/orm/extensions/asyncio.rst
+%%PORTDOCS%%%%DOCSDIR%%/build/orm/extensions/automap.rst
+%%PORTDOCS%%%%DOCSDIR%%/build/orm/extensions/baked.rst
+%%PORTDOCS%%%%DOCSDIR%%/build/orm/extensions/declarative/api.rst
+%%PORTDOCS%%%%DOCSDIR%%/build/orm/extensions/declarative/basic_use.rst
+%%PORTDOCS%%%%DOCSDIR%%/build/orm/extensions/declarative/index.rst
+%%PORTDOCS%%%%DOCSDIR%%/build/orm/extensions/declarative/inheritance.rst
+%%PORTDOCS%%%%DOCSDIR%%/build/orm/extensions/declarative/mixins.rst
+%%PORTDOCS%%%%DOCSDIR%%/build/orm/extensions/declarative/relationships.rst
+%%PORTDOCS%%%%DOCSDIR%%/build/orm/extensions/declarative/table_config.rst
+%%PORTDOCS%%%%DOCSDIR%%/build/orm/extensions/horizontal_shard.rst
+%%PORTDOCS%%%%DOCSDIR%%/build/orm/extensions/hybrid.rst
+%%PORTDOCS%%%%DOCSDIR%%/build/orm/extensions/index.rst
+%%PORTDOCS%%%%DOCSDIR%%/build/orm/extensions/indexable.rst
+%%PORTDOCS%%%%DOCSDIR%%/build/orm/extensions/instrumentation.rst
+%%PORTDOCS%%%%DOCSDIR%%/build/orm/extensions/mutable.rst
+%%PORTDOCS%%%%DOCSDIR%%/build/orm/extensions/mypy.rst
+%%PORTDOCS%%%%DOCSDIR%%/build/orm/extensions/orderinglist.rst
+%%PORTDOCS%%%%DOCSDIR%%/build/orm/index.rst
+%%PORTDOCS%%%%DOCSDIR%%/build/orm/inheritance.rst
+%%PORTDOCS%%%%DOCSDIR%%/build/orm/inheritance_loading.rst
+%%PORTDOCS%%%%DOCSDIR%%/build/orm/internals.rst
+%%PORTDOCS%%%%DOCSDIR%%/build/orm/join_conditions.rst
+%%PORTDOCS%%%%DOCSDIR%%/build/orm/large_collections.rst
+%%PORTDOCS%%%%DOCSDIR%%/build/orm/loading.rst
+%%PORTDOCS%%%%DOCSDIR%%/build/orm/loading_columns.rst
+%%PORTDOCS%%%%DOCSDIR%%/build/orm/loading_objects.rst
+%%PORTDOCS%%%%DOCSDIR%%/build/orm/loading_relationships.rst
+%%PORTDOCS%%%%DOCSDIR%%/build/orm/mapped_attributes.rst
+%%PORTDOCS%%%%DOCSDIR%%/build/orm/mapped_sql_expr.rst
+%%PORTDOCS%%%%DOCSDIR%%/build/orm/mapper_config.rst
+%%PORTDOCS%%%%DOCSDIR%%/build/orm/mapping_api.rst
+%%PORTDOCS%%%%DOCSDIR%%/build/orm/mapping_columns.rst
+%%PORTDOCS%%%%DOCSDIR%%/build/orm/mapping_styles.rst
+%%PORTDOCS%%%%DOCSDIR%%/build/orm/nonstandard_mappings.rst
+%%PORTDOCS%%%%DOCSDIR%%/build/orm/persistence_techniques.rst
+%%PORTDOCS%%%%DOCSDIR%%/build/orm/query.rst
+%%PORTDOCS%%%%DOCSDIR%%/build/orm/queryguide.rst
+%%PORTDOCS%%%%DOCSDIR%%/build/orm/queryguide/_deferred_setup.rst
+%%PORTDOCS%%%%DOCSDIR%%/build/orm/queryguide/_dml_setup.rst
+%%PORTDOCS%%%%DOCSDIR%%/build/orm/queryguide/_end_doctest.rst
+%%PORTDOCS%%%%DOCSDIR%%/build/orm/queryguide/_inheritance_setup.rst
+%%PORTDOCS%%%%DOCSDIR%%/build/orm/queryguide/_plain_setup.rst
+%%PORTDOCS%%%%DOCSDIR%%/build/orm/queryguide/_single_inheritance.rst
+%%PORTDOCS%%%%DOCSDIR%%/build/orm/queryguide/api.rst
+%%PORTDOCS%%%%DOCSDIR%%/build/orm/queryguide/columns.rst
+%%PORTDOCS%%%%DOCSDIR%%/build/orm/queryguide/dml.rst
+%%PORTDOCS%%%%DOCSDIR%%/build/orm/queryguide/index.rst
+%%PORTDOCS%%%%DOCSDIR%%/build/orm/queryguide/inheritance.rst
+%%PORTDOCS%%%%DOCSDIR%%/build/orm/queryguide/query.rst
+%%PORTDOCS%%%%DOCSDIR%%/build/orm/queryguide/queryguide_nav_include.rst
+%%PORTDOCS%%%%DOCSDIR%%/build/orm/queryguide/relationships.rst
+%%PORTDOCS%%%%DOCSDIR%%/build/orm/queryguide/select.rst
+%%PORTDOCS%%%%DOCSDIR%%/build/orm/quickstart.rst
+%%PORTDOCS%%%%DOCSDIR%%/build/orm/relationship_api.rst
+%%PORTDOCS%%%%DOCSDIR%%/build/orm/relationship_persistence.rst
+%%PORTDOCS%%%%DOCSDIR%%/build/orm/relationships.rst
+%%PORTDOCS%%%%DOCSDIR%%/build/orm/scalar_mapping.rst
+%%PORTDOCS%%%%DOCSDIR%%/build/orm/self_referential.rst
+%%PORTDOCS%%%%DOCSDIR%%/build/orm/session.rst
+%%PORTDOCS%%%%DOCSDIR%%/build/orm/session_api.rst
+%%PORTDOCS%%%%DOCSDIR%%/build/orm/session_basics.rst
+%%PORTDOCS%%%%DOCSDIR%%/build/orm/session_events.rst
+%%PORTDOCS%%%%DOCSDIR%%/build/orm/session_state_management.rst
+%%PORTDOCS%%%%DOCSDIR%%/build/orm/session_transaction.rst
+%%PORTDOCS%%%%DOCSDIR%%/build/orm/space_invaders.jpg
+%%PORTDOCS%%%%DOCSDIR%%/build/orm/tutorial.rst
+%%PORTDOCS%%%%DOCSDIR%%/build/orm/versioning.rst
+%%PORTDOCS%%%%DOCSDIR%%/build/requirements.txt
+%%PORTDOCS%%%%DOCSDIR%%/build/sqla_arch_small.png
+%%PORTDOCS%%%%DOCSDIR%%/build/texinputs/Makefile
+%%PORTDOCS%%%%DOCSDIR%%/build/texinputs/sphinx.sty
+%%PORTDOCS%%%%DOCSDIR%%/build/tutorial/data.rst
+%%PORTDOCS%%%%DOCSDIR%%/build/tutorial/data_insert.rst
+%%PORTDOCS%%%%DOCSDIR%%/build/tutorial/data_select.rst
+%%PORTDOCS%%%%DOCSDIR%%/build/tutorial/data_update.rst
+%%PORTDOCS%%%%DOCSDIR%%/build/tutorial/dbapi_transactions.rst
+%%PORTDOCS%%%%DOCSDIR%%/build/tutorial/engine.rst
+%%PORTDOCS%%%%DOCSDIR%%/build/tutorial/further_reading.rst
+%%PORTDOCS%%%%DOCSDIR%%/build/tutorial/index.rst
+%%PORTDOCS%%%%DOCSDIR%%/build/tutorial/metadata.rst
+%%PORTDOCS%%%%DOCSDIR%%/build/tutorial/orm_data_manipulation.rst
+%%PORTDOCS%%%%DOCSDIR%%/build/tutorial/orm_related_objects.rst
+%%PORTDOCS%%%%DOCSDIR%%/build/tutorial/tutorial_nav_include.rst
+%%PORTDOCS%%%%DOCSDIR%%/changelog/changelog_01.html
+%%PORTDOCS%%%%DOCSDIR%%/changelog/changelog_02.html
+%%PORTDOCS%%%%DOCSDIR%%/changelog/changelog_03.html
+%%PORTDOCS%%%%DOCSDIR%%/changelog/changelog_04.html
+%%PORTDOCS%%%%DOCSDIR%%/changelog/changelog_05.html
+%%PORTDOCS%%%%DOCSDIR%%/changelog/changelog_06.html
+%%PORTDOCS%%%%DOCSDIR%%/changelog/changelog_07.html
+%%PORTDOCS%%%%DOCSDIR%%/changelog/changelog_08.html
+%%PORTDOCS%%%%DOCSDIR%%/changelog/changelog_09.html
+%%PORTDOCS%%%%DOCSDIR%%/changelog/changelog_10.html
+%%PORTDOCS%%%%DOCSDIR%%/changelog/changelog_11.html
+%%PORTDOCS%%%%DOCSDIR%%/changelog/changelog_12.html
+%%PORTDOCS%%%%DOCSDIR%%/changelog/changelog_13.html
+%%PORTDOCS%%%%DOCSDIR%%/changelog/changelog_14.html
+%%PORTDOCS%%%%DOCSDIR%%/changelog/changelog_20.html
+%%PORTDOCS%%%%DOCSDIR%%/changelog/index.html
+%%PORTDOCS%%%%DOCSDIR%%/changelog/migration_04.html
+%%PORTDOCS%%%%DOCSDIR%%/changelog/migration_05.html
+%%PORTDOCS%%%%DOCSDIR%%/changelog/migration_06.html
+%%PORTDOCS%%%%DOCSDIR%%/changelog/migration_07.html
+%%PORTDOCS%%%%DOCSDIR%%/changelog/migration_08.html
+%%PORTDOCS%%%%DOCSDIR%%/changelog/migration_09.html
+%%PORTDOCS%%%%DOCSDIR%%/changelog/migration_10.html
+%%PORTDOCS%%%%DOCSDIR%%/changelog/migration_11.html
+%%PORTDOCS%%%%DOCSDIR%%/changelog/migration_12.html
+%%PORTDOCS%%%%DOCSDIR%%/changelog/migration_13.html
+%%PORTDOCS%%%%DOCSDIR%%/changelog/migration_14.html
+%%PORTDOCS%%%%DOCSDIR%%/changelog/migration_20.html
+%%PORTDOCS%%%%DOCSDIR%%/changelog/whatsnew_20.html
+%%PORTDOCS%%%%DOCSDIR%%/contents.html
+%%PORTDOCS%%%%DOCSDIR%%/copyright.html
+%%PORTDOCS%%%%DOCSDIR%%/core/api_basics.html
+%%PORTDOCS%%%%DOCSDIR%%/core/compiler.html
+%%PORTDOCS%%%%DOCSDIR%%/core/connections.html
+%%PORTDOCS%%%%DOCSDIR%%/core/constraints.html
+%%PORTDOCS%%%%DOCSDIR%%/core/custom_types.html
+%%PORTDOCS%%%%DOCSDIR%%/core/ddl.html
+%%PORTDOCS%%%%DOCSDIR%%/core/defaults.html
+%%PORTDOCS%%%%DOCSDIR%%/core/dml.html
+%%PORTDOCS%%%%DOCSDIR%%/core/engines.html
+%%PORTDOCS%%%%DOCSDIR%%/core/engines_connections.html
+%%PORTDOCS%%%%DOCSDIR%%/core/event.html
+%%PORTDOCS%%%%DOCSDIR%%/core/events.html
+%%PORTDOCS%%%%DOCSDIR%%/core/exceptions.html
+%%PORTDOCS%%%%DOCSDIR%%/core/expression_api.html
+%%PORTDOCS%%%%DOCSDIR%%/core/foundation.html
+%%PORTDOCS%%%%DOCSDIR%%/core/functions.html
+%%PORTDOCS%%%%DOCSDIR%%/core/future.html
+%%PORTDOCS%%%%DOCSDIR%%/core/index.html
+%%PORTDOCS%%%%DOCSDIR%%/core/inspection.html
+%%PORTDOCS%%%%DOCSDIR%%/core/internals.html
+%%PORTDOCS%%%%DOCSDIR%%/core/metadata.html
+%%PORTDOCS%%%%DOCSDIR%%/core/operators.html
+%%PORTDOCS%%%%DOCSDIR%%/core/pooling.html
+%%PORTDOCS%%%%DOCSDIR%%/core/reflection.html
+%%PORTDOCS%%%%DOCSDIR%%/core/schema.html
+%%PORTDOCS%%%%DOCSDIR%%/core/selectable.html
+%%PORTDOCS%%%%DOCSDIR%%/core/serializer.html
+%%PORTDOCS%%%%DOCSDIR%%/core/sqlelement.html
+%%PORTDOCS%%%%DOCSDIR%%/core/tutorial.html
+%%PORTDOCS%%%%DOCSDIR%%/core/type_api.html
+%%PORTDOCS%%%%DOCSDIR%%/core/type_basics.html
+%%PORTDOCS%%%%DOCSDIR%%/core/types.html
+%%PORTDOCS%%%%DOCSDIR%%/core/visitors.html
+%%PORTDOCS%%%%DOCSDIR%%/dialects/index.html
+%%PORTDOCS%%%%DOCSDIR%%/dialects/mssql.html
+%%PORTDOCS%%%%DOCSDIR%%/dialects/mysql.html
+%%PORTDOCS%%%%DOCSDIR%%/dialects/oracle.html
+%%PORTDOCS%%%%DOCSDIR%%/dialects/postgresql.html
+%%PORTDOCS%%%%DOCSDIR%%/dialects/sqlite.html
+%%PORTDOCS%%%%DOCSDIR%%/errors.html
+%%PORTDOCS%%%%DOCSDIR%%/faq/connections.html
+%%PORTDOCS%%%%DOCSDIR%%/faq/index.html
+%%PORTDOCS%%%%DOCSDIR%%/faq/installation.html
+%%PORTDOCS%%%%DOCSDIR%%/faq/metadata_schema.html
+%%PORTDOCS%%%%DOCSDIR%%/faq/ormconfiguration.html
+%%PORTDOCS%%%%DOCSDIR%%/faq/performance.html
+%%PORTDOCS%%%%DOCSDIR%%/faq/sessions.html
+%%PORTDOCS%%%%DOCSDIR%%/faq/sqlexpressions.html
+%%PORTDOCS%%%%DOCSDIR%%/faq/thirdparty.html
+%%PORTDOCS%%%%DOCSDIR%%/genindex.html
+%%PORTDOCS%%%%DOCSDIR%%/glossary.html
+%%PORTDOCS%%%%DOCSDIR%%/index.html
+%%PORTDOCS%%%%DOCSDIR%%/intro.html
+%%PORTDOCS%%%%DOCSDIR%%/notfound.html
+%%PORTDOCS%%%%DOCSDIR%%/orm/backref.html
+%%PORTDOCS%%%%DOCSDIR%%/orm/basic_relationships.html
+%%PORTDOCS%%%%DOCSDIR%%/orm/cascades.html
+%%PORTDOCS%%%%DOCSDIR%%/orm/classical.html
+%%PORTDOCS%%%%DOCSDIR%%/orm/collection_api.html
+%%PORTDOCS%%%%DOCSDIR%%/orm/collections.html
+%%PORTDOCS%%%%DOCSDIR%%/orm/composites.html
+%%PORTDOCS%%%%DOCSDIR%%/orm/constructors.html
+%%PORTDOCS%%%%DOCSDIR%%/orm/contextual.html
+%%PORTDOCS%%%%DOCSDIR%%/orm/dataclasses.html
+%%PORTDOCS%%%%DOCSDIR%%/orm/declarative_config.html
+%%PORTDOCS%%%%DOCSDIR%%/orm/declarative_mapping.html
+%%PORTDOCS%%%%DOCSDIR%%/orm/declarative_mixins.html
+%%PORTDOCS%%%%DOCSDIR%%/orm/declarative_styles.html
+%%PORTDOCS%%%%DOCSDIR%%/orm/declarative_tables.html
+%%PORTDOCS%%%%DOCSDIR%%/orm/events.html
+%%PORTDOCS%%%%DOCSDIR%%/orm/examples.html
+%%PORTDOCS%%%%DOCSDIR%%/orm/exceptions.html
+%%PORTDOCS%%%%DOCSDIR%%/orm/extending.html
+%%PORTDOCS%%%%DOCSDIR%%/orm/extensions/associationproxy.html
+%%PORTDOCS%%%%DOCSDIR%%/orm/extensions/asyncio.html
+%%PORTDOCS%%%%DOCSDIR%%/orm/extensions/automap.html
+%%PORTDOCS%%%%DOCSDIR%%/orm/extensions/baked.html
+%%PORTDOCS%%%%DOCSDIR%%/orm/extensions/declarative/api.html
+%%PORTDOCS%%%%DOCSDIR%%/orm/extensions/declarative/basic_use.html
+%%PORTDOCS%%%%DOCSDIR%%/orm/extensions/declarative/index.html
+%%PORTDOCS%%%%DOCSDIR%%/orm/extensions/declarative/inheritance.html
+%%PORTDOCS%%%%DOCSDIR%%/orm/extensions/declarative/mixins.html
+%%PORTDOCS%%%%DOCSDIR%%/orm/extensions/declarative/relationships.html
+%%PORTDOCS%%%%DOCSDIR%%/orm/extensions/declarative/table_config.html
+%%PORTDOCS%%%%DOCSDIR%%/orm/extensions/horizontal_shard.html
+%%PORTDOCS%%%%DOCSDIR%%/orm/extensions/hybrid.html
+%%PORTDOCS%%%%DOCSDIR%%/orm/extensions/index.html
+%%PORTDOCS%%%%DOCSDIR%%/orm/extensions/indexable.html
+%%PORTDOCS%%%%DOCSDIR%%/orm/extensions/instrumentation.html
+%%PORTDOCS%%%%DOCSDIR%%/orm/extensions/mutable.html
+%%PORTDOCS%%%%DOCSDIR%%/orm/extensions/mypy.html
+%%PORTDOCS%%%%DOCSDIR%%/orm/extensions/orderinglist.html
+%%PORTDOCS%%%%DOCSDIR%%/orm/index.html
+%%PORTDOCS%%%%DOCSDIR%%/orm/inheritance.html
+%%PORTDOCS%%%%DOCSDIR%%/orm/inheritance_loading.html
+%%PORTDOCS%%%%DOCSDIR%%/orm/internals.html
+%%PORTDOCS%%%%DOCSDIR%%/orm/join_conditions.html
+%%PORTDOCS%%%%DOCSDIR%%/orm/large_collections.html
+%%PORTDOCS%%%%DOCSDIR%%/orm/loading.html
+%%PORTDOCS%%%%DOCSDIR%%/orm/loading_columns.html
+%%PORTDOCS%%%%DOCSDIR%%/orm/loading_objects.html
+%%PORTDOCS%%%%DOCSDIR%%/orm/loading_relationships.html
+%%PORTDOCS%%%%DOCSDIR%%/orm/mapped_attributes.html
+%%PORTDOCS%%%%DOCSDIR%%/orm/mapped_sql_expr.html
+%%PORTDOCS%%%%DOCSDIR%%/orm/mapper_config.html
+%%PORTDOCS%%%%DOCSDIR%%/orm/mapping_api.html
+%%PORTDOCS%%%%DOCSDIR%%/orm/mapping_columns.html
+%%PORTDOCS%%%%DOCSDIR%%/orm/mapping_styles.html
+%%PORTDOCS%%%%DOCSDIR%%/orm/nonstandard_mappings.html
+%%PORTDOCS%%%%DOCSDIR%%/orm/persistence_techniques.html
+%%PORTDOCS%%%%DOCSDIR%%/orm/query.html
+%%PORTDOCS%%%%DOCSDIR%%/orm/queryguide.html
+%%PORTDOCS%%%%DOCSDIR%%/orm/queryguide/_deferred_setup.html
+%%PORTDOCS%%%%DOCSDIR%%/orm/queryguide/_dml_setup.html
+%%PORTDOCS%%%%DOCSDIR%%/orm/queryguide/_end_doctest.html
+%%PORTDOCS%%%%DOCSDIR%%/orm/queryguide/_inheritance_setup.html
+%%PORTDOCS%%%%DOCSDIR%%/orm/queryguide/_plain_setup.html
+%%PORTDOCS%%%%DOCSDIR%%/orm/queryguide/_single_inheritance.html
+%%PORTDOCS%%%%DOCSDIR%%/orm/queryguide/api.html
+%%PORTDOCS%%%%DOCSDIR%%/orm/queryguide/columns.html
+%%PORTDOCS%%%%DOCSDIR%%/orm/queryguide/dml.html
+%%PORTDOCS%%%%DOCSDIR%%/orm/queryguide/index.html
+%%PORTDOCS%%%%DOCSDIR%%/orm/queryguide/inheritance.html
+%%PORTDOCS%%%%DOCSDIR%%/orm/queryguide/query.html
+%%PORTDOCS%%%%DOCSDIR%%/orm/queryguide/relationships.html
+%%PORTDOCS%%%%DOCSDIR%%/orm/queryguide/select.html
+%%PORTDOCS%%%%DOCSDIR%%/orm/quickstart.html
+%%PORTDOCS%%%%DOCSDIR%%/orm/relationship_api.html
+%%PORTDOCS%%%%DOCSDIR%%/orm/relationship_persistence.html
+%%PORTDOCS%%%%DOCSDIR%%/orm/relationships.html
+%%PORTDOCS%%%%DOCSDIR%%/orm/scalar_mapping.html
+%%PORTDOCS%%%%DOCSDIR%%/orm/self_referential.html
+%%PORTDOCS%%%%DOCSDIR%%/orm/session.html
+%%PORTDOCS%%%%DOCSDIR%%/orm/session_api.html
+%%PORTDOCS%%%%DOCSDIR%%/orm/session_basics.html
+%%PORTDOCS%%%%DOCSDIR%%/orm/session_events.html
+%%PORTDOCS%%%%DOCSDIR%%/orm/session_state_management.html
+%%PORTDOCS%%%%DOCSDIR%%/orm/session_transaction.html
+%%PORTDOCS%%%%DOCSDIR%%/orm/tutorial.html
+%%PORTDOCS%%%%DOCSDIR%%/orm/versioning.html
+%%PORTDOCS%%%%DOCSDIR%%/search.html
+%%PORTDOCS%%%%DOCSDIR%%/searchindex.js
+%%PORTDOCS%%%%DOCSDIR%%/tutorial/data.html
+%%PORTDOCS%%%%DOCSDIR%%/tutorial/data_insert.html
+%%PORTDOCS%%%%DOCSDIR%%/tutorial/data_select.html
+%%PORTDOCS%%%%DOCSDIR%%/tutorial/data_update.html
+%%PORTDOCS%%%%DOCSDIR%%/tutorial/dbapi_transactions.html
+%%PORTDOCS%%%%DOCSDIR%%/tutorial/engine.html
+%%PORTDOCS%%%%DOCSDIR%%/tutorial/further_reading.html
+%%PORTDOCS%%%%DOCSDIR%%/tutorial/index.html
+%%PORTDOCS%%%%DOCSDIR%%/tutorial/metadata.html
+%%PORTDOCS%%%%DOCSDIR%%/tutorial/orm_data_manipulation.html
+%%PORTDOCS%%%%DOCSDIR%%/tutorial/orm_related_objects.html
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/__init__.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/adjacency_list/__init__.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/adjacency_list/adjacency_list.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/association/__init__.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/association/basic_association.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/association/dict_of_sets_with_default.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/association/proxied_association.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/asyncio/__init__.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/asyncio/async_orm.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/asyncio/async_orm_writeonly.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/asyncio/basic.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/asyncio/gather_orm_statements.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/asyncio/greenlet_orm.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/custom_attributes/__init__.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/custom_attributes/active_column_defaults.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/custom_attributes/custom_management.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/custom_attributes/listen_for_events.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dogpile_caching/__init__.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dogpile_caching/advanced.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dogpile_caching/caching_query.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dogpile_caching/environment.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dogpile_caching/fixture_data.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dogpile_caching/helloworld.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dogpile_caching/local_session_caching.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dogpile_caching/model.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dogpile_caching/relationship_caching.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dynamic_dict/__init__.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dynamic_dict/dynamic_dict.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/extending_query/__init__.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/extending_query/filter_public.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/extending_query/temporal_range.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/generic_associations/__init__.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/generic_associations/discriminator_on_association.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/generic_associations/generic_fk.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/generic_associations/table_per_association.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/generic_associations/table_per_related.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/graphs/__init__.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/graphs/directed_graph.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/inheritance/__init__.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/inheritance/concrete.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/inheritance/joined.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/inheritance/single.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/materialized_paths/__init__.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/materialized_paths/materialized_paths.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/nested_sets/__init__.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/nested_sets/nested_sets.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/performance/__init__.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/performance/__main__.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/performance/bulk_inserts.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/performance/bulk_updates.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/performance/large_resultsets.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/performance/short_selects.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/performance/single_inserts.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sharding/__init__.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sharding/asyncio.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sharding/separate_databases.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sharding/separate_schema_translates.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sharding/separate_tables.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/space_invaders/__init__.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/space_invaders/space_invaders.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/versioned_history/__init__.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/versioned_history/history_meta.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/versioned_history/test_versioning.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/versioned_rows/__init__.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/versioned_rows/versioned_map.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/versioned_rows/versioned_rows.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/versioned_rows/versioned_rows_w_versionid.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/versioned_rows/versioned_update_old_row.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/vertical/__init__.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/vertical/dictlike-polymorphic.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/vertical/dictlike.py
diff --git a/databases/py-sqlcipher3/Makefile b/databases/py-sqlcipher3/Makefile
new file mode 100644
index 000000000000..464a60b35128
--- /dev/null
+++ b/databases/py-sqlcipher3/Makefile
@@ -0,0 +1,22 @@
+PORTNAME=	sqlcipher3
+DISTVERSION=	0.5.2
+CATEGORIES=	databases python
+MASTER_SITES=	PYPI
+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+
+MAINTAINER=	yuri@FreeBSD.org
+COMMENT=	Python 3 bindings for SQLCipher
+WWW=		https://github.com/coleifer/sqlcipher3
+
+LICENSE=	BSD3CLAUSE
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
+LIB_DEPENDS=	libsqlcipher.so:databases/sqlcipher
+
+USES=		localbase python
+USE_PYTHON=	distutils autoplist pytest
+
+post-install:
+	@${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/sqlcipher3/_sqlite3${PYTHON_EXT_SUFFIX}.so
+
+.include <bsd.port.mk>
diff --git a/databases/py-sqlcipher3/distinfo b/databases/py-sqlcipher3/distinfo
new file mode 100644
index 000000000000..6281a8bdf23b
--- /dev/null
+++ b/databases/py-sqlcipher3/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1707948034
+SHA256 (sqlcipher3-0.5.2.tar.gz) = 032619b45d54520e418c3462f8caee8e3ef08991a43713839f0e6b243beafaee
+SIZE (sqlcipher3-0.5.2.tar.gz) = 40357
diff --git a/databases/py-sqlcipher3/pkg-descr b/databases/py-sqlcipher3/pkg-descr
new file mode 100644
index 000000000000..fb9c5f24d256
--- /dev/null
+++ b/databases/py-sqlcipher3/pkg-descr
@@ -0,0 +1,14 @@
+SQLCipher is a standalone fork of the SQLite database library that adds 256 bit
+AES encryption of database files and other security features like:
+* on-the-fly encryption
+* tamper detection
+* memory sanitization
+* strong key derivation
+
+SQLCipher is based on SQLite and stable upstream release features are
+periodically integrated. While SQLCipher is maintained as a separate version of
+the source tree, the project minimizes alterations to core SQLite code whenever
+possible.
+
+SQLCipher is maintained by Zetetic, LLC, and additional information and
+documentation is available on the official SQLCipher site.
diff --git a/databases/py-sqlglot/Makefile b/databases/py-sqlglot/Makefile
new file mode 100644
index 000000000000..f3e35f921da0
--- /dev/null
+++ b/databases/py-sqlglot/Makefile
@@ -0,0 +1,24 @@
+PORTNAME=	sqlglot
+PORTVERSION=	17.16.2
+PORTREVISION=	1
+CATEGORIES=	databases python
+MASTER_SITES=	PYPI
+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+
+MAINTAINER=	sunpoet@FreeBSD.org
+COMMENT=	Easily customizable SQL parser and transpiler
+WWW=		https://github.com/tobymao/sqlglot
+
+LICENSE=	MIT
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}setuptools-scm>=0:devel/py-setuptools-scm@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR}
+
+USES=		python
+USE_PYTHON=	autoplist concurrent pep517
+
+NO_ARCH=	yes
+
+.include <bsd.port.mk>
diff --git a/databases/py-sqlglot/distinfo b/databases/py-sqlglot/distinfo
new file mode 100644
index 000000000000..2f7d9e14cccb
--- /dev/null
+++ b/databases/py-sqlglot/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1693333947
+SHA256 (sqlglot-17.16.2.tar.gz) = a3447e81da039e8fd3741ca9021141ae51f6909f1de43c18a93a679160538549
+SIZE (sqlglot-17.16.2.tar.gz) = 8562390
diff --git a/databases/py-sqlglot/pkg-descr b/databases/py-sqlglot/pkg-descr
new file mode 100644
index 000000000000..f5fe4d6bc8b8
--- /dev/null
+++ b/databases/py-sqlglot/pkg-descr
@@ -0,0 +1,13 @@
+SQLGlot is a no dependency Python SQL parser, transpiler, and optimizer. It can
+be used to format SQL or translate between different dialects like DuckDB,
+Presto, Spark, and BigQuery. It aims to read a wide variety of SQL inputs and
+output syntactically correct SQL in the targeted dialects.
+
+It is a very comprehensive generic SQL parser with a robust test suite. It is
+also quite performant while being written purely in Python.
+
+You can easily customize the parser, analyze queries, traverse expression trees,
+and programmatically build SQL.
+
+Syntax errors are highlighted and dialect incompatibilities can warn or raise
+depending on configurations.
diff --git a/databases/py-sqlite-fts4/Makefile b/databases/py-sqlite-fts4/Makefile
new file mode 100644
index 000000000000..65566bad2c17
--- /dev/null
+++ b/databases/py-sqlite-fts4/Makefile
@@ -0,0 +1,22 @@
+PORTNAME=	sqlite-fts4
+PORTVERSION=	1.0.1
+CATEGORIES=	databases python
+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+
+MAINTAINER=	loader@FreeBSD.org
+COMMENT=	Python functions for working with SQLite FTS4 search
+WWW=		https://github.com/simonw/sqlite-fts4
+
+LICENSE=	APACHE20
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR}
+
+USES=		python
+USE_GITHUB=	yes
+GH_ACCOUNT=	simonw
+USE_PYTHON=	autoplist distutils pytest
+
+NO_ARCH=	yes
+
+.include <bsd.port.mk>
diff --git a/databases/py-sqlite-fts4/distinfo b/databases/py-sqlite-fts4/distinfo
new file mode 100644
index 000000000000..feb57adb2424
--- /dev/null
+++ b/databases/py-sqlite-fts4/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1658735890
+SHA256 (simonw-sqlite-fts4-1.0.1_GH0.tar.gz) = a261ece8ddb0c70751660220fa64c19c5b491c76111e3ea3870ca1c1c143dfe5
+SIZE (simonw-sqlite-fts4-1.0.1_GH0.tar.gz) = 10786
diff --git a/databases/py-sqlite-fts4/pkg-descr b/databases/py-sqlite-fts4/pkg-descr
new file mode 100644
index 000000000000..1173b6e598f0
--- /dev/null
+++ b/databases/py-sqlite-fts4/pkg-descr
@@ -0,0 +1,2 @@
+Custom SQLite functions written in Python for ranking documents
+indexed using the FTS4 extension.
diff --git a/databases/py-sqlite-utils/Makefile b/databases/py-sqlite-utils/Makefile
new file mode 100644
index 000000000000..da4d0769da99
--- /dev/null
+++ b/databases/py-sqlite-utils/Makefile
@@ -0,0 +1,27 @@
+PORTNAME=	sqlite-utils
+PORTVERSION=	3.28
+PORTREVISION=	1
+CATEGORIES=	databases python
+MASTER_SITES=	PYPI
+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+
+MAINTAINER=	loader@FreeBSD.org
+COMMENT=	Python CLI utility and library for manipulating SQLite databases
+WWW=		https://github.com/simonw/sqlite-utils
+
+LICENSE=	APACHE20
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite-fts4>0:databases/py-sqlite-fts4@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}click>0:devel/py-click@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}click-default-group>0:devel/py-click-default-group@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}tabulate>0:devel/py-tabulate@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}python-dateutil>0:devel/py-python-dateutil@${PY_FLAVOR}
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}hypothesis>0:devel/py-hypothesis@${PY_FLAVOR}
+
+USES=		python
+USE_PYTHON=	autoplist concurrent distutils pytest
+
+NO_ARCH=	yes
+
+.include <bsd.port.mk>
diff --git a/databases/py-sqlite-utils/distinfo b/databases/py-sqlite-utils/distinfo
new file mode 100644
index 000000000000..7a2d9319ddef
--- /dev/null
+++ b/databases/py-sqlite-utils/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1658735281
+SHA256 (sqlite-utils-3.28.tar.gz) = 790b01f4be16c32756b9b5eae07b6b7c905b6613ca538d646877c50b05b0a53a
+SIZE (sqlite-utils-3.28.tar.gz) = 188238
diff --git a/databases/py-sqlite-utils/pkg-descr b/databases/py-sqlite-utils/pkg-descr
new file mode 100644
index 000000000000..8194db2d615b
--- /dev/null
+++ b/databases/py-sqlite-utils/pkg-descr
@@ -0,0 +1,15 @@
+Python CLI utility and library for manipulating SQLite databases.
+
+Some feature highlights
+
+* Pipe JSON (or CSV or TSV) directly into a new SQLite database
+  file, automatically creating a table with the appropriate schema
+* Run in-memory SQL queries, including joins, directly against data
+  in CSV, TSV or JSON files and view the results
+* Configure SQLite full-text search against your database tables
+  and run search queries against them, ordered by relevance
+* Run transformations against your tables to make schema changes
+  that SQLite ALTER TABLE does not directly support, such as
+  changing the type of a column
+* Extract columns into separate tables to better normalize your
+  existing data
diff --git a/databases/py-sqlite3/Makefile b/databases/py-sqlite3/Makefile
index d1ba18d4f4cf..510ad060eac7 100644
--- a/databases/py-sqlite3/Makefile
+++ b/databases/py-sqlite3/Makefile
@@ -1,5 +1,3 @@
-# Created by: Hye-Shik Chang
-
 PORTNAME=	sqlite3
 DISTVERSION=	${PYTHON_DISTVERSION}
 PORTREVISION=	7
@@ -27,6 +25,8 @@ WRKSRC_SUBDIR=	Modules
 
 PYDISTUTILS_INSTALLARGS+=	--install-lib ${PYTHON_LIBDIR}/lib-dynload
 
+TESTING_UNSAFE=	ModuleNotFoundError: No module named '_sqlite3'
+
 .include <bsd.port.pre.mk>
 
 post-extract:
@@ -37,6 +37,9 @@ post-extract:
 .endif
 
 post-install:
-	${STRIP_CMD} ${STAGEDIR}${PYTHON_LIBDIR}/lib-dynload/_sqlite3*.so
+	@${STRIP_CMD} ${STAGEDIR}${PYTHON_LIBDIR}/lib-dynload/_sqlite3*.so
+
+do-test:
+	@${PYTHON_CMD} -c 'import sqlite3'  # minimal smoke test
 
 .include <bsd.port.post.mk>
diff --git a/databases/py-sqlite3/files/setup3.py b/databases/py-sqlite3/files/setup3.py
index 4a5bf6bb5ef6..944c89920852 100644
--- a/databases/py-sqlite3/files/setup3.py
+++ b/databases/py-sqlite3/files/setup3.py
@@ -3,6 +3,8 @@
 #       python setup.py install
 #
 
+import platform
+
 try:
     import distutils
     from distutils import sysconfig
@@ -19,7 +21,6 @@ lib_dirs = [prefix + "/lib"]
 libs = ["sqlite3"]
 macros = [('MODULE_NAME', '"sqlite3"')]
 sqlite_srcs = [
-'_sqlite/cache.c',
 '_sqlite/connection.c',
 '_sqlite/cursor.c',
 '_sqlite/microprotocols.c',
@@ -29,6 +30,14 @@ sqlite_srcs = [
 '_sqlite/statement.c',
 '_sqlite/util.c']
 
+major, minor = map(int, platform.python_version_tuple()[:2])
+
+if (major, minor) <= (3, 10):
+    sqlite_srcs.append('_sqlite/cache.c',)
+
+if (major, minor) >= (3, 11):
+    sqlite_srcs.append('_sqlite/blob.c',)
+
 try:
     import ctypes
     ctypes.CDLL('libsqlite3.so').sqlite3_load_extension
diff --git a/databases/py-sqlobject/Makefile b/databases/py-sqlobject/Makefile
index 96770c5846c2..7d42526c02b7 100644
--- a/databases/py-sqlobject/Makefile
+++ b/databases/py-sqlobject/Makefile
@@ -1,15 +1,13 @@
-# Created by: "Choe, Cheng-Dae" whitekid
-
 PORTNAME=	sqlobject
-PORTVERSION=	1.6.0
-PORTREVISION=	1
+PORTVERSION=	3.11.0
 CATEGORIES=	databases python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	SQLObject-${PORTVERSION}
 
-MAINTAINER=	wg@FreeBSD.org
+MAINTAINER=	wen@FreeBSD.org
 COMMENT=	Python object for manipulation with SQL table row
+WWW=		http://www.sqlobject.org
 
 LICENSE=	LGPL21
 
@@ -17,7 +15,7 @@ BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}formencode>=1.2.2:www/py-formencode@${PY_F
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
-USES=		python:3.6+
+USES=		dos2unix python
 USE_PYTHON=	autoplist distutils
 
 # currently MaxDB(SAP), ADODB are not supported
@@ -31,7 +29,7 @@ MSSQL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pymssql>=0:databases/py-pymssql@${PY_F
 
 post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/README.txt ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/README.rst ${STAGEDIR}${DOCSDIR}
 	(cd ${WRKSRC}/docs && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR})
 
 .include <bsd.port.mk>
diff --git a/databases/py-sqlobject/distinfo b/databases/py-sqlobject/distinfo
index 1740aa04bfdf..4edd005d6838 100644
--- a/databases/py-sqlobject/distinfo
+++ b/databases/py-sqlobject/distinfo
@@ -1,2 +1,3 @@
-SHA256 (SQLObject-1.6.0.tar.gz) = 7299dc568d074ea8cb418bf3ad64a5ed380ae6c18be381519ead6c6a2e578b95
-SIZE (SQLObject-1.6.0.tar.gz) = 276441
+TIMESTAMP = 1700566647
+SHA256 (SQLObject-3.11.0.tar.gz) = 42b1b2acce9ed5cc42b45e06c688af5d4fc68f61fc5671bb1057208a62df7678
+SIZE (SQLObject-3.11.0.tar.gz) = 1327706
diff --git a/databases/py-sqlobject/pkg-descr b/databases/py-sqlobject/pkg-descr
index 57056e5853fd..a7e287f7d12f 100644
--- a/databases/py-sqlobject/pkg-descr
+++ b/databases/py-sqlobject/pkg-descr
@@ -1,5 +1,3 @@
 SQLObject is an object-relational mapper.
 It allows you to translate RDBMS table rows into Python objects,
 and manipulate those objects to transparently manipulate the database.
-
-WWW: http://www.sqlobject.org
diff --git a/databases/py-sqlparse/Makefile b/databases/py-sqlparse/Makefile
index dd730cb8a7bc..468019bfb9f3 100644
--- a/databases/py-sqlparse/Makefile
+++ b/databases/py-sqlparse/Makefile
@@ -1,22 +1,23 @@
-# Created by: Roland van Laar <roland@micite.net>
-
 PORTNAME=	sqlparse
-PORTVERSION=	0.4.1
+PORTVERSION=	0.5.0
 CATEGORIES=	databases python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Non-validating SQL parser for Python
+WWW=		https://github.com/andialbrecht/sqlparse
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-USES=		python:3.5+
-USE_PYTHON=	autoplist concurrent distutils
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}hatchling>=0:devel/py-hatchling@${PY_FLAVOR}
+
+USES=		python shebangfix
+USE_PYTHON=	autoplist concurrent pep517
 
 NO_ARCH=	yes
 
-CONFLICTS_INSTALL=	${PYTHON_PKGNAMEPREFIX}sqlparse020
+SHEBANG_FILES=	sqlparse/cli.py
 
 .include <bsd.port.mk>
diff --git a/databases/py-sqlparse/distinfo b/databases/py-sqlparse/distinfo
index ed6479ecf2a6..54e48f002357 100644
--- a/databases/py-sqlparse/distinfo
+++ b/databases/py-sqlparse/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1602524157
-SHA256 (sqlparse-0.4.1.tar.gz) = 0f91fd2e829c44362cbcfab3e9ae12e22badaa8a29ad5ff599f9ec109f0454e8
-SIZE (sqlparse-0.4.1.tar.gz) = 67228
+TIMESTAMP = 1713528520
+SHA256 (sqlparse-0.5.0.tar.gz) = 714d0a4932c059d16189f58ef5411ec2287a4360f17cdd0edd2d09d4c5087c93
+SIZE (sqlparse-0.5.0.tar.gz) = 83475
diff --git a/databases/py-sqlparse/pkg-descr b/databases/py-sqlparse/pkg-descr
index ee614a0adedc..b778da48c0f6 100644
--- a/databases/py-sqlparse/pkg-descr
+++ b/databases/py-sqlparse/pkg-descr
@@ -1,4 +1,2 @@
 sqlparse is a non-validating SQL parser module.
 It provides support for parsing, splitting and formatting SQL statements.
-
-WWW: https://github.com/andialbrecht/sqlparse
diff --git a/databases/py-sqlrelay/Makefile b/databases/py-sqlrelay/Makefile
index edfdbdad88e4..15d352b562fc 100644
--- a/databases/py-sqlrelay/Makefile
+++ b/databases/py-sqlrelay/Makefile
@@ -1,5 +1,3 @@
-# Created by: Akinori MUSHA aka knu <knu@idaemons.org>
-
 PORTNAME=	${SQLRELAY_PORTNAME}
 PORTVERSION=	${SQLRELAY_PORTVERSION}
 CATEGORIES=	databases python
@@ -9,6 +7,7 @@ DISTFILES=	# none
 
 MAINTAINER=	pi@FreeBSD.org
 COMMENT=	Python modules to access to SQL Relay
+WWW=		https://sqlrelay.sourceforge.net/
 
 EXTRACT_DEPENDS=	${NONEXISTENT}:${SQLRELAY_PORTDIR}:patch
 LIB_DEPENDS=	libsqlrclient.so:${SQLRELAY_PORTDIR}
diff --git a/databases/py-sqlrelay/pkg-descr b/databases/py-sqlrelay/pkg-descr
index 3f5e933d6abc..be041d25312e 100644
--- a/databases/py-sqlrelay/pkg-descr
+++ b/databases/py-sqlrelay/pkg-descr
@@ -1,3 +1 @@
 This package provides Python modules to access to SQL Relay.
-
-WWW: http://sqlrelay.sourceforge.net/
diff --git a/databases/py-tableschema/Makefile b/databases/py-tableschema/Makefile
index 191743d596aa..e6b326e05307 100644
--- a/databases/py-tableschema/Makefile
+++ b/databases/py-tableschema/Makefile
@@ -1,30 +1,32 @@
-# Created by: Po-Chuan Hsieh <sunpoet@FreeBSD.org>
-
 PORTNAME=	tableschema
-PORTVERSION=	1.20.2
+PORTVERSION=	1.20.7
+PORTREVISION=	1
 CATEGORIES=	databases python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Utility library for working with Table Schema
+WWW=		https://github.com/frictionlessdata/tableschema-py
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cached-property>=1.5:devel/py-cached-property@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}click>=3.3:devel/py-click@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}isodate>=0.5.4:devel/py-isodate@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}jsonschema>=2.5:devel/py-jsonschema@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}dateutil>=2.4:devel/py-dateutil@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}python-dateutil>=2.4:devel/py-python-dateutil@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>=2.5:www/py-requests@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}rfc3986>=1.1.0:www/py-rfc3986@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}six>=1.9:devel/py-six@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}tabulator>=1.51.3:devel/py-tabulator@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}unicodecsv>=0.14:devel/py-unicodecsv@${PY_FLAVOR}
 
-USES=		python:3.6+
-USE_PYTHON=	autoplist concurrent distutils
+USES=		python
+USE_PYTHON=	autoplist concurrent pep517
 
 NO_ARCH=	yes
 
diff --git a/databases/py-tableschema/distinfo b/databases/py-tableschema/distinfo
index dab624885eb8..97ba0c52e628 100644
--- a/databases/py-tableschema/distinfo
+++ b/databases/py-tableschema/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1614794252
-SHA256 (tableschema-1.20.2.tar.gz) = cfa3b0aa1c0941002384c6288794f9488cb5ea9188cf84ac700d17758cb036e7
-SIZE (tableschema-1.20.2.tar.gz) = 72379
+TIMESTAMP = 1711466116
+SHA256 (tableschema-1.20.7.tar.gz) = 95de2816058b330a97fbde81fd4f4a5acf937b82dc30264b25854ec4740f0baf
+SIZE (tableschema-1.20.7.tar.gz) = 70928
diff --git a/databases/py-tableschema/pkg-descr b/databases/py-tableschema/pkg-descr
index 741d58775ccc..3f5fa4c57c0e 100644
--- a/databases/py-tableschema/pkg-descr
+++ b/databases/py-tableschema/pkg-descr
@@ -13,5 +13,3 @@ Features:
 - built-in command-line interface to validate and infer schemas
 - storage/plugins system to connect tables to different storage backends like
   SQL Database
-
-WWW: https://github.com/frictionlessdata/tableschema-py
diff --git a/databases/py-tarantool/Makefile b/databases/py-tarantool/Makefile
index 34f8fa984453..f7470ba73715 100644
--- a/databases/py-tarantool/Makefile
+++ b/databases/py-tarantool/Makefile
@@ -1,20 +1,24 @@
-# Created by: Veniamin Gvozdikov <vg@FreeBSD.org>
-
 PORTNAME=	tarantool
-PORTVERSION=	0.7.1
+PORTVERSION=	1.2.0
 CATEGORIES=	databases python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Client library for Tarantool Database
+WWW=		https://github.com/tarantool/tarantool-python
 
-LICENSE=	BSD3CLAUSE
+LICENSE=	BSD2CLAUSE
+LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}msgpack>=0.4.0:devel/py-msgpack@${PY_FLAVOR}
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}setuptools-scm>=6.4.2:devel/py-setuptools-scm@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR}
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}msgpack>=0:devel/py-msgpack@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pytz>=0,1:devel/py-pytz@${PY_FLAVOR}
 
-USES=		python:3.6+
-USE_PYTHON=	autoplist concurrent distutils
+USES=		python
+USE_PYTHON=	autoplist concurrent pep517
 
 NO_ARCH=	yes
 
diff --git a/databases/py-tarantool/distinfo b/databases/py-tarantool/distinfo
index cdcdcc9a35ff..98531d660a92 100644
--- a/databases/py-tarantool/distinfo
+++ b/databases/py-tarantool/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1611856542
-SHA256 (tarantool-0.7.1.tar.gz) = a4bf212e86c5f43dcb6baf89487f0db478a45e2c5a1b16926fbbc0e9aa6eae22
-SIZE (tarantool-0.7.1.tar.gz) = 65930
+TIMESTAMP = 1711860495
+SHA256 (tarantool-1.2.0.tar.gz) = c8a11585fd0b38105e94ff1c35cffa7e7a13eb4cc36e200c07ec25f238566122
+SIZE (tarantool-1.2.0.tar.gz) = 288911
diff --git a/databases/py-tarantool/files/patch-setup.py b/databases/py-tarantool/files/patch-setup.py
new file mode 100644
index 000000000000..44f9fff13b33
--- /dev/null
+++ b/databases/py-tarantool/files/patch-setup.py
@@ -0,0 +1,11 @@
+--- setup.py.orig	2023-04-17 11:03:59 UTC
++++ setup.py
+@@ -112,7 +112,7 @@ setup(
+     command_options=command_options,
+     install_requires=get_dependencies('requirements.txt'),
+     setup_requires=[
+-        'setuptools_scm==6.4.2',
++        'setuptools_scm>=6.4.2',
+     ],
+     python_requires='>=3.6',
+ )
diff --git a/databases/py-tarantool/pkg-descr b/databases/py-tarantool/pkg-descr
index f9723553df1d..dc432b2c1917 100644
--- a/databases/py-tarantool/pkg-descr
+++ b/databases/py-tarantool/pkg-descr
@@ -1,3 +1 @@
 This package is a pure-python client library for Tarantool Database.
-
-WWW: https://github.com/tarantool/tarantool-python
diff --git a/databases/py-tiledb/Makefile b/databases/py-tiledb/Makefile
index dfa0e1b5d2c9..a50fb0526f9f 100644
--- a/databases/py-tiledb/Makefile
+++ b/databases/py-tiledb/Makefile
@@ -1,29 +1,35 @@
-# Created by: Po-Chuan Hsieh <sunpoet@FreeBSD.org>
-
 PORTNAME=	tiledb
-PORTVERSION=	0.8.11
+PORTVERSION=	0.28.0
 CATEGORIES=	databases python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Python interface to the TileDB array storage manager
+WWW=		https://github.com/TileDB-Inc/TileDB-Py
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-NOT_FOR_ARCHS=	i386
-NOT_FOR_ARCHS_REASON=	is currently 64-bit only
-
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cython>=0.27:lang/cython@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}pybind11>=2.6.2:devel/py-pybind11@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}setuptools_scm>=1.5.4:devel/py-setuptools_scm@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}numpy>=1.16,1:math/py-numpy@${PY_FLAVOR} \
-		tiledb>=2.2.8:databases/tiledb
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}numpy>=1.23.2,1:math/py-numpy@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pybind11>=0:devel/py-pybind11@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}setuptools>=61:devel/py-setuptools@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}setuptools-scm>=1.5.4:devel/py-setuptools-scm@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}wheel>=0.30:devel/py-wheel@${PY_FLAVOR} \
+		tiledb>=2.21.1:databases/tiledb
 LIB_DEPENDS=	libtiledb.so:databases/tiledb
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}numpy>=1.16,1:math/py-numpy@${PY_FLAVOR}
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}numpy>=1.23.2,1:math/py-numpy@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}packaging>=0:devel/py-packaging@${PY_FLAVOR}
+
+USES=		compiler:c++17-lang localbase python
+USE_PYTHON=	autoplist concurrent cython pep517
+
+MAKE_ENV=	TILEDB_PATH=${LOCALBASE}
+
+post-patch:
+	@${RM} -r ${WRKSRC}/ci/
 
-USES=		compiler:c++14-lang localbase python:3.7+
-USE_PYTHON=	autoplist concurrent cython distutils
+post-install:
+	${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR} -name '*.so' -exec ${STRIP_CMD} {} +
 
 .include <bsd.port.mk>
diff --git a/databases/py-tiledb/distinfo b/databases/py-tiledb/distinfo
index 9937b4faf1a9..4a9617c38518 100644
--- a/databases/py-tiledb/distinfo
+++ b/databases/py-tiledb/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1622214052
-SHA256 (tiledb-0.8.11.tar.gz) = 66a182ab76d129b6c346e435a45cf365ee47acda85683221041dd235818ec427
-SIZE (tiledb-0.8.11.tar.gz) = 212399
+TIMESTAMP = 1713528502
+SHA256 (tiledb-0.28.0.tar.gz) = b9be057e0f06bc5692dd1755f6774844e44003234e546e1c1ec82300d6ab7284
+SIZE (tiledb-0.28.0.tar.gz) = 338715
diff --git a/databases/py-tiledb/files/patch-requirements_dev.txt b/databases/py-tiledb/files/patch-requirements_dev.txt
new file mode 100644
index 000000000000..4dc176e29aca
--- /dev/null
+++ b/databases/py-tiledb/files/patch-requirements_dev.txt
@@ -0,0 +1,18 @@
+--- requirements_dev.txt.orig	2024-03-22 14:33:47 UTC
++++ requirements_dev.txt
+@@ -3,14 +3,10 @@ numpy >= 1.16.5
+ # ------------------------------------------------
+ # ** MUST sync with misc/requirements_wheel.txt **
+ # ------------------------------------------------
+-build
+-cmake >= 3.23
+ cython
+ pybind11
+-setuptools >= 64
++setuptools >= 61
+ setuptools_scm >= 8
+ wheel >= 0.30
+ contextvars ;python_version<"3.7"
+ dataclasses ;python_version<"3.7"
+-pytest
+--r misc/requirements_test.txt
diff --git a/databases/py-tiledb/files/patch-setup.py b/databases/py-tiledb/files/patch-setup.py
index ae2b28957cf6..8fcd1097ede3 100644
--- a/databases/py-tiledb/files/patch-setup.py
+++ b/databases/py-tiledb/files/patch-setup.py
@@ -1,24 +1,15 @@
---- setup.py.orig	2021-06-08 20:19:16 UTC
+--- setup.py.orig	2023-01-04 19:23:00 UTC
 +++ setup.py
-@@ -489,12 +489,9 @@ def cmake_available():
- def setup_requires():
-     req = [
-         "cython>=0.27",
--        "numpy==1.16.* ; python_version < '3.9' and 'arm' not in platform_machine",
--        "numpy ; python_version >= '3.9' and 'arm' not in platform_machine",
--        "numpy ; 'arm' in platform_machine",
-+        "numpy>=1.16",
-         "setuptools>=18.0",
-         "setuptools_scm>=1.5.4",
--        "wheel>=0.30",
-         "pybind11>=2.6.2",
-     ]
-     # Add cmake requirement if libtiledb is not found and cmake is not available.
-@@ -687,7 +684,6 @@ setup(
-     setup_requires=setup_requires(),
-     install_requires=[
-         "numpy>=1.16",
--        "wheel>=0.30",
-         "contextvars ;python_version<'3.7'",
-         "dataclasses ;python_version<'3.7'",
-     ],
+@@ -555,12 +555,6 @@ def setup_requires():
+         req = parse_requirements("requirements_dev.txt")
+         req = list(filter(lambda r: not r.startswith("-r"), req))
+ 
+-    req_cmake = list(filter(lambda r: "cmake" in r, req))[0]
+-
+-    # Add cmake requirement if libtiledb is not found and cmake is not available.
+-    if not libtiledb_exists(LIB_DIRS) and not cmake_available():
+-        req.append(req_cmake)
+-
+     return req
+ 
+ 
diff --git a/databases/py-tiledb/pkg-descr b/databases/py-tiledb/pkg-descr
index 066fb205fb44..c472c65a7a15 100644
--- a/databases/py-tiledb/pkg-descr
+++ b/databases/py-tiledb/pkg-descr
@@ -5,5 +5,3 @@ efficient parallel I/O system for high scalability, and high-level APIs
 including Python, R, Golang and more.
 
 TileDB-Py is the official Python interface to TileDB.
-
-WWW: https://github.com/TileDB-Inc/TileDB-Py
diff --git a/databases/py-txredisapi/Makefile b/databases/py-txredisapi/Makefile
index a22df9eea8ef..048640f486b8 100644
--- a/databases/py-txredisapi/Makefile
+++ b/databases/py-txredisapi/Makefile
@@ -6,6 +6,7 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	ports@skyforge.at
 COMMENT=	Non-blocking redis client for python
+WWW=		https://github.com/IlyaSkriblovsky/txredisapi
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
@@ -16,7 +17,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted@${PY_FLAVOR} \
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mock>=2.0:devel/py-mock@${PY_FLAVOR} \
 		redis-server:databases/redis
 
-USES=		python:3.6+
+USES=		python
 USE_GITHUB=	yes
 USE_PYTHON=	autoplist distutils
 
diff --git a/databases/py-txredisapi/pkg-descr b/databases/py-txredisapi/pkg-descr
index 869496f10a49..98d11cd7d73e 100644
--- a/databases/py-txredisapi/pkg-descr
+++ b/databases/py-txredisapi/pkg-descr
@@ -1,4 +1,2 @@
 txredisapi is a non-blocking client driver for the redis database, written in
 python. It uses twisted for the asynchronous communication with redis.
-
-WWW: https://github.com/IlyaSkriblovsky/txredisapi
diff --git a/databases/py-unqlite/Makefile b/databases/py-unqlite/Makefile
index ac76e2cfe336..5fc98c60d94c 100644
--- a/databases/py-unqlite/Makefile
+++ b/databases/py-unqlite/Makefile
@@ -1,15 +1,19 @@
 PORTNAME=	unqlite
-PORTVERSION=	0.5.3
+PORTVERSION=	0.9.6
 CATEGORIES=	databases python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
-MAINTAINER=	wg@FreeBSD.org
+MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	Fast Python bindings for the UnQLite embedded NoSQL database
+WWW=		https://github.com/coleifer/unqlite-python
 
 LICENSE=	MIT
 
-USES=		python:3.6+
+USES=		python
 USE_PYTHON=	distutils autoplist cython
 
+post-stage:
+	@${STRIP_CMD} ${STAGEDIR}/${PYTHONPREFIX_SITELIBDIR}/unqlite*.so
+
 .include <bsd.port.mk>
diff --git a/databases/py-unqlite/distinfo b/databases/py-unqlite/distinfo
index ced8e3a4b5ba..b95f20556a53 100644
--- a/databases/py-unqlite/distinfo
+++ b/databases/py-unqlite/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1464625232
-SHA256 (unqlite-0.5.3.tar.gz) = 510244124782764f225dd17d0e2aba2ba60d89ba56fc10ae34943c9175fbd4d1
-SIZE (unqlite-0.5.3.tar.gz) = 535060
+TIMESTAMP = 1689776590
+SHA256 (unqlite-0.9.6.tar.gz) = 2db08624da69e25fe74a1b66b4dc8a975b256b2bb3d4f83fa185133961225c97
+SIZE (unqlite-0.9.6.tar.gz) = 580032
diff --git a/databases/py-unqlite/pkg-descr b/databases/py-unqlite/pkg-descr
index d82272ac84e1..2d847addd2a7 100644
--- a/databases/py-unqlite/pkg-descr
+++ b/databases/py-unqlite/pkg-descr
@@ -1,4 +1,2 @@
 Fast Python bindings for UnQLite, a lightweight, embedded NoSQL database and
 JSON document store.
-
-WWW: https://github.com/coleifer/unqlite-python
diff --git a/databases/py-varstack/Makefile b/databases/py-varstack/Makefile
index d3ecba03c2cb..be8c3e6e5baa 100644
--- a/databases/py-varstack/Makefile
+++ b/databases/py-varstack/Makefile
@@ -5,11 +5,12 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	python@FreeBSD.org
 COMMENT=	Create stacked configuration structures
+WWW=		https://github.com/conversis/varstack
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-USES=		python:3.6+
+USES=		python
 USE_PYTHON=	distutils autoplist
 USE_GITHUB=	yes
 GH_ACCOUNT=	conversis
diff --git a/databases/py-varstack/pkg-descr b/databases/py-varstack/pkg-descr
index 35d08a972c60..695c2d7cfe0f 100644
--- a/databases/py-varstack/pkg-descr
+++ b/databases/py-varstack/pkg-descr
@@ -1,5 +1,3 @@
 Varstack is a system that allows you to stack of layer a set of configuration
 variables and let definitions in the higher more specific levels of the stack
 override/extend the broader one in the lower levels.
-
-WWW: https://github.com/conversis/varstack
diff --git a/databases/py-whisper/Makefile b/databases/py-whisper/Makefile
index c7406eb0e355..6df59b046c55 100644
--- a/databases/py-whisper/Makefile
+++ b/databases/py-whisper/Makefile
@@ -1,21 +1,19 @@
-# Created by: Steven Kreuzer <skreuzer@FreeBSD.org>
-
 PORTNAME=	whisper
-PORTVERSION=	1.1.3
-PORTREVISION=	1
+PORTVERSION=	1.1.10
 CATEGORIES=	databases python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	skreuzer@FreeBSD.org
 COMMENT=	Fixed-size database, similar in design to RRD
+WWW=		https://github.com/graphite-project/whisper
 
 LICENSE=	APACHE20
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${PY_FLAVOR}
 
 NO_ARCH=	yes
-USES=		python:3.6+
+USES=		python
 USE_PYTHON=	autoplist concurrent distutils
 
 .include <bsd.port.mk>
diff --git a/databases/py-whisper/distinfo b/databases/py-whisper/distinfo
index d02b6072bda5..6f5d77401516 100644
--- a/databases/py-whisper/distinfo
+++ b/databases/py-whisper/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1522932311
-SHA256 (whisper-1.1.3.tar.gz) = 2893af2797ae74c29b4aef2109caf8298bae975e5814dce69848735166d71faa
-SIZE (whisper-1.1.3.tar.gz) = 24490
+TIMESTAMP = 1653789398
+SHA256 (whisper-1.1.10.tar.gz) = 435b4fb843c4c752719bdf0511a652d5be710e9bb35ad9ebe3b133268ee31c44
+SIZE (whisper-1.1.10.tar.gz) = 42835
diff --git a/databases/py-whisper/pkg-descr b/databases/py-whisper/pkg-descr
index 57fa035bba6b..bea1708202c3 100644
--- a/databases/py-whisper/pkg-descr
+++ b/databases/py-whisper/pkg-descr
@@ -1,5 +1,3 @@
 Whisper is a fixed-size database, similar in design to RRD
 (round-robin-database). It provides fast, reliable storage of numeric
 data over time.
-
-WWW: https://github.com/graphite-project/whisper
diff --git a/databases/py-xapian/Makefile b/databases/py-xapian/Makefile
index e8012ee47a6a..fb6f12cfd26d 100644
--- a/databases/py-xapian/Makefile
+++ b/databases/py-xapian/Makefile
@@ -1,7 +1,5 @@
-# Created by: Po-Chuan Hsieh <sunpoet@FreeBSD.org>
-
 PORTNAME=	xapian
-PORTVERSION=	1.4.18
+PORTVERSION=	1.4.25
 DISTVERSIONPREFIX=	bindings-
 CATEGORIES=	databases python
 MASTER_SITES=	https://oligarchy.co.uk/xapian/${PORTVERSION}/ \
@@ -10,6 +8,7 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Python binding for Xapian
+WWW=		https://xapian.org/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
@@ -17,7 +16,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 BUILD_DEPENDS=	xapian-core>=${PORTVERSION}:databases/xapian-core
 LIB_DEPENDS=	libxapian.so:databases/xapian-core
 
-USES=		compiler:c++11-lang libtool python:3.6+ tar:xz
+USES=		compiler:c++11-lang libtool python tar:xz
 USE_PYTHON=	flavors
 
 CONFIGURE_ARGS=	--datarootdir=${DATADIR} \
@@ -30,7 +29,6 @@ CONFIGURE_ARGS=	--datarootdir=${DATADIR} \
 		--without-lua \
 		--without-perl \
 		--without-php \
-		--without-php7 \
 		--without-python \
 		--without-ruby \
 		--without-tcl
@@ -48,11 +46,6 @@ PORTSCOUT=	limitw:1,even
 OPTIONS_DEFINE=	DOCS
 
 DOCS_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sphinx>=0,1:textproc/py-sphinx@${PY_FLAVOR}
-
-post-patch:
-	@${REINPLACE_CMD} -e 's|-lstdc++||g' ${WRKSRC}/configure
-
-post-patch-DOCS-off:
-	@${REINPLACE_CMD} -e 's| all-local||; s| install-data-local install-dist_exampledataDATA||' ${WRKSRC}/python/Makefile.in ${WRKSRC}/python3/Makefile.in
+DOCS_EXTRA_PATCHES_OFF=	${PATCHDIR}/extra-patch-python3-Makefile.in
 
 .include <bsd.port.mk>
diff --git a/databases/py-xapian/distinfo b/databases/py-xapian/distinfo
index db5366ad4826..bdd052137d4b 100644
--- a/databases/py-xapian/distinfo
+++ b/databases/py-xapian/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1611665353
-SHA256 (xapian-bindings-1.4.18.tar.xz) = fe52064e90d202f7819130ae3ad013c8b2b9cb517ad9fd607cf41d0110c5f18f
-SIZE (xapian-bindings-1.4.18.tar.xz) = 1135644
+TIMESTAMP = 1710712358
+SHA256 (xapian-bindings-1.4.25.tar.xz) = 068314fca3f54524701492df432fa54c485fd4e39613ca2cd275e136964e81a9
+SIZE (xapian-bindings-1.4.25.tar.xz) = 1076644
diff --git a/databases/py-xapian/files/extra-patch-python3-Makefile.in b/databases/py-xapian/files/extra-patch-python3-Makefile.in
new file mode 100644
index 000000000000..f00876e074d6
--- /dev/null
+++ b/databases/py-xapian/files/extra-patch-python3-Makefile.in
@@ -0,0 +1,20 @@
+--- python3/Makefile.in.orig	2024-03-07 22:58:53 UTC
++++ python3/Makefile.in
+@@ -1094,7 +1094,7 @@ check: $(BUILT_SOURCES)
+ 	$(MAKE) $(AM_MAKEFLAGS) check-TESTS
+ check: $(BUILT_SOURCES)
+ 	$(MAKE) $(AM_MAKEFLAGS) check-am
+-all-am: Makefile $(LTLIBRARIES) $(DATA) all-local
++all-am: Makefile $(LTLIBRARIES) $(DATA)
+ installdirs:
+ 	for dir in "$(DESTDIR)$(pkgpylibdir)" "$(DESTDIR)$(exampledatadir)" "$(DESTDIR)$(pkgpylibdir)"; do \
+ 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+@@ -1160,7 +1160,7 @@ info-am:
+ 
+ info-am:
+ 
+-install-data-am: install-data-local install-dist_exampledataDATA \
++install-data-am: \
+ 	install-pkgpylibDATA install-pkgpylibLTLIBRARIES
+ 	@$(NORMAL_INSTALL)
+ 	$(MAKE) $(AM_MAKEFLAGS) install-data-hook
diff --git a/databases/py-xapian/files/patch-configure b/databases/py-xapian/files/patch-configure
index faad12613e77..d6b74ea6ebdc 100644
--- a/databases/py-xapian/files/patch-configure
+++ b/databases/py-xapian/files/patch-configure
@@ -1,24 +1,31 @@
---- configure.orig	2019-07-24 03:34:23 UTC
+--- configure.orig	2024-03-07 22:58:52 UTC
 +++ configure
-@@ -17102,10 +17102,6 @@ $as_echo "yes" >&6; }
-     else
-       { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
--      if test yes = "$with_python" ; then
--	as_fn_error $? "Couldn't import sphinx module and call sphinx.main() for Python2 - try package python-sphinx" "$LINENO" 5
--      fi
--      PYTHON2=
+@@ -18948,19 +18948,6 @@ printf "%s\n" "$version (too old)" >&6; }
+       PYTHON3_INC=`$PYTHON3 -c 'import os,sysconfig;print(sysconfig.get_path("include").replace(os.sep,"/"))' 2>/dev/null`
+ 
      fi
-     if test -n "$PYTHON2" ; then
-                   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $PYTHON2_INC/Python.h" >&5
-@@ -17289,10 +17285,6 @@ $as_echo "yes" >&6; }
-     else
-       { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
+-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for python3 sphinx module" >&5
+-printf %s "checking for python3 sphinx module... " >&6; }
+-    if $PYTHON3 -c 'import sphinx' >&5 2>&5 ; then
+-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+-printf "%s\n" "yes" >&6; }
+-    else
+-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-printf "%s\n" "no" >&6; }
 -      if test yes = "$with_python3" ; then
 -	as_fn_error $? "Couldn't import sphinx module for Python3 - try package python3-sphinx" "$LINENO" 5
 -      fi
 -      PYTHON3=
-     fi
+-    fi
      if test -n "$PYTHON3" ; then
-                   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $PYTHON3_INC/Python.h" >&5
+                   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $PYTHON3_INC/Python.h" >&5
+ printf %s "checking for $PYTHON3_INC/Python.h... " >&6; }
+@@ -21080,7 +21067,7 @@ if test yes = "$GXX" ; then
+ if test yes = "$GXX" ; then
+                     SWIG_CXXFLAGS="-fno-strict-aliasing"
+ 
+-              XAPIAN_LIBS="$XAPIAN_LIBS -lstdc++"
++              XAPIAN_LIBS="$XAPIAN_LIBS"
+ 
+ 
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
diff --git a/databases/py-xapian/pkg-descr b/databases/py-xapian/pkg-descr
index 666a9ba2b6cd..24214312c37a 100644
--- a/databases/py-xapian/pkg-descr
+++ b/databases/py-xapian/pkg-descr
@@ -1,3 +1 @@
 Python binding for Xapian
-
-WWW: https://xapian.org/
diff --git a/databases/py-xapian/pkg-plist b/databases/py-xapian/pkg-plist
index 69d8e0d410ba..6e8db2c212b9 100644
--- a/databases/py-xapian/pkg-plist
+++ b/databases/py-xapian/pkg-plist
@@ -1,7 +1,5 @@
-%%PYTHON3%%%%PYTHON_SITELIBDIR%%/xapian/__init__.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON3%%%%PYTHON_SITELIBDIR%%/xapian/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/xapian/__init__.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/xapian/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/xapian/__init__.py
-%%PYTHON2%%%%PYTHON_SITELIBDIR%%/xapian/__init__.pyc
-%%PYTHON2%%%%PYTHON_SITELIBDIR%%/xapian/__init__.pyo
 %%PYTHON_SITELIBDIR%%/xapian/_xapian.a
 %%PYTHON_SITELIBDIR%%/xapian/_xapian%%PYTHON_EXT_SUFFIX%%.so
diff --git a/databases/py-zodbpickle/Makefile b/databases/py-zodbpickle/Makefile
index e3488054491a..dd9bfe01ac13 100644
--- a/databases/py-zodbpickle/Makefile
+++ b/databases/py-zodbpickle/Makefile
@@ -1,18 +1,24 @@
-# Created by: Mark Felder <feld@FreeBSD.org>
-
 PORTNAME=	zodbpickle
-PORTVERSION=	2.0.0
+PORTVERSION=	3.0.1
+PORTREVISION=	1
 CATEGORIES=	databases python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Python pickling interface for ZODB
+WWW=		https://github.com/zopefoundation/zodbpickle
 
 LICENSE=	PSFL ZPL21
 LICENSE_COMB=	multi
 
-USES=		python:3.6+
-USE_PYTHON=	autoplist concurrent distutils
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR}
+
+USES=		python
+USE_PYTHON=	autoplist concurrent pep517
+
+post-install:
+	${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR} -name '*.so' -exec ${STRIP_CMD} {} +
 
 .include <bsd.port.mk>
diff --git a/databases/py-zodbpickle/distinfo b/databases/py-zodbpickle/distinfo
index 112718fc17d4..190fa6f4fbce 100644
--- a/databases/py-zodbpickle/distinfo
+++ b/databases/py-zodbpickle/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1577693915
-SHA256 (zodbpickle-2.0.0.tar.gz) = e0d9930f46d41f086a763f40a12d014c46bbc5e19e728c8d66d7a06fef616739
-SIZE (zodbpickle-2.0.0.tar.gz) = 183073
+TIMESTAMP = 1684104374
+SHA256 (zodbpickle-3.0.1.tar.gz) = 0f0975bdd4a7615320e74af2b0b8be4763c73cf8bf7c4212ab72044289e77498
+SIZE (zodbpickle-3.0.1.tar.gz) = 111068
diff --git a/databases/py-zodbpickle/pkg-descr b/databases/py-zodbpickle/pkg-descr
index 20831dc27e3b..567a8f53440d 100644
--- a/databases/py-zodbpickle/pkg-descr
+++ b/databases/py-zodbpickle/pkg-descr
@@ -6,5 +6,3 @@ zodbpickle presents a uniform pickling interface for ZODB:
 - Under Py3k, this package forks the pickle module (and the supporting C
   extension) from both Python 3.2 and Python 3.3. The fork add support for the
   noload operations used by ZODB.
-
-WWW: https://github.com/zopefoundation/zodbpickle
diff --git a/databases/pymongo/Makefile b/databases/pymongo/Makefile
deleted file mode 100644
index 39802ddbf123..000000000000
--- a/databases/pymongo/Makefile
+++ /dev/null
@@ -1,23 +0,0 @@
-# Created by: wen@FreeBSD.org
-
-PORTNAME=	pymongo
-PORTVERSION=	3.12.0
-CATEGORIES=	databases python
-MASTER_SITES=	CHEESESHOP
-PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
-
-MAINTAINER=	farrokhi@FreeBSD.org
-COMMENT=	Python driver for MongoDB
-
-LICENSE=	APACHE20
-
-USES=		python:3.6+
-USE_PYTHON=	autoplist concurrent distutils
-
-CONFLICTS_INSTALL=	py[0-9][0-9]-pymongo28
-
-post-install:
-	        ${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/bson/_cbson${PYTHON_EXT_SUFFIX}.so
-	        ${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/pymongo/_cmessage${PYTHON_EXT_SUFFIX}.so
-
-.include <bsd.port.mk>
diff --git a/databases/pymongo/distinfo b/databases/pymongo/distinfo
deleted file mode 100644
index 023d02cd27da..000000000000
--- a/databases/pymongo/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1626424176
-SHA256 (pymongo-3.12.0.tar.gz) = b88d1742159bc93a078733f9789f563cef26f5e370eba810476a71aa98e5fbc2
-SIZE (pymongo-3.12.0.tar.gz) = 818554
diff --git a/databases/pymongo/pkg-descr b/databases/pymongo/pkg-descr
deleted file mode 100644
index 0ada7a393733..000000000000
--- a/databases/pymongo/pkg-descr
+++ /dev/null
@@ -1,6 +0,0 @@
-The PyMongo distribution contains tools for interacting with
-the Mongo database from Python. The pymongo package is a native
-Python driver for the Mongo database. The gridfs package is a
-gridfs implementation on top of pymongo.
-
-WWW: https://github.com/mongodb/mongo-python-driver
diff --git a/databases/qdbm-plus/Makefile b/databases/qdbm-plus/Makefile
index d093dce5c85c..cfeddd28ed50 100644
--- a/databases/qdbm-plus/Makefile
+++ b/databases/qdbm-plus/Makefile
@@ -1,5 +1,3 @@
-# Created by: Michael Johnson <ahze@FreeBSD.org>
-
 PORTNAME=	qdbm
 PORTVERSION=	1.8.78
 PORTREVISION=	5
@@ -9,6 +7,7 @@ PKGNAMESUFFIX=	-plus
 
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	C++ API for QDBM
+WWW=		https://dbmx.net/qdbm/
 
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKDIR}/${PORTNAME}-${PORTVERSION}/COPYING
@@ -17,10 +16,12 @@ LIB_DEPENDS=	liblzo2.so:archivers/lzo2 \
 		libqdbm.so:databases/qdbm
 
 USES=		iconv shebangfix
+USE_CXXSTD=	c++14
+USE_LDCONFIG=	yes
+
 SHEBANG_FILES=	xapidoc/installdox
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}/plus
 GNU_CONFIGURE=	yes
-USE_LDCONFIG=	yes
 CONFIGURE_ENV=	ac_cv_lib_iconv_main=yes
 CXXFLAGS+=	-fsigned-char -fPIC
 INSTALL_TARGET=	install-strip
diff --git a/databases/qdbm-plus/pkg-descr b/databases/qdbm-plus/pkg-descr
index e46d26b07363..8612b2244318 100644
--- a/databases/qdbm-plus/pkg-descr
+++ b/databases/qdbm-plus/pkg-descr
@@ -1,3 +1 @@
 C++ API for QDBM
-
-WWW: https://dbmx.net/qdbm/
diff --git a/databases/qdbm/Makefile b/databases/qdbm/Makefile
index 42439a94ba3e..cecd30522096 100644
--- a/databases/qdbm/Makefile
+++ b/databases/qdbm/Makefile
@@ -1,13 +1,12 @@
-# Created by: Kimura Fuyuki <fuyuki@nigredo.org>
-
 PORTNAME=	qdbm
 PORTVERSION=	1.8.78
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	databases
 MASTER_SITES=	https://dbmx.net/qdbm/
 
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	Quick Database Manager
+WWW=		https://dbmx.net/qdbm/
 
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/COPYING
@@ -16,6 +15,7 @@ LIB_DEPENDS=	liblzo2.so:archivers/lzo2
 
 USES=		cpe iconv
 GNU_CONFIGURE=	yes
+GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
 USE_LDCONFIG=	yes
 CONFIGURE_ENV=	ac_cv_lib_iconv_main=yes
 CONFIGURE_ARGS=	--enable-bzip --enable-lzo --enable-zlib \
diff --git a/databases/qdbm/pkg-descr b/databases/qdbm/pkg-descr
index 920b86688daf..5c679caefe4d 100644
--- a/databases/qdbm/pkg-descr
+++ b/databases/qdbm/pkg-descr
@@ -4,5 +4,3 @@ a value.  Every key and value is serial bytes with variable length.
 Both binary data and character string can be used as a key and a
 value.  There is neither concept of data tables nor data types.
 Records are organized in hash table or B+ tree.
-
-WWW: https://dbmx.net/qdbm/
diff --git a/databases/qdbm/pkg-plist b/databases/qdbm/pkg-plist
index 41bbf7cf45ae..62bf11a615be 100644
--- a/databases/qdbm/pkg-plist
+++ b/databases/qdbm/pkg-plist
@@ -31,35 +31,35 @@ lib/libqdbm.so
 lib/libqdbm.so.14
 lib/libqdbm.so.14.14.0
 libdata/pkgconfig/qdbm.pc
-man/man1/cbcodec.1.gz
-man/man1/cbtest.1.gz
-man/man1/crmgr.1.gz
-man/man1/crtest.1.gz
-man/man1/crtsv.1.gz
-man/man1/dpmgr.1.gz
-man/man1/dptest.1.gz
-man/man1/dptsv.1.gz
-man/man1/hvmgr.1.gz
-man/man1/hvtest.1.gz
-man/man1/odidx.1.gz
-man/man1/odmgr.1.gz
-man/man1/odtest.1.gz
-man/man1/qmttest.1.gz
-man/man1/rlmgr.1.gz
-man/man1/rltest.1.gz
-man/man1/vlmgr.1.gz
-man/man1/vltest.1.gz
-man/man1/vltsv.1.gz
-man/man3/cabin.3.gz
-man/man3/cropen.3.gz
-man/man3/curia.3.gz
-man/man3/depot.3.gz
-man/man3/dpopen.3.gz
-man/man3/hovel.3.gz
-man/man3/odeum.3.gz
-man/man3/odopen.3.gz
-man/man3/qdbm.3.gz
-man/man3/relic.3.gz
-man/man3/villa.3.gz
-man/man3/vista.3.gz
-man/man3/vlopen.3.gz
+share/man/man1/cbcodec.1.gz
+share/man/man1/cbtest.1.gz
+share/man/man1/crmgr.1.gz
+share/man/man1/crtest.1.gz
+share/man/man1/crtsv.1.gz
+share/man/man1/dpmgr.1.gz
+share/man/man1/dptest.1.gz
+share/man/man1/dptsv.1.gz
+share/man/man1/hvmgr.1.gz
+share/man/man1/hvtest.1.gz
+share/man/man1/odidx.1.gz
+share/man/man1/odmgr.1.gz
+share/man/man1/odtest.1.gz
+share/man/man1/qmttest.1.gz
+share/man/man1/rlmgr.1.gz
+share/man/man1/rltest.1.gz
+share/man/man1/vlmgr.1.gz
+share/man/man1/vltest.1.gz
+share/man/man1/vltsv.1.gz
+share/man/man3/cabin.3.gz
+share/man/man3/cropen.3.gz
+share/man/man3/curia.3.gz
+share/man/man3/depot.3.gz
+share/man/man3/dpopen.3.gz
+share/man/man3/hovel.3.gz
+share/man/man3/odeum.3.gz
+share/man/man3/odopen.3.gz
+share/man/man3/qdbm.3.gz
+share/man/man3/relic.3.gz
+share/man/man3/villa.3.gz
+share/man/man3/vista.3.gz
+share/man/man3/vlopen.3.gz
diff --git a/databases/qdrant/Makefile b/databases/qdrant/Makefile
new file mode 100644
index 000000000000..1453344fb878
--- /dev/null
+++ b/databases/qdrant/Makefile
@@ -0,0 +1,684 @@
+PORTNAME=	qdrant
+DISTVERSIONPREFIX=	v
+DISTVERSION=	1.8.2
+PORTREVISION=	1
+CATEGORIES=	databases
+
+MAINTAINER=	yuri@FreeBSD.org
+COMMENT=	Vector search engine and database for the next gen AI applications
+WWW=		https://qdrant.tech
+
+LICENSE=	APACHE20
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
+BROKEN_armv7=	compiler crashes, see https://github.com/rust-lang/rust/issues/120637
+BROKEN_i386=	compilation breaks with fatal warning: implicit conversion from 'std::numeric_limits<unsigned long long>::type' (aka 'unsigned long long') to 'size_t' (aka 'unsigned int') changes value from 18446744073709551615 to 4294967295
+BROKEN_powerpc64le=	compilation failure: called `Option::unwrap()` on a `None` value in ring-0.16.20/build.rs: # see https://github.com/qdrant/qdrant/issues/3392
+
+BUILD_DEPENDS=	protoc:devel/protobuf
+
+USES=		cargo gmake llvm:min=13 perl5 pkgconfig
+USE_GITHUB=	yes
+USE_PERL5=	build
+USE_RC_SUBR=	qdrant
+
+CARGO_CRATES=	actix-codec-0.5.0 \
+		actix-cors-0.7.0 \
+		actix-files-0.6.5 \
+		actix-http-3.6.0 \
+		actix-macros-0.2.3 \
+		actix-multipart-0.6.1 \
+		actix-multipart-derive-0.6.1 \
+		actix-router-0.5.1 \
+		actix-rt-2.7.0 \
+		actix-server-2.1.1 \
+		actix-service-2.0.2 \
+		actix-tls-3.3.0 \
+		actix-utils-3.0.1 \
+		actix-web-4.5.1 \
+		actix-web-codegen-4.2.0 \
+		actix-web-extras-0.1.0 \
+		actix-web-httpauth-0.8.1 \
+		actix-web-validator-5.0.1 \
+		addr2line-0.19.0 \
+		adler-1.0.2 \
+		aes-0.8.3 \
+		ahash-0.8.11 \
+		aho-corasick-1.1.2 \
+		alloc-no-stdlib-2.0.4 \
+		alloc-stdlib-0.2.2 \
+		allocator-api2-0.2.16 \
+		android-tzdata-0.1.1 \
+		android_system_properties-0.1.5 \
+		anes-0.1.6 \
+		anstream-0.6.11 \
+		anstyle-1.0.6 \
+		anstyle-parse-0.2.0 \
+		anstyle-query-1.0.0 \
+		anstyle-wincon-3.0.1 \
+		antidote-1.0.0 \
+		anyhow-1.0.80 \
+		approx-0.5.1 \
+		arc-swap-1.7.0 \
+		arrayvec-0.4.12 \
+		arrayvec-0.7.2 \
+		async-recursion-1.0.5 \
+		async-stream-0.3.3 \
+		async-stream-impl-0.3.3 \
+		async-trait-0.1.77 \
+		atomic_refcell-0.1.13 \
+		atomicwrites-0.4.3 \
+		autocfg-1.1.0 \
+		axum-0.6.12 \
+		axum-core-0.3.3 \
+		backtrace-0.3.67 \
+		base64-0.13.1 \
+		base64-0.21.0 \
+		base64ct-1.6.0 \
+		bincode-1.3.3 \
+		bindgen-0.69.4 \
+		bit-set-0.5.3 \
+		bit-vec-0.6.3 \
+		bitflags-1.3.2 \
+		bitflags-2.4.1 \
+		bitpacking-0.9.2 \
+		bitvec-1.0.1 \
+		blake2-rfc-0.2.18 \
+		block-buffer-0.10.3 \
+		brotli-3.3.4 \
+		brotli-decompressor-2.3.2 \
+		bumpalo-3.11.1 \
+		bytemuck-1.12.3 \
+		byteorder-1.4.3 \
+		bytes-1.5.0 \
+		bytestring-1.2.0 \
+		bzip2-0.4.4 \
+		bzip2-sys-0.1.11+1.0.8 \
+		cast-0.3.0 \
+		cc-1.0.83 \
+		cedarwood-0.4.6 \
+		cexpr-0.6.0 \
+		cfg-if-1.0.0 \
+		cgroups-rs-0.3.4 \
+		charabia-0.8.7 \
+		chrono-0.4.34 \
+		ci_info-0.10.2 \
+		ciborium-0.2.0 \
+		ciborium-io-0.2.0 \
+		ciborium-ll-0.2.0 \
+		cipher-0.4.4 \
+		clang-sys-1.4.0 \
+		clap-4.5.2 \
+		clap_builder-4.5.2 \
+		clap_derive-4.5.0 \
+		clap_lex-0.7.0 \
+		codespan-reporting-0.11.1 \
+		colorchoice-1.0.0 \
+		colored-2.1.0 \
+		config-0.14.0 \
+		console-0.15.2 \
+		console-api-0.5.0 \
+		console-subscriber-0.1.10 \
+		const-random-0.1.17 \
+		const-random-macro-0.1.16 \
+		constant_time_eq-0.1.5 \
+		constant_time_eq-0.3.0 \
+		convert_case-0.4.0 \
+		convert_case-0.6.0 \
+		cookie-0.16.2 \
+		core-foundation-0.9.4 \
+		core-foundation-sys-0.8.6 \
+		cow-utils-0.1.2 \
+		cpp_demangle-0.4.2 \
+		cpufeatures-0.2.5 \
+		crc32c-0.6.4 \
+		crc32fast-1.3.2 \
+		criterion-0.5.1 \
+		criterion-plot-0.5.0 \
+		crossbeam-channel-0.5.8 \
+		crossbeam-deque-0.8.2 \
+		crossbeam-epoch-0.9.13 \
+		crossbeam-utils-0.8.14 \
+		crunchy-0.2.2 \
+		crypto-common-0.1.6 \
+		csv-1.3.0 \
+		csv-core-0.1.11 \
+		cxx-1.0.85 \
+		cxx-build-1.0.85 \
+		cxxbridge-flags-1.0.85 \
+		cxxbridge-macro-1.0.85 \
+		darling-0.20.3 \
+		darling_core-0.20.3 \
+		darling_macro-0.20.3 \
+		dashmap-5.5.3 \
+		debugid-0.8.0 \
+		derive_more-0.99.17 \
+		deunicode-1.4.3 \
+		digest-0.10.7 \
+		dlv-list-0.5.2 \
+		docopt-1.1.1 \
+		dyn-clone-1.0.10 \
+		earcutr-0.4.2 \
+		either-1.10.0 \
+		encode_unicode-0.3.6 \
+		encoding-0.2.33 \
+		encoding-index-japanese-1.20141219.5 \
+		encoding-index-korean-1.20141219.5 \
+		encoding-index-simpchinese-1.20141219.5 \
+		encoding-index-singlebyte-1.20141219.5 \
+		encoding-index-tradchinese-1.20141219.5 \
+		encoding_index_tests-0.1.4 \
+		encoding_rs-0.8.32 \
+		encoding_rs_io-0.1.7 \
+		env_filter-0.1.0 \
+		env_logger-0.10.2 \
+		env_logger-0.11.3 \
+		envmnt-0.8.4 \
+		equivalent-1.0.1 \
+		erased-serde-0.4.2 \
+		errno-0.3.8 \
+		fastrand-2.0.1 \
+		filetime-0.2.19 \
+		findshlibs-0.10.2 \
+		fixedbitset-0.4.2 \
+		flate2-1.0.26 \
+		float_next_after-1.0.0 \
+		fnv-1.0.7 \
+		foreign-types-0.5.0 \
+		foreign-types-macros-0.2.3 \
+		foreign-types-shared-0.3.1 \
+		form_urlencoded-1.2.1 \
+		fs4-0.7.0 \
+		fs_extra-1.3.0 \
+		fsio-0.1.3 \
+		fst-0.4.7 \
+		funty-2.0.0 \
+		futures-0.3.30 \
+		futures-channel-0.3.30 \
+		futures-core-0.3.30 \
+		futures-executor-0.3.30 \
+		futures-io-0.3.30 \
+		futures-macro-0.3.30 \
+		futures-sink-0.3.30 \
+		futures-task-0.3.30 \
+		futures-timer-3.0.2 \
+		futures-util-0.3.30 \
+		fxhash-0.2.1 \
+		generator-0.7.4 \
+		generic-array-0.14.6 \
+		generic-tests-0.1.2 \
+		geo-0.28.0 \
+		geo-types-0.7.13 \
+		geographiclib-rs-0.2.3 \
+		geohash-0.13.0 \
+		getopts-0.2.21 \
+		getrandom-0.1.16 \
+		getrandom-0.2.11 \
+		getset-0.1.2 \
+		gimli-0.27.0 \
+		glob-0.3.1 \
+		h2-0.3.24 \
+		half-1.8.2 \
+		hash32-0.3.1 \
+		hashbrown-0.12.3 \
+		hashbrown-0.13.2 \
+		hashbrown-0.14.2 \
+		hashring-0.3.3 \
+		hdrhistogram-7.5.2 \
+		heapless-0.8.0 \
+		heck-0.4.0 \
+		hermit-abi-0.3.3 \
+		hex-0.4.3 \
+		hmac-0.12.1 \
+		http-0.2.9 \
+		http-1.0.0 \
+		http-body-0.4.5 \
+		http-range-0.1.5 \
+		http-serde-2.0.0 \
+		httparse-1.8.0 \
+		httpdate-1.0.2 \
+		humantime-2.1.0 \
+		hyper-0.14.26 \
+		hyper-rustls-0.24.0 \
+		hyper-timeout-0.4.1 \
+		iana-time-zone-0.1.53 \
+		iana-time-zone-haiku-0.1.1 \
+		ident_case-1.0.1 \
+		idna-0.4.0 \
+		idna-0.5.0 \
+		if_chain-1.0.2 \
+		impl-more-0.1.6 \
+		indexmap-1.9.2 \
+		indexmap-2.2.5 \
+		indicatif-0.17.8 \
+		inferno-0.11.18 \
+		inout-0.1.3 \
+		instant-0.1.12 \
+		inventory-0.3.14 \
+		io-lifetimes-1.0.11 \
+		io-uring-0.6.3 \
+		ipnet-2.7.0 \
+		irg-kvariants-0.1.0 \
+		is-terminal-0.4.6 \
+		is_sorted-0.1.1 \
+		itertools-0.10.5 \
+		itertools-0.12.1 \
+		itoa-1.0.5 \
+		jieba-rs-0.6.8 \
+		jobserver-0.1.25 \
+		js-sys-0.3.60 \
+		json5-0.4.1 \
+		jsonwebtoken-9.2.0 \
+		language-tags-0.3.2 \
+		lazy_static-1.4.0 \
+		lazycell-1.3.0 \
+		libc-0.2.153 \
+		libloading-0.7.4 \
+		libm-0.2.6 \
+		librocksdb-sys-0.16.0+8.10.0 \
+		libz-sys-1.1.8 \
+		lindera-cc-cedict-builder-0.27.2 \
+		lindera-compress-0.27.2 \
+		lindera-core-0.27.2 \
+		lindera-decompress-0.27.2 \
+		lindera-dictionary-0.27.2 \
+		lindera-ipadic-builder-0.27.2 \
+		lindera-ipadic-neologd-builder-0.27.2 \
+		lindera-ko-dic-0.27.2 \
+		lindera-ko-dic-builder-0.27.2 \
+		lindera-tokenizer-0.27.2 \
+		lindera-unidic-0.27.2 \
+		lindera-unidic-builder-0.27.2 \
+		link-cplusplus-1.0.8 \
+		linked-hash-map-0.5.6 \
+		linux-raw-sys-0.3.8 \
+		linux-raw-sys-0.4.13 \
+		litemap-0.7.2 \
+		local-channel-0.1.3 \
+		local-waker-0.1.3 \
+		lock_api-0.4.11 \
+		log-0.4.21 \
+		loom-0.7.1 \
+		macro_rules_attribute-0.2.0 \
+		macro_rules_attribute-proc_macro-0.2.0 \
+		matchers-0.1.0 \
+		matchit-0.7.0 \
+		memchr-2.5.0 \
+		memmap2-0.5.10 \
+		memmap2-0.9.4 \
+		memoffset-0.7.1 \
+		merge-0.1.0 \
+		merge_derive-0.1.0 \
+		mime-0.3.16 \
+		mime_guess-2.0.4 \
+		minimal-lexical-0.2.1 \
+		miniz_oxide-0.6.2 \
+		miniz_oxide-0.7.1 \
+		mio-0.8.11 \
+		multimap-0.8.3 \
+		nias-0.5.0 \
+		nix-0.25.1 \
+		nix-0.26.2 \
+		nodrop-0.1.14 \
+		nom-7.1.3 \
+		ntapi-0.4.1 \
+		nu-ansi-term-0.46.0 \
+		num-bigint-0.4.4 \
+		num-cmp-0.1.0 \
+		num-derive-0.4.2 \
+		num-format-0.4.4 \
+		num-integer-0.1.46 \
+		num-traits-0.2.18 \
+		num_cpus-1.16.0 \
+		number_prefix-0.4.0 \
+		object-0.30.0 \
+		once_cell-1.19.0 \
+		oorandom-11.1.3 \
+		ordered-float-2.10.1 \
+		ordered-float-4.2.0 \
+		ordered-multimap-0.6.0 \
+		overload-0.1.1 \
+		parking_lot-0.12.1 \
+		parking_lot_core-0.9.9 \
+		parse-size-1.0.0 \
+		password-hash-0.4.2 \
+		paste-1.0.11 \
+		pathdiff-0.2.1 \
+		pbkdf2-0.11.0 \
+		pem-3.0.3 \
+		percent-encoding-2.3.1 \
+		permutation_iterator-0.1.2 \
+		pest-2.5.1 \
+		pest_derive-2.5.1 \
+		pest_generator-2.5.1 \
+		pest_meta-2.5.1 \
+		petgraph-0.6.2 \
+		phf-0.11.2 \
+		phf_codegen-0.11.2 \
+		phf_generator-0.11.2 \
+		phf_shared-0.11.2 \
+		pin-project-1.0.12 \
+		pin-project-internal-1.0.12 \
+		pin-project-lite-0.2.12 \
+		pin-utils-0.1.0 \
+		pinyin-0.10.0 \
+		pkg-config-0.3.26 \
+		plotters-0.3.4 \
+		plotters-backend-0.3.4 \
+		plotters-svg-0.3.3 \
+		portable-atomic-1.3.2 \
+		pprof-0.12.1 \
+		ppv-lite86-0.2.17 \
+		prettyplease-0.1.22 \
+		prettyplease-0.2.4 \
+		proc-macro-error-1.0.4 \
+		proc-macro-error-attr-1.0.4 \
+		proc-macro2-1.0.76 \
+		procfs-0.16.0 \
+		procfs-core-0.16.0 \
+		prometheus-0.13.3 \
+		proptest-1.4.0 \
+		prost-0.11.9 \
+		prost-0.12.3 \
+		prost-build-0.11.9 \
+		prost-build-0.12.3 \
+		prost-derive-0.11.9 \
+		prost-derive-0.12.3 \
+		prost-types-0.11.9 \
+		prost-types-0.12.3 \
+		prost-wkt-0.4.2 \
+		prost-wkt-build-0.4.2 \
+		prost-wkt-types-0.4.2 \
+		protobuf-2.28.0 \
+		protobuf-build-0.14.0 \
+		pulldown-cmark-0.9.3 \
+		pulldown-cmark-to-cmark-10.0.4 \
+		quick-error-1.2.3 \
+		quick-xml-0.26.0 \
+		quote-1.0.35 \
+		radium-0.7.0 \
+		raft-0.7.0 \
+		raft-proto-0.7.0 \
+		rand-0.7.3 \
+		rand-0.8.5 \
+		rand_chacha-0.2.2 \
+		rand_chacha-0.3.1 \
+		rand_core-0.5.1 \
+		rand_core-0.6.4 \
+		rand_distr-0.4.3 \
+		rand_hc-0.2.0 \
+		rand_xorshift-0.3.0 \
+		rayon-1.9.0 \
+		rayon-core-1.12.1 \
+		redox_syscall-0.2.16 \
+		redox_syscall-0.4.1 \
+		regex-1.8.4 \
+		regex-automata-0.1.10 \
+		regex-syntax-0.6.28 \
+		regex-syntax-0.7.2 \
+		regex-syntax-0.8.2 \
+		relative-path-1.8.0 \
+		reqwest-0.11.23 \
+		rgb-0.8.34 \
+		ring-0.16.20 \
+		ring-0.17.5 \
+		ringbuffer-0.15.0 \
+		rmp-0.8.11 \
+		rmp-serde-1.1.2 \
+		robust-1.1.0 \
+		rocksdb-0.22.0 \
+		ron-0.8.1 \
+		rstack-0.3.3 \
+		rstack-self-0.3.0 \
+		rstar-0.12.0 \
+		rstest-0.18.2 \
+		rstest_macros-0.18.2 \
+		rust-ini-0.19.0 \
+		rustc-demangle-0.1.21 \
+		rustc-hash-1.1.0 \
+		rustc_version-0.4.0 \
+		rustix-0.37.27 \
+		rustix-0.38.31 \
+		rustls-0.21.10 \
+		rustls-0.22.2 \
+		rustls-pemfile-1.0.3 \
+		rustls-pemfile-2.1.1 \
+		rustls-pki-types-1.3.1 \
+		rustls-webpki-0.100.2 \
+		rustls-webpki-0.101.7 \
+		rustls-webpki-0.102.2 \
+		rustversion-1.0.11 \
+		rusty-fork-0.3.0 \
+		rusty-forkfork-0.4.0 \
+		rusty-hook-0.11.2 \
+		ryu-1.0.12 \
+		same-file-1.0.6 \
+		schemars-0.8.16 \
+		schemars_derive-0.8.16 \
+		scoped-tls-1.0.1 \
+		scopeguard-1.1.0 \
+		scratch-1.0.3 \
+		sct-0.7.0 \
+		seahash-4.1.0 \
+		sealed_test-1.0.0 \
+		sealed_test_derive-1.0.0 \
+		semver-1.0.22 \
+		serde-1.0.197 \
+		serde-value-0.7.0 \
+		serde_cbor-0.11.2 \
+		serde_derive-1.0.197 \
+		serde_derive_internals-0.26.0 \
+		serde_json-1.0.114 \
+		serde_plain-1.0.1 \
+		serde_qs-0.10.1 \
+		serde_spanned-0.6.5 \
+		serde_urlencoded-0.7.1 \
+		serial_test-3.0.0 \
+		serial_test_derive-3.0.0 \
+		sha1-0.10.5 \
+		sha2-0.10.8 \
+		sharded-slab-0.1.4 \
+		shlex-1.3.0 \
+		signal-hook-registry-1.4.0 \
+		simple_asn1-0.6.2 \
+		siphasher-0.3.10 \
+		slab-0.4.7 \
+		slice-group-by-0.3.1 \
+		slog-2.7.0 \
+		slog-scope-4.4.0 \
+		slog-stdlog-4.1.1 \
+		smallvec-1.13.1 \
+		smol_str-0.2.1 \
+		socket2-0.4.9 \
+		socket2-0.5.5 \
+		spade-2.4.1 \
+		sparse-0.1.0 \
+		spin-0.5.2 \
+		spin-0.9.8 \
+		stable_deref_trait-1.2.0 \
+		static_assertions-1.1.0 \
+		storage-0.2.0 \
+		str_stack-0.1.0 \
+		strsim-0.10.0 \
+		strsim-0.11.0 \
+		subtle-2.5.0 \
+		symbolic-common-12.2.0 \
+		symbolic-demangle-12.2.0 \
+		syn-1.0.107 \
+		syn-2.0.48 \
+		sync_wrapper-0.1.1 \
+		sys-info-0.9.1 \
+		sysinfo-0.30.7 \
+		system-configuration-0.5.1 \
+		system-configuration-sys-0.5.0 \
+		tap-1.0.1 \
+		tar-0.4.40 \
+		tempfile-3.10.1 \
+		termcolor-1.1.3 \
+		terminal_size-0.1.17 \
+		thiserror-1.0.57 \
+		thiserror-impl-1.0.57 \
+		thread-id-4.0.0 \
+		thread-priority-0.16.0 \
+		thread_local-1.1.7 \
+		tikv-jemalloc-sys-0.5.2+5.3.0-patched \
+		tikv-jemallocator-0.5.4 \
+		time-0.3.17 \
+		time-core-0.1.0 \
+		time-macros-0.2.6 \
+		tiny-keccak-2.0.2 \
+		tinytemplate-1.2.1 \
+		tinyvec-1.6.0 \
+		tinyvec_macros-0.1.0 \
+		tokio-1.36.0 \
+		tokio-io-timeout-1.2.0 \
+		tokio-macros-2.2.0 \
+		tokio-rustls-0.24.1 \
+		tokio-rustls-0.25.0 \
+		tokio-stream-0.1.11 \
+		tokio-util-0.7.10 \
+		toml-0.5.10 \
+		toml-0.8.9 \
+		toml_datetime-0.6.5 \
+		toml_edit-0.21.1 \
+		tonic-0.9.2 \
+		tonic-build-0.10.2 \
+		tonic-reflection-0.9.2 \
+		tower-0.4.13 \
+		tower-layer-0.3.2 \
+		tower-service-0.3.2 \
+		tracing-0.1.40 \
+		tracing-attributes-0.1.27 \
+		tracing-core-0.1.32 \
+		tracing-log-0.2.0 \
+		tracing-subscriber-0.3.18 \
+		tracing-tracy-0.11.0 \
+		tracy-client-0.17.0 \
+		tracy-client-sys-0.21.2 \
+		try-lock-0.2.3 \
+		typenum-1.16.0 \
+		typetag-0.2.15 \
+		typetag-impl-0.2.15 \
+		ucd-trie-0.1.5 \
+		unarray-0.1.4 \
+		unicase-2.6.0 \
+		unicode-bidi-0.3.13 \
+		unicode-ident-1.0.6 \
+		unicode-normalization-0.1.22 \
+		unicode-segmentation-1.10.1 \
+		unicode-width-0.1.10 \
+		untrusted-0.7.1 \
+		untrusted-0.9.0 \
+		unwind-0.4.1 \
+		unwind-sys-0.1.3 \
+		ureq-2.7.1 \
+		url-2.5.0 \
+		utf8parse-0.2.1 \
+		uuid-1.7.0 \
+		v_htmlescape-0.15.8 \
+		validator-0.16.1 \
+		validator_derive-0.16.0 \
+		validator_types-0.16.0 \
+		valuable-0.1.0 \
+		vcpkg-0.2.15 \
+		version_check-0.9.4 \
+		wait-timeout-0.2.0 \
+		walkdir-2.5.0 \
+		want-0.3.0 \
+		wasi-0.9.0+wasi-snapshot-preview1 \
+		wasi-0.11.0+wasi-snapshot-preview1 \
+		wasm-bindgen-0.2.83 \
+		wasm-bindgen-backend-0.2.83 \
+		wasm-bindgen-futures-0.4.33 \
+		wasm-bindgen-macro-0.2.83 \
+		wasm-bindgen-macro-support-0.2.83 \
+		wasm-bindgen-shared-0.2.83 \
+		wasm-streams-0.3.0 \
+		web-sys-0.3.60 \
+		webpki-roots-0.23.1 \
+		webpki-roots-0.25.2 \
+		whatlang-0.16.4 \
+		which-4.3.0 \
+		winapi-0.3.9 \
+		winapi-i686-pc-windows-gnu-0.4.0 \
+		winapi-util-0.1.5 \
+		winapi-x86_64-pc-windows-gnu-0.4.0 \
+		winnow-0.5.37 \
+		windows-0.48.0 \
+		windows-0.52.0 \
+		windows-core-0.52.0 \
+		windows-sys-0.42.0 \
+		windows-sys-0.45.0 \
+		windows-sys-0.48.0 \
+		windows-sys-0.52.0 \
+		windows-targets-0.42.2 \
+		windows-targets-0.48.0 \
+		windows-targets-0.52.0 \
+		windows_aarch64_gnullvm-0.42.2 \
+		windows_aarch64_gnullvm-0.48.0 \
+		windows_aarch64_gnullvm-0.52.0 \
+		windows_aarch64_msvc-0.42.2 \
+		windows_aarch64_msvc-0.48.0 \
+		windows_aarch64_msvc-0.52.0 \
+		windows_i686_gnu-0.42.2 \
+		windows_i686_gnu-0.48.0 \
+		windows_i686_gnu-0.52.0 \
+		windows_i686_msvc-0.42.2 \
+		windows_i686_msvc-0.48.0 \
+		windows_i686_msvc-0.52.0 \
+		windows_x86_64_gnu-0.42.2 \
+		windows_x86_64_gnu-0.48.0 \
+		windows_x86_64_gnu-0.52.0 \
+		windows_x86_64_gnullvm-0.42.2 \
+		windows_x86_64_gnullvm-0.48.0 \
+		windows_x86_64_gnullvm-0.52.0 \
+		windows_x86_64_msvc-0.42.2 \
+		windows_x86_64_msvc-0.48.0 \
+		windows_x86_64_msvc-0.52.0 \
+		winreg-0.50.0 \
+		wyz-0.5.1 \
+		xattr-1.0.1 \
+		yada-0.5.0 \
+		yaml-rust-0.4.5 \
+		zerocopy-0.7.31 \
+		zerocopy-derive-0.7.31 \
+		zerofrom-0.1.3 \
+		zeroize-1.7.0 \
+		zerovec-0.10.1 \
+		zip-0.6.6 \
+		zstd-0.11.2+zstd.1.5.2 \
+		zstd-0.13.0 \
+		zstd-safe-5.0.2+zstd.1.5.2 \
+		zstd-safe-7.0.0 \
+		zstd-sys-2.0.9+zstd.1.5.5 \
+		quantization@git+https://github.com/qdrant/quantization.git\#939fdb627a8edcf92fd71e3c79017156690850e9 \
+		tonic@git+https://github.com/qdrant/tonic?branch=v0.9.2-patched\#060ab88c87955adc59d46a44b4e3b72cb4cc1522 \
+		wal@git+https://github.com/qdrant/wal.git?rev=fad0e7c48be58d8e7db4cc739acd9b1cf6735de0\#fad0e7c48be58d8e7db4cc739acd9b1cf6735de0
+
+QDRANT_DBDIR?=	/var/db/qdrant
+QDRANT_USER?=	nobody
+QDRANT_GROUP?=	nobody
+
+SUB_LIST=	RC_SUBR_SUFFIX=${RC_SUBR_SUFFIX}
+
+PLIST_SUB=	QDRANT_DBDIR=${QDRANT_DBDIR} \
+		QDRANT_GROUP=${QDRANT_GROUP} \
+		QDRANT_USER=${QDRANT_USER}
+
+post-patch:
+	${REINPLACE_CMD} -e "s,%%DBDIR%%,${QDRANT_DBDIR},g; \
+		s,%%ETCDIR%%,${ETCDIR},g" ${WRKSRC}/config/config.yaml
+
+post-install:
+# install config sample
+	${MKDIR} ${STAGEDIR}${ETCDIR}
+	${MKDIR} ${STAGEDIR}${ETCDIR}/tls
+	${MKDIR} ${STAGEDIR}${QDRANT_DBDIR}
+	${INSTALL_DATA} ${WRKSRC}/config/config.yaml ${STAGEDIR}${ETCDIR}/config.yaml.sample
+# strip binaries
+	${STRIP_CMD} \
+		${STAGEDIR}${PREFIX}/bin/${PORTNAME} \
+		${STAGEDIR}${PREFIX}/bin/schema_generator \
+		${STAGEDIR}${PREFIX}/bin/wal_inspector
+
+.include <bsd.port.mk>
diff --git a/databases/qdrant/distinfo b/databases/qdrant/distinfo
new file mode 100644
index 000000000000..d9f6b676ddc1
--- /dev/null
+++ b/databases/qdrant/distinfo
@@ -0,0 +1,1267 @@
+TIMESTAMP = 1710657172
+SHA256 (rust/crates/actix-codec-0.5.0.crate) = 57a7559404a7f3573127aab53c08ce37a6c6a315c374a31070f3c91cd1b4a7fe
+SIZE (rust/crates/actix-codec-0.5.0.crate) = 14046
+SHA256 (rust/crates/actix-cors-0.7.0.crate) = f9e772b3bcafe335042b5db010ab7c09013dad6eac4915c91d8d50902769f331
+SIZE (rust/crates/actix-cors-0.7.0.crate) = 29516
+SHA256 (rust/crates/actix-files-0.6.5.crate) = bf0bdd6ff79de7c9a021f5d9ea79ce23e108d8bfc9b49b5b4a2cf6fad5a35212
+SIZE (rust/crates/actix-files-0.6.5.crate) = 39268
+SHA256 (rust/crates/actix-http-3.6.0.crate) = d223b13fd481fc0d1f83bb12659ae774d9e3601814c68a0bc539731698cca743
+SIZE (rust/crates/actix-http-3.6.0.crate) = 152432
+SHA256 (rust/crates/actix-macros-0.2.3.crate) = 465a6172cf69b960917811022d8f29bc0b7fa1398bc4f78b3c466673db1213b6
+SIZE (rust/crates/actix-macros-0.2.3.crate) = 8259
+SHA256 (rust/crates/actix-multipart-0.6.1.crate) = 3b960e2aea75f49c8f069108063d12a48d329fc8b60b786dfc7552a9d5918d2d
+SIZE (rust/crates/actix-multipart-0.6.1.crate) = 24535
+SHA256 (rust/crates/actix-multipart-derive-0.6.1.crate) = 0a0a77f836d869f700e5b47ac7c3c8b9c8bc82e4aec861954c6198abee3ebd4d
+SIZE (rust/crates/actix-multipart-derive-0.6.1.crate) = 9348
+SHA256 (rust/crates/actix-router-0.5.1.crate) = d66ff4d247d2b160861fa2866457e85706833527840e4133f8f49aa423a38799
+SIZE (rust/crates/actix-router-0.5.1.crate) = 31905
+SHA256 (rust/crates/actix-rt-2.7.0.crate) = 7ea16c295198e958ef31930a6ef37d0fb64e9ca3b6116e6b93a8bdae96ee1000
+SIZE (rust/crates/actix-rt-2.7.0.crate) = 20170
+SHA256 (rust/crates/actix-server-2.1.1.crate) = 0da34f8e659ea1b077bb4637948b815cd3768ad5a188fdcd74ff4d84240cd824
+SIZE (rust/crates/actix-server-2.1.1.crate) = 37296
+SHA256 (rust/crates/actix-service-2.0.2.crate) = 3b894941f818cfdc7ccc4b9e60fa7e53b5042a2e8567270f9147d5591893373a
+SIZE (rust/crates/actix-service-2.0.2.crate) = 25293
+SHA256 (rust/crates/actix-tls-3.3.0.crate) = d4cce60a2f2b477bc72e5cde0af1812a6e82d8fd85b5570a5dcf2a5bf2c5be5f
+SIZE (rust/crates/actix-tls-3.3.0.crate) = 38498
+SHA256 (rust/crates/actix-utils-3.0.1.crate) = 88a1dcdff1466e3c2488e1cb5c36a71822750ad43839937f85d2f4d9f8b705d8
+SIZE (rust/crates/actix-utils-3.0.1.crate) = 10096
+SHA256 (rust/crates/actix-web-4.5.1.crate) = 43a6556ddebb638c2358714d853257ed226ece6023ef9364f23f0c70737ea984
+SIZE (rust/crates/actix-web-4.5.1.crate) = 231024
+SHA256 (rust/crates/actix-web-codegen-4.2.0.crate) = 2262160a7ae29e3415554a3f1fc04c764b1540c116aa524683208078b7a75bc9
+SIZE (rust/crates/actix-web-codegen-4.2.0.crate) = 16767
+SHA256 (rust/crates/actix-web-extras-0.1.0.crate) = ef1dfa234e9b71ed142e54b26b4cc9e13ef4ac563cf1a2be810b0c3d057781ea
+SIZE (rust/crates/actix-web-extras-0.1.0.crate) = 3255
+SHA256 (rust/crates/actix-web-httpauth-0.8.1.crate) = 1d613edf08a42ccc6864c941d30fe14e1b676a77d16f1dbadc1174d065a0a775
+SIZE (rust/crates/actix-web-httpauth-0.8.1.crate) = 27480
+SHA256 (rust/crates/actix-web-validator-5.0.1.crate) = f40ee5ed4e266dad8d980f964c5ddd746f1f4f85b7f3b54f7099ab861ec6d746
+SIZE (rust/crates/actix-web-validator-5.0.1.crate) = 11998
+SHA256 (rust/crates/addr2line-0.19.0.crate) = a76fd60b23679b7d19bd066031410fb7e458ccc5e958eb5c325888ce4baedc97
+SIZE (rust/crates/addr2line-0.19.0.crate) = 33210
+SHA256 (rust/crates/adler-1.0.2.crate) = f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe
+SIZE (rust/crates/adler-1.0.2.crate) = 12778
+SHA256 (rust/crates/aes-0.8.3.crate) = ac1f845298e95f983ff1944b728ae08b8cebab80d684f0a832ed0fc74dfa27e2
+SIZE (rust/crates/aes-0.8.3.crate) = 124679
+SHA256 (rust/crates/ahash-0.8.11.crate) = e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011
+SIZE (rust/crates/ahash-0.8.11.crate) = 43607
+SHA256 (rust/crates/aho-corasick-1.1.2.crate) = b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0
+SIZE (rust/crates/aho-corasick-1.1.2.crate) = 183136
+SHA256 (rust/crates/alloc-no-stdlib-2.0.4.crate) = cc7bb162ec39d46ab1ca8c77bf72e890535becd1751bb45f64c597edb4c8c6b3
+SIZE (rust/crates/alloc-no-stdlib-2.0.4.crate) = 10105
+SHA256 (rust/crates/alloc-stdlib-0.2.2.crate) = 94fb8275041c72129eb51b7d0322c29b8387a0386127718b096429201a5d6ece
+SIZE (rust/crates/alloc-stdlib-0.2.2.crate) = 6693
+SHA256 (rust/crates/allocator-api2-0.2.16.crate) = 0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5
+SIZE (rust/crates/allocator-api2-0.2.16.crate) = 59025
+SHA256 (rust/crates/android-tzdata-0.1.1.crate) = e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0
+SIZE (rust/crates/android-tzdata-0.1.1.crate) = 7674
+SHA256 (rust/crates/android_system_properties-0.1.5.crate) = 819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311
+SIZE (rust/crates/android_system_properties-0.1.5.crate) = 5243
+SHA256 (rust/crates/anes-0.1.6.crate) = 4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299
+SIZE (rust/crates/anes-0.1.6.crate) = 23857
+SHA256 (rust/crates/anstream-0.6.11.crate) = 6e2e1ebcb11de5c03c67de28a7df593d32191b44939c482e97702baaaa6ab6a5
+SIZE (rust/crates/anstream-0.6.11.crate) = 30239
+SHA256 (rust/crates/anstyle-1.0.6.crate) = 8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc
+SIZE (rust/crates/anstyle-1.0.6.crate) = 14604
+SHA256 (rust/crates/anstyle-parse-0.2.0.crate) = e765fd216e48e067936442276d1d57399e37bce53c264d6fefbe298080cb57ee
+SIZE (rust/crates/anstyle-parse-0.2.0.crate) = 24361
+SHA256 (rust/crates/anstyle-query-1.0.0.crate) = 5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b
+SIZE (rust/crates/anstyle-query-1.0.0.crate) = 8620
+SHA256 (rust/crates/anstyle-wincon-3.0.1.crate) = f0699d10d2f4d628a98ee7b57b289abbc98ff3bad977cb3152709d4bf2330628
+SIZE (rust/crates/anstyle-wincon-3.0.1.crate) = 11279
+SHA256 (rust/crates/antidote-1.0.0.crate) = 34fde25430d87a9388dadbe6e34d7f72a462c8b43ac8d309b42b0a8505d7e2a5
+SIZE (rust/crates/antidote-1.0.0.crate) = 6312
+SHA256 (rust/crates/anyhow-1.0.80.crate) = 5ad32ce52e4161730f7098c077cd2ed6229b5804ccf99e5366be1ab72a98b4e1
+SIZE (rust/crates/anyhow-1.0.80.crate) = 45138
+SHA256 (rust/crates/approx-0.5.1.crate) = cab112f0a86d568ea0e627cc1d6be74a1e9cd55214684db5561995f6dad897c6
+SIZE (rust/crates/approx-0.5.1.crate) = 15100
+SHA256 (rust/crates/arc-swap-1.7.0.crate) = 7b3d0060af21e8d11a926981cc00c6c1541aa91dd64b9f881985c3da1094425f
+SIZE (rust/crates/arc-swap-1.7.0.crate) = 68468
+SHA256 (rust/crates/arrayvec-0.4.12.crate) = cd9fd44efafa8690358b7408d253adf110036b88f55672a933f01d616ad9b1b9
+SIZE (rust/crates/arrayvec-0.4.12.crate) = 26551
+SHA256 (rust/crates/arrayvec-0.7.2.crate) = 8da52d66c7071e2e3fa2a1e5c6d088fec47b593032b254f5e980de8ea54454d6
+SIZE (rust/crates/arrayvec-0.7.2.crate) = 29341
+SHA256 (rust/crates/async-recursion-1.0.5.crate) = 5fd55a5ba1179988837d24ab4c7cc8ed6efdeff578ede0416b4225a5fca35bd0
+SIZE (rust/crates/async-recursion-1.0.5.crate) = 11890
+SHA256 (rust/crates/async-stream-0.3.3.crate) = dad5c83079eae9969be7fadefe640a1c566901f05ff91ab221de4b6f68d9507e
+SIZE (rust/crates/async-stream-0.3.3.crate) = 12142
+SHA256 (rust/crates/async-stream-impl-0.3.3.crate) = 10f203db73a71dfa2fb6dd22763990fa26f3d2625a6da2da900d23b87d26be27
+SIZE (rust/crates/async-stream-impl-0.3.3.crate) = 4072
+SHA256 (rust/crates/async-trait-0.1.77.crate) = c980ee35e870bd1a4d2c8294d4c04d0499e67bca1e4b5cefcc693c2fa00caea9
+SIZE (rust/crates/async-trait-0.1.77.crate) = 29986
+SHA256 (rust/crates/atomic_refcell-0.1.13.crate) = 41e67cd8309bbd06cd603a9e693a784ac2e5d1e955f11286e355089fcab3047c
+SIZE (rust/crates/atomic_refcell-0.1.13.crate) = 11760
+SHA256 (rust/crates/atomicwrites-0.4.3.crate) = fc7b2dbe9169059af0f821e811180fddc971fc210c776c133c7819ccd6e478db
+SIZE (rust/crates/atomicwrites-0.4.3.crate) = 6337
+SHA256 (rust/crates/autocfg-1.1.0.crate) = d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa
+SIZE (rust/crates/autocfg-1.1.0.crate) = 13272
+SHA256 (rust/crates/axum-0.6.12.crate) = 349f8ccfd9221ee7d1f3d4b33e1f8319b3a81ed8f61f2ea40b37b859794b4491
+SIZE (rust/crates/axum-0.6.12.crate) = 139967
+SHA256 (rust/crates/axum-core-0.3.3.crate) = b2f958c80c248b34b9a877a643811be8dbca03ca5ba827f2b63baf3a81e5fc4e
+SIZE (rust/crates/axum-core-0.3.3.crate) = 20568
+SHA256 (rust/crates/backtrace-0.3.67.crate) = 233d376d6d185f2a3093e58f283f60f880315b6c60075b01f36b3b85154564ca
+SIZE (rust/crates/backtrace-0.3.67.crate) = 78564
+SHA256 (rust/crates/base64-0.13.1.crate) = 9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8
+SIZE (rust/crates/base64-0.13.1.crate) = 61002
+SHA256 (rust/crates/base64-0.21.0.crate) = a4a4ddaa51a5bc52a6948f74c06d20aaaddb71924eab79b8c97a8c556e942d6a
+SIZE (rust/crates/base64-0.21.0.crate) = 72180
+SHA256 (rust/crates/base64ct-1.6.0.crate) = 8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b
+SIZE (rust/crates/base64ct-1.6.0.crate) = 28870
+SHA256 (rust/crates/bincode-1.3.3.crate) = b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad
+SIZE (rust/crates/bincode-1.3.3.crate) = 28958
+SHA256 (rust/crates/bindgen-0.69.4.crate) = a00dc851838a2120612785d195287475a3ac45514741da670b735818822129a0
+SIZE (rust/crates/bindgen-0.69.4.crate) = 221092
+SHA256 (rust/crates/bit-set-0.5.3.crate) = 0700ddab506f33b20a03b13996eccd309a48e5ff77d0d95926aa0210fb4e95f1
+SIZE (rust/crates/bit-set-0.5.3.crate) = 14470
+SHA256 (rust/crates/bit-vec-0.6.3.crate) = 349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb
+SIZE (rust/crates/bit-vec-0.6.3.crate) = 19927
+SHA256 (rust/crates/bitflags-1.3.2.crate) = bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a
+SIZE (rust/crates/bitflags-1.3.2.crate) = 23021
+SHA256 (rust/crates/bitflags-2.4.1.crate) = 327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07
+SIZE (rust/crates/bitflags-2.4.1.crate) = 37043
+SHA256 (rust/crates/bitpacking-0.9.2.crate) = 4c1d3e2bfd8d06048a179f7b17afc3188effa10385e7b00dc65af6aae732ea92
+SIZE (rust/crates/bitpacking-0.9.2.crate) = 23049
+SHA256 (rust/crates/bitvec-1.0.1.crate) = 1bc2832c24239b0141d5674bb9174f9d68a8b5b3f2753311927c172ca46f7e9c
+SIZE (rust/crates/bitvec-1.0.1.crate) = 224375
+SHA256 (rust/crates/blake2-rfc-0.2.18.crate) = 5d6d530bdd2d52966a6d03b7a964add7ae1a288d25214066fd4b600f0f796400
+SIZE (rust/crates/blake2-rfc-0.2.18.crate) = 15676
+SHA256 (rust/crates/block-buffer-0.10.3.crate) = 69cce20737498f97b993470a6e536b8523f0af7892a4f928cceb1ac5e52ebe7e
+SIZE (rust/crates/block-buffer-0.10.3.crate) = 10465
+SHA256 (rust/crates/brotli-3.3.4.crate) = a1a0b1dbcc8ae29329621f8d4f0d835787c1c38bb1401979b49d13b0b305ff68
+SIZE (rust/crates/brotli-3.3.4.crate) = 1369026
+SHA256 (rust/crates/brotli-decompressor-2.3.2.crate) = 59ad2d4653bf5ca36ae797b1f4bb4dbddb60ce49ca4aed8a2ce4829f60425b80
+SIZE (rust/crates/brotli-decompressor-2.3.2.crate) = 191197
+SHA256 (rust/crates/bumpalo-3.11.1.crate) = 572f695136211188308f16ad2ca5c851a712c464060ae6974944458eb83880ba
+SIZE (rust/crates/bumpalo-3.11.1.crate) = 81207
+SHA256 (rust/crates/bytemuck-1.12.3.crate) = aaa3a8d9a1ca92e282c96a32d6511b695d7d994d1d102ba85d279f9b2756947f
+SIZE (rust/crates/bytemuck-1.12.3.crate) = 39835
+SHA256 (rust/crates/byteorder-1.4.3.crate) = 14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610
+SIZE (rust/crates/byteorder-1.4.3.crate) = 22512
+SHA256 (rust/crates/bytes-1.5.0.crate) = a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223
+SIZE (rust/crates/bytes-1.5.0.crate) = 58909
+SHA256 (rust/crates/bytestring-1.2.0.crate) = f7f83e57d9154148e355404702e2694463241880b939570d7c97c014da7a69a1
+SIZE (rust/crates/bytestring-1.2.0.crate) = 8409
+SHA256 (rust/crates/bzip2-0.4.4.crate) = bdb116a6ef3f6c3698828873ad02c3014b3c85cadb88496095628e3ef1e347f8
+SIZE (rust/crates/bzip2-0.4.4.crate) = 34197
+SHA256 (rust/crates/bzip2-sys-0.1.11+1.0.8.crate) = 736a955f3fa7875102d57c82b8cac37ec45224a07fd32d58f9f7a186b6cd4cdc
+SIZE (rust/crates/bzip2-sys-0.1.11+1.0.8.crate) = 633444
+SHA256 (rust/crates/cast-0.3.0.crate) = 37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5
+SIZE (rust/crates/cast-0.3.0.crate) = 11452
+SHA256 (rust/crates/cc-1.0.83.crate) = f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0
+SIZE (rust/crates/cc-1.0.83.crate) = 68343
+SHA256 (rust/crates/cedarwood-0.4.6.crate) = 6d910bedd62c24733263d0bed247460853c9d22e8956bd4cd964302095e04e90
+SIZE (rust/crates/cedarwood-0.4.6.crate) = 12726
+SHA256 (rust/crates/cexpr-0.6.0.crate) = 6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766
+SIZE (rust/crates/cexpr-0.6.0.crate) = 17966
+SHA256 (rust/crates/cfg-if-1.0.0.crate) = baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd
+SIZE (rust/crates/cfg-if-1.0.0.crate) = 7934
+SHA256 (rust/crates/cgroups-rs-0.3.4.crate) = 6db7c2f5545da4c12c5701455d9471da5f07db52e49b9cccb4f5512226dd0836
+SIZE (rust/crates/cgroups-rs-0.3.4.crate) = 53584
+SHA256 (rust/crates/charabia-0.8.7.crate) = 3a9071b1586dd067b5fdfd2069fab932c047ca5bbce4bd2bdee8af0f4b155053
+SIZE (rust/crates/charabia-0.8.7.crate) = 911753
+SHA256 (rust/crates/chrono-0.4.34.crate) = 5bc015644b92d5890fab7489e49d21f879d5c990186827d42ec511919404f38b
+SIZE (rust/crates/chrono-0.4.34.crate) = 228932
+SHA256 (rust/crates/ci_info-0.10.2.crate) = 24f638c70e8c5753795cc9a8c07c44da91554a09e4cf11a7326e8161b0a3c45e
+SIZE (rust/crates/ci_info-0.10.2.crate) = 806783
+SHA256 (rust/crates/ciborium-0.2.0.crate) = b0c137568cc60b904a7724001b35ce2630fd00d5d84805fbb608ab89509d788f
+SIZE (rust/crates/ciborium-0.2.0.crate) = 30130
+SHA256 (rust/crates/ciborium-io-0.2.0.crate) = 346de753af073cc87b52b2083a506b38ac176a44cfb05497b622e27be899b369
+SIZE (rust/crates/ciborium-io-0.2.0.crate) = 2738
+SHA256 (rust/crates/ciborium-ll-0.2.0.crate) = 213030a2b5a4e0c0892b6652260cf6ccac84827b83a85a534e178e3906c4cf1b
+SIZE (rust/crates/ciborium-ll-0.2.0.crate) = 10740
+SHA256 (rust/crates/cipher-0.4.4.crate) = 773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad
+SIZE (rust/crates/cipher-0.4.4.crate) = 19073
+SHA256 (rust/crates/clang-sys-1.4.0.crate) = fa2e27ae6ab525c3d369ded447057bca5438d86dc3a68f6faafb8269ba82ebf3
+SIZE (rust/crates/clang-sys-1.4.0.crate) = 38679
+SHA256 (rust/crates/clap-4.5.2.crate) = b230ab84b0ffdf890d5a10abdbc8b83ae1c4918275daea1ab8801f71536b2651
+SIZE (rust/crates/clap-4.5.2.crate) = 55385
+SHA256 (rust/crates/clap_builder-4.5.2.crate) = ae129e2e766ae0ec03484e609954119f123cc1fe650337e155d03b022f24f7b4
+SIZE (rust/crates/clap_builder-4.5.2.crate) = 163566
+SHA256 (rust/crates/clap_derive-4.5.0.crate) = 307bc0538d5f0f83b8248db3087aa92fe504e4691294d0c96c0eabc33f47ba47
+SIZE (rust/crates/clap_derive-4.5.0.crate) = 29042
+SHA256 (rust/crates/clap_lex-0.7.0.crate) = 98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce
+SIZE (rust/crates/clap_lex-0.7.0.crate) = 11915
+SHA256 (rust/crates/codespan-reporting-0.11.1.crate) = 3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e
+SIZE (rust/crates/codespan-reporting-0.11.1.crate) = 48963
+SHA256 (rust/crates/colorchoice-1.0.0.crate) = acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7
+SIZE (rust/crates/colorchoice-1.0.0.crate) = 6857
+SHA256 (rust/crates/colored-2.1.0.crate) = cbf2150cce219b664a8a70df7a1f933836724b503f8a413af9365b4dcc4d90b8
+SIZE (rust/crates/colored-2.1.0.crate) = 23348
+SHA256 (rust/crates/config-0.14.0.crate) = 7328b20597b53c2454f0b1919720c25c7339051c02b72b7e05409e00b14132be
+SIZE (rust/crates/config-0.14.0.crate) = 79442
+SHA256 (rust/crates/console-0.15.2.crate) = c050367d967ced717c04b65d8c619d863ef9292ce0c5760028655a2fb298718c
+SIZE (rust/crates/console-0.15.2.crate) = 31576
+SHA256 (rust/crates/console-api-0.5.0.crate) = c2895653b4d9f1538a83970077cb01dfc77a4810524e51a110944688e916b18e
+SIZE (rust/crates/console-api-0.5.0.crate) = 32420
+SHA256 (rust/crates/console-subscriber-0.1.10.crate) = d4cf42660ac07fcebed809cfe561dd8730bcd35b075215e6479c516bcd0d11cb
+SIZE (rust/crates/console-subscriber-0.1.10.crate) = 56045
+SHA256 (rust/crates/const-random-0.1.17.crate) = 5aaf16c9c2c612020bcfd042e170f6e32de9b9d75adb5277cdbbd2e2c8c8299a
+SIZE (rust/crates/const-random-0.1.17.crate) = 6640
+SHA256 (rust/crates/const-random-macro-0.1.16.crate) = f9d839f2a20b0aee515dc581a6172f2321f96cab76c1a38a4c584a194955390e
+SIZE (rust/crates/const-random-macro-0.1.16.crate) = 6657
+SHA256 (rust/crates/constant_time_eq-0.1.5.crate) = 245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc
+SIZE (rust/crates/constant_time_eq-0.1.5.crate) = 4936
+SHA256 (rust/crates/constant_time_eq-0.3.0.crate) = f7144d30dcf0fafbce74250a3963025d8d52177934239851c917d29f1df280c2
+SIZE (rust/crates/constant_time_eq-0.3.0.crate) = 11369
+SHA256 (rust/crates/convert_case-0.4.0.crate) = 6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e
+SIZE (rust/crates/convert_case-0.4.0.crate) = 8098
+SHA256 (rust/crates/convert_case-0.6.0.crate) = ec182b0ca2f35d8fc196cf3404988fd8b8c739a4d270ff118a398feb0cbec1ca
+SIZE (rust/crates/convert_case-0.6.0.crate) = 18675
+SHA256 (rust/crates/cookie-0.16.2.crate) = e859cd57d0710d9e06c381b550c06e76992472a8c6d527aecd2fc673dcc231fb
+SIZE (rust/crates/cookie-0.16.2.crate) = 34632
+SHA256 (rust/crates/core-foundation-0.9.4.crate) = 91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f
+SIZE (rust/crates/core-foundation-0.9.4.crate) = 27743
+SHA256 (rust/crates/core-foundation-sys-0.8.6.crate) = 06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f
+SIZE (rust/crates/core-foundation-sys-0.8.6.crate) = 37629
+SHA256 (rust/crates/cow-utils-0.1.2.crate) = 79bb3adfaf5f75d24b01aee375f7555907840fa2800e5ec8fa3b9e2031830173
+SIZE (rust/crates/cow-utils-0.1.2.crate) = 5602
+SHA256 (rust/crates/cpp_demangle-0.4.2.crate) = ee34052ee3d93d6d8f3e6f81d85c47921f6653a19a7b70e939e3e602d893a674
+SIZE (rust/crates/cpp_demangle-0.4.2.crate) = 79166
+SHA256 (rust/crates/cpufeatures-0.2.5.crate) = 28d997bd5e24a5928dd43e46dc529867e207907fe0b239c3477d924f7f2ca320
+SIZE (rust/crates/cpufeatures-0.2.5.crate) = 11251
+SHA256 (rust/crates/crc32c-0.6.4.crate) = d8f48d60e5b4d2c53d5c2b1d8a58c849a70ae5e5509b08a48d047e3b65714a74
+SIZE (rust/crates/crc32c-0.6.4.crate) = 9661
+SHA256 (rust/crates/crc32fast-1.3.2.crate) = b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d
+SIZE (rust/crates/crc32fast-1.3.2.crate) = 38661
+SHA256 (rust/crates/criterion-0.5.1.crate) = f2b12d017a929603d80db1831cd3a24082f8137ce19c69e6447f54f5fc8d692f
+SIZE (rust/crates/criterion-0.5.1.crate) = 110088
+SHA256 (rust/crates/criterion-plot-0.5.0.crate) = 6b50826342786a51a89e2da3a28f1c32b06e387201bc2d19791f622c673706b1
+SIZE (rust/crates/criterion-plot-0.5.0.crate) = 22706
+SHA256 (rust/crates/crossbeam-channel-0.5.8.crate) = a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200
+SIZE (rust/crates/crossbeam-channel-0.5.8.crate) = 90455
+SHA256 (rust/crates/crossbeam-deque-0.8.2.crate) = 715e8152b692bba2d374b53d4875445368fdf21a94751410af607a5ac677d1fc
+SIZE (rust/crates/crossbeam-deque-0.8.2.crate) = 21237
+SHA256 (rust/crates/crossbeam-epoch-0.9.13.crate) = 01a9af1f4c2ef74bb8aa1f7e19706bc72d03598c8a570bb5de72243c7a9d9d5a
+SIZE (rust/crates/crossbeam-epoch-0.9.13.crate) = 48313
+SHA256 (rust/crates/crossbeam-utils-0.8.14.crate) = 4fb766fa798726286dbbb842f174001dab8abc7b627a1dd86e0b7222a95d929f
+SIZE (rust/crates/crossbeam-utils-0.8.14.crate) = 42127
+SHA256 (rust/crates/crunchy-0.2.2.crate) = 7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7
+SIZE (rust/crates/crunchy-0.2.2.crate) = 2995
+SHA256 (rust/crates/crypto-common-0.1.6.crate) = 1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3
+SIZE (rust/crates/crypto-common-0.1.6.crate) = 8760
+SHA256 (rust/crates/csv-1.3.0.crate) = ac574ff4d437a7b5ad237ef331c17ccca63c46479e5b5453eb8e10bb99a759fe
+SIZE (rust/crates/csv-1.3.0.crate) = 888212
+SHA256 (rust/crates/csv-core-0.1.11.crate) = 5efa2b3d7902f4b634a20cae3c9c4e6209dc4779feb6863329607560143efa70
+SIZE (rust/crates/csv-core-0.1.11.crate) = 25852
+SHA256 (rust/crates/cxx-1.0.85.crate) = 5add3fc1717409d029b20c5b6903fc0c0b02fa6741d820054f4a2efa5e5816fd
+SIZE (rust/crates/cxx-1.0.85.crate) = 589916
+SHA256 (rust/crates/cxx-build-1.0.85.crate) = b4c87959ba14bc6fbc61df77c3fcfe180fc32b93538c4f1031dd802ccb5f2ff0
+SIZE (rust/crates/cxx-build-1.0.85.crate) = 84820
+SHA256 (rust/crates/cxxbridge-flags-1.0.85.crate) = 69a3e162fde4e594ed2b07d0f83c6c67b745e7f28ce58c6df5e6b6bef99dfb59
+SIZE (rust/crates/cxxbridge-flags-1.0.85.crate) = 5635
+SHA256 (rust/crates/cxxbridge-macro-1.0.85.crate) = 3e7e2adeb6a0d4a282e581096b06e1791532b7d576dcde5ccd9382acf55db8e6
+SIZE (rust/crates/cxxbridge-macro-1.0.85.crate) = 59873
+SHA256 (rust/crates/darling-0.20.3.crate) = 0209d94da627ab5605dcccf08bb18afa5009cfbef48d8a8b7d7bdbc79be25c5e
+SIZE (rust/crates/darling-0.20.3.crate) = 26066
+SHA256 (rust/crates/darling_core-0.20.3.crate) = 177e3443818124b357d8e76f53be906d60937f0d3a90773a664fa63fa253e621
+SIZE (rust/crates/darling_core-0.20.3.crate) = 60281
+SHA256 (rust/crates/darling_macro-0.20.3.crate) = 836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5
+SIZE (rust/crates/darling_macro-0.20.3.crate) = 1859
+SHA256 (rust/crates/dashmap-5.5.3.crate) = 978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856
+SIZE (rust/crates/dashmap-5.5.3.crate) = 24061
+SHA256 (rust/crates/debugid-0.8.0.crate) = bef552e6f588e446098f6ba40d89ac146c8c7b64aade83c051ee00bb5d2bc18d
+SIZE (rust/crates/debugid-0.8.0.crate) = 12757
+SHA256 (rust/crates/derive_more-0.99.17.crate) = 4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321
+SIZE (rust/crates/derive_more-0.99.17.crate) = 55771
+SHA256 (rust/crates/deunicode-1.4.3.crate) = b6e854126756c496b8c81dec88f9a706b15b875c5849d4097a3854476b9fdf94
+SIZE (rust/crates/deunicode-1.4.3.crate) = 177180
+SHA256 (rust/crates/digest-0.10.7.crate) = 9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292
+SIZE (rust/crates/digest-0.10.7.crate) = 19557
+SHA256 (rust/crates/dlv-list-0.5.2.crate) = 442039f5147480ba31067cb00ada1adae6892028e40e45fc5de7b7df6dcc1b5f
+SIZE (rust/crates/dlv-list-0.5.2.crate) = 22373
+SHA256 (rust/crates/docopt-1.1.1.crate) = 7f3f119846c823f9eafcf953a8f6ffb6ed69bf6240883261a7f13b634579a51f
+SIZE (rust/crates/docopt-1.1.1.crate) = 39845
+SHA256 (rust/crates/dyn-clone-1.0.10.crate) = c9b0705efd4599c15a38151f4721f7bc388306f61084d3bfd50bd07fbca5cb60
+SIZE (rust/crates/dyn-clone-1.0.10.crate) = 11946
+SHA256 (rust/crates/earcutr-0.4.2.crate) = 0812b44697951d35fde8fcb0da81c9de7e809e825a66bbf1ecb79d9829d4ca3d
+SIZE (rust/crates/earcutr-0.4.2.crate) = 644764
+SHA256 (rust/crates/either-1.10.0.crate) = 11157ac094ffbdde99aa67b23417ebdd801842852b500e395a45a9c0aac03e4a
+SIZE (rust/crates/either-1.10.0.crate) = 18334
+SHA256 (rust/crates/encode_unicode-0.3.6.crate) = a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f
+SIZE (rust/crates/encode_unicode-0.3.6.crate) = 45741
+SHA256 (rust/crates/encoding-0.2.33.crate) = 6b0d943856b990d12d3b55b359144ff341533e516d94098b1d3fc1ac666d36ec
+SIZE (rust/crates/encoding-0.2.33.crate) = 88798
+SHA256 (rust/crates/encoding-index-japanese-1.20141219.5.crate) = 04e8b2ff42e9a05335dbf8b5c6f7567e5591d0d916ccef4e0b1710d32a0d0c91
+SIZE (rust/crates/encoding-index-japanese-1.20141219.5.crate) = 91495
+SHA256 (rust/crates/encoding-index-korean-1.20141219.5.crate) = 4dc33fb8e6bcba213fe2f14275f0963fd16f0a02c878e3095ecfdf5bee529d81
+SIZE (rust/crates/encoding-index-korean-1.20141219.5.crate) = 103230
+SHA256 (rust/crates/encoding-index-simpchinese-1.20141219.5.crate) = d87a7194909b9118fc707194baa434a4e3b0fb6a5a757c73c3adb07aa25031f7
+SIZE (rust/crates/encoding-index-simpchinese-1.20141219.5.crate) = 130962
+SHA256 (rust/crates/encoding-index-singlebyte-1.20141219.5.crate) = 3351d5acffb224af9ca265f435b859c7c01537c0849754d3db3fdf2bfe2ae84a
+SIZE (rust/crates/encoding-index-singlebyte-1.20141219.5.crate) = 14950
+SHA256 (rust/crates/encoding-index-tradchinese-1.20141219.5.crate) = fd0e20d5688ce3cab59eb3ef3a2083a5c77bf496cb798dc6fcdb75f323890c18
+SIZE (rust/crates/encoding-index-tradchinese-1.20141219.5.crate) = 120862
+SHA256 (rust/crates/encoding_index_tests-0.1.4.crate) = a246d82be1c9d791c5dfde9a2bd045fc3cbba3fa2b11ad558f27d01712f00569
+SIZE (rust/crates/encoding_index_tests-0.1.4.crate) = 1631
+SHA256 (rust/crates/encoding_rs-0.8.32.crate) = 071a31f4ee85403370b58aca746f01041ede6f0da2730960ad001edc2b71b394
+SIZE (rust/crates/encoding_rs-0.8.32.crate) = 1370046
+SHA256 (rust/crates/encoding_rs_io-0.1.7.crate) = 1cc3c5651fb62ab8aa3103998dade57efdd028544bd300516baa31840c252a83
+SIZE (rust/crates/encoding_rs_io-0.1.7.crate) = 16969
+SHA256 (rust/crates/env_filter-0.1.0.crate) = a009aa4810eb158359dda09d0c87378e4bbb89b5a801f016885a4707ba24f7ea
+SIZE (rust/crates/env_filter-0.1.0.crate) = 11553
+SHA256 (rust/crates/env_logger-0.10.2.crate) = 4cd405aab171cb85d6735e5c8d9db038c17d3ca007a4d2c25f337935c3d90580
+SIZE (rust/crates/env_logger-0.10.2.crate) = 36402
+SHA256 (rust/crates/env_logger-0.11.3.crate) = 38b35839ba51819680ba087cd351788c9a3c476841207e0b8cee0b04722343b9
+SIZE (rust/crates/env_logger-0.11.3.crate) = 29704
+SHA256 (rust/crates/envmnt-0.8.4.crate) = a2d328fc287c61314c4a61af7cfdcbd7e678e39778488c7cb13ec133ce0f4059
+SIZE (rust/crates/envmnt-0.8.4.crate) = 848106
+SHA256 (rust/crates/equivalent-1.0.1.crate) = 5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5
+SIZE (rust/crates/equivalent-1.0.1.crate) = 6615
+SHA256 (rust/crates/erased-serde-0.4.2.crate) = 55d05712b2d8d88102bc9868020c9e5c7a1f5527c452b9b97450a1d006140ba7
+SIZE (rust/crates/erased-serde-0.4.2.crate) = 25661
+SHA256 (rust/crates/errno-0.3.8.crate) = a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245
+SIZE (rust/crates/errno-0.3.8.crate) = 10645
+SHA256 (rust/crates/fastrand-2.0.1.crate) = 25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5
+SIZE (rust/crates/fastrand-2.0.1.crate) = 14664
+SHA256 (rust/crates/filetime-0.2.19.crate) = 4e884668cd0c7480504233e951174ddc3b382f7c2666e3b7310b5c4e7b0c37f9
+SIZE (rust/crates/filetime-0.2.19.crate) = 15028
+SHA256 (rust/crates/findshlibs-0.10.2.crate) = 40b9e59cd0f7e0806cca4be089683ecb6434e602038df21fe6bf6711b2f07f64
+SIZE (rust/crates/findshlibs-0.10.2.crate) = 20101
+SHA256 (rust/crates/fixedbitset-0.4.2.crate) = 0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80
+SIZE (rust/crates/fixedbitset-0.4.2.crate) = 15954
+SHA256 (rust/crates/flate2-1.0.26.crate) = 3b9429470923de8e8cbd4d2dc513535400b4b3fef0319fb5c4e1f520a7bef743
+SIZE (rust/crates/flate2-1.0.26.crate) = 70832
+SHA256 (rust/crates/float_next_after-1.0.0.crate) = 8bf7cc16383c4b8d58b9905a8509f02926ce3058053c056376248d958c9df1e8
+SIZE (rust/crates/float_next_after-1.0.0.crate) = 6965
+SHA256 (rust/crates/fnv-1.0.7.crate) = 3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1
+SIZE (rust/crates/fnv-1.0.7.crate) = 11266
+SHA256 (rust/crates/foreign-types-0.5.0.crate) = d737d9aa519fb7b749cbc3b962edcf310a8dd1f4b67c91c4f83975dbdd17d965
+SIZE (rust/crates/foreign-types-0.5.0.crate) = 7824
+SHA256 (rust/crates/foreign-types-macros-0.2.3.crate) = 1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742
+SIZE (rust/crates/foreign-types-macros-0.2.3.crate) = 7635
+SHA256 (rust/crates/foreign-types-shared-0.3.1.crate) = aa9a19cbb55df58761df49b23516a86d432839add4af60fc256da840f66ed35b
+SIZE (rust/crates/foreign-types-shared-0.3.1.crate) = 6006
+SHA256 (rust/crates/form_urlencoded-1.2.1.crate) = e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456
+SIZE (rust/crates/form_urlencoded-1.2.1.crate) = 8969
+SHA256 (rust/crates/fs4-0.7.0.crate) = 29f9df8a11882c4e3335eb2d18a0137c505d9ca927470b0cac9c6f0ae07d28f7
+SIZE (rust/crates/fs4-0.7.0.crate) = 18207
+SHA256 (rust/crates/fs_extra-1.3.0.crate) = 42703706b716c37f96a77aea830392ad231f44c9e9a67872fa5548707e11b11c
+SIZE (rust/crates/fs_extra-1.3.0.crate) = 31298
+SHA256 (rust/crates/fsio-0.1.3.crate) = c1fd087255f739f4f1aeea69f11b72f8080e9c2e7645cd06955dad4a178a49e3
+SIZE (rust/crates/fsio-0.1.3.crate) = 810965
+SHA256 (rust/crates/fst-0.4.7.crate) = 7ab85b9b05e3978cc9a9cf8fea7f01b494e1a09ed3037e16ba39edc7a29eb61a
+SIZE (rust/crates/fst-0.4.7.crate) = 1573393
+SHA256 (rust/crates/funty-2.0.0.crate) = e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c
+SIZE (rust/crates/funty-2.0.0.crate) = 13160
+SHA256 (rust/crates/futures-0.3.30.crate) = 645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0
+SIZE (rust/crates/futures-0.3.30.crate) = 53828
+SHA256 (rust/crates/futures-channel-0.3.30.crate) = eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78
+SIZE (rust/crates/futures-channel-0.3.30.crate) = 31736
+SHA256 (rust/crates/futures-core-0.3.30.crate) = dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d
+SIZE (rust/crates/futures-core-0.3.30.crate) = 14071
+SHA256 (rust/crates/futures-executor-0.3.30.crate) = a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d
+SIZE (rust/crates/futures-executor-0.3.30.crate) = 17744
+SHA256 (rust/crates/futures-io-0.3.30.crate) = a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1
+SIZE (rust/crates/futures-io-0.3.30.crate) = 8910
+SHA256 (rust/crates/futures-macro-0.3.30.crate) = 87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac
+SIZE (rust/crates/futures-macro-0.3.30.crate) = 11278
+SHA256 (rust/crates/futures-sink-0.3.30.crate) = 9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5
+SIZE (rust/crates/futures-sink-0.3.30.crate) = 7852
+SHA256 (rust/crates/futures-task-0.3.30.crate) = 38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004
+SIZE (rust/crates/futures-task-0.3.30.crate) = 11126
+SHA256 (rust/crates/futures-timer-3.0.2.crate) = e64b03909df88034c26dc1547e8970b91f98bdb65165d6a4e9110d94263dbb2c
+SIZE (rust/crates/futures-timer-3.0.2.crate) = 19879
+SHA256 (rust/crates/futures-util-0.3.30.crate) = 3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48
+SIZE (rust/crates/futures-util-0.3.30.crate) = 159977
+SHA256 (rust/crates/fxhash-0.2.1.crate) = c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c
+SIZE (rust/crates/fxhash-0.2.1.crate) = 4102
+SHA256 (rust/crates/generator-0.7.4.crate) = f3e123d9ae7c02966b4d892e550bdc32164f05853cd40ab570650ad600596a8a
+SIZE (rust/crates/generator-0.7.4.crate) = 29919
+SHA256 (rust/crates/generic-array-0.14.6.crate) = bff49e947297f3312447abdca79f45f4738097cc82b06e72054d2223f601f1b9
+SIZE (rust/crates/generic-array-0.14.6.crate) = 15889
+SHA256 (rust/crates/generic-tests-0.1.2.crate) = eeb39ec0dacc89541b6eced815ab9e97f6b7d44078628abb090c6437763fd050
+SIZE (rust/crates/generic-tests-0.1.2.crate) = 18637
+SHA256 (rust/crates/geo-0.28.0.crate) = f811f663912a69249fa620dcd2a005db7254529da2d8a0b23942e81f47084501
+SIZE (rust/crates/geo-0.28.0.crate) = 264928
+SHA256 (rust/crates/geo-types-0.7.13.crate) = 9ff16065e5720f376fbced200a5ae0f47ace85fd70b7e54269790281353b6d61
+SIZE (rust/crates/geo-types-0.7.13.crate) = 36006
+SHA256 (rust/crates/geographiclib-rs-0.2.3.crate) = 8ea804e7bd3c6a4ca6a01edfa35231557a8a81d4d3f3e1e2b650d028c42592be
+SIZE (rust/crates/geographiclib-rs-0.2.3.crate) = 52845
+SHA256 (rust/crates/geohash-0.13.0.crate) = 8a18b809b13fa4f1c9ccfd94179cc429021a3517856b5160422c3d810c1e8546
+SIZE (rust/crates/geohash-0.13.0.crate) = 111304
+SHA256 (rust/crates/getopts-0.2.21.crate) = 14dbbfd5c71d70241ecf9e6f13737f7b5ce823821063188d7e46c41d371eebd5
+SIZE (rust/crates/getopts-0.2.21.crate) = 18457
+SHA256 (rust/crates/getrandom-0.1.16.crate) = 8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce
+SIZE (rust/crates/getrandom-0.1.16.crate) = 25077
+SHA256 (rust/crates/getrandom-0.2.11.crate) = fe9006bed769170c11f845cf00c7c1e9092aeb3f268e007c3e760ac68008070f
+SIZE (rust/crates/getrandom-0.2.11.crate) = 35391
+SHA256 (rust/crates/getset-0.1.2.crate) = e45727250e75cc04ff2846a66397da8ef2b3db8e40e0cef4df67950a07621eb9
+SIZE (rust/crates/getset-0.1.2.crate) = 8831
+SHA256 (rust/crates/gimli-0.27.0.crate) = dec7af912d60cdbd3677c1af9352ebae6fb8394d165568a2234df0fa00f87793
+SIZE (rust/crates/gimli-0.27.0.crate) = 720457
+SHA256 (rust/crates/glob-0.3.1.crate) = d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b
+SIZE (rust/crates/glob-0.3.1.crate) = 18880
+SHA256 (rust/crates/h2-0.3.24.crate) = bb2c4422095b67ee78da96fbb51a4cc413b3b25883c7717ff7ca1ab31022c9c9
+SIZE (rust/crates/h2-0.3.24.crate) = 167814
+SHA256 (rust/crates/half-1.8.2.crate) = eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7
+SIZE (rust/crates/half-1.8.2.crate) = 41874
+SHA256 (rust/crates/hash32-0.3.1.crate) = 47d60b12902ba28e2730cd37e95b8c9223af2808df9e902d4df49588d1470606
+SIZE (rust/crates/hash32-0.3.1.crate) = 10273
+SHA256 (rust/crates/hashbrown-0.12.3.crate) = 8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888
+SIZE (rust/crates/hashbrown-0.12.3.crate) = 102968
+SHA256 (rust/crates/hashbrown-0.13.2.crate) = 43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e
+SIZE (rust/crates/hashbrown-0.13.2.crate) = 105265
+SHA256 (rust/crates/hashbrown-0.14.2.crate) = f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156
+SIZE (rust/crates/hashbrown-0.14.2.crate) = 140080
+SHA256 (rust/crates/hashring-0.3.3.crate) = aa283406d74fcfeb4778f4e300beaae30db96793371da168d003cbc833e149e0
+SIZE (rust/crates/hashring-0.3.3.crate) = 5827
+SHA256 (rust/crates/hdrhistogram-7.5.2.crate) = 7f19b9f54f7c7f55e31401bb647626ce0cf0f67b0004982ce815b3ee72a02aa8
+SIZE (rust/crates/hdrhistogram-7.5.2.crate) = 316864
+SHA256 (rust/crates/heapless-0.8.0.crate) = 0bfb9eb618601c89945a70e254898da93b13be0388091d42117462b265bb3fad
+SIZE (rust/crates/heapless-0.8.0.crate) = 77802
+SHA256 (rust/crates/heck-0.4.0.crate) = 2540771e65fc8cb83cd6e8a237f70c319bd5c29f78ed1084ba5d50eeac86f7f9
+SIZE (rust/crates/heck-0.4.0.crate) = 11161
+SHA256 (rust/crates/hermit-abi-0.3.3.crate) = d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7
+SIZE (rust/crates/hermit-abi-0.3.3.crate) = 14253
+SHA256 (rust/crates/hex-0.4.3.crate) = 7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70
+SIZE (rust/crates/hex-0.4.3.crate) = 13299
+SHA256 (rust/crates/hmac-0.12.1.crate) = 6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e
+SIZE (rust/crates/hmac-0.12.1.crate) = 42657
+SHA256 (rust/crates/http-0.2.9.crate) = bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482
+SIZE (rust/crates/http-0.2.9.crate) = 100146
+SHA256 (rust/crates/http-1.0.0.crate) = b32afd38673a8016f7c9ae69e5af41a58f81b1d31689040f2f1959594ce194ea
+SIZE (rust/crates/http-1.0.0.crate) = 100981
+SHA256 (rust/crates/http-body-0.4.5.crate) = d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1
+SIZE (rust/crates/http-body-0.4.5.crate) = 9242
+SHA256 (rust/crates/http-range-0.1.5.crate) = 21dec9db110f5f872ed9699c3ecf50cf16f423502706ba5c72462e28d3157573
+SIZE (rust/crates/http-range-0.1.5.crate) = 4871
+SHA256 (rust/crates/http-serde-2.0.0.crate) = 7fb7239a6d49eda628c2dfdd7e982c59b0c3f0fb99ce45c4237f02a520030688
+SIZE (rust/crates/http-serde-2.0.0.crate) = 4307
+SHA256 (rust/crates/httparse-1.8.0.crate) = d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904
+SIZE (rust/crates/httparse-1.8.0.crate) = 29954
+SHA256 (rust/crates/httpdate-1.0.2.crate) = c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421
+SIZE (rust/crates/httpdate-1.0.2.crate) = 10673
+SHA256 (rust/crates/humantime-2.1.0.crate) = 9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4
+SIZE (rust/crates/humantime-2.1.0.crate) = 16749
+SHA256 (rust/crates/hyper-0.14.26.crate) = ab302d72a6f11a3b910431ff93aae7e773078c769f0a3ef15fb9ec692ed147d4
+SIZE (rust/crates/hyper-0.14.26.crate) = 195570
+SHA256 (rust/crates/hyper-rustls-0.24.0.crate) = 0646026eb1b3eea4cd9ba47912ea5ce9cc07713d105b1a14698f4e6433d348b7
+SIZE (rust/crates/hyper-rustls-0.24.0.crate) = 29917
+SHA256 (rust/crates/hyper-timeout-0.4.1.crate) = bbb958482e8c7be4bc3cf272a766a2b0bf1a6755e7a6ae777f017a31d11b13b1
+SIZE (rust/crates/hyper-timeout-0.4.1.crate) = 13805
+SHA256 (rust/crates/iana-time-zone-0.1.53.crate) = 64c122667b287044802d6ce17ee2ddf13207ed924c712de9a66a5814d5b64765
+SIZE (rust/crates/iana-time-zone-0.1.53.crate) = 20176
+SHA256 (rust/crates/iana-time-zone-haiku-0.1.1.crate) = 0703ae284fc167426161c2e3f1da3ea71d94b21bedbcc9494e92b28e334e3dca
+SIZE (rust/crates/iana-time-zone-haiku-0.1.1.crate) = 7200
+SHA256 (rust/crates/ident_case-1.0.1.crate) = b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39
+SIZE (rust/crates/ident_case-1.0.1.crate) = 3492
+SHA256 (rust/crates/idna-0.4.0.crate) = 7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c
+SIZE (rust/crates/idna-0.4.0.crate) = 271429
+SHA256 (rust/crates/idna-0.5.0.crate) = 634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6
+SIZE (rust/crates/idna-0.5.0.crate) = 271940
+SHA256 (rust/crates/if_chain-1.0.2.crate) = cb56e1aa765b4b4f3aadfab769793b7087bb03a4ea4920644a6d238e2df5b9ed
+SIZE (rust/crates/if_chain-1.0.2.crate) = 8062
+SHA256 (rust/crates/impl-more-0.1.6.crate) = 206ca75c9c03ba3d4ace2460e57b189f39f43de612c2f85836e65c929701bb2d
+SIZE (rust/crates/impl-more-0.1.6.crate) = 13967
+SHA256 (rust/crates/indexmap-1.9.2.crate) = 1885e79c1fc4b10f0e172c475f458b7f7b93061064d98c3293e98c5ba0c8b399
+SIZE (rust/crates/indexmap-1.9.2.crate) = 54627
+SHA256 (rust/crates/indexmap-2.2.5.crate) = 7b0b929d511467233429c45a44ac1dcaa21ba0f5ba11e4879e6ed28ddb4f9df4
+SIZE (rust/crates/indexmap-2.2.5.crate) = 81498
+SHA256 (rust/crates/indicatif-0.17.8.crate) = 763a5a8f45087d6bcea4222e7b72c291a054edf80e4ef6efd2a4979878c7bea3
+SIZE (rust/crates/indicatif-0.17.8.crate) = 64869
+SHA256 (rust/crates/inferno-0.11.18.crate) = abfb2e51b23c338595ae0b6bdaaa7a4a8b860b8d788a4331cb07b50fe5dea71b
+SIZE (rust/crates/inferno-0.11.18.crate) = 102794
+SHA256 (rust/crates/inout-0.1.3.crate) = a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5
+SIZE (rust/crates/inout-0.1.3.crate) = 10743
+SHA256 (rust/crates/instant-0.1.12.crate) = 7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c
+SIZE (rust/crates/instant-0.1.12.crate) = 6128
+SHA256 (rust/crates/inventory-0.3.14.crate) = c8573b2b1fb643a372c73b23f4da5f888677feef3305146d68a539250a9bccc7
+SIZE (rust/crates/inventory-0.3.14.crate) = 13953
+SHA256 (rust/crates/io-lifetimes-1.0.11.crate) = eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2
+SIZE (rust/crates/io-lifetimes-1.0.11.crate) = 37346
+SHA256 (rust/crates/io-uring-0.6.3.crate) = a9febecd4aebbe9c7c23c8e536e966805fdf09944c8a915e7991ee51acb67087
+SIZE (rust/crates/io-uring-0.6.3.crate) = 53887
+SHA256 (rust/crates/ipnet-2.7.0.crate) = 11b0d96e660696543b251e58030cf9787df56da39dab19ad60eae7353040917e
+SIZE (rust/crates/ipnet-2.7.0.crate) = 26918
+SHA256 (rust/crates/irg-kvariants-0.1.0.crate) = c73214298363629cf9dbfc93b426808865ee3c121029778cb31b1284104fdf78
+SIZE (rust/crates/irg-kvariants-0.1.0.crate) = 128391
+SHA256 (rust/crates/is-terminal-0.4.6.crate) = 256017f749ab3117e93acb91063009e1f1bb56d03965b14c2c8df4eb02c524d8
+SIZE (rust/crates/is-terminal-0.4.6.crate) = 7856
+SHA256 (rust/crates/is_sorted-0.1.1.crate) = 357376465c37db3372ef6a00585d336ed3d0f11d4345eef77ebcb05865392b21
+SIZE (rust/crates/is_sorted-0.1.1.crate) = 22933
+SHA256 (rust/crates/itertools-0.10.5.crate) = b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473
+SIZE (rust/crates/itertools-0.10.5.crate) = 115354
+SHA256 (rust/crates/itertools-0.12.1.crate) = ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569
+SIZE (rust/crates/itertools-0.12.1.crate) = 137761
+SHA256 (rust/crates/itoa-1.0.5.crate) = fad582f4b9e86b6caa621cabeb0963332d92eea04729ab12892c2533951e6440
+SIZE (rust/crates/itoa-1.0.5.crate) = 10622
+SHA256 (rust/crates/jieba-rs-0.6.8.crate) = 93f0c1347cd3ac8d7c6e3a2dc33ac496d365cf09fc0831aa61111e1a6738983e
+SIZE (rust/crates/jieba-rs-0.6.8.crate) = 4313878
+SHA256 (rust/crates/jobserver-0.1.25.crate) = 068b1ee6743e4d11fb9c6a1e6064b3693a1b600e7f5f5988047d98b3dc9fb90b
+SIZE (rust/crates/jobserver-0.1.25.crate) = 21888
+SHA256 (rust/crates/js-sys-0.3.60.crate) = 49409df3e3bf0856b916e2ceaca09ee28e6871cf7d9ce97a692cacfdb2a25a47
+SIZE (rust/crates/js-sys-0.3.60.crate) = 79257
+SHA256 (rust/crates/json5-0.4.1.crate) = 96b0db21af676c1ce64250b5f40f3ce2cf27e4e47cb91ed91eb6fe9350b430c1
+SIZE (rust/crates/json5-0.4.1.crate) = 15678
+SHA256 (rust/crates/jsonwebtoken-9.2.0.crate) = 5c7ea04a7c5c055c175f189b6dc6ba036fd62306b58c66c9f6389036c503a3f4
+SIZE (rust/crates/jsonwebtoken-9.2.0.crate) = 48775
+SHA256 (rust/crates/language-tags-0.3.2.crate) = d4345964bb142484797b161f473a503a434de77149dd8c7427788c6e13379388
+SIZE (rust/crates/language-tags-0.3.2.crate) = 53420
+SHA256 (rust/crates/lazy_static-1.4.0.crate) = e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646
+SIZE (rust/crates/lazy_static-1.4.0.crate) = 10443
+SHA256 (rust/crates/lazycell-1.3.0.crate) = 830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55
+SIZE (rust/crates/lazycell-1.3.0.crate) = 12502
+SHA256 (rust/crates/libc-0.2.153.crate) = 9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd
+SIZE (rust/crates/libc-0.2.153.crate) = 740614
+SHA256 (rust/crates/libloading-0.7.4.crate) = b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f
+SIZE (rust/crates/libloading-0.7.4.crate) = 27580
+SHA256 (rust/crates/libm-0.2.6.crate) = 348108ab3fba42ec82ff6e9564fc4ca0247bdccdc68dd8af9764bbc79c3c8ffb
+SIZE (rust/crates/libm-0.2.6.crate) = 113690
+SHA256 (rust/crates/librocksdb-sys-0.16.0+8.10.0.crate) = ce3d60bc059831dc1c83903fb45c103f75db65c5a7bf22272764d9cc683e348c
+SIZE (rust/crates/librocksdb-sys-0.16.0+8.10.0.crate) = 6929396
+SHA256 (rust/crates/libz-sys-1.1.8.crate) = 9702761c3935f8cc2f101793272e202c72b99da8f4224a19ddcf1279a6450bbf
+SIZE (rust/crates/libz-sys-1.1.8.crate) = 2481844
+SHA256 (rust/crates/lindera-cc-cedict-builder-0.27.2.crate) = a90d23f7cef31c6ab7ac0d4f3b23940754207f7b5a80b080c39193caffe99ac2
+SIZE (rust/crates/lindera-cc-cedict-builder-0.27.2.crate) = 5444
+SHA256 (rust/crates/lindera-compress-0.27.2.crate) = 1927b7d2bd4ffc19e07691bf8609722663c341f80260a1c636cee8f1ec420dce
+SIZE (rust/crates/lindera-compress-0.27.2.crate) = 1759
+SHA256 (rust/crates/lindera-core-0.27.2.crate) = 3299caa2b81c9a076535a4651a83bf7d624c15f2349f243187fffc64b5a78251
+SIZE (rust/crates/lindera-core-0.27.2.crate) = 10536
+SHA256 (rust/crates/lindera-decompress-0.27.2.crate) = 7b82b8d2323a67dc8ff0c40751d199b7ba94cd5e3c13a5b31622d318acc79e5b
+SIZE (rust/crates/lindera-decompress-0.27.2.crate) = 1600
+SHA256 (rust/crates/lindera-dictionary-0.27.2.crate) = cddf783b459d54b130d956889bec052c25fcb478a304e03fa9b2289387572bc5
+SIZE (rust/crates/lindera-dictionary-0.27.2.crate) = 5599
+SHA256 (rust/crates/lindera-ipadic-builder-0.27.2.crate) = 27c708f08f14b0806f6c4cce5324b4bcba27209463026b78c31f399f8be9d30d
+SIZE (rust/crates/lindera-ipadic-builder-0.27.2.crate) = 7421
+SHA256 (rust/crates/lindera-ipadic-neologd-builder-0.27.2.crate) = e5e67eb91652203d202f7d27ead220d1d8c9099552709b8429eae9c70f2312fb
+SIZE (rust/crates/lindera-ipadic-neologd-builder-0.27.2.crate) = 7389
+SHA256 (rust/crates/lindera-ko-dic-0.27.2.crate) = d45da8d9a5888f4d4e78bb29fc82ff9ae519962efb0d2d92343b6cf8e373952f
+SIZE (rust/crates/lindera-ko-dic-0.27.2.crate) = 41068947
+SHA256 (rust/crates/lindera-ko-dic-builder-0.27.2.crate) = 41c0933295dc945178bbc08f34111dc3ef22bfee38820f78453c8f8d4f3463d1
+SIZE (rust/crates/lindera-ko-dic-builder-0.27.2.crate) = 10158
+SHA256 (rust/crates/lindera-tokenizer-0.27.2.crate) = 348ce9bb3f2e5edc577420b98cca05b2177f3af50ef5ae278a1d8a1351d56197
+SIZE (rust/crates/lindera-tokenizer-0.27.2.crate) = 24175
+SHA256 (rust/crates/lindera-unidic-0.27.2.crate) = 74022a57c395ed7e213a9cd5833207e3c583145078ee9a164aeaec68b30c9d8e
+SIZE (rust/crates/lindera-unidic-0.27.2.crate) = 4649
+SHA256 (rust/crates/lindera-unidic-builder-0.27.2.crate) = a34e5564ee81af82603cd6a03c3abe6e17cc0ae598bfa5078809f06e59e96e08
+SIZE (rust/crates/lindera-unidic-builder-0.27.2.crate) = 6623
+SHA256 (rust/crates/link-cplusplus-1.0.8.crate) = ecd207c9c713c34f95a097a5b029ac2ce6010530c7b49d7fea24d977dede04f5
+SIZE (rust/crates/link-cplusplus-1.0.8.crate) = 7674
+SHA256 (rust/crates/linked-hash-map-0.5.6.crate) = 0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f
+SIZE (rust/crates/linked-hash-map-0.5.6.crate) = 15049
+SHA256 (rust/crates/linux-raw-sys-0.3.8.crate) = ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519
+SIZE (rust/crates/linux-raw-sys-0.3.8.crate) = 1013776
+SHA256 (rust/crates/linux-raw-sys-0.4.13.crate) = 01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c
+SIZE (rust/crates/linux-raw-sys-0.4.13.crate) = 1493855
+SHA256 (rust/crates/litemap-0.7.2.crate) = f9d642685b028806386b2b6e75685faadd3eb65a85fff7df711ce18446a422da
+SIZE (rust/crates/litemap-0.7.2.crate) = 27778
+SHA256 (rust/crates/local-channel-0.1.3.crate) = 7f303ec0e94c6c54447f84f3b0ef7af769858a9c4ef56ef2a986d3dcd4c3fc9c
+SIZE (rust/crates/local-channel-0.1.3.crate) = 7522
+SHA256 (rust/crates/local-waker-0.1.3.crate) = e34f76eb3611940e0e7d53a9aaa4e6a3151f69541a282fd0dad5571420c53ff1
+SIZE (rust/crates/local-waker-0.1.3.crate) = 6369
+SHA256 (rust/crates/lock_api-0.4.11.crate) = 3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45
+SIZE (rust/crates/lock_api-0.4.11.crate) = 27487
+SHA256 (rust/crates/log-0.4.21.crate) = 90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c
+SIZE (rust/crates/log-0.4.21.crate) = 43442
+SHA256 (rust/crates/loom-0.7.1.crate) = 7e045d70ddfbc984eacfa964ded019534e8f6cbf36f6410aee0ed5cefa5a9175
+SIZE (rust/crates/loom-0.7.1.crate) = 73744
+SHA256 (rust/crates/macro_rules_attribute-0.2.0.crate) = 8a82271f7bc033d84bbca59a3ce3e4159938cb08a9c3aebbe54d215131518a13
+SIZE (rust/crates/macro_rules_attribute-0.2.0.crate) = 15408
+SHA256 (rust/crates/macro_rules_attribute-proc_macro-0.2.0.crate) = b8dd856d451cc0da70e2ef2ce95a18e39a93b7558bedf10201ad28503f918568
+SIZE (rust/crates/macro_rules_attribute-proc_macro-0.2.0.crate) = 8264
+SHA256 (rust/crates/matchers-0.1.0.crate) = 8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558
+SIZE (rust/crates/matchers-0.1.0.crate) = 6948
+SHA256 (rust/crates/matchit-0.7.0.crate) = b87248edafb776e59e6ee64a79086f65890d3510f2c656c000bf2a7e8a0aea40
+SIZE (rust/crates/matchit-0.7.0.crate) = 19113
+SHA256 (rust/crates/memchr-2.5.0.crate) = 2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d
+SIZE (rust/crates/memchr-2.5.0.crate) = 65812
+SHA256 (rust/crates/memmap2-0.5.10.crate) = 83faa42c0a078c393f6b29d5db232d8be22776a891f8f56e5284faee4a20b327
+SIZE (rust/crates/memmap2-0.5.10.crate) = 26847
+SHA256 (rust/crates/memmap2-0.9.4.crate) = fe751422e4a8caa417e13c3ea66452215d7d63e19e604f4980461212f3ae1322
+SIZE (rust/crates/memmap2-0.9.4.crate) = 32752
+SHA256 (rust/crates/memoffset-0.7.1.crate) = 5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4
+SIZE (rust/crates/memoffset-0.7.1.crate) = 8556
+SHA256 (rust/crates/merge-0.1.0.crate) = 10bbef93abb1da61525bbc45eeaff6473a41907d19f8f9aa5168d214e10693e9
+SIZE (rust/crates/merge-0.1.0.crate) = 16946
+SHA256 (rust/crates/merge_derive-0.1.0.crate) = 209d075476da2e63b4b29e72a2ef627b840589588e71400a25e3565c4f849d07
+SIZE (rust/crates/merge_derive-0.1.0.crate) = 2598
+SHA256 (rust/crates/mime-0.3.16.crate) = 2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d
+SIZE (rust/crates/mime-0.3.16.crate) = 15206
+SHA256 (rust/crates/mime_guess-2.0.4.crate) = 4192263c238a5f0d0c6bfd21f336a313a4ce1c450542449ca191bb657b4642ef
+SIZE (rust/crates/mime_guess-2.0.4.crate) = 26399
+SHA256 (rust/crates/minimal-lexical-0.2.1.crate) = 68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a
+SIZE (rust/crates/minimal-lexical-0.2.1.crate) = 94841
+SHA256 (rust/crates/miniz_oxide-0.6.2.crate) = b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa
+SIZE (rust/crates/miniz_oxide-0.6.2.crate) = 54536
+SHA256 (rust/crates/miniz_oxide-0.7.1.crate) = e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7
+SIZE (rust/crates/miniz_oxide-0.7.1.crate) = 55194
+SHA256 (rust/crates/mio-0.8.11.crate) = a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c
+SIZE (rust/crates/mio-0.8.11.crate) = 102983
+SHA256 (rust/crates/multimap-0.8.3.crate) = e5ce46fe64a9d73be07dcbe690a38ce1b293be448fd8ce1e6c1b8062c9f72c6a
+SIZE (rust/crates/multimap-0.8.3.crate) = 13518
+SHA256 (rust/crates/nias-0.5.0.crate) = ab250442c86f1850815b5d268639dff018c0627022bc1940eb2d642ca1ce12f0
+SIZE (rust/crates/nias-0.5.0.crate) = 4771
+SHA256 (rust/crates/nix-0.25.1.crate) = f346ff70e7dbfd675fe90590b92d59ef2de15a8779ae305ebcbfd3f0caf59be4
+SIZE (rust/crates/nix-0.25.1.crate) = 272312
+SHA256 (rust/crates/nix-0.26.2.crate) = bfdda3d196821d6af13126e40375cdf7da646a96114af134d5f417a9a1dc8e1a
+SIZE (rust/crates/nix-0.26.2.crate) = 277973
+SHA256 (rust/crates/nodrop-0.1.14.crate) = 72ef4a56884ca558e5ddb05a1d1e7e1bfd9a68d9ed024c21704cc98872dae1bb
+SIZE (rust/crates/nodrop-0.1.14.crate) = 7667
+SHA256 (rust/crates/nom-7.1.3.crate) = d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a
+SIZE (rust/crates/nom-7.1.3.crate) = 117570
+SHA256 (rust/crates/ntapi-0.4.1.crate) = e8a3895c6391c39d7fe7ebc444a87eb2991b2a0bc718fdabd071eec617fc68e4
+SIZE (rust/crates/ntapi-0.4.1.crate) = 126552
+SHA256 (rust/crates/nu-ansi-term-0.46.0.crate) = 77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84
+SIZE (rust/crates/nu-ansi-term-0.46.0.crate) = 24311
+SHA256 (rust/crates/num-bigint-0.4.4.crate) = 608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0
+SIZE (rust/crates/num-bigint-0.4.4.crate) = 99369
+SHA256 (rust/crates/num-cmp-0.1.0.crate) = 63335b2e2c34fae2fb0aa2cecfd9f0832a1e24b3b32ecec612c3426d46dc8aaa
+SIZE (rust/crates/num-cmp-0.1.0.crate) = 15375
+SHA256 (rust/crates/num-derive-0.4.2.crate) = ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202
+SIZE (rust/crates/num-derive-0.4.2.crate) = 14709
+SHA256 (rust/crates/num-format-0.4.4.crate) = a652d9771a63711fd3c3deb670acfbe5c30a4072e664d7a3bf5a9e1056ac72c3
+SIZE (rust/crates/num-format-0.4.4.crate) = 61509
+SHA256 (rust/crates/num-integer-0.1.46.crate) = 7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f
+SIZE (rust/crates/num-integer-0.1.46.crate) = 22331
+SHA256 (rust/crates/num-traits-0.2.18.crate) = da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a
+SIZE (rust/crates/num-traits-0.2.18.crate) = 51930
+SHA256 (rust/crates/num_cpus-1.16.0.crate) = 4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43
+SIZE (rust/crates/num_cpus-1.16.0.crate) = 15713
+SHA256 (rust/crates/number_prefix-0.4.0.crate) = 830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3
+SIZE (rust/crates/number_prefix-0.4.0.crate) = 6922
+SHA256 (rust/crates/object-0.30.0.crate) = 239da7f290cfa979f43f85a8efeee9a8a76d0827c356d37f9d3d7254d6b537fb
+SIZE (rust/crates/object-0.30.0.crate) = 257728
+SHA256 (rust/crates/once_cell-1.19.0.crate) = 3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92
+SIZE (rust/crates/once_cell-1.19.0.crate) = 33046
+SHA256 (rust/crates/oorandom-11.1.3.crate) = 0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575
+SIZE (rust/crates/oorandom-11.1.3.crate) = 10068
+SHA256 (rust/crates/ordered-float-2.10.1.crate) = 68f19d67e5a2795c94e73e0bb1cc1a7edeb2e28efd39e2e1c9b7a40c1108b11c
+SIZE (rust/crates/ordered-float-2.10.1.crate) = 16029
+SHA256 (rust/crates/ordered-float-4.2.0.crate) = a76df7075c7d4d01fdcb46c912dd17fba5b60c78ea480b475f2b6ab6f666584e
+SIZE (rust/crates/ordered-float-4.2.0.crate) = 20510
+SHA256 (rust/crates/ordered-multimap-0.6.0.crate) = 4ed8acf08e98e744e5384c8bc63ceb0364e68a6854187221c18df61c4797690e
+SIZE (rust/crates/ordered-multimap-0.6.0.crate) = 23158
+SHA256 (rust/crates/overload-0.1.1.crate) = b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39
+SIZE (rust/crates/overload-0.1.1.crate) = 24439
+SHA256 (rust/crates/parking_lot-0.12.1.crate) = 3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f
+SIZE (rust/crates/parking_lot-0.12.1.crate) = 40967
+SHA256 (rust/crates/parking_lot_core-0.9.9.crate) = 4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e
+SIZE (rust/crates/parking_lot_core-0.9.9.crate) = 32445
+SHA256 (rust/crates/parse-size-1.0.0.crate) = 944553dd59c802559559161f9816429058b869003836120e262e8caec061b7ae
+SIZE (rust/crates/parse-size-1.0.0.crate) = 6588
+SHA256 (rust/crates/password-hash-0.4.2.crate) = 7676374caaee8a325c9e7a2ae557f216c5563a171d6997b0ef8a65af35147700
+SIZE (rust/crates/password-hash-0.4.2.crate) = 26099
+SHA256 (rust/crates/paste-1.0.11.crate) = d01a5bd0424d00070b0098dd17ebca6f961a959dead1dbcbbbc1d1cd8d3deeba
+SIZE (rust/crates/paste-1.0.11.crate) = 18349
+SHA256 (rust/crates/pathdiff-0.2.1.crate) = 8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd
+SIZE (rust/crates/pathdiff-0.2.1.crate) = 7142
+SHA256 (rust/crates/pbkdf2-0.11.0.crate) = 83a0692ec44e4cf1ef28ca317f14f8f07da2d95ec3fa01f86e4467b725e60917
+SIZE (rust/crates/pbkdf2-0.11.0.crate) = 13229
+SHA256 (rust/crates/pem-3.0.3.crate) = 1b8fcc794035347fb64beda2d3b462595dd2753e3f268d89c5aae77e8cf2c310
+SIZE (rust/crates/pem-3.0.3.crate) = 13035
+SHA256 (rust/crates/percent-encoding-2.3.1.crate) = e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e
+SIZE (rust/crates/percent-encoding-2.3.1.crate) = 10235
+SHA256 (rust/crates/permutation_iterator-0.1.2.crate) = b55405179fe06e4e3820ddaf9f9b51cdff9e7496af9554acdb2b1921a86ca9cb
+SIZE (rust/crates/permutation_iterator-0.1.2.crate) = 14046
+SHA256 (rust/crates/pest-2.5.1.crate) = cc8bed3549e0f9b0a2a78bf7c0018237a2cdf085eecbbc048e52612438e4e9d0
+SIZE (rust/crates/pest-2.5.1.crate) = 94437
+SHA256 (rust/crates/pest_derive-2.5.1.crate) = cdc078600d06ff90d4ed238f0119d84ab5d43dbaad278b0e33a8820293b32344
+SIZE (rust/crates/pest_derive-2.5.1.crate) = 17682
+SHA256 (rust/crates/pest_generator-2.5.1.crate) = 28a1af60b1c4148bb269006a750cff8e2ea36aff34d2d96cf7be0b14d1bed23c
+SIZE (rust/crates/pest_generator-2.5.1.crate) = 14887
+SHA256 (rust/crates/pest_meta-2.5.1.crate) = fec8605d59fc2ae0c6c1aefc0c7c7a9769732017c0ce07f7a9cfffa7b4404f20
+SIZE (rust/crates/pest_meta-2.5.1.crate) = 31871
+SHA256 (rust/crates/petgraph-0.6.2.crate) = e6d5014253a1331579ce62aa67443b4a658c5e7dd03d4bc6d302b94474888143
+SIZE (rust/crates/petgraph-0.6.2.crate) = 182513
+SHA256 (rust/crates/phf-0.11.2.crate) = ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc
+SIZE (rust/crates/phf-0.11.2.crate) = 21569
+SHA256 (rust/crates/phf_codegen-0.11.2.crate) = e8d39688d359e6b34654d328e262234662d16cc0f60ec8dcbe5e718709342a5a
+SIZE (rust/crates/phf_codegen-0.11.2.crate) = 12977
+SHA256 (rust/crates/phf_generator-0.11.2.crate) = 48e4cc64c2ad9ebe670cb8fd69dd50ae301650392e81c05f9bfcb2d5bdbc24b0
+SIZE (rust/crates/phf_generator-0.11.2.crate) = 14190
+SHA256 (rust/crates/phf_shared-0.11.2.crate) = 90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b
+SIZE (rust/crates/phf_shared-0.11.2.crate) = 14284
+SHA256 (rust/crates/pin-project-1.0.12.crate) = ad29a609b6bcd67fee905812e544992d216af9d755757c05ed2d0e15a74c6ecc
+SIZE (rust/crates/pin-project-1.0.12.crate) = 56972
+SHA256 (rust/crates/pin-project-internal-1.0.12.crate) = 069bdb1e05adc7a8990dce9cc75370895fbe4e3d58b9b73bf1aee56359344a55
+SIZE (rust/crates/pin-project-internal-1.0.12.crate) = 27956
+SHA256 (rust/crates/pin-project-lite-0.2.12.crate) = 12cc1b0bf1727a77a54b6654e7b5f1af8604923edc8b81885f8ec92f9e3f0a05
+SIZE (rust/crates/pin-project-lite-0.2.12.crate) = 29073
+SHA256 (rust/crates/pin-utils-0.1.0.crate) = 8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184
+SIZE (rust/crates/pin-utils-0.1.0.crate) = 7580
+SHA256 (rust/crates/pinyin-0.10.0.crate) = 16f2611cd06a1ac239a0cea4521de9eb068a6ca110324ee00631aa68daa74fc0
+SIZE (rust/crates/pinyin-0.10.0.crate) = 346176
+SHA256 (rust/crates/pkg-config-0.3.26.crate) = 6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160
+SIZE (rust/crates/pkg-config-0.3.26.crate) = 18662
+SHA256 (rust/crates/plotters-0.3.4.crate) = 2538b639e642295546c50fcd545198c9d64ee2a38620a628724a3b266d5fbf97
+SIZE (rust/crates/plotters-0.3.4.crate) = 143219
+SHA256 (rust/crates/plotters-backend-0.3.4.crate) = 193228616381fecdc1224c62e96946dfbc73ff4384fba576e052ff8c1bea8142
+SIZE (rust/crates/plotters-backend-0.3.4.crate) = 13416
+SHA256 (rust/crates/plotters-svg-0.3.3.crate) = f9a81d2759aae1dae668f783c308bc5c8ebd191ff4184aaa1b37f65a6ae5a56f
+SIZE (rust/crates/plotters-svg-0.3.3.crate) = 6916
+SHA256 (rust/crates/portable-atomic-1.3.2.crate) = dc59d1bcc64fc5d021d67521f818db868368028108d37f0e98d74e33f68297b5
+SIZE (rust/crates/portable-atomic-1.3.2.crate) = 124372
+SHA256 (rust/crates/pprof-0.12.1.crate) = 978385d59daf9269189d052ca8a84c1acfd0715c0599a5d5188d4acc078ca46a
+SIZE (rust/crates/pprof-0.12.1.crate) = 45426
+SHA256 (rust/crates/ppv-lite86-0.2.17.crate) = 5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de
+SIZE (rust/crates/ppv-lite86-0.2.17.crate) = 22242
+SHA256 (rust/crates/prettyplease-0.1.22.crate) = 2c8992a85d8e93a28bdf76137db888d3874e3b230dee5ed8bebac4c9f7617773
+SIZE (rust/crates/prettyplease-0.1.22.crate) = 49563
+SHA256 (rust/crates/prettyplease-0.2.4.crate) = 1ceca8aaf45b5c46ec7ed39fff75f57290368c1846d33d24a122ca81416ab058
+SIZE (rust/crates/prettyplease-0.2.4.crate) = 53478
+SHA256 (rust/crates/proc-macro-error-1.0.4.crate) = da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c
+SIZE (rust/crates/proc-macro-error-1.0.4.crate) = 25293
+SHA256 (rust/crates/proc-macro-error-attr-1.0.4.crate) = a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869
+SIZE (rust/crates/proc-macro-error-attr-1.0.4.crate) = 7971
+SHA256 (rust/crates/proc-macro2-1.0.76.crate) = 95fc56cda0b5c3325f5fbbd7ff9fda9e02bb00bb3dac51252d2f1bfa1cb8cc8c
+SIZE (rust/crates/proc-macro2-1.0.76.crate) = 45660
+SHA256 (rust/crates/procfs-0.16.0.crate) = 731e0d9356b0c25f16f33b5be79b1c57b562f141ebfcdb0ad8ac2c13a24293b4
+SIZE (rust/crates/procfs-0.16.0.crate) = 60581
+SHA256 (rust/crates/procfs-core-0.16.0.crate) = 2d3554923a69f4ce04c4a754260c338f505ce22642d3830e049a399fc2059a29
+SIZE (rust/crates/procfs-core-0.16.0.crate) = 68279
+SHA256 (rust/crates/prometheus-0.13.3.crate) = 449811d15fbdf5ceb5c1144416066429cf82316e2ec8ce0c1f6f8a02e7bbcf8c
+SIZE (rust/crates/prometheus-0.13.3.crate) = 82457
+SHA256 (rust/crates/proptest-1.4.0.crate) = 31b476131c3c86cb68032fdc5cb6d5a1045e3e42d96b69fa599fd77701e1f5bf
+SIZE (rust/crates/proptest-1.4.0.crate) = 198527
+SHA256 (rust/crates/prost-0.11.9.crate) = 0b82eaa1d779e9a4bc1c3217db8ffbeabaae1dca241bf70183242128d48681cd
+SIZE (rust/crates/prost-0.11.9.crate) = 28958
+SHA256 (rust/crates/prost-0.12.3.crate) = 146c289cda302b98a28d40c8b3b90498d6e526dd24ac2ecea73e4e491685b94a
+SIZE (rust/crates/prost-0.12.3.crate) = 29461
+SHA256 (rust/crates/prost-build-0.11.9.crate) = 119533552c9a7ffacc21e099c24a0ac8bb19c2a2a3f363de84cd9b844feab270
+SIZE (rust/crates/prost-build-0.11.9.crate) = 37990
+SHA256 (rust/crates/prost-build-0.12.3.crate) = c55e02e35260070b6f716a2423c2ff1c3bb1642ddca6f99e1f26d06268a0e2d2
+SIZE (rust/crates/prost-build-0.12.3.crate) = 39018
+SHA256 (rust/crates/prost-derive-0.11.9.crate) = e5d2d8d10f3c6ded6da8b05b5fb3b8a5082514344d56c9f871412d29b4e075b4
+SIZE (rust/crates/prost-derive-0.11.9.crate) = 19513
+SHA256 (rust/crates/prost-derive-0.12.3.crate) = efb6c9a1dd1def8e2124d17e83a20af56f1570d6c2d2bd9e266ccb768df3840e
+SIZE (rust/crates/prost-derive-0.12.3.crate) = 19603
+SHA256 (rust/crates/prost-types-0.11.9.crate) = 213622a1460818959ac1181aaeb2dc9c7f63df720db7d788b3e24eacd1983e13
+SIZE (rust/crates/prost-types-0.11.9.crate) = 40809
+SHA256 (rust/crates/prost-types-0.12.3.crate) = 193898f59edcf43c26227dcd4c8427f00d99d61e95dcde58dabd49fa291d470e
+SIZE (rust/crates/prost-types-0.12.3.crate) = 42091
+SHA256 (rust/crates/prost-wkt-0.4.2.crate) = 562788060bcf2bfabe055194bd991ed2442457661744c88e0a0828ff9a08c08b
+SIZE (rust/crates/prost-wkt-0.4.2.crate) = 9355
+SHA256 (rust/crates/prost-wkt-build-0.4.2.crate) = c4dca8bcead3b728a6a7da017cc95e7f4cb2320ec4f6896bc593a1c4700f7328
+SIZE (rust/crates/prost-wkt-build-0.4.2.crate) = 4922
+SHA256 (rust/crates/prost-wkt-types-0.4.2.crate) = 2377c5680f2342871823045052e791b4487f7c90aae17e0feaee24cf59578a34
+SIZE (rust/crates/prost-wkt-types-0.4.2.crate) = 20302
+SHA256 (rust/crates/protobuf-2.28.0.crate) = 106dd99e98437432fed6519dedecfade6a06a73bb7b2a1e019fdd2bee5778d94
+SIZE (rust/crates/protobuf-2.28.0.crate) = 167541
+SHA256 (rust/crates/protobuf-build-0.14.0.crate) = 6fb3c02f54ecaf12572c1a60dbdb36b1f8f713a16105881143f2be84cca5bbe3
+SIZE (rust/crates/protobuf-build-0.14.0.crate) = 9745975
+SHA256 (rust/crates/pulldown-cmark-0.9.3.crate) = 77a1a2f1f0a7ecff9c31abbe177637be0e97a0aef46cf8738ece09327985d998
+SIZE (rust/crates/pulldown-cmark-0.9.3.crate) = 117339
+SHA256 (rust/crates/pulldown-cmark-to-cmark-10.0.4.crate) = 0194e6e1966c23cc5fd988714f85b18d548d773e81965413555d96569931833d
+SIZE (rust/crates/pulldown-cmark-to-cmark-10.0.4.crate) = 17917
+SHA256 (rust/crates/quick-error-1.2.3.crate) = a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0
+SIZE (rust/crates/quick-error-1.2.3.crate) = 15066
+SHA256 (rust/crates/quick-xml-0.26.0.crate) = 7f50b1c63b38611e7d4d7f68b82d3ad0cc71a2ad2e7f61fc10f1328d917c93cd
+SIZE (rust/crates/quick-xml-0.26.0.crate) = 116260
+SHA256 (rust/crates/quote-1.0.35.crate) = 291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef
+SIZE (rust/crates/quote-1.0.35.crate) = 28136
+SHA256 (rust/crates/radium-0.7.0.crate) = dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09
+SIZE (rust/crates/radium-0.7.0.crate) = 10906
+SHA256 (rust/crates/raft-0.7.0.crate) = f12688b23a649902762d4c11d854d73c49c9b93138f2de16403ef9f571ad5bae
+SIZE (rust/crates/raft-0.7.0.crate) = 183907
+SHA256 (rust/crates/raft-proto-0.7.0.crate) = fb6884896294f553e8d5cfbdb55080b9f5f2f43394afff59c9f077e0f4b46d6b
+SIZE (rust/crates/raft-proto-0.7.0.crate) = 6509
+SHA256 (rust/crates/rand-0.7.3.crate) = 6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03
+SIZE (rust/crates/rand-0.7.3.crate) = 112246
+SHA256 (rust/crates/rand-0.8.5.crate) = 34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404
+SIZE (rust/crates/rand-0.8.5.crate) = 87113
+SHA256 (rust/crates/rand_chacha-0.2.2.crate) = f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402
+SIZE (rust/crates/rand_chacha-0.2.2.crate) = 13267
+SHA256 (rust/crates/rand_chacha-0.3.1.crate) = e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88
+SIZE (rust/crates/rand_chacha-0.3.1.crate) = 15251
+SHA256 (rust/crates/rand_core-0.5.1.crate) = 90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19
+SIZE (rust/crates/rand_core-0.5.1.crate) = 21116
+SHA256 (rust/crates/rand_core-0.6.4.crate) = ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c
+SIZE (rust/crates/rand_core-0.6.4.crate) = 22666
+SHA256 (rust/crates/rand_distr-0.4.3.crate) = 32cb0b9bc82b0a0876c2dd994a7e7a2683d3e7390ca40e6886785ef0c7e3ee31
+SIZE (rust/crates/rand_distr-0.4.3.crate) = 58255
+SHA256 (rust/crates/rand_hc-0.2.0.crate) = ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c
+SIZE (rust/crates/rand_hc-0.2.0.crate) = 11670
+SHA256 (rust/crates/rand_xorshift-0.3.0.crate) = d25bf25ec5ae4a3f1b92f929810509a2f53d7dca2f50b794ff57e3face536c8f
+SIZE (rust/crates/rand_xorshift-0.3.0.crate) = 9121
+SHA256 (rust/crates/rayon-1.9.0.crate) = e4963ed1bc86e4f3ee217022bd855b297cef07fb9eac5dfa1f788b220b49b3bd
+SIZE (rust/crates/rayon-1.9.0.crate) = 177770
+SHA256 (rust/crates/rayon-core-1.12.1.crate) = 1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2
+SIZE (rust/crates/rayon-core-1.12.1.crate) = 70701
+SHA256 (rust/crates/redox_syscall-0.2.16.crate) = fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a
+SIZE (rust/crates/redox_syscall-0.2.16.crate) = 24012
+SHA256 (rust/crates/redox_syscall-0.4.1.crate) = 4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa
+SIZE (rust/crates/redox_syscall-0.4.1.crate) = 24858
+SHA256 (rust/crates/regex-1.8.4.crate) = d0ab3ca65655bb1e41f2a8c8cd662eb4fb035e67c3f78da1d61dffe89d07300f
+SIZE (rust/crates/regex-1.8.4.crate) = 249562
+SHA256 (rust/crates/regex-automata-0.1.10.crate) = 6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132
+SIZE (rust/crates/regex-automata-0.1.10.crate) = 114533
+SHA256 (rust/crates/regex-syntax-0.6.28.crate) = 456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848
+SIZE (rust/crates/regex-syntax-0.6.28.crate) = 299288
+SHA256 (rust/crates/regex-syntax-0.7.2.crate) = 436b050e76ed2903236f032a59761c1eb99e1b0aead2c257922771dab1fc8c78
+SIZE (rust/crates/regex-syntax-0.7.2.crate) = 339778
+SHA256 (rust/crates/regex-syntax-0.8.2.crate) = c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f
+SIZE (rust/crates/regex-syntax-0.8.2.crate) = 347228
+SHA256 (rust/crates/relative-path-1.8.0.crate) = 4bf2521270932c3c7bed1a59151222bd7643c79310f2916f01925e1e16255698
+SIZE (rust/crates/relative-path-1.8.0.crate) = 24865
+SHA256 (rust/crates/reqwest-0.11.23.crate) = 37b1ae8d9ac08420c66222fb9096fc5de435c3c48542bc5336c51892cffafb41
+SIZE (rust/crates/reqwest-0.11.23.crate) = 158448
+SHA256 (rust/crates/rgb-0.8.34.crate) = 3603b7d71ca82644f79b5a06d1220e9a58ede60bd32255f698cb1af8838b8db3
+SIZE (rust/crates/rgb-0.8.34.crate) = 16285
+SHA256 (rust/crates/ring-0.16.20.crate) = 3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc
+SIZE (rust/crates/ring-0.16.20.crate) = 5082615
+SHA256 (rust/crates/ring-0.17.5.crate) = fb0205304757e5d899b9c2e448b867ffd03ae7f988002e47cd24954391394d0b
+SIZE (rust/crates/ring-0.17.5.crate) = 4147790
+SHA256 (rust/crates/ringbuffer-0.15.0.crate) = 3df6368f71f205ff9c33c076d170dd56ebf68e8161c733c0caa07a7a5509ed53
+SIZE (rust/crates/ringbuffer-0.15.0.crate) = 20234
+SHA256 (rust/crates/rmp-0.8.11.crate) = 44519172358fd6d58656c86ab8e7fbc9e1490c3e8f14d35ed78ca0dd07403c9f
+SIZE (rust/crates/rmp-0.8.11.crate) = 28829
+SHA256 (rust/crates/rmp-serde-1.1.2.crate) = bffea85eea980d8a74453e5d02a8d93028f3c34725de143085a844ebe953258a
+SIZE (rust/crates/rmp-serde-1.1.2.crate) = 30388
+SHA256 (rust/crates/robust-1.1.0.crate) = cbf4a6aa5f6d6888f39e980649f3ad6b666acdce1d78e95b8a2cb076e687ae30
+SIZE (rust/crates/robust-1.1.0.crate) = 476312
+SHA256 (rust/crates/rocksdb-0.22.0.crate) = 6bd13e55d6d7b8cd0ea569161127567cd587676c99f4472f779a0279aa60a7a7
+SIZE (rust/crates/rocksdb-0.22.0.crate) = 143095
+SHA256 (rust/crates/ron-0.8.1.crate) = b91f7eff05f748767f183df4320a63d6936e9c6107d97c9e6bdd9784f4289c94
+SIZE (rust/crates/ron-0.8.1.crate) = 63251
+SHA256 (rust/crates/rstack-0.3.3.crate) = e7df9d3ebd4f17b52e6134efe2fa20021c80688cbe823d481a729a993b730493
+SIZE (rust/crates/rstack-0.3.3.crate) = 7575
+SHA256 (rust/crates/rstack-self-0.3.0.crate) = 6dd5030da3aba0ec731502f74ec38e63798eea6bc8b8ba5972129afe3eababd2
+SIZE (rust/crates/rstack-self-0.3.0.crate) = 7870
+SHA256 (rust/crates/rstar-0.12.0.crate) = 133315eb94c7b1e8d0cb097e5a710d850263372fd028fff18969de708afc7008
+SIZE (rust/crates/rstar-0.12.0.crate) = 42105
+SHA256 (rust/crates/rstest-0.18.2.crate) = 97eeab2f3c0a199bc4be135c36c924b6590b88c377d416494288c14f2db30199
+SIZE (rust/crates/rstest-0.18.2.crate) = 28868
+SHA256 (rust/crates/rstest_macros-0.18.2.crate) = d428f8247852f894ee1be110b375111b586d4fa431f6c46e64ba5a0dcccbe605
+SIZE (rust/crates/rstest_macros-0.18.2.crate) = 57534
+SHA256 (rust/crates/rust-ini-0.19.0.crate) = 7e2a3bcec1f113553ef1c88aae6c020a369d03d55b58de9869a0908930385091
+SIZE (rust/crates/rust-ini-0.19.0.crate) = 18328
+SHA256 (rust/crates/rustc-demangle-0.1.21.crate) = 7ef03e0a2b150c7a90d01faf6254c9c48a41e95fb2a8c2ac1c6f0d2b9aefc342
+SIZE (rust/crates/rustc-demangle-0.1.21.crate) = 27920
+SHA256 (rust/crates/rustc-hash-1.1.0.crate) = 08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2
+SIZE (rust/crates/rustc-hash-1.1.0.crate) = 9331
+SHA256 (rust/crates/rustc_version-0.4.0.crate) = bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366
+SIZE (rust/crates/rustc_version-0.4.0.crate) = 12175
+SHA256 (rust/crates/rustix-0.37.27.crate) = fea8ca367a3a01fe35e6943c400addf443c0f57670e6ec51196f71a4b8762dd2
+SIZE (rust/crates/rustix-0.37.27.crate) = 324534
+SHA256 (rust/crates/rustix-0.38.31.crate) = 6ea3e1a662af26cd7a3ba09c0297a31af215563ecf42817c98df621387f4e949
+SIZE (rust/crates/rustix-0.38.31.crate) = 375443
+SHA256 (rust/crates/rustls-0.21.10.crate) = f9d5a6813c0759e4609cd494e8e725babae6a2ca7b62a5536a13daaec6fcb7ba
+SIZE (rust/crates/rustls-0.21.10.crate) = 284920
+SHA256 (rust/crates/rustls-0.22.2.crate) = e87c9956bd9807afa1f77e0f7594af32566e830e088a5576d27c5b6f30f49d41
+SIZE (rust/crates/rustls-0.22.2.crate) = 332080
+SHA256 (rust/crates/rustls-pemfile-1.0.3.crate) = 2d3987094b1d07b653b7dfdc3f70ce9a1da9c51ac18c1b06b662e4f9a0e9f4b2
+SIZE (rust/crates/rustls-pemfile-1.0.3.crate) = 20432
+SHA256 (rust/crates/rustls-pemfile-2.1.1.crate) = f48172685e6ff52a556baa527774f61fcaa884f59daf3375c62a3f1cd2549dab
+SIZE (rust/crates/rustls-pemfile-2.1.1.crate) = 26161
+SHA256 (rust/crates/rustls-pki-types-1.3.1.crate) = 5ede67b28608b4c60685c7d54122d4400d90f62b40caee7700e700380a390fa8
+SIZE (rust/crates/rustls-pki-types-1.3.1.crate) = 21637
+SHA256 (rust/crates/rustls-webpki-0.100.2.crate) = e98ff011474fa39949b7e5c0428f9b4937eda7da7848bbb947786b7be0b27dab
+SIZE (rust/crates/rustls-webpki-0.100.2.crate) = 71561
+SHA256 (rust/crates/rustls-webpki-0.101.7.crate) = 8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765
+SIZE (rust/crates/rustls-webpki-0.101.7.crate) = 168808
+SHA256 (rust/crates/rustls-webpki-0.102.2.crate) = faaa0a62740bedb9b2ef5afa303da42764c012f743917351dc9a237ea1663610
+SIZE (rust/crates/rustls-webpki-0.102.2.crate) = 196881
+SHA256 (rust/crates/rustversion-1.0.11.crate) = 5583e89e108996506031660fe09baa5011b9dd0341b89029313006d1fb508d70
+SIZE (rust/crates/rustversion-1.0.11.crate) = 17485
+SHA256 (rust/crates/rusty-fork-0.3.0.crate) = cb3dcc6e454c328bb824492db107ab7c0ae8fcffe4ad210136ef014458c1bc4f
+SIZE (rust/crates/rusty-fork-0.3.0.crate) = 19881
+SHA256 (rust/crates/rusty-forkfork-0.4.0.crate) = 7ce85af4dfa2fb0c0143121ab5e424c71ea693867357c9159b8777b59984c218
+SIZE (rust/crates/rusty-forkfork-0.4.0.crate) = 21388
+SHA256 (rust/crates/rusty-hook-0.11.2.crate) = 96cee9be61be7e1cbadd851e58ed7449c29c620f00b23df937cb9cbc04ac21a3
+SIZE (rust/crates/rusty-hook-0.11.2.crate) = 12637
+SHA256 (rust/crates/ryu-1.0.12.crate) = 7b4b9743ed687d4b4bcedf9ff5eaa7398495ae14e61cba0a295704edbc7decde
+SIZE (rust/crates/ryu-1.0.12.crate) = 47070
+SHA256 (rust/crates/same-file-1.0.6.crate) = 93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502
+SIZE (rust/crates/same-file-1.0.6.crate) = 10183
+SHA256 (rust/crates/schemars-0.8.16.crate) = 45a28f4c49489add4ce10783f7911893516f15afe45d015608d41faca6bc4d29
+SIZE (rust/crates/schemars-0.8.16.crate) = 57072
+SHA256 (rust/crates/schemars_derive-0.8.16.crate) = c767fd6fa65d9ccf9cf026122c1b555f2ef9a4f0cea69da4d7dbc3e258d30967
+SIZE (rust/crates/schemars_derive-0.8.16.crate) = 19064
+SHA256 (rust/crates/scoped-tls-1.0.1.crate) = e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294
+SIZE (rust/crates/scoped-tls-1.0.1.crate) = 8202
+SHA256 (rust/crates/scopeguard-1.1.0.crate) = d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd
+SIZE (rust/crates/scopeguard-1.1.0.crate) = 11470
+SHA256 (rust/crates/scratch-1.0.3.crate) = ddccb15bcce173023b3fedd9436f882a0739b8dfb45e4f6b6002bee5929f61b2
+SIZE (rust/crates/scratch-1.0.3.crate) = 8198
+SHA256 (rust/crates/sct-0.7.0.crate) = d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4
+SIZE (rust/crates/sct-0.7.0.crate) = 27502
+SHA256 (rust/crates/seahash-4.1.0.crate) = 1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b
+SIZE (rust/crates/seahash-4.1.0.crate) = 31976
+SHA256 (rust/crates/sealed_test-1.0.0.crate) = 1a608d94641cc17fe203b102db2ae86d47a236630192f0244ddbbbb0044c0272
+SIZE (rust/crates/sealed_test-1.0.0.crate) = 4544
+SHA256 (rust/crates/sealed_test_derive-1.0.0.crate) = 7b672e005ae58fef5da619d90b9f1c5b44b061890f4a371b3c96257a8a15e697
+SIZE (rust/crates/sealed_test_derive-1.0.0.crate) = 2735
+SHA256 (rust/crates/semver-1.0.22.crate) = 92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca
+SIZE (rust/crates/semver-1.0.22.crate) = 30446
+SHA256 (rust/crates/serde-1.0.197.crate) = 3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2
+SIZE (rust/crates/serde-1.0.197.crate) = 77087
+SHA256 (rust/crates/serde-value-0.7.0.crate) = f3a1a3341211875ef120e117ea7fd5228530ae7e7036a779fdc9117be6b3282c
+SIZE (rust/crates/serde-value-0.7.0.crate) = 10249
+SHA256 (rust/crates/serde_cbor-0.11.2.crate) = 2bef2ebfde456fb76bbcf9f59315333decc4fda0b2b44b420243c11e0f5ec1f5
+SIZE (rust/crates/serde_cbor-0.11.2.crate) = 44570
+SHA256 (rust/crates/serde_derive-1.0.197.crate) = 7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b
+SIZE (rust/crates/serde_derive-1.0.197.crate) = 55771
+SHA256 (rust/crates/serde_derive_internals-0.26.0.crate) = 85bf8229e7920a9f636479437026331ce11aa132b4dde37d121944a44d6e5f3c
+SIZE (rust/crates/serde_derive_internals-0.26.0.crate) = 25382
+SHA256 (rust/crates/serde_json-1.0.114.crate) = c5f09b1bd632ef549eaa9f60a1f8de742bdbc698e6cee2095fc84dde5f549ae0
+SIZE (rust/crates/serde_json-1.0.114.crate) = 146986
+SHA256 (rust/crates/serde_plain-1.0.1.crate) = d6018081315db179d0ce57b1fe4b62a12a0028c9cf9bbef868c9cf477b3c34ae
+SIZE (rust/crates/serde_plain-1.0.1.crate) = 11135
+SHA256 (rust/crates/serde_qs-0.10.1.crate) = 8cac3f1e2ca2fe333923a1ae72caca910b98ed0630bb35ef6f8c8517d6e81afa
+SIZE (rust/crates/serde_qs-0.10.1.crate) = 51109
+SHA256 (rust/crates/serde_spanned-0.6.5.crate) = eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1
+SIZE (rust/crates/serde_spanned-0.6.5.crate) = 8349
+SHA256 (rust/crates/serde_urlencoded-0.7.1.crate) = d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd
+SIZE (rust/crates/serde_urlencoded-0.7.1.crate) = 12822
+SHA256 (rust/crates/serial_test-3.0.0.crate) = 953ad9342b3aaca7cb43c45c097dd008d4907070394bd0751a0aa8817e5a018d
+SIZE (rust/crates/serial_test-3.0.0.crate) = 8483
+SHA256 (rust/crates/serial_test_derive-3.0.0.crate) = b93fb4adc70021ac1b47f7d45e8cc4169baaa7ea58483bc5b721d19a26202212
+SIZE (rust/crates/serial_test_derive-3.0.0.crate) = 6588
+SHA256 (rust/crates/sha1-0.10.5.crate) = f04293dc80c3993519f2d7f6f511707ee7094fe0c6d3406feb330cdb3540eba3
+SIZE (rust/crates/sha1-0.10.5.crate) = 12146
+SHA256 (rust/crates/sha2-0.10.8.crate) = 793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8
+SIZE (rust/crates/sha2-0.10.8.crate) = 26357
+SHA256 (rust/crates/sharded-slab-0.1.4.crate) = 900fba806f70c630b0a382d0d825e17a0f19fcd059a2ade1ff237bcddf446b31
+SIZE (rust/crates/sharded-slab-0.1.4.crate) = 52479
+SHA256 (rust/crates/shlex-1.3.0.crate) = 0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64
+SIZE (rust/crates/shlex-1.3.0.crate) = 18713
+SHA256 (rust/crates/signal-hook-registry-1.4.0.crate) = e51e73328dc4ac0c7ccbda3a494dfa03df1de2f46018127f60c693f2648455b0
+SIZE (rust/crates/signal-hook-registry-1.4.0.crate) = 17912
+SHA256 (rust/crates/simple_asn1-0.6.2.crate) = adc4e5204eb1910f40f9cfa375f6f05b68c3abac4b6fd879c8ff5e7ae8a0a085
+SIZE (rust/crates/simple_asn1-0.6.2.crate) = 15992
+SHA256 (rust/crates/siphasher-0.3.10.crate) = 7bd3e3206899af3f8b12af284fafc038cc1dc2b41d1b89dd17297221c5d225de
+SIZE (rust/crates/siphasher-0.3.10.crate) = 9889
+SHA256 (rust/crates/slab-0.4.7.crate) = 4614a76b2a8be0058caa9dbbaf66d988527d86d003c11a94fbd335d7661edcef
+SIZE (rust/crates/slab-0.4.7.crate) = 16647
+SHA256 (rust/crates/slice-group-by-0.3.1.crate) = 826167069c09b99d56f31e9ae5c99049e932a98c9dc2dac47645b08dbbf76ba7
+SIZE (rust/crates/slice-group-by-0.3.1.crate) = 14640
+SHA256 (rust/crates/slog-2.7.0.crate) = 8347046d4ebd943127157b94d63abb990fcf729dc4e9978927fdf4ac3c998d06
+SIZE (rust/crates/slog-2.7.0.crate) = 45432
+SHA256 (rust/crates/slog-scope-4.4.0.crate) = 2f95a4b4c3274cd2869549da82b57ccc930859bdbf5bcea0424bc5f140b3c786
+SIZE (rust/crates/slog-scope-4.4.0.crate) = 16753
+SHA256 (rust/crates/slog-stdlog-4.1.1.crate) = 6706b2ace5bbae7291d3f8d2473e2bfab073ccd7d03670946197aec98471fa3e
+SIZE (rust/crates/slog-stdlog-4.1.1.crate) = 16731
+SHA256 (rust/crates/smallvec-1.13.1.crate) = e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7
+SIZE (rust/crates/smallvec-1.13.1.crate) = 34952
+SHA256 (rust/crates/smol_str-0.2.1.crate) = e6845563ada680337a52d43bb0b29f396f2d911616f6573012645b9e3d048a49
+SIZE (rust/crates/smol_str-0.2.1.crate) = 14689
+SHA256 (rust/crates/socket2-0.4.9.crate) = 64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662
+SIZE (rust/crates/socket2-0.4.9.crate) = 45421
+SHA256 (rust/crates/socket2-0.5.5.crate) = 7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9
+SIZE (rust/crates/socket2-0.5.5.crate) = 54863
+SHA256 (rust/crates/spade-2.4.1.crate) = 87a3ef2efbc408c9051c1a27ce7edff430d74531d31a480b7ca4f618072c2670
+SIZE (rust/crates/spade-2.4.1.crate) = 190102
+SHA256 (rust/crates/sparse-0.1.0.crate) = dd34fde69e050ea6d4f9d60b8971574d69a765610e06c028ebaf2e7459d3c67b
+SIZE (rust/crates/sparse-0.1.0.crate) = 3277
+SHA256 (rust/crates/spin-0.5.2.crate) = 6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d
+SIZE (rust/crates/spin-0.5.2.crate) = 12004
+SHA256 (rust/crates/spin-0.9.8.crate) = 6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67
+SIZE (rust/crates/spin-0.9.8.crate) = 38958
+SHA256 (rust/crates/stable_deref_trait-1.2.0.crate) = a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3
+SIZE (rust/crates/stable_deref_trait-1.2.0.crate) = 8054
+SHA256 (rust/crates/static_assertions-1.1.0.crate) = a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f
+SIZE (rust/crates/static_assertions-1.1.0.crate) = 18480
+SHA256 (rust/crates/storage-0.2.0.crate) = c7ab896a6bc6e597b3967a7e5d58e5dd98b20b2753c3d0ae9e0ec75fb3c18531
+SIZE (rust/crates/storage-0.2.0.crate) = 4416
+SHA256 (rust/crates/str_stack-0.1.0.crate) = 9091b6114800a5f2141aee1d1b9d6ca3592ac062dc5decb3764ec5895a47b4eb
+SIZE (rust/crates/str_stack-0.1.0.crate) = 7977
+SHA256 (rust/crates/strsim-0.10.0.crate) = 73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623
+SIZE (rust/crates/strsim-0.10.0.crate) = 11355
+SHA256 (rust/crates/strsim-0.11.0.crate) = 5ee073c9e4cd00e28217186dbe12796d692868f432bf2e97ee73bed0c56dfa01
+SIZE (rust/crates/strsim-0.11.0.crate) = 13710
+SHA256 (rust/crates/subtle-2.5.0.crate) = 81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc
+SIZE (rust/crates/subtle-2.5.0.crate) = 13909
+SHA256 (rust/crates/symbolic-common-12.2.0.crate) = 38f7afd8bcd36190409e6b71d89928f7f09d918a7aa3460d847bc49a538d672e
+SIZE (rust/crates/symbolic-common-12.2.0.crate) = 22768
+SHA256 (rust/crates/symbolic-demangle-12.2.0.crate) = ec64922563a36e3fe686b6d99f06f25dacad2a202ac7502ed642930a188fb20a
+SIZE (rust/crates/symbolic-demangle-12.2.0.crate) = 205508
+SHA256 (rust/crates/syn-1.0.107.crate) = 1f4064b5b16e03ae50984a5a8ed5d4f8803e6bc1fd170a3cda91a1be4b18e3f5
+SIZE (rust/crates/syn-1.0.107.crate) = 237539
+SHA256 (rust/crates/syn-2.0.48.crate) = 0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f
+SIZE (rust/crates/syn-2.0.48.crate) = 250566
+SHA256 (rust/crates/sync_wrapper-0.1.1.crate) = 20518fe4a4c9acf048008599e464deb21beeae3d3578418951a189c235a7a9a8
+SIZE (rust/crates/sync_wrapper-0.1.1.crate) = 6556
+SHA256 (rust/crates/sys-info-0.9.1.crate) = 0b3a0d0aba8bf96a0e1ddfdc352fc53b3df7f39318c71854910c3c4b024ae52c
+SIZE (rust/crates/sys-info-0.9.1.crate) = 20589
+SHA256 (rust/crates/sysinfo-0.30.7.crate) = 0c385888ef380a852a16209afc8cfad22795dd8873d69c9a14d2e2088f118d18
+SIZE (rust/crates/sysinfo-0.30.7.crate) = 171551
+SHA256 (rust/crates/system-configuration-0.5.1.crate) = ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7
+SIZE (rust/crates/system-configuration-0.5.1.crate) = 12618
+SHA256 (rust/crates/system-configuration-sys-0.5.0.crate) = a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9
+SIZE (rust/crates/system-configuration-sys-0.5.0.crate) = 6730
+SHA256 (rust/crates/tap-1.0.1.crate) = 55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369
+SIZE (rust/crates/tap-1.0.1.crate) = 11316
+SHA256 (rust/crates/tar-0.4.40.crate) = b16afcea1f22891c49a00c751c7b63b2233284064f11a200fc624137c51e2ddb
+SIZE (rust/crates/tar-0.4.40.crate) = 51844
+SHA256 (rust/crates/tempfile-3.10.1.crate) = 85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1
+SIZE (rust/crates/tempfile-3.10.1.crate) = 33653
+SHA256 (rust/crates/termcolor-1.1.3.crate) = bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755
+SIZE (rust/crates/termcolor-1.1.3.crate) = 17242
+SHA256 (rust/crates/terminal_size-0.1.17.crate) = 633c1a546cee861a1a6d0dc69ebeca693bf4296661ba7852b9d21d159e0506df
+SIZE (rust/crates/terminal_size-0.1.17.crate) = 9141
+SHA256 (rust/crates/thiserror-1.0.57.crate) = 1e45bcbe8ed29775f228095caf2cd67af7a4ccf756ebff23a306bf3e8b47b24b
+SIZE (rust/crates/thiserror-1.0.57.crate) = 20993
+SHA256 (rust/crates/thiserror-impl-1.0.57.crate) = a953cb265bef375dae3de6663da4d3804eee9682ea80d8e2542529b73c531c81
+SIZE (rust/crates/thiserror-impl-1.0.57.crate) = 15639
+SHA256 (rust/crates/thread-id-4.0.0.crate) = 5fdfe0627923f7411a43ec9ec9c39c3a9b4151be313e0922042581fb6c9b717f
+SIZE (rust/crates/thread-id-4.0.0.crate) = 8045
+SHA256 (rust/crates/thread-priority-0.16.0.crate) = a617e9eeeb20448b01a8e2427fb80dfbc9c49d79a1de3b11f25731edbf547e3c
+SIZE (rust/crates/thread-priority-0.16.0.crate) = 20046
+SHA256 (rust/crates/thread_local-1.1.7.crate) = 3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152
+SIZE (rust/crates/thread_local-1.1.7.crate) = 13585
+SHA256 (rust/crates/tikv-jemalloc-sys-0.5.2+5.3.0-patched.crate) = ec45c14da997d0925c7835883e4d5c181f196fa142f8c19d7643d1e9af2592c3
+SIZE (rust/crates/tikv-jemalloc-sys-0.5.2+5.3.0-patched.crate) = 880664
+SHA256 (rust/crates/tikv-jemallocator-0.5.4.crate) = 965fe0c26be5c56c94e38ba547249074803efd52adfb66de62107d95aab3eaca
+SIZE (rust/crates/tikv-jemallocator-0.5.4.crate) = 13101
+SHA256 (rust/crates/time-0.3.17.crate) = a561bf4617eebd33bca6434b988f39ed798e527f51a1e797d0ee4f61c0a38376
+SIZE (rust/crates/time-0.3.17.crate) = 99048
+SHA256 (rust/crates/time-core-0.1.0.crate) = 2e153e1f1acaef8acc537e68b44906d2db6436e2b35ac2c6b42640fff91f00fd
+SIZE (rust/crates/time-core-0.1.0.crate) = 6597
+SHA256 (rust/crates/time-macros-0.2.6.crate) = d967f99f534ca7e495c575c62638eebc2898a8c84c119b89e250477bc4ba16b2
+SIZE (rust/crates/time-macros-0.2.6.crate) = 19163
+SHA256 (rust/crates/tiny-keccak-2.0.2.crate) = 2c9d3793400a45f954c52e73d068316d76b6f4e36977e3fcebb13a2721e80237
+SIZE (rust/crates/tiny-keccak-2.0.2.crate) = 20129
+SHA256 (rust/crates/tinytemplate-1.2.1.crate) = be4d6b5f19ff7664e8c98d03e2139cb510db9b0a60b55f8e8709b689d939b6bc
+SIZE (rust/crates/tinytemplate-1.2.1.crate) = 26490
+SHA256 (rust/crates/tinyvec-1.6.0.crate) = 87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50
+SIZE (rust/crates/tinyvec-1.6.0.crate) = 45991
+SHA256 (rust/crates/tinyvec_macros-0.1.0.crate) = cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c
+SIZE (rust/crates/tinyvec_macros-0.1.0.crate) = 1817
+SHA256 (rust/crates/tokio-1.36.0.crate) = 61285f6515fa018fb2d1e46eb21223fff441ee8db5d0f1435e8ab4f5cdb80931
+SIZE (rust/crates/tokio-1.36.0.crate) = 757286
+SHA256 (rust/crates/tokio-io-timeout-1.2.0.crate) = 30b74022ada614a1b4834de765f9bb43877f910cc8ce4be40e89042c9223a8bf
+SIZE (rust/crates/tokio-io-timeout-1.2.0.crate) = 8993
+SHA256 (rust/crates/tokio-macros-2.2.0.crate) = 5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b
+SIZE (rust/crates/tokio-macros-2.2.0.crate) = 11520
+SHA256 (rust/crates/tokio-rustls-0.24.1.crate) = c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081
+SIZE (rust/crates/tokio-rustls-0.24.1.crate) = 33049
+SHA256 (rust/crates/tokio-rustls-0.25.0.crate) = 775e0c0f0adb3a2f22a00c4745d728b479985fc15ee7ca6a2608388c5569860f
+SIZE (rust/crates/tokio-rustls-0.25.0.crate) = 30541
+SHA256 (rust/crates/tokio-stream-0.1.11.crate) = d660770404473ccd7bc9f8b28494a811bc18542b915c0855c51e8f419d5223ce
+SIZE (rust/crates/tokio-stream-0.1.11.crate) = 33918
+SHA256 (rust/crates/tokio-util-0.7.10.crate) = 5419f34732d9eb6ee4c3578b7989078579b7f039cbbb9ca2c4da015749371e15
+SIZE (rust/crates/tokio-util-0.7.10.crate) = 110508
+SHA256 (rust/crates/toml-0.5.10.crate) = 1333c76748e868a4d9d1017b5ab53171dfd095f70c712fdb4653a406547f598f
+SIZE (rust/crates/toml-0.5.10.crate) = 55193
+SHA256 (rust/crates/toml-0.8.9.crate) = c6a4b9e8023eb94392d3dca65d717c53abc5dad49c07cb65bb8fcd87115fa325
+SIZE (rust/crates/toml-0.8.9.crate) = 50659
+SHA256 (rust/crates/toml_datetime-0.6.5.crate) = 3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1
+SIZE (rust/crates/toml_datetime-0.6.5.crate) = 10910
+SHA256 (rust/crates/toml_edit-0.21.1.crate) = 6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1
+SIZE (rust/crates/toml_edit-0.21.1.crate) = 101661
+SHA256 (rust/crates/tonic-0.9.2.crate) = 3082666a3a6433f7f511c7192923fa1fe07c69332d3c6a2e6bb040b569199d5a
+SIZE (rust/crates/tonic-0.9.2.crate) = 92598
+SHA256 (rust/crates/tonic-build-0.10.2.crate) = 9d021fc044c18582b9a2408cd0dd05b1596e3ecdb5c4df822bb0183545683889
+SIZE (rust/crates/tonic-build-0.10.2.crate) = 17908
+SHA256 (rust/crates/tonic-reflection-0.9.2.crate) = 0543d7092032041fbeac1f2c84304537553421a11a623c2301b12ef0264862c7
+SIZE (rust/crates/tonic-reflection-0.9.2.crate) = 13178
+SHA256 (rust/crates/tower-0.4.13.crate) = b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c
+SIZE (rust/crates/tower-0.4.13.crate) = 106906
+SHA256 (rust/crates/tower-layer-0.3.2.crate) = c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0
+SIZE (rust/crates/tower-layer-0.3.2.crate) = 6023
+SHA256 (rust/crates/tower-service-0.3.2.crate) = b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52
+SIZE (rust/crates/tower-service-0.3.2.crate) = 6847
+SHA256 (rust/crates/tracing-0.1.40.crate) = c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef
+SIZE (rust/crates/tracing-0.1.40.crate) = 79459
+SHA256 (rust/crates/tracing-attributes-0.1.27.crate) = 34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7
+SIZE (rust/crates/tracing-attributes-0.1.27.crate) = 32241
+SHA256 (rust/crates/tracing-core-0.1.32.crate) = c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54
+SIZE (rust/crates/tracing-core-0.1.32.crate) = 61221
+SHA256 (rust/crates/tracing-log-0.2.0.crate) = ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3
+SIZE (rust/crates/tracing-log-0.2.0.crate) = 17561
+SHA256 (rust/crates/tracing-subscriber-0.3.18.crate) = ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b
+SIZE (rust/crates/tracing-subscriber-0.3.18.crate) = 196312
+SHA256 (rust/crates/tracing-tracy-0.11.0.crate) = 6024d04f84a69fd0d1dc1eee3a2b070bd246530a0582f9982ae487cb6c703614
+SIZE (rust/crates/tracing-tracy-0.11.0.crate) = 14401
+SHA256 (rust/crates/tracy-client-0.17.0.crate) = 59fb931a64ff88984f86d3e9bcd1ae8843aa7fe44dd0f8097527bc172351741d
+SIZE (rust/crates/tracy-client-0.17.0.crate) = 20654
+SHA256 (rust/crates/tracy-client-sys-0.21.2.crate) = 2cb915ea3af048554640d76dd6f1492589a6401a41a30d789b983c1ec280455a
+SIZE (rust/crates/tracy-client-sys-0.21.2.crate) = 303387
+SHA256 (rust/crates/try-lock-0.2.3.crate) = 59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642
+SIZE (rust/crates/try-lock-0.2.3.crate) = 4158
+SHA256 (rust/crates/typenum-1.16.0.crate) = 497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba
+SIZE (rust/crates/typenum-1.16.0.crate) = 42477
+SHA256 (rust/crates/typetag-0.2.15.crate) = c43148481c7b66502c48f35b8eef38b6ccdc7a9f04bd4cc294226d901ccc9bc7
+SIZE (rust/crates/typetag-0.2.15.crate) = 27792
+SHA256 (rust/crates/typetag-impl-0.2.15.crate) = 291db8a81af4840c10d636e047cac67664e343be44e24dfdbd1492df9a5d3390
+SIZE (rust/crates/typetag-impl-0.2.15.crate) = 9108
+SHA256 (rust/crates/ucd-trie-0.1.5.crate) = 9e79c4d996edb816c91e4308506774452e55e95c3c9de07b6729e17e15a5ef81
+SIZE (rust/crates/ucd-trie-0.1.5.crate) = 45391
+SHA256 (rust/crates/unarray-0.1.4.crate) = eaea85b334db583fe3274d12b4cd1880032beab409c0d774be044d4480ab9a94
+SIZE (rust/crates/unarray-0.1.4.crate) = 12895
+SHA256 (rust/crates/unicase-2.6.0.crate) = 50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6
+SIZE (rust/crates/unicase-2.6.0.crate) = 23478
+SHA256 (rust/crates/unicode-bidi-0.3.13.crate) = 92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460
+SIZE (rust/crates/unicode-bidi-0.3.13.crate) = 44477
+SHA256 (rust/crates/unicode-ident-1.0.6.crate) = 84a22b9f218b40614adcb3f4ff08b703773ad44fa9423e4e0d346d5db86e4ebc
+SIZE (rust/crates/unicode-ident-1.0.6.crate) = 42158
+SHA256 (rust/crates/unicode-normalization-0.1.22.crate) = 5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921
+SIZE (rust/crates/unicode-normalization-0.1.22.crate) = 122604
+SHA256 (rust/crates/unicode-segmentation-1.10.1.crate) = 1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36
+SIZE (rust/crates/unicode-segmentation-1.10.1.crate) = 98416
+SHA256 (rust/crates/unicode-width-0.1.10.crate) = c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b
+SIZE (rust/crates/unicode-width-0.1.10.crate) = 18968
+SHA256 (rust/crates/untrusted-0.7.1.crate) = a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a
+SIZE (rust/crates/untrusted-0.7.1.crate) = 7924
+SHA256 (rust/crates/untrusted-0.9.0.crate) = 8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1
+SIZE (rust/crates/untrusted-0.9.0.crate) = 14447
+SHA256 (rust/crates/unwind-0.4.1.crate) = f0e0da3c8d6b71dbaf219188cc0e7f9ca3943f3263ca479920338d92d7ea5e07
+SIZE (rust/crates/unwind-0.4.1.crate) = 5948
+SHA256 (rust/crates/unwind-sys-0.1.3.crate) = d554005b247de226d124a523cae6cd6a4348277071258296dda837cf760e02e7
+SIZE (rust/crates/unwind-sys-0.1.3.crate) = 5794
+SHA256 (rust/crates/ureq-2.7.1.crate) = 0b11c96ac7ee530603dcdf68ed1557050f374ce55a5a07193ebf8cbc9f8927e9
+SIZE (rust/crates/ureq-2.7.1.crate) = 111068
+SHA256 (rust/crates/url-2.5.0.crate) = 31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633
+SIZE (rust/crates/url-2.5.0.crate) = 78605
+SHA256 (rust/crates/utf8parse-0.2.1.crate) = 711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a
+SIZE (rust/crates/utf8parse-0.2.1.crate) = 13435
+SHA256 (rust/crates/uuid-1.7.0.crate) = f00cc9702ca12d3c81455259621e676d0f7251cec66a21e98fe2e9a37db93b2a
+SIZE (rust/crates/uuid-1.7.0.crate) = 42627
+SHA256 (rust/crates/v_htmlescape-0.15.8.crate) = 4e8257fbc510f0a46eb602c10215901938b5c2a7d5e70fc11483b1d3c9b5b18c
+SIZE (rust/crates/v_htmlescape-0.15.8.crate) = 10878
+SHA256 (rust/crates/validator-0.16.1.crate) = b92f40481c04ff1f4f61f304d61793c7b56ff76ac1469f1beb199b1445b253bd
+SIZE (rust/crates/validator-0.16.1.crate) = 13718
+SHA256 (rust/crates/validator_derive-0.16.0.crate) = bc44ca3088bb3ba384d9aecf40c6a23a676ce23e09bdaca2073d99c207f864af
+SIZE (rust/crates/validator_derive-0.16.0.crate) = 12759
+SHA256 (rust/crates/validator_types-0.16.0.crate) = 111abfe30072511849c5910134e8baf8dc05de4c0e5903d681cbd5c9c4d611e3
+SIZE (rust/crates/validator_types-0.16.0.crate) = 2145
+SHA256 (rust/crates/valuable-0.1.0.crate) = 830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d
+SIZE (rust/crates/valuable-0.1.0.crate) = 27718
+SHA256 (rust/crates/vcpkg-0.2.15.crate) = accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426
+SIZE (rust/crates/vcpkg-0.2.15.crate) = 228735
+SHA256 (rust/crates/version_check-0.9.4.crate) = 49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f
+SIZE (rust/crates/version_check-0.9.4.crate) = 14895
+SHA256 (rust/crates/wait-timeout-0.2.0.crate) = 9f200f5b12eb75f8c1ed65abd4b2db8a6e1b138a20de009dacee265a2498f3f6
+SIZE (rust/crates/wait-timeout-0.2.0.crate) = 12441
+SHA256 (rust/crates/walkdir-2.5.0.crate) = 29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b
+SIZE (rust/crates/walkdir-2.5.0.crate) = 23951
+SHA256 (rust/crates/want-0.3.0.crate) = 1ce8a968cb1cd110d136ff8b819a556d6fb6d919363c61534f6860c7eb172ba0
+SIZE (rust/crates/want-0.3.0.crate) = 6550
+SHA256 (rust/crates/wasi-0.9.0+wasi-snapshot-preview1.crate) = cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519
+SIZE (rust/crates/wasi-0.9.0+wasi-snapshot-preview1.crate) = 31521
+SHA256 (rust/crates/wasi-0.11.0+wasi-snapshot-preview1.crate) = 9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423
+SIZE (rust/crates/wasi-0.11.0+wasi-snapshot-preview1.crate) = 28131
+SHA256 (rust/crates/wasm-bindgen-0.2.83.crate) = eaf9f5aceeec8be17c128b2e93e031fb8a4d469bb9c4ae2d7dc1888b26887268
+SIZE (rust/crates/wasm-bindgen-0.2.83.crate) = 169618
+SHA256 (rust/crates/wasm-bindgen-backend-0.2.83.crate) = 4c8ffb332579b0557b52d268b91feab8df3615f265d5270fec2a8c95b17c1142
+SIZE (rust/crates/wasm-bindgen-backend-0.2.83.crate) = 25620
+SHA256 (rust/crates/wasm-bindgen-futures-0.4.33.crate) = 23639446165ca5a5de86ae1d8896b737ae80319560fbaa4c2887b7da6e7ebd7d
+SIZE (rust/crates/wasm-bindgen-futures-0.4.33.crate) = 15216
+SHA256 (rust/crates/wasm-bindgen-macro-0.2.83.crate) = 052be0f94026e6cbc75cdefc9bae13fd6052cdcaf532fa6c45e7ae33a1e6c810
+SIZE (rust/crates/wasm-bindgen-macro-0.2.83.crate) = 12075
+SHA256 (rust/crates/wasm-bindgen-macro-support-0.2.83.crate) = 07bc0c051dc5f23e307b13285f9d75df86bfdf816c5721e573dec1f9b8aa193c
+SIZE (rust/crates/wasm-bindgen-macro-support-0.2.83.crate) = 18530
+SHA256 (rust/crates/wasm-bindgen-shared-0.2.83.crate) = 1c38c045535d93ec4f0b4defec448e4291638ee608530863b1e2ba115d4fff7f
+SIZE (rust/crates/wasm-bindgen-shared-0.2.83.crate) = 7194
+SHA256 (rust/crates/wasm-streams-0.3.0.crate) = b4609d447824375f43e1ffbc051b50ad8f4b3ae8219680c94452ea05eb240ac7
+SIZE (rust/crates/wasm-streams-0.3.0.crate) = 33502
+SHA256 (rust/crates/web-sys-0.3.60.crate) = bcda906d8be16e728fd5adc5b729afad4e444e106ab28cd1c7256e54fa61510f
+SIZE (rust/crates/web-sys-0.3.60.crate) = 700485
+SHA256 (rust/crates/webpki-roots-0.23.1.crate) = b03058f88386e5ff5310d9111d53f48b17d732b401aeb83a8d5190f2ac459338
+SIZE (rust/crates/webpki-roots-0.23.1.crate) = 245626
+SHA256 (rust/crates/webpki-roots-0.25.2.crate) = 14247bb57be4f377dfb94c72830b8ce8fc6beac03cf4bf7b9732eadd414123fc
+SIZE (rust/crates/webpki-roots-0.25.2.crate) = 250405
+SHA256 (rust/crates/whatlang-0.16.4.crate) = 471d1c1645d361eb782a1650b1786a8fb58dd625e681a04c09f5ff7c8764a7b0
+SIZE (rust/crates/whatlang-0.16.4.crate) = 82482
+SHA256 (rust/crates/which-4.3.0.crate) = 1c831fbbee9e129a8cf93e7747a82da9d95ba8e16621cae60ec2cdc849bacb7b
+SIZE (rust/crates/which-4.3.0.crate) = 9635
+SHA256 (rust/crates/winapi-0.3.9.crate) = 5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419
+SIZE (rust/crates/winapi-0.3.9.crate) = 1200382
+SHA256 (rust/crates/winapi-i686-pc-windows-gnu-0.4.0.crate) = ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6
+SIZE (rust/crates/winapi-i686-pc-windows-gnu-0.4.0.crate) = 2918815
+SHA256 (rust/crates/winapi-util-0.1.5.crate) = 70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178
+SIZE (rust/crates/winapi-util-0.1.5.crate) = 10164
+SHA256 (rust/crates/winapi-x86_64-pc-windows-gnu-0.4.0.crate) = 712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f
+SIZE (rust/crates/winapi-x86_64-pc-windows-gnu-0.4.0.crate) = 2947998
+SHA256 (rust/crates/winnow-0.5.37.crate) = a7cad8365489051ae9f054164e459304af2e7e9bb407c958076c8bf4aef52da5
+SIZE (rust/crates/winnow-0.5.37.crate) = 158728
+SHA256 (rust/crates/windows-0.48.0.crate) = e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f
+SIZE (rust/crates/windows-0.48.0.crate) = 11864177
+SHA256 (rust/crates/windows-0.52.0.crate) = e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be
+SIZE (rust/crates/windows-0.52.0.crate) = 11843715
+SHA256 (rust/crates/windows-core-0.52.0.crate) = 33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9
+SIZE (rust/crates/windows-core-0.52.0.crate) = 42154
+SHA256 (rust/crates/windows-sys-0.42.0.crate) = 5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7
+SIZE (rust/crates/windows-sys-0.42.0.crate) = 3006791
+SHA256 (rust/crates/windows-sys-0.45.0.crate) = 75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0
+SIZE (rust/crates/windows-sys-0.45.0.crate) = 2568659
+SHA256 (rust/crates/windows-sys-0.48.0.crate) = 677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9
+SIZE (rust/crates/windows-sys-0.48.0.crate) = 2628884
+SHA256 (rust/crates/windows-sys-0.52.0.crate) = 282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d
+SIZE (rust/crates/windows-sys-0.52.0.crate) = 2576877
+SHA256 (rust/crates/windows-targets-0.42.2.crate) = 8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071
+SIZE (rust/crates/windows-targets-0.42.2.crate) = 5492
+SHA256 (rust/crates/windows-targets-0.48.0.crate) = 7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5
+SIZE (rust/crates/windows-targets-0.48.0.crate) = 7466
+SHA256 (rust/crates/windows-targets-0.52.0.crate) = 8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd
+SIZE (rust/crates/windows-targets-0.52.0.crate) = 6229
+SHA256 (rust/crates/windows_aarch64_gnullvm-0.42.2.crate) = 597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8
+SIZE (rust/crates/windows_aarch64_gnullvm-0.42.2.crate) = 364071
+SHA256 (rust/crates/windows_aarch64_gnullvm-0.48.0.crate) = 91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc
+SIZE (rust/crates/windows_aarch64_gnullvm-0.48.0.crate) = 366543
+SHA256 (rust/crates/windows_aarch64_gnullvm-0.52.0.crate) = cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea
+SIZE (rust/crates/windows_aarch64_gnullvm-0.52.0.crate) = 430182
+SHA256 (rust/crates/windows_aarch64_msvc-0.42.2.crate) = e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43
+SIZE (rust/crates/windows_aarch64_msvc-0.42.2.crate) = 666981
+SHA256 (rust/crates/windows_aarch64_msvc-0.48.0.crate) = b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3
+SIZE (rust/crates/windows_aarch64_msvc-0.48.0.crate) = 671479
+SHA256 (rust/crates/windows_aarch64_msvc-0.52.0.crate) = bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef
+SIZE (rust/crates/windows_aarch64_msvc-0.52.0.crate) = 821663
+SHA256 (rust/crates/windows_i686_gnu-0.42.2.crate) = c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f
+SIZE (rust/crates/windows_i686_gnu-0.42.2.crate) = 736236
+SHA256 (rust/crates/windows_i686_gnu-0.48.0.crate) = 622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241
+SIZE (rust/crates/windows_i686_gnu-0.48.0.crate) = 741490
+SHA256 (rust/crates/windows_i686_gnu-0.52.0.crate) = a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313
+SIZE (rust/crates/windows_i686_gnu-0.52.0.crate) = 870285
+SHA256 (rust/crates/windows_i686_msvc-0.42.2.crate) = 44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060
+SIZE (rust/crates/windows_i686_msvc-0.42.2.crate) = 724951
+SHA256 (rust/crates/windows_i686_msvc-0.48.0.crate) = 4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00
+SIZE (rust/crates/windows_i686_msvc-0.48.0.crate) = 730056
+SHA256 (rust/crates/windows_i686_msvc-0.52.0.crate) = ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a
+SIZE (rust/crates/windows_i686_msvc-0.52.0.crate) = 888693
+SHA256 (rust/crates/windows_x86_64_gnu-0.42.2.crate) = 8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36
+SIZE (rust/crates/windows_x86_64_gnu-0.42.2.crate) = 699373
+SHA256 (rust/crates/windows_x86_64_gnu-0.48.0.crate) = ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1
+SIZE (rust/crates/windows_x86_64_gnu-0.48.0.crate) = 703595
+SHA256 (rust/crates/windows_x86_64_gnu-0.52.0.crate) = 3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd
+SIZE (rust/crates/windows_x86_64_gnu-0.52.0.crate) = 826213
+SHA256 (rust/crates/windows_x86_64_gnullvm-0.42.2.crate) = 26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3
+SIZE (rust/crates/windows_x86_64_gnullvm-0.42.2.crate) = 364068
+SHA256 (rust/crates/windows_x86_64_gnullvm-0.48.0.crate) = 7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953
+SIZE (rust/crates/windows_x86_64_gnullvm-0.48.0.crate) = 366536
+SHA256 (rust/crates/windows_x86_64_gnullvm-0.52.0.crate) = 1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e
+SIZE (rust/crates/windows_x86_64_gnullvm-0.52.0.crate) = 430165
+SHA256 (rust/crates/windows_x86_64_msvc-0.42.2.crate) = 9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0
+SIZE (rust/crates/windows_x86_64_msvc-0.42.2.crate) = 666936
+SHA256 (rust/crates/windows_x86_64_msvc-0.48.0.crate) = 1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a
+SIZE (rust/crates/windows_x86_64_msvc-0.48.0.crate) = 671422
+SHA256 (rust/crates/windows_x86_64_msvc-0.52.0.crate) = dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04
+SIZE (rust/crates/windows_x86_64_msvc-0.52.0.crate) = 821600
+SHA256 (rust/crates/winreg-0.50.0.crate) = 524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1
+SIZE (rust/crates/winreg-0.50.0.crate) = 29703
+SHA256 (rust/crates/wyz-0.5.1.crate) = 05f360fc0b24296329c78fda852a1e9ae82de9cf7b27dae4b7f62f118f77b9ed
+SIZE (rust/crates/wyz-0.5.1.crate) = 18790
+SHA256 (rust/crates/xattr-1.0.1.crate) = f4686009f71ff3e5c4dbcf1a282d0a44db3f021ba69350cd42086b3e5f1c6985
+SIZE (rust/crates/xattr-1.0.1.crate) = 12258
+SHA256 (rust/crates/yada-0.5.0.crate) = b6d12cb7a57bbf2ab670ed9545bae3648048547f9039279a89ce000208e585c1
+SIZE (rust/crates/yada-0.5.0.crate) = 13308
+SHA256 (rust/crates/yaml-rust-0.4.5.crate) = 56c1936c4cc7a1c9ab21a1ebb602eb942ba868cbd44a99cb7cdc5892335e1c85
+SIZE (rust/crates/yaml-rust-0.4.5.crate) = 47783
+SHA256 (rust/crates/zerocopy-0.7.31.crate) = 1c4061bedbb353041c12f413700357bec76df2c7e2ca8e4df8bac24c6bf68e3d
+SIZE (rust/crates/zerocopy-0.7.31.crate) = 151100
+SHA256 (rust/crates/zerocopy-derive-0.7.31.crate) = b3c129550b3e6de3fd0ba67ba5c81818f9805e58b8d7fee80a3a59d2c9fc601a
+SIZE (rust/crates/zerocopy-derive-0.7.31.crate) = 533507
+SHA256 (rust/crates/zerofrom-0.1.3.crate) = 655b0814c5c0b19ade497851070c640773304939a6c0fd5f5fb43da0696d05b7
+SIZE (rust/crates/zerofrom-0.1.3.crate) = 4973
+SHA256 (rust/crates/zeroize-1.7.0.crate) = 525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d
+SIZE (rust/crates/zeroize-1.7.0.crate) = 19039
+SHA256 (rust/crates/zerovec-0.10.1.crate) = eff4439ae91fb5c72b8abc12f3f2dbf51bd27e6eadb9f8a5bc8898dddb0e27ea
+SIZE (rust/crates/zerovec-0.10.1.crate) = 124999
+SHA256 (rust/crates/zip-0.6.6.crate) = 760394e246e4c28189f19d488c058bf16f564016aefac5d32bb1f3b51d5e9261
+SIZE (rust/crates/zip-0.6.6.crate) = 65789
+SHA256 (rust/crates/zstd-0.11.2+zstd.1.5.2.crate) = 20cc960326ece64f010d2d2107537f26dc589a6573a316bd5b1dba685fa5fde4
+SIZE (rust/crates/zstd-0.11.2+zstd.1.5.2.crate) = 28987
+SHA256 (rust/crates/zstd-0.13.0.crate) = bffb3309596d527cfcba7dfc6ed6052f1d39dfbd7c867aa2e865e4a449c10110
+SIZE (rust/crates/zstd-0.13.0.crate) = 28911
+SHA256 (rust/crates/zstd-safe-5.0.2+zstd.1.5.2.crate) = 1d2a5585e04f9eea4b2a3d1eca508c4dee9592a89ef6f450c11719da0726f4db
+SIZE (rust/crates/zstd-safe-5.0.2+zstd.1.5.2.crate) = 17273
+SHA256 (rust/crates/zstd-safe-7.0.0.crate) = 43747c7422e2924c11144d5229878b98180ef8b06cca4ab5af37afc8a8d8ea3e
+SIZE (rust/crates/zstd-safe-7.0.0.crate) = 20463
+SHA256 (rust/crates/zstd-sys-2.0.9+zstd.1.5.5.crate) = 9e16efa8a874a0481a574084d34cc26fdb3b99627480f785888deb6386506656
+SIZE (rust/crates/zstd-sys-2.0.9+zstd.1.5.5.crate) = 728791
+SHA256 (qdrant-quantization-939fdb627a8edcf92fd71e3c79017156690850e9_GH0.tar.gz) = 30f039511820cddd9d769a85b3a28fd8083db8013161c7a9109784a399ac7c95
+SIZE (qdrant-quantization-939fdb627a8edcf92fd71e3c79017156690850e9_GH0.tar.gz) = 59857
+SHA256 (qdrant-tonic-060ab88c87955adc59d46a44b4e3b72cb4cc1522_GH0.tar.gz) = 590505f0eb8f59cbc64bb0eabbb5b06132e14dd98b3d349df57788834638afc9
+SIZE (qdrant-tonic-060ab88c87955adc59d46a44b4e3b72cb4cc1522_GH0.tar.gz) = 37445849
+SHA256 (qdrant-wal-fad0e7c48be58d8e7db4cc739acd9b1cf6735de0_GH0.tar.gz) = 4856294449286749889f6e3ffc9caaf7e92e1795743fdaff8f18fb3931d2364a
+SIZE (qdrant-wal-fad0e7c48be58d8e7db4cc739acd9b1cf6735de0_GH0.tar.gz) = 26823
+SHA256 (qdrant-qdrant-v1.8.2_GH0.tar.gz) = 62db1e1a78398adef44f581d0085ae86cbe8ad2a3feb8c2dd3e34315ea90f339
+SIZE (qdrant-qdrant-v1.8.2_GH0.tar.gz) = 1899711
diff --git a/databases/qdrant/files/patch-config_config.yaml b/databases/qdrant/files/patch-config_config.yaml
new file mode 100644
index 000000000000..97be1e81c191
--- /dev/null
+++ b/databases/qdrant/files/patch-config_config.yaml
@@ -0,0 +1,37 @@
+--- config/config.yaml.orig	2024-01-03 19:31:20 UTC
++++ config/config.yaml
+@@ -2,10 +2,10 @@ log_level: INFO
+ 
+ storage:
+   # Where to store all the data
+-  storage_path: ./storage
++  storage_path: %%DBDIR%%/storage
+ 
+   # Where to store snapshots
+-  snapshots_path: ./snapshots
++  snapshots_path: %%DBDIR%%/snapshots
+ 
+   # Where to store temporary files
+   # If null, temporary snapshot are stored in: storage/snapshots_temp/
+@@ -205,10 +205,10 @@ telemetry_disabled: false
+ # Required if either service.enable_tls or cluster.p2p.enable_tls is true.
+ tls:
+   # Server certificate chain file
+-  cert: ./tls/cert.pem
++  cert: %%ETCDIR%%/tls/cert.pem
+ 
+   # Server private key file
+-  key: ./tls/key.pem
++  key: %%ETCDIR%%/tls/key.pem
+ 
+   # Certificate authority certificate file.
+   # This certificate will be used to validate the certificates
+@@ -218,7 +218,7 @@ tls:
+   # HTTPS client certificate
+   #
+   # Required if cluster.p2p.enable_tls is true.
+-  ca_cert: ./tls/cacert.pem
++  ca_cert: %%ETCDIR%%/tls/cacert.pem
+ 
+   # TTL in seconds to reload certificate from disk, useful for certificate rotations.
+   # Only works for HTTPS endpoints. Does not support gRPC (and intra-cluster communication).
diff --git a/databases/qdrant/files/qdrant.in b/databases/qdrant/files/qdrant.in
new file mode 100644
index 000000000000..6151d3e21399
--- /dev/null
+++ b/databases/qdrant/files/qdrant.in
@@ -0,0 +1,131 @@
+#!/bin/sh
+
+# PROVIDE: qdrant
+# REQUIRE: LOGIN
+# KEYWORD: shutdown
+#
+# Add the following lines to /etc/rc.conf to run qdrant:
+#
+# qdrant_profiles (str):     Set to "" by default.
+#                               Define your profiles here.
+# qdrant(_profile)?_enable (bool):	Set it to "YES" to enable qdrant.
+#				Default is "NO".
+# qdrant(_profile)?_config (str):	Full name of config file
+#				Default is "%%ETCDIR%%/config.yaml" or
+#				"%%ETCDIR%%/config(.profile)?.yaml
+# qdrant(_profile)?_args (flags):	Set extra args here. More options in qdrant(1)
+#				Default is empty "".
+# qdrant(_profile)?_user (user):	Set user to run qdrant.
+#				Default is "nobody".
+# qdrant(_profile)?_group (group):	Set group to run qdrant.
+#				Default is "nobody".
+# qdrant(_profile)?_post_start (str):   Set extra commands that should be executed after qdrant was successfully
+#                               started here.
+#                               Default is empty "".
+
+. /etc/rc.subr
+
+name="qdrant"
+rcvar=qdrant_enable
+
+_piddir="/var/run/qdrant"
+pidfile="${_piddir}/qdrant.pid"
+
+: ${qdrant_enable="NO"}
+: ${qdrant_config="%%ETCDIR%%/config.yaml"}
+: ${qdrant_user="nobody"}
+: ${qdrant_group="nobody"}
+: ${qdrant_args=""}
+
+load_rc_config ${name}
+
+if [ -n "$2" ]; then
+	profile="$2"
+	if [ -n "${qdrant_profiles}" ]; then
+		pidfile="${_piddir}/qdrant.${profile}.pid"
+		eval qdrant_enable="\${qdrant_${profile}_enable:-${qdrant_enable}}"
+		eval qdrant_config="\${qdrant_${profile}_config:-${qdrant_config}}"
+                eval qdrant_user="\${qdrant_${profile}_user:-${qdrant_user}}"
+                eval qdrant_group="\${qdrant_${profile}_group:-${qdrant_group}}"
+		eval qdrant_args="\${qdrant_${profile}_args:-${qdrant_args}}"
+		eval qdrant_post_start="\${qdrant_${profile}_post_start:-${qdrant_post_start}}"
+	else
+		echo "%%PREFIX%%/etc/rc.d/qdrant%%RC_SUBR_SUFFIX%%: extra argument ignored"
+	fi
+else
+	if [ -n "${qdrant_profiles}" -a -n "$1" ]; then
+		for profile in ${qdrant_profiles}; do
+			eval _enable="\${qdrant_${profile}_enable}"
+			case "${_enable:-${qdrant_enable}}" in
+			[Nn][Oo]|[Ff][Aa][Ll][Ss][Ee]|[Oo][Ff][Ff]|0)
+				continue
+				;;
+			[Yy][Ee][Ss]|[Tt][Rr][Uu][Ee]|[Oo][Nn]|1)
+				;;
+			*)
+				if test -z "$_enable"; then
+					_var=qdrant_enable
+				else
+					_var=qdrant_"${profile}"_enable
+				fi
+				warn "Bad value" \
+				    "'${_enable:-${qdrant_enable}}'" \
+				    "for ${_var}. " \
+				    "Profile ${profile} skipped."
+				continue
+				;;
+			esac
+			echo "===> qdrant profile: ${profile}"
+			if %%PREFIX%%/etc/rc.d/qdrant%%RC_SUBR_SUFFIX%% $1 ${profile} ; then
+				success="${profile} ${success:-}"
+			else
+				failed="${profile} (${retcode}) ${failed:-}"
+			fi
+		done
+		exit 0
+	fi
+fi
+
+qdrant_poststart()
+{
+    if [ -n "$qdrant_post_start" ]; then
+        eval $qdrant_post_start
+    fi
+}
+
+qdrant_poststop()
+{
+	if [ -n "${profile}" ]; then
+		[ -e "$pidfile" ] && unlink $pidfile
+	else
+		local file
+
+		for file in ${_piddir}/* ; do
+			case "$file" in
+			*\*)
+				continue ;;
+			esac
+			unlink $file
+		done
+	fi
+}
+
+_profsuffx=""
+if [ -n "${profile}" ]; then
+	_profsuffx="-${profile}"
+fi
+
+required_files="$qdrant_config"
+procname=%%PREFIX%%/bin/qdrant
+command="/usr/sbin/daemon"
+command_args="-f -S -p ${pidfile} \
+	-t qdrant${_profsuffx} \
+	%%PREFIX%%/bin/qdrant --config-path $qdrant_config \
+	$qdrant_args"
+
+
+start_precmd="install -d -o $qdrant_user -g $qdrant_group -m 755 $_piddir"
+start_postcmd="${name}_poststart"
+stop_postcmd="${name}_poststop"
+
+run_rc_command "$1"
diff --git a/databases/qdrant/pkg-descr b/databases/qdrant/pkg-descr
new file mode 100644
index 000000000000..f6008b362158
--- /dev/null
+++ b/databases/qdrant/pkg-descr
@@ -0,0 +1,11 @@
+Qdrant is a vector similarity search engine and vector database.
+
+It provides a production-ready service with a convenient API to store,
+search, and manage points - vectors with an additional payload.
+Qdrant is tailored to extended filtering support. It makes it useful for all
+sorts of neural-network or semantic-based matching, faceted search, and other
+applications.
+
+With Qdrant, embeddings or neural network encoders can be turned into
+full-fledged applications for matching, searching, recommending, and much
+more.
diff --git a/databases/qdrant/pkg-plist b/databases/qdrant/pkg-plist
new file mode 100644
index 000000000000..41e99bcec522
--- /dev/null
+++ b/databases/qdrant/pkg-plist
@@ -0,0 +1,6 @@
+bin/qdrant
+bin/schema_generator
+bin/wal_inspector
+@sample %%ETCDIR%%/config.yaml.sample
+@dir(%%QDRANT_USER%%,%%QDRANT_GROUP%%,0750) %%ETCDIR%%/tls
+@dir(%%QDRANT_USER%%,%%QDRANT_GROUP%%,0750) %%QDRANT_DBDIR%%
diff --git a/databases/qof/Makefile b/databases/qof/Makefile
index 1551116153e9..decb9ce49cb1 100644
--- a/databases/qof/Makefile
+++ b/databases/qof/Makefile
@@ -1,12 +1,13 @@
 PORTNAME=	qof
 PORTVERSION=	0.8.8
-PORTREVISION=	1
+PORTREVISION=	3
 CATEGORIES=	databases
 MASTER_SITES=	DEBIAN_POOL
 DISTNAME=	qof_${PORTVERSION}.orig
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Query Object Framework
+WWW=		https://alioth.debian.org/projects/qof/
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
diff --git a/databases/qof/pkg-descr b/databases/qof/pkg-descr
index 7ab086d2a59c..356c026ff7e6 100644
--- a/databases/qof/pkg-descr
+++ b/databases/qof/pkg-descr
@@ -1,5 +1,3 @@
 QOF - Query Object Framework - library to add a query engine to C
 applications with generic XML backend.  A SQL database is not needed; any
 collection of C/C++ objects can act as tables.
-
-WWW: https://alioth.debian.org/projects/qof/
diff --git a/databases/qt5-sql/Makefile b/databases/qt5-sql/Makefile
index 950da5757e3d..fa1f1ed8cbff 100644
--- a/databases/qt5-sql/Makefile
+++ b/databases/qt5-sql/Makefile
@@ -1,14 +1,14 @@
 PORTNAME=	sql
-DISTVERSION=	${QT5_VERSION}
-PORTREVISION=	1
+PORTVERSION=	${QT5_VERSION}${QT5_KDE_PATCH}
 CATEGORIES=	databases
 PKGNAMEPREFIX=	qt5-
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Qt SQL database integration module
 
-USES=		compiler:c++11-lang qmake:no_env qt-dist:5,base
-USE_QT=		core qmake_build buildtools_build
+USES=		compiler:c++11-lang perl5 qmake:no_env qt-dist:5,base
+USE_PERL5=	extract
+USE_QT=		core qmake:build buildtools:build
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	-no-gui -no-xcb
 
diff --git a/databases/qt5-sql/distinfo b/databases/qt5-sql/distinfo
new file mode 100644
index 000000000000..a0c66832e9c4
--- /dev/null
+++ b/databases/qt5-sql/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1711770881
+SHA256 (KDE/Qt/5.15.13/kde-qtbase-5.15.13p142.tar.xz) = 1fa166c50478b5d09250a352912449e16d6ad73de46275d92d0b4b90abe2dcdb
+SIZE (KDE/Qt/5.15.13/kde-qtbase-5.15.13p142.tar.xz) = 50408504
diff --git a/databases/qt5-sql/pkg-message b/databases/qt5-sql/pkg-message
index cee398c2b5bf..00820951f27f 100644
--- a/databases/qt5-sql/pkg-message
+++ b/databases/qt5-sql/pkg-message
@@ -3,7 +3,6 @@
   message: <<EOM
 To enable Qt database support, install the database plugin ports. The
 following plugin ports are available:
- - databases/qt5-sqldrivers-ibase	InterBase/Firebird
  - databases/qt5-sqldrivers-mysql	MySQL
  - databases/qt5-sqldrivers-odbc	Open Database Connectivity
  - databases/qt5-sqldrivers-pgsql	PostgreSQL
diff --git a/databases/qt5-sqldrivers-ibase/Makefile b/databases/qt5-sqldrivers-ibase/Makefile
deleted file mode 100644
index 10f0e65da56c..000000000000
--- a/databases/qt5-sqldrivers-ibase/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-PORTREVISION=	1
-
-DB=		IBase
-DB_DESC=	InterBase/Firebird
-
-USES=		firebird
-
-ONLY_FOR_ARCHS=	i386 amd64
-
-.include "${.CURDIR:H:H}/devel/qt5/Makefile.sqldrivers"
diff --git a/databases/qt5-sqldrivers-mysql/Makefile b/databases/qt5-sqldrivers-mysql/Makefile
index 04a43c5fb77d..cb439f9671af 100644
--- a/databases/qt5-sqldrivers-mysql/Makefile
+++ b/databases/qt5-sqldrivers-mysql/Makefile
@@ -1,4 +1,3 @@
-PORTREVISION=	1
 
 DB=		MYSQL
 DB_DESC=	MySQL
diff --git a/databases/qt5-sqldrivers-mysql/distinfo b/databases/qt5-sqldrivers-mysql/distinfo
new file mode 100644
index 000000000000..a8355a2cc064
--- /dev/null
+++ b/databases/qt5-sqldrivers-mysql/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1711770882
+SHA256 (KDE/Qt/5.15.13/kde-qtbase-5.15.13p142.tar.xz) = 1fa166c50478b5d09250a352912449e16d6ad73de46275d92d0b4b90abe2dcdb
+SIZE (KDE/Qt/5.15.13/kde-qtbase-5.15.13p142.tar.xz) = 50408504
diff --git a/databases/qt5-sqldrivers-mysql/files/patch-src_plugins_sqldrivers_mysql_qsql__mysql.cpp b/databases/qt5-sqldrivers-mysql/files/patch-src_plugins_sqldrivers_mysql_qsql__mysql.cpp
index d76cd1b67365..2226444592de 100644
--- a/databases/qt5-sqldrivers-mysql/files/patch-src_plugins_sqldrivers_mysql_qsql__mysql.cpp
+++ b/databases/qt5-sqldrivers-mysql/files/patch-src_plugins_sqldrivers_mysql_qsql__mysql.cpp
@@ -1,9 +1,9 @@
---- src/plugins/sqldrivers/mysql/qsql_mysql.cpp.orig	2020-10-27 08:02:11 UTC
+--- src/plugins/sqldrivers/mysql/qsql_mysql.cpp.orig	2023-09-04 21:23:22 UTC
 +++ src/plugins/sqldrivers/mysql/qsql_mysql.cpp
-@@ -352,11 +360,11 @@ void QMYSQLResultPrivate::bindBlobs()
- 
-     for(i = 0; i < fields.count(); ++i) {
-         fieldInfo = fields.at(i).myField;
+@@ -363,11 +363,11 @@ void QMYSQLResultPrivate::bindBlobs()
+     MYSQL_BIND *bind;
+     for (int i = 0; i < fields.count(); ++i) {
+         const MYSQL_FIELD *fieldInfo = fields.at(i).myField;
 -        if (qIsBlob(inBinds[i].buffer_type) && meta && fieldInfo) {
 +        if (qIsBlob(inBinds[i].buffer_type) && meta && fieldInfo && fieldInfo->max_length) {
              bind = &inBinds[i];
diff --git a/databases/qt5-sqldrivers-odbc/Makefile b/databases/qt5-sqldrivers-odbc/Makefile
index 33ae93b833f3..abb0e9f39809 100644
--- a/databases/qt5-sqldrivers-odbc/Makefile
+++ b/databases/qt5-sqldrivers-odbc/Makefile
@@ -1,4 +1,3 @@
-
 COMMENT=	Qt ${DB_DESC} plugin
 
 DB=		ODBC
diff --git a/databases/qt5-sqldrivers-odbc/distinfo b/databases/qt5-sqldrivers-odbc/distinfo
new file mode 100644
index 000000000000..8127d099b6db
--- /dev/null
+++ b/databases/qt5-sqldrivers-odbc/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1711770883
+SHA256 (KDE/Qt/5.15.13/kde-qtbase-5.15.13p142.tar.xz) = 1fa166c50478b5d09250a352912449e16d6ad73de46275d92d0b4b90abe2dcdb
+SIZE (KDE/Qt/5.15.13/kde-qtbase-5.15.13p142.tar.xz) = 50408504
diff --git a/databases/qt5-sqldrivers-pgsql/distinfo b/databases/qt5-sqldrivers-pgsql/distinfo
new file mode 100644
index 000000000000..cba7e145d64b
--- /dev/null
+++ b/databases/qt5-sqldrivers-pgsql/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1711770885
+SHA256 (KDE/Qt/5.15.13/kde-qtbase-5.15.13p142.tar.xz) = 1fa166c50478b5d09250a352912449e16d6ad73de46275d92d0b4b90abe2dcdb
+SIZE (KDE/Qt/5.15.13/kde-qtbase-5.15.13p142.tar.xz) = 50408504
diff --git a/databases/qt5-sqldrivers-sqlite2/Makefile b/databases/qt5-sqldrivers-sqlite2/Makefile
index c7d67c04b33a..3017d42f58ec 100644
--- a/databases/qt5-sqldrivers-sqlite2/Makefile
+++ b/databases/qt5-sqldrivers-sqlite2/Makefile
@@ -1,4 +1,3 @@
-
 DB=		SQLite2
 DB_DESC=	SQLite 2
 
diff --git a/databases/qt5-sqldrivers-sqlite2/distinfo b/databases/qt5-sqldrivers-sqlite2/distinfo
new file mode 100644
index 000000000000..18d2a9818741
--- /dev/null
+++ b/databases/qt5-sqldrivers-sqlite2/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1711770886
+SHA256 (KDE/Qt/5.15.13/kde-qtbase-5.15.13p142.tar.xz) = 1fa166c50478b5d09250a352912449e16d6ad73de46275d92d0b4b90abe2dcdb
+SIZE (KDE/Qt/5.15.13/kde-qtbase-5.15.13p142.tar.xz) = 50408504
diff --git a/databases/qt5-sqldrivers-sqlite3/distinfo b/databases/qt5-sqldrivers-sqlite3/distinfo
new file mode 100644
index 000000000000..4ba56d2ed9b5
--- /dev/null
+++ b/databases/qt5-sqldrivers-sqlite3/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1711770887
+SHA256 (KDE/Qt/5.15.13/kde-qtbase-5.15.13p142.tar.xz) = 1fa166c50478b5d09250a352912449e16d6ad73de46275d92d0b4b90abe2dcdb
+SIZE (KDE/Qt/5.15.13/kde-qtbase-5.15.13p142.tar.xz) = 50408504
diff --git a/databases/qt5-sqldrivers-tds/Makefile b/databases/qt5-sqldrivers-tds/Makefile
index 56c646aa873b..982794b6c7d1 100644
--- a/databases/qt5-sqldrivers-tds/Makefile
+++ b/databases/qt5-sqldrivers-tds/Makefile
@@ -1,4 +1,3 @@
-
 DB=		TDS
 DB_DESC=	TDS Database Connectivity
 
diff --git a/databases/qt5-sqldrivers-tds/distinfo b/databases/qt5-sqldrivers-tds/distinfo
new file mode 100644
index 000000000000..d5543e8e55b5
--- /dev/null
+++ b/databases/qt5-sqldrivers-tds/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1711770889
+SHA256 (KDE/Qt/5.15.13/kde-qtbase-5.15.13p142.tar.xz) = 1fa166c50478b5d09250a352912449e16d6ad73de46275d92d0b4b90abe2dcdb
+SIZE (KDE/Qt/5.15.13/kde-qtbase-5.15.13p142.tar.xz) = 50408504
diff --git a/databases/qt6-base_sqldriver/Makefile b/databases/qt6-base_sqldriver/Makefile
new file mode 100644
index 000000000000..fc30996a3275
--- /dev/null
+++ b/databases/qt6-base_sqldriver/Makefile
@@ -0,0 +1,37 @@
+# This should be sub-packages...
+
+PORTNAME=	base
+DISTVERSION=	${QT6_VERSION}
+CATEGORIES=	databases
+PKGNAMEPREFIX=	qt6-
+PKGNAMESUFFIX=	_sqldriver-${FLAVOR}
+
+MAINTAINER=	kde@FreeBSD.org
+COMMENT=	Qt base (${FLAVOR} sqldriver)
+
+FLAVORS=	sqlite mysql odbc psql
+FLAVOR?=	sqlite
+
+WRKSRC_SUBDIR=	src/plugins/sqldrivers
+
+USES=		cmake compiler:c++17-lang pkgconfig qt-dist:6 \
+		${${FLAVOR}_USES}
+USE_QT=		base
+
+CMAKE_ARGS=	-DCMAKE_PROJECT_NAME=Qt6${FLAVOR}
+CMAKE_ON=	FEATURE_sql_${FLAVOR} ${${FLAVOR}_CMAKE_ON}
+CMAKE_OFF=	${FLAVORS:N${FLAVOR}:S/^/FEATURE_sql_/} \
+		FEATURE_sql_ibase
+
+mysql_USES=		mysql
+odbc_LIB_DEPENDS=	libodbc.so:databases/unixODBC
+psql_USES=		pgsql
+sqlite_USES=		sqlite:3
+sqlite_CMAKE_ON=	QT_FEATURE_system_sqlite
+${FLAVOR}_PLIST=	${.CURDIR}/pkg-plist.${FLAVOR}
+
+.if ${FLAVOR:U} == mysql
+IGNORE_WITH_MYSQL=	105m 106m 1011m
+.endif
+
+.include <bsd.port.mk>
diff --git a/databases/qt6-base_sqldriver/distinfo b/databases/qt6-base_sqldriver/distinfo
new file mode 100644
index 000000000000..bc3c99a06a93
--- /dev/null
+++ b/databases/qt6-base_sqldriver/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1711660995
+SHA256 (KDE/Qt/6.6.3/qtbase-everywhere-src-6.6.3.tar.xz) = 0493fd0b380c4edf8872f011a7f26d245aa4cdd75b349904ef340a22dedf7462
+SIZE (KDE/Qt/6.6.3/qtbase-everywhere-src-6.6.3.tar.xz) = 48784716
diff --git a/databases/qt6-base_sqldriver/pkg-descr b/databases/qt6-base_sqldriver/pkg-descr
new file mode 100644
index 000000000000..918d9e303a76
--- /dev/null
+++ b/databases/qt6-base_sqldriver/pkg-descr
@@ -0,0 +1 @@
+Qt Base 
diff --git a/databases/qt6-base_sqldriver/pkg-plist.mysql b/databases/qt6-base_sqldriver/pkg-plist.mysql
new file mode 100644
index 000000000000..f449aceab5ec
--- /dev/null
+++ b/databases/qt6-base_sqldriver/pkg-plist.mysql
@@ -0,0 +1,7 @@
+lib/cmake/Qt6Sql/Qt6QMYSQLDriverPluginAdditionalTargetInfo.cmake
+lib/cmake/Qt6Sql/Qt6QMYSQLDriverPluginConfig.cmake
+lib/cmake/Qt6Sql/Qt6QMYSQLDriverPluginConfigVersion.cmake
+lib/cmake/Qt6Sql/Qt6QMYSQLDriverPluginConfigVersionImpl.cmake
+lib/cmake/Qt6Sql/Qt6QMYSQLDriverPluginTargets-%%CMAKE_BUILD_TYPE%%.cmake
+lib/cmake/Qt6Sql/Qt6QMYSQLDriverPluginTargets.cmake
+%%QT_PLUGINDIR%%/sqldrivers/libqsqlmysql.so
diff --git a/databases/qt6-base_sqldriver/pkg-plist.odbc b/databases/qt6-base_sqldriver/pkg-plist.odbc
new file mode 100644
index 000000000000..2878ad96a1fb
--- /dev/null
+++ b/databases/qt6-base_sqldriver/pkg-plist.odbc
@@ -0,0 +1,7 @@
+lib/cmake/Qt6Sql/Qt6QODBCDriverPluginAdditionalTargetInfo.cmake
+lib/cmake/Qt6Sql/Qt6QODBCDriverPluginConfig.cmake
+lib/cmake/Qt6Sql/Qt6QODBCDriverPluginConfigVersion.cmake
+lib/cmake/Qt6Sql/Qt6QODBCDriverPluginConfigVersionImpl.cmake
+lib/cmake/Qt6Sql/Qt6QODBCDriverPluginTargets-%%CMAKE_BUILD_TYPE%%.cmake
+lib/cmake/Qt6Sql/Qt6QODBCDriverPluginTargets.cmake
+%%QT_PLUGINDIR%%/sqldrivers/libqsqlodbc.so
diff --git a/databases/qt6-base_sqldriver/pkg-plist.psql b/databases/qt6-base_sqldriver/pkg-plist.psql
new file mode 100644
index 000000000000..563e02ea5883
--- /dev/null
+++ b/databases/qt6-base_sqldriver/pkg-plist.psql
@@ -0,0 +1,7 @@
+lib/cmake/Qt6Sql/Qt6QPSQLDriverPluginAdditionalTargetInfo.cmake
+lib/cmake/Qt6Sql/Qt6QPSQLDriverPluginConfig.cmake
+lib/cmake/Qt6Sql/Qt6QPSQLDriverPluginConfigVersion.cmake
+lib/cmake/Qt6Sql/Qt6QPSQLDriverPluginConfigVersionImpl.cmake
+lib/cmake/Qt6Sql/Qt6QPSQLDriverPluginTargets-%%CMAKE_BUILD_TYPE%%.cmake
+lib/cmake/Qt6Sql/Qt6QPSQLDriverPluginTargets.cmake
+%%QT_PLUGINDIR%%/sqldrivers/libqsqlpsql.so
diff --git a/databases/qt6-base_sqldriver/pkg-plist.sqlite b/databases/qt6-base_sqldriver/pkg-plist.sqlite
new file mode 100644
index 000000000000..f7250cec0756
--- /dev/null
+++ b/databases/qt6-base_sqldriver/pkg-plist.sqlite
@@ -0,0 +1,7 @@
+lib/cmake/Qt6Sql/Qt6QSQLiteDriverPluginAdditionalTargetInfo.cmake
+lib/cmake/Qt6Sql/Qt6QSQLiteDriverPluginConfig.cmake
+lib/cmake/Qt6Sql/Qt6QSQLiteDriverPluginConfigVersion.cmake
+lib/cmake/Qt6Sql/Qt6QSQLiteDriverPluginConfigVersionImpl.cmake
+lib/cmake/Qt6Sql/Qt6QSQLiteDriverPluginTargets-%%CMAKE_BUILD_TYPE%%.cmake
+lib/cmake/Qt6Sql/Qt6QSQLiteDriverPluginTargets.cmake
+%%QT_PLUGINDIR%%/sqldrivers/libqsqlite.so
diff --git a/databases/quake/Makefile b/databases/quake/Makefile
new file mode 100644
index 000000000000..ac660a8f6869
--- /dev/null
+++ b/databases/quake/Makefile
@@ -0,0 +1,454 @@
+PORTNAME=	quake
+DISTVERSIONPREFIX=	v
+DISTVERSION=	0.5.1-57
+DISTVERSIONSUFFIX=	-gbb8ae55
+PORTREVISION=	2
+CATEGORIES=	databases
+PKGNAMESUFFIX=	-framework
+
+MAINTAINER=	yuri@FreeBSD.org
+COMMENT=	Quake is a knowledge management meta-framework for geeks
+WWW=		https://github.com/phodal/quake
+
+LICENSE=	MIT
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
+USES=		cargo
+
+USE_GITHUB=	yes
+GH_ACCOUNT=	phodal
+
+CARGO_CRATES=	adler-1.0.2 \
+		adobe-cmap-parser-0.3.3 \
+		aead-0.5.1 \
+		aes-0.7.5 \
+		aes-0.8.2 \
+		aes-gcm-0.10.1 \
+		ahash-0.7.6 \
+		aho-corasick-0.7.20 \
+		android_system_properties-0.1.5 \
+		anstream-0.3.2 \
+		anstyle-1.0.0 \
+		anstyle-parse-0.2.0 \
+		anstyle-query-1.0.0 \
+		anstyle-wincon-1.0.1 \
+		async-attributes-1.1.2 \
+		async-channel-1.8.0 \
+		async-executor-1.5.0 \
+		async-global-executor-2.3.1 \
+		async-io-1.12.0 \
+		async-lock-2.6.0 \
+		async-std-1.12.0 \
+		async-stream-0.3.3 \
+		async-stream-impl-0.3.3 \
+		async-task-4.3.0 \
+		async-trait-0.1.59 \
+		atomic-0.5.1 \
+		atomic-waker-1.0.0 \
+		atty-0.2.14 \
+		autocfg-1.1.0 \
+		base-x-0.2.11 \
+		base64-0.13.1 \
+		base64ct-1.5.3 \
+		binascii-0.1.4 \
+		bincode-1.3.3 \
+		bit-set-0.5.3 \
+		bit-vec-0.6.3 \
+		bitflags-1.3.2 \
+		block-buffer-0.10.3 \
+		blocking-1.3.0 \
+		bstr-0.2.17 \
+		bumpalo-3.11.1 \
+		bytecount-0.6.3 \
+		byteorder-1.4.3 \
+		bytes-1.3.0 \
+		bzip2-0.4.3 \
+		bzip2-sys-0.1.11+1.0.8 \
+		cassowary-0.3.0 \
+		cc-1.0.77 \
+		cesu8-1.1.0 \
+		cfg-if-1.0.0 \
+		chrono-0.4.23 \
+		cipher-0.3.0 \
+		cipher-0.4.3 \
+		clap-4.3.3 \
+		clap_builder-4.3.3 \
+		clap_derive-4.3.2 \
+		clap_lex-0.5.0 \
+		codespan-reporting-0.11.1 \
+		colorchoice-1.0.0 \
+		combine-4.6.6 \
+		comfy-table-6.1.3 \
+		concurrent-queue-2.0.0 \
+		config-0.13.3 \
+		const_fn-0.4.9 \
+		constant_time_eq-0.1.5 \
+		cookie-0.16.1 \
+		core-foundation-0.9.3 \
+		core-foundation-sys-0.8.3 \
+		cpufeatures-0.2.5 \
+		crc32fast-1.3.2 \
+		crossbeam-channel-0.5.6 \
+		crossbeam-utils-0.8.14 \
+		crossterm-0.20.0 \
+		crossterm-0.22.1 \
+		crossterm-0.25.0 \
+		crossterm_winapi-0.8.0 \
+		crossterm_winapi-0.9.0 \
+		crypto-common-0.1.6 \
+		csv-1.1.6 \
+		csv-core-0.1.10 \
+		ctor-0.1.26 \
+		ctr-0.9.2 \
+		cty-0.2.2 \
+		cxx-1.0.83 \
+		cxx-build-1.0.83 \
+		cxxbridge-flags-1.0.83 \
+		cxxbridge-macro-1.0.83 \
+		devise-0.3.1 \
+		devise_codegen-0.3.1 \
+		devise_core-0.3.1 \
+		digest-0.10.6 \
+		discard-1.0.4 \
+		dlv-list-0.3.0 \
+		dtoa-0.4.8 \
+		either-1.8.0 \
+		encoding-0.2.33 \
+		encoding-index-japanese-1.20141219.5 \
+		encoding-index-korean-1.20141219.5 \
+		encoding-index-simpchinese-1.20141219.5 \
+		encoding-index-singlebyte-1.20141219.5 \
+		encoding-index-tradchinese-1.20141219.5 \
+		encoding_index_tests-0.1.4 \
+		encoding_rs-0.8.31 \
+		encoding_rs_io-0.1.7 \
+		errno-0.3.1 \
+		errno-dragonfly-0.1.2 \
+		euclid-0.20.14 \
+		event-listener-2.5.3 \
+		fallible-iterator-0.2.0 \
+		fallible-streaming-iterator-0.1.9 \
+		fancy-regex-0.7.1 \
+		fastrand-1.8.0 \
+		figment-0.10.8 \
+		filetime-0.2.18 \
+		flate2-1.0.25 \
+		fnv-1.0.7 \
+		foreign-types-0.3.2 \
+		foreign-types-shared-0.1.1 \
+		form_urlencoded-1.1.0 \
+		fsevent-sys-4.1.0 \
+		futures-0.3.25 \
+		futures-channel-0.3.25 \
+		futures-core-0.3.25 \
+		futures-executor-0.3.25 \
+		futures-io-0.3.25 \
+		futures-lite-1.12.0 \
+		futures-macro-0.3.25 \
+		futures-sink-0.3.25 \
+		futures-task-0.3.25 \
+		futures-util-0.3.25 \
+		generator-0.7.1 \
+		generic-array-0.14.6 \
+		getopts-0.2.21 \
+		getrandom-0.2.8 \
+		ghash-0.5.0 \
+		glob-0.3.0 \
+		gloo-timers-0.2.5 \
+		grep-matcher-0.1.5 \
+		grep-regex-0.1.10 \
+		grep-searcher-0.1.10 \
+		h2-0.3.15 \
+		hashbrown-0.11.2 \
+		hashbrown-0.12.3 \
+		hashlink-0.7.0 \
+		heck-0.4.0 \
+		hermit-abi-0.1.19 \
+		hermit-abi-0.3.1 \
+		hkdf-0.12.3 \
+		hmac-0.12.1 \
+		http-0.2.8 \
+		http-body-0.4.5 \
+		httparse-1.8.0 \
+		httpdate-1.0.2 \
+		hyper-0.14.23 \
+		hyper-tls-0.5.0 \
+		iana-time-zone-0.1.53 \
+		iana-time-zone-haiku-0.1.1 \
+		idna-0.3.0 \
+		indexmap-1.9.2 \
+		inlinable_string-0.1.15 \
+		inotify-0.9.6 \
+		inotify-sys-0.1.5 \
+		inout-0.1.3 \
+		instant-0.1.12 \
+		io-lifetimes-1.0.11 \
+		ipnet-2.5.1 \
+		is-terminal-0.4.7 \
+		itoa-0.4.8 \
+		itoa-1.0.4 \
+		jni-0.20.0 \
+		jni-sys-0.3.0 \
+		jobserver-0.1.25 \
+		js-sys-0.3.60 \
+		json-0.12.4 \
+		json5-0.4.1 \
+		kqueue-1.0.7 \
+		kqueue-sys-1.0.3 \
+		kv-log-macro-1.0.7 \
+		lazy_static-1.4.0 \
+		libc-0.2.146 \
+		libsqlite3-sys-0.22.2 \
+		line-wrap-0.1.1 \
+		link-cplusplus-1.0.7 \
+		linked-hash-map-0.5.3 \
+		linux-raw-sys-0.3.8 \
+		lock_api-0.4.9 \
+		log-0.4.17 \
+		loom-0.5.6 \
+		lopdf-0.26.0 \
+		lzw-0.10.0 \
+		malloc_buf-0.0.6 \
+		matchers-0.1.0 \
+		memchr-2.5.0 \
+		memmap2-0.5.8 \
+		mime-0.3.16 \
+		minimal-lexical-0.2.1 \
+		miniz_oxide-0.6.2 \
+		mio-0.7.14 \
+		mio-0.8.5 \
+		miow-0.3.7 \
+		multer-2.0.4 \
+		native-tls-0.2.11 \
+		ndk-context-0.1.1 \
+		nom-7.1.1 \
+		notify-5.0.0 \
+		ntapi-0.3.7 \
+		nu-ansi-term-0.46.0 \
+		num-integer-0.1.45 \
+		num-traits-0.2.15 \
+		num_cpus-1.14.0 \
+		objc-0.2.7 \
+		once_cell-1.16.0 \
+		opaque-debug-0.3.0 \
+		openssl-0.10.44 \
+		openssl-macros-0.1.0 \
+		openssl-probe-0.1.5 \
+		openssl-sys-0.9.79 \
+		ordered-multimap-0.4.3 \
+		overload-0.1.1 \
+		parking-2.0.0 \
+		parking_lot-0.11.2 \
+		parking_lot-0.12.1 \
+		parking_lot_core-0.8.5 \
+		parking_lot_core-0.9.5 \
+		password-hash-0.4.2 \
+		pathdiff-0.2.1 \
+		pbkdf2-0.11.0 \
+		pdf-extract-0.6.4 \
+		pear-0.2.3 \
+		pear_codegen-0.2.3 \
+		percent-encoding-2.2.0 \
+		pest-2.5.1 \
+		pest_derive-2.5.1 \
+		pest_generator-2.5.1 \
+		pest_meta-2.5.1 \
+		pin-project-lite-0.2.9 \
+		pin-utils-0.1.0 \
+		pkg-config-0.3.26 \
+		plist-1.3.1 \
+		polling-2.5.1 \
+		polyval-0.6.0 \
+		pom-1.1.0 \
+		pom-3.2.0 \
+		postscript-0.14.1 \
+		ppv-lite86-0.2.17 \
+		proc-macro-hack-0.5.19 \
+		proc-macro2-1.0.60 \
+		proc-macro2-diagnostics-0.9.1 \
+		pulldown-cmark-0.8.0 \
+		pulldown-cmark-to-cmark-7.1.1 \
+		quake_microsoft_todo-0.1.1 \
+		quote-1.0.28 \
+		rand-0.8.5 \
+		rand_chacha-0.3.1 \
+		rand_core-0.6.4 \
+		raw-window-handle-0.5.0 \
+		redox_syscall-0.2.16 \
+		ref-cast-1.0.13 \
+		ref-cast-impl-1.0.13 \
+		regex-1.7.0 \
+		regex-automata-0.1.10 \
+		regex-syntax-0.6.28 \
+		remove_dir_all-0.5.3 \
+		reqwest-0.11.13 \
+		rocket-0.5.0-rc.2 \
+		rocket-multipart-form-data-0.10.5 \
+		rocket_codegen-0.5.0-rc.2 \
+		rocket_http-0.5.0-rc.2 \
+		ron-0.7.1 \
+		rstest-0.12.0 \
+		rusqlite-0.25.4 \
+		rust-ini-0.18.0 \
+		rustc_version-0.2.3 \
+		rustc_version-0.4.0 \
+		rustix-0.37.20 \
+		rustversion-1.0.9 \
+		ryu-1.0.11 \
+		safemem-0.3.3 \
+		same-file-1.0.6 \
+		schannel-0.1.20 \
+		scoped-tls-1.0.1 \
+		scopeguard-1.1.0 \
+		scratch-1.0.2 \
+		security-framework-2.7.0 \
+		security-framework-sys-2.6.1 \
+		semver-0.9.0 \
+		semver-1.0.14 \
+		semver-parser-0.7.0 \
+		serde-1.0.149 \
+		serde_derive-1.0.149 \
+		serde_json-1.0.89 \
+		serde_urlencoded-0.7.1 \
+		serde_yaml-0.8.26 \
+		serde_yaml-0.9.14 \
+		sha1-0.6.1 \
+		sha1-0.10.5 \
+		sha1_smol-1.0.0 \
+		sha2-0.10.6 \
+		sharded-slab-0.1.4 \
+		signal-hook-0.3.14 \
+		signal-hook-mio-0.2.3 \
+		signal-hook-registry-1.4.0 \
+		slab-0.4.7 \
+		smallvec-1.10.0 \
+		socket2-0.4.7 \
+		spin-0.9.4 \
+		stable-pattern-0.1.0 \
+		standback-0.2.17 \
+		state-0.5.3 \
+		stdweb-0.4.20 \
+		stdweb-derive-0.5.3 \
+		stdweb-internal-macros-0.2.9 \
+		stdweb-internal-runtime-0.1.5 \
+		strsim-0.10.0 \
+		strum-0.24.1 \
+		strum_macros-0.24.3 \
+		subtle-2.4.1 \
+		syn-1.0.105 \
+		syn-2.0.18 \
+		syntect-5.0.0 \
+		tempfile-3.3.0 \
+		termcolor-1.1.3 \
+		thiserror-1.0.37 \
+		thiserror-impl-1.0.37 \
+		thread_local-1.1.4 \
+		time-0.1.45 \
+		time-0.2.27 \
+		time-0.3.17 \
+		time-core-0.1.0 \
+		time-macros-0.1.1 \
+		time-macros-0.2.6 \
+		time-macros-impl-0.1.2 \
+		tinyvec-1.6.0 \
+		tinyvec_macros-0.1.0 \
+		tokio-1.23.0 \
+		tokio-macros-1.8.2 \
+		tokio-native-tls-0.3.0 \
+		tokio-stream-0.1.11 \
+		tokio-util-0.7.4 \
+		toml-0.5.9 \
+		tower-service-0.3.2 \
+		tracing-0.1.37 \
+		tracing-attributes-0.1.23 \
+		tracing-core-0.1.30 \
+		tracing-log-0.1.3 \
+		tracing-subscriber-0.3.16 \
+		try-lock-0.2.3 \
+		tui-0.16.0 \
+		type1-encoding-parser-0.1.0 \
+		typenum-1.16.0 \
+		ubyte-0.10.3 \
+		ucd-trie-0.1.5 \
+		uncased-0.9.7 \
+		unicase-2.6.0 \
+		unicode-bidi-0.3.8 \
+		unicode-ident-1.0.5 \
+		unicode-normalization-0.1.22 \
+		unicode-segmentation-1.10.0 \
+		unicode-width-0.1.10 \
+		unicode-xid-0.2.4 \
+		universal-hash-0.5.0 \
+		unsafe-libyaml-0.2.4 \
+		url-2.3.1 \
+		utf8parse-0.2.1 \
+		valuable-0.1.0 \
+		value-bag-1.0.0-alpha.9 \
+		vcpkg-0.2.15 \
+		version_check-0.9.4 \
+		waker-fn-1.1.0 \
+		walkdir-2.3.2 \
+		want-0.3.0 \
+		wasi-0.10.0+wasi-snapshot-preview1 \
+		wasi-0.11.0+wasi-snapshot-preview1 \
+		wasm-bindgen-0.2.83 \
+		wasm-bindgen-backend-0.2.83 \
+		wasm-bindgen-futures-0.4.33 \
+		wasm-bindgen-macro-0.2.83 \
+		wasm-bindgen-macro-support-0.2.83 \
+		wasm-bindgen-shared-0.2.83 \
+		web-sys-0.3.60 \
+		webbrowser-0.8.2 \
+		wepoll-ffi-0.1.2 \
+		widestring-1.0.2 \
+		winapi-0.3.9 \
+		winapi-i686-pc-windows-gnu-0.4.0 \
+		winapi-util-0.1.5 \
+		winapi-x86_64-pc-windows-gnu-0.4.0 \
+		windows-0.32.0 \
+		windows-sys-0.36.1 \
+		windows-sys-0.42.0 \
+		windows-sys-0.48.0 \
+		windows-targets-0.48.0 \
+		windows_aarch64_gnullvm-0.42.0 \
+		windows_aarch64_gnullvm-0.48.0 \
+		windows_aarch64_msvc-0.32.0 \
+		windows_aarch64_msvc-0.36.1 \
+		windows_aarch64_msvc-0.42.0 \
+		windows_aarch64_msvc-0.48.0 \
+		windows_i686_gnu-0.32.0 \
+		windows_i686_gnu-0.36.1 \
+		windows_i686_gnu-0.42.0 \
+		windows_i686_gnu-0.48.0 \
+		windows_i686_msvc-0.32.0 \
+		windows_i686_msvc-0.36.1 \
+		windows_i686_msvc-0.42.0 \
+		windows_i686_msvc-0.48.0 \
+		windows_x86_64_gnu-0.32.0 \
+		windows_x86_64_gnu-0.36.1 \
+		windows_x86_64_gnu-0.42.0 \
+		windows_x86_64_gnu-0.48.0 \
+		windows_x86_64_gnullvm-0.42.0 \
+		windows_x86_64_gnullvm-0.48.0 \
+		windows_x86_64_msvc-0.32.0 \
+		windows_x86_64_msvc-0.36.1 \
+		windows_x86_64_msvc-0.42.0 \
+		windows_x86_64_msvc-0.48.0 \
+		winreg-0.10.1 \
+		xml-rs-0.8.4 \
+		yaml-rust-0.4.5 \
+		yansi-0.5.1 \
+		zip-0.6.3 \
+		zstd-0.11.2+zstd.1.5.2 \
+		zstd-safe-5.0.2+zstd.1.5.2 \
+		zstd-sys-2.0.4+zstd.1.5.2
+
+OPENSSLINC=	/usr/include
+OPENSSLLIB=	/usr/lib
+
+PLIST_FILES=	bin/${PORTNAME}
+
+post-install:
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
+
+.include <bsd.port.mk>
diff --git a/databases/quake/distinfo b/databases/quake/distinfo
new file mode 100644
index 000000000000..42567765750d
--- /dev/null
+++ b/databases/quake/distinfo
@@ -0,0 +1,851 @@
+TIMESTAMP = 1705767689
+SHA256 (rust/crates/adler-1.0.2.crate) = f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe
+SIZE (rust/crates/adler-1.0.2.crate) = 12778
+SHA256 (rust/crates/adobe-cmap-parser-0.3.3.crate) = c3aaf5066d68c8ec9656cfd3a96bc9de83d4883f183d6c6b8d742e36a4819dda
+SIZE (rust/crates/adobe-cmap-parser-0.3.3.crate) = 3268
+SHA256 (rust/crates/aead-0.5.1.crate) = 5c192eb8f11fc081b0fe4259ba5af04217d4e0faddd02417310a927911abd7c8
+SIZE (rust/crates/aead-0.5.1.crate) = 15474
+SHA256 (rust/crates/aes-0.7.5.crate) = 9e8b47f52ea9bae42228d07ec09eb676433d7c4ed1ebdf0f1d1c29ed446f1ab8
+SIZE (rust/crates/aes-0.7.5.crate) = 128544
+SHA256 (rust/crates/aes-0.8.2.crate) = 433cfd6710c9986c576a25ca913c39d66a6474107b406f34f91d4a8923395241
+SIZE (rust/crates/aes-0.8.2.crate) = 124158
+SHA256 (rust/crates/aes-gcm-0.10.1.crate) = 82e1366e0c69c9f927b1fa5ce2c7bf9eafc8f9268c0b9800729e8b267612447c
+SIZE (rust/crates/aes-gcm-0.10.1.crate) = 148410
+SHA256 (rust/crates/ahash-0.7.6.crate) = fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47
+SIZE (rust/crates/ahash-0.7.6.crate) = 38030
+SHA256 (rust/crates/aho-corasick-0.7.20.crate) = cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac
+SIZE (rust/crates/aho-corasick-0.7.20.crate) = 111440
+SHA256 (rust/crates/android_system_properties-0.1.5.crate) = 819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311
+SIZE (rust/crates/android_system_properties-0.1.5.crate) = 5243
+SHA256 (rust/crates/anstream-0.3.2.crate) = 0ca84f3628370c59db74ee214b3263d58f9aadd9b4fe7e711fd87dc452b7f163
+SIZE (rust/crates/anstream-0.3.2.crate) = 19504
+SHA256 (rust/crates/anstyle-1.0.0.crate) = 41ed9a86bf92ae6580e0a31281f65a1b1d867c0cc68d5346e2ae128dddfa6a7d
+SIZE (rust/crates/anstyle-1.0.0.crate) = 13972
+SHA256 (rust/crates/anstyle-parse-0.2.0.crate) = e765fd216e48e067936442276d1d57399e37bce53c264d6fefbe298080cb57ee
+SIZE (rust/crates/anstyle-parse-0.2.0.crate) = 24361
+SHA256 (rust/crates/anstyle-query-1.0.0.crate) = 5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b
+SIZE (rust/crates/anstyle-query-1.0.0.crate) = 8620
+SHA256 (rust/crates/anstyle-wincon-1.0.1.crate) = 180abfa45703aebe0093f79badacc01b8fd4ea2e35118747e5811127f926e188
+SIZE (rust/crates/anstyle-wincon-1.0.1.crate) = 11718
+SHA256 (rust/crates/async-attributes-1.1.2.crate) = a3203e79f4dd9bdda415ed03cf14dae5a2bf775c683a00f94e9cd1faf0f596e5
+SIZE (rust/crates/async-attributes-1.1.2.crate) = 11431
+SHA256 (rust/crates/async-channel-1.8.0.crate) = cf46fee83e5ccffc220104713af3292ff9bc7c64c7de289f66dae8e38d826833
+SIZE (rust/crates/async-channel-1.8.0.crate) = 13534
+SHA256 (rust/crates/async-executor-1.5.0.crate) = 17adb73da160dfb475c183343c8cccd80721ea5a605d3eb57125f0a7b7a92d0b
+SIZE (rust/crates/async-executor-1.5.0.crate) = 15068
+SHA256 (rust/crates/async-global-executor-2.3.1.crate) = f1b6f5d7df27bd294849f8eec66ecfc63d11814df7a4f5d74168a2394467b776
+SIZE (rust/crates/async-global-executor-2.3.1.crate) = 11790
+SHA256 (rust/crates/async-io-1.12.0.crate) = 8c374dda1ed3e7d8f0d9ba58715f924862c63eae6849c92d3a18e7fbde9e2794
+SIZE (rust/crates/async-io-1.12.0.crate) = 37087
+SHA256 (rust/crates/async-lock-2.6.0.crate) = c8101efe8695a6c17e02911402145357e718ac92d3ff88ae8419e84b1707b685
+SIZE (rust/crates/async-lock-2.6.0.crate) = 20497
+SHA256 (rust/crates/async-std-1.12.0.crate) = 62565bb4402e926b29953c785397c6dc0391b7b446e45008b0049eb43cec6f5d
+SIZE (rust/crates/async-std-1.12.0.crate) = 215080
+SHA256 (rust/crates/async-stream-0.3.3.crate) = dad5c83079eae9969be7fadefe640a1c566901f05ff91ab221de4b6f68d9507e
+SIZE (rust/crates/async-stream-0.3.3.crate) = 12142
+SHA256 (rust/crates/async-stream-impl-0.3.3.crate) = 10f203db73a71dfa2fb6dd22763990fa26f3d2625a6da2da900d23b87d26be27
+SIZE (rust/crates/async-stream-impl-0.3.3.crate) = 4072
+SHA256 (rust/crates/async-task-4.3.0.crate) = 7a40729d2133846d9ed0ea60a8b9541bccddab49cd30f0715a1da672fe9a2524
+SIZE (rust/crates/async-task-4.3.0.crate) = 29544
+SHA256 (rust/crates/async-trait-0.1.59.crate) = 31e6e93155431f3931513b243d371981bb2770112b370c82745a1d19d2f99364
+SIZE (rust/crates/async-trait-0.1.59.crate) = 27349
+SHA256 (rust/crates/atomic-0.5.1.crate) = b88d82667eca772c4aa12f0f1348b3ae643424c8876448f3f7bd5787032e234c
+SIZE (rust/crates/atomic-0.5.1.crate) = 12817
+SHA256 (rust/crates/atomic-waker-1.0.0.crate) = 065374052e7df7ee4047b1160cca5e1467a12351a40b3da123c870ba0b8eda2a
+SIZE (rust/crates/atomic-waker-1.0.0.crate) = 11771
+SHA256 (rust/crates/atty-0.2.14.crate) = d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8
+SIZE (rust/crates/atty-0.2.14.crate) = 5470
+SHA256 (rust/crates/autocfg-1.1.0.crate) = d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa
+SIZE (rust/crates/autocfg-1.1.0.crate) = 13272
+SHA256 (rust/crates/base-x-0.2.11.crate) = 4cbbc9d0964165b47557570cce6c952866c2678457aca742aafc9fb771d30270
+SIZE (rust/crates/base-x-0.2.11.crate) = 10755
+SHA256 (rust/crates/base64-0.13.1.crate) = 9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8
+SIZE (rust/crates/base64-0.13.1.crate) = 61002
+SHA256 (rust/crates/base64ct-1.5.3.crate) = b645a089122eccb6111b4f81cbc1a49f5900ac4666bb93ac027feaecf15607bf
+SIZE (rust/crates/base64ct-1.5.3.crate) = 28781
+SHA256 (rust/crates/binascii-0.1.4.crate) = 383d29d513d8764dcdc42ea295d979eb99c3c9f00607b3692cf68a431f7dca72
+SIZE (rust/crates/binascii-0.1.4.crate) = 6076
+SHA256 (rust/crates/bincode-1.3.3.crate) = b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad
+SIZE (rust/crates/bincode-1.3.3.crate) = 28958
+SHA256 (rust/crates/bit-set-0.5.3.crate) = 0700ddab506f33b20a03b13996eccd309a48e5ff77d0d95926aa0210fb4e95f1
+SIZE (rust/crates/bit-set-0.5.3.crate) = 14470
+SHA256 (rust/crates/bit-vec-0.6.3.crate) = 349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb
+SIZE (rust/crates/bit-vec-0.6.3.crate) = 19927
+SHA256 (rust/crates/bitflags-1.3.2.crate) = bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a
+SIZE (rust/crates/bitflags-1.3.2.crate) = 23021
+SHA256 (rust/crates/block-buffer-0.10.3.crate) = 69cce20737498f97b993470a6e536b8523f0af7892a4f928cceb1ac5e52ebe7e
+SIZE (rust/crates/block-buffer-0.10.3.crate) = 10465
+SHA256 (rust/crates/blocking-1.3.0.crate) = 3c67b173a56acffd6d2326fb7ab938ba0b00a71480e14902b2591c87bc5741e8
+SIZE (rust/crates/blocking-1.3.0.crate) = 18687
+SHA256 (rust/crates/bstr-0.2.17.crate) = ba3569f383e8f1598449f1a423e72e99569137b47740b1da11ef19af3d5c3223
+SIZE (rust/crates/bstr-0.2.17.crate) = 330350
+SHA256 (rust/crates/bumpalo-3.11.1.crate) = 572f695136211188308f16ad2ca5c851a712c464060ae6974944458eb83880ba
+SIZE (rust/crates/bumpalo-3.11.1.crate) = 81207
+SHA256 (rust/crates/bytecount-0.6.3.crate) = 2c676a478f63e9fa2dd5368a42f28bba0d6c560b775f38583c8bbaa7fcd67c9c
+SIZE (rust/crates/bytecount-0.6.3.crate) = 12416
+SHA256 (rust/crates/byteorder-1.4.3.crate) = 14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610
+SIZE (rust/crates/byteorder-1.4.3.crate) = 22512
+SHA256 (rust/crates/bytes-1.3.0.crate) = dfb24e866b15a1af2a1b663f10c6b6b8f397a84aadb828f12e5b289ec23a3a3c
+SIZE (rust/crates/bytes-1.3.0.crate) = 57563
+SHA256 (rust/crates/bzip2-0.4.3.crate) = 6afcd980b5f3a45017c57e57a2fcccbb351cc43a356ce117ef760ef8052b89b0
+SIZE (rust/crates/bzip2-0.4.3.crate) = 34195
+SHA256 (rust/crates/bzip2-sys-0.1.11+1.0.8.crate) = 736a955f3fa7875102d57c82b8cac37ec45224a07fd32d58f9f7a186b6cd4cdc
+SIZE (rust/crates/bzip2-sys-0.1.11+1.0.8.crate) = 633444
+SHA256 (rust/crates/cassowary-0.3.0.crate) = df8670b8c7b9dae1793364eafadf7239c40d669904660c5960d74cfd80b46a53
+SIZE (rust/crates/cassowary-0.3.0.crate) = 22876
+SHA256 (rust/crates/cc-1.0.77.crate) = e9f73505338f7d905b19d18738976aae232eb46b8efc15554ffc56deb5d9ebe4
+SIZE (rust/crates/cc-1.0.77.crate) = 60723
+SHA256 (rust/crates/cesu8-1.1.0.crate) = 6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c
+SIZE (rust/crates/cesu8-1.1.0.crate) = 10555
+SHA256 (rust/crates/cfg-if-1.0.0.crate) = baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd
+SIZE (rust/crates/cfg-if-1.0.0.crate) = 7934
+SHA256 (rust/crates/chrono-0.4.23.crate) = 16b0a3d9ed01224b22057780a37bb8c5dbfe1be8ba48678e7bf57ec4b385411f
+SIZE (rust/crates/chrono-0.4.23.crate) = 187259
+SHA256 (rust/crates/cipher-0.3.0.crate) = 7ee52072ec15386f770805afd189a01c8841be8696bed250fa2f13c4c0d6dfb7
+SIZE (rust/crates/cipher-0.3.0.crate) = 12756
+SHA256 (rust/crates/cipher-0.4.3.crate) = d1873270f8f7942c191139cb8a40fd228da6c3fd2fc376d7e92d47aa14aeb59e
+SIZE (rust/crates/cipher-0.4.3.crate) = 19206
+SHA256 (rust/crates/clap-4.3.3.crate) = ca8f255e4b8027970e78db75e78831229c9815fdbfa67eb1a1b777a62e24b4a0
+SIZE (rust/crates/clap-4.3.3.crate) = 54235
+SHA256 (rust/crates/clap_builder-4.3.3.crate) = acd4f3c17c83b0ba34ffbc4f8bbd74f079413f747f84a6f89292f138057e36ab
+SIZE (rust/crates/clap_builder-4.3.3.crate) = 162393
+SHA256 (rust/crates/clap_derive-4.3.2.crate) = b8cd2b2a819ad6eec39e8f1d6b53001af1e5469f8c177579cdaeb313115b825f
+SIZE (rust/crates/clap_derive-4.3.2.crate) = 29053
+SHA256 (rust/crates/clap_lex-0.5.0.crate) = 2da6da31387c7e4ef160ffab6d5e7f00c42626fe39aea70a7b0f1773f7dd6c1b
+SIZE (rust/crates/clap_lex-0.5.0.crate) = 11792
+SHA256 (rust/crates/codespan-reporting-0.11.1.crate) = 3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e
+SIZE (rust/crates/codespan-reporting-0.11.1.crate) = 48963
+SHA256 (rust/crates/colorchoice-1.0.0.crate) = acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7
+SIZE (rust/crates/colorchoice-1.0.0.crate) = 6857
+SHA256 (rust/crates/combine-4.6.6.crate) = 35ed6e9d84f0b51a7f52daf1c7d71dd136fd7a3f41a8462b8cdb8c78d920fad4
+SIZE (rust/crates/combine-4.6.6.crate) = 132428
+SHA256 (rust/crates/comfy-table-6.1.3.crate) = e621e7e86c46fd8a14c32c6ae3cb95656621b4743a27d0cffedb831d46e7ad21
+SIZE (rust/crates/comfy-table-6.1.3.crate) = 61810
+SHA256 (rust/crates/concurrent-queue-2.0.0.crate) = bd7bef69dc86e3c610e4e7aed41035e2a7ed12e72dd7530f61327a6579a4390b
+SIZE (rust/crates/concurrent-queue-2.0.0.crate) = 19465
+SHA256 (rust/crates/config-0.13.3.crate) = d379af7f68bfc21714c6c7dea883544201741d2ce8274bb12fa54f89507f52a7
+SIZE (rust/crates/config-0.13.3.crate) = 67180
+SHA256 (rust/crates/const_fn-0.4.9.crate) = fbdcdcb6d86f71c5e97409ad45898af11cbc995b4ee8112d59095a28d376c935
+SIZE (rust/crates/const_fn-0.4.9.crate) = 12624
+SHA256 (rust/crates/constant_time_eq-0.1.5.crate) = 245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc
+SIZE (rust/crates/constant_time_eq-0.1.5.crate) = 4936
+SHA256 (rust/crates/cookie-0.16.1.crate) = 344adc371239ef32293cb1c4fe519592fcf21206c79c02854320afcdf3ab4917
+SIZE (rust/crates/cookie-0.16.1.crate) = 34602
+SHA256 (rust/crates/core-foundation-0.9.3.crate) = 194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146
+SIZE (rust/crates/core-foundation-0.9.3.crate) = 27059
+SHA256 (rust/crates/core-foundation-sys-0.8.3.crate) = 5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc
+SIZE (rust/crates/core-foundation-sys-0.8.3.crate) = 17519
+SHA256 (rust/crates/cpufeatures-0.2.5.crate) = 28d997bd5e24a5928dd43e46dc529867e207907fe0b239c3477d924f7f2ca320
+SIZE (rust/crates/cpufeatures-0.2.5.crate) = 11251
+SHA256 (rust/crates/crc32fast-1.3.2.crate) = b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d
+SIZE (rust/crates/crc32fast-1.3.2.crate) = 38661
+SHA256 (rust/crates/crossbeam-channel-0.5.6.crate) = c2dd04ddaf88237dc3b8d8f9a3c1004b506b54b3313403944054d23c0870c521
+SIZE (rust/crates/crossbeam-channel-0.5.6.crate) = 90292
+SHA256 (rust/crates/crossbeam-utils-0.8.14.crate) = 4fb766fa798726286dbbb842f174001dab8abc7b627a1dd86e0b7222a95d929f
+SIZE (rust/crates/crossbeam-utils-0.8.14.crate) = 42127
+SHA256 (rust/crates/crossterm-0.20.0.crate) = c0ebde6a9dd5e331cd6c6f48253254d117642c31653baa475e394657c59c1f7d
+SIZE (rust/crates/crossterm-0.20.0.crate) = 103025
+SHA256 (rust/crates/crossterm-0.22.1.crate) = c85525306c4291d1b73ce93c8acf9c339f9b213aef6c1d85c3830cbf1c16325c
+SIZE (rust/crates/crossterm-0.22.1.crate) = 105450
+SHA256 (rust/crates/crossterm-0.25.0.crate) = e64e6c0fbe2c17357405f7c758c1ef960fce08bdfb2c03d88d2a18d7e09c4b67
+SIZE (rust/crates/crossterm-0.25.0.crate) = 116533
+SHA256 (rust/crates/crossterm_winapi-0.8.0.crate) = 3a6966607622438301997d3dac0d2f6e9a90c68bb6bc1785ea98456ab93c0507
+SIZE (rust/crates/crossterm_winapi-0.8.0.crate) = 15531
+SHA256 (rust/crates/crossterm_winapi-0.9.0.crate) = 2ae1b35a484aa10e07fe0638d02301c5ad24de82d310ccbd2f3693da5f09bf1c
+SIZE (rust/crates/crossterm_winapi-0.9.0.crate) = 15561
+SHA256 (rust/crates/crypto-common-0.1.6.crate) = 1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3
+SIZE (rust/crates/crypto-common-0.1.6.crate) = 8760
+SHA256 (rust/crates/csv-1.1.6.crate) = 22813a6dc45b335f9bade10bf7271dc477e81113e89eb251a0bc2a8a81c536e1
+SIZE (rust/crates/csv-1.1.6.crate) = 886999
+SHA256 (rust/crates/csv-core-0.1.10.crate) = 2b2466559f260f48ad25fe6317b3c8dac77b5bdb5763ac7d9d6103530663bc90
+SIZE (rust/crates/csv-core-0.1.10.crate) = 25668
+SHA256 (rust/crates/ctor-0.1.26.crate) = 6d2301688392eb071b0bf1a37be05c469d3cc4dbbd95df672fe28ab021e6a096
+SIZE (rust/crates/ctor-0.1.26.crate) = 10803
+SHA256 (rust/crates/ctr-0.9.2.crate) = 0369ee1ad671834580515889b80f2ea915f23b8be8d0daa4bbaf2ac5c7590835
+SIZE (rust/crates/ctr-0.9.2.crate) = 18344
+SHA256 (rust/crates/cty-0.2.2.crate) = b365fabc795046672053e29c954733ec3b05e4be654ab130fe8f1f94d7051f35
+SIZE (rust/crates/cty-0.2.2.crate) = 7230
+SHA256 (rust/crates/cxx-1.0.83.crate) = bdf07d07d6531bfcdbe9b8b739b104610c6508dcc4d63b410585faf338241daf
+SIZE (rust/crates/cxx-1.0.83.crate) = 198262
+SHA256 (rust/crates/cxx-build-1.0.83.crate) = d2eb5b96ecdc99f72657332953d4d9c50135af1bac34277801cc3937906ebd39
+SIZE (rust/crates/cxx-build-1.0.83.crate) = 84791
+SHA256 (rust/crates/cxxbridge-flags-1.0.83.crate) = ac040a39517fd1674e0f32177648334b0f4074625b5588a64519804ba0553b12
+SIZE (rust/crates/cxxbridge-flags-1.0.83.crate) = 5635
+SHA256 (rust/crates/cxxbridge-macro-1.0.83.crate) = 1362b0ddcfc4eb0a1f57b68bd77dd99f0e826958a96abd0ae9bd092e114ffed6
+SIZE (rust/crates/cxxbridge-macro-1.0.83.crate) = 59869
+SHA256 (rust/crates/devise-0.3.1.crate) = 50c7580b072f1c8476148f16e0a0d5dedddab787da98d86c5082c5e9ed8ab595
+SIZE (rust/crates/devise-0.3.1.crate) = 902
+SHA256 (rust/crates/devise_codegen-0.3.1.crate) = 123c73e7a6e51b05c75fe1a1b2f4e241399ea5740ed810b0e3e6cacd9db5e7b2
+SIZE (rust/crates/devise_codegen-0.3.1.crate) = 2222
+SHA256 (rust/crates/devise_core-0.3.1.crate) = 841ef46f4787d9097405cac4e70fb8644fc037b526e8c14054247c0263c400d0
+SIZE (rust/crates/devise_core-0.3.1.crate) = 12907
+SHA256 (rust/crates/digest-0.10.6.crate) = 8168378f4e5023e7218c89c891c0fd8ecdb5e5e4f18cb78f38cf245dd021e76f
+SIZE (rust/crates/digest-0.10.6.crate) = 19527
+SHA256 (rust/crates/discard-1.0.4.crate) = 212d0f5754cb6769937f4501cc0e67f4f4483c8d2c3e1e922ee9edbe4ab4c7c0
+SIZE (rust/crates/discard-1.0.4.crate) = 4700
+SHA256 (rust/crates/dlv-list-0.3.0.crate) = 0688c2a7f92e427f44895cd63841bff7b29f8d7a1648b9e7e07a4a365b2e1257
+SIZE (rust/crates/dlv-list-0.3.0.crate) = 11920
+SHA256 (rust/crates/dtoa-0.4.8.crate) = 56899898ce76aaf4a0f24d914c97ea6ed976d42fec6ad33fcbb0a1103e07b2b0
+SIZE (rust/crates/dtoa-0.4.8.crate) = 16175
+SHA256 (rust/crates/either-1.8.0.crate) = 90e5c1c8368803113bf0c9584fc495a58b86dc8a29edbf8fe877d21d9507e797
+SIZE (rust/crates/either-1.8.0.crate) = 15992
+SHA256 (rust/crates/encoding-0.2.33.crate) = 6b0d943856b990d12d3b55b359144ff341533e516d94098b1d3fc1ac666d36ec
+SIZE (rust/crates/encoding-0.2.33.crate) = 88798
+SHA256 (rust/crates/encoding-index-japanese-1.20141219.5.crate) = 04e8b2ff42e9a05335dbf8b5c6f7567e5591d0d916ccef4e0b1710d32a0d0c91
+SIZE (rust/crates/encoding-index-japanese-1.20141219.5.crate) = 91495
+SHA256 (rust/crates/encoding-index-korean-1.20141219.5.crate) = 4dc33fb8e6bcba213fe2f14275f0963fd16f0a02c878e3095ecfdf5bee529d81
+SIZE (rust/crates/encoding-index-korean-1.20141219.5.crate) = 103230
+SHA256 (rust/crates/encoding-index-simpchinese-1.20141219.5.crate) = d87a7194909b9118fc707194baa434a4e3b0fb6a5a757c73c3adb07aa25031f7
+SIZE (rust/crates/encoding-index-simpchinese-1.20141219.5.crate) = 130962
+SHA256 (rust/crates/encoding-index-singlebyte-1.20141219.5.crate) = 3351d5acffb224af9ca265f435b859c7c01537c0849754d3db3fdf2bfe2ae84a
+SIZE (rust/crates/encoding-index-singlebyte-1.20141219.5.crate) = 14950
+SHA256 (rust/crates/encoding-index-tradchinese-1.20141219.5.crate) = fd0e20d5688ce3cab59eb3ef3a2083a5c77bf496cb798dc6fcdb75f323890c18
+SIZE (rust/crates/encoding-index-tradchinese-1.20141219.5.crate) = 120862
+SHA256 (rust/crates/encoding_index_tests-0.1.4.crate) = a246d82be1c9d791c5dfde9a2bd045fc3cbba3fa2b11ad558f27d01712f00569
+SIZE (rust/crates/encoding_index_tests-0.1.4.crate) = 1631
+SHA256 (rust/crates/encoding_rs-0.8.31.crate) = 9852635589dc9f9ea1b6fe9f05b50ef208c85c834a562f0c6abb1c475736ec2b
+SIZE (rust/crates/encoding_rs-0.8.31.crate) = 1370113
+SHA256 (rust/crates/encoding_rs_io-0.1.7.crate) = 1cc3c5651fb62ab8aa3103998dade57efdd028544bd300516baa31840c252a83
+SIZE (rust/crates/encoding_rs_io-0.1.7.crate) = 16969
+SHA256 (rust/crates/errno-0.3.1.crate) = 4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a
+SIZE (rust/crates/errno-0.3.1.crate) = 10348
+SHA256 (rust/crates/errno-dragonfly-0.1.2.crate) = aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf
+SIZE (rust/crates/errno-dragonfly-0.1.2.crate) = 1810
+SHA256 (rust/crates/euclid-0.20.14.crate) = 2bb7ef65b3777a325d1eeefefab5b6d4959da54747e33bd6258e789640f307ad
+SIZE (rust/crates/euclid-0.20.14.crate) = 74299
+SHA256 (rust/crates/event-listener-2.5.3.crate) = 0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0
+SIZE (rust/crates/event-listener-2.5.3.crate) = 15392
+SHA256 (rust/crates/fallible-iterator-0.2.0.crate) = 4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7
+SIZE (rust/crates/fallible-iterator-0.2.0.crate) = 18509
+SHA256 (rust/crates/fallible-streaming-iterator-0.1.9.crate) = 7360491ce676a36bf9bb3c56c1aa791658183a54d2744120f27285738d90465a
+SIZE (rust/crates/fallible-streaming-iterator-0.1.9.crate) = 9249
+SHA256 (rust/crates/fancy-regex-0.7.1.crate) = 9d6b8560a05112eb52f04b00e5d3790c0dd75d9d980eb8a122fb23b92a623ccf
+SIZE (rust/crates/fancy-regex-0.7.1.crate) = 78178
+SHA256 (rust/crates/fastrand-1.8.0.crate) = a7a407cfaa3385c4ae6b23e84623d48c2798d06e3e6a1878f7f59f17b3f86499
+SIZE (rust/crates/fastrand-1.8.0.crate) = 11369
+SHA256 (rust/crates/figment-0.10.8.crate) = 4e56602b469b2201400dec66a66aec5a9b8761ee97cd1b8c96ab2483fcc16cc9
+SIZE (rust/crates/figment-0.10.8.crate) = 63390
+SHA256 (rust/crates/filetime-0.2.18.crate) = 4b9663d381d07ae25dc88dbdf27df458faa83a9b25336bcac83d5e452b5fc9d3
+SIZE (rust/crates/filetime-0.2.18.crate) = 14622
+SHA256 (rust/crates/flate2-1.0.25.crate) = a8a2db397cb1c8772f31494cb8917e48cd1e64f0fa7efac59fbd741a0a8ce841
+SIZE (rust/crates/flate2-1.0.25.crate) = 70210
+SHA256 (rust/crates/fnv-1.0.7.crate) = 3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1
+SIZE (rust/crates/fnv-1.0.7.crate) = 11266
+SHA256 (rust/crates/foreign-types-0.3.2.crate) = f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1
+SIZE (rust/crates/foreign-types-0.3.2.crate) = 7504
+SHA256 (rust/crates/foreign-types-shared-0.1.1.crate) = 00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b
+SIZE (rust/crates/foreign-types-shared-0.1.1.crate) = 5672
+SHA256 (rust/crates/form_urlencoded-1.1.0.crate) = a9c384f161156f5260c24a097c56119f9be8c798586aecc13afbcbe7b7e26bf8
+SIZE (rust/crates/form_urlencoded-1.1.0.crate) = 8734
+SHA256 (rust/crates/fsevent-sys-4.1.0.crate) = 76ee7a02da4d231650c7cea31349b889be2f45ddb3ef3032d2ec8185f6313fd2
+SIZE (rust/crates/fsevent-sys-4.1.0.crate) = 4620
+SHA256 (rust/crates/futures-0.3.25.crate) = 38390104763dc37a5145a53c29c63c1290b5d316d6086ec32c293f6736051bb0
+SIZE (rust/crates/futures-0.3.25.crate) = 51664
+SHA256 (rust/crates/futures-channel-0.3.25.crate) = 52ba265a92256105f45b719605a571ffe2d1f0fea3807304b522c1d778f79eed
+SIZE (rust/crates/futures-channel-0.3.25.crate) = 31974
+SHA256 (rust/crates/futures-core-0.3.25.crate) = 04909a7a7e4633ae6c4a9ab280aeb86da1236243a77b694a49eacd659a4bd3ac
+SIZE (rust/crates/futures-core-0.3.25.crate) = 14623
+SHA256 (rust/crates/futures-executor-0.3.25.crate) = 7acc85df6714c176ab5edf386123fafe217be88c0840ec11f199441134a074e2
+SIZE (rust/crates/futures-executor-0.3.25.crate) = 17744
+SHA256 (rust/crates/futures-io-0.3.25.crate) = 00f5fb52a06bdcadeb54e8d3671f8888a39697dcb0b81b23b55174030427f4eb
+SIZE (rust/crates/futures-io-0.3.25.crate) = 8911
+SHA256 (rust/crates/futures-lite-1.12.0.crate) = 7694489acd39452c77daa48516b894c153f192c3578d5a839b62c58099fcbf48
+SIZE (rust/crates/futures-lite-1.12.0.crate) = 36032
+SHA256 (rust/crates/futures-macro-0.3.25.crate) = bdfb8ce053d86b91919aad980c220b1fb8401a9394410e1c289ed7e66b61835d
+SIZE (rust/crates/futures-macro-0.3.25.crate) = 11256
+SHA256 (rust/crates/futures-sink-0.3.25.crate) = 39c15cf1a4aa79df40f1bb462fb39676d0ad9e366c2a33b590d7c66f4f81fcf9
+SIZE (rust/crates/futures-sink-0.3.25.crate) = 7854
+SHA256 (rust/crates/futures-task-0.3.25.crate) = 2ffb393ac5d9a6eaa9d3fdf37ae2776656b706e200c8e16b1bdb227f5198e6ea
+SIZE (rust/crates/futures-task-0.3.25.crate) = 11844
+SHA256 (rust/crates/futures-util-0.3.25.crate) = 197676987abd2f9cadff84926f410af1c183608d36641465df73ae8211dc65d6
+SIZE (rust/crates/futures-util-0.3.25.crate) = 155866
+SHA256 (rust/crates/generator-0.7.1.crate) = cc184cace1cea8335047a471cc1da80f18acf8a76f3bab2028d499e328948ec7
+SIZE (rust/crates/generator-0.7.1.crate) = 29776
+SHA256 (rust/crates/generic-array-0.14.6.crate) = bff49e947297f3312447abdca79f45f4738097cc82b06e72054d2223f601f1b9
+SIZE (rust/crates/generic-array-0.14.6.crate) = 15889
+SHA256 (rust/crates/getopts-0.2.21.crate) = 14dbbfd5c71d70241ecf9e6f13737f7b5ce823821063188d7e46c41d371eebd5
+SIZE (rust/crates/getopts-0.2.21.crate) = 18457
+SHA256 (rust/crates/getrandom-0.2.8.crate) = c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31
+SIZE (rust/crates/getrandom-0.2.8.crate) = 30553
+SHA256 (rust/crates/ghash-0.5.0.crate) = d930750de5717d2dd0b8c0d42c076c0e884c81a73e6cab859bbd2339c71e3e40
+SIZE (rust/crates/ghash-0.5.0.crate) = 9244
+SHA256 (rust/crates/glob-0.3.0.crate) = 9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574
+SIZE (rust/crates/glob-0.3.0.crate) = 18724
+SHA256 (rust/crates/gloo-timers-0.2.5.crate) = 98c4a8d6391675c6b2ee1a6c8d06e8e2d03605c44cec1270675985a4c2a5500b
+SIZE (rust/crates/gloo-timers-0.2.5.crate) = 5490
+SHA256 (rust/crates/grep-matcher-0.1.5.crate) = 6d27563c33062cd33003b166ade2bb4fd82db1fd6a86db764dfdad132d46c1cc
+SIZE (rust/crates/grep-matcher-0.1.5.crate) = 15677
+SHA256 (rust/crates/grep-regex-0.1.10.crate) = 1345f8d33c89f2d5b081f2f2a41175adef9fd0bed2fea6a26c96c2deb027e58e
+SIZE (rust/crates/grep-regex-0.1.10.crate) = 29451
+SHA256 (rust/crates/grep-searcher-0.1.10.crate) = 48852bd08f9b4eb3040ecb6d2f4ade224afe880a9a0909c5563cc59fa67932cc
+SIZE (rust/crates/grep-searcher-0.1.10.crate) = 44856
+SHA256 (rust/crates/h2-0.3.15.crate) = 5f9f29bc9dda355256b2916cf526ab02ce0aeaaaf2bad60d65ef3f12f11dd0f4
+SIZE (rust/crates/h2-0.3.15.crate) = 162238
+SHA256 (rust/crates/hashbrown-0.11.2.crate) = ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e
+SIZE (rust/crates/hashbrown-0.11.2.crate) = 85713
+SHA256 (rust/crates/hashbrown-0.12.3.crate) = 8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888
+SIZE (rust/crates/hashbrown-0.12.3.crate) = 102968
+SHA256 (rust/crates/hashlink-0.7.0.crate) = 7249a3129cbc1ffccd74857f81464a323a152173cdb134e0fd81bc803b29facf
+SIZE (rust/crates/hashlink-0.7.0.crate) = 25309
+SHA256 (rust/crates/heck-0.4.0.crate) = 2540771e65fc8cb83cd6e8a237f70c319bd5c29f78ed1084ba5d50eeac86f7f9
+SIZE (rust/crates/heck-0.4.0.crate) = 11161
+SHA256 (rust/crates/hermit-abi-0.1.19.crate) = 62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33
+SIZE (rust/crates/hermit-abi-0.1.19.crate) = 9979
+SHA256 (rust/crates/hermit-abi-0.3.1.crate) = fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286
+SIZE (rust/crates/hermit-abi-0.3.1.crate) = 13793
+SHA256 (rust/crates/hkdf-0.12.3.crate) = 791a029f6b9fc27657f6f188ec6e5e43f6911f6f878e0dc5501396e09809d437
+SIZE (rust/crates/hkdf-0.12.3.crate) = 170910
+SHA256 (rust/crates/hmac-0.12.1.crate) = 6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e
+SIZE (rust/crates/hmac-0.12.1.crate) = 42657
+SHA256 (rust/crates/http-0.2.8.crate) = 75f43d41e26995c17e71ee126451dd3941010b0514a81a9d11f3b341debc2399
+SIZE (rust/crates/http-0.2.8.crate) = 105591
+SHA256 (rust/crates/http-body-0.4.5.crate) = d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1
+SIZE (rust/crates/http-body-0.4.5.crate) = 9242
+SHA256 (rust/crates/httparse-1.8.0.crate) = d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904
+SIZE (rust/crates/httparse-1.8.0.crate) = 29954
+SHA256 (rust/crates/httpdate-1.0.2.crate) = c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421
+SIZE (rust/crates/httpdate-1.0.2.crate) = 10673
+SHA256 (rust/crates/hyper-0.14.23.crate) = 034711faac9d2166cb1baf1a2fb0b60b1f277f8492fd72176c17f3515e1abd3c
+SIZE (rust/crates/hyper-0.14.23.crate) = 186136
+SHA256 (rust/crates/hyper-tls-0.5.0.crate) = d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905
+SIZE (rust/crates/hyper-tls-0.5.0.crate) = 13257
+SHA256 (rust/crates/iana-time-zone-0.1.53.crate) = 64c122667b287044802d6ce17ee2ddf13207ed924c712de9a66a5814d5b64765
+SIZE (rust/crates/iana-time-zone-0.1.53.crate) = 20176
+SHA256 (rust/crates/iana-time-zone-haiku-0.1.1.crate) = 0703ae284fc167426161c2e3f1da3ea71d94b21bedbcc9494e92b28e334e3dca
+SIZE (rust/crates/iana-time-zone-haiku-0.1.1.crate) = 7200
+SHA256 (rust/crates/idna-0.3.0.crate) = e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6
+SIZE (rust/crates/idna-0.3.0.crate) = 271128
+SHA256 (rust/crates/indexmap-1.9.2.crate) = 1885e79c1fc4b10f0e172c475f458b7f7b93061064d98c3293e98c5ba0c8b399
+SIZE (rust/crates/indexmap-1.9.2.crate) = 54627
+SHA256 (rust/crates/inlinable_string-0.1.15.crate) = c8fae54786f62fb2918dcfae3d568594e50eb9b5c25bf04371af6fe7516452fb
+SIZE (rust/crates/inlinable_string-0.1.15.crate) = 19290
+SHA256 (rust/crates/inotify-0.9.6.crate) = f8069d3ec154eb856955c1c0fbffefbf5f3c40a104ec912d4797314c1801abff
+SIZE (rust/crates/inotify-0.9.6.crate) = 22971
+SHA256 (rust/crates/inotify-sys-0.1.5.crate) = e05c02b5e89bff3b946cedeca278abc628fe811e604f027c45a8aa3cf793d0eb
+SIZE (rust/crates/inotify-sys-0.1.5.crate) = 6965
+SHA256 (rust/crates/inout-0.1.3.crate) = a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5
+SIZE (rust/crates/inout-0.1.3.crate) = 10743
+SHA256 (rust/crates/instant-0.1.12.crate) = 7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c
+SIZE (rust/crates/instant-0.1.12.crate) = 6128
+SHA256 (rust/crates/io-lifetimes-1.0.11.crate) = eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2
+SIZE (rust/crates/io-lifetimes-1.0.11.crate) = 37346
+SHA256 (rust/crates/ipnet-2.5.1.crate) = f88c5561171189e69df9d98bcf18fd5f9558300f7ea7b801eb8a0fd748bd8745
+SIZE (rust/crates/ipnet-2.5.1.crate) = 26025
+SHA256 (rust/crates/is-terminal-0.4.7.crate) = adcf93614601c8129ddf72e2d5633df827ba6551541c6d8c59520a371475be1f
+SIZE (rust/crates/is-terminal-0.4.7.crate) = 8356
+SHA256 (rust/crates/itoa-0.4.8.crate) = b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4
+SIZE (rust/crates/itoa-0.4.8.crate) = 11926
+SHA256 (rust/crates/itoa-1.0.4.crate) = 4217ad341ebadf8d8e724e264f13e593e0648f5b3e94b3896a5df283be015ecc
+SIZE (rust/crates/itoa-1.0.4.crate) = 10601
+SHA256 (rust/crates/jni-0.20.0.crate) = 039022cdf4d7b1cf548d31f60ae783138e5fd42013f6271049d7df7afadef96c
+SIZE (rust/crates/jni-0.20.0.crate) = 69054
+SHA256 (rust/crates/jni-sys-0.3.0.crate) = 8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130
+SIZE (rust/crates/jni-sys-0.3.0.crate) = 10232
+SHA256 (rust/crates/jobserver-0.1.25.crate) = 068b1ee6743e4d11fb9c6a1e6064b3693a1b600e7f5f5988047d98b3dc9fb90b
+SIZE (rust/crates/jobserver-0.1.25.crate) = 21888
+SHA256 (rust/crates/js-sys-0.3.60.crate) = 49409df3e3bf0856b916e2ceaca09ee28e6871cf7d9ce97a692cacfdb2a25a47
+SIZE (rust/crates/js-sys-0.3.60.crate) = 79257
+SHA256 (rust/crates/json-0.12.4.crate) = 078e285eafdfb6c4b434e0d31e8cfcb5115b651496faca5749b88fafd4f23bfd
+SIZE (rust/crates/json-0.12.4.crate) = 105942
+SHA256 (rust/crates/json5-0.4.1.crate) = 96b0db21af676c1ce64250b5f40f3ce2cf27e4e47cb91ed91eb6fe9350b430c1
+SIZE (rust/crates/json5-0.4.1.crate) = 15678
+SHA256 (rust/crates/kqueue-1.0.7.crate) = 2c8fc60ba15bf51257aa9807a48a61013db043fcf3a78cb0d916e8e396dcad98
+SIZE (rust/crates/kqueue-1.0.7.crate) = 12554
+SHA256 (rust/crates/kqueue-sys-1.0.3.crate) = 8367585489f01bc55dd27404dcf56b95e6da061a256a666ab23be9ba96a2e587
+SIZE (rust/crates/kqueue-sys-1.0.3.crate) = 6673
+SHA256 (rust/crates/kv-log-macro-1.0.7.crate) = 0de8b303297635ad57c9f5059fd9cee7a47f8e8daa09df0fcd07dd39fb22977f
+SIZE (rust/crates/kv-log-macro-1.0.7.crate) = 16842
+SHA256 (rust/crates/lazy_static-1.4.0.crate) = e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646
+SIZE (rust/crates/lazy_static-1.4.0.crate) = 10443
+SHA256 (rust/crates/libc-0.2.146.crate) = f92be4933c13fd498862a9e02a3055f8a8d9c039ce33db97306fd5a6caa7f29b
+SIZE (rust/crates/libc-0.2.146.crate) = 684707
+SHA256 (rust/crates/libsqlite3-sys-0.22.2.crate) = 290b64917f8b0cb885d9de0f9959fe1f775d7fa12f1da2db9001c1c8ab60f89d
+SIZE (rust/crates/libsqlite3-sys-0.22.2.crate) = 2345859
+SHA256 (rust/crates/line-wrap-0.1.1.crate) = f30344350a2a51da54c1d53be93fade8a237e545dbcc4bdbe635413f2117cab9
+SIZE (rust/crates/line-wrap-0.1.1.crate) = 10010
+SHA256 (rust/crates/link-cplusplus-1.0.7.crate) = 9272ab7b96c9046fbc5bc56c06c117cb639fe2d509df0c421cad82d2915cf369
+SIZE (rust/crates/link-cplusplus-1.0.7.crate) = 7576
+SHA256 (rust/crates/linked-hash-map-0.5.3.crate) = 8dd5a6d5999d9907cda8ed67bbd137d3af8085216c2ac62de5be860bd41f304a
+SIZE (rust/crates/linked-hash-map-0.5.3.crate) = 16130
+SHA256 (rust/crates/linux-raw-sys-0.3.8.crate) = ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519
+SIZE (rust/crates/linux-raw-sys-0.3.8.crate) = 1013776
+SHA256 (rust/crates/lock_api-0.4.9.crate) = 435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df
+SIZE (rust/crates/lock_api-0.4.9.crate) = 25685
+SHA256 (rust/crates/log-0.4.17.crate) = abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e
+SIZE (rust/crates/log-0.4.17.crate) = 38028
+SHA256 (rust/crates/loom-0.5.6.crate) = ff50ecb28bb86013e935fb6683ab1f6d3a20016f123c76fd4c27470076ac30f5
+SIZE (rust/crates/loom-0.5.6.crate) = 72186
+SHA256 (rust/crates/lopdf-0.26.0.crate) = b49a0272112719d0037ab63d4bb67f73ba659e1e90bc38f235f163a457ac16f3
+SIZE (rust/crates/lopdf-0.26.0.crate) = 82365
+SHA256 (rust/crates/lzw-0.10.0.crate) = 7d947cbb889ed21c2a84be6ffbaebf5b4e0f4340638cba0444907e38b56be084
+SIZE (rust/crates/lzw-0.10.0.crate) = 10744
+SHA256 (rust/crates/malloc_buf-0.0.6.crate) = 62bb907fe88d54d8d9ce32a3cceab4218ed2f6b7d35617cafe9adf84e43919cb
+SIZE (rust/crates/malloc_buf-0.0.6.crate) = 1239
+SHA256 (rust/crates/matchers-0.1.0.crate) = 8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558
+SIZE (rust/crates/matchers-0.1.0.crate) = 6948
+SHA256 (rust/crates/memchr-2.5.0.crate) = 2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d
+SIZE (rust/crates/memchr-2.5.0.crate) = 65812
+SHA256 (rust/crates/memmap2-0.5.8.crate) = 4b182332558b18d807c4ce1ca8ca983b34c3ee32765e47b3f0f69b90355cc1dc
+SIZE (rust/crates/memmap2-0.5.8.crate) = 26592
+SHA256 (rust/crates/mime-0.3.16.crate) = 2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d
+SIZE (rust/crates/mime-0.3.16.crate) = 15206
+SHA256 (rust/crates/minimal-lexical-0.2.1.crate) = 68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a
+SIZE (rust/crates/minimal-lexical-0.2.1.crate) = 94841
+SHA256 (rust/crates/miniz_oxide-0.6.2.crate) = b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa
+SIZE (rust/crates/miniz_oxide-0.6.2.crate) = 54536
+SHA256 (rust/crates/mio-0.7.14.crate) = 8067b404fe97c70829f082dec8bcf4f71225d7eaea1d8645349cb76fa06205cc
+SIZE (rust/crates/mio-0.7.14.crate) = 87429
+SHA256 (rust/crates/mio-0.8.5.crate) = e5d732bc30207a6423068df043e3d02e0735b155ad7ce1a6f76fe2baa5b158de
+SIZE (rust/crates/mio-0.8.5.crate) = 93993
+SHA256 (rust/crates/miow-0.3.7.crate) = b9f1c5b025cda876f66ef43a113f91ebc9f4ccef34843000e0adf6ebbab84e21
+SIZE (rust/crates/miow-0.3.7.crate) = 24563
+SHA256 (rust/crates/multer-2.0.4.crate) = 6ed4198ce7a4cbd2a57af78d28c6fbb57d81ac5f1d6ad79ac6c5587419cbdf22
+SIZE (rust/crates/multer-2.0.4.crate) = 24090
+SHA256 (rust/crates/native-tls-0.2.11.crate) = 07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e
+SIZE (rust/crates/native-tls-0.2.11.crate) = 29008
+SHA256 (rust/crates/ndk-context-0.1.1.crate) = 27b02d87554356db9e9a873add8782d4ea6e3e58ea071a9adb9a2e8ddb884a8b
+SIZE (rust/crates/ndk-context-0.1.1.crate) = 2205
+SHA256 (rust/crates/nom-7.1.1.crate) = a8903e5a29a317527874d0402f867152a3d21c908bb0b933e416c65e301d4c36
+SIZE (rust/crates/nom-7.1.1.crate) = 115818
+SHA256 (rust/crates/notify-5.0.0.crate) = ed2c66da08abae1c024c01d635253e402341b4060a12e99b31c7594063bf490a
+SIZE (rust/crates/notify-5.0.0.crate) = 37091
+SHA256 (rust/crates/ntapi-0.3.7.crate) = c28774a7fd2fbb4f0babd8237ce554b73af68021b5f695a3cebd6c59bac0980f
+SIZE (rust/crates/ntapi-0.3.7.crate) = 126994
+SHA256 (rust/crates/nu-ansi-term-0.46.0.crate) = 77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84
+SIZE (rust/crates/nu-ansi-term-0.46.0.crate) = 24311
+SHA256 (rust/crates/num-integer-0.1.45.crate) = 225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9
+SIZE (rust/crates/num-integer-0.1.45.crate) = 22529
+SHA256 (rust/crates/num-traits-0.2.15.crate) = 578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd
+SIZE (rust/crates/num-traits-0.2.15.crate) = 49262
+SHA256 (rust/crates/num_cpus-1.14.0.crate) = f6058e64324c71e02bc2b150e4f3bc8286db6c83092132ffa3f6b1eab0f9def5
+SIZE (rust/crates/num_cpus-1.14.0.crate) = 15673
+SHA256 (rust/crates/objc-0.2.7.crate) = 915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1
+SIZE (rust/crates/objc-0.2.7.crate) = 22036
+SHA256 (rust/crates/once_cell-1.16.0.crate) = 86f0b0d4bf799edbc74508c1e8bf170ff5f41238e5f8225603ca7caaae2b7860
+SIZE (rust/crates/once_cell-1.16.0.crate) = 32120
+SHA256 (rust/crates/opaque-debug-0.3.0.crate) = 624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5
+SIZE (rust/crates/opaque-debug-0.3.0.crate) = 5767
+SHA256 (rust/crates/openssl-0.10.44.crate) = 29d971fd5722fec23977260f6e81aa67d2f22cadbdc2aa049f1022d9a3be1566
+SIZE (rust/crates/openssl-0.10.44.crate) = 234682
+SHA256 (rust/crates/openssl-macros-0.1.0.crate) = b501e44f11665960c7e7fcf062c7d96a14ade4aa98116c004b2e37b5be7d736c
+SIZE (rust/crates/openssl-macros-0.1.0.crate) = 5566
+SHA256 (rust/crates/openssl-probe-0.1.5.crate) = ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf
+SIZE (rust/crates/openssl-probe-0.1.5.crate) = 7227
+SHA256 (rust/crates/openssl-sys-0.9.79.crate) = 5454462c0eced1e97f2ec09036abc8da362e66802f66fd20f86854d9d8cbcbc4
+SIZE (rust/crates/openssl-sys-0.9.79.crate) = 61400
+SHA256 (rust/crates/ordered-multimap-0.4.3.crate) = ccd746e37177e1711c20dd619a1620f34f5c8b569c53590a72dedd5344d8924a
+SIZE (rust/crates/ordered-multimap-0.4.3.crate) = 19599
+SHA256 (rust/crates/overload-0.1.1.crate) = b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39
+SIZE (rust/crates/overload-0.1.1.crate) = 24439
+SHA256 (rust/crates/parking-2.0.0.crate) = 427c3892f9e783d91cc128285287e70a59e206ca452770ece88a76f7a3eddd72
+SIZE (rust/crates/parking-2.0.0.crate) = 9714
+SHA256 (rust/crates/parking_lot-0.11.2.crate) = 7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99
+SIZE (rust/crates/parking_lot-0.11.2.crate) = 39869
+SHA256 (rust/crates/parking_lot-0.12.1.crate) = 3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f
+SIZE (rust/crates/parking_lot-0.12.1.crate) = 40967
+SHA256 (rust/crates/parking_lot_core-0.8.5.crate) = d76e8e1493bcac0d2766c42737f34458f1c8c50c0d23bcb24ea953affb273216
+SIZE (rust/crates/parking_lot_core-0.8.5.crate) = 32466
+SHA256 (rust/crates/parking_lot_core-0.9.5.crate) = 7ff9f3fef3968a3ec5945535ed654cb38ff72d7495a25619e2247fb15a2ed9ba
+SIZE (rust/crates/parking_lot_core-0.9.5.crate) = 32396
+SHA256 (rust/crates/password-hash-0.4.2.crate) = 7676374caaee8a325c9e7a2ae557f216c5563a171d6997b0ef8a65af35147700
+SIZE (rust/crates/password-hash-0.4.2.crate) = 26099
+SHA256 (rust/crates/pathdiff-0.2.1.crate) = 8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd
+SIZE (rust/crates/pathdiff-0.2.1.crate) = 7142
+SHA256 (rust/crates/pbkdf2-0.11.0.crate) = 83a0692ec44e4cf1ef28ca317f14f8f07da2d95ec3fa01f86e4467b725e60917
+SIZE (rust/crates/pbkdf2-0.11.0.crate) = 13229
+SHA256 (rust/crates/pdf-extract-0.6.4.crate) = 9f7875466ea3ecc4b763c4946993d5dcdf4f6e3a67e2f293e506a4a9ec551759
+SIZE (rust/crates/pdf-extract-0.6.4.crate) = 89955
+SHA256 (rust/crates/pear-0.2.3.crate) = 15e44241c5e4c868e3eaa78b7c1848cadd6344ed4f54d029832d32b415a58702
+SIZE (rust/crates/pear-0.2.3.crate) = 19110
+SHA256 (rust/crates/pear_codegen-0.2.3.crate) = 82a5ca643c2303ecb740d506539deba189e16f2754040a42901cd8105d0282d0
+SIZE (rust/crates/pear_codegen-0.2.3.crate) = 7185
+SHA256 (rust/crates/percent-encoding-2.2.0.crate) = 478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e
+SIZE (rust/crates/percent-encoding-2.2.0.crate) = 10075
+SHA256 (rust/crates/pest-2.5.1.crate) = cc8bed3549e0f9b0a2a78bf7c0018237a2cdf085eecbbc048e52612438e4e9d0
+SIZE (rust/crates/pest-2.5.1.crate) = 94437
+SHA256 (rust/crates/pest_derive-2.5.1.crate) = cdc078600d06ff90d4ed238f0119d84ab5d43dbaad278b0e33a8820293b32344
+SIZE (rust/crates/pest_derive-2.5.1.crate) = 17682
+SHA256 (rust/crates/pest_generator-2.5.1.crate) = 28a1af60b1c4148bb269006a750cff8e2ea36aff34d2d96cf7be0b14d1bed23c
+SIZE (rust/crates/pest_generator-2.5.1.crate) = 14887
+SHA256 (rust/crates/pest_meta-2.5.1.crate) = fec8605d59fc2ae0c6c1aefc0c7c7a9769732017c0ce07f7a9cfffa7b4404f20
+SIZE (rust/crates/pest_meta-2.5.1.crate) = 31871
+SHA256 (rust/crates/pin-project-lite-0.2.9.crate) = e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116
+SIZE (rust/crates/pin-project-lite-0.2.9.crate) = 27713
+SHA256 (rust/crates/pin-utils-0.1.0.crate) = 8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184
+SIZE (rust/crates/pin-utils-0.1.0.crate) = 7580
+SHA256 (rust/crates/pkg-config-0.3.26.crate) = 6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160
+SIZE (rust/crates/pkg-config-0.3.26.crate) = 18662
+SHA256 (rust/crates/plist-1.3.1.crate) = bd39bc6cdc9355ad1dc5eeedefee696bb35c34caf21768741e81826c0bbd7225
+SIZE (rust/crates/plist-1.3.1.crate) = 44772
+SHA256 (rust/crates/polling-2.5.1.crate) = 166ca89eb77fd403230b9c156612965a81e094ec6ec3aa13663d4c8b113fa748
+SIZE (rust/crates/polling-2.5.1.crate) = 22015
+SHA256 (rust/crates/polyval-0.6.0.crate) = 7ef234e08c11dfcb2e56f79fd70f6f2eb7f025c0ce2333e82f4f0518ecad30c6
+SIZE (rust/crates/polyval-0.6.0.crate) = 17602
+SHA256 (rust/crates/pom-1.1.0.crate) = 60f6ce597ecdcc9a098e7fddacb1065093a3d66446fa16c675e7e71d1b5c28e6
+SIZE (rust/crates/pom-1.1.0.crate) = 168217
+SHA256 (rust/crates/pom-3.2.0.crate) = 07e2192780e9f8e282049ff9bffcaa28171e1cb0844f49ed5374e518ae6024ec
+SIZE (rust/crates/pom-3.2.0.crate) = 169708
+SHA256 (rust/crates/postscript-0.14.1.crate) = 78451badbdaebaf17f053fd9152b3ffb33b516104eacb45e7864aaa9c712f306
+SIZE (rust/crates/postscript-0.14.1.crate) = 22499
+SHA256 (rust/crates/ppv-lite86-0.2.17.crate) = 5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de
+SIZE (rust/crates/ppv-lite86-0.2.17.crate) = 22242
+SHA256 (rust/crates/proc-macro-hack-0.5.19.crate) = dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5
+SIZE (rust/crates/proc-macro-hack-0.5.19.crate) = 15556
+SHA256 (rust/crates/proc-macro2-1.0.60.crate) = dec2b086b7a862cf4de201096214fa870344cf922b2b30c167badb3af3195406
+SIZE (rust/crates/proc-macro2-1.0.60.crate) = 44160
+SHA256 (rust/crates/proc-macro2-diagnostics-0.9.1.crate) = 4bf29726d67464d49fa6224a1d07936a8c08bb3fba727c7493f6cf1616fdaada
+SIZE (rust/crates/proc-macro2-diagnostics-0.9.1.crate) = 12305
+SHA256 (rust/crates/pulldown-cmark-0.8.0.crate) = ffade02495f22453cd593159ea2f59827aae7f53fa8323f756799b670881dcf8
+SIZE (rust/crates/pulldown-cmark-0.8.0.crate) = 106330
+SHA256 (rust/crates/pulldown-cmark-to-cmark-7.1.1.crate) = 8bc14bc6b9f5881f240f9766414707ab24f972bcc3388589fe15b22fb15dc60d
+SIZE (rust/crates/pulldown-cmark-to-cmark-7.1.1.crate) = 14520
+SHA256 (rust/crates/quake_microsoft_todo-0.1.1.crate) = acd48865ef07090ce0765a60199e228939714b0546eed625356a3cd2f61a4b5a
+SIZE (rust/crates/quake_microsoft_todo-0.1.1.crate) = 7615
+SHA256 (rust/crates/quote-1.0.28.crate) = 1b9ab9c7eadfd8df19006f1cf1a4aed13540ed5cbc047010ece5826e10825488
+SIZE (rust/crates/quote-1.0.28.crate) = 28382
+SHA256 (rust/crates/rand-0.8.5.crate) = 34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404
+SIZE (rust/crates/rand-0.8.5.crate) = 87113
+SHA256 (rust/crates/rand_chacha-0.3.1.crate) = e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88
+SIZE (rust/crates/rand_chacha-0.3.1.crate) = 15251
+SHA256 (rust/crates/rand_core-0.6.4.crate) = ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c
+SIZE (rust/crates/rand_core-0.6.4.crate) = 22666
+SHA256 (rust/crates/raw-window-handle-0.5.0.crate) = ed7e3d950b66e19e0c372f3fa3fbbcf85b1746b571f74e0c2af6042a5c93420a
+SIZE (rust/crates/raw-window-handle-0.5.0.crate) = 11715
+SHA256 (rust/crates/redox_syscall-0.2.16.crate) = fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a
+SIZE (rust/crates/redox_syscall-0.2.16.crate) = 24012
+SHA256 (rust/crates/ref-cast-1.0.13.crate) = 53b15debb4f9d60d767cd8ca9ef7abb2452922f3214671ff052defc7f3502c44
+SIZE (rust/crates/ref-cast-1.0.13.crate) = 12473
+SHA256 (rust/crates/ref-cast-impl-1.0.13.crate) = abfa8511e9e94fd3de6585a3d3cd00e01ed556dc9814829280af0e8dc72a8f36
+SIZE (rust/crates/ref-cast-impl-1.0.13.crate) = 9430
+SHA256 (rust/crates/regex-1.7.0.crate) = e076559ef8e241f2ae3479e36f97bd5741c0330689e217ad51ce2c76808b868a
+SIZE (rust/crates/regex-1.7.0.crate) = 239421
+SHA256 (rust/crates/regex-automata-0.1.10.crate) = 6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132
+SIZE (rust/crates/regex-automata-0.1.10.crate) = 114533
+SHA256 (rust/crates/regex-syntax-0.6.28.crate) = 456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848
+SIZE (rust/crates/regex-syntax-0.6.28.crate) = 299288
+SHA256 (rust/crates/remove_dir_all-0.5.3.crate) = 3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7
+SIZE (rust/crates/remove_dir_all-0.5.3.crate) = 9184
+SHA256 (rust/crates/reqwest-0.11.13.crate) = 68cc60575865c7831548863cc02356512e3f1dc2f3f82cb837d7fc4cc8f3c97c
+SIZE (rust/crates/reqwest-0.11.13.crate) = 144263
+SHA256 (rust/crates/rocket-0.5.0-rc.2.crate) = 98ead083fce4a405feb349cf09abdf64471c6077f14e0ce59364aa90d4b99317
+SIZE (rust/crates/rocket-0.5.0-rc.2.crate) = 278842
+SHA256 (rust/crates/rocket-multipart-form-data-0.10.5.crate) = 9a8148192183eb2a7c1438e603fb8db1d9020739776aecd11a4f821b578575c3
+SIZE (rust/crates/rocket-multipart-form-data-0.10.5.crate) = 18757
+SHA256 (rust/crates/rocket_codegen-0.5.0-rc.2.crate) = d6aeb6bb9c61e9cd2c00d70ea267bf36f76a4cc615e5908b349c2f9d93999b47
+SIZE (rust/crates/rocket_codegen-0.5.0-rc.2.crate) = 108047
+SHA256 (rust/crates/rocket_http-0.5.0-rc.2.crate) = 2ded65d127954de3c12471630bf4b81a2792f065984461e65b91d0fdaafc17a2
+SIZE (rust/crates/rocket_http-0.5.0-rc.2.crate) = 91029
+SHA256 (rust/crates/ron-0.7.1.crate) = 88073939a61e5b7680558e6be56b419e208420c2adb92be54921fa6b72283f1a
+SIZE (rust/crates/ron-0.7.1.crate) = 53572
+SHA256 (rust/crates/rstest-0.12.0.crate) = d912f35156a3f99a66ee3e11ac2e0b3f34ac85a07e05263d05a7e2c8810d616f
+SIZE (rust/crates/rstest-0.12.0.crate) = 919939
+SHA256 (rust/crates/rusqlite-0.25.4.crate) = 5c4b1eaf239b47034fb450ee9cdedd7d0226571689d8823030c4b6c2cb407152
+SIZE (rust/crates/rusqlite-0.25.4.crate) = 129773
+SHA256 (rust/crates/rust-ini-0.18.0.crate) = f6d5f2436026b4f6e79dc829837d467cc7e9a55ee40e750d716713540715a2df
+SIZE (rust/crates/rust-ini-0.18.0.crate) = 15439
+SHA256 (rust/crates/rustc_version-0.2.3.crate) = 138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a
+SIZE (rust/crates/rustc_version-0.2.3.crate) = 10210
+SHA256 (rust/crates/rustc_version-0.4.0.crate) = bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366
+SIZE (rust/crates/rustc_version-0.4.0.crate) = 12175
+SHA256 (rust/crates/rustix-0.37.20.crate) = b96e891d04aa506a6d1f318d2771bcb1c7dfda84e126660ace067c9b474bb2c0
+SIZE (rust/crates/rustix-0.37.20.crate) = 327665
+SHA256 (rust/crates/rustversion-1.0.9.crate) = 97477e48b4cf8603ad5f7aaf897467cf42ab4218a38ef76fb14c2d6773a6d6a8
+SIZE (rust/crates/rustversion-1.0.9.crate) = 17425
+SHA256 (rust/crates/ryu-1.0.11.crate) = 4501abdff3ae82a1c1b477a17252eb69cee9e66eb915c1abaa4f44d873df9f09
+SIZE (rust/crates/ryu-1.0.11.crate) = 47007
+SHA256 (rust/crates/safemem-0.3.3.crate) = ef703b7cb59335eae2eb93ceb664c0eb7ea6bf567079d843e09420219668e072
+SIZE (rust/crates/safemem-0.3.3.crate) = 7778
+SHA256 (rust/crates/same-file-1.0.6.crate) = 93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502
+SIZE (rust/crates/same-file-1.0.6.crate) = 10183
+SHA256 (rust/crates/schannel-0.1.20.crate) = 88d6731146462ea25d9244b2ed5fd1d716d25c52e4d54aa4fb0f3c4e9854dbe2
+SIZE (rust/crates/schannel-0.1.20.crate) = 41579
+SHA256 (rust/crates/scoped-tls-1.0.1.crate) = e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294
+SIZE (rust/crates/scoped-tls-1.0.1.crate) = 8202
+SHA256 (rust/crates/scopeguard-1.1.0.crate) = d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd
+SIZE (rust/crates/scopeguard-1.1.0.crate) = 11470
+SHA256 (rust/crates/scratch-1.0.2.crate) = 9c8132065adcfd6e02db789d9285a0deb2f3fcb04002865ab67d5fb103533898
+SIZE (rust/crates/scratch-1.0.2.crate) = 8152
+SHA256 (rust/crates/security-framework-2.7.0.crate) = 2bc1bb97804af6631813c55739f771071e0f2ed33ee20b68c86ec505d906356c
+SIZE (rust/crates/security-framework-2.7.0.crate) = 72601
+SHA256 (rust/crates/security-framework-sys-2.6.1.crate) = 0160a13a177a45bfb43ce71c01580998474f556ad854dcbca936dd2841a5c556
+SIZE (rust/crates/security-framework-sys-2.6.1.crate) = 17717
+SHA256 (rust/crates/semver-0.9.0.crate) = 1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403
+SIZE (rust/crates/semver-0.9.0.crate) = 17344
+SHA256 (rust/crates/semver-1.0.14.crate) = e25dfac463d778e353db5be2449d1cce89bd6fd23c9f1ea21310ce6e5a1b29c4
+SIZE (rust/crates/semver-1.0.14.crate) = 29813
+SHA256 (rust/crates/semver-parser-0.7.0.crate) = 388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3
+SIZE (rust/crates/semver-parser-0.7.0.crate) = 10268
+SHA256 (rust/crates/serde-1.0.149.crate) = 256b9932320c590e707b94576e3cc1f7c9024d0ee6612dfbcf1cb106cbe8e055
+SIZE (rust/crates/serde-1.0.149.crate) = 76702
+SHA256 (rust/crates/serde_derive-1.0.149.crate) = b4eae9b04cbffdfd550eb462ed33bc6a1b68c935127d008b27444d08380f94e4
+SIZE (rust/crates/serde_derive-1.0.149.crate) = 55561
+SHA256 (rust/crates/serde_json-1.0.89.crate) = 020ff22c755c2ed3f8cf162dbb41a7268d934702f3ed3631656ea597e08fc3db
+SIZE (rust/crates/serde_json-1.0.89.crate) = 144638
+SHA256 (rust/crates/serde_urlencoded-0.7.1.crate) = d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd
+SIZE (rust/crates/serde_urlencoded-0.7.1.crate) = 12822
+SHA256 (rust/crates/serde_yaml-0.8.26.crate) = 578a7433b776b56a35785ed5ce9a7e777ac0598aac5a6dd1b4b18a307c7fc71b
+SIZE (rust/crates/serde_yaml-0.8.26.crate) = 40670
+SHA256 (rust/crates/serde_yaml-0.9.14.crate) = 6d232d893b10de3eb7258ff01974d6ee20663d8e833263c99409d4b13a0209da
+SIZE (rust/crates/serde_yaml-0.9.14.crate) = 63823
+SHA256 (rust/crates/sha1-0.6.1.crate) = c1da05c97445caa12d05e848c4a4fcbbea29e748ac28f7e80e9b010392063770
+SIZE (rust/crates/sha1-0.6.1.crate) = 2931
+SHA256 (rust/crates/sha1-0.10.5.crate) = f04293dc80c3993519f2d7f6f511707ee7094fe0c6d3406feb330cdb3540eba3
+SIZE (rust/crates/sha1-0.10.5.crate) = 12146
+SHA256 (rust/crates/sha1_smol-1.0.0.crate) = ae1a47186c03a32177042e55dbc5fd5aee900b8e0069a8d70fba96a9375cd012
+SIZE (rust/crates/sha1_smol-1.0.0.crate) = 9782
+SHA256 (rust/crates/sha2-0.10.6.crate) = 82e6b795fe2e3b1e845bafcb27aa35405c4d47cdfc92af5fc8d3002f76cebdc0
+SIZE (rust/crates/sha2-0.10.6.crate) = 20558
+SHA256 (rust/crates/sharded-slab-0.1.4.crate) = 900fba806f70c630b0a382d0d825e17a0f19fcd059a2ade1ff237bcddf446b31
+SIZE (rust/crates/sharded-slab-0.1.4.crate) = 52479
+SHA256 (rust/crates/signal-hook-0.3.14.crate) = a253b5e89e2698464fc26b545c9edceb338e18a89effeeecfea192c3025be29d
+SIZE (rust/crates/signal-hook-0.3.14.crate) = 49446
+SHA256 (rust/crates/signal-hook-mio-0.2.3.crate) = 29ad2e15f37ec9a6cc544097b78a1ec90001e9f71b81338ca39f430adaca99af
+SIZE (rust/crates/signal-hook-mio-0.2.3.crate) = 9064
+SHA256 (rust/crates/signal-hook-registry-1.4.0.crate) = e51e73328dc4ac0c7ccbda3a494dfa03df1de2f46018127f60c693f2648455b0
+SIZE (rust/crates/signal-hook-registry-1.4.0.crate) = 17912
+SHA256 (rust/crates/slab-0.4.7.crate) = 4614a76b2a8be0058caa9dbbaf66d988527d86d003c11a94fbd335d7661edcef
+SIZE (rust/crates/slab-0.4.7.crate) = 16647
+SHA256 (rust/crates/smallvec-1.10.0.crate) = a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0
+SIZE (rust/crates/smallvec-1.10.0.crate) = 31564
+SHA256 (rust/crates/socket2-0.4.7.crate) = 02e2d2db9033d13a1567121ddd7a095ee144db4e1ca1b1bda3419bc0da294ebd
+SIZE (rust/crates/socket2-0.4.7.crate) = 44619
+SHA256 (rust/crates/spin-0.9.4.crate) = 7f6002a767bff9e83f8eeecf883ecb8011875a21ae8da43bffb817a57e78cc09
+SIZE (rust/crates/spin-0.9.4.crate) = 30180
+SHA256 (rust/crates/stable-pattern-0.1.0.crate) = 4564168c00635f88eaed410d5efa8131afa8d8699a612c80c455a0ba05c21045
+SIZE (rust/crates/stable-pattern-0.1.0.crate) = 16533
+SHA256 (rust/crates/standback-0.2.17.crate) = e113fb6f3de07a243d434a56ec6f186dfd51cb08448239fe7bcae73f87ff28ff
+SIZE (rust/crates/standback-0.2.17.crate) = 29011
+SHA256 (rust/crates/state-0.5.3.crate) = dbe866e1e51e8260c9eed836a042a5e7f6726bb2b411dffeaa712e19c388f23b
+SIZE (rust/crates/state-0.5.3.crate) = 30385
+SHA256 (rust/crates/stdweb-0.4.20.crate) = d022496b16281348b52d0e30ae99e01a73d737b2f45d38fed4edf79f9325a1d5
+SIZE (rust/crates/stdweb-0.4.20.crate) = 194102
+SHA256 (rust/crates/stdweb-derive-0.5.3.crate) = c87a60a40fccc84bef0652345bbbbbe20a605bf5d0ce81719fc476f5c03b50ef
+SIZE (rust/crates/stdweb-derive-0.5.3.crate) = 3894
+SHA256 (rust/crates/stdweb-internal-macros-0.2.9.crate) = 58fa5ff6ad0d98d1ffa8cb115892b6e69d67799f6763e162a1c9db421dc22e11
+SIZE (rust/crates/stdweb-internal-macros-0.2.9.crate) = 11828
+SHA256 (rust/crates/stdweb-internal-runtime-0.1.5.crate) = 213701ba3370744dcd1a12960caa4843b3d68b4d1c0a5d575e0d65b2ee9d16c0
+SIZE (rust/crates/stdweb-internal-runtime-0.1.5.crate) = 5445
+SHA256 (rust/crates/strsim-0.10.0.crate) = 73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623
+SIZE (rust/crates/strsim-0.10.0.crate) = 11355
+SHA256 (rust/crates/strum-0.24.1.crate) = 063e6045c0e62079840579a7e47a355ae92f60eb74daaf156fb1e84ba164e63f
+SIZE (rust/crates/strum-0.24.1.crate) = 5636
+SHA256 (rust/crates/strum_macros-0.24.3.crate) = 1e385be0d24f186b4ce2f9982191e7101bb737312ad61c1f2f984f34bcf85d59
+SIZE (rust/crates/strum_macros-0.24.3.crate) = 20696
+SHA256 (rust/crates/subtle-2.4.1.crate) = 6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601
+SIZE (rust/crates/subtle-2.4.1.crate) = 12630
+SHA256 (rust/crates/syn-1.0.105.crate) = 60b9b43d45702de4c839cb9b51d9f529c5dd26a4aff255b42b1ebc03e88ee908
+SIZE (rust/crates/syn-1.0.105.crate) = 237549
+SHA256 (rust/crates/syn-2.0.18.crate) = 32d41677bcbe24c20c52e7c70b0d8db04134c5d1066bf98662e2871ad200ea3e
+SIZE (rust/crates/syn-2.0.18.crate) = 240648
+SHA256 (rust/crates/syntect-5.0.0.crate) = c6c454c27d9d7d9a84c7803aaa3c50cd088d2906fe3c6e42da3209aa623576a8
+SIZE (rust/crates/syntect-5.0.0.crate) = 809452
+SHA256 (rust/crates/tempfile-3.3.0.crate) = 5cdb1ef4eaeeaddc8fbd371e5017057064af0911902ef36b39801f67cc6d79e4
+SIZE (rust/crates/tempfile-3.3.0.crate) = 27578
+SHA256 (rust/crates/termcolor-1.1.3.crate) = bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755
+SIZE (rust/crates/termcolor-1.1.3.crate) = 17242
+SHA256 (rust/crates/thiserror-1.0.37.crate) = 10deb33631e3c9018b9baf9dcbbc4f737320d2b576bac10f6aefa048fa407e3e
+SIZE (rust/crates/thiserror-1.0.37.crate) = 18752
+SHA256 (rust/crates/thiserror-impl-1.0.37.crate) = 982d17546b47146b28f7c22e3d08465f6b8903d0ea13c1660d9d84a6e7adcdbb
+SIZE (rust/crates/thiserror-impl-1.0.37.crate) = 15428
+SHA256 (rust/crates/thread_local-1.1.4.crate) = 5516c27b78311c50bf42c071425c560ac799b11c30b31f87e3081965fe5e0180
+SIZE (rust/crates/thread_local-1.1.4.crate) = 13106
+SHA256 (rust/crates/time-0.1.45.crate) = 1b797afad3f312d1c66a56d11d0316f916356d11bd158fbc6ca6389ff6bf805a
+SIZE (rust/crates/time-0.1.45.crate) = 28911
+SHA256 (rust/crates/time-0.2.27.crate) = 4752a97f8eebd6854ff91f1c1824cd6160626ac4bd44287f7f4ea2035a02a242
+SIZE (rust/crates/time-0.2.27.crate) = 65167
+SHA256 (rust/crates/time-0.3.17.crate) = a561bf4617eebd33bca6434b988f39ed798e527f51a1e797d0ee4f61c0a38376
+SIZE (rust/crates/time-0.3.17.crate) = 99048
+SHA256 (rust/crates/time-core-0.1.0.crate) = 2e153e1f1acaef8acc537e68b44906d2db6436e2b35ac2c6b42640fff91f00fd
+SIZE (rust/crates/time-core-0.1.0.crate) = 6597
+SHA256 (rust/crates/time-macros-0.1.1.crate) = 957e9c6e26f12cb6d0dd7fc776bb67a706312e7299aed74c8dd5b17ebb27e2f1
+SIZE (rust/crates/time-macros-0.1.1.crate) = 5447
+SHA256 (rust/crates/time-macros-0.2.6.crate) = d967f99f534ca7e495c575c62638eebc2898a8c84c119b89e250477bc4ba16b2
+SIZE (rust/crates/time-macros-0.2.6.crate) = 19163
+SHA256 (rust/crates/time-macros-impl-0.1.2.crate) = fd3c141a1b43194f3f56a1411225df8646c55781d5f26db825b3d98507eb482f
+SIZE (rust/crates/time-macros-impl-0.1.2.crate) = 10096
+SHA256 (rust/crates/tinyvec-1.6.0.crate) = 87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50
+SIZE (rust/crates/tinyvec-1.6.0.crate) = 45991
+SHA256 (rust/crates/tinyvec_macros-0.1.0.crate) = cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c
+SIZE (rust/crates/tinyvec_macros-0.1.0.crate) = 1817
+SHA256 (rust/crates/tokio-1.23.0.crate) = eab6d665857cc6ca78d6e80303a02cea7a7851e85dfbd77cbdc09bd129f1ef46
+SIZE (rust/crates/tokio-1.23.0.crate) = 621207
+SHA256 (rust/crates/tokio-macros-1.8.2.crate) = d266c00fde287f55d3f1c3e96c500c362a2b8c695076ec180f27918820bc6df8
+SIZE (rust/crates/tokio-macros-1.8.2.crate) = 10071
+SHA256 (rust/crates/tokio-native-tls-0.3.0.crate) = f7d995660bd2b7f8c1568414c1126076c13fbb725c40112dc0120b78eb9b717b
+SIZE (rust/crates/tokio-native-tls-0.3.0.crate) = 20759
+SHA256 (rust/crates/tokio-stream-0.1.11.crate) = d660770404473ccd7bc9f8b28494a811bc18542b915c0855c51e8f419d5223ce
+SIZE (rust/crates/tokio-stream-0.1.11.crate) = 33918
+SHA256 (rust/crates/tokio-util-0.7.4.crate) = 0bb2e075f03b3d66d8d8785356224ba688d2906a371015e225beeb65ca92c740
+SIZE (rust/crates/tokio-util-0.7.4.crate) = 93424
+SHA256 (rust/crates/toml-0.5.9.crate) = 8d82e1a7758622a465f8cee077614c73484dac5b836c02ff6a40d5d1010324d7
+SIZE (rust/crates/toml-0.5.9.crate) = 55667
+SHA256 (rust/crates/tower-service-0.3.2.crate) = b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52
+SIZE (rust/crates/tower-service-0.3.2.crate) = 6847
+SHA256 (rust/crates/tracing-0.1.37.crate) = 8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8
+SIZE (rust/crates/tracing-0.1.37.crate) = 73888
+SHA256 (rust/crates/tracing-attributes-0.1.23.crate) = 4017f8f45139870ca7e672686113917c71c7a6e02d4924eda67186083c03081a
+SIZE (rust/crates/tracing-attributes-0.1.23.crate) = 30450
+SHA256 (rust/crates/tracing-core-0.1.30.crate) = 24eb03ba0eab1fd845050058ce5e616558e8f8d8fca633e6b163fe25c797213a
+SIZE (rust/crates/tracing-core-0.1.30.crate) = 60351
+SHA256 (rust/crates/tracing-log-0.1.3.crate) = 78ddad33d2d10b1ed7eb9d1f518a5674713876e97e5bb9b7345a7984fbb4f922
+SIZE (rust/crates/tracing-log-0.1.3.crate) = 20549
+SHA256 (rust/crates/tracing-subscriber-0.3.16.crate) = a6176eae26dd70d0c919749377897b54a9276bd7061339665dd68777926b5a70
+SIZE (rust/crates/tracing-subscriber-0.3.16.crate) = 193572
+SHA256 (rust/crates/try-lock-0.2.3.crate) = 59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642
+SIZE (rust/crates/try-lock-0.2.3.crate) = 4158
+SHA256 (rust/crates/tui-0.16.0.crate) = 39c8ce4e27049eed97cfa363a5048b09d995e209994634a0efc26a14ab6c0c23
+SIZE (rust/crates/tui-0.16.0.crate) = 142363
+SHA256 (rust/crates/type1-encoding-parser-0.1.0.crate) = d3d6cc09e1a99c7e01f2afe4953789311a1c50baebbdac5b477ecf78e2e92a5b
+SIZE (rust/crates/type1-encoding-parser-0.1.0.crate) = 2979
+SHA256 (rust/crates/typenum-1.16.0.crate) = 497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba
+SIZE (rust/crates/typenum-1.16.0.crate) = 42477
+SHA256 (rust/crates/ubyte-0.10.3.crate) = c81f0dae7d286ad0d9366d7679a77934cfc3cf3a8d67e82669794412b2368fe6
+SIZE (rust/crates/ubyte-0.10.3.crate) = 13665
+SHA256 (rust/crates/ucd-trie-0.1.5.crate) = 9e79c4d996edb816c91e4308506774452e55e95c3c9de07b6729e17e15a5ef81
+SIZE (rust/crates/ucd-trie-0.1.5.crate) = 45391
+SHA256 (rust/crates/uncased-0.9.7.crate) = 09b01702b0fd0b3fadcf98e098780badda8742d4f4a7676615cad90e8ac73622
+SIZE (rust/crates/uncased-0.9.7.crate) = 10525
+SHA256 (rust/crates/unicase-2.6.0.crate) = 50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6
+SIZE (rust/crates/unicase-2.6.0.crate) = 23478
+SHA256 (rust/crates/unicode-bidi-0.3.8.crate) = 099b7128301d285f79ddd55b9a83d5e6b9e97c92e0ea0daebee7263e932de992
+SIZE (rust/crates/unicode-bidi-0.3.8.crate) = 36575
+SHA256 (rust/crates/unicode-ident-1.0.5.crate) = 6ceab39d59e4c9499d4e5a8ee0e2735b891bb7308ac83dfb4e80cad195c9f6f3
+SIZE (rust/crates/unicode-ident-1.0.5.crate) = 35455
+SHA256 (rust/crates/unicode-normalization-0.1.22.crate) = 5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921
+SIZE (rust/crates/unicode-normalization-0.1.22.crate) = 122604
+SHA256 (rust/crates/unicode-segmentation-1.10.0.crate) = 0fdbf052a0783de01e944a6ce7a8cb939e295b1e7be835a1112c3b9a7f047a5a
+SIZE (rust/crates/unicode-segmentation-1.10.0.crate) = 93893
+SHA256 (rust/crates/unicode-width-0.1.10.crate) = c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b
+SIZE (rust/crates/unicode-width-0.1.10.crate) = 18968
+SHA256 (rust/crates/unicode-xid-0.2.4.crate) = f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c
+SIZE (rust/crates/unicode-xid-0.2.4.crate) = 15352
+SHA256 (rust/crates/universal-hash-0.5.0.crate) = 7d3160b73c9a19f7e2939a2fdad446c57c1bbbbf4d919d3213ff1267a580d8b5
+SIZE (rust/crates/universal-hash-0.5.0.crate) = 9137
+SHA256 (rust/crates/unsafe-libyaml-0.2.4.crate) = c1e5fa573d8ac5f1a856f8d7be41d390ee973daf97c806b2c1a465e4e1406e68
+SIZE (rust/crates/unsafe-libyaml-0.2.4.crate) = 61183
+SHA256 (rust/crates/url-2.3.1.crate) = 0d68c799ae75762b8c3fe375feb6600ef5602c883c5d21eb51c09f22b83c4643
+SIZE (rust/crates/url-2.3.1.crate) = 72777
+SHA256 (rust/crates/utf8parse-0.2.1.crate) = 711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a
+SIZE (rust/crates/utf8parse-0.2.1.crate) = 13435
+SHA256 (rust/crates/valuable-0.1.0.crate) = 830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d
+SIZE (rust/crates/valuable-0.1.0.crate) = 27718
+SHA256 (rust/crates/value-bag-1.0.0-alpha.9.crate) = 2209b78d1249f7e6f3293657c9779fe31ced465df091bbd433a1cf88e916ec55
+SIZE (rust/crates/value-bag-1.0.0-alpha.9.crate) = 26630
+SHA256 (rust/crates/vcpkg-0.2.15.crate) = accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426
+SIZE (rust/crates/vcpkg-0.2.15.crate) = 228735
+SHA256 (rust/crates/version_check-0.9.4.crate) = 49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f
+SIZE (rust/crates/version_check-0.9.4.crate) = 14895
+SHA256 (rust/crates/waker-fn-1.1.0.crate) = 9d5b2c62b4012a3e1eca5a7e077d13b3bf498c4073e33ccd58626607748ceeca
+SIZE (rust/crates/waker-fn-1.1.0.crate) = 7114
+SHA256 (rust/crates/walkdir-2.3.2.crate) = 808cf2735cd4b6866113f648b791c6adc5714537bc222d9347bb203386ffda56
+SIZE (rust/crates/walkdir-2.3.2.crate) = 23516
+SHA256 (rust/crates/want-0.3.0.crate) = 1ce8a968cb1cd110d136ff8b819a556d6fb6d919363c61534f6860c7eb172ba0
+SIZE (rust/crates/want-0.3.0.crate) = 6550
+SHA256 (rust/crates/wasi-0.10.0+wasi-snapshot-preview1.crate) = 1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f
+SIZE (rust/crates/wasi-0.10.0+wasi-snapshot-preview1.crate) = 26964
+SHA256 (rust/crates/wasi-0.11.0+wasi-snapshot-preview1.crate) = 9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423
+SIZE (rust/crates/wasi-0.11.0+wasi-snapshot-preview1.crate) = 28131
+SHA256 (rust/crates/wasm-bindgen-0.2.83.crate) = eaf9f5aceeec8be17c128b2e93e031fb8a4d469bb9c4ae2d7dc1888b26887268
+SIZE (rust/crates/wasm-bindgen-0.2.83.crate) = 169618
+SHA256 (rust/crates/wasm-bindgen-backend-0.2.83.crate) = 4c8ffb332579b0557b52d268b91feab8df3615f265d5270fec2a8c95b17c1142
+SIZE (rust/crates/wasm-bindgen-backend-0.2.83.crate) = 25620
+SHA256 (rust/crates/wasm-bindgen-futures-0.4.33.crate) = 23639446165ca5a5de86ae1d8896b737ae80319560fbaa4c2887b7da6e7ebd7d
+SIZE (rust/crates/wasm-bindgen-futures-0.4.33.crate) = 15216
+SHA256 (rust/crates/wasm-bindgen-macro-0.2.83.crate) = 052be0f94026e6cbc75cdefc9bae13fd6052cdcaf532fa6c45e7ae33a1e6c810
+SIZE (rust/crates/wasm-bindgen-macro-0.2.83.crate) = 12075
+SHA256 (rust/crates/wasm-bindgen-macro-support-0.2.83.crate) = 07bc0c051dc5f23e307b13285f9d75df86bfdf816c5721e573dec1f9b8aa193c
+SIZE (rust/crates/wasm-bindgen-macro-support-0.2.83.crate) = 18530
+SHA256 (rust/crates/wasm-bindgen-shared-0.2.83.crate) = 1c38c045535d93ec4f0b4defec448e4291638ee608530863b1e2ba115d4fff7f
+SIZE (rust/crates/wasm-bindgen-shared-0.2.83.crate) = 7194
+SHA256 (rust/crates/web-sys-0.3.60.crate) = bcda906d8be16e728fd5adc5b729afad4e444e106ab28cd1c7256e54fa61510f
+SIZE (rust/crates/web-sys-0.3.60.crate) = 700485
+SHA256 (rust/crates/webbrowser-0.8.2.crate) = 2a0cc7962b5aaa0dfcebaeef0161eec6edf5f4606c12e6777fd7d392f52033a5
+SIZE (rust/crates/webbrowser-0.8.2.crate) = 26787
+SHA256 (rust/crates/wepoll-ffi-0.1.2.crate) = d743fdedc5c64377b5fc2bc036b01c7fd642205a0d96356034ae3404d49eb7fb
+SIZE (rust/crates/wepoll-ffi-0.1.2.crate) = 31309
+SHA256 (rust/crates/widestring-1.0.2.crate) = 653f141f39ec16bba3c5abe400a0c60da7468261cc2cbf36805022876bc721a8
+SIZE (rust/crates/widestring-1.0.2.crate) = 79706
+SHA256 (rust/crates/winapi-0.3.9.crate) = 5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419
+SIZE (rust/crates/winapi-0.3.9.crate) = 1200382
+SHA256 (rust/crates/winapi-i686-pc-windows-gnu-0.4.0.crate) = ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6
+SIZE (rust/crates/winapi-i686-pc-windows-gnu-0.4.0.crate) = 2918815
+SHA256 (rust/crates/winapi-util-0.1.5.crate) = 70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178
+SIZE (rust/crates/winapi-util-0.1.5.crate) = 10164
+SHA256 (rust/crates/winapi-x86_64-pc-windows-gnu-0.4.0.crate) = 712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f
+SIZE (rust/crates/winapi-x86_64-pc-windows-gnu-0.4.0.crate) = 2947998
+SHA256 (rust/crates/windows-0.32.0.crate) = fbedf6db9096bc2364adce0ae0aa636dcd89f3c3f2cd67947062aaf0ca2a10ec
+SIZE (rust/crates/windows-0.32.0.crate) = 14154519
+SHA256 (rust/crates/windows-sys-0.36.1.crate) = ea04155a16a59f9eab786fe12a4a450e75cdb175f9e0d80da1e17db09f55b8d2
+SIZE (rust/crates/windows-sys-0.36.1.crate) = 3347053
+SHA256 (rust/crates/windows-sys-0.42.0.crate) = 5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7
+SIZE (rust/crates/windows-sys-0.42.0.crate) = 3006791
+SHA256 (rust/crates/windows-sys-0.48.0.crate) = 677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9
+SIZE (rust/crates/windows-sys-0.48.0.crate) = 2628884
+SHA256 (rust/crates/windows-targets-0.48.0.crate) = 7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5
+SIZE (rust/crates/windows-targets-0.48.0.crate) = 7466
+SHA256 (rust/crates/windows_aarch64_gnullvm-0.42.0.crate) = 41d2aa71f6f0cbe00ae5167d90ef3cfe66527d6f613ca78ac8024c3ccab9a19e
+SIZE (rust/crates/windows_aarch64_gnullvm-0.42.0.crate) = 357917
+SHA256 (rust/crates/windows_aarch64_gnullvm-0.48.0.crate) = 91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc
+SIZE (rust/crates/windows_aarch64_gnullvm-0.48.0.crate) = 366543
+SHA256 (rust/crates/windows_aarch64_msvc-0.32.0.crate) = d8e92753b1c443191654ec532f14c199742964a061be25d77d7a96f09db20bf5
+SIZE (rust/crates/windows_aarch64_msvc-0.32.0.crate) = 673810
+SHA256 (rust/crates/windows_aarch64_msvc-0.36.1.crate) = 9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47
+SIZE (rust/crates/windows_aarch64_msvc-0.36.1.crate) = 661960
+SHA256 (rust/crates/windows_aarch64_msvc-0.42.0.crate) = dd0f252f5a35cac83d6311b2e795981f5ee6e67eb1f9a7f64eb4500fbc4dcdb4
+SIZE (rust/crates/windows_aarch64_msvc-0.42.0.crate) = 659424
+SHA256 (rust/crates/windows_aarch64_msvc-0.48.0.crate) = b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3
+SIZE (rust/crates/windows_aarch64_msvc-0.48.0.crate) = 671479
+SHA256 (rust/crates/windows_i686_gnu-0.32.0.crate) = 6a711c68811799e017b6038e0922cb27a5e2f43a2ddb609fe0b6f3eeda9de615
+SIZE (rust/crates/windows_i686_gnu-0.32.0.crate) = 772251
+SHA256 (rust/crates/windows_i686_gnu-0.36.1.crate) = 180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6
+SIZE (rust/crates/windows_i686_gnu-0.36.1.crate) = 818115
+SHA256 (rust/crates/windows_i686_gnu-0.42.0.crate) = fbeae19f6716841636c28d695375df17562ca208b2b7d0dc47635a50ae6c5de7
+SIZE (rust/crates/windows_i686_gnu-0.42.0.crate) = 728570
+SHA256 (rust/crates/windows_i686_gnu-0.48.0.crate) = 622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241
+SIZE (rust/crates/windows_i686_gnu-0.48.0.crate) = 741490
+SHA256 (rust/crates/windows_i686_msvc-0.32.0.crate) = 146c11bb1a02615db74680b32a68e2d61f553cc24c4eb5b4ca10311740e44172
+SIZE (rust/crates/windows_i686_msvc-0.32.0.crate) = 733422
+SHA256 (rust/crates/windows_i686_msvc-0.36.1.crate) = e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024
+SIZE (rust/crates/windows_i686_msvc-0.36.1.crate) = 724575
+SHA256 (rust/crates/windows_i686_msvc-0.42.0.crate) = 84c12f65daa39dd2babe6e442988fc329d6243fdce47d7d2d155b8d874862246
+SIZE (rust/crates/windows_i686_msvc-0.42.0.crate) = 717477
+SHA256 (rust/crates/windows_i686_msvc-0.48.0.crate) = 4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00
+SIZE (rust/crates/windows_i686_msvc-0.48.0.crate) = 730056
+SHA256 (rust/crates/windows_x86_64_gnu-0.32.0.crate) = c912b12f7454c6620635bbff3450962753834be2a594819bd5e945af18ec64bc
+SIZE (rust/crates/windows_x86_64_gnu-0.32.0.crate) = 744209
+SHA256 (rust/crates/windows_x86_64_gnu-0.36.1.crate) = 4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1
+SIZE (rust/crates/windows_x86_64_gnu-0.36.1.crate) = 790934
+SHA256 (rust/crates/windows_x86_64_gnu-0.42.0.crate) = bf7b1b21b5362cbc318f686150e5bcea75ecedc74dd157d874d754a2ca44b0ed
+SIZE (rust/crates/windows_x86_64_gnu-0.42.0.crate) = 692493
+SHA256 (rust/crates/windows_x86_64_gnu-0.48.0.crate) = ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1
+SIZE (rust/crates/windows_x86_64_gnu-0.48.0.crate) = 703595
+SHA256 (rust/crates/windows_x86_64_gnullvm-0.42.0.crate) = 09d525d2ba30eeb3297665bd434a54297e4170c7f1a44cad4ef58095b4cd2028
+SIZE (rust/crates/windows_x86_64_gnullvm-0.42.0.crate) = 357906
+SHA256 (rust/crates/windows_x86_64_gnullvm-0.48.0.crate) = 7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953
+SIZE (rust/crates/windows_x86_64_gnullvm-0.48.0.crate) = 366536
+SHA256 (rust/crates/windows_x86_64_msvc-0.32.0.crate) = 504a2476202769977a040c6364301a3f65d0cc9e3fb08600b2bda150a0488316
+SIZE (rust/crates/windows_x86_64_msvc-0.32.0.crate) = 669835
+SHA256 (rust/crates/windows_x86_64_msvc-0.36.1.crate) = c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680
+SIZE (rust/crates/windows_x86_64_msvc-0.36.1.crate) = 661999
+SHA256 (rust/crates/windows_x86_64_msvc-0.42.0.crate) = f40009d85759725a34da6d89a94e63d7bdc50a862acf0dbc7c8e488f1edcb6f5
+SIZE (rust/crates/windows_x86_64_msvc-0.42.0.crate) = 659377
+SHA256 (rust/crates/windows_x86_64_msvc-0.48.0.crate) = 1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a
+SIZE (rust/crates/windows_x86_64_msvc-0.48.0.crate) = 671422
+SHA256 (rust/crates/winreg-0.10.1.crate) = 80d0f4e272c85def139476380b12f9ac60926689dd2e01d4923222f40580869d
+SIZE (rust/crates/winreg-0.10.1.crate) = 25725
+SHA256 (rust/crates/xml-rs-0.8.4.crate) = d2d7d3948613f75c98fd9328cfdcc45acc4d360655289d0a7d4ec931392200a3
+SIZE (rust/crates/xml-rs-0.8.4.crate) = 52690
+SHA256 (rust/crates/yaml-rust-0.4.5.crate) = 56c1936c4cc7a1c9ab21a1ebb602eb942ba868cbd44a99cb7cdc5892335e1c85
+SIZE (rust/crates/yaml-rust-0.4.5.crate) = 47783
+SHA256 (rust/crates/yansi-0.5.1.crate) = 09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec
+SIZE (rust/crates/yansi-0.5.1.crate) = 16525
+SHA256 (rust/crates/zip-0.6.3.crate) = 537ce7411d25e54e8ae21a7ce0b15840e7bfcff15b51d697ec3266cc76bdf080
+SIZE (rust/crates/zip-0.6.3.crate) = 61785
+SHA256 (rust/crates/zstd-0.11.2+zstd.1.5.2.crate) = 20cc960326ece64f010d2d2107537f26dc589a6573a316bd5b1dba685fa5fde4
+SIZE (rust/crates/zstd-0.11.2+zstd.1.5.2.crate) = 28987
+SHA256 (rust/crates/zstd-safe-5.0.2+zstd.1.5.2.crate) = 1d2a5585e04f9eea4b2a3d1eca508c4dee9592a89ef6f450c11719da0726f4db
+SIZE (rust/crates/zstd-safe-5.0.2+zstd.1.5.2.crate) = 17273
+SHA256 (rust/crates/zstd-sys-2.0.4+zstd.1.5.2.crate) = 4fa202f2ef00074143e219d15b62ffc317d17cc33909feac471c044087cad7b0
+SIZE (rust/crates/zstd-sys-2.0.4+zstd.1.5.2.crate) = 713677
+SHA256 (phodal-quake-v0.5.1-57-gbb8ae55_GH0.tar.gz) = 997300a369fca90ca5d3f2cf01ac00e8aa162912a89c2d406264c2a0035e21a8
+SIZE (phodal-quake-v0.5.1-57-gbb8ae55_GH0.tar.gz) = 1578645
diff --git a/databases/quake/pkg-descr b/databases/quake/pkg-descr
new file mode 100644
index 000000000000..21b386fd4aa9
--- /dev/null
+++ b/databases/quake/pkg-descr
@@ -0,0 +1,9 @@
+Quake is a knowledge management meta-framework for geeks.
+It can:
+- freedom text content management. todo lists, article management, book reviews,
+  notes, etc.
+- construct a knowledge network system. customized markdown link
+- fleeting inspiration.support quick start (CLI, TUI, Web, GUI) and global
+  search
+- freely present the canvas. DSL and free Sketchpad
+- graph engine
diff --git a/databases/recutils/Makefile b/databases/recutils/Makefile
index 481ed98481f8..d28a59c27cd6 100644
--- a/databases/recutils/Makefile
+++ b/databases/recutils/Makefile
@@ -1,20 +1,21 @@
-# Created by: Alexey Dokuchaev <danfe@FreeBSD.org>
-
 PORTNAME=	recutils
-PORTVERSION=	1.8
+DISTVERSION=	1.9
 PORTREVISION=	1
 CATEGORIES=	databases
 MASTER_SITES=	GNU
 
 MAINTAINER=	zeus@gnu.org.ua
 COMMENT=	Tools and libraries to access human-editable, plain text databases
+WWW=		https://www.gnu.org/software/recutils/
 
 LICENSE=	GPLv3+
 
 LIB_DEPENDS=	libuuid.so:misc/e2fsprogs-libuuid
 
-USES=		charsetfix libtool makeinfo pkgconfig readline
+USES=		charsetfix cpe libtool makeinfo pkgconfig readline
+CPE_VENDOR=	gnu
 GNU_CONFIGURE=	yes
+GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
 USE_LDCONFIG=	yes
 INSTALL_TARGET=	install-strip
 
@@ -53,10 +54,6 @@ post-patch:
 	@${REINPLACE_CMD} -e 's,mdb_init,mdb_get_version,' \
 		${WRKSRC}/configure
 
-post-install:
-	${INSTALL_DATA} ${WRKSRC}/etc/*.el \
-		${STAGEDIR}${PREFIX}/share/emacs/site-lisp
-
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
diff --git a/databases/recutils/distinfo b/databases/recutils/distinfo
index 16a178f4a33a..1a2296dcd80a 100644
--- a/databases/recutils/distinfo
+++ b/databases/recutils/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1546510437
-SHA256 (recutils-1.8.tar.gz) = df8eae69593fdba53e264cbf4b2307dfb82120c09b6fab23e2dad51a89a5b193
-SIZE (recutils-1.8.tar.gz) = 2474024
+TIMESTAMP = 1683954283
+SHA256 (recutils-1.9.tar.gz) = 6301592b0020c14b456757ef5d434d49f6027b8e5f3a499d13362f205c486e0e
+SIZE (recutils-1.9.tar.gz) = 2759999
diff --git a/databases/recutils/files/patch-utils_mdb2rec.c b/databases/recutils/files/patch-utils_mdb2rec.c
index c1290edb9c1d..b4c2e3aac59e 100644
--- a/databases/recutils/files/patch-utils_mdb2rec.c
+++ b/databases/recutils/files/patch-utils_mdb2rec.c
@@ -1,6 +1,6 @@
---- utils/mdb2rec.c.orig	2019-01-03 08:47:43 UTC
+--- utils/mdb2rec.c.orig	2022-04-16 15:56:37 UTC
 +++ utils/mdb2rec.c
-@@ -33,7 +33,7 @@
+@@ -26,7 +26,7 @@
  #include <gettext.h>
  #define _(str) gettext (str)
  
@@ -9,7 +9,7 @@
  #include <mdbtools.h>
  
  #include <rec.h>
-@@ -472,16 +472,14 @@ process_mdb (void)
+@@ -427,14 +427,12 @@ process_mdb (void)
    if (!db)
      recutl_out_of_memory ();
  
@@ -19,10 +19,8 @@
 -
    mdb = mdb_open (mdb2rec_mdb_file, MDB_NOFLAGS);
    if (!mdb)
-     {
-       recutl_fatal (_("could not open file %s\n"),
-                     mdb2rec_mdb_file);
-     }
+     recutl_fatal (_("could not open file %s\n"),
+                   mdb2rec_mdb_file);
 +
 +  mdb_set_date_fmt (mdb, "%Y-%m-%dT%H:%M:%S%z"); /* ISO 8601 */
  
diff --git a/databases/recutils/pkg-descr b/databases/recutils/pkg-descr
index 8734018c2a33..622d73ca2399 100644
--- a/databases/recutils/pkg-descr
+++ b/databases/recutils/pkg-descr
@@ -13,5 +13,3 @@ and to manipulate automatically.  Obviously they are not suitable for many
 tasks (for example, it can be difficult to manage hierarchies in recfiles)
 and performance is somewhat sacrificed in favor of readability, but they are
 quite handy to store small to medium simple databases.
-
-WWW: http://www.gnu.org/software/recutils/
diff --git a/databases/recutils/pkg-plist b/databases/recutils/pkg-plist
index c0be591493a5..f6663de2e049 100644
--- a/databases/recutils/pkg-plist
+++ b/databases/recutils/pkg-plist
@@ -21,18 +21,16 @@ lib/librec.so.1.0.0
 %%BASH%%lib/testrec.so
 %%BASH%%lib/testrec.so.0
 %%BASH%%lib/testrec.so.0.0.0
-man/man1/csv2rec.1.gz
-%%MDB%%man/man1/mdb2rec.1.gz
-man/man1/rec2csv.1.gz
-man/man1/recdel.1.gz
-man/man1/recfix.1.gz
-man/man1/recfmt.1.gz
-man/man1/recinf.1.gz
-man/man1/recins.1.gz
-man/man1/recsel.1.gz
-man/man1/recset.1.gz
-share/emacs/site-lisp/ob-rec.el
-share/emacs/site-lisp/rec-mode.el
+share/man/man1/csv2rec.1.gz
+%%MDB%%share/man/man1/mdb2rec.1.gz
+share/man/man1/rec2csv.1.gz
+share/man/man1/recdel.1.gz
+share/man/man1/recfix.1.gz
+share/man/man1/recfmt.1.gz
+share/man/man1/recinf.1.gz
+share/man/man1/recins.1.gz
+share/man/man1/recsel.1.gz
+share/man/man1/recset.1.gz
 %%NLS%%share/locale/de/LC_MESSAGES/recutils.mo
 %%NLS%%share/locale/es/LC_MESSAGES/recutils.mo
 %%NLS%%share/locale/fi/LC_MESSAGES/recutils.mo
diff --git a/databases/redis-devel/Makefile b/databases/redis-devel/Makefile
index 7999b4e9079d..32d6b39656e8 100644
--- a/databases/redis-devel/Makefile
+++ b/databases/redis-devel/Makefile
@@ -1,111 +1,66 @@
-# Created by: Sergey Skvortsov <skv@protey.ru>
-
 PORTNAME=	redis
-PORTVERSION=	7.0.0.20210916
+DISTVERSION=	7.2.4.20240229
+PORTREVISION=	1
 CATEGORIES=	databases
 PKGNAMESUFFIX=	-devel
 
-MAINTAINER=	osa@FreeBSD.org
+MAINTAINER=	yasu@FreeBSD.org
 COMMENT=	Persistent key-value database with built-in net interface
+WWW=		https://redis.io/
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-USES+=		compiler:c11 gmake
+USES+=		compiler:c11 cpe gmake tcl:test
+CPE_VENDOR=	redislabs
 USE_GITHUB=	yes
-GH_TUPLE=	redis:redis:f898a9e
-
-OPTIONS_DEFINE=	JEMALLOC TESTS TLS TRIB
-OPTIONS_RADIO=	EXTLUA
-OPTIONS_RADIO_EXTLUA=	LUA LUAJIT LUAJITOR
-OPTIONS_SUB=	yes
-JEMALLOC_DESC=	Use jemalloc
-LUA_DESC=	Use lang/lua instead of builtin lua
-LUAJIT_DESC=	Use lang/luajit instead of builtin lua
-LUAJITOR_DESC=	Use lang/luajit-openresty instead of builtin lua
-TLS_DESC=	Use TLS (openssl req.)
-TESTS_DESC=	Install lang/tcl for redis unit tests
-TRIB_DESC=	Install redis-trib.rb (lang/ruby req.)
-
-MAKE_ENV=	V=yo OPTIMIZATION=
-
-JEMALLOC_MAKE_ENV=	USE_JEMALLOC=yes
-
-LUA_USES=		lua:51
-LUA_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-src-Makefile.lua
-LUA_VARS=		_addflags=true
-
-LUAJIT_LIB_DEPENDS=	libluajit-5.1.so:lang/luajit
-LUAJIT_BUILD_DEPENDS=	${LOCALBASE}/include/luajit-2.0/lua.h:lang/luajit
-LUAJIT_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-src-Makefile.luajit
-LUAJIT_VARS=		_addflags=true
-
-LUAJITOR_LIB_DEPENDS=	libluajit-5.1.so:lang/luajit-openresty
-LUAJITOR_BUILD_DEPENDS=	${LOCALBASE}/include/luajit-2.1/lua.h:lang/luajit-openresty
-LUAJITOR_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-src-Makefile.luajit-or \
-			${PATCHDIR}/extra-patch-deps_lua_src_lua__cjson.c
-LUAJITOR_VARS=		_addflags=true
+GH_TAGNAME=	f17381a38
+USE_RC_SUBR=	redis sentinel
 
-TESTS_USES=	tcl:build
+MAKE_ENV=	OPTIMIZATION= \
+		V=yo
 
-TLS_USES=	ssl
-TLS_MAKE_ENV=	BUILD_TLS=yes
+LDFLAGS+=	-lpthread -lm -lexecinfo
 
-TRIB_CATEGORIES=	ruby
-TRIB_USE=		ruby=yes
-TRIB_RUN_DEPENDS=	rubygem-redis>=2.2:databases/rubygem-redis
+CONFLICTS_INSTALL=	redis redis6 redis62 redis70 # etc/rc.d/redis
 
-.include <bsd.port.pre.mk>
+PORTSCOUT=	ignore:1
+SUB_FILES=	pkg-message
+SUB_LIST+=	PORTNAME=${PORTNAME} \
+		REDIS_DBDIR=${REDIS_DBDIR} \
+		REDIS_LOGDIR=${REDIS_LOGDIR} \
+		REDIS_RUNDIR=${REDIS_RUNDIR} \
+		REDIS_USER=${USERS}
 
-.if ${ARCH} == i386 && ! ${CFLAGS:M-march=*}
-# Needed for __atomic_fetch_add_8
-USE_GCC=	yes
-CFLAGS+=	-march=i586
-.endif
+USERS=		redis
+GROUPS=		redis
 
-.if defined(_ADDFLAGS)
-CFLAGS=		-fPIC
-LDFLAGS=	-Wl,-E
-.endif
+PLIST_SUB+=	REDIS_DBDIR=${REDIS_DBDIR} \
+		REDIS_GROUP=${GROUPS} \
+		REDIS_LOGDIR=${REDIS_LOGDIR} \
+		REDIS_RUNDIR=${REDIS_RUNDIR} \
+		REDIS_USER=${USERS}
 
-LDFLAGS+=	-lpthread -lm -lexecinfo
+OPTIONS_DEFINE=		JEMALLOC TLS
+OPTIONS_DEFAULT=	TLS
+OPTIONS_SUB=		yes
 
-CONFLICTS?=	redis5-5.* redis6-6.* redis-6.*
+JEMALLOC_DESC=	Use jemalloc
+TLS_DESC=	Use TLS (openssl req.)
 
-USE_RC_SUBR=	redis sentinel
-BIN_FILES=	redis-benchmark redis-check-aof redis-check-rdb \
-		redis-cli redis-sentinel redis-server
+JEMALLOC_MAKE_ENV=	USE_JEMALLOC=yes
+TLS_USES=		ssl
+TLS_MAKE_ENV=		BUILD_TLS=yes
 
-USERS=	redis
-GROUPS=	redis
+BIN_FILES=	redis-benchmark redis-check-aof redis-check-rdb redis-cli \
+		redis-sentinel redis-server
 
 REDIS_DBDIR?=	/var/db/redis
 REDIS_RUNDIR?=	/var/run/redis
 REDIS_LOGDIR?=	/var/log/redis
 
-SUB_FILES=	pkg-message
-SUB_LIST+=	PORTNAME=${PORTNAME} \
-	REDIS_USER=${USERS} \
-	REDIS_DBDIR=${REDIS_DBDIR} \
-	REDIS_LOGDIR=${REDIS_LOGDIR} \
-	REDIS_RUNDIR=${REDIS_RUNDIR}
-
-PLIST_SUB+=	REDIS_USER=${USERS} \
-	REDIS_GROUP=${GROUPS} \
-	REDIS_LOGDIR=${REDIS_LOGDIR} \
-	REDIS_DBDIR=${REDIS_DBDIR} \
-	REDIS_RUNDIR=${REDIS_RUNDIR}
-
-post-patch:
-	${REINPLACE_CMD} '77s!malloc.h!stdlib.h!' ${WRKSRC}/src/zmalloc.h
-
 post-patch-JEMALLOC-on:
-	@${REINPLACE_CMD} '35s!Linux!FreeBSD!g' ${WRKSRC}/src/Makefile
-
-post-patch-LUA-on:
-	@cd ${WRKSRC}/deps/lua/src && ${CP} fpconv.* lua_* strbuf.* ${WRKSRC}/src/
-post-patch-LUAJIT-on:	post-patch-LUA-on
-post-patch-LUAJITOR-on:	post-patch-LUA-on
+	@${REINPLACE_CMD} '72s!Linux!FreeBSD!g' ${WRKSRC}/src/Makefile
 
 post-build:
 	${SED} ${SUB_LIST:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
@@ -119,10 +74,7 @@ do-install:
 		${STAGEDIR}${REDIS_DBDIR} \
 		${STAGEDIR}${REDIS_RUNDIR}
 
-do-install-TRIB-on:
-	${INSTALL_SCRIPT} ${WRKSRC}/src/redis-trib.rb ${STAGEDIR}${PREFIX}/bin/
-
 do-test:
 	@cd ${WRKSRC} && ${TCLSH} tests/test_helper.tcl
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/databases/redis-devel/distinfo b/databases/redis-devel/distinfo
index c16301842e36..bce582a956bd 100644
--- a/databases/redis-devel/distinfo
+++ b/databases/redis-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1631895282
-SHA256 (redis-redis-7.0.0.20210916-f898a9e_GH0.tar.gz) = 66b094130140e919a1a269f4e65ca9e4902abaa6ede7f3f185b40a1d85b12133
-SIZE (redis-redis-7.0.0.20210916-f898a9e_GH0.tar.gz) = 2557073
+TIMESTAMP = 1709245097
+SHA256 (redis-redis-7.2.4.20240229-f17381a38_GH0.tar.gz) = 8859d064d40b0accd284e7375ca71252a01af9ded9de7d6a18913e41633ed81e
+SIZE (redis-redis-7.2.4.20240229-f17381a38_GH0.tar.gz) = 3471107
diff --git a/databases/redis-devel/files/extra-patch-deps_lua_src_lua__cjson.c b/databases/redis-devel/files/extra-patch-deps_lua_src_lua__cjson.c
deleted file mode 100644
index 847b70d25dea..000000000000
--- a/databases/redis-devel/files/extra-patch-deps_lua_src_lua__cjson.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- deps/lua/src/lua_cjson.c.orig	2019-12-08 07:56:31.419672000 -0500
-+++ deps/lua/src/lua_cjson.c	2019-12-08 07:56:52.389362000 -0500
-@@ -1299,7 +1299,7 @@
-  *
-  * luaL_setfuncs() is used to create a module table where the functions have
-  * json_config_t as their first upvalue. Code borrowed from Lua 5.2 source. */
--static void luaL_setfuncs (lua_State *l, const luaL_Reg *reg, int nup)
-+void luaL_setfuncs (lua_State *l, const luaL_Reg *reg, int nup)
- {
-     int i;
- 
diff --git a/databases/redis-devel/files/extra-patch-src-Makefile.lua b/databases/redis-devel/files/extra-patch-src-Makefile.lua
deleted file mode 100644
index 25b57390aea4..000000000000
--- a/databases/redis-devel/files/extra-patch-src-Makefile.lua
+++ /dev/null
@@ -1,58 +0,0 @@
---- src/Makefile.orig	2021-01-12 09:21:03.000000000 -0500
-+++ src/Makefile	2021-01-13 11:52:33.070529000 -0500
-@@ -16,7 +16,7 @@
- uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not')
- uname_M := $(shell sh -c 'uname -m 2>/dev/null || echo not')
- OPTIMIZATION?=-O2
--DEPENDENCY_TARGETS=hiredis linenoise lua hdr_histogram
-+DEPENDENCY_TARGETS=hiredis linenoise hdr_histogram
- NODEPS:=clean distclean
- 
- # Default settings
-@@ -83,8 +83,8 @@
- # Override default settings if possible
- -include .make-settings
- 
--FINAL_CFLAGS=$(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) $(REDIS_CFLAGS)
--FINAL_LDFLAGS=$(LDFLAGS) $(REDIS_LDFLAGS) $(DEBUG)
-+FINAL_CFLAGS=$(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS)
-+FINAL_LDFLAGS=$(LDFLAGS) $(DEBUG)
- FINAL_LIBS=-lm
- DEBUG=-g -ggdb
- 
-@@ -188,7 +188,7 @@
- endif
- endif
- # Include paths to dependencies
--FINAL_CFLAGS+= -I../deps/hiredis -I../deps/linenoise -I../deps/lua/src -I../deps/hdr_histogram
-+FINAL_CFLAGS+= -I../deps/hiredis -I../deps/linenoise -I../deps/hdr_histogram
- 
- # Determine systemd support and/or build preference (defaulting to auto-detection)
- BUILD_WITH_SYSTEMD=no
-@@ -251,6 +251,9 @@
- 	FINAL_LIBS += ../deps/hiredis/libhiredis_ssl.a $(LIBSSL_LIBS) $(LIBCRYPTO_LIBS)
- endif
- 
-+FINAL_CFLAGS+=-I${PREFIX}/include/lua51
-+FINAL_LIBS+= -L${PREFIX}/lib -llua-5.1
-+
- REDIS_CC=$(QUIET_CC)$(CC) $(FINAL_CFLAGS)
- REDIS_LD=$(QUIET_LINK)$(CC) $(FINAL_LDFLAGS)
- REDIS_INSTALL=$(QUIET_INSTALL)$(INSTALL)
-@@ -271,6 +274,7 @@
- REDIS_SERVER_NAME=redis-server$(PROG_SUFFIX)
- REDIS_SENTINEL_NAME=redis-sentinel$(PROG_SUFFIX)
- REDIS_SERVER_OBJ=adlist.o quicklist.o ae.o anet.o dict.o server.o sds.o zmalloc.o lzf_c.o lzf_d.o pqsort.o zipmap.o sha1.o ziplist.o release.o networking.o util.o object.o db.o replication.o rdb.o t_string.o t_list.o t_set.o t_zset.o t_hash.o config.o aof.o pubsub.o multi.o debug.o sort.o intset.o syncio.o cluster.o crc16.o endianconv.o slowlog.o scripting.o bio.o rio.o rand.o memtest.o crcspeed.o crc64.o bitops.o sentinel.o notify.o setproctitle.o blocked.o hyperloglog.o latency.o sparkline.o redis-check-rdb.o redis-check-aof.o geo.o lazyfree.o module.o evict.o expire.o geohash.o geohash_helper.o childinfo.o defrag.o siphash.o rax.o t_stream.o listpack.o localtime.o lolwut.o lolwut5.o lolwut6.o acl.o tracking.o connection.o tls.o sha256.o timeout.o setcpuaffinity.o monotonic.o mt19937-64.o resp_parser.o call_reply.o
-+REDIS_SERVER_OBJ+=fpconv.o lua_bit.o lua_cjson.o lua_cmsgpack.o lua_struct.o strbuf.o
- REDIS_CLI_NAME=redis-cli$(PROG_SUFFIX)
- REDIS_CLI_OBJ=anet.o adlist.o dict.o redis-cli.o zmalloc.o release.o ae.o crcspeed.o crc64.o siphash.o crc16.o monotonic.o cli_common.o mt19937-64.o
- REDIS_BENCHMARK_NAME=redis-benchmark$(PROG_SUFFIX)
-@@ -324,7 +328,7 @@
- 
- # redis-server
- $(REDIS_SERVER_NAME): $(REDIS_SERVER_OBJ)
--	$(REDIS_LD) -o $@ $^ ../deps/hiredis/libhiredis.a ../deps/lua/src/liblua.a $(FINAL_LIBS)
-+	$(REDIS_LD) -o $@ $^ ../deps/hiredis/libhiredis.a $(FINAL_LIBS)
- 
- # redis-sentinel
- $(REDIS_SENTINEL_NAME): $(REDIS_SERVER_NAME)
diff --git a/databases/redis-devel/files/extra-patch-src-Makefile.luajit b/databases/redis-devel/files/extra-patch-src-Makefile.luajit
deleted file mode 100644
index b9affc3fabd1..000000000000
--- a/databases/redis-devel/files/extra-patch-src-Makefile.luajit
+++ /dev/null
@@ -1,58 +0,0 @@
---- src/Makefile.orig	2021-01-12 09:21:03.000000000 -0500
-+++ src/Makefile	2021-01-13 12:25:07.823451000 -0500
-@@ -16,7 +16,7 @@
- uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not')
- uname_M := $(shell sh -c 'uname -m 2>/dev/null || echo not')
- OPTIMIZATION?=-O2
--DEPENDENCY_TARGETS=hiredis linenoise lua hdr_histogram
-+DEPENDENCY_TARGETS=hiredis linenoise hdr_histogram
- NODEPS:=clean distclean
- 
- # Default settings
-@@ -83,8 +83,8 @@
- # Override default settings if possible
- -include .make-settings
- 
--FINAL_CFLAGS=$(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) $(REDIS_CFLAGS)
--FINAL_LDFLAGS=$(LDFLAGS) $(REDIS_LDFLAGS) $(DEBUG)
-+FINAL_CFLAGS=$(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS)
-+FINAL_LDFLAGS=$(LDFLAGS) $(DEBUG)
- FINAL_LIBS=-lm
- DEBUG=-g -ggdb
- 
-@@ -188,7 +188,7 @@
- endif
- endif
- # Include paths to dependencies
--FINAL_CFLAGS+= -I../deps/hiredis -I../deps/linenoise -I../deps/lua/src -I../deps/hdr_histogram
-+FINAL_CFLAGS+= -I../deps/hiredis -I../deps/linenoise -I../deps/hdr_histogram
- 
- # Determine systemd support and/or build preference (defaulting to auto-detection)
- BUILD_WITH_SYSTEMD=no
-@@ -251,6 +251,9 @@
- 	FINAL_LIBS += ../deps/hiredis/libhiredis_ssl.a $(LIBSSL_LIBS) $(LIBCRYPTO_LIBS)
- endif
- 
-+FINAL_CFLAGS+=-I${PREFIX}/include/luajit-2.0
-+FINAL_LIBS+= -L${PREFIX}/lib -lluajit-5.1
-+
- REDIS_CC=$(QUIET_CC)$(CC) $(FINAL_CFLAGS)
- REDIS_LD=$(QUIET_LINK)$(CC) $(FINAL_LDFLAGS)
- REDIS_INSTALL=$(QUIET_INSTALL)$(INSTALL)
-@@ -271,6 +274,7 @@
- REDIS_SERVER_NAME=redis-server$(PROG_SUFFIX)
- REDIS_SENTINEL_NAME=redis-sentinel$(PROG_SUFFIX)
- REDIS_SERVER_OBJ=adlist.o quicklist.o ae.o anet.o dict.o server.o sds.o zmalloc.o lzf_c.o lzf_d.o pqsort.o zipmap.o sha1.o ziplist.o release.o networking.o util.o object.o db.o replication.o rdb.o t_string.o t_list.o t_set.o t_zset.o t_hash.o config.o aof.o pubsub.o multi.o debug.o sort.o intset.o syncio.o cluster.o crc16.o endianconv.o slowlog.o scripting.o bio.o rio.o rand.o memtest.o crcspeed.o crc64.o bitops.o sentinel.o notify.o setproctitle.o blocked.o hyperloglog.o latency.o sparkline.o redis-check-rdb.o redis-check-aof.o geo.o lazyfree.o module.o evict.o expire.o geohash.o geohash_helper.o childinfo.o defrag.o siphash.o rax.o t_stream.o listpack.o localtime.o lolwut.o lolwut5.o lolwut6.o acl.o tracking.o connection.o tls.o sha256.o timeout.o setcpuaffinity.o monotonic.o mt19937-64.o resp_parser.o call_reply.o
-+REDIS_SERVER_OBJ+=fpconv.o lua_bit.o lua_cjson.o lua_cmsgpack.o lua_struct.o strbuf.o
- REDIS_CLI_NAME=redis-cli$(PROG_SUFFIX)
- REDIS_CLI_OBJ=anet.o adlist.o dict.o redis-cli.o zmalloc.o release.o ae.o crcspeed.o crc64.o siphash.o crc16.o monotonic.o cli_common.o mt19937-64.o
- REDIS_BENCHMARK_NAME=redis-benchmark$(PROG_SUFFIX)
-@@ -324,7 +328,7 @@
- 
- # redis-server
- $(REDIS_SERVER_NAME): $(REDIS_SERVER_OBJ)
--	$(REDIS_LD) -o $@ $^ ../deps/hiredis/libhiredis.a ../deps/lua/src/liblua.a $(FINAL_LIBS)
-+	$(REDIS_LD) -o $@ $^ ../deps/hiredis/libhiredis.a $(FINAL_LIBS)
- 
- # redis-sentinel
- $(REDIS_SENTINEL_NAME): $(REDIS_SERVER_NAME)
diff --git a/databases/redis-devel/files/extra-patch-src-Makefile.luajit-or b/databases/redis-devel/files/extra-patch-src-Makefile.luajit-or
deleted file mode 100644
index 8e18d4bf3088..000000000000
--- a/databases/redis-devel/files/extra-patch-src-Makefile.luajit-or
+++ /dev/null
@@ -1,58 +0,0 @@
---- src/Makefile.orig	2021-01-12 09:21:03.000000000 -0500
-+++ src/Makefile	2021-01-13 12:27:19.444193000 -0500
-@@ -16,7 +16,7 @@
- uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not')
- uname_M := $(shell sh -c 'uname -m 2>/dev/null || echo not')
- OPTIMIZATION?=-O2
--DEPENDENCY_TARGETS=hiredis linenoise lua hdr_histogram
-+DEPENDENCY_TARGETS=hiredis linenoise hdr_histogram
- NODEPS:=clean distclean
- 
- # Default settings
-@@ -83,8 +83,8 @@
- # Override default settings if possible
- -include .make-settings
- 
--FINAL_CFLAGS=$(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) $(REDIS_CFLAGS)
--FINAL_LDFLAGS=$(LDFLAGS) $(REDIS_LDFLAGS) $(DEBUG)
-+FINAL_CFLAGS=$(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS)
-+FINAL_LDFLAGS=$(LDFLAGS) $(DEBUG)
- FINAL_LIBS=-lm
- DEBUG=-g -ggdb
- 
-@@ -188,7 +188,7 @@
- endif
- endif
- # Include paths to dependencies
--FINAL_CFLAGS+= -I../deps/hiredis -I../deps/linenoise -I../deps/lua/src -I../deps/hdr_histogram
-+FINAL_CFLAGS+= -I../deps/hiredis -I../deps/linenoise -I../deps/hdr_histogram
- 
- # Determine systemd support and/or build preference (defaulting to auto-detection)
- BUILD_WITH_SYSTEMD=no
-@@ -251,6 +251,9 @@
- 	FINAL_LIBS += ../deps/hiredis/libhiredis_ssl.a $(LIBSSL_LIBS) $(LIBCRYPTO_LIBS)
- endif
- 
-+FINAL_CFLAGS+=-I${PREFIX}/include/luajit-2.1
-+FINAL_LIBS+= -L${PREFIX}/lib -lluajit-5.1
-+
- REDIS_CC=$(QUIET_CC)$(CC) $(FINAL_CFLAGS)
- REDIS_LD=$(QUIET_LINK)$(CC) $(FINAL_LDFLAGS)
- REDIS_INSTALL=$(QUIET_INSTALL)$(INSTALL)
-@@ -271,6 +274,7 @@
- REDIS_SERVER_NAME=redis-server$(PROG_SUFFIX)
- REDIS_SENTINEL_NAME=redis-sentinel$(PROG_SUFFIX)
- REDIS_SERVER_OBJ=adlist.o quicklist.o ae.o anet.o dict.o server.o sds.o zmalloc.o lzf_c.o lzf_d.o pqsort.o zipmap.o sha1.o ziplist.o release.o networking.o util.o object.o db.o replication.o rdb.o t_string.o t_list.o t_set.o t_zset.o t_hash.o config.o aof.o pubsub.o multi.o debug.o sort.o intset.o syncio.o cluster.o crc16.o endianconv.o slowlog.o scripting.o bio.o rio.o rand.o memtest.o crcspeed.o crc64.o bitops.o sentinel.o notify.o setproctitle.o blocked.o hyperloglog.o latency.o sparkline.o redis-check-rdb.o redis-check-aof.o geo.o lazyfree.o module.o evict.o expire.o geohash.o geohash_helper.o childinfo.o defrag.o siphash.o rax.o t_stream.o listpack.o localtime.o lolwut.o lolwut5.o lolwut6.o acl.o tracking.o connection.o tls.o sha256.o timeout.o setcpuaffinity.o monotonic.o mt19937-64.o resp_parser.o call_reply.o
-+REDIS_SERVER_OBJ+=fpconv.o lua_bit.o lua_cjson.o lua_cmsgpack.o lua_struct.o strbuf.o
- REDIS_CLI_NAME=redis-cli$(PROG_SUFFIX)
- REDIS_CLI_OBJ=anet.o adlist.o dict.o redis-cli.o zmalloc.o release.o ae.o crcspeed.o crc64.o siphash.o crc16.o monotonic.o cli_common.o mt19937-64.o
- REDIS_BENCHMARK_NAME=redis-benchmark$(PROG_SUFFIX)
-@@ -324,7 +328,7 @@
- 
- # redis-server
- $(REDIS_SERVER_NAME): $(REDIS_SERVER_OBJ)
--	$(REDIS_LD) -o $@ $^ ../deps/hiredis/libhiredis.a ../deps/lua/src/liblua.a $(FINAL_LIBS)
-+	$(REDIS_LD) -o $@ $^ ../deps/hiredis/libhiredis.a $(FINAL_LIBS)
- 
- # redis-sentinel
- $(REDIS_SENTINEL_NAME): $(REDIS_SERVER_NAME)
diff --git a/databases/redis-devel/files/patch-deps-Makefile b/databases/redis-devel/files/patch-deps-Makefile
index c2a757c59b33..9da224428a99 100644
--- a/databases/redis-devel/files/patch-deps-Makefile
+++ b/databases/redis-devel/files/patch-deps-Makefile
@@ -1,20 +1,21 @@
---- deps/Makefile.orig	2021-01-12 09:21:03.000000000 -0500
-+++ deps/Makefile	2021-01-13 11:37:45.979445000 -0500
-@@ -69,7 +69,7 @@
- 	LUA_CFLAGS= -D__C99FEATURES__=1
+--- deps/Makefile.orig	2023-06-29 16:32:01 UTC
++++ deps/Makefile
+@@ -83,7 +83,7 @@ LUA_LDFLAGS+= $(LDFLAGS)
+ ifeq ($(LUA_DEBUG),yes)
+ 	LUA_CFLAGS+= -O0 -g -DLUA_USE_APICHECK
+ else
+-	LUA_CFLAGS+= -O2 
++	LUA_CFLAGS+=
  endif
- 
--LUA_CFLAGS+= -O2 -Wall -DLUA_ANSI -DENABLE_CJSON_GLOBAL -DREDIS_STATIC='' -DLUA_USE_MKSTEMP $(CFLAGS)
-+LUA_CFLAGS+= -Wall -DLUA_ANSI -DENABLE_CJSON_GLOBAL -DREDIS_STATIC='' -DLUA_USE_MKSTEMP $(CFLAGS)
- LUA_LDFLAGS+= $(LDFLAGS)
  # lua's Makefile defines AR="ar rcu", which is unusual, and makes it more
  # challenging to cross-compile lua (and redis).  These defines make it easier
-@@ -79,7 +79,7 @@
+@@ -106,7 +106,7 @@ endif
  
- lua: .make-prerequisites
+ jemalloc: .make-prerequisites
  	@printf '%b %b\n' $(MAKECOLOR)MAKE$(ENDCOLOR) $(BINCOLOR)$@$(ENDCOLOR)
--	cd lua/src && $(MAKE) all CFLAGS="$(LUA_CFLAGS)" MYLDFLAGS="$(LUA_LDFLAGS)" AR="$(AR) $(ARFLAGS)"
-+	cd lua/src && $(MAKE) all CC="$(CC)" CFLAGS="$(LUA_CFLAGS)" MYLDFLAGS="$(LUA_LDFLAGS)" AR="$(AR) $(ARFLAGS)"
- 
- .PHONY: lua
+-	cd jemalloc && ./configure --disable-cxx --with-version=5.3.0-0-g0 --with-lg-quantum=3 --disable-cache-oblivious --with-jemalloc-prefix=je_ CFLAGS="$(JEMALLOC_CFLAGS)" LDFLAGS="$(JEMALLOC_LDFLAGS)" $(JEMALLOC_CONFIGURE_OPTS)
+-	cd jemalloc && $(MAKE) lib/libjemalloc.a
++	cd jemalloc && ./configure --disable-cxx --with-version=5.3.0-0-g0 --with-lg-quantum=3 --disable-cache-oblivious --with-jemalloc-prefix=je_ CFLAGS="$(JEMALLOC_CFLAGS)" CXXFLAGS="$(JEMALLOC_CFLAGS)" LDFLAGS="$(JEMALLOC_LDFLAGS)" $(JEMALLOC_CONFIGURE_OPTS)
++	cd jemalloc && $(MAKE) CFLAGS="$(JEMALLOC_CFLAGS)" CXXFLAGS="$(JEMALLOC_CFLAGS)" LDFLAGS="$(JEMALLOC_LDFLAGS)" lib/libjemalloc.a
  
+ .PHONY: jemalloc
diff --git a/databases/redis-devel/files/patch-deps-hiredis-Makefile b/databases/redis-devel/files/patch-deps-hiredis-Makefile
index 9422ba8d3245..a2789076673c 100644
--- a/databases/redis-devel/files/patch-deps-hiredis-Makefile
+++ b/databases/redis-devel/files/patch-deps-hiredis-Makefile
@@ -1,6 +1,6 @@
---- deps/hiredis/Makefile.orig	2021-01-12 09:21:03.000000000 -0500
-+++ deps/hiredis/Makefile	2021-01-13 11:40:26.109827000 -0500
-@@ -21,7 +21,7 @@
+--- deps/hiredis/Makefile.orig	2023-07-30 05:48:29 UTC
++++ deps/hiredis/Makefile
+@@ -15,7 +15,7 @@ HIREDIS_PATCH=$(shell grep HIREDIS_PATCH hiredis.h | a
  HIREDIS_SONAME=$(shell grep HIREDIS_SONAME hiredis.h | awk '{print $$3}')
  
  # Installation related variables and target
@@ -9,21 +9,21 @@
  INCLUDE_PATH?=include/hiredis
  LIBRARY_PATH?=lib
  PKGCONF_PATH?=pkgconfig
-@@ -44,10 +44,8 @@
+@@ -38,10 +38,8 @@ export REDIS_TEST_CONFIG
  # Fallback to gcc when $CC is not in $PATH.
  CC:=$(shell sh -c 'type $${CC%% *} >/dev/null 2>/dev/null && echo $(CC) || echo gcc')
  CXX:=$(shell sh -c 'type $${CXX%% *} >/dev/null 2>/dev/null && echo $(CXX) || echo g++')
 -OPTIMIZATION?=-O3
- WARNINGS=-Wall -W -Wstrict-prototypes -Wwrite-strings -Wno-missing-field-initializers
+ WARNINGS=-Wall -Wextra -Werror -Wstrict-prototypes -Wwrite-strings -Wno-missing-field-initializers
 -DEBUG_FLAGS?= -g -ggdb
--REAL_CFLAGS=$(OPTIMIZATION) -fPIC $(CPPFLAGS) $(CFLAGS) $(WARNINGS) $(DEBUG_FLAGS)
-+REAL_CFLAGS=$(OPTIMIZATION) -fPIC $(CFLAGS) $(WARNINGS) $(DEBUG_FLAGS)
+-REAL_CFLAGS=$(OPTIMIZATION) -fPIC $(CPPFLAGS) $(CFLAGS) $(WARNINGS) $(DEBUG_FLAGS) $(PLATFORM_FLAGS)
++REAL_CFLAGS=$(OPTIMIZATION) -fPIC $(CFLAGS) $(WARNINGS) $(DEBUG_FLAGS) $(PLATFORM_FLAGS)
  REAL_LDFLAGS=$(LDFLAGS)
  
  DYLIBSUFFIX=so
-@@ -83,7 +81,16 @@
-   CFLAGS+=-I$(OPENSSL_PREFIX)/include
-   SSL_LDFLAGS+=-L$(OPENSSL_PREFIX)/lib -lssl -lcrypto
+@@ -122,7 +120,16 @@ ifeq ($(uname_S),FreeBSD)
+ else
+   REAL_CFLAGS+=-pedantic
  endif
 -
 +ifeq ($(uname_S),FreeBSD)
diff --git a/databases/redis-devel/files/patch-deps-hiredis-net.c b/databases/redis-devel/files/patch-deps-hiredis-net.c
index 3fd2b5996f97..0dfde3135238 100644
--- a/databases/redis-devel/files/patch-deps-hiredis-net.c
+++ b/databases/redis-devel/files/patch-deps-hiredis-net.c
@@ -1,5 +1,5 @@
---- deps/hiredis/net.c.orig	2019-11-28 14:32:05.942453000 -0500
-+++ deps/hiredis/net.c	2019-11-28 14:39:08.326408000 -0500
+--- deps/hiredis/net.c.orig	2019-11-28 19:32:05 UTC
++++ deps/hiredis/net.c
 @@ -178,14 +178,34 @@
          __redisSetError(c,REDIS_ERR_OTHER,strerror(errno));
          return REDIS_ERR;
diff --git a/databases/redis-devel/files/patch-deps_Makefile b/databases/redis-devel/files/patch-deps_Makefile
deleted file mode 100644
index 39dadb06b822..000000000000
--- a/databases/redis-devel/files/patch-deps_Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
---- deps/Makefile.orig	2021-01-13 11:43:05.174197000 -0500
-+++ deps/Makefile	2021-01-13 11:44:13.744658000 -0500
-@@ -83,12 +83,12 @@
- 
- .PHONY: lua
- 
--JEMALLOC_CFLAGS= -std=gnu99 -Wall -pipe -g3 -O3 -funroll-loops $(CFLAGS)
-+JEMALLOC_CFLAGS= -std=gnu99 -Wall -pipe -funroll-loops $(CFLAGS)
- JEMALLOC_LDFLAGS= $(LDFLAGS)
- 
- jemalloc: .make-prerequisites
- 	@printf '%b %b\n' $(MAKECOLOR)MAKE$(ENDCOLOR) $(BINCOLOR)$@$(ENDCOLOR)
--	cd jemalloc && ./configure --with-version=5.1.0-0-g0 --with-lg-quantum=3 --with-jemalloc-prefix=je_ CFLAGS="$(JEMALLOC_CFLAGS)" LDFLAGS="$(JEMALLOC_LDFLAGS)"
--	cd jemalloc && $(MAKE) CFLAGS="$(JEMALLOC_CFLAGS)" LDFLAGS="$(JEMALLOC_LDFLAGS)" lib/libjemalloc.a
-+	cd jemalloc && ./configure --with-version=5.1.0-0-g0 --with-lg-quantum=3 --with-jemalloc-prefix=je_ CFLAGS="$(JEMALLOC_CFLAGS)" CXXFLAGS="$(JEMALLOC_CFLAGS)" LDFLAGS="$(JEMALLOC_LDFLAGS)"
-+	cd jemalloc && $(MAKE) CFLAGS="$(JEMALLOC_CFLAGS)" CXXFLAGS="$(JEMALLOC_CFLAGS)" LDFLAGS="$(JEMALLOC_LDFLAGS)" lib/libjemalloc.a
- 
- .PHONY: jemalloc
diff --git a/databases/redis-devel/files/patch-redis.conf b/databases/redis-devel/files/patch-redis.conf
index f71797d9555e..a84973345b78 100644
--- a/databases/redis-devel/files/patch-redis.conf
+++ b/databases/redis-devel/files/patch-redis.conf
@@ -1,5 +1,5 @@
---- redis.conf.orig	2021-01-12 09:21:03.000000000 -0500
-+++ redis.conf	2021-01-13 11:46:40.445746000 -0500
+--- redis.conf.orig	2021-01-12 14:21:03 UTC
++++ redis.conf	2021-01-13
 @@ -244,7 +244,7 @@
  # By default Redis does not run as a daemon. Use 'yes' if you need it.
  # Note that Redis will write a pid file in /var/run/redis.pid when daemonized.
diff --git a/databases/redis-devel/files/patch-src-mkreleasehdr.sh b/databases/redis-devel/files/patch-src-mkreleasehdr.sh
index e48b3174d315..65920da3a3ff 100644
--- a/databases/redis-devel/files/patch-src-mkreleasehdr.sh
+++ b/databases/redis-devel/files/patch-src-mkreleasehdr.sh
@@ -1,9 +1,9 @@
---- src/mkreleasehdr.sh.orig	2019-11-22 16:54:22 UTC
+--- src/mkreleasehdr.sh.orig	2024-01-27 09:11:53 UTC
 +++ src/mkreleasehdr.sh
 @@ -1,6 +1,6 @@
  #!/bin/sh
 -GIT_SHA1=`(git show-ref --head --hash=8 2> /dev/null || echo 00000000) | head -n1`
--GIT_DIRTY=`git diff --no-ext-diff 2> /dev/null | wc -l`
+-GIT_DIRTY=`git diff --no-ext-diff -- ../src ../deps 2> /dev/null | wc -l`
 +GIT_SHA1="00000000"
 +GIT_DIRTY="0"
  BUILD_ID=`uname -n`"-"`date +%s`
diff --git a/databases/redis-devel/pkg-descr b/databases/redis-devel/pkg-descr
index 15beb1c8d992..5500bd1afad4 100644
--- a/databases/redis-devel/pkg-descr
+++ b/databases/redis-devel/pkg-descr
@@ -15,5 +15,3 @@ command to a log.
 Redis also supports trivial-to-setup master-slave replication, with very
 fast non-blocking first synchronization, auto-reconnection on net split
 and so forth.
-
-WWW: https://redis.io/
diff --git a/databases/redis-devel/pkg-plist b/databases/redis-devel/pkg-plist
index 7bc055909fdd..fafc472df89b 100644
--- a/databases/redis-devel/pkg-plist
+++ b/databases/redis-devel/pkg-plist
@@ -4,7 +4,6 @@ bin/redis-check-rdb
 bin/redis-cli
 bin/redis-sentinel
 bin/redis-server
-%%TRIB%%bin/redis-trib.rb
 @sample etc/redis.conf.sample
 @sample(%%REDIS_USER%%,%%REDIS_GROUP%%,) etc/sentinel.conf.sample
 @dir(%%REDIS_USER%%,%%REDIS_GROUP%%,) %%REDIS_DBDIR%%
diff --git a/databases/redis/Makefile b/databases/redis/Makefile
index 442a56640e17..1ed90d8b2fde 100644
--- a/databases/redis/Makefile
+++ b/databases/redis/Makefile
@@ -1,107 +1,63 @@
-# Created by: Sergey Skvortsov <skv@protey.ru>
-
 PORTNAME=	redis
-PORTVERSION=	6.2.5
+DISTVERSION=	7.2.4
 PORTREVISION=	1
 CATEGORIES=	databases
 MASTER_SITES=	https://download.redis.io/releases/
 
-MAINTAINER=	osa@FreeBSD.org
+MAINTAINER=	yasu@FreeBSD.org
 COMMENT=	Persistent key-value database with built-in net interface
+WWW=		https://redis.io/
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-USES+=		compiler:c11 gmake
-
-OPTIONS_DEFINE=	JEMALLOC TESTS TLS TRIB
-OPTIONS_RADIO=	EXTLUA
-OPTIONS_RADIO_EXTLUA=	LUA LUAJIT LUAJITOR
-OPTIONS_SUB=	yes
-JEMALLOC_DESC=	Use jemalloc
-LUA_DESC=	Use lang/lua instead of builtin lua
-LUAJIT_DESC=	Use lang/luajit instead of builtin lua
-LUAJITOR_DESC=	Use lang/luajit-openresty instead of builtin lua
-TLS_DESC=	Use TLS (openssl req.)
-TESTS_DESC=	Install lang/tcl for redis unit tests
-TRIB_DESC=	Install redis-trib.rb (lang/ruby req.)
-
-MAKE_ENV=	V=yo OPTIMIZATION=
-
-JEMALLOC_MAKE_ENV=	USE_JEMALLOC=yes
-
-LUA_USES=		lua:51
-LUA_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-src-Makefile.lua
-LUA_VARS=		_addflags=true
-
-LUAJIT_LIB_DEPENDS=	libluajit-5.1.so:lang/luajit
-LUAJIT_BUILD_DEPENDS=	${LOCALBASE}/include/luajit-2.0/lua.h:lang/luajit
-LUAJIT_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-src-Makefile.luajit
-LUAJIT_VARS=		_addflags=true
-
-LUAJITOR_LIB_DEPENDS=	libluajit-5.1.so:lang/luajit-openresty
-LUAJITOR_BUILD_DEPENDS=	${LOCALBASE}/include/luajit-2.1/lua.h:lang/luajit-openresty
-LUAJITOR_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-src-Makefile.luajit-or \
-			${PATCHDIR}/extra-patch-deps_lua_src_lua__cjson.c
-LUAJITOR_VARS=		_addflags=true
+USES=		compiler:c11 cpe gmake tcl:test
+CPE_VENDOR=	redislabs
+USE_RC_SUBR=	redis sentinel
 
-TESTS_USES=	tcl:build
+MAKE_ENV=	OPTIMIZATION= \
+		V=yo
 
-TLS_USES=	ssl
-TLS_MAKE_ENV=	BUILD_TLS=yes
+LDFLAGS+=	-lpthread -lm -lexecinfo
 
-TRIB_CATEGORIES=	ruby
-TRIB_USE=		ruby=yes
-TRIB_RUN_DEPENDS=	rubygem-redis>=2.2:databases/rubygem-redis
+CONFLICTS_INSTALL=	redis-devel redis6 redis62 redis70 # etc/rc.d/redis
 
-.include <bsd.port.pre.mk>
+SUB_FILES=	pkg-message
+SUB_LIST=	PORTNAME=${PORTNAME} \
+		REDIS_DBDIR=${REDIS_DBDIR} \
+		REDIS_LOGDIR=${REDIS_LOGDIR} \
+		REDIS_RUNDIR=${REDIS_RUNDIR} \
+		REDIS_USER=${USERS}
 
-.if ${ARCH} == i386 && ! ${CFLAGS:M-march=*}
-# Needed for __atomic_fetch_add_8
-USE_GCC=	yes
-CFLAGS+=	-march=i586
-.endif
+USERS=		redis
+GROUPS=		redis
 
-.if defined(_ADDFLAGS)
-CFLAGS=		-fPIC
-LDFLAGS=	-Wl,-E
-.endif
+PLIST_SUB=	REDIS_DBDIR=${REDIS_DBDIR} \
+		REDIS_GROUP=${GROUPS} \
+		REDIS_LOGDIR=${REDIS_LOGDIR} \
+		REDIS_RUNDIR=${REDIS_RUNDIR} \
+		REDIS_USER=${USERS}
 
-LDFLAGS+=	-lpthread -lm -lexecinfo
+OPTIONS_DEFINE=		JEMALLOC TLS
+OPTIONS_DEFAULT=	TLS
+OPTIONS_SUB=		yes
 
-CONFLICTS?=	redis5-5.* redis6-6.* redis-devel-6.*
+JEMALLOC_DESC=	Use jemalloc
+TLS_DESC=	Use TLS (openssl req.)
 
-USE_RC_SUBR=	redis sentinel
-BIN_FILES=	redis-benchmark redis-check-aof redis-check-rdb \
-		redis-cli redis-sentinel redis-server
+JEMALLOC_MAKE_ENV=	USE_JEMALLOC=yes
+TLS_USES=		ssl
+TLS_MAKE_ENV=		BUILD_TLS=yes
 
-USERS=	redis
-GROUPS=	redis
+BIN_FILES=	redis-benchmark redis-check-aof redis-check-rdb redis-cli \
+		redis-sentinel redis-server
 
 REDIS_DBDIR?=	/var/db/redis
 REDIS_RUNDIR?=	/var/run/redis
 REDIS_LOGDIR?=	/var/log/redis
 
-SUB_FILES=	pkg-message
-SUB_LIST+=	PORTNAME=${PORTNAME} \
-	REDIS_USER=${USERS} \
-	REDIS_DBDIR=${REDIS_DBDIR} \
-	REDIS_LOGDIR=${REDIS_LOGDIR} \
-	REDIS_RUNDIR=${REDIS_RUNDIR}
-
-PLIST_SUB+=	REDIS_USER=${USERS} \
-	REDIS_GROUP=${GROUPS} \
-	REDIS_LOGDIR=${REDIS_LOGDIR} \
-	REDIS_DBDIR=${REDIS_DBDIR} \
-	REDIS_RUNDIR=${REDIS_RUNDIR}
-
 post-patch-JEMALLOC-on:
-	@${REINPLACE_CMD} '35s!Linux!FreeBSD!g' ${WRKSRC}/src/Makefile
-
-post-patch-LUA-on:
-	@cd ${WRKSRC}/deps/lua/src && ${CP} fpconv.* lua_* strbuf.* ${WRKSRC}/src/
-post-patch-LUAJIT-on:	post-patch-LUA-on
-post-patch-LUAJITOR-on:	post-patch-LUA-on
+	@${REINPLACE_CMD} '69s!Linux!FreeBSD!g' ${WRKSRC}/src/Makefile
 
 post-build:
 	${SED} ${SUB_LIST:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
@@ -115,10 +71,7 @@ do-install:
 		${STAGEDIR}${REDIS_DBDIR} \
 		${STAGEDIR}${REDIS_RUNDIR}
 
-do-install-TRIB-on:
-	${INSTALL_SCRIPT} ${WRKSRC}/src/redis-trib.rb ${STAGEDIR}${PREFIX}/bin/
-
 do-test:
 	@cd ${WRKSRC} && ${TCLSH} tests/test_helper.tcl
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/databases/redis/distinfo b/databases/redis/distinfo
index 0fc14cbc2de0..97435da1b122 100644
--- a/databases/redis/distinfo
+++ b/databases/redis/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1629324274
-SHA256 (redis-6.2.5.tar.gz) = 4b9a75709a1b74b3785e20a6c158cab94cf52298aa381eea947a678a60d551ae
-SIZE (redis-6.2.5.tar.gz) = 2465302
+TIMESTAMP = 1704963743
+SHA256 (redis-7.2.4.tar.gz) = 8d104c26a154b29fd67d6568b4f375212212ad41e0c2caa3d66480e78dbd3b59
+SIZE (redis-7.2.4.tar.gz) = 3386861
diff --git a/databases/redis/files/extra-patch-deps_lua_src_lua__cjson.c b/databases/redis/files/extra-patch-deps_lua_src_lua__cjson.c
deleted file mode 100644
index 847b70d25dea..000000000000
--- a/databases/redis/files/extra-patch-deps_lua_src_lua__cjson.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- deps/lua/src/lua_cjson.c.orig	2019-12-08 07:56:31.419672000 -0500
-+++ deps/lua/src/lua_cjson.c	2019-12-08 07:56:52.389362000 -0500
-@@ -1299,7 +1299,7 @@
-  *
-  * luaL_setfuncs() is used to create a module table where the functions have
-  * json_config_t as their first upvalue. Code borrowed from Lua 5.2 source. */
--static void luaL_setfuncs (lua_State *l, const luaL_Reg *reg, int nup)
-+void luaL_setfuncs (lua_State *l, const luaL_Reg *reg, int nup)
- {
-     int i;
- 
diff --git a/databases/redis/files/extra-patch-src-Makefile.lua b/databases/redis/files/extra-patch-src-Makefile.lua
deleted file mode 100644
index 937eeac680a2..000000000000
--- a/databases/redis/files/extra-patch-src-Makefile.lua
+++ /dev/null
@@ -1,58 +0,0 @@
---- src/Makefile.orig	2021-01-12 09:21:03.000000000 -0500
-+++ src/Makefile	2021-01-13 11:52:33.070529000 -0500
-@@ -16,7 +16,7 @@
- uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not')
- uname_M := $(shell sh -c 'uname -m 2>/dev/null || echo not')
- OPTIMIZATION?=-O2
--DEPENDENCY_TARGETS=hiredis linenoise lua hdr_histogram
-+DEPENDENCY_TARGETS=hiredis linenoise hdr_histogram
- NODEPS:=clean distclean
- 
- # Default settings
-@@ -83,8 +83,8 @@
- # Override default settings if possible
- -include .make-settings
- 
--FINAL_CFLAGS=$(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) $(REDIS_CFLAGS)
--FINAL_LDFLAGS=$(LDFLAGS) $(REDIS_LDFLAGS) $(DEBUG)
-+FINAL_CFLAGS=$(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS)
-+FINAL_LDFLAGS=$(LDFLAGS) $(DEBUG)
- FINAL_LIBS=-lm
- DEBUG=-g -ggdb
- 
-@@ -188,7 +188,7 @@
- endif
- endif
- # Include paths to dependencies
--FINAL_CFLAGS+= -I../deps/hiredis -I../deps/linenoise -I../deps/lua/src -I../deps/hdr_histogram
-+FINAL_CFLAGS+= -I../deps/hiredis -I../deps/linenoise -I../deps/hdr_histogram
- 
- # Determine systemd support and/or build preference (defaulting to auto-detection)
- BUILD_WITH_SYSTEMD=no
-@@ -251,6 +251,9 @@
- 	FINAL_LIBS += ../deps/hiredis/libhiredis_ssl.a $(LIBSSL_LIBS) $(LIBCRYPTO_LIBS)
- endif
- 
-+FINAL_CFLAGS+=-I${PREFIX}/include/lua51
-+FINAL_LIBS+= -L${PREFIX}/lib -llua-5.1
-+
- REDIS_CC=$(QUIET_CC)$(CC) $(FINAL_CFLAGS)
- REDIS_LD=$(QUIET_LINK)$(CC) $(FINAL_LDFLAGS)
- REDIS_INSTALL=$(QUIET_INSTALL)$(INSTALL)
-@@ -271,6 +274,7 @@
- REDIS_SERVER_NAME=redis-server$(PROG_SUFFIX)
- REDIS_SENTINEL_NAME=redis-sentinel$(PROG_SUFFIX)
- REDIS_SERVER_OBJ=adlist.o quicklist.o ae.o anet.o dict.o server.o sds.o zmalloc.o lzf_c.o lzf_d.o pqsort.o zipmap.o sha1.o ziplist.o release.o networking.o util.o object.o db.o replication.o rdb.o t_string.o t_list.o t_set.o t_zset.o t_hash.o config.o aof.o pubsub.o multi.o debug.o sort.o intset.o syncio.o cluster.o crc16.o endianconv.o slowlog.o scripting.o bio.o rio.o rand.o memtest.o crcspeed.o crc64.o bitops.o sentinel.o notify.o setproctitle.o blocked.o hyperloglog.o latency.o sparkline.o redis-check-rdb.o redis-check-aof.o geo.o lazyfree.o module.o evict.o expire.o geohash.o geohash_helper.o childinfo.o defrag.o siphash.o rax.o t_stream.o listpack.o localtime.o lolwut.o lolwut5.o lolwut6.o acl.o gopher.o tracking.o connection.o tls.o sha256.o timeout.o setcpuaffinity.o monotonic.o mt19937-64.o
-+REDIS_SERVER_OBJ+=fpconv.o lua_bit.o lua_cjson.o lua_cmsgpack.o lua_struct.o strbuf.o
- REDIS_CLI_NAME=redis-cli$(PROG_SUFFIX)
- REDIS_CLI_OBJ=anet.o adlist.o dict.o redis-cli.o zmalloc.o release.o ae.o crcspeed.o crc64.o siphash.o crc16.o monotonic.o cli_common.o mt19937-64.o
- REDIS_BENCHMARK_NAME=redis-benchmark$(PROG_SUFFIX)
-@@ -324,7 +328,7 @@
- 
- # redis-server
- $(REDIS_SERVER_NAME): $(REDIS_SERVER_OBJ)
--	$(REDIS_LD) -o $@ $^ ../deps/hiredis/libhiredis.a ../deps/lua/src/liblua.a $(FINAL_LIBS)
-+	$(REDIS_LD) -o $@ $^ ../deps/hiredis/libhiredis.a $(FINAL_LIBS)
- 
- # redis-sentinel
- $(REDIS_SENTINEL_NAME): $(REDIS_SERVER_NAME)
diff --git a/databases/redis/files/extra-patch-src-Makefile.luajit b/databases/redis/files/extra-patch-src-Makefile.luajit
deleted file mode 100644
index 3e40ea4a77a0..000000000000
--- a/databases/redis/files/extra-patch-src-Makefile.luajit
+++ /dev/null
@@ -1,58 +0,0 @@
---- src/Makefile.orig	2021-01-12 09:21:03.000000000 -0500
-+++ src/Makefile	2021-01-13 12:25:07.823451000 -0500
-@@ -16,7 +16,7 @@
- uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not')
- uname_M := $(shell sh -c 'uname -m 2>/dev/null || echo not')
- OPTIMIZATION?=-O2
--DEPENDENCY_TARGETS=hiredis linenoise lua hdr_histogram
-+DEPENDENCY_TARGETS=hiredis linenoise hdr_histogram
- NODEPS:=clean distclean
- 
- # Default settings
-@@ -83,8 +83,8 @@
- # Override default settings if possible
- -include .make-settings
- 
--FINAL_CFLAGS=$(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) $(REDIS_CFLAGS)
--FINAL_LDFLAGS=$(LDFLAGS) $(REDIS_LDFLAGS) $(DEBUG)
-+FINAL_CFLAGS=$(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS)
-+FINAL_LDFLAGS=$(LDFLAGS) $(DEBUG)
- FINAL_LIBS=-lm
- DEBUG=-g -ggdb
- 
-@@ -188,7 +188,7 @@
- endif
- endif
- # Include paths to dependencies
--FINAL_CFLAGS+= -I../deps/hiredis -I../deps/linenoise -I../deps/lua/src -I../deps/hdr_histogram
-+FINAL_CFLAGS+= -I../deps/hiredis -I../deps/linenoise -I../deps/hdr_histogram
- 
- # Determine systemd support and/or build preference (defaulting to auto-detection)
- BUILD_WITH_SYSTEMD=no
-@@ -251,6 +251,9 @@
- 	FINAL_LIBS += ../deps/hiredis/libhiredis_ssl.a $(LIBSSL_LIBS) $(LIBCRYPTO_LIBS)
- endif
- 
-+FINAL_CFLAGS+=-I${PREFIX}/include/luajit-2.0
-+FINAL_LIBS+= -L${PREFIX}/lib -lluajit-5.1
-+
- REDIS_CC=$(QUIET_CC)$(CC) $(FINAL_CFLAGS)
- REDIS_LD=$(QUIET_LINK)$(CC) $(FINAL_LDFLAGS)
- REDIS_INSTALL=$(QUIET_INSTALL)$(INSTALL)
-@@ -271,6 +274,7 @@
- REDIS_SERVER_NAME=redis-server$(PROG_SUFFIX)
- REDIS_SENTINEL_NAME=redis-sentinel$(PROG_SUFFIX)
- REDIS_SERVER_OBJ=adlist.o quicklist.o ae.o anet.o dict.o server.o sds.o zmalloc.o lzf_c.o lzf_d.o pqsort.o zipmap.o sha1.o ziplist.o release.o networking.o util.o object.o db.o replication.o rdb.o t_string.o t_list.o t_set.o t_zset.o t_hash.o config.o aof.o pubsub.o multi.o debug.o sort.o intset.o syncio.o cluster.o crc16.o endianconv.o slowlog.o scripting.o bio.o rio.o rand.o memtest.o crcspeed.o crc64.o bitops.o sentinel.o notify.o setproctitle.o blocked.o hyperloglog.o latency.o sparkline.o redis-check-rdb.o redis-check-aof.o geo.o lazyfree.o module.o evict.o expire.o geohash.o geohash_helper.o childinfo.o defrag.o siphash.o rax.o t_stream.o listpack.o localtime.o lolwut.o lolwut5.o lolwut6.o acl.o gopher.o tracking.o connection.o tls.o sha256.o timeout.o setcpuaffinity.o monotonic.o mt19937-64.o
-+REDIS_SERVER_OBJ+=fpconv.o lua_bit.o lua_cjson.o lua_cmsgpack.o lua_struct.o strbuf.o
- REDIS_CLI_NAME=redis-cli$(PROG_SUFFIX)
- REDIS_CLI_OBJ=anet.o adlist.o dict.o redis-cli.o zmalloc.o release.o ae.o crcspeed.o crc64.o siphash.o crc16.o monotonic.o cli_common.o mt19937-64.o
- REDIS_BENCHMARK_NAME=redis-benchmark$(PROG_SUFFIX)
-@@ -324,7 +328,7 @@
- 
- # redis-server
- $(REDIS_SERVER_NAME): $(REDIS_SERVER_OBJ)
--	$(REDIS_LD) -o $@ $^ ../deps/hiredis/libhiredis.a ../deps/lua/src/liblua.a $(FINAL_LIBS)
-+	$(REDIS_LD) -o $@ $^ ../deps/hiredis/libhiredis.a $(FINAL_LIBS)
- 
- # redis-sentinel
- $(REDIS_SENTINEL_NAME): $(REDIS_SERVER_NAME)
diff --git a/databases/redis/files/extra-patch-src-Makefile.luajit-or b/databases/redis/files/extra-patch-src-Makefile.luajit-or
deleted file mode 100644
index 3926e8169300..000000000000
--- a/databases/redis/files/extra-patch-src-Makefile.luajit-or
+++ /dev/null
@@ -1,58 +0,0 @@
---- src/Makefile.orig	2021-01-12 09:21:03.000000000 -0500
-+++ src/Makefile	2021-01-13 12:27:19.444193000 -0500
-@@ -16,7 +16,7 @@
- uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not')
- uname_M := $(shell sh -c 'uname -m 2>/dev/null || echo not')
- OPTIMIZATION?=-O2
--DEPENDENCY_TARGETS=hiredis linenoise lua hdr_histogram
-+DEPENDENCY_TARGETS=hiredis linenoise hdr_histogram
- NODEPS:=clean distclean
- 
- # Default settings
-@@ -83,8 +83,8 @@
- # Override default settings if possible
- -include .make-settings
- 
--FINAL_CFLAGS=$(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) $(REDIS_CFLAGS)
--FINAL_LDFLAGS=$(LDFLAGS) $(REDIS_LDFLAGS) $(DEBUG)
-+FINAL_CFLAGS=$(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS)
-+FINAL_LDFLAGS=$(LDFLAGS) $(DEBUG)
- FINAL_LIBS=-lm
- DEBUG=-g -ggdb
- 
-@@ -188,7 +188,7 @@
- endif
- endif
- # Include paths to dependencies
--FINAL_CFLAGS+= -I../deps/hiredis -I../deps/linenoise -I../deps/lua/src -I../deps/hdr_histogram
-+FINAL_CFLAGS+= -I../deps/hiredis -I../deps/linenoise -I../deps/hdr_histogram
- 
- # Determine systemd support and/or build preference (defaulting to auto-detection)
- BUILD_WITH_SYSTEMD=no
-@@ -251,6 +251,9 @@
- 	FINAL_LIBS += ../deps/hiredis/libhiredis_ssl.a $(LIBSSL_LIBS) $(LIBCRYPTO_LIBS)
- endif
- 
-+FINAL_CFLAGS+=-I${PREFIX}/include/luajit-2.1
-+FINAL_LIBS+= -L${PREFIX}/lib -lluajit-5.1
-+
- REDIS_CC=$(QUIET_CC)$(CC) $(FINAL_CFLAGS)
- REDIS_LD=$(QUIET_LINK)$(CC) $(FINAL_LDFLAGS)
- REDIS_INSTALL=$(QUIET_INSTALL)$(INSTALL)
-@@ -271,6 +274,7 @@
- REDIS_SERVER_NAME=redis-server$(PROG_SUFFIX)
- REDIS_SENTINEL_NAME=redis-sentinel$(PROG_SUFFIX)
- REDIS_SERVER_OBJ=adlist.o quicklist.o ae.o anet.o dict.o server.o sds.o zmalloc.o lzf_c.o lzf_d.o pqsort.o zipmap.o sha1.o ziplist.o release.o networking.o util.o object.o db.o replication.o rdb.o t_string.o t_list.o t_set.o t_zset.o t_hash.o config.o aof.o pubsub.o multi.o debug.o sort.o intset.o syncio.o cluster.o crc16.o endianconv.o slowlog.o scripting.o bio.o rio.o rand.o memtest.o crcspeed.o crc64.o bitops.o sentinel.o notify.o setproctitle.o blocked.o hyperloglog.o latency.o sparkline.o redis-check-rdb.o redis-check-aof.o geo.o lazyfree.o module.o evict.o expire.o geohash.o geohash_helper.o childinfo.o defrag.o siphash.o rax.o t_stream.o listpack.o localtime.o lolwut.o lolwut5.o lolwut6.o acl.o gopher.o tracking.o connection.o tls.o sha256.o timeout.o setcpuaffinity.o monotonic.o mt19937-64.o
-+REDIS_SERVER_OBJ+=fpconv.o lua_bit.o lua_cjson.o lua_cmsgpack.o lua_struct.o strbuf.o
- REDIS_CLI_NAME=redis-cli$(PROG_SUFFIX)
- REDIS_CLI_OBJ=anet.o adlist.o dict.o redis-cli.o zmalloc.o release.o ae.o crcspeed.o crc64.o siphash.o crc16.o monotonic.o cli_common.o mt19937-64.o
- REDIS_BENCHMARK_NAME=redis-benchmark$(PROG_SUFFIX)
-@@ -324,7 +328,7 @@
- 
- # redis-server
- $(REDIS_SERVER_NAME): $(REDIS_SERVER_OBJ)
--	$(REDIS_LD) -o $@ $^ ../deps/hiredis/libhiredis.a ../deps/lua/src/liblua.a $(FINAL_LIBS)
-+	$(REDIS_LD) -o $@ $^ ../deps/hiredis/libhiredis.a $(FINAL_LIBS)
- 
- # redis-sentinel
- $(REDIS_SENTINEL_NAME): $(REDIS_SERVER_NAME)
diff --git a/databases/redis/files/patch-deps-Makefile b/databases/redis/files/patch-deps-Makefile
index c2a757c59b33..33e36467dbca 100644
--- a/databases/redis/files/patch-deps-Makefile
+++ b/databases/redis/files/patch-deps-Makefile
@@ -1,20 +1,21 @@
---- deps/Makefile.orig	2021-01-12 09:21:03.000000000 -0500
-+++ deps/Makefile	2021-01-13 11:37:45.979445000 -0500
-@@ -69,7 +69,7 @@
- 	LUA_CFLAGS= -D__C99FEATURES__=1
+--- deps/Makefile.orig	2023-07-10 11:55:20 UTC
++++ deps/Makefile
+@@ -84,7 +84,7 @@ LUA_LDFLAGS+= $(LDFLAGS)
+ ifeq ($(LUA_DEBUG),yes)
+ 	LUA_CFLAGS+= -O0 -g -DLUA_USE_APICHECK
+ else
+-	LUA_CFLAGS+= -O2 
++	LUA_CFLAGS+=
  endif
+ ifeq ($(LUA_COVERAGE),yes)
+ 	LUA_CFLAGS += -fprofile-arcs -ftest-coverage
+@@ -112,7 +112,7 @@ endif
  
--LUA_CFLAGS+= -O2 -Wall -DLUA_ANSI -DENABLE_CJSON_GLOBAL -DREDIS_STATIC='' -DLUA_USE_MKSTEMP $(CFLAGS)
-+LUA_CFLAGS+= -Wall -DLUA_ANSI -DENABLE_CJSON_GLOBAL -DREDIS_STATIC='' -DLUA_USE_MKSTEMP $(CFLAGS)
- LUA_LDFLAGS+= $(LDFLAGS)
- # lua's Makefile defines AR="ar rcu", which is unusual, and makes it more
- # challenging to cross-compile lua (and redis).  These defines make it easier
-@@ -79,7 +79,7 @@
- 
- lua: .make-prerequisites
+ jemalloc: .make-prerequisites
  	@printf '%b %b\n' $(MAKECOLOR)MAKE$(ENDCOLOR) $(BINCOLOR)$@$(ENDCOLOR)
--	cd lua/src && $(MAKE) all CFLAGS="$(LUA_CFLAGS)" MYLDFLAGS="$(LUA_LDFLAGS)" AR="$(AR) $(ARFLAGS)"
-+	cd lua/src && $(MAKE) all CC="$(CC)" CFLAGS="$(LUA_CFLAGS)" MYLDFLAGS="$(LUA_LDFLAGS)" AR="$(AR) $(ARFLAGS)"
- 
- .PHONY: lua
+-	cd jemalloc && ./configure --disable-cxx --with-version=5.3.0-0-g0 --with-lg-quantum=3 --disable-cache-oblivious --with-jemalloc-prefix=je_ CFLAGS="$(JEMALLOC_CFLAGS)" LDFLAGS="$(JEMALLOC_LDFLAGS)" $(JEMALLOC_CONFIGURE_OPTS)
+-	cd jemalloc && $(MAKE) lib/libjemalloc.a
++	cd jemalloc && ./configure --disable-cxx --with-version=5.3.0-0-g0 --with-lg-quantum=3 --disable-cache-oblivious --with-jemalloc-prefix=je_ CFLAGS="$(JEMALLOC_CFLAGS)" CXXFLAGS="$(JEMALLOC_CFLAGS)" LDFLAGS="$(JEMALLOC_LDFLAGS)" $(JEMALLOC_CONFIGURE_OPTS)
++	cd jemalloc && $(MAKE) CFLAGS="$(JEMALLOC_CFLAGS)" CXXFLAGS="$(JEMALLOC_CFLAGS)" LDFLAGS="$(JEMALLOC_LDFLAGS)" lib/libjemalloc.a
  
+ .PHONY: jemalloc
diff --git a/databases/redis/files/patch-deps-hiredis-Makefile b/databases/redis/files/patch-deps-hiredis-Makefile
index 9422ba8d3245..76e3ea96245d 100644
--- a/databases/redis/files/patch-deps-hiredis-Makefile
+++ b/databases/redis/files/patch-deps-hiredis-Makefile
@@ -1,6 +1,6 @@
---- deps/hiredis/Makefile.orig	2021-01-12 09:21:03.000000000 -0500
-+++ deps/hiredis/Makefile	2021-01-13 11:40:26.109827000 -0500
-@@ -21,7 +21,7 @@
+--- deps/hiredis/Makefile.orig	2023-08-15 09:38:36 UTC
++++ deps/hiredis/Makefile
+@@ -15,7 +15,7 @@ HIREDIS_PATCH=$(shell grep HIREDIS_PATCH hiredis.h | a
  HIREDIS_SONAME=$(shell grep HIREDIS_SONAME hiredis.h | awk '{print $$3}')
  
  # Installation related variables and target
@@ -9,21 +9,21 @@
  INCLUDE_PATH?=include/hiredis
  LIBRARY_PATH?=lib
  PKGCONF_PATH?=pkgconfig
-@@ -44,10 +44,8 @@
+@@ -38,10 +38,9 @@ export REDIS_TEST_CONFIG
  # Fallback to gcc when $CC is not in $PATH.
  CC:=$(shell sh -c 'type $${CC%% *} >/dev/null 2>/dev/null && echo $(CC) || echo gcc')
  CXX:=$(shell sh -c 'type $${CXX%% *} >/dev/null 2>/dev/null && echo $(CXX) || echo g++')
 -OPTIMIZATION?=-O3
- WARNINGS=-Wall -W -Wstrict-prototypes -Wwrite-strings -Wno-missing-field-initializers
--DEBUG_FLAGS?= -g -ggdb
--REAL_CFLAGS=$(OPTIMIZATION) -fPIC $(CPPFLAGS) $(CFLAGS) $(WARNINGS) $(DEBUG_FLAGS)
-+REAL_CFLAGS=$(OPTIMIZATION) -fPIC $(CFLAGS) $(WARNINGS) $(DEBUG_FLAGS)
+ WARNINGS=-Wall -Wextra -Werror -Wstrict-prototypes -Wwrite-strings -Wno-missing-field-initializers
+ DEBUG_FLAGS?= -g -ggdb
+-REAL_CFLAGS=$(OPTIMIZATION) -fPIC $(CPPFLAGS) $(CFLAGS) $(WARNINGS) $(DEBUG_FLAGS) $(PLATFORM_FLAGS)
++REAL_CFLAGS=$(OPTIMIZATION) -fPIC $(CFLAGS) $(WARNINGS) $(DEBUG_FLAGS) $(PLATFORM_FLAGS)
  REAL_LDFLAGS=$(LDFLAGS)
  
  DYLIBSUFFIX=so
-@@ -83,7 +81,16 @@
-   CFLAGS+=-I$(OPENSSL_PREFIX)/include
-   SSL_LDFLAGS+=-L$(OPENSSL_PREFIX)/lib -lssl -lcrypto
+@@ -122,7 +121,16 @@ ifeq ($(uname_S),FreeBSD)
+ else
+   REAL_CFLAGS+=-pedantic
  endif
 -
 +ifeq ($(uname_S),FreeBSD)
diff --git a/databases/redis/files/patch-deps-hiredis-net.c b/databases/redis/files/patch-deps-hiredis-net.c
index 3fd2b5996f97..0dfde3135238 100644
--- a/databases/redis/files/patch-deps-hiredis-net.c
+++ b/databases/redis/files/patch-deps-hiredis-net.c
@@ -1,5 +1,5 @@
---- deps/hiredis/net.c.orig	2019-11-28 14:32:05.942453000 -0500
-+++ deps/hiredis/net.c	2019-11-28 14:39:08.326408000 -0500
+--- deps/hiredis/net.c.orig	2019-11-28 19:32:05 UTC
++++ deps/hiredis/net.c
 @@ -178,14 +178,34 @@
          __redisSetError(c,REDIS_ERR_OTHER,strerror(errno));
          return REDIS_ERR;
diff --git a/databases/redis/files/patch-deps_Makefile b/databases/redis/files/patch-deps_Makefile
deleted file mode 100644
index 39dadb06b822..000000000000
--- a/databases/redis/files/patch-deps_Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
---- deps/Makefile.orig	2021-01-13 11:43:05.174197000 -0500
-+++ deps/Makefile	2021-01-13 11:44:13.744658000 -0500
-@@ -83,12 +83,12 @@
- 
- .PHONY: lua
- 
--JEMALLOC_CFLAGS= -std=gnu99 -Wall -pipe -g3 -O3 -funroll-loops $(CFLAGS)
-+JEMALLOC_CFLAGS= -std=gnu99 -Wall -pipe -funroll-loops $(CFLAGS)
- JEMALLOC_LDFLAGS= $(LDFLAGS)
- 
- jemalloc: .make-prerequisites
- 	@printf '%b %b\n' $(MAKECOLOR)MAKE$(ENDCOLOR) $(BINCOLOR)$@$(ENDCOLOR)
--	cd jemalloc && ./configure --with-version=5.1.0-0-g0 --with-lg-quantum=3 --with-jemalloc-prefix=je_ CFLAGS="$(JEMALLOC_CFLAGS)" LDFLAGS="$(JEMALLOC_LDFLAGS)"
--	cd jemalloc && $(MAKE) CFLAGS="$(JEMALLOC_CFLAGS)" LDFLAGS="$(JEMALLOC_LDFLAGS)" lib/libjemalloc.a
-+	cd jemalloc && ./configure --with-version=5.1.0-0-g0 --with-lg-quantum=3 --with-jemalloc-prefix=je_ CFLAGS="$(JEMALLOC_CFLAGS)" CXXFLAGS="$(JEMALLOC_CFLAGS)" LDFLAGS="$(JEMALLOC_LDFLAGS)"
-+	cd jemalloc && $(MAKE) CFLAGS="$(JEMALLOC_CFLAGS)" CXXFLAGS="$(JEMALLOC_CFLAGS)" LDFLAGS="$(JEMALLOC_LDFLAGS)" lib/libjemalloc.a
- 
- .PHONY: jemalloc
diff --git a/databases/redis/files/patch-redis.conf b/databases/redis/files/patch-redis.conf
index f71797d9555e..b653f89a3211 100644
--- a/databases/redis/files/patch-redis.conf
+++ b/databases/redis/files/patch-redis.conf
@@ -1,5 +1,5 @@
---- redis.conf.orig	2021-01-12 09:21:03.000000000 -0500
-+++ redis.conf	2021-01-13 11:46:40.445746000 -0500
+--- redis.conf.orig	2021-01-12 14:21:03 UTC
++++ redis.conf
 @@ -244,7 +244,7 @@
  # By default Redis does not run as a daemon. Use 'yes' if you need it.
  # Note that Redis will write a pid file in /var/run/redis.pid when daemonized.
diff --git a/databases/redis/pkg-descr b/databases/redis/pkg-descr
index 15beb1c8d992..5500bd1afad4 100644
--- a/databases/redis/pkg-descr
+++ b/databases/redis/pkg-descr
@@ -15,5 +15,3 @@ command to a log.
 Redis also supports trivial-to-setup master-slave replication, with very
 fast non-blocking first synchronization, auto-reconnection on net split
 and so forth.
-
-WWW: https://redis.io/
diff --git a/databases/redis/pkg-plist b/databases/redis/pkg-plist
index 7bc055909fdd..fafc472df89b 100644
--- a/databases/redis/pkg-plist
+++ b/databases/redis/pkg-plist
@@ -4,7 +4,6 @@ bin/redis-check-rdb
 bin/redis-cli
 bin/redis-sentinel
 bin/redis-server
-%%TRIB%%bin/redis-trib.rb
 @sample etc/redis.conf.sample
 @sample(%%REDIS_USER%%,%%REDIS_GROUP%%,) etc/sentinel.conf.sample
 @dir(%%REDIS_USER%%,%%REDIS_GROUP%%,) %%REDIS_DBDIR%%
diff --git a/databases/redis5/Makefile b/databases/redis5/Makefile
deleted file mode 100644
index e3e0b09d3260..000000000000
--- a/databases/redis5/Makefile
+++ /dev/null
@@ -1,128 +0,0 @@
-# Created by: Sergey Skvortsov <skv@protey.ru>
-
-PORTNAME=	redis5
-PORTVERSION=	5.0.13
-CATEGORIES=	databases
-MASTER_SITES=	https://download.redis.io/releases/
-DISTNAME=	redis-${PORTVERSION}
-
-MAINTAINER=	osa@FreeBSD.org
-COMMENT=	Persistent key-value database with built-in net interface
-
-LICENSE=	BSD3CLAUSE
-LICENSE_FILE=	${WRKSRC}/COPYING
-
-OPTIONS_DEFINE=	JEMALLOC TESTS TRIB
-OPTIONS_RADIO=	EXTLUA
-OPTIONS_RADIO_EXTLUA=	LUA LUAJIT LUAJITOR
-OPTIONS_SUB=	yes
-JEMALLOC_DESC=	Use jemalloc
-LUA_DESC=	Use lang/lua instead of builtin lua
-LUAJIT_DESC=	Use lang/luajit instead of builtin lua
-LUAJITOR_DESC=	Use lang/luajit-openjit instead of builtin lua
-TESTS_DESC=	Install lang/tcl for redis unit tests
-TRIB_DESC=	Install redis-trib.rb (lang/ruby req.)
-
-USES+=		compiler:c11 gmake
-MAKE_ENV=	"V=yo"
-
-.include <bsd.port.options.mk>
-
-.if ${ARCH} == i386 && ! ${CFLAGS:M-march=*}
-# Needed for __atomic_fetch_add_8
-USE_GCC=	yes
-CFLAGS+=	-march=i586
-.endif
-
-.if ${PORT_OPTIONS:MJEMALLOC}
-MAKE_ENV+=	"USE_JEMALLOC=yes"
-.endif
-
-.if ${PORT_OPTIONS:MTRIB}
-CATEGORIES+=	ruby
-USE_RUBY=	yes
-RUN_DEPENDS=	rubygem-redis>=2.2:databases/rubygem-redis
-.endif
-
-.if ${PORT_OPTIONS:MLUA}
-USES+=		lua:51
-EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-src-Makefile.lua
-.endif
-
-.if ${PORT_OPTIONS:MLUAJIT}
-LIB_DEPENDS+=	libluajit-5.1.so:lang/luajit
-EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-src-Makefile.luajit
-.endif
-
-.if ${PORT_OPTIONS:MLUAJITOR}
-LIB_DEPENDS+=	libluajit-5.1.so:lang/luajit-openresty
-EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-src-Makefile.luajit-or \
-		${PATCHDIR}/extra-patch-deps_lua_src_lua__cjson.c
-.endif
-
-.if ${PORT_OPTIONS:MLUA} || ${PORT_OPTIONS:MLUAJIT} || ${PORT_OPTIONS:MLUAJITOR}
-CFLAGS+=	-fPIC
-LDFLAGS+=	-Wl,-E
-.endif
-
-.if ${PORT_OPTIONS:MTESTS}
-USES+=		tcl:build
-.endif
-
-LDFLAGS+=	-lpthread -lm -lexecinfo
-
-CONFLICTS?=	redis-6.* redis-devel-6.* redis6-6.*
-
-USE_RC_SUBR=	redis sentinel
-BIN_FILES=	redis-benchmark redis-check-aof redis-check-rdb \
-		redis-cli redis-sentinel redis-server
-
-USERS=	redis
-GROUPS=	redis
-
-REDIS_DBDIR?=	/var/db/redis
-REDIS_RUNDIR?=	/var/run/redis
-REDIS_LOGDIR?=	/var/log/redis
-
-SUB_FILES=	pkg-message
-SUB_LIST+=	PORTNAME=${PORTNAME} \
-	REDIS_USER=${USERS} \
-	REDIS_DBDIR=${REDIS_DBDIR} \
-	REDIS_LOGDIR=${REDIS_LOGDIR} \
-	REDIS_RUNDIR=${REDIS_RUNDIR}
-
-PLIST_SUB+=	REDIS_USER=${USERS} \
-	REDIS_GROUP=${GROUPS} \
-	REDIS_LOGDIR=${REDIS_LOGDIR} \
-	REDIS_DBDIR=${REDIS_DBDIR} \
-	REDIS_RUNDIR=${REDIS_RUNDIR}
-
-.include <bsd.port.pre.mk>
-
-post-patch:
-.if ${PORT_OPTIONS:MJEMALLOC}
-	@${REINPLACE_CMD} '35s!Linux!FreeBSD!g' ${WRKSRC}/src/Makefile
-.endif
-.if ${PORT_OPTIONS:MLUA} || ${PORT_OPTIONS:MLUAJIT} || ${PORT_OPTIONS:MLUAJITOR}
-	@cd ${WRKSRC}/deps/lua/src && ${CP} fpconv.* lua_* strbuf.* ${WRKSRC}/src/
-.endif
-
-post-build:
-	${SED} ${SUB_LIST:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
-		${WRKSRC}/redis.conf > ${WRKDIR}/redis.conf
-
-do-install:
-	${INSTALL_PROGRAM} ${BIN_FILES:C!^!${WRKSRC}/src/!} ${STAGEDIR}${PREFIX}/bin/
-.if ${PORT_OPTIONS:MTRIB}
-	${INSTALL_SCRIPT} ${WRKSRC}/src/redis-trib.rb ${STAGEDIR}${PREFIX}/bin/
-.endif
-	${INSTALL_DATA} ${WRKDIR}/redis.conf ${STAGEDIR}${PREFIX}/etc/redis.conf.sample
-	${INSTALL_DATA} ${WRKSRC}/sentinel.conf ${STAGEDIR}${PREFIX}/etc/sentinel.conf.sample
-	${MKDIR} ${STAGEDIR}${REDIS_LOGDIR} \
-		${STAGEDIR}${REDIS_DBDIR} \
-		${STAGEDIR}${REDIS_RUNDIR}
-
-do-test:
-	@cd ${WRKSRC} && ${TCLSH} tests/test_helper.tcl
-
-.include <bsd.port.post.mk>
diff --git a/databases/redis5/distinfo b/databases/redis5/distinfo
deleted file mode 100644
index d44b6d9703cd..000000000000
--- a/databases/redis5/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1626937857
-SHA256 (redis-5.0.13.tar.gz) = 2b617aa2d6ad66c6a5d99fc8590c6b83b40d391fd1184c6eeab30df31f6a7208
-SIZE (redis-5.0.13.tar.gz) = 1995566
diff --git a/databases/redis5/files/extra-patch-deps_lua_src_lua__cjson.c b/databases/redis5/files/extra-patch-deps_lua_src_lua__cjson.c
deleted file mode 100644
index 847b70d25dea..000000000000
--- a/databases/redis5/files/extra-patch-deps_lua_src_lua__cjson.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- deps/lua/src/lua_cjson.c.orig	2019-12-08 07:56:31.419672000 -0500
-+++ deps/lua/src/lua_cjson.c	2019-12-08 07:56:52.389362000 -0500
-@@ -1299,7 +1299,7 @@
-  *
-  * luaL_setfuncs() is used to create a module table where the functions have
-  * json_config_t as their first upvalue. Code borrowed from Lua 5.2 source. */
--static void luaL_setfuncs (lua_State *l, const luaL_Reg *reg, int nup)
-+void luaL_setfuncs (lua_State *l, const luaL_Reg *reg, int nup)
- {
-     int i;
- 
diff --git a/databases/redis5/files/extra-patch-src-Makefile.lua b/databases/redis5/files/extra-patch-src-Makefile.lua
deleted file mode 100644
index 17c3d23b74b5..000000000000
--- a/databases/redis5/files/extra-patch-src-Makefile.lua
+++ /dev/null
@@ -1,58 +0,0 @@
---- src/Makefile.orig	2018-10-18 18:09:43.930566000 -0400
-+++ src/Makefile	2018-10-18 18:10:32.562125000 -0400
-@@ -16,7 +16,7 @@
- uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not')
- uname_M := $(shell sh -c 'uname -m 2>/dev/null || echo not')
- OPTIMIZATION?=-O2
--DEPENDENCY_TARGETS=hiredis linenoise lua
-+DEPENDENCY_TARGETS=hiredis linenoise
- NODEPS:=clean distclean
- 
- # Default settings
-@@ -63,8 +63,8 @@
- # Override default settings if possible
- -include .make-settings
- 
--FINAL_CFLAGS=$(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) $(REDIS_CFLAGS)
--FINAL_LDFLAGS=$(LDFLAGS) $(REDIS_LDFLAGS) $(DEBUG)
-+FINAL_CFLAGS=$(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS)
-+FINAL_LDFLAGS=$(LDFLAGS) $(DEBUG)
- FINAL_LIBS=-lm
- 
- ifeq ($(uname_S),SunOS)
-@@ -112,7 +112,7 @@
- endif
- endif
- # Include paths to dependencies
--FINAL_CFLAGS+= -I../deps/hiredis -I../deps/linenoise -I../deps/lua/src
-+FINAL_CFLAGS+= -I../deps/hiredis -I../deps/linenoise
- 
- ifeq ($(MALLOC),tcmalloc)
- 	FINAL_CFLAGS+= -DUSE_TCMALLOC
-@@ -130,6 +130,9 @@
- 	FINAL_LIBS := ../deps/jemalloc/lib/libjemalloc.a $(FINAL_LIBS)
- endif
- 
-+FINAL_CFLAGS+=-I${PREFIX}/include/lua51
-+FINAL_LIBS+= -L${PREFIX}/lib -llua-5.1
-+
- REDIS_CC=$(QUIET_CC)$(CC) $(FINAL_CFLAGS)
- REDIS_LD=$(QUIET_LINK)$(CC) $(FINAL_LDFLAGS)
- REDIS_INSTALL=$(QUIET_INSTALL)$(INSTALL)
-@@ -150,6 +153,7 @@
- REDIS_SERVER_NAME=redis-server
- REDIS_SENTINEL_NAME=redis-sentinel
- REDIS_SERVER_OBJ=adlist.o quicklist.o ae.o anet.o dict.o server.o sds.o zmalloc.o lzf_c.o lzf_d.o pqsort.o zipmap.o sha1.o ziplist.o release.o networking.o util.o object.o db.o replication.o rdb.o t_string.o t_list.o t_set.o t_zset.o t_hash.o config.o aof.o pubsub.o multi.o debug.o sort.o intset.o syncio.o cluster.o crc16.o endianconv.o slowlog.o scripting.o bio.o rio.o rand.o memtest.o crc64.o bitops.o sentinel.o notify.o setproctitle.o blocked.o hyperloglog.o latency.o sparkline.o redis-check-rdb.o redis-check-aof.o geo.o lazyfree.o module.o evict.o expire.o geohash.o geohash_helper.o childinfo.o defrag.o siphash.o rax.o t_stream.o listpack.o localtime.o lolwut.o lolwut5.o
-+REDIS_SERVER_OBJ+=fpconv.o lua_bit.o lua_cjson.o lua_cmsgpack.o lua_struct.o strbuf.o
- REDIS_CLI_NAME=redis-cli
- REDIS_CLI_OBJ=anet.o adlist.o dict.o redis-cli.o zmalloc.o release.o anet.o ae.o crc64.o siphash.o crc16.o
- REDIS_BENCHMARK_NAME=redis-benchmark
-@@ -201,7 +205,7 @@
- 
- # redis-server
- $(REDIS_SERVER_NAME): $(REDIS_SERVER_OBJ)
--	$(REDIS_LD) -o $@ $^ ../deps/hiredis/libhiredis.a ../deps/lua/src/liblua.a $(FINAL_LIBS)
-+	$(REDIS_LD) -o $@ $^ ../deps/hiredis/libhiredis.a $(FINAL_LIBS)
- 
- # redis-sentinel
- $(REDIS_SENTINEL_NAME): $(REDIS_SERVER_NAME)
diff --git a/databases/redis5/files/extra-patch-src-Makefile.luajit b/databases/redis5/files/extra-patch-src-Makefile.luajit
deleted file mode 100644
index a0cc15f0f22a..000000000000
--- a/databases/redis5/files/extra-patch-src-Makefile.luajit
+++ /dev/null
@@ -1,58 +0,0 @@
---- src/Makefile.orig	2018-10-18 18:11:24.649811000 -0400
-+++ src/Makefile	2018-10-18 18:11:35.160523000 -0400
-@@ -16,7 +16,7 @@
- uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not')
- uname_M := $(shell sh -c 'uname -m 2>/dev/null || echo not')
- OPTIMIZATION?=-O2
--DEPENDENCY_TARGETS=hiredis linenoise lua
-+DEPENDENCY_TARGETS=hiredis linenoise
- NODEPS:=clean distclean
- 
- # Default settings
-@@ -63,8 +63,8 @@
- # Override default settings if possible
- -include .make-settings
- 
--FINAL_CFLAGS=$(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) $(REDIS_CFLAGS)
--FINAL_LDFLAGS=$(LDFLAGS) $(REDIS_LDFLAGS) $(DEBUG)
-+FINAL_CFLAGS=$(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS)
-+FINAL_LDFLAGS=$(LDFLAGS) $(DEBUG)
- FINAL_LIBS=-lm
- 
- ifeq ($(uname_S),SunOS)
-@@ -112,7 +112,7 @@
- endif
- endif
- # Include paths to dependencies
--FINAL_CFLAGS+= -I../deps/hiredis -I../deps/linenoise -I../deps/lua/src
-+FINAL_CFLAGS+= -I../deps/hiredis -I../deps/linenoise
- 
- ifeq ($(MALLOC),tcmalloc)
- 	FINAL_CFLAGS+= -DUSE_TCMALLOC
-@@ -130,6 +130,9 @@
- 	FINAL_LIBS := ../deps/jemalloc/lib/libjemalloc.a $(FINAL_LIBS)
- endif
- 
-+FINAL_CFLAGS+=-I${PREFIX}/include/luajit-2.0
-+FINAL_LIBS+= -L${PREFIX}/lib -lluajit-5.1
-+
- REDIS_CC=$(QUIET_CC)$(CC) $(FINAL_CFLAGS)
- REDIS_LD=$(QUIET_LINK)$(CC) $(FINAL_LDFLAGS)
- REDIS_INSTALL=$(QUIET_INSTALL)$(INSTALL)
-@@ -150,6 +153,7 @@
- REDIS_SERVER_NAME=redis-server
- REDIS_SENTINEL_NAME=redis-sentinel
- REDIS_SERVER_OBJ=adlist.o quicklist.o ae.o anet.o dict.o server.o sds.o zmalloc.o lzf_c.o lzf_d.o pqsort.o zipmap.o sha1.o ziplist.o release.o networking.o util.o object.o db.o replication.o rdb.o t_string.o t_list.o t_set.o t_zset.o t_hash.o config.o aof.o pubsub.o multi.o debug.o sort.o intset.o syncio.o cluster.o crc16.o endianconv.o slowlog.o scripting.o bio.o rio.o rand.o memtest.o crc64.o bitops.o sentinel.o notify.o setproctitle.o blocked.o hyperloglog.o latency.o sparkline.o redis-check-rdb.o redis-check-aof.o geo.o lazyfree.o module.o evict.o expire.o geohash.o geohash_helper.o childinfo.o defrag.o siphash.o rax.o t_stream.o listpack.o localtime.o lolwut.o lolwut5.o
-+REDIS_SERVER_OBJ+=fpconv.o lua_bit.o lua_cjson.o lua_cmsgpack.o lua_struct.o strbuf.o
- REDIS_CLI_NAME=redis-cli
- REDIS_CLI_OBJ=anet.o adlist.o dict.o redis-cli.o zmalloc.o release.o anet.o ae.o crc64.o siphash.o crc16.o
- REDIS_BENCHMARK_NAME=redis-benchmark
-@@ -201,7 +205,7 @@
- 
- # redis-server
- $(REDIS_SERVER_NAME): $(REDIS_SERVER_OBJ)
--	$(REDIS_LD) -o $@ $^ ../deps/hiredis/libhiredis.a ../deps/lua/src/liblua.a $(FINAL_LIBS)
-+	$(REDIS_LD) -o $@ $^ ../deps/hiredis/libhiredis.a $(FINAL_LIBS)
- 
- # redis-sentinel
- $(REDIS_SENTINEL_NAME): $(REDIS_SERVER_NAME)
diff --git a/databases/redis5/files/extra-patch-src-Makefile.luajit-or b/databases/redis5/files/extra-patch-src-Makefile.luajit-or
deleted file mode 100644
index 2ad603ae1750..000000000000
--- a/databases/redis5/files/extra-patch-src-Makefile.luajit-or
+++ /dev/null
@@ -1,58 +0,0 @@
---- src/Makefile.orig	2019-11-19 12:05:52.000000000 -0500
-+++ src/Makefile	2019-12-11 19:44:38.238797000 -0500
-@@ -16,7 +16,7 @@
- uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not')
- uname_M := $(shell sh -c 'uname -m 2>/dev/null || echo not')
- OPTIMIZATION?=-O2
--DEPENDENCY_TARGETS=hiredis linenoise lua
-+DEPENDENCY_TARGETS=hiredis linenoise
- NODEPS:=clean distclean
- 
- # Default settings
-@@ -72,8 +72,8 @@
- # Override default settings if possible
- -include .make-settings
- 
--FINAL_CFLAGS=$(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) $(REDIS_CFLAGS)
--FINAL_LDFLAGS=$(LDFLAGS) $(REDIS_LDFLAGS) $(DEBUG)
-+FINAL_CFLAGS=$(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS)
-+FINAL_LDFLAGS=$(LDFLAGS) $(DEBUG)
- FINAL_LIBS=-lm
- DEBUG=-g -ggdb
- 
-@@ -127,7 +127,7 @@
- endif
- endif
- # Include paths to dependencies
--FINAL_CFLAGS+= -I../deps/hiredis -I../deps/linenoise -I../deps/lua/src
-+FINAL_CFLAGS+= -I../deps/hiredis -I../deps/linenoise
- 
- ifeq ($(MALLOC),tcmalloc)
- 	FINAL_CFLAGS+= -DUSE_TCMALLOC
-@@ -145,6 +145,9 @@
- 	FINAL_LIBS := ../deps/jemalloc/lib/libjemalloc.a $(FINAL_LIBS)
- endif
- 
-+FINAL_CFLAGS+=-I${PREFIX}/include/luajit-2.1
-+FINAL_LIBS+= -L${PREFIX}/lib -lluajit-5.1
-+
- REDIS_CC=$(QUIET_CC)$(CC) $(FINAL_CFLAGS)
- REDIS_LD=$(QUIET_LINK)$(CC) $(FINAL_LDFLAGS)
- REDIS_INSTALL=$(QUIET_INSTALL)$(INSTALL)
-@@ -165,6 +168,7 @@
- REDIS_SERVER_NAME=redis-server
- REDIS_SENTINEL_NAME=redis-sentinel
- REDIS_SERVER_OBJ=adlist.o quicklist.o ae.o anet.o dict.o server.o sds.o zmalloc.o lzf_c.o lzf_d.o pqsort.o zipmap.o sha1.o ziplist.o release.o networking.o util.o object.o db.o replication.o rdb.o t_string.o t_list.o t_set.o t_zset.o t_hash.o config.o aof.o pubsub.o multi.o debug.o sort.o intset.o syncio.o cluster.o crc16.o endianconv.o slowlog.o scripting.o bio.o rio.o rand.o memtest.o crc64.o bitops.o sentinel.o notify.o setproctitle.o blocked.o hyperloglog.o latency.o sparkline.o redis-check-rdb.o redis-check-aof.o geo.o lazyfree.o module.o evict.o expire.o geohash.o geohash_helper.o childinfo.o defrag.o siphash.o rax.o t_stream.o listpack.o localtime.o lolwut.o lolwut5.o
-+REDIS_SERVER_OBJ+=fpconv.o lua_bit.o lua_cjson.o lua_cmsgpack.o lua_struct.o strbuf.o
- REDIS_CLI_NAME=redis-cli
- REDIS_CLI_OBJ=anet.o adlist.o dict.o redis-cli.o zmalloc.o release.o anet.o ae.o crc64.o siphash.o crc16.o
- REDIS_BENCHMARK_NAME=redis-benchmark
-@@ -216,7 +220,7 @@
- 
- # redis-server
- $(REDIS_SERVER_NAME): $(REDIS_SERVER_OBJ)
--	$(REDIS_LD) -o $@ $^ ../deps/hiredis/libhiredis.a ../deps/lua/src/liblua.a $(FINAL_LIBS)
-+	$(REDIS_LD) -o $@ $^ ../deps/hiredis/libhiredis.a $(FINAL_LIBS)
- 
- # redis-sentinel
- $(REDIS_SENTINEL_NAME): $(REDIS_SERVER_NAME)
diff --git a/databases/redis5/files/patch-deps-Makefile b/databases/redis5/files/patch-deps-Makefile
deleted file mode 100644
index 385f0a116c6d..000000000000
--- a/databases/redis5/files/patch-deps-Makefile
+++ /dev/null
@@ -1,20 +0,0 @@
---- deps/Makefile.orig	2019-09-25 10:40:18 UTC
-+++ deps/Makefile
-@@ -58,7 +58,7 @@ ifeq ($(uname_S),SunOS)
- 	LUA_CFLAGS= -D__C99FEATURES__=1
- endif
- 
--LUA_CFLAGS+= -O2 -Wall -DLUA_ANSI -DENABLE_CJSON_GLOBAL -DREDIS_STATIC='' $(CFLAGS)
-+LUA_CFLAGS+= -Wall -DLUA_ANSI -DENABLE_CJSON_GLOBAL -DREDIS_STATIC='' $(CFLAGS)
- LUA_LDFLAGS+= $(LDFLAGS)
- # lua's Makefile defines AR="ar rcu", which is unusual, and makes it more
- # challenging to cross-compile lua (and redis).  These defines make it easier
-@@ -68,7 +68,7 @@ ARFLAGS=rcu
- 
- lua: .make-prerequisites
- 	@printf '%b %b\n' $(MAKECOLOR)MAKE$(ENDCOLOR) $(BINCOLOR)$@$(ENDCOLOR)
--	cd lua/src && $(MAKE) all CFLAGS="$(LUA_CFLAGS)" MYLDFLAGS="$(LUA_LDFLAGS)" AR="$(AR) $(ARFLAGS)"
-+	cd lua/src && $(MAKE) all CC="$(CC)" CFLAGS="$(LUA_CFLAGS)" MYLDFLAGS="$(LUA_LDFLAGS)" AR="$(AR) $(ARFLAGS)"
- 
- .PHONY: lua
- 
diff --git a/databases/redis5/files/patch-deps-hiredis-Makefile b/databases/redis5/files/patch-deps-hiredis-Makefile
deleted file mode 100644
index a74d7b4cc81c..000000000000
--- a/databases/redis5/files/patch-deps-hiredis-Makefile
+++ /dev/null
@@ -1,41 +0,0 @@
---- deps/hiredis/Makefile.orig	2019-09-25 10:40:18 UTC
-+++ deps/hiredis/Makefile
-@@ -15,7 +15,7 @@ HIREDIS_PATCH=$(shell grep HIREDIS_PATCH hiredis.h | a
- HIREDIS_SONAME=$(shell grep HIREDIS_SONAME hiredis.h | awk '{print $$3}')
- 
- # Installation related variables and target
--PREFIX?=/usr/local
-+PREFIX?=${PREFIX}
- INCLUDE_PATH?=include/hiredis
- LIBRARY_PATH?=lib
- PKGCONF_PATH?=pkgconfig
-@@ -38,10 +38,10 @@ export REDIS_TEST_CONFIG
- # Fallback to gcc when $CC is not in $PATH.
- CC:=$(shell sh -c 'type $(CC) >/dev/null 2>/dev/null && echo $(CC) || echo gcc')
- CXX:=$(shell sh -c 'type $(CXX) >/dev/null 2>/dev/null && echo $(CXX) || echo g++')
--OPTIMIZATION?=-O3
-+#OPTIMIZATION?=-O3
- WARNINGS=-Wall -W -Wstrict-prototypes -Wwrite-strings
--DEBUG_FLAGS?= -g -ggdb
--REAL_CFLAGS=$(OPTIMIZATION) -fPIC $(CFLAGS) $(WARNINGS) $(DEBUG_FLAGS) $(ARCH)
-+#DEBUG_FLAGS?= -g -ggdb
-+REAL_CFLAGS=$(OPTIMIZATION) -fPIC $(CFLAGS) $(WARNINGS) $(DEBUG_FLAGS)
- REAL_LDFLAGS=$(LDFLAGS) $(ARCH)
- 
- DYLIBSUFFIX=so
-@@ -59,6 +59,15 @@ ifeq ($(uname_S),SunOS)
-   REAL_LDFLAGS+= -ldl -lnsl -lsocket
-   DYLIB_MAKE_CMD=$(CC) -G -o $(DYLIBNAME) -h $(DYLIB_MINOR_NAME) $(LDFLAGS)
-   INSTALL= cp -r
-+endif
-+ifeq ($(uname_S),FreeBSD)
-+  CFLAGS?=$(CFLAGS)
-+  CCLINK?=-pthread
-+  LDFLAGS?=-L. -Wl,-rpath,.
-+  DYLIBNAME?=libhiredis.so
-+  DYLIB_MAKE_CMD?=$(CC) -o ${DYLIBNAME} ${OBJ}
-+  STLIBNAME?=libhiredis.a
-+  STLIB_MAKE_CMD?=ar rcs ${STLIBNAME} ${OBJ}
- endif
- ifeq ($(uname_S),Darwin)
-   DYLIBSUFFIX=dylib
diff --git a/databases/redis5/files/patch-deps-hiredis-net.c b/databases/redis5/files/patch-deps-hiredis-net.c
deleted file mode 100644
index dc390fab3057..000000000000
--- a/databases/redis5/files/patch-deps-hiredis-net.c
+++ /dev/null
@@ -1,64 +0,0 @@
---- deps/hiredis/net.c.orig	2019-09-25 10:40:18 UTC
-+++ deps/hiredis/net.c
-@@ -135,13 +135,12 @@ int redisKeepAlive(redisContext *c, int interval) {
- 
-     val = interval;
- 
--#ifdef _OSX
-+#if defined(_OSX)
-     if (setsockopt(fd, IPPROTO_TCP, TCP_KEEPALIVE, &val, sizeof(val)) < 0) {
-         __redisSetError(c,REDIS_ERR_OTHER,strerror(errno));
-         return REDIS_ERR;
-     }
--#else
--#if defined(__GLIBC__) && !defined(__FreeBSD_kernel__)
-+#elif defined(__GLIBC__)
-     val = interval;
-     if (setsockopt(fd, IPPROTO_TCP, TCP_KEEPIDLE, &val, sizeof(val)) < 0) {
-         __redisSetError(c,REDIS_ERR_OTHER,strerror(errno));
-@@ -160,6 +159,27 @@ int redisKeepAlive(redisContext *c, int interval) {
-         __redisSetError(c,REDIS_ERR_OTHER,strerror(errno));
-         return REDIS_ERR;
-     }
-+#else
-+#if !defined(__sun) && defined(TCP_KEEPIDLE) && defined(TCP_KEEPINTVL) && \
-+    defined(TCP_KEEPCNT)
-+    val = interval;
-+    if (setsockopt(fd, IPPROTO_TCP, TCP_KEEPIDLE, &val, sizeof(val)) < 0) {
-+        __redisSetError(c,REDIS_ERR_OTHER,strerror(errno));
-+        return REDIS_ERR;
-+    }
-+ 
-+    val = interval/3;
-+    if (val == 0) val = 1;
-+    if (setsockopt(fd, IPPROTO_TCP, TCP_KEEPINTVL, &val, sizeof(val)) < 0) {
-+        __redisSetError(c,REDIS_ERR_OTHER,strerror(errno));
-+        return REDIS_ERR;
-+    }
-+
-+    val = 3;
-+    if (setsockopt(fd, IPPROTO_TCP, TCP_KEEPCNT, &val, sizeof(val)) < 0) {
-+        __redisSetError(c,REDIS_ERR_OTHER,strerror(errno));
-+        return REDIS_ERR;
-+    }
- #endif
- #endif
- 
-@@ -431,7 +451,7 @@ int redisContextConnectUnix(redisContext *c, const cha
-     struct sockaddr_un sa;
-     long timeout_msec = -1;
- 
--    if (redisCreateSocket(c,AF_LOCAL) < 0)
-+    if (redisCreateSocket(c,AF_UNIX) < 0)
-         return REDIS_ERR;
-     if (redisSetBlocking(c,0) != REDIS_OK)
-         return REDIS_ERR;
-@@ -456,7 +476,7 @@ int redisContextConnectUnix(redisContext *c, const cha
-     if (redisContextTimeoutMsec(c,&timeout_msec) != REDIS_OK)
-         return REDIS_ERR;
- 
--    sa.sun_family = AF_LOCAL;
-+    sa.sun_family = AF_UNIX;
-     strncpy(sa.sun_path,path,sizeof(sa.sun_path)-1);
-     if (connect(c->fd, (struct sockaddr*)&sa, sizeof(sa)) == -1) {
-         if (errno == EINPROGRESS && !blocking) {
diff --git a/databases/redis5/files/patch-deps_Makefile b/databases/redis5/files/patch-deps_Makefile
deleted file mode 100644
index ab5b282c67f5..000000000000
--- a/databases/redis5/files/patch-deps_Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
---- deps/Makefile.orig	2019-11-29 16:35:59 UTC
-+++ deps/Makefile
-@@ -76,12 +76,12 @@ lua: .make-prerequisites
- 
- .PHONY: lua
- 
--JEMALLOC_CFLAGS= -std=gnu99 -Wall -pipe -g3 -O3 -funroll-loops $(CFLAGS)
-+JEMALLOC_CFLAGS= -std=gnu99 -Wall -pipe -funroll-loops $(CFLAGS)
- JEMALLOC_LDFLAGS= $(LDFLAGS)
- 
- jemalloc: .make-prerequisites
- 	@printf '%b %b\n' $(MAKECOLOR)MAKE$(ENDCOLOR) $(BINCOLOR)$@$(ENDCOLOR)
--	cd jemalloc && ./configure --with-version=5.1.0-0-g0 --with-lg-quantum=3 --with-jemalloc-prefix=je_ --enable-cc-silence CFLAGS="$(JEMALLOC_CFLAGS)" LDFLAGS="$(JEMALLOC_LDFLAGS)"
--	cd jemalloc && $(MAKE) CFLAGS="$(JEMALLOC_CFLAGS)" LDFLAGS="$(JEMALLOC_LDFLAGS)" lib/libjemalloc.a
-+	cd jemalloc && ./configure --with-version=5.1.0-0-g0 --with-lg-quantum=3 --with-jemalloc-prefix=je_ --enable-cc-silence CFLAGS="$(JEMALLOC_CFLAGS)" CXXFLAGS="$(JEMALLOC_CFLAGS)" LDFLAGS="$(JEMALLOC_LDFLAGS)"
-+	cd jemalloc && $(MAKE) CFLAGS="$(JEMALLOC_CFLAGS)" CXXFLAGS="$(JEMALLOC_CFLAGS)" LDFLAGS="$(JEMALLOC_LDFLAGS)" lib/libjemalloc.a
- 
- .PHONY: jemalloc
diff --git a/databases/redis5/files/patch-redis.conf b/databases/redis5/files/patch-redis.conf
deleted file mode 100644
index 187a9dfd5d20..000000000000
--- a/databases/redis5/files/patch-redis.conf
+++ /dev/null
@@ -1,38 +0,0 @@
---- redis.conf.orig	2019-09-25 10:40:18 UTC
-+++ redis.conf
-@@ -133,7 +133,7 @@ tcp-keepalive 300
- 
- # By default Redis does not run as a daemon. Use 'yes' if you need it.
- # Note that Redis will write a pid file in /var/run/redis.pid when daemonized.
--daemonize no
-+daemonize yes
- 
- # If you run Redis from upstart or systemd, Redis can interact with your
- # supervision tree. Options:
-@@ -155,7 +155,7 @@ supervised no
- #
- # Creating a pid file is best effort: if Redis is not able to create it
- # nothing bad happens, the server will start and run normally.
--pidfile /var/run/redis_6379.pid
-+pidfile %%REDIS_RUNDIR%%/redis.pid
- 
- # Specify the server verbosity level.
- # This can be one of:
-@@ -168,7 +168,7 @@ loglevel notice
- # Specify the log file name. Also the empty string can be used to force
- # Redis to log on the standard output. Note that if you use standard
- # output for logging but daemonize, logs will be sent to /dev/null
--logfile ""
-+logfile %%REDIS_LOGDIR%%/redis.log
- 
- # To enable logging to the system logger, just set 'syslog-enabled' to yes,
- # and optionally update the other syslog parameters to suit your needs.
-@@ -260,7 +260,7 @@ dbfilename dump.rdb
- # The Append Only File will also be created inside this directory.
- #
- # Note that you must specify a directory here, not a file name.
--dir ./
-+dir %%REDIS_DBDIR%%/
- 
- ################################# REPLICATION #################################
- 
diff --git a/databases/redis5/files/patch-src-Makefile b/databases/redis5/files/patch-src-Makefile
deleted file mode 100644
index 039f8f0dbe1e..000000000000
--- a/databases/redis5/files/patch-src-Makefile
+++ /dev/null
@@ -1,39 +0,0 @@
---- src/Makefile.orig	2019-09-25 10:40:18 UTC
-+++ src/Makefile
-@@ -29,7 +29,7 @@ endif
- WARN=-Wall -W -Wno-missing-field-initializers
- OPT=$(OPTIMIZATION)
- 
--PREFIX?=/usr/local
-+PREFIX:=$(PREFIX)
- INSTALL_BIN=$(PREFIX)/bin
- INSTALL=install
- 
-@@ -75,7 +75,6 @@ endif
- FINAL_CFLAGS=$(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) $(REDIS_CFLAGS)
- FINAL_LDFLAGS=$(LDFLAGS) $(REDIS_LDFLAGS) $(DEBUG)
- FINAL_LIBS=-lm
--DEBUG=-g -ggdb
- 
- ifeq ($(uname_S),SunOS)
- 	# SunOS
-@@ -94,6 +93,11 @@ ifeq ($(uname_S),Darwin)
- 	# Darwin
- 	FINAL_LIBS+= -ldl
- else
-+ifeq ($(uname_S),FreeBSD)
-+        # FreeBSD
-+        FINAL_CFLAGS?= $(CFLAGS) $(REDIS_CFLAGS) -I${PREFIX}/include
-+        FINAL_LDFLAGS= $(LDFLAGS) -pthread
-+else
- ifeq ($(uname_S),AIX)
-         # AIX
-         FINAL_LDFLAGS+= -Wl,-bexpall
-@@ -120,6 +124,7 @@ else
- 	# All the other OSes (notably Linux)
- 	FINAL_LDFLAGS+= -rdynamic
- 	FINAL_LIBS+=-ldl -pthread -lrt
-+endif
- endif
- endif
- endif
diff --git a/databases/redis5/files/patch-src-mkreleasehdr.sh b/databases/redis5/files/patch-src-mkreleasehdr.sh
deleted file mode 100644
index 05176402b0c0..000000000000
--- a/databases/redis5/files/patch-src-mkreleasehdr.sh
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/mkreleasehdr.sh.orig	2019-09-25 10:40:18 UTC
-+++ src/mkreleasehdr.sh
-@@ -1,6 +1,6 @@
- #!/bin/sh
--GIT_SHA1=`(git show-ref --head --hash=8 2> /dev/null || echo 00000000) | head -n1`
--GIT_DIRTY=`git diff --no-ext-diff 2> /dev/null | wc -l`
-+GIT_SHA1="00000000"
-+GIT_DIRTY="0"
- BUILD_ID=`uname -n`"-"`date +%s`
- if [ -n "$SOURCE_DATE_EPOCH" ]; then
-   BUILD_ID=$(date -u -d "@$SOURCE_DATE_EPOCH" +%s 2>/dev/null || date -u -r "$SOURCE_DATE_EPOCH" +%s 2>/dev/null || date -u %s)
diff --git a/databases/redis5/pkg-descr b/databases/redis5/pkg-descr
deleted file mode 100644
index 15beb1c8d992..000000000000
--- a/databases/redis5/pkg-descr
+++ /dev/null
@@ -1,19 +0,0 @@
-Redis is an open source, advanced key-value store.  It is often referred
-to as a data structure server since keys can contain strings, hashes,
-lists, sets and sorted sets.
-
-You can run atomic operations on these types, like appending to a string;
-incrementing the value in a hash; pushing to a list; computing set
-intersection, union and difference; or getting the member with highest
-ranking in a sorted set.
-
-In order to achieve its outstanding performance, Redis works with an
-in-memory dataset.  Depending on your use case, you can persist it either
-by dumping the dataset to disk every once in a while, or by appending each
-command to a log.
-
-Redis also supports trivial-to-setup master-slave replication, with very
-fast non-blocking first synchronization, auto-reconnection on net split
-and so forth.
-
-WWW: https://redis.io/
diff --git a/databases/redis5/pkg-plist b/databases/redis5/pkg-plist
deleted file mode 100644
index 7bc055909fdd..000000000000
--- a/databases/redis5/pkg-plist
+++ /dev/null
@@ -1,12 +0,0 @@
-bin/redis-benchmark
-bin/redis-check-aof
-bin/redis-check-rdb
-bin/redis-cli
-bin/redis-sentinel
-bin/redis-server
-%%TRIB%%bin/redis-trib.rb
-@sample etc/redis.conf.sample
-@sample(%%REDIS_USER%%,%%REDIS_GROUP%%,) etc/sentinel.conf.sample
-@dir(%%REDIS_USER%%,%%REDIS_GROUP%%,) %%REDIS_DBDIR%%
-@dir(%%REDIS_USER%%,%%REDIS_GROUP%%,) %%REDIS_LOGDIR%%
-@dir(%%REDIS_USER%%,%%REDIS_GROUP%%,) %%REDIS_RUNDIR%%
diff --git a/databases/redis6/Makefile b/databases/redis6/Makefile
deleted file mode 100644
index 08874b0fd75f..000000000000
--- a/databases/redis6/Makefile
+++ /dev/null
@@ -1,125 +0,0 @@
-# Created by: Sergey Skvortsov <skv@protey.ru>
-
-PORTNAME=	redis6
-PORTVERSION=	6.0.15
-PORTREVISION=	1
-CATEGORIES=	databases
-MASTER_SITES=	https://download.redis.io/releases/
-DISTNAME=	redis-${PORTVERSION}
-
-MAINTAINER=	osa@FreeBSD.org
-COMMENT=	Persistent key-value database with built-in net interface
-
-LICENSE=	BSD3CLAUSE
-LICENSE_FILE=	${WRKSRC}/COPYING
-
-USES+=		compiler:c11 gmake
-
-OPTIONS_DEFINE=	JEMALLOC TESTS TLS TRIB
-OPTIONS_RADIO=	EXTLUA
-OPTIONS_RADIO_EXTLUA=	LUA LUAJIT LUAJITOR
-OPTIONS_SUB=	yes
-JEMALLOC_DESC=	Use jemalloc
-LUA_DESC=	Use lang/lua instead of builtin lua
-LUAJIT_DESC=	Use lang/luajit instead of builtin lua
-LUAJITOR_DESC=	Use lang/luajit-openresty instead of builtin lua
-TLS_DESC=	Use TLS (openssl req.)
-TESTS_DESC=	Install lang/tcl for redis unit tests
-TRIB_DESC=	Install redis-trib.rb (lang/ruby req.)
-
-MAKE_ENV=	V=yo OPTIMIZATION=
-
-JEMALLOC_MAKE_ENV=	USE_JEMALLOC=yes
-
-LUA_USES=		lua:51
-LUA_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-src-Makefile.lua
-LUA_VARS=		_addflags=true
-
-LUAJIT_LIB_DEPENDS=	libluajit-5.1.so:lang/luajit
-LUAJIT_BUILD_DEPENDS=	${LOCALBASE}/include/luajit-2.0/lua.h:lang/luajit
-LUAJIT_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-src-Makefile.luajit
-LUAJIT_VARS=		_addflags=true
-
-LUAJITOR_LIB_DEPENDS=	libluajit-5.1.so:lang/luajit-openresty
-LUAJITOR_BUILD_DEPENDS=	${LOCALBASE}/include/luajit-2.1/lua.h:lang/luajit-openresty
-LUAJITOR_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-src-Makefile.luajit-or \
-			${PATCHDIR}/extra-patch-deps_lua_src_lua__cjson.c
-LUAJITOR_VARS=		_addflags=true
-
-TESTS_USES=	tcl:build
-
-TLS_USES=	ssl
-TLS_MAKE_ENV=	BUILD_TLS=yes
-
-TRIB_CATEGORIES=	ruby
-TRIB_USE=		ruby=yes
-TRIB_RUN_DEPENDS=	rubygem-redis>=2.2:databases/rubygem-redis
-
-.include <bsd.port.pre.mk>
-
-.if ${ARCH} == i386 && ! ${CFLAGS:M-march=*}
-# Needed for __atomic_fetch_add_8
-USE_GCC=	yes
-CFLAGS+=	-march=i586
-.endif
-
-.if defined(_ADDFLAGS)
-CFLAGS=		-fPIC
-LDFLAGS=	-Wl,-E
-.endif
-
-LDFLAGS+=	-lpthread -lm -lexecinfo
-
-CONFLICTS?=	redis5-5.* redis-6.* redis-devel-6.*
-
-USE_RC_SUBR=	redis sentinel
-BIN_FILES=	redis-benchmark redis-check-aof redis-check-rdb \
-		redis-cli redis-sentinel redis-server
-
-USERS=	redis
-GROUPS=	redis
-
-REDIS_DBDIR?=	/var/db/redis
-REDIS_RUNDIR?=	/var/run/redis
-REDIS_LOGDIR?=	/var/log/redis
-
-SUB_FILES=	pkg-message
-SUB_LIST+=	PORTNAME=${PORTNAME} \
-	REDIS_USER=${USERS} \
-	REDIS_DBDIR=${REDIS_DBDIR} \
-	REDIS_LOGDIR=${REDIS_LOGDIR} \
-	REDIS_RUNDIR=${REDIS_RUNDIR}
-
-PLIST_SUB+=	REDIS_USER=${USERS} \
-	REDIS_GROUP=${GROUPS} \
-	REDIS_LOGDIR=${REDIS_LOGDIR} \
-	REDIS_DBDIR=${REDIS_DBDIR} \
-	REDIS_RUNDIR=${REDIS_RUNDIR}
-
-post-patch-JEMALLOC-on:
-	@${REINPLACE_CMD} '35s!Linux!FreeBSD!g' ${WRKSRC}/src/Makefile
-
-post-patch-LUA-on:
-	@cd ${WRKSRC}/deps/lua/src && ${CP} fpconv.* lua_* strbuf.* ${WRKSRC}/src/
-post-patch-LUAJIT-on:	post-patch-LUA-on
-post-patch-LUAJITOR-on:	post-patch-LUA-on
-
-post-build:
-	${SED} ${SUB_LIST:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
-		${WRKSRC}/redis.conf > ${WRKDIR}/redis.conf
-
-do-install:
-	${INSTALL_PROGRAM} ${BIN_FILES:C!^!${WRKSRC}/src/!} ${STAGEDIR}${PREFIX}/bin/
-	${INSTALL_DATA} ${WRKDIR}/redis.conf ${STAGEDIR}${PREFIX}/etc/redis.conf.sample
-	${INSTALL_DATA} ${WRKSRC}/sentinel.conf ${STAGEDIR}${PREFIX}/etc/sentinel.conf.sample
-	${MKDIR} ${STAGEDIR}${REDIS_LOGDIR} \
-		${STAGEDIR}${REDIS_DBDIR} \
-		${STAGEDIR}${REDIS_RUNDIR}
-
-do-install-TRIB-on:
-	${INSTALL_SCRIPT} ${WRKSRC}/src/redis-trib.rb ${STAGEDIR}${PREFIX}/bin/
-
-do-test:
-	@cd ${WRKSRC} && ${TCLSH} tests/test_helper.tcl
-
-.include <bsd.port.post.mk>
diff --git a/databases/redis6/distinfo b/databases/redis6/distinfo
deleted file mode 100644
index d8a3994a10b7..000000000000
--- a/databases/redis6/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1626937566
-SHA256 (redis-6.0.15.tar.gz) = 4bc295264a95bc94423c162a9eee66135a24a51eefe5f53f18fc9bde5c3a9f74
-SIZE (redis-6.0.15.tar.gz) = 2282471
diff --git a/databases/redis6/files/extra-patch-deps_lua_src_lua__cjson.c b/databases/redis6/files/extra-patch-deps_lua_src_lua__cjson.c
deleted file mode 100644
index 847b70d25dea..000000000000
--- a/databases/redis6/files/extra-patch-deps_lua_src_lua__cjson.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- deps/lua/src/lua_cjson.c.orig	2019-12-08 07:56:31.419672000 -0500
-+++ deps/lua/src/lua_cjson.c	2019-12-08 07:56:52.389362000 -0500
-@@ -1299,7 +1299,7 @@
-  *
-  * luaL_setfuncs() is used to create a module table where the functions have
-  * json_config_t as their first upvalue. Code borrowed from Lua 5.2 source. */
--static void luaL_setfuncs (lua_State *l, const luaL_Reg *reg, int nup)
-+void luaL_setfuncs (lua_State *l, const luaL_Reg *reg, int nup)
- {
-     int i;
- 
diff --git a/databases/redis6/files/extra-patch-src-Makefile.lua b/databases/redis6/files/extra-patch-src-Makefile.lua
deleted file mode 100644
index bbcae4d3acc1..000000000000
--- a/databases/redis6/files/extra-patch-src-Makefile.lua
+++ /dev/null
@@ -1,58 +0,0 @@
---- src/Makefile.orig	2020-05-15 16:29:52.000000000 -0400
-+++ src/Makefile	2020-05-16 12:20:46.728148000 -0400
-@@ -16,7 +16,7 @@
- uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not')
- uname_M := $(shell sh -c 'uname -m 2>/dev/null || echo not')
- OPTIMIZATION?=-O2
--DEPENDENCY_TARGETS=hiredis linenoise lua
-+DEPENDENCY_TARGETS=hiredis linenoise
- NODEPS:=clean distclean
- 
- # Default settings
-@@ -73,8 +73,8 @@
- # Override default settings if possible
- -include .make-settings
- 
--FINAL_CFLAGS=$(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) $(REDIS_CFLAGS)
--FINAL_LDFLAGS=$(LDFLAGS) $(REDIS_LDFLAGS) $(DEBUG)
-+FINAL_CFLAGS=$(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS)
-+FINAL_LDFLAGS=$(LDFLAGS) $(DEBUG)
- FINAL_LIBS=-lm
- DEBUG=-g -ggdb
- 
-@@ -149,7 +149,7 @@
- endif
- endif
- # Include paths to dependencies
--FINAL_CFLAGS+= -I../deps/hiredis -I../deps/linenoise -I../deps/lua/src
-+FINAL_CFLAGS+= -I../deps/hiredis -I../deps/linenoise
- 
- # Determine systemd support and/or build preference (defaulting to auto-detection)
- BUILD_WITH_SYSTEMD=no
-@@ -197,6 +197,9 @@
-     FINAL_LIBS += ../deps/hiredis/libhiredis_ssl.a -lssl -lcrypto
- endif
- 
-+FINAL_CFLAGS+=-I${PREFIX}/include/lua51
-+FINAL_LIBS+= -L${PREFIX}/lib -llua-5.1
-+
- REDIS_CC=$(QUIET_CC)$(CC) $(FINAL_CFLAGS)
- REDIS_LD=$(QUIET_LINK)$(CC) $(FINAL_LDFLAGS)
- REDIS_INSTALL=$(QUIET_INSTALL)$(INSTALL)
-@@ -217,6 +220,7 @@
- REDIS_SERVER_NAME=redis-server$(PROG_SUFFIX)
- REDIS_SENTINEL_NAME=redis-sentinel$(PROG_SUFFIX)
- REDIS_SERVER_OBJ=adlist.o quicklist.o ae.o anet.o dict.o server.o sds.o zmalloc.o lzf_c.o lzf_d.o pqsort.o zipmap.o sha1.o ziplist.o release.o networking.o util.o object.o db.o replication.o rdb.o t_string.o t_list.o t_set.o t_zset.o t_hash.o config.o aof.o pubsub.o multi.o debug.o sort.o intset.o syncio.o cluster.o crc16.o endianconv.o slowlog.o scripting.o bio.o rio.o rand.o memtest.o crcspeed.o crc64.o bitops.o sentinel.o notify.o setproctitle.o blocked.o hyperloglog.o latency.o sparkline.o redis-check-rdb.o redis-check-aof.o geo.o lazyfree.o module.o evict.o expire.o geohash.o geohash_helper.o childinfo.o defrag.o siphash.o rax.o t_stream.o listpack.o localtime.o lolwut.o lolwut5.o lolwut6.o acl.o gopher.o tracking.o connection.o tls.o sha256.o timeout.o setcpuaffinity.o mt19937-64.o
-+REDIS_SERVER_OBJ+=fpconv.o lua_bit.o lua_cjson.o lua_cmsgpack.o lua_struct.o strbuf.o
- REDIS_CLI_NAME=redis-cli$(PROG_SUFFIX)
- REDIS_CLI_OBJ=anet.o adlist.o dict.o redis-cli.o zmalloc.o release.o ae.o crcspeed.o crc64.o siphash.o crc16.o mt19937-64.o
- REDIS_BENCHMARK_NAME=redis-benchmark$(PROG_SUFFIX)
-@@ -268,7 +272,7 @@
- 
- # redis-server
- $(REDIS_SERVER_NAME): $(REDIS_SERVER_OBJ)
--	$(REDIS_LD) -o $@ $^ ../deps/hiredis/libhiredis.a ../deps/lua/src/liblua.a $(FINAL_LIBS)
-+	$(REDIS_LD) -o $@ $^ ../deps/hiredis/libhiredis.a $(FINAL_LIBS)
- 
- # redis-sentinel
- $(REDIS_SENTINEL_NAME): $(REDIS_SERVER_NAME)
diff --git a/databases/redis6/files/extra-patch-src-Makefile.luajit b/databases/redis6/files/extra-patch-src-Makefile.luajit
deleted file mode 100644
index f81f2ac24c80..000000000000
--- a/databases/redis6/files/extra-patch-src-Makefile.luajit
+++ /dev/null
@@ -1,58 +0,0 @@
---- src/Makefile.orig	2020-05-15 16:29:52.000000000 -0400
-+++ src/Makefile	2020-05-16 12:25:33.461058000 -0400
-@@ -16,7 +16,7 @@
- uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not')
- uname_M := $(shell sh -c 'uname -m 2>/dev/null || echo not')
- OPTIMIZATION?=-O2
--DEPENDENCY_TARGETS=hiredis linenoise lua
-+DEPENDENCY_TARGETS=hiredis linenoise
- NODEPS:=clean distclean
- 
- # Default settings
-@@ -73,8 +73,8 @@
- # Override default settings if possible
- -include .make-settings
- 
--FINAL_CFLAGS=$(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) $(REDIS_CFLAGS)
--FINAL_LDFLAGS=$(LDFLAGS) $(REDIS_LDFLAGS) $(DEBUG)
-+FINAL_CFLAGS=$(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS)
-+FINAL_LDFLAGS=$(LDFLAGS) $(DEBUG)
- FINAL_LIBS=-lm
- DEBUG=-g -ggdb
- 
-@@ -149,7 +149,7 @@
- endif
- endif
- # Include paths to dependencies
--FINAL_CFLAGS+= -I../deps/hiredis -I../deps/linenoise -I../deps/lua/src
-+FINAL_CFLAGS+= -I../deps/hiredis -I../deps/linenoise
- 
- # Determine systemd support and/or build preference (defaulting to auto-detection)
- BUILD_WITH_SYSTEMD=no
-@@ -197,6 +197,9 @@
-     FINAL_LIBS += ../deps/hiredis/libhiredis_ssl.a -lssl -lcrypto
- endif
- 
-+FINAL_CFLAGS+=-I${PREFIX}/include/luajit-2.0
-+FINAL_LIBS+= -L${PREFIX}/lib -lluajit-5.1
-+
- REDIS_CC=$(QUIET_CC)$(CC) $(FINAL_CFLAGS)
- REDIS_LD=$(QUIET_LINK)$(CC) $(FINAL_LDFLAGS)
- REDIS_INSTALL=$(QUIET_INSTALL)$(INSTALL)
-@@ -217,6 +220,7 @@
- REDIS_SERVER_NAME=redis-server$(PROG_SUFFIX)
- REDIS_SENTINEL_NAME=redis-sentinel$(PROG_SUFFIX)
- REDIS_SERVER_OBJ=adlist.o quicklist.o ae.o anet.o dict.o server.o sds.o zmalloc.o lzf_c.o lzf_d.o pqsort.o zipmap.o sha1.o ziplist.o release.o networking.o util.o object.o db.o replication.o rdb.o t_string.o t_list.o t_set.o t_zset.o t_hash.o config.o aof.o pubsub.o multi.o debug.o sort.o intset.o syncio.o cluster.o crc16.o endianconv.o slowlog.o scripting.o bio.o rio.o rand.o memtest.o crcspeed.o crc64.o bitops.o sentinel.o notify.o setproctitle.o blocked.o hyperloglog.o latency.o sparkline.o redis-check-rdb.o redis-check-aof.o geo.o lazyfree.o module.o evict.o expire.o geohash.o geohash_helper.o childinfo.o defrag.o siphash.o rax.o t_stream.o listpack.o localtime.o lolwut.o lolwut5.o lolwut6.o acl.o gopher.o tracking.o connection.o tls.o sha256.o timeout.o setcpuaffinity.o mt19937-64.o
-+REDIS_SERVER_OBJ+=fpconv.o lua_bit.o lua_cjson.o lua_cmsgpack.o lua_struct.o strbuf.o
- REDIS_CLI_NAME=redis-cli$(PROG_SUFFIX)
- REDIS_CLI_OBJ=anet.o adlist.o dict.o redis-cli.o zmalloc.o release.o ae.o crcspeed.o crc64.o siphash.o crc16.o mt19937-64.o
- REDIS_BENCHMARK_NAME=redis-benchmark$(PROG_SUFFIX)
-@@ -268,7 +272,7 @@
- 
- # redis-server
- $(REDIS_SERVER_NAME): $(REDIS_SERVER_OBJ)
--	$(REDIS_LD) -o $@ $^ ../deps/hiredis/libhiredis.a ../deps/lua/src/liblua.a $(FINAL_LIBS)
-+	$(REDIS_LD) -o $@ $^ ../deps/hiredis/libhiredis.a $(FINAL_LIBS)
- 
- # redis-sentinel
- $(REDIS_SENTINEL_NAME): $(REDIS_SERVER_NAME)
diff --git a/databases/redis6/files/extra-patch-src-Makefile.luajit-or b/databases/redis6/files/extra-patch-src-Makefile.luajit-or
deleted file mode 100644
index 916971af2a7e..000000000000
--- a/databases/redis6/files/extra-patch-src-Makefile.luajit-or
+++ /dev/null
@@ -1,58 +0,0 @@
---- src/Makefile.orig	2020-05-15 16:29:52.000000000 -0400
-+++ src/Makefile	2020-05-16 12:22:56.630826000 -0400
-@@ -16,7 +16,7 @@
- uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not')
- uname_M := $(shell sh -c 'uname -m 2>/dev/null || echo not')
- OPTIMIZATION?=-O2
--DEPENDENCY_TARGETS=hiredis linenoise lua
-+DEPENDENCY_TARGETS=hiredis linenoise
- NODEPS:=clean distclean
- 
- # Default settings
-@@ -73,8 +73,8 @@
- # Override default settings if possible
- -include .make-settings
- 
--FINAL_CFLAGS=$(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) $(REDIS_CFLAGS)
--FINAL_LDFLAGS=$(LDFLAGS) $(REDIS_LDFLAGS) $(DEBUG)
-+FINAL_CFLAGS=$(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS)
-+FINAL_LDFLAGS=$(LDFLAGS) $(DEBUG)
- FINAL_LIBS=-lm
- DEBUG=-g -ggdb
- 
-@@ -149,7 +149,7 @@
- endif
- endif
- # Include paths to dependencies
--FINAL_CFLAGS+= -I../deps/hiredis -I../deps/linenoise -I../deps/lua/src
-+FINAL_CFLAGS+= -I../deps/hiredis -I../deps/linenoise
- 
- # Determine systemd support and/or build preference (defaulting to auto-detection)
- BUILD_WITH_SYSTEMD=no
-@@ -197,6 +197,9 @@
-     FINAL_LIBS += ../deps/hiredis/libhiredis_ssl.a -lssl -lcrypto
- endif
- 
-+FINAL_CFLAGS+=-I${PREFIX}/include/luajit-2.1
-+FINAL_LIBS+= -L${PREFIX}/lib -lluajit-5.1
-+
- REDIS_CC=$(QUIET_CC)$(CC) $(FINAL_CFLAGS)
- REDIS_LD=$(QUIET_LINK)$(CC) $(FINAL_LDFLAGS)
- REDIS_INSTALL=$(QUIET_INSTALL)$(INSTALL)
-@@ -217,6 +220,7 @@
- REDIS_SERVER_NAME=redis-server$(PROG_SUFFIX)
- REDIS_SENTINEL_NAME=redis-sentinel$(PROG_SUFFIX)
- REDIS_SERVER_OBJ=adlist.o quicklist.o ae.o anet.o dict.o server.o sds.o zmalloc.o lzf_c.o lzf_d.o pqsort.o zipmap.o sha1.o ziplist.o release.o networking.o util.o object.o db.o replication.o rdb.o t_string.o t_list.o t_set.o t_zset.o t_hash.o config.o aof.o pubsub.o multi.o debug.o sort.o intset.o syncio.o cluster.o crc16.o endianconv.o slowlog.o scripting.o bio.o rio.o rand.o memtest.o crcspeed.o crc64.o bitops.o sentinel.o notify.o setproctitle.o blocked.o hyperloglog.o latency.o sparkline.o redis-check-rdb.o redis-check-aof.o geo.o lazyfree.o module.o evict.o expire.o geohash.o geohash_helper.o childinfo.o defrag.o siphash.o rax.o t_stream.o listpack.o localtime.o lolwut.o lolwut5.o lolwut6.o acl.o gopher.o tracking.o connection.o tls.o sha256.o timeout.o setcpuaffinity.o mt19937-64.o
-+REDIS_SERVER_OBJ+=fpconv.o lua_bit.o lua_cjson.o lua_cmsgpack.o lua_struct.o strbuf.o
- REDIS_CLI_NAME=redis-cli$(PROG_SUFFIX)
- REDIS_CLI_OBJ=anet.o adlist.o dict.o redis-cli.o zmalloc.o release.o ae.o crcspeed.o crc64.o siphash.o crc16.o mt19937-64.o
- REDIS_BENCHMARK_NAME=redis-benchmark$(PROG_SUFFIX)
-@@ -268,7 +272,7 @@
- 
- # redis-server
- $(REDIS_SERVER_NAME): $(REDIS_SERVER_OBJ)
--	$(REDIS_LD) -o $@ $^ ../deps/hiredis/libhiredis.a ../deps/lua/src/liblua.a $(FINAL_LIBS)
-+	$(REDIS_LD) -o $@ $^ ../deps/hiredis/libhiredis.a $(FINAL_LIBS)
- 
- # redis-sentinel
- $(REDIS_SENTINEL_NAME): $(REDIS_SERVER_NAME)
diff --git a/databases/redis6/files/patch-deps-Makefile b/databases/redis6/files/patch-deps-Makefile
deleted file mode 100644
index 385f0a116c6d..000000000000
--- a/databases/redis6/files/patch-deps-Makefile
+++ /dev/null
@@ -1,20 +0,0 @@
---- deps/Makefile.orig	2019-09-25 10:40:18 UTC
-+++ deps/Makefile
-@@ -58,7 +58,7 @@ ifeq ($(uname_S),SunOS)
- 	LUA_CFLAGS= -D__C99FEATURES__=1
- endif
- 
--LUA_CFLAGS+= -O2 -Wall -DLUA_ANSI -DENABLE_CJSON_GLOBAL -DREDIS_STATIC='' $(CFLAGS)
-+LUA_CFLAGS+= -Wall -DLUA_ANSI -DENABLE_CJSON_GLOBAL -DREDIS_STATIC='' $(CFLAGS)
- LUA_LDFLAGS+= $(LDFLAGS)
- # lua's Makefile defines AR="ar rcu", which is unusual, and makes it more
- # challenging to cross-compile lua (and redis).  These defines make it easier
-@@ -68,7 +68,7 @@ ARFLAGS=rcu
- 
- lua: .make-prerequisites
- 	@printf '%b %b\n' $(MAKECOLOR)MAKE$(ENDCOLOR) $(BINCOLOR)$@$(ENDCOLOR)
--	cd lua/src && $(MAKE) all CFLAGS="$(LUA_CFLAGS)" MYLDFLAGS="$(LUA_LDFLAGS)" AR="$(AR) $(ARFLAGS)"
-+	cd lua/src && $(MAKE) all CC="$(CC)" CFLAGS="$(LUA_CFLAGS)" MYLDFLAGS="$(LUA_LDFLAGS)" AR="$(AR) $(ARFLAGS)"
- 
- .PHONY: lua
- 
diff --git a/databases/redis6/files/patch-deps-hiredis-Makefile b/databases/redis6/files/patch-deps-hiredis-Makefile
deleted file mode 100644
index 1b08c4514d3d..000000000000
--- a/databases/redis6/files/patch-deps-hiredis-Makefile
+++ /dev/null
@@ -1,40 +0,0 @@
---- deps/hiredis/Makefile.orig	2019-11-29 16:35:59 UTC
-+++ deps/hiredis/Makefile
-@@ -21,7 +21,7 @@ HIREDIS_PATCH=$(shell grep HIREDIS_PATCH hiredis.h | a
- HIREDIS_SONAME=$(shell grep HIREDIS_SONAME hiredis.h | awk '{print $$3}')
- 
- # Installation related variables and target
--PREFIX?=/usr/local
-+PREFIX?=${PREFIX}
- INCLUDE_PATH?=include/hiredis
- LIBRARY_PATH?=lib
- PKGCONF_PATH?=pkgconfig
-@@ -44,10 +44,8 @@ export REDIS_TEST_CONFIG
- # Fallback to gcc when $CC is not in $PATH.
- CC:=$(shell sh -c 'type $${CC%% *} >/dev/null 2>/dev/null && echo $(CC) || echo gcc')
- CXX:=$(shell sh -c 'type $${CXX%% *} >/dev/null 2>/dev/null && echo $(CXX) || echo g++')
--OPTIMIZATION?=-O3
- WARNINGS=-Wall -W -Wstrict-prototypes -Wwrite-strings -Wno-missing-field-initializers
--DEBUG_FLAGS?= -g -ggdb
--REAL_CFLAGS=$(OPTIMIZATION) -fPIC $(CPPFLAGS) $(CFLAGS) $(WARNINGS) $(DEBUG_FLAGS)
-+REAL_CFLAGS=$(OPTIMIZATION) -fPIC $(CFLAGS) $(WARNINGS) $(DEBUG_FLAGS)
- REAL_LDFLAGS=$(LDFLAGS)
- 
- DYLIBSUFFIX=so
-@@ -82,6 +80,16 @@ endif
- ifeq ($(uname_S),SunOS)
-   REAL_LDFLAGS+= -ldl -lnsl -lsocket
-   DYLIB_MAKE_CMD=$(CC) -G -o $(DYLIBNAME) -h $(DYLIB_MINOR_NAME) $(LDFLAGS)
-+endif
-+ifeq ($(uname_S),FreeBSD)
-+  CFLAGS?=$(CFLAGS)
-+  CCLINK?=pthread
-+  LDFLAGS?=-L. -Wl,-rpath,.
-+  DYLIBNAME?=libhiredis.so
-+  DYLIB_MAKE_CMD?=$(CC) -o ${DYLIBNAME} ${OBJ}
-+  STLIBNAME?=libhiredis.a
-+  STLIB_MAKE_CMD?=ar rcs ${STLIBNAME} ${OBJ}
-+  SSL_LDFLAGS+=	${OPENSSL_LDFLAGS}
- endif
- ifeq ($(uname_S),Darwin)
-   DYLIBSUFFIX=dylib
diff --git a/databases/redis6/files/patch-deps-hiredis-net.c b/databases/redis6/files/patch-deps-hiredis-net.c
deleted file mode 100644
index 3fd2b5996f97..000000000000
--- a/databases/redis6/files/patch-deps-hiredis-net.c
+++ /dev/null
@@ -1,39 +0,0 @@
---- deps/hiredis/net.c.orig	2019-11-28 14:32:05.942453000 -0500
-+++ deps/hiredis/net.c	2019-11-28 14:39:08.326408000 -0500
-@@ -178,14 +178,34 @@
-         __redisSetError(c,REDIS_ERR_OTHER,strerror(errno));
-         return REDIS_ERR;
-     }
--#else
--#if defined(__GLIBC__) && !defined(__FreeBSD_kernel__)
-+#elif defined(__GLIBC__)
-     if (setsockopt(fd, IPPROTO_TCP, TCP_KEEPIDLE, &val, sizeof(val)) < 0) {
-         __redisSetError(c,REDIS_ERR_OTHER,strerror(errno));
-         return REDIS_ERR;
-     }
- 
-     val = interval/3;
-+    if (val == 0) val = 1;
-+    if (setsockopt(fd, IPPROTO_TCP, TCP_KEEPINTVL, &val, sizeof(val)) < 0) {
-+        __redisSetError(c,REDIS_ERR_OTHER,strerror(errno));
-+        return REDIS_ERR;
-+    }
-+
-+    val = 3;
-+    if (setsockopt(fd, IPPROTO_TCP, TCP_KEEPCNT, &val, sizeof(val)) < 0) {
-+        __redisSetError(c,REDIS_ERR_OTHER,strerror(errno));
-+        return REDIS_ERR;
-+    }
-+#else
-+#if !defined(__sun) && defined(TCP_KEEPIDLE) && defined(TCP_KEEPINTL) && \
-+    defined(TCP_KEEPCNT)
-+    val = interval;
-+    if (setsockopt(fd, IPPROTO_TCP, TCP_KEEPIDLE, &val, sizeof(val)) < 0) {
-+        __redisSetError(c,REDIS_ERR_OTHER,strerror(errno));
-+        return REDIS_ERR;
-+    }
-+
-+    val = internal/3;
-     if (val == 0) val = 1;
-     if (setsockopt(fd, IPPROTO_TCP, TCP_KEEPINTVL, &val, sizeof(val)) < 0) {
-         __redisSetError(c,REDIS_ERR_OTHER,strerror(errno));
diff --git a/databases/redis6/files/patch-deps_Makefile b/databases/redis6/files/patch-deps_Makefile
deleted file mode 100644
index ab5b282c67f5..000000000000
--- a/databases/redis6/files/patch-deps_Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
---- deps/Makefile.orig	2019-11-29 16:35:59 UTC
-+++ deps/Makefile
-@@ -76,12 +76,12 @@ lua: .make-prerequisites
- 
- .PHONY: lua
- 
--JEMALLOC_CFLAGS= -std=gnu99 -Wall -pipe -g3 -O3 -funroll-loops $(CFLAGS)
-+JEMALLOC_CFLAGS= -std=gnu99 -Wall -pipe -funroll-loops $(CFLAGS)
- JEMALLOC_LDFLAGS= $(LDFLAGS)
- 
- jemalloc: .make-prerequisites
- 	@printf '%b %b\n' $(MAKECOLOR)MAKE$(ENDCOLOR) $(BINCOLOR)$@$(ENDCOLOR)
--	cd jemalloc && ./configure --with-version=5.1.0-0-g0 --with-lg-quantum=3 --with-jemalloc-prefix=je_ --enable-cc-silence CFLAGS="$(JEMALLOC_CFLAGS)" LDFLAGS="$(JEMALLOC_LDFLAGS)"
--	cd jemalloc && $(MAKE) CFLAGS="$(JEMALLOC_CFLAGS)" LDFLAGS="$(JEMALLOC_LDFLAGS)" lib/libjemalloc.a
-+	cd jemalloc && ./configure --with-version=5.1.0-0-g0 --with-lg-quantum=3 --with-jemalloc-prefix=je_ --enable-cc-silence CFLAGS="$(JEMALLOC_CFLAGS)" CXXFLAGS="$(JEMALLOC_CFLAGS)" LDFLAGS="$(JEMALLOC_LDFLAGS)"
-+	cd jemalloc && $(MAKE) CFLAGS="$(JEMALLOC_CFLAGS)" CXXFLAGS="$(JEMALLOC_CFLAGS)" LDFLAGS="$(JEMALLOC_LDFLAGS)" lib/libjemalloc.a
- 
- .PHONY: jemalloc
diff --git a/databases/redis6/files/patch-redis.conf b/databases/redis6/files/patch-redis.conf
deleted file mode 100644
index e70b7e609ca1..000000000000
--- a/databases/redis6/files/patch-redis.conf
+++ /dev/null
@@ -1,38 +0,0 @@
---- redis.conf.orig	2019-11-22 16:54:22 UTC
-+++ redis.conf
-@@ -203,7 +203,7 @@ tcp-keepalive 300
- 
- # By default Redis does not run as a daemon. Use 'yes' if you need it.
- # Note that Redis will write a pid file in /var/run/redis.pid when daemonized.
--daemonize no
-+daemonize yes
- 
- # If you run Redis from upstart or systemd, Redis can interact with your
- # supervision tree. Options:
-@@ -225,7 +225,7 @@ supervised no
- #
- # Creating a pid file is best effort: if Redis is not able to create it
- # nothing bad happens, the server will start and run normally.
--pidfile /var/run/redis_6379.pid
-+pidfile %%REDIS_RUNDIR%%/redis.pid
- 
- # Specify the server verbosity level.
- # This can be one of:
-@@ -238,7 +238,7 @@ loglevel notice
- # Specify the log file name. Also the empty string can be used to force
- # Redis to log on the standard output. Note that if you use standard
- # output for logging but daemonize, logs will be sent to /dev/null
--logfile ""
-+logfile %%REDIS_LOGDIR%%/redis.log
- 
- # To enable logging to the system logger, just set 'syslog-enabled' to yes,
- # and optionally update the other syslog parameters to suit your needs.
-@@ -330,7 +330,7 @@ dbfilename dump.rdb
- # The Append Only File will also be created inside this directory.
- #
- # Note that you must specify a directory here, not a file name.
--dir ./
-+dir %%REDIS_DBDIR%%/
- 
- ################################# REPLICATION #################################
- 
diff --git a/databases/redis6/pkg-descr b/databases/redis6/pkg-descr
deleted file mode 100644
index 15beb1c8d992..000000000000
--- a/databases/redis6/pkg-descr
+++ /dev/null
@@ -1,19 +0,0 @@
-Redis is an open source, advanced key-value store.  It is often referred
-to as a data structure server since keys can contain strings, hashes,
-lists, sets and sorted sets.
-
-You can run atomic operations on these types, like appending to a string;
-incrementing the value in a hash; pushing to a list; computing set
-intersection, union and difference; or getting the member with highest
-ranking in a sorted set.
-
-In order to achieve its outstanding performance, Redis works with an
-in-memory dataset.  Depending on your use case, you can persist it either
-by dumping the dataset to disk every once in a while, or by appending each
-command to a log.
-
-Redis also supports trivial-to-setup master-slave replication, with very
-fast non-blocking first synchronization, auto-reconnection on net split
-and so forth.
-
-WWW: https://redis.io/
diff --git a/databases/redis6/pkg-plist b/databases/redis6/pkg-plist
deleted file mode 100644
index 7bc055909fdd..000000000000
--- a/databases/redis6/pkg-plist
+++ /dev/null
@@ -1,12 +0,0 @@
-bin/redis-benchmark
-bin/redis-check-aof
-bin/redis-check-rdb
-bin/redis-cli
-bin/redis-sentinel
-bin/redis-server
-%%TRIB%%bin/redis-trib.rb
-@sample etc/redis.conf.sample
-@sample(%%REDIS_USER%%,%%REDIS_GROUP%%,) etc/sentinel.conf.sample
-@dir(%%REDIS_USER%%,%%REDIS_GROUP%%,) %%REDIS_DBDIR%%
-@dir(%%REDIS_USER%%,%%REDIS_GROUP%%,) %%REDIS_LOGDIR%%
-@dir(%%REDIS_USER%%,%%REDIS_GROUP%%,) %%REDIS_RUNDIR%%
diff --git a/databases/redis62/Makefile b/databases/redis62/Makefile
new file mode 100644
index 000000000000..cb25c52f4506
--- /dev/null
+++ b/databases/redis62/Makefile
@@ -0,0 +1,80 @@
+PORTNAME=	redis
+DISTVERSION=	6.2.14
+PORTREVISION=	1
+CATEGORIES=	databases
+MASTER_SITES=	https://download.redis.io/releases/
+PKGNAMESUFFIX=	62
+
+MAINTAINER=	yasu@FreeBSD.org
+COMMENT=	Persistent key-value database with built-in net interface
+WWW=		https://redis.io/
+
+LICENSE=	BSD3CLAUSE
+LICENSE_FILE=	${WRKSRC}/COPYING
+
+USES+=		compiler:c11 cpe gmake tcl:test
+CPE_VENDOR=	redislabs
+CPE_PRODUCT=	redis
+USE_RC_SUBR=	redis sentinel
+
+MAKE_ENV=	OPTIMIZATION= \
+		V=yo
+
+LDFLAGS+=	-lpthread -lm -lexecinfo
+
+CONFLICTS_INSTALL=	redis redis-devel redis6 redis70 # etc/rc.d/redis
+
+PORTSCOUT=	limit:^6\.2
+SUB_FILES=	pkg-message
+SUB_LIST+=	PORTNAME=${PORTNAME} \
+		REDIS_DBDIR=${REDIS_DBDIR} \
+		REDIS_LOGDIR=${REDIS_LOGDIR} \
+		REDIS_RUNDIR=${REDIS_RUNDIR} \
+		REDIS_USER=${USERS}
+
+USERS=		redis
+GROUPS=		redis
+
+PLIST_SUB+=	REDIS_DBDIR=${REDIS_DBDIR} \
+		REDIS_GROUP=${GROUPS} \
+		REDIS_LOGDIR=${REDIS_LOGDIR} \
+		REDIS_RUNDIR=${REDIS_RUNDIR} \
+		REDIS_USER=${USERS}
+
+OPTIONS_DEFINE=		JEMALLOC TLS
+OPTIONS_DEFAULT=	TLS
+OPTIONS_SUB=		yes
+
+JEMALLOC_DESC=	Use jemalloc
+TLS_DESC=	Use TLS (openssl req.)
+
+JEMALLOC_MAKE_ENV=	USE_JEMALLOC=yes
+TLS_USES=		ssl
+TLS_MAKE_ENV=		BUILD_TLS=yes
+
+BIN_FILES=	redis-benchmark redis-check-aof redis-check-rdb redis-cli \
+		redis-sentinel redis-server
+
+REDIS_DBDIR?=	/var/db/redis
+REDIS_RUNDIR?=	/var/run/redis
+REDIS_LOGDIR?=	/var/log/redis
+
+post-patch-JEMALLOC-on:
+	@${REINPLACE_CMD} '58s!Linux!FreeBSD!g' ${WRKSRC}/src/Makefile
+
+post-build:
+	${SED} ${SUB_LIST:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
+		${WRKSRC}/redis.conf > ${WRKDIR}/redis.conf
+
+do-install:
+	${INSTALL_PROGRAM} ${BIN_FILES:C!^!${WRKSRC}/src/!} ${STAGEDIR}${PREFIX}/bin/
+	${INSTALL_DATA} ${WRKDIR}/redis.conf ${STAGEDIR}${PREFIX}/etc/redis.conf.sample
+	${INSTALL_DATA} ${WRKSRC}/sentinel.conf ${STAGEDIR}${PREFIX}/etc/sentinel.conf.sample
+	${MKDIR} ${STAGEDIR}${REDIS_LOGDIR} \
+		${STAGEDIR}${REDIS_DBDIR} \
+		${STAGEDIR}${REDIS_RUNDIR}
+
+do-test:
+	@cd ${WRKSRC} && ${TCLSH} tests/test_helper.tcl
+
+.include <bsd.port.mk>
diff --git a/databases/redis62/distinfo b/databases/redis62/distinfo
new file mode 100644
index 000000000000..7f4fee223e0b
--- /dev/null
+++ b/databases/redis62/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1697636938
+SHA256 (redis-6.2.14.tar.gz) = 34e74856cbd66fdb3a684fb349d93961d8c7aa668b06f81fd93ff267d09bc277
+SIZE (redis-6.2.14.tar.gz) = 2496149
diff --git a/databases/redis62/files/patch-deps-Makefile b/databases/redis62/files/patch-deps-Makefile
new file mode 100644
index 000000000000..84a2f6dcbc60
--- /dev/null
+++ b/databases/redis62/files/patch-deps-Makefile
@@ -0,0 +1,20 @@
+--- deps/Makefile.orig	2021-01-12 14:21:03 UTC
++++ deps/Makefile
+@@ -69,7 +69,7 @@
+ 	LUA_CFLAGS= -D__C99FEATURES__=1
+ endif
+ 
+-LUA_CFLAGS+= -O2 -Wall -DLUA_ANSI -DENABLE_CJSON_GLOBAL -DREDIS_STATIC='' -DLUA_USE_MKSTEMP $(CFLAGS)
++LUA_CFLAGS+= -Wall -DLUA_ANSI -DENABLE_CJSON_GLOBAL -DREDIS_STATIC='' -DLUA_USE_MKSTEMP $(CFLAGS)
+ LUA_LDFLAGS+= $(LDFLAGS)
+ # lua's Makefile defines AR="ar rcu", which is unusual, and makes it more
+ # challenging to cross-compile lua (and redis).  These defines make it easier
+@@ -79,7 +79,7 @@
+ 
+ lua: .make-prerequisites
+ 	@printf '%b %b\n' $(MAKECOLOR)MAKE$(ENDCOLOR) $(BINCOLOR)$@$(ENDCOLOR)
+-	cd lua/src && $(MAKE) all CFLAGS="$(LUA_CFLAGS)" MYLDFLAGS="$(LUA_LDFLAGS)" AR="$(AR) $(ARFLAGS)"
++	cd lua/src && $(MAKE) all CC="$(CC)" CFLAGS="$(LUA_CFLAGS)" MYLDFLAGS="$(LUA_LDFLAGS)" AR="$(AR) $(ARFLAGS)"
+ 
+ .PHONY: lua
+ 
diff --git a/databases/redis62/files/patch-deps-hiredis-Makefile b/databases/redis62/files/patch-deps-hiredis-Makefile
new file mode 100644
index 000000000000..aec6b29a7b2e
--- /dev/null
+++ b/databases/redis62/files/patch-deps-hiredis-Makefile
@@ -0,0 +1,41 @@
+--- deps/hiredis/Makefile.orig	2021-01-12 14:21:03 UTC
++++ deps/hiredis/Makefile
+@@ -21,7 +21,7 @@
+ HIREDIS_SONAME=$(shell grep HIREDIS_SONAME hiredis.h | awk '{print $$3}')
+ 
+ # Installation related variables and target
+-PREFIX?=/usr/local
++PREFIX?=${PREFIX}
+ INCLUDE_PATH?=include/hiredis
+ LIBRARY_PATH?=lib
+ PKGCONF_PATH?=pkgconfig
+@@ -44,10 +44,8 @@
+ # Fallback to gcc when $CC is not in $PATH.
+ CC:=$(shell sh -c 'type $${CC%% *} >/dev/null 2>/dev/null && echo $(CC) || echo gcc')
+ CXX:=$(shell sh -c 'type $${CXX%% *} >/dev/null 2>/dev/null && echo $(CXX) || echo g++')
+-OPTIMIZATION?=-O3
+ WARNINGS=-Wall -W -Wstrict-prototypes -Wwrite-strings -Wno-missing-field-initializers
+-DEBUG_FLAGS?= -g -ggdb
+-REAL_CFLAGS=$(OPTIMIZATION) -fPIC $(CPPFLAGS) $(CFLAGS) $(WARNINGS) $(DEBUG_FLAGS)
++REAL_CFLAGS=$(OPTIMIZATION) -fPIC $(CFLAGS) $(WARNINGS) $(DEBUG_FLAGS)
+ REAL_LDFLAGS=$(LDFLAGS)
+ 
+ DYLIBSUFFIX=so
+@@ -83,7 +81,16 @@
+   CFLAGS+=-I$(OPENSSL_PREFIX)/include
+   SSL_LDFLAGS+=-L$(OPENSSL_PREFIX)/lib -lssl -lcrypto
+ endif
+-
++ifeq ($(uname_S),FreeBSD)
++  CFLAGS?=$(CFLAGS)
++  CCLINK?=pthread
++  LDFLAGS?=-L. -Wl,-rpath,.
++  DYLIBNAME?=libhiredis.so
++  DYLIB_MAKE_CMD?=$(CC) -o ${DYLIBNAME} ${OBJ}
++  STLIBNAME?=libhiredis.a
++  STLIB_MAKE_CMD?=ar rcs ${STLIBNAME} ${OBJ}
++  SSL_LDFLAGS+=${OPENSSL_LDFLAGS}
++endif
+ ifeq ($(uname_S),SunOS)
+   IS_SUN_CC=$(shell sh -c '$(CC) -V 2>&1 |egrep -i -c "sun|studio"')
+   ifeq ($(IS_SUN_CC),1)
diff --git a/databases/redis62/files/patch-deps-hiredis-net.c b/databases/redis62/files/patch-deps-hiredis-net.c
new file mode 100644
index 000000000000..0dfde3135238
--- /dev/null
+++ b/databases/redis62/files/patch-deps-hiredis-net.c
@@ -0,0 +1,39 @@
+--- deps/hiredis/net.c.orig	2019-11-28 19:32:05 UTC
++++ deps/hiredis/net.c
+@@ -178,14 +178,34 @@
+         __redisSetError(c,REDIS_ERR_OTHER,strerror(errno));
+         return REDIS_ERR;
+     }
+-#else
+-#if defined(__GLIBC__) && !defined(__FreeBSD_kernel__)
++#elif defined(__GLIBC__)
+     if (setsockopt(fd, IPPROTO_TCP, TCP_KEEPIDLE, &val, sizeof(val)) < 0) {
+         __redisSetError(c,REDIS_ERR_OTHER,strerror(errno));
+         return REDIS_ERR;
+     }
+ 
+     val = interval/3;
++    if (val == 0) val = 1;
++    if (setsockopt(fd, IPPROTO_TCP, TCP_KEEPINTVL, &val, sizeof(val)) < 0) {
++        __redisSetError(c,REDIS_ERR_OTHER,strerror(errno));
++        return REDIS_ERR;
++    }
++
++    val = 3;
++    if (setsockopt(fd, IPPROTO_TCP, TCP_KEEPCNT, &val, sizeof(val)) < 0) {
++        __redisSetError(c,REDIS_ERR_OTHER,strerror(errno));
++        return REDIS_ERR;
++    }
++#else
++#if !defined(__sun) && defined(TCP_KEEPIDLE) && defined(TCP_KEEPINTL) && \
++    defined(TCP_KEEPCNT)
++    val = interval;
++    if (setsockopt(fd, IPPROTO_TCP, TCP_KEEPIDLE, &val, sizeof(val)) < 0) {
++        __redisSetError(c,REDIS_ERR_OTHER,strerror(errno));
++        return REDIS_ERR;
++    }
++
++    val = internal/3;
+     if (val == 0) val = 1;
+     if (setsockopt(fd, IPPROTO_TCP, TCP_KEEPINTVL, &val, sizeof(val)) < 0) {
+         __redisSetError(c,REDIS_ERR_OTHER,strerror(errno));
diff --git a/databases/redis6/files/patch-deps-linenoise-Makefile b/databases/redis62/files/patch-deps-linenoise-Makefile
index aef0f10966af..aef0f10966af 100644
--- a/databases/redis6/files/patch-deps-linenoise-Makefile
+++ b/databases/redis62/files/patch-deps-linenoise-Makefile
diff --git a/databases/redis62/files/patch-deps_Makefile b/databases/redis62/files/patch-deps_Makefile
new file mode 100644
index 000000000000..354558054689
--- /dev/null
+++ b/databases/redis62/files/patch-deps_Makefile
@@ -0,0 +1,18 @@
+--- deps/Makefile.orig	2021-01-13 16:43:05 UTC
++++ deps/Makefile
+@@ -83,12 +83,12 @@
+ 
+ .PHONY: lua
+ 
+-JEMALLOC_CFLAGS= -std=gnu99 -Wall -pipe -g3 -O3 -funroll-loops $(CFLAGS)
++JEMALLOC_CFLAGS= -std=gnu99 -Wall -pipe -funroll-loops $(CFLAGS)
+ JEMALLOC_LDFLAGS= $(LDFLAGS)
+ 
+ jemalloc: .make-prerequisites
+ 	@printf '%b %b\n' $(MAKECOLOR)MAKE$(ENDCOLOR) $(BINCOLOR)$@$(ENDCOLOR)
+-	cd jemalloc && ./configure --with-version=5.1.0-0-g0 --with-lg-quantum=3 --with-jemalloc-prefix=je_ CFLAGS="$(JEMALLOC_CFLAGS)" LDFLAGS="$(JEMALLOC_LDFLAGS)"
+-	cd jemalloc && $(MAKE) CFLAGS="$(JEMALLOC_CFLAGS)" LDFLAGS="$(JEMALLOC_LDFLAGS)" lib/libjemalloc.a
++	cd jemalloc && ./configure --with-version=5.1.0-0-g0 --with-lg-quantum=3 --with-jemalloc-prefix=je_ CFLAGS="$(JEMALLOC_CFLAGS)" CXXFLAGS="$(JEMALLOC_CFLAGS)" LDFLAGS="$(JEMALLOC_LDFLAGS)"
++	cd jemalloc && $(MAKE) CFLAGS="$(JEMALLOC_CFLAGS)" CXXFLAGS="$(JEMALLOC_CFLAGS)" LDFLAGS="$(JEMALLOC_LDFLAGS)" lib/libjemalloc.a
+ 
+ .PHONY: jemalloc
diff --git a/databases/redis6/files/patch-deps_lua_src_lua__cjson.c b/databases/redis62/files/patch-deps_lua_src_lua__cjson.c
index 0bb150504c67..0bb150504c67 100644
--- a/databases/redis6/files/patch-deps_lua_src_lua__cjson.c
+++ b/databases/redis62/files/patch-deps_lua_src_lua__cjson.c
diff --git a/databases/redis62/files/patch-redis.conf b/databases/redis62/files/patch-redis.conf
new file mode 100644
index 000000000000..b653f89a3211
--- /dev/null
+++ b/databases/redis62/files/patch-redis.conf
@@ -0,0 +1,38 @@
+--- redis.conf.orig	2021-01-12 14:21:03 UTC
++++ redis.conf
+@@ -244,7 +244,7 @@
+ # By default Redis does not run as a daemon. Use 'yes' if you need it.
+ # Note that Redis will write a pid file in /var/run/redis.pid when daemonized.
+ # When Redis is supervised by upstart or systemd, this parameter has no impact.
+-daemonize no
++daemonize yes
+ 
+ # If you run Redis from upstart or systemd, Redis can interact with your
+ # supervision tree. Options:
+@@ -276,7 +276,7 @@
+ #
+ # Note that on modern Linux systems "/run/redis.pid" is more conforming
+ # and should be used instead.
+-pidfile /var/run/redis_6379.pid
++pidfile %%REDIS_RUNDIR%%/redis.pid
+ 
+ # Specify the server verbosity level.
+ # This can be one of:
+@@ -289,7 +289,7 @@
+ # Specify the log file name. Also the empty string can be used to force
+ # Redis to log on the standard output. Note that if you use standard
+ # output for logging but daemonize, logs will be sent to /dev/null
+-logfile ""
++logfile %%REDIS_LOGDIR%%/redis.log
+ 
+ # To enable logging to the system logger, just set 'syslog-enabled' to yes,
+ # and optionally update the other syslog parameters to suit your needs.
+@@ -420,7 +420,7 @@
+ # The Append Only File will also be created inside this directory.
+ #
+ # Note that you must specify a directory here, not a file name.
+-dir ./
++dir %%REDIS_DBDIR%%/
+ 
+ ################################# REPLICATION #################################
+ 
diff --git a/databases/redis6/files/patch-src-Makefile b/databases/redis62/files/patch-src-Makefile
index 6b3ed47b68be..6b3ed47b68be 100644
--- a/databases/redis6/files/patch-src-Makefile
+++ b/databases/redis62/files/patch-src-Makefile
diff --git a/databases/redis62/files/patch-src-mkreleasehdr.sh b/databases/redis62/files/patch-src-mkreleasehdr.sh
new file mode 100644
index 000000000000..e48b3174d315
--- /dev/null
+++ b/databases/redis62/files/patch-src-mkreleasehdr.sh
@@ -0,0 +1,11 @@
+--- src/mkreleasehdr.sh.orig	2019-11-22 16:54:22 UTC
++++ src/mkreleasehdr.sh
+@@ -1,6 +1,6 @@
+ #!/bin/sh
+-GIT_SHA1=`(git show-ref --head --hash=8 2> /dev/null || echo 00000000) | head -n1`
+-GIT_DIRTY=`git diff --no-ext-diff 2> /dev/null | wc -l`
++GIT_SHA1="00000000"
++GIT_DIRTY="0"
+ BUILD_ID=`uname -n`"-"`date +%s`
+ if [ -n "$SOURCE_DATE_EPOCH" ]; then
+   BUILD_ID=$(date -u -d "@$SOURCE_DATE_EPOCH" +%s 2>/dev/null || date -u -r "$SOURCE_DATE_EPOCH" +%s 2>/dev/null || date -u +%s)
diff --git a/databases/redis5/files/pkg-message.in b/databases/redis62/files/pkg-message.in
index 85a89529262a..85a89529262a 100644
--- a/databases/redis5/files/pkg-message.in
+++ b/databases/redis62/files/pkg-message.in
diff --git a/databases/redis5/files/redis.in b/databases/redis62/files/redis.in
index d18063c3a504..d18063c3a504 100644
--- a/databases/redis5/files/redis.in
+++ b/databases/redis62/files/redis.in
diff --git a/databases/redis5/files/sentinel.in b/databases/redis62/files/sentinel.in
index 088f4382fc06..088f4382fc06 100644
--- a/databases/redis5/files/sentinel.in
+++ b/databases/redis62/files/sentinel.in
diff --git a/databases/redis62/pkg-descr b/databases/redis62/pkg-descr
new file mode 100644
index 000000000000..5500bd1afad4
--- /dev/null
+++ b/databases/redis62/pkg-descr
@@ -0,0 +1,17 @@
+Redis is an open source, advanced key-value store.  It is often referred
+to as a data structure server since keys can contain strings, hashes,
+lists, sets and sorted sets.
+
+You can run atomic operations on these types, like appending to a string;
+incrementing the value in a hash; pushing to a list; computing set
+intersection, union and difference; or getting the member with highest
+ranking in a sorted set.
+
+In order to achieve its outstanding performance, Redis works with an
+in-memory dataset.  Depending on your use case, you can persist it either
+by dumping the dataset to disk every once in a while, or by appending each
+command to a log.
+
+Redis also supports trivial-to-setup master-slave replication, with very
+fast non-blocking first synchronization, auto-reconnection on net split
+and so forth.
diff --git a/databases/redis62/pkg-plist b/databases/redis62/pkg-plist
new file mode 100644
index 000000000000..fafc472df89b
--- /dev/null
+++ b/databases/redis62/pkg-plist
@@ -0,0 +1,11 @@
+bin/redis-benchmark
+bin/redis-check-aof
+bin/redis-check-rdb
+bin/redis-cli
+bin/redis-sentinel
+bin/redis-server
+@sample etc/redis.conf.sample
+@sample(%%REDIS_USER%%,%%REDIS_GROUP%%,) etc/sentinel.conf.sample
+@dir(%%REDIS_USER%%,%%REDIS_GROUP%%,) %%REDIS_DBDIR%%
+@dir(%%REDIS_USER%%,%%REDIS_GROUP%%,) %%REDIS_LOGDIR%%
+@dir(%%REDIS_USER%%,%%REDIS_GROUP%%,) %%REDIS_RUNDIR%%
diff --git a/databases/redis70/Makefile b/databases/redis70/Makefile
new file mode 100644
index 000000000000..53806d0dd09f
--- /dev/null
+++ b/databases/redis70/Makefile
@@ -0,0 +1,80 @@
+PORTNAME=	redis
+DISTVERSION=	7.0.15
+PORTREVISION=	1
+CATEGORIES=	databases
+MASTER_SITES=	https://download.redis.io/releases/
+PKGNAMESUFFIX=	70
+
+MAINTAINER=	yasu@FreeBSD.org
+COMMENT=	Persistent key-value database with built-in net interface
+WWW=		https://redis.io/
+
+LICENSE=	BSD3CLAUSE
+LICENSE_FILE=	${WRKSRC}/COPYING
+
+USES+=		compiler:c11 cpe gmake tcl:test
+CPE_VENDOR=	redislabs
+
+MAKE_ENV=	OPTIMIZATION= \
+		V=yo
+
+CONFLICTS_INSTALL=	redis redis-devel redis6 redis62 # etc/rc.d/redis
+
+PORTSCOUT=	limit:^7\.0
+
+OPTIONS_DEFINE=		JEMALLOC TLS
+OPTIONS_DEFAULT=	TLS
+OPTIONS_SUB=		yes
+
+JEMALLOC_DESC=	Use jemalloc
+TLS_DESC=	Use TLS (openssl req.)
+
+JEMALLOC_MAKE_ENV=	USE_JEMALLOC=yes
+TLS_USES=		ssl
+TLS_MAKE_ENV=		BUILD_TLS=yes
+
+LDFLAGS+=	-lpthread -lm -lexecinfo
+
+USE_RC_SUBR=	redis sentinel
+BIN_FILES=	redis-benchmark redis-check-aof redis-check-rdb redis-cli \
+		redis-sentinel redis-server
+
+USERS=		redis
+GROUPS=		redis
+
+REDIS_DBDIR?=	/var/db/redis
+REDIS_RUNDIR?=	/var/run/redis
+REDIS_LOGDIR?=	/var/log/redis
+
+SUB_FILES=	pkg-message
+SUB_LIST+=	PORTNAME=${PORTNAME} \
+		REDIS_DBDIR=${REDIS_DBDIR} \
+		REDIS_LOGDIR=${REDIS_LOGDIR} \
+		REDIS_RUNDIR=${REDIS_RUNDIR} \
+		REDIS_USER=${USERS}
+
+PLIST_SUB+=	REDIS_DBDIR=${REDIS_DBDIR} \
+		REDIS_GROUP=${GROUPS} \
+		REDIS_LOGDIR=${REDIS_LOGDIR} \
+		REDIS_RUNDIR=${REDIS_RUNDIR} \
+		REDIS_USER=${USERS}
+
+post-patch-JEMALLOC-on:
+	@${REINPLACE_CMD} '62s!Linux!FreeBSD!g' ${WRKSRC}/src/Makefile
+
+post-build:
+	${SED} ${SUB_LIST:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
+		${WRKSRC}/redis.conf > ${WRKDIR}/redis.conf
+
+do-install:
+	${INSTALL_PROGRAM} ${BIN_FILES:C!^!${WRKSRC}/src/!} ${STAGEDIR}${PREFIX}/bin/
+	${INSTALL_DATA} ${WRKDIR}/redis.conf ${STAGEDIR}${PREFIX}/etc/redis.conf.sample
+	${INSTALL_DATA} ${WRKSRC}/sentinel.conf ${STAGEDIR}${PREFIX}/etc/sentinel.conf.sample
+	${MKDIR} ${STAGEDIR}${REDIS_LOGDIR} \
+		${STAGEDIR}${REDIS_DBDIR} \
+		${STAGEDIR}${REDIS_RUNDIR}
+
+do-test:
+	@cd ${WRKSRC} && ${TCLSH} tests/test_helper.tcl
+
+.include <bsd.port.mk>
diff --git a/databases/redis70/distinfo b/databases/redis70/distinfo
new file mode 100644
index 000000000000..bf26959ec27b
--- /dev/null
+++ b/databases/redis70/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1705951803
+SHA256 (redis-7.0.15.tar.gz) = 98066f5363504b26c34dd20fbcc3c957990d764cdf42576c836fc021073f4341
+SIZE (redis-7.0.15.tar.gz) = 2994329
diff --git a/databases/redis70/files/patch-deps-Makefile b/databases/redis70/files/patch-deps-Makefile
new file mode 100644
index 000000000000..21331efe7d8a
--- /dev/null
+++ b/databases/redis70/files/patch-deps-Makefile
@@ -0,0 +1,30 @@
+--- deps/Makefile.orig	2021-12-01 15:06:05 UTC
++++ deps/Makefile
+@@ -76,7 +76,7 @@
+ ifeq ($(LUA_DEBUG),yes)
+ 	LUA_CFLAGS+= -O0 -g -DLUA_USE_APICHECK
+ else
+-	LUA_CFLAGS+= -O2 
++	LUA_CFLAGS+=
+ endif
+ # lua's Makefile defines AR="ar rcu", which is unusual, and makes it more
+ # challenging to cross-compile lua (and redis).  These defines make it easier
+@@ -90,7 +90,7 @@
+ 
+ .PHONY: lua
+ 
+-JEMALLOC_CFLAGS= -std=gnu99 -Wall -pipe -g3 -O3 -funroll-loops $(CFLAGS)
++JEMALLOC_CFLAGS= -std=gnu99 -Wall -pipe -funroll-loops $(CFLAGS)
+ JEMALLOC_LDFLAGS= $(LDFLAGS)
+ 
+ ifneq ($(DEB_HOST_GNU_TYPE),)
+@@ -99,7 +99,7 @@
+ 
+ jemalloc: .make-prerequisites
+ 	@printf '%b %b\n' $(MAKECOLOR)MAKE$(ENDCOLOR) $(BINCOLOR)$@$(ENDCOLOR)
+-	cd jemalloc && ./configure --with-version=5.2.1-0-g0 --with-lg-quantum=3 --with-jemalloc-prefix=je_ CFLAGS="$(JEMALLOC_CFLAGS)" LDFLAGS="$(JEMALLOC_LDFLAGS)" $(JEMALLOC_CONFIGURE_OPTS)
+-	cd jemalloc && $(MAKE) CFLAGS="$(JEMALLOC_CFLAGS)" LDFLAGS="$(JEMALLOC_LDFLAGS)" lib/libjemalloc.a
++	cd jemalloc && ./configure --with-version=5.2.1-0-g0 --with-lg-quantum=3 --with-jemalloc-prefix=je_ CFLAGS="$(JEMALLOC_CFLAGS)" CXXFLAGS="$(JEMALLOC_CFLAGS)" LDFLAGS="$(JEMALLOC_LDFLAGS)" $(JEMALLOC_CONFIGURE_OPTS)
++	cd jemalloc && $(MAKE) CFLAGS="$(JEMALLOC_CFLAGS)" CXXFLAGS="$(JEMALLOC_CFLAGS)" LDFLAGS="$(JEMALLOC_LDFLAGS)" lib/libjemalloc.a
+ 
+ .PHONY: jemalloc
diff --git a/databases/redis70/files/patch-deps-hiredis-Makefile b/databases/redis70/files/patch-deps-hiredis-Makefile
new file mode 100644
index 000000000000..aec6b29a7b2e
--- /dev/null
+++ b/databases/redis70/files/patch-deps-hiredis-Makefile
@@ -0,0 +1,41 @@
+--- deps/hiredis/Makefile.orig	2021-01-12 14:21:03 UTC
++++ deps/hiredis/Makefile
+@@ -21,7 +21,7 @@
+ HIREDIS_SONAME=$(shell grep HIREDIS_SONAME hiredis.h | awk '{print $$3}')
+ 
+ # Installation related variables and target
+-PREFIX?=/usr/local
++PREFIX?=${PREFIX}
+ INCLUDE_PATH?=include/hiredis
+ LIBRARY_PATH?=lib
+ PKGCONF_PATH?=pkgconfig
+@@ -44,10 +44,8 @@
+ # Fallback to gcc when $CC is not in $PATH.
+ CC:=$(shell sh -c 'type $${CC%% *} >/dev/null 2>/dev/null && echo $(CC) || echo gcc')
+ CXX:=$(shell sh -c 'type $${CXX%% *} >/dev/null 2>/dev/null && echo $(CXX) || echo g++')
+-OPTIMIZATION?=-O3
+ WARNINGS=-Wall -W -Wstrict-prototypes -Wwrite-strings -Wno-missing-field-initializers
+-DEBUG_FLAGS?= -g -ggdb
+-REAL_CFLAGS=$(OPTIMIZATION) -fPIC $(CPPFLAGS) $(CFLAGS) $(WARNINGS) $(DEBUG_FLAGS)
++REAL_CFLAGS=$(OPTIMIZATION) -fPIC $(CFLAGS) $(WARNINGS) $(DEBUG_FLAGS)
+ REAL_LDFLAGS=$(LDFLAGS)
+ 
+ DYLIBSUFFIX=so
+@@ -83,7 +81,16 @@
+   CFLAGS+=-I$(OPENSSL_PREFIX)/include
+   SSL_LDFLAGS+=-L$(OPENSSL_PREFIX)/lib -lssl -lcrypto
+ endif
+-
++ifeq ($(uname_S),FreeBSD)
++  CFLAGS?=$(CFLAGS)
++  CCLINK?=pthread
++  LDFLAGS?=-L. -Wl,-rpath,.
++  DYLIBNAME?=libhiredis.so
++  DYLIB_MAKE_CMD?=$(CC) -o ${DYLIBNAME} ${OBJ}
++  STLIBNAME?=libhiredis.a
++  STLIB_MAKE_CMD?=ar rcs ${STLIBNAME} ${OBJ}
++  SSL_LDFLAGS+=${OPENSSL_LDFLAGS}
++endif
+ ifeq ($(uname_S),SunOS)
+   IS_SUN_CC=$(shell sh -c '$(CC) -V 2>&1 |egrep -i -c "sun|studio"')
+   ifeq ($(IS_SUN_CC),1)
diff --git a/databases/redis70/files/patch-deps-hiredis-net.c b/databases/redis70/files/patch-deps-hiredis-net.c
new file mode 100644
index 000000000000..0dfde3135238
--- /dev/null
+++ b/databases/redis70/files/patch-deps-hiredis-net.c
@@ -0,0 +1,39 @@
+--- deps/hiredis/net.c.orig	2019-11-28 19:32:05 UTC
++++ deps/hiredis/net.c
+@@ -178,14 +178,34 @@
+         __redisSetError(c,REDIS_ERR_OTHER,strerror(errno));
+         return REDIS_ERR;
+     }
+-#else
+-#if defined(__GLIBC__) && !defined(__FreeBSD_kernel__)
++#elif defined(__GLIBC__)
+     if (setsockopt(fd, IPPROTO_TCP, TCP_KEEPIDLE, &val, sizeof(val)) < 0) {
+         __redisSetError(c,REDIS_ERR_OTHER,strerror(errno));
+         return REDIS_ERR;
+     }
+ 
+     val = interval/3;
++    if (val == 0) val = 1;
++    if (setsockopt(fd, IPPROTO_TCP, TCP_KEEPINTVL, &val, sizeof(val)) < 0) {
++        __redisSetError(c,REDIS_ERR_OTHER,strerror(errno));
++        return REDIS_ERR;
++    }
++
++    val = 3;
++    if (setsockopt(fd, IPPROTO_TCP, TCP_KEEPCNT, &val, sizeof(val)) < 0) {
++        __redisSetError(c,REDIS_ERR_OTHER,strerror(errno));
++        return REDIS_ERR;
++    }
++#else
++#if !defined(__sun) && defined(TCP_KEEPIDLE) && defined(TCP_KEEPINTL) && \
++    defined(TCP_KEEPCNT)
++    val = interval;
++    if (setsockopt(fd, IPPROTO_TCP, TCP_KEEPIDLE, &val, sizeof(val)) < 0) {
++        __redisSetError(c,REDIS_ERR_OTHER,strerror(errno));
++        return REDIS_ERR;
++    }
++
++    val = internal/3;
+     if (val == 0) val = 1;
+     if (setsockopt(fd, IPPROTO_TCP, TCP_KEEPINTVL, &val, sizeof(val)) < 0) {
+         __redisSetError(c,REDIS_ERR_OTHER,strerror(errno));
diff --git a/databases/redis70/files/patch-deps-linenoise-Makefile b/databases/redis70/files/patch-deps-linenoise-Makefile
new file mode 100644
index 000000000000..aef0f10966af
--- /dev/null
+++ b/databases/redis70/files/patch-deps-linenoise-Makefile
@@ -0,0 +1,15 @@
+--- deps/linenoise/Makefile.orig	2019-09-25 10:40:18 UTC
++++ deps/linenoise/Makefile
+@@ -1,10 +1,10 @@
+ STD=
+ WARN= -Wall
+-OPT= -Os
++#OPT= -Os
+ 
+ R_CFLAGS= $(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS)
+ R_LDFLAGS= $(LDFLAGS)
+-DEBUG= -g
++#DEBUG= -g
+ 
+ R_CC=$(CC) $(R_CFLAGS)
+ R_LD=$(CC) $(R_LDFLAGS)
diff --git a/databases/redis70/files/patch-deps_lua_src_lua__cjson.c b/databases/redis70/files/patch-deps_lua_src_lua__cjson.c
new file mode 100644
index 000000000000..0bb150504c67
--- /dev/null
+++ b/databases/redis70/files/patch-deps_lua_src_lua__cjson.c
@@ -0,0 +1,12 @@
+--- deps/lua/src/lua_cjson.c.orig	2019-09-25 10:40:18 UTC
++++ deps/lua/src/lua_cjson.c
+@@ -46,7 +46,9 @@
+ #include "strbuf.h"
+ #include "fpconv.h"
+ 
++#if defined(__sun)
+ #include "../../../src/solarisfixes.h"
++#endif
+ 
+ #ifndef CJSON_MODNAME
+ #define CJSON_MODNAME   "cjson"
diff --git a/databases/redis70/files/patch-redis.conf b/databases/redis70/files/patch-redis.conf
new file mode 100644
index 000000000000..b653f89a3211
--- /dev/null
+++ b/databases/redis70/files/patch-redis.conf
@@ -0,0 +1,38 @@
+--- redis.conf.orig	2021-01-12 14:21:03 UTC
++++ redis.conf
+@@ -244,7 +244,7 @@
+ # By default Redis does not run as a daemon. Use 'yes' if you need it.
+ # Note that Redis will write a pid file in /var/run/redis.pid when daemonized.
+ # When Redis is supervised by upstart or systemd, this parameter has no impact.
+-daemonize no
++daemonize yes
+ 
+ # If you run Redis from upstart or systemd, Redis can interact with your
+ # supervision tree. Options:
+@@ -276,7 +276,7 @@
+ #
+ # Note that on modern Linux systems "/run/redis.pid" is more conforming
+ # and should be used instead.
+-pidfile /var/run/redis_6379.pid
++pidfile %%REDIS_RUNDIR%%/redis.pid
+ 
+ # Specify the server verbosity level.
+ # This can be one of:
+@@ -289,7 +289,7 @@
+ # Specify the log file name. Also the empty string can be used to force
+ # Redis to log on the standard output. Note that if you use standard
+ # output for logging but daemonize, logs will be sent to /dev/null
+-logfile ""
++logfile %%REDIS_LOGDIR%%/redis.log
+ 
+ # To enable logging to the system logger, just set 'syslog-enabled' to yes,
+ # and optionally update the other syslog parameters to suit your needs.
+@@ -420,7 +420,7 @@
+ # The Append Only File will also be created inside this directory.
+ #
+ # Note that you must specify a directory here, not a file name.
+-dir ./
++dir %%REDIS_DBDIR%%/
+ 
+ ################################# REPLICATION #################################
+ 
diff --git a/databases/redis70/files/patch-src-Makefile b/databases/redis70/files/patch-src-Makefile
new file mode 100644
index 000000000000..6b3ed47b68be
--- /dev/null
+++ b/databases/redis70/files/patch-src-Makefile
@@ -0,0 +1,39 @@
+--- src/Makefile.orig	2019-11-29 16:35:59 UTC
++++ src/Makefile
+@@ -29,7 +29,7 @@ endif
+ WARN=-Wall -W -Wno-missing-field-initializers
+ OPT=$(OPTIMIZATION)
+ 
+-PREFIX?=/usr/local
++PREFIX:=$(PREFIX)
+ INSTALL_BIN=$(PREFIX)/bin
+ INSTALL=install
+ 
+@@ -75,7 +75,6 @@ endif
+ FINAL_CFLAGS=$(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) $(REDIS_CFLAGS)
+ FINAL_LDFLAGS=$(LDFLAGS) $(REDIS_LDFLAGS) $(DEBUG)
+ FINAL_LIBS=-lm
+-DEBUG=-g -ggdb
+ 
+ # Linux ARM needs -latomic at linking time
+ ifneq (,$(filter aarch64 armv,$(uname_M)))
+@@ -105,6 +104,11 @@ ifeq ($(uname_S),Darwin)
+ 	OPENSSL_CFLAGS=-I/usr/local/opt/openssl/include
+ 	OPENSSL_LDFLAGS=-L/usr/local/opt/openssl/lib
+ else
++ifeq ($(uname_S),FreeBSD)
++        # FreeBSD
++        FINAL_CFLAGS?= $(CFLAGS) $(REDIS_CFLAGS) -I${PREFIX}/include
++        FINAL_LDFLAGS= $(LDFLAGS) -pthread
++else
+ ifeq ($(uname_S),AIX)
+         # AIX
+         FINAL_LDFLAGS+= -Wl,-bexpall
+@@ -131,6 +135,7 @@ else
+ 	# All the other OSes (notably Linux)
+ 	FINAL_LDFLAGS+= -rdynamic
+ 	FINAL_LIBS+=-ldl -pthread -lrt
++endif
+ endif
+ endif
+ endif
diff --git a/databases/redis70/files/patch-src-mkreleasehdr.sh b/databases/redis70/files/patch-src-mkreleasehdr.sh
new file mode 100644
index 000000000000..e48b3174d315
--- /dev/null
+++ b/databases/redis70/files/patch-src-mkreleasehdr.sh
@@ -0,0 +1,11 @@
+--- src/mkreleasehdr.sh.orig	2019-11-22 16:54:22 UTC
++++ src/mkreleasehdr.sh
+@@ -1,6 +1,6 @@
+ #!/bin/sh
+-GIT_SHA1=`(git show-ref --head --hash=8 2> /dev/null || echo 00000000) | head -n1`
+-GIT_DIRTY=`git diff --no-ext-diff 2> /dev/null | wc -l`
++GIT_SHA1="00000000"
++GIT_DIRTY="0"
+ BUILD_ID=`uname -n`"-"`date +%s`
+ if [ -n "$SOURCE_DATE_EPOCH" ]; then
+   BUILD_ID=$(date -u -d "@$SOURCE_DATE_EPOCH" +%s 2>/dev/null || date -u -r "$SOURCE_DATE_EPOCH" +%s 2>/dev/null || date -u +%s)
diff --git a/databases/redis6/files/pkg-message.in b/databases/redis70/files/pkg-message.in
index 85a89529262a..85a89529262a 100644
--- a/databases/redis6/files/pkg-message.in
+++ b/databases/redis70/files/pkg-message.in
diff --git a/databases/redis6/files/redis.in b/databases/redis70/files/redis.in
index d18063c3a504..d18063c3a504 100644
--- a/databases/redis6/files/redis.in
+++ b/databases/redis70/files/redis.in
diff --git a/databases/redis6/files/sentinel.in b/databases/redis70/files/sentinel.in
index 088f4382fc06..088f4382fc06 100644
--- a/databases/redis6/files/sentinel.in
+++ b/databases/redis70/files/sentinel.in
diff --git a/databases/redis70/pkg-descr b/databases/redis70/pkg-descr
new file mode 100644
index 000000000000..5500bd1afad4
--- /dev/null
+++ b/databases/redis70/pkg-descr
@@ -0,0 +1,17 @@
+Redis is an open source, advanced key-value store.  It is often referred
+to as a data structure server since keys can contain strings, hashes,
+lists, sets and sorted sets.
+
+You can run atomic operations on these types, like appending to a string;
+incrementing the value in a hash; pushing to a list; computing set
+intersection, union and difference; or getting the member with highest
+ranking in a sorted set.
+
+In order to achieve its outstanding performance, Redis works with an
+in-memory dataset.  Depending on your use case, you can persist it either
+by dumping the dataset to disk every once in a while, or by appending each
+command to a log.
+
+Redis also supports trivial-to-setup master-slave replication, with very
+fast non-blocking first synchronization, auto-reconnection on net split
+and so forth.
diff --git a/databases/redis70/pkg-plist b/databases/redis70/pkg-plist
new file mode 100644
index 000000000000..fafc472df89b
--- /dev/null
+++ b/databases/redis70/pkg-plist
@@ -0,0 +1,11 @@
+bin/redis-benchmark
+bin/redis-check-aof
+bin/redis-check-rdb
+bin/redis-cli
+bin/redis-sentinel
+bin/redis-server
+@sample etc/redis.conf.sample
+@sample(%%REDIS_USER%%,%%REDIS_GROUP%%,) etc/sentinel.conf.sample
+@dir(%%REDIS_USER%%,%%REDIS_GROUP%%,) %%REDIS_DBDIR%%
+@dir(%%REDIS_USER%%,%%REDIS_GROUP%%,) %%REDIS_LOGDIR%%
+@dir(%%REDIS_USER%%,%%REDIS_GROUP%%,) %%REDIS_RUNDIR%%
diff --git a/databases/redis_exporter/Makefile b/databases/redis_exporter/Makefile
index 624263e0f408..406b63a29fb2 100644
--- a/databases/redis_exporter/Makefile
+++ b/databases/redis_exporter/Makefile
@@ -1,41 +1,26 @@
-# Created by: Jev Björsell <ports@ecadlabs.com>
-
 PORTNAME=	redis_exporter
-PORTVERSION=	1.10.0
-DISTVERSIONPREFIX=v
+DISTVERSIONPREFIX=	v
+DISTVERSION=	1.58.0
+PORTREVISION=	1
 CATEGORIES=	databases
 
 MAINTAINER=	arcade@b1t.name
 COMMENT=	Prometheus exporter for redis stats
+WWW=		https://github.com/oliver006/redis_exporter
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-USES=		go:modules
+USES=		go:modules,1.22
 
-USE_GITHUB=	yes
-GH_ACCOUNT=	oliver006
 USE_RC_SUBR=	redis_exporter
 
-GH_TUPLE=	beorn7:perks:v1.0.1:beorn7_perks/vendor/github.com/beorn7/perks \
-		cespare:xxhash:v2.1.1:cespare_xxhash/vendor/github.com/cespare/xxhash/v2 \
-		golang:protobuf:v1.4.2:golang_protobuf/vendor/github.com/golang/protobuf \
-		golang:sys:e047566:golang_sys/vendor/golang.org/x/sys \
-		protocolbuffers:protobuf-go:v1.25.0:protocolbuffers_protobuf_go/vendor/google.golang.org/protobuf \
-		gomodule:redigo:v1.8.2:gomodule_redigo/vendor/github.com/gomodule/redigo \
-		matttproud:golang_protobuf_extensions:v1.0.1:matttproud_golang_protobuf_extensions/vendor/github.com/matttproud/golang_protobuf_extensions \
-		prometheus:client_golang:v1.7.0:prometheus_client_golang/vendor/github.com/prometheus/client_golang \
-		prometheus:client_model:v0.2.0:prometheus_client_model/vendor/github.com/prometheus/client_model \
-		prometheus:common:v0.10.0:prometheus_common/vendor/github.com/prometheus/common \
-		prometheus:procfs:v0.1.3:prometheus_procfs/vendor/github.com/prometheus/procfs \
-		sirupsen:logrus:v1.6.0:sirupsen_logrus/vendor/github.com/sirupsen/logrus
-
+GO_MODULE=	github.com/oliver006/redis_exporter
 GO_BUILDFLAGS=	-v -ldflags "${LD_FLAG_STRING}"
 
 PLIST_FILES=	bin/redis_exporter
 
 LD_FLAG_X_PREFIX=	-X main
-LD_FLAG_STRING=		-s \
-		${LD_FLAG_X_PREFIX}.BuildVersion=${PORTVERSION}
+LD_FLAG_STRING=		${STRIP} ${LD_FLAG_X_PREFIX}.BuildVersion=${PORTVERSION}
 
 .include <bsd.port.mk>
diff --git a/databases/redis_exporter/distinfo b/databases/redis_exporter/distinfo
index 38efdc7f8b36..14405192bfc8 100644
--- a/databases/redis_exporter/distinfo
+++ b/databases/redis_exporter/distinfo
@@ -1,27 +1,5 @@
-TIMESTAMP = 1597908276
-SHA256 (oliver006-redis_exporter-v1.10.0_GH0.tar.gz) = f86196d45eae87f750e13952dd04e088b8a8a52f622fe56d11a59019cf26b131
-SIZE (oliver006-redis_exporter-v1.10.0_GH0.tar.gz) = 43086
-SHA256 (beorn7-perks-v1.0.1_GH0.tar.gz) = 98db84bb0224a26094e6adba91b7ee7a1a7ace28cb648d818f8e779e6a19f825
-SIZE (beorn7-perks-v1.0.1_GH0.tar.gz) = 10867
-SHA256 (cespare-xxhash-v2.1.1_GH0.tar.gz) = 0ee31178d2c5a1249be4e26294a2f428008dc4e1ecbbfbe47f74e41026df1148
-SIZE (cespare-xxhash-v2.1.1_GH0.tar.gz) = 9292
-SHA256 (golang-protobuf-v1.4.2_GH0.tar.gz) = a1e486b3ed6f502c43e10cb28bde4e8f020a420ef9958d3fbe61801492c07c87
-SIZE (golang-protobuf-v1.4.2_GH0.tar.gz) = 171778
-SHA256 (golang-sys-e047566_GH0.tar.gz) = 7f92a6517b6552ea479ffef7dc9b1a5f39a8eea4a0a940454ff0351bc350daeb
-SIZE (golang-sys-e047566_GH0.tar.gz) = 1534595
-SHA256 (protocolbuffers-protobuf-go-v1.25.0_GH0.tar.gz) = c1c04d6e36c0d0fb6f3374197f9025d7e6df13f38a974098be020617c00fbaf2
-SIZE (protocolbuffers-protobuf-go-v1.25.0_GH0.tar.gz) = 1258804
-SHA256 (gomodule-redigo-v1.8.2_GH0.tar.gz) = d30c13303514969f1875a7c71b25dace0c52cc3d23cd41addcc9b3fa77ad4a7a
-SIZE (gomodule-redigo-v1.8.2_GH0.tar.gz) = 48915
-SHA256 (matttproud-golang_protobuf_extensions-v1.0.1_GH0.tar.gz) = 2def0ee6f6b12b1efc0e3007d89f598608a072610e805c3655ea9d13c3ead49b
-SIZE (matttproud-golang_protobuf_extensions-v1.0.1_GH0.tar.gz) = 37184
-SHA256 (prometheus-client_golang-v1.7.0_GH0.tar.gz) = 580946814972dd8df686ea8ac034aa2f009c13f69d67c923f5d9de0b09ae9743
-SIZE (prometheus-client_golang-v1.7.0_GH0.tar.gz) = 159940
-SHA256 (prometheus-client_model-v0.2.0_GH0.tar.gz) = 4ab1be9cdfa702d7f49beeb09a256bcc6a2aad55e8a0a37e7732a46934264e12
-SIZE (prometheus-client_model-v0.2.0_GH0.tar.gz) = 10986
-SHA256 (prometheus-common-v0.10.0_GH0.tar.gz) = 349381082ea8e66637c2d2475f1ae0e74ca04a7b91eb3b96817c261b87668fd3
-SIZE (prometheus-common-v0.10.0_GH0.tar.gz) = 107763
-SHA256 (prometheus-procfs-v0.1.3_GH0.tar.gz) = 0b0872058bfdef11d9942535c992420150724c3b5a912a48a8d2ea26ac39efa6
-SIZE (prometheus-procfs-v0.1.3_GH0.tar.gz) = 156868
-SHA256 (sirupsen-logrus-v1.6.0_GH0.tar.gz) = 536151aa2fed39e2b74925f81c8cd31f0c02c013881ba2d30982731d12424ed0
-SIZE (sirupsen-logrus-v1.6.0_GH0.tar.gz) = 45748
+TIMESTAMP = 1711646542
+SHA256 (go/databases_redis_exporter/redis_exporter-v1.58.0/v1.58.0.mod) = 05ef636732b5d51b89fa5a5c4322e89272e8c7e82e9555c7043555a631116417
+SIZE (go/databases_redis_exporter/redis_exporter-v1.58.0/v1.58.0.mod) = 617
+SHA256 (go/databases_redis_exporter/redis_exporter-v1.58.0/v1.58.0.zip) = 134d826fe04342bb6c0c5062e294e690a61ececa3ca753ba4f1881f1e6e72686
+SIZE (go/databases_redis_exporter/redis_exporter-v1.58.0/v1.58.0.zip) = 111900
diff --git a/databases/redis_exporter/pkg-descr b/databases/redis_exporter/pkg-descr
index 9fe58e99173d..ee918f325561 100644
--- a/databases/redis_exporter/pkg-descr
+++ b/databases/redis_exporter/pkg-descr
@@ -1,3 +1 @@
 Prometheus Exporter for Redis Metrics. Supports Redis 2.x, 3.x and 4.x
-
-WWW: https://github.com/oliver006/redis_exporter
diff --git a/databases/redisdesktopmanager/Makefile b/databases/redisdesktopmanager/Makefile
index 8989cb838e45..c6061cf1a162 100644
--- a/databases/redisdesktopmanager/Makefile
+++ b/databases/redisdesktopmanager/Makefile
@@ -1,52 +1,61 @@
 PORTNAME=	redisdesktopmanager
-PORTVERSION=	2021.7
+PORTVERSION=	2022.5
 CATEGORIES=	databases
 
-MAINTAINER=	swills@FreeBSD.org
+MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	Redis DB management tool
+WWW=		https://github.com/RedisInsight/RedisDesktopManager
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LIB_DEPENDS=	liblz4.so:archivers/liblz4 \
+LIB_DEPENDS=	libbrotlicommon.so:archivers/brotli \
+		liblz4.so:archivers/liblz4 \
 		libpython${PYTHON_VER}${PYTHON_ABIVER}.so:lang/python${PYTHON_SUFFIX} \
+		libsnappy.so:archivers/snappy \
+		libzstd.so:archivers/zstd \
 		libssh2.so:security/libssh2
 
-USES=			compiler:c++0x dos2unix gettext-runtime gl kde:5 \
-			python:build qmake qt:5
-USE_GL=			gl
-USE_GITHUB=		yes
-DOS2UNIX_FILES=		3rdparty/3rdparty.pri
+USES=		compiler:c++0x dos2unix gettext-runtime gl kde:5 python:build \
+		qmake qt:5
+DOS2UNIX_FILES=	3rdparty/3rdparty.pri
+USE_GITHUB=	yes
+GH_TUPLE=	RedisInsight:RedisDesktopManager:${PORTVERSION}:DEFAULT/RedisDesktopManager-${PORTVERSION} \
+		benlau:asyncfuture:5ca0304:asyncfuture/3rdparty/qredisclient/3rdparty/asyncfuture \
+		eranpeer:FakeIt:80a446b:FakeIt/3rdparty/fakeit \
+		uglide:pyotherside:c1a8cc0:pyotherside/3rdparty/pyotherside \
+		uglide:qredisclient:901b005:qredisclient/3rdparty/qredisclient \
+		redis:hiredis:b731283:hiredis/3rdparty/qredisclient/3rdparty/hiredis \
+		simdjson:simdjson:3bd8b0b:simdjson/3rdparty/simdjson
+USE_GL=		gl
+USE_QT=		charts concurrent core declarative gui network quickcontrols \
+		svg widgets buildtools:build qmake:build
+
+QMAKE_ARGS+=	SYSTEM_BROTLI=1 SYSTEM_LZ4=1 SYSTEM_SNAPPY=1 SYSTEM_ZSTD=1 \
+		VERSION=${PORTVERSION}
+
+CXXFLAGS_powerpc64=	-mpower8-vector
+
+BINARY_ALIAS=	python3-config=${PYTHON_CMD}-config python3=${PYTHON_CMD}
+DESKTOP_ENTRIES=	"GUI for Redis" \
+			"GUI for Redis" \
+			"resp" \
+			"resp" \
+			"Development;" \
+			""
+
 BUILD_WRKSRC=		${WRKSRC}/src
 CONFIGURE_WRKSRC=	${WRKSRC}/src
 INSTALL_WRKSRC=		${WRKSRC}/bin/linux/release
-PLIST_FILES=		bin/rdm \
-			share/pixmaps/rdm.png
-DESKTOP_ENTRIES=	"Redis Desktop Manager" \
-			"Redis Desktop Manager" \
-			"rdm" \
-			"rdm" \
-			"Development;" \
-			""
-GH_TUPLE=		uglide:RedisDesktopManager:${PORTVERSION}:DEFAULT/RedisDesktopManager-${PORTVERSION} \
-			benlau:asyncfuture:5ca0304:asyncfuture/3rdparty/qredisclient/3rdparty/asyncfuture \
-			uglide:qredisclient:68621f3:qredisclient/3rdparty/qredisclient \
-			sijk:qt-unix-signals:d6a1d12:qtunixsignals/3rdparty/qt-unix-signals \
-			uglide:qsshclient:6fa7fb7:qsshclient/3rdparty/qredisclient/3rdparty/qsshclient \
-			uglide:pyotherside:c1a8cc0:pyotherside/3rdparty/pyotherside \
-			redis:hiredis:6850306:hiredis/3rdparty/qredisclient/3rdparty/hiredis \
-			simdjson:simdjson:ea3d4e7c:simdjson/3rdparty/simdjson
-USE_QT=			charts concurrent core declarative gui network \
-			quickcontrols svg widgets buildtools_build qmake_build
-QMAKE_ARGS+=		SYSTEM_LZ4=1 VERSION=${PORTVERSION}
-BINARY_ALIAS=		python3-config=${PYTHON_CMD}-config \
-			python3=${PYTHON_CMD}
+
+PLIST_FILES=	bin/resp \
+		share/pixmaps/resp.png
 
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/bin ${STAGEDIR}${PREFIX}/share/pixmaps
 	cd ${INSTALL_WRKSRC} ; \
-	${STRIP_CMD} rdm ; \
-	${INSTALL_PROGRAM} rdm ${STAGEDIR}${PREFIX}/bin/rdm
-	${INSTALL_DATA} ${BUILD_WRKSRC}/resources/images/rdm.png ${STAGEDIR}${PREFIX}/share/pixmaps/rdm.png
+	${STRIP_CMD} resp ; \
+	${INSTALL_PROGRAM} resp ${STAGEDIR}${PREFIX}/bin/resp
+	${INSTALL_DATA} ${BUILD_WRKSRC}/resources/images/resp.png ${STAGEDIR}${PREFIX}/share/pixmaps/resp.png
 
 .include <bsd.port.mk>
diff --git a/databases/redisdesktopmanager/distinfo b/databases/redisdesktopmanager/distinfo
index b641e6e56fc6..cda1c2a81593 100644
--- a/databases/redisdesktopmanager/distinfo
+++ b/databases/redisdesktopmanager/distinfo
@@ -1,17 +1,15 @@
-TIMESTAMP = 1626723274
-SHA256 (uglide-RedisDesktopManager-2021.7_GH0.tar.gz) = 476863977f1fee98f3182b75e2a823d861a5b43f01e1b10abb4ddac924e81785
-SIZE (uglide-RedisDesktopManager-2021.7_GH0.tar.gz) = 2843193
+TIMESTAMP = 1681311282
+SHA256 (RedisInsight-RedisDesktopManager-2022.5_GH0.tar.gz) = 3b6c02a27030bc95439d112df72a85a5b360ab2a55c4146fffc2989c7389c395
+SIZE (RedisInsight-RedisDesktopManager-2022.5_GH0.tar.gz) = 2440386
 SHA256 (benlau-asyncfuture-5ca0304_GH0.tar.gz) = 1718a942ee0c80d05765fd12a0717a99645f4e90f1cc34ad0dd571d386aad199
 SIZE (benlau-asyncfuture-5ca0304_GH0.tar.gz) = 35037
-SHA256 (uglide-qredisclient-68621f3_GH0.tar.gz) = 6304e4756a492ed42af5b7667d0a0447acc145bfb4bb6a025d892ab4419dc192
-SIZE (uglide-qredisclient-68621f3_GH0.tar.gz) = 223672
-SHA256 (sijk-qt-unix-signals-d6a1d12_GH0.tar.gz) = 8bbc578430ab2fd6665ff2f2f6fcf402b3346b6d3cdfcc16e8c1d8f5a8f75ea2
-SIZE (sijk-qt-unix-signals-d6a1d12_GH0.tar.gz) = 3792
-SHA256 (uglide-qsshclient-6fa7fb7_GH0.tar.gz) = b9eaed71f8cae6d4fa1e6cf7de979ba8a5d1a14e2681cf1a0f2bfc42d5960ea1
-SIZE (uglide-qsshclient-6fa7fb7_GH0.tar.gz) = 10446
+SHA256 (eranpeer-FakeIt-80a446b_GH0.tar.gz) = 20b39c53957e6642c5a688bb6cf95eb7f58ce1f3b72dbe1c1ae496b51fc7aa7c
+SIZE (eranpeer-FakeIt-80a446b_GH0.tar.gz) = 408635
 SHA256 (uglide-pyotherside-c1a8cc0_GH0.tar.gz) = 4a7f629da473f465ca128619081218de3f6d4958f4ffbc93db17523191c13384
 SIZE (uglide-pyotherside-c1a8cc0_GH0.tar.gz) = 185205
-SHA256 (redis-hiredis-6850306_GH0.tar.gz) = f30e78ba3f8ae8effaf538c26412302bcd82a0268741de6441d30bc7c43dd90c
-SIZE (redis-hiredis-6850306_GH0.tar.gz) = 63061
-SHA256 (simdjson-simdjson-ea3d4e7c_GH0.tar.gz) = 7871c5fc4d11d04a6139c03767a1829134f140a2e58fa15ec77c1c4f55421d5e
-SIZE (simdjson-simdjson-ea3d4e7c_GH0.tar.gz) = 1449886
+SHA256 (uglide-qredisclient-901b005_GH0.tar.gz) = 3500d00500ae2b0f9193cd2ed531a520e71bd583705162b21975410698d682e6
+SIZE (uglide-qredisclient-901b005_GH0.tar.gz) = 224101
+SHA256 (redis-hiredis-b731283_GH0.tar.gz) = 827a711091ae110ada60eded4c4dfb5c4a12d4843028ac6c4035fd1b8c9d41a9
+SIZE (redis-hiredis-b731283_GH0.tar.gz) = 98155
+SHA256 (simdjson-simdjson-3bd8b0b_GH0.tar.gz) = 78718f97a06ed1098def7fc8b3cfa2048a83dc7b49afc9dd5b40c1ee8072a681
+SIZE (simdjson-simdjson-3bd8b0b_GH0.tar.gz) = 1546791
diff --git a/databases/redisdesktopmanager/pkg-descr b/databases/redisdesktopmanager/pkg-descr
index 77c9a835faf2..997fdf4a5747 100644
--- a/databases/redisdesktopmanager/pkg-descr
+++ b/databases/redisdesktopmanager/pkg-descr
@@ -4,5 +4,3 @@ DB and perform some basic operations: view keys as a tree, CRUD keys, execute
 commands via shell. RDM supports SSL/TLS encryption, SSH tunnels and cloud
 Redis instances such as: Amazon ElastiCache, Microsoft Azure Redis Cache and
 Redis Labs.
-
-WWW: https://redisdesktop.com/
diff --git a/databases/redisjson/Makefile b/databases/redisjson/Makefile
index cfb0095a9aac..b62f3e95c46d 100644
--- a/databases/redisjson/Makefile
+++ b/databases/redisjson/Makefile
@@ -1,12 +1,12 @@
-# Created by: Sergey A. Osokin <osa@FreeBSD.org>
-
 PORTNAME=	redisjson
-PORTVERSION=	0.0.0.0.2021.08.30.01
-PORTREVISION=	1
+DISTVERSIONPREFIX=	v
+DISTVERSION=	2.0.8
+PORTREVISION=	18
 CATEGORIES=	databases
 
-MAINTAINER=	osa@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	JSON data type for Redis
+WWW=		https://oss.redislabs.com/redisjson/
 
 LICENSE=	UNKNOWN
 LICENSE_NAME=	Redis Source Available License Agreement
@@ -16,97 +16,101 @@ LICENSE_PERMS=	dist-mirror pkg-mirror auto-accept
 BUILD_DEPENDS=	${LOCALBASE}/llvm${LLVM_DEFAULT}/lib/libclang.so:devel/llvm${LLVM_DEFAULT}
 
 USES=		cargo
+USE_GITHUB=	yes
+GH_ACCOUNT=	RedisJSON
+GH_PROJECT=	RedisJSON
 
-USE_GITHUB=	nodefault
-GH_TUPLE=	RedisJSON:redisjson:90bc4a0:redisjson \
-		RedisJSON:jsonpath:14af7aa5435f3e676ceb3441ad78b9c8cb3ffa3a:jsonpath_lib
-
-CARGO_CRATES=	aho-corasick-0.7.15 \
-		ansi_term-0.11.0 \
+CARGO_CRATES=	addr2line-0.17.0 \
+		adler-1.0.2 \
+		aho-corasick-0.7.18 \
+		ansi_term-0.12.1 \
 		array_tool-1.0.3 \
 		atty-0.2.14 \
-		autocfg-1.0.1 \
-		bindgen-0.59.1 \
+		autocfg-1.1.0 \
+		backtrace-0.3.64 \
+		bindgen-0.59.2 \
 		bitflags-1.3.2 \
-		bitvec-0.19.5 \
 		bson-0.14.1 \
 		byteorder-1.4.3 \
-		cc-1.0.69 \
-		cexpr-0.5.0 \
+		cc-1.0.73 \
+		cexpr-0.6.0 \
 		cfg-if-1.0.0 \
 		chrono-0.4.19 \
-		clang-sys-1.2.0 \
-		clap-2.33.3 \
+		clang-sys-1.3.1 \
+		clap-2.34.0 \
+		dashmap-4.0.2 \
+		either-1.6.1 \
 		enum-primitive-derive-0.1.2 \
-		env_logger-0.8.4 \
-		funty-1.1.0 \
+		env_logger-0.9.0 \
 		getrandom-0.1.16 \
+		gimli-0.26.1 \
 		glob-0.3.0 \
 		hashbrown-0.11.2 \
 		heck-0.3.3 \
 		hermit-abi-0.1.19 \
 		hex-0.3.2 \
 		humantime-2.1.0 \
-		indexmap-1.7.0 \
-		itoa-0.4.8 \
+		ijson-0.1.3 \
+		indexmap-1.8.0 \
+		itertools-0.10.3 \
+		itoa-1.0.1 \
 		lazy_static-1.4.0 \
 		lazycell-1.3.0 \
-		libc-0.2.100 \
-		libloading-0.7.0 \
+		libc-0.2.120 \
+		libloading-0.7.3 \
 		linked-hash-map-0.5.4 \
 		log-0.4.14 \
 		md5-0.6.1 \
-		memchr-2.3.4 \
-		nom-6.2.1 \
+		memchr-2.4.1 \
+		minimal-lexical-0.2.1 \
+		miniz_oxide-0.4.4 \
+		nom-7.1.1 \
 		num-integer-0.1.44 \
 		num-traits-0.1.43 \
 		num-traits-0.2.14 \
+		num_cpus-1.13.1 \
+		object-0.27.1 \
 		peeking_take_while-0.1.2 \
-		ppv-lite86-0.2.10 \
-		proc-macro2-1.0.28 \
+		ppv-lite86-0.2.16 \
+		proc-macro2-1.0.36 \
 		quote-0.3.15 \
-		quote-1.0.9 \
-		radium-0.5.3 \
+		quote-1.0.15 \
 		rand-0.7.3 \
 		rand_chacha-0.2.2 \
 		rand_core-0.5.1 \
 		rand_hc-0.2.0 \
-		redis-module-0.23.0 \
-		regex-1.4.6 \
+		redis-module-1.0.0 \
+		regex-1.5.5 \
 		regex-syntax-0.6.25 \
+		rustc-demangle-0.1.21 \
 		rustc-hash-1.1.0 \
-		ryu-1.0.5 \
-		serde-1.0.128 \
-		serde_derive-1.0.128 \
-		serde_json-1.0.66 \
-		shlex-1.0.0 \
+		rustversion-1.0.6 \
+		ryu-1.0.9 \
+		serde-1.0.136 \
+		serde_derive-1.0.136 \
+		serde_json-1.0.79 \
+		shlex-1.1.0 \
 		strsim-0.8.0 \
-		strum_macros-0.21.1 \
+		strum_macros-0.23.1 \
 		syn-0.11.11 \
-		syn-1.0.75 \
+		syn-1.0.88 \
 		synom-0.11.3 \
-		tap-1.0.1 \
-		termcolor-1.1.2 \
+		termcolor-1.1.3 \
 		textwrap-0.11.0 \
 		time-0.1.44 \
-		unicode-segmentation-1.8.0 \
-		unicode-width-0.1.8 \
+		unicode-segmentation-1.9.0 \
+		unicode-width-0.1.9 \
 		unicode-xid-0.0.4 \
 		unicode-xid-0.2.2 \
 		vec_map-0.8.2 \
-		version_check-0.9.3 \
 		wasi-0.9.0+wasi-snapshot-preview1 \
 		wasi-0.10.0+wasi-snapshot-preview1 \
-		which-3.1.1 \
+		which-4.2.4 \
 		winapi-0.3.9 \
 		winapi-i686-pc-windows-gnu-0.4.0 \
 		winapi-util-0.1.5 \
 		winapi-x86_64-pc-windows-gnu-0.4.0 \
-		wyz-0.2.0
-
-CARGO_USE_GITHUB=	yes
-
-WRKSRC=		${WRKDIR}/RedisJSON-90bc4a0
+		jsonpath_lib@git+https://github.com/RedisJSON/jsonpath.git?branch=generic_json_path\#6da271ec44ff56db0d2e7009efc707935ee8c0f8
 
 PLIST_FILES=	lib/librejson.so
 
diff --git a/databases/redisjson/distinfo b/databases/redisjson/distinfo
index 8292c99d8955..7eaeb68ad762 100644
--- a/databases/redisjson/distinfo
+++ b/databases/redisjson/distinfo
@@ -1,44 +1,52 @@
-TIMESTAMP = 1630353808
-SHA256 (rust/crates/aho-corasick-0.7.15.crate) = 7404febffaa47dac81aa44dba71523c9d069b1bdc50a77db41195149e17f68e5
-SIZE (rust/crates/aho-corasick-0.7.15.crate) = 113071
-SHA256 (rust/crates/ansi_term-0.11.0.crate) = ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b
-SIZE (rust/crates/ansi_term-0.11.0.crate) = 17087
+TIMESTAMP = 1651881118
+SHA256 (rust/crates/addr2line-0.17.0.crate) = b9ecd88a8c8378ca913a680cd98f0f13ac67383d35993f86c90a70e3f137816b
+SIZE (rust/crates/addr2line-0.17.0.crate) = 32260
+SHA256 (rust/crates/adler-1.0.2.crate) = f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe
+SIZE (rust/crates/adler-1.0.2.crate) = 12778
+SHA256 (rust/crates/aho-corasick-0.7.18.crate) = 1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f
+SIZE (rust/crates/aho-corasick-0.7.18.crate) = 112923
+SHA256 (rust/crates/ansi_term-0.12.1.crate) = d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2
+SIZE (rust/crates/ansi_term-0.12.1.crate) = 24838
 SHA256 (rust/crates/array_tool-1.0.3.crate) = 8f8cb5d814eb646a863c4f24978cff2880c4be96ad8cde2c0f0678732902e271
 SIZE (rust/crates/array_tool-1.0.3.crate) = 11979
 SHA256 (rust/crates/atty-0.2.14.crate) = d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8
 SIZE (rust/crates/atty-0.2.14.crate) = 5470
-SHA256 (rust/crates/autocfg-1.0.1.crate) = cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a
-SIZE (rust/crates/autocfg-1.0.1.crate) = 12908
-SHA256 (rust/crates/bindgen-0.59.1.crate) = 453c49e5950bb0eb63bb3df640e31618846c89d5b7faa54040d76e98e0134375
-SIZE (rust/crates/bindgen-0.59.1.crate) = 205256
+SHA256 (rust/crates/autocfg-1.1.0.crate) = d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa
+SIZE (rust/crates/autocfg-1.1.0.crate) = 13272
+SHA256 (rust/crates/backtrace-0.3.64.crate) = 5e121dee8023ce33ab248d9ce1493df03c3b38a659b240096fcbd7048ff9c31f
+SIZE (rust/crates/backtrace-0.3.64.crate) = 74311
+SHA256 (rust/crates/bindgen-0.59.2.crate) = 2bd2a9a458e8f4304c52c43ebb0cfbd520289f8379a52e329a38afda99bf8eb8
+SIZE (rust/crates/bindgen-0.59.2.crate) = 206267
 SHA256 (rust/crates/bitflags-1.3.2.crate) = bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a
 SIZE (rust/crates/bitflags-1.3.2.crate) = 23021
-SHA256 (rust/crates/bitvec-0.19.5.crate) = 8942c8d352ae1838c9dda0b0ca2ab657696ef2232a20147cf1b30ae1a9cb4321
-SIZE (rust/crates/bitvec-0.19.5.crate) = 148200
 SHA256 (rust/crates/bson-0.14.1.crate) = 3c177ed0122f24ce5e0f05bf9b29e79f3ac1a359bc504e0e14c3b34896c71c00
 SIZE (rust/crates/bson-0.14.1.crate) = 41912
 SHA256 (rust/crates/byteorder-1.4.3.crate) = 14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610
 SIZE (rust/crates/byteorder-1.4.3.crate) = 22512
-SHA256 (rust/crates/cc-1.0.69.crate) = e70cc2f62c6ce1868963827bd677764c62d07c3d9a3e1fb1177ee1a9ab199eb2
-SIZE (rust/crates/cc-1.0.69.crate) = 56044
-SHA256 (rust/crates/cexpr-0.5.0.crate) = db507a7679252d2276ed0dd8113c6875ec56d3089f9225b2b42c30cc1f8e5c89
-SIZE (rust/crates/cexpr-0.5.0.crate) = 17964
+SHA256 (rust/crates/cc-1.0.73.crate) = 2fff2a6927b3bb87f9595d67196a70493f627687a71d87a0d692242c33f58c11
+SIZE (rust/crates/cc-1.0.73.crate) = 57880
+SHA256 (rust/crates/cexpr-0.6.0.crate) = 6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766
+SIZE (rust/crates/cexpr-0.6.0.crate) = 17966
 SHA256 (rust/crates/cfg-if-1.0.0.crate) = baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd
 SIZE (rust/crates/cfg-if-1.0.0.crate) = 7934
 SHA256 (rust/crates/chrono-0.4.19.crate) = 670ad68c9088c2a963aaa298cb369688cf3f9465ce5e2d4ca10e6e0098a1ce73
 SIZE (rust/crates/chrono-0.4.19.crate) = 155663
-SHA256 (rust/crates/clang-sys-1.2.0.crate) = 853eda514c284c2287f4bf20ae614f8781f40a81d32ecda6e91449304dfe077c
-SIZE (rust/crates/clang-sys-1.2.0.crate) = 36874
-SHA256 (rust/crates/clap-2.33.3.crate) = 37e58ac78573c40708d45522f0d80fa2f01cc4f9b4e2bf749807255454312002
-SIZE (rust/crates/clap-2.33.3.crate) = 201925
+SHA256 (rust/crates/clang-sys-1.3.1.crate) = 4cc00842eed744b858222c4c9faf7243aafc6d33f92f96935263ef4d8a41ce21
+SIZE (rust/crates/clang-sys-1.3.1.crate) = 37840
+SHA256 (rust/crates/clap-2.34.0.crate) = a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c
+SIZE (rust/crates/clap-2.34.0.crate) = 202210
+SHA256 (rust/crates/dashmap-4.0.2.crate) = e77a43b28d0668df09411cb0bc9a8c2adc40f9a048afe863e05fd43251e8e39c
+SIZE (rust/crates/dashmap-4.0.2.crate) = 21066
+SHA256 (rust/crates/either-1.6.1.crate) = e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457
+SIZE (rust/crates/either-1.6.1.crate) = 13641
 SHA256 (rust/crates/enum-primitive-derive-0.1.2.crate) = e2b90e520ec62c1864c8c78d637acbfe8baf5f63240f2fb8165b8325c07812dd
 SIZE (rust/crates/enum-primitive-derive-0.1.2.crate) = 3607
-SHA256 (rust/crates/env_logger-0.8.4.crate) = a19187fea3ac7e84da7dacf48de0c45d63c6a76f9490dae389aead16c243fce3
-SIZE (rust/crates/env_logger-0.8.4.crate) = 33342
-SHA256 (rust/crates/funty-1.1.0.crate) = fed34cd105917e91daa4da6b3728c47b068749d6a62c59811f06ed2ac71d9da7
-SIZE (rust/crates/funty-1.1.0.crate) = 11631
+SHA256 (rust/crates/env_logger-0.9.0.crate) = 0b2cf0344971ee6c64c31be0d530793fba457d322dfec2810c453d0ef228f9c3
+SIZE (rust/crates/env_logger-0.9.0.crate) = 33573
 SHA256 (rust/crates/getrandom-0.1.16.crate) = 8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce
 SIZE (rust/crates/getrandom-0.1.16.crate) = 25077
+SHA256 (rust/crates/gimli-0.26.1.crate) = 78cc372d058dcf6d5ecd98510e7fbc9e5aec4d21de70f65fea8fecebcd881bd4
+SIZE (rust/crates/gimli-0.26.1.crate) = 716168
 SHA256 (rust/crates/glob-0.3.0.crate) = 9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574
 SIZE (rust/crates/glob-0.3.0.crate) = 18724
 SHA256 (rust/crates/hashbrown-0.11.2.crate) = ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e
@@ -51,46 +59,56 @@ SHA256 (rust/crates/hex-0.3.2.crate) = 805026a5d0141ffc30abb3be3173848ad46a1b166
 SIZE (rust/crates/hex-0.3.2.crate) = 9053
 SHA256 (rust/crates/humantime-2.1.0.crate) = 9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4
 SIZE (rust/crates/humantime-2.1.0.crate) = 16749
-SHA256 (rust/crates/indexmap-1.7.0.crate) = bc633605454125dec4b66843673f01c7df2b89479b32e0ed634e43a91cff62a5
-SIZE (rust/crates/indexmap-1.7.0.crate) = 50363
-SHA256 (rust/crates/itoa-0.4.8.crate) = b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4
-SIZE (rust/crates/itoa-0.4.8.crate) = 11926
+SHA256 (rust/crates/ijson-0.1.3.crate) = b96214564d1f12875bd9661b183d8494dd10e373cb693629536fe2f3125e254b
+SIZE (rust/crates/ijson-0.1.3.crate) = 548509
+SHA256 (rust/crates/indexmap-1.8.0.crate) = 282a6247722caba404c065016bbfa522806e51714c34f5dfc3e4a3a46fcb4223
+SIZE (rust/crates/indexmap-1.8.0.crate) = 52583
+SHA256 (rust/crates/itertools-0.10.3.crate) = a9a9d19fa1e79b6215ff29b9d6880b706147f16e9b1dbb1e4e5947b5b02bc5e3
+SIZE (rust/crates/itertools-0.10.3.crate) = 118661
+SHA256 (rust/crates/itoa-1.0.1.crate) = 1aab8fc367588b89dcee83ab0fd66b72b50b72fa1904d7095045ace2b0c81c35
+SIZE (rust/crates/itoa-1.0.1.crate) = 11059
 SHA256 (rust/crates/lazy_static-1.4.0.crate) = e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646
 SIZE (rust/crates/lazy_static-1.4.0.crate) = 10443
 SHA256 (rust/crates/lazycell-1.3.0.crate) = 830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55
 SIZE (rust/crates/lazycell-1.3.0.crate) = 12502
-SHA256 (rust/crates/libc-0.2.100.crate) = a1fa8cddc8fbbee11227ef194b5317ed014b8acbf15139bd716a18ad3fe99ec5
-SIZE (rust/crates/libc-0.2.100.crate) = 528168
-SHA256 (rust/crates/libloading-0.7.0.crate) = 6f84d96438c15fcd6c3f244c8fce01d1e2b9c6b5623e9c711dc9286d8fc92d6a
-SIZE (rust/crates/libloading-0.7.0.crate) = 26216
+SHA256 (rust/crates/libc-0.2.120.crate) = ad5c14e80759d0939d013e6ca49930e59fc53dd8e5009132f76240c179380c09
+SIZE (rust/crates/libc-0.2.120.crate) = 574677
+SHA256 (rust/crates/libloading-0.7.3.crate) = efbc0f03f9a775e9f6aed295c6a1ba2253c5757a9e03d55c6caa46a681abcddd
+SIZE (rust/crates/libloading-0.7.3.crate) = 27378
 SHA256 (rust/crates/linked-hash-map-0.5.4.crate) = 7fb9b38af92608140b86b693604b9ffcc5824240a484d1ecd4795bacb2fe88f3
 SIZE (rust/crates/linked-hash-map-0.5.4.crate) = 16166
 SHA256 (rust/crates/log-0.4.14.crate) = 51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710
 SIZE (rust/crates/log-0.4.14.crate) = 34582
 SHA256 (rust/crates/md5-0.6.1.crate) = 7e6bcd6433cff03a4bfc3d9834d504467db1f1cf6d0ea765d37d330249ed629d
 SIZE (rust/crates/md5-0.6.1.crate) = 6574
-SHA256 (rust/crates/memchr-2.3.4.crate) = 0ee1c47aaa256ecabcaea351eae4a9b01ef39ed810004e298d2511ed284b1525
-SIZE (rust/crates/memchr-2.3.4.crate) = 23077
-SHA256 (rust/crates/nom-6.2.1.crate) = 9c5c51b9083a3c620fa67a2a635d1ce7d95b897e957d6b28ff9a5da960a103a6
-SIZE (rust/crates/nom-6.2.1.crate) = 148362
+SHA256 (rust/crates/memchr-2.4.1.crate) = 308cc39be01b73d0d18f82a0e7b2a3df85245f84af96fdddc5d202d27e47b86a
+SIZE (rust/crates/memchr-2.4.1.crate) = 64977
+SHA256 (rust/crates/minimal-lexical-0.2.1.crate) = 68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a
+SIZE (rust/crates/minimal-lexical-0.2.1.crate) = 94841
+SHA256 (rust/crates/miniz_oxide-0.4.4.crate) = a92518e98c078586bc6c934028adcca4c92a53d6a958196de835170a01d84e4b
+SIZE (rust/crates/miniz_oxide-0.4.4.crate) = 49938
+SHA256 (rust/crates/nom-7.1.1.crate) = a8903e5a29a317527874d0402f867152a3d21c908bb0b933e416c65e301d4c36
+SIZE (rust/crates/nom-7.1.1.crate) = 115818
 SHA256 (rust/crates/num-integer-0.1.44.crate) = d2cc698a63b549a70bc047073d2949cce27cd1c7b0a4a862d08a8031bc2801db
 SIZE (rust/crates/num-integer-0.1.44.crate) = 22216
 SHA256 (rust/crates/num-traits-0.1.43.crate) = 92e5113e9fd4cc14ded8e499429f396a20f98c772a47cc8622a736e1ec843c31
 SIZE (rust/crates/num-traits-0.1.43.crate) = 7659
 SHA256 (rust/crates/num-traits-0.2.14.crate) = 9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290
 SIZE (rust/crates/num-traits-0.2.14.crate) = 45476
+SHA256 (rust/crates/num_cpus-1.13.1.crate) = 19e64526ebdee182341572e50e9ad03965aa510cd94427a4549448f285e957a1
+SIZE (rust/crates/num_cpus-1.13.1.crate) = 14752
+SHA256 (rust/crates/object-0.27.1.crate) = 67ac1d3f9a1d3616fd9a60c8d74296f22406a238b6a72f5cc1e6f314df4ffbf9
+SIZE (rust/crates/object-0.27.1.crate) = 228030
 SHA256 (rust/crates/peeking_take_while-0.1.2.crate) = 19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099
 SIZE (rust/crates/peeking_take_while-0.1.2.crate) = 6697
-SHA256 (rust/crates/ppv-lite86-0.2.10.crate) = ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857
-SIZE (rust/crates/ppv-lite86-0.2.10.crate) = 20915
-SHA256 (rust/crates/proc-macro2-1.0.28.crate) = 5c7ed8b8c7b886ea3ed7dde405212185f423ab44682667c8c6dd14aa1d9f6612
-SIZE (rust/crates/proc-macro2-1.0.28.crate) = 38732
+SHA256 (rust/crates/ppv-lite86-0.2.16.crate) = eb9f9e6e233e5c4a35559a617bf40a4ec447db2e84c20b55a6f83167b7e57872
+SIZE (rust/crates/ppv-lite86-0.2.16.crate) = 22245
+SHA256 (rust/crates/proc-macro2-1.0.36.crate) = c7342d5883fbccae1cc37a2353b09c87c9b0f3afd73f5fb9bba687a1f733b029
+SIZE (rust/crates/proc-macro2-1.0.36.crate) = 41411
 SHA256 (rust/crates/quote-0.3.15.crate) = 7a6e920b65c65f10b2ae65c831a81a073a89edd28c7cce89475bff467ab4167a
 SIZE (rust/crates/quote-0.3.15.crate) = 12041
-SHA256 (rust/crates/quote-1.0.9.crate) = c3d0b9745dc2debf507c8422de05d7226cc1f0644216dfdfead988f9b1ab32a7
-SIZE (rust/crates/quote-1.0.9.crate) = 25042
-SHA256 (rust/crates/radium-0.5.3.crate) = 941ba9d78d8e2f7ce474c015eea4d9c6d25b6a3327f9832ee29a4de27f91bbb8
-SIZE (rust/crates/radium-0.5.3.crate) = 7588
+SHA256 (rust/crates/quote-1.0.15.crate) = 864d3e96a899863136fc6e99f3d7cae289dafe43bf2c5ac19b70df7210c0a145
+SIZE (rust/crates/quote-1.0.15.crate) = 27281
 SHA256 (rust/crates/rand-0.7.3.crate) = 6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03
 SIZE (rust/crates/rand-0.7.3.crate) = 112246
 SHA256 (rust/crates/rand_chacha-0.2.2.crate) = f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402
@@ -99,60 +117,60 @@ SHA256 (rust/crates/rand_core-0.5.1.crate) = 90bde5296fc891b0cef12a6d03ddccc162c
 SIZE (rust/crates/rand_core-0.5.1.crate) = 21116
 SHA256 (rust/crates/rand_hc-0.2.0.crate) = ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c
 SIZE (rust/crates/rand_hc-0.2.0.crate) = 11670
-SHA256 (rust/crates/redis-module-0.23.0.crate) = aa35d4a0a162f70f156bc58fa120f45e2cd61d43a7e07130bcb6822f77501a03
-SIZE (rust/crates/redis-module-0.23.0.crate) = 47045
-SHA256 (rust/crates/regex-1.4.6.crate) = 2a26af418b574bd56588335b3a3659a65725d4e636eb1016c2f9e3b38c7cc759
-SIZE (rust/crates/regex-1.4.6.crate) = 242248
+SHA256 (rust/crates/redis-module-1.0.0.crate) = 2cb881243f9ca167fce1b38876c8d2bc84d7c657bdfe5240634ad700cbc53813
+SIZE (rust/crates/redis-module-1.0.0.crate) = 51045
+SHA256 (rust/crates/regex-1.5.5.crate) = 1a11647b6b25ff05a515cb92c365cec08801e83423a235b51e231e1808747286
+SIZE (rust/crates/regex-1.5.5.crate) = 238119
 SHA256 (rust/crates/regex-syntax-0.6.25.crate) = f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b
 SIZE (rust/crates/regex-syntax-0.6.25.crate) = 293293
+SHA256 (rust/crates/rustc-demangle-0.1.21.crate) = 7ef03e0a2b150c7a90d01faf6254c9c48a41e95fb2a8c2ac1c6f0d2b9aefc342
+SIZE (rust/crates/rustc-demangle-0.1.21.crate) = 27920
 SHA256 (rust/crates/rustc-hash-1.1.0.crate) = 08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2
 SIZE (rust/crates/rustc-hash-1.1.0.crate) = 9331
-SHA256 (rust/crates/ryu-1.0.5.crate) = 71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e
-SIZE (rust/crates/ryu-1.0.5.crate) = 49570
-SHA256 (rust/crates/serde-1.0.128.crate) = 1056a0db1978e9dbf0f6e4fca677f6f9143dc1c19de346f22cac23e422196834
-SIZE (rust/crates/serde-1.0.128.crate) = 75169
-SHA256 (rust/crates/serde_derive-1.0.128.crate) = 13af2fbb8b60a8950d6c72a56d2095c28870367cc8e10c55e9745bac4995a2c4
-SIZE (rust/crates/serde_derive-1.0.128.crate) = 54242
-SHA256 (rust/crates/serde_json-1.0.66.crate) = 336b10da19a12ad094b59d870ebde26a45402e5b470add4b5fd03c5048a32127
-SIZE (rust/crates/serde_json-1.0.66.crate) = 115121
-SHA256 (rust/crates/shlex-1.0.0.crate) = 42a568c8f2cd051a4d283bd6eb0343ac214c1b0f1ac19f93e1175b2dee38c73d
-SIZE (rust/crates/shlex-1.0.0.crate) = 4555
+SHA256 (rust/crates/rustversion-1.0.6.crate) = f2cc38e8fa666e2de3c4aba7edeb5ffc5246c1c2ed0e3d17e560aeeba736b23f
+SIZE (rust/crates/rustversion-1.0.6.crate) = 18380
+SHA256 (rust/crates/ryu-1.0.9.crate) = 73b4b750c782965c211b42f022f59af1fbceabdd026623714f104152f1ec149f
+SIZE (rust/crates/ryu-1.0.9.crate) = 48391
+SHA256 (rust/crates/serde-1.0.136.crate) = ce31e24b01e1e524df96f1c2fdd054405f8d7376249a5110886fb4b658484789
+SIZE (rust/crates/serde-1.0.136.crate) = 76158
+SHA256 (rust/crates/serde_derive-1.0.136.crate) = 08597e7152fcd306f41838ed3e37be9eaeed2b61c42e2117266a554fab4662f9
+SIZE (rust/crates/serde_derive-1.0.136.crate) = 54776
+SHA256 (rust/crates/serde_json-1.0.79.crate) = 8e8d9fa5c3b304765ce1fd9c4c8a3de2c8db365a5b91be52f186efc675681d95
+SIZE (rust/crates/serde_json-1.0.79.crate) = 144451
+SHA256 (rust/crates/shlex-1.1.0.crate) = 43b2853a4d09f215c24cc5489c992ce46052d359b5109343cbafbf26bc62f8a3
+SIZE (rust/crates/shlex-1.1.0.crate) = 5199
 SHA256 (rust/crates/strsim-0.8.0.crate) = 8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a
 SIZE (rust/crates/strsim-0.8.0.crate) = 9309
-SHA256 (rust/crates/strum_macros-0.21.1.crate) = d06aaeeee809dbc59eb4556183dd927df67db1540de5be8d3ec0b6636358a5ec
-SIZE (rust/crates/strum_macros-0.21.1.crate) = 16280
+SHA256 (rust/crates/strum_macros-0.23.1.crate) = 5bb0dc7ee9c15cea6199cde9a127fa16a4c5819af85395457ad72d68edc85a38
+SIZE (rust/crates/strum_macros-0.23.1.crate) = 18203
 SHA256 (rust/crates/syn-0.11.11.crate) = d3b891b9015c88c576343b9b3e41c2c11a51c219ef067b264bd9c8aa9b441dad
 SIZE (rust/crates/syn-0.11.11.crate) = 63309
-SHA256 (rust/crates/syn-1.0.75.crate) = b7f58f7e8eaa0009c5fec437aabf511bd9933e4b2d7407bd05273c01a8906ea7
-SIZE (rust/crates/syn-1.0.75.crate) = 233068
+SHA256 (rust/crates/syn-1.0.88.crate) = ebd69e719f31e88618baa1eaa6ee2de5c9a1c004f1e9ecdb58e8352a13f20a01
+SIZE (rust/crates/syn-1.0.88.crate) = 236112
 SHA256 (rust/crates/synom-0.11.3.crate) = a393066ed9010ebaed60b9eafa373d4b1baac186dd7e008555b0f702b51945b6
 SIZE (rust/crates/synom-0.11.3.crate) = 17120
-SHA256 (rust/crates/tap-1.0.1.crate) = 55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369
-SIZE (rust/crates/tap-1.0.1.crate) = 11316
-SHA256 (rust/crates/termcolor-1.1.2.crate) = 2dfed899f0eb03f32ee8c6a0aabdb8a7949659e3466561fc0adf54e26d88c5f4
-SIZE (rust/crates/termcolor-1.1.2.crate) = 17287
+SHA256 (rust/crates/termcolor-1.1.3.crate) = bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755
+SIZE (rust/crates/termcolor-1.1.3.crate) = 17242
 SHA256 (rust/crates/textwrap-0.11.0.crate) = d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060
 SIZE (rust/crates/textwrap-0.11.0.crate) = 17322
 SHA256 (rust/crates/time-0.1.44.crate) = 6db9e6914ab8b1ae1c260a4ae7a49b6c5611b40328a735b21862567685e73255
 SIZE (rust/crates/time-0.1.44.crate) = 28885
-SHA256 (rust/crates/unicode-segmentation-1.8.0.crate) = 8895849a949e7845e06bd6dc1aa51731a103c42707010a5b591c0038fb73385b
-SIZE (rust/crates/unicode-segmentation-1.8.0.crate) = 94011
-SHA256 (rust/crates/unicode-width-0.1.8.crate) = 9337591893a19b88d8d87f2cec1e73fad5cdfd10e5a6f349f498ad6ea2ffb1e3
-SIZE (rust/crates/unicode-width-0.1.8.crate) = 16732
+SHA256 (rust/crates/unicode-segmentation-1.9.0.crate) = 7e8820f5d777f6224dc4be3632222971ac30164d4a258d595640799554ebfd99
+SIZE (rust/crates/unicode-segmentation-1.9.0.crate) = 93241
+SHA256 (rust/crates/unicode-width-0.1.9.crate) = 3ed742d4ea2bd1176e236172c8429aaf54486e7ac098db29ffe6529e0ce50973
+SIZE (rust/crates/unicode-width-0.1.9.crate) = 16745
 SHA256 (rust/crates/unicode-xid-0.0.4.crate) = 8c1f860d7d29cf02cb2f3f359fd35991af3d30bac52c57d265a3c461074cb4dc
 SIZE (rust/crates/unicode-xid-0.0.4.crate) = 16034
 SHA256 (rust/crates/unicode-xid-0.2.2.crate) = 8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3
 SIZE (rust/crates/unicode-xid-0.2.2.crate) = 14955
 SHA256 (rust/crates/vec_map-0.8.2.crate) = f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191
 SIZE (rust/crates/vec_map-0.8.2.crate) = 14466
-SHA256 (rust/crates/version_check-0.9.3.crate) = 5fecdca9a5291cc2b8dcf7dc02453fee791a280f3743cb0905f8822ae463b3fe
-SIZE (rust/crates/version_check-0.9.3.crate) = 12547
 SHA256 (rust/crates/wasi-0.9.0+wasi-snapshot-preview1.crate) = cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519
 SIZE (rust/crates/wasi-0.9.0+wasi-snapshot-preview1.crate) = 31521
 SHA256 (rust/crates/wasi-0.10.0+wasi-snapshot-preview1.crate) = 1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f
 SIZE (rust/crates/wasi-0.10.0+wasi-snapshot-preview1.crate) = 26964
-SHA256 (rust/crates/which-3.1.1.crate) = d011071ae14a2f6671d0b74080ae0cd8ebf3a6f8c9589a2cd45f23126fe29724
-SIZE (rust/crates/which-3.1.1.crate) = 8071
+SHA256 (rust/crates/which-4.2.4.crate) = 2a5a7e487e921cf220206864a94a89b6c6905bfc19f1057fa26a4cb360e5c1d2
+SIZE (rust/crates/which-4.2.4.crate) = 9259
 SHA256 (rust/crates/winapi-0.3.9.crate) = 5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419
 SIZE (rust/crates/winapi-0.3.9.crate) = 1200382
 SHA256 (rust/crates/winapi-i686-pc-windows-gnu-0.4.0.crate) = ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6
@@ -161,9 +179,7 @@ SHA256 (rust/crates/winapi-util-0.1.5.crate) = 70ec6ce85bb158151cae5e5c87f95a8e9
 SIZE (rust/crates/winapi-util-0.1.5.crate) = 10164
 SHA256 (rust/crates/winapi-x86_64-pc-windows-gnu-0.4.0.crate) = 712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f
 SIZE (rust/crates/winapi-x86_64-pc-windows-gnu-0.4.0.crate) = 2947998
-SHA256 (rust/crates/wyz-0.2.0.crate) = 85e60b0d1b5f99db2556934e21937020776a5d31520bf169e851ac44e6420214
-SIZE (rust/crates/wyz-0.2.0.crate) = 12926
-SHA256 (RedisJSON-redisjson-90bc4a0_GH0.tar.gz) = 743a342ad1c61e38621a94f247802a04d3e0defa86a826e72ceb13bb3f57d400
-SIZE (RedisJSON-redisjson-90bc4a0_GH0.tar.gz) = 591636
-SHA256 (RedisJSON-jsonpath-14af7aa5435f3e676ceb3441ad78b9c8cb3ffa3a_GH0.tar.gz) = 1d3e33b0211b36b9a35ce3a4cd3da8d4109fcceb751131e1dd4e7fc00bb4e347
-SIZE (RedisJSON-jsonpath-14af7aa5435f3e676ceb3441ad78b9c8cb3ffa3a_GH0.tar.gz) = 448708
+SHA256 (RedisJSON-jsonpath-6da271ec44ff56db0d2e7009efc707935ee8c0f8_GH0.tar.gz) = 87b61327a8bd8671bfcc6bc470e36525136a69163b0d55677b05da5cd0e8b4b3
+SIZE (RedisJSON-jsonpath-6da271ec44ff56db0d2e7009efc707935ee8c0f8_GH0.tar.gz) = 449917
+SHA256 (RedisJSON-RedisJSON-v2.0.8_GH0.tar.gz) = 76389da7fd0643708b0450338558a6e00d62ed21e187dc0312c9185c03298d5d
+SIZE (RedisJSON-RedisJSON-v2.0.8_GH0.tar.gz) = 684059
diff --git a/databases/redisjson/files/patch-Cargo.toml b/databases/redisjson/files/patch-Cargo.toml
deleted file mode 100644
index ee6d36a74288..000000000000
--- a/databases/redisjson/files/patch-Cargo.toml
+++ /dev/null
@@ -1,11 +0,0 @@
---- Cargo.toml.orig	2021-08-30 07:17:30 UTC
-+++ Cargo.toml
-@@ -14,7 +14,7 @@ bson = "0.14"
- serde_json = "1.0"
- serde = "1.0"
- libc = "0.2"
--jsonpath_lib = { git = "https://github.com/RedisJSON/jsonpath.git", branch = "generic_json_path" }
-+jsonpath_lib = { path="../jsonpath-14af7aa5435f3e676ceb3441ad78b9c8cb3ffa3a/" }
- redis-module = { version="0.23", features = ["experimental-api"]}
- [features]
- # Workaround to allow cfg(feature = "test") in redismodue-rs dependencies:
diff --git a/databases/redisjson/pkg-descr b/databases/redisjson/pkg-descr
index 3b910f368265..78d984143922 100644
--- a/databases/redisjson/pkg-descr
+++ b/databases/redisjson/pkg-descr
@@ -8,5 +8,3 @@ Primary features:
 - Documents are stored as binary data in a tree structure, allowing
   fast access to sub-elements
 - Typed atomic operations for all JSON values types
-
-WWW: https://oss.redislabs.com/redisjson/
diff --git a/databases/replibyte/Makefile b/databases/replibyte/Makefile
new file mode 100644
index 000000000000..8a546ac3c15e
--- /dev/null
+++ b/databases/replibyte/Makefile
@@ -0,0 +1,397 @@
+PORTNAME=	replibyte
+DISTVERSIONPREFIX=	v
+DISTVERSION=	0.10.0
+PORTREVISION=	12
+CATEGORIES=	databases
+
+MAINTAINER=	yuri@FreeBSD.org
+COMMENT=	Seed your databases with your production data
+WWW=		https://www.replibyte.com/docs/introduction
+
+LICENSE=	MIT
+LICENSE_FILE=	${WRKSRC}/../LICENSE
+
+ONLY_FOR_ARCHS=		aarch64 amd64
+ONLY_FOR_ARCHS_REASON=	only these architectures are allowed for target_os="freebsd" in wasmer-vm-2.2.1/src/trap/traphandlers.rs
+
+USES=		cargo
+USE_GITHUB=	yes
+GH_ACCOUNT=	Qovery
+GH_PROJECT=	Replibyte
+
+WRKSRC_SUBDIR=	replibyte
+
+CARGO_CRATES=	addr2line-0.17.0 \
+		adler-1.0.2 \
+		aead-0.4.3 \
+		aes-0.7.5 \
+		aes-gcm-0.9.4 \
+		ahash-0.7.6 \
+		aho-corasick-0.7.18 \
+		anyhow-1.0.57 \
+		arrayref-0.3.6 \
+		arrayvec-0.5.2 \
+		atty-0.2.14 \
+		autocfg-0.1.8 \
+		autocfg-1.1.0 \
+		aws-config-0.9.0 \
+		aws-endpoint-0.9.0 \
+		aws-http-0.9.0 \
+		aws-sdk-s3-0.9.0 \
+		aws-sdk-sso-0.9.0 \
+		aws-sdk-sts-0.9.0 \
+		aws-sig-auth-0.9.0 \
+		aws-sigv4-0.9.0 \
+		aws-smithy-async-0.39.0 \
+		aws-smithy-client-0.39.0 \
+		aws-smithy-eventstream-0.39.0 \
+		aws-smithy-http-0.39.0 \
+		aws-smithy-http-tower-0.39.0 \
+		aws-smithy-json-0.39.0 \
+		aws-smithy-query-0.39.0 \
+		aws-smithy-types-0.39.0 \
+		aws-smithy-xml-0.39.0 \
+		aws-types-0.9.0 \
+		backtrace-0.3.65 \
+		base-x-0.2.10 \
+		base64-0.13.0 \
+		bitflags-1.3.2 \
+		blake2b_simd-0.5.11 \
+		bson-2.2.0 \
+		bstr-0.2.17 \
+		build_const-0.2.2 \
+		bumpalo-3.9.1 \
+		bytecheck-0.6.8 \
+		bytecheck_derive-0.6.8 \
+		byteorder-1.4.3 \
+		bytes-1.1.0 \
+		bytes-utils-0.1.2 \
+		cc-1.0.73 \
+		cfg-if-0.1.10 \
+		cfg-if-1.0.0 \
+		chrono-0.4.19 \
+		cipher-0.3.0 \
+		clap-3.1.18 \
+		clap_derive-3.1.18 \
+		clap_lex-0.2.0 \
+		cloudabi-0.0.3 \
+		console-0.15.0 \
+		console_error_panic_hook-0.1.7 \
+		const_fn-0.4.9 \
+		constant_time_eq-0.1.5 \
+		core-foundation-0.9.3 \
+		core-foundation-sys-0.8.3 \
+		cpufeatures-0.2.2 \
+		cranelift-bforest-0.76.0 \
+		cranelift-codegen-0.76.0 \
+		cranelift-codegen-meta-0.76.0 \
+		cranelift-codegen-shared-0.76.0 \
+		cranelift-entity-0.76.0 \
+		cranelift-frontend-0.76.0 \
+		crc-1.8.1 \
+		crc32fast-1.3.2 \
+		crossbeam-channel-0.5.4 \
+		crossbeam-deque-0.8.1 \
+		crossbeam-epoch-0.9.8 \
+		crossbeam-utils-0.8.8 \
+		csv-1.1.6 \
+		csv-core-0.1.10 \
+		ct-logs-0.8.0 \
+		ctr-0.8.0 \
+		ctrlc-3.2.2 \
+		darling-0.13.4 \
+		darling_core-0.13.4 \
+		darling_macro-0.13.4 \
+		dirs-1.0.5 \
+		discard-1.0.4 \
+		either-1.6.1 \
+		encode_unicode-0.3.6 \
+		encoding_rs-0.8.31 \
+		enum-iterator-0.7.0 \
+		enum-iterator-derive-0.7.0 \
+		enumset-1.0.11 \
+		enumset_derive-0.6.0 \
+		env_logger-0.9.0 \
+		failure-0.1.8 \
+		failure_derive-0.1.8 \
+		fake-2.4.3 \
+		fallible-iterator-0.2.0 \
+		fastrand-1.7.0 \
+		flate2-1.0.23 \
+		fnv-1.0.7 \
+		foreign-types-0.3.2 \
+		foreign-types-shared-0.1.1 \
+		form_urlencoded-1.0.1 \
+		fuchsia-cprng-0.1.1 \
+		futures-channel-0.3.21 \
+		futures-core-0.3.21 \
+		futures-io-0.3.21 \
+		futures-macro-0.3.21 \
+		futures-sink-0.3.21 \
+		futures-task-0.3.21 \
+		futures-util-0.3.21 \
+		generational-arena-0.2.8 \
+		generic-array-0.14.5 \
+		getrandom-0.1.16 \
+		getrandom-0.2.6 \
+		ghash-0.4.4 \
+		gimli-0.25.0 \
+		gimli-0.26.1 \
+		h2-0.3.13 \
+		hashbrown-0.11.2 \
+		hashbrown-0.12.1 \
+		heck-0.4.0 \
+		hermit-abi-0.1.19 \
+		hex-0.4.3 \
+		http-0.2.7 \
+		http-body-0.4.4 \
+		httparse-1.7.1 \
+		httpdate-1.0.2 \
+		humantime-2.1.0 \
+		hyper-0.14.18 \
+		hyper-rustls-0.22.1 \
+		hyper-tls-0.5.0 \
+		ident_case-1.0.1 \
+		idna-0.2.3 \
+		indexmap-1.8.1 \
+		indicatif-0.16.2 \
+		instant-0.1.12 \
+		ipnet-2.5.0 \
+		isolang-1.0.0 \
+		itoa-0.4.8 \
+		itoa-1.0.2 \
+		js-sys-0.3.57 \
+		lazy_static-1.4.0 \
+		leb128-0.2.5 \
+		libc-0.2.125 \
+		libloading-0.7.3 \
+		linked-hash-map-0.5.4 \
+		lock_api-0.4.7 \
+		log-0.4.17 \
+		loupe-0.1.3 \
+		loupe-derive-0.1.3 \
+		mach-0.3.2 \
+		machine-uid-0.2.0 \
+		matches-0.1.9 \
+		md5-0.7.0 \
+		memchr-2.5.0 \
+		memmap2-0.5.3 \
+		memoffset-0.6.5 \
+		memory_units-0.4.0 \
+		mime-0.3.16 \
+		miniz_oxide-0.5.1 \
+		mio-0.8.3 \
+		more-asserts-0.2.2 \
+		native-tls-0.2.10 \
+		nix-0.24.1 \
+		num-integer-0.1.45 \
+		num-traits-0.2.15 \
+		num_cpus-1.13.1 \
+		num_threads-0.1.6 \
+		number_prefix-0.4.0 \
+		object-0.28.4 \
+		once_cell-1.10.0 \
+		opaque-debug-0.3.0 \
+		openssl-0.10.40 \
+		openssl-macros-0.1.0 \
+		openssl-probe-0.1.5 \
+		openssl-sys-0.9.73 \
+		os_str_bytes-6.0.1 \
+		parking_lot-0.12.0 \
+		parking_lot_core-0.9.3 \
+		percent-encoding-2.1.0 \
+		phf-0.7.24 \
+		phf_codegen-0.7.24 \
+		phf_generator-0.7.24 \
+		phf_shared-0.7.24 \
+		pin-project-1.0.10 \
+		pin-project-internal-1.0.10 \
+		pin-project-lite-0.2.9 \
+		pin-utils-0.1.0 \
+		pkg-config-0.3.25 \
+		polyval-0.5.3 \
+		ppv-lite86-0.2.16 \
+		prettytable-rs-0.8.0 \
+		proc-macro-error-1.0.4 \
+		proc-macro-error-attr-1.0.4 \
+		proc-macro-hack-0.5.19 \
+		proc-macro2-1.0.38 \
+		ptr_meta-0.1.4 \
+		ptr_meta_derive-0.1.4 \
+		quote-1.0.18 \
+		rand-0.6.5 \
+		rand-0.8.5 \
+		rand_chacha-0.1.1 \
+		rand_chacha-0.3.1 \
+		rand_core-0.3.1 \
+		rand_core-0.4.2 \
+		rand_core-0.6.3 \
+		rand_hc-0.1.0 \
+		rand_isaac-0.1.1 \
+		rand_jitter-0.1.4 \
+		rand_os-0.1.3 \
+		rand_pcg-0.1.2 \
+		rand_xorshift-0.1.1 \
+		rayon-1.5.3 \
+		rayon-core-1.9.3 \
+		rdrand-0.4.0 \
+		redox_syscall-0.1.57 \
+		redox_syscall-0.2.13 \
+		redox_users-0.3.5 \
+		regalloc-0.0.31 \
+		regex-1.5.5 \
+		regex-automata-0.1.10 \
+		regex-syntax-0.6.25 \
+		region-3.0.0 \
+		remove_dir_all-0.5.3 \
+		rend-0.3.6 \
+		reqwest-0.11.10 \
+		ring-0.16.20 \
+		rkyv-0.7.38 \
+		rkyv_derive-0.7.38 \
+		rust-argon2-0.8.3 \
+		rustc-demangle-0.1.21 \
+		rustc-hash-1.1.0 \
+		rustc_version-0.2.3 \
+		rustc_version-0.4.0 \
+		rustls-0.19.1 \
+		rustls-0.20.5 \
+		rustls-native-certs-0.5.0 \
+		rustversion-1.0.6 \
+		ryu-1.0.10 \
+		schannel-0.1.19 \
+		scoped-tls-1.0.0 \
+		scopeguard-1.1.0 \
+		sct-0.6.1 \
+		sct-0.7.0 \
+		seahash-4.1.0 \
+		security-framework-2.6.1 \
+		security-framework-sys-2.6.1 \
+		semver-0.9.0 \
+		semver-1.0.9 \
+		semver-parser-0.7.0 \
+		serde-1.0.137 \
+		serde_bytes-0.11.6 \
+		serde_derive-1.0.137 \
+		serde_json-1.0.81 \
+		serde_urlencoded-0.7.1 \
+		serde_yaml-0.8.24 \
+		sha1-0.6.1 \
+		sha1_smol-1.0.0 \
+		signal-hook-registry-1.4.0 \
+		siphasher-0.2.3 \
+		slab-0.4.6 \
+		smallvec-1.8.0 \
+		socket2-0.4.4 \
+		spin-0.5.2 \
+		stable_deref_trait-1.2.0 \
+		standback-0.2.17 \
+		stdweb-0.4.20 \
+		stdweb-derive-0.5.3 \
+		stdweb-internal-macros-0.2.9 \
+		stdweb-internal-runtime-0.1.5 \
+		strsim-0.10.0 \
+		subtle-2.4.1 \
+		syn-1.0.94 \
+		synstructure-0.12.6 \
+		target-lexicon-0.12.3 \
+		tempfile-3.3.0 \
+		term-0.5.2 \
+		termcolor-1.1.3 \
+		terminal_size-0.1.17 \
+		textwrap-0.15.0 \
+		thiserror-1.0.31 \
+		thiserror-impl-1.0.31 \
+		time-0.1.43 \
+		time-0.2.27 \
+		time-0.3.9 \
+		time-macros-0.1.1 \
+		time-macros-impl-0.1.2 \
+		timeago-0.3.1 \
+		tinyvec-1.6.0 \
+		tinyvec_macros-0.1.0 \
+		tokio-1.18.2 \
+		tokio-macros-1.7.0 \
+		tokio-native-tls-0.3.0 \
+		tokio-rustls-0.22.0 \
+		tokio-stream-0.1.8 \
+		tokio-util-0.6.10 \
+		tokio-util-0.7.2 \
+		tower-0.4.12 \
+		tower-layer-0.3.1 \
+		tower-service-0.3.1 \
+		tracing-0.1.34 \
+		tracing-attributes-0.1.21 \
+		tracing-core-0.1.26 \
+		try-lock-0.2.3 \
+		typenum-1.15.0 \
+		unicode-bidi-0.3.8 \
+		unicode-normalization-0.1.19 \
+		unicode-width-0.1.9 \
+		unicode-xid-0.2.3 \
+		universal-hash-0.4.1 \
+		untrusted-0.7.1 \
+		url-2.2.2 \
+		urlencoding-1.3.3 \
+		uuid-0.8.2 \
+		vcpkg-0.2.15 \
+		version_check-0.9.4 \
+		want-0.3.0 \
+		wasi-0.9.0+wasi-snapshot-preview1 \
+		wasi-0.10.2+wasi-snapshot-preview1 \
+		wasi-0.11.0+wasi-snapshot-preview1 \
+		wasm-bindgen-0.2.80 \
+		wasm-bindgen-backend-0.2.80 \
+		wasm-bindgen-futures-0.4.30 \
+		wasm-bindgen-macro-0.2.80 \
+		wasm-bindgen-macro-support-0.2.80 \
+		wasm-bindgen-shared-0.2.80 \
+		wasm-bindgen-test-0.3.30 \
+		wasm-bindgen-test-macro-0.3.30 \
+		wasmer-2.2.1 \
+		wasmer-compiler-2.2.1 \
+		wasmer-compiler-cranelift-2.2.1 \
+		wasmer-derive-2.2.1 \
+		wasmer-engine-2.2.1 \
+		wasmer-engine-dylib-2.2.1 \
+		wasmer-engine-universal-2.2.1 \
+		wasmer-object-2.2.1 \
+		wasmer-types-2.2.1 \
+		wasmer-vfs-2.2.1 \
+		wasmer-vm-2.2.1 \
+		wasmer-wasi-2.2.1 \
+		wasmer-wasi-types-2.2.1 \
+		wasmparser-0.78.2 \
+		wast-40.0.0 \
+		wat-1.0.42 \
+		web-sys-0.3.57 \
+		webpki-0.21.4 \
+		webpki-0.22.0 \
+		wee_alloc-0.4.5 \
+		which-4.2.5 \
+		winapi-0.3.9 \
+		winapi-i686-pc-windows-gnu-0.4.0 \
+		winapi-util-0.1.5 \
+		winapi-x86_64-pc-windows-gnu-0.4.0 \
+		windows-sys-0.36.1 \
+		windows_aarch64_msvc-0.36.1 \
+		windows_i686_gnu-0.36.1 \
+		windows_i686_msvc-0.36.1 \
+		windows_x86_64_gnu-0.36.1 \
+		windows_x86_64_msvc-0.36.1 \
+		winreg-0.6.2 \
+		winreg-0.10.1 \
+		xmlparser-0.13.3 \
+		yaml-rust-0.4.5 \
+		zeroize-1.5.5 \
+		mongodb-schema-parser@git+https://github.com/mongodb-rust/mongodb-schema-parser.git?rev=2d489307dd70b63b216a9968f7dec7c217108b32\#2d489307dd70b63b216a9968f7dec7c217108b32
+
+OPENSSLINC=	/usr/include
+OPENSSLLIB=	/usr/lib
+
+PLIST_FILES=	bin/${PORTNAME}
+
+post-install:
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
+
+.include <bsd.port.mk>
diff --git a/databases/replibyte/distinfo b/databases/replibyte/distinfo
new file mode 100644
index 000000000000..ea49e216ef7b
--- /dev/null
+++ b/databases/replibyte/distinfo
@@ -0,0 +1,731 @@
+TIMESTAMP = 1672650987
+SHA256 (rust/crates/addr2line-0.17.0.crate) = b9ecd88a8c8378ca913a680cd98f0f13ac67383d35993f86c90a70e3f137816b
+SIZE (rust/crates/addr2line-0.17.0.crate) = 32260
+SHA256 (rust/crates/adler-1.0.2.crate) = f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe
+SIZE (rust/crates/adler-1.0.2.crate) = 12778
+SHA256 (rust/crates/aead-0.4.3.crate) = 0b613b8e1e3cf911a086f53f03bf286f52fd7a7258e4fa606f0ef220d39d8877
+SIZE (rust/crates/aead-0.4.3.crate) = 14717
+SHA256 (rust/crates/aes-0.7.5.crate) = 9e8b47f52ea9bae42228d07ec09eb676433d7c4ed1ebdf0f1d1c29ed446f1ab8
+SIZE (rust/crates/aes-0.7.5.crate) = 128544
+SHA256 (rust/crates/aes-gcm-0.9.4.crate) = df5f85a83a7d8b0442b6aa7b504b8212c1733da07b98aae43d4bc21b2cb3cdf6
+SIZE (rust/crates/aes-gcm-0.9.4.crate) = 148477
+SHA256 (rust/crates/ahash-0.7.6.crate) = fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47
+SIZE (rust/crates/ahash-0.7.6.crate) = 38030
+SHA256 (rust/crates/aho-corasick-0.7.18.crate) = 1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f
+SIZE (rust/crates/aho-corasick-0.7.18.crate) = 112923
+SHA256 (rust/crates/anyhow-1.0.57.crate) = 08f9b8508dccb7687a1d6c4ce66b2b0ecef467c94667de27d8d7fe1f8d2a9cdc
+SIZE (rust/crates/anyhow-1.0.57.crate) = 44614
+SHA256 (rust/crates/arrayref-0.3.6.crate) = a4c527152e37cf757a3f78aae5a06fbeefdb07ccc535c980a3208ee3060dd544
+SIZE (rust/crates/arrayref-0.3.6.crate) = 10035
+SHA256 (rust/crates/arrayvec-0.5.2.crate) = 23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b
+SIZE (rust/crates/arrayvec-0.5.2.crate) = 27838
+SHA256 (rust/crates/atty-0.2.14.crate) = d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8
+SIZE (rust/crates/atty-0.2.14.crate) = 5470
+SHA256 (rust/crates/autocfg-0.1.8.crate) = 0dde43e75fd43e8a1bf86103336bc699aa8d17ad1be60c76c0bdfd4828e19b78
+SIZE (rust/crates/autocfg-0.1.8.crate) = 6621
+SHA256 (rust/crates/autocfg-1.1.0.crate) = d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa
+SIZE (rust/crates/autocfg-1.1.0.crate) = 13272
+SHA256 (rust/crates/aws-config-0.9.0.crate) = 2da63196d2d0dd38667b404459a35d32562a8d83c1f46c5b789ab89ab176fd53
+SIZE (rust/crates/aws-config-0.9.0.crate) = 103901
+SHA256 (rust/crates/aws-endpoint-0.9.0.crate) = 5279590d48e92b287f864e099c7e851af03a5e184a57cec0959872cee297c7a0
+SIZE (rust/crates/aws-endpoint-0.9.0.crate) = 10087
+SHA256 (rust/crates/aws-http-0.9.0.crate) = e7046bdd807c70caf28d6dbc69b9d6d8dda1728577866d3ff3862de585b8b0eb
+SIZE (rust/crates/aws-http-0.9.0.crate) = 16101
+SHA256 (rust/crates/aws-sdk-s3-0.9.0.crate) = c4fd99b22cbdb894925468005ad55defcfe0ce294fadcc5f7be9d9119646b0de
+SIZE (rust/crates/aws-sdk-s3-0.9.0.crate) = 460464
+SHA256 (rust/crates/aws-sdk-sso-0.9.0.crate) = 96f9038b498944025a39e426ae38f64e3e8481a9d675469580e1de7397b46ed5
+SIZE (rust/crates/aws-sdk-sso-0.9.0.crate) = 29069
+SHA256 (rust/crates/aws-sdk-sts-0.9.0.crate) = e717e67debcd7f9d87563d08e7d40e3c5c28634a8badc491650d5ad2305befd3
+SIZE (rust/crates/aws-sdk-sts-0.9.0.crate) = 71852
+SHA256 (rust/crates/aws-sig-auth-0.9.0.crate) = a0e6e4ba09f502057ad6a4ebf3627f9dae8402e366cf7b36ca1c09cbff8b5834
+SIZE (rust/crates/aws-sig-auth-0.9.0.crate) = 11934
+SHA256 (rust/crates/aws-sigv4-0.9.0.crate) = ea07a5a108ee538793d681d608057218df95c5575f6c0699a1973c27a09334b2
+SIZE (rust/crates/aws-sigv4-0.9.0.crate) = 23762
+SHA256 (rust/crates/aws-smithy-async-0.39.0.crate) = 66ab5373d24e1651860240f122a8d956f7a2094d4553c78979617a7fac640030
+SIZE (rust/crates/aws-smithy-async-0.39.0.crate) = 11950
+SHA256 (rust/crates/aws-smithy-client-0.39.0.crate) = 88e8a92747322eace67f666402a5949da27675f60a2b9098b84b63edef8e6980
+SIZE (rust/crates/aws-smithy-client-0.39.0.crate) = 39040
+SHA256 (rust/crates/aws-smithy-eventstream-0.39.0.crate) = 775b1de8d55fd1cda393c3d81cb5c3dc0e1cac38170883049e2d7a8e16cefad1
+SIZE (rust/crates/aws-smithy-eventstream-0.39.0.crate) = 15795
+SHA256 (rust/crates/aws-smithy-http-0.39.0.crate) = 579d0c2ae96c700499c5330f082c4170b0535835f01eb845056324aa0abd04b4
+SIZE (rust/crates/aws-smithy-http-0.39.0.crate) = 36164
+SHA256 (rust/crates/aws-smithy-http-tower-0.39.0.crate) = 101a2e213acebe624cfb9bfc944de5e33c849e0df0f09c3d3aa3b54368dbe7af
+SIZE (rust/crates/aws-smithy-http-tower-0.39.0.crate) = 8756
+SHA256 (rust/crates/aws-smithy-json-0.39.0.crate) = bd21f28535a2538b77274aa590abfb6d37aece3281dfc4c9411c1625d3b9239e
+SIZE (rust/crates/aws-smithy-json-0.39.0.crate) = 21953
+SHA256 (rust/crates/aws-smithy-query-0.39.0.crate) = eb5a2c90311b0d20cf23212a15961cad2b76480863b1f7ce0608d9ece8dacdfb
+SIZE (rust/crates/aws-smithy-query-0.39.0.crate) = 7039
+SHA256 (rust/crates/aws-smithy-types-0.39.0.crate) = 962f2da621cd29f272636eebce39ca321c91e02bbb7eb848c4587ac14933d339
+SIZE (rust/crates/aws-smithy-types-0.39.0.crate) = 38286
+SHA256 (rust/crates/aws-smithy-xml-0.39.0.crate) = 829c7efd92b7a6d0536ceb48fd93a289ddf8763c67bffe875d82eae3f9886546
+SIZE (rust/crates/aws-smithy-xml-0.39.0.crate) = 15379
+SHA256 (rust/crates/aws-types-0.9.0.crate) = 68159725aa77553dbc6028f36d8378563cd45b18ef9cf03d1515ac469efacf13
+SIZE (rust/crates/aws-types-0.9.0.crate) = 17856
+SHA256 (rust/crates/backtrace-0.3.65.crate) = 11a17d453482a265fd5f8479f2a3f405566e6ca627837aaddb85af8b1ab8ef61
+SIZE (rust/crates/backtrace-0.3.65.crate) = 74129
+SHA256 (rust/crates/base-x-0.2.10.crate) = dc19a4937b4fbd3fe3379793130e42060d10627a360f2127802b10b87e7baf74
+SIZE (rust/crates/base-x-0.2.10.crate) = 10758
+SHA256 (rust/crates/base64-0.13.0.crate) = 904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd
+SIZE (rust/crates/base64-0.13.0.crate) = 62070
+SHA256 (rust/crates/bitflags-1.3.2.crate) = bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a
+SIZE (rust/crates/bitflags-1.3.2.crate) = 23021
+SHA256 (rust/crates/blake2b_simd-0.5.11.crate) = afa748e348ad3be8263be728124b24a24f268266f6f5d58af9d75f6a40b5c587
+SIZE (rust/crates/blake2b_simd-0.5.11.crate) = 34096
+SHA256 (rust/crates/bson-2.2.0.crate) = f60a2c7c80a7850b56df4b8e98e8e4932c34877b8add4f13e8350499cc1e4572
+SIZE (rust/crates/bson-2.2.0.crate) = 111427
+SHA256 (rust/crates/bstr-0.2.17.crate) = ba3569f383e8f1598449f1a423e72e99569137b47740b1da11ef19af3d5c3223
+SIZE (rust/crates/bstr-0.2.17.crate) = 330350
+SHA256 (rust/crates/build_const-0.2.2.crate) = b4ae4235e6dac0694637c763029ecea1a2ec9e4e06ec2729bd21ba4d9c863eb7
+SIZE (rust/crates/build_const-0.2.2.crate) = 4511
+SHA256 (rust/crates/bumpalo-3.9.1.crate) = a4a45a46ab1f2412e53d3a0ade76ffad2025804294569aae387231a0cd6e0899
+SIZE (rust/crates/bumpalo-3.9.1.crate) = 77507
+SHA256 (rust/crates/bytecheck-0.6.8.crate) = 3a31f923c2db9513e4298b72df143e6e655a759b3d6a0966df18f81223fff54f
+SIZE (rust/crates/bytecheck-0.6.8.crate) = 8120
+SHA256 (rust/crates/bytecheck_derive-0.6.8.crate) = edb17c862a905d912174daa27ae002326fff56dc8b8ada50a0a5f0976cb174f0
+SIZE (rust/crates/bytecheck_derive-0.6.8.crate) = 5045
+SHA256 (rust/crates/byteorder-1.4.3.crate) = 14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610
+SIZE (rust/crates/byteorder-1.4.3.crate) = 22512
+SHA256 (rust/crates/bytes-1.1.0.crate) = c4872d67bab6358e59559027aa3b9157c53d9358c51423c17554809a8858e0f8
+SIZE (rust/crates/bytes-1.1.0.crate) = 49640
+SHA256 (rust/crates/bytes-utils-0.1.2.crate) = 1934a3ef9cac8efde4966a92781e77713e1ba329f1d42e446c7d7eba340d8ef1
+SIZE (rust/crates/bytes-utils-0.1.2.crate) = 19658
+SHA256 (rust/crates/cc-1.0.73.crate) = 2fff2a6927b3bb87f9595d67196a70493f627687a71d87a0d692242c33f58c11
+SIZE (rust/crates/cc-1.0.73.crate) = 57880
+SHA256 (rust/crates/cfg-if-0.1.10.crate) = 4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822
+SIZE (rust/crates/cfg-if-0.1.10.crate) = 7933
+SHA256 (rust/crates/cfg-if-1.0.0.crate) = baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd
+SIZE (rust/crates/cfg-if-1.0.0.crate) = 7934
+SHA256 (rust/crates/chrono-0.4.19.crate) = 670ad68c9088c2a963aaa298cb369688cf3f9465ce5e2d4ca10e6e0098a1ce73
+SIZE (rust/crates/chrono-0.4.19.crate) = 155663
+SHA256 (rust/crates/cipher-0.3.0.crate) = 7ee52072ec15386f770805afd189a01c8841be8696bed250fa2f13c4c0d6dfb7
+SIZE (rust/crates/cipher-0.3.0.crate) = 12756
+SHA256 (rust/crates/clap-3.1.18.crate) = d2dbdf4bdacb33466e854ce889eee8dfd5729abf7ccd7664d0a2d60cd384440b
+SIZE (rust/crates/clap-3.1.18.crate) = 209664
+SHA256 (rust/crates/clap_derive-3.1.18.crate) = 25320346e922cffe59c0bbc5410c8d8784509efb321488971081313cb1e1a33c
+SIZE (rust/crates/clap_derive-3.1.18.crate) = 25521
+SHA256 (rust/crates/clap_lex-0.2.0.crate) = a37c35f1112dad5e6e0b1adaff798507497a18fceeb30cceb3bae7d1427b9213
+SIZE (rust/crates/clap_lex-0.2.0.crate) = 9581
+SHA256 (rust/crates/cloudabi-0.0.3.crate) = ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f
+SIZE (rust/crates/cloudabi-0.0.3.crate) = 22156
+SHA256 (rust/crates/console-0.15.0.crate) = a28b32d32ca44b70c3e4acd7db1babf555fa026e385fb95f18028f88848b3c31
+SIZE (rust/crates/console-0.15.0.crate) = 23507
+SHA256 (rust/crates/console_error_panic_hook-0.1.7.crate) = a06aeb73f470f66dcdbf7223caeebb85984942f22f1adb2a088cf9668146bbbc
+SIZE (rust/crates/console_error_panic_hook-0.1.7.crate) = 507196
+SHA256 (rust/crates/const_fn-0.4.9.crate) = fbdcdcb6d86f71c5e97409ad45898af11cbc995b4ee8112d59095a28d376c935
+SIZE (rust/crates/const_fn-0.4.9.crate) = 12624
+SHA256 (rust/crates/constant_time_eq-0.1.5.crate) = 245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc
+SIZE (rust/crates/constant_time_eq-0.1.5.crate) = 4936
+SHA256 (rust/crates/core-foundation-0.9.3.crate) = 194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146
+SIZE (rust/crates/core-foundation-0.9.3.crate) = 27059
+SHA256 (rust/crates/core-foundation-sys-0.8.3.crate) = 5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc
+SIZE (rust/crates/core-foundation-sys-0.8.3.crate) = 17519
+SHA256 (rust/crates/cpufeatures-0.2.2.crate) = 59a6001667ab124aebae2a495118e11d30984c3a653e99d86d58971708cf5e4b
+SIZE (rust/crates/cpufeatures-0.2.2.crate) = 10655
+SHA256 (rust/crates/cranelift-bforest-0.76.0.crate) = 7e6bea67967505247f54fa2c85cf4f6e0e31c4e5692c9b70e4ae58e339067333
+SIZE (rust/crates/cranelift-bforest-0.76.0.crate) = 30816
+SHA256 (rust/crates/cranelift-codegen-0.76.0.crate) = 48194035d2752bdd5bdae429e3ab88676e95f52a2b1355a5d4e809f9e39b1d74
+SIZE (rust/crates/cranelift-codegen-0.76.0.crate) = 835601
+SHA256 (rust/crates/cranelift-codegen-meta-0.76.0.crate) = 976efb22fcab4f2cd6bd4e9913764616a54d895c1a23530128d04e03633c555f
+SIZE (rust/crates/cranelift-codegen-meta-0.76.0.crate) = 179689
+SHA256 (rust/crates/cranelift-codegen-shared-0.76.0.crate) = 9dabb5fe66e04d4652e434195b45ae65b5c8172d520247b8f66d8df42b2b45dc
+SIZE (rust/crates/cranelift-codegen-shared-0.76.0.crate) = 12583
+SHA256 (rust/crates/cranelift-entity-0.76.0.crate) = 3329733e4d4b8e91c809efcaa4faee80bf66f20164e3dd16d707346bd3494799
+SIZE (rust/crates/cranelift-entity-0.76.0.crate) = 25261
+SHA256 (rust/crates/cranelift-frontend-0.76.0.crate) = 279afcc0d3e651b773f94837c3d581177b348c8d69e928104b2e9fccb226f921
+SIZE (rust/crates/cranelift-frontend-0.76.0.crate) = 31953
+SHA256 (rust/crates/crc-1.8.1.crate) = d663548de7f5cca343f1e0a48d14dcfb0e9eb4e079ec58883b7251539fa10aeb
+SIZE (rust/crates/crc-1.8.1.crate) = 9114
+SHA256 (rust/crates/crc32fast-1.3.2.crate) = b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d
+SIZE (rust/crates/crc32fast-1.3.2.crate) = 38661
+SHA256 (rust/crates/crossbeam-channel-0.5.4.crate) = 5aaa7bd5fb665c6864b5f963dd9097905c54125909c7aa94c9e18507cdbe6c53
+SIZE (rust/crates/crossbeam-channel-0.5.4.crate) = 88237
+SHA256 (rust/crates/crossbeam-deque-0.8.1.crate) = 6455c0ca19f0d2fbf751b908d5c55c1f5cbc65e03c4225427254b46890bdde1e
+SIZE (rust/crates/crossbeam-deque-0.8.1.crate) = 20852
+SHA256 (rust/crates/crossbeam-epoch-0.9.8.crate) = 1145cf131a2c6ba0615079ab6a638f7e1973ac9c2634fcbeaaad6114246efe8c
+SIZE (rust/crates/crossbeam-epoch-0.9.8.crate) = 46012
+SHA256 (rust/crates/crossbeam-utils-0.8.8.crate) = 0bf124c720b7686e3c2663cf54062ab0f68a88af2fb6a030e87e30bf721fcb38
+SIZE (rust/crates/crossbeam-utils-0.8.8.crate) = 39681
+SHA256 (rust/crates/csv-1.1.6.crate) = 22813a6dc45b335f9bade10bf7271dc477e81113e89eb251a0bc2a8a81c536e1
+SIZE (rust/crates/csv-1.1.6.crate) = 886999
+SHA256 (rust/crates/csv-core-0.1.10.crate) = 2b2466559f260f48ad25fe6317b3c8dac77b5bdb5763ac7d9d6103530663bc90
+SIZE (rust/crates/csv-core-0.1.10.crate) = 25668
+SHA256 (rust/crates/ct-logs-0.8.0.crate) = c1a816186fa68d9e426e3cb4ae4dff1fcd8e4a2c34b781bf7a822574a0d0aac8
+SIZE (rust/crates/ct-logs-0.8.0.crate) = 19766
+SHA256 (rust/crates/ctr-0.8.0.crate) = 049bb91fb4aaf0e3c7efa6cd5ef877dbbbd15b39dad06d9948de4ec8a75761ea
+SIZE (rust/crates/ctr-0.8.0.crate) = 17740
+SHA256 (rust/crates/ctrlc-3.2.2.crate) = b37feaa84e6861e00a1f5e5aa8da3ee56d605c9992d33e082786754828e20865
+SIZE (rust/crates/ctrlc-3.2.2.crate) = 12699
+SHA256 (rust/crates/darling-0.13.4.crate) = a01d95850c592940db9b8194bc39f4bc0e89dee5c4265e4b1807c34a9aba453c
+SIZE (rust/crates/darling-0.13.4.crate) = 20895
+SHA256 (rust/crates/darling_core-0.13.4.crate) = 859d65a907b6852c9361e3185c862aae7fafd2887876799fa55f5f99dc40d610
+SIZE (rust/crates/darling_core-0.13.4.crate) = 52937
+SHA256 (rust/crates/darling_macro-0.13.4.crate) = 9c972679f83bdf9c42bd905396b6c3588a843a17f0f16dfcfa3e2c5d57441835
+SIZE (rust/crates/darling_macro-0.13.4.crate) = 1910
+SHA256 (rust/crates/dirs-1.0.5.crate) = 3fd78930633bd1c6e35c4b42b1df7b0cbc6bc191146e512bb3bedf243fcc3901
+SIZE (rust/crates/dirs-1.0.5.crate) = 12908
+SHA256 (rust/crates/discard-1.0.4.crate) = 212d0f5754cb6769937f4501cc0e67f4f4483c8d2c3e1e922ee9edbe4ab4c7c0
+SIZE (rust/crates/discard-1.0.4.crate) = 4700
+SHA256 (rust/crates/either-1.6.1.crate) = e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457
+SIZE (rust/crates/either-1.6.1.crate) = 13641
+SHA256 (rust/crates/encode_unicode-0.3.6.crate) = a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f
+SIZE (rust/crates/encode_unicode-0.3.6.crate) = 45741
+SHA256 (rust/crates/encoding_rs-0.8.31.crate) = 9852635589dc9f9ea1b6fe9f05b50ef208c85c834a562f0c6abb1c475736ec2b
+SIZE (rust/crates/encoding_rs-0.8.31.crate) = 1370113
+SHA256 (rust/crates/enum-iterator-0.7.0.crate) = 4eeac5c5edb79e4e39fe8439ef35207780a11f69c52cbe424ce3dfad4cb78de6
+SIZE (rust/crates/enum-iterator-0.7.0.crate) = 1783
+SHA256 (rust/crates/enum-iterator-derive-0.7.0.crate) = c134c37760b27a871ba422106eedbb8247da973a09e82558bf26d619c882b159
+SIZE (rust/crates/enum-iterator-derive-0.7.0.crate) = 2431
+SHA256 (rust/crates/enumset-1.0.11.crate) = 4799cdb24d48f1f8a7a98d06b7fde65a85a2d1e42b25a889f5406aa1fbefe074
+SIZE (rust/crates/enumset-1.0.11.crate) = 20347
+SHA256 (rust/crates/enumset_derive-0.6.0.crate) = ea83a3fbdc1d999ccfbcbee717eab36f8edf2d71693a23ce0d7cca19e085304c
+SIZE (rust/crates/enumset_derive-0.6.0.crate) = 10706
+SHA256 (rust/crates/env_logger-0.9.0.crate) = 0b2cf0344971ee6c64c31be0d530793fba457d322dfec2810c453d0ef228f9c3
+SIZE (rust/crates/env_logger-0.9.0.crate) = 33573
+SHA256 (rust/crates/failure-0.1.8.crate) = d32e9bd16cc02eae7db7ef620b392808b89f6a5e16bb3497d159c6b92a0f4f86
+SIZE (rust/crates/failure-0.1.8.crate) = 37582
+SHA256 (rust/crates/failure_derive-0.1.8.crate) = aa4da3c766cd7a0db8242e326e9e4e081edd567072893ed320008189715366a4
+SIZE (rust/crates/failure_derive-0.1.8.crate) = 4950
+SHA256 (rust/crates/fake-2.4.3.crate) = 21a8531dd3a64fd1cfbe92fad4160bc2060489c6195fe847e045e5788f710bae
+SIZE (rust/crates/fake-2.4.3.crate) = 81721
+SHA256 (rust/crates/fallible-iterator-0.2.0.crate) = 4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7
+SIZE (rust/crates/fallible-iterator-0.2.0.crate) = 18509
+SHA256 (rust/crates/fastrand-1.7.0.crate) = c3fcf0cee53519c866c09b5de1f6c56ff9d647101f81c1964fa632e148896cdf
+SIZE (rust/crates/fastrand-1.7.0.crate) = 11265
+SHA256 (rust/crates/flate2-1.0.23.crate) = b39522e96686d38f4bc984b9198e3a0613264abaebaff2c5c918bfa6b6da09af
+SIZE (rust/crates/flate2-1.0.23.crate) = 70440
+SHA256 (rust/crates/fnv-1.0.7.crate) = 3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1
+SIZE (rust/crates/fnv-1.0.7.crate) = 11266
+SHA256 (rust/crates/foreign-types-0.3.2.crate) = f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1
+SIZE (rust/crates/foreign-types-0.3.2.crate) = 7504
+SHA256 (rust/crates/foreign-types-shared-0.1.1.crate) = 00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b
+SIZE (rust/crates/foreign-types-shared-0.1.1.crate) = 5672
+SHA256 (rust/crates/form_urlencoded-1.0.1.crate) = 5fc25a87fa4fd2094bffb06925852034d90a17f0d1e05197d4956d3555752191
+SIZE (rust/crates/form_urlencoded-1.0.1.crate) = 8773
+SHA256 (rust/crates/fuchsia-cprng-0.1.1.crate) = a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba
+SIZE (rust/crates/fuchsia-cprng-0.1.1.crate) = 2950
+SHA256 (rust/crates/futures-channel-0.3.21.crate) = c3083ce4b914124575708913bca19bfe887522d6e2e6d0952943f5eac4a74010
+SIZE (rust/crates/futures-channel-0.3.21.crate) = 31961
+SHA256 (rust/crates/futures-core-0.3.21.crate) = 0c09fd04b7e4073ac7156a9539b57a484a8ea920f79c7c675d05d289ab6110d3
+SIZE (rust/crates/futures-core-0.3.21.crate) = 14601
+SHA256 (rust/crates/futures-io-0.3.21.crate) = fc4045962a5a5e935ee2fdedaa4e08284547402885ab326734432bed5d12966b
+SIZE (rust/crates/futures-io-0.3.21.crate) = 8902
+SHA256 (rust/crates/futures-macro-0.3.21.crate) = 33c1e13800337f4d4d7a316bf45a567dbcb6ffe087f16424852d97e97a91f512
+SIZE (rust/crates/futures-macro-0.3.21.crate) = 11250
+SHA256 (rust/crates/futures-sink-0.3.21.crate) = 21163e139fa306126e6eedaf49ecdb4588f939600f0b1e770f4205ee4b7fa868
+SIZE (rust/crates/futures-sink-0.3.21.crate) = 7843
+SHA256 (rust/crates/futures-task-0.3.21.crate) = 57c66a976bf5909d801bbef33416c41372779507e7a6b3a5e25e4749c58f776a
+SIZE (rust/crates/futures-task-0.3.21.crate) = 11815
+SHA256 (rust/crates/futures-util-0.3.21.crate) = d8b7abd5d659d9b90c8cba917f6ec750a74e2dc23902ef9cd4cc8c8b22e6036a
+SIZE (rust/crates/futures-util-0.3.21.crate) = 153768
+SHA256 (rust/crates/generational-arena-0.2.8.crate) = 8e1d3b771574f62d0548cee0ad9057857e9fc25d7a3335f140c84f6acd0bf601
+SIZE (rust/crates/generational-arena-0.2.8.crate) = 20899
+SHA256 (rust/crates/generic-array-0.14.5.crate) = fd48d33ec7f05fbfa152300fdad764757cbded343c1aa1cff2fbaf4134851803
+SIZE (rust/crates/generic-array-0.14.5.crate) = 28915
+SHA256 (rust/crates/getrandom-0.1.16.crate) = 8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce
+SIZE (rust/crates/getrandom-0.1.16.crate) = 25077
+SHA256 (rust/crates/getrandom-0.2.6.crate) = 9be70c98951c83b8d2f8f60d7065fa6d5146873094452a1008da8c2f1e4205ad
+SIZE (rust/crates/getrandom-0.2.6.crate) = 28043
+SHA256 (rust/crates/ghash-0.4.4.crate) = 1583cc1656d7839fd3732b80cf4f38850336cdb9b8ded1cd399ca62958de3c99
+SIZE (rust/crates/ghash-0.4.4.crate) = 9005
+SHA256 (rust/crates/gimli-0.25.0.crate) = f0a01e0497841a3b2db4f8afa483cce65f7e96a3498bd6c541734792aeac8fe7
+SIZE (rust/crates/gimli-0.25.0.crate) = 705238
+SHA256 (rust/crates/gimli-0.26.1.crate) = 78cc372d058dcf6d5ecd98510e7fbc9e5aec4d21de70f65fea8fecebcd881bd4
+SIZE (rust/crates/gimli-0.26.1.crate) = 716168
+SHA256 (rust/crates/h2-0.3.13.crate) = 37a82c6d637fc9515a4694bbf1cb2457b79d81ce52b3108bdeea58b07dd34a57
+SIZE (rust/crates/h2-0.3.13.crate) = 161962
+SHA256 (rust/crates/hashbrown-0.11.2.crate) = ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e
+SIZE (rust/crates/hashbrown-0.11.2.crate) = 85713
+SHA256 (rust/crates/hashbrown-0.12.1.crate) = db0d4cf898abf0081f964436dc980e96670a0f36863e4b83aaacdb65c9d7ccc3
+SIZE (rust/crates/hashbrown-0.12.1.crate) = 90855
+SHA256 (rust/crates/heck-0.4.0.crate) = 2540771e65fc8cb83cd6e8a237f70c319bd5c29f78ed1084ba5d50eeac86f7f9
+SIZE (rust/crates/heck-0.4.0.crate) = 11161
+SHA256 (rust/crates/hermit-abi-0.1.19.crate) = 62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33
+SIZE (rust/crates/hermit-abi-0.1.19.crate) = 9979
+SHA256 (rust/crates/hex-0.4.3.crate) = 7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70
+SIZE (rust/crates/hex-0.4.3.crate) = 13299
+SHA256 (rust/crates/http-0.2.7.crate) = ff8670570af52249509a86f5e3e18a08c60b177071826898fde8997cf5f6bfbb
+SIZE (rust/crates/http-0.2.7.crate) = 104219
+SHA256 (rust/crates/http-body-0.4.4.crate) = 1ff4f84919677303da5f147645dbea6b1881f368d03ac84e1dc09031ebd7b2c6
+SIZE (rust/crates/http-body-0.4.4.crate) = 7836
+SHA256 (rust/crates/httparse-1.7.1.crate) = 496ce29bb5a52785b44e0f7ca2847ae0bb839c9bd28f69acac9b99d461c0c04c
+SIZE (rust/crates/httparse-1.7.1.crate) = 29379
+SHA256 (rust/crates/httpdate-1.0.2.crate) = c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421
+SIZE (rust/crates/httpdate-1.0.2.crate) = 10673
+SHA256 (rust/crates/humantime-2.1.0.crate) = 9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4
+SIZE (rust/crates/humantime-2.1.0.crate) = 16749
+SHA256 (rust/crates/hyper-0.14.18.crate) = b26ae0a80afebe130861d90abf98e3814a4f28a4c6ffeb5ab8ebb2be311e0ef2
+SIZE (rust/crates/hyper-0.14.18.crate) = 179660
+SHA256 (rust/crates/hyper-rustls-0.22.1.crate) = 5f9f7a97316d44c0af9b0301e65010573a853a9fc97046d7331d7f6bc0fd5a64
+SIZE (rust/crates/hyper-rustls-0.22.1.crate) = 26718
+SHA256 (rust/crates/hyper-tls-0.5.0.crate) = d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905
+SIZE (rust/crates/hyper-tls-0.5.0.crate) = 13257
+SHA256 (rust/crates/ident_case-1.0.1.crate) = b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39
+SIZE (rust/crates/ident_case-1.0.1.crate) = 3492
+SHA256 (rust/crates/idna-0.2.3.crate) = 418a0a6fab821475f634efe3ccc45c013f742efe03d853e8d3355d5cb850ecf8
+SIZE (rust/crates/idna-0.2.3.crate) = 271023
+SHA256 (rust/crates/indexmap-1.8.1.crate) = 0f647032dfaa1f8b6dc29bd3edb7bbef4861b8b8007ebb118d6db284fd59f6ee
+SIZE (rust/crates/indexmap-1.8.1.crate) = 53220
+SHA256 (rust/crates/indicatif-0.16.2.crate) = 2d207dc617c7a380ab07ff572a6e52fa202a2a8f355860ac9c38e23f8196be1b
+SIZE (rust/crates/indicatif-0.16.2.crate) = 35057
+SHA256 (rust/crates/instant-0.1.12.crate) = 7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c
+SIZE (rust/crates/instant-0.1.12.crate) = 6128
+SHA256 (rust/crates/ipnet-2.5.0.crate) = 879d54834c8c76457ef4293a689b2a8c59b076067ad77b15efafbb05f92a592b
+SIZE (rust/crates/ipnet-2.5.0.crate) = 25808
+SHA256 (rust/crates/isolang-1.0.0.crate) = 265ef164908329e47e753c769b14cbb27434abf0c41984dca201484022f09ce5
+SIZE (rust/crates/isolang-1.0.0.crate) = 72781
+SHA256 (rust/crates/itoa-0.4.8.crate) = b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4
+SIZE (rust/crates/itoa-0.4.8.crate) = 11926
+SHA256 (rust/crates/itoa-1.0.2.crate) = 112c678d4050afce233f4f2852bb2eb519230b3cf12f33585275537d7e41578d
+SIZE (rust/crates/itoa-1.0.2.crate) = 11112
+SHA256 (rust/crates/js-sys-0.3.57.crate) = 671a26f820db17c2a2750743f1dd03bafd15b98c9f30c7c2628c024c05d73397
+SIZE (rust/crates/js-sys-0.3.57.crate) = 78605
+SHA256 (rust/crates/lazy_static-1.4.0.crate) = e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646
+SIZE (rust/crates/lazy_static-1.4.0.crate) = 10443
+SHA256 (rust/crates/leb128-0.2.5.crate) = 884e2677b40cc8c339eaefcb701c32ef1fd2493d71118dc0ca4b6a736c93bd67
+SIZE (rust/crates/leb128-0.2.5.crate) = 11843
+SHA256 (rust/crates/libc-0.2.125.crate) = 5916d2ae698f6de9bfb891ad7a8d65c09d232dc58cc4ac433c7da3b2fd84bc2b
+SIZE (rust/crates/libc-0.2.125.crate) = 589236
+SHA256 (rust/crates/libloading-0.7.3.crate) = efbc0f03f9a775e9f6aed295c6a1ba2253c5757a9e03d55c6caa46a681abcddd
+SIZE (rust/crates/libloading-0.7.3.crate) = 27378
+SHA256 (rust/crates/linked-hash-map-0.5.4.crate) = 7fb9b38af92608140b86b693604b9ffcc5824240a484d1ecd4795bacb2fe88f3
+SIZE (rust/crates/linked-hash-map-0.5.4.crate) = 16166
+SHA256 (rust/crates/lock_api-0.4.7.crate) = 327fa5b6a6940e4699ec49a9beae1ea4845c6bab9314e4f84ac68742139d8c53
+SIZE (rust/crates/lock_api-0.4.7.crate) = 25371
+SHA256 (rust/crates/log-0.4.17.crate) = abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e
+SIZE (rust/crates/log-0.4.17.crate) = 38028
+SHA256 (rust/crates/loupe-0.1.3.crate) = 9b6a72dfa44fe15b5e76b94307eeb2ff995a8c5b283b55008940c02e0c5b634d
+SIZE (rust/crates/loupe-0.1.3.crate) = 9650
+SHA256 (rust/crates/loupe-derive-0.1.3.crate) = c0fbfc88337168279f2e9ae06e157cfed4efd3316e14dc96ed074d4f2e6c5952
+SIZE (rust/crates/loupe-derive-0.1.3.crate) = 3127
+SHA256 (rust/crates/mach-0.3.2.crate) = b823e83b2affd8f40a9ee8c29dbc56404c1e34cd2710921f2801e2cf29527afa
+SIZE (rust/crates/mach-0.3.2.crate) = 19611
+SHA256 (rust/crates/machine-uid-0.2.0.crate) = 1f1595709b0a7386bcd56ba34d250d626e5503917d05d32cdccddcd68603e212
+SIZE (rust/crates/machine-uid-0.2.0.crate) = 4352
+SHA256 (rust/crates/matches-0.1.9.crate) = a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f
+SIZE (rust/crates/matches-0.1.9.crate) = 2246
+SHA256 (rust/crates/md5-0.7.0.crate) = 490cc448043f947bae3cbee9c203358d62dbee0db12107a74be5c30ccfd09771
+SIZE (rust/crates/md5-0.7.0.crate) = 6671
+SHA256 (rust/crates/memchr-2.5.0.crate) = 2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d
+SIZE (rust/crates/memchr-2.5.0.crate) = 65812
+SHA256 (rust/crates/memmap2-0.5.3.crate) = 057a3db23999c867821a7a59feb06a578fcb03685e983dff90daf9e7d24ac08f
+SIZE (rust/crates/memmap2-0.5.3.crate) = 24967
+SHA256 (rust/crates/memoffset-0.6.5.crate) = 5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce
+SIZE (rust/crates/memoffset-0.6.5.crate) = 7686
+SHA256 (rust/crates/memory_units-0.4.0.crate) = 8452105ba047068f40ff7093dd1d9da90898e63dd61736462e9cdda6a90ad3c3
+SIZE (rust/crates/memory_units-0.4.0.crate) = 8824
+SHA256 (rust/crates/mime-0.3.16.crate) = 2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d
+SIZE (rust/crates/mime-0.3.16.crate) = 15206
+SHA256 (rust/crates/miniz_oxide-0.5.1.crate) = d2b29bd4bc3f33391105ebee3589c19197c4271e3e5a9ec9bfe8127eeff8f082
+SIZE (rust/crates/miniz_oxide-0.5.1.crate) = 52418
+SHA256 (rust/crates/mio-0.8.3.crate) = 713d550d9b44d89174e066b7a6217ae06234c10cb47819a88290d2b353c31799
+SIZE (rust/crates/mio-0.8.3.crate) = 92506
+SHA256 (rust/crates/more-asserts-0.2.2.crate) = 7843ec2de400bcbc6a6328c958dc38e5359da6e93e72e37bc5246bf1ae776389
+SIZE (rust/crates/more-asserts-0.2.2.crate) = 7033
+SHA256 (rust/crates/native-tls-0.2.10.crate) = fd7e2f3618557f980e0b17e8856252eee3c97fa12c54dff0ca290fb6266ca4a9
+SIZE (rust/crates/native-tls-0.2.10.crate) = 28590
+SHA256 (rust/crates/nix-0.24.1.crate) = 8f17df307904acd05aa8e32e97bb20f2a0df1728bbc2d771ae8f9a90463441e9
+SIZE (rust/crates/nix-0.24.1.crate) = 263506
+SHA256 (rust/crates/num-integer-0.1.45.crate) = 225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9
+SIZE (rust/crates/num-integer-0.1.45.crate) = 22529
+SHA256 (rust/crates/num-traits-0.2.15.crate) = 578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd
+SIZE (rust/crates/num-traits-0.2.15.crate) = 49262
+SHA256 (rust/crates/num_cpus-1.13.1.crate) = 19e64526ebdee182341572e50e9ad03965aa510cd94427a4549448f285e957a1
+SIZE (rust/crates/num_cpus-1.13.1.crate) = 14752
+SHA256 (rust/crates/num_threads-0.1.6.crate) = 2819ce041d2ee131036f4fc9d6ae7ae125a3a40e97ba64d04fe799ad9dabbb44
+SIZE (rust/crates/num_threads-0.1.6.crate) = 7334
+SHA256 (rust/crates/number_prefix-0.4.0.crate) = 830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3
+SIZE (rust/crates/number_prefix-0.4.0.crate) = 6922
+SHA256 (rust/crates/object-0.28.4.crate) = e42c982f2d955fac81dd7e1d0e1426a7d702acd9c98d19ab01083a6a0328c424
+SIZE (rust/crates/object-0.28.4.crate) = 237248
+SHA256 (rust/crates/once_cell-1.10.0.crate) = 87f3e037eac156d1775da914196f0f37741a274155e34a0b7e427c35d2a2ecb9
+SIZE (rust/crates/once_cell-1.10.0.crate) = 30414
+SHA256 (rust/crates/opaque-debug-0.3.0.crate) = 624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5
+SIZE (rust/crates/opaque-debug-0.3.0.crate) = 5767
+SHA256 (rust/crates/openssl-0.10.40.crate) = fb81a6430ac911acb25fe5ac8f1d2af1b4ea8a4fdfda0f1ee4292af2e2d8eb0e
+SIZE (rust/crates/openssl-0.10.40.crate) = 217120
+SHA256 (rust/crates/openssl-macros-0.1.0.crate) = b501e44f11665960c7e7fcf062c7d96a14ade4aa98116c004b2e37b5be7d736c
+SIZE (rust/crates/openssl-macros-0.1.0.crate) = 5566
+SHA256 (rust/crates/openssl-probe-0.1.5.crate) = ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf
+SIZE (rust/crates/openssl-probe-0.1.5.crate) = 7227
+SHA256 (rust/crates/openssl-sys-0.9.73.crate) = 9d5fd19fb3e0a8191c1e34935718976a3e70c112ab9a24af6d7cadccd9d90bc0
+SIZE (rust/crates/openssl-sys-0.9.73.crate) = 59581
+SHA256 (rust/crates/os_str_bytes-6.0.1.crate) = 029d8d0b2f198229de29dca79676f2738ff952edf3fde542eb8bf94d8c21b435
+SIZE (rust/crates/os_str_bytes-6.0.1.crate) = 21079
+SHA256 (rust/crates/parking_lot-0.12.0.crate) = 87f5ec2493a61ac0506c0f4199f99070cbe83857b0337006a30f3e6719b8ef58
+SIZE (rust/crates/parking_lot-0.12.0.crate) = 39761
+SHA256 (rust/crates/parking_lot_core-0.9.3.crate) = 09a279cbf25cb0757810394fbc1e359949b59e348145c643a939a525692e6929
+SIZE (rust/crates/parking_lot_core-0.9.3.crate) = 32256
+SHA256 (rust/crates/percent-encoding-2.1.0.crate) = d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e
+SIZE (rust/crates/percent-encoding-2.1.0.crate) = 9748
+SHA256 (rust/crates/phf-0.7.24.crate) = b3da44b85f8e8dfaec21adae67f95d93244b2ecf6ad2a692320598dcc8e6dd18
+SIZE (rust/crates/phf-0.7.24.crate) = 4318
+SHA256 (rust/crates/phf_codegen-0.7.24.crate) = b03e85129e324ad4166b06b2c7491ae27fe3ec353af72e72cd1654c7225d517e
+SIZE (rust/crates/phf_codegen-0.7.24.crate) = 2946
+SHA256 (rust/crates/phf_generator-0.7.24.crate) = 09364cc93c159b8b06b1f4dd8a4398984503483891b0c26b867cf431fb132662
+SIZE (rust/crates/phf_generator-0.7.24.crate) = 2261
+SHA256 (rust/crates/phf_shared-0.7.24.crate) = 234f71a15de2288bcb7e3b6515828d22af7ec8598ee6d24c3b526fa0a80b67a0
+SIZE (rust/crates/phf_shared-0.7.24.crate) = 2170
+SHA256 (rust/crates/pin-project-1.0.10.crate) = 58ad3879ad3baf4e44784bc6a718a8698867bb991f8ce24d1bcbe2cfb4c3a75e
+SIZE (rust/crates/pin-project-1.0.10.crate) = 56366
+SHA256 (rust/crates/pin-project-internal-1.0.10.crate) = 744b6f092ba29c3650faf274db506afd39944f48420f6c86b17cfe0ee1cb36bb
+SIZE (rust/crates/pin-project-internal-1.0.10.crate) = 27913
+SHA256 (rust/crates/pin-project-lite-0.2.9.crate) = e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116
+SIZE (rust/crates/pin-project-lite-0.2.9.crate) = 27713
+SHA256 (rust/crates/pin-utils-0.1.0.crate) = 8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184
+SIZE (rust/crates/pin-utils-0.1.0.crate) = 7580
+SHA256 (rust/crates/pkg-config-0.3.25.crate) = 1df8c4ec4b0627e53bdf214615ad287367e482558cf84b109250b37464dc03ae
+SIZE (rust/crates/pkg-config-0.3.25.crate) = 16838
+SHA256 (rust/crates/polyval-0.5.3.crate) = 8419d2b623c7c0896ff2d5d96e2cb4ede590fed28fcc34934f4c33c036e620a1
+SIZE (rust/crates/polyval-0.5.3.crate) = 17368
+SHA256 (rust/crates/ppv-lite86-0.2.16.crate) = eb9f9e6e233e5c4a35559a617bf40a4ec447db2e84c20b55a6f83167b7e57872
+SIZE (rust/crates/ppv-lite86-0.2.16.crate) = 22245
+SHA256 (rust/crates/prettytable-rs-0.8.0.crate) = 0fd04b170004fa2daccf418a7f8253aaf033c27760b5f225889024cf66d7ac2e
+SIZE (rust/crates/prettytable-rs-0.8.0.crate) = 29000
+SHA256 (rust/crates/proc-macro-error-1.0.4.crate) = da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c
+SIZE (rust/crates/proc-macro-error-1.0.4.crate) = 25293
+SHA256 (rust/crates/proc-macro-error-attr-1.0.4.crate) = a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869
+SIZE (rust/crates/proc-macro-error-attr-1.0.4.crate) = 7971
+SHA256 (rust/crates/proc-macro-hack-0.5.19.crate) = dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5
+SIZE (rust/crates/proc-macro-hack-0.5.19.crate) = 15556
+SHA256 (rust/crates/proc-macro2-1.0.38.crate) = 9027b48e9d4c9175fa2218adf3557f91c1137021739951d4932f5f8268ac48aa
+SIZE (rust/crates/proc-macro2-1.0.38.crate) = 41687
+SHA256 (rust/crates/ptr_meta-0.1.4.crate) = 0738ccf7ea06b608c10564b31debd4f5bc5e197fc8bfe088f68ae5ce81e7a4f1
+SIZE (rust/crates/ptr_meta-0.1.4.crate) = 5754
+SHA256 (rust/crates/ptr_meta_derive-0.1.4.crate) = 16b845dbfca988fa33db069c0e230574d15a3088f147a87b64c7589eb662c9ac
+SIZE (rust/crates/ptr_meta_derive-0.1.4.crate) = 2302
+SHA256 (rust/crates/quote-1.0.18.crate) = a1feb54ed693b93a84e14094943b84b7c4eae204c512b7ccb95ab0c66d278ad1
+SIZE (rust/crates/quote-1.0.18.crate) = 28911
+SHA256 (rust/crates/rand-0.6.5.crate) = 6d71dacdc3c88c1fde3885a3be3fbab9f35724e6ce99467f7d9c5026132184ca
+SIZE (rust/crates/rand-0.6.5.crate) = 104814
+SHA256 (rust/crates/rand-0.8.5.crate) = 34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404
+SIZE (rust/crates/rand-0.8.5.crate) = 87113
+SHA256 (rust/crates/rand_chacha-0.1.1.crate) = 556d3a1ca6600bfcbab7c7c91ccb085ac7fbbcd70e008a98742e7847f4f7bcef
+SIZE (rust/crates/rand_chacha-0.1.1.crate) = 11703
+SHA256 (rust/crates/rand_chacha-0.3.1.crate) = e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88
+SIZE (rust/crates/rand_chacha-0.3.1.crate) = 15251
+SHA256 (rust/crates/rand_core-0.3.1.crate) = 7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b
+SIZE (rust/crates/rand_core-0.3.1.crate) = 15483
+SHA256 (rust/crates/rand_core-0.4.2.crate) = 9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc
+SIZE (rust/crates/rand_core-0.4.2.crate) = 20243
+SHA256 (rust/crates/rand_core-0.6.3.crate) = d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7
+SIZE (rust/crates/rand_core-0.6.3.crate) = 21938
+SHA256 (rust/crates/rand_hc-0.1.0.crate) = 7b40677c7be09ae76218dc623efbf7b18e34bced3f38883af07bb75630a21bc4
+SIZE (rust/crates/rand_hc-0.1.0.crate) = 11644
+SHA256 (rust/crates/rand_isaac-0.1.1.crate) = ded997c9d5f13925be2a6fd7e66bf1872597f759fd9dd93513dd7e92e5a5ee08
+SIZE (rust/crates/rand_isaac-0.1.1.crate) = 16020
+SHA256 (rust/crates/rand_jitter-0.1.4.crate) = 1166d5c91dc97b88d1decc3285bb0a99ed84b05cfd0bc2341bdf2d43fc41e39b
+SIZE (rust/crates/rand_jitter-0.1.4.crate) = 18409
+SHA256 (rust/crates/rand_os-0.1.3.crate) = 7b75f676a1e053fc562eafbb47838d67c84801e38fc1ba459e8f180deabd5071
+SIZE (rust/crates/rand_os-0.1.3.crate) = 18965
+SHA256 (rust/crates/rand_pcg-0.1.2.crate) = abf9b09b01790cfe0364f52bf32995ea3c39f4d2dd011eac241d2914146d0b44
+SIZE (rust/crates/rand_pcg-0.1.2.crate) = 10844
+SHA256 (rust/crates/rand_xorshift-0.1.1.crate) = cbf7e9e623549b0e21f6e97cf8ecf247c1a8fd2e8a992ae265314300b2455d5c
+SIZE (rust/crates/rand_xorshift-0.1.1.crate) = 8997
+SHA256 (rust/crates/rayon-1.5.3.crate) = bd99e5772ead8baa5215278c9b15bf92087709e9c1b2d1f97cdb5a183c933a7d
+SIZE (rust/crates/rayon-1.5.3.crate) = 167246
+SHA256 (rust/crates/rayon-core-1.9.3.crate) = 258bcdb5ac6dad48491bb2992db6b7cf74878b0384908af124823d118c99683f
+SIZE (rust/crates/rayon-core-1.9.3.crate) = 65300
+SHA256 (rust/crates/rdrand-0.4.0.crate) = 678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2
+SIZE (rust/crates/rdrand-0.4.0.crate) = 6456
+SHA256 (rust/crates/redox_syscall-0.1.57.crate) = 41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce
+SIZE (rust/crates/redox_syscall-0.1.57.crate) = 17087
+SHA256 (rust/crates/redox_syscall-0.2.13.crate) = 62f25bc4c7e55e0b0b7a1d43fb893f4fa1361d0abe38b9ce4f323c2adfe6ef42
+SIZE (rust/crates/redox_syscall-0.2.13.crate) = 23759
+SHA256 (rust/crates/redox_users-0.3.5.crate) = de0737333e7a9502c789a36d7c7fa6092a49895d4faa31ca5df163857ded2e9d
+SIZE (rust/crates/redox_users-0.3.5.crate) = 12644
+SHA256 (rust/crates/regalloc-0.0.31.crate) = 571f7f397d61c4755285cd37853fe8e03271c243424a907415909379659381c5
+SIZE (rust/crates/regalloc-0.0.31.crate) = 170781
+SHA256 (rust/crates/regex-1.5.5.crate) = 1a11647b6b25ff05a515cb92c365cec08801e83423a235b51e231e1808747286
+SIZE (rust/crates/regex-1.5.5.crate) = 238119
+SHA256 (rust/crates/regex-automata-0.1.10.crate) = 6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132
+SIZE (rust/crates/regex-automata-0.1.10.crate) = 114533
+SHA256 (rust/crates/regex-syntax-0.6.25.crate) = f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b
+SIZE (rust/crates/regex-syntax-0.6.25.crate) = 293293
+SHA256 (rust/crates/region-3.0.0.crate) = 76e189c2369884dce920945e2ddf79b3dff49e071a167dd1817fa9c4c00d512e
+SIZE (rust/crates/region-3.0.0.crate) = 21488
+SHA256 (rust/crates/remove_dir_all-0.5.3.crate) = 3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7
+SIZE (rust/crates/remove_dir_all-0.5.3.crate) = 9184
+SHA256 (rust/crates/rend-0.3.6.crate) = 79af64b4b6362ffba04eef3a4e10829718a4896dac19daa741851c86781edf95
+SIZE (rust/crates/rend-0.3.6.crate) = 8574
+SHA256 (rust/crates/reqwest-0.11.10.crate) = 46a1f7aa4f35e5e8b4160449f51afc758f0ce6454315a9fa7d0d113e958c41eb
+SIZE (rust/crates/reqwest-0.11.10.crate) = 140434
+SHA256 (rust/crates/ring-0.16.20.crate) = 3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc
+SIZE (rust/crates/ring-0.16.20.crate) = 5082615
+SHA256 (rust/crates/rkyv-0.7.38.crate) = 517a3034eb2b1499714e9d1e49b2367ad567e07639b69776d35e259d9c27cca6
+SIZE (rust/crates/rkyv-0.7.38.crate) = 105807
+SHA256 (rust/crates/rkyv_derive-0.7.38.crate) = 505c209ee04111a006431abf39696e640838364d67a107c559ababaf6fd8c9dd
+SIZE (rust/crates/rkyv_derive-0.7.38.crate) = 18829
+SHA256 (rust/crates/rust-argon2-0.8.3.crate) = 4b18820d944b33caa75a71378964ac46f58517c92b6ae5f762636247c09e78fb
+SIZE (rust/crates/rust-argon2-0.8.3.crate) = 28313
+SHA256 (rust/crates/rustc-demangle-0.1.21.crate) = 7ef03e0a2b150c7a90d01faf6254c9c48a41e95fb2a8c2ac1c6f0d2b9aefc342
+SIZE (rust/crates/rustc-demangle-0.1.21.crate) = 27920
+SHA256 (rust/crates/rustc-hash-1.1.0.crate) = 08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2
+SIZE (rust/crates/rustc-hash-1.1.0.crate) = 9331
+SHA256 (rust/crates/rustc_version-0.2.3.crate) = 138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a
+SIZE (rust/crates/rustc_version-0.2.3.crate) = 10210
+SHA256 (rust/crates/rustc_version-0.4.0.crate) = bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366
+SIZE (rust/crates/rustc_version-0.4.0.crate) = 12175
+SHA256 (rust/crates/rustls-0.19.1.crate) = 35edb675feee39aec9c99fa5ff985081995a06d594114ae14cbe797ad7b7a6d7
+SIZE (rust/crates/rustls-0.19.1.crate) = 208143
+SHA256 (rust/crates/rustls-0.20.5.crate) = a024a432ae760ab3bff924ad91ce1cfa52cb57ed16e1ef32d0d249cfee1a6c13
+SIZE (rust/crates/rustls-0.20.5.crate) = 258873
+SHA256 (rust/crates/rustls-native-certs-0.5.0.crate) = 5a07b7c1885bd8ed3831c289b7870b13ef46fe0e856d288c30d9cc17d75a2092
+SIZE (rust/crates/rustls-native-certs-0.5.0.crate) = 18482
+SHA256 (rust/crates/rustversion-1.0.6.crate) = f2cc38e8fa666e2de3c4aba7edeb5ffc5246c1c2ed0e3d17e560aeeba736b23f
+SIZE (rust/crates/rustversion-1.0.6.crate) = 18380
+SHA256 (rust/crates/ryu-1.0.10.crate) = f3f6f92acf49d1b98f7a81226834412ada05458b7364277387724a237f062695
+SIZE (rust/crates/ryu-1.0.10.crate) = 48485
+SHA256 (rust/crates/schannel-0.1.19.crate) = 8f05ba609c234e60bee0d547fe94a4c7e9da733d1c962cf6e59efa4cd9c8bc75
+SIZE (rust/crates/schannel-0.1.19.crate) = 42755
+SHA256 (rust/crates/scoped-tls-1.0.0.crate) = ea6a9290e3c9cf0f18145ef7ffa62d68ee0bf5fcd651017e586dc7fd5da448c2
+SIZE (rust/crates/scoped-tls-1.0.0.crate) = 9146
+SHA256 (rust/crates/scopeguard-1.1.0.crate) = d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd
+SIZE (rust/crates/scopeguard-1.1.0.crate) = 11470
+SHA256 (rust/crates/sct-0.6.1.crate) = b362b83898e0e69f38515b82ee15aa80636befe47c3b6d3d89a911e78fc228ce
+SIZE (rust/crates/sct-0.6.1.crate) = 26825
+SHA256 (rust/crates/sct-0.7.0.crate) = d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4
+SIZE (rust/crates/sct-0.7.0.crate) = 27502
+SHA256 (rust/crates/seahash-4.1.0.crate) = 1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b
+SIZE (rust/crates/seahash-4.1.0.crate) = 31976
+SHA256 (rust/crates/security-framework-2.6.1.crate) = 2dc14f172faf8a0194a3aded622712b0de276821addc574fa54fc0a1167e10dc
+SIZE (rust/crates/security-framework-2.6.1.crate) = 71688
+SHA256 (rust/crates/security-framework-sys-2.6.1.crate) = 0160a13a177a45bfb43ce71c01580998474f556ad854dcbca936dd2841a5c556
+SIZE (rust/crates/security-framework-sys-2.6.1.crate) = 17717
+SHA256 (rust/crates/semver-0.9.0.crate) = 1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403
+SIZE (rust/crates/semver-0.9.0.crate) = 17344
+SHA256 (rust/crates/semver-1.0.9.crate) = 8cb243bdfdb5936c8dc3c45762a19d12ab4550cdc753bc247637d4ec35a040fd
+SIZE (rust/crates/semver-1.0.9.crate) = 30843
+SHA256 (rust/crates/semver-parser-0.7.0.crate) = 388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3
+SIZE (rust/crates/semver-parser-0.7.0.crate) = 10268
+SHA256 (rust/crates/serde-1.0.137.crate) = 61ea8d54c77f8315140a05f4c7237403bf38b72704d031543aa1d16abbf517d1
+SIZE (rust/crates/serde-1.0.137.crate) = 76182
+SHA256 (rust/crates/serde_bytes-0.11.6.crate) = 212e73464ebcde48d723aa02eb270ba62eff38a9b732df31f33f1b4e145f3a54
+SIZE (rust/crates/serde_bytes-0.11.6.crate) = 11137
+SHA256 (rust/crates/serde_derive-1.0.137.crate) = 1f26faba0c3959972377d3b2d306ee9f71faee9714294e41bb777f83f88578be
+SIZE (rust/crates/serde_derive-1.0.137.crate) = 54831
+SHA256 (rust/crates/serde_json-1.0.81.crate) = 9b7ce2b32a1aed03c558dc61a5cd328f15aff2dbc17daad8fb8af04d2100e15c
+SIZE (rust/crates/serde_json-1.0.81.crate) = 144480
+SHA256 (rust/crates/serde_urlencoded-0.7.1.crate) = d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd
+SIZE (rust/crates/serde_urlencoded-0.7.1.crate) = 12822
+SHA256 (rust/crates/serde_yaml-0.8.24.crate) = 707d15895415db6628332b737c838b88c598522e4dc70647e59b72312924aebc
+SIZE (rust/crates/serde_yaml-0.8.24.crate) = 42102
+SHA256 (rust/crates/sha1-0.6.1.crate) = c1da05c97445caa12d05e848c4a4fcbbea29e748ac28f7e80e9b010392063770
+SIZE (rust/crates/sha1-0.6.1.crate) = 2931
+SHA256 (rust/crates/sha1_smol-1.0.0.crate) = ae1a47186c03a32177042e55dbc5fd5aee900b8e0069a8d70fba96a9375cd012
+SIZE (rust/crates/sha1_smol-1.0.0.crate) = 9782
+SHA256 (rust/crates/signal-hook-registry-1.4.0.crate) = e51e73328dc4ac0c7ccbda3a494dfa03df1de2f46018127f60c693f2648455b0
+SIZE (rust/crates/signal-hook-registry-1.4.0.crate) = 17912
+SHA256 (rust/crates/siphasher-0.2.3.crate) = 0b8de496cf83d4ed58b6be86c3a275b8602f6ffe98d3024a869e124147a9a3ac
+SIZE (rust/crates/siphasher-0.2.3.crate) = 8717
+SHA256 (rust/crates/slab-0.4.6.crate) = eb703cfe953bccee95685111adeedb76fabe4e97549a58d16f03ea7b9367bb32
+SIZE (rust/crates/slab-0.4.6.crate) = 16067
+SHA256 (rust/crates/smallvec-1.8.0.crate) = f2dd574626839106c320a323308629dcb1acfc96e32a8cba364ddc61ac23ee83
+SIZE (rust/crates/smallvec-1.8.0.crate) = 27992
+SHA256 (rust/crates/socket2-0.4.4.crate) = 66d72b759436ae32898a2af0a14218dbf55efde3feeb170eb623637db85ee1e0
+SIZE (rust/crates/socket2-0.4.4.crate) = 44048
+SHA256 (rust/crates/spin-0.5.2.crate) = 6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d
+SIZE (rust/crates/spin-0.5.2.crate) = 12004
+SHA256 (rust/crates/stable_deref_trait-1.2.0.crate) = a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3
+SIZE (rust/crates/stable_deref_trait-1.2.0.crate) = 8054
+SHA256 (rust/crates/standback-0.2.17.crate) = e113fb6f3de07a243d434a56ec6f186dfd51cb08448239fe7bcae73f87ff28ff
+SIZE (rust/crates/standback-0.2.17.crate) = 29011
+SHA256 (rust/crates/stdweb-0.4.20.crate) = d022496b16281348b52d0e30ae99e01a73d737b2f45d38fed4edf79f9325a1d5
+SIZE (rust/crates/stdweb-0.4.20.crate) = 194102
+SHA256 (rust/crates/stdweb-derive-0.5.3.crate) = c87a60a40fccc84bef0652345bbbbbe20a605bf5d0ce81719fc476f5c03b50ef
+SIZE (rust/crates/stdweb-derive-0.5.3.crate) = 3894
+SHA256 (rust/crates/stdweb-internal-macros-0.2.9.crate) = 58fa5ff6ad0d98d1ffa8cb115892b6e69d67799f6763e162a1c9db421dc22e11
+SIZE (rust/crates/stdweb-internal-macros-0.2.9.crate) = 11828
+SHA256 (rust/crates/stdweb-internal-runtime-0.1.5.crate) = 213701ba3370744dcd1a12960caa4843b3d68b4d1c0a5d575e0d65b2ee9d16c0
+SIZE (rust/crates/stdweb-internal-runtime-0.1.5.crate) = 5445
+SHA256 (rust/crates/strsim-0.10.0.crate) = 73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623
+SIZE (rust/crates/strsim-0.10.0.crate) = 11355
+SHA256 (rust/crates/subtle-2.4.1.crate) = 6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601
+SIZE (rust/crates/subtle-2.4.1.crate) = 12630
+SHA256 (rust/crates/syn-1.0.94.crate) = a07e33e919ebcd69113d5be0e4d70c5707004ff45188910106854f38b960df4a
+SIZE (rust/crates/syn-1.0.94.crate) = 236697
+SHA256 (rust/crates/synstructure-0.12.6.crate) = f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f
+SIZE (rust/crates/synstructure-0.12.6.crate) = 18429
+SHA256 (rust/crates/target-lexicon-0.12.3.crate) = d7fa7e55043acb85fca6b3c01485a2eeb6b69c5d21002e273c79e465f43b7ac1
+SIZE (rust/crates/target-lexicon-0.12.3.crate) = 22990
+SHA256 (rust/crates/tempfile-3.3.0.crate) = 5cdb1ef4eaeeaddc8fbd371e5017057064af0911902ef36b39801f67cc6d79e4
+SIZE (rust/crates/tempfile-3.3.0.crate) = 27578
+SHA256 (rust/crates/term-0.5.2.crate) = edd106a334b7657c10b7c540a0106114feadeb4dc314513e97df481d5d966f42
+SIZE (rust/crates/term-0.5.2.crate) = 37638
+SHA256 (rust/crates/termcolor-1.1.3.crate) = bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755
+SIZE (rust/crates/termcolor-1.1.3.crate) = 17242
+SHA256 (rust/crates/terminal_size-0.1.17.crate) = 633c1a546cee861a1a6d0dc69ebeca693bf4296661ba7852b9d21d159e0506df
+SIZE (rust/crates/terminal_size-0.1.17.crate) = 9141
+SHA256 (rust/crates/textwrap-0.15.0.crate) = b1141d4d61095b28419e22cb0bbf02755f5e54e0526f97f1e3d1d160e60885fb
+SIZE (rust/crates/textwrap-0.15.0.crate) = 52998
+SHA256 (rust/crates/thiserror-1.0.31.crate) = bd829fe32373d27f76265620b5309d0340cb8550f523c1dda251d6298069069a
+SIZE (rust/crates/thiserror-1.0.31.crate) = 18013
+SHA256 (rust/crates/thiserror-impl-1.0.31.crate) = 0396bc89e626244658bef819e22d0cc459e795a5ebe878e6ec336d1674a8d79a
+SIZE (rust/crates/thiserror-impl-1.0.31.crate) = 15283
+SHA256 (rust/crates/time-0.1.43.crate) = ca8a50ef2360fbd1eeb0ecd46795a87a19024eb4b53c5dc916ca1fd95fe62438
+SIZE (rust/crates/time-0.1.43.crate) = 28653
+SHA256 (rust/crates/time-0.2.27.crate) = 4752a97f8eebd6854ff91f1c1824cd6160626ac4bd44287f7f4ea2035a02a242
+SIZE (rust/crates/time-0.2.27.crate) = 65167
+SHA256 (rust/crates/time-0.3.9.crate) = c2702e08a7a860f005826c6815dcac101b19b5eb330c27fe4a5928fec1d20ddd
+SIZE (rust/crates/time-0.3.9.crate) = 81412
+SHA256 (rust/crates/time-macros-0.1.1.crate) = 957e9c6e26f12cb6d0dd7fc776bb67a706312e7299aed74c8dd5b17ebb27e2f1
+SIZE (rust/crates/time-macros-0.1.1.crate) = 5447
+SHA256 (rust/crates/time-macros-impl-0.1.2.crate) = fd3c141a1b43194f3f56a1411225df8646c55781d5f26db825b3d98507eb482f
+SIZE (rust/crates/time-macros-impl-0.1.2.crate) = 10096
+SHA256 (rust/crates/timeago-0.3.1.crate) = 6ec32dde57efb15c035ac074118d7f32820451395f28cb0524a01d4e94983b26
+SIZE (rust/crates/timeago-0.3.1.crate) = 16179
+SHA256 (rust/crates/tinyvec-1.6.0.crate) = 87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50
+SIZE (rust/crates/tinyvec-1.6.0.crate) = 45991
+SHA256 (rust/crates/tinyvec_macros-0.1.0.crate) = cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c
+SIZE (rust/crates/tinyvec_macros-0.1.0.crate) = 1817
+SHA256 (rust/crates/tokio-1.18.2.crate) = 4903bf0427cf68dddd5aa6a93220756f8be0c34fcfa9f5e6191e103e15a31395
+SIZE (rust/crates/tokio-1.18.2.crate) = 572381
+SHA256 (rust/crates/tokio-macros-1.7.0.crate) = b557f72f448c511a979e2564e55d74e6c4432fc96ff4f6241bc6bded342643b7
+SIZE (rust/crates/tokio-macros-1.7.0.crate) = 9261
+SHA256 (rust/crates/tokio-native-tls-0.3.0.crate) = f7d995660bd2b7f8c1568414c1126076c13fbb725c40112dc0120b78eb9b717b
+SIZE (rust/crates/tokio-native-tls-0.3.0.crate) = 20759
+SHA256 (rust/crates/tokio-rustls-0.22.0.crate) = bc6844de72e57df1980054b38be3a9f4702aba4858be64dd700181a8a6d0e1b6
+SIZE (rust/crates/tokio-rustls-0.22.0.crate) = 22706
+SHA256 (rust/crates/tokio-stream-0.1.8.crate) = 50145484efff8818b5ccd256697f36863f587da82cf8b409c53adf1e840798e3
+SIZE (rust/crates/tokio-stream-0.1.8.crate) = 30537
+SHA256 (rust/crates/tokio-util-0.6.10.crate) = 36943ee01a6d67977dd3f84a5a1d2efeb4ada3a1ae771cadfaa535d9d9fc6507
+SIZE (rust/crates/tokio-util-0.6.10.crate) = 71140
+SHA256 (rust/crates/tokio-util-0.7.2.crate) = f988a1a1adc2fb21f9c12aa96441da33a1728193ae0b95d2be22dbd17fcb4e5c
+SIZE (rust/crates/tokio-util-0.7.2.crate) = 82006
+SHA256 (rust/crates/tower-0.4.12.crate) = 9a89fd63ad6adf737582df5db40d286574513c69a11dac5214dc3b5603d6713e
+SIZE (rust/crates/tower-0.4.12.crate) = 107319
+SHA256 (rust/crates/tower-layer-0.3.1.crate) = 343bc9466d3fe6b0f960ef45960509f84480bf4fd96f92901afe7ff3df9d3a62
+SIZE (rust/crates/tower-layer-0.3.1.crate) = 5165
+SHA256 (rust/crates/tower-service-0.3.1.crate) = 360dfd1d6d30e05fda32ace2c8c70e9c0a9da713275777f5a4dbb8a1893930c6
+SIZE (rust/crates/tower-service-0.3.1.crate) = 6299
+SHA256 (rust/crates/tracing-0.1.34.crate) = 5d0ecdcb44a79f0fe9844f0c4f33a342cbcbb5117de8001e6ba0dc2351327d09
+SIZE (rust/crates/tracing-0.1.34.crate) = 72775
+SHA256 (rust/crates/tracing-attributes-0.1.21.crate) = cc6b8ad3567499f98a1db7a752b07a7c8c7c7c34c332ec00effb2b0027974b7c
+SIZE (rust/crates/tracing-attributes-0.1.21.crate) = 27552
+SHA256 (rust/crates/tracing-core-0.1.26.crate) = f54c8ca710e81886d498c2fd3331b56c93aa248d49de2222ad2742247c60072f
+SIZE (rust/crates/tracing-core-0.1.26.crate) = 53727
+SHA256 (rust/crates/try-lock-0.2.3.crate) = 59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642
+SIZE (rust/crates/try-lock-0.2.3.crate) = 4158
+SHA256 (rust/crates/typenum-1.15.0.crate) = dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987
+SIZE (rust/crates/typenum-1.15.0.crate) = 40741
+SHA256 (rust/crates/unicode-bidi-0.3.8.crate) = 099b7128301d285f79ddd55b9a83d5e6b9e97c92e0ea0daebee7263e932de992
+SIZE (rust/crates/unicode-bidi-0.3.8.crate) = 36575
+SHA256 (rust/crates/unicode-normalization-0.1.19.crate) = d54590932941a9e9266f0832deed84ebe1bf2e4c9e4a3554d393d18f5e854bf9
+SIZE (rust/crates/unicode-normalization-0.1.19.crate) = 107353
+SHA256 (rust/crates/unicode-width-0.1.9.crate) = 3ed742d4ea2bd1176e236172c8429aaf54486e7ac098db29ffe6529e0ce50973
+SIZE (rust/crates/unicode-width-0.1.9.crate) = 16745
+SHA256 (rust/crates/unicode-xid-0.2.3.crate) = 957e51f3646910546462e67d5f7599b9e4fb8acdd304b087a6494730f9eebf04
+SIZE (rust/crates/unicode-xid-0.2.3.crate) = 15174
+SHA256 (rust/crates/universal-hash-0.4.1.crate) = 9f214e8f697e925001e66ec2c6e37a4ef93f0f78c2eed7814394e10c62025b05
+SIZE (rust/crates/universal-hash-0.4.1.crate) = 8503
+SHA256 (rust/crates/untrusted-0.7.1.crate) = a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a
+SIZE (rust/crates/untrusted-0.7.1.crate) = 7924
+SHA256 (rust/crates/url-2.2.2.crate) = a507c383b2d33b5fc35d1861e77e6b383d158b2da5e14fe51b83dfedf6fd578c
+SIZE (rust/crates/url-2.2.2.crate) = 68555
+SHA256 (rust/crates/urlencoding-1.3.3.crate) = 5a1f0175e03a0973cf4afd476bef05c26e228520400eb1fd473ad417b1c00ffb
+SIZE (rust/crates/urlencoding-1.3.3.crate) = 5965
+SHA256 (rust/crates/uuid-0.8.2.crate) = bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7
+SIZE (rust/crates/uuid-0.8.2.crate) = 37909
+SHA256 (rust/crates/vcpkg-0.2.15.crate) = accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426
+SIZE (rust/crates/vcpkg-0.2.15.crate) = 228735
+SHA256 (rust/crates/version_check-0.9.4.crate) = 49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f
+SIZE (rust/crates/version_check-0.9.4.crate) = 14895
+SHA256 (rust/crates/want-0.3.0.crate) = 1ce8a968cb1cd110d136ff8b819a556d6fb6d919363c61534f6860c7eb172ba0
+SIZE (rust/crates/want-0.3.0.crate) = 6550
+SHA256 (rust/crates/wasi-0.9.0+wasi-snapshot-preview1.crate) = cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519
+SIZE (rust/crates/wasi-0.9.0+wasi-snapshot-preview1.crate) = 31521
+SHA256 (rust/crates/wasi-0.10.2+wasi-snapshot-preview1.crate) = fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6
+SIZE (rust/crates/wasi-0.10.2+wasi-snapshot-preview1.crate) = 27505
+SHA256 (rust/crates/wasi-0.11.0+wasi-snapshot-preview1.crate) = 9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423
+SIZE (rust/crates/wasi-0.11.0+wasi-snapshot-preview1.crate) = 28131
+SHA256 (rust/crates/wasm-bindgen-0.2.80.crate) = 27370197c907c55e3f1a9fbe26f44e937fe6451368324e009cba39e139dc08ad
+SIZE (rust/crates/wasm-bindgen-0.2.80.crate) = 164576
+SHA256 (rust/crates/wasm-bindgen-backend-0.2.80.crate) = 53e04185bfa3a779273da532f5025e33398409573f348985af9a1cbf3774d3f4
+SIZE (rust/crates/wasm-bindgen-backend-0.2.80.crate) = 25741
+SHA256 (rust/crates/wasm-bindgen-futures-0.4.30.crate) = 6f741de44b75e14c35df886aff5f1eb73aa114fa5d4d00dcd37b5e01259bf3b2
+SIZE (rust/crates/wasm-bindgen-futures-0.4.30.crate) = 15220
+SHA256 (rust/crates/wasm-bindgen-macro-0.2.80.crate) = 17cae7ff784d7e83a2fe7611cfe766ecf034111b49deb850a3dc7699c08251f5
+SIZE (rust/crates/wasm-bindgen-macro-0.2.80.crate) = 11805
+SHA256 (rust/crates/wasm-bindgen-macro-support-0.2.80.crate) = 99ec0dc7a4756fffc231aab1b9f2f578d23cd391390ab27f952ae0c9b3ece20b
+SIZE (rust/crates/wasm-bindgen-macro-support-0.2.80.crate) = 17857
+SHA256 (rust/crates/wasm-bindgen-shared-0.2.80.crate) = d554b7f530dee5964d9a9468d95c1f8b8acae4f282807e7d27d4b03099a46744
+SIZE (rust/crates/wasm-bindgen-shared-0.2.80.crate) = 7204
+SHA256 (rust/crates/wasm-bindgen-test-0.3.30.crate) = d4464b3f74729a25f42b1a0cd9e6a515d2f25001f3535a6cfaf35d34a4de3bab
+SIZE (rust/crates/wasm-bindgen-test-0.3.30.crate) = 15551
+SHA256 (rust/crates/wasm-bindgen-test-macro-0.3.30.crate) = a77c5a6f82cc6093a321ca5fb3dc9327fe51675d477b3799b4a9375bac3b7b4c
+SIZE (rust/crates/wasm-bindgen-test-macro-0.3.30.crate) = 6313
+SHA256 (rust/crates/wasmer-2.2.1.crate) = f727a39e7161f7438ddb8eafe571b67c576a8c2fb459f666d9053b5bba4afdea
+SIZE (rust/crates/wasmer-2.2.1.crate) = 104871
+SHA256 (rust/crates/wasmer-compiler-2.2.1.crate) = 4e9951599222eb12bd13d4d91bcded0a880e4c22c2dfdabdf5dc7e5e803b7bf3
+SIZE (rust/crates/wasmer-compiler-2.2.1.crate) = 23725
+SHA256 (rust/crates/wasmer-compiler-cranelift-2.2.1.crate) = 44c83273bce44e668f3a2b9ccb7f1193db918b1d6806f64acc5ff71f6ece5f20
+SIZE (rust/crates/wasmer-compiler-cranelift-2.2.1.crate) = 55516
+SHA256 (rust/crates/wasmer-derive-2.2.1.crate) = 458dbd9718a837e6dbc52003aef84487d79eedef5fa28c7d28b6784be98ac08e
+SIZE (rust/crates/wasmer-derive-2.2.1.crate) = 5964
+SHA256 (rust/crates/wasmer-engine-2.2.1.crate) = 6ed603a6d037ebbb14014d7f739ae996a78455a4b86c41cfa4e81c590a1253b9
+SIZE (rust/crates/wasmer-engine-2.2.1.crate) = 18756
+SHA256 (rust/crates/wasmer-engine-dylib-2.2.1.crate) = ccd7fdc60e252a795c849b3f78a81a134783051407e7e279c10b7019139ef8dc
+SIZE (rust/crates/wasmer-engine-dylib-2.2.1.crate) = 16861
+SHA256 (rust/crates/wasmer-engine-universal-2.2.1.crate) = dcff0cd2c01a8de6009fd863b14ea883132a468a24f2d2ee59dc34453d3a31b5
+SIZE (rust/crates/wasmer-engine-universal-2.2.1.crate) = 15873
+SHA256 (rust/crates/wasmer-object-2.2.1.crate) = 24ce18ac2877050e59580d27ee1a88f3192d7a31e77fbba0852abc7888d6e0b5
+SIZE (rust/crates/wasmer-object-2.2.1.crate) = 4726
+SHA256 (rust/crates/wasmer-types-2.2.1.crate) = 659fa3dd6c76f62630deff4ac8c7657b07f0b1e4d7e0f8243a552b9d9b448e24
+SIZE (rust/crates/wasmer-types-2.2.1.crate) = 30518
+SHA256 (rust/crates/wasmer-vfs-2.2.1.crate) = f02fc47308cf5cf2cc039ec61c098773320b3d3c099434f20580bd143beee63b
+SIZE (rust/crates/wasmer-vfs-2.2.1.crate) = 21294
+SHA256 (rust/crates/wasmer-vm-2.2.1.crate) = afdc46158517c2769f9938bc222a7d41b3bb330824196279d8aa2d667cd40641
+SIZE (rust/crates/wasmer-vm-2.2.1.crate) = 59342
+SHA256 (rust/crates/wasmer-wasi-2.2.1.crate) = 3087d48fe015928118ae23f66f05b533e75fbea5dfcd64c75a74b7b5f941cc65
+SIZE (rust/crates/wasmer-wasi-2.2.1.crate) = 588413
+SHA256 (rust/crates/wasmer-wasi-types-2.2.1.crate) = 69adbd8d0d89cd19fb8b1e0252c76e3f72dbc65c944f0db7a9c28c4157fbcd3a
+SIZE (rust/crates/wasmer-wasi-types-2.2.1.crate) = 6882
+SHA256 (rust/crates/wasmparser-0.78.2.crate) = 52144d4c78e5cf8b055ceab8e5fa22814ce4315d6002ad32cfd914f37c12fd65
+SIZE (rust/crates/wasmparser-0.78.2.crate) = 80388
+SHA256 (rust/crates/wast-40.0.0.crate) = 9bb4f48a8b083dbc50e291e430afb8f524092bb00428957bcc63f49f856c64ac
+SIZE (rust/crates/wast-40.0.0.crate) = 101232
+SHA256 (rust/crates/wat-1.0.42.crate) = 0401b6395ce0db91629a75b29597ccb66ea29950af9fc859f1bb3a736609c76e
+SIZE (rust/crates/wat-1.0.42.crate) = 9183
+SHA256 (rust/crates/web-sys-0.3.57.crate) = 7b17e741662c70c8bd24ac5c5b18de314a2c26c32bf8346ee1e6f53de919c283
+SIZE (rust/crates/web-sys-0.3.57.crate) = 686563
+SHA256 (rust/crates/webpki-0.21.4.crate) = b8e38c0608262c46d4a56202ebabdeb094cef7e560ca7a226c6bf055188aa4ea
+SIZE (rust/crates/webpki-0.21.4.crate) = 58505
+SHA256 (rust/crates/webpki-0.22.0.crate) = f095d78192e208183081cc07bc5515ef55216397af48b873e5edcd72637fa1bd
+SIZE (rust/crates/webpki-0.22.0.crate) = 58663
+SHA256 (rust/crates/wee_alloc-0.4.5.crate) = dbb3b5a6b2bb17cb6ad44a2e68a43e8d2722c997da10e928665c72ec6c0a0b8e
+SIZE (rust/crates/wee_alloc-0.4.5.crate) = 16159
+SHA256 (rust/crates/which-4.2.5.crate) = 5c4fb54e6113b6a8772ee41c3404fb0301ac79604489467e0a9ce1f3e97c24ae
+SIZE (rust/crates/which-4.2.5.crate) = 9326
+SHA256 (rust/crates/winapi-0.3.9.crate) = 5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419
+SIZE (rust/crates/winapi-0.3.9.crate) = 1200382
+SHA256 (rust/crates/winapi-i686-pc-windows-gnu-0.4.0.crate) = ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6
+SIZE (rust/crates/winapi-i686-pc-windows-gnu-0.4.0.crate) = 2918815
+SHA256 (rust/crates/winapi-util-0.1.5.crate) = 70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178
+SIZE (rust/crates/winapi-util-0.1.5.crate) = 10164
+SHA256 (rust/crates/winapi-x86_64-pc-windows-gnu-0.4.0.crate) = 712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f
+SIZE (rust/crates/winapi-x86_64-pc-windows-gnu-0.4.0.crate) = 2947998
+SHA256 (rust/crates/windows-sys-0.36.1.crate) = ea04155a16a59f9eab786fe12a4a450e75cdb175f9e0d80da1e17db09f55b8d2
+SIZE (rust/crates/windows-sys-0.36.1.crate) = 3347053
+SHA256 (rust/crates/windows_aarch64_msvc-0.36.1.crate) = 9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47
+SIZE (rust/crates/windows_aarch64_msvc-0.36.1.crate) = 661960
+SHA256 (rust/crates/windows_i686_gnu-0.36.1.crate) = 180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6
+SIZE (rust/crates/windows_i686_gnu-0.36.1.crate) = 818115
+SHA256 (rust/crates/windows_i686_msvc-0.36.1.crate) = e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024
+SIZE (rust/crates/windows_i686_msvc-0.36.1.crate) = 724575
+SHA256 (rust/crates/windows_x86_64_gnu-0.36.1.crate) = 4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1
+SIZE (rust/crates/windows_x86_64_gnu-0.36.1.crate) = 790934
+SHA256 (rust/crates/windows_x86_64_msvc-0.36.1.crate) = c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680
+SIZE (rust/crates/windows_x86_64_msvc-0.36.1.crate) = 661999
+SHA256 (rust/crates/winreg-0.6.2.crate) = b2986deb581c4fe11b621998a5e53361efe6b48a151178d0cd9eeffa4dc6acc9
+SIZE (rust/crates/winreg-0.6.2.crate) = 19338
+SHA256 (rust/crates/winreg-0.10.1.crate) = 80d0f4e272c85def139476380b12f9ac60926689dd2e01d4923222f40580869d
+SIZE (rust/crates/winreg-0.10.1.crate) = 25725
+SHA256 (rust/crates/xmlparser-0.13.3.crate) = 114ba2b24d2167ef6d67d7d04c8cc86522b87f490025f39f0303b7db5bf5e3d8
+SIZE (rust/crates/xmlparser-0.13.3.crate) = 25732
+SHA256 (rust/crates/yaml-rust-0.4.5.crate) = 56c1936c4cc7a1c9ab21a1ebb602eb942ba868cbd44a99cb7cdc5892335e1c85
+SIZE (rust/crates/yaml-rust-0.4.5.crate) = 47783
+SHA256 (rust/crates/zeroize-1.5.5.crate) = 94693807d016b2f2d2e14420eb3bfcca689311ff775dcf113d74ea624b7cdf07
+SIZE (rust/crates/zeroize-1.5.5.crate) = 18550
+SHA256 (mongodb-rust-mongodb-schema-parser-2d489307dd70b63b216a9968f7dec7c217108b32_GH0.tar.gz) = 8222ebd07ed51e1c6d3ca3fe6ea2e5502ee751e3fb5cb49d5793f6db8bb371ff
+SIZE (mongodb-rust-mongodb-schema-parser-2d489307dd70b63b216a9968f7dec7c217108b32_GH0.tar.gz) = 22744
+SHA256 (Qovery-Replibyte-v0.10.0_GH0.tar.gz) = e74345cfe7dbce30eb928bc6f0c6b8108e4c2515289fda0ab1c46c6abd357fd4
+SIZE (Qovery-Replibyte-v0.10.0_GH0.tar.gz) = 2919372
diff --git a/databases/replibyte/pkg-descr b/databases/replibyte/pkg-descr
new file mode 100644
index 000000000000..2ad50225ab20
--- /dev/null
+++ b/databases/replibyte/pkg-descr
@@ -0,0 +1,2 @@
+Replibyte is a blazingly fast tool to seed your databases with your production
+data while keeping sensitive data safe.
diff --git a/databases/retcl/Makefile b/databases/retcl/Makefile
index 8b0c8dc9d8d3..9b06b50fc1b9 100644
--- a/databases/retcl/Makefile
+++ b/databases/retcl/Makefile
@@ -1,11 +1,10 @@
-# Created by: gahr
-
 PORTNAME=	retcl
-PORTVERSION=	0.3.2
+PORTVERSION=	0.4.0
 CATEGORIES=	databases
 
 MAINTAINER=	gahr@FreeBSD.org
 COMMENT=	Tcl client library for Redis
+WWW=		https://github.com/gahr/retcl
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
diff --git a/databases/retcl/distinfo b/databases/retcl/distinfo
index 1b804e9c7ce5..c605f6297dd7 100644
--- a/databases/retcl/distinfo
+++ b/databases/retcl/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1523951857
-SHA256 (gahr-retcl-0.3.2_GH0.tar.gz) = 4c89fadbce5f44556ff95a61964e973a5f8da375cae14ff555f67b7284aed4d0
-SIZE (gahr-retcl-0.3.2_GH0.tar.gz) = 22745
+TIMESTAMP = 1638171617
+SHA256 (gahr-retcl-0.4.0_GH0.tar.gz) = 233eaa78cf2973c2a0f27c600efde276fbf07cdc24774d7d91b87bb270fe3890
+SIZE (gahr-retcl-0.4.0_GH0.tar.gz) = 26360
diff --git a/databases/retcl/pkg-descr b/databases/retcl/pkg-descr
index a97f7c277687..546fcbb1872f 100644
--- a/databases/retcl/pkg-descr
+++ b/databases/retcl/pkg-descr
@@ -1,5 +1,3 @@
 Retcl is an event-driven, object-oriented, Redis client library targetting the
 Tcl scripting language. The library consists of a single Tcl Module file, which
 makes it extremely easy to deploy or integrate into existing projects.
-
-WWW: https://github.com/gahr/retcl
diff --git a/databases/rocksdb-lite/Makefile b/databases/rocksdb-lite/Makefile
deleted file mode 100644
index 76f6cfd68a1e..000000000000
--- a/databases/rocksdb-lite/Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-# Created by: David Thiel <lx@FreeBSD.org>
-
-PORTREVISION=	1
-
-MAINTAINER=	lx@FreeBSD.org
-COMMENT=	Persistent key-value store for fast storage environments (lite version)
-
-LITE=		yes
-MASTERDIR=	${.CURDIR}/../rocksdb
-
-BROKEN=		fails to package
-BROKEN_armv6=		does not build: db/compaction_job.cc:714:52: error: implicit conversion loses integer precision: 'uint64_t' (aka 'unsigned long long') to 'const size_t' (aka 'const unsigned int')
-BROKEN_armv7=		does not build: db/compaction_job.cc:714:52: error: implicit conversion loses integer precision: 'uint64_t' (aka 'unsigned long long') to 'const size_t' (aka 'const unsigned int')
-
-.include "${MASTERDIR}/Makefile"
diff --git a/databases/rocksdb/Makefile b/databases/rocksdb/Makefile
index aaa3333e1160..ef801cb3e14e 100644
--- a/databases/rocksdb/Makefile
+++ b/databases/rocksdb/Makefile
@@ -1,16 +1,12 @@
-# Created by: Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>
-
 PORTNAME=	rocksdb
-PORTVERSION=	6.11.6
+PORTVERSION=	9.1.0
 DISTVERSIONPREFIX=	v
-PORTREVISION=	1
 CATEGORIES=	databases
 
-PATCH_SITES=	https://github.com/facebook/${PORTNAME}/commit/
-PATCHFILES=	b937be377901afa32357b60eebbee80f14087180.patch:-p1
-
-MAINTAINER?=	sunpoet@FreeBSD.org
-COMMENT?=	Persistent key-value store for fast storage environments
+MAINTAINER=	sunpoet@FreeBSD.org
+COMMENT=	Persistent key-value store for fast storage environments
+WWW=		https://rocksdb.org/ \
+		https://github.com/facebook/rocksdb
 
 LICENSE=	APACHE20 GPLv2
 LICENSE_COMB=	dual
@@ -18,19 +14,14 @@ LICENSE_FILE_APACHE20=	${WRKSRC}/LICENSE.Apache
 LICENSE_FILE_GPLv2=	${WRKSRC}/COPYING
 
 BROKEN_DragonFly=	does not build on DragonFly BSD using GCC with -Werror
-BROKEN_armv6?=		does not build: db/c.cc:2281:44: implicit conversion loses integer precision: 'uint64_t' (aka 'unsigned long long') to 'size_t' (aka 'unsigned int')
-BROKEN_armv7?=		does not build: /nxb-bin/usr/bin/ld: undefined reference to symbol `__gnu_Unwind_Find_exidx@@FBSD_1.4' (try adding -lc) #'`
-BROKEN_FreeBSD_11_powerpc64=	does not build: util/crc32c.cc:435:22: 'arch_ppc_probe' was not declared in this scope
-BROKEN_FreeBSD_12_powerpc64=	does not build: util/crc32c.cc:435:22: 'arch_ppc_probe' was not declared in this scope
+BROKEN_armv6=	does not build: db/c.cc:2281:44: implicit conversion loses integer precision: 'uint64_t' (aka 'unsigned long long') to 'size_t' (aka 'unsigned int')
+BROKEN_armv7=	does not build: /nxb-bin/usr/bin/ld: undefined reference to symbol `__gnu_Unwind_Find_exidx@@FBSD_1.4' (try adding -lc) #'`
 
 BUILD_DEPENDS=	bash:shells/bash
 LIB_DEPENDS=	libgflags.so:devel/gflags \
 		libsnappy.so:archivers/snappy
 
-OPTIONS_DEFINE=	DEBUG LZ4 ZSTD
-OPTIONS_DEFAULT=LZ4
-
-USES=		compiler:c++11-lib gmake localbase:ldflags perl5
+USES=		compiler:c++17-lang gmake localbase:ldflags perl5
 USE_PERL5=	build
 
 ALL_TARGET=	shared_lib static_lib all
@@ -39,8 +30,8 @@ CONFIGURE_ARGS=	make_config.mk
 CONFIGURE_ENV=	PORTABLE=0 ROCKSDB_ROOT=${WRKSRC}
 CONFIGURE_SCRIPT=	build_tools/build_detect_platform
 HAS_CONFIGURE=	yes
-MAKE_ENV=	CXX=${CXX} INSTALL_PATH=${STAGEDIR}${PREFIX} USE_RTTI=1
-USE_CXXSTD=	c++11
+MAKE_ENV=	CXX=${CXX} INSTALL_PATH=${STAGEDIR}${PREFIX} USE_RTTI=1 V=1
+USE_CXXSTD=	c++17
 USE_LDCONFIG=	yes
 TEST_TARGET=	check
 
@@ -50,9 +41,14 @@ PORTDATA=	make_config.mk
 GH_ACCOUNT=	facebook
 USE_GITHUB=	yes
 
+CONFLICTS_INSTALL=	rocksdb-lite
+
 BENCHMARKS=	cache_bench db_bench memtablerep_bench persistent_cache_bench range_del_aggregator_bench table_reader_bench
 TOOLS=		blob_dump db_repl_stress db_sanity_test db_stress ldb rocksdb_dump rocksdb_undump sst_dump trace_analyzer write_stress
 
+OPTIONS_DEFINE=	DEBUG LZ4 ZSTD
+OPTIONS_DEFAULT=LZ4 ZSTD
+
 DEBUG_MAKE_ENV=		DEBUG_LEVEL=2
 DEBUG_MAKE_ENV_OFF=	DEBUG_LEVEL=0
 LZ4_LIB_DEPENDS=	liblz4.so:archivers/liblz4
@@ -60,31 +56,15 @@ LZ4_MAKE_ENV_OFF=	ROCKSDB_DISABLE_LZ4=yes
 ZSTD_LIB_DEPENDS=	libzstd.so:archivers/zstd
 ZSTD_MAKE_ENV_OFF=	ROCKSDB_DISABLE_ZSTD=yes
 
-.if !defined(LITE)
-CONFLICTS_INSTALL=	rocksdb-lite
-PLIST_SUB+=	LITE="@comment "
-.else
-PKGNAMESUFFIX=	-lite
-CONFLICTS_INSTALL=	rocksdb
-CFLAGS+=	-DROCKSDB_LITE=1
-MAKE_ENV+=	LIBNAME=librocksdb${PKGNAMESUFFIX} DISABLE_JEMALLOC=1
-PLIST_SUB+=	LITE=""
-.endif
-
 .include <bsd.port.pre.mk>
 
 .if ${CHOSEN_COMPILER_TYPE} == clang
-CXXFLAGS+=	-Wno-inconsistent-missing-override -Wno-unused-variable
-# Clang 8 detects shadow enums and stops the build. This workaround adds -Wno-error=shadow to bypass it.
-.if ${COMPILER_VERSION} >= 80
-CXXFLAGS+=	-Wno-error=shadow
-.endif
+CXXFLAGS+=	-Wno-inconsistent-missing-override -Wno-unused-parameter -Wno-unused-variable -Wno-unused-private-field
 .endif
 
 post-patch:
 .if (${ARCH} == amd64 || ${ARCH} == i386) && !empty(CFLAGS:M-march=*)
-	@${REINPLACE_CMD} -e 's| -march=native| ${CFLAGS:M-march=*}|' \
-	    ${WRKSRC}/build_tools/build_detect_platform
+	@${REINPLACE_CMD} -e 's| -march=native| ${CFLAGS:M-march=*}|' ${WRKSRC}/build_tools/build_detect_platform
 .else
 	@${REINPLACE_CMD} -e 's| -march=native||' ${WRKSRC}/build_tools/build_detect_platform
 .endif
@@ -92,8 +72,8 @@ post-patch:
 post-install:
 	${MKDIR} ${STAGEDIR}${DATADIR}/
 	cd ${WRKSRC}/ && ${INSTALL_PROGRAM} ${BENCHMARKS} ${TOOLS} ${STAGEDIR}${PREFIX}/bin/
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/librocksdb${PKGNAMESUFFIX}.so
-	${INSTALL_DATA} ${WRKSRC}/librocksdb${PKGNAMESUFFIX}_tools.a ${STAGEDIR}${PREFIX}/lib/
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/librocksdb.so
+	${INSTALL_LIB} ${WRKSRC}/librocksdb_test.so ${WRKSRC}/librocksdb_tools.so ${STAGEDIR}${PREFIX}/lib/
 	${INSTALL_DATA} ${WRKSRC}/make_config.mk ${STAGEDIR}${DATADIR}/
 
 .include <bsd.port.post.mk>
diff --git a/databases/rocksdb/distinfo b/databases/rocksdb/distinfo
index fc5f73414123..34019513e111 100644
--- a/databases/rocksdb/distinfo
+++ b/databases/rocksdb/distinfo
@@ -1,5 +1,3 @@
-TIMESTAMP = 1606857109
-SHA256 (facebook-rocksdb-v6.11.6_GH0.tar.gz) = 7ff7cb277cad1dc4d1516c61470816e21c7c6e4dbb9a6e517dd590f2f2732b56
-SIZE (facebook-rocksdb-v6.11.6_GH0.tar.gz) = 6210689
-SHA256 (b937be377901afa32357b60eebbee80f14087180.patch) = 05ec8d1d8710e954f43f528de012feb26ca3f1a46e77994b9591882ce2d64060
-SIZE (b937be377901afa32357b60eebbee80f14087180.patch) = 12681
+TIMESTAMP = 1713624662
+SHA256 (facebook-rocksdb-v9.1.0_GH0.tar.gz) = 3c225e45bf6f6367cf5a4413f71abc4a3427627790e6d58c57adc2daa4b6309d
+SIZE (facebook-rocksdb-v9.1.0_GH0.tar.gz) = 13457512
diff --git a/databases/rocksdb/files/patch-Makefile b/databases/rocksdb/files/patch-Makefile
index 5f1c2c3585ae..f6dd90351cbe 100644
--- a/databases/rocksdb/files/patch-Makefile
+++ b/databases/rocksdb/files/patch-Makefile
@@ -1,34 +1,53 @@
---- Makefile.orig	2020-05-27 23:38:10 UTC
+--- Makefile.orig	2022-10-05 23:40:03 UTC
 +++ Makefile
-@@ -207,14 +207,14 @@ AM_LINK = $(AM_V_CCLD)$(CXX) $^ $(EXEC_LDFLAGS) -o $@ 
+@@ -239,19 +239,19 @@ AM_SHARE = $(AM_V_CCLD) $(CXX) $(PLATFORM_SHARED_LDFLA
  # Detect what platform we're building on.
  # Export some common variables that might have been passed as Make variables
  # instead of environment variables.
 -dummy := $(shell (export ROCKSDB_ROOT="$(CURDIR)"; \
+-                  export CXXFLAGS="$(EXTRA_CXXFLAGS)"; \
+-                  export LDFLAGS="$(EXTRA_LDFLAGS)"; \
 -                  export COMPILE_WITH_ASAN="$(COMPILE_WITH_ASAN)"; \
 -                  export COMPILE_WITH_TSAN="$(COMPILE_WITH_TSAN)"; \
 -                  export COMPILE_WITH_UBSAN="$(COMPILE_WITH_UBSAN)"; \
 -                  export PORTABLE="$(PORTABLE)"; \
 -                  export ROCKSDB_NO_FBCODE="$(ROCKSDB_NO_FBCODE)"; \
 -                  export USE_CLANG="$(USE_CLANG)"; \
+-                  export LIB_MODE="$(LIB_MODE)"; \
+-		  export ROCKSDB_CXX_STANDARD="$(ROCKSDB_CXX_STANDARD)"; \
+-		  export USE_FOLLY="$(USE_FOLLY)"; \
 -                  "$(CURDIR)/build_tools/build_detect_platform" "$(CURDIR)/make_config.mk"))
 +#dummy := $(shell (export ROCKSDB_ROOT="$(CURDIR)"; \
++#                  export CXXFLAGS="$(EXTRA_CXXFLAGS)"; \
++#                  export LDFLAGS="$(EXTRA_LDFLAGS)"; \
 +#                  export COMPILE_WITH_ASAN="$(COMPILE_WITH_ASAN)"; \
 +#                  export COMPILE_WITH_TSAN="$(COMPILE_WITH_TSAN)"; \
 +#                  export COMPILE_WITH_UBSAN="$(COMPILE_WITH_UBSAN)"; \
 +#                  export PORTABLE="$(PORTABLE)"; \
 +#                  export ROCKSDB_NO_FBCODE="$(ROCKSDB_NO_FBCODE)"; \
 +#                  export USE_CLANG="$(USE_CLANG)"; \
++#                  export LIB_MODE="$(LIB_MODE)"; \
++#		  export ROCKSDB_CXX_STANDARD="$(ROCKSDB_CXX_STANDARD)"; \
++#		  export USE_FOLLY="$(USE_FOLLY)"; \
 +#                  "$(CURDIR)/build_tools/build_detect_platform" "$(CURDIR)/make_config.mk"))
  # this file is generated by the previous line to set build flags and sources
  include make_config.mk
- export JAVAC_ARGS
-@@ -779,7 +779,7 @@ endif  # PLATFORM_SHARED_EXT
- 	blackbox_crash_test_with_txn whitebox_crash_test_with_txn
  
+@@ -876,7 +876,7 @@ endif  # PLATFORM_SHARED_EXT
+ 	rocksdbjavastatic rocksdbjava install install-static install-shared \
+ 	uninstall analyze tools tools_lib check-headers checkout_folly
  
 -all: $(LIBRARY) $(BENCHMARKS) tools tools_lib test_libs $(TESTS)
 +all: $(LIBRARY) $(BENCHMARKS) tools tools_lib test_libs # $(TESTS)
  
- all_but_some_tests: $(LIBRARY) $(BENCHMARKS) tools tools_lib test_libs $(SUBSET)
+ all_but_some_tests: $(LIBRARY) $(BENCHMARKS) tools tools_lib test_libs $(ROCKSDBTESTS_SUBSET)
  
+@@ -1273,7 +1273,7 @@ package:
+ # 	Unit tests and tools
+ # ---------------------------------------------------------------------------
+ $(STATIC_LIBRARY): $(LIB_OBJECTS)
+-	$(AM_V_AR)rm -f $@ $(SHARED1) $(SHARED2) $(SHARED3) $(SHARED4)
++	$(AM_V_AR)rm -f $@
+ 	$(AM_V_at)$(AR) $(ARFLAGS) $@ $(LIB_OBJECTS)
+ 
+ $(STATIC_TEST_LIBRARY): $(TEST_OBJECTS)
diff --git a/databases/rocksdb/files/patch-aarch64 b/databases/rocksdb/files/patch-aarch64
new file mode 100644
index 000000000000..d256ce95b119
--- /dev/null
+++ b/databases/rocksdb/files/patch-aarch64
@@ -0,0 +1,11 @@
+--- util/crc32c_arm64.cc.orig	2024-02-28 00:24:11 UTC
++++ util/crc32c_arm64.cc
+@@ -10,7 +10,7 @@
+ #if defined(__linux__)
+ #include <asm/hwcap.h>
+ #endif
+-#ifdef ROCKSDB_AUXV_GETAUXVAL_PRESENT
++#if defined(ROCKSDB_AUXV_GETAUXVAL_PRESENT) || defined(__FreeBSD__)
+ #include <sys/auxv.h>
+ #endif
+ #ifndef HWCAP_CRC32
diff --git a/databases/rocksdb/files/patch-build_tools-build_detect_platform b/databases/rocksdb/files/patch-build_tools-build_detect_platform
index b685a2dfc33a..cbf3251be4f3 100644
--- a/databases/rocksdb/files/patch-build_tools-build_detect_platform
+++ b/databases/rocksdb/files/patch-build_tools-build_detect_platform
@@ -1,8 +1,10 @@
 Remove -fno-builtin-memcmp and -ltcmalloc
 
---- build_tools/build_detect_platform.orig	2020-05-27 23:38:10 UTC
+% sed -i .orig 's| -fno-builtin-memcmp||; s| -ltcmalloc||' build_tools/build_detect_platform
+
+--- build_tools/build_detect_platform.orig	2022-02-17 23:56:08 UTC
 +++ build_tools/build_detect_platform
-@@ -126,7 +126,7 @@ PLATFORM_SHARED_VERSIONED=true
+@@ -145,7 +145,7 @@ PLATFORM_SHARED_VERSIONED=true
  # generic port files (working on all platform by #ifdef) go directly in /port
  GENERIC_PORT_FILES=`cd "$ROCKSDB_ROOT"; find port -name '*.cc' | tr "\n" " "`
  
@@ -11,7 +13,7 @@ Remove -fno-builtin-memcmp and -ltcmalloc
  case "$TARGET_OS" in
      Darwin)
          PLATFORM=OS_MACOSX
-@@ -147,7 +147,7 @@ case "$TARGET_OS" in
+@@ -166,7 +166,7 @@ case "$TARGET_OS" in
          PLATFORM=OS_LINUX
          COMMON_FLAGS="$COMMON_FLAGS -DOS_LINUX"
          if [ -z "$USE_CLANG" ]; then
@@ -20,7 +22,7 @@ Remove -fno-builtin-memcmp and -ltcmalloc
          else
              PLATFORM_LDFLAGS="$PLATFORM_LDFLAGS -latomic"
          fi
-@@ -174,34 +174,34 @@ EOF
+@@ -193,21 +193,21 @@ EOF
          ;;
      SunOS)
          PLATFORM=OS_SOLARIS
@@ -45,6 +47,17 @@ Remove -fno-builtin-memcmp and -ltcmalloc
          PLATFORM_LDFLAGS="$PLATFORM_LDFLAGS -lpthread"
          # PORT_FILES=port/freebsd/freebsd_specific.cc
          ;;
+@@ -215,7 +215,7 @@ EOF
+         PLATFORM=OS_GNU_KFREEBSD
+         COMMON_FLAGS="$COMMON_FLAGS -DOS_GNU_KFREEBSD"
+         if [ -z "$USE_CLANG" ]; then
+-            COMMON_FLAGS="$COMMON_FLAGS -fno-builtin-memcmp"
++            COMMON_FLAGS="$COMMON_FLAGS"
+         else
+             PLATFORM_LDFLAGS="$PLATFORM_LDFLAGS -latomic"
+         fi
+@@ -224,14 +224,14 @@ EOF
+         ;;
      NetBSD)
          PLATFORM=OS_NETBSD
 -        COMMON_FLAGS="$COMMON_FLAGS -fno-builtin-memcmp -D_REENTRANT -DOS_NETBSD"
@@ -60,7 +73,7 @@ Remove -fno-builtin-memcmp and -ltcmalloc
          PLATFORM_LDFLAGS="$PLATFORM_LDFLAGS -pthread"
          # PORT_FILES=port/openbsd/openbsd_specific.cc
  	FIND=gfind
-@@ -209,7 +209,7 @@ EOF
+@@ -239,7 +239,7 @@ EOF
          ;;
      DragonFly)
          PLATFORM=OS_DRAGONFLYBSD
@@ -69,7 +82,7 @@ Remove -fno-builtin-memcmp and -ltcmalloc
          PLATFORM_LDFLAGS="$PLATFORM_LDFLAGS -lpthread"
          # PORT_FILES=port/dragonfly/dragonfly_specific.cc
          ;;
-@@ -219,7 +219,7 @@ EOF
+@@ -249,7 +249,7 @@ EOF
          PLATFORM_CXXFLAGS="-std=gnu++11"
          COMMON_FLAGS="$COMMON_FLAGS -DCYGWIN"
          if [ -z "$USE_CLANG" ]; then
@@ -78,7 +91,7 @@ Remove -fno-builtin-memcmp and -ltcmalloc
          else
              PLATFORM_LDFLAGS="$PLATFORM_LDFLAGS -latomic"
          fi
-@@ -228,7 +228,7 @@ EOF
+@@ -258,7 +258,7 @@ EOF
          ;;
      OS_ANDROID_CROSSCOMPILE)
          PLATFORM=OS_ANDROID
@@ -87,10 +100,10 @@ Remove -fno-builtin-memcmp and -ltcmalloc
  	PLATFORM_LDFLAGS="$PLATFORM_LDFLAGS "  # All pthread features are in the Android C library
          # PORT_FILES=port/android/android.cc
          CROSS_COMPILE=true
-@@ -410,9 +410,9 @@ EOF
+@@ -448,9 +448,9 @@ EOF
      if ! test $JEMALLOC && ! test $ROCKSDB_DISABLE_TCMALLOC; then
          # jemalloc is not available. Let's try tcmalloc
-         if echo 'int main() {}' | $CXX $CFLAGS -x c++ - -o /dev/null \
+         if echo 'int main() {}' | $CXX $PLATFORM_CXXFLAGS -x c++ - -o test.o \
 -          -ltcmalloc 2>/dev/null; then
 -            PLATFORM_LDFLAGS="$PLATFORM_LDFLAGS -ltcmalloc"
 -            JAVA_LDFLAGS="$JAVA_LDFLAGS -ltcmalloc"
diff --git a/databases/rocksdb/files/patch-clang10 b/databases/rocksdb/files/patch-clang10
deleted file mode 100644
index ae35e4b08538..000000000000
--- a/databases/rocksdb/files/patch-clang10
+++ /dev/null
@@ -1,145 +0,0 @@
-Obtained from:	https://github.com/facebook/rocksdb/commit/9cc25190e1ba6fc66bbd0d47caaf043d75839b6f
-
---- db/db_iter_stress_test.cc.orig	2020-07-16 00:54:15 UTC
-+++ db/db_iter_stress_test.cc
-@@ -97,7 +97,8 @@ struct StressTestIterator : public InternalIterator {
- 
-   bool MaybeFail() {
-     if (rnd->Next() >=
--        std::numeric_limits<uint64_t>::max() * error_probability) {
-+        static_cast<double>(std::numeric_limits<uint64_t>::max()) *
-+            error_probability) {
-       return false;
-     }
-     if (rnd->Next() % 2) {
-@@ -114,7 +115,8 @@ struct StressTestIterator : public InternalIterator {
- 
-   void MaybeMutate() {
-     if (rnd->Next() >=
--        std::numeric_limits<uint64_t>::max() * mutation_probability) {
-+        static_cast<double>(std::numeric_limits<uint64_t>::max()) *
-+            mutation_probability) {
-       return;
-     }
-     do {
-@@ -126,8 +128,9 @@ struct StressTestIterator : public InternalIterator {
-       if (data->hidden.empty()) {
-         hide_probability = 1;
-       }
--      bool do_hide =
--          rnd->Next() < std::numeric_limits<uint64_t>::max() * hide_probability;
-+      bool do_hide = rnd->Next() <
-+                     static_cast<double>(std::numeric_limits<uint64_t>::max()) *
-+                         hide_probability;
-       if (do_hide) {
-         // Hide a random entry.
-         size_t idx = rnd->Next() % data->entries.size();
---- db/db_options_test.cc.orig	2020-07-16 00:54:15 UTC
-+++ db/db_options_test.cc
-@@ -39,7 +39,7 @@ class DBOptionsTest : public DBTestBase {
-     std::unordered_map<std::string, std::string> options_map;
-     StringToMap(options_str, &options_map);
-     std::unordered_map<std::string, std::string> mutable_map;
--    for (const auto opt : db_options_type_info) {
-+    for (const auto& opt : db_options_type_info) {
-       if (opt.second.IsMutable() && opt.second.ShouldSerialize()) {
-         mutable_map[opt.first] = options_map[opt.first];
-       }
-@@ -57,7 +57,7 @@ class DBOptionsTest : public DBTestBase {
-     std::unordered_map<std::string, std::string> options_map;
-     StringToMap(options_str, &options_map);
-     std::unordered_map<std::string, std::string> mutable_map;
--    for (const auto opt : cf_options_type_info) {
-+    for (const auto& opt : cf_options_type_info) {
-       if (opt.second.IsMutable() && opt.second.ShouldSerialize()) {
-         mutable_map[opt.first] = options_map[opt.first];
-       }
---- env/env_test.cc.orig	2020-07-16 00:54:15 UTC
-+++ env/env_test.cc
-@@ -1047,7 +1047,7 @@ TEST_P(EnvPosixTestWithParam, RandomAccessUniqueIDConc
- 
-     // Collect and check whether the IDs are unique.
-     std::unordered_set<std::string> ids;
--    for (const std::string fname : fnames) {
-+    for (const std::string& fname : fnames) {
-       std::unique_ptr<RandomAccessFile> file;
-       std::string unique_id;
-       ASSERT_OK(env_->NewRandomAccessFile(fname, &file, soptions));
-@@ -1061,7 +1061,7 @@ TEST_P(EnvPosixTestWithParam, RandomAccessUniqueIDConc
-     }
- 
-     // Delete the files
--    for (const std::string fname : fnames) {
-+    for (const std::string& fname : fnames) {
-       ASSERT_OK(env_->DeleteFile(fname));
-     }
- 
---- options/options_helper.cc.orig	2020-07-16 00:54:15 UTC
-+++ options/options_helper.cc
-@@ -656,7 +656,7 @@ Status GetStringFromStruct(
-     std::string* opt_string) {
-   assert(opt_string);
-   opt_string->clear();
--  for (const auto iter : type_info) {
-+  for (const auto& iter : type_info) {
-     const auto& opt_info = iter.second;
-     // If the option is no longer used in rocksdb and marked as deprecated,
-     // we skip it in the serialization.
---- table/table_test.cc.orig	2020-07-16 00:54:15 UTC
-+++ table/table_test.cc
-@@ -228,7 +228,7 @@ class BlockConstructor: public Constructor {
-     block_ = nullptr;
-     BlockBuilder builder(table_options.block_restart_interval);
- 
--    for (const auto kv : kv_map) {
-+    for (const auto& kv : kv_map) {
-       builder.Add(kv.first, kv.second);
-     }
-     // Open the block
-@@ -352,7 +352,7 @@ class TableConstructor: public Constructor {
-         TablePropertiesCollectorFactory::Context::kUnknownColumnFamily,
-         file_writer_.get()));
- 
--    for (const auto kv : kv_map) {
-+    for (const auto& kv : kv_map) {
-       if (convert_to_internal_key_) {
-         ParsedInternalKey ikey(kv.first, kMaxSequenceNumber, kTypeValue);
-         std::string encoded;
-@@ -487,7 +487,7 @@ class MemTableConstructor: public Constructor {
-                              kMaxSequenceNumber, 0 /* column_family_id */);
-     memtable_->Ref();
-     int seq = 1;
--    for (const auto kv : kv_map) {
-+    for (const auto& kv : kv_map) {
-       memtable_->Add(seq, kTypeValue, kv.first, kv.second);
-       seq++;
-     }
-@@ -548,7 +548,7 @@ class DBConstructor: public Constructor {
-     delete db_;
-     db_ = nullptr;
-     NewDB();
--    for (const auto kv : kv_map) {
-+    for (const auto& kv : kv_map) {
-       WriteBatch batch;
-       batch.Put(kv.first, kv.second);
-       EXPECT_TRUE(db_->Write(WriteOptions(), &batch).ok());
-@@ -1224,7 +1224,7 @@ class FileChecksumTestHelper {
-   }
- 
-   Status WriteKVAndFlushTable() {
--    for (const auto kv : kv_map_) {
-+    for (const auto& kv : kv_map_) {
-       if (convert_to_internal_key_) {
-         ParsedInternalKey ikey(kv.first, kMaxSequenceNumber, kTypeValue);
-         std::string encoded;
---- tools/ldb_cmd_test.cc.orig	2020-07-16 00:54:15 UTC
-+++ tools/ldb_cmd_test.cc
-@@ -76,7 +76,7 @@ TEST_F(LdbCmdTest, HexToStringBadInputs) {
-   const vector<string> badInputs = {
-       "0xZZ", "123", "0xx5", "0x111G", "0x123", "Ox12", "0xT", "0x1Q1",
-   };
--  for (const auto badInput : badInputs) {
-+  for (const auto& badInput : badInputs) {
-     try {
-       ROCKSDB_NAMESPACE::LDBCommand::HexToString(badInput);
-       std::cerr << "Should fail on bad hex value: " << badInput << "\n";
diff --git a/databases/rocksdb/files/patch-db-db_test_util.cc b/databases/rocksdb/files/patch-db-db_test_util.cc
new file mode 100644
index 000000000000..3ab185f0c560
--- /dev/null
+++ b/databases/rocksdb/files/patch-db-db_test_util.cc
@@ -0,0 +1,119 @@
+--- db/db_test_util.cc.orig	2023-02-19 21:44:55 UTC
++++ db/db_test_util.cc
+@@ -102,9 +102,11 @@ DBTestBase::DBTestBase(const std::string path, bool en
+ }
+ 
+ DBTestBase::~DBTestBase() {
++#ifndef NDEBUG
+   ROCKSDB_NAMESPACE::SyncPoint::GetInstance()->DisableProcessing();
+   ROCKSDB_NAMESPACE::SyncPoint::GetInstance()->LoadDependency({});
+   ROCKSDB_NAMESPACE::SyncPoint::GetInstance()->ClearAllCallBacks();
++#endif
+   Close();
+   Options options;
+   options.db_paths.emplace_back(dbname_, 0);
+@@ -338,6 +340,7 @@ Options DBTestBase::GetOptions(
+   Options options = default_options;
+   BlockBasedTableOptions table_options;
+   bool set_block_based_table_factory = true;
++#ifndef NDEBUG
+ #if !defined(OS_MACOSX) && !defined(OS_WIN) && !defined(OS_SOLARIS) && \
+     !defined(OS_AIX)
+   ROCKSDB_NAMESPACE::SyncPoint::GetInstance()->ClearCallBack(
+@@ -345,6 +348,7 @@ Options DBTestBase::GetOptions(
+   ROCKSDB_NAMESPACE::SyncPoint::GetInstance()->ClearCallBack(
+       "NewWritableFile:O_DIRECT");
+ #endif
++#endif
+   // kMustFreeHeapAllocations -> indicates ASAN build
+   if (kMustFreeHeapAllocations && !options_override.full_block_cache) {
+     // Detecting block cache use-after-free is normally difficult in unit
+@@ -409,7 +413,9 @@ Options DBTestBase::GetOptions(
+       options.use_direct_reads = true;
+       options.use_direct_io_for_flush_and_compaction = true;
+       options.compaction_readahead_size = 2 * 1024 * 1024;
++#ifndef NDEBUG
+       SetupSyncPointsToMockDirectIO();
++#endif
+       break;
+     }
+     case kMergePut:
+@@ -1141,6 +1147,7 @@ std::string DBTestBase::FilesPerLevel(int cf) {
+ }
+ 
+ 
++#ifndef NDEBUG
+ std::vector<uint64_t> DBTestBase::GetBlobFileNumbers() {
+   VersionSet* const versions = dbfull()->GetVersionSet();
+   assert(versions);
+@@ -1166,6 +1173,7 @@ std::vector<uint64_t> DBTestBase::GetBlobFileNumbers()
+ 
+   return result;
+ }
++#endif
+ 
+ size_t DBTestBase::CountFiles() {
+   size_t count = 0;
+@@ -1248,6 +1256,7 @@ void DBTestBase::FillLevels(const std::string& smalles
+ }
+ 
+ void DBTestBase::MoveFilesToLevel(int level, int cf) {
++#ifndef NDEBUG
+   for (int l = 0; l < level; ++l) {
+     if (cf > 0) {
+       EXPECT_OK(dbfull()->TEST_CompactRange(l, nullptr, nullptr, handles_[cf]));
+@@ -1255,12 +1264,15 @@ void DBTestBase::MoveFilesToLevel(int level, int cf) {
+       EXPECT_OK(dbfull()->TEST_CompactRange(l, nullptr, nullptr));
+     }
+   }
++#endif
+ }
+ 
+ void DBTestBase::DumpFileCounts(const char* label) {
+   fprintf(stderr, "---\n%s:\n", label);
++#ifndef NDEBUG
+   fprintf(stderr, "maxoverlap: %" PRIu64 "\n",
+           dbfull()->TEST_MaxNextLevelOverlappingBytes());
++#endif
+   for (int level = 0; level < db_->NumberLevels(); level++) {
+     int num = NumTableFilesAtLevel(level);
+     if (num > 0) {
+@@ -1302,10 +1314,12 @@ void DBTestBase::GenerateNewFile(int cf, Random* rnd, 
+     ASSERT_OK(Put(cf, Key(*key_idx), rnd->RandomString((i == 99) ? 1 : 990)));
+     (*key_idx)++;
+   }
++#ifndef NDEBUG
+   if (!nowait) {
+     ASSERT_OK(dbfull()->TEST_WaitForFlushMemTable());
+     ASSERT_OK(dbfull()->TEST_WaitForCompact());
+   }
++#endif
+ }
+ 
+ // this will generate non-overlapping files since it keeps increasing key_idx
+@@ -1314,10 +1328,12 @@ void DBTestBase::GenerateNewFile(Random* rnd, int* key
+     ASSERT_OK(Put(Key(*key_idx), rnd->RandomString((i == 99) ? 1 : 990)));
+     (*key_idx)++;
+   }
++#ifndef NDEBUG
+   if (!nowait) {
+     ASSERT_OK(dbfull()->TEST_WaitForFlushMemTable());
+     ASSERT_OK(dbfull()->TEST_WaitForCompact());
+   }
++#endif
+ }
+ 
+ const int DBTestBase::kNumKeysByGenerateNewRandomFile = 51;
+@@ -1327,10 +1343,12 @@ void DBTestBase::GenerateNewRandomFile(Random* rnd, bo
+     ASSERT_OK(Put("key" + rnd->RandomString(7), rnd->RandomString(2000)));
+   }
+   ASSERT_OK(Put("key" + rnd->RandomString(7), rnd->RandomString(200)));
++#ifndef NDEBUG
+   if (!nowait) {
+     ASSERT_OK(dbfull()->TEST_WaitForFlushMemTable());
+     ASSERT_OK(dbfull()->TEST_WaitForCompact());
+   }
++#endif
+ }
+ 
+ std::string DBTestBase::IterStatus(Iterator* iter) {
diff --git a/databases/rocksdb/files/patch-memory-arena.cc b/databases/rocksdb/files/patch-memory-arena.cc
deleted file mode 100644
index 1a7ea39671bf..000000000000
--- a/databases/rocksdb/files/patch-memory-arena.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- memory/arena.cc.orig	2018-01-31 01:15:39 UTC
-+++ memory/arena.cc
-@@ -33,7 +33,7 @@ const size_t Arena::kInlineSize;
- 
- const size_t Arena::kMinBlockSize = 4096;
- const size_t Arena::kMaxBlockSize = 2u << 30;
--static const int kAlignUnit = alignof(max_align_t);
-+static const int kAlignUnit = alignof(std::max_align_t);
- 
- size_t OptimizeBlockSize(size_t block_size) {
-   // Make sure block_size is in optimal range
diff --git a/databases/rocksdb/files/patch-memory-arena.h b/databases/rocksdb/files/patch-memory-arena.h
deleted file mode 100644
index a1dda117600a..000000000000
--- a/databases/rocksdb/files/patch-memory-arena.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- memory/arena.h.orig	2018-01-31 01:15:39 UTC
-+++ memory/arena.h
-@@ -82,7 +82,7 @@ class Arena : public Allocator {
-   }
- 
-  private:
--  char inline_block_[kInlineSize] __attribute__((__aligned__(alignof(max_align_t))));
-+  char inline_block_[kInlineSize] __attribute__((__aligned__(alignof(std::max_align_t))));
-   // Number of bytes allocated in one block
-   const size_t kBlockSize;
-   // Array of new[] allocated memory blocks
diff --git a/databases/rocksdb/files/patch-memory-arena_test.cc b/databases/rocksdb/files/patch-memory-arena_test.cc
index ccbdef9fc0b7..5c5b33c8cd31 100644
--- a/databases/rocksdb/files/patch-memory-arena_test.cc
+++ b/databases/rocksdb/files/patch-memory-arena_test.cc
@@ -1,6 +1,6 @@
---- memory/arena_test.cc.orig	2018-01-31 01:15:39 UTC
+--- memory/arena_test.cc.orig	2023-02-19 21:44:55 UTC
 +++ memory/arena_test.cc
-@@ -91,7 +91,7 @@ static void ApproximateMemoryUsageTest(s
+@@ -96,7 +96,7 @@ static void ApproximateMemoryUsageTest(size_t huge_pag
    ASSERT_EQ(kZero, arena.ApproximateMemoryUsage());
  
    // allocate inline bytes
diff --git a/databases/rocksdb/files/patch-port-stack_trace.cc b/databases/rocksdb/files/patch-port-stack_trace.cc
new file mode 100644
index 000000000000..f3d3c09689ae
--- /dev/null
+++ b/databases/rocksdb/files/patch-port-stack_trace.cc
@@ -0,0 +1,10 @@
+--- port/stack_trace.cc.orig	2023-09-01 20:58:39 UTC
++++ port/stack_trace.cc
+@@ -37,6 +37,7 @@ void* SaveStack(int* /*num_frames*/, int /*first_frame
+ #endif  // OS_OPENBSD
+ #ifdef OS_FREEBSD
+ #include <sys/sysctl.h>
++#include <sys/wait.h>
+ #endif  // OS_FREEBSD
+ #ifdef OS_LINUX
+ #include <sys/prctl.h>
diff --git a/databases/rocksdb/files/patch-powerpc64 b/databases/rocksdb/files/patch-powerpc64
new file mode 100644
index 000000000000..1cebaf2dbac2
--- /dev/null
+++ b/databases/rocksdb/files/patch-powerpc64
@@ -0,0 +1,25 @@
+--- utilities/transactions/lock/range/range_tree/lib/portability/toku_time.h.orig	2021-12-10 22:56:20 UTC
++++ utilities/transactions/lock/range/range_tree/lib/portability/toku_time.h
+@@ -58,7 +58,7 @@ Copyright (c) 2006, 2015, Percona and/or its affiliate
+ #include <stdint.h>
+ #include <sys/time.h>
+ #include <time.h>
+-#if defined(__powerpc__)
++#if defined(__powerpc__) && defined(__linux__)
+ #include <sys/platform/ppc.h>
+ #endif
+ 
+@@ -132,7 +132,13 @@ static inline tokutime_t toku_time_now(void) {
+   __asm __volatile__("mrs %[rt], cntvct_el0" : [ rt ] "=r"(result));
+   return result;
+ #elif defined(__powerpc__)
++#ifdef __linux__
+   return __ppc_get_timebase();
++#elif defined(__FreeBSD__)
++  int64_t tbr;
++  asm volatile("mfspr %0, 268" : "=r"(tbr));
++  return tbr;
++#endif
+ #elif defined(__s390x__)
+   uint64_t result;
+   asm volatile("stckf %0" : "=Q"(result) : : "cc");
diff --git a/databases/rocksdb/files/patch-util_crc32c.cc b/databases/rocksdb/files/patch-util_crc32c.cc
deleted file mode 100644
index 71f38e5898ca..000000000000
--- a/databases/rocksdb/files/patch-util_crc32c.cc
+++ /dev/null
@@ -1,24 +0,0 @@
---- util/crc32c.cc.orig	2020-12-01 23:49:39 UTC
-+++ util/crc32c.cc
-@@ -463,6 +463,21 @@ static int arch_ppc_probe(void) {
- 
-   return arch_ppc_crc32;
- }
-+#elif __FreeBSD__
-+#include <machine/cpu.h>
-+#include <sys/auxv.h>
-+#include <sys/elf_common.h>
-+static int arch_ppc_probe(void) {
-+  unsigned long cpufeatures;
-+  arch_ppc_crc32 = 0;
-+
-+#if defined(__powerpc64__)
-+  elf_aux_info(AT_HWCAP2, &cpufeatures, sizeof(cpufeatures));
-+  if (cpufeatures & PPC_FEATURE2_HAS_VEC_CRYPTO) arch_ppc_crc32 = 1;
-+#endif  /* __powerpc64__ */
-+
-+  return arch_ppc_crc32;
-+}
- #endif  // __linux__
- 
- static bool isAltiVec() {
diff --git a/databases/rocksdb/pkg-descr b/databases/rocksdb/pkg-descr
index a8ef4259b2b1..81849ad193c7 100644
--- a/databases/rocksdb/pkg-descr
+++ b/databases/rocksdb/pkg-descr
@@ -5,6 +5,3 @@ on embedded workloads.
 RocksDB builds on LevelDB to be scalable to run on servers with many CPU cores,
 to efficiently use fast storage, to support IO-bound, in-memory and write-once
 workloads, and to be flexible to allow for innovation.
-
-WWW: https://rocksdb.org/
-WWW: https://github.com/facebook/rocksdb
diff --git a/databases/rocksdb/pkg-plist b/databases/rocksdb/pkg-plist
index 56d57e31ef6d..ab978a14a0be 100644
--- a/databases/rocksdb/pkg-plist
+++ b/databases/rocksdb/pkg-plist
@@ -14,15 +14,22 @@ bin/sst_dump
 bin/table_reader_bench
 bin/trace_analyzer
 bin/write_stress
+include/rocksdb/advanced_cache.h
 include/rocksdb/advanced_options.h
+include/rocksdb/block_cache_trace_writer.h
 include/rocksdb/c.h
 include/rocksdb/cache.h
+include/rocksdb/cache_bench_tool.h
 include/rocksdb/cleanable.h
 include/rocksdb/compaction_filter.h
 include/rocksdb/compaction_job_stats.h
 include/rocksdb/comparator.h
+include/rocksdb/compression_type.h
 include/rocksdb/concurrent_task_limiter.h
+include/rocksdb/configurable.h
 include/rocksdb/convenience.h
+include/rocksdb/customizable.h
+include/rocksdb/data_structure.h
 include/rocksdb/db.h
 include/rocksdb/db_bench_tool.h
 include/rocksdb/db_dump_tool.h
@@ -34,6 +41,7 @@ include/rocksdb/file_checksum.h
 include/rocksdb/file_system.h
 include/rocksdb/filter_policy.h
 include/rocksdb/flush_block_policy.h
+include/rocksdb/functor_wrapper.h
 include/rocksdb/io_status.h
 include/rocksdb/iostats_context.h
 include/rocksdb/iterator.h
@@ -47,8 +55,10 @@ include/rocksdb/options.h
 include/rocksdb/perf_context.h
 include/rocksdb/perf_level.h
 include/rocksdb/persistent_cache.h
+include/rocksdb/port_defs.h
 include/rocksdb/rate_limiter.h
 include/rocksdb/rocksdb_namespace.h
+include/rocksdb/secondary_cache.h
 include/rocksdb/slice.h
 include/rocksdb/slice_transform.h
 include/rocksdb/snapshot.h
@@ -56,23 +66,31 @@ include/rocksdb/sst_dump_tool.h
 include/rocksdb/sst_file_manager.h
 include/rocksdb/sst_file_reader.h
 include/rocksdb/sst_file_writer.h
+include/rocksdb/sst_partitioner.h
 include/rocksdb/statistics.h
 include/rocksdb/stats_history.h
 include/rocksdb/status.h
+include/rocksdb/system_clock.h
 include/rocksdb/table.h
 include/rocksdb/table_properties.h
+include/rocksdb/table_reader_caller.h
 include/rocksdb/thread_status.h
 include/rocksdb/threadpool.h
 include/rocksdb/trace_reader_writer.h
+include/rocksdb/trace_record.h
+include/rocksdb/trace_record_result.h
 include/rocksdb/transaction_log.h
 include/rocksdb/types.h
+include/rocksdb/unique_id.h
 include/rocksdb/universal_compaction.h
-include/rocksdb/utilities/backupable_db.h
+include/rocksdb/utilities/agg_merge.h
+include/rocksdb/utilities/backup_engine.h
+include/rocksdb/utilities/cache_dump_load.h
 include/rocksdb/utilities/checkpoint.h
 include/rocksdb/utilities/convenience.h
+include/rocksdb/utilities/customizable_util.h
 include/rocksdb/utilities/db_ttl.h
 include/rocksdb/utilities/debug.h
-include/rocksdb/utilities/env_librados.h
 include/rocksdb/utilities/env_mirror.h
 include/rocksdb/utilities/info_log_finder.h
 include/rocksdb/utilities/ldb_cmd.h
@@ -84,29 +102,27 @@ include/rocksdb/utilities/memory_util.h
 include/rocksdb/utilities/object_registry.h
 include/rocksdb/utilities/optimistic_transaction_db.h
 include/rocksdb/utilities/option_change_migration.h
+include/rocksdb/utilities/options_type.h
 include/rocksdb/utilities/options_util.h
+include/rocksdb/utilities/replayer.h
 include/rocksdb/utilities/sim_cache.h
 include/rocksdb/utilities/stackable_db.h
 include/rocksdb/utilities/table_properties_collectors.h
 include/rocksdb/utilities/transaction.h
 include/rocksdb/utilities/transaction_db.h
 include/rocksdb/utilities/transaction_db_mutex.h
-include/rocksdb/utilities/utility_db.h
 include/rocksdb/utilities/write_batch_with_index.h
 include/rocksdb/version.h
 include/rocksdb/wal_filter.h
+include/rocksdb/wide_columns.h
 include/rocksdb/write_batch.h
 include/rocksdb/write_batch_base.h
 include/rocksdb/write_buffer_manager.h
-%%LITE%%lib/librocksdb-lite.a
-%%LITE%%lib/librocksdb-lite.so
-%%LITE%%lib/librocksdb-lite.so.6
-%%LITE%%lib/librocksdb-lite.so.%%SHLIB_VER%%
-%%LITE%%lib/librocksdb-lite.so.%%PORTVERSION%%
-%%LITE%%lib/librocksdb-lite_tools.a
 lib/librocksdb.a
 lib/librocksdb.so
-lib/librocksdb.so.6
+lib/librocksdb.so.9
 lib/librocksdb.so.%%SHLIB_VER%%
 lib/librocksdb.so.%%PORTVERSION%%
-lib/librocksdb_tools.a
+lib/librocksdb_test.so
+lib/librocksdb_tools.so
+libdata/pkgconfig/rocksdb.pc
diff --git a/databases/rqlite/Makefile b/databases/rqlite/Makefile
new file mode 100644
index 000000000000..9ddd6cbf571e
--- /dev/null
+++ b/databases/rqlite/Makefile
@@ -0,0 +1,24 @@
+PORTNAME=	rqlite
+DISTVERSIONPREFIX=	v
+DISTVERSION=	8.23.2
+CATEGORIES=	databases
+
+MAINTAINER=	yuri@FreeBSD.org
+COMMENT=	Lightweight, distributed relational database built on SQLite
+WWW=		https://rqlite.io/
+
+LICENSE=	MIT
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
+USES=		go:1.21,modules
+
+GO_MODULE=	github.com/rqlite/rqlite/v8
+GO_TARGET=	./cmd/rqbench \
+		./cmd/rqlite \
+		./cmd/rqlited
+
+PLIST_FILES=	bin/rqbench \
+		bin/rqlite \
+		bin/rqlited
+
+.include <bsd.port.mk>
diff --git a/databases/rqlite/distinfo b/databases/rqlite/distinfo
new file mode 100644
index 000000000000..2c57a35a70c1
--- /dev/null
+++ b/databases/rqlite/distinfo
@@ -0,0 +1,5 @@
+TIMESTAMP = 1713844853
+SHA256 (go/databases_rqlite/rqlite-v8.23.2/v8.23.2.mod) = f4ab31411d1ced2f7114dfd00d9a2afa967b1f9b3bed8802ddb719546dae77d0
+SIZE (go/databases_rqlite/rqlite-v8.23.2/v8.23.2.mod) = 2591
+SHA256 (go/databases_rqlite/rqlite-v8.23.2/v8.23.2.zip) = 13d1c0b6ab619e59d9d65ef57e962cb02b28b7351bf03cc212702040da32b36c
+SIZE (go/databases_rqlite/rqlite-v8.23.2/v8.23.2.zip) = 711612
diff --git a/databases/rqlite/pkg-descr b/databases/rqlite/pkg-descr
new file mode 100644
index 000000000000..c1fcc9730751
--- /dev/null
+++ b/databases/rqlite/pkg-descr
@@ -0,0 +1,4 @@
+rqlite combines SQLite's simplicity with the power of a robust, fault-tolerant
+distributed database. It's designed for easy deployment and efficient operation,
+offering a developer-friendly and operation-centric solution across various
+systems.
diff --git a/databases/rrdman/Makefile b/databases/rrdman/Makefile
index c448be6ad0d7..e9e19aa2a351 100644
--- a/databases/rrdman/Makefile
+++ b/databases/rrdman/Makefile
@@ -1,19 +1,19 @@
-# Created by: Janos Mohacsi <janos.mohacsi@bsd.hu>
-
 PORTNAME=	rrdman
 PORTVERSION=	1.0.1
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	databases
 MASTER_SITES=	SF/rrfw/${PORTNAME}/${PORTVERSION}
 
 MAINTAINER=	jmohacsi@bsd.hu
 COMMENT=	Apply Holt-Winters prediction parameters to RRD data
+WWW=		https://rrfw.sourceforge.net/rrdman/
 
 BUILD_DEPENDS=	rrdtool:databases/rrdtool
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 GNU_CONFIGURE=	YES
+GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
 USES=		perl5
-PLIST_FILES=	bin/rrd_hwreapply man/man1/rrd_hwreapply.1.gz
+PLIST_FILES=	bin/rrd_hwreapply share/man/man1/rrd_hwreapply.1.gz
 
 .include <bsd.port.mk>
diff --git a/databases/rrdman/pkg-descr b/databases/rrdman/pkg-descr
index c4a150b10291..95a238ac7659 100644
--- a/databases/rrdman/pkg-descr
+++ b/databases/rrdman/pkg-descr
@@ -4,5 +4,3 @@ Currently it consists of the following utilities:
     * rrd_hwreapply: Re-apply Holt-Winters prediction parameters to RRD data
 
 RRDman is hosted as a subproject of RRFW
-
-WWW: http://rrfw.sourceforge.net/rrdman/
diff --git a/databases/rrdmerge/Makefile b/databases/rrdmerge/Makefile
index ba892ef71712..869588ed0f5c 100644
--- a/databases/rrdmerge/Makefile
+++ b/databases/rrdmerge/Makefile
@@ -1,5 +1,3 @@
-# Created by: sobomax
-
 PORTNAME=	rrdmerge
 PORTVERSION=	0.0.1
 PORTREVISION=	2
@@ -7,8 +5,9 @@ CATEGORIES=	databases
 MASTER_SITES=	http://download.sippysoft.com/thirdparty/
 DISTNAME=	${PORTNAME}-${GITREVISION}
 
-MAINTAINER=	sobomax@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Utility to merge existing RRD data from backups into new RRD files
+WWW=		https://bitbucket.org/ctheune/rrdmerge/
 
 LICENSE=	GPLv3+
 
diff --git a/databases/rrdmerge/pkg-descr b/databases/rrdmerge/pkg-descr
index 7e411e8626fb..a7221406f191 100644
--- a/databases/rrdmerge/pkg-descr
+++ b/databases/rrdmerge/pkg-descr
@@ -1,5 +1,3 @@
 A simple utility to merge existing RRD data from backups into new RRD files
 that have started gathering data already. Useful for getting historical data
 back while performing disaster recovery.
-
-WWW: https://bitbucket.org/ctheune/rrdmerge/
diff --git a/databases/rrdtool/Makefile b/databases/rrdtool/Makefile
index 45e786b0ac50..9cdd46f931ad 100644
--- a/databases/rrdtool/Makefile
+++ b/databases/rrdtool/Makefile
@@ -1,89 +1,83 @@
-# Created by: Dmitry Sivachenko <dima@Chg.RU>
-
 PORTNAME=	rrdtool
-PORTVERSION=	1.7.2
+DISTVERSION=	1.8.0
 PORTREVISION=	4
 CATEGORIES=	databases graphics
-MASTER_SITES=	http://oss.oetiker.ch/rrdtool/pub/
+MASTER_SITES=	https://github.com/oetiker/rrdtool-1.x/releases/download/v${DISTVERSION}/
 
-MAINTAINER=	zeising@FreeBSD.org
+MAINTAINER=	eduardo@FreeBSD.org
 COMMENT=	Round Robin Database Tools
+WWW=		https://oss.oetiker.ch/rrdtool/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-CONFLICTS=	rrdtool12-*
-
-CONFIGURE_ARGS=	--disable-tcl
-CPPFLAGS+=	-I${LOCALBASE}/include -I${LOCALBASE}/include/freetype2
-USE_RC_SUBR=	rrdcached
-USE_LDCONFIG=	yes
-GNU_CONFIGURE=	yes
 USES=		cpe gmake gnome libtool pathfix pkgconfig shebangfix
+CPE_VENDOR=	rrdtool_project
 USE_GNOME=	glib20 libxml2
+USE_LDCONFIG=	yes
+USE_RC_SUBR=	rrdcached
+SHEBANG_FILES=	examples/rrdcached/rrdcached-size.pl examples/stripes.py
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--disable-tcl
+CONFIGURE_ENV=	RRDDOCDIR=${DOCSDIR:Q}
 INSTALL_TARGET=	install-strip
-CPE_VENDOR=	rrdtool_project
-
+CPPFLAGS+=	-I${LOCALBASE}/include -I${LOCALBASE}/include/freetype2
+# Some symbols in the linker version script librrd.sym are undefined when the
+# CACHE option is off. Suppress errors with lld >= 17 due to these undefined
+# symbols.
+LDFLAGS+=	-Wl,--undefined-version
+CONFLICTS=	rrdtool12
+PORTDOCS=	*
 PORTEXAMPLES=	cgi-demo.cgi
 
-OPTIONS_DEFINE=	DEJAVU GRAPH MMAP NLS PERL PYTHON \
-		RUBY EXAMPLES DOCS
-OPTIONS_DEFAULT=DEJAVU GRAPH MMAP PERL
-OPTIONS_SUB=	yes
-GRAPH_DESC=	Enable the rrdtool graph command (needs cairo)
-DEJAVU_DESC=	Use DejaVu fonts (requires X11)
-MMAP_DESC=	Use mmap in rrd_update
-PERL_DESC=	Build PERL module
-PYTHON_DESC=	Build PYTHON bindings
-RUBY_DESC=	Build RUBY bindings
-
-DEJAVU_RUN_DEPENDS=	dejavu>0:x11-fonts/dejavu
-
-DOCS_CONFIGURE_ENABLE=	docs
-DOCS_USES=		groff
-
-GRAPH_CONFIGURE_OFF=	--disable-rrdcgi --disable-rrd_graph
-GRAPH_LIB_DEPENDS=	libfreetype.so:print/freetype2 \
-			libpng.so:graphics/png
-GRAPH_USE=		GNOME=cairo,pango
-MMAP_CONFIGURE_ENABLE=	mmap
-NLS_CONFIGURE_ENABLE=	nls
-NLS_USE=		GNOME=intltool
-NLS_USES=		gettext localbase
-PERL_CONFIGURE_OFF=	--disable-perl
-PERL_CONFIGURE_ON=	--enable-perl --enable-perl-site-install
-PERL_MAKE_ARGS=		PERL_MAKE_OPTIONS='PREFIX="${PREFIX}" INSTALLPRIVLIB="${PREFIX}/lib" INSTALLARCHLIB="${PREFIX}/lib"'
-PERL_USES=		perl5
-PYTHON_CONFIGURE_ENABLE=python
-PYTHON_USES=		python
-PYTHON_USE=		python=flavors,optsuffix
-RUBY_CONFIGURE_ENABLE=	ruby
-RUBY_USE=		RUBY=yes
-
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MPERL}
-SHEBANG_FILES=	examples/rrdcached/rrdcached-size.pl
-PORTEXAMPLES+=	4charts.pl bigtops.pl minmax.pl perftest.pl \
-		piped-demo.pl shared-demo.pl stripes.pl \
-		rrdcached/RRDCached.pm rrdcached/rrdcached-size.pl
-.endif
-.if ${PORT_OPTIONS:MPYTHON}
-SHEBANG_FILES+=	examples/stripes.py
-PORTEXAMPLES+=	stripes.py
-.endif
+OPTIONS_DEFINE=		DEJAVU DOCS EXAMPLES GRAPH LOCKTIMEOUT MMAP NLS PERL \
+			PYTHON RUBY
+OPTIONS_DEFAULT=	DEJAVU GRAPH MMAP PERL
+OPTIONS_SUB=		yes
+DEJAVU_DESC=		Use DejaVu fonts (requires X11)
+GRAPH_DESC=		Enable the rrdtool graph command (needs cairo)
+LOCKTIMEOUT_DESC=	Enable the patch for lock timeout
+MMAP_DESC=		Use mmap in rrd_update
+PERL_DESC=		Build PERL module
+PYTHON_DESC=		Build PYTHON bindings
+RUBY_DESC=		Build RUBY bindings
+
+DEJAVU_RUN_DEPENDS=		dejavu>0:x11-fonts/dejavu
+DOCS_USES=			groff
+DOCS_CONFIGURE_ENABLE=		docs
+EXAMPLES_CONFIGURE_ENABLE=	examples
+GRAPH_LIB_DEPENDS=		libfreetype.so:print/freetype2 \
+				libharfbuzz.so:print/harfbuzz \
+				libpng.so:graphics/png
+GRAPH_USE=			GNOME=cairo,pango
+GRAPH_CONFIGURE_OFF=		--disable-rrd_graph \
+				--disable-rrdcgi
+LOCKTIMEOUT_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-locktimeout
+MMAP_CONFIGURE_ENABLE=		mmap
+NLS_USES=			gettext localbase
+NLS_USE=			GNOME=intltool
+NLS_CONFIGURE_ENABLE=		nls
+PERL_USES=			perl5
+PERL_CONFIGURE_ON=		--enable-perl \
+				--enable-perl-site-install
+PERL_CONFIGURE_OFF=		--disable-perl
+PERL_MAKE_ARGS=			PERL_MAKE_OPTIONS='PREFIX="${PREFIX}" INSTALLPRIVLIB="${PREFIX}/lib" INSTALLARCHLIB="${PREFIX}/lib"'
+PERL_PORTEXAMPLES=		4charts.pl bigtops.pl minmax.pl perftest.pl \
+				piped-demo.pl rrdcached/rrdcached-size.pl \
+				rrdcached/RRDCached.pm shared-demo.pl \
+				stripes.pl
+PYTHON_BUILD_DEPENDS=		${PY_SETUPTOOLS}
+PYTHON_USES=			python
+PYTHON_USE=			PYTHON=flavors,optsuffix
+PYTHON_CONFIGURE_ENABLE=	python
+PYTHON_PORTEXAMPLES=		stripes.py
+RUBY_USES=			ruby
+RUBY_CONFIGURE_ENABLE=		ruby
 
 post-extract:
-	@${REINPLACE_CMD} -E 's|(^rrdcached_LDADD = librrd_th.la)|\1 $$\(ALL_LIBS\)|' \
-		${WRKSRC}/src/Makefile.in
-
 	@${REINPLACE_CMD} -E 's|(^rrdtool_LDADD = librrd.la)|\1 $$\(ALL_LIBS\)|' \
 		${WRKSRC}/src/Makefile.in
 
-post-extract-EXAMPLES-off:
-	@${REINPLACE_CMD} -e '/^SUBDIRS = /s| examples | |' \
-		${WRKSRC}/Makefile.in
-
 post-install-EXAMPLES-on:
 .if !defined(BATCH)
 	@${ECHO_MSG} ""
diff --git a/databases/rrdtool/distinfo b/databases/rrdtool/distinfo
index 4500a1f2c739..bb1b542fe402 100644
--- a/databases/rrdtool/distinfo
+++ b/databases/rrdtool/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1562346918
-SHA256 (rrdtool-1.7.2.tar.gz) = a199faeb7eff7cafc46fac253e682d833d08932f3db93a550a4a5af180ca58db
-SIZE (rrdtool-1.7.2.tar.gz) = 2883737
+TIMESTAMP = 1659536807
+SHA256 (rrdtool-1.8.0.tar.gz) = bd37614137d7a8dc523359648eb2a81631a34fd91a82ed5581916a52c08433f4
+SIZE (rrdtool-1.8.0.tar.gz) = 2955398
diff --git a/databases/rrdtool/files/extra-patch-locktimeout b/databases/rrdtool/files/extra-patch-locktimeout
new file mode 100644
index 000000000000..9d6d4607a7fb
--- /dev/null
+++ b/databases/rrdtool/files/extra-patch-locktimeout
@@ -0,0 +1,80 @@
+--- src/rrd_open.c.orig	2019-05-28 01:48:09.000000000 +0700
++++ src/rrd_open.c	2022-07-11 00:05:29.242533000 +0700
+@@ -32,6 +32,16 @@
+ #include "rrd_rados.h"
+ #endif
+ 
++#include <signal.h>
++/*
++ * Signal handler for SIGALRM.
++ */
++static void
++timeout(int sig)
++{
++    (void)sig;
++}
++
+ #define MEMBLK 8192
+ 
+ #ifdef _WIN32
+@@ -776,8 +786,9 @@ int rrd_rwlock(
+             return 0;
+     }
+ #endif
+-    int       rcstat;
++    int       rcstat, waitsec;
+     rrd_simple_file_t *rrd_simple_file;
++    char     *endptr, *pwaitsec;
+ 
+     rrd_simple_file = (rrd_simple_file_t *) rrd_file->pvt;
+ #ifdef USE_WINDOWS_LOCK
+@@ -786,6 +797,25 @@ int rrd_rwlock(
+     /* Silence unused parameter compiler warning */
+     (void) writelock;
+ #else
++    if ((pwaitsec = getenv("RRDTOOL_LOCK_TIMEOUT")) != NULL) {
++	waitsec = strtol(pwaitsec, &endptr, 0);
++	if (*endptr == '\0' && waitsec >= 0) {
++	    if (waitsec > 0) {			/* Set up a timeout. */
++	        struct sigaction act;
++
++	        act.sa_handler = timeout;
++	        sigemptyset(&act.sa_mask);
++	        act.sa_flags = SA_RESETHAND;	/* Note that we do not set SA_RESTART. */
++	        sigaction(SIGALRM, &act, NULL);
++	        alarm(waitsec);
++	    }
++	    rcstat = flock(rrd_simple_file->fd, writelock ? LOCK_EX : LOCK_SH);
++	    if (waitsec > 0)
++		alarm(0);
++
++	    return (rcstat);
++	}
++    }
+     {
+         struct flock lock;
+ 
+--- doc/rrdtool.pod.orig	2019-02-04 20:54:28.000000000 +0700
++++ doc/rrdtool.pod	2022-07-11 00:37:16.486373000 +0700
+@@ -321,6 +321,21 @@
+ L<rrdcached>, a caching daemon for RRDtool which may help you lessen the
+ stress on your disks.
+ 
++=head1 ENVIRONMENT
++
++=over 8
++
++=item RRDTOOL_LOCK_TIMEOUT
++
++By default, B<RRDtool> tries to lock RRD file and fails
++if it cannot obtain the lock immediately.
++This variable allows to change this behavior and specify
++a time interval in seconds to wait for lock if the file is busy.
++It will fail if the lock cannot be obtained in time.
++Zero value makes it wait for the lock indefinitely.
++
++=back
++
+ =head1 SEE ALSO
+ 
+ rrdcreate, rrdupdate, rrdgraph, rrddump, rrdfetch, rrdtune, rrdlast, rrdxport,
diff --git a/databases/rrdtool/files/patch-8829fa7.c b/databases/rrdtool/files/patch-8829fa7.c
deleted file mode 100644
index c6406a3f327c..000000000000
--- a/databases/rrdtool/files/patch-8829fa7.c
+++ /dev/null
@@ -1,35 +0,0 @@
-From 8829fa758f3e585f20094cff69b32489f4cce3e7 Mon Sep 17 00:00:00 2001
-From: Niclas Zeising
-Date: Sun, 14 Jun 2020 11:31:33 +0200
-Subject: [PATCH] rrd_open: Ignore EINVAL from posix_fallocate()
-
-ZFS on FreeBSD (at least) does not support posix_fallocate(),
-returning EINVAL instead.  Ignore this error and continue normally.
-Without this change, it is not possible to resize rrd files on ZFS.
-
-This fixes #1082
-
-Signed-off-by: Niclas Zeising
----
- src/rrd_open.c | 8 +++++++-
- 1 file changed, 7 insertions(+), 1 deletion(-)
-
-diff --git a/src/rrd_open.c b/src/rrd_open.c
-index d8005fe4..00dfb8ca 100644
---- src/rrd_open.c
-+++ src/rrd_open.c
-@@ -363,7 +363,13 @@ rrd_file_t *rrd_open(
-          */
-         int       fret =
-             posix_fallocate(rrd_simple_file->fd, 0, newfile_size);
--        if (fret) {
-+        /* ZFS (on FreeBSD) does not support posix_fallocate(), always returning
-+         * EINVAL.  Ignore this error and continue anyway.
-+         * Without this, resize isn't possible on ZFS filesystems.
-+         */
-+        if (fret == EINVAL) {
-+            /* DO NOTHING */
-+        } else if (fret) {
-             rrd_set_error("posix_fallocate '%s': %s", file_name,
-                           rrd_strerror(fret));
-             goto out_close;
diff --git a/databases/rrdtool/files/patch-bindings-Makefile.in b/databases/rrdtool/files/patch-bindings-Makefile.in
deleted file mode 100644
index e5bb6791a9b2..000000000000
--- a/databases/rrdtool/files/patch-bindings-Makefile.in
+++ /dev/null
@@ -1,21 +0,0 @@
---- bindings/Makefile.in.orig	2016-01-27 17:19:31 UTC
-+++ bindings/Makefile.in
-@@ -711,15 +711,15 @@ all-local:  @COMP_PERL@ @COMP_RUBY@ @COM
- install-data-local:
- 	$(AM_V_GEN)test -f ${builddir}/perl-piped/Makefile \
-            && ( cd ${builddir}/perl-piped \
--	        && $(MAKE) install ) \
-+	        && $(MAKE) pure_install ) \
- 	   || true
- 	$(AM_V_GEN)test -f ${builddir}/perl-shared/Makefile \
-            && ( cd ${builddir}/perl-shared \
--                && $(MAKE) install ) \
-+                && $(MAKE) pure_install ) \
-            || true
- 	$(AM_V_GEN)test -f ${builddir}/ruby/Makefile \
-            && ( cd ${builddir}/ruby \
--                && $(MAKE) EPREFIX=$(DESTDIR)$(exec_prefix) $(RUBY_MAKE_OPTIONS) install ) \
-+                && $(MAKE) EPREFIX=$(DESTDIR)$(exec_prefix) install ) \
-            || true
- 	$(AM_V_GEN)test -d ${builddir}/python/build \
-            && ( cd ${builddir}/python \
diff --git a/databases/rrdtool/files/patch-bindings_Makefile.in b/databases/rrdtool/files/patch-bindings_Makefile.in
new file mode 100644
index 000000000000..a874e91ffa7b
--- /dev/null
+++ b/databases/rrdtool/files/patch-bindings_Makefile.in
@@ -0,0 +1,16 @@
+--- bindings/Makefile.in.orig	2022-03-14 14:29:39 UTC
++++ bindings/Makefile.in
+@@ -727,11 +727,11 @@ all-local:  @COMP_PERL@ @COMP_RUBY@ @COMP_PYTHON@
+ install-data-local:
+ 	$(AM_V_GEN)test -f ${builddir}/perl-piped/Makefile \
+            && ( cd ${builddir}/perl-piped \
+-	        && $(MAKE) install ) \
++	        && $(MAKE) pure_install ) \
+ 	   || true
+ 	$(AM_V_GEN)test -f ${builddir}/perl-shared/Makefile \
+            && ( cd ${builddir}/perl-shared \
+-                && $(MAKE) install ) \
++                && $(MAKE) pure_install ) \
+            || true
+ 	$(AM_V_GEN)test -f ${builddir}/ruby/Makefile \
+            && ( cd ${builddir}/ruby \
diff --git a/databases/rrdtool/files/patch-bindings_python_setup.py b/databases/rrdtool/files/patch-bindings_python_setup.py
deleted file mode 100644
index 86b777c0429b..000000000000
--- a/databases/rrdtool/files/patch-bindings_python_setup.py
+++ /dev/null
@@ -1,14 +0,0 @@
---- bindings/python/setup.py.orig	2017-03-10 18:03:11 UTC
-+++ bindings/python/setup.py
-@@ -1,10 +1,7 @@
- #!/usr/bin/env python
- import os
- 
--try:
--    from setuptools import setup, Extension
--except ImportError:
--    sys.exit('The setup requires setuptools.')
-+from distutils.core import setup, Extension
- 
- TOP_SRCDIR = os.environ.get('ABS_TOP_SRCDIR', '../..')
- TOP_BUILDDIR = os.environ.get('ABS_TOP_BUILDDIR', '../..')
diff --git a/databases/rrdtool/files/patch-configure b/databases/rrdtool/files/patch-configure
index b56de23d32a7..a70b30a69a20 100644
--- a/databases/rrdtool/files/patch-configure
+++ b/databases/rrdtool/files/patch-configure
@@ -1,27 +1,15 @@
---- configure.orig	2017-05-16 11:55:23 UTC
+--- configure.orig	2022-03-14 14:29:38 UTC
 +++ configure
-@@ -13698,7 +13698,7 @@ fi
- 
- 
- if test "x$GCC" = "xyes"; then
--  for flag in -fno-strict-aliasing -Wall -std=gnu99 -pedantic -Wundef -Wshadow -Wpointer-arith -Wcast-align -Wmissing-prototypes -Wmissing-declarations -Wnested-externs -Winline -Wold-style-definition -W; do
-+  for flag in -fno-strict-aliasing -Wall -std=gnu99 -pedantic -Wundef -Wshadow -Wpointer-arith -Wcast-align -Wmissing-prototypes -Wmissing-declarations -Wnested-externs -Winline -Wold-style-definition; do
-     oCFLAGS="$CFLAGS"
-     CFLAGS="$CFLAGS $flag"
-     cachename=rd_cv_gcc_flag_`echo $flag|sed 's/[^A-Za-z]/_/g'`
-@@ -22422,9 +22422,9 @@ $as_echo "$am_cv_python_pyexecdir" >&6; }
- $as_echo_n "checking for headers required to compile python extensions... " >&6; }
- py_prefix=`$PYTHON -c "import sys; print(sys.prefix)"`
- py_exec_prefix=`$PYTHON -c "import sys; print(sys.exec_prefix)"`
--PYTHON_INCLUDES="-I${py_prefix}/include/python${PYTHON_VERSION}"
-+PYTHON_INCLUDES="-I${py_prefix}/include/python${PYTHON_VERSION} -I${py_prefix}/include/python${PYTHON_VERSION}m"
- if test "$py_prefix" != "$py_exec_prefix"; then
--  PYTHON_INCLUDES="$PYTHON_INCLUDES -I${py_exec_prefix}/include/python${PYTHON_VERSION}"
-+  PYTHON_INCLUDES="$PYTHON_INCLUDES -I${py_exec_prefix}/include/python${PYTHON_VERSION} -I${py_exec_prefix}/include/python${PYTHON_VERSION}m"
+@@ -22491,7 +22491,7 @@ fi
+ if test "${enable_ruby_site_install+set}" = set; then :
+   enableval=$enable_ruby_site_install; RUBY_MAKE_OPTIONS=
+ else
+-  RUBY_MAKE_OPTIONS="sitedir=$langpref/lib/ruby"
++  RUBY_MAKE_OPTIONS="PREFIX=$langpref INSTALL_BASE= LIB=$langpref/lib/ruby"
  fi
  
- save_CPPFLAGS="$CPPFLAGS"
-@@ -27780,18 +27780,6 @@ $as_echo_n "checking in... " >&6; }
+ 
+@@ -28807,19 +28807,6 @@ $as_echo_n "checking in... " >&6; }
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: and out again" >&5
  $as_echo "and out again" >&6; }
  
@@ -37,6 +25,7 @@
 -sleep 1
 -{ $as_echo "$as_me:${as_lineno-$LINENO}: result:  just kidding ;-)" >&5
 -$as_echo " just kidding ;-)" >&6; }
- echo
+-echo
  echo "----------------------------------------------------------------"
  echo "Config is DONE!"
+ echo
diff --git a/databases/rrdtool/files/patch-doc-Makefile.in b/databases/rrdtool/files/patch-doc-Makefile.in
deleted file mode 100644
index 9fc94f8f7fcf..000000000000
--- a/databases/rrdtool/files/patch-doc-Makefile.in
+++ /dev/null
@@ -1,14 +0,0 @@
---- doc/Makefile.in.orig	2016-01-27 10:49:53 UTC
-+++ doc/Makefile.in
-@@ -377,9 +377,9 @@ CLEANFILES = $(GENERATED_EXTRADIST) pod2
- 
- # what should go into the distribution
- EXTRA_DIST = $(GENERATED_EXTRADIST) $(POD) $(POD3) rrdtool-dump.dtd rrdtool-xport.dtd rrdgraph_libdbi.pod rrdlua.pod
--idocdir = $(RRDDOCDIR)/txt
-+idocdir = $(datadir)/doc/rrdtool/txt
- idoc_DATA = $(POD) $(TXT)
--ihtmldir = $(RRDDOCDIR)/html
-+ihtmldir = $(datadir)/doc/rrdtool/html
- ihtml_DATA = $(HTML)
- imandir = $(mandir)/man1
- iman_DATA = $(MAN)
diff --git a/databases/rrdtool/files/patch-examples-Makefile.in b/databases/rrdtool/files/patch-examples-Makefile.in
deleted file mode 100644
index 864a9633dc20..000000000000
--- a/databases/rrdtool/files/patch-examples-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- examples/Makefile.in.orig	2016-01-27 10:49:53 UTC
-+++ examples/Makefile.in
-@@ -420,7 +420,7 @@ top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- SUBDIRS = rrdcached
- EXTRA_DIST = cgi-demo.cgi.in stripes.py
--examplesdir = $(pkgdatadir)/examples
-+examplesdir = $(datadir)/examples/rrdtool
- examples_SCRIPTS = cgi-demo.cgi piped-demo.pl shared-demo.pl \
- 	stripes.pl bigtops.pl minmax.pl 4charts.pl perftest.pl \
-         stripes.py
diff --git a/databases/rrdtool/files/patch-examples_Makefile.in b/databases/rrdtool/files/patch-examples_Makefile.in
new file mode 100644
index 000000000000..e5e0b6a5f497
--- /dev/null
+++ b/databases/rrdtool/files/patch-examples_Makefile.in
@@ -0,0 +1,11 @@
+--- examples/Makefile.in.orig	2022-03-14 14:29:40 UTC
++++ examples/Makefile.in
+@@ -431,7 +431,7 @@ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ SUBDIRS = rrdcached
+ EXTRA_DIST = cgi-demo.cgi.in stripes.py
+-examplesdir = $(pkgdatadir)/examples
++examplesdir = $(datadir)/examples/rrdtool
+ examples_SCRIPTS = cgi-demo.cgi piped-demo.pl shared-demo.pl \
+ 	stripes.pl bigtops.pl minmax.pl 4charts.pl perftest.pl \
+         stripes.py
diff --git a/databases/rrdtool/files/patch-examples_rrdcached_Makefile.in b/databases/rrdtool/files/patch-examples_rrdcached_Makefile.in
index a14b3bbeb369..795905d8894b 100644
--- a/databases/rrdtool/files/patch-examples_rrdcached_Makefile.in
+++ b/databases/rrdtool/files/patch-examples_rrdcached_Makefile.in
@@ -1,6 +1,6 @@
---- examples/rrdcached/Makefile.in.orig	2016-01-27 10:49:53 UTC
+--- examples/rrdcached/Makefile.in.orig	2022-03-14 14:29:40 UTC
 +++ examples/rrdcached/Makefile.in
-@@ -356,7 +356,7 @@ target_vendor = @target_vendor@
+@@ -368,7 +368,7 @@ target_vendor = @target_vendor@
  top_build_prefix = @top_build_prefix@
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
diff --git a/databases/rrdtool/files/patch-src_rrd__graph__helper.c b/databases/rrdtool/files/patch-src_rrd__graph__helper.c
deleted file mode 100644
index 45167a881a9b..000000000000
--- a/databases/rrdtool/files/patch-src_rrd__graph__helper.c
+++ /dev/null
@@ -1,25 +0,0 @@
-Backport of:
-
-commit 254e4e44cd7828fba8f5bb18a7a29668221e0af5
-Author: John W. O'Brien <john@saltant.com>
-Date:   Sat Mar 14 08:49:47 2020 -0400
-
-    Fix double meaning of time 0 as uninitialized value
-
-    Treat "VRULE:0#..." as "VRULE:1#..." because elsewhere xrule==0 is
-    used to mean xrule has not been set, which can lead to an array
-    bounds violation.
-
---- src/rrd_graph_helper.c.orig	2020-03-14 17:06:47 UTC
-+++ src/rrd_graph_helper.c
-@@ -776,6 +776,10 @@ static graph_desc_t* newGraphDescription(image_desc_t 
-               }
-               if (gf==GF_VRULE){
-                  gdp->xrule=val;
-+                 if (gdp->xrule == 0) {
-+                    /* distinguish from uninitialized */
-+                    gdp->xrule++;
-+                 }
-               }
-               else {
-                  gdp->yrule=val;
diff --git a/databases/rrdtool/files/patch-src_rrd__rpncalc.c b/databases/rrdtool/files/patch-src_rrd__rpncalc.c
deleted file mode 100644
index 3a093028da16..000000000000
--- a/databases/rrdtool/files/patch-src_rrd__rpncalc.c
+++ /dev/null
@@ -1,29 +0,0 @@
-Fix UB when calculating median of all-NaN values
-
-Corresponds to upstream commit 1d700bf
-
-https://github.com/oetiker/rrdtool-1.x/commit/1d700bf3ba13a75b91047e6e979231abd755892b
-
---- src/rrd_rpncalc.c.orig	2019-05-27 18:48:09 UTC
-+++ src/rrd_rpncalc.c
-@@ -1197,15 +1197,16 @@ short rpn_calc(
-                     }
-                 }
- 
-+				/* when goodvals and badvals meet, they might have met on a
-+				 * NAN, which wouldn't decrease final_elements. so, check
-+				 * that now. */
-+				if (isnan(*goodvals)) --final_elements;
-+
-                 stptr -= elements;
-                 if (!final_elements) {
-                     /* no non-NAN elements; push NAN */
-                     rpnstack->s[++stptr] = DNAN;
-                 } else {
--                    /* when goodvals and badvals meet, they might have met on a
--                     * NAN, which wouldn't decrease final_elements. so, check
--                     * that now. */
--                    if (isnan(*goodvals)) --final_elements;
-                     /* and finally, take the median of the remaining non-NAN
-                      * elements. */
-                     qsort(element_ptr, final_elements, sizeof(double),
diff --git a/databases/rrdtool/pkg-descr b/databases/rrdtool/pkg-descr
index 2d47a2220ffc..05d45d7011bf 100644
--- a/databases/rrdtool/pkg-descr
+++ b/databases/rrdtool/pkg-descr
@@ -6,5 +6,3 @@ where RRDtool kicks in. It lets you log and analyze the data you gather from
 all kinds of data-sources. The data analysis part of RRDtool is based
 on the ability to quickly generate graphical representations of the data
 values collected over a definable time period.
-
-WWW: http://www.rrdtool.org/
diff --git a/databases/rrdtool/pkg-plist b/databases/rrdtool/pkg-plist
index fc684ee34b53..56c95bb299ee 100644
--- a/databases/rrdtool/pkg-plist
+++ b/databases/rrdtool/pkg-plist
@@ -10,141 +10,51 @@ include/rrd_format.h
 lib/librrd.a
 lib/librrd.so
 lib/librrd.so.8
-lib/librrd.so.8.2.1
+lib/librrd.so.8.3.0
 %%PERL%%%%SITE_PERL%%/RRDp.pm
 %%PERL%%%%SITE_ARCH%%/RRDs.pm
 %%PERL%%%%SITE_ARCH%%/auto/RRDs/RRDs.so
 %%PERL%%%%PERL5_MAN3%%/RRDp.3.gz
 %%PERL%%%%PERL5_MAN3%%/RRDs.3.gz
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/rrdtool-0.1.10-py%%PYTHON_VER%%.egg-info
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/rrdtool-0.1.10-py%%PYTHON_VER%%.egg-info/PKG-INFO
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/rrdtool-0.1.10-py%%PYTHON_VER%%.egg-info/SOURCES.txt
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/rrdtool-0.1.10-py%%PYTHON_VER%%.egg-info/dependency_links.txt
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/rrdtool-0.1.10-py%%PYTHON_VER%%.egg-info/top_level.txt
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/rrdtool%%PYTHON_EXT_SUFFIX%%.so
 %%RUBY%%%%RUBY_SITEARCHLIBDIR%%/RRD.so
 libdata/pkgconfig/librrd.pc
-%%PORTDOCS%%man/man1/bin_dec_hex.1.gz
-%%PORTDOCS%%man/man1/cdeftutorial.1.gz
-%%PORTDOCS%%man/man1/rpntutorial.1.gz
-%%PORTDOCS%%man/man1/rrd-beginners.1.gz
-%%PORTDOCS%%man/man1/rrd_pdpcalc.1.gz
-%%PORTDOCS%%man/man1/rrdbuild.1.gz
-%%PORTDOCS%%man/man1/rrdcached.1.gz
-%%PORTDOCS%%man/man1/rrdcgi.1.gz
-%%PORTDOCS%%man/man1/rrdcreate.1.gz
-%%PORTDOCS%%man/man1/rrddump.1.gz
-%%PORTDOCS%%man/man1/rrdfetch.1.gz
-%%PORTDOCS%%man/man1/rrdfirst.1.gz
-%%PORTDOCS%%man/man1/rrdflushcached.1.gz
-%%PORTDOCS%%man/man1/rrdgraph.1.gz
-%%PORTDOCS%%man/man1/rrdgraph_data.1.gz
-%%PORTDOCS%%man/man1/rrdgraph_examples.1.gz
-%%PORTDOCS%%man/man1/rrdgraph_graph.1.gz
-%%PORTDOCS%%man/man1/rrdgraph_rpn.1.gz
-%%PORTDOCS%%man/man1/rrdinfo.1.gz
-%%PORTDOCS%%man/man1/rrdlast.1.gz
-%%PORTDOCS%%man/man1/rrdlastupdate.1.gz
-%%PORTDOCS%%man/man1/rrdlist.1.gz
-%%PORTDOCS%%man/man1/rrdresize.1.gz
-%%PORTDOCS%%man/man1/rrdrestore.1.gz
-%%PORTDOCS%%man/man1/rrdthreads.1.gz
-%%PORTDOCS%%man/man1/rrdtool.1.gz
-%%PORTDOCS%%man/man1/rrdtune.1.gz
-%%PORTDOCS%%man/man1/rrdtutorial.1.gz
-%%PORTDOCS%%man/man1/rrdupdate.1.gz
-%%PORTDOCS%%man/man1/rrdxport.1.gz
-%%PORTDOCS%%man/man3/librrd.3.gz
-%%PORTDOCS%%%%DOCSDIR%%/html/RRDp.html
-%%PORTDOCS%%%%DOCSDIR%%/html/RRDs.html
-%%PORTDOCS%%%%DOCSDIR%%/html/bin_dec_hex.html
-%%PORTDOCS%%%%DOCSDIR%%/html/cdeftutorial.html
-%%PORTDOCS%%%%DOCSDIR%%/html/index.html
-%%PORTDOCS%%%%DOCSDIR%%/html/librrd.html
-%%PORTDOCS%%%%DOCSDIR%%/html/rpntutorial.html
-%%PORTDOCS%%%%DOCSDIR%%/html/rrd-beginners.html
-%%PORTDOCS%%%%DOCSDIR%%/html/rrd_pdpcalc.html
-%%PORTDOCS%%%%DOCSDIR%%/html/rrdbuild.html
-%%PORTDOCS%%%%DOCSDIR%%/html/rrdcached.html
-%%PORTDOCS%%%%DOCSDIR%%/html/rrdcgi.html
-%%PORTDOCS%%%%DOCSDIR%%/html/rrdcreate.html
-%%PORTDOCS%%%%DOCSDIR%%/html/rrddump.html
-%%PORTDOCS%%%%DOCSDIR%%/html/rrdfetch.html
-%%PORTDOCS%%%%DOCSDIR%%/html/rrdfirst.html
-%%PORTDOCS%%%%DOCSDIR%%/html/rrdflushcached.html
-%%PORTDOCS%%%%DOCSDIR%%/html/rrdgraph.html
-%%PORTDOCS%%%%DOCSDIR%%/html/rrdgraph_data.html
-%%PORTDOCS%%%%DOCSDIR%%/html/rrdgraph_examples.html
-%%PORTDOCS%%%%DOCSDIR%%/html/rrdgraph_graph.html
-%%PORTDOCS%%%%DOCSDIR%%/html/rrdgraph_rpn.html
-%%PORTDOCS%%%%DOCSDIR%%/html/rrdinfo.html
-%%PORTDOCS%%%%DOCSDIR%%/html/rrdlast.html
-%%PORTDOCS%%%%DOCSDIR%%/html/rrdlastupdate.html
-%%PORTDOCS%%%%DOCSDIR%%/html/rrdlist.html
-%%PORTDOCS%%%%DOCSDIR%%/html/rrdresize.html
-%%PORTDOCS%%%%DOCSDIR%%/html/rrdrestore.html
-%%PORTDOCS%%%%DOCSDIR%%/html/rrdthreads.html
-%%PORTDOCS%%%%DOCSDIR%%/html/rrdtool.html
-%%PORTDOCS%%%%DOCSDIR%%/html/rrdtune.html
-%%PORTDOCS%%%%DOCSDIR%%/html/rrdtutorial.html
-%%PORTDOCS%%%%DOCSDIR%%/html/rrdupdate.html
-%%PORTDOCS%%%%DOCSDIR%%/html/rrdxport.html
-%%PORTDOCS%%%%DOCSDIR%%/txt/bin_dec_hex.pod
-%%PORTDOCS%%%%DOCSDIR%%/txt/bin_dec_hex.txt
-%%PORTDOCS%%%%DOCSDIR%%/txt/cdeftutorial.pod
-%%PORTDOCS%%%%DOCSDIR%%/txt/cdeftutorial.txt
-%%PORTDOCS%%%%DOCSDIR%%/txt/librrd.txt
-%%PORTDOCS%%%%DOCSDIR%%/txt/rpntutorial.pod
-%%PORTDOCS%%%%DOCSDIR%%/txt/rpntutorial.txt
-%%PORTDOCS%%%%DOCSDIR%%/txt/rrd-beginners.pod
-%%PORTDOCS%%%%DOCSDIR%%/txt/rrd-beginners.txt
-%%PORTDOCS%%%%DOCSDIR%%/txt/rrd_pdpcalc.pod
-%%PORTDOCS%%%%DOCSDIR%%/txt/rrd_pdpcalc.txt
-%%PORTDOCS%%%%DOCSDIR%%/txt/rrdbuild.pod
-%%PORTDOCS%%%%DOCSDIR%%/txt/rrdbuild.txt
-%%PORTDOCS%%%%DOCSDIR%%/txt/rrdcached.pod
-%%PORTDOCS%%%%DOCSDIR%%/txt/rrdcached.txt
-%%PORTDOCS%%%%DOCSDIR%%/txt/rrdcgi.pod
-%%PORTDOCS%%%%DOCSDIR%%/txt/rrdcgi.txt
-%%PORTDOCS%%%%DOCSDIR%%/txt/rrdcreate.pod
-%%PORTDOCS%%%%DOCSDIR%%/txt/rrdcreate.txt
-%%PORTDOCS%%%%DOCSDIR%%/txt/rrddump.pod
-%%PORTDOCS%%%%DOCSDIR%%/txt/rrddump.txt
-%%PORTDOCS%%%%DOCSDIR%%/txt/rrdfetch.pod
-%%PORTDOCS%%%%DOCSDIR%%/txt/rrdfetch.txt
-%%PORTDOCS%%%%DOCSDIR%%/txt/rrdfirst.pod
-%%PORTDOCS%%%%DOCSDIR%%/txt/rrdfirst.txt
-%%PORTDOCS%%%%DOCSDIR%%/txt/rrdflushcached.pod
-%%PORTDOCS%%%%DOCSDIR%%/txt/rrdflushcached.txt
-%%PORTDOCS%%%%DOCSDIR%%/txt/rrdgraph.pod
-%%PORTDOCS%%%%DOCSDIR%%/txt/rrdgraph.txt
-%%PORTDOCS%%%%DOCSDIR%%/txt/rrdgraph_data.pod
-%%PORTDOCS%%%%DOCSDIR%%/txt/rrdgraph_data.txt
-%%PORTDOCS%%%%DOCSDIR%%/txt/rrdgraph_examples.pod
-%%PORTDOCS%%%%DOCSDIR%%/txt/rrdgraph_examples.txt
-%%PORTDOCS%%%%DOCSDIR%%/txt/rrdgraph_graph.pod
-%%PORTDOCS%%%%DOCSDIR%%/txt/rrdgraph_graph.txt
-%%PORTDOCS%%%%DOCSDIR%%/txt/rrdgraph_rpn.pod
-%%PORTDOCS%%%%DOCSDIR%%/txt/rrdgraph_rpn.txt
-%%PORTDOCS%%%%DOCSDIR%%/txt/rrdinfo.pod
-%%PORTDOCS%%%%DOCSDIR%%/txt/rrdinfo.txt
-%%PORTDOCS%%%%DOCSDIR%%/txt/rrdlast.pod
-%%PORTDOCS%%%%DOCSDIR%%/txt/rrdlast.txt
-%%PORTDOCS%%%%DOCSDIR%%/txt/rrdlastupdate.pod
-%%PORTDOCS%%%%DOCSDIR%%/txt/rrdlastupdate.txt
-%%PORTDOCS%%%%DOCSDIR%%/txt/rrdlist.pod
-%%PORTDOCS%%%%DOCSDIR%%/txt/rrdlist.txt
-%%PORTDOCS%%%%DOCSDIR%%/txt/rrdresize.pod
-%%PORTDOCS%%%%DOCSDIR%%/txt/rrdresize.txt
-%%PORTDOCS%%%%DOCSDIR%%/txt/rrdrestore.pod
-%%PORTDOCS%%%%DOCSDIR%%/txt/rrdrestore.txt
-%%PORTDOCS%%%%DOCSDIR%%/txt/rrdthreads.pod
-%%PORTDOCS%%%%DOCSDIR%%/txt/rrdthreads.txt
-%%PORTDOCS%%%%DOCSDIR%%/txt/rrdtool.pod
-%%PORTDOCS%%%%DOCSDIR%%/txt/rrdtool.txt
-%%PORTDOCS%%%%DOCSDIR%%/txt/rrdtune.pod
-%%PORTDOCS%%%%DOCSDIR%%/txt/rrdtune.txt
-%%PORTDOCS%%%%DOCSDIR%%/txt/rrdtutorial.pod
-%%PORTDOCS%%%%DOCSDIR%%/txt/rrdtutorial.txt
-%%PORTDOCS%%%%DOCSDIR%%/txt/rrdupdate.pod
-%%PORTDOCS%%%%DOCSDIR%%/txt/rrdupdate.txt
-%%PORTDOCS%%%%DOCSDIR%%/txt/rrdxport.pod
-%%PORTDOCS%%%%DOCSDIR%%/txt/rrdxport.txt
+%%PORTDOCS%%share/man/man1/bin_dec_hex.1.gz
+%%PORTDOCS%%share/man/man1/cdeftutorial.1.gz
+%%PORTDOCS%%share/man/man1/rpntutorial.1.gz
+%%PORTDOCS%%share/man/man1/rrd-beginners.1.gz
+%%PORTDOCS%%share/man/man1/rrd_pdpcalc.1.gz
+%%PORTDOCS%%share/man/man1/rrdbuild.1.gz
+%%PORTDOCS%%share/man/man1/rrdcached.1.gz
+%%PORTDOCS%%share/man/man1/rrdcgi.1.gz
+%%PORTDOCS%%share/man/man1/rrdcreate.1.gz
+%%PORTDOCS%%share/man/man1/rrddump.1.gz
+%%PORTDOCS%%share/man/man1/rrdfetch.1.gz
+%%PORTDOCS%%share/man/man1/rrdfirst.1.gz
+%%PORTDOCS%%share/man/man1/rrdflushcached.1.gz
+%%PORTDOCS%%share/man/man1/rrdgraph.1.gz
+%%PORTDOCS%%share/man/man1/rrdgraph_data.1.gz
+%%PORTDOCS%%share/man/man1/rrdgraph_examples.1.gz
+%%PORTDOCS%%share/man/man1/rrdgraph_graph.1.gz
+%%PORTDOCS%%share/man/man1/rrdgraph_rpn.1.gz
+%%PORTDOCS%%share/man/man1/rrdinfo.1.gz
+%%PORTDOCS%%share/man/man1/rrdlast.1.gz
+%%PORTDOCS%%share/man/man1/rrdlastupdate.1.gz
+%%PORTDOCS%%share/man/man1/rrdlist.1.gz
+%%PORTDOCS%%%%PYTHON%%share/man/man1/rrdpython.1.gz
+%%PORTDOCS%%share/man/man1/rrdresize.1.gz
+%%PORTDOCS%%share/man/man1/rrdrestore.1.gz
+%%PORTDOCS%%%%RUBY%%share/man/man1/rrdruby.1.gz
+%%PORTDOCS%%share/man/man1/rrdthreads.1.gz
+%%PORTDOCS%%share/man/man1/rrdtool.1.gz
+%%PORTDOCS%%share/man/man1/rrdtune.1.gz
+%%PORTDOCS%%share/man/man1/rrdtutorial.1.gz
+%%PORTDOCS%%share/man/man1/rrdupdate.1.gz
+%%PORTDOCS%%share/man/man1/rrdxport.1.gz
+%%PORTDOCS%%share/man/man3/librrd.3.gz
 %%NLS%%share/locale/fr/LC_MESSAGES/rrdtool.mo
 %%NLS%%share/locale/hu/LC_MESSAGES/rrdtool.mo
diff --git a/databases/rrdtool12/Makefile b/databases/rrdtool12/Makefile
index 39f6cfb3ca97..ae47becd0cb7 100644
--- a/databases/rrdtool12/Makefile
+++ b/databases/rrdtool12/Makefile
@@ -1,24 +1,25 @@
-# Created by: Jeremy Chadwick <koitsu@FreeBSD.org>
-
 PORTNAME=	rrdtool
 PORTVERSION=	1.2.30
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	databases graphics
 MASTER_SITES=	http://oss.oetiker.ch/rrdtool/pub/
 PKGNAMESUFFIX=	12
 
 MAINTAINER=	beat@FreeBSD.org
 COMMENT=	Round Robin Database Tools v1.2
+WWW=		https://www.rrdtool.org/
 
 LIB_DEPENDS=	libfreetype.so:print/freetype2 \
 		libart_lgpl_2.so:graphics/libart_lgpl \
 		libpng.so:graphics/png
 
-CONFLICTS=	rrdtool-1.*
+CONFLICTS_INSTALL=	rrdtool # include/rrd.h
 
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
-USES=		gmake libtool
+GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
+USES=		cpe gmake libtool
+CPE_VENDOR=	${PORTNAME}_project
 
 CONFIGURE_ARGS=	--disable-tcl --disable-python
 
@@ -28,7 +29,7 @@ OPTIONS_DEFAULT=	PERL
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MRUBY}
-USE_RUBY=	yes
+USES+=	ruby
 PLIST_SUB+=	WITH_RUBY=""
 CONFIGURE_ARGS+=	--enable-ruby
 .else
diff --git a/databases/rrdtool12/pkg-descr b/databases/rrdtool12/pkg-descr
index 2d47a2220ffc..05d45d7011bf 100644
--- a/databases/rrdtool12/pkg-descr
+++ b/databases/rrdtool12/pkg-descr
@@ -6,5 +6,3 @@ where RRDtool kicks in. It lets you log and analyze the data you gather from
 all kinds of data-sources. The data analysis part of RRDtool is based
 on the ability to quickly generate graphical representations of the data
 values collected over a definable time period.
-
-WWW: http://www.rrdtool.org/
diff --git a/databases/rrdtool12/pkg-plist b/databases/rrdtool12/pkg-plist
index a799bb55676c..6bc246ad5684 100644
--- a/databases/rrdtool12/pkg-plist
+++ b/databases/rrdtool12/pkg-plist
@@ -10,32 +10,32 @@ lib/librrd_th.so
 lib/librrd_th.so.2
 lib/librrd_th.so.2.0.13
 include/rrd.h
-man/man1/bin_dec_hex.1.gz
-man/man1/cdeftutorial.1.gz
-man/man1/rpntutorial.1.gz
-man/man1/rrd-beginners.1.gz
-man/man1/rrdbuild.1.gz
-man/man1/rrdcgi.1.gz
-man/man1/rrdcreate.1.gz
-man/man1/rrddump.1.gz
-man/man1/rrdfetch.1.gz
-man/man1/rrdfirst.1.gz
-man/man1/rrdgraph.1.gz
-man/man1/rrdgraph_data.1.gz
-man/man1/rrdgraph_examples.1.gz
-man/man1/rrdgraph_graph.1.gz
-man/man1/rrdgraph_rpn.1.gz
-man/man1/rrdinfo.1.gz
-man/man1/rrdlast.1.gz
-man/man1/rrdresize.1.gz
-man/man1/rrdrestore.1.gz
-man/man1/rrdthreads.1.gz
-man/man1/rrdtool.1.gz
-man/man1/rrdtune.1.gz
-man/man1/rrdtutorial.1.gz
-man/man1/rrdupdate.1.gz
-man/man1/rrdxport.1.gz
-man/man1/rrdlastupdate.1.gz
+share/man/man1/bin_dec_hex.1.gz
+share/man/man1/cdeftutorial.1.gz
+share/man/man1/rpntutorial.1.gz
+share/man/man1/rrd-beginners.1.gz
+share/man/man1/rrdbuild.1.gz
+share/man/man1/rrdcgi.1.gz
+share/man/man1/rrdcreate.1.gz
+share/man/man1/rrddump.1.gz
+share/man/man1/rrdfetch.1.gz
+share/man/man1/rrdfirst.1.gz
+share/man/man1/rrdgraph.1.gz
+share/man/man1/rrdgraph_data.1.gz
+share/man/man1/rrdgraph_examples.1.gz
+share/man/man1/rrdgraph_graph.1.gz
+share/man/man1/rrdgraph_rpn.1.gz
+share/man/man1/rrdinfo.1.gz
+share/man/man1/rrdlast.1.gz
+share/man/man1/rrdresize.1.gz
+share/man/man1/rrdrestore.1.gz
+share/man/man1/rrdthreads.1.gz
+share/man/man1/rrdtool.1.gz
+share/man/man1/rrdtune.1.gz
+share/man/man1/rrdtutorial.1.gz
+share/man/man1/rrdupdate.1.gz
+share/man/man1/rrdxport.1.gz
+share/man/man1/rrdlastupdate.1.gz
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/4charts.pl
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/bigtops.pl
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/cgi-demo.cgi
diff --git a/databases/ruby-bdb/Makefile b/databases/ruby-bdb/Makefile
index 7657b9f886ff..512f33bc608a 100644
--- a/databases/ruby-bdb/Makefile
+++ b/databases/ruby-bdb/Makefile
@@ -1,8 +1,6 @@
-# Created by: Akinori MUSHA aka knu <knu@idaemons.org>
-
 PORTNAME=	bdb
 PORTVERSION=	0.6.6
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	databases ruby
 MASTER_SITES=	ftp://ftp.idaemons.org/pub/distfiles/ruby/ \
 		http://idaemons.org/distfiles/ruby/ \
@@ -12,48 +10,43 @@ DIST_SUBDIR=	ruby
 
 MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	Ruby interface to Oracle Berkeley DB revision 2 or later
+WWW=		https://github.com/knu/ruby-bdb
 
 LICENSE=	RUBY
 
 BUILD_DEPENDS=	rubygem-rdoc>=0.a:devel/rubygem-rdoc
 
-OPTIONS_DEFINE=	DOCS EXAMPLES
+USES=		bdb ruby:extconf shebangfix tar:bzip2
 
-USES=		bdb shebangfix tar:bzip2
-USE_RUBY=		yes
-USE_RUBY_EXTCONF=	yes
+SHEBANG_FILES=	examples/basic.rb examples/cats.rb examples/cursor.rb \
+		examples/func.rb examples/join.rb examples/lock.rb \
+		examples/log.rb examples/queue.rb examples/recno.rb \
+		examples/record.rb examples/replication/base/b.rb \
+		examples/replication/base/cl.rb examples/replication/base/ma.rb \
+		examples/replication/base/mc.rb examples/replication/base/op.rb \
+		examples/replication/mgr/b.rb examples/txn.rb examples/zeroc.rb
 
-ALL_TARGET=	all rdoc
 CONFIGURE_ARGS=	--with-db-include=${BDB_INCLUDE_DIR} \
 		--with-db-lib=${BDB_LIB_DIR}
+ALL_TARGET=	all rdoc
 INSTALL_TARGET=	site-install
-MAKE_ENV=	RUBY_RDOC=${LOCALBASE}/bin/rdoc
+WITH_BDB6_PERMITTED=	yes
 
 DOCS=		Changes README.en bdb.rd docs/*.rd
 DOCSDIR=	${RUBY_MODDOCDIR}
 EXAMPLESDIR=	${RUBY_MODEXAMPLESDIR}
 SHAREMODE=	0644
-PLIST_FILES=	%%RUBY_SITEARCHLIBDIR%%/bdb.so
+PLIST_FILES=	${RUBY_SITEARCHLIBDIR}/bdb.so
 PORTDOCS=	*
 PORTEXAMPLES=	*
-SHEBANG_FILES=	examples/record.rb \
-		examples/recno.rb \
-		examples/zeroc.rb \
-		examples/txn.rb \
-		examples/queue.rb \
-		examples/cats.rb \
-		examples/log.rb \
-		examples/cursor.rb \
-		examples/func.rb \
-		examples/replication/mgr/b.rb \
-		examples/replication/base/op.rb \
-		examples/replication/base/cl.rb \
-		examples/replication/base/b.rb \
-		examples/replication/base/ma.rb \
-		examples/replication/base/mc.rb \
-		examples/join.rb \
-		examples/basic.rb \
-		examples/lock.rb
+
+OPTIONS_DEFINE=	DOCS EXAMPLES
+
+.include <bsd.port.options.mk>
+
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 ))
+CONFIGURE_ARGS+=	--with-cflags="-Wno-error=incompatible-function-pointer-types"
+.endif
 
 post-patch:
 	@${RM} ${WRKSRC}/docs/*.orig
diff --git a/databases/ruby-bdb/files/patch-bdbxml1-bdbxml.cc b/databases/ruby-bdb/files/patch-bdbxml1-bdbxml.cc
new file mode 100644
index 000000000000..b7a9b2093410
--- /dev/null
+++ b/databases/ruby-bdb/files/patch-bdbxml1-bdbxml.cc
@@ -0,0 +1,120 @@
+--- bdbxml1/bdbxml.cc.orig	2011-04-06 19:35:39 UTC
++++ bdbxml1/bdbxml.cc
+@@ -1148,15 +1148,19 @@ xb_con_init(int argc, VALUE *argv, VALUE obj)
+ 	    flags = NUM2INT(b);
+ 	}
+     }
++#if defined(RUBY_SAFE_LEVEL_MAX) && RUBY_SAFE_LEVEL_MAX >= 2
+     if (flags & DB_TRUNCATE) {
+ 	rb_secure(2);
+     }
++#endif
++#if defined(RUBY_SAFE_LEVEL_MAX) && RUBY_SAFE_LEVEL_MAX >= 4
+     if (flags & DB_CREATE) {
+ 	rb_secure(4);
+     }
+     if (rb_safe_level() >= 4) {
+ 	flags |= DB_RDONLY;
+     }
++#endif
+     if (!txn && con->env_val) {
+ 	bdb_ENV *envst = NULL;
+ 	GetEnvDBErr(con->env_val, envst, id_current_env, xb_eFatal);
+@@ -1179,9 +1183,11 @@ xb_con_close(int argc, VALUE *argv, VALUE obj)
+     xcon *con;
+     int flags = 0;
+ 
++#if defined(RUBY_SAFE_LEVEL_MAX) && RUBY_SAFE_LEVEL_MAX >= 4
+     if (!OBJ_TAINTED(obj) && rb_safe_level() >= 4) {
+ 	rb_raise(rb_eSecurityError, "Insecure: can't close the container");
+     }
++#endif
+     Data_Get_Struct(obj, xcon, con);
+     if (!con->closed && con->con) {
+ 	if (rb_scan_args(argc, argv, "01", &a)) {
+@@ -1516,7 +1522,9 @@ xb_int_update(int argc, VALUE *argv, VALUE obj, XmlUpd
+     DbTxn *txn;
+     VALUE a;
+ 
++#if defined(RUBY_SAFE_LEVEL_MAX) && RUBY_SAFE_LEVEL_MAX >= 4
+     rb_secure(4);
++#endif
+     GetConTxn(obj, con, txn);
+     if (rb_scan_args(argc, argv, "10", &a) != 1) {
+ 	rb_raise(rb_eArgError, "invalid number of arguments (%d for 1)", argc);
+@@ -1545,7 +1553,9 @@ xb_int_push(int argc, VALUE *argv, VALUE obj, XmlUpdat
+     VALUE a, b;
+     int flags = 0;
+ 
++#if defined(RUBY_SAFE_LEVEL_MAX) && RUBY_SAFE_LEVEL_MAX >= 4
+     rb_secure(4);
++#endif
+     GetConTxn(obj, con, txn);
+     if (rb_scan_args(argc, argv, "11", &a, &b) == 2) {
+ 	flags = NUM2INT(b);
+@@ -1775,7 +1785,9 @@ xb_int_delete(int argc, VALUE *argv, VALUE obj, XmlUpd
+     VALUE a, b;
+     int flags = 0;
+ 
++#if defined(RUBY_SAFE_LEVEL_MAX) && RUBY_SAFE_LEVEL_MAX >= 4
+     rb_secure(4);
++#endif
+     GetConTxn(obj, con, txn);
+     if (rb_scan_args(argc, argv, "11", &a, &b) == 2) {
+ 	flags = NUM2INT(b);
+@@ -1824,7 +1836,9 @@ xb_con_remove(int argc, VALUE *argv, VALUE obj)
+     xcon *con;
+     DbTxn *txn = NULL;
+ 
++#if defined(RUBY_SAFE_LEVEL_MAX) && RUBY_SAFE_LEVEL_MAX >= 2
+     rb_secure(2);
++#endif
+     if (rb_scan_args(argc, argv, "11", &a, &b) == 2) {
+ 	flags = NUM2INT(b);
+     }
+@@ -1844,7 +1858,9 @@ xb_con_rename(int argc, VALUE *argv, VALUE obj)
+     char *str;
+     DbTxn *txn = NULL;
+ 
++#if defined(RUBY_SAFE_LEVEL_MAX) && RUBY_SAFE_LEVEL_MAX >= 2
+     rb_secure(2);
++#endif
+     if (rb_scan_args(argc, argv, "21", &a, &b, &c) == 3) {
+ 	flags = NUM2INT(c);
+     }
+@@ -2340,18 +2356,16 @@ extern "C" {
+ 	major = NUM2INT(rb_const_get(xb_mDb, rb_intern("VERSION_MAJOR")));
+ 	minor = NUM2INT(rb_const_get(xb_mDb, rb_intern("VERSION_MINOR")));
+ 	patch = NUM2INT(rb_const_get(xb_mDb, rb_intern("VERSION_PATCH")));
+-	if (major != DB_VERSION_MAJOR || minor != DB_VERSION_MINOR
+-	    || patch != DB_VERSION_PATCH) {
+-	    rb_raise(rb_eNotImpError, "\nBDB::XML needs compatible versions of BDB\n\tyou have BDB::XML version %d.%d.%d and BDB version %d.%d.%d\n",
+-		     DB_VERSION_MAJOR, DB_VERSION_MINOR, DB_VERSION_PATCH,
+-		     major, minor, patch);
++	if (major != DB_VERSION_MAJOR || minor != DB_VERSION_MINOR) {
++	    rb_raise(rb_eNotImpError, "\nBDB::XML needs compatible versions of BDB\n\tyou have BDB::XML version %d.%d and BDB version %d.%d\n",
++		     DB_VERSION_MAJOR, DB_VERSION_MINOR,
++		     major, minor);
+ 	}
+ 	version = rb_tainted_str_new2(dbxml_version(&major, &minor, &patch));
+-	if (major != DBXML_VERSION_MAJOR || minor != DBXML_VERSION_MINOR
+-	    || patch != DBXML_VERSION_PATCH) {
+-	    rb_raise(rb_eNotImpError, "\nBDB::XML needs compatible versions of DbXml\n\tyou have DbXml.hpp version %d.%d.%d and libdbxml version %d.%d.%d\n",
+-		     DB_VERSION_MAJOR, DB_VERSION_MINOR, DB_VERSION_PATCH,
+-		     major, minor, patch);
++	if (major != DBXML_VERSION_MAJOR || minor != DBXML_VERSION_MINOR) {
++	    rb_raise(rb_eNotImpError, "\nBDB::XML needs compatible versions of DbXml\n\tyou have DbXml.hpp version %d.%d and libdbxml version %d.%d\n",
++		     DB_VERSION_MAJOR, DB_VERSION_MINOR,
++		     major, minor);
+ 	}
+ 
+ 	xb_eFatal = rb_const_get(xb_mDb, rb_intern("Fatal"));
+@@ -2477,7 +2491,7 @@ extern "C" {
+ 	rb_define_method(xb_cUpd, "<<", RMF(xb_upd_add), 1);
+ 	rb_define_method(xb_cUpd, "delete", RMF(xb_upd_delete), -1);
+ 	rb_define_method(xb_cUpd, "update", RMF(xb_upd_update), -1);
+-	xb_cTmp = rb_define_class_under(xb_mXML, "Tmp", rb_cData);
++	xb_cTmp = rb_define_class_under(xb_mXML, "Tmp", rb_cObject);
+ 	rb_undef_method(CLASS_OF(xb_cTmp), "allocate");
+ 	rb_undef_method(CLASS_OF(xb_cTmp), "new");
+ 	rb_define_method(xb_cTmp, "[]", RMF(xb_cxt_name_get), 1);
diff --git a/databases/ruby-bdb/files/patch-bdbxml1__bdbxml.cc b/databases/ruby-bdb/files/patch-bdbxml1__bdbxml.cc
deleted file mode 100644
index afd3561f8df8..000000000000
--- a/databases/ruby-bdb/files/patch-bdbxml1__bdbxml.cc
+++ /dev/null
@@ -1,111 +0,0 @@
---- bdbxml1/bdbxml.cc.orig	2011-04-06 19:35:39 UTC
-+++ bdbxml1/bdbxml.cc
-@@ -1148,15 +1148,19 @@ xb_con_init(int argc, VALUE *argv, VALUE obj)
- 	    flags = NUM2INT(b);
- 	}
-     }
-+#if defined(RUBY_SAFE_LEVEL_MAX) && RUBY_SAFE_LEVEL_MAX >= 2
-     if (flags & DB_TRUNCATE) {
- 	rb_secure(2);
-     }
-+#endif
-+#if defined(RUBY_SAFE_LEVEL_MAX) && RUBY_SAFE_LEVEL_MAX >= 4
-     if (flags & DB_CREATE) {
- 	rb_secure(4);
-     }
-     if (rb_safe_level() >= 4) {
- 	flags |= DB_RDONLY;
-     }
-+#endif
-     if (!txn && con->env_val) {
- 	bdb_ENV *envst = NULL;
- 	GetEnvDBErr(con->env_val, envst, id_current_env, xb_eFatal);
-@@ -1179,9 +1183,11 @@ xb_con_close(int argc, VALUE *argv, VALUE obj)
-     xcon *con;
-     int flags = 0;
- 
-+#if defined(RUBY_SAFE_LEVEL_MAX) && RUBY_SAFE_LEVEL_MAX >= 4
-     if (!OBJ_TAINTED(obj) && rb_safe_level() >= 4) {
- 	rb_raise(rb_eSecurityError, "Insecure: can't close the container");
-     }
-+#endif
-     Data_Get_Struct(obj, xcon, con);
-     if (!con->closed && con->con) {
- 	if (rb_scan_args(argc, argv, "01", &a)) {
-@@ -1516,7 +1522,9 @@ xb_int_update(int argc, VALUE *argv, VALUE obj, XmlUpd
-     DbTxn *txn;
-     VALUE a;
- 
-+#if defined(RUBY_SAFE_LEVEL_MAX) && RUBY_SAFE_LEVEL_MAX >= 4
-     rb_secure(4);
-+#endif
-     GetConTxn(obj, con, txn);
-     if (rb_scan_args(argc, argv, "10", &a) != 1) {
- 	rb_raise(rb_eArgError, "invalid number of arguments (%d for 1)", argc);
-@@ -1545,7 +1553,9 @@ xb_int_push(int argc, VALUE *argv, VALUE obj, XmlUpdat
-     VALUE a, b;
-     int flags = 0;
- 
-+#if defined(RUBY_SAFE_LEVEL_MAX) && RUBY_SAFE_LEVEL_MAX >= 4
-     rb_secure(4);
-+#endif
-     GetConTxn(obj, con, txn);
-     if (rb_scan_args(argc, argv, "11", &a, &b) == 2) {
- 	flags = NUM2INT(b);
-@@ -1775,7 +1785,9 @@ xb_int_delete(int argc, VALUE *argv, VALUE obj, XmlUpd
-     VALUE a, b;
-     int flags = 0;
- 
-+#if defined(RUBY_SAFE_LEVEL_MAX) && RUBY_SAFE_LEVEL_MAX >= 4
-     rb_secure(4);
-+#endif
-     GetConTxn(obj, con, txn);
-     if (rb_scan_args(argc, argv, "11", &a, &b) == 2) {
- 	flags = NUM2INT(b);
-@@ -1824,7 +1836,9 @@ xb_con_remove(int argc, VALUE *argv, VALUE obj)
-     xcon *con;
-     DbTxn *txn = NULL;
- 
-+#if defined(RUBY_SAFE_LEVEL_MAX) && RUBY_SAFE_LEVEL_MAX >= 2
-     rb_secure(2);
-+#endif
-     if (rb_scan_args(argc, argv, "11", &a, &b) == 2) {
- 	flags = NUM2INT(b);
-     }
-@@ -1844,7 +1858,9 @@ xb_con_rename(int argc, VALUE *argv, VALUE obj)
-     char *str;
-     DbTxn *txn = NULL;
- 
-+#if defined(RUBY_SAFE_LEVEL_MAX) && RUBY_SAFE_LEVEL_MAX >= 2
-     rb_secure(2);
-+#endif
-     if (rb_scan_args(argc, argv, "21", &a, &b, &c) == 3) {
- 	flags = NUM2INT(c);
-     }
-@@ -2340,18 +2356,16 @@ extern "C" {
- 	major = NUM2INT(rb_const_get(xb_mDb, rb_intern("VERSION_MAJOR")));
- 	minor = NUM2INT(rb_const_get(xb_mDb, rb_intern("VERSION_MINOR")));
- 	patch = NUM2INT(rb_const_get(xb_mDb, rb_intern("VERSION_PATCH")));
--	if (major != DB_VERSION_MAJOR || minor != DB_VERSION_MINOR
--	    || patch != DB_VERSION_PATCH) {
--	    rb_raise(rb_eNotImpError, "\nBDB::XML needs compatible versions of BDB\n\tyou have BDB::XML version %d.%d.%d and BDB version %d.%d.%d\n",
--		     DB_VERSION_MAJOR, DB_VERSION_MINOR, DB_VERSION_PATCH,
--		     major, minor, patch);
-+	if (major != DB_VERSION_MAJOR || minor != DB_VERSION_MINOR) {
-+	    rb_raise(rb_eNotImpError, "\nBDB::XML needs compatible versions of BDB\n\tyou have BDB::XML version %d.%d and BDB version %d.%d\n",
-+		     DB_VERSION_MAJOR, DB_VERSION_MINOR,
-+		     major, minor);
- 	}
- 	version = rb_tainted_str_new2(dbxml_version(&major, &minor, &patch));
--	if (major != DBXML_VERSION_MAJOR || minor != DBXML_VERSION_MINOR
--	    || patch != DBXML_VERSION_PATCH) {
--	    rb_raise(rb_eNotImpError, "\nBDB::XML needs compatible versions of DbXml\n\tyou have DbXml.hpp version %d.%d.%d and libdbxml version %d.%d.%d\n",
--		     DB_VERSION_MAJOR, DB_VERSION_MINOR, DB_VERSION_PATCH,
--		     major, minor, patch);
-+	if (major != DBXML_VERSION_MAJOR || minor != DBXML_VERSION_MINOR) {
-+	    rb_raise(rb_eNotImpError, "\nBDB::XML needs compatible versions of DbXml\n\tyou have DbXml.hpp version %d.%d and libdbxml version %d.%d\n",
-+		     DB_VERSION_MAJOR, DB_VERSION_MINOR,
-+		     major, minor);
- 	}
- 
- 	xb_eFatal = rb_const_get(xb_mDb, rb_intern("Fatal"));
diff --git a/databases/ruby-bdb/files/patch-bdbxml2__bdbxml.cc b/databases/ruby-bdb/files/patch-bdbxml2-bdbxml.cc
index 28204b52d6d6..28204b52d6d6 100644
--- a/databases/ruby-bdb/files/patch-bdbxml2__bdbxml.cc
+++ b/databases/ruby-bdb/files/patch-bdbxml2-bdbxml.cc
diff --git a/databases/ruby-bdb/files/patch-bdbxml2-bdbxml.h b/databases/ruby-bdb/files/patch-bdbxml2-bdbxml.h
index ba92db94b87c..3b9fced8a529 100644
--- a/databases/ruby-bdb/files/patch-bdbxml2-bdbxml.h
+++ b/databases/ruby-bdb/files/patch-bdbxml2-bdbxml.h
@@ -1,11 +1,11 @@
 --- bdbxml2/bdbxml.h.orig	2011-04-06 19:35:39 UTC
 +++ bdbxml2/bdbxml.h
-@@ -377,7 +377,7 @@
+@@ -377,7 +377,7 @@ get_mod(VALUE obj)
  static inline void
  rset_obj(VALUE obj)
  {
 -    RBASIC(obj)->klass = rb_cData;
-+    RBASIC_SET_CLASS_RAW(obj, rb_cData);
++    RBASIC_SET_CLASS_RAW(obj, rb_cObject);
      RDATA(obj)->dfree = (RDF)free;
      RDATA(obj)->dmark = 0;
  }
diff --git a/databases/ruby-bdb/files/patch-extconf.rb b/databases/ruby-bdb/files/patch-extconf.rb
index 4edd71af924f..c229cc51056e 100644
--- a/databases/ruby-bdb/files/patch-extconf.rb
+++ b/databases/ruby-bdb/files/patch-extconf.rb
@@ -1,15 +1,6 @@
 --- extconf.rb.orig	2011-04-06 19:35:39 UTC
 +++ extconf.rb
-@@ -50,7 +50,7 @@
- rdoc: docs/doc/index.html
- 
- docs/doc/index.html: $(RDOC)
--\t@-(cd docs; rdoc .)
-+\t@-(cd docs; ${RUBY_RDOC} .)
- 
- ri:
- \t@-(rdoc -r docs/*rb)
-@@ -67,7 +67,7 @@
+@@ -67,7 +67,7 @@ test: $(DLLIB)
     Dir.foreach('tests') do |x|
        next if /^\./ =~ x || /(_\.rb|~)$/ =~ x
        next if FileTest.directory?(x)
@@ -18,7 +9,7 @@
     end
  ensure
     make.close
-@@ -76,7 +76,7 @@
+@@ -76,7 +76,7 @@ end
  subdirs.each do |subdir|
     STDERR.puts("#{$0}: Entering directory `#{subdir}'")
     Dir.chdir(subdir)
diff --git a/databases/ruby-bdb/files/patch-src-bdb.c b/databases/ruby-bdb/files/patch-src-bdb.c
new file mode 100644
index 000000000000..87bc6d797eec
--- /dev/null
+++ b/databases/ruby-bdb/files/patch-src-bdb.c
@@ -0,0 +1,29 @@
+--- src/bdb.c.orig	2011-04-06 19:35:39 UTC
++++ src/bdb.c
+@@ -165,12 +165,11 @@ Init_bdb()
+     if (rb_const_defined_at(rb_cObject, rb_intern("BDB"))) {
+ 	rb_raise(rb_eNameError, "module already defined");
+     }
+-    version = rb_tainted_str_new2(db_version(&major, &minor, &patch));
+-    if (major != DB_VERSION_MAJOR || minor != DB_VERSION_MINOR
+-	|| patch != DB_VERSION_PATCH) {
+-        rb_raise(rb_eNotImpError, "\nBDB needs compatible versions of libdb & db.h\n\tyou have db.h version %d.%d.%d and libdb version %d.%d.%d\n",
+-		 DB_VERSION_MAJOR, DB_VERSION_MINOR, DB_VERSION_PATCH,
+-		 major, minor, patch);
++    version = rb_str_new_cstr(db_version(&major, &minor, &patch));
++    if (major != DB_VERSION_MAJOR || minor != DB_VERSION_MINOR) {
++        rb_raise(rb_eNotImpError, "\nBDB needs compatible versions of libdb & db.h\n\tyou have db.h version %d.%d and libdb version %d.%d\n",
++		 DB_VERSION_MAJOR, DB_VERSION_MINOR,
++		 major, minor);
+     }
+     bdb_mMarshal = rb_const_get(rb_cObject, rb_intern("Marshal"));
+     bdb_id_current_db = rb_intern("__bdb_current_db__");
+@@ -958,7 +957,7 @@ Init_bdb()
+     bdb_init_delegator();
+     bdb_init_sequence();
+ 
+-    bdb_errstr = rb_tainted_str_new(0, 0);
++    bdb_errstr = rb_str_new(0, 0);
+     rb_global_variable(&bdb_errstr);
+     
+ }
diff --git a/databases/ruby-bdb/files/patch-src-common.c b/databases/ruby-bdb/files/patch-src-common.c
index ba1783425a39..19682dfb76a5 100644
--- a/databases/ruby-bdb/files/patch-src-common.c
+++ b/databases/ruby-bdb/files/patch-src-common.c
@@ -1,5 +1,32 @@
 --- src/common.c.orig	2011-04-06 19:35:39 UTC
 +++ src/common.c
+@@ -273,7 +273,7 @@ bdb_test_load(VALUE obj, DBT *a, int type_kv)
+                 res = Qnil;
+             }
+             else {
+-                res = rb_tainted_str_new(a->data, a->size);
++                res = rb_str_new(a->data, a->size);
+                 if (dbst->filter[2 + posi]) {
+                     if (FIXNUM_P(dbst->filter[2 + posi])) {
+                         res = rb_funcall(obj, NUM2INT(dbst->filter[2 + posi]),
+@@ -494,7 +494,7 @@ bdb_h_hash(DB *dbbd, const void *bytes, u_int32_t leng
+ #endif
+ 
+     GetIdDbSec(obj, dbst, dbbd);
+-    st = rb_tainted_str_new((char *)bytes, length);
++    st = rb_str_new((char *)bytes, length);
+     if (dbst->h_hash == 0)
+ 	res = rb_funcall(obj, id_h_hash, 1, st);
+     else
+@@ -603,7 +603,7 @@ compar_func(VALUE value)
+ }
+ 
+ static VALUE
+-bdb_i_options(VALUE obj, VALUE dbstobj)
++bdb_i_options(VALUE obj, VALUE dbstobj, int _argc, const VALUE *_argv, VALUE _blockarg)
+ {
+     VALUE key, value;
+     char *options, *str;
 @@ -1080,9 +1080,11 @@ bdb_close(int argc, VALUE *argv, VALUE obj)
      bdb_DB *dbst;
      int flags = 0;
@@ -12,7 +39,27 @@
      Data_Get_Struct(obj, bdb_DB, dbst);
      if (dbst->dbp != NULL) {
  	if (rb_scan_args(argc, argv, "01", &opt)) {
-@@ -1229,7 +1231,7 @@ bdb_s_new(int argc, VALUE *argv, VALUE obj)
+@@ -1140,8 +1142,7 @@ bdb_hard_count(dbp)
+ #endif
+ 
+ static long
+-bdb_is_recnum(dbp)
+-    DB *dbp;
++bdb_is_recnum(DB *dbp)
+ {
+     DB_BTREE_STAT *bdb_stat;
+     long count;
+@@ -1172,8 +1173,7 @@ bdb_is_recnum(dbp)
+ }
+ 
+ static VALUE
+-bdb_recno_length(obj)
+-    VALUE obj;
++bdb_recno_length(VALUE obj)
+ {
+     bdb_DB *dbst;
+     DB_BTREE_STAT *bdb_stat;
+@@ -1229,7 +1229,7 @@ bdb_s_new(int argc, VALUE *argv, VALUE obj)
      if (argc && TYPE(argv[argc - 1]) == T_HASH) {
  	VALUE v, f = argv[argc - 1];
  
@@ -21,7 +68,7 @@
  	    if (!rb_obj_is_kind_of(v, bdb_cTxn)) {
  		rb_raise(bdb_eFatal, "argument of txn must be a transaction");
  	    }
-@@ -1241,7 +1243,7 @@ bdb_s_new(int argc, VALUE *argv, VALUE obj)
+@@ -1241,7 +1241,7 @@ bdb_s_new(int argc, VALUE *argv, VALUE obj)
  	    dbst->options |= envst->options & BDB_NO_THREAD;
  	    dbst->marshal = txnst->marshal;
  	}
@@ -30,7 +77,7 @@
  	    if (!rb_obj_is_kind_of(v, bdb_cEnv)) {
  		rb_raise(bdb_eFatal, "argument of env must be an environnement");
  	    }
-@@ -1254,11 +1256,11 @@ bdb_s_new(int argc, VALUE *argv, VALUE obj)
+@@ -1254,11 +1254,11 @@ bdb_s_new(int argc, VALUE *argv, VALUE obj)
  #if HAVE_CONST_DB_ENCRYPT 
  	if (envst && (envst->options & BDB_ENV_ENCRYPT)) {
  	    VALUE tmp = rb_str_new2("set_flags");
@@ -44,7 +91,16 @@
  		rb_hash_aset(f, tmp, INT2NUM(NUM2INT(v) | DB_ENCRYPT));
  	    }
  	    else {
-@@ -1431,15 +1433,19 @@ bdb_init(int argc, VALUE *argv, VALUE obj)
+@@ -1338,7 +1338,7 @@ bdb_init(int argc, VALUE *argv, VALUE obj)
+ #endif
+     if (argc && TYPE(argv[argc - 1]) == T_HASH) {
+ 	hash_arg = argv[argc - 1];
+-	rb_iterate(rb_each, argv[argc - 1], bdb_i_options, obj);
++	rb_block_call(argv[argc - 1], rb_intern("each"), 0, NULL, bdb_i_options, obj);
+         argc--;
+     }
+     mode = flags = 0;
+@@ -1431,15 +1431,19 @@ bdb_init(int argc, VALUE *argv, VALUE obj)
  	dbst->options |= BDB_FEEDBACK;
      }
  #endif
@@ -64,7 +120,22 @@
  #if HAVE_CONST_DB_DUPSORT
      if (dbst->options & BDB_DUP_COMPARE) {
  #if HAVE_TYPE_DB_INFO
-@@ -1570,10 +1576,10 @@ bdb_init(int argc, VALUE *argv, VALUE obj)
+@@ -1540,12 +1544,12 @@ bdb_init(int argc, VALUE *argv, VALUE obj)
+     }
+     dbst->filename = dbst->database = Qnil;
+     if (name) {
+-	dbst->filename = rb_tainted_str_new2(name);
++	dbst->filename = rb_str_new_cstr(name);
+ 	OBJ_FREEZE(dbst->filename);
+     }
+ #if HAVE_ST_DB_OPEN
+     if (subname) {
+-	dbst->database = rb_tainted_str_new2(subname);
++	dbst->database = rb_str_new_cstr(subname);
+ 	OBJ_FREEZE(dbst->database);
+     }
+ #endif
+@@ -1570,10 +1574,10 @@ bdb_init(int argc, VALUE *argv, VALUE obj)
  #endif
  	switch(dbst->type) {
  	case DB_BTREE:
@@ -77,7 +148,7 @@
  	    break;
  	case DB_RECNO:
  	{
-@@ -1581,17 +1587,17 @@ bdb_init(int argc, VALUE *argv, VALUE obj)
+@@ -1581,17 +1585,17 @@ bdb_init(int argc, VALUE *argv, VALUE obj)
  
  	    rb_warning("It's hard to distinguish Recnum with Recno for all versions of Berkeley DB");
  	    if ((count = bdb_is_recnum(dbst->dbp)) != -1) {
@@ -98,7 +169,17 @@
  	    break;
  #endif
  	default:
-@@ -1635,29 +1641,29 @@ bdb_s_alloc(obj)
+@@ -1625,8 +1629,7 @@ bdb_init(int argc, VALUE *argv, VALUE obj)
+ }
+ 
+ static VALUE
+-bdb_s_alloc(obj)
+-    VALUE obj;
++bdb_s_alloc(VALUE obj)
+ {
+     VALUE res, cl;
+     bdb_DB *dbst;
+@@ -1635,29 +1638,29 @@ bdb_s_alloc(obj)
      dbst->options = BDB_NOT_OPEN;
      cl = obj;
      while (cl) {
@@ -134,9 +215,81 @@
  	    dbst->type = DB_UNKNOWN;
  	    break;
  	}
-@@ -1802,7 +1808,9 @@ bdb_append_internal(argc, argv, obj, flag, retval)
+@@ -1671,8 +1674,7 @@ bdb_s_alloc(obj)
+ }
+ 
+ static VALUE
+-bdb_i_s_create(obj, db)
+-    VALUE obj, db;
++bdb_i_s_create(VALUE obj, VALUE db, int _argc, const VALUE *_argv, VALUE _blockarg)
+ {
+     VALUE tmp[2];
+     tmp[0] = rb_ary_entry(obj, 0);
+@@ -1689,7 +1691,7 @@ bdb_s_create(int argc, VALUE *argv, VALUE obj)
+ 
+     res = rb_funcall2(obj, rb_intern("new"), 0, 0);
+     if (argc == 1 && TYPE(argv[0]) == T_HASH) {
+-	rb_iterate(rb_each, argv[0], bdb_i_s_create, res);
++	rb_block_call(argv[0], rb_intern("each"), 0, NULL, bdb_i_s_create, res);
+ 	return res;
+     }
+     if (argc % 2 != 0) {
+@@ -1718,8 +1720,7 @@ struct re {
+ };
+ 
+ static VALUE
+-bdb_queue_i_search_re_len(obj, restobj)
+-    VALUE obj, restobj;
++bdb_queue_i_search_re_len(VALUE obj, VALUE restobj, int _argc, const VALUE *_argv, VALUE _blockarg)
+ {
+     VALUE key, value;
+     char *str;
+@@ -1760,14 +1761,14 @@ bdb_queue_s_new(int argc, VALUE *argv, VALUE obj) 
+     rest->re_len = -1;
+     rest->re_pad = -1;
+     if (argc && TYPE(argv[argc - 1]) == T_HASH) {
+-	rb_iterate(rb_each, argv[argc - 1], bdb_queue_i_search_re_len, restobj);
++	rb_block_call(argv[argc - 1], rb_intern("each"), 0, NULL, bdb_queue_i_search_re_len, restobj);
+ 	if (rest->re_len <= 0) {
+ 	    rest->re_len = DEFAULT_RECORD_LENGTH;
+-	    rb_hash_aset(argv[argc - 1], rb_tainted_str_new2("set_re_len"), INT2NUM(rest->re_len));
++	    rb_hash_aset(argv[argc - 1], rb_str_new_cstr("set_re_len"), INT2NUM(rest->re_len));
+ 	}
+ 	if (rest->re_pad < 0) {
+ 	    rest->re_pad = DEFAULT_RECORD_PAD;
+-	    rb_hash_aset(argv[argc - 1], rb_tainted_str_new2("set_re_pad"), INT2NUM(rest->re_pad));
++	    rb_hash_aset(argv[argc - 1], rb_str_new_cstr("set_re_pad"), INT2NUM(rest->re_pad));
+ 	}
+ 	nargv = argv;
+     }
+@@ -1777,8 +1778,8 @@ bdb_queue_s_new(int argc, VALUE *argv, VALUE obj) 
+ 	nargv[argc] = rb_hash_new();
+ 	rest->re_len = DEFAULT_RECORD_LENGTH;
+ 	rest->re_pad = DEFAULT_RECORD_PAD;
+-	rb_hash_aset(nargv[argc], rb_tainted_str_new2("set_re_len"), INT2NUM(DEFAULT_RECORD_LENGTH));
+-	rb_hash_aset(nargv[argc], rb_tainted_str_new2("set_re_pad"), INT2NUM(DEFAULT_RECORD_PAD));
++	rb_hash_aset(nargv[argc], rb_str_new_cstr("set_re_len"), INT2NUM(DEFAULT_RECORD_LENGTH));
++	rb_hash_aset(nargv[argc], rb_str_new_cstr("set_re_pad"), INT2NUM(DEFAULT_RECORD_PAD));
+ 	argc += 1;
+     }
+     ret = bdb_s_new(argc, nargv, obj);
+@@ -1790,9 +1791,7 @@ bdb_queue_s_new(int argc, VALUE *argv, VALUE obj) 
+ #endif
+ 
+ static VALUE
+-bdb_append_internal(argc, argv, obj, flag, retval)
+-    int argc, flag;
+-    VALUE *argv, obj;
++bdb_append_internal(int argc, VALUE *argv, VALUE obj, int flag, retval)
+ {
+     bdb_DB *dbst;
+     DB_TXN *txnid;
+@@ -1800,9 +1799,11 @@ bdb_append_internal(argc, argv, obj, flag, retval)
+     db_recno_t recno;
+     int i;
      VALUE *a, ary = Qnil;
-     volatile VALUE res = Qnil;
+-    volatile VALUE res = Qnil;
++    volatile VALUE res;
  
 +#if defined(RUBY_SAFE_LEVEL_MAX) && RUBY_SAFE_LEVEL_MAX >= 4
      rb_secure(4);
@@ -144,7 +297,16 @@
      if (argc < 1)
  	return obj;
      INIT_TXN(txnid, obj, dbst);
-@@ -1885,7 +1893,9 @@ bdb_put(int argc, VALUE *argv, VALUE obj)
+@@ -1876,7 +1877,7 @@ bdb_unshift(int argc, VALUE *argv, VALUE obj)
+ VALUE
+ bdb_put(int argc, VALUE *argv, VALUE obj)
+ {
+-    volatile VALUE a0 = Qnil;
++    volatile VALUE a0;
+     volatile VALUE b0 = Qnil;
+     VALUE a, b, c;
+     bdb_DB *dbst;
+@@ -1885,7 +1886,9 @@ bdb_put(int argc, VALUE *argv, VALUE obj)
      int ret, flags;
      db_recno_t recno;
  
@@ -154,7 +316,226 @@
      INIT_TXN(txnid, obj, dbst);
      flags = 0;
      a = b = c = Qnil;
-@@ -2374,7 +2384,9 @@ bdb_consume(obj)
+@@ -1924,8 +1927,7 @@ bdb_put(int argc, VALUE *argv, VALUE obj)
+ }
+ 
+ static VALUE
+-bdb_aset(obj, a, b)
+-    VALUE obj, a, b;
++bdb_aset(VALUE obj, VALUE a, VALUE b)
+ {
+     VALUE tmp[2];
+     tmp[0] = a;
+@@ -1935,9 +1937,7 @@ bdb_aset(obj, a, b)
+ }
+ 
+ VALUE
+-bdb_test_load_key(obj, key)
+-    VALUE obj;
+-    DBT *key;
++bdb_test_load_key(VALUE obj, DBT *key)
+ {
+     bdb_DB *dbst;
+     Data_Get_Struct(obj, bdb_DB, dbst);
+@@ -1947,18 +1947,14 @@ bdb_test_load_key(obj, key)
+ }
+ 
+ VALUE
+-bdb_assoc(obj, key, data)
+-    VALUE obj;
+-    DBT *key, *data;
++bdb_assoc(VALUE obj, DBT *key, DBT *data)
+ {
+     return rb_assoc_new(bdb_test_load_key(obj, key), 
+ 			bdb_test_load(obj, data, FILTER_VALUE));
+ }
+ 
+ VALUE
+-bdb_assoc_dyna(obj, key, data)
+-    VALUE obj;
+-    DBT *key, *data;
++bdb_assoc_dyna(VALUE obj, DBT *key, DBT *data)
+ {
+     VALUE k, v;
+     int to_free = key->flags & DB_DBT_MALLOC;
+@@ -1976,9 +1972,7 @@ bdb_assoc_dyna(obj, key, data)
+ #if HAVE_ST_DB_PGET
+ 
+ static VALUE
+-bdb_assoc2(obj, skey, pkey, data)
+-    VALUE obj;
+-    DBT *skey, *pkey, *data;
++bdb_assoc2(VALUE obj, DBT *skey, DBT *pkey, DBT *data)
+ {
+     return rb_assoc_new(
+ 	rb_assoc_new(bdb_test_load_key(obj, skey), bdb_test_load_key(obj, pkey)),
+@@ -1988,9 +1982,7 @@ bdb_assoc2(obj, skey, pkey, data)
+ #endif
+ 
+ VALUE
+-bdb_assoc3(obj, skey, pkey, data)
+-    VALUE obj;
+-    DBT *skey, *pkey, *data;
++bdb_assoc3(VALUE obj, DBT *skey, DBT *pkey, DBT *data)
+ {
+     return rb_ary_new3(3, bdb_test_load_key(obj, skey), 
+ 		       bdb_test_load_key(obj, pkey),
+@@ -2006,12 +1998,7 @@ static VALUE bdb_has_both_internal _((VALUE, VALUE, VA
+ #endif
+ 
+ static VALUE
+-bdb_get_internal(argc, argv, obj, notfound, dyna)
+-    int argc;
+-    VALUE *argv;
+-    VALUE obj;
+-    VALUE notfound;
+-    int dyna;
++bdb_get_internal(int argc, VALUE *argv, VALUE obj, VALUE notfound, int dyna)
+ {
+     VALUE a = Qnil;
+     VALUE b = Qnil;
+@@ -2019,13 +2006,12 @@ bdb_get_internal(argc, argv, obj, notfound, dyna)
+     bdb_DB *dbst;
+     DB_TXN *txnid;
+     DBT key, data;
+-    int flagss;
+     int ret, flags;
+     db_recno_t recno;
+     void *tmp_data = 0;
+ 
+     INIT_TXN(txnid, obj, dbst);
+-    flagss = flags = 0;
++    flags = 0;
+     MEMZERO(&key, DBT, 1);
+     MEMZERO(&data, DBT, 1);
+     data.flags |= DB_DBT_MALLOC;
+@@ -2043,7 +2029,7 @@ bdb_get_internal(argc, argv, obj, notfound, dyna)
+         }
+ 	break;
+     case 2:
+-	flagss = flags = NUM2INT(b);
++	flags = NUM2INT(b);
+ 	break;
+     }
+     a = bdb_test_recno(obj, &key, &recno, a);
+@@ -2128,13 +2114,12 @@ bdb_pget(int argc, VALUE *argv, VALUE obj)
+     bdb_DB *dbst;
+     DB_TXN *txnid;
+     DBT pkey, data, skey;
+-    int flagss;
+     int ret, flags;
+     db_recno_t srecno;
+     void *tmp_data = 0;
+ 
+     INIT_TXN(txnid, obj, dbst);
+-    flagss = flags = 0;
++    flags = 0;
+     MEMZERO(&skey, DBT, 1);
+     MEMZERO(&pkey, DBT, 1);
+     MEMZERO(&data, DBT, 1);
+@@ -2150,7 +2135,7 @@ bdb_pget(int argc, VALUE *argv, VALUE obj)
+         }
+ 	break;
+     case 2:
+-	flagss = flags = NUM2INT(b);
++	flags = NUM2INT(b);
+ 	break;
+     }
+     a = bdb_test_recno(obj, &skey, &srecno, a);
+@@ -2174,15 +2159,14 @@ bdb_pget(int argc, VALUE *argv, VALUE obj)
+ #if HAVE_TYPE_DB_KEY_RANGE
+ 
+ static VALUE
+-bdb_btree_key_range(obj, a)
+-    VALUE obj, a;
++bdb_btree_key_range(VALUE obj, VALUE a)
+ {
+     bdb_DB *dbst;
+     DB_TXN *txnid;
+     DBT key;
+     db_recno_t recno;
+     DB_KEY_RANGE key_range;
+-    volatile VALUE b = Qnil;
++    volatile VALUE b;
+ 
+     INIT_TXN(txnid, obj, dbst);
+     MEMZERO(&key, DBT, 1);
+@@ -2203,8 +2187,7 @@ struct data_flags {
+ };
+ 
+ static VALUE
+-bdb_compact_i(obj, dataobj)
+-    VALUE obj, dataobj;
++bdb_compact_i(VALUE obj, VALUE dataobj, int _argc, const VALUE *_argv, VALUE _blockarg)
+ {
+     VALUE key, value;
+     char *str;
+@@ -2255,10 +2238,10 @@ bdb_treerec_compact(int argc, VALUE *argv, VALUE obj)
+ 	    struct data_flags *dtf;
+ 	    VALUE dtobj;
+ 		
+-	    dtobj = Data_Make_Struct(rb_cData, struct data_flags, 0, free, dtf);
++	    dtobj = Data_Make_Struct(rb_cObject, struct data_flags, 0, free, dtf);
+ 	    dtf->cdata = &cdata;
+ 	    dtf->flags = 0;
+-	    rb_iterate(rb_each, c, bdb_compact_i, dtobj);
++	    rb_block_call(c, rb_intern("each"), 0, NULL, bdb_compact_i, dtobj);
+ 	    flags = dtf->flags;
+ 	}
+ 	/* ... */
+@@ -2280,16 +2263,16 @@ bdb_treerec_compact(int argc, VALUE *argv, VALUE obj)
+     bdb_test_error(dbst->dbp->compact(dbst->dbp, txnid, pstart, pstop, &cdata,
+ 				      flags, &end));
+     result = rb_hash_new();
+-    rb_hash_aset(result, rb_tainted_str_new2("end"), bdb_test_load_key(obj, &end));
+-    rb_hash_aset(result, rb_tainted_str_new2("compact_deadlock"),
++    rb_hash_aset(result, rb_str_new_cstr("end"), bdb_test_load_key(obj, &end));
++    rb_hash_aset(result, rb_str_new_cstr("compact_deadlock"),
+ 		 INT2NUM(cdata.compact_deadlock));
+-    rb_hash_aset(result, rb_tainted_str_new2("compact_levels"),
++    rb_hash_aset(result, rb_str_new_cstr("compact_levels"),
+ 		 INT2NUM(cdata.compact_levels));
+-    rb_hash_aset(result, rb_tainted_str_new2("compact_pages_free"),
++    rb_hash_aset(result, rb_str_new_cstr("compact_pages_free"),
+ 		 INT2NUM(cdata.compact_pages_free));
+-    rb_hash_aset(result, rb_tainted_str_new2("compact_pages_examine"),
++    rb_hash_aset(result, rb_str_new_cstr("compact_pages_examine"),
+ 		 INT2NUM(cdata.compact_pages_examine));
+-    rb_hash_aset(result, rb_tainted_str_new2("compact_pages_truncated"),
++    rb_hash_aset(result, rb_str_new_cstr("compact_pages_truncated"),
+ 		 INT2NUM(cdata.compact_pages_truncated));
+     return result;
+ }
+@@ -2301,8 +2284,7 @@ bdb_treerec_compact(int argc, VALUE *argv, VALUE obj)
+ #if HAVE_CONST_DB_NEXT_DUP
+ 
+ static VALUE
+-bdb_count(obj, a)
+-    VALUE obj, a;
++bdb_count(VALUE obj, VALUE a)
+ {
+     bdb_DB *dbst;
+     DB_TXN *txnid;
+@@ -2311,7 +2293,7 @@ bdb_count(obj, a)
+     int ret, flags27;
+     db_recno_t recno;
+     db_recno_t count;
+-    volatile VALUE b = Qnil;
++    volatile VALUE b;
+ 
+     INIT_TXN(txnid, obj, dbst);
+     MEMZERO(&key, DBT, 1);
+@@ -2364,8 +2346,7 @@ bdb_count(obj, a)
+ #if HAVE_CONST_DB_CONSUME
+ 
+ static VALUE
+-bdb_consume(obj)
+-    VALUE obj;
++bdb_consume(VALUE obj)
+ {
+     bdb_DB *dbst;
+     DB_TXN *txnid;
+@@ -2374,7 +2355,9 @@ bdb_consume(obj)
      int ret;
      db_recno_t recno;
  
@@ -164,9 +545,63 @@
      INIT_TXN(txnid, obj, dbst);
      MEMZERO(&key, DBT, 1);
      MEMZERO(&data, DBT, 1);
-@@ -2551,7 +2563,9 @@ bdb_del(obj, a)
+@@ -2396,8 +2379,7 @@ bdb_consume(obj)
+ #endif
+ 
+ static VALUE
+-bdb_has_key(obj, key)
+-    VALUE obj, key;
++bdb_has_key(VALUE obj, VALUE key)
+ {
+     return (bdb_get_internal(1, &key, obj, Qundef, 0) == Qundef)?Qfalse:Qtrue;
+ }
+@@ -2405,8 +2387,7 @@ bdb_has_key(obj, key)
+ #if CANT_DB_CURSOR_GET_BOTH
+ 
+ static VALUE
+-bdb_has_both_internal(obj, a, b, flag)
+-    VALUE obj, a, b, flag;
++bdb_has_both_internal(VALUE obj, VALUE a, VALUE b, VALUE flag)
+ {
+     bdb_DB *dbst;
+     DB_TXN *txnid;
+@@ -2491,8 +2472,7 @@ bdb_has_both_internal(obj, a, b, flag)
+ #endif
+ 
+ static VALUE
+-bdb_has_both(obj, a, b)
+-    VALUE obj, a, b;
++bdb_has_both(VALUE obj, VALUE a, VALUE b)
+ {
+ #if ! HAVE_CONST_DB_GET_BOTH
+     return bdb_has_both_internal(obj, a, b, Qfalse);
+@@ -2502,8 +2482,8 @@ bdb_has_both(obj, a, b)
+     DBT key, data;
+     int ret, flags;
+     db_recno_t recno;
+-    volatile VALUE c = Qnil;
+-    volatile VALUE d = Qnil;
++    volatile VALUE c;
++    volatile VALUE d;
+     void *tmp_key, *tmp_data;
+ 
+     INIT_TXN(txnid, obj, dbst);
+@@ -2540,8 +2520,7 @@ bdb_has_both(obj, a, b)
+ }
+ 
+ VALUE
+-bdb_del(obj, a)
+-    VALUE a, obj;
++bdb_del(VALUE obj, VALUE a)
+ {
+     bdb_DB *dbst;
+     DB_TXN *txnid;
+@@ -2549,9 +2528,11 @@ bdb_del(obj, a)
+     DBT key;
+     int ret;
      db_recno_t recno;
-     volatile VALUE b = Qnil;
+-    volatile VALUE b = Qnil;
++    volatile VALUE b;
  
 +#if defined(RUBY_SAFE_LEVEL_MAX) && RUBY_SAFE_LEVEL_MAX >= 4
      rb_secure(4);
@@ -174,7 +609,142 @@
      INIT_TXN(txnid, obj, dbst);
  #if HAVE_CONST_DB_AUTO_COMMIT
      if (txnid == NULL && (dbst->options & BDB_AUTO_COMMIT)) {
-@@ -3004,8 +3018,8 @@ bdb_each_kvc(argc, argv, obj, sens, replace, type)
+@@ -2568,8 +2549,7 @@ bdb_del(obj, a)
+ }
+ 
+ static VALUE
+-bdb_empty(obj)
+-    VALUE obj;
++bdb_empty(VALUE obj)
+ {
+     bdb_DB *dbst;
+     DB_TXN *txnid;
+@@ -2603,8 +2583,7 @@ bdb_empty(obj)
+ }
+ 
+ static VALUE
+-bdb_lgth_intern(obj, delete)
+-    VALUE obj, delete;
++bdb_lgth_intern(VALUE obj, VALUE delete)
+ {
+     bdb_DB *dbst;
+     DB_TXN *txnid;
+@@ -2646,8 +2625,7 @@ bdb_lgth_intern(obj, delete)
+ }
+ 
+ static VALUE
+-bdb_length(obj)
+-    VALUE obj;
++bdb_length(VALUE obj)
+ {
+     return bdb_lgth_intern(obj, Qfalse);
+ }
+@@ -2667,10 +2645,10 @@ typedef struct {
+ } eachst;
+ 
+ static VALUE
+-bdb_each_ensure(st)
+-    eachst *st;
++bdb_each_ensure(VALUE pst)
+ {
+ #if HAVE_CONST_DB_MULTIPLE_KEY
++    eachst *st = (eachst *)pst;
+     if (st->len && st->data) {
+ 	free(st->data);
+     }
+@@ -2680,9 +2658,7 @@ bdb_each_ensure(st)
+ }
+ 
+ static void
+-bdb_treat(st, pkey, key, data)
+-    eachst *st;
+-    DBT *pkey, *key, *data;
++bdb_treat(eachst *st, DBT *pkey, DBT *key, DBT *data)
+ {
+     bdb_DB *dbst;
+     DBC *dbcp;
+@@ -2772,10 +2748,7 @@ bdb_treat(st, pkey, key, data)
+ }
+ 
+ static int
+-bdb_i_last_prefix(dbcp, key, pkey, data, orig, st)
+-    DBC *dbcp;
+-    DBT *key, *pkey, *data, *orig;
+-    eachst *st;
++bdb_i_last_prefix(DBC *dbcp, DBT *key, DBT *pkey, DBT *data, DBT *orig, eachst *st)
+ {
+     int ret, flags = DB_LAST;
+ 
+@@ -2811,15 +2784,14 @@ bdb_i_last_prefix(dbcp, key, pkey, data, orig, st)
+ }
+ 
+ static VALUE
+-bdb_i_each_kv(st)
+-    eachst *st;
++bdb_i_each_kv(VALUE pst)
+ {
++    eachst *st = (eachst *)pst;
+     bdb_DB *dbst;
+     DBC *dbcp;
+     DBT pkey, key, data, orig;
+     int ret, init = Qfalse, prefix = Qfalse;
+     db_recno_t recno;
+-    volatile VALUE res = Qnil;
+     
+     prefix = st->type & BDB_ST_PREFIX;
+     st->type &= ~BDB_ST_PREFIX;
+@@ -2834,7 +2806,7 @@ bdb_i_each_kv(st)
+     MEMZERO(&pkey, DBT, 1);
+     pkey.flags = DB_DBT_MALLOC;
+     if (!NIL_P(st->set)) {
+-	res = bdb_test_recno(st->db, &key, &recno, st->set);
++	bdb_test_recno(st->db, &key, &recno, st->set);
+         if (prefix) {
+             init = Qtrue;
+             orig.size = key.size;
+@@ -2929,9 +2901,9 @@ bdb_i_each_kv(st)
+ #if HAVE_CONST_DB_MULTIPLE_KEY
+ 
+ static VALUE
+-bdb_i_each_kv_bulk(st)
+-    eachst *st;
++bdb_i_each_kv_bulk(VALUE pst)
+ {
++    eachst *st = (eachst *)pst;
+     bdb_DB *dbst;
+     DBC *dbcp;
+     DBT key, data;
+@@ -2940,7 +2912,6 @@ bdb_i_each_kv_bulk(st)
+     int ret, init;
+     db_recno_t recno;
+     void *p;
+-    volatile VALUE res = Qnil;
+     
+     GetDB(st->db, dbst);
+     dbcp = st->dbcp;
+@@ -2958,7 +2929,7 @@ bdb_i_each_kv_bulk(st)
+     init = 1;
+     do {
+ 	if (init && !NIL_P(st->set)) {
+-	    res = bdb_test_recno(st->db, &key, &recno, st->set);
++	    bdb_test_recno(st->db, &key, &recno, st->set);
+ 	    ret = bdb_test_error(dbcp->c_get(dbcp, &key, &data, 
+                                              ((st->type & BDB_ST_DUP)?DB_SET:
+                                               DB_SET_RANGE)|DB_MULTIPLE_KEY));
+@@ -2990,11 +2961,7 @@ bdb_i_each_kv_bulk(st)
+ #endif
+ 
+ VALUE
+-bdb_each_kvc(argc, argv, obj, sens, replace, type)
+-    VALUE obj, *argv;
+-    int argc, sens;
+-    VALUE replace;
+-    int type;
++bdb_each_kvc(int argc, VALUE *argv, VALUE obj, int sens, VALUE replace, int type)
+ {
+     bdb_DB *dbst;
+     DB_TXN *txnid;
+@@ -3004,8 +2971,8 @@ bdb_each_kvc(argc, argv, obj, sens, replace, type)
  
      if (argc && TYPE(argv[argc - 1]) == T_HASH) {
  	VALUE g, f = argv[argc - 1];
@@ -185,7 +755,7 @@
  	    flags = NUM2INT(g);
  	}
  	argc--;
-@@ -3053,9 +3067,11 @@ bdb_each_kvc(argc, argv, obj, sens, replace, type)
+@@ -3053,9 +3020,11 @@ bdb_each_kvc(argc, argv, obj, sens, replace, type)
      }
  #endif
      type &= ~BDB_ST_ONE;
@@ -197,7 +767,56 @@
      INIT_TXN(txnid, obj, dbst);
  #if HAVE_DB_CURSOR_4
      bdb_test_error(dbst->dbp->cursor(dbst->dbp, txnid, &dbcp, flags));
-@@ -3309,7 +3325,9 @@ bdb_clear(int argc, VALUE *argv, VALUE obj)
+@@ -3211,8 +3180,7 @@ bdb_each_riap_prim(int argc, VALUE *argv, VALUE obj) 
+ }
+ 
+ VALUE
+-bdb_to_type(obj, result, flag)
+-    VALUE obj, result, flag;
++bdb_to_type(VALUE obj, VALUE result, VALUE flag)
+ {
+     bdb_DB *dbst;
+     DB_TXN *txnid;
+@@ -3266,15 +3234,13 @@ bdb_to_type(obj, result, flag)
+ }
+ 
+ static VALUE
+-bdb_to_a(obj)
+-    VALUE obj;
++bdb_to_a(VALUE obj)
+ {
+     return bdb_to_type(obj, rb_ary_new(), Qtrue);
+ }
+ 
+ static VALUE
+-bdb_update_i(pair, obj)
+-    VALUE pair, obj;
++bdb_update_i(VALUE pair, VALUE obj, int _argc, const VALUE *_argv, VALUE _blockarg)
+ {
+     Check_Type(pair, T_ARRAY);
+     if (RARRAY_LEN(pair) < 2) {
+@@ -3285,17 +3251,15 @@ bdb_update_i(pair, obj)
+ }
+ 
+ static VALUE
+-each_pair(obj)
+-    VALUE obj;
++each_pair(VALUE obj)
+ {
+     return rb_funcall(obj, rb_intern("each_pair"), 0, 0);
+ }
+ 
+ static VALUE
+-bdb_update(obj, other)
+-    VALUE obj, other;
++bdb_update(VALUE obj, VALUE other)
+ {
+-    rb_iterate(each_pair, other, bdb_update_i, obj);
++    rb_block_call(other, each_pair, 0, NULL, bdb_update_i, obj);
+     return obj;
+ }
+ 
+@@ -3309,7 +3273,9 @@ bdb_clear(int argc, VALUE *argv, VALUE obj)
  #endif
      int flags = 0;
  
@@ -207,7 +826,7 @@
  #if HAVE_ST_DB_TRUNCATE
      INIT_TXN(txnid, obj, dbst);
  #if HAVE_CONST_DB_AUTO_COMMIT
-@@ -3323,8 +3341,8 @@ bdb_clear(int argc, VALUE *argv, VALUE obj)
+@@ -3323,8 +3289,8 @@ bdb_clear(int argc, VALUE *argv, VALUE obj)
      flags = 0;
      if (argc && TYPE(argv[argc - 1]) == T_HASH) {
  	VALUE g, f = argv[argc - 1];
@@ -218,7 +837,7 @@
  	    flags = NUM2INT(g);
  	}
  	argc--;
-@@ -3348,8 +3366,8 @@ bdb_replace(int argc, VALUE *argv, VALUE obj)
+@@ -3348,8 +3314,8 @@ bdb_replace(int argc, VALUE *argv, VALUE obj)
      flags = 0;
      if (TYPE(argv[argc - 1]) == T_HASH) {
  	VALUE f = argv[argc - 1];
@@ -229,7 +848,91 @@
  	    flags = NUM2INT(g);
  	}
  	argc--;
-@@ -3557,8 +3575,10 @@ bdb_sync(obj)
+@@ -3359,28 +3325,24 @@ bdb_replace(int argc, VALUE *argv, VALUE obj)
+     }
+     g = INT2FIX(flags);
+     bdb_clear(1, &g, obj);
+-    rb_iterate(each_pair, argv[0], bdb_update_i, obj);
++    rb_block_call(argv[0], rb_intern("each_pair"), 0, NULL, bdb_update_i, obj);
+     return obj;
+ }
+ 
+ static VALUE
+-bdb_invert(obj)
+-    VALUE obj;
++bdb_invert(VALUE obj)
+ {
+     return bdb_to_type(obj, rb_hash_new(), Qfalse);
+ }
+ 
+ static VALUE
+-bdb_to_hash(obj)
+-    VALUE obj;
++bdb_to_hash(VALUE obj)
+ {
+     return bdb_to_type(obj, rb_hash_new(), Qtrue);
+ }
+  
+ static VALUE
+-bdb_kv(obj, type)
+-    VALUE obj;
+-    int type;
++bdb_kv(VALUE obj, int type)
+ {
+     bdb_DB *dbst;
+     DB_TXN *txnid;
+@@ -3426,23 +3388,19 @@ bdb_kv(obj, type)
+ }
+ 
+ static VALUE
+-bdb_values(obj)
+-    VALUE obj;
++bdb_values(VALUE obj)
+ {
+     return bdb_kv(obj, BDB_ST_VALUE);
+ }
+ 
+ static VALUE
+-bdb_keys(obj)
+-    VALUE obj;
++bdb_keys(VALUE obj)
+ {
+     return bdb_kv(obj, BDB_ST_KEY);
+ }
+ 
+ VALUE
+-bdb_internal_value(obj, a, b, sens)
+-    VALUE obj, a, b;
+-    int sens;
++bdb_internal_value(VALUE obj, VALUE a, VALUE b, int sens)
+ {
+     bdb_DB *dbst;
+     DB_TXN *txnid;
+@@ -3490,8 +3448,7 @@ bdb_internal_value(obj, a, b, sens)
+ }
+ 
+ VALUE
+-bdb_index(obj, a)
+-    VALUE obj, a;
++bdb_index(VALUE obj, VALUE a)
+ {
+     return bdb_internal_value(obj, a, Qtrue, DB_NEXT);
+ }
+@@ -3545,20 +3502,20 @@ bdb_select(int argc, VALUE *argv, VALUE obj)
+ }
+ 
+ VALUE
+-bdb_has_value(obj, a)
+-    VALUE obj, a;
++bdb_has_value(VALUE obj, VALUE a)
+ {
+     return bdb_internal_value(obj, a, Qfalse, DB_NEXT);
+ }
+ 
+ static VALUE
+-bdb_sync(obj)
+-    VALUE obj;
++bdb_sync(VALUE obj)
  {
      bdb_DB *dbst;
  
@@ -240,7 +943,215 @@
      GetDB(obj, dbst);
      bdb_test_error(dbst->dbp->sync(dbst->dbp, 0));
      return Qtrue;
-@@ -3884,7 +3904,9 @@ bdb_s_upgrade(int argc, VALUE *argv, VALUE obj)
+@@ -3597,36 +3554,36 @@ bdb_hash_stat(int argc, VALUE *argv, VALUE obj)
+     bdb_test_error(dbst->dbp->stat(dbst->dbp, &bdb_stat, flags));
+ #endif
+     hash = rb_hash_new();
+-    rb_hash_aset(hash, rb_tainted_str_new2("hash_magic"), INT2NUM(bdb_stat->hash_magic));
+-    rb_hash_aset(hash, rb_tainted_str_new2("hash_version"), INT2NUM(bdb_stat->hash_version));
+-    rb_hash_aset(hash, rb_tainted_str_new2("hash_pagesize"), INT2NUM(bdb_stat->hash_pagesize));
++    rb_hash_aset(hash, rb_str_new_cstr("hash_magic"), INT2NUM(bdb_stat->hash_magic));
++    rb_hash_aset(hash, rb_str_new_cstr("hash_version"), INT2NUM(bdb_stat->hash_version));
++    rb_hash_aset(hash, rb_str_new_cstr("hash_pagesize"), INT2NUM(bdb_stat->hash_pagesize));
+ #if HAVE_ST_DB_HASH_STAT_HASH_NKEYS
+-    rb_hash_aset(hash, rb_tainted_str_new2("hash_nkeys"), INT2NUM(bdb_stat->hash_nkeys));
++    rb_hash_aset(hash, rb_str_new_cstr("hash_nkeys"), INT2NUM(bdb_stat->hash_nkeys));
+ #if ! HAVE_ST_DB_HASH_STAT_HASH_NRECS
+-    rb_hash_aset(hash, rb_tainted_str_new2("hash_nrecs"), INT2NUM(bdb_stat->hash_nkeys));
++    rb_hash_aset(hash, rb_str_new_cstr("hash_nrecs"), INT2NUM(bdb_stat->hash_nkeys));
+ #endif
+ #endif
+ #if HAVE_ST_DB_HASH_STAT_HASH_NRECS
+-    rb_hash_aset(hash, rb_tainted_str_new2("hash_nrecs"), INT2NUM(bdb_stat->hash_nrecs));
++    rb_hash_aset(hash, rb_str_new_cstr("hash_nrecs"), INT2NUM(bdb_stat->hash_nrecs));
+ #endif
+ #if HAVE_ST_DB_HASH_STAT_HASH_NDATA
+-    rb_hash_aset(hash, rb_tainted_str_new2("hash_ndata"), INT2NUM(bdb_stat->hash_ndata));
++    rb_hash_aset(hash, rb_str_new_cstr("hash_ndata"), INT2NUM(bdb_stat->hash_ndata));
+ #endif
+ #if HAVE_ST_DB_HASH_STAT_HASH_NELEM
+-    rb_hash_aset(hash, rb_tainted_str_new2("hash_nelem"), INT2NUM(bdb_stat->hash_nelem));
++    rb_hash_aset(hash, rb_str_new_cstr("hash_nelem"), INT2NUM(bdb_stat->hash_nelem));
+ #endif
+-    rb_hash_aset(hash, rb_tainted_str_new2("hash_ffactor"), INT2NUM(bdb_stat->hash_ffactor));
+-    rb_hash_aset(hash, rb_tainted_str_new2("hash_buckets"), INT2NUM(bdb_stat->hash_buckets));
+-    rb_hash_aset(hash, rb_tainted_str_new2("hash_free"), INT2NUM(bdb_stat->hash_free));
+-    rb_hash_aset(hash, rb_tainted_str_new2("hash_bfree"), INT2NUM(bdb_stat->hash_bfree));
+-    rb_hash_aset(hash, rb_tainted_str_new2("hash_bigpages"), INT2NUM(bdb_stat->hash_bigpages));
+-    rb_hash_aset(hash, rb_tainted_str_new2("hash_big_bfree"), INT2NUM(bdb_stat->hash_big_bfree));
+-    rb_hash_aset(hash, rb_tainted_str_new2("hash_overflows"), INT2NUM(bdb_stat->hash_overflows));
+-    rb_hash_aset(hash, rb_tainted_str_new2("hash_ovfl_free"), INT2NUM(bdb_stat->hash_ovfl_free));
+-    rb_hash_aset(hash, rb_tainted_str_new2("hash_dup"), INT2NUM(bdb_stat->hash_dup));
+-    rb_hash_aset(hash, rb_tainted_str_new2("hash_dup_free"), INT2NUM(bdb_stat->hash_dup_free));
++    rb_hash_aset(hash, rb_str_new_cstr("hash_ffactor"), INT2NUM(bdb_stat->hash_ffactor));
++    rb_hash_aset(hash, rb_str_new_cstr("hash_buckets"), INT2NUM(bdb_stat->hash_buckets));
++    rb_hash_aset(hash, rb_str_new_cstr("hash_free"), INT2NUM(bdb_stat->hash_free));
++    rb_hash_aset(hash, rb_str_new_cstr("hash_bfree"), INT2NUM(bdb_stat->hash_bfree));
++    rb_hash_aset(hash, rb_str_new_cstr("hash_bigpages"), INT2NUM(bdb_stat->hash_bigpages));
++    rb_hash_aset(hash, rb_str_new_cstr("hash_big_bfree"), INT2NUM(bdb_stat->hash_big_bfree));
++    rb_hash_aset(hash, rb_str_new_cstr("hash_overflows"), INT2NUM(bdb_stat->hash_overflows));
++    rb_hash_aset(hash, rb_str_new_cstr("hash_ovfl_free"), INT2NUM(bdb_stat->hash_ovfl_free));
++    rb_hash_aset(hash, rb_str_new_cstr("hash_dup"), INT2NUM(bdb_stat->hash_dup));
++    rb_hash_aset(hash, rb_str_new_cstr("hash_dup_free"), INT2NUM(bdb_stat->hash_dup_free));
+ #if HAVE_ST_DB_HASH_STAT_HASH_PAGECNT
+-    rb_hash_aset(hash, rb_tainted_str_new2("hash_pagecnt"), INT2NUM(bdb_stat->hash_pagecnt));
++    rb_hash_aset(hash, rb_str_new_cstr("hash_pagecnt"), INT2NUM(bdb_stat->hash_pagecnt));
+ #endif
+     free(bdb_stat);
+     return hash;
+@@ -3666,37 +3623,37 @@ bdb_tree_stat(int argc, VALUE *argv, VALUE obj)
+     bdb_test_error(dbst->dbp->stat(dbst->dbp, &bdb_stat, flags));
+ #endif
+     hash = rb_hash_new();
+-    rb_hash_aset(hash, rb_tainted_str_new2("bt_magic"), INT2NUM(bdb_stat->bt_magic));
+-    rb_hash_aset(hash, rb_tainted_str_new2("bt_version"), INT2NUM(bdb_stat->bt_version));
+-    rb_hash_aset(hash, rb_tainted_str_new2("bt_dup_pg"), INT2NUM(bdb_stat->bt_dup_pg));
+-    rb_hash_aset(hash, rb_tainted_str_new2("bt_dup_pgfree"), INT2NUM(bdb_stat->bt_dup_pgfree));
+-    rb_hash_aset(hash, rb_tainted_str_new2("bt_free"), INT2NUM(bdb_stat->bt_free));
+-    rb_hash_aset(hash, rb_tainted_str_new2("bt_int_pg"), INT2NUM(bdb_stat->bt_int_pg));
+-    rb_hash_aset(hash, rb_tainted_str_new2("bt_int_pgfree"), INT2NUM(bdb_stat->bt_int_pgfree));
+-    rb_hash_aset(hash, rb_tainted_str_new2("bt_leaf_pg"), INT2NUM(bdb_stat->bt_leaf_pg));
+-    rb_hash_aset(hash, rb_tainted_str_new2("bt_leaf_pgfree"), INT2NUM(bdb_stat->bt_leaf_pgfree));
+-    rb_hash_aset(hash, rb_tainted_str_new2("bt_levels"), INT2NUM(bdb_stat->bt_levels));
+-    rb_hash_aset(hash, rb_tainted_str_new2("bt_minkey"), INT2NUM(bdb_stat->bt_minkey));
++    rb_hash_aset(hash, rb_str_new_cstr("bt_magic"), INT2NUM(bdb_stat->bt_magic));
++    rb_hash_aset(hash, rb_str_new_cstr("bt_version"), INT2NUM(bdb_stat->bt_version));
++    rb_hash_aset(hash, rb_str_new_cstr("bt_dup_pg"), INT2NUM(bdb_stat->bt_dup_pg));
++    rb_hash_aset(hash, rb_str_new_cstr("bt_dup_pgfree"), INT2NUM(bdb_stat->bt_dup_pgfree));
++    rb_hash_aset(hash, rb_str_new_cstr("bt_free"), INT2NUM(bdb_stat->bt_free));
++    rb_hash_aset(hash, rb_str_new_cstr("bt_int_pg"), INT2NUM(bdb_stat->bt_int_pg));
++    rb_hash_aset(hash, rb_str_new_cstr("bt_int_pgfree"), INT2NUM(bdb_stat->bt_int_pgfree));
++    rb_hash_aset(hash, rb_str_new_cstr("bt_leaf_pg"), INT2NUM(bdb_stat->bt_leaf_pg));
++    rb_hash_aset(hash, rb_str_new_cstr("bt_leaf_pgfree"), INT2NUM(bdb_stat->bt_leaf_pgfree));
++    rb_hash_aset(hash, rb_str_new_cstr("bt_levels"), INT2NUM(bdb_stat->bt_levels));
++    rb_hash_aset(hash, rb_str_new_cstr("bt_minkey"), INT2NUM(bdb_stat->bt_minkey));
+ #if HAVE_ST_DB_BTREE_STAT_BT_NRECS
+-    rb_hash_aset(hash, rb_tainted_str_new2("bt_nrecs"), INT2NUM(bdb_stat->bt_nrecs));
++    rb_hash_aset(hash, rb_str_new_cstr("bt_nrecs"), INT2NUM(bdb_stat->bt_nrecs));
+ #endif
+ #if HAVE_ST_DB_BTREE_STAT_BT_NKEYS
+-    rb_hash_aset(hash, rb_tainted_str_new2("bt_nkeys"), INT2NUM(bdb_stat->bt_nkeys));
++    rb_hash_aset(hash, rb_str_new_cstr("bt_nkeys"), INT2NUM(bdb_stat->bt_nkeys));
+ #if ! HAVE_ST_DB_BTREE_STAT_BT_NRECS
+-    rb_hash_aset(hash, rb_tainted_str_new2("bt_nrecs"), INT2NUM(bdb_stat->bt_nkeys));
++    rb_hash_aset(hash, rb_str_new_cstr("bt_nrecs"), INT2NUM(bdb_stat->bt_nkeys));
+ #endif
+ #endif
+ #if HAVE_ST_DB_BTREE_STAT_BT_NDATA
+-    rb_hash_aset(hash, rb_tainted_str_new2("bt_ndata"), INT2NUM(bdb_stat->bt_ndata));
++    rb_hash_aset(hash, rb_str_new_cstr("bt_ndata"), INT2NUM(bdb_stat->bt_ndata));
+ #endif
+-    rb_hash_aset(hash, rb_tainted_str_new2("bt_over_pg"), INT2NUM(bdb_stat->bt_over_pg));
+-    rb_hash_aset(hash, rb_tainted_str_new2("bt_over_pgfree"), INT2NUM(bdb_stat->bt_over_pgfree));
+-    rb_hash_aset(hash, rb_tainted_str_new2("bt_pagesize"), INT2NUM(bdb_stat->bt_pagesize));
+-    rb_hash_aset(hash, rb_tainted_str_new2("bt_re_len"), INT2NUM(bdb_stat->bt_re_len));
++    rb_hash_aset(hash, rb_str_new_cstr("bt_over_pg"), INT2NUM(bdb_stat->bt_over_pg));
++    rb_hash_aset(hash, rb_str_new_cstr("bt_over_pgfree"), INT2NUM(bdb_stat->bt_over_pgfree));
++    rb_hash_aset(hash, rb_str_new_cstr("bt_pagesize"), INT2NUM(bdb_stat->bt_pagesize));
++    rb_hash_aset(hash, rb_str_new_cstr("bt_re_len"), INT2NUM(bdb_stat->bt_re_len));
+     pad = (char)bdb_stat->bt_re_pad;
+-    rb_hash_aset(hash, rb_tainted_str_new2("bt_re_pad"), rb_tainted_str_new(&pad, 1));
++    rb_hash_aset(hash, rb_str_new_cstr("bt_re_pad"), rb_str_new(&pad, 1));
+ #if HAVE_ST_DB_BTREE_STAT_BT_PAGECNT
+-    rb_hash_aset(hash, rb_tainted_str_new2("bt_pagecnt"), INT2NUM(bdb_stat->bt_pagecnt));
++    rb_hash_aset(hash, rb_str_new_cstr("bt_pagecnt"), INT2NUM(bdb_stat->bt_pagecnt));
+ #endif
+     free(bdb_stat);
+     return hash;
+@@ -3736,38 +3693,37 @@ bdb_queue_stat(int argc, VALUE *argv, VALUE obj)
+     bdb_test_error(dbst->dbp->stat(dbst->dbp, &bdb_stat, flags));
+ #endif
+     hash = rb_hash_new();
+-    rb_hash_aset(hash, rb_tainted_str_new2("qs_magic"), INT2NUM(bdb_stat->qs_magic));
+-    rb_hash_aset(hash, rb_tainted_str_new2("qs_version"), INT2NUM(bdb_stat->qs_version));
++    rb_hash_aset(hash, rb_str_new_cstr("qs_magic"), INT2NUM(bdb_stat->qs_magic));
++    rb_hash_aset(hash, rb_str_new_cstr("qs_version"), INT2NUM(bdb_stat->qs_version));
+ #if HAVE_ST_DB_QUEUE_STAT_QS_NKEYS
+-    rb_hash_aset(hash, rb_tainted_str_new2("qs_nkeys"), INT2NUM(bdb_stat->qs_nkeys));
++    rb_hash_aset(hash, rb_str_new_cstr("qs_nkeys"), INT2NUM(bdb_stat->qs_nkeys));
+ #if ! HAVE_ST_DB_QUEUE_STAT_QS_NRECS
+-    rb_hash_aset(hash, rb_tainted_str_new2("qs_nrecs"), INT2NUM(bdb_stat->qs_nkeys));
++    rb_hash_aset(hash, rb_str_new_cstr("qs_nrecs"), INT2NUM(bdb_stat->qs_nkeys));
+ #endif
+ #endif
+ #if HAVE_ST_DB_QUEUE_STAT_QS_NDATA
+-    rb_hash_aset(hash, rb_tainted_str_new2("qs_ndata"), INT2NUM(bdb_stat->qs_ndata));
++    rb_hash_aset(hash, rb_str_new_cstr("qs_ndata"), INT2NUM(bdb_stat->qs_ndata));
+ #endif
+ #if HAVE_ST_DB_QUEUE_STAT_QS_NRECS
+-    rb_hash_aset(hash, rb_tainted_str_new2("qs_nrecs"), INT2NUM(bdb_stat->qs_nrecs));
++    rb_hash_aset(hash, rb_str_new_cstr("qs_nrecs"), INT2NUM(bdb_stat->qs_nrecs));
+ #endif
+-    rb_hash_aset(hash, rb_tainted_str_new2("qs_pages"), INT2NUM(bdb_stat->qs_pages));
+-    rb_hash_aset(hash, rb_tainted_str_new2("qs_pagesize"), INT2NUM(bdb_stat->qs_pagesize));
+-    rb_hash_aset(hash, rb_tainted_str_new2("qs_pgfree"), INT2NUM(bdb_stat->qs_pgfree));
+-    rb_hash_aset(hash, rb_tainted_str_new2("qs_re_len"), INT2NUM(bdb_stat->qs_re_len));
++    rb_hash_aset(hash, rb_str_new_cstr("qs_pages"), INT2NUM(bdb_stat->qs_pages));
++    rb_hash_aset(hash, rb_str_new_cstr("qs_pagesize"), INT2NUM(bdb_stat->qs_pagesize));
++    rb_hash_aset(hash, rb_str_new_cstr("qs_pgfree"), INT2NUM(bdb_stat->qs_pgfree));
++    rb_hash_aset(hash, rb_str_new_cstr("qs_re_len"), INT2NUM(bdb_stat->qs_re_len));
+     pad = (char)bdb_stat->qs_re_pad;
+-    rb_hash_aset(hash, rb_tainted_str_new2("qs_re_pad"), rb_tainted_str_new(&pad, 1));
++    rb_hash_aset(hash, rb_str_new_cstr("qs_re_pad"), rb_str_new(&pad, 1));
+ #if HAVE_ST_DB_QUEUE_STAT_QS_START
+-    rb_hash_aset(hash, rb_tainted_str_new2("qs_start"), INT2NUM(bdb_stat->qs_start));
++    rb_hash_aset(hash, rb_str_new_cstr("qs_start"), INT2NUM(bdb_stat->qs_start));
+ #endif
+-    rb_hash_aset(hash, rb_tainted_str_new2("qs_first_recno"), INT2NUM(bdb_stat->qs_first_recno));
+-    rb_hash_aset(hash, rb_tainted_str_new2("qs_cur_recno"), INT2NUM(bdb_stat->qs_cur_recno));
++    rb_hash_aset(hash, rb_str_new_cstr("qs_first_recno"), INT2NUM(bdb_stat->qs_first_recno));
++    rb_hash_aset(hash, rb_str_new_cstr("qs_cur_recno"), INT2NUM(bdb_stat->qs_cur_recno));
+     free(bdb_stat);
+     return hash;
+ }
+ 
+ static VALUE
+-bdb_queue_padlen(obj)
+-    VALUE obj;
++bdb_queue_padlen(VALUE obj)
+ {
+     bdb_DB *dbst;
+     DB_QUEUE_STAT *bdb_stat;
+@@ -3794,7 +3750,7 @@ bdb_queue_padlen(obj)
+     bdb_test_error(dbst->dbp->stat(dbst->dbp, &bdb_stat, 0));
+ #endif
+     pad = (char)bdb_stat->qs_re_pad;
+-    hash = rb_assoc_new(rb_tainted_str_new(&pad, 1), INT2NUM(bdb_stat->qs_re_len));
++    hash = rb_assoc_new(rb_str_new(&pad, 1), INT2NUM(bdb_stat->qs_re_len));
+     free(bdb_stat);
+     return hash;
+ }
+@@ -3802,8 +3758,7 @@ bdb_queue_padlen(obj)
+ #endif
+ 
+ static VALUE
+-bdb_set_partial(obj, a, b)
+-    VALUE obj, a, b;
++bdb_set_partial(VALUE obj, VALUE a, VALUE b)
+ {
+     bdb_DB *dbst;
+     VALUE ret;
+@@ -3823,8 +3778,7 @@ bdb_set_partial(obj, a, b)
+ }
+ 
+ static VALUE
+-bdb_clear_partial(obj)
+-    VALUE obj;
++bdb_clear_partial(VALUE obj)
+ {
+     bdb_DB *dbst;
+     VALUE ret;
+@@ -3844,8 +3798,7 @@ bdb_clear_partial(obj)
+ #if HAVE_ST_DB_SET_ERRCALL
+ 
+ static VALUE
+-bdb_i_create(obj)
+-    VALUE obj;
++bdb_i_create(VALUE obj)
+ {
+     DB *dbp;
+     bdb_ENV *envst = 0;
+@@ -3884,7 +3837,9 @@ bdb_s_upgrade(int argc, VALUE *argv, VALUE obj)
      int flags;
      VALUE val;
  
@@ -250,7 +1161,7 @@
      flags = 0;
      if (rb_scan_args(argc, argv, "11", &a, &b) == 2) {
  	flags = NUM2INT(b);
-@@ -3908,7 +3930,9 @@ bdb_s_remove(int argc, VALUE *argv, VALUE obj)
+@@ -3908,7 +3863,9 @@ bdb_s_remove(int argc, VALUE *argv, VALUE obj)
      VALUE a, b, c;
      char *name, *subname;
  
@@ -260,7 +1171,7 @@
      c = bdb_i_create(obj);
      GetDB(c, dbst);
      name = subname = NULL;
-@@ -3936,7 +3960,9 @@ bdb_s_rename(int argc, VALUE *argv, VALUE obj)
+@@ -3936,7 +3893,9 @@ bdb_s_rename(int argc, VALUE *argv, VALUE obj)
      VALUE a, b, c;
      char *name, *subname, *newname;
  
@@ -270,7 +1181,94 @@
      c = bdb_i_create(obj);
      GetDB(c, dbst);
      name = subname = NULL;
-@@ -4222,7 +4248,9 @@ bdb_verify(int argc, VALUE *argv, VALUE obj)
+@@ -3959,9 +3918,9 @@ bdb_s_rename(int argc, VALUE *argv, VALUE obj)
+ #if HAVE_ST_DB_JOIN
+ 
+ static VALUE
+-bdb_i_joinclose(st)
+-    eachst *st;
++bdb_i_joinclose(VALUE pst)
+ {
++    eachst *st = (eachst *)pst;
+     bdb_DB *dbst;
+ 
+     GetDB(st->db, dbst);
+@@ -3973,9 +3932,9 @@ bdb_i_joinclose(st)
+ 
+  
+ static VALUE
+-bdb_i_join(st)
+-    eachst *st;
++bdb_i_join(VALUE pst)
+ {
++    eachst *st = (eachst *)pst;
+     int ret;
+     DBT key, data;
+     db_recno_t recno;
+@@ -4004,9 +3963,8 @@ bdb_join(int argc, VALUE *argv, VALUE obj)
+     DBC *dbc, **dbcarr;
+     int flags, i;
+     eachst st;
+-    VALUE a, b, c;
++    VALUE a, b;
+ 
+-    c = 0;
+     flags = 0;
+     GetDB(obj, dbst);
+     if (rb_scan_args(argc, argv, "11", &a, &b) == 2) {
+@@ -4050,8 +4008,7 @@ bdb_join(int argc, VALUE *argv, VALUE obj)
+ #if HAVE_ST_DB_BYTESWAPPED || HAVE_ST_DB_GET_BYTESWAPPED
+ 
+ static VALUE
+-bdb_byteswapp(obj)
+-    VALUE obj;
++bdb_byteswapp(VALUE obj)
+ {
+     bdb_DB *dbst;
+     int byteswap = 0;
+@@ -4072,18 +4029,14 @@ bdb_byteswapp(obj)
+ #if HAVE_ST_DB_ASSOCIATE
+ 
+ static VALUE
+-bdb_internal_second_call(tmp)
+-    VALUE *tmp;
++bdb_internal_second_call(VALUE ptmp)
+ {
++    VALUE *tmp = (VALUE *)ptmp;
+     return rb_funcall2(tmp[0], bdb_id_call, 3, tmp + 1);
+ }
+ 
+ static int
+-bdb_call_secondary(secst, pkey, pdata, skey)
+-    DB *secst;
+-    DBT *pkey;
+-    DBT *pdata;
+-    DBT *skey;
++bdb_call_secondary(DB *secst, DBT *pkey, DBT *pdata, DBT *skey)
+ {
+     VALUE obj, ary, second;
+     bdb_DB *dbst, *secondst;
+@@ -4189,8 +4142,7 @@ bdb_associate(int argc, VALUE *argv, VALUE obj)
+ #endif
+ 
+ static VALUE
+-bdb_filename(obj)
+-    VALUE obj;
++bdb_filename(VALUE obj)
+ {
+     bdb_DB *dbst;
+     GetDB(obj, dbst);
+@@ -4198,8 +4150,7 @@ bdb_filename(obj)
+ }
+ 
+ static VALUE
+-bdb_database(obj)
+-    VALUE obj;
++bdb_database(VALUE obj)
+ {
+     bdb_DB *dbst;
+     GetDB(obj, dbst);
+@@ -4222,7 +4173,9 @@ bdb_verify(int argc, VALUE *argv, VALUE obj)
  #endif
      FILE *io = NULL;
  
@@ -280,3 +1278,50 @@
      file = database = NULL;
      switch(rb_scan_args(argc, argv, "02", &iov, &flagv)) {
      case 2:
+@@ -4346,8 +4299,7 @@ bdb_feedback_set(VALUE obj, VALUE a)
+ #endif
+ 
+ static VALUE
+-bdb_i_conf(obj, a)
+-    VALUE obj, a;
++bdb_i_conf(VALUE obj, VALUE a)
+ {
+     bdb_DB *dbst;
+     u_int32_t value;
+@@ -4390,13 +4342,13 @@ bdb_i_conf(obj, a)
+ 	bdb_test_error(dbst->dbp->get_dbname(dbst->dbp, &filename, &dbname));
+ 	res = rb_ary_new2(3);
+ 	if (filename && strlen(filename)) {
+-	    rb_ary_push(res, rb_tainted_str_new2(filename));
++	    rb_ary_push(res, rb_str_new_cstr(filename));
+ 	}
+ 	else {
+ 	    rb_ary_push(res, Qnil);
+ 	}
+ 	if (dbname && strlen(dbname)) {
+-	    rb_ary_push(res, rb_tainted_str_new2(dbname));
++	    rb_ary_push(res, rb_str_new_cstr(dbname));
+ 	}
+ 	else {
+ 	    rb_ary_push(res, Qnil);
+@@ -4463,7 +4415,7 @@ bdb_i_conf(obj, a)
+ 
+ 	bdb_test_error(dbst->dbp->get_re_source(dbst->dbp, &strval));
+ 	if (strval && strlen(strval)) {
+-	    return rb_tainted_str_new2(strval);
++	    return rb_str_new_cstr(strval);
+ 	}
+ 	return Qnil;
+     }
+@@ -4539,9 +4491,9 @@ struct optst {
+ };
+ 
+ static VALUE
+-bdb_intern_conf(optp)
+-    struct optst *optp;
++bdb_intern_conf(VALUE poptp)
+ {
++    struct optst *optp = (struct optst *)poptp;
+     return bdb_i_conf(optp->obj, optp->str);
+ }
+ 
diff --git a/databases/ruby-bdb/files/patch-src-delegator.c b/databases/ruby-bdb/files/patch-src-delegator.c
new file mode 100644
index 000000000000..8a65b0124760
--- /dev/null
+++ b/databases/ruby-bdb/files/patch-src-delegator.c
@@ -0,0 +1,11 @@
+--- src/delegator.c.orig	2011-04-06 19:35:39 UTC
++++ src/delegator.c
+@@ -32,7 +32,7 @@ bdb_deleg_missing(int argc, VALUE *argv, VALUE obj)
+     Data_Get_Struct(obj, struct deleg_class, delegst);
+     if (rb_block_given_p()) {
+ #if HAVE_RB_BLOCK_CALL
+-	res = rb_block_call(delegst->obj, id_send, argc, argv, rb_yield, 0);
++	res = rb_block_call(delegst->obj, id_send, argc, argv, (rb_block_call_func_t)rb_yield, 0);
+ #else
+ 	VALUE tmp[3];
+ 
diff --git a/databases/ruby-bdb/files/patch-src-env.c b/databases/ruby-bdb/files/patch-src-env.c
new file mode 100644
index 000000000000..a8dcbc9d4f7e
--- /dev/null
+++ b/databases/ruby-bdb/files/patch-src-env.c
@@ -0,0 +1,439 @@
+--- src/env.c.orig	2011-04-06 19:35:39 UTC
++++ src/env.c
+@@ -67,8 +67,8 @@ bdb_env_rep_transport(DB_ENV *env, const DBT *control,
+     lsnobj = bdb_makelsn(obj);
+     Data_Get_Struct(lsnobj, struct dblsnst, lsnst);
+     MEMCPY(lsnst->lsn, lsn, DB_LSN, 1);
+-    av = rb_tainted_str_new(control->data, control->size);
+-    bv = rb_tainted_str_new(rec->data, rec->size);
++    av = rb_str_new(control->data, control->size);
++    bv = rb_str_new(rec->data, rec->size);
+     if (envst->rep_transport == 0) {
+ 	res = rb_funcall(obj, rb_intern("bdb_rep_transport"), 5, av, bv, lsnobj,
+ 			 INT2FIX(envid), INT2FIX(flags));
+@@ -90,8 +90,8 @@ bdb_env_rep_transport(DB_ENV *env, const DBT *control,
+     bdb_ENV *envst;
+ 
+     GetIdEnv(obj, envst);
+-    av = rb_tainted_str_new(control->data, control->size);
+-    bv = rb_tainted_str_new(rec->data, rec->size);
++    av = rb_str_new(control->data, control->size);
++    bv = rb_str_new(rec->data, rec->size);
+     if (envst->rep_transport == 0) {
+ 	res = rb_funcall(obj, rb_intern("bdb_rep_transport"), 4, av, bv,
+ 			 INT2FIX(envid), INT2FIX(flags));
+@@ -328,10 +328,10 @@ bdb_env_msgcall(const DB_ENV *dbenv, const char *msg)
+ 	return;
+     }
+     if (envst->msgcall == 0) {
+-	rb_funcall(obj, id_msgcall, 1, rb_tainted_str_new2(msg));
++	rb_funcall(obj, id_msgcall, 1, rb_str_new_cstr(msg));
+     }
+     else {
+-	rb_funcall(envst->msgcall, bdb_id_call, 1, rb_tainted_str_new2(msg));
++	rb_funcall(envst->msgcall, bdb_id_call, 1, rb_str_new_cstr(msg));
+     }
+ }
+ 
+@@ -508,7 +508,7 @@ bdb_env_set_notify(VALUE obj, VALUE a)
+ 
+ 
+ static VALUE
+-bdb_env_i_options(VALUE obj, VALUE db_stobj)
++bdb_env_i_options(VALUE obj, VALUE db_stobj, int _argc, const VALUE *_argv, VALUE _blockarg)
+ {
+     char *options;
+     DB_ENV *envp;
+@@ -1121,9 +1121,11 @@ bdb_env_close(VALUE obj)
+ {
+     bdb_ENV *envst;
+ 
++#if defined(RUBY_SAFE_LEVEL_MAX) && RUBY_SAFE_LEVEL_MAX >= 4
+     if (!OBJ_TAINTED(obj) && rb_safe_level() >= 4) {
+ 	rb_raise(rb_eSecurityError, "Insecure: can't close the environnement");
+     }
++#endif
+     GetEnvDB(obj, envst);
+     bdb_final(envst);
+     RDATA(obj)->dfree = free;
+@@ -1193,10 +1195,10 @@ bdb_env_open_db(int argc, VALUE *argv, VALUE obj)
+ 	argv[argc - 1] = rb_hash_new();
+     }
+     if (rb_obj_is_kind_of(obj, bdb_cEnv)) {
+-	rb_hash_aset(argv[argc - 1], rb_tainted_str_new2("env"), obj);
++	rb_hash_aset(argv[argc - 1], rb_str_new_cstr("env"), obj);
+     }
+     else {
+-	rb_hash_aset(argv[argc - 1], rb_tainted_str_new2("txn"), obj);
++	rb_hash_aset(argv[argc - 1], rb_str_new_cstr("txn"), obj);
+     }
+     return rb_funcall2(cl, rb_intern("new"), argc, argv);
+ }
+@@ -1206,7 +1208,7 @@ void
+ bdb_env_errcall(const DB_ENV *env, const char *errpfx, const char *msg)
+ {
+     bdb_errcall = 1;
+-    bdb_errstr = rb_tainted_str_new2(msg);
++    bdb_errstr = rb_str_new_cstr(msg);
+ }
+ 
+ #else
+@@ -1215,7 +1217,7 @@ void
+ bdb_env_errcall(const char *errpfx, char *msg)
+ {
+     bdb_errcall = 1;
+-    bdb_errstr = rb_tainted_str_new2(msg);
++    bdb_errstr = rb_str_new_cstr(msg);
+ }
+ 
+ #endif
+@@ -1303,7 +1305,7 @@ bdb_env_each_options(VALUE opt, VALUE stobj)
+     DB_ENV *envp;
+     struct db_stoptions *db_st;
+ 
+-    res = rb_iterate(rb_each, opt, bdb_env_i_options, stobj);
++    res = rb_block_call(opt, rb_intern("each"), 0, NULL, bdb_env_i_options, stobj);
+     Data_Get_Struct(stobj, struct db_stoptions, db_st);
+     envp = db_st->env->envp;
+ #if HAVE_ST_DB_ENV_SET_LG_BSIZE
+@@ -1322,8 +1324,9 @@ bdb_env_each_options(VALUE opt, VALUE stobj)
+ }
+ 
+ static VALUE
+-bdb_env_s_i_options(VALUE obj, int *flags)
++bdb_env_s_i_options(VALUE obj, VALUE pflags, int _argc, const VALUE *_argv, VALUE _blockarg)
+ {
++    int *flags = (int *)pflags;
+     char *options;
+     VALUE key, value;
+ 
+@@ -1394,7 +1397,7 @@ bdb_env_s_new(int argc, VALUE *argv, VALUE obj)
+     envst->envp->db_errcall = bdb_env_errcall;
+ #else
+     if (argc && TYPE(argv[argc - 1]) == T_HASH) {
+-	rb_iterate(rb_each, argv[argc - 1], bdb_env_s_i_options, (VALUE)&flags);
++	rb_block_call(argv[argc - 1], rb_intern("each"), 0, NULL, bdb_env_s_i_options, (VALUE)&flags);
+     }
+     bdb_test_error(db_env_create(&(envst->envp), flags));
+     envst->envp->set_errpfx(envst->envp, "BDB::");
+@@ -1406,7 +1409,7 @@ bdb_env_s_new(int argc, VALUE *argv, VALUE obj)
+     if (argc && TYPE(argv[argc - 1]) == T_HASH) {
+ 	VALUE value = Qnil;
+ 
+-	rb_iterate(rb_each, argv[argc - 1], bdb_env_s_j_options, (VALUE)&value);
++	rb_block_call(argv[argc - 1], rb_intern("each"), 0, NULL, bdb_env_s_j_options, (VALUE)&value);
+ 	if (!NIL_P(value)) {
+ 	    if (!rb_respond_to(value, bdb_id_call)) {
+ 		rb_raise(bdb_eFatal, "arg must respond to #call");
+@@ -1517,12 +1520,16 @@ bdb_env_init(int argc, VALUE *argv, VALUE obj)
+ 	flags = NUM2INT(c);
+         break;
+     }
++#if defined(RUBY_SAFE_LEVEL_MAX) && RUBY_SAFE_LEVEL_MAX >= 4
+     if (flags & DB_CREATE) {
+ 	rb_secure(4);
+     }
++#endif
++#if defined(RUBY_SAFE_LEVEL_MAX) && RUBY_SAFE_LEVEL_MAX >= 1
+     if (flags & DB_USE_ENVIRON) {
+ 	rb_secure(1);
+     }
++#endif
+ #ifndef BDB_NO_THREAD_COMPILE
+     if (!(envst->options & BDB_NO_THREAD)) {
+ 	bdb_set_func(envst);
+@@ -1621,7 +1628,7 @@ bdb_env_init(int argc, VALUE *argv, VALUE obj)
+ 	envst->options |= BDB_AUTO_COMMIT;
+     }
+ #endif
+-    envst->home = rb_tainted_str_new2(db_home);
++    envst->home = rb_str_new_cstr(db_home);
+     OBJ_FREEZE(envst->home);
+ #if HAVE_CONST_DB_INIT_REP
+     if (flags & DB_INIT_REP) {
+@@ -1658,7 +1665,9 @@ bdb_env_s_remove(int argc, VALUE *argv, VALUE obj)
+     char *db_home;
+     int flag = 0;
+ 
++#if defined(RUBY_SAFE_LEVEL_MAX) && RUBY_SAFE_LEVEL_MAX >= 2
+     rb_secure(2);
++#endif
+     if (rb_scan_args(argc, argv, "11", &a, &b) == 2) {
+ 	flag = NUM2INT(b);
+     }
+@@ -1754,13 +1763,13 @@ bdb_thread_init(int argc, VALUE *argv, VALUE obj)
+     if (rb_block_given_p()) {
+ #if HAVE_RB_BLOCK_CALL
+ 	return rb_block_call(obj, rb_intern("__bdb_thread_init__"), argc, argv,
+-			     rb_yield, obj);
++			     (rb_block_call_func_t)rb_yield, obj);
+ #else
+ 	VALUE tmp[3];
+ 	tmp[0] = obj;
+ 	tmp[1] = (VALUE)argc;
+ 	tmp[2] = (VALUE)argv;
+-	return rb_iterate((VALUE (*)(VALUE))bdb_env_iterate, (VALUE)tmp, rb_yield, obj);
++	return rb_block_call((VALUE)tmp, bdb_env_iterate, 0, NULL, (rb_block_call_func_t)rb_yield, obj);
+ #endif
+     }
+     return rb_funcall2(obj, rb_intern("__bdb_thread_init__"), argc, argv);
+@@ -1828,7 +1837,7 @@ bdb_env_i_conf(VALUE obj, VALUE a)
+ 	res = rb_ary_new();
+ 	if (dirs) {
+ 	    for (i = 0; dirs[i] != NULL; i++) {
+-		rb_ary_push(res, rb_tainted_str_new2(dirs[i]));
++		rb_ary_push(res, rb_str_new_cstr(dirs[i]));
+ 	    }
+ 	}
+ 	return res;
+@@ -1844,7 +1853,7 @@ bdb_env_i_conf(VALUE obj, VALUE a)
+     if (strcmp(str, "home") == 0) {
+ 	bdb_test_error(envst->envp->get_home(envst->envp, &strval));
+ 	if (strval && strlen(strval)) {
+-	    return rb_tainted_str_new2(strval);
++	    return rb_str_new_cstr(strval);
+ 	}
+ 	return Qnil;
+     }
+@@ -1859,7 +1868,7 @@ bdb_env_i_conf(VALUE obj, VALUE a)
+     if (strcmp(str, "lg_dir") == 0) {
+ 	bdb_test_error(envst->envp->get_lg_dir(envst->envp, &strval));
+ 	if (strval && strlen(strval)) {
+-	    return rb_tainted_str_new2(strval);
++	    return rb_str_new_cstr(strval);
+ 	}
+ 	return Qnil;
+     }
+@@ -1961,7 +1970,7 @@ bdb_env_i_conf(VALUE obj, VALUE a)
+     if (strcmp(str, "tmp_dir") == 0) {
+ 	bdb_test_error(envst->envp->get_tmp_dir(envst->envp, &strval));
+ 	if (strval && strlen(strval)) {
+-	    return rb_tainted_str_new2(strval);
++	    return rb_str_new_cstr(strval);
+ 	}
+ 	return Qnil;
+     }
+@@ -2343,10 +2352,10 @@ bdb_env_repmgr_site_list(VALUE obj)
+     res = rb_ary_new();
+     for (i = 0; i < count; i++) {
+ 	tmp = rb_hash_new();
+-	rb_hash_aset(tmp, rb_tainted_str_new2("eid"), INT2NUM(list[i].eid));
+-	rb_hash_aset(tmp, rb_tainted_str_new2("host"), rb_tainted_str_new2(list[i].host));
+-	rb_hash_aset(tmp, rb_tainted_str_new2("port"), INT2NUM(list[i].port));
+-	rb_hash_aset(tmp, rb_tainted_str_new2("status"), INT2NUM(list[i].status));
++	rb_hash_aset(tmp, rb_str_new_cstr("eid"), INT2NUM(list[i].eid));
++	rb_hash_aset(tmp, rb_str_new_cstr("host"), rb_str_new_cstr(list[i].host));
++	rb_hash_aset(tmp, rb_str_new_cstr("port"), INT2NUM(list[i].port));
++	rb_hash_aset(tmp, rb_str_new_cstr("status"), INT2NUM(list[i].status));
+ 	rb_ary_push(res, tmp);
+     }
+     free(list);
+@@ -2445,7 +2454,7 @@ bdb_env_rep_set_nsites(VALUE obj, VALUE a)
+ }
+ 
+ static VALUE
+-bdb_env_rep_get_nsites(VALUE obj, VALUE a)
++bdb_env_rep_get_nsites(VALUE obj)
+ {
+     bdb_ENV *envst;
+     int offon;
+@@ -2470,7 +2479,7 @@ bdb_env_rep_set_priority(VALUE obj, VALUE a)
+ }
+ 
+ static VALUE
+-bdb_env_rep_get_priority(VALUE obj, VALUE a)
++bdb_env_rep_get_priority(VALUE obj)
+ {
+     bdb_ENV *envst;
+     int offon;
+@@ -2571,102 +2580,102 @@ bdb_env_rep_stat(int argc, VALUE *argv, VALUE obj)
+     bdb_test_error(envst->envp->rep_stat(envst->envp, &bs, flags));
+     a = rb_hash_new();
+ #if HAVE_ST_DB_REP_STAT_ST_BULK_FILLS
+-    rb_hash_aset(a, rb_tainted_str_new2("st_bulk_fills"), INT2NUM(bs->st_bulk_fills));
++    rb_hash_aset(a, rb_str_new_cstr("st_bulk_fills"), INT2NUM(bs->st_bulk_fills));
+ #endif
+ #if HAVE_ST_DB_REP_STAT_ST_BULK_OVERFLOWS
+-    rb_hash_aset(a, rb_tainted_str_new2("st_bulk_overflows"), INT2NUM(bs->st_bulk_overflows));
++    rb_hash_aset(a, rb_str_new_cstr("st_bulk_overflows"), INT2NUM(bs->st_bulk_overflows));
+ #endif
+ #if HAVE_ST_DB_REP_STAT_ST_BULK_RECORDS
+-    rb_hash_aset(a, rb_tainted_str_new2("st_bulk_records"), INT2NUM(bs->st_bulk_records));
++    rb_hash_aset(a, rb_str_new_cstr("st_bulk_records"), INT2NUM(bs->st_bulk_records));
+ #endif
+ #if HAVE_ST_DB_REP_STAT_ST_BULK_TRANSFERS
+-    rb_hash_aset(a, rb_tainted_str_new2("st_bulk_transfers"), INT2NUM(bs->st_bulk_transfers));
++    rb_hash_aset(a, rb_str_new_cstr("st_bulk_transfers"), INT2NUM(bs->st_bulk_transfers));
+ #endif
+ #if HAVE_ST_DB_REP_STAT_ST_CLIENT_REREQUESTS
+-    rb_hash_aset(a, rb_tainted_str_new2("st_client_rerequests"), INT2NUM(bs->st_client_rerequests));
++    rb_hash_aset(a, rb_str_new_cstr("st_client_rerequests"), INT2NUM(bs->st_client_rerequests));
+ #endif
+ #if HAVE_ST_DB_REP_STAT_ST_CLIENT_SVC_MISS
+-    rb_hash_aset(a, rb_tainted_str_new2("st_client_svc_miss"), INT2NUM(bs->st_client_svc_miss));
++    rb_hash_aset(a, rb_str_new_cstr("st_client_svc_miss"), INT2NUM(bs->st_client_svc_miss));
+ #endif
+ #if HAVE_ST_DB_REP_STAT_ST_CLIENT_SVC_REQ
+-    rb_hash_aset(a, rb_tainted_str_new2("st_client_svc_req"), INT2NUM(bs->st_client_svc_req));
++    rb_hash_aset(a, rb_str_new_cstr("st_client_svc_req"), INT2NUM(bs->st_client_svc_req));
+ #endif
+-    rb_hash_aset(a, rb_tainted_str_new2("st_dupmasters"), INT2NUM(bs->st_dupmasters));
++    rb_hash_aset(a, rb_str_new_cstr("st_dupmasters"), INT2NUM(bs->st_dupmasters));
+ #if HAVE_ST_DB_REP_STAT_ST_EGEN
+-    rb_hash_aset(a, rb_tainted_str_new2("st_egen"), INT2NUM(bs->st_egen));
++    rb_hash_aset(a, rb_str_new_cstr("st_egen"), INT2NUM(bs->st_egen));
+ #endif
+-    rb_hash_aset(a, rb_tainted_str_new2("st_election_cur_winner"), INT2NUM(bs->st_election_cur_winner));
+-    rb_hash_aset(a, rb_tainted_str_new2("st_election_gen"), INT2NUM(bs->st_election_gen));
++    rb_hash_aset(a, rb_str_new_cstr("st_election_cur_winner"), INT2NUM(bs->st_election_cur_winner));
++    rb_hash_aset(a, rb_str_new_cstr("st_election_gen"), INT2NUM(bs->st_election_gen));
+ 
+     lsn = bdb_makelsn(obj);
+     Data_Get_Struct(lsn, struct dblsnst, lsnst);
+     MEMCPY(lsnst->lsn, &bs->st_election_lsn, DB_LSN, 1);
+-    rb_hash_aset(a, rb_tainted_str_new2("st_election_lsn"), lsn);
++    rb_hash_aset(a, rb_str_new_cstr("st_election_lsn"), lsn);
+ 
+-    rb_hash_aset(a, rb_tainted_str_new2("st_election_nsites"), INT2NUM(bs->st_election_nsites));
++    rb_hash_aset(a, rb_str_new_cstr("st_election_nsites"), INT2NUM(bs->st_election_nsites));
+ #if HAVE_ST_DB_REP_STAT_ST_ELECTION_NVOTES
+-    rb_hash_aset(a, rb_tainted_str_new2("st_election_nvotes"), INT2NUM(bs->st_election_nvotes));
++    rb_hash_aset(a, rb_str_new_cstr("st_election_nvotes"), INT2NUM(bs->st_election_nvotes));
+ #endif
+-    rb_hash_aset(a, rb_tainted_str_new2("st_election_priority"), INT2NUM(bs->st_election_priority));
++    rb_hash_aset(a, rb_str_new_cstr("st_election_priority"), INT2NUM(bs->st_election_priority));
+ #if HAVE_ST_DB_REP_STAT_ST_ELECTION_SEC
+-    rb_hash_aset(a, rb_tainted_str_new2("st_election_sec"), INT2NUM(bs->st_election_sec));
++    rb_hash_aset(a, rb_str_new_cstr("st_election_sec"), INT2NUM(bs->st_election_sec));
+ #endif
+-    rb_hash_aset(a, rb_tainted_str_new2("st_election_status"), INT2NUM(bs->st_election_status));
+-    rb_hash_aset(a, rb_tainted_str_new2("st_election_tiebreaker"), INT2NUM(bs->st_election_tiebreaker));
++    rb_hash_aset(a, rb_str_new_cstr("st_election_status"), INT2NUM(bs->st_election_status));
++    rb_hash_aset(a, rb_str_new_cstr("st_election_tiebreaker"), INT2NUM(bs->st_election_tiebreaker));
+ #if HAVE_ST_DB_REP_STAT_ST_ELECTION_USEC
+-    rb_hash_aset(a, rb_tainted_str_new2("st_election_usec"), INT2NUM(bs->st_election_usec));
++    rb_hash_aset(a, rb_str_new_cstr("st_election_usec"), INT2NUM(bs->st_election_usec));
+ #endif
+-    rb_hash_aset(a, rb_tainted_str_new2("st_election_votes"), INT2NUM(bs->st_election_votes));
+-    rb_hash_aset(a, rb_tainted_str_new2("st_elections"), INT2NUM(bs->st_elections));
+-    rb_hash_aset(a, rb_tainted_str_new2("st_elections_won"), INT2NUM(bs->st_elections_won));
+-    rb_hash_aset(a, rb_tainted_str_new2("st_env_id"), INT2NUM(bs->st_env_id));
+-    rb_hash_aset(a, rb_tainted_str_new2("st_env_priority"), INT2NUM(bs->st_env_priority));
+-    rb_hash_aset(a, rb_tainted_str_new2("st_gen"), INT2NUM(bs->st_gen));
+-    rb_hash_aset(a, rb_tainted_str_new2("st_log_duplicated"), INT2NUM(bs->st_log_duplicated));
+-    rb_hash_aset(a, rb_tainted_str_new2("st_log_queued"), INT2NUM(bs->st_log_queued));
+-    rb_hash_aset(a, rb_tainted_str_new2("st_log_queued_max"), INT2NUM(bs->st_log_queued_max));
+-    rb_hash_aset(a, rb_tainted_str_new2("st_log_queued_total"), INT2NUM(bs->st_log_queued_total));
+-    rb_hash_aset(a, rb_tainted_str_new2("st_log_records"), INT2NUM(bs->st_log_records));
+-    rb_hash_aset(a, rb_tainted_str_new2("st_log_requested"), INT2NUM(bs->st_log_requested));
+-    rb_hash_aset(a, rb_tainted_str_new2("st_master"), INT2NUM(bs->st_master));
+-    rb_hash_aset(a, rb_tainted_str_new2("st_master_changes"), INT2NUM(bs->st_master_changes));
+-    rb_hash_aset(a, rb_tainted_str_new2("st_msgs_badgen"), INT2NUM(bs->st_msgs_badgen));
+-    rb_hash_aset(a, rb_tainted_str_new2("st_msgs_processed"), INT2NUM(bs->st_msgs_processed));
+-    rb_hash_aset(a, rb_tainted_str_new2("st_msgs_recover"), INT2NUM(bs->st_msgs_recover));
+-    rb_hash_aset(a, rb_tainted_str_new2("st_msgs_send_failures"), INT2NUM(bs->st_msgs_send_failures));
+-    rb_hash_aset(a, rb_tainted_str_new2("st_msgs_sent"), INT2NUM(bs->st_msgs_sent));
+-    rb_hash_aset(a, rb_tainted_str_new2("st_newsites"), INT2NUM(bs->st_newsites));
++    rb_hash_aset(a, rb_str_new_cstr("st_election_votes"), INT2NUM(bs->st_election_votes));
++    rb_hash_aset(a, rb_str_new_cstr("st_elections"), INT2NUM(bs->st_elections));
++    rb_hash_aset(a, rb_str_new_cstr("st_elections_won"), INT2NUM(bs->st_elections_won));
++    rb_hash_aset(a, rb_str_new_cstr("st_env_id"), INT2NUM(bs->st_env_id));
++    rb_hash_aset(a, rb_str_new_cstr("st_env_priority"), INT2NUM(bs->st_env_priority));
++    rb_hash_aset(a, rb_str_new_cstr("st_gen"), INT2NUM(bs->st_gen));
++    rb_hash_aset(a, rb_str_new_cstr("st_log_duplicated"), INT2NUM(bs->st_log_duplicated));
++    rb_hash_aset(a, rb_str_new_cstr("st_log_queued"), INT2NUM(bs->st_log_queued));
++    rb_hash_aset(a, rb_str_new_cstr("st_log_queued_max"), INT2NUM(bs->st_log_queued_max));
++    rb_hash_aset(a, rb_str_new_cstr("st_log_queued_total"), INT2NUM(bs->st_log_queued_total));
++    rb_hash_aset(a, rb_str_new_cstr("st_log_records"), INT2NUM(bs->st_log_records));
++    rb_hash_aset(a, rb_str_new_cstr("st_log_requested"), INT2NUM(bs->st_log_requested));
++    rb_hash_aset(a, rb_str_new_cstr("st_master"), INT2NUM(bs->st_master));
++    rb_hash_aset(a, rb_str_new_cstr("st_master_changes"), INT2NUM(bs->st_master_changes));
++    rb_hash_aset(a, rb_str_new_cstr("st_msgs_badgen"), INT2NUM(bs->st_msgs_badgen));
++    rb_hash_aset(a, rb_str_new_cstr("st_msgs_processed"), INT2NUM(bs->st_msgs_processed));
++    rb_hash_aset(a, rb_str_new_cstr("st_msgs_recover"), INT2NUM(bs->st_msgs_recover));
++    rb_hash_aset(a, rb_str_new_cstr("st_msgs_send_failures"), INT2NUM(bs->st_msgs_send_failures));
++    rb_hash_aset(a, rb_str_new_cstr("st_msgs_sent"), INT2NUM(bs->st_msgs_sent));
++    rb_hash_aset(a, rb_str_new_cstr("st_newsites"), INT2NUM(bs->st_newsites));
+ 
+     lsn = bdb_makelsn(obj);
+     Data_Get_Struct(lsn, struct dblsnst, lsnst);
+     MEMCPY(lsnst->lsn, &bs->st_next_lsn, DB_LSN, 1);
+-    rb_hash_aset(a, rb_tainted_str_new2("st_next_lsn"), lsn);
++    rb_hash_aset(a, rb_str_new_cstr("st_next_lsn"), lsn);
+ #if HAVE_ST_DB_REP_STAT_ST_NEXT_PG
+-    rb_hash_aset(a, rb_tainted_str_new2("st_next_pg"), INT2NUM(bs->st_next_pg));
++    rb_hash_aset(a, rb_str_new_cstr("st_next_pg"), INT2NUM(bs->st_next_pg));
+ #endif
+-    rb_hash_aset(a, rb_tainted_str_new2("st_nsites"), INT2NUM(bs->st_nsites));
+-    rb_hash_aset(a, rb_tainted_str_new2("st_nthrottles"), INT2NUM(bs->st_nthrottles));
+-    rb_hash_aset(a, rb_tainted_str_new2("st_outdated"), INT2NUM(bs->st_outdated));
++    rb_hash_aset(a, rb_str_new_cstr("st_nsites"), INT2NUM(bs->st_nsites));
++    rb_hash_aset(a, rb_str_new_cstr("st_nthrottles"), INT2NUM(bs->st_nthrottles));
++    rb_hash_aset(a, rb_str_new_cstr("st_outdated"), INT2NUM(bs->st_outdated));
+ #if HAVE_ST_DB_REP_STAT_ST_PG_DUPLICATED
+-    rb_hash_aset(a, rb_tainted_str_new2("st_pg_duplicated"), INT2NUM(bs->st_pg_duplicated));
++    rb_hash_aset(a, rb_str_new_cstr("st_pg_duplicated"), INT2NUM(bs->st_pg_duplicated));
+ #endif
+ #if HAVE_ST_DB_REP_STAT_ST_PG_RECORDS
+-    rb_hash_aset(a, rb_tainted_str_new2("st_pg_records"), INT2NUM(bs->st_pg_records));
++    rb_hash_aset(a, rb_str_new_cstr("st_pg_records"), INT2NUM(bs->st_pg_records));
+ #endif
+ #if HAVE_ST_DB_REP_STAT_ST_PG_REQUESTED
+-    rb_hash_aset(a, rb_tainted_str_new2("st_pg_requested"), INT2NUM(bs->st_pg_requested));
++    rb_hash_aset(a, rb_str_new_cstr("st_pg_requested"), INT2NUM(bs->st_pg_requested));
+ #endif
+ #if HAVE_ST_DB_REP_STAT_ST_STARTUP_COMPLETE
+-    rb_hash_aset(a, rb_tainted_str_new2("st_startup_complete"), INT2NUM(bs->st_startup_complete));
++    rb_hash_aset(a, rb_str_new_cstr("st_startup_complete"), INT2NUM(bs->st_startup_complete));
+ #endif
+-    rb_hash_aset(a, rb_tainted_str_new2("st_status"), INT2NUM(bs->st_status));
+-    rb_hash_aset(a, rb_tainted_str_new2("st_txns_applied"), INT2NUM(bs->st_txns_applied));
++    rb_hash_aset(a, rb_str_new_cstr("st_status"), INT2NUM(bs->st_status));
++    rb_hash_aset(a, rb_str_new_cstr("st_txns_applied"), INT2NUM(bs->st_txns_applied));
+     lsn = bdb_makelsn(obj);
+     Data_Get_Struct(lsn, struct dblsnst, lsnst);
+     MEMCPY(lsnst->lsn, &bs->st_waiting_lsn, DB_LSN, 1);
+-    rb_hash_aset(a, rb_tainted_str_new2("st_waiting_lsn"), lsn);
++    rb_hash_aset(a, rb_str_new_cstr("st_waiting_lsn"), lsn);
+ #if HAVE_ST_DB_REP_STAT_ST_WAITING_PG
+-    rb_hash_aset(a, rb_tainted_str_new2("st_waiting_pg"), INT2NUM(bs->st_waiting_pg));
++    rb_hash_aset(a, rb_str_new_cstr("st_waiting_pg"), INT2NUM(bs->st_waiting_pg));
+ #endif
+     free(bs);
+     return a;
+@@ -2764,7 +2773,7 @@ bdb_env_rep_set_clockskew(VALUE obj, VALUE a, VALUE b)
+ }
+ 
+ static VALUE
+-bdb_env_rep_get_clockskew(VALUE obj, VALUE a)
++bdb_env_rep_get_clockskew(VALUE obj)
+ {
+     bdb_ENV *envst;
+     u_int32_t fast, slow;
+@@ -2791,7 +2800,7 @@ bdb_env_rep_set_request(VALUE obj, VALUE a, VALUE b)
+ }
+ 
+ static VALUE
+-bdb_env_rep_get_request(VALUE obj, VALUE a)
++bdb_env_rep_get_request(VALUE obj)
+ {
+     bdb_ENV *envst;
+     u_int32_t frmin, frmax;
+@@ -2816,7 +2825,7 @@ bdb_env_dir_mode(VALUE obj)
+     if (envst->envp->get_intermediate_dir_mode(envst->envp, &dir)) {
+ 	rb_raise(rb_eArgError, "invalid environment");
+     }
+-    return rb_tainted_str_new2(dir);
++    return rb_str_new_cstr(dir);
+ }
+ 
+ #endif
+@@ -3012,7 +3021,7 @@ void bdb_init_env()
+     rb_define_method(bdb_cEnv, "rep_timeout?", bdb_env_rep_intern_timeout, 1);
+ #endif
+ #if HAVE_ST_DB_ENV_REP_STAT
+-    rb_define_method(bdb_cEnv, "rep_stat", bdb_env_rep_stat, 0);
++    rb_define_method(bdb_cEnv, "rep_stat", bdb_env_rep_stat, -1);
+ #endif
+ #if HAVE_ST_DB_ENV_REP_SYNC
+     rb_define_method(bdb_cEnv, "rep_sync", bdb_env_rep_sync, -1);
diff --git a/databases/ruby-bdb/files/patch-src-extconf.rb b/databases/ruby-bdb/files/patch-src-extconf.rb
index d3603baf22d7..3316c19a29bf 100644
--- a/databases/ruby-bdb/files/patch-src-extconf.rb
+++ b/databases/ruby-bdb/files/patch-src-extconf.rb
@@ -1,6 +1,6 @@
 --- src/extconf.rb.orig	2011-04-06 19:35:39 UTC
 +++ src/extconf.rb
-@@ -36,16 +36,16 @@ end
+@@ -36,16 +36,16 @@ if unknown = enable_config("unknown")
  
  if unknown = enable_config("unknown")
     libs = if CONFIG.key?("LIBRUBYARG_STATIC")
@@ -21,7 +21,15 @@
  when /solaris2/
     $DLDFLAGS ||= ""
     $DLDFLAGS += " -R#{lib_dir}"
-@@ -63,10 +63,12 @@ end
+@@ -53,6 +53,7 @@ $CFLAGS += " -DBDB_NO_THREAD_COMPILE" if enable_config
+ $bdb_libdir = lib_dir
+ 
+ $CFLAGS += " -DBDB_NO_THREAD_COMPILE" if enable_config("thread") == false
++$CFLAGS += " -Wno-int-conversion"
+ 
+ unique = with_config("db-uniquename") || ''
+ 
+@@ -63,10 +64,12 @@ if csv = with_config('db-version')
  if csv = with_config('db-version')
     version = csv.split(',', -1)
     version << '' if version.empty?
@@ -36,7 +44,7 @@
     else
        if m[2]
           major, minor = m[2], m[3]
-@@ -94,7 +96,7 @@ catch(:done) do
+@@ -94,7 +97,7 @@ catch(:done) do
           end
           next if with_ver.empty?
           if !unique.is_a?(String) || unique.empty?
diff --git a/databases/ruby-bdb/files/patch-src-lock.c b/databases/ruby-bdb/files/patch-src-lock.c
new file mode 100644
index 000000000000..1192f5f14b2d
--- /dev/null
+++ b/databases/ruby-bdb/files/patch-src-lock.c
@@ -0,0 +1,11 @@
+--- src/lock.c.orig	2011-04-06 19:35:39 UTC
++++ src/lock.c
+@@ -335,7 +335,7 @@ struct lockreq {
+ };
+ 
+ static VALUE
+-bdb_lockid_each(VALUE obj, VALUE listobj)
++bdb_lockid_each(VALUE obj, VALUE listobj, int _argc, const VALUE *_argv, VALUE _blockarg)
+ {
+     VALUE key, value;
+     DB_LOCKREQ *list;
diff --git a/databases/ruby-bdb/files/patch-src-log.c b/databases/ruby-bdb/files/patch-src-log.c
new file mode 100644
index 000000000000..d35bd60444ac
--- /dev/null
+++ b/databases/ruby-bdb/files/patch-src-log.c
@@ -0,0 +1,11 @@
+--- src/log.c.orig	2011-04-06 19:35:39 UTC
++++ src/log.c
+@@ -688,7 +688,7 @@ bdb_log_unregister(VALUE obj)
+ void bdb_init_log()
+ {
+     rb_define_method(bdb_cEnv, "log_put", bdb_s_log_put, -1);
+-    rb_define_method(bdb_cEnv, "log_curlsn", bdb_s_log_curlsn, 0);
++    rb_define_method(bdb_cEnv, "log_curlsn", bdb_s_log_curlsn, 1);
+     rb_define_method(bdb_cEnv, "log_checkpoint", bdb_s_log_checkpoint, 1);
+     rb_define_method(bdb_cEnv, "log_flush", bdb_s_log_flush, -1);
+     rb_define_method(bdb_cEnv, "log_stat", bdb_env_log_stat, -1);
diff --git a/databases/ruby-bdb/files/patch-src-recnum.c b/databases/ruby-bdb/files/patch-src-recnum.c
index db95ad281c90..66aade8fac08 100644
--- a/databases/ruby-bdb/files/patch-src-recnum.c
+++ b/databases/ruby-bdb/files/patch-src-recnum.c
@@ -30,3 +30,12 @@
  	    flags = NUM2INT(g);
  	}
  	argc--;
+@@ -948,7 +950,7 @@ void bdb_init_recnum()
+     rb_define_method(bdb_cRecnum, "collect", bdb_sary_collect, -1);
+     rb_define_method(bdb_cRecnum, "collect!", bdb_sary_collect_bang, -1);
+ #if HAVE_RB_ARY_VALUES_AT
+-    rb_define_method(bdb_cRecnum, "map", bdb_sary_collect, 0);
++    rb_define_method(bdb_cRecnum, "map", bdb_sary_collect, -1);
+     rb_define_method(bdb_cRecnum, "select", bdb_sary_select, -1);
+     rb_define_method(bdb_cRecnum, "values_at", bdb_sary_values_at, -1);
+ #endif
diff --git a/databases/ruby-bdb/files/patch-src-sequence.c b/databases/ruby-bdb/files/patch-src-sequence.c
new file mode 100644
index 000000000000..909ea1a5d783
--- /dev/null
+++ b/databases/ruby-bdb/files/patch-src-sequence.c
@@ -0,0 +1,20 @@
+--- src/sequence.c.orig	2011-04-06 19:35:39 UTC
++++ src/sequence.c
+@@ -66,7 +66,7 @@ bdb_seq_txn_close(VALUE obj, VALUE commit, VALUE real)
+ }
+ 
+ static VALUE
+-bdb_seq_i_options(VALUE obj, VALUE seqobj)
++bdb_seq_i_options(VALUE obj, VALUE seqobj, int _argc, const VALUE *_argv, VALUE _blockarg)
+ {
+     VALUE key, value;
+     bdb_SEQ *seqst;
+@@ -148,7 +148,7 @@ bdb_seq_open(int argc, VALUE *argv, VALUE obj)
+         break;
+     }
+     if (!NIL_P(options)) {
+-        rb_iterate(rb_each, options, bdb_seq_i_options, res);
++	rb_block_call(options, rb_intern("each"), 0, NULL, bdb_seq_i_options, res);
+     }
+     a = bdb_test_recno(obj, &key, &recno, a);
+     if (seqst->seqp->open(seqst->seqp, txnid, &key, flags)) {
diff --git a/databases/ruby-bdb/files/patch-src-transaction.c b/databases/ruby-bdb/files/patch-src-transaction.c
new file mode 100644
index 000000000000..3c25a82824e6
--- /dev/null
+++ b/databases/ruby-bdb/files/patch-src-transaction.c
@@ -0,0 +1,79 @@
+--- src/transaction.c.orig	2011-04-06 19:35:39 UTC
++++ src/transaction.c
+@@ -139,7 +139,9 @@ bdb_txn_commit(int argc, VALUE *argv, VALUE obj)
+     VALUE a;
+     int flags;
+ 
++#if defined(RUBY_SAFE_LEVEL_MAX) && RUBY_SAFE_LEVEL_MAX >= 4
+     rb_secure(4);
++#endif
+     flags = 0;
+     if (rb_scan_args(argc, argv, "01", &a) == 1) {
+         flags = NUM2INT(a);
+@@ -205,7 +207,7 @@ bdb_txn_unlock(VALUE txnv)
+ }
+ 
+ static VALUE
+-bdb_catch(VALUE val, VALUE args, VALUE self)
++bdb_catch(VALUE val, VALUE args, int _argc, const VALUE *_argv, VALUE _blockarg)
+ {
+     rb_yield(args);
+     return Qtrue;
+@@ -260,7 +262,7 @@ struct dbtxnopt {
+ };
+ 
+ static VALUE
+-bdb_txn_i_options(VALUE obj, VALUE dbstobj)
++bdb_txn_i_options(VALUE obj, VALUE dbstobj, int _argc, const VALUE *_argv, VALUE _blockarg)
+ {
+     struct dbtxnopt *opt = (struct dbtxnopt *)dbstobj;
+     VALUE key, value;
+@@ -329,7 +331,7 @@ bdb_env_rslbl_begin(VALUE origin, int argc, VALUE *arg
+     if (argc > 0 && TYPE(argv[argc - 1]) == T_HASH) {
+ 	options = argv[argc - 1];
+ 	argc--;
+-	rb_iterate(rb_each, options, bdb_txn_i_options, (VALUE)&opt);
++	rb_block_call(options, rb_intern("each"), 0, NULL, bdb_txn_i_options, (VALUE)&opt);
+ 	flags = opt.flags;
+ 	if (flags & BDB_TXN_COMMIT) {
+ 	    commit = 1;
+@@ -552,7 +554,9 @@ bdb_env_recover(VALUE obj)
+     if (!rb_block_given_p()) {
+         rb_raise(bdb_eFatal, "call out of an iterator");
+     }
++#if defined(RUBY_SAFE_LEVEL_MAX) && RUBY_SAFE_LEVEL_MAX >= 4
+     rb_secure(4);
++#endif
+     GetEnvDB(obj, envst);
+     txnv = Data_Make_Struct(bdb_cTxn, bdb_TXN, bdb_txn_mark, bdb_txn_free, txnst);
+     txnst->env = obj;
+@@ -584,7 +588,9 @@ bdb_txn_discard(VALUE obj)
+     bdb_TXN *txnst;
+     int flags;
+ 
++#if defined(RUBY_SAFE_LEVEL_MAX) && RUBY_SAFE_LEVEL_MAX >= 4
+     rb_secure(4);
++#endif
+     flags = 0;
+     GetTxnDB(obj, txnst);
+ #if HAVE_ST_DB_TXN_DISCARD
+@@ -761,7 +767,9 @@ bdb_env_dbremove(int argc, VALUE *argv, VALUE obj)
+     bdb_TXN *txnst;
+     DB_TXN *txnid;
+ 
++#if defined(RUBY_SAFE_LEVEL_MAX) && RUBY_SAFE_LEVEL_MAX >= 2
+     rb_secure(2);
++#endif
+     a = b = c = Qnil;
+     file = database = NULL;
+     flags = 0;
+@@ -810,7 +818,9 @@ bdb_env_dbrename(int argc, VALUE *argv, VALUE obj)
+     bdb_TXN *txnst;
+     DB_TXN *txnid;
+ 
++#if defined(RUBY_SAFE_LEVEL_MAX) && RUBY_SAFE_LEVEL_MAX >= 2
+     rb_secure(2);
++#endif
+     a = b = c = Qnil;
+     file = database = newname = NULL;
+     flags = 0;
diff --git a/databases/ruby-bdb/files/patch-src__bdb.c b/databases/ruby-bdb/files/patch-src__bdb.c
deleted file mode 100644
index 3ad6c0cb8163..000000000000
--- a/databases/ruby-bdb/files/patch-src__bdb.c
+++ /dev/null
@@ -1,18 +0,0 @@
---- src/bdb.c.orig	2011-04-06 19:35:39 UTC
-+++ src/bdb.c
-@@ -166,11 +166,10 @@
- 	rb_raise(rb_eNameError, "module already defined");
-     }
-     version = rb_tainted_str_new2(db_version(&major, &minor, &patch));
--    if (major != DB_VERSION_MAJOR || minor != DB_VERSION_MINOR
--	|| patch != DB_VERSION_PATCH) {
--        rb_raise(rb_eNotImpError, "\nBDB needs compatible versions of libdb & db.h\n\tyou have db.h version %d.%d.%d and libdb version %d.%d.%d\n",
--		 DB_VERSION_MAJOR, DB_VERSION_MINOR, DB_VERSION_PATCH,
--		 major, minor, patch);
-+    if (major != DB_VERSION_MAJOR || minor != DB_VERSION_MINOR) {
-+        rb_raise(rb_eNotImpError, "\nBDB needs compatible versions of libdb & db.h\n\tyou have db.h version %d.%d and libdb version %d.%d\n",
-+		 DB_VERSION_MAJOR, DB_VERSION_MINOR,
-+		 major, minor);
-     }
-     bdb_mMarshal = rb_const_get(rb_cObject, rb_intern("Marshal"));
-     bdb_id_current_db = rb_intern("__bdb_current_db__");
diff --git a/databases/ruby-bdb/files/patch-src__env.c b/databases/ruby-bdb/files/patch-src__env.c
deleted file mode 100644
index be5ccea26a5e..000000000000
--- a/databases/ruby-bdb/files/patch-src__env.c
+++ /dev/null
@@ -1,41 +0,0 @@
---- src/env.c.orig	2011-04-06 19:35:39 UTC
-+++ src/env.c
-@@ -1121,9 +1121,11 @@ bdb_env_close(VALUE obj)
- {
-     bdb_ENV *envst;
- 
-+#if defined(RUBY_SAFE_LEVEL_MAX) && RUBY_SAFE_LEVEL_MAX >= 4
-     if (!OBJ_TAINTED(obj) && rb_safe_level() >= 4) {
- 	rb_raise(rb_eSecurityError, "Insecure: can't close the environnement");
-     }
-+#endif
-     GetEnvDB(obj, envst);
-     bdb_final(envst);
-     RDATA(obj)->dfree = free;
-@@ -1517,12 +1519,16 @@ bdb_env_init(int argc, VALUE *argv, VALUE obj)
- 	flags = NUM2INT(c);
-         break;
-     }
-+#if defined(RUBY_SAFE_LEVEL_MAX) && RUBY_SAFE_LEVEL_MAX >= 4
-     if (flags & DB_CREATE) {
- 	rb_secure(4);
-     }
-+#endif
-+#if defined(RUBY_SAFE_LEVEL_MAX) && RUBY_SAFE_LEVEL_MAX >= 1
-     if (flags & DB_USE_ENVIRON) {
- 	rb_secure(1);
-     }
-+#endif
- #ifndef BDB_NO_THREAD_COMPILE
-     if (!(envst->options & BDB_NO_THREAD)) {
- 	bdb_set_func(envst);
-@@ -1658,7 +1664,9 @@ bdb_env_s_remove(int argc, VALUE *argv, VALUE obj)
-     char *db_home;
-     int flag = 0;
- 
-+#if defined(RUBY_SAFE_LEVEL_MAX) && RUBY_SAFE_LEVEL_MAX >= 2
-     rb_secure(2);
-+#endif
-     if (rb_scan_args(argc, argv, "11", &a, &b) == 2) {
- 	flag = NUM2INT(b);
-     }
diff --git a/databases/ruby-bdb/files/patch-src__transaction.c b/databases/ruby-bdb/files/patch-src__transaction.c
deleted file mode 100644
index 22b9a7d65312..000000000000
--- a/databases/ruby-bdb/files/patch-src__transaction.c
+++ /dev/null
@@ -1,52 +0,0 @@
---- src/transaction.c.orig	2011-04-06 19:35:39 UTC
-+++ src/transaction.c
-@@ -139,7 +139,9 @@ bdb_txn_commit(int argc, VALUE *argv, VALUE obj)
-     VALUE a;
-     int flags;
- 
-+#if defined(RUBY_SAFE_LEVEL_MAX) && RUBY_SAFE_LEVEL_MAX >= 4
-     rb_secure(4);
-+#endif
-     flags = 0;
-     if (rb_scan_args(argc, argv, "01", &a) == 1) {
-         flags = NUM2INT(a);
-@@ -552,7 +554,9 @@ bdb_env_recover(VALUE obj)
-     if (!rb_block_given_p()) {
-         rb_raise(bdb_eFatal, "call out of an iterator");
-     }
-+#if defined(RUBY_SAFE_LEVEL_MAX) && RUBY_SAFE_LEVEL_MAX >= 4
-     rb_secure(4);
-+#endif
-     GetEnvDB(obj, envst);
-     txnv = Data_Make_Struct(bdb_cTxn, bdb_TXN, bdb_txn_mark, bdb_txn_free, txnst);
-     txnst->env = obj;
-@@ -584,7 +588,9 @@ bdb_txn_discard(VALUE obj)
-     bdb_TXN *txnst;
-     int flags;
- 
-+#if defined(RUBY_SAFE_LEVEL_MAX) && RUBY_SAFE_LEVEL_MAX >= 4
-     rb_secure(4);
-+#endif
-     flags = 0;
-     GetTxnDB(obj, txnst);
- #if HAVE_ST_DB_TXN_DISCARD
-@@ -761,7 +767,9 @@ bdb_env_dbremove(int argc, VALUE *argv, VALUE obj)
-     bdb_TXN *txnst;
-     DB_TXN *txnid;
- 
-+#if defined(RUBY_SAFE_LEVEL_MAX) && RUBY_SAFE_LEVEL_MAX >= 2
-     rb_secure(2);
-+#endif
-     a = b = c = Qnil;
-     file = database = NULL;
-     flags = 0;
-@@ -810,7 +818,9 @@ bdb_env_dbrename(int argc, VALUE *argv, VALUE obj)
-     bdb_TXN *txnst;
-     DB_TXN *txnid;
- 
-+#if defined(RUBY_SAFE_LEVEL_MAX) && RUBY_SAFE_LEVEL_MAX >= 2
-     rb_secure(2);
-+#endif
-     a = b = c = Qnil;
-     file = database = newname = NULL;
-     flags = 0;
diff --git a/databases/ruby-bdb/pkg-descr b/databases/ruby-bdb/pkg-descr
index 855aa0aaffbf..0c1d91affefe 100644
--- a/databases/ruby-bdb/pkg-descr
+++ b/databases/ruby-bdb/pkg-descr
@@ -1,5 +1,3 @@
 Ruby-bdb is an interface to Sleepycat's Berkeley DB revision 2 or
 later.  DB >= 2 is required. (some functionalities like join are not
 available with DB < 2.6)
-
-WWW: https://github.com/knu/ruby-bdb
diff --git a/databases/ruby-qdbm/Makefile b/databases/ruby-qdbm/Makefile
index 10775f23ca93..f9c545d3784c 100644
--- a/databases/ruby-qdbm/Makefile
+++ b/databases/ruby-qdbm/Makefile
@@ -1,5 +1,3 @@
-# Created by: Michael Johnson <ahze@FreeBSD.org>
-
 PORTNAME=	qdbm
 PORTVERSION=	1.8.78
 PORTREVISION=	4
@@ -9,22 +7,22 @@ PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
 
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	Ruby API for QDBM
+WWW=		https://dbmx.net/qdbm/
 
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKDIR}/${PORTNAME}-${PORTVERSION}/COPYING
 
 LIB_DEPENDS=	libqdbm.so:databases/qdbm
 
-USES=		iconv shebangfix
+USES=		iconv ruby shebangfix
 SHEBANG_FILES=	curia/rbcrtest depot/rbdptest myrbdoc villa/rbvltest
-USE_RUBY=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}/ruby
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 CONFIGURE_ENV=	ac_cv_lib_iconv_main=yes
 MAKE_ENV=	CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" \
 		LOCALBASE="${LOCALBASE}"
-CFLAGS+=	-I${LOCALBASE}/include
+CFLAGS+=	-I${LOCALBASE}/include -fdeclspec
 LDFLAGS+=	-L${LOCALBASE}/lib
 
 post-configure:
diff --git a/databases/ruby-qdbm/pkg-descr b/databases/ruby-qdbm/pkg-descr
index a9d29560484c..24411395e40f 100644
--- a/databases/ruby-qdbm/pkg-descr
+++ b/databases/ruby-qdbm/pkg-descr
@@ -1,3 +1 @@
 Ruby API for QDBM
-
-WWW: https://dbmx.net/qdbm/
diff --git a/databases/ruby-tokyocabinet/Makefile b/databases/ruby-tokyocabinet/Makefile
index 454159917986..34fddee3a907 100644
--- a/databases/ruby-tokyocabinet/Makefile
+++ b/databases/ruby-tokyocabinet/Makefile
@@ -1,5 +1,3 @@
-# Created by: Damian Gerow <dgerow@afflictions.org>
-
 PORTNAME=	tokyocabinet
 PORTVERSION=	1.31
 CATEGORIES=	databases ruby
@@ -10,11 +8,14 @@ DIST_SUBDIR=	ruby
 
 MAINTAINER=	dgerow@afflictions.org
 COMMENT=	Ruby interface to the Tokyo Cabinet DB engine
+WWW=		https://dbmx.net/tokyocabinet/
+
+LICENSE=	LGPL21
+LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libtokyocabinet.so:databases/tokyocabinet
 
-USE_RUBY=	yes
-USE_RUBY_EXTCONF=	yes
+USES=	ruby:extconf
 
 INSTALL_TARGET=	site-install
 
@@ -22,6 +23,12 @@ DOCS=	doc/*
 
 OPTIONS_DEFINE=	DOCS
 
+.include <bsd.port.options.mk>
+
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 ))
+CONFIGURE_ARGS+=	--with-cflags="-Wno-error=incompatible-function-pointer-types"
+.endif
+
 post-install:
 	${MKDIR} ${STAGEDIR}${RUBY_MODDOCDIR}
 .for f in ${DOCS}
diff --git a/databases/ruby-tokyocabinet/pkg-descr b/databases/ruby-tokyocabinet/pkg-descr
index e500808ea74b..ba6f92d825da 100644
--- a/databases/ruby-tokyocabinet/pkg-descr
+++ b/databases/ruby-tokyocabinet/pkg-descr
@@ -1,4 +1,2 @@
 tokyocabinet-ruby provides an interface to the Toky Cabinet database
 engine.
-
-WWW: https://dbmx.net/tokyocabinet/
diff --git a/databases/ruby-xapian/Makefile b/databases/ruby-xapian/Makefile
index 16d7aac8bdd9..b12b21a4d330 100644
--- a/databases/ruby-xapian/Makefile
+++ b/databases/ruby-xapian/Makefile
@@ -1,7 +1,5 @@
-# Created by: Po-Chuan Hsieh <sunpoet@FreeBSD.org>
-
 PORTNAME=	xapian
-PORTVERSION=	1.4.18
+PORTVERSION=	1.4.25
 DISTVERSIONPREFIX=	bindings-
 CATEGORIES=	databases ruby
 MASTER_SITES=	https://oligarchy.co.uk/xapian/${PORTVERSION}/ \
@@ -10,15 +8,16 @@ PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Ruby binding for Xapian
+WWW=		https://xapian.org/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	xapian-core>=${PORTVERSION}:databases/xapian-core
+BUILD_DEPENDS=	rubygem-rdoc>=0:devel/rubygem-rdoc \
+		xapian-core>=${PORTVERSION}:databases/xapian-core
 LIB_DEPENDS=	libxapian.so:databases/xapian-core
 
-USES=		compiler:c++11-lang libtool tar:xz
-USE_RUBY=	yes
+USES=		compiler:c++11-lang libtool ruby tar:xz
 
 CONFIGURE_ARGS=	--datarootdir=${DATADIR} \
 		--docdir=${DOCSDIR} \
@@ -30,7 +29,6 @@ CONFIGURE_ARGS=	--datarootdir=${DATADIR} \
 		--without-lua \
 		--without-perl \
 		--without-php \
-		--without-php7 \
 		--without-python \
 		--without-python3 \
 		--without-tcl
@@ -38,21 +36,10 @@ GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
 USE_CXXSTD=	c++11
 
-PORTDOCS=	*
-
 CONFLICTS_INSTALL=	xapian-bindings12
 
 PORTSCOUT=	limitw:1,even
 
 OPTIONS_DEFINE=	DOCS
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|-lstdc++||g' ${WRKSRC}/configure
-
-.include <bsd.port.pre.mk>
-
-.if ${RUBY_VER} >= 2.6
-BUILD_DEPENDS+=	rubygem-rdoc>=0:devel/rubygem-rdoc
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/databases/ruby-xapian/distinfo b/databases/ruby-xapian/distinfo
index 87d80baf24a3..577650a9a6ff 100644
--- a/databases/ruby-xapian/distinfo
+++ b/databases/ruby-xapian/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1611665355
-SHA256 (xapian-bindings-1.4.18.tar.xz) = fe52064e90d202f7819130ae3ad013c8b2b9cb517ad9fd607cf41d0110c5f18f
-SIZE (xapian-bindings-1.4.18.tar.xz) = 1135644
+TIMESTAMP = 1710712360
+SHA256 (xapian-bindings-1.4.25.tar.xz) = 068314fca3f54524701492df432fa54c485fd4e39613ca2cd275e136964e81a9
+SIZE (xapian-bindings-1.4.25.tar.xz) = 1076644
diff --git a/databases/ruby-xapian/files/patch-configure b/databases/ruby-xapian/files/patch-configure
new file mode 100644
index 000000000000..6b9dce2bb21b
--- /dev/null
+++ b/databases/ruby-xapian/files/patch-configure
@@ -0,0 +1,11 @@
+--- configure.orig	2023-02-02 01:01:44 UTC
++++ configure
+@@ -21048,7 +21048,7 @@ SWIG_CXXFLAGS=
+ if test yes = "$GXX" ; then
+                     SWIG_CXXFLAGS="-fno-strict-aliasing"
+ 
+-              XAPIAN_LIBS="$XAPIAN_LIBS -lstdc++"
++              XAPIAN_LIBS="$XAPIAN_LIBS "
+ 
+ 
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
diff --git a/databases/ruby-xapian/pkg-descr b/databases/ruby-xapian/pkg-descr
index f530fd141bf8..1f3c3fc3be3a 100644
--- a/databases/ruby-xapian/pkg-descr
+++ b/databases/ruby-xapian/pkg-descr
@@ -1,3 +1 @@
 Ruby binding for Xapian
-
-WWW: https://xapian.org/
diff --git a/databases/ruby-xapian/pkg-plist b/databases/ruby-xapian/pkg-plist
index 4b6df24246ed..4bed0050ec64 100644
--- a/databases/ruby-xapian/pkg-plist
+++ b/databases/ruby-xapian/pkg-plist
@@ -1,3 +1,70 @@
 %%RUBY_SITEARCHLIBDIR%%/_xapian.a
 %%RUBY_SITEARCHLIBDIR%%/_xapian.so
 %%RUBY_SITELIBDIR%%/xapian.rb
+%%PORTDOCS%%%%DOCSDIR%%/ruby/examples/simpleexpand.rb
+%%PORTDOCS%%%%DOCSDIR%%/ruby/examples/simpleindex.rb
+%%PORTDOCS%%%%DOCSDIR%%/ruby/examples/simplematchdecider.rb
+%%PORTDOCS%%%%DOCSDIR%%/ruby/examples/simplesearch.rb
+%%PORTDOCS%%%%DOCSDIR%%/ruby/index.html
+%%PORTDOCS%%%%DOCSDIR%%/ruby/rdocs/Xapian.html
+%%PORTDOCS%%%%DOCSDIR%%/ruby/rdocs/Xapian/Database.html
+%%PORTDOCS%%%%DOCSDIR%%/ruby/rdocs/Xapian/Document.html
+%%PORTDOCS%%%%DOCSDIR%%/ruby/rdocs/Xapian/ESet.html
+%%PORTDOCS%%%%DOCSDIR%%/ruby/rdocs/Xapian/Enquire.html
+%%PORTDOCS%%%%DOCSDIR%%/ruby/rdocs/Xapian/ExpandTerm.html
+%%PORTDOCS%%%%DOCSDIR%%/ruby/rdocs/Xapian/LatLongCoord.html
+%%PORTDOCS%%%%DOCSDIR%%/ruby/rdocs/Xapian/LatLongCoords.html
+%%PORTDOCS%%%%DOCSDIR%%/ruby/rdocs/Xapian/MSet.html
+%%PORTDOCS%%%%DOCSDIR%%/ruby/rdocs/Xapian/Match.html
+%%PORTDOCS%%%%DOCSDIR%%/ruby/rdocs/Xapian/MultiValueKeyMaker.html
+%%PORTDOCS%%%%DOCSDIR%%/ruby/rdocs/Xapian/MultiValueKeyMaker/KeySpec.html
+%%PORTDOCS%%%%DOCSDIR%%/ruby/rdocs/Xapian/Posting.html
+%%PORTDOCS%%%%DOCSDIR%%/ruby/rdocs/Xapian/Query.html
+%%PORTDOCS%%%%DOCSDIR%%/ruby/rdocs/Xapian/QueryParser.html
+%%PORTDOCS%%%%DOCSDIR%%/ruby/rdocs/Xapian/Term.html
+%%PORTDOCS%%%%DOCSDIR%%/ruby/rdocs/Xapian/Value.html
+%%PORTDOCS%%%%DOCSDIR%%/ruby/rdocs/Xapian/ValueCountMatchSpy.html
+%%PORTDOCS%%%%DOCSDIR%%/ruby/rdocs/created.rid
+%%PORTDOCS%%%%DOCSDIR%%/ruby/rdocs/css/fonts.css
+%%PORTDOCS%%%%DOCSDIR%%/ruby/rdocs/css/rdoc.css
+%%PORTDOCS%%%%DOCSDIR%%/ruby/rdocs/fonts/Lato-Light.ttf
+%%PORTDOCS%%%%DOCSDIR%%/ruby/rdocs/fonts/Lato-LightItalic.ttf
+%%PORTDOCS%%%%DOCSDIR%%/ruby/rdocs/fonts/Lato-Regular.ttf
+%%PORTDOCS%%%%DOCSDIR%%/ruby/rdocs/fonts/Lato-RegularItalic.ttf
+%%PORTDOCS%%%%DOCSDIR%%/ruby/rdocs/fonts/SourceCodePro-Bold.ttf
+%%PORTDOCS%%%%DOCSDIR%%/ruby/rdocs/fonts/SourceCodePro-Regular.ttf
+%%PORTDOCS%%%%DOCSDIR%%/ruby/rdocs/images/add.png
+%%PORTDOCS%%%%DOCSDIR%%/ruby/rdocs/images/arrow_up.png
+%%PORTDOCS%%%%DOCSDIR%%/ruby/rdocs/images/brick.png
+%%PORTDOCS%%%%DOCSDIR%%/ruby/rdocs/images/brick_link.png
+%%PORTDOCS%%%%DOCSDIR%%/ruby/rdocs/images/bug.png
+%%PORTDOCS%%%%DOCSDIR%%/ruby/rdocs/images/bullet_black.png
+%%PORTDOCS%%%%DOCSDIR%%/ruby/rdocs/images/bullet_toggle_minus.png
+%%PORTDOCS%%%%DOCSDIR%%/ruby/rdocs/images/bullet_toggle_plus.png
+%%PORTDOCS%%%%DOCSDIR%%/ruby/rdocs/images/date.png
+%%PORTDOCS%%%%DOCSDIR%%/ruby/rdocs/images/delete.png
+%%PORTDOCS%%%%DOCSDIR%%/ruby/rdocs/images/find.png
+%%PORTDOCS%%%%DOCSDIR%%/ruby/rdocs/images/loadingAnimation.gif
+%%PORTDOCS%%%%DOCSDIR%%/ruby/rdocs/images/macFFBgHack.png
+%%PORTDOCS%%%%DOCSDIR%%/ruby/rdocs/images/package.png
+%%PORTDOCS%%%%DOCSDIR%%/ruby/rdocs/images/page_green.png
+%%PORTDOCS%%%%DOCSDIR%%/ruby/rdocs/images/page_white_text.png
+%%PORTDOCS%%%%DOCSDIR%%/ruby/rdocs/images/page_white_width.png
+%%PORTDOCS%%%%DOCSDIR%%/ruby/rdocs/images/plugin.png
+%%PORTDOCS%%%%DOCSDIR%%/ruby/rdocs/images/ruby.png
+%%PORTDOCS%%%%DOCSDIR%%/ruby/rdocs/images/tag_blue.png
+%%PORTDOCS%%%%DOCSDIR%%/ruby/rdocs/images/tag_green.png
+%%PORTDOCS%%%%DOCSDIR%%/ruby/rdocs/images/transparent.png
+%%PORTDOCS%%%%DOCSDIR%%/ruby/rdocs/images/wrench.png
+%%PORTDOCS%%%%DOCSDIR%%/ruby/rdocs/images/wrench_orange.png
+%%PORTDOCS%%%%DOCSDIR%%/ruby/rdocs/images/zoom.png
+%%PORTDOCS%%%%DOCSDIR%%/ruby/rdocs/index.html
+%%PORTDOCS%%%%DOCSDIR%%/ruby/rdocs/js/darkfish.js
+%%PORTDOCS%%%%DOCSDIR%%/ruby/rdocs/js/navigation.js
+%%PORTDOCS%%%%DOCSDIR%%/ruby/rdocs/js/navigation.js.gz
+%%PORTDOCS%%%%DOCSDIR%%/ruby/rdocs/js/search.js
+%%PORTDOCS%%%%DOCSDIR%%/ruby/rdocs/js/search_index.js
+%%PORTDOCS%%%%DOCSDIR%%/ruby/rdocs/js/search_index.js.gz
+%%PORTDOCS%%%%DOCSDIR%%/ruby/rdocs/js/searcher.js
+%%PORTDOCS%%%%DOCSDIR%%/ruby/rdocs/js/searcher.js.gz
+%%PORTDOCS%%%%DOCSDIR%%/ruby/rdocs/table_of_contents.html
diff --git a/databases/rubygem-active_model_serializers/Makefile b/databases/rubygem-active_model_serializers/Makefile
index d797fd40620b..840b8ec14acd 100644
--- a/databases/rubygem-active_model_serializers/Makefile
+++ b/databases/rubygem-active_model_serializers/Makefile
@@ -1,21 +1,21 @@
 PORTNAME=	active_model_serializers
-PORTVERSION=	0.10.12
+PORTVERSION=	0.10.14
 CATEGORIES=	databases rubygems
 MASTER_SITES=	RG
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Conventions-based JSON generation for Rails
+WWW=		https://github.com/rails-api/active_model_serializers
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/MIT-LICENSE
 
-RUN_DEPENDS=	rubygem-activemodel5>=4.1<6.2:databases/rubygem-activemodel5 \
-		rubygem-actionpack5>=4.1<6.2:www/rubygem-actionpack5 \
+RUN_DEPENDS=	rubygem-activemodel5>=4.1:databases/rubygem-activemodel5 \
+		rubygem-actionpack5>=4.1:www/rubygem-actionpack5 \
 		rubygem-case_transform>=0.2:textproc/rubygem-case_transform \
 		rubygem-jsonapi-renderer>=0.1.1<0.3:devel/rubygem-jsonapi-renderer
 
 USES=		gem
-USE_RUBY=	yes
 
 NO_ARCH=	yes
 
diff --git a/databases/rubygem-active_model_serializers/distinfo b/databases/rubygem-active_model_serializers/distinfo
index 93e29b8ed130..403e426abd26 100644
--- a/databases/rubygem-active_model_serializers/distinfo
+++ b/databases/rubygem-active_model_serializers/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1607685413
-SHA256 (rubygem/active_model_serializers-0.10.12.gem) = 12fa2d82f64205e6b5665bc85be6cd87131da0f8d3c40b9768c066817aae53ca
-SIZE (rubygem/active_model_serializers-0.10.12.gem) = 61440
+TIMESTAMP = 1696753700
+SHA256 (rubygem/active_model_serializers-0.10.14.gem) = 14de177c843a8a1edbc7e954eb7637074b1af2dced3bd8454173bc06ec8dc18e
+SIZE (rubygem/active_model_serializers-0.10.14.gem) = 61440
diff --git a/databases/rubygem-active_model_serializers/pkg-descr b/databases/rubygem-active_model_serializers/pkg-descr
index 75fdc8a485c7..00bf98e471e1 100644
--- a/databases/rubygem-active_model_serializers/pkg-descr
+++ b/databases/rubygem-active_model_serializers/pkg-descr
@@ -1,5 +1,3 @@
 This gem is an ActiveModel Serializer implementation with Rails hooks.
 It provides a means to generate JSON in an object-oriented and
 convention-driven manner.
-
-WWW: https://github.com/rails-api/active_model_serializers
diff --git a/databases/rubygem-active_model_serializers61/Makefile b/databases/rubygem-active_model_serializers61/Makefile
new file mode 100644
index 000000000000..bb7b8ac85132
--- /dev/null
+++ b/databases/rubygem-active_model_serializers61/Makefile
@@ -0,0 +1,23 @@
+PORTNAME=	active_model_serializers
+PORTVERSION=	0.10.14
+CATEGORIES=	databases rubygems
+MASTER_SITES=	RG
+PKGNAMESUFFIX=	61
+
+MAINTAINER=	bofh@FreeBSD.org
+COMMENT=	Conventions-based JSON generation for Rails
+WWW=		https://github.com/rails-api/active_model_serializers
+
+LICENSE=	MIT
+LICENSE_FILE=	${WRKSRC}/MIT-LICENSE
+
+RUN_DEPENDS=	rubygem-activemodel61>=4.1<7.1:databases/rubygem-activemodel61 \
+		rubygem-actionpack61>=4.1<7.1:www/rubygem-actionpack61 \
+		rubygem-case_transform61>=0.2:textproc/rubygem-case_transform61 \
+		rubygem-jsonapi-renderer>=0.1.1<0.3:devel/rubygem-jsonapi-renderer
+
+USES=		gem
+
+NO_ARCH=	yes
+
+.include <bsd.port.mk>
diff --git a/databases/rubygem-active_model_serializers61/distinfo b/databases/rubygem-active_model_serializers61/distinfo
new file mode 100644
index 000000000000..488c88ec45a0
--- /dev/null
+++ b/databases/rubygem-active_model_serializers61/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1696622831
+SHA256 (rubygem/active_model_serializers-0.10.14.gem) = 14de177c843a8a1edbc7e954eb7637074b1af2dced3bd8454173bc06ec8dc18e
+SIZE (rubygem/active_model_serializers-0.10.14.gem) = 61440
diff --git a/databases/rubygem-active_model_serializers61/pkg-descr b/databases/rubygem-active_model_serializers61/pkg-descr
new file mode 100644
index 000000000000..00bf98e471e1
--- /dev/null
+++ b/databases/rubygem-active_model_serializers61/pkg-descr
@@ -0,0 +1,3 @@
+This gem is an ActiveModel Serializer implementation with Rails hooks.
+It provides a means to generate JSON in an object-oriented and
+convention-driven manner.
diff --git a/databases/rubygem-active_record_query_trace/Makefile b/databases/rubygem-active_record_query_trace/Makefile
index 114e087bcbeb..834b2928e737 100644
--- a/databases/rubygem-active_record_query_trace/Makefile
+++ b/databases/rubygem-active_record_query_trace/Makefile
@@ -1,16 +1,16 @@
 PORTNAME=	active_record_query_trace
-PORTVERSION=	1.5.4
+PORTVERSION=	1.8
 CATEGORIES=	databases rubygems
 MASTER_SITES=	RG
 
 MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	Print stack trace of all queries to the Rails log
+WWW=		https://github.com/brunofacca/active-record-query-trace
 
 LICENSE=	MIT
 
-NO_ARCH=	yes
-
-USE_RUBY=	yes
 USES=		gem
 
+NO_ARCH=	yes
+
 .include <bsd.port.mk>
diff --git a/databases/rubygem-active_record_query_trace/distinfo b/databases/rubygem-active_record_query_trace/distinfo
index fd512e0ef12a..72942581368c 100644
--- a/databases/rubygem-active_record_query_trace/distinfo
+++ b/databases/rubygem-active_record_query_trace/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1492685193
-SHA256 (rubygem/active_record_query_trace-1.5.4.gem) = b0c5cbc0d48a4d0755472a0e6211e7d46e16cb6c22829936bda031177ccd0aaa
-SIZE (rubygem/active_record_query_trace-1.5.4.gem) = 5632
+TIMESTAMP = 1660576852
+SHA256 (rubygem/active_record_query_trace-1.8.gem) = 1680327c6db78af0a9e83e86f505324edec4a597669bc8d41479e3db244708a5
+SIZE (rubygem/active_record_query_trace-1.8.gem) = 7168
diff --git a/databases/rubygem-active_record_query_trace/pkg-descr b/databases/rubygem-active_record_query_trace/pkg-descr
index c4abf191cd39..98b51ad76011 100644
--- a/databases/rubygem-active_record_query_trace/pkg-descr
+++ b/databases/rubygem-active_record_query_trace/pkg-descr
@@ -1,4 +1,2 @@
 This gem logs the execution source of all queries to the Rails log.  Tracking
 down the source is often useful for performance optimization.
-
-WWW: https://github.com/ruckus/active-record-query-trace
diff --git a/databases/rubygem-activemodel-serializers-xml/Makefile b/databases/rubygem-activemodel-serializers-xml/Makefile
index 2680e625891a..67d2eeaabc5f 100644
--- a/databases/rubygem-activemodel-serializers-xml/Makefile
+++ b/databases/rubygem-activemodel-serializers-xml/Makefile
@@ -1,5 +1,3 @@
-# Created by: Po-Chuan Hsieh <sunpoet@FreeBSD.org>
-
 PORTNAME=	activemodel-serializers-xml
 PORTVERSION=	1.0.2
 CATEGORIES=	databases rubygems
@@ -7,6 +5,7 @@ MASTER_SITES=	RG
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	XML serialization for Active Model objects and Active Record models
+WWW=		https://github.com/rails/activemodel-serializers-xml
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/MIT-LICENSE
@@ -16,7 +15,6 @@ RUN_DEPENDS=	rubygem-activemodel5>=5.0:databases/rubygem-activemodel5 \
 		rubygem-builder>=3.1<4:devel/rubygem-builder
 
 USES=		gem
-USE_RUBY=	yes
 
 NO_ARCH=	yes
 
diff --git a/databases/rubygem-activemodel-serializers-xml/pkg-descr b/databases/rubygem-activemodel-serializers-xml/pkg-descr
index 1808b6442987..b9357719132d 100644
--- a/databases/rubygem-activemodel-serializers-xml/pkg-descr
+++ b/databases/rubygem-activemodel-serializers-xml/pkg-descr
@@ -1,4 +1,2 @@
 ActiveModel::Serializers::Xml provides XML serialization for your Active Model
 objects and Active Record models.
-
-WWW: https://github.com/rails/activemodel-serializers-xml
diff --git a/databases/rubygem-activemodel4/Makefile b/databases/rubygem-activemodel4/Makefile
index 88d5dc05c411..dca7169a79dc 100644
--- a/databases/rubygem-activemodel4/Makefile
+++ b/databases/rubygem-activemodel4/Makefile
@@ -1,5 +1,3 @@
-# Created by: Johannes Meixner <johannes@perceivon.net>
-
 PORTNAME=	activemodel
 PORTVERSION=	4.2.11.3
 CATEGORIES=	databases rubygems
@@ -8,6 +6,7 @@ PKGNAMESUFFIX=	4
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Toolkit for building modeling frameworks
+WWW=		https://github.com/rails/rails/tree/main/activemodel
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/MIT-LICENSE
@@ -16,7 +15,6 @@ RUN_DEPENDS=	rubygem-activesupport4>=${PORTVERSION}:devel/rubygem-activesupport4
 		rubygem-builder>=3.1<4:devel/rubygem-builder
 
 USES=		gem
-USE_RUBY=	yes
 
 NO_ARCH=	yes
 
diff --git a/databases/rubygem-activemodel4/pkg-descr b/databases/rubygem-activemodel4/pkg-descr
index 5eee67fa991a..2fbd12e1479d 100644
--- a/databases/rubygem-activemodel4/pkg-descr
+++ b/databases/rubygem-activemodel4/pkg-descr
@@ -6,5 +6,4 @@ the Rails framework.
 Active Model provides a default module that implements the basic API required to
 integrate with Action Pack out of the box: ActiveModel::Model.
 
-WWW: https://rubyonrails.org/
-WWW: https://github.com/rails/rails/tree/master/activemodel
+See also: https://rubyonrails.org/
diff --git a/databases/rubygem-activemodel5/Makefile b/databases/rubygem-activemodel5/Makefile
index 65a7add94758..732e3a84661a 100644
--- a/databases/rubygem-activemodel5/Makefile
+++ b/databases/rubygem-activemodel5/Makefile
@@ -1,5 +1,3 @@
-# Created by: Johannes Meixner <johannes@perceivon.net>
-
 PORTNAME=	activemodel
 PORTVERSION=	5.1.7
 CATEGORIES=	databases rubygems
@@ -8,6 +6,7 @@ PKGNAMESUFFIX=	5
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Toolkit for building modeling frameworks
+WWW=		https://github.com/rails/rails/tree/main/activemodel
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/MIT-LICENSE
@@ -15,7 +14,6 @@ LICENSE_FILE=	${WRKSRC}/MIT-LICENSE
 RUN_DEPENDS=	rubygem-activesupport5>=${PORTVERSION}:devel/rubygem-activesupport5
 
 USES=		gem
-USE_RUBY=	yes
 
 NO_ARCH=	yes
 
diff --git a/databases/rubygem-activemodel5/pkg-descr b/databases/rubygem-activemodel5/pkg-descr
index 5eee67fa991a..2fbd12e1479d 100644
--- a/databases/rubygem-activemodel5/pkg-descr
+++ b/databases/rubygem-activemodel5/pkg-descr
@@ -6,5 +6,4 @@ the Rails framework.
 Active Model provides a default module that implements the basic API required to
 integrate with Action Pack out of the box: ActiveModel::Model.
 
-WWW: https://rubyonrails.org/
-WWW: https://github.com/rails/rails/tree/master/activemodel
+See also: https://rubyonrails.org/
diff --git a/databases/rubygem-activemodel50/Makefile b/databases/rubygem-activemodel50/Makefile
index 3b0948b2dd37..5a9be52a37b6 100644
--- a/databases/rubygem-activemodel50/Makefile
+++ b/databases/rubygem-activemodel50/Makefile
@@ -1,5 +1,3 @@
-# Created by: Johannes Meixner <johannes@perceivon.net>
-
 PORTNAME=	activemodel
 PORTVERSION=	5.0.7.2
 CATEGORIES=	databases rubygems
@@ -8,6 +6,7 @@ PKGNAMESUFFIX=	50
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Toolkit for building modeling frameworks
+WWW=		https://github.com/rails/rails/tree/main/activemodel
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/MIT-LICENSE
@@ -15,7 +14,6 @@ LICENSE_FILE=	${WRKSRC}/MIT-LICENSE
 RUN_DEPENDS=	rubygem-activesupport50>=${PORTVERSION}:devel/rubygem-activesupport50
 
 USES=		gem
-USE_RUBY=	yes
 
 NO_ARCH=	yes
 
diff --git a/databases/rubygem-activemodel50/pkg-descr b/databases/rubygem-activemodel50/pkg-descr
index 5eee67fa991a..2fbd12e1479d 100644
--- a/databases/rubygem-activemodel50/pkg-descr
+++ b/databases/rubygem-activemodel50/pkg-descr
@@ -6,5 +6,4 @@ the Rails framework.
 Active Model provides a default module that implements the basic API required to
 integrate with Action Pack out of the box: ActiveModel::Model.
 
-WWW: https://rubyonrails.org/
-WWW: https://github.com/rails/rails/tree/master/activemodel
+See also: https://rubyonrails.org/
diff --git a/databases/rubygem-activemodel52/Makefile b/databases/rubygem-activemodel52/Makefile
index 8cc182d5a76a..847de092de37 100644
--- a/databases/rubygem-activemodel52/Makefile
+++ b/databases/rubygem-activemodel52/Makefile
@@ -1,13 +1,12 @@
-# Created by: Johannes Meixner <johannes@perceivon.net>
-
 PORTNAME=	activemodel
-PORTVERSION=	5.2.6
+PORTVERSION=	5.2.8.1
 CATEGORIES=	databases rubygems
 MASTER_SITES=	RG
 PKGNAMESUFFIX=	52
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Toolkit for building modeling frameworks
+WWW=		https://github.com/rails/rails/tree/main/activemodel
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/MIT-LICENSE
@@ -15,7 +14,6 @@ LICENSE_FILE=	${WRKSRC}/MIT-LICENSE
 RUN_DEPENDS=	rubygem-activesupport52>=${PORTVERSION}:devel/rubygem-activesupport52
 
 USES=		gem
-USE_RUBY=	yes
 
 NO_ARCH=	yes
 
diff --git a/databases/rubygem-activemodel52/distinfo b/databases/rubygem-activemodel52/distinfo
index de37fe376475..bd83851512ad 100644
--- a/databases/rubygem-activemodel52/distinfo
+++ b/databases/rubygem-activemodel52/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1620298694
-SHA256 (rubygem/activemodel-5.2.6.gem) = 467f960c0d787a825e21687619d131acbcbaf645add91c5b34b5a1fc2d9b48e4
-SIZE (rubygem/activemodel-5.2.6.gem) = 56832
+TIMESTAMP = 1657835507
+SHA256 (rubygem/activemodel-5.2.8.1.gem) = 2fad202735ec6b5c6508b1691ac2e44e4f9f22a859c0f727cdef107ae5ea5e6f
+SIZE (rubygem/activemodel-5.2.8.1.gem) = 56832
diff --git a/databases/rubygem-activemodel52/pkg-descr b/databases/rubygem-activemodel52/pkg-descr
index 5eee67fa991a..2fbd12e1479d 100644
--- a/databases/rubygem-activemodel52/pkg-descr
+++ b/databases/rubygem-activemodel52/pkg-descr
@@ -6,5 +6,4 @@ the Rails framework.
 Active Model provides a default module that implements the basic API required to
 integrate with Action Pack out of the box: ActiveModel::Model.
 
-WWW: https://rubyonrails.org/
-WWW: https://github.com/rails/rails/tree/master/activemodel
+See also: https://rubyonrails.org/
diff --git a/databases/rubygem-activemodel60/Makefile b/databases/rubygem-activemodel60/Makefile
index c23630748739..ebdfcdce9e67 100644
--- a/databases/rubygem-activemodel60/Makefile
+++ b/databases/rubygem-activemodel60/Makefile
@@ -1,21 +1,20 @@
-# Created by: Johannes Meixner <johannes@perceivon.net>
-
 PORTNAME=	activemodel
-PORTVERSION=	6.0.3.7
+PORTVERSION=	6.0.6.1
 CATEGORIES=	databases rubygems
 MASTER_SITES=	RG
 PKGNAMESUFFIX=	60
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Toolkit for building modeling frameworks
+WWW=		https://github.com/rails/rails/tree/main/activemodel \
+		https://rubyonrails.org/
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/MIT-LICENSE
 
-RUN_DEPENDS=	rubygem-activesupport60>=${PORTVERSION}:devel/rubygem-activesupport60
+RUN_DEPENDS=	rubygem-activesupport60>=${PORTVERSION}<${PORTVERSION}_99:devel/rubygem-activesupport60
 
 USES=		gem
-USE_RUBY=	yes
 
 NO_ARCH=	yes
 
diff --git a/databases/rubygem-activemodel60/distinfo b/databases/rubygem-activemodel60/distinfo
index f2ac711710b0..092396b38d14 100644
--- a/databases/rubygem-activemodel60/distinfo
+++ b/databases/rubygem-activemodel60/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1620298716
-SHA256 (rubygem/activemodel-6.0.3.7.gem) = f1aceff039036d032b39b0b9a60b382e59aefd31ce5ad919c274e0142ed55ff7
-SIZE (rubygem/activemodel-6.0.3.7.gem) = 58880
+TIMESTAMP = 1675191909
+SHA256 (rubygem/activemodel-6.0.6.1.gem) = 8856126e35d604084e5531dc6d29095bee431b93e7899687dfec59da929b6f5f
+SIZE (rubygem/activemodel-6.0.6.1.gem) = 58880
diff --git a/databases/rubygem-activemodel60/pkg-descr b/databases/rubygem-activemodel60/pkg-descr
index 5eee67fa991a..32d2e965b6a6 100644
--- a/databases/rubygem-activemodel60/pkg-descr
+++ b/databases/rubygem-activemodel60/pkg-descr
@@ -5,6 +5,3 @@ the Rails framework.
 
 Active Model provides a default module that implements the basic API required to
 integrate with Action Pack out of the box: ActiveModel::Model.
-
-WWW: https://rubyonrails.org/
-WWW: https://github.com/rails/rails/tree/master/activemodel
diff --git a/databases/rubygem-activemodel61/Makefile b/databases/rubygem-activemodel61/Makefile
index 903fee09f902..d938ddb028be 100644
--- a/databases/rubygem-activemodel61/Makefile
+++ b/databases/rubygem-activemodel61/Makefile
@@ -1,21 +1,20 @@
-# Created by: Johannes Meixner <johannes@perceivon.net>
-
 PORTNAME=	activemodel
-PORTVERSION=	6.1.3.2
+PORTVERSION=	6.1.7.7
 CATEGORIES=	databases rubygems
 MASTER_SITES=	RG
 PKGNAMESUFFIX=	61
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Toolkit for building modeling frameworks
+WWW=		https://github.com/rails/rails/tree/main/activemodel \
+		https://rubyonrails.org/
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/MIT-LICENSE
 
-RUN_DEPENDS=	rubygem-activesupport61>=${PORTVERSION}:devel/rubygem-activesupport61
+RUN_DEPENDS=	rubygem-activesupport61>=${PORTVERSION}<${PORTVERSION}_99:devel/rubygem-activesupport61
 
 USES=		gem
-USE_RUBY=	yes
 
 NO_ARCH=	yes
 
diff --git a/databases/rubygem-activemodel61/distinfo b/databases/rubygem-activemodel61/distinfo
index db9fe098b19d..db996ac20c1b 100644
--- a/databases/rubygem-activemodel61/distinfo
+++ b/databases/rubygem-activemodel61/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1620298742
-SHA256 (rubygem/activemodel-6.1.3.2.gem) = 5459410a49855d18b89ecf2d509cb74924e37559a01a991b41d9fb4c201cedbe
-SIZE (rubygem/activemodel-6.1.3.2.gem) = 61952
+TIMESTAMP = 1709390994
+SHA256 (rubygem/activemodel-6.1.7.7.gem) = 5ecd0c1b92025066fb9c9e2749e2d8d064e9d37108e6ef40f3da89795212e37f
+SIZE (rubygem/activemodel-6.1.7.7.gem) = 62464
diff --git a/databases/rubygem-activemodel61/pkg-descr b/databases/rubygem-activemodel61/pkg-descr
index 5eee67fa991a..32d2e965b6a6 100644
--- a/databases/rubygem-activemodel61/pkg-descr
+++ b/databases/rubygem-activemodel61/pkg-descr
@@ -5,6 +5,3 @@ the Rails framework.
 
 Active Model provides a default module that implements the basic API required to
 integrate with Action Pack out of the box: ActiveModel::Model.
-
-WWW: https://rubyonrails.org/
-WWW: https://github.com/rails/rails/tree/master/activemodel
diff --git a/databases/rubygem-activemodel70/Makefile b/databases/rubygem-activemodel70/Makefile
new file mode 100644
index 000000000000..5a448e91cc7c
--- /dev/null
+++ b/databases/rubygem-activemodel70/Makefile
@@ -0,0 +1,23 @@
+PORTNAME=	activemodel
+PORTVERSION=	7.0.8.1
+CATEGORIES=	databases rubygems
+MASTER_SITES=	RG
+PKGNAMESUFFIX=	70
+
+MAINTAINER=	sunpoet@FreeBSD.org
+COMMENT=	Toolkit for building modeling frameworks like Active Record
+WWW=		https://github.com/rails/rails/tree/main/activemodel \
+		https://rubyonrails.org/
+
+LICENSE=	MIT
+LICENSE_FILE=	${WRKSRC}/MIT-LICENSE
+
+RUN_DEPENDS=	rubygem-activesupport70>=${PORTVERSION}<${PORTVERSION}_99:devel/rubygem-activesupport70
+
+USES=		gem
+
+NO_ARCH=	yes
+
+PORTSCOUT=	limit:^7\.0\.
+
+.include <bsd.port.mk>
diff --git a/databases/rubygem-activemodel70/distinfo b/databases/rubygem-activemodel70/distinfo
new file mode 100644
index 000000000000..5edf068d23ef
--- /dev/null
+++ b/databases/rubygem-activemodel70/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1709391020
+SHA256 (rubygem/activemodel-7.0.8.1.gem) = 4115aef7f780abd168629c5d77031b014eecd84a52760ab149920148dfbe2d3f
+SIZE (rubygem/activemodel-7.0.8.1.gem) = 61952
diff --git a/databases/rubygem-activemodel70/pkg-descr b/databases/rubygem-activemodel70/pkg-descr
new file mode 100644
index 000000000000..9e0e982e3352
--- /dev/null
+++ b/databases/rubygem-activemodel70/pkg-descr
@@ -0,0 +1,7 @@
+Active Model provides a known set of interfaces for usage in model classes. They
+allow for Action Pack helpers to interact with non-Active Record models, for
+example. Active Model also helps with building custom ORMs for use outside of
+the Rails framework.
+
+Active Model provides a default module that implements the basic API required to
+integrate with Action Pack out of the box: ActiveModel::API.
diff --git a/databases/rubygem-activemodel71/Makefile b/databases/rubygem-activemodel71/Makefile
new file mode 100644
index 000000000000..2cc4d62c906c
--- /dev/null
+++ b/databases/rubygem-activemodel71/Makefile
@@ -0,0 +1,23 @@
+PORTNAME=	activemodel
+PORTVERSION=	7.1.3.2
+CATEGORIES=	databases rubygems
+MASTER_SITES=	RG
+PKGNAMESUFFIX=	71
+
+MAINTAINER=	sunpoet@FreeBSD.org
+COMMENT=	Toolkit for building modeling frameworks like Active Record
+WWW=		https://github.com/rails/rails/tree/main/activemodel \
+		https://rubyonrails.org/
+
+LICENSE=	MIT
+LICENSE_FILE=	${WRKSRC}/MIT-LICENSE
+
+RUN_DEPENDS=	rubygem-activesupport71>=${PORTVERSION}<${PORTVERSION}_99:devel/rubygem-activesupport71
+
+USES=		gem
+
+NO_ARCH=	yes
+
+PORTSCOUT=	limit:^7\.1\.
+
+.include <bsd.port.mk>
diff --git a/databases/rubygem-activemodel71/distinfo b/databases/rubygem-activemodel71/distinfo
new file mode 100644
index 000000000000..299dc0bb5254
--- /dev/null
+++ b/databases/rubygem-activemodel71/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1709391046
+SHA256 (rubygem/activemodel-7.1.3.2.gem) = 108e5262f96333c694e0fdba0209de5beeec1084b9a947940c259450f45d715c
+SIZE (rubygem/activemodel-7.1.3.2.gem) = 69120
diff --git a/databases/rubygem-activemodel71/pkg-descr b/databases/rubygem-activemodel71/pkg-descr
new file mode 100644
index 000000000000..9e0e982e3352
--- /dev/null
+++ b/databases/rubygem-activemodel71/pkg-descr
@@ -0,0 +1,7 @@
+Active Model provides a known set of interfaces for usage in model classes. They
+allow for Action Pack helpers to interact with non-Active Record models, for
+example. Active Model also helps with building custom ORMs for use outside of
+the Rails framework.
+
+Active Model provides a default module that implements the basic API required to
+integrate with Action Pack out of the box: ActiveModel::API.
diff --git a/databases/rubygem-activerecord-explain-analyze/Makefile b/databases/rubygem-activerecord-explain-analyze/Makefile
index c84e1c9bdeeb..4f2fb4d88e5e 100644
--- a/databases/rubygem-activerecord-explain-analyze/Makefile
+++ b/databases/rubygem-activerecord-explain-analyze/Makefile
@@ -1,21 +1,19 @@
-# Created by: Matthias Fechner <mfechner@FreeBSD.org>
-
 PORTNAME=	activerecord-explain-analyze
 PORTVERSION=	0.1.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	databases rubygems
 MASTER_SITES=	RG
 
 MAINTAINER=	mfechner@FreeBSD.org
 COMMENT=	Extends ActiveRecord#explain with additional features
+WWW=		https://github.com/6/activerecord-explain-analyze
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-activerecord60>=4:databases/rubygem-activerecord60 \
+RUN_DEPENDS=	rubygem-activerecord61>=4:databases/rubygem-activerecord61 \
 		rubygem-pg>=0:databases/rubygem-pg
 
 USES=		gem
-USE_RUBY=	yes
 
 NO_ARCH=	yes
 
diff --git a/databases/rubygem-activerecord-explain-analyze/pkg-descr b/databases/rubygem-activerecord-explain-analyze/pkg-descr
index f9a2957ab472..940b694762c5 100644
--- a/databases/rubygem-activerecord-explain-analyze/pkg-descr
+++ b/databases/rubygem-activerecord-explain-analyze/pkg-descr
@@ -1,5 +1,3 @@
 Extends ActiveRecord#explain with support for EXPLAIN ANALYZE
 and output formats of JSON, XML, and YAML.
 It currently supports ActiveRecord 4 and 5, and PostgreSQL only.
-
-WWW: https://github.com/6/activerecord-explain-analyze
diff --git a/databases/rubygem-activerecord-import/Makefile b/databases/rubygem-activerecord-import/Makefile
index 39add912c19b..828c47def167 100644
--- a/databases/rubygem-activerecord-import/Makefile
+++ b/databases/rubygem-activerecord-import/Makefile
@@ -1,18 +1,18 @@
 PORTNAME=	activerecord-import
-PORTVERSION=	1.2.0
+PORTVERSION=	1.6.0
 CATEGORIES=	databases rubygems
 MASTER_SITES=	RG
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Bulk import many records into an ActiveRecord DB
+WWW=		https://github.com/zdennis/activerecord-import
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	rubygem-activerecord4>=3.2:databases/rubygem-activerecord4
+RUN_DEPENDS=	rubygem-activerecord4>=4.2:databases/rubygem-activerecord4
 
 USES=		gem
-USE_RUBY=	yes
 
 NO_ARCH=	yes
 
diff --git a/databases/rubygem-activerecord-import/distinfo b/databases/rubygem-activerecord-import/distinfo
index dda6ea54de25..bfe61f21f940 100644
--- a/databases/rubygem-activerecord-import/distinfo
+++ b/databases/rubygem-activerecord-import/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1626542058
-SHA256 (rubygem/activerecord-import-1.2.0.gem) = 1179b76d43c708840eb34bf9ed2f697465036bdfde21e36d62006af65253cd9f
-SIZE (rubygem/activerecord-import-1.2.0.gem) = 66560
+TIMESTAMP = 1710712576
+SHA256 (rubygem/activerecord-import-1.6.0.gem) = b1704a8bcd47888d1adb249a302ba21fd0ec8e28123d8d66b6552ea8c4d94fb9
+SIZE (rubygem/activerecord-import-1.6.0.gem) = 70144
diff --git a/databases/rubygem-activerecord-import/pkg-descr b/databases/rubygem-activerecord-import/pkg-descr
index 2649be2988b4..afc03e76de70 100644
--- a/databases/rubygem-activerecord-import/pkg-descr
+++ b/databases/rubygem-activerecord-import/pkg-descr
@@ -1,4 +1,2 @@
 Extraction of the ActiveRecord::Base#import functionality from ar-extensions for
 Rails 3 and beyond.
-
-WWW: https://github.com/zdennis/activerecord-import
diff --git a/databases/rubygem-activerecord-jdbc-adapter/Makefile b/databases/rubygem-activerecord-jdbc-adapter/Makefile
index 08892a8005e4..8075d526060e 100644
--- a/databases/rubygem-activerecord-jdbc-adapter/Makefile
+++ b/databases/rubygem-activerecord-jdbc-adapter/Makefile
@@ -1,5 +1,3 @@
-# Created by: Alexander Logvinov <ports@logvinov,com>
-
 PORTNAME=	activerecord-jdbc-adapter
 PORTVERSION=	51.0
 CATEGORIES=	databases rubygems java
@@ -7,6 +5,7 @@ MASTER_SITES=	RG
 
 MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	JDBC adapter for ActiveRecord, for use within JRuby on Rails
+WWW=		https://github.com/jruby/activerecord-jdbc-adapter
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
@@ -15,7 +14,6 @@ RUN_DEPENDS=	jruby:lang/jruby \
 		rubygem-activerecord5>=5.1.0:databases/rubygem-activerecord5
 
 NO_ARCH=	yes
-USE_RUBY=	yes
 USES=		gem
 
 .include <bsd.port.mk>
diff --git a/databases/rubygem-activerecord-jdbc-adapter/pkg-descr b/databases/rubygem-activerecord-jdbc-adapter/pkg-descr
index 30072cc5825b..aa339dce583c 100644
--- a/databases/rubygem-activerecord-jdbc-adapter/pkg-descr
+++ b/databases/rubygem-activerecord-jdbc-adapter/pkg-descr
@@ -2,5 +2,3 @@ ActiveRecord-JDBC is a database adapter for Rails' ActiveRecord component
 that can be used with JRuby.
 It allows use of virtually any JDBC-compliant database with your
 JRuby on Rails application.
-
-WWW: https://github.com/jruby/activerecord-jdbc-adapter
diff --git a/databases/rubygem-activerecord-jdbcmysql-adapter/Makefile b/databases/rubygem-activerecord-jdbcmysql-adapter/Makefile
index bffcdc74f25d..dcf71ee3cef8 100644
--- a/databases/rubygem-activerecord-jdbcmysql-adapter/Makefile
+++ b/databases/rubygem-activerecord-jdbcmysql-adapter/Makefile
@@ -1,5 +1,3 @@
-# Created by: Alexander Logvinov <ports@logvinov,com>
-
 PORTNAME=	activerecord-jdbcmysql-adapter
 PORTVERSION=	51.0
 CATEGORIES=	databases rubygems java
@@ -7,6 +5,7 @@ MASTER_SITES=	RG
 
 MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	ActiveRecord driver for MySQL using JDBC running under JRuby
+WWW=		https://github.com/jruby/activerecord-jdbc-adapter
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
@@ -16,7 +15,6 @@ RUN_DEPENDS=	jruby:lang/jruby \
 		rubygem-jdbc-mysql>=5.1.36:databases/rubygem-jdbc-mysql
 
 NO_ARCH=	yes
-USE_RUBY=	yes
 USES=		gem
 
 .include <bsd.port.mk>
diff --git a/databases/rubygem-activerecord-jdbcmysql-adapter/pkg-descr b/databases/rubygem-activerecord-jdbcmysql-adapter/pkg-descr
index c7006d59097c..cb75b707ae66 100644
--- a/databases/rubygem-activerecord-jdbcmysql-adapter/pkg-descr
+++ b/databases/rubygem-activerecord-jdbcmysql-adapter/pkg-descr
@@ -1,3 +1 @@
 This is an ActiveRecord driver for MySQL using JDBC running under JRuby.
-
-WWW: https://github.com/jruby/activerecord-jdbc-adapter
diff --git a/databases/rubygem-activerecord-session_store/Makefile b/databases/rubygem-activerecord-session_store/Makefile
index 10b96e2d6d25..d470d2d16526 100644
--- a/databases/rubygem-activerecord-session_store/Makefile
+++ b/databases/rubygem-activerecord-session_store/Makefile
@@ -1,24 +1,23 @@
-# Created by: Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>
-
 PORTNAME=	activerecord-session_store
-PORTVERSION=	2.0.0
+PORTVERSION=	2.1.0
 CATEGORIES=	databases rubygems
 MASTER_SITES=	RG
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Action Dispatch session store backed by an Active Record class
+WWW=		https://github.com/rails/activerecord-session_store
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/MIT-LICENSE
 
-RUN_DEPENDS=	rubygem-actionpack60>=5.2.4.1:www/rubygem-actionpack60 \
-		rubygem-activerecord60>=5.2.4.1:databases/rubygem-activerecord60 \
+RUN_DEPENDS=	rubygem-actionpack61>=6.1:www/rubygem-actionpack61 \
+		rubygem-activerecord61>=6.1:databases/rubygem-activerecord61 \
+		rubygem-cgi>=0.3.6:www/rubygem-cgi \
 		rubygem-multi_json>=1.11.2<2:devel/rubygem-multi_json \
-		rubygem-rack>=2.0.8,3<3,3:www/rubygem-rack \
-		rubygem-railties60>=5.2.4.1:www/rubygem-railties60
+		rubygem-rack>=2.0.8,3<4,3:www/rubygem-rack \
+		rubygem-railties61>=6.1:www/rubygem-railties61
 
 USES=		gem
-USE_RUBY=	yes
 
 NO_ARCH=	yes
 
diff --git a/databases/rubygem-activerecord-session_store/distinfo b/databases/rubygem-activerecord-session_store/distinfo
index 7924013b12ff..e7c1dfa8d8d7 100644
--- a/databases/rubygem-activerecord-session_store/distinfo
+++ b/databases/rubygem-activerecord-session_store/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1618320320
-SHA256 (rubygem/activerecord-session_store-2.0.0.gem) = cf39cab1d037db11e4de277edae151adf4381a7b88d8047614e779b1c287ad19
-SIZE (rubygem/activerecord-session_store-2.0.0.gem) = 12288
+TIMESTAMP = 1693823947
+SHA256 (rubygem/activerecord-session_store-2.1.0.gem) = f8453b1d618d0c8744683f0808fda4c01c9a93508301316299dd1b9756662374
+SIZE (rubygem/activerecord-session_store-2.1.0.gem) = 12288
diff --git a/databases/rubygem-activerecord-session_store/pkg-descr b/databases/rubygem-activerecord-session_store/pkg-descr
index a5011b53620f..2d45587df1df 100644
--- a/databases/rubygem-activerecord-session_store/pkg-descr
+++ b/databases/rubygem-activerecord-session_store/pkg-descr
@@ -1,5 +1,3 @@
 A session store backed by an Active Record class. A default class is provided,
 but any object duck-typing to an Active Record Session class with text
 session_id and data attributes is sufficient.
-
-WWW: https://github.com/rails/activerecord-session_store
diff --git a/databases/rubygem-activerecord-trilogy-adapter/Makefile b/databases/rubygem-activerecord-trilogy-adapter/Makefile
new file mode 100644
index 000000000000..007af42db8ac
--- /dev/null
+++ b/databases/rubygem-activerecord-trilogy-adapter/Makefile
@@ -0,0 +1,20 @@
+PORTNAME=	activerecord-trilogy-adapter
+PORTVERSION=	3.1.2
+CATEGORIES=	databases rubygems
+MASTER_SITES=	RG
+
+MAINTAINER=	sunpoet@FreeBSD.org
+COMMENT=	Active Record adapter for trilogy
+WWW=		https://github.com/trilogy-libraries/activerecord-trilogy-adapter
+
+LICENSE=	MIT
+LICENSE_FILE=	${WRKSRC}/LICENSE.md
+
+RUN_DEPENDS=	rubygem-activerecord70>=6.0<7.1:databases/rubygem-activerecord70 \
+		rubygem-trilogy>=2.4.0:databases/rubygem-trilogy
+
+USES=		gem
+
+NO_ARCH=	yes
+
+.include <bsd.port.mk>
diff --git a/databases/rubygem-activerecord-trilogy-adapter/distinfo b/databases/rubygem-activerecord-trilogy-adapter/distinfo
new file mode 100644
index 000000000000..2056f734dbf7
--- /dev/null
+++ b/databases/rubygem-activerecord-trilogy-adapter/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1697463034
+SHA256 (rubygem/activerecord-trilogy-adapter-3.1.2.gem) = 6ab05aea764e98e265d31a0c2c1c81ae8dc8914bdf82b3f0dfa53f66c2fda469
+SIZE (rubygem/activerecord-trilogy-adapter-3.1.2.gem) = 11776
diff --git a/databases/rubygem-activerecord-trilogy-adapter/pkg-descr b/databases/rubygem-activerecord-trilogy-adapter/pkg-descr
new file mode 100644
index 000000000000..4e80f283ecf5
--- /dev/null
+++ b/databases/rubygem-activerecord-trilogy-adapter/pkg-descr
@@ -0,0 +1,3 @@
+Trilogy Adapter is a Ruby on Rails Active Record database adapter for Trilogy, a
+client library for MySQL-compatible database servers, designed for performance,
+flexibility, and ease of embedding.
diff --git a/databases/rubygem-activerecord4/Makefile b/databases/rubygem-activerecord4/Makefile
index 1972c1bf5d16..f48e5e8c27ef 100644
--- a/databases/rubygem-activerecord4/Makefile
+++ b/databases/rubygem-activerecord4/Makefile
@@ -1,5 +1,3 @@
-# Created by: Johannes Meixner <johannes@perceivon.net>
-
 PORTNAME=	activerecord
 PORTVERSION=	4.2.11.3
 CATEGORIES=	databases rubygems
@@ -8,6 +6,7 @@ PKGNAMESUFFIX=	4
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Object-relational mapping layer for Rails MVC Framework
+WWW=		https://github.com/rails/rails/tree/main/activerecord
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/MIT-LICENSE
@@ -17,7 +16,6 @@ RUN_DEPENDS=	rubygem-activemodel4>=${PORTVERSION}:databases/rubygem-activemodel4
 		rubygem-arel6>=6.0<7:databases/rubygem-arel6
 
 USES=		gem
-USE_RUBY=	yes
 
 NO_ARCH=	yes
 
diff --git a/databases/rubygem-activerecord4/pkg-descr b/databases/rubygem-activerecord4/pkg-descr
index 29c7987b2296..afdce63dcd89 100644
--- a/databases/rubygem-activerecord4/pkg-descr
+++ b/databases/rubygem-activerecord4/pkg-descr
@@ -10,5 +10,4 @@ names to establish mappings between respective database tables and foreign key
 columns. Although these mappings can be defined explicitly, it's recommended to
 follow naming conventions, especially when getting started with the library.
 
-WWW: https://rubyonrails.org/
-WWW: https://github.com/rails/rails/tree/master/activerecord
+See also: https://rubyonrails.org/
diff --git a/databases/rubygem-activerecord5/Makefile b/databases/rubygem-activerecord5/Makefile
index 3712204a4b28..e8c87824be7a 100644
--- a/databases/rubygem-activerecord5/Makefile
+++ b/databases/rubygem-activerecord5/Makefile
@@ -1,5 +1,3 @@
-# Created by: Johannes Meixner <johannes@perceivon.net>
-
 PORTNAME=	activerecord
 PORTVERSION=	5.1.7
 CATEGORIES=	databases rubygems
@@ -8,6 +6,7 @@ PKGNAMESUFFIX=	5
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Object-relational mapping layer for Rails MVC Framework
+WWW=		https://github.com/rails/rails/tree/main/activerecord
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/MIT-LICENSE
@@ -17,7 +16,6 @@ RUN_DEPENDS=	rubygem-activemodel5>=${PORTVERSION}:databases/rubygem-activemodel5
 		rubygem-arel8>=8.0,1<9,1:databases/rubygem-arel8
 
 USES=		gem
-USE_RUBY=	yes
 
 NO_ARCH=	yes
 
diff --git a/databases/rubygem-activerecord5/pkg-descr b/databases/rubygem-activerecord5/pkg-descr
index 29c7987b2296..afdce63dcd89 100644
--- a/databases/rubygem-activerecord5/pkg-descr
+++ b/databases/rubygem-activerecord5/pkg-descr
@@ -10,5 +10,4 @@ names to establish mappings between respective database tables and foreign key
 columns. Although these mappings can be defined explicitly, it's recommended to
 follow naming conventions, especially when getting started with the library.
 
-WWW: https://rubyonrails.org/
-WWW: https://github.com/rails/rails/tree/master/activerecord
+See also: https://rubyonrails.org/
diff --git a/databases/rubygem-activerecord50/Makefile b/databases/rubygem-activerecord50/Makefile
index 29fd36671db2..741068982ef5 100644
--- a/databases/rubygem-activerecord50/Makefile
+++ b/databases/rubygem-activerecord50/Makefile
@@ -1,5 +1,3 @@
-# Created by: Johannes Meixner <johannes@perceivon.net>
-
 PORTNAME=	activerecord
 PORTVERSION=	5.0.7.2
 CATEGORIES=	databases rubygems
@@ -8,6 +6,7 @@ PKGNAMESUFFIX=	50
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Object-relational mapping layer for Rails MVC Framework
+WWW=		https://github.com/rails/rails/tree/main/activerecord
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/MIT-LICENSE
@@ -17,7 +16,6 @@ RUN_DEPENDS=	rubygem-activemodel50>=${PORTVERSION}:databases/rubygem-activemodel
 		rubygem-arel7>=7.0,1<8,1:databases/rubygem-arel7
 
 USES=		gem
-USE_RUBY=	yes
 
 NO_ARCH=	yes
 
diff --git a/databases/rubygem-activerecord50/pkg-descr b/databases/rubygem-activerecord50/pkg-descr
index 29c7987b2296..afdce63dcd89 100644
--- a/databases/rubygem-activerecord50/pkg-descr
+++ b/databases/rubygem-activerecord50/pkg-descr
@@ -10,5 +10,4 @@ names to establish mappings between respective database tables and foreign key
 columns. Although these mappings can be defined explicitly, it's recommended to
 follow naming conventions, especially when getting started with the library.
 
-WWW: https://rubyonrails.org/
-WWW: https://github.com/rails/rails/tree/master/activerecord
+See also: https://rubyonrails.org/
diff --git a/databases/rubygem-activerecord52/Makefile b/databases/rubygem-activerecord52/Makefile
index 198c834efe06..c2bd3064097e 100644
--- a/databases/rubygem-activerecord52/Makefile
+++ b/databases/rubygem-activerecord52/Makefile
@@ -1,13 +1,12 @@
-# Created by: Johannes Meixner <johannes@perceivon.net>
-
 PORTNAME=	activerecord
-PORTVERSION=	5.2.6
+PORTVERSION=	5.2.8.1
 CATEGORIES=	databases rubygems
 MASTER_SITES=	RG
 PKGNAMESUFFIX=	52
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Object-relational mapping layer for Rails MVC Framework
+WWW=		https://github.com/rails/rails/tree/main/activerecord
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/MIT-LICENSE
@@ -17,7 +16,6 @@ RUN_DEPENDS=	rubygem-activemodel52>=${PORTVERSION}:databases/rubygem-activemodel
 		rubygem-arel>=9.0:databases/rubygem-arel
 
 USES=		gem
-USE_RUBY=	yes
 
 NO_ARCH=	yes
 
diff --git a/databases/rubygem-activerecord52/distinfo b/databases/rubygem-activerecord52/distinfo
index e47542ae97a7..38444a680643 100644
--- a/databases/rubygem-activerecord52/distinfo
+++ b/databases/rubygem-activerecord52/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1620298696
-SHA256 (rubygem/activerecord-5.2.6.gem) = ecbb022ce4b00c95323ce3bd8eedbd4d98e88497efb6d0c637b4f60759b41817
-SIZE (rubygem/activerecord-5.2.6.gem) = 358400
+TIMESTAMP = 1657835509
+SHA256 (rubygem/activerecord-5.2.8.1.gem) = 0a288fe88b1032aa688dd9192f4ec3ac3315efc7e09fdce9b4c510bc1bc7684a
+SIZE (rubygem/activerecord-5.2.8.1.gem) = 359424
diff --git a/databases/rubygem-activerecord52/pkg-descr b/databases/rubygem-activerecord52/pkg-descr
index 29c7987b2296..afdce63dcd89 100644
--- a/databases/rubygem-activerecord52/pkg-descr
+++ b/databases/rubygem-activerecord52/pkg-descr
@@ -10,5 +10,4 @@ names to establish mappings between respective database tables and foreign key
 columns. Although these mappings can be defined explicitly, it's recommended to
 follow naming conventions, especially when getting started with the library.
 
-WWW: https://rubyonrails.org/
-WWW: https://github.com/rails/rails/tree/master/activerecord
+See also: https://rubyonrails.org/
diff --git a/databases/rubygem-activerecord60/Makefile b/databases/rubygem-activerecord60/Makefile
index e6c61184c914..a8e2d36d5807 100644
--- a/databases/rubygem-activerecord60/Makefile
+++ b/databases/rubygem-activerecord60/Makefile
@@ -1,22 +1,21 @@
-# Created by: Johannes Meixner <johannes@perceivon.net>
-
 PORTNAME=	activerecord
-PORTVERSION=	6.0.3.7
+PORTVERSION=	6.0.6.1
 CATEGORIES=	databases rubygems
 MASTER_SITES=	RG
 PKGNAMESUFFIX=	60
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Object-relational mapping layer for Rails MVC Framework
+WWW=		https://github.com/rails/rails/tree/main/activerecord \
+		https://rubyonrails.org/
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/MIT-LICENSE
 
-RUN_DEPENDS=	rubygem-activemodel60>=${PORTVERSION}:databases/rubygem-activemodel60 \
-		rubygem-activesupport60>=${PORTVERSION}:devel/rubygem-activesupport60
+RUN_DEPENDS=	rubygem-activemodel60>=${PORTVERSION}<${PORTVERSION}_99:databases/rubygem-activemodel60 \
+		rubygem-activesupport60>=${PORTVERSION}<${PORTVERSION}_99:devel/rubygem-activesupport60
 
 USES=		gem
-USE_RUBY=	yes
 
 NO_ARCH=	yes
 
diff --git a/databases/rubygem-activerecord60/distinfo b/databases/rubygem-activerecord60/distinfo
index 4fd9b9d2c907..3eb93a49cd2a 100644
--- a/databases/rubygem-activerecord60/distinfo
+++ b/databases/rubygem-activerecord60/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1620298718
-SHA256 (rubygem/activerecord-6.0.3.7.gem) = 515f9e1fb3de980c1932e302b3fd4e403e6271fa5bd9155760225e920dcfa179
-SIZE (rubygem/activerecord-6.0.3.7.gem) = 407552
+TIMESTAMP = 1675191911
+SHA256 (rubygem/activerecord-6.0.6.1.gem) = be387b7c8997ea5373d42bf56d2789914a742b67357701677d769ce8a31ba139
+SIZE (rubygem/activerecord-6.0.6.1.gem) = 412160
diff --git a/databases/rubygem-activerecord60/pkg-descr b/databases/rubygem-activerecord60/pkg-descr
index 29c7987b2296..2ec976f87967 100644
--- a/databases/rubygem-activerecord60/pkg-descr
+++ b/databases/rubygem-activerecord60/pkg-descr
@@ -9,6 +9,3 @@ Active Record relies heavily on naming in that it uses class and association
 names to establish mappings between respective database tables and foreign key
 columns. Although these mappings can be defined explicitly, it's recommended to
 follow naming conventions, especially when getting started with the library.
-
-WWW: https://rubyonrails.org/
-WWW: https://github.com/rails/rails/tree/master/activerecord
diff --git a/databases/rubygem-activerecord61/Makefile b/databases/rubygem-activerecord61/Makefile
index 7b0a60352f42..9ed76ad8e507 100644
--- a/databases/rubygem-activerecord61/Makefile
+++ b/databases/rubygem-activerecord61/Makefile
@@ -1,22 +1,21 @@
-# Created by: Johannes Meixner <johannes@perceivon.net>
-
 PORTNAME=	activerecord
-PORTVERSION=	6.1.3.2
+PORTVERSION=	6.1.7.7
 CATEGORIES=	databases rubygems
 MASTER_SITES=	RG
 PKGNAMESUFFIX=	61
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Object-relational mapping layer for Rails MVC Framework
+WWW=		https://github.com/rails/rails/tree/main/activerecord \
+		https://rubyonrails.org/
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/MIT-LICENSE
 
-RUN_DEPENDS=	rubygem-activemodel61>=${PORTVERSION}:databases/rubygem-activemodel61 \
-		rubygem-activesupport61>=${PORTVERSION}:devel/rubygem-activesupport61
+RUN_DEPENDS=	rubygem-activemodel61>=${PORTVERSION}<${PORTVERSION}_99:databases/rubygem-activemodel61 \
+		rubygem-activesupport61>=${PORTVERSION}<${PORTVERSION}_99:devel/rubygem-activesupport61
 
 USES=		gem
-USE_RUBY=	yes
 
 NO_ARCH=	yes
 
diff --git a/databases/rubygem-activerecord61/distinfo b/databases/rubygem-activerecord61/distinfo
index f4d48404d94b..7eb347bf55c6 100644
--- a/databases/rubygem-activerecord61/distinfo
+++ b/databases/rubygem-activerecord61/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1620298744
-SHA256 (rubygem/activerecord-6.1.3.2.gem) = c8400e75c1caa43aefcc6dd1d21c427030f4190ee606931ff8f97da12a46e539
-SIZE (rubygem/activerecord-6.1.3.2.gem) = 429056
+TIMESTAMP = 1709390996
+SHA256 (rubygem/activerecord-6.1.7.7.gem) = d6626189763fe9fdb02169f9aa114fdfdcf74196e22ed5a81853f09dfdabfe63
+SIZE (rubygem/activerecord-6.1.7.7.gem) = 434176
diff --git a/databases/rubygem-activerecord61/pkg-descr b/databases/rubygem-activerecord61/pkg-descr
index 29c7987b2296..2ec976f87967 100644
--- a/databases/rubygem-activerecord61/pkg-descr
+++ b/databases/rubygem-activerecord61/pkg-descr
@@ -9,6 +9,3 @@ Active Record relies heavily on naming in that it uses class and association
 names to establish mappings between respective database tables and foreign key
 columns. Although these mappings can be defined explicitly, it's recommended to
 follow naming conventions, especially when getting started with the library.
-
-WWW: https://rubyonrails.org/
-WWW: https://github.com/rails/rails/tree/master/activerecord
diff --git a/databases/rubygem-activerecord70/Makefile b/databases/rubygem-activerecord70/Makefile
new file mode 100644
index 000000000000..12d2144b3373
--- /dev/null
+++ b/databases/rubygem-activerecord70/Makefile
@@ -0,0 +1,24 @@
+PORTNAME=	activerecord
+PORTVERSION=	7.0.8.1
+CATEGORIES=	databases rubygems
+MASTER_SITES=	RG
+PKGNAMESUFFIX=	70
+
+MAINTAINER=	sunpoet@FreeBSD.org
+COMMENT=	Object-relational mapping layer for Rails MVC Framework
+WWW=		https://github.com/rails/rails/tree/main/activerecord \
+		https://rubyonrails.org/
+
+LICENSE=	MIT
+LICENSE_FILE=	${WRKSRC}/MIT-LICENSE
+
+RUN_DEPENDS=	rubygem-activemodel70>=${PORTVERSION}<${PORTVERSION}_99:databases/rubygem-activemodel70 \
+		rubygem-activesupport70>=${PORTVERSION}<${PORTVERSION}_99:devel/rubygem-activesupport70
+
+USES=		gem
+
+NO_ARCH=	yes
+
+PORTSCOUT=	limit:^7\.0\.
+
+.include <bsd.port.mk>
diff --git a/databases/rubygem-activerecord70/distinfo b/databases/rubygem-activerecord70/distinfo
new file mode 100644
index 000000000000..2d27aaa05a4d
--- /dev/null
+++ b/databases/rubygem-activerecord70/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1709391022
+SHA256 (rubygem/activerecord-7.0.8.1.gem) = 8e5dfbad90638944fc99b64337dffa729b1aaf2cd38ea624a08dcd9259f09366
+SIZE (rubygem/activerecord-7.0.8.1.gem) = 480256
diff --git a/databases/rubygem-activerecord70/pkg-descr b/databases/rubygem-activerecord70/pkg-descr
new file mode 100644
index 000000000000..2ec976f87967
--- /dev/null
+++ b/databases/rubygem-activerecord70/pkg-descr
@@ -0,0 +1,11 @@
+Active Record connects classes to relational database tables to establish an
+almost zero-configuration persistence layer for applications. The library
+provides a base class that, when subclassed, sets up a mapping between the new
+class and an existing table in the database. In the context of an application,
+these classes are commonly referred to as models. Models can also be connected
+to other models; this is done by defining associations.
+
+Active Record relies heavily on naming in that it uses class and association
+names to establish mappings between respective database tables and foreign key
+columns. Although these mappings can be defined explicitly, it's recommended to
+follow naming conventions, especially when getting started with the library.
diff --git a/databases/rubygem-activerecord71/Makefile b/databases/rubygem-activerecord71/Makefile
new file mode 100644
index 000000000000..c2c7e61c8007
--- /dev/null
+++ b/databases/rubygem-activerecord71/Makefile
@@ -0,0 +1,25 @@
+PORTNAME=	activerecord
+PORTVERSION=	7.1.3.2
+CATEGORIES=	databases rubygems
+MASTER_SITES=	RG
+PKGNAMESUFFIX=	71
+
+MAINTAINER=	sunpoet@FreeBSD.org
+COMMENT=	Object-relational mapping layer for Rails MVC Framework
+WWW=		https://github.com/rails/rails/tree/main/activerecord \
+		https://rubyonrails.org/
+
+LICENSE=	MIT
+LICENSE_FILE=	${WRKSRC}/MIT-LICENSE
+
+RUN_DEPENDS=	rubygem-activemodel71>=${PORTVERSION}<${PORTVERSION}_99:databases/rubygem-activemodel71 \
+		rubygem-activesupport71>=${PORTVERSION}<${PORTVERSION}_99:devel/rubygem-activesupport71 \
+		rubygem-timeout>=0.4.0:devel/rubygem-timeout
+
+USES=		gem
+
+NO_ARCH=	yes
+
+PORTSCOUT=	limit:^7\.1\.
+
+.include <bsd.port.mk>
diff --git a/databases/rubygem-activerecord71/distinfo b/databases/rubygem-activerecord71/distinfo
new file mode 100644
index 000000000000..6b9260f4ef0b
--- /dev/null
+++ b/databases/rubygem-activerecord71/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1709391048
+SHA256 (rubygem/activerecord-7.1.3.2.gem) = 4872900c3340948e2fc92ea08397034eaacd8cec1760ed7704975a116cc78173
+SIZE (rubygem/activerecord-7.1.3.2.gem) = 544256
diff --git a/databases/rubygem-activerecord71/pkg-descr b/databases/rubygem-activerecord71/pkg-descr
new file mode 100644
index 000000000000..2ec976f87967
--- /dev/null
+++ b/databases/rubygem-activerecord71/pkg-descr
@@ -0,0 +1,11 @@
+Active Record connects classes to relational database tables to establish an
+almost zero-configuration persistence layer for applications. The library
+provides a base class that, when subclassed, sets up a mapping between the new
+class and an existing table in the database. In the context of an application,
+these classes are commonly referred to as models. Models can also be connected
+to other models; this is done by defining associations.
+
+Active Record relies heavily on naming in that it uses class and association
+names to establish mappings between respective database tables and foreign key
+columns. Although these mappings can be defined explicitly, it's recommended to
+follow naming conventions, especially when getting started with the library.
diff --git a/databases/rubygem-after_commit_queue/Makefile b/databases/rubygem-after_commit_queue/Makefile
index 523aa820c57c..2475ac7b408e 100644
--- a/databases/rubygem-after_commit_queue/Makefile
+++ b/databases/rubygem-after_commit_queue/Makefile
@@ -4,8 +4,9 @@ PORTREVISION=	1
 CATEGORIES=	databases rubygems
 MASTER_SITES=	RG
 
-MAINTAINER=	ports@michael-fausten.de
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Allows to run callbacks after transaction is committed
+WWW=		https://github.com/shellycloud/after_commit_queue
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/MIT-LICENSE
@@ -13,7 +14,6 @@ LICENSE_FILE=	${WRKSRC}/MIT-LICENSE
 RUN_DEPENDS?=	rubygem-activerecord4>=3.0:databases/rubygem-activerecord4
 
 NO_ARCH=	yes
-USE_RUBY=	yes
 USES=		gem
 
 .include <bsd.port.mk>
diff --git a/databases/rubygem-after_commit_queue/pkg-descr b/databases/rubygem-after_commit_queue/pkg-descr
index f46555d57c79..418a6ebff332 100644
--- a/databases/rubygem-after_commit_queue/pkg-descr
+++ b/databases/rubygem-after_commit_queue/pkg-descr
@@ -1,3 +1 @@
 Plugin for running methods on ActiveRecord models after record is committed
-
-WWW: https://github.com/shellycloud/after_commit_queue
diff --git a/databases/rubygem-amalgalite/Makefile b/databases/rubygem-amalgalite/Makefile
index 1f6eaa6f0e95..53bd203b6e56 100644
--- a/databases/rubygem-amalgalite/Makefile
+++ b/databases/rubygem-amalgalite/Makefile
@@ -1,12 +1,11 @@
-# Created by: Eric Freeman <freebsdports@chillibear.com>
-
 PORTNAME=	amalgalite
-PORTVERSION=	1.7.0
+PORTVERSION=	1.9.1
 CATEGORIES=	databases rubygems
 MASTER_SITES=	RG
 
 MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	Embeds the SQLite database engine in a Ruby extension
+WWW=		https://github.com/copiousfreetime/amalgalite
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
@@ -14,7 +13,6 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 RUN_DEPENDS=	rubygem-arrayfields>=4.9<5:devel/rubygem-arrayfields
 
 USES=		gem
-USE_RUBY=	yes
 
 PLIST_FILES=	bin/amalgalite-pack
 
diff --git a/databases/rubygem-amalgalite/distinfo b/databases/rubygem-amalgalite/distinfo
index 27bb9abf49e3..f0541c284082 100644
--- a/databases/rubygem-amalgalite/distinfo
+++ b/databases/rubygem-amalgalite/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1624630244
-SHA256 (rubygem/amalgalite-1.7.0.gem) = cee357bbaa42baa4a9e4dd383257db0ef8d0d98794f6be1917c122642c9a2296
-SIZE (rubygem/amalgalite-1.7.0.gem) = 2393088
+TIMESTAMP = 1682903248
+SHA256 (rubygem/amalgalite-1.9.1.gem) = 574c6cdd7ea5dd884d410f9013cb7ef74d22299f22443be2e1bb411175a50507
+SIZE (rubygem/amalgalite-1.9.1.gem) = 2527744
diff --git a/databases/rubygem-amalgalite/pkg-descr b/databases/rubygem-amalgalite/pkg-descr
index f3a772da52ee..4a03b88c90b0 100644
--- a/databases/rubygem-amalgalite/pkg-descr
+++ b/databases/rubygem-amalgalite/pkg-descr
@@ -1,4 +1,2 @@
 Amalgalite embeds the SQLite database engine in a ruby extension. There is no
 need to install SQLite separately.
-
-WWW: https://github.com/copiousfreetime/amalgalite
diff --git a/databases/rubygem-arel-helpers/Makefile b/databases/rubygem-arel-helpers/Makefile
index ffcf0d7d82bd..ff99cf3127bf 100644
--- a/databases/rubygem-arel-helpers/Makefile
+++ b/databases/rubygem-arel-helpers/Makefile
@@ -1,17 +1,18 @@
 PORTNAME=	arel-helpers
-PORTVERSION=	2.12.1
+PORTVERSION=	2.14.0
+PORTREVISION=	1
 CATEGORIES=	databases rubygems
 MASTER_SITES=	RG
 
 MAINTAINER=	antoine@FreeBSD.org
 COMMENT=	Helpers to construct database queries with ActiveRecord and Arel
+WWW=		https://github.com/camertron/arel-helpers
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-activerecord52>=3.1.0:databases/rubygem-activerecord52
+RUN_DEPENDS=	rubygem-activerecord70>=7.0:databases/rubygem-activerecord70
 
 USES=		gem
-USE_RUBY=	yes
 
 NO_ARCH=	yes
 
diff --git a/databases/rubygem-arel-helpers/distinfo b/databases/rubygem-arel-helpers/distinfo
index 1b724858f218..bb05af586519 100644
--- a/databases/rubygem-arel-helpers/distinfo
+++ b/databases/rubygem-arel-helpers/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1632081789
-SHA256 (rubygem/arel-helpers-2.12.1.gem) = 8b1119e952ef7b6588f34e81f77600047b21154ad9c2555597afd6de4d7a639c
-SIZE (rubygem/arel-helpers-2.12.1.gem) = 16896
+TIMESTAMP = 1652194279
+SHA256 (rubygem/arel-helpers-2.14.0.gem) = eabf93a16d4b517f59b29d2fb59998b146b1488694c9d30dddd47ae938f624ac
+SIZE (rubygem/arel-helpers-2.14.0.gem) = 12800
diff --git a/databases/rubygem-arel-helpers/pkg-descr b/databases/rubygem-arel-helpers/pkg-descr
index edd801b6a68f..05f7f9206667 100644
--- a/databases/rubygem-arel-helpers/pkg-descr
+++ b/databases/rubygem-arel-helpers/pkg-descr
@@ -1,3 +1 @@
 Useful tools to help construct database queries with ActiveRecord and Arel.
-
-WWW: https://github.com/camertron/arel-helpers
diff --git a/databases/rubygem-arel/Makefile b/databases/rubygem-arel/Makefile
index 53156f6aa701..05d8b9c4a99c 100644
--- a/databases/rubygem-arel/Makefile
+++ b/databases/rubygem-arel/Makefile
@@ -6,12 +6,12 @@ MASTER_SITES=	RG
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Relational Algebra for Ruby
+WWW=		https://github.com/rails/arel
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/MIT-LICENSE.txt
 
 USES=		gem
-USE_RUBY=	yes
 
 NO_ARCH=	yes
 
diff --git a/databases/rubygem-arel/pkg-descr b/databases/rubygem-arel/pkg-descr
index a033bd026be1..c7335e5e5664 100644
--- a/databases/rubygem-arel/pkg-descr
+++ b/databases/rubygem-arel/pkg-descr
@@ -2,5 +2,3 @@ A toolkit for building modeling frameworks like Active Record and
 Active Resource. Rich support for attributes, callbacks,
 validations, observers, serialization, internationalization,
 and testing.
-
-WWW: https://github.com/rails/arel
diff --git a/databases/rubygem-arel6/Makefile b/databases/rubygem-arel6/Makefile
index bb3ad2ef42b4..59513e27af3e 100644
--- a/databases/rubygem-arel6/Makefile
+++ b/databases/rubygem-arel6/Makefile
@@ -6,12 +6,12 @@ PKGNAMESUFFIX=	6
 
 MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	Relational Algebra for Ruby
+WWW=		https://github.com/rails/arel
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/MIT-LICENSE.txt
 
 NO_ARCH=	yes
-USE_RUBY=	yes
 USES=		gem
 
 .include <bsd.port.mk>
diff --git a/databases/rubygem-arel6/pkg-descr b/databases/rubygem-arel6/pkg-descr
index a033bd026be1..c7335e5e5664 100644
--- a/databases/rubygem-arel6/pkg-descr
+++ b/databases/rubygem-arel6/pkg-descr
@@ -2,5 +2,3 @@ A toolkit for building modeling frameworks like Active Record and
 Active Resource. Rich support for attributes, callbacks,
 validations, observers, serialization, internationalization,
 and testing.
-
-WWW: https://github.com/rails/arel
diff --git a/databases/rubygem-arel7/Makefile b/databases/rubygem-arel7/Makefile
index 1719e9721161..38a20d5fb6ae 100644
--- a/databases/rubygem-arel7/Makefile
+++ b/databases/rubygem-arel7/Makefile
@@ -7,12 +7,12 @@ PKGNAMESUFFIX=	7
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Relational Algebra for Ruby
+WWW=		https://github.com/rails/arel
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/MIT-LICENSE.txt
 
 USES=		gem
-USE_RUBY=	yes
 
 NO_ARCH=	yes
 
diff --git a/databases/rubygem-arel7/pkg-descr b/databases/rubygem-arel7/pkg-descr
index a033bd026be1..c7335e5e5664 100644
--- a/databases/rubygem-arel7/pkg-descr
+++ b/databases/rubygem-arel7/pkg-descr
@@ -2,5 +2,3 @@ A toolkit for building modeling frameworks like Active Record and
 Active Resource. Rich support for attributes, callbacks,
 validations, observers, serialization, internationalization,
 and testing.
-
-WWW: https://github.com/rails/arel
diff --git a/databases/rubygem-arel8/Makefile b/databases/rubygem-arel8/Makefile
index b6f7a8e04088..f9748ab0e436 100644
--- a/databases/rubygem-arel8/Makefile
+++ b/databases/rubygem-arel8/Makefile
@@ -7,12 +7,12 @@ PKGNAMESUFFIX=	8
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Relational Algebra for Ruby
+WWW=		https://github.com/rails/arel
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/MIT-LICENSE.txt
 
 USES=		gem
-USE_RUBY=	yes
 
 NO_ARCH=	yes
 
diff --git a/databases/rubygem-arel8/pkg-descr b/databases/rubygem-arel8/pkg-descr
index a033bd026be1..c7335e5e5664 100644
--- a/databases/rubygem-arel8/pkg-descr
+++ b/databases/rubygem-arel8/pkg-descr
@@ -2,5 +2,3 @@ A toolkit for building modeling frameworks like Active Record and
 Active Resource. Rich support for attributes, callbacks,
 validations, observers, serialization, internationalization,
 and testing.
-
-WWW: https://github.com/rails/arel
diff --git a/databases/rubygem-attr_json/Makefile b/databases/rubygem-attr_json/Makefile
new file mode 100644
index 000000000000..f44f81cacb72
--- /dev/null
+++ b/databases/rubygem-attr_json/Makefile
@@ -0,0 +1,19 @@
+PORTNAME=	attr_json
+PORTVERSION=	2.3.0
+CATEGORIES=	databases rubygems
+MASTER_SITES=	RG
+
+MAINTAINER=	sunpoet@FreeBSD.org
+COMMENT=	Serialized json-hash-backed ActiveRecord attributes
+WWW=		https://github.com/jrochkind/attr_json
+
+LICENSE=	MIT
+LICENSE_FILE=	${WRKSRC}/LICENSE.txt
+
+USES=		gem
+
+RUN_DEPENDS=	rubygem-activerecord70>=6.0.0<7.2:databases/rubygem-activerecord70
+
+NO_ARCH=	yes
+
+.include <bsd.port.mk>
diff --git a/databases/rubygem-attr_json/distinfo b/databases/rubygem-attr_json/distinfo
new file mode 100644
index 000000000000..1ddd46ecfcc7
--- /dev/null
+++ b/databases/rubygem-attr_json/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1702028178
+SHA256 (rubygem/attr_json-2.3.0.gem) = 70ac3d9028fd3343281199311fdf37759d357a7262b84bbbf06c4bb690260b41
+SIZE (rubygem/attr_json-2.3.0.gem) = 49152
diff --git a/databases/rubygem-attr_json/pkg-descr b/databases/rubygem-attr_json/pkg-descr
new file mode 100644
index 000000000000..e8013e957921
--- /dev/null
+++ b/databases/rubygem-attr_json/pkg-descr
@@ -0,0 +1,10 @@
+ActiveRecord attributes stored serialized in a json column, super smooth.
+
+Typed and cast like Active Record. Supporting nested models, dirty tracking,
+some querying (with postgres jsonb contains), and working smoothy with form
+builders.
+
+Use your database as a typed object store via ActiveRecord, in the same models
+right next to ordinary ActiveRecord column-backed attributes and associations.
+Your json-serialized attr_json attributes use as much of the existing
+ActiveRecord architecture as we can.
diff --git a/databases/rubygem-awesome_nested_set/Makefile b/databases/rubygem-awesome_nested_set/Makefile
index 088da584486a..4e94980ca00c 100644
--- a/databases/rubygem-awesome_nested_set/Makefile
+++ b/databases/rubygem-awesome_nested_set/Makefile
@@ -1,20 +1,18 @@
-# Created by: Steve Wills <swills@freebsd.org>
-
 PORTNAME=	awesome_nested_set
-PORTVERSION=	3.4.0
+PORTVERSION=	3.6.0
 CATEGORIES=	databases rubygems
 MASTER_SITES=	RG
 
 MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	Nested set implementation for Active Record
+WWW=		https://github.com/collectiveidea/awesome_nested_set
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/MIT-LICENSE
 
-RUN_DEPENDS=	rubygem-activerecord4>=4.0.0<7.0:databases/rubygem-activerecord4
+RUN_DEPENDS=	rubygem-activerecord4>=4.0.0<7.2:databases/rubygem-activerecord4
 
 USES=		gem
-USE_RUBY=	yes
 
 NO_ARCH=	yes
 
diff --git a/databases/rubygem-awesome_nested_set/distinfo b/databases/rubygem-awesome_nested_set/distinfo
index 4410eea77573..564ddf07a181 100644
--- a/databases/rubygem-awesome_nested_set/distinfo
+++ b/databases/rubygem-awesome_nested_set/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1624630246
-SHA256 (rubygem/awesome_nested_set-3.4.0.gem) = d95478b94451115ac10ccf44c34075458c550ce8af9fb1806e9323df0272ef19
-SIZE (rubygem/awesome_nested_set-3.4.0.gem) = 25600
+TIMESTAMP = 1696753766
+SHA256 (rubygem/awesome_nested_set-3.6.0.gem) = ce9be0a79204ac51856a4568ae67d3c0268e4789984e33871d94c5f85a76eff3
+SIZE (rubygem/awesome_nested_set-3.6.0.gem) = 21504
diff --git a/databases/rubygem-awesome_nested_set/pkg-descr b/databases/rubygem-awesome_nested_set/pkg-descr
index 9a670f422a0d..c822afa239d7 100644
--- a/databases/rubygem-awesome_nested_set/pkg-descr
+++ b/databases/rubygem-awesome_nested_set/pkg-descr
@@ -1,3 +1 @@
 An awesome nested set implementation for Active Record
-
-WWW: https://github.com/collectiveidea/awesome_nested_set
diff --git a/databases/rubygem-bdb1/Makefile b/databases/rubygem-bdb1/Makefile
index f3f770dd6d02..672138cb9bda 100644
--- a/databases/rubygem-bdb1/Makefile
+++ b/databases/rubygem-bdb1/Makefile
@@ -1,16 +1,16 @@
 PORTNAME=	bdb1
 PORTVERSION=	0.2.5
-PORTREVISION=	1
+PORTREVISION=	4
 CATEGORIES=	databases rubygems
 MASTER_SITES=	RG
 
 MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	Ruby interface to Berkeley DB revision 1.8x with full feature support
+WWW=		https://github.com/knu/ruby-bdb1
 
 LICENSE=	BSD2CLAUSE RUBY
 LICENSE_COMB=	dual
 
-USE_RUBY=	yes
 USES=		gem shebangfix
 SHEBANG_FILES=	examples/*.rb
 
diff --git a/databases/rubygem-bdb1/files/patch-ext_bdb1_bdb1.c b/databases/rubygem-bdb1/files/patch-ext_bdb1_bdb1.c
index 64290a2c98bd..051b6e1051ed 100644
--- a/databases/rubygem-bdb1/files/patch-ext_bdb1_bdb1.c
+++ b/databases/rubygem-bdb1/files/patch-ext_bdb1_bdb1.c
@@ -1,6 +1,127 @@
---- ext/bdb1/bdb1.c.orig	2016-01-18 21:34:35 UTC
+--- ext/bdb1/bdb1.c.orig	2024-03-25 10:10:37 UTC
 +++ ext/bdb1/bdb1.c
-@@ -752,15 +752,15 @@ bdb1_s_alloc(VALUE obj)
+@@ -115,7 +115,6 @@ VALUE
+ bdb1_test_load(VALUE obj, const DBT *a, int type_kv)
+ {
+     VALUE res;
+-    int i;
+     bdb1_DB *dbst;
+ 
+     Data_Get_Struct(obj, bdb1_DB, dbst);
+@@ -138,7 +137,7 @@ bdb1_test_load(VALUE obj, const DBT *a, int type_kv)
+ 	    res = Qnil;
+ 	}
+ 	else {
+-	    res = rb_tainted_str_new(a->data, a->size);
++	    res = rb_str_new(a->data, a->size);
+ 	    if (dbst->filter[2 + type_kv]) {
+ 		if (FIXNUM_P(dbst->filter[2 + type_kv])) {
+ 		    res = rb_funcall(obj,
+@@ -230,7 +229,7 @@ bdb1_h_hash(const void *bytes, size_t length)
+ 	rb_raise(bdb1_eFatal, "BUG : current_db not set");
+     }
+     Data_Get_Struct(obj, bdb1_DB, dbst);
+-    st = rb_tainted_str_new((char *)bytes, length);
++    st = rb_str_new((char *)bytes, length);
+     if (dbst->h_hash == 0)
+ 	res = rb_funcall(obj, id_h_hash, 1, st);
+     else
+@@ -270,7 +269,7 @@ bdb1_mark(bdb1_DB *dbst)
+ }
+ 
+ static VALUE
+-bdb1_i185_btree(VALUE obj, VALUE dbstobj)
++bdb1_i185_btree(VALUE obj, VALUE dbstobj, int _argc, const VALUE *_argv, VALUE _blockarg)
+ {
+     VALUE key, value;
+     bdb1_DB *dbst;
+@@ -323,7 +322,7 @@ bdb1_i185_btree(VALUE obj, VALUE dbstobj)
+ }
+ 
+ static VALUE
+-bdb1_i185_hash(VALUE obj, VALUE dbstobj)
++bdb1_i185_hash(VALUE obj, VALUE dbstobj, int _argc, const VALUE *_argv, VALUE _blockarg)
+ {
+     VALUE key, value;
+     bdb1_DB *dbst;
+@@ -363,7 +362,7 @@ bdb1_i185_hash(VALUE obj, VALUE dbstobj)
+ }
+ 
+ static VALUE
+-bdb1_i185_recno(VALUE obj, VALUE dbstobj)
++bdb1_i185_recno(VALUE obj, VALUE dbstobj, int _argc, const VALUE *_argv, VALUE _blockarg)
+ {
+     VALUE key, value;
+     bdb1_DB *dbst;
+@@ -379,7 +378,6 @@ bdb1_i185_recno(VALUE obj, VALUE dbstobj)
+ 	dbst->info.ri.flags = NUM2INT(value);
+     }
+     else if (strcmp(options, "set_re_delim") == 0) {
+-	int ch;
+ 	if (TYPE(value) == T_STRING) {
+ 	    str = StringValueCStr(value);
+ 	    dbst->info.ri.bval = str[0];
+@@ -396,7 +394,6 @@ bdb1_i185_recno(VALUE obj, VALUE dbstobj)
+ 	dbst->info.ri.flags |= R_FIXEDLEN;
+     }
+     else if (strcmp(options, "set_re_pad") == 0) {
+-	int ch;
+ 	if (TYPE(value) == T_STRING) {
+ 	    str = StringValueCStr(value);
+ 	    dbst->info.ri.bval = str[0];
+@@ -444,7 +441,7 @@ bdb1_load_dump(VALUE obj)
+ }
+ 
+ static VALUE
+-bdb1_i185_common(VALUE obj, VALUE dbstobj)
++bdb1_i185_common(VALUE obj, VALUE dbstobj, int _argc, const VALUE *_argv, VALUE _blockarg)
+ {
+     VALUE key, value;
+     bdb1_DB *dbst;
+@@ -682,7 +679,7 @@ bdb1_init(int argc, VALUE *argv, VALUE obj)
+ 	}
+ 	switch(dbst->type) {
+ 	case 0:
+-	    rb_iterate(rb_each, f, bdb1_i185_btree, obj);
++  	    rb_block_call(f, rb_intern("each"), 0, NULL, bdb1_i185_btree, obj);
+ 	    if (dbst->bt_compare == 0 && rb_respond_to(obj, id_bt_compare)) {
+ 		dbst->has_info = Qtrue;
+ 		dbst->options |= BDB1_BT_COMPARE;
+@@ -695,7 +692,7 @@ bdb1_init(int argc, VALUE *argv, VALUE obj)
+ 	    }
+ 	    break;
+ 	case 1:
+-	    rb_iterate(rb_each, f, bdb1_i185_hash, obj);
++  	    rb_block_call(f, rb_intern("each"), 0, NULL, bdb1_i185_hash, obj);
+ 	    if (dbst->h_hash == 0 && rb_respond_to(obj, id_h_hash)) {
+ 		dbst->has_info = Qtrue;
+ 		dbst->options |= BDB1_H_HASH;
+@@ -703,10 +700,10 @@ bdb1_init(int argc, VALUE *argv, VALUE obj)
+ 	    }
+ 	    break;
+ 	case 2:
+-	    rb_iterate(rb_each, f, bdb1_i185_recno, obj);
++  	    rb_block_call(f, rb_intern("each"), 0, NULL, bdb1_i185_recno, obj);
+ 	    break;
+ 	}
+-	rb_iterate(rb_each, f, bdb1_i185_common, obj);
++  	rb_block_call(f, rb_intern("each"), 0, NULL, bdb1_i185_common, obj);
+     }
+     if (name == NULL) oflags = O_CREAT | O_RDWR;
+     if (dbst->has_info) openinfo = &dbst->info;
+@@ -733,9 +730,11 @@ bdb1_close(VALUE obj)
+     VALUE opt;
+     bdb1_DB *dbst;
+ 
++#if defined(RUBY_SAFE_LEVEL_MAX) && RUBY_SAFE_LEVEL_MAX >= 4
+     if (!OBJ_TAINTED(obj) && rb_safe_level() >= 4) {
+ 	rb_raise(rb_eSecurityError, "Insecure: can't close the database");
+     }
++#endif
+     Data_Get_Struct(obj, bdb1_DB, dbst);
+     bdb1_i_close(dbst);
+     return Qnil;
+@@ -752,15 +751,15 @@ bdb1_s_alloc(VALUE obj)
      dbst->options |= BDB1_NOT_OPEN;
      cl = obj;
      while (cl) {
@@ -19,3 +140,151 @@
  	    dbst->type = DB_RECNO;
  	    break;
  	}
+@@ -802,7 +801,7 @@ bdb1_s_create(int argc, VALUE *argv, VALUE obj)
+ }
+ 
+ static VALUE
+-bdb1_i_create(VALUE obj, VALUE db)
++bdb1_i_create(VALUE obj, VALUE db, int _argc, const VALUE *_argv, VALUE _blockarg)
+ {
+     VALUE tmp[2];
+     tmp[0] = rb_ary_entry(obj, 0);
+@@ -826,12 +825,12 @@ bdb1_i_create(VALUE obj, VALUE db)
+ static VALUE
+ bdb1_s_aref(int argc, VALUE *argv, VALUE obj)
+ {
+-    VALUE res, tmp[2];
++    VALUE res;
+     int i;
+ 
+     res = rb_funcall2(obj, rb_intern("new"), 0, 0);
+     if (argc == 1 && TYPE(argv[0]) == T_HASH) {
+-	rb_iterate(rb_each, argv[0], bdb1_i_create, res);
++	rb_block_call(argv[0], rb_intern("each"), 0, NULL, bdb1_i_create, res);
+ 	return res;
+     }
+     if (argc % 2 != 0) {
+@@ -870,7 +869,7 @@ bdb1_s_open(int argc, VALUE *argv, VALUE obj)
+ VALUE
+ bdb1_put(int argc, VALUE *argv, VALUE obj)
+ {
+-    volatile VALUE a0 = Qnil;
++    volatile VALUE a0;
+     volatile VALUE b0 = Qnil;
+     VALUE a, b, c;
+     bdb1_DB *dbst;
+@@ -878,7 +877,9 @@ bdb1_put(int argc, VALUE *argv, VALUE obj)
+     int ret, flags;
+     db_recno_t recno;
+ 
++#if defined(RUBY_SAFE_LEVEL_MAX) && RUBY_SAFE_LEVEL_MAX >= 4
+     rb_secure(4);
++#endif
+     GetDB(obj, dbst);
+     if (rb_scan_args(argc, argv, "21", &a, &b, &c) == 3)
+         flags = NUM2INT(c);
+@@ -935,7 +936,6 @@ bdb1_get_internal(int argc, VALUE *argv, VALUE obj, VA
+     VALUE b, c;
+     bdb1_DB *dbst;
+     DBT key, data;
+-    DBT datas;
+     int flagss;
+     int ret, flags;
+     db_recno_t recno;
+@@ -994,7 +994,7 @@ bdb1_fetch(int argc, VALUE *argv, VALUE obj)
+     if (val == Qundef) {
+ 	if (rb_block_given_p()) {
+ 	    if (argc > 1) {
+-		rb_raise(rb_eArgError, "wrong # of arguments", argc);
++		rb_raise(rb_eArgError, "wrong # of arguments, %d", argc);
+ 	    }
+ 	    return rb_yield(key);
+ 	}
+@@ -1026,8 +1026,8 @@ bdb1_has_both(VALUE obj, VALUE a, VALUE b)
+     DBT keys, datas;
+     int ret, flags;
+     db_recno_t recno;
+-    volatile VALUE c = Qnil;
+-    volatile VALUE d = Qnil;
++    volatile VALUE c;
++    volatile VALUE d;
+ 
+     GetDB(obj, dbst);
+     DATA_ZERO(key);
+@@ -1071,7 +1071,9 @@ bdb1_del(VALUE obj, VALUE a)
+     db_recno_t recno;
+     volatile VALUE c = Qnil;
+ 
++#if defined(RUBY_SAFE_LEVEL_MAX) && RUBY_SAFE_LEVEL_MAX >= 4
+     rb_secure(4);
++#endif
+     GetDB(obj, dbst);
+     if (dbst->type == DB_HASH) {
+ 	rb_warning("delete can give strange result with DB_HASH");
+@@ -1090,7 +1092,7 @@ bdb1_empty(VALUE obj)
+ {
+     bdb1_DB *dbst;
+     DBT key, data;
+-    int ret, flags;
++    int ret;
+     db_recno_t recno;
+ 
+     GetDB(obj, dbst);
+@@ -1109,10 +1111,12 @@ bdb1_delete_if(VALUE obj)
+ {
+     bdb1_DB *dbst;
+     DBT key, data, save;
+-    int ret, ret1, flags;
++    int ret, flags;
+     db_recno_t recno;
+ 
++#if defined(RUBY_SAFE_LEVEL_MAX) && RUBY_SAFE_LEVEL_MAX >= 4
+     rb_secure(4);
++#endif
+     GetDB(obj, dbst);
+     INIT_RECNO(dbst, key, recno);
+     DATA_ZERO(data);
+@@ -1134,11 +1138,13 @@ VALUE
+ bdb1_clear(VALUE obj)
+ {
+     bdb1_DB *dbst;
+-    DBT key, data, save;
++    DBT key, data;
+     int ret, value, flags;
+     db_recno_t recno;
+ 
++#if defined(RUBY_SAFE_LEVEL_MAX) && RUBY_SAFE_LEVEL_MAX >= 4
+     rb_secure(4);
++#endif
+     GetDB(obj, dbst);
+     INIT_RECNO(dbst, key, recno);
+     DATA_ZERO(data);
+@@ -1360,7 +1366,7 @@ bdb1_each_kv(VALUE obj, VALUE a, VALUE result, VALUE f
+     int ret, flags;
+     db_recno_t recno;
+     VALUE k;
+-    volatile VALUE b = Qnil;
++    volatile VALUE b;
+ 
+     GetDB(obj, dbst);
+     b = test_recno(obj, &key, &recno, a);
+@@ -1536,8 +1542,10 @@ bdb1_sync(VALUE obj)
+ {
+     bdb1_DB *dbst;
+ 
++#if defined(RUBY_SAFE_LEVEL_MAX) && RUBY_SAFE_LEVEL_MAX >= 4
+     if (!OBJ_TAINTED(obj) && rb_safe_level() >= 4)
+ 	rb_raise(rb_eSecurityError, "Insecure: can't sync the database");
++#endif
+     GetDB(obj, dbst);
+     bdb1_test_error(dbst->dbp->sync(dbst->dbp, 0));
+     return Qtrue;
+@@ -1740,7 +1748,7 @@ Init_bdb1(void)
+     rb_undef_method(bdb1_cHash, "reverse_each_pair");
+     rb_undef_method(bdb1_cHash, "reverse_each");
+     bdb1_cUnknown = rb_define_class_under(bdb1_mDb, "Unknown", bdb1_cCommon);
+-    bdb1_errstr = rb_tainted_str_new(0, 0);
++    bdb1_errstr = rb_str_new(0, 0);
+     rb_global_variable(&bdb1_errstr);
+     bdb1_init_delegator();
+     bdb1_init_recnum();
diff --git a/databases/rubygem-bdb1/files/patch-ext_bdb1_delegate.c b/databases/rubygem-bdb1/files/patch-ext_bdb1_delegate.c
new file mode 100644
index 000000000000..1a12f09e4f6a
--- /dev/null
+++ b/databases/rubygem-bdb1/files/patch-ext_bdb1_delegate.c
@@ -0,0 +1,11 @@
+--- ext/bdb1/delegate.c.orig	2023-07-08 13:26:04 UTC
++++ ext/bdb1/delegate.c
+@@ -33,7 +33,7 @@ bdb1_deleg_missing(int argc, VALUE *argv, VALUE obj)
+ 
+     Data_Get_Struct(obj, struct deleg_class, delegst);
+     if (rb_block_given_p()) {
+-	res = rb_block_call(delegst->obj, id_send, argc, argv, rb_yield, 0);
++	res = rb_block_call(delegst->obj, id_send, argc, argv, (rb_block_call_func_t)rb_yield, 0);
+     }
+     else {
+ 	res = rb_funcall2(delegst->obj, id_send, argc, argv);
diff --git a/databases/rubygem-bdb1/files/patch-ext_bdb1_recnum.c b/databases/rubygem-bdb1/files/patch-ext_bdb1_recnum.c
index e9b7eb20fdcc..6f15ebe7c15b 100644
--- a/databases/rubygem-bdb1/files/patch-ext_bdb1_recnum.c
+++ b/databases/rubygem-bdb1/files/patch-ext_bdb1_recnum.c
@@ -1,6 +1,6 @@
---- ext/bdb1/recnum.c.orig
+--- ext/bdb1/recnum.c.orig	2022-05-09 10:22:04 UTC
 +++ ext/bdb1/recnum.c
-@@ -17,7 +17,7 @@
+@@ -17,7 +17,7 @@ bdb1_recnum_init(int argc, VALUE *argv, VALUE obj)
  	argc++;
      }
      rb_hash_aset(argv[argc - 1], array, INT2FIX(0));
@@ -8,4 +8,14 @@
 +    if (rb_hash_lookup2(argv[argc - 1], sarray, Qundef) != Qundef) {
  	rb_hash_aset(argv[argc - 1], sarray, INT2FIX(0));
      }
-     rb_hash_aset(argv[argc - 1], rb_str_new2("set_flags"), INT2FIX(DB_RENUMBER));
+     return bdb1_init(argc, argv, obj);
+@@ -134,7 +134,9 @@ bdb1_intern_shift_pop(VALUE obj, int depart, int len)
+     db_recno_t recno;
+     VALUE res;
+ 
++#if defined(RUBY_SAFE_LEVEL_MAX) && RUBY_SAFE_LEVEL_MAX >= 4
+     rb_secure(4);
++#endif
+     GetDB(obj, dbst);
+     INIT_RECNO(dbst, key, recno);
+     DATA_ZERO(data);
diff --git a/databases/rubygem-bdb1/pkg-descr b/databases/rubygem-bdb1/pkg-descr
index 530b0bc57bdf..f49e2651e70e 100644
--- a/databases/rubygem-bdb1/pkg-descr
+++ b/databases/rubygem-bdb1/pkg-descr
@@ -10,5 +10,3 @@ And the following interfaces:
 
 * Hash like interface - BDB1::Btree and BDB1::Hash
 * Array like interface - BDB1::Recnum(Recno)
-
-WWW: https://github.com/knu/ruby-bdb1
diff --git a/databases/rubygem-bigrecord/Makefile b/databases/rubygem-bigrecord/Makefile
index 12eb83d24bd0..45722f7f83c8 100644
--- a/databases/rubygem-bigrecord/Makefile
+++ b/databases/rubygem-bigrecord/Makefile
@@ -1,5 +1,3 @@
-# Created by: Philip M. Gollucci
-
 PORTNAME=	bigrecord
 PORTVERSION=	0.1.1
 PORTREVISION=	1
@@ -8,6 +6,7 @@ MASTER_SITES=	RG
 
 MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	Intended to work as a drop-in for Rails applications
+WWW=		http://www.bigrecord.org
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
@@ -17,7 +16,6 @@ RUN_DEPENDS=	rubygem-activerecord4>=0:databases/rubygem-activerecord4 \
 		rubygem-uuidtools>=2.0.0:devel/rubygem-uuidtools
 
 NO_ARCH=	yes
-USE_RUBY=	yes
 USES=		gem
 
 .include <bsd.port.mk>
diff --git a/databases/rubygem-bigrecord/pkg-descr b/databases/rubygem-bigrecord/pkg-descr
index 6faa54b58f22..d7a9b4edb248 100644
--- a/databases/rubygem-bigrecord/pkg-descr
+++ b/databases/rubygem-bigrecord/pkg-descr
@@ -1,4 +1,2 @@
 BigRecord is built from ActiveRecord, and intended to seamlessly integrate
 into your Ruby on Rails applications.
-
-WWW: http://www.bigrecord.org
diff --git a/databases/rubygem-brpoplpush-redis_script/Makefile b/databases/rubygem-brpoplpush-redis_script/Makefile
index 5d2b0a2a6d02..3856f0ef3c50 100644
--- a/databases/rubygem-brpoplpush-redis_script/Makefile
+++ b/databases/rubygem-brpoplpush-redis_script/Makefile
@@ -1,21 +1,19 @@
-# Created by: Po-Chuan Hsieh <sunpoet@FreeBSD.org>
-
 PORTNAME=	brpoplpush-redis_script
-PORTVERSION=	0.1.2
+PORTVERSION=	0.1.3
 CATEGORIES=	databases rubygems
 MASTER_SITES=	RG
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Bring your own LUA scripts into redis
+WWW=		https://github.com/brpoplpush/brpoplpush-redis_script
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	rubygem-concurrent-ruby>=1.0.5<2:devel/rubygem-concurrent-ruby \
-		rubygem-redis>=1.0<5.0:databases/rubygem-redis
+		rubygem-redis>=1.0<6:databases/rubygem-redis
 
 USES=		gem
-USE_RUBY=	yes
 
 NO_ARCH=	yes
 
diff --git a/databases/rubygem-brpoplpush-redis_script/distinfo b/databases/rubygem-brpoplpush-redis_script/distinfo
index 44060a0e7196..3e9667bcc0aa 100644
--- a/databases/rubygem-brpoplpush-redis_script/distinfo
+++ b/databases/rubygem-brpoplpush-redis_script/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1618320322
-SHA256 (rubygem/brpoplpush-redis_script-0.1.2.gem) = 327d5fcc608f0cb3ff96b8b0f61d3794ef5242a1d74514ab2f8353d8080a5566
-SIZE (rubygem/brpoplpush-redis_script-0.1.2.gem) = 12288
+TIMESTAMP = 1669058023
+SHA256 (rubygem/brpoplpush-redis_script-0.1.3.gem) = 3411dc086d093908bf3d3ce3923cf764238171131a7dac334d1b56ec8bfca5d9
+SIZE (rubygem/brpoplpush-redis_script-0.1.3.gem) = 12288
diff --git a/databases/rubygem-brpoplpush-redis_script/pkg-descr b/databases/rubygem-brpoplpush-redis_script/pkg-descr
index 604525dc1e75..c2e954976b2f 100644
--- a/databases/rubygem-brpoplpush-redis_script/pkg-descr
+++ b/databases/rubygem-brpoplpush-redis_script/pkg-descr
@@ -1,3 +1 @@
 Bring your own LUA scripts into redis.
-
-WWW: https://github.com/brpoplpush/brpoplpush-redis_script
diff --git a/databases/rubygem-couchrest/Makefile b/databases/rubygem-couchrest/Makefile
index 2422f5a544cf..79cea0adcf65 100644
--- a/databases/rubygem-couchrest/Makefile
+++ b/databases/rubygem-couchrest/Makefile
@@ -1,5 +1,3 @@
-# Created by: Mike Carlson (carlson39@llnl.gov)
-
 PORTNAME=	couchrest
 PORTVERSION=	2.0.1
 CATEGORIES=	databases rubygems
@@ -7,6 +5,7 @@ MASTER_SITES=	RG
 
 MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	Provides a simple interface on top of CouchDBs RESTful HTTP API
+WWW=		https://github.com/couchrest/couchrest
 
 LICENSE=	APACHE20
 
@@ -15,7 +14,6 @@ RUN_DEPENDS=	rubygem-httpclient>=2.8<3:www/rubygem-httpclient \
 		rubygem-multi_json>=1.7<2:devel/rubygem-multi_json
 
 USES=		gem
-USE_RUBY=	yes
 
 NO_ARCH=	yes
 
diff --git a/databases/rubygem-couchrest/pkg-descr b/databases/rubygem-couchrest/pkg-descr
index eb552ac82f3f..0a3434b638fd 100644
--- a/databases/rubygem-couchrest/pkg-descr
+++ b/databases/rubygem-couchrest/pkg-descr
@@ -1,4 +1,2 @@
 CouchRest provides a simple interface on top of CouchDB's RESTful HTTP API,
 as well as including some utility scripts for managing views and attachments.
-
-WWW: https://github.com/couchrest/couchrest
diff --git a/databases/rubygem-dalli/Makefile b/databases/rubygem-dalli/Makefile
index 42e5dae93401..88696d97f531 100644
--- a/databases/rubygem-dalli/Makefile
+++ b/databases/rubygem-dalli/Makefile
@@ -1,18 +1,16 @@
-# Created by: Po-Chuan Hsieh <sunpoet@FreeBSD.org>
-
 PORTNAME=	dalli
-PORTVERSION=	2.7.11
+PORTVERSION=	3.2.8
 CATEGORIES=	databases rubygems
 MASTER_SITES=	RG
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	High performance memcached client for Ruby
+WWW=		https://github.com/petergoldstein/dalli
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		gem
-USE_RUBY=	yes
 
 NO_ARCH=	yes
 
diff --git a/databases/rubygem-dalli/distinfo b/databases/rubygem-dalli/distinfo
index 1344c84a3761..b3284fdfa6d0 100644
--- a/databases/rubygem-dalli/distinfo
+++ b/databases/rubygem-dalli/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1601319720
-SHA256 (rubygem/dalli-2.7.11.gem) = c49c477fccbf494c2f2ac3f0272354064327686bfa15eae2e007855c994e232f
-SIZE (rubygem/dalli-2.7.11.gem) = 34816
+TIMESTAMP = 1708449556
+SHA256 (rubygem/dalli-3.2.8.gem) = 2e63595084d91fae2655514a02c5d4fc0f16c0799893794abe23bf628bebaaa5
+SIZE (rubygem/dalli-3.2.8.gem) = 44544
diff --git a/databases/rubygem-dalli/pkg-descr b/databases/rubygem-dalli/pkg-descr
index dc689ba98c3a..62c7bdee66a1 100644
--- a/databases/rubygem-dalli/pkg-descr
+++ b/databases/rubygem-dalli/pkg-descr
@@ -4,5 +4,3 @@ be considered a replacement for the memcache-client gem.
 
 The name is a variant of Salvador Dali for his famous painting The Persistence
 of Memory.
-
-WWW: https://github.com/petergoldstein/dalli
diff --git a/databases/rubygem-data_objects/Makefile b/databases/rubygem-data_objects/Makefile
index 96cd4a94671c..49412341c90e 100644
--- a/databases/rubygem-data_objects/Makefile
+++ b/databases/rubygem-data_objects/Makefile
@@ -1,5 +1,3 @@
-# Created by: Espen Volden aka voldern <voldern@hoeggen.net>
-
 PORTNAME=	data_objects
 PORTVERSION=	0.10.17
 CATEGORIES=	databases rubygems
@@ -7,6 +5,7 @@ MASTER_SITES=	RG
 
 MAINTAINER=	voldern@hoeggen.net
 COMMENT=	Unified Ruby API for popular databases
+WWW=		https://github.com/datamapper/do
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
@@ -14,7 +13,6 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 RUN_DEPENDS=	rubygem-addressable>=2.1:www/rubygem-addressable
 
 NO_ARCH=	yes
-USE_RUBY=	yes
 USES=		gem
 
 .include <bsd.port.mk>
diff --git a/databases/rubygem-data_objects/pkg-descr b/databases/rubygem-data_objects/pkg-descr
index 888b8ce435e8..151b4620f6fd 100644
--- a/databases/rubygem-data_objects/pkg-descr
+++ b/databases/rubygem-data_objects/pkg-descr
@@ -1,5 +1,3 @@
 The purpose of DO.rb is to rewrite existing Ruby database drivers to conform to
 a single interface.
 At present, PostgreSQL, MySQL, and SQLite adapters are available.
-
-WWW: https://github.com/datamapper/do
diff --git a/databases/rubygem-datamapper/Makefile b/databases/rubygem-datamapper/Makefile
index 47773c0816c4..2d81f04680b9 100644
--- a/databases/rubygem-datamapper/Makefile
+++ b/databases/rubygem-datamapper/Makefile
@@ -1,5 +1,3 @@
-# Created by: Martin Wilke <miwi@FreeBSD.org>
-
 PORTNAME=	datamapper
 PORTVERSION=	1.2.0
 PORTREVISION=	1
@@ -8,6 +6,7 @@ MASTER_SITES=	RG
 
 MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	Fast, thread-safe, object-relational mapper
+WWW=		http://datamapper.org
 
 LICENSE=	MIT
 
@@ -23,7 +22,6 @@ RUN_DEPENDS=	rubygem-dm-aggregates>=${PORTVERSION}:databases/rubygem-dm-aggregat
 
 NO_ARCH=	yes
 
-USE_RUBY=	yes
 USES=		gem
 
 .include <bsd.port.mk>
diff --git a/databases/rubygem-datamapper/pkg-descr b/databases/rubygem-datamapper/pkg-descr
index 02fc9a5f273f..ed77a0f02604 100644
--- a/databases/rubygem-datamapper/pkg-descr
+++ b/databases/rubygem-datamapper/pkg-descr
@@ -1,5 +1,3 @@
 DataMapper is a Object Relational Mapper written in Ruby. The goal
 is to create an ORM which is fast, thread-safe and feature-rich with
 ActiveRecord-compatibility.
-
-WWW: http://datamapper.org
diff --git a/databases/rubygem-dbd-mysql/Makefile b/databases/rubygem-dbd-mysql/Makefile
index ecd36a29c777..7bca5507fb0f 100644
--- a/databases/rubygem-dbd-mysql/Makefile
+++ b/databases/rubygem-dbd-mysql/Makefile
@@ -4,15 +4,16 @@ PORTREVISION=	1
 CATEGORIES=	databases rubygems
 MASTER_SITES=	RG
 
-MAINTAINER=	ruby@FreeBSD.org
+MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	MySQL driver for DBI-for-Ruby
+WWW=		https://github.com/dinoex/ruby-dbi
 
 LICENSE=	BSD3CLAUSE
 
 RUN_DEPENDS=	rubygem-dbi>=0:databases/rubygem-dbi \
 		rubygem-mysql>=0:databases/rubygem-mysql
 
-USE_RUBY=	yes
 USES=		gem
+IGNORE_WITH_MYSQL=	80 81
 
 .include <bsd.port.mk>
diff --git a/databases/rubygem-dbd-mysql/pkg-descr b/databases/rubygem-dbd-mysql/pkg-descr
index ec522e130851..c90c72d390b2 100644
--- a/databases/rubygem-dbd-mysql/pkg-descr
+++ b/databases/rubygem-dbd-mysql/pkg-descr
@@ -1,3 +1 @@
 This is the MySQL driver for DBI-for-Ruby.
-
-WWW: http://ruby-dbi.sourceforge.net
diff --git a/databases/rubygem-dbd-pg/Makefile b/databases/rubygem-dbd-pg/Makefile
index b2443f2b2637..8048703e6078 100644
--- a/databases/rubygem-dbd-pg/Makefile
+++ b/databases/rubygem-dbd-pg/Makefile
@@ -6,6 +6,7 @@ MASTER_SITES=	RG
 
 MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	PostgreSQL driver for DBI-for-Ruby
+WWW=		http://ruby-dbi.sourceforge.net
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
@@ -14,7 +15,6 @@ RUN_DEPENDS=	rubygem-dbi>=0.4.0:databases/rubygem-dbi \
 		rubygem-pg>=0:databases/rubygem-pg
 
 NO_ARCH=	yes
-USE_RUBY=	yes
 USES=		gem
 
 .include <bsd.port.mk>
diff --git a/databases/rubygem-dbd-pg/pkg-descr b/databases/rubygem-dbd-pg/pkg-descr
index 07de69e58599..bc302d90412e 100644
--- a/databases/rubygem-dbd-pg/pkg-descr
+++ b/databases/rubygem-dbd-pg/pkg-descr
@@ -1,3 +1 @@
 This is the PostgreSQL driver for DBI-for-Ruby.
-
-WWW: http://ruby-dbi.sourceforge.net
diff --git a/databases/rubygem-dbd-sqlite3/Makefile b/databases/rubygem-dbd-sqlite3/Makefile
index 6966c786d403..b322e97c245f 100644
--- a/databases/rubygem-dbd-sqlite3/Makefile
+++ b/databases/rubygem-dbd-sqlite3/Makefile
@@ -6,6 +6,7 @@ MASTER_SITES=	RG
 
 MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	SQLite3 driver for DBI-for-Ruby
+WWW=		http://ruby-dbi.sourceforge.net
 
 LICENSE=	BSD3CLAUSE
 
@@ -14,7 +15,6 @@ RUN_DEPENDS=	rubygem-dbi>=0.4.0:databases/rubygem-dbi \
 
 NO_ARCH=	yes
 
-USE_RUBY=	yes
 USES=		gem
 
 .include <bsd.port.mk>
diff --git a/databases/rubygem-dbd-sqlite3/pkg-descr b/databases/rubygem-dbd-sqlite3/pkg-descr
index ca74ace1f57e..a73269c19951 100644
--- a/databases/rubygem-dbd-sqlite3/pkg-descr
+++ b/databases/rubygem-dbd-sqlite3/pkg-descr
@@ -1,3 +1 @@
 This is the SQLite3 driver for DBI-for-Ruby.
-
-WWW: http://ruby-dbi.sourceforge.net
diff --git a/databases/rubygem-dbf/Makefile b/databases/rubygem-dbf/Makefile
index d1b36466fda8..50700dc3c127 100644
--- a/databases/rubygem-dbf/Makefile
+++ b/databases/rubygem-dbf/Makefile
@@ -1,21 +1,23 @@
-# Created by: Po-Chuan Hsieh <sunpoet@FreeBSD.org>
-
 PORTNAME=	dbf
-PORTVERSION=	4.1.4
+PORTVERSION=	4.3.2
 CATEGORIES=	databases rubygems
 MASTER_SITES=	RG
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Library for reading dBase, xBase, Clipper and FoxPro database files
+WWW=		https://github.com/infused/dbf
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		gem
-USE_RUBY=	yes
+
+RUN_DEPENDS=	rubygem-csv>=0:devel/rubygem-csv
 
 NO_ARCH=	yes
 
 PLIST_FILES=	bin/dbf
 
+CONFLICTS_INSTALL=	dbf # bin/dbf
+
 .include <bsd.port.mk>
diff --git a/databases/rubygem-dbf/distinfo b/databases/rubygem-dbf/distinfo
index 73706684630c..4663e043fae3 100644
--- a/databases/rubygem-dbf/distinfo
+++ b/databases/rubygem-dbf/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1629364682
-SHA256 (rubygem/dbf-4.1.4.gem) = 20f59a44a12b883d8784110bf85cff20b77acdd570c7eb992f7d58b264a82d24
-SIZE (rubygem/dbf-4.1.4.gem) = 217088
+TIMESTAMP = 1708449558
+SHA256 (rubygem/dbf-4.3.2.gem) = e54f90d6164b9cbcd7a04309065ce9339666f1edd9faf0421f91d6e7901d6f7f
+SIZE (rubygem/dbf-4.3.2.gem) = 128000
diff --git a/databases/rubygem-dbf/pkg-descr b/databases/rubygem-dbf/pkg-descr
index cc546871b89d..2ff77e2b0f89 100644
--- a/databases/rubygem-dbf/pkg-descr
+++ b/databases/rubygem-dbf/pkg-descr
@@ -1,4 +1,2 @@
 DBF is a small fast library for reading dBase, xBase, Clipper and FoxPro
 database files.
-
-WWW: https://github.com/infused/dbf
diff --git a/databases/rubygem-dbi/Makefile b/databases/rubygem-dbi/Makefile
index 780b4d8c7793..bd4e411410ad 100644
--- a/databases/rubygem-dbi/Makefile
+++ b/databases/rubygem-dbi/Makefile
@@ -1,5 +1,3 @@
-# Created by: Steve Wills <swills@FreeBSD.org>
-
 PORTNAME=	dbi
 PORTVERSION=	0.4.5
 PORTREVISION=	1
@@ -8,6 +6,7 @@ MASTER_SITES=	RG
 
 MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	Vendor independent interface for accessing databases
+WWW=		https://github.com/erikh/ruby-dbi
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
@@ -16,7 +15,6 @@ RUN_DEPENDS=	rubygem-deprecated2>=2.0.1:devel/rubygem-deprecated2 \
 		rubygem-aspectr>=0:devel/rubygem-aspectr
 
 NO_ARCH=	yes
-USE_RUBY=	yes
 USES=		gem
 
 PLIST_FILES=	bin/dbi bin/test_broken_dbi
diff --git a/databases/rubygem-dbi/pkg-descr b/databases/rubygem-dbi/pkg-descr
index 7004f6d85cdf..46371e6409a9 100644
--- a/databases/rubygem-dbi/pkg-descr
+++ b/databases/rubygem-dbi/pkg-descr
@@ -1,3 +1 @@
 A vendor independent interface for accessing databases, similar to Perl's DBI
-
-WWW: https://github.com/erikh/ruby-dbi
diff --git a/databases/rubygem-dbm/Makefile b/databases/rubygem-dbm/Makefile
index 546b1d1a557e..9a3be79f82e2 100644
--- a/databases/rubygem-dbm/Makefile
+++ b/databases/rubygem-dbm/Makefile
@@ -3,13 +3,13 @@ PORTVERSION=	1.1.0
 CATEGORIES=	databases rubygems
 MASTER_SITES=	RG
 
-MAINTAINER=	yasu@utahime.org
+MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	Wrapper for the UNIX-style Database Manager Library
+WWW=		https://github.com/ruby/dbm
 
 LICENSE=	BSD2CLAUSE
 
 USES=		gem
-USE_RUBY=	yes
 
 OPTIONS_SINGLE=			BACKEND
 OPTIONS_SINGLE_BACKEND=		BDB GDBM LIBC QDBM
diff --git a/databases/rubygem-dbm/files/patch-ext_dbm_extconf.rb b/databases/rubygem-dbm/files/patch-ext_dbm_extconf.rb
index de340a4c8bd1..96631779f6e4 100644
--- a/databases/rubygem-dbm/files/patch-ext_dbm_extconf.rb
+++ b/databases/rubygem-dbm/files/patch-ext_dbm_extconf.rb
@@ -1,24 +1,31 @@
---- ext/dbm/extconf.rb.orig	2019-12-01 06:24:29 UTC
+--- ext/dbm/extconf.rb.orig	2022-12-07 02:13:27 UTC
 +++ ext/dbm/extconf.rb
-@@ -24,7 +24,7 @@ dir_config("dbm")
+@@ -7,6 +7,7 @@
+ #   db          Berkeley DB (libdb)
+ #   db2         Berkeley DB (libdb2)
+ #   db1         Berkeley DB (libdb1)
++#   db18        Berkeley DB (libdb18)
+ #   db6         Berkeley DB (libdb6)
+ #   db5         Berkeley DB (libdb5)
+ #   db4         Berkeley DB (libdb4)
+@@ -24,7 +25,7 @@ dir_config("dbm")
  if dblib = with_config("dbm-type", nil)
    dblib = dblib.split(/[ ,]+/)
  else
 -  dblib = %w(libc db db2 db1 db6 db5 db4 db3 gdbm_compat gdbm qdbm)
-+  dblib = %w(libc db db2 db1 db6 db5 db48 db3 gdbm_compat gdbm qdbm)
++  dblib = %w(libc db db2 db1 db18 db6 db5 db4 db3 gdbm_compat gdbm qdbm)
  end
  
  headers = {
-@@ -33,7 +33,7 @@ headers = {
-   "db1" => ["db1/ndbm.h", "db1.h", "ndbm.h"],
-   "db2" => ["db2/db.h", "db2.h", "db.h"],
-   "db3" => ["db3/db.h", "db3.h", "db.h"],
--  "db4" => ["db4/db.h", "db4.h", "db.h"],
-+  "db48" => ["db48/db.h", "db4.h", "db.h"],
+@@ -36,6 +37,7 @@ headers = {
+   "db4" => ["db4/db.h", "db4.h", "db.h"],
    "db5" => ["db5/db.h", "db5.h", "db.h"],
    "db6" => ["db6/db.h", "db6.h", "db.h"],
++  "db18" => ["db18/db.h", "db18.h", "db.h"],
    "gdbm_compat" => ["gdbm-ndbm.h", "gdbm/ndbm.h", "ndbm.h"], # GDBM since 1.8.1
-@@ -127,6 +127,19 @@ end
+   "gdbm" => ["gdbm-ndbm.h", "gdbm/ndbm.h", "ndbm.h"], # GDBM until 1.8.0
+   "qdbm" => ["qdbm/relic.h", "relic.h"],
+@@ -127,13 +129,27 @@ end
  
  
  def headers.db_check2(db, hdr)
@@ -27,9 +34,10 @@
 +    "db1" => "db1",
 +    "db2" => "db2",
 +    "db3" => "db3",
-+    "db48" => "db-4.8",
++    "db4" => "db4",
 +    "db5" => "db-5",
 +    "db6" => "db-6",
++    "db18" => "db-18",
 +    "gdbm_compat" => "gdbm_compat",
 +    "gdbm" => "gdbm",
 +    "qdbm" => "qdbm",
@@ -38,7 +46,15 @@
    $defs.push(%{-DRUBYDBM_DBM_HEADER='"#{hdr}"'})
    $defs.push(%{-DRUBYDBM_DBM_TYPE='"#{db}"'})
  
-@@ -147,7 +160,7 @@ def headers.db_check2(db, hdr)
+   hsearch = nil
+ 
+   case db
+-  when /^db[2-6]?$/
++  when /^db([2-6]|18)?$/
+     hsearch = "-DDB_DBM_HSEARCH"
+   when "gdbm_compat"
+     have_library("gdbm") or return false
+@@ -147,7 +163,7 @@ def headers.db_check2(db, hdr)
    # 4.3BSD original ndbm is contained in libc.
    # 4.4BSD (and its derivatives such as NetBSD) contains Berkeley DB 1 in libc.
    if !(db == 'libc' ? have_func('dbm_open("", 0, 0)', hdr, hsearch) :
diff --git a/databases/rubygem-dbm/pkg-descr b/databases/rubygem-dbm/pkg-descr
index 81308c194112..c148f86deea0 100644
--- a/databases/rubygem-dbm/pkg-descr
+++ b/databases/rubygem-dbm/pkg-descr
@@ -20,5 +20,3 @@ any of the following:
 
 All of these dbm implementations have their own Ruby interfaces
 available, which provide richer (but varying) APIs.
-
-WWW: https://github.com/ruby/dbm
diff --git a/databases/rubygem-discard-rails61/Makefile b/databases/rubygem-discard-rails61/Makefile
new file mode 100644
index 000000000000..a859597a9dc6
--- /dev/null
+++ b/databases/rubygem-discard-rails61/Makefile
@@ -0,0 +1,20 @@
+PORTNAME=	discard
+PORTVERSION=	1.3.0
+CATEGORIES=	databases rubygems
+MASTER_SITES=	RG
+PKGNAMESUFFIX=	-rails61
+
+MAINTAINER=	bofh@FreeBSD.org
+COMMENT=	Allows marking ActiveRecord objects as discarded
+WWW=		https://github.com/jhawthorn/discard
+
+LICENSE=	MIT
+LICENSE_FILE=	${WRKSRC}/LICENSE.txt
+
+RUN_DEPENDS=	rubygem-activerecord61>=4.2<8:databases/rubygem-activerecord61
+
+USES=		gem
+
+NO_ARCH=	yes
+
+.include <bsd.port.mk>
diff --git a/databases/rubygem-discard-rails61/distinfo b/databases/rubygem-discard-rails61/distinfo
new file mode 100644
index 000000000000..42f8e5d6ee10
--- /dev/null
+++ b/databases/rubygem-discard-rails61/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1692332336
+SHA256 (rubygem/discard-1.3.0.gem) = 55218997ca4dc11f0594f1bb2d1196c4a959ceb562f1ab6490130233598dda67
+SIZE (rubygem/discard-1.3.0.gem) = 14336
diff --git a/databases/rubygem-discard-rails61/pkg-descr b/databases/rubygem-discard-rails61/pkg-descr
new file mode 100644
index 000000000000..0671830a56e1
--- /dev/null
+++ b/databases/rubygem-discard-rails61/pkg-descr
@@ -0,0 +1,4 @@
+Soft deletes for ActiveRecord done right.
+
+A simple ActiveRecord mixin to add conventions for flagging records as
+discarded.
diff --git a/databases/rubygem-dm-aggregates/Makefile b/databases/rubygem-dm-aggregates/Makefile
index 45411be2b010..a12d22901a89 100644
--- a/databases/rubygem-dm-aggregates/Makefile
+++ b/databases/rubygem-dm-aggregates/Makefile
@@ -1,5 +1,3 @@
-# Created by: Jyun-Yan You <jyyou@cs.nctu.edu.tw>
-
 PORTNAME=	dm-aggregates
 PORTVERSION=	1.2.0
 CATEGORIES=	databases rubygems
@@ -7,6 +5,7 @@ MASTER_SITES=	RG
 
 MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	DataMapper plugin providing support for aggregates
+WWW=		https://github.com/datamapper/dm-aggregates
 
 LICENSE=	MIT
 
@@ -14,7 +13,6 @@ RUN_DEPENDS=	rubygem-dm-core>=${PORTVERSION}:databases/rubygem-dm-core
 
 NO_ARCH=	yes
 
-USE_RUBY=	yes
 USES=		gem
 
 .include <bsd.port.mk>
diff --git a/databases/rubygem-dm-aggregates/pkg-descr b/databases/rubygem-dm-aggregates/pkg-descr
index f15134a24b3a..835d0ee075bc 100644
--- a/databases/rubygem-dm-aggregates/pkg-descr
+++ b/databases/rubygem-dm-aggregates/pkg-descr
@@ -1,4 +1,2 @@
 DataMapper plugin providing support for aggregates, functions on collections
 and datasets
-
-WWW: https://github.com/datamapper/dm-aggregates
diff --git a/databases/rubygem-dm-chunked_query/Makefile b/databases/rubygem-dm-chunked_query/Makefile
index 343fd9e87a61..5ef01129f1d8 100644
--- a/databases/rubygem-dm-chunked_query/Makefile
+++ b/databases/rubygem-dm-chunked_query/Makefile
@@ -1,5 +1,3 @@
-# Created by: Ryan Steinmetz <zi@FreeBSD.org>
-
 PORTNAME=	dm-chunked_query
 PORTVERSION=	0.3.1
 CATEGORIES=	databases rubygems
@@ -7,6 +5,7 @@ MASTER_SITES=	RG
 
 MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	Allows performing chunked queries
+WWW=		https://github.com/postmodern/dm-chunked_query
 
 LICENSE=	MIT
 
@@ -15,7 +14,6 @@ RUN_DEPENDS=	rubygem-dm-aggregates>=1.0:databases/rubygem-dm-aggregates \
 
 NO_ARCH=	yes
 
-USE_RUBY=	yes
 USES=		gem
 
 .include <bsd.port.mk>
diff --git a/databases/rubygem-dm-chunked_query/pkg-descr b/databases/rubygem-dm-chunked_query/pkg-descr
index 907923b9177b..4bcb0449369f 100644
--- a/databases/rubygem-dm-chunked_query/pkg-descr
+++ b/databases/rubygem-dm-chunked_query/pkg-descr
@@ -1,3 +1 @@
 Allows performing chunked queries on DataMapper Models or Collections.
-
-WWW: https://github.com/postmodern/dm-chunked_query
diff --git a/databases/rubygem-dm-constraints/Makefile b/databases/rubygem-dm-constraints/Makefile
index c94bfbbd2407..d28be58ac571 100644
--- a/databases/rubygem-dm-constraints/Makefile
+++ b/databases/rubygem-dm-constraints/Makefile
@@ -6,6 +6,7 @@ MASTER_SITES=	RG
 
 MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	DataMapper plugin constraining relationships
+WWW=		https://github.com/datamapper/dm-constraints
 
 LICENSE=	MIT
 
@@ -13,7 +14,6 @@ RUN_DEPENDS=	rubygem-dm-core>=${PORTVERSION}:databases/rubygem-dm-core
 
 NO_ARCH=	yes
 
-USE_RUBY=	yes
 USES=		gem
 
 .include <bsd.port.mk>
diff --git a/databases/rubygem-dm-constraints/pkg-descr b/databases/rubygem-dm-constraints/pkg-descr
index 08f8137728bb..5c289251ca9b 100644
--- a/databases/rubygem-dm-constraints/pkg-descr
+++ b/databases/rubygem-dm-constraints/pkg-descr
@@ -1,3 +1 @@
 DataMapper plugin constraining relationships
-
-WWW: https://github.com/datamapper/dm-constraints
diff --git a/databases/rubygem-dm-core/Makefile b/databases/rubygem-dm-core/Makefile
index aa38291dcddd..ba9395138070 100644
--- a/databases/rubygem-dm-core/Makefile
+++ b/databases/rubygem-dm-core/Makefile
@@ -1,5 +1,3 @@
-# Created by: Jyun-Yan You <jyyou@cs.nctu.edu.tw>
-
 PORTNAME=	dm-core
 PORTVERSION=	1.2.1
 PORTREVISION=	1
@@ -8,6 +6,7 @@ MASTER_SITES=	RG
 
 MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	Object/Relational Mapper for Ruby
+WWW=		https://github.com/datamapper/dm-core
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
@@ -15,7 +14,6 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 RUN_DEPENDS=	rubygem-addressable>=2.3:www/rubygem-addressable
 
 NO_ARCH=	yes
-USE_RUBY=	yes
 USES=		gem
 
 .include <bsd.port.mk>
diff --git a/databases/rubygem-dm-core/pkg-descr b/databases/rubygem-dm-core/pkg-descr
index 0a8269b2e5eb..0ae2390b11b8 100644
--- a/databases/rubygem-dm-core/pkg-descr
+++ b/databases/rubygem-dm-core/pkg-descr
@@ -2,5 +2,3 @@ DataMapper is a Object Relational Mapper written in Ruby. The goal
 is to create an ORM which is fast, thread-safe and feature-rich.
 
 The core portion
-
-WWW: https://github.com/datamapper/dm-core
diff --git a/databases/rubygem-dm-do-adapter/Makefile b/databases/rubygem-dm-do-adapter/Makefile
index d285bc0f3104..7a19b141cd38 100644
--- a/databases/rubygem-dm-do-adapter/Makefile
+++ b/databases/rubygem-dm-do-adapter/Makefile
@@ -1,5 +1,3 @@
-# Created by: Jyun-Yan You <jyyou@cs.nctu.edu.tw>
-
 PORTNAME=	dm-do-adapter
 PORTVERSION=	1.2.0
 CATEGORIES=	databases rubygems
@@ -7,6 +5,7 @@ MASTER_SITES=	RG
 
 MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	DataObjects Adapter for DataMapper
+WWW=		https://github.com/datamapper/dm-do-adapter
 
 LICENSE=	MIT
 
@@ -15,7 +14,6 @@ RUN_DEPENDS=	rubygem-data_objects>=0.10.6:databases/rubygem-data_objects \
 
 NO_ARCH=	yes
 
-USE_RUBY=	yes
 USES=		gem
 
 .include <bsd.port.mk>
diff --git a/databases/rubygem-dm-do-adapter/pkg-descr b/databases/rubygem-dm-do-adapter/pkg-descr
index dae39346a77a..e7d7806df589 100644
--- a/databases/rubygem-dm-do-adapter/pkg-descr
+++ b/databases/rubygem-dm-do-adapter/pkg-descr
@@ -1,3 +1 @@
 DataObjects Adapter for DataMapper
-
-WWW: https://github.com/datamapper/dm-do-adapter
diff --git a/databases/rubygem-dm-migrations/Makefile b/databases/rubygem-dm-migrations/Makefile
index db327e7d3e13..7607803cd5e7 100644
--- a/databases/rubygem-dm-migrations/Makefile
+++ b/databases/rubygem-dm-migrations/Makefile
@@ -5,6 +5,7 @@ MASTER_SITES=	RG
 
 MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	DataMapper plugin for writing and specifying migrations
+WWW=		https://github.com/datamapper/dm-migrations
 
 LICENSE=	MIT
 
@@ -12,7 +13,6 @@ RUN_DEPENDS=	rubygem-dm-core>=${PORTVERSION}:databases/rubygem-dm-core
 
 NO_ARCH=	yes
 
-USE_RUBY=	yes
 USES=		gem
 
 .include <bsd.port.mk>
diff --git a/databases/rubygem-dm-migrations/pkg-descr b/databases/rubygem-dm-migrations/pkg-descr
index 8fd405da1165..5d0078c365ba 100644
--- a/databases/rubygem-dm-migrations/pkg-descr
+++ b/databases/rubygem-dm-migrations/pkg-descr
@@ -1,3 +1 @@
 DataMapper plugin for writing and speccing migrations
-
-WWW: https://github.com/datamapper/dm-migrations
diff --git a/databases/rubygem-dm-mysql-adapter/Makefile b/databases/rubygem-dm-mysql-adapter/Makefile
index e9e0df123165..4efc153c33f6 100644
--- a/databases/rubygem-dm-mysql-adapter/Makefile
+++ b/databases/rubygem-dm-mysql-adapter/Makefile
@@ -1,5 +1,3 @@
-# Created by: Jyun-Yan You <jyyou@cs.nctu.edu.tw>
-
 PORTNAME=	dm-mysql-adapter
 PORTVERSION=	1.2.0
 CATEGORIES=	databases rubygems
@@ -7,6 +5,7 @@ MASTER_SITES=	RG
 
 MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	MySQL Adapter for DataMapper
+WWW=		https://github.com/datamapper/dm-mysql-adapter
 
 LICENSE=	MIT
 
@@ -15,7 +14,6 @@ RUN_DEPENDS=	rubygem-dm-do-adapter>=${PORTVERSION}:databases/rubygem-dm-do-adapt
 
 NO_ARCH=	yes
 
-USE_RUBY=	yes
 USES=		gem
 
 .include <bsd.port.mk>
diff --git a/databases/rubygem-dm-mysql-adapter/pkg-descr b/databases/rubygem-dm-mysql-adapter/pkg-descr
index 4f9e5f619a8f..a74371b9c931 100644
--- a/databases/rubygem-dm-mysql-adapter/pkg-descr
+++ b/databases/rubygem-dm-mysql-adapter/pkg-descr
@@ -1,3 +1 @@
 MySQL Adapter for DataMapper
-
-WWW: https://github.com/datamapper/dm-mysql-adapter
diff --git a/databases/rubygem-dm-observer/Makefile b/databases/rubygem-dm-observer/Makefile
index 7f141415307f..f1cae8ebafb9 100644
--- a/databases/rubygem-dm-observer/Makefile
+++ b/databases/rubygem-dm-observer/Makefile
@@ -1,5 +1,3 @@
-# Created by: Ryan Steinmetz <rpsfa@rit.edu>
-
 PORTNAME=	dm-observer
 PORTVERSION=	1.2.0
 CATEGORIES=	databases rubygems
@@ -7,6 +5,7 @@ MASTER_SITES=	RG
 
 MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	DataMapper plugin for observing Resources
+WWW=		https://github.com/datamapper/dm-observer
 
 LICENSE=	MIT
 
@@ -14,7 +13,6 @@ RUN_DEPENDS=	rubygem-dm-core>=${PORTVERSION}:databases/rubygem-dm-core
 
 NO_ARCH=	yes
 
-USE_RUBY=	yes
 USES=		gem
 
 .include <bsd.port.mk>
diff --git a/databases/rubygem-dm-observer/pkg-descr b/databases/rubygem-dm-observer/pkg-descr
index c4a443ca880a..02c414e1eeeb 100644
--- a/databases/rubygem-dm-observer/pkg-descr
+++ b/databases/rubygem-dm-observer/pkg-descr
@@ -1,4 +1,2 @@
 DataMapper::Observer allows you to add callback hooks to
 many models. This is similar to observers in ActiveRecord.
-
-WWW: https://github.com/datamapper/dm-observer
diff --git a/databases/rubygem-dm-pager/Makefile b/databases/rubygem-dm-pager/Makefile
index 099f6a0d14c4..412663216506 100644
--- a/databases/rubygem-dm-pager/Makefile
+++ b/databases/rubygem-dm-pager/Makefile
@@ -1,5 +1,3 @@
-# Created by: Ryan Steinmetz <rpsfa@rit.edu>
-
 PORTNAME=	dm-pager
 PORTVERSION=	1.1.0
 CATEGORIES=	databases rubygems
@@ -7,6 +5,7 @@ MASTER_SITES=	RG
 
 MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	DataMapper Pagination
+WWW=		https://github.com/tj/dm-pagination
 
 LICENSE=	MIT
 
@@ -15,7 +14,6 @@ RUN_DEPENDS=	rubygem-dm-aggregates>=0.10.1:databases/rubygem-dm-aggregates \
 
 NO_ARCH=	yes
 
-USE_RUBY=	yes
 USES=		gem
 
 .include <bsd.port.mk>
diff --git a/databases/rubygem-dm-pager/pkg-descr b/databases/rubygem-dm-pager/pkg-descr
index 91c8ade1f8dc..7ec24962b2ee 100644
--- a/databases/rubygem-dm-pager/pkg-descr
+++ b/databases/rubygem-dm-pager/pkg-descr
@@ -3,5 +3,3 @@ lacking in functionality) dm-pager is a new, fresh, and feature
 rich pagination implementation for DataMapper. Due to Github's gem
 builder being destroyed, we were forced to rename our gem to
 'dm-pager' which is now available on Gemcutter.org.
-
-WWW: https://github.com/tj/dm-pagination
diff --git a/databases/rubygem-dm-paperclip/Makefile b/databases/rubygem-dm-paperclip/Makefile
index c76b1173ca56..4c065248e5e5 100644
--- a/databases/rubygem-dm-paperclip/Makefile
+++ b/databases/rubygem-dm-paperclip/Makefile
@@ -1,5 +1,3 @@
-# Created by: Ryan Steinmetz <rpsfa@rit.edu>
-
 PORTNAME=	dm-paperclip
 PORTVERSION=	2.5.0
 CATEGORIES=	databases rubygems
@@ -7,6 +5,7 @@ MASTER_SITES=	RG
 
 MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	File attachments as attributes for DataMapper
+WWW=		https://github.com/krobertson/dm-paperclip
 
 LICENSE=	MIT
 
@@ -17,7 +16,6 @@ RUN_DEPENDS=	rubygem-dm-core>=1.2.0:databases/rubygem-dm-core \
 
 NO_ARCH=	yes
 
-USE_RUBY=	yes
 USES=		gem
 
 .include <bsd.port.mk>
diff --git a/databases/rubygem-dm-paperclip/pkg-descr b/databases/rubygem-dm-paperclip/pkg-descr
index abb27bf3ecb4..fd458953ec74 100644
--- a/databases/rubygem-dm-paperclip/pkg-descr
+++ b/databases/rubygem-dm-paperclip/pkg-descr
@@ -1,4 +1,2 @@
 File attachments as attributes for DataMapper,
 based on the original Paperclip by Jon Yurek at Thoughtbot
-
-WWW: https://github.com/krobertson/dm-paperclip
diff --git a/databases/rubygem-dm-postgres-adapter/Makefile b/databases/rubygem-dm-postgres-adapter/Makefile
index 8d7cdab1cadc..f6f8a05d5971 100644
--- a/databases/rubygem-dm-postgres-adapter/Makefile
+++ b/databases/rubygem-dm-postgres-adapter/Makefile
@@ -1,5 +1,3 @@
-# Created by: stas
-
 PORTNAME=	dm-postgres-adapter
 PORTVERSION=	1.2.0
 PORTREVISION=	2
@@ -8,6 +6,7 @@ MASTER_SITES=	RG
 
 MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	PostgreSQL Adapter for DataMapper
+WWW=		https://github.com/datamapper/dm-postgres-adapter
 
 LICENSE=	MIT
 
@@ -16,7 +15,6 @@ RUN_DEPENDS=	rubygem-dm-do-adapter>=${PORTVERSION}:databases/rubygem-dm-do-adapt
 
 NO_ARCH=	yes
 
-USE_RUBY=	yes
 USES=		gem
 
 .include <bsd.port.mk>
diff --git a/databases/rubygem-dm-postgres-adapter/pkg-descr b/databases/rubygem-dm-postgres-adapter/pkg-descr
index f225d5f42059..3e0cfbfe4447 100644
--- a/databases/rubygem-dm-postgres-adapter/pkg-descr
+++ b/databases/rubygem-dm-postgres-adapter/pkg-descr
@@ -1,3 +1 @@
 PostgreSQL Adapter for DataMapper
-
-WWW: https://github.com/datamapper/dm-postgres-adapter
diff --git a/databases/rubygem-dm-serializer/Makefile b/databases/rubygem-dm-serializer/Makefile
index 459086d5df55..8f413b3f7f31 100644
--- a/databases/rubygem-dm-serializer/Makefile
+++ b/databases/rubygem-dm-serializer/Makefile
@@ -6,6 +6,7 @@ MASTER_SITES=	RG
 
 MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	DataMapper plugin for serializing Resources and Collections
+WWW=		https://github.com/datamapper/dm-serializer
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
@@ -17,7 +18,6 @@ RUN_DEPENDS=	rubygem-dm-core>=1.2.0<1.3:databases/rubygem-dm-core \
 		rubygem-multi_json>=1.0<2:devel/rubygem-multi_json
 
 USES=		gem
-USE_RUBY=	yes
 
 NO_ARCH=	yes
 
diff --git a/databases/rubygem-dm-serializer/pkg-descr b/databases/rubygem-dm-serializer/pkg-descr
index f52ff56572c9..67d74b597ecd 100644
--- a/databases/rubygem-dm-serializer/pkg-descr
+++ b/databases/rubygem-dm-serializer/pkg-descr
@@ -1,3 +1 @@
 DataMapper plugin for serializing Resources and Collections
-
-WWW: https://github.com/datamapper/dm-serializer
diff --git a/databases/rubygem-dm-timestamps/Makefile b/databases/rubygem-dm-timestamps/Makefile
index 5281d8756aa8..74aea0aab3ba 100644
--- a/databases/rubygem-dm-timestamps/Makefile
+++ b/databases/rubygem-dm-timestamps/Makefile
@@ -6,6 +6,7 @@ MASTER_SITES=	RG
 
 MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	DataMapper plugin for magical timestamps
+WWW=		https://github.com/datamapper/dm-timestamps
 
 LICENSE=	MIT
 
@@ -13,7 +14,6 @@ RUN_DEPENDS=	rubygem-dm-core>=${PORTVERSION}:databases/rubygem-dm-core
 
 NO_ARCH=	yes
 
-USE_RUBY=	yes
 USES=		gem
 
 .include <bsd.port.mk>
diff --git a/databases/rubygem-dm-timestamps/pkg-descr b/databases/rubygem-dm-timestamps/pkg-descr
index f7796ada90e4..c3cfbba16639 100644
--- a/databases/rubygem-dm-timestamps/pkg-descr
+++ b/databases/rubygem-dm-timestamps/pkg-descr
@@ -1,3 +1 @@
 DataMapper plugin for magical timestamps
-
-WWW: https://github.com/datamapper/dm-timestamps
diff --git a/databases/rubygem-dm-transactions/Makefile b/databases/rubygem-dm-transactions/Makefile
index 4f873b237cc9..662d63fac95f 100644
--- a/databases/rubygem-dm-transactions/Makefile
+++ b/databases/rubygem-dm-transactions/Makefile
@@ -5,6 +5,7 @@ MASTER_SITES=	RG
 
 MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	Makes transaction support available for adapters that support them
+WWW=		https://github.com/datamapper/dm-transactions
 
 LICENSE=	MIT
 
@@ -12,7 +13,6 @@ RUN_DEPENDS=	rubygem-dm-core>=${PORTVERSION}:databases/rubygem-dm-core
 
 NO_ARCH=	yes
 
-USE_RUBY=	yes
 USES=		gem
 
 .include <bsd.port.mk>
diff --git a/databases/rubygem-dm-transactions/pkg-descr b/databases/rubygem-dm-transactions/pkg-descr
index e79096d765f9..ba81a00c17e7 100644
--- a/databases/rubygem-dm-transactions/pkg-descr
+++ b/databases/rubygem-dm-transactions/pkg-descr
@@ -1,3 +1 @@
 Makes transaction support available for adapters that support them
-
-WWW: https://github.com/datamapper/dm-transactions
diff --git a/databases/rubygem-dm-types/Makefile b/databases/rubygem-dm-types/Makefile
index 9eee2897a4d6..2680ad0d2438 100644
--- a/databases/rubygem-dm-types/Makefile
+++ b/databases/rubygem-dm-types/Makefile
@@ -1,5 +1,3 @@
-# Created by: Jyun-Yan You <jyyou@cs.nctu.edu.tw>
-
 PORTNAME=	dm-types
 PORTVERSION=	1.2.2
 PORTREVISION=	2
@@ -8,6 +6,7 @@ MASTER_SITES=	RG
 
 MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	DataMapper plugin providing extra data types
+WWW=		https://github.com/datamapper/dm-types
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
@@ -21,7 +20,6 @@ RUN_DEPENDS=	rubygem-bcrypt-ruby>=3.0<4:security/rubygem-bcrypt-ruby \
 		rubygem-uuidtools>=2.1<3:devel/rubygem-uuidtools
 
 USES=		gem
-USE_RUBY=	yes
 
 NO_ARCH=	yes
 
diff --git a/databases/rubygem-dm-types/files/patch-gemspec b/databases/rubygem-dm-types/files/patch-gemspec
index 49e11627c3f2..a9aac04af4bf 100644
--- a/databases/rubygem-dm-types/files/patch-gemspec
+++ b/databases/rubygem-dm-types/files/patch-gemspec
@@ -1,11 +1,11 @@
---- dm-types.gemspec.orig	2016-03-31 16:07:46 UTC
+--- dm-types.gemspec.orig	2024-02-14 06:14:08 UTC
 +++ dm-types.gemspec
-@@ -25,7 +25,7 @@ Gem::Specification.new do |s|
-       s.add_runtime_dependency(%q<fastercsv>.freeze, ["~> 1.5"])
-       s.add_runtime_dependency(%q<multi_json>.freeze, ["~> 1.0"])
-       s.add_runtime_dependency(%q<json>.freeze, ["~> 1.6"])
--      s.add_runtime_dependency(%q<stringex>.freeze, ["~> 1.4"])
-+      s.add_runtime_dependency(%q<stringex>.freeze, [">= 1.4"])
-       s.add_runtime_dependency(%q<uuidtools>.freeze, ["~> 2.1"])
-       s.add_runtime_dependency(%q<dm-core>.freeze, ["~> 1.2.0"])
-       s.add_development_dependency(%q<rake>.freeze, ["~> 0.9"])
+@@ -23,7 +23,7 @@ Gem::Specification.new do |s|
+   s.add_runtime_dependency(%q<fastercsv>.freeze, ["~> 1.5".freeze])
+   s.add_runtime_dependency(%q<multi_json>.freeze, ["~> 1.0".freeze])
+   s.add_runtime_dependency(%q<json>.freeze, ["~> 1.6".freeze])
+-  s.add_runtime_dependency(%q<stringex>.freeze, ["~> 1.4".freeze])
++  s.add_runtime_dependency(%q<stringex>.freeze, [">= 1.4".freeze])
+   s.add_runtime_dependency(%q<uuidtools>.freeze, ["~> 2.1".freeze])
+   s.add_runtime_dependency(%q<dm-core>.freeze, ["~> 1.2.0".freeze])
+   s.add_development_dependency(%q<rake>.freeze, ["~> 0.9".freeze])
diff --git a/databases/rubygem-dm-types/pkg-descr b/databases/rubygem-dm-types/pkg-descr
index 50f4b13b9cb3..ec96e01a139e 100644
--- a/databases/rubygem-dm-types/pkg-descr
+++ b/databases/rubygem-dm-types/pkg-descr
@@ -1,3 +1 @@
 DataMapper plugin providing extra data types
-
-WWW: https://github.com/datamapper/dm-types
diff --git a/databases/rubygem-dm-validations/Makefile b/databases/rubygem-dm-validations/Makefile
index c53ac22e3302..a155a7b2f1b5 100644
--- a/databases/rubygem-dm-validations/Makefile
+++ b/databases/rubygem-dm-validations/Makefile
@@ -5,6 +5,7 @@ MASTER_SITES=	RG
 
 MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	Library for performing validations on DM models and pure Ruby object
+WWW=		https://github.com/datamapper/dm-validations
 
 LICENSE=	MIT
 
@@ -12,7 +13,6 @@ RUN_DEPENDS=	rubygem-dm-core>=${PORTVERSION}:databases/rubygem-dm-core
 
 NO_ARCH=	yes
 
-USE_RUBY=	yes
 USES=		gem
 
 .include <bsd.port.mk>
diff --git a/databases/rubygem-dm-validations/pkg-descr b/databases/rubygem-dm-validations/pkg-descr
index 4f70d2644747..399109d9d6d1 100644
--- a/databases/rubygem-dm-validations/pkg-descr
+++ b/databases/rubygem-dm-validations/pkg-descr
@@ -1,3 +1 @@
 Library for performing validations on DM models and pure Ruby object
-
-WWW: https://github.com/datamapper/dm-validations
diff --git a/databases/rubygem-do_mysql/Makefile b/databases/rubygem-do_mysql/Makefile
index 6b0c060a06cf..2f79c0ca6115 100644
--- a/databases/rubygem-do_mysql/Makefile
+++ b/databases/rubygem-do_mysql/Makefile
@@ -1,5 +1,3 @@
-# Created by: Espen Volden aka voldern <voldern@hoeggen.net>
-
 PORTNAME=	do_mysql
 PORTVERSION=	0.10.17
 CATEGORIES=	databases rubygems
@@ -7,10 +5,10 @@ MASTER_SITES=	RG
 
 MAINTAINER=	voldern@hoeggen.net
 COMMENT=	Ruby DataObjects driver for MySQL
+WWW=		https://rubygems.org/gems/do_mysql
 
 RUN_DEPENDS=	rubygem-data_objects>=0.10.17:databases/rubygem-data_objects
 
 USES=		gem mysql
-USE_RUBY=	yes
 
 .include <bsd.port.mk>
diff --git a/databases/rubygem-do_mysql/pkg-descr b/databases/rubygem-do_mysql/pkg-descr
index 3f1205014c71..e52b195d1ccb 100644
--- a/databases/rubygem-do_mysql/pkg-descr
+++ b/databases/rubygem-do_mysql/pkg-descr
@@ -2,5 +2,3 @@ Ruby DataObjects driver for MySQL
 The purpose of DO.rb is to rewrite existing Ruby database drivers to conform to
 a single interface.
 At present, PostgreSQL, MySQL, and SQLite adapters are available.
-
-WWW: https://rubygems.org/gems/do_mysql
diff --git a/databases/rubygem-do_postgres/Makefile b/databases/rubygem-do_postgres/Makefile
index c3edbebd34a4..a88cb8b27879 100644
--- a/databases/rubygem-do_postgres/Makefile
+++ b/databases/rubygem-do_postgres/Makefile
@@ -1,5 +1,3 @@
-# Created by: Espen Volden aka voldern <voldern@hoeggen.net>
-
 PORTNAME=	do_postgres
 PORTVERSION=	0.10.17
 PORTREVISION=	2
@@ -8,10 +6,10 @@ MASTER_SITES=	RG
 
 MAINTAINER=	voldern@hoeggen.net
 COMMENT=	Ruby DataObjects driver for PostgreSQL
+WWW=		https://rubygems.org/gems/do_postgres
 
 RUN_DEPENDS=	rubygem-data_objects>=0.10.17:databases/rubygem-data_objects
 
-USE_RUBY=	yes
 USES=		gem pgsql
 
 .include <bsd.port.mk>
diff --git a/databases/rubygem-do_postgres/pkg-descr b/databases/rubygem-do_postgres/pkg-descr
index f65fe49266ed..4e12007cb7ec 100644
--- a/databases/rubygem-do_postgres/pkg-descr
+++ b/databases/rubygem-do_postgres/pkg-descr
@@ -2,5 +2,3 @@ Ruby DataObjects driver for PostgreSQL
 The purpose of DO.rb is to rewrite existing Ruby database drivers to conform to
 a single interface.
 At present, PostgreSQL, MySQL, and SQLite adapters are available.
-
-WWW: https://rubygems.org/gems/do_postgres
diff --git a/databases/rubygem-do_sqlite3/Makefile b/databases/rubygem-do_sqlite3/Makefile
index 19faf915f79d..c0878d8310ce 100644
--- a/databases/rubygem-do_sqlite3/Makefile
+++ b/databases/rubygem-do_sqlite3/Makefile
@@ -1,5 +1,3 @@
-# Created by: Espen Volden aka voldern <voldern@hoeggen.net>
-
 PORTNAME=	do_sqlite3
 PORTVERSION=	0.10.17
 CATEGORIES=	databases rubygems
@@ -7,11 +5,11 @@ MASTER_SITES=	RG
 
 MAINTAINER=	voldern@hoeggen.net
 COMMENT=	Ruby DataObjects driver to the SQLite DB engine version 3
+WWW=		https://rubygems.org/gems/do_sqlite3
 
 LIB_DEPENDS=	libsqlite3.so:databases/sqlite3
 RUN_DEPENDS=	rubygem-data_objects>=0.10.17:databases/rubygem-data_objects
 
-USE_RUBY=	yes
 USES=		gem
 
 CONFIGURE_ARGS=	--with-sqlite3-dir=${LOCALBASE}
diff --git a/databases/rubygem-do_sqlite3/pkg-descr b/databases/rubygem-do_sqlite3/pkg-descr
index 82b12283cb97..4020867d9bf7 100644
--- a/databases/rubygem-do_sqlite3/pkg-descr
+++ b/databases/rubygem-do_sqlite3/pkg-descr
@@ -2,5 +2,3 @@ Ruby DataObjects driver to the SQLite DB engine version 3
 The purpose of DO.rb is to rewrite existing Ruby database drivers to conform to
 a single interface.
 At present, PostgreSQL, MySQL, and SQLite adapters are available.
-
-WWW: https://rubygems.org/gems/do_sqlite3
diff --git a/databases/rubygem-em-redis-unified/Makefile b/databases/rubygem-em-redis-unified/Makefile
index 21fc90aa06db..32fef27cc893 100644
--- a/databases/rubygem-em-redis-unified/Makefile
+++ b/databases/rubygem-em-redis-unified/Makefile
@@ -5,13 +5,13 @@ MASTER_SITES=	RG
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Eventmachine-based implementation of the Redis protocol
+WWW=		https://github.com/portertech/em-redis
 
 LICENSE=	MIT
 
 RUN_DEPENDS=	rubygem-eventmachine>=0.12.10:devel/rubygem-eventmachine
 
 USES=		gem
-USE_RUBY=	yes
 
 NO_ARCH=	yes
 
diff --git a/databases/rubygem-em-redis-unified/pkg-descr b/databases/rubygem-em-redis-unified/pkg-descr
index 626bb72d8ad4..31f224c7d380 100644
--- a/databases/rubygem-em-redis-unified/pkg-descr
+++ b/databases/rubygem-em-redis-unified/pkg-descr
@@ -7,5 +7,3 @@ This library is only useful when used as part of an application that relies on
 Event Machine's event loop. It implements an EM-based client protocol, which
 leverages the non-blocking nature of the EM interface to achieve significant
 parallelization without threads.
-
-WWW: https://github.com/portertech/em-redis
diff --git a/databases/rubygem-fabrication/Makefile b/databases/rubygem-fabrication/Makefile
new file mode 100644
index 000000000000..b64c6bd89796
--- /dev/null
+++ b/databases/rubygem-fabrication/Makefile
@@ -0,0 +1,17 @@
+PORTNAME=	fabrication
+PORTVERSION=	2.31.0
+CATEGORIES=	databases rubygems
+MASTER_SITES=	RG
+
+MAINTAINER=	bofh@FreeBSD.org
+COMMENT=	Object generation framework for ActiveRecord or any other Ruby object
+WWW=		https://fabricationgem.org/
+
+LICENSE=	MIT
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
+USES=		gem
+
+NO_ARCH=	yes
+
+.include <bsd.port.mk>
diff --git a/databases/rubygem-fabrication/distinfo b/databases/rubygem-fabrication/distinfo
new file mode 100644
index 000000000000..b238efd3d184
--- /dev/null
+++ b/databases/rubygem-fabrication/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1701425873
+SHA256 (rubygem/fabrication-2.31.0.gem) = 2c79f10d1b88034a2ebd47ce77acba66847fc4636581c8282b3408adc68e85aa
+SIZE (rubygem/fabrication-2.31.0.gem) = 15360
diff --git a/databases/rubygem-fabrication/pkg-descr b/databases/rubygem-fabrication/pkg-descr
new file mode 100644
index 000000000000..75c718472042
--- /dev/null
+++ b/databases/rubygem-fabrication/pkg-descr
@@ -0,0 +1,5 @@
+Fabrication generates objects in Ruby. Fabricators are schematics for your
+objects, and can be created as needed anywhere in your app or specs.
+
+Fabrication can generate anything, but has specific support for ActiveRecord
+Models, Mongoid Documents, Sequel Models, and DataMapper Resources.
diff --git a/databases/rubygem-familia/Makefile b/databases/rubygem-familia/Makefile
index 66ae0af561ba..a9c6bad71ed6 100644
--- a/databases/rubygem-familia/Makefile
+++ b/databases/rubygem-familia/Makefile
@@ -1,24 +1,22 @@
-# Created by: Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>
-
 PORTNAME=	familia
-PORTVERSION=	0.7.1
+PORTVERSION=	0.9.3
 CATEGORIES=	databases rubygems
 MASTER_SITES=	RG
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Organize and store ruby objects in Redis
+WWW=		https://github.com/delano/familia
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	rubygem-gibbler>=0.8.6:devel/rubygem-gibbler \
-		rubygem-multi_json>=0.0.5:devel/rubygem-multi_json \
-		rubygem-redis>=2.1.0:databases/rubygem-redis \
-		rubygem-storable>=0.8.6:devel/rubygem-storable \
-		rubygem-uri-redis>=0.4.2:net/rubygem-uri-redis
+RUN_DEPENDS=	rubygem-gibbler>=1.0.0<1.1:devel/rubygem-gibbler \
+		rubygem-multi_json>=1.15<2:devel/rubygem-multi_json \
+		rubygem-redis>=4.8<7:databases/rubygem-redis \
+		rubygem-storable>=0.10.0<0.11:devel/rubygem-storable \
+		rubygem-uri-redis>=1.0.0:net/rubygem-uri-redis
 
 USES=		gem
-USE_RUBY=	yes
 
 NO_ARCH=	yes
 
diff --git a/databases/rubygem-familia/distinfo b/databases/rubygem-familia/distinfo
index 0939c8b3f4ec..f2a81c9ef1ae 100644
--- a/databases/rubygem-familia/distinfo
+++ b/databases/rubygem-familia/distinfo
@@ -1,2 +1,3 @@
-SHA256 (rubygem/familia-0.7.1.gem) = 218f4ce07aa438bd62a0b94066587fbbd5045f7c565d2987e3806c7b0b52488e
-SIZE (rubygem/familia-0.7.1.gem) = 23040
+TIMESTAMP = 1713033336
+SHA256 (rubygem/familia-0.9.3.gem) = e24b39237ad13d8ec51bcbfccef1548af420daf09afde9cd5412ec39118a0669
+SIZE (rubygem/familia-0.9.3.gem) = 22016
diff --git a/databases/rubygem-familia/pkg-descr b/databases/rubygem-familia/pkg-descr
index cde4310af0b9..7747b64ccc2b 100644
--- a/databases/rubygem-familia/pkg-descr
+++ b/databases/rubygem-familia/pkg-descr
@@ -1,3 +1 @@
 rubygem-familia helps to organize and store Ruby objects in Redis.
-
-WWW: https://github.com/delano/familia
diff --git a/databases/rubygem-flipper-active_record-rails61/Makefile b/databases/rubygem-flipper-active_record-rails61/Makefile
index bb3b92d30403..43c19a16d63a 100644
--- a/databases/rubygem-flipper-active_record-rails61/Makefile
+++ b/databases/rubygem-flipper-active_record-rails61/Makefile
@@ -1,7 +1,5 @@
-# Created by: Po-Chuan Hsieh <sunpoet@FreeBSD.org>
-
 PORTNAME=	flipper-active_record
-PORTVERSION=	0.21.0
+PORTVERSION=	0.25.4
 PORTREVISION=	1
 CATEGORIES=	databases rubygems
 MASTER_SITES=	RG
@@ -9,14 +7,14 @@ PKGNAMESUFFIX=	-rails61
 
 MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	ActiveRecord adapter for Flipper
+WWW=		https://github.com/jnunemaker/flipper
 
 LICENSE=	MIT
 
 RUN_DEPENDS=	rubygem-activerecord61>=5.0<7:databases/rubygem-activerecord61 \
-		rubygem-flipper021>=${PORTVERSION}<0.22:devel/rubygem-flipper021
+		rubygem-flipper025>=${PORTVERSION}<0.26:devel/rubygem-flipper025
 
 USES=		gem
-USE_RUBY=	yes
 
 NO_ARCH=	yes
 
diff --git a/databases/rubygem-flipper-active_record-rails61/distinfo b/databases/rubygem-flipper-active_record-rails61/distinfo
index 8e56766e2902..ed3cd34b5bf0 100644
--- a/databases/rubygem-flipper-active_record-rails61/distinfo
+++ b/databases/rubygem-flipper-active_record-rails61/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1620928645
-SHA256 (rubygem/flipper-active_record-0.21.0.gem) = a5624961a172a34c7be3b9f43105a67174f81af2cdc68d01ad74f686d173461a
-SIZE (rubygem/flipper-active_record-0.21.0.gem) = 9728
+TIMESTAMP = 1669058347
+SHA256 (rubygem/flipper-active_record-0.25.4.gem) = 2ce867c1e1e732330a77c150e3b701feb9b62168c7f9bf22ed91a101e8d7312b
+SIZE (rubygem/flipper-active_record-0.25.4.gem) = 9216
diff --git a/databases/rubygem-flipper-active_record-rails61/pkg-descr b/databases/rubygem-flipper-active_record-rails61/pkg-descr
index c7c39d56f4de..635d5a774c49 100644
--- a/databases/rubygem-flipper-active_record-rails61/pkg-descr
+++ b/databases/rubygem-flipper-active_record-rails61/pkg-descr
@@ -1,3 +1 @@
 Flipper ActiveRecord is an ActiveRecord adapter for Flipper.
-
-WWW: https://github.com/jnunemaker/flipper
diff --git a/databases/rubygem-flipper-active_record-rails70/Makefile b/databases/rubygem-flipper-active_record-rails70/Makefile
new file mode 100644
index 000000000000..dae50c6a4374
--- /dev/null
+++ b/databases/rubygem-flipper-active_record-rails70/Makefile
@@ -0,0 +1,20 @@
+PORTNAME=	flipper-active_record
+PORTVERSION=	0.26.2
+CATEGORIES=	databases rubygems
+MASTER_SITES=	RG
+PKGNAMESUFFIX=	-rails70
+
+MAINTAINER=	ruby@FreeBSD.org
+COMMENT=	ActiveRecord adapter for Flipper
+WWW=		https://github.com/jnunemaker/flipper
+
+LICENSE=	MIT
+
+RUN_DEPENDS=	rubygem-activerecord70>=4.2<8:databases/rubygem-activerecord70 \
+		rubygem-flipper026>=${PORTVERSION}<0.27:devel/rubygem-flipper026
+
+USES=		gem
+
+NO_ARCH=	yes
+
+.include <bsd.port.mk>
diff --git a/databases/rubygem-flipper-active_record-rails70/distinfo b/databases/rubygem-flipper-active_record-rails70/distinfo
new file mode 100644
index 000000000000..5faae3998117
--- /dev/null
+++ b/databases/rubygem-flipper-active_record-rails70/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1695539311
+SHA256 (rubygem/flipper-active_record-0.26.2.gem) = 61deaeef8ce2f775e67d7095f40fd95fc2d07241e143dd4436e78c7b26a320bc
+SIZE (rubygem/flipper-active_record-0.26.2.gem) = 9728
diff --git a/databases/rubygem-flipper-active_record-rails70/pkg-descr b/databases/rubygem-flipper-active_record-rails70/pkg-descr
new file mode 100644
index 000000000000..635d5a774c49
--- /dev/null
+++ b/databases/rubygem-flipper-active_record-rails70/pkg-descr
@@ -0,0 +1 @@
+Flipper ActiveRecord is an ActiveRecord adapter for Flipper.
diff --git a/databases/rubygem-flipper-active_record/Makefile b/databases/rubygem-flipper-active_record/Makefile
index 2ab8d53601b1..b97c06cfdddb 100644
--- a/databases/rubygem-flipper-active_record/Makefile
+++ b/databases/rubygem-flipper-active_record/Makefile
@@ -1,20 +1,19 @@
-# Created by: Po-Chuan Hsieh <sunpoet@FreeBSD.org>
-
 PORTNAME=	flipper-active_record
-PORTVERSION=	0.22.0
+PORTVERSION=	1.3.0
 CATEGORIES=	databases rubygems
 MASTER_SITES=	RG
 
 MAINTAINER=	sunpoet@FreeBSD.org
-COMMENT=	ActiveRecord adapter for Flipper
+COMMENT=	ActiveRecord feature flag adapter for Flipper
+WWW=		https://www.flippercloud.io/ \
+		https://github.com/flippercloud/flipper
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-activerecord50>=4.2<7:databases/rubygem-activerecord50 \
-		rubygem-flipper>=${PORTVERSION}<0.23:devel/rubygem-flipper
+RUN_DEPENDS=	rubygem-activerecord71>=4.2<8:databases/rubygem-activerecord71 \
+		rubygem-flipper>=${PORTVERSION}<1.4:devel/rubygem-flipper
 
 USES=		gem
-USE_RUBY=	yes
 
 NO_ARCH=	yes
 
diff --git a/databases/rubygem-flipper-active_record/distinfo b/databases/rubygem-flipper-active_record/distinfo
index f655532150bf..aa4c83e6d955 100644
--- a/databases/rubygem-flipper-active_record/distinfo
+++ b/databases/rubygem-flipper-active_record/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1625585520
-SHA256 (rubygem/flipper-active_record-0.22.0.gem) = 698f54eefe77c28765360dc443c22769fe13401406e48e4d0742e9970f265983
-SIZE (rubygem/flipper-active_record-0.22.0.gem) = 9728
+TIMESTAMP = 1713528564
+SHA256 (rubygem/flipper-active_record-1.3.0.gem) = 9951c9416103d7770de6c15eb12c411a4225ed720606dd09b7a003d54aa4547f
+SIZE (rubygem/flipper-active_record-1.3.0.gem) = 11264
diff --git a/databases/rubygem-flipper-active_record/pkg-descr b/databases/rubygem-flipper-active_record/pkg-descr
index c7c39d56f4de..635d5a774c49 100644
--- a/databases/rubygem-flipper-active_record/pkg-descr
+++ b/databases/rubygem-flipper-active_record/pkg-descr
@@ -1,3 +1 @@
 Flipper ActiveRecord is an ActiveRecord adapter for Flipper.
-
-WWW: https://github.com/jnunemaker/flipper
diff --git a/databases/rubygem-flipper-active_record017/Makefile b/databases/rubygem-flipper-active_record017/Makefile
deleted file mode 100644
index 0ba59fb1196a..000000000000
--- a/databases/rubygem-flipper-active_record017/Makefile
+++ /dev/null
@@ -1,25 +0,0 @@
-# Created by: Po-Chuan Hsieh <sunpoet@FreeBSD.org>
-
-PORTNAME=	flipper-active_record
-PORTVERSION=	0.17.2
-PORTREVISION=	1
-CATEGORIES=	databases rubygems
-MASTER_SITES=	RG
-PKGNAMESUFFIX=	017
-
-MAINTAINER=	sunpoet@FreeBSD.org
-COMMENT=	ActiveRecord adapter for Flipper
-
-LICENSE=	MIT
-
-RUN_DEPENDS=	rubygem-activerecord60>=4.2<7:databases/rubygem-activerecord60 \
-		rubygem-flipper017>=${PORTVERSION}<0.18:devel/rubygem-flipper017
-
-USES=		gem
-USE_RUBY=	yes
-
-NO_ARCH=	yes
-
-PORTSCOUT=	limit:^0\.17\.
-
-.include <bsd.port.mk>
diff --git a/databases/rubygem-flipper-active_record017/distinfo b/databases/rubygem-flipper-active_record017/distinfo
deleted file mode 100644
index 9a5c70e6c6ed..000000000000
--- a/databases/rubygem-flipper-active_record017/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1578197787
-SHA256 (rubygem/flipper-active_record-0.17.2.gem) = 8983132061966bba4250e3902132bb95488fe54d1554fecdeab91f0506dce32f
-SIZE (rubygem/flipper-active_record-0.17.2.gem) = 9728
diff --git a/databases/rubygem-flipper-active_record017/pkg-descr b/databases/rubygem-flipper-active_record017/pkg-descr
deleted file mode 100644
index c7c39d56f4de..000000000000
--- a/databases/rubygem-flipper-active_record017/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-Flipper ActiveRecord is an ActiveRecord adapter for Flipper.
-
-WWW: https://github.com/jnunemaker/flipper
diff --git a/databases/rubygem-gdbm/Makefile b/databases/rubygem-gdbm/Makefile
index 23210858a1ce..ec818490cf23 100644
--- a/databases/rubygem-gdbm/Makefile
+++ b/databases/rubygem-gdbm/Makefile
@@ -1,5 +1,3 @@
-# Created by: Akinori MUSHA aka knu <knu@idaemons.org>
-
 PORTNAME=	gdbm
 PORTVERSION=	2.1.0
 PORTEPOCH=	2
@@ -8,12 +6,12 @@ MASTER_SITES=	RG
 
 MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	Ruby extension to GDBM library
+WWW=		https://github.com/ruby/gdbm
 
 LICENSE=	BSD2CLAUSE
 
 LIB_DEPENDS=	libgdbm.so:databases/gdbm
 
 USES=		gem
-USE_RUBY=	yes
 
 .include <bsd.port.mk>
diff --git a/databases/rubygem-gdbm/pkg-descr b/databases/rubygem-gdbm/pkg-descr
index 62719480e11c..dd3a2e8b895c 100644
--- a/databases/rubygem-gdbm/pkg-descr
+++ b/databases/rubygem-gdbm/pkg-descr
@@ -15,5 +15,3 @@ time. A process can open a database as a "reader" or a
 "writer". Whereas a reader has only read-access to the database, a
 writer has read- and write-access. A database can be accessed either
 by any number of readers or by exactly one writer at the same time.
-
-WWW: https://rubygems.org/gems/gdbm
diff --git a/databases/rubygem-globalid-rails5/Makefile b/databases/rubygem-globalid-rails5/Makefile
index cdb64724a395..0ccaed9e7695 100644
--- a/databases/rubygem-globalid-rails5/Makefile
+++ b/databases/rubygem-globalid-rails5/Makefile
@@ -1,22 +1,22 @@
-# Created by: Johannes Meixner <johannes@perceivon.net>
-
 PORTNAME=	globalid
-PORTVERSION=	0.4.2
+PORTVERSION=	1.1.0
 CATEGORIES=	databases rubygems
 MASTER_SITES=	RG
 PKGNAMESUFFIX=	-rails5
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	URIs for your models makes it easy to pass references around
+WWW=		https://github.com/rails/globalid
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/MIT-LICENSE
 
-RUN_DEPENDS=	rubygem-activesupport5>=4.2.0:devel/rubygem-activesupport5
+RUN_DEPENDS=	rubygem-activesupport5>=5.0:devel/rubygem-activesupport5
 
 USES=		gem
-USE_RUBY=	yes
 
 NO_ARCH=	yes
 
+PORTSCOUT=	limit:^1\.1\.
+
 .include <bsd.port.mk>
diff --git a/databases/rubygem-globalid-rails5/distinfo b/databases/rubygem-globalid-rails5/distinfo
index 30ad220803a6..086574041b17 100644
--- a/databases/rubygem-globalid-rails5/distinfo
+++ b/databases/rubygem-globalid-rails5/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1549638071
-SHA256 (rubygem/globalid-0.4.2.gem) = 61f72a3817e0d8ca0c382460847ed19b821805b5a9ad3204774b9cc976b37dfe
-SIZE (rubygem/globalid-0.4.2.gem) = 12800
+TIMESTAMP = 1675191127
+SHA256 (rubygem/globalid-1.1.0.gem) = b337e1746f0c8cb0a6c918234b03a1ddeb4966206ce288fbb57779f59b2d154f
+SIZE (rubygem/globalid-1.1.0.gem) = 13312
diff --git a/databases/rubygem-globalid-rails5/pkg-descr b/databases/rubygem-globalid-rails5/pkg-descr
index 38332a771c02..09672db6bc67 100644
--- a/databases/rubygem-globalid-rails5/pkg-descr
+++ b/databases/rubygem-globalid-rails5/pkg-descr
@@ -1,3 +1 @@
 URIs for your models makes it easy to pass references around.
-
-WWW: https://github.com/rails/globalid
diff --git a/databases/rubygem-globalid-rails50/Makefile b/databases/rubygem-globalid-rails50/Makefile
index b00d7fe3693a..ada2416fecf6 100644
--- a/databases/rubygem-globalid-rails50/Makefile
+++ b/databases/rubygem-globalid-rails50/Makefile
@@ -1,22 +1,22 @@
-# Created by: Johannes Meixner <johannes@perceivon.net>
-
 PORTNAME=	globalid
-PORTVERSION=	0.4.2
+PORTVERSION=	1.1.0
 CATEGORIES=	databases rubygems
 MASTER_SITES=	RG
 PKGNAMESUFFIX=	-rails50
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	URIs for your models makes it easy to pass references around
+WWW=		https://github.com/rails/globalid
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/MIT-LICENSE
 
-RUN_DEPENDS=	rubygem-activesupport50>=4.2.0:devel/rubygem-activesupport50
+RUN_DEPENDS=	rubygem-activesupport50>=5.0:devel/rubygem-activesupport50
 
 USES=		gem
-USE_RUBY=	yes
 
 NO_ARCH=	yes
 
+PORTSCOUT=	limit:^1\.1\.
+
 .include <bsd.port.mk>
diff --git a/databases/rubygem-globalid-rails50/distinfo b/databases/rubygem-globalid-rails50/distinfo
index 30ad220803a6..e139a2a13269 100644
--- a/databases/rubygem-globalid-rails50/distinfo
+++ b/databases/rubygem-globalid-rails50/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1549638071
-SHA256 (rubygem/globalid-0.4.2.gem) = 61f72a3817e0d8ca0c382460847ed19b821805b5a9ad3204774b9cc976b37dfe
-SIZE (rubygem/globalid-0.4.2.gem) = 12800
+TIMESTAMP = 1675191129
+SHA256 (rubygem/globalid-1.1.0.gem) = b337e1746f0c8cb0a6c918234b03a1ddeb4966206ce288fbb57779f59b2d154f
+SIZE (rubygem/globalid-1.1.0.gem) = 13312
diff --git a/databases/rubygem-globalid-rails50/pkg-descr b/databases/rubygem-globalid-rails50/pkg-descr
index 38332a771c02..09672db6bc67 100644
--- a/databases/rubygem-globalid-rails50/pkg-descr
+++ b/databases/rubygem-globalid-rails50/pkg-descr
@@ -1,3 +1 @@
 URIs for your models makes it easy to pass references around.
-
-WWW: https://github.com/rails/globalid
diff --git a/databases/rubygem-globalid-rails52/Makefile b/databases/rubygem-globalid-rails52/Makefile
index 82a8eae6708d..715a4da9e7bc 100644
--- a/databases/rubygem-globalid-rails52/Makefile
+++ b/databases/rubygem-globalid-rails52/Makefile
@@ -1,22 +1,22 @@
-# Created by: Johannes Meixner <johannes@perceivon.net>
-
 PORTNAME=	globalid
-PORTVERSION=	0.4.2
+PORTVERSION=	1.1.0
 CATEGORIES=	databases rubygems
 MASTER_SITES=	RG
 PKGNAMESUFFIX=	-rails52
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	URIs for your models makes it easy to pass references around
+WWW=		https://github.com/rails/globalid
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/MIT-LICENSE
 
-RUN_DEPENDS=	rubygem-activesupport52>=4.2.0:devel/rubygem-activesupport52
+RUN_DEPENDS=	rubygem-activesupport52>=5.0:devel/rubygem-activesupport52
 
 USES=		gem
-USE_RUBY=	yes
 
 NO_ARCH=	yes
 
+PORTSCOUT=	limit:^1\.1\.
+
 .include <bsd.port.mk>
diff --git a/databases/rubygem-globalid-rails52/distinfo b/databases/rubygem-globalid-rails52/distinfo
index 30ad220803a6..d6b4a2b9f6df 100644
--- a/databases/rubygem-globalid-rails52/distinfo
+++ b/databases/rubygem-globalid-rails52/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1549638071
-SHA256 (rubygem/globalid-0.4.2.gem) = 61f72a3817e0d8ca0c382460847ed19b821805b5a9ad3204774b9cc976b37dfe
-SIZE (rubygem/globalid-0.4.2.gem) = 12800
+TIMESTAMP = 1675191131
+SHA256 (rubygem/globalid-1.1.0.gem) = b337e1746f0c8cb0a6c918234b03a1ddeb4966206ce288fbb57779f59b2d154f
+SIZE (rubygem/globalid-1.1.0.gem) = 13312
diff --git a/databases/rubygem-globalid-rails52/pkg-descr b/databases/rubygem-globalid-rails52/pkg-descr
index 38332a771c02..09672db6bc67 100644
--- a/databases/rubygem-globalid-rails52/pkg-descr
+++ b/databases/rubygem-globalid-rails52/pkg-descr
@@ -1,3 +1 @@
 URIs for your models makes it easy to pass references around.
-
-WWW: https://github.com/rails/globalid
diff --git a/databases/rubygem-globalid-rails60/Makefile b/databases/rubygem-globalid-rails60/Makefile
index 3abf1a31fd4a..ab93e1098a46 100644
--- a/databases/rubygem-globalid-rails60/Makefile
+++ b/databases/rubygem-globalid-rails60/Makefile
@@ -1,22 +1,22 @@
-# Created by: Johannes Meixner <johannes@perceivon.net>
-
 PORTNAME=	globalid
-PORTVERSION=	0.4.2
+PORTVERSION=	1.1.0
 CATEGORIES=	databases rubygems
 MASTER_SITES=	RG
 PKGNAMESUFFIX=	-rails60
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	URIs for your models makes it easy to pass references around
+WWW=		https://github.com/rails/globalid
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/MIT-LICENSE
 
-RUN_DEPENDS=	rubygem-activesupport60>=4.2.0:devel/rubygem-activesupport60
+RUN_DEPENDS=	rubygem-activesupport60>=5.0:devel/rubygem-activesupport60
 
 USES=		gem
-USE_RUBY=	yes
 
 NO_ARCH=	yes
 
+PORTSCOUT=	limit:^1\.1\.
+
 .include <bsd.port.mk>
diff --git a/databases/rubygem-globalid-rails60/distinfo b/databases/rubygem-globalid-rails60/distinfo
index 30ad220803a6..386f21474d15 100644
--- a/databases/rubygem-globalid-rails60/distinfo
+++ b/databases/rubygem-globalid-rails60/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1549638071
-SHA256 (rubygem/globalid-0.4.2.gem) = 61f72a3817e0d8ca0c382460847ed19b821805b5a9ad3204774b9cc976b37dfe
-SIZE (rubygem/globalid-0.4.2.gem) = 12800
+TIMESTAMP = 1675191133
+SHA256 (rubygem/globalid-1.1.0.gem) = b337e1746f0c8cb0a6c918234b03a1ddeb4966206ce288fbb57779f59b2d154f
+SIZE (rubygem/globalid-1.1.0.gem) = 13312
diff --git a/databases/rubygem-globalid-rails60/pkg-descr b/databases/rubygem-globalid-rails60/pkg-descr
index 38332a771c02..09672db6bc67 100644
--- a/databases/rubygem-globalid-rails60/pkg-descr
+++ b/databases/rubygem-globalid-rails60/pkg-descr
@@ -1,3 +1 @@
 URIs for your models makes it easy to pass references around.
-
-WWW: https://github.com/rails/globalid
diff --git a/databases/rubygem-globalid-rails61/Makefile b/databases/rubygem-globalid-rails61/Makefile
index 8bc4e782e0fd..0c8d87612fd9 100644
--- a/databases/rubygem-globalid-rails61/Makefile
+++ b/databases/rubygem-globalid-rails61/Makefile
@@ -1,21 +1,19 @@
-# Created by: Johannes Meixner <johannes@perceivon.net>
-
 PORTNAME=	globalid
-PORTVERSION=	0.4.2
+PORTVERSION=	1.2.1
 CATEGORIES=	databases rubygems
 MASTER_SITES=	RG
 PKGNAMESUFFIX=	-rails61
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	URIs for your models makes it easy to pass references around
+WWW=		https://github.com/rails/globalid
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/MIT-LICENSE
 
-RUN_DEPENDS=	rubygem-activesupport61>=4.2.0:devel/rubygem-activesupport61
+RUN_DEPENDS=	rubygem-activesupport61>=6.1:devel/rubygem-activesupport61
 
 USES=		gem
-USE_RUBY=	yes
 
 NO_ARCH=	yes
 
diff --git a/databases/rubygem-globalid-rails61/distinfo b/databases/rubygem-globalid-rails61/distinfo
index 30ad220803a6..cd684cf05058 100644
--- a/databases/rubygem-globalid-rails61/distinfo
+++ b/databases/rubygem-globalid-rails61/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1549638071
-SHA256 (rubygem/globalid-0.4.2.gem) = 61f72a3817e0d8ca0c382460847ed19b821805b5a9ad3204774b9cc976b37dfe
-SIZE (rubygem/globalid-0.4.2.gem) = 12800
+TIMESTAMP = 1693987451
+SHA256 (rubygem/globalid-1.2.1.gem) = 70bf76711871f843dbba72beb8613229a49429d1866828476f9c9d6ccc327ce9
+SIZE (rubygem/globalid-1.2.1.gem) = 14848
diff --git a/databases/rubygem-globalid-rails61/pkg-descr b/databases/rubygem-globalid-rails61/pkg-descr
index 38332a771c02..09672db6bc67 100644
--- a/databases/rubygem-globalid-rails61/pkg-descr
+++ b/databases/rubygem-globalid-rails61/pkg-descr
@@ -1,3 +1 @@
 URIs for your models makes it easy to pass references around.
-
-WWW: https://github.com/rails/globalid
diff --git a/databases/rubygem-globalid-rails70/Makefile b/databases/rubygem-globalid-rails70/Makefile
new file mode 100644
index 000000000000..158332536d68
--- /dev/null
+++ b/databases/rubygem-globalid-rails70/Makefile
@@ -0,0 +1,20 @@
+PORTNAME=	globalid
+PORTVERSION=	1.2.1
+CATEGORIES=	databases rubygems
+MASTER_SITES=	RG
+PKGNAMESUFFIX=	-rails70
+
+MAINTAINER=	sunpoet@FreeBSD.org
+COMMENT=	URIs for your models makes it easy to pass references around
+WWW=		https://github.com/rails/globalid
+
+LICENSE=	MIT
+LICENSE_FILE=	${WRKSRC}/MIT-LICENSE
+
+RUN_DEPENDS=	rubygem-activesupport70>=6.1:devel/rubygem-activesupport70
+
+USES=		gem
+
+NO_ARCH=	yes
+
+.include <bsd.port.mk>
diff --git a/databases/rubygem-globalid-rails70/distinfo b/databases/rubygem-globalid-rails70/distinfo
new file mode 100644
index 000000000000..18915e3a833f
--- /dev/null
+++ b/databases/rubygem-globalid-rails70/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1693987453
+SHA256 (rubygem/globalid-1.2.1.gem) = 70bf76711871f843dbba72beb8613229a49429d1866828476f9c9d6ccc327ce9
+SIZE (rubygem/globalid-1.2.1.gem) = 14848
diff --git a/databases/rubygem-globalid-rails70/pkg-descr b/databases/rubygem-globalid-rails70/pkg-descr
new file mode 100644
index 000000000000..09672db6bc67
--- /dev/null
+++ b/databases/rubygem-globalid-rails70/pkg-descr
@@ -0,0 +1 @@
+URIs for your models makes it easy to pass references around.
diff --git a/databases/rubygem-globalid-rails71/Makefile b/databases/rubygem-globalid-rails71/Makefile
new file mode 100644
index 000000000000..bc0ef003ea7c
--- /dev/null
+++ b/databases/rubygem-globalid-rails71/Makefile
@@ -0,0 +1,20 @@
+PORTNAME=	globalid
+PORTVERSION=	1.2.1
+CATEGORIES=	databases rubygems
+MASTER_SITES=	RG
+PKGNAMESUFFIX=	-rails71
+
+MAINTAINER=	sunpoet@FreeBSD.org
+COMMENT=	URIs for your models makes it easy to pass references around
+WWW=		https://github.com/rails/globalid
+
+LICENSE=	MIT
+LICENSE_FILE=	${WRKSRC}/MIT-LICENSE
+
+RUN_DEPENDS=	rubygem-activesupport71>=6.1:devel/rubygem-activesupport71
+
+USES=		gem
+
+NO_ARCH=	yes
+
+.include <bsd.port.mk>
diff --git a/databases/rubygem-globalid-rails71/distinfo b/databases/rubygem-globalid-rails71/distinfo
new file mode 100644
index 000000000000..f25598c9d396
--- /dev/null
+++ b/databases/rubygem-globalid-rails71/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1697330208
+SHA256 (rubygem/globalid-1.2.1.gem) = 70bf76711871f843dbba72beb8613229a49429d1866828476f9c9d6ccc327ce9
+SIZE (rubygem/globalid-1.2.1.gem) = 14848
diff --git a/databases/rubygem-globalid-rails71/pkg-descr b/databases/rubygem-globalid-rails71/pkg-descr
new file mode 100644
index 000000000000..09672db6bc67
--- /dev/null
+++ b/databases/rubygem-globalid-rails71/pkg-descr
@@ -0,0 +1 @@
+URIs for your models makes it easy to pass references around.
diff --git a/databases/rubygem-globalid/Makefile b/databases/rubygem-globalid/Makefile
index c8577eccae55..26ac8b88c3a2 100644
--- a/databases/rubygem-globalid/Makefile
+++ b/databases/rubygem-globalid/Makefile
@@ -1,5 +1,3 @@
-# Created by: Johannes Meixner <johannes@perceivon.net>
-
 PORTNAME=	globalid
 PORTVERSION=	0.4.2
 CATEGORIES=	databases rubygems
@@ -7,6 +5,7 @@ MASTER_SITES=	RG
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	URIs for your models makes it easy to pass references around
+WWW=		https://github.com/rails/globalid
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/MIT-LICENSE
@@ -14,8 +13,9 @@ LICENSE_FILE=	${WRKSRC}/MIT-LICENSE
 RUN_DEPENDS=	rubygem-activesupport4>=4.2.0:devel/rubygem-activesupport4
 
 USES=		gem
-USE_RUBY=	yes
 
 NO_ARCH=	yes
 
+PORTSCOUT=	limit:^0\.
+
 .include <bsd.port.mk>
diff --git a/databases/rubygem-globalid/pkg-descr b/databases/rubygem-globalid/pkg-descr
index 38332a771c02..09672db6bc67 100644
--- a/databases/rubygem-globalid/pkg-descr
+++ b/databases/rubygem-globalid/pkg-descr
@@ -1,3 +1 @@
 URIs for your models makes it easy to pass references around.
-
-WWW: https://github.com/rails/globalid
diff --git a/databases/rubygem-google-cloud-datastore-v1/Makefile b/databases/rubygem-google-cloud-datastore-v1/Makefile
new file mode 100644
index 000000000000..2786c36a2416
--- /dev/null
+++ b/databases/rubygem-google-cloud-datastore-v1/Makefile
@@ -0,0 +1,22 @@
+PORTNAME=	google-cloud-datastore-v1
+PORTVERSION=	0.18.0
+CATEGORIES=	databases rubygems
+MASTER_SITES=	RG
+
+MAINTAINER=	sunpoet@FreeBSD.org
+COMMENT=	Ruby Client for the Firestore in Datastore mode V1 API
+WWW=		https://cloud.google.com/ruby/docs/reference/google-cloud-datastore-v1/latest/ \
+		https://github.com/googleapis/google-cloud-ruby/tree/main/google-cloud-datastore-v1 \
+		https://github.com/googleapis/google-cloud-ruby
+
+LICENSE=	APACHE20
+LICENSE_FILE=	${WRKSRC}/LICENSE.md
+
+RUN_DEPENDS=	rubygem-gapic-common>=0.21.1<2.0:devel/rubygem-gapic-common \
+		rubygem-google-cloud-errors>=1.0<2:net/rubygem-google-cloud-errors
+
+USES=		gem
+
+NO_ARCH=	yes
+
+.include <bsd.port.mk>
diff --git a/databases/rubygem-google-cloud-datastore-v1/distinfo b/databases/rubygem-google-cloud-datastore-v1/distinfo
new file mode 100644
index 000000000000..674174a11058
--- /dev/null
+++ b/databases/rubygem-google-cloud-datastore-v1/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1711466242
+SHA256 (rubygem/google-cloud-datastore-v1-0.18.0.gem) = 127177ce9aeb65e2b5e69a85097b93eff81a86aeef65550999c7d26e59c8b527
+SIZE (rubygem/google-cloud-datastore-v1-0.18.0.gem) = 59392
diff --git a/databases/rubygem-google-cloud-datastore-v1/pkg-descr b/databases/rubygem-google-cloud-datastore-v1/pkg-descr
new file mode 100644
index 000000000000..ea099804815e
--- /dev/null
+++ b/databases/rubygem-google-cloud-datastore-v1/pkg-descr
@@ -0,0 +1,7 @@
+Ruby Client for the Firestore in Datastore mode V1 API
+
+Accesses the schemaless NoSQL database to provide fully managed, robust,
+scalable storage for your application.
+
+Firestore in Datastore mode is a NoSQL document database built for automatic
+scaling, high performance, and ease of application development.
diff --git a/databases/rubygem-google-cloud-datastore/Makefile b/databases/rubygem-google-cloud-datastore/Makefile
new file mode 100644
index 000000000000..469cabed3aca
--- /dev/null
+++ b/databases/rubygem-google-cloud-datastore/Makefile
@@ -0,0 +1,23 @@
+PORTNAME=	google-cloud-datastore
+PORTVERSION=	2.9.0
+CATEGORIES=	databases rubygems
+MASTER_SITES=	RG
+
+MAINTAINER=	sunpoet@FreeBSD.org
+COMMENT=	Official library for Google Cloud Datastore
+WWW=		https://cloud.google.com/ruby/docs/reference/google-cloud-datastore/latest/ \
+		https://googleapis.github.io/google-cloud-ruby/docs/ \
+		https://github.com/googleapis/google-cloud-ruby/tree/main/google-cloud-datastore \
+		https://github.com/googleapis/google-cloud-ruby
+
+LICENSE=	APACHE20
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
+RUN_DEPENDS=	rubygem-google-cloud-core>=1.5<2:net/rubygem-google-cloud-core \
+		rubygem-google-cloud-datastore-v1>=0.0<1:databases/rubygem-google-cloud-datastore-v1
+
+USES=		gem
+
+NO_ARCH=	yes
+
+.include <bsd.port.mk>
diff --git a/databases/rubygem-google-cloud-datastore/distinfo b/databases/rubygem-google-cloud-datastore/distinfo
new file mode 100644
index 000000000000..fe9c69ab6874
--- /dev/null
+++ b/databases/rubygem-google-cloud-datastore/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1710712578
+SHA256 (rubygem/google-cloud-datastore-2.9.0.gem) = 389ffcd7a383431406d7d7dbbfb38ef1b9a66466e3ea5bbbb2aa25f200d716cd
+SIZE (rubygem/google-cloud-datastore-2.9.0.gem) = 52224
diff --git a/databases/rubygem-google-cloud-datastore/pkg-descr b/databases/rubygem-google-cloud-datastore/pkg-descr
new file mode 100644
index 000000000000..8ce6ef31ff21
--- /dev/null
+++ b/databases/rubygem-google-cloud-datastore/pkg-descr
@@ -0,0 +1,7 @@
+google-cloud-datastore is the official library for Google Cloud Datastore.
+
+Google Cloud Datastore is a fully managed, schemaless database for storing
+non-relational data. Cloud Datastore automatically scales with your users and
+supports ACID transactions, high availability of reads and writes, strong
+consistency for reads and ancestor queries, and eventual consistency for all
+other queries.
diff --git a/databases/rubygem-google-cloud-firestore-v1/Makefile b/databases/rubygem-google-cloud-firestore-v1/Makefile
new file mode 100644
index 000000000000..dc059a6c76e2
--- /dev/null
+++ b/databases/rubygem-google-cloud-firestore-v1/Makefile
@@ -0,0 +1,23 @@
+PORTNAME=	google-cloud-firestore-v1
+PORTVERSION=	0.13.0
+CATEGORIES=	databases rubygems
+MASTER_SITES=	RG
+
+MAINTAINER=	sunpoet@FreeBSD.org
+COMMENT=	Ruby Client for the Cloud Firestore V1 API
+WWW=		https://cloud.google.com/ruby/docs/reference/google-cloud-firestore-v1/latest/ \
+		https://github.com/googleapis/google-cloud-ruby/tree/main/google-cloud-firestore-v1 \
+		https://github.com/googleapis/google-cloud-ruby
+
+LICENSE=	APACHE20
+LICENSE_FILE=	${WRKSRC}/LICENSE.md
+
+RUN_DEPENDS=	rubygem-gapic-common>=0.21.1<2.0:devel/rubygem-gapic-common \
+		rubygem-google-cloud-errors>=1.0<2:net/rubygem-google-cloud-errors \
+		rubygem-google-cloud-location>=0.7<2.0:net/rubygem-google-cloud-location
+
+USES=		gem
+
+NO_ARCH=	yes
+
+.include <bsd.port.mk>
diff --git a/databases/rubygem-google-cloud-firestore-v1/distinfo b/databases/rubygem-google-cloud-firestore-v1/distinfo
new file mode 100644
index 000000000000..04c44ea31a36
--- /dev/null
+++ b/databases/rubygem-google-cloud-firestore-v1/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1711466244
+SHA256 (rubygem/google-cloud-firestore-v1-0.13.0.gem) = b827230dab5a6704ba3fffea9553829a199a03c2bfa1f00705af6a4ba5c7daeb
+SIZE (rubygem/google-cloud-firestore-v1-0.13.0.gem) = 78336
diff --git a/databases/rubygem-google-cloud-firestore-v1/pkg-descr b/databases/rubygem-google-cloud-firestore-v1/pkg-descr
new file mode 100644
index 000000000000..29cc3546a52d
--- /dev/null
+++ b/databases/rubygem-google-cloud-firestore-v1/pkg-descr
@@ -0,0 +1,7 @@
+Ruby Client for the Cloud Firestore V1 API
+
+Accesses the NoSQL document database built for automatic scaling, high
+performance, and ease of application development.
+
+Cloud Firestore is a NoSQL document database built for automatic scaling, high
+performance, and ease of application development.
diff --git a/databases/rubygem-google-cloud-firestore/Makefile b/databases/rubygem-google-cloud-firestore/Makefile
new file mode 100644
index 000000000000..f21203550a4e
--- /dev/null
+++ b/databases/rubygem-google-cloud-firestore/Makefile
@@ -0,0 +1,26 @@
+PORTNAME=	google-cloud-firestore
+PORTVERSION=	2.15.0
+CATEGORIES=	databases rubygems
+MASTER_SITES=	RG
+
+MAINTAINER=	sunpoet@FreeBSD.org
+COMMENT=	Official library for Google Cloud Firestore API
+WWW=		https://rubygems.org/gems/google-cloud-firestore
+WWW=		https://cloud.google.com/ruby/docs/reference/google-cloud-firestore/latest/ \
+		https://googleapis.github.io/google-cloud-ruby/docs/ \
+		https://github.com/googleapis/google-cloud-ruby/tree/main/google-cloud-firestore \
+		https://github.com/googleapis/google-cloud-ruby
+
+LICENSE=	APACHE20
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
+RUN_DEPENDS=	rubygem-concurrent-ruby>=1.0<2:devel/rubygem-concurrent-ruby \
+		rubygem-google-cloud-core>=1.5<2:net/rubygem-google-cloud-core \
+		rubygem-google-cloud-firestore-v1>=0.10<1:databases/rubygem-google-cloud-firestore-v1 \
+		rubygem-rbtree>=0.4.2<0.5:devel/rubygem-rbtree
+
+USES=		gem
+
+NO_ARCH=	yes
+
+.include <bsd.port.mk>
diff --git a/databases/rubygem-google-cloud-firestore/distinfo b/databases/rubygem-google-cloud-firestore/distinfo
new file mode 100644
index 000000000000..29272586811e
--- /dev/null
+++ b/databases/rubygem-google-cloud-firestore/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1710712580
+SHA256 (rubygem/google-cloud-firestore-2.15.0.gem) = 721b2aceda1efc591afa556b37df12a9ae5df0c4a0a74190de660a587b5237c3
+SIZE (rubygem/google-cloud-firestore-2.15.0.gem) = 79872
diff --git a/databases/rubygem-google-cloud-firestore/pkg-descr b/databases/rubygem-google-cloud-firestore/pkg-descr
new file mode 100644
index 000000000000..ba4d0188408b
--- /dev/null
+++ b/databases/rubygem-google-cloud-firestore/pkg-descr
@@ -0,0 +1,5 @@
+Cloud Firestore is a NoSQL document database built for automatic scaling, high
+performance, and ease of application development. While the Cloud Firestore
+interface has many of the same features as traditional databases, as a NoSQL
+database it differs from them in the way it describes relationships between data
+objects.
diff --git a/databases/rubygem-her/Makefile b/databases/rubygem-her/Makefile
index b63614adf9b9..e8e6209e5a15 100644
--- a/databases/rubygem-her/Makefile
+++ b/databases/rubygem-her/Makefile
@@ -1,20 +1,21 @@
 PORTNAME=	her
 PORTVERSION=	1.1.1
+PORTREVISION=	1
 CATEGORIES=	databases rubygems
 MASTER_SITES=	RG
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	ORM that maps REST resources to Ruby objects
+WWW=		https://github.com/remi/her
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	rubygem-activemodel4>=4.2.1:databases/rubygem-activemodel4 \
-		rubygem-faraday>=0.8:www/rubygem-faraday \
+		rubygem-faraday1>=0.8:www/rubygem-faraday1 \
 		rubygem-multi_json>=1.7<2:devel/rubygem-multi_json
 
 USES=		gem
-USE_RUBY=	yes
 
 NO_ARCH=	yes
 
diff --git a/databases/rubygem-her/pkg-descr b/databases/rubygem-her/pkg-descr
index f26ad9bfe2f2..f7c1908497c4 100644
--- a/databases/rubygem-her/pkg-descr
+++ b/databases/rubygem-her/pkg-descr
@@ -3,5 +3,3 @@ resources to Ruby objects.
 
 It is designed to build applications that are powered
 by a RESTful API instead of a database.
-
-WWW: https://github.com/remi/her
diff --git a/databases/rubygem-hiredis/Makefile b/databases/rubygem-hiredis/Makefile
index 4da3507a0c04..e77e2e77052d 100644
--- a/databases/rubygem-hiredis/Makefile
+++ b/databases/rubygem-hiredis/Makefile
@@ -1,5 +1,3 @@
-# Created by: Steve Wills <swills@FreeBSD.org>
-
 PORTNAME=	hiredis
 PORTVERSION=	0.6.3
 PORTREVISION=	4
@@ -8,6 +6,7 @@ MASTER_SITES=	RG
 
 MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	Ruby wrapper for hiredis
+WWW=		https://github.com/redis/hiredis-rb
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYING
@@ -15,6 +14,5 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 RUN_DEPENDS=	redis>=0:databases/redis
 
 USES=		gem gmake
-USE_RUBY=	yes
 
 .include <bsd.port.mk>
diff --git a/databases/rubygem-hiredis/pkg-descr b/databases/rubygem-hiredis/pkg-descr
index 1c9441a0dcc1..9d51b62f1387 100644
--- a/databases/rubygem-hiredis/pkg-descr
+++ b/databases/rubygem-hiredis/pkg-descr
@@ -1,4 +1,2 @@
 Ruby wrapper for hiredis (protocol serialization/deserialization and blocking
 I/O)
-
-WWW: https://github.com/redis/hiredis-rb
diff --git a/databases/rubygem-influxdb/Makefile b/databases/rubygem-influxdb/Makefile
index 1cb143129ac1..a665ecdf5282 100644
--- a/databases/rubygem-influxdb/Makefile
+++ b/databases/rubygem-influxdb/Makefile
@@ -1,18 +1,15 @@
-# Created by: Matthias Fechner <mfechner@FreeBSD.org>
-
 PORTNAME=	influxdb
-PORTVERSION=	0.7.0
-PORTREVISION=	0
+PORTVERSION=	0.8.1
 CATEGORIES=	databases rubygems
 MASTER_SITES=	RG
 
 MAINTAINER=	mfechner@FreeBSD.org
 COMMENT=	Ruby library for InfluxDB
+WWW=		http://influxdb.org/
 
 LICENSE=	MIT
 
 USES=		gem
-USE_RUBY=	yes
 
 NO_ARCH=	yes
 
diff --git a/databases/rubygem-influxdb/distinfo b/databases/rubygem-influxdb/distinfo
index 1e8876655174..847ea16b4a01 100644
--- a/databases/rubygem-influxdb/distinfo
+++ b/databases/rubygem-influxdb/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1556201882
-SHA256 (rubygem/influxdb-0.7.0.gem) = a943a6f7b1d93cc3b627a50bc44b83cfad3fe0e102eac610b983e4d515412b60
-SIZE (rubygem/influxdb-0.7.0.gem) = 43520
+TIMESTAMP = 1644234690
+SHA256 (rubygem/influxdb-0.8.1.gem) = 9cb4d358bb0b0e2667a28f00d7a86bdd97716478ffd0f1a46c6a703591935ad0
+SIZE (rubygem/influxdb-0.8.1.gem) = 45568
diff --git a/databases/rubygem-influxdb/pkg-descr b/databases/rubygem-influxdb/pkg-descr
index a3a18d5fa654..aef2209e0b31 100644
--- a/databases/rubygem-influxdb/pkg-descr
+++ b/databases/rubygem-influxdb/pkg-descr
@@ -1,3 +1 @@
 This is the official Ruby library for InfluxDB.
-
-WWW: http://influxdb.org/
diff --git a/databases/rubygem-jdbc-mysql/Makefile b/databases/rubygem-jdbc-mysql/Makefile
index c011eaae3530..2e4982f4db36 100644
--- a/databases/rubygem-jdbc-mysql/Makefile
+++ b/databases/rubygem-jdbc-mysql/Makefile
@@ -1,5 +1,3 @@
-# Created by: Alexander Logvinov <ports@logvinov,com>
-
 PORTNAME=	jdbc-mysql
 PORTVERSION=	5.1.44
 CATEGORIES=	databases rubygems java
@@ -7,6 +5,7 @@ MASTER_SITES=	RG
 
 MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	MySQL JDBC driver for JRuby
+WWW=		https://github.com/jruby/activerecord-jdbc-adapter/tree/master/jdbc-mysql
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
@@ -14,7 +13,6 @@ LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 RUN_DEPENDS=	jruby:lang/jruby
 
 NO_ARCH=	yes
-USE_RUBY=	yes
 USES=		gem
 
 .include <bsd.port.mk>
diff --git a/databases/rubygem-jdbc-mysql/pkg-descr b/databases/rubygem-jdbc-mysql/pkg-descr
index b3e747dd9437..6d5099bc482c 100644
--- a/databases/rubygem-jdbc-mysql/pkg-descr
+++ b/databases/rubygem-jdbc-mysql/pkg-descr
@@ -3,5 +3,3 @@ This is a MySQL JDBC driver gem for JRuby. Use
    require 'jdbc/mysql'
 
 to make the driver accessible to JDBC and ActiveRecord code running in JRuby.
-
-WWW: https://github.com/jruby/activerecord-jdbc-adapter/tree/master/jdbc-mysql
diff --git a/databases/rubygem-leo_manager_client/Makefile b/databases/rubygem-leo_manager_client/Makefile
index c3a80964b142..20958d10c480 100644
--- a/databases/rubygem-leo_manager_client/Makefile
+++ b/databases/rubygem-leo_manager_client/Makefile
@@ -1,5 +1,3 @@
-# Created by: Mikolaj Golub <trociny@FreeBSD.org>
-
 PORTNAME=	leo_manager_client
 PORTVERSION=	0.4.13
 CATEGORIES=	databases
@@ -7,12 +5,12 @@ MASTER_SITES=	RG
 
 MAINTAINER=	trociny@FreeBSD.org
 COMMENT=	LeoFS-Manager client library for Ruby
+WWW=		https://leo-project.net/
 
 LICENSE=	APACHE20
 
 NO_ARCH=	yes
 
-USE_RUBY=	yes
 USES=		gem
 
 .include <bsd.port.mk>
diff --git a/databases/rubygem-leo_manager_client/pkg-descr b/databases/rubygem-leo_manager_client/pkg-descr
index 1f35c9238bf3..90950ec1fa81 100644
--- a/databases/rubygem-leo_manager_client/pkg-descr
+++ b/databases/rubygem-leo_manager_client/pkg-descr
@@ -1,5 +1,3 @@
 LeoFS is a highly scalable, fault-tolerant distributed file system
 for the Web. This library allows any Ruby application to communicate
 with LeoFS manager.
-
-WWW: http://leo-project.net/
diff --git a/databases/rubygem-marginalia/Makefile b/databases/rubygem-marginalia/Makefile
index 04dccda48f79..0be937b94511 100644
--- a/databases/rubygem-marginalia/Makefile
+++ b/databases/rubygem-marginalia/Makefile
@@ -1,21 +1,21 @@
-# Created by Matthias Fechner <mfechner@FreeBSD.org>
-
 PORTNAME=	marginalia
-PORTVERSION=	1.10.1
+PORTVERSION=	1.11.1
+PORTREVISION=	1
 CATEGORIES=	databases rubygems
 MASTER_SITES=	RG
 
 MAINTAINER=	mfechner@FreeBSD.org
 COMMENT=	Attach comments to your ActiveRecord queries
+WWW=		https://github.com/basecamp/marginalia
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	rubygem-actionpack61>=2.3:www/rubygem-actionpack61 \
-		rubygem-activerecord61>=2.3:databases/rubygem-activerecord61
+RUN_DEPENDS=	rubygem-actionpack70>=2.3:www/rubygem-actionpack70 \
+		rubygem-activerecord70>=2.3:databases/rubygem-activerecord70
 
-USES=		gem
-USE_RUBY=	yes
+USES=		cpe gem
+CPE_VENDOR=	${PORTNAME}_project
 
 NO_ARCH=	yes
 
diff --git a/databases/rubygem-marginalia/distinfo b/databases/rubygem-marginalia/distinfo
index 9237cd895cf2..96111763390a 100644
--- a/databases/rubygem-marginalia/distinfo
+++ b/databases/rubygem-marginalia/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1626361053
-SHA256 (rubygem/marginalia-1.10.1.gem) = 024b406e9d461499f7f8aa4ae8a91711039e40dcaaa2a182e7a7c32c1b68a641
-SIZE (rubygem/marginalia-1.10.1.gem) = 13824
+TIMESTAMP = 1668838137
+SHA256 (rubygem/marginalia-1.11.1.gem) = cb63212ab63e42746e27595e912cb20408a1a28bcd0edde55d15b7c45fa289cf
+SIZE (rubygem/marginalia-1.11.1.gem) = 17408
diff --git a/databases/rubygem-marginalia/pkg-descr b/databases/rubygem-marginalia/pkg-descr
index ebafdc781571..f51eddcf6bf0 100644
--- a/databases/rubygem-marginalia/pkg-descr
+++ b/databases/rubygem-marginalia/pkg-descr
@@ -1,4 +1,2 @@
 Attach comments to your ActiveRecord queries. By default, it adds the
 application, controller, and action names as a comment at the end of each query.
-
-WWW: https://github.com/basecamp/marginalia
diff --git a/databases/rubygem-mario-redis-lock/Makefile b/databases/rubygem-mario-redis-lock/Makefile
index 42c0097ad168..bef18e5254af 100644
--- a/databases/rubygem-mario-redis-lock/Makefile
+++ b/databases/rubygem-mario-redis-lock/Makefile
@@ -5,13 +5,13 @@ MASTER_SITES=	RG
 
 MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	Ruby distributed lock using Redis, with emphasis in transparency
+WWW=		https://github.com/marioizquierdo/mario-redis-lock
 
 LICENSE=	MIT
 
 RUN_DEPENDS=	rubygem-redis>=3.0.5:databases/rubygem-redis
 
 USES=		gem
-USE_RUBY=	yes
 
 NO_ARCH=	yes
 
diff --git a/databases/rubygem-mario-redis-lock/pkg-descr b/databases/rubygem-mario-redis-lock/pkg-descr
index c05335415da7..f8b6e5ad1b66 100644
--- a/databases/rubygem-mario-redis-lock/pkg-descr
+++ b/databases/rubygem-mario-redis-lock/pkg-descr
@@ -2,5 +2,3 @@ This is yet another Ruby distributed lock using Redis, with an emphasis on
 transparency. It requires Redis version 2.6.12 or later, because it uses the
 syntax for SET introduced in that version to easily implement the robust
 algorithm described in the SET command documentation.
-
-WWW: https://github.com/marioizquierdo/mario-redis-lock
diff --git a/databases/rubygem-memcache-client/Makefile b/databases/rubygem-memcache-client/Makefile
index 86bfca3b835a..cb015770ad98 100644
--- a/databases/rubygem-memcache-client/Makefile
+++ b/databases/rubygem-memcache-client/Makefile
@@ -1,5 +1,3 @@
-# Created by: Jonathan Weiss (<jw@innerewut.de>)
-
 PORTNAME=	memcache-client
 PORTVERSION=	1.8.5
 CATEGORIES=	databases rubygems
@@ -7,12 +5,12 @@ MASTER_SITES=	RG
 
 MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	Ruby bindings for MemCached
+WWW=		https://github.com/mperham/memcache-client
 
 LICENSE=	BSD3CLAUSE
 
 NO_ARCH=	yes
 
-USE_RUBY=	yes
 USES=		gem
 
 PLIST_FILES=	bin/memcached_top
diff --git a/databases/rubygem-memcache-client/pkg-descr b/databases/rubygem-memcache-client/pkg-descr
index 0036309c2b64..01d66594628e 100644
--- a/databases/rubygem-memcache-client/pkg-descr
+++ b/databases/rubygem-memcache-client/pkg-descr
@@ -2,5 +2,3 @@ MemCache Client
 
 memcache-client is a pure Ruby client for memcached. It is nearly
 a drop-in replacement for Ruby MemCache (databases/ruby-memcache).
-
-WWW: https://github.com/mperham/memcache-client
diff --git a/databases/rubygem-memcache/Makefile b/databases/rubygem-memcache/Makefile
index b5acd183c954..cd6a8b09923b 100644
--- a/databases/rubygem-memcache/Makefile
+++ b/databases/rubygem-memcache/Makefile
@@ -1,5 +1,3 @@
-# Created by: Mikhail T. <michael@fun-box.ru>
-
 PORTNAME=	memcache
 PORTVERSION=	1.5.1
 PORTREVISION=	1
@@ -8,6 +6,7 @@ MASTER_SITES=	RG
 
 MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	Ruby bindings for libmemcached
+WWW=		https://github.com/ninjudd/memcache
 
 LICENSE=	MIT
 
@@ -15,7 +14,6 @@ LIB_DEPENDS=	libmemcached.so:databases/libmemcached
 
 CONFIGURE_ARGS=	--with-opt-dir=${LOCALBASE}
 GEM_ENV=	EXTERNAL_LIB="yes"
-USE_RUBY=	yes
 USES=		gem
 
 .include <bsd.port.mk>
diff --git a/databases/rubygem-memcache/pkg-descr b/databases/rubygem-memcache/pkg-descr
index 1287a77447af..f9747eea77f6 100644
--- a/databases/rubygem-memcache/pkg-descr
+++ b/databases/rubygem-memcache/pkg-descr
@@ -2,5 +2,3 @@ rubygem-memcache
 
 Ruby client for memcached supporting advanced
 protocol features and pluggable architecture.
-
-WWW: https://github.com/ninjudd/memcache
diff --git a/databases/rubygem-mysql/Makefile b/databases/rubygem-mysql/Makefile
index 9a9ecdebf21c..41655af7f89c 100644
--- a/databases/rubygem-mysql/Makefile
+++ b/databases/rubygem-mysql/Makefile
@@ -1,17 +1,17 @@
-# Created by: Ryan Steinmetz <zi@FreeBSD.org>
-
 PORTNAME=	mysql
 PORTVERSION=	2.9.1
+PORTREVISION=	4
 CATEGORIES=	databases rubygems
 MASTER_SITES=	RG
 
 MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	MySQL API module for Ruby
+WWW=		https://github.com/luislavena/mysql-gem
 
 LICENSE=	GPLv2 RUBY
 LICENSE_COMB=	dual
 
-USE_RUBY=	yes
 USES=		gem mysql
+IGNORE_WITH_MYSQL=	80 81
 
 .include <bsd.port.mk>
diff --git a/databases/rubygem-mysql/files/patch-ext-mysql_api-extconf.rb b/databases/rubygem-mysql/files/patch-ext-mysql_api-extconf.rb
new file mode 100644
index 000000000000..5a81b1eb5fb3
--- /dev/null
+++ b/databases/rubygem-mysql/files/patch-ext-mysql_api-extconf.rb
@@ -0,0 +1,11 @@
+--- ext/mysql_api/extconf.rb.orig	2024-01-21 14:47:39 UTC
++++ ext/mysql_api/extconf.rb
+@@ -76,6 +76,8 @@ IO.foreach('confout') do |l|
+   next unless l =~ /errmsg\.h|mysqld_error\.h/
+   fn = l.split(/\"/)[1]
+   IO.foreach(fn) do |m|
++    next if m =~ /ER_UNKNOWN_ERROR_CODE/
++
+     if m =~ /^#define\s+([CE]R_[0-9A-Z_]+)/ then
+       error_syms << $1
+     end
diff --git a/databases/rubygem-mysql/files/patch-ext-mysql_api-mysql.c b/databases/rubygem-mysql/files/patch-ext-mysql_api-mysql.c
index 749e6b92282c..c7d41962b868 100644
--- a/databases/rubygem-mysql/files/patch-ext-mysql_api-mysql.c
+++ b/databases/rubygem-mysql/files/patch-ext-mysql_api-mysql.c
@@ -1,5 +1,27 @@
---- ext/mysql_api/mysql.c.orig	2020-05-29 23:08:40 UTC
+--- ext/mysql_api/mysql.c.orig	2024-03-11 10:33:12 UTC
 +++ ext/mysql_api/mysql.c
+@@ -170,7 +170,7 @@ static void mysql_raise(MYSQL* m)
+     VALUE e = rb_exc_new2(eMysql, mysql_error(m));
+     rb_iv_set(e, "errno", INT2FIX(mysql_errno(m)));
+ #if MYSQL_VERSION_ID >= 40101
+-    rb_iv_set(e, "sqlstate", rb_tainted_str_new2(mysql_sqlstate(m)));
++    rb_iv_set(e, "sqlstate", rb_str_new_cstr(mysql_sqlstate(m)));
+ #endif
+     rb_exc_raise(e);
+ }
+@@ -197,9 +197,9 @@ static VALUE make_field_obj(MYSQL_FIELD* f)
+     if (f == NULL)
+ 	return Qnil;
+     obj = rb_obj_alloc(cMysqlField);
+-    rb_iv_set(obj, "name", f->name? rb_str_freeze(rb_tainted_str_new2(f->name)): Qnil);
+-    rb_iv_set(obj, "table", f->table? rb_str_freeze(rb_tainted_str_new2(f->table)): Qnil);
+-    rb_iv_set(obj, "def", f->def? rb_str_freeze(rb_tainted_str_new2(f->def)): Qnil);
++    rb_iv_set(obj, "name", f->name? rb_str_freeze(rb_str_new_cstr(f->name)): Qnil);
++    rb_iv_set(obj, "table", f->table? rb_str_freeze(rb_str_new_cstr(f->table)): Qnil);
++    rb_iv_set(obj, "def", f->def? rb_str_freeze(rb_str_new_cstr(f->def)): Qnil);
+     rb_iv_set(obj, "type", INT2NUM(f->type));
+     rb_iv_set(obj, "length", INT2NUM(f->length));
+     rb_iv_set(obj, "max_length", INT2NUM(f->max_length));
 @@ -273,7 +273,10 @@ static VALUE real_connect(int argc, VALUE* argv, VALUE
      rb_thread_start_timer();
  #endif
@@ -11,6 +33,15 @@
      myp->connection = Qtrue;
      myp->query_with_result = Qtrue;
      rb_obj_call_init(obj, argc, argv);
+@@ -294,7 +297,7 @@ static VALUE escape_string(VALUE klass, VALUE str)
+ /*	client_info()	*/
+ static VALUE client_info(VALUE klass)
+ {
+-    return rb_tainted_str_new2(mysql_get_client_info());
++    return rb_str_new_cstr(mysql_get_client_info());
+ }
+ 
+ #if MYSQL_VERSION_ID >= 32332
 @@ -347,7 +350,10 @@ static VALUE real_connect2(int argc, VALUE* argv, VALU
  #ifdef HAVE_RB_THREAD_START_TIMER
      rb_thread_start_timer();
@@ -22,6 +53,92 @@
      GetMysqlStruct(obj)->connection = Qtrue;
  
      return obj;
+@@ -469,7 +475,7 @@ static VALUE change_user(int argc, VALUE* argv, VALUE 
+ /*	character_set_name()	*/
+ static VALUE character_set_name(VALUE obj)
+ {
+-    return rb_tainted_str_new2(mysql_character_set_name(GetHandler(obj)));
++    return rb_str_new_cstr(mysql_character_set_name(GetHandler(obj)));
+ }
+ #endif
+ 
+@@ -534,7 +540,7 @@ static VALUE field_count(VALUE obj)
+ /*	host_info()	*/
+ static VALUE host_info(VALUE obj)
+ {
+-    return rb_tainted_str_new2(mysql_get_host_info(GetHandler(obj)));
++    return rb_str_new_cstr(mysql_get_host_info(GetHandler(obj)));
+ }
+ 
+ /*	proto_info()	*/
+@@ -546,14 +552,14 @@ static VALUE proto_info(VALUE obj)
+ /*	server_info()	*/
+ static VALUE server_info(VALUE obj)
+ {
+-    return rb_tainted_str_new2(mysql_get_server_info(GetHandler(obj)));
++    return rb_str_new_cstr(mysql_get_server_info(GetHandler(obj)));
+ }
+ 
+ /*	info()		*/
+ static VALUE info(VALUE obj)
+ {
+     const char* p = mysql_info(GetHandler(obj));
+-    return p? rb_tainted_str_new2(p): Qnil;
++    return p? rb_str_new_cstr(p): Qnil;
+ }
+ 
+ /*	insert_id()	*/
+@@ -588,7 +594,7 @@ static VALUE list_dbs(int argc, VALUE* argv, VALUE obj
+     n = mysql_num_rows(res);
+     ret = rb_ary_new2(n);
+     for (i=0; i<n; i++)
+-	rb_ary_store(ret, i, rb_tainted_str_new2(mysql_fetch_row(res)[0]));
++	rb_ary_store(ret, i, rb_str_new_cstr(mysql_fetch_row(res)[0]));
+     mysql_free_result(res);
+     return ret;
+ }
+@@ -633,7 +639,7 @@ static VALUE list_tables(int argc, VALUE* argv, VALUE 
+     n = mysql_num_rows(res);
+     ret = rb_ary_new2(n);
+     for (i=0; i<n; i++)
+-	rb_ary_store(ret, i, rb_tainted_str_new2(mysql_fetch_row(res)[0]));
++	rb_ary_store(ret, i, rb_str_new_cstr(mysql_fetch_row(res)[0]));
+     mysql_free_result(res);
+     return ret;
+ }
+@@ -697,7 +703,7 @@ static VALUE my_stat(VALUE obj)
+     const char* s = mysql_stat(m);
+     if (s == NULL)
+ 	mysql_raise(m);
+-    return rb_tainted_str_new2(s);
++    return rb_str_new_cstr(s);
+ }
+ 
+ /*	store_result()	*/
+@@ -864,7 +870,7 @@ static VALUE set_server_option(VALUE obj, VALUE option
+ static VALUE sqlstate(VALUE obj)
+ {
+     MYSQL *m = GetHandler(obj);
+-    return rb_tainted_str_new2(mysql_sqlstate(m));
++    return rb_str_new_cstr(mysql_sqlstate(m));
+ }
+ #endif
+ 
+@@ -875,12 +881,12 @@ static VALUE stmt_init(VALUE obj)
+     MYSQL *m = GetHandler(obj);
+     MYSQL_STMT *s;
+     struct mysql_stmt* stmt;
+-    my_bool true = 1;
++    my_bool mytrue = 1;
+     VALUE st_obj;
+ 
+     if ((s = mysql_stmt_init(m)) == NULL)
+ 	mysql_raise(m);
+-    if (mysql_stmt_attr_set(s, STMT_ATTR_UPDATE_MAX_LENGTH, &true))
++    if (mysql_stmt_attr_set(s, STMT_ATTR_UPDATE_MAX_LENGTH, &mytrue))
+ 	rb_raise(rb_eArgError, "mysql_stmt_attr_set() failed");
+     st_obj = Data_Make_Struct(cMysqlStmt, struct mysql_stmt, 0, free_mysqlstmt, stmt);
+     memset(stmt, 0, sizeof(*stmt));
 @@ -917,13 +923,21 @@ static VALUE query_with_result_set(VALUE obj, VALUE fl
  /*	reconnect()	*/
  static VALUE reconnect(VALUE obj)
@@ -44,6 +161,51 @@
      return flag;
  }
  
+@@ -1029,7 +1043,7 @@ static VALUE fetch_row(VALUE obj)
+ 	return Qnil;
+     ary = rb_ary_new2(n);
+     for (i=0; i<n; i++)
+-	rb_ary_store(ary, i, row[i]? rb_tainted_str_new(row[i], lengths[i]): Qnil);
++	rb_ary_store(ary, i, row[i]? rb_str_new(row[i], lengths[i]): Qnil);
+     return ary;
+ }
+ 
+@@ -1053,7 +1067,7 @@ static VALUE fetch_hash2(VALUE obj, VALUE with_table)
+         if (colname == Qnil) {
+             colname = rb_ary_new2(n);
+             for (i=0; i<n; i++) {
+-                VALUE s = rb_tainted_str_new2(fields[i].name);
++                VALUE s = rb_str_new_cstr(fields[i].name);
+                 rb_obj_freeze(s);
+                 rb_ary_store(colname, i, s);
+             }
+@@ -1066,7 +1080,7 @@ static VALUE fetch_hash2(VALUE obj, VALUE with_table)
+             colname = rb_ary_new2(n);
+             for (i=0; i<n; i++) {
+                 int len = strlen(fields[i].table)+strlen(fields[i].name)+1;
+-                VALUE s = rb_tainted_str_new(NULL, len);
++                VALUE s = rb_str_new(NULL, len);
+                 snprintf(RSTRING_PTR(s), len+1, "%s.%s", fields[i].table, fields[i].name);
+                 rb_obj_freeze(s);
+                 rb_ary_store(colname, i, s);
+@@ -1076,7 +1090,7 @@ static VALUE fetch_hash2(VALUE obj, VALUE with_table)
+         }
+     }
+     for (i=0; i<n; i++) {
+-        rb_hash_aset(hash, rb_ary_entry(colname, i), row[i]? rb_tainted_str_new(row[i], lengths[i]): Qnil);
++        rb_hash_aset(hash, rb_ary_entry(colname, i), row[i]? rb_str_new(row[i], lengths[i]): Qnil);
+     }
+     return hash;
+ }
+@@ -1257,7 +1271,7 @@ static void mysql_stmt_raise(MYSQL_STMT* s)
+ {
+     VALUE e = rb_exc_new2(eMysql, mysql_stmt_error(s));
+     rb_iv_set(e, "errno", INT2FIX(mysql_stmt_errno(s)));
+-    rb_iv_set(e, "sqlstate", rb_tainted_str_new2(mysql_stmt_sqlstate(s)));
++    rb_iv_set(e, "sqlstate", rb_str_new_cstr(mysql_stmt_sqlstate(s)));
+     rb_exc_raise(e);
+ }
+ 
 @@ -1317,7 +1331,7 @@ static VALUE stmt_bind_result(int argc, VALUE *argv, V
  	}
  	else if (argv[i] == rb_cString)
@@ -53,3 +215,42 @@
  	    s->result.bind[i].buffer_type = MYSQL_TYPE_LONGLONG;
  	else if (argv[i] == rb_cFloat)
  	    s->result.bind[i].buffer_type = MYSQL_TYPE_DOUBLE;
+@@ -1573,7 +1587,7 @@ static VALUE stmt_fetch(VALUE obj)
+             case MYSQL_TYPE_NEWDECIMAL:
+             case MYSQL_TYPE_BIT:
+ #endif
+-                v = rb_tainted_str_new(s->result.bind[i].buffer, s->result.length[i]);
++                v = rb_str_new(s->result.bind[i].buffer, s->result.length[i]);
+                 break;
+             default:
+                 rb_raise(rb_eTypeError, "unknown buffer_type: %d", s->result.bind[i].buffer_type);
+@@ -1762,7 +1776,7 @@ static VALUE stmt_send_long_data(VALUE obj, VALUE col,
+ static VALUE stmt_sqlstate(VALUE obj)
+ {
+     struct mysql_stmt* s = DATA_PTR(obj);
+-    return rb_tainted_str_new2(mysql_stmt_sqlstate(s->stmt));
++    return rb_str_new_cstr(mysql_stmt_sqlstate(s->stmt));
+ }
+ 
+ /*-------------------------------
+@@ -1884,6 +1898,7 @@ static VALUE error_sqlstate(VALUE obj)
+ 
+ void Init_mysql_api(void)
+ {
++#if 0
+     int i;
+     int dots = 0;
+     const char *lib = mysql_get_client_info();
+@@ -1898,9 +1913,12 @@ void Init_mysql_api(void)
+             return;
+         }
+     }
++#endif
+ 
+     cMysql = rb_define_class("Mysql", rb_cObject);
++    rb_undef_alloc_func(cMysql);
+     cMysqlRes = rb_define_class_under(cMysql, "Result", rb_cObject);
++    rb_undef_alloc_func(cMysqlRes);
+     cMysqlField = rb_define_class_under(cMysql, "Field", rb_cObject);
+ #if MYSQL_VERSION_ID >= 40102
+     cMysqlStmt = rb_define_class_under(cMysql, "Stmt", rb_cObject);
diff --git a/databases/rubygem-mysql/pkg-descr b/databases/rubygem-mysql/pkg-descr
index 8765e2a9df90..ba0364e0ddd7 100644
--- a/databases/rubygem-mysql/pkg-descr
+++ b/databases/rubygem-mysql/pkg-descr
@@ -1,4 +1,2 @@
 This is the MySQL API module for Ruby. It provides the same functions for Ruby
 programs that the MySQL C API provides for C programs.
-
-WWW: https://github.com/luislavena/mysql-gem
diff --git a/databases/rubygem-mysql2/Makefile b/databases/rubygem-mysql2/Makefile
index 3904bd8fa294..877861440b11 100644
--- a/databases/rubygem-mysql2/Makefile
+++ b/databases/rubygem-mysql2/Makefile
@@ -1,17 +1,15 @@
-# Created by: Kimo <kimor79@yahoo.com>
-
 PORTNAME=	mysql2
-PORTVERSION=	0.5.3
+PORTVERSION=	0.5.6
 CATEGORIES=	databases rubygems
 MASTER_SITES=	RG
 
 MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	Simple, fast MySQL library for Ruby, binding to libmysql
+WWW=		https://github.com/brianmario/mysql2
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		gem mysql ssl
-USE_RUBY=	yes
 
 .include <bsd.port.mk>
diff --git a/databases/rubygem-mysql2/distinfo b/databases/rubygem-mysql2/distinfo
index 8bf672f2f875..f4bab9818234 100644
--- a/databases/rubygem-mysql2/distinfo
+++ b/databases/rubygem-mysql2/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1595416797
-SHA256 (rubygem/mysql2-0.5.3.gem) = 5ca2d97d9c25fa27dc67eca77dd8d73f12576c4cd4f6f6c18b12925a3cbb2434
-SIZE (rubygem/mysql2-0.5.3.gem) = 74240
+TIMESTAMP = 1708450752
+SHA256 (rubygem/mysql2-0.5.6.gem) = 70f447d45d6b3cc16b00f7dd30366f708a81b4093a35d026ff7135d778d8da33
+SIZE (rubygem/mysql2-0.5.6.gem) = 86528
diff --git a/databases/rubygem-mysql2/pkg-descr b/databases/rubygem-mysql2/pkg-descr
index 6587a2e0537e..c94120b5578e 100644
--- a/databases/rubygem-mysql2/pkg-descr
+++ b/databases/rubygem-mysql2/pkg-descr
@@ -1,5 +1,3 @@
 The Mysql2 gem is meant to serve the extremely common use-case of connecting,
 querying and iterating on results. Some database libraries out there serve as
 direct 1:1 mappings of the already complex C API's available. This one is not.
-
-WWW: https://github.com/brianmario/mysql2
diff --git a/databases/rubygem-mysql204/Makefile b/databases/rubygem-mysql204/Makefile
deleted file mode 100644
index e68a1af158bc..000000000000
--- a/databases/rubygem-mysql204/Makefile
+++ /dev/null
@@ -1,20 +0,0 @@
-# Created by: Kimo <kimor79@yahoo.com>
-
-PORTNAME=	mysql2
-PORTVERSION=	0.4.10
-CATEGORIES=	databases rubygems
-MASTER_SITES=	RG
-PKGNAMESUFFIX=	04
-
-MAINTAINER=	ruby@FreeBSD.org
-COMMENT=	Simple, fast MySQL library for Ruby, binding to libmysql
-
-LICENSE=	MIT
-LICENSE_FILE=	${WRKSRC}/LICENSE
-
-USES=		gem mysql ssl
-USE_RUBY=	yes
-
-PORTSCOUT=	limit:^0\.4\.
-
-.include <bsd.port.mk>
diff --git a/databases/rubygem-mysql204/distinfo b/databases/rubygem-mysql204/distinfo
deleted file mode 100644
index 95736524f3ca..000000000000
--- a/databases/rubygem-mysql204/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1510757747
-SHA256 (rubygem/mysql2-0.4.10.gem) = 38960c148f7b9f7b0f6513c92217b5961396a5f162c1ac1b55890365f8494d62
-SIZE (rubygem/mysql2-0.4.10.gem) = 97792
diff --git a/databases/rubygem-mysql204/pkg-descr b/databases/rubygem-mysql204/pkg-descr
deleted file mode 100644
index 6587a2e0537e..000000000000
--- a/databases/rubygem-mysql204/pkg-descr
+++ /dev/null
@@ -1,5 +0,0 @@
-The Mysql2 gem is meant to serve the extremely common use-case of connecting,
-querying and iterating on results. Some database libraries out there serve as
-direct 1:1 mappings of the already complex C API's available. This one is not.
-
-WWW: https://github.com/brianmario/mysql2
diff --git a/databases/rubygem-neighbor/Makefile b/databases/rubygem-neighbor/Makefile
new file mode 100644
index 000000000000..7815a0d21eff
--- /dev/null
+++ b/databases/rubygem-neighbor/Makefile
@@ -0,0 +1,18 @@
+PORTNAME=	neighbor
+PORTVERSION=	0.2.3
+CATEGORIES=	databases rubygems
+MASTER_SITES=	RG
+
+MAINTAINER=	mfechner@FreeBSD.org
+COMMENT=	Ruby nearest neighbor search for Rails and Postgres
+WWW=		https://github.com/ankane/neighbor
+
+LICENSE=	MIT
+
+RUN_DEPENDS=	rubygem-activerecord61>=5.2:databases/rubygem-activerecord61
+
+USES=		gem
+
+NO_ARCH=	yes
+
+.include <bsd.port.mk>
diff --git a/databases/rubygem-neighbor/distinfo b/databases/rubygem-neighbor/distinfo
new file mode 100644
index 000000000000..1747db5d0ee1
--- /dev/null
+++ b/databases/rubygem-neighbor/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1684385631
+SHA256 (rubygem/neighbor-0.2.3.gem) = 70887ac2110d0c7ab243ee988f64359b8bb94a63a0c78542bbeef4f33b1933e5
+SIZE (rubygem/neighbor-0.2.3.gem) = 10752
diff --git a/databases/rubygem-neighbor/pkg-descr b/databases/rubygem-neighbor/pkg-descr
new file mode 100644
index 000000000000..cc45498bf71e
--- /dev/null
+++ b/databases/rubygem-neighbor/pkg-descr
@@ -0,0 +1 @@
+Nearest neighbor search for Rails and Postgres
diff --git a/databases/rubygem-openid-redis-store/Makefile b/databases/rubygem-openid-redis-store/Makefile
index ee48a5fda866..4da26595a38f 100644
--- a/databases/rubygem-openid-redis-store/Makefile
+++ b/databases/rubygem-openid-redis-store/Makefile
@@ -1,5 +1,3 @@
-# Created by: Steve Wills <swills@FreeBSD.org>
-
 PORTNAME=	openid-redis-store
 PORTVERSION=	0.0.2
 PORTREVISION=	1
@@ -8,13 +6,13 @@ MASTER_SITES=	RG
 
 MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	Redis store for OpenID
+WWW=		https://github.com/dekart/openid-redis-store
 
 RUN_DEPENDS=	rubygem-redis>=0:databases/rubygem-redis \
 		rubygem-ruby-openid>=0:net/rubygem-ruby-openid
 
 NO_ARCH=	yes
 
-USE_RUBY=	yes
 USES=		gem
 
 .include <bsd.port.mk>
diff --git a/databases/rubygem-openid-redis-store/pkg-descr b/databases/rubygem-openid-redis-store/pkg-descr
index 866845b8f01a..e3d37c16c04e 100644
--- a/databases/rubygem-openid-redis-store/pkg-descr
+++ b/databases/rubygem-openid-redis-store/pkg-descr
@@ -1,4 +1,2 @@
 Implementation of the ruby-openid Store interface that stores information in
 Redis
-
-WWW: https://github.com/dekart/openid-redis-store
diff --git a/databases/rubygem-paranoia/Makefile b/databases/rubygem-paranoia/Makefile
index 1243115ba3df..42d54aff1aa2 100644
--- a/databases/rubygem-paranoia/Makefile
+++ b/databases/rubygem-paranoia/Makefile
@@ -1,20 +1,18 @@
-# Created by: Torsten Zuhlsdorff <ports@toco-domains.de>
-
 PORTNAME=	paranoia
-PORTVERSION=	2.4.3
+PORTVERSION=	2.6.3
 CATEGORIES=	databases rubygems
 MASTER_SITES=	RG
 
 MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	Soft deletion mapper for activerecord
+WWW=		https://github.com/rubysherpas/paranoia
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	rubygem-activerecord4>=4.0<6.2:databases/rubygem-activerecord4
+RUN_DEPENDS=	rubygem-activerecord60>=5.1<7.2:databases/rubygem-activerecord60
 
 USES=		gem
-USE_RUBY=	yes
 
 NO_ARCH=	yes
 
diff --git a/databases/rubygem-paranoia/distinfo b/databases/rubygem-paranoia/distinfo
index 9fd260642993..a24854c544bd 100644
--- a/databases/rubygem-paranoia/distinfo
+++ b/databases/rubygem-paranoia/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1624630248
-SHA256 (rubygem/paranoia-2.4.3.gem) = b17f479482b584770cc9a76a992fff194b62ae7acc7c9fdd50fd3f8fd3fef40a
-SIZE (rubygem/paranoia-2.4.3.gem) = 23040
+TIMESTAMP = 1697463224
+SHA256 (rubygem/paranoia-2.6.3.gem) = e7626868a603442311d4bb5934615f59b912f9b4afd3522f6904a019dae9a3a1
+SIZE (rubygem/paranoia-2.6.3.gem) = 18432
diff --git a/databases/rubygem-paranoia/pkg-descr b/databases/rubygem-paranoia/pkg-descr
index bc09c172ddcc..fa50d231a0f5 100644
--- a/databases/rubygem-paranoia/pkg-descr
+++ b/databases/rubygem-paranoia/pkg-descr
@@ -1,3 +1 @@
 Paranoia adds soft deletion feature for activerecord.
-
-WWW: https://github.com/rubysherpas/paranoia
diff --git a/databases/rubygem-pg/Makefile b/databases/rubygem-pg/Makefile
index 6c60a68eede2..98f9fa4bc41b 100644
--- a/databases/rubygem-pg/Makefile
+++ b/databases/rubygem-pg/Makefile
@@ -1,12 +1,11 @@
-# Created by: Wen Heping <wenheping@gmail.com>
-
 PORTNAME=	pg
-PORTVERSION=	1.2.3
+PORTVERSION=	1.5.6
 CATEGORIES=	databases rubygems
 MASTER_SITES=	RG
 
 MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	Ruby interface to PostgreSQL library
+WWW=		https://github.com/ged/ruby-pg
 
 LICENSE=	BSD2CLAUSE RUBY
 LICENSE_COMB=	dual
@@ -14,7 +13,6 @@ LICENSE_FILE_BSD2CLAUSE=${WRKSRC}/BSDL
 LICENSE_FILE_RUBY=	${WRKSRC}/LICENSE
 
 USES=		gem pgsql
-USE_RUBY=	yes
 
 CONFIGURE_ARGS=	--with-pgsql-include-dir=`${PG_CONFIG} --includedir` \
 		--with-pgsql-lib-dir=`${PG_CONFIG} --libdir`
diff --git a/databases/rubygem-pg/distinfo b/databases/rubygem-pg/distinfo
index 366e6cca34f7..4c42d8f193a5 100644
--- a/databases/rubygem-pg/distinfo
+++ b/databases/rubygem-pg/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1600949255
-SHA256 (rubygem/pg-1.2.3.gem) = f2e71e101eb7fc297222fa9a277a89a9686729a8dfa416d46408e696b5cfae8e
-SIZE (rubygem/pg-1.2.3.gem) = 196608
+TIMESTAMP = 1709391160
+SHA256 (rubygem/pg-1.5.6.gem) = 4bc3ad2438825eea68457373555e3fd4ea1a82027b8a6be98ef57c0d57292b1c
+SIZE (rubygem/pg-1.5.6.gem) = 221184
diff --git a/databases/rubygem-pg/pkg-descr b/databases/rubygem-pg/pkg-descr
index d0484d1b2370..f942a1c46ddd 100644
--- a/databases/rubygem-pg/pkg-descr
+++ b/databases/rubygem-pg/pkg-descr
@@ -1,5 +1,3 @@
 rubygem-pg provides the module "pg", a Ruby interface to the
 PostgreSQL Relational Database Management System, which
 supersedes the old "postgres" module.
-
-WWW: https://bitbucket.org/ged/ruby-pg/wiki/Home
diff --git a/databases/rubygem-pg0/Makefile b/databases/rubygem-pg0/Makefile
deleted file mode 100644
index 446575652735..000000000000
--- a/databases/rubygem-pg0/Makefile
+++ /dev/null
@@ -1,27 +0,0 @@
-# Created by: Wen Heping <wenheping@gmail.com>
-
-PORTNAME=	pg
-PORTVERSION=	0.21.0
-PORTREVISION=	2
-CATEGORIES=	databases rubygems
-MASTER_SITES=	RG
-PKGNAMESUFFIX=	0
-
-MAINTAINER=	sunpoet@FreeBSD.org
-COMMENT=	Ruby interface to PostgreSQL library
-
-LICENSE=	BSD2CLAUSE RUBY
-LICENSE_COMB=	dual
-LICENSE_FILE_BSD2CLAUSE=${WRKSRC}/BSDL
-LICENSE_FILE_RUBY=	${WRKSRC}/LICENSE
-
-USES=		gem pgsql
-USE_RUBY=	yes
-
-CONFIGURE_ARGS=	--with-pgsql-include-dir=`${PG_CONFIG} --includedir` \
-		--with-pgsql-lib-dir=`${PG_CONFIG} --libdir`
-PG_CONFIG=	${LOCALBASE}/bin/pg_config
-
-PORTSCOUT=	limit:^0\.
-
-.include <bsd.port.mk>
diff --git a/databases/rubygem-pg0/distinfo b/databases/rubygem-pg0/distinfo
deleted file mode 100644
index 808cfa4ddf30..000000000000
--- a/databases/rubygem-pg0/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1497359776
-SHA256 (rubygem/pg-0.21.0.gem) = 10b7cc05782236fb840c247a4ecb859f4b77001416774e1646c911c6b1567003
-SIZE (rubygem/pg-0.21.0.gem) = 214016
diff --git a/databases/rubygem-pg0/pkg-descr b/databases/rubygem-pg0/pkg-descr
deleted file mode 100644
index d0484d1b2370..000000000000
--- a/databases/rubygem-pg0/pkg-descr
+++ /dev/null
@@ -1,5 +0,0 @@
-rubygem-pg provides the module "pg", a Ruby interface to the
-PostgreSQL Relational Database Management System, which
-supersedes the old "postgres" module.
-
-WWW: https://bitbucket.org/ged/ruby-pg/wiki/Home
diff --git a/databases/rubygem-pg018/Makefile b/databases/rubygem-pg018/Makefile
deleted file mode 100644
index 342711cf7033..000000000000
--- a/databases/rubygem-pg018/Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
-PORTNAME=	pg
-PORTVERSION=	0.18.4
-PORTREVISION=	2
-CATEGORIES=	databases rubygems
-MASTER_SITES=	RG
-PKGNAMESUFFIX=	018
-
-MAINTAINER=	mfechner@FreeBSD.org
-COMMENT=	Ruby interface to PostgreSQL library
-
-LICENSE=	BSD2CLAUSE RUBY
-LICENSE_COMB=	dual
-LICENSE_FILE_BSD2CLAUSE	=${WRKSRC}/BSDL
-LICENSE_FILE_RUBY	=${WRKSRC}/LICENSE
-
-PORTSCOUT=	limit:^0\.18\.
-
-CONFIGURE_ARGS=	--with-pgsql-include-dir=`${PG_CONFIG} --includedir` \
-		--with-pgsql-lib-dir=`${PG_CONFIG} --libdir`
-PG_CONFIG=	${LOCALBASE}/bin/pg_config
-USES=		gem pgsql
-USE_RUBY=	yes
-
-.include <bsd.port.mk>
diff --git a/databases/rubygem-pg018/distinfo b/databases/rubygem-pg018/distinfo
deleted file mode 100644
index b2a88f17b12c..000000000000
--- a/databases/rubygem-pg018/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (rubygem/pg-0.18.4.gem) = 62f0dce2fd0b3b0f684b2d60e09b3f515e7eb30f8f736bf5ede5b49e5425bb1d
-SIZE (rubygem/pg-0.18.4.gem) = 219648
diff --git a/databases/rubygem-pg018/pkg-descr b/databases/rubygem-pg018/pkg-descr
deleted file mode 100644
index d0484d1b2370..000000000000
--- a/databases/rubygem-pg018/pkg-descr
+++ /dev/null
@@ -1,5 +0,0 @@
-rubygem-pg provides the module "pg", a Ruby interface to the
-PostgreSQL Relational Database Management System, which
-supersedes the old "postgres" module.
-
-WWW: https://bitbucket.org/ged/ruby-pg/wiki/Home
diff --git a/databases/rubygem-pg_array_parser/Makefile b/databases/rubygem-pg_array_parser/Makefile
index 77ba9ed17232..c3a6ac7dff28 100644
--- a/databases/rubygem-pg_array_parser/Makefile
+++ b/databases/rubygem-pg_array_parser/Makefile
@@ -5,10 +5,10 @@ MASTER_SITES=	RG
 
 MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	Fast PostreSQL array parsing
+WWW=		https://github.com/dockyard/pg_array_parser
 
 LICENSE=	MIT
 
-USE_RUBY=	yes
 USES=		gem
 
 .include <bsd.port.mk>
diff --git a/databases/rubygem-pg_array_parser/pkg-descr b/databases/rubygem-pg_array_parser/pkg-descr
index 92f80bbff51f..5236539c8245 100644
--- a/databases/rubygem-pg_array_parser/pkg-descr
+++ b/databases/rubygem-pg_array_parser/pkg-descr
@@ -1,4 +1,2 @@
 rubygem-pg_array_parser is a simple library to parse PostgreSQL arrays into an
 array of strings.
-
-WWW: https://github.com/dockyard/pg_array_parser
diff --git a/databases/rubygem-pg_query/Makefile b/databases/rubygem-pg_query/Makefile
index 251b49879ed0..3d68bdd5ac62 100644
--- a/databases/rubygem-pg_query/Makefile
+++ b/databases/rubygem-pg_query/Makefile
@@ -1,20 +1,22 @@
-# Created by: Matthias Fechner <mfechner@FreeBSD.org>
-
 PORTNAME=	pg_query
-PORTVERSION=	2.1.0
+PORTVERSION=	5.1.0
+PORTREVISION=	1
 CATEGORIES=	databases rubygems
 MASTER_SITES=	RG
 
 MAINTAINER=	mfechner@FreeBSD.org
 COMMENT=	Parses SQL queries using a copy of the PostgreSQL server query parser
+WWW=		https://github.com/lfittl/pg_query
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	rubygem-pathname>0:devel/rubygem-pathname
-RUN_DEPENDS=	rubygem-google-protobuf>=3.17.1:devel/rubygem-google-protobuf
+RUN_DEPENDS=	rubygem-google-protobuf>=3.22.3:devel/rubygem-google-protobuf
 
 USES=		gem
-USE_RUBY=	yes
+
+post-patch:
+#	${RM} ${WRKSRC}/ext/pg_query/pg_query_ruby_freebsd.sym
 
 .include <bsd.port.mk>
diff --git a/databases/rubygem-pg_query/distinfo b/databases/rubygem-pg_query/distinfo
index 2ab02d4d281a..0b9c9a9efe7a 100644
--- a/databases/rubygem-pg_query/distinfo
+++ b/databases/rubygem-pg_query/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1625564038
-SHA256 (rubygem/pg_query-2.1.0.gem) = 1d4a1402ba5c9f8f2a94417409d03db7e763c846de674f049bccba66b15eb189
-SIZE (rubygem/pg_query-2.1.0.gem) = 2145280
+TIMESTAMP = 1708417107
+SHA256 (rubygem/pg_query-5.1.0.gem) = b7f7f47c864f08ccbed46a8244906fb6ee77ee344fd27250717963928c93145d
+SIZE (rubygem/pg_query-5.1.0.gem) = 2323968
diff --git a/databases/rubygem-pg_query/files/patch-ext_pg__query_extconf.rb b/databases/rubygem-pg_query/files/patch-ext_pg__query_extconf.rb
deleted file mode 100644
index 4eb77808db7b..000000000000
--- a/databases/rubygem-pg_query/files/patch-ext_pg__query_extconf.rb
+++ /dev/null
@@ -1,19 +0,0 @@
---- ext/pg_query/extconf.rb.orig	2021-07-06 09:35:46 UTC
-+++ ext/pg_query/extconf.rb
-@@ -7,15 +7,8 @@ require 'pathname'
- 
- $objs = Dir.glob(File.join(__dir__, '*.c')).map { |f| Pathname.new(f).sub_ext('.o').to_s }
- 
--$CFLAGS << " -O3 -Wall -fno-strict-aliasing -fwrapv -fstack-protector -Wno-unused-function -Wno-unused-variable -g"
-+$CFLAGS << " -O3 -Wall -fno-strict-aliasing -fwrapv -fstack-protector -Wno-unused-function -Wno-unused-variable -DHAVE_STRCHRNUL -g"
- 
- $INCFLAGS = "-I#{File.join(__dir__, 'include')} " + $INCFLAGS
--
--SYMFILE = File.join(__dir__, 'pg_query_ruby.sym')
--if RUBY_PLATFORM =~ /darwin/
--  $DLDFLAGS << " -Wl,-exported_symbols_list #{SYMFILE}" unless defined?(::Rubinius)
--else
--  $DLDFLAGS << " -Wl,--retain-symbols-file=#{SYMFILE}"
--end
- 
- create_makefile 'pg_query/pg_query'
diff --git a/databases/rubygem-pg_query/files/patch-ext_pg__query_pg__query__ruby__freebsd.sym b/databases/rubygem-pg_query/files/patch-ext_pg__query_pg__query__ruby__freebsd.sym
new file mode 100644
index 000000000000..5f2ef87b78ee
--- /dev/null
+++ b/databases/rubygem-pg_query/files/patch-ext_pg__query_pg__query__ruby__freebsd.sym
@@ -0,0 +1,5 @@
+--- ext/pg_query/pg_query_ruby_freebsd.sym.orig	2024-03-07 07:21:50 UTC
++++ ext/pg_query/pg_query_ruby_freebsd.sym
+@@ -1,2 +1 @@
+-_Init_pg_query
+ Init_pg_query
diff --git a/databases/rubygem-pg_query/pkg-descr b/databases/rubygem-pg_query/pkg-descr
index 7a86795e7fa5..078e1c8f2e70 100644
--- a/databases/rubygem-pg_query/pkg-descr
+++ b/databases/rubygem-pg_query/pkg-descr
@@ -3,5 +3,3 @@ to parse SQL queries and return the internal PostgreSQL parsetree.
 
 In addition the extension allows you to normalize queries (replacing constant
 values with ?) and parse these normalized queries into a parsetree again.
-
-WWW: https://github.com/lfittl/pg_query
diff --git a/databases/rubygem-pghero-rails5/Makefile b/databases/rubygem-pghero-rails5/Makefile
index a4dbf30c1d79..df32c4525299 100644
--- a/databases/rubygem-pghero-rails5/Makefile
+++ b/databases/rubygem-pghero-rails5/Makefile
@@ -1,20 +1,22 @@
 PORTNAME=	pghero
-PORTVERSION=	2.8.1
+PORTVERSION=	2.8.3
 CATEGORIES=	databases rubygems
 MASTER_SITES=	RG
 PKGNAMESUFFIX=	-rails5
 
 MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	Performance dashboard for Postgres
+WWW=		https://github.com/ankane/pghero
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 RUN_DEPENDS=	rubygem-activerecord5>=5:databases/rubygem-activerecord5
 
-USES=		gem
-USE_RUBY=	yes
+USES=		cpe gem
 
 NO_ARCH=	yes
 
+CPE_VENDOR=	pghero_project
+
 .include <bsd.port.mk>
diff --git a/databases/rubygem-pghero-rails5/distinfo b/databases/rubygem-pghero-rails5/distinfo
index 9b4b34844658..2cc1b169ba8b 100644
--- a/databases/rubygem-pghero-rails5/distinfo
+++ b/databases/rubygem-pghero-rails5/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1624630250
-SHA256 (rubygem/pghero-2.8.1.gem) = 05104982ad1578ed0015ca63737982d54431dae78c7d0205b68ea900066f6e29
-SIZE (rubygem/pghero-2.8.1.gem) = 328192
+TIMESTAMP = 1652122939
+SHA256 (rubygem/pghero-2.8.3.gem) = 8ab4f07beb0496f1468b9f07423d1fe8dd009e2b725dd4d5b0583e9afcd70cec
+SIZE (rubygem/pghero-2.8.3.gem) = 326656
diff --git a/databases/rubygem-pghero-rails5/pkg-descr b/databases/rubygem-pghero-rails5/pkg-descr
index 240c381b8a75..7111f43908cc 100644
--- a/databases/rubygem-pghero-rails5/pkg-descr
+++ b/databases/rubygem-pghero-rails5/pkg-descr
@@ -1,4 +1,2 @@
 PgHere is a performance dashboard for Postgres.  It includes health checks,
 suggested indexes, and more.
-
-WWW: https://github.com/ankane/pghero
diff --git a/databases/rubygem-pghero-rails50/Makefile b/databases/rubygem-pghero-rails50/Makefile
index b1f622958cc9..25b2d010888b 100644
--- a/databases/rubygem-pghero-rails50/Makefile
+++ b/databases/rubygem-pghero-rails50/Makefile
@@ -1,20 +1,22 @@
 PORTNAME=	pghero
-PORTVERSION=	2.8.1
+PORTVERSION=	2.8.3
 CATEGORIES=	databases rubygems
 MASTER_SITES=	RG
 PKGNAMESUFFIX=	-rails50
 
 MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	Performance dashboard for Postgres
+WWW=		https://github.com/ankane/pghero
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 RUN_DEPENDS=	rubygem-activerecord50>=5:databases/rubygem-activerecord50
 
-USES=		gem
-USE_RUBY=	yes
+USES=		cpe gem
 
 NO_ARCH=	yes
 
+CPE_VENDOR=	pghero_project
+
 .include <bsd.port.mk>
diff --git a/databases/rubygem-pghero-rails50/distinfo b/databases/rubygem-pghero-rails50/distinfo
index 9b4b34844658..2cc1b169ba8b 100644
--- a/databases/rubygem-pghero-rails50/distinfo
+++ b/databases/rubygem-pghero-rails50/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1624630250
-SHA256 (rubygem/pghero-2.8.1.gem) = 05104982ad1578ed0015ca63737982d54431dae78c7d0205b68ea900066f6e29
-SIZE (rubygem/pghero-2.8.1.gem) = 328192
+TIMESTAMP = 1652122939
+SHA256 (rubygem/pghero-2.8.3.gem) = 8ab4f07beb0496f1468b9f07423d1fe8dd009e2b725dd4d5b0583e9afcd70cec
+SIZE (rubygem/pghero-2.8.3.gem) = 326656
diff --git a/databases/rubygem-pghero-rails50/pkg-descr b/databases/rubygem-pghero-rails50/pkg-descr
index 240c381b8a75..7111f43908cc 100644
--- a/databases/rubygem-pghero-rails50/pkg-descr
+++ b/databases/rubygem-pghero-rails50/pkg-descr
@@ -1,4 +1,2 @@
 PgHere is a performance dashboard for Postgres.  It includes health checks,
 suggested indexes, and more.
-
-WWW: https://github.com/ankane/pghero
diff --git a/databases/rubygem-pghero-rails61/Makefile b/databases/rubygem-pghero-rails61/Makefile
new file mode 100644
index 000000000000..8b6e4b6c970d
--- /dev/null
+++ b/databases/rubygem-pghero-rails61/Makefile
@@ -0,0 +1,22 @@
+PORTNAME=	pghero
+PORTVERSION=	3.4.1
+CATEGORIES=	databases rubygems
+MASTER_SITES=	RG
+PKGNAMESUFFIX=	-rails61
+
+MAINTAINER=	bofh@FreeBSD.org
+COMMENT=	Performance dashboard for Postgres
+WWW=		https://github.com/ankane/pghero
+
+LICENSE=	MIT
+LICENSE_FILE=	${WRKSRC}/LICENSE.txt
+
+RUN_DEPENDS=	rubygem-activerecord61>=5:databases/rubygem-activerecord61
+
+USES=		cpe gem
+
+NO_ARCH=	yes
+
+CPE_VENDOR=	pghero_project
+
+.include <bsd.port.mk>
diff --git a/databases/rubygem-pghero-rails61/distinfo b/databases/rubygem-pghero-rails61/distinfo
new file mode 100644
index 000000000000..b26b8de07c27
--- /dev/null
+++ b/databases/rubygem-pghero-rails61/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1707583025
+SHA256 (rubygem/pghero-3.4.1.gem) = 7f949828119ab17de22ebaef1854ab8c738106bdc31bee3ac0acd0462c0efa88
+SIZE (rubygem/pghero-3.4.1.gem) = 365056
diff --git a/databases/rubygem-pghero-rails61/pkg-descr b/databases/rubygem-pghero-rails61/pkg-descr
new file mode 100644
index 000000000000..7111f43908cc
--- /dev/null
+++ b/databases/rubygem-pghero-rails61/pkg-descr
@@ -0,0 +1,2 @@
+PgHere is a performance dashboard for Postgres.  It includes health checks,
+suggested indexes, and more.
diff --git a/databases/rubygem-pghero/Makefile b/databases/rubygem-pghero/Makefile
index 068c116cc9e1..54b57542de5c 100644
--- a/databases/rubygem-pghero/Makefile
+++ b/databases/rubygem-pghero/Makefile
@@ -1,19 +1,21 @@
 PORTNAME=	pghero
-PORTVERSION=	2.8.1
+PORTVERSION=	3.4.1
 CATEGORIES=	databases rubygems
 MASTER_SITES=	RG
 
-MAINTAINER=	ruby@FreeBSD.org
+MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Performance dashboard for Postgres
+WWW=		https://github.com/ankane/pghero
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	rubygem-activerecord60>=5:databases/rubygem-activerecord60
+RUN_DEPENDS=	rubygem-activerecord71>=6:databases/rubygem-activerecord71
 
-USES=		gem
-USE_RUBY=	yes
+USES=		cpe gem
 
 NO_ARCH=	yes
 
+CPE_VENDOR=	pghero_project
+
 .include <bsd.port.mk>
diff --git a/databases/rubygem-pghero/distinfo b/databases/rubygem-pghero/distinfo
index 9b4b34844658..e66c8d939493 100644
--- a/databases/rubygem-pghero/distinfo
+++ b/databases/rubygem-pghero/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1624630250
-SHA256 (rubygem/pghero-2.8.1.gem) = 05104982ad1578ed0015ca63737982d54431dae78c7d0205b68ea900066f6e29
-SIZE (rubygem/pghero-2.8.1.gem) = 328192
+TIMESTAMP = 1708449566
+SHA256 (rubygem/pghero-3.4.1.gem) = 7f949828119ab17de22ebaef1854ab8c738106bdc31bee3ac0acd0462c0efa88
+SIZE (rubygem/pghero-3.4.1.gem) = 365056
diff --git a/databases/rubygem-pghero/pkg-descr b/databases/rubygem-pghero/pkg-descr
index 240c381b8a75..7111f43908cc 100644
--- a/databases/rubygem-pghero/pkg-descr
+++ b/databases/rubygem-pghero/pkg-descr
@@ -1,4 +1,2 @@
 PgHere is a performance dashboard for Postgres.  It includes health checks,
 suggested indexes, and more.
-
-WWW: https://github.com/ankane/pghero
diff --git a/databases/rubygem-pl-puppetdb-ruby/Makefile b/databases/rubygem-pl-puppetdb-ruby/Makefile
index e7ae4b34e702..7b028dd107ba 100644
--- a/databases/rubygem-pl-puppetdb-ruby/Makefile
+++ b/databases/rubygem-pl-puppetdb-ruby/Makefile
@@ -5,13 +5,13 @@ MASTER_SITES=	RG
 
 MAINTAINER=	puppet@FreeBSD.org
 COMMENT=	Simple Ruby client library for PuppetDB API
+WWW=		https://rubygems.org/gems/pl-puppetdb-ruby
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	rubygem-httparty>0:www/rubygem-httparty
 
-USE_RUBY=	yes
 USES=		gem
 NO_ARCH=	yes
 
diff --git a/databases/rubygem-pl-puppetdb-ruby/pkg-descr b/databases/rubygem-pl-puppetdb-ruby/pkg-descr
index 51f887499c04..9af1e81d9001 100644
--- a/databases/rubygem-pl-puppetdb-ruby/pkg-descr
+++ b/databases/rubygem-pl-puppetdb-ruby/pkg-descr
@@ -1,3 +1 @@
 Simple Ruby client library for PuppetDB API
-
-WWW: https://rubygems.org/gems/pl-puppetdb-ruby
diff --git a/databases/rubygem-postgres_ext/Makefile b/databases/rubygem-postgres_ext/Makefile
index e2e382c15202..b193d15312a5 100644
--- a/databases/rubygem-postgres_ext/Makefile
+++ b/databases/rubygem-postgres_ext/Makefile
@@ -5,6 +5,7 @@ MASTER_SITES=	RG
 
 MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	PostgreSQL data types extension for ActiveRecord
+WWW=		https://github.com/dockyard/postgres_ext
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
@@ -14,7 +15,6 @@ RUN_DEPENDS=	rubygem-activerecord4>=4.0:databases/rubygem-activerecord4 \
 		rubygem-pg_array_parser>=0.0.9:databases/rubygem-pg_array_parser
 
 NO_ARCH=	yes
-USE_RUBY=	yes
 USES=		gem
 
 .include <bsd.port.mk>
diff --git a/databases/rubygem-postgres_ext/pkg-descr b/databases/rubygem-postgres_ext/pkg-descr
index 6425ff2dd265..8abb56ad9578 100644
--- a/databases/rubygem-postgres_ext/pkg-descr
+++ b/databases/rubygem-postgres_ext/pkg-descr
@@ -1,4 +1,2 @@
 rubygem-postgres_ext adds missing native PostgreSQL data types to ActiveRecord
 and convenient querying extensions to ActiveRecord and Arel for Rails 4.x
-
-WWW: https://github.com/dockyard/postgres_ext
diff --git a/databases/rubygem-puppetdb_cli/Makefile b/databases/rubygem-puppetdb_cli/Makefile
index 21356d7eca37..6fedf7c65aa0 100644
--- a/databases/rubygem-puppetdb_cli/Makefile
+++ b/databases/rubygem-puppetdb_cli/Makefile
@@ -5,15 +5,15 @@ MASTER_SITES=	RG
 
 MAINTAINER=	puppet@FreeBSD.org
 COMMENT=	PuppetDB CLI Tooling
+WWW=		https://github.com/puppetlabs/puppetdb-cli
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	rubygem-cri>0:devel/rubygem-cri \
-		rubygem-pl-puppetdb-ruby>0:databases/rubygem-pl-puppetdb-ruby
+RUN_DEPENDS=	rubygem-cri>=2.15<3:devel/rubygem-cri \
+		rubygem-pl-puppetdb-ruby>=2.0.3<2.1:databases/rubygem-pl-puppetdb-ruby
 
 USES=		gem
-USE_RUBY=	yes
 
 NO_ARCH=	yes
 
diff --git a/databases/rubygem-puppetdb_cli/pkg-descr b/databases/rubygem-puppetdb_cli/pkg-descr
index 8cbd4bf2969c..7584df52642f 100644
--- a/databases/rubygem-puppetdb_cli/pkg-descr
+++ b/databases/rubygem-puppetdb_cli/pkg-descr
@@ -7,5 +7,3 @@ PQL syntax of the traditional PuppetDB query syntax (also known as AST).
 
 The db subcommand is a replacement for the older puppetdb <export|import>
 commands with faster startup times and much friendlier error messages.
-
-WWW: https://github.com/puppetlabs/puppetdb-cli
diff --git a/databases/rubygem-rbase/Makefile b/databases/rubygem-rbase/Makefile
index bfef637012cc..7680dad4e6f4 100644
--- a/databases/rubygem-rbase/Makefile
+++ b/databases/rubygem-rbase/Makefile
@@ -1,5 +1,3 @@
-# Created by: Alexander Logvinov <ports@logvinov.com>
-
 PORTNAME=	rbase
 PORTVERSION=	0.1.3
 CATEGORIES=	databases rubygems
@@ -7,9 +5,9 @@ MASTER_SITES=	RG
 
 MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	Library to create/read/write to XBase databases (*.DBF files)
+WWW=		https://rubygems.org/gems/rbase
 
 USES=		gem
-USE_RUBY=	yes
 
 NO_ARCH=	yes
 
diff --git a/databases/rubygem-rbase/pkg-descr b/databases/rubygem-rbase/pkg-descr
index 06cab6e15030..c1c3320cfacc 100644
--- a/databases/rubygem-rbase/pkg-descr
+++ b/databases/rubygem-rbase/pkg-descr
@@ -1,3 +1 @@
 RBase is a library to manipulate XBase database using Ruby.
-
-WWW: https://rubygems.org/gems/rbase
diff --git a/databases/rubygem-red-arrow-dataset/Makefile b/databases/rubygem-red-arrow-dataset/Makefile
new file mode 100644
index 000000000000..ca19afe271ea
--- /dev/null
+++ b/databases/rubygem-red-arrow-dataset/Makefile
@@ -0,0 +1,21 @@
+PORTNAME=	red-arrow-dataset
+PORTVERSION=	15.0.2
+CATEGORIES=	databases rubygems
+MASTER_SITES=	RG
+
+MAINTAINER=	sunpoet@FreeBSD.org
+COMMENT=	Ruby bindings of Apache Arrow Dataset
+WWW=		https://arrow.apache.org/ \
+		https://github.com/apache/arrow/tree/main/ruby/red-arrow-dataset
+
+LICENSE=	APACHE20
+LICENSE_FILE=	${WRKSRC}/LICENSE.txt
+
+BUILD_DEPENDS=	rubygem-rake>=0:devel/rubygem-rake
+RUN_DEPENDS=	rubygem-red-arrow>=${PORTVERSION}<${PORTVERSION}_99:databases/rubygem-red-arrow
+
+USES=		gem
+
+NO_ARCH=	yes
+
+.include <bsd.port.mk>
diff --git a/databases/rubygem-red-arrow-dataset/distinfo b/databases/rubygem-red-arrow-dataset/distinfo
new file mode 100644
index 000000000000..de3e0a4376f9
--- /dev/null
+++ b/databases/rubygem-red-arrow-dataset/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1712427962
+SHA256 (rubygem/red-arrow-dataset-15.0.2.gem) = 469ca223e7e73912ca2928a651162ac464226b312d992f634b1c5e825408a1e7
+SIZE (rubygem/red-arrow-dataset-15.0.2.gem) = 13312
diff --git a/databases/rubygem-red-arrow-dataset/pkg-descr b/databases/rubygem-red-arrow-dataset/pkg-descr
new file mode 100644
index 000000000000..7c98a1f61c05
--- /dev/null
+++ b/databases/rubygem-red-arrow-dataset/pkg-descr
@@ -0,0 +1,11 @@
+Red Arrow Dataset is the Ruby bindings of Apache Arrow Dataset. Red Arrow
+Dataset is based on GObject Introspection.
+
+Apache Arrow Dataset is one of Apache Arrow components to read and write
+semantic datasets stored in different locations and formats.
+
+GObject Introspection is a middleware for language bindings of C library.
+GObject Introspection can generate language bindings automatically at runtime.
+
+Red Arrow Dataset uses Apache Arrow Dataset GLib and gobject-introspection gem
+to generate Ruby bindings of Apache Arrow Dataset.
diff --git a/databases/rubygem-red-arrow/Makefile b/databases/rubygem-red-arrow/Makefile
new file mode 100644
index 000000000000..ac659d78814b
--- /dev/null
+++ b/databases/rubygem-red-arrow/Makefile
@@ -0,0 +1,27 @@
+PORTNAME=	red-arrow
+PORTVERSION=	15.0.2
+CATEGORIES=	databases rubygems
+MASTER_SITES=	RG
+
+MAINTAINER=	sunpoet@FreeBSD.org
+COMMENT=	Ruby bindings of Apache Arrow
+WWW=		https://arrow.apache.org/ \
+		https://github.com/apache/arrow/tree/main/ruby/red-arrow
+
+LICENSE=	APACHE20
+LICENSE_FILE=	${WRKSRC}/LICENSE.txt
+
+BUILD_DEPENDS=	arrow>=${PORTVERSION}<${PORTVERSION}_99:databases/arrow \
+		arrow-glib>=${PORTVERSION}<${PORTVERSION}_99:databases/arrow-glib
+LIB_DEPENDS=	libarrow.so:databases/arrow \
+		libarrow-glib.so:databases/arrow-glib
+RUN_DEPENDS=	rubygem-bigdecimal>=3.1.0:math/rubygem-bigdecimal \
+		rubygem-csv>=0:devel/rubygem-csv \
+		rubygem-extpp>=0.1.1:devel/rubygem-extpp \
+		rubygem-gio2>=3.5.0:devel/rubygem-gio2 \
+		rubygem-native-package-installer>=0:devel/rubygem-native-package-installer \
+		rubygem-pkg-config>=0:devel/rubygem-pkg-config \
+
+USES=		gem
+
+.include <bsd.port.mk>
diff --git a/databases/rubygem-red-arrow/distinfo b/databases/rubygem-red-arrow/distinfo
new file mode 100644
index 000000000000..6370027aa2a3
--- /dev/null
+++ b/databases/rubygem-red-arrow/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1712427960
+SHA256 (rubygem/red-arrow-15.0.2.gem) = 650d8f3acf7401432af6c13635dd56c18e05777a687726a8313b8c6ca4499a59
+SIZE (rubygem/red-arrow-15.0.2.gem) = 117760
diff --git a/databases/rubygem-red-arrow/files/patch-ext-arrow-extconf.rb b/databases/rubygem-red-arrow/files/patch-ext-arrow-extconf.rb
new file mode 100644
index 000000000000..e1efe63ad39e
--- /dev/null
+++ b/databases/rubygem-red-arrow/files/patch-ext-arrow-extconf.rb
@@ -0,0 +1,11 @@
+--- ext/arrow/extconf.rb.orig	2022-09-13 15:47:51 UTC
++++ ext/arrow/extconf.rb
+@@ -65,7 +65,7 @@ unless required_pkg_config_package([
+ end
+ 
+ [
+-  ["glib2", "ext/glib2"],
++  ["glib2", "lib"],
+ ].each do |name, relative_source_dir|
+   spec = find_gem_spec(name)
+   source_dir = File.join(spec.full_gem_path, relative_source_dir)
diff --git a/databases/rubygem-red-arrow/pkg-descr b/databases/rubygem-red-arrow/pkg-descr
new file mode 100644
index 000000000000..3a2f3ca20270
--- /dev/null
+++ b/databases/rubygem-red-arrow/pkg-descr
@@ -0,0 +1,11 @@
+Red Arrow is the Ruby bindings of Apache Arrow. Red Arrow is based on GObject
+Introspection.
+
+Apache Arrow is an in-memory columnar data store. It's used by many products for
+data analytics.
+
+GObject Introspection is a middleware for language bindings of C library.
+GObject Introspection can generate language bindings automatically at runtime.
+
+Red Arrow uses Apache Arrow GLib and gobject-introspection gem to generate Ruby
+bindings of Apache Arrow.
diff --git a/databases/rubygem-red-gandiva/Makefile b/databases/rubygem-red-gandiva/Makefile
new file mode 100644
index 000000000000..89ea73172ad6
--- /dev/null
+++ b/databases/rubygem-red-gandiva/Makefile
@@ -0,0 +1,25 @@
+PORTNAME=	red-gandiva
+PORTVERSION=	15.0.2
+CATEGORIES=	databases rubygems
+MASTER_SITES=	RG
+
+MAINTAINER=	sunpoet@FreeBSD.org
+COMMENT=	Ruby bindings of Gandiva
+WWW=		https://arrow.apache.org/ \
+		https://github.com/apache/arrow/tree/master/ruby/red-gandiva
+
+LICENSE=	APACHE20
+LICENSE_FILE=	${WRKSRC}/LICENSE.txt
+
+BUILD_DEPENDS=	arrow>=${PORTVERSION}<${PORTVERSION}_99:databases/arrow \
+		arrow-glib>=${PORTVERSION}<${PORTVERSION}_99:databases/arrow-glib \
+		rubygem-rake>=0:devel/rubygem-rake
+LIB_DEPENDS=	libarrow.so:databases/arrow \
+		libarrow-glib.so:databases/arrow-glib
+RUN_DEPENDS=	rubygem-red-arrow>=${PORTVERSION}<${PORTVERSION}_99:databases/rubygem-red-arrow
+
+USES=		gem
+
+NO_ARCH=	yes
+
+.include <bsd.port.mk>
diff --git a/databases/rubygem-red-gandiva/distinfo b/databases/rubygem-red-gandiva/distinfo
new file mode 100644
index 000000000000..6f008b1ed81a
--- /dev/null
+++ b/databases/rubygem-red-gandiva/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1712427964
+SHA256 (rubygem/red-gandiva-15.0.2.gem) = b0ea553c326e61613b6d51db04b555f78cb7f51ca6a34f7e83b8d81e1f14d235
+SIZE (rubygem/red-gandiva-15.0.2.gem) = 14336
diff --git a/databases/rubygem-red-gandiva/pkg-descr b/databases/rubygem-red-gandiva/pkg-descr
new file mode 100644
index 000000000000..3c3254cc46c4
--- /dev/null
+++ b/databases/rubygem-red-gandiva/pkg-descr
@@ -0,0 +1,10 @@
+Red Gandiva is the Ruby bindings of Gandiva. Red Gandiva is based on GObject
+Introspection.
+
+Gandiva is a toolset for compiling and evaluating expressions on Arrow data.
+
+GObject Introspection is a middleware for language bindings of C library.
+GObject Introspection can generate language bindings automatically at runtime.
+
+Red Gandiva uses Gandiva GLib and gobject-introspection gem to generate Ruby
+bindings of Gandiva.
diff --git a/databases/rubygem-red-parquet/Makefile b/databases/rubygem-red-parquet/Makefile
new file mode 100644
index 000000000000..8343d43d9e2f
--- /dev/null
+++ b/databases/rubygem-red-parquet/Makefile
@@ -0,0 +1,25 @@
+PORTNAME=	red-parquet
+PORTVERSION=	15.0.2
+CATEGORIES=	databases rubygems
+MASTER_SITES=	RG
+
+MAINTAINER=	sunpoet@FreeBSD.org
+COMMENT=	Ruby bindings of Apache Parquet
+WWW=		https://arrow.apache.org/ \
+		https://github.com/apache/arrow/tree/master/ruby/red-parquet
+
+LICENSE=	APACHE20
+LICENSE_FILE=	${WRKSRC}/LICENSE.txt
+
+BUILD_DEPENDS=	arrow>=${PORTVERSION}<${PORTVERSION}_99:databases/arrow \
+		arrow-glib>=${PORTVERSION}<${PORTVERSION}_99:databases/arrow-glib \
+		rubygem-rake>=0:devel/rubygem-rake
+LIB_DEPENDS=	libarrow.so:databases/arrow \
+		libarrow-glib.so:databases/arrow-glib
+RUN_DEPENDS=	rubygem-red-arrow>=${PORTVERSION}<${PORTVERSION}_99:databases/rubygem-red-arrow
+
+USES=		gem
+
+NO_ARCH=	yes
+
+.include <bsd.port.mk>
diff --git a/databases/rubygem-red-parquet/distinfo b/databases/rubygem-red-parquet/distinfo
new file mode 100644
index 000000000000..7f989b33815c
--- /dev/null
+++ b/databases/rubygem-red-parquet/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1712427966
+SHA256 (rubygem/red-parquet-15.0.2.gem) = 3826707b75663b76f766d7a3b544e30c4b5ca13e592e7d6a7d9ed517a2c2c9dc
+SIZE (rubygem/red-parquet-15.0.2.gem) = 12800
diff --git a/databases/rubygem-red-parquet/pkg-descr b/databases/rubygem-red-parquet/pkg-descr
new file mode 100644
index 000000000000..2a0ab7e7de34
--- /dev/null
+++ b/databases/rubygem-red-parquet/pkg-descr
@@ -0,0 +1,10 @@
+Red Parquet is the Ruby bindings of Apache Parquet. Red Parquet is based on
+GObject Introspection.
+
+Apache Parquet is a columnar storage format.
+
+GObject Introspection is a middleware for language bindings of C library.
+GObject Introspection can generate language bindings automatically at runtime.
+
+Red Parquet uses Apache Parquet GLib and gobject-introspection gem to generate
+Ruby bindings of Apache Parquet.
diff --git a/databases/rubygem-redis-actionpack-rails5/Makefile b/databases/rubygem-redis-actionpack-rails5/Makefile
index 5d5af422c24e..b67986d69fb6 100644
--- a/databases/rubygem-redis-actionpack-rails5/Makefile
+++ b/databases/rubygem-redis-actionpack-rails5/Makefile
@@ -1,21 +1,21 @@
 PORTNAME=	redis-actionpack
-PORTVERSION=	5.2.0
+PORTVERSION=	5.4.0
 CATEGORIES=	databases rubygems
 MASTER_SITES=	RG
 PKGNAMESUFFIX=	-rails5
 
 MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	Redis session store for ActionPack
+WWW=		https://redis-store.org/redis-actionpack/
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/MIT-LICENSE
 
-RUN_DEPENDS=	rubygem-actionpack5>=5<7:www/rubygem-actionpack5 \
-		rubygem-redis-rack>=2.1.0<3:www/rubygem-redis-rack \
+RUN_DEPENDS=	rubygem-actionpack5>=5<8:www/rubygem-actionpack5 \
+		rubygem-redis-rack>=2.1.0<4:www/rubygem-redis-rack \
 		rubygem-redis-store>=1.1.0<2:devel/rubygem-redis-store
 
 USES=		gem
-USE_RUBY=	yes
 
 NO_ARCH=	yes
 
diff --git a/databases/rubygem-redis-actionpack-rails5/distinfo b/databases/rubygem-redis-actionpack-rails5/distinfo
index 212149715d71..08a627ff09dd 100644
--- a/databases/rubygem-redis-actionpack-rails5/distinfo
+++ b/databases/rubygem-redis-actionpack-rails5/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1595416805
-SHA256 (rubygem/redis-actionpack-5.2.0.gem) = 6337f72c5ed21e7d4909468479fe51d9c2b343cf0ea933e0270400f6bf394230
-SIZE (rubygem/redis-actionpack-5.2.0.gem) = 13312
+TIMESTAMP = 1702028324
+SHA256 (rubygem/redis-actionpack-5.4.0.gem) = f10cf649ab05914716d63334d7f709221ecc883b87cf348f90ecfe0c35ea3540
+SIZE (rubygem/redis-actionpack-5.4.0.gem) = 14336
diff --git a/databases/rubygem-redis-actionpack-rails5/pkg-descr b/databases/rubygem-redis-actionpack-rails5/pkg-descr
index 0998b5878721..ebcad6a52a5c 100644
--- a/databases/rubygem-redis-actionpack-rails5/pkg-descr
+++ b/databases/rubygem-redis-actionpack-rails5/pkg-descr
@@ -1,3 +1 @@
 Redis session store for ActionPack
-
-WWW: https://redis-store.org/redis-actionpack/
diff --git a/databases/rubygem-redis-actionpack-rails50/Makefile b/databases/rubygem-redis-actionpack-rails50/Makefile
index e43a7f21faeb..b1f976f185e7 100644
--- a/databases/rubygem-redis-actionpack-rails50/Makefile
+++ b/databases/rubygem-redis-actionpack-rails50/Makefile
@@ -1,21 +1,21 @@
 PORTNAME=	redis-actionpack
-PORTVERSION=	5.2.0
+PORTVERSION=	5.4.0
 CATEGORIES=	databases rubygems
 MASTER_SITES=	RG
 PKGNAMESUFFIX=	-rails50
 
 MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	Redis session store for ActionPack
+WWW=		https://redis-store.org/redis-actionpack/
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/MIT-LICENSE
 
-RUN_DEPENDS=	rubygem-actionpack50>=5<7:www/rubygem-actionpack50 \
-		rubygem-redis-rack>=2.1.0<3:www/rubygem-redis-rack \
+RUN_DEPENDS=	rubygem-actionpack50>=5<8:www/rubygem-actionpack50 \
+		rubygem-redis-rack>=2.1.0<4:www/rubygem-redis-rack \
 		rubygem-redis-store>=1.1.0<2:devel/rubygem-redis-store
 
 USES=		gem
-USE_RUBY=	yes
 
 NO_ARCH=	yes
 
diff --git a/databases/rubygem-redis-actionpack-rails50/distinfo b/databases/rubygem-redis-actionpack-rails50/distinfo
index 26fe847b3835..08a627ff09dd 100644
--- a/databases/rubygem-redis-actionpack-rails50/distinfo
+++ b/databases/rubygem-redis-actionpack-rails50/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1595416807
-SHA256 (rubygem/redis-actionpack-5.2.0.gem) = 6337f72c5ed21e7d4909468479fe51d9c2b343cf0ea933e0270400f6bf394230
-SIZE (rubygem/redis-actionpack-5.2.0.gem) = 13312
+TIMESTAMP = 1702028324
+SHA256 (rubygem/redis-actionpack-5.4.0.gem) = f10cf649ab05914716d63334d7f709221ecc883b87cf348f90ecfe0c35ea3540
+SIZE (rubygem/redis-actionpack-5.4.0.gem) = 14336
diff --git a/databases/rubygem-redis-actionpack-rails50/pkg-descr b/databases/rubygem-redis-actionpack-rails50/pkg-descr
index 0998b5878721..ebcad6a52a5c 100644
--- a/databases/rubygem-redis-actionpack-rails50/pkg-descr
+++ b/databases/rubygem-redis-actionpack-rails50/pkg-descr
@@ -1,3 +1 @@
 Redis session store for ActionPack
-
-WWW: https://redis-store.org/redis-actionpack/
diff --git a/databases/rubygem-redis-actionpack-rails52/Makefile b/databases/rubygem-redis-actionpack-rails52/Makefile
index cffaa5ef7e63..527b94ce98e9 100644
--- a/databases/rubygem-redis-actionpack-rails52/Makefile
+++ b/databases/rubygem-redis-actionpack-rails52/Makefile
@@ -1,21 +1,21 @@
 PORTNAME=	redis-actionpack
-PORTVERSION=	5.2.0
+PORTVERSION=	5.4.0
 CATEGORIES=	databases rubygems
 MASTER_SITES=	RG
 PKGNAMESUFFIX=	-rails52
 
 MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	Redis session store for ActionPack
+WWW=		https://redis-store.org/redis-actionpack/
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/MIT-LICENSE
 
-RUN_DEPENDS=	rubygem-actionpack52>=5<7:www/rubygem-actionpack52 \
-		rubygem-redis-rack>=2.1.0<3:www/rubygem-redis-rack \
+RUN_DEPENDS=	rubygem-actionpack52>=5<8:www/rubygem-actionpack52 \
+		rubygem-redis-rack>=2.1.0<4:www/rubygem-redis-rack \
 		rubygem-redis-store>=1.1.0<2:devel/rubygem-redis-store
 
 USES=		gem
-USE_RUBY=	yes
 
 NO_ARCH=	yes
 
diff --git a/databases/rubygem-redis-actionpack-rails52/distinfo b/databases/rubygem-redis-actionpack-rails52/distinfo
index d043baaa6963..08a627ff09dd 100644
--- a/databases/rubygem-redis-actionpack-rails52/distinfo
+++ b/databases/rubygem-redis-actionpack-rails52/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1595416809
-SHA256 (rubygem/redis-actionpack-5.2.0.gem) = 6337f72c5ed21e7d4909468479fe51d9c2b343cf0ea933e0270400f6bf394230
-SIZE (rubygem/redis-actionpack-5.2.0.gem) = 13312
+TIMESTAMP = 1702028324
+SHA256 (rubygem/redis-actionpack-5.4.0.gem) = f10cf649ab05914716d63334d7f709221ecc883b87cf348f90ecfe0c35ea3540
+SIZE (rubygem/redis-actionpack-5.4.0.gem) = 14336
diff --git a/databases/rubygem-redis-actionpack-rails52/pkg-descr b/databases/rubygem-redis-actionpack-rails52/pkg-descr
index 0998b5878721..ebcad6a52a5c 100644
--- a/databases/rubygem-redis-actionpack-rails52/pkg-descr
+++ b/databases/rubygem-redis-actionpack-rails52/pkg-descr
@@ -1,3 +1 @@
 Redis session store for ActionPack
-
-WWW: https://redis-store.org/redis-actionpack/
diff --git a/databases/rubygem-redis-actionpack-rails60/Makefile b/databases/rubygem-redis-actionpack-rails60/Makefile
index 7fa4d8b261e0..11de1ef457ac 100644
--- a/databases/rubygem-redis-actionpack-rails60/Makefile
+++ b/databases/rubygem-redis-actionpack-rails60/Makefile
@@ -1,21 +1,21 @@
 PORTNAME=	redis-actionpack
-PORTVERSION=	5.2.0
+PORTVERSION=	5.4.0
 CATEGORIES=	databases rubygems
 MASTER_SITES=	RG
 PKGNAMESUFFIX=	-rails60
 
 MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	Redis session store for ActionPack
+WWW=		https://redis-store.org/redis-actionpack/
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/MIT-LICENSE
 
-RUN_DEPENDS=	rubygem-actionpack60>=5<7:www/rubygem-actionpack60 \
-		rubygem-redis-rack>=2.1.0<3:www/rubygem-redis-rack \
+RUN_DEPENDS=	rubygem-actionpack60>=5<8:www/rubygem-actionpack60 \
+		rubygem-redis-rack>=2.1.0<4:www/rubygem-redis-rack \
 		rubygem-redis-store>=1.1.0<2:devel/rubygem-redis-store
 
 USES=		gem
-USE_RUBY=	yes
 
 NO_ARCH=	yes
 
diff --git a/databases/rubygem-redis-actionpack-rails60/distinfo b/databases/rubygem-redis-actionpack-rails60/distinfo
index 8b1547cacdb6..08a627ff09dd 100644
--- a/databases/rubygem-redis-actionpack-rails60/distinfo
+++ b/databases/rubygem-redis-actionpack-rails60/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1582626493
-SHA256 (rubygem/redis-actionpack-5.2.0.gem) = 6337f72c5ed21e7d4909468479fe51d9c2b343cf0ea933e0270400f6bf394230
-SIZE (rubygem/redis-actionpack-5.2.0.gem) = 13312
+TIMESTAMP = 1702028324
+SHA256 (rubygem/redis-actionpack-5.4.0.gem) = f10cf649ab05914716d63334d7f709221ecc883b87cf348f90ecfe0c35ea3540
+SIZE (rubygem/redis-actionpack-5.4.0.gem) = 14336
diff --git a/databases/rubygem-redis-actionpack-rails60/pkg-descr b/databases/rubygem-redis-actionpack-rails60/pkg-descr
index 0998b5878721..ebcad6a52a5c 100644
--- a/databases/rubygem-redis-actionpack-rails60/pkg-descr
+++ b/databases/rubygem-redis-actionpack-rails60/pkg-descr
@@ -1,3 +1 @@
 Redis session store for ActionPack
-
-WWW: https://redis-store.org/redis-actionpack/
diff --git a/databases/rubygem-redis-actionpack-rails61/Makefile b/databases/rubygem-redis-actionpack-rails61/Makefile
index e2657384a896..8c708efd2ca3 100644
--- a/databases/rubygem-redis-actionpack-rails61/Makefile
+++ b/databases/rubygem-redis-actionpack-rails61/Makefile
@@ -1,21 +1,21 @@
 PORTNAME=	redis-actionpack
-PORTVERSION=	5.2.0
+PORTVERSION=	5.4.0
 CATEGORIES=	databases rubygems
 MASTER_SITES=	RG
 PKGNAMESUFFIX=	-rails61
 
 MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	Redis session store for ActionPack
+WWW=		https://redis-store.org/redis-actionpack/
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/MIT-LICENSE
 
-RUN_DEPENDS=	rubygem-actionpack61>=5<7:www/rubygem-actionpack61 \
-		rubygem-redis-rack>=2.1.0<3:www/rubygem-redis-rack \
+RUN_DEPENDS=	rubygem-actionpack61>=5<8:www/rubygem-actionpack61 \
+		rubygem-redis-rack>=2.1.0<4:www/rubygem-redis-rack \
 		rubygem-redis-store>=1.1.0<2:devel/rubygem-redis-store
 
 USES=		gem
-USE_RUBY=	yes
 
 NO_ARCH=	yes
 
diff --git a/databases/rubygem-redis-actionpack-rails61/distinfo b/databases/rubygem-redis-actionpack-rails61/distinfo
index 8b1547cacdb6..08a627ff09dd 100644
--- a/databases/rubygem-redis-actionpack-rails61/distinfo
+++ b/databases/rubygem-redis-actionpack-rails61/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1582626493
-SHA256 (rubygem/redis-actionpack-5.2.0.gem) = 6337f72c5ed21e7d4909468479fe51d9c2b343cf0ea933e0270400f6bf394230
-SIZE (rubygem/redis-actionpack-5.2.0.gem) = 13312
+TIMESTAMP = 1702028324
+SHA256 (rubygem/redis-actionpack-5.4.0.gem) = f10cf649ab05914716d63334d7f709221ecc883b87cf348f90ecfe0c35ea3540
+SIZE (rubygem/redis-actionpack-5.4.0.gem) = 14336
diff --git a/databases/rubygem-redis-actionpack-rails61/pkg-descr b/databases/rubygem-redis-actionpack-rails61/pkg-descr
index 0998b5878721..ebcad6a52a5c 100644
--- a/databases/rubygem-redis-actionpack-rails61/pkg-descr
+++ b/databases/rubygem-redis-actionpack-rails61/pkg-descr
@@ -1,3 +1 @@
 Redis session store for ActionPack
-
-WWW: https://redis-store.org/redis-actionpack/
diff --git a/databases/rubygem-redis-actionpack-rails70/Makefile b/databases/rubygem-redis-actionpack-rails70/Makefile
new file mode 100644
index 000000000000..79edbf413aa6
--- /dev/null
+++ b/databases/rubygem-redis-actionpack-rails70/Makefile
@@ -0,0 +1,22 @@
+PORTNAME=	redis-actionpack
+PORTVERSION=	5.4.0
+CATEGORIES=	databases rubygems
+MASTER_SITES=	RG
+PKGNAMESUFFIX=	-rails70
+
+MAINTAINER=	ruby@FreeBSD.org
+COMMENT=	Redis session store for ActionPack
+WWW=		https://redis-store.org/redis-actionpack/
+
+LICENSE=	MIT
+LICENSE_FILE=	${WRKSRC}/MIT-LICENSE
+
+RUN_DEPENDS=	rubygem-actionpack70>=5<8:www/rubygem-actionpack70 \
+		rubygem-redis-rack2>=2.1.0<4:www/rubygem-redis-rack2 \
+		rubygem-redis-store>=1.1.0<2:devel/rubygem-redis-store
+
+USES=		gem
+
+NO_ARCH=	yes
+
+.include <bsd.port.mk>
diff --git a/databases/rubygem-redis-actionpack-rails70/distinfo b/databases/rubygem-redis-actionpack-rails70/distinfo
new file mode 100644
index 000000000000..01fa36d55e3f
--- /dev/null
+++ b/databases/rubygem-redis-actionpack-rails70/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1705828236
+SHA256 (rubygem/redis-actionpack-5.4.0.gem) = f10cf649ab05914716d63334d7f709221ecc883b87cf348f90ecfe0c35ea3540
+SIZE (rubygem/redis-actionpack-5.4.0.gem) = 14336
diff --git a/databases/rubygem-redis-actionpack-rails70/pkg-descr b/databases/rubygem-redis-actionpack-rails70/pkg-descr
new file mode 100644
index 000000000000..ebcad6a52a5c
--- /dev/null
+++ b/databases/rubygem-redis-actionpack-rails70/pkg-descr
@@ -0,0 +1 @@
+Redis session store for ActionPack
diff --git a/databases/rubygem-redis-actionpack/Makefile b/databases/rubygem-redis-actionpack/Makefile
index 0c99e45128df..ab7186d42783 100644
--- a/databases/rubygem-redis-actionpack/Makefile
+++ b/databases/rubygem-redis-actionpack/Makefile
@@ -1,20 +1,20 @@
 PORTNAME=	redis-actionpack
-PORTVERSION=	5.2.0
+PORTVERSION=	5.4.0
 CATEGORIES=	databases rubygems
 MASTER_SITES=	RG
 
-MAINTAINER=	ruby@FreeBSD.org
+MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Redis session store for ActionPack
+WWW=		https://redis-store.org/redis-actionpack/
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/MIT-LICENSE
 
-RUN_DEPENDS=	rubygem-actionpack52>=5<7:www/rubygem-actionpack52 \
-		rubygem-redis-rack>=2.1.0<3:www/rubygem-redis-rack \
+RUN_DEPENDS=	rubygem-actionpack52>=5<8:www/rubygem-actionpack52 \
+		rubygem-redis-rack>=2.1.0<4:www/rubygem-redis-rack \
 		rubygem-redis-store>=1.1.0<2:devel/rubygem-redis-store
 
 USES=		gem
-USE_RUBY=	yes
 
 NO_ARCH=	yes
 
diff --git a/databases/rubygem-redis-actionpack/distinfo b/databases/rubygem-redis-actionpack/distinfo
index 2fe971f70197..08a627ff09dd 100644
--- a/databases/rubygem-redis-actionpack/distinfo
+++ b/databases/rubygem-redis-actionpack/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1598175328
-SHA256 (rubygem/redis-actionpack-5.2.0.gem) = 6337f72c5ed21e7d4909468479fe51d9c2b343cf0ea933e0270400f6bf394230
-SIZE (rubygem/redis-actionpack-5.2.0.gem) = 13312
+TIMESTAMP = 1702028324
+SHA256 (rubygem/redis-actionpack-5.4.0.gem) = f10cf649ab05914716d63334d7f709221ecc883b87cf348f90ecfe0c35ea3540
+SIZE (rubygem/redis-actionpack-5.4.0.gem) = 14336
diff --git a/databases/rubygem-redis-actionpack/pkg-descr b/databases/rubygem-redis-actionpack/pkg-descr
index 0998b5878721..ebcad6a52a5c 100644
--- a/databases/rubygem-redis-actionpack/pkg-descr
+++ b/databases/rubygem-redis-actionpack/pkg-descr
@@ -1,3 +1 @@
 Redis session store for ActionPack
-
-WWW: https://redis-store.org/redis-actionpack/
diff --git a/databases/rubygem-redis-client/Makefile b/databases/rubygem-redis-client/Makefile
new file mode 100644
index 000000000000..c7afe358b1bf
--- /dev/null
+++ b/databases/rubygem-redis-client/Makefile
@@ -0,0 +1,19 @@
+PORTNAME=	redis-client
+PORTVERSION=	0.22.1
+CATEGORIES=	databases rubygems
+MASTER_SITES=	RG
+
+MAINTAINER=	sunpoet@FreeBSD.org
+COMMENT=	Simple low-level client for Redis 6+
+WWW=		https://github.com/redis-rb/redis-client
+
+LICENSE=	MIT
+LICENSE_FILE=	${WRKSRC}/LICENSE.md
+
+RUN_DEPENDS=	rubygem-connection_pool>=0:net/rubygem-connection_pool
+
+USES=		gem
+
+NO_ARCH=	yes
+
+.include <bsd.port.mk>
diff --git a/databases/rubygem-redis-client/distinfo b/databases/rubygem-redis-client/distinfo
new file mode 100644
index 000000000000..8b4a7dd8809f
--- /dev/null
+++ b/databases/rubygem-redis-client/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1713528568
+SHA256 (rubygem/redis-client-0.22.1.gem) = b411b3812e83f817069dc20651dd3b01d4d417a0cab0f04fbaf143d6de19107e
+SIZE (rubygem/redis-client-0.22.1.gem) = 29696
diff --git a/databases/rubygem-redis-client/pkg-descr b/databases/rubygem-redis-client/pkg-descr
new file mode 100644
index 000000000000..bc399958afca
--- /dev/null
+++ b/databases/rubygem-redis-client/pkg-descr
@@ -0,0 +1,4 @@
+redis-client is a simple, low-level, client for Redis 6+.
+
+Contrary to the redis gem, redis-client doesn't try to map all Redis commands to
+Ruby constructs, it merely is a thin wrapper on top of the RESP3 protocol.
diff --git a/databases/rubygem-redis-cluster-client/Makefile b/databases/rubygem-redis-cluster-client/Makefile
new file mode 100644
index 000000000000..1e63bf362a9c
--- /dev/null
+++ b/databases/rubygem-redis-cluster-client/Makefile
@@ -0,0 +1,18 @@
+PORTNAME=	redis-cluster-client
+PORTVERSION=	0.8.2
+CATEGORIES=	databases rubygems
+MASTER_SITES=	RG
+
+MAINTAINER=	sunpoet@FreeBSD.org
+COMMENT=	Redis cluster client for Ruby
+WWW=		https://github.com/redis-rb/redis-cluster-client
+
+LICENSE=	MIT
+
+RUN_DEPENDS=	rubygem-redis-client>=0.22<1:databases/rubygem-redis-client
+
+USES=		gem
+
+NO_ARCH=	yes
+
+.include <bsd.port.mk>
diff --git a/databases/rubygem-redis-cluster-client/distinfo b/databases/rubygem-redis-cluster-client/distinfo
new file mode 100644
index 000000000000..e9e7a761831e
--- /dev/null
+++ b/databases/rubygem-redis-cluster-client/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1713624728
+SHA256 (rubygem/redis-cluster-client-0.8.2.gem) = 1ced1b8a86e2bd57d297de35194e06f84da306f22c13cfbb7103e6458055eb80
+SIZE (rubygem/redis-cluster-client-0.8.2.gem) = 25088
diff --git a/databases/rubygem-redis-cluster-client/pkg-descr b/databases/rubygem-redis-cluster-client/pkg-descr
new file mode 100644
index 000000000000..333d1ae09eca
--- /dev/null
+++ b/databases/rubygem-redis-cluster-client/pkg-descr
@@ -0,0 +1 @@
+Redis Cluster Client is a client for Redis cluster. It depends on redis-client.
diff --git a/databases/rubygem-redis-clustering/Makefile b/databases/rubygem-redis-clustering/Makefile
new file mode 100644
index 000000000000..20ab79b02a71
--- /dev/null
+++ b/databases/rubygem-redis-clustering/Makefile
@@ -0,0 +1,20 @@
+PORTNAME=	redis-clustering
+PORTVERSION=	5.2.0
+CATEGORIES=	databases rubygems
+MASTER_SITES=	RG
+
+MAINTAINER=	sunpoet@FreeBSD.org
+COMMENT=	Ruby client that tries to match Redis Cluster API
+WWW=		https://github.com/redis/redis-rb/tree/master/cluster
+
+LICENSE=	MIT
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
+RUN_DEPENDS=	rubygem-redis>=${PORTVERSION}<${PORTVERSION}_99:databases/rubygem-redis \
+		rubygem-redis-cluster-client>=0.7.11:databases/rubygem-redis-cluster-client
+
+USES=		gem
+
+NO_ARCH=	yes
+
+.include <bsd.port.mk>
diff --git a/databases/rubygem-redis-clustering/distinfo b/databases/rubygem-redis-clustering/distinfo
new file mode 100644
index 000000000000..28971fa04743
--- /dev/null
+++ b/databases/rubygem-redis-clustering/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1713528570
+SHA256 (rubygem/redis-clustering-5.2.0.gem) = 685f388e0bdd81091a96cce9a46e22e727213d5fa14ebfc5111e110440e0038e
+SIZE (rubygem/redis-clustering-5.2.0.gem) = 8704
diff --git a/databases/rubygem-redis-clustering/pkg-descr b/databases/rubygem-redis-clustering/pkg-descr
new file mode 100644
index 000000000000..a66f60bdc61c
--- /dev/null
+++ b/databases/rubygem-redis-clustering/pkg-descr
@@ -0,0 +1,2 @@
+Redis::Cluster is a Ruby client that tries to match Redis' Cluster API
+one-to-one, while still providing an idiomatic interface.
diff --git a/databases/rubygem-redis-clustering50/Makefile b/databases/rubygem-redis-clustering50/Makefile
new file mode 100644
index 000000000000..b1c6a3c3e6b0
--- /dev/null
+++ b/databases/rubygem-redis-clustering50/Makefile
@@ -0,0 +1,23 @@
+PORTNAME=	redis-clustering
+PORTVERSION=	5.0.8
+CATEGORIES=	databases rubygems
+MASTER_SITES=	RG
+PKGNAMESUFFIX=	50
+
+MAINTAINER=	ruby@FreeBSD.org
+COMMENT=	Ruby client that tries to match Redis Cluster API
+WWW=		https://github.com/redis/redis-rb/tree/master/cluster
+
+LICENSE=	MIT
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
+RUN_DEPENDS=	rubygem-redis50>=${PORTVERSION}<${PORTVERSION}_99:databases/rubygem-redis50 \
+		rubygem-redis-cluster-client>=0.7.0:databases/rubygem-redis-cluster-client
+
+USES=		gem
+
+NO_ARCH=	yes
+
+PORTSCOUT=	limit:^5\.0\.
+
+.include <bsd.port.mk>
diff --git a/databases/rubygem-redis-clustering50/distinfo b/databases/rubygem-redis-clustering50/distinfo
new file mode 100644
index 000000000000..dc916059fbb2
--- /dev/null
+++ b/databases/rubygem-redis-clustering50/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1711468628
+SHA256 (rubygem/redis-clustering-5.0.8.gem) = 8e2f3de3b1a700668eeac59125636e01be6ecd985e635a4d5649c47d71f6e166
+SIZE (rubygem/redis-clustering-5.0.8.gem) = 8192
diff --git a/databases/rubygem-redis-clustering50/pkg-descr b/databases/rubygem-redis-clustering50/pkg-descr
new file mode 100644
index 000000000000..a66f60bdc61c
--- /dev/null
+++ b/databases/rubygem-redis-clustering50/pkg-descr
@@ -0,0 +1,2 @@
+Redis::Cluster is a Ruby client that tries to match Redis' Cluster API
+one-to-one, while still providing an idiomatic interface.
diff --git a/databases/rubygem-redis-namespace/Makefile b/databases/rubygem-redis-namespace/Makefile
index d3efffed7249..572cebb3baf9 100644
--- a/databases/rubygem-redis-namespace/Makefile
+++ b/databases/rubygem-redis-namespace/Makefile
@@ -1,20 +1,18 @@
-# Created by: Steve Wills <swills@FreeBSD.org>
-
 PORTNAME=	redis-namespace
-PORTVERSION=	1.8.1
+PORTVERSION=	1.11.0
 CATEGORIES=	databases rubygems
 MASTER_SITES=	RG
 
 MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	Ruby client class for Redis with namespace support
+WWW=		https://github.com/resque/redis-namespace
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	rubygem-redis>=3.0.4:databases/rubygem-redis
+RUN_DEPENDS=	rubygem-redis>=4:databases/rubygem-redis
 
 USES=		gem
-USE_RUBY=	yes
 
 NO_ARCH=	yes
 
diff --git a/databases/rubygem-redis-namespace/distinfo b/databases/rubygem-redis-namespace/distinfo
index 29eff9e02ffe..c3635c93d09b 100644
--- a/databases/rubygem-redis-namespace/distinfo
+++ b/databases/rubygem-redis-namespace/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1624630252
-SHA256 (rubygem/redis-namespace-1.8.1.gem) = c81707d693e5e754c690b4e1fa68ecfa8bd1028fbf306e533b3832e44e76c54c
-SIZE (rubygem/redis-namespace-1.8.1.gem) = 17920
+TIMESTAMP = 1686496908
+SHA256 (rubygem/redis-namespace-1.11.0.gem) = e91a1aa2b2d888b6dea1d4ab8d39e1ae6fac3426161feb9d91dd5cca598a2239
+SIZE (rubygem/redis-namespace-1.11.0.gem) = 19456
diff --git a/databases/rubygem-redis-namespace/pkg-descr b/databases/rubygem-redis-namespace/pkg-descr
index 40e1df3222fe..017c90780e16 100644
--- a/databases/rubygem-redis-namespace/pkg-descr
+++ b/databases/rubygem-redis-namespace/pkg-descr
@@ -1,5 +1,3 @@
 Adds a Redis::Namespace class which can be used to namespace calls to Redis.
 This is useful when using a single instance of Redis with multiple, different
 applications.
-
-WWW: https://github.com/resque/redis-namespace
diff --git a/databases/rubygem-redis-namespace110/Makefile b/databases/rubygem-redis-namespace110/Makefile
new file mode 100644
index 000000000000..0aca292d3ab9
--- /dev/null
+++ b/databases/rubygem-redis-namespace110/Makefile
@@ -0,0 +1,22 @@
+PORTNAME=	redis-namespace
+PORTVERSION=	1.10.0
+CATEGORIES=	databases rubygems
+MASTER_SITES=	RG
+PKGNAMESUFFIX=	110
+
+MAINTAINER=	ruby@FreeBSD.org
+COMMENT=	Ruby client class for Redis with namespace support
+WWW=		https://github.com/resque/redis-namespace
+
+LICENSE=	MIT
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
+RUN_DEPENDS=	rubygem-redis>=4:databases/rubygem-redis
+
+USES=		gem
+
+NO_ARCH=	yes
+
+PORTSCOUT=	limit:^1\.10\.
+
+.include <bsd.port.mk>
diff --git a/databases/rubygem-redis-namespace110/distinfo b/databases/rubygem-redis-namespace110/distinfo
new file mode 100644
index 000000000000..7d1bd17eab1c
--- /dev/null
+++ b/databases/rubygem-redis-namespace110/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1703587662
+SHA256 (rubygem/redis-namespace-1.10.0.gem) = 2c1c6ea7c6c5e343e75b9bee3aa4c265e364a5b9966507397467af2bb3758d94
+SIZE (rubygem/redis-namespace-1.10.0.gem) = 19456
diff --git a/databases/rubygem-redis-namespace110/pkg-descr b/databases/rubygem-redis-namespace110/pkg-descr
new file mode 100644
index 000000000000..017c90780e16
--- /dev/null
+++ b/databases/rubygem-redis-namespace110/pkg-descr
@@ -0,0 +1,3 @@
+Adds a Redis::Namespace class which can be used to namespace calls to Redis.
+This is useful when using a single instance of Redis with multiple, different
+applications.
diff --git a/databases/rubygem-redis-namespace16/Makefile b/databases/rubygem-redis-namespace16/Makefile
deleted file mode 100644
index 79c2458bdebe..000000000000
--- a/databases/rubygem-redis-namespace16/Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
-# Created by: Steve Wills <swills@FreeBSD.org>
-
-PORTNAME=	redis-namespace
-PORTVERSION=	1.6.0
-CATEGORIES=	databases rubygems
-MASTER_SITES=	RG
-PKGNAMESUFFIX=	16
-
-MAINTAINER=	sunpoet@FreeBSD.org
-COMMENT=	Ruby client class for Redis with namespace support
-
-LICENSE=	MIT
-LICENSE_FILE=	${WRKSRC}/LICENSE
-
-RUN_DEPENDS=	rubygem-redis>=3.0.4:databases/rubygem-redis
-
-USES=		gem
-USE_RUBY=	yes
-
-NO_ARCH=	yes
-
-PORTSCOUT=	limit:^1\.6\.
-
-.include <bsd.port.mk>
diff --git a/databases/rubygem-redis-namespace16/distinfo b/databases/rubygem-redis-namespace16/distinfo
deleted file mode 100644
index cee23f4987a7..000000000000
--- a/databases/rubygem-redis-namespace16/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1509817677
-SHA256 (rubygem/redis-namespace-1.6.0.gem) = 50bd2565a5c9face98907339a7b3c02beff8d35ebc3794805d314b999f52ed64
-SIZE (rubygem/redis-namespace-1.6.0.gem) = 16896
diff --git a/databases/rubygem-redis-namespace16/pkg-descr b/databases/rubygem-redis-namespace16/pkg-descr
deleted file mode 100644
index 40e1df3222fe..000000000000
--- a/databases/rubygem-redis-namespace16/pkg-descr
+++ /dev/null
@@ -1,5 +0,0 @@
-Adds a Redis::Namespace class which can be used to namespace calls to Redis.
-This is useful when using a single instance of Redis with multiple, different
-applications.
-
-WWW: https://github.com/resque/redis-namespace
diff --git a/databases/rubygem-redis/Makefile b/databases/rubygem-redis/Makefile
index b1d9a021335d..a274165af25b 100644
--- a/databases/rubygem-redis/Makefile
+++ b/databases/rubygem-redis/Makefile
@@ -1,18 +1,18 @@
-# Created by: Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>
-
 PORTNAME=	redis
-PORTVERSION=	4.4.0
+PORTVERSION=	5.2.0
 CATEGORIES=	databases rubygems
 MASTER_SITES=	RG
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Ruby client library for Redis, the key value storage server
+WWW=		https://github.com/redis/redis-rb
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
+RUN_DEPENDS=	rubygem-redis-client>=0.22.0:databases/rubygem-redis-client
+
 USES=		gem
-USE_RUBY=	yes
 
 NO_ARCH=	yes
 
diff --git a/databases/rubygem-redis/distinfo b/databases/rubygem-redis/distinfo
index abf573cfa02d..36fcc864f1d3 100644
--- a/databases/rubygem-redis/distinfo
+++ b/databases/rubygem-redis/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1628103192
-SHA256 (rubygem/redis-4.4.0.gem) = 409c6a2ed2cc3fe542485cabdfe5a7a9f223d577d1929194b9b776709b18e8c5
-SIZE (rubygem/redis-4.4.0.gem) = 60416
+TIMESTAMP = 1713528566
+SHA256 (rubygem/redis-5.2.0.gem) = 336b975a56b166c6af4d4a1026c71dbed429ba5dc949aac373ef2fded07936b4
+SIZE (rubygem/redis-5.2.0.gem) = 52224
diff --git a/databases/rubygem-redis/pkg-descr b/databases/rubygem-redis/pkg-descr
index 689266df5a57..060aad72bc9b 100644
--- a/databases/rubygem-redis/pkg-descr
+++ b/databases/rubygem-redis/pkg-descr
@@ -1,3 +1 @@
 rubygem-redis is a Ruby client library for the Redis key-value store.
-
-WWW: https://github.com/redis/redis-rb
diff --git a/databases/rubygem-redis4/Makefile b/databases/rubygem-redis4/Makefile
new file mode 100644
index 000000000000..a3d7606daf48
--- /dev/null
+++ b/databases/rubygem-redis4/Makefile
@@ -0,0 +1,23 @@
+PORTNAME=	redis
+PORTVERSION=	4.8.1
+CATEGORIES=	databases rubygems
+MASTER_SITES=	RG
+PKGNAMESUFFIX=	4
+
+MAINTAINER=	sunpoet@FreeBSD.org
+COMMENT=	Ruby client library for Redis, the key value storage server
+WWW=		https://github.com/redis/redis-rb
+
+LICENSE=	MIT
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
+USES=		gem
+
+NO_ARCH=	yes
+
+PORTSCOUT=	limit:^4\.
+
+post-install:
+	${RM} ${STAGEDIR}${PREFIX}/bin/build
+
+.include <bsd.port.mk>
diff --git a/databases/rubygem-redis4/distinfo b/databases/rubygem-redis4/distinfo
new file mode 100644
index 000000000000..4d3dffe4dfdf
--- /dev/null
+++ b/databases/rubygem-redis4/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1677771397
+SHA256 (rubygem/redis-4.8.1.gem) = 387ee086694fffc9632aaeb1efe4a7b1627ca783bf373320346a8a20cd93333a
+SIZE (rubygem/redis-4.8.1.gem) = 69120
diff --git a/databases/rubygem-redis4/pkg-descr b/databases/rubygem-redis4/pkg-descr
new file mode 100644
index 000000000000..060aad72bc9b
--- /dev/null
+++ b/databases/rubygem-redis4/pkg-descr
@@ -0,0 +1 @@
+rubygem-redis is a Ruby client library for the Redis key-value store.
diff --git a/databases/rubygem-redis50/Makefile b/databases/rubygem-redis50/Makefile
new file mode 100644
index 000000000000..1259d1ab33a7
--- /dev/null
+++ b/databases/rubygem-redis50/Makefile
@@ -0,0 +1,25 @@
+PORTNAME=	redis
+PORTVERSION=	5.0.8
+CATEGORIES=	databases rubygems
+MASTER_SITES=	RG
+PKGNAMESUFFIX=	50
+
+MAINTAINER=	ruby@FreeBSD.org
+COMMENT=	Ruby client library for Redis, the key value storage server
+WWW=		https://github.com/redis/redis-rb
+
+LICENSE=	MIT
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
+RUN_DEPENDS=	rubygem-redis-client>=0.17.0:databases/rubygem-redis-client
+
+USES=		gem
+
+NO_ARCH=	yes
+
+PORTSCOUT=	limit:^5\.0\.
+
+post-install:
+	${RM} ${STAGEDIR}${PREFIX}/bin/build
+
+.include <bsd.port.mk>
diff --git a/databases/rubygem-redis50/distinfo b/databases/rubygem-redis50/distinfo
new file mode 100644
index 000000000000..fe1bb48ea069
--- /dev/null
+++ b/databases/rubygem-redis50/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1711468347
+SHA256 (rubygem/redis-5.0.8.gem) = 3b770ea597850b26d6a9718fa184241e53e6c8a7ae0486ee8bfaefd29f26f3d8
+SIZE (rubygem/redis-5.0.8.gem) = 51200
diff --git a/databases/rubygem-redis50/pkg-descr b/databases/rubygem-redis50/pkg-descr
new file mode 100644
index 000000000000..060aad72bc9b
--- /dev/null
+++ b/databases/rubygem-redis50/pkg-descr
@@ -0,0 +1 @@
+rubygem-redis is a Ruby client library for the Redis key-value store.
diff --git a/databases/rubygem-ruby-mysql/Makefile b/databases/rubygem-ruby-mysql/Makefile
new file mode 100644
index 000000000000..0749629d20a3
--- /dev/null
+++ b/databases/rubygem-ruby-mysql/Makefile
@@ -0,0 +1,16 @@
+PORTNAME=	ruby-mysql
+PORTVERSION=	4.1.0
+CATEGORIES=	databases rubygems
+MASTER_SITES=	RG
+
+MAINTAINER=	antoine@FreeBSD.org
+COMMENT=	MySQL connector in pure ruby
+WWW=		https://gitlab.com/tmtms/ruby-mysql
+
+LICENSE=	MIT
+
+NO_ARCH=	yes
+
+USES=		gem
+
+.include <bsd.port.mk>
diff --git a/databases/rubygem-ruby-mysql/distinfo b/databases/rubygem-ruby-mysql/distinfo
new file mode 100644
index 000000000000..be56baf29121
--- /dev/null
+++ b/databases/rubygem-ruby-mysql/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1704466321
+SHA256 (rubygem/ruby-mysql-4.1.0.gem) = 6515157cfc0d986c1b9a13f52ebe3260e09c3ef9142e4703160f2f8dbf65dcbc
+SIZE (rubygem/ruby-mysql-4.1.0.gem) = 42496
diff --git a/databases/rubygem-ruby-mysql/pkg-descr b/databases/rubygem-ruby-mysql/pkg-descr
new file mode 100644
index 000000000000..915e072f8428
--- /dev/null
+++ b/databases/rubygem-ruby-mysql/pkg-descr
@@ -0,0 +1 @@
+ruby-mysql is a MySQL client library.  It is written entirely in Ruby.
diff --git a/databases/rubygem-scenic61/Makefile b/databases/rubygem-scenic61/Makefile
new file mode 100644
index 000000000000..ee46d4398f4f
--- /dev/null
+++ b/databases/rubygem-scenic61/Makefile
@@ -0,0 +1,21 @@
+PORTNAME=	scenic
+PORTVERSION=	1.8.0
+CATEGORIES=	databases rubygems
+MASTER_SITES=	RG
+PKGNAMESUFFIX=	61
+
+MAINTAINER=	bofh@FreeBSD.org
+COMMENT=	Adds methods to ActiveRecord::Migration to create and manage database views in Rails
+WWW=		https://github.com/scenic-views/scenic
+
+LICENSE=	MIT
+LICENSE_FILE=	${WRKSRC}/LICENSE.txt
+
+RUN_DEPENDS=	rubygem-activerecord61>=4.0.0:databases/rubygem-activerecord61 \
+		rubygem-railties61>=4.0.0:www/rubygem-railties61
+
+USES=		gem
+
+NO_ARCH=	yes
+
+.include <bsd.port.mk>
diff --git a/databases/rubygem-scenic61/distinfo b/databases/rubygem-scenic61/distinfo
new file mode 100644
index 000000000000..f6420f3ea8bc
--- /dev/null
+++ b/databases/rubygem-scenic61/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1711705610
+SHA256 (rubygem/scenic-1.8.0.gem) = 31920ab1f3aa00e8b39aa273ebcb10727806a2e2fc100146b57afc079e530d70
+SIZE (rubygem/scenic-1.8.0.gem) = 38912
diff --git a/databases/rubygem-scenic61/pkg-descr b/databases/rubygem-scenic61/pkg-descr
new file mode 100644
index 000000000000..00bf98e471e1
--- /dev/null
+++ b/databases/rubygem-scenic61/pkg-descr
@@ -0,0 +1,3 @@
+This gem is an ActiveModel Serializer implementation with Rails hooks.
+It provides a means to generate JSON in an object-oriented and
+convention-driven manner.
diff --git a/databases/rubygem-sdbm/Makefile b/databases/rubygem-sdbm/Makefile
index a5b6b8f0ab76..1dd216131508 100644
--- a/databases/rubygem-sdbm/Makefile
+++ b/databases/rubygem-sdbm/Makefile
@@ -1,5 +1,3 @@
-# Created by: Po-Chuan Hsieh <sunpoet@FreeBSD.org>
-
 PORTNAME=	sdbm
 PORTVERSION=	1.0.0
 CATEGORIES=	databases rubygems
@@ -7,10 +5,10 @@ MASTER_SITES=	RG
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Simple file-based key-value store with String keys and values
+WWW=		https://github.com/ruby/sdbm
 
 LICENSE=	BSD2CLAUSE
 
 USES=		gem
-USE_RUBY=	yes
 
 .include <bsd.port.mk>
diff --git a/databases/rubygem-sdbm/pkg-descr b/databases/rubygem-sdbm/pkg-descr
index 1ce9e8402232..b872e0d0043f 100644
--- a/databases/rubygem-sdbm/pkg-descr
+++ b/databases/rubygem-sdbm/pkg-descr
@@ -1,4 +1,2 @@
 SDBM provides a simple file-based key-value store, which can only store String
 keys and values.
-
-WWW: https://github.com/ruby/sdbm
diff --git a/databases/rubygem-seed-fu/Makefile b/databases/rubygem-seed-fu/Makefile
index 7940990170c8..29e67557c14c 100644
--- a/databases/rubygem-seed-fu/Makefile
+++ b/databases/rubygem-seed-fu/Makefile
@@ -1,20 +1,20 @@
 PORTNAME=	seed-fu
 PORTVERSION=	2.3.9
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	databases rubygems
 MASTER_SITES=	RG
 
 MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	Library to maintain seed data
+WWW=		https://github.com/mbleigh/seed-fu
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	rubygem-activerecord60>=3.1:databases/rubygem-activerecord60 \
-		rubygem-activesupport60>=3.1:devel/rubygem-activesupport60
+RUN_DEPENDS=	rubygem-activerecord61>=3.1:databases/rubygem-activerecord61 \
+		rubygem-activesupport61>=3.1:devel/rubygem-activesupport61
 
 USES=		gem
-USE_RUBY=	yes
 
 NO_ARCH=	yes
 
diff --git a/databases/rubygem-seed-fu/pkg-descr b/databases/rubygem-seed-fu/pkg-descr
index 99f7c5d05344..2a3d17572f36 100644
--- a/databases/rubygem-seed-fu/pkg-descr
+++ b/databases/rubygem-seed-fu/pkg-descr
@@ -2,5 +2,3 @@ Seed Fu is an attempt to once and for all solve the problem of inserting and
 maintaining seed data in a database. It uses a variety of techniques gathered
 from various places around the web and combines them to create what is
 hopefully the most robust seed data system around.
-
-WWW: https://github.com/mbleigh/seed-fu
diff --git a/databases/rubygem-sqlite3-ruby/Makefile b/databases/rubygem-sqlite3-ruby/Makefile
index 54c6d7b5940a..d50912e41e6e 100644
--- a/databases/rubygem-sqlite3-ruby/Makefile
+++ b/databases/rubygem-sqlite3-ruby/Makefile
@@ -1,5 +1,3 @@
-# Created by: Akinori MUSHA aka knu <knu@idaemons.org>
-
 PORTNAME=	sqlite3-ruby
 PORTVERSION=	1.3.3
 PORTREVISION=	1
@@ -8,6 +6,7 @@ MASTER_SITES=	RG
 
 MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	Ruby interface to the SQLite DB engine version 3
+WWW=		https://github.com/sparklemotion/sqlite3-ruby
 
 LICENSE=	BSD3CLAUSE
 
@@ -17,7 +16,6 @@ RUN_DEPENDS=	rubygem-sqlite3>=1.3.3:databases/rubygem-sqlite3
 
 CONFIGURE_ARGS=	--with-sqlite3-dir=${LOCALBASE}
 NO_ARCH=	yes
-USE_RUBY=	yes
 USES=		gem
 
 PLIST_FILES=	bin/sqlite3_ruby
diff --git a/databases/rubygem-sqlite3-ruby/pkg-descr b/databases/rubygem-sqlite3-ruby/pkg-descr
index f2940774779f..f05b893bede6 100644
--- a/databases/rubygem-sqlite3-ruby/pkg-descr
+++ b/databases/rubygem-sqlite3-ruby/pkg-descr
@@ -4,5 +4,3 @@ and from the ruby DBI version of SQLite in that it is SQLite specific,
 so you can do things that would otherwise be more difficult via DBI.
 If you want portability between backends, use DBI.  If you want ease
 of use with SQLite, use this.
-
-WWW: https://github.com/sparklemotion/sqlite3-ruby
diff --git a/databases/rubygem-sqlite3/Makefile b/databases/rubygem-sqlite3/Makefile
index aed9e0f69521..57bdd304fb9e 100644
--- a/databases/rubygem-sqlite3/Makefile
+++ b/databases/rubygem-sqlite3/Makefile
@@ -1,22 +1,21 @@
-# Created by: Akinori MUSHA aka knu <knu@idaemons.org>
-
 PORTNAME=	sqlite3
-PORTVERSION=	1.4.2
+PORTVERSION=	1.7.3
+PORTREVISION=	1
 CATEGORIES=	databases rubygems
 MASTER_SITES=	RG
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Ruby interface to the SQLite DB engine version 3
+WWW=		https://github.com/sparklemotion/sqlite3-ruby
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	swig:devel/swig
-LIB_DEPENDS=	libsqlite3.so:databases/sqlite3
+USES=		gem sqlite
 
-USES=		gem
-USE_RUBY=	yes
+CONFIGURE_ARGS=	--enable-system-libraries --with-sqlite3-dir=${LOCALBASE}
 
-CONFIGURE_ARGS=	--with-sqlite3-dir=${LOCALBASE}
+post-patch:
+	@${RM} -r ${WRKSRC}/ports/
 
 .include <bsd.port.mk>
diff --git a/databases/rubygem-sqlite3/distinfo b/databases/rubygem-sqlite3/distinfo
index 1ebaffe1ed0f..52b54fd5c69c 100644
--- a/databases/rubygem-sqlite3/distinfo
+++ b/databases/rubygem-sqlite3/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1577145805
-SHA256 (rubygem/sqlite3-1.4.2.gem) = e8b8ef3b0f75c18e1a7ee62c5678c827e99389e53fa55eb7a9a5f57459004a52
-SIZE (rubygem/sqlite3-1.4.2.gem) = 70656
+TIMESTAMP = 1711466256
+SHA256 (rubygem/sqlite3-1.7.3.gem) = fa77f63c709548f46d4e9b6bb45cda52aa3881aa12cc85991132758e8968701c
+SIZE (rubygem/sqlite3-1.7.3.gem) = 3307008
diff --git a/databases/rubygem-sqlite3/files/patch-ext-sqlite3-extconf.rb b/databases/rubygem-sqlite3/files/patch-ext-sqlite3-extconf.rb
new file mode 100644
index 000000000000..7a946b9d0a06
--- /dev/null
+++ b/databases/rubygem-sqlite3/files/patch-ext-sqlite3-extconf.rb
@@ -0,0 +1,11 @@
+--- ext/sqlite3/extconf.rb.orig	2023-04-08 07:40:49 UTC
++++ ext/sqlite3/extconf.rb
+@@ -130,8 +130,6 @@ module Sqlite3
+       end
+ 
+       def minimal_recipe
+-        require "mini_portile2"
+-
+         MiniPortile.new(libname, sqlite3_config[:version]).tap do |recipe|
+           if sqlite_source_dir
+             recipe.source_directory = sqlite_source_dir
diff --git a/databases/rubygem-sqlite3/files/patch-gemspec b/databases/rubygem-sqlite3/files/patch-gemspec
new file mode 100644
index 000000000000..f794d37bb4b9
--- /dev/null
+++ b/databases/rubygem-sqlite3/files/patch-gemspec
@@ -0,0 +1,21 @@
+% sed -i .orig 's|, "ports/[^"]*".freeze||g' sqlite3.gemspec
+
+--- sqlite3.gemspec.orig	2024-04-19 04:56:31 UTC
++++ sqlite3.gemspec
+@@ -14,7 +14,7 @@ Gem::Specification.new do |s|
+   s.description = "Ruby library to interface with the SQLite3 database engine (http://www.sqlite.org). Precompiled\nbinaries are available for common platforms for recent versions of Ruby.\n".freeze
+   s.extensions = ["ext/sqlite3/extconf.rb".freeze]
+   s.extra_rdoc_files = ["API_CHANGES.md".freeze, "CHANGELOG.md".freeze, "README.md".freeze, "ext/sqlite3/aggregator.c".freeze, "ext/sqlite3/backup.c".freeze, "ext/sqlite3/database.c".freeze, "ext/sqlite3/exception.c".freeze, "ext/sqlite3/sqlite3.c".freeze, "ext/sqlite3/statement.c".freeze]
+-  s.files = [".gemtest".freeze, "API_CHANGES.md".freeze, "CHANGELOG.md".freeze, "CONTRIBUTING.md".freeze, "ChangeLog.cvs".freeze, "FAQ.md".freeze, "Gemfile".freeze, "INSTALLATION.md".freeze, "LICENSE".freeze, "LICENSE-DEPENDENCIES".freeze, "README.md".freeze, "dependencies.yml".freeze, "ext/sqlite3/aggregator.c".freeze, "ext/sqlite3/aggregator.h".freeze, "ext/sqlite3/backup.c".freeze, "ext/sqlite3/backup.h".freeze, "ext/sqlite3/database.c".freeze, "ext/sqlite3/database.h".freeze, "ext/sqlite3/exception.c".freeze, "ext/sqlite3/exception.h".freeze, "ext/sqlite3/extconf.rb".freeze, "ext/sqlite3/sqlite3.c".freeze, "ext/sqlite3/sqlite3_ruby.h".freeze, "ext/sqlite3/statement.c".freeze, "ext/sqlite3/statement.h".freeze, "lib/sqlite3.rb".freeze, "lib/sqlite3/constants.rb".freeze, "lib/sqlite3/database.rb".freeze, "lib/sqlite3/errors.rb".freeze, "lib/sqlite3/pragmas.rb".freeze, "lib/sqlite3/resultset.rb".freeze, "lib/sqlite3/statement.rb".freeze, "lib/sqlite3/translator.rb".freeze, "lib/sqlite3/value.rb".freeze, "lib/sqlite3/version.rb".freeze, "ports/archives/sqlite-autoconf-3450200.tar.gz".freeze, "test/helper.rb".freeze, "test/test_backup.rb".freeze, "test/test_collation.rb".freeze, "test/test_database.rb".freeze, "test/test_database_flags.rb".freeze, "test/test_database_readonly.rb".freeze, "test/test_database_readwrite.rb".freeze, "test/test_deprecated.rb".freeze, "test/test_encoding.rb".freeze, "test/test_integration.rb".freeze, "test/test_integration_aggregate.rb".freeze, "test/test_integration_open_close.rb".freeze, "test/test_integration_pending.rb".freeze, "test/test_integration_resultset.rb".freeze, "test/test_integration_statement.rb".freeze, "test/test_pragmas.rb".freeze, "test/test_result_set.rb".freeze, "test/test_sqlite3.rb".freeze, "test/test_statement.rb".freeze, "test/test_statement_execute.rb".freeze]
++  s.files = [".gemtest".freeze, "API_CHANGES.md".freeze, "CHANGELOG.md".freeze, "CONTRIBUTING.md".freeze, "ChangeLog.cvs".freeze, "FAQ.md".freeze, "Gemfile".freeze, "INSTALLATION.md".freeze, "LICENSE".freeze, "LICENSE-DEPENDENCIES".freeze, "README.md".freeze, "dependencies.yml".freeze, "ext/sqlite3/aggregator.c".freeze, "ext/sqlite3/aggregator.h".freeze, "ext/sqlite3/backup.c".freeze, "ext/sqlite3/backup.h".freeze, "ext/sqlite3/database.c".freeze, "ext/sqlite3/database.h".freeze, "ext/sqlite3/exception.c".freeze, "ext/sqlite3/exception.h".freeze, "ext/sqlite3/extconf.rb".freeze, "ext/sqlite3/sqlite3.c".freeze, "ext/sqlite3/sqlite3_ruby.h".freeze, "ext/sqlite3/statement.c".freeze, "ext/sqlite3/statement.h".freeze, "lib/sqlite3.rb".freeze, "lib/sqlite3/constants.rb".freeze, "lib/sqlite3/database.rb".freeze, "lib/sqlite3/errors.rb".freeze, "lib/sqlite3/pragmas.rb".freeze, "lib/sqlite3/resultset.rb".freeze, "lib/sqlite3/statement.rb".freeze, "lib/sqlite3/translator.rb".freeze, "lib/sqlite3/value.rb".freeze, "lib/sqlite3/version.rb".freeze, "test/helper.rb".freeze, "test/test_backup.rb".freeze, "test/test_collation.rb".freeze, "test/test_database.rb".freeze, "test/test_database_flags.rb".freeze, "test/test_database_readonly.rb".freeze, "test/test_database_readwrite.rb".freeze, "test/test_deprecated.rb".freeze, "test/test_encoding.rb".freeze, "test/test_integration.rb".freeze, "test/test_integration_aggregate.rb".freeze, "test/test_integration_open_close.rb".freeze, "test/test_integration_pending.rb".freeze, "test/test_integration_resultset.rb".freeze, "test/test_integration_statement.rb".freeze, "test/test_pragmas.rb".freeze, "test/test_result_set.rb".freeze, "test/test_sqlite3.rb".freeze, "test/test_statement.rb".freeze, "test/test_statement_execute.rb".freeze]
+   s.homepage = "https://github.com/sparklemotion/sqlite3-ruby".freeze
+   s.licenses = ["BSD-3-Clause".freeze]
+   s.rdoc_options = ["--main".freeze, "README.md".freeze]
+@@ -23,7 +23,5 @@ Gem::Specification.new do |s|
+   s.summary = "Ruby library to interface with the SQLite3 database engine (http://www.sqlite.org).".freeze
+ 
+   s.specification_version = 4
+-
+-  s.add_runtime_dependency(%q<mini_portile2>.freeze, ["~> 2.8.0".freeze])
+ end
+ 
diff --git a/databases/rubygem-sqlite3/pkg-descr b/databases/rubygem-sqlite3/pkg-descr
index 9fa24d3ad6ab..f05b893bede6 100644
--- a/databases/rubygem-sqlite3/pkg-descr
+++ b/databases/rubygem-sqlite3/pkg-descr
@@ -4,5 +4,3 @@ and from the ruby DBI version of SQLite in that it is SQLite specific,
 so you can do things that would otherwise be more difficult via DBI.
 If you want portability between backends, use DBI.  If you want ease
 of use with SQLite, use this.
-
-WWW: https://github.com/luislavena/sqlite3-ruby
diff --git a/databases/rubygem-state_machines-activemodel/Makefile b/databases/rubygem-state_machines-activemodel/Makefile
index 6dc9db96a709..fc24234fc1d5 100644
--- a/databases/rubygem-state_machines-activemodel/Makefile
+++ b/databases/rubygem-state_machines-activemodel/Makefile
@@ -1,21 +1,19 @@
-# Created by: Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>
-
 PORTNAME=	state_machines-activemodel
-PORTVERSION=	0.8.0
+PORTVERSION=	0.9.0
 CATEGORIES=	databases rubygems
 MASTER_SITES=	RG
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Support for creating state machines for attributes on ActiveModel
+WWW=		https://github.com/state-machines/state_machines-activemodel
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	rubygem-activemodel60>=5.1:databases/rubygem-activemodel60 \
-		rubygem-state_machines>=0.5.0:devel/rubygem-state_machines
+RUN_DEPENDS=	rubygem-activemodel60>=6.0:databases/rubygem-activemodel60 \
+		rubygem-state_machines>=0.6.0:devel/rubygem-state_machines
 
 USES=		gem
-USE_RUBY=	yes
 
 NO_ARCH=	yes
 
diff --git a/databases/rubygem-state_machines-activemodel/distinfo b/databases/rubygem-state_machines-activemodel/distinfo
index 2b7411ea4050..1ee19d6e9c98 100644
--- a/databases/rubygem-state_machines-activemodel/distinfo
+++ b/databases/rubygem-state_machines-activemodel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1609598937
-SHA256 (rubygem/state_machines-activemodel-0.8.0.gem) = e932dab190d4be044fb5f9cab01a3ea0b092c5f113d4676c6c0a0d49bf738d2c
-SIZE (rubygem/state_machines-activemodel-0.8.0.gem) = 17408
+TIMESTAMP = 1688902213
+SHA256 (rubygem/state_machines-activemodel-0.9.0.gem) = 832fcee34a4e1093a3539cb7f6d864fb480c489e5025f8f4ba55a26d32d0b04a
+SIZE (rubygem/state_machines-activemodel-0.9.0.gem) = 15360
diff --git a/databases/rubygem-state_machines-activemodel/pkg-descr b/databases/rubygem-state_machines-activemodel/pkg-descr
index 94a0df12f6d9..0004b37c526c 100644
--- a/databases/rubygem-state_machines-activemodel/pkg-descr
+++ b/databases/rubygem-state_machines-activemodel/pkg-descr
@@ -2,5 +2,3 @@ The StateMachines ActiveModel integration is useful for both standalone usage
 and for providing the base implementation for ORMs which implement the
 ActiveModel API. This integration adds support for validation errors and dirty
 attribute tracking.
-
-WWW: https://github.com/state-machines/state_machines-activemodel
diff --git a/databases/rubygem-state_machines-activerecord/Makefile b/databases/rubygem-state_machines-activerecord/Makefile
index f0e635976012..91335f8caea8 100644
--- a/databases/rubygem-state_machines-activerecord/Makefile
+++ b/databases/rubygem-state_machines-activerecord/Makefile
@@ -1,22 +1,19 @@
-# Created by: Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>
-
 PORTNAME=	state_machines-activerecord
-PORTVERSION=	0.8.0
-PORTREVISION=	0
+PORTVERSION=	0.9.0
 CATEGORIES=	databases rubygems
 MASTER_SITES=	RG
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Support for creating state machines for attributes on ActiveRecord
+WWW=		https://github.com/state-machines/state_machines-activerecord
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	rubygem-activerecord60>=5.1:databases/rubygem-activerecord60 \
-		rubygem-state_machines-activemodel>=0.8.0:databases/rubygem-state_machines-activemodel
+RUN_DEPENDS=	rubygem-activerecord60>=6.0:databases/rubygem-activerecord60 \
+		rubygem-state_machines-activemodel>=0.9.0:databases/rubygem-state_machines-activemodel
 
 USES=		gem
-USE_RUBY=	yes
 
 NO_ARCH=	yes
 
diff --git a/databases/rubygem-state_machines-activerecord/distinfo b/databases/rubygem-state_machines-activerecord/distinfo
index cc65f0eeb7c0..359bcc689af3 100644
--- a/databases/rubygem-state_machines-activerecord/distinfo
+++ b/databases/rubygem-state_machines-activerecord/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1611262267
-SHA256 (rubygem/state_machines-activerecord-0.8.0.gem) = 072fb701b8ab03de0608297f6c55dc34ed096e556fa8f77e556f3c461c71aab6
-SIZE (rubygem/state_machines-activerecord-0.8.0.gem) = 24064
+TIMESTAMP = 1694348324
+SHA256 (rubygem/state_machines-activerecord-0.9.0.gem) = 06a9731aabbfd456d594bd55832d4d1b3c0054fc7530bbe8eb771213a819182a
+SIZE (rubygem/state_machines-activerecord-0.9.0.gem) = 22528
diff --git a/databases/rubygem-state_machines-activerecord/pkg-descr b/databases/rubygem-state_machines-activerecord/pkg-descr
index a1d452e49a4e..81f624bca9fe 100644
--- a/databases/rubygem-state_machines-activerecord/pkg-descr
+++ b/databases/rubygem-state_machines-activerecord/pkg-descr
@@ -1,4 +1,2 @@
 The StateMachines Active Record 4.1+ integration adds support for database
 transactions, automatically saving the record, named scopes, validation errors.
-
-WWW: https://github.com/state-machines/state_machines-activerecord
diff --git a/databases/rubygem-state_machines-activerecord08/Makefile b/databases/rubygem-state_machines-activerecord08/Makefile
new file mode 100644
index 000000000000..a250d0fbf1c9
--- /dev/null
+++ b/databases/rubygem-state_machines-activerecord08/Makefile
@@ -0,0 +1,23 @@
+PORTNAME=	state_machines-activerecord
+PORTVERSION=	0.8.0
+CATEGORIES=	databases rubygems
+MASTER_SITES=	RG
+PKGNAMESUFFIX=	08
+
+MAINTAINER=	sunpoet@FreeBSD.org
+COMMENT=	Support for creating state machines for attributes on ActiveRecord
+WWW=		https://github.com/state-machines/state_machines-activerecord
+
+LICENSE=	MIT
+LICENSE_FILE=	${WRKSRC}/LICENSE.txt
+
+RUN_DEPENDS=	rubygem-activerecord60>=5.1:databases/rubygem-activerecord60 \
+		rubygem-state_machines-activemodel>=0.8.0:databases/rubygem-state_machines-activemodel
+
+USES=		gem
+
+NO_ARCH=	yes
+
+PORTSCOUT=	limit:^0\.8\.
+
+.include <bsd.port.mk>
diff --git a/databases/rubygem-state_machines-activerecord08/distinfo b/databases/rubygem-state_machines-activerecord08/distinfo
new file mode 100644
index 000000000000..cc65f0eeb7c0
--- /dev/null
+++ b/databases/rubygem-state_machines-activerecord08/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1611262267
+SHA256 (rubygem/state_machines-activerecord-0.8.0.gem) = 072fb701b8ab03de0608297f6c55dc34ed096e556fa8f77e556f3c461c71aab6
+SIZE (rubygem/state_machines-activerecord-0.8.0.gem) = 24064
diff --git a/databases/rubygem-state_machines-activerecord08/pkg-descr b/databases/rubygem-state_machines-activerecord08/pkg-descr
new file mode 100644
index 000000000000..81f624bca9fe
--- /dev/null
+++ b/databases/rubygem-state_machines-activerecord08/pkg-descr
@@ -0,0 +1,2 @@
+The StateMachines Active Record 4.1+ integration adds support for database
+transactions, automatically saving the record, named scopes, validation errors.
diff --git a/databases/rubygem-tarantool/Makefile b/databases/rubygem-tarantool/Makefile
index 60fdcfd51311..0e6f28012f2e 100644
--- a/databases/rubygem-tarantool/Makefile
+++ b/databases/rubygem-tarantool/Makefile
@@ -1,5 +1,3 @@
-# Created by: Veniamin Gvozdikov <vg@FreeBSD.org>
-
 PORTNAME=	tarantool
 PORTVERSION=	0.5.8
 CATEGORIES=	databases rubygems
@@ -7,6 +5,7 @@ MASTER_SITES=	RG
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Tarantool KV-storage client
+WWW=		https://github.com/tarantool/tarantool-ruby
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
@@ -17,6 +16,5 @@ RUN_DEPENDS=	rubygem-bin_utils>=0.0.3<0.1:devel/rubygem-bin_utils \
 		rubygem-sumbur>=0.0.2:devel/rubygem-sumbur
 
 USES=		gem
-USE_RUBY=	yes
 
 .include <bsd.port.mk>
diff --git a/databases/rubygem-tarantool/pkg-descr b/databases/rubygem-tarantool/pkg-descr
index ef0ab5449d93..5bc75e053ab0 100644
--- a/databases/rubygem-tarantool/pkg-descr
+++ b/databases/rubygem-tarantool/pkg-descr
@@ -1,3 +1 @@
 It's ruby client for Tarantool Key-Value Storage.
-
-WWW: https://github.com/tarantool/tarantool-ruby
diff --git a/databases/rubygem-trilogy/Makefile b/databases/rubygem-trilogy/Makefile
new file mode 100644
index 000000000000..3f2cce345600
--- /dev/null
+++ b/databases/rubygem-trilogy/Makefile
@@ -0,0 +1,15 @@
+PORTNAME=	trilogy
+PORTVERSION=	2.8.0
+CATEGORIES=	databases rubygems
+MASTER_SITES=	RG
+
+MAINTAINER=	sunpoet@FreeBSD.org
+COMMENT=	Friendly MySQL-compatible library for Ruby, binding to libtrilogy
+WWW=		https://github.com/trilogy-libraries/trilogy/tree/main/contrib/ruby
+
+LICENSE=	MIT
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
+USES=		gem ssl
+
+.include <bsd.port.mk>
diff --git a/databases/rubygem-trilogy/distinfo b/databases/rubygem-trilogy/distinfo
new file mode 100644
index 000000000000..ad380afff4f0
--- /dev/null
+++ b/databases/rubygem-trilogy/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1712644672
+SHA256 (rubygem/trilogy-2.8.0.gem) = 39a3329bd9515f3f7cb4f28e93317272e7a43b07df2f9890faa932ef00198621
+SIZE (rubygem/trilogy-2.8.0.gem) = 69120
diff --git a/databases/rubygem-trilogy/pkg-descr b/databases/rubygem-trilogy/pkg-descr
new file mode 100644
index 000000000000..40f23c799f27
--- /dev/null
+++ b/databases/rubygem-trilogy/pkg-descr
@@ -0,0 +1 @@
+Ruby bindings to the Trilogy client library
diff --git a/databases/sequeler/Makefile b/databases/sequeler/Makefile
index cd881a080ffa..d4ff7dc9f63a 100644
--- a/databases/sequeler/Makefile
+++ b/databases/sequeler/Makefile
@@ -1,28 +1,27 @@
 PORTNAME=	sequeler
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.8.0
-PORTREVISION=	1
+DISTVERSION=	0.8.2
+PORTREVISION=	5
 CATEGORIES=	databases
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Friendly SQL client
+WWW=		https://github.com/Alecaddd/sequeler
 
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	vala:lang/vala
 LIB_DEPENDS=	libgee-0.8.so:devel/libgee \
 		libgranite.so:x11-toolkits/granite \
 		libsecret-1.so:security/libsecret \
 		libssh2.so:security/libssh2
 
 USES=		desktop-file-utils gettext gnome meson pkgconfig \
-		python:3.5+,build
+		python:build vala:build
 USE_GITHUB=	yes
 GH_ACCOUNT=	Alecaddd
 USE_GNOME=	cairo glib20 gtk30 gtksourceview3 libgda5
 GLIB_SCHEMAS=	com.github.alecaddd.sequeler.gschema.xml
-INSTALLS_ICONS=	yes
 
 # for build-aux/meson_post_install.py
 BINARY_ALIAS=	python3=${PYTHON_CMD}
diff --git a/databases/sequeler/distinfo b/databases/sequeler/distinfo
index b76352681dc7..3eb10cd725a4 100644
--- a/databases/sequeler/distinfo
+++ b/databases/sequeler/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1593154415
-SHA256 (Alecaddd-sequeler-v0.8.0_GH0.tar.gz) = 471fdf63fda568d4caddf6182897518e4b7abc1b4f5dfb466bd1dfc86d380f0c
-SIZE (Alecaddd-sequeler-v0.8.0_GH0.tar.gz) = 943925
+TIMESTAMP = 1637953904
+SHA256 (Alecaddd-sequeler-v0.8.2_GH0.tar.gz) = 66ae40d8fc6bf5aa0f5608ffc32c3b66c2ff78deb675d301112a8eca7f050876
+SIZE (Alecaddd-sequeler-v0.8.2_GH0.tar.gz) = 398250
diff --git a/databases/sequeler/pkg-descr b/databases/sequeler/pkg-descr
index 36af30b87e08..f89945829690 100644
--- a/databases/sequeler/pkg-descr
+++ b/databases/sequeler/pkg-descr
@@ -1,5 +1,3 @@
 Sequeler is a friendly SQL client that allows you to connect to
 your local and remote databases, write SQL in a handy text editor
 with language recognition, and visualize SELECT results.
-
-WWW: https://github.com/Alecaddd/sequeler
diff --git a/databases/sfcgal/Makefile b/databases/sfcgal/Makefile
index e98a2907145e..802f30aecfb8 100644
--- a/databases/sfcgal/Makefile
+++ b/databases/sfcgal/Makefile
@@ -1,28 +1,31 @@
-# Created by: Loïc BARTOLETTI <lbartoletti@FreeBSD.org>
-
 PORTNAME=	sfcgal
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.4.0
+DISTVERSION=	1.5.1
+PORTREVISION=	1
 CATEGORIES=	databases math graphics
 
+MASTER_SITES=	https://github.com/CGAL/cgal/releases/download/v5.6/:source1
+DISTFILES=	CGAL-5.6.tar.xz:source1
+
 MAINTAINER=	lbartoletti@FreeBSD.org
 COMMENT=	Wrapper library around CGAL for PostGIS
+WWW=		https://oslandia.gitlab.io/SFCGAL/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	cgal>0:math/cgal
 LIB_DEPENDS=	libboost_system.so:devel/boost-libs \
 		libgmp.so:math/gmp \
 		libmpfr.so:math/mpfr
 
 USES=		cmake compiler:c++14-lang
 USE_GITLAB=	yes
-GL_ACCOUNT=	Oslandia
+GL_ACCOUNT=	SFCGAL
 GL_PROJECT=	SFCGAL
-GL_COMMIT=	815d5097f684dbc48b22041bf2047beab36df0a1
 USE_LDCONFIG=	yes
 
-PLIST_SUB=	SHL3=${PORTVERSION} SHL1=${PORTVERSION:R:R}
+PLIST_SUB=	SHL3=${PORTVERSION} SHL1=${PORTVERSION:R:R} DEBUG_SUFFIX=${WITH_DEBUG:Dd}
+
+CMAKE_ARGS+=	-DCGAL_DIR=${WRKDIR}/CGAL-5.6
 
 .include <bsd.port.mk>
diff --git a/databases/sfcgal/distinfo b/databases/sfcgal/distinfo
index bc1b4fb720ad..a595a5c08f63 100644
--- a/databases/sfcgal/distinfo
+++ b/databases/sfcgal/distinfo
@@ -1,3 +1,5 @@
-TIMESTAMP = 1631629768
-SHA256 (Oslandia-SFCGAL-815d5097f684dbc48b22041bf2047beab36df0a1_GL0.tar.gz) = ab0e3b327d79edc01f549ed8de9006f8262cf56135bfe2dff7db35cb7a339307
-SIZE (Oslandia-SFCGAL-815d5097f684dbc48b22041bf2047beab36df0a1_GL0.tar.gz) = 2418077
+TIMESTAMP = 1703228116
+SHA256 (CGAL-5.6.tar.xz) = dcab9b08a50a06a7cc2cc69a8a12200f8d8f391b9b8013ae476965c10b45161f
+SIZE (CGAL-5.6.tar.xz) = 24874364
+SHA256 (SFCGAL-v1.5.1.tar.bz2) = 79f3296f956d1a51885e1fe9d9d16bc305b0556323867856ce4e8e5d3184301c
+SIZE (SFCGAL-v1.5.1.tar.bz2) = 2322830
diff --git a/databases/sfcgal/pkg-descr b/databases/sfcgal/pkg-descr
index 3a6d87beb491..295df4131e27 100644
--- a/databases/sfcgal/pkg-descr
+++ b/databases/sfcgal/pkg-descr
@@ -4,5 +4,3 @@ SFCGAL is a C++ wrapper library around CGAL with the aim of supporting ISO
 SFCGAL provides standard compliant geometry types and operations, that can be
 accessed from its C or C++ APIs. PostGIS uses the C API, to expose some
 SFCGAL's functions in spatial databases
-
-WWW: http://www.sfcgal.org/
diff --git a/databases/sfcgal/pkg-plist b/databases/sfcgal/pkg-plist
index 62420bb598d7..2941fc708923 100644
--- a/databases/sfcgal/pkg-plist
+++ b/databases/sfcgal/pkg-plist
@@ -23,6 +23,7 @@ include/SFCGAL/TriangulatedSurface.h
 include/SFCGAL/Validity.h
 include/SFCGAL/algorithm/BoundaryVisitor.h
 include/SFCGAL/algorithm/ConsistentOrientationBuilder.h
+include/SFCGAL/algorithm/alphaShapes.h
 include/SFCGAL/algorithm/area.h
 include/SFCGAL/algorithm/collect.h
 include/SFCGAL/algorithm/collectionExtract.h
@@ -47,11 +48,13 @@ include/SFCGAL/algorithm/minkowskiSum.h
 include/SFCGAL/algorithm/normal.h
 include/SFCGAL/algorithm/offset.h
 include/SFCGAL/algorithm/orientation.h
+include/SFCGAL/algorithm/partition_2.h
 include/SFCGAL/algorithm/plane.h
 include/SFCGAL/algorithm/straightSkeleton.h
 include/SFCGAL/algorithm/tesselate.h
 include/SFCGAL/algorithm/translate.h
 include/SFCGAL/algorithm/union.h
+include/SFCGAL/algorithm/visibility.h
 include/SFCGAL/algorithm/volume.h
 include/SFCGAL/capi/sfcgal_c.h
 include/SFCGAL/config.h
@@ -76,6 +79,8 @@ include/SFCGAL/detail/graph/algorithm/isHalfEdge.h
 include/SFCGAL/detail/graph/algorithm/orientation.h
 include/SFCGAL/detail/io/OsgFactory.h
 include/SFCGAL/detail/io/Serialization.h
+include/SFCGAL/detail/io/WkbReader.h
+include/SFCGAL/detail/io/WkbWriter.h
 include/SFCGAL/detail/io/WktReader.h
 include/SFCGAL/detail/io/WktWriter.h
 include/SFCGAL/detail/polygonSetToMultiPolygon.h
@@ -99,12 +104,13 @@ include/SFCGAL/io/GeometryStreams.h
 include/SFCGAL/io/ewkt.h
 include/SFCGAL/io/osg.h
 include/SFCGAL/io/vtk.h
+include/SFCGAL/io/wkb.h
 include/SFCGAL/io/wkt.h
 include/SFCGAL/numeric.h
 include/SFCGAL/triangulate/triangulate2DZ.h
 include/SFCGAL/triangulate/triangulatePolygon.h
 include/SFCGAL/version.h
-lib/libSFCGAL.so
-lib/libSFCGAL.so.%%SHL1%%
-lib/libSFCGAL.so.%%SHL3%%
+lib/libSFCGAL%%DEBUG_SUFFIX%%.so
+lib/libSFCGAL%%DEBUG_SUFFIX%%.so.%%SHL1%%
+lib/libSFCGAL%%DEBUG_SUFFIX%%.so.%%SHL3%%
 libdata/pkgconfig/sfcgal.pc
diff --git a/databases/sharedance/Makefile b/databases/sharedance/Makefile
index ebedabc3ce3e..dff43734c7a1 100644
--- a/databases/sharedance/Makefile
+++ b/databases/sharedance/Makefile
@@ -1,5 +1,3 @@
-# Created by: Gea-Suan Lin <gslin@gslin.org>
-
 PORTNAME=	sharedance
 PORTVERSION=	0.6
 PORTREVISION=	7
@@ -8,6 +6,7 @@ MASTER_SITES=	http://download.pureftpd.org/pub/sharedance/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Daemon to centralize keys and associated data
+WWW=		http://sharedance.pureftpd.org/project/sharedance
 
 LIB_DEPENDS=	libevent.so:devel/libevent
 
diff --git a/databases/sharedance/pkg-descr b/databases/sharedance/pkg-descr
index 6743997e2c78..7b9c566ccb16 100644
--- a/databases/sharedance/pkg-descr
+++ b/databases/sharedance/pkg-descr
@@ -1,5 +1,3 @@
 Sharedance is a high-performance server that centralize ephemeral
 key/data pairs on remote hosts, without the overhead and the
 complexity of an SQL database.
-
-WWW: http://sharedance.pureftpd.org/project/sharedance
diff --git a/databases/slony1v2/Makefile b/databases/slony1v2/Makefile
index 49e8797a64d3..e7e6b44e24ff 100644
--- a/databases/slony1v2/Makefile
+++ b/databases/slony1v2/Makefile
@@ -1,7 +1,5 @@
-# Created by: Radim Kolar
-
 PORTNAME=	slony1v2
-PORTVERSION=	2.2.10
+PORTVERSION=	2.2.11
 CATEGORIES=	databases
 MASTER_SITES=	http://main.slony.info/downloads/2.2/source/
 DISTNAME=	slony1-${PORTVERSION}
@@ -10,6 +8,7 @@ DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
 
 MAINTAINER=	dgilbert@eicat.ca
 COMMENT=	PostgreSQL master to multiple replicas replication system
+WWW=		https://www.slony.info/
 
 LICENSE=	PostgreSQL
 LICENSE_FILE=	${WRKSRC}/COPYRIGHT
diff --git a/databases/slony1v2/distinfo b/databases/slony1v2/distinfo
index 61d77a47d4cf..6923afeec06b 100644
--- a/databases/slony1v2/distinfo
+++ b/databases/slony1v2/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1609531021
-SHA256 (slony1-2.2.10.tar.bz2) = b12c1292d3dc95c181327256a0bcc765441af8e4dee73754c60df8ba94e59610
-SIZE (slony1-2.2.10.tar.bz2) = 1464652
-SHA256 (slony1-2.2.10-docs.tar.bz2) = 469aa9693f54619940b6a812c6f4033ed322b3725ce370bd163dc89944448ed8
-SIZE (slony1-2.2.10-docs.tar.bz2) = 1445193
+TIMESTAMP = 1693423630
+SHA256 (slony1-2.2.11.tar.bz2) = a8a1d1380058c02d8b0b6a51b1aed9bcf0484f44d4e3282c552cadb491d32fb7
+SIZE (slony1-2.2.11.tar.bz2) = 1464951
+SHA256 (slony1-2.2.11-docs.tar.bz2) = e4375c5772a9aa17938ed9fe7b8b85d899718f113aac100094913e383cc2c1f3
+SIZE (slony1-2.2.11-docs.tar.bz2) = 1445007
diff --git a/databases/slony1v2/pkg-descr b/databases/slony1v2/pkg-descr
index 7aa21c9a96dd..c339790d811f 100644
--- a/databases/slony1v2/pkg-descr
+++ b/databases/slony1v2/pkg-descr
@@ -15,5 +15,3 @@ Differences from 1.2 stream
 - Removal of TABLE ADD KEY
 
 - It drops all support for databases prior to PostgreSQL version 8.3.
-
-WWW: https://www.slony.info/
diff --git a/databases/slony1v2/pkg-plist b/databases/slony1v2/pkg-plist
index 4687fa148938..7d05cf3bb662 100644
--- a/databases/slony1v2/pkg-plist
+++ b/databases/slony1v2/pkg-plist
@@ -3,15 +3,15 @@ bin/slonik
 bin/slony_logshipper
 etc/slon.conf-sample
 %%PERLTOOLS%%etc/slon_tools.conf-sample
-lib/postgresql/slony1_funcs.2.2.10.so
+lib/postgresql/slony1_funcs.2.2.11.so
 %%PERLTOOLS%%lib/slon-tools.pm
 sbin/slon-mkservice
-share/postgresql/slony1_base.2.2.10.sql
-share/postgresql/slony1_base.v83.2.2.10.sql
-share/postgresql/slony1_base.v84.2.2.10.sql
-share/postgresql/slony1_funcs.2.2.10.sql
-share/postgresql/slony1_funcs.v83.2.2.10.sql
-share/postgresql/slony1_funcs.v84.2.2.10.sql
+share/postgresql/slony1_base.2.2.11.sql
+share/postgresql/slony1_base.v83.2.2.11.sql
+share/postgresql/slony1_base.v84.2.2.11.sql
+share/postgresql/slony1_funcs.2.2.11.sql
+share/postgresql/slony1_funcs.v83.2.2.11.sql
+share/postgresql/slony1_funcs.v84.2.2.11.sql
 %%PERLTOOLS%%sbin/slon_kill
 %%PERLTOOLS%%sbin/slon_start
 %%PERLTOOLS%%sbin/slon_status
diff --git a/databases/soci/Makefile b/databases/soci/Makefile
index 4f29549e643f..93e2bca77c89 100644
--- a/databases/soci/Makefile
+++ b/databases/soci/Makefile
@@ -1,59 +1,61 @@
-# Created by: Julien Laffaye <kimelto@gmail.com>
-
 PORTNAME=	soci
-DISTVERSION=	4.0.1
-PORTREVISION=	1
+DISTVERSIONPREFIX=	v
+DISTVERSION=	4.0.3
+PORTREVISION=	8
 CATEGORIES=	databases
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	nc@FreeBSD.org
 COMMENT=	C++ Database Access Library
+WWW=		https://soci.sourceforge.net/
 
 LICENSE=	BSL
 LICENSE_FILE=	${WRKSRC}/LICENSE_1_0.txt
 
 USES=		cmake compiler:c++11-lang
-USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	SOCI
 
+USE_LDCONFIG=	yes
+
 CMAKE_OFF=	WITH_ORACLE
 
 SUB_FILES=	pkg-message
 
-OPTIONS_DEFINE=	MYSQL PGSQL SQLITE ODBC BOOST FIREBIRD
-BOOST_DESC=	Enable support for additional types using Boost
-OPTIONS_DEFAULT=MYSQL PGSQL SQLITE ODBC BOOST FIREBIRD
-OPTIONS_SUB=	yes
+OPTIONS_DEFINE=		BOOST FIREBIRD MYSQL ODBC PGSQL SQLITE
+OPTIONS_DEFAULT=	BOOST FIREBIRD MYSQL ODBC PGSQL SQLITE
 
 # firebird is currently only available on x86.
 OPTIONS_EXCLUDE_aarch64=	FIREBIRD
-OPTIONS_EXCLUDE_armv6=		FIREBIRD
-OPTIONS_EXCLUDE_armv7=		FIREBIRD
-OPTIONS_EXCLUDE_mips=		FIREBIRD
-OPTIONS_EXCLUDE_mips64=		FIREBIRD
+OPTIONS_EXCLUDE_armv6=	FIREBIRD
+OPTIONS_EXCLUDE_armv7=	FIREBIRD
+OPTIONS_EXCLUDE_mips=	FIREBIRD
+OPTIONS_EXCLUDE_mips64=	FIREBIRD
 OPTIONS_EXCLUDE_powerpc=	FIREBIRD
 OPTIONS_EXCLUDE_powerpc64=	FIREBIRD
 OPTIONS_EXCLUDE_powerpc64le=	FIREBIRD
-OPTIONS_EXCLUDE_sparc64=	FIREBIRD
+OPTIONS_EXCLUDE_riscv64=	FIREBIRD
 
-MYSQL_USES=	mysql
-MYSQL_CMAKE_BOOL=	WITH_MYSQL
+OPTIONS_SUB=	yes
 
-PGSQL_USES=	pgsql
-PGSQL_CMAKE_BOOL=	WITH_POSTGRESQL
+BOOST_DESC=		Enable support for additional types using Boost
+BOOST_LIB_DEPENDS=	libboost_date_time.so:devel/boost-libs
+BOOST_CMAKE_BOOL=	WITH_BOOST
 
-SQLITE_USES=	sqlite
-SQLITE_CMAKE_BOOL=	WITH_SQLITE3
+FIREBIRD_USES=		firebird
+FIREBIRD_CMAKE_BOOL=	WITH_FIREBIRD
+
+MYSQL_USES=		mysql
+MYSQL_CMAKE_BOOL=	WITH_MYSQL
 
 ODBC_LIB_DEPENDS=	libodbc.so:databases/unixODBC
 ODBC_CMAKE_BOOL=	WITH_ODBC
 ODBC_CMAKE_ON=		-DODBC_LIBRARY:FILE_PATH=${LOCALBASE}/lib/libodbc.so
 
-BOOST_LIB_DEPENDS=	libboost_date_time.so:devel/boost-libs
-BOOST_CMAKE_BOOL=	WITH_BOOST
+PGSQL_USES=		pgsql
+PGSQL_CMAKE_BOOL=	WITH_POSTGRESQL
 
-FIREBIRD_USES=	firebird
-FIREBIRD_CMAKE_BOOL=	WITH_FIREBIRD
+SQLITE_USES=		sqlite
+SQLITE_CMAKE_BOOL=	WITH_SQLITE3
 
 .include <bsd.port.mk>
diff --git a/databases/soci/distinfo b/databases/soci/distinfo
index c5634c764065..89acc0debdaf 100644
--- a/databases/soci/distinfo
+++ b/databases/soci/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1610905825
-SHA256 (SOCI-soci-4.0.1_GH0.tar.gz) = fa69347b1a1ef74450c0382b665a67bd6777cc7005bbe09726479625bcf1e29c
-SIZE (SOCI-soci-4.0.1_GH0.tar.gz) = 489841
+TIMESTAMP = 1644601909
+SHA256 (SOCI-soci-v4.0.3_GH0.tar.gz) = 4b1ff9c8545c5d802fbe06ee6cd2886630e5c03bf740e269bb625b45cf934928
+SIZE (SOCI-soci-v4.0.3_GH0.tar.gz) = 508750
diff --git a/databases/soci/files/patch-CMakeLists.txt b/databases/soci/files/patch-CMakeLists.txt
deleted file mode 100644
index 24d063d1153e..000000000000
--- a/databases/soci/files/patch-CMakeLists.txt
+++ /dev/null
@@ -1,11 +0,0 @@
---- CMakeLists.txt.orig	2020-10-19 14:59:47 UTC
-+++ CMakeLists.txt
-@@ -134,7 +134,7 @@ set_property(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
- ###############################################################################
- 
- if(NOT DEFINED SOCI_LIBDIR)
--  if(APPLE OR CMAKE_SIZEOF_VOID_P EQUAL 4)
-+  if(APPLE OR CMAKE_SIZEOF_VOID_P EQUAL 4 OR CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
-     set(SOCI_LIBDIR "lib")
-   else()
-     set(SOCI_LIBDIR "lib64")
diff --git a/databases/soci/files/patch-tests_catch.hpp b/databases/soci/files/patch-tests_catch.hpp
new file mode 100644
index 000000000000..97cd0e00127b
--- /dev/null
+++ b/databases/soci/files/patch-tests_catch.hpp
@@ -0,0 +1,11 @@
+--- tests/catch.hpp.orig	2022-02-10 19:13:13 UTC
++++ tests/catch.hpp
+@@ -7170,7 +7170,7 @@ namespace Catch {
+ namespace Catch {
+ 
+     struct RandomNumberGenerator {
+-        typedef std::ptrdiff_t result_type;
++        typedef std::size_t result_type;
+ 
+         result_type operator()( result_type n ) const { return std::rand() % n; }
+ 
diff --git a/databases/soci/pkg-descr b/databases/soci/pkg-descr
index aa190b8f4075..fa769b2eba8f 100644
--- a/databases/soci/pkg-descr
+++ b/databases/soci/pkg-descr
@@ -3,5 +3,3 @@ SQL queries in the regular C++ code, staying entirely within the Standard C++.
 The idea is to provide C++ programmers a way to access SQL databases in the most
 natural and intuitive way. If you find existing libraries too difficult for your
 needs or just distracting, SOCI can be a good alternative.
-
-WWW: http://soci.sourceforge.net/
diff --git a/databases/soci/pkg-plist b/databases/soci/pkg-plist
index eb1d3f4fb68d..f38d059e5b15 100644
--- a/databases/soci/pkg-plist
+++ b/databases/soci/pkg-plist
@@ -1,13 +1,11 @@
-cmake/SOCI-%%CMAKE_BUILD_TYPE%%.cmake
-cmake/SOCI.cmake
 include/soci/backend-loader.h
 include/soci/bind-values.h
 include/soci/blob-exchange.h
 include/soci/blob.h
-%%BOOST%%include/soci/boost-fusion.h
-%%BOOST%%include/soci/boost-gregorian-date.h
-%%BOOST%%include/soci/boost-optional.h
-%%BOOST%%include/soci/boost-tuple.h
+include/soci/boost-fusion.h
+include/soci/boost-gregorian-date.h
+include/soci/boost-optional.h
+include/soci/boost-tuple.h
 include/soci/callbacks.h
 include/soci/column-info.h
 include/soci/connection-parameters.h
@@ -54,31 +52,35 @@ include/soci/use.h
 include/soci/values-exchange.h
 include/soci/values.h
 include/soci/version.h
+lib/cmake/SOCI/SOCIConfig.cmake
+lib/cmake/SOCI/SOCIConfigVersion.cmake
+lib/cmake/SOCI/SOCITargets-%%CMAKE_BUILD_TYPE%%.cmake
+lib/cmake/SOCI/SOCITargets.cmake
 lib/libsoci_core.a
 lib/libsoci_core.so
 lib/libsoci_core.so.4.0
-lib/libsoci_core.so.4.0.1
+lib/libsoci_core.so.4.0.3
 lib/libsoci_empty.a
 lib/libsoci_empty.so
 lib/libsoci_empty.so.4.0
-lib/libsoci_empty.so.4.0.1
+lib/libsoci_empty.so.4.0.3
 %%FIREBIRD%%lib/libsoci_firebird.a
 %%FIREBIRD%%lib/libsoci_firebird.so
 %%FIREBIRD%%lib/libsoci_firebird.so.4.0
-%%FIREBIRD%%lib/libsoci_firebird.so.4.0.1
+%%FIREBIRD%%lib/libsoci_firebird.so.4.0.3
 %%MYSQL%%lib/libsoci_mysql.a
 %%MYSQL%%lib/libsoci_mysql.so
 %%MYSQL%%lib/libsoci_mysql.so.4.0
-%%MYSQL%%lib/libsoci_mysql.so.4.0.1
+%%MYSQL%%lib/libsoci_mysql.so.4.0.3
 %%ODBC%%lib/libsoci_odbc.a
 %%ODBC%%lib/libsoci_odbc.so
 %%ODBC%%lib/libsoci_odbc.so.4.0
-%%ODBC%%lib/libsoci_odbc.so.4.0.1
+%%ODBC%%lib/libsoci_odbc.so.4.0.3
 %%PGSQL%%lib/libsoci_postgresql.a
 %%PGSQL%%lib/libsoci_postgresql.so
 %%PGSQL%%lib/libsoci_postgresql.so.4.0
-%%PGSQL%%lib/libsoci_postgresql.so.4.0.1
+%%PGSQL%%lib/libsoci_postgresql.so.4.0.3
 %%SQLITE%%lib/libsoci_sqlite3.a
 %%SQLITE%%lib/libsoci_sqlite3.so
 %%SQLITE%%lib/libsoci_sqlite3.so.4.0
-%%SQLITE%%lib/libsoci_sqlite3.so.4.0.1
+%%SQLITE%%lib/libsoci_sqlite3.so.4.0.3
diff --git a/databases/spatialite-tools/Makefile b/databases/spatialite-tools/Makefile
index 0df5ebf784f5..a66d7959992a 100644
--- a/databases/spatialite-tools/Makefile
+++ b/databases/spatialite-tools/Makefile
@@ -1,10 +1,12 @@
 PORTNAME=	spatialite-tools
 PORTVERSION=	5.0.1
+PORTREVISION=	9
 CATEGORIES=	databases geography
 MASTER_SITES=	http://www.gaia-gis.it/gaia-sins/
 
 MAINTAINER=	lbartoletti@FreeBSD.org
 COMMENT=	Collection of CLI tools supporting SpatiaLite
+WWW=		http://www.gaia-gis.it/fossil/spatialite-tools/index
 
 LICENSE=	GPLv3
 
@@ -13,11 +15,10 @@ LIB_DEPENDS=	libgeos_c.so:graphics/geos \
 		libfreexl.so:textproc/freexl \
 		libexpat.so:textproc/expat2 \
 		libspatialite.so:databases/spatialite \
-		libreadosm.so:astro/readosm \
-		libminizip.so:archivers/minizip
+		libreadosm.so:astro/readosm
 
 GNU_CONFIGURE=	yes
-USES=		gmake gnome pkgconfig iconv sqlite
+USES=		gmake gnome iconv minizip pkgconfig sqlite
 USE_GNOME=	libxml2
 
 CFLAGS+=	-I${LOCALBASE}/include
diff --git a/databases/spatialite-tools/pkg-descr b/databases/spatialite-tools/pkg-descr
index 62fd8d952837..d36cb04af106 100644
--- a/databases/spatialite-tools/pkg-descr
+++ b/databases/spatialite-tools/pkg-descr
@@ -18,5 +18,3 @@ spatialite-tools is a collection of open source Command Line Interface (CLI)
 * XML-tools: spatialite_xml_load, spatialite_xml_collapse,
  spatialite_xml_print, spatialite_xml_validator: tools supporting XML files
  processing
-
-WWW: http://www.gaia-gis.it/fossil/spatialite-tools/index
diff --git a/databases/spatialite/Makefile b/databases/spatialite/Makefile
index 2d7f56f80f20..a7165d51fc51 100644
--- a/databases/spatialite/Makefile
+++ b/databases/spatialite/Makefile
@@ -1,13 +1,13 @@
-# Created by: Wen Heping <wenheping@gmail.com>
-
 PORTNAME=	spatialite
-PORTVERSION=	5.0.1
+PORTVERSION=	5.1.0
+PORTREVISION=	1
 CATEGORIES=	databases geography
 MASTER_SITES=	http://www.gaia-gis.it/gaia-sins/libspatialite-sources/
 DISTNAME=	lib${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	lbartoletti@FreeBSD.org
 COMMENT=	Spatial Extensions for SQLite
+WWW=		https://www.gaia-gis.it/gaia-sins/
 
 LICENSE=	GPLv2 # Only GPLv2 since we enable rttopo and gcp
 LICENSE_FILE=	${WRKSRC}/COPYING
@@ -15,11 +15,10 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 LIB_DEPENDS=	libgeos_c.so:graphics/geos \
 		libproj.so:graphics/proj \
 		libfreexl.so:textproc/freexl \
-		libminizip.so:archivers/minizip \
 		librttopo.so:devel/librttopo
 
 GNU_CONFIGURE=	yes
-USES=		gmake gnome iconv libtool pathfix pkgconfig sqlite
+USES=		gmake gnome iconv libtool pathfix minizip pkgconfig sqlite
 USE_GNOME=	libxml2
 
 CFLAGS+=	-I${WRKSRC}/src/headers -I${LOCALBASE}/include
@@ -30,9 +29,7 @@ CONFIGURE_ARGS+=	--enable-gcp=yes --enable-libxml2=yes --enable-rttopo=yes \
 USE_LDCONFIG=	yes
 INSTALL_TARGET=install-strip
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|-ldl| |' ${WRKSRC}/src/Makefile.am
-	@${REINPLACE_CMD} -e 's|-ldl| |' ${WRKSRC}/src/Makefile.in
-	@${REINPLACE_CMD} -e 's|-ldl| |' ${WRKSRC}/configure
+#post-patch:
+#	@${REINPLACE_CMD} -e 's|-ldl| |' ${WRKSRC}/configure
 
 .include <bsd.port.mk>
diff --git a/databases/spatialite/distinfo b/databases/spatialite/distinfo
index e5a231a4ccb1..7c36e95813c8 100644
--- a/databases/spatialite/distinfo
+++ b/databases/spatialite/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1618814239
-SHA256 (libspatialite-5.0.1.tar.gz) = eecbc94311c78012d059ebc0fae86ea5ef6eecb13303e6e82b3753c1b3409e98
-SIZE (libspatialite-5.0.1.tar.gz) = 6372753
+TIMESTAMP = 1700734773
+SHA256 (libspatialite-5.1.0.tar.gz) = 43be2dd349daffe016dd1400c5d11285828c22fea35ca5109f21f3ed50605080
+SIZE (libspatialite-5.1.0.tar.gz) = 6517377
diff --git a/databases/spatialite/files/patch-src_Makefile.in b/databases/spatialite/files/patch-src_Makefile.in
deleted file mode 100644
index bd505ce0ff08..000000000000
--- a/databases/spatialite/files/patch-src_Makefile.in
+++ /dev/null
@@ -1,13 +0,0 @@
---- src/Makefile.in.orig	2020-10-23 14:15:44 UTC
-+++ src/Makefile.in
-@@ -467,8 +467,8 @@ mod_spatialite_la_LIBADD = ./gaiaaux/gaiaaux.la ./gaia
- mod_spatialite_la_CPPFLAGS = @CFLAGS@ @CPPFLAGS@ \
- 	-I$(top_srcdir)/src/headers -I. -DLOADABLE_EXTENSION
- mod_spatialite_la_LIBTOOLFLAGS = --tag=disable-static
--@ANDROID_FALSE@@MINGW_FALSE@mod_spatialite_la_LDFLAGS = -module -version-info 8:0:1
--@ANDROID_TRUE@@MINGW_FALSE@mod_spatialite_la_LDFLAGS = -module -version-info 8:0:1
-+@ANDROID_FALSE@@MINGW_FALSE@mod_spatialite_la_LDFLAGS = -module -version-info 8:1:1
-+@ANDROID_TRUE@@MINGW_FALSE@mod_spatialite_la_LDFLAGS = -module -version-info 8:1:1
- @MINGW_TRUE@mod_spatialite_la_LDFLAGS = -module -avoid-version -no-undefined
- MOSTLYCLEANFILES = *.gcna *.gcno *.gcda
- all: all-recursive
diff --git a/databases/spatialite/pkg-descr b/databases/spatialite/pkg-descr
index ef004e0b09a1..5350c205491a 100644
--- a/databases/spatialite/pkg-descr
+++ b/databases/spatialite/pkg-descr
@@ -4,5 +4,3 @@ load, store and manipulate Spatial Data (aka GeographicData, GIS Data,
 Cartographic Data, GeoSpatial Data, Geometry Data and alike). SpatiaLite
 implements spatial extensions following the specification of the Open
 Geospatial Consortium (OGC).
-
-WWW: http://www.gaia-gis.it/gaia-sins/
diff --git a/databases/spatialite/pkg-plist b/databases/spatialite/pkg-plist
index 67c18aa84c5f..b0dd22465907 100644
--- a/databases/spatialite/pkg-plist
+++ b/databases/spatialite/pkg-plist
@@ -29,9 +29,9 @@ include/spatialite/sqlite.h
 include/spatialite/stored_procedures.h
 lib/libspatialite.a
 lib/libspatialite.so
-lib/libspatialite.so.7
-lib/libspatialite.so.7.1.2
+lib/libspatialite.so.8
+lib/libspatialite.so.8.1.0
 lib/mod_spatialite.so
-lib/mod_spatialite.so.7
-lib/mod_spatialite.so.7.1.1
+lib/mod_spatialite.so.8
+lib/mod_spatialite.so.8.1.0
 libdata/pkgconfig/spatialite.pc
diff --git a/databases/spatialite_gui/Makefile b/databases/spatialite_gui/Makefile
index a256db7236d6..8eca7f010315 100644
--- a/databases/spatialite_gui/Makefile
+++ b/databases/spatialite_gui/Makefile
@@ -1,32 +1,37 @@
-# Created by: lbartoletti <lbartoletti@FreeBSD.org>
-
 PORTNAME=	spatialite_gui
-PORTVERSION=	1.7.1
-PORTREVISION=	9
+DISTVERSION=	2.1.0
+PORTREVISION=	12
+DISTVERSIONSUFFIX=	-beta1
 CATEGORIES=	databases geography
-MASTER_SITES=	http://www.gaia-gis.it/gaia-sins/
+MASTER_SITES=	http://www.gaia-gis.it/gaia-sins/spatialite-gui-sources/
 
 MAINTAINER=	lbartoletti@FreeBSD.org
 COMMENT=	Graphical User Interface (GUI) tool supporting SpatiaLite
+WWW=		https://www.gaia-gis.it/fossil/spatialite_gui/index
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libgaiagraphics.so:graphics/libgaiagraphics \
+LIB_DEPENDS=	librasterlite2.so:graphics/librasterlite2 \
 		libfreexl.so:textproc/freexl \
-		libspatialite.so:databases/spatialite
+		libspatialite.so:databases/spatialite \
+		libxlsxwriter.so:math/libxlsxwriter \
+		libvirtualpg.so:databases/virtualpg \
+		librttopo.so:devel/librttopo \
+		libcurl.so:ftp/curl \
+		libminizip.so:archivers/minizip \
+		libproj.so:graphics/proj \
+		libgeos_c.so:graphics/geos
 
 USES=		compiler:c++11-lang gmake gnome iconv localbase:ldflags \
-		pkgconfig
-USE_WX=		2.8
+		pgsql pkgconfig sqlite
+USE_WX=		3.0
 GNU_CONFIGURE=	yes
 USE_GNOME=	libxml2
 
-CPPFLAGS+=	`${WX_CONFIG} --cppflags` "-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H=1"
+CPPFLAGS+=	`${WX_CONFIG} --cppflags`
 LDFLAGS+=	${ICONV_LIB} `${WX_CONFIG} --libs` -lsqlite3
-CONFIGURE_ARGS=	CFLAGS="${CFLAGS} ${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
-USE_LDCONFIG=	yes
-
-PLIST_FILES=	bin/spatialite_gui
+CONFIGURE_ARGS=	CFLAGS="${CFLAGS} ${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \
+		--with-wxconfig=${WX_CONFIG}
 
 .include <bsd.port.mk>
diff --git a/databases/spatialite_gui/distinfo b/databases/spatialite_gui/distinfo
index 0bea43d4b9b6..a218a27327b9 100644
--- a/databases/spatialite_gui/distinfo
+++ b/databases/spatialite_gui/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1561512545
-SHA256 (spatialite_gui-1.7.1.tar.gz) = cb9cb1ede7f83a5fc5f52c83437e556ab9cb54d6ace3c545d31b317fd36f05e4
-SIZE (spatialite_gui-1.7.1.tar.gz) = 1090178
+TIMESTAMP = 1643314509
+SHA256 (spatialite_gui-2.1.0-beta1.tar.gz) = ba48d96df18cebc3ff23f69797207ae1582cce62f4596b69bae300ca3c23db33
+SIZE (spatialite_gui-2.1.0-beta1.tar.gz) = 2023014
diff --git a/databases/spatialite_gui/pkg-descr b/databases/spatialite_gui/pkg-descr
index fae547d6f4fb..a0f590c38b67 100644
--- a/databases/spatialite_gui/pkg-descr
+++ b/databases/spatialite_gui/pkg-descr
@@ -1,4 +1,2 @@
 spatialite-gui is an open source Graphical User Interface (GUI)
 tool supporting SpatiaLite.
-
-WWW: https://www.gaia-gis.it/fossil/spatialite_gui/index
diff --git a/databases/spatialite_gui/pkg-plist b/databases/spatialite_gui/pkg-plist
new file mode 100644
index 000000000000..4a9deb6c406c
--- /dev/null
+++ b/databases/spatialite_gui/pkg-plist
@@ -0,0 +1,19 @@
+bin/spatialite_gui
+share/applications/spatialite-gui.desktop
+share/icons/hicolor/128x128/apps/spatialite-gui.png
+share/icons/hicolor/16x16/apps/spatialite-gui.png
+share/icons/hicolor/192x192/apps/spatialite-gui.png
+share/icons/hicolor/22x22/apps/spatialite-gui.png
+share/icons/hicolor/24x24/apps/spatialite-gui.png
+share/icons/hicolor/256x256/apps/spatialite-gui.png
+share/icons/hicolor/32x32/apps/spatialite-gui.png
+share/icons/hicolor/36x36/apps/spatialite-gui.png
+share/icons/hicolor/40x40/apps/spatialite-gui.png
+share/icons/hicolor/42x42/apps/spatialite-gui.png
+share/icons/hicolor/48x48/apps/spatialite-gui.png
+share/icons/hicolor/512x512/apps/spatialite-gui.png
+share/icons/hicolor/64x64/apps/spatialite-gui.png
+share/icons/hicolor/72x72/apps/spatialite-gui.png
+share/icons/hicolor/80x80/apps/spatialite-gui.png
+share/icons/hicolor/8x8/apps/spatialite-gui.png
+share/icons/hicolor/96x96/apps/spatialite-gui.png
diff --git a/databases/speedtables/Makefile b/databases/speedtables/Makefile
index 964cce9448fa..1518a02f65bb 100644
--- a/databases/speedtables/Makefile
+++ b/databases/speedtables/Makefile
@@ -1,13 +1,12 @@
-# Created by: gahr
-
 PORTNAME=	speedtables
-PORTVERSION=	1.13.12
+PORTVERSION=	1.13.18
 DISTVERSIONPREFIX=	v
-PORTREVISION=	0
+PORTREVISION=	2
 CATEGORIES=	databases
 
 MAINTAINER=	gahr@FreeBSD.org
 COMMENT=	High-performance memory-resident database
+WWW=		https://flightaware.github.io/speedtables/
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
diff --git a/databases/speedtables/distinfo b/databases/speedtables/distinfo
index aae65f1cd871..1ad6932a8ff0 100644
--- a/databases/speedtables/distinfo
+++ b/databases/speedtables/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1624867979
-SHA256 (flightaware-speedtables-v1.13.12_GH0.tar.gz) = 1a6a5eeddf2ed5abdd3baf6f68f8b53676211faa93202a41274d3a8147539618
-SIZE (flightaware-speedtables-v1.13.12_GH0.tar.gz) = 739207
+TIMESTAMP = 1646318189
+SHA256 (flightaware-speedtables-v1.13.18_GH0.tar.gz) = 88a8cfb41145d25d76f561ddad6dbb5855b0ec44ee35966ba3cdbe0babe74a0a
+SIZE (flightaware-speedtables-v1.13.18_GH0.tar.gz) = 739381
diff --git a/databases/speedtables/pkg-descr b/databases/speedtables/pkg-descr
index 19c57f051af7..9d9aeed14f90 100644
--- a/databases/speedtables/pkg-descr
+++ b/databases/speedtables/pkg-descr
@@ -6,5 +6,3 @@ corresponding structures, generating a custom C language Tcl extension to
 create, access and manipulate those tables and building a native code package
 in a shared library that is loadable on demand via Tcl's "package require"
 mechanism.
-
-WWW: http://flightaware.github.io/speedtables/
diff --git a/databases/sql-workbench/Makefile b/databases/sql-workbench/Makefile
index 2f19348cc909..ef0fcd827245 100644
--- a/databases/sql-workbench/Makefile
+++ b/databases/sql-workbench/Makefile
@@ -1,7 +1,5 @@
-# Created by: Aldis Berjoza <graudeejs@gmail.com>
-
 PORTNAME=	sql-workbench
-PORTVERSION=	127
+PORTVERSION=	138
 PORTEPOCH=	1
 CATEGORIES=	databases java
 MASTER_SITES=	http://www.sql-workbench.net/ \
@@ -10,18 +8,19 @@ DISTNAME=	Workbench-Build${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	DBMS-independent, cross-platform SQL query tool
+WWW=		https://www.sql-workbench.eu/
 
 LICENSE=	APACHE20
 
 USES=		zip
 USE_JAVA=	yes
-JAVA_VERSION=	1.8+
+JAVA_VERSION=	11+
 
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
 
 OPTIONS_DEFINE=	DOCS MYSQL_JDBC PGSQL_JDBC
-MYSQL_JDBC_RUN_DEPENDS=	${JAVALIBDIR}/mysql-connector-java.jar:databases/mysql-connector-java
+MYSQL_JDBC_RUN_DEPENDS=	${JAVALIBDIR}/mysql-connector-j.jar:databases/mysql-connector-j
 PGSQL_JDBC_RUN_DEPENDS=	${JAVALIBDIR}/postgresql.jar:databases/postgresql-jdbc
 
 pre-install:
diff --git a/databases/sql-workbench/distinfo b/databases/sql-workbench/distinfo
index 9ec3c42b8a95..65e467767a3f 100644
--- a/databases/sql-workbench/distinfo
+++ b/databases/sql-workbench/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1613164253
-SHA256 (Workbench-Build127.zip) = da017f92bb344b846027d52223be6d88ffd283368495a0b26b6e1334a42ac955
-SIZE (Workbench-Build127.zip) = 8275806
+TIMESTAMP = 1701157804
+SHA256 (Workbench-Build138.zip) = 2ac589b9f57e6d8fdcfca55e3e734e236f9b75d410aa76d0dd528ee079db59c7
+SIZE (Workbench-Build138.zip) = 9563223
diff --git a/databases/sql-workbench/pkg-descr b/databases/sql-workbench/pkg-descr
index 294bfce7c583..b60d5bfcf24d 100644
--- a/databases/sql-workbench/pkg-descr
+++ b/databases/sql-workbench/pkg-descr
@@ -5,5 +5,3 @@ system that provides a Java Runtime Environment.
 Its main focus is on running SQL scripts (either interactively or
 as a batch) and export/import features. Graphical query building
 or more advanced DBA tasks are not the focus and are not planned.
-
-WWW: https://www.sql-workbench.eu/
diff --git a/databases/sqlcached/Makefile b/databases/sqlcached/Makefile
index 90d0bbe676bc..d06dfac35662 100644
--- a/databases/sqlcached/Makefile
+++ b/databases/sqlcached/Makefile
@@ -1,13 +1,12 @@
-# Created by: ivoras
-
 PORTNAME=	sqlcached
 PORTVERSION=	r6
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	databases net
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	ivoras@FreeBSD.org
 COMMENT=	Cache daemon using SQL for data manipulation
+WWW=		https://sqlcached.sourceforge.net/
 
 USES=		localbase:ldflags ncurses readline sqlite tar:tgz
 
@@ -16,7 +15,7 @@ WRKSRC=		${WRKDIR}/${PORTNAME}
 PORTDOCS=	${PORTNAME}.html ${PORTNAME}.txt
 
 PLIST_FILES=	bin/${PORTNAME} etc/rc.d/${PORTNAME} \
-		man/man1/${PORTNAME}.1.gz
+		share/man/man1/${PORTNAME}.1.gz
 
 OPTIONS_DEFINE=	DOCS
 
@@ -26,7 +25,7 @@ post-patch:
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/doc/${PORTNAME}.1 ${STAGEDIR}${MANPREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/doc/${PORTNAME}.1 ${STAGEDIR}${PREFIX}/share/man/man1
 	${INSTALL_SCRIPT} ${WRKSRC}/FreeBSD/${PORTNAME} ${STAGEDIR}${PREFIX}/etc/rc.d
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/doc/|} ${STAGEDIR}${DOCSDIR}
diff --git a/databases/sqlcached/pkg-descr b/databases/sqlcached/pkg-descr
index cf775f2c4864..ceb3cf0b0adc 100644
--- a/databases/sqlcached/pkg-descr
+++ b/databases/sqlcached/pkg-descr
@@ -1,5 +1,3 @@
 SQLCacheD is a memory-based SQL database intended for use as a memory cache
 engine. In purpose, it.s similar to (and inspired by) memcached but allows
 fine-grained data manipulation using SQL.
-
-WWW: http://sqlcached.sourceforge.net/
diff --git a/databases/sqlcipher/Makefile b/databases/sqlcipher/Makefile
index 28535bede5f5..9d7267da906b 100644
--- a/databases/sqlcipher/Makefile
+++ b/databases/sqlcipher/Makefile
@@ -1,15 +1,17 @@
 PORTNAME=	sqlcipher
 DISTVERSIONPREFIX=	v
-DISTVERSION=	3.4.2
+DISTVERSION=	4.5.6
 CATEGORIES=	databases
 
 MAINTAINER=	jharris@widomaker.com
 COMMENT=	Encrypted SQLite database
+WWW=		https://www.zetetic.net/sqlcipher/
 
 LICENSE=	BSD3CLAUSE
-LICENSE_FILE=	${WRKSRC}/LICENSE
+LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
-USES=		libedit libtool pathfix ssl tcl:86,build
+USES=		cpe libedit libtool pathfix ssl tcl:86,build
+CPE_VENDOR=	zetetic
 USE_LDCONFIG=	yes
 USE_GITHUB=	yes
 
diff --git a/databases/sqlcipher/distinfo b/databases/sqlcipher/distinfo
index 4f1ace00d3f2..f68afc1ded0f 100644
--- a/databases/sqlcipher/distinfo
+++ b/databases/sqlcipher/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1518208810
-SHA256 (sqlcipher-sqlcipher-v3.4.2_GH0.tar.gz) = 69897a5167f34e8a84c7069f1b283aba88cdfa8ec183165c4a5da2c816cfaadb
-SIZE (sqlcipher-sqlcipher-v3.4.2_GH0.tar.gz) = 14743960
+TIMESTAMP = 1707945924
+SHA256 (sqlcipher-sqlcipher-v4.5.6_GH0.tar.gz) = e4a527e38e67090c1d2dc41df28270d16c15f7ca5210a3e7ec4c4b8fda36e28f
+SIZE (sqlcipher-sqlcipher-v4.5.6_GH0.tar.gz) = 18937692
diff --git a/databases/sqlcipher/files/patch-sqlcipher-libressl-2.7 b/databases/sqlcipher/files/patch-sqlcipher-libressl-2.7
deleted file mode 100644
index bda45d959ea3..000000000000
--- a/databases/sqlcipher/files/patch-sqlcipher-libressl-2.7
+++ /dev/null
@@ -1,31 +0,0 @@
-diff --git a/src/crypto_openssl.c b/src/crypto_openssl.c
-index a45db3b..4344076 100644
---- src/crypto_openssl.c.orig
-+++ src/crypto_openssl.c
-@@ -47,7 +47,7 @@ static unsigned int openssl_external_init = 0;
- static unsigned int openssl_init_count = 0;
- static sqlite3_mutex* openssl_rand_mutex = NULL;
- 
--#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000) 
- static HMAC_CTX *HMAC_CTX_new(void)
- {
-   HMAC_CTX *ctx = OPENSSL_malloc(sizeof(*ctx));
-@@ -117,7 +117,7 @@ static int sqlcipher_openssl_activate(void *ctx) {
- 
-   if(openssl_init_count == 0 && openssl_external_init == 0)  {
-     /* if the library was not externally initialized, then should be now */
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000)
-     OpenSSL_add_all_algorithms();
- #endif
-   } 
-@@ -154,7 +154,7 @@ static int sqlcipher_openssl_deactivate(void *ctx) {
-        Note: this code will only be reached if OpensSSL_add_all_algorithms()
-        is called by SQLCipher internally. This should prevent SQLCipher from 
-        "cleaning up" openssl when it was initialized externally by the program */
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000)
-       EVP_cleanup();
- #endif
-     } else {
diff --git a/databases/sqlcipher/pkg-descr b/databases/sqlcipher/pkg-descr
index 668d4a7c8fc9..a122136794fb 100644
--- a/databases/sqlcipher/pkg-descr
+++ b/databases/sqlcipher/pkg-descr
@@ -1,3 +1 @@
 Allows the creation of encrypted SQLite databases
-
-WWW: http://www.sqlcipher.net
diff --git a/databases/sqldeveloper/Makefile b/databases/sqldeveloper/Makefile
index 6fd1c38e7538..2ed97edb0885 100644
--- a/databases/sqldeveloper/Makefile
+++ b/databases/sqldeveloper/Makefile
@@ -1,26 +1,29 @@
 PORTNAME=	sqldeveloper
-DISTVERSION=	21.2.1.204.1703
+DISTVERSION=	23.1.1.345.2114
 DISTVERSIONSUFFIX=	-no-jre
+PORTREVISION=	2
 CATEGORIES=	databases java
 # https://www.oracle.com/tools/downloads/sqldev-downloads.html
 MASTER_SITES=
 DIST_SUBDIR=	oracle
 
-MAINTAINER=	vvd@unislabs.com
+MAINTAINER=	vvd@FreeBSD.org
 COMMENT=	Graphical tool for database development
+WWW=		https://www.oracle.com/database/technologies/appdev/sqldeveloper-landing.html
 
 # https://www.oracle.com/downloads/licenses/sqldev-license.html
 LICENSE_NAME=	OTN
 LICENSE_PERMS=	no-dist-mirror no-dist-sell no-pkg-mirror
 
-RUN_DEPENDS=	bash:shells/bash
+RUN_DEPENDS=	openjfx14>=0:java/openjfx14 \
+		bash:shells/bash
 
 USES=		gnome zip
-INSTALLS_ICONS=	yes
 USE_JAVA=	yes
 JAVA_VERSION=	11+
 
 DATADIR=	${JAVASHAREDIR}/${PORTNAME}
+NO_ARCH=	yes
 NO_BUILD=	yes
 SUB_FILES=	${PORTNAME}.desktop ${PORTNAME}.sh
 SUB_LIST=	JAVA_HOME=${JAVA_HOME} \
@@ -28,18 +31,7 @@ SUB_LIST=	JAVA_HOME=${JAVA_HOME} \
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
-OPTIONS_DEFINE=		OPENJFX14
-OPTIONS_DEFAULT=	OPENJFX14
-OPENJFX14_DESC=		Use JavaFX 14 (can work without it with some limitations)
-OPENJFX14_RUN_DEPENDS=	openjfx14>=0:java/openjfx14
-
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MOPENJFX14}
-OPENJFX14_JVM_OPTIONS=	-J--module-path=${LOCALBASE}/openjfx14/lib \
-			-J--add-modules=javafx.swing,javafx.web
-.endif
-SUB_LIST+=		OPENJFX14_JVM_OPTIONS="${OPENJFX14_JVM_OPTIONS}"
+SUB_LIST+=	OPENJFX14_JVM_OPTIONS="-J--module-path=${LOCALBASE}/openjfx14/lib -J--add-modules=javafx.swing,javafx.web"
 
 .include <bsd.port.pre.mk>
 
@@ -62,7 +54,7 @@ do-install:
 
 .for d in configuration dataminer dropins equinox \
     external ide javavm jdbc jdev jlib jviews modules \
-    netbeans orakafka rdbms sleepycat sqldeveloper sqlj svnkit
+    netbeans rdbms sleepycat sqldeveloper sqlj svnkit
 	${ECHO_MSG} -n ">> Installing data directory '${d}'..."
 	cd ${WRKSRC} && ${FIND} ${d} -type d \
 		-exec ${MKDIR} ${STAGEDIR}/${DATADIR}/\{} \;
@@ -75,6 +67,9 @@ do-install:
 	${ECHO_MSG} " [ DONE ]"
 .endfor
 
+	${RM} -r ${STAGEDIR}/${DATADIR}/modules/javafx
+	${RM} -r ${STAGEDIR}/${DATADIR}/netbeans/platform/modules/lib
+
 	@${ECHO_MSG} ">> Installing icon and desktop file ..."
 	@${MKDIR} ${STAGEDIR}/${PREFIX}/share/applications/ \
 	    ${STAGEDIR}/${PREFIX}/share/icons/hicolor/32x32/apps/
diff --git a/databases/sqldeveloper/distinfo b/databases/sqldeveloper/distinfo
index b6a1fca67c5b..196518c776d6 100644
--- a/databases/sqldeveloper/distinfo
+++ b/databases/sqldeveloper/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1630799719
-SHA256 (oracle/sqldeveloper-21.2.1.204.1703-no-jre.zip) = 928692bc6f481f51053fac4458e805d2389a5b3b21c761c59c7f773d3b526995
-SIZE (oracle/sqldeveloper-21.2.1.204.1703-no-jre.zip) = 458220863
+TIMESTAMP = 1704753733
+SHA256 (oracle/sqldeveloper-23.1.1.345.2114-no-jre.zip) = ae84622086392ab29d235aa5c9cadfef976f5b1453a0c301a007f74c005d92e5
+SIZE (oracle/sqldeveloper-23.1.1.345.2114-no-jre.zip) = 509665648
diff --git a/databases/sqldeveloper/pkg-descr b/databases/sqldeveloper/pkg-descr
index 0c74138b643b..91fa8a3a326e 100644
--- a/databases/sqldeveloper/pkg-descr
+++ b/databases/sqldeveloper/pkg-descr
@@ -6,5 +6,3 @@ productivity and simplifies your database development tasks.
 
 SQL Developer can connect to any Oracle Database version >= 9.2.0.1 and MySQL
 database version >= 3.0.
-
-WWW: https://www.oracle.com/database/technologies/appdev/sqldeveloper-landing.html
diff --git a/databases/sqldeveloper/pkg-plist b/databases/sqldeveloper/pkg-plist
index 2268513f9f4c..8f86eb975e63 100644
--- a/databases/sqldeveloper/pkg-plist
+++ b/databases/sqldeveloper/pkg-plist
@@ -1,4 +1,4 @@
-@(,,750) bin/sqldeveloper
+bin/sqldeveloper
 share/applications/sqldeveloper.desktop
 share/icons/hicolor/32x32/apps/sqldeveloper.png
 %%DATADIR%%/configuration/bundles.info
@@ -156,6 +156,7 @@ share/icons/hicolor/32x32/apps/sqldeveloper.png
 %%DATADIR%%/dataminer/scripts/upgradeRepo12_2_0_0_3To12_2_0_0_4.sql
 %%DATADIR%%/dataminer/scripts/upgradeRepo12_2_0_0_4To12_2_0_0_5.sql
 %%DATADIR%%/dataminer/scripts/upgradeRepo12_2_0_0_5To12_2_0_0_6.sql
+%%DATADIR%%/dataminer/scripts/upgradeRepo12_2_0_0_6To12_2_0_0_7.sql
 %%DATADIR%%/dataminer/scripts/upgradeRepoFromORToBinary.sql
 %%DATADIR%%/dataminer/scripts/upgradeRepoWithNewTableSpace.sql
 %%DATADIR%%/dataminer/scripts/upgradeRepository.sql
@@ -173,6 +174,7 @@ share/icons/hicolor/32x32/apps/sqldeveloper.png
 %%DATADIR%%/external/oracle.adf-share-base.jar
 %%DATADIR%%/external/oracle.db-ca.jar
 %%DATADIR%%/external/oracle.dbtools.data.jar
+%%DATADIR%%/external/oracle.dbtools.datapump.jar
 %%DATADIR%%/external/oracle.dbtools.http.jar
 %%DATADIR%%/external/oracle.dbtools.net.jar
 %%DATADIR%%/external/oracle.dvt-jclient-gui.jar
@@ -183,7 +185,6 @@ share/icons/hicolor/32x32/apps/sqldeveloper.png
 %%DATADIR%%/external/oracle.external.apache.commons-codec.jar
 %%DATADIR%%/external/oracle.external.apache.commons-collections4.jar
 %%DATADIR%%/external/oracle.external.apache.commons-compress.jar
-%%DATADIR%%/external/oracle.external.apache.commons-logging.jar
 %%DATADIR%%/external/oracle.external.apache.commons-math3.jar
 %%DATADIR%%/external/oracle.external.apache.xmlbeans.jar
 %%DATADIR%%/external/oracle.external.apache_httpclient.jar
@@ -197,6 +198,7 @@ share/icons/hicolor/32x32/apps/sqldeveloper.png
 %%DATADIR%%/external/oracle.external.cloudstorage.jar
 %%DATADIR%%/external/oracle.external.commons-codec.jar
 %%DATADIR%%/external/oracle.external.commons-httpclient.jar
+%%DATADIR%%/external/oracle.external.commons-io.jar
 %%DATADIR%%/external/oracle.external.curvesapi.jar
 %%DATADIR%%/external/oracle.external.el-for-uix2.jar
 %%DATADIR%%/external/oracle.external.el.jar
@@ -233,7 +235,7 @@ share/icons/hicolor/32x32/apps/sqldeveloper.png
 %%DATADIR%%/external/oracle.external.qb.jar
 %%DATADIR%%/external/oracle.external.rsyntaxtextarea.jar
 %%DATADIR%%/external/oracle.external.servlet-runtime.jar
-%%DATADIR%%/external/oracle.external.slf4j-api.jar
+%%DATADIR%%/external/oracle.external.slf4j.jar
 %%DATADIR%%/external/oracle.external.spatial.jar
 %%DATADIR%%/external/oracle.external.sqldev.mina-sshd.jar
 %%DATADIR%%/external/oracle.external.sqlj-rt.jar
@@ -346,12 +348,11 @@ share/icons/hicolor/32x32/apps/sqldeveloper.png
 %%DATADIR%%/ide/macros/external-xdb.properties
 %%DATADIR%%/ide/macros/external-xmlparser.properties
 %%DATADIR%%/ide/macros/ide-boot.properties
-%%DATADIR%%/ide/src/javax-ide-src.zip
 %%DATADIR%%/ide/themes/creating_themes.html
 %%DATADIR%%/ide/themes/fusionblue.jar
 %%DATADIR%%/ide/themes/sizingmargins.png
 %%DATADIR%%/javavm/lib/aurora.jar
-%%DATADIR%%/jdbc/lib/ojdbc8.jar
+%%DATADIR%%/jdbc/lib/ojdbc11.jar
 %%DATADIR%%/jdev/bin/ojwebupdate
 %%DATADIR%%/jdev/bin/ojwebupdate-logging.conf
 %%DATADIR%%/jdev/bin/ojwebupdate.boot
@@ -413,112 +414,17 @@ share/icons/hicolor/32x32/apps/sqldeveloper.png
 %%DATADIR%%/jviews/icu4j-55_1.jar
 %%DATADIR%%/jviews/jviews-diagrammer.jar
 %%DATADIR%%/jviews/jviews-framework-lib.jar
-%%DATADIR%%/modules/el-api-2.2.1-b04.jar
-%%DATADIR%%/modules/javax.el-2.2.5.jar
-%%DATADIR%%/modules/com.fasterxml.woodstox/woodstox-core.jar
 %%DATADIR%%/modules/com.sun.xml.bind.jaxb-core.jar
 %%DATADIR%%/modules/com.sun.xml.bind.jaxb-impl.jar
 %%DATADIR%%/modules/com.sun.xml.bind.jaxb-jxc.jar
 %%DATADIR%%/modules/com.sun.xml.bind.jaxb-xjc.jar
+%%DATADIR%%/modules/el-api-2.2.1-b04.jar
 %%DATADIR%%/modules/j2ee/istack-commons-runtime.jar
 %%DATADIR%%/modules/j2ee/javax.activation-api.jar
 %%DATADIR%%/modules/j2ee/jaxb-api.jar
 %%DATADIR%%/modules/j2ee/jaxb-runtime.jar
 %%DATADIR%%/modules/j2ee/jaxws-api.jar
-%%DATADIR%%/modules/javafx/linux-x64/legal/javafx.base/COPYRIGHT
-%%DATADIR%%/modules/javafx/linux-x64/legal/javafx.controls/COPYRIGHT
-%%DATADIR%%/modules/javafx/linux-x64/legal/javafx.fxml/COPYRIGHT
-%%DATADIR%%/modules/javafx/linux-x64/legal/javafx.graphics/COPYRIGHT
-%%DATADIR%%/modules/javafx/linux-x64/legal/javafx.graphics/jpeg_fx.md
-%%DATADIR%%/modules/javafx/linux-x64/legal/javafx.graphics/mesa3d.md
-%%DATADIR%%/modules/javafx/linux-x64/legal/javafx.media/COPYRIGHT
-%%DATADIR%%/modules/javafx/linux-x64/legal/javafx.media/directshow.md
-%%DATADIR%%/modules/javafx/linux-x64/legal/javafx.media/glib.md
-%%DATADIR%%/modules/javafx/linux-x64/legal/javafx.media/gstreamer.md
-%%DATADIR%%/modules/javafx/linux-x64/legal/javafx.media/libffi.md
-%%DATADIR%%/modules/javafx/linux-x64/legal/javafx.swing/COPYRIGHT
-%%DATADIR%%/modules/javafx/linux-x64/legal/javafx.web/COPYRIGHT
-%%DATADIR%%/modules/javafx/linux-x64/legal/javafx.web/icu_web.md
-%%DATADIR%%/modules/javafx/linux-x64/legal/javafx.web/libxml2.md
-%%DATADIR%%/modules/javafx/linux-x64/legal/javafx.web/libxslt.md
-%%DATADIR%%/modules/javafx/linux-x64/legal/javafx.web/webkit.md
-%%DATADIR%%/modules/javafx/linux-x64/lib/javafx-swt.jar
-%%DATADIR%%/modules/javafx/linux-x64/lib/javafx.base.jar
-%%DATADIR%%/modules/javafx/linux-x64/lib/javafx.controls.jar
-%%DATADIR%%/modules/javafx/linux-x64/lib/javafx.fxml.jar
-%%DATADIR%%/modules/javafx/linux-x64/lib/javafx.graphics.jar
-%%DATADIR%%/modules/javafx/linux-x64/lib/javafx.media.jar
-%%DATADIR%%/modules/javafx/linux-x64/lib/javafx.properties
-%%DATADIR%%/modules/javafx/linux-x64/lib/javafx.swing.jar
-%%DATADIR%%/modules/javafx/linux-x64/lib/javafx.web.jar
-%%DATADIR%%/modules/javafx/linux-x64/lib/src.zip
-%%DATADIR%%/modules/javafx/osx-x64/legal/javafx.base/COPYRIGHT
-%%DATADIR%%/modules/javafx/osx-x64/legal/javafx.controls/COPYRIGHT
-%%DATADIR%%/modules/javafx/osx-x64/legal/javafx.fxml/COPYRIGHT
-%%DATADIR%%/modules/javafx/osx-x64/legal/javafx.graphics/COPYRIGHT
-%%DATADIR%%/modules/javafx/osx-x64/legal/javafx.graphics/jpeg_fx.md
-%%DATADIR%%/modules/javafx/osx-x64/legal/javafx.graphics/mesa3d.md
-%%DATADIR%%/modules/javafx/osx-x64/legal/javafx.media/COPYRIGHT
-%%DATADIR%%/modules/javafx/osx-x64/legal/javafx.media/directshow.md
-%%DATADIR%%/modules/javafx/osx-x64/legal/javafx.media/glib.md
-%%DATADIR%%/modules/javafx/osx-x64/legal/javafx.media/gstreamer.md
-%%DATADIR%%/modules/javafx/osx-x64/legal/javafx.media/libffi.md
-%%DATADIR%%/modules/javafx/osx-x64/legal/javafx.swing/COPYRIGHT
-%%DATADIR%%/modules/javafx/osx-x64/legal/javafx.web/COPYRIGHT
-%%DATADIR%%/modules/javafx/osx-x64/legal/javafx.web/icu_web.md
-%%DATADIR%%/modules/javafx/osx-x64/legal/javafx.web/libxml2.md
-%%DATADIR%%/modules/javafx/osx-x64/legal/javafx.web/libxslt.md
-%%DATADIR%%/modules/javafx/osx-x64/legal/javafx.web/webkit.md
-%%DATADIR%%/modules/javafx/osx-x64/lib/javafx-swt.jar
-%%DATADIR%%/modules/javafx/osx-x64/lib/javafx.base.jar
-%%DATADIR%%/modules/javafx/osx-x64/lib/javafx.controls.jar
-%%DATADIR%%/modules/javafx/osx-x64/lib/javafx.fxml.jar
-%%DATADIR%%/modules/javafx/osx-x64/lib/javafx.graphics.jar
-%%DATADIR%%/modules/javafx/osx-x64/lib/javafx.media.jar
-%%DATADIR%%/modules/javafx/osx-x64/lib/javafx.properties
-%%DATADIR%%/modules/javafx/osx-x64/lib/javafx.swing.jar
-%%DATADIR%%/modules/javafx/osx-x64/lib/javafx.web.jar
-%%DATADIR%%/modules/javafx/osx-x64/lib/libdecora_sse.dylib
-%%DATADIR%%/modules/javafx/osx-x64/lib/libfxplugins.dylib
-%%DATADIR%%/modules/javafx/osx-x64/lib/libglass.dylib
-%%DATADIR%%/modules/javafx/osx-x64/lib/libglib-lite.dylib
-%%DATADIR%%/modules/javafx/osx-x64/lib/libgstreamer-lite.dylib
-%%DATADIR%%/modules/javafx/osx-x64/lib/libjavafx_font.dylib
-%%DATADIR%%/modules/javafx/osx-x64/lib/libjavafx_iio.dylib
-%%DATADIR%%/modules/javafx/osx-x64/lib/libjfxmedia.dylib
-%%DATADIR%%/modules/javafx/osx-x64/lib/libjfxmedia_avf.dylib
-%%DATADIR%%/modules/javafx/osx-x64/lib/libjfxwebkit.dylib
-%%DATADIR%%/modules/javafx/osx-x64/lib/libprism_common.dylib
-%%DATADIR%%/modules/javafx/osx-x64/lib/libprism_es2.dylib
-%%DATADIR%%/modules/javafx/osx-x64/lib/libprism_sw.dylib
-%%DATADIR%%/modules/javafx/osx-x64/lib/src.zip
-%%DATADIR%%/modules/javafx/windows-x64/legal/javafx.base/COPYRIGHT
-%%DATADIR%%/modules/javafx/windows-x64/legal/javafx.controls/COPYRIGHT
-%%DATADIR%%/modules/javafx/windows-x64/legal/javafx.fxml/COPYRIGHT
-%%DATADIR%%/modules/javafx/windows-x64/legal/javafx.graphics/COPYRIGHT
-%%DATADIR%%/modules/javafx/windows-x64/legal/javafx.graphics/jpeg_fx.md
-%%DATADIR%%/modules/javafx/windows-x64/legal/javafx.graphics/mesa3d.md
-%%DATADIR%%/modules/javafx/windows-x64/legal/javafx.media/COPYRIGHT
-%%DATADIR%%/modules/javafx/windows-x64/legal/javafx.media/directshow.md
-%%DATADIR%%/modules/javafx/windows-x64/legal/javafx.media/glib.md
-%%DATADIR%%/modules/javafx/windows-x64/legal/javafx.media/gstreamer.md
-%%DATADIR%%/modules/javafx/windows-x64/legal/javafx.media/libffi.md
-%%DATADIR%%/modules/javafx/windows-x64/legal/javafx.swing/COPYRIGHT
-%%DATADIR%%/modules/javafx/windows-x64/legal/javafx.web/COPYRIGHT
-%%DATADIR%%/modules/javafx/windows-x64/legal/javafx.web/icu_web.md
-%%DATADIR%%/modules/javafx/windows-x64/legal/javafx.web/libxml2.md
-%%DATADIR%%/modules/javafx/windows-x64/legal/javafx.web/libxslt.md
-%%DATADIR%%/modules/javafx/windows-x64/legal/javafx.web/webkit.md
-%%DATADIR%%/modules/javafx/windows-x64/lib/javafx-swt.jar
-%%DATADIR%%/modules/javafx/windows-x64/lib/javafx.base.jar
-%%DATADIR%%/modules/javafx/windows-x64/lib/javafx.controls.jar
-%%DATADIR%%/modules/javafx/windows-x64/lib/javafx.fxml.jar
-%%DATADIR%%/modules/javafx/windows-x64/lib/javafx.graphics.jar
-%%DATADIR%%/modules/javafx/windows-x64/lib/javafx.media.jar
-%%DATADIR%%/modules/javafx/windows-x64/lib/javafx.properties
-%%DATADIR%%/modules/javafx/windows-x64/lib/javafx.swing.jar
-%%DATADIR%%/modules/javafx/windows-x64/lib/javafx.web.jar
-%%DATADIR%%/modules/javafx/windows-x64/lib/src.zip
+%%DATADIR%%/modules/javax.el-2.2.5.jar
 %%DATADIR%%/modules/javax.servlet.javax.servlet-api.jar
 %%DATADIR%%/modules/javax.servlet.jsp.javax.servlet.jsp-api.jar
 %%DATADIR%%/modules/oracle.adf.model/db-ca.jar
@@ -573,13 +479,14 @@ share/icons/hicolor/32x32/apps/sqldeveloper.png
 %%DATADIR%%/modules/oracle.xdk/xsqlserializers.jar
 %%DATADIR%%/modules/oracle.xdk/xsu12.jar
 %%DATADIR%%/modules/oracle.xmlef/xmlef.jar
-%%DATADIR%%/modules/org.codehaus.woodstox/stax2-api.jar
 %%DATADIR%%/modules/org.glassfish.javax.el.jar
 %%DATADIR%%/modules/org.glassfish.javax.json.jar
-%%DATADIR%%/modules/thirdparty/batik-all-1.11.0.0.1.jar
-%%DATADIR%%/modules/thirdparty/commons-codec-1.13.jar
-%%DATADIR%%/modules/thirdparty/commons-io-2.6.jar
+%%DATADIR%%/modules/thirdparty/asm-9.0.jar
+%%DATADIR%%/modules/thirdparty/batik-all-1.16.0.0.1.jar
+%%DATADIR%%/modules/thirdparty/commons-codec-1.15.jar
+%%DATADIR%%/modules/thirdparty/commons-io-2.8.0.jar
 %%DATADIR%%/modules/thirdparty/commons-logging-1.2.0.0.2.jar
+%%DATADIR%%/modules/thirdparty/features/asm.jar
 %%DATADIR%%/modules/thirdparty/features/batik-all.jar
 %%DATADIR%%/modules/thirdparty/features/commons-codec.jar
 %%DATADIR%%/modules/thirdparty/features/commons-io.jar
@@ -587,18 +494,22 @@ share/icons/hicolor/32x32/apps/sqldeveloper.png
 %%DATADIR%%/modules/thirdparty/features/httpclient-cache.jar
 %%DATADIR%%/modules/thirdparty/features/httpclient.jar
 %%DATADIR%%/modules/thirdparty/features/httpcore.jar
-%%DATADIR%%/modules/thirdparty/features/httpmime_4.5.1.0.0.jar
+%%DATADIR%%/modules/thirdparty/features/httpmime.jar
 %%DATADIR%%/modules/thirdparty/features/jakarta-commons-el.jar
 %%DATADIR%%/modules/thirdparty/features/jaxen.jar
 %%DATADIR%%/modules/thirdparty/features/jsch.jar
+%%DATADIR%%/modules/thirdparty/features/stax2-api.jar
+%%DATADIR%%/modules/thirdparty/features/woodstox-core.jar
 %%DATADIR%%/modules/thirdparty/features/xml-apis-ext.jar
-%%DATADIR%%/modules/thirdparty/httpclient-4.5.10.jar
-%%DATADIR%%/modules/thirdparty/httpclient-cache-4.5.10.jar
-%%DATADIR%%/modules/thirdparty/httpcore-4.4.12.jar
-%%DATADIR%%/modules/thirdparty/httpmime-4.5.1.jar
+%%DATADIR%%/modules/thirdparty/httpclient-4.5.13.jar
+%%DATADIR%%/modules/thirdparty/httpclient-cache-4.5.13.jar
+%%DATADIR%%/modules/thirdparty/httpcore-4.4.14.jar
+%%DATADIR%%/modules/thirdparty/httpmime-4.5.2.jar
 %%DATADIR%%/modules/thirdparty/jakarta-commons-el-1.jar
 %%DATADIR%%/modules/thirdparty/jaxen-1.2.0.jar
 %%DATADIR%%/modules/thirdparty/jsch-0.1.55.jar
+%%DATADIR%%/modules/thirdparty/stax2-api-4.2.1.jar
+%%DATADIR%%/modules/thirdparty/woodstox-core-6.0.2.jar
 %%DATADIR%%/modules/thirdparty/xml-apis-ext-1.4.01.jar
 %%DATADIR%%/netbeans/fcpbridge/config/Modules/com-oracle-jdeveloper-extcache.xml
 %%DATADIR%%/netbeans/fcpbridge/config/Modules/com-oracle-jdeveloper-nbactions.xml
@@ -1186,9 +1097,8 @@ share/icons/hicolor/32x32/apps/sqldeveloper.png
 %%DATADIR%%/netbeans/platform/update_tracking/org-openide-util-ui.xml
 %%DATADIR%%/netbeans/platform/update_tracking/org-openide-util.xml
 %%DATADIR%%/netbeans/platform/update_tracking/org-openide-windows.xml
-%%DATADIR%%/orakafka/orakafka.zip
 %%DATADIR%%/rdbms/jlib/ojdi.jar
-%%DATADIR%%/rdbms/jlib/xdb6.jar
+%%DATADIR%%/rdbms/jlib/xdb.jar
 %%DATADIR%%/sleepycat/je-3.3.98/lib/je-3.3.98.jar
 %%DATADIR%%/sqldeveloper/bin/SQLDeveloperIcons.icns
 %%DATADIR%%/sqldeveloper/bin/common.boot
@@ -2085,6 +1995,38 @@ share/icons/hicolor/32x32/apps/sqldeveloper.png
 %%DATADIR%%/sqldeveloper/extensions/oracle.sqldeveloper.migration.translation.gui.jar
 %%DATADIR%%/sqldeveloper/extensions/oracle.sqldeveloper.migration.translation.mysql.jar
 %%DATADIR%%/sqldeveloper/extensions/oracle.sqldeveloper.migration.translation.teradata.jar
+%%DATADIR%%/sqldeveloper/extensions/oracle.sqldeveloper.pgql.jar
+%%DATADIR%%/sqldeveloper/extensions/oracle.sqldeveloper.pgql/lib/animal-sniffer-annotations.jar
+%%DATADIR%%/sqldeveloper/extensions/oracle.sqldeveloper.pgql/lib/aopalliance.jar
+%%DATADIR%%/sqldeveloper/extensions/oracle.sqldeveloper.pgql/lib/capsule.jar
+%%DATADIR%%/sqldeveloper/extensions/oracle.sqldeveloper.pgql/lib/checker-qual.jar
+%%DATADIR%%/sqldeveloper/extensions/oracle.sqldeveloper.pgql/lib/commons-configuration2-jackson.jar
+%%DATADIR%%/sqldeveloper/extensions/oracle.sqldeveloper.pgql/lib/commons-configuration2.jar
+%%DATADIR%%/sqldeveloper/extensions/oracle.sqldeveloper.pgql/lib/commons-io.jar
+%%DATADIR%%/sqldeveloper/extensions/oracle.sqldeveloper.pgql/lib/commons-lang3.jar
+%%DATADIR%%/sqldeveloper/extensions/oracle.sqldeveloper.pgql/lib/commons-logging.jar
+%%DATADIR%%/sqldeveloper/extensions/oracle.sqldeveloper.pgql/lib/commons-text.jar
+%%DATADIR%%/sqldeveloper/extensions/oracle.sqldeveloper.pgql/lib/commons-vfs2.jar
+%%DATADIR%%/sqldeveloper/extensions/oracle.sqldeveloper.pgql/lib/error_prone_annotations.jar
+%%DATADIR%%/sqldeveloper/extensions/oracle.sqldeveloper.pgql/lib/failureaccess.jar
+%%DATADIR%%/sqldeveloper/extensions/oracle.sqldeveloper.pgql/lib/fastdoubleparser.jar
+%%DATADIR%%/sqldeveloper/extensions/oracle.sqldeveloper.pgql/lib/graph-query-ir.jar
+%%DATADIR%%/sqldeveloper/extensions/oracle.sqldeveloper.pgql/lib/guava.jar
+%%DATADIR%%/sqldeveloper/extensions/oracle.sqldeveloper.pgql/lib/guice.jar
+%%DATADIR%%/sqldeveloper/extensions/oracle.sqldeveloper.pgql/lib/j2objc-annotations.jar
+%%DATADIR%%/sqldeveloper/extensions/oracle.sqldeveloper.pgql/lib/jackson-annotations.jar
+%%DATADIR%%/sqldeveloper/extensions/oracle.sqldeveloper.pgql/lib/jackson-core.jar
+%%DATADIR%%/sqldeveloper/extensions/oracle.sqldeveloper.pgql/lib/jackson-databind.jar
+%%DATADIR%%/sqldeveloper/extensions/oracle.sqldeveloper.pgql/lib/javax.inject.jar
+%%DATADIR%%/sqldeveloper/extensions/oracle.sqldeveloper.pgql/lib/jsr305.jar
+%%DATADIR%%/sqldeveloper/extensions/oracle.sqldeveloper.pgql/lib/listenablefuture.jar
+%%DATADIR%%/sqldeveloper/extensions/oracle.sqldeveloper.pgql/lib/ojdbc8.jar
+%%DATADIR%%/sqldeveloper/extensions/oracle.sqldeveloper.pgql/lib/org.metaborg.spoofax.core.uber.jar
+%%DATADIR%%/sqldeveloper/extensions/oracle.sqldeveloper.pgql/lib/pgql-lang.jar
+%%DATADIR%%/sqldeveloper/extensions/oracle.sqldeveloper.pgql/lib/pgql-on-rdbms.jar
+%%DATADIR%%/sqldeveloper/extensions/oracle.sqldeveloper.pgql/lib/reactive-streams.jar
+%%DATADIR%%/sqldeveloper/extensions/oracle.sqldeveloper.pgql/lib/rxjava.jar
+%%DATADIR%%/sqldeveloper/extensions/oracle.sqldeveloper.pgql/lib/slf4j-api.jar
 %%DATADIR%%/sqldeveloper/extensions/oracle.sqldeveloper.rdfgraph.jar
 %%DATADIR%%/sqldeveloper/extensions/oracle.sqldeveloper.rdfgraph/lib/rdfgraph_help.jar
 %%DATADIR%%/sqldeveloper/extensions/oracle.sqldeveloper.rdfgraph/lib/sdordf-client.jar
@@ -2105,9 +2047,6 @@ share/icons/hicolor/32x32/apps/sqldeveloper.png
 %%DATADIR%%/sqldeveloper/extensions/oracle.sqldeveloper.timesten/lib/jsch.jar
 %%DATADIR%%/sqldeveloper/extensions/oracle.sqldeveloper.timesten/lib/jzlib.jar
 %%DATADIR%%/sqldeveloper/extensions/oracle.sqldeveloper.tuning.jar
-%%DATADIR%%/sqldeveloper/extensions/oracle.sqldeveloper.unit_test.jar
-%%DATADIR%%/sqldeveloper/extensions/oracle.sqldeveloper.unit_test/sql/createRepositoryRoles.sql
-%%DATADIR%%/sqldeveloper/extensions/oracle.sqldeveloper.unit_test/sql/createRepositoryUser.sql
 %%DATADIR%%/sqldeveloper/extensions/oracle.sqldeveloper.utils.jar
 %%DATADIR%%/sqldeveloper/extensions/oracle.sqldeveloper.worksheet.jar
 %%DATADIR%%/sqldeveloper/extensions/oracle.sqldeveloper.xmlschema.jar
@@ -2115,59 +2054,60 @@ share/icons/hicolor/32x32/apps/sqldeveloper.png
 %%DATADIR%%/sqldeveloper/lib/PropertyStorage.jar
 %%DATADIR%%/sqldeveloper/lib/ST4.jar
 %%DATADIR%%/sqldeveloper/lib/SparseBitSet.jar
+%%DATADIR%%/sqldeveloper/lib/annotations.jar
 %%DATADIR%%/sqldeveloper/lib/antlr-all-2.7.6.jar
 %%DATADIR%%/sqldeveloper/lib/antlr-runtime-3.1.3.jar
 %%DATADIR%%/sqldeveloper/lib/antlr-runtime.jar
-%%DATADIR%%/sqldeveloper/lib/aopalliance-repackaged.jar
+%%DATADIR%%/sqldeveloper/lib/antlr4-runtime.jar
 %%DATADIR%%/sqldeveloper/lib/asm.jar
 %%DATADIR%%/sqldeveloper/lib/aurora.jar
 %%DATADIR%%/sqldeveloper/lib/common.jar
 %%DATADIR%%/sqldeveloper/lib/commons-codec.jar
 %%DATADIR%%/sqldeveloper/lib/commons-collections4.jar
 %%DATADIR%%/sqldeveloper/lib/commons-compress.jar
-%%DATADIR%%/sqldeveloper/lib/commons-logging.jar
+%%DATADIR%%/sqldeveloper/lib/commons-io.jar
 %%DATADIR%%/sqldeveloper/lib/commons-math3.jar
 %%DATADIR%%/sqldeveloper/lib/curvesapi.jar
 %%DATADIR%%/sqldeveloper/lib/dbtools-common.jar
 %%DATADIR%%/sqldeveloper/lib/dbtools-data.jar
+%%DATADIR%%/sqldeveloper/lib/dbtools-datapump.jar
 %%DATADIR%%/sqldeveloper/lib/dbtools-http.jar
 %%DATADIR%%/sqldeveloper/lib/dbtools-net.jar
 %%DATADIR%%/sqldeveloper/lib/dbtools-sqlcl.jar
 %%DATADIR%%/sqldeveloper/lib/editor.jar
 %%DATADIR%%/sqldeveloper/lib/emapi.jar
+%%DATADIR%%/sqldeveloper/lib/ext/cpat.jar
+%%DATADIR%%/sqldeveloper/lib/ext/dbtools-apex.jar
+%%DATADIR%%/sqldeveloper/lib/ext/dbtools-aq.jar
+%%DATADIR%%/sqldeveloper/lib/ext/dbtools-cpat.jar
+%%DATADIR%%/sqldeveloper/lib/ext/dbtools-dg.jar
 %%DATADIR%%/sqldeveloper/lib/ext/dbtools-liquibase.jar
 %%DATADIR%%/sqldeveloper/lib/ext/dbtools-modeler-cli-ext.jar
 %%DATADIR%%/sqldeveloper/lib/ext/dbtools-modeler-common.jar
 %%DATADIR%%/sqldeveloper/lib/ext/liquibase-core.jar
-%%DATADIR%%/sqldeveloper/lib/guava.jar
-%%DATADIR%%/sqldeveloper/lib/hk2-api.jar
-%%DATADIR%%/sqldeveloper/lib/hk2-locator.jar
-%%DATADIR%%/sqldeveloper/lib/hk2-utils.jar
+%%DATADIR%%/sqldeveloper/lib/fastdoubleparser.jar
+%%DATADIR%%/sqldeveloper/lib/guava-with-lf.jar
 %%DATADIR%%/sqldeveloper/lib/httpclient5.jar
 %%DATADIR%%/sqldeveloper/lib/httpcore5.jar
 %%DATADIR%%/sqldeveloper/lib/jackson-annotations.jar
 %%DATADIR%%/sqldeveloper/lib/jackson-core.jar
 %%DATADIR%%/sqldeveloper/lib/jackson-jr-objects.jar
 %%DATADIR%%/sqldeveloper/lib/jackson-jr-stree.jar
+%%DATADIR%%/sqldeveloper/lib/jakarta.json-api.jar
 %%DATADIR%%/sqldeveloper/lib/jansi.jar
-%%DATADIR%%/sqldeveloper/lib/javassist.jar
-%%DATADIR%%/sqldeveloper/lib/javax.activation-api.jar
-%%DATADIR%%/sqldeveloper/lib/javax.annotation-api.jar
-%%DATADIR%%/sqldeveloper/lib/javax.inject.jar
-%%DATADIR%%/sqldeveloper/lib/javax.ws.rs-api.jar
+%%DATADIR%%/sqldeveloper/lib/jcl-over-slf4j.jar
 %%DATADIR%%/sqldeveloper/lib/jdbcrest.jar
-%%DATADIR%%/sqldeveloper/lib/jersey-client.jar
-%%DATADIR%%/sqldeveloper/lib/jersey-common.jar
-%%DATADIR%%/sqldeveloper/lib/jersey-guava.jar
 %%DATADIR%%/sqldeveloper/lib/jgraphx.jar
 %%DATADIR%%/sqldeveloper/lib/jline3.jar
 %%DATADIR%%/sqldeveloper/lib/json.jar
 %%DATADIR%%/sqldeveloper/lib/log4j-1.2-api.jar
 %%DATADIR%%/sqldeveloper/lib/log4j-api.jar
 %%DATADIR%%/sqldeveloper/lib/log4j-core.jar
+%%DATADIR%%/sqldeveloper/lib/log4j-over-slf4j.jar
 %%DATADIR%%/sqldeveloper/lib/low-level-api.jar
 %%DATADIR%%/sqldeveloper/lib/mongodbjdbc.jar
 %%DATADIR%%/sqldeveloper/lib/mvclient.jar
+%%DATADIR%%/sqldeveloper/lib/ojdbc11.jar
 %%DATADIR%%/sqldeveloper/lib/ojdl.jar
 %%DATADIR%%/sqldeveloper/lib/ojmisc.jar
 %%DATADIR%%/sqldeveloper/lib/oracle.dbtools.headless.jar
@@ -2177,9 +2117,9 @@ share/icons/hicolor/32x32/apps/sqldeveloper.png
 %%DATADIR%%/sqldeveloper/lib/orajsoda.jar
 %%DATADIR%%/sqldeveloper/lib/osdt_cert.jar
 %%DATADIR%%/sqldeveloper/lib/osdt_core.jar
-%%DATADIR%%/sqldeveloper/lib/osgi-resource-locator.jar
+%%DATADIR%%/sqldeveloper/lib/parsson.jar
 %%DATADIR%%/sqldeveloper/lib/plugin-api.jar
-%%DATADIR%%/sqldeveloper/lib/poi-ooxml-schemas.jar
+%%DATADIR%%/sqldeveloper/lib/poi-ooxml-lite.jar
 %%DATADIR%%/sqldeveloper/lib/poi-ooxml.jar
 %%DATADIR%%/sqldeveloper/lib/poi.jar
 %%DATADIR%%/sqldeveloper/lib/resource-templates.jar
@@ -2195,8 +2135,9 @@ share/icons/hicolor/32x32/apps/sqldeveloper.png
 %%DATADIR%%/sqldeveloper/lib/sshd-scp.jar
 %%DATADIR%%/sqldeveloper/lib/sshd-sftp.jar
 %%DATADIR%%/sqldeveloper/lib/stringtemplate-3.1b1.jar
-%%DATADIR%%/sqldeveloper/lib/ucp.jar
+%%DATADIR%%/sqldeveloper/lib/xdb.jar
 %%DATADIR%%/sqldeveloper/lib/xmlbeans.jar
+%%DATADIR%%/sqldeveloper/lib/xmlparserv2_sans_jaxp_services.jar
 %%DATADIR%%/sqlj/lib/runtime12.jar
 %%DATADIR%%/svnkit/antlr-runtime.jar
 %%DATADIR%%/svnkit/licenses/ANTLR-LICENSE
@@ -2212,7 +2153,3 @@ share/icons/hicolor/32x32/apps/sqldeveloper.png
 %%DATADIR%%/svnkit/svnjavahl.jar
 %%DATADIR%%/svnkit/svnkit.jar
 %%DATADIR%%/svnkit/trilead.jar
-@dir %%DATADIR%%/modules/javafx/windows-x64/bin
-@dir %%DATADIR%%/netbeans/platform/modules/lib/amd64/linux
-@dir %%DATADIR%%/netbeans/platform/modules/lib/i386/linux
-@dir %%DATADIR%%/netbeans/platform/modules/lib/x86
diff --git a/databases/sqlite-ext-miscfuncs/Makefile b/databases/sqlite-ext-miscfuncs/Makefile
index 0188bbd1cf9b..49e19962ed3d 100644
--- a/databases/sqlite-ext-miscfuncs/Makefile
+++ b/databases/sqlite-ext-miscfuncs/Makefile
@@ -1,5 +1,3 @@
-# Created by: Greg Larkin <glarkin@FreeBSD.org>
-
 PORTNAME=	sqlite-ext-miscfuncs
 PORTVERSION=	1.1
 PORTREVISION=	2
@@ -11,6 +9,7 @@ EXTRACT_SUFX=	# empty
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Math, string, and aggregate function library for SQLite
+WWW=		https://www.sqlite.org/contrib
 
 USES=		localbase sqlite
 DIST_SUBDIR=	sqlite-ext
diff --git a/databases/sqlite-ext-miscfuncs/pkg-descr b/databases/sqlite-ext-miscfuncs/pkg-descr
index 3843c4da818a..d1be76cfc8f9 100644
--- a/databases/sqlite-ext-miscfuncs/pkg-descr
+++ b/databases/sqlite-ext-miscfuncs/pkg-descr
@@ -15,5 +15,3 @@ String functions:
 Aggregate functions:
 
   stdev, variance, mode, median, lower_quartile, upper_quartile
-
-WWW: https://www.sqlite.org/contrib
diff --git a/databases/sqlite-ext-pcre/Makefile b/databases/sqlite-ext-pcre/Makefile
index dfa64224d3a3..a47bfee15aa0 100644
--- a/databases/sqlite-ext-pcre/Makefile
+++ b/databases/sqlite-ext-pcre/Makefile
@@ -6,6 +6,7 @@ DIST_SUBDIR=	sqlite-ext
 
 MAINTAINER=	vivek@khera.org
 COMMENT=	Regexp function for SQLite based on PCRE library
+WWW=		https://github.com/ralight/sqlite3-pcre
 
 LICENSE=	PD
 
diff --git a/databases/sqlite-ext-pcre/pkg-descr b/databases/sqlite-ext-pcre/pkg-descr
index dd12616cbda7..ea45ca932d63 100644
--- a/databases/sqlite-ext-pcre/pkg-descr
+++ b/databases/sqlite-ext-pcre/pkg-descr
@@ -1,4 +1,2 @@
 This is sqlite3-pcre, an extension for sqlite3 that uses libpcre to provide
 a regexp() function to use with the REGEXP operator.
-
-WWW: https://github.com/ralight/sqlite3-pcre
diff --git a/databases/sqlite-ext-regexp/Makefile b/databases/sqlite-ext-regexp/Makefile
index 4f6e62e8042a..b123b76cbfb4 100644
--- a/databases/sqlite-ext-regexp/Makefile
+++ b/databases/sqlite-ext-regexp/Makefile
@@ -1,5 +1,3 @@
-# Created by: Yuri Victorovich <yuri@rawbw.com>
-
 PORTNAME=	sqlite-ext-regexp
 PORTVERSION=	3.8.11.1
 PORTREVISION=	1
@@ -10,6 +8,7 @@ DIST_SUBDIR=	sqlite-ext
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Regular-expression matcher using NFA engine for SQLite
+WWW=		https://www.sqlite.org/
 
 LICENSE=	public
 LICENSE_NAME=	Public Domain
diff --git a/databases/sqlite-ext-regexp/pkg-descr b/databases/sqlite-ext-regexp/pkg-descr
index 614a8481304b..392675eea058 100644
--- a/databases/sqlite-ext-regexp/pkg-descr
+++ b/databases/sqlite-ext-regexp/pkg-descr
@@ -2,5 +2,3 @@ Regular-expression matcher for posix extended regular expressions
 against UTF8 text.
 
 Functions: regexp
-
-WWW: https://www.sqlite.org/
diff --git a/databases/sqlite-ext-spellfix/Makefile b/databases/sqlite-ext-spellfix/Makefile
index 61d03006b0c7..ecb45294b90c 100644
--- a/databases/sqlite-ext-spellfix/Makefile
+++ b/databases/sqlite-ext-spellfix/Makefile
@@ -1,5 +1,3 @@
-# Created by: Yuri Victorovich <yuri@rawbw.com>
-
 PORTNAME=	sqlite-ext-spellfix
 PORTVERSION=	3.8.11.1
 PORTREVISION=	1
@@ -10,6 +8,7 @@ DIST_SUBDIR=	sqlite-ext
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Search large vocabulary for close matches for SQLite
+WWW=		https://www.sqlite.org/spellfix1.html
 
 LICENSE=	PD
 
diff --git a/databases/sqlite-ext-spellfix/pkg-descr b/databases/sqlite-ext-spellfix/pkg-descr
index cb08c8627298..d29024a3c270 100644
--- a/databases/sqlite-ext-spellfix/pkg-descr
+++ b/databases/sqlite-ext-spellfix/pkg-descr
@@ -9,5 +9,3 @@ Functions:
 
   editdist, editdist3, spellfix1_translit, spellfix1_phonehash,
   spellfix1_scriptcode
-
-WWW: https://www.sqlite.org/spellfix1.html
diff --git a/databases/sqlite2/Makefile b/databases/sqlite2/Makefile
index a863f9f90a69..8053747b7e8a 100644
--- a/databases/sqlite2/Makefile
+++ b/databases/sqlite2/Makefile
@@ -1,5 +1,3 @@
-# Created by: Ying-Chieh Liao <ijliao@FreeBSD.org>
-
 PORTNAME=	sqlite
 PORTVERSION=	2.8.17
 PORTREVISION=	5
@@ -8,6 +6,7 @@ MASTER_SITES=	http://www.sqlite.org/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	SQL database engine in a C library
+WWW=		https://www.sqlite.org/
 
 GNU_CONFIGURE=	yes
 USES=		cpe gmake libtool pathfix pkgconfig readline
diff --git a/databases/sqlite2/pkg-descr b/databases/sqlite2/pkg-descr
index 3cdcbd6b2daf..ae9239a10213 100644
--- a/databases/sqlite2/pkg-descr
+++ b/databases/sqlite2/pkg-descr
@@ -3,5 +3,3 @@ library can have SQL database access without running a separate RDBMS process.
 The distribution comes with a standalone command-line access program (sqlite)
 that can be used to administer an SQLite database and which serves as an
 example of how to use the SQLite library.
-
-WWW: http://www.sqlite.org/
diff --git a/databases/sqlite3/Makefile b/databases/sqlite3/Makefile
index d5335e4c0841..a18401decd21 100644
--- a/databases/sqlite3/Makefile
+++ b/databases/sqlite3/Makefile
@@ -1,11 +1,11 @@
-# Created by: Ying-Chieh Liao <ijliao@FreeBSD.org>
-
 PORTNAME=	sqlite3
-DISTVERSION=	3.35.5
-PORTREVISION=	3
+DISTVERSION=	3.45.1
 PORTEPOCH=	1
 CATEGORIES=	databases
-MASTER_SITES=	https://www.sqlite.org/${%Y:L:gmtime}/ https://www2.sqlite.org/${%Y:L:gmtime}/ https://www3.sqlite.org/${%Y:L:gmtime}/
+MASTER_SITES=	https://www.sqlite.org/${_YEAR}/ https://www2.sqlite.org/${_YEAR}/ https://www3.sqlite.org/${_YEAR}/
+.if defined(TEA)
+PKGNAMEPREFIX=	tcl-
+.endif
 DISTNAME=	sqlite-src-${PORTVERSION:C/\.([[:digit:]])[[:>:]]/0\1/g:S/.//g}00
 
 MAINTAINER=	pavelivolkov@gmail.com
@@ -16,22 +16,31 @@ COMMENT+=	(ICU flavor)
 .if ${FLAVOR:U} == tcl
 COMMENT+=	(TCL flavor)
 .endif
+.if defined(TEA)
+COMMENT=	SQLite extension for Tcl using the Tcl Extension Architecture (TEA)
+.endif
+WWW=		https://www.sqlite.org/
 
 LICENSE=	PD
 
+.if !defined(TEA)
 FLAVORS=	default icu tcl
 FLAVOR?=	${FLAVORS:[1]}
 icu_PKGNAMESUFFIX=	-${FLAVOR}	# databases/p5-DBD-SQLite with ICU support
-icu_CONFLICTS_INSTALL=	${PORTNAME} ${PORTNAME}-tcl
 tcl_PKGNAMESUFFIX=	-${FLAVOR}	# lang/tcl* support
-tcl_CONFLICTS_INSTALL=	${PORTNAME} ${PORTNAME}-icu
+.endif
 
 USES=	libtool pathfix zip
 USE_LDCONFIG=	yes
 
 GNU_CONFIGURE=	yes
+GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
 
 MAKE_JOBS_UNSAFE=	yes
+ALL_TARGET+=	sqldiff
+.if defined(TEA)
+INSTALL_TARGET=	tcl_install
+.endif
 TEST_TARGET=	test
 
 # The default numeric file permissions for newly created database files under unix.
@@ -41,40 +50,62 @@ TEST_TARGET=	test
 CPPFLAGS+=	-DSQLITE_DEFAULT_FILE_PERMISSIONS=${DEFAULT_FILE_PERMISSIONS}
 .endif
 
+CONFLICTS_INSTALL=	sqlite3 sqlite3-icu sqlite3-tcl tcl-sqlite3 # include/sqlite3.h share/examples/sqlite3/example.tcl
+
 SUB_FILES=	example.tcl
 SUB_LIST=	TCLSH_CMD="${TCLSH}"
 
-PLIST_SUB=	TCLVER=tcl${TCL_VER} TCLSUF=tcl${TCL_VER:S/.//g}
+.if defined(TEA)
+USES+=	sqlite
+DESCR=	${MASTERDIR}/pkg-descr-tea
+SUB_LIST+=	TEA="" NO_TEA="@comment "
+PLIST_SUB+=	TEA="" NO_TEA="@comment "
+.else
+SUB_LIST+=	TEA="@comment " NO_TEA=""
+PLIST_SUB+=	TEA="@comment " NO_TEA=""
+.endif
+
+PLIST_SUB+=	TCLVER=tcl${TCL_VER} TCLSUF=tcl${TCL_VER:S/.//g}
 
 # Compilation Options For SQLite https://www.sqlite.org/compile.html
-OPTIONS_DEFINE=		ARMOR DBPAGE DBSTAT DIRECT_READ DQS EXAMPLES EXTENSION FTS3_TOKEN \
+OPTIONS_DEFINE=		EXAMPLES STRIP TCL THREADS
+.if !defined(TEA)
+OPTIONS_DEFINE+=	ARMOR DBPAGE DBSTAT DIRECT_READ DQS EXTENSION FTS3_TOKEN \
 			FTS4 FTS5 LIKENOTBLOB MEMMAN METADATA NORMALIZE NULL_TRIM RBU SECURE_DELETE \
-			SORT_REF STATIC STMT STRIP TCL THREADS TRUSTED_SCHEMA UNKNOWN_SQL UNLOCK_NOTIFY \
+			SORT_REF STATIC STMT TRUSTED_SCHEMA UNKNOWN_SQL UNLOCK_NOTIFY \
 			UPDATE_LIMIT URI URI_AUTHORITY
-OPTIONS_DEFAULT=	DBPAGE DBSTAT DQS EXTENSION FTS3_TOKEN FTS4 FTS5 JSON1 LIBEDIT METADATA \
+.endif
+OPTIONS_DEFAULT=	DBPAGE DBSTAT DIRECT_READ EXTENSION FTS3_TOKEN FTS4 FTS5 LIBEDIT METADATA \
 			RTREE SECURE_DELETE STRIP THREADS TS1 UNICODE61 UNLOCK_NOTIFY URI
 # SECURE_DELETE, UNLOCK_NOTIFY, DBSTAT (since 41.0) used by www/firefox et al.
 # RTREE used by graphics/mapnik, databases/spatialite
 # FTS3_TOKEN used by audio/clementine-player, mail/thunderbird, www/seamonkey
 # FTS5 used by sysutils/tracker
-# JSON1 used by net-im/py-matrix-synapse
+# JSON1 used by net-im/py-matrix-synapse (since SQLite 3.38.0 included by default)
 # DBPAGE used by audio/audacity (since 3.0.0)
+# DQS used by multimedia/emby-server, multimedia/tautulli, net/vnstat, www/qutebrowser
 #
+.if !defined(TEA)
 OPTIONS_GROUP=		OPT_EXT OPT_FUNC RTREEG UNICODE
-OPTIONS_GROUP_OPT_EXT=	JSON1 SESSION
-OPTIONS_GROUP_OPT_FUNC=	OFFSET SER1 SOUNDEX
+.endif
+OPTIONS_GROUP_OPT_EXT=	SESSION
+OPTIONS_GROUP_OPT_FUNC=	OFFSET SOUNDEX
 OPTIONS_GROUP_RTREEG=	GEOPOLY RTREE RTREE_INT
 OPTIONS_GROUP_UNICODE=	ICU UNICODE61
+.if !defined(TEA)
 OPTIONS_RADIO=		STAT RL
+.endif
 OPTIONS_RADIO_RL=	LIBEDIT READLINE
 OPTIONS_RADIO_STAT=	STAT3 STAT4
+.if !defined(TEA)
 OPTIONS_SINGLE=		RAMT
+.endif
 OPTIONS_SINGLE_RAMT=	TS0 TS1 TS2 TS3
 .if ${FLAVOR:U} == icu
 OPTIONS_EXCLUDE=	UNICODE61
 OPTIONS_SLAVE=		ICU
 .endif
-.if ${FLAVOR:U} == tcl
+.if ${FLAVOR:U} == tcl || defined(TEA)
 OPTIONS_SLAVE=		TCL
 .endif
 OPTIONS_SUB=		yes
@@ -82,20 +113,19 @@ OPTIONS_SUB=		yes
 ARMOR_DESC=		Detect misuse of the API # https://www.sqlite.org/compile.html#enable_api_armor
 DBPAGE_DESC=		Enable DBPAGE Virtual Table # https://sqlite.org/compile.html#enable_dbpage_vtab
 DBSTAT_DESC=		Enable DBSTAT Virtual Table # https://www.sqlite.org/dbstat.html
-DIRECT_READ_DESC=	File is read directly from disk
+DIRECT_READ_DESC=	File is read directly from disk # https://sqlite.org/compile.html#direct_overflow_read
 DQS_DESC=		Double-quoted String Literals # https://www.sqlite.org/compile.html#dqs
 EXTENSION_DESC=		Allow loadable extensions
 FTS3_TOKEN_DESC=	Enable two-args version fts3_tokenizer # https://www.sqlite.org/compile.html#enable_fts3_tokenizer, https://www.sqlite.org/fts3.html#f3tknzr
 FTS4_DESC=		Enable FTS3/4 (Full Text Search) module # https://www.sqlite.org/fts3.html, https://www.sqlite.org/compile.html#enable_fts3_parenthesis
 FTS5_DESC=		Enable version 5 full-text search engine # https://www.sqlite.org/fts5.html
 GEOPOLY_DESC=		Uses the GeoJSON notation (RFC-7946) # https://www.sqlite.org/geopoly.html
-JSON1_DESC=		Enable the JSON1 extension # https://www.sqlite.org/json1.html
 LIKENOTBLOB_DESC=	LIKE does not match blobs # https://sqlite.org/compile.html#like_doesnt_match_blobs
 MEMMAN_DESC=		Allow it to release unused memory
 METADATA_DESC=		Enable column metadata
 NORMALIZE_DESC=		Enable normalized sql function
 NULL_TRIM_DESC=		Omits NULL columns at the ends of rows # https://sqlite.org/compile.html#enable_null_trim
-OFFSET_DESC=		Enable sqlite_offset() returning record's file offset # http://www.sqlite.org/compile.html#enable_offset_sql_func
+OFFSET_DESC=		Enable sqlite_offset() returning records file offset # http://www.sqlite.org/compile.html#enable_offset_sql_func
 OPT_EXT_DESC=		Optional extensions
 OPT_FUNC_DESC=		Optional functions
 RAMT_DESC=		Where to store temporary file # https://www.sqlite.org/tempfiles.html#tempstore
@@ -105,7 +135,6 @@ RTREEG_DESC=		Index type for range queries # https://www.sqlite.org/rtree.html
 RTREE_DESC=		Enable R*Tree module
 RTREE_INT_DESC=		Store 32-bit sig int (no float) coordinates
 SECURE_DELETE_DESC=	Overwrite deleted information with zeros
-SER1_DESC=		Enable the sqlite3_[de]serialize() interface # https://www.sqlite.org/compile.html#enable_deserialize
 SESSION_DESC=		Enable the session extension # https://www.sqlite.org/sessionintro.html
 SORT_REF_DESC=		To use references in the sorter # https://www.sqlite.org/compile.html#enable_sorter_references
 SOUNDEX_DESC=		Enable the soundex() SQL function
@@ -129,7 +158,7 @@ URI_DESC=		Enable use the URI filename
 ARMOR_CPPFLAGS=	-DSQLITE_ENABLE_API_ARMOR=1
 DBPAGE_CPPFLAGS=	-DSQLITE_ENABLE_DBPAGE_VTAB=1
 DBSTAT_CPPFLAGS=	-DSQLITE_ENABLE_DBSTAT_VTAB=1
-DIRECT_READ_CPPFLAGS=	-DSQLITE_DIRECT_OVERFLOW_READ=1
+DIRECT_READ_CPPFLAGS_OFF=	-DSQLITE_DIRECT_OVERFLOW_READ=0
 DQS_CPPFLAGS=	-DSQLITE_DQS=3
 DQS_CPPFLAGS_OFF=	-DSQLITE_DQS=0
 EXTENSION_CONFIGURE_ENABLE=	load-extension
@@ -144,7 +173,6 @@ ICU_BUILD_DEPENDS=	${LOCALBASE}/bin/icu-config:devel/icu
 ICU_LIB_DEPENDS=	libicudata.so:devel/icu
 ICU_CPPFLAGS=	`${LOCALBASE}/bin/icu-config --cppflags` -DSQLITE_ENABLE_ICU=1
 ICU_LIBS=	`${LOCALBASE}/bin/icu-config --ldflags`
-JSON1_CONFIGURE_ENABLE=	json1
 LIBEDIT_USES=	libedit
 LIBEDIT_CONFIGURE_ENABLE=	editline
 LIKENOTBLOB_CPPFLAGS=	-DSQLITE_LIKE_DOESNT_MATCH_BLOBS=1
@@ -159,7 +187,6 @@ READLINE_CONFIGURE_ENABLE=	readline
 RTREE_CONFIGURE_ENABLE=	rtree
 RTREE_INT_CPPFLAGS=	-DSQLITE_RTREE_INT_ONLY=1
 SECURE_DELETE_CPPFLAGS=	-DSQLITE_SECURE_DELETE=1
-SER1_CPPFLAGS=	-DSQLITE_ENABLE_DESERIALIZE=1
 SESSION_CONFIGURE_ENABLE=	session
 SORT_REF_CPPFLAGS=	-DSQLITE_ENABLE_SORTER_REFERENCES=1
 SOUNDEX_CPPFLAGS=	-DSQLITE_SOUNDEX=1
@@ -170,6 +197,8 @@ STMT_CPPFLAGS=	-DSQLITE_ENABLE_STMT_SCANSTATUS=1
 TCL_USES=	tcl
 TCL_USES_OFF=	tcl:build
 TCL_CONFIGURE_ENABLE=	tcl
+TCL_CONFIGURE_WITH=	tcl=${TCL_LIBDIR}
+TCL_CONFIGURE_ENV=	ac_cv_prog_TCLSH_CMD=${TCLSH}
 TCL_ALL_TARGET+=	sqlite3_analyzer
 THREADS_CONFIGURE_ENABLE=	threadsafe
 THREADS_LIBS=	-lpthread
@@ -187,6 +216,18 @@ URI_AUTHORITY_CPPFLAGS=	-DSQLITE_ALLOW_URI_AUTHORITY=1
 
 .include <bsd.port.options.mk>
 
+# _YEAR=	${%Y:L:gmtime} - do not work with the version from the previous year
+_YEAR=	2024
+
+# Recommended options
+# https://sqlite.org/compile.html#strict_subtype
+.if defined(SQLITE_STRICT_SUBTYPE)
+CPPFLAGS+=	-DSQLITE_STRICT_SUBTYPE=${SQLITE_STRICT_SUBTYPE}
+.else
+# This recommended option helps to identify problems in the implementation of application-defined SQL functions early in the development cycle.
+CPPFLAGS+=	-DSQLITE_STRICT_SUBTYPE=1
+.endif
+
 # Platform Configuration
 # -DHAVE_POSIX_FALLOCATE=1 not yet, chunksize.test ZFS failure chunksize-1.2 expected: [32768] got: [2048]
 CPPFLAGS+=	-DHAVE_FCHOWN=1 \
@@ -211,7 +252,7 @@ CFLAGS_powerpc64le=	-DSQLITE_BYTEORDER=1234
 # EXTRACT_DEPENDS=p5-Digest-SHA3:security/p5-Digest-SHA3; USES=perl5; USE_PERL5=extract;
 # @${PERL} -MDigest::SHA3 -le 'print Digest::SHA3->new(sha_256_hex)->add(<>)->hexdigest' < ${DISTDIR}/${ALLFILES}
 pre-extract:
-	@${WHICH} sha3sum > /dev/null && ${ECHO_MSG} -n "=> " && sha3sum -a 256 --tag ${DISTDIR}/${ALLFILES} || ${TRUE}
+	@${WHICH} sha3sum > /dev/null && for entry in ${ALLFILES}; do ${ECHO_MSG} -n "=> "; sha3sum -a 256 --tag "${DISTDIR}/$${entry}"; done || ${TRUE}
 
 post-configure:
 	@${ECHO_MSG} "===> CONFIGURE_ARGS=${CONFIGURE_ARGS}"
@@ -219,24 +260,36 @@ post-configure:
 	@${ECHO_MSG} "===> CPPFLAGS=${CPPFLAGS}"
 	@${ECHO_MSG} "===> LDFLAGS=${LDFLAGS}"
 	@${ECHO_MSG} "===> LIBS=${LIBS}"
+	@${ECHO_MSG} "===> TCL_VER=${TCL_VER}"
+	@${ECHO_MSG} "===> TCLSH=${TCLSH}"
+	@${ECHO_MSG} "===> TCL_INCLUDEDIR=${TCL_INCLUDEDIR}"
+	@${ECHO_MSG} "===> TCL_LIBDIR=${TCL_LIBDIR}"
 
 post-install:
-	${INSTALL_MAN} ${WRKSRC}/sqlite3.1 ${STAGEDIR}${PREFIX}/man/man1
-	${RM} ${STAGEDIR}${PREFIX}/include/msvc.h
+.if !defined(TEA)
+	${INSTALL_MAN} "${WRKSRC}/${PORTNAME}.1" "${STAGEDIR}${PREFIX}/share/man/man1"
+	${RM} "${STAGEDIR}${PREFIX}/include/msvc.h"
 	${SETENV} LD_LIBMAP_DISABLE=1 ldd -a "${STAGEDIR}${PREFIX}/bin/${PORTNAME}" "${STAGEDIR}${PREFIX}/lib/lib${PORTNAME}.so"
+	${INSTALL_PROGRAM} "${WRKSRC}/sqldiff" "${STAGEDIR}${PREFIX}/bin"
+.else
+	${RM} "${STAGEDIR}${PREFIX}/lib/lib${PORTNAME}.so.0.8.6" "${STAGEDIR}${PREFIX}/lib/lib${PORTNAME}.a"
+.endif
 
 post-install-STRIP-on:
+.if !defined(TEA)
 	${STRIP_CMD} "${STAGEDIR}${PREFIX}/bin/${PORTNAME}" "${STAGEDIR}${PREFIX}/lib/lib${PORTNAME}.so"
+.endif
 .if ${PORT_OPTIONS:MTCL}
 	${STRIP_CMD} "${STAGEDIR}${PREFIX}/lib/tcl${TCL_VER}/${PORTNAME}/libtcl${PORTNAME}.so"
 .endif
 
 post-install-TCL-on:
-	${INSTALL_PROGRAM} ${WRKSRC}/sqlite3_analyzer ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/autoconf/tea/doc/${PORTNAME}.n ${STAGEDIR}${PREFIX}/man/mann/${PORTNAME}.tcl${TCL_VER:S/.//g}.n
+	${INSTALL_PROGRAM} "${WRKSRC}/${PORTNAME}_analyzer" "${STAGEDIR}${PREFIX}/bin"
+	${MKDIR} ${STAGEDIR}${PREFIX}/share/man/mann
+	${INSTALL_MAN} "${WRKSRC}/autoconf/tea/doc/${PORTNAME}.n" "${STAGEDIR}${PREFIX}/share/man/mann/${PORTNAME}.tcl${TCL_VER:S/.//g}.n"
 .if ${PORT_OPTIONS:MEXAMPLES}
-	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
-	${INSTALL_SCRIPT} ${WRKDIR}/${SUB_FILES} ${WRKSRC}/contrib/sqlitecon.tcl ${STAGEDIR}${EXAMPLESDIR}
+	${MKDIR} "${STAGEDIR}${EXAMPLESDIR}"
+	${INSTALL_SCRIPT} "${WRKDIR}/${SUB_FILES}" "${WRKSRC}/contrib/sqlitecon.tcl" "${STAGEDIR}${EXAMPLESDIR}"
 .endif
 
 pre-test:
diff --git a/databases/sqlite3/distinfo b/databases/sqlite3/distinfo
index a55e95d86cff..4ec758c1cd5f 100644
--- a/databases/sqlite3/distinfo
+++ b/databases/sqlite3/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1619268670
-SHA256 (sqlite-src-3350500.zip) = f4beeca5595c33ab5031a920d9c9fd65fe693bad2b16320c3a6a6950e66d3b11
-SIZE (sqlite-src-3350500.zip) = 12819198
+TIMESTAMP = 1710050109
+SHA256 (sqlite-src-3450100.zip) = 7f7b14a68edbcd4a57df3a8c4dbd56d2d3546a6e7cdd50de40ceb03af33d34ba
+SIZE (sqlite-src-3450100.zip) = 14152147
diff --git a/databases/sqlite3/files/patch-Makefile.in b/databases/sqlite3/files/patch-Makefile.in
index 47e20de23c2f..70aa8e8a281e 100644
--- a/databases/sqlite3/files/patch-Makefile.in
+++ b/databases/sqlite3/files/patch-Makefile.in
@@ -1,11 +1,11 @@
---- Makefile.in.orig	2021-04-11 09:08:25 UTC
+--- Makefile.in.orig	2022-11-26 11:17:35 UTC
 +++ Makefile.in
-@@ -1274,7 +1274,7 @@ valgrindfuzz:	fuzzcheck$(TEXT) $(FUZZDATA) sessionfuzz
+@@ -1299,7 +1299,7 @@ tcltest:	./testfixture$(TEXE)
  # The veryquick.test TCL tests.
  #
  tcltest:	./testfixture$(TEXE)
 -	./testfixture$(TEXE) $(TOP)/test/veryquick.test $(TESTOPTS)
 +	mkdir $(TOP)/testdir && touch $(TOP)/test-out.txt && chown nobody $(TOP)/testdir $(TOP)/test-out.txt && su -m nobody -c "./testfixture$(TEXE) $(TOP)/test/veryquick.test $(TESTOPTS)"
  
- # Minimal testing that runs in less than 3 minutes
- #
+ # Runs all the same tests cases as the "tcltest" target but uses
+ # the testrunner.tcl script to run them in multiple cores
diff --git a/databases/sqlite3/pkg-descr b/databases/sqlite3/pkg-descr
index 6fb7bc338cc0..6d1a2816c759 100644
--- a/databases/sqlite3/pkg-descr
+++ b/databases/sqlite3/pkg-descr
@@ -3,5 +3,3 @@ library can have SQL database access without running a separate RDBMS process.
 The distribution comes with a standalone command-line access program (sqlite3)
 that can be used to administer an SQLite database and which serves as an
 example of how to use the SQLite library.
-
-WWW: https://www.sqlite.org/
diff --git a/databases/sqlite3/pkg-descr-tea b/databases/sqlite3/pkg-descr-tea
new file mode 100644
index 000000000000..9de972fee282
--- /dev/null
+++ b/databases/sqlite3/pkg-descr-tea
@@ -0,0 +1,2 @@
+This is the SQLite extension for Tcl using the Tcl Extension
+Architecture (TEA).
diff --git a/databases/sqlite3/pkg-plist b/databases/sqlite3/pkg-plist
index 28f9704cc12f..f547f671f412 100644
--- a/databases/sqlite3/pkg-plist
+++ b/databases/sqlite3/pkg-plist
@@ -1,14 +1,15 @@
-bin/sqlite3
+%%NO_TEA%%bin/sqlite3
+%%NO_TEA%%bin/sqldiff
 %%TCL%%bin/sqlite3_analyzer
-include/sqlite3.h
-include/sqlite3ext.h
-%%STATIC%%lib/libsqlite3.a
-lib/libsqlite3.so
-lib/libsqlite3.so.0
-lib/libsqlite3.so.0.8.6
-libdata/pkgconfig/sqlite3.pc
-man/man1/sqlite3.1.gz
-%%TCL%%man/mann/sqlite3.%%TCLSUF%%.n.gz
+%%NO_TEA%%include/sqlite3.h
+%%NO_TEA%%include/sqlite3ext.h
+%%NO_TEA%%%%STATIC%%lib/libsqlite3.a
+%%NO_TEA%%lib/libsqlite3.so
+%%NO_TEA%%lib/libsqlite3.so.0
+%%NO_TEA%%lib/libsqlite3.so.0.8.6
+%%NO_TEA%%libdata/pkgconfig/sqlite3.pc
+%%NO_TEA%%share/man/man1/sqlite3.1.gz
+%%TCL%%share/man/mann/sqlite3.%%TCLSUF%%.n.gz
 %%TCL%%lib/%%TCLVER%%/sqlite3/libtclsqlite3.so
 %%TCL%%lib/%%TCLVER%%/sqlite3/pkgIndex.tcl
 %%TCL%%%%EXAMPLES%%share/examples/sqlite3/example.tcl
diff --git a/databases/sqlitebrowser/Makefile b/databases/sqlitebrowser/Makefile
index e0b0f1b7c336..a4a07ac9f409 100644
--- a/databases/sqlitebrowser/Makefile
+++ b/databases/sqlitebrowser/Makefile
@@ -1,13 +1,12 @@
-# Created by: loïc bartoletti <lbartoletti@FreeBSD.org>
-
 PORTNAME=	sqlitebrowser
 PORTVERSION=	3.12.1
-PORTREVISION=	5
+PORTREVISION=	7
 DISTVERSIONPREFIX=	v
 CATEGORIES=	databases
 
 MAINTAINER=	lbartoletti@FreeBSD.org
 COMMENT=	Visual tool to manage SQLite databases
+WWW=		https://sqlitebrowser.org/
 
 LICENSE=	MPL20 GPLv3
 LICENSE_COMB=	dual
@@ -19,11 +18,9 @@ LIB_DEPENDS=	libqscintilla2_qt5.so:devel/qscintilla2-qt5
 USES=		compiler:c++11-lang cmake desktop-file-utils gnome qt:5 sqlite
 CMAKE_ARGS+=	-DQT_INCLUDE_DIR=${QT_INCDIR} -DQT_LIBRARY_DIR=${QT_LIBDIR}
 USE_QT=		core concurrent gui network printsupport testlib widgets \
-		buildtools_build linguisttools_build qmake_build xml
+		buildtools:build linguisttools:build qmake:build xml
 USE_GITHUB=	yes
 
-INSTALLS_ICONS=	yes
-
 PORTSCOUT=	ignore:1
 
 post-patch:
diff --git a/databases/sqlitebrowser/pkg-descr b/databases/sqlitebrowser/pkg-descr
index 1ec6e04a5b3c..6adc59268284 100644
--- a/databases/sqlitebrowser/pkg-descr
+++ b/databases/sqlitebrowser/pkg-descr
@@ -6,5 +6,3 @@ using a set of wizards and a spreadsheet-like interface.
 This project has previous been known as "SQLite Browser" and "Database
 Browser for SQLite". "DB Browser for SQLite" will hopefully be the
 name that sticks. :)
-
-WWW: https://sqlitebrowser.org/
diff --git a/databases/sqliteconvert/Makefile b/databases/sqliteconvert/Makefile
index 219b58e60f87..1b5eb1334fe2 100644
--- a/databases/sqliteconvert/Makefile
+++ b/databases/sqliteconvert/Makefile
@@ -1,10 +1,12 @@
 PORTNAME=	sqliteconvert
 DISTVERSIONPREFIX=	VERSION_
 DISTVERSION=	0_1_2
+PORTREVISION=	1
 CATEGORIES=	databases
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Tools to convert SQLite3 schema files into documentation
+WWW=		https://kristaps.bsd.lv/sqliteconvert/
 
 LICENSE=	ISCL
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
@@ -14,6 +16,9 @@ RUN_DEPENDS=	dot:graphics/graphviz
 USE_GITHUB=	yes
 GH_ACCOUNT=	kristapsdz
 
+post-patch:
+	@${REINPLACE_CMD} -e 's|man/man1|share/man/man1|' ${WRKSRC}/Makefile
+
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/sqlite2html \
 		${STAGEDIR}${PREFIX}/bin/sqlite2dot
diff --git a/databases/sqliteconvert/pkg-descr b/databases/sqliteconvert/pkg-descr
index 4afe79713c8c..640c197637ef 100644
--- a/databases/sqliteconvert/pkg-descr
+++ b/databases/sqliteconvert/pkg-descr
@@ -3,5 +3,3 @@ documentation.  It includes sqlite2dot(1), which converts into a
 graphviz file; sqlite2html(1), which converts into an HTML5 fragment;
 and sqliteconvert(1), which pulls these tools together with some sane
 default templates.
-
-WWW: https://kristaps.bsd.lv/sqliteconvert/
diff --git a/databases/sqliteconvert/pkg-plist b/databases/sqliteconvert/pkg-plist
index d8f51de4e82d..668e17ebb060 100644
--- a/databases/sqliteconvert/pkg-plist
+++ b/databases/sqliteconvert/pkg-plist
@@ -1,7 +1,7 @@
 bin/sqlite2dot
 bin/sqlite2html
 bin/sqliteconvert
-man/man1/sqlite2dot.1.gz
-man/man1/sqlite2html.1.gz
-man/man1/sqliteconvert.1.gz
+share/man/man1/sqlite2dot.1.gz
+share/man/man1/sqlite2html.1.gz
+share/man/man1/sqliteconvert.1.gz
 %%DATADIR%%/schema.xml
diff --git a/databases/sqlitecpp/Makefile b/databases/sqlitecpp/Makefile
index 1c435e9350cd..93a45b55b1d6 100644
--- a/databases/sqlitecpp/Makefile
+++ b/databases/sqlitecpp/Makefile
@@ -1,10 +1,10 @@
 PORTNAME=	sqlitecpp
-DISTVERSION=	3.1.1-28
-DISTVERSIONSUFFIX=	-g0c46d86
+DISTVERSION=	3.3.1
 CATEGORIES=	databases devel
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	SQLiteC++: Easy to use C++ SQLite3 wrapper
+WWW=		https://github.com/SRombauts/SQLiteCpp
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
diff --git a/databases/sqlitecpp/distinfo b/databases/sqlitecpp/distinfo
index 9e0f4b726fa3..037ce61d2f47 100644
--- a/databases/sqlitecpp/distinfo
+++ b/databases/sqlitecpp/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1623289372
-SHA256 (SRombauts-SQLiteCpp-3.1.1-28-g0c46d86_GH0.tar.gz) = f7037c4726fae366988467b21d8c699211c6a19f051c5544653b4d413087dc7f
-SIZE (SRombauts-SQLiteCpp-3.1.1-28-g0c46d86_GH0.tar.gz) = 2431117
+TIMESTAMP = 1693200371
+SHA256 (SRombauts-SQLiteCpp-3.3.1_GH0.tar.gz) = 71f990f9fb4b004533b6859ce40729af823b87fe691dd99ca084a7fd40db54b9
+SIZE (SRombauts-SQLiteCpp-3.3.1_GH0.tar.gz) = 2624658
diff --git a/databases/sqlitecpp/pkg-descr b/databases/sqlitecpp/pkg-descr
index 0221061b0b31..d2eef6f89a65 100644
--- a/databases/sqlitecpp/pkg-descr
+++ b/databases/sqlitecpp/pkg-descr
@@ -1,4 +1,2 @@
 SQLiteC++ offers an encapsulation layer around the native C APIs of SQLite, with
 a few intuitive and well documented C++ classes.
-
-WWW: https://github.com/SRombauts/SQLiteCpp
diff --git a/databases/sqlitecpp/pkg-plist b/databases/sqlitecpp/pkg-plist
index 5bcbec25253a..d1e63ce5e17e 100644
--- a/databases/sqlitecpp/pkg-plist
+++ b/databases/sqlitecpp/pkg-plist
@@ -5,6 +5,7 @@ include/SQLiteCpp/Database.h
 include/SQLiteCpp/Exception.h
 include/SQLiteCpp/ExecuteMany.h
 include/SQLiteCpp/SQLiteCpp.h
+include/SQLiteCpp/SQLiteCppExport.h
 include/SQLiteCpp/Savepoint.h
 include/SQLiteCpp/Statement.h
 include/SQLiteCpp/Transaction.h
@@ -16,3 +17,4 @@ lib/cmake/SQLiteCpp/SQLiteCppTargets-%%CMAKE_BUILD_TYPE%%.cmake
 lib/cmake/SQLiteCpp/SQLiteCppTargets.cmake
 lib/libSQLiteCpp.so
 lib/libSQLiteCpp.so.0
+share/SQLiteCpp/package.xml
diff --git a/databases/sqlitemanager/Makefile b/databases/sqlitemanager/Makefile
index a16f246ddc43..3f4eef7a6c6a 100644
--- a/databases/sqlitemanager/Makefile
+++ b/databases/sqlitemanager/Makefile
@@ -1,5 +1,3 @@
-# Created by: Gea-Suan Lin <gslin@gslin.org>
-
 PORTNAME=	sqlitemanager
 PORTVERSION=	1.2.4
 CATEGORIES=	databases www
@@ -8,6 +6,7 @@ DISTNAME=	SQliteManager-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Multilingual web based tool to manage SQLite database
+WWW=		https://www.sqlitemanager.org/
 
 LICENSE=	GPLv2
 
diff --git a/databases/sqlitemanager/pkg-descr b/databases/sqlitemanager/pkg-descr
index 5e75734c8229..3087dec23f69 100644
--- a/databases/sqlitemanager/pkg-descr
+++ b/databases/sqlitemanager/pkg-descr
@@ -1,5 +1,3 @@
 SQLiteManager is a multilingual web based tool to manage SQLite
 database. The programming language used is: PHP4, but work fine with
 PHP5. Work just as well on a platform Linux as on Windows or MAC.
-
-WWW: http://www.sqlitemanager.org/
diff --git a/databases/sqliteodbc/Makefile b/databases/sqliteodbc/Makefile
index 6354ee18a22b..f17414096a8f 100644
--- a/databases/sqliteodbc/Makefile
+++ b/databases/sqliteodbc/Makefile
@@ -1,11 +1,11 @@
 PORTNAME=	sqliteodbc
-PORTVERSION=	0.9998
-PORTREVISION?=	0
+PORTVERSION=	0.99991
 CATEGORIES=	databases
 MASTER_SITES=	http://www.ch-werner.de/sqliteodbc/
 
-MAINTAINER?=	madpilot@FreeBSD.org
+MAINTAINER?=	ports@FreeBSD.org
 COMMENT?=	ODBC driver for SQLite 3
+WWW=		http://www.ch-werner.de/sqliteodbc/
 
 LICENSE=	SQLITEODBC
 LICENSE_NAME=	sqliteodbc own licensing terms (BSD style)
diff --git a/databases/sqliteodbc/distinfo b/databases/sqliteodbc/distinfo
index d1920d5cbb11..8496556225e6 100644
--- a/databases/sqliteodbc/distinfo
+++ b/databases/sqliteodbc/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1593159706
-SHA256 (sqliteodbc-0.9998.tar.gz) = fabcbec73f98d1a34911636c02c29fc64147d27516b142e8e132c68c05a6065b
-SIZE (sqliteodbc-0.9998.tar.gz) = 1000548
+TIMESTAMP = 1701347701
+SHA256 (sqliteodbc-0.99991.tar.gz) = 4d94adb8d3cde1fa94a28aeb0dfcc7be73145bcdfcdf3d5e225434db31dc8a5c
+SIZE (sqliteodbc-0.99991.tar.gz) = 1002929
diff --git a/databases/sqliteodbc/pkg-descr b/databases/sqliteodbc/pkg-descr
index e271e714a362..56ef7e314611 100644
--- a/databases/sqliteodbc/pkg-descr
+++ b/databases/sqliteodbc/pkg-descr
@@ -1,3 +1 @@
 ODBC driver for SQLite 2 and 3.
-
-WWW: http://www.ch-werner.de/sqliteodbc/
diff --git a/databases/sqlitestudio/Makefile b/databases/sqlitestudio/Makefile
index 77e044a76fd2..47c68477f6d2 100644
--- a/databases/sqlitestudio/Makefile
+++ b/databases/sqlitestudio/Makefile
@@ -1,38 +1,51 @@
-# Created by: Yuri Victorovich <yuri@rawbw.com>
-
 PORTNAME=	sqlitestudio
-DISTVERSION=	3.3.3
+DISTVERSION=	3.4.4
 PORTREVISION=	1
 CATEGORIES=	databases
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	SQLite database GUI manager
+WWW=		https://sqlitestudio.pl/
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/../LICENSE
 
+USES=		compiler:c++17-lang gl gmake ncurses qmake qt:5 readline sqlite
+USE_LDCONFIG=	yes
+USE_QT=		core concurrent declarative gui network script sql sql-sqlite3:run svg widgets xml \
+		uitools buildtools:build linguisttools:build
+USE_GL=		gl
+
+USE_GITHUB=	yes
+GH_ACCOUNT=	pawelsalawa
+
 OPTIONS_GROUP=		PLUGINS
 OPTIONS_DEFAULT=	${OPTIONS_GROUP_PLUGINS}
 OPTIONS_SUB=		yes
 PLUGINS_DESC=			Install plugins:
 
-ALL_PLUGINS=		CsvImport CsvExport DbSqliteCipher HtmlExport JsonExport MultiEditorImage PdfExport Printing \
-			RegExpImport SqlFormatterSimple SqlExport SqlEnterpriseFormatter XmlExport
+ALL_PLUGINS=		ConfigMigration CsvExport CsvImport DbAndroid DbSqliteCipher \
+			DbSqliteWx FusionDarkStyle HtmlExport JsonExport MultiEditorImage \
+			PdfExport Printing PythonSyntaxHighlighter RegExpImport ScriptingPython \
+			ScriptingTcl SqlEnterpriseFormatter SqlExport SqlFormatterSimple XmlExport
+
 .for p in ${ALL_PLUGINS}
 OPTIONS_GROUP_PLUGINS+=		PLUGIN${p:C/([A-Z])/_\1/g:tu}
 PLUGIN${p:C/([A-Z])/_\1/g:tu}_DESC=		${p} plugin
 PLUGIN${p:C/([A-Z])/_\1/g:tu}_VARS=	PLUGIN_DIRS+=${p}
 .endfor
 
-PLUGIN_DB_SQLITE_CIPHER_USES=		ssl
-PLUGIN_PRINTING_USE=			QT=printsupport
+PLUGIN_DB_SQLITE_CIPHER_USES=				ssl
+PLUGIN_PRINTING_USE=					QT=printsupport
 
-USES=		compiler:c++17-lang gl gmake ncurses qmake qt:5 readline sqlite
-USE_GITHUB=	yes
-GH_ACCOUNT=	pawelsalawa
-USE_QT=		core concurrent gui network script sql sql-sqlite3_run svg widgets xml \
-		uitools buildtools_build linguisttools_build
-USE_GL=		gl
+PLUGIN_PLUGIN_PYTHON_SYNTAX_HIGHLIGHTER_USES=		python
+PLUGIN_PLUGIN_PYTHON_SYNTAX_HIGHLIGHTER_CXXFLAGS=	-I${PYTHON_INCLUDEDIR}
+
+PLUGIN_SCRIPTING_PYTHON_USES=				python
+PLUGIN_SCRIPTING_PYTHON_CXXFLAGS=			-I${PYTHON_INCLUDEDIR}
+
+PLUGIN_SCRIPTING_TCL_USES=				tcl:87
+PLUGIN_SCRIPTING_TCL_CXXFLAGS=				-I${TCL_INCLUDEDIR}
 
 WRKSRC_SUBDIR=	SQLiteStudio3
 
@@ -42,12 +55,10 @@ DESKTOP_ENTRIES=	"SQLite database manager" \
 			"Advanced SQLite database manager" \
 			"SQLiteStudio" \
 			"SQLiteStudio" \
-			"Database;Viewer;DataVisualization;Development;Qt;" \
+			"Viewer;DataVisualization;Development;Qt;" \
 			""
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|/usr/|${LOCALBASE}/|' \
-		${WRKSRC}/dirs.pri
 	@${REINPLACE_CMD} -e 's|pluginDirs += QDir(CFG->getConfigDir()).absoluteFilePath("plugins");|pluginDirs += "${LOCALBASE}/lib/sqlitestudio";|' \
 		${WRKSRC}/coreSQLiteStudio/services/impl/pluginmanagerimpl.cpp
 
diff --git a/databases/sqlitestudio/distinfo b/databases/sqlitestudio/distinfo
index c94a7cc7bb84..6d307e595f59 100644
--- a/databases/sqlitestudio/distinfo
+++ b/databases/sqlitestudio/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1619063721
-SHA256 (pawelsalawa-sqlitestudio-3.3.3_GH0.tar.gz) = f234e1ea87d27e80a1794f86d32116ebd8919d51be63d35a7d0816a77115ce31
-SIZE (pawelsalawa-sqlitestudio-3.3.3_GH0.tar.gz) = 8863232
+TIMESTAMP = 1680909909
+SHA256 (pawelsalawa-sqlitestudio-3.4.4_GH0.tar.gz) = 4a0b73401f8fc0a2a7f095dfcb487a83b3643adfe88fb7b53532bc6bc4ae04f1
+SIZE (pawelsalawa-sqlitestudio-3.4.4_GH0.tar.gz) = 16187828
diff --git a/databases/sqlitestudio/files/patch-sqlitestudiocli_sqlitestudiocli.pro b/databases/sqlitestudio/files/patch-sqlitestudiocli_sqlitestudiocli.pro
deleted file mode 100644
index a09f7e92c3ac..000000000000
--- a/databases/sqlitestudio/files/patch-sqlitestudiocli_sqlitestudiocli.pro
+++ /dev/null
@@ -1,11 +0,0 @@
---- sqlitestudiocli/sqlitestudiocli.pro.orig	2015-11-24 19:09:31 UTC
-+++ sqlitestudiocli/sqlitestudiocli.pro
-@@ -74,7 +74,7 @@ win32: {
- }
- 
- unix: {
--    LIBS += -lreadline -lcurses
-+    LIBS += -lreadline -lncurses
- }
- 
- HEADERS += \
diff --git a/databases/sqlitestudio/pkg-descr b/databases/sqlitestudio/pkg-descr
index dfb67eb55718..b885de94b95e 100644
--- a/databases/sqlitestudio/pkg-descr
+++ b/databases/sqlitestudio/pkg-descr
@@ -7,5 +7,3 @@ SQLiteStudio is a SQLite database manager with the following features:
   in editor windows, on-the-fly syntax checking, and more
 * Unicode support
 * Configurable colors, fonts and shortcuts
-
-WWW: https://sqlitestudio.pl/
diff --git a/databases/sqlitestudio/pkg-plist b/databases/sqlitestudio/pkg-plist
index f22ad823739e..97a023d9f81d 100644
--- a/databases/sqlitestudio/pkg-plist
+++ b/databases/sqlitestudio/pkg-plist
@@ -9,17 +9,24 @@ lib/libguiSQLiteStudio.so
 lib/libguiSQLiteStudio.so.1
 lib/libguiSQLiteStudio.so.1.0
 lib/libguiSQLiteStudio.so.1.0.0
-%%PLUGIN_CSV_IMPORT%%lib/sqlitestudio/libCsvImport.so
+%%PLUGIN_CONFIG_MIGRATION%%lib/sqlitestudio/libConfigMigration.so
 %%PLUGIN_CSV_EXPORT%%lib/sqlitestudio/libCsvExport.so
+%%PLUGIN_CSV_IMPORT%%lib/sqlitestudio/libCsvImport.so
+%%PLUGIN_DB_ANDROID%%lib/sqlitestudio/libDbAndroid.so
 %%PLUGIN_DB_SQLITE_CIPHER%%lib/sqlitestudio/libDbSqliteCipher.so
+%%PLUGIN_DB_SQLITE_WX%%lib/sqlitestudio/libDbSqliteWx.so
+%%PLUGIN_FUSION_DARK_STYLE%%lib/sqlitestudio/libFusionDarkStyle.so
 %%PLUGIN_HTML_EXPORT%%lib/sqlitestudio/libHtmlExport.so
 %%PLUGIN_JSON_EXPORT%%lib/sqlitestudio/libJsonExport.so
 %%PLUGIN_MULTI_EDITOR_IMAGE%%lib/sqlitestudio/libMultiEditorImage.so
 %%PLUGIN_PDF_EXPORT%%lib/sqlitestudio/libPdfExport.so
 %%PLUGIN_PRINTING%%lib/sqlitestudio/libPrinting.so
+%%PLUGIN_PYTHON_SYNTAX_HIGHLIGHTER%%lib/sqlitestudio/libPythonSyntaxHighlighter.so
 %%PLUGIN_REG_EXP_IMPORT%%lib/sqlitestudio/libRegExpImport.so
+%%PLUGIN_SCRIPTING_PYTHON%%lib/sqlitestudio/libScriptingPython.so
+%%PLUGIN_SCRIPTING_TCL%%lib/sqlitestudio/libScriptingTcl.so
 %%PLUGIN_SQL_FORMATTER_SIMPLE%%lib/sqlitestudio/libSqlFormatterSimple.so
-%%PLUGIN_SQL_EXPORT%%lib/sqlitestudio/libSqlExport.so
 %%PLUGIN_SQL_ENTERPRISE_FORMATTER%%lib/sqlitestudio/libSqlEnterpriseFormatter.so
+%%PLUGIN_SQL_EXPORT%%lib/sqlitestudio/libSqlExport.so
 %%PLUGIN_XML_EXPORT%%lib/sqlitestudio/libXmlExport.so
 share/icons/hicolor/scalable/apps/SQLiteStudio.svg
diff --git a/databases/sqlrelay/Makefile b/databases/sqlrelay/Makefile
index 7789c1f5e85d..5d9dc2572629 100644
--- a/databases/sqlrelay/Makefile
+++ b/databases/sqlrelay/Makefile
@@ -1,12 +1,12 @@
-# Created by: Akinori MUSHA aka knu <knu@idaemons.org>
-
 PORTNAME=	${SQLRELAY_PORTNAME}
 PORTVERSION=	${SQLRELAY_PORTVERSION}
+PORTREVISION=	1
 CATEGORIES=	databases
 MASTER_SITES=	SF
 
 MAINTAINER=	pi@FreeBSD.org
 COMMENT=	Persistent DB connection pooling/proxying/load balancing system
+WWW=		https://sqlrelay.sourceforge.net/
 
 LICENSE=	LGPL20
 
@@ -20,6 +20,7 @@ USES=		gmake iconv libedit libtool pathfix python readline ssl
 PATHFIX_MAKEFILEIN=	Makefile
 CPPFLAGS+=	-I${LOCALBASE}/include
 GNU_CONFIGURE=	yes
+GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
 CONFIGURE_ARGS=		${SQLRELAY_CONFIGURE_ARGS} \
 			--disable-tcl \
 			--disable-java \
diff --git a/databases/sqlrelay/Makefile.common b/databases/sqlrelay/Makefile.common
index 39429944c54d..a3af558ff44d 100644
--- a/databases/sqlrelay/Makefile.common
+++ b/databases/sqlrelay/Makefile.common
@@ -1,5 +1,5 @@
 SQLRELAY_PORTNAME=	sqlrelay
-SQLRELAY_PORTVERSION=	1.7.0
+SQLRELAY_PORTVERSION=	1.9.3
 
 SQLRELAY_PORTDIR=	databases/${SQLRELAY_PORTNAME}
 SQLRELAY_WRKSRC_CMD=	cd ${PORTSDIR}/${SQLRELAY_PORTDIR} && ${MAKE} -V WRKSRC
diff --git a/databases/sqlrelay/distinfo b/databases/sqlrelay/distinfo
index b59ed7295865..9236a51eda7c 100644
--- a/databases/sqlrelay/distinfo
+++ b/databases/sqlrelay/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1592142050
-SHA256 (sqlrelay-1.7.0.tar.gz) = db2d16e1ef627888f95c3814b116e822340d8c2631cd2d663a2d6f49a2be1a2b
-SIZE (sqlrelay-1.7.0.tar.gz) = 4644728
+TIMESTAMP = 1679405999
+SHA256 (sqlrelay-1.9.3.tar.gz) = f3f419591af839bf40509a6c2d76de7b2ea188f66e9d606692803bd7fa167b7e
+SIZE (sqlrelay-1.9.3.tar.gz) = 4903142
diff --git a/databases/sqlrelay/pkg-descr b/databases/sqlrelay/pkg-descr
index 54d7b09040fe..ea7a1607a855 100644
--- a/databases/sqlrelay/pkg-descr
+++ b/databases/sqlrelay/pkg-descr
@@ -10,5 +10,3 @@ speeding up database-driven web-based applications, accessing
 databases from unsupported platforms, migrating between databases,
 distributing access to replicated databases and throttling database
 access.
-
-WWW: http://sqlrelay.sourceforge.net/
diff --git a/databases/sqlrelay/pkg-plist b/databases/sqlrelay/pkg-plist
index 7ffe23762895..33dac409b1e3 100644
--- a/databases/sqlrelay/pkg-plist
+++ b/databases/sqlrelay/pkg-plist
@@ -3,9 +3,10 @@
 %%FREETDS%%libexec/sqlrelay/sqlrconnection_freetds.so
 %%MYSQL%%libexec/sqlrelay/sqlrconnection_mysql.so
 %%ODBC%%lib/libsqlrodbc.so
-%%ODBC%%lib/libsqlrodbc.so.5
-%%ODBC%%lib/libsqlrodbc.so.5.0.0
+%%ODBC%%lib/libsqlrodbc.so.7
+%%ODBC%%lib/libsqlrodbc.so.7.0.0
 %%ODBC%%libexec/sqlrelay/sqlrconnection_odbc.so
+%%ODBC%%libexec/sqlrelay/sqlrpwdenc_aes128.so
 %%PGSQL%%libexec/sqlrelay/sqlrconnection_postgresql.so
 %%SQLITE3%%libexec/sqlrelay/sqlrconnection_sqlite.so
 @dir %%ETCDIR%%
@@ -31,6 +32,20 @@ bin/sqlrsh
 etc/rc.d/sqlrcachemanager
 etc/rc.d/sqlrelay
 etc/sqlrelay/sqlrelay.xsd
+include/sqlrelay/private/sqlrexport.h
+include/sqlrelay/private/sqlrexportcsv.h
+include/sqlrelay/private/sqlrexportcsvincludes.h
+include/sqlrelay/private/sqlrexportincludes.h
+include/sqlrelay/private/sqlrexportxml.h
+include/sqlrelay/private/sqlrexportxmlincludes.h
+include/sqlrelay/private/sqlrimport.h
+include/sqlrelay/private/sqlrimportcsv.h
+include/sqlrelay/private/sqlrimportcsvincludes.h
+include/sqlrelay/private/sqlrimportincludes.h
+include/sqlrelay/private/sqlrimportxml.h
+include/sqlrelay/private/sqlrimportxmlincludes.h
+include/sqlrelay/private/sqlrresultsetdomnode.h
+include/sqlrelay/private/sqlrresultsetdomnodeincludes.h
 include/sqlrelay/private/sqlrauth.h
 include/sqlrelay/private/sqlrauths.h
 include/sqlrelay/private/sqlrbindvariabletranslation.h
@@ -90,24 +105,31 @@ include/sqlrelay/private/sqlruserpasswordcredentials.h
 include/sqlrelay/private/sqlrutilincludes.h
 include/sqlrelay/sqlrclient.h
 include/sqlrelay/sqlrclientwrapper.h
+include/sqlrelay/sqlrexport.h
+include/sqlrelay/sqlrexportcsv.h
+include/sqlrelay/sqlrexportxml.h
+include/sqlrelay/sqlrimport.h
+include/sqlrelay/sqlrimportcsv.h
+include/sqlrelay/sqlrimportxml.h
+include/sqlrelay/sqlrresultsetdomnode.h
 include/sqlrelay/sqlrserver.h
 include/sqlrelay/sqlrutil.h
 lib/libsqlrclient.a
 lib/libsqlrclient.so
-lib/libsqlrclient.so.5
-lib/libsqlrclient.so.5.0.0
+lib/libsqlrclient.so.7
+lib/libsqlrclient.so.7.0.0
 lib/libsqlrclientwrapper.a
 lib/libsqlrclientwrapper.so
-lib/libsqlrclientwrapper.so.5
-lib/libsqlrclientwrapper.so.5.0.0
+lib/libsqlrclientwrapper.so.7
+lib/libsqlrclientwrapper.so.7.0.0
 lib/libsqlrserver.a
 lib/libsqlrserver.so
-lib/libsqlrserver.so.10
-lib/libsqlrserver.so.10.0.0
+lib/libsqlrserver.so.12
+lib/libsqlrserver.so.12.0.0
 lib/libsqlrutil.a
 lib/libsqlrutil.so
-lib/libsqlrutil.so.10
-lib/libsqlrutil.so.10.0.0
+lib/libsqlrutil.so.12
+lib/libsqlrutil.so.12.0.0
 libdata/pkgconfig/sqlrelay-c++.pc
 libdata/pkgconfig/sqlrelay-c.pc
 libexec/sqlrelay/sqlrauth_database.so
@@ -155,14 +177,14 @@ libexec/sqlrelay/sqlrschedule_cron_userlist.so
 libexec/sqlrelay/sqlrtranslation_normalize.so
 libexec/sqlrelay/sqlrtranslation_patterns.so
 libexec/sqlrelay/sqlrtrigger_replay.so
-man/man1/sqlr-export.1.gz
-man/man1/sqlr-import.1.gz
-man/man1/sqlrsh.1.gz
-man/man8/sqlr-cachemanager.8.gz
-man/man8/sqlr-connection.8.gz
-man/man8/sqlr-listener.8.gz
-man/man8/sqlr-pwdenc.8.gz
-man/man8/sqlr-scaler.8.gz
-man/man8/sqlr-start.8.gz
-man/man8/sqlr-status.8.gz
-man/man8/sqlr-stop.8.gz
+share/man/man1/sqlr-export.1.gz
+share/man/man1/sqlr-import.1.gz
+share/man/man1/sqlrsh.1.gz
+share/man/man8/sqlr-cachemanager.8.gz
+share/man/man8/sqlr-connection.8.gz
+share/man/man8/sqlr-listener.8.gz
+share/man/man8/sqlr-pwdenc.8.gz
+share/man/man8/sqlr-scaler.8.gz
+share/man/man8/sqlr-start.8.gz
+share/man/man8/sqlr-status.8.gz
+share/man/man8/sqlr-stop.8.gz
diff --git a/databases/sqlx-cli/Makefile b/databases/sqlx-cli/Makefile
new file mode 100644
index 000000000000..ef1f56cac2c8
--- /dev/null
+++ b/databases/sqlx-cli/Makefile
@@ -0,0 +1,459 @@
+PORTNAME=	sqlx
+DISTVERSIONPREFIX=	v
+DISTVERSION=	0.7.4
+PORTREVISION=	1
+CATEGORIES=	databases
+PKGNAMESUFFIX=	-cli
+
+MAINTAINER=	yuri@FreeBSD.org
+COMMENT=	Rust SQL Toolkit with support for PostgreSQL, MySQL, SQLite, MSSQL
+WWW=		https://github.com/launchbadge/sqlx
+
+LICENSE=	APACHE20 MIT
+LICENSE_COMB=	dual
+LICENSE_FILE_APACHE20=	${WRKSRC}/LICENSE-APACHE
+LICENSE_FILE_MIT=	${WRKSRC}/LICENSE-MIT
+
+USES=		cargo ssl
+
+USE_GITHUB=	yes
+GH_ACCOUNT=	launchbadge
+
+CARGO_CRATES=	addr2line-0.21.0 \
+		adler-1.0.2 \
+		ahash-0.7.8 \
+		ahash-0.8.11 \
+		aho-corasick-1.1.2 \
+		allocator-api2-0.2.16 \
+		android-tzdata-0.1.1 \
+		android_system_properties-0.1.5 \
+		anes-0.1.6 \
+		ansi_term-0.12.1 \
+		anstream-0.6.13 \
+		anstyle-1.0.6 \
+		anstyle-parse-0.2.3 \
+		anstyle-query-1.0.2 \
+		anstyle-wincon-3.0.2 \
+		anyhow-1.0.80 \
+		argon2-0.4.1 \
+		arrayvec-0.7.4 \
+		assert_cmd-2.0.14 \
+		async-attributes-1.1.2 \
+		async-channel-1.9.0 \
+		async-channel-2.2.0 \
+		async-executor-1.8.0 \
+		async-global-executor-2.4.1 \
+		async-io-1.13.0 \
+		async-io-2.3.2 \
+		async-lock-2.8.0 \
+		async-lock-3.3.0 \
+		async-std-1.12.0 \
+		async-task-4.7.0 \
+		async-trait-0.1.77 \
+		atoi-2.0.0 \
+		atomic-waker-1.1.2 \
+		atty-0.2.14 \
+		autocfg-1.1.0 \
+		axum-0.5.17 \
+		axum-core-0.2.9 \
+		axum-macros-0.2.3 \
+		backoff-0.4.0 \
+		backtrace-0.3.69 \
+		base64-0.13.1 \
+		base64-0.21.7 \
+		base64ct-1.6.0 \
+		basic-toml-0.1.8 \
+		bigdecimal-0.3.1 \
+		bit-vec-0.6.3 \
+		bitflags-1.3.2 \
+		bitflags-2.4.2 \
+		bitvec-1.0.1 \
+		blake2-0.10.6 \
+		block-buffer-0.10.4 \
+		blocking-1.5.1 \
+		borsh-1.3.1 \
+		borsh-derive-1.3.1 \
+		bstr-1.9.1 \
+		bumpalo-3.15.4 \
+		bytecheck-0.6.12 \
+		bytecheck_derive-0.6.12 \
+		byteorder-1.5.0 \
+		bytes-1.5.0 \
+		camino-1.1.6 \
+		cargo-platform-0.1.7 \
+		cargo_metadata-0.14.2 \
+		cassowary-0.3.0 \
+		cast-0.3.0 \
+		cc-1.0.90 \
+		cfg-if-1.0.0 \
+		cfg_aliases-0.1.1 \
+		chrono-0.4.35 \
+		ciborium-0.2.2 \
+		ciborium-io-0.2.2 \
+		ciborium-ll-0.2.2 \
+		clap-2.34.0 \
+		clap-4.5.2 \
+		clap_builder-4.5.2 \
+		clap_complete-4.5.1 \
+		clap_derive-4.5.0 \
+		clap_lex-0.7.0 \
+		clipboard-win-4.5.0 \
+		colorchoice-1.0.0 \
+		concurrent-queue-2.4.0 \
+		console-0.15.8 \
+		const-oid-0.9.6 \
+		core-foundation-0.9.4 \
+		core-foundation-sys-0.8.6 \
+		cpufeatures-0.2.12 \
+		crc-3.0.1 \
+		crc-catalog-2.4.0 \
+		criterion-0.5.1 \
+		criterion-plot-0.5.0 \
+		crossbeam-deque-0.8.5 \
+		crossbeam-epoch-0.9.18 \
+		crossbeam-queue-0.3.11 \
+		crossbeam-utils-0.8.19 \
+		crossterm-0.25.0 \
+		crossterm_winapi-0.9.1 \
+		crunchy-0.2.2 \
+		crypto-common-0.1.6 \
+		darling-0.20.8 \
+		darling_core-0.20.8 \
+		darling_macro-0.20.8 \
+		der-0.7.8 \
+		deranged-0.3.11 \
+		difflib-0.4.0 \
+		digest-0.10.7 \
+		dirs-next-2.0.0 \
+		dirs-sys-next-0.1.2 \
+		doc-comment-0.3.3 \
+		dotenvy-0.15.7 \
+		downcast-0.11.0 \
+		either-1.10.0 \
+		encode_unicode-0.3.6 \
+		encoding_rs-0.8.33 \
+		endian-type-0.1.2 \
+		env_filter-0.1.0 \
+		env_logger-0.11.3 \
+		equivalent-1.0.1 \
+		errno-0.3.8 \
+		error-code-2.3.1 \
+		etcetera-0.8.0 \
+		event-listener-2.5.3 \
+		event-listener-4.0.3 \
+		event-listener-5.2.0 \
+		event-listener-strategy-0.4.0 \
+		event-listener-strategy-0.5.0 \
+		fastrand-1.9.0 \
+		fastrand-2.0.1 \
+		fd-lock-3.0.13 \
+		filetime-0.2.23 \
+		finl_unicode-1.2.0 \
+		float-cmp-0.9.0 \
+		flume-0.11.0 \
+		fnv-1.0.7 \
+		foreign-types-0.3.2 \
+		foreign-types-shared-0.1.1 \
+		form_urlencoded-1.2.1 \
+		fragile-2.0.0 \
+		funty-2.0.0 \
+		futures-0.3.30 \
+		futures-channel-0.3.30 \
+		futures-core-0.3.30 \
+		futures-executor-0.3.30 \
+		futures-intrusive-0.5.0 \
+		futures-io-0.3.30 \
+		futures-lite-1.13.0 \
+		futures-lite-2.2.0 \
+		futures-macro-0.3.30 \
+		futures-sink-0.3.30 \
+		futures-task-0.3.30 \
+		futures-util-0.3.30 \
+		generic-array-0.14.7 \
+		getrandom-0.2.12 \
+		gimli-0.28.1 \
+		glob-0.3.1 \
+		gloo-timers-0.2.6 \
+		half-2.4.0 \
+		hashbrown-0.12.3 \
+		hashbrown-0.14.3 \
+		hashlink-0.8.4 \
+		heck-0.3.3 \
+		heck-0.4.1 \
+		hermit-abi-0.1.19 \
+		hermit-abi-0.3.9 \
+		hex-0.4.3 \
+		hkdf-0.12.4 \
+		hmac-0.12.1 \
+		home-0.5.9 \
+		http-0.2.12 \
+		http-body-0.4.6 \
+		http-range-header-0.3.1 \
+		httparse-1.8.0 \
+		httpdate-1.0.3 \
+		humantime-2.1.0 \
+		hyper-0.14.28 \
+		iana-time-zone-0.1.60 \
+		iana-time-zone-haiku-0.1.2 \
+		ident_case-1.0.1 \
+		idna-0.4.0 \
+		idna-0.5.0 \
+		if_chain-1.0.2 \
+		indexmap-1.9.3 \
+		indexmap-2.2.5 \
+		instant-0.1.12 \
+		io-lifetimes-1.0.11 \
+		ipnetwork-0.20.0 \
+		is-terminal-0.4.12 \
+		itertools-0.10.5 \
+		itertools-0.12.1 \
+		itoa-1.0.10 \
+		js-sys-0.3.69 \
+		kv-log-macro-1.0.7 \
+		lazy_static-1.4.0 \
+		libc-0.2.153 \
+		libm-0.2.8 \
+		libredox-0.0.1 \
+		libsqlite3-sys-0.27.0 \
+		linux-raw-sys-0.3.8 \
+		linux-raw-sys-0.4.13 \
+		lock_api-0.4.11 \
+		log-0.4.21 \
+		mac_address-1.1.5 \
+		matchit-0.5.0 \
+		md-5-0.10.6 \
+		memchr-2.7.1 \
+		memoffset-0.6.5 \
+		mime-0.3.17 \
+		minimal-lexical-0.2.1 \
+		miniz_oxide-0.7.2 \
+		mio-0.8.11 \
+		mockall-0.11.4 \
+		mockall_derive-0.11.4 \
+		native-tls-0.2.11 \
+		nibble_vec-0.1.0 \
+		nix-0.23.2 \
+		nom-7.1.3 \
+		normalize-line-endings-0.3.0 \
+		num-bigint-0.4.4 \
+		num-bigint-dig-0.8.4 \
+		num-conv-0.1.0 \
+		num-integer-0.1.46 \
+		num-iter-0.1.44 \
+		num-traits-0.2.18 \
+		num_cpus-1.16.0 \
+		object-0.32.2 \
+		once_cell-1.19.0 \
+		oorandom-11.1.3 \
+		openssl-0.10.64 \
+		openssl-macros-0.1.1 \
+		openssl-probe-0.1.5 \
+		openssl-src-300.2.3+3.2.1 \
+		openssl-sys-0.9.101 \
+		parking-2.2.0 \
+		parking_lot-0.12.1 \
+		parking_lot_core-0.9.9 \
+		password-hash-0.4.2 \
+		paste-1.0.14 \
+		pem-rfc7468-0.7.0 \
+		percent-encoding-2.3.1 \
+		pin-project-1.1.5 \
+		pin-project-internal-1.1.5 \
+		pin-project-lite-0.2.13 \
+		pin-utils-0.1.0 \
+		piper-0.2.1 \
+		pkcs1-0.7.5 \
+		pkcs8-0.10.2 \
+		pkg-config-0.3.30 \
+		plotters-0.3.5 \
+		plotters-backend-0.3.5 \
+		plotters-svg-0.3.5 \
+		polling-2.8.0 \
+		polling-3.5.0 \
+		powerfmt-0.2.0 \
+		ppv-lite86-0.2.17 \
+		predicates-2.1.5 \
+		predicates-3.1.0 \
+		predicates-core-1.0.6 \
+		predicates-tree-1.0.9 \
+		proc-macro-crate-3.1.0 \
+		proc-macro-error-1.0.4 \
+		proc-macro-error-attr-1.0.4 \
+		proc-macro2-1.0.78 \
+		promptly-0.3.1 \
+		ptr_meta-0.1.4 \
+		ptr_meta_derive-0.1.4 \
+		quote-1.0.35 \
+		radium-0.7.0 \
+		radix_trie-0.2.1 \
+		rand-0.8.5 \
+		rand_chacha-0.3.1 \
+		rand_core-0.6.4 \
+		rand_xoshiro-0.6.0 \
+		rayon-1.9.0 \
+		rayon-core-1.12.1 \
+		redox_syscall-0.4.1 \
+		redox_users-0.4.4 \
+		regex-1.10.3 \
+		regex-automata-0.4.6 \
+		regex-syntax-0.8.2 \
+		rend-0.4.2 \
+		ring-0.17.8 \
+		rkyv-0.7.44 \
+		rkyv_derive-0.7.44 \
+		rsa-0.9.6 \
+		rust_decimal-1.34.3 \
+		rustc-demangle-0.1.23 \
+		rustix-0.37.27 \
+		rustix-0.38.31 \
+		rustls-0.21.10 \
+		rustls-pemfile-1.0.4 \
+		rustls-webpki-0.101.7 \
+		rustyline-9.1.2 \
+		ryu-1.0.17 \
+		same-file-1.0.6 \
+		schannel-0.1.23 \
+		scopeguard-1.2.0 \
+		sct-0.7.1 \
+		seahash-4.1.0 \
+		security-framework-2.9.2 \
+		security-framework-sys-2.9.1 \
+		semver-1.0.22 \
+		serde-1.0.197 \
+		serde_derive-1.0.197 \
+		serde_json-1.0.114 \
+		serde_urlencoded-0.7.1 \
+		serde_with-2.3.3 \
+		serde_with_macros-2.3.3 \
+		sha1-0.10.6 \
+		sha2-0.10.8 \
+		signal-hook-0.3.17 \
+		signal-hook-mio-0.2.3 \
+		signal-hook-registry-1.4.1 \
+		signature-2.2.0 \
+		simdutf8-0.1.4 \
+		slab-0.4.9 \
+		smallvec-1.13.1 \
+		socket2-0.4.10 \
+		socket2-0.5.6 \
+		spin-0.5.2 \
+		spin-0.9.8 \
+		spki-0.7.3 \
+		sqlformat-0.2.3 \
+		str-buf-1.0.6 \
+		stringprep-0.1.4 \
+		strsim-0.8.0 \
+		strsim-0.10.0 \
+		strsim-0.11.0 \
+		structopt-0.3.26 \
+		structopt-derive-0.4.18 \
+		subtle-2.5.0 \
+		syn-1.0.109 \
+		syn-2.0.52 \
+		syn_derive-0.1.8 \
+		sync_wrapper-0.1.2 \
+		tap-1.0.1 \
+		tempfile-3.10.1 \
+		termcolor-1.4.1 \
+		termtree-0.4.1 \
+		textwrap-0.11.0 \
+		thiserror-1.0.57 \
+		thiserror-impl-1.0.57 \
+		time-0.3.34 \
+		time-core-0.1.2 \
+		time-macros-0.2.17 \
+		tinytemplate-1.2.1 \
+		tinyvec-1.6.0 \
+		tinyvec_macros-0.1.1 \
+		tokio-1.36.0 \
+		tokio-macros-2.2.0 \
+		tokio-stream-0.1.14 \
+		toml_datetime-0.6.5 \
+		toml_edit-0.21.1 \
+		tower-0.4.13 \
+		tower-http-0.3.5 \
+		tower-layer-0.3.2 \
+		tower-service-0.3.2 \
+		tracing-0.1.40 \
+		tracing-attributes-0.1.27 \
+		tracing-core-0.1.32 \
+		try-lock-0.2.5 \
+		trybuild-1.0.89 \
+		tui-0.19.0 \
+		typenum-1.17.0 \
+		unicode-bidi-0.3.15 \
+		unicode-ident-1.0.12 \
+		unicode-normalization-0.1.23 \
+		unicode-segmentation-1.11.0 \
+		unicode-width-0.1.11 \
+		unicode_categories-0.1.1 \
+		untrusted-0.9.0 \
+		url-2.5.0 \
+		urlencoding-2.1.3 \
+		utf8parse-0.2.1 \
+		uuid-1.7.0 \
+		validator-0.16.1 \
+		validator_derive-0.16.0 \
+		validator_types-0.16.0 \
+		value-bag-1.8.0 \
+		vcpkg-0.2.15 \
+		vec_map-0.8.2 \
+		version_check-0.9.4 \
+		wait-timeout-0.2.0 \
+		waker-fn-1.1.1 \
+		walkdir-2.5.0 \
+		want-0.3.1 \
+		wasi-0.11.0+wasi-snapshot-preview1 \
+		wasite-0.1.0 \
+		wasm-bindgen-0.2.92 \
+		wasm-bindgen-backend-0.2.92 \
+		wasm-bindgen-futures-0.4.42 \
+		wasm-bindgen-macro-0.2.92 \
+		wasm-bindgen-macro-support-0.2.92 \
+		wasm-bindgen-shared-0.2.92 \
+		web-sys-0.3.69 \
+		webpki-roots-0.25.4 \
+		whoami-1.5.1 \
+		winapi-0.3.9 \
+		winapi-i686-pc-windows-gnu-0.4.0 \
+		winapi-util-0.1.6 \
+		winapi-x86_64-pc-windows-gnu-0.4.0 \
+		windows-core-0.52.0 \
+		windows-sys-0.48.0 \
+		windows-sys-0.52.0 \
+		windows-targets-0.48.5 \
+		windows-targets-0.52.4 \
+		windows_aarch64_gnullvm-0.48.5 \
+		windows_aarch64_gnullvm-0.52.4 \
+		windows_aarch64_msvc-0.48.5 \
+		windows_aarch64_msvc-0.52.4 \
+		windows_i686_gnu-0.48.5 \
+		windows_i686_gnu-0.52.4 \
+		windows_i686_msvc-0.48.5 \
+		windows_i686_msvc-0.52.4 \
+		windows_x86_64_gnu-0.48.5 \
+		windows_x86_64_gnu-0.52.4 \
+		windows_x86_64_gnullvm-0.48.5 \
+		windows_x86_64_gnullvm-0.52.4 \
+		windows_x86_64_msvc-0.48.5 \
+		windows_x86_64_msvc-0.52.4 \
+		winnow-0.5.40 \
+		wyz-0.5.1 \
+		zerocopy-0.7.32 \
+		zerocopy-derive-0.7.32 \
+		zeroize-1.7.0
+CARGO_BUILD_ARGS=	--package=sqlx-cli
+CARGO_INSTALL_PATH=	sqlx-cli
+
+OPENSSLINC=	/usr/include
+OPENSSLLIB=	/usr/lib
+
+PLIST_FILES=	bin/cargo-sqlx \
+		bin/${PORTNAME}
+
+post-install:
+	@${STRIP_CMD} \
+		${STAGEDIR}${PREFIX}/bin/cargo-sqlx \
+		${STAGEDIR}${PREFIX}/bin/${PORTNAME}
+
+.include <bsd.port.mk>
diff --git a/databases/sqlx-cli/distinfo b/databases/sqlx-cli/distinfo
new file mode 100644
index 000000000000..29bc82615b05
--- /dev/null
+++ b/databases/sqlx-cli/distinfo
@@ -0,0 +1,849 @@
+TIMESTAMP = 1710303293
+SHA256 (rust/crates/addr2line-0.21.0.crate) = 8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb
+SIZE (rust/crates/addr2line-0.21.0.crate) = 40807
+SHA256 (rust/crates/adler-1.0.2.crate) = f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe
+SIZE (rust/crates/adler-1.0.2.crate) = 12778
+SHA256 (rust/crates/ahash-0.7.8.crate) = 891477e0c6a8957309ee5c45a6368af3ae14bb510732d2684ffa19af310920f9
+SIZE (rust/crates/ahash-0.7.8.crate) = 38550
+SHA256 (rust/crates/ahash-0.8.11.crate) = e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011
+SIZE (rust/crates/ahash-0.8.11.crate) = 43607
+SHA256 (rust/crates/aho-corasick-1.1.2.crate) = b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0
+SIZE (rust/crates/aho-corasick-1.1.2.crate) = 183136
+SHA256 (rust/crates/allocator-api2-0.2.16.crate) = 0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5
+SIZE (rust/crates/allocator-api2-0.2.16.crate) = 59025
+SHA256 (rust/crates/android-tzdata-0.1.1.crate) = e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0
+SIZE (rust/crates/android-tzdata-0.1.1.crate) = 7674
+SHA256 (rust/crates/android_system_properties-0.1.5.crate) = 819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311
+SIZE (rust/crates/android_system_properties-0.1.5.crate) = 5243
+SHA256 (rust/crates/anes-0.1.6.crate) = 4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299
+SIZE (rust/crates/anes-0.1.6.crate) = 23857
+SHA256 (rust/crates/ansi_term-0.12.1.crate) = d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2
+SIZE (rust/crates/ansi_term-0.12.1.crate) = 24838
+SHA256 (rust/crates/anstream-0.6.13.crate) = d96bd03f33fe50a863e394ee9718a706f988b9079b20c3784fb726e7678b62fb
+SIZE (rust/crates/anstream-0.6.13.crate) = 30928
+SHA256 (rust/crates/anstyle-1.0.6.crate) = 8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc
+SIZE (rust/crates/anstyle-1.0.6.crate) = 14604
+SHA256 (rust/crates/anstyle-parse-0.2.3.crate) = c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c
+SIZE (rust/crates/anstyle-parse-0.2.3.crate) = 24699
+SHA256 (rust/crates/anstyle-query-1.0.2.crate) = e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648
+SIZE (rust/crates/anstyle-query-1.0.2.crate) = 8739
+SHA256 (rust/crates/anstyle-wincon-3.0.2.crate) = 1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7
+SIZE (rust/crates/anstyle-wincon-3.0.2.crate) = 11272
+SHA256 (rust/crates/anyhow-1.0.80.crate) = 5ad32ce52e4161730f7098c077cd2ed6229b5804ccf99e5366be1ab72a98b4e1
+SIZE (rust/crates/anyhow-1.0.80.crate) = 45138
+SHA256 (rust/crates/argon2-0.4.1.crate) = db4ce4441f99dbd377ca8a8f57b698c44d0d6e712d8329b5040da5a64aa1ce73
+SIZE (rust/crates/argon2-0.4.1.crate) = 28834
+SHA256 (rust/crates/arrayvec-0.7.4.crate) = 96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711
+SIZE (rust/crates/arrayvec-0.7.4.crate) = 29856
+SHA256 (rust/crates/assert_cmd-2.0.14.crate) = ed72493ac66d5804837f480ab3766c72bdfab91a65e565fc54fa9e42db0073a8
+SIZE (rust/crates/assert_cmd-2.0.14.crate) = 24591
+SHA256 (rust/crates/async-attributes-1.1.2.crate) = a3203e79f4dd9bdda415ed03cf14dae5a2bf775c683a00f94e9cd1faf0f596e5
+SIZE (rust/crates/async-attributes-1.1.2.crate) = 11431
+SHA256 (rust/crates/async-channel-1.9.0.crate) = 81953c529336010edd6d8e358f886d9581267795c61b19475b71314bffa46d35
+SIZE (rust/crates/async-channel-1.9.0.crate) = 13664
+SHA256 (rust/crates/async-channel-2.2.0.crate) = f28243a43d821d11341ab73c80bed182dc015c514b951616cf79bd4af39af0c3
+SIZE (rust/crates/async-channel-2.2.0.crate) = 14307
+SHA256 (rust/crates/async-executor-1.8.0.crate) = 17ae5ebefcc48e7452b4987947920dac9450be1110cadf34d1b8c116bdbaf97c
+SIZE (rust/crates/async-executor-1.8.0.crate) = 21870
+SHA256 (rust/crates/async-global-executor-2.4.1.crate) = 05b1b633a2115cd122d73b955eadd9916c18c8f510ec9cd1686404c60ad1c29c
+SIZE (rust/crates/async-global-executor-2.4.1.crate) = 11844
+SHA256 (rust/crates/async-io-1.13.0.crate) = 0fc5b45d93ef0529756f812ca52e44c221b35341892d3dcc34132ac02f3dd2af
+SIZE (rust/crates/async-io-1.13.0.crate) = 37191
+SHA256 (rust/crates/async-io-2.3.2.crate) = dcccb0f599cfa2f8ace422d3555572f47424da5648a4382a9dd0310ff8210884
+SIZE (rust/crates/async-io-2.3.2.crate) = 49298
+SHA256 (rust/crates/async-lock-2.8.0.crate) = 287272293e9d8c41773cec55e365490fe034813a2f172f502d6ddcf75b2f582b
+SIZE (rust/crates/async-lock-2.8.0.crate) = 29944
+SHA256 (rust/crates/async-lock-3.3.0.crate) = d034b430882f8381900d3fe6f0aaa3ad94f2cb4ac519b429692a1bc2dda4ae7b
+SIZE (rust/crates/async-lock-3.3.0.crate) = 33286
+SHA256 (rust/crates/async-std-1.12.0.crate) = 62565bb4402e926b29953c785397c6dc0391b7b446e45008b0049eb43cec6f5d
+SIZE (rust/crates/async-std-1.12.0.crate) = 215080
+SHA256 (rust/crates/async-task-4.7.0.crate) = fbb36e985947064623dbd357f727af08ffd077f93d696782f3c56365fa2e2799
+SIZE (rust/crates/async-task-4.7.0.crate) = 38906
+SHA256 (rust/crates/async-trait-0.1.77.crate) = c980ee35e870bd1a4d2c8294d4c04d0499e67bca1e4b5cefcc693c2fa00caea9
+SIZE (rust/crates/async-trait-0.1.77.crate) = 29986
+SHA256 (rust/crates/atoi-2.0.0.crate) = f28d99ec8bfea296261ca1af174f24225171fea9664ba9003cbebee704810528
+SIZE (rust/crates/atoi-2.0.0.crate) = 7785
+SHA256 (rust/crates/atomic-waker-1.1.2.crate) = 1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0
+SIZE (rust/crates/atomic-waker-1.1.2.crate) = 12422
+SHA256 (rust/crates/atty-0.2.14.crate) = d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8
+SIZE (rust/crates/atty-0.2.14.crate) = 5470
+SHA256 (rust/crates/autocfg-1.1.0.crate) = d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa
+SIZE (rust/crates/autocfg-1.1.0.crate) = 13272
+SHA256 (rust/crates/axum-0.5.17.crate) = acee9fd5073ab6b045a275b3e709c163dd36c90685219cb21804a147b58dba43
+SIZE (rust/crates/axum-0.5.17.crate) = 112165
+SHA256 (rust/crates/axum-core-0.2.9.crate) = 37e5939e02c56fecd5c017c37df4238c0a839fa76b7f97acdd7efb804fd181cc
+SIZE (rust/crates/axum-core-0.2.9.crate) = 16993
+SHA256 (rust/crates/axum-macros-0.2.3.crate) = 6293dae2ec708e679da6736e857cf8532886ef258e92930f38279c12641628b8
+SIZE (rust/crates/axum-macros-0.2.3.crate) = 22900
+SHA256 (rust/crates/backoff-0.4.0.crate) = b62ddb9cb1ec0a098ad4bbf9344d0713fa193ae1a80af55febcff2627b6a00c1
+SIZE (rust/crates/backoff-0.4.0.crate) = 26738
+SHA256 (rust/crates/backtrace-0.3.69.crate) = 2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837
+SIZE (rust/crates/backtrace-0.3.69.crate) = 77299
+SHA256 (rust/crates/base64-0.13.1.crate) = 9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8
+SIZE (rust/crates/base64-0.13.1.crate) = 61002
+SHA256 (rust/crates/base64-0.21.7.crate) = 9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567
+SIZE (rust/crates/base64-0.21.7.crate) = 82576
+SHA256 (rust/crates/base64ct-1.6.0.crate) = 8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b
+SIZE (rust/crates/base64ct-1.6.0.crate) = 28870
+SHA256 (rust/crates/basic-toml-0.1.8.crate) = 2db21524cad41c5591204d22d75e1970a2d1f71060214ca931dc7d5afe2c14e5
+SIZE (rust/crates/basic-toml-0.1.8.crate) = 50283
+SHA256 (rust/crates/bigdecimal-0.3.1.crate) = a6773ddc0eafc0e509fb60e48dff7f450f8e674a0686ae8605e8d9901bd5eefa
+SIZE (rust/crates/bigdecimal-0.3.1.crate) = 28858
+SHA256 (rust/crates/bit-vec-0.6.3.crate) = 349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb
+SIZE (rust/crates/bit-vec-0.6.3.crate) = 19927
+SHA256 (rust/crates/bitflags-1.3.2.crate) = bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a
+SIZE (rust/crates/bitflags-1.3.2.crate) = 23021
+SHA256 (rust/crates/bitflags-2.4.2.crate) = ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf
+SIZE (rust/crates/bitflags-2.4.2.crate) = 42602
+SHA256 (rust/crates/bitvec-1.0.1.crate) = 1bc2832c24239b0141d5674bb9174f9d68a8b5b3f2753311927c172ca46f7e9c
+SIZE (rust/crates/bitvec-1.0.1.crate) = 224375
+SHA256 (rust/crates/blake2-0.10.6.crate) = 46502ad458c9a52b69d4d4d32775c788b7a1b85e8bc9d482d92250fc0e3f8efe
+SIZE (rust/crates/blake2-0.10.6.crate) = 47234
+SHA256 (rust/crates/block-buffer-0.10.4.crate) = 3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71
+SIZE (rust/crates/block-buffer-0.10.4.crate) = 10538
+SHA256 (rust/crates/blocking-1.5.1.crate) = 6a37913e8dc4ddcc604f0c6d3bf2887c995153af3611de9e23c352b44c1b9118
+SIZE (rust/crates/blocking-1.5.1.crate) = 17277
+SHA256 (rust/crates/borsh-1.3.1.crate) = f58b559fd6448c6e2fd0adb5720cd98a2506594cafa4737ff98c396f3e82f667
+SIZE (rust/crates/borsh-1.3.1.crate) = 59069
+SHA256 (rust/crates/borsh-derive-1.3.1.crate) = 7aadb5b6ccbd078890f6d7003694e33816e6b784358f18e15e7e6d9f065a57cd
+SIZE (rust/crates/borsh-derive-1.3.1.crate) = 29088
+SHA256 (rust/crates/bstr-1.9.1.crate) = 05efc5cfd9110c8416e471df0e96702d58690178e206e61b7173706673c93706
+SIZE (rust/crates/bstr-1.9.1.crate) = 380305
+SHA256 (rust/crates/bumpalo-3.15.4.crate) = 7ff69b9dd49fd426c69a0db9fc04dd934cdb6645ff000864d98f7e2af8830eaa
+SIZE (rust/crates/bumpalo-3.15.4.crate) = 85028
+SHA256 (rust/crates/bytecheck-0.6.12.crate) = 23cdc57ce23ac53c931e88a43d06d070a6fd142f2617be5855eb75efc9beb1c2
+SIZE (rust/crates/bytecheck-0.6.12.crate) = 8202
+SHA256 (rust/crates/bytecheck_derive-0.6.12.crate) = 3db406d29fbcd95542e92559bed4d8ad92636d1ca8b3b72ede10b4bcc010e659
+SIZE (rust/crates/bytecheck_derive-0.6.12.crate) = 5415
+SHA256 (rust/crates/byteorder-1.5.0.crate) = 1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b
+SIZE (rust/crates/byteorder-1.5.0.crate) = 23288
+SHA256 (rust/crates/bytes-1.5.0.crate) = a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223
+SIZE (rust/crates/bytes-1.5.0.crate) = 58909
+SHA256 (rust/crates/camino-1.1.6.crate) = c59e92b5a388f549b863a7bea62612c09f24c8393560709a54558a9abdfb3b9c
+SIZE (rust/crates/camino-1.1.6.crate) = 30519
+SHA256 (rust/crates/cargo-platform-0.1.7.crate) = 694c8807f2ae16faecc43dc17d74b3eb042482789fd0eb64b39a2e04e087053f
+SIZE (rust/crates/cargo-platform-0.1.7.crate) = 11819
+SHA256 (rust/crates/cargo_metadata-0.14.2.crate) = 4acbb09d9ee8e23699b9634375c72795d095bf268439da88562cf9b501f181fa
+SIZE (rust/crates/cargo_metadata-0.14.2.crate) = 17469
+SHA256 (rust/crates/cassowary-0.3.0.crate) = df8670b8c7b9dae1793364eafadf7239c40d669904660c5960d74cfd80b46a53
+SIZE (rust/crates/cassowary-0.3.0.crate) = 22876
+SHA256 (rust/crates/cast-0.3.0.crate) = 37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5
+SIZE (rust/crates/cast-0.3.0.crate) = 11452
+SHA256 (rust/crates/cc-1.0.90.crate) = 8cd6604a82acf3039f1144f54b8eb34e91ffba622051189e71b781822d5ee1f5
+SIZE (rust/crates/cc-1.0.90.crate) = 73954
+SHA256 (rust/crates/cfg-if-1.0.0.crate) = baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd
+SIZE (rust/crates/cfg-if-1.0.0.crate) = 7934
+SHA256 (rust/crates/cfg_aliases-0.1.1.crate) = fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e
+SIZE (rust/crates/cfg_aliases-0.1.1.crate) = 6009
+SHA256 (rust/crates/chrono-0.4.35.crate) = 8eaf5903dcbc0a39312feb77df2ff4c76387d591b9fc7b04a238dcf8bb62639a
+SIZE (rust/crates/chrono-0.4.35.crate) = 234267
+SHA256 (rust/crates/ciborium-0.2.2.crate) = 42e69ffd6f0917f5c029256a24d0161db17cea3997d185db0d35926308770f0e
+SIZE (rust/crates/ciborium-0.2.2.crate) = 35611
+SHA256 (rust/crates/ciborium-io-0.2.2.crate) = 05afea1e0a06c9be33d539b876f1ce3692f4afea2cb41f740e7743225ed1c757
+SIZE (rust/crates/ciborium-io-0.2.2.crate) = 6697
+SHA256 (rust/crates/ciborium-ll-0.2.2.crate) = 57663b653d948a338bfb3eeba9bb2fd5fcfaecb9e199e87e1eda4d9e8b240fd9
+SIZE (rust/crates/ciborium-ll-0.2.2.crate) = 14695
+SHA256 (rust/crates/clap-2.34.0.crate) = a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c
+SIZE (rust/crates/clap-2.34.0.crate) = 202210
+SHA256 (rust/crates/clap-4.5.2.crate) = b230ab84b0ffdf890d5a10abdbc8b83ae1c4918275daea1ab8801f71536b2651
+SIZE (rust/crates/clap-4.5.2.crate) = 55385
+SHA256 (rust/crates/clap_builder-4.5.2.crate) = ae129e2e766ae0ec03484e609954119f123cc1fe650337e155d03b022f24f7b4
+SIZE (rust/crates/clap_builder-4.5.2.crate) = 163566
+SHA256 (rust/crates/clap_complete-4.5.1.crate) = 885e4d7d5af40bfb99ae6f9433e292feac98d452dcb3ec3d25dfe7552b77da8c
+SIZE (rust/crates/clap_complete-4.5.1.crate) = 37823
+SHA256 (rust/crates/clap_derive-4.5.0.crate) = 307bc0538d5f0f83b8248db3087aa92fe504e4691294d0c96c0eabc33f47ba47
+SIZE (rust/crates/clap_derive-4.5.0.crate) = 29042
+SHA256 (rust/crates/clap_lex-0.7.0.crate) = 98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce
+SIZE (rust/crates/clap_lex-0.7.0.crate) = 11915
+SHA256 (rust/crates/clipboard-win-4.5.0.crate) = 7191c27c2357d9b7ef96baac1773290d4ca63b24205b82a3fd8a0637afcf0362
+SIZE (rust/crates/clipboard-win-4.5.0.crate) = 13476
+SHA256 (rust/crates/colorchoice-1.0.0.crate) = acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7
+SIZE (rust/crates/colorchoice-1.0.0.crate) = 6857
+SHA256 (rust/crates/concurrent-queue-2.4.0.crate) = d16048cd947b08fa32c24458a22f5dc5e835264f689f4f5653210c69fd107363
+SIZE (rust/crates/concurrent-queue-2.4.0.crate) = 20244
+SHA256 (rust/crates/console-0.15.8.crate) = 0e1f83fc076bd6dd27517eacdf25fef6c4dfe5f1d7448bafaaf3a26f13b5e4eb
+SIZE (rust/crates/console-0.15.8.crate) = 36364
+SHA256 (rust/crates/const-oid-0.9.6.crate) = c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8
+SIZE (rust/crates/const-oid-0.9.6.crate) = 45382
+SHA256 (rust/crates/core-foundation-0.9.4.crate) = 91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f
+SIZE (rust/crates/core-foundation-0.9.4.crate) = 27743
+SHA256 (rust/crates/core-foundation-sys-0.8.6.crate) = 06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f
+SIZE (rust/crates/core-foundation-sys-0.8.6.crate) = 37629
+SHA256 (rust/crates/cpufeatures-0.2.12.crate) = 53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504
+SIZE (rust/crates/cpufeatures-0.2.12.crate) = 12837
+SHA256 (rust/crates/crc-3.0.1.crate) = 86ec7a15cbe22e59248fc7eadb1907dab5ba09372595da4d73dd805ed4417dfe
+SIZE (rust/crates/crc-3.0.1.crate) = 9950
+SHA256 (rust/crates/crc-catalog-2.4.0.crate) = 19d374276b40fb8bbdee95aef7c7fa6b5316ec764510eb64b8dd0e2ed0d7e7f5
+SIZE (rust/crates/crc-catalog-2.4.0.crate) = 10155
+SHA256 (rust/crates/criterion-0.5.1.crate) = f2b12d017a929603d80db1831cd3a24082f8137ce19c69e6447f54f5fc8d692f
+SIZE (rust/crates/criterion-0.5.1.crate) = 110088
+SHA256 (rust/crates/criterion-plot-0.5.0.crate) = 6b50826342786a51a89e2da3a28f1c32b06e387201bc2d19791f622c673706b1
+SIZE (rust/crates/criterion-plot-0.5.0.crate) = 22706
+SHA256 (rust/crates/crossbeam-deque-0.8.5.crate) = 613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d
+SIZE (rust/crates/crossbeam-deque-0.8.5.crate) = 21726
+SHA256 (rust/crates/crossbeam-epoch-0.9.18.crate) = 5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e
+SIZE (rust/crates/crossbeam-epoch-0.9.18.crate) = 46875
+SHA256 (rust/crates/crossbeam-queue-0.3.11.crate) = df0346b5d5e76ac2fe4e327c5fd1118d6be7c51dfb18f9b7922923f287471e35
+SIZE (rust/crates/crossbeam-queue-0.3.11.crate) = 15581
+SHA256 (rust/crates/crossbeam-utils-0.8.19.crate) = 248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345
+SIZE (rust/crates/crossbeam-utils-0.8.19.crate) = 42328
+SHA256 (rust/crates/crossterm-0.25.0.crate) = e64e6c0fbe2c17357405f7c758c1ef960fce08bdfb2c03d88d2a18d7e09c4b67
+SIZE (rust/crates/crossterm-0.25.0.crate) = 116533
+SHA256 (rust/crates/crossterm_winapi-0.9.1.crate) = acdd7c62a3665c7f6830a51635d9ac9b23ed385797f70a83bb8bafe9c572ab2b
+SIZE (rust/crates/crossterm_winapi-0.9.1.crate) = 16027
+SHA256 (rust/crates/crunchy-0.2.2.crate) = 7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7
+SIZE (rust/crates/crunchy-0.2.2.crate) = 2995
+SHA256 (rust/crates/crypto-common-0.1.6.crate) = 1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3
+SIZE (rust/crates/crypto-common-0.1.6.crate) = 8760
+SHA256 (rust/crates/darling-0.20.8.crate) = 54e36fcd13ed84ffdfda6f5be89b31287cbb80c439841fe69e04841435464391
+SIZE (rust/crates/darling-0.20.8.crate) = 31234
+SHA256 (rust/crates/darling_core-0.20.8.crate) = 9c2cf1c23a687a1feeb728783b993c4e1ad83d99f351801977dd809b48d0a70f
+SIZE (rust/crates/darling_core-0.20.8.crate) = 64442
+SHA256 (rust/crates/darling_macro-0.20.8.crate) = a668eda54683121533a393014d8692171709ff57a7d61f187b6e782719f8933f
+SIZE (rust/crates/darling_macro-0.20.8.crate) = 1856
+SHA256 (rust/crates/der-0.7.8.crate) = fffa369a668c8af7dbf8b5e56c9f744fbd399949ed171606040001947de40b1c
+SIZE (rust/crates/der-0.7.8.crate) = 85085
+SHA256 (rust/crates/deranged-0.3.11.crate) = b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4
+SIZE (rust/crates/deranged-0.3.11.crate) = 18043
+SHA256 (rust/crates/difflib-0.4.0.crate) = 6184e33543162437515c2e2b48714794e37845ec9851711914eec9d308f6ebe8
+SIZE (rust/crates/difflib-0.4.0.crate) = 7638
+SHA256 (rust/crates/digest-0.10.7.crate) = 9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292
+SIZE (rust/crates/digest-0.10.7.crate) = 19557
+SHA256 (rust/crates/dirs-next-2.0.0.crate) = b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1
+SIZE (rust/crates/dirs-next-2.0.0.crate) = 11689
+SHA256 (rust/crates/dirs-sys-next-0.1.2.crate) = 4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d
+SIZE (rust/crates/dirs-sys-next-0.1.2.crate) = 10681
+SHA256 (rust/crates/doc-comment-0.3.3.crate) = fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10
+SIZE (rust/crates/doc-comment-0.3.3.crate) = 4123
+SHA256 (rust/crates/dotenvy-0.15.7.crate) = 1aaf95b3e5c8f23aa320147307562d361db0ae0d51242340f558153b4eb2439b
+SIZE (rust/crates/dotenvy-0.15.7.crate) = 20293
+SHA256 (rust/crates/downcast-0.11.0.crate) = 1435fa1053d8b2fbbe9be7e97eca7f33d37b28409959813daefc1446a14247f1
+SIZE (rust/crates/downcast-0.11.0.crate) = 5976
+SHA256 (rust/crates/either-1.10.0.crate) = 11157ac094ffbdde99aa67b23417ebdd801842852b500e395a45a9c0aac03e4a
+SIZE (rust/crates/either-1.10.0.crate) = 18334
+SHA256 (rust/crates/encode_unicode-0.3.6.crate) = a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f
+SIZE (rust/crates/encode_unicode-0.3.6.crate) = 45741
+SHA256 (rust/crates/encoding_rs-0.8.33.crate) = 7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1
+SIZE (rust/crates/encoding_rs-0.8.33.crate) = 1370071
+SHA256 (rust/crates/endian-type-0.1.2.crate) = c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d
+SIZE (rust/crates/endian-type-0.1.2.crate) = 2340
+SHA256 (rust/crates/env_filter-0.1.0.crate) = a009aa4810eb158359dda09d0c87378e4bbb89b5a801f016885a4707ba24f7ea
+SIZE (rust/crates/env_filter-0.1.0.crate) = 11553
+SHA256 (rust/crates/env_logger-0.11.3.crate) = 38b35839ba51819680ba087cd351788c9a3c476841207e0b8cee0b04722343b9
+SIZE (rust/crates/env_logger-0.11.3.crate) = 29704
+SHA256 (rust/crates/equivalent-1.0.1.crate) = 5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5
+SIZE (rust/crates/equivalent-1.0.1.crate) = 6615
+SHA256 (rust/crates/errno-0.3.8.crate) = a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245
+SIZE (rust/crates/errno-0.3.8.crate) = 10645
+SHA256 (rust/crates/error-code-2.3.1.crate) = 64f18991e7bf11e7ffee451b5318b5c1a73c52d0d0ada6e5a3017c8c1ced6a21
+SIZE (rust/crates/error-code-2.3.1.crate) = 5324
+SHA256 (rust/crates/etcetera-0.8.0.crate) = 136d1b5283a1ab77bd9257427ffd09d8667ced0570b6f938942bc7568ed5b943
+SIZE (rust/crates/etcetera-0.8.0.crate) = 13295
+SHA256 (rust/crates/event-listener-2.5.3.crate) = 0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0
+SIZE (rust/crates/event-listener-2.5.3.crate) = 15392
+SHA256 (rust/crates/event-listener-4.0.3.crate) = 67b215c49b2b248c855fb73579eb1f4f26c38ffdc12973e20e07b91d78d5646e
+SIZE (rust/crates/event-listener-4.0.3.crate) = 39784
+SHA256 (rust/crates/event-listener-5.2.0.crate) = 2b5fb89194fa3cad959b833185b3063ba881dbfc7030680b314250779fb4cc91
+SIZE (rust/crates/event-listener-5.2.0.crate) = 40217
+SHA256 (rust/crates/event-listener-strategy-0.4.0.crate) = 958e4d70b6d5e81971bebec42271ec641e7ff4e170a6fa605f2b8a8b65cb97d3
+SIZE (rust/crates/event-listener-strategy-0.4.0.crate) = 10225
+SHA256 (rust/crates/event-listener-strategy-0.5.0.crate) = feedafcaa9b749175d5ac357452a9d41ea2911da598fde46ce1fe02c37751291
+SIZE (rust/crates/event-listener-strategy-0.5.0.crate) = 10616
+SHA256 (rust/crates/fastrand-1.9.0.crate) = e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be
+SIZE (rust/crates/fastrand-1.9.0.crate) = 11910
+SHA256 (rust/crates/fastrand-2.0.1.crate) = 25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5
+SIZE (rust/crates/fastrand-2.0.1.crate) = 14664
+SHA256 (rust/crates/fd-lock-3.0.13.crate) = ef033ed5e9bad94e55838ca0ca906db0e043f517adda0c8b79c7a8c66c93c1b5
+SIZE (rust/crates/fd-lock-3.0.13.crate) = 13692
+SHA256 (rust/crates/filetime-0.2.23.crate) = 1ee447700ac8aa0b2f2bd7bc4462ad686ba06baa6727ac149a2d6277f0d240fd
+SIZE (rust/crates/filetime-0.2.23.crate) = 14942
+SHA256 (rust/crates/finl_unicode-1.2.0.crate) = 8fcfdc7a0362c9f4444381a9e697c79d435fe65b52a37466fc2c1184cee9edc6
+SIZE (rust/crates/finl_unicode-1.2.0.crate) = 687752
+SHA256 (rust/crates/float-cmp-0.9.0.crate) = 98de4bbd547a563b716d8dfa9aad1cb19bfab00f4fa09a6a4ed21dbcf44ce9c4
+SIZE (rust/crates/float-cmp-0.9.0.crate) = 10102
+SHA256 (rust/crates/flume-0.11.0.crate) = 55ac459de2512911e4b674ce33cf20befaba382d05b62b008afc1c8b57cbf181
+SIZE (rust/crates/flume-0.11.0.crate) = 67502
+SHA256 (rust/crates/fnv-1.0.7.crate) = 3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1
+SIZE (rust/crates/fnv-1.0.7.crate) = 11266
+SHA256 (rust/crates/foreign-types-0.3.2.crate) = f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1
+SIZE (rust/crates/foreign-types-0.3.2.crate) = 7504
+SHA256 (rust/crates/foreign-types-shared-0.1.1.crate) = 00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b
+SIZE (rust/crates/foreign-types-shared-0.1.1.crate) = 5672
+SHA256 (rust/crates/form_urlencoded-1.2.1.crate) = e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456
+SIZE (rust/crates/form_urlencoded-1.2.1.crate) = 8969
+SHA256 (rust/crates/fragile-2.0.0.crate) = 6c2141d6d6c8512188a7891b4b01590a45f6dac67afb4f255c4124dbb86d4eaa
+SIZE (rust/crates/fragile-2.0.0.crate) = 14668
+SHA256 (rust/crates/funty-2.0.0.crate) = e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c
+SIZE (rust/crates/funty-2.0.0.crate) = 13160
+SHA256 (rust/crates/futures-0.3.30.crate) = 645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0
+SIZE (rust/crates/futures-0.3.30.crate) = 53828
+SHA256 (rust/crates/futures-channel-0.3.30.crate) = eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78
+SIZE (rust/crates/futures-channel-0.3.30.crate) = 31736
+SHA256 (rust/crates/futures-core-0.3.30.crate) = dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d
+SIZE (rust/crates/futures-core-0.3.30.crate) = 14071
+SHA256 (rust/crates/futures-executor-0.3.30.crate) = a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d
+SIZE (rust/crates/futures-executor-0.3.30.crate) = 17744
+SHA256 (rust/crates/futures-intrusive-0.5.0.crate) = 1d930c203dd0b6ff06e0201a4a2fe9149b43c684fd4420555b26d21b1a02956f
+SIZE (rust/crates/futures-intrusive-0.5.0.crate) = 85563
+SHA256 (rust/crates/futures-io-0.3.30.crate) = a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1
+SIZE (rust/crates/futures-io-0.3.30.crate) = 8910
+SHA256 (rust/crates/futures-lite-1.13.0.crate) = 49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce
+SIZE (rust/crates/futures-lite-1.13.0.crate) = 37058
+SHA256 (rust/crates/futures-lite-2.2.0.crate) = 445ba825b27408685aaecefd65178908c36c6e96aaf6d8599419d46e624192ba
+SIZE (rust/crates/futures-lite-2.2.0.crate) = 38029
+SHA256 (rust/crates/futures-macro-0.3.30.crate) = 87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac
+SIZE (rust/crates/futures-macro-0.3.30.crate) = 11278
+SHA256 (rust/crates/futures-sink-0.3.30.crate) = 9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5
+SIZE (rust/crates/futures-sink-0.3.30.crate) = 7852
+SHA256 (rust/crates/futures-task-0.3.30.crate) = 38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004
+SIZE (rust/crates/futures-task-0.3.30.crate) = 11126
+SHA256 (rust/crates/futures-util-0.3.30.crate) = 3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48
+SIZE (rust/crates/futures-util-0.3.30.crate) = 159977
+SHA256 (rust/crates/generic-array-0.14.7.crate) = 85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a
+SIZE (rust/crates/generic-array-0.14.7.crate) = 15950
+SHA256 (rust/crates/getrandom-0.2.12.crate) = 190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5
+SIZE (rust/crates/getrandom-0.2.12.crate) = 36163
+SHA256 (rust/crates/gimli-0.28.1.crate) = 4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253
+SIZE (rust/crates/gimli-0.28.1.crate) = 270497
+SHA256 (rust/crates/glob-0.3.1.crate) = d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b
+SIZE (rust/crates/glob-0.3.1.crate) = 18880
+SHA256 (rust/crates/gloo-timers-0.2.6.crate) = 9b995a66bb87bebce9a0f4a95aed01daca4872c050bfcb21653361c03bc35e5c
+SIZE (rust/crates/gloo-timers-0.2.6.crate) = 5516
+SHA256 (rust/crates/half-2.4.0.crate) = b5eceaaeec696539ddaf7b333340f1af35a5aa87ae3e4f3ead0532f72affab2e
+SIZE (rust/crates/half-2.4.0.crate) = 50666
+SHA256 (rust/crates/hashbrown-0.12.3.crate) = 8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888
+SIZE (rust/crates/hashbrown-0.12.3.crate) = 102968
+SHA256 (rust/crates/hashbrown-0.14.3.crate) = 290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604
+SIZE (rust/crates/hashbrown-0.14.3.crate) = 141425
+SHA256 (rust/crates/hashlink-0.8.4.crate) = e8094feaf31ff591f651a2664fb9cfd92bba7a60ce3197265e9482ebe753c8f7
+SIZE (rust/crates/hashlink-0.8.4.crate) = 26514
+SHA256 (rust/crates/heck-0.3.3.crate) = 6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c
+SIZE (rust/crates/heck-0.3.3.crate) = 10260
+SHA256 (rust/crates/heck-0.4.1.crate) = 95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8
+SIZE (rust/crates/heck-0.4.1.crate) = 11567
+SHA256 (rust/crates/hermit-abi-0.1.19.crate) = 62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33
+SIZE (rust/crates/hermit-abi-0.1.19.crate) = 9979
+SHA256 (rust/crates/hermit-abi-0.3.9.crate) = d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024
+SIZE (rust/crates/hermit-abi-0.3.9.crate) = 16165
+SHA256 (rust/crates/hex-0.4.3.crate) = 7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70
+SIZE (rust/crates/hex-0.4.3.crate) = 13299
+SHA256 (rust/crates/hkdf-0.12.4.crate) = 7b5f8eb2ad728638ea2c7d47a21db23b7b58a72ed6a38256b8a1849f15fbbdf7
+SIZE (rust/crates/hkdf-0.12.4.crate) = 171163
+SHA256 (rust/crates/hmac-0.12.1.crate) = 6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e
+SIZE (rust/crates/hmac-0.12.1.crate) = 42657
+SHA256 (rust/crates/home-0.5.9.crate) = e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5
+SIZE (rust/crates/home-0.5.9.crate) = 8760
+SHA256 (rust/crates/http-0.2.12.crate) = 601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1
+SIZE (rust/crates/http-0.2.12.crate) = 101964
+SHA256 (rust/crates/http-body-0.4.6.crate) = 7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2
+SIZE (rust/crates/http-body-0.4.6.crate) = 10773
+SHA256 (rust/crates/http-range-header-0.3.1.crate) = add0ab9360ddbd88cfeb3bd9574a1d85cfdfa14db10b3e21d3700dbc4328758f
+SIZE (rust/crates/http-range-header-0.3.1.crate) = 7712
+SHA256 (rust/crates/httparse-1.8.0.crate) = d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904
+SIZE (rust/crates/httparse-1.8.0.crate) = 29954
+SHA256 (rust/crates/httpdate-1.0.3.crate) = df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9
+SIZE (rust/crates/httpdate-1.0.3.crate) = 10639
+SHA256 (rust/crates/humantime-2.1.0.crate) = 9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4
+SIZE (rust/crates/humantime-2.1.0.crate) = 16749
+SHA256 (rust/crates/hyper-0.14.28.crate) = bf96e135eb83a2a8ddf766e426a841d8ddd7449d5f00d34ea02b41d2f19eef80
+SIZE (rust/crates/hyper-0.14.28.crate) = 197204
+SHA256 (rust/crates/iana-time-zone-0.1.60.crate) = e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141
+SIZE (rust/crates/iana-time-zone-0.1.60.crate) = 27074
+SHA256 (rust/crates/iana-time-zone-haiku-0.1.2.crate) = f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f
+SIZE (rust/crates/iana-time-zone-haiku-0.1.2.crate) = 7185
+SHA256 (rust/crates/ident_case-1.0.1.crate) = b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39
+SIZE (rust/crates/ident_case-1.0.1.crate) = 3492
+SHA256 (rust/crates/idna-0.4.0.crate) = 7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c
+SIZE (rust/crates/idna-0.4.0.crate) = 271429
+SHA256 (rust/crates/idna-0.5.0.crate) = 634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6
+SIZE (rust/crates/idna-0.5.0.crate) = 271940
+SHA256 (rust/crates/if_chain-1.0.2.crate) = cb56e1aa765b4b4f3aadfab769793b7087bb03a4ea4920644a6d238e2df5b9ed
+SIZE (rust/crates/if_chain-1.0.2.crate) = 8062
+SHA256 (rust/crates/indexmap-1.9.3.crate) = bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99
+SIZE (rust/crates/indexmap-1.9.3.crate) = 54653
+SHA256 (rust/crates/indexmap-2.2.5.crate) = 7b0b929d511467233429c45a44ac1dcaa21ba0f5ba11e4879e6ed28ddb4f9df4
+SIZE (rust/crates/indexmap-2.2.5.crate) = 81498
+SHA256 (rust/crates/instant-0.1.12.crate) = 7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c
+SIZE (rust/crates/instant-0.1.12.crate) = 6128
+SHA256 (rust/crates/io-lifetimes-1.0.11.crate) = eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2
+SIZE (rust/crates/io-lifetimes-1.0.11.crate) = 37346
+SHA256 (rust/crates/ipnetwork-0.20.0.crate) = bf466541e9d546596ee94f9f69590f89473455f88372423e0008fc1a7daf100e
+SIZE (rust/crates/ipnetwork-0.20.0.crate) = 16556
+SHA256 (rust/crates/is-terminal-0.4.12.crate) = f23ff5ef2b80d608d61efee834934d862cd92461afc0560dedf493e4c033738b
+SIZE (rust/crates/is-terminal-0.4.12.crate) = 7470
+SHA256 (rust/crates/itertools-0.10.5.crate) = b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473
+SIZE (rust/crates/itertools-0.10.5.crate) = 115354
+SHA256 (rust/crates/itertools-0.12.1.crate) = ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569
+SIZE (rust/crates/itertools-0.12.1.crate) = 137761
+SHA256 (rust/crates/itoa-1.0.10.crate) = b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c
+SIZE (rust/crates/itoa-1.0.10.crate) = 10534
+SHA256 (rust/crates/js-sys-0.3.69.crate) = 29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d
+SIZE (rust/crates/js-sys-0.3.69.crate) = 81083
+SHA256 (rust/crates/kv-log-macro-1.0.7.crate) = 0de8b303297635ad57c9f5059fd9cee7a47f8e8daa09df0fcd07dd39fb22977f
+SIZE (rust/crates/kv-log-macro-1.0.7.crate) = 16842
+SHA256 (rust/crates/lazy_static-1.4.0.crate) = e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646
+SIZE (rust/crates/lazy_static-1.4.0.crate) = 10443
+SHA256 (rust/crates/libc-0.2.153.crate) = 9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd
+SIZE (rust/crates/libc-0.2.153.crate) = 740614
+SHA256 (rust/crates/libm-0.2.8.crate) = 4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058
+SIZE (rust/crates/libm-0.2.8.crate) = 113450
+SHA256 (rust/crates/libredox-0.0.1.crate) = 85c833ca1e66078851dba29046874e38f08b2c883700aa29a03ddd3b23814ee8
+SIZE (rust/crates/libredox-0.0.1.crate) = 4212
+SHA256 (rust/crates/libsqlite3-sys-0.27.0.crate) = cf4e226dcd58b4be396f7bd3c20da8fdee2911400705297ba7d2d7cc2c30f716
+SIZE (rust/crates/libsqlite3-sys-0.27.0.crate) = 4948458
+SHA256 (rust/crates/linux-raw-sys-0.3.8.crate) = ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519
+SIZE (rust/crates/linux-raw-sys-0.3.8.crate) = 1013776
+SHA256 (rust/crates/linux-raw-sys-0.4.13.crate) = 01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c
+SIZE (rust/crates/linux-raw-sys-0.4.13.crate) = 1493855
+SHA256 (rust/crates/lock_api-0.4.11.crate) = 3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45
+SIZE (rust/crates/lock_api-0.4.11.crate) = 27487
+SHA256 (rust/crates/log-0.4.21.crate) = 90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c
+SIZE (rust/crates/log-0.4.21.crate) = 43442
+SHA256 (rust/crates/mac_address-1.1.5.crate) = 4863ee94f19ed315bf3bc00299338d857d4b5bc856af375cc97d237382ad3856
+SIZE (rust/crates/mac_address-1.1.5.crate) = 12191
+SHA256 (rust/crates/matchit-0.5.0.crate) = 73cbba799671b762df5a175adf59ce145165747bb891505c43d09aefbbf38beb
+SIZE (rust/crates/matchit-0.5.0.crate) = 20782
+SHA256 (rust/crates/md-5-0.10.6.crate) = d89e7ee0cfbedfc4da3340218492196241d89eefb6dab27de5df917a6d2e78cf
+SIZE (rust/crates/md-5-0.10.6.crate) = 16161
+SHA256 (rust/crates/memchr-2.7.1.crate) = 523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149
+SIZE (rust/crates/memchr-2.7.1.crate) = 96307
+SHA256 (rust/crates/memoffset-0.6.5.crate) = 5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce
+SIZE (rust/crates/memoffset-0.6.5.crate) = 7686
+SHA256 (rust/crates/mime-0.3.17.crate) = 6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a
+SIZE (rust/crates/mime-0.3.17.crate) = 15712
+SHA256 (rust/crates/minimal-lexical-0.2.1.crate) = 68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a
+SIZE (rust/crates/minimal-lexical-0.2.1.crate) = 94841
+SHA256 (rust/crates/miniz_oxide-0.7.2.crate) = 9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7
+SIZE (rust/crates/miniz_oxide-0.7.2.crate) = 55731
+SHA256 (rust/crates/mio-0.8.11.crate) = a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c
+SIZE (rust/crates/mio-0.8.11.crate) = 102983
+SHA256 (rust/crates/mockall-0.11.4.crate) = 4c84490118f2ee2d74570d114f3d0493cbf02790df303d2707606c3e14e07c96
+SIZE (rust/crates/mockall-0.11.4.crate) = 22374
+SHA256 (rust/crates/mockall_derive-0.11.4.crate) = 22ce75669015c4f47b289fd4d4f56e894e4c96003ffdf3ac51313126f94c6cbb
+SIZE (rust/crates/mockall_derive-0.11.4.crate) = 44096
+SHA256 (rust/crates/native-tls-0.2.11.crate) = 07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e
+SIZE (rust/crates/native-tls-0.2.11.crate) = 29008
+SHA256 (rust/crates/nibble_vec-0.1.0.crate) = 77a5d83df9f36fe23f0c3648c6bbb8b0298bb5f1939c8f2704431371f4b84d43
+SIZE (rust/crates/nibble_vec-0.1.0.crate) = 11796
+SHA256 (rust/crates/nix-0.23.2.crate) = 8f3790c00a0150112de0f4cd161e3d7fc4b2d8a5542ffc35f099a2562aecb35c
+SIZE (rust/crates/nix-0.23.2.crate) = 242042
+SHA256 (rust/crates/nom-7.1.3.crate) = d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a
+SIZE (rust/crates/nom-7.1.3.crate) = 117570
+SHA256 (rust/crates/normalize-line-endings-0.3.0.crate) = 61807f77802ff30975e01f4f071c8ba10c022052f98b3294119f3e615d13e5be
+SIZE (rust/crates/normalize-line-endings-0.3.0.crate) = 5737
+SHA256 (rust/crates/num-bigint-0.4.4.crate) = 608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0
+SIZE (rust/crates/num-bigint-0.4.4.crate) = 99369
+SHA256 (rust/crates/num-bigint-dig-0.8.4.crate) = dc84195820f291c7697304f3cbdadd1cb7199c0efc917ff5eafd71225c136151
+SIZE (rust/crates/num-bigint-dig-0.8.4.crate) = 123825
+SHA256 (rust/crates/num-conv-0.1.0.crate) = 51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9
+SIZE (rust/crates/num-conv-0.1.0.crate) = 7444
+SHA256 (rust/crates/num-integer-0.1.46.crate) = 7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f
+SIZE (rust/crates/num-integer-0.1.46.crate) = 22331
+SHA256 (rust/crates/num-iter-0.1.44.crate) = d869c01cc0c455284163fd0092f1f93835385ccab5a98a0dcc497b2f8bf055a9
+SIZE (rust/crates/num-iter-0.1.44.crate) = 10249
+SHA256 (rust/crates/num-traits-0.2.18.crate) = da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a
+SIZE (rust/crates/num-traits-0.2.18.crate) = 51930
+SHA256 (rust/crates/num_cpus-1.16.0.crate) = 4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43
+SIZE (rust/crates/num_cpus-1.16.0.crate) = 15713
+SHA256 (rust/crates/object-0.32.2.crate) = a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441
+SIZE (rust/crates/object-0.32.2.crate) = 286994
+SHA256 (rust/crates/once_cell-1.19.0.crate) = 3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92
+SIZE (rust/crates/once_cell-1.19.0.crate) = 33046
+SHA256 (rust/crates/oorandom-11.1.3.crate) = 0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575
+SIZE (rust/crates/oorandom-11.1.3.crate) = 10068
+SHA256 (rust/crates/openssl-0.10.64.crate) = 95a0481286a310808298130d22dd1fef0fa571e05a8f44ec801801e84b216b1f
+SIZE (rust/crates/openssl-0.10.64.crate) = 272306
+SHA256 (rust/crates/openssl-macros-0.1.1.crate) = a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c
+SIZE (rust/crates/openssl-macros-0.1.1.crate) = 5601
+SHA256 (rust/crates/openssl-probe-0.1.5.crate) = ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf
+SIZE (rust/crates/openssl-probe-0.1.5.crate) = 7227
+SHA256 (rust/crates/openssl-src-300.2.3+3.2.1.crate) = 5cff92b6f71555b61bb9315f7c64da3ca43d87531622120fea0195fc761b4843
+SIZE (rust/crates/openssl-src-300.2.3+3.2.1.crate) = 9584245
+SHA256 (rust/crates/openssl-sys-0.9.101.crate) = dda2b0f344e78efc2facf7d195d098df0dd72151b26ab98da807afc26c198dff
+SIZE (rust/crates/openssl-sys-0.9.101.crate) = 68568
+SHA256 (rust/crates/parking-2.2.0.crate) = bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae
+SIZE (rust/crates/parking-2.2.0.crate) = 9730
+SHA256 (rust/crates/parking_lot-0.12.1.crate) = 3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f
+SIZE (rust/crates/parking_lot-0.12.1.crate) = 40967
+SHA256 (rust/crates/parking_lot_core-0.9.9.crate) = 4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e
+SIZE (rust/crates/parking_lot_core-0.9.9.crate) = 32445
+SHA256 (rust/crates/password-hash-0.4.2.crate) = 7676374caaee8a325c9e7a2ae557f216c5563a171d6997b0ef8a65af35147700
+SIZE (rust/crates/password-hash-0.4.2.crate) = 26099
+SHA256 (rust/crates/paste-1.0.14.crate) = de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c
+SIZE (rust/crates/paste-1.0.14.crate) = 18157
+SHA256 (rust/crates/pem-rfc7468-0.7.0.crate) = 88b39c9bfcfc231068454382784bb460aae594343fb030d46e9f50a645418412
+SIZE (rust/crates/pem-rfc7468-0.7.0.crate) = 24159
+SHA256 (rust/crates/percent-encoding-2.3.1.crate) = e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e
+SIZE (rust/crates/percent-encoding-2.3.1.crate) = 10235
+SHA256 (rust/crates/pin-project-1.1.5.crate) = b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3
+SIZE (rust/crates/pin-project-1.1.5.crate) = 54214
+SHA256 (rust/crates/pin-project-internal-1.1.5.crate) = 2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965
+SIZE (rust/crates/pin-project-internal-1.1.5.crate) = 28280
+SHA256 (rust/crates/pin-project-lite-0.2.13.crate) = 8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58
+SIZE (rust/crates/pin-project-lite-0.2.13.crate) = 29141
+SHA256 (rust/crates/pin-utils-0.1.0.crate) = 8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184
+SIZE (rust/crates/pin-utils-0.1.0.crate) = 7580
+SHA256 (rust/crates/piper-0.2.1.crate) = 668d31b1c4eba19242f2088b2bf3316b82ca31082a8335764db4e083db7485d4
+SIZE (rust/crates/piper-0.2.1.crate) = 15878
+SHA256 (rust/crates/pkcs1-0.7.5.crate) = c8ffb9f10fa047879315e6625af03c164b16962a5368d724ed16323b68ace47f
+SIZE (rust/crates/pkcs1-0.7.5.crate) = 35790
+SHA256 (rust/crates/pkcs8-0.10.2.crate) = f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7
+SIZE (rust/crates/pkcs8-0.10.2.crate) = 26360
+SHA256 (rust/crates/pkg-config-0.3.30.crate) = d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec
+SIZE (rust/crates/pkg-config-0.3.30.crate) = 20613
+SHA256 (rust/crates/plotters-0.3.5.crate) = d2c224ba00d7cadd4d5c660deaf2098e5e80e07846537c51f9cfa4be50c1fd45
+SIZE (rust/crates/plotters-0.3.5.crate) = 143975
+SHA256 (rust/crates/plotters-backend-0.3.5.crate) = 9e76628b4d3a7581389a35d5b6e2139607ad7c75b17aed325f210aa91f4a9609
+SIZE (rust/crates/plotters-backend-0.3.5.crate) = 13440
+SHA256 (rust/crates/plotters-svg-0.3.5.crate) = 38f6d39893cca0701371e3c27294f09797214b86f1fb951b89ade8ec04e2abab
+SIZE (rust/crates/plotters-svg-0.3.5.crate) = 6948
+SHA256 (rust/crates/polling-2.8.0.crate) = 4b2d323e8ca7996b3e23126511a523f7e62924d93ecd5ae73b333815b0eb3dce
+SIZE (rust/crates/polling-2.8.0.crate) = 43554
+SHA256 (rust/crates/polling-3.5.0.crate) = 24f040dee2588b4963afb4e420540439d126f73fdacf4a9c486a96d840bac3c9
+SIZE (rust/crates/polling-3.5.0.crate) = 56439
+SHA256 (rust/crates/powerfmt-0.2.0.crate) = 439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391
+SIZE (rust/crates/powerfmt-0.2.0.crate) = 15165
+SHA256 (rust/crates/ppv-lite86-0.2.17.crate) = 5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de
+SIZE (rust/crates/ppv-lite86-0.2.17.crate) = 22242
+SHA256 (rust/crates/predicates-2.1.5.crate) = 59230a63c37f3e18569bdb90e4a89cbf5bf8b06fea0b84e65ea10cc4df47addd
+SIZE (rust/crates/predicates-2.1.5.crate) = 24165
+SHA256 (rust/crates/predicates-3.1.0.crate) = 68b87bfd4605926cdfefc1c3b5f8fe560e3feca9d5552cf68c466d3d8236c7e8
+SIZE (rust/crates/predicates-3.1.0.crate) = 23090
+SHA256 (rust/crates/predicates-core-1.0.6.crate) = b794032607612e7abeb4db69adb4e33590fa6cf1149e95fd7cb00e634b92f174
+SIZE (rust/crates/predicates-core-1.0.6.crate) = 8084
+SHA256 (rust/crates/predicates-tree-1.0.9.crate) = 368ba315fb8c5052ab692e68a0eefec6ec57b23a36959c14496f0b0df2c0cecf
+SIZE (rust/crates/predicates-tree-1.0.9.crate) = 7960
+SHA256 (rust/crates/proc-macro-crate-3.1.0.crate) = 6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284
+SIZE (rust/crates/proc-macro-crate-3.1.0.crate) = 11084
+SHA256 (rust/crates/proc-macro-error-1.0.4.crate) = da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c
+SIZE (rust/crates/proc-macro-error-1.0.4.crate) = 25293
+SHA256 (rust/crates/proc-macro-error-attr-1.0.4.crate) = a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869
+SIZE (rust/crates/proc-macro-error-attr-1.0.4.crate) = 7971
+SHA256 (rust/crates/proc-macro2-1.0.78.crate) = e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae
+SIZE (rust/crates/proc-macro2-1.0.78.crate) = 47158
+SHA256 (rust/crates/promptly-0.3.1.crate) = 9acbc6c5a5b029fe58342f58445acb00ccfe24624e538894bc2f04ce112980ba
+SIZE (rust/crates/promptly-0.3.1.crate) = 9899
+SHA256 (rust/crates/ptr_meta-0.1.4.crate) = 0738ccf7ea06b608c10564b31debd4f5bc5e197fc8bfe088f68ae5ce81e7a4f1
+SIZE (rust/crates/ptr_meta-0.1.4.crate) = 5754
+SHA256 (rust/crates/ptr_meta_derive-0.1.4.crate) = 16b845dbfca988fa33db069c0e230574d15a3088f147a87b64c7589eb662c9ac
+SIZE (rust/crates/ptr_meta_derive-0.1.4.crate) = 2302
+SHA256 (rust/crates/quote-1.0.35.crate) = 291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef
+SIZE (rust/crates/quote-1.0.35.crate) = 28136
+SHA256 (rust/crates/radium-0.7.0.crate) = dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09
+SIZE (rust/crates/radium-0.7.0.crate) = 10906
+SHA256 (rust/crates/radix_trie-0.2.1.crate) = c069c179fcdc6a2fe24d8d18305cf085fdbd4f922c041943e203685d6a1c58fd
+SIZE (rust/crates/radix_trie-0.2.1.crate) = 251366
+SHA256 (rust/crates/rand-0.8.5.crate) = 34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404
+SIZE (rust/crates/rand-0.8.5.crate) = 87113
+SHA256 (rust/crates/rand_chacha-0.3.1.crate) = e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88
+SIZE (rust/crates/rand_chacha-0.3.1.crate) = 15251
+SHA256 (rust/crates/rand_core-0.6.4.crate) = ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c
+SIZE (rust/crates/rand_core-0.6.4.crate) = 22666
+SHA256 (rust/crates/rand_xoshiro-0.6.0.crate) = 6f97cdb2a36ed4183de61b2f824cc45c9f1037f28afe0a322e9fff4c108b5aaa
+SIZE (rust/crates/rand_xoshiro-0.6.0.crate) = 17125
+SHA256 (rust/crates/rayon-1.9.0.crate) = e4963ed1bc86e4f3ee217022bd855b297cef07fb9eac5dfa1f788b220b49b3bd
+SIZE (rust/crates/rayon-1.9.0.crate) = 177770
+SHA256 (rust/crates/rayon-core-1.12.1.crate) = 1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2
+SIZE (rust/crates/rayon-core-1.12.1.crate) = 70701
+SHA256 (rust/crates/redox_syscall-0.4.1.crate) = 4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa
+SIZE (rust/crates/redox_syscall-0.4.1.crate) = 24858
+SHA256 (rust/crates/redox_users-0.4.4.crate) = a18479200779601e498ada4e8c1e1f50e3ee19deb0259c25825a98b5603b2cb4
+SIZE (rust/crates/redox_users-0.4.4.crate) = 15438
+SHA256 (rust/crates/regex-1.10.3.crate) = b62dbe01f0b06f9d8dc7d49e05a0785f153b00b2c227856282f671e0318c9b15
+SIZE (rust/crates/regex-1.10.3.crate) = 253101
+SHA256 (rust/crates/regex-automata-0.4.6.crate) = 86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea
+SIZE (rust/crates/regex-automata-0.4.6.crate) = 617565
+SHA256 (rust/crates/regex-syntax-0.8.2.crate) = c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f
+SIZE (rust/crates/regex-syntax-0.8.2.crate) = 347228
+SHA256 (rust/crates/rend-0.4.2.crate) = 71fe3824f5629716b1589be05dacd749f6aa084c87e00e016714a8cdfccc997c
+SIZE (rust/crates/rend-0.4.2.crate) = 9324
+SHA256 (rust/crates/ring-0.17.8.crate) = c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d
+SIZE (rust/crates/ring-0.17.8.crate) = 4188554
+SHA256 (rust/crates/rkyv-0.7.44.crate) = 5cba464629b3394fc4dbc6f940ff8f5b4ff5c7aef40f29166fd4ad12acbc99c0
+SIZE (rust/crates/rkyv-0.7.44.crate) = 115686
+SHA256 (rust/crates/rkyv_derive-0.7.44.crate) = a7dddfff8de25e6f62b9d64e6e432bf1c6736c57d20323e15ee10435fbda7c65
+SIZE (rust/crates/rkyv_derive-0.7.44.crate) = 18912
+SHA256 (rust/crates/rsa-0.9.6.crate) = 5d0e5124fcb30e76a7e79bfee683a2746db83784b86289f6251b54b7950a0dfc
+SIZE (rust/crates/rsa-0.9.6.crate) = 80048
+SHA256 (rust/crates/rust_decimal-1.34.3.crate) = b39449a79f45e8da28c57c341891b69a183044b29518bb8f86dbac9df60bb7df
+SIZE (rust/crates/rust_decimal-1.34.3.crate) = 127935
+SHA256 (rust/crates/rustc-demangle-0.1.23.crate) = d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76
+SIZE (rust/crates/rustc-demangle-0.1.23.crate) = 28970
+SHA256 (rust/crates/rustix-0.37.27.crate) = fea8ca367a3a01fe35e6943c400addf443c0f57670e6ec51196f71a4b8762dd2
+SIZE (rust/crates/rustix-0.37.27.crate) = 324534
+SHA256 (rust/crates/rustix-0.38.31.crate) = 6ea3e1a662af26cd7a3ba09c0297a31af215563ecf42817c98df621387f4e949
+SIZE (rust/crates/rustix-0.38.31.crate) = 375443
+SHA256 (rust/crates/rustls-0.21.10.crate) = f9d5a6813c0759e4609cd494e8e725babae6a2ca7b62a5536a13daaec6fcb7ba
+SIZE (rust/crates/rustls-0.21.10.crate) = 284920
+SHA256 (rust/crates/rustls-pemfile-1.0.4.crate) = 1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c
+SIZE (rust/crates/rustls-pemfile-1.0.4.crate) = 22092
+SHA256 (rust/crates/rustls-webpki-0.101.7.crate) = 8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765
+SIZE (rust/crates/rustls-webpki-0.101.7.crate) = 168808
+SHA256 (rust/crates/rustyline-9.1.2.crate) = db7826789c0e25614b03e5a54a0717a86f9ff6e6e5247f92b369472869320039
+SIZE (rust/crates/rustyline-9.1.2.crate) = 100566
+SHA256 (rust/crates/ryu-1.0.17.crate) = e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1
+SIZE (rust/crates/ryu-1.0.17.crate) = 47537
+SHA256 (rust/crates/same-file-1.0.6.crate) = 93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502
+SIZE (rust/crates/same-file-1.0.6.crate) = 10183
+SHA256 (rust/crates/schannel-0.1.23.crate) = fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534
+SIZE (rust/crates/schannel-0.1.23.crate) = 41667
+SHA256 (rust/crates/scopeguard-1.2.0.crate) = 94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49
+SIZE (rust/crates/scopeguard-1.2.0.crate) = 11619
+SHA256 (rust/crates/sct-0.7.1.crate) = da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414
+SIZE (rust/crates/sct-0.7.1.crate) = 27501
+SHA256 (rust/crates/seahash-4.1.0.crate) = 1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b
+SIZE (rust/crates/seahash-4.1.0.crate) = 31976
+SHA256 (rust/crates/security-framework-2.9.2.crate) = 05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de
+SIZE (rust/crates/security-framework-2.9.2.crate) = 79295
+SHA256 (rust/crates/security-framework-sys-2.9.1.crate) = e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a
+SIZE (rust/crates/security-framework-sys-2.9.1.crate) = 18284
+SHA256 (rust/crates/semver-1.0.22.crate) = 92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca
+SIZE (rust/crates/semver-1.0.22.crate) = 30446
+SHA256 (rust/crates/serde-1.0.197.crate) = 3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2
+SIZE (rust/crates/serde-1.0.197.crate) = 77087
+SHA256 (rust/crates/serde_derive-1.0.197.crate) = 7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b
+SIZE (rust/crates/serde_derive-1.0.197.crate) = 55771
+SHA256 (rust/crates/serde_json-1.0.114.crate) = c5f09b1bd632ef549eaa9f60a1f8de742bdbc698e6cee2095fc84dde5f549ae0
+SIZE (rust/crates/serde_json-1.0.114.crate) = 146986
+SHA256 (rust/crates/serde_urlencoded-0.7.1.crate) = d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd
+SIZE (rust/crates/serde_urlencoded-0.7.1.crate) = 12822
+SHA256 (rust/crates/serde_with-2.3.3.crate) = 07ff71d2c147a7b57362cead5e22f772cd52f6ab31cfcd9edcd7f6aeb2a0afbe
+SIZE (rust/crates/serde_with-2.3.3.crate) = 123415
+SHA256 (rust/crates/serde_with_macros-2.3.3.crate) = 881b6f881b17d13214e5d494c939ebab463d01264ce1811e9d4ac3a882e7695f
+SIZE (rust/crates/serde_with_macros-2.3.3.crate) = 28198
+SHA256 (rust/crates/sha1-0.10.6.crate) = e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba
+SIZE (rust/crates/sha1-0.10.6.crate) = 13517
+SHA256 (rust/crates/sha2-0.10.8.crate) = 793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8
+SIZE (rust/crates/sha2-0.10.8.crate) = 26357
+SHA256 (rust/crates/signal-hook-0.3.17.crate) = 8621587d4798caf8eb44879d42e56b9a93ea5dcd315a6487c357130095b62801
+SIZE (rust/crates/signal-hook-0.3.17.crate) = 50296
+SHA256 (rust/crates/signal-hook-mio-0.2.3.crate) = 29ad2e15f37ec9a6cc544097b78a1ec90001e9f71b81338ca39f430adaca99af
+SIZE (rust/crates/signal-hook-mio-0.2.3.crate) = 9064
+SHA256 (rust/crates/signal-hook-registry-1.4.1.crate) = d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1
+SIZE (rust/crates/signal-hook-registry-1.4.1.crate) = 17987
+SHA256 (rust/crates/signature-2.2.0.crate) = 77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de
+SIZE (rust/crates/signature-2.2.0.crate) = 15531
+SHA256 (rust/crates/simdutf8-0.1.4.crate) = f27f6278552951f1f2b8cf9da965d10969b2efdea95a6ec47987ab46edfe263a
+SIZE (rust/crates/simdutf8-0.1.4.crate) = 28621
+SHA256 (rust/crates/slab-0.4.9.crate) = 8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67
+SIZE (rust/crates/slab-0.4.9.crate) = 17108
+SHA256 (rust/crates/smallvec-1.13.1.crate) = e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7
+SIZE (rust/crates/smallvec-1.13.1.crate) = 34952
+SHA256 (rust/crates/socket2-0.4.10.crate) = 9f7916fc008ca5542385b89a3d3ce689953c143e9304a9bf8beec1de48994c0d
+SIZE (rust/crates/socket2-0.4.10.crate) = 45697
+SHA256 (rust/crates/socket2-0.5.6.crate) = 05ffd9c0a93b7543e062e759284fcf5f5e3b098501104bfbdde4d404db792871
+SIZE (rust/crates/socket2-0.5.6.crate) = 55270
+SHA256 (rust/crates/spin-0.5.2.crate) = 6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d
+SIZE (rust/crates/spin-0.5.2.crate) = 12004
+SHA256 (rust/crates/spin-0.9.8.crate) = 6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67
+SIZE (rust/crates/spin-0.9.8.crate) = 38958
+SHA256 (rust/crates/spki-0.7.3.crate) = d91ed6c858b01f942cd56b37a94b3e0a1798290327d1236e4d9cf4eaca44d29d
+SIZE (rust/crates/spki-0.7.3.crate) = 16409
+SHA256 (rust/crates/sqlformat-0.2.3.crate) = ce81b7bd7c4493975347ef60d8c7e8b742d4694f4c49f93e0a12ea263938176c
+SIZE (rust/crates/sqlformat-0.2.3.crate) = 21878
+SHA256 (rust/crates/str-buf-1.0.6.crate) = 9e08d8363704e6c71fc928674353e6b7c23dcea9d82d7012c8faf2a3a025f8d0
+SIZE (rust/crates/str-buf-1.0.6.crate) = 3828
+SHA256 (rust/crates/stringprep-0.1.4.crate) = bb41d74e231a107a1b4ee36bd1214b11285b77768d2e3824aedafa988fd36ee6
+SIZE (rust/crates/stringprep-0.1.4.crate) = 23551
+SHA256 (rust/crates/strsim-0.8.0.crate) = 8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a
+SIZE (rust/crates/strsim-0.8.0.crate) = 9309
+SHA256 (rust/crates/strsim-0.10.0.crate) = 73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623
+SIZE (rust/crates/strsim-0.10.0.crate) = 11355
+SHA256 (rust/crates/strsim-0.11.0.crate) = 5ee073c9e4cd00e28217186dbe12796d692868f432bf2e97ee73bed0c56dfa01
+SIZE (rust/crates/strsim-0.11.0.crate) = 13710
+SHA256 (rust/crates/structopt-0.3.26.crate) = 0c6b5c64445ba8094a6ab0c3cd2ad323e07171012d9c98b0b15651daf1787a10
+SIZE (rust/crates/structopt-0.3.26.crate) = 53798
+SHA256 (rust/crates/structopt-derive-0.4.18.crate) = dcb5ae327f9cc13b68763b5749770cb9e048a99bd9dfdfa58d0cf05d5f64afe0
+SIZE (rust/crates/structopt-derive-0.4.18.crate) = 20996
+SHA256 (rust/crates/subtle-2.5.0.crate) = 81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc
+SIZE (rust/crates/subtle-2.5.0.crate) = 13909
+SHA256 (rust/crates/syn-1.0.109.crate) = 72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237
+SIZE (rust/crates/syn-1.0.109.crate) = 237611
+SHA256 (rust/crates/syn-2.0.52.crate) = b699d15b36d1f02c3e7c69f8ffef53de37aefae075d8488d4ba1a7788d574a07
+SIZE (rust/crates/syn-2.0.52.crate) = 254728
+SHA256 (rust/crates/syn_derive-0.1.8.crate) = 1329189c02ff984e9736652b1631330da25eaa6bc639089ed4915d25446cbe7b
+SIZE (rust/crates/syn_derive-0.1.8.crate) = 5173
+SHA256 (rust/crates/sync_wrapper-0.1.2.crate) = 2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160
+SIZE (rust/crates/sync_wrapper-0.1.2.crate) = 6933
+SHA256 (rust/crates/tap-1.0.1.crate) = 55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369
+SIZE (rust/crates/tap-1.0.1.crate) = 11316
+SHA256 (rust/crates/tempfile-3.10.1.crate) = 85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1
+SIZE (rust/crates/tempfile-3.10.1.crate) = 33653
+SHA256 (rust/crates/termcolor-1.4.1.crate) = 06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755
+SIZE (rust/crates/termcolor-1.4.1.crate) = 18773
+SHA256 (rust/crates/termtree-0.4.1.crate) = 3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76
+SIZE (rust/crates/termtree-0.4.1.crate) = 4557
+SHA256 (rust/crates/textwrap-0.11.0.crate) = d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060
+SIZE (rust/crates/textwrap-0.11.0.crate) = 17322
+SHA256 (rust/crates/thiserror-1.0.57.crate) = 1e45bcbe8ed29775f228095caf2cd67af7a4ccf756ebff23a306bf3e8b47b24b
+SIZE (rust/crates/thiserror-1.0.57.crate) = 20993
+SHA256 (rust/crates/thiserror-impl-1.0.57.crate) = a953cb265bef375dae3de6663da4d3804eee9682ea80d8e2542529b73c531c81
+SIZE (rust/crates/thiserror-impl-1.0.57.crate) = 15639
+SHA256 (rust/crates/time-0.3.34.crate) = c8248b6521bb14bc45b4067159b9b6ad792e2d6d754d6c41fb50e29fefe38749
+SIZE (rust/crates/time-0.3.34.crate) = 118430
+SHA256 (rust/crates/time-core-0.1.2.crate) = ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3
+SIZE (rust/crates/time-core-0.1.2.crate) = 7191
+SHA256 (rust/crates/time-macros-0.2.17.crate) = 7ba3a3ef41e6672a2f0f001392bb5dcd3ff0a9992d618ca761a11c3121547774
+SIZE (rust/crates/time-macros-0.2.17.crate) = 24443
+SHA256 (rust/crates/tinytemplate-1.2.1.crate) = be4d6b5f19ff7664e8c98d03e2139cb510db9b0a60b55f8e8709b689d939b6bc
+SIZE (rust/crates/tinytemplate-1.2.1.crate) = 26490
+SHA256 (rust/crates/tinyvec-1.6.0.crate) = 87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50
+SIZE (rust/crates/tinyvec-1.6.0.crate) = 45991
+SHA256 (rust/crates/tinyvec_macros-0.1.1.crate) = 1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20
+SIZE (rust/crates/tinyvec_macros-0.1.1.crate) = 5865
+SHA256 (rust/crates/tokio-1.36.0.crate) = 61285f6515fa018fb2d1e46eb21223fff441ee8db5d0f1435e8ab4f5cdb80931
+SIZE (rust/crates/tokio-1.36.0.crate) = 757286
+SHA256 (rust/crates/tokio-macros-2.2.0.crate) = 5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b
+SIZE (rust/crates/tokio-macros-2.2.0.crate) = 11520
+SHA256 (rust/crates/tokio-stream-0.1.14.crate) = 397c988d37662c7dda6d2208364a706264bf3d6138b11d436cbac0ad38832842
+SIZE (rust/crates/tokio-stream-0.1.14.crate) = 35881
+SHA256 (rust/crates/toml_datetime-0.6.5.crate) = 3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1
+SIZE (rust/crates/toml_datetime-0.6.5.crate) = 10910
+SHA256 (rust/crates/toml_edit-0.21.1.crate) = 6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1
+SIZE (rust/crates/toml_edit-0.21.1.crate) = 101661
+SHA256 (rust/crates/tower-0.4.13.crate) = b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c
+SIZE (rust/crates/tower-0.4.13.crate) = 106906
+SHA256 (rust/crates/tower-http-0.3.5.crate) = f873044bf02dd1e8239e9c1293ea39dad76dc594ec16185d0a1bf31d8dc8d858
+SIZE (rust/crates/tower-http-0.3.5.crate) = 107116
+SHA256 (rust/crates/tower-layer-0.3.2.crate) = c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0
+SIZE (rust/crates/tower-layer-0.3.2.crate) = 6023
+SHA256 (rust/crates/tower-service-0.3.2.crate) = b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52
+SIZE (rust/crates/tower-service-0.3.2.crate) = 6847
+SHA256 (rust/crates/tracing-0.1.40.crate) = c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef
+SIZE (rust/crates/tracing-0.1.40.crate) = 79459
+SHA256 (rust/crates/tracing-attributes-0.1.27.crate) = 34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7
+SIZE (rust/crates/tracing-attributes-0.1.27.crate) = 32241
+SHA256 (rust/crates/tracing-core-0.1.32.crate) = c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54
+SIZE (rust/crates/tracing-core-0.1.32.crate) = 61221
+SHA256 (rust/crates/try-lock-0.2.5.crate) = e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b
+SIZE (rust/crates/try-lock-0.2.5.crate) = 4314
+SHA256 (rust/crates/trybuild-1.0.89.crate) = 9a9d3ba662913483d6722303f619e75ea10b7855b0f8e0d72799cf8621bb488f
+SIZE (rust/crates/trybuild-1.0.89.crate) = 41033
+SHA256 (rust/crates/tui-0.19.0.crate) = ccdd26cbd674007e649a272da4475fb666d3aa0ad0531da7136db6fab0e5bad1
+SIZE (rust/crates/tui-0.19.0.crate) = 141279
+SHA256 (rust/crates/typenum-1.17.0.crate) = 42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825
+SIZE (rust/crates/typenum-1.17.0.crate) = 42849
+SHA256 (rust/crates/unicode-bidi-0.3.15.crate) = 08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75
+SIZE (rust/crates/unicode-bidi-0.3.15.crate) = 56811
+SHA256 (rust/crates/unicode-ident-1.0.12.crate) = 3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b
+SIZE (rust/crates/unicode-ident-1.0.12.crate) = 42168
+SHA256 (rust/crates/unicode-normalization-0.1.23.crate) = a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5
+SIZE (rust/crates/unicode-normalization-0.1.23.crate) = 122649
+SHA256 (rust/crates/unicode-segmentation-1.11.0.crate) = d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202
+SIZE (rust/crates/unicode-segmentation-1.11.0.crate) = 102740
+SHA256 (rust/crates/unicode-width-0.1.11.crate) = e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85
+SIZE (rust/crates/unicode-width-0.1.11.crate) = 19187
+SHA256 (rust/crates/unicode_categories-0.1.1.crate) = 39ec24b3121d976906ece63c9daad25b85969647682eee313cb5779fdd69e14e
+SIZE (rust/crates/unicode_categories-0.1.1.crate) = 87298
+SHA256 (rust/crates/untrusted-0.9.0.crate) = 8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1
+SIZE (rust/crates/untrusted-0.9.0.crate) = 14447
+SHA256 (rust/crates/url-2.5.0.crate) = 31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633
+SIZE (rust/crates/url-2.5.0.crate) = 78605
+SHA256 (rust/crates/urlencoding-2.1.3.crate) = daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da
+SIZE (rust/crates/urlencoding-2.1.3.crate) = 6538
+SHA256 (rust/crates/utf8parse-0.2.1.crate) = 711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a
+SIZE (rust/crates/utf8parse-0.2.1.crate) = 13435
+SHA256 (rust/crates/uuid-1.7.0.crate) = f00cc9702ca12d3c81455259621e676d0f7251cec66a21e98fe2e9a37db93b2a
+SIZE (rust/crates/uuid-1.7.0.crate) = 42627
+SHA256 (rust/crates/validator-0.16.1.crate) = b92f40481c04ff1f4f61f304d61793c7b56ff76ac1469f1beb199b1445b253bd
+SIZE (rust/crates/validator-0.16.1.crate) = 13718
+SHA256 (rust/crates/validator_derive-0.16.0.crate) = bc44ca3088bb3ba384d9aecf40c6a23a676ce23e09bdaca2073d99c207f864af
+SIZE (rust/crates/validator_derive-0.16.0.crate) = 12759
+SHA256 (rust/crates/validator_types-0.16.0.crate) = 111abfe30072511849c5910134e8baf8dc05de4c0e5903d681cbd5c9c4d611e3
+SIZE (rust/crates/validator_types-0.16.0.crate) = 2145
+SHA256 (rust/crates/value-bag-1.8.0.crate) = 8fec26a25bd6fca441cdd0f769fd7f891bae119f996de31f86a5eddccef54c1d
+SIZE (rust/crates/value-bag-1.8.0.crate) = 38836
+SHA256 (rust/crates/vcpkg-0.2.15.crate) = accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426
+SIZE (rust/crates/vcpkg-0.2.15.crate) = 228735
+SHA256 (rust/crates/vec_map-0.8.2.crate) = f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191
+SIZE (rust/crates/vec_map-0.8.2.crate) = 14466
+SHA256 (rust/crates/version_check-0.9.4.crate) = 49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f
+SIZE (rust/crates/version_check-0.9.4.crate) = 14895
+SHA256 (rust/crates/wait-timeout-0.2.0.crate) = 9f200f5b12eb75f8c1ed65abd4b2db8a6e1b138a20de009dacee265a2498f3f6
+SIZE (rust/crates/wait-timeout-0.2.0.crate) = 12441
+SHA256 (rust/crates/waker-fn-1.1.1.crate) = f3c4517f54858c779bbcbf228f4fca63d121bf85fbecb2dc578cdf4a39395690
+SIZE (rust/crates/waker-fn-1.1.1.crate) = 6323
+SHA256 (rust/crates/walkdir-2.5.0.crate) = 29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b
+SIZE (rust/crates/walkdir-2.5.0.crate) = 23951
+SHA256 (rust/crates/want-0.3.1.crate) = bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e
+SIZE (rust/crates/want-0.3.1.crate) = 6398
+SHA256 (rust/crates/wasi-0.11.0+wasi-snapshot-preview1.crate) = 9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423
+SIZE (rust/crates/wasi-0.11.0+wasi-snapshot-preview1.crate) = 28131
+SHA256 (rust/crates/wasite-0.1.0.crate) = b8dad83b4f25e74f184f64c43b150b91efe7647395b42289f38e50566d82855b
+SIZE (rust/crates/wasite-0.1.0.crate) = 2346
+SHA256 (rust/crates/wasm-bindgen-0.2.92.crate) = 4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8
+SIZE (rust/crates/wasm-bindgen-0.2.92.crate) = 184119
+SHA256 (rust/crates/wasm-bindgen-backend-0.2.92.crate) = 614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da
+SIZE (rust/crates/wasm-bindgen-backend-0.2.92.crate) = 28348
+SHA256 (rust/crates/wasm-bindgen-futures-0.4.42.crate) = 76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0
+SIZE (rust/crates/wasm-bindgen-futures-0.4.42.crate) = 15380
+SHA256 (rust/crates/wasm-bindgen-macro-0.2.92.crate) = a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726
+SIZE (rust/crates/wasm-bindgen-macro-0.2.92.crate) = 13835
+SHA256 (rust/crates/wasm-bindgen-macro-support-0.2.92.crate) = e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7
+SIZE (rust/crates/wasm-bindgen-macro-support-0.2.92.crate) = 20092
+SHA256 (rust/crates/wasm-bindgen-shared-0.2.92.crate) = af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96
+SIZE (rust/crates/wasm-bindgen-shared-0.2.92.crate) = 7263
+SHA256 (rust/crates/web-sys-0.3.69.crate) = 77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef
+SIZE (rust/crates/web-sys-0.3.69.crate) = 728877
+SHA256 (rust/crates/webpki-roots-0.25.4.crate) = 5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1
+SIZE (rust/crates/webpki-roots-0.25.4.crate) = 253559
+SHA256 (rust/crates/whoami-1.5.1.crate) = a44ab49fad634e88f55bf8f9bb3abd2f27d7204172a112c7c9987e01c1c94ea9
+SIZE (rust/crates/whoami-1.5.1.crate) = 24026
+SHA256 (rust/crates/winapi-0.3.9.crate) = 5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419
+SIZE (rust/crates/winapi-0.3.9.crate) = 1200382
+SHA256 (rust/crates/winapi-i686-pc-windows-gnu-0.4.0.crate) = ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6
+SIZE (rust/crates/winapi-i686-pc-windows-gnu-0.4.0.crate) = 2918815
+SHA256 (rust/crates/winapi-util-0.1.6.crate) = f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596
+SIZE (rust/crates/winapi-util-0.1.6.crate) = 12234
+SHA256 (rust/crates/winapi-x86_64-pc-windows-gnu-0.4.0.crate) = 712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f
+SIZE (rust/crates/winapi-x86_64-pc-windows-gnu-0.4.0.crate) = 2947998
+SHA256 (rust/crates/windows-core-0.52.0.crate) = 33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9
+SIZE (rust/crates/windows-core-0.52.0.crate) = 42154
+SHA256 (rust/crates/windows-sys-0.48.0.crate) = 677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9
+SIZE (rust/crates/windows-sys-0.48.0.crate) = 2628884
+SHA256 (rust/crates/windows-sys-0.52.0.crate) = 282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d
+SIZE (rust/crates/windows-sys-0.52.0.crate) = 2576877
+SHA256 (rust/crates/windows-targets-0.48.5.crate) = 9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c
+SIZE (rust/crates/windows-targets-0.48.5.crate) = 6904
+SHA256 (rust/crates/windows-targets-0.52.4.crate) = 7dd37b7e5ab9018759f893a1952c9420d060016fc19a472b4bb20d1bdd694d1b
+SIZE (rust/crates/windows-targets-0.52.4.crate) = 6310
+SHA256 (rust/crates/windows_aarch64_gnullvm-0.48.5.crate) = 2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8
+SIZE (rust/crates/windows_aarch64_gnullvm-0.48.5.crate) = 418492
+SHA256 (rust/crates/windows_aarch64_gnullvm-0.52.4.crate) = bcf46cf4c365c6f2d1cc93ce535f2c8b244591df96ceee75d8e83deb70a9cac9
+SIZE (rust/crates/windows_aarch64_gnullvm-0.52.4.crate) = 433373
+SHA256 (rust/crates/windows_aarch64_msvc-0.48.5.crate) = dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc
+SIZE (rust/crates/windows_aarch64_msvc-0.48.5.crate) = 798483
+SHA256 (rust/crates/windows_aarch64_msvc-0.52.4.crate) = da9f259dd3bcf6990b55bffd094c4f7235817ba4ceebde8e6d11cd0c5633b675
+SIZE (rust/crates/windows_aarch64_msvc-0.52.4.crate) = 828055
+SHA256 (rust/crates/windows_i686_gnu-0.48.5.crate) = a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e
+SIZE (rust/crates/windows_i686_gnu-0.48.5.crate) = 844891
+SHA256 (rust/crates/windows_i686_gnu-0.52.4.crate) = b474d8268f99e0995f25b9f095bc7434632601028cf86590aea5c8a5cb7801d3
+SIZE (rust/crates/windows_i686_gnu-0.52.4.crate) = 875736
+SHA256 (rust/crates/windows_i686_msvc-0.48.5.crate) = 8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406
+SIZE (rust/crates/windows_i686_msvc-0.48.5.crate) = 864300
+SHA256 (rust/crates/windows_i686_msvc-0.52.4.crate) = 1515e9a29e5bed743cb4415a9ecf5dfca648ce85ee42e15873c3cd8610ff8e02
+SIZE (rust/crates/windows_i686_msvc-0.52.4.crate) = 895530
+SHA256 (rust/crates/windows_x86_64_gnu-0.48.5.crate) = 53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e
+SIZE (rust/crates/windows_x86_64_gnu-0.48.5.crate) = 801619
+SHA256 (rust/crates/windows_x86_64_gnu-0.52.4.crate) = 5eee091590e89cc02ad514ffe3ead9eb6b660aedca2183455434b93546371a03
+SIZE (rust/crates/windows_x86_64_gnu-0.52.4.crate) = 831627
+SHA256 (rust/crates/windows_x86_64_gnullvm-0.48.5.crate) = 0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc
+SIZE (rust/crates/windows_x86_64_gnullvm-0.48.5.crate) = 418486
+SHA256 (rust/crates/windows_x86_64_gnullvm-0.52.4.crate) = 77ca79f2451b49fa9e2af39f0747fe999fcda4f5e241b2898624dca97a1f2177
+SIZE (rust/crates/windows_x86_64_gnullvm-0.52.4.crate) = 433358
+SHA256 (rust/crates/windows_x86_64_msvc-0.48.5.crate) = ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538
+SIZE (rust/crates/windows_x86_64_msvc-0.48.5.crate) = 798412
+SHA256 (rust/crates/windows_x86_64_msvc-0.52.4.crate) = 32b752e52a2da0ddfbdbcc6fceadfeede4c939ed16d13e648833a61dfb611ed8
+SIZE (rust/crates/windows_x86_64_msvc-0.52.4.crate) = 828019
+SHA256 (rust/crates/winnow-0.5.40.crate) = f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876
+SIZE (rust/crates/winnow-0.5.40.crate) = 159316
+SHA256 (rust/crates/wyz-0.5.1.crate) = 05f360fc0b24296329c78fda852a1e9ae82de9cf7b27dae4b7f62f118f77b9ed
+SIZE (rust/crates/wyz-0.5.1.crate) = 18790
+SHA256 (rust/crates/zerocopy-0.7.32.crate) = 74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be
+SIZE (rust/crates/zerocopy-0.7.32.crate) = 151096
+SHA256 (rust/crates/zerocopy-derive-0.7.32.crate) = 9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6
+SIZE (rust/crates/zerocopy-derive-0.7.32.crate) = 37623
+SHA256 (rust/crates/zeroize-1.7.0.crate) = 525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d
+SIZE (rust/crates/zeroize-1.7.0.crate) = 19039
+SHA256 (launchbadge-sqlx-v0.7.4_GH0.tar.gz) = ec388590cc15232eca9d02356428c0527a6cc599d09136fac46f62116050fe77
+SIZE (launchbadge-sqlx-v0.7.4_GH0.tar.gz) = 915089
diff --git a/databases/sqlx-cli/pkg-descr b/databases/sqlx-cli/pkg-descr
new file mode 100644
index 000000000000..9b7ee23b6fe1
--- /dev/null
+++ b/databases/sqlx-cli/pkg-descr
@@ -0,0 +1,8 @@
+SQLx is an async, pure Rust SQL crate featuring compile-time checked queries
+without a DSL.
+
+Features:
+- Truly Asynchronous: Built from the ground-up using async/await
+  for maximum concurrency.
+- Compile-time checked queries.
+- Database Agnostic: Support for [PostgreSQL], [MySQL], [SQLite].
diff --git a/databases/sqsh/Makefile b/databases/sqsh/Makefile
index 8ee7591e525e..1d3885f10cc2 100644
--- a/databases/sqsh/Makefile
+++ b/databases/sqsh/Makefile
@@ -1,19 +1,19 @@
-# Created by: Domas Mituzas <midom@dammit.lt>
-
 PORTNAME=	sqsh
 PORTVERSION=	2.5.16.1
-PORTREVISION=	1
+PORTREVISION=	3
 CATEGORIES=	databases
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION:R:R}
 
-MAINTAINER=	ports@FreeBSD.org
+PATCH_SITES=	https://raw.githubusercontent.com/netzbasis/openbsd-ports/11f6e510cbdf022a7b6c71ee125a41ba443fe927/databases/sqsh/patches/
+PATCHFILES=	patch-src_cmd_connect_c
+
+MAINTAINER=	fuz@FreeBSD.org
 COMMENT=	Interactive tool for querying Sybase database servers
+WWW=		https://sourceforge.net/projects/sqsh
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BROKEN=		cmd_connect.c:1897:17: error: use of undeclared identifier 'CS_MAX_CHAR'
-
 LIB_DEPENDS=	libct.so:databases/freetds
 
 USES=		readline tar:tgz
@@ -23,12 +23,13 @@ CONFIGURE_ARGS=	--with-readline
 ALL_TARGET=	build
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:R:R}
 
-PLIST_FILES=	bin/sqsh etc/sqshrc.default man/man1/sqsh.1.gz
+PLIST_FILES=	bin/sqsh etc/sqshrc.default share/man/man1/sqsh.1.gz
 
 OPTIONS_DEFINE=	X11
 OPTIONS_DEFAULT=X11
 
 X11_USES=	motif
+X11_USE=	xorg=x11,xext,xmu,xt
 X11_CONFIGURE_ON=	--with-motif --with-x
 
 post-patch:
@@ -37,7 +38,7 @@ post-patch:
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/sqsh ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/doc/sqsh.1 ${STAGEDIR}${MANPREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/doc/sqsh.1 ${STAGEDIR}${PREFIX}/share/man/man1
 	${INSTALL_DATA} ${WRKSRC}/doc/global.sqshrc ${STAGEDIR}${PREFIX}/etc/sqshrc.default
 
 .include <bsd.port.mk>
diff --git a/databases/sqsh/distinfo b/databases/sqsh/distinfo
index a57f371e1677..5e4278b49237 100644
--- a/databases/sqsh/distinfo
+++ b/databases/sqsh/distinfo
@@ -1,3 +1,5 @@
-TIMESTAMP = 1524247164
+TIMESTAMP = 1648655356
 SHA256 (sqsh-2.5.16.1.tgz) = d6641f365ace60225fc0fa48f82b9dbed77a4e506a0e497eb6889e096b8320f2
 SIZE (sqsh-2.5.16.1.tgz) = 623715
+SHA256 (patch-src_cmd_connect_c) = 1270ac466cacbac98952190315964cda0e8da0e955e01d14030a4091ed3ce9b7
+SIZE (patch-src_cmd_connect_c) = 1579
diff --git a/databases/sqsh/files/patch-src_cmd__connect.c b/databases/sqsh/files/patch-src_cmd__connect.c
index b2c79eee90b9..dc77a7dc194b 100644
--- a/databases/sqsh/files/patch-src_cmd__connect.c
+++ b/databases/sqsh/files/patch-src_cmd__connect.c
@@ -1,6 +1,7 @@
---- src/cmd_connect.c	2014-04-04 08:22:38
-+++ src/cmd_connect.c	2018-04-20 18:26:38
-@@ -861,6 +861,14 @@
+--- src/cmd_connect.c.orig	2014-04-04 08:22:38 UTC
++++ src/cmd_connect.c
+@@ -860,8 +860,16 @@ int cmd_connect( argc, argv )
+         /* Then we use freetds which uses enum instead of defines */
          else if (strcmp(tds_version, "7.0") == 0)
              version = CS_TDS_70;
 +        else if (strcmp(tds_version, "7.1") == 0)
@@ -12,15 +13,15 @@
 +        else if (strcmp(tds_version, "7.4") == 0)
 +            version = CS_TDS_74;
          else if (strcmp(tds_version, "8.0") == 0)
--            version = CS_TDS_80;
-+            version = CS_TDS_71; /* https://sourceforge.net/p/sqsh/discussion/365924/thread/29ae1664/#7f59/707f */
+             version = CS_TDS_71;
  #endif
          else version = CS_TDS_50; /* default version */
-@@ -1259,7 +1267,16 @@
+ 
+@@ -1258,9 +1266,18 @@ int cmd_connect( argc, argv )
+                 case CS_TDS_70:
                      env_set( g_env, "tds_version", "7.0" );
                      break;
--                case CS_TDS_80:
-+                case CS_TDS_71:
+                 case CS_TDS_71:
                      env_set( g_env, "tds_version", "8.0" );
                      break;
 +                case CS_TDS_72:
@@ -34,3 +35,4 @@
 +                    break;
  #endif
                  default:
+                     env_set( g_env, "tds_version", "unknown" );
diff --git a/databases/sqsh/pkg-descr b/databases/sqsh/pkg-descr
index e74832bc3699..2e292ec21004 100644
--- a/databases/sqsh/pkg-descr
+++ b/databases/sqsh/pkg-descr
@@ -1,4 +1,2 @@
 This is alternative to ancient isql - interactive
 and comfortable database query tool for Sybase.
-
-WWW: http://www.sqsh.org/
diff --git a/databases/squirrel-sql/Makefile b/databases/squirrel-sql/Makefile
index ec6a560d315c..ebc2063f3f8d 100644
--- a/databases/squirrel-sql/Makefile
+++ b/databases/squirrel-sql/Makefile
@@ -1,24 +1,17 @@
-# Created by: Roy Boerner
-
 PORTNAME=	squirrel-sql
-PORTVERSION=	4.2.0
+PORTVERSION=	4.7.1
 CATEGORIES=	databases java
 MASTER_SITES=	SF/${PORTNAME}/1-stable/${PORTVERSION}-plainzip
 DISTNAME=	squirrelsql-${PORTVERSION}-optional
 
 MAINTAINER=	jonc@chen.org.nz
 COMMENT=	Universal SQL Client
+WWW=		http://www.squirrelsql.org/
 
 LICENSE=	GPLv2
 
 USES=		zip
-
-USE_JAVA=	8+
-NO_BUILD=	yes
-NO_ARCH=	yes
-WRKSRC=		${WRKDIR}/${DISTNAME}
-
-SUB_FILES=	squirrel-sql
+USE_JAVA=	11+
 
 DATADIR=	${PREFIX}/share/java/${PKGBASE}
 
@@ -28,6 +21,12 @@ DESKTOP_ENTRIES="Squirrel-SQL Client" \
 		"squirrel-sql" \
 		"Development;Database;Java;" \
 		false
+NO_ARCH=	yes
+NO_BUILD=	yes
+
+SUB_FILES=	squirrel-sql
+
+WRKSRC=		${WRKDIR}/${DISTNAME}
 
 post-extract:
 	cd "${WRKSRC}" && ${RM} -r *.bat *.sh icons/acorn.png.bak.png mac squirrelcli
diff --git a/databases/squirrel-sql/distinfo b/databases/squirrel-sql/distinfo
index 30afcc6b963e..26c4d61c453f 100644
--- a/databases/squirrel-sql/distinfo
+++ b/databases/squirrel-sql/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1622511901
-SHA256 (squirrelsql-4.2.0-optional.zip) = 664ee4f2cf40b3a6e12ee57cbfa1361a156ee8539862b04fa85ad39c873f1105
-SIZE (squirrelsql-4.2.0-optional.zip) = 59859070
+TIMESTAMP = 1711051942
+SHA256 (squirrelsql-4.7.1-optional.zip) = efaf42e08fa9a8a8ab032bea13106d660ae1b9327ed97c7810ceff12a285a4d2
+SIZE (squirrelsql-4.7.1-optional.zip) = 54312644
diff --git a/databases/squirrel-sql/pkg-descr b/databases/squirrel-sql/pkg-descr
index 958dcd173478..b8facd6adb4f 100644
--- a/databases/squirrel-sql/pkg-descr
+++ b/databases/squirrel-sql/pkg-descr
@@ -1,5 +1,3 @@
 SQuirreL SQL Client is a graphical Java program that will allow you to view the
 structure of a JDBC compliant database, browse the data in tables, issue SQL
 commands etc.
-
-WWW: http://www.squirrelsql.org/index.php?page=screenshots
diff --git a/databases/squirrel-sql/pkg-plist b/databases/squirrel-sql/pkg-plist
index e5c5af262f93..db5cd871d5dc 100644
--- a/databases/squirrel-sql/pkg-plist
+++ b/databases/squirrel-sql/pkg-plist
@@ -17,6 +17,7 @@ bin/squirrel-sql
 %%DATADIR%%/doc/images/color-properties.png
 %%DATADIR%%/doc/images/connect_window.png
 %%DATADIR%%/doc/images/createresultwindow.gif
+%%DATADIR%%/doc/images/creattable.jpg
 %%DATADIR%%/doc/images/discovery.gif
 %%DATADIR%%/doc/images/drivers_tool_window_1.png
 %%DATADIR%%/doc/images/error_st_obj.gif
@@ -49,6 +50,9 @@ bin/squirrel-sql
 %%DATADIR%%/doc/images/session_props_general.png
 %%DATADIR%%/doc/images/session_props_objecttree.png
 %%DATADIR%%/doc/images/session_props_sql.png
+%%DATADIR%%/doc/images/sql2file.jpg
+%%DATADIR%%/doc/images/sql2file_exportController.jpg
+%%DATADIR%%/doc/images/sql2file_progress.jpg
 %%DATADIR%%/doc/images/sql_1.png
 %%DATADIR%%/doc/images/sql_2.png
 %%DATADIR%%/doc/images/sql_history_dialog.png
@@ -56,6 +60,7 @@ bin/squirrel-sql
 %%DATADIR%%/doc/images/stacked_tabs.png
 %%DATADIR%%/doc/images/tabbed_session_layout.png
 %%DATADIR%%/doc/images/toolspopup.jpg
+%%DATADIR%%/doc/images/toolspopup_scripting.jpg
 %%DATADIR%%/doc/images/update-dialog.png
 %%DATADIR%%/doc/images/update-settings.png
 %%DATADIR%%/doc/images/update_download_progress.png
@@ -81,50 +86,38 @@ bin/squirrel-sql
 %%DATADIR%%/icons/acorn.png
 %%DATADIR%%/icons/acorn.xpm
 %%DATADIR%%/icons/splash.jpg
-%%DATADIR%%/lib/RText.jar
 %%DATADIR%%/lib/antlr.jar
 %%DATADIR%%/lib/asm-attrs.jar
 %%DATADIR%%/lib/asm.jar
-%%DATADIR%%/lib/autocomplete-3.1.0.jar
-%%DATADIR%%/lib/axis-jaxrpc.jar
-%%DATADIR%%/lib/axis-saaj.jar
-%%DATADIR%%/lib/axis-wsdl4j.jar
-%%DATADIR%%/lib/axis.jar
 %%DATADIR%%/lib/cglib.jar
-%%DATADIR%%/lib/common.jar
 %%DATADIR%%/lib/commons-cli-1.4.jar
 %%DATADIR%%/lib/commons-codec-1.13.jar
 %%DATADIR%%/lib/commons-collections-3.2.1.jar
 %%DATADIR%%/lib/commons-discovery.jar
 %%DATADIR%%/lib/commons-httpclient.jar
-%%DATADIR%%/lib/commons-lang.jar
-%%DATADIR%%/lib/commons-logging.jar
+%%DATADIR%%/lib/commons-lang3-3.12.0.jar
+%%DATADIR%%/lib/commons-logging-1.2.jar
 %%DATADIR%%/lib/dom4j-2.1.3.jar
-%%DATADIR%%/lib/forms.jar
-%%DATADIR%%/lib/hibernate-annotations.jar
-%%DATADIR%%/lib/hibernate-commons-annotations.jar
-%%DATADIR%%/lib/hibernate-entitymanager.jar
-%%DATADIR%%/lib/hibernate.jar
 %%DATADIR%%/lib/jackson-annotations-2.6.3.jar
 %%DATADIR%%/lib/jackson-core-2.6.3.jar
 %%DATADIR%%/lib/jackson-databind-2.6.3.jar
 %%DATADIR%%/lib/java-diff-utils-4.5.jar
 %%DATADIR%%/lib/javahelp.jar
 %%DATADIR%%/lib/javax.activation.jar
-%%DATADIR%%/lib/jfreechart-1.5.0.jar
-%%DATADIR%%/lib/jgit5.6.0.201912101111-r-with-dependencies.jar
-%%DATADIR%%/lib/jide-oss.jar
-%%DATADIR%%/lib/jmeld-3.4.0-jar-with-some-dependencies.jar
-%%DATADIR%%/lib/jsqlparser-3.3-SNAPSHOT.jar
-%%DATADIR%%/lib/log4j.jar
+%%DATADIR%%/lib/jfreechart-1.5.3.jar
+%%DATADIR%%/lib/jgit6.0.0.202111291000-r-with-dependencies.jar
+%%DATADIR%%/lib/jmeld-3.6.0-jar-with-some-dependencies.jar
+%%DATADIR%%/lib/jsqlparser-4.3.jar
 %%DATADIR%%/lib/markdowngeneratorJava1_6.jar
-%%DATADIR%%/lib/nanoxml.jar
 %%DATADIR%%/lib/org.eclipse.equinox.common.jar
 %%DATADIR%%/lib/poi-ooxml-schemas.jar
 %%DATADIR%%/lib/poi-ooxml.jar
 %%DATADIR%%/lib/poi.jar
-%%DATADIR%%/lib/rstaui-3.1.0.jar
-%%DATADIR%%/lib/rsyntaxtextarea-3.1.1.jar
+%%DATADIR%%/lib/rsyntax_RText-6.0.2.jar
+%%DATADIR%%/lib/rsyntax_autocomplete-3.3.1.jar
+%%DATADIR%%/lib/rsyntax_rstaui-3.3.1.jar
+%%DATADIR%%/lib/rsyntax_rsyntaxtextarea-3.3.4.jar
+%%DATADIR%%/lib/slf4j-api-1.7.32.jar
 %%DATADIR%%/lib/sound_jlayer-1.0.1.4.jar
 %%DATADIR%%/lib/sound_jorbis-0.0.17.4.jar
 %%DATADIR%%/lib/sound_mp3spi-1.9.5.4.jar
@@ -137,7 +130,10 @@ bin/squirrel-sql
 %%DATADIR%%/lib/versioncheck.jar
 %%DATADIR%%/lib/xml-apis.jar
 %%DATADIR%%/lib/xmlbeans.jar
-%%DATADIR%%/log4j.properties
+%%DATADIR%%/plugins/cache.jar
+%%DATADIR%%/plugins/cache/doc/changes.txt
+%%DATADIR%%/plugins/cache/doc/licence.txt
+%%DATADIR%%/plugins/cache/doc/readme.txt
 %%DATADIR%%/plugins/codecompletion.jar
 %%DATADIR%%/plugins/codecompletion/doc/changes.txt
 %%DATADIR%%/plugins/codecompletion/doc/completionpopup.jpg
@@ -145,11 +141,6 @@ bin/squirrel-sql
 %%DATADIR%%/plugins/codecompletion/doc/licence.txt
 %%DATADIR%%/plugins/codecompletion/doc/readme.html
 %%DATADIR%%/plugins/codecompletion/doc/readme.txt
-%%DATADIR%%/plugins/dataimport.jar
-%%DATADIR%%/plugins/dataimport/doc/TODO.txt
-%%DATADIR%%/plugins/dataimport/doc/changes.txt
-%%DATADIR%%/plugins/dataimport/doc/licence.txt
-%%DATADIR%%/plugins/dataimport/doc/readme.html
 %%DATADIR%%/plugins/db2.jar
 %%DATADIR%%/plugins/db2/doc/changes.txt
 %%DATADIR%%/plugins/db2/doc/images/index_details.jpg
@@ -227,13 +218,6 @@ bin/squirrel-sql
 %%DATADIR%%/plugins/dbcopy/www/phpinfo.php
 %%DATADIR%%/plugins/dbcopy/www/screenshots.html
 %%DATADIR%%/plugins/dbcopy/www/style.css
-%%DATADIR%%/plugins/dbdiff.jar
-%%DATADIR%%/plugins/dbdiff/doc/changes.txt
-%%DATADIR%%/plugins/dbdiff/doc/images/compare_menu.png
-%%DATADIR%%/plugins/dbdiff/doc/images/differences_dialog.png
-%%DATADIR%%/plugins/dbdiff/doc/images/select_menu.png
-%%DATADIR%%/plugins/dbdiff/doc/licence.txt
-%%DATADIR%%/plugins/dbdiff/doc/readme.html
 %%DATADIR%%/plugins/derby.jar
 %%DATADIR%%/plugins/derby/doc/changes.txt
 %%DATADIR%%/plugins/derby/doc/images/trigger_details.jpg
@@ -280,12 +264,21 @@ bin/squirrel-sql
 %%DATADIR%%/plugins/h2/doc/licence.txt
 %%DATADIR%%/plugins/h2/doc/readme.html
 %%DATADIR%%/plugins/hibernate.jar
+%%DATADIR%%/plugins/hibernate/doc/browseEntities.png
 %%DATADIR%%/plugins/hibernate/doc/changes.txt
 %%DATADIR%%/plugins/hibernate/doc/factory.jpg
 %%DATADIR%%/plugins/hibernate/doc/hibernate.jpg
+%%DATADIR%%/plugins/hibernate/doc/hibernateConfig.png
+%%DATADIR%%/plugins/hibernate/doc/hql_jql.png
+%%DATADIR%%/plugins/hibernate/doc/launchInConsole.png
 %%DATADIR%%/plugins/hibernate/doc/licence.txt
 %%DATADIR%%/plugins/hibernate/doc/readme.html
 %%DATADIR%%/plugins/hibernate/doc/session.png
+%%DATADIR%%/plugins/highresicon.jar
+%%DATADIR%%/plugins/highresicon/doc/changes.txt
+%%DATADIR%%/plugins/highresicon/doc/licence.txt
+%%DATADIR%%/plugins/highresicon/doc/readme.txt
+%%DATADIR%%/plugins/highresicon/lib/xbrz-1.8.jar
 %%DATADIR%%/plugins/i18n.jar
 %%DATADIR%%/plugins/i18n/doc/changes.txt
 %%DATADIR%%/plugins/i18n/doc/licence.txt
@@ -316,16 +309,19 @@ bin/squirrel-sql
 %%DATADIR%%/plugins/laf/doc/tinylaf-license.txt
 %%DATADIR%%/plugins/laf/doc/tonic-licence.txt
 %%DATADIR%%/plugins/laf/lafs/JTattoo-1.6.10.jar
-%%DATADIR%%/plugins/laf/lafs/flatlaf-1.0.jar
+%%DATADIR%%/plugins/laf/lafs/flatlaf-3.2.5.jar
 %%DATADIR%%/plugins/laf/lafs/ilf-gpl.jar
 %%DATADIR%%/plugins/laf/lafs/jgoodies-common-1.8.1.jar
 %%DATADIR%%/plugins/laf/lafs/jgoodies-looks-2.5.3.jar
 %%DATADIR%%/plugins/laf/lafs/kunststoff.jar
 %%DATADIR%%/plugins/laf/lafs/napkinlaf-1.3-SNAPSHOT.jar
 %%DATADIR%%/plugins/laf/lafs/nimrod-laf.jar
+%%DATADIR%%/plugins/laf/lafs/radiance-animation-5.0.0.jar
+%%DATADIR%%/plugins/laf/lafs/radiance-common-5.0.0.jar
+%%DATADIR%%/plugins/laf/lafs/radiance-theming-5.0.0.jar
+%%DATADIR%%/plugins/laf/lafs/radiance-theming-extras-5.0.0.jar
 %%DATADIR%%/plugins/laf/lafs/readme.txt
 %%DATADIR%%/plugins/laf/lafs/skinlf.jar
-%%DATADIR%%/plugins/laf/lafs/substance.jar
 %%DATADIR%%/plugins/laf/lafs/swingsetthemes.jar
 %%DATADIR%%/plugins/laf/lafs/tinylaf.jar
 %%DATADIR%%/plugins/laf/lafs/toniclf.jar
@@ -486,6 +482,8 @@ bin/squirrel-sql
 %%DATADIR%%/plugins/smarttools/doc/licence.txt
 %%DATADIR%%/plugins/smarttools/doc/missingIndices.html
 %%DATADIR%%/plugins/smarttools/doc/readme.html
+%%DATADIR%%/plugins/smarttools/lib/jgoodies-common-1.8.1.jar
+%%DATADIR%%/plugins/smarttools/lib/jgoodies-forms-1.8.0.jar
 %%DATADIR%%/plugins/sqlbookmark.jar
 %%DATADIR%%/plugins/sqlbookmark/doc/bookmarkspopup.jpg
 %%DATADIR%%/plugins/sqlbookmark/doc/changes.txt
@@ -503,21 +501,15 @@ bin/squirrel-sql
 %%DATADIR%%/plugins/sqlreplace/doc/licence.txt
 %%DATADIR%%/plugins/sqlreplace/doc/readme.html
 %%DATADIR%%/plugins/sqlreplace/doc/readme.txt
-%%DATADIR%%/plugins/sqlscript.jar
-%%DATADIR%%/plugins/sqlscript/doc/changes.txt
-%%DATADIR%%/plugins/sqlscript/doc/creattable.jpg
-%%DATADIR%%/plugins/sqlscript/doc/licence.txt
-%%DATADIR%%/plugins/sqlscript/doc/readme.html
-%%DATADIR%%/plugins/sqlscript/doc/readme.txt
-%%DATADIR%%/plugins/sqlscript/doc/sql2file.jpg
-%%DATADIR%%/plugins/sqlscript/doc/sql2file_exportController.jpg
-%%DATADIR%%/plugins/sqlscript/doc/sql2file_progress.jpg
-%%DATADIR%%/plugins/sqlscript/doc/toolspopup.jpg
 %%DATADIR%%/plugins/sqlval.jar
 %%DATADIR%%/plugins/sqlval/doc/changes.txt
 %%DATADIR%%/plugins/sqlval/doc/licence.txt
 %%DATADIR%%/plugins/sqlval/doc/readme.html
 %%DATADIR%%/plugins/sqlval/doc/wsdl.xml
+%%DATADIR%%/plugins/sqlval/lib/axis-jaxrpc.jar
+%%DATADIR%%/plugins/sqlval/lib/axis-saaj.jar
+%%DATADIR%%/plugins/sqlval/lib/axis-wsdl4j.jar
+%%DATADIR%%/plugins/sqlval/lib/axis.jar
 %%DATADIR%%/plugins/swingViolations.jar
 %%DATADIR%%/plugins/swingViolations/doc/changes.txt
 %%DATADIR%%/plugins/swingViolations/doc/licence.txt
@@ -552,5 +544,4 @@ bin/squirrel-sql
 %%DATADIR%%/plugins/vertica/doc/readme.html
 %%DATADIR%%/plugins/wikiTableConfigurations.jar
 %%DATADIR%%/squirrel-sql.jar
-%%DATADIR%%/update-log4j.properties
 @dir %%DATADIR%%/plugins/wikiTableConfigurations
diff --git a/databases/surrealdb/Makefile b/databases/surrealdb/Makefile
new file mode 100644
index 000000000000..7d7427378f28
--- /dev/null
+++ b/databases/surrealdb/Makefile
@@ -0,0 +1,702 @@
+PORTNAME=	surrealdb
+DISTVERSIONPREFIX=	v
+DISTVERSION=	1.4.2
+CATEGORIES=	databases
+
+MAINTAINER=	yuri@FreeBSD.org
+COMMENT=	Scalable, distributed, collaborative, document-graph database
+WWW=		https://surrealdb.com
+
+LICENSE=	BSL11
+LICENSE_NAME=	Business Source License 1.1
+LICENSE_FILE=	${WRKSRC}/LICENSE
+LICENSE_PERMS=	dist-mirror no-dist-sell pkg-mirror no-pkg-sell auto-accept
+
+BROKEN_armv7=	compilation fails: memory allocation of 83886084 bytes failed
+BROKEN_i386=	compilation fails: memory allocation of 109051908 bytes failed
+
+LIB_DEPENDS=	libzstd.so:archivers/zstd
+
+USES=		cargo llvm:15
+
+USE_GITHUB=	yes
+
+CARGO_CRATES=	actix-codec-0.5.2 \
+		actix-http-3.6.0 \
+		actix-macros-0.2.4 \
+		actix-router-0.5.2 \
+		actix-rt-2.9.0 \
+		actix-server-2.3.0 \
+		actix-service-2.0.2 \
+		actix-utils-3.0.1 \
+		actix-web-4.5.1 \
+		actix-web-codegen-4.2.2 \
+		addr-0.15.6 \
+		addr2line-0.21.0 \
+		adler-1.0.2 \
+		ahash-0.7.8 \
+		ahash-0.8.11 \
+		aho-corasick-1.1.3 \
+		alloc-no-stdlib-2.0.4 \
+		alloc-stdlib-0.2.2 \
+		allocator-api2-0.2.16 \
+		android-tzdata-0.1.1 \
+		android_system_properties-0.1.5 \
+		anes-0.1.6 \
+		anstream-0.6.13 \
+		anstyle-1.0.6 \
+		anstyle-parse-0.2.3 \
+		anstyle-query-1.0.2 \
+		anstyle-wincon-3.0.2 \
+		any_ascii-0.3.2 \
+		anyhow-1.0.81 \
+		approx-0.5.1 \
+		arbitrary-1.3.2 \
+		arc-swap-1.7.1 \
+		argon2-0.5.3 \
+		arrayvec-0.7.4 \
+		ascii-canvas-3.0.0 \
+		assert-json-diff-2.0.2 \
+		assert_fs-1.1.1 \
+		async-channel-1.9.0 \
+		async-channel-2.2.0 \
+		async-compression-0.4.8 \
+		async-executor-1.10.0 \
+		async-lock-2.8.0 \
+		async-lock-3.3.0 \
+		async-recursion-0.3.2 \
+		async-recursion-1.1.0 \
+		async-stream-0.3.5 \
+		async-stream-impl-0.3.5 \
+		async-task-4.7.0 \
+		async-trait-0.1.79 \
+		async_io_stream-0.3.3 \
+		atomic-0.5.3 \
+		atomic-polyfill-1.0.3 \
+		autocfg-1.2.0 \
+		axum-0.6.20 \
+		axum-0.7.5 \
+		axum-core-0.3.4 \
+		axum-core-0.4.3 \
+		axum-extra-0.7.7 \
+		axum-macros-0.3.8 \
+		axum-server-0.5.1 \
+		backtrace-0.3.71 \
+		base64-0.13.1 \
+		base64-0.21.7 \
+		base64-0.22.0 \
+		base64ct-1.6.0 \
+		bcrypt-0.15.1 \
+		bincode-1.3.3 \
+		bindgen-0.65.1 \
+		bindgen-0.66.1 \
+		bit-set-0.5.3 \
+		bit-vec-0.6.3 \
+		bitflags-1.3.2 \
+		bitflags-2.5.0 \
+		bitmaps-3.2.1 \
+		bitvec-1.0.1 \
+		blake2-0.10.6 \
+		block-buffer-0.10.4 \
+		blowfish-0.9.1 \
+		borsh-1.4.0 \
+		borsh-derive-1.4.0 \
+		brotli-3.5.0 \
+		brotli-4.0.0 \
+		brotli-decompressor-2.5.1 \
+		brotli-decompressor-3.0.0 \
+		bstr-1.9.1 \
+		bumpalo-3.16.0 \
+		bytecheck-0.6.12 \
+		bytecheck_derive-0.6.12 \
+		bytemuck-1.15.0 \
+		byteorder-1.5.0 \
+		bytes-1.6.0 \
+		bytestring-1.3.1 \
+		bzip2-sys-0.1.11+1.0.8 \
+		cast-0.3.0 \
+		cc-1.0.92 \
+		cedar-policy-2.4.2 \
+		cedar-policy-core-2.4.2 \
+		cedar-policy-validator-2.4.2 \
+		cexpr-0.6.0 \
+		cfg-if-1.0.0 \
+		cfg_aliases-0.1.1 \
+		chrono-0.4.37 \
+		ciborium-0.2.2 \
+		ciborium-io-0.2.2 \
+		ciborium-ll-0.2.2 \
+		cipher-0.4.4 \
+		clang-sys-1.7.0 \
+		clap-4.5.4 \
+		clap_builder-4.5.2 \
+		clap_derive-4.5.4 \
+		clap_lex-0.7.0 \
+		clipboard-win-4.5.0 \
+		colorchoice-1.0.0 \
+		concurrent-queue-2.4.0 \
+		console_error_panic_hook-0.1.7 \
+		const-oid-0.9.6 \
+		convert_case-0.4.0 \
+		convert_case-0.6.0 \
+		cookie-0.16.2 \
+		core-foundation-0.9.4 \
+		core-foundation-sys-0.8.6 \
+		cpp_demangle-0.4.3 \
+		cpufeatures-0.2.12 \
+		crc32fast-1.4.0 \
+		criterion-0.5.1 \
+		criterion-plot-0.5.0 \
+		critical-section-1.1.2 \
+		crossbeam-0.8.4 \
+		crossbeam-channel-0.5.12 \
+		crossbeam-deque-0.8.5 \
+		crossbeam-epoch-0.9.18 \
+		crossbeam-queue-0.3.11 \
+		crossbeam-utils-0.8.19 \
+		crunchy-0.2.2 \
+		crypto-common-0.1.6 \
+		darling-0.20.8 \
+		darling_core-0.20.8 \
+		darling_macro-0.20.8 \
+		dashmap-5.5.3 \
+		data-encoding-2.5.0 \
+		deadpool-0.9.5 \
+		deadpool-runtime-0.1.3 \
+		debugid-0.8.0 \
+		der-0.7.9 \
+		deranged-0.3.11 \
+		derive-new-0.5.9 \
+		derive_arbitrary-1.3.2 \
+		derive_more-0.99.17 \
+		deunicode-1.4.3 \
+		difflib-0.4.0 \
+		digest-0.10.7 \
+		dirs-next-2.0.0 \
+		dirs-sys-next-0.1.2 \
+		dmp-0.2.0 \
+		doc-comment-0.3.3 \
+		earcutr-0.4.3 \
+		echodb-0.4.0 \
+		either-1.10.0 \
+		ena-0.14.2 \
+		encoding_rs-0.8.33 \
+		endian-type-0.1.2 \
+		env_filter-0.1.0 \
+		env_logger-0.10.2 \
+		env_logger-0.11.3 \
+		equivalent-1.0.1 \
+		errno-0.3.8 \
+		error-code-2.3.1 \
+		event-listener-2.5.3 \
+		event-listener-4.0.3 \
+		event-listener-5.3.0 \
+		event-listener-strategy-0.4.0 \
+		event-listener-strategy-0.5.1 \
+		fail-0.4.0 \
+		fastrand-1.9.0 \
+		fastrand-2.0.2 \
+		fd-lock-3.0.13 \
+		filetime-0.2.23 \
+		findshlibs-0.10.2 \
+		fixedbitset-0.4.2 \
+		flate2-1.0.28 \
+		float_next_after-1.0.0 \
+		flume-0.11.0 \
+		fnv-1.0.7 \
+		foreign-types-0.3.2 \
+		foreign-types-shared-0.1.1 \
+		form_urlencoded-1.2.1 \
+		foundationdb-0.8.0 \
+		foundationdb-gen-0.8.0 \
+		foundationdb-macros-0.2.0 \
+		foundationdb-sys-0.8.0 \
+		fst-0.4.7 \
+		funty-2.0.0 \
+		futures-0.3.30 \
+		futures-channel-0.3.30 \
+		futures-concurrency-7.5.0 \
+		futures-core-0.3.30 \
+		futures-executor-0.3.30 \
+		futures-io-0.3.30 \
+		futures-lite-1.13.0 \
+		futures-lite-2.3.0 \
+		futures-macro-0.3.30 \
+		futures-sink-0.3.30 \
+		futures-task-0.3.30 \
+		futures-timer-3.0.3 \
+		futures-util-0.3.30 \
+		fuzzy-matcher-0.3.7 \
+		generic-array-0.14.7 \
+		geo-0.26.0 \
+		geo-0.27.0 \
+		geo-0.28.0 \
+		geo-types-0.7.13 \
+		geographiclib-rs-0.2.4 \
+		getrandom-0.1.16 \
+		getrandom-0.2.14 \
+		gimli-0.28.1 \
+		glob-0.3.1 \
+		globset-0.4.14 \
+		globwalk-0.9.1 \
+		h2-0.3.26 \
+		half-2.4.1 \
+		hash32-0.2.1 \
+		hash32-0.3.1 \
+		hashbrown-0.12.3 \
+		hashbrown-0.14.3 \
+		headers-0.3.9 \
+		headers-core-0.2.0 \
+		heapless-0.7.17 \
+		heapless-0.8.0 \
+		heck-0.4.1 \
+		heck-0.5.0 \
+		hermit-abi-0.3.9 \
+		hex-0.4.3 \
+		hmac-0.12.1 \
+		home-0.5.9 \
+		http-0.2.12 \
+		http-1.1.0 \
+		http-body-0.4.6 \
+		http-body-1.0.0 \
+		http-body-util-0.1.1 \
+		http-range-header-0.3.1 \
+		http-types-2.12.0 \
+		httparse-1.8.0 \
+		httpdate-1.0.3 \
+		humantime-2.1.0 \
+		hyper-0.14.28 \
+		hyper-1.2.0 \
+		hyper-rustls-0.24.2 \
+		hyper-timeout-0.4.1 \
+		hyper-tls-0.5.0 \
+		hyper-util-0.1.3 \
+		iana-time-zone-0.1.60 \
+		iana-time-zone-haiku-0.1.2 \
+		ident_case-1.0.1 \
+		idna-0.5.0 \
+		ignore-0.4.22 \
+		imbl-2.0.3 \
+		imbl-sized-chunks-0.1.2 \
+		indexmap-1.9.3 \
+		indexmap-2.2.6 \
+		indxdb-0.4.0 \
+		infer-0.2.3 \
+		inferno-0.11.19 \
+		inout-0.1.3 \
+		instant-0.1.12 \
+		ipnet-2.9.0 \
+		is-terminal-0.4.12 \
+		itertools-0.10.5 \
+		itertools-0.11.0 \
+		itertools-0.12.1 \
+		itoa-1.0.11 \
+		jemalloc-sys-0.5.4+5.3.0-patched \
+		jemallocator-0.5.4 \
+		jobserver-0.1.28 \
+		js-sys-0.3.69 \
+		lalrpop-0.20.2 \
+		lalrpop-util-0.20.2 \
+		language-tags-0.3.2 \
+		lazy_static-1.4.0 \
+		lazycell-1.3.0 \
+		lexicmp-0.1.0 \
+		libc-0.2.153 \
+		libloading-0.7.4 \
+		libloading-0.8.3 \
+		libm-0.2.8 \
+		libmimalloc-sys-0.1.35 \
+		libredox-0.1.3 \
+		librocksdb-sys-0.11.0+8.1.1 \
+		libspeedb-sys-0.0.4+2.7.0 \
+		libz-sys-1.1.16 \
+		linux-raw-sys-0.4.13 \
+		local-channel-0.1.5 \
+		local-waker-0.1.4 \
+		lock_api-0.4.11 \
+		log-0.4.21 \
+		lru-0.12.3 \
+		lz4-sys-1.9.4 \
+		matchers-0.1.0 \
+		matchit-0.7.3 \
+		matrixmultiply-0.3.8 \
+		md-5-0.10.6 \
+		memchr-2.7.2 \
+		memmap2-0.9.4 \
+		miette-5.10.0 \
+		miette-derive-5.10.0 \
+		mimalloc-0.1.39 \
+		mime-0.3.17 \
+		mime_guess-2.0.4 \
+		minimal-lexical-0.2.1 \
+		miniz_oxide-0.7.2 \
+		mio-0.8.11 \
+		multimap-0.10.0 \
+		nanoid-0.4.0 \
+		nanorand-0.7.0 \
+		native-tls-0.2.11 \
+		ndarray-0.15.6 \
+		new_debug_unreachable-1.0.6 \
+		nibble_vec-0.1.0 \
+		nix-0.26.4 \
+		nix-0.27.1 \
+		nom-7.1.3 \
+		nu-ansi-term-0.46.0 \
+		num-bigint-0.4.4 \
+		num-bigint-dig-0.8.4 \
+		num-complex-0.4.5 \
+		num-conv-0.1.0 \
+		num-format-0.4.4 \
+		num-integer-0.1.46 \
+		num-iter-0.1.44 \
+		num-traits-0.2.18 \
+		num_cpus-1.16.0 \
+		object-0.32.2 \
+		object_store-0.8.0 \
+		once_cell-1.19.0 \
+		oorandom-11.1.3 \
+		openssl-0.10.64 \
+		openssl-macros-0.1.1 \
+		openssl-probe-0.1.5 \
+		openssl-sys-0.9.102 \
+		opentelemetry-0.19.0 \
+		opentelemetry-otlp-0.12.0 \
+		opentelemetry-proto-0.2.0 \
+		opentelemetry_api-0.19.0 \
+		opentelemetry_sdk-0.19.0 \
+		ort-1.16.3 \
+		overload-0.1.1 \
+		parking-2.2.0 \
+		parking_lot-0.12.1 \
+		parking_lot_core-0.9.9 \
+		password-hash-0.5.0 \
+		paste-1.0.14 \
+		path-clean-1.0.1 \
+		pbkdf2-0.12.2 \
+		peeking_take_while-0.1.2 \
+		pem-2.0.1 \
+		pem-3.0.4 \
+		pem-rfc7468-0.7.0 \
+		percent-encoding-2.3.1 \
+		petgraph-0.6.4 \
+		pharos-0.5.3 \
+		phf-0.11.2 \
+		phf_generator-0.11.2 \
+		phf_macros-0.11.2 \
+		phf_shared-0.10.0 \
+		phf_shared-0.11.2 \
+		pico-args-0.5.0 \
+		pin-project-1.1.5 \
+		pin-project-internal-1.1.5 \
+		pin-project-lite-0.2.14 \
+		pin-utils-0.1.0 \
+		pkcs1-0.7.5 \
+		pkcs8-0.10.2 \
+		pkg-config-0.3.30 \
+		plotters-0.3.5 \
+		plotters-backend-0.3.5 \
+		plotters-svg-0.3.5 \
+		powerfmt-0.2.0 \
+		pprof-0.13.0 \
+		ppv-lite86-0.2.17 \
+		precomputed-hash-0.1.1 \
+		predicates-3.1.0 \
+		predicates-core-1.0.6 \
+		predicates-tree-1.0.9 \
+		prettyplease-0.2.17 \
+		proc-macro-crate-1.3.1 \
+		proc-macro-crate-3.1.0 \
+		proc-macro-error-1.0.4 \
+		proc-macro-error-attr-1.0.4 \
+		proc-macro2-1.0.79 \
+		prometheus-0.13.3 \
+		prost-0.11.9 \
+		prost-0.12.4 \
+		prost-build-0.12.4 \
+		prost-derive-0.11.9 \
+		prost-derive-0.12.4 \
+		prost-types-0.12.4 \
+		psl-types-2.0.11 \
+		psm-0.1.21 \
+		ptr_meta-0.1.4 \
+		ptr_meta_derive-0.1.4 \
+		quick-xml-0.26.0 \
+		quick_cache-0.4.2 \
+		quote-1.0.35 \
+		radium-0.7.0 \
+		radix_trie-0.2.1 \
+		rand-0.7.3 \
+		rand-0.8.5 \
+		rand_chacha-0.2.2 \
+		rand_chacha-0.3.1 \
+		rand_core-0.5.1 \
+		rand_core-0.6.4 \
+		rand_hc-0.2.0 \
+		rand_xoshiro-0.6.0 \
+		rawpointer-0.2.1 \
+		rayon-1.10.0 \
+		rayon-core-1.12.1 \
+		rcgen-0.11.3 \
+		redox_syscall-0.4.1 \
+		redox_users-0.4.5 \
+		ref-cast-1.0.22 \
+		ref-cast-impl-1.0.22 \
+		regex-1.10.4 \
+		regex-automata-0.1.10 \
+		regex-automata-0.4.6 \
+		regex-syntax-0.6.29 \
+		regex-syntax-0.8.3 \
+		relative-path-1.9.2 \
+		rend-0.4.2 \
+		reqwest-0.11.27 \
+		retain_mut-0.1.9 \
+		revision-0.7.0 \
+		revision-derive-0.7.0 \
+		rexie-0.4.2 \
+		rgb-0.8.37 \
+		ring-0.16.20 \
+		ring-0.17.8 \
+		rkyv-0.7.44 \
+		rkyv_derive-0.7.44 \
+		rmp-0.8.12 \
+		rmp-serde-1.1.2 \
+		rmpv-1.0.1 \
+		roaring-0.10.3 \
+		robust-1.1.0 \
+		rocksdb-0.21.0 \
+		rquickjs-0.5.1 \
+		rquickjs-core-0.5.1 \
+		rquickjs-macro-0.5.1 \
+		rquickjs-sys-0.5.1 \
+		rsa-0.9.6 \
+		rstar-0.11.0 \
+		rstar-0.12.0 \
+		rust-stemmers-1.2.0 \
+		rust_decimal-1.35.0 \
+		rustc-demangle-0.1.23 \
+		rustc-hash-1.1.0 \
+		rustc_lexer-0.1.0 \
+		rustc_version-0.4.0 \
+		rustix-0.38.32 \
+		rustls-0.21.11 \
+		rustls-0.22.4 \
+		rustls-pemfile-1.0.4 \
+		rustls-pki-types-1.4.1 \
+		rustls-webpki-0.101.7 \
+		rustls-webpki-0.102.2 \
+		rustversion-1.0.15 \
+		rustyline-12.0.0 \
+		rustyline-derive-0.9.0 \
+		ryu-1.0.17 \
+		salsa20-0.10.2 \
+		same-file-1.0.6 \
+		schannel-0.1.23 \
+		scopeguard-1.2.0 \
+		scrypt-0.11.0 \
+		sct-0.7.1 \
+		seahash-4.1.0 \
+		security-framework-2.10.0 \
+		security-framework-sys-2.10.0 \
+		semver-1.0.22 \
+		send_wrapper-0.6.0 \
+		serde-1.0.197 \
+		serde_bytes-0.11.14 \
+		serde_derive-1.0.197 \
+		serde_html_form-0.2.6 \
+		serde_json-1.0.115 \
+		serde_path_to_error-0.1.16 \
+		serde_qs-0.8.5 \
+		serde_urlencoded-0.7.1 \
+		serde_with-3.7.0 \
+		serde_with_macros-3.7.0 \
+		serial_test-2.0.0 \
+		serial_test_derive-2.0.0 \
+		sha1-0.10.6 \
+		sha2-0.10.8 \
+		sharded-slab-0.1.7 \
+		shlex-1.3.0 \
+		signal-hook-registry-1.4.1 \
+		signature-2.2.0 \
+		simdutf8-0.1.4 \
+		simple_asn1-0.6.2 \
+		siphasher-0.3.11 \
+		slab-0.4.9 \
+		smallvec-1.13.2 \
+		smol_str-0.2.1 \
+		snafu-0.7.5 \
+		snafu-derive-0.7.5 \
+		snap-1.1.1 \
+		socket2-0.5.6 \
+		spade-2.6.0 \
+		speedb-0.0.4 \
+		spin-0.5.2 \
+		spin-0.9.8 \
+		spki-0.7.3 \
+		stable_deref_trait-1.2.0 \
+		stacker-0.1.15 \
+		static_assertions-1.1.0 \
+		storekey-0.5.0 \
+		str-buf-1.0.6 \
+		str_stack-0.1.0 \
+		string_cache-0.8.7 \
+		strsim-0.10.0 \
+		strsim-0.11.1 \
+		subtle-2.5.0 \
+		surrealdb-core-1.4.2 \
+		surrealdb-derive-0.12.0 \
+		surrealdb-jsonwebtoken-8.3.0-surreal.1 \
+		surrealdb-tikv-client-0.2.0-surreal.2 \
+		surrealkv-0.1.3 \
+		surrealml-core-0.0.8 \
+		surrealml-core-0.1.2 \
+		symbolic-common-12.8.0 \
+		symbolic-demangle-12.8.0 \
+		syn-1.0.109 \
+		syn-2.0.58 \
+		syn_derive-0.1.8 \
+		sync_wrapper-0.1.2 \
+		sync_wrapper-1.0.1 \
+		system-configuration-0.5.1 \
+		system-configuration-sys-0.5.0 \
+		tap-1.0.1 \
+		tar-0.4.40 \
+		temp-dir-0.1.13 \
+		temp-env-0.3.6 \
+		tempfile-3.10.1 \
+		term-0.7.0 \
+		termcolor-1.4.1 \
+		terminal_size-0.3.0 \
+		termtree-0.4.1 \
+		test-log-0.2.15 \
+		test-log-macros-0.2.15 \
+		thiserror-1.0.58 \
+		thiserror-impl-1.0.58 \
+		thread_local-1.1.8 \
+		time-0.3.34 \
+		time-core-0.1.2 \
+		time-macros-0.2.17 \
+		tiny-keccak-2.0.2 \
+		tinytemplate-1.2.1 \
+		tinyvec-1.6.0 \
+		tinyvec_macros-0.1.1 \
+		tokio-1.37.0 \
+		tokio-io-timeout-1.2.0 \
+		tokio-macros-2.2.0 \
+		tokio-native-tls-0.3.1 \
+		tokio-rustls-0.24.1 \
+		tokio-stream-0.1.15 \
+		tokio-tungstenite-0.20.1 \
+		tokio-util-0.7.10 \
+		toml_datetime-0.6.5 \
+		toml_edit-0.19.15 \
+		toml_edit-0.21.1 \
+		tonic-0.8.3 \
+		tonic-0.9.2 \
+		tower-0.4.13 \
+		tower-http-0.4.4 \
+		tower-layer-0.3.2 \
+		tower-service-0.3.2 \
+		tracing-0.1.40 \
+		tracing-attributes-0.1.27 \
+		tracing-core-0.1.32 \
+		tracing-futures-0.2.5 \
+		tracing-log-0.1.4 \
+		tracing-log-0.2.0 \
+		tracing-opentelemetry-0.19.0 \
+		tracing-subscriber-0.3.18 \
+		trice-0.4.0 \
+		try-lock-0.2.5 \
+		try_map-0.3.1 \
+		tungstenite-0.20.1 \
+		typenum-1.17.0 \
+		ulid-1.1.2 \
+		unicase-2.7.0 \
+		unicode-bidi-0.3.15 \
+		unicode-ident-1.0.12 \
+		unicode-normalization-0.1.23 \
+		unicode-script-0.5.6 \
+		unicode-security-0.1.1 \
+		unicode-segmentation-1.11.0 \
+		unicode-width-0.1.11 \
+		unicode-xid-0.2.4 \
+		untrusted-0.7.1 \
+		untrusted-0.9.0 \
+		ureq-2.9.6 \
+		url-2.5.0 \
+		urlencoding-2.1.3 \
+		utf-8-0.7.6 \
+		utf8parse-0.2.1 \
+		uuid-1.8.0 \
+		valuable-0.1.0 \
+		vart-0.1.1 \
+		vcpkg-0.2.15 \
+		version_check-0.9.4 \
+		vswhom-0.1.0 \
+		vswhom-sys-0.1.2 \
+		waker-fn-1.1.1 \
+		walkdir-2.5.0 \
+		want-0.3.1 \
+		wasi-0.9.0+wasi-snapshot-preview1 \
+		wasi-0.11.0+wasi-snapshot-preview1 \
+		wasm-bindgen-0.2.92 \
+		wasm-bindgen-backend-0.2.92 \
+		wasm-bindgen-futures-0.4.42 \
+		wasm-bindgen-macro-0.2.92 \
+		wasm-bindgen-macro-support-0.2.92 \
+		wasm-bindgen-shared-0.2.92 \
+		wasm-streams-0.4.0 \
+		wasmtimer-0.2.0 \
+		web-sys-0.3.69 \
+		web-time-1.1.0 \
+		webpki-roots-0.25.4 \
+		webpki-roots-0.26.1 \
+		which-4.4.2 \
+		winapi-0.3.9 \
+		winapi-i686-pc-windows-gnu-0.4.0 \
+		winapi-util-0.1.6 \
+		winapi-x86_64-pc-windows-gnu-0.4.0 \
+		windows-core-0.52.0 \
+		windows-sys-0.48.0 \
+		windows-sys-0.52.0 \
+		windows-targets-0.48.5 \
+		windows-targets-0.52.4 \
+		windows_aarch64_gnullvm-0.48.5 \
+		windows_aarch64_gnullvm-0.52.4 \
+		windows_aarch64_msvc-0.48.5 \
+		windows_aarch64_msvc-0.52.4 \
+		windows_i686_gnu-0.48.5 \
+		windows_i686_gnu-0.52.4 \
+		windows_i686_msvc-0.48.5 \
+		windows_i686_msvc-0.52.4 \
+		windows_x86_64_gnu-0.48.5 \
+		windows_x86_64_gnu-0.52.4 \
+		windows_x86_64_gnullvm-0.48.5 \
+		windows_x86_64_gnullvm-0.52.4 \
+		windows_x86_64_msvc-0.48.5 \
+		windows_x86_64_msvc-0.52.4 \
+		winnow-0.5.40 \
+		winreg-0.50.0 \
+		wiremock-0.5.22 \
+		ws_stream_wasm-0.7.4 \
+		wyz-0.5.1 \
+		xattr-1.3.1 \
+		xml-rs-0.8.20 \
+		yasna-0.5.2 \
+		zerocopy-0.7.32 \
+		zerocopy-derive-0.7.32 \
+		zeroize-1.7.0 \
+		zip-0.6.6 \
+		zstd-0.13.1 \
+		zstd-safe-7.1.0 \
+		zstd-sys-2.0.10+zstd.1.5.6
+RUSTFLAGS=	--cfg surrealdb_unstable # workaround for https://github.com/surrealdb/surrealdb/issues/3871
+
+OPENSSLINC=	/usr/include
+OPENSSLLIB=	/usr/lib
+
+PLIST_FILES=	bin/surreal
+
+post-install:
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/surreal
+
+.include <bsd.port.mk>
diff --git a/databases/surrealdb/distinfo b/databases/surrealdb/distinfo
new file mode 100644
index 000000000000..748dbcef0de2
--- /dev/null
+++ b/databases/surrealdb/distinfo
@@ -0,0 +1,1339 @@
+TIMESTAMP = 1713672889
+SHA256 (rust/crates/actix-codec-0.5.2.crate) = 5f7b0a21988c1bf877cf4759ef5ddaac04c1c9fe808c9142ecb78ba97d97a28a
+SIZE (rust/crates/actix-codec-0.5.2.crate) = 14085
+SHA256 (rust/crates/actix-http-3.6.0.crate) = d223b13fd481fc0d1f83bb12659ae774d9e3601814c68a0bc539731698cca743
+SIZE (rust/crates/actix-http-3.6.0.crate) = 152432
+SHA256 (rust/crates/actix-macros-0.2.4.crate) = e01ed3140b2f8d422c68afa1ed2e85d996ea619c988ac834d255db32138655cb
+SIZE (rust/crates/actix-macros-0.2.4.crate) = 8380
+SHA256 (rust/crates/actix-router-0.5.2.crate) = d22475596539443685426b6bdadb926ad0ecaefdfc5fb05e5e3441f15463c511
+SIZE (rust/crates/actix-router-0.5.2.crate) = 32386
+SHA256 (rust/crates/actix-rt-2.9.0.crate) = 28f32d40287d3f402ae0028a9d54bef51af15c8769492826a69d28f81893151d
+SIZE (rust/crates/actix-rt-2.9.0.crate) = 22096
+SHA256 (rust/crates/actix-server-2.3.0.crate) = 3eb13e7eef0423ea6eab0e59f6c72e7cb46d33691ad56a726b3cd07ddec2c2d4
+SIZE (rust/crates/actix-server-2.3.0.crate) = 38806
+SHA256 (rust/crates/actix-service-2.0.2.crate) = 3b894941f818cfdc7ccc4b9e60fa7e53b5042a2e8567270f9147d5591893373a
+SIZE (rust/crates/actix-service-2.0.2.crate) = 25293
+SHA256 (rust/crates/actix-utils-3.0.1.crate) = 88a1dcdff1466e3c2488e1cb5c36a71822750ad43839937f85d2f4d9f8b705d8
+SIZE (rust/crates/actix-utils-3.0.1.crate) = 10096
+SHA256 (rust/crates/actix-web-4.5.1.crate) = 43a6556ddebb638c2358714d853257ed226ece6023ef9364f23f0c70737ea984
+SIZE (rust/crates/actix-web-4.5.1.crate) = 231024
+SHA256 (rust/crates/actix-web-codegen-4.2.2.crate) = eb1f50ebbb30eca122b188319a4398b3f7bb4a8cdf50ecfb73bfc6a3c3ce54f5
+SIZE (rust/crates/actix-web-codegen-4.2.2.crate) = 17159
+SHA256 (rust/crates/addr-0.15.6.crate) = a93b8a41dbe230ad5087cc721f8d41611de654542180586b315d9f4cf6b72bef
+SIZE (rust/crates/addr-0.15.6.crate) = 92595
+SHA256 (rust/crates/addr2line-0.21.0.crate) = 8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb
+SIZE (rust/crates/addr2line-0.21.0.crate) = 40807
+SHA256 (rust/crates/adler-1.0.2.crate) = f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe
+SIZE (rust/crates/adler-1.0.2.crate) = 12778
+SHA256 (rust/crates/ahash-0.7.8.crate) = 891477e0c6a8957309ee5c45a6368af3ae14bb510732d2684ffa19af310920f9
+SIZE (rust/crates/ahash-0.7.8.crate) = 38550
+SHA256 (rust/crates/ahash-0.8.11.crate) = e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011
+SIZE (rust/crates/ahash-0.8.11.crate) = 43607
+SHA256 (rust/crates/aho-corasick-1.1.3.crate) = 8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916
+SIZE (rust/crates/aho-corasick-1.1.3.crate) = 183311
+SHA256 (rust/crates/alloc-no-stdlib-2.0.4.crate) = cc7bb162ec39d46ab1ca8c77bf72e890535becd1751bb45f64c597edb4c8c6b3
+SIZE (rust/crates/alloc-no-stdlib-2.0.4.crate) = 10105
+SHA256 (rust/crates/alloc-stdlib-0.2.2.crate) = 94fb8275041c72129eb51b7d0322c29b8387a0386127718b096429201a5d6ece
+SIZE (rust/crates/alloc-stdlib-0.2.2.crate) = 6693
+SHA256 (rust/crates/allocator-api2-0.2.16.crate) = 0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5
+SIZE (rust/crates/allocator-api2-0.2.16.crate) = 59025
+SHA256 (rust/crates/android-tzdata-0.1.1.crate) = e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0
+SIZE (rust/crates/android-tzdata-0.1.1.crate) = 7674
+SHA256 (rust/crates/android_system_properties-0.1.5.crate) = 819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311
+SIZE (rust/crates/android_system_properties-0.1.5.crate) = 5243
+SHA256 (rust/crates/anes-0.1.6.crate) = 4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299
+SIZE (rust/crates/anes-0.1.6.crate) = 23857
+SHA256 (rust/crates/anstream-0.6.13.crate) = d96bd03f33fe50a863e394ee9718a706f988b9079b20c3784fb726e7678b62fb
+SIZE (rust/crates/anstream-0.6.13.crate) = 30928
+SHA256 (rust/crates/anstyle-1.0.6.crate) = 8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc
+SIZE (rust/crates/anstyle-1.0.6.crate) = 14604
+SHA256 (rust/crates/anstyle-parse-0.2.3.crate) = c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c
+SIZE (rust/crates/anstyle-parse-0.2.3.crate) = 24699
+SHA256 (rust/crates/anstyle-query-1.0.2.crate) = e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648
+SIZE (rust/crates/anstyle-query-1.0.2.crate) = 8739
+SHA256 (rust/crates/anstyle-wincon-3.0.2.crate) = 1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7
+SIZE (rust/crates/anstyle-wincon-3.0.2.crate) = 11272
+SHA256 (rust/crates/any_ascii-0.3.2.crate) = ea50b14b7a4b9343f8c627a7a53c52076482bd4bdad0a24fd3ec533ed616cc2c
+SIZE (rust/crates/any_ascii-0.3.2.crate) = 240380
+SHA256 (rust/crates/anyhow-1.0.81.crate) = 0952808a6c2afd1aa8947271f3a60f1a6763c7b912d210184c5149b5cf147247
+SIZE (rust/crates/anyhow-1.0.81.crate) = 45142
+SHA256 (rust/crates/approx-0.5.1.crate) = cab112f0a86d568ea0e627cc1d6be74a1e9cd55214684db5561995f6dad897c6
+SIZE (rust/crates/approx-0.5.1.crate) = 15100
+SHA256 (rust/crates/arbitrary-1.3.2.crate) = 7d5a26814d8dcb93b0e5a0ff3c6d80a8843bafb21b39e8e18a6f05471870e110
+SIZE (rust/crates/arbitrary-1.3.2.crate) = 32037
+SHA256 (rust/crates/arc-swap-1.7.1.crate) = 69f7f8c3906b62b754cd5326047894316021dcfe5a194c8ea52bdd94934a3457
+SIZE (rust/crates/arc-swap-1.7.1.crate) = 68512
+SHA256 (rust/crates/argon2-0.5.3.crate) = 3c3610892ee6e0cbce8ae2700349fcf8f98adb0dbfbee85aec3c9179d29cc072
+SIZE (rust/crates/argon2-0.5.3.crate) = 28795
+SHA256 (rust/crates/arrayvec-0.7.4.crate) = 96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711
+SIZE (rust/crates/arrayvec-0.7.4.crate) = 29856
+SHA256 (rust/crates/ascii-canvas-3.0.0.crate) = 8824ecca2e851cec16968d54a01dd372ef8f95b244fb84b84e70128be347c3c6
+SIZE (rust/crates/ascii-canvas-3.0.0.crate) = 10575
+SHA256 (rust/crates/assert-json-diff-2.0.2.crate) = 47e4f2b81832e72834d7518d8487a0396a28cc408186a2e8854c0f98011faf12
+SIZE (rust/crates/assert-json-diff-2.0.2.crate) = 10874
+SHA256 (rust/crates/assert_fs-1.1.1.crate) = 2cd762e110c8ed629b11b6cde59458cc1c71de78ebbcc30099fc8e0403a2a2ec
+SIZE (rust/crates/assert_fs-1.1.1.crate) = 18090
+SHA256 (rust/crates/async-channel-1.9.0.crate) = 81953c529336010edd6d8e358f886d9581267795c61b19475b71314bffa46d35
+SIZE (rust/crates/async-channel-1.9.0.crate) = 13664
+SHA256 (rust/crates/async-channel-2.2.0.crate) = f28243a43d821d11341ab73c80bed182dc015c514b951616cf79bd4af39af0c3
+SIZE (rust/crates/async-channel-2.2.0.crate) = 14307
+SHA256 (rust/crates/async-compression-0.4.8.crate) = 07dbbf24db18d609b1462965249abdf49129ccad073ec257da372adc83259c60
+SIZE (rust/crates/async-compression-0.4.8.crate) = 104878
+SHA256 (rust/crates/async-executor-1.10.0.crate) = 5f98c37cf288e302c16ef6c8472aad1e034c6c84ce5ea7b8101c98eb4a802fee
+SIZE (rust/crates/async-executor-1.10.0.crate) = 24273
+SHA256 (rust/crates/async-lock-2.8.0.crate) = 287272293e9d8c41773cec55e365490fe034813a2f172f502d6ddcf75b2f582b
+SIZE (rust/crates/async-lock-2.8.0.crate) = 29944
+SHA256 (rust/crates/async-lock-3.3.0.crate) = d034b430882f8381900d3fe6f0aaa3ad94f2cb4ac519b429692a1bc2dda4ae7b
+SIZE (rust/crates/async-lock-3.3.0.crate) = 33286
+SHA256 (rust/crates/async-recursion-0.3.2.crate) = d7d78656ba01f1b93024b7c3a0467f1608e4be67d725749fdcd7d2c7678fd7a2
+SIZE (rust/crates/async-recursion-0.3.2.crate) = 10774
+SHA256 (rust/crates/async-recursion-1.1.0.crate) = 30c5ef0ede93efbf733c1a727f3b6b5a1060bbedd5600183e66f6e4be4af0ec5
+SIZE (rust/crates/async-recursion-1.1.0.crate) = 14982
+SHA256 (rust/crates/async-stream-0.3.5.crate) = cd56dd203fef61ac097dd65721a419ddccb106b2d2b70ba60a6b529f03961a51
+SIZE (rust/crates/async-stream-0.3.5.crate) = 11916
+SHA256 (rust/crates/async-stream-impl-0.3.5.crate) = 16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193
+SIZE (rust/crates/async-stream-impl-0.3.5.crate) = 4173
+SHA256 (rust/crates/async-task-4.7.0.crate) = fbb36e985947064623dbd357f727af08ffd077f93d696782f3c56365fa2e2799
+SIZE (rust/crates/async-task-4.7.0.crate) = 38906
+SHA256 (rust/crates/async-trait-0.1.79.crate) = a507401cad91ec6a857ed5513a2073c82a9b9048762b885bb98655b306964681
+SIZE (rust/crates/async-trait-0.1.79.crate) = 29558
+SHA256 (rust/crates/async_io_stream-0.3.3.crate) = b6d7b9decdf35d8908a7e3ef02f64c5e9b1695e230154c0e8de3969142d9b94c
+SIZE (rust/crates/async_io_stream-0.3.3.crate) = 15111
+SHA256 (rust/crates/atomic-0.5.3.crate) = c59bdb34bc650a32731b31bd8f0829cc15d24a708ee31559e0bb34f2bc320cba
+SIZE (rust/crates/atomic-0.5.3.crate) = 12801
+SHA256 (rust/crates/atomic-polyfill-1.0.3.crate) = 8cf2bce30dfe09ef0bfaef228b9d414faaf7e563035494d7fe092dba54b300f4
+SIZE (rust/crates/atomic-polyfill-1.0.3.crate) = 11581
+SHA256 (rust/crates/autocfg-1.2.0.crate) = f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80
+SIZE (rust/crates/autocfg-1.2.0.crate) = 14808
+SHA256 (rust/crates/axum-0.6.20.crate) = 3b829e4e32b91e643de6eafe82b1d90675f5874230191a4ffbc1b336dec4d6bf
+SIZE (rust/crates/axum-0.6.20.crate) = 146227
+SHA256 (rust/crates/axum-0.7.5.crate) = 3a6c9af12842a67734c9a2e355436e5d03b22383ed60cf13cd0c18fbfe3dcbcf
+SIZE (rust/crates/axum-0.7.5.crate) = 151429
+SHA256 (rust/crates/axum-core-0.3.4.crate) = 759fa577a247914fd3f7f76d62972792636412fbfd634cd452f6a385a74d2d2c
+SIZE (rust/crates/axum-core-0.3.4.crate) = 21088
+SHA256 (rust/crates/axum-core-0.4.3.crate) = a15c63fd72d41492dc4f497196f5da1fb04fb7529e631d73630d1b491e47a2e3
+SIZE (rust/crates/axum-core-0.4.3.crate) = 21877
+SHA256 (rust/crates/axum-extra-0.7.7.crate) = a93e433be9382c737320af3924f7d5fc6f89c155cf2bf88949d8f5126fab283f
+SIZE (rust/crates/axum-extra-0.7.7.crate) = 36782
+SHA256 (rust/crates/axum-macros-0.3.8.crate) = cdca6a10ecad987bda04e95606ef85a5417dcaac1a78455242d72e031e2b6b62
+SIZE (rust/crates/axum-macros-0.3.8.crate) = 35948
+SHA256 (rust/crates/axum-server-0.5.1.crate) = 447f28c85900215cc1bea282f32d4a2f22d55c5a300afdfbc661c8d6a632e063
+SIZE (rust/crates/axum-server-0.5.1.crate) = 37642
+SHA256 (rust/crates/backtrace-0.3.71.crate) = 26b05800d2e817c8b3b4b54abd461726265fa9789ae34330622f2db9ee696f9d
+SIZE (rust/crates/backtrace-0.3.71.crate) = 86553
+SHA256 (rust/crates/base64-0.13.1.crate) = 9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8
+SIZE (rust/crates/base64-0.13.1.crate) = 61002
+SHA256 (rust/crates/base64-0.21.7.crate) = 9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567
+SIZE (rust/crates/base64-0.21.7.crate) = 82576
+SHA256 (rust/crates/base64-0.22.0.crate) = 9475866fec1451be56a3c2400fd081ff546538961565ccb5b7142cbd22bc7a51
+SIZE (rust/crates/base64-0.22.0.crate) = 81568
+SHA256 (rust/crates/base64ct-1.6.0.crate) = 8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b
+SIZE (rust/crates/base64ct-1.6.0.crate) = 28870
+SHA256 (rust/crates/bcrypt-0.15.1.crate) = e65938ed058ef47d92cf8b346cc76ef48984572ade631927e9937b5ffc7662c7
+SIZE (rust/crates/bcrypt-0.15.1.crate) = 11628
+SHA256 (rust/crates/bincode-1.3.3.crate) = b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad
+SIZE (rust/crates/bincode-1.3.3.crate) = 28958
+SHA256 (rust/crates/bindgen-0.65.1.crate) = cfdf7b466f9a4903edc73f95d6d2bcd5baf8ae620638762244d3f60143643cc5
+SIZE (rust/crates/bindgen-0.65.1.crate) = 213479
+SHA256 (rust/crates/bindgen-0.66.1.crate) = f2b84e06fc203107bfbad243f4aba2af864eb7db3b1cf46ea0a023b0b433d2a7
+SIZE (rust/crates/bindgen-0.66.1.crate) = 218860
+SHA256 (rust/crates/bit-set-0.5.3.crate) = 0700ddab506f33b20a03b13996eccd309a48e5ff77d0d95926aa0210fb4e95f1
+SIZE (rust/crates/bit-set-0.5.3.crate) = 14470
+SHA256 (rust/crates/bit-vec-0.6.3.crate) = 349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb
+SIZE (rust/crates/bit-vec-0.6.3.crate) = 19927
+SHA256 (rust/crates/bitflags-1.3.2.crate) = bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a
+SIZE (rust/crates/bitflags-1.3.2.crate) = 23021
+SHA256 (rust/crates/bitflags-2.5.0.crate) = cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1
+SIZE (rust/crates/bitflags-2.5.0.crate) = 43821
+SHA256 (rust/crates/bitmaps-3.2.1.crate) = a1d084b0137aaa901caf9f1e8b21daa6aa24d41cd806e111335541eff9683bd6
+SIZE (rust/crates/bitmaps-3.2.1.crate) = 19587
+SHA256 (rust/crates/bitvec-1.0.1.crate) = 1bc2832c24239b0141d5674bb9174f9d68a8b5b3f2753311927c172ca46f7e9c
+SIZE (rust/crates/bitvec-1.0.1.crate) = 224375
+SHA256 (rust/crates/blake2-0.10.6.crate) = 46502ad458c9a52b69d4d4d32775c788b7a1b85e8bc9d482d92250fc0e3f8efe
+SIZE (rust/crates/blake2-0.10.6.crate) = 47234
+SHA256 (rust/crates/block-buffer-0.10.4.crate) = 3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71
+SIZE (rust/crates/block-buffer-0.10.4.crate) = 10538
+SHA256 (rust/crates/blowfish-0.9.1.crate) = e412e2cd0f2b2d93e02543ceae7917b3c70331573df19ee046bcbc35e45e87d7
+SIZE (rust/crates/blowfish-0.9.1.crate) = 16734
+SHA256 (rust/crates/borsh-1.4.0.crate) = 0901fc8eb0aca4c83be0106d6f2db17d86a08dfc2c25f0e84464bf381158add6
+SIZE (rust/crates/borsh-1.4.0.crate) = 60239
+SHA256 (rust/crates/borsh-derive-1.4.0.crate) = 51670c3aa053938b0ee3bd67c3817e471e626151131b934038e83c5bf8de48f5
+SIZE (rust/crates/borsh-derive-1.4.0.crate) = 29187
+SHA256 (rust/crates/brotli-3.5.0.crate) = d640d25bc63c50fb1f0b545ffd80207d2e10a4c965530809b40ba3386825c391
+SIZE (rust/crates/brotli-3.5.0.crate) = 1390231
+SHA256 (rust/crates/brotli-4.0.0.crate) = 125740193d7fee5cc63ab9e16c2fdc4e07c74ba755cc53b327d6ea029e9fc569
+SIZE (rust/crates/brotli-4.0.0.crate) = 1389566
+SHA256 (rust/crates/brotli-decompressor-2.5.1.crate) = 4e2e4afe60d7dd600fdd3de8d0f08c2b7ec039712e3b6137ff98b7004e82de4f
+SIZE (rust/crates/brotli-decompressor-2.5.1.crate) = 193087
+SHA256 (rust/crates/brotli-decompressor-3.0.0.crate) = 65622a320492e09b5e0ac436b14c54ff68199bac392d0e89a6832c4518eea525
+SIZE (rust/crates/brotli-decompressor-3.0.0.crate) = 193126
+SHA256 (rust/crates/bstr-1.9.1.crate) = 05efc5cfd9110c8416e471df0e96702d58690178e206e61b7173706673c93706
+SIZE (rust/crates/bstr-1.9.1.crate) = 380305
+SHA256 (rust/crates/bumpalo-3.16.0.crate) = 79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c
+SIZE (rust/crates/bumpalo-3.16.0.crate) = 85677
+SHA256 (rust/crates/bytecheck-0.6.12.crate) = 23cdc57ce23ac53c931e88a43d06d070a6fd142f2617be5855eb75efc9beb1c2
+SIZE (rust/crates/bytecheck-0.6.12.crate) = 8202
+SHA256 (rust/crates/bytecheck_derive-0.6.12.crate) = 3db406d29fbcd95542e92559bed4d8ad92636d1ca8b3b72ede10b4bcc010e659
+SIZE (rust/crates/bytecheck_derive-0.6.12.crate) = 5415
+SHA256 (rust/crates/bytemuck-1.15.0.crate) = 5d6d68c57235a3a081186990eca2867354726650f42f7516ca50c28d6281fd15
+SIZE (rust/crates/bytemuck-1.15.0.crate) = 47672
+SHA256 (rust/crates/byteorder-1.5.0.crate) = 1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b
+SIZE (rust/crates/byteorder-1.5.0.crate) = 23288
+SHA256 (rust/crates/bytes-1.6.0.crate) = 514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9
+SIZE (rust/crates/bytes-1.6.0.crate) = 60605
+SHA256 (rust/crates/bytestring-1.3.1.crate) = 74d80203ea6b29df88012294f62733de21cfeab47f17b41af3a38bc30a03ee72
+SIZE (rust/crates/bytestring-1.3.1.crate) = 9142
+SHA256 (rust/crates/bzip2-sys-0.1.11+1.0.8.crate) = 736a955f3fa7875102d57c82b8cac37ec45224a07fd32d58f9f7a186b6cd4cdc
+SIZE (rust/crates/bzip2-sys-0.1.11+1.0.8.crate) = 633444
+SHA256 (rust/crates/cast-0.3.0.crate) = 37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5
+SIZE (rust/crates/cast-0.3.0.crate) = 11452
+SHA256 (rust/crates/cc-1.0.92.crate) = 2678b2e3449475e95b0aa6f9b506a28e61b3dc8996592b983695e8ebb58a8b41
+SIZE (rust/crates/cc-1.0.92.crate) = 76130
+SHA256 (rust/crates/cedar-policy-2.4.2.crate) = 3d91e3b10a0f7f2911774d5e49713c4d25753466f9e11d1cd2ec627f8a2dc857
+SIZE (rust/crates/cedar-policy-2.4.2.crate) = 48952
+SHA256 (rust/crates/cedar-policy-core-2.4.2.crate) = cd2315591c6b7e18f8038f0a0529f254235fd902b6c217aabc04f2459b0d9995
+SIZE (rust/crates/cedar-policy-core-2.4.2.crate) = 183420
+SHA256 (rust/crates/cedar-policy-validator-2.4.2.crate) = e756e1b2a5da742ed97e65199ad6d0893e9aa4bd6b34be1de9e70bd1e6adc7df
+SIZE (rust/crates/cedar-policy-validator-2.4.2.crate) = 102833
+SHA256 (rust/crates/cexpr-0.6.0.crate) = 6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766
+SIZE (rust/crates/cexpr-0.6.0.crate) = 17966
+SHA256 (rust/crates/cfg-if-1.0.0.crate) = baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd
+SIZE (rust/crates/cfg-if-1.0.0.crate) = 7934
+SHA256 (rust/crates/cfg_aliases-0.1.1.crate) = fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e
+SIZE (rust/crates/cfg_aliases-0.1.1.crate) = 6009
+SHA256 (rust/crates/chrono-0.4.37.crate) = 8a0d04d43504c61aa6c7531f1871dd0d418d91130162063b789da00fd7057a5e
+SIZE (rust/crates/chrono-0.4.37.crate) = 234441
+SHA256 (rust/crates/ciborium-0.2.2.crate) = 42e69ffd6f0917f5c029256a24d0161db17cea3997d185db0d35926308770f0e
+SIZE (rust/crates/ciborium-0.2.2.crate) = 35611
+SHA256 (rust/crates/ciborium-io-0.2.2.crate) = 05afea1e0a06c9be33d539b876f1ce3692f4afea2cb41f740e7743225ed1c757
+SIZE (rust/crates/ciborium-io-0.2.2.crate) = 6697
+SHA256 (rust/crates/ciborium-ll-0.2.2.crate) = 57663b653d948a338bfb3eeba9bb2fd5fcfaecb9e199e87e1eda4d9e8b240fd9
+SIZE (rust/crates/ciborium-ll-0.2.2.crate) = 14695
+SHA256 (rust/crates/cipher-0.4.4.crate) = 773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad
+SIZE (rust/crates/cipher-0.4.4.crate) = 19073
+SHA256 (rust/crates/clang-sys-1.7.0.crate) = 67523a3b4be3ce1989d607a828d036249522dd9c1c8de7f4dd2dae43a37369d1
+SIZE (rust/crates/clang-sys-1.7.0.crate) = 42088
+SHA256 (rust/crates/clap-4.5.4.crate) = 90bc066a67923782aa8515dbaea16946c5bcc5addbd668bb80af688e53e548a0
+SIZE (rust/crates/clap-4.5.4.crate) = 55401
+SHA256 (rust/crates/clap_builder-4.5.2.crate) = ae129e2e766ae0ec03484e609954119f123cc1fe650337e155d03b022f24f7b4
+SIZE (rust/crates/clap_builder-4.5.2.crate) = 163566
+SHA256 (rust/crates/clap_derive-4.5.4.crate) = 528131438037fd55894f62d6e9f068b8f45ac57ffa77517819645d10aed04f64
+SIZE (rust/crates/clap_derive-4.5.4.crate) = 29159
+SHA256 (rust/crates/clap_lex-0.7.0.crate) = 98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce
+SIZE (rust/crates/clap_lex-0.7.0.crate) = 11915
+SHA256 (rust/crates/clipboard-win-4.5.0.crate) = 7191c27c2357d9b7ef96baac1773290d4ca63b24205b82a3fd8a0637afcf0362
+SIZE (rust/crates/clipboard-win-4.5.0.crate) = 13476
+SHA256 (rust/crates/colorchoice-1.0.0.crate) = acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7
+SIZE (rust/crates/colorchoice-1.0.0.crate) = 6857
+SHA256 (rust/crates/concurrent-queue-2.4.0.crate) = d16048cd947b08fa32c24458a22f5dc5e835264f689f4f5653210c69fd107363
+SIZE (rust/crates/concurrent-queue-2.4.0.crate) = 20244
+SHA256 (rust/crates/console_error_panic_hook-0.1.7.crate) = a06aeb73f470f66dcdbf7223caeebb85984942f22f1adb2a088cf9668146bbbc
+SIZE (rust/crates/console_error_panic_hook-0.1.7.crate) = 507196
+SHA256 (rust/crates/const-oid-0.9.6.crate) = c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8
+SIZE (rust/crates/const-oid-0.9.6.crate) = 45382
+SHA256 (rust/crates/convert_case-0.4.0.crate) = 6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e
+SIZE (rust/crates/convert_case-0.4.0.crate) = 8098
+SHA256 (rust/crates/convert_case-0.6.0.crate) = ec182b0ca2f35d8fc196cf3404988fd8b8c739a4d270ff118a398feb0cbec1ca
+SIZE (rust/crates/convert_case-0.6.0.crate) = 18675
+SHA256 (rust/crates/cookie-0.16.2.crate) = e859cd57d0710d9e06c381b550c06e76992472a8c6d527aecd2fc673dcc231fb
+SIZE (rust/crates/cookie-0.16.2.crate) = 34632
+SHA256 (rust/crates/core-foundation-0.9.4.crate) = 91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f
+SIZE (rust/crates/core-foundation-0.9.4.crate) = 27743
+SHA256 (rust/crates/core-foundation-sys-0.8.6.crate) = 06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f
+SIZE (rust/crates/core-foundation-sys-0.8.6.crate) = 37629
+SHA256 (rust/crates/cpp_demangle-0.4.3.crate) = 7e8227005286ec39567949b33df9896bcadfa6051bccca2488129f108ca23119
+SIZE (rust/crates/cpp_demangle-0.4.3.crate) = 78861
+SHA256 (rust/crates/cpufeatures-0.2.12.crate) = 53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504
+SIZE (rust/crates/cpufeatures-0.2.12.crate) = 12837
+SHA256 (rust/crates/crc32fast-1.4.0.crate) = b3855a8a784b474f333699ef2bbca9db2c4a1f6d9088a90a2d25b1eb53111eaa
+SIZE (rust/crates/crc32fast-1.4.0.crate) = 38665
+SHA256 (rust/crates/criterion-0.5.1.crate) = f2b12d017a929603d80db1831cd3a24082f8137ce19c69e6447f54f5fc8d692f
+SIZE (rust/crates/criterion-0.5.1.crate) = 110088
+SHA256 (rust/crates/criterion-plot-0.5.0.crate) = 6b50826342786a51a89e2da3a28f1c32b06e387201bc2d19791f622c673706b1
+SIZE (rust/crates/criterion-plot-0.5.0.crate) = 22706
+SHA256 (rust/crates/critical-section-1.1.2.crate) = 7059fff8937831a9ae6f0fe4d658ffabf58f2ca96aa9dec1c889f936f705f216
+SIZE (rust/crates/critical-section-1.1.2.crate) = 18337
+SHA256 (rust/crates/crossbeam-0.8.4.crate) = 1137cd7e7fc0fb5d3c5a8678be38ec56e819125d8d7907411fe24ccb943faca8
+SIZE (rust/crates/crossbeam-0.8.4.crate) = 10500
+SHA256 (rust/crates/crossbeam-channel-0.5.12.crate) = ab3db02a9c5b5121e1e42fbdb1aeb65f5e02624cc58c43f2884c6ccac0b82f95
+SIZE (rust/crates/crossbeam-channel-0.5.12.crate) = 90515
+SHA256 (rust/crates/crossbeam-deque-0.8.5.crate) = 613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d
+SIZE (rust/crates/crossbeam-deque-0.8.5.crate) = 21726
+SHA256 (rust/crates/crossbeam-epoch-0.9.18.crate) = 5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e
+SIZE (rust/crates/crossbeam-epoch-0.9.18.crate) = 46875
+SHA256 (rust/crates/crossbeam-queue-0.3.11.crate) = df0346b5d5e76ac2fe4e327c5fd1118d6be7c51dfb18f9b7922923f287471e35
+SIZE (rust/crates/crossbeam-queue-0.3.11.crate) = 15581
+SHA256 (rust/crates/crossbeam-utils-0.8.19.crate) = 248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345
+SIZE (rust/crates/crossbeam-utils-0.8.19.crate) = 42328
+SHA256 (rust/crates/crunchy-0.2.2.crate) = 7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7
+SIZE (rust/crates/crunchy-0.2.2.crate) = 2995
+SHA256 (rust/crates/crypto-common-0.1.6.crate) = 1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3
+SIZE (rust/crates/crypto-common-0.1.6.crate) = 8760
+SHA256 (rust/crates/darling-0.20.8.crate) = 54e36fcd13ed84ffdfda6f5be89b31287cbb80c439841fe69e04841435464391
+SIZE (rust/crates/darling-0.20.8.crate) = 31234
+SHA256 (rust/crates/darling_core-0.20.8.crate) = 9c2cf1c23a687a1feeb728783b993c4e1ad83d99f351801977dd809b48d0a70f
+SIZE (rust/crates/darling_core-0.20.8.crate) = 64442
+SHA256 (rust/crates/darling_macro-0.20.8.crate) = a668eda54683121533a393014d8692171709ff57a7d61f187b6e782719f8933f
+SIZE (rust/crates/darling_macro-0.20.8.crate) = 1856
+SHA256 (rust/crates/dashmap-5.5.3.crate) = 978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856
+SIZE (rust/crates/dashmap-5.5.3.crate) = 24061
+SHA256 (rust/crates/data-encoding-2.5.0.crate) = 7e962a19be5cfc3f3bf6dd8f61eb50107f356ad6270fbb3ed41476571db78be5
+SIZE (rust/crates/data-encoding-2.5.0.crate) = 20632
+SHA256 (rust/crates/deadpool-0.9.5.crate) = 421fe0f90f2ab22016f32a9881be5134fdd71c65298917084b0c7477cbc3856e
+SIZE (rust/crates/deadpool-0.9.5.crate) = 32190
+SHA256 (rust/crates/deadpool-runtime-0.1.3.crate) = 63dfa964fe2a66f3fde91fc70b267fe193d822c7e603e2a675a49a7f46ad3f49
+SIZE (rust/crates/deadpool-runtime-0.1.3.crate) = 3038
+SHA256 (rust/crates/debugid-0.8.0.crate) = bef552e6f588e446098f6ba40d89ac146c8c7b64aade83c051ee00bb5d2bc18d
+SIZE (rust/crates/debugid-0.8.0.crate) = 12757
+SHA256 (rust/crates/der-0.7.9.crate) = f55bf8e7b65898637379c1b74eb1551107c8294ed26d855ceb9fd1a09cfc9bc0
+SIZE (rust/crates/der-0.7.9.crate) = 85173
+SHA256 (rust/crates/deranged-0.3.11.crate) = b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4
+SIZE (rust/crates/deranged-0.3.11.crate) = 18043
+SHA256 (rust/crates/derive-new-0.5.9.crate) = 3418329ca0ad70234b9735dc4ceed10af4df60eff9c8e7b06cb5e520d92c3535
+SIZE (rust/crates/derive-new-0.5.9.crate) = 7733
+SHA256 (rust/crates/derive_arbitrary-1.3.2.crate) = 67e77553c4162a157adbf834ebae5b415acbecbeafc7a74b0e886657506a7611
+SIZE (rust/crates/derive_arbitrary-1.3.2.crate) = 10614
+SHA256 (rust/crates/derive_more-0.99.17.crate) = 4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321
+SIZE (rust/crates/derive_more-0.99.17.crate) = 55771
+SHA256 (rust/crates/deunicode-1.4.3.crate) = b6e854126756c496b8c81dec88f9a706b15b875c5849d4097a3854476b9fdf94
+SIZE (rust/crates/deunicode-1.4.3.crate) = 177180
+SHA256 (rust/crates/difflib-0.4.0.crate) = 6184e33543162437515c2e2b48714794e37845ec9851711914eec9d308f6ebe8
+SIZE (rust/crates/difflib-0.4.0.crate) = 7638
+SHA256 (rust/crates/digest-0.10.7.crate) = 9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292
+SIZE (rust/crates/digest-0.10.7.crate) = 19557
+SHA256 (rust/crates/dirs-next-2.0.0.crate) = b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1
+SIZE (rust/crates/dirs-next-2.0.0.crate) = 11689
+SHA256 (rust/crates/dirs-sys-next-0.1.2.crate) = 4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d
+SIZE (rust/crates/dirs-sys-next-0.1.2.crate) = 10681
+SHA256 (rust/crates/dmp-0.2.0.crate) = bfaa1135a34d26e5cc5b4927a8935af887d4f30a5653a797c33b9a4222beb6d9
+SIZE (rust/crates/dmp-0.2.0.crate) = 26504
+SHA256 (rust/crates/doc-comment-0.3.3.crate) = fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10
+SIZE (rust/crates/doc-comment-0.3.3.crate) = 4123
+SHA256 (rust/crates/earcutr-0.4.3.crate) = 79127ed59a85d7687c409e9978547cffb7dc79675355ed22da6b66fd5f6ead01
+SIZE (rust/crates/earcutr-0.4.3.crate) = 645213
+SHA256 (rust/crates/echodb-0.4.0.crate) = 312221c0bb46e82cd250c818404ef9dce769a4d5a62915c0249b577762eec34a
+SIZE (rust/crates/echodb-0.4.0.crate) = 11626
+SHA256 (rust/crates/either-1.10.0.crate) = 11157ac094ffbdde99aa67b23417ebdd801842852b500e395a45a9c0aac03e4a
+SIZE (rust/crates/either-1.10.0.crate) = 18334
+SHA256 (rust/crates/ena-0.14.2.crate) = c533630cf40e9caa44bd91aadc88a75d75a4c3a12b4cfde353cbed41daa1e1f1
+SIZE (rust/crates/ena-0.14.2.crate) = 22991
+SHA256 (rust/crates/encoding_rs-0.8.33.crate) = 7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1
+SIZE (rust/crates/encoding_rs-0.8.33.crate) = 1370071
+SHA256 (rust/crates/endian-type-0.1.2.crate) = c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d
+SIZE (rust/crates/endian-type-0.1.2.crate) = 2340
+SHA256 (rust/crates/env_filter-0.1.0.crate) = a009aa4810eb158359dda09d0c87378e4bbb89b5a801f016885a4707ba24f7ea
+SIZE (rust/crates/env_filter-0.1.0.crate) = 11553
+SHA256 (rust/crates/env_logger-0.10.2.crate) = 4cd405aab171cb85d6735e5c8d9db038c17d3ca007a4d2c25f337935c3d90580
+SIZE (rust/crates/env_logger-0.10.2.crate) = 36402
+SHA256 (rust/crates/env_logger-0.11.3.crate) = 38b35839ba51819680ba087cd351788c9a3c476841207e0b8cee0b04722343b9
+SIZE (rust/crates/env_logger-0.11.3.crate) = 29704
+SHA256 (rust/crates/equivalent-1.0.1.crate) = 5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5
+SIZE (rust/crates/equivalent-1.0.1.crate) = 6615
+SHA256 (rust/crates/errno-0.3.8.crate) = a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245
+SIZE (rust/crates/errno-0.3.8.crate) = 10645
+SHA256 (rust/crates/error-code-2.3.1.crate) = 64f18991e7bf11e7ffee451b5318b5c1a73c52d0d0ada6e5a3017c8c1ced6a21
+SIZE (rust/crates/error-code-2.3.1.crate) = 5324
+SHA256 (rust/crates/event-listener-2.5.3.crate) = 0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0
+SIZE (rust/crates/event-listener-2.5.3.crate) = 15392
+SHA256 (rust/crates/event-listener-4.0.3.crate) = 67b215c49b2b248c855fb73579eb1f4f26c38ffdc12973e20e07b91d78d5646e
+SIZE (rust/crates/event-listener-4.0.3.crate) = 39784
+SHA256 (rust/crates/event-listener-5.3.0.crate) = 6d9944b8ca13534cdfb2800775f8dd4902ff3fc75a50101466decadfdf322a24
+SIZE (rust/crates/event-listener-5.3.0.crate) = 43084
+SHA256 (rust/crates/event-listener-strategy-0.4.0.crate) = 958e4d70b6d5e81971bebec42271ec641e7ff4e170a6fa605f2b8a8b65cb97d3
+SIZE (rust/crates/event-listener-strategy-0.4.0.crate) = 10225
+SHA256 (rust/crates/event-listener-strategy-0.5.1.crate) = 332f51cb23d20b0de8458b86580878211da09bcd4503cb579c225b3d124cabb3
+SIZE (rust/crates/event-listener-strategy-0.5.1.crate) = 10656
+SHA256 (rust/crates/fail-0.4.0.crate) = 3be3c61c59fdc91f5dbc3ea31ee8623122ce80057058be560654c5d410d181a6
+SIZE (rust/crates/fail-0.4.0.crate) = 17598
+SHA256 (rust/crates/fastrand-1.9.0.crate) = e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be
+SIZE (rust/crates/fastrand-1.9.0.crate) = 11910
+SHA256 (rust/crates/fastrand-2.0.2.crate) = 658bd65b1cf4c852a3cc96f18a8ce7b5640f6b703f905c7d74532294c2a63984
+SIZE (rust/crates/fastrand-2.0.2.crate) = 14674
+SHA256 (rust/crates/fd-lock-3.0.13.crate) = ef033ed5e9bad94e55838ca0ca906db0e043f517adda0c8b79c7a8c66c93c1b5
+SIZE (rust/crates/fd-lock-3.0.13.crate) = 13692
+SHA256 (rust/crates/filetime-0.2.23.crate) = 1ee447700ac8aa0b2f2bd7bc4462ad686ba06baa6727ac149a2d6277f0d240fd
+SIZE (rust/crates/filetime-0.2.23.crate) = 14942
+SHA256 (rust/crates/findshlibs-0.10.2.crate) = 40b9e59cd0f7e0806cca4be089683ecb6434e602038df21fe6bf6711b2f07f64
+SIZE (rust/crates/findshlibs-0.10.2.crate) = 20101
+SHA256 (rust/crates/fixedbitset-0.4.2.crate) = 0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80
+SIZE (rust/crates/fixedbitset-0.4.2.crate) = 15954
+SHA256 (rust/crates/flate2-1.0.28.crate) = 46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e
+SIZE (rust/crates/flate2-1.0.28.crate) = 73690
+SHA256 (rust/crates/float_next_after-1.0.0.crate) = 8bf7cc16383c4b8d58b9905a8509f02926ce3058053c056376248d958c9df1e8
+SIZE (rust/crates/float_next_after-1.0.0.crate) = 6965
+SHA256 (rust/crates/flume-0.11.0.crate) = 55ac459de2512911e4b674ce33cf20befaba382d05b62b008afc1c8b57cbf181
+SIZE (rust/crates/flume-0.11.0.crate) = 67502
+SHA256 (rust/crates/fnv-1.0.7.crate) = 3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1
+SIZE (rust/crates/fnv-1.0.7.crate) = 11266
+SHA256 (rust/crates/foreign-types-0.3.2.crate) = f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1
+SIZE (rust/crates/foreign-types-0.3.2.crate) = 7504
+SHA256 (rust/crates/foreign-types-shared-0.1.1.crate) = 00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b
+SIZE (rust/crates/foreign-types-shared-0.1.1.crate) = 5672
+SHA256 (rust/crates/form_urlencoded-1.2.1.crate) = e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456
+SIZE (rust/crates/form_urlencoded-1.2.1.crate) = 8969
+SHA256 (rust/crates/foundationdb-0.8.0.crate) = 8696fd1be198f101eb58aeecf0f504fc02b28c7afcc008b4e4a998a91b305108
+SIZE (rust/crates/foundationdb-0.8.0.crate) = 82472
+SHA256 (rust/crates/foundationdb-gen-0.8.0.crate) = 62239700f01b041b6372aaeb847c52f960e1a69fd2b1025dc995ea3dd90e3308
+SIZE (rust/crates/foundationdb-gen-0.8.0.crate) = 48958
+SHA256 (rust/crates/foundationdb-macros-0.2.0.crate) = 83c8d52fe8b46ab822b4decdcc0d6d85aeedfc98f0d52ba2bd4aec4a97807516
+SIZE (rust/crates/foundationdb-macros-0.2.0.crate) = 2815
+SHA256 (rust/crates/foundationdb-sys-0.8.0.crate) = 98e49545f5393d276b7b888c77e3f9519fd33727435f8244344be72c3284256f
+SIZE (rust/crates/foundationdb-sys-0.8.0.crate) = 80539
+SHA256 (rust/crates/fst-0.4.7.crate) = 7ab85b9b05e3978cc9a9cf8fea7f01b494e1a09ed3037e16ba39edc7a29eb61a
+SIZE (rust/crates/fst-0.4.7.crate) = 1573393
+SHA256 (rust/crates/funty-2.0.0.crate) = e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c
+SIZE (rust/crates/funty-2.0.0.crate) = 13160
+SHA256 (rust/crates/futures-0.3.30.crate) = 645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0
+SIZE (rust/crates/futures-0.3.30.crate) = 53828
+SHA256 (rust/crates/futures-channel-0.3.30.crate) = eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78
+SIZE (rust/crates/futures-channel-0.3.30.crate) = 31736
+SHA256 (rust/crates/futures-concurrency-7.5.0.crate) = 9b590a729e1cbaf9ae3ec294143ea034d93cbb1de01c884d04bcd0af8b613d02
+SIZE (rust/crates/futures-concurrency-7.5.0.crate) = 61842
+SHA256 (rust/crates/futures-core-0.3.30.crate) = dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d
+SIZE (rust/crates/futures-core-0.3.30.crate) = 14071
+SHA256 (rust/crates/futures-executor-0.3.30.crate) = a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d
+SIZE (rust/crates/futures-executor-0.3.30.crate) = 17744
+SHA256 (rust/crates/futures-io-0.3.30.crate) = a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1
+SIZE (rust/crates/futures-io-0.3.30.crate) = 8910
+SHA256 (rust/crates/futures-lite-1.13.0.crate) = 49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce
+SIZE (rust/crates/futures-lite-1.13.0.crate) = 37058
+SHA256 (rust/crates/futures-lite-2.3.0.crate) = 52527eb5074e35e9339c6b4e8d12600c7128b68fb25dcb9fa9dec18f7c25f3a5
+SIZE (rust/crates/futures-lite-2.3.0.crate) = 39181
+SHA256 (rust/crates/futures-macro-0.3.30.crate) = 87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac
+SIZE (rust/crates/futures-macro-0.3.30.crate) = 11278
+SHA256 (rust/crates/futures-sink-0.3.30.crate) = 9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5
+SIZE (rust/crates/futures-sink-0.3.30.crate) = 7852
+SHA256 (rust/crates/futures-task-0.3.30.crate) = 38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004
+SIZE (rust/crates/futures-task-0.3.30.crate) = 11126
+SHA256 (rust/crates/futures-timer-3.0.3.crate) = f288b0a4f20f9a56b5d1da57e2227c661b7b16168e2f72365f57b63326e29b24
+SIZE (rust/crates/futures-timer-3.0.3.crate) = 19739
+SHA256 (rust/crates/futures-util-0.3.30.crate) = 3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48
+SIZE (rust/crates/futures-util-0.3.30.crate) = 159977
+SHA256 (rust/crates/fuzzy-matcher-0.3.7.crate) = 54614a3312934d066701a80f20f15fa3b56d67ac7722b39eea5b4c9dd1d66c94
+SIZE (rust/crates/fuzzy-matcher-0.3.7.crate) = 18047
+SHA256 (rust/crates/generic-array-0.14.7.crate) = 85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a
+SIZE (rust/crates/generic-array-0.14.7.crate) = 15950
+SHA256 (rust/crates/geo-0.26.0.crate) = 1645cf1d7fea7dac1a66f7357f3df2677ada708b8d9db8e9b043878930095a96
+SIZE (rust/crates/geo-0.26.0.crate) = 221771
+SHA256 (rust/crates/geo-0.27.0.crate) = 4841b40fdbccd4b7042bd6195e4de91da54af34c50632e371bcbfcdfb558b873
+SIZE (rust/crates/geo-0.27.0.crate) = 255082
+SHA256 (rust/crates/geo-0.28.0.crate) = f811f663912a69249fa620dcd2a005db7254529da2d8a0b23942e81f47084501
+SIZE (rust/crates/geo-0.28.0.crate) = 264928
+SHA256 (rust/crates/geo-types-0.7.13.crate) = 9ff16065e5720f376fbced200a5ae0f47ace85fd70b7e54269790281353b6d61
+SIZE (rust/crates/geo-types-0.7.13.crate) = 36006
+SHA256 (rust/crates/geographiclib-rs-0.2.4.crate) = e6e5ed84f8089c70234b0a8e0aedb6dc733671612ddc0d37c6066052f9781960
+SIZE (rust/crates/geographiclib-rs-0.2.4.crate) = 53029
+SHA256 (rust/crates/getrandom-0.1.16.crate) = 8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce
+SIZE (rust/crates/getrandom-0.1.16.crate) = 25077
+SHA256 (rust/crates/getrandom-0.2.14.crate) = 94b22e06ecb0110981051723910cbf0b5f5e09a2062dd7663334ee79a9d1286c
+SIZE (rust/crates/getrandom-0.2.14.crate) = 37307
+SHA256 (rust/crates/gimli-0.28.1.crate) = 4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253
+SIZE (rust/crates/gimli-0.28.1.crate) = 270497
+SHA256 (rust/crates/glob-0.3.1.crate) = d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b
+SIZE (rust/crates/glob-0.3.1.crate) = 18880
+SHA256 (rust/crates/globset-0.4.14.crate) = 57da3b9b5b85bd66f31093f8c408b90a74431672542466497dcbdfdc02034be1
+SIZE (rust/crates/globset-0.4.14.crate) = 25090
+SHA256 (rust/crates/globwalk-0.9.1.crate) = 0bf760ebf69878d9fd8f110c89703d90ce35095324d1f1edcb595c63945ee757
+SIZE (rust/crates/globwalk-0.9.1.crate) = 12572
+SHA256 (rust/crates/h2-0.3.26.crate) = 81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8
+SIZE (rust/crates/h2-0.3.26.crate) = 168315
+SHA256 (rust/crates/half-2.4.1.crate) = 6dd08c532ae367adf81c312a4580bc67f1d0fe8bc9c460520283f4c0ff277888
+SIZE (rust/crates/half-2.4.1.crate) = 50892
+SHA256 (rust/crates/hash32-0.2.1.crate) = b0c35f58762feb77d74ebe43bdbc3210f09be9fe6742234d573bacc26ed92b67
+SIZE (rust/crates/hash32-0.2.1.crate) = 11168
+SHA256 (rust/crates/hash32-0.3.1.crate) = 47d60b12902ba28e2730cd37e95b8c9223af2808df9e902d4df49588d1470606
+SIZE (rust/crates/hash32-0.3.1.crate) = 10273
+SHA256 (rust/crates/hashbrown-0.12.3.crate) = 8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888
+SIZE (rust/crates/hashbrown-0.12.3.crate) = 102968
+SHA256 (rust/crates/hashbrown-0.14.3.crate) = 290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604
+SIZE (rust/crates/hashbrown-0.14.3.crate) = 141425
+SHA256 (rust/crates/headers-0.3.9.crate) = 06683b93020a07e3dbcf5f8c0f6d40080d725bea7936fc01ad345c01b97dc270
+SIZE (rust/crates/headers-0.3.9.crate) = 68290
+SHA256 (rust/crates/headers-core-0.2.0.crate) = e7f66481bfee273957b1f20485a4ff3362987f85b2c236580d81b4eb7a326429
+SIZE (rust/crates/headers-core-0.2.0.crate) = 2380
+SHA256 (rust/crates/heapless-0.7.17.crate) = cdc6457c0eb62c71aac4bc17216026d8410337c4126773b9c5daba343f17964f
+SIZE (rust/crates/heapless-0.7.17.crate) = 75767
+SHA256 (rust/crates/heapless-0.8.0.crate) = 0bfb9eb618601c89945a70e254898da93b13be0388091d42117462b265bb3fad
+SIZE (rust/crates/heapless-0.8.0.crate) = 77802
+SHA256 (rust/crates/heck-0.4.1.crate) = 95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8
+SIZE (rust/crates/heck-0.4.1.crate) = 11567
+SHA256 (rust/crates/heck-0.5.0.crate) = 2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea
+SIZE (rust/crates/heck-0.5.0.crate) = 11517
+SHA256 (rust/crates/hermit-abi-0.3.9.crate) = d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024
+SIZE (rust/crates/hermit-abi-0.3.9.crate) = 16165
+SHA256 (rust/crates/hex-0.4.3.crate) = 7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70
+SIZE (rust/crates/hex-0.4.3.crate) = 13299
+SHA256 (rust/crates/hmac-0.12.1.crate) = 6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e
+SIZE (rust/crates/hmac-0.12.1.crate) = 42657
+SHA256 (rust/crates/home-0.5.9.crate) = e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5
+SIZE (rust/crates/home-0.5.9.crate) = 8760
+SHA256 (rust/crates/http-0.2.12.crate) = 601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1
+SIZE (rust/crates/http-0.2.12.crate) = 101964
+SHA256 (rust/crates/http-1.1.0.crate) = 21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258
+SIZE (rust/crates/http-1.1.0.crate) = 103144
+SHA256 (rust/crates/http-body-0.4.6.crate) = 7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2
+SIZE (rust/crates/http-body-0.4.6.crate) = 10773
+SHA256 (rust/crates/http-body-1.0.0.crate) = 1cac85db508abc24a2e48553ba12a996e87244a0395ce011e62b37158745d643
+SIZE (rust/crates/http-body-1.0.0.crate) = 5411
+SHA256 (rust/crates/http-body-util-0.1.1.crate) = 0475f8b2ac86659c21b64320d5d653f9efe42acd2a4e560073ec61a155a34f1d
+SIZE (rust/crates/http-body-util-0.1.1.crate) = 11930
+SHA256 (rust/crates/http-range-header-0.3.1.crate) = add0ab9360ddbd88cfeb3bd9574a1d85cfdfa14db10b3e21d3700dbc4328758f
+SIZE (rust/crates/http-range-header-0.3.1.crate) = 7712
+SHA256 (rust/crates/http-types-2.12.0.crate) = 6e9b187a72d63adbfba487f48095306ac823049cb504ee195541e91c7775f5ad
+SIZE (rust/crates/http-types-2.12.0.crate) = 1193808
+SHA256 (rust/crates/httparse-1.8.0.crate) = d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904
+SIZE (rust/crates/httparse-1.8.0.crate) = 29954
+SHA256 (rust/crates/httpdate-1.0.3.crate) = df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9
+SIZE (rust/crates/httpdate-1.0.3.crate) = 10639
+SHA256 (rust/crates/humantime-2.1.0.crate) = 9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4
+SIZE (rust/crates/humantime-2.1.0.crate) = 16749
+SHA256 (rust/crates/hyper-0.14.28.crate) = bf96e135eb83a2a8ddf766e426a841d8ddd7449d5f00d34ea02b41d2f19eef80
+SIZE (rust/crates/hyper-0.14.28.crate) = 197204
+SHA256 (rust/crates/hyper-1.2.0.crate) = 186548d73ac615b32a73aafe38fb4f56c0d340e110e5a200bcadbaf2e199263a
+SIZE (rust/crates/hyper-1.2.0.crate) = 148064
+SHA256 (rust/crates/hyper-rustls-0.24.2.crate) = ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590
+SIZE (rust/crates/hyper-rustls-0.24.2.crate) = 30195
+SHA256 (rust/crates/hyper-timeout-0.4.1.crate) = bbb958482e8c7be4bc3cf272a766a2b0bf1a6755e7a6ae777f017a31d11b13b1
+SIZE (rust/crates/hyper-timeout-0.4.1.crate) = 13805
+SHA256 (rust/crates/hyper-tls-0.5.0.crate) = d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905
+SIZE (rust/crates/hyper-tls-0.5.0.crate) = 13257
+SHA256 (rust/crates/hyper-util-0.1.3.crate) = ca38ef113da30126bbff9cd1705f9273e15d45498615d138b0c20279ac7a76aa
+SIZE (rust/crates/hyper-util-0.1.3.crate) = 61647
+SHA256 (rust/crates/iana-time-zone-0.1.60.crate) = e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141
+SIZE (rust/crates/iana-time-zone-0.1.60.crate) = 27074
+SHA256 (rust/crates/iana-time-zone-haiku-0.1.2.crate) = f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f
+SIZE (rust/crates/iana-time-zone-haiku-0.1.2.crate) = 7185
+SHA256 (rust/crates/ident_case-1.0.1.crate) = b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39
+SIZE (rust/crates/ident_case-1.0.1.crate) = 3492
+SHA256 (rust/crates/idna-0.5.0.crate) = 634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6
+SIZE (rust/crates/idna-0.5.0.crate) = 271940
+SHA256 (rust/crates/ignore-0.4.22.crate) = b46810df39e66e925525d6e38ce1e7f6e1d208f72dc39757880fcb66e2c58af1
+SIZE (rust/crates/ignore-0.4.22.crate) = 55462
+SHA256 (rust/crates/imbl-2.0.3.crate) = 978d142c8028edf52095703af2fad11d6f611af1246685725d6b850634647085
+SIZE (rust/crates/imbl-2.0.3.crate) = 120924
+SHA256 (rust/crates/imbl-sized-chunks-0.1.2.crate) = 144006fb58ed787dcae3f54575ff4349755b00ccc99f4b4873860b654be1ed63
+SIZE (rust/crates/imbl-sized-chunks-0.1.2.crate) = 43304
+SHA256 (rust/crates/indexmap-1.9.3.crate) = bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99
+SIZE (rust/crates/indexmap-1.9.3.crate) = 54653
+SHA256 (rust/crates/indexmap-2.2.6.crate) = 168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26
+SIZE (rust/crates/indexmap-2.2.6.crate) = 82420
+SHA256 (rust/crates/indxdb-0.4.0.crate) = 1de97697bf90e30042ea4ae3260a976253e0bb1703fa339541bcc047cc994180
+SIZE (rust/crates/indxdb-0.4.0.crate) = 11250
+SHA256 (rust/crates/infer-0.2.3.crate) = 64e9829a50b42bb782c1df523f78d332fe371b10c661e78b7a3c34b0198e9fac
+SIZE (rust/crates/infer-0.2.3.crate) = 12401
+SHA256 (rust/crates/inferno-0.11.19.crate) = 321f0f839cd44a4686e9504b0a62b4d69a50b62072144c71c68f5873c167b8d9
+SIZE (rust/crates/inferno-0.11.19.crate) = 102753
+SHA256 (rust/crates/inout-0.1.3.crate) = a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5
+SIZE (rust/crates/inout-0.1.3.crate) = 10743
+SHA256 (rust/crates/instant-0.1.12.crate) = 7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c
+SIZE (rust/crates/instant-0.1.12.crate) = 6128
+SHA256 (rust/crates/ipnet-2.9.0.crate) = 8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3
+SIZE (rust/crates/ipnet-2.9.0.crate) = 27627
+SHA256 (rust/crates/is-terminal-0.4.12.crate) = f23ff5ef2b80d608d61efee834934d862cd92461afc0560dedf493e4c033738b
+SIZE (rust/crates/is-terminal-0.4.12.crate) = 7470
+SHA256 (rust/crates/itertools-0.10.5.crate) = b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473
+SIZE (rust/crates/itertools-0.10.5.crate) = 115354
+SHA256 (rust/crates/itertools-0.11.0.crate) = b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57
+SIZE (rust/crates/itertools-0.11.0.crate) = 125074
+SHA256 (rust/crates/itertools-0.12.1.crate) = ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569
+SIZE (rust/crates/itertools-0.12.1.crate) = 137761
+SHA256 (rust/crates/itoa-1.0.11.crate) = 49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b
+SIZE (rust/crates/itoa-1.0.11.crate) = 10563
+SHA256 (rust/crates/jemalloc-sys-0.5.4+5.3.0-patched.crate) = ac6c1946e1cea1788cbfde01c993b52a10e2da07f4bac608228d1bed20bfebf2
+SIZE (rust/crates/jemalloc-sys-0.5.4+5.3.0-patched.crate) = 884321
+SHA256 (rust/crates/jemallocator-0.5.4.crate) = a0de374a9f8e63150e6f5e8a60cc14c668226d7a347d8aee1a45766e3c4dd3bc
+SIZE (rust/crates/jemallocator-0.5.4.crate) = 13088
+SHA256 (rust/crates/jobserver-0.1.28.crate) = ab46a6e9526ddef3ae7f787c06f0f2600639ba80ea3eade3d8e670a2230f51d6
+SIZE (rust/crates/jobserver-0.1.28.crate) = 25543
+SHA256 (rust/crates/js-sys-0.3.69.crate) = 29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d
+SIZE (rust/crates/js-sys-0.3.69.crate) = 81083
+SHA256 (rust/crates/lalrpop-0.20.2.crate) = 55cb077ad656299f160924eb2912aa147d7339ea7d69e1b5517326fdcec3c1ca
+SIZE (rust/crates/lalrpop-0.20.2.crate) = 240370
+SHA256 (rust/crates/lalrpop-util-0.20.2.crate) = 507460a910eb7b32ee961886ff48539633b788a36b65692b95f225b844c82553
+SIZE (rust/crates/lalrpop-util-0.20.2.crate) = 15064
+SHA256 (rust/crates/language-tags-0.3.2.crate) = d4345964bb142484797b161f473a503a434de77149dd8c7427788c6e13379388
+SIZE (rust/crates/language-tags-0.3.2.crate) = 53420
+SHA256 (rust/crates/lazy_static-1.4.0.crate) = e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646
+SIZE (rust/crates/lazy_static-1.4.0.crate) = 10443
+SHA256 (rust/crates/lazycell-1.3.0.crate) = 830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55
+SIZE (rust/crates/lazycell-1.3.0.crate) = 12502
+SHA256 (rust/crates/lexicmp-0.1.0.crate) = 7378d131ddf24063b32cbd7e91668d183140c4b3906270635a4d633d1068ea5d
+SIZE (rust/crates/lexicmp-0.1.0.crate) = 12867
+SHA256 (rust/crates/libc-0.2.153.crate) = 9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd
+SIZE (rust/crates/libc-0.2.153.crate) = 740614
+SHA256 (rust/crates/libloading-0.7.4.crate) = b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f
+SIZE (rust/crates/libloading-0.7.4.crate) = 27580
+SHA256 (rust/crates/libloading-0.8.3.crate) = 0c2a198fb6b0eada2a8df47933734e6d35d350665a33a3593d7164fa52c75c19
+SIZE (rust/crates/libloading-0.8.3.crate) = 28480
+SHA256 (rust/crates/libm-0.2.8.crate) = 4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058
+SIZE (rust/crates/libm-0.2.8.crate) = 113450
+SHA256 (rust/crates/libmimalloc-sys-0.1.35.crate) = 3979b5c37ece694f1f5e51e7ecc871fdb0f517ed04ee45f88d15d6d553cb9664
+SIZE (rust/crates/libmimalloc-sys-0.1.35.crate) = 184695
+SHA256 (rust/crates/libredox-0.1.3.crate) = c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d
+SIZE (rust/crates/libredox-0.1.3.crate) = 6068
+SHA256 (rust/crates/librocksdb-sys-0.11.0+8.1.1.crate) = d3386f101bcb4bd252d8e9d2fb41ec3b0862a15a62b478c355b2982efa469e3e
+SIZE (rust/crates/librocksdb-sys-0.11.0+8.1.1.crate) = 6270227
+SHA256 (rust/crates/libspeedb-sys-0.0.4+2.7.0.crate) = 14468e1c90e57078dcc625b045d9ad38ed53550d21282d886c48d521163ed05b
+SIZE (rust/crates/libspeedb-sys-0.0.4+2.7.0.crate) = 5846831
+SHA256 (rust/crates/libz-sys-1.1.16.crate) = 5e143b5e666b2695d28f6bca6497720813f699c9602dd7f5cac91008b8ada7f9
+SIZE (rust/crates/libz-sys-1.1.16.crate) = 3958920
+SHA256 (rust/crates/linux-raw-sys-0.4.13.crate) = 01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c
+SIZE (rust/crates/linux-raw-sys-0.4.13.crate) = 1493855
+SHA256 (rust/crates/local-channel-0.1.5.crate) = b6cbc85e69b8df4b8bb8b89ec634e7189099cea8927a276b7384ce5488e53ec8
+SIZE (rust/crates/local-channel-0.1.5.crate) = 7881
+SHA256 (rust/crates/local-waker-0.1.4.crate) = 4d873d7c67ce09b42110d801813efbc9364414e356be9935700d368351657487
+SIZE (rust/crates/local-waker-0.1.4.crate) = 6730
+SHA256 (rust/crates/lock_api-0.4.11.crate) = 3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45
+SIZE (rust/crates/lock_api-0.4.11.crate) = 27487
+SHA256 (rust/crates/log-0.4.21.crate) = 90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c
+SIZE (rust/crates/log-0.4.21.crate) = 43442
+SHA256 (rust/crates/lru-0.12.3.crate) = d3262e75e648fce39813cb56ac41f3c3e3f65217ebf3844d818d1f9398cfb0dc
+SIZE (rust/crates/lru-0.12.3.crate) = 15009
+SHA256 (rust/crates/lz4-sys-1.9.4.crate) = 57d27b317e207b10f69f5e75494119e391a96f48861ae870d1da6edac98ca900
+SIZE (rust/crates/lz4-sys-1.9.4.crate) = 354842
+SHA256 (rust/crates/matchers-0.1.0.crate) = 8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558
+SIZE (rust/crates/matchers-0.1.0.crate) = 6948
+SHA256 (rust/crates/matchit-0.7.3.crate) = 0e7465ac9959cc2b1404e8e2367b43684a6d13790fe23056cc8c6c5a6b7bcb94
+SIZE (rust/crates/matchit-0.7.3.crate) = 30372
+SHA256 (rust/crates/matrixmultiply-0.3.8.crate) = 7574c1cf36da4798ab73da5b215bbf444f50718207754cb522201d78d1cd0ff2
+SIZE (rust/crates/matrixmultiply-0.3.8.crate) = 57530
+SHA256 (rust/crates/md-5-0.10.6.crate) = d89e7ee0cfbedfc4da3340218492196241d89eefb6dab27de5df917a6d2e78cf
+SIZE (rust/crates/md-5-0.10.6.crate) = 16161
+SHA256 (rust/crates/memchr-2.7.2.crate) = 6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d
+SIZE (rust/crates/memchr-2.7.2.crate) = 96220
+SHA256 (rust/crates/memmap2-0.9.4.crate) = fe751422e4a8caa417e13c3ea66452215d7d63e19e604f4980461212f3ae1322
+SIZE (rust/crates/memmap2-0.9.4.crate) = 32752
+SHA256 (rust/crates/miette-5.10.0.crate) = 59bb584eaeeab6bd0226ccf3509a69d7936d148cf3d036ad350abe35e8c6856e
+SIZE (rust/crates/miette-5.10.0.crate) = 88585
+SHA256 (rust/crates/miette-derive-5.10.0.crate) = 49e7bc1560b95a3c4a25d03de42fe76ca718ab92d1a22a55b9b4cf67b3ae635c
+SIZE (rust/crates/miette-derive-5.10.0.crate) = 16062
+SHA256 (rust/crates/mimalloc-0.1.39.crate) = fa01922b5ea280a911e323e4d2fd24b7fe5cc4042e0d2cda3c40775cdc4bdc9c
+SIZE (rust/crates/mimalloc-0.1.39.crate) = 3727
+SHA256 (rust/crates/mime-0.3.17.crate) = 6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a
+SIZE (rust/crates/mime-0.3.17.crate) = 15712
+SHA256 (rust/crates/mime_guess-2.0.4.crate) = 4192263c238a5f0d0c6bfd21f336a313a4ce1c450542449ca191bb657b4642ef
+SIZE (rust/crates/mime_guess-2.0.4.crate) = 26399
+SHA256 (rust/crates/minimal-lexical-0.2.1.crate) = 68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a
+SIZE (rust/crates/minimal-lexical-0.2.1.crate) = 94841
+SHA256 (rust/crates/miniz_oxide-0.7.2.crate) = 9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7
+SIZE (rust/crates/miniz_oxide-0.7.2.crate) = 55731
+SHA256 (rust/crates/mio-0.8.11.crate) = a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c
+SIZE (rust/crates/mio-0.8.11.crate) = 102983
+SHA256 (rust/crates/multimap-0.10.0.crate) = defc4c55412d89136f966bbb339008b474350e5e6e78d2714439c386b3137a03
+SIZE (rust/crates/multimap-0.10.0.crate) = 14359
+SHA256 (rust/crates/nanoid-0.4.0.crate) = 3ffa00dec017b5b1a8b7cf5e2c008bfda1aa7e0697ac1508b491fdf2622fb4d8
+SIZE (rust/crates/nanoid-0.4.0.crate) = 6196
+SHA256 (rust/crates/nanorand-0.7.0.crate) = 6a51313c5820b0b02bd422f4b44776fbf47961755c74ce64afc73bfad10226c3
+SIZE (rust/crates/nanorand-0.7.0.crate) = 18437
+SHA256 (rust/crates/native-tls-0.2.11.crate) = 07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e
+SIZE (rust/crates/native-tls-0.2.11.crate) = 29008
+SHA256 (rust/crates/ndarray-0.15.6.crate) = adb12d4e967ec485a5f71c6311fe28158e9d6f4bc4a447b474184d0f91a8fa32
+SIZE (rust/crates/ndarray-0.15.6.crate) = 275225
+SHA256 (rust/crates/new_debug_unreachable-1.0.6.crate) = 650eef8c711430f1a879fdd01d4745a7deea475becfb90269c06775983bbf086
+SIZE (rust/crates/new_debug_unreachable-1.0.6.crate) = 2582
+SHA256 (rust/crates/nibble_vec-0.1.0.crate) = 77a5d83df9f36fe23f0c3648c6bbb8b0298bb5f1939c8f2704431371f4b84d43
+SIZE (rust/crates/nibble_vec-0.1.0.crate) = 11796
+SHA256 (rust/crates/nix-0.26.4.crate) = 598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b
+SIZE (rust/crates/nix-0.26.4.crate) = 279099
+SHA256 (rust/crates/nix-0.27.1.crate) = 2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053
+SIZE (rust/crates/nix-0.27.1.crate) = 286494
+SHA256 (rust/crates/nom-7.1.3.crate) = d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a
+SIZE (rust/crates/nom-7.1.3.crate) = 117570
+SHA256 (rust/crates/nu-ansi-term-0.46.0.crate) = 77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84
+SIZE (rust/crates/nu-ansi-term-0.46.0.crate) = 24311
+SHA256 (rust/crates/num-bigint-0.4.4.crate) = 608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0
+SIZE (rust/crates/num-bigint-0.4.4.crate) = 99369
+SHA256 (rust/crates/num-bigint-dig-0.8.4.crate) = dc84195820f291c7697304f3cbdadd1cb7199c0efc917ff5eafd71225c136151
+SIZE (rust/crates/num-bigint-dig-0.8.4.crate) = 123825
+SHA256 (rust/crates/num-complex-0.4.5.crate) = 23c6602fda94a57c990fe0df199a035d83576b496aa29f4e634a8ac6004e68a6
+SIZE (rust/crates/num-complex-0.4.5.crate) = 29614
+SHA256 (rust/crates/num-conv-0.1.0.crate) = 51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9
+SIZE (rust/crates/num-conv-0.1.0.crate) = 7444
+SHA256 (rust/crates/num-format-0.4.4.crate) = a652d9771a63711fd3c3deb670acfbe5c30a4072e664d7a3bf5a9e1056ac72c3
+SIZE (rust/crates/num-format-0.4.4.crate) = 61509
+SHA256 (rust/crates/num-integer-0.1.46.crate) = 7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f
+SIZE (rust/crates/num-integer-0.1.46.crate) = 22331
+SHA256 (rust/crates/num-iter-0.1.44.crate) = d869c01cc0c455284163fd0092f1f93835385ccab5a98a0dcc497b2f8bf055a9
+SIZE (rust/crates/num-iter-0.1.44.crate) = 10249
+SHA256 (rust/crates/num-traits-0.2.18.crate) = da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a
+SIZE (rust/crates/num-traits-0.2.18.crate) = 51930
+SHA256 (rust/crates/num_cpus-1.16.0.crate) = 4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43
+SIZE (rust/crates/num_cpus-1.16.0.crate) = 15713
+SHA256 (rust/crates/object-0.32.2.crate) = a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441
+SIZE (rust/crates/object-0.32.2.crate) = 286994
+SHA256 (rust/crates/object_store-0.8.0.crate) = 2524735495ea1268be33d200e1ee97455096a0846295a21548cd2f3541de7050
+SIZE (rust/crates/object_store-0.8.0.crate) = 157444
+SHA256 (rust/crates/once_cell-1.19.0.crate) = 3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92
+SIZE (rust/crates/once_cell-1.19.0.crate) = 33046
+SHA256 (rust/crates/oorandom-11.1.3.crate) = 0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575
+SIZE (rust/crates/oorandom-11.1.3.crate) = 10068
+SHA256 (rust/crates/openssl-0.10.64.crate) = 95a0481286a310808298130d22dd1fef0fa571e05a8f44ec801801e84b216b1f
+SIZE (rust/crates/openssl-0.10.64.crate) = 272306
+SHA256 (rust/crates/openssl-macros-0.1.1.crate) = a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c
+SIZE (rust/crates/openssl-macros-0.1.1.crate) = 5601
+SHA256 (rust/crates/openssl-probe-0.1.5.crate) = ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf
+SIZE (rust/crates/openssl-probe-0.1.5.crate) = 7227
+SHA256 (rust/crates/openssl-sys-0.9.102.crate) = c597637d56fbc83893a35eb0dd04b2b8e7a50c91e64e9493e398b5df4fb45fa2
+SIZE (rust/crates/openssl-sys-0.9.102.crate) = 68622
+SHA256 (rust/crates/opentelemetry-0.19.0.crate) = 5f4b8347cc26099d3aeee044065ecc3ae11469796b4d65d065a23a584ed92a6f
+SIZE (rust/crates/opentelemetry-0.19.0.crate) = 15193
+SHA256 (rust/crates/opentelemetry-otlp-0.12.0.crate) = 8af72d59a4484654ea8eb183fea5ae4eb6a41d7ac3e3bae5f4d2a282a3a7d3ca
+SIZE (rust/crates/opentelemetry-otlp-0.12.0.crate) = 30592
+SHA256 (rust/crates/opentelemetry-proto-0.2.0.crate) = 045f8eea8c0fa19f7d48e7bc3128a39c2e5c533d5c61298c548dfefc1064474c
+SIZE (rust/crates/opentelemetry-proto-0.2.0.crate) = 87818
+SHA256 (rust/crates/opentelemetry_api-0.19.0.crate) = ed41783a5bf567688eb38372f2b7a8530f5a607a4b49d38dd7573236c23ca7e2
+SIZE (rust/crates/opentelemetry_api-0.19.0.crate) = 55531
+SHA256 (rust/crates/opentelemetry_sdk-0.19.0.crate) = 8b3a2a91fdbfdd4d212c0dcc2ab540de2c2bcbbd90be17de7a7daf8822d010c1
+SIZE (rust/crates/opentelemetry_sdk-0.19.0.crate) = 98527
+SHA256 (rust/crates/ort-1.16.3.crate) = 889dca4c98efa21b1ba54ddb2bde44fd4920d910f492b618351f839d8428d79d
+SIZE (rust/crates/ort-1.16.3.crate) = 715107
+SHA256 (rust/crates/overload-0.1.1.crate) = b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39
+SIZE (rust/crates/overload-0.1.1.crate) = 24439
+SHA256 (rust/crates/parking-2.2.0.crate) = bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae
+SIZE (rust/crates/parking-2.2.0.crate) = 9730
+SHA256 (rust/crates/parking_lot-0.12.1.crate) = 3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f
+SIZE (rust/crates/parking_lot-0.12.1.crate) = 40967
+SHA256 (rust/crates/parking_lot_core-0.9.9.crate) = 4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e
+SIZE (rust/crates/parking_lot_core-0.9.9.crate) = 32445
+SHA256 (rust/crates/password-hash-0.5.0.crate) = 346f04948ba92c43e8469c1ee6736c7563d71012b17d40745260fe106aac2166
+SIZE (rust/crates/password-hash-0.5.0.crate) = 26884
+SHA256 (rust/crates/paste-1.0.14.crate) = de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c
+SIZE (rust/crates/paste-1.0.14.crate) = 18157
+SHA256 (rust/crates/path-clean-1.0.1.crate) = 17359afc20d7ab31fdb42bb844c8b3bb1dabd7dcf7e68428492da7f16966fcef
+SIZE (rust/crates/path-clean-1.0.1.crate) = 4514
+SHA256 (rust/crates/pbkdf2-0.12.2.crate) = f8ed6a7761f76e3b9f92dfb0a60a6a6477c61024b775147ff0973a02653abaf2
+SIZE (rust/crates/pbkdf2-0.12.2.crate) = 13906
+SHA256 (rust/crates/peeking_take_while-0.1.2.crate) = 19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099
+SIZE (rust/crates/peeking_take_while-0.1.2.crate) = 6697
+SHA256 (rust/crates/pem-2.0.1.crate) = 6b13fe415cdf3c8e44518e18a7c95a13431d9bdf6d15367d82b23c377fdd441a
+SIZE (rust/crates/pem-2.0.1.crate) = 12493
+SHA256 (rust/crates/pem-3.0.4.crate) = 8e459365e590736a54c3fa561947c84837534b8e9af6fc5bf781307e82658fae
+SIZE (rust/crates/pem-3.0.4.crate) = 13040
+SHA256 (rust/crates/pem-rfc7468-0.7.0.crate) = 88b39c9bfcfc231068454382784bb460aae594343fb030d46e9f50a645418412
+SIZE (rust/crates/pem-rfc7468-0.7.0.crate) = 24159
+SHA256 (rust/crates/percent-encoding-2.3.1.crate) = e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e
+SIZE (rust/crates/percent-encoding-2.3.1.crate) = 10235
+SHA256 (rust/crates/petgraph-0.6.4.crate) = e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9
+SIZE (rust/crates/petgraph-0.6.4.crate) = 185895
+SHA256 (rust/crates/pharos-0.5.3.crate) = e9567389417feee6ce15dd6527a8a1ecac205ef62c2932bcf3d9f6fc5b78b414
+SIZE (rust/crates/pharos-0.5.3.crate) = 26028
+SHA256 (rust/crates/phf-0.11.2.crate) = ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc
+SIZE (rust/crates/phf-0.11.2.crate) = 21569
+SHA256 (rust/crates/phf_generator-0.11.2.crate) = 48e4cc64c2ad9ebe670cb8fd69dd50ae301650392e81c05f9bfcb2d5bdbc24b0
+SIZE (rust/crates/phf_generator-0.11.2.crate) = 14190
+SHA256 (rust/crates/phf_macros-0.11.2.crate) = 3444646e286606587e49f3bcf1679b8cef1dc2c5ecc29ddacaffc305180d464b
+SIZE (rust/crates/phf_macros-0.11.2.crate) = 4748
+SHA256 (rust/crates/phf_shared-0.10.0.crate) = b6796ad771acdc0123d2a88dc428b5e38ef24456743ddb1744ed628f9815c096
+SIZE (rust/crates/phf_shared-0.10.0.crate) = 4095
+SHA256 (rust/crates/phf_shared-0.11.2.crate) = 90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b
+SIZE (rust/crates/phf_shared-0.11.2.crate) = 14284
+SHA256 (rust/crates/pico-args-0.5.0.crate) = 5be167a7af36ee22fe3115051bc51f6e6c7054c9348e28deb4f49bd6f705a315
+SIZE (rust/crates/pico-args-0.5.0.crate) = 11545
+SHA256 (rust/crates/pin-project-1.1.5.crate) = b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3
+SIZE (rust/crates/pin-project-1.1.5.crate) = 54214
+SHA256 (rust/crates/pin-project-internal-1.1.5.crate) = 2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965
+SIZE (rust/crates/pin-project-internal-1.1.5.crate) = 28280
+SHA256 (rust/crates/pin-project-lite-0.2.14.crate) = bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02
+SIZE (rust/crates/pin-project-lite-0.2.14.crate) = 28817
+SHA256 (rust/crates/pin-utils-0.1.0.crate) = 8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184
+SIZE (rust/crates/pin-utils-0.1.0.crate) = 7580
+SHA256 (rust/crates/pkcs1-0.7.5.crate) = c8ffb9f10fa047879315e6625af03c164b16962a5368d724ed16323b68ace47f
+SIZE (rust/crates/pkcs1-0.7.5.crate) = 35790
+SHA256 (rust/crates/pkcs8-0.10.2.crate) = f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7
+SIZE (rust/crates/pkcs8-0.10.2.crate) = 26360
+SHA256 (rust/crates/pkg-config-0.3.30.crate) = d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec
+SIZE (rust/crates/pkg-config-0.3.30.crate) = 20613
+SHA256 (rust/crates/plotters-0.3.5.crate) = d2c224ba00d7cadd4d5c660deaf2098e5e80e07846537c51f9cfa4be50c1fd45
+SIZE (rust/crates/plotters-0.3.5.crate) = 143975
+SHA256 (rust/crates/plotters-backend-0.3.5.crate) = 9e76628b4d3a7581389a35d5b6e2139607ad7c75b17aed325f210aa91f4a9609
+SIZE (rust/crates/plotters-backend-0.3.5.crate) = 13440
+SHA256 (rust/crates/plotters-svg-0.3.5.crate) = 38f6d39893cca0701371e3c27294f09797214b86f1fb951b89ade8ec04e2abab
+SIZE (rust/crates/plotters-svg-0.3.5.crate) = 6948
+SHA256 (rust/crates/powerfmt-0.2.0.crate) = 439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391
+SIZE (rust/crates/powerfmt-0.2.0.crate) = 15165
+SHA256 (rust/crates/pprof-0.13.0.crate) = ef5c97c51bd34c7e742402e216abdeb44d415fbe6ae41d56b114723e953711cb
+SIZE (rust/crates/pprof-0.13.0.crate) = 44693
+SHA256 (rust/crates/ppv-lite86-0.2.17.crate) = 5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de
+SIZE (rust/crates/ppv-lite86-0.2.17.crate) = 22242
+SHA256 (rust/crates/precomputed-hash-0.1.1.crate) = 925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c
+SIZE (rust/crates/precomputed-hash-0.1.1.crate) = 1640
+SHA256 (rust/crates/predicates-3.1.0.crate) = 68b87bfd4605926cdfefc1c3b5f8fe560e3feca9d5552cf68c466d3d8236c7e8
+SIZE (rust/crates/predicates-3.1.0.crate) = 23090
+SHA256 (rust/crates/predicates-core-1.0.6.crate) = b794032607612e7abeb4db69adb4e33590fa6cf1149e95fd7cb00e634b92f174
+SIZE (rust/crates/predicates-core-1.0.6.crate) = 8084
+SHA256 (rust/crates/predicates-tree-1.0.9.crate) = 368ba315fb8c5052ab692e68a0eefec6ec57b23a36959c14496f0b0df2c0cecf
+SIZE (rust/crates/predicates-tree-1.0.9.crate) = 7960
+SHA256 (rust/crates/prettyplease-0.2.17.crate) = 8d3928fb5db768cb86f891ff014f0144589297e3c6a1aba6ed7cecfdace270c7
+SIZE (rust/crates/prettyplease-0.2.17.crate) = 57713
+SHA256 (rust/crates/proc-macro-crate-1.3.1.crate) = 7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919
+SIZE (rust/crates/proc-macro-crate-1.3.1.crate) = 9678
+SHA256 (rust/crates/proc-macro-crate-3.1.0.crate) = 6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284
+SIZE (rust/crates/proc-macro-crate-3.1.0.crate) = 11084
+SHA256 (rust/crates/proc-macro-error-1.0.4.crate) = da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c
+SIZE (rust/crates/proc-macro-error-1.0.4.crate) = 25293
+SHA256 (rust/crates/proc-macro-error-attr-1.0.4.crate) = a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869
+SIZE (rust/crates/proc-macro-error-attr-1.0.4.crate) = 7971
+SHA256 (rust/crates/proc-macro2-1.0.79.crate) = e835ff2298f5721608eb1a980ecaee1aef2c132bf95ecc026a11b7bf3c01c02e
+SIZE (rust/crates/proc-macro2-1.0.79.crate) = 47200
+SHA256 (rust/crates/prometheus-0.13.3.crate) = 449811d15fbdf5ceb5c1144416066429cf82316e2ec8ce0c1f6f8a02e7bbcf8c
+SIZE (rust/crates/prometheus-0.13.3.crate) = 82457
+SHA256 (rust/crates/prost-0.11.9.crate) = 0b82eaa1d779e9a4bc1c3217db8ffbeabaae1dca241bf70183242128d48681cd
+SIZE (rust/crates/prost-0.11.9.crate) = 28958
+SHA256 (rust/crates/prost-0.12.4.crate) = d0f5d036824e4761737860779c906171497f6d55681139d8312388f8fe398922
+SIZE (rust/crates/prost-0.12.4.crate) = 29935
+SHA256 (rust/crates/prost-build-0.12.4.crate) = 80b776a1b2dc779f5ee0641f8ade0125bc1298dd41a9a0c16d8bd57b42d222b1
+SIZE (rust/crates/prost-build-0.12.4.crate) = 39184
+SHA256 (rust/crates/prost-derive-0.11.9.crate) = e5d2d8d10f3c6ded6da8b05b5fb3b8a5082514344d56c9f871412d29b4e075b4
+SIZE (rust/crates/prost-derive-0.11.9.crate) = 19513
+SHA256 (rust/crates/prost-derive-0.12.4.crate) = 19de2de2a00075bf566bee3bd4db014b11587e84184d3f7a791bc17f1a8e9e48
+SIZE (rust/crates/prost-derive-0.12.4.crate) = 19603
+SHA256 (rust/crates/prost-types-0.12.4.crate) = 3235c33eb02c1f1e212abdbe34c78b264b038fb58ca612664343271e36e55ffe
+SIZE (rust/crates/prost-types-0.12.4.crate) = 43616
+SHA256 (rust/crates/psl-types-2.0.11.crate) = 33cb294fe86a74cbcf50d4445b37da762029549ebeea341421c7c70370f86cac
+SIZE (rust/crates/psl-types-2.0.11.crate) = 7959
+SHA256 (rust/crates/psm-0.1.21.crate) = 5787f7cda34e3033a72192c018bc5883100330f362ef279a8cbccfce8bb4e874
+SIZE (rust/crates/psm-0.1.21.crate) = 23126
+SHA256 (rust/crates/ptr_meta-0.1.4.crate) = 0738ccf7ea06b608c10564b31debd4f5bc5e197fc8bfe088f68ae5ce81e7a4f1
+SIZE (rust/crates/ptr_meta-0.1.4.crate) = 5754
+SHA256 (rust/crates/ptr_meta_derive-0.1.4.crate) = 16b845dbfca988fa33db069c0e230574d15a3088f147a87b64c7589eb662c9ac
+SIZE (rust/crates/ptr_meta_derive-0.1.4.crate) = 2302
+SHA256 (rust/crates/quick-xml-0.26.0.crate) = 7f50b1c63b38611e7d4d7f68b82d3ad0cc71a2ad2e7f61fc10f1328d917c93cd
+SIZE (rust/crates/quick-xml-0.26.0.crate) = 116260
+SHA256 (rust/crates/quick_cache-0.4.2.crate) = b1380629287ed1247c1e0fcc6d43efdcec508b65382c9ab775cc8f3df7ca07b0
+SIZE (rust/crates/quick_cache-0.4.2.crate) = 36659
+SHA256 (rust/crates/quote-1.0.35.crate) = 291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef
+SIZE (rust/crates/quote-1.0.35.crate) = 28136
+SHA256 (rust/crates/radium-0.7.0.crate) = dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09
+SIZE (rust/crates/radium-0.7.0.crate) = 10906
+SHA256 (rust/crates/radix_trie-0.2.1.crate) = c069c179fcdc6a2fe24d8d18305cf085fdbd4f922c041943e203685d6a1c58fd
+SIZE (rust/crates/radix_trie-0.2.1.crate) = 251366
+SHA256 (rust/crates/rand-0.7.3.crate) = 6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03
+SIZE (rust/crates/rand-0.7.3.crate) = 112246
+SHA256 (rust/crates/rand-0.8.5.crate) = 34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404
+SIZE (rust/crates/rand-0.8.5.crate) = 87113
+SHA256 (rust/crates/rand_chacha-0.2.2.crate) = f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402
+SIZE (rust/crates/rand_chacha-0.2.2.crate) = 13267
+SHA256 (rust/crates/rand_chacha-0.3.1.crate) = e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88
+SIZE (rust/crates/rand_chacha-0.3.1.crate) = 15251
+SHA256 (rust/crates/rand_core-0.5.1.crate) = 90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19
+SIZE (rust/crates/rand_core-0.5.1.crate) = 21116
+SHA256 (rust/crates/rand_core-0.6.4.crate) = ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c
+SIZE (rust/crates/rand_core-0.6.4.crate) = 22666
+SHA256 (rust/crates/rand_hc-0.2.0.crate) = ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c
+SIZE (rust/crates/rand_hc-0.2.0.crate) = 11670
+SHA256 (rust/crates/rand_xoshiro-0.6.0.crate) = 6f97cdb2a36ed4183de61b2f824cc45c9f1037f28afe0a322e9fff4c108b5aaa
+SIZE (rust/crates/rand_xoshiro-0.6.0.crate) = 17125
+SHA256 (rust/crates/rawpointer-0.2.1.crate) = 60a357793950651c4ed0f3f52338f53b2f809f32d83a07f72909fa13e4c6c1e3
+SIZE (rust/crates/rawpointer-0.2.1.crate) = 7490
+SHA256 (rust/crates/rayon-1.10.0.crate) = b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa
+SIZE (rust/crates/rayon-1.10.0.crate) = 180155
+SHA256 (rust/crates/rayon-core-1.12.1.crate) = 1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2
+SIZE (rust/crates/rayon-core-1.12.1.crate) = 70701
+SHA256 (rust/crates/rcgen-0.11.3.crate) = 52c4f3084aa3bc7dfbba4eff4fab2a54db4324965d8872ab933565e6fbd83bc6
+SIZE (rust/crates/rcgen-0.11.3.crate) = 55311
+SHA256 (rust/crates/redox_syscall-0.4.1.crate) = 4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa
+SIZE (rust/crates/redox_syscall-0.4.1.crate) = 24858
+SHA256 (rust/crates/redox_users-0.4.5.crate) = bd283d9651eeda4b2a83a43c1c91b266c40fd76ecd39a50a8c630ae69dc72891
+SIZE (rust/crates/redox_users-0.4.5.crate) = 15514
+SHA256 (rust/crates/ref-cast-1.0.22.crate) = c4846d4c50d1721b1a3bef8af76924eef20d5e723647333798c1b519b3a9473f
+SIZE (rust/crates/ref-cast-1.0.22.crate) = 12664
+SHA256 (rust/crates/ref-cast-impl-1.0.22.crate) = 5fddb4f8d99b0a2ebafc65a87a69a7b9875e4b1ae1f00db265d300ef7f28bccc
+SIZE (rust/crates/ref-cast-impl-1.0.22.crate) = 9306
+SHA256 (rust/crates/regex-1.10.4.crate) = c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c
+SIZE (rust/crates/regex-1.10.4.crate) = 253191
+SHA256 (rust/crates/regex-automata-0.1.10.crate) = 6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132
+SIZE (rust/crates/regex-automata-0.1.10.crate) = 114533
+SHA256 (rust/crates/regex-automata-0.4.6.crate) = 86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea
+SIZE (rust/crates/regex-automata-0.4.6.crate) = 617565
+SHA256 (rust/crates/regex-syntax-0.6.29.crate) = f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1
+SIZE (rust/crates/regex-syntax-0.6.29.crate) = 299752
+SHA256 (rust/crates/regex-syntax-0.8.3.crate) = adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56
+SIZE (rust/crates/regex-syntax-0.8.3.crate) = 347497
+SHA256 (rust/crates/relative-path-1.9.2.crate) = e898588f33fdd5b9420719948f9f2a32c922a246964576f71ba7f24f80610fbc
+SIZE (rust/crates/relative-path-1.9.2.crate) = 22420
+SHA256 (rust/crates/rend-0.4.2.crate) = 71fe3824f5629716b1589be05dacd749f6aa084c87e00e016714a8cdfccc997c
+SIZE (rust/crates/rend-0.4.2.crate) = 9324
+SHA256 (rust/crates/reqwest-0.11.27.crate) = dd67538700a17451e7cba03ac727fb961abb7607553461627b97de0b89cf4a62
+SIZE (rust/crates/reqwest-0.11.27.crate) = 163155
+SHA256 (rust/crates/retain_mut-0.1.9.crate) = 4389f1d5789befaf6029ebd9f7dac4af7f7e3d61b69d4f30e2ac02b57e7712b0
+SIZE (rust/crates/retain_mut-0.1.9.crate) = 4058
+SHA256 (rust/crates/revision-0.7.0.crate) = 588784c1d9453cfd2ce1b7aff06c903513677cf0e63779a0a3085ee8a44f5b17
+SIZE (rust/crates/revision-0.7.0.crate) = 18086
+SHA256 (rust/crates/revision-derive-0.7.0.crate) = 854ff0b6794d4e0aab5e4486870941caefe9f258e63cad2f21b49a6302377c85
+SIZE (rust/crates/revision-derive-0.7.0.crate) = 14133
+SHA256 (rust/crates/rexie-0.4.2.crate) = fef172ff9cdf146cdc934e28cdeb137517bf954fb75e6ee8987dd44b58f351b1
+SIZE (rust/crates/rexie-0.4.2.crate) = 13279
+SHA256 (rust/crates/rgb-0.8.37.crate) = 05aaa8004b64fd573fc9d002f4e632d51ad4f026c2b5ba95fcb6c2f32c2c47d8
+SIZE (rust/crates/rgb-0.8.37.crate) = 16644
+SHA256 (rust/crates/ring-0.16.20.crate) = 3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc
+SIZE (rust/crates/ring-0.16.20.crate) = 5082615
+SHA256 (rust/crates/ring-0.17.8.crate) = c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d
+SIZE (rust/crates/ring-0.17.8.crate) = 4188554
+SHA256 (rust/crates/rkyv-0.7.44.crate) = 5cba464629b3394fc4dbc6f940ff8f5b4ff5c7aef40f29166fd4ad12acbc99c0
+SIZE (rust/crates/rkyv-0.7.44.crate) = 115686
+SHA256 (rust/crates/rkyv_derive-0.7.44.crate) = a7dddfff8de25e6f62b9d64e6e432bf1c6736c57d20323e15ee10435fbda7c65
+SIZE (rust/crates/rkyv_derive-0.7.44.crate) = 18912
+SHA256 (rust/crates/rmp-0.8.12.crate) = 7f9860a6cc38ed1da53456442089b4dfa35e7cedaa326df63017af88385e6b20
+SIZE (rust/crates/rmp-0.8.12.crate) = 28844
+SHA256 (rust/crates/rmp-serde-1.1.2.crate) = bffea85eea980d8a74453e5d02a8d93028f3c34725de143085a844ebe953258a
+SIZE (rust/crates/rmp-serde-1.1.2.crate) = 30388
+SHA256 (rust/crates/rmpv-1.0.1.crate) = 2e0e0214a4a2b444ecce41a4025792fc31f77c7bb89c46d253953ea8c65701ec
+SIZE (rust/crates/rmpv-1.0.1.crate) = 28289
+SHA256 (rust/crates/roaring-0.10.3.crate) = a1c77081a55300e016cb86f2864415b7518741879db925b8d488a0ee0d2da6bf
+SIZE (rust/crates/roaring-0.10.3.crate) = 91420
+SHA256 (rust/crates/robust-1.1.0.crate) = cbf4a6aa5f6d6888f39e980649f3ad6b666acdce1d78e95b8a2cb076e687ae30
+SIZE (rust/crates/robust-1.1.0.crate) = 476312
+SHA256 (rust/crates/rocksdb-0.21.0.crate) = bb6f170a4041d50a0ce04b0d2e14916d6ca863ea2e422689a5b694395d299ffe
+SIZE (rust/crates/rocksdb-0.21.0.crate) = 125106
+SHA256 (rust/crates/rquickjs-0.5.1.crate) = ad7f63201fa6f2ff8173e4758ea552549d687d8f63003361a8b5c50f7c446ded
+SIZE (rust/crates/rquickjs-0.5.1.crate) = 15304
+SHA256 (rust/crates/rquickjs-core-0.5.1.crate) = cad00eeddc0f88af54ee202c8385fb214fe0423897c056a7df8369fb482e3695
+SIZE (rust/crates/rquickjs-core-0.5.1.crate) = 101246
+SHA256 (rust/crates/rquickjs-macro-0.5.1.crate) = f27b39e889cc951e3e5f6b74012f943e642fa0fac51a8552948751f19a9b62f8
+SIZE (rust/crates/rquickjs-macro-0.5.1.crate) = 25791
+SHA256 (rust/crates/rquickjs-sys-0.5.1.crate) = 120dbbc3296de9b96de8890091635d46f3506cd38b4e8f21800c386c035d64fa
+SIZE (rust/crates/rquickjs-sys-0.5.1.crate) = 721498
+SHA256 (rust/crates/rsa-0.9.6.crate) = 5d0e5124fcb30e76a7e79bfee683a2746db83784b86289f6251b54b7950a0dfc
+SIZE (rust/crates/rsa-0.9.6.crate) = 80048
+SHA256 (rust/crates/rstar-0.11.0.crate) = 73111312eb7a2287d229f06c00ff35b51ddee180f017ab6dec1f69d62ac098d6
+SIZE (rust/crates/rstar-0.11.0.crate) = 40181
+SHA256 (rust/crates/rstar-0.12.0.crate) = 133315eb94c7b1e8d0cb097e5a710d850263372fd028fff18969de708afc7008
+SIZE (rust/crates/rstar-0.12.0.crate) = 42105
+SHA256 (rust/crates/rust-stemmers-1.2.0.crate) = e46a2036019fdb888131db7a4c847a1063a7493f971ed94ea82c67eada63ca54
+SIZE (rust/crates/rust-stemmers-1.2.0.crate) = 2351301
+SHA256 (rust/crates/rust_decimal-1.35.0.crate) = 1790d1c4c0ca81211399e0e0af16333276f375209e71a37b67698a373db5b47a
+SIZE (rust/crates/rust_decimal-1.35.0.crate) = 128340
+SHA256 (rust/crates/rustc-demangle-0.1.23.crate) = d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76
+SIZE (rust/crates/rustc-demangle-0.1.23.crate) = 28970
+SHA256 (rust/crates/rustc-hash-1.1.0.crate) = 08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2
+SIZE (rust/crates/rustc-hash-1.1.0.crate) = 9331
+SHA256 (rust/crates/rustc_lexer-0.1.0.crate) = c86aae0c77166108c01305ee1a36a1e77289d7dc6ca0a3cd91ff4992de2d16a5
+SIZE (rust/crates/rustc_lexer-0.1.0.crate) = 8011
+SHA256 (rust/crates/rustc_version-0.4.0.crate) = bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366
+SIZE (rust/crates/rustc_version-0.4.0.crate) = 12175
+SHA256 (rust/crates/rustix-0.38.32.crate) = 65e04861e65f21776e67888bfbea442b3642beaa0138fdb1dd7a84a52dffdb89
+SIZE (rust/crates/rustix-0.38.32.crate) = 376999
+SHA256 (rust/crates/rustls-0.21.11.crate) = 7fecbfb7b1444f477b345853b1fce097a2c6fb637b2bfb87e6bc5db0f043fae4
+SIZE (rust/crates/rustls-0.21.11.crate) = 284815
+SHA256 (rust/crates/rustls-0.22.4.crate) = bf4ef73721ac7bcd79b2b315da7779d8fc09718c6b3d2d1b2d94850eb8c18432
+SIZE (rust/crates/rustls-0.22.4.crate) = 333681
+SHA256 (rust/crates/rustls-pemfile-1.0.4.crate) = 1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c
+SIZE (rust/crates/rustls-pemfile-1.0.4.crate) = 22092
+SHA256 (rust/crates/rustls-pki-types-1.4.1.crate) = ecd36cc4259e3e4514335c4a138c6b43171a8d61d8f5c9348f9fc7529416f247
+SIZE (rust/crates/rustls-pki-types-1.4.1.crate) = 29437
+SHA256 (rust/crates/rustls-webpki-0.101.7.crate) = 8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765
+SIZE (rust/crates/rustls-webpki-0.101.7.crate) = 168808
+SHA256 (rust/crates/rustls-webpki-0.102.2.crate) = faaa0a62740bedb9b2ef5afa303da42764c012f743917351dc9a237ea1663610
+SIZE (rust/crates/rustls-webpki-0.102.2.crate) = 196881
+SHA256 (rust/crates/rustversion-1.0.15.crate) = 80af6f9131f277a45a3fba6ce8e2258037bb0477a67e610d3c1fe046ab31de47
+SIZE (rust/crates/rustversion-1.0.15.crate) = 17406
+SHA256 (rust/crates/rustyline-12.0.0.crate) = 994eca4bca05c87e86e15d90fc7a91d1be64b4482b38cb2d27474568fe7c9db9
+SIZE (rust/crates/rustyline-12.0.0.crate) = 113749
+SHA256 (rust/crates/rustyline-derive-0.9.0.crate) = 5a32af5427251d2e4be14fc151eabe18abb4a7aad5efee7044da9f096c906a43
+SIZE (rust/crates/rustyline-derive-0.9.0.crate) = 2438
+SHA256 (rust/crates/ryu-1.0.17.crate) = e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1
+SIZE (rust/crates/ryu-1.0.17.crate) = 47537
+SHA256 (rust/crates/salsa20-0.10.2.crate) = 97a22f5af31f73a954c10289c93e8a50cc23d971e80ee446f1f6f7137a088213
+SIZE (rust/crates/salsa20-0.10.2.crate) = 12780
+SHA256 (rust/crates/same-file-1.0.6.crate) = 93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502
+SIZE (rust/crates/same-file-1.0.6.crate) = 10183
+SHA256 (rust/crates/schannel-0.1.23.crate) = fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534
+SIZE (rust/crates/schannel-0.1.23.crate) = 41667
+SHA256 (rust/crates/scopeguard-1.2.0.crate) = 94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49
+SIZE (rust/crates/scopeguard-1.2.0.crate) = 11619
+SHA256 (rust/crates/scrypt-0.11.0.crate) = 0516a385866c09368f0b5bcd1caff3366aace790fcd46e2bb032697bb172fd1f
+SIZE (rust/crates/scrypt-0.11.0.crate) = 13440
+SHA256 (rust/crates/sct-0.7.1.crate) = da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414
+SIZE (rust/crates/sct-0.7.1.crate) = 27501
+SHA256 (rust/crates/seahash-4.1.0.crate) = 1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b
+SIZE (rust/crates/seahash-4.1.0.crate) = 31976
+SHA256 (rust/crates/security-framework-2.10.0.crate) = 770452e37cad93e0a50d5abc3990d2bc351c36d0328f86cefec2f2fb206eaef6
+SIZE (rust/crates/security-framework-2.10.0.crate) = 79723
+SHA256 (rust/crates/security-framework-sys-2.10.0.crate) = 41f3cc463c0ef97e11c3461a9d3787412d30e8e7eb907c79180c4a57bf7c04ef
+SIZE (rust/crates/security-framework-sys-2.10.0.crate) = 18676
+SHA256 (rust/crates/semver-1.0.22.crate) = 92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca
+SIZE (rust/crates/semver-1.0.22.crate) = 30446
+SHA256 (rust/crates/send_wrapper-0.6.0.crate) = cd0b0ec5f1c1ca621c432a25813d8d60c88abe6d3e08a3eb9cf37d97a0fe3d73
+SIZE (rust/crates/send_wrapper-0.6.0.crate) = 10519
+SHA256 (rust/crates/serde-1.0.197.crate) = 3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2
+SIZE (rust/crates/serde-1.0.197.crate) = 77087
+SHA256 (rust/crates/serde_bytes-0.11.14.crate) = 8b8497c313fd43ab992087548117643f6fcd935cbf36f176ffda0aacf9591734
+SIZE (rust/crates/serde_bytes-0.11.14.crate) = 12018
+SHA256 (rust/crates/serde_derive-1.0.197.crate) = 7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b
+SIZE (rust/crates/serde_derive-1.0.197.crate) = 55771
+SHA256 (rust/crates/serde_html_form-0.2.6.crate) = 8de514ef58196f1fc96dcaef80fe6170a1ce6215df9687a93fe8300e773fefc5
+SIZE (rust/crates/serde_html_form-0.2.6.crate) = 14480
+SHA256 (rust/crates/serde_json-1.0.115.crate) = 12dc5c46daa8e9fdf4f5e71b6cf9a53f2487da0e86e55808e2d35539666497dd
+SIZE (rust/crates/serde_json-1.0.115.crate) = 147100
+SHA256 (rust/crates/serde_path_to_error-0.1.16.crate) = af99884400da37c88f5e9146b7f1fd0fbcae8f6eec4e9da38b67d05486f814a6
+SIZE (rust/crates/serde_path_to_error-0.1.16.crate) = 16657
+SHA256 (rust/crates/serde_qs-0.8.5.crate) = c7715380eec75f029a4ef7de39a9200e0a63823176b759d055b613f5a87df6a6
+SIZE (rust/crates/serde_qs-0.8.5.crate) = 44854
+SHA256 (rust/crates/serde_urlencoded-0.7.1.crate) = d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd
+SIZE (rust/crates/serde_urlencoded-0.7.1.crate) = 12822
+SHA256 (rust/crates/serde_with-3.7.0.crate) = ee80b0e361bbf88fd2f6e242ccd19cfda072cb0faa6ae694ecee08199938569a
+SIZE (rust/crates/serde_with-3.7.0.crate) = 140905
+SHA256 (rust/crates/serde_with_macros-3.7.0.crate) = 6561dc161a9224638a31d876ccdfefbc1df91d3f3a8342eddb35f055d48c7655
+SIZE (rust/crates/serde_with_macros-3.7.0.crate) = 30834
+SHA256 (rust/crates/serial_test-2.0.0.crate) = 0e56dd856803e253c8f298af3f4d7eb0ae5e23a737252cd90bb4f3b435033b2d
+SIZE (rust/crates/serial_test-2.0.0.crate) = 7946
+SHA256 (rust/crates/serial_test_derive-2.0.0.crate) = 91d129178576168c589c9ec973feedf7d3126c01ac2bf08795109aa35b69fb8f
+SIZE (rust/crates/serial_test_derive-2.0.0.crate) = 5638
+SHA256 (rust/crates/sha1-0.10.6.crate) = e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba
+SIZE (rust/crates/sha1-0.10.6.crate) = 13517
+SHA256 (rust/crates/sha2-0.10.8.crate) = 793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8
+SIZE (rust/crates/sha2-0.10.8.crate) = 26357
+SHA256 (rust/crates/sharded-slab-0.1.7.crate) = f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6
+SIZE (rust/crates/sharded-slab-0.1.7.crate) = 58227
+SHA256 (rust/crates/shlex-1.3.0.crate) = 0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64
+SIZE (rust/crates/shlex-1.3.0.crate) = 18713
+SHA256 (rust/crates/signal-hook-registry-1.4.1.crate) = d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1
+SIZE (rust/crates/signal-hook-registry-1.4.1.crate) = 17987
+SHA256 (rust/crates/signature-2.2.0.crate) = 77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de
+SIZE (rust/crates/signature-2.2.0.crate) = 15531
+SHA256 (rust/crates/simdutf8-0.1.4.crate) = f27f6278552951f1f2b8cf9da965d10969b2efdea95a6ec47987ab46edfe263a
+SIZE (rust/crates/simdutf8-0.1.4.crate) = 28621
+SHA256 (rust/crates/simple_asn1-0.6.2.crate) = adc4e5204eb1910f40f9cfa375f6f05b68c3abac4b6fd879c8ff5e7ae8a0a085
+SIZE (rust/crates/simple_asn1-0.6.2.crate) = 15992
+SHA256 (rust/crates/siphasher-0.3.11.crate) = 38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d
+SIZE (rust/crates/siphasher-0.3.11.crate) = 10442
+SHA256 (rust/crates/slab-0.4.9.crate) = 8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67
+SIZE (rust/crates/slab-0.4.9.crate) = 17108
+SHA256 (rust/crates/smallvec-1.13.2.crate) = 3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67
+SIZE (rust/crates/smallvec-1.13.2.crate) = 35216
+SHA256 (rust/crates/smol_str-0.2.1.crate) = e6845563ada680337a52d43bb0b29f396f2d911616f6573012645b9e3d048a49
+SIZE (rust/crates/smol_str-0.2.1.crate) = 14689
+SHA256 (rust/crates/snafu-0.7.5.crate) = e4de37ad025c587a29e8f3f5605c00f70b98715ef90b9061a815b9e59e9042d6
+SIZE (rust/crates/snafu-0.7.5.crate) = 65229
+SHA256 (rust/crates/snafu-derive-0.7.5.crate) = 990079665f075b699031e9c08fd3ab99be5029b96f3b78dc0709e8f77e4efebf
+SIZE (rust/crates/snafu-derive-0.7.5.crate) = 28208
+SHA256 (rust/crates/snap-1.1.1.crate) = 1b6b67fb9a61334225b5b790716f609cd58395f895b3fe8b328786812a40bc3b
+SIZE (rust/crates/snap-1.1.1.crate) = 33763
+SHA256 (rust/crates/socket2-0.5.6.crate) = 05ffd9c0a93b7543e062e759284fcf5f5e3b098501104bfbdde4d404db792871
+SIZE (rust/crates/socket2-0.5.6.crate) = 55270
+SHA256 (rust/crates/spade-2.6.0.crate) = 61addf9117b11d1f5b4bf6fe94242ba25f59d2d4b2080544b771bd647024fd00
+SIZE (rust/crates/spade-2.6.0.crate) = 412396
+SHA256 (rust/crates/speedb-0.0.4.crate) = 78a8bab270d7d5a088d3dd9f1eb6ce0f0c5ee6261acff6b04b3e230bfafe8a1c
+SIZE (rust/crates/speedb-0.0.4.crate) = 128022
+SHA256 (rust/crates/spin-0.5.2.crate) = 6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d
+SIZE (rust/crates/spin-0.5.2.crate) = 12004
+SHA256 (rust/crates/spin-0.9.8.crate) = 6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67
+SIZE (rust/crates/spin-0.9.8.crate) = 38958
+SHA256 (rust/crates/spki-0.7.3.crate) = d91ed6c858b01f942cd56b37a94b3e0a1798290327d1236e4d9cf4eaca44d29d
+SIZE (rust/crates/spki-0.7.3.crate) = 16409
+SHA256 (rust/crates/stable_deref_trait-1.2.0.crate) = a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3
+SIZE (rust/crates/stable_deref_trait-1.2.0.crate) = 8054
+SHA256 (rust/crates/stacker-0.1.15.crate) = c886bd4480155fd3ef527d45e9ac8dd7118a898a46530b7b94c3e21866259fce
+SIZE (rust/crates/stacker-0.1.15.crate) = 14656
+SHA256 (rust/crates/static_assertions-1.1.0.crate) = a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f
+SIZE (rust/crates/static_assertions-1.1.0.crate) = 18480
+SHA256 (rust/crates/storekey-0.5.0.crate) = 43c42833834a5d23b344f71d87114e0cc9994766a5c42938f4b50e7b2aef85b2
+SIZE (rust/crates/storekey-0.5.0.crate) = 18220
+SHA256 (rust/crates/str-buf-1.0.6.crate) = 9e08d8363704e6c71fc928674353e6b7c23dcea9d82d7012c8faf2a3a025f8d0
+SIZE (rust/crates/str-buf-1.0.6.crate) = 3828
+SHA256 (rust/crates/str_stack-0.1.0.crate) = 9091b6114800a5f2141aee1d1b9d6ca3592ac062dc5decb3764ec5895a47b4eb
+SIZE (rust/crates/str_stack-0.1.0.crate) = 7977
+SHA256 (rust/crates/string_cache-0.8.7.crate) = f91138e76242f575eb1d3b38b4f1362f10d3a43f47d182a5b359af488a02293b
+SIZE (rust/crates/string_cache-0.8.7.crate) = 16655
+SHA256 (rust/crates/strsim-0.10.0.crate) = 73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623
+SIZE (rust/crates/strsim-0.10.0.crate) = 11355
+SHA256 (rust/crates/strsim-0.11.1.crate) = 7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f
+SIZE (rust/crates/strsim-0.11.1.crate) = 14266
+SHA256 (rust/crates/subtle-2.5.0.crate) = 81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc
+SIZE (rust/crates/subtle-2.5.0.crate) = 13909
+SHA256 (rust/crates/surrealdb-core-1.4.2.crate) = 7a2f403dba761e0e3404f90334f8ff1454f1f308e88c84dd5dbcee52866ff30e
+SIZE (rust/crates/surrealdb-core-1.4.2.crate) = 544967
+SHA256 (rust/crates/surrealdb-derive-0.12.0.crate) = aacdb4c58b9ebef0291310afcd63af0012d85610d361f3785952c61b6f1dddf4
+SIZE (rust/crates/surrealdb-derive-0.12.0.crate) = 4940
+SHA256 (rust/crates/surrealdb-jsonwebtoken-8.3.0-surreal.1.crate) = 02d4f759c65df8a8cf2d83c99db7fdd3ae5b8fff05fa7fe69a8612f29dd5f99b
+SIZE (rust/crates/surrealdb-jsonwebtoken-8.3.0-surreal.1.crate) = 49802
+SHA256 (rust/crates/surrealdb-tikv-client-0.2.0-surreal.2.crate) = b79f921871d6ed67c970e8499b4aca3724115c189f99ab30f51b46c77bd19819
+SIZE (rust/crates/surrealdb-tikv-client-0.2.0-surreal.2.crate) = 246776
+SHA256 (rust/crates/surrealkv-0.1.3.crate) = 85fd66fd1b355d38cab3204504b44c17702517b20407db0dbe79f197ec4dac9a
+SIZE (rust/crates/surrealkv-0.1.3.crate) = 63687
+SHA256 (rust/crates/surrealml-core-0.0.8.crate) = 12c54e2e688e15c48e3bd26824311c5143b17028391733f88862f162f70dd4ca
+SIZE (rust/crates/surrealml-core-0.0.8.crate) = 32367
+SHA256 (rust/crates/surrealml-core-0.1.2.crate) = c7e37965f48cd85239fa96b511d69cf5ad5dd127461a6f76c5f34906aef531d9
+SIZE (rust/crates/surrealml-core-0.1.2.crate) = 34945
+SHA256 (rust/crates/symbolic-common-12.8.0.crate) = 1cccfffbc6bb3bb2d3a26cd2077f4d055f6808d266f9d4d158797a4c60510dfe
+SIZE (rust/crates/symbolic-common-12.8.0.crate) = 24334
+SHA256 (rust/crates/symbolic-demangle-12.8.0.crate) = 76a99812da4020a67e76c4eb41f08c87364c14170495ff780f30dd519c221a68
+SIZE (rust/crates/symbolic-demangle-12.8.0.crate) = 205528
+SHA256 (rust/crates/syn-1.0.109.crate) = 72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237
+SIZE (rust/crates/syn-1.0.109.crate) = 237611
+SHA256 (rust/crates/syn-2.0.58.crate) = 44cfb93f38070beee36b3fef7d4f5a16f27751d94b187b666a5cc5e9b0d30687
+SIZE (rust/crates/syn-2.0.58.crate) = 254920
+SHA256 (rust/crates/syn_derive-0.1.8.crate) = 1329189c02ff984e9736652b1631330da25eaa6bc639089ed4915d25446cbe7b
+SIZE (rust/crates/syn_derive-0.1.8.crate) = 5173
+SHA256 (rust/crates/sync_wrapper-0.1.2.crate) = 2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160
+SIZE (rust/crates/sync_wrapper-0.1.2.crate) = 6933
+SHA256 (rust/crates/sync_wrapper-1.0.1.crate) = a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394
+SIZE (rust/crates/sync_wrapper-1.0.1.crate) = 6939
+SHA256 (rust/crates/system-configuration-0.5.1.crate) = ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7
+SIZE (rust/crates/system-configuration-0.5.1.crate) = 12618
+SHA256 (rust/crates/system-configuration-sys-0.5.0.crate) = a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9
+SIZE (rust/crates/system-configuration-sys-0.5.0.crate) = 6730
+SHA256 (rust/crates/tap-1.0.1.crate) = 55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369
+SIZE (rust/crates/tap-1.0.1.crate) = 11316
+SHA256 (rust/crates/tar-0.4.40.crate) = b16afcea1f22891c49a00c751c7b63b2233284064f11a200fc624137c51e2ddb
+SIZE (rust/crates/tar-0.4.40.crate) = 51844
+SHA256 (rust/crates/temp-dir-0.1.13.crate) = 1f227968ec00f0e5322f9b8173c7a0cbcff6181a0a5b28e9892491c286277231
+SIZE (rust/crates/temp-dir-0.1.13.crate) = 5829
+SHA256 (rust/crates/temp-env-0.3.6.crate) = 96374855068f47402c3121c6eed88d29cb1de8f3ab27090e273e420bdabcf050
+SIZE (rust/crates/temp-env-0.3.6.crate) = 10746
+SHA256 (rust/crates/tempfile-3.10.1.crate) = 85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1
+SIZE (rust/crates/tempfile-3.10.1.crate) = 33653
+SHA256 (rust/crates/term-0.7.0.crate) = c59df8ac95d96ff9bede18eb7300b0fda5e5d8d90960e76f8e14ae765eedbf1f
+SIZE (rust/crates/term-0.7.0.crate) = 37082
+SHA256 (rust/crates/termcolor-1.4.1.crate) = 06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755
+SIZE (rust/crates/termcolor-1.4.1.crate) = 18773
+SHA256 (rust/crates/terminal_size-0.3.0.crate) = 21bebf2b7c9e0a515f6e0f8c51dc0f8e4696391e6f1ff30379559f8365fb0df7
+SIZE (rust/crates/terminal_size-0.3.0.crate) = 10096
+SHA256 (rust/crates/termtree-0.4.1.crate) = 3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76
+SIZE (rust/crates/termtree-0.4.1.crate) = 4557
+SHA256 (rust/crates/test-log-0.2.15.crate) = 7b319995299c65d522680decf80f2c108d85b861d81dfe340a10d16cee29d9e6
+SIZE (rust/crates/test-log-0.2.15.crate) = 9739
+SHA256 (rust/crates/test-log-macros-0.2.15.crate) = c8f546451eaa38373f549093fe9fd05e7d2bade739e2ddf834b9968621d60107
+SIZE (rust/crates/test-log-macros-0.2.15.crate) = 7589
+SHA256 (rust/crates/thiserror-1.0.58.crate) = 03468839009160513471e86a034bb2c5c0e4baae3b43f79ffc55c4a5427b3297
+SIZE (rust/crates/thiserror-1.0.58.crate) = 21025
+SHA256 (rust/crates/thiserror-impl-1.0.58.crate) = c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7
+SIZE (rust/crates/thiserror-impl-1.0.58.crate) = 15645
+SHA256 (rust/crates/thread_local-1.1.8.crate) = 8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c
+SIZE (rust/crates/thread_local-1.1.8.crate) = 13962
+SHA256 (rust/crates/time-0.3.34.crate) = c8248b6521bb14bc45b4067159b9b6ad792e2d6d754d6c41fb50e29fefe38749
+SIZE (rust/crates/time-0.3.34.crate) = 118430
+SHA256 (rust/crates/time-core-0.1.2.crate) = ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3
+SIZE (rust/crates/time-core-0.1.2.crate) = 7191
+SHA256 (rust/crates/time-macros-0.2.17.crate) = 7ba3a3ef41e6672a2f0f001392bb5dcd3ff0a9992d618ca761a11c3121547774
+SIZE (rust/crates/time-macros-0.2.17.crate) = 24443
+SHA256 (rust/crates/tiny-keccak-2.0.2.crate) = 2c9d3793400a45f954c52e73d068316d76b6f4e36977e3fcebb13a2721e80237
+SIZE (rust/crates/tiny-keccak-2.0.2.crate) = 20129
+SHA256 (rust/crates/tinytemplate-1.2.1.crate) = be4d6b5f19ff7664e8c98d03e2139cb510db9b0a60b55f8e8709b689d939b6bc
+SIZE (rust/crates/tinytemplate-1.2.1.crate) = 26490
+SHA256 (rust/crates/tinyvec-1.6.0.crate) = 87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50
+SIZE (rust/crates/tinyvec-1.6.0.crate) = 45991
+SHA256 (rust/crates/tinyvec_macros-0.1.1.crate) = 1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20
+SIZE (rust/crates/tinyvec_macros-0.1.1.crate) = 5865
+SHA256 (rust/crates/tokio-1.37.0.crate) = 1adbebffeca75fcfd058afa480fb6c0b81e165a0323f9c9d39c9697e37c46787
+SIZE (rust/crates/tokio-1.37.0.crate) = 764297
+SHA256 (rust/crates/tokio-io-timeout-1.2.0.crate) = 30b74022ada614a1b4834de765f9bb43877f910cc8ce4be40e89042c9223a8bf
+SIZE (rust/crates/tokio-io-timeout-1.2.0.crate) = 8993
+SHA256 (rust/crates/tokio-macros-2.2.0.crate) = 5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b
+SIZE (rust/crates/tokio-macros-2.2.0.crate) = 11520
+SHA256 (rust/crates/tokio-native-tls-0.3.1.crate) = bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2
+SIZE (rust/crates/tokio-native-tls-0.3.1.crate) = 20676
+SHA256 (rust/crates/tokio-rustls-0.24.1.crate) = c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081
+SIZE (rust/crates/tokio-rustls-0.24.1.crate) = 33049
+SHA256 (rust/crates/tokio-stream-0.1.15.crate) = 267ac89e0bec6e691e5813911606935d77c476ff49024f98abcea3e7b15e37af
+SIZE (rust/crates/tokio-stream-0.1.15.crate) = 36284
+SHA256 (rust/crates/tokio-tungstenite-0.20.1.crate) = 212d5dcb2a1ce06d81107c3d0ffa3121fe974b73f068c8282cb1c32328113b6c
+SIZE (rust/crates/tokio-tungstenite-0.20.1.crate) = 28569
+SHA256 (rust/crates/tokio-util-0.7.10.crate) = 5419f34732d9eb6ee4c3578b7989078579b7f039cbbb9ca2c4da015749371e15
+SIZE (rust/crates/tokio-util-0.7.10.crate) = 110508
+SHA256 (rust/crates/toml_datetime-0.6.5.crate) = 3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1
+SIZE (rust/crates/toml_datetime-0.6.5.crate) = 10910
+SHA256 (rust/crates/toml_edit-0.19.15.crate) = 1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421
+SIZE (rust/crates/toml_edit-0.19.15.crate) = 95324
+SHA256 (rust/crates/toml_edit-0.21.1.crate) = 6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1
+SIZE (rust/crates/toml_edit-0.21.1.crate) = 101661
+SHA256 (rust/crates/tonic-0.8.3.crate) = 8f219fad3b929bef19b1f86fbc0358d35daed8f2cac972037ac0dc10bbb8d5fb
+SIZE (rust/crates/tonic-0.8.3.crate) = 88259
+SHA256 (rust/crates/tonic-0.9.2.crate) = 3082666a3a6433f7f511c7192923fa1fe07c69332d3c6a2e6bb040b569199d5a
+SIZE (rust/crates/tonic-0.9.2.crate) = 92598
+SHA256 (rust/crates/tower-0.4.13.crate) = b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c
+SIZE (rust/crates/tower-0.4.13.crate) = 106906
+SHA256 (rust/crates/tower-http-0.4.4.crate) = 61c5bb1d698276a2443e5ecfabc1008bf15a36c12e6a7176e7bf089ea9131140
+SIZE (rust/crates/tower-http-0.4.4.crate) = 115612
+SHA256 (rust/crates/tower-layer-0.3.2.crate) = c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0
+SIZE (rust/crates/tower-layer-0.3.2.crate) = 6023
+SHA256 (rust/crates/tower-service-0.3.2.crate) = b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52
+SIZE (rust/crates/tower-service-0.3.2.crate) = 6847
+SHA256 (rust/crates/tracing-0.1.40.crate) = c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef
+SIZE (rust/crates/tracing-0.1.40.crate) = 79459
+SHA256 (rust/crates/tracing-attributes-0.1.27.crate) = 34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7
+SIZE (rust/crates/tracing-attributes-0.1.27.crate) = 32241
+SHA256 (rust/crates/tracing-core-0.1.32.crate) = c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54
+SIZE (rust/crates/tracing-core-0.1.32.crate) = 61221
+SHA256 (rust/crates/tracing-futures-0.2.5.crate) = 97d095ae15e245a057c8e8451bab9b3ee1e1f68e9ba2b4fbc18d0ac5237835f2
+SIZE (rust/crates/tracing-futures-0.2.5.crate) = 11637
+SHA256 (rust/crates/tracing-log-0.1.4.crate) = f751112709b4e791d8ce53e32c4ed2d353565a795ce84da2285393f41557bdf2
+SIZE (rust/crates/tracing-log-0.1.4.crate) = 20640
+SHA256 (rust/crates/tracing-log-0.2.0.crate) = ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3
+SIZE (rust/crates/tracing-log-0.2.0.crate) = 17561
+SHA256 (rust/crates/tracing-opentelemetry-0.19.0.crate) = 00a39dcf9bfc1742fa4d6215253b33a6e474be78275884c216fc2a06267b3600
+SIZE (rust/crates/tracing-opentelemetry-0.19.0.crate) = 123489
+SHA256 (rust/crates/tracing-subscriber-0.3.18.crate) = ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b
+SIZE (rust/crates/tracing-subscriber-0.3.18.crate) = 196312
+SHA256 (rust/crates/trice-0.4.0.crate) = d3aaab10ae9fac0b10f392752bf56f0fd20845f39037fec931e8537b105b515a
+SIZE (rust/crates/trice-0.4.0.crate) = 8324
+SHA256 (rust/crates/try-lock-0.2.5.crate) = e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b
+SIZE (rust/crates/try-lock-0.2.5.crate) = 4314
+SHA256 (rust/crates/try_map-0.3.1.crate) = fb1626d07cb5c1bb2cf17d94c0be4852e8a7c02b041acec9a8c5bdda99f9d580
+SIZE (rust/crates/try_map-0.3.1.crate) = 7002
+SHA256 (rust/crates/tungstenite-0.20.1.crate) = 9e3dac10fd62eaf6617d3a904ae222845979aec67c615d1c842b4002c7666fb9
+SIZE (rust/crates/tungstenite-0.20.1.crate) = 60095
+SHA256 (rust/crates/typenum-1.17.0.crate) = 42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825
+SIZE (rust/crates/typenum-1.17.0.crate) = 42849
+SHA256 (rust/crates/ulid-1.1.2.crate) = 34778c17965aa2a08913b57e1f34db9b4a63f5de31768b55bf20d2795f921259
+SIZE (rust/crates/ulid-1.1.2.crate) = 11517
+SHA256 (rust/crates/unicase-2.7.0.crate) = f7d2d4dafb69621809a81864c9c1b864479e1235c0dd4e199924b9742439ed89
+SIZE (rust/crates/unicase-2.7.0.crate) = 23783
+SHA256 (rust/crates/unicode-bidi-0.3.15.crate) = 08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75
+SIZE (rust/crates/unicode-bidi-0.3.15.crate) = 56811
+SHA256 (rust/crates/unicode-ident-1.0.12.crate) = 3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b
+SIZE (rust/crates/unicode-ident-1.0.12.crate) = 42168
+SHA256 (rust/crates/unicode-normalization-0.1.23.crate) = a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5
+SIZE (rust/crates/unicode-normalization-0.1.23.crate) = 122649
+SHA256 (rust/crates/unicode-script-0.5.6.crate) = ad8d71f5726e5f285a935e9fe8edfd53f0491eb6e9a5774097fdabee7cd8c9cd
+SIZE (rust/crates/unicode-script-0.5.6.crate) = 43993
+SHA256 (rust/crates/unicode-security-0.1.1.crate) = ee9e13753df674873f3c4693b240ae5c03245ddc157dfccf7c26db9329af3a11
+SIZE (rust/crates/unicode-security-0.1.1.crate) = 75795
+SHA256 (rust/crates/unicode-segmentation-1.11.0.crate) = d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202
+SIZE (rust/crates/unicode-segmentation-1.11.0.crate) = 102740
+SHA256 (rust/crates/unicode-width-0.1.11.crate) = e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85
+SIZE (rust/crates/unicode-width-0.1.11.crate) = 19187
+SHA256 (rust/crates/unicode-xid-0.2.4.crate) = f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c
+SIZE (rust/crates/unicode-xid-0.2.4.crate) = 15352
+SHA256 (rust/crates/untrusted-0.7.1.crate) = a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a
+SIZE (rust/crates/untrusted-0.7.1.crate) = 7924
+SHA256 (rust/crates/untrusted-0.9.0.crate) = 8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1
+SIZE (rust/crates/untrusted-0.9.0.crate) = 14447
+SHA256 (rust/crates/ureq-2.9.6.crate) = 11f214ce18d8b2cbe84ed3aa6486ed3f5b285cf8d8fbdbce9f3f767a724adc35
+SIZE (rust/crates/ureq-2.9.6.crate) = 113677
+SHA256 (rust/crates/url-2.5.0.crate) = 31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633
+SIZE (rust/crates/url-2.5.0.crate) = 78605
+SHA256 (rust/crates/urlencoding-2.1.3.crate) = daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da
+SIZE (rust/crates/urlencoding-2.1.3.crate) = 6538
+SHA256 (rust/crates/utf-8-0.7.6.crate) = 09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9
+SIZE (rust/crates/utf-8-0.7.6.crate) = 10422
+SHA256 (rust/crates/utf8parse-0.2.1.crate) = 711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a
+SIZE (rust/crates/utf8parse-0.2.1.crate) = 13435
+SHA256 (rust/crates/uuid-1.8.0.crate) = a183cf7feeba97b4dd1c0d46788634f6221d87fa961b305bed08c851829efcc0
+SIZE (rust/crates/uuid-1.8.0.crate) = 44043
+SHA256 (rust/crates/valuable-0.1.0.crate) = 830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d
+SIZE (rust/crates/valuable-0.1.0.crate) = 27718
+SHA256 (rust/crates/vart-0.1.1.crate) = e273ebe2c2eaad64b95aaeccbae6b95d0ba235564b062a13b8ef134c5cae9f6a
+SIZE (rust/crates/vart-0.1.1.crate) = 786318
+SHA256 (rust/crates/vcpkg-0.2.15.crate) = accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426
+SIZE (rust/crates/vcpkg-0.2.15.crate) = 228735
+SHA256 (rust/crates/version_check-0.9.4.crate) = 49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f
+SIZE (rust/crates/version_check-0.9.4.crate) = 14895
+SHA256 (rust/crates/vswhom-0.1.0.crate) = be979b7f07507105799e854203b470ff7c78a1639e330a58f183b5fea574608b
+SIZE (rust/crates/vswhom-0.1.0.crate) = 9420
+SHA256 (rust/crates/vswhom-sys-0.1.2.crate) = d3b17ae1f6c8a2b28506cd96d412eebf83b4a0ff2cbefeeb952f2f9dfa44ba18
+SIZE (rust/crates/vswhom-sys-0.1.2.crate) = 15852
+SHA256 (rust/crates/waker-fn-1.1.1.crate) = f3c4517f54858c779bbcbf228f4fca63d121bf85fbecb2dc578cdf4a39395690
+SIZE (rust/crates/waker-fn-1.1.1.crate) = 6323
+SHA256 (rust/crates/walkdir-2.5.0.crate) = 29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b
+SIZE (rust/crates/walkdir-2.5.0.crate) = 23951
+SHA256 (rust/crates/want-0.3.1.crate) = bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e
+SIZE (rust/crates/want-0.3.1.crate) = 6398
+SHA256 (rust/crates/wasi-0.9.0+wasi-snapshot-preview1.crate) = cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519
+SIZE (rust/crates/wasi-0.9.0+wasi-snapshot-preview1.crate) = 31521
+SHA256 (rust/crates/wasi-0.11.0+wasi-snapshot-preview1.crate) = 9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423
+SIZE (rust/crates/wasi-0.11.0+wasi-snapshot-preview1.crate) = 28131
+SHA256 (rust/crates/wasm-bindgen-0.2.92.crate) = 4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8
+SIZE (rust/crates/wasm-bindgen-0.2.92.crate) = 184119
+SHA256 (rust/crates/wasm-bindgen-backend-0.2.92.crate) = 614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da
+SIZE (rust/crates/wasm-bindgen-backend-0.2.92.crate) = 28348
+SHA256 (rust/crates/wasm-bindgen-futures-0.4.42.crate) = 76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0
+SIZE (rust/crates/wasm-bindgen-futures-0.4.42.crate) = 15380
+SHA256 (rust/crates/wasm-bindgen-macro-0.2.92.crate) = a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726
+SIZE (rust/crates/wasm-bindgen-macro-0.2.92.crate) = 13835
+SHA256 (rust/crates/wasm-bindgen-macro-support-0.2.92.crate) = e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7
+SIZE (rust/crates/wasm-bindgen-macro-support-0.2.92.crate) = 20092
+SHA256 (rust/crates/wasm-bindgen-shared-0.2.92.crate) = af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96
+SIZE (rust/crates/wasm-bindgen-shared-0.2.92.crate) = 7263
+SHA256 (rust/crates/wasm-streams-0.4.0.crate) = b65dc4c90b63b118468cf747d8bf3566c1913ef60be765b5730ead9e0a3ba129
+SIZE (rust/crates/wasm-streams-0.4.0.crate) = 34328
+SHA256 (rust/crates/wasmtimer-0.2.0.crate) = 5f656cd8858a5164932d8a90f936700860976ec21eb00e0fe2aa8cab13f6b4cf
+SIZE (rust/crates/wasmtimer-0.2.0.crate) = 31747
+SHA256 (rust/crates/web-sys-0.3.69.crate) = 77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef
+SIZE (rust/crates/web-sys-0.3.69.crate) = 728877
+SHA256 (rust/crates/web-time-1.1.0.crate) = 5a6580f308b1fad9207618087a65c04e7a10bc77e02c8e84e9b00dd4b12fa0bb
+SIZE (rust/crates/web-time-1.1.0.crate) = 18026
+SHA256 (rust/crates/webpki-roots-0.25.4.crate) = 5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1
+SIZE (rust/crates/webpki-roots-0.25.4.crate) = 253559
+SHA256 (rust/crates/webpki-roots-0.26.1.crate) = b3de34ae270483955a94f4b21bdaaeb83d508bb84a01435f393818edb0012009
+SIZE (rust/crates/webpki-roots-0.26.1.crate) = 249748
+SHA256 (rust/crates/which-4.4.2.crate) = 87ba24419a2078cd2b0f2ede2691b6c66d8e47836da3b6db8265ebad47afbfc7
+SIZE (rust/crates/which-4.4.2.crate) = 15953
+SHA256 (rust/crates/winapi-0.3.9.crate) = 5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419
+SIZE (rust/crates/winapi-0.3.9.crate) = 1200382
+SHA256 (rust/crates/winapi-i686-pc-windows-gnu-0.4.0.crate) = ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6
+SIZE (rust/crates/winapi-i686-pc-windows-gnu-0.4.0.crate) = 2918815
+SHA256 (rust/crates/winapi-util-0.1.6.crate) = f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596
+SIZE (rust/crates/winapi-util-0.1.6.crate) = 12234
+SHA256 (rust/crates/winapi-x86_64-pc-windows-gnu-0.4.0.crate) = 712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f
+SIZE (rust/crates/winapi-x86_64-pc-windows-gnu-0.4.0.crate) = 2947998
+SHA256 (rust/crates/windows-core-0.52.0.crate) = 33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9
+SIZE (rust/crates/windows-core-0.52.0.crate) = 42154
+SHA256 (rust/crates/windows-sys-0.48.0.crate) = 677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9
+SIZE (rust/crates/windows-sys-0.48.0.crate) = 2628884
+SHA256 (rust/crates/windows-sys-0.52.0.crate) = 282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d
+SIZE (rust/crates/windows-sys-0.52.0.crate) = 2576877
+SHA256 (rust/crates/windows-targets-0.48.5.crate) = 9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c
+SIZE (rust/crates/windows-targets-0.48.5.crate) = 6904
+SHA256 (rust/crates/windows-targets-0.52.4.crate) = 7dd37b7e5ab9018759f893a1952c9420d060016fc19a472b4bb20d1bdd694d1b
+SIZE (rust/crates/windows-targets-0.52.4.crate) = 6310
+SHA256 (rust/crates/windows_aarch64_gnullvm-0.48.5.crate) = 2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8
+SIZE (rust/crates/windows_aarch64_gnullvm-0.48.5.crate) = 418492
+SHA256 (rust/crates/windows_aarch64_gnullvm-0.52.4.crate) = bcf46cf4c365c6f2d1cc93ce535f2c8b244591df96ceee75d8e83deb70a9cac9
+SIZE (rust/crates/windows_aarch64_gnullvm-0.52.4.crate) = 433373
+SHA256 (rust/crates/windows_aarch64_msvc-0.48.5.crate) = dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc
+SIZE (rust/crates/windows_aarch64_msvc-0.48.5.crate) = 798483
+SHA256 (rust/crates/windows_aarch64_msvc-0.52.4.crate) = da9f259dd3bcf6990b55bffd094c4f7235817ba4ceebde8e6d11cd0c5633b675
+SIZE (rust/crates/windows_aarch64_msvc-0.52.4.crate) = 828055
+SHA256 (rust/crates/windows_i686_gnu-0.48.5.crate) = a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e
+SIZE (rust/crates/windows_i686_gnu-0.48.5.crate) = 844891
+SHA256 (rust/crates/windows_i686_gnu-0.52.4.crate) = b474d8268f99e0995f25b9f095bc7434632601028cf86590aea5c8a5cb7801d3
+SIZE (rust/crates/windows_i686_gnu-0.52.4.crate) = 875736
+SHA256 (rust/crates/windows_i686_msvc-0.48.5.crate) = 8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406
+SIZE (rust/crates/windows_i686_msvc-0.48.5.crate) = 864300
+SHA256 (rust/crates/windows_i686_msvc-0.52.4.crate) = 1515e9a29e5bed743cb4415a9ecf5dfca648ce85ee42e15873c3cd8610ff8e02
+SIZE (rust/crates/windows_i686_msvc-0.52.4.crate) = 895530
+SHA256 (rust/crates/windows_x86_64_gnu-0.48.5.crate) = 53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e
+SIZE (rust/crates/windows_x86_64_gnu-0.48.5.crate) = 801619
+SHA256 (rust/crates/windows_x86_64_gnu-0.52.4.crate) = 5eee091590e89cc02ad514ffe3ead9eb6b660aedca2183455434b93546371a03
+SIZE (rust/crates/windows_x86_64_gnu-0.52.4.crate) = 831627
+SHA256 (rust/crates/windows_x86_64_gnullvm-0.48.5.crate) = 0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc
+SIZE (rust/crates/windows_x86_64_gnullvm-0.48.5.crate) = 418486
+SHA256 (rust/crates/windows_x86_64_gnullvm-0.52.4.crate) = 77ca79f2451b49fa9e2af39f0747fe999fcda4f5e241b2898624dca97a1f2177
+SIZE (rust/crates/windows_x86_64_gnullvm-0.52.4.crate) = 433358
+SHA256 (rust/crates/windows_x86_64_msvc-0.48.5.crate) = ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538
+SIZE (rust/crates/windows_x86_64_msvc-0.48.5.crate) = 798412
+SHA256 (rust/crates/windows_x86_64_msvc-0.52.4.crate) = 32b752e52a2da0ddfbdbcc6fceadfeede4c939ed16d13e648833a61dfb611ed8
+SIZE (rust/crates/windows_x86_64_msvc-0.52.4.crate) = 828019
+SHA256 (rust/crates/winnow-0.5.40.crate) = f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876
+SIZE (rust/crates/winnow-0.5.40.crate) = 159316
+SHA256 (rust/crates/winreg-0.50.0.crate) = 524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1
+SIZE (rust/crates/winreg-0.50.0.crate) = 29703
+SHA256 (rust/crates/wiremock-0.5.22.crate) = 13a3a53eaf34f390dd30d7b1b078287dd05df2aa2e21a589ccb80f5c7253c2e9
+SIZE (rust/crates/wiremock-0.5.22.crate) = 44340
+SHA256 (rust/crates/ws_stream_wasm-0.7.4.crate) = 7999f5f4217fe3818726b66257a4475f71e74ffd190776ad053fa159e50737f5
+SIZE (rust/crates/ws_stream_wasm-0.7.4.crate) = 23942
+SHA256 (rust/crates/wyz-0.5.1.crate) = 05f360fc0b24296329c78fda852a1e9ae82de9cf7b27dae4b7f62f118f77b9ed
+SIZE (rust/crates/wyz-0.5.1.crate) = 18790
+SHA256 (rust/crates/xattr-1.3.1.crate) = 8da84f1a25939b27f6820d92aed108f83ff920fdf11a7b19366c27c4cda81d4f
+SIZE (rust/crates/xattr-1.3.1.crate) = 12580
+SHA256 (rust/crates/xml-rs-0.8.20.crate) = 791978798f0597cfc70478424c2b4fdc2b7a8024aaff78497ef00f24ef674193
+SIZE (rust/crates/xml-rs-0.8.20.crate) = 54443
+SHA256 (rust/crates/yasna-0.5.2.crate) = e17bb3549cc1321ae1296b9cdc2698e2b6cb1992adfa19a8c72e5b7a738f44cd
+SIZE (rust/crates/yasna-0.5.2.crate) = 34859
+SHA256 (rust/crates/zerocopy-0.7.32.crate) = 74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be
+SIZE (rust/crates/zerocopy-0.7.32.crate) = 151096
+SHA256 (rust/crates/zerocopy-derive-0.7.32.crate) = 9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6
+SIZE (rust/crates/zerocopy-derive-0.7.32.crate) = 37623
+SHA256 (rust/crates/zeroize-1.7.0.crate) = 525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d
+SIZE (rust/crates/zeroize-1.7.0.crate) = 19039
+SHA256 (rust/crates/zip-0.6.6.crate) = 760394e246e4c28189f19d488c058bf16f564016aefac5d32bb1f3b51d5e9261
+SIZE (rust/crates/zip-0.6.6.crate) = 65789
+SHA256 (rust/crates/zstd-0.13.1.crate) = 2d789b1514203a1120ad2429eae43a7bd32b90976a7bb8a05f7ec02fa88cc23a
+SIZE (rust/crates/zstd-0.13.1.crate) = 29805
+SHA256 (rust/crates/zstd-safe-7.1.0.crate) = 1cd99b45c6bc03a018c8b8a86025678c87e55526064e38f9df301989dce7ec0a
+SIZE (rust/crates/zstd-safe-7.1.0.crate) = 20792
+SHA256 (rust/crates/zstd-sys-2.0.10+zstd.1.5.6.crate) = c253a4914af5bafc8fa8c86ee400827e83cf6ec01195ec1f1ed8441bf00d65aa
+SIZE (rust/crates/zstd-sys-2.0.10+zstd.1.5.6.crate) = 749088
+SHA256 (surrealdb-surrealdb-v1.4.2_GH0.tar.gz) = 20f5a4134a3ca344a2f236f209450a73f7b69024c39f3f4c777aa8c14f8c6b9e
+SIZE (surrealdb-surrealdb-v1.4.2_GH0.tar.gz) = 3203647
diff --git a/databases/surrealdb/pkg-descr b/databases/surrealdb/pkg-descr
new file mode 100644
index 000000000000..e17ac08fa9b9
--- /dev/null
+++ b/databases/surrealdb/pkg-descr
@@ -0,0 +1,11 @@
+SurrealDB is an end-to-end cloud-native database designed for modern
+applications, including web, mobile, serverless, Jamstack, backend,
+and traditional applications. With SurrealDB, you can simplify your database
+and API infrastructure, reduce development time, and build secure, performant
+apps quickly and cost-effectively.
+
+Key features of SurrealDB include:
+* Reduces development time
+* Real-time collaborative API backend service
+* Support for multiple querying languages
+* Granular access control
diff --git a/databases/symphytum/Makefile b/databases/symphytum/Makefile
new file mode 100644
index 000000000000..ca1c0f9a8b55
--- /dev/null
+++ b/databases/symphytum/Makefile
@@ -0,0 +1,31 @@
+PORTNAME=	symphytum
+PORTVERSION=	2.6
+DISTVERSIONPREFIX=	v
+CATEGORIES=	databases
+
+MAINTAINER=	danfe@FreeBSD.org
+COMMENT=	Personal, user-friendly database software
+WWW=		https://github.com/giowck/symphytum
+
+LICENSE=	BSD2CLAUSE
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
+USES=		qmake qt:5
+USE_QT=		buildtools:build \
+		core gui network printsupport sql svg widgets
+USE_GITHUB=	yes
+GH_ACCOUNT=	giowck
+
+PLIST_FILES=	bin/${PORTNAME}
+PORTDOCS=	AUTHORS CHANGELOG.md
+
+OPTIONS_DEFINE=	DOCS
+
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
+
+do-install-DOCS-on:
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
+
+.include <bsd.port.mk>
diff --git a/databases/symphytum/distinfo b/databases/symphytum/distinfo
new file mode 100644
index 000000000000..265ce97836ff
--- /dev/null
+++ b/databases/symphytum/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1580856379
+SHA256 (giowck-symphytum-v2.6_GH0.tar.gz) = 64f2c10fc7de005473cc49c7109fc19fb5e0765f94ca3ffc23fbd9627d728610
+SIZE (giowck-symphytum-v2.6_GH0.tar.gz) = 15443973
diff --git a/databases/symphytum/pkg-descr b/databases/symphytum/pkg-descr
new file mode 100644
index 000000000000..aedd6bf721d7
--- /dev/null
+++ b/databases/symphytum/pkg-descr
@@ -0,0 +1,3 @@
+Symphytum is a personal database software for everyone who desires to
+manage and organize data in an easy and intuitive way, without having
+to study complex database languages and software user interfaces.
diff --git a/databases/tarantool-c/Makefile b/databases/tarantool-c/Makefile
index 58937c931e80..8facba5819fe 100644
--- a/databases/tarantool-c/Makefile
+++ b/databases/tarantool-c/Makefile
@@ -1,10 +1,11 @@
 PORTNAME=	tarantool-c
 PORTVERSION=	1.0.1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	databases
 
-MAINTAINER=	sunpoet@FreeBSD.org
+MAINTAINER=	balaev@tarantool.org
 COMMENT=	C client for Tarantool 1.6+
+WWW=		https://github.com/tarantool/tarantool-c
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
@@ -17,10 +18,8 @@ CMAKE_OFF=	ENABLE_BUNDLED_DOCS ENABLE_BUNDLED_MSGPUCK
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	tarantool
-GH_TAGNAME=	0ab37e8
+GH_TAGNAME=	2aa7937
 
-post-patch:
-	@${GREP} -lr 'msgpuck/msgpuck.h' ${WRKSRC}/ | ${XARGS} ${REINPLACE_CMD} -e 's|msgpuck/msgpuck.h|msgpuck.h|'
-	@${REINPLACE_CMD} -e 's|libmsgpuck.a|libmsgpuck.so|' ${WRKSRC}/cmake/FindMsgPuck.cmake
+CONFLICTS_INSTALL=	nosqlbench # include/tarantool/tarantool.h
 
 .include <bsd.port.mk>
diff --git a/databases/tarantool-c/distinfo b/databases/tarantool-c/distinfo
index cf0e51e6ff83..955e3c90ef33 100644
--- a/databases/tarantool-c/distinfo
+++ b/databases/tarantool-c/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1605901606
-SHA256 (tarantool-tarantool-c-1.0.1-0ab37e8_GH0.tar.gz) = 367afdee08befb80ae985f5531ccabe4a1c3712335b0fee5449a3eef6229d0cf
-SIZE (tarantool-tarantool-c-1.0.1-0ab37e8_GH0.tar.gz) = 140515
+TIMESTAMP = 1643382496
+SHA256 (tarantool-tarantool-c-1.0.1-2aa7937_GH0.tar.gz) = 883ee233f82216b1e1d5408cae348ae584a7d70fda1a6a9d4e9858885045e77c
+SIZE (tarantool-tarantool-c-1.0.1-2aa7937_GH0.tar.gz) = 141602
diff --git a/databases/tarantool-c/files/patch-CMakeLists.txt b/databases/tarantool-c/files/patch-CMakeLists.txt
new file mode 100644
index 000000000000..5ab36717da11
--- /dev/null
+++ b/databases/tarantool-c/files/patch-CMakeLists.txt
@@ -0,0 +1,11 @@
+--- CMakeLists.txt.orig	2021-11-26 15:16:51 UTC
++++ CMakeLists.txt
+@@ -46,7 +46,7 @@ if (NOT ENABLE_BUNDLED_MSGPUCK)
+     set (MSGPUCK_REQUIRED ON)
+     include (cmake/FindMsgPuck.cmake)
+     include_directories(${MSGPUCK_INCLUDE_DIR})
+-elseif (NOT EXISTS "${PROJECT_SOURCE_DIR}/third_party/msgpuck/msgpuck.h")
++elseif (NOT EXISTS "${PROJECT_SOURCE_DIR}/third_party/msgpuck.h")
+     message(FATAL_ERROR "Could not find msgpuck development files")
+ else (NOT ENABLE_BUNDLED_MSGPUCK)
+     set (MSGPUCK_INCLUDE_DIR "${PROJECT_SOURCE_DIR}/third_party")
diff --git a/databases/tarantool-c/files/patch-cmake-FindMsgPuck.cmake b/databases/tarantool-c/files/patch-cmake-FindMsgPuck.cmake
new file mode 100644
index 000000000000..640053688282
--- /dev/null
+++ b/databases/tarantool-c/files/patch-cmake-FindMsgPuck.cmake
@@ -0,0 +1,11 @@
+--- cmake/FindMsgPuck.cmake.orig	2021-11-26 15:16:51 UTC
++++ cmake/FindMsgPuck.cmake
+@@ -7,7 +7,7 @@
+ #
+ 
+ find_path(MSGPUCK_INCLUDE_DIR msgpuck.h PATH_SUFFIXES msgpuck)
+-find_library(MSGPUCK_LIBRARY NAMES libmsgpuck.a)
++find_library(MSGPUCK_LIBRARY NAMES libmsgpuck.so)
+ 
+ include(FindPackageHandleStandardArgs)
+ find_package_handle_standard_args(MsgPuck
diff --git a/databases/tarantool-c/files/patch-include_tp.h b/databases/tarantool-c/files/patch-include_tp.h
new file mode 100644
index 000000000000..e12cea2444e4
--- /dev/null
+++ b/databases/tarantool-c/files/patch-include_tp.h
@@ -0,0 +1,11 @@
+--- include/tp.h.orig	2021-11-26 15:16:51 UTC
++++ include/tp.h
+@@ -6,7 +6,7 @@
+ #include <assert.h>
+ #include <stdarg.h>
+ 
+-#include <msgpuck/msgpuck.h>
++#include <msgpuck.h>
+ #include <sha1.h>
+ #include <base64.h>
+ 
diff --git a/databases/tarantool-c/files/patch-test-plain_test.c b/databases/tarantool-c/files/patch-test-plain_test.c
new file mode 100644
index 000000000000..0264a64711b0
--- /dev/null
+++ b/databases/tarantool-c/files/patch-test-plain_test.c
@@ -0,0 +1,11 @@
+--- test/plain_test.c.orig	2021-11-26 15:16:51 UTC
++++ test/plain_test.c
+@@ -8,7 +8,7 @@
+ 
+ #include <sys/uio.h>
+ 
+-#include <msgpuck/msgpuck.h>
++#include <msgpuck.h>
+ 
+ #include <tarantool/tnt_net.h>
+ 
diff --git a/databases/tarantool-c/pkg-descr b/databases/tarantool-c/pkg-descr
index 1a5f6b1b6a16..7ecfb8a32b34 100644
--- a/databases/tarantool-c/pkg-descr
+++ b/databases/tarantool-c/pkg-descr
@@ -1,3 +1 @@
 Tarantool-c is a client library written in C for Tarantool.
-
-WWW: https://github.com/tarantool/tarantool-c
diff --git a/databases/tarantool/Makefile b/databases/tarantool/Makefile
index 86ad694d1bf9..9a1c13a6c3b5 100644
--- a/databases/tarantool/Makefile
+++ b/databases/tarantool/Makefile
@@ -1,21 +1,21 @@
-# Created by: Veniamin Gvozdikov <vg@FreeBSD.org>
-
 PORTNAME=	tarantool
-PORTVERSION=	2.8.1
+PORTVERSION=	3.0.0
 CATEGORIES=	databases
+MASTER_SITES=	https://download.tarantool.org/tarantool/src/
 
-MAINTAINER=	sunpoet@FreeBSD.org
+MAINTAINER=	balaev@tarantool.org
 COMMENT=	NoSQL database running in a Lua application server
+WWW=		https://tarantool.io/
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BROKEN_aarch64=		fails to compile: mmintrin.h:50:12: invalid conversion between vector type '__m64' (vector of 1 'long long' value) and integer type 'int' of different siz
-BROKEN_riscv64=		fails to compile: mmintrin.h:50:12: invalid conversion between vector type '__m64' (vector of 1 'long long' value) and integer type 'int' of different siz
-NOT_FOR_ARCHS=		armv6 powerpc64 sparc64
+NOT_FOR_ARCHS=		armv6 i386 powerpc64
 NOT_FOR_ARCHS_REASON=	fails to build: Unsupported architecture
 
-BUILD_DEPENDS=	gsed:textproc/gsed
+BUILD_DEPENDS=	gsed:textproc/gsed \
+		msgpuck>=2.0_6:devel/msgpuck \
+		curl>=8.4.0:ftp/curl
 LIB_DEPENDS=	libcurl.so:ftp/curl \
 		libicui18n.so:devel/icu \
 		libmsgpuck.so:devel/msgpuck \
@@ -25,10 +25,12 @@ LIB_DEPENDS=	libcurl.so:ftp/curl \
 USES=		cmake:noninja compiler:c++11-lang cpe gettext-runtime gmake iconv perl5 readline ssl
 USE_PERL5=	build
 
+CONFLICTS_INSTALL=	tarantool2
+
 BINARY_ALIAS=	sed=${LOCALBASE}/bin/gsed
 CMAKE_ARGS=	-DCMAKE_INSTALL_FULL_SYSCONFDIR=${ETCDIR} \
 		-DCMAKE_INSTALL_LOCALSTATEDIR=/var \
-		-DCMAKE_INSTALL_MANDIR=${PREFIX}/man
+		-DCMAKE_INSTALL_MANDIR=${PREFIX}/share/man
 CMAKE_OFF=	ENABLE_BUNDLED_LIBCURL \
 		ENABLE_BUNDLED_LIBYAML \
 		ENABLE_BUNDLED_MSGPUCK \
@@ -45,28 +47,12 @@ PLIST_SUB=	TT_DATADIR=${TT_DATADIR} \
 		TT_LOGDIR=${TT_LOGDIR}
 SUB_FILES=	pkg-message
 
-GH_TUPLE=	luafun:luafun:e248e00:luafun_luafun/third_party/luafun \
-		tarantool:decNumber:5ddfde1:tarantool_decNumber/third_party/decNumber \
-		tarantool:luajit:789820a:tarantool_luajit/third_party/luajit \
-		tarantool:luarocks:954c2f5:tarantool_luarocks/third_party/luarocks \
-		tarantool:serpent:879580f:tarantool_serpent/third_party/serpent \
-		tarantool:small:279fa38:tarantool_small/src/lib/small \
-		tarantool:test-run:1263cb5:tarantool_test_run/test-run
-USE_GITHUB=	yes
-
 TT_DATADIR?=	/var/db/tarantool
 TT_LOGDIR?=	/var/log/tarantool
 TT_RUNDIR?=	/var/run/tarantool
 
-OPTIONS_DEFINE=	DEBUG
-
-DEBUG_CMAKE_BOOL=	ENABLE_BACKTRACE
-
 post-patch:
 	@${ECHO_CMD} ${PORTVERSION}-0 > ${WRKSRC}/VERSION
-	@${GREP} -lr 'msgpuck/msgpuck.h' ${WRKSRC}/ | ${XARGS} ${REINPLACE_CMD} -e 's|msgpuck/msgpuck.h|msgpuck.h|'
-	@${REINPLACE_CMD} -e 's|libmsgpuck.a|libmsgpuck.so|' ${WRKSRC}/cmake/FindMsgPuck.cmake
-	@${REINPLACE_CMD} -e 's|lib/msgpuck.h|msgpuck.h|' ${WRKSRC}/src/lib/core/decimal.c
 
 post-install:
 	@${RMDIR} ${STAGEDIR}${PREFIX}/lib/tarantool/
diff --git a/databases/tarantool/distinfo b/databases/tarantool/distinfo
index 89ac176697b8..0004384a9081 100644
--- a/databases/tarantool/distinfo
+++ b/databases/tarantool/distinfo
@@ -1,17 +1,3 @@
-TIMESTAMP = 1619198381
-SHA256 (tarantool-tarantool-2.8.1_GH0.tar.gz) = 4f0d6e8ea4ad61f9428b38f0615b096faa512a84b22cea2d7fd5a9cd7eeead19
-SIZE (tarantool-tarantool-2.8.1_GH0.tar.gz) = 7479060
-SHA256 (luafun-luafun-e248e00_GH0.tar.gz) = 9978dd21c0688d5c6206846697be17363a4be446851c1c1d60e2427fe200b7f2
-SIZE (luafun-luafun-e248e00_GH0.tar.gz) = 67323
-SHA256 (tarantool-decNumber-5ddfde1_GH0.tar.gz) = 3518875bff0e0a4d5751d72b52152163c894a1e9c0a6311ae637bece338ede65
-SIZE (tarantool-decNumber-5ddfde1_GH0.tar.gz) = 209681
-SHA256 (tarantool-luajit-789820a_GH0.tar.gz) = c38b917c10f1200b0b4a55ac16a96611ea218ff4213786bf73d3675ee207be9f
-SIZE (tarantool-luajit-789820a_GH0.tar.gz) = 1286309
-SHA256 (tarantool-luarocks-954c2f5_GH0.tar.gz) = d8008994db63c725c23c03366cf85cbd8394a75da9ae14602bcacbcedacaa37b
-SIZE (tarantool-luarocks-954c2f5_GH0.tar.gz) = 5353746
-SHA256 (tarantool-serpent-879580f_GH0.tar.gz) = 2367c5e3ab069f5686a4d23124759a2332b991f73695f3760dd7728e295893be
-SIZE (tarantool-serpent-879580f_GH0.tar.gz) = 13234
-SHA256 (tarantool-small-279fa38_GH0.tar.gz) = 036eb0f9c92ae87df93985722d13466de17e3b6b448a3a9dd1581b6876901099
-SIZE (tarantool-small-279fa38_GH0.tar.gz) = 123764
-SHA256 (tarantool-test-run-1263cb5_GH0.tar.gz) = e3c3c16a156852a4e2ddaf764d18ea523f23c8884ec448947ce99eddb242fcc7
-SIZE (tarantool-test-run-1263cb5_GH0.tar.gz) = 74848
+TIMESTAMP = 1703671142
+SHA256 (tarantool-3.0.0.tar.gz) = 41dee7d752839e47b55dafeca424937e15be2d72d5a002ccc3b7f23dc8dbee3f
+SIZE (tarantool-3.0.0.tar.gz) = 43019938
diff --git a/databases/tarantool/files/patch-cmake-BuildMisc.cmake b/databases/tarantool/files/patch-cmake-BuildMisc.cmake
deleted file mode 100644
index f803a79802fa..000000000000
--- a/databases/tarantool/files/patch-cmake-BuildMisc.cmake
+++ /dev/null
@@ -1,17 +0,0 @@
---- cmake/BuildMisc.cmake.orig	2020-07-17 11:22:52 UTC
-+++ cmake/BuildMisc.cmake
-@@ -35,11 +35,11 @@ macro(libmisc_build)
- 
-     if (HAVE_OPENMP)
-         if(BUILD_STATIC)
--            set(GOMP_LIBRARY libgomp.a)
-+            set(OMP_LIBRARY libomp.a)
-         else()
--            set(GOMP_LIBRARY gomp)
-+            set(OMP_LIBRARY omp)
-         endif()
--        target_link_libraries(misc ${GOMP_LIBRARY} pthread ${CMAKE_DL_LIBS})
-+        target_link_libraries(misc ${OMP_LIBRARY} pthread ${CMAKE_DL_LIBS})
-     endif()
- 
-     unset(misc_src)
diff --git a/databases/tarantool/files/patch-cmake-FindICONV.cmake b/databases/tarantool/files/patch-cmake-FindICONV.cmake
deleted file mode 100644
index b4e92d86f3e4..000000000000
--- a/databases/tarantool/files/patch-cmake-FindICONV.cmake
+++ /dev/null
@@ -1,11 +0,0 @@
---- cmake/FindICONV.cmake.orig	2018-10-12 19:53:35 UTC
-+++ cmake/FindICONV.cmake
-@@ -4,7 +4,7 @@
- # ICONV_LIBRARIES
- #
- 
--if (TARGET_OS_LINUX)
-+if (TARGET_OS_FREEBSD OR TARGET_OS_LINUX)
-     set(ICONV_LIBRARY "")
- else()
-     find_library(ICONV_LIBRARY iconv)
diff --git a/databases/tarantool/files/patch-include-order.cmake b/databases/tarantool/files/patch-include-order.cmake
new file mode 100644
index 000000000000..2980c7efb21b
--- /dev/null
+++ b/databases/tarantool/files/patch-include-order.cmake
@@ -0,0 +1,11 @@
+--- src/CMakeLists.txt.orig	2023-12-27 13:53:12.178934000 +0000
++++ src/CMakeLists.txt	2023-12-27 13:53:23.287048000 +0000
+@@ -10,7 +10,7 @@
+ include_directories(${READLINE_INCLUDE_DIRS})
+ include_directories(${LIBYAML_INCLUDE_DIRS})
+ include_directories(${MSGPUCK_INCLUDE_DIRS})
+-include_directories(BEFORE ${CURL_INCLUDE_DIRS})
++include_directories(${CURL_INCLUDE_DIRS})
+ include_directories(${ICU_INCLUDE_DIRS})
+ include_directories(${ICONV_INCLUDE_DIRS})
+ include_directories(${DECNUMBER_INCLUDE_DIR})
diff --git a/databases/tarantool/pkg-descr b/databases/tarantool/pkg-descr
index 0b58c78fdc14..83e64c66b137 100644
--- a/databases/tarantool/pkg-descr
+++ b/databases/tarantool/pkg-descr
@@ -14,5 +14,3 @@ Key features of the database:
 - asynchronous master-master replication
 - authentication and access control
 - the database is just a C extension to the app server and can be turned off
-
-WWW: https://tarantool.io/
diff --git a/databases/tarantool/pkg-plist b/databases/tarantool/pkg-plist
index f755795bf7ba..a2407ad3e082 100644
--- a/databases/tarantool/pkg-plist
+++ b/databases/tarantool/pkg-plist
@@ -10,14 +10,15 @@ include/tarantool/luaconf.h
 include/tarantool/luajit.h
 include/tarantool/lualib.h
 include/tarantool/module.h
-man/man1/tarantool.1.gz
-man/man1/tarantoolctl.1.gz
+share/man/man1/tarantool.1.gz
+share/man/man1/tarantoolctl.1.gz
 %%DATADIR%%/luarocks/admin/cache.lua
 %%DATADIR%%/luarocks/admin/cmd/add.lua
 %%DATADIR%%/luarocks/admin/cmd/make_manifest.lua
 %%DATADIR%%/luarocks/admin/cmd/refresh_cache.lua
 %%DATADIR%%/luarocks/admin/cmd/remove.lua
 %%DATADIR%%/luarocks/admin/index.lua
+%%DATADIR%%/luarocks/argparse.lua
 %%DATADIR%%/luarocks/build.lua
 %%DATADIR%%/luarocks/build/builtin.lua
 %%DATADIR%%/luarocks/build/cmake.lua
@@ -28,7 +29,6 @@ man/man1/tarantoolctl.1.gz
 %%DATADIR%%/luarocks/cmd/config.lua
 %%DATADIR%%/luarocks/cmd/doc.lua
 %%DATADIR%%/luarocks/cmd/download.lua
-%%DATADIR%%/luarocks/cmd/help.lua
 %%DATADIR%%/luarocks/cmd/init.lua
 %%DATADIR%%/luarocks/cmd/install.lua
 %%DATADIR%%/luarocks/cmd/lint.lua
@@ -55,6 +55,7 @@ man/man1/tarantoolctl.1.gz
 %%DATADIR%%/luarocks/core/sysdetect.lua
 %%DATADIR%%/luarocks/core/util.lua
 %%DATADIR%%/luarocks/core/vers.lua
+%%DATADIR%%/luarocks/deplocks.lua
 %%DATADIR%%/luarocks/deps.lua
 %%DATADIR%%/luarocks/dir.lua
 %%DATADIR%%/luarocks/download.lua
@@ -74,6 +75,7 @@ man/man1/tarantoolctl.1.gz
 %%DATADIR%%/luarocks/fs.lua
 %%DATADIR%%/luarocks/fs/lua.lua
 %%DATADIR%%/luarocks/fs/tools.lua
+%%DATADIR%%/luarocks/fs/macosx.lua
 %%DATADIR%%/luarocks/fs/unix.lua
 %%DATADIR%%/luarocks/fs/unix/tools.lua
 %%DATADIR%%/luarocks/fs/win32.lua
diff --git a/databases/tarantool2/Makefile b/databases/tarantool2/Makefile
new file mode 100644
index 000000000000..754b411cc1e2
--- /dev/null
+++ b/databases/tarantool2/Makefile
@@ -0,0 +1,65 @@
+PORTNAME=	tarantool
+PORTVERSION=	2.11.2
+CATEGORIES=	databases
+MASTER_SITES=	https://download.tarantool.org/tarantool/src/
+PKGNAMESUFFIX?=	2
+
+MAINTAINER=	balaev@tarantool.org
+COMMENT=	NoSQL database running in a Lua application server
+WWW=		https://tarantool.io/
+
+LICENSE=	BSD2CLAUSE
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
+BROKEN_aarch64=		fails to compile: mmintrin.h:50:12: invalid conversion between vector type '__m64' (vector of 1 'long long' value) and integer type 'int' of different siz
+BROKEN_riscv64=		fails to compile: mmintrin.h:50:12: invalid conversion between vector type '__m64' (vector of 1 'long long' value) and integer type 'int' of different siz
+NOT_FOR_ARCHS=		armv6 i386 powerpc64
+NOT_FOR_ARCHS_REASON=	fails to build: Unsupported architecture
+
+BUILD_DEPENDS=	gsed:textproc/gsed \
+		msgpuck>=2.0_6:devel/msgpuck
+LIB_DEPENDS=	libcurl.so:ftp/curl \
+		libicui18n.so:devel/icu \
+		libmsgpuck.so:devel/msgpuck \
+		libyaml.so:textproc/libyaml \
+		libzstd.so:archivers/zstd
+
+USES=		cmake:noninja compiler:c++11-lang cpe gettext-runtime gmake iconv perl5 readline ssl
+USE_PERL5=	build
+
+CONFLICTS_INSTALL=	tarantool
+
+BINARY_ALIAS=	sed=${LOCALBASE}/bin/gsed
+CMAKE_ARGS=	-DCMAKE_INSTALL_FULL_SYSCONFDIR=${ETCDIR} \
+		-DCMAKE_INSTALL_LOCALSTATEDIR=/var \
+		-DCMAKE_INSTALL_MANDIR=${PREFIX}/share/man
+CMAKE_OFF=	ENABLE_BUNDLED_LIBCURL \
+		ENABLE_BUNDLED_LIBYAML \
+		ENABLE_BUNDLED_MSGPUCK \
+		ENABLE_BUNDLED_ZSTD
+CMAKE_ON=	ENABLE_DIST
+MAKE_JOBS_UNSAFE=	yes
+USE_LDCONFIG=	yes
+USE_RC_SUBR=	tarantool
+
+USERS=		tarantool
+GROUPS=		tarantool
+
+PLIST_SUB=	TT_DATADIR=${TT_DATADIR} \
+		TT_LOGDIR=${TT_LOGDIR}
+SUB_FILES=	pkg-message
+
+TT_DATADIR?=	/var/db/tarantool
+TT_LOGDIR?=	/var/log/tarantool
+TT_RUNDIR?=	/var/run/tarantool
+
+post-patch:
+	@${ECHO_CMD} ${PORTVERSION}-0 > ${WRKSRC}/VERSION
+	@${GREP} -lr 'msgpuck/msgpuck.h' ${WRKSRC}/ | ${XARGS} ${REINPLACE_CMD} -e 's|msgpuck/msgpuck.h|msgpuck.h|'
+	@${REINPLACE_CMD} -e 's|libmsgpuck.a|libmsgpuck.so|' ${WRKSRC}/cmake/FindMsgPuck.cmake
+	@${REINPLACE_CMD} -e 's|lib/msgpuck.h|msgpuck.h|' ${WRKSRC}/src/lib/core/decimal.c
+
+post-install:
+	@${RMDIR} ${STAGEDIR}${PREFIX}/lib/tarantool/
+
+.include <bsd.port.mk>
diff --git a/databases/tarantool2/distinfo b/databases/tarantool2/distinfo
new file mode 100644
index 000000000000..8a52b64a2520
--- /dev/null
+++ b/databases/tarantool2/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1702046696
+SHA256 (tarantool-2.11.2.tar.gz) = 2f30215ad41f5148471c38c9148f3f8a6e931ed914af153c58a136e08c829d28
+SIZE (tarantool-2.11.2.tar.gz) = 42536437
diff --git a/databases/tarantool2/files/patch-third_party-luajit-cmake-SetVersion.cmake b/databases/tarantool2/files/patch-third_party-luajit-cmake-SetVersion.cmake
new file mode 100644
index 000000000000..0b0c0b39bbd3
--- /dev/null
+++ b/databases/tarantool2/files/patch-third_party-luajit-cmake-SetVersion.cmake
@@ -0,0 +1,11 @@
+--- third_party/luajit/cmake/SetVersion.cmake.orig	2021-04-19 14:24:28 UTC
++++ third_party/luajit/cmake/SetVersion.cmake
+@@ -4,7 +4,7 @@
+ # Copyright (C) 2015-2020 IPONWEB Ltd.
+ 
+ function(SetVersion version majver minver patchver tweakver prerel)
+-  find_package(Git QUIET REQUIRED)
++  find_package(Git QUIET)
+   if(EXISTS ${CMAKE_SOURCE_DIR}/.git AND Git_FOUND)
+     # Read version from the project's VCS and store the result
+     # into version.
diff --git a/databases/tarantool2/files/pkg-message.in b/databases/tarantool2/files/pkg-message.in
new file mode 100644
index 000000000000..7f0d47f82080
--- /dev/null
+++ b/databases/tarantool2/files/pkg-message.in
@@ -0,0 +1,14 @@
+[
+{ type: install
+  message: <<EOM
+  After install, you'll need:
+
+  Configuration at /etc/rc.conf:
+
+  * Enable tarantool on startup:
+      tarantool_enable="yes"
+  * Path to storage link files of instances:
+      tarantool_instances="%%ETCDIR%%/instances.enabled"
+EOM
+}
+]
diff --git a/databases/tarantool2/files/tarantool.in b/databases/tarantool2/files/tarantool.in
new file mode 100644
index 000000000000..19a793b2c96a
--- /dev/null
+++ b/databases/tarantool2/files/tarantool.in
@@ -0,0 +1,53 @@
+#!/bin/sh
+
+# PROVIDE: tarantool
+# REQUIRE: LOGIN
+# KEYWORD: shutdown
+#
+# tarantool_enable="YES"
+# tarantool_instances=""
+#
+
+. /etc/rc.subr
+
+name="tarantool"
+rcvar=tarantool_enable
+
+load_rc_config "$name"
+
+tarantool_enable=${tarantool_enable:-"NO"}
+tarantool_instances=${tarantool_instances:-"%%ETCDIR%%/instances.enabled"}
+
+start_cmd="${name}_start"
+stop_cmd="${name}_stop"
+restart_cmd="${name}_restart"
+
+INSTANCES=$(find ${tarantool_instances} -type l -name '*.lua' 2>/dev/null)
+TDAEMON=%%PREFIX%%/bin/tarantool
+TCTL=%%PREFIX%%/bin/tarantoolctl
+
+tarantool_start()
+{
+	echo "tarantool: Starting instances"
+	for inst in ${INSTANCES}
+	do
+		${TDAEMON} ${TCTL} start $(basename ${inst} .lua)
+	done
+}
+
+tarantool_stop()
+{
+	echo "tarantool: Stopping instances"
+	for inst in ${INSTANCES}
+	do
+		${TDAEMON} ${TCTL} stop $(basename ${inst} .lua)
+	done
+}
+
+tarantool_restart()
+{
+	tarantool_stop
+	tarantool_start
+}
+
+run_rc_command "$1"
diff --git a/databases/tarantool2/pkg-descr b/databases/tarantool2/pkg-descr
new file mode 100644
index 000000000000..83e64c66b137
--- /dev/null
+++ b/databases/tarantool2/pkg-descr
@@ -0,0 +1,16 @@
+Tarantool is an in-memory database and application server.
+
+Key features of the application server:
+- 100% compatible drop-in replacement for Lua 5.1, based on LuaJIT 2.1. Simply
+  use #!/usr/bin/tarantool instead of #!/usr/bin/lua in your script.
+- full support for Lua modules and a rich set of own modules, including
+  cooperative multitasking, non-blocking I/O, access to external databases, etc
+
+Key features of the database:
+- MsgPack data format and MsgPack based client-server protocol
+- two data engines: 100% in-memory with optional persistence and a 2-level
+  disk-based B-tree, to use with large data sets
+- multiple index types: HASH, TREE, RTREE, BITSET
+- asynchronous master-master replication
+- authentication and access control
+- the database is just a C extension to the app server and can be turned off
diff --git a/databases/tarantool2/pkg-plist b/databases/tarantool2/pkg-plist
new file mode 100644
index 000000000000..7e3b8bde6f25
--- /dev/null
+++ b/databases/tarantool2/pkg-plist
@@ -0,0 +1,111 @@
+bin/tarantool
+bin/tarantoolctl
+etc/tarantool/default/tarantool
+etc/tarantool/instances.available/example.lua
+include/tarantool/lauxlib.h
+include/tarantool/lmisclib.h
+include/tarantool/lua.h
+include/tarantool/lua.hpp
+include/tarantool/luaconf.h
+include/tarantool/luajit.h
+include/tarantool/lualib.h
+include/tarantool/module.h
+share/man/man1/tarantool.1.gz
+share/man/man1/tarantoolctl.1.gz
+%%DATADIR%%/luarocks/admin/cache.lua
+%%DATADIR%%/luarocks/admin/cmd/add.lua
+%%DATADIR%%/luarocks/admin/cmd/make_manifest.lua
+%%DATADIR%%/luarocks/admin/cmd/refresh_cache.lua
+%%DATADIR%%/luarocks/admin/cmd/remove.lua
+%%DATADIR%%/luarocks/admin/index.lua
+%%DATADIR%%/luarocks/argparse.lua
+%%DATADIR%%/luarocks/build.lua
+%%DATADIR%%/luarocks/build/builtin.lua
+%%DATADIR%%/luarocks/build/cmake.lua
+%%DATADIR%%/luarocks/build/command.lua
+%%DATADIR%%/luarocks/build/make.lua
+%%DATADIR%%/luarocks/cmd.lua
+%%DATADIR%%/luarocks/cmd/build.lua
+%%DATADIR%%/luarocks/cmd/config.lua
+%%DATADIR%%/luarocks/cmd/doc.lua
+%%DATADIR%%/luarocks/cmd/download.lua
+%%DATADIR%%/luarocks/cmd/init.lua
+%%DATADIR%%/luarocks/cmd/install.lua
+%%DATADIR%%/luarocks/cmd/lint.lua
+%%DATADIR%%/luarocks/cmd/list.lua
+%%DATADIR%%/luarocks/cmd/make.lua
+%%DATADIR%%/luarocks/cmd/new_version.lua
+%%DATADIR%%/luarocks/cmd/pack.lua
+%%DATADIR%%/luarocks/cmd/path.lua
+%%DATADIR%%/luarocks/cmd/purge.lua
+%%DATADIR%%/luarocks/cmd/remove.lua
+%%DATADIR%%/luarocks/cmd/search.lua
+%%DATADIR%%/luarocks/cmd/show.lua
+%%DATADIR%%/luarocks/cmd/test.lua
+%%DATADIR%%/luarocks/cmd/unpack.lua
+%%DATADIR%%/luarocks/cmd/upload.lua
+%%DATADIR%%/luarocks/cmd/which.lua
+%%DATADIR%%/luarocks/cmd/write_rockspec.lua
+%%DATADIR%%/luarocks/core/cfg.lua
+%%DATADIR%%/luarocks/core/dir.lua
+%%DATADIR%%/luarocks/core/hardcoded.lua
+%%DATADIR%%/luarocks/core/manif.lua
+%%DATADIR%%/luarocks/core/path.lua
+%%DATADIR%%/luarocks/core/persist.lua
+%%DATADIR%%/luarocks/core/sysdetect.lua
+%%DATADIR%%/luarocks/core/util.lua
+%%DATADIR%%/luarocks/core/vers.lua
+%%DATADIR%%/luarocks/deplocks.lua
+%%DATADIR%%/luarocks/deps.lua
+%%DATADIR%%/luarocks/dir.lua
+%%DATADIR%%/luarocks/download.lua
+%%DATADIR%%/luarocks/fetch.lua
+%%DATADIR%%/luarocks/fetch/cvs.lua
+%%DATADIR%%/luarocks/fetch/git.lua
+%%DATADIR%%/luarocks/fetch/git_file.lua
+%%DATADIR%%/luarocks/fetch/git_http.lua
+%%DATADIR%%/luarocks/fetch/git_https.lua
+%%DATADIR%%/luarocks/fetch/git_ssh.lua
+%%DATADIR%%/luarocks/fetch/hg.lua
+%%DATADIR%%/luarocks/fetch/hg_http.lua
+%%DATADIR%%/luarocks/fetch/hg_https.lua
+%%DATADIR%%/luarocks/fetch/hg_ssh.lua
+%%DATADIR%%/luarocks/fetch/sscm.lua
+%%DATADIR%%/luarocks/fetch/svn.lua
+%%DATADIR%%/luarocks/fs.lua
+%%DATADIR%%/luarocks/fs/lua.lua
+%%DATADIR%%/luarocks/fs/macosx.lua
+%%DATADIR%%/luarocks/fs/tools.lua
+%%DATADIR%%/luarocks/fs/unix.lua
+%%DATADIR%%/luarocks/fs/unix/tools.lua
+%%DATADIR%%/luarocks/fs/win32.lua
+%%DATADIR%%/luarocks/fs/win32/tools.lua
+%%DATADIR%%/luarocks/fun.lua
+%%DATADIR%%/luarocks/loader.lua
+%%DATADIR%%/luarocks/manif.lua
+%%DATADIR%%/luarocks/manif/writer.lua
+%%DATADIR%%/luarocks/pack.lua
+%%DATADIR%%/luarocks/path.lua
+%%DATADIR%%/luarocks/persist.lua
+%%DATADIR%%/luarocks/queries.lua
+%%DATADIR%%/luarocks/remove.lua
+%%DATADIR%%/luarocks/repos.lua
+%%DATADIR%%/luarocks/require.lua
+%%DATADIR%%/luarocks/results.lua
+%%DATADIR%%/luarocks/rockspecs.lua
+%%DATADIR%%/luarocks/search.lua
+%%DATADIR%%/luarocks/signing.lua
+%%DATADIR%%/luarocks/test.lua
+%%DATADIR%%/luarocks/test/busted.lua
+%%DATADIR%%/luarocks/test/command.lua
+%%DATADIR%%/luarocks/tools/patch.lua
+%%DATADIR%%/luarocks/tools/tar.lua
+%%DATADIR%%/luarocks/tools/zip.lua
+%%DATADIR%%/luarocks/type/manifest.lua
+%%DATADIR%%/luarocks/type/rockspec.lua
+%%DATADIR%%/luarocks/type_check.lua
+%%DATADIR%%/luarocks/upload/api.lua
+%%DATADIR%%/luarocks/upload/multipart.lua
+%%DATADIR%%/luarocks/util.lua
+@dir(tarantool,tarantool,) %%TT_DATADIR%%
+@dir(tarantool,tarantool,) %%TT_LOGDIR%%
diff --git a/databases/tcl-Mysql/Makefile b/databases/tcl-Mysql/Makefile
index 991d84359f12..a1ebf2226389 100644
--- a/databases/tcl-Mysql/Makefile
+++ b/databases/tcl-Mysql/Makefile
@@ -1,5 +1,3 @@
-# Created by: Mikhail Teterin <mi@aldan.algebra.com>
-
 PORTNAME=	${TCL_NODOT}-sql
 PORTVERSION=	20000114
 PORTREVISION=	7
@@ -9,6 +7,7 @@ DISTNAME=	tcl-sql-${PORTVERSION}
 
 MAINTAINER=	mi@aldan.algebra.com
 COMMENT=	TCL module for accessing MySQL databases
+WWW=		https://sourceforge.net/projects/tcl-sql/
 
 PATCH_DEPENDS=	rcsdiff:devel/rcs
 
diff --git a/databases/tcl-Mysql/pkg-descr b/databases/tcl-Mysql/pkg-descr
index 603d7c7a4b16..40552457e5bd 100644
--- a/databases/tcl-Mysql/pkg-descr
+++ b/databases/tcl-Mysql/pkg-descr
@@ -3,5 +3,3 @@ to  build generic  database interface  for  TCL, but  currently he  only
 supports MySQL.
 
 The author's web-site is:
-
-WWW: https://sourceforge.net/projects/tcl-sql/
diff --git a/databases/tcl-lmdb/Makefile b/databases/tcl-lmdb/Makefile
index 6aadc0967300..1ae713d36061 100644
--- a/databases/tcl-lmdb/Makefile
+++ b/databases/tcl-lmdb/Makefile
@@ -1,31 +1,30 @@
-# Created by: gahr
-
 PORTNAME=	tcl-lmdb
-PORTVERSION=	0.4.1
+DISTVERSION=	0.4.3
+PORTREVISION=	1
 CATEGORIES=	databases
 
 MAINTAINER=	gahr@FreeBSD.org
 COMMENT=	Tcl interface to the Lightning Memory-Mapped Database
+WWW=		https://github.com/ray2501/tcl-lmdb
 
 LICENSE=	BSD2CLAUSE
 
 LIB_DEPENDS=	liblmdb.so:databases/lmdb
 
-USES=		gmake tcl:tea
+USES=		gmake localbase:ldflags tcl:tea
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	ray2501
 
+GNU_CONFIGURE=	yes
+GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
 CONFIGURE_ARGS=	--with-system-lmdb
-CFLAGS+=	-I${LOCALBASE}/include
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
 
 TEST_TARGET=	test
 
 PLIST_FILES=	lib/${TCL_PKG}/lib${TCL_PKG}.so \
 		lib/${TCL_PKG}/pkgIndex.tcl \
-		man/mann/lmdb.n.gz
+		share/man/mann/lmdb.n.gz
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/${TCL_PKG}/lib${TCL_PKG}.so
diff --git a/databases/tcl-lmdb/distinfo b/databases/tcl-lmdb/distinfo
index aef08a3d82da..6e4bc45c6947 100644
--- a/databases/tcl-lmdb/distinfo
+++ b/databases/tcl-lmdb/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1583237941
-SHA256 (ray2501-tcl-lmdb-0.4.1_GH0.tar.gz) = 2a94bfe476659b348c05c96a17efa0940fa1151393bb579dd2a38d6dadae94f5
-SIZE (ray2501-tcl-lmdb-0.4.1_GH0.tar.gz) = 284967
+TIMESTAMP = 1704721930
+SHA256 (ray2501-tcl-lmdb-0.4.3_GH0.tar.gz) = 619d1ac6595f5d1aaa080cc5db48ccf1e40aa1d2631a560a7bb89e4cf930f720
+SIZE (ray2501-tcl-lmdb-0.4.3_GH0.tar.gz) = 284269
diff --git a/databases/tcl-lmdb/pkg-descr b/databases/tcl-lmdb/pkg-descr
index 85f2235e2d8b..dc918bf1a088 100644
--- a/databases/tcl-lmdb/pkg-descr
+++ b/databases/tcl-lmdb/pkg-descr
@@ -1,4 +1,2 @@
 This is the Lightning Memory-Mapped Database (LMDB) extension for Tcl using the
 Tcl Extension Architecture (TEA).
-
-WWW: https://sites.google.com/site/ray2501/tcl-lmdb
diff --git a/databases/tcl-sqlite3/Makefile b/databases/tcl-sqlite3/Makefile
index 0d1cc8ef0227..c51dc5825b38 100644
--- a/databases/tcl-sqlite3/Makefile
+++ b/databases/tcl-sqlite3/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	sqlite3
 PORTVERSION=	3.34.1
+PORTREVISION=	1
 CATEGORIES=	databases tcl
 MASTER_SITES=	https://www.sqlite.org/2021/ \
 		https://www2.sqlite.org/2021/ \
@@ -9,6 +10,7 @@ DISTNAME=	sqlite-autoconf-${PORTVERSION:C/\.([[:digit:]])[[:>:]]/0\1/g:S/.//g}00
 
 MAINTAINER=	pavelivolkov@gmail.com
 COMMENT=	SQLite extension for Tcl using the Tcl Extension Architecture (TEA)
+WWW=		https://www.sqlite.org/
 
 LICENSE=	PD
 
@@ -17,6 +19,7 @@ LIB_DEPENDS=	libsqlite3.so:databases/sqlite3
 USES=		pkgconfig tcl:tea
 USE_LDCONFIG=	yes
 
+GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
 CONFIGURE_ARGS=	--with-system-sqlite
 
 CFLAGS+=	`pkg-config --cflags sqlite3`
@@ -29,7 +32,7 @@ WRKSRC=		${WRKDIR}/${DISTNAME}/tea
 
 PLIST_FILES=	lib/${PORTNAME}/libsqlite${PORTVERSION}.so \
 		lib/${PORTNAME}/pkgIndex.tcl \
-		man/mann/sqlite3.n.gz
+		share/man/mann/sqlite3.n.gz
 PORTEXAMPLES=	*
 
 OPTIONS_DEFINE=		EXAMPLES THREADS
diff --git a/databases/tcl-sqlite3/pkg-descr b/databases/tcl-sqlite3/pkg-descr
index 879810d67c5a..9de972fee282 100644
--- a/databases/tcl-sqlite3/pkg-descr
+++ b/databases/tcl-sqlite3/pkg-descr
@@ -1,4 +1,2 @@
 This is the SQLite extension for Tcl using the Tcl Extension
 Architecture (TEA).
-
-WWW: https://www.sqlite.org/
diff --git a/databases/tdb/Makefile b/databases/tdb/Makefile
index 7d41c9fa1619..315dce1f4dea 100644
--- a/databases/tdb/Makefile
+++ b/databases/tdb/Makefile
@@ -1,116 +1,74 @@
-PORTNAME=		tdb
-PORTVERSION=		1.4.3
-PORTREVISION=		0
-PORTEPOCH=		1
-CATEGORIES=		databases
-MASTER_SITES=		SAMBA
-
-MAINTAINER=		timur@FreeBSD.org
-COMMENT=		Trivial Database
-
-LICENSE=		GPLv3
-
-IGNORE_NONTHREAD_PYTHON=needs port lang/python${PYTHON_SUFFIX} to be build with THREADS support
-
-CONFLICTS_INSTALL=	tdb1-*
-
-#FLAVORS=		default nopython debug
-#nopython_PKGNAMESUFFIX=	-nopython
-#debug_PKGNAMESUFFIX=	-debug
-#nopython_CONFLICTS=	tdb tdb-debug
-#debug_CONFLICTS=	tdb tdb-nopython
-#default_CONFLICTS=	tdb-nopython tdb-debug
-
-USES=			compiler gettext-runtime pkgconfig waf 
-USE_LDCONFIG=		yes
-WAF_CMD=		buildtools/bin/waf
-CONFIGURE_LOG=		bin/config.log
-
-PKGCONFIGDIR?=		${PREFIX}/libdata/pkgconfig
-PLIST_SUB+=		PKGCONFIGDIR=${PKGCONFIGDIR:S;${PREFIX}/;;}
-
-CONFIGURE_ARGS+=	--mandir=${MANPREFIX}/man \
-			--disable-rpath \
-			--without-gettext
-
-OPTIONS_DEFINE=		MANPAGES DEBUG
-MANPAGES_DESC=		Build and install manpages (requires textproc/docbook-xsl)
-
-DEBUG_CONFIGURE_ON=	--verbose --enable-debug
-DEBUG_MAKE_ARGS=	--verbose
-DEBUG_FLAGS=		-g -ggdb3 -O0 -DTDB_TRACE=1
-
-.include <bsd.port.options.mk>
-
-TDB_BINS=		bin/tdbbackup \
-			bin/tdbdump \
-			bin/tdbrestore \
-			bin/tdbtool
-
-PLIST_FILES+=		include/tdb.h \
-			${TDB_BINS} \
-			lib/libtdb.so \
-			lib/libtdb.so.1 \
-			${PKGCONFIGDIR}/tdb.pc
-
-
-.if defined(NO_PYTHON)
-USES+=			python:build,test
-CONFIGURE_ARGS+=	--disable-python
-.else
-USES+=			python:3.4+
-
-PLIST_FILES+=		${PYTHON_SITELIBDIR}/tdb${PYTHON_EXT_SUFFIX}.so \
-			${PYTHON_SITELIBDIR}/_tdb_text.py
-.endif
-
-.include <bsd.port.pre.mk>
-
-.if ! ${PORT_OPTIONS:MMANPAGES}
-CONFIGURE_ENV+=		XSLTPROC="true"
-.else
-BUILD_DEPENDS+=		${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:textproc/docbook-xsl \
-			xsltproc:textproc/libxslt
-.endif
+PORTNAME=			tdb
+DISTVERSION=			1.4.7
+PORTREVISION=			1
+PORTEPOCH=			1
+CATEGORIES=			databases
+MASTER_SITES=			SAMBA
+
+MAINTAINER=			timur@FreeBSD.org
+COMMENT=			Trivial Database
+WWW=		https://tdb.samba.org/
+
+LICENSE=			GPLv3
+
+USES=				compiler pkgconfig shebangfix waf
+USE_LDCONFIG=			yes
+SHEBANG_GLOB=			*.py
+WAF_CMD=			buildtools/bin/waf
+CONFIGURE_LOG=			bin/config.log
+
+PKGCONFIGDIR?=			${PREFIX}/libdata/pkgconfig
+PLIST_SUB+=			PKGCONFIGDIR=${PKGCONFIGDIR:S;^${PREFIX}/;;}
+
+CONFIGURE_ARGS+=		--disable-rpath \
+				--disable-rpath-install \
+				--bundled-libraries=NONE \
+				--builtin-libraries=replace \
+				--without-gettext
+CONFIGURE_ENV=			PYTHONHASHSEED=1
+MAKE_ENV=			PYTHONHASHSEED=1
+
+MANPAGES_DESC=			Build and install manpages (requires textproc/docbook-xsl)
+
+OPTIONS_DEFINE=			MANPAGES DEBUG PYTHON
+OPTIONS_DEFAULT=		PYTHON
+OPTIONS_SUB=			yes
+
+DEBUG_CFLAGS=			-g -ggdb3 -O0
+DEBUG_CONFIGURE_ON=		--verbose --enable-debug
+DEBUG_MAKE_ARGS=		--verbose
+
+PYTHON_USES=			gettext-runtime python
+PYTHON_USE+=			python=py3kplist
+PYTHON_USES_OFF=		python:build,test
+PYTHON_CONFIGURE_OFF=		--disable-python
+
+MANPAGES_CONFIGURE_ENV_OFF+=	XSLTPROC="true"
+MANPAGES_BUILD_DEPENDS+=	${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:textproc/docbook-xsl \
+				xsltproc:textproc/libxslt
 # No fancy color error messages
-.if ${COMPILER_TYPE} == "clang"
-CFLAGS+=		-fno-color-diagnostics
-.endif
-CONFIGURE_ENV+=		NOCOLOR=yes
-MAKE_ENV+=		NOCOLOR=yes
-
-TDB_MAN8=		man/man8/tdbbackup.8.gz \
-			man/man8/tdbdump.8.gz \
-			man/man8/tdbrestore.8.gz \
-			man/man8/tdbtool.8.gz
-
-PLIST_FILES+=		${TDB_MAN8}
+CFLAGS+=			${CFLAGS_${CHOSEN_COMPILER_TYPE}}
+CFLAGS_clang=			-fno-color-diagnostics
+CONFIGURE_ENV+=			NOCOLOR=yes
+MAKE_ENV+=			NOCOLOR=yes
+# Some symbols in tdb's linker version scripts are not defined, but since the
+# scripts are generated dynamically, suppress errors with lld >= 17 due to these
+# undefined symbols.
+LDFLAGS+=			-Wl,--undefined-version
 
 post-patch:
-			@${REINPLACE_CMD} -e 's|%%PKGCONFIGDIR%%|${PKGCONFIGDIR}|g' \
-				${BUILD_WRKSRC}/wscript
-
-# Use threading (or multiprocessing) but not thread (renamed in python 3+).
-pre-configure:
-			@if ! ${PYTHON_CMD} -c "import multiprocessing;" 2>/dev/null; then \
-				${ECHO_CMD}; \
-				${ECHO_MSG} "===>  ${PKGNAME} "${IGNORE_NONTHREAD_PYTHON:Q}.; \
-				${ECHO_CMD}; \
-				${FALSE}; \
-			fi
+				@${REINPLACE_CMD} -e 's|%%PKGCONFIGDIR%%|${PKGCONFIGDIR}|g' \
+					${BUILD_WRKSRC}/wscript
 
 pre-build-MANPAGES-off:
-			-${MKDIR} ${BUILD_WRKSRC}/bin/default/man
-.for man in ${TDB_MAN8}
-			${INSTALL_MAN} ${FILESDIR}/`basename ${man} .gz` ${BUILD_WRKSRC}/bin/default/man
-.endfor
+				${MKDIR} ${BUILD_WRKSRC}/bin/default/man
+				${INSTALL_MAN} ${FILESDIR}/tdb*.8 ${BUILD_WRKSRC}/bin/default/man
 
 post-install:
-.for lib in ${TDB_BINS} lib/libtdb.so
-			${STRIP_CMD} ${STAGEDIR}${PREFIX}/${lib}
-.endfor
-.if !defined(NO_PYTHON)
-			${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/tdb*.so
-.endif
+				${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/tdb*
+				${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libtdb.so.1
+
+post-install-PYTHON-on:
+				${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/tdb*.so
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/databases/tdb/distinfo b/databases/tdb/distinfo
index bbcd60410368..1e2aae9589e7 100644
--- a/databases/tdb/distinfo
+++ b/databases/tdb/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1577717387
-SHA256 (tdb-1.4.3.tar.gz) = c8058393dfa15f47e11ebd2f1d132693f0b3b3b8bf22d0201bfb305026f88a1b
-SIZE (tdb-1.4.3.tar.gz) = 702836
+TIMESTAMP = 1659106948
+SHA256 (tdb-1.4.7.tar.gz) = a4fb168def533f31ff2c07f7d9844bb3131e6799f094ebe77d0380adc987c20e
+SIZE (tdb-1.4.7.tar.gz) = 741714
diff --git a/databases/tdb/pkg-descr b/databases/tdb/pkg-descr
index 624574f89d00..fa18095b5ca0 100644
--- a/databases/tdb/pkg-descr
+++ b/databases/tdb/pkg-descr
@@ -2,5 +2,3 @@ TDB is a Trivial Database. In concept, it is very much like GDBM, and
 BSD's DB except that it allows multiple simultaneous writers and uses
 locking internally to keep writers from trampling on each other. TDB is
 also extremely small.
-
-WWW: http://tdb.samba.org/
diff --git a/databases/tdb/pkg-plist b/databases/tdb/pkg-plist
new file mode 100644
index 000000000000..347df81efda7
--- /dev/null
+++ b/databases/tdb/pkg-plist
@@ -0,0 +1,14 @@
+bin/tdbbackup
+bin/tdbdump
+bin/tdbrestore
+bin/tdbtool
+include/tdb.h
+lib/libtdb.so
+lib/libtdb.so.1
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/_tdb_text.py
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/tdb%%PYTHON_EXT_SUFFIX%%.so
+libdata/pkgconfig/tdb.pc
+share/man/man8/tdbbackup.8.gz
+share/man/man8/tdbdump.8.gz
+share/man/man8/tdbrestore.8.gz
+share/man/man8/tdbtool.8.gz
diff --git a/databases/tdbc/Makefile b/databases/tdbc/Makefile
index 31f34ab38903..b099976d8cd6 100644
--- a/databases/tdbc/Makefile
+++ b/databases/tdbc/Makefile
@@ -1,29 +1,29 @@
-# Created by: Pietro Cerutti <gahr@FreeBSD.org>
-
 PORTNAME=	tdbc
-DISTVERSION=	1.1.2
+DISTVERSION=	1.1.7
 PORTREVISION=	0
 CATEGORIES=	databases
-MASTER_SITES=	SF/tcl/Tcl/8.6.11
+MASTER_SITES=	SF/tcl/Tcl/8.6.14
 DISTFILES=	${PORTNAME}${PORTVERSION}${EXTRACT_SUFX}
 
 MAINTAINER=	tcltk@FreeBSD.org
 COMMENT=	Common database access interface for Tcl
+WWW=		http://tdbc.tcl.tk
 
 LICENSE=	TclTk
 LICENSE_NAME=	Tcl/Tk License
 LICENSE_FILE=	${WRKDIR}/${PORTNAME}${PORTVERSION}/license.terms
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
+USES=		tcl:86+,tea
+
 OPTIONS_DEFINE=	MYSQL PGSQL SQLITE ODBC
 OPTIONS_DEFAULT=MYSQL PGSQL SQLITE ODBC
 OPTIONS_SUB=	yes
 
-USES=		tcl:86,tea
 USE_LDCONFIG=	yes
 MAKE_ENV+=	DESTDIR=${STAGEDIR}
 CONFIGURE_ARGS+=--enable-threads \
-		--mandir=${PREFIX}/man \
+		--mandir=${PREFIX}/share/man \
 		--includedir=${PREFIX}/include/tdbc
 PLIST_SUB+=	VERSION=${DISTVERSION} \
 		TCL_MAJ=${TCL_VER:R} \
@@ -79,9 +79,6 @@ do-configure:
 
 .endfor
 
-post-configure:
-	${FIND} ${WRKDIR} -type f | ${XARGS} ${REINPLACE_CMD} -e 's|tdbcstub100|tdbcstub|g'
-
 do-build:
 .for module in ${MODULES}
 	@echo "================================="
diff --git a/databases/tdbc/distinfo b/databases/tdbc/distinfo
index 27403de1b203..b0ff4eeba567 100644
--- a/databases/tdbc/distinfo
+++ b/databases/tdbc/distinfo
@@ -1,11 +1,11 @@
-TIMESTAMP = 1624881373
-SHA256 (tdbc1.1.2.tar.gz) = 9c1f4aff19f65c05b32549aea910b6aef21e2ef4d630f20bc4848230a6cc1983
-SIZE (tdbc1.1.2.tar.gz) = 184547
-SHA256 (tdbcmysql1.1.2.tar.gz) = 13d5a0d9fd438520f5b360ba738bd16feffac94514e19348393446cf0c23dad3
-SIZE (tdbcmysql1.1.2.tar.gz) = 179456
-SHA256 (tdbcodbc1.1.2.tar.gz) = ffe9f10c525047f6742b547a861c7a8950d25da9262098cee07030b459836862
-SIZE (tdbcodbc1.1.2.tar.gz) = 196596
-SHA256 (tdbcpostgres1.1.2.tar.gz) = 9731ae756f1c8bb12e03870885120d2f949a545ecb996526053c484a05dc2a1a
-SIZE (tdbcpostgres1.1.2.tar.gz) = 174458
-SHA256 (tdbcsqlite3-1.1.2.tar.gz) = 664cdc5f831724fa42247009f1377aa97d956b0e8cfc8b4973818813aafdd925
-SIZE (tdbcsqlite3-1.1.2.tar.gz) = 141698
+TIMESTAMP = 1709627380
+SHA256 (tdbc1.1.7.tar.gz) = d9cebffeeb5240abe26925e509943bb56a3a25091c5f211548308b63f4e41fb1
+SIZE (tdbc1.1.7.tar.gz) = 189092
+SHA256 (tdbcmysql1.1.7.tar.gz) = 47f48890078ac0e7b6d12a12bfbfb80f6d5799cd40b2082addec4b761c369b58
+SIZE (tdbcmysql1.1.7.tar.gz) = 184838
+SHA256 (tdbcodbc1.1.7.tar.gz) = d4207a111f8f26dc5e6e00c547e217ab7f02f56c39835c9f3d3208a6a9249697
+SIZE (tdbcodbc1.1.7.tar.gz) = 203944
+SHA256 (tdbcpostgres1.1.7.tar.gz) = 7e9c668c555656bfdbb7a1328f6c6b9302ec5a942ec57f907f18eb1ff221c6e5
+SIZE (tdbcpostgres1.1.7.tar.gz) = 179823
+SHA256 (tdbcsqlite3-1.1.7.tar.gz) = 0ec87bb74b29e2bc5a127d92d33de1d2ba0b4864efa86bc3d8b179af2c7799ec
+SIZE (tdbcsqlite3-1.1.7.tar.gz) = 142923
diff --git a/databases/tdbc/pkg-descr b/databases/tdbc/pkg-descr
index a9b8fd5b8b50..c808dc2b133c 100644
--- a/databases/tdbc/pkg-descr
+++ b/databases/tdbc/pkg-descr
@@ -1,8 +1,5 @@
 TDBC is the Tcl Database Connectivity, an abstraction layer for database
 drivers in the Tcl programming language. The interface is described in
-TIP 308 (http://www.tcl.tk/cgi-bin/tct/tip/308) with updates in TIP 350
-(http://www.tcl.tk/cgi-bin/tct/tip/350).
+TIP 308 with updates in TIP 350.
 
 Currently, drivers for MySQL, ODBC, PostgreSQL, and SQLite3 are included.
-
-WWW: http://tdbc.tcl.tk
diff --git a/databases/tdbc/pkg-plist b/databases/tdbc/pkg-plist
index 748a7266976f..96fd830237f3 100644
--- a/databases/tdbc/pkg-plist
+++ b/databases/tdbc/pkg-plist
@@ -6,34 +6,34 @@ lib/tdbc%%VERSION%%/libtdbcstub%%VERSION%%.a
 lib/tdbc%%VERSION%%/pkgIndex.tcl
 lib/tdbc%%VERSION%%/tdbc.tcl
 lib/tdbc%%VERSION%%/tdbcConfig.sh
-man/man3/Tdbc_Init.3.gz
-man/mann/tdbc.n.gz
-man/mann/tdbc_connection.n.gz
-man/mann/tdbc_mapSqlState.n.gz
-man/mann/tdbc_resultset.n.gz
-man/mann/tdbc_statement.n.gz
-man/mann/tdbc_tokenize.n.gz
+share/man/man3/Tdbc_Init.3.gz
+share/man/mann/tdbc.n.gz
+share/man/mann/tdbc_connection.n.gz
+share/man/mann/tdbc_mapSqlState.n.gz
+share/man/mann/tdbc_resultset.n.gz
+share/man/mann/tdbc_statement.n.gz
+share/man/mann/tdbc_tokenize.n.gz
 @comment MySQL
 %%MYSQL%%include/tdbc/fakemysql.h
 %%MYSQL%%include/tdbc/mysqlStubs.h
 %%MYSQL%%lib/tdbcmysql%%VERSION%%/libtdbcmysql%%VERSION%%.so
 %%MYSQL%%lib/tdbcmysql%%VERSION%%/tdbcmysql.tcl
 %%MYSQL%%lib/tdbcmysql%%VERSION%%/pkgIndex.tcl
-%%MYSQL%%man/mann/tdbc_mysql.n.gz
+%%MYSQL%%share/man/mann/tdbc_mysql.n.gz
 @comment ODBC
 %%ODBC%%include/tdbc/fakesql.h
 %%ODBC%%include/tdbc/odbcStubs.h
 %%ODBC%%lib/tdbcodbc%%VERSION%%/libtdbcodbc%%VERSION%%.so
 %%ODBC%%lib/tdbcodbc%%VERSION%%/tdbcodbc.tcl
 %%ODBC%%lib/tdbcodbc%%VERSION%%/pkgIndex.tcl
-%%ODBC%%man/mann/tdbc_odbc.n.gz
+%%ODBC%%share/man/mann/tdbc_odbc.n.gz
 @comment PGSQL
 %%PGSQL%%include/tdbc/fakepq.h
 %%PGSQL%%include/tdbc/pqStubs.h
 %%PGSQL%%lib/tdbcpostgres%%VERSION%%/libtdbcpostgres%%VERSION%%.so
 %%PGSQL%%lib/tdbcpostgres%%VERSION%%/tdbcpostgres.tcl
 %%PGSQL%%lib/tdbcpostgres%%VERSION%%/pkgIndex.tcl
-%%PGSQL%%man/mann/tdbc_postgres.n.gz
+%%PGSQL%%share/man/mann/tdbc_postgres.n.gz
 @comment SQLITE
 %%SQLITE%%lib/tcl%%TCL_MAJ%%/%%TCL_VER%%/tdbc/sqlite3-%%VERSION%%.tm
-%%SQLITE%%man/mann/tdbc_sqlite3.n.gz
+%%SQLITE%%share/man/mann/tdbc_sqlite3.n.gz
diff --git a/databases/tile38/Makefile b/databases/tile38/Makefile
index 66c9f4f62ee3..4f1aa5b7cf13 100644
--- a/databases/tile38/Makefile
+++ b/databases/tile38/Makefile
@@ -1,15 +1,17 @@
-# Created by: olevole@olevole.ru
-
 PORTNAME=	tile38
 DISTVERSION=	1.12.0
+PORTREVISION=	18
 CATEGORIES=	databases
 
 MAINTAINER=	a.andersson.thn@gmail.com
 COMMENT=	In-memory geolocation data store, spatial index, and realtime geofence
+WWW=		https://tile38.com/
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
+BROKEN_aarch64=	fails to build: vendor/golang.org/x/sys/unix/cap_freebsd.go:18:23: undefined: CAP_RIGHTS_VERSION_00
+
 BUILD_DEPENDS=	bash:shells/bash
 
 USES=		go shebangfix
diff --git a/databases/tile38/pkg-descr b/databases/tile38/pkg-descr
index b3ecce9b803f..fa903c0c9705 100644
--- a/databases/tile38/pkg-descr
+++ b/databases/tile38/pkg-descr
@@ -14,5 +14,3 @@ Features:
     Full command line interface.
     Leader / follower replication.
     In-memory database that persists on disk.
-
-WWW: https://tile38.com/
diff --git a/databases/tiledb/Makefile b/databases/tiledb/Makefile
index 1b156f3edb2b..0591e609207b 100644
--- a/databases/tiledb/Makefile
+++ b/databases/tiledb/Makefile
@@ -1,34 +1,75 @@
-# Created by: Po-Chuan Hsieh <sunpoet@FreeBSD.org>
-
 PORTNAME=	tiledb
-PORTVERSION=	2.2.9
-PORTREVISION=	1
+PORTVERSION=	2.22.0
 CATEGORIES=	databases
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	TileDB array data management
+WWW=		https://tiledb.com/ \
+		https://github.com/TileDB-Inc/TileDB
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
-LIB_DEPENDS=	libfmt.so:devel/libfmt \
+LIB_DEPENDS=	libcapnp.so:devel/capnproto1 \
+		libcurl.so:ftp/curl \
+		libfmt.so:devel/libfmt \
 		liblz4.so:archivers/liblz4 \
 		libzstd.so:archivers/zstd
-RUN_DEPENDS=	catch>=0:devel/catch \
-		clipp>=0:devel/clipp \
-		spdlog>=1.4:devel/spdlog
+RUN_DEPENDS=	capnproto1>=1.0.1:devel/capnproto1 \
+		catch2>=3.1:devel/catch2 \
+		clipp>=1.2.3_1:devel/clipp \
+		curl>=7.74.0:ftp/curl \
+		liblz4>=1.9.3,1:archivers/liblz4 \
+		spdlog>=1.11.0:devel/spdlog \
+		zstd>=1.4.8:archivers/zstd
 
-USES=		cmake compiler:c++11-lang localbase:ldflags ssl
+USES=		cmake compiler:c++17-lang localbase:ldflags pkgconfig ssl
 
 CFLAGS+=	-DSPDLOG_FMT_EXTERNAL=1
-CMAKE_ARGS=	-DCATCH_INCLUDE_DIR=${LOCALBASE}/include/catch2
-CMAKE_OFF=	TILEDB_CMAKE_IDE TILEDB_FORCE_ALL_DEPS TILEDB_HDFS TILEDB_S3 TILEDB_SUPERBUILD TILEDB_TBB TILEDB_TBB_SHARED TILEDB_TESTS_AWS_S3_CONFIG TILEDB_VERBOSE TILEDB_WERROR
-CMAKE_ON=	TILEDB_CPP_API TILEDB_STATIC TILEDB_STATS TILEDB_TESTS TILEDB_TOOLS
+CFLAGS_armv6=	-Wno-c++11-narrowing
+CFLAGS_armv7=	-Wno-c++11-narrowing
+CFLAGS_i386=	-Wno-c++11-narrowing
+CFLAGS_powerpc=	-Wno-c++11-narrowing
+CMAKE_ARGS=	-DCATCH_INCLUDE_DIR=${LOCALBASE}/include/catch2 \
+		-DFREEBSD_OPENSSLBASE=${OPENSSLBASE} \
+		-Dlibmagic_DICTIONARY=/usr/share/misc/magic.mgc
+CMAKE_OFF=	TILEDB_ALLOW_REGEX_CHAR_PATH \
+		TILEDB_ARROW_TESTS \
+		TILEDB_ASSERTIONS \
+		TILEDB_AZURE \
+		TILEDB_CMAKE_IDE \
+		TILEDB_EXPERIMENTAL_FEATURES \
+		TILEDB_FORCE_ALL_DEPS \
+		TILEDB_GCS \
+		TILEDB_HDFS \
+		TILEDB_S3 \
+		TILEDB_SKIP_S3AWSSDK_DIR_LENGTH_CHECK \
+		TILEDB_SUPERBUILD \
+		TILEDB_TESTS \
+		TILEDB_VCPKG \
+		TILEDB_VERBOSE \
+		TILEDB_WEBP \
+		TILEDB_WERROR
+CMAKE_ON=	CMAKE_EXPORT_COMPILE_COMMANDS \
+		TILEDB_CCACHE \
+		TILEDB_CPP_API \
+		TILEDB_LOG_OUTPUT_ON_FAILURE \
+		TILEDB_SERIALIZATION \
+		TILEDB_STATS \
+		TILEDB_TOOLS
 LDFLAGS+=	-lfmt
 
 GH_ACCOUNT=	TileDB-Inc
 GH_PROJECT=	TileDB
 USE_GITHUB=	yes
 
+OPTIONS_DEFINE=	AVX2
+AVX2_DESC=	AVX2 instructions support
+
+AVX2_CMAKE_BOOL=	COMPILER_SUPPORTS_AVX2
+
+post-install:
+	${RM} ${STAGEDIR}${PREFIX}/lib/libbz2.so ${STAGEDIR}${PREFIX}/lib/liblz4.so ${STAGEDIR}${PREFIX}/lib/libzstd.so
+
 .include <bsd.port.mk>
diff --git a/databases/tiledb/distinfo b/databases/tiledb/distinfo
index 7d9ccedabe60..5ded5741fc4f 100644
--- a/databases/tiledb/distinfo
+++ b/databases/tiledb/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1620928561
-SHA256 (TileDB-Inc-TileDB-2.2.9_GH0.tar.gz) = e5460824e32b5ce19800b183ac748624de30cab6a8de3c1c580789c7d4fd10a5
-SIZE (TileDB-Inc-TileDB-2.2.9_GH0.tar.gz) = 1865183
+TIMESTAMP = 1713528500
+SHA256 (TileDB-Inc-TileDB-2.22.0_GH0.tar.gz) = 55848552a169a029d2b73e14f4efc846117f41e42f742402f774290d12f410be
+SIZE (TileDB-Inc-TileDB-2.22.0_GH0.tar.gz) = 4424592
diff --git a/databases/tiledb/files/patch-cmake-inputs-Config.cmake.in b/databases/tiledb/files/patch-cmake-inputs-Config.cmake.in
new file mode 100644
index 000000000000..6df00e7a3ac8
--- /dev/null
+++ b/databases/tiledb/files/patch-cmake-inputs-Config.cmake.in
@@ -0,0 +1,14 @@
+--- cmake/inputs/Config.cmake.in.orig	2023-12-13 20:43:06 UTC
++++ cmake/inputs/Config.cmake.in
+@@ -14,11 +14,9 @@ if(@TILEDB_STATIC@) # TILEDB_STATIC
+   include(CMakeFindDependencyMacro)
+   find_dependency(Threads)
+   find_dependency(BZip2)
+-  find_dependency(lz4)
+   find_dependency(spdlog)
+   find_dependency(ZLIB)
+   find_dependency(zstd)
+-  find_dependency(unofficial-libmagic)
+   if(NOT WIN32)
+     find_dependency(OpenSSL)
+   endif()
diff --git a/databases/tiledb/files/patch-cmake-openssl b/databases/tiledb/files/patch-cmake-openssl
new file mode 100644
index 000000000000..924f7a6ea2c5
--- /dev/null
+++ b/databases/tiledb/files/patch-cmake-openssl
@@ -0,0 +1,15 @@
+Fix search for OpenSSL with CMake >= 3.27. This port uses OPENSSL_PATHS to set
+OPENSSL_ROOT_DIR, so CMake tries to find OpenSSL in TILEDB_EP_INSTALL_PREFIX
+which is problably not where we want to look.
+
+--- cmake/Modules/FindOpenSSL_EP.cmake.orig    2023-10-25 06:36:39 UTC
++++ cmake/Modules/FindOpenSSL_EP.cmake
+@@ -41,7 +41,7 @@ endif()
+ endif()
+ 
+ # Search the path set during the superbuild for the EP.
+-set(OPENSSL_PATHS ${TILEDB_EP_INSTALL_PREFIX})
++set(OPENSSL_PATHS ${FREEBSD_OPENSSLBASE})
+ 
+ # Add /usr/local/opt, as Homebrew sometimes installs it there.
+ set (HOMEBREW_BASE "/usr/local/opt/openssl")
diff --git a/databases/tiledb/files/patch-external-src-blosc-shuffle.cc b/databases/tiledb/files/patch-external-src-blosc-shuffle.cc
deleted file mode 100644
index c72dfceb3e97..000000000000
--- a/databases/tiledb/files/patch-external-src-blosc-shuffle.cc
+++ /dev/null
@@ -1,26 +0,0 @@
---- external/src/blosc/shuffle.cc.orig	2020-07-31 17:44:09 UTC
-+++ external/src/blosc/shuffle.cc
-@@ -158,6 +158,8 @@ __cpuidex(int32_t cpuInfo[4], int32_t function_id, int
- /* Reads the content of an extended control register.
-    https://software.intel.com/en-us/articles/how-to-detect-new-instruction-support-in-the-4th-generation-intel-core-processor-family
- */
-+
-+#if defined(__clang_major__) && __clang_major__ < 9
- static inline uint64_t
- _xgetbv(uint32_t xcr) {
-   uint32_t eax, edx;
-@@ -173,6 +175,7 @@ _xgetbv(uint32_t xcr) {
-     );
-   return ((uint64_t)edx << 32) | eax;
- }
-+#endif
- 
- #endif /* defined(_MSC_FULL_VER) */
- 
-@@ -385,4 +388,4 @@ unshuffle(const size_t bytesoftype, const size_t block
-   (host_implementation.unshuffle)(bytesoftype, blocksize, _src, _dest);
- }
- 
--}
-\ No newline at end of file
-+}
diff --git a/databases/tiledb/files/patch-magic b/databases/tiledb/files/patch-magic
new file mode 100644
index 000000000000..b1a0812ff549
--- /dev/null
+++ b/databases/tiledb/files/patch-magic
@@ -0,0 +1,165 @@
+Obtained from:	https://github.com/TileDB-Inc/TileDB/pull/3270
+
+--- cmake/Modules/FindMagic_EP.cmake.orig	2022-08-25 01:25:52 UTC
++++ cmake/Modules/FindMagic_EP.cmake
+@@ -3,7 +3,7 @@
+ #
+ # The MIT License
+ #
+-# Copyright (c) 2018-2021 TileDB, Inc.
++# Copyright (c) 2022 TileDB, Inc.
+ #
+ # Permission is hereby granted, free of charge, to any person obtaining a copy
+ # of this software and associated documentation files (the "Software"), to deal
+@@ -34,47 +34,47 @@
+ # Include some common helper functions.
+ include(TileDBCommon)
+ 
+-# Search the path set during the superbuild for the EP.
+-set(LIBMAGIC_PATHS ${TILEDB_EP_INSTALL_PREFIX})
++# First check for a static version in the EP prefix.
++find_library(libmagic_LIBRARIES
++        NAMES
++        magic${CMAKE_STATIC_LIBRARY_SUFFIX}
++        libmagic${CMAKE_STATIC_LIBRARY_SUFFIX}
++        PATHS ${TILEDB_EP_INSTALL_PREFIX}
++        PATH_SUFFIXES lib
++        NO_DEFAULT_PATH
++)
+ 
+-if(TILEDB_LIBMAGIC_EP_BUILT)
+-  find_package(libmagic PATHS ${TILEDB_EP_INSTALL_PREFIX} ${TILEDB_DEPS_NO_DEFAULT_PATH})
+-endif()
+-
+-if (TILEDB_LIBMAGIC_EP_BUILT)
++if (libmagic_LIBRARIES)
++  set(libmagic_STATIC_EP_FOUND TRUE)
+   find_path(libmagic_INCLUDE_DIR
+-    NAMES magic.h
+-    PATHS ${LIBMAGIC_PATHS}
+-    PATH_SUFFIXES include
+-    ${NO_DEFAULT_PATH}
+-  )
+-
+-  if (NOT libmagic_INCLUDE_DIR)
+-    find_path(libmagic_INCLUDE_DIR
+-      NAMES file/file.h
+-      PATHS ${LIBMAGIC_PATHS}
+-      PATH_SUFFIXES include
+-      ${NO_DEFAULT_PATH}
+-    )
+-  endif()
+-
+-  # Link statically if installed with the EP.
++          NAMES magic.h
++          PATHS ${TILEDB_EP_INSTALL_PREFIX}
++          PATH_SUFFIXES include
++          NO_DEFAULT_PATH
++          )
++elseif(NOT TILEDB_FORCE_ALL_DEPS)
++  set(libmagic_STATIC_EP_FOUND FALSE)
++  # Static EP not found, search in system paths.
+   find_library(libmagic_LIBRARIES
+-    libmagic
+-    PATHS ${LIBMAGIC_PATHS}
+-    PATH_SUFFIXES lib a
+-    #${TILEDB_DEPS_NO_DEFAULT_PATH}
+-    ${NO_DEFAULT_PATH}
+-  )
+-
+-  include(FindPackageHandleStandardArgs)
+-  FIND_PACKAGE_HANDLE_STANDARD_ARGS(libmagic
+-    REQUIRED_VARS libmagic_LIBRARIES libmagic_INCLUDE_DIR
+-  )
++          NAMES
++          magic libmagic
++          PATH_SUFFIXES lib bin
++          ${TILEDB_DEPS_NO_DEFAULT_PATH}
++          )
++  find_path(libmagic_INCLUDE_DIR
++          NAMES magic.h
++          PATH_SUFFIXES include
++          ${TILEDB_DEPS_NO_DEFAULT_PATH}
++          )
+ endif()
+ 
++include(FindPackageHandleStandardArgs)
++FIND_PACKAGE_HANDLE_STANDARD_ARGS(libmagic
++        REQUIRED_VARS libmagic_LIBRARIES libmagic_INCLUDE_DIR
++)
++
+ # if not yet built add it as an external project
+-if(NOT TILEDB_LIBMAGIC_EP_BUILT)
++if(NOT libmagic_FOUND)
+   if (TILEDB_SUPERBUILD)
+     message(STATUS "Adding Magic as an external project")
+ 
+@@ -115,11 +115,22 @@ if(NOT TILEDB_LIBMAGIC_EP_BUILT)
+   endif()
+ endif()
+ 
+-find_file(libmagic_DICTIONARY magic.mgc
+-  PATHS ${LIBMAGIC_PATHS}
+-  PATH_SUFFIXES bin share
+-  ${NO_DEFAULT_PATH}
+-)
++if(TILEDB_LIBMAGIC_EP_BUILT)
++  find_file(libmagic_DICTIONARY magic.mgc
++          PATHS ${LIBMAGIC_PATHS}
++          PATH_SUFFIXES bin share misc
++          ${TILEDB_DEPS_NO_DEFAULT_PATH}
++          )
++else()
++  find_file(libmagic_DICTIONARY magic.mgc
++    PATH_SUFFIXES bin share misc share/misc
++    ${TILEDB_DEPS_NO_DEFAULT_PATH}
++  )
++endif()
++
++if(NOT TILEDB_SUPERBUILD AND NOT libmagic_DICTIONARY)
++  message(FATAL_ERROR "Unable to find libmagic dictionary")
++endif()
+ 
+ if (libmagic_FOUND AND NOT TARGET libmagic)
+   message(STATUS "Found Magic, adding imported target: ${libmagic_LIBRARIES}")
+--- tiledb/CMakeLists.txt.orig	2022-08-25 01:25:52 UTC
++++ tiledb/CMakeLists.txt
+@@ -357,14 +357,18 @@ target_link_libraries(TILEDB_CORE_OBJECTS PRIVATE $<BU
+ ############################################################
+ # provide actions/target for preparation of magic.mgc data for embedding/build
+ 
+-set(MGC_GZIPPED_BIN_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/..")
++set(MGC_GZIPPED_BIN_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/sm/misc")
+ set(MGC_GZIPPED_BIN_OUTPUT_FILE "${MGC_GZIPPED_BIN_OUTPUT_DIRECTORY}/magic_mgc_gzipped.bin")
+ set(MGC_GZIPPED_BIN_INPUT_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/sm/misc")
+ set(MGC_GZIPPED_BIN_INPUT_FILE "${MGC_GZIPPED_BIN_INPUT_DIRECTORY}/magic_mgc_gzipped.bin.tar.bz2")
+ 
++# Create the output directory if it does not exist
++add_custom_target(create_magic_bin_output_directory ALL
++        COMMAND ${CMAKE_COMMAND} -E make_directory ${MGC_GZIPPED_BIN_OUTPUT_DIRECTORY})
++
+ add_custom_command(
+   OUTPUT "${MGC_GZIPPED_BIN_OUTPUT_FILE}"
+-  DEPENDS "${MGC_GZIPPED_BIN_INPUT_FILE}"
++  DEPENDS "${MGC_GZIPPED_BIN_INPUT_FILE}" create_magic_bin_output_directory
+   COMMAND ${CMAKE_COMMAND} -E tar x "${MGC_GZIPPED_BIN_INPUT_FILE}"
+   WORKING_DIRECTORY "${MGC_GZIPPED_BIN_OUTPUT_DIRECTORY}"
+ )
+@@ -380,7 +384,7 @@ add_custom_target(
+   WORKING_DIRECTORY "${MGC_GZIPPED_BIN_OUTPUT_DIRECTORY}"
+   COMMAND ${CMAKE_COMMAND} -E tar cvj "magic_mgc_gzipped.bin.tar.bz2" "magic_mgc_gzipped.bin"
+   COMMAND ${CMAKE_COMMAND} -E copy "magic_mgc_gzipped.bin.tar.bz2" "${MGC_GZIPPED_BIN_INPUT_FILE}"
+-  DEPENDS "${libmagic_DICTIONARY}"
++  DEPENDS "${libmagic_DICTIONARY}" create_magic_bin_output_directory
+   COMMENT "Re-generate ${MGC_GZIPPED_BIN_INPUT_FILE} for embedded magic.mgc support"
+ )
+ 
+@@ -394,6 +398,8 @@ target_include_directories(TILEDB_CORE_OBJECTS
+     "${TILEDB_EXTERNALS_INCLUDE_DIRS}"
+ 	# to pickup <build_dir>/tiledb for capnp gen'd files
+     "${CMAKE_CURRENT_BINARY_DIR}/.."
++    # For libmagic binary data include
++    "${CMAKE_CURRENT_BINARY_DIR}/sm/misc"
+ )
+ 
+ # Build a separate copy of the object library for use with static TileDB
diff --git a/databases/tiledb/files/patch-tiledb-common-logger.h b/databases/tiledb/files/patch-tiledb-common-logger.h
deleted file mode 100644
index 8e18c0e2f4c8..000000000000
--- a/databases/tiledb/files/patch-tiledb-common-logger.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- tiledb/common/logger.h.orig	2021-01-07 18:31:04 UTC
-+++ tiledb/common/logger.h
-@@ -37,6 +37,7 @@
- 
- #include <spdlog/fmt/ostr.h>
- #include <spdlog/spdlog.h>
-+#include <spdlog/sinks/stdout_color_sinks.h>
- 
- #include "tiledb/common/status.h"
- 
diff --git a/databases/tiledb/pkg-descr b/databases/tiledb/pkg-descr
index 4e15cb4ec118..d0d06fad6753 100644
--- a/databases/tiledb/pkg-descr
+++ b/databases/tiledb/pkg-descr
@@ -16,5 +16,3 @@ Features:
 - Language Bindings.
 - Key-value Store.
 - Virtual Filesystem.
-
-WWW: https://www.tiledb.io/
diff --git a/databases/tiledb/pkg-plist b/databases/tiledb/pkg-plist
index 843907113f51..aaeb4d114404 100644
--- a/databases/tiledb/pkg-plist
+++ b/databases/tiledb/pkg-plist
@@ -1,36 +1,97 @@
+include/tiledb/api/c_api/api_external_common.h
+include/tiledb/api/c_api/attribute/attribute_api_external.h
+include/tiledb/api/c_api/attribute/attribute_api_external_experimental.h
+include/tiledb/api/c_api/buffer/buffer_api_external.h
+include/tiledb/api/c_api/buffer_list/buffer_list_api_external.h
+include/tiledb/api/c_api/config/config_api_external.h
+include/tiledb/api/c_api/context/context_api_external.h
+include/tiledb/api/c_api/data_order/data_order_api_enum.h
+include/tiledb/api/c_api/data_order/data_order_api_external.h
+include/tiledb/api/c_api/datatype/datatype_api_enum.h
+include/tiledb/api/c_api/datatype/datatype_api_external.h
+include/tiledb/api/c_api/dimension/dimension_api_external.h
+include/tiledb/api/c_api/dimension_label/dimension_label_api_external.h
+include/tiledb/api/c_api/domain/domain_api_external.h
+include/tiledb/api/c_api/enumeration/enumeration_api_experimental.h
+include/tiledb/api/c_api/error/error_api_external.h
+include/tiledb/api/c_api/filesystem/filesystem_api_enum.h
+include/tiledb/api/c_api/filesystem/filesystem_api_external.h
+include/tiledb/api/c_api/filter/filter_api_enum.h
+include/tiledb/api/c_api/filter/filter_api_external.h
+include/tiledb/api/c_api/filter_list/filter_list_api_external.h
+include/tiledb/api/c_api/group/group_api_external.h
+include/tiledb/api/c_api/group/group_api_external_experimental.h
+include/tiledb/api/c_api/object/object_api_enum.h
+include/tiledb/api/c_api/object/object_api_external.h
+include/tiledb/api/c_api/query/query_api_enum.h
+include/tiledb/api/c_api/query/query_api_external.h
+include/tiledb/api/c_api/query_aggregate/query_aggregate_api_external_experimental.h
+include/tiledb/api/c_api/query_field/query_field_api_external_experimental.h
+include/tiledb/api/c_api/query_plan/query_plan_api_external_experimental.h
+include/tiledb/api/c_api/string/string_api_external.h
+include/tiledb/api/c_api/vfs/vfs_api_enum.h
+include/tiledb/api/c_api/vfs/vfs_api_experimental.h
+include/tiledb/api/c_api/vfs/vfs_api_external.h
 include/tiledb/array.h
+include/tiledb/array_deprecated.h
+include/tiledb/array_experimental.h
 include/tiledb/array_schema.h
+include/tiledb/array_schema_evolution.h
+include/tiledb/array_schema_experimental.h
 include/tiledb/arrow_io_impl.h
 include/tiledb/arrowio
+include/tiledb/as_built_experimental.h
 include/tiledb/attribute.h
+include/tiledb/attribute_experimental.h
+include/tiledb/capi_string.h
+include/tiledb/channel_operation.h
+include/tiledb/channel_operator.h
 include/tiledb/config.h
+include/tiledb/consolidation_plan_experimental.h
 include/tiledb/context.h
 include/tiledb/core_interface.h
 include/tiledb/deleter.h
 include/tiledb/dimension.h
+include/tiledb/dimension_label_experimental.h
 include/tiledb/domain.h
+include/tiledb/enumeration_experimental.h
+include/tiledb/error.h
 include/tiledb/exception.h
 include/tiledb/filter.h
 include/tiledb/filter_list.h
 include/tiledb/fragment_info.h
 include/tiledb/group.h
+include/tiledb/group_experimental.h
+include/tiledb/log.h
 include/tiledb/object.h
 include/tiledb/object_iter.h
 include/tiledb/query.h
+include/tiledb/query_channel.h
+include/tiledb/query_condition.h
+include/tiledb/query_condition_experimental.h
+include/tiledb/query_experimental.h
 include/tiledb/schema_base.h
 include/tiledb/stats.h
+include/tiledb/subarray.h
+include/tiledb/subarray_experimental.h
 include/tiledb/tiledb
 include/tiledb/tiledb.h
+include/tiledb/tiledb_dimension_label_experimental.h
 include/tiledb/tiledb_enum.h
+include/tiledb/tiledb_experimental
+include/tiledb/tiledb_experimental.h
 include/tiledb/tiledb_export.h
+include/tiledb/tiledb_serialization.h
 include/tiledb/tiledb_version.h
 include/tiledb/type.h
 include/tiledb/utils.h
 include/tiledb/version.h
 include/tiledb/vfs.h
+include/tiledb/vfs_experimental.h
+include/tiledb_export.h
 lib/cmake/TileDB/TileDBConfig.cmake
+lib/cmake/TileDB/TileDBConfigVersion.cmake
 lib/cmake/TileDB/TileDBTargets-%%CMAKE_BUILD_TYPE%%.cmake
 lib/cmake/TileDB/TileDBTargets.cmake
-lib/libtiledb.a
 lib/libtiledb.so
 libdata/pkgconfig/tiledb.pc
diff --git a/databases/timescaledb-backup/Makefile b/databases/timescaledb-backup/Makefile
new file mode 100644
index 000000000000..fb3bd945ee95
--- /dev/null
+++ b/databases/timescaledb-backup/Makefile
@@ -0,0 +1,58 @@
+PORTNAME=	timescaledb-backup
+DISTVERSION=	0.1.1
+PORTREVISION=	18
+CATEGORIES=	databases
+
+MAINTAINER=	kbowling@FreeBSD.org
+COMMENT=	Tool for performing TimescaleDB backups across versions
+WWW=		https://github.com/timescale/timescaledb-backup
+
+LICENSE=	TSL
+LICENSE_NAME=	Timescale License Agreement
+LICENSE_FILE=	${WRKSRC}/LICENSE
+LICENSE_PERMS=	dist-mirror pkg-mirror auto-accept
+
+USES=		go:modules
+USE_GITHUB=	yes
+GH_ACCOUNT=	timescale
+GH_TUPLE=	Microsoft:go-winio:v0.4.11:microsoft_go_winio/vendor/github.com/Microsoft/go-winio \
+		Microsoft:hcsshim:v0.8.6:microsoft_hcsshim/vendor/github.com/Microsoft/hcsshim \
+		cenkalti:backoff:v2.2.1:cenkalti_backoff/vendor/github.com/cenkalti/backoff \
+		containerd:continuity:aaeac12a7ffc:containerd_continuity/vendor/github.com/containerd/continuity \
+		docker:distribution:0d3efadf0154:docker_distribution/vendor/github.com/docker/distribution \
+		docker:go-connections:v0.4.0:docker_go_connections/vendor/github.com/docker/go-connections \
+		docker:go-units:v0.3.3:docker_go_units/vendor/github.com/docker/go-units \
+		gogo:protobuf:v1.2.0:gogo_protobuf/vendor/github.com/gogo/protobuf \
+		golang:crypto:0ec3e9974c59:golang_crypto/vendor/golang.org/x/crypto \
+		golang:net:74dc4d7220e7:golang_net/vendor/golang.org/x/net \
+		golang:protobuf:v1.3.2:golang_protobuf/vendor/github.com/golang/protobuf \
+		golang:sync:112230192c58:golang_sync/vendor/golang.org/x/sync \
+		golang:sys:c7b8b68b1456:golang_sys/vendor/golang.org/x/sys \
+		golang:text:v0.3.2:golang_text/vendor/golang.org/x/text \
+		golang:xerrors:a985d3407aa7:golang_xerrors/vendor/golang.org/x/xerrors \
+		google:go-genproto:c66870c02cf8:google_go_genproto/vendor/google.golang.org/genproto \
+		grpc:grpc-go:v1.17.0:grpc_grpc_go/vendor/google.golang.org/grpc \
+		jackc:chunkreader:v2.0.1:jackc_chunkreader_v2/vendor/github.com/jackc/chunkreader/v2 \
+		jackc:pgconn:v1.5.0:jackc_pgconn/vendor/github.com/jackc/pgconn \
+		jackc:pgio:v1.0.0:jackc_pgio/vendor/github.com/jackc/pgio \
+		jackc:pgpassfile:v1.0.0:jackc_pgpassfile/vendor/github.com/jackc/pgpassfile \
+		jackc:pgproto3:v2.0.1:jackc_pgproto3_v2/vendor/github.com/jackc/pgproto3/v2 \
+		jackc:pgservicefile:3430c5407db8:jackc_pgservicefile/vendor/github.com/jackc/pgservicefile \
+		jackc:pgtype:v1.3.0:jackc_pgtype/vendor/github.com/jackc/pgtype \
+		jackc:pgx:v4.6.0:jackc_pgx_v4/vendor/github.com/jackc/pgx/v4 \
+		konsorten:go-windows-terminal-sequences:v1.0.2:konsorten_go_windows_terminal_sequences/vendor/github.com/konsorten/go-windows-terminal-sequences \
+		moby:moby:b20a14b54661:moby_moby/vendor/github.com/docker/docker \
+		opencontainers:go-digest:v1.0.0-rc1:opencontainers_go_digest/vendor/github.com/opencontainers/go-digest \
+		opencontainers:image-spec:v1.0.1:opencontainers_image_spec/vendor/github.com/opencontainers/image-spec \
+		opencontainers:runc:v0.1.1:opencontainers_runc/vendor/github.com/opencontainers/runc \
+		pkg:errors:v0.9.1:pkg_errors/vendor/github.com/pkg/errors \
+		satori:go.uuid:v1.2.0:satori_go_uuid/vendor/github.com/satori/go.uuid \
+		sirupsen:logrus:v1.4.2:sirupsen_logrus/vendor/github.com/sirupsen/logrus \
+		testcontainers:testcontainers-go:v0.3.1:testcontainers_testcontainers_go/vendor/github.com/testcontainers/testcontainers-go
+
+GO_TARGET=	./cmd/ts-dump ./cmd/ts-restore
+
+PLIST_FILES=	bin/ts-dump \
+		bin/ts-restore
+
+.include <bsd.port.mk>
diff --git a/databases/timescaledb-backup/distinfo b/databases/timescaledb-backup/distinfo
new file mode 100644
index 000000000000..1339ce5dccc5
--- /dev/null
+++ b/databases/timescaledb-backup/distinfo
@@ -0,0 +1,71 @@
+TIMESTAMP = 1634314174
+SHA256 (timescale-timescaledb-backup-0.1.1_GH0.tar.gz) = 0345b8740848d83f2f7e972279b439a748481128e6d14f739e8bed32de0b11f6
+SIZE (timescale-timescaledb-backup-0.1.1_GH0.tar.gz) = 26854
+SHA256 (Microsoft-go-winio-v0.4.11_GH0.tar.gz) = e46f186982d8d27b8d740e724b6b736d047c3b92419f2265402390a15989a825
+SIZE (Microsoft-go-winio-v0.4.11_GH0.tar.gz) = 79254
+SHA256 (Microsoft-hcsshim-v0.8.6_GH0.tar.gz) = 8ed4dbe7a70172101c32b3365c3b43ba779e2fd5259cf00389b729c68a50cbd3
+SIZE (Microsoft-hcsshim-v0.8.6_GH0.tar.gz) = 1664509
+SHA256 (cenkalti-backoff-v2.2.1_GH0.tar.gz) = a2c29d0184e7afc415975cf2689723028d2686ffbb67fe0999ab1d691e6d16db
+SIZE (cenkalti-backoff-v2.2.1_GH0.tar.gz) = 8623
+SHA256 (containerd-continuity-aaeac12a7ffc_GH0.tar.gz) = ba055627964a61222263d01fbc765140ecd1dfaeefedcc3fabd9efe4a1211ebe
+SIZE (containerd-continuity-aaeac12a7ffc_GH0.tar.gz) = 1075575
+SHA256 (docker-distribution-0d3efadf0154_GH0.tar.gz) = ed0046d2f0f2c08c60108f9267d758a4884a04b38057cf6c1a70afd1108e5fd8
+SIZE (docker-distribution-0d3efadf0154_GH0.tar.gz) = 2003263
+SHA256 (docker-go-connections-v0.4.0_GH0.tar.gz) = e31dfcf72dd9b07bf6dc320671a78a142a1b7c6287a7282c034c8cd463bc8663
+SIZE (docker-go-connections-v0.4.0_GH0.tar.gz) = 30770
+SHA256 (docker-go-units-v0.3.3_GH0.tar.gz) = a088ea93ec2d4112d4b100f5760fd73252820ed5872c880234e390d922a1399b
+SIZE (docker-go-units-v0.3.3_GH0.tar.gz) = 11220
+SHA256 (gogo-protobuf-v1.2.0_GH0.tar.gz) = 957c8f03cf595525d2a667035d9865a0930b3d446be0ab6eb76972934f925b00
+SIZE (gogo-protobuf-v1.2.0_GH0.tar.gz) = 2011389
+SHA256 (golang-crypto-0ec3e9974c59_GH0.tar.gz) = 737fd8da273ec11281d2ff8798d6847ab1be9ebfa94bbc5a7252e0b04e1373a5
+SIZE (golang-crypto-0ec3e9974c59_GH0.tar.gz) = 1727772
+SHA256 (golang-net-74dc4d7220e7_GH0.tar.gz) = e974b081e105d9c61374fd026aa89bff010cc58b676dddf67a319dbba8df35fa
+SIZE (golang-net-74dc4d7220e7_GH0.tar.gz) = 1099877
+SHA256 (golang-protobuf-v1.3.2_GH0.tar.gz) = c9cda622857a17cf0877c5ba76688a931883e505f40744c9495638b6e3da1f65
+SIZE (golang-protobuf-v1.3.2_GH0.tar.gz) = 312285
+SHA256 (golang-sync-112230192c58_GH0.tar.gz) = 6d98880ea18369550cb12d7011df8e4b21c5b7588268a412b863b5c9d2fa0313
+SIZE (golang-sync-112230192c58_GH0.tar.gz) = 16832
+SHA256 (golang-sys-c7b8b68b1456_GH0.tar.gz) = 826e76dcb9c9c2ed234d81b2f4d8cb960a4fec707814521f938c9be99e9f1d80
+SIZE (golang-sys-c7b8b68b1456_GH0.tar.gz) = 1455888
+SHA256 (golang-text-v0.3.2_GH0.tar.gz) = 0b9309698f5708531c5377ab1e29b423a6d9e20c55a8d386c3b8283428212f22
+SIZE (golang-text-v0.3.2_GH0.tar.gz) = 7168069
+SHA256 (golang-xerrors-a985d3407aa7_GH0.tar.gz) = cbceb1aab297e932cee5a54775f655e1885f5a6a850a27a6d566cab11e0c0401
+SIZE (golang-xerrors-a985d3407aa7_GH0.tar.gz) = 12270
+SHA256 (google-go-genproto-c66870c02cf8_GH0.tar.gz) = 156e7cd1f95947c3f3293e18baa7af04e0da58eeeb3475f15bcc308ff491f31a
+SIZE (google-go-genproto-c66870c02cf8_GH0.tar.gz) = 2191164
+SHA256 (grpc-grpc-go-v1.17.0_GH0.tar.gz) = 891add70cc16c9e2dc07986fd6e8fae44a36921727411f0b652afbc76e0fb169
+SIZE (grpc-grpc-go-v1.17.0_GH0.tar.gz) = 563534
+SHA256 (jackc-chunkreader-v2.0.1_GH0.tar.gz) = bf856bad6608fb7345707aba713a1d77eb984f1d217065738a12c97e37669be4
+SIZE (jackc-chunkreader-v2.0.1_GH0.tar.gz) = 3038
+SHA256 (jackc-pgconn-v1.5.0_GH0.tar.gz) = 2284cdf1b8c1c2daa6e5b78d5da8f0587343bd49cec525324ed8c02904a84d01
+SIZE (jackc-pgconn-v1.5.0_GH0.tar.gz) = 44460
+SHA256 (jackc-pgio-v1.0.0_GH0.tar.gz) = d36e367c877954acdc96b8cd1a0df417b4cfae80dae726474a8f0de3a68a68ab
+SIZE (jackc-pgio-v1.0.0_GH0.tar.gz) = 1884
+SHA256 (jackc-pgpassfile-v1.0.0_GH0.tar.gz) = df8904662382e1d0064ec7a5a8c36c49264d7128cea923d597802ada8c5b9603
+SIZE (jackc-pgpassfile-v1.0.0_GH0.tar.gz) = 3254
+SHA256 (jackc-pgproto3-v2.0.1_GH0.tar.gz) = fb1dbd363d589e46beaeb249b41b78c58569182417e9dd116dd5b5ebeddb9c94
+SIZE (jackc-pgproto3-v2.0.1_GH0.tar.gz) = 16494
+SHA256 (jackc-pgservicefile-3430c5407db8_GH0.tar.gz) = bad387b5f30b9882c94cd71df47663010472348c1d21054a20500e2d710c5e65
+SIZE (jackc-pgservicefile-3430c5407db8_GH0.tar.gz) = 2954
+SHA256 (jackc-pgtype-v1.3.0_GH0.tar.gz) = b2504ce4436afed578d0c85a13b653718f74d14c3b41c0d57d33bea71d5ea4da
+SIZE (jackc-pgtype-v1.3.0_GH0.tar.gz) = 98733
+SHA256 (jackc-pgx-v4.6.0_GH0.tar.gz) = 1b9c31b927b4d3fdafe0edb92b0ca99018619de62c46de1b0de619fd6eb8d307
+SIZE (jackc-pgx-v4.6.0_GH0.tar.gz) = 85853
+SHA256 (konsorten-go-windows-terminal-sequences-v1.0.2_GH0.tar.gz) = e61f6422c7d1222c4c642b9134e5a4576a89ff651ef947487faa8ef33b6b4cfe
+SIZE (konsorten-go-windows-terminal-sequences-v1.0.2_GH0.tar.gz) = 1987
+SHA256 (moby-moby-b20a14b54661_GH0.tar.gz) = 34a11c5fbc5f299207080ec642be13aefbb89fad741a329ff0456d781ef8171a
+SIZE (moby-moby-b20a14b54661_GH0.tar.gz) = 9088574
+SHA256 (opencontainers-go-digest-v1.0.0-rc1_GH0.tar.gz) = 3f511b32c46f60482644f0ad6a345f52e672c82164bfb08274f15f7c14cd3076
+SIZE (opencontainers-go-digest-v1.0.0-rc1_GH0.tar.gz) = 19206
+SHA256 (opencontainers-image-spec-v1.0.1_GH0.tar.gz) = c7ca467de2cca65e7ea74414a3f51e91450156213af485830dcdfff0571e10d2
+SIZE (opencontainers-image-spec-v1.0.1_GH0.tar.gz) = 138674
+SHA256 (opencontainers-runc-v0.1.1_GH0.tar.gz) = e59694701625218b26b40a8ab2401ef366a940467c61aa21c71f156ea9778f9e
+SIZE (opencontainers-runc-v0.1.1_GH0.tar.gz) = 496426
+SHA256 (pkg-errors-v0.9.1_GH0.tar.gz) = 56bfd893023daa498508bfe161de1be83299fcf15376035e7df79cbd7d6fa608
+SIZE (pkg-errors-v0.9.1_GH0.tar.gz) = 13415
+SHA256 (satori-go.uuid-v1.2.0_GH0.tar.gz) = 6f9d9549958252d7c5a5ed1cabeedeaab7a600ca0b888a3666cce4c3590aa5a7
+SIZE (satori-go.uuid-v1.2.0_GH0.tar.gz) = 8297
+SHA256 (sirupsen-logrus-v1.4.2_GH0.tar.gz) = 67f2ddf467b7e63d2d2529d227946a331e245aeef7e2e4521ae82647b5ef84d9
+SIZE (sirupsen-logrus-v1.4.2_GH0.tar.gz) = 41373
+SHA256 (testcontainers-testcontainers-go-v0.3.1_GH0.tar.gz) = 80d03c65aad36c44b283bf39350cba0c6d880b77792bd36bd28ff0fc093aedb1
+SIZE (testcontainers-testcontainers-go-v0.3.1_GH0.tar.gz) = 30816
diff --git a/databases/timescaledb-backup/pkg-descr b/databases/timescaledb-backup/pkg-descr
new file mode 100644
index 000000000000..8b609b8e5d51
--- /dev/null
+++ b/databases/timescaledb-backup/pkg-descr
@@ -0,0 +1,2 @@
+timescaledb-backup is a program for making dumping and restoring a TimescaleDB
+database simpler, less error-prone, and more performant.
diff --git a/databases/timescaledb-tune/Makefile b/databases/timescaledb-tune/Makefile
new file mode 100644
index 000000000000..aeeeff75336a
--- /dev/null
+++ b/databases/timescaledb-tune/Makefile
@@ -0,0 +1,21 @@
+PORTNAME=	timescaledb-tune
+DISTVERSIONPREFIX=	v
+DISTVERSION=	0.16.0
+PORTREVISION=	1
+CATEGORIES=	databases
+
+MAINTAINER=	kbowling@FreeBSD.org
+COMMENT=	Tool for tuning TimescaleDB for better performance
+WWW=		https://github.com/timescale/timescaledb-tune
+
+LICENSE=	APACHE20
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
+USES=		go:modules
+
+GO_MODULE=	github.com/timescale/timescaledb-tune
+GO_TARGET=	./cmd/${PORTNAME}
+
+PLIST_FILES=	bin/timescaledb-tune
+
+.include <bsd.port.mk>
diff --git a/databases/timescaledb-tune/distinfo b/databases/timescaledb-tune/distinfo
new file mode 100644
index 000000000000..502083ae1a65
--- /dev/null
+++ b/databases/timescaledb-tune/distinfo
@@ -0,0 +1,5 @@
+TIMESTAMP = 1711690762
+SHA256 (go/databases_timescaledb-tune/timescaledb-tune-v0.16.0/v0.16.0.mod) = bebb2c461ea9e89748067473975e588bb31ee4fd69308d7c597a3e0f3a4f24db
+SIZE (go/databases_timescaledb-tune/timescaledb-tune-v0.16.0/v0.16.0.mod) = 307
+SHA256 (go/databases_timescaledb-tune/timescaledb-tune-v0.16.0/v0.16.0.zip) = bfea7d96773fb1abf95de9ce85e2ec36100666723986848c5c1becc67466d785
+SIZE (go/databases_timescaledb-tune/timescaledb-tune-v0.16.0/v0.16.0.zip) = 86363
diff --git a/databases/timescaledb-tune/pkg-descr b/databases/timescaledb-tune/pkg-descr
new file mode 100644
index 000000000000..9e5c7032a546
--- /dev/null
+++ b/databases/timescaledb-tune/pkg-descr
@@ -0,0 +1,2 @@
+A tool for tuning TimescaleDB for better performance by adjusting settings
+to match your system's CPU and memory resources.
diff --git a/databases/timescaledb/Makefile b/databases/timescaledb/Makefile
index fa783433bac6..bb56429eef9f 100644
--- a/databases/timescaledb/Makefile
+++ b/databases/timescaledb/Makefile
@@ -1,11 +1,10 @@
-# Created by: Kevin Bowling <kbowling@freebsd.org>
-
 PORTNAME=	timescaledb
-PORTVERSION=	2.4.1
+PORTVERSION=	2.14.2
 CATEGORIES=	databases
 
 MAINTAINER=	kbowling@FreeBSD.org
 COMMENT=	Time-series database built on PostgreSQL
+WWW=		https://www.timescale.com/
 
 LICENSE=		APACHE20 TSL
 LICENSE_COMB=		multi
@@ -14,11 +13,13 @@ LICENSE_FILE_APACHE20=	${WRKSRC}/LICENSE-APACHE
 LICENSE_FILE_TSL=	${WRKSRC}/tsl/LICENSE-TIMESCALE
 LICENSE_PERMS_TSL=	dist-mirror pkg-mirror auto-accept
 
-USES=		compiler:c11 cmake pgsql:12,13
+USES=		compiler:c11 cmake gettext-runtime cpe pgsql:13-16
 
 USE_GITHUB=	YES
 GH_ACCOUNT=	timescale
 
+CPE_VENDOR=	timescale
+
 PLIST_SUB=	PORTVERSION=${PORTVERSION}
 SUB_FILES=	pkg-message
 SUB_LIST=	PORTVERSION=${PORTVERSION}
diff --git a/databases/timescaledb/distinfo b/databases/timescaledb/distinfo
index 48dee6246cbb..85f71aca2f24 100644
--- a/databases/timescaledb/distinfo
+++ b/databases/timescaledb/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1629417297
-SHA256 (timescale-timescaledb-2.4.1_GH0.tar.gz) = c0f10378dcaac2bc2f396fcfd3962401cb0f40e4707b3ca6b496cc4c388ab48b
-SIZE (timescale-timescaledb-2.4.1_GH0.tar.gz) = 2401410
+TIMESTAMP = 1711340919
+SHA256 (timescale-timescaledb-2.14.2_GH0.tar.gz) = c7768b267ea67914d0491b28da102faecd317060e429b2da7530517fbc94e73b
+SIZE (timescale-timescaledb-2.14.2_GH0.tar.gz) = 7319288
diff --git a/databases/timescaledb/pkg-descr b/databases/timescaledb/pkg-descr
index 08331bfb0ce3..25d48145820d 100644
--- a/databases/timescaledb/pkg-descr
+++ b/databases/timescaledb/pkg-descr
@@ -1,4 +1,2 @@
 An open-source time-series database optimized for fast ingest and complex
 queries built on PostgreSQL.
-
-WWW: http://www.timescale.com/
diff --git a/databases/timescaledb/pkg-plist b/databases/timescaledb/pkg-plist
index 03d0a58a81af..a2dea40f3f00 100644
--- a/databases/timescaledb/pkg-plist
+++ b/databases/timescaledb/pkg-plist
@@ -1,19 +1,6 @@
 lib/postgresql/timescaledb-%%PORTVERSION%%.so
 %%TSL%%lib/postgresql/timescaledb-tsl-%%PORTVERSION%%.so
 lib/postgresql/timescaledb.so
-share/postgresql/extension/timescaledb--1.7.0--%%PORTVERSION%%.sql
-share/postgresql/extension/timescaledb--1.7.1--%%PORTVERSION%%.sql
-share/postgresql/extension/timescaledb--1.7.2--%%PORTVERSION%%.sql
-share/postgresql/extension/timescaledb--1.7.3--%%PORTVERSION%%.sql
-share/postgresql/extension/timescaledb--1.7.4--%%PORTVERSION%%.sql
-share/postgresql/extension/timescaledb--1.7.5--%%PORTVERSION%%.sql
-share/postgresql/extension/timescaledb--2.0.0-rc1--%%PORTVERSION%%.sql
-share/postgresql/extension/timescaledb--2.0.0-rc2--%%PORTVERSION%%.sql
-share/postgresql/extension/timescaledb--2.0.0-rc3--%%PORTVERSION%%.sql
-share/postgresql/extension/timescaledb--2.0.0-rc4--%%PORTVERSION%%.sql
-share/postgresql/extension/timescaledb--2.0.0--%%PORTVERSION%%.sql
-share/postgresql/extension/timescaledb--2.0.1--%%PORTVERSION%%.sql
-share/postgresql/extension/timescaledb--2.0.2--%%PORTVERSION%%.sql
 share/postgresql/extension/timescaledb--2.1.0--%%PORTVERSION%%.sql
 share/postgresql/extension/timescaledb--2.1.1--%%PORTVERSION%%.sql
 share/postgresql/extension/timescaledb--2.2.0--%%PORTVERSION%%.sql
@@ -21,5 +8,35 @@ share/postgresql/extension/timescaledb--2.2.1--%%PORTVERSION%%.sql
 share/postgresql/extension/timescaledb--2.3.0--%%PORTVERSION%%.sql
 share/postgresql/extension/timescaledb--2.3.1--%%PORTVERSION%%.sql
 share/postgresql/extension/timescaledb--2.4.0--%%PORTVERSION%%.sql
+share/postgresql/extension/timescaledb--2.4.1--%%PORTVERSION%%.sql
+share/postgresql/extension/timescaledb--2.4.2--%%PORTVERSION%%.sql
+share/postgresql/extension/timescaledb--2.5.0--%%PORTVERSION%%.sql
+share/postgresql/extension/timescaledb--2.5.1--%%PORTVERSION%%.sql
+share/postgresql/extension/timescaledb--2.5.2--%%PORTVERSION%%.sql
+share/postgresql/extension/timescaledb--2.6.0--%%PORTVERSION%%.sql
+share/postgresql/extension/timescaledb--2.6.1--%%PORTVERSION%%.sql
+share/postgresql/extension/timescaledb--2.7.0--%%PORTVERSION%%.sql
+share/postgresql/extension/timescaledb--2.7.1--%%PORTVERSION%%.sql
+share/postgresql/extension/timescaledb--2.7.2--%%PORTVERSION%%.sql
+share/postgresql/extension/timescaledb--2.8.0--%%PORTVERSION%%.sql
+share/postgresql/extension/timescaledb--2.8.1--%%PORTVERSION%%.sql
+share/postgresql/extension/timescaledb--2.9.0--%%PORTVERSION%%.sql
+share/postgresql/extension/timescaledb--2.9.1--%%PORTVERSION%%.sql
+share/postgresql/extension/timescaledb--2.9.2--%%PORTVERSION%%.sql
+share/postgresql/extension/timescaledb--2.9.3--%%PORTVERSION%%.sql
+share/postgresql/extension/timescaledb--2.10.0--%%PORTVERSION%%.sql
+share/postgresql/extension/timescaledb--2.10.1--%%PORTVERSION%%.sql
+share/postgresql/extension/timescaledb--2.10.2--%%PORTVERSION%%.sql
+share/postgresql/extension/timescaledb--2.10.3--%%PORTVERSION%%.sql
+share/postgresql/extension/timescaledb--2.11.0--%%PORTVERSION%%.sql
+share/postgresql/extension/timescaledb--2.11.1--%%PORTVERSION%%.sql
+share/postgresql/extension/timescaledb--2.11.2--%%PORTVERSION%%.sql
+share/postgresql/extension/timescaledb--2.12.0--%%PORTVERSION%%.sql
+share/postgresql/extension/timescaledb--2.12.1--%%PORTVERSION%%.sql
+share/postgresql/extension/timescaledb--2.12.2--%%PORTVERSION%%.sql
+share/postgresql/extension/timescaledb--2.13.0--%%PORTVERSION%%.sql
+share/postgresql/extension/timescaledb--2.13.1--%%PORTVERSION%%.sql
+share/postgresql/extension/timescaledb--2.14.0--%%PORTVERSION%%.sql
+share/postgresql/extension/timescaledb--2.14.1--%%PORTVERSION%%.sql
 share/postgresql/extension/timescaledb--%%PORTVERSION%%.sql
 share/postgresql/extension/timescaledb.control
diff --git a/databases/tinycdb/Makefile b/databases/tinycdb/Makefile
index b0e5b6a4ce0b..1d45c7606d04 100644
--- a/databases/tinycdb/Makefile
+++ b/databases/tinycdb/Makefile
@@ -1,13 +1,11 @@
-# Created by: ijliao
-
 PORTNAME=	tinycdb
-PORTVERSION=	0.78
-PORTREVISION=	2
+PORTVERSION=	0.81
 CATEGORIES=	databases
 MASTER_SITES=	http://www.corpit.ru/mjt/tinycdb/
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Analogous to cdb, but faster
+WWW=		https://www.corpit.ru/mjt/tinycdb.html
 
 LICENSE=	PD
 
@@ -15,9 +13,15 @@ USES=		gmake
 
 ALL_TARGET=	static sharedlib
 INSTALL_TARGET=	install install-sharedlib
-MAKE_ARGS=	CC="${CC}" CFLAGS="${CFLAGS}" prefix="${PREFIX}"
+MAKE_ARGS=	CC="${CC}" \
+		CFLAGS="${CFLAGS}" \
+		mandir=${PREFIX}/share/man \
+		pkgconfdir=${PREFIX}/libdata/pkgconfig \
+		prefix=${PREFIX}
 USE_LDCONFIG=	yes
 
+CONFLICTS_INSTALL=	libcdb # lib/libcdb.a
+
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/cdb ${STAGEDIR}${PREFIX}/lib/libcdb.so
 
diff --git a/databases/tinycdb/distinfo b/databases/tinycdb/distinfo
index 71caa0f5de41..4b1544ca80ab 100644
--- a/databases/tinycdb/distinfo
+++ b/databases/tinycdb/distinfo
@@ -1,2 +1,3 @@
-SHA256 (tinycdb-0.78.tar.gz) = 50678f432d8ada8d69f728ec11c3140e151813a7847cf30a62d86f3a720ed63c
-SIZE (tinycdb-0.78.tar.gz) = 36754
+TIMESTAMP = 1708448886
+SHA256 (tinycdb-0.81.tar.gz) = 469de2d445bf54880f652f4b6dc95c7cdf6f5502c35524a45b2122d70d47ebc2
+SIZE (tinycdb-0.81.tar.gz) = 31901
diff --git a/databases/tinycdb/pkg-descr b/databases/tinycdb/pkg-descr
index 2d5142141be7..0c253e67973a 100644
--- a/databases/tinycdb/pkg-descr
+++ b/databases/tinycdb/pkg-descr
@@ -1,5 +1,3 @@
 It is analogous to cdb from D.J.Berstein, but written completely from scratch,
 has some functionality removed and some new added compared to DJB's one, a bit
 faster, and much easier to use (only one library needed at link time).
-
-WWW: http://www.corpit.ru/mjt/tinycdb.html
diff --git a/databases/tinycdb/pkg-plist b/databases/tinycdb/pkg-plist
index 1f72bb8a1369..ce8608509bef 100644
--- a/databases/tinycdb/pkg-plist
+++ b/databases/tinycdb/pkg-plist
@@ -3,6 +3,7 @@ include/cdb.h
 lib/libcdb.a
 lib/libcdb.so
 lib/libcdb.so.1
-man/man1/cdb.1.gz
-man/man3/cdb.3.gz
-man/man5/cdb.5.gz
+libdata/pkgconfig/libcdb.pc
+share/man/man1/cdb.1.gz
+share/man/man3/cdb.3.gz
+share/man/man5/cdb.5.gz
diff --git a/databases/tokyocabinet/Makefile b/databases/tokyocabinet/Makefile
index 3818bb5fc299..954d73615755 100644
--- a/databases/tokyocabinet/Makefile
+++ b/databases/tokyocabinet/Makefile
@@ -1,18 +1,19 @@
-# Created by: Gea-Suan Lin <gslin@gslin.org>
-
 PORTNAME=	tokyocabinet
 PORTVERSION=	1.4.48
+PORTREVISION=	1
 CATEGORIES=	databases
 MASTER_SITES=	LOCAL/kuriyama \
 		https://dbmx.net/${PORTNAME}/
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Modern implementation of DBM
+WWW=		https://dbmx.net/tokyocabinet/
 
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 GNU_CONFIGURE=	yes
+GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
 USES=		pathfix gmake
 USE_LDCONFIG=	yes
 
diff --git a/databases/tokyocabinet/pkg-descr b/databases/tokyocabinet/pkg-descr
index af2fb39f86c7..233a879a63c5 100644
--- a/databases/tokyocabinet/pkg-descr
+++ b/databases/tokyocabinet/pkg-descr
@@ -4,5 +4,3 @@ key and a value. Every key and value is serial bytes with variable
 length. Both binary data and character string can be used as a key and
 a value. There is neither concept of data tables nor data types.
 Records are organized in hash table or B+ tree.
-
-WWW: https://dbmx.net/tokyocabinet/
diff --git a/databases/tokyocabinet/pkg-plist b/databases/tokyocabinet/pkg-plist
index 5a5870b37444..f29e6a8ad9a2 100644
--- a/databases/tokyocabinet/pkg-plist
+++ b/databases/tokyocabinet/pkg-plist
@@ -28,34 +28,34 @@ lib/libtokyocabinet.a
 %%SHARED%%lib/libtokyocabinet.so.%%SHLIB_VER%%
 libdata/pkgconfig/tokyocabinet.pc
 libexec/tcawmgr.cgi
-man/man1/tcamgr.1.gz
-man/man1/tcamttest.1.gz
-man/man1/tcatest.1.gz
-man/man1/tcbmgr.1.gz
-man/man1/tcbmttest.1.gz
-man/man1/tcbtest.1.gz
-man/man1/tcfmgr.1.gz
-man/man1/tcfmttest.1.gz
-man/man1/tcftest.1.gz
-man/man1/tchmgr.1.gz
-man/man1/tchmttest.1.gz
-man/man1/tchtest.1.gz
-man/man1/tctmgr.1.gz
-man/man1/tctmttest.1.gz
-man/man1/tcttest.1.gz
-man/man1/tcucodec.1.gz
-man/man1/tcumttest.1.gz
-man/man1/tcutest.1.gz
-man/man3/tcadb.3.gz
-man/man3/tcbdb.3.gz
-man/man3/tcfdb.3.gz
-man/man3/tchdb.3.gz
-man/man3/tclist.3.gz
-man/man3/tcmap.3.gz
-man/man3/tcmdb.3.gz
-man/man3/tcmpool.3.gz
-man/man3/tctdb.3.gz
-man/man3/tctree.3.gz
-man/man3/tcutil.3.gz
-man/man3/tcxstr.3.gz
-man/man3/tokyocabinet.3.gz
+share/man/man1/tcamgr.1.gz
+share/man/man1/tcamttest.1.gz
+share/man/man1/tcatest.1.gz
+share/man/man1/tcbmgr.1.gz
+share/man/man1/tcbmttest.1.gz
+share/man/man1/tcbtest.1.gz
+share/man/man1/tcfmgr.1.gz
+share/man/man1/tcfmttest.1.gz
+share/man/man1/tcftest.1.gz
+share/man/man1/tchmgr.1.gz
+share/man/man1/tchmttest.1.gz
+share/man/man1/tchtest.1.gz
+share/man/man1/tctmgr.1.gz
+share/man/man1/tctmttest.1.gz
+share/man/man1/tcttest.1.gz
+share/man/man1/tcucodec.1.gz
+share/man/man1/tcumttest.1.gz
+share/man/man1/tcutest.1.gz
+share/man/man3/tcadb.3.gz
+share/man/man3/tcbdb.3.gz
+share/man/man3/tcfdb.3.gz
+share/man/man3/tchdb.3.gz
+share/man/man3/tclist.3.gz
+share/man/man3/tcmap.3.gz
+share/man/man3/tcmdb.3.gz
+share/man/man3/tcmpool.3.gz
+share/man/man3/tctdb.3.gz
+share/man/man3/tctree.3.gz
+share/man/man3/tcutil.3.gz
+share/man/man3/tcxstr.3.gz
+share/man/man3/tokyocabinet.3.gz
diff --git a/databases/tokyotyrant/Makefile b/databases/tokyotyrant/Makefile
index 1b66a86e9c65..9a6e4194636a 100644
--- a/databases/tokyotyrant/Makefile
+++ b/databases/tokyotyrant/Makefile
@@ -1,13 +1,12 @@
-# Created by: Gea-Suan Lin <gslin@gslin.org>
-
 PORTNAME=	tokyotyrant
 PORTVERSION=	1.1.41
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	databases
 MASTER_SITES=	https://dbmx.net/tokyotyrant/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Network interface of Tokyo Cabinet
+WWW=		https://dbmx.net/tokyotyrant/
 
 BUILD_DEPENDS=	tokyocabinet>=1.4.20:databases/tokyocabinet
 LIB_DEPENDS=	libtokyocabinet.so:databases/tokyocabinet
@@ -15,6 +14,7 @@ LIB_DEPENDS=	libtokyocabinet.so:databases/tokyocabinet
 USES=		gmake localbase pathfix
 
 GNU_CONFIGURE=	yes
+GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
 USE_LDCONFIG=	yes
 USE_RC_SUBR=	ttserver
 
diff --git a/databases/tokyotyrant/pkg-descr b/databases/tokyotyrant/pkg-descr
index a645b1a928a1..06636f0b0f42 100644
--- a/databases/tokyotyrant/pkg-descr
+++ b/databases/tokyotyrant/pkg-descr
@@ -5,5 +5,3 @@ processes access the database. Thus, Tokyo Tyrant is provided for
 concurrent and remote connections to Tokyo Cabinet. It is composed of
 the server process managing a database and its access library for
 client applications.
-
-WWW: https://dbmx.net/tokyotyrant/
diff --git a/databases/tokyotyrant/pkg-plist b/databases/tokyotyrant/pkg-plist
index 1f15514d545d..b0e16d7bc2d4 100644
--- a/databases/tokyotyrant/pkg-plist
+++ b/databases/tokyotyrant/pkg-plist
@@ -28,13 +28,13 @@ lib/ttskelnull.so
 lib/ttskelproxy.so
 libdata/pkgconfig/tokyotyrant.pc
 sbin/ttservctl
-man/man1/tcrmgr.1.gz
-man/man1/tcrmttest.1.gz
-man/man1/tcrtest.1.gz
-man/man1/ttserver.1.gz
-man/man1/ttulmgr.1.gz
-man/man1/ttultest.1.gz
-man/man3/tcrdb.3.gz
-man/man3/tculog.3.gz
-man/man3/ttutil.3.gz
-man/man8/ttservctl.8.gz
+share/man/man1/tcrmgr.1.gz
+share/man/man1/tcrmttest.1.gz
+share/man/man1/tcrtest.1.gz
+share/man/man1/ttserver.1.gz
+share/man/man1/ttulmgr.1.gz
+share/man/man1/ttultest.1.gz
+share/man/man3/tcrdb.3.gz
+share/man/man3/tculog.3.gz
+share/man/man3/ttutil.3.gz
+share/man/man8/ttservctl.8.gz
diff --git a/databases/trilogy/Makefile b/databases/trilogy/Makefile
new file mode 100644
index 000000000000..547196cb9e9e
--- /dev/null
+++ b/databases/trilogy/Makefile
@@ -0,0 +1,24 @@
+PORTNAME=	trilogy
+PORTVERSION=	2.8.0
+DISTVERSIONPREFIX=	v
+CATEGORIES=	databases
+
+MAINTAINER=	sunpoet@FreeBSD.org
+COMMENT=	Client library for MySQL-compatible database servers
+WWW=		https://github.com/trilogy-libraries/trilogy
+
+LICENSE=	MIT
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
+USES=		gmake ssl
+
+USE_GITHUB=	yes
+GH_ACCOUNT=	trilogy-libraries
+
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/example/trilogy_query ${STAGEDIR}${PREFIX}/bin/
+	cd ${WRKSRC}/inc/ && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/include/
+	${INSTALL_DATA} ${WRKSRC}/libtrilogy.a ${STAGEDIR}${PREFIX}/lib/
+	${INSTALL_LIB} ${WRKSRC}/libtrilogy.so ${STAGEDIR}${PREFIX}/lib/
+
+.include <bsd.port.mk>
diff --git a/databases/trilogy/distinfo b/databases/trilogy/distinfo
new file mode 100644
index 000000000000..e20393047378
--- /dev/null
+++ b/databases/trilogy/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1712734007
+SHA256 (trilogy-libraries-trilogy-v2.8.0_GH0.tar.gz) = e3359abe32bf863dd66fa7ddffff658a9694dce1409b6258c492c0bf72f57c03
+SIZE (trilogy-libraries-trilogy-v2.8.0_GH0.tar.gz) = 184873
diff --git a/databases/trilogy/files/patch-Makefile b/databases/trilogy/files/patch-Makefile
new file mode 100644
index 000000000000..591bd4280d91
--- /dev/null
+++ b/databases/trilogy/files/patch-Makefile
@@ -0,0 +1,24 @@
+--- Makefile.orig	2023-09-18 20:57:42 UTC
++++ Makefile
+@@ -21,16 +21,19 @@ else
+ endif
+ 
+ .PHONY: all
+-all: libtrilogy.a examples
++all: libtrilogy.a libtrilogy.so examples
+ 
+ .PHONY: examples
+ examples: $(EXAMPLES)
+ 
+-example/%: example/%.c libtrilogy.a
++example/%: example/%.c libtrilogy.so
+ 	$(CC) -o $@ $(CFLAGS) -pedantic $(LDFLAGS) $^ $(OPENSSL)
+ 
+ libtrilogy.a: $(OBJS)
+ 	$(AR) r $@ $^
++
++libtrilogy.so: $(OBJS)
++	$(CC) -shared $^ -o $@
+ 
+ %.o: %.c inc/trilogy/*.h
+ 	$(CC) -o $@ $(CFLAGS) -pedantic -c $<
diff --git a/databases/trilogy/pkg-descr b/databases/trilogy/pkg-descr
new file mode 100644
index 000000000000..3c677b5465ba
--- /dev/null
+++ b/databases/trilogy/pkg-descr
@@ -0,0 +1,17 @@
+Trilogy is a client library for MySQL-compatible database servers, designed for
+performance, flexibility, and ease of embedding.
+
+It's currently in production use on github.com.
+
+Features:
+- Supports the most frequently used parts of the text protocol
+  - Handshake
+  - Password authentication
+  - Query, ping, and quit commands
+- Support prepared statements (binary protocol)
+- Low-level protocol API completely decoupled from IO
+- Non-blocking client API wrapping the protocol API
+- Blocking client API wrapping the non-blocking API
+- No dependencies outside of POSIX, the C standard library & OpenSSL
+- Minimal dynamic allocation
+- MIT licensed
diff --git a/databases/trilogy/pkg-plist b/databases/trilogy/pkg-plist
new file mode 100644
index 000000000000..a75a94cfd941
--- /dev/null
+++ b/databases/trilogy/pkg-plist
@@ -0,0 +1,16 @@
+bin/trilogy_query
+include/trilogy.h
+include/trilogy/blocking.h
+include/trilogy/buffer.h
+include/trilogy/builder.h
+include/trilogy/charset.h
+include/trilogy/client.h
+include/trilogy/error.h
+include/trilogy/packet_parser.h
+include/trilogy/protocol.h
+include/trilogy/reader.h
+include/trilogy/socket.h
+include/trilogy/vendor/curl_hostcheck.h
+include/trilogy/vendor/openssl_hostname_validation.h
+lib/libtrilogy.a
+lib/libtrilogy.so
diff --git a/databases/tsearch_extras/Makefile b/databases/tsearch_extras/Makefile
index 3212561812ad..97f696c85d68 100644
--- a/databases/tsearch_extras/Makefile
+++ b/databases/tsearch_extras/Makefile
@@ -5,6 +5,7 @@ CATEGORIES=	databases
 
 MAINTAINER=	rm@FreeBSD.org
 COMMENT=	Functions for getting lower-level data about full text search
+WWW=		https://github.com/zulip/tsearch_extras
 
 LICENSE=	PostgreSQL
 LICENSE_FILE=	${WRKSRC}/COPYRIGHT
diff --git a/databases/tsearch_extras/pkg-descr b/databases/tsearch_extras/pkg-descr
index 9a47f1f00245..3d2a10719c50 100644
--- a/databases/tsearch_extras/pkg-descr
+++ b/databases/tsearch_extras/pkg-descr
@@ -1,4 +1,2 @@
 The package provides a few PostgreSQL functions that allow you to get at
 lower-level data about full text search.
-
-WWW: https://github.com/zulip/tsearch_extras
diff --git a/databases/tuning-primer/Makefile b/databases/tuning-primer/Makefile
index 29b06aaccd2f..777bb7c15a52 100644
--- a/databases/tuning-primer/Makefile
+++ b/databases/tuning-primer/Makefile
@@ -1,5 +1,3 @@
-# Created by: Joe Horn <joehorn@gmail.com>
-
 PORTNAME=	tuning-primer
 PORTVERSION=	1.6.r1
 CATEGORIES=	databases
@@ -11,6 +9,7 @@ EXTRACT_ONLY=	# empty
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	MySQL performance tuning primer script
+WWW=		https://launchpad.net/mysql-tuning-primer
 
 LICENSE=	GPLv2
 
diff --git a/databases/tuning-primer/pkg-descr b/databases/tuning-primer/pkg-descr
index 0172b44ca4bc..98c621c4ae1e 100644
--- a/databases/tuning-primer/pkg-descr
+++ b/databases/tuning-primer/pkg-descr
@@ -3,5 +3,3 @@ and "SHOW VARIABLES LIKE..." then attempts to produce
 sane recommendations for tuning server variables.
 
 It is compatible with all versions of MySQL 3.23 - 5.1.
-
-WWW: https://launchpad.net/mysql-tuning-primer
diff --git a/databases/twemproxy/Makefile b/databases/twemproxy/Makefile
index f5668d9ff03f..7b3569464149 100644
--- a/databases/twemproxy/Makefile
+++ b/databases/twemproxy/Makefile
@@ -1,11 +1,11 @@
-# Created by: Steven Kreuzer <skreuzer@FreeBSD.org>
-
 PORTNAME=	twemproxy
 PORTVERSION=	0.5.0
+PORTREVISION=	1
 CATEGORIES=	databases
 
 MAINTAINER=	skreuzer@FreeBSD.org
 COMMENT=	Fast, light-weight proxy for memcached and redis
+WWW=		https://github.com/twitter/twemproxy
 
 LICENSE=	APACHE20
 
@@ -17,14 +17,14 @@ GH_ACCOUNT=	twitter
 LDFLAGS+=	-lexecinfo
 
 PLIST_FILES=	sbin/nutcracker \
-		man/man8/nutcracker.8.gz \
+		share/man/man8/nutcracker.8.gz \
 		etc/nutcracker.yml.sample
 
 HAS_CONFIGURE=	yes
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/nutcracker ${STAGEDIR}${PREFIX}/sbin
-	${INSTALL_MAN} ${WRKSRC}/man/nutcracker.8 ${STAGEDIR}${MANPREFIX}/man/man8/
+	${INSTALL_MAN} ${WRKSRC}/man/nutcracker.8 ${STAGEDIR}${PREFIX}/share/man/man8/
 	${INSTALL_DATA} ${WRKSRC}/conf/nutcracker.yml ${STAGEDIR}${PREFIX}/etc/nutcracker.yml.sample
 
 .include <bsd.port.mk>
diff --git a/databases/twemproxy/pkg-descr b/databases/twemproxy/pkg-descr
index 4c309b9a78a9..f831bd618b04 100644
--- a/databases/twemproxy/pkg-descr
+++ b/databases/twemproxy/pkg-descr
@@ -1,5 +1,3 @@
 twemproxy, aka nutcracker is a fast and lightweight proxy for memcached and
 redis protocol. It was primarily built to reduce the connection count on the
 backend caching serve
-
-WWW: https://github.com/twitter/twemproxy
diff --git a/databases/unixODBC/Makefile b/databases/unixODBC/Makefile
index 6e5a86316615..7cc274e40626 100644
--- a/databases/unixODBC/Makefile
+++ b/databases/unixODBC/Makefile
@@ -1,13 +1,13 @@
-# Created by: Nick Sayer <nsayer@FreeBSD.org>
-
 PORTNAME=	unixODBC
-PORTVERSION=	2.3.9
+PORTVERSION=	2.3.12
+PORTREVISION=	1
 CATEGORIES=	databases
 MASTER_SITES=	http://www.unixodbc.org/ \
 		ftp://ftp.unixodbc.org/pub/unixODBC/
 
 MAINTAINER=	brnrd@FreeBSD.org
 COMMENT=	ODBC library suite for Unix
+WWW=		http://www.unixodbc.org/
 
 LICENSE=	GPLv2 LGPL21
 LICENSE_COMB=	multi
@@ -15,6 +15,7 @@ LICENSE_COMB=	multi
 OPTIONS_DEFINE=	DOCS
 
 GNU_CONFIGURE=	yes
+GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
 CONFIGURE_ENV=	ac_cv_header_msql_h=no
 CONFIGURE_ARGS=	--enable-static --enable-shared \
 		${ICONV_CONFIGURE_ARG}
diff --git a/databases/unixODBC/distinfo b/databases/unixODBC/distinfo
index fc5e26b853c9..4c90b1f936ca 100644
--- a/databases/unixODBC/distinfo
+++ b/databases/unixODBC/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1608086166
-SHA256 (unixODBC-2.3.9.tar.gz) = 52833eac3d681c8b0c9a5a65f2ebd745b3a964f208fc748f977e44015a31b207
-SIZE (unixODBC-2.3.9.tar.gz) = 1676145
+TIMESTAMP = 1703846675
+SHA256 (unixODBC-2.3.12.tar.gz) = f210501445ce21bf607ba51ef8c125e10e22dffdffec377646462df5f01915ec
+SIZE (unixODBC-2.3.12.tar.gz) = 1753915
diff --git a/databases/unixODBC/pkg-descr b/databases/unixODBC/pkg-descr
index f0e9160091d6..e1d6e7845b80 100644
--- a/databases/unixODBC/pkg-descr
+++ b/databases/unixODBC/pkg-descr
@@ -10,5 +10,3 @@ What is ODBC?
 ODBC is an open specification for providing application developers with
 a predictable API with which to access Data Sources. Data Sources include
 SQL Servers and any Data Source with an ODBC Driver.
-
-WWW: http://www.unixodbc.org/
diff --git a/databases/unixODBC/pkg-plist b/databases/unixODBC/pkg-plist
index 10f1f8b0427f..a8f478231982 100644
--- a/databases/unixODBC/pkg-plist
+++ b/databases/unixODBC/pkg-plist
@@ -14,7 +14,8 @@ include/sqlext.h
 include/sqlspi.h
 include/sqltypes.h
 include/sqlucode.h
-include/unixodbc_conf.h
+include/unixODBC/unixodbc_conf.h
+include/unixodbc.h
 include/uodbc_extras.h
 include/uodbc_stats.h
 lib/libodbc.a
@@ -35,12 +36,12 @@ lib/libodbcinst.so.2.0.0
 libdata/pkgconfig/odbc.pc
 libdata/pkgconfig/odbccr.pc
 libdata/pkgconfig/odbcinst.pc
-man/man1/dltest.1.gz
-man/man1/isql.1.gz
-man/man1/iusql.1.gz
-man/man1/odbc_config.1.gz
-man/man1/odbcinst.1.gz
-man/man5/odbc.ini.5.gz
-man/man5/odbcinst.ini.5.gz
-man/man7/unixODBC.7.gz
+share/man/man1/dltest.1.gz
+share/man/man1/isql.1.gz
+share/man/man1/iusql.1.gz
+share/man/man1/odbc_config.1.gz
+share/man/man1/odbcinst.1.gz
+share/man/man5/odbc.ini.5.gz
+share/man/man5/odbcinst.ini.5.gz
+share/man/man7/unixODBC.7.gz
 @dir etc/ODBCDataSources
diff --git a/databases/usql/Makefile b/databases/usql/Makefile
index 6f140fe87483..106c47f131a1 100644
--- a/databases/usql/Makefile
+++ b/databases/usql/Makefile
@@ -1,15 +1,17 @@
 PORTNAME=	usql
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.9.4
+DISTVERSION=	0.18.1
+PORTREVISION=	1
 CATEGORIES=	databases
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Universal command-line interface for SQL databases
+WWW=		https://github.com/xo/usql
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-USES=		go:modules
+USES=		go:1.22,modules
 
 GO_MODULE=	github.com/xo/usql
 
diff --git a/databases/usql/distinfo b/databases/usql/distinfo
index 21ac22aab33c..bb9945d3a5c2 100644
--- a/databases/usql/distinfo
+++ b/databases/usql/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1631860966
-SHA256 (go/databases_usql/usql-v0.9.4/v0.9.4.mod) = 2fa14772f3a4f8663fb40391554086dc5841b446ed8f96fe11edd57479c1aede
-SIZE (go/databases_usql/usql-v0.9.4/v0.9.4.mod) = 5527
-SHA256 (go/databases_usql/usql-v0.9.4/v0.9.4.zip) = 369662f7c1d72020dfbbec02d29cc4da905b5bc6a86d1ba109cd22bc0381c725
-SIZE (go/databases_usql/usql-v0.9.4/v0.9.4.zip) = 314318
+TIMESTAMP = 1711741460
+SHA256 (go/databases_usql/usql-v0.18.1/v0.18.1.mod) = dec4e65c39d5bcb0c788727998aff2221dae41f969c5b37b2a0d420f447ef5e8
+SIZE (go/databases_usql/usql-v0.18.1/v0.18.1.mod) = 17101
+SHA256 (go/databases_usql/usql-v0.18.1/v0.18.1.zip) = e59ab573c3e0c27a393cd7eaf355e4e4b94b5dc2538033ec4558195d2b95edea
+SIZE (go/databases_usql/usql-v0.18.1/v0.18.1.zip) = 375507
diff --git a/databases/usql/pkg-descr b/databases/usql/pkg-descr
index dd6e4e29ede5..37feb5e303ca 100644
--- a/databases/usql/pkg-descr
+++ b/databases/usql/pkg-descr
@@ -6,5 +6,3 @@ Database administrators and developers that would prefer to work with
 non-PostgreSQL databases with a tool like psql, will find usql intuitive,
 easy-to-use, and a great replacement for the command-line clients/tools
 available for other databases.
-
-WWW: https://github.com/xo/usql
diff --git a/databases/valkey/Makefile b/databases/valkey/Makefile
new file mode 100644
index 000000000000..e498f13a9237
--- /dev/null
+++ b/databases/valkey/Makefile
@@ -0,0 +1,69 @@
+PORTNAME=	valkey
+DISTVERSION=	7.2.5
+CATEGORIES=	databases
+
+MAINTAINER=	yasu@FreeBSD.org
+COMMENT=	High-performance data structure server that primarily serves key/value workloads
+WWW=		https://valkey.io/
+
+LICENSE=	BSD3CLAUSE
+LICENSE_FILE=	${WRKSRC}/COPYING
+
+USES=		gmake pkgconfig tcl:test
+USE_GITHUB=	yes
+GH_ACCOUNT=	valkey-io
+USE_RC_SUBR=	valkey valkeysentinel
+
+MAKE_ENV=	OPTIMIZATION= \
+		V=1
+
+LDFLAGS+=	-lpthread -lm -lexecinfo
+
+SUB_FILES=	pkg-message
+SUB_LIST+=	PORTNAME=${PORTNAME} \
+		VALKEY_DBDIR=${VALKEY_DBDIR} \
+		VALKEY_LOGDIR=${VALKEY_LOGDIR} \
+		VALKEY_RUNDIR=${VALKEY_RUNDIR} \
+		VALKEY_USER=${USERS}
+
+USERS=		valkey
+GROUPS=		valkey
+
+PLIST_SUB+=	VALKEY_DBDIR=${VALKEY_DBDIR} \
+		VALKEY_GROUP=${GROUPS} \
+		VALKEY_LOGDIR=${VALKEY_LOGDIR} \
+		VALKEY_RUNDIR=${VALKEY_RUNDIR} \
+		VALKEY_USER=${USERS}
+
+OPTIONS_DEFINE=		JEMALLOC TLS
+OPTIONS_DEFAULT=	TLS
+OPTIONS_SUB=		yes
+
+JEMALLOC_DESC=	Use jemalloc
+TLS_DESC=	Use TLS
+
+JEMALLOC_MAKE_ENV=	MALLOC=jemalloc
+TLS_USES=		ssl
+TLS_MAKE_ENV=		BUILD_TLS=yes
+
+VALKEY_DBDIR?=	/var/db/valkey
+VALKEY_RUNDIR?=	/var/run/valkey
+VALKEY_LOGDIR?=	/var/log/valkey
+
+post-build:
+	${SED} ${SUB_LIST:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
+		${WRKSRC}/valkey.conf > ${WRKDIR}/valkey.conf
+	${SED} ${SUB_LIST:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
+		${WRKSRC}/sentinel.conf > ${WRKDIR}/valkey-sentinel.conf
+
+post-install:
+	${INSTALL_DATA} ${WRKDIR}/valkey.conf ${STAGEDIR}${PREFIX}/etc/valkey.conf.sample
+	${INSTALL_DATA} ${WRKDIR}/valkey-sentinel.conf ${STAGEDIR}${PREFIX}/etc/valkey-sentinel.conf.sample
+	${MKDIR} ${STAGEDIR}${VALKEY_LOGDIR} \
+		${STAGEDIR}${VALKEY_DBDIR} \
+		${STAGEDIR}${VALKEY_RUNDIR}
+
+do-test:
+	@cd ${WRKSRC} && ${TCLSH} tests/test_helper.tcl
+
+.include <bsd.port.mk>
diff --git a/databases/valkey/distinfo b/databases/valkey/distinfo
new file mode 100644
index 000000000000..ff9c571ed2c6
--- /dev/null
+++ b/databases/valkey/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1713663446
+SHA256 (valkey-io-valkey-7.2.5_GH0.tar.gz) = c7c7a758edabe7693b3692db58fe5328130036b06224df64ab1f0c12fe265a76
+SIZE (valkey-io-valkey-7.2.5_GH0.tar.gz) = 3420515
diff --git a/databases/valkey/files/patch-deps-Makefile b/databases/valkey/files/patch-deps-Makefile
new file mode 100644
index 000000000000..003ae439c2c5
--- /dev/null
+++ b/databases/valkey/files/patch-deps-Makefile
@@ -0,0 +1,21 @@
+--- deps/Makefile.orig	2024-04-01 02:56:24 UTC
++++ deps/Makefile
+@@ -84,7 +84,7 @@ else
+ ifeq ($(LUA_DEBUG),yes)
+ 	LUA_CFLAGS+= -O0 -g -DLUA_USE_APICHECK
+ else
+-	LUA_CFLAGS+= -O2 
++	LUA_CFLAGS+=
+ endif
+ ifeq ($(LUA_COVERAGE),yes)
+ 	LUA_CFLAGS += -fprofile-arcs -ftest-coverage
+@@ -112,7 +112,7 @@ jemalloc: .make-prerequisites
+ 
+ jemalloc: .make-prerequisites
+ 	@printf '%b %b\n' $(MAKECOLOR)MAKE$(ENDCOLOR) $(BINCOLOR)$@$(ENDCOLOR)
+-	cd jemalloc && ./configure --disable-cxx --with-version=5.3.0-0-g0 --with-lg-quantum=3 --disable-cache-oblivious --with-jemalloc-prefix=je_ CFLAGS="$(JEMALLOC_CFLAGS)" LDFLAGS="$(JEMALLOC_LDFLAGS)" $(JEMALLOC_CONFIGURE_OPTS)
+-	cd jemalloc && $(MAKE) lib/libjemalloc.a
++	cd jemalloc && ./configure --disable-cxx --with-version=5.3.0-0-g0 --with-lg-quantum=3 --disable-cache-oblivious --with-jemalloc-prefix=je_ CFLAGS="$(JEMALLOC_CFLAGS)" CXXFLAGS="$(JEMALLOC_CFLAGS)" LDFLAGS="$(JEMALLOC_LDFLAGS)" $(JEMALLOC_CONFIGURE_OPTS)
++	cd jemalloc && $(MAKE) CFLAGS="$(JEMALLOC_CFLAGS)" CXXFLAGS="$(JEMALLOC_CFLAGS)" LDFLAGS="$(JEMALLOC_LDFLAGS)" lib/libjemalloc.a
+ 
+ .PHONY: jemalloc
diff --git a/databases/valkey/files/patch-deps-hiredis-Makefile b/databases/valkey/files/patch-deps-hiredis-Makefile
new file mode 100644
index 000000000000..a2789076673c
--- /dev/null
+++ b/databases/valkey/files/patch-deps-hiredis-Makefile
@@ -0,0 +1,41 @@
+--- deps/hiredis/Makefile.orig	2023-07-30 05:48:29 UTC
++++ deps/hiredis/Makefile
+@@ -15,7 +15,7 @@ HIREDIS_PATCH=$(shell grep HIREDIS_PATCH hiredis.h | a
+ HIREDIS_SONAME=$(shell grep HIREDIS_SONAME hiredis.h | awk '{print $$3}')
+ 
+ # Installation related variables and target
+-PREFIX?=/usr/local
++PREFIX?=${PREFIX}
+ INCLUDE_PATH?=include/hiredis
+ LIBRARY_PATH?=lib
+ PKGCONF_PATH?=pkgconfig
+@@ -38,10 +38,8 @@ export REDIS_TEST_CONFIG
+ # Fallback to gcc when $CC is not in $PATH.
+ CC:=$(shell sh -c 'type $${CC%% *} >/dev/null 2>/dev/null && echo $(CC) || echo gcc')
+ CXX:=$(shell sh -c 'type $${CXX%% *} >/dev/null 2>/dev/null && echo $(CXX) || echo g++')
+-OPTIMIZATION?=-O3
+ WARNINGS=-Wall -Wextra -Werror -Wstrict-prototypes -Wwrite-strings -Wno-missing-field-initializers
+-DEBUG_FLAGS?= -g -ggdb
+-REAL_CFLAGS=$(OPTIMIZATION) -fPIC $(CPPFLAGS) $(CFLAGS) $(WARNINGS) $(DEBUG_FLAGS) $(PLATFORM_FLAGS)
++REAL_CFLAGS=$(OPTIMIZATION) -fPIC $(CFLAGS) $(WARNINGS) $(DEBUG_FLAGS) $(PLATFORM_FLAGS)
+ REAL_LDFLAGS=$(LDFLAGS)
+ 
+ DYLIBSUFFIX=so
+@@ -122,7 +120,16 @@ ifeq ($(uname_S),FreeBSD)
+ else
+   REAL_CFLAGS+=-pedantic
+ endif
+-
++ifeq ($(uname_S),FreeBSD)
++  CFLAGS?=$(CFLAGS)
++  CCLINK?=pthread
++  LDFLAGS?=-L. -Wl,-rpath,.
++  DYLIBNAME?=libhiredis.so
++  DYLIB_MAKE_CMD?=$(CC) -o ${DYLIBNAME} ${OBJ}
++  STLIBNAME?=libhiredis.a
++  STLIB_MAKE_CMD?=ar rcs ${STLIBNAME} ${OBJ}
++  SSL_LDFLAGS+=${OPENSSL_LDFLAGS}
++endif
+ ifeq ($(uname_S),SunOS)
+   IS_SUN_CC=$(shell sh -c '$(CC) -V 2>&1 |egrep -i -c "sun|studio"')
+   ifeq ($(IS_SUN_CC),1)
diff --git a/databases/valkey/files/patch-deps-hiredis-net.c b/databases/valkey/files/patch-deps-hiredis-net.c
new file mode 100644
index 000000000000..434ebf0e81a4
--- /dev/null
+++ b/databases/valkey/files/patch-deps-hiredis-net.c
@@ -0,0 +1,39 @@
+--- deps/hiredis/net.c.orig	2024-04-01 02:56:24 UTC
++++ deps/hiredis/net.c
+@@ -185,14 +185,34 @@ int redisKeepAlive(redisContext *c, int interval) {
+         __redisSetError(c,REDIS_ERR_OTHER,strerror(errno));
+         return REDIS_ERR;
+     }
+-#else
+-#if defined(__GLIBC__) && !defined(__FreeBSD_kernel__)
++#elif defined(__GLIBC__)
+     if (setsockopt(fd, IPPROTO_TCP, TCP_KEEPIDLE, &val, sizeof(val)) < 0) {
+         __redisSetError(c,REDIS_ERR_OTHER,strerror(errno));
+         return REDIS_ERR;
+     }
+ 
+     val = interval/3;
++    if (val == 0) val = 1;
++    if (setsockopt(fd, IPPROTO_TCP, TCP_KEEPINTVL, &val, sizeof(val)) < 0) {
++        __redisSetError(c,REDIS_ERR_OTHER,strerror(errno));
++        return REDIS_ERR;
++    }
++
++    val = 3;
++    if (setsockopt(fd, IPPROTO_TCP, TCP_KEEPCNT, &val, sizeof(val)) < 0) {
++        __redisSetError(c,REDIS_ERR_OTHER,strerror(errno));
++        return REDIS_ERR;
++    }
++#else
++#if !defined(__sun) && defined(TCP_KEEPIDLE) && defined(TCP_KEEPINTL) && \
++    defined(TCP_KEEPCNT)
++    val = interval;
++    if (setsockopt(fd, IPPROTO_TCP, TCP_KEEPIDLE, &val, sizeof(val)) < 0) {
++        __redisSetError(c,REDIS_ERR_OTHER,strerror(errno));
++        return REDIS_ERR;
++    }
++
++    val = internal/3;
+     if (val == 0) val = 1;
+     if (setsockopt(fd, IPPROTO_TCP, TCP_KEEPINTVL, &val, sizeof(val)) < 0) {
+         __redisSetError(c,REDIS_ERR_OTHER,strerror(errno));
diff --git a/databases/valkey/files/patch-deps-linenoise-Makefile b/databases/valkey/files/patch-deps-linenoise-Makefile
new file mode 100644
index 000000000000..aef0f10966af
--- /dev/null
+++ b/databases/valkey/files/patch-deps-linenoise-Makefile
@@ -0,0 +1,15 @@
+--- deps/linenoise/Makefile.orig	2019-09-25 10:40:18 UTC
++++ deps/linenoise/Makefile
+@@ -1,10 +1,10 @@
+ STD=
+ WARN= -Wall
+-OPT= -Os
++#OPT= -Os
+ 
+ R_CFLAGS= $(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS)
+ R_LDFLAGS= $(LDFLAGS)
+-DEBUG= -g
++#DEBUG= -g
+ 
+ R_CC=$(CC) $(R_CFLAGS)
+ R_LD=$(CC) $(R_LDFLAGS)
diff --git a/databases/valkey/files/patch-deps_lua_src_lua__cjson.c b/databases/valkey/files/patch-deps_lua_src_lua__cjson.c
new file mode 100644
index 000000000000..55f700aee7f3
--- /dev/null
+++ b/databases/valkey/files/patch-deps_lua_src_lua__cjson.c
@@ -0,0 +1,12 @@
+--- deps/lua/src/lua_cjson.c.orig	2024-04-01 02:56:24 UTC
++++ deps/lua/src/lua_cjson.c
+@@ -47,7 +47,9 @@
+ #include "strbuf.h"
+ #include "fpconv.h"
+ 
++#if defined(__sun)
+ #include "../../../src/solarisfixes.h"
++#endif
+ 
+ #ifndef CJSON_MODNAME
+ #define CJSON_MODNAME   "cjson"
diff --git a/databases/valkey/files/patch-sentinel.conf b/databases/valkey/files/patch-sentinel.conf
new file mode 100644
index 000000000000..8f26502b8146
--- /dev/null
+++ b/databases/valkey/files/patch-sentinel.conf
@@ -0,0 +1,26 @@
+--- sentinel.conf.orig	2024-04-16 04:18:47 UTC
++++ sentinel.conf
+@@ -12,12 +12,12 @@ port 26379
+ # By default Valkey Sentinel does not run as a daemon. Use 'yes' if you need it.
+ # Note that Valkey will write a pid file in /var/run/valkey-sentinel.pid when
+ # daemonized.
+-daemonize no
++daemonize yes
+ 
+ # When running daemonized, Valkey Sentinel writes a pid file in
+ # /var/run/valkey-sentinel.pid by default. You can specify a custom pid file
+ # location here.
+-pidfile /var/run/valkey-sentinel.pid
++pidfile %%VALKEY_RUNDIR%%/valkey-sentinel.pid
+ 
+ # Specify the server verbosity level.
+ # This can be one of:
+@@ -31,7 +31,7 @@ loglevel notice
+ # Specify the log file name. Also the empty string can be used to force
+ # Sentinel to log on the standard output. Note that if you use standard
+ # output for logging but daemonize, logs will be sent to /dev/null
+-logfile ""
++logfile %%VALKEY_LOGDIR%%/valkey-sentinel.log
+ 
+ # To enable logging to the system logger, just set 'syslog-enabled' to yes,
+ # and optionally update the other syslog parameters to suit your needs.
diff --git a/databases/valkey/files/patch-src-Makefile b/databases/valkey/files/patch-src-Makefile
new file mode 100644
index 000000000000..37d215714f74
--- /dev/null
+++ b/databases/valkey/files/patch-src-Makefile
@@ -0,0 +1,54 @@
+--- src/Makefile.orig	2024-04-16 04:18:47 UTC
++++ src/Makefile
+@@ -55,8 +55,8 @@ endif
+ 	STD+=-std=c99
+ endif
+ 
+-PREFIX?=/usr/local
+-INSTALL_BIN=$(PREFIX)/bin
++PREFIX:=$(PREFIX)
++INSTALL_BIN=$(DESTDIR)$(PREFIX)/bin
+ INSTALL=install
+ PKG_CONFIG?=pkg-config
+ 
+@@ -127,7 +127,6 @@ FINAL_LIBS=-lm
+ FINAL_CFLAGS=$(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) $(SERVER_CFLAGS)
+ FINAL_LDFLAGS=$(LDFLAGS) $(SERVER_LDFLAGS) $(DEBUG)
+ FINAL_LIBS=-lm
+-DEBUG=-g -ggdb
+ 
+ # Linux ARM32 needs -latomic at linking time
+ ifneq (,$(findstring armv,$(uname_M)))
+@@ -166,6 +165,11 @@ else
+ 	OPENSSL_PREFIX?=/usr/local/opt/openssl
+ endif
+ else
++ifeq ($(uname_S),FreeBSD)
++        # FreeBSD
++        FINAL_CFLAGS?= $(CFLAGS) $(REDIS_CFLAGS) -I${PREFIX}/include
++        FINAL_LDFLAGS= $(LDFLAGS) -pthread
++else
+ ifeq ($(uname_S),AIX)
+         # AIX
+         FINAL_LDFLAGS+= -Wl,-bexpall
+@@ -225,6 +229,7 @@ endif
+ endif
+ endif
+ endif
++endif
+ 
+ ifdef OPENSSL_PREFIX
+ 	OPENSSL_CFLAGS=-I$(OPENSSL_PREFIX)/include
+@@ -541,12 +546,6 @@ install: all
+ 	@ln -sf $(REDIS_SERVER_NAME) $(INSTALL_BIN)/$(REDIS_CHECK_RDB_NAME)
+ 	@ln -sf $(REDIS_SERVER_NAME) $(INSTALL_BIN)/$(REDIS_CHECK_AOF_NAME)
+ 	@ln -sf $(REDIS_SERVER_NAME) $(INSTALL_BIN)/$(REDIS_SENTINEL_NAME)
+-	$(call MAYBE_INSTALL_REDIS_SYMLINK,$(REDIS_SERVER_NAME),$(INSTALL_BIN))
+-	$(call MAYBE_INSTALL_REDIS_SYMLINK,$(REDIS_CLI_NAME),$(INSTALL_BIN))
+-	$(call MAYBE_INSTALL_REDIS_SYMLINK,$(REDIS_BENCHMARK_NAME),$(INSTALL_BIN))
+-	$(call MAYBE_INSTALL_REDIS_SYMLINK,$(REDIS_CHECK_RDB_NAME),$(INSTALL_BIN))
+-	$(call MAYBE_INSTALL_REDIS_SYMLINK,$(REDIS_CHECK_AOF_NAME),$(INSTALL_BIN))
+-	$(call MAYBE_INSTALL_REDIS_SYMLINK,$(REDIS_SENTINEL_NAME),$(INSTALL_BIN))
+ 
+ uninstall:
+ 	rm -f $(INSTALL_BIN)/{$(REDIS_SERVER_NAME),$(REDIS_BENCHMARK_NAME),$(REDIS_CLI_NAME),$(REDIS_CHECK_RDB_NAME),$(REDIS_CHECK_AOF_NAME),$(REDIS_SENTINEL_NAME)}
diff --git a/databases/valkey/files/patch-src-mkreleasehdr.sh b/databases/valkey/files/patch-src-mkreleasehdr.sh
new file mode 100644
index 000000000000..90c25249469d
--- /dev/null
+++ b/databases/valkey/files/patch-src-mkreleasehdr.sh
@@ -0,0 +1,11 @@
+--- src/mkreleasehdr.sh.orig	2024-04-16 04:18:47 UTC
++++ src/mkreleasehdr.sh
+@@ -1,6 +1,6 @@
+ #!/bin/sh
+-GIT_SHA1=`(git show-ref --head --hash=8 2> /dev/null || echo 00000000) | head -n1`
+-GIT_DIRTY=`git diff --no-ext-diff 2> /dev/null | wc -l`
++GIT_SHA1="00000000"
++GIT_DIRTY="0"
+ BUILD_ID=`uname -n`"-"`date +%s`
+ if [ -n "$SOURCE_DATE_EPOCH" ]; then
+   BUILD_ID=$(date -u -d "@$SOURCE_DATE_EPOCH" +%s 2>/dev/null || date -u -r "$SOURCE_DATE_EPOCH" +%s 2>/dev/null || date -u +%s)
diff --git a/databases/valkey/files/patch-valkey.conf b/databases/valkey/files/patch-valkey.conf
new file mode 100644
index 000000000000..87d03a4935ac
--- /dev/null
+++ b/databases/valkey/files/patch-valkey.conf
@@ -0,0 +1,38 @@
+--- valkey.conf.orig	2024-04-16 04:18:47 UTC
++++ valkey.conf
+@@ -303,7 +303,7 @@ tcp-keepalive 300
+ # By default the server does not run as a daemon. Use 'yes' if you need it.
+ # Note that the server will write a pid file in /var/run/valkey.pid when daemonized.
+ # When the server is supervised by upstart or systemd, this parameter has no impact.
+-daemonize no
++daemonize yes
+ 
+ # If you run the server from upstart or systemd, the server can interact with your
+ # supervision tree. Options:
+@@ -335,7 +335,7 @@ daemonize no
+ #
+ # Note that on modern Linux systems "/run/valkey.pid" is more conforming
+ # and should be used instead.
+-pidfile /var/run/valkey_6379.pid
++pidfile %%VALKEY_RUNDIR%%/valkey.pid
+ 
+ # Specify the server verbosity level.
+ # This can be one of:
+@@ -349,7 +349,7 @@ loglevel notice
+ # Specify the log file name. Also the empty string can be used to force
+ # the server to log on the standard output. Note that if you use standard
+ # output for logging but daemonize, logs will be sent to /dev/null
+-logfile ""
++logfile %%VALKEY_LOGDIR%%/valkey.log
+ 
+ # To enable logging to the system logger, just set 'syslog-enabled' to yes,
+ # and optionally update the other syslog parameters to suit your needs.
+@@ -504,7 +504,7 @@ rdb-del-sync-files no
+ # The Append Only File will also be created inside this directory.
+ #
+ # Note that you must specify a directory here, not a file name.
+-dir ./
++dir %%VALKEY_DBDIR%%/
+ 
+ ################################# REPLICATION #################################
+ 
diff --git a/databases/valkey/files/pkg-message.in b/databases/valkey/files/pkg-message.in
new file mode 100644
index 000000000000..e32864db05c1
--- /dev/null
+++ b/databases/valkey/files/pkg-message.in
@@ -0,0 +1,11 @@
+[
+{ type: install
+  message: <<EOM
+      To setup "%%PORTNAME%%" you need to edit the configuration file:
+      %%PREFIX%%/etc/%%PORTNAME%%.conf
+
+      To run valkey from startup, add %%PORTNAME%%_enable="YES"
+      in your /etc/rc.conf.
+EOM
+}
+]
diff --git a/databases/valkey/files/valkey.in b/databases/valkey/files/valkey.in
new file mode 100644
index 000000000000..23be6ccb8a9e
--- /dev/null
+++ b/databases/valkey/files/valkey.in
@@ -0,0 +1,67 @@
+#!/bin/sh
+
+# PROVIDE: valkey
+# REQUIRE: LOGIN
+# BEFORE:  securelevel
+# KEYWORD: shutdown
+
+# Add the following line to /etc/rc.conf to enable `valkey':
+#
+#valkey_enable="YES"
+#
+# Define profiles here to run separate valkey instances:
+#
+#valkey_profiles="foo bar" #  Script uses %%PREFIX%%/etc/valkey-NAME.conf respectively.
+#			     For correct script working please update pidfile entries in
+#			     valkey-NAME.conf files.
+
+. /etc/rc.subr
+
+name="valkey"
+rcvar="${name}_enable"
+
+extra_commands="reload"
+
+command="%%PREFIX%%/bin/valkey-server"
+pidfile="%%VALKEY_RUNDIR%%/$name.pid"
+
+# read configuration and set defaults
+load_rc_config "$name"
+: ${valkey_enable="NO"}
+: ${valkey_user="%%VALKEY_USER%%"}
+: ${valkey_config="%%PREFIX%%/etc/$name.conf"}
+
+command_args="${valkey_config}"
+required_files="${valkey_config}"
+
+_profile_exists() {
+	for _p in ${valkey_profiles}; do
+		[ "${_p}" = "$1" ] && return 1;
+	done
+	return 0
+}
+
+if [ $# -eq 2 ]; then
+	_profile=$2
+	_profile_exists $_profile
+	_exists=$?
+	[ ${_exists} -ne 1 ] && {
+		echo "`basename %%PREFIX%%/etc/rc.d/valkey`: no '$2' in 'valkey_profiles'"
+		exit 1
+	};
+	echo "-- Profile: ${_profile} --"
+	config_file="%%PREFIX%%/etc/${name}-${_profile}.conf"
+	command_args="${config_file}"
+	pidfile="%%VALKEY_RUNDIR%%/${_profile}.pid"
+	required_files="${config_file}"
+elif [ -n "${valkey_profiles}" ]; then
+	_swap=$*; shift; _profiles=$*
+	_profiles=${_profiles:-${valkey_profiles}}
+	set -- ${_swap}
+	for _profile in ${_profiles}; do
+		%%PREFIX%%/etc/rc.d/valkey $1 ${_profile}
+	done
+	exit 0
+fi
+
+run_rc_command "$1"
diff --git a/databases/valkey/files/valkeysentinel.in b/databases/valkey/files/valkeysentinel.in
new file mode 100644
index 000000000000..ec940321b1cd
--- /dev/null
+++ b/databases/valkey/files/valkeysentinel.in
@@ -0,0 +1,39 @@
+#!/bin/sh
+
+# PROVIDE: valkeysentinel
+# REQUIRE: LOGIN
+# BEFORE:  securelevel
+# KEYWORD: shutdown
+
+# Add the following line to /etc/rc.conf to enable `valkeysentinel':
+#
+#valkeysentinel_enable="YES"
+#
+
+. /etc/rc.subr
+
+name="valkeysentinel"
+rcvar="$valkeysentinel_enable"
+
+command="/usr/local/bin/valkey-sentinel"
+pidfile="/var/run/valkey/valkey-sentinel.pid"
+
+# read configuration and set defaults
+load_rc_config "$name"
+: ${valkeysentinel_enable="NO"}
+: ${valkeysentinel_user="valkey"}
+: ${valkeysentinel_config="/usr/local/etc/valkey-sentinel.conf"}
+
+command_args="${valkeysentinel_config} --daemonize yes --pidfile ${pidfile}"
+required_files="${valkeysentinel_config}"
+start_precmd="valkeysentinel_checks"
+restart_precmd="valkeysentinel_checks"
+
+valkeysentinel_checks()
+{
+    if [ x`id -u ${valkeysentinel_user}` != x`stat -f %u ${valkeysentinel_config}` ]; then
+	err 1 "${valkeysentinel_config} must be owned by user ${valkeysentinel_user}"
+    fi
+}
+
+run_rc_command "$1"
diff --git a/databases/valkey/pkg-descr b/databases/valkey/pkg-descr
new file mode 100644
index 000000000000..cbf8f62894b1
--- /dev/null
+++ b/databases/valkey/pkg-descr
@@ -0,0 +1,4 @@
+Valkey is a high-performance data structure server that primarily
+serves key/value workloads. It supports a wide range of native
+structures and an extensible plugin system for adding new data
+structures and access patterns.
diff --git a/databases/valkey/pkg-plist b/databases/valkey/pkg-plist
new file mode 100644
index 000000000000..9ccd7d930e5a
--- /dev/null
+++ b/databases/valkey/pkg-plist
@@ -0,0 +1,11 @@
+bin/valkey-benchmark
+bin/valkey-check-aof
+bin/valkey-check-rdb
+bin/valkey-cli
+bin/valkey-sentinel
+bin/valkey-server
+@sample etc/valkey.conf.sample
+@sample(%%VALKEY_USER%%,%%VALKEY_GROUP%%,) etc/valkey-sentinel.conf.sample
+@dir(%%VALKEY_USER%%,%%VALKEY_GROUP%%,) %%VALKEY_DBDIR%%
+@dir(%%VALKEY_USER%%,%%VALKEY_GROUP%%,) %%VALKEY_LOGDIR%%
+@dir(%%VALKEY_USER%%,%%VALKEY_GROUP%%,) %%VALKEY_RUNDIR%%
diff --git a/databases/vfront/Makefile b/databases/vfront/Makefile
index a6ebbbd8ad83..f27d0da19fc4 100644
--- a/databases/vfront/Makefile
+++ b/databases/vfront/Makefile
@@ -6,19 +6,21 @@ MASTER_SITES=	SF/vfront/vfront/vfront-${DISTVERSION}
 
 MAINTAINER=	crees@FreeBSD.org
 COMMENT=	Simple frontend for database data entry
+WWW=		http://www.vfront.org/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/license
 
-NO_BUILD=	yes
+USES=		cpe php
+
 NO_ARCH=	yes
-PLIST=		${WRKDIR}/pkg-plist
+NO_BUILD=	yes
 
-USES=		cpe php
+PLIST=		${WRKDIR}/pkg-plist
 
+OPTIONS_DEFAULT=	MYSQL PGSQL
 OPTIONS_MULTI=	DATABASE
 OPTIONS_MULTI_DATABASE=	MYSQL PGSQL
-OPTIONS_DEFAULT=	MYSQL PGSQL
 
 MYSQL_USES=	mysql
 MYSQL_USE=	PHP=mysqli
@@ -36,8 +38,8 @@ pre-install:
 	    ${FIND} * -type f | ${SED} 's,^,%%WWWDIR%%/,' > ${PLIST} && \
 	    ${FIND} * -type d -empty | ${SORT} -r | \
 			${SED} 's,^,@dir %%WWWDIR%%/,' >> ${PLIST})
-	@${ECHO_CMD} '@exec ${CHOWN} -R ${WWWOWN} %D/%%WWWDIR%%' >> ${PLIST}
-	@${ECHO_CMD} '@exec ${CHMOD} 700 %D/%%WWWDIR%%/conf' >> ${PLIST}
+	@${ECHO_CMD} '@postexec ${CHOWN} -R ${WWWOWN} %D/%%WWWDIR%%' >> ${PLIST}
+	@${ECHO_CMD} '@postexec ${CHMOD} 700 %D/%%WWWDIR%%/conf' >> ${PLIST}
 
 do-install:
 	(cd ${WRKSRC} && ${COPYTREE_SHARE} \* ${STAGEDIR}${WWWDIR})
diff --git a/databases/vfront/pkg-descr b/databases/vfront/pkg-descr
index 199d629939d2..2e806db9d280 100644
--- a/databases/vfront/pkg-descr
+++ b/databases/vfront/pkg-descr
@@ -2,5 +2,3 @@ VFront is a free, open source front-end for MySQL or PostgreSQL databases
 written in PHP and Javascript.  With VFront you can create forms for managing
 your data in AJAX style, different rules and privileges for groups, report in
 XML, HTML, PDF, statistics and much more.
-
-WWW: http://www.vfront.org/
diff --git a/databases/virtualpg/Makefile b/databases/virtualpg/Makefile
index ed09a701f562..8b18fca68441 100644
--- a/databases/virtualpg/Makefile
+++ b/databases/virtualpg/Makefile
@@ -1,5 +1,3 @@
-# Created by: Loïc BARTOLETTI <lbartoletti@FreeBSD.org>
-
 PORTNAME=	virtualpg
 PORTVERSION=	2.0.1
 CATEGORIES=	databases geography
@@ -7,6 +5,7 @@ MASTER_SITES=	http://www.gaia-gis.it/gaia-sins/
 
 MAINTAINER=	lbartoletti@FreeBSD.org
 COMMENT=	Loadable dynamic extension to both SQLite and SpatiaLite
+WWW=		https://www.gaia-gis.it/fossil/virtualpg/index
 
 LICENSE=	MPL11 LGPL21 GPLv2
 LICENSE_COMB=	dual
diff --git a/databases/virtualpg/pkg-descr b/databases/virtualpg/pkg-descr
index bb4ce0b7c91d..9977f8ebb66a 100644
--- a/databases/virtualpg/pkg-descr
+++ b/databases/virtualpg/pkg-descr
@@ -4,5 +4,3 @@ dynamic extension module for both SQLite and SpatiaLite.
 The intended scope of VirtualPG is supporting direct data exchange form/to
 PostgreSQL / PostGIS targets and SQLite simply using basic,
 plain SQL statements.
-
-WWW: https://www.gaia-gis.it/fossil/virtualpg/index
diff --git a/databases/virtuoso/Makefile b/databases/virtuoso/Makefile
deleted file mode 100644
index 0654b446a106..000000000000
--- a/databases/virtuoso/Makefile
+++ /dev/null
@@ -1,112 +0,0 @@
-# Created by: Max Khon <fjoe@FreeBSD.org>
-
-PORTNAME=	virtuoso
-PORTVERSION=	7.2.5
-PORTREVISION=	1
-CATEGORIES=	databases
-MASTER_SITES=	SF
-DISTNAME=	${PORTNAME}-opensource-${PORTVERSION}
-
-MAINTAINER=	fjoe@FreeBSD.org
-COMMENT=	Universal SQL/Application Server
-
-LICENSE=	GPLv2
-LICENSE_FILE=	${WRKSRC}/COPYING
-
-BROKEN_aarch64=		Fails to link: missing sbrk
-BROKEN_mips64=		Does not compile: error: DV_INT_TAG_WORD undeclared
-BROKEN_powerpc64=	Does not compile: error: DV_INT_TAG_WORD undeclared
-BROKEN_sparc64=		Does not compile: error: DV_INT_TAG_WORD undeclared
-NOT_FOR_ARCHS=		armv6 armv7 i386 mips powerpc powerpcspe
-NOT_FOR_ARCHS_REASON=	can only be built on 64bit platforms
-
-BUILD_DEPENDS=	gawk:lang/gawk\
-		htmldoc:textproc/htmldoc\
-		flex>2.5.4:textproc/flex\
-		gperf>=3.0.3:devel/gperf
-LIB_DEPENDS=	libxml2.so:textproc/libxml2
-
-USES=		gmake libtool readline uidfix ssl
-
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-readline\
-		--without-internal-zlib\
-		--without-jdk2\
-		--without-jdk3\
-		--without-jdk4\
-		--disable-hslookup\
-		--disable-wbxml2\
-		--with-layout=freebsd\
-		--datadir="${PREFIX}"\
-		--localstatedir="${PREFIX}"
-CONFIGURE_ENV=	ac_cv_header_sys_timeb_h=no
-CPPFLAGS+=	-std=gnu89
-LDFLAGS+=	-lexecinfo
-MAKE_ENV=	PATH=${LOCALBASE}/bin:${PATH}\
-		ISQL=isql-vt
-USE_RC_SUBR=	virtuoso
-USERS=		virtuoso
-GROUPS=		virtuoso
-SUB_FILES=	pkg-message
-
-CHECK_PORT=	nc -z localhost $$\1 2>\&1
-
-OPTIONS_DEFINE=		IMAGEMAGICK KERBEROS LDAP IODBC
-
-post-patch:
-	${REINPLACE_CMD} -e 's,-lruby,-lruby${RUBY_SUFFIX},g'\
-			${WRKSRC}/configure
-	${FIND} ${WRKSRC} -name '*.sh' | ${XARGS} ${GREP} -l 'netstat -an.*grep LISTEN' |\
-	    ${XARGS} ${REINPLACE_CMD}\
-		-e 's,expr \$$,expr -- $$,'\
-		-e 's,netstat -an.*grep.*$$\([a-zA-Z0-9]*\).*grep LISTEN,${CHECK_PORT},'
-
-check:
-	${SETENV} -u HOST ${MAKE_ENV} ${MAKE} -C ${WRKSRC} check
-
-.include <bsd.port.options.mk>
-
-.if ${SSL_DEFAULT} == base
-BROKEN_FreeBSD_12=	OpenSSL version 1.1.0 or greater is currently not supported
-BROKEN_FreeBSD_13=	OpenSSL version 1.1.0 or greater is currently not supported
-BROKEN_FreeBSD_14=	OpenSSL version 1.1.0 or greater is currently not supported
-.endif
-
-.if ${PORT_OPTIONS:MIMAGEMAGICK}
-CONFIGURE_ARGS+=--enable-imagemagick=${LOCALBASE}
-LIB_DEPENDS+=	libMagickWand-6.so:graphics/ImageMagick6
-PLIST_SUB+=	WITH_IMAGEMAGICK=""
-.else
-CONFIGURE_ARGS+=--disable-imagemagick
-PLIST_SUB+=	WITH_IMAGEMAGICK="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MIODBC}
-CONFIGURE_ARGS+=--with-iodbc=${LOCALBASE}
-LIB_DEPENDS+=	libiodbc.so:databases/libiodbc
-CPPFLAGS+=	-I${LOCALBASE}/include/libiodbc
-PLIST_SUB+=	WITH_IODBC=""
-.else
-CPPFLAGS+=	-I../../libsrc/odbcsdk/include
-PLIST_SUB+=	WITH_IODBC="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MKERBEROS}
-CONFIGURE_ARGS+=--enable-krb=${LOCALBASE}
-LIB_DEPENDS+=	libkrb5.so:security/krb5
-.else
-CONFIGURE_ARGS+=--disable-krb
-.endif
-
-.if ${PORT_OPTIONS:MLDAP}
-CONFIGURE_ARGS+=--enable-openldap=${LOCALBASE}
-USE_OPENLDAP=	yes
-.else
-CONFIGURE_ARGS+=--disable-openldap
-.endif
-
-post-install:
-	${FIND} ${STAGEDIR} -name "*.ini" -exec ${MV} {} {}.sample \; -print
-	${RMDIR} ${STAGEDIR}${PREFIX}/virtuoso/doc/html
-
-.include <bsd.port.mk>
diff --git a/databases/virtuoso/distinfo b/databases/virtuoso/distinfo
deleted file mode 100644
index a93ce53e37da..000000000000
--- a/databases/virtuoso/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1544683042
-SHA256 (virtuoso-opensource-7.2.5.tar.gz) = 826477d25a8493a68064919873fb4da4823ebe09537c04ff4d26ba49d9543d64
-SIZE (virtuoso-opensource-7.2.5.tar.gz) = 120299376
diff --git a/databases/virtuoso/files/patch-binsrc-tests-Makefile.in b/databases/virtuoso/files/patch-binsrc-tests-Makefile.in
deleted file mode 100644
index 66c1cde5d88d..000000000000
--- a/databases/virtuoso/files/patch-binsrc-tests-Makefile.in
+++ /dev/null
@@ -1,29 +0,0 @@
---- binsrc/tests/Makefile.in.orig	2016-04-25 16:12:58.000000000 +0000
-+++ binsrc/tests/Makefile.in	2016-10-04 17:37:15.132578000 +0000
-@@ -100,7 +100,7 @@
- POST_UNINSTALL = :
- build_triplet = @build@
- host_triplet = @host@
--bin_PROGRAMS = isql$(EXEEXT) isqlw$(EXEEXT) inifile$(EXEEXT) \
-+bin_PROGRAMS = isql-vt$(EXEEXT) isqlw-vt$(EXEEXT) inifile$(EXEEXT) \
- 	$(am__EXEEXT_1)
- noinst_PROGRAMS = M2$(EXEEXT) paramstats$(EXEEXT) ins$(EXEEXT) \
- 	blobs$(EXEEXT) blobs2$(EXEEXT) blobnulls$(EXEEXT) \
-@@ -903,7 +903,7 @@
- 	@rm -f ins-iodbc$(EXEEXT)
- 	$(AM_V_CCLD)$(ins_iodbc_LINK) $(ins_iodbc_OBJECTS) $(ins_iodbc_LDADD) $(LIBS)
- 
--isql$(EXEEXT): $(isql_OBJECTS) $(isql_DEPENDENCIES) $(EXTRA_isql_DEPENDENCIES) 
-+isql-vt$(EXEEXT): $(isql_OBJECTS) $(isql_DEPENDENCIES) $(EXTRA_isql_DEPENDENCIES) 
- 	@rm -f isql$(EXEEXT)
- 	$(AM_V_CCLD)$(isql_LINK) $(isql_OBJECTS) $(isql_LDADD) $(LIBS)
- 
-@@ -911,7 +911,7 @@
- 	@rm -f isql-iodbc$(EXEEXT)
- 	$(AM_V_CCLD)$(isql_iodbc_LINK) $(isql_iodbc_OBJECTS) $(isql_iodbc_LDADD) $(LIBS)
- 
--isqlw$(EXEEXT): $(isqlw_OBJECTS) $(isqlw_DEPENDENCIES) $(EXTRA_isqlw_DEPENDENCIES) 
-+isqlw-vt$(EXEEXT): $(isqlw_OBJECTS) $(isqlw_DEPENDENCIES) $(EXTRA_isqlw_DEPENDENCIES) 
- 	@rm -f isqlw$(EXEEXT)
- 	$(AM_V_CCLD)$(isqlw_LINK) $(isqlw_OBJECTS) $(isqlw_LDADD) $(LIBS)
- 
diff --git a/databases/virtuoso/files/patch-binsrc-tests-biftest-thook.sh b/databases/virtuoso/files/patch-binsrc-tests-biftest-thook.sh
deleted file mode 100644
index 5d5388d4e3be..000000000000
--- a/databases/virtuoso/files/patch-binsrc-tests-biftest-thook.sh
+++ /dev/null
@@ -1,12 +0,0 @@
---- binsrc/tests/biftest/thook.sh.orig	2012-06-15 17:48:39.000000000 +0700
-+++ binsrc/tests/biftest/thook.sh	2012-06-15 17:52:34.000000000 +0700
-@@ -22,7 +22,8 @@
- #
- 
- OUTPUT=thook.output
--ISQL=../isql
-+ISQL=${ISQL-isql}
-+ISQL=../$ISQL
- TIMEOUT=1000
- HOST_OS=`uname -s | grep WIN`
- SERVER=./virtuoso-iodbc-sample-t
diff --git a/databases/virtuoso/files/patch-configure b/databases/virtuoso/files/patch-configure
deleted file mode 100644
index 4d1f117256c2..000000000000
--- a/databases/virtuoso/files/patch-configure
+++ /dev/null
@@ -1,15 +0,0 @@
---- configure.orig	2011-10-29 06:28:32.000000000 +0700
-+++ configure	2012-06-08 12:59:49.000000000 +0700
-@@ -3784,9 +3784,9 @@
- 	docdir=$datadir/virtuoso/doc
- 	htmldocdir=$datadir/virtuoso/doc/html
- 	pdfdocdir=$datadir/virtuoso/doc/pdf
--	demodir=$localstatedir/lib/virtuoso/demo
--	dbdir=$localstatedir/lib/virtuoso/db
--	httprootdir=$localstatedir/lib/virtuoso/vsp
-+	demodir=$localstatedir/virtuoso/demo
-+	dbdir=$localstatedir/virtuoso/db
-+	httprootdir=$localstatedir/virtuoso/vsp
- 	hostingdir=$libdir/virtuoso/hosting
- 	;;
- 
diff --git a/databases/virtuoso/files/pkg-message.in b/databases/virtuoso/files/pkg-message.in
deleted file mode 100644
index f076a546df30..000000000000
--- a/databases/virtuoso/files/pkg-message.in
+++ /dev/null
@@ -1,9 +0,0 @@
-[
-{ type: install
-  message: <<EOM
-Please copy and edit the sample configuration file before enabling the server:
-
-cp %%PREFIX%%/lib/virtuoso/db/virtuoso.ini.sample %%PREFIX%%/lib/virtuoso/db/virtuoso.ini
-EOM
-}
-]
diff --git a/databases/virtuoso/files/virtuoso.in b/databases/virtuoso/files/virtuoso.in
deleted file mode 100644
index ec0153c394dd..000000000000
--- a/databases/virtuoso/files/virtuoso.in
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/sh
-
-# PROVIDE: virtuoso
-# REQUIRE: LOGIN
-# KEYWORD: shutdown
-#
-# Add the following line to /etc/rc.conf to enable Virtuoso Universal Server:
-#
-#  virtuoso_enable="YES"
-#  # optional
-#  virtuoso_config="%%PREFIX%%/virtuoso/db/virtuoso.ini"
-#  virtuoso_flags="<set as needed>"
-#
-# This scripts takes one of the following commands:
-#
-#   start stop restart status
-#
-
-. /etc/rc.subr
-
-load_rc_config virtuoso
-
-# set defaults
-virtuoso_enable=${virtuoso_enable:-"NO"}
-virtuoso_config=${virtuoso_config:-"db/virtuoso.ini"}
-virtuoso_user=virtuoso
-virtuoso_data=%%PREFIX%%/virtuoso
-
-name=virtuoso
-rcvar=virtuoso_enable
-
-command=%%PREFIX%%/bin/virtuoso-t
-command_args="+configfile ${virtuoso_config} ${virtuoso_flags}"
-
-start_precmd="cd ${virtuoso_data}"
-
-run_rc_command "$1"
diff --git a/databases/virtuoso/pkg-descr b/databases/virtuoso/pkg-descr
deleted file mode 100644
index 5de6e702b926..000000000000
--- a/databases/virtuoso/pkg-descr
+++ /dev/null
@@ -1,11 +0,0 @@
-Virtuoso is an innovative Virtualization platform that transparently
-integrates Data, Services, and Business Processes across the enterprise.
-Its unique product architecture enables it to delivery traditionally
-distinct server functionality, within a single product offering,
-along the following lines:
-* Data Management & Integration (SQL, XML and EII)
-* Application Integration (Web Services & SOA)
-* Process Management & Integration (BPEL)
-* Collaboration and Network Effects
-
-WWW: http://virtuoso.openlinksw.com/
diff --git a/databases/virtuoso/pkg-plist b/databases/virtuoso/pkg-plist
deleted file mode 100644
index 21c3bbf18aab..000000000000
--- a/databases/virtuoso/pkg-plist
+++ /dev/null
@@ -1,1310 +0,0 @@
-bin/inifile
-%%WITH_IODBC%%bin/isql-iodbc
-bin/isql-vt
-%%WITH_IODBC%%bin/isqlw-iodbc
-bin/isqlw-vt
-%%WITH_IODBC%%bin/odbc_mail
-bin/virt_mail
-bin/virtuoso-t
-lib/hibernate/virt_dialect.jar
-lib/jdbc-2.0/virtjdbc2.jar
-lib/jdbc-3.0/virtjdbc3.jar
-lib/jdbc-3.0/virtjdbc3ssl.jar
-lib/jdbc-4.0/virtjdbc4.jar
-lib/jdbc-4.0/virtjdbc4ssl.jar
-lib/jdbc-4.1/virtjdbc4_1.jar
-lib/jdbc-4.1/virtjdbc4_1ssl.jar
-lib/jdbc-4.2/virtjdbc4_2.jar
-lib/jdbc-4.2/virtjdbc4_2ssl.jar
-lib/jena/virt_jena.jar
-lib/jena2/virt_jena2.jar
-lib/jena3/virt_jena3.jar
-lib/rdf4j/create-virtuoso.xsl
-lib/rdf4j/create.xsl
-lib/rdf4j/virt_rdf4j.jar
-lib/libvirtuoso-t.a
-lib/sesame/create-virtuoso.xsl
-lib/sesame/create.xsl
-lib/sesame/virt_sesame.jar
-lib/sesame/virt_sesame2.jar
-lib/sesame/virt_sesame3.jar
-lib/sesame/virt_sesame4.jar
-lib/virtodbc.a
-lib/virtodbc.so
-lib/virtodbc_r.a
-lib/virtodbc_r.so
-lib/virtodbcu.a
-lib/virtodbcu.so
-lib/virtodbcu_r.a
-lib/virtodbcu_r.so
-@sample lib/virtuoso/db/virtuoso.ini.sample
-%%WITH_IMAGEMAGICK%%lib/virtuoso/hosting/im.a
-%%WITH_IMAGEMAGICK%%lib/virtuoso/hosting/im.so
-lib/virtuoso/hosting/creolewiki.a
-lib/virtuoso/hosting/creolewiki.so
-lib/virtuoso/hosting/mediawiki.a
-lib/virtuoso/hosting/mediawiki.so
-lib/virtuoso/hosting/wikiv.a
-lib/virtuoso/hosting/wikiv.so
-lib/virtuoso/vsp/admin/index_left.vsp
-lib/virtuoso/vsp/admin_style.html
-lib/virtuoso/vsp/bugsfixed.html
-lib/virtuoso/vsp/default.css
-lib/virtuoso/vsp/demo-index.html
-lib/virtuoso/vsp/downfr.html
-lib/virtuoso/vsp/images/PoweredByVirtuoso.gif
-lib/virtuoso/vsp/images/PoweredByVirtuosoSmall2.jpg
-lib/virtuoso/vsp/images/VirtuosoSplash2.jpg
-lib/virtuoso/vsp/images/about_32.png
-lib/virtuoso/vsp/images/atom.png
-lib/virtuoso/vsp/images/atom03.png
-lib/virtuoso/vsp/images/bg.jpg
-lib/virtuoso/vsp/images/bl-arrow.jpg
-lib/virtuoso/vsp/images/bl-house.jpg
-lib/virtuoso/vsp/images/blog-active.png
-lib/virtuoso/vsp/images/bloglogo.jpg
-lib/virtuoso/vsp/images/bpel-lg.jpg
-lib/virtuoso/vsp/images/bpel-sm.jpg
-lib/virtuoso/vsp/images/bugsfixed.gif
-lib/virtuoso/vsp/images/conductor-lg.jpg
-lib/virtuoso/vsp/images/conductor-sm.jpg
-lib/virtuoso/vsp/images/cross.gif
-lib/virtuoso/vsp/images/dash-sm.jpg
-lib/virtuoso/vsp/images/dir.gif
-lib/virtuoso/vsp/images/dir_prop.gif
-lib/virtuoso/vsp/images/docs_16.png
-lib/virtuoso/vsp/images/echo_prototype.png
-lib/virtuoso/vsp/images/exit.gif
-lib/virtuoso/vsp/images/featdemo.gif
-lib/virtuoso/vsp/images/foaf.gif
-lib/virtuoso/vsp/images/generic.gif
-lib/virtuoso/vsp/images/globe_xl.jpg
-lib/virtuoso/vsp/images/help_32.png
-lib/virtuoso/vsp/images/home.gif
-lib/virtuoso/vsp/images/html401.gif
-lib/virtuoso/vsp/images/http-lg.jpg
-lib/virtuoso/vsp/images/http-sm.jpg
-lib/virtuoso/vsp/images/hzline1.jpg
-lib/virtuoso/vsp/images/isql-lg.jpg
-lib/virtuoso/vsp/images/isql-sm.jpg
-lib/virtuoso/vsp/images/jdbcdemo.gif
-lib/virtuoso/vsp/images/line.gif
-lib/virtuoso/vsp/images/line.jpg
-lib/virtuoso/vsp/images/logobg.jpg
-lib/virtuoso/vsp/images/mailto.gif
-lib/virtuoso/vsp/images/menutpl.gif
-lib/virtuoso/vsp/images/mxml.gif
-lib/virtuoso/vsp/images/nav_arrrow1.gif
-lib/virtuoso/vsp/images/newfeatures.gif
-lib/virtuoso/vsp/images/oplhome.gif
-lib/virtuoso/vsp/images/opml.gif
-lib/virtuoso/vsp/images/opsys_32.png
-lib/virtuoso/vsp/images/opts_16.png
-lib/virtuoso/vsp/images/prop.gif
-lib/virtuoso/vsp/images/rdf.gif
-lib/virtuoso/vsp/images/rdf48.gif
-lib/virtuoso/vsp/images/repl-sm.jpg
-lib/virtuoso/vsp/images/rss201.gif
-lib/virtuoso/vsp/images/score.gif
-lib/virtuoso/vsp/images/sel_nav2_grad2.gif
-lib/virtuoso/vsp/images/sel_nav_grad2.gif
-lib/virtuoso/vsp/images/sky_blu_grad.gif
-lib/virtuoso/vsp/images/slvnav.jpg
-lib/virtuoso/vsp/images/soap-lg.jpg
-lib/virtuoso/vsp/images/soap-sm.jpg
-lib/virtuoso/vsp/images/soap_r3_1.png
-lib/virtuoso/vsp/images/soap_r3_2.jpg
-lib/virtuoso/vsp/images/soap_r3_3.jpg
-lib/virtuoso/vsp/images/solndemo.gif
-lib/virtuoso/vsp/images/sqlxml-lg.jpg
-lib/virtuoso/vsp/images/stl_blu1_grad.gif
-lib/virtuoso/vsp/images/stl_blu2_grad.gif
-lib/virtuoso/vsp/images/support_32.png
-lib/virtuoso/vsp/images/tick.gif
-lib/virtuoso/vsp/images/tour_16.png
-lib/virtuoso/vsp/images/vadmin.gif
-lib/virtuoso/vsp/images/vblog2_32.png
-lib/virtuoso/vsp/images/vblog_32.png
-lib/virtuoso/vsp/images/vbloglogo.gif
-lib/virtuoso/vsp/images/vdbdsn-lg.jpg
-lib/virtuoso/vsp/images/vdbdsn-sm.jpg
-lib/virtuoso/vsp/images/vdemo.gif
-lib/virtuoso/vsp/images/vdocs.gif
-lib/virtuoso/vsp/images/vdocs2_32.png
-lib/virtuoso/vsp/images/vdocs_32.png
-lib/virtuoso/vsp/images/vdoctitle1.jpg
-lib/virtuoso/vsp/images/virtblck.gif
-lib/virtuoso/vsp/images/virtblck.jpg
-lib/virtuoso/vsp/images/virtuoso_banner.gif
-lib/virtuoso/vsp/images/virtv.gif
-lib/virtuoso/vsp/images/vlogin.gif
-lib/virtuoso/vsp/images/vprodinf.gif
-lib/virtuoso/vsp/images/vrthome.gif
-lib/virtuoso/vsp/images/vrtnews.gif
-lib/virtuoso/vsp/images/vsales.gif
-lib/virtuoso/vsp/images/vsoftdwn.gif
-lib/virtuoso/vsp/images/vsupport.gif
-lib/virtuoso/vsp/images/wa-lg.jpg
-lib/virtuoso/vsp/images/wa-sm.jpg
-lib/virtuoso/vsp/images/web_16.png
-lib/virtuoso/vsp/images/webdav-lg.jpg
-lib/virtuoso/vsp/images/webdav-sm.jpg
-lib/virtuoso/vsp/images/wnew_16.png
-lib/virtuoso/vsp/images/xml.gif
-lib/virtuoso/vsp/index.html
-lib/virtuoso/vsp/index1.html
-lib/virtuoso/vsp/knownissues.html
-lib/virtuoso/vsp/leftfr.html
-lib/virtuoso/vsp/mainfr.html
-lib/virtuoso/vsp/newfeatures.html
-lib/virtuoso/vsp/releasenotes.css
-lib/virtuoso/vsp/releasenotes.html
-lib/virtuoso/vsp/robots.txt
-lib/virtuoso/vsp/vsmx/close_16.gif
-lib/virtuoso/vsp/vsmx/default.css
-lib/virtuoso/vsp/vsmx/minus.gif
-lib/virtuoso/vsp/vsmx/msg.vspx
-lib/virtuoso/vsp/vsmx/oper.vspx
-lib/virtuoso/vsp/vsmx/plus.gif
-lib/virtuoso/vsp/vsmx/slvnav.jpg
-lib/virtuoso/vsp/vsmx/stl_blu1_grad.gif
-lib/virtuoso/vsp/vsmx/vsmx.vspx
-lib/virtuoso/vsp/vsmx/vsmx_msg.xsl
-lib/virtuoso/vsp/vsmx/vsmx_oper.xsl
-lib/virtuoso/vsp/vsmx/vsmx_res.xsl
-virtuoso/doc/AUTHORS
-virtuoso/doc/COPYING
-virtuoso/doc/COPYING.md
-virtuoso/doc/CREDITS
-virtuoso/doc/CREDITS.md
-virtuoso/doc/INSTALL
-virtuoso/doc/INSTALL.md
-virtuoso/doc/LICENSE
-virtuoso/doc/LICENSE.md
-virtuoso/doc/NEWS
-virtuoso/doc/NEWS.md
-virtuoso/doc/README
-virtuoso/doc/README.GIT.md
-virtuoso/doc/README.MACOSX.md
-virtuoso/doc/README.OpenSSL.md
-virtuoso/doc/README.UPGRADE.md
-virtuoso/doc/README.WINDOWS.md
-virtuoso/doc/README.hibernate.md
-virtuoso/doc/README.jena.md
-virtuoso/doc/README.jsse.md
-virtuoso/doc/README.php5.md
-virtuoso/doc/README.sesame2.md
-virtuoso/doc/README.sesame3.md
-virtuoso/doc/images/VirtProviderClassHier.jpg
-virtuoso/doc/images/VirtuosoBlog.jpg
-virtuoso/doc/images/conndsn1a.png
-virtuoso/doc/images/conndsn1b.png
-virtuoso/doc/images/conndsn2.png
-virtuoso/doc/images/database.png
-virtuoso/doc/images/datalinkprovider.jpg
-virtuoso/doc/images/datalinkvirtuosoconnection.jpg
-virtuoso/doc/images/defport.gif
-virtuoso/doc/images/demoport.gif
-virtuoso/doc/images/demoquery.png
-virtuoso/doc/images/digestauth.jpg
-virtuoso/doc/images/fig2_bottom.jpg
-virtuoso/doc/images/fig2_bottom.png
-virtuoso/doc/images/fig2_bottom2.png
-virtuoso/doc/images/fig2_bottom3.png
-virtuoso/doc/images/fig2_top.jpg
-virtuoso/doc/images/fig2_top.png
-virtuoso/doc/images/http_handler_aspx.jpg
-virtuoso/doc/images/http_handler_jsp.jpg
-virtuoso/doc/images/http_handler_php.jpg
-virtuoso/doc/images/httpconcept.jpg
-virtuoso/doc/images/inst/02prepare.png
-virtuoso/doc/images/inst/03engine.png
-virtuoso/doc/images/inst/10welcome.png
-virtuoso/doc/images/inst/11license.png
-virtuoso/doc/images/inst/12clienttype.png
-virtuoso/doc/images/inst/13installtype.png
-virtuoso/doc/images/inst/14support.png
-virtuoso/doc/images/inst/17destination.png
-virtuoso/doc/images/inst/18filesexist.png
-virtuoso/doc/images/inst/20feature.png
-virtuoso/doc/images/inst/21smtp.png
-virtuoso/doc/images/inst/22jdk.png
-virtuoso/doc/images/inst/23demooverwrite.png
-virtuoso/doc/images/inst/24licfile.png
-virtuoso/doc/images/inst/25licfile2.png
-virtuoso/doc/images/inst/30startdb.png
-virtuoso/doc/images/inst/32selectdef.png
-virtuoso/doc/images/inst/34selectdemo.png
-virtuoso/doc/images/inst/36startuptype.png
-virtuoso/doc/images/inst/40menufolder.png
-virtuoso/doc/images/inst/50startcopy.png
-virtuoso/doc/images/inst/55serviceconflict.png
-virtuoso/doc/images/inst/58copyfiles.png
-virtuoso/doc/images/inst/60defhttp.png
-virtuoso/doc/images/inst/62defport.png
-virtuoso/doc/images/inst/64defdba.png
-virtuoso/doc/images/inst/66defdav.png
-virtuoso/doc/images/inst/70demohttp.png
-virtuoso/doc/images/inst/72demoport.png
-virtuoso/doc/images/inst/73createdemo.png
-virtuoso/doc/images/inst/74demodba.png
-virtuoso/doc/images/inst/76demodav.png
-virtuoso/doc/images/inst/80demostart.png
-virtuoso/doc/images/inst/91complete.png
-virtuoso/doc/images/inst/95admingui.png
-virtuoso/doc/images/inst/v50-pe-unx-00.png
-virtuoso/doc/images/inst/v50-pe-unx-01.png
-virtuoso/doc/images/inst/v50-pe-unx-02.png
-virtuoso/doc/images/inst/v50pex8601.png
-virtuoso/doc/images/inst/v50pex8602.png
-virtuoso/doc/images/inst/v50pex8603.png
-virtuoso/doc/images/inst/v50pex8604.png
-virtuoso/doc/images/inst/v50pex8605.png
-virtuoso/doc/images/inst/v50pex8606.png
-virtuoso/doc/images/inst/v50pex8607.png
-virtuoso/doc/images/inst/v50pex8608.png
-virtuoso/doc/images/inst/v50pex8609.png
-virtuoso/doc/images/inst/v50pex8610.png
-virtuoso/doc/images/inst/v50pex8611.png
-virtuoso/doc/images/inst/v50pex8612.png
-virtuoso/doc/images/inst/v50pex8613.png
-virtuoso/doc/images/inst/v50pex8614.png
-virtuoso/doc/images/inst/v50pex8615.png
-virtuoso/doc/images/instprog.gif
-virtuoso/doc/images/instrestart.gif
-virtuoso/doc/images/insttype.gif
-virtuoso/doc/images/insttype2.gif
-virtuoso/doc/images/internetmailmsg.jpg
-virtuoso/doc/images/linked_data_gen_opts3.png
-virtuoso/doc/images/linked_data_gen_opts4.png
-virtuoso/doc/images/ln-inst-isql.png
-virtuoso/doc/images/ln-inst-isql2.png
-virtuoso/doc/images/ln-inst-login.png
-virtuoso/doc/images/ln-inst3.gif
-virtuoso/doc/images/ln-inst4.png
-virtuoso/doc/images/mac/config01.jpg
-virtuoso/doc/images/mac/config03.jpg
-virtuoso/doc/images/mac/config04.jpg
-virtuoso/doc/images/mac/config05.jpg
-virtuoso/doc/images/mac/config06.jpg
-virtuoso/doc/images/mac/config07.jpg
-virtuoso/doc/images/mac/install.jpg
-virtuoso/doc/images/mac/install01.jpg
-virtuoso/doc/images/mac/install02.jpg
-virtuoso/doc/images/mac/install09.jpg
-virtuoso/doc/images/mac/install11.jpg
-virtuoso/doc/images/mac/install12.jpg
-virtuoso/doc/images/mac/install13.jpg
-virtuoso/doc/images/mac/osximage01.gif
-virtuoso/doc/images/mac/osximage02.gif
-virtuoso/doc/images/mac/osximage03.gif
-virtuoso/doc/images/mac/osximage05.gif
-virtuoso/doc/images/mac/osximage07.gif
-virtuoso/doc/images/mac/osximage08.gif
-virtuoso/doc/images/mac/osximage09.gif
-virtuoso/doc/images/mac/osximage10.gif
-virtuoso/doc/images/mac/osximage11.gif
-virtuoso/doc/images/mac/osximage12.gif
-virtuoso/doc/images/mac/osximage13.gif
-virtuoso/doc/images/mac/osximage14.gif
-virtuoso/doc/images/mac/osximage15.gif
-virtuoso/doc/images/mac/osximage16.gif
-virtuoso/doc/images/mac/osximage17.gif
-virtuoso/doc/images/mac/osximage18.gif
-virtuoso/doc/images/mac/osximage19.gif
-virtuoso/doc/images/mac/osximage20.gif
-virtuoso/doc/images/mac/osximage21.gif
-virtuoso/doc/images/mac/osximage22.gif
-virtuoso/doc/images/mac/osximage23.gif
-virtuoso/doc/images/mac/osximage25.gif
-virtuoso/doc/images/mac/osximage26.gif
-virtuoso/doc/images/mac/osximage27.gif
-virtuoso/doc/images/mac/osximage28.gif
-virtuoso/doc/images/mac/osximage30.gif
-virtuoso/doc/images/mac/osximage31.gif
-virtuoso/doc/images/mac/osximage32.gif
-virtuoso/doc/images/mac/osximage33.gif
-virtuoso/doc/images/mac/osximage34.gif
-virtuoso/doc/images/mac/v50pe00.png
-virtuoso/doc/images/mac/v50pe01.png
-virtuoso/doc/images/mac/v50pe02.png
-virtuoso/doc/images/mac/v50pe03.png
-virtuoso/doc/images/mac/v50pe04.png
-virtuoso/doc/images/mac/v50pe05.png
-virtuoso/doc/images/mac/v50pe06.png
-virtuoso/doc/images/mac/v50pe07.png
-virtuoso/doc/images/mac/v50pe08.png
-virtuoso/doc/images/mac/v50pe09.png
-virtuoso/doc/images/mac/v50pe10.png
-virtuoso/doc/images/mac/v50pe11.png
-virtuoso/doc/images/mac/v50pe12.png
-virtuoso/doc/images/mac/v50pe13.png
-virtuoso/doc/images/mac/v50pe14.png
-virtuoso/doc/images/mac/v50pe15.png
-virtuoso/doc/images/mac/v50pe16.png
-virtuoso/doc/images/mac/v50pe17.png
-virtuoso/doc/images/mail.jpg
-virtuoso/doc/images/menu-cutout.png
-virtuoso/doc/images/misc/1x1.gif
-virtuoso/doc/images/misc/acopdflogo.gif
-virtuoso/doc/images/misc/favicon.ico
-virtuoso/doc/images/misc/flag-china.gif
-virtuoso/doc/images/misc/flag-france.gif
-virtuoso/doc/images/misc/flag-germany.gif
-virtuoso/doc/images/misc/flag-italy.gif
-virtuoso/doc/images/misc/flag-japan.gif
-virtuoso/doc/images/misc/flag-portugal.gif
-virtuoso/doc/images/misc/flag-spain.gif
-virtuoso/doc/images/misc/leftbg.jpg
-virtuoso/doc/images/misc/leftlogo.gif
-virtuoso/doc/images/misc/logo.jpg
-virtuoso/doc/images/misc/logobg.jpg
-virtuoso/doc/images/misc/splash-blue.jpg
-virtuoso/doc/images/misc/splash.jpg
-virtuoso/doc/images/moblog.gif
-virtuoso/doc/images/moblogconfig.gif
-virtuoso/doc/images/newdsn.png
-virtuoso/doc/images/nntp.png
-virtuoso/doc/images/note.gif
-virtuoso/doc/images/querytools.jpg
-virtuoso/doc/images/querytools.png
-virtuoso/doc/images/rdf.png
-virtuoso/doc/images/rdf1.png
-virtuoso/doc/images/rdf10.png
-virtuoso/doc/images/rdf11.png
-virtuoso/doc/images/rdf12.png
-virtuoso/doc/images/rdf13.png
-virtuoso/doc/images/rdf14.png
-virtuoso/doc/images/rdf15.png
-virtuoso/doc/images/rdf16.png
-virtuoso/doc/images/rdf17.png
-virtuoso/doc/images/rdf18.png
-virtuoso/doc/images/rdf19.png
-virtuoso/doc/images/rdf2.png
-virtuoso/doc/images/rdf3.png
-virtuoso/doc/images/rdf4.png
-virtuoso/doc/images/rdf5.png
-virtuoso/doc/images/rdf6.png
-virtuoso/doc/images/rdf7.png
-virtuoso/doc/images/rdf8.png
-virtuoso/doc/images/rdf9.png
-virtuoso/doc/images/replication.png
-virtuoso/doc/images/rmtadd.png
-virtuoso/doc/images/rmtdsnqry.png
-virtuoso/doc/images/rth/mig001.jpg
-virtuoso/doc/images/rth/mig002.jpg
-virtuoso/doc/images/rth/mig003.jpg
-virtuoso/doc/images/rth/mig004.jpg
-virtuoso/doc/images/rth/mig005.jpg
-virtuoso/doc/images/rth/mig006.jpg
-virtuoso/doc/images/rth/mig007.jpg
-virtuoso/doc/images/rth/mig008.jpg
-virtuoso/doc/images/rth/mig009.png
-virtuoso/doc/images/rth/mig010.png
-virtuoso/doc/images/rth/mig011.png
-virtuoso/doc/images/rth/mig012.png
-virtuoso/doc/images/rth/mig013.jpg
-virtuoso/doc/images/rth/vs001.jpg
-virtuoso/doc/images/rth/vs002.jpg
-virtuoso/doc/images/rth/vs003.jpg
-virtuoso/doc/images/rth/vs004.jpg
-virtuoso/doc/images/rth/vs005.jpg
-virtuoso/doc/images/rth/vs006.jpg
-virtuoso/doc/images/rth/vs007.jpg
-virtuoso/doc/images/rth/vs008.jpg
-virtuoso/doc/images/rth/vs009.jpg
-virtuoso/doc/images/rth/vs010.jpg
-virtuoso/doc/images/rth/vs011.jpg
-virtuoso/doc/images/rth/vs012.jpg
-virtuoso/doc/images/rth/vs013.jpg
-virtuoso/doc/images/rth/vs014.jpg
-virtuoso/doc/images/rth/vs015.jpg
-virtuoso/doc/images/rth/vs016.jpg
-virtuoso/doc/images/rth/vs017.jpg
-virtuoso/doc/images/rth/vs018.jpg
-virtuoso/doc/images/rth/vs019.jpg
-virtuoso/doc/images/rth/writeaspx001.jpg
-virtuoso/doc/images/sampl001.gif
-virtuoso/doc/images/sampl003.gif
-virtuoso/doc/images/sampl004.gif
-virtuoso/doc/images/sampl006.gif
-virtuoso/doc/images/sampl007.gif
-virtuoso/doc/images/sampl008.gif
-virtuoso/doc/images/sampl009.gif
-virtuoso/doc/images/sampl010.gif
-virtuoso/doc/images/sampl011.gif
-virtuoso/doc/images/sampl012.gif
-virtuoso/doc/images/sampl013.gif
-virtuoso/doc/images/sampl014.gif
-virtuoso/doc/images/sampl015.gif
-virtuoso/doc/images/sampl016.gif
-virtuoso/doc/images/sampl017.gif
-virtuoso/doc/images/sampl018.gif
-virtuoso/doc/images/sampl019.gif
-virtuoso/doc/images/sampl020.gif
-virtuoso/doc/images/sampl021.gif
-virtuoso/doc/images/sampl022.gif
-virtuoso/doc/images/startsrv.gif
-virtuoso/doc/images/systemadmin.png
-virtuoso/doc/images/tree/1x1.gif
-virtuoso/doc/images/tree/item.gif
-virtuoso/doc/images/tree/menu.gif
-virtuoso/doc/images/tree/menu2.gif
-virtuoso/doc/images/twitter_home.png
-virtuoso/doc/images/twitter_ode_rdf.png
-virtuoso/doc/images/ui/Excel1.png
-virtuoso/doc/images/ui/Excel2.png
-virtuoso/doc/images/ui/JSON1.png
-virtuoso/doc/images/ui/JSON2.png
-virtuoso/doc/images/ui/ODS3.png
-virtuoso/doc/images/ui/ODS4.png
-virtuoso/doc/images/ui/ODS5.png
-virtuoso/doc/images/ui/ODS6.png
-virtuoso/doc/images/ui/ODS7.png
-virtuoso/doc/images/ui/ODSA.png
-virtuoso/doc/images/ui/ODSB.png
-virtuoso/doc/images/ui/ODSC.png
-virtuoso/doc/images/ui/SparqlFOAFSSL1.png
-virtuoso/doc/images/ui/SparqlFOAFSSL2.png
-virtuoso/doc/images/ui/SparqlFOAFSSL3.png
-virtuoso/doc/images/ui/SparqlFOAFSSL4.png
-virtuoso/doc/images/ui/SparqlFOAFSSL5.png
-virtuoso/doc/images/ui/SparqlFOAFSSL6.png
-virtuoso/doc/images/ui/SparqlOAuth1.png
-virtuoso/doc/images/ui/SparqlOAuth10.png
-virtuoso/doc/images/ui/SparqlOAuth11.png
-virtuoso/doc/images/ui/SparqlOAuth12.png
-virtuoso/doc/images/ui/SparqlOAuth2.png
-virtuoso/doc/images/ui/SparqlOAuth3.png
-virtuoso/doc/images/ui/SparqlOAuth4.png
-virtuoso/doc/images/ui/SparqlOAuth5.png
-virtuoso/doc/images/ui/SparqlOAuth6.png
-virtuoso/doc/images/ui/SparqlOAuth7.png
-virtuoso/doc/images/ui/SparqlOAuth8.png
-virtuoso/doc/images/ui/SparqlOAuth9.png
-virtuoso/doc/images/ui/VirtConductorR2RMLImport01.png
-virtuoso/doc/images/ui/VirtConductorR2RMLImport02.png
-virtuoso/doc/images/ui/VirtConductorR2RMLImport03.png
-virtuoso/doc/images/ui/VirtConductorR2RMLImport04.png
-virtuoso/doc/images/ui/VirtConductorR2RMLImport05.png
-virtuoso/doc/images/ui/VirtConductorR2RMLImport06.png
-virtuoso/doc/images/ui/VirtConductorR2RMLImport07.png
-virtuoso/doc/images/ui/VirtConductorR2RMLImport08.png
-virtuoso/doc/images/ui/VirtFacetUsage1.png
-virtuoso/doc/images/ui/VirtFacetUsage10.png
-virtuoso/doc/images/ui/VirtFacetUsage2.png
-virtuoso/doc/images/ui/VirtFacetUsage3.png
-virtuoso/doc/images/ui/VirtFacetUsage4.png
-virtuoso/doc/images/ui/VirtFacetUsage5.png
-virtuoso/doc/images/ui/VirtFacetUsage6.png
-virtuoso/doc/images/ui/VirtFacetUsage7.png
-virtuoso/doc/images/ui/VirtFacetUsage8.png
-virtuoso/doc/images/ui/VirtFacetUsage9.png
-virtuoso/doc/images/ui/VirtJenaProvider.png
-virtuoso/doc/images/ui/VirtRedLand.png
-virtuoso/doc/images/ui/VirtSesame2Provider.png
-virtuoso/doc/images/ui/acl001.png
-virtuoso/doc/images/ui/acl002.png
-virtuoso/doc/images/ui/acl003.png
-virtuoso/doc/images/ui/adf1.png
-virtuoso/doc/images/ui/admacl.png
-virtuoso/doc/images/ui/admevt_01.png
-virtuoso/doc/images/ui/admevt_01a.png
-virtuoso/doc/images/ui/admprocedures_01.png
-virtuoso/doc/images/ui/admrmtprocs001.png
-virtuoso/doc/images/ui/admrmtprocs002.png
-virtuoso/doc/images/ui/admrmtprocs003.png
-virtuoso/doc/images/ui/admrmtprocs004.png
-virtuoso/doc/images/ui/admrmttbls_01.png
-virtuoso/doc/images/ui/admtables_01.png
-virtuoso/doc/images/ui/admtables_01a.png
-virtuoso/doc/images/ui/admviews_01.png
-virtuoso/doc/images/ui/admvirtdir001.png
-virtuoso/doc/images/ui/admvirtdir002.png
-virtuoso/doc/images/ui/admvirtdir003.png
-virtuoso/doc/images/ui/admvirtdir004.png
-virtuoso/doc/images/ui/admvirtdir005.png
-virtuoso/doc/images/ui/admvirtdir006.png
-virtuoso/doc/images/ui/admvirtdir007.png
-virtuoso/doc/images/ui/admvirtdir008.png
-virtuoso/doc/images/ui/admvirtdir009.png
-virtuoso/doc/images/ui/admvirtdir010.png
-virtuoso/doc/images/ui/admvirtdir011.png
-virtuoso/doc/images/ui/admvirtdir012.png
-virtuoso/doc/images/ui/admvirtdir013.png
-virtuoso/doc/images/ui/admvirtdir014.png
-virtuoso/doc/images/ui/ado1.png
-virtuoso/doc/images/ui/ado10.png
-virtuoso/doc/images/ui/ado11.png
-virtuoso/doc/images/ui/ado12.png
-virtuoso/doc/images/ui/ado13.png
-virtuoso/doc/images/ui/ado3.png
-virtuoso/doc/images/ui/ado4.png
-virtuoso/doc/images/ui/ado5.png
-virtuoso/doc/images/ui/ado6.png
-virtuoso/doc/images/ui/ado7.png
-virtuoso/doc/images/ui/ado8.png
-virtuoso/doc/images/ui/adon8.png
-virtuoso/doc/images/ui/adon9.png
-virtuoso/doc/images/ui/ados10.png
-virtuoso/doc/images/ui/ados11.png
-virtuoso/doc/images/ui/ados12.png
-virtuoso/doc/images/ui/ados13.png
-virtuoso/doc/images/ui/ados14.png
-virtuoso/doc/images/ui/ados15.png
-virtuoso/doc/images/ui/ados16.png
-virtuoso/doc/images/ui/ados17.png
-virtuoso/doc/images/ui/ados18.png
-virtuoso/doc/images/ui/ados7.png
-virtuoso/doc/images/ui/adow1.png
-virtuoso/doc/images/ui/adow11.png
-virtuoso/doc/images/ui/adow12.png
-virtuoso/doc/images/ui/adow15.png
-virtuoso/doc/images/ui/adow16.png
-virtuoso/doc/images/ui/adow3.png
-virtuoso/doc/images/ui/adow4.png
-virtuoso/doc/images/ui/adow5.png
-virtuoso/doc/images/ui/adow6.png
-virtuoso/doc/images/ui/adow8.png
-virtuoso/doc/images/ui/adow9.png
-virtuoso/doc/images/ui/ag1.png
-virtuoso/doc/images/ui/ag2.png
-virtuoso/doc/images/ui/ag3.png
-virtuoso/doc/images/ui/auth1.png
-virtuoso/doc/images/ui/auth3.png
-virtuoso/doc/images/ui/auth4.png
-virtuoso/doc/images/ui/auth5.png
-virtuoso/doc/images/ui/auth6.png
-virtuoso/doc/images/ui/bd1.png
-virtuoso/doc/images/ui/bd10.png
-virtuoso/doc/images/ui/bd11.png
-virtuoso/doc/images/ui/bd12.png
-virtuoso/doc/images/ui/bd13.png
-virtuoso/doc/images/ui/bd14.png
-virtuoso/doc/images/ui/bd15.png
-virtuoso/doc/images/ui/bd16.png
-virtuoso/doc/images/ui/bd17.png
-virtuoso/doc/images/ui/bd18.png
-virtuoso/doc/images/ui/bd19.png
-virtuoso/doc/images/ui/bd2.png
-virtuoso/doc/images/ui/bd20.png
-virtuoso/doc/images/ui/bd21.png
-virtuoso/doc/images/ui/bd22.png
-virtuoso/doc/images/ui/bd23.png
-virtuoso/doc/images/ui/bd24.png
-virtuoso/doc/images/ui/bd25.png
-virtuoso/doc/images/ui/bd26.png
-virtuoso/doc/images/ui/bd27.png
-virtuoso/doc/images/ui/bd28.png
-virtuoso/doc/images/ui/bd29.png
-virtuoso/doc/images/ui/bd3.png
-virtuoso/doc/images/ui/bd30.png
-virtuoso/doc/images/ui/bd31.png
-virtuoso/doc/images/ui/bd32.png
-virtuoso/doc/images/ui/bd33.png
-virtuoso/doc/images/ui/bd34.png
-virtuoso/doc/images/ui/bd35.png
-virtuoso/doc/images/ui/bd36.png
-virtuoso/doc/images/ui/bd37.png
-virtuoso/doc/images/ui/bd38.png
-virtuoso/doc/images/ui/bd39.png
-virtuoso/doc/images/ui/bd4.png
-virtuoso/doc/images/ui/bd40.png
-virtuoso/doc/images/ui/bd41.png
-virtuoso/doc/images/ui/bd5.png
-virtuoso/doc/images/ui/bd6.png
-virtuoso/doc/images/ui/bd7.png
-virtuoso/doc/images/ui/bd8.png
-virtuoso/doc/images/ui/bd9.png
-virtuoso/doc/images/ui/blog001.jpg
-virtuoso/doc/images/ui/blog002.jpg
-virtuoso/doc/images/ui/blog003.jpg
-virtuoso/doc/images/ui/blog004.jpg
-virtuoso/doc/images/ui/blog005.jpg
-virtuoso/doc/images/ui/blog006.jpg
-virtuoso/doc/images/ui/blog007.jpg
-virtuoso/doc/images/ui/blog008.jpg
-virtuoso/doc/images/ui/blog009.jpg
-virtuoso/doc/images/ui/blog010.jpg
-virtuoso/doc/images/ui/blog011.jpg
-virtuoso/doc/images/ui/blog012.jpg
-virtuoso/doc/images/ui/blog013.jpg
-virtuoso/doc/images/ui/cartrapikey.png
-virtuoso/doc/images/ui/cfolder.png
-virtuoso/doc/images/ui/cn1.png
-virtuoso/doc/images/ui/cn2.png
-virtuoso/doc/images/ui/cr1.png
-virtuoso/doc/images/ui/cr10.png
-virtuoso/doc/images/ui/cr11.png
-virtuoso/doc/images/ui/cr11a.png
-virtuoso/doc/images/ui/cr11b.png
-virtuoso/doc/images/ui/cr12.png
-virtuoso/doc/images/ui/cr12a.png
-virtuoso/doc/images/ui/cr13.png
-virtuoso/doc/images/ui/cr14.png
-virtuoso/doc/images/ui/cr15.png
-virtuoso/doc/images/ui/cr16.png
-virtuoso/doc/images/ui/cr17.png
-virtuoso/doc/images/ui/cr17a.png
-virtuoso/doc/images/ui/cr18.png
-virtuoso/doc/images/ui/cr19.png
-virtuoso/doc/images/ui/cr2.png
-virtuoso/doc/images/ui/cr20.png
-virtuoso/doc/images/ui/cr21.png
-virtuoso/doc/images/ui/cr3.png
-virtuoso/doc/images/ui/cr4.png
-virtuoso/doc/images/ui/cr5.png
-virtuoso/doc/images/ui/cr6.png
-virtuoso/doc/images/ui/cr7.png
-virtuoso/doc/images/ui/cr8.png
-virtuoso/doc/images/ui/cr9.png
-virtuoso/doc/images/ui/cra1.png
-virtuoso/doc/images/ui/cra10.png
-virtuoso/doc/images/ui/cra11.png
-virtuoso/doc/images/ui/cra12.png
-virtuoso/doc/images/ui/cra13.png
-virtuoso/doc/images/ui/cra14.png
-virtuoso/doc/images/ui/cra15.png
-virtuoso/doc/images/ui/cra2.png
-virtuoso/doc/images/ui/cra3.png
-virtuoso/doc/images/ui/cra4.png
-virtuoso/doc/images/ui/cra5.png
-virtuoso/doc/images/ui/cra6.png
-virtuoso/doc/images/ui/cra7.png
-virtuoso/doc/images/ui/cra8.png
-virtuoso/doc/images/ui/cra9.png
-virtuoso/doc/images/ui/d1.png
-virtuoso/doc/images/ui/d1a.png
-virtuoso/doc/images/ui/d2.png
-virtuoso/doc/images/ui/d3.png
-virtuoso/doc/images/ui/d4.png
-virtuoso/doc/images/ui/d5.png
-virtuoso/doc/images/ui/d6.png
-virtuoso/doc/images/ui/d7.png
-virtuoso/doc/images/ui/dav_freetxt_01.jpg
-virtuoso/doc/images/ui/dav_idxprprty_01.png
-virtuoso/doc/images/ui/dav_rbt_expt_02.png
-virtuoso/doc/images/ui/dav_rbt_que_01.png
-virtuoso/doc/images/ui/dav_rbt_rtrd_01.png
-virtuoso/doc/images/ui/dav_rbt_trgt_01.png
-virtuoso/doc/images/ui/dav_rbt_trgt_02.png
-virtuoso/doc/images/ui/dav_resrctyp_01.png
-virtuoso/doc/images/ui/dav_txtresults_01.jpg
-virtuoso/doc/images/ui/dav_txttrigr_01.jpg
-virtuoso/doc/images/ui/dav_xpath_01.png
-virtuoso/doc/images/ui/dav_xpath_02.png
-virtuoso/doc/images/ui/dav_xpath_03.png
-virtuoso/doc/images/ui/dav_xpath_04.png
-virtuoso/doc/images/ui/dav_xpath_05.png
-virtuoso/doc/images/ui/davcont001.jpg
-virtuoso/doc/images/ui/db_strtp_01.png
-virtuoso/doc/images/ui/db_strtp_02.png
-virtuoso/doc/images/ui/db_strtp_03.png
-virtuoso/doc/images/ui/db_strtp_04.png
-virtuoso/doc/images/ui/db_strtp_05.png
-virtuoso/doc/images/ui/db_strtp_06.png
-virtuoso/doc/images/ui/db_strtp_07.png
-virtuoso/doc/images/ui/demodbinstall_01.png
-virtuoso/doc/images/ui/demodbinstall_02.png
-virtuoso/doc/images/ui/demodbinstall_03.png
-virtuoso/doc/images/ui/demodbinstall_04.png
-virtuoso/doc/images/ui/dora1.png
-virtuoso/doc/images/ui/dora10.png
-virtuoso/doc/images/ui/dora9.png
-virtuoso/doc/images/ui/editres.png
-virtuoso/doc/images/ui/einf4.png
-virtuoso/doc/images/ui/eora2.png
-virtuoso/doc/images/ui/eora3.png
-virtuoso/doc/images/ui/eora5.png
-virtuoso/doc/images/ui/eora6.png
-virtuoso/doc/images/ui/exmp1.png
-virtuoso/doc/images/ui/export_srv_cert.png
-virtuoso/doc/images/ui/f1.png
-virtuoso/doc/images/ui/f10.png
-virtuoso/doc/images/ui/f11.png
-virtuoso/doc/images/ui/f12.png
-virtuoso/doc/images/ui/f13.png
-virtuoso/doc/images/ui/f14.png
-virtuoso/doc/images/ui/f15.png
-virtuoso/doc/images/ui/f16.png
-virtuoso/doc/images/ui/f17.png
-virtuoso/doc/images/ui/f18.png
-virtuoso/doc/images/ui/f19.png
-virtuoso/doc/images/ui/f2.png
-virtuoso/doc/images/ui/f20.png
-virtuoso/doc/images/ui/f21.png
-virtuoso/doc/images/ui/f22.png
-virtuoso/doc/images/ui/f23.png
-virtuoso/doc/images/ui/f24.png
-virtuoso/doc/images/ui/f3.png
-virtuoso/doc/images/ui/f4.png
-virtuoso/doc/images/ui/f5.png
-virtuoso/doc/images/ui/f6.png
-virtuoso/doc/images/ui/f7.png
-virtuoso/doc/images/ui/f8.png
-virtuoso/doc/images/ui/f9.png
-virtuoso/doc/images/ui/fb1.png
-virtuoso/doc/images/ui/fb10.png
-virtuoso/doc/images/ui/fb11.png
-virtuoso/doc/images/ui/fb12.png
-virtuoso/doc/images/ui/fb13.png
-virtuoso/doc/images/ui/fb14.png
-virtuoso/doc/images/ui/fb15.png
-virtuoso/doc/images/ui/fb16.png
-virtuoso/doc/images/ui/fb17.png
-virtuoso/doc/images/ui/fb18.png
-virtuoso/doc/images/ui/fb19.png
-virtuoso/doc/images/ui/fb2.png
-virtuoso/doc/images/ui/fb20.png
-virtuoso/doc/images/ui/fb21.png
-virtuoso/doc/images/ui/fb22.png
-virtuoso/doc/images/ui/fb23.png
-virtuoso/doc/images/ui/fb24.png
-virtuoso/doc/images/ui/fb25.png
-virtuoso/doc/images/ui/fb26.png
-virtuoso/doc/images/ui/fb27.png
-virtuoso/doc/images/ui/fb28.png
-virtuoso/doc/images/ui/fb29.png
-virtuoso/doc/images/ui/fb3.png
-virtuoso/doc/images/ui/fb30.png
-virtuoso/doc/images/ui/fb31.png
-virtuoso/doc/images/ui/fb32.png
-virtuoso/doc/images/ui/fb33.png
-virtuoso/doc/images/ui/fb34.png
-virtuoso/doc/images/ui/fb35.png
-virtuoso/doc/images/ui/fb36.png
-virtuoso/doc/images/ui/fb37.png
-virtuoso/doc/images/ui/fb38.png
-virtuoso/doc/images/ui/fb4.png
-virtuoso/doc/images/ui/fb5.png
-virtuoso/doc/images/ui/fb6.png
-virtuoso/doc/images/ui/fb7.png
-virtuoso/doc/images/ui/fb8.png
-virtuoso/doc/images/ui/fb9.png
-virtuoso/doc/images/ui/fcapiex1.png
-virtuoso/doc/images/ui/fct1.png
-virtuoso/doc/images/ui/fct10.png
-virtuoso/doc/images/ui/fct11.png
-virtuoso/doc/images/ui/fct12.png
-virtuoso/doc/images/ui/fct13.png
-virtuoso/doc/images/ui/fct14.png
-virtuoso/doc/images/ui/fct15.png
-virtuoso/doc/images/ui/fct2.png
-virtuoso/doc/images/ui/fct3.png
-virtuoso/doc/images/ui/fct4.png
-virtuoso/doc/images/ui/fct5.png
-virtuoso/doc/images/ui/fct6.png
-virtuoso/doc/images/ui/fct7.png
-virtuoso/doc/images/ui/fct8.png
-virtuoso/doc/images/ui/fct9.png
-virtuoso/doc/images/ui/fctinst1.png
-virtuoso/doc/images/ui/fctinst10.png
-virtuoso/doc/images/ui/fctinst11.png
-virtuoso/doc/images/ui/fctinst12.png
-virtuoso/doc/images/ui/fctinst13.png
-virtuoso/doc/images/ui/fctinst2.png
-virtuoso/doc/images/ui/fctinst3.png
-virtuoso/doc/images/ui/fctinst4.png
-virtuoso/doc/images/ui/fctinst5.png
-virtuoso/doc/images/ui/fctinst6.png
-virtuoso/doc/images/ui/fctinst7.png
-virtuoso/doc/images/ui/fctinst8.png
-virtuoso/doc/images/ui/fctinst9.png
-virtuoso/doc/images/ui/foafssl1.png
-virtuoso/doc/images/ui/foafssl10.png
-virtuoso/doc/images/ui/foafssl11.png
-virtuoso/doc/images/ui/foafssl12.png
-virtuoso/doc/images/ui/foafssl13.png
-virtuoso/doc/images/ui/foafssl14.png
-virtuoso/doc/images/ui/foafssl15.png
-virtuoso/doc/images/ui/foafssl16.png
-virtuoso/doc/images/ui/foafssl17.png
-virtuoso/doc/images/ui/foafssl18.png
-virtuoso/doc/images/ui/foafssl19.png
-virtuoso/doc/images/ui/foafssl2.png
-virtuoso/doc/images/ui/foafssl20.png
-virtuoso/doc/images/ui/foafssl21.png
-virtuoso/doc/images/ui/foafssl22.png
-virtuoso/doc/images/ui/foafssl23.png
-virtuoso/doc/images/ui/foafssl24.png
-virtuoso/doc/images/ui/foafssl25.png
-virtuoso/doc/images/ui/foafssl26.png
-virtuoso/doc/images/ui/foafssl27.png
-virtuoso/doc/images/ui/foafssl3.png
-virtuoso/doc/images/ui/foafssl4.png
-virtuoso/doc/images/ui/foafssl5.png
-virtuoso/doc/images/ui/foafssl6.png
-virtuoso/doc/images/ui/foafssl7.png
-virtuoso/doc/images/ui/foafssl8.png
-virtuoso/doc/images/ui/foafssl9.png
-virtuoso/doc/images/ui/fsp1.png
-virtuoso/doc/images/ui/fsp2.png
-virtuoso/doc/images/ui/fsp3.png
-virtuoso/doc/images/ui/fsp4.png
-virtuoso/doc/images/ui/fsp5.png
-virtuoso/doc/images/ui/fsp6.png
-virtuoso/doc/images/ui/htps1.png
-virtuoso/doc/images/ui/htps10.png
-virtuoso/doc/images/ui/htps2.png
-virtuoso/doc/images/ui/htps3.png
-virtuoso/doc/images/ui/htps4.png
-virtuoso/doc/images/ui/htps5.png
-virtuoso/doc/images/ui/htps6.png
-virtuoso/doc/images/ui/htps7.png
-virtuoso/doc/images/ui/htps8.png
-virtuoso/doc/images/ui/htps9.png
-virtuoso/doc/images/ui/insg1.png
-virtuoso/doc/images/ui/insg10.png
-virtuoso/doc/images/ui/insg11.png
-virtuoso/doc/images/ui/insg12.png
-virtuoso/doc/images/ui/insg13.png
-virtuoso/doc/images/ui/insg14.png
-virtuoso/doc/images/ui/insg15.png
-virtuoso/doc/images/ui/insg16.png
-virtuoso/doc/images/ui/insg17.png
-virtuoso/doc/images/ui/insg18.png
-virtuoso/doc/images/ui/insg19.png
-virtuoso/doc/images/ui/insg20.png
-virtuoso/doc/images/ui/insg21.png
-virtuoso/doc/images/ui/insg22.png
-virtuoso/doc/images/ui/insg23.png
-virtuoso/doc/images/ui/insg5.png
-virtuoso/doc/images/ui/insg6.png
-virtuoso/doc/images/ui/insg7.png
-virtuoso/doc/images/ui/insg8.png
-virtuoso/doc/images/ui/insg9.png
-virtuoso/doc/images/ui/instmac.png
-virtuoso/doc/images/ui/instmac2.png
-virtuoso/doc/images/ui/keys1.png
-virtuoso/doc/images/ui/keys10.png
-virtuoso/doc/images/ui/keys11.png
-virtuoso/doc/images/ui/keys12.png
-virtuoso/doc/images/ui/keys13.png
-virtuoso/doc/images/ui/keys14.png
-virtuoso/doc/images/ui/keys15.png
-virtuoso/doc/images/ui/keys16.png
-virtuoso/doc/images/ui/keys17.png
-virtuoso/doc/images/ui/keys18.png
-virtuoso/doc/images/ui/keys19.png
-virtuoso/doc/images/ui/keys2.png
-virtuoso/doc/images/ui/keys20.png
-virtuoso/doc/images/ui/keys21.png
-virtuoso/doc/images/ui/keys22.png
-virtuoso/doc/images/ui/keys23.png
-virtuoso/doc/images/ui/keys24.png
-virtuoso/doc/images/ui/keys25.png
-virtuoso/doc/images/ui/keys3.png
-virtuoso/doc/images/ui/keys4.png
-virtuoso/doc/images/ui/keys5.png
-virtuoso/doc/images/ui/keys6.png
-virtuoso/doc/images/ui/keys7.png
-virtuoso/doc/images/ui/keys8.png
-virtuoso/doc/images/ui/keys9.png
-virtuoso/doc/images/ui/ldap1.png
-virtuoso/doc/images/ui/ldap2.png
-virtuoso/doc/images/ui/ldap3.png
-virtuoso/doc/images/ui/ldap3a.png
-virtuoso/doc/images/ui/ldap4.png
-virtuoso/doc/images/ui/ldap5.png
-virtuoso/doc/images/ui/ldap6.png
-virtuoso/doc/images/ui/ldap7.png
-virtuoso/doc/images/ui/ldap8.png
-virtuoso/doc/images/ui/lock_16.png
-virtuoso/doc/images/ui/m1.png
-virtuoso/doc/images/ui/m10.png
-virtuoso/doc/images/ui/m11.png
-virtuoso/doc/images/ui/m12.png
-virtuoso/doc/images/ui/m13.png
-virtuoso/doc/images/ui/m14.png
-virtuoso/doc/images/ui/m15.png
-virtuoso/doc/images/ui/m16.png
-virtuoso/doc/images/ui/m17.png
-virtuoso/doc/images/ui/m18.png
-virtuoso/doc/images/ui/m19.png
-virtuoso/doc/images/ui/m2.png
-virtuoso/doc/images/ui/m20.png
-virtuoso/doc/images/ui/m21.png
-virtuoso/doc/images/ui/m22.png
-virtuoso/doc/images/ui/m23.png
-virtuoso/doc/images/ui/m24.png
-virtuoso/doc/images/ui/m25.png
-virtuoso/doc/images/ui/m26.png
-virtuoso/doc/images/ui/m27.png
-virtuoso/doc/images/ui/m28.png
-virtuoso/doc/images/ui/m29.png
-virtuoso/doc/images/ui/m3.png
-virtuoso/doc/images/ui/m30.png
-virtuoso/doc/images/ui/m31.png
-virtuoso/doc/images/ui/m32.png
-virtuoso/doc/images/ui/m33.png
-virtuoso/doc/images/ui/m34.png
-virtuoso/doc/images/ui/m35.png
-virtuoso/doc/images/ui/m36.png
-virtuoso/doc/images/ui/m36a.png
-virtuoso/doc/images/ui/m38.png
-virtuoso/doc/images/ui/m4.png
-virtuoso/doc/images/ui/m5.png
-virtuoso/doc/images/ui/m6.png
-virtuoso/doc/images/ui/m7.png
-virtuoso/doc/images/ui/m8.png
-virtuoso/doc/images/ui/m9.png
-virtuoso/doc/images/ui/mail_comp_01.jpg
-virtuoso/doc/images/ui/mail_get_01.jpg
-virtuoso/doc/images/ui/mail_messlst_01.jpg
-virtuoso/doc/images/ui/meditres.png
-virtuoso/doc/images/ui/meditres2.png
-virtuoso/doc/images/ui/news_add_01.png
-virtuoso/doc/images/ui/news_addgrp_01.png
-virtuoso/doc/images/ui/news_adm_01.png
-virtuoso/doc/images/ui/news_adm_01a.png
-virtuoso/doc/images/ui/news_adm_01b.png
-virtuoso/doc/images/ui/news_adm_01c.png
-virtuoso/doc/images/ui/news_lclsrvr_01.png
-virtuoso/doc/images/ui/news_nntperr_01.jpg
-virtuoso/doc/images/ui/news_txtres_01.jpg
-virtuoso/doc/images/ui/news_txtsrch_01.jpg
-virtuoso/doc/images/ui/oc1.png
-virtuoso/doc/images/ui/oc2.png
-virtuoso/doc/images/ui/oc3.png
-virtuoso/doc/images/ui/oc4.png
-virtuoso/doc/images/ui/oc5.png
-virtuoso/doc/images/ui/odbcadm_01.png
-virtuoso/doc/images/ui/qry_sql_01.png
-virtuoso/doc/images/ui/qry_sql_01a.png
-virtuoso/doc/images/ui/qry_sql_02.png
-virtuoso/doc/images/ui/qry_sql_02a.png
-virtuoso/doc/images/ui/qs-dav001.png
-virtuoso/doc/images/ui/qs-dav002.png
-virtuoso/doc/images/ui/qs-dav003.png
-virtuoso/doc/images/ui/qs-dav004.png
-virtuoso/doc/images/ui/qs-dav005.png
-virtuoso/doc/images/ui/qs-dav006.png
-virtuoso/doc/images/ui/qssql2xml001.png
-virtuoso/doc/images/ui/qssql2xml002.png
-virtuoso/doc/images/ui/qssql2xml003.png
-virtuoso/doc/images/ui/qssql2xml101.png
-virtuoso/doc/images/ui/qssql2xml102.png
-virtuoso/doc/images/ui/qssql2xml103.png
-virtuoso/doc/images/ui/r1.png
-virtuoso/doc/images/ui/r10.png
-virtuoso/doc/images/ui/r11.png
-virtuoso/doc/images/ui/r12.png
-virtuoso/doc/images/ui/r13.png
-virtuoso/doc/images/ui/r13a.png
-virtuoso/doc/images/ui/r15.png
-virtuoso/doc/images/ui/r16.png
-virtuoso/doc/images/ui/r18.png
-virtuoso/doc/images/ui/r19.png
-virtuoso/doc/images/ui/r2.png
-virtuoso/doc/images/ui/r22.png
-virtuoso/doc/images/ui/r23.png
-virtuoso/doc/images/ui/r24.png
-virtuoso/doc/images/ui/r3.png
-virtuoso/doc/images/ui/r4.png
-virtuoso/doc/images/ui/r5.png
-virtuoso/doc/images/ui/r6.png
-virtuoso/doc/images/ui/r7.png
-virtuoso/doc/images/ui/r8.png
-virtuoso/doc/images/ui/r9.png
-virtuoso/doc/images/ui/rd1.png
-virtuoso/doc/images/ui/rd13.png
-virtuoso/doc/images/ui/rd14.png
-virtuoso/doc/images/ui/rd15.png
-virtuoso/doc/images/ui/rd2.png
-virtuoso/doc/images/ui/rd3.png
-virtuoso/doc/images/ui/rd4.png
-virtuoso/doc/images/ui/rd5.png
-virtuoso/doc/images/ui/rd6.png
-virtuoso/doc/images/ui/rd7.png
-virtuoso/doc/images/ui/rd8.png
-virtuoso/doc/images/ui/rd9.png
-virtuoso/doc/images/ui/rdfinsert1.png
-virtuoso/doc/images/ui/rdfinsert11.png
-virtuoso/doc/images/ui/rdfinsert12.png
-virtuoso/doc/images/ui/rdfinsert13.png
-virtuoso/doc/images/ui/rdfinsert14.png
-virtuoso/doc/images/ui/rdfinsert15.png
-virtuoso/doc/images/ui/rdfinsert16.png
-virtuoso/doc/images/ui/rdfinsert17.png
-virtuoso/doc/images/ui/rdfinsert18.png
-virtuoso/doc/images/ui/rdfinsert19.png
-virtuoso/doc/images/ui/rdfinsert2.png
-virtuoso/doc/images/ui/rdfinsert20.png
-virtuoso/doc/images/ui/rdfinsert21.png
-virtuoso/doc/images/ui/rdfinsertwebdav22.png
-virtuoso/doc/images/ui/rdfinsertwebdav23.png
-virtuoso/doc/images/ui/replt_ss_01.png
-virtuoso/doc/images/ui/replt_ss_add_01.png
-virtuoso/doc/images/ui/replt_ss_add_02.png
-virtuoso/doc/images/ui/replt_ss_add_03.png
-virtuoso/doc/images/ui/replt_ss_add_04.png
-virtuoso/doc/images/ui/replt_ss_add_05.png
-virtuoso/doc/images/ui/replt_ss_add_06.png
-virtuoso/doc/images/ui/replt_trans_sub_01.png
-virtuoso/doc/images/ui/replt_trans_sub_02.png
-virtuoso/doc/images/ui/repltranspub001.png
-virtuoso/doc/images/ui/repltranspub002.png
-virtuoso/doc/images/ui/repltranspub002a.png
-virtuoso/doc/images/ui/repltranspub003.png
-virtuoso/doc/images/ui/repltranspub004.png
-virtuoso/doc/images/ui/repltranspub005.png
-virtuoso/doc/images/ui/repltranspub006.png
-virtuoso/doc/images/ui/ria1.png
-virtuoso/doc/images/ui/ria10.png
-virtuoso/doc/images/ui/ria2.png
-virtuoso/doc/images/ui/ria3.png
-virtuoso/doc/images/ui/ria4.png
-virtuoso/doc/images/ui/ria5.png
-virtuoso/doc/images/ui/ria6.png
-virtuoso/doc/images/ui/ria7.png
-virtuoso/doc/images/ui/ria8.png
-virtuoso/doc/images/ui/ria9.png
-virtuoso/doc/images/ui/riad1.png
-virtuoso/doc/images/ui/riad2.png
-virtuoso/doc/images/ui/riad3.png
-virtuoso/doc/images/ui/riad4.png
-virtuoso/doc/images/ui/rmtconnected_01.png
-virtuoso/doc/images/ui/rth001.png
-virtuoso/doc/images/ui/rth002.png
-virtuoso/doc/images/ui/rth003.png
-virtuoso/doc/images/ui/s1.png
-virtuoso/doc/images/ui/s2.png
-virtuoso/doc/images/ui/s3.png
-virtuoso/doc/images/ui/s4.png
-virtuoso/doc/images/ui/s5.png
-virtuoso/doc/images/ui/scp1.png
-virtuoso/doc/images/ui/scp10.png
-virtuoso/doc/images/ui/scp11.png
-virtuoso/doc/images/ui/scp12.png
-virtuoso/doc/images/ui/scp13.png
-virtuoso/doc/images/ui/scp14.png
-virtuoso/doc/images/ui/scp2.png
-virtuoso/doc/images/ui/scp3.png
-virtuoso/doc/images/ui/scp4.png
-virtuoso/doc/images/ui/scp5.png
-virtuoso/doc/images/ui/scp6.png
-virtuoso/doc/images/ui/scp7.png
-virtuoso/doc/images/ui/scp8.png
-virtuoso/doc/images/ui/scp9.png
-virtuoso/doc/images/ui/si1.png
-virtuoso/doc/images/ui/si2.png
-virtuoso/doc/images/ui/si3.png
-virtuoso/doc/images/ui/si4.png
-virtuoso/doc/images/ui/si5.png
-virtuoso/doc/images/ui/si6.png
-virtuoso/doc/images/ui/si7.png
-virtuoso/doc/images/ui/sink1.png
-virtuoso/doc/images/ui/sink2.png
-virtuoso/doc/images/ui/sink3.png
-virtuoso/doc/images/ui/sink4.png
-virtuoso/doc/images/ui/so1.png
-virtuoso/doc/images/ui/so11.png
-virtuoso/doc/images/ui/so12.png
-virtuoso/doc/images/ui/so13.png
-virtuoso/doc/images/ui/so14.png
-virtuoso/doc/images/ui/so15.png
-virtuoso/doc/images/ui/so16.png
-virtuoso/doc/images/ui/so2.png
-virtuoso/doc/images/ui/so3.png
-virtuoso/doc/images/ui/so4.png
-virtuoso/doc/images/ui/so5.png
-virtuoso/doc/images/ui/so6.png
-virtuoso/doc/images/ui/so7.png
-virtuoso/doc/images/ui/so8.png
-virtuoso/doc/images/ui/so9.png
-virtuoso/doc/images/ui/sparqlwinf1.png
-virtuoso/doc/images/ui/sparqlwinf10.png
-virtuoso/doc/images/ui/sparqlwinf11.png
-virtuoso/doc/images/ui/sparqlwinf12.png
-virtuoso/doc/images/ui/sparqlwinf13.png
-virtuoso/doc/images/ui/sparqlwinf14.png
-virtuoso/doc/images/ui/sparqlwinf15.png
-virtuoso/doc/images/ui/sparqlwinf16.png
-virtuoso/doc/images/ui/sparqlwinf17.png
-virtuoso/doc/images/ui/sparqlwinf18.png
-virtuoso/doc/images/ui/sparqlwinf19.png
-virtuoso/doc/images/ui/sparqlwinf2.png
-virtuoso/doc/images/ui/sparqlwinf20.png
-virtuoso/doc/images/ui/sparqlwinf21.png
-virtuoso/doc/images/ui/sparqlwinf22.png
-virtuoso/doc/images/ui/sparqlwinf23.png
-virtuoso/doc/images/ui/sparqlwinf24.png
-virtuoso/doc/images/ui/sparqlwinf25.png
-virtuoso/doc/images/ui/sparqlwinf26.png
-virtuoso/doc/images/ui/sparqlwinf27.png
-virtuoso/doc/images/ui/sparqlwinf28.png
-virtuoso/doc/images/ui/sparqlwinf29.png
-virtuoso/doc/images/ui/sparqlwinf3.png
-virtuoso/doc/images/ui/sparqlwinf30.png
-virtuoso/doc/images/ui/sparqlwinf31.png
-virtuoso/doc/images/ui/sparqlwinf32.png
-virtuoso/doc/images/ui/sparqlwinf33.png
-virtuoso/doc/images/ui/sparqlwinf34.png
-virtuoso/doc/images/ui/sparqlwinf35.png
-virtuoso/doc/images/ui/sparqlwinf4.png
-virtuoso/doc/images/ui/sparqlwinf5.png
-virtuoso/doc/images/ui/sparqlwinf6.png
-virtuoso/doc/images/ui/sparqlwinf7.png
-virtuoso/doc/images/ui/sparqlwinf8.png
-virtuoso/doc/images/ui/sparqlwinf9.png
-virtuoso/doc/images/ui/spbi1.png
-virtuoso/doc/images/ui/spong1.png
-virtuoso/doc/images/ui/spong2.png
-virtuoso/doc/images/ui/spong3.png
-virtuoso/doc/images/ui/spong4.png
-virtuoso/doc/images/ui/spong5.png
-virtuoso/doc/images/ui/spong6.png
-virtuoso/doc/images/ui/spong7.png
-virtuoso/doc/images/ui/spqc1.png
-virtuoso/doc/images/ui/sql_xml_mng_01.png
-virtuoso/doc/images/ui/ss1.png
-virtuoso/doc/images/ui/ss10.png
-virtuoso/doc/images/ui/ss11.png
-virtuoso/doc/images/ui/ss12.png
-virtuoso/doc/images/ui/ss13.png
-virtuoso/doc/images/ui/ss2.png
-virtuoso/doc/images/ui/ss3.png
-virtuoso/doc/images/ui/ss4.png
-virtuoso/doc/images/ui/ss5.png
-virtuoso/doc/images/ui/ss7.png
-virtuoso/doc/images/ui/ss8.png
-virtuoso/doc/images/ui/ss9.png
-virtuoso/doc/images/ui/sts_audit_01.jpg
-virtuoso/doc/images/ui/sts_dsk_01.png
-virtuoso/doc/images/ui/sts_gen_01.png
-virtuoso/doc/images/ui/sts_httpsvr_01.png
-virtuoso/doc/images/ui/sts_idx_01.png
-virtuoso/doc/images/ui/sts_lck_01.jpg
-virtuoso/doc/images/ui/sts_profile_01.png
-virtuoso/doc/images/ui/topo-chain.png
-virtuoso/doc/images/ui/topo-scenario.png
-virtuoso/doc/images/ui/topo-star.png
-virtuoso/doc/images/ui/trs1.png
-virtuoso/doc/images/ui/trs2.png
-virtuoso/doc/images/ui/uado1.png
-virtuoso/doc/images/ui/uado10.png
-virtuoso/doc/images/ui/uado11.png
-virtuoso/doc/images/ui/uado12.png
-virtuoso/doc/images/ui/uado13.png
-virtuoso/doc/images/ui/uado14.png
-virtuoso/doc/images/ui/uado15.png
-virtuoso/doc/images/ui/uado16.png
-virtuoso/doc/images/ui/uado17.png
-virtuoso/doc/images/ui/uado18.png
-virtuoso/doc/images/ui/uado19.png
-virtuoso/doc/images/ui/uado2.png
-virtuoso/doc/images/ui/uado20.png
-virtuoso/doc/images/ui/uado21.png
-virtuoso/doc/images/ui/uado3.png
-virtuoso/doc/images/ui/uado4.png
-virtuoso/doc/images/ui/uado5.png
-virtuoso/doc/images/ui/uado6.png
-virtuoso/doc/images/ui/uado7.png
-virtuoso/doc/images/ui/uado8.png
-virtuoso/doc/images/ui/uado9.png
-virtuoso/doc/images/ui/uados1.png
-virtuoso/doc/images/ui/uc1.png
-virtuoso/doc/images/ui/uc2.png
-virtuoso/doc/images/ui/uc3.png
-virtuoso/doc/images/ui/uc4.png
-virtuoso/doc/images/ui/uc5.png
-virtuoso/doc/images/ui/uc6.png
-virtuoso/doc/images/ui/uc7.png
-virtuoso/doc/images/ui/ufile.png
-virtuoso/doc/images/ui/urlrw1.png
-virtuoso/doc/images/ui/usr1.png
-virtuoso/doc/images/ui/usr2.png
-virtuoso/doc/images/ui/usrt.png
-virtuoso/doc/images/ui/virtdir1.png
-virtuoso/doc/images/ui/virtdir2.png
-virtuoso/doc/images/ui/virtdir3.png
-virtuoso/doc/images/ui/virtdir4.png
-virtuoso/doc/images/ui/virtdir5.png
-virtuoso/doc/images/ui/virtdsn_01.png
-virtuoso/doc/images/ui/virthost2.png
-virtuoso/doc/images/ui/virthost3.png
-virtuoso/doc/images/ui/virthost3a.png
-virtuoso/doc/images/ui/virthost4.png
-virtuoso/doc/images/ui/vsmx001.png
-virtuoso/doc/images/ui/win_destination_folder.jpg
-virtuoso/doc/images/ui/win_file_copystart.jpg
-virtuoso/doc/images/ui/win_install_folder.jpg
-virtuoso/doc/images/ui/win_install_type.jpg
-virtuoso/doc/images/ui/win_installer_program.jpg
-virtuoso/doc/images/ui/win_launch_manager.jpg
-virtuoso/doc/images/ui/win_license_agreement.jpg
-virtuoso/doc/images/ui/win_locate_manager.jpg
-virtuoso/doc/images/ui/win_obtain_license.jpg
-virtuoso/doc/images/ui/win_start_service.jpg
-virtuoso/doc/images/ui/win_virt_admin.jpg
-virtuoso/doc/images/ui/winpinst14.png
-virtuoso/doc/images/ui/winpinst15.png
-virtuoso/doc/images/ui/winpinst16.png
-virtuoso/doc/images/ui/winpinst17.png
-virtuoso/doc/images/ui/wsdlimp001.png
-virtuoso/doc/images/ui/wsdlimp002.png
-virtuoso/doc/images/varch32.jpg
-virtuoso/doc/images/virt002.gif
-virtuoso/doc/images/virt003.gif
-virtuoso/doc/images/virt004.gif
-virtuoso/doc/images/virt005.gif
-virtuoso/doc/images/virt006.gif
-virtuoso/doc/images/virt007.gif
-virtuoso/doc/images/virtdsn001.jpg
-virtuoso/doc/images/virtdsn001.png
-virtuoso/doc/images/virtdsn002.jpg
-virtuoso/doc/images/virtdsn002.png
-virtuoso/doc/images/virtdsn003.jpg
-virtuoso/doc/images/virtdsn003.png
-virtuoso/doc/images/virtdsn004.jpg
-virtuoso/doc/images/virtdsn005.jpg
-virtuoso/doc/images/virtinst12.gif
-virtuoso/doc/images/virtpyramid.jpg
-virtuoso/doc/images/virttour1.png
-virtuoso/doc/images/virttour2.gif
-virtuoso/doc/images/virttour3.gif
-virtuoso/doc/images/virttour32.gif
-virtuoso/doc/images/virttour33.gif
-virtuoso/doc/images/virttour4.gif
-virtuoso/doc/images/virttour5.gif
-virtuoso/doc/images/virttour6.gif
-virtuoso/doc/images/virttour7.gif
-virtuoso/doc/images/virttour8.png
-virtuoso/doc/images/virttour9.gif
-virtuoso/doc/images/virtualdirectories.jpg
-virtuoso/doc/images/vjdemo1.gif
-virtuoso/doc/images/vjdemo2.gif
-virtuoso/doc/images/vjdemo3.gif
-virtuoso/doc/images/vsmx001.jpg
-virtuoso/doc/images/vsmx002.jpg
-virtuoso/doc/images/vsmx003.jpg
-virtuoso/doc/images/vspconcept.jpg
-virtuoso/doc/images/vspxconcept.jpg
-virtuoso/doc/images/webdav.png
-virtuoso/doc/images/webservices.png
-virtuoso/doc/images/wpImage18.gif
-virtuoso/doc/images/wpImage19.gif
-virtuoso/doc/images/wpImage20.gif
-virtuoso/doc/images/wpImage21.gif
-virtuoso/doc/images/wpImage22.gif
-virtuoso/doc/images/wpImage23.gif
-virtuoso/doc/images/wpImage24.gif
-virtuoso/doc/images/wpImage25.gif
-virtuoso/doc/images/wpImage26.gif
-virtuoso/doc/images/wpImage27.gif
-virtuoso/doc/images/wpImage28.gif
-virtuoso/doc/images/wpImage29.gif
-virtuoso/doc/images/xmltemplate001.png
-virtuoso/doc/images/xmltemplate002.png
-virtuoso/doc/images/xmltemplate002a.png
-virtuoso/doc/images/xmltemplate004.png
-virtuoso/doc/images/xmltemplate005.png
-virtuoso/doc/images/xmltemplate006.png
-virtuoso/doc/images/xmltemplate007.png
-virtuoso/doc/images/xmltemplate008.png
-virtuoso/doc/images/xmltemplate009.png
-virtuoso/doc/images/xmltemplate010.png
-virtuoso/doc/images/xmltemplate011.png
-virtuoso/doc/images/xmltemplatediagram.jpg
-virtuoso/vad/conductor_dav.vad
-virtuoso/vad/isparql_dav.vad
diff --git a/databases/vsqlite/Makefile b/databases/vsqlite/Makefile
index dcff01e3e278..6745fba83977 100644
--- a/databases/vsqlite/Makefile
+++ b/databases/vsqlite/Makefile
@@ -1,12 +1,11 @@
-# Created by: Koop Mast <kwm@FreeBSD.org>
-
 PORTNAME=	vsqlite
 PORTVERSION=	0.3.13
-PORTREVISION=	17
+PORTREVISION=	19
 CATEGORIES=	databases
 
 MAINTAINER=	kwm@FreeBSD.org
 COMMENT=	Well designed and portable SQLite3 Wrapper for C++
+WWW=		https://github.com/vinzenz/vsqlite--
 
 LICENSE=	BSD3CLAUSE
 
diff --git a/databases/vsqlite/pkg-descr b/databases/vsqlite/pkg-descr
index e56db6237487..d4761e2a0a0b 100644
--- a/databases/vsqlite/pkg-descr
+++ b/databases/vsqlite/pkg-descr
@@ -1,3 +1 @@
 Well designed and portable SQLite3 Wrapper for C++
-
-WWW: https://github.com/vinzenz/vsqlite--
diff --git a/databases/webdis/Makefile b/databases/webdis/Makefile
index da95f9e9746c..04a2ec41bf33 100644
--- a/databases/webdis/Makefile
+++ b/databases/webdis/Makefile
@@ -1,9 +1,11 @@
 PORTNAME=	webdis
-DISTVERSION=	0.1.17
+DISTVERSION=	0.1.20
+PORTREVISION=	1
 CATEGORIES=	databases
 
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	HTTP interface for Redis
+WWW=		https://webd.is/
 
 LICENSE=	BSD2CLAUSE
 
diff --git a/databases/webdis/distinfo b/databases/webdis/distinfo
index a0a5bbbfb640..bfddf57cef30 100644
--- a/databases/webdis/distinfo
+++ b/databases/webdis/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1630864696
-SHA256 (nicolasff-webdis-0.1.17_GH0.tar.gz) = c5e97b17f03e2759e6351581c72e582e28ea8d97210fe178c5851020540962f6
-SIZE (nicolasff-webdis-0.1.17_GH0.tar.gz) = 159091
+TIMESTAMP = 1645692323
+SHA256 (nicolasff-webdis-0.1.20_GH0.tar.gz) = 1f0c8e8e8b68486fb7ccfc68a2c0d28167f7b243004b8a521c2552d0f9bbbe84
+SIZE (nicolasff-webdis-0.1.20_GH0.tar.gz) = 198385
diff --git a/databases/webdis/files/webdis.in b/databases/webdis/files/webdis.in
index 1aba2553440f..a0b8149f4ba0 100644
--- a/databases/webdis/files/webdis.in
+++ b/databases/webdis/files/webdis.in
@@ -30,7 +30,7 @@ start_precmd=webdis_start_precmd
 pidfile="/var/run/${name}.pid"
 procname="%%PREFIX%%/bin/${name}"
 command=/usr/sbin/daemon
-command_args="-f -c -p ${pidfile} ${procname} ${webdis_config}"
+command_args="-r -f -c -P ${pidfile} ${procname} ${webdis_config}"
 
 webdis_start_precmd()
 {
diff --git a/databases/webdis/pkg-descr b/databases/webdis/pkg-descr
index 95630b6b8293..e710ee11acb6 100644
--- a/databases/webdis/pkg-descr
+++ b/databases/webdis/pkg-descr
@@ -1,4 +1,2 @@
 Webdis is a simple HTTP server which forwards commands to Redis and
 sends the reply back using a format of your choice.
-
-WWW: https://webd.is/
diff --git a/databases/wfb2sql/Makefile b/databases/wfb2sql/Makefile
index ba5b888451a6..6a27c97320e7 100644
--- a/databases/wfb2sql/Makefile
+++ b/databases/wfb2sql/Makefile
@@ -1,5 +1,3 @@
-# Created by: Sean Chittenden <seanc@FreeBSD.org>
-
 PORTNAME=	wfb2sql
 PORTVERSION=	0.6
 PORTREVISION=	1
@@ -8,6 +6,7 @@ MASTER_SITES=	SF
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	CIA World Fact Book to SQL Conversion Utility
+WWW=		http://wfb2sql.sf.net/
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
diff --git a/databases/wfb2sql/pkg-descr b/databases/wfb2sql/pkg-descr
index 925197da7157..785d9ccbe56b 100644
--- a/databases/wfb2sql/pkg-descr
+++ b/databases/wfb2sql/pkg-descr
@@ -4,5 +4,3 @@ Book, this is the port for you: wfb2sql converts the WFB into SQL
 inserts.  Act now and get your copy of the WFB for free now!  The
 WFB is a public domain document that may disappear as fast as you do
 after the black helicopters lock in on your location!!!!
-
-WWW: http://wfb2sql.sf.net/
diff --git a/databases/xapian-bindings/Makefile b/databases/xapian-bindings/Makefile
index 4aa2a56c5288..3e623ecc452b 100644
--- a/databases/xapian-bindings/Makefile
+++ b/databases/xapian-bindings/Makefile
@@ -1,11 +1,10 @@
-# Created by: Gea-Suan Lin <gslin@gslin.org>
-
 PORTNAME=	xapian-bindings
-PORTVERSION=	1.4.18
+PORTVERSION=	1.4.25
 CATEGORIES=	databases
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Bindings allowing Xapian to be used from various programming languages
+WWW=		https://xapian.org/
 
 LICENSE=	GPLv2
 
@@ -24,7 +23,6 @@ PHP_USES=		php
 PYTHON_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}xapian>=${PORTVERSION}:databases/py-xapian@${PY_FLAVOR}
 PYTHON_USES=		python:run
 RUBY_RUN_DEPENDS=	${RUBY_PKGNAMEPREFIX}xapian>=${PORTVERSION}:databases/ruby-xapian
-RUBY_USE=		RUBY=yes
-RUBY_VARS=		RUBY_NO_BUILD_DEPENDS=yes
+RUBY_USES=		ruby:run
 
 .include <bsd.port.mk>
diff --git a/databases/xapian-bindings/pkg-descr b/databases/xapian-bindings/pkg-descr
index 591ccce41160..e3d6b2817c0a 100644
--- a/databases/xapian-bindings/pkg-descr
+++ b/databases/xapian-bindings/pkg-descr
@@ -4,5 +4,3 @@ This is the meta port of the following bindings:
 - databases/php-xapian: PHP binding
 - databases/py-xapian: Python binding
 - databases/ruby-xapian: Ruby binding
-
-WWW: https://xapian.org/
diff --git a/databases/xapian-bindings12/Makefile b/databases/xapian-bindings12/Makefile
deleted file mode 100644
index 53f75e45fdb9..000000000000
--- a/databases/xapian-bindings12/Makefile
+++ /dev/null
@@ -1,42 +0,0 @@
-# Created by: Gea-Suan Lin <gslin@gslin.org>
-
-PORTNAME=	xapian-bindings
-PORTVERSION=	1.2.25
-PORTREVISION=	3
-CATEGORIES=	databases
-MASTER_SITES=	https://oligarchy.co.uk/xapian/${PORTVERSION}/ \
-		LOCAL/sunpoet
-PKGNAMESUFFIX=	12
-
-MAINTAINER=	sunpoet@FreeBSD.org
-COMMENT=	Bindings allowing Xapian to be used from various programming languages
-
-LICENSE=	GPLv2
-LICENSE_FILE=	${WRKSRC}/COPYING
-
-LIB_DEPENDS=	libxapian.so:databases/xapian-core12
-
-USES=		libtool tar:xz
-
-CONFIGURE_ARGS=	--datarootdir=${DATADIR} --docdir=${DOCSDIR} \
-		--without-csharp --without-java --without-perl --without-ruby --without-tcl
-GNU_CONFIGURE=	yes
-INSTALL_TARGET=	install-strip
-
-PORTDOCS=	*
-
-CONFLICTS=	xapian-bindings
-
-PORTSCOUT=	limitw:1,even
-
-OPTIONS_DEFINE=	DOCS LUA
-
-LUA_CONFIGURE_ENV=	LUA="${LUA_CMD}" LUA_INC="${LUA_INCDIR}" LUA_LIB="${LUA_MODLIBDIR}" LUA_SO=.so
-LUA_CONFIGURE_WITH=	lua
-LUA_PLIST_FILES=	${LUA_MODLIBDIR}/xapian.so
-LUA_USES=		lua
-
-post-patch:
-	@${REINPLACE_CMD} -e 's|-lstdc++||g' ${WRKSRC}/configure
-
-.include <bsd.port.mk>
diff --git a/databases/xapian-bindings12/distinfo b/databases/xapian-bindings12/distinfo
deleted file mode 100644
index a260b8c05a63..000000000000
--- a/databases/xapian-bindings12/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1506515445
-SHA256 (xapian-bindings-1.2.25.tar.xz) = 5f07425d6c5fc540fab965cd011bb043e3ee0df7da03a8814d6fc20dc5e9dd0f
-SIZE (xapian-bindings-1.2.25.tar.xz) = 1711860
diff --git a/databases/xapian-bindings12/pkg-descr b/databases/xapian-bindings12/pkg-descr
deleted file mode 100644
index 78ef0221523a..000000000000
--- a/databases/xapian-bindings12/pkg-descr
+++ /dev/null
@@ -1,4 +0,0 @@
-SWIG and JNI bindings allowing Xapian to be used from various other programming
-languages.
-
-WWW: https://xapian.org/
diff --git a/databases/xapian-core/Makefile b/databases/xapian-core/Makefile
index 7a1e9a41cec3..f9fcee7013a4 100644
--- a/databases/xapian-core/Makefile
+++ b/databases/xapian-core/Makefile
@@ -1,7 +1,5 @@
-# Created by: J.F. Dockes
-
 PORTNAME=	xapian-core
-PORTVERSION=	1.4.18
+PORTVERSION=	1.4.25
 PORTEPOCH=	1
 CATEGORIES=	databases
 MASTER_SITES=	https://oligarchy.co.uk/xapian/${PORTVERSION}/ \
@@ -9,6 +7,7 @@ MASTER_SITES=	https://oligarchy.co.uk/xapian/${PORTVERSION}/ \
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Probabilistic text search database engine
+WWW=		https://xapian.org/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
@@ -21,7 +20,7 @@ INSTALL_TARGET=	install-strip
 USE_CXXSTD=	c++11
 USE_LDCONFIG=	yes
 
-CONFLICTS_INSTALL=	xapian-core10 xapian-core12
+CONFLICTS_INSTALL=	xapian-core12 # include/xapian.h
 
 PORTSCOUT=	limitw:1,even
 
diff --git a/databases/xapian-core/distinfo b/databases/xapian-core/distinfo
index d8b3e7c8271c..06960ff3dab1 100644
--- a/databases/xapian-core/distinfo
+++ b/databases/xapian-core/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1611665345
-SHA256 (xapian-core-1.4.18.tar.xz) = 196ddbb4ad10450100f0991a599e4ed944cbad92e4a6fe813be6dce160244b77
-SIZE (xapian-core-1.4.18.tar.xz) = 2984508
+TIMESTAMP = 1710712350
+SHA256 (xapian-core-1.4.25.tar.xz) = 0c99dfdd817571cb5689bc412a7e021407938313f38ea3a70fa3bf86410608ee
+SIZE (xapian-core-1.4.25.tar.xz) = 3205904
diff --git a/databases/xapian-core/pkg-descr b/databases/xapian-core/pkg-descr
index 732b65106831..38a2fc1265cf 100644
--- a/databases/xapian-core/pkg-descr
+++ b/databases/xapian-core/pkg-descr
@@ -14,5 +14,3 @@ Xapian features include:
 - Database files > 2GB
 - Platform independent data formats
 - Allows simultaneous update and searching.
-
-WWW: https://xapian.org/
diff --git a/databases/xapian-core/pkg-plist b/databases/xapian-core/pkg-plist
index eaf494b938ae..9b2315b3b8a0 100644
--- a/databases/xapian-core/pkg-plist
+++ b/databases/xapian-core/pkg-plist
@@ -55,25 +55,13 @@ lib/cmake/xapian/xapian-config-version.cmake
 lib/cmake/xapian/xapian-config.cmake
 lib/libxapian.so
 lib/libxapian.so.30
-lib/libxapian.so.30.11.0
+lib/libxapian.so.30.12.6
 libdata/pkgconfig/xapian-core.pc
-man/man1/copydatabase.1.gz
-man/man1/quest.1.gz
-man/man1/xapian-check.1.gz
-man/man1/xapian-compact.1.gz
-man/man1/xapian-config.1.gz
-man/man1/xapian-delve.1.gz
-man/man1/xapian-metadata.1.gz
-man/man1/xapian-pos.1.gz
-man/man1/xapian-progsrv.1.gz
-man/man1/xapian-replicate-server.1.gz
-man/man1/xapian-replicate.1.gz
-man/man1/xapian-tcpsrv.1.gz
 share/aclocal/xapian.m4
 %%PORTDOCS%%%%DOCSDIR%%/admin_notes.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/annotated.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/bc_s.png
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/bdwn.png
+%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/bc_sd.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1AssertionError-members.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1AssertionError.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/classXapian_1_1AssertionError__inherit__graph.png
@@ -348,7 +336,6 @@ share/aclocal/xapian.m4
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/dbfactory_8h.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/deprecated.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/dir_f63502d618711192f85ccb772536c6ae.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/doc.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/document_8h.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/doxygen.css
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/dynsections.js
@@ -358,8 +345,6 @@ share/aclocal/xapian.m4
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/eset_8h.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/expanddecider_8h.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/files.html
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/folderclosed.png
-%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/folderopen.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/functions.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/functions_b.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/functions_c.html
@@ -466,8 +451,10 @@ share/aclocal/xapian.m4
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/namespacemembers_vars.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/namespaces.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/nav_f.png
+%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/nav_fd.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/nav_g.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/nav_h.png
+%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/nav_hd.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/open.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/pages.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/positioniterator_8h.html
@@ -477,15 +464,20 @@ share/aclocal/xapian.m4
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/queryparser_8h.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/registry_8h.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/splitbar.png
+%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/splitbard.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/stem_8h.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/structXapian_1_1LatLongCoord-members.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/structXapian_1_1LatLongCoord.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/sync_off.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/sync_on.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/tab_a.png
+%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/tab_ad.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/tab_b.png
+%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/tab_bd.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/tab_h.png
+%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/tab_hd.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/tab_s.png
+%%PORTDOCS%%%%DOCSDIR%%/apidoc/html/tab_sd.png
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/tabs.css
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/termgenerator_8h.html
 %%PORTDOCS%%%%DOCSDIR%%/apidoc/html/termiterator_8h.html
@@ -521,6 +513,18 @@ share/aclocal/xapian.m4
 %%PORTDOCS%%%%DOCSDIR%%/termgenerator.html
 %%PORTDOCS%%%%DOCSDIR%%/tests.html
 %%PORTDOCS%%%%DOCSDIR%%/valueranges.html
+share/man/man1/copydatabase.1.gz
+share/man/man1/quest.1.gz
+share/man/man1/xapian-check.1.gz
+share/man/man1/xapian-compact.1.gz
+share/man/man1/xapian-config.1.gz
+share/man/man1/xapian-delve.1.gz
+share/man/man1/xapian-metadata.1.gz
+share/man/man1/xapian-pos.1.gz
+share/man/man1/xapian-progsrv.1.gz
+share/man/man1/xapian-replicate-server.1.gz
+share/man/man1/xapian-replicate.1.gz
+share/man/man1/xapian-tcpsrv.1.gz
 %%DATADIR%%/stopwords/arabic.list
 %%DATADIR%%/stopwords/danish.list
 %%DATADIR%%/stopwords/dutch.list
diff --git a/databases/xapian-core12/Makefile b/databases/xapian-core12/Makefile
deleted file mode 100644
index 25078db93c17..000000000000
--- a/databases/xapian-core12/Makefile
+++ /dev/null
@@ -1,39 +0,0 @@
-# Created by: J.F. Dockes
-
-PORTNAME=	xapian-core
-PORTVERSION=	1.2.25
-PORTEPOCH=	1
-CATEGORIES=	databases
-MASTER_SITES=	https://oligarchy.co.uk/xapian/${PORTVERSION}/ \
-		LOCAL/sunpoet
-PKGNAMESUFFIX=	12
-
-MAINTAINER=	sunpoet@FreeBSD.org
-COMMENT=	Probabilistic text search database engine
-
-LICENSE=	GPLv2
-LICENSE_FILE=	${WRKSRC}/COPYING
-
-USES=		libtool pathfix tar:xz
-
-GNU_CONFIGURE=	yes
-INSTALL_TARGET=	install-strip
-USE_LDCONFIG=	yes
-
-PORTDOCS=	*
-
-CONFLICTS_INSTALL=	xapian-core xapian-core10
-
-PORTSCOUT=	limitw:1,even
-
-OPTIONS_DEFINE=	DOCS SSE2
-SSE2_DESC=	Use SSE2 for floating point
-
-SSE2_CONFIGURE_ENABLE=	sse
-
-post-install:
-.for file in copydatabase delve quest
-	${INSTALL_PROGRAM} ${WRKSRC}/examples/.libs/${file} ${STAGEDIR}${PREFIX}/bin/xapian-${file}
-.endfor
-
-.include <bsd.port.mk>
diff --git a/databases/xapian-core12/distinfo b/databases/xapian-core12/distinfo
deleted file mode 100644
index 6d34ad446486..000000000000
--- a/databases/xapian-core12/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1506515418
-SHA256 (xapian-core-1.2.25.tar.xz) = 7c77ff259bc92414c620015d6798f5f3e2c52907936096ec97c23c17fc0d6403
-SIZE (xapian-core-1.2.25.tar.xz) = 3253292
diff --git a/databases/xapian-core12/files/patch-Makefile.in b/databases/xapian-core12/files/patch-Makefile.in
deleted file mode 100644
index 99c5c7140be1..000000000000
--- a/databases/xapian-core12/files/patch-Makefile.in
+++ /dev/null
@@ -1,33 +0,0 @@
---- Makefile.in.orig	2011-08-10 06:54:57 UTC
-+++ Makefile.in
-@@ -47,7 +47,8 @@
- @VPATH_BUILD_TRUE@am__append_1 = -I$(top_builddir)/include \
- @VPATH_BUILD_TRUE@	-I$(top_srcdir)/languages -Ilanguages \
- @VPATH_BUILD_TRUE@	-I$(top_srcdir)/queryparser
--bin_PROGRAMS = $(am__EXEEXT_1) $(am__EXEEXT_2) $(am__EXEEXT_3) \
-+bin_PROGRAMS = $(am__EXEEXT_1) $(am__EXEEXT_2) $(am__EXEEXT_3)
-+noinst_bin_PROGRAMS = \
- 	examples/copydatabase$(EXEEXT) examples/delve$(EXEEXT) \
- 	examples/quest$(EXEEXT) examples/simpleexpand$(EXEEXT) \
- 	examples/simpleindex$(EXEEXT) examples/simplesearch$(EXEEXT) \
-@@ -713,7 +714,7 @@
- @BUILD_BACKEND_CHERT_TRUE@@BUILD_BACKEND_FLINT_TRUE@am__EXEEXT_2 = bin/xapian-chert-update$(EXEEXT)
- @BUILD_BACKEND_REMOTE_TRUE@am__EXEEXT_3 = bin/xapian-progsrv$(EXEEXT) \
- @BUILD_BACKEND_REMOTE_TRUE@	bin/xapian-tcpsrv$(EXEEXT)
--PROGRAMS = $(bin_PROGRAMS)
-+PROGRAMS = $(bin_PROGRAMS) $(noinst_bin_PROGRAMS)
- am__bin_xapian_check_SOURCES_DIST = bin/xapian-check.cc \
- 	bin/xapian-check-brass.cc bin/xapian-check-brass.h \
- 	bin/xapian-check-chert.cc bin/xapian-check-chert.h \
-@@ -1323,10 +1324,7 @@
- 	weight/tradweight.cc weight/weight.cc weight/weightinternal.cc
- @MAINTAINER_NO_DOCS_FALSE@dist_man_MANS = xapian-config.1 \
- @MAINTAINER_NO_DOCS_FALSE@	$(am__append_3) $(am__append_5) \
--@MAINTAINER_NO_DOCS_FALSE@	$(am__append_7) \
--@MAINTAINER_NO_DOCS_FALSE@	examples/copydatabase.1 \
--@MAINTAINER_NO_DOCS_FALSE@	examples/delve.1 examples/quest.1 \
--@MAINTAINER_NO_DOCS_FALSE@	examples/xapian-metadata.1
-+@MAINTAINER_NO_DOCS_FALSE@	$(am__append_7)
- bin_xapian_check_CPPFLAGS = \
- 	-I$(top_srcdir)/backends/brass\
- 	-I$(top_srcdir)/backends/chert\
diff --git a/databases/xapian-core12/files/patch-clang b/databases/xapian-core12/files/patch-clang
deleted file mode 100644
index 2f039a8a66b3..000000000000
--- a/databases/xapian-core12/files/patch-clang
+++ /dev/null
@@ -1,10 +0,0 @@
---- common/safeuuid.h.orig	2013-12-04 00:13:34 UTC
-+++ common/safeuuid.h
-@@ -55,6 +55,7 @@
- 
- // UUID API on FreeBSD, NetBSD and AIX.
- 
-+# include <stdlib.h>
- # ifdef _AIX
- /* AIX uses a byte typedef in its <uuid.h> which collides with ours, so use a
-  * macro to rename theirs out of the way.
diff --git a/databases/xapian-core12/files/patch-configure b/databases/xapian-core12/files/patch-configure
deleted file mode 100644
index cfb208e94107..000000000000
--- a/databases/xapian-core12/files/patch-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig	2017-09-27 01:50:56 UTC
-+++ configure
-@@ -22590,7 +22590,7 @@ $CXXCPP $cxxcpp_flags\
- 	-DREVISION="\"$REVISION\""\
- 	$dash_d_visibility\
- 	$srcdir/include/xapian/version_h.cc|\
--	${SED-sed} '/"/!d;s/^ *//;/^#/d;s/ *$//;s/" *,//;s/"//g;s/@@/"/g;s/  */ /g;s/ *,\r$//;s/ *,$//'\
-+	${SED-sed} '/"/!d;s/^ *//;/^#/d;s/ *$//;s/" *,//;s/"//g;s/@@/"/g;s/  */ /g;s/ *,$//'\
- 	> include/xapian/version.h.tmp
- touch include/xapian/version.h.timestamp
- if cmp include/xapian/version.h.tmp include/xapian/version.h >/dev/null 2>&1
diff --git a/databases/xapian-core12/pkg-descr b/databases/xapian-core12/pkg-descr
deleted file mode 100644
index 732b65106831..000000000000
--- a/databases/xapian-core12/pkg-descr
+++ /dev/null
@@ -1,18 +0,0 @@
-Xapian is an Open Source Probabilistic Information Retrieval library, released
-under the GPL. It's written in C++, with bindings to allow use from other
-languages.
-
-Xapian is designed to be a highly adaptable toolkit to allow developers to
-easily add advanced indexing and search facilities to their own applications.
-
-Xapian features include:
-- Ranked probabilistic search - word importance weighting
-- Relevance feedback
-- Phrase and proximity searching
-- Full range of structured boolean search operators
-- Term stemming
-- Database files > 2GB
-- Platform independent data formats
-- Allows simultaneous update and searching.
-
-WWW: https://xapian.org/
diff --git a/databases/xapian-core12/pkg-plist b/databases/xapian-core12/pkg-plist
deleted file mode 100644
index 6bda9bb010da..000000000000
--- a/databases/xapian-core12/pkg-plist
+++ /dev/null
@@ -1,59 +0,0 @@
-bin/xapian-check
-bin/xapian-chert-update
-bin/xapian-compact
-bin/xapian-config
-bin/xapian-copydatabase
-bin/xapian-delve
-bin/xapian-inspect
-bin/xapian-progsrv
-bin/xapian-quest
-bin/xapian-replicate
-bin/xapian-replicate-server
-bin/xapian-tcpsrv
-include/xapian.h
-include/xapian/base.h
-include/xapian/compactor.h
-include/xapian/database.h
-include/xapian/dbfactory.h
-include/xapian/deprecated.h
-include/xapian/derefwrapper.h
-include/xapian/document.h
-include/xapian/enquire.h
-include/xapian/error.h
-include/xapian/errorhandler.h
-include/xapian/expanddecider.h
-include/xapian/keymaker.h
-include/xapian/matchspy.h
-include/xapian/positioniterator.h
-include/xapian/postingiterator.h
-include/xapian/postingsource.h
-include/xapian/query.h
-include/xapian/queryparser.h
-include/xapian/registry.h
-include/xapian/stem.h
-include/xapian/termgenerator.h
-include/xapian/termiterator.h
-include/xapian/types.h
-include/xapian/unicode.h
-include/xapian/valueiterator.h
-include/xapian/valuesetmatchdecider.h
-include/xapian/version.h
-include/xapian/visibility.h
-include/xapian/weight.h
-lib/cmake/xapian/xapian-config-version.cmake
-lib/cmake/xapian/xapian-config.cmake
-lib/libxapian.a
-lib/libxapian.so
-lib/libxapian.so.22
-lib/libxapian.so.22.7.3
-libdata/pkgconfig/xapian-core.pc
-man/man1/xapian-check.1.gz
-man/man1/xapian-chert-update.1.gz
-man/man1/xapian-compact.1.gz
-man/man1/xapian-config.1.gz
-man/man1/xapian-inspect.1.gz
-man/man1/xapian-progsrv.1.gz
-man/man1/xapian-replicate.1.gz
-man/man1/xapian-replicate-server.1.gz
-man/man1/xapian-tcpsrv.1.gz
-share/aclocal/xapian.m4
diff --git a/databases/xls2txt/Makefile b/databases/xls2txt/Makefile
index 9d8c1729db70..60931e62eef8 100644
--- a/databases/xls2txt/Makefile
+++ b/databases/xls2txt/Makefile
@@ -1,10 +1,11 @@
 PORTNAME=	xls2txt
 DISTVERSION=	1.0.1
-PORTREVISION=	7
+PORTREVISION=	31
 CATEGORIES=	databases textproc
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Utilities to convert spreadsheet files to text and csv formats
+WWW=		https://github.com/masklinn/xls2txt
 
 LICENSE=	APACHE20
 
@@ -60,6 +61,8 @@ EXECUTABLES=	${PORTNAME} xls2csv
 
 PLIST_FILES=	${EXECUTABLES:S/^/bin\//}
 
+CONFLICTS_INSTALL=	catdoc libxls p5-Spreadsheet-Read
+
 post-install:
 	cd ${STAGEDIR}${PREFIX}/bin && ${STRIP_CMD} ${EXECUTABLES}
 
diff --git a/databases/xls2txt/pkg-descr b/databases/xls2txt/pkg-descr
index f75fa9db4920..871da98c93bd 100644
--- a/databases/xls2txt/pkg-descr
+++ b/databases/xls2txt/pkg-descr
@@ -2,5 +2,3 @@ xls2txt and xsl2csv allow converting spreadsheet files to text for compatibility
 with terminals and command-line utilities (e.g. diff or less). Despite the name,
 they should work with both excel (xls, xlsx or xlsb) and OpenDocument (ods)
 files.
-
-WWW: https://github.com/masklinn/xls2txt
diff --git a/databases/xrootd/Makefile b/databases/xrootd/Makefile
index 313a19dfb778..23737d5048ac 100644
--- a/databases/xrootd/Makefile
+++ b/databases/xrootd/Makefile
@@ -1,11 +1,11 @@
 PORTNAME=	xrootd
-DISTVERSION=	4.10.0
-PORTREVISION=	1
+DISTVERSION=	5.6.9
 CATEGORIES=	databases
-MASTER_SITES=	http://xrootd.org/download/v${DISTVERSION}/
+MASTER_SITES=	https://xrootd.slac.stanford.edu/download/v${DISTVERSION}/
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Framework for fast, low latency, scalable data access
+WWW=		https://xrootd.slac.stanford.edu/index.html
 
 LICENSE=	GPLv3 LGPL3
 LICENSE_COMB=	dual
@@ -13,31 +13,42 @@ LICENSE_FILE_GPLv3=	${WRKSRC}/COPYING
 LICENSE_FILE_LGPL3=	${WRKSRC}/COPYING.LGPL
 
 BUILD_DEPENDS=	bash:shells/bash
-LIB_DEPENDS=	libcurl.so:ftp/curl
+LIB_DEPENDS=	libcurl.so:ftp/curl \
+		libtinyxml.so:textproc/tinyxml \
+		libuuid.so:misc/e2fsprogs-libuuid
 
-USES=		cmake cpe gnome localbase:ldflags pkgconfig readline shebangfix ssl
+USES=		cmake:testing compiler:c++14-lang cpe gnome localbase:ldflags pkgconfig readline shebangfix ssl
 SHEBANG_GLOB=	*.sh
 SHEBANG_FILES=	utils/cms_monPerf
 USE_GNOME=	libxml2
 USE_LDCONFIG=	yes
 
-CMAKE_ARGS=	-DCMAKE_INSTALL_LIBDIR:STRING=${PREFIX}/lib \
-		-DCMAKE_INSTALL_BINDIR:STRING=${PREFIX}/bin \
-		-DCMAKE_INSTALL_INCLUDEDIR:STRING=${PREFIX}/include \
-		-DCMAKE_INSTALL_MANDIR:STRING=${PREFIX}/man \
-		-DCMAKE_INSTALL_DATADIR:STRING=${DATADIR}
+# options are defined in cmake/XRootDDefaults.cmake
+CMAKE_ON=	FORCE_ENABLED
+CMAKE_OFF=	ENABLE_PYTHON \
+		ENABLE_SCITOKENS \
+		ENABLE_FUSE
+CMAKE_TESTING_ON=	ENABLE_TESTS
 
 CXXFLAGS+=	-Ddirent64=dirent
 LDFLAGS+=	-lexecinfo
 
-OPTIONS_DEFINE=	KERBEROS5
-OPTIONS_SUB=	yes
+OPTIONS_DEFINE=		KERBEROS5
+OPTIONS_GROUP=		PLUGINS
+OPTIONS_GROUP_PLUGINS=	MACAROONS XRDCLHTTP
+OPTIONS_DEFAULT=	KERBEROS5 XRDCLHTTP # MACAROONS
+OPTIONS_SUB=		yes
 
-KERBEROS5_CMAKE_BOOL=	ENABLE_KRB5
-KERBEROS5_BROKEN=	build picks base kerberos, but needs the port one (problem only exists in poudriere builds for some reason)
-KERBEROS5_LIB_DEPENDS=	libkrb5.so:security/krb5
+KERBEROS5_CMAKE_BOOL=		ENABLE_KRB5
+KERBEROS5_BUILD_DEPENDS=	${LOCALBASE}/lib/libkrb5.so:security/krb5
+KERBEROS5_RUN_DEPENDS=		${LOCALBASE}/lib/libkrb5.so:security/krb5
 
-post-patch:
-	@${REINPLACE_CMD} 's|  dl|  $${CMAKE_DL_LIBS}| ; s|-ldl|$${CMAKE_DL_LIBS}|' ${WRKSRC}/src/*.cmake ${WRKSRC}/src/*/CMakeLists.txt
+MACAROONS_DESC=		Macaroons plugin
+MACAROONS_CMAKE_BOOL=	ENABLE_MACAROONS
+MACAROONS_BROKEN=	https://github.com/xrootd/xrootd/issues/2230
+
+XRDCLHTTP_DESC=		xrdcl-http plugin
+XRDCLHTTP_CMAKE_BOOL=	ENABLE_XRDCLHTTP
+XRDCLHTTP_LIB_DEPENDS=	libdavix.so:www/davix
 
 .include <bsd.port.mk>
diff --git a/databases/xrootd/distinfo b/databases/xrootd/distinfo
index a15f18253f92..3fdbb8ffc13f 100644
--- a/databases/xrootd/distinfo
+++ b/databases/xrootd/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1573887088
-SHA256 (xrootd-4.10.0.tar.gz) = f07f85e27d72e9e8ff124173c7b53619aed8fcd36f9d6234c33f8f7fd511995b
-SIZE (xrootd-4.10.0.tar.gz) = 2532873
+TIMESTAMP = 1711947441
+SHA256 (xrootd-5.6.9.tar.gz) = 44196167fbcf030d113e3749dfdecab934c43ec15e38e77481e29aac191ca3a8
+SIZE (xrootd-5.6.9.tar.gz) = 6701277
diff --git a/databases/xrootd/files/patch-cmake_XRootDOSDefs.cmake b/databases/xrootd/files/patch-cmake_XRootDOSDefs.cmake
new file mode 100644
index 000000000000..fd2efefd8708
--- /dev/null
+++ b/databases/xrootd/files/patch-cmake_XRootDOSDefs.cmake
@@ -0,0 +1,11 @@
+--- cmake/XRootDOSDefs.cmake.orig	2024-03-31 18:44:16 UTC
++++ cmake/XRootDOSDefs.cmake
+@@ -129,7 +129,7 @@ if( ${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD" )
+ if( ${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD" )
+   define_default( CMAKE_INSTALL_LIBDIR "lib" )
+   define_default( CMAKE_INSTALL_BINDIR "bin" )
+-  define_default( CMAKE_INSTALL_MANDIR "man" )
++  define_default( CMAKE_INSTALL_MANDIR "share/man" )
+   define_default( CMAKE_INSTALL_INCLUDEDIR "include" )
+   define_default( CMAKE_INSTALL_DATADIR "share" )
+ endif()
diff --git a/databases/xrootd/files/patch-src_XrdSys_XrdSysFAttrBsd.icc b/databases/xrootd/files/patch-src_XrdSys_XrdSysFAttrBsd.icc
deleted file mode 100644
index d2032e200123..000000000000
--- a/databases/xrootd/files/patch-src_XrdSys_XrdSysFAttrBsd.icc
+++ /dev/null
@@ -1,42 +0,0 @@
---- src/XrdSys/XrdSysFAttrBsd.icc.orig	2018-08-01 05:55:51 UTC
-+++ src/XrdSys/XrdSysFAttrBsd.icc
-@@ -68,7 +68,7 @@ int XrdSysFAttr::Get(const char *Aname, 
- // Obtain the attribute.
- //
-    ec = (fd < 0 ? extattr_get_file(Path,EXTATTR_NAMESPACE_USER,Aname,Aval,Avsz)
--                  extattr_get_fd(  fd,  EXTATTR_NAMESPACE_USER,Aname,Aval,Avsz));
-+                : extattr_get_fd(  fd,  EXTATTR_NAMESPACE_USER,Aname,Aval,Avsz));
- 
- // Diagnose errors. We return 0 on ENOENT to indicate no attribute.
- //
-@@ -89,8 +89,8 @@ int XrdSysFAttr::List(AList **aPL, const
- // First obtain the amount of storage we will need for the whole list
- //
-    *aPL = 0;
--   Tlen = (fd < 0 ? extattr_get_file(Path,EXTATTR_NAMESPACE_USER, 0, 0)
--                    extattr_list_fd(   fd,EXTATTR_NAMESPACE_USER, 0, 0));
-+   Tlen = (fd < 0 ? extattr_get_file(Path,EXTATTR_NAMESPACE_USER, "", 0, 0)
-+                  : extattr_list_fd(   fd,EXTATTR_NAMESPACE_USER, 0, 0));
-    if (Tlen < 0)
-       {if ((ec = Diagnose("list", "*", Path, errno)) == -ENOENT) ec = 0;
-        return ec;
-@@ -109,8 +109,8 @@ int XrdSysFAttr::List(AList **aPL, const
- // Now get the actual list. We will not recover if someone added an attribute
- // since the time we actual determined the size of the buffer we need.
- //
--   Tlen = (fd < 0 ? extattr_get_file(Path,EXTATTR_NAMESPACE_USER, Buff, Tlen)
--                    extattr_list_fd(   fd,EXTATTR_NAMESPACE_USER, Buff, Tlen));
-+   Tlen = (fd < 0 ? extattr_get_file(Path,EXTATTR_NAMESPACE_USER, "", Buff, Tlen)
-+                  : extattr_list_fd(   fd,EXTATTR_NAMESPACE_USER, Buff, Tlen));
-    if (Tlen < 0)
-       {if ((ec = Diagnose("list", "*", Path, errno)) == -ENOENT) ec = 0;
-        free(Buff);
-@@ -160,7 +160,7 @@ int XrdSysFAttr::Set(const char *Aname, 
- //
-   if (isNew)
-      {ec = (fd < 0 ? extattr_get_file(Path,EXTATTR_NAMESPACE_USER,Aname,0,0)
--                   : extattr_get_fd(  fd,  EXTATTR_NAMESPACE_USER,Aname,0 0));
-+                   : extattr_get_fd(  fd,  EXTATTR_NAMESPACE_USER,Aname,0,0));
-       if (ec >= 0) return -EEXIST;
-      }
- 
diff --git a/databases/xrootd/pkg-descr b/databases/xrootd/pkg-descr
index 229d285bedb0..eac43469e18d 100644
--- a/databases/xrootd/pkg-descr
+++ b/databases/xrootd/pkg-descr
@@ -12,5 +12,3 @@ scalable data access, which can serve natively any kind of data, organized as a
 hierarchical filesystem-like namespace, based on the concept of directory. As a
 general rule, particular emphasis has been put in the quality of the core
 software parts.
-
-WWW: http://xrootd.org/
diff --git a/databases/xrootd/pkg-plist b/databases/xrootd/pkg-plist
index 979a3ce1ce63..9d4facb037b1 100644
--- a/databases/xrootd/pkg-plist
+++ b/databases/xrootd/pkg-plist
@@ -1,28 +1,26 @@
-bin/XrdCnsd
 bin/cconfig
 bin/cmsd
-bin/cns_ssi
 bin/frm_admin
 bin/frm_purged
 bin/frm_xfragent
 bin/frm_xfrd
 bin/mpxstats
 bin/wait41
-bin/xprep
-bin/xrd
 bin/xrdacctest
 bin/xrdadler32
+bin/xrdcks
 bin/xrdcopy
 bin/xrdcp
-bin/xrdcp-old
+bin/xrdcrc32c
 bin/xrdfs
 bin/xrdgsiproxy
 bin/xrdgsitest
 bin/xrdmapc
 bin/xrdpfc_print
+bin/xrdpinls
 bin/xrdpwdadmin
+bin/xrdreplay
 bin/xrdsssadmin
-bin/xrdstagetool
 bin/xrootd
 bin/xrootd-config
 include/xrootd/XProtocol/XProtocol.hh
@@ -33,6 +31,7 @@ include/xrootd/Xrd/XrdLink.hh
 include/xrootd/Xrd/XrdLinkMatch.hh
 include/xrootd/Xrd/XrdProtocol.hh
 include/xrootd/Xrd/XrdScheduler.hh
+include/xrootd/Xrd/XrdTcpMonPin.hh
 include/xrootd/XrdAcc/XrdAccAuthorize.hh
 include/xrootd/XrdAcc/XrdAccPrivs.hh
 include/xrootd/XrdCks/XrdCks.hh
@@ -40,6 +39,7 @@ include/xrootd/XrdCks/XrdCksAssist.hh
 include/xrootd/XrdCks/XrdCksCalc.hh
 include/xrootd/XrdCks/XrdCksData.hh
 include/xrootd/XrdCks/XrdCksManager.hh
+include/xrootd/XrdCks/XrdCksWrapper.hh
 include/xrootd/XrdCl/XrdClAnyObject.hh
 include/xrootd/XrdCl/XrdClBuffer.hh
 include/xrootd/XrdCl/XrdClConstants.hh
@@ -50,30 +50,16 @@ include/xrootd/XrdCl/XrdClFile.hh
 include/xrootd/XrdCl/XrdClFileSystem.hh
 include/xrootd/XrdCl/XrdClFileSystemUtils.hh
 include/xrootd/XrdCl/XrdClLog.hh
-include/xrootd/XrdCl/XrdClMessage.hh
 include/xrootd/XrdCl/XrdClMonitor.hh
+include/xrootd/XrdCl/XrdClOptional.hh
 include/xrootd/XrdCl/XrdClPlugInInterface.hh
-include/xrootd/XrdCl/XrdClPlugInManager.hh
-include/xrootd/XrdCl/XrdClPostMaster.hh
-include/xrootd/XrdCl/XrdClPostMasterInterfaces.hh
 include/xrootd/XrdCl/XrdClPropertyList.hh
 include/xrootd/XrdCl/XrdClStatus.hh
-include/xrootd/XrdCl/XrdClTransportManager.hh
 include/xrootd/XrdCl/XrdClURL.hh
 include/xrootd/XrdCl/XrdClXRootDResponses.hh
-include/xrootd/XrdClient/XrdClient.hh
-include/xrootd/XrdClient/XrdClientAbs.hh
-include/xrootd/XrdClient/XrdClientAbsMonIntf.hh
-include/xrootd/XrdClient/XrdClientAdmin.hh
-include/xrootd/XrdClient/XrdClientConst.hh
-include/xrootd/XrdClient/XrdClientEnv.hh
-include/xrootd/XrdClient/XrdClientUnsolMsg.hh
-include/xrootd/XrdClient/XrdClientUrlInfo.hh
-include/xrootd/XrdClient/XrdClientUrlSet.hh
-include/xrootd/XrdClient/XrdClientVector.hh
 include/xrootd/XrdCms/XrdCmsClient.hh
+include/xrootd/XrdCms/XrdCmsPerfMon.hh
 include/xrootd/XrdCms/XrdCmsVnId.hh
-include/xrootd/XrdFileCache/XrdFileCacheDecision.hh
 include/xrootd/XrdHttp/XrdHttpSecXtractor.hh
 include/xrootd/XrdNet/XrdNet.hh
 include/xrootd/XrdNet/XrdNetAddr.hh
@@ -81,16 +67,19 @@ include/xrootd/XrdNet/XrdNetAddrInfo.hh
 include/xrootd/XrdNet/XrdNetCmsNotify.hh
 include/xrootd/XrdNet/XrdNetConnect.hh
 include/xrootd/XrdNet/XrdNetOpts.hh
+include/xrootd/XrdNet/XrdNetPMark.hh
 include/xrootd/XrdNet/XrdNetSockAddr.hh
 include/xrootd/XrdNet/XrdNetSocket.hh
 include/xrootd/XrdNet/XrdNetUtils.hh
+include/xrootd/XrdOfs/XrdOfsFSctl_PI.hh
 include/xrootd/XrdOfs/XrdOfsPrepare.hh
 include/xrootd/XrdOss/XrdOss.hh
 include/xrootd/XrdOss/XrdOssDefaultSS.hh
 include/xrootd/XrdOss/XrdOssStatInfo.hh
+include/xrootd/XrdOss/XrdOssVS.hh
+include/xrootd/XrdOss/XrdOssWrapper.hh
 include/xrootd/XrdOuc/XrdOucBuffer.hh
 include/xrootd/XrdOuc/XrdOucCRC.hh
-include/xrootd/XrdOuc/XrdOucCache.hh
 include/xrootd/XrdOuc/XrdOucCacheCM.hh
 include/xrootd/XrdOuc/XrdOucCacheStats.hh
 include/xrootd/XrdOuc/XrdOucCallBack.hh
@@ -106,6 +95,7 @@ include/xrootd/XrdOuc/XrdOucHash.icc
 include/xrootd/XrdOuc/XrdOucIOVec.hh
 include/xrootd/XrdOuc/XrdOucLock.hh
 include/xrootd/XrdOuc/XrdOucName2Name.hh
+include/xrootd/XrdOuc/XrdOucPinObject.hh
 include/xrootd/XrdOuc/XrdOucPinPath.hh
 include/xrootd/XrdOuc/XrdOucRash.hh
 include/xrootd/XrdOuc/XrdOucRash.icc
@@ -118,6 +108,7 @@ include/xrootd/XrdOuc/XrdOucTokenizer.hh
 include/xrootd/XrdOuc/XrdOucTrace.hh
 include/xrootd/XrdOuc/XrdOucUtils.hh
 include/xrootd/XrdOuc/XrdOuca2x.hh
+include/xrootd/XrdPfc/XrdPfcDecision.hh
 include/xrootd/XrdPosix/XrdPosix.hh
 include/xrootd/XrdPosix/XrdPosixCache.hh
 include/xrootd/XrdPosix/XrdPosixCallBack.hh
@@ -125,21 +116,24 @@ include/xrootd/XrdPosix/XrdPosixExtern.hh
 include/xrootd/XrdPosix/XrdPosixOsDep.hh
 include/xrootd/XrdPosix/XrdPosixXrootd.hh
 include/xrootd/XrdPosix/XrdPosixXrootdPath.hh
+include/xrootd/XrdSec/XrdSecAttr.hh
 include/xrootd/XrdSec/XrdSecEntity.hh
+include/xrootd/XrdSec/XrdSecEntityAttr.hh
+include/xrootd/XrdSec/XrdSecEntityPin.hh
 include/xrootd/XrdSec/XrdSecInterface.hh
 include/xrootd/XrdSfs/XrdSfsAio.hh
 include/xrootd/XrdSfs/XrdSfsDio.hh
 include/xrootd/XrdSfs/XrdSfsFlags.hh
+include/xrootd/XrdSfs/XrdSfsGPFile.hh
 include/xrootd/XrdSfs/XrdSfsInterface.hh
 include/xrootd/XrdSfs/XrdSfsXio.hh
 include/xrootd/XrdSys/XrdSysAtomics.hh
-include/xrootd/XrdSys/XrdSysDNS.hh
 include/xrootd/XrdSys/XrdSysError.hh
 include/xrootd/XrdSys/XrdSysFD.hh
 include/xrootd/XrdSys/XrdSysHeaders.hh
-include/xrootd/XrdSys/XrdSysLinuxSemaphore.hh
 include/xrootd/XrdSys/XrdSysLogPI.hh
 include/xrootd/XrdSys/XrdSysLogger.hh
+include/xrootd/XrdSys/XrdSysPageSize.hh
 include/xrootd/XrdSys/XrdSysPlatform.hh
 include/xrootd/XrdSys/XrdSysPlugin.hh
 include/xrootd/XrdSys/XrdSysPthread.hh
@@ -150,24 +144,40 @@ include/xrootd/XrdSys/XrdSysXSLock.hh
 include/xrootd/XrdVersion.hh
 include/xrootd/XrdXml/XrdXmlReader.hh
 include/xrootd/XrdXrootd/XrdXrootdBridge.hh
+include/xrootd/XrdXrootd/XrdXrootdGStream.hh
 include/xrootd/XrdXrootd/XrdXrootdMonData.hh
 include/xrootd/private/Xrd/XrdPoll.hh
-include/xrootd/private/XrdClArg.hh
-include/xrootd/private/XrdClFileOperations.hh
-include/xrootd/private/XrdClFileSystemOperations.hh
-include/xrootd/private/XrdClFwd.hh
-include/xrootd/private/XrdClOperationHandlers.hh
-include/xrootd/private/XrdClOperations.hh
-include/xrootd/private/XrdClParallelOperation.hh
-include/xrootd/private/XrdClient/XrdClientConn.hh
-include/xrootd/private/XrdClient/XrdClientConnMgr.hh
-include/xrootd/private/XrdClient/XrdClientDebug.hh
-include/xrootd/private/XrdClient/XrdClientInputBuffer.hh
-include/xrootd/private/XrdClient/XrdClientLogConnection.hh
-include/xrootd/private/XrdClient/XrdClientMessage.hh
-include/xrootd/private/XrdClient/XrdClientPhyConnection.hh
-include/xrootd/private/XrdClient/XrdClientReadCache.hh
-include/xrootd/private/XrdClient/XrdClientSock.hh
+include/xrootd/private/XrdCl/XrdClArg.hh
+include/xrootd/private/XrdCl/XrdClCtx.hh
+include/xrootd/private/XrdCl/XrdClFileOperations.hh
+include/xrootd/private/XrdCl/XrdClFileSystemOperations.hh
+include/xrootd/private/XrdCl/XrdClFinalOperation.hh
+include/xrootd/private/XrdCl/XrdClFwd.hh
+include/xrootd/private/XrdCl/XrdClJobManager.hh
+include/xrootd/private/XrdCl/XrdClMessage.hh
+include/xrootd/private/XrdCl/XrdClOperationHandlers.hh
+include/xrootd/private/XrdCl/XrdClOperationTimeout.hh
+include/xrootd/private/XrdCl/XrdClOperations.hh
+include/xrootd/private/XrdCl/XrdClParallelOperation.hh
+include/xrootd/private/XrdCl/XrdClPlugInManager.hh
+include/xrootd/private/XrdCl/XrdClPostMaster.hh
+include/xrootd/private/XrdCl/XrdClPostMasterInterfaces.hh
+include/xrootd/private/XrdCl/XrdClResponseJob.hh
+include/xrootd/private/XrdCl/XrdClSyncQueue.hh
+include/xrootd/private/XrdCl/XrdClTransportManager.hh
+include/xrootd/private/XrdCl/XrdClUtils.hh
+include/xrootd/private/XrdCl/XrdClXRootDTransport.hh
+include/xrootd/private/XrdCl/XrdClZipArchive.hh
+include/xrootd/private/XrdCl/XrdClZipCache.hh
+include/xrootd/private/XrdCl/XrdClZipOperations.hh
+include/xrootd/private/XrdCrypto/XrdCryptoAux.hh
+include/xrootd/private/XrdCrypto/XrdCryptoFactory.hh
+include/xrootd/private/XrdCrypto/XrdCryptoRSA.hh
+include/xrootd/private/XrdCrypto/XrdCryptoX509.hh
+include/xrootd/private/XrdCrypto/XrdCryptoX509Chain.hh
+include/xrootd/private/XrdCrypto/XrdCryptoX509Crl.hh
+include/xrootd/private/XrdCrypto/XrdCryptoX509Req.hh
+include/xrootd/private/XrdCrypto/XrdCryptosslAux.hh
 include/xrootd/private/XrdHttp/XrdHttpExtHandler.hh
 include/xrootd/private/XrdNet/XrdNetBuffer.hh
 include/xrootd/private/XrdNet/XrdNetIF.hh
@@ -180,10 +190,17 @@ include/xrootd/private/XrdOfs/XrdOfsTrace.hh
 include/xrootd/private/XrdOss/XrdOssApi.hh
 include/xrootd/private/XrdOss/XrdOssConfig.hh
 include/xrootd/private/XrdOss/XrdOssError.hh
+include/xrootd/private/XrdOuc/XrdOucCRC32C.hh
 include/xrootd/private/XrdOuc/XrdOucExport.hh
+include/xrootd/private/XrdOuc/XrdOucGatherConf.hh
 include/xrootd/private/XrdOuc/XrdOucN2NLoader.hh
 include/xrootd/private/XrdOuc/XrdOucPList.hh
+include/xrootd/private/XrdOuc/XrdOucPgrwUtils.hh
+include/xrootd/private/XrdOuc/XrdOucPinLoader.hh
+include/xrootd/private/XrdOuc/XrdOucTUtils.hh
+include/xrootd/private/XrdPosix/XrdPosixMap.hh
 include/xrootd/private/XrdSecsss/XrdSecsssID.hh
+include/xrootd/private/XrdSfs/XrdSfsFAttr.hh
 include/xrootd/private/XrdSsi/XrdSsiAtomics.hh
 include/xrootd/private/XrdSsi/XrdSsiCluster.hh
 include/xrootd/private/XrdSsi/XrdSsiEntity.hh
@@ -196,96 +213,108 @@ include/xrootd/private/XrdSsi/XrdSsiRespInfo.hh
 include/xrootd/private/XrdSsi/XrdSsiResponder.hh
 include/xrootd/private/XrdSsi/XrdSsiService.hh
 include/xrootd/private/XrdSsi/XrdSsiStream.hh
+include/xrootd/private/XrdSut/XrdSutAux.hh
+include/xrootd/private/XrdSut/XrdSutBucket.hh
 include/xrootd/private/XrdSys/XrdSysPriv.hh
+include/xrootd/private/XrdSys/XrdSysTrace.hh
+include/xrootd/private/XrdZip/XrdZipCDFH.hh
+include/xrootd/private/XrdZip/XrdZipDataDescriptor.hh
+include/xrootd/private/XrdZip/XrdZipEOCD.hh
+include/xrootd/private/XrdZip/XrdZipExtra.hh
+include/xrootd/private/XrdZip/XrdZipLFH.hh
+include/xrootd/private/XrdZip/XrdZipUtils.hh
+include/xrootd/private/XrdZip/XrdZipZIP64EOCD.hh
+include/xrootd/private/XrdZip/XrdZipZIP64EOCDL.hh
+lib/cmake/XRootD/XRootDConfig.cmake
+lib/cmake/XRootD/XRootDConfigVersion.cmake
 lib/libXrdAppUtils.so
-lib/libXrdAppUtils.so.1
-lib/libXrdAppUtils.so.1.0.0
-lib/libXrdBlacklistDecision-4.so
-lib/libXrdBwm-4.so
-lib/libXrdCksCalczcrc32-4.so
+lib/libXrdAppUtils.so.2
+lib/libXrdAppUtils.so.2.0.0
+lib/libXrdBlacklistDecision-5.so
+lib/libXrdBwm-5.so
+lib/libXrdCksCalczcrc32-5.so
 lib/libXrdCl.so
-lib/libXrdCl.so.2
-lib/libXrdCl.so.2.0.0
-lib/libXrdClProxyPlugin-4.so
-lib/libXrdClient.so
-lib/libXrdClient.so.2
-lib/libXrdClient.so.2.0.0
+lib/libXrdCl.so.3
+lib/libXrdCl.so.3.0.0
+%%XRDCLHTTP%%lib/libXrdClHttp-5.so
+lib/libXrdClProxyPlugin-5.so
+lib/libXrdClRecorder-5.so
+lib/libXrdCmsRedirectLocal-5.so
 lib/libXrdCrypto.so
-lib/libXrdCrypto.so.1
-lib/libXrdCrypto.so.1.0.0
+lib/libXrdCrypto.so.2
+lib/libXrdCrypto.so.2.0.0
 lib/libXrdCryptoLite.so
-lib/libXrdCryptoLite.so.1
-lib/libXrdCryptoLite.so.1.0.0
-lib/libXrdCryptossl-4.so
+lib/libXrdCryptoLite.so.2
+lib/libXrdCryptoLite.so.2.0.0
+lib/libXrdCryptossl-5.so
 lib/libXrdFfs.so
-lib/libXrdFfs.so.2
-lib/libXrdFfs.so.2.0.0
-lib/libXrdFileCache-4.so
-lib/libXrdHttp-4.so
-lib/libXrdHttpTPC-4.so
+lib/libXrdFfs.so.3
+lib/libXrdFfs.so.3.0.0
+lib/libXrdFileCache-5.so
+lib/libXrdHttp-5.so
+lib/libXrdHttpTPC-5.so
 lib/libXrdHttpUtils.so
-lib/libXrdHttpUtils.so.1
-lib/libXrdHttpUtils.so.1.0.0
-lib/libXrdN2No2p-4.so
-lib/libXrdOssSIgpfsT-4.so
+lib/libXrdHttpUtils.so.2
+lib/libXrdHttpUtils.so.2.0.0
+lib/libXrdN2No2p-5.so
+lib/libXrdOfsPrepGPI-5.so
+lib/libXrdOssCsi-5.so
+lib/libXrdOssSIgpfsT-5.so
+lib/libXrdPfc-5.so
 lib/libXrdPosix.so
-lib/libXrdPosix.so.2
-lib/libXrdPosix.so.2.0.0
+lib/libXrdPosix.so.3
+lib/libXrdPosix.so.3.0.0
 lib/libXrdPosixPreload.so
-lib/libXrdPosixPreload.so.1
-lib/libXrdPosixPreload.so.1.0.0
-lib/libXrdPss-4.so
-lib/libXrdSec-4.so
-lib/libXrdSecProt-4.so
-lib/libXrdSecgsi-4.so
-lib/libXrdSecgsiAUTHZVO-4.so
-lib/libXrdSecgsiGMAPDN-4.so
-%%KERBEROS5%%lib/libXrdSeckrb5-4.so
-lib/libXrdSecpwd-4.so
-lib/libXrdSecsss-4.so
-lib/libXrdSecunix-4.so
+lib/libXrdPosixPreload.so.2
+lib/libXrdPosixPreload.so.2.0.0
+lib/libXrdPss-5.so
+lib/libXrdSec-5.so
+lib/libXrdSecProt-5.so
+lib/libXrdSecgsi-5.so
+lib/libXrdSecgsiAUTHZVO-5.so
+lib/libXrdSecgsiGMAPDN-5.so
+%%KERBEROS5%%lib/libXrdSeckrb5-5.so
+lib/libXrdSecpwd-5.so
+lib/libXrdSecsss-5.so
+lib/libXrdSecunix-5.so
+lib/libXrdSecztn-5.so
 lib/libXrdServer.so
-lib/libXrdServer.so.2
-lib/libXrdServer.so.2.0.0
-lib/libXrdSsi-4.so
+lib/libXrdServer.so.3
+lib/libXrdServer.so.3.0.0
+lib/libXrdSsi-5.so
 lib/libXrdSsiLib.so
-lib/libXrdSsiLib.so.1
-lib/libXrdSsiLib.so.1.0.0
-lib/libXrdSsiLog-4.so
+lib/libXrdSsiLib.so.2
+lib/libXrdSsiLib.so.2.0.0
+lib/libXrdSsiLog-5.so
 lib/libXrdSsiShMap.so
-lib/libXrdSsiShMap.so.1
-lib/libXrdSsiShMap.so.1.0.0
-lib/libXrdThrottle-4.so
+lib/libXrdSsiShMap.so.2
+lib/libXrdSsiShMap.so.2.0.0
+lib/libXrdThrottle-5.so
 lib/libXrdUtils.so
-lib/libXrdUtils.so.2
-lib/libXrdUtils.so.2.0.0
+lib/libXrdUtils.so.3
+lib/libXrdUtils.so.3.0.0
 lib/libXrdXml.so
-lib/libXrdXml.so.2
-lib/libXrdXml.so.2.0.0
-lib/libXrdXrootd-4.so
-man/man1/xprep.1.gz
-man/man1/xrd.1.gz
-man/man1/xrdadler32.1.gz
-man/man1/xrdcopy.1.gz
-man/man1/xrdcp-old.1.gz
-man/man1/xrdcp.1.gz
-man/man1/xrdfs.1.gz
-man/man1/xrdgsiproxy.1.gz
-man/man1/xrdgsitest.1.gz
-man/man1/xrdstagetool.1.gz
-man/man8/XrdCnsd.8.gz
-man/man8/cmsd.8.gz
-man/man8/cns_ssi.8.gz
-man/man8/frm_admin.8.gz
-man/man8/frm_purged.8.gz
-man/man8/frm_xfragent.8.gz
-man/man8/frm_xfrd.8.gz
-man/man8/mpxstats.8.gz
-man/man8/xrdpfc_print.8.gz
-man/man8/xrdpwdadmin.8.gz
-man/man8/xrdsssadmin.8.gz
-man/man8/xrootd.8.gz
-%%DATADIR%%/utils/cms_monPerf
+lib/libXrdXml.so.3
+lib/libXrdXml.so.3.0.0
+lib/libXrdXrootd-5.so
+share/man/man1/xrdadler32.1.gz
+share/man/man1/xrdcopy.1.gz
+share/man/man1/xrdcp.1.gz
+share/man/man1/xrdfs.1.gz
+share/man/man1/xrdgsiproxy.1.gz
+share/man/man1/xrdgsitest.1.gz
+share/man/man1/xrdmapc.1.gz
+share/man/man8/cmsd.8.gz
+share/man/man8/frm_admin.8.gz
+share/man/man8/frm_purged.8.gz
+share/man/man8/frm_xfragent.8.gz
+share/man/man8/frm_xfrd.8.gz
+share/man/man8/mpxstats.8.gz
+share/man/man8/xrdpfc_print.8.gz
+share/man/man8/xrdpwdadmin.8.gz
+share/man/man8/xrdsssadmin.8.gz
+share/man/man8/xrootd.8.gz
 %%DATADIR%%/utils/XrdCmsNotify.pm
 %%DATADIR%%/utils/XrdOlbMonPerf
+%%DATADIR%%/utils/cms_monPerf
 %%DATADIR%%/utils/netchk
diff --git a/databases/xtrabackup/Makefile b/databases/xtrabackup/Makefile
deleted file mode 100644
index 3b65bd636e2a..000000000000
--- a/databases/xtrabackup/Makefile
+++ /dev/null
@@ -1,61 +0,0 @@
-# Created by: Alex Samorukov <samm@freebsd.org>
-
-PORTNAME=	xtrabackup
-DISTVERSION=	2.4.21
-CATEGORIES=	databases
-MASTER_SITES=	https://www.percona.com/downloads/Percona-XtraBackup-${PORTVERSION:R}/Percona-XtraBackup-${PORTVERSION}/source/tarball/:xtrabackup \
-		https://ftp.osuosl.org/pub/blfs/conglomeration/boost/:boost SF/boost/boost/1.59.0/:boost
-DISTFILES=	percona-${PORTNAME}-${PORTVERSION}.tar.gz:xtrabackup \
-		boost_1_59_0.tar.bz2:boost
-
-MAINTAINER=	samm@FreeBSD.org
-COMMENT=	OpenSource version of InnoDB backup with support of Percona extensions
-
-LICENSE=	GPLv2
-LICENSE_FILE=	${WRKSRC}/LICENSE
-
-BROKEN_armv6=		fails to compile: cannot combine with previous 'type-name' declaration specifier
-BROKEN_armv7=		fails to compile: cannot combine with previous 'type-name' declaration specifier
-BROKEN_mips64=		fails to compile: 'fpsetmask' was not declared in this scope
-
-# quilt is required by build.sh
-BUILD_DEPENDS=	bash:shells/bash \
-		cmake:devel/cmake
-LIB_DEPENDS=	libcurl.so:ftp/curl \
-		libev.so:devel/libev \
-		libgcrypt.so:security/libgcrypt \
-		libgpg-error.so:security/libgpg-error
-RUN_DEPENDS=	qpress:archivers/qpress
-
-USES=		alias autoreconf:build bison cmake:noninja compiler:c++11-lang \
-		cpe gettext libtool perl5 shebangfix
-USE_CXXSTD=	c++11
-
-CONFLICTS_INSTALL=	${PORTNAME}8
-
-CPE_VENDOR=	percona
-SHEBANG_FILES=	storage/innobase/xtrabackup/xbcloud_osenv.sh
-CMAKE_ARGS=	-DWITH_BOOST=${WRKDIR}/boost_1_59_0 -DWITH_VERSION_CHECK=OFF
-
-WRKSRC=		${WRKDIR}/percona-${PORTNAME}-${PORTVERSION}
-
-PLIST_FILES=	bin/xtrabackup bin/xbstream bin/innobackupex bin/xbcrypt \
-		bin/xbcloud bin/xbcloud_osenv
-
-.include <bsd.port.pre.mk>
-# xtrabackup/mysql57 fails to compile with llvm11, which was imported to current in r364284
-# without a version increase (1300109 = r364274).
-# Until a proper fix is provided, simply use llvm from ports, which probably could be
-# a backport of amongst other tings:
-# https://github.com/mysql/mysql-server/commit/08f46b3c00ee70e7ed7825daeb91df2289f80f50
-.if ${CHOSEN_COMPILER_TYPE} == clang && ${OPSYS} == FreeBSD && ${OSVERSION} >= 1300109
-BUILD_DEPENDS+=	clang${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT}
-CC=		${LOCALBASE}/bin/clang${LLVM_DEFAULT}
-CXX=		${LOCALBASE}/bin/clang++${LLVM_DEFAULT}
-.endif
-
-# Not sure why it's trying to install mysql client libraries now
-post-install:
-	${RM} -rf ${STAGEDIR}${LOCALBASE}/lib
-
-.include <bsd.port.post.mk>
diff --git a/databases/xtrabackup/distinfo b/databases/xtrabackup/distinfo
deleted file mode 100644
index 2a26d91ed656..000000000000
--- a/databases/xtrabackup/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-TIMESTAMP = 1610454639
-SHA256 (percona-xtrabackup-2.4.21.tar.gz) = 6427b16348c181df8b570bc9e7c16374fef81277dd8677628ae3b9fb608548cc
-SIZE (percona-xtrabackup-2.4.21.tar.gz) = 61901220
-SHA256 (boost_1_59_0.tar.bz2) = 727a932322d94287b62abb1bd2d41723eec4356a7728909e38adb65ca25241ca
-SIZE (boost_1_59_0.tar.bz2) = 70389425
diff --git a/databases/xtrabackup/files/patch-cmake_os_FreeBSD.cmake b/databases/xtrabackup/files/patch-cmake_os_FreeBSD.cmake
deleted file mode 100644
index 2b65a3faef22..000000000000
--- a/databases/xtrabackup/files/patch-cmake_os_FreeBSD.cmake
+++ /dev/null
@@ -1,31 +0,0 @@
---- cmake/os/FreeBSD.cmake.orig	2020-05-26 05:35:19 UTC
-+++ cmake/os/FreeBSD.cmake
-@@ -36,6 +36,20 @@ IF(NOT FORCE_UNSUPPORTED_COMPILER)
-     IF(GCC_VERSION VERSION_LESS 4.4)
-       MESSAGE(FATAL_ERROR "GCC 4.4 or newer is required!")
-     ENDIF()
-+    CHECK_C_SOURCE_RUNS("
-+      int main()
-+      {
-+        return (__clang_major__ >= 4);
-+      }" I386_ATOMIC_BUILTINS)
-+    IF((CMAKE_SYSTEM_PROCESSOR MATCHES "i386") AND (NOT I386_ATOMIC_BUILTINS))
-+      SET(HAVE_GCC_ATOMIC_BUILTINS CACHE  INTERNAL "")
-+    ENDIF()
-+  ELSEIF(CMAKE_COMPILER_IS_GNUCC)
-+    EXECUTE_PROCESS(COMMAND ${CMAKE_C_COMPILER} -dumpversion
-+                    OUTPUT_VARIABLE GCC_VERSION)
-+    IF(GCC_VERSION VERSION_LESS 4.4)
-+      MESSAGE(FATAL_ERROR "GCC 4.4 or newer is required!")
-+    ENDIF()
-   ELSE()
-     MESSAGE(FATAL_ERROR "Unsupported compiler!")
-   ENDIF()
-@@ -44,4 +58,6 @@ ENDIF()
- # Should not be needed any more, but kept for easy resurrection if needed
- #   #Legacy option, maybe not needed anymore , taken as is from autotools build
- #   ADD_DEFINITIONS(-DNET_RETRY_COUNT=1000000)
--
-+# For GCC maybe it's also good idea to use
-+#   ADD_DEFINITIONS(-D_GNU_SOURCE)
-+    
diff --git a/databases/xtrabackup/files/patch-storage-myisam-mi_dynrec.c b/databases/xtrabackup/files/patch-storage-myisam-mi_dynrec.c
deleted file mode 100644
index 4436e2e4b195..000000000000
--- a/databases/xtrabackup/files/patch-storage-myisam-mi_dynrec.c
+++ /dev/null
@@ -1,23 +0,0 @@
---- storage/myisam/mi_dynrec.c.orig	2020-04-10 19:45:19 UTC
-+++ storage/myisam/mi_dynrec.c
-@@ -65,18 +65,13 @@ my_bool mi_dynmap_file(MI_INFO *info, my_off_t size)
-     DBUG_RETURN(1);
-   }
-   /*
--    I wonder if it is good to use MAP_NORESERVE. From the Linux man page:
--    MAP_NORESERVE
--      Do not reserve swap space for this mapping. When swap space is
--      reserved, one has the guarantee that it is possible to modify the
--      mapping. When swap space is not reserved one might get SIGSEGV
--      upon a write if no physical memory is available.
-+      MAP_NORESERVE is unimplemented in FreeBSD
-   */
-   info->s->file_map= (uchar*)
-                   my_mmap(0, (size_t) size,
-                           info->s->mode==O_RDONLY ? PROT_READ :
-                           PROT_READ | PROT_WRITE,
--                          MAP_SHARED | MAP_NORESERVE,
-+                          MAP_SHARED,
-                           info->dfile, 0L);
-   if (info->s->file_map == (uchar*) MAP_FAILED)
-   {
diff --git a/databases/xtrabackup/files/patch-storage_innobase_fsp_fsp0fsp.cc b/databases/xtrabackup/files/patch-storage_innobase_fsp_fsp0fsp.cc
deleted file mode 100644
index 86d7e46582fb..000000000000
--- a/databases/xtrabackup/files/patch-storage_innobase_fsp_fsp0fsp.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- storage/innobase/fsp/fsp0fsp.cc.orig	2020-04-10 19:45:19 UTC
-+++ storage/innobase/fsp/fsp0fsp.cc
-@@ -1289,7 +1289,7 @@ fsp_header_decode_encryption_info(
- 
- 	if (elen == MY_AES_BAD_DATA) {
- 		my_free(master_key);
--		return(NULL);
-+		return(false);
- 	}
- 
- 	/* Check checksum bytes. */
diff --git a/databases/xtrabackup/files/patch-storage_innobase_xtrabackup_src_ds__tmpfile.c b/databases/xtrabackup/files/patch-storage_innobase_xtrabackup_src_ds__tmpfile.c
deleted file mode 100644
index 1354c60ff98c..000000000000
--- a/databases/xtrabackup/files/patch-storage_innobase_xtrabackup_src_ds__tmpfile.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- storage/innobase/xtrabackup/src/ds_tmpfile.c.orig	2020-04-10 19:45:19 UTC
-+++ storage/innobase/xtrabackup/src/ds_tmpfile.c
-@@ -55,7 +55,7 @@ datasink_t datasink_tmpfile = {
- 	&tmpfile_deinit
- };
- 
--MY_TMPDIR mysql_tmpdir_list;
-+extern MY_TMPDIR mysql_tmpdir_list;
- 
- static ds_ctxt_t *
- tmpfile_init(const char *root)
diff --git a/databases/xtrabackup/files/patch-storage_innobase_xtrabackup_src_xbstream.c b/databases/xtrabackup/files/patch-storage_innobase_xtrabackup_src_xbstream.c
deleted file mode 100644
index 2542052b2790..000000000000
--- a/databases/xtrabackup/files/patch-storage_innobase_xtrabackup_src_xbstream.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- storage/innobase/xtrabackup/src/xbstream.c.orig	2020-04-10 19:45:19 UTC
-+++ storage/innobase/xtrabackup/src/xbstream.c
-@@ -55,7 +55,6 @@ datasink_t datasink_xbstream;
- datasink_t datasink_compress;
- datasink_t datasink_tmpfile;
- datasink_t datasink_encrypt;
--datasink_t datasink_buffer;
- 
- static run_mode_t	opt_mode;
- static char *		opt_directory = NULL;
diff --git a/databases/xtrabackup/pkg-descr b/databases/xtrabackup/pkg-descr
deleted file mode 100644
index 6fb6e725074b..000000000000
--- a/databases/xtrabackup/pkg-descr
+++ /dev/null
@@ -1,6 +0,0 @@
-Percona XtraBackup is OpenSource online (non-blockable) backup solution for
-InnoDB and XtraDB engines. It can back up data from InnoDB, XtraDB, and MyISAM
-tables on unmodified MySQL 5.1, 5.5 and 5.6 servers, as well as Percona Server
-with XtraDB.
-
-WWW: https://www.percona.com/doc/percona-xtrabackup/
diff --git a/databases/xtrabackup8/Makefile b/databases/xtrabackup8/Makefile
deleted file mode 100644
index dd5bd8aa1fbc..000000000000
--- a/databases/xtrabackup8/Makefile
+++ /dev/null
@@ -1,64 +0,0 @@
-# Created by: Alex Samorukov <samm@freebsd.org>
-
-PORTNAME=	xtrabackup
-PORTVERSION=	8.0.14
-PORTREVISION=	2
-CATEGORIES=	databases
-MASTER_SITES=	https://www.percona.com/downloads/Percona-XtraBackup-${PORTVERSION:R}/Percona-XtraBackup-${PORTVERSION}/source/tarball/ \
-		https://github.com/percona/percona-xtrabackup/archive/
-PKGNAMESUFFIX=	8
-DISTNAME=	percona-${PORTNAME}-${PORTVERSION}
-
-MAINTAINER=	eugene@zhegan.in
-COMMENT=	Open-source backup tool for InnoDB and XtraDB
-
-LICENSE=	GPLv2
-LICENSE_FILE=	${WRKSRC}/LICENSE
-
-BUILD_DEPENDS=	xxd:editors/vim \
-		boost-libs>=1.72.0:devel/boost-libs \
-		protobuf>=3.0:devel/protobuf \
-		rapidjson>=1.1.0:devel/rapidjson \
-		libevent>=2.1:devel/libevent
-LIB_DEPENDS=	libcurl.so:ftp/curl \
-		libev.so:devel/libev \
-		libgcrypt.so:security/libgcrypt \
-		libgpg-error.so:security/libgpg-error \
-		libicudata.so:devel/icu \
-		libunwind.so:devel/libunwind \
-		libzstd.so:archivers/zstd
-RUN_DEPENDS=	qpress:archivers/qpress
-
-CONFLICTS_INSTALL=	${PORTNAME}
-
-USES=		bison cmake compiler:c++14-lang cpe pkgconfig ssl
-CPE_VENDOR=	percona
-CMAKE_ARGS=	-DBUILD_CONFIG:STRING=xtrabackup_release
-.for component in EDITLINE ICU LIBEVENT PROTOBUF RAPIDJSON ZSTD
-CMAKE_ARGS+=	-DWITH_${component}:STRING=system
-.endfor
-
-.include <bsd.port.pre.mk>
-
-# Since MySQL 8.0.20 InnoDB engine uses new memory alligned allocator
-# which is broken on i386 due to different size of types and causes a
-# 'static_assert(alignof(T) <= alignof(std::max_align_t))' error
-.if ${ARCH} == i386
-CMAKE_ARGS+=	-DDISABLE_PSI_MEMORY=1
-.endif
-
-post-extract:
-# Delete bundled components so we won't accidentally use them, except LZ4
-# which cannot be removed just yet
-	@${MV} ${WRKSRC}/extra/lz4 ${WRKSRC}
-	@${RM} -r ${WRKSRC}/extra/*
-	@${MV} ${WRKSRC}/lz4 ${WRKSRC}/extra
-
-post-patch:
-	@${REINPLACE_CMD} -e 's,TRUE,true,' ${WRKSRC}/sql/mysqld.cc
-
-post-stage:
-	@${RM} -r ${STAGEDIR}${PREFIX}/docs
-	@${RMDIR} ${STAGEDIR}${PREFIX}/lib/plugin/debug
-
-.include <bsd.port.post.mk>
diff --git a/databases/xtrabackup8/distinfo b/databases/xtrabackup8/distinfo
deleted file mode 100644
index 17df898cd990..000000000000
--- a/databases/xtrabackup8/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1598684487
-SHA256 (percona-xtrabackup-8.0.14.tar.gz) = db8d6d2c6a6b016bf24b4942582ebdbd55c09253ccc78daa6911217bd5a73d5d
-SIZE (percona-xtrabackup-8.0.14.tar.gz) = 285621091
diff --git a/databases/xtrabackup8/files/patch-CMakeLists.txt b/databases/xtrabackup8/files/patch-CMakeLists.txt
deleted file mode 100644
index 15735641fee2..000000000000
--- a/databases/xtrabackup8/files/patch-CMakeLists.txt
+++ /dev/null
@@ -1,13 +0,0 @@
---- CMakeLists.txt.orig	2020-08-28 21:02:32 UTC
-+++ CMakeLists.txt
-@@ -1575,10 +1575,6 @@ IF(ENABLE_GCOV)
-   INCLUDE(fastcov)
- ENDIF()
- 
--IF(UNIX)
--  ADD_SUBDIRECTORY(man)
--ENDIF()
--
- IF(NOT WITHOUT_SERVER)
-   ADD_SUBDIRECTORY(packaging/rpm-common)
-   ADD_SUBDIRECTORY(packaging/rpm-oel)
diff --git a/databases/xtrabackup8/files/patch-cmake-install_layout.cmake b/databases/xtrabackup8/files/patch-cmake-install_layout.cmake
deleted file mode 100644
index e823abeffe31..000000000000
--- a/databases/xtrabackup8/files/patch-cmake-install_layout.cmake
+++ /dev/null
@@ -1,11 +0,0 @@
---- cmake/install_layout.cmake.orig	2020-04-10 19:45:19 UTC
-+++ cmake/install_layout.cmake
-@@ -160,7 +160,7 @@ SET(INSTALL_INFODIR_STANDALONE          "docs")
- #
- SET(INSTALL_SHAREDIR_STANDALONE         "share")
- SET(INSTALL_MYSQLSHAREDIR_STANDALONE    "share")
--SET(INSTALL_MYSQLTESTDIR_STANDALONE     "xtrabackup-test")
-+# SET(INSTALL_MYSQLTESTDIR_STANDALONE     "xtrabackup-test")
- SET(INSTALL_SUPPORTFILESDIR_STANDALONE  "support-files")
- #
- SET(INSTALL_MYSQLDATADIR_STANDALONE     "data")
diff --git a/databases/xtrabackup8/files/patch-sql_binlog.cc b/databases/xtrabackup8/files/patch-sql_binlog.cc
deleted file mode 100644
index 2bae3d050d5a..000000000000
--- a/databases/xtrabackup8/files/patch-sql_binlog.cc
+++ /dev/null
@@ -1,24 +0,0 @@
---- sql/binlog.cc.orig	2020-08-28 21:02:32 UTC
-+++ sql/binlog.cc
-@@ -9163,8 +9163,8 @@ void MYSQL_BIN_LOG::report_missing_purged_gtids(
- 
-   char *missing_gtids = NULL;
-   char *slave_executed_gtids = NULL;
--  gtid_missing.to_string(&missing_gtids, NULL);
--  slave_executed_gtid_set->to_string(&slave_executed_gtids, NULL);
-+  gtid_missing.to_string(&missing_gtids, false);
-+  slave_executed_gtid_set->to_string(&slave_executed_gtids, false);
- 
-   /*
-      Log the information about the missing purged GTIDs to the error log.
-@@ -9217,8 +9217,8 @@ void MYSQL_BIN_LOG::report_missing_gtids(
-   Gtid_set gtid_missing(slave_executed_gtid_set->get_sid_map());
-   gtid_missing.add_gtid_set(slave_executed_gtid_set);
-   gtid_missing.remove_gtid_set(previous_gtid_set);
--  gtid_missing.to_string(&missing_gtids, NULL);
--  slave_executed_gtid_set->to_string(&slave_executed_gtids, NULL);
-+  gtid_missing.to_string(&missing_gtids, false);
-+  slave_executed_gtid_set->to_string(&slave_executed_gtids, false);
- 
-   String tmp_uuid;
- 
diff --git a/databases/xtrabackup8/pkg-descr b/databases/xtrabackup8/pkg-descr
deleted file mode 100644
index f3724e711112..000000000000
--- a/databases/xtrabackup8/pkg-descr
+++ /dev/null
@@ -1,6 +0,0 @@
-Percona XtraBackup is an open-source hot backup utility for MySQL that
-doesn't lock your database during the backup. It can back up data from
-InnoDB, XtraDB and MyISAM tables on MySQL/Percona Server/MariaDB
-servers, and has many advanced features.
-
-WWW: https://www.percona.com/doc/percona-xtrabackup/
diff --git a/databases/xtrabackup8/pkg-plist b/databases/xtrabackup8/pkg-plist
deleted file mode 100644
index 23c9a45c576d..000000000000
--- a/databases/xtrabackup8/pkg-plist
+++ /dev/null
@@ -1,8 +0,0 @@
-bin/xbcloud
-bin/xbcloud_osenv
-bin/xbcrypt
-bin/xbstream
-bin/xtrabackup
-lib/libmysqlservices.a
-lib/plugin/keyring_file.so
-lib/plugin/keyring_vault.so
diff --git a/databases/xtrabackup80/Makefile b/databases/xtrabackup80/Makefile
new file mode 100644
index 000000000000..65315e7d2baf
--- /dev/null
+++ b/databases/xtrabackup80/Makefile
@@ -0,0 +1,89 @@
+PORTNAME=	xtrabackup80
+PORTVERSION=	8.0.35
+DISTVERSIONSUFFIX=	-30
+CATEGORIES=	databases
+MASTER_SITES=	https://downloads.percona.com/downloads/Percona-XtraBackup-8.0/Percona-XtraBackup-8.0.35-30/source/tarball/:percona \
+		SF/boost/boost/${BOOST_VERSION}:boost
+DISTFILES=	${PPORTNAME}-${DVERSION}${EXTRACT_SUFX}:percona \
+		boost_${BOOST_VERSION_UNDER}${EXTRACT_SUFX}:boost
+
+MAINTAINER=	eugene@zhegan.in
+COMMENT=	Open-source backup tool for InnoDB and XtraDB
+WWW=		https://www.percona.com/doc/percona-xtrabackup/
+
+LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
+BUILD_DEPENDS=	protobuf>=3.0:devel/protobuf \
+		rapidjson>=1.1.0:devel/rapidjson \
+		libevent>=2.1:devel/libevent
+LIB_DEPENDS=	libcurl.so:ftp/curl \
+		libev.so:devel/libev \
+		libgcrypt.so:security/libgcrypt \
+		libgpg-error.so:security/libgpg-error \
+		libicudata.so:devel/icu \
+		libprotobuf-lite.so:devel/protobuf \
+		libunwind.so:devel/libunwind \
+		libzstd.so:archivers/zstd
+RUN_DEPENDS=	qpress:archivers/qpress
+
+USES=		bison cmake compiler:c++14-lang cpe pkgconfig ssl
+CPE_VENDOR=	percona
+CMAKE_ARGS=	-DBUILD_CONFIG:STRING=xtrabackup_release \
+		-DWITHOUT_COMPONENT_KEYRING_KMIP:STRING=yes \
+		-DWITH_VERSION_CHECK=false
+
+.for component in EDITLINE ICU LIBEVENT PROTOBUF RAPIDJSON ZSTD
+CMAKE_ARGS+=	-DWITH_${component}:STRING=system
+.endfor
+
+CONFLICTS_INSTALL=	${PORTNAME:C/.$//}*
+
+# Bundle last supported Boost release
+BOOST_VERSION=	1.77.0
+BOOST_VERSION_UNDER=	${BOOST_VERSION:C/\./_/g}
+
+CMAKE_ARGS+=	-DWITH_BOOST=${WRKDIR}/boost_${BOOST_VERSION_UNDER}
+
+# Build fails without NDEBUG, so force it
+CFLAGS+=	-DNDEBUG
+CXXFLAGS+=	-DNDEBUG
+
+DVERSION=	${PORTVERSION}${DISTVERSIONSUFFIX}
+PPORTNAME=	percona-xtrabackup
+WRKSRC=		${WRKDIR}/${PPORTNAME}-${DVERSION}
+
+.include <bsd.port.pre.mk>
+
+# Since MySQL 8.0.20 InnoDB engine uses new memory alligned allocator
+# which is broken on i386 due to different size of types and causes a
+# 'static_assert(alignof(T) <= alignof(std::max_align_t))' error
+.if ${ARCH} == i386
+CXXFLAGS+=	-malign-double
+.endif
+
+KEEP_EXTRA=	lz4 robin-hood-hashing zlib
+
+post-patch:
+.for d in storage/innobase/xtrabackup/src sql/protobuf
+	${REINPLACE_CMD} 's,%%PREFIX%%,${PREFIX},' ${WRKSRC}/${d}/CMakeLists.txt
+.endfor
+.if ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} >= 160
+	@${REINPLACE_CMD} -e 's|std::unary_function|std::__unary_function|' \
+		${WRKSRC}/../boost_${BOOST_VERSION_UNDER}/boost/container_hash/hash.hpp
+.endif
+
+pre-configure:
+.for dir in ${KEEP_EXTRA}
+	@${MV} ${WRKSRC}/extra/${dir} ${WRKDIR}
+.endfor
+	@${RM} -r ${WRKSRC}/extra/*
+.for dir in ${KEEP_EXTRA}
+	@${MV} ${WRKDIR}/${dir} ${WRKSRC}/extra
+.endfor
+
+post-stage:
+	@${RM} -r ${STAGEDIR}${PREFIX}/docs ${STAGEDIR}${PREFIX}/man
+	@${RMDIR} ${STAGEDIR}${PREFIX}/lib/plugin/debug
+
+.include <bsd.port.post.mk>
diff --git a/databases/xtrabackup80/distinfo b/databases/xtrabackup80/distinfo
new file mode 100644
index 000000000000..53dc0ae04280
--- /dev/null
+++ b/databases/xtrabackup80/distinfo
@@ -0,0 +1,5 @@
+TIMESTAMP = 1677255149
+SHA256 (percona-xtrabackup-8.0.35-30.tar.gz) = 8a3632a5a7a91834800f4f83902468bccff1d979e82347c0372b39a97b0c85f0
+SIZE (percona-xtrabackup-8.0.35-30.tar.gz) = 447842768
+SHA256 (boost_1_77_0.tar.gz) = 5347464af5b14ac54bb945dc68f1dd7c56f0dad7262816b956138fc53bcc0131
+SIZE (boost_1_77_0.tar.gz) = 130620992
diff --git a/databases/xtrabackup80/files/patch-CMakeLists.txt b/databases/xtrabackup80/files/patch-CMakeLists.txt
new file mode 100644
index 000000000000..750740325604
--- /dev/null
+++ b/databases/xtrabackup80/files/patch-CMakeLists.txt
@@ -0,0 +1,22 @@
+--- CMakeLists.txt.orig	2023-11-24 17:33:10.000000000 +0700
++++ CMakeLists.txt	2024-02-17 02:31:46.069754000 +0700
+@@ -2078,8 +2078,6 @@
+   ENDIF()
+ ENDIF()
+ 
+-ADD_SUBDIRECTORY(extra/libkmip)
+-
+ #
+ # Setup maintainer mode options by the end. Platform checks are
+ # not run with the warning options as to not perturb fragile checks
+@@ -2322,10 +2320,6 @@
+ 
+ IF(ENABLE_GCOV)
+   INCLUDE(fastcov)
+-ENDIF()
+-
+-IF(UNIX)
+-  ADD_SUBDIRECTORY(man)
+ ENDIF()
+ 
+ IF(LINUX AND NOT WITHOUT_SERVER)
diff --git a/databases/xtrabackup/files/patch-cmake-install_layout.cmake b/databases/xtrabackup80/files/patch-cmake-install_layout.cmake
index e823abeffe31..e823abeffe31 100644
--- a/databases/xtrabackup/files/patch-cmake-install_layout.cmake
+++ b/databases/xtrabackup80/files/patch-cmake-install_layout.cmake
diff --git a/databases/xtrabackup8/files/patch-cmake_os_FreeBSD.cmake b/databases/xtrabackup80/files/patch-cmake_os_FreeBSD.cmake
index 624f462e7542..624f462e7542 100644
--- a/databases/xtrabackup8/files/patch-cmake_os_FreeBSD.cmake
+++ b/databases/xtrabackup80/files/patch-cmake_os_FreeBSD.cmake
diff --git a/databases/xtrabackup80/files/patch-file_utils b/databases/xtrabackup80/files/patch-file_utils
new file mode 100644
index 000000000000..a23aa72136d4
--- /dev/null
+++ b/databases/xtrabackup80/files/patch-file_utils
@@ -0,0 +1,20 @@
+--- storage/innobase/xtrabackup/src/file_utils.cc.orig	2023-11-24 17:33:10.000000000 +0700
++++ storage/innobase/xtrabackup/src/file_utils.cc	2024-02-17 00:40:45.193255000 +0700
+@@ -20,7 +20,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Bos
+ 
+ #include "file_utils.h"
+ #include <mysql/service_mysql_alloc.h>
+-#ifdef __APPLE__
++#if defined(__APPLE__) || defined (__FreeBSD__)
+ #include <sys/event.h>
+ #else
+ #include <sys/epoll.h>
+@@ -391,7 +391,7 @@ File open_fifo_for_read_with_timeout(const char *path,
+   }
+ 
+   /* File was open, lets check its open on the other side */
+-#ifdef __APPLE__
++#if defined(__APPLE__) || defined(__FreeBSD__)
+   struct timespec tm = {timeout, 0};
+   int kqueue_fd = kqueue();
+   if (kqueue_fd < 0) {
diff --git a/databases/xtrabackup80/files/patch-llvm-15 b/databases/xtrabackup80/files/patch-llvm-15
new file mode 100644
index 000000000000..094f83fbb98b
--- /dev/null
+++ b/databases/xtrabackup80/files/patch-llvm-15
@@ -0,0 +1,28 @@
+--- storage/innobase/include/ddl0impl.h.orig	2023-11-24 13:33:10.000000000 +0300
++++ storage/innobase/include/ddl0impl.h	2024-02-16 15:06:59.137578000 +0300
+@@ -118,14 +118,6 @@
+ 
+ /** Physical row context. */
+ struct Row {
+-  /** Constructor. */
+-  Row() = default;
+-
+-  Row(const Row &) = default;
+-
+-  /** Destructor. */
+-  ~Row() = default;
+-
+   Row &operator=(const Row &) = default;
+ 
+   /** Build a row from a raw record.
+--- unittest/gunit/mysys_my_rdtsc-t.cc.orig	2024-02-16 15:08:36.323297000 +0300
++++ unittest/gunit/mysys_my_rdtsc-t.cc	2024-02-16 15:08:40.000582000 +0300
+@@ -145,7 +145,7 @@
+   ulonglong t1 = my_timer_nanoseconds();
+   ulonglong t2;
+   int i;
+-  int backward = 0;
++  int backward [[maybe_unused]] = 0;
+   int nonzero = 0;
+ 
+   for (i = 0; i < LOOP_COUNT; i++) {
diff --git a/databases/xtrabackup80/files/patch-procps b/databases/xtrabackup80/files/patch-procps
new file mode 100644
index 000000000000..733821dd7c65
--- /dev/null
+++ b/databases/xtrabackup80/files/patch-procps
@@ -0,0 +1,28 @@
+--- storage/innobase/xtrabackup/src/CMakeLists.txt.orig	2023-11-24 13:33:10.000000000 +0300
++++ storage/innobase/xtrabackup/src/CMakeLists.txt	2024-02-16 15:38:03.294091000 +0300
+@@ -20,8 +20,9 @@
+ 
+ INCLUDE(${MYSQL_CMAKE_SCRIPT_DIR}/compile_flags.cmake)
+ 
++INCLUDE_DIRECTORIES(%%PREFIX%%/include)
++
+ FIND_GCRYPT()
+-FIND_PROCPS()
+ 
+ CHECK_TYPE_SIZE("unsigned long" SIZEOF_UNSIGNED_LONG)
+ 
+@@ -134,14 +135,6 @@
+   ext::icu
+   crc
+   )
+-
+-IF(NOT APPLE)
+-  IF(PROCPS_VERSION EQUAL 4)
+-    TARGET_LINK_LIBRARIES(xtrabackup proc2)
+-  ELSE()
+-    TARGET_LINK_LIBRARIES(xtrabackup procps)
+-  ENDIF()
+-ENDIF()
+ 
+  # We depend on protobuf because of the mysqlx plugin and replication.
+  IF(UNIX_INSTALL_RPATH_ORIGIN_PRIV_LIBDIR)
diff --git a/databases/xtrabackup80/files/patch-protobuf b/databases/xtrabackup80/files/patch-protobuf
new file mode 100644
index 000000000000..f1bd482d944a
--- /dev/null
+++ b/databases/xtrabackup80/files/patch-protobuf
@@ -0,0 +1,10 @@
+--- sql/protobuf/CMakeLists.txt.orig	2023-11-24 17:33:10.000000000 +0700
++++ sql/protobuf/CMakeLists.txt	2024-02-17 02:13:42.264307000 +0700
+@@ -21,6 +21,7 @@
+ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
+ 
+ INCLUDE(${CMAKE_SOURCE_DIR}/cmake/protobuf.cmake)
++INCLUDE_DIRECTORIES(%%PREFIX%%/include)
+ 
+ SET(PROTOBUF_LITE_LIB_NAME rpl_protobuf_lite)
+ 
diff --git a/databases/xtrabackup80/files/patch-storage_innobase_log__log0recv.cc b/databases/xtrabackup80/files/patch-storage_innobase_log__log0recv.cc
new file mode 100644
index 000000000000..4f6c96125878
--- /dev/null
+++ b/databases/xtrabackup80/files/patch-storage_innobase_log__log0recv.cc
@@ -0,0 +1,29 @@
+--- storage/innobase/log/log0recv.cc.orig	2023-11-24 13:33:10.000000000 +0300
++++ storage/innobase/log/log0recv.cc	2024-02-16 15:16:49.528584000 +0300
+@@ -3702,7 +3702,7 @@
+ #else  /* !UNIV_HOTBACKUP */
+ bool meb_scan_log_recs(
+ #endif /* !UNIV_HOTBACKUP */
+-                               size_t *max_memory, const byte *buf, size_t len,
++                               size_t max_memory, const byte *buf, size_t len,
+                                lsn_t start_lsn, lsn_t *read_upto_lsn,
+                                lsn_t to_lsn) {
+   const byte *log_block = buf;
+@@ -3975,7 +3975,7 @@
+     recv_parse_log_recs();
+ 
+ #ifndef UNIV_HOTBACKUP
+-    if (recv_heap_used() > *max_memory) {
++    if (recv_heap_used() > max_memory) {
+       recv_apply_hashed_log_recs(log, false);
+     }
+ #endif /* !UNIV_HOTBACKUP */
+@@ -4161,7 +4161,7 @@
+       break;
+     }
+ 
+-    finished = recv_scan_log_recs(log, &max_mem, log.buf, end_lsn - start_lsn,
++    finished = recv_scan_log_recs(log, max_mem, log.buf, end_lsn - start_lsn,
+                                   start_lsn, &log.m_scanned_lsn, to_lsn);
+ 
+     start_lsn = end_lsn;
diff --git a/databases/xtrabackup80/files/patch-storage_innobase_xtrabackup_src_utils.cc b/databases/xtrabackup80/files/patch-storage_innobase_xtrabackup_src_utils.cc
new file mode 100644
index 000000000000..34feee9867f6
--- /dev/null
+++ b/databases/xtrabackup80/files/patch-storage_innobase_xtrabackup_src_utils.cc
@@ -0,0 +1,59 @@
+--- storage/innobase/xtrabackup/src/utils.cc.orig	2023-01-30 20:34:34.000000000 +0700
++++ storage/innobase/xtrabackup/src/utils.cc	2023-02-25 02:50:31.899561000 +0700
+@@ -21,6 +21,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Bos
+ 
+ #ifdef __APPLE__
+ #include <mach/mach_host.h>
++#endif
++#if defined(__APPLE__) || defined(__FreeBSD__)
+ #include <sys/sysctl.h>
+ #else
+ #include <proc/sysinfo.h>
+@@ -112,12 +114,14 @@ unsigned long get_version_number(std::string version_s
+   return major * 10000 + minor * 100 + version;
+ }
+ 
+-#ifdef __APPLE__
++#if defined(__APPLE__) || defined(__FreeBSD__)
+ unsigned long host_total_memory() {
+   unsigned long total_mem = sysconf(_SC_PHYS_PAGES) * sysconf(_SC_PAGESIZE);
+   return total_mem;
+ }
++#endif
+ 
++#ifdef __APPLE__
+ unsigned long host_free_memory() {
+   unsigned long total_mem = host_total_memory();
+   int64_t used_mem;
+@@ -138,6 +142,31 @@ unsigned long host_free_memory() {
+     return total_mem - (unsigned long)used_mem;
+   }
+   return 0;
++}
++#elif defined(__FreeBSD__)
++unsigned long host_free_memory() {
++  static int mib_free[2] = { -1, 0 }; 
++  static int mib_inactive[2] = { -1, 0 };
++  size_t miblen = sizeof(mib_free) / sizeof(mib_free[0]);
++  uint32_t free_pages, inactive_pages;
++  size_t sz = sizeof(free_pages);
++  
++  free_pages = inactive_pages = 0;
++
++  if (mib_free[0] < 0 &&
++      sysctlnametomib("vm.stats.vm.v_free_count", mib_free, &miblen) < 0)
++          mib_free[0] = 0;
++  if (mib_inactive[0] < 0 &&
++      sysctlnametomib("vm.stats.vm.v_inactive_count", mib_inactive, &miblen) < 0)
++          mib_inactive[0] = 0;
++  
++  if (mib_free[0] &&
++      sysctl(mib_free, 2, &free_pages, &sz, NULL, 0) < 0)
++          free_pages = 0; /* should not happen */
++  if (mib_inactive[0] && sysctl(mib_inactive, 2, &inactive_pages, &sz, NULL, 0) < 0)
++          inactive_pages = 0; /* should not happen, too */
++
++  return (free_pages + inactive_pages) * sysconf(_SC_PAGESIZE);
+ }
+ #else
+ unsigned long host_total_memory() {
diff --git a/databases/xtrabackup8/files/patch-storage_innobase_xtrabackup_xbcloud__osenv.sh b/databases/xtrabackup80/files/patch-storage_innobase_xtrabackup_xbcloud__osenv.sh
index 37b1e45afc66..37b1e45afc66 100644
--- a/databases/xtrabackup8/files/patch-storage_innobase_xtrabackup_xbcloud__osenv.sh
+++ b/databases/xtrabackup80/files/patch-storage_innobase_xtrabackup_xbcloud__osenv.sh
diff --git a/databases/xtrabackup8/files/patch-storage_temptable_include_temptable_lock_free_type.h b/databases/xtrabackup80/files/patch-storage_temptable_include_temptable_lock_free_type.h
index a229da5b0adc..a229da5b0adc 100644
--- a/databases/xtrabackup8/files/patch-storage_temptable_include_temptable_lock_free_type.h
+++ b/databases/xtrabackup80/files/patch-storage_temptable_include_temptable_lock_free_type.h
diff --git a/databases/xtrabackup80/pkg-descr b/databases/xtrabackup80/pkg-descr
new file mode 100644
index 000000000000..da1655f57769
--- /dev/null
+++ b/databases/xtrabackup80/pkg-descr
@@ -0,0 +1,4 @@
+Percona XtraBackup is an open-source hot backup utility for MySQL that
+doesn't lock your database during the backup. It can back up data from
+InnoDB, XtraDB and MyISAM tables on MySQL/Percona Server/MariaDB
+servers, and has many advanced features.
diff --git a/databases/xtrabackup80/pkg-plist b/databases/xtrabackup80/pkg-plist
new file mode 100644
index 000000000000..7d1e3c5b80e7
--- /dev/null
+++ b/databases/xtrabackup80/pkg-plist
@@ -0,0 +1,10 @@
+bin/xbcloud
+bin/xbcloud_osenv
+bin/xbcrypt
+bin/xbstream
+bin/xtrabackup
+lib/libmysqlservices.a
+lib/plugin/component_keyring_file.so
+lib/plugin/component_keyring_kms.so
+lib/plugin/keyring_file.so
+lib/plugin/keyring_vault.so
diff --git a/databases/xtrabackup81/Makefile b/databases/xtrabackup81/Makefile
new file mode 100644
index 000000000000..75165fccc89c
--- /dev/null
+++ b/databases/xtrabackup81/Makefile
@@ -0,0 +1,89 @@
+PORTNAME=	xtrabackup81
+PORTVERSION=	8.1.0
+DISTVERSIONSUFFIX=	-1
+CATEGORIES=	databases
+MASTER_SITES=	https://downloads.percona.com/downloads/Percona-XtraBackup-innovative-release/Percona-XtraBackup-8.1.0-1/source/tarball/:percona \
+		SF/boost/boost/${BOOST_VERSION}:boost
+DISTFILES=	${PPORTNAME}-${DVERSION}${EXTRACT_SUFX}:percona \
+		boost_${BOOST_VERSION_UNDER}${EXTRACT_SUFX}:boost
+
+MAINTAINER=	eugene@zhegan.in
+COMMENT=	Open-source backup tool for InnoDB and XtraDB
+WWW=		https://www.percona.com/doc/percona-xtrabackup/
+
+LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
+BUILD_DEPENDS=	protobuf>=3.0:devel/protobuf \
+		rapidjson>=1.1.0:devel/rapidjson \
+		libevent>=2.1:devel/libevent
+LIB_DEPENDS=	libcurl.so:ftp/curl \
+		libev.so:devel/libev \
+		libgcrypt.so:security/libgcrypt \
+		libgpg-error.so:security/libgpg-error \
+		libicudata.so:devel/icu \
+		libprotobuf-lite.so:devel/protobuf \
+		libunwind.so:devel/libunwind \
+		libzstd.so:archivers/zstd
+RUN_DEPENDS=	qpress:archivers/qpress
+
+USES=		bison cmake compiler:c++14-lang cpe pkgconfig ssl
+CPE_VENDOR=	percona
+CMAKE_ARGS=	-DBUILD_CONFIG:STRING=xtrabackup_release \
+		-DWITHOUT_COMPONENT_KEYRING_KMIP:STRING=yes \
+		-DWITH_VERSION_CHECK=false
+
+.for component in EDITLINE ICU LIBEVENT PROTOBUF RAPIDJSON ZSTD
+CMAKE_ARGS+=	-DWITH_${component}:STRING=system
+.endfor
+
+CONFLICTS_INSTALL=	${PORTNAME:C/.$//}*
+
+# Bundle last supported Boost release
+BOOST_VERSION=	1.77.0
+BOOST_VERSION_UNDER=	${BOOST_VERSION:C/\./_/g}
+
+CMAKE_ARGS+=	-DWITH_BOOST=${WRKDIR}/boost_${BOOST_VERSION_UNDER}
+
+# Build fails without NDEBUG, so force it
+CFLAGS+=	-DNDEBUG
+CXXFLAGS+=	-DNDEBUG
+
+DVERSION=	${PORTVERSION}${DISTVERSIONSUFFIX}
+PPORTNAME=	percona-xtrabackup
+WRKSRC=		${WRKDIR}/${PPORTNAME}-${DVERSION}
+
+.include <bsd.port.pre.mk>
+
+# Since MySQL 8.0.20 InnoDB engine uses new memory alligned allocator
+# which is broken on i386 due to different size of types and causes a
+# 'static_assert(alignof(T) <= alignof(std::max_align_t))' error
+.if ${ARCH} == i386
+CXXFLAGS+=	-malign-double
+.endif
+
+KEEP_EXTRA=	lz4 robin-hood-hashing zlib
+
+post-patch:
+.for d in storage/innobase/xtrabackup/src sql/protobuf
+	${REINPLACE_CMD} 's,%%PREFIX%%,${PREFIX},' ${WRKSRC}/${d}/CMakeLists.txt
+.endfor
+.if ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} >= 160
+	@${REINPLACE_CMD} -e 's|std::unary_function|std::__unary_function|' \
+		${WRKSRC}/../boost_${BOOST_VERSION_UNDER}/boost/container_hash/hash.hpp
+.endif
+
+pre-configure:
+.for dir in ${KEEP_EXTRA}
+	@${MV} ${WRKSRC}/extra/${dir} ${WRKDIR}
+.endfor
+	@${RM} -r ${WRKSRC}/extra/*
+.for dir in ${KEEP_EXTRA}
+	@${MV} ${WRKDIR}/${dir} ${WRKSRC}/extra
+.endfor
+
+post-stage:
+	@${RM} -r ${STAGEDIR}${PREFIX}/docs ${STAGEDIR}${PREFIX}/man
+	@${RMDIR} ${STAGEDIR}${PREFIX}/lib/plugin/debug
+
+.include <bsd.port.post.mk>
diff --git a/databases/xtrabackup81/distinfo b/databases/xtrabackup81/distinfo
new file mode 100644
index 000000000000..aa6d91e59545
--- /dev/null
+++ b/databases/xtrabackup81/distinfo
@@ -0,0 +1,5 @@
+TIMESTAMP = 1711999595
+SHA256 (percona-xtrabackup-8.1.0-1.tar.gz) = e058d18e2a80838940aa8f80a095413d994f5a4e8ff5c16228fd9382bb826fe6
+SIZE (percona-xtrabackup-8.1.0-1.tar.gz) = 446978094
+SHA256 (boost_1_77_0.tar.gz) = 5347464af5b14ac54bb945dc68f1dd7c56f0dad7262816b956138fc53bcc0131
+SIZE (boost_1_77_0.tar.gz) = 130620992
diff --git a/databases/xtrabackup81/files/patch-CMakeLists.txt b/databases/xtrabackup81/files/patch-CMakeLists.txt
new file mode 100644
index 000000000000..8152347c2ee0
--- /dev/null
+++ b/databases/xtrabackup81/files/patch-CMakeLists.txt
@@ -0,0 +1,22 @@
+--- CMakeLists.txt.orig	2023-10-19 12:05:28 UTC
++++ CMakeLists.txt
+@@ -2094,8 +2094,6 @@ IF(WITH_PROTOBUF STREQUAL "bundled" OR WITH_FIDO STREQ
+   ENDIF()
+ ENDIF()
+ 
+-ADD_SUBDIRECTORY(extra/libkmip)
+-
+ #
+ # Setup maintainer mode options by the end. Platform checks are
+ # not run with the warning options as to not perturb fragile checks
+@@ -2345,10 +2343,6 @@ ENDIF()
+ 
+ IF(ENABLE_GCOV)
+   INCLUDE(fastcov)
+-ENDIF()
+-
+-IF(UNIX)
+-  ADD_SUBDIRECTORY(man)
+ ENDIF()
+ 
+ IF(LINUX AND NOT WITHOUT_SERVER)
diff --git a/databases/xtrabackup81/files/patch-cmake-install_layout.cmake b/databases/xtrabackup81/files/patch-cmake-install_layout.cmake
new file mode 100644
index 000000000000..f5916ece2f0b
--- /dev/null
+++ b/databases/xtrabackup81/files/patch-cmake-install_layout.cmake
@@ -0,0 +1,11 @@
+--- cmake/install_layout.cmake.orig	2023-10-19 12:05:28 UTC
++++ cmake/install_layout.cmake
+@@ -159,7 +159,7 @@ SET(INSTALL_INFODIR_STANDALONE          "docs")
+ #
+ SET(INSTALL_SHAREDIR_STANDALONE         "share")
+ SET(INSTALL_MYSQLSHAREDIR_STANDALONE    "share")
+-SET(INSTALL_MYSQLTESTDIR_STANDALONE     "xtrabackup-test")
++# SET(INSTALL_MYSQLTESTDIR_STANDALONE     "xtrabackup-test")
+ SET(INSTALL_SUPPORTFILESDIR_STANDALONE  "support-files")
+ #
+ SET(INSTALL_MYSQLDATADIR_STANDALONE     "data")
diff --git a/databases/xtrabackup81/files/patch-cmake_os_FreeBSD.cmake b/databases/xtrabackup81/files/patch-cmake_os_FreeBSD.cmake
new file mode 100644
index 000000000000..55947a14f6c3
--- /dev/null
+++ b/databases/xtrabackup81/files/patch-cmake_os_FreeBSD.cmake
@@ -0,0 +1,23 @@
+--- cmake/os/FreeBSD.cmake.orig	2023-10-19 12:05:28 UTC
++++ cmake/os/FreeBSD.cmake
+@@ -48,6 +48,20 @@ IF(NOT FORCE_UNSUPPORTED_COMPILER)
+     IF(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 7.1)
+       MESSAGE(FATAL_ERROR "GCC 7.1 or newer is required")
+     ENDIF()
++    CHECK_C_SOURCE_RUNS("
++      int main()
++      {
++        return (__clang_major__ >= 4);
++      }" I386_ATOMIC_BUILTINS)
++    IF((CMAKE_SYSTEM_PROCESSOR MATCHES "i386") AND (NOT I386_ATOMIC_BUILTINS))
++      SET(HAVE_GCC_ATOMIC_BUILTINS CACHE  INTERNAL "")
++    ENDIF()
++  ELSEIF(CMAKE_COMPILER_IS_GNUCC)
++    EXECUTE_PROCESS(COMMAND ${CMAKE_C_COMPILER} -dumpversion
++                    OUTPUT_VARIABLE GCC_VERSION)
++    IF(GCC_VERSION VERSION_LESS 4.4)
++      MESSAGE(FATAL_ERROR "GCC 4.4 or newer is required!")
++    ENDIF()
+   ELSE()
+     MESSAGE(FATAL_ERROR "Unsupported compiler!")
+   ENDIF()
diff --git a/databases/xtrabackup81/files/patch-file_utils b/databases/xtrabackup81/files/patch-file_utils
new file mode 100644
index 000000000000..a23aa72136d4
--- /dev/null
+++ b/databases/xtrabackup81/files/patch-file_utils
@@ -0,0 +1,20 @@
+--- storage/innobase/xtrabackup/src/file_utils.cc.orig	2023-11-24 17:33:10.000000000 +0700
++++ storage/innobase/xtrabackup/src/file_utils.cc	2024-02-17 00:40:45.193255000 +0700
+@@ -20,7 +20,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Bos
+ 
+ #include "file_utils.h"
+ #include <mysql/service_mysql_alloc.h>
+-#ifdef __APPLE__
++#if defined(__APPLE__) || defined (__FreeBSD__)
+ #include <sys/event.h>
+ #else
+ #include <sys/epoll.h>
+@@ -391,7 +391,7 @@ File open_fifo_for_read_with_timeout(const char *path,
+   }
+ 
+   /* File was open, lets check its open on the other side */
+-#ifdef __APPLE__
++#if defined(__APPLE__) || defined(__FreeBSD__)
+   struct timespec tm = {timeout, 0};
+   int kqueue_fd = kqueue();
+   if (kqueue_fd < 0) {
diff --git a/databases/xtrabackup81/files/patch-llvm-15 b/databases/xtrabackup81/files/patch-llvm-15
new file mode 100644
index 000000000000..0017d73b5902
--- /dev/null
+++ b/databases/xtrabackup81/files/patch-llvm-15
@@ -0,0 +1,28 @@
+--- storage/innobase/include/ddl0impl.h.orig	2023-10-19 12:05:28 UTC
++++ storage/innobase/include/ddl0impl.h
+@@ -118,14 +118,6 @@ struct Fetch_sequence : public Context::FTS::Sequence 
+ 
+ /** Physical row context. */
+ struct Row {
+-  /** Constructor. */
+-  Row() = default;
+-
+-  Row(const Row &) = default;
+-
+-  /** Destructor. */
+-  ~Row() = default;
+-
+   Row &operator=(const Row &) = default;
+ 
+   /** Build a row from a raw record.
+--- unittest/gunit/mysys_my_rdtsc-t.cc.orig	2023-10-19 12:05:28 UTC
++++ unittest/gunit/mysys_my_rdtsc-t.cc
+@@ -145,7 +145,7 @@ TEST_F(RDTimeStampCounter, TestNanosecond) {
+   ulonglong t1 = my_timer_nanoseconds();
+   ulonglong t2;
+   int i;
+-  int backward = 0;
++  int backward [[maybe_unused]] = 0;
+   int nonzero = 0;
+ 
+   for (i = 0; i < LOOP_COUNT; i++) {
diff --git a/databases/xtrabackup81/files/patch-procps b/databases/xtrabackup81/files/patch-procps
new file mode 100644
index 000000000000..733821dd7c65
--- /dev/null
+++ b/databases/xtrabackup81/files/patch-procps
@@ -0,0 +1,28 @@
+--- storage/innobase/xtrabackup/src/CMakeLists.txt.orig	2023-11-24 13:33:10.000000000 +0300
++++ storage/innobase/xtrabackup/src/CMakeLists.txt	2024-02-16 15:38:03.294091000 +0300
+@@ -20,8 +20,9 @@
+ 
+ INCLUDE(${MYSQL_CMAKE_SCRIPT_DIR}/compile_flags.cmake)
+ 
++INCLUDE_DIRECTORIES(%%PREFIX%%/include)
++
+ FIND_GCRYPT()
+-FIND_PROCPS()
+ 
+ CHECK_TYPE_SIZE("unsigned long" SIZEOF_UNSIGNED_LONG)
+ 
+@@ -134,14 +135,6 @@
+   ext::icu
+   crc
+   )
+-
+-IF(NOT APPLE)
+-  IF(PROCPS_VERSION EQUAL 4)
+-    TARGET_LINK_LIBRARIES(xtrabackup proc2)
+-  ELSE()
+-    TARGET_LINK_LIBRARIES(xtrabackup procps)
+-  ENDIF()
+-ENDIF()
+ 
+  # We depend on protobuf because of the mysqlx plugin and replication.
+  IF(UNIX_INSTALL_RPATH_ORIGIN_PRIV_LIBDIR)
diff --git a/databases/xtrabackup81/files/patch-protobuf b/databases/xtrabackup81/files/patch-protobuf
new file mode 100644
index 000000000000..f1bd482d944a
--- /dev/null
+++ b/databases/xtrabackup81/files/patch-protobuf
@@ -0,0 +1,10 @@
+--- sql/protobuf/CMakeLists.txt.orig	2023-11-24 17:33:10.000000000 +0700
++++ sql/protobuf/CMakeLists.txt	2024-02-17 02:13:42.264307000 +0700
+@@ -21,6 +21,7 @@
+ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
+ 
+ INCLUDE(${CMAKE_SOURCE_DIR}/cmake/protobuf.cmake)
++INCLUDE_DIRECTORIES(%%PREFIX%%/include)
+ 
+ SET(PROTOBUF_LITE_LIB_NAME rpl_protobuf_lite)
+ 
diff --git a/databases/xtrabackup81/files/patch-storage_innobase_xtrabackup_src_utils.cc b/databases/xtrabackup81/files/patch-storage_innobase_xtrabackup_src_utils.cc
new file mode 100644
index 000000000000..dbc84f05a7e1
--- /dev/null
+++ b/databases/xtrabackup81/files/patch-storage_innobase_xtrabackup_src_utils.cc
@@ -0,0 +1,59 @@
+--- storage/innobase/xtrabackup/src/utils.cc.orig	2023-10-19 12:05:28 UTC
++++ storage/innobase/xtrabackup/src/utils.cc
+@@ -21,6 +21,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Bos
+ 
+ #ifdef __APPLE__
+ #include <mach/mach_host.h>
++#endif
++#if defined(__APPLE__) || defined(__FreeBSD__)
+ #include <sys/sysctl.h>
+ #else
+ #ifdef HAVE_PROCPS_V3
+@@ -113,12 +115,14 @@ unsigned long get_version_number(std::string version_s
+   return major * 10000 + minor * 100 + version;
+ }
+ 
+-#ifdef __APPLE__
++#if defined(__APPLE__) || defined(__FreeBSD__)
+ unsigned long host_total_memory() {
+   unsigned long total_mem = sysconf(_SC_PHYS_PAGES) * sysconf(_SC_PAGESIZE);
+   return total_mem;
+ }
++#endif
+ 
++#ifdef __APPLE__
+ unsigned long host_free_memory() {
+   unsigned long total_mem = host_total_memory();
+   int64_t used_mem;
+@@ -139,6 +143,31 @@ unsigned long host_free_memory() {
+     return total_mem - (unsigned long)used_mem;
+   }
+   return 0;
++}
++#elif defined(__FreeBSD__)
++unsigned long host_free_memory() {
++  static int mib_free[2] = { -1, 0 }; 
++  static int mib_inactive[2] = { -1, 0 };
++  size_t miblen = sizeof(mib_free) / sizeof(mib_free[0]);
++  uint32_t free_pages, inactive_pages;
++  size_t sz = sizeof(free_pages);
++  
++  free_pages = inactive_pages = 0;
++
++  if (mib_free[0] < 0 &&
++      sysctlnametomib("vm.stats.vm.v_free_count", mib_free, &miblen) < 0)
++          mib_free[0] = 0;
++  if (mib_inactive[0] < 0 &&
++      sysctlnametomib("vm.stats.vm.v_inactive_count", mib_inactive, &miblen) < 0)
++          mib_inactive[0] = 0;
++  
++  if (mib_free[0] &&
++      sysctl(mib_free, 2, &free_pages, &sz, NULL, 0) < 0)
++          free_pages = 0; /* should not happen */
++  if (mib_inactive[0] && sysctl(mib_inactive, 2, &inactive_pages, &sz, NULL, 0) < 0)
++          inactive_pages = 0; /* should not happen, too */
++
++  return (free_pages + inactive_pages) * sysconf(_SC_PAGESIZE);
+ }
+ #else
+ unsigned long host_total_memory() {
diff --git a/databases/xtrabackup81/files/patch-storage_innobase_xtrabackup_xbcloud__osenv.sh b/databases/xtrabackup81/files/patch-storage_innobase_xtrabackup_xbcloud__osenv.sh
new file mode 100644
index 000000000000..37b1e45afc66
--- /dev/null
+++ b/databases/xtrabackup81/files/patch-storage_innobase_xtrabackup_xbcloud__osenv.sh
@@ -0,0 +1,15 @@
+--- storage/innobase/xtrabackup/xbcloud_osenv.sh.orig	2020-08-28 21:02:32 UTC
++++ storage/innobase/xtrabackup/xbcloud_osenv.sh
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/bin/sh
+ 
+ # Copyright (C) 2015 Percona LLC and/or its affiliates.
+ # This software comes with ABSOLUTELY NO WARRANTY. This is free software,
+@@ -105,5 +105,5 @@ fi
+ 
+ # do it
+ # shellcheck disable=SC2086,SC2048
+-${XBCLOUD_BIN} $* ${XBCLOUD_OS_ENV}
++${XBCLOUD_BIN} "$@" ${XBCLOUD_OS_ENV}
+ 
diff --git a/databases/xtrabackup81/files/patch-storage_temptable_include_temptable_lock__free__type.h b/databases/xtrabackup81/files/patch-storage_temptable_include_temptable_lock__free__type.h
new file mode 100644
index 000000000000..f6664e3afa74
--- /dev/null
+++ b/databases/xtrabackup81/files/patch-storage_temptable_include_temptable_lock__free__type.h
@@ -0,0 +1,17 @@
+--- storage/temptable/include/temptable/lock_free_type.h.orig	2023-10-19 12:05:28 UTC
++++ storage/temptable/include/temptable/lock_free_type.h
+@@ -32,6 +32,14 @@ Lock-free type (selection) implementation. */
+ #include "my_config.h"
+ #include "storage/temptable/include/temptable/constants.h"
+ 
++#if defined(__i386__) //&& defined(__GCC_HAVE_SYNC_COMPARE_AND_SWAP_8)
++/* Fix for clang setting __GCC_ATOMIC_LLONG_LOCK_FREE incorrectly for x86
++ * https://llvm.org/bugs/show_bug.cgi?id=19355
++ */
++#undef ATOMIC_LLONG_LOCK_FREE
++#define ATOMIC_LLONG_LOCK_FREE 2
++#endif
++
+ namespace temptable {
+ 
+ /** Clang has a bug which causes ATOMIC_LLONG_LOCK_FREE to be defined as 1
diff --git a/databases/xtrabackup81/pkg-descr b/databases/xtrabackup81/pkg-descr
new file mode 100644
index 000000000000..da1655f57769
--- /dev/null
+++ b/databases/xtrabackup81/pkg-descr
@@ -0,0 +1,4 @@
+Percona XtraBackup is an open-source hot backup utility for MySQL that
+doesn't lock your database during the backup. It can back up data from
+InnoDB, XtraDB and MyISAM tables on MySQL/Percona Server/MariaDB
+servers, and has many advanced features.
diff --git a/databases/xtrabackup81/pkg-plist b/databases/xtrabackup81/pkg-plist
new file mode 100644
index 000000000000..40cde5419101
--- /dev/null
+++ b/databases/xtrabackup81/pkg-plist
@@ -0,0 +1,10 @@
+bin/xbcloud
+bin/xbcloud_osenv
+bin/xbcrypt
+bin/xbstream
+bin/xtrabackup
+lib/libmysqlservices.a
+lib/plugin/component_keyring_file.so
+lib/plugin/component_keyring_kms.so
+lib/plugin/keyring_file.so
+lib/plugin/component_keyring_vault.so
diff --git a/databases/zabbix3-libzbxpgsql/Makefile b/databases/zabbix3-libzbxpgsql/Makefile
deleted file mode 100644
index 6abe6917aa7c..000000000000
--- a/databases/zabbix3-libzbxpgsql/Makefile
+++ /dev/null
@@ -1,44 +0,0 @@
-# Created by: Martin Waschbuesch <martin@waschbuesch.de>
-
-PORTNAME=	libzbxpgsql
-PORTVERSION=	1.1.0
-DISTVERSIONPREFIX=	v
-PORTREVISION=	3
-CATEGORIES=	databases
-PKGNAMEPREFIX=	zabbix3-
-
-MAINTAINER=	martin@waschbuesch.de
-COMMENT=	Zabbix agent module for comprehensive monitoring of PostgreSQL servers
-
-LICENSE=	GPLv2+
-LICENSE_FILE=	${WRKSRC}/COPYING
-
-BUILD_DEPENDS=	${NONEXISTENT}:net-mgmt/${PKGNAMEPREFIX}agent:patch
-RUN_DEPENDS=	zabbix_agentd:net-mgmt/${PKGNAMEPREFIX}agent
-LIB_DEPENDS=	libconfig.so:devel/libconfig
-
-CONFLICTS=	zabbix[0-9][0-9]-libzbxpgsql
-
-USES=		autoreconf gmake libtool pgsql
-
-USE_GITHUB=	yes
-GH_ACCOUNT=	cavaliercoder
-
-GNU_CONFIGURE=	yes
-GET_ZBX_WRKSRC=	cd ${.CURDIR:H:H}/net-mgmt/${PKGNAMEPREFIX}agent && make -V WRKSRC
-CONFIGURE_ARGS=	--with-zabbix=$$(${GET_ZBX_WRKSRC})
-
-USE_LDCONFIG=	yes
-
-OPTIONS_DEFINE=	EXAMPLES
-
-PORTSCOUT=	skipv:latest,gh-pages
-
-do-install:
-		${INSTALL_LIB} ${WRKSRC}/src/.libs/libzbxpgsql.so ${STAGEDIR}${PREFIX}/lib/libzbxpgsql.so
-
-do-install-EXAMPLES-on:
-		${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
-		${INSTALL_DATA} ${WRKSRC}/templates/*.xml ${STAGEDIR}${EXAMPLESDIR}
-
-.include <bsd.port.mk>
diff --git a/databases/zabbix3-libzbxpgsql/distinfo b/databases/zabbix3-libzbxpgsql/distinfo
deleted file mode 100644
index 269563ce15d3..000000000000
--- a/databases/zabbix3-libzbxpgsql/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1503755196
-SHA256 (cavaliercoder-libzbxpgsql-v1.1.0_GH0.tar.gz) = 50acc4364241253a013058daf76c4184cc522104f78005d3c4d5e7e09d77571a
-SIZE (cavaliercoder-libzbxpgsql-v1.1.0_GH0.tar.gz) = 61106
diff --git a/databases/zabbix3-libzbxpgsql/files/patch-src_libzbxpgsql.c b/databases/zabbix3-libzbxpgsql/files/patch-src_libzbxpgsql.c
deleted file mode 100644
index e1ae90077e39..000000000000
--- a/databases/zabbix3-libzbxpgsql/files/patch-src_libzbxpgsql.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/libzbxpgsql.c.orig	2016-06-25 14:18:03 UTC
-+++ src/libzbxpgsql.c
-@@ -24,6 +24,9 @@
-  */
- 
- #include "libzbxpgsql.h"
-+#include <sys/types.h>
-+#include <sys/socket.h>
-+#include <netinet/in.h>
- 
- // Define custom keys
- static ZBX_METRIC keys[] =
diff --git a/databases/zabbix3-libzbxpgsql/pkg-descr b/databases/zabbix3-libzbxpgsql/pkg-descr
deleted file mode 100644
index 0b6a261aae10..000000000000
--- a/databases/zabbix3-libzbxpgsql/pkg-descr
+++ /dev/null
@@ -1,7 +0,0 @@
-This project provides comprehensive monitoring of PostgreSQL servers using a
-natively compiled Zabbix agent module, written in C.
-
-The module enables discovery and monitoring of tablespaces, databases,
-namespaces, tables, indexes, etc.
-
-WWW: http://cavaliercoder.com/libzbxpgsql/
diff --git a/databases/zabbix3-libzbxpgsql/pkg-message b/databases/zabbix3-libzbxpgsql/pkg-message
deleted file mode 100644
index 0837bde77f1b..000000000000
--- a/databases/zabbix3-libzbxpgsql/pkg-message
+++ /dev/null
@@ -1,9 +0,0 @@
-[
-{ type: install
-  message: <<EOM
-In order to enable the module, add libzbxpgsql.so to the LoadModule=
-line in zabbix_agentd.conf and restart the agent with
-service zabbix_agentd restart
-EOM
-}
-]
diff --git a/databases/zabbix3-libzbxpgsql/pkg-plist b/databases/zabbix3-libzbxpgsql/pkg-plist
deleted file mode 100644
index 765ec35e2459..000000000000
--- a/databases/zabbix3-libzbxpgsql/pkg-plist
+++ /dev/null
@@ -1,4 +0,0 @@
-lib/libzbxpgsql.so
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Template_PostgreSQL_Server_2.0.xml
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Template_PostgreSQL_Server_2.4.xml
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Template_PostgreSQL_Server_3.0.xml
diff --git a/databases/zodb/Makefile b/databases/zodb/Makefile
new file mode 100644
index 000000000000..eea936a65832
--- /dev/null
+++ b/databases/zodb/Makefile
@@ -0,0 +1,27 @@
+PORTNAME=	zodb
+PORTVERSION=	5.8.1
+CATEGORIES=	databases python
+MASTER_SITES=	PYPI
+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+DISTNAME=	ZODB-${PORTVERSION}
+
+MAINTAINER=	wen@FreeBSD.org
+COMMENT=	Python object-oriented database
+WWW=		https://github.com/zopefoundation/zodb
+
+LICENSE=	ZPL21
+LICENSE_FILE=	${WRKSRC}/LICENSE.txt
+
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}persistent>=4.4.0:devel/py-persistent@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}BTrees>=4.2.0:devel/py-BTrees@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}zconfig>0:devel/py-zconfig@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}transaction>=2.4:devel/py-transaction@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}zclockfile>=0:devel/py-zclockfile@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}zodbpickle>=1.0.1:databases/py-zodbpickle@${PY_FLAVOR}
+
+USES=		python
+USE_PYTHON=	autoplist concurrent distutils
+
+.include <bsd.port.mk>
diff --git a/databases/zodb/distinfo b/databases/zodb/distinfo
new file mode 100644
index 000000000000..9f1d12a7cedc
--- /dev/null
+++ b/databases/zodb/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1689923787
+SHA256 (ZODB-5.8.1.tar.gz) = c6c73abd3660d606ffc1f21f97def14b52b46f4a702ec9e6ee449a6e2be264df
+SIZE (ZODB-5.8.1.tar.gz) = 790095
diff --git a/databases/zodb/pkg-descr b/databases/zodb/pkg-descr
new file mode 100644
index 000000000000..8eeb0f492376
--- /dev/null
+++ b/databases/zodb/pkg-descr
@@ -0,0 +1,10 @@
+ZODB provides an object-oriented database for Python that provides
+a high-degree of transparency. ZODB runs on Python 2.7 or Python 3.4
+ and above. It also runs on PyPy.
+
+*no separate language for database operations
+*very little impact on your code to make objects persistent
+*no database mapper that partially hides the database.
+*Using an object-relational mapping is not like using an object-oriented
+database.
+*almost no seam between code and database.